From 825ccadd11ecc42f8b7184a84d987b8691097f9f Mon Sep 17 00:00:00 2001
From: fabianoflnsp <45748723+fabianoflnsp@users.noreply.github.com>
Date: Tue, 21 Apr 2020 01:55:10 -0300
Subject: [PATCH 0001/3183] Update index.js

Added Support for Sonoff Mini
---
 index.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/index.js b/index.js
index a7710bf1..9450617a 100644
--- a/index.js
+++ b/index.js
@@ -142,6 +142,7 @@ function eWeLink(log, config, api) {
 						if ((deviceInformationFromWebApi !== undefined) && (deviceInformationFromWebApi["productModel"])) {
 							switch (deviceInformationFromWebApi.productModel) {
 								case 'B1':
+								case 'MINI':
 									powerState = deviceInformationFromWebApi.params.state;
 									break;
 								case 'iFan02':
@@ -217,6 +218,7 @@ eWeLink.prototype.getStateFromDevice = function(device) {
 	if ((device !== undefined) && (device["productModel"])) {
 		switch (device.productModel) {
 			case 'B1':
+			case "MINI":
 				powerState = device.params.state;
 				break;
 			case 'iFan02':

From 133af6b4040adfbe4a934e3785507021476970d8 Mon Sep 17 00:00:00 2001
From: George <19616587+gbro115@users.noreply.github.com>
Date: Tue, 19 May 2020 11:38:39 -0400
Subject: [PATCH 0002/3183] Update package.json

Modify name post merge
---
 package.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 6c64e424..b66653c9 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
-  "name": "homebridge-ewelink-complete",
+  "name": "homebridge-ewelink",
   "version": "0.1.76",
-  "description": "Fork of homebridge-eWeLink is a Homebrige plugin to control Sonoff relays running OEM firmware",
+  "description": "homebridge-eWeLink is a Homebrige plugin to control Sonoff relays running OEM firmware",
   "license": "MIT",
   "keywords": [
     "homebridge-plugin",
@@ -13,7 +13,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/ronnieroberts/homebridge-ewelink.git"
+    "url": "https://github.com/gbro115/homebridge-ewelink.git"
   },
   "dependencies": {
     "ewelink-api": "^2.0.0",

From 87388442fe9025db866e364aa11ef913618239b5 Mon Sep 17 00:00:00 2001
From: George <19616587+gbro115@users.noreply.github.com>
Date: Tue, 19 May 2020 11:40:16 -0400
Subject: [PATCH 0003/3183] Update README.md

---
 README.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 82d1b8c4..d476dd88 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,9 @@
-## This is a fork of homebridge-ewelink
+# Changes from homebridge-ewelink-complete have been merged into the master
 
 The largest change here is to use evelink-api for all API needs rather than rewrite
 
-# homebridge-ewelink-complete
+# About
+
 Homebridge plugin to control Sonoff relays with OEM firmware. It uses the same API as the iOS app to communicate with your devices.
 
 The platform will dynamically add/remove devices based on what is configured in your eWeLink account.

From b56ea1b9b8521d331042cbb1fde81173b1eaee04 Mon Sep 17 00:00:00 2001
From: George <19616587+gbro115@users.noreply.github.com>
Date: Tue, 19 May 2020 11:40:39 -0400
Subject: [PATCH 0004/3183] Update README.md

Formatting
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index d476dd88..fc4f06d7 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Changes from homebridge-ewelink-complete have been merged into the master
+### Changes from homebridge-ewelink-complete have been merged into the master
 
 The largest change here is to use evelink-api for all API needs rather than rewrite
 

From 043705b3dbfc2b7bd3fa298457eeb32eefe37b0f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 16 Aug 2020 07:53:42 +0100
Subject: [PATCH 0005/3183] jshint format tweaks

---
 index.js | 710 +++++++++++++++++++++++++++----------------------------
 1 file changed, 343 insertions(+), 367 deletions(-)

diff --git a/index.js b/index.js
index 9450617a..fadb4c55 100644
--- a/index.js
+++ b/index.js
@@ -1,382 +1,358 @@
-var WebSocket = require('ws');
-var http = require('http');
-var url = require('url');
-var request = require('request-json');
+/* jshint esversion: 9, -W030, node: true */
 const ewelinkapi = require('ewelink-api');
 
-var nonce = require('nonce')();
-
-var wsc;
-var isSocketOpen = false;
-var sequence = 0;
-var webClient = '';
-var apiKey = 'UNCONFIGURED';
-var authenticationToken = 'UNCONFIGURED';
-var phoneNumberOrEmail = '';
-var accountPassword = '';
-var connection = 0;
 var Accessory, Service, Characteristic, UUIDGen;
-var debug = false;
-
-module.exports = function(homebridge) {
-	console.log("homebridge API version: " + homebridge.version);
-
-	// Accessory must be created from PlatformAccessory Constructor
-	Accessory = homebridge.platformAccessory;
 
-	// Service and Characteristic are from hap-nodejs
-	Service = homebridge.hap.Service;
-	Characteristic = homebridge.hap.Characteristic;
-	UUIDGen = homebridge.hap.uuid;
-
-	// For platform plugin to be considered as dynamic platform plugin,
-	// registerPlatform(pluginName, platformName, constructor, dynamic), dynamic must be true
-	homebridge.registerPlatform("homebridge-eWeLink", "eWeLink", eWeLink, true);
-
-}
+module.exports = function (homebridge) {
+   console.log("homebridge API version: " + homebridge.version);
+   
+   // Accessory must be created from PlatformAccessory Constructor
+   Accessory = homebridge.platformAccessory;
+   
+   // Service and Characteristic are from hap-nodejs
+   Service = homebridge.hap.Service;
+   Characteristic = homebridge.hap.Characteristic;
+   UUIDGen = homebridge.hap.uuid;
+   
+   // For platform plugin to be considered as dynamic platform plugin,
+   // registerPlatform(pluginName, platformName, constructor, dynamic), dynamic must be true
+   homebridge.registerPlatform("homebridge-eWeLink", "eWeLink", eWeLink, true);
+   
+};
 
 // Platform constructor
 function eWeLink(log, config, api) {
-
-	log("Intialising eWeLink");
-
-	var platform = this;
-
-	this.log = log;
-	this.config = config;
-	this.accessories = new Map();
-	this.authenticationToken = 'UNCONFIGURED';
-	this.phoneNumberOrEmail = config['phoneNumberOrEmail'];
-	this.accountPassword = config['accountPassword'];
-	this.debug = (config['debug'] == 'true') ? true : false;
-
-
-	if (api) {
-
-		// Save the API object as plugin needs to register new accessory via this object
-		this.api = api;
-
-		// Listen to event "didFinishLaunching", this means homebridge already finished loading cached accessories.
-		// Platform Plugin should only register new accessory that doesn't exist in homebridge after this event.
-		// Or start discover new accessories.
-
-
-		this.api.on('didFinishLaunching', function() {
-
-			platform.log("A total of [%s] accessories were loaded from the local cache", platform.accessories.size);
-
-			// Get a list of all devices from the API, and compare it to the list of cached devices.
-			// New devices will be added, and devices that exist in the cache but not in the web list
-			// will be removed from Homebridge.
-
-			(async() => {
-
-				const connection = new ewelinkapi({
-					email: this.phoneNumberOrEmail,
-					password: this.accountPassword
-				});
-				this.connection = connection;
-				this.authenticationToken = await connection.getCredentials();
-				if(this.debug) platform.log("authenticationToken %s", JSON.stringify(this.authenticationToken));
-
-				/* get all devices */
-				platform.log("Requesting a list of devices from eWeLink HTTPS API");
-				const devices = await connection.getDevices();
-				//				console.log(JSON.stringify(devices));
-
-				var size = devices.length;
-				platform.log("eWeLink HTTPS API reports that there are a total of [%s] devices registered", size);
-
-				if (size == 0) {
-					platform.log("As there were no devices were found, all devices have been removed from the platorm's cache. Please regiester your devices using the eWeLink app and restart HomeBridge");
-					platform.accessories.clear();
-					platform.api.unregisterPlatformAccessories("homebridge-eWeLink", "eWeLink", platform.accessories);
-					return;
-				}
-
-				var devicesFromApi = new Map();
-				var newDevicesToAdd = new Map();
-
-				devices.forEach((device) => {
-					platform.apiKey = device.apikey;
-					devicesFromApi.set(device.deviceid, device);
-				})
-
-				// Now we compare the cached devices against the web list
-				platform.log("Evaluating if devices need to be removed...");
-
-				function checkIfDeviceIsStillRegistered(value, deviceId, map) {
-
-					var accessory = platform.accessories.get(deviceId);
-
-					if (devicesFromApi.has(deviceId)) {
-						platform.log('Device [%s] is regeistered with API. Nothing to do.', accessory.displayName);
-					} else {
-						platform.log('Device [%s], ID : [%s] was not present in the response from the API. It will be removed.', accessory.displayName, accessory.UUID);
-						platform.removeAccessory(accessory);
-					};
-				}
-
-				// If we have devices in our cache, check that they exist in the web response
-				if (platform.accessories.size > 0) {
-					platform.log("Verifying that all cached devices are still registered with the API. Devices that are no longer registered with the API will be removed.");
-					platform.accessories.forEach(checkIfDeviceIsStillRegistered);
-				}
-
-				platform.log("Evaluating if new devices need to be added...");
-
-				// Now we compare the cached devices against the web list
-				function checkIfDeviceIsAlreadyConfigured(value, deviceId, map) {
-					if (platform.accessories.has(deviceId)) {
-
-						platform.log('Device with ID [%s] is already configured. Ensuring that the configuration is current.', deviceId);
-
-						var accessory = platform.accessories.get(deviceId);
-						var deviceInformationFromWebApi = devicesFromApi.get(deviceId);
-
-						accessory.getService(Service.AccessoryInformation).setCharacteristic(Characteristic.Name, deviceInformationFromWebApi.name);
-						accessory.getService(Service.AccessoryInformation).setCharacteristic(Characteristic.SerialNumber, deviceInformationFromWebApi.extra.extra.mac);
-						accessory.getService(Service.AccessoryInformation).setCharacteristic(Characteristic.Manufacturer, deviceInformationFromWebApi.brandName);
-						accessory.getService(Service.AccessoryInformation).setCharacteristic(Characteristic.Model, deviceInformationFromWebApi.productModel);
-						accessory.getService(Service.AccessoryInformation).setCharacteristic(Characteristic.FirmwareRevision, deviceInformationFromWebApi.params.fwVersion);
-						if ((deviceInformationFromWebApi !== undefined) && (deviceInformationFromWebApi["productModel"])) {
-							switch (deviceInformationFromWebApi.productModel) {
-								case 'B1':
-								case 'MINI':
-									powerState = deviceInformationFromWebApi.params.state;
-									break;
-								case 'iFan02':
-									powerState = deviceInformationFromWebApi.params.switches[0].switch;
-									break;
-								case 'AD500--X':
-									powerState = deviceInformationFromWebApi.params.switch;
-							};
-						}
-						if(this.debug) platform.log("::checkIfDeviceIsAlreadyConfigured() " + deviceInformationFromWebApi.name + " is " + powerState);
-
-						platform.updatePowerStateCharacteristic(deviceId, powerState);
-
-
-					} else {
-						var deviceToAdd = devicesFromApi.get(deviceId);
-						platform.log('Device [%s], ID : [%s] will be added', deviceToAdd.name, deviceToAdd.deviceid);
-						platform.addAccessory(deviceToAdd);
-					};
-				}
-
-				// Go through the web response to make sure that all the devices that are in the response do exist in the accessories map
-				if (devicesFromApi.size > 0) {
-					devicesFromApi.forEach(checkIfDeviceIsAlreadyConfigured);
-				}
-
-				if(this.debug) platform.log("API key retrieved from web service is [%s]", platform.apiKey);
-
-
-			})().catch(function(error) {
-				platform.log("Error in intialization");
-			});
-		}.bind(this));
-	}
+   
+   log("Intialising eWeLink");
+   
+   var platform = this;
+   
+   this.log = log;
+   this.config = config;
+   this.accessories = new Map();
+   this.authenticationToken = 'UNCONFIGURED';
+   this.phoneNumberOrEmail = config.phoneNumberOrEmail;
+   this.accountPassword = config.accountPassword;
+   this.debug = (config.debug === 'true') ? true : false;
+   
+   if (api) {
+      
+      // Save the API object as plugin needs to register new accessory via this object
+      this.api = api;
+      
+      // Listen to event "didFinishLaunching", this means homebridge already finished loading cached accessories.
+      // Platform Plugin should only register new accessory that doesn't exist in homebridge after this event.
+      // Or start discover new accessories.
+      
+      this.api.on('didFinishLaunching', function () {
+         
+         platform.log("A total of [%s] accessories were loaded from the local cache", platform.accessories.size);
+         
+         // Get a list of all devices from the API, and compare it to the list of cached devices.
+         // New devices will be added, and devices that exist in the cache but not in the web list
+         // will be removed from Homebridge.
+         
+         (async () => {
+            
+            const connection = new ewelinkapi({
+               email: this.phoneNumberOrEmail,
+               password: this.accountPassword
+            });
+            this.connection = connection;
+            this.authenticationToken = await connection.getCredentials();
+            if (this.debug) platform.log("authenticationToken %s", JSON.stringify(this.authenticationToken));
+            
+            /* get all devices */
+            platform.log("Requesting a list of devices from eWeLink HTTPS API");
+            const devices = await connection.getDevices();
+            //				console.log(JSON.stringify(devices));
+            
+            var size = devices.length;
+            platform.log("eWeLink HTTPS API reports that there are a total of [%s] devices registered", size);
+            
+            if (size == 0) {
+               platform.log("As there were no devices were found, all devices have been removed from the platorm's cache. Please regiester your devices using the eWeLink app and restart HomeBridge");
+               platform.accessories.clear();
+               platform.api.unregisterPlatformAccessories("homebridge-eWeLink", "eWeLink", platform.accessories);
+               return;
+            }
+            
+            var devicesFromApi = new Map();
+            
+            devices.forEach((device) => {
+               platform.apiKey = device.apikey;
+               devicesFromApi.set(device.deviceid, device);
+            });
+            
+            // Now we compare the cached devices against the web list
+            platform.log("Evaluating if devices need to be removed...");
+            
+            function checkIfDeviceIsStillRegistered(value, deviceId, map) {
+               
+               var accessory = platform.accessories.get(deviceId);
+               
+               if (devicesFromApi.has(deviceId)) {
+                  platform.log('Device [%s] is regeistered with API. Nothing to do.', accessory.displayName);
+               } else {
+                  platform.log('Device [%s], ID : [%s] was not present in the response from the API. It will be removed.', accessory.displayName, accessory.UUID);
+                  platform.removeAccessory(accessory);
+               }
+            }
+            
+            // If we have devices in our cache, check that they exist in the web response
+            if (platform.accessories.size > 0) {
+               platform.log("Verifying that all cached devices are still registered with the API. Devices that are no longer registered with the API will be removed.");
+               platform.accessories.forEach(checkIfDeviceIsStillRegistered);
+            }
+            
+            platform.log("Evaluating if new devices need to be added...");
+            
+            // Now we compare the cached devices against the web list
+            function checkIfDeviceIsAlreadyConfigured(value, deviceId, map) {
+               if (platform.accessories.has(deviceId)) {
+                  
+                  platform.log('Device with ID [%s] is already configured. Ensuring that the configuration is current.', deviceId);
+                  
+                  var accessory = platform.accessories.get(deviceId);
+                  var deviceInformationFromWebApi = devicesFromApi.get(deviceId);
+                  
+                  accessory.getService(Service.AccessoryInformation).setCharacteristic(Characteristic.Name, deviceInformationFromWebApi.name);
+                  accessory.getService(Service.AccessoryInformation).setCharacteristic(Characteristic.SerialNumber, deviceInformationFromWebApi.extra.extra.mac);
+                  accessory.getService(Service.AccessoryInformation).setCharacteristic(Characteristic.Manufacturer, deviceInformationFromWebApi.brandName);
+                  accessory.getService(Service.AccessoryInformation).setCharacteristic(Characteristic.Model, deviceInformationFromWebApi.productModel);
+                  accessory.getService(Service.AccessoryInformation).setCharacteristic(Characteristic.FirmwareRevision, deviceInformationFromWebApi.params.fwVersion);
+                  let powerState;
+                  if ((deviceInformationFromWebApi !== undefined) && (deviceInformationFromWebApi.productModel)) {
+                     switch (deviceInformationFromWebApi.productModel) {
+                     case 'B1':
+                     case 'MINI':
+                        powerState = deviceInformationFromWebApi.params.state;
+                        break;
+                     case 'iFan02':
+                        powerState = deviceInformationFromWebApi.params.switches[0].switch;
+                        break;
+                     case 'AD500--X':
+                        powerState = deviceInformationFromWebApi.params.switch;
+                     }
+                  }
+                  if (this.debug) platform.log("::checkIfDeviceIsAlreadyConfigured() " + deviceInformationFromWebApi.name + " is " + powerState);
+                  
+                  platform.updatePowerStateCharacteristic(deviceId, powerState);
+                  
+               } else {
+                  var deviceToAdd = devicesFromApi.get(deviceId);
+                  platform.log('Device [%s], ID : [%s] will be added', deviceToAdd.name, deviceToAdd.deviceid);
+                  platform.addAccessory(deviceToAdd);
+               }
+            }
+            
+            // Go through the web response to make sure that all the devices that are in the response do exist in the accessories map
+            if (devicesFromApi.size > 0) {
+               devicesFromApi.forEach(checkIfDeviceIsAlreadyConfigured);
+            }
+            
+            if (this.debug) platform.log("API key retrieved from web service is [%s]", platform.apiKey);
+            
+         })().catch(function (error) {
+            platform.log("Error in intialization");
+         });
+      }.bind(this));
+   }
 }
 
-
 // Function invoked when homebridge tries to restore cached accessory.
 // We update the existing devices as part of didFinishLaunching(), as to avoid an additional call to the the HTTPS API.
-eWeLink.prototype.configureAccessory = function(accessory) {
-
-	this.log(accessory.displayName, "Configure Accessory");
-
-	var platform = this;
-	accessory.reachable = true;
-	
-	accessory.on('identify', function(paired, callback) {
-	    platform.log(accessory.displayName, "Identify!!!");
-	    callback();
-	  });
-
-	if (accessory.getService(Service.Switch)) {
-
-		accessory.getService(Service.Switch).getCharacteristic(Characteristic.On)
-			.on('set', function(value, callback) {
-				platform.setPowerState(accessory, value);
-				callback();
-			})
-			.on('get', function(callback) {
-				platform.getPowerState(accessory);
-				callback();
-			});
-
-	}
-
-	this.accessories.set(accessory.context.deviceId, accessory);
-
-}
-
-eWeLink.prototype.getStateFromDevice = function(device) {
-	if(this.debug) this.log("getStateFromDevice:: ENTER");
-	var powerState = 'on';
-	if ((device !== undefined) && (device["productModel"])) {
-		switch (device.productModel) {
-			case 'B1':
-			case "MINI":
-				powerState = device.params.state;
-				break;
-			case 'iFan02':
-				powerState = device.params.switches[0].switch;
-				break;
-			case 'AD500--X':
-				powerState = device.params.switch;
-		};
-	}
-	if(this.debug) this.log("getStateFromDevice:: " + device.name + " is " + powerState);
-	if(this.debug) this.log("getStateFromDevice:: EXIT");
-	return powerState;
-}
+eWeLink.prototype.configureAccessory = function (accessory) {
+   
+   this.log(accessory.displayName, "Configure Accessory");
+   
+   var platform = this;
+   accessory.reachable = true;
+   
+   accessory.on('identify', function (paired, callback) {
+      platform.log(accessory.displayName, "Identify!!!");
+      callback();
+   });
+   
+   if (accessory.getService(Service.Switch)) {
+      
+      accessory.getService(Service.Switch).getCharacteristic(Characteristic.On)
+         .on('set', function (value, callback) {
+            platform.setPowerState(accessory, value);
+            callback();
+         })
+         .on('get', function (callback) {
+            platform.getPowerState(accessory);
+            callback();
+         });
+      
+   }
+   
+   this.accessories.set(accessory.context.deviceId, accessory);
+   
+};
+
+eWeLink.prototype.getStateFromDevice = function (device) {
+   if (this.debug) this.log("getStateFromDevice:: ENTER");
+   var powerState = 'on';
+   if ((device !== undefined) && (device.productModel)) {
+      switch (device.productModel) {
+      case 'B1':
+      case "MINI":
+         powerState = device.params.state;
+         break;
+      case 'iFan02':
+         powerState = device.params.switches[0].switch;
+         break;
+      case 'AD500--X':
+         powerState = device.params.switch;
+      }
+   }
+   if (this.debug) this.log("getStateFromDevice:: " + device.name + " is " + powerState);
+   if (this.debug) this.log("getStateFromDevice:: EXIT");
+   return powerState;
+};
 
 // Sample function to show how developer can add accessory dynamically from outside event
-eWeLink.prototype.addAccessory = function(device) {
-
-	// Here we need to check if it is currently there
-	if (this.accessories.get(device.deviceid)) {
-		this.log("Not adding [%s] as it already exists in the cache", device.deviceid);
-		return
-	}
-
-	var platform = this;
-
-	if (device.type != 10) {
-		this.log("A device with an unknown type was returned. It will be skipped.", device.type);
-		return;
-	}
-
-	this.log("Found Accessory with Name : [%s], Manufacturer : [%s], Status : [%s], Is Online : [%s], API Key: [%s] ", device.name, device.productModel, this.getStateFromDevice(device), device.online, device.apikey);
-
-	const accessory = new Accessory(device.name, UUIDGen.generate(device.deviceid.toString()))
-
-	accessory.context.deviceId = device.deviceid
-	accessory.context.apiKey = device.apikey;
-
-	// if (device.online == 'true') {
-		accessory.reachable = true;
-	// } else {
-	// 	accessory.reachable = false;
-	// }
-
-	var platform = this;
-	accessory.addService(Service.Switch, device.name)
-		.getCharacteristic(Characteristic.On)
-		.on('set', function(value, callback) {
-			platform.setPowerState(accessory, value);
-			callback();
-		})
-		.on('get', function(callback) {
-			platform.getPowerState(accessory);
-			callback();
-		});
-
-
-	accessory.on('identify', function(paired, callback) {
-		platform.log(accessory.displayName, "Identify not supported");
-		callback();
-	});
-
-	accessory.getService(Service.AccessoryInformation).Characteristic(Characteristic.SerialNumber, device.extra.extra.mac);
-	accessory.getService(Service.AccessoryInformation).setCharacteristic(Characteristic.Manufacturer, device.productModel);
-	accessory.getService(Service.AccessoryInformation).setCharacteristic(Characteristic.Model, device.extra.extra.model);
-	accessory.getService(Service.AccessoryInformation).setCharacteristic(Characteristic.Identify, false);
-	accessory.getService(Service.AccessoryInformation).setCharacteristic(Characteristic.FirmwareRevision, device.params.fwVersion);
-
-	this.accessories.set(device.deviceid, accessory);
-
-	this.api.registerPlatformAccessories("homebridge-eWeLink",
-		"eWeLink", [accessory]);
-
-}
-
-eWeLink.prototype.getSequence = function() {
-	var time_stamp = new Date() / 1000;
-	this.sequence = Math.floor(time_stamp * 1000);
-	return this.sequence;
-}
-
-eWeLink.prototype.updatePowerStateCharacteristic = function(deviceId, state) {
-	var platform = this;
-	if (platform.debug) platform.log("::updatePowerStateCharacteristic() : ENTER with (deviceId='"+deviceId+"',state='"+state+"')");
-	
-	// Used when we receive an update from an external source
-	var isOn = false;
-	var accessory = platform.accessories.get(deviceId);
-	if (state == 'on') {
-		isOn = true;
-	}
-	//if (platform.debug) platform.log("::updatePowerStateCharacteristic() : accessory before update: "+JSON.stringify(accessory));
-
-	if (platform.debug) platform.log("::updatePowerStateCharacteristic() : Updating recorded Characteristic.On for [%s] to [%s]. No request will be sent to the device.", accessory.context.deviceId, isOn);
-	accessory.getService(Service.Switch).setCharacteristic(Characteristic.On, isOn);
-	//if (platform.debug) platform.log("::updatePowerStateCharacteristic() : accessory after update: "+JSON.stringify(accessory));
-	//platform.updatePowerStateCharacteristic(deviceId, powerState);
-	if (platform.debug) platform.log("::updatePowerStateCharacteristic() : EXIT");
-}
-
-
-eWeLink.prototype.getPowerState = function(accessory, callback) {
-	var platform = this;
-
-	if (this.debug) platform.log("::getPowerState() : ENTER Requesting power state for [%s].", accessory.displayName); //, JSON.stringify(accessory));
-
-	(async() => {
-		//		const device = await platform.connection.getDevice(accessory.context.deviceId);
-		var interestedDevice = null;
-/////////////
-		const devices = await platform.connection.getDevices();
-		//if (platform.debug) platform.log("::getPowerState() : retrieved all devices, found "+devices.length+" devices");
-
-		//if (platform.debug) platform.log("::getPowerState() : Looking for interested device");
-		devices.forEach((device) => {
-//			if (platform.debug) platform.log("::getPowerState() : Found : "+JSON.stringify(device));
-			//if (platform.debug) platform.log("::getPowerState() : Looking for " + accessory.context.deviceId + ", but found "+device.deviceid);
-			if(accessory.context.deviceId==device.deviceid) {
-				//if (platform.debug) platform.log("::getPowerState() : found what I was looking for");
-				interestedDevice = device; 
-			}
-		})
-/////////////
-		powerState = platform.getStateFromDevice(interestedDevice)
-		if (platform.debug) platform.log("::getPowerState() : power state for [%s] is %s", accessory.displayName, powerState);
-		this.updatePowerStateCharacteristic(accessory.context.deviceId, powerState);
-		if (this.debug) platform.log("::getPowerState() : EXIT");
-	})()
-	.catch(function(error) {
-		platform.log("::getPowerState() : Error in retrieving device\n"+JSON.stringify(error));
-	});
-}
-
-eWeLink.prototype.setPowerState = function(accessory, isOn, callback) {
-	var platform = this;
-	if(platform.debug) platform.log("::setPowerState() : ENTER");
-
-	var targetState = 'off';
-	
-	if (isOn==true || isOn=='on') {
-		targetState = 'on';
-	}
-
-	if (this.debug) platform.log("::setPowerState() : Setting power state to [%s] for device [%s]", targetState, accessory.displayName);
-	(async() => {
-		const status = await platform.connection.setDevicePowerState(accessory.context.deviceId, targetState);
-		if (this.debug) platform.log("::setPowerState() : power state for [%s] is %s", accessory.displayName, JSON.stringify(status));
-		//this.updatePowerStateCharacteristic(accessory.context.deviceId, targetState);
-		if(platform.debug) platform.log("::setPowerState() : EXIT");
-	})().catch(function(error) {
-		platform.log("::setPowerState() : Error in retrieving device\n"+JSON.stringify(error));
-	});
-}
-
+eWeLink.prototype.addAccessory = function (device) {
+   
+   // Here we need to check if it is currently there
+   if (this.accessories.get(device.deviceid)) {
+      this.log("Not adding [%s] as it already exists in the cache", device.deviceid);
+      return;
+   }
+   
+   var platform = this;
+   
+   if (device.type != 10) {
+      this.log("A device with an unknown type was returned. It will be skipped.", device.type);
+      return;
+   }
+   
+   this.log("Found Accessory with Name : [%s], Manufacturer : [%s], Status : [%s], Is Online : [%s], API Key: [%s] ", device.name, device.productModel, this.getStateFromDevice(device), device.online, device.apikey);
+   
+   const accessory = new Accessory(device.name, UUIDGen.generate(device.deviceid.toString()));
+   
+   accessory.context.deviceId = device.deviceid;
+   accessory.context.apiKey = device.apikey;
+   
+   // if (device.online == 'true') {
+   accessory.reachable = true;
+   // } else {
+   // 	accessory.reachable = false;
+   // }
+   
+   accessory.addService(Service.Switch, device.name)
+      .getCharacteristic(Characteristic.On)
+      .on('set', function (value, callback) {
+         platform.setPowerState(accessory, value);
+         callback();
+      })
+      .on('get', function (callback) {
+         platform.getPowerState(accessory);
+         callback();
+      });
+   
+   accessory.on('identify', function (paired, callback) {
+      platform.log(accessory.displayName, "Identify not supported");
+      callback();
+   });
+   
+   accessory.getService(Service.AccessoryInformation).Characteristic(Characteristic.SerialNumber, device.extra.extra.mac);
+   accessory.getService(Service.AccessoryInformation).setCharacteristic(Characteristic.Manufacturer, device.productModel);
+   accessory.getService(Service.AccessoryInformation).setCharacteristic(Characteristic.Model, device.extra.extra.model);
+   accessory.getService(Service.AccessoryInformation).setCharacteristic(Characteristic.Identify, false);
+   accessory.getService(Service.AccessoryInformation).setCharacteristic(Characteristic.FirmwareRevision, device.params.fwVersion);
+   
+   this.accessories.set(device.deviceid, accessory);
+   
+   this.api.registerPlatformAccessories("homebridge-eWeLink",
+      "eWeLink", [accessory]);
+   
+};
+
+eWeLink.prototype.getSequence = function () {
+   var time_stamp = new Date() / 1000;
+   this.sequence = Math.floor(time_stamp * 1000);
+   return this.sequence;
+};
+
+eWeLink.prototype.updatePowerStateCharacteristic = function (deviceId, state) {
+   var platform = this;
+   if (platform.debug) platform.log("::updatePowerStateCharacteristic() : ENTER with (deviceId='" + deviceId + "',state='" + state + "')");
+   
+   // Used when we receive an update from an external source
+   var isOn = false;
+   var accessory = platform.accessories.get(deviceId);
+   if (state == 'on') {
+      isOn = true;
+   }
+   //if (platform.debug) platform.log("::updatePowerStateCharacteristic() : accessory before update: "+JSON.stringify(accessory));
+   
+   if (platform.debug) platform.log("::updatePowerStateCharacteristic() : Updating recorded Characteristic.On for [%s] to [%s]. No request will be sent to the device.", accessory.context.deviceId, isOn);
+   accessory.getService(Service.Switch).setCharacteristic(Characteristic.On, isOn);
+   //if (platform.debug) platform.log("::updatePowerStateCharacteristic() : accessory after update: "+JSON.stringify(accessory));
+   //platform.updatePowerStateCharacteristic(deviceId, powerState);
+   if (platform.debug) platform.log("::updatePowerStateCharacteristic() : EXIT");
+};
+
+eWeLink.prototype.getPowerState = function (accessory, callback) {
+   var platform = this;
+   
+   if (this.debug) platform.log("::getPowerState() : ENTER Requesting power state for [%s].", accessory.displayName); //, JSON.stringify(accessory));
+   
+   (async () => {
+      //		const device = await platform.connection.getDevice(accessory.context.deviceId);
+      var interestedDevice = null;
+      /////////////
+      const devices = await platform.connection.getDevices();
+      //if (platform.debug) platform.log("::getPowerState() : retrieved all devices, found "+devices.length+" devices");
+      
+      //if (platform.debug) platform.log("::getPowerState() : Looking for interested device");
+      devices.forEach((device) => {
+         //			if (platform.debug) platform.log("::getPowerState() : Found : "+JSON.stringify(device));
+         //if (platform.debug) platform.log("::getPowerState() : Looking for " + accessory.context.deviceId + ", but found "+device.deviceid);
+         if (accessory.context.deviceId == device.deviceid) {
+            //if (platform.debug) platform.log("::getPowerState() : found what I was looking for");
+            interestedDevice = device;
+         }
+      });
+      /////////////
+      let powerState = platform.getStateFromDevice(interestedDevice);
+      if (platform.debug) platform.log("::getPowerState() : power state for [%s] is %s", accessory.displayName, powerState);
+      this.updatePowerStateCharacteristic(accessory.context.deviceId, powerState);
+      if (this.debug) platform.log("::getPowerState() : EXIT");
+   })()
+   .catch(function (error) {
+      platform.log("::getPowerState() : Error in retrieving device\n" + JSON.stringify(error));
+   });
+};
+
+eWeLink.prototype.setPowerState = function (accessory, isOn, callback) {
+   var platform = this;
+   if (platform.debug) platform.log("::setPowerState() : ENTER");
+   
+   var targetState = 'off';
+   
+   if (isOn == true || isOn == 'on') {
+      targetState = 'on';
+   }
+   
+   if (this.debug) platform.log("::setPowerState() : Setting power state to [%s] for device [%s]", targetState, accessory.displayName);
+   (async () => {
+      const status = await platform.connection.setDevicePowerState(accessory.context.deviceId, targetState);
+      if (this.debug) platform.log("::setPowerState() : power state for [%s] is %s", accessory.displayName, JSON.stringify(status));
+      //this.updatePowerStateCharacteristic(accessory.context.deviceId, targetState);
+      if (platform.debug) platform.log("::setPowerState() : EXIT");
+   })().catch(function (error) {
+      platform.log("::setPowerState() : Error in retrieving device\n" + JSON.stringify(error));
+   });
+};
 
 // Sample function to show how developer can remove accessory dynamically from outside event
-eWeLink.prototype.removeAccessory = function(accessory) {
-
-	this.log('Removing accessory [%s]', accessory.displayName);
-	this.accessories.delete(accessory.context.deviceId);
-	this.api.unregisterPlatformAccessories('homebridge-eWeLink', 'eWeLink', [accessory]);
-}
+eWeLink.prototype.removeAccessory = function (accessory) {
+   
+   this.log('Removing accessory [%s]', accessory.displayName);
+   this.accessories.delete(accessory.context.deviceId);
+   this.api.unregisterPlatformAccessories('homebridge-eWeLink', 'eWeLink', [accessory]);
+};
\ No newline at end of file

From 9bdc20edf798653f4487f5f298a006f59383720b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 16 Aug 2020 07:53:58 +0100
Subject: [PATCH 0006/3183] remove unused deps

---
 package-lock.json | 382 +---------------------------------------------
 package.json      |   8 +-
 2 files changed, 4 insertions(+), 386 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 6e8d52cf..212a164d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
-  "name": "homebridge-ewelink-complete",
-  "version": "0.1.11",
+  "name": "homebridge-ewelink",
+  "version": "0.1.76",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -15,16 +15,6 @@
         "uri-js": "^4.2.2"
       }
     },
-    "ansi-regex": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
-    },
-    "ansi-styles": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-      "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
-    },
     "arpping": {
       "version": "github:skydiver/arpping#ae65410343bdcbddb64b37ac9f674c65af1fe92c",
       "from": "github:skydiver/arpping",
@@ -38,39 +28,11 @@
       "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
       "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y="
     },
-    "assert-plus": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz",
-      "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ="
-    },
-    "async": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/async/-/async-2.6.0.tgz",
-      "integrity": "sha512-xAfGg1/NTLBBKlHFmnd7PlmUW9KhVQIUuSrYem9xzFUZy13ScvtyGGejaae9iAVRiRq9+Cx7DPFaAAhCpyxyPw==",
-      "requires": {
-        "lodash": "^4.14.0"
-      }
-    },
-    "async-limiter": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz",
-      "integrity": "sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg=="
-    },
     "asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
       "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
     },
-    "aws-sign2": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz",
-      "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8="
-    },
-    "aws4": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz",
-      "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4="
-    },
     "babel-runtime": {
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
@@ -89,44 +51,11 @@
         "tweetnacl": "^0.14.3"
       }
     },
-    "bl": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/bl/-/bl-1.1.2.tgz",
-      "integrity": "sha1-/cqHGplxOqANGeO7ukHER4emU5g=",
-      "requires": {
-        "readable-stream": "~2.0.5"
-      }
-    },
     "bluebird": {
       "version": "3.7.2",
       "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
       "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg=="
     },
-    "boom": {
-      "version": "2.10.1",
-      "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz",
-      "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=",
-      "requires": {
-        "hoek": "2.x.x"
-      }
-    },
-    "caseless": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz",
-      "integrity": "sha1-cVuW6phBWTzDMGeSP17GDr2k99c="
-    },
-    "chalk": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-      "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-      "requires": {
-        "ansi-styles": "^2.2.1",
-        "escape-string-regexp": "^1.0.2",
-        "has-ansi": "^2.0.0",
-        "strip-ansi": "^3.0.0",
-        "supports-color": "^2.0.0"
-      }
-    },
     "child_process": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/child_process/-/child_process-1.0.2.tgz",
@@ -137,19 +66,6 @@
       "resolved": "https://registry.npmjs.org/chnl/-/chnl-0.5.0.tgz",
       "integrity": "sha512-0dl4ZJfAZdLn9mDnWejs5nasZKVnDTwdXV+dkxodYbb//GJDtXNhPlqCCYUb1xF0NQpIB5zlHRDrU1RCB4BRog=="
     },
-    "combined-stream": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
-      "integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=",
-      "requires": {
-        "delayed-stream": "~1.0.0"
-      }
-    },
-    "commander": {
-      "version": "2.12.2",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.12.2.tgz",
-      "integrity": "sha512-BFnaq5ZOGcDN7FlrtBT4xxkgIToalIIxwjxLWVJ8bGTpe1LroqMiqQXdA7ygc7CRvaYS+9zfPGFnJqFSayx+AA=="
-    },
     "core-js": {
       "version": "2.6.11",
       "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz",
@@ -160,14 +76,6 @@
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
       "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
     },
-    "cryptiles": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
-      "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=",
-      "requires": {
-        "boom": "2.x.x"
-      }
-    },
     "crypto-js": {
       "version": "3.1.9-1",
       "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-3.1.9-1.tgz",
@@ -223,11 +131,6 @@
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
       "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
     },
-    "depd": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.0.tgz",
-      "integrity": "sha1-4b2Cxqq2ztlluXuIsX7T5SjKGMM="
-    },
     "ecc-jsbn": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz",
@@ -294,11 +197,6 @@
         "ext": "^1.1.2"
       }
     },
-    "escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
-    },
     "ewelink-api": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ewelink-api/-/ewelink-api-2.0.0.tgz",
@@ -466,11 +364,6 @@
         }
       }
     },
-    "extend": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
-      "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ="
-    },
     "extsprintf": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
@@ -496,34 +389,11 @@
       "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
       "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
     },
-    "form-data": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-1.0.1.tgz",
-      "integrity": "sha1-rjFduaSQf6BlUCMEpm13M0de43w=",
-      "requires": {
-        "async": "^2.0.1",
-        "combined-stream": "^1.0.5",
-        "mime-types": "^2.1.11"
-      }
-    },
     "function-bind": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
       "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
     },
-    "generate-function": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz",
-      "integrity": "sha1-aFj+fAlpt9TpCTM3ZHrHn2DfvnQ="
-    },
-    "generate-object-property": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz",
-      "integrity": "sha1-nA4cQDCM6AT0eDYYuTf6iPmdUNA=",
-      "requires": {
-        "is-property": "^1.0.0"
-      }
-    },
     "getpass": {
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
@@ -544,17 +414,6 @@
       "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
       "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI="
     },
-    "har-validator": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz",
-      "integrity": "sha1-zcvAgYgmWtEZtqWnyKtw7s+10n0=",
-      "requires": {
-        "chalk": "^1.1.1",
-        "commander": "^2.9.0",
-        "is-my-json-valid": "^2.12.4",
-        "pinkie-promise": "^2.0.0"
-      }
-    },
     "has": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
@@ -563,50 +422,11 @@
         "function-bind": "^1.1.1"
       }
     },
-    "has-ansi": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-      "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
-      "requires": {
-        "ansi-regex": "^2.0.0"
-      }
-    },
     "has-symbols": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz",
       "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg=="
     },
-    "hawk": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz",
-      "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=",
-      "requires": {
-        "boom": "2.x.x",
-        "cryptiles": "2.x.x",
-        "hoek": "2.x.x",
-        "sntp": "1.x.x"
-      }
-    },
-    "hoek": {
-      "version": "2.16.3",
-      "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
-      "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0="
-    },
-    "http-signature": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz",
-      "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=",
-      "requires": {
-        "assert-plus": "^0.2.0",
-        "jsprim": "^1.2.2",
-        "sshpk": "^1.7.0"
-      }
-    },
-    "inherits": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
-    },
     "is-callable": {
       "version": "1.1.5",
       "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.5.tgz",
@@ -617,22 +437,6 @@
       "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz",
       "integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g=="
     },
-    "is-my-json-valid": {
-      "version": "2.16.1",
-      "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.16.1.tgz",
-      "integrity": "sha512-ochPsqWS1WXj8ZnMIV0vnNXooaMhp7cyL4FMSIPKTtnV0Ha/T19G2b9kkhcNsabV9bxYkze7/aLZJb/bYuFduQ==",
-      "requires": {
-        "generate-function": "^2.0.0",
-        "generate-object-property": "^1.1.0",
-        "jsonpointer": "^4.0.0",
-        "xtend": "^4.0.0"
-      }
-    },
-    "is-property": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz",
-      "integrity": "sha1-V/4cTkhHTt1lsJkR8msc1Ald2oQ="
-    },
     "is-regex": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz",
@@ -654,11 +458,6 @@
       "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
       "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
     },
-    "isarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
-    },
     "isstream": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
@@ -685,11 +484,6 @@
       "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
       "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
     },
-    "jsonpointer": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz",
-      "integrity": "sha1-T9kss04OnbPInIYi7PUfm5eMbLk="
-    },
     "jsprim": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
@@ -708,24 +502,6 @@
         }
       }
     },
-    "lodash": {
-      "version": "4.17.4",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
-      "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4="
-    },
-    "mime-db": {
-      "version": "1.30.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.30.0.tgz",
-      "integrity": "sha1-dMZD2i3Z1qRTmZY0ZbJtXKfXHwE="
-    },
-    "mime-types": {
-      "version": "2.1.17",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz",
-      "integrity": "sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo=",
-      "requires": {
-        "mime-db": "~1.30.0"
-      }
-    },
     "ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
@@ -741,26 +517,11 @@
       "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz",
       "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw="
     },
-    "node-uuid": {
-      "version": "1.4.8",
-      "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.8.tgz",
-      "integrity": "sha1-sEDrCSOWivq/jTL7HxfxFn/auQc="
-    },
     "nonce": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/nonce/-/nonce-1.0.4.tgz",
       "integrity": "sha1-7nMCrejBvvR28wG4yR9cxRpIdhI="
     },
-    "npmrc": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/npmrc/-/npmrc-1.1.1.tgz",
-      "integrity": "sha1-KBupOt6FxN4rBGEQMfL/LyTmId0="
-    },
-    "oauth-sign": {
-      "version": "0.8.2",
-      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
-      "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM="
-    },
     "object-inspect": {
       "version": "1.7.0",
       "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.7.0.tgz",
@@ -802,24 +563,6 @@
       "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
       "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
     },
-    "pinkie": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
-      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA="
-    },
-    "pinkie-promise": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
-      "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
-      "requires": {
-        "pinkie": "^2.0.0"
-      }
-    },
-    "process-nextick-args": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
-      "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M="
-    },
     "promise-controller": {
       "version": "0.5.2",
       "resolved": "https://registry.npmjs.org/promise-controller/-/promise-controller-0.5.2.tgz",
@@ -845,11 +588,6 @@
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
       "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4="
     },
-    "qs": {
-      "version": "6.2.3",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.2.3.tgz",
-      "integrity": "sha1-HPyyXBCpsrSDBT/zn138kjOQjP4="
-    },
     "random": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/random/-/random-2.1.1.tgz",
@@ -861,61 +599,11 @@
         "seedrandom": "^2.4.4"
       }
     },
-    "readable-stream": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz",
-      "integrity": "sha1-j5A0HmilPMySh4jaz80Rs265t44=",
-      "requires": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.1",
-        "isarray": "~1.0.0",
-        "process-nextick-args": "~1.0.6",
-        "string_decoder": "~0.10.x",
-        "util-deprecate": "~1.0.1"
-      }
-    },
     "regenerator-runtime": {
       "version": "0.11.1",
       "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
       "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="
     },
-    "request": {
-      "version": "2.74.0",
-      "resolved": "https://registry.npmjs.org/request/-/request-2.74.0.tgz",
-      "integrity": "sha1-dpPKdou7DqXIzgjAhKRe+gW4kqs=",
-      "requires": {
-        "aws-sign2": "~0.6.0",
-        "aws4": "^1.2.1",
-        "bl": "~1.1.2",
-        "caseless": "~0.11.0",
-        "combined-stream": "~1.0.5",
-        "extend": "~3.0.0",
-        "forever-agent": "~0.6.1",
-        "form-data": "~1.0.0-rc4",
-        "har-validator": "~2.0.6",
-        "hawk": "~3.1.3",
-        "http-signature": "~1.1.0",
-        "is-typedarray": "~1.0.0",
-        "isstream": "~0.1.2",
-        "json-stringify-safe": "~5.0.1",
-        "mime-types": "~2.1.7",
-        "node-uuid": "~1.4.7",
-        "oauth-sign": "~0.8.1",
-        "qs": "~6.2.0",
-        "stringstream": "~0.0.4",
-        "tough-cookie": "~2.3.0",
-        "tunnel-agent": "~0.4.1"
-      }
-    },
-    "request-json": {
-      "version": "0.6.2",
-      "resolved": "https://registry.npmjs.org/request-json/-/request-json-0.6.2.tgz",
-      "integrity": "sha1-KMdtBdYMU8nhjUCXywFyO5UGkyI=",
-      "requires": {
-        "depd": "1.1.0",
-        "request": "2.74.0"
-      }
-    },
     "request-promise": {
       "version": "4.2.5",
       "resolved": "https://registry.npmjs.org/request-promise/-/request-promise-4.2.5.tgz",
@@ -942,24 +630,11 @@
         }
       }
     },
-    "safe-buffer": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-      "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
-    },
     "seedrandom": {
       "version": "2.4.4",
       "resolved": "https://registry.npmjs.org/seedrandom/-/seedrandom-2.4.4.tgz",
       "integrity": "sha512-9A+PDmgm+2du77B5i0Ip2cxOqqHjgNxnBgglxLcX78A2D6c2rTo61z4jnVABpF4cKeDMDG+cmXXvdnqse2VqMA=="
     },
-    "sntp": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz",
-      "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=",
-      "requires": {
-        "hoek": "2.x.x"
-      }
-    },
     "sshpk": {
       "version": "1.13.1",
       "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz",
@@ -1005,29 +680,6 @@
         "function-bind": "^1.1.1"
       }
     },
-    "string_decoder": {
-      "version": "0.10.31",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-      "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ="
-    },
-    "stringstream": {
-      "version": "0.0.5",
-      "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
-      "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg="
-    },
-    "strip-ansi": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-      "requires": {
-        "ansi-regex": "^2.0.0"
-      }
-    },
-    "supports-color": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-      "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
-    },
     "tough-cookie": {
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz",
@@ -1036,11 +688,6 @@
         "punycode": "^1.4.1"
       }
     },
-    "tunnel-agent": {
-      "version": "0.4.3",
-      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz",
-      "integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us="
-    },
     "tweetnacl": {
       "version": "0.14.5",
       "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
@@ -1060,11 +707,6 @@
         "is-typedarray": "^1.0.0"
       }
     },
-    "ultron": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz",
-      "integrity": "sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og=="
-    },
     "uri-js": {
       "version": "4.2.2",
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
@@ -1080,11 +722,6 @@
         }
       }
     },
-    "util-deprecate": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
-    },
     "uuid": {
       "version": "3.4.0",
       "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
@@ -1130,21 +767,6 @@
         "promise.prototype.finally": "^3.1.0"
       }
     },
-    "ws": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-3.3.2.tgz",
-      "integrity": "sha512-t+WGpsNxhMR4v6EClXS8r8km5ZljKJzyGhJf7goJz9k5Ye3+b5Bvno5rjqPuIBn5mnn5GBb7o8IrIWHxX1qOLQ==",
-      "requires": {
-        "async-limiter": "~1.0.0",
-        "safe-buffer": "~5.1.0",
-        "ultron": "~1.1.0"
-      }
-    },
-    "xtend": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
-      "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68="
-    },
     "yaeti": {
       "version": "0.0.6",
       "resolved": "https://registry.npmjs.org/yaeti/-/yaeti-0.0.6.tgz",
diff --git a/package.json b/package.json
index b66653c9..94e0b697 100644
--- a/package.json
+++ b/package.json
@@ -13,13 +13,9 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/gbro115/homebridge-ewelink.git"
+    "url": "https://github.com/bwp91/homebridge-ewelink.git"
   },
   "dependencies": {
-    "ewelink-api": "^2.0.0",
-    "nonce": "^1.0.4",
-    "npmrc": "^1.1.1",
-    "request-json": "^0.6.2",
-    "ws": "^3.3.2"
+    "ewelink-api": "^2.0.0"
   }
 }

From 6fe3d2b23685ba2e6f2178284b39e7a7e032eb9f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 16 Aug 2020 08:02:00 +0100
Subject: [PATCH 0007/3183] update ewelink-api

---
 package-lock.json | 550 ++++++----------------------------------------
 package.json      |   2 +-
 2 files changed, 68 insertions(+), 484 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 212a164d..94d0313e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4,17 +4,6 @@
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
-    "ajv": {
-      "version": "6.11.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.11.0.tgz",
-      "integrity": "sha512-nCprB/0syFYy9fVYU1ox1l2KN8S9I+tziH8D4zdZuLT3N6RMlGSGt5FSTpAiHB/Whv8Qs1cWHma1aMKZyaHRKA==",
-      "requires": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      }
-    },
     "arpping": {
       "version": "github:skydiver/arpping#ae65410343bdcbddb64b37ac9f674c65af1fe92c",
       "from": "github:skydiver/arpping",
@@ -23,16 +12,6 @@
         "os": "^0.1.1"
       }
     },
-    "asn1": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
-      "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y="
-    },
-    "asynckit": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
-    },
     "babel-runtime": {
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
@@ -42,44 +21,25 @@
         "regenerator-runtime": "^0.11.0"
       }
     },
-    "bcrypt-pbkdf": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz",
-      "integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=",
-      "optional": true,
-      "requires": {
-        "tweetnacl": "^0.14.3"
-      }
-    },
-    "bluebird": {
-      "version": "3.7.2",
-      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
-      "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg=="
-    },
     "child_process": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/child_process/-/child_process-1.0.2.tgz",
       "integrity": "sha1-sffn/HPSXn/R1FWtyU4UODAYK1o="
     },
     "chnl": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/chnl/-/chnl-0.5.0.tgz",
-      "integrity": "sha512-0dl4ZJfAZdLn9mDnWejs5nasZKVnDTwdXV+dkxodYbb//GJDtXNhPlqCCYUb1xF0NQpIB5zlHRDrU1RCB4BRog=="
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/chnl/-/chnl-1.2.0.tgz",
+      "integrity": "sha512-g5gJb59edwCliFbX2j7G6sBfY4sX9YLy211yctONI2GRaiX0f2zIbKWmBm+sPqFNEpM7Ljzm7IJX/xrjiEbPrw=="
     },
     "core-js": {
       "version": "2.6.11",
       "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz",
       "integrity": "sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg=="
     },
-    "core-util-is": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
-    },
     "crypto-js": {
-      "version": "3.1.9-1",
-      "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-3.1.9-1.tgz",
-      "integrity": "sha1-/aGedh/Ad+Af+/3G6f38WeiAbNg="
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-4.0.0.tgz",
+      "integrity": "sha512-bzHZN8Pn+gS7DQA6n+iUmBfl0hO5DJq++QP3U6uTucDtk/0iGpXd/Gg7CGR0p8tJhofJyaKoWBuJI4eAO00BBg=="
     },
     "d": {
       "version": "1.0.1",
@@ -90,21 +50,6 @@
         "type": "^1.0.1"
       }
     },
-    "dashdash": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
-      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
-      "requires": {
-        "assert-plus": "^1.0.0"
-      },
-      "dependencies": {
-        "assert-plus": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
-        }
-      }
-    },
     "debug": {
       "version": "2.6.9",
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
@@ -122,40 +67,26 @@
       }
     },
     "delay": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/delay/-/delay-4.3.0.tgz",
-      "integrity": "sha512-Lwaf3zVFDMBop1yDuFZ19F9WyGcZcGacsbdlZtWjQmM50tOcMntm1njF/Nb/Vjij3KaSvCF+sEYGKrrjObu2NA=="
-    },
-    "delayed-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
-    },
-    "ecc-jsbn": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz",
-      "integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=",
-      "optional": true,
-      "requires": {
-        "jsbn": "~0.1.0"
-      }
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/delay/-/delay-4.4.0.tgz",
+      "integrity": "sha512-txgOrJu3OdtOfTiEOT2e76dJVfG/1dz2NZ4F0Pyt4UGZJryssMRp5vdM5wQoLwSOBNdrJv3F9PAhp/heqd7vrA=="
     },
     "es-abstract": {
-      "version": "1.17.4",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.4.tgz",
-      "integrity": "sha512-Ae3um/gb8F0mui/jPL+QiqmglkUsaQf7FwBEHYIFkztkneosu9imhqHpBzQ3h1vit8t5iQ74t6PEVvphBZiuiQ==",
+      "version": "1.17.6",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.6.tgz",
+      "integrity": "sha512-Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw==",
       "requires": {
         "es-to-primitive": "^1.2.1",
         "function-bind": "^1.1.1",
         "has": "^1.0.3",
         "has-symbols": "^1.0.1",
-        "is-callable": "^1.1.5",
-        "is-regex": "^1.0.5",
+        "is-callable": "^1.2.0",
+        "is-regex": "^1.1.0",
         "object-inspect": "^1.7.0",
         "object-keys": "^1.1.1",
         "object.assign": "^4.1.0",
-        "string.prototype.trimleft": "^2.1.1",
-        "string.prototype.trimright": "^2.1.1"
+        "string.prototype.trimend": "^1.0.1",
+        "string.prototype.trimstart": "^1.0.1"
       }
     },
     "es-to-primitive": {
@@ -198,155 +129,17 @@
       }
     },
     "ewelink-api": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ewelink-api/-/ewelink-api-2.0.0.tgz",
-      "integrity": "sha512-VcIs2PBK2F0RckZAOvZHcPb8ZpLz4eQclFPmHNZFABI/0XGG3UJw+Ev4LGDz9AkAUFHkSc29LM3hRWlfmNdWgQ==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/ewelink-api/-/ewelink-api-3.0.0.tgz",
+      "integrity": "sha512-W60dGUIPnV8b/ckCKRAi+0mYyIYil/YrkVrAknlf6CtnivHIVxvcQPUxQPOX6ctWzK10n+ACAh8V7uOok1rjMA==",
       "requires": {
         "arpping": "github:skydiver/arpping",
-        "crypto-js": "^3.1.9-1",
+        "crypto-js": "^4.0.0",
         "delay": "^4.3.0",
-        "nonce": "^1.0.4",
-        "random": "^2.1.1",
-        "request": "^2.88.0",
-        "request-promise": "^4.2.4",
-        "websocket": "^1.0.30",
-        "websocket-as-promised": "^0.10.1"
-      },
-      "dependencies": {
-        "assert-plus": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
-        },
-        "aws-sign2": {
-          "version": "0.7.0",
-          "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
-          "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg="
-        },
-        "aws4": {
-          "version": "1.9.1",
-          "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.9.1.tgz",
-          "integrity": "sha512-wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug=="
-        },
-        "caseless": {
-          "version": "0.12.0",
-          "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-          "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
-        },
-        "combined-stream": {
-          "version": "1.0.8",
-          "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
-          "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
-          "requires": {
-            "delayed-stream": "~1.0.0"
-          }
-        },
-        "extend": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
-          "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
-        },
-        "form-data": {
-          "version": "2.3.3",
-          "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
-          "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
-          "requires": {
-            "asynckit": "^0.4.0",
-            "combined-stream": "^1.0.6",
-            "mime-types": "^2.1.12"
-          }
-        },
-        "har-validator": {
-          "version": "5.1.3",
-          "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz",
-          "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==",
-          "requires": {
-            "ajv": "^6.5.5",
-            "har-schema": "^2.0.0"
-          }
-        },
-        "http-signature": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
-          "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
-          "requires": {
-            "assert-plus": "^1.0.0",
-            "jsprim": "^1.2.2",
-            "sshpk": "^1.7.0"
-          }
-        },
-        "mime-db": {
-          "version": "1.43.0",
-          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.43.0.tgz",
-          "integrity": "sha512-+5dsGEEovYbT8UY9yD7eE4XTc4UwJ1jBYlgaQQF38ENsKR3wj/8q8RFZrF9WIZpB2V1ArTVFUva8sAul1NzRzQ=="
-        },
-        "mime-types": {
-          "version": "2.1.26",
-          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.26.tgz",
-          "integrity": "sha512-01paPWYgLrkqAyrlDorC1uDwl2p3qZT7yl806vW7DvDoxwXi46jsjFbg+WdwotBIk6/MbEhO/dh5aZ5sNj/dWQ==",
-          "requires": {
-            "mime-db": "1.43.0"
-          }
-        },
-        "oauth-sign": {
-          "version": "0.9.0",
-          "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
-          "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="
-        },
-        "qs": {
-          "version": "6.5.2",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
-          "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="
-        },
-        "request": {
-          "version": "2.88.0",
-          "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz",
-          "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==",
-          "requires": {
-            "aws-sign2": "~0.7.0",
-            "aws4": "^1.8.0",
-            "caseless": "~0.12.0",
-            "combined-stream": "~1.0.6",
-            "extend": "~3.0.2",
-            "forever-agent": "~0.6.1",
-            "form-data": "~2.3.2",
-            "har-validator": "~5.1.0",
-            "http-signature": "~1.2.0",
-            "is-typedarray": "~1.0.0",
-            "isstream": "~0.1.2",
-            "json-stringify-safe": "~5.0.1",
-            "mime-types": "~2.1.19",
-            "oauth-sign": "~0.9.0",
-            "performance-now": "^2.1.0",
-            "qs": "~6.5.2",
-            "safe-buffer": "^5.1.2",
-            "tough-cookie": "~2.4.3",
-            "tunnel-agent": "^0.6.0",
-            "uuid": "^3.3.2"
-          }
-        },
-        "safe-buffer": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz",
-          "integrity": "sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg=="
-        },
-        "tough-cookie": {
-          "version": "2.4.3",
-          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz",
-          "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==",
-          "requires": {
-            "psl": "^1.1.24",
-            "punycode": "^1.4.1"
-          }
-        },
-        "tunnel-agent": {
-          "version": "0.6.0",
-          "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-          "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
-          "requires": {
-            "safe-buffer": "^5.0.1"
-          }
-        }
+        "node-fetch": "^2.6.0",
+        "random": "^2.2.0",
+        "websocket": "^1.0.31",
+        "websocket-as-promised": "^1.0.1"
       }
     },
     "ext": {
@@ -364,56 +157,11 @@
         }
       }
     },
-    "extsprintf": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
-    },
-    "fast-deep-equal": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz",
-      "integrity": "sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA=="
-    },
-    "fast-json-stable-stringify": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="
-    },
-    "flat-options": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/flat-options/-/flat-options-0.1.3.tgz",
-      "integrity": "sha512-z1vH9mb4ly55dWUZZFUeLNqhFWhwSQNngHpK8RQOhFuNw/sWcNDZhkHl3GS1YTHiYxB5qvcbSRbH7X6ThzX9UA=="
-    },
-    "forever-agent": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
-    },
     "function-bind": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
       "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
     },
-    "getpass": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
-      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
-      "requires": {
-        "assert-plus": "^1.0.0"
-      },
-      "dependencies": {
-        "assert-plus": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
-        }
-      }
-    },
-    "har-schema": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
-      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI="
-    },
     "has": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
@@ -428,9 +176,9 @@
       "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg=="
     },
     "is-callable": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.5.tgz",
-      "integrity": "sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q=="
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.0.tgz",
+      "integrity": "sha512-pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw=="
     },
     "is-date-object": {
       "version": "1.0.2",
@@ -438,11 +186,11 @@
       "integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g=="
     },
     "is-regex": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz",
-      "integrity": "sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.1.tgz",
+      "integrity": "sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==",
       "requires": {
-        "has": "^1.0.3"
+        "has-symbols": "^1.0.1"
       }
     },
     "is-symbol": {
@@ -458,74 +206,30 @@
       "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
       "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
     },
-    "isstream": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
-    },
-    "jsbn": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
-      "optional": true
-    },
-    "json-schema": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
-      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
-    },
-    "json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
-    },
-    "json-stringify-safe": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
-    },
-    "jsprim": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
-      "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
-      "requires": {
-        "assert-plus": "1.0.0",
-        "extsprintf": "1.3.0",
-        "json-schema": "0.2.3",
-        "verror": "1.10.0"
-      },
-      "dependencies": {
-        "assert-plus": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
-        }
-      }
-    },
     "ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
     },
     "nan": {
-      "version": "2.14.0",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz",
-      "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg=="
+      "version": "2.14.1",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.1.tgz",
+      "integrity": "sha512-isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw=="
     },
     "next-tick": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz",
       "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw="
     },
-    "nonce": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/nonce/-/nonce-1.0.4.tgz",
-      "integrity": "sha1-7nMCrejBvvR28wG4yR9cxRpIdhI="
+    "node-fetch": {
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz",
+      "integrity": "sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA=="
     },
     "object-inspect": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.7.0.tgz",
-      "integrity": "sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw=="
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.8.0.tgz",
+      "integrity": "sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA=="
     },
     "object-keys": {
       "version": "1.1.1",
@@ -558,15 +262,10 @@
       "resolved": "https://registry.npmjs.org/ow-lite/-/ow-lite-0.0.2.tgz",
       "integrity": "sha1-359QDmdAtlkKHpqWVzDUmo61l9E="
     },
-    "performance-now": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
-    },
     "promise-controller": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/promise-controller/-/promise-controller-0.5.2.tgz",
-      "integrity": "sha512-ymVCGfCxN+A+6TqESLnGZhGfQdQJ08SpIMyft4xQPUDrOgoqzKcQnLIYaqQk7/rPyg4wpKpxBKefeGkvumWgUg=="
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/promise-controller/-/promise-controller-1.0.0.tgz",
+      "integrity": "sha512-goA0zA9L91tuQbUmiMinSYqlyUtEgg4fxJcjYnLYOQnrktb4o4UqciXDNXiRUPiDBPACmsr1k8jDW4r7UDq9Qw=="
     },
     "promise.prototype.finally": {
       "version": "3.1.2",
@@ -578,25 +277,15 @@
         "function-bind": "^1.1.1"
       }
     },
-    "psl": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/psl/-/psl-1.7.0.tgz",
-      "integrity": "sha512-5NsSEDv8zY70ScRnOTn7bK7eanl2MvFrOrS/R6x+dBt5g1ghnj9Zv90kO8GwT8gxcu2ANyFprnFYB85IogIJOQ=="
-    },
-    "punycode": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-      "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4="
-    },
     "random": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/random/-/random-2.1.1.tgz",
-      "integrity": "sha512-8HQriGPwjc8R+7hPOI9ZphAEEWmIt/RmuqXZ682ww9kjK5HRGXcN7hgWUxZ9AabgjZm5wIa6EwapTI1sg11XXg==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/random/-/random-2.2.0.tgz",
+      "integrity": "sha512-4HBR4Xye4jJ41QBi6RfIaO1yKQpxVUZafQtdE6NvvjzirNlwWgsk3tkGLTbQtWUarF4ofZsUVEmWqB1TDQlkwA==",
       "requires": {
         "babel-runtime": "^6.26.0",
         "ow": "^0.4.0",
         "ow-lite": "^0.0.2",
-        "seedrandom": "^2.4.4"
+        "seedrandom": "^3.0.5"
       }
     },
     "regenerator-runtime": {
@@ -604,96 +293,29 @@
       "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
       "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="
     },
-    "request-promise": {
-      "version": "4.2.5",
-      "resolved": "https://registry.npmjs.org/request-promise/-/request-promise-4.2.5.tgz",
-      "integrity": "sha512-ZgnepCykFdmpq86fKGwqntyTiUrHycALuGggpyCZwMvGaZWgxW6yagT0FHkgo5LzYvOaCNvxYwWYIjevSH1EDg==",
-      "requires": {
-        "bluebird": "^3.5.0",
-        "request-promise-core": "1.1.3",
-        "stealthy-require": "^1.1.1",
-        "tough-cookie": "^2.3.3"
-      }
-    },
-    "request-promise-core": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.3.tgz",
-      "integrity": "sha512-QIs2+ArIGQVp5ZYbWD5ZLCY29D5CfWizP8eWnm8FoGD1TX61veauETVQbrV60662V0oFBkrDOuaBI8XgtuyYAQ==",
-      "requires": {
-        "lodash": "^4.17.15"
-      },
-      "dependencies": {
-        "lodash": {
-          "version": "4.17.15",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
-          "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="
-        }
-      }
-    },
     "seedrandom": {
-      "version": "2.4.4",
-      "resolved": "https://registry.npmjs.org/seedrandom/-/seedrandom-2.4.4.tgz",
-      "integrity": "sha512-9A+PDmgm+2du77B5i0Ip2cxOqqHjgNxnBgglxLcX78A2D6c2rTo61z4jnVABpF4cKeDMDG+cmXXvdnqse2VqMA=="
-    },
-    "sshpk": {
-      "version": "1.13.1",
-      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz",
-      "integrity": "sha1-US322mKHFEMW3EwY/hzx2UBzm+M=",
-      "requires": {
-        "asn1": "~0.2.3",
-        "assert-plus": "^1.0.0",
-        "bcrypt-pbkdf": "^1.0.0",
-        "dashdash": "^1.12.0",
-        "ecc-jsbn": "~0.1.1",
-        "getpass": "^0.1.1",
-        "jsbn": "~0.1.0",
-        "tweetnacl": "~0.14.0"
-      },
-      "dependencies": {
-        "assert-plus": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
-        }
-      }
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/seedrandom/-/seedrandom-3.0.5.tgz",
+      "integrity": "sha512-8OwmbklUNzwezjGInmZ+2clQmExQPvomqjL7LFqOYqtmuxRgQYqOD3mHaU+MvZn5FLUeVxVfQjwLZW/n/JFuqg=="
     },
-    "stealthy-require": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz",
-      "integrity": "sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks="
-    },
-    "string.prototype.trimleft": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz",
-      "integrity": "sha512-iu2AGd3PuP5Rp7x2kEZCrB2Nf41ehzh+goo8TV7z8/XDBbsvc6HQIlUl9RjkZ4oyrW1XM5UwlGl1oVEaDjg6Ag==",
+    "string.prototype.trimend": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz",
+      "integrity": "sha512-LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g==",
       "requires": {
         "define-properties": "^1.1.3",
-        "function-bind": "^1.1.1"
+        "es-abstract": "^1.17.5"
       }
     },
-    "string.prototype.trimright": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.1.tgz",
-      "integrity": "sha512-qFvWL3/+QIgZXVmJBfpHmxLB7xsUXz6HsUmP8+5dRaC3Q7oKUv9Vo6aMCRZC1smrtyECFsIT30PqBJ1gTjAs+g==",
+    "string.prototype.trimstart": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz",
+      "integrity": "sha512-XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw==",
       "requires": {
         "define-properties": "^1.1.3",
-        "function-bind": "^1.1.1"
+        "es-abstract": "^1.17.5"
       }
     },
-    "tough-cookie": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz",
-      "integrity": "sha1-C2GKVWW23qkL80JdBNVe3EdadWE=",
-      "requires": {
-        "punycode": "^1.4.1"
-      }
-    },
-    "tweetnacl": {
-      "version": "0.14.5",
-      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
-      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
-      "optional": true
-    },
     "type": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/type/-/type-1.2.0.tgz",
@@ -707,43 +329,6 @@
         "is-typedarray": "^1.0.0"
       }
     },
-    "uri-js": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
-      "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
-      "requires": {
-        "punycode": "^2.1.0"
-      },
-      "dependencies": {
-        "punycode": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-          "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
-        }
-      }
-    },
-    "uuid": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
-      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="
-    },
-    "verror": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
-      "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
-      "requires": {
-        "assert-plus": "^1.0.0",
-        "core-util-is": "1.0.2",
-        "extsprintf": "^1.2.0"
-      },
-      "dependencies": {
-        "assert-plus": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
-        }
-      }
-    },
     "websocket": {
       "version": "1.0.31",
       "resolved": "https://registry.npmjs.org/websocket/-/websocket-1.0.31.tgz",
@@ -757,14 +342,13 @@
       }
     },
     "websocket-as-promised": {
-      "version": "0.10.1",
-      "resolved": "https://registry.npmjs.org/websocket-as-promised/-/websocket-as-promised-0.10.1.tgz",
-      "integrity": "sha512-hKAZPSIGaao4WPoporPkDQpKl9jz0I0Hh9x/Dn05k6u//e44+0rAhMam4/gvBlYZl02wJYELD561bAenyxwJJQ==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/websocket-as-promised/-/websocket-as-promised-1.0.1.tgz",
+      "integrity": "sha512-+gBevna4yxisb8cigL8NxcS8s241cvfMeyy1fNFcFgBcX/6vknMT84MwMmBNLYmsYH2giVoxOSEiAeeb7txFOw==",
       "requires": {
-        "chnl": "^0.5.0",
-        "flat-options": "^0.1.3",
-        "promise-controller": "^0.5.2",
-        "promise.prototype.finally": "^3.1.0"
+        "chnl": "^1.0.0",
+        "promise-controller": "^1.0.0",
+        "promise.prototype.finally": "^3.1.1"
       }
     },
     "yaeti": {
diff --git a/package.json b/package.json
index 94e0b697..cb41333c 100644
--- a/package.json
+++ b/package.json
@@ -16,6 +16,6 @@
     "url": "https://github.com/bwp91/homebridge-ewelink.git"
   },
   "dependencies": {
-    "ewelink-api": "^2.0.0"
+    "ewelink-api": "^3.0.0"
   }
 }

From 3d00c1873e3b98f0b7fedd9e65fb29611b2bd24a Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 16 Aug 2020 08:34:24 +0100
Subject: [PATCH 0008/3183] .github

---
 .github/FUNDING.yml                       |  2 ++
 .github/ISSUE_TEMPLATE/feature-request.md | 20 ++++++++++++++++++++
 .github/ISSUE_TEMPLATE/new-issue.md       | 20 ++++++++++++++++++++
 3 files changed, 42 insertions(+)
 create mode 100644 .github/FUNDING.yml
 create mode 100644 .github/ISSUE_TEMPLATE/feature-request.md
 create mode 100644 .github/ISSUE_TEMPLATE/new-issue.md

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
new file mode 100644
index 00000000..addfcd2d
--- /dev/null
+++ b/.github/FUNDING.yml
@@ -0,0 +1,2 @@
+patreon: bwp91
+custom: ["https://www.paypal.me/BenPotter"]
diff --git a/.github/ISSUE_TEMPLATE/feature-request.md b/.github/ISSUE_TEMPLATE/feature-request.md
new file mode 100644
index 00000000..47b2c95b
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature-request.md
@@ -0,0 +1,20 @@
+---
+name: Feature Request
+about: I have an idea for the package!
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Please explain your feature request in one sentence.**
+...
+
+**Is your feature request related to a problem? Please describe.**
+...
+
+**Any particular Sonoff devices that this relates to?**
+...
+
+**Anything else?**
+...
diff --git a/.github/ISSUE_TEMPLATE/new-issue.md b/.github/ISSUE_TEMPLATE/new-issue.md
new file mode 100644
index 00000000..44f070df
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/new-issue.md
@@ -0,0 +1,20 @@
+---
+name: New Issue
+about: I have a problem with the package!
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**What issue do you have? Please be as thorough and explicit as possible.**
+
+...
+
+**Which version of the package are you using?**
+
+...
+
+**Please paste any relevant logs below. It helps if you can turn `debug` and `debugReqRes` in the package settings for more thorough logging.**
+
+...

From 2f47c90df01e87653f0eac31e548a955dd54cfe9 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 16 Aug 2020 08:38:27 +0100
Subject: [PATCH 0009/3183] align with ewelink-sonoff

---
 .gitignore         |    6 +-
 .npmignore         |    5 +
 LICENSE            |    4 +-
 config.schema.json |  322 ++++++++
 index.js           |  359 +--------
 lib/constants.js   |  119 +++
 lib/eWeLink.js     | 1825 ++++++++++++++++++++++++++++++++++++++++++++
 lib/eWeLinkHTTP.js |  158 ++++
 lib/eWeLinkLAN.js  |  157 ++++
 lib/eWeLinkWS.js   |  271 +++++++
 package-lock.json  |  412 ++--------
 package.json       |   74 +-
 12 files changed, 2979 insertions(+), 733 deletions(-)
 create mode 100644 .npmignore
 create mode 100644 config.schema.json
 create mode 100644 lib/constants.js
 create mode 100644 lib/eWeLink.js
 create mode 100644 lib/eWeLinkHTTP.js
 create mode 100644 lib/eWeLinkLAN.js
 create mode 100644 lib/eWeLinkWS.js

diff --git a/.gitignore b/.gitignore
index 3c3629e6..45fb205e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,5 @@
-node_modules
+.DS_Store
+.nova
+.github
+.npm
+node_modules/
\ No newline at end of file
diff --git a/.npmignore b/.npmignore
new file mode 100644
index 00000000..45fb205e
--- /dev/null
+++ b/.npmignore
@@ -0,0 +1,5 @@
+.DS_Store
+.nova
+.github
+.npm
+node_modules/
\ No newline at end of file
diff --git a/LICENSE b/LICENSE
index 85986b7d..23e8aaa0 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2017 George
+Copyright (c) 2020 Ben Potter
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+SOFTWARE.
\ No newline at end of file
diff --git a/config.schema.json b/config.schema.json
new file mode 100644
index 00000000..b8a7a5cf
--- /dev/null
+++ b/config.schema.json
@@ -0,0 +1,322 @@
+{
+   "pluginAlias":"eWeLink",
+   "pluginType":"platform",
+   "singular":true,
+   "headerDisplay":"Homebridge plugin to control Sonoff devices with OEM firmware.",
+   "footerDisplay":"If you have any suggestions, please open an issue on [GitHub](https://github.com/bwp91/homebridge-ewelink/issues).",
+   "schema":{
+      "type":"object",
+      "properties":{
+         "name":{
+            "type":"string",
+            "default":"eWeLink"
+         },
+         "countryCode":{
+            "type":"string",
+            "title":"Country Code",
+            "description":"The telephone country code linked to your eWeLink account (without the +)."
+         },
+         "username":{
+            "type":"string",
+            "title":"Username",
+            "description":"The phone number or email address linked to your eWeLink account. If you use a phone number please enter the country code (with the +), for example +8613185260282."
+         },
+         "password":{
+            "type":"string",
+            "title":"Password",
+            "description":"The password for your eWeLink account."
+         },
+         "debug":{
+            "title":"Debug Logging",
+            "type":"boolean",
+            "required":true,
+            "description":"If enabled, more information will be added to the Homebridge log.",
+            "default":false
+         },
+         "debugReqRes":{
+            "title":"Request & Response Logging",
+            "type":"boolean",
+            "required":true,
+            "description":"If enabled, HTTP, web socket and LAN mode messages will be added to the log. Not recommended for long-term use.",
+            "default":false
+         },
+         "mode":{
+            "type":"string",
+            "title":"Connection Mode",
+            "required":true,
+            "default":"ws",
+            "description":"Preferred method of updating devices. Devices that don't support LAN mode will use web socket.",
+            "oneOf":[
+               {
+                  "title":"LAN Mode (Recommended)",
+                  "enum":[
+                     "lan"
+                  ]
+               },
+               {
+                  "title":"Web Socket",
+                  "enum":[
+                     "ws"
+                  ]
+               }
+            ]
+         },
+         "hideDevFromHB":{
+            "type":"string",
+            "title":"Hide Devices",
+            "description":"A list of eWeLink devices to hide from Homebridge. For example '10009553c8' or multiple devices separated with a comma '10009553c8,10009553c9'.",
+            "default":""
+         },
+         "hideFromHB":{
+            "type":"string",
+            "title":"Hide Device Channels",
+            "description":"A list of device channels to hide from Homebridge. For example '10009553c8SW1' or multiple channels separated with a comma '10009553c8SW1,10009553c9SW2'. Only channels from switches, lights and irrigation valves can be hidden.",
+            "default":""
+         },
+         "sensorTimeLength":{
+            "type":"integer",
+            "title":"Sensor Length",
+            "description":"The number of seconds which the sensor tile in the Home app will light up for if a sensor detects something.",
+            "default":"2",
+            "maximum":999
+         },
+         "sensorTimeDifference":{
+            "type":"integer",
+            "title":"Sensor Lag",
+            "description":"An offset in seconds to ignore any notifications if they is a delay between a sensor detecting something and Homebridge receiving the notification.",
+            "default":"120",
+            "maximum":999
+         },
+         "valveTimeLength":{
+            "type":"integer",
+            "title":"Valve Duration",
+            "description":"The default number of seconds that irrigation valves will run for.",
+            "default":"20",
+            "maximum":999
+         },
+         "hideZBLDPress":{
+            "title":"Hide Double/Long Press",
+            "type":"boolean",
+            "description":"If enabled, double and long press options will be hidden for the ZigBee button.",
+            "default":false
+         },
+         "groups":{
+            "type":"array",
+            "title":"Custom Groups",
+            "description":"You can group channels of Sonoff devices to simulate another HomeKit accessory instead of having each switch separately. Currently only blinds and garage doors are supported.",
+            "items":{
+               "type":"object",
+               "properties":{
+                  "type":{
+                     "type":"string",
+                     "title":"Type",
+                     "default":"null",
+                     "description":"A description of this group.",
+                     "oneOf":[
+                        {
+                           "title":"Blind",
+                           "enum":[
+                              "blind"
+                           ]
+                        },
+                        {
+                           "title":"Garage Door",
+                           "enum":[
+                              "garage"
+                           ]
+                        }
+                     ]
+                  },
+                  "deviceId":{
+                     "type":"string",
+                     "title":"Device ID",
+                     "description":"Device ID from your eWeLink app (ten digits normally in the format 1000******)."
+                  },
+                  "setup":{
+                     "type":"string",
+                     "title":"Device Setup",
+                     "default":"null",
+                     "description":"The device setup.",
+                     "oneOf":[
+                        {
+                           "title":"One Switch - for up and down",
+                           "enum":[
+                              "oneSwitch"
+                           ]
+                        },
+                        {
+                           "title":"Two Switches - one for up and one for down",
+                           "enum":[
+                              "twoSwitch"
+                           ]
+                        }
+                     ]
+                  },
+                  "operationTime":{
+                     "type":"number",
+                     "title":"Operation Time",
+                     "description":"Total time in deciseconds to fully open/close the blind/door. Count the time in seconds and multiply by 10, for example 100 for 10 seconds or 75 for 7.5 seconds.",
+                     "default":100
+                  },
+                  "inched":{
+                     "title":"Device Inching",
+                     "type":"boolean",
+                     "description":"If device inching is already setup in your eWeLink account then set this to true. Otherwise this plugin will send an 'off' command after half a second to mimic the inching behaviour.",
+                     "default":true
+                  },
+                  "sensorId":{
+                     "type":"string",
+                     "title":"Sensor",
+                     "description":"A Sonoff DW2 sensor can be used for a 'one switch' setup. This is to determine the current open/closed state of this device. Please enter the 10 digit device ID. Otherwise leave this blank."
+                  }
+               }
+            }
+         },
+         "bridgeSensors":{
+            "type":"array",
+            "title":"Sensors",
+            "description":"You can expose different types of sensors connected to your RF Bridge in HomeKit.",
+            "items":{
+               "type":"object",
+               "properties":{
+                  "deviceId":{
+                     "type":"string",
+                     "title":"RF Bridge Device ID",
+                     "description":"Device ID of your RF Bridge from your eWeLink app (10 digits normally in the format 1000******)."
+                  },
+                  "fullDeviceId":{
+                     "type":"string",
+                     "title":"Sensor Device ID",
+                     "description":"Device ID of the sensor from Homebridge (13 digits normally in the format 1000******SW*)."
+                  },
+                  "type":{
+                     "type":"string",
+                     "title":"Sensor Type",
+                     "default":"motion",
+                     "description":"Select the type of sensor you would like to expose this as in Homebridge.",
+                     "oneOf":[
+                        {
+                           "title":"Button",
+                           "enum":[
+                              "button"
+                           ]
+                        },
+                        {
+                           "title":"Motion",
+                           "enum":[
+                              "motion"
+                           ]
+                        },
+                        {
+                           "title":"Smoke/Fire",
+                           "enum":[
+                              "smoke"
+                           ]
+                        },
+                        {
+                           "title":"Water/Leak",
+                           "enum":[
+                              "water"
+                           ]
+                        },
+                        {
+                           "title":"Carbon Monoxide",
+                           "enum":[
+                              "co"
+                           ]
+                        },
+                        {
+                           "title":"Carbon Dioxide",
+                           "enum":[
+                              "co2"
+                           ]
+                        },
+                        {
+                           "title":"Occupancy",
+                           "enum":[
+                              "occupancy"
+                           ]
+                        },
+                        {
+                           "title":"Contact",
+                           "enum":[
+                              "contact"
+                           ]
+                        }
+                     ]
+                  }
+               }
+            }
+         }
+      },
+      "required":[
+         "countryCode",
+         "username",
+         "password"
+      ]
+   },
+   "layout":[
+      {
+         "type":"fieldset",
+         "items":[
+            "countryCode",
+            "username",
+            "password"
+         ]
+      },
+      {
+         "type":"fieldset",
+         "title":"Optional",
+         "description":"Only adjust these settings if you know what you are doing.",
+         "expandable":true,
+         "items":[
+            "debug",
+            "debugReqRes",
+            "mode",
+            "hideDevFromHB",
+            "hideFromHB",
+            "sensorTimeLength",
+            "sensorTimeDifference",
+            "valveTimeLength",
+            "hideZBLDPress"
+         ]
+      },
+      {
+         "key":"groups",
+         "expandable":true,
+         "title":"Custom Groups",
+         "add":"Add Another Group",
+         "type":"array",
+         "items":[
+            {
+               "type":"fieldset",
+               "items":[
+                  "groups[].type",
+                  "groups[].deviceId",
+                  "groups[].setup",
+                  "groups[].operationTime",
+                  "groups[].inched",
+                  "groups[].sensorId"
+               ]
+            }
+         ]
+      },
+      {
+         "key":"bridgeSensors",
+         "title":"RF Bridge Devices",
+         "expandable":true,
+         "add":"Add Another Device",
+         "type":"array",
+         "items":[
+            {
+               "type":"fieldset",
+               "items":[
+                  "bridgeSensors[].deviceId",
+                  "bridgeSensors[].fullDeviceId",
+                  "bridgeSensors[].type"
+               ]
+            }
+         ]
+      }
+   ]
+}
\ No newline at end of file
diff --git a/index.js b/index.js
index fadb4c55..3083dd2d 100644
--- a/index.js
+++ b/index.js
@@ -1,358 +1,7 @@
 /* jshint esversion: 9, -W030, node: true */
-const ewelinkapi = require('ewelink-api');
-
-var Accessory, Service, Characteristic, UUIDGen;
-
+"use strict";
+const constants = require("./lib/constants");
 module.exports = function (homebridge) {
-   console.log("homebridge API version: " + homebridge.version);
-   
-   // Accessory must be created from PlatformAccessory Constructor
-   Accessory = homebridge.platformAccessory;
-   
-   // Service and Characteristic are from hap-nodejs
-   Service = homebridge.hap.Service;
-   Characteristic = homebridge.hap.Characteristic;
-   UUIDGen = homebridge.hap.uuid;
-   
-   // For platform plugin to be considered as dynamic platform plugin,
-   // registerPlatform(pluginName, platformName, constructor, dynamic), dynamic must be true
-   homebridge.registerPlatform("homebridge-eWeLink", "eWeLink", eWeLink, true);
-   
-};
-
-// Platform constructor
-function eWeLink(log, config, api) {
-   
-   log("Intialising eWeLink");
-   
-   var platform = this;
-   
-   this.log = log;
-   this.config = config;
-   this.accessories = new Map();
-   this.authenticationToken = 'UNCONFIGURED';
-   this.phoneNumberOrEmail = config.phoneNumberOrEmail;
-   this.accountPassword = config.accountPassword;
-   this.debug = (config.debug === 'true') ? true : false;
-   
-   if (api) {
-      
-      // Save the API object as plugin needs to register new accessory via this object
-      this.api = api;
-      
-      // Listen to event "didFinishLaunching", this means homebridge already finished loading cached accessories.
-      // Platform Plugin should only register new accessory that doesn't exist in homebridge after this event.
-      // Or start discover new accessories.
-      
-      this.api.on('didFinishLaunching', function () {
-         
-         platform.log("A total of [%s] accessories were loaded from the local cache", platform.accessories.size);
-         
-         // Get a list of all devices from the API, and compare it to the list of cached devices.
-         // New devices will be added, and devices that exist in the cache but not in the web list
-         // will be removed from Homebridge.
-         
-         (async () => {
-            
-            const connection = new ewelinkapi({
-               email: this.phoneNumberOrEmail,
-               password: this.accountPassword
-            });
-            this.connection = connection;
-            this.authenticationToken = await connection.getCredentials();
-            if (this.debug) platform.log("authenticationToken %s", JSON.stringify(this.authenticationToken));
-            
-            /* get all devices */
-            platform.log("Requesting a list of devices from eWeLink HTTPS API");
-            const devices = await connection.getDevices();
-            //				console.log(JSON.stringify(devices));
-            
-            var size = devices.length;
-            platform.log("eWeLink HTTPS API reports that there are a total of [%s] devices registered", size);
-            
-            if (size == 0) {
-               platform.log("As there were no devices were found, all devices have been removed from the platorm's cache. Please regiester your devices using the eWeLink app and restart HomeBridge");
-               platform.accessories.clear();
-               platform.api.unregisterPlatformAccessories("homebridge-eWeLink", "eWeLink", platform.accessories);
-               return;
-            }
-            
-            var devicesFromApi = new Map();
-            
-            devices.forEach((device) => {
-               platform.apiKey = device.apikey;
-               devicesFromApi.set(device.deviceid, device);
-            });
-            
-            // Now we compare the cached devices against the web list
-            platform.log("Evaluating if devices need to be removed...");
-            
-            function checkIfDeviceIsStillRegistered(value, deviceId, map) {
-               
-               var accessory = platform.accessories.get(deviceId);
-               
-               if (devicesFromApi.has(deviceId)) {
-                  platform.log('Device [%s] is regeistered with API. Nothing to do.', accessory.displayName);
-               } else {
-                  platform.log('Device [%s], ID : [%s] was not present in the response from the API. It will be removed.', accessory.displayName, accessory.UUID);
-                  platform.removeAccessory(accessory);
-               }
-            }
-            
-            // If we have devices in our cache, check that they exist in the web response
-            if (platform.accessories.size > 0) {
-               platform.log("Verifying that all cached devices are still registered with the API. Devices that are no longer registered with the API will be removed.");
-               platform.accessories.forEach(checkIfDeviceIsStillRegistered);
-            }
-            
-            platform.log("Evaluating if new devices need to be added...");
-            
-            // Now we compare the cached devices against the web list
-            function checkIfDeviceIsAlreadyConfigured(value, deviceId, map) {
-               if (platform.accessories.has(deviceId)) {
-                  
-                  platform.log('Device with ID [%s] is already configured. Ensuring that the configuration is current.', deviceId);
-                  
-                  var accessory = platform.accessories.get(deviceId);
-                  var deviceInformationFromWebApi = devicesFromApi.get(deviceId);
-                  
-                  accessory.getService(Service.AccessoryInformation).setCharacteristic(Characteristic.Name, deviceInformationFromWebApi.name);
-                  accessory.getService(Service.AccessoryInformation).setCharacteristic(Characteristic.SerialNumber, deviceInformationFromWebApi.extra.extra.mac);
-                  accessory.getService(Service.AccessoryInformation).setCharacteristic(Characteristic.Manufacturer, deviceInformationFromWebApi.brandName);
-                  accessory.getService(Service.AccessoryInformation).setCharacteristic(Characteristic.Model, deviceInformationFromWebApi.productModel);
-                  accessory.getService(Service.AccessoryInformation).setCharacteristic(Characteristic.FirmwareRevision, deviceInformationFromWebApi.params.fwVersion);
-                  let powerState;
-                  if ((deviceInformationFromWebApi !== undefined) && (deviceInformationFromWebApi.productModel)) {
-                     switch (deviceInformationFromWebApi.productModel) {
-                     case 'B1':
-                     case 'MINI':
-                        powerState = deviceInformationFromWebApi.params.state;
-                        break;
-                     case 'iFan02':
-                        powerState = deviceInformationFromWebApi.params.switches[0].switch;
-                        break;
-                     case 'AD500--X':
-                        powerState = deviceInformationFromWebApi.params.switch;
-                     }
-                  }
-                  if (this.debug) platform.log("::checkIfDeviceIsAlreadyConfigured() " + deviceInformationFromWebApi.name + " is " + powerState);
-                  
-                  platform.updatePowerStateCharacteristic(deviceId, powerState);
-                  
-               } else {
-                  var deviceToAdd = devicesFromApi.get(deviceId);
-                  platform.log('Device [%s], ID : [%s] will be added', deviceToAdd.name, deviceToAdd.deviceid);
-                  platform.addAccessory(deviceToAdd);
-               }
-            }
-            
-            // Go through the web response to make sure that all the devices that are in the response do exist in the accessories map
-            if (devicesFromApi.size > 0) {
-               devicesFromApi.forEach(checkIfDeviceIsAlreadyConfigured);
-            }
-            
-            if (this.debug) platform.log("API key retrieved from web service is [%s]", platform.apiKey);
-            
-         })().catch(function (error) {
-            platform.log("Error in intialization");
-         });
-      }.bind(this));
-   }
-}
-
-// Function invoked when homebridge tries to restore cached accessory.
-// We update the existing devices as part of didFinishLaunching(), as to avoid an additional call to the the HTTPS API.
-eWeLink.prototype.configureAccessory = function (accessory) {
-   
-   this.log(accessory.displayName, "Configure Accessory");
-   
-   var platform = this;
-   accessory.reachable = true;
-   
-   accessory.on('identify', function (paired, callback) {
-      platform.log(accessory.displayName, "Identify!!!");
-      callback();
-   });
-   
-   if (accessory.getService(Service.Switch)) {
-      
-      accessory.getService(Service.Switch).getCharacteristic(Characteristic.On)
-         .on('set', function (value, callback) {
-            platform.setPowerState(accessory, value);
-            callback();
-         })
-         .on('get', function (callback) {
-            platform.getPowerState(accessory);
-            callback();
-         });
-      
-   }
-   
-   this.accessories.set(accessory.context.deviceId, accessory);
-   
-};
-
-eWeLink.prototype.getStateFromDevice = function (device) {
-   if (this.debug) this.log("getStateFromDevice:: ENTER");
-   var powerState = 'on';
-   if ((device !== undefined) && (device.productModel)) {
-      switch (device.productModel) {
-      case 'B1':
-      case "MINI":
-         powerState = device.params.state;
-         break;
-      case 'iFan02':
-         powerState = device.params.switches[0].switch;
-         break;
-      case 'AD500--X':
-         powerState = device.params.switch;
-      }
-   }
-   if (this.debug) this.log("getStateFromDevice:: " + device.name + " is " + powerState);
-   if (this.debug) this.log("getStateFromDevice:: EXIT");
-   return powerState;
-};
-
-// Sample function to show how developer can add accessory dynamically from outside event
-eWeLink.prototype.addAccessory = function (device) {
-   
-   // Here we need to check if it is currently there
-   if (this.accessories.get(device.deviceid)) {
-      this.log("Not adding [%s] as it already exists in the cache", device.deviceid);
-      return;
-   }
-   
-   var platform = this;
-   
-   if (device.type != 10) {
-      this.log("A device with an unknown type was returned. It will be skipped.", device.type);
-      return;
-   }
-   
-   this.log("Found Accessory with Name : [%s], Manufacturer : [%s], Status : [%s], Is Online : [%s], API Key: [%s] ", device.name, device.productModel, this.getStateFromDevice(device), device.online, device.apikey);
-   
-   const accessory = new Accessory(device.name, UUIDGen.generate(device.deviceid.toString()));
-   
-   accessory.context.deviceId = device.deviceid;
-   accessory.context.apiKey = device.apikey;
-   
-   // if (device.online == 'true') {
-   accessory.reachable = true;
-   // } else {
-   // 	accessory.reachable = false;
-   // }
-   
-   accessory.addService(Service.Switch, device.name)
-      .getCharacteristic(Characteristic.On)
-      .on('set', function (value, callback) {
-         platform.setPowerState(accessory, value);
-         callback();
-      })
-      .on('get', function (callback) {
-         platform.getPowerState(accessory);
-         callback();
-      });
-   
-   accessory.on('identify', function (paired, callback) {
-      platform.log(accessory.displayName, "Identify not supported");
-      callback();
-   });
-   
-   accessory.getService(Service.AccessoryInformation).Characteristic(Characteristic.SerialNumber, device.extra.extra.mac);
-   accessory.getService(Service.AccessoryInformation).setCharacteristic(Characteristic.Manufacturer, device.productModel);
-   accessory.getService(Service.AccessoryInformation).setCharacteristic(Characteristic.Model, device.extra.extra.model);
-   accessory.getService(Service.AccessoryInformation).setCharacteristic(Characteristic.Identify, false);
-   accessory.getService(Service.AccessoryInformation).setCharacteristic(Characteristic.FirmwareRevision, device.params.fwVersion);
-   
-   this.accessories.set(device.deviceid, accessory);
-   
-   this.api.registerPlatformAccessories("homebridge-eWeLink",
-      "eWeLink", [accessory]);
-   
-};
-
-eWeLink.prototype.getSequence = function () {
-   var time_stamp = new Date() / 1000;
-   this.sequence = Math.floor(time_stamp * 1000);
-   return this.sequence;
-};
-
-eWeLink.prototype.updatePowerStateCharacteristic = function (deviceId, state) {
-   var platform = this;
-   if (platform.debug) platform.log("::updatePowerStateCharacteristic() : ENTER with (deviceId='" + deviceId + "',state='" + state + "')");
-   
-   // Used when we receive an update from an external source
-   var isOn = false;
-   var accessory = platform.accessories.get(deviceId);
-   if (state == 'on') {
-      isOn = true;
-   }
-   //if (platform.debug) platform.log("::updatePowerStateCharacteristic() : accessory before update: "+JSON.stringify(accessory));
-   
-   if (platform.debug) platform.log("::updatePowerStateCharacteristic() : Updating recorded Characteristic.On for [%s] to [%s]. No request will be sent to the device.", accessory.context.deviceId, isOn);
-   accessory.getService(Service.Switch).setCharacteristic(Characteristic.On, isOn);
-   //if (platform.debug) platform.log("::updatePowerStateCharacteristic() : accessory after update: "+JSON.stringify(accessory));
-   //platform.updatePowerStateCharacteristic(deviceId, powerState);
-   if (platform.debug) platform.log("::updatePowerStateCharacteristic() : EXIT");
-};
-
-eWeLink.prototype.getPowerState = function (accessory, callback) {
-   var platform = this;
-   
-   if (this.debug) platform.log("::getPowerState() : ENTER Requesting power state for [%s].", accessory.displayName); //, JSON.stringify(accessory));
-   
-   (async () => {
-      //		const device = await platform.connection.getDevice(accessory.context.deviceId);
-      var interestedDevice = null;
-      /////////////
-      const devices = await platform.connection.getDevices();
-      //if (platform.debug) platform.log("::getPowerState() : retrieved all devices, found "+devices.length+" devices");
-      
-      //if (platform.debug) platform.log("::getPowerState() : Looking for interested device");
-      devices.forEach((device) => {
-         //			if (platform.debug) platform.log("::getPowerState() : Found : "+JSON.stringify(device));
-         //if (platform.debug) platform.log("::getPowerState() : Looking for " + accessory.context.deviceId + ", but found "+device.deviceid);
-         if (accessory.context.deviceId == device.deviceid) {
-            //if (platform.debug) platform.log("::getPowerState() : found what I was looking for");
-            interestedDevice = device;
-         }
-      });
-      /////////////
-      let powerState = platform.getStateFromDevice(interestedDevice);
-      if (platform.debug) platform.log("::getPowerState() : power state for [%s] is %s", accessory.displayName, powerState);
-      this.updatePowerStateCharacteristic(accessory.context.deviceId, powerState);
-      if (this.debug) platform.log("::getPowerState() : EXIT");
-   })()
-   .catch(function (error) {
-      platform.log("::getPowerState() : Error in retrieving device\n" + JSON.stringify(error));
-   });
-};
-
-eWeLink.prototype.setPowerState = function (accessory, isOn, callback) {
-   var platform = this;
-   if (platform.debug) platform.log("::setPowerState() : ENTER");
-   
-   var targetState = 'off';
-   
-   if (isOn == true || isOn == 'on') {
-      targetState = 'on';
-   }
-   
-   if (this.debug) platform.log("::setPowerState() : Setting power state to [%s] for device [%s]", targetState, accessory.displayName);
-   (async () => {
-      const status = await platform.connection.setDevicePowerState(accessory.context.deviceId, targetState);
-      if (this.debug) platform.log("::setPowerState() : power state for [%s] is %s", accessory.displayName, JSON.stringify(status));
-      //this.updatePowerStateCharacteristic(accessory.context.deviceId, targetState);
-      if (platform.debug) platform.log("::setPowerState() : EXIT");
-   })().catch(function (error) {
-      platform.log("::setPowerState() : Error in retrieving device\n" + JSON.stringify(error));
-   });
-};
-
-// Sample function to show how developer can remove accessory dynamically from outside event
-eWeLink.prototype.removeAccessory = function (accessory) {
-   
-   this.log('Removing accessory [%s]', accessory.displayName);
-   this.accessories.delete(accessory.context.deviceId);
-   this.api.unregisterPlatformAccessories('homebridge-eWeLink', 'eWeLink', [accessory]);
+   let eWeLink = require("./lib/eWeLink.js")(homebridge);
+   homebridge.registerPlatform(constants.packageName, "eWeLink", eWeLink, true);
 };
\ No newline at end of file
diff --git a/lib/constants.js b/lib/constants.js
new file mode 100644
index 00000000..27699ea5
--- /dev/null
+++ b/lib/constants.js
@@ -0,0 +1,119 @@
+/* jshint esversion: 9, -W030, node: true */
+"use strict";
+module.exports = {
+   appId: "oeVkj2lYFGnJu5XUtWisfW4utiN4u9Mq",
+   packageName: "homebridge-ewelink",
+   devicesHideable: ["switch", "light", "valve"],
+   devicesSingleSwitch: [1, 5, 6, 14, 15, 22, 24, 27, 32, 36, 44, 59],
+   devicesSingleSwitchLight: ["T1 1C", "L1", "B1", "B1_R2", "TX1C", "D1", "D1R1", "KING-M4", "Slampher"],
+   devicesMultiSwitch: [2, 3, 4, 7, 8, 9, 29, 30, 31, 34, 41],
+   devicesMultiSwitchLight: ["T1 2C", "T1 3C", "TX2C", "TX3C"],
+   devicesBrightable: [36, 44],
+   devicesColourable: [22, 59],
+   devicesSensor: [102],
+   devicesThermostat: [15],
+   devicesFan: [34],
+   devicesOutlet: [32],
+   devicesUSB: [77],
+   devicesSCM: [78],
+   devicesRFBridge: [28],
+   devicesZBBridge: [66],
+   devicesZB: [1000, 1770, 2026, 3026],
+   paramsToKeep: ["bright", "brightness", "channel", "cmd", "colorB", "colorG", "colorR", "currentHumidity", "currentTemperature", "fan", "humidity", "key", "light", "lock", "mainSwitch", "mode", "online", "rfChl", "rfList", "rfTrig", "sensorType", "speed", "state", "switch", "switches", "temperature", "type", "zyx_mode"],
+   chansFromUiid: {
+      1: 1, // "SOCKET"                                  \\ 20, MINI, BASIC, S26
+      2: 2, // "SOCKET_2"                                \\ 
+      3: 3, // "SOCKET_3"                                \\ 
+      4: 4, // "SOCKET_4",                               \\ 
+      5: 1, // "SOCKET_POWER"                            \\ 
+      6: 1, // "SWITCH"                                  \\ T1 1C, TX1C
+      7: 2, // "SWITCH_2"                                \\ T1 2C, TX2C
+      8: 3, // "SWITCH_3"                                \\ T1 3C, TX3C
+      9: 4, // "SWITCH_4"                                \\ 
+      10: 0, // "OSPF"                                   \\ 
+      11: 0, // "CURTAIN"                                \\ King Q4 Cover
+      12: 0, // "EW-RE"                                  \\ 
+      13: 0, // "FIREPLACE"                              \\ 
+      14: 1, // "SWITCH_CHANGE"                          \\ 
+      15: 1, // "THERMOSTAT"                             \\ TH10, TH16
+      16: 0, // "COLD_WARM_LED"                          \\ 
+      17: 0, // "THREE_GEAR_FAN"                         \\ 
+      18: 0, // "SENSORS_CENTER"                         \\ 
+      19: 0, // "HUMIDIFIER"                             \\ 
+      22: 1, // "RGB_BALL_LIGHT"                         \\ B1, B1_R2
+      23: 0, // "NEST_THERMOSTAT"                        \\ 
+      24: 1, // "GSM_SOCKET"                             \\
+      25: 0, // "AROMATHERAPY",                          \\ Diffuser
+      26: 0, // "RuiMiTeWenKongQi"                       \\
+      27: 1, // "GSM_UNLIMIT_SOCKET"                     \\
+      28: 1, // "RF_BRIDGE"                              \\ RFBridge, RF_Bridge
+      29: 2, // "GSM_SOCKET_2"                           \\
+      30: 3, // "GSM_SOCKET_3"                           \\
+      31: 4, // "GSM_SOCKET_4"                           \\
+      32: 1, // "POWER_DETECTION_SOCKET"                 \\ Pow_R2 POW
+      33: 0, // "LIGHT_BELT",                            \\
+      34: 4, // "FAN_LIGHT"                              \\ iFan02, iFan
+      35: 0, // "EZVIZ_CAMERA",                          \\
+      36: 1, // "SINGLE_CHANNEL_DIMMER_SWITCH"           \\ KING-M4
+      38: 0, // "HOME_KIT_BRIDGE",                       \\
+      40: 0, // "FUJIN_OPS"                              \\
+      41: 4, // "CUN_YOU_DOOR"                           \\
+      42: 0, // "SMART_BEDSIDE_AND_NEW_RGB_BALL_LIGHT"   \\ 
+      43: 0, // "?"                                      \\ 
+      44: 1, // "SNOFF_LIGHT"                            \\ D1
+      45: 0, // "DOWN_CEILING_LIGHT"                     \\
+      46: 0, // "AIR_CLEANER"                            \\
+      49: 0, // "MACHINE_BED"                            \\
+      51: 0, // "COLD_WARM_DESK_LIGHT"                   \\
+      52: 0, // "DOUBLE_COLOR_DEMO_LIGHT"                \\
+      53: 0, // "ELECTRIC_FAN_WITH_LAMP"                 \\
+      55: 0, // "SWEEPING_ROBOT"                         \\
+      56: 0, // "RGB_BALL_LIGHT_4"                       \\
+      57: 0, // "MONOCHROMATIC_BALL_LIGHT"               \\
+      59: 1, // "MUSIC_LIGHT_BELT"                       \\ L1
+      60: 0, // "NEW_HUMIDIFIER"                         \\
+      61: 0, // "KAI_WEI_ROUTER"                         \\
+      62: 0, // "MEARICAMERA"                            \\
+      64: 0, // "HeatingTable"                           \\
+      65: 0, // "CustomCamera"                           \\
+      66: 0, // "ZIGBEE_MAIN_DEVICE"                     \\
+      67: 0, // "RollingDoor"                            \\
+      68: 0, // "KOOCHUWAH"                              \\
+      69: 0, // "ATMOSPHERE_LAMP"                        \\
+      76: 0, // "YI_GE_ER_LAMP"                          \\
+      77: 4, // "SINGLE_SOCKET_MULTIPLE"                 \\ (1 socket device using data structure of four :()
+      78: 4, // "SINGLE_SWITCH_MULTIPLE"                 \\ (1 switch device using data structure of four :()
+      79: 0, // "CHRISTMAS_LIGHT"                        \\
+      80: 0, // "HANYUAN_AIR_CONDITION"                  \\
+      81: 1, // "GSM_SOCKET_NO_FLOW"                     \\
+      82: 2, // "GSM_SOCKET_2_NO_FLOW"                   \\
+      83: 3, // "GSM_SOCKET_3_NO_FLOW"                   \\
+      84: 4, // "GSM_SOCKET_4_NO_FLOW"                   \\
+      86: 0, // "CLEAR_BOOT"                             \\
+      87: 0, // "EWELINK_IOT_CAMERA"                     \\ GK-200MP2B
+      88: 0, // "YK_INFRARED"                            \\
+      89: 0, // "SMART_OPEN_MACHINE"                     \\
+      90: 0, // "GSM_RFBridge"                           \\
+      91: 0, // "ROLLING_DOOR_91"                        \\
+      93: 0, // "HTHD_AIR_CLEANER"                       \\
+      94: 0, // "YIAN_ELECTRIC_PROTECT"                  \\
+      98: 0, // "DOORBELL_RFBRIDGE"                      \\
+      102: 1, // "DOOR_MAGNETIC"                         \\ OPL-DMA, DW2
+      103: 0, // "WOTEWODE_TEM_LIGHT"                    \\
+      104: 0, // "WOTEWODE_RGB_TEM_LIGHT"                \\
+      107: 0, // "GSM_SOCKET_NO_FLOW"                    \\
+      109: 0, // "YK_INFRARED_2"                         \\
+      1000: 1, // "ZIGBEE_WIRELESS_SWITCH"               \\
+      1001: 0, // "BLADELESS_FAN"                        \\
+      1002: 0, // "NEW_HUMIDIFIER"                       \\
+      1003: 0, // "WARM_AIR_BLOWER"                      \\
+      1256: 1, // "ZIGBEE_SINGLE_SWITCH"                 \\
+      1770: 1, // "ZIGBEE_TEMPERATURE_SENSOR"            \\
+      2026: 1, // "ZIGBEE_MOBILE_SENSOR"                 \\
+      2256: 2, // "ZIGBEE_SWITCH_2"                      \\
+      3026: 1, // "ZIGBEE_DOOR_AND_WINDOW_SENSOR"        \\
+      3256: 3, // "ZIGBEE_SWITCH_3"                      \\
+      4026: 1, // "ZIGBEE_WATER_SENSOR"                  \\
+      4256: 4, // "ZIGBEE_SWITCH_4"                      \\
+   }
+};
\ No newline at end of file
diff --git a/lib/eWeLink.js b/lib/eWeLink.js
new file mode 100644
index 00000000..8cfdceec
--- /dev/null
+++ b/lib/eWeLink.js
@@ -0,0 +1,1825 @@
+/* jshint esversion: 9, -W030, node: true */
+"use strict";
+const constants = require("./constants");
+const convert = require("color-convert");
+const eWeLinkHTTP = require("./eWeLinkHTTP");
+const eWeLinkWS = require("./eWeLinkWS");
+const eWeLinkLAN = require("./eWeLinkLAN");
+let Accessory, Service, Characteristic, UUIDGen;
+class eWeLink {
+   constructor(log, config, api) {
+      if (!log || !api) {
+         return;
+      }
+      if (!config || (!config.username || !config.password || !config.countryCode)) {
+         log.error("** Could not load " + constants.packageName + " **");
+         log.warn("Make sure your eWeLink credentials are in the Homebridge configuration.");
+         return;
+      }
+      this.log = log;
+      this.config = config;
+      this.api = api;
+      this.mode = this.config.mode || "lan";
+      this.debug = this.config.debug || false;
+      this.debugReqRes = this.config.debugReqRes || false;
+      this.customHideChanFromHB = this.config.hideFromHB || "";
+      this.customHideDvceFromHB = this.config.hideDevFromHB || "";
+      this.customNameOverride = this.config.nameOverride || {};
+      this.sensorTimeLength = this.config.sensorTimeLength || 2;
+      this.sensorTimeDifference = this.config.sensorTimeDifference || 120;
+      this.valveTimeLength = this.config.valveTimeLength || 120;
+      this.hideZBLDPress = this.config.hideZBLDPress || false;
+      this.devicesInHB = new Map();
+      this.devicesInEwe = new Map();
+      this.cusG = new Map();
+      this.cusS = new Map();
+      this.api.on("didFinishLaunching", () => {
+         this.log("Plugin has finished initialising. Starting synchronisation with eWeLink account.");
+         //*** Set up HTTP client and get the user HTTP host ***\\
+         this.httpClient = new eWeLinkHTTP(this.config, this.log);
+         this.httpClient.getHost()
+            .then(res => { //*** Use the HTTP API host to log into eWeLink ***\\
+               return this.httpClient.login();
+            }).then(res => { //*** Set up the web socket client ***\\
+               this.wsClient = new eWeLinkWS(this.config, this.log, res);
+               return this.wsClient.getHost();
+            }).then(res => { //*** Open web socket connection and get device list via HTTP ***\\
+               this.wsClient.login();
+               return this.httpClient.getDevices();
+            }).then(res => { //*** Get device IP addresses for LAN mode ***\\
+               this.httpDevices = res;
+               this.lanClient = new eWeLinkLAN(this.config, this.log, this.httpDevices);
+               return this.lanClient.getHosts();
+            }).then(res => { //*** Set up the LAN mode listener ***\\
+               this.lanDevices = res;
+               return this.lanClient.startMonitor();
+            }).then(res => { //*** Use the device list to refresh Homebridge accessories ***\\
+               (() => {
+                  //*** Remove all Homebridge accessories if none found ***\\
+                  if (Object.keys(this.httpDevices).length === 0 && Object.keys(this.lanDevices).length === 0) {
+                     this.removeAllAccessories();
+                     return;
+                  }
+                  //*** Make a map of devices from eWeLink ***\\
+                  this.httpDevices.forEach(device => {
+                     if (this.customHideDvceFromHB.includes(device.deviceid)) {
+                        return;
+                     }
+                     this.devicesInEwe.set(device.deviceid, device);
+                  });
+                  //*** Make a map of custom groups from Homebridge config ***\\
+                  if (this.config.groups && Object.keys(this.config.groups).length > 0) {
+                     this.config.groups.forEach(group => {
+                        if (typeof group.deviceId !== "undefined" && this.devicesInEwe.has(group.deviceId.toLowerCase())) {
+                           this.cusG.set(group.deviceId + "SWX", group);
+                        }
+                     });
+                  }
+                  //*** Make a map of RF Bridge custom sensors from Homebridge config ***\\
+                  if (this.config.bridgeSensors && Object.keys(this.config.bridgeSensors).length > 0) {
+                     this.config.bridgeSensors.forEach(bridgeSensor => {
+                        if (typeof bridgeSensor.deviceId !== "undefined" && this.devicesInEwe.has(bridgeSensor.deviceId.toLowerCase())) {
+                           this.cusS.set(bridgeSensor.fullDeviceId, bridgeSensor);
+                        }
+                     });
+                  }
+                  //*** Logging always helps to see if everything is okay so far ***\\
+                  this.log("[%s] eWeLink devices were loaded from the Homebridge cache.", this.devicesInHB.size);
+                  this.log("[%s] primary devices were loaded from your eWeLink account.", this.devicesInEwe.size);
+                  this.log("[%s] primary devices were discovered on your local network.", Object.keys(this.lanDevices).length);
+                  //*** Remove Homebridge accessories that don't appear in eWeLink ***\\
+                  if (this.devicesInHB.size > 0) {
+                     this.devicesInHB.forEach(accessory => {
+                        if (!this.devicesInEwe.has(accessory.context.eweDeviceId)) {
+                           this.removeAccessory(accessory);
+                        }
+                     });
+                  }
+                  //*** Disable plugin if no eWeLink devices ***\\
+                  if (this.devicesInEwe.size === 0) {
+                     return;
+                  }
+                  //*** Synchronise (add/refresh) devices between eWeLink and Homebridge ***\\
+                  this.devicesInEwe.forEach(device => {
+                     this.initialiseDevice(device);
+                  });
+                  //*** Set up the ws listener for future external device updates ***\\
+                  this.wsClient.receiveUpdate(device => {
+                     this.receiveDeviceUpdate(device);
+                  });
+                  //*** Set up the lan listener for future external device updates ***\\
+                  this.lanClient.receiveUpdate(device => {
+                     this.receiveDeviceUpdate(device);
+                  });
+                  this.log("Synchronisation complete. Ready to go!");
+                  if (this.debugReqRes) {
+                     this.log.warn("You have 'Request & Response Logging' enabled. This setting is not recommended for long-term use.");
+                  }
+               })();
+            }).catch(err => {
+               this.log.error("** eWeLink synchronisation error: **");
+               this.log.warn(err);
+               this.log.error("** Plugin will not be loaded. **");
+            });
+      });
+   }
+   initialiseDevice(device) {
+      let accessory;
+      //*** First add the device if it isn't already in Homebridge ***\\
+      if (!this.devicesInHB.has(device.deviceid + "SWX") && !this.devicesInHB.has(device.deviceid + "SW0")) {
+         if (device.extra.uiid === 2 && device.brandName === "coolkit" && device.productModel === "0285") {
+            this.addAccessory(device, device.deviceid + "SWX", "valve");
+         } else if (this.cusG.has(device.deviceid + "SWX") && this.cusG.get(device.deviceid + "SWX").type === "blind") {
+            this.addAccessory(device, device.deviceid + "SWX", "blind");
+         } else if (this.cusG.has(device.deviceid + "SWX") && this.cusG.get(device.deviceid + "SWX").type === "garage") {
+            this.addAccessory(device, device.deviceid + "SWX", "garage");
+         } else if (constants.devicesSensor.includes(device.extra.uiid)) {
+            this.addAccessory(device, device.deviceid + "SWX", "sensor");
+         } else if (constants.devicesFan.includes(device.extra.uiid)) {
+            this.addAccessory(device, device.deviceid + "SWX", "fan");
+         } else if (constants.devicesThermostat.includes(device.extra.uiid)) {
+            this.addAccessory(device, device.deviceid + "SWX", "thermostat");
+         } else if (constants.devicesOutlet.includes(device.extra.uiid)) {
+            this.addAccessory(device, device.deviceid + "SWX", "outlet");
+         } else if (constants.devicesUSB.includes(device.extra.uiid)) {
+            this.addAccessory(device, device.deviceid + "SWX", "usb");
+         } else if (constants.devicesSCM.includes(device.extra.uiid)) {
+            this.addAccessory(device, device.deviceid + "SWX", "scm");
+         } else if (constants.devicesSingleSwitch.includes(device.extra.uiid) && constants.devicesSingleSwitchLight.includes(device.productModel)) {
+            this.addAccessory(device, device.deviceid + "SWX", "light");
+         } else if (constants.devicesMultiSwitch.includes(device.extra.uiid) && constants.devicesMultiSwitchLight.includes(device.productModel)) {
+            for (let i = 0; i <= constants.chansFromUiid[device.extra.uiid]; i++) {
+               this.addAccessory(device, device.deviceid + "SW" + i, "light");
+            }
+         } else if (constants.devicesSingleSwitch.includes(device.extra.uiid)) {
+            this.addAccessory(device, device.deviceid + "SWX", "switch");
+         } else if (constants.devicesMultiSwitch.includes(device.extra.uiid)) {
+            for (let i = 0; i <= constants.chansFromUiid[device.extra.uiid]; i++) {
+               this.addAccessory(device, device.deviceid + "SW" + i, "switch");
+            }
+         } else if (constants.devicesRFBridge.includes(device.extra.uiid)) {
+            this.addAccessory(device, device.deviceid + "SW0", "rf_pri");
+            for (let i = 1; i <= Object.keys(device.params.rfList).length; i++) {
+               this.addAccessory(device, device.deviceid + "SW" + i, "rf_sub");
+            }
+         } else if (constants.devicesZBBridge.includes(device.extra.uiid)) {
+            this.addAccessory(device, device.deviceid + "SWX", "zb_pri");
+         } else if (constants.devicesZB.includes(device.extra.uiid)) {
+            this.addAccessory(device, device.deviceid + "SWX", "zb_sub");
+         } else {
+            this.log.warn("[%s] could not be added as it is not supported by this plugin.", device.name);
+         }
+      }
+      //*** Next refresh the device ***\\
+      if ((accessory = this.devicesInHB.get(device.deviceid + "SWX"))) {
+         accessory.getService(Service.AccessoryInformation).setCharacteristic(Characteristic.FirmwareRevision, device.params.fwVersion);
+         accessory.context.reachableWAN = accessory.context.eweUIID !== 102 ?
+            device.online :
+            true; //*** DW2 offline sometimes (as battery powered?) ***\\
+         accessory.context.reachableLAN = this.lanDevices[device.deviceid].ip || false;
+         let str = accessory.context.reachableLAN ?
+            "and locally with IP [" + accessory.context.reachableLAN + "]" :
+            (accessory.context.reachableWAN) ?
+            "but LAN mode unavailable as unsupported/shared device" :
+            "but LAN mode unavailable as device offline";
+         this.log("[%s] found in eWeLink %s.", accessory.displayName, str);
+         try {
+            this.devicesInHB.set(accessory.context.hbDeviceId, accessory);
+            this.api.updatePlatformAccessories(constants.packageName, "eWeLink", [accessory]);
+         } catch (e) {
+            this.log.warn("[%s] online/offline status could not be updated - [%s].", accessory.displayName, e);
+         }
+      } else if ((accessory = this.devicesInHB.get(device.deviceid + "SW0"))) {
+         accessory.context.reachableLAN = this.lanDevices[device.deviceid].ip || false;
+         let str = accessory.context.reachableLAN ?
+            "and locally with IP [" + accessory.context.reachableLAN + "]" :
+            (accessory.context.reachableWAN) ?
+            "but LAN mode unavailable as unsupported/shared device" :
+            "but LAN mode unavailable as device offline";
+         this.log("[%s] found in eWeLink %s.", accessory.displayName, str);
+         let isRf = constants.devicesRFBridge.includes(device.extra.uiid);
+         let rfCh = false;
+         for (let i = 0; i <= accessory.context.channelCount; i++) {
+            let oAccessory;
+            try {
+               if (!this.devicesInHB.has(device.deviceid + "SW" + i)) {
+                  if (i > 0 && this.customHideChanFromHB.includes(device.deviceid + "SW" + i) && constants.devicesHideable.includes(accessory.context.type)) {
+                     continue;
+                  } else {
+                     this.addAccessory(device, device.deviceid + "SW" + i, "switch");
+                  }
+               }
+               oAccessory = this.devicesInHB.get(device.deviceid + "SW" + i);
+               if (i > 0 && this.customHideChanFromHB.includes(device.deviceid + "SW" + i) && constants.devicesHideable.includes(accessory.context.type)) {
+                  this.removeAccessory(oAccessory);
+                  continue;
+               }
+               if (i > 0 && isRf) {
+                  let ct = this.cusS.has(oAccessory.context.hbDeviceId) ? this.cusS.get(oAccessory.context.hbDeviceId).type : "motion";
+                  if (ct !== oAccessory.context.sensorType) {
+                     rfCh = true;
+                  }
+               }
+               oAccessory.getService(Service.AccessoryInformation).setCharacteristic(Characteristic.FirmwareRevision, device.params.fwVersion);
+               oAccessory.context.reachableWAN = device.online;
+               oAccessory.context.reachableLAN = this.lanDevices[device.deviceid].ip || false;
+               this.devicesInHB.set(oAccessory.context.hbDeviceId, oAccessory);
+               this.api.updatePlatformAccessories(constants.packageName, "eWeLink", [oAccessory]);
+            } catch (e) {}
+         }
+         if (rfCh) {
+            this.log.warn("RF Bridge configuration changed. Devices will be removed and readded.");
+            try {
+               for (let i = 0; i <= accessory.context.channelCount; i++) {
+                  let oAccessory = this.devicesInHB.get(device.deviceid + "SW" + i);
+                  this.removeAccessory(oAccessory);
+               }
+               this.initialiseDevice(device);
+            } catch (err) {}
+            return;
+         }
+      } else {
+         this.log.warn("[%s] will not be refreshed as it wasn't found in Homebridge.", device.name);
+         return;
+      }
+      if (!accessory.context.reachableWAN && !accessory.context.reachableLAN) {
+         this.log.warn("[%s] will not be refreshed as it has been reported offline.", accessory.displayName);
+         return;
+      }
+      device.params.updateSource = "http";
+      if (!this.refreshAccessory(accessory, device.params)) {
+         this.log.warn("[%s] could not be refreshed. Please try removing accessory from the Homebridge cache along with any secondary devices (SW1, SW2, etc.). Debugging: [%s:%s:%s]", accessory.displayName, "initialise", accessory.context.type, accessory.context.channelCount);
+      }
+   }
+   addAccessory(device, hbDeviceId, type) {
+      let channelCount = type === "rf_pri" ? Object.keys(device.params.rfList).length : constants.chansFromUiid[device.extra.uiid],
+         switchNumber = hbDeviceId.substr(-1).toString(),
+         newDeviceName = device.name;
+      if (["1", "2", "3", "4"].includes(switchNumber)) {
+         newDeviceName += " SW" + switchNumber;
+         if (this.customHideChanFromHB.includes(hbDeviceId) && type === "switch") {
+            this.log.warn("[%s] has not been added as per configuration", newDeviceName);
+            return;
+         }
+      }
+      if (this.customNameOverride.hasOwnProperty(hbDeviceId)) {
+         newDeviceName = this.customNameOverride[hbDeviceId];
+      }
+      const accessory = new Accessory(newDeviceName, UUIDGen.generate(hbDeviceId).toString());
+      try {
+         accessory.getService(Service.AccessoryInformation)
+            .setCharacteristic(Characteristic.SerialNumber, hbDeviceId)
+            .setCharacteristic(Characteristic.Manufacturer, device.brandName)
+            .setCharacteristic(Characteristic.Model, device.productModel + " (" + device.extra.model + ")")
+            .setCharacteristic(Characteristic.FirmwareRevision, device.params.fwVersion)
+            .setCharacteristic(Characteristic.Identify, false);
+         accessory.context = {
+            hbDeviceId,
+            eweDeviceId: device.deviceid,
+            eweUIID: device.extra.uiid,
+            eweModel: device.productModel,
+            eweApiKey: device.apikey,
+            switchNumber,
+            channelCount,
+            type
+         };
+         switch (type) {
+         case "valve":
+            ["A", "B"].forEach(v => {
+               accessory.addService(Service.Valve, "Valve " + v, "valve" + v.toLowerCase())
+                  .setCharacteristic(Characteristic.Active, 0)
+                  .setCharacteristic(Characteristic.InUse, 0)
+                  .setCharacteristic(Characteristic.ValveType, 1)
+                  .setCharacteristic(Characteristic.SetDuration, this.valveTimeLength)
+                  .addCharacteristic(Characteristic.RemainingDuration);
+            });
+            break;
+         case "blind":
+            accessory.addService(Service.WindowCovering)
+               .setCharacteristic(Characteristic.CurrentPosition, 100)
+               .setCharacteristic(Characteristic.TargetPosition, 100)
+               .setCharacteristic(Characteristic.PositionState, 2);
+            break;
+         case "garage":
+            accessory.addService(Service.GarageDoorOpener)
+               .setCharacteristic(Characteristic.CurrentDoorState, 1)
+               .setCharacteristic(Characteristic.TargetDoorState, 1)
+               .setCharacteristic(Characteristic.ObstructionDetected, false);
+            break;
+         case "sensor":
+            accessory.addService(Service.ContactSensor)
+               .setCharacteristic(Characteristic.ContactSensorState, 0);
+            break;
+         case "fan":
+            accessory.addService(Service.Fanv2);
+            accessory.addService(Service.Lightbulb);
+            break;
+         case "thermostat":
+            accessory.addService(Service.Switch);
+            accessory.addService(Service.TemperatureSensor);
+            if (device.params.sensorType !== "DS18B20") {
+               accessory.addService(Service.HumiditySensor);
+            }
+            break;
+         case "outlet":
+         case "usb":
+            accessory.addService(Service.Outlet);
+            break;
+         case "light":
+            accessory.addService(Service.Lightbulb);
+            break;
+         case "switch":
+         case "scm":
+            accessory.addService(Service.Switch);
+            break;
+         case "rf_pri":
+         case "zb_pri":
+            break;
+         case "rf_sub":
+            accessory.context.sensorType = this.cusS.has(hbDeviceId) ? this.cusS.get(hbDeviceId).type : "motion";
+            accessory.context.rfChl = parseInt(switchNumber) - 1;
+            switch (accessory.context.sensorType) {
+            case "button":
+               accessory.addService(Service.Switch);
+               break;
+            case "water":
+               accessory.addService(Service.LeakSensor);
+               break;
+            case "fire":
+            case "smoke":
+               accessory.addService(Service.SmokeSensor);
+               break;
+            case "co":
+               accessory.addService(Service.CarbonMonoxideSensor);
+               break;
+            case "co2":
+               accessory.addService(Service.CarbonDioxideSensor);
+               break;
+            case "contact":
+               accessory.addService(Service.ContactSensor);
+               break;
+            case "occupancy":
+               accessory.addService(Service.OccupancySensor);
+               break;
+            case "motion":
+            default:
+               accessory.addService(Service.MotionSensor);
+               break;
+            }
+            break;
+         case "zb_sub":
+            switch (device.extra.uiid) {
+            case 1000: //*** credit @tasict ***\\
+               accessory.addService(Service.StatelessProgrammableSwitch);
+               if (this.hideZBLDPress) {
+                  accessory.getService(Service.StatelessProgrammableSwitch)
+                     .getCharacteristic(Characteristic.ProgrammableSwitchEvent)
+                     .setProps({
+                        validValues: [0]
+                     });
+               }
+               break;
+            case 1770:
+               accessory.addService(Service.TemperatureSensor);
+               accessory.addService(Service.HumiditySensor);
+               break;
+            case 2026:
+               accessory.addService(Service.MotionSensor);
+               break;
+            case 3026:
+               accessory.addService(Service.ContactSensor).setCharacteristic(Characteristic.ContactSensorState, 0);
+               break;
+            default:
+               throw "unsupported zigbee device type with uiid [" + device.extra.uiid + "]";
+            }
+            break;
+         default:
+            throw "device is not supported by this plugin";
+         }
+         this.devicesInHB.set(hbDeviceId, accessory);
+         this.api.registerPlatformAccessories(constants.packageName, "eWeLink", [accessory]);
+         this.configureAccessory(accessory);
+         this.log("[%s] has been added to Homebridge.", newDeviceName);
+      } catch (e) {
+         this.log.warn("[%s] could not be added as %s.", accessory.displayName, e);
+      }
+   }
+   configureAccessory(accessory) {
+      if (!this.log) {
+         return;
+      }
+      try {
+         switch (accessory.context.type) {
+         case "valve":
+            ["A", "B"].forEach(v => {
+               accessory.getService("Valve " + v).getCharacteristic(Characteristic.Active)
+                  .on("set", (value, callback) => {
+                     accessory.getService("Valve " + v).getCharacteristic(Characteristic.Active).value !== value ?
+                        this.internalValveUpdate(accessory, "Valve " + v, value, callback) :
+                        callback();
+                  });
+               accessory.getService("Valve " + v).getCharacteristic(Characteristic.SetDuration)
+                  .on("set", (value, callback) => {
+                     if (accessory.getService("Valve " + v).getCharacteristic(Characteristic.InUse).value) {
+                        accessory.getService("Valve " + v).updateCharacteristic(Characteristic.RemainingDuration, value);
+                        clearTimeout(accessory.getService("Valve " + v).timer);
+                        accessory.getService("Valve " + v).timer = setTimeout(() => {
+                           accessory.getService("Valve " + v).setCharacteristic(Characteristic.Active, 0);
+                        }, (value * 1000));
+                     }
+                     callback();
+                  });
+            });
+            break;
+         case "blind":
+            accessory.getService(Service.WindowCovering).getCharacteristic(Characteristic.TargetPosition)
+               .setProps({
+                  minStep: 100
+               })
+               .on("set", (value, callback) => {
+                  accessory.getService(Service.WindowCovering).getCharacteristic(Characteristic.TargetPosition).value !== value ?
+                     this.internalBlindUpdate(accessory, value, callback) :
+                     callback();
+               });
+            break;
+         case "garage":
+            accessory.getService(Service.GarageDoorOpener).getCharacteristic(Characteristic.TargetDoorState)
+               .on("set", (value, callback) => {
+                  accessory.getService(Service.GarageDoorOpener).getCharacteristic(Characteristic.TargetDoorState).value !== value ?
+                     this.internalGarageUpdate(accessory, value, callback) :
+                     callback();
+               });
+            break;
+         case "fan":
+            accessory.getService(Service.Fanv2).getCharacteristic(Characteristic.Active)
+               .on("set", (value, callback) => {
+                  accessory.getService(Service.Fanv2).getCharacteristic(Characteristic.Active).value !== value ?
+                     this.internalFanUpdate(accessory, "power", value, callback) :
+                     callback();
+               });
+            accessory.getService(Service.Fanv2).getCharacteristic(Characteristic.RotationSpeed)
+               .setProps({
+                  minStep: 33
+               })
+               .on("set", (value, callback) => {
+                  accessory.getService(Service.Fanv2).getCharacteristic(Characteristic.RotationSpeed).value !== value ?
+                     this.internalFanUpdate(accessory, "speed", value, callback) :
+                     callback();
+               });
+            accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On)
+               .on("set", (value, callback) => {
+                  accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On).value !== value ?
+                     this.internalFanUpdate(accessory, "light", value, callback) :
+                     callback();
+               });
+            break;
+         case "thermostat":
+            accessory.getService(Service.Switch).getCharacteristic(Characteristic.On)
+               .on("set", (value, callback) => {
+                  accessory.getService(Service.Switch).getCharacteristic(Characteristic.On).value !== value ?
+                     this.internalThermostatUpdate(accessory, value, callback) :
+                     callback();
+               });
+            break;
+         case "outlet":
+            accessory.getService(Service.Outlet).getCharacteristic(Characteristic.On)
+               .on("set", (value, callback) => {
+                  accessory.getService(Service.Outlet).getCharacteristic(Characteristic.On).value !== value ?
+                     this.internalOutletUpdate(accessory, value, callback) :
+                     callback();
+               });
+            break;
+         case "usb":
+            accessory.getService(Service.Outlet).getCharacteristic(Characteristic.On)
+               .on("set", (value, callback) => {
+                  accessory.getService(Service.Outlet).getCharacteristic(Characteristic.On).value !== value ?
+                     this.internalUSBUpdate(accessory, value, callback) :
+                     callback();
+               });
+            break;
+         case "scm":
+            accessory.getService(Service.Switch).getCharacteristic(Characteristic.On)
+               .on("set", (value, callback) => {
+                  accessory.getService(Service.Switch).getCharacteristic(Characteristic.On).value !== value ?
+                     this.internalSCMUpdate(accessory, value, callback) :
+                     callback();
+               });
+            break;
+         case "light":
+            accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On)
+               .on("set", (value, callback) => {
+                  accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On).value !== value ?
+                     this.internalLightbulbUpdate(accessory, value, callback) :
+                     callback();
+               });
+            if (constants.devicesBrightable.includes(accessory.context.eweUIID)) {
+               accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.Brightness)
+                  .on("set", (value, callback) => {
+                     if (value > 0) {
+                        if (!accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On).value) {
+                           this.internalLightbulbUpdate(accessory, true, callback);
+                        }
+                        accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.Brightness).value !== value ?
+                           this.internalBrightnessUpdate(accessory, value, callback) :
+                           callback();
+                     } else {
+                        accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On).value ?
+                           this.internalLightbulbUpdate(accessory, false, callback) :
+                           callback();
+                     }
+                  });
+            } else if (constants.devicesColourable.includes(accessory.context.eweUIID)) {
+               accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.Brightness)
+                  .on("set", (value, callback) => {
+                     if (value > 0) {
+                        if (!accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On).value) {
+                           this.internalLightbulbUpdate(accessory, true, callback);
+                        }
+                        accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.Brightness).value !== value ?
+                           this.internalHSBUpdate(accessory, "bri", value, callback) :
+                           callback();
+                     } else {
+                        accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On).value ?
+                           this.internalLightbulbUpdate(accessory, false, callback) :
+                           callback();
+                     }
+                  });
+               accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.Hue)
+                  .on("set", (value, callback) => {
+                     accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.Hue).value !== value ?
+                        this.internalHSBUpdate(accessory, "hue", value, callback) :
+                        callback();
+                  });
+               accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.Saturation)
+                  .on("set", (value, callback) => {
+                     accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.Saturation, value);
+                     callback();
+                  });
+            }
+            break;
+         case "switch":
+            accessory.getService(Service.Switch).getCharacteristic(Characteristic.On)
+               .on("set", (value, callback) => {
+                  accessory.getService(Service.Switch).getCharacteristic(Characteristic.On).value !== value ?
+                     this.internalSwitchUpdate(accessory, value, callback) :
+                     callback();
+               });
+            break;
+         case "rf_sub":
+            if (accessory.context.sensorType === "button") {
+               accessory.getService(Service.Switch).getCharacteristic(Characteristic.On)
+                  .on("set", (value, callback) => {
+                     this.internalRFDeviceUpdate(accessory, true, callback);
+                  });
+            }
+            break;
+         }
+         accessory.context.reachableWAN = true;
+         accessory.context.reachableLAN = true;
+         this.devicesInHB.set(accessory.context.hbDeviceId, accessory);
+         this.api.updatePlatformAccessories(constants.packageName, "eWeLink", [accessory]);
+      } catch (e) {
+         this.log.warn("[%s] could not be refreshed - [%s].", accessory.displayName, e);
+      }
+   }
+   refreshAccessory(accessory, newParams) {
+      switch (accessory.context.type) {
+      case "valve":
+         if (Array.isArray(newParams.switches)) {
+            this.externalValveUpdate(accessory, newParams);
+         }
+         return true;
+      case "blind":
+         if (Array.isArray(newParams.switches)) {
+            this.externalBlindUpdate(accessory, newParams);
+         }
+         return true;
+      case "garage":
+         if (newParams.hasOwnProperty("switch") || Array.isArray(newParams.switches)) {
+            this.externalGarageUpdate(accessory, newParams);
+         }
+         return true;
+      case "sensor":
+         if (newParams.hasOwnProperty("switch")) {
+            this.externalSensorUpdate(accessory, newParams);
+         }
+         return true;
+      case "fan":
+         if (Array.isArray(newParams.switches) || (newParams.hasOwnProperty("light") && newParams.hasOwnProperty("fan") && newParams.hasOwnProperty("speed"))) {
+            this.externalFanUpdate(accessory, newParams);
+         }
+         return true;
+      case "thermostat":
+         if (newParams.hasOwnProperty("currentTemperature") || newParams.hasOwnProperty("currentHumidity") || newParams.hasOwnProperty("switch") || newParams.hasOwnProperty("masterSwitch")) {
+            this.externalThermostatUpdate(accessory, newParams);
+         }
+         return true;
+      case "outlet":
+         if (newParams.hasOwnProperty("switch")) {
+            this.externalOutletUpdate(accessory, newParams);
+         }
+         return true;
+      case "usb":
+         if (Array.isArray(newParams.switches)) {
+            this.externalUSBUpdate(accessory, newParams);
+         }
+         return true;
+      case "scm":
+         if (Array.isArray(newParams.switches)) {
+            this.externalSCMUpdate(accessory, newParams);
+         }
+         return true;
+      case "light":
+         if (constants.devicesSingleSwitch.includes(accessory.context.eweUIID) && constants.devicesSingleSwitchLight.includes(accessory.context.eweModel)) {
+            if (newParams.hasOwnProperty("switch") || newParams.hasOwnProperty("state") || newParams.hasOwnProperty("bright") || newParams.hasOwnProperty("colorR") || newParams.hasOwnProperty("brightness") || newParams.hasOwnProperty("channel0") || newParams.hasOwnProperty("channel2") || newParams.hasOwnProperty("zyx_mode")) {
+               this.externalSingleLightUpdate(accessory, newParams);
+            }
+         } else if (constants.devicesMultiSwitch.includes(accessory.context.eweUIID) && constants.devicesMultiSwitchLight.includes(accessory.context.eweModel)) {
+            if (Array.isArray(newParams.switches)) {
+               this.externalMultiLightUpdate(accessory, newParams);
+            }
+         }
+         return true;
+      case "switch":
+         if (constants.devicesSingleSwitch.includes(accessory.context.eweUIID)) {
+            if (newParams.hasOwnProperty("switch")) {
+               this.externalSingleSwitchUpdate(accessory, newParams);
+            }
+         } else if (constants.devicesMultiSwitch.includes(accessory.context.eweUIID)) {
+            if (Array.isArray(newParams.switches)) {
+               this.externalMultiSwitchUpdate(accessory, newParams);
+            }
+         }
+         return true;
+      case "rf_pri":
+         this.externalRFDeviceUpdate(accessory, newParams);
+         return true;
+      case "rf_sub":
+         return true;
+      case "zb_pri":
+         return true;
+      case "zb_sub":
+         this.externalZBDeviceUpdate(accessory, newParams);
+         return true;
+      default:
+         return false;
+      }
+   }
+   removeAccessory(accessory) {
+      try {
+         this.devicesInHB.delete(accessory.context.hbDeviceId);
+         this.api.unregisterPlatformAccessories(constants.packageName, "eWeLink", [accessory]);
+         this.log("[%s] will be removed from Homebridge.", accessory.displayName);
+      } catch (e) {
+         this.log.warn("[%s] needed to be removed but couldn't - [%s].", accessory.displayName, e);
+      }
+   }
+   removeAllAccessories() {
+      try {
+         this.log.warn("[0] primary devices were loaded from your eWeLink account so any eWeLink devices in the Homebridge cache will be removed. This plugin will not load as there is no reason to continue.");
+         this.api.unregisterPlatformAccessories(constants.packageName, "eWeLink", Array.from(this.devicesInHB.values()));
+         this.devicesInHB.clear();
+      } catch (e) {
+         this.log.warn("Accessories could not be removed from the Homebridge cache - [%s].", e);
+      }
+   }
+   sendDeviceUpdate(accessory, params, callback) {
+      let payload = {
+         apikey: accessory.context.eweApiKey,
+         deviceid: accessory.context.eweDeviceId,
+         params
+      };
+      switch (this.mode) {
+      case "lan":
+      default:
+         this.lanClient.sendUpdate(payload)
+            .then(res => {
+               callback();
+            })
+            .catch(err => {
+               if (accessory.context.reachableWAN) {
+                  if (this.debug) {
+                     this.log.warn("[%s] LAN update failed as %s. Trying web socket update.", accessory.displayName, err);
+                  }
+                  this.wsClient.sendUpdate(payload, callback);
+                  setTimeout(() => {
+                     this.wsClient.requestUpdate(accessory);
+                  }, 2500);
+               } else {
+                  this.log.error("[%s] could not be updated as it appears to be offline.", accessory.displayName);
+                  callback("Device has failed to update");
+               }
+            });
+         break;
+      case "ws":
+         this.wsClient.sendUpdate(payload, callback);
+         setTimeout(() => {
+            this.wsClient.requestUpdate(accessory);
+         }, 2500);
+         break;
+      }
+   }
+   receiveDeviceUpdate(device) {
+      let accessory;
+      switch (device.action) {
+      case "sysmsg":
+         if (this.devicesInHB.has(device.deviceid + "SWX") || this.devicesInHB.has(device.deviceid + "SW0")) {
+            accessory = this.devicesInHB.get(device.deviceid + "SWX") || this.devicesInHB.get(device.deviceid + "SW0");
+            try {
+               if (accessory.context.reachableWAN !== device.params.online) {
+                  accessory.context.reachableWAN = device.params.online;
+                  this.log("[%s] has been reported [%s].", accessory.displayName, accessory.context.reachableWAN ? "online" : "offline");
+                  this.devicesInHB.set(accessory.context.hbDeviceId, accessory);
+                  this.api.updatePlatformAccessories(constants.packageName, "eWeLink", [accessory]);
+                  if (accessory.context.reachableWAN) {
+                     this.wsClient.requestUpdate(accessory);
+                  }
+               }
+            } catch (e) {
+               this.log.warn("[%s] online/offline status could not be updated - [%s].", accessory.displayName, e);
+            }
+            if (this.devicesInHB.has(device.deviceid + "SW0")) {
+               let oAccessory;
+               for (let i = 1; i <= accessory.context.channelCount; i++) {
+                  try {
+                     if (this.devicesInHB.has(device.deviceid + "SW" + i)) {
+                        oAccessory = this.devicesInHB.get(device.deviceid + "SW" + i);
+                        oAccessory.context.reachableWAN = device.params.online;
+                        this.devicesInHB.set(oAccessory.context.hbDeviceId, oAccessory);
+                        this.api.updatePlatformAccessories(constants.packageName, "eWeLink", [oAccessory]);
+                     }
+                  } catch (e) {
+                     this.log.warn("[%s] online/offline status could not be updated - [%s].", oAccessory.displayName, e);
+                  }
+               }
+            }
+         }
+         break;
+      case "update":
+         let source = device.params.updateSource === "ws" ? "WS" : "LAN";
+         if (this.devicesInHB.has(device.deviceid + "SWX") || this.devicesInHB.has(device.deviceid + "SW0")) {
+            accessory = this.devicesInHB.get(device.deviceid + "SWX") || this.devicesInHB.get(device.deviceid + "SW0");
+            if (source === "ws" && !accessory.context.reachableWAN) {
+               accessory.context.reachableWAN = true;
+            }
+            if (source === "lan" && !accessory.context.reachableLAN) {
+               accessory.context.reachableLAN = true;
+            }
+            if (this.debug) {
+               this.log("[%s] externally updated from above %s message and will be refreshed.", accessory.displayName, source);
+            }
+            if (this.refreshAccessory(accessory, device.params)) {
+               return;
+            }
+            this.log.warn("[%s] cannot be refreshed. Please try removing accessory from the Homebridge cache along with any secondary devices (SW1, SW2, etc.). Debugging: [%s:%s:%s]", accessory.displayName, "refresh", accessory.context.type, accessory.context.channelCount);
+         } else if (this.customHideDvceFromHB.includes(device.deviceid)) {
+            this.log.warn("[%s] %s update is for hidden accessory.", device.deviceid, source);
+         } else {
+            this.log.warn("[%s] Accessory received via %s update does not exist in Homebridge. If it's a new accessory please restart Homebridge so it is added.", device.deviceid, source);
+         }
+         break;
+      }
+   }
+   internalValveUpdate(accessory, valve, value, callback) {
+      try {
+         if (!accessory.context.reachableWAN && !accessory.context.reachableLAN) {
+            throw "it is currently offline";
+         }
+         let params = {};
+         accessory.getService(valve)
+            .updateCharacteristic(Characteristic.Active, value)
+            .updateCharacteristic(Characteristic.InUse, value);
+         switch (value) {
+         case 0:
+            accessory.getService(valve).updateCharacteristic(Characteristic.RemainingDuration, 0);
+            clearTimeout(accessory.getService(valve).timer);
+            break;
+         case 1:
+            let timer = accessory.getService(valve).getCharacteristic(Characteristic.SetDuration).value;
+            accessory.getService(valve).updateCharacteristic(Characteristic.RemainingDuration, timer);
+            accessory.getService(valve).timer = setTimeout(() => {
+               accessory.getService(valve).setCharacteristic(Characteristic.Active, 0);
+            }, (timer * 1000));
+            break;
+         }
+         params.switches = this.devicesInEwe.get(accessory.context.eweDeviceId).params.switches;
+         switch (valve) {
+         case "Valve A":
+            params.switches[0].switch = value ? "on" : "off";
+            params.switches[1].switch = accessory.getService("Valve B").getCharacteristic(Characteristic.Active).value ? "on" : "off";
+            break;
+         case "Valve B":
+            params.switches[0].switch = accessory.getService("Valve A").getCharacteristic(Characteristic.Active).value ? "on" : "off";
+            params.switches[1].switch = value ? "on" : "off";
+            break;
+         default:
+            throw "unknown valve [" + valve + "]";
+         }
+         params.switches[2].switch = "off";
+         params.switches[3].switch = "off";
+         this.sendDeviceUpdate(accessory, params, callback);
+      } catch (err) {
+         let str = "[" + accessory.displayName + "] could not be updated as " + err + ".";
+         this.log.error(str);
+         callback(str);
+      }
+   }
+   internalBlindUpdate(accessory, value, callback) {
+      try {
+         if (!accessory.context.reachableWAN && !accessory.context.reachableLAN) {
+            throw "it is currently offline";
+         }
+         let blindConfig;
+         if (!(blindConfig = this.cusG.get(accessory.context.hbDeviceId))) {
+            throw "group config missing";
+         }
+         if (blindConfig.type !== "blind" || !["oneSwitch", "twoSwitch"].includes(blindConfig.setup)) {
+            throw "improper configuration";
+         }
+         let pSte, params = {};
+         value = value >= 50 ? 100 : 0;
+         pSte = accessory.getService(Service.WindowCovering).getCharacteristic(Characteristic.PositionState).value;
+         if (value === pSte * 100) {
+            accessory.getService(Service.WindowCovering)
+               .updateCharacteristic(Characteristic.TargetPosition, value)
+               .updateCharacteristic(Characteristic.PositionState, pSte);
+            callback();
+            return;
+         }
+         switch (blindConfig.setup) {
+         case "oneSwitch":
+            params.switch = "on";
+            break;
+         case "twoSwitch":
+            params.switches = this.devicesInEwe.get(accessory.context.eweDeviceId).params.switches;
+            params.switches[0].switch = value === 100 ? "on" : "off";
+            params.switches[1].switch = value === 0 ? "on" : "off";
+            break;
+         }
+         this.sendDeviceUpdate(accessory, params, function () {
+            return;
+         });
+         accessory.getService(Service.WindowCovering)
+            .updateCharacteristic(Characteristic.TargetPosition, value)
+            .updateCharacteristic(Characteristic.PositionState, (value / 100));
+         if (!blindConfig.inched || blindConfig.inched === "false") {
+            setTimeout(() => {
+               switch (blindConfig.setup) {
+               case "oneSwitch":
+                  params.switch = "off";
+                  break;
+               case "twoSwitch":
+                  params.switches[0].switch = "off";
+                  params.switches[1].switch = "off";
+                  break;
+               }
+               this.sendDeviceUpdate(accessory, params, function () {
+                  return;
+               });
+            }, 500);
+         }
+         setTimeout(() => {
+            accessory.getService(Service.WindowCovering)
+               .updateCharacteristic(Characteristic.CurrentPosition, value)
+               .updateCharacteristic(Characteristic.PositionState, 2);
+            callback();
+         }, parseInt(blindConfig.operationTime) * 100);
+      } catch (err) {
+         let str = "[" + accessory.displayName + "] could not be updated as " + err + ".";
+         this.log.error(str);
+         callback(str);
+      }
+   }
+   internalGarageUpdate(accessory, value, callback) {
+      try {
+         if (!accessory.context.reachableWAN && !accessory.context.reachableLAN) {
+            throw "it is currently offline";
+         }
+         let garageConfig;
+         if (!(garageConfig = this.cusG.get(accessory.context.hbDeviceId))) {
+            throw "group config missing";
+         }
+         if (garageConfig.type !== "garage" || !["oneSwitch", "twoSwitch"].includes(garageConfig.setup)) {
+            throw "improper configuration";
+         }
+         let sensorDefinition = garageConfig.sensorId || false,
+            sAccessory = false,
+            pSte,
+            params = {};
+         if (sensorDefinition && !(sAccessory = this.devicesInHB.get(garageConfig.sensorId + "SWX"))) {
+            throw "defined sensor doesn't exist";
+         }
+         this.log("[%s] has received request to [%s].", accessory.displayName, value === 0 ? "open" : "close");
+         pSte = sAccessory ?
+            sAccessory.getService(Service.ContactSensor).getCharacteristic(Characteristic.ContactSensorState).value === 0 ? 1 : 0 : [0, 2].includes(accessory.getService(Service.GarageDoorOpener).getCharacteristic(Characteristic.CurrentDoorState).value) ? 0 : 1;
+         if (value === pSte) {
+            accessory.getService(Service.GarageDoorOpener)
+               .updateCharacteristic(Characteristic.TargetDoorState, value)
+               .updateCharacteristic(Characteristic.CurrentDoorState, value);
+            callback();
+            return;
+         }
+         switch (garageConfig.setup) {
+         case "oneSwitch":
+            params.switch = "on";
+            break;
+         case "twoSwitch":
+            params.switches = this.devicesInEwe.get(accessory.context.eweDeviceId).params.switches;
+            params.switches[0].switch = value === 0 ? "on" : "off";
+            params.switches[1].switch = value === 1 ? "on" : "off";
+            break;
+         }
+         this.sendDeviceUpdate(accessory, params, function () {
+            return;
+         });
+         accessory.getService(Service.GarageDoorOpener)
+            .updateCharacteristic(Characteristic.TargetDoorState, value)
+            .updateCharacteristic(Characteristic.CurrentDoorState, value === 0 ? 2 : 3);
+         if (!garageConfig.inched || garageConfig.inched === "false") {
+            setTimeout(() => {
+               switch (garageConfig.setup) {
+               case "oneSwitch":
+                  params.switch = "off";
+                  break;
+               case "twoSwitch":
+                  params.switches[0].switch = "off";
+                  params.switches[1].switch = "off";
+                  break;
+               }
+               this.sendDeviceUpdate(accessory, params, function () {
+                  return;
+               });
+            }, 500);
+         }
+         if (!sAccessory) {
+            setTimeout(() => {
+               accessory.getService(Service.GarageDoorOpener)
+                  .updateCharacteristic(Characteristic.CurrentDoorState, value === 0 ? 0 : 1);
+               callback();
+            }, parseInt(garageConfig.operationTime) * 100);
+         } else {
+            callback();
+         }
+      } catch (err) {
+         let str = "[" + accessory.displayName + "] could not be updated as " + err + ".";
+         this.log.error(str);
+         callback(str);
+      }
+   }
+   internalFanUpdate(accessory, type, value, callback) {
+      try {
+         if (!accessory.context.reachableWAN && !accessory.context.reachableLAN) {
+            throw "it is currently offline";
+         }
+         let newPower, newSpeed, newLight;
+         switch (type) {
+         case "power":
+            newPower = value;
+            newSpeed = value ? 33 : 0;
+            newLight = accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On).value;
+            break;
+         case "speed":
+            newPower = value >= 33 ? 1 : 0;
+            newSpeed = value;
+            newLight = accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On).value;
+            break;
+         case "light":
+            newPower = accessory.getService(Service.Fanv2).getCharacteristic(Characteristic.Active).value;
+            newSpeed = accessory.getService(Service.Fanv2).getCharacteristic(Characteristic.RotationSpeed).value;
+            newLight = value;
+            break;
+         }
+         accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, newLight);
+         accessory.getService(Service.Fanv2)
+            .updateCharacteristic(Characteristic.Active, newPower)
+            .updateCharacteristic(Characteristic.RotationSpeed, newSpeed);
+         let params = {
+            switches: this.devicesInEwe.get(accessory.context.eweDeviceId).params.switches
+         };
+         params.switches[0].switch = newLight ? "on" : "off";
+         params.switches[1].switch = (newPower === 1 && newSpeed >= 33) ? "on" : "off";
+         params.switches[2].switch = (newPower === 1 && newSpeed >= 66 && newSpeed < 99) ? "on" : "off";
+         params.switches[3].switch = (newPower === 1 && newSpeed >= 99) ? "on" : "off";
+         if (this.debug) {
+            this.log.warn("Fan Update - setting " + type + " to " + value);
+            this.log("[%s] new stats: power [%s], speed [%s%], light [%s].", accessory.displayName, newPower, newSpeed, newLight);
+         }
+         this.sendDeviceUpdate(accessory, params, callback);
+      } catch (err) {
+         let str = "[" + accessory.displayName + "] could not be updated as " + err + ".";
+         this.log.error(str);
+         callback(str);
+      }
+   }
+   internalThermostatUpdate(accessory, value, callback) {
+      try {
+         if (!accessory.context.reachableWAN && !accessory.context.reachableLAN) {
+            throw "it is currently offline";
+         }
+         let params = {
+            switch: value ? "on" : "off",
+            mainSwitch: value ? "on" : "off"
+         };
+         if (this.debug) {
+            this.log("[%s] updating to turn [%s].", accessory.displayName, value ? "on" : "off");
+         }
+         accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, value);
+         this.sendDeviceUpdate(accessory, params, callback);
+      } catch (err) {
+         let str = "[" + accessory.displayName + "] could not be updated as " + err + ".";
+         this.log.error(str);
+         callback(str);
+      }
+   }
+   internalOutletUpdate(accessory, value, callback) {
+      try {
+         if (!accessory.context.reachableWAN && !accessory.context.reachableLAN) {
+            throw "it is currently offline";
+         }
+         let params = {
+            switch: value ? "on" : "off"
+         };
+         if (this.debug) {
+            this.log("[%s] requesting to turn [%s].", accessory.displayName, value ? "on" : "off");
+         }
+         accessory.getService(Service.Outlet).updateCharacteristic(Characteristic.On, value);
+         this.sendDeviceUpdate(accessory, params, callback);
+      } catch (err) {
+         callback("[" + accessory.displayName + "] " + err + ".");
+      }
+   }
+   internalUSBUpdate(accessory, value, callback) {
+      try {
+         if (!accessory.context.reachableWAN && !accessory.context.reachableLAN) {
+            throw "it is currently offline";
+         }
+         let params = {
+            switches: this.devicesInEwe.get(accessory.context.eweDeviceId).params.switches
+         };
+         params.switches[0].switch = value ? "on" : "off";
+         if (this.debug) {
+            this.log("[%s] requesting to turn [%s].", accessory.displayName, value ? "on" : "off");
+         }
+         accessory.getService(Service.Outlet).updateCharacteristic(Characteristic.On, value);
+         this.sendDeviceUpdate(accessory, params, callback);
+      } catch (err) {
+         callback("[" + accessory.displayName + "] " + err + ".");
+      }
+   }
+   internalSCMUpdate(accessory, value, callback) {
+      try {
+         if (!accessory.context.reachableWAN && !accessory.context.reachableLAN) {
+            throw "it is currently offline";
+         }
+         let params = {
+            switches: this.devicesInEwe.get(accessory.context.eweDeviceId).params.switches
+         };
+         params.switches[0].switch = value ? "on" : "off";
+         if (this.debug) {
+            this.log("[%s] requesting to turn [%s].", accessory.displayName, value ? "on" : "off");
+         }
+         accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, value);
+         this.sendDeviceUpdate(accessory, params, callback);
+      } catch (err) {
+         callback("[" + accessory.displayName + "] " + err + ".");
+      }
+   }
+   internalLightbulbUpdate(accessory, value, callback) {
+      try {
+         if (!accessory.context.reachableWAN && !accessory.context.reachableLAN) {
+            throw "it is currently offline";
+         }
+         let oAccessory, params = {};
+         switch (accessory.context.switchNumber) {
+         case "X":
+            if (accessory.context.eweUIID === 22) { //*** B1 ***\\
+               params.state = value ? "on" : "off";
+            } else {
+               params.switch = value ? "on" : "off";
+            }
+            if (this.debug) {
+               this.log("[%s] updating to turn [%s].", accessory.displayName, value ? "on" : "off");
+            }
+            accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, value);
+            break;
+         case "0":
+            params.switches = this.devicesInEwe.get(accessory.context.eweDeviceId).params.switches;
+            params.switches[0].switch = value ? "on" : "off";
+            params.switches[1].switch = value ? "on" : "off";
+            params.switches[2].switch = value ? "on" : "off";
+            params.switches[3].switch = value ? "on" : "off";
+            if (this.debug) {
+               this.log("[%s] updating to turn group [%s].", accessory.displayName, value ? "on" : "off");
+            }
+            accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, value);
+            for (let i = 1; i <= 4; i++) {
+               if (this.devicesInHB.has(accessory.context.eweDeviceId + "SW" + i)) {
+                  oAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW" + i);
+                  oAccessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, value);
+               }
+            }
+            break;
+         case "1":
+         case "2":
+         case "3":
+         case "4":
+            if (this.debug) {
+               this.log("[%s] updating to turn [%s].", accessory.displayName, value ? "on" : "off");
+            }
+            accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, value);
+            let tAccessory,
+               masterState = "off";
+            params.switches = this.devicesInEwe.get(accessory.context.eweDeviceId).params.switches;
+            for (let i = 1; i <= 4; i++) {
+               if ((tAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW" + i))) {
+                  i === parseInt(accessory.context.switchNumber) ?
+                     params.switches[i - 1].switch = value ? "on" : "off" :
+                     params.switches[i - 1].switch = tAccessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On).value ? "on" : "off";
+                  if (tAccessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On).value) {
+                     masterState = "on";
+                  }
+               } else {
+                  params.switches[i - 1].switch = "off";
+               }
+            }
+            oAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW0");
+            oAccessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, masterState === "on");
+            break;
+         default:
+            throw "unknown switch number [" + accessory.context.switchNumber + "]";
+         }
+         this.sendDeviceUpdate(accessory, params, callback);
+      } catch (err) {
+         let str = "[" + accessory.displayName + "] could not be updated as " + err + ".";
+         this.log.error(str);
+         callback(str);
+      }
+   }
+   internalBrightnessUpdate(accessory, value, callback) {
+      try {
+         if (!accessory.context.reachableWAN && !accessory.context.reachableLAN) {
+            throw "it is currently offline";
+         }
+         let params = {};
+         if (value === 0) {
+            params.switch = "off";
+            accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, false);
+         } else {
+            if (!accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On).value) {
+               params.switch = "on";
+            }
+            switch (accessory.context.eweUIID) {
+            case 36: //*** KING-M4 ***\\
+               params.bright = Math.round(value * 9 / 10 + 10);
+               break;
+            case 44: //*** D1 ***\\
+               params.brightness = value;
+               params.mode = 0;
+               break;
+            default:
+               throw "unknown device UIID";
+            }
+            accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.Brightness, value);
+         }
+         if (this.debug) {
+            this.log("[%s] updating brightness to [%s%].", accessory.displayName, value);
+         }
+         setTimeout(() => {
+            this.sendDeviceUpdate(accessory, params, callback);
+         }, 250);
+      } catch (err) {
+         let str = "[" + accessory.displayName + "] could not be updated as " + err + ".";
+         this.log.error(str);
+         callback(str);
+      }
+   }
+   internalHSBUpdate(accessory, type, value, callback) {
+      try {
+         if (!accessory.context.reachableWAN && !accessory.context.reachableLAN) {
+            throw "it is currently offline";
+         }
+         let newRGB,
+            params = {},
+            curHue = accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.Hue).value,
+            curSat = accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.Saturation).value;
+         switch (type) {
+         case "hue":
+            newRGB = convert.hsv.rgb(value, curSat, 100);
+            switch (accessory.context.eweUIID) {
+            case 22: //*** B1 ***\\
+               params = {
+                  zyx_mode: 2,
+                  type: "middle",
+                  channel0: "0",
+                  channel1: "0",
+                  channel2: newRGB[0].toString(),
+                  channel3: newRGB[1].toString(),
+                  channel4: newRGB[2].toString()
+               };
+               break;
+            case 59: //*** L1 ***\\
+               params = {
+                  mode: 1,
+                  colorR: newRGB[0],
+                  colorG: newRGB[1],
+                  colorB: newRGB[2]
+               };
+               break;
+            default:
+               throw "unknown device UIID";
+            }
+            if (this.debug) {
+               this.log("[%s] updating hue to [%s°].", accessory.displayName, value);
+            }
+            accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.Hue, value);
+            break;
+         case "bri":
+            switch (accessory.context.eweUIID) {
+            case 22: //*** B1 ***\\
+               newRGB = convert.hsv.rgb(curHue, curSat, value);
+               params = {
+                  zyx_mode: 2,
+                  type: "middle",
+                  channel0: "0",
+                  channel1: "0",
+                  channel2: newRGB[0].toString(),
+                  channel3: newRGB[1].toString(),
+                  channel4: newRGB[2].toString()
+               };
+               break;
+            case 59: //*** L1 ***\\
+               params = {
+                  mode: 1,
+                  bright: value
+               };
+               break;
+            }
+            if (this.debug) {
+               this.log("[%s] updating brightness to [%s%].", accessory.displayName, value);
+            }
+            accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.Brightness, value);
+            break;
+         default:
+            throw "unknown device UIID";
+         }
+         setTimeout(() => {
+            this.sendDeviceUpdate(accessory, params, callback);
+         }, 250);
+      } catch (err) {
+         let str = "[" + accessory.displayName + "] could not be updated as " + err + ".";
+         this.log.error(str);
+         callback(str);
+      }
+   }
+   internalSwitchUpdate(accessory, value, callback) {
+      try {
+         if (!accessory.context.reachableWAN && !accessory.context.reachableLAN) {
+            throw "it is currently offline";
+         }
+         let oAccessory, params = {};
+         switch (accessory.context.switchNumber) {
+         case "X":
+            params.switch = value ? "on" : "off";
+            if (this.debug) {
+               this.log("[%s] updating to turn [%s].", accessory.displayName, value ? "on" : "off");
+            }
+            accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, value);
+            break;
+         case "0":
+            params.switches = this.devicesInEwe.get(accessory.context.eweDeviceId).params.switches;
+            params.switches[0].switch = value ? "on" : "off";
+            params.switches[1].switch = value ? "on" : "off";
+            params.switches[2].switch = value ? "on" : "off";
+            params.switches[3].switch = value ? "on" : "off";
+            if (this.debug) {
+               this.log("[%s] updating to turn group [%s].", accessory.displayName, value ? "on" : "off");
+            }
+            accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, value);
+            for (let i = 1; i <= 4; i++) {
+               if (this.devicesInHB.has(accessory.context.eweDeviceId + "SW" + i)) {
+                  oAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW" + i);
+                  oAccessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, value);
+               }
+            }
+            break;
+         case "1":
+         case "2":
+         case "3":
+         case "4":
+            if (this.debug) {
+               this.log("[%s] updating to turn [%s].", accessory.displayName, value ? "on" : "off");
+            }
+            accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, value);
+            let tAccessory,
+               masterState = "off";
+            params.switches = this.devicesInEwe.get(accessory.context.eweDeviceId).params.switches;
+            for (let i = 1; i <= 4; i++) {
+               if ((tAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW" + i))) {
+                  i === parseInt(accessory.context.switchNumber) ?
+                     params.switches[i - 1].switch = value ? "on" : "off" :
+                     params.switches[i - 1].switch = tAccessory.getService(Service.Switch).getCharacteristic(Characteristic.On).value ? "on" : "off";
+                  if (tAccessory.getService(Service.Switch).getCharacteristic(Characteristic.On).value) {
+                     masterState = "on";
+                  }
+               } else {
+                  params.switches[i - 1].switch = "off";
+               }
+            }
+            oAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW0");
+            oAccessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, masterState === "on");
+            break;
+         default:
+            throw "unknown switch number [" + accessory.context.switchNumber + "]";
+         }
+         this.sendDeviceUpdate(accessory, params, callback);
+      } catch (err) {
+         let str = "[" + accessory.displayName + "] could not be updated as " + err + ".";
+         this.log.error(str);
+         callback(str);
+      }
+   }
+   externalValveUpdate(accessory, params) {
+      try {
+         ["A", "B"].forEach((v, k) => {
+            accessory.getService("Valve " + v)
+               .updateCharacteristic(Characteristic.Active, params.switches[k].switch === "on")
+               .updateCharacteristic(Characteristic.InUse, params.switches[k].switch === "on");
+            if (params.switches[k].switch === "on") {
+               let timer = accessory.getService("Valve " + v).getCharacteristic(Characteristic.SetDuration).value;
+               accessory.getService("Valve " + v).updateCharacteristic(Characteristic.RemainingDuration, timer);
+               accessory.getService("Valve " + v).timer = setTimeout(() => {
+                  accessory.getService("Valve " + v).setCharacteristic(Characteristic.Active, 0);
+               }, (timer * 1000));
+            } else {
+               accessory.getService("Valve " + v).updateCharacteristic(Characteristic.RemainingDuration, 0);
+               clearTimeout(accessory.getService("Valve " + v).timer);
+            }
+         });
+      } catch (err) {
+         this.log.warn("[%s] could not be updated - [%s].", accessory.displayName, err);
+      }
+   }
+   internalRFDeviceUpdate(accessory, value, callback) {
+      try {
+         if (!accessory.context.reachableWAN && !accessory.context.reachableLAN) {
+            throw "it is currently offline";
+         }
+         let params = {
+            cmd: "transmit",
+            rfChl: accessory.context.rfChl
+         };
+         if (this.debug) {
+            this.log("[%s] mimicking RF button press.", accessory.displayName);
+         }
+         accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, true);
+         this.sendDeviceUpdate(accessory, params, callback);
+         setTimeout(() => {
+            accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, false);
+         }, 500);
+      } catch (err) {
+         let str = "[" + accessory.displayName + "] could not be updated as " + err + ".";
+         this.log.error(str);
+         callback(str);
+      }
+   }
+   externalBlindUpdate(accessory, params) {
+      try {
+         let blindConfig, nSte;
+         if (!(blindConfig = this.cusG.get(accessory.context.hbDeviceId))) {
+            throw "group config missing";
+         }
+         if (blindConfig.type !== "blind" || ["oneSwitch", "twoSwitch"].includes(blindConfig.setup)) {
+            throw "improper configuration";
+         }
+         switch (blindConfig.setup) {
+         case "oneSwitch":
+            if (params.switch === "off") {
+               return;
+            }
+            nSte = accessory.getService(Service.WindowCovering).getCharacteristic(Characteristic.PositionState).value === 0 ? 1 : 0;
+            break;
+         case "twoSwitch":
+            if (params.switches[0].switch === "off" && params.switches[1].switch === "off") {
+               return;
+            }
+            let switchUp = params.switches[0].switch === "on" ? -1 : 0, // matrix of numbers to get
+               switchDown = params.switches[1].switch === "on" ? 0 : 2; // ... the correct HomeKit value
+            nSte = switchUp + switchDown;
+            break;
+         }
+         accessory.getService(Service.WindowCovering)
+            .updateCharacteristic(Characteristic.PositionState, nSte)
+            .updateCharacteristic(Characteristic.TargetPosition, nSte * 100);
+         setTimeout(() => {
+            accessory.getService(Service.WindowCovering)
+               .updateCharacteristic(Characteristic.PositionState, 2)
+               .updateCharacteristic(Characteristic.CurrentPosition, nSte * 100);
+         }, parseInt(blindConfig.operationTime) * 100);
+      } catch (err) {
+         this.log.warn("[%s] could not be updated - [%s].", accessory.displayName, err);
+      }
+   }
+   externalGarageUpdate(accessory, params) {
+      try {
+         let garageConfig, nSte;
+         if (!(garageConfig = this.cusG.get(accessory.context.hbDeviceId))) {
+            throw "group config missing";
+         }
+         if (garageConfig.type !== "garage" || !["oneSwitch", "twoSwitch"].includes(garageConfig.setup)) {
+            throw "improper configuration";
+         }
+         switch (garageConfig.setup) {
+         case "oneSwitch":
+            if (params.switch === "off" || garageConfig.sensorId) {
+               return;
+            }
+            nSte = [0, 2].includes(accessory.getService(Service.GarageDoorOpener).getCharacteristic(Characteristic.CurrentDoorState).value) ? 3 : 2;
+            break;
+         case "twoSwitch":
+            if (params.switches[0].switch === "off" && params.switches[1].switch === "off") {
+               return;
+            }
+            // @TODO twoSwitch garage external update
+            return;
+         }
+         if (garageConfig.setup !== "oneSwitch" || !garageConfig.sensorId) {
+            accessory.getService(Service.GarageDoorOpener)
+               .updateCharacteristic(Characteristic.CurrentDoorState, nSte)
+               .updateCharacteristic(Characteristic.TargetDoorState, nSte - 2);
+            setTimeout(() => {
+               accessory.getService(Service.GarageDoorOpener)
+                  .updateCharacteristic(Characteristic.CurrentDoorState, nSte - 2);
+            }, parseInt(garageConfig.operationTime) * 100);
+         }
+      } catch (err) {
+         this.log.warn("[%s] could not be updated - [%s].", accessory.displayName, err);
+      }
+   }
+   externalSensorUpdate(accessory, params) {
+      try {
+         let oldState = accessory.getService(Service.ContactSensor).getCharacteristic(Characteristic.ContactSensorState).value,
+            newState = params.switch === "on" ? 1 : 0,
+            oAccessory = false;
+            accessory.getService(Service.ContactSensor).updateCharacteristic(Characteristic.ContactSensorState, newState);
+         this.log("[%s] sent update that it was [%s] and is now [%s].", accessory.displayName, oldState ? "apart" : "joined", newState ? "apart" : "joined");
+         this.cusG.forEach(group => {
+            if (group.sensorId === accessory.context.eweDeviceId && group.type === "garage") {
+               if ((oAccessory = this.devicesInHB.get(group.deviceId + "SWX"))) {
+                  switch (newState) {
+                  case 0:
+                     oAccessory.getService(Service.GarageDoorOpener)
+                        .updateCharacteristic(Characteristic.TargetDoorState, 1)
+                        .updateCharacteristic(Characteristic.CurrentDoorState, 1);
+                     this.log("[%s] updating to [closed] based on sensor.", oAccessory.displayName);
+                     break;
+                  case 1:
+                     setTimeout(() => {
+                        oAccessory.getService(Service.GarageDoorOpener)
+                           .updateCharacteristic(Characteristic.TargetDoorState, 0)
+                           .updateCharacteristic(Characteristic.CurrentDoorState, 0);
+                        this.log("[%s] updating to [open] based on sensor.", oAccessory.displayName);
+                     }, group.operationTime * 100);
+                     break;
+                  default:
+                     throw "unknown sensor status received";
+                  }
+               }
+            }
+         });
+      } catch (err) {
+         this.log.warn("[%s] could not be updated - [%s].", accessory.displayName, err);
+      }
+   }
+   externalFanUpdate(accessory, params) {
+      try {
+         let light, status, speed;
+         if (Array.isArray(params.switches)) {
+            light = params.switches[0].switch === "on";
+            switch (params.switches[1].switch+params.switches[2].switch+params.switches[3].switch) {
+            default:
+               status = 0;
+               speed = 0;
+               break;
+            case "onoffoff":
+               status = 1;
+               speed = 33;
+               break;
+            case "ononoff":
+               status = 1;
+               speed = 66;
+               break;
+            case "onoffon":
+               status = 1;
+               speed = 99;
+            }
+         } else if (params.hasOwnProperty("light") && params.hasOwnProperty("fan") && params.hasOwnProperty("speed")) {
+            light = params.light === "on";
+            status = params.fan === "on" ? 1 : 0;
+            speed = params.speed * 33 * status;
+         } else {
+            throw "unknown parameters received";
+         }
+         accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, light);
+         accessory.getService(Service.Fanv2)
+            .updateCharacteristic(Characteristic.Active, status)
+            .updateCharacteristic(Characteristic.RotationSpeed, speed);
+      } catch (err) {
+         this.log.warn("[%s] could not be updated - [%s].", accessory.displayName, err);
+      }
+   }
+   externalThermostatUpdate(accessory, params) {
+      try {
+         if (params.hasOwnProperty("switch") || params.hasOwnProperty("mainSwitch")) {
+            let newState = params.hasOwnProperty("switch") ? params.switch === "on" : params.mainSwitch === "on";
+            accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, newState);
+         }
+         if (params.hasOwnProperty("currentTemperature") && accessory.getService(Service.TemperatureSensor)) {
+            let currentTemp = params.currentTemperature !== "unavailable" ? params.currentTemperature : 0;
+            accessory.getService(Service.TemperatureSensor).updateCharacteristic(Characteristic.CurrentTemperature, currentTemp);
+         }
+         if (params.hasOwnProperty("currentHumidity") && accessory.getService(Service.HumiditySensor)) {
+            let currentHumi = params.currentHumidity !== "unavailable" ? params.currentHumidity : 0;
+            accessory.getService(Service.HumiditySensor).updateCharacteristic(Characteristic.CurrentRelativeHumidity, currentHumi);
+         }
+      } catch (err) {
+         this.log.warn("[%s] could not be updated - [%s].", accessory.displayName, err);
+      }
+   }
+   externalOutletUpdate(accessory, params) {
+      try {
+         accessory.getService(Service.Outlet).updateCharacteristic(Characteristic.On, params.switch === "on");
+      } catch (err) {
+         this.log.warn("[%s] could not be updated - [%s].", accessory.displayName, err);
+      }
+   }
+   externalUSBUpdate(accessory, params) {
+      try {
+         accessory.getService(Service.Outlet).updateCharacteristic(Characteristic.On, params.switches[0].switch === "on");
+      } catch (err) {
+         this.log.warn("[%s] could not be updated - [%s].", accessory.displayName, err);
+      }
+   }
+   externalSCMUpdate(accessory, params) {
+      try {
+         accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, params.switches[0].switch === "on");
+      } catch (err) {
+         this.log.warn("[%s] could not be updated - [%s].", accessory.displayName, err);
+      }
+   }
+   externalSingleLightUpdate(accessory, params) {
+      try {
+         let newColour, mode, isOn = false;
+         if (accessory.context.eweUIID === 22 && params.hasOwnProperty("state")) {
+            isOn = params.state === "on";
+         } else if (accessory.context.eweUIID !== 22 && params.hasOwnProperty("switch")) {
+            isOn = params.switch === "on";
+         } else {
+            isOn = accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On).value;
+         }
+         if (isOn) {
+            accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, true);
+            switch (accessory.context.eweUIID) {
+            case 36: // KING-M4
+               if (params.hasOwnProperty("bright")) {
+                  let nb = Math.round((params.bright - 10) * 10 / 9); // eWeLink scale is 10-100 and HomeKit scale is 0-100.
+                  accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.Brightness, nb);
+               }
+               break;
+            case 44: // D1
+               if (params.hasOwnProperty("brightness")) {
+                  accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.Brightness, params.brightness);
+               }
+               break;
+            case 22: // B1
+               if (params.hasOwnProperty("zyx_mode")) {
+                  mode = parseInt(params.zyx_mode);
+               } else if (params.hasOwnProperty("channel0") && (parseInt(params.channel0) + parseInt(params.channel1) > 0)) {
+                  mode = 1;
+               } else {
+                  mode = 2;
+               }
+               if (mode === 2) {
+                  accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, true);
+                  newColour = convert.rgb.hsv(parseInt(params.channel2), parseInt(params.channel3), parseInt(params.channel4));
+                  accessory.getService(Service.Lightbulb)
+                     .updateCharacteristic(Characteristic.Hue, newColour[0])
+                     .updateCharacteristic(Characteristic.Saturation, 100)
+                     .updateCharacteristic(Characteristic.Brightness, 100);
+               } else if (mode === 1) {
+                  throw "has been set to white mode which is not supported";
+               }
+               break;
+            case 59: // L1
+               if (params.hasOwnProperty("bright")) {
+                  accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.Brightness, params.bright);
+               }
+               if (params.hasOwnProperty("colorR")) {
+                  newColour = convert.rgb.hsv(params.colorR, params.colorG, params.colorB);
+                  accessory.getService(Service.Lightbulb)
+                     .updateCharacteristic(Characteristic.Hue, newColour[0])
+                     .updateCharacteristic(Characteristic.Saturation, newColour[1]);
+               }
+               break;
+            default:
+               return;
+            }
+         } else {
+            accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, false);
+         }
+      } catch (err) {
+         this.log.warn("[%s] could not be updated - [%s].", accessory.displayName, err);
+      }
+   }
+   externalMultiLightUpdate(accessory, params) {
+      try {
+         let idToCheck = accessory.context.hbDeviceId.slice(0, -1),
+            primaryState = false;
+         for (let i = 1; i <= accessory.context.channelCount; i++) {
+            if (this.devicesInHB.has(idToCheck + i)) {
+               let oAccessory = this.devicesInHB.get(idToCheck + i);
+               oAccessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, params.switches[i - 1].switch === "on");
+               if (params.switches[i - 1].switch === "on") {
+                  primaryState = true;
+               }
+            }
+         }
+         accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, primaryState);
+      } catch (err) {
+         this.log.warn("[%s] could not be updated - [%s].", accessory.displayName, err);
+      }
+   }
+   externalSingleSwitchUpdate(accessory, params) {
+      try {
+         accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, params.switch === "on");
+      } catch (err) {
+         this.log.warn("[%s] could not be updated - [%s].", accessory.displayName, err);
+      }
+   }
+   externalMultiSwitchUpdate(accessory, params) {
+      try {
+         let idToCheck = accessory.context.hbDeviceId.slice(0, -1),
+            primaryState = false;
+         for (let i = 1; i <= accessory.context.channelCount; i++) {
+            if (this.devicesInHB.has(idToCheck + i)) {
+               let oAccessory = this.devicesInHB.get(idToCheck + i);
+               oAccessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, params.switches[i - 1].switch === "on");
+               if (params.switches[i - 1].switch === "on") {
+                  primaryState = true;
+               }
+            }
+         }
+         accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, primaryState);
+      } catch (err) {
+         this.log.warn("[%s] could not be updated - [%s].", accessory.displayName, err);
+      }
+   }
+   externalRFDeviceUpdate(accessory, params) {
+      try {
+         let idToCheck = accessory.context.hbDeviceId.slice(0, -1),
+            timeNow = new Date();
+         if (params.hasOwnProperty("cmd") && params.cmd === "transmit" && params.hasOwnProperty("rfChl")) { // RF Button
+            let bAccessory;
+            if ((bAccessory = this.devicesInHB.get(idToCheck + (params.rfChl + 1)))) {
+               bAccessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, 1);
+               setTimeout(() => {
+                  bAccessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, 0);
+               }, 500);
+            } else {
+               throw "rf button not found in Homebridge";
+            }
+            return;
+         } // else RF Sensor
+         for (let i = 1; i <= accessory.context.channelCount; i++) {
+            if (this.devicesInHB.has(idToCheck + i)) {
+               let oAccessory = this.devicesInHB.get(idToCheck + i);
+               if (params.hasOwnProperty("rfTrig" + (i - 1))) {
+                  let timeOfMotion = new Date(params["rfTrig" + (i - 1)]),
+                     timeDifference = (timeNow.getTime() - timeOfMotion.getTime()) / 1000;
+                  if (timeDifference < this.sensorTimeDifference) {
+                     switch (oAccessory.context.sensorType) {
+                     case "button":
+                        break;
+                     case "water":
+                        oAccessory.getService(Service.LeakSensor).updateCharacteristic(Characteristic.LeakDetected, 1);
+                        break;
+                     case "fire":
+                     case "smoke":
+                        oAccessory.getService(Service.SmokeSensor).updateCharacteristic(Characteristic.SmokeDetected, 1);
+                        break;
+                     case "co":
+                        oAccessory.getService(Service.CarbonMonoxideSensor).updateCharacteristic(Characteristic.CarbonMonoxideDetected, 1);
+                        break;
+                     case "co2":
+                        oAccessory.getService(Service.CarbonDioxideSensor).updateCharacteristic(Characteristic.CarbonDioxideDetected, 1);
+                        break;
+                     case "contact":
+                        oAccessory.getService(Service.ContactSensor).updateCharacteristic(Characteristic.ContactSensorState, 1);
+                        break;
+                     case "occupancy":
+                        oAccessory.getService(Service.OccupancySensor).updateCharacteristic(Characteristic.OccupancyDetected, 1);
+                        break;
+                     case "motion":
+                     default:
+                        oAccessory.getService(Service.MotionSensor).updateCharacteristic(Characteristic.MotionDetected, true);
+                        break;
+                     }
+                     if (this.debug) {
+                        this.log("[%s] has detected [%s].", oAccessory.displayName, oAccessory.context.sensorType);
+                     }
+                  }
+               }
+            }
+         }
+         setTimeout(() => {
+            for (let i = 1; i <= accessory.context.channelCount; i++) {
+               if (this.devicesInHB.has(idToCheck + i)) {
+                  let oAccessory = this.devicesInHB.get(idToCheck + i);
+                  switch (oAccessory.context.sensorType) {
+                  case "button":
+                     break;
+                  case "water":
+                     oAccessory.getService(Service.LeakSensor).updateCharacteristic(Characteristic.LeakDetected, 0);
+                     break;
+                  case "fire":
+                  case "smoke":
+                     oAccessory.getService(Service.SmokeSensor).updateCharacteristic(Characteristic.SmokeDetected, 0);
+                     break;
+                  case "co":
+                     oAccessory.getService(Service.CarbonMonoxideSensor).updateCharacteristic(Characteristic.CarbonMonoxideDetected, 0);
+                     break;
+                  case "co2":
+                     oAccessory.getService(Service.CarbonDioxideSensor).updateCharacteristic(Characteristic.CarbonDioxideDetected, 0);
+                     break;
+                  case "contact":
+                     oAccessory.getService(Service.ContactSensor).updateCharacteristic(Characteristic.ContactSensorState, 0);
+                     break;
+                  case "occupancy":
+                     oAccessory.getService(Service.OccupancySensor).updateCharacteristic(Characteristic.OccupancyDetected, 0);
+                     break;
+                  case "motion":
+                  default:
+                     oAccessory.getService(Service.MotionSensor).updateCharacteristic(Characteristic.MotionDetected, false);
+                     break;
+                  }
+               }
+            }
+         }, this.sensorTimeLength * 1000);
+      } catch (err) {
+         this.log.warn("[%s] could not be updated - [%s].", accessory.displayName, err);
+      }
+   }
+   externalZBDeviceUpdate(accessory, params) {
+      try {
+         switch (accessory.context.eweUIID) {
+         case 1000:
+            if (params.hasOwnProperty("key")) {
+               if ([0, 1, 2].includes(params.key)) {
+                  accessory.getService(Service.StatelessProgrammableSwitch).updateCharacteristic(Characteristic.ProgrammableSwitchEvent, params.key); //*** credit @tasict ***\\
+               } else {
+                  throw "unknown 'key' parameter received [" + params.key + "]";
+               }
+            }
+            break;
+         case 1770:
+            if (params.hasOwnProperty("temperature")) {
+               let currentTemp = parseInt(params.temperature) / 100;
+               accessory.getService(Service.TemperatureSensor).updateCharacteristic(Characteristic.CurrentTemperature, currentTemp);
+            }
+            if (params.hasOwnProperty("humidity")) {
+               let currentHumi = parseInt(params.humidity) / 100;
+               accessory.getService(Service.HumiditySensor).updateCharacteristic(Characteristic.CurrentRelativeHumidity, currentHumi);
+            }
+            break;
+         case 2026:
+            if (params.hasOwnProperty("motion")) {
+               if ([0, 1].includes(params.lock)) {
+                  accessory.getService(Service.MotionSensor).updateCharacteristic(Characteristic.MotionDetected, params.motion);
+               } else {
+                  throw "unknown 'motion' parameter received [" + params.motion + "]";
+               }
+            }
+            break;
+         case 3026:
+            if (params.hasOwnProperty("lock")) {
+               if ([0, 1].includes(params.lock)) {
+                  accessory.getService(Service.ContactSensor).updateCharacteristic(Characteristic.ContactSensorState, params.lock);
+               } else {
+                  throw "unknown 'lock' parameter received [" + params.lock + "]";
+               }
+            }
+            break;
+         default:
+            throw "unsupported zigbee device type";
+         }
+      } catch (err) {
+         this.log.warn("[%s] could not be updated - [%s].", accessory.displayName, err);
+      }
+   }
+}
+module.exports = function (homebridge) {
+   Accessory = homebridge.platformAccessory;
+   Service = homebridge.hap.Service;
+   Characteristic = homebridge.hap.Characteristic;
+   UUIDGen = homebridge.hap.uuid;
+   return eWeLink;
+};
\ No newline at end of file
diff --git a/lib/eWeLinkHTTP.js b/lib/eWeLinkHTTP.js
new file mode 100644
index 00000000..f6c0c71d
--- /dev/null
+++ b/lib/eWeLinkHTTP.js
@@ -0,0 +1,158 @@
+/* jshint esversion: 9, -W030, node: true */
+"use strict";
+const axios = require("axios");
+const constants = require("./constants");
+const crypto = require("crypto");
+module.exports = class eWeLinkHTTP {
+   constructor(config, log) {
+      this.config = config;
+      this.log = log;
+      this.debug = this.config.debug || false;
+      this.debugReqRes = this.config.debugReqRes || false;
+   }
+   login() {
+      let data = {
+         countryCode: "+" + this.config.countryCode.toString().replace("+", "").replace(" ", ""),
+         password: this.config.password
+      };
+      this.config.username.includes("@") ?
+         data.email = this.config.username :
+         data.phoneNumber = this.config.username;
+      if (this.debugReqRes) {
+         let msg = JSON.stringify(data, null, 2).replace(this.config.password, "**hidden**").replace(this.config.username, "**hidden**");
+         this.log.warn("Sending HTTP login request. This text is yellow for clarity.\n%s", msg);
+      } else if (this.debug) {
+         this.log("Sending HTTP login request.");
+      }
+      let dataToSign = crypto.createHmac("sha256", "6Nz4n0xA8s8qdxQf2GqurZj2Fs55FUvM").update(JSON.stringify(data)).digest("base64");
+      return new Promise((resolve, reject) => {
+         axios({
+            url: "https://" + this.httpHost + "/v2/user/login",
+            method: "post",
+            headers: {
+               Authorization: "Sign " + dataToSign,
+               "Content-Type": "application/json",
+               Host: this.httpHost,
+               "X-CK-Appid": constants.appId,
+               "X-CK-Nonce": Math.random().toString(36).substr(2, 8)
+            },
+            data
+         }).then(res => {
+            let body = res.data;
+            if (body.hasOwnProperty("error") && body.error === 10004 && body.hasOwnProperty("data") && body.data.hasOwnProperty("region")) {
+               switch (body.data.region) {
+               case "eu":
+               case "us":
+               case "as":
+                  this.httpHost = body.data.region + "-apia.coolkit.cc";
+                  break;
+               case "cn":
+                  this.httpHost = "cn-apia.coolkit.cn";
+                  break;
+               default:
+                  throw "No valid region received - [" + body.data.region + "].";
+               }
+               if (this.debug) {
+                  this.log("New HTTP API host received [%s].", this.httpHost);
+               }
+               resolve(this.login());
+               return;
+            }
+            if (!body.data.at) {
+               throw "Server did not respond with an authentication token. Please double check your eWeLink username and password in the Homebridge configuration.\n" + JSON.stringify(body, null, 2);
+            }
+            this.aToken = body.data.at;
+            this.apiKey = body.data.user.apikey;
+            resolve({
+               aToken: body.data.at,
+               apiKey: body.data.user.apikey,
+               httpHost: this.httpHost
+            });
+         }).catch(err => {
+            reject(err);
+         });
+      });
+   }
+   getHost() {
+      let data = {
+            appid: constants.appId,
+            country_code: this.config.countryCode.toString().replace("+", "").replace(" ", ""),
+            nonce: Math.random().toString(36).substr(2, 8),
+            ts: Math.floor(new Date().getTime() / 1000),
+            version: 8
+         },
+         dataToSign = [];
+      Object.keys(data).forEach(function (key) {
+         dataToSign.push({
+            key: key,
+            value: data[key]
+         });
+      });
+      dataToSign.sort(function (a, b) {
+         return a.key < b.key ? -1 : 1;
+      });
+      dataToSign = dataToSign.map(function (kv) {
+         return kv.key + "=" + kv.value;
+      }).join("&");
+      dataToSign = crypto.createHmac("sha256", "6Nz4n0xA8s8qdxQf2GqurZj2Fs55FUvM").update(dataToSign).digest("base64");
+      return new Promise((resolve, reject) => {
+         axios.get("https://api.coolkit.cc:8080/api/user/region", {
+            headers: {
+               Authorization: "Sign " + dataToSign,
+               "Content-Type": "application/json"
+            },
+            params: data
+         }).then(res => {
+            let body = res.data;
+            if (!body.region) {
+               throw "Server did not respond with a region.\n" + JSON.stringify(body, null, 2);
+            }
+            switch (body.region) {
+            case "eu":
+            case "us":
+            case "as":
+               this.httpHost = body.region + "-apia.coolkit.cc";
+               break;
+            case "cn":
+               this.httpHost = "cn-apia.coolkit.cn";
+               break;
+            default:
+               throw "No valid region received - [" + body.region + "].";
+            }
+            if (this.debug) {
+               this.log("HTTP API host received [%s].", this.httpHost);
+            }
+            resolve(this.httpHost);
+         }).catch(err => {
+            reject(err);
+         });
+      });
+   }
+   getDevices() {
+      return new Promise((resolve, reject) => {
+         axios.get("https://" + this.httpHost + "/v2/device/thing", {
+            headers: {
+               Authorization: "Bearer " + this.aToken,
+               "Content-Type": "application/json",
+               Host: this.httpHost,
+               "X-CK-Appid": constants.appId,
+               "X-CK-Nonce": Math.random().toString(36).substr(2, 8)
+            }
+         }).then(res => {
+            let body = res.data;
+            if (!body.hasOwnProperty("error") || (body.hasOwnProperty("error") && body.error !== 0)) {
+               throw JSON.stringify(body, null, 2);
+            }
+            let deviceList = [];
+            if (body.data.thingList && body.data.thingList.length > 0) {
+               body.data.thingList.forEach(device => {
+                  deviceList.push(device.itemData);
+               });
+            }
+            resolve(deviceList);
+         }).catch(err => {
+            reject(err);
+         });
+      });
+   }
+};
\ No newline at end of file
diff --git a/lib/eWeLinkLAN.js b/lib/eWeLinkLAN.js
new file mode 100644
index 00000000..9146dbe7
--- /dev/null
+++ b/lib/eWeLinkLAN.js
@@ -0,0 +1,157 @@
+/* jshint esversion: 9, -W030, node: true */
+"use strict";
+const axios = require("axios");
+const constants = require("./constants");
+const crypto = require("crypto");
+const dns = require("node-dns-sd");
+const eventemitter = require("events");
+module.exports = class eWeLinkLAN {
+   constructor(config, log, devices) {
+      this.config = config;
+      this.log = log;
+      this.devices = devices;
+      let deviceMap = {};
+      devices.forEach(device => {
+         deviceMap[device.deviceid] = {
+            apiKey: device.devicekey,
+            ip: false
+         };
+      });
+      this.deviceMap = deviceMap;
+      this.debug = this.config.debug || false;
+      this.debugReqRes = this.config.debugReqRes || false;
+      this.emitter = new eventemitter();
+   }
+   getHosts() {
+      return new Promise((resolve, reject) => {
+         dns.discover({
+            name: "_ewelink._tcp.local"
+         }).then(res => {
+            res.forEach(device => {
+               let a = device.fqdn.replace("._ewelink._tcp.local", "").replace("eWeLink_", "");
+               if (this.deviceMap.hasOwnProperty(a)) {
+                  this.deviceMap[a].ip = device.address;
+               }
+            });
+            resolve(this.deviceMap);
+         }).catch(err => {
+            reject(err);
+         });
+      });
+   }
+   startMonitor() {
+      dns.ondata = packet => {
+         if (packet.answers) {
+            packet.answers
+               .filter(value => value.name.includes("_ewelink._tcp.local"))
+               .forEach(value => {
+                  if (value.type === "TXT") {
+                     let rdata = value.rdata;
+                     if (this.deviceMap.hasOwnProperty(rdata.id)) {
+                        let deviceKey = this.deviceMap[rdata.id].apiKey,
+                           data = rdata.data1 +
+                           (rdata.hasOwnProperty("data2") ? rdata.data2 : "") +
+                           (rdata.hasOwnProperty("data3") ? rdata.data3 : "") +
+                           (rdata.hasOwnProperty("data4") ? rdata.data4 : ""),
+                           key = crypto.createHash("md5").update(Buffer.from(deviceKey, "utf8")).digest(),
+                           dText = crypto.createDecipheriv("aes-128-cbc", key, Buffer.from(rdata.iv, "base64")),
+                           pText = Buffer.concat([dText.update(Buffer.from(data, "base64")), dText.final()]).toString("utf8"),
+                           params;
+                        try {
+                           params = JSON.parse(pText);
+                        } catch (e) {
+                           this.log.warn("[%s] An error occured reading the LAN message [%s]", rdata.id, e);
+                           return;
+                        }
+                        for (let param in params) {
+                           if (params.hasOwnProperty(param)) {
+                              if (!constants.paramsToKeep.includes(param.replace(/[0-9]/g, ""))) {
+                                 delete params[param];
+                              }
+                           }
+                        }
+                        params.updateSource = "lan";
+                        if (Object.keys(params).length > 0) {
+                           let returnTemplate = {
+                              deviceid: rdata.id,
+                              action: "update",
+                              params
+                           };
+                           if (this.debugReqRes) {
+                              let msg = JSON.stringify(returnTemplate, null, 2).replace(rdata.id, "**hidden**");
+                              this.log("LAN message received.\n%s", msg);
+                           } else if (this.debug) {
+                              this.log("LAN message received.");
+                           }
+                           this.emitter.emit("update", returnTemplate);
+                        }
+                     }
+                  }
+               });
+         }
+      };
+      return new Promise((resolve, reject) => {
+         dns.startMonitoring().then(() => {
+            resolve();
+         }).catch(err => {
+            reject(err);
+         });
+      });
+   }
+   sendUpdate(json) {
+      return new Promise((resolve, reject) => {
+         if (!this.deviceMap[json.deviceid].ip) {
+            throw "device does not support LAN mode";
+         }
+         let apiKey, suffix, params = {};
+         if (json.params.hasOwnProperty("switches")) {
+            params.switches = json.params.switches;
+            suffix = "switches";
+         } else if (json.params.hasOwnProperty("switch")) {
+            params.switch = json.params.switch;
+            suffix = "switch";
+         } else {
+            throw "plugin does not support lan mode for this device yet - feel free to create a github issue";
+         }
+         if ((apiKey = this.deviceMap[json.deviceid].apiKey)) {
+            let key = crypto.createHash('md5').update(Buffer.from(apiKey, 'utf8')).digest(),
+               iv = crypto.randomBytes(16),
+               enc = crypto.createCipheriv('aes-128-cbc', key, iv),
+               data = {
+                  data: Buffer.concat([enc.update(JSON.stringify(params)), enc.final()]).toString('base64'),
+                  deviceid: json.deviceid,
+                  encrypt: true,
+                  iv: iv.toString('base64'),
+                  selfApikey: "123",
+                  sequence: Date.now().toString()
+               };
+            if (this.debugReqRes) {
+               let msg = JSON.stringify(json, null, 2).replace(json.apikey, "**hidden**").replace(json.apikey, "**hidden**").replace(json.deviceid, "**hidden**");
+               this.log.warn("LAN mode message sent. This text is yellow for clarity.\n%s", msg);
+            } else if (this.debug) {
+               this.log("LAN mode message sent.");
+            }
+            axios({
+               method: "post",
+               url: "http://" + this.deviceMap[json.deviceid].ip + ":8081/zeroconf/" + suffix,
+               headers: {
+                  Accept: "application/json",
+                  "Content-Type": "application/json;charset=UTF-8"
+               },
+               data
+            }).then(res => {
+               let body = res.data;
+               if (body.hasOwnProperty("error") && body.error === 0) {
+                  resolve();
+               }
+               throw body;
+            }).catch(err => {
+               reject(err);
+            });
+         }
+      });
+   }
+   receiveUpdate(f) {
+      this.emitter.addListener("update", f);
+   }
+};
\ No newline at end of file
diff --git a/lib/eWeLinkWS.js b/lib/eWeLinkWS.js
new file mode 100644
index 00000000..23f690d7
--- /dev/null
+++ b/lib/eWeLinkWS.js
@@ -0,0 +1,271 @@
+/* jshint esversion: 9, -W030, node: true */
+"use strict";
+const axios = require("axios");
+const constants = require("./constants");
+const eventemitter = require("events");
+const ws = require("ws");
+module.exports = class eWeLinkWS {
+   constructor(config, log, res) {
+      this.config = config;
+      this.log = log;
+      this.debug = this.config.debug || false;
+      this.debugReqRes = this.config.debugReqRes || false;
+      this.httpHost = res.httpHost;
+      this.aToken = res.aToken;
+      this.apiKey = res.apiKey;
+      this.wsIsOpen = false;
+      this.emitter = new eventemitter();
+      this.delaySend = 0;
+   }
+   getHost() {
+      return new Promise((resolve, reject) => {
+         axios({
+            method: "post",
+            url: "https://" + this.httpHost.replace("-api", "-disp") + "/dispatch/app",
+            headers: {
+               Authorization: "Bearer " + this.aToken,
+               "Content-Type": "application/json"
+            },
+            data: {
+               appid: constants.appId,
+               nonce: Math.random().toString(36).substr(2, 8),
+               ts: Math.floor(new Date().getTime() / 1000),
+               version: 8
+            }
+         }).then(res => {
+            let body = res.data;
+            if (!body.domain) {
+               throw "Server did not respond with a web socket host.";
+            }
+            if (this.debug) {
+               this.log("Web socket host received [%s].", body.domain);
+            }
+            this.wsHost = body.domain;
+            resolve(body.domain);
+         }).catch(err => {
+            reject(err);
+         });
+      });
+   }
+   login() {
+      this.ws = new ws("wss://" + this.wsHost + ":8080/api/ws");
+      this.ws.on("open", () => {
+         this.wsIsOpen = true;
+         let payload = {
+            action: "userOnline",
+            apikey: this.apiKey,
+            appid: constants.appId,
+            at: this.aToken,
+            nonce: Math.random().toString(36).substr(2, 8),
+            sequence: Math.floor(new Date()),
+            ts: Math.floor(new Date() / 1000),
+            userAgent: "app",
+            version: 8
+         };
+         this.ws.send(JSON.stringify(payload));
+         if (this.debugReqRes) {
+            let msg = JSON.stringify(payload, null, 2).replace(this.aToken, "**hidden**").replace(this.apiKey, "**hidden**");
+            this.log.warn("Sending WS login request. This text is yellow for clarity.\n%s", msg);
+         } else if (this.debug) {
+            this.log("Sending WS login request.");
+         }
+      });
+      this.ws.on("message", m => {
+         if (m === "pong") {
+            return;
+         }
+         let device;
+         try {
+            device = JSON.parse(m);
+         } catch (e) {
+            this.log.warn("An error occured reading the web socket message [%s]", e);
+            return;
+         }
+         // for requestUpdate response
+         if (device.hasOwnProperty("deviceid") && device.hasOwnProperty("params") && device.hasOwnProperty("error") && device.error === 0) {
+            device.action = "update";
+         } else if (device.hasOwnProperty("deviceid") && device.hasOwnProperty("error") && device.error === 504) {
+            device.action = "sysmsg";
+            device.params = {
+               online: false
+            };
+         }
+         // for external updates
+         if (device.hasOwnProperty("config") && device.config.hb && device.config.hbInterval && !this.hbInterval) {
+            this.hbInterval = setInterval(() => {
+               this.ws.send("ping");
+            }, (device.config.hbInterval + 7) * 1000);
+         } else if (device.hasOwnProperty("action")) {
+            switch (device.action) {
+            case "sysmsg":
+               device.params.updateSource = "ws";
+               let returnTemplate = {
+                  deviceid: device.deviceid,
+                  action: "sysmsg",
+                  params: device.params
+               };
+               if (this.debugReqRes) {
+                  let msg = JSON.stringify(returnTemplate, null, 2).replace(device.deviceid, "**hidden**");
+                  this.log("WS message received.\n%s", msg);
+               } else if (this.debug) {
+                  this.log("WS message received.");
+               }
+               this.emitter.emit("update", returnTemplate);
+               break;
+            case "update":
+               let params = device.params;
+               for (let param in params) {
+                  if (params.hasOwnProperty(param)) {
+                     if (!constants.paramsToKeep.includes(param.replace(/[0-9]/g, ""))) {
+                        delete params[param];
+                     }
+                  }
+               }
+               if (Object.keys(params).length > 0) {
+                  params.updateSource = "ws";
+                  let returnTemplate = {
+                     deviceid: device.deviceid,
+                     action: "update",
+                     params
+                  };
+                  if (this.debugReqRes) {
+                     let msg = JSON.stringify(returnTemplate, null, 2).replace(device.deviceid, "**hidden**");
+                     this.log("WS message received.\n%s", msg);
+                  } else if (this.debug) {
+                     this.log("WS message received.");
+                  }
+                  this.emitter.emit("update", returnTemplate);
+               }
+               break;
+            default:
+               this.log.warn("[%s] WS message has unknown action.\n" + JSON.stringify(device, null, 2), device.deviceid);
+               return;
+            }
+         } else if (device.hasOwnProperty("error") && device.error === 0) {
+            // *** Safe to ignore these messages *** \\
+         } else {
+            if (this.debug) {
+               this.log.warn("WS unknown command received.\n" + JSON.stringify(device, null, 2));
+            }
+         }
+      });
+      this.ws.on("close", (e) => {
+         this.log.warn("Web socket closed - [%s].", e);
+         if (e.code !== 1000) {
+            this.log.warn("Web socket will try to reconnect in five seconds then try the command again.");
+            this.ws.removeAllListeners();
+            setTimeout(() => {
+               this.login();
+            }, 5000);
+         } else {
+            this.log.error("Please try restarting Homebridge so that this plugin can work again.");
+         }
+         this.wsIsOpen = false;
+         if (this.hbInterval) {
+            clearInterval(this.hbInterval);
+            this.hbInterval = null;
+         }
+      });
+      this.ws.on("error", (e) => {
+         this.log.error("Web socket error - [%s].", e);
+         if (e.code === "ECONNREFUSED") {
+            this.log.warn("Web socket will try to reconnect in five seconds then try the command again.");
+            this.ws.removeAllListeners();
+            setTimeout(() => {
+               this.login();
+            }, 5000);
+         } else {
+            this.log.warn("If this was unexpected then please try restarting Homebridge.");
+         }
+      });
+   }
+   sendUpdate(json, callback) {
+      json = {
+         ...json,
+         ...{
+            action: "update",
+            sequence: Math.floor(new Date()),
+            userAgent: "app"
+         }
+      };
+      let sendOperation = req => {
+         if (!this.wsIsOpen) {
+            setTimeout(() => {
+               sendOperation(req);
+            }, 280);
+            return;
+         }
+         if (this.ws) {
+            callback();
+            this.ws.send(req);
+            if (this.debugReqRes) {
+               let msg = JSON.stringify(json, null, 2).replace(json.apikey, "**hidden**").replace(json.apiKey, "**hidden**").replace(json.deviceid, "**hidden**");
+               this.log.warn("Web socket message sent. This text is yellow for clarity.\n%s", msg);
+            }
+            return;
+         }
+         this.delaySend = this.delaySend <= 0 ? 0 : this.delaySend -= 280;
+      };
+      let string = JSON.stringify(json);
+      if (this.wsIsOpen) {
+         setTimeout(sendOperation, this.delaySend, string);
+         this.delaySend += 280;
+      } else {
+         this.log.warn("Web socket is currently reconnecting. Command will be resent.");
+         let interval,
+            waitToSend = req => {
+               if (this.wsIsOpen) {
+                  clearInterval(interval);
+                  sendOperation(req);
+               }
+            };
+         interval = setInterval(waitToSend, 2500, string);
+      }
+   }
+   requestUpdate(accessory) {
+      let json = {
+            action: "query",
+            apikey: accessory.context.eweApiKey,
+            deviceid: accessory.context.eweDeviceId,
+            params: [],
+            sequence: Math.floor(new Date()),
+            ts: 0,
+            userAgent: "app"
+         },
+         sendOperation = req => {
+            if (!this.wsIsOpen) {
+               setTimeout(() => {
+                  sendOperation(req);
+               }, 280);
+               return;
+            }
+            if (this.ws) {
+               this.ws.send(req);
+               if (this.debugReqRes) {
+                  let msg = JSON.stringify(json, null, 2).replace(json.apikey, "**hidden**").replace(json.apiKey, "**hidden**").replace(json.deviceid, "**hidden**");
+                  this.log.warn("Web socket message sent. This text is yellow for clarity.\n%s", msg);
+               }
+               return;
+            }
+            this.delaySend = this.delaySend <= 0 ? 0 : this.delaySend -= 280;
+         },
+         string = JSON.stringify(json);
+      if (this.wsIsOpen) {
+         setTimeout(sendOperation, this.delaySend, string);
+         this.delaySend += 280;
+      } else {
+         this.log.warn("Web socket is currently reconnecting. Command will be resent.");
+         let interval,
+            waitToSend = req => {
+               if (this.wsIsOpen) {
+                  clearInterval(interval);
+                  sendOperation(req);
+               }
+            };
+         interval = setInterval(waitToSend, 2500, string);
+      }
+   }
+   receiveUpdate(f) {
+      this.emitter.addListener("update", f);
+   }
+};
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index 94d0313e..9420b343 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,360 +1,60 @@
 {
-  "name": "homebridge-ewelink",
-  "version": "0.1.76",
-  "lockfileVersion": 1,
-  "requires": true,
-  "dependencies": {
-    "arpping": {
-      "version": "github:skydiver/arpping#ae65410343bdcbddb64b37ac9f674c65af1fe92c",
-      "from": "github:skydiver/arpping",
-      "requires": {
-        "child_process": "^1.0.2",
-        "os": "^0.1.1"
-      }
-    },
-    "babel-runtime": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
-      "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
-      "requires": {
-        "core-js": "^2.4.0",
-        "regenerator-runtime": "^0.11.0"
-      }
-    },
-    "child_process": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/child_process/-/child_process-1.0.2.tgz",
-      "integrity": "sha1-sffn/HPSXn/R1FWtyU4UODAYK1o="
-    },
-    "chnl": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/chnl/-/chnl-1.2.0.tgz",
-      "integrity": "sha512-g5gJb59edwCliFbX2j7G6sBfY4sX9YLy211yctONI2GRaiX0f2zIbKWmBm+sPqFNEpM7Ljzm7IJX/xrjiEbPrw=="
-    },
-    "core-js": {
-      "version": "2.6.11",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz",
-      "integrity": "sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg=="
-    },
-    "crypto-js": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-4.0.0.tgz",
-      "integrity": "sha512-bzHZN8Pn+gS7DQA6n+iUmBfl0hO5DJq++QP3U6uTucDtk/0iGpXd/Gg7CGR0p8tJhofJyaKoWBuJI4eAO00BBg=="
-    },
-    "d": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/d/-/d-1.0.1.tgz",
-      "integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==",
-      "requires": {
-        "es5-ext": "^0.10.50",
-        "type": "^1.0.1"
-      }
-    },
-    "debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "requires": {
-        "ms": "2.0.0"
-      }
-    },
-    "define-properties": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
-      "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
-      "requires": {
-        "object-keys": "^1.0.12"
-      }
-    },
-    "delay": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/delay/-/delay-4.4.0.tgz",
-      "integrity": "sha512-txgOrJu3OdtOfTiEOT2e76dJVfG/1dz2NZ4F0Pyt4UGZJryssMRp5vdM5wQoLwSOBNdrJv3F9PAhp/heqd7vrA=="
-    },
-    "es-abstract": {
-      "version": "1.17.6",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.6.tgz",
-      "integrity": "sha512-Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw==",
-      "requires": {
-        "es-to-primitive": "^1.2.1",
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.1",
-        "is-callable": "^1.2.0",
-        "is-regex": "^1.1.0",
-        "object-inspect": "^1.7.0",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.0",
-        "string.prototype.trimend": "^1.0.1",
-        "string.prototype.trimstart": "^1.0.1"
-      }
-    },
-    "es-to-primitive": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
-      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
-      "requires": {
-        "is-callable": "^1.1.4",
-        "is-date-object": "^1.0.1",
-        "is-symbol": "^1.0.2"
-      }
-    },
-    "es5-ext": {
-      "version": "0.10.53",
-      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.53.tgz",
-      "integrity": "sha512-Xs2Stw6NiNHWypzRTY1MtaG/uJlwCk8kH81920ma8mvN8Xq1gsfhZvpkImLQArw8AHnv8MT2I45J3c0R8slE+Q==",
-      "requires": {
-        "es6-iterator": "~2.0.3",
-        "es6-symbol": "~3.1.3",
-        "next-tick": "~1.0.0"
-      }
-    },
-    "es6-iterator": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz",
-      "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=",
-      "requires": {
-        "d": "1",
-        "es5-ext": "^0.10.35",
-        "es6-symbol": "^3.1.1"
-      }
-    },
-    "es6-symbol": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz",
-      "integrity": "sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==",
-      "requires": {
-        "d": "^1.0.1",
-        "ext": "^1.1.2"
-      }
-    },
-    "ewelink-api": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/ewelink-api/-/ewelink-api-3.0.0.tgz",
-      "integrity": "sha512-W60dGUIPnV8b/ckCKRAi+0mYyIYil/YrkVrAknlf6CtnivHIVxvcQPUxQPOX6ctWzK10n+ACAh8V7uOok1rjMA==",
-      "requires": {
-        "arpping": "github:skydiver/arpping",
-        "crypto-js": "^4.0.0",
-        "delay": "^4.3.0",
-        "node-fetch": "^2.6.0",
-        "random": "^2.2.0",
-        "websocket": "^1.0.31",
-        "websocket-as-promised": "^1.0.1"
-      }
-    },
-    "ext": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/ext/-/ext-1.4.0.tgz",
-      "integrity": "sha512-Key5NIsUxdqKg3vIsdw9dSuXpPCQ297y6wBjL30edxwPgt2E44WcWBZey/ZvUc6sERLTxKdyCu4gZFmUbk1Q7A==",
-      "requires": {
-        "type": "^2.0.0"
+   "name": "homebridge-ewelink",
+   "version": "2.19.1",
+   "lockfileVersion": 1,
+   "requires": true,
+   "dependencies": {
+      "axios": {
+         "version": "0.19.2",
+         "resolved": "https://registry.npmjs.org/axios/-/axios-0.19.2.tgz",
+         "integrity": "sha512-fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA==",
+         "requires": {
+            "follow-redirects": "1.5.10"
+         }
       },
-      "dependencies": {
-        "type": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/type/-/type-2.0.0.tgz",
-          "integrity": "sha512-KBt58xCHry4Cejnc2ISQAF7QY+ORngsWfxezO68+12hKV6lQY8P/psIkcbjeHWn7MqcgciWJyCCevFMJdIXpow=="
-        }
-      }
-    },
-    "function-bind": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
-    },
-    "has": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-      "requires": {
-        "function-bind": "^1.1.1"
-      }
-    },
-    "has-symbols": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz",
-      "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg=="
-    },
-    "is-callable": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.0.tgz",
-      "integrity": "sha512-pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw=="
-    },
-    "is-date-object": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz",
-      "integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g=="
-    },
-    "is-regex": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.1.tgz",
-      "integrity": "sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==",
-      "requires": {
-        "has-symbols": "^1.0.1"
-      }
-    },
-    "is-symbol": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz",
-      "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==",
-      "requires": {
-        "has-symbols": "^1.0.1"
-      }
-    },
-    "is-typedarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
-    },
-    "ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-    },
-    "nan": {
-      "version": "2.14.1",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.1.tgz",
-      "integrity": "sha512-isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw=="
-    },
-    "next-tick": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz",
-      "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw="
-    },
-    "node-fetch": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz",
-      "integrity": "sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA=="
-    },
-    "object-inspect": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.8.0.tgz",
-      "integrity": "sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA=="
-    },
-    "object-keys": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="
-    },
-    "object.assign": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz",
-      "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==",
-      "requires": {
-        "define-properties": "^1.1.2",
-        "function-bind": "^1.1.1",
-        "has-symbols": "^1.0.0",
-        "object-keys": "^1.0.11"
-      }
-    },
-    "os": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/os/-/os-0.1.1.tgz",
-      "integrity": "sha1-IIhF6J4ZOtTZcUdLk5R3NqVtE/M="
-    },
-    "ow": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/ow/-/ow-0.4.0.tgz",
-      "integrity": "sha512-kJNzxUgVd6EF5LoGs+s2/etJPwjfRDLXPTCfEgV8At77sRrV+PSFA8lcoW2HF15Qd455mIR2Stee/2MzDiFBDA=="
-    },
-    "ow-lite": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/ow-lite/-/ow-lite-0.0.2.tgz",
-      "integrity": "sha1-359QDmdAtlkKHpqWVzDUmo61l9E="
-    },
-    "promise-controller": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/promise-controller/-/promise-controller-1.0.0.tgz",
-      "integrity": "sha512-goA0zA9L91tuQbUmiMinSYqlyUtEgg4fxJcjYnLYOQnrktb4o4UqciXDNXiRUPiDBPACmsr1k8jDW4r7UDq9Qw=="
-    },
-    "promise.prototype.finally": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/promise.prototype.finally/-/promise.prototype.finally-3.1.2.tgz",
-      "integrity": "sha512-A2HuJWl2opDH0EafgdjwEw7HysI8ff/n4lW4QEVBCUXFk9QeGecBWv0Deph0UmLe3tTNYegz8MOjsVuE6SMoJA==",
-      "requires": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.0-next.0",
-        "function-bind": "^1.1.1"
-      }
-    },
-    "random": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/random/-/random-2.2.0.tgz",
-      "integrity": "sha512-4HBR4Xye4jJ41QBi6RfIaO1yKQpxVUZafQtdE6NvvjzirNlwWgsk3tkGLTbQtWUarF4ofZsUVEmWqB1TDQlkwA==",
-      "requires": {
-        "babel-runtime": "^6.26.0",
-        "ow": "^0.4.0",
-        "ow-lite": "^0.0.2",
-        "seedrandom": "^3.0.5"
-      }
-    },
-    "regenerator-runtime": {
-      "version": "0.11.1",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
-      "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="
-    },
-    "seedrandom": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/seedrandom/-/seedrandom-3.0.5.tgz",
-      "integrity": "sha512-8OwmbklUNzwezjGInmZ+2clQmExQPvomqjL7LFqOYqtmuxRgQYqOD3mHaU+MvZn5FLUeVxVfQjwLZW/n/JFuqg=="
-    },
-    "string.prototype.trimend": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz",
-      "integrity": "sha512-LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g==",
-      "requires": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.5"
-      }
-    },
-    "string.prototype.trimstart": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz",
-      "integrity": "sha512-XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw==",
-      "requires": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.5"
-      }
-    },
-    "type": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/type/-/type-1.2.0.tgz",
-      "integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg=="
-    },
-    "typedarray-to-buffer": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
-      "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",
-      "requires": {
-        "is-typedarray": "^1.0.0"
-      }
-    },
-    "websocket": {
-      "version": "1.0.31",
-      "resolved": "https://registry.npmjs.org/websocket/-/websocket-1.0.31.tgz",
-      "integrity": "sha512-VAouplvGKPiKFDTeCCO65vYHsyay8DqoBSlzIO3fayrfOgU94lQN5a1uWVnFrMLceTJw/+fQXR5PGbUVRaHshQ==",
-      "requires": {
-        "debug": "^2.2.0",
-        "es5-ext": "^0.10.50",
-        "nan": "^2.14.0",
-        "typedarray-to-buffer": "^3.1.5",
-        "yaeti": "^0.0.6"
-      }
-    },
-    "websocket-as-promised": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/websocket-as-promised/-/websocket-as-promised-1.0.1.tgz",
-      "integrity": "sha512-+gBevna4yxisb8cigL8NxcS8s241cvfMeyy1fNFcFgBcX/6vknMT84MwMmBNLYmsYH2giVoxOSEiAeeb7txFOw==",
-      "requires": {
-        "chnl": "^1.0.0",
-        "promise-controller": "^1.0.0",
-        "promise.prototype.finally": "^3.1.1"
+      "color-convert": {
+         "version": "2.0.1",
+         "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+         "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+         "requires": {
+            "color-name": "~1.1.4"
+         }
+      },
+      "color-name": {
+         "version": "1.1.4",
+         "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+         "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+      },
+      "debug": {
+         "version": "3.1.0",
+         "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+         "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+         "requires": {
+            "ms": "2.0.0"
+         }
+      },
+      "follow-redirects": {
+         "version": "1.5.10",
+         "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz",
+         "integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==",
+         "requires": {
+            "debug": "=3.1.0"
+         }
+      },
+      "ms": {
+         "version": "2.0.0",
+         "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+         "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+      },
+      "node-dns-sd": {
+         "version": "0.4.1",
+         "resolved": "https://registry.npmjs.org/node-dns-sd/-/node-dns-sd-0.4.1.tgz",
+         "integrity": "sha512-x+WSuMgvDBQv24OCq75YHcZj1SOzvP5fU4Tz+PBUiVvVBsfc+9XAHAuIftaCpf2nPLl+ys71uZoGr/v9fVDa6A=="
+      },
+      "ws": {
+         "version": "7.3.1",
+         "resolved": "https://registry.npmjs.org/ws/-/ws-7.3.1.tgz",
+         "integrity": "sha512-D3RuNkynyHmEJIpD2qrgVkc9DQ23OrN/moAwZX4L8DfvszsJxpjQuUq3LMx6HoYji9fbIOBY18XWBsAux1ZZUA=="
       }
-    },
-    "yaeti": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/yaeti/-/yaeti-0.0.6.tgz",
-      "integrity": "sha1-8m9ITXJoTPQr7ft2lwqhYI+/lXc="
-    }
-  }
+   }
 }
diff --git a/package.json b/package.json
index cb41333c..8a64e5a3 100644
--- a/package.json
+++ b/package.json
@@ -1,21 +1,57 @@
 {
-  "name": "homebridge-ewelink",
-  "version": "0.1.76",
-  "description": "homebridge-eWeLink is a Homebrige plugin to control Sonoff relays running OEM firmware",
-  "license": "MIT",
-  "keywords": [
-    "homebridge-plugin",
-    "sonoff"
-  ],
-  "engines": {
-    "node": ">=0.12.0",
-    "homebridge": ">=0.2.0"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/bwp91/homebridge-ewelink.git"
-  },
-  "dependencies": {
-    "ewelink-api": "^3.0.0"
-  }
+   "name": "homebridge-ewelink",
+   "version": "2.19.1",
+   "author": "bwp91",
+   "contributors": [
+      "gbro115",
+      "MrTomAsh",
+      "howanghk",
+      "LeJeko",
+      "aremishevsky-chegg",
+      "samkni",
+      "robsonfj",
+      "ramsesz",
+      "metarutaiga",
+      "janbuecker",
+      "jacopofranza",
+      "donavanbecker",
+      "dhutchison",
+      "danielk117",
+      "bassrock",
+      "VictorKrasnov",
+      "JuniorGenius",
+      "BobbySlope"
+   ],
+   "description": "homebridge-ewelink-sonoff is a Homebrige plugin to control Sonoff devices running OEM firmware.",
+   "license": "MIT",
+   "keywords": [
+      "homebridge",
+      "homebridge-plugin",
+      "sonoff",
+      "ewelink"
+   ],
+   "engines": {
+      "node": ">=6.0.0",
+      "homebridge": ">=0.2.0"
+   },
+   "repository": {
+      "type": "git",
+      "url": "https://github.com/bwp91/homebridge-ewelink"
+   },
+   "dependencies": {
+      "axios": "0.19.2",
+      "color-convert": "2.0.1",
+      "node-dns-sd": "0.4.1",
+      "ws": "7.3.1"
+   },
+   "funding": [
+      {
+         "type": "patreon",
+         "url": "https://www.patreon.com/bwp91"
+      },
+      {
+         "type": "paypal",
+         "url": "https://www.paypal.me/BenPotter"
+      }
+   ]
 }

From 227f2f29d54bfbb4c888cf723cb99b3576648bab Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Sun, 16 Aug 2020 11:36:01 +0100
Subject: [PATCH 0010/3183] Update README.md

---
 README.md | 117 +-----------------------------------------------------
 1 file changed, 1 insertion(+), 116 deletions(-)

diff --git a/README.md b/README.md
index fc4f06d7..1a70beb2 100644
--- a/README.md
+++ b/README.md
@@ -1,116 +1 @@
-### Changes from homebridge-ewelink-complete have been merged into the master
-
-The largest change here is to use evelink-api for all API needs rather than rewrite
-
-# About
-
-Homebridge plugin to control Sonoff relays with OEM firmware. It uses the same API as the iOS app to communicate with your devices.
-
-The platform will dynamically add/remove devices based on what is configured in your eWeLink account.
-
-It has been tested with the [Sonoff basic](http://sonoff.itead.cc/en/products/sonoff/sonoff-basic) relays. I have performed testing with up to two relays associated to my account.
-
-The plugin will only support one eWeLink account.
-
-It is possible to continute to use the OEM functionality (eWeLink app, Google Home integration); this plugin requires no modification to the relay's firmware.
-
-## Shortcomings
-
-The plugin uses the same credentials as the eWeLink app. In order to obtain the authenticationToken, you'll need to use Charles to inspect the traffic and grab the value from the Authorization header. See below for information on how to obtain this value.
-
-Also, the code is of suboptimal quality. It was a quick-and-dirty plugin; feel free to contribute & improve.
-
-## Steps to install / configure
-
-*Assuming that you've already downloaded the eWeLink app on your iOS device & have configured it:*
-
-1) Install the plugin
-```
-sudo npm -g install homebridge-ewelink-complete
-```
-
-2) Add to the platforms[] section of config.json. Steps for obtaining the values for authenticationToken, apiHost, and webSocketApi can be found below.
-
-3) Restart Homebridge
-
-### Sample config.json
-
-```
-{
-    "bridge": {
-        "name": "Homebridge",
-        "username": "XX:XX:XX:XX:XX:XX",
-        "port": 51826,
-        "pin": "123-45-678"
-    },
-    
-    "description": "Your description here",
-
-    "accessories": [
-    ],
-
-    "platforms": [
- {
-            "platform": "eWeLink",
-            "name": "eWeLink",
-            "phoneNumberOrEmail": "YOUR_ACCOUNT_EMAIL_OR_PHONE",
-            "accountPassword": "YOUR_ACCOUNT_PASSWORD",
-            "apiHost": "us-api.coolkit.cc:8080",
-            "webSocketApi": "us-long.coolkit.cc",
-            "debug": "true"
-        }    ]
-}
-```
-
-### A note on the authenticationToken
-
-The authentication token is generated every time your device's app logs in to the eWeLink service. Based on my limited testing, the session seems to persist for quite some time.
-
-You can only have one authentication token per user account. 
-
-If you logout and login to the app again, you'll need to perform the above steps to get things working again.
-
-## Troubleshooting
-
-I've attempted to make the logging as useful as possible. If you have any suggestions, please open an issue on GitHub.  I've also hidden most logging behind the debug parameter, please set to true or false accordingly
-
-## Sample logging
-
-```
-[12/13/2017, 9:39:05 PM] [eWeLink] A total of [1] accessories were loaded from the local cache
-[12/13/2017, 9:39:05 PM] [eWeLink] Requesting a list of devices from eWeLink HTTPS API at [https://us-api.coolkit.cc:8080]
-[12/13/2017, 9:39:06 PM] [eWeLink] eWeLink HTTPS API reports that there are a total of [1] devices registered
-[12/13/2017, 9:39:06 PM] [eWeLink] Evaluating if devices need to be removed...
-[12/13/2017, 9:39:06 PM] [eWeLink] Verifying that all cached devices are still registered with the API. Devices that are no longer registered with the API will be removed.
-[12/13/2017, 9:39:06 PM] [eWeLink] Device [Fan] is regeistered with API. Nothing to do.
-[12/13/2017, 9:39:06 PM] [eWeLink] Evaluating if new devices need to be added...
-[12/13/2017, 9:39:06 PM] [eWeLink] Device with ID [XXXXXXX] is already configured. Ensuring that the configuration is current.
-[12/13/2017, 9:39:06 PM] [eWeLink] Updating recorded Characteristic.On for [Fan] to [false]. No request will be sent to the device.
-[12/13/2017, 9:39:06 PM] [eWeLink] Setting power state to [off] for device [Fan]
-[12/13/2017, 9:39:06 PM] [eWeLink] API key retrieved from web service is [XXXXXXX]
-[12/13/2017, 9:39:06 PM] [eWeLink] Connecting to the WebSocket API at [wss://us-long.coolkit.cc:8080/api/ws]
-[12/13/2017, 9:39:06 PM] [eWeLink] Sending login request [{"action":"userOnline","userAgent":"app","version":6,"nonce":"151321914688000","apkVesrion":"1.8","os":"ios","at":"XXXXXXX","apikey":"xxxxxxx","ts":"1513219146","model":"iPhone10,6","romVersion":"11.1.2","sequence":1513219146880}]
-[12/13/2017, 9:39:06 PM] [eWeLink] WebSocket messge received:  {"error":0,"apikey":"xxxxxxx","config":{"hb":1,"hbInterval":145},"sequence":"1513219146880"}
-```
-
-*Hey Siri, turn on the fan*
-```
-[12/13/2017, 9:39:09 PM] [eWeLink] Setting power state to [on] for device [Fan]
-[12/13/2017, 9:39:09 PM] [eWeLink] WebSocket messge received:  {"error":0,"deviceid":"XXXXXXX","apikey":"XXXXXXX","sequence":"1513219149620"}
-[12/13/2017, 9:39:11 PM] [eWeLink] Setting power state to [off] for device [Fan]
-[12/13/2017, 9:39:12 PM] [eWeLink] WebSocket messge received:  {"error":0,"deviceid":"XXXXXXX","apikey":"XXXXXXX","sequence":"1513219151735"}
-```
-
-The plugin will also listen for announcements via a persistent web socket. This allows you to control the device from the likes of Google Home & have Homebridge be kept up-to-date
-
-*Hey Google, turn on the fan*
-```
-[12/13/2017, 9:41:50 PM] [eWeLink] Update message received for device [XXXXXXX]
-[12/13/2017, 9:41:50 PM] [eWeLink] Updating recorded Characteristic.On for [Fan] to [true]. No request will be sent to the device.
-[12/13/2017, 9:41:50 PM] [eWeLink] Setting power state to [on] for device [Fan]
-[12/13/2017, 9:41:50 PM] [eWeLink] WebSocket messge received:  {"error":0,"deviceid":"XXXXXXX","apikey":"XXXXXXX","sequence":"1513219310003"}
-```
-## Credits
-
-So many... needs updated.  This is a fork of homebridge-ewelink
-
+Plugin update coming soon.

From 8aa5141fb5fba65492c98265b949aeb1203f467d Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Mon, 17 Aug 2020 06:58:47 +0100
Subject: [PATCH 0011/3183] Update README.md

---
 README.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/README.md b/README.md
index 1a70beb2..cf449835 100644
--- a/README.md
+++ b/README.md
@@ -1 +1,10 @@
+<p align="center">
+   <a href="https://github.com/homebridge/verified/blob/master/verified-plugins.json"><img alt="Homebridge Verified" src="https://user-images.githubusercontent.com/43026681/90361629-9af86200-e056-11ea-8553-4e4e5c4b5a54.png" width="500px"></a>
+</p>
+<span align="center">
+  
+# homebridge-ewelink-sonoff 
+
+</span>
+
 Plugin update coming soon.

From 9a235aec17bf57a7575f1a74ca63fc4d892742bf Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Mon, 17 Aug 2020 08:55:17 +0100
Subject: [PATCH 0012/3183] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index cf449835..b4af0fec 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 <p align="center">
-   <a href="https://github.com/homebridge/verified/blob/master/verified-plugins.json"><img alt="Homebridge Verified" src="https://user-images.githubusercontent.com/43026681/90361629-9af86200-e056-11ea-8553-4e4e5c4b5a54.png" width="500px"></a>
+   <img alt="Homebridge Verified" src="https://user-images.githubusercontent.com/43026681/90361629-9af86200-e056-11ea-8553-4e4e5c4b5a54.png" width="500px">
 </p>
 <span align="center">
   

From e5010696d51a3c6ad6b4c9b62c02cd189d420881 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Mon, 17 Aug 2020 08:55:53 +0100
Subject: [PATCH 0013/3183] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index b4af0fec..a5b69dcb 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 </p>
 <span align="center">
   
-# homebridge-ewelink-sonoff 
+# homebridge-ewelink
 
 </span>
 

From 307b049208a804d18f7d229ad2ae44e01cafb7ec Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Mon, 17 Aug 2020 13:19:41 +0100
Subject: [PATCH 0014/3183] Update new-issue.md

---
 .github/ISSUE_TEMPLATE/new-issue.md | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/new-issue.md b/.github/ISSUE_TEMPLATE/new-issue.md
index 44f070df..8f5f5df0 100644
--- a/.github/ISSUE_TEMPLATE/new-issue.md
+++ b/.github/ISSUE_TEMPLATE/new-issue.md
@@ -11,10 +11,20 @@ assignees: ''
 
 ...
 
-**Which version of the package are you using?**
+**Details of your setup.**
+Do you use Homebridge or HOOBS?
+
+...
+
+Which version of Homebridge/HOOBS do you have?
+
+...
+
+Which version of this plugin (homebridge-ewelink-sonoff) do you have?
 
 ...
 
 **Please paste any relevant logs below. It helps if you can turn `debug` and `debugReqRes` in the package settings for more thorough logging.**
+> If you are posting an error then it is helpful for me to also see the previous few lines as this can show the cause of the error.
 
 ...

From dd9903f5220f1eeea524c6182c40419406fb8fc6 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Mon, 17 Aug 2020 13:19:56 +0100
Subject: [PATCH 0015/3183] Update new-issue.md

---
 .github/ISSUE_TEMPLATE/new-issue.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/new-issue.md b/.github/ISSUE_TEMPLATE/new-issue.md
index 8f5f5df0..32cfb7df 100644
--- a/.github/ISSUE_TEMPLATE/new-issue.md
+++ b/.github/ISSUE_TEMPLATE/new-issue.md
@@ -20,7 +20,7 @@ Which version of Homebridge/HOOBS do you have?
 
 ...
 
-Which version of this plugin (homebridge-ewelink-sonoff) do you have?
+Which version of this plugin (homebridge-ewelink) do you have?
 
 ...
 

From 44eec9875bb2bc9131a8c01d37c81a36fee478ae Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Mon, 17 Aug 2020 13:27:39 +0100
Subject: [PATCH 0016/3183] Update README.md

---
 README.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index a5b69dcb..e17ee9a1 100644
--- a/README.md
+++ b/README.md
@@ -7,4 +7,7 @@
 
 </span>
 
-Plugin update coming soon.
+This package will soon become the new home of [homebridge-ewelink-sonoff](https://github.com/bwp91/homebridge-ewelink-sonoff)!
+
+### Credit
+To the original owner of this package @gbro115 for letting me take over. I will look after it as best as I can!

From a99c3c3e65e5f371285bd554add10f405c6997d4 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Mon, 17 Aug 2020 16:19:46 +0100
Subject: [PATCH 0017/3183] Update FUNDING.yml

---
 .github/FUNDING.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
index addfcd2d..9444c69e 100644
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1,2 +1,3 @@
 patreon: bwp91
+ko_fi: bwp91
 custom: ["https://www.paypal.me/BenPotter"]

From ca47926ac14e6fdbb13e01ac5b64feb00f414186 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 17 Aug 2020 16:23:26 +0100
Subject: [PATCH 0018/3183] v rollback

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 9420b343..7b3138f9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
    "name": "homebridge-ewelink",
-   "version": "2.19.1",
+   "version": "2.19.0",
    "lockfileVersion": 1,
    "requires": true,
    "dependencies": {
diff --git a/package.json b/package.json
index 8a64e5a3..c516fe57 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
    "name": "homebridge-ewelink",
-   "version": "2.19.1",
+   "version": "2.19.0",
    "author": "bwp91",
    "contributors": [
       "gbro115",

From cfd348deee2ee899ae9ab2d032fa6f34e7b7d91f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 17 Aug 2020 16:32:46 +0100
Subject: [PATCH 0019/3183] 2.19.1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 7b3138f9..9420b343 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
    "name": "homebridge-ewelink",
-   "version": "2.19.0",
+   "version": "2.19.1",
    "lockfileVersion": 1,
    "requires": true,
    "dependencies": {
diff --git a/package.json b/package.json
index c516fe57..8a64e5a3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
    "name": "homebridge-ewelink",
-   "version": "2.19.0",
+   "version": "2.19.1",
    "author": "bwp91",
    "contributors": [
       "gbro115",

From c536c2507203c7db3a089438f13ee1ff0815324f Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Mon, 17 Aug 2020 16:40:23 +0100
Subject: [PATCH 0020/3183] Update README.md

---
 README.md | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index e17ee9a1..deb01fd4 100644
--- a/README.md
+++ b/README.md
@@ -3,11 +3,18 @@
 </p>
 <span align="center">
   
-# homebridge-ewelink
+# homebridge-ewelink 
 
+ [![verified-by-homebridge](https://badgen.net/badge/homebridge/verified/purple)](https://github.com/homebridge/homebridge/wiki/Verified-Plugins)
+ [![Discord](https://img.shields.io/discord/432663330281226270?color=728ED5&logo=discord&label=discord)](https://discord.com/channels/432663330281226270/742733745743855627)
+ [![npm](https://img.shields.io/npm/dt/homebridge-ewelink-sonoff)](https://www.npmjs.com/package/homebridge-ewelink)   
+ [![npm](https://img.shields.io/npm/v/homebridge-ewelink-sonoff?label=release)](https://www.npmjs.com/package/homebridge-ewelink)
+ [![npm](https://img.shields.io/npm/v/homebridge-ewelink-beta?label=beta)](https://www.npmjs.com/package/homebridge-ewelink-beta)
+ 
 </span>
 
-This package will soon become the new home of [homebridge-ewelink-sonoff](https://github.com/bwp91/homebridge-ewelink-sonoff)!
+## Documentation
+Please refer to the [wiki](https://github.com/bwp91/homebridge-ewelink-sonoff/wiki) for documentation.
 
-### Credit
-To the original owner of this package @gbro115 for letting me take over. I will look after it as best as I can!
+## Credit
+To the original owner of this package @gbro115 for letting me take over. I will look after it as best as I can :)

From e27c2d228975ec87034dd9aec418a450957ccb59 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 17 Aug 2020 16:55:25 +0100
Subject: [PATCH 0021/3183] Update package.json

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 8a64e5a3..e33b50b4 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,7 @@
       "JuniorGenius",
       "BobbySlope"
    ],
-   "description": "homebridge-ewelink-sonoff is a Homebrige plugin to control Sonoff devices running OEM firmware.",
+   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
    "license": "MIT",
    "keywords": [
       "homebridge",

From 72000421e0e12dc4068236f001f6c4638c2aa6c2 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 17 Aug 2020 17:25:03 +0100
Subject: [PATCH 0022/3183] Update config.schema.json

---
 config.schema.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config.schema.json b/config.schema.json
index b8a7a5cf..90c72ece 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -2,7 +2,7 @@
    "pluginAlias":"eWeLink",
    "pluginType":"platform",
    "singular":true,
-   "headerDisplay":"Homebridge plugin to control Sonoff devices with OEM firmware.",
+   "headerDisplay":"Homebridge plugin to control eWeLink devices with original firmware.",
    "footerDisplay":"If you have any suggestions, please open an issue on [GitHub](https://github.com/bwp91/homebridge-ewelink/issues).",
    "schema":{
       "type":"object",

From b75ec7243364d82eb519ebac7ca4190d4bc5069c Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Mon, 17 Aug 2020 17:37:26 +0100
Subject: [PATCH 0023/3183] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index deb01fd4..6f976a7a 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@
 </span>
 
 ## Documentation
-Please refer to the [wiki](https://github.com/bwp91/homebridge-ewelink-sonoff/wiki) for documentation.
+Please refer to the [wiki](https://github.com/bwp91/homebridge-ewelink/wiki) for documentation.
 
 ## Credit
 To the original owner of this package @gbro115 for letting me take over. I will look after it as best as I can :)

From 82b6fdf9151eccba656e9028d51364fdf47c8f93 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 17 Aug 2020 19:34:14 +0100
Subject: [PATCH 0024/3183] camera log entries

---
 lib/eWeLink.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index 8cfdceec..eba46a71 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -166,6 +166,8 @@ class eWeLink {
             this.addAccessory(device, device.deviceid + "SWX", "zb_pri");
          } else if (constants.devicesZB.includes(device.extra.uiid)) {
             this.addAccessory(device, device.deviceid + "SWX", "zb_sub");
+         } else if (device.extra.uiid === 87) {
+            this.log.warn("[%s] please consider using homebridge-camera-ffmpeg to use this camera.", device.name);
          } else {
             this.log.warn("[%s] could not be added as it is not supported by this plugin.", device.name);
          }
@@ -239,7 +241,9 @@ class eWeLink {
             return;
          }
       } else {
-         this.log.warn("[%s] will not be refreshed as it wasn't found in Homebridge.", device.name);
+         if (device.extra.uiid !== 87) {
+            this.log.warn("[%s] will not be refreshed as it wasn't found in Homebridge.", device.name);
+         }
          return;
       }
       if (!accessory.context.reachableWAN && !accessory.context.reachableLAN) {
@@ -655,7 +659,6 @@ class eWeLink {
          this.externalRFDeviceUpdate(accessory, newParams);
          return true;
       case "rf_sub":
-         return true;
       case "zb_pri":
          return true;
       case "zb_sub":
@@ -1460,7 +1463,7 @@ class eWeLink {
          let oldState = accessory.getService(Service.ContactSensor).getCharacteristic(Characteristic.ContactSensorState).value,
             newState = params.switch === "on" ? 1 : 0,
             oAccessory = false;
-            accessory.getService(Service.ContactSensor).updateCharacteristic(Characteristic.ContactSensorState, newState);
+         accessory.getService(Service.ContactSensor).updateCharacteristic(Characteristic.ContactSensorState, newState);
          this.log("[%s] sent update that it was [%s] and is now [%s].", accessory.displayName, oldState ? "apart" : "joined", newState ? "apart" : "joined");
          this.cusG.forEach(group => {
             if (group.sensorId === accessory.context.eweDeviceId && group.type === "garage") {

From c2db874675578f4d768c31a5d8591837c235df7d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 17 Aug 2020 20:29:00 +0100
Subject: [PATCH 0025/3183] 2.19.2

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 9420b343..386790ae 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
    "name": "homebridge-ewelink",
-   "version": "2.19.1",
+   "version": "2.19.2",
    "lockfileVersion": 1,
    "requires": true,
    "dependencies": {
diff --git a/package.json b/package.json
index e33b50b4..607d3323 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
    "name": "homebridge-ewelink",
-   "version": "2.19.1",
+   "version": "2.19.2",
    "author": "bwp91",
    "contributors": [
       "gbro115",

From 8d7ba03d6ef201e48136e5021ab71b1c586cd98b Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Mon, 17 Aug 2020 20:41:35 +0100
Subject: [PATCH 0026/3183] Update README.md

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 6f976a7a..c8124630 100644
--- a/README.md
+++ b/README.md
@@ -7,8 +7,8 @@
 
  [![verified-by-homebridge](https://badgen.net/badge/homebridge/verified/purple)](https://github.com/homebridge/homebridge/wiki/Verified-Plugins)
  [![Discord](https://img.shields.io/discord/432663330281226270?color=728ED5&logo=discord&label=discord)](https://discord.com/channels/432663330281226270/742733745743855627)
- [![npm](https://img.shields.io/npm/dt/homebridge-ewelink-sonoff)](https://www.npmjs.com/package/homebridge-ewelink)   
- [![npm](https://img.shields.io/npm/v/homebridge-ewelink-sonoff?label=release)](https://www.npmjs.com/package/homebridge-ewelink)
+ [![npm](https://img.shields.io/npm/dt/homebridge-ewelink)](https://www.npmjs.com/package/homebridge-ewelink)   
+ [![npm](https://img.shields.io/npm/v/homebridge-ewelink?label=release)](https://www.npmjs.com/package/homebridge-ewelink)
  [![npm](https://img.shields.io/npm/v/homebridge-ewelink-beta?label=beta)](https://www.npmjs.com/package/homebridge-ewelink-beta)
  
 </span>

From 76f7b8bbfa0d6c58e713e4bcb0d255fda78c45e9 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Mon, 17 Aug 2020 21:12:45 +0100
Subject: [PATCH 0027/3183] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index c8124630..633cb902 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 <p align="center">
-   <img alt="Homebridge Verified" src="https://user-images.githubusercontent.com/43026681/90361629-9af86200-e056-11ea-8553-4e4e5c4b5a54.png" width="500px">
+   <a href="https://github.com/homebridge/verified/blob/master/verified-plugins.json"><img alt="Homebridge Verified" src="https://user-images.githubusercontent.com/43026681/90361629-9af86200-e056-11ea-8553-4e4e5c4b5a54.png" width="500px"></a>
 </p>
 <span align="center">
   

From e8db9d9846438abf2fa6e975a6d51b23e96f8d5a Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Mon, 17 Aug 2020 21:29:14 +0100
Subject: [PATCH 0028/3183] Set theme jekyll-theme-slate

---
 _config.yml | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 _config.yml

diff --git a/_config.yml b/_config.yml
new file mode 100644
index 00000000..c7418817
--- /dev/null
+++ b/_config.yml
@@ -0,0 +1 @@
+theme: jekyll-theme-slate
\ No newline at end of file

From 36ca2782e763647cd50b58ec3c13f4c5e8c037ba Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 19 Aug 2020 14:32:18 +0100
Subject: [PATCH 0029/3183] remove button as now auto

---
 config.schema.json | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 90c72ece..95772b9f 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -195,12 +195,6 @@
                      "default":"motion",
                      "description":"Select the type of sensor you would like to expose this as in Homebridge.",
                      "oneOf":[
-                        {
-                           "title":"Button",
-                           "enum":[
-                              "button"
-                           ]
-                        },
                         {
                            "title":"Motion",
                            "enum":[
@@ -303,9 +297,9 @@
       },
       {
          "key":"bridgeSensors",
-         "title":"RF Bridge Devices",
+         "title":"RF Bridge Sensors",
          "expandable":true,
-         "add":"Add Another Device",
+         "add":"Add Another Sensor",
          "type":"array",
          "items":[
             {

From 098d2b90d58d2bb150a6d48a076483896a67b199 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 19 Aug 2020 21:24:43 +0100
Subject: [PATCH 0030/3183] issue #72 helper

---
 lib/eWeLink.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index eba46a71..9516058e 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -101,7 +101,12 @@ class eWeLink {
                   }
                   //*** Synchronise (add/refresh) devices between eWeLink and Homebridge ***\\
                   this.devicesInEwe.forEach(device => {
-                     this.initialiseDevice(device);
+                     if (device.hasOwnProperty("extra") && device.extra.hasOwnProperty("uiid")) {
+                        this.initialiseDevice(device);
+                     } else {
+                        let deviceName = device.hasOwnProperty("name") ? device.name : "Unknown Device";
+                        this.log.warn("[%s] could not be synchronised due to missing uiid parameter.", deviceName);
+                     }
                   });
                   //*** Set up the ws listener for future external device updates ***\\
                   this.wsClient.receiveUpdate(device => {

From 1f423035ad05fc4bef92e74b1bf9e421a9fe4fae Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 19 Aug 2020 21:25:19 +0100
Subject: [PATCH 0031/3183] 2.19.3

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 386790ae..0077fce1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
    "name": "homebridge-ewelink",
-   "version": "2.19.2",
+   "version": "2.19.3",
    "lockfileVersion": 1,
    "requires": true,
    "dependencies": {
diff --git a/package.json b/package.json
index 607d3323..83a1c664 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
    "name": "homebridge-ewelink",
-   "version": "2.19.2",
+   "version": "2.19.3",
    "author": "bwp91",
    "contributors": [
       "gbro115",

From 6a2b380605ab338b11c267f3e9f543735f7d4a74 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 19 Aug 2020 22:21:56 +0100
Subject: [PATCH 0032/3183] lan default

---
 config.schema.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config.schema.json b/config.schema.json
index 95772b9f..a265ff91 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -44,7 +44,7 @@
             "type":"string",
             "title":"Connection Mode",
             "required":true,
-            "default":"ws",
+            "default":"lan",
             "description":"Preferred method of updating devices. Devices that don't support LAN mode will use web socket.",
             "oneOf":[
                {

From 29cd09f93f8ad01d4ab92e319e22c2140eef0fba Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 20 Aug 2020 17:06:19 +0100
Subject: [PATCH 0033/3183] remove mode option

---
 config.schema.json | 22 ----------------------
 1 file changed, 22 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index a265ff91..8a6237d9 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -40,27 +40,6 @@
             "description":"If enabled, HTTP, web socket and LAN mode messages will be added to the log. Not recommended for long-term use.",
             "default":false
          },
-         "mode":{
-            "type":"string",
-            "title":"Connection Mode",
-            "required":true,
-            "default":"lan",
-            "description":"Preferred method of updating devices. Devices that don't support LAN mode will use web socket.",
-            "oneOf":[
-               {
-                  "title":"LAN Mode (Recommended)",
-                  "enum":[
-                     "lan"
-                  ]
-               },
-               {
-                  "title":"Web Socket",
-                  "enum":[
-                     "ws"
-                  ]
-               }
-            ]
-         },
          "hideDevFromHB":{
             "type":"string",
             "title":"Hide Devices",
@@ -266,7 +245,6 @@
          "items":[
             "debug",
             "debugReqRes",
-            "mode",
             "hideDevFromHB",
             "hideFromHB",
             "sensorTimeLength",

From fa9c3f422e4dae90309ea914ca52e326364f6c6a Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 20 Aug 2020 17:06:28 +0100
Subject: [PATCH 0034/3183] add camera uiid

---
 lib/constants.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/constants.js b/lib/constants.js
index 27699ea5..3c557fca 100644
--- a/lib/constants.js
+++ b/lib/constants.js
@@ -14,6 +14,7 @@ module.exports = {
    devicesThermostat: [15],
    devicesFan: [34],
    devicesOutlet: [32],
+   devicesCamera: [87],
    devicesUSB: [77],
    devicesSCM: [78],
    devicesRFBridge: [28],

From 387e98bcae9ceda49b9057f22f1c84d863ead5d8 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 20 Aug 2020 17:06:39 +0100
Subject: [PATCH 0035/3183] refactors

---
 lib/eWeLink.js     | 1974 +++++++++++++++++++++-----------------------
 lib/eWeLinkHTTP.js |   46 +-
 lib/eWeLinkLAN.js  |   43 +-
 lib/eWeLinkWS.js   |   91 +-
 4 files changed, 1056 insertions(+), 1098 deletions(-)

diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index 9516058e..89352a12 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -1,6 +1,6 @@
 /* jshint esversion: 9, -W030, node: true */
 "use strict";
-const constants = require("./constants");
+const cns = require("./constants");
 const convert = require("color-convert");
 const eWeLinkHTTP = require("./eWeLinkHTTP");
 const eWeLinkWS = require("./eWeLinkWS");
@@ -12,23 +12,12 @@ class eWeLink {
          return;
       }
       if (!config || (!config.username || !config.password || !config.countryCode)) {
-         log.error("** Could not load " + constants.packageName + " **");
-         log.warn("Make sure your eWeLink credentials are in the Homebridge configuration.");
+         log.error("🔴  Cannot load %s - please check your eWeLink credentials in the plugin settings.", cns.packageName);
          return;
       }
       this.log = log;
       this.config = config;
       this.api = api;
-      this.mode = this.config.mode || "lan";
-      this.debug = this.config.debug || false;
-      this.debugReqRes = this.config.debugReqRes || false;
-      this.customHideChanFromHB = this.config.hideFromHB || "";
-      this.customHideDvceFromHB = this.config.hideDevFromHB || "";
-      this.customNameOverride = this.config.nameOverride || {};
-      this.sensorTimeLength = this.config.sensorTimeLength || 2;
-      this.sensorTimeDifference = this.config.sensorTimeDifference || 120;
-      this.valveTimeLength = this.config.valveTimeLength || 120;
-      this.hideZBLDPress = this.config.hideZBLDPress || false;
       this.devicesInHB = new Map();
       this.devicesInEwe = new Map();
       this.cusG = new Map();
@@ -43,94 +32,78 @@ class eWeLink {
             }).then(res => { //*** Set up the web socket client ***\\
                this.wsClient = new eWeLinkWS(this.config, this.log, res);
                return this.wsClient.getHost();
-            }).then(res => { //*** Open web socket connection and get device list via HTTP ***\\
+            }).then(() => { //*** Open web socket connection and get device list via HTTP ***\\
                this.wsClient.login();
                return this.httpClient.getDevices();
             }).then(res => { //*** Get device IP addresses for LAN mode ***\\
+               this.httpDevices = res
+                  .filter(device => !(this.config.hideDevFromHB || "").includes(device.deviceid))
+                  .forEach(device => this.devicesInEwe.set(device.deviceid, device));
                this.httpDevices = res;
                this.lanClient = new eWeLinkLAN(this.config, this.log, this.httpDevices);
                return this.lanClient.getHosts();
             }).then(res => { //*** Set up the LAN mode listener ***\\
-               this.lanDevices = res;
+               this.lanDevices = res.map;
+               this.lanDeviceOnline = res.count;
                return this.lanClient.startMonitor();
-            }).then(res => { //*** Use the device list to refresh Homebridge accessories ***\\
+            }).then(() => { //*** Use the device list to refresh Homebridge accessories ***\\
                (() => {
                   //*** Remove all Homebridge accessories if none found ***\\
                   if (Object.keys(this.httpDevices).length === 0 && Object.keys(this.lanDevices).length === 0) {
-                     this.removeAllAccessories();
+                     Array.from(this.devicesInHB.values()).forEach(a => this.removeAccessory(a));
+                     this.devicesInHB.clear();
+                     this.log.warn("🟠  No devices were found registered to your eWeLink account so disabling plugin.");
                      return;
                   }
-                  //*** Make a map of devices from eWeLink ***\\
-                  this.httpDevices.forEach(device => {
-                     if (this.customHideDvceFromHB.includes(device.deviceid)) {
-                        return;
-                     }
-                     this.devicesInEwe.set(device.deviceid, device);
-                  });
                   //*** Make a map of custom groups from Homebridge config ***\\
-                  if (this.config.groups && Object.keys(this.config.groups).length > 0) {
-                     this.config.groups.forEach(group => {
-                        if (typeof group.deviceId !== "undefined" && this.devicesInEwe.has(group.deviceId.toLowerCase())) {
-                           this.cusG.set(group.deviceId + "SWX", group);
-                        }
-                     });
+                  if (Object.keys(this.config.groups || []).length > 0) {
+                     this.config.groups
+                        .filter(g => g.hasOwnProperty("deviceId") && this.devicesInEwe.has(g.deviceId.toLowerCase()))
+                        .forEach(g => this.cusG.set(g.deviceId + "SWX", g));
                   }
                   //*** Make a map of RF Bridge custom sensors from Homebridge config ***\\
-                  if (this.config.bridgeSensors && Object.keys(this.config.bridgeSensors).length > 0) {
-                     this.config.bridgeSensors.forEach(bridgeSensor => {
-                        if (typeof bridgeSensor.deviceId !== "undefined" && this.devicesInEwe.has(bridgeSensor.deviceId.toLowerCase())) {
-                           this.cusS.set(bridgeSensor.fullDeviceId, bridgeSensor);
-                        }
-                     });
+                  if (Object.keys(this.config.bridgeSensors || []).length > 0) {
+                     this.config.bridgeSensors
+                        .filter(s => s.hasOwnProperty("deviceId") && this.devicesInEwe.has(s.deviceId.toLowerCase()))
+                        .forEach(s => this.cusS.set(s.fullDeviceId, s));
                   }
                   //*** Logging always helps to see if everything is okay so far ***\\
                   this.log("[%s] eWeLink devices were loaded from the Homebridge cache.", this.devicesInHB.size);
                   this.log("[%s] primary devices were loaded from your eWeLink account.", this.devicesInEwe.size);
-                  this.log("[%s] primary devices were discovered on your local network.", Object.keys(this.lanDevices).length);
+                  this.log("[%s] primary devices were discovered on your local network.", this.lanDeviceOnline);
                   //*** Remove Homebridge accessories that don't appear in eWeLink ***\\
-                  if (this.devicesInHB.size > 0) {
-                     this.devicesInHB.forEach(accessory => {
-                        if (!this.devicesInEwe.has(accessory.context.eweDeviceId)) {
-                           this.removeAccessory(accessory);
-                        }
-                     });
-                  }
-                  //*** Disable plugin if no eWeLink devices ***\\
-                  if (this.devicesInEwe.size === 0) {
-                     return;
-                  }
-                  //*** Synchronise (add/refresh) devices between eWeLink and Homebridge ***\\
-                  this.devicesInEwe.forEach(device => {
-                     if (device.hasOwnProperty("extra") && device.extra.hasOwnProperty("uiid")) {
-                        this.initialiseDevice(device);
-                     } else {
-                        let deviceName = device.hasOwnProperty("name") ? device.name : "Unknown Device";
-                        this.log.warn("[%s] could not be synchronised due to missing uiid parameter.", deviceName);
+                  this.devicesInHB.forEach(accessory => {
+                     if (!this.devicesInEwe.has(accessory.context.eweDeviceId)) {
+                        this.removeAccessory(accessory);
                      }
                   });
-                  //*** Set up the ws listener for future external device updates ***\\
-                  this.wsClient.receiveUpdate(device => {
-                     this.receiveDeviceUpdate(device);
-                  });
-                  //*** Set up the lan listener for future external device updates ***\\
-                  this.lanClient.receiveUpdate(device => {
-                     this.receiveDeviceUpdate(device);
-                  });
-                  this.log("Synchronisation complete. Ready to go!");
-                  if (this.debugReqRes) {
+                  //*** Synchronise devices between eWeLink and Homebridge and set up ws/lan listeners ***\\
+                  this.devicesInEwe.forEach(device => this.initialiseDevice(device));
+                  this.wsClient.receiveUpdate(device => this.receiveDeviceUpdate(device));
+                  this.lanClient.receiveUpdate(device => this.receiveDeviceUpdate(device));
+                  this.log("🟢  eWeLink setup complete. If you're enjoying this package please consider a ⭐️  on GitHub!");
+                  if (this.config.debugReqRes) {
                      this.log.warn("You have 'Request & Response Logging' enabled. This setting is not recommended for long-term use.");
                   }
                })();
-            }).catch(err => {
-               this.log.error("** eWeLink synchronisation error: **");
-               this.log.warn(err);
-               this.log.error("** Plugin will not be loaded. **");
-            });
+            }).catch(err => this.log.error("🔴  Cannot load %s - %s", cns.packageName, err));
+      });
+      this.api.on('shutdown', () => {
+         this.lanClient.closeConnection();
+         this.wsClient.closeConnection();
       });
    }
    initialiseDevice(device) {
+      if (!device.hasOwnProperty("extra") || !device.extra.hasOwnProperty("uiid")) {
+         let deviceName = device.hasOwnProperty("name") ?
+            device.name :
+            device.hasOwnProperty("deviceid") ? device.deviceid : "Unknown Device";
+         this.log.warn("[%s] could not be synchronised due to missing uiid parameter.", deviceName);
+         return;
+      }
       let accessory;
-      //*** First add the device if it isn't already in Homebridge ***\\
+      device.params.updateSource = "http";
+      //*** First add the device if it isn't already in Homebridge. Yeah this code looks a mess :| ***\\
       if (!this.devicesInHB.has(device.deviceid + "SWX") && !this.devicesInHB.has(device.deviceid + "SW0")) {
          if (device.extra.uiid === 2 && device.brandName === "coolkit" && device.productModel === "0285") {
             this.addAccessory(device, device.deviceid + "SWX", "valve");
@@ -138,141 +111,117 @@ class eWeLink {
             this.addAccessory(device, device.deviceid + "SWX", "blind");
          } else if (this.cusG.has(device.deviceid + "SWX") && this.cusG.get(device.deviceid + "SWX").type === "garage") {
             this.addAccessory(device, device.deviceid + "SWX", "garage");
-         } else if (constants.devicesSensor.includes(device.extra.uiid)) {
+         } else if (cns.devicesSensor.includes(device.extra.uiid)) {
             this.addAccessory(device, device.deviceid + "SWX", "sensor");
-         } else if (constants.devicesFan.includes(device.extra.uiid)) {
+         } else if (cns.devicesFan.includes(device.extra.uiid)) {
             this.addAccessory(device, device.deviceid + "SWX", "fan");
-         } else if (constants.devicesThermostat.includes(device.extra.uiid)) {
+         } else if (cns.devicesThermostat.includes(device.extra.uiid)) {
             this.addAccessory(device, device.deviceid + "SWX", "thermostat");
-         } else if (constants.devicesOutlet.includes(device.extra.uiid)) {
+         } else if (cns.devicesOutlet.includes(device.extra.uiid)) {
             this.addAccessory(device, device.deviceid + "SWX", "outlet");
-         } else if (constants.devicesUSB.includes(device.extra.uiid)) {
+         } else if (cns.devicesUSB.includes(device.extra.uiid)) {
             this.addAccessory(device, device.deviceid + "SWX", "usb");
-         } else if (constants.devicesSCM.includes(device.extra.uiid)) {
+         } else if (cns.devicesSCM.includes(device.extra.uiid)) {
             this.addAccessory(device, device.deviceid + "SWX", "scm");
-         } else if (constants.devicesSingleSwitch.includes(device.extra.uiid) && constants.devicesSingleSwitchLight.includes(device.productModel)) {
+         } else if (cns.devicesSingleSwitch.includes(device.extra.uiid) && cns.devicesSingleSwitchLight.includes(device.productModel)) {
             this.addAccessory(device, device.deviceid + "SWX", "light");
-         } else if (constants.devicesMultiSwitch.includes(device.extra.uiid) && constants.devicesMultiSwitchLight.includes(device.productModel)) {
-            for (let i = 0; i <= constants.chansFromUiid[device.extra.uiid]; i++) {
+         } else if (cns.devicesMultiSwitch.includes(device.extra.uiid) && cns.devicesMultiSwitchLight.includes(device.productModel)) {
+            for (let i = 0; i <= cns.chansFromUiid[device.extra.uiid]; i++) {
                this.addAccessory(device, device.deviceid + "SW" + i, "light");
             }
-         } else if (constants.devicesSingleSwitch.includes(device.extra.uiid)) {
+         } else if (cns.devicesSingleSwitch.includes(device.extra.uiid)) {
             this.addAccessory(device, device.deviceid + "SWX", "switch");
-         } else if (constants.devicesMultiSwitch.includes(device.extra.uiid)) {
-            for (let i = 0; i <= constants.chansFromUiid[device.extra.uiid]; i++) {
+         } else if (cns.devicesMultiSwitch.includes(device.extra.uiid)) {
+            for (let i = 0; i <= cns.chansFromUiid[device.extra.uiid]; i++) {
                this.addAccessory(device, device.deviceid + "SW" + i, "switch");
             }
-         } else if (constants.devicesRFBridge.includes(device.extra.uiid)) {
+         } else if (cns.devicesRFBridge.includes(device.extra.uiid)) {
             this.addAccessory(device, device.deviceid + "SW0", "rf_pri");
-            for (let i = 1; i <= Object.keys(device.params.rfList).length; i++) {
+            for (let i = 1; i <= Object.keys(device.tags.zyx_info).length; i++) {
                this.addAccessory(device, device.deviceid + "SW" + i, "rf_sub");
             }
-         } else if (constants.devicesZBBridge.includes(device.extra.uiid)) {
+         } else if (cns.devicesZBBridge.includes(device.extra.uiid)) {
             this.addAccessory(device, device.deviceid + "SWX", "zb_pri");
-         } else if (constants.devicesZB.includes(device.extra.uiid)) {
+         } else if (cns.devicesZB.includes(device.extra.uiid)) {
             this.addAccessory(device, device.deviceid + "SWX", "zb_sub");
-         } else if (device.extra.uiid === 87) {
+         } else if (cns.devicesCamera.includes(device.extra.uiid)) {
             this.log.warn("[%s] please consider using homebridge-camera-ffmpeg to use this camera.", device.name);
+            return;
          } else {
-            this.log.warn("[%s] could not be added as it is not supported by this plugin.", device.name);
+            this.log.warn("[%s] cannot be added as it is not supported by this plugin. Please make a GitHub issue request.", device.name);
+            return;
          }
       }
       //*** Next refresh the device ***\\
-      if ((accessory = this.devicesInHB.get(device.deviceid + "SWX"))) {
+      if ((accessory = this.devicesInHB.get(device.deviceid + "SWX") || this.devicesInHB.get(device.deviceid + "SW0"))) {
+         let isX = accessory.context.hbDeviceId.substr(-1) === "X",
+            isRfBridge = cns.devicesRFBridge.includes(accessory.context.eweUIID),
+            rfBridgeChange = false;
          accessory.getService(Service.AccessoryInformation).setCharacteristic(Characteristic.FirmwareRevision, device.params.fwVersion);
-         accessory.context.reachableWAN = accessory.context.eweUIID !== 102 ?
-            device.online :
-            true; //*** DW2 offline sometimes (as battery powered?) ***\\
-         accessory.context.reachableLAN = this.lanDevices[device.deviceid].ip || false;
+         accessory.context.reachableWAN = accessory.context.eweUIID !== 102 ? device.online : true; //*** DW2 ***\\
+         accessory.context.reachableLAN = this.lanDevices.get(device.deviceid).online || false;
          let str = accessory.context.reachableLAN ?
-            "and locally with IP [" + accessory.context.reachableLAN + "]" :
-            (accessory.context.reachableWAN) ?
-            "but LAN mode unavailable as unsupported/shared device" :
-            "but LAN mode unavailable as device offline";
+            "and locally with IP [" + this.lanDevices.get(device.deviceid).ip + "]" :
+            "but LAN mode unavailable as unsupported/shared device";
          this.log("[%s] found in eWeLink %s.", accessory.displayName, str);
-         try {
-            this.devicesInHB.set(accessory.context.hbDeviceId, accessory);
-            this.api.updatePlatformAccessories(constants.packageName, "eWeLink", [accessory]);
-         } catch (e) {
-            this.log.warn("[%s] online/offline status could not be updated - [%s].", accessory.displayName, e);
-         }
-      } else if ((accessory = this.devicesInHB.get(device.deviceid + "SW0"))) {
-         accessory.context.reachableLAN = this.lanDevices[device.deviceid].ip || false;
-         let str = accessory.context.reachableLAN ?
-            "and locally with IP [" + accessory.context.reachableLAN + "]" :
-            (accessory.context.reachableWAN) ?
-            "but LAN mode unavailable as unsupported/shared device" :
-            "but LAN mode unavailable as device offline";
-         this.log("[%s] found in eWeLink %s.", accessory.displayName, str);
-         let isRf = constants.devicesRFBridge.includes(device.extra.uiid);
-         let rfCh = false;
-         for (let i = 0; i <= accessory.context.channelCount; i++) {
-            let oAccessory;
-            try {
+         this.devicesInHB.set(accessory.context.hbDeviceId, accessory);
+         if (!isX) {
+            for (let i = 1; i <= accessory.context.channelCount; i++) {
                if (!this.devicesInHB.has(device.deviceid + "SW" + i)) {
-                  if (i > 0 && this.customHideChanFromHB.includes(device.deviceid + "SW" + i) && constants.devicesHideable.includes(accessory.context.type)) {
-                     continue;
-                  } else {
-                     this.addAccessory(device, device.deviceid + "SW" + i, "switch");
+                  if (cns.devicesHideable.includes(accessory.context.type)) {
+                     if ((this.config.hideFromHB || "").includes(device.deviceid + "SW" + i)) {
+                        continue;
+                     } else {
+                        this.addAccessory(device, device.deviceid + "SW" + i, "switch");
+                     }
                   }
                }
-               oAccessory = this.devicesInHB.get(device.deviceid + "SW" + i);
-               if (i > 0 && this.customHideChanFromHB.includes(device.deviceid + "SW" + i) && constants.devicesHideable.includes(accessory.context.type)) {
+               let oAccessory = this.devicesInHB.get(device.deviceid + "SW" + i);
+               if ((this.config.hideFromHB || "").includes(device.deviceid + "SW" + i) && cns.devicesHideable.includes(accessory.context.type)) {
                   this.removeAccessory(oAccessory);
                   continue;
                }
-               if (i > 0 && isRf) {
+               if (isRfBridge && oAccessory.context.sensorType !== "button") {
                   let ct = this.cusS.has(oAccessory.context.hbDeviceId) ? this.cusS.get(oAccessory.context.hbDeviceId).type : "motion";
-                  if (ct !== oAccessory.context.sensorType) {
-                     rfCh = true;
+                  if (ct !== oAccessory.context.sensorType || typeof accessory.context.updated === "undefined") {
+                     rfBridgeChange = true;
                   }
                }
                oAccessory.getService(Service.AccessoryInformation).setCharacteristic(Characteristic.FirmwareRevision, device.params.fwVersion);
                oAccessory.context.reachableWAN = device.online;
-               oAccessory.context.reachableLAN = this.lanDevices[device.deviceid].ip || false;
+               oAccessory.context.reachableLAN = this.lanDevices.get(device.deviceid).online || false;
                this.devicesInHB.set(oAccessory.context.hbDeviceId, oAccessory);
-               this.api.updatePlatformAccessories(constants.packageName, "eWeLink", [oAccessory]);
-            } catch (e) {}
-         }
-         if (rfCh) {
-            this.log.warn("RF Bridge configuration changed. Devices will be removed and readded.");
-            try {
-               for (let i = 0; i <= accessory.context.channelCount; i++) {
-                  let oAccessory = this.devicesInHB.get(device.deviceid + "SW" + i);
-                  this.removeAccessory(oAccessory);
-               }
-               this.initialiseDevice(device);
-            } catch (err) {}
+            }
+         }
+         if (rfBridgeChange) {
+            this.log.warn("[%s] bridge configuration changed - devices will be removed and readded.", accessory.displayName);
+            for (let i = 0; i <= accessory.context.channelCount; i++) {
+               let oAccessory = this.devicesInHB.get(device.deviceid + "SW" + i);
+               this.removeAccessory(oAccessory);
+            }
+            this.initialiseDevice(device);
             return;
          }
-      } else {
-         if (device.extra.uiid !== 87) {
-            this.log.warn("[%s] will not be refreshed as it wasn't found in Homebridge.", device.name);
+         if (!this.refreshAccessory(accessory, device.params)) {
+            this.log.warn("[%s] could not be initialised. Please try removing accessory from the Homebridge cache along with any secondary devices (SW1, SW2, etc.) [debug:%s:%s].", accessory.displayName, accessory.context.type, accessory.context.channelCount);
          }
-         return;
-      }
-      if (!accessory.context.reachableWAN && !accessory.context.reachableLAN) {
-         this.log.warn("[%s] will not be refreshed as it has been reported offline.", accessory.displayName);
-         return;
-      }
-      device.params.updateSource = "http";
-      if (!this.refreshAccessory(accessory, device.params)) {
-         this.log.warn("[%s] could not be refreshed. Please try removing accessory from the Homebridge cache along with any secondary devices (SW1, SW2, etc.). Debugging: [%s:%s:%s]", accessory.displayName, "initialise", accessory.context.type, accessory.context.channelCount);
+      } else {
+         this.log.warn("[%s] cannot be initialised as it wasn't found in Homebridge.", device.name);
       }
    }
    addAccessory(device, hbDeviceId, type) {
-      let channelCount = type === "rf_pri" ? Object.keys(device.params.rfList).length : constants.chansFromUiid[device.extra.uiid],
+      let channelCount = type === "rf_pri" ? Object.keys(device.tags.zyx_info).length : cns.chansFromUiid[device.extra.uiid],
          switchNumber = hbDeviceId.substr(-1).toString(),
-         newDeviceName = device.name;
-      if (["1", "2", "3", "4"].includes(switchNumber)) {
+         newDeviceName = type === "rf_sub" ? device.tags.zyx_info[switchNumber - 1].name : device.name;
+      if (["1", "2", "3", "4"].includes(switchNumber) && type !== "rf_sub") {
          newDeviceName += " SW" + switchNumber;
-         if (this.customHideChanFromHB.includes(hbDeviceId) && type === "switch") {
+         if ((this.config.hideFromHB || "").includes(hbDeviceId) && cns.devicesHideable.includes(type)) {
             this.log.warn("[%s] has not been added as per configuration", newDeviceName);
             return;
          }
       }
-      if (this.customNameOverride.hasOwnProperty(hbDeviceId)) {
-         newDeviceName = this.customNameOverride[hbDeviceId];
+      if ((this.config.nameOverride || {}).hasOwnProperty(hbDeviceId)) {
+         newDeviceName = this.config.nameOverride[hbDeviceId];
       }
       const accessory = new Accessory(newDeviceName, UUIDGen.generate(hbDeviceId).toString());
       try {
@@ -293,124 +242,150 @@ class eWeLink {
             type
          };
          switch (type) {
-         case "valve":
-            ["A", "B"].forEach(v => {
-               accessory.addService(Service.Valve, "Valve " + v, "valve" + v.toLowerCase())
-                  .setCharacteristic(Characteristic.Active, 0)
-                  .setCharacteristic(Characteristic.InUse, 0)
-                  .setCharacteristic(Characteristic.ValveType, 1)
-                  .setCharacteristic(Characteristic.SetDuration, this.valveTimeLength)
-                  .addCharacteristic(Characteristic.RemainingDuration);
-            });
-            break;
-         case "blind":
-            accessory.addService(Service.WindowCovering)
-               .setCharacteristic(Characteristic.CurrentPosition, 100)
-               .setCharacteristic(Characteristic.TargetPosition, 100)
-               .setCharacteristic(Characteristic.PositionState, 2);
-            break;
-         case "garage":
-            accessory.addService(Service.GarageDoorOpener)
-               .setCharacteristic(Characteristic.CurrentDoorState, 1)
-               .setCharacteristic(Characteristic.TargetDoorState, 1)
-               .setCharacteristic(Characteristic.ObstructionDetected, false);
-            break;
-         case "sensor":
-            accessory.addService(Service.ContactSensor)
-               .setCharacteristic(Characteristic.ContactSensorState, 0);
-            break;
-         case "fan":
-            accessory.addService(Service.Fanv2);
-            accessory.addService(Service.Lightbulb);
-            break;
-         case "thermostat":
-            accessory.addService(Service.Switch);
-            accessory.addService(Service.TemperatureSensor);
-            if (device.params.sensorType !== "DS18B20") {
-               accessory.addService(Service.HumiditySensor);
-            }
-            break;
-         case "outlet":
-         case "usb":
-            accessory.addService(Service.Outlet);
-            break;
-         case "light":
-            accessory.addService(Service.Lightbulb);
-            break;
-         case "switch":
-         case "scm":
-            accessory.addService(Service.Switch);
-            break;
-         case "rf_pri":
-         case "zb_pri":
-            break;
-         case "rf_sub":
-            accessory.context.sensorType = this.cusS.has(hbDeviceId) ? this.cusS.get(hbDeviceId).type : "motion";
-            accessory.context.rfChl = parseInt(switchNumber) - 1;
-            switch (accessory.context.sensorType) {
-            case "button":
-               accessory.addService(Service.Switch);
+            case "valve":
+               ["A", "B"].forEach(v => {
+                  accessory.addService(Service.Valve, "Valve " + v, "valve" + v.toLowerCase())
+                     .setCharacteristic(Characteristic.Active, 0)
+                     .setCharacteristic(Characteristic.InUse, 0)
+                     .setCharacteristic(Characteristic.ValveType, 1)
+                     .setCharacteristic(Characteristic.SetDuration, (this.config.valveTimeLength || 120))
+                     .addCharacteristic(Characteristic.RemainingDuration);
+               });
                break;
-            case "water":
-               accessory.addService(Service.LeakSensor);
+            case "blind":
+               accessory.addService(Service.WindowCovering)
+                  .setCharacteristic(Characteristic.CurrentPosition, 100)
+                  .setCharacteristic(Characteristic.TargetPosition, 100)
+                  .setCharacteristic(Characteristic.PositionState, 2);
                break;
-            case "fire":
-            case "smoke":
-               accessory.addService(Service.SmokeSensor);
+            case "garage":
+               accessory.addService(Service.GarageDoorOpener)
+                  .setCharacteristic(Characteristic.CurrentDoorState, 1)
+                  .setCharacteristic(Characteristic.TargetDoorState, 1)
+                  .setCharacteristic(Characteristic.ObstructionDetected, false);
                break;
-            case "co":
-               accessory.addService(Service.CarbonMonoxideSensor);
+            case "sensor":
+               accessory.addService(Service.ContactSensor);
                break;
-            case "co2":
-               accessory.addService(Service.CarbonDioxideSensor);
+            case "fan":
+               accessory.addService(Service.Fanv2);
+               accessory.addService(Service.Lightbulb);
                break;
-            case "contact":
-               accessory.addService(Service.ContactSensor);
+            case "thermostat":
+               accessory.addService(Service.Switch);
+               accessory.addService(Service.TemperatureSensor);
+               if (device.params.sensorType !== "DS18B20") {
+                  accessory.addService(Service.HumiditySensor);
+               }
                break;
-            case "occupancy":
-               accessory.addService(Service.OccupancySensor);
+            case "outlet":
+            case "usb":
+               accessory.addService(Service.Outlet);
                break;
-            case "motion":
-            default:
-               accessory.addService(Service.MotionSensor);
+            case "light":
+               accessory.addService(Service.Lightbulb);
                break;
-            }
-            break;
-         case "zb_sub":
-            switch (device.extra.uiid) {
-            case 1000: //*** credit @tasict ***\\
-               accessory.addService(Service.StatelessProgrammableSwitch);
-               if (this.hideZBLDPress) {
-                  accessory.getService(Service.StatelessProgrammableSwitch)
-                     .getCharacteristic(Characteristic.ProgrammableSwitchEvent)
-                     .setProps({
-                        validValues: [0]
-                     });
-               }
+            case "switch":
+            case "scm":
+               accessory.addService(Service.Switch);
                break;
-            case 1770:
-               accessory.addService(Service.TemperatureSensor);
-               accessory.addService(Service.HumiditySensor);
+            case "rf_pri":
+               accessory.context.rfChlMap = {};
+               accessory.context.updated = true;
                break;
-            case 2026:
-               accessory.addService(Service.MotionSensor);
+            case "zb_pri":
                break;
-            case 3026:
-               accessory.addService(Service.ContactSensor).setCharacteristic(Characteristic.ContactSensorState, 0);
+            case "rf_sub":
+               accessory.context.rfChls = {};
+               switch (device.tags.zyx_info[parseInt(switchNumber) - 1].remote_type) {
+                  case "1":
+                  case "2":
+                  case "3":
+                  case "4":
+                     accessory.context.sensorType = "button";
+                     break;
+                  case "6":
+                     accessory.context.sensorType = this.cusS.has(hbDeviceId) ? this.cusS.get(hbDeviceId).type : "motion";
+                     break;
+                  case "5":
+                  default:
+                     throw "RF device type is not supported";
+               }
+               let mAccessory = this.devicesInHB.get(device.deviceid + "SW0");
+               device.tags.zyx_info[parseInt(switchNumber) - 1].buttonName.forEach(button => {
+                  let rfChan, name;
+                  Object.entries(button).forEach(([k, v]) => {
+                     rfChan = k;
+                     name = v;
+                  });
+                  accessory.context.rfChls[rfChan] = name;
+                  mAccessory.context.rfChlMap[rfChan] = switchNumber;
+                  switch (accessory.context.sensorType) {
+                     case "button":
+                        accessory.addService(Service.Switch, name, "switch" + rfChan);
+                        break;
+                     case "water":
+                        accessory.addService(Service.LeakSensor);
+                        break;
+                     case "fire":
+                     case "smoke":
+                        accessory.addService(Service.SmokeSensor);
+                        break;
+                     case "co":
+                        accessory.addService(Service.CarbonMonoxideSensor);
+                        break;
+                     case "co2":
+                        accessory.addService(Service.CarbonDioxideSensor);
+                        break;
+                     case "contact":
+                        accessory.addService(Service.ContactSensor);
+                        break;
+                     case "occupancy":
+                        accessory.addService(Service.OccupancySensor);
+                        break;
+                     case "motion":
+                     default:
+                        accessory.addService(Service.MotionSensor);
+                        break;
+                  }
+                  this.devicesInHB.set(mAccessory.context.hbDeviceId, mAccessory);
+               });
+               break;
+            case "zb_sub": //*** credit @tasict ***\\
+               switch (device.extra.uiid) {
+                  case 1000:
+                     accessory.addService(Service.StatelessProgrammableSwitch);
+                     if (this.config.hideZBLDPress) {
+                        accessory.getService(Service.StatelessProgrammableSwitch)
+                           .getCharacteristic(Characteristic.ProgrammableSwitchEvent)
+                           .setProps({
+                              validValues: [0]
+                           });
+                     }
+                     break;
+                  case 1770:
+                     accessory.addService(Service.TemperatureSensor);
+                     accessory.addService(Service.HumiditySensor);
+                     break;
+                  case 2026:
+                     accessory.addService(Service.MotionSensor);
+                     break;
+                  case 3026:
+                     accessory.addService(Service.ContactSensor);
+                     break;
+                  default:
+                     throw "unsupported zigbee device type with uiid [" + device.extra.uiid + "]";
+               }
                break;
             default:
-               throw "unsupported zigbee device type with uiid [" + device.extra.uiid + "]";
-            }
-            break;
-         default:
-            throw "device is not supported by this plugin";
+               throw "device is not supported by this plugin";
          }
          this.devicesInHB.set(hbDeviceId, accessory);
-         this.api.registerPlatformAccessories(constants.packageName, "eWeLink", [accessory]);
+         this.api.registerPlatformAccessories(cns.packageName, "eWeLink", [accessory]);
          this.configureAccessory(accessory);
          this.log("[%s] has been added to Homebridge.", newDeviceName);
-      } catch (e) {
-         this.log.warn("[%s] could not be added as %s.", accessory.displayName, e);
+      } catch (err) {
+         this.log.warn("[%s] could not be added - %s.", newDeviceName, err);
       }
    }
    configureAccessory(accessory) {
@@ -419,276 +394,272 @@ class eWeLink {
       }
       try {
          switch (accessory.context.type) {
-         case "valve":
-            ["A", "B"].forEach(v => {
-               accessory.getService("Valve " + v).getCharacteristic(Characteristic.Active)
+            case "valve":
+               ["A", "B"].forEach(v => {
+                  accessory.getService("Valve " + v).getCharacteristic(Characteristic.Active)
+                     .on("set", (value, callback) => {
+                        accessory.getService("Valve " + v).getCharacteristic(Characteristic.Active).value !== value ?
+                           this.internalValveUpdate(accessory, "Valve " + v, value, callback) :
+                           callback();
+                     });
+                  accessory.getService("Valve " + v).getCharacteristic(Characteristic.SetDuration)
+                     .on("set", (value, callback) => {
+                        if (accessory.getService("Valve " + v).getCharacteristic(Characteristic.InUse).value) {
+                           accessory.getService("Valve " + v).updateCharacteristic(Characteristic.RemainingDuration, value);
+                           clearTimeout(accessory.getService("Valve " + v).timer);
+                           accessory.getService("Valve " + v).timer = setTimeout(() => {
+                              accessory.getService("Valve " + v).setCharacteristic(Characteristic.Active, 0);
+                           }, (value * 1000));
+                        }
+                        callback();
+                     });
+               });
+               break;
+            case "blind":
+               accessory.getService(Service.WindowCovering).getCharacteristic(Characteristic.TargetPosition)
+                  .setProps({
+                     minStep: 100
+                  })
                   .on("set", (value, callback) => {
-                     accessory.getService("Valve " + v).getCharacteristic(Characteristic.Active).value !== value ?
-                        this.internalValveUpdate(accessory, "Valve " + v, value, callback) :
+                     accessory.getService(Service.WindowCovering).getCharacteristic(Characteristic.TargetPosition).value !== value ?
+                        this.internalBlindUpdate(accessory, value, callback) :
                         callback();
                   });
-               accessory.getService("Valve " + v).getCharacteristic(Characteristic.SetDuration)
+               break;
+            case "garage":
+               accessory.getService(Service.GarageDoorOpener).getCharacteristic(Characteristic.TargetDoorState)
                   .on("set", (value, callback) => {
-                     if (accessory.getService("Valve " + v).getCharacteristic(Characteristic.InUse).value) {
-                        accessory.getService("Valve " + v).updateCharacteristic(Characteristic.RemainingDuration, value);
-                        clearTimeout(accessory.getService("Valve " + v).timer);
-                        accessory.getService("Valve " + v).timer = setTimeout(() => {
-                           accessory.getService("Valve " + v).setCharacteristic(Characteristic.Active, 0);
-                        }, (value * 1000));
-                     }
-                     callback();
+                     accessory.getService(Service.GarageDoorOpener).getCharacteristic(Characteristic.TargetDoorState).value !== value ?
+                        this.internalGarageUpdate(accessory, value, callback) :
+                        callback();
                   });
-            });
-            break;
-         case "blind":
-            accessory.getService(Service.WindowCovering).getCharacteristic(Characteristic.TargetPosition)
-               .setProps({
-                  minStep: 100
-               })
-               .on("set", (value, callback) => {
-                  accessory.getService(Service.WindowCovering).getCharacteristic(Characteristic.TargetPosition).value !== value ?
-                     this.internalBlindUpdate(accessory, value, callback) :
-                     callback();
-               });
-            break;
-         case "garage":
-            accessory.getService(Service.GarageDoorOpener).getCharacteristic(Characteristic.TargetDoorState)
-               .on("set", (value, callback) => {
-                  accessory.getService(Service.GarageDoorOpener).getCharacteristic(Characteristic.TargetDoorState).value !== value ?
-                     this.internalGarageUpdate(accessory, value, callback) :
-                     callback();
-               });
-            break;
-         case "fan":
-            accessory.getService(Service.Fanv2).getCharacteristic(Characteristic.Active)
-               .on("set", (value, callback) => {
-                  accessory.getService(Service.Fanv2).getCharacteristic(Characteristic.Active).value !== value ?
-                     this.internalFanUpdate(accessory, "power", value, callback) :
-                     callback();
-               });
-            accessory.getService(Service.Fanv2).getCharacteristic(Characteristic.RotationSpeed)
-               .setProps({
-                  minStep: 33
-               })
-               .on("set", (value, callback) => {
-                  accessory.getService(Service.Fanv2).getCharacteristic(Characteristic.RotationSpeed).value !== value ?
-                     this.internalFanUpdate(accessory, "speed", value, callback) :
-                     callback();
-               });
-            accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On)
-               .on("set", (value, callback) => {
-                  accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On).value !== value ?
-                     this.internalFanUpdate(accessory, "light", value, callback) :
-                     callback();
-               });
-            break;
-         case "thermostat":
-            accessory.getService(Service.Switch).getCharacteristic(Characteristic.On)
-               .on("set", (value, callback) => {
-                  accessory.getService(Service.Switch).getCharacteristic(Characteristic.On).value !== value ?
-                     this.internalThermostatUpdate(accessory, value, callback) :
-                     callback();
-               });
-            break;
-         case "outlet":
-            accessory.getService(Service.Outlet).getCharacteristic(Characteristic.On)
-               .on("set", (value, callback) => {
-                  accessory.getService(Service.Outlet).getCharacteristic(Characteristic.On).value !== value ?
-                     this.internalOutletUpdate(accessory, value, callback) :
-                     callback();
-               });
-            break;
-         case "usb":
-            accessory.getService(Service.Outlet).getCharacteristic(Characteristic.On)
-               .on("set", (value, callback) => {
-                  accessory.getService(Service.Outlet).getCharacteristic(Characteristic.On).value !== value ?
-                     this.internalUSBUpdate(accessory, value, callback) :
-                     callback();
-               });
-            break;
-         case "scm":
-            accessory.getService(Service.Switch).getCharacteristic(Characteristic.On)
-               .on("set", (value, callback) => {
-                  accessory.getService(Service.Switch).getCharacteristic(Characteristic.On).value !== value ?
-                     this.internalSCMUpdate(accessory, value, callback) :
-                     callback();
-               });
-            break;
-         case "light":
-            accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On)
-               .on("set", (value, callback) => {
-                  accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On).value !== value ?
-                     this.internalLightbulbUpdate(accessory, value, callback) :
-                     callback();
-               });
-            if (constants.devicesBrightable.includes(accessory.context.eweUIID)) {
-               accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.Brightness)
+               break;
+            case "fan":
+               accessory.getService(Service.Fanv2).getCharacteristic(Characteristic.Active)
                   .on("set", (value, callback) => {
-                     if (value > 0) {
-                        if (!accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On).value) {
-                           this.internalLightbulbUpdate(accessory, true, callback);
-                        }
-                        accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.Brightness).value !== value ?
-                           this.internalBrightnessUpdate(accessory, value, callback) :
-                           callback();
-                     } else {
-                        accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On).value ?
-                           this.internalLightbulbUpdate(accessory, false, callback) :
-                           callback();
-                     }
+                     accessory.getService(Service.Fanv2).getCharacteristic(Characteristic.Active).value !== value ?
+                        this.internalFanUpdate(accessory, "power", value, callback) :
+                        callback();
                   });
-            } else if (constants.devicesColourable.includes(accessory.context.eweUIID)) {
-               accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.Brightness)
+               accessory.getService(Service.Fanv2).getCharacteristic(Characteristic.RotationSpeed)
+                  .setProps({
+                     minStep: 33
+                  })
                   .on("set", (value, callback) => {
-                     if (value > 0) {
-                        if (!accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On).value) {
-                           this.internalLightbulbUpdate(accessory, true, callback);
-                        }
-                        accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.Brightness).value !== value ?
-                           this.internalHSBUpdate(accessory, "bri", value, callback) :
-                           callback();
-                     } else {
-                        accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On).value ?
-                           this.internalLightbulbUpdate(accessory, false, callback) :
-                           callback();
-                     }
+                     accessory.getService(Service.Fanv2).getCharacteristic(Characteristic.RotationSpeed).value !== value ?
+                        this.internalFanUpdate(accessory, "speed", value, callback) :
+                        callback();
                   });
-               accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.Hue)
+               accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On)
                   .on("set", (value, callback) => {
-                     accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.Hue).value !== value ?
-                        this.internalHSBUpdate(accessory, "hue", value, callback) :
+                     accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On).value !== value ?
+                        this.internalFanUpdate(accessory, "light", value, callback) :
                         callback();
                   });
-               accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.Saturation)
+               break;
+            case "thermostat":
+               accessory.getService(Service.Switch).getCharacteristic(Characteristic.On)
                   .on("set", (value, callback) => {
-                     accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.Saturation, value);
-                     callback();
+                     accessory.getService(Service.Switch).getCharacteristic(Characteristic.On).value !== value ?
+                        this.internalThermostatUpdate(accessory, value, callback) :
+                        callback();
                   });
-            }
-            break;
-         case "switch":
-            accessory.getService(Service.Switch).getCharacteristic(Characteristic.On)
-               .on("set", (value, callback) => {
-                  accessory.getService(Service.Switch).getCharacteristic(Characteristic.On).value !== value ?
-                     this.internalSwitchUpdate(accessory, value, callback) :
-                     callback();
-               });
-            break;
-         case "rf_sub":
-            if (accessory.context.sensorType === "button") {
+               break;
+            case "outlet":
+               accessory.getService(Service.Outlet).getCharacteristic(Characteristic.On)
+                  .on("set", (value, callback) => {
+                     accessory.getService(Service.Outlet).getCharacteristic(Characteristic.On).value !== value ?
+                        this.internalOutletUpdate(accessory, value, callback) :
+                        callback();
+                  });
+               break;
+            case "usb":
+               accessory.getService(Service.Outlet).getCharacteristic(Characteristic.On)
+                  .on("set", (value, callback) => {
+                     accessory.getService(Service.Outlet).getCharacteristic(Characteristic.On).value !== value ?
+                        this.internalUSBUpdate(accessory, value, callback) :
+                        callback();
+                  });
+               break;
+            case "scm":
                accessory.getService(Service.Switch).getCharacteristic(Characteristic.On)
                   .on("set", (value, callback) => {
-                     this.internalRFDeviceUpdate(accessory, true, callback);
+                     accessory.getService(Service.Switch).getCharacteristic(Characteristic.On).value !== value ?
+                        this.internalSCMUpdate(accessory, value, callback) :
+                        callback();
                   });
-            }
-            break;
+               break;
+            case "light":
+               accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On)
+                  .on("set", (value, callback) => {
+                     accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On).value !== value ?
+                        this.internalLightbulbUpdate(accessory, value, callback) :
+                        callback();
+                  });
+               if (cns.devicesBrightable.includes(accessory.context.eweUIID)) {
+                  accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.Brightness)
+                     .on("set", (value, callback) => {
+                        if (value > 0) {
+                           if (!accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On).value) {
+                              this.internalLightbulbUpdate(accessory, true, callback);
+                           }
+                           accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.Brightness).value !== value ?
+                              this.internalBrightnessUpdate(accessory, value, callback) :
+                              callback();
+                        } else {
+                           accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On).value ?
+                              this.internalLightbulbUpdate(accessory, false, callback) :
+                              callback();
+                        }
+                     });
+               } else if (cns.devicesColourable.includes(accessory.context.eweUIID)) {
+                  accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.Brightness)
+                     .on("set", (value, callback) => {
+                        if (value > 0) {
+                           if (!accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On).value) {
+                              this.internalLightbulbUpdate(accessory, true, callback);
+                           }
+                           accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.Brightness).value !== value ?
+                              this.internalHSBUpdate(accessory, "bri", value, callback) :
+                              callback();
+                        } else {
+                           accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On).value ?
+                              this.internalLightbulbUpdate(accessory, false, callback) :
+                              callback();
+                        }
+                     });
+                  accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.Hue)
+                     .on("set", (value, callback) => {
+                        accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.Hue).value !== value ?
+                           this.internalHSBUpdate(accessory, "hue", value, callback) :
+                           callback();
+                     });
+                  accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.Saturation)
+                     .on("set", (value, callback) => {
+                        accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.Saturation, value);
+                        callback();
+                     });
+               }
+               break;
+            case "switch":
+               accessory.getService(Service.Switch).getCharacteristic(Characteristic.On)
+                  .on("set", (value, callback) => {
+                     accessory.getService(Service.Switch).getCharacteristic(Characteristic.On).value !== value ?
+                        this.internalSwitchUpdate(accessory, value, callback) :
+                        callback();
+                  });
+               break;
+            case "rf_sub":
+               accessory.context.rfChls = accessory.context.rfChls || {};
+               if (accessory.context.sensorType === "button") {
+                  Object.entries(accessory.context.rfChls).forEach(([k, v]) => {
+                     accessory.getService(v).updateCharacteristic(Characteristic.On, false);
+                     accessory.getService(v).getCharacteristic(Characteristic.On)
+                        .on("set", (value, callback) => {
+                           value ?
+                              this.internalRFDeviceUpdate(accessory, k, callback) :
+                              callback();
+                        });
+                  });
+               }
+               break;
          }
          accessory.context.reachableWAN = true;
          accessory.context.reachableLAN = true;
          this.devicesInHB.set(accessory.context.hbDeviceId, accessory);
-         this.api.updatePlatformAccessories(constants.packageName, "eWeLink", [accessory]);
-      } catch (e) {
-         this.log.warn("[%s] could not be refreshed - [%s].", accessory.displayName, e);
+      } catch (err) {
+         this.log.warn("[%s] could not be refreshed - [%s].", accessory.displayName, err);
       }
    }
    refreshAccessory(accessory, newParams) {
       switch (accessory.context.type) {
-      case "valve":
-         if (Array.isArray(newParams.switches)) {
-            this.externalValveUpdate(accessory, newParams);
-         }
-         return true;
-      case "blind":
-         if (Array.isArray(newParams.switches)) {
-            this.externalBlindUpdate(accessory, newParams);
-         }
-         return true;
-      case "garage":
-         if (newParams.hasOwnProperty("switch") || Array.isArray(newParams.switches)) {
-            this.externalGarageUpdate(accessory, newParams);
-         }
-         return true;
-      case "sensor":
-         if (newParams.hasOwnProperty("switch")) {
-            this.externalSensorUpdate(accessory, newParams);
-         }
-         return true;
-      case "fan":
-         if (Array.isArray(newParams.switches) || (newParams.hasOwnProperty("light") && newParams.hasOwnProperty("fan") && newParams.hasOwnProperty("speed"))) {
-            this.externalFanUpdate(accessory, newParams);
-         }
-         return true;
-      case "thermostat":
-         if (newParams.hasOwnProperty("currentTemperature") || newParams.hasOwnProperty("currentHumidity") || newParams.hasOwnProperty("switch") || newParams.hasOwnProperty("masterSwitch")) {
-            this.externalThermostatUpdate(accessory, newParams);
-         }
-         return true;
-      case "outlet":
-         if (newParams.hasOwnProperty("switch")) {
-            this.externalOutletUpdate(accessory, newParams);
-         }
-         return true;
-      case "usb":
-         if (Array.isArray(newParams.switches)) {
-            this.externalUSBUpdate(accessory, newParams);
-         }
-         return true;
-      case "scm":
-         if (Array.isArray(newParams.switches)) {
-            this.externalSCMUpdate(accessory, newParams);
-         }
-         return true;
-      case "light":
-         if (constants.devicesSingleSwitch.includes(accessory.context.eweUIID) && constants.devicesSingleSwitchLight.includes(accessory.context.eweModel)) {
-            if (newParams.hasOwnProperty("switch") || newParams.hasOwnProperty("state") || newParams.hasOwnProperty("bright") || newParams.hasOwnProperty("colorR") || newParams.hasOwnProperty("brightness") || newParams.hasOwnProperty("channel0") || newParams.hasOwnProperty("channel2") || newParams.hasOwnProperty("zyx_mode")) {
-               this.externalSingleLightUpdate(accessory, newParams);
+         case "valve":
+            if (Array.isArray(newParams.switches)) {
+               this.externalValveUpdate(accessory, newParams);
             }
-         } else if (constants.devicesMultiSwitch.includes(accessory.context.eweUIID) && constants.devicesMultiSwitchLight.includes(accessory.context.eweModel)) {
+            return true;
+         case "blind":
             if (Array.isArray(newParams.switches)) {
-               this.externalMultiLightUpdate(accessory, newParams);
+               this.externalBlindUpdate(accessory, newParams);
             }
-         }
-         return true;
-      case "switch":
-         if (constants.devicesSingleSwitch.includes(accessory.context.eweUIID)) {
+            return true;
+         case "garage":
+            if (newParams.hasOwnProperty("switch") || Array.isArray(newParams.switches)) {
+               this.externalGarageUpdate(accessory, newParams);
+            }
+            return true;
+         case "sensor":
             if (newParams.hasOwnProperty("switch")) {
-               this.externalSingleSwitchUpdate(accessory, newParams);
+               this.externalSensorUpdate(accessory, newParams);
+            }
+            return true;
+         case "fan":
+            if (Array.isArray(newParams.switches) || (newParams.hasOwnProperty("light") && newParams.hasOwnProperty("fan") && newParams.hasOwnProperty("speed"))) {
+               this.externalFanUpdate(accessory, newParams);
+            }
+            return true;
+         case "thermostat":
+            if (newParams.hasOwnProperty("currentTemperature") || newParams.hasOwnProperty("currentHumidity") || newParams.hasOwnProperty("switch") || newParams.hasOwnProperty("masterSwitch")) {
+               this.externalThermostatUpdate(accessory, newParams);
+            }
+            return true;
+         case "outlet":
+            if (newParams.hasOwnProperty("switch")) {
+               this.externalOutletUpdate(accessory, newParams);
+            }
+            return true;
+         case "usb":
+            if (Array.isArray(newParams.switches)) {
+               this.externalUSBUpdate(accessory, newParams);
             }
-         } else if (constants.devicesMultiSwitch.includes(accessory.context.eweUIID)) {
+            return true;
+         case "scm":
             if (Array.isArray(newParams.switches)) {
-               this.externalMultiSwitchUpdate(accessory, newParams);
+               this.externalSCMUpdate(accessory, newParams);
             }
-         }
-         return true;
-      case "rf_pri":
-         this.externalRFDeviceUpdate(accessory, newParams);
-         return true;
-      case "rf_sub":
-      case "zb_pri":
-         return true;
-      case "zb_sub":
-         this.externalZBDeviceUpdate(accessory, newParams);
-         return true;
-      default:
-         return false;
+            return true;
+         case "light":
+            if (cns.devicesSingleSwitch.includes(accessory.context.eweUIID) && cns.devicesSingleSwitchLight.includes(accessory.context.eweModel)) {
+               if (newParams.hasOwnProperty("switch") || newParams.hasOwnProperty("state") || newParams.hasOwnProperty("bright") || newParams.hasOwnProperty("colorR") || newParams.hasOwnProperty("brightness") || newParams.hasOwnProperty("channel0") || newParams.hasOwnProperty("channel2") || newParams.hasOwnProperty("zyx_mode")) {
+                  this.externalSingleLightUpdate(accessory, newParams);
+               }
+            } else if (cns.devicesMultiSwitch.includes(accessory.context.eweUIID) && cns.devicesMultiSwitchLight.includes(accessory.context.eweModel)) {
+               if (Array.isArray(newParams.switches)) {
+                  this.externalMultiLightUpdate(accessory, newParams);
+               }
+            }
+            return true;
+         case "switch":
+            if (cns.devicesSingleSwitch.includes(accessory.context.eweUIID)) {
+               if (newParams.hasOwnProperty("switch")) {
+                  this.externalSingleSwitchUpdate(accessory, newParams);
+               }
+            } else if (cns.devicesMultiSwitch.includes(accessory.context.eweUIID)) {
+               if (Array.isArray(newParams.switches)) {
+                  this.externalMultiSwitchUpdate(accessory, newParams);
+               }
+            }
+            return true;
+         case "rf_pri":
+            this.externalRFDeviceUpdate(accessory, newParams);
+            return true;
+         case "rf_sub":
+         case "zb_pri":
+            return true;
+         case "zb_sub":
+            this.externalZBDeviceUpdate(accessory, newParams);
+            return true;
+         default:
+            return false;
       }
    }
    removeAccessory(accessory) {
       try {
          this.devicesInHB.delete(accessory.context.hbDeviceId);
-         this.api.unregisterPlatformAccessories(constants.packageName, "eWeLink", [accessory]);
-         this.log("[%s] will be removed from Homebridge.", accessory.displayName);
-      } catch (e) {
-         this.log.warn("[%s] needed to be removed but couldn't - [%s].", accessory.displayName, e);
-      }
-   }
-   removeAllAccessories() {
-      try {
-         this.log.warn("[0] primary devices were loaded from your eWeLink account so any eWeLink devices in the Homebridge cache will be removed. This plugin will not load as there is no reason to continue.");
-         this.api.unregisterPlatformAccessories(constants.packageName, "eWeLink", Array.from(this.devicesInHB.values()));
-         this.devicesInHB.clear();
-      } catch (e) {
-         this.log.warn("Accessories could not be removed from the Homebridge cache - [%s].", e);
+         this.api.unregisterPlatformAccessories(cns.packageName, "eWeLink", [accessory]);
+         this.log("[%s] has been removed from Homebridge.", accessory.displayName);
+      } catch (err) {
+         this.log.warn("[%s] needed to be removed but couldn't - [%s].", accessory.displayName, err);
       }
    }
    sendDeviceUpdate(accessory, params, callback) {
@@ -697,95 +668,70 @@ class eWeLink {
          deviceid: accessory.context.eweDeviceId,
          params
       };
-      switch (this.mode) {
-      case "lan":
-      default:
-         this.lanClient.sendUpdate(payload)
-            .then(res => {
-               callback();
-            })
-            .catch(err => {
-               if (accessory.context.reachableWAN) {
-                  if (this.debug) {
-                     this.log.warn("[%s] LAN update failed as %s. Trying web socket update.", accessory.displayName, err);
-                  }
-                  this.wsClient.sendUpdate(payload, callback);
-                  setTimeout(() => {
-                     this.wsClient.requestUpdate(accessory);
-                  }, 2500);
-               } else {
-                  this.log.error("[%s] could not be updated as it appears to be offline.", accessory.displayName);
-                  callback("Device has failed to update");
+      this.lanClient.sendUpdate(payload)
+         .then(res => {
+            callback();
+         })
+         .catch(err => {
+            if (accessory.context.reachableWAN) {
+               if (this.config.debug) {
+                  this.log.warn("[%s] Reverting to web socket as %s.", accessory.displayName, err);
                }
-            });
-         break;
-      case "ws":
-         this.wsClient.sendUpdate(payload, callback);
-         setTimeout(() => {
-            this.wsClient.requestUpdate(accessory);
-         }, 2500);
-         break;
-      }
+               this.wsClient.sendUpdate(payload, callback);
+               setTimeout(() => {
+                  this.wsClient.requestUpdate(accessory);
+               }, 3000);
+            } else {
+               this.log.error("[%s] could not be updated as it appears to be offline.", accessory.displayName);
+               callback("Device has failed to update");
+            }
+         });
    }
    receiveDeviceUpdate(device) {
-      let accessory;
+      let accessory, source = device.params.updateSource === "ws" ? "WS" : "LAN";
       switch (device.action) {
-      case "sysmsg":
-         if (this.devicesInHB.has(device.deviceid + "SWX") || this.devicesInHB.has(device.deviceid + "SW0")) {
-            accessory = this.devicesInHB.get(device.deviceid + "SWX") || this.devicesInHB.get(device.deviceid + "SW0");
-            try {
-               if (accessory.context.reachableWAN !== device.params.online) {
+         case "sysmsg":
+            if ((accessory = this.devicesInHB.get(device.deviceid + "SWX") || this.devicesInHB.get(device.deviceid + "SW0"))) {
+               let isX = accessory.context.hbDeviceId.substr(-1) === "X";
+               if (source === "ws" && accessory.context.reachableWAN !== device.params.online) {
                   accessory.context.reachableWAN = device.params.online;
                   this.log("[%s] has been reported [%s].", accessory.displayName, accessory.context.reachableWAN ? "online" : "offline");
                   this.devicesInHB.set(accessory.context.hbDeviceId, accessory);
-                  this.api.updatePlatformAccessories(constants.packageName, "eWeLink", [accessory]);
                   if (accessory.context.reachableWAN) {
                      this.wsClient.requestUpdate(accessory);
                   }
                }
-            } catch (e) {
-               this.log.warn("[%s] online/offline status could not be updated - [%s].", accessory.displayName, e);
-            }
-            if (this.devicesInHB.has(device.deviceid + "SW0")) {
-               let oAccessory;
-               for (let i = 1; i <= accessory.context.channelCount; i++) {
-                  try {
+               if (!isX) {
+                  for (let i = 1; i <= accessory.context.channelCount; i++) {
                      if (this.devicesInHB.has(device.deviceid + "SW" + i)) {
-                        oAccessory = this.devicesInHB.get(device.deviceid + "SW" + i);
+                        let oAccessory = this.devicesInHB.get(device.deviceid + "SW" + i);
                         oAccessory.context.reachableWAN = device.params.online;
                         this.devicesInHB.set(oAccessory.context.hbDeviceId, oAccessory);
-                        this.api.updatePlatformAccessories(constants.packageName, "eWeLink", [oAccessory]);
                      }
-                  } catch (e) {
-                     this.log.warn("[%s] online/offline status could not be updated - [%s].", oAccessory.displayName, e);
                   }
                }
             }
-         }
-         break;
-      case "update":
-         let source = device.params.updateSource === "ws" ? "WS" : "LAN";
-         if (this.devicesInHB.has(device.deviceid + "SWX") || this.devicesInHB.has(device.deviceid + "SW0")) {
-            accessory = this.devicesInHB.get(device.deviceid + "SWX") || this.devicesInHB.get(device.deviceid + "SW0");
-            if (source === "ws" && !accessory.context.reachableWAN) {
-               accessory.context.reachableWAN = true;
-            }
-            if (source === "lan" && !accessory.context.reachableLAN) {
-               accessory.context.reachableLAN = true;
-            }
-            if (this.debug) {
-               this.log("[%s] externally updated from above %s message and will be refreshed.", accessory.displayName, source);
-            }
-            if (this.refreshAccessory(accessory, device.params)) {
-               return;
+            break;
+         case "update":
+            if ((accessory = this.devicesInHB.get(device.deviceid + "SWX") || this.devicesInHB.get(device.deviceid + "SW0"))) {
+               if (source === "ws" && !accessory.context.reachableWAN) {
+                  accessory.context.reachableWAN = true;
+               }
+               if (source === "lan" && !accessory.context.reachableLAN) {
+                  accessory.context.reachableLAN = true;
+               }
+               if (this.config.debug) {
+                  this.log("[%s] externally updated from above %s message and will be refreshed.", accessory.displayName, source);
+               }
+               if (!this.refreshAccessory(accessory, device.params)) {
+                  this.log.warn("[%s] cannot be refreshed. Please try removing accessory from the Homebridge cache along with any secondary devices (SW1, SW2, etc.). [debug:%s:%s]", accessory.displayName, accessory.context.type, accessory.context.channelCount);
+               }
+            } else {
+               if (!(this.config.hideDevFromHB || "").includes(device.deviceid)) {
+                  this.log.warn("[%s] Accessory received via %s update does not exist in Homebridge. If it's a new accessory please restart Homebridge so it is added.", device.deviceid, source);
+               }
             }
-            this.log.warn("[%s] cannot be refreshed. Please try removing accessory from the Homebridge cache along with any secondary devices (SW1, SW2, etc.). Debugging: [%s:%s:%s]", accessory.displayName, "refresh", accessory.context.type, accessory.context.channelCount);
-         } else if (this.customHideDvceFromHB.includes(device.deviceid)) {
-            this.log.warn("[%s] %s update is for hidden accessory.", device.deviceid, source);
-         } else {
-            this.log.warn("[%s] Accessory received via %s update does not exist in Homebridge. If it's a new accessory please restart Homebridge so it is added.", device.deviceid, source);
-         }
-         break;
+            break;
       }
    }
    internalValveUpdate(accessory, valve, value, callback) {
@@ -798,30 +744,30 @@ class eWeLink {
             .updateCharacteristic(Characteristic.Active, value)
             .updateCharacteristic(Characteristic.InUse, value);
          switch (value) {
-         case 0:
-            accessory.getService(valve).updateCharacteristic(Characteristic.RemainingDuration, 0);
-            clearTimeout(accessory.getService(valve).timer);
-            break;
-         case 1:
-            let timer = accessory.getService(valve).getCharacteristic(Characteristic.SetDuration).value;
-            accessory.getService(valve).updateCharacteristic(Characteristic.RemainingDuration, timer);
-            accessory.getService(valve).timer = setTimeout(() => {
-               accessory.getService(valve).setCharacteristic(Characteristic.Active, 0);
-            }, (timer * 1000));
-            break;
+            case 0:
+               accessory.getService(valve).updateCharacteristic(Characteristic.RemainingDuration, 0);
+               clearTimeout(accessory.getService(valve).timer);
+               break;
+            case 1:
+               let timer = accessory.getService(valve).getCharacteristic(Characteristic.SetDuration).value;
+               accessory.getService(valve).updateCharacteristic(Characteristic.RemainingDuration, timer);
+               accessory.getService(valve).timer = setTimeout(() => {
+                  accessory.getService(valve).setCharacteristic(Characteristic.Active, 0);
+               }, (timer * 1000));
+               break;
          }
          params.switches = this.devicesInEwe.get(accessory.context.eweDeviceId).params.switches;
          switch (valve) {
-         case "Valve A":
-            params.switches[0].switch = value ? "on" : "off";
-            params.switches[1].switch = accessory.getService("Valve B").getCharacteristic(Characteristic.Active).value ? "on" : "off";
-            break;
-         case "Valve B":
-            params.switches[0].switch = accessory.getService("Valve A").getCharacteristic(Characteristic.Active).value ? "on" : "off";
-            params.switches[1].switch = value ? "on" : "off";
-            break;
-         default:
-            throw "unknown valve [" + valve + "]";
+            case "Valve A":
+               params.switches[0].switch = value ? "on" : "off";
+               params.switches[1].switch = accessory.getService("Valve B").getCharacteristic(Characteristic.Active).value ? "on" : "off";
+               break;
+            case "Valve B":
+               params.switches[0].switch = accessory.getService("Valve A").getCharacteristic(Characteristic.Active).value ? "on" : "off";
+               params.switches[1].switch = value ? "on" : "off";
+               break;
+            default:
+               throw "unknown valve [" + valve + "]";
          }
          params.switches[2].switch = "off";
          params.switches[3].switch = "off";
@@ -855,16 +801,16 @@ class eWeLink {
             return;
          }
          switch (blindConfig.setup) {
-         case "oneSwitch":
-            params.switch = "on";
-            break;
-         case "twoSwitch":
-            params.switches = this.devicesInEwe.get(accessory.context.eweDeviceId).params.switches;
-            params.switches[0].switch = value === 100 ? "on" : "off";
-            params.switches[1].switch = value === 0 ? "on" : "off";
-            break;
+            case "oneSwitch":
+               params.switch = "on";
+               break;
+            case "twoSwitch":
+               params.switches = this.devicesInEwe.get(accessory.context.eweDeviceId).params.switches;
+               params.switches[0].switch = value === 100 ? "on" : "off";
+               params.switches[1].switch = value === 0 ? "on" : "off";
+               break;
          }
-         this.sendDeviceUpdate(accessory, params, function () {
+         this.sendDeviceUpdate(accessory, params, function() {
             return;
          });
          accessory.getService(Service.WindowCovering)
@@ -873,15 +819,15 @@ class eWeLink {
          if (!blindConfig.inched || blindConfig.inched === "false") {
             setTimeout(() => {
                switch (blindConfig.setup) {
-               case "oneSwitch":
-                  params.switch = "off";
-                  break;
-               case "twoSwitch":
-                  params.switches[0].switch = "off";
-                  params.switches[1].switch = "off";
-                  break;
+                  case "oneSwitch":
+                     params.switch = "off";
+                     break;
+                  case "twoSwitch":
+                     params.switches[0].switch = "off";
+                     params.switches[1].switch = "off";
+                     break;
                }
-               this.sendDeviceUpdate(accessory, params, function () {
+               this.sendDeviceUpdate(accessory, params, function() {
                   return;
                });
             }, 500);
@@ -928,16 +874,16 @@ class eWeLink {
             return;
          }
          switch (garageConfig.setup) {
-         case "oneSwitch":
-            params.switch = "on";
-            break;
-         case "twoSwitch":
-            params.switches = this.devicesInEwe.get(accessory.context.eweDeviceId).params.switches;
-            params.switches[0].switch = value === 0 ? "on" : "off";
-            params.switches[1].switch = value === 1 ? "on" : "off";
-            break;
+            case "oneSwitch":
+               params.switch = "on";
+               break;
+            case "twoSwitch":
+               params.switches = this.devicesInEwe.get(accessory.context.eweDeviceId).params.switches;
+               params.switches[0].switch = value === 0 ? "on" : "off";
+               params.switches[1].switch = value === 1 ? "on" : "off";
+               break;
          }
-         this.sendDeviceUpdate(accessory, params, function () {
+         this.sendDeviceUpdate(accessory, params, function() {
             return;
          });
          accessory.getService(Service.GarageDoorOpener)
@@ -946,15 +892,15 @@ class eWeLink {
          if (!garageConfig.inched || garageConfig.inched === "false") {
             setTimeout(() => {
                switch (garageConfig.setup) {
-               case "oneSwitch":
-                  params.switch = "off";
-                  break;
-               case "twoSwitch":
-                  params.switches[0].switch = "off";
-                  params.switches[1].switch = "off";
-                  break;
+                  case "oneSwitch":
+                     params.switch = "off";
+                     break;
+                  case "twoSwitch":
+                     params.switches[0].switch = "off";
+                     params.switches[1].switch = "off";
+                     break;
                }
-               this.sendDeviceUpdate(accessory, params, function () {
+               this.sendDeviceUpdate(accessory, params, function() {
                   return;
                });
             }, 500);
@@ -981,21 +927,21 @@ class eWeLink {
          }
          let newPower, newSpeed, newLight;
          switch (type) {
-         case "power":
-            newPower = value;
-            newSpeed = value ? 33 : 0;
-            newLight = accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On).value;
-            break;
-         case "speed":
-            newPower = value >= 33 ? 1 : 0;
-            newSpeed = value;
-            newLight = accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On).value;
-            break;
-         case "light":
-            newPower = accessory.getService(Service.Fanv2).getCharacteristic(Characteristic.Active).value;
-            newSpeed = accessory.getService(Service.Fanv2).getCharacteristic(Characteristic.RotationSpeed).value;
-            newLight = value;
-            break;
+            case "power":
+               newPower = value;
+               newSpeed = value ? 33 : 0;
+               newLight = accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On).value;
+               break;
+            case "speed":
+               newPower = value >= 33 ? 1 : 0;
+               newSpeed = value;
+               newLight = accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On).value;
+               break;
+            case "light":
+               newPower = accessory.getService(Service.Fanv2).getCharacteristic(Characteristic.Active).value;
+               newSpeed = accessory.getService(Service.Fanv2).getCharacteristic(Characteristic.RotationSpeed).value;
+               newLight = value;
+               break;
          }
          accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, newLight);
          accessory.getService(Service.Fanv2)
@@ -1008,7 +954,7 @@ class eWeLink {
          params.switches[1].switch = (newPower === 1 && newSpeed >= 33) ? "on" : "off";
          params.switches[2].switch = (newPower === 1 && newSpeed >= 66 && newSpeed < 99) ? "on" : "off";
          params.switches[3].switch = (newPower === 1 && newSpeed >= 99) ? "on" : "off";
-         if (this.debug) {
+         if (this.config.debug) {
             this.log.warn("Fan Update - setting " + type + " to " + value);
             this.log("[%s] new stats: power [%s], speed [%s%], light [%s].", accessory.displayName, newPower, newSpeed, newLight);
          }
@@ -1028,7 +974,7 @@ class eWeLink {
             switch: value ? "on" : "off",
             mainSwitch: value ? "on" : "off"
          };
-         if (this.debug) {
+         if (this.config.debug) {
             this.log("[%s] updating to turn [%s].", accessory.displayName, value ? "on" : "off");
          }
          accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, value);
@@ -1047,7 +993,7 @@ class eWeLink {
          let params = {
             switch: value ? "on" : "off"
          };
-         if (this.debug) {
+         if (this.config.debug) {
             this.log("[%s] requesting to turn [%s].", accessory.displayName, value ? "on" : "off");
          }
          accessory.getService(Service.Outlet).updateCharacteristic(Characteristic.On, value);
@@ -1065,7 +1011,7 @@ class eWeLink {
             switches: this.devicesInEwe.get(accessory.context.eweDeviceId).params.switches
          };
          params.switches[0].switch = value ? "on" : "off";
-         if (this.debug) {
+         if (this.config.debug) {
             this.log("[%s] requesting to turn [%s].", accessory.displayName, value ? "on" : "off");
          }
          accessory.getService(Service.Outlet).updateCharacteristic(Characteristic.On, value);
@@ -1083,7 +1029,7 @@ class eWeLink {
             switches: this.devicesInEwe.get(accessory.context.eweDeviceId).params.switches
          };
          params.switches[0].switch = value ? "on" : "off";
-         if (this.debug) {
+         if (this.config.debug) {
             this.log("[%s] requesting to turn [%s].", accessory.displayName, value ? "on" : "off");
          }
          accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, value);
@@ -1099,62 +1045,62 @@ class eWeLink {
          }
          let oAccessory, params = {};
          switch (accessory.context.switchNumber) {
-         case "X":
-            if (accessory.context.eweUIID === 22) { //*** B1 ***\\
-               params.state = value ? "on" : "off";
-            } else {
-               params.switch = value ? "on" : "off";
-            }
-            if (this.debug) {
-               this.log("[%s] updating to turn [%s].", accessory.displayName, value ? "on" : "off");
-            }
-            accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, value);
-            break;
-         case "0":
-            params.switches = this.devicesInEwe.get(accessory.context.eweDeviceId).params.switches;
-            params.switches[0].switch = value ? "on" : "off";
-            params.switches[1].switch = value ? "on" : "off";
-            params.switches[2].switch = value ? "on" : "off";
-            params.switches[3].switch = value ? "on" : "off";
-            if (this.debug) {
-               this.log("[%s] updating to turn group [%s].", accessory.displayName, value ? "on" : "off");
-            }
-            accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, value);
-            for (let i = 1; i <= 4; i++) {
-               if (this.devicesInHB.has(accessory.context.eweDeviceId + "SW" + i)) {
-                  oAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW" + i);
-                  oAccessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, value);
+            case "X":
+               if (accessory.context.eweUIID === 22) { //*** B1 ***\\
+                  params.state = value ? "on" : "off";
+               } else {
+                  params.switch = value ? "on" : "off";
                }
-            }
-            break;
-         case "1":
-         case "2":
-         case "3":
-         case "4":
-            if (this.debug) {
-               this.log("[%s] updating to turn [%s].", accessory.displayName, value ? "on" : "off");
-            }
-            accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, value);
-            let tAccessory,
-               masterState = "off";
-            params.switches = this.devicesInEwe.get(accessory.context.eweDeviceId).params.switches;
-            for (let i = 1; i <= 4; i++) {
-               if ((tAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW" + i))) {
-                  i === parseInt(accessory.context.switchNumber) ?
-                     params.switches[i - 1].switch = value ? "on" : "off" :
-                     params.switches[i - 1].switch = tAccessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On).value ? "on" : "off";
-                  if (tAccessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On).value) {
-                     masterState = "on";
+               if (this.config.debug) {
+                  this.log("[%s] updating to turn [%s].", accessory.displayName, value ? "on" : "off");
+               }
+               accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, value);
+               break;
+            case "0":
+               params.switches = this.devicesInEwe.get(accessory.context.eweDeviceId).params.switches;
+               params.switches[0].switch = value ? "on" : "off";
+               params.switches[1].switch = value ? "on" : "off";
+               params.switches[2].switch = value ? "on" : "off";
+               params.switches[3].switch = value ? "on" : "off";
+               if (this.config.debug) {
+                  this.log("[%s] updating to turn group [%s].", accessory.displayName, value ? "on" : "off");
+               }
+               accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, value);
+               for (let i = 1; i <= 4; i++) {
+                  if (this.devicesInHB.has(accessory.context.eweDeviceId + "SW" + i)) {
+                     oAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW" + i);
+                     oAccessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, value);
                   }
-               } else {
-                  params.switches[i - 1].switch = "off";
                }
-            }
-            oAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW0");
-            oAccessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, masterState === "on");
-            break;
-         default:
-            throw "unknown switch number [" + accessory.context.switchNumber + "]";
+               break;
+            case "1":
+            case "2":
+            case "3":
+            case "4":
+               if (this.config.debug) {
+                  this.log("[%s] updating to turn [%s].", accessory.displayName, value ? "on" : "off");
+               }
+               accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, value);
+               let tAccessory,
+                  masterState = "off";
+               params.switches = this.devicesInEwe.get(accessory.context.eweDeviceId).params.switches;
+               for (let i = 1; i <= 4; i++) {
+                  if ((tAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW" + i))) {
+                     i === parseInt(accessory.context.switchNumber) ?
+                        params.switches[i - 1].switch = value ? "on" : "off" :
+                        params.switches[i - 1].switch = tAccessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On).value ? "on" : "off";
+                     if (tAccessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On).value) {
+                        masterState = "on";
+                     }
+                  } else {
+                     params.switches[i - 1].switch = "off";
+                  }
+               }
+               oAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW0");
+               oAccessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, masterState === "on");
+               break;
+            default:
+               throw "unknown switch number [" + accessory.context.switchNumber + "]";
          }
          this.sendDeviceUpdate(accessory, params, callback);
       } catch (err) {
@@ -1177,19 +1123,19 @@ class eWeLink {
                params.switch = "on";
             }
             switch (accessory.context.eweUIID) {
-            case 36: //*** KING-M4 ***\\
-               params.bright = Math.round(value * 9 / 10 + 10);
-               break;
-            case 44: //*** D1 ***\\
-               params.brightness = value;
-               params.mode = 0;
-               break;
-            default:
-               throw "unknown device UIID";
+               case 36: //*** KING-M4 ***\\
+                  params.bright = Math.round(value * 9 / 10 + 10);
+                  break;
+               case 44: //*** D1 ***\\
+                  params.brightness = value;
+                  params.mode = 0;
+                  break;
+               default:
+                  throw "unknown device UIID";
             }
             accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.Brightness, value);
          }
-         if (this.debug) {
+         if (this.config.debug) {
             this.log("[%s] updating brightness to [%s%].", accessory.displayName, value);
          }
          setTimeout(() => {
@@ -1211,64 +1157,64 @@ class eWeLink {
             curHue = accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.Hue).value,
             curSat = accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.Saturation).value;
          switch (type) {
-         case "hue":
-            newRGB = convert.hsv.rgb(value, curSat, 100);
-            switch (accessory.context.eweUIID) {
-            case 22: //*** B1 ***\\
-               params = {
-                  zyx_mode: 2,
-                  type: "middle",
-                  channel0: "0",
-                  channel1: "0",
-                  channel2: newRGB[0].toString(),
-                  channel3: newRGB[1].toString(),
-                  channel4: newRGB[2].toString()
-               };
+            case "hue":
+               newRGB = convert.hsv.rgb(value, curSat, 100);
+               switch (accessory.context.eweUIID) {
+                  case 22: //*** B1 ***\\
+                     params = {
+                        zyx_mode: 2,
+                        type: "middle",
+                        channel0: "0",
+                        channel1: "0",
+                        channel2: newRGB[0].toString(),
+                        channel3: newRGB[1].toString(),
+                        channel4: newRGB[2].toString()
+                     };
+                     break;
+                  case 59: //*** L1 ***\\
+                     params = {
+                        mode: 1,
+                        colorR: newRGB[0],
+                        colorG: newRGB[1],
+                        colorB: newRGB[2]
+                     };
+                     break;
+                  default:
+                     throw "unknown device UIID";
+               }
+               if (this.config.debug) {
+                  this.log("[%s] updating hue to [%s°].", accessory.displayName, value);
+               }
+               accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.Hue, value);
                break;
-            case 59: //*** L1 ***\\
-               params = {
-                  mode: 1,
-                  colorR: newRGB[0],
-                  colorG: newRGB[1],
-                  colorB: newRGB[2]
-               };
+            case "bri":
+               switch (accessory.context.eweUIID) {
+                  case 22: //*** B1 ***\\
+                     newRGB = convert.hsv.rgb(curHue, curSat, value);
+                     params = {
+                        zyx_mode: 2,
+                        type: "middle",
+                        channel0: "0",
+                        channel1: "0",
+                        channel2: newRGB[0].toString(),
+                        channel3: newRGB[1].toString(),
+                        channel4: newRGB[2].toString()
+                     };
+                     break;
+                  case 59: //*** L1 ***\\
+                     params = {
+                        mode: 1,
+                        bright: value
+                     };
+                     break;
+               }
+               if (this.config.debug) {
+                  this.log("[%s] updating brightness to [%s%].", accessory.displayName, value);
+               }
+               accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.Brightness, value);
                break;
             default:
                throw "unknown device UIID";
-            }
-            if (this.debug) {
-               this.log("[%s] updating hue to [%s°].", accessory.displayName, value);
-            }
-            accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.Hue, value);
-            break;
-         case "bri":
-            switch (accessory.context.eweUIID) {
-            case 22: //*** B1 ***\\
-               newRGB = convert.hsv.rgb(curHue, curSat, value);
-               params = {
-                  zyx_mode: 2,
-                  type: "middle",
-                  channel0: "0",
-                  channel1: "0",
-                  channel2: newRGB[0].toString(),
-                  channel3: newRGB[1].toString(),
-                  channel4: newRGB[2].toString()
-               };
-               break;
-            case 59: //*** L1 ***\\
-               params = {
-                  mode: 1,
-                  bright: value
-               };
-               break;
-            }
-            if (this.debug) {
-               this.log("[%s] updating brightness to [%s%].", accessory.displayName, value);
-            }
-            accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.Brightness, value);
-            break;
-         default:
-            throw "unknown device UIID";
          }
          setTimeout(() => {
             this.sendDeviceUpdate(accessory, params, callback);
@@ -1286,58 +1232,58 @@ class eWeLink {
          }
          let oAccessory, params = {};
          switch (accessory.context.switchNumber) {
-         case "X":
-            params.switch = value ? "on" : "off";
-            if (this.debug) {
-               this.log("[%s] updating to turn [%s].", accessory.displayName, value ? "on" : "off");
-            }
-            accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, value);
-            break;
-         case "0":
-            params.switches = this.devicesInEwe.get(accessory.context.eweDeviceId).params.switches;
-            params.switches[0].switch = value ? "on" : "off";
-            params.switches[1].switch = value ? "on" : "off";
-            params.switches[2].switch = value ? "on" : "off";
-            params.switches[3].switch = value ? "on" : "off";
-            if (this.debug) {
-               this.log("[%s] updating to turn group [%s].", accessory.displayName, value ? "on" : "off");
-            }
-            accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, value);
-            for (let i = 1; i <= 4; i++) {
-               if (this.devicesInHB.has(accessory.context.eweDeviceId + "SW" + i)) {
-                  oAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW" + i);
-                  oAccessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, value);
+            case "X":
+               params.switch = value ? "on" : "off";
+               if (this.config.debug) {
+                  this.log("[%s] updating to turn [%s].", accessory.displayName, value ? "on" : "off");
                }
-            }
-            break;
-         case "1":
-         case "2":
-         case "3":
-         case "4":
-            if (this.debug) {
-               this.log("[%s] updating to turn [%s].", accessory.displayName, value ? "on" : "off");
-            }
-            accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, value);
-            let tAccessory,
-               masterState = "off";
-            params.switches = this.devicesInEwe.get(accessory.context.eweDeviceId).params.switches;
-            for (let i = 1; i <= 4; i++) {
-               if ((tAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW" + i))) {
-                  i === parseInt(accessory.context.switchNumber) ?
-                     params.switches[i - 1].switch = value ? "on" : "off" :
-                     params.switches[i - 1].switch = tAccessory.getService(Service.Switch).getCharacteristic(Characteristic.On).value ? "on" : "off";
-                  if (tAccessory.getService(Service.Switch).getCharacteristic(Characteristic.On).value) {
-                     masterState = "on";
+               accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, value);
+               break;
+            case "0":
+               params.switches = this.devicesInEwe.get(accessory.context.eweDeviceId).params.switches;
+               params.switches[0].switch = value ? "on" : "off";
+               params.switches[1].switch = value ? "on" : "off";
+               params.switches[2].switch = value ? "on" : "off";
+               params.switches[3].switch = value ? "on" : "off";
+               if (this.config.debug) {
+                  this.log("[%s] updating to turn group [%s].", accessory.displayName, value ? "on" : "off");
+               }
+               accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, value);
+               for (let i = 1; i <= 4; i++) {
+                  if (this.devicesInHB.has(accessory.context.eweDeviceId + "SW" + i)) {
+                     oAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW" + i);
+                     oAccessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, value);
                   }
-               } else {
-                  params.switches[i - 1].switch = "off";
                }
-            }
-            oAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW0");
-            oAccessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, masterState === "on");
-            break;
-         default:
-            throw "unknown switch number [" + accessory.context.switchNumber + "]";
+               break;
+            case "1":
+            case "2":
+            case "3":
+            case "4":
+               if (this.config.debug) {
+                  this.log("[%s] updating to turn [%s].", accessory.displayName, value ? "on" : "off");
+               }
+               accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, value);
+               let tAccessory,
+                  masterState = "off";
+               params.switches = this.devicesInEwe.get(accessory.context.eweDeviceId).params.switches;
+               for (let i = 1; i <= 4; i++) {
+                  if ((tAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW" + i))) {
+                     i === parseInt(accessory.context.switchNumber) ?
+                        params.switches[i - 1].switch = value ? "on" : "off" :
+                        params.switches[i - 1].switch = tAccessory.getService(Service.Switch).getCharacteristic(Characteristic.On).value ? "on" : "off";
+                     if (tAccessory.getService(Service.Switch).getCharacteristic(Characteristic.On).value) {
+                        masterState = "on";
+                     }
+                  } else {
+                     params.switches[i - 1].switch = "off";
+                  }
+               }
+               oAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW0");
+               oAccessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, masterState === "on");
+               break;
+            default:
+               throw "unknown switch number [" + accessory.context.switchNumber + "]";
          }
          this.sendDeviceUpdate(accessory, params, callback);
       } catch (err) {
@@ -1367,25 +1313,26 @@ class eWeLink {
          this.log.warn("[%s] could not be updated - [%s].", accessory.displayName, err);
       }
    }
-   internalRFDeviceUpdate(accessory, value, callback) {
+   internalRFDeviceUpdate(accessory, rfChl, callback) {
       try {
          if (!accessory.context.reachableWAN && !accessory.context.reachableLAN) {
             throw "it is currently offline";
          }
+         rfChl = parseInt(rfChl);
          let params = {
             cmd: "transmit",
-            rfChl: accessory.context.rfChl
+            rfChl
          };
-         if (this.debug) {
-            this.log("[%s] mimicking RF button press.", accessory.displayName);
+         if (this.config.debug) {
+            this.log("[%s %s] mimicking RF button press.", accessory.displayName, accessory.context.rfChls[rfChl]);
          }
-         accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, true);
+         accessory.getService(accessory.context.rfChls[rfChl]).updateCharacteristic(Characteristic.On, true);
          this.sendDeviceUpdate(accessory, params, callback);
          setTimeout(() => {
-            accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, false);
-         }, 500);
+            accessory.getService(accessory.context.rfChls[rfChl]).updateCharacteristic(Characteristic.On, false);
+         }, 3000);
       } catch (err) {
-         let str = "[" + accessory.displayName + "] could not be updated as " + err + ".";
+         let str = "[" + accessory.displayName + " " + name + "] could not be updated as " + err + ".";
          this.log.error(str);
          callback(str);
       }
@@ -1400,20 +1347,20 @@ class eWeLink {
             throw "improper configuration";
          }
          switch (blindConfig.setup) {
-         case "oneSwitch":
-            if (params.switch === "off") {
-               return;
-            }
-            nSte = accessory.getService(Service.WindowCovering).getCharacteristic(Characteristic.PositionState).value === 0 ? 1 : 0;
-            break;
-         case "twoSwitch":
-            if (params.switches[0].switch === "off" && params.switches[1].switch === "off") {
-               return;
-            }
-            let switchUp = params.switches[0].switch === "on" ? -1 : 0, // matrix of numbers to get
-               switchDown = params.switches[1].switch === "on" ? 0 : 2; // ... the correct HomeKit value
-            nSte = switchUp + switchDown;
-            break;
+            case "oneSwitch":
+               if (params.switch === "off") {
+                  return;
+               }
+               nSte = accessory.getService(Service.WindowCovering).getCharacteristic(Characteristic.PositionState).value === 0 ? 1 : 0;
+               break;
+            case "twoSwitch":
+               if (params.switches[0].switch === "off" && params.switches[1].switch === "off") {
+                  return;
+               }
+               let switchUp = params.switches[0].switch === "on" ? -1 : 0, // matrix of numbers to get
+                  switchDown = params.switches[1].switch === "on" ? 0 : 2; // ... the correct HomeKit value
+               nSte = switchUp + switchDown;
+               break;
          }
          accessory.getService(Service.WindowCovering)
             .updateCharacteristic(Characteristic.PositionState, nSte)
@@ -1437,18 +1384,18 @@ class eWeLink {
             throw "improper configuration";
          }
          switch (garageConfig.setup) {
-         case "oneSwitch":
-            if (params.switch === "off" || garageConfig.sensorId) {
-               return;
-            }
-            nSte = [0, 2].includes(accessory.getService(Service.GarageDoorOpener).getCharacteristic(Characteristic.CurrentDoorState).value) ? 3 : 2;
-            break;
-         case "twoSwitch":
-            if (params.switches[0].switch === "off" && params.switches[1].switch === "off") {
+            case "oneSwitch":
+               if (params.switch === "off" || garageConfig.sensorId) {
+                  return;
+               }
+               nSte = [0, 2].includes(accessory.getService(Service.GarageDoorOpener).getCharacteristic(Characteristic.CurrentDoorState).value) ? 3 : 2;
+               break;
+            case "twoSwitch":
+               if (params.switches[0].switch === "off" && params.switches[1].switch === "off") {
+                  return;
+               }
+               // @TODO twoSwitch garage external update
                return;
-            }
-            // @TODO twoSwitch garage external update
-            return;
          }
          if (garageConfig.setup !== "oneSwitch" || !garageConfig.sensorId) {
             accessory.getService(Service.GarageDoorOpener)
@@ -1474,22 +1421,22 @@ class eWeLink {
             if (group.sensorId === accessory.context.eweDeviceId && group.type === "garage") {
                if ((oAccessory = this.devicesInHB.get(group.deviceId + "SWX"))) {
                   switch (newState) {
-                  case 0:
-                     oAccessory.getService(Service.GarageDoorOpener)
-                        .updateCharacteristic(Characteristic.TargetDoorState, 1)
-                        .updateCharacteristic(Characteristic.CurrentDoorState, 1);
-                     this.log("[%s] updating to [closed] based on sensor.", oAccessory.displayName);
-                     break;
-                  case 1:
-                     setTimeout(() => {
+                     case 0:
                         oAccessory.getService(Service.GarageDoorOpener)
-                           .updateCharacteristic(Characteristic.TargetDoorState, 0)
-                           .updateCharacteristic(Characteristic.CurrentDoorState, 0);
-                        this.log("[%s] updating to [open] based on sensor.", oAccessory.displayName);
-                     }, group.operationTime * 100);
-                     break;
-                  default:
-                     throw "unknown sensor status received";
+                           .updateCharacteristic(Characteristic.TargetDoorState, 1)
+                           .updateCharacteristic(Characteristic.CurrentDoorState, 1);
+                        this.log("[%s] updating to [closed] based on sensor.", oAccessory.displayName);
+                        break;
+                     case 1:
+                        setTimeout(() => {
+                           oAccessory.getService(Service.GarageDoorOpener)
+                              .updateCharacteristic(Characteristic.TargetDoorState, 0)
+                              .updateCharacteristic(Characteristic.CurrentDoorState, 0);
+                           this.log("[%s] updating to [open] based on sensor.", oAccessory.displayName);
+                        }, group.operationTime * 100);
+                        break;
+                     default:
+                        throw "unknown sensor status received";
                   }
                }
             }
@@ -1504,21 +1451,21 @@ class eWeLink {
          if (Array.isArray(params.switches)) {
             light = params.switches[0].switch === "on";
             switch (params.switches[1].switch+params.switches[2].switch+params.switches[3].switch) {
-            default:
-               status = 0;
-               speed = 0;
-               break;
-            case "onoffoff":
-               status = 1;
-               speed = 33;
-               break;
-            case "ononoff":
-               status = 1;
-               speed = 66;
-               break;
-            case "onoffon":
-               status = 1;
-               speed = 99;
+               default:
+                  status = 0;
+                  speed = 0;
+                  break;
+               case "onoffoff":
+                  status = 1;
+                  speed = 33;
+                  break;
+               case "ononoff":
+                  status = 1;
+                  speed = 66;
+                  break;
+               case "onoffon":
+                  status = 1;
+                  speed = 99;
             }
          } else if (params.hasOwnProperty("light") && params.hasOwnProperty("fan") && params.hasOwnProperty("speed")) {
             light = params.light === "on";
@@ -1587,49 +1534,49 @@ class eWeLink {
          if (isOn) {
             accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, true);
             switch (accessory.context.eweUIID) {
-            case 36: // KING-M4
-               if (params.hasOwnProperty("bright")) {
-                  let nb = Math.round((params.bright - 10) * 10 / 9); // eWeLink scale is 10-100 and HomeKit scale is 0-100.
-                  accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.Brightness, nb);
-               }
-               break;
-            case 44: // D1
-               if (params.hasOwnProperty("brightness")) {
-                  accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.Brightness, params.brightness);
-               }
-               break;
-            case 22: // B1
-               if (params.hasOwnProperty("zyx_mode")) {
-                  mode = parseInt(params.zyx_mode);
-               } else if (params.hasOwnProperty("channel0") && (parseInt(params.channel0) + parseInt(params.channel1) > 0)) {
-                  mode = 1;
-               } else {
-                  mode = 2;
-               }
-               if (mode === 2) {
-                  accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, true);
-                  newColour = convert.rgb.hsv(parseInt(params.channel2), parseInt(params.channel3), parseInt(params.channel4));
-                  accessory.getService(Service.Lightbulb)
-                     .updateCharacteristic(Characteristic.Hue, newColour[0])
-                     .updateCharacteristic(Characteristic.Saturation, 100)
-                     .updateCharacteristic(Characteristic.Brightness, 100);
-               } else if (mode === 1) {
-                  throw "has been set to white mode which is not supported";
-               }
-               break;
-            case 59: // L1
-               if (params.hasOwnProperty("bright")) {
-                  accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.Brightness, params.bright);
-               }
-               if (params.hasOwnProperty("colorR")) {
-                  newColour = convert.rgb.hsv(params.colorR, params.colorG, params.colorB);
-                  accessory.getService(Service.Lightbulb)
-                     .updateCharacteristic(Characteristic.Hue, newColour[0])
-                     .updateCharacteristic(Characteristic.Saturation, newColour[1]);
-               }
-               break;
-            default:
-               return;
+               case 36: // KING-M4
+                  if (params.hasOwnProperty("bright")) {
+                     let nb = Math.round((params.bright - 10) * 10 / 9); // eWeLink scale is 10-100 and HomeKit scale is 0-100.
+                     accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.Brightness, nb);
+                  }
+                  break;
+               case 44: // D1
+                  if (params.hasOwnProperty("brightness")) {
+                     accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.Brightness, params.brightness);
+                  }
+                  break;
+               case 22: // B1
+                  if (params.hasOwnProperty("zyx_mode")) {
+                     mode = parseInt(params.zyx_mode);
+                  } else if (params.hasOwnProperty("channel0") && (parseInt(params.channel0) + parseInt(params.channel1) > 0)) {
+                     mode = 1;
+                  } else {
+                     mode = 2;
+                  }
+                  if (mode === 2) {
+                     accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, true);
+                     newColour = convert.rgb.hsv(parseInt(params.channel2), parseInt(params.channel3), parseInt(params.channel4));
+                     accessory.getService(Service.Lightbulb)
+                        .updateCharacteristic(Characteristic.Hue, newColour[0])
+                        .updateCharacteristic(Characteristic.Saturation, 100)
+                        .updateCharacteristic(Characteristic.Brightness, 100);
+                  } else if (mode === 1) {
+                     throw "has been set to white mode which is not supported";
+                  }
+                  break;
+               case 59: // L1
+                  if (params.hasOwnProperty("bright")) {
+                     accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.Brightness, params.bright);
+                  }
+                  if (params.hasOwnProperty("colorR")) {
+                     newColour = convert.rgb.hsv(params.colorR, params.colorG, params.colorB);
+                     accessory.getService(Service.Lightbulb)
+                        .updateCharacteristic(Characteristic.Hue, newColour[0])
+                        .updateCharacteristic(Characteristic.Saturation, newColour[1]);
+                  }
+                  break;
+               default:
+                  return;
             }
          } else {
             accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, false);
@@ -1683,95 +1630,86 @@ class eWeLink {
    }
    externalRFDeviceUpdate(accessory, params) {
       try {
+         if (params.updateSource === "http") {
+            return;
+         }
          let idToCheck = accessory.context.hbDeviceId.slice(0, -1),
             timeNow = new Date();
          if (params.hasOwnProperty("cmd") && params.cmd === "transmit" && params.hasOwnProperty("rfChl")) { // RF Button
             let bAccessory;
-            if ((bAccessory = this.devicesInHB.get(idToCheck + (params.rfChl + 1)))) {
-               bAccessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, 1);
+            if ((bAccessory = this.devicesInHB.get(idToCheck + accessory.context.rfChlMap[params.rfChl]))) {
+               bAccessory.getService(bAccessory.context.rfChls[params.rfChl]).updateCharacteristic(Characteristic.On, 1);
                setTimeout(() => {
-                  bAccessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, 0);
-               }, 500);
+                  bAccessory.getService(bAccessory.context.rfChls[params.rfChl]).updateCharacteristic(Characteristic.On, 0);
+               }, 3000);
             } else {
                throw "rf button not found in Homebridge";
             }
-            return;
-         } // else RF Sensor
-         for (let i = 1; i <= accessory.context.channelCount; i++) {
-            if (this.devicesInHB.has(idToCheck + i)) {
-               let oAccessory = this.devicesInHB.get(idToCheck + i);
-               if (params.hasOwnProperty("rfTrig" + (i - 1))) {
-                  let timeOfMotion = new Date(params["rfTrig" + (i - 1)]),
+         } else if (params.hasOwnProperty("cmd") && params.cmd === "trigger") { // RF Sensor
+            let rfChan = Object.keys(params).filter(name => /rfTrig/.test(name));
+            rfChan.forEach(chan => {
+               let chanNum = chan.substr(-1).toString(),
+                  accessoryNum = accessory.context.rfChlMap[chanNum],
+                  oAccessory;
+               if ((oAccessory = this.devicesInHB.get(idToCheck + accessoryNum))) {
+                  let timeOfMotion = new Date(params[chan]),
                      timeDifference = (timeNow.getTime() - timeOfMotion.getTime()) / 1000;
-                  if (timeDifference < this.sensorTimeDifference) {
+                  if (timeDifference < (this.config.sensorTimeDifference || 120)) {
                      switch (oAccessory.context.sensorType) {
-                     case "button":
-                        break;
-                     case "water":
-                        oAccessory.getService(Service.LeakSensor).updateCharacteristic(Characteristic.LeakDetected, 1);
-                        break;
-                     case "fire":
-                     case "smoke":
-                        oAccessory.getService(Service.SmokeSensor).updateCharacteristic(Characteristic.SmokeDetected, 1);
-                        break;
-                     case "co":
-                        oAccessory.getService(Service.CarbonMonoxideSensor).updateCharacteristic(Characteristic.CarbonMonoxideDetected, 1);
-                        break;
-                     case "co2":
-                        oAccessory.getService(Service.CarbonDioxideSensor).updateCharacteristic(Characteristic.CarbonDioxideDetected, 1);
-                        break;
-                     case "contact":
-                        oAccessory.getService(Service.ContactSensor).updateCharacteristic(Characteristic.ContactSensorState, 1);
-                        break;
-                     case "occupancy":
-                        oAccessory.getService(Service.OccupancySensor).updateCharacteristic(Characteristic.OccupancyDetected, 1);
-                        break;
-                     case "motion":
-                     default:
-                        oAccessory.getService(Service.MotionSensor).updateCharacteristic(Characteristic.MotionDetected, true);
-                        break;
+                        case "button":
+                           break;
+                        case "water":
+                           oAccessory.getService(Service.LeakSensor).updateCharacteristic(Characteristic.LeakDetected, 1);
+                           setTimeout(() => {
+                              oAccessory.getService(Service.LeakSensor).updateCharacteristic(Characteristic.LeakDetected, 0);
+                           }, (this.config.sensorTimeLength || 2) * 1000);
+                           break;
+                        case "fire":
+                        case "smoke":
+                           oAccessory.getService(Service.SmokeSensor).updateCharacteristic(Characteristic.SmokeDetected, 1);
+                           setTimeout(() => {
+                              oAccessory.getService(Service.SmokeSensor).updateCharacteristic(Characteristic.SmokeDetected, 0);
+                           }, (this.config.sensorTimeLength || 2) * 1000);
+                           break;
+                        case "co":
+                           oAccessory.getService(Service.CarbonMonoxideSensor).updateCharacteristic(Characteristic.CarbonMonoxideDetected, 1);
+                           setTimeout(() => {
+                              oAccessory.getService(Service.CarbonMonoxideSensor).updateCharacteristic(Characteristic.CarbonMonoxideDetected, 0);
+                           }, (this.config.sensorTimeLength || 2) * 1000);
+                           break;
+                        case "co2":
+                           oAccessory.getService(Service.CarbonDioxideSensor).updateCharacteristic(Characteristic.CarbonDioxideDetected, 1);
+                           setTimeout(() => {
+                              oAccessory.getService(Service.CarbonDioxideSensor).updateCharacteristic(Characteristic.CarbonDioxideDetected, 0);
+                           }, (this.config.sensorTimeLength || 2) * 1000);
+                           break;
+                        case "contact":
+                           oAccessory.getService(Service.ContactSensor).updateCharacteristic(Characteristic.ContactSensorState, 1);
+                           setTimeout(() => {
+                              oAccessory.getService(Service.ContactSensor).updateCharacteristic(Characteristic.ContactSensorState, 0);
+                           }, (this.config.sensorTimeLength || 2) * 1000);
+                           break;
+                        case "occupancy":
+                           oAccessory.getService(Service.OccupancySensor).updateCharacteristic(Characteristic.OccupancyDetected, 1);
+                           setTimeout(() => {
+                              oAccessory.getService(Service.OccupancySensor).updateCharacteristic(Characteristic.OccupancyDetected, 0);
+                           }, (this.config.sensorTimeLength || 2) * 1000);
+                           break;
+                        case "motion":
+                        default:
+                           oAccessory.getService(Service.MotionSensor).updateCharacteristic(Characteristic.MotionDetected, true);
+                           setTimeout(() => {
+                              oAccessory.getService(Service.MotionSensor).updateCharacteristic(Characteristic.MotionDetected, false);
+                           }, (this.config.sensorTimeLength || 2) * 1000);
+                           break;
                      }
-                     if (this.debug) {
+                     if (this.config.debug) {
                         this.log("[%s] has detected [%s].", oAccessory.displayName, oAccessory.context.sensorType);
                      }
                   }
                }
-            }
+            });
          }
-         setTimeout(() => {
-            for (let i = 1; i <= accessory.context.channelCount; i++) {
-               if (this.devicesInHB.has(idToCheck + i)) {
-                  let oAccessory = this.devicesInHB.get(idToCheck + i);
-                  switch (oAccessory.context.sensorType) {
-                  case "button":
-                     break;
-                  case "water":
-                     oAccessory.getService(Service.LeakSensor).updateCharacteristic(Characteristic.LeakDetected, 0);
-                     break;
-                  case "fire":
-                  case "smoke":
-                     oAccessory.getService(Service.SmokeSensor).updateCharacteristic(Characteristic.SmokeDetected, 0);
-                     break;
-                  case "co":
-                     oAccessory.getService(Service.CarbonMonoxideSensor).updateCharacteristic(Characteristic.CarbonMonoxideDetected, 0);
-                     break;
-                  case "co2":
-                     oAccessory.getService(Service.CarbonDioxideSensor).updateCharacteristic(Characteristic.CarbonDioxideDetected, 0);
-                     break;
-                  case "contact":
-                     oAccessory.getService(Service.ContactSensor).updateCharacteristic(Characteristic.ContactSensorState, 0);
-                     break;
-                  case "occupancy":
-                     oAccessory.getService(Service.OccupancySensor).updateCharacteristic(Characteristic.OccupancyDetected, 0);
-                     break;
-                  case "motion":
-                  default:
-                     oAccessory.getService(Service.MotionSensor).updateCharacteristic(Characteristic.MotionDetected, false);
-                     break;
-                  }
-               }
-            }
-         }, this.sensorTimeLength * 1000);
       } catch (err) {
          this.log.warn("[%s] could not be updated - [%s].", accessory.displayName, err);
       }
@@ -1779,52 +1717,52 @@ class eWeLink {
    externalZBDeviceUpdate(accessory, params) {
       try {
          switch (accessory.context.eweUIID) {
-         case 1000:
-            if (params.hasOwnProperty("key")) {
-               if ([0, 1, 2].includes(params.key)) {
-                  accessory.getService(Service.StatelessProgrammableSwitch).updateCharacteristic(Characteristic.ProgrammableSwitchEvent, params.key); //*** credit @tasict ***\\
-               } else {
-                  throw "unknown 'key' parameter received [" + params.key + "]";
+            case 1000:
+               if (params.hasOwnProperty("key")) {
+                  if ([0, 1, 2].includes(params.key)) {
+                     accessory.getService(Service.StatelessProgrammableSwitch).updateCharacteristic(Characteristic.ProgrammableSwitchEvent, params.key); //*** credit @tasict ***\\
+                  } else {
+                     throw "unknown 'key' parameter received [" + params.key + "]";
+                  }
                }
-            }
-            break;
-         case 1770:
-            if (params.hasOwnProperty("temperature")) {
-               let currentTemp = parseInt(params.temperature) / 100;
-               accessory.getService(Service.TemperatureSensor).updateCharacteristic(Characteristic.CurrentTemperature, currentTemp);
-            }
-            if (params.hasOwnProperty("humidity")) {
-               let currentHumi = parseInt(params.humidity) / 100;
-               accessory.getService(Service.HumiditySensor).updateCharacteristic(Characteristic.CurrentRelativeHumidity, currentHumi);
-            }
-            break;
-         case 2026:
-            if (params.hasOwnProperty("motion")) {
-               if ([0, 1].includes(params.lock)) {
-                  accessory.getService(Service.MotionSensor).updateCharacteristic(Characteristic.MotionDetected, params.motion);
-               } else {
-                  throw "unknown 'motion' parameter received [" + params.motion + "]";
+               break;
+            case 1770:
+               if (params.hasOwnProperty("temperature")) {
+                  let currentTemp = parseInt(params.temperature) / 100;
+                  accessory.getService(Service.TemperatureSensor).updateCharacteristic(Characteristic.CurrentTemperature, currentTemp);
                }
-            }
-            break;
-         case 3026:
-            if (params.hasOwnProperty("lock")) {
-               if ([0, 1].includes(params.lock)) {
-                  accessory.getService(Service.ContactSensor).updateCharacteristic(Characteristic.ContactSensorState, params.lock);
-               } else {
-                  throw "unknown 'lock' parameter received [" + params.lock + "]";
+               if (params.hasOwnProperty("humidity")) {
+                  let currentHumi = parseInt(params.humidity) / 100;
+                  accessory.getService(Service.HumiditySensor).updateCharacteristic(Characteristic.CurrentRelativeHumidity, currentHumi);
                }
-            }
-            break;
-         default:
-            throw "unsupported zigbee device type";
+               break;
+            case 2026:
+               if (params.hasOwnProperty("motion")) {
+                  if ([0, 1].includes(params.lock)) {
+                     accessory.getService(Service.MotionSensor).updateCharacteristic(Characteristic.MotionDetected, params.motion);
+                  } else {
+                     throw "unknown 'motion' parameter received [" + params.motion + "]";
+                  }
+               }
+               break;
+            case 3026:
+               if (params.hasOwnProperty("lock")) {
+                  if ([0, 1].includes(params.lock)) {
+                     accessory.getService(Service.ContactSensor).updateCharacteristic(Characteristic.ContactSensorState, params.lock);
+                  } else {
+                     throw "unknown 'lock' parameter received [" + params.lock + "]";
+                  }
+               }
+               break;
+            default:
+               throw "unsupported zigbee device type";
          }
       } catch (err) {
          this.log.warn("[%s] could not be updated - [%s].", accessory.displayName, err);
       }
    }
 }
-module.exports = function (homebridge) {
+module.exports = function(homebridge) {
    Accessory = homebridge.platformAccessory;
    Service = homebridge.hap.Service;
    Characteristic = homebridge.hap.Characteristic;
diff --git a/lib/eWeLinkHTTP.js b/lib/eWeLinkHTTP.js
index f6c0c71d..f7701ed7 100644
--- a/lib/eWeLinkHTTP.js
+++ b/lib/eWeLinkHTTP.js
@@ -41,16 +41,16 @@ module.exports = class eWeLinkHTTP {
             let body = res.data;
             if (body.hasOwnProperty("error") && body.error === 10004 && body.hasOwnProperty("data") && body.data.hasOwnProperty("region")) {
                switch (body.data.region) {
-               case "eu":
-               case "us":
-               case "as":
-                  this.httpHost = body.data.region + "-apia.coolkit.cc";
-                  break;
-               case "cn":
-                  this.httpHost = "cn-apia.coolkit.cn";
-                  break;
-               default:
-                  throw "No valid region received - [" + body.data.region + "].";
+                  case "eu":
+                  case "us":
+                  case "as":
+                     this.httpHost = body.data.region + "-apia.coolkit.cc";
+                     break;
+                  case "cn":
+                     this.httpHost = "cn-apia.coolkit.cn";
+                     break;
+                  default:
+                     throw "No valid region received - [" + body.data.region + "].";
                }
                if (this.debug) {
                   this.log("New HTTP API host received [%s].", this.httpHost);
@@ -82,16 +82,16 @@ module.exports = class eWeLinkHTTP {
             version: 8
          },
          dataToSign = [];
-      Object.keys(data).forEach(function (key) {
+      Object.keys(data).forEach(function(key) {
          dataToSign.push({
             key: key,
             value: data[key]
          });
       });
-      dataToSign.sort(function (a, b) {
+      dataToSign.sort(function(a, b) {
          return a.key < b.key ? -1 : 1;
       });
-      dataToSign = dataToSign.map(function (kv) {
+      dataToSign = dataToSign.map(function(kv) {
          return kv.key + "=" + kv.value;
       }).join("&");
       dataToSign = crypto.createHmac("sha256", "6Nz4n0xA8s8qdxQf2GqurZj2Fs55FUvM").update(dataToSign).digest("base64");
@@ -108,16 +108,16 @@ module.exports = class eWeLinkHTTP {
                throw "Server did not respond with a region.\n" + JSON.stringify(body, null, 2);
             }
             switch (body.region) {
-            case "eu":
-            case "us":
-            case "as":
-               this.httpHost = body.region + "-apia.coolkit.cc";
-               break;
-            case "cn":
-               this.httpHost = "cn-apia.coolkit.cn";
-               break;
-            default:
-               throw "No valid region received - [" + body.region + "].";
+               case "eu":
+               case "us":
+               case "as":
+                  this.httpHost = body.region + "-apia.coolkit.cc";
+                  break;
+               case "cn":
+                  this.httpHost = "cn-apia.coolkit.cn";
+                  break;
+               default:
+                  throw "No valid region received - [" + body.region + "].";
             }
             if (this.debug) {
                this.log("HTTP API host received [%s].", this.httpHost);
diff --git a/lib/eWeLinkLAN.js b/lib/eWeLinkLAN.js
index 9146dbe7..1032afa0 100644
--- a/lib/eWeLinkLAN.js
+++ b/lib/eWeLinkLAN.js
@@ -10,12 +10,13 @@ module.exports = class eWeLinkLAN {
       this.config = config;
       this.log = log;
       this.devices = devices;
-      let deviceMap = {};
+      let deviceMap = new Map();
       devices.forEach(device => {
-         deviceMap[device.deviceid] = {
+         deviceMap.set(device.deviceid, {
             apiKey: device.devicekey,
-            ip: false
-         };
+            online: false,
+            ip: null
+         });
       });
       this.deviceMap = deviceMap;
       this.debug = this.config.debug || false;
@@ -27,13 +28,22 @@ module.exports = class eWeLinkLAN {
          dns.discover({
             name: "_ewelink._tcp.local"
          }).then(res => {
+            let onlineCount = 0;
             res.forEach(device => {
-               let a = device.fqdn.replace("._ewelink._tcp.local", "").replace("eWeLink_", "");
-               if (this.deviceMap.hasOwnProperty(a)) {
-                  this.deviceMap[a].ip = device.address;
+               let d, deviceId = device.fqdn.replace("._ewelink._tcp.local", "").replace("eWeLink_", "");
+               if ((d = this.deviceMap.get(deviceId))) {
+                  this.deviceMap.set(deviceId, {
+                     apiKey: d.apiKey,
+                     online: true,
+                     ip: device.address
+                  });
+                  onlineCount++;
                }
             });
-            resolve(this.deviceMap);
+            resolve({
+               map: this.deviceMap,
+               count: onlineCount
+            });
          }).catch(err => {
             reject(err);
          });
@@ -100,7 +110,7 @@ module.exports = class eWeLinkLAN {
    }
    sendUpdate(json) {
       return new Promise((resolve, reject) => {
-         if (!this.deviceMap[json.deviceid].ip) {
+         if (!this.deviceMap.get(json.deviceid).online) {
             throw "device does not support LAN mode";
          }
          let apiKey, suffix, params = {};
@@ -113,7 +123,7 @@ module.exports = class eWeLinkLAN {
          } else {
             throw "plugin does not support lan mode for this device yet - feel free to create a github issue";
          }
-         if ((apiKey = this.deviceMap[json.deviceid].apiKey)) {
+         if ((apiKey = this.deviceMap.get(json.deviceid).apiKey)) {
             let key = crypto.createHash('md5').update(Buffer.from(apiKey, 'utf8')).digest(),
                iv = crypto.randomBytes(16),
                enc = crypto.createCipheriv('aes-128-cbc', key, iv),
@@ -133,18 +143,17 @@ module.exports = class eWeLinkLAN {
             }
             axios({
                method: "post",
-               url: "http://" + this.deviceMap[json.deviceid].ip + ":8081/zeroconf/" + suffix,
+               url: "http://" + this.deviceMap.get(json.deviceid).ip + ":8081/zeroconf/" + suffix,
                headers: {
                   Accept: "application/json",
-                  "Content-Type": "application/json;charset=UTF-8"
+                  "Content-Type": "application/json"
                },
                data
             }).then(res => {
-               let body = res.data;
-               if (body.hasOwnProperty("error") && body.error === 0) {
+               if (res.data.hasOwnProperty("error") && res.data.error === 0) {
                   resolve();
                }
-               throw body;
+               throw res.data;
             }).catch(err => {
                reject(err);
             });
@@ -154,4 +163,8 @@ module.exports = class eWeLinkLAN {
    receiveUpdate(f) {
       this.emitter.addListener("update", f);
    }
+   closeConnection() {
+      dns.stopMonitoring();
+      this.log("LAN monitoring stopped as part of Homebridge shutdown.");
+   }
 };
\ No newline at end of file
diff --git a/lib/eWeLinkWS.js b/lib/eWeLinkWS.js
index 23f690d7..95aea46d 100644
--- a/lib/eWeLinkWS.js
+++ b/lib/eWeLinkWS.js
@@ -97,36 +97,12 @@ module.exports = class eWeLinkWS {
             }, (device.config.hbInterval + 7) * 1000);
          } else if (device.hasOwnProperty("action")) {
             switch (device.action) {
-            case "sysmsg":
-               device.params.updateSource = "ws";
-               let returnTemplate = {
-                  deviceid: device.deviceid,
-                  action: "sysmsg",
-                  params: device.params
-               };
-               if (this.debugReqRes) {
-                  let msg = JSON.stringify(returnTemplate, null, 2).replace(device.deviceid, "**hidden**");
-                  this.log("WS message received.\n%s", msg);
-               } else if (this.debug) {
-                  this.log("WS message received.");
-               }
-               this.emitter.emit("update", returnTemplate);
-               break;
-            case "update":
-               let params = device.params;
-               for (let param in params) {
-                  if (params.hasOwnProperty(param)) {
-                     if (!constants.paramsToKeep.includes(param.replace(/[0-9]/g, ""))) {
-                        delete params[param];
-                     }
-                  }
-               }
-               if (Object.keys(params).length > 0) {
-                  params.updateSource = "ws";
+               case "sysmsg":
+                  device.params.updateSource = "ws";
                   let returnTemplate = {
                      deviceid: device.deviceid,
-                     action: "update",
-                     params
+                     action: "sysmsg",
+                     params: device.params
                   };
                   if (this.debugReqRes) {
                      let msg = JSON.stringify(returnTemplate, null, 2).replace(device.deviceid, "**hidden**");
@@ -135,11 +111,35 @@ module.exports = class eWeLinkWS {
                      this.log("WS message received.");
                   }
                   this.emitter.emit("update", returnTemplate);
-               }
-               break;
-            default:
-               this.log.warn("[%s] WS message has unknown action.\n" + JSON.stringify(device, null, 2), device.deviceid);
-               return;
+                  break;
+               case "update":
+                  let params = device.params;
+                  for (let param in params) {
+                     if (params.hasOwnProperty(param)) {
+                        if (!constants.paramsToKeep.includes(param.replace(/[0-9]/g, ""))) {
+                           delete params[param];
+                        }
+                     }
+                  }
+                  if (Object.keys(params).length > 0) {
+                     params.updateSource = "ws";
+                     let returnTemplate = {
+                        deviceid: device.deviceid,
+                        action: "update",
+                        params
+                     };
+                     if (this.debugReqRes) {
+                        let msg = JSON.stringify(returnTemplate, null, 2).replace(device.deviceid, "**hidden**");
+                        this.log("WS message received.\n%s", msg);
+                     } else if (this.debug) {
+                        this.log("WS message received.");
+                     }
+                     this.emitter.emit("update", returnTemplate);
+                  }
+                  break;
+               default:
+                  this.log.warn("[%s] WS message has unknown action.\n" + JSON.stringify(device, null, 2), device.deviceid);
+                  return;
             }
          } else if (device.hasOwnProperty("error") && device.error === 0) {
             // *** Safe to ignore these messages *** \\
@@ -149,22 +149,26 @@ module.exports = class eWeLinkWS {
             }
          }
       });
-      this.ws.on("close", (e) => {
-         this.log.warn("Web socket closed - [%s].", e);
-         if (e.code !== 1000) {
-            this.log.warn("Web socket will try to reconnect in five seconds then try the command again.");
-            this.ws.removeAllListeners();
-            setTimeout(() => {
-               this.login();
-            }, 5000);
+      this.ws.on("close", (e, m) => {
+         if (m === "Stopping Homebridge") {
+            this.log("Web socket closed as part of Homebridge shutdown.");
          } else {
-            this.log.error("Please try restarting Homebridge so that this plugin can work again.");
+            this.log.warn("Web socket closed - [%s - %s].", e, m);
+            if (e !== 1000) {
+               this.log("Web socket will try to reconnect in five seconds.");
+               setTimeout(() => {
+                  this.login();
+               }, 5000);
+            } else {
+               this.log("Please try restarting Homebridge so that this plugin can work again.");
+            }
          }
          this.wsIsOpen = false;
          if (this.hbInterval) {
             clearInterval(this.hbInterval);
             this.hbInterval = null;
          }
+         this.ws.removeAllListeners();
       });
       this.ws.on("error", (e) => {
          this.log.error("Web socket error - [%s].", e);
@@ -268,4 +272,7 @@ module.exports = class eWeLinkWS {
    receiveUpdate(f) {
       this.emitter.addListener("update", f);
    }
+   closeConnection() {
+      this.ws.close(1000, "Stopping Homebridge");
+   }
 };
\ No newline at end of file

From 65fc7549cc9aa1150e937b3cf4d59cd36a4cfe37 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 20 Aug 2020 17:08:50 +0100
Subject: [PATCH 0036/3183] 2.23.0-0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 0077fce1..8254df29 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
    "name": "homebridge-ewelink",
-   "version": "2.19.3",
+   "version": "2.23.0-0",
    "lockfileVersion": 1,
    "requires": true,
    "dependencies": {
diff --git a/package.json b/package.json
index 83a1c664..eb102db4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
    "name": "homebridge-ewelink",
-   "version": "2.19.3",
+   "version": "2.23.0-0",
    "author": "bwp91",
    "contributors": [
       "gbro115",

From acfa27e6c86b7d4666d06b6b382b2f38a1dba9c5 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 20 Aug 2020 20:39:32 +0100
Subject: [PATCH 0037/3183] 2.23.0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 8254df29..9f311274 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
    "name": "homebridge-ewelink",
-   "version": "2.23.0-0",
+   "version": "2.23.0",
    "lockfileVersion": 1,
    "requires": true,
    "dependencies": {
diff --git a/package.json b/package.json
index eb102db4..1f11ab88 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
    "name": "homebridge-ewelink",
-   "version": "2.23.0-0",
+   "version": "2.23.0",
    "author": "bwp91",
    "contributors": [
       "gbro115",

From db010c5d0b872afdef3d7b7c729028954ce3777d Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Thu, 20 Aug 2020 23:04:59 +0100
Subject: [PATCH 0038/3183] Delete _config.yml

---
 _config.yml | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 _config.yml

diff --git a/_config.yml b/_config.yml
deleted file mode 100644
index c7418817..00000000
--- a/_config.yml
+++ /dev/null
@@ -1 +0,0 @@
-theme: jekyll-theme-slate
\ No newline at end of file

From 5edc9ef42a58d4d46530deba8af0bb71c1d6bb39 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Thu, 20 Aug 2020 23:08:52 +0100
Subject: [PATCH 0039/3183] Update README.md

---
 README.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 633cb902..f2df355c 100644
--- a/README.md
+++ b/README.md
@@ -8,8 +8,9 @@
  [![verified-by-homebridge](https://badgen.net/badge/homebridge/verified/purple)](https://github.com/homebridge/homebridge/wiki/Verified-Plugins)
  [![Discord](https://img.shields.io/discord/432663330281226270?color=728ED5&logo=discord&label=discord)](https://discord.com/channels/432663330281226270/742733745743855627)
  [![npm](https://img.shields.io/npm/dt/homebridge-ewelink)](https://www.npmjs.com/package/homebridge-ewelink)   
- [![npm](https://img.shields.io/npm/v/homebridge-ewelink?label=release)](https://www.npmjs.com/package/homebridge-ewelink)
- [![npm](https://img.shields.io/npm/v/homebridge-ewelink-beta?label=beta)](https://www.npmjs.com/package/homebridge-ewelink-beta)
+ [![npm](https://img.shields.io/npm/v/homebridge-ewelink/release?label=release)](https://www.npmjs.com/package/homebridge-ewelink)
+ [![npm](https://img.shields.io/npm/v/homebridge-ewelink/beta?label=beta)](https://www.npmjs.com/package/homebridge-ewelink)
+
  
 </span>
 

From f0d386db08af9d56ef380793213e4c2cce86f9db Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Thu, 20 Aug 2020 23:09:12 +0100
Subject: [PATCH 0040/3183] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index f2df355c..bbcd2fef 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@
  [![verified-by-homebridge](https://badgen.net/badge/homebridge/verified/purple)](https://github.com/homebridge/homebridge/wiki/Verified-Plugins)
  [![Discord](https://img.shields.io/discord/432663330281226270?color=728ED5&logo=discord&label=discord)](https://discord.com/channels/432663330281226270/742733745743855627)
  [![npm](https://img.shields.io/npm/dt/homebridge-ewelink)](https://www.npmjs.com/package/homebridge-ewelink)   
- [![npm](https://img.shields.io/npm/v/homebridge-ewelink/release?label=release)](https://www.npmjs.com/package/homebridge-ewelink)
+ [![npm](https://img.shields.io/npm/v/homebridge-ewelink/latest?label=release)](https://www.npmjs.com/package/homebridge-ewelink)
  [![npm](https://img.shields.io/npm/v/homebridge-ewelink/beta?label=beta)](https://www.npmjs.com/package/homebridge-ewelink)
 
  

From f6b0531a6d7a85c647ad640ed2d0d29890b3edc1 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 21 Aug 2020 08:52:03 +0100
Subject: [PATCH 0041/3183] default ws for unsupported lan

---
 lib/constants.js |  1 +
 lib/eWeLink.js   | 43 +++++++++++++++++++++++--------------------
 2 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/lib/constants.js b/lib/constants.js
index 3c557fca..077cc40f 100644
--- a/lib/constants.js
+++ b/lib/constants.js
@@ -4,6 +4,7 @@ module.exports = {
    appId: "oeVkj2lYFGnJu5XUtWisfW4utiN4u9Mq",
    packageName: "homebridge-ewelink",
    devicesHideable: ["switch", "light", "valve"],
+   devicesNonLAN: [22, 59, 102],
    devicesSingleSwitch: [1, 5, 6, 14, 15, 22, 24, 27, 32, 36, 44, 59],
    devicesSingleSwitchLight: ["T1 1C", "L1", "B1", "B1_R2", "TX1C", "D1", "D1R1", "KING-M4", "Slampher"],
    devicesMultiSwitch: [2, 3, 4, 7, 8, 9, 29, 30, 31, 34, 41],
diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index 89352a12..c5f9bb29 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -307,7 +307,6 @@ class eWeLink {
                   case "6":
                      accessory.context.sensorType = this.cusS.has(hbDeviceId) ? this.cusS.get(hbDeviceId).type : "motion";
                      break;
-                  case "5":
                   default:
                      throw "RF device type is not supported";
                }
@@ -343,7 +342,6 @@ class eWeLink {
                      case "occupancy":
                         accessory.addService(Service.OccupancySensor);
                         break;
-                     case "motion":
                      default:
                         accessory.addService(Service.MotionSensor);
                         break;
@@ -668,24 +666,30 @@ class eWeLink {
          deviceid: accessory.context.eweDeviceId,
          params
       };
-      this.lanClient.sendUpdate(payload)
-         .then(res => {
-            callback();
-         })
-         .catch(err => {
-            if (accessory.context.reachableWAN) {
-               if (this.config.debug) {
-                  this.log.warn("[%s] Reverting to web socket as %s.", accessory.displayName, err);
+      if (cns.devicesNonLAN.includes(accessory.context.eweUIID)) {
+         if (accessory.context.reachableWAN) {
+            this.wsClient.sendUpdate(payload, callback);
+         } else {
+            this.log.error("[%s] could not be updated as it appears to be offline.", accessory.displayName);
+            callback("Device has failed to update");
+         }
+      } else {
+         this.lanClient.sendUpdate(payload)
+            .then(res => {
+               callback();
+            })
+            .catch(err => {
+               if (accessory.context.reachableWAN) {
+                  if (this.config.debug) {
+                     this.log.warn("[%s] Reverting to web socket as %s.", accessory.displayName, err);
+                  }
+                  this.wsClient.sendUpdate(payload, callback);
+               } else {
+                  this.log.error("[%s] could not be updated as it appears to be offline.", accessory.displayName);
+                  callback("Device has failed to update");
                }
-               this.wsClient.sendUpdate(payload, callback);
-               setTimeout(() => {
-                  this.wsClient.requestUpdate(accessory);
-               }, 3000);
-            } else {
-               this.log.error("[%s] could not be updated as it appears to be offline.", accessory.displayName);
-               callback("Device has failed to update");
-            }
-         });
+            });
+      }
    }
    receiveDeviceUpdate(device) {
       let accessory, source = device.params.updateSource === "ws" ? "WS" : "LAN";
@@ -1695,7 +1699,6 @@ class eWeLink {
                               oAccessory.getService(Service.OccupancySensor).updateCharacteristic(Characteristic.OccupancyDetected, 0);
                            }, (this.config.sensorTimeLength || 2) * 1000);
                            break;
-                        case "motion":
                         default:
                            oAccessory.getService(Service.MotionSensor).updateCharacteristic(Characteristic.MotionDetected, true);
                            setTimeout(() => {

From 514708fbaef362f0f846793d1ca90bd9a25e43e7 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 21 Aug 2020 08:53:27 +0100
Subject: [PATCH 0042/3183] 2.23.1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 9f311274..7481fabd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
    "name": "homebridge-ewelink",
-   "version": "2.23.0",
+   "version": "2.23.1",
    "lockfileVersion": 1,
    "requires": true,
    "dependencies": {
diff --git a/package.json b/package.json
index 1f11ab88..c1aa9dee 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
    "name": "homebridge-ewelink",
-   "version": "2.23.0",
+   "version": "2.23.1",
    "author": "bwp91",
    "contributors": [
       "gbro115",

From 1d6f1a4c59f39577dc0de7f87ee664ae4de4f330 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 21 Aug 2020 13:51:52 +0100
Subject: [PATCH 0043/3183] ws/lan refactor

---
 lib/eWeLink.js | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index c5f9bb29..87b1838a 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -666,28 +666,26 @@ class eWeLink {
          deviceid: accessory.context.eweDeviceId,
          params
       };
-      if (cns.devicesNonLAN.includes(accessory.context.eweUIID)) {
+      let sendViaWS = () => {
          if (accessory.context.reachableWAN) {
             this.wsClient.sendUpdate(payload, callback);
          } else {
             this.log.error("[%s] could not be updated as it appears to be offline.", accessory.displayName);
             callback("Device has failed to update");
          }
+      };
+      if (cns.devicesNonLAN.includes(accessory.context.eweUIID) || !this.lanDevices.get(accessory.context.eweDeviceId).online) {
+         sendViaWS();
       } else {
          this.lanClient.sendUpdate(payload)
             .then(res => {
                callback();
             })
             .catch(err => {
-               if (accessory.context.reachableWAN) {
-                  if (this.config.debug) {
-                     this.log.warn("[%s] Reverting to web socket as %s.", accessory.displayName, err);
-                  }
-                  this.wsClient.sendUpdate(payload, callback);
-               } else {
-                  this.log.error("[%s] could not be updated as it appears to be offline.", accessory.displayName);
-                  callback("Device has failed to update");
+               if (this.config.debug) {
+                  this.log.warn("[%s] Reverting to web socket as %s.", accessory.displayName, err);
                }
+               sendViaWS();
             });
       }
    }

From dd78ff39f4a267d3da7d0d78e1bc47f3d9f7561c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 21 Aug 2020 13:52:23 +0100
Subject: [PATCH 0044/3183] 2.23.2

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 7481fabd..39fb9235 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
    "name": "homebridge-ewelink",
-   "version": "2.23.1",
+   "version": "2.23.2",
    "lockfileVersion": 1,
    "requires": true,
    "dependencies": {
diff --git a/package.json b/package.json
index c1aa9dee..dea62940 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
    "name": "homebridge-ewelink",
-   "version": "2.23.1",
+   "version": "2.23.2",
    "author": "bwp91",
    "contributors": [
       "gbro115",

From 23884cc9575bc90315e85fe107febff969eaaca4 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Fri, 21 Aug 2020 23:36:49 +0100
Subject: [PATCH 0045/3183] config hide TH switch

---
 config.schema.json | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/config.schema.json b/config.schema.json
index 8a6237d9..1ef46d3e 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -73,6 +73,12 @@
             "default":"20",
             "maximum":999
          },
+         "hideTHSwitch":{
+            "title":"Hide TH10/TH16 Switch",
+            "type":"boolean",
+            "description":"If enabled, the switch for the TH10/TH16 devices will be hidden from Homebridge.",
+            "default":false
+         },
          "hideZBLDPress":{
             "title":"Hide Double/Long Press",
             "type":"boolean",
@@ -291,4 +297,4 @@
          ]
       }
    ]
-}
\ No newline at end of file
+}

From 54c68c19b381e5620e288b805153bb92a352bdcb Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Fri, 21 Aug 2020 23:41:37 +0100
Subject: [PATCH 0046/3183] ability to hide th10/16 switch

---
 lib/eWeLink.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index 87b1838a..89a16d67 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -272,7 +272,9 @@ class eWeLink {
                accessory.addService(Service.Lightbulb);
                break;
             case "thermostat":
-               accessory.addService(Service.Switch);
+               if (!this.config.hideTHSwitch) {
+                  accessory.addService(Service.Switch);
+               }
                accessory.addService(Service.TemperatureSensor);
                if (device.params.sensorType !== "DS18B20") {
                   accessory.addService(Service.HumiditySensor);
@@ -1486,7 +1488,7 @@ class eWeLink {
    }
    externalThermostatUpdate(accessory, params) {
       try {
-         if (params.hasOwnProperty("switch") || params.hasOwnProperty("mainSwitch")) {
+         if (!this.config.hideTHSwitch && (params.hasOwnProperty("switch") || params.hasOwnProperty("mainSwitch"))) {
             let newState = params.hasOwnProperty("switch") ? params.switch === "on" : params.mainSwitch === "on";
             accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, newState);
          }
@@ -1769,4 +1771,4 @@ module.exports = function(homebridge) {
    Characteristic = homebridge.hap.Characteristic;
    UUIDGen = homebridge.hap.uuid;
    return eWeLink;
-};
\ No newline at end of file
+};

From 8743d0e81d7b976da86218d7a880f4af1788ab01 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Fri, 21 Aug 2020 23:44:02 +0100
Subject: [PATCH 0047/3183] hideTHSwitch visability

---
 config.schema.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config.schema.json b/config.schema.json
index 1ef46d3e..c41d0656 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -256,6 +256,7 @@
             "sensorTimeLength",
             "sensorTimeDifference",
             "valveTimeLength",
+            "hideTHSwitch",
             "hideZBLDPress"
          ]
       },

From 344b03b5647668c187660e15ddb8fc4c317b5724 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Sat, 22 Aug 2020 00:01:00 +0100
Subject: [PATCH 0048/3183] Update README.md

---
 README.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index bbcd2fef..31a356b8 100644
--- a/README.md
+++ b/README.md
@@ -17,5 +17,6 @@
 ## Documentation
 Please refer to the [wiki](https://github.com/bwp91/homebridge-ewelink/wiki) for documentation.
 
-## Credit
-To the original owner of this package @gbro115 for letting me take over. I will look after it as best as I can :)
+## Credits
+- To the original owner of this package @gbro115 for letting me take over. I will look after it as best as I can :)
+- More credits in the [wiki](https://github.com/bwp91/homebridge-ewelink/wiki/Credits).

From d6d8f4fe1997044d7e72124c97651a75a4dd1689 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 22 Aug 2020 00:04:25 +0100
Subject: [PATCH 0049/3183] 2.24.0-0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 39fb9235..16318a79 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
    "name": "homebridge-ewelink",
-   "version": "2.23.2",
+   "version": "2.24.0-0",
    "lockfileVersion": 1,
    "requires": true,
    "dependencies": {
diff --git a/package.json b/package.json
index dea62940..f27e3e2e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
    "name": "homebridge-ewelink",
-   "version": "2.23.2",
+   "version": "2.24.0-0",
    "author": "bwp91",
    "contributors": [
       "gbro115",

From e87441134623fac2d644ee78df757ddf5e9e5491 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 23 Aug 2020 13:05:25 +0100
Subject: [PATCH 0050/3183] hide th switch option

---
 lib/eWeLink.js | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index 89a16d67..cb9464c2 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -458,12 +458,14 @@ class eWeLink {
                   });
                break;
             case "thermostat":
-               accessory.getService(Service.Switch).getCharacteristic(Characteristic.On)
-                  .on("set", (value, callback) => {
-                     accessory.getService(Service.Switch).getCharacteristic(Characteristic.On).value !== value ?
-                        this.internalThermostatUpdate(accessory, value, callback) :
-                        callback();
-                  });
+               if (!this.config.hideTHSwitch) {
+                  accessory.getService(Service.Switch).getCharacteristic(Characteristic.On)
+                     .on("set", (value, callback) => {
+                        accessory.getService(Service.Switch).getCharacteristic(Characteristic.On).value !== value ?
+                           this.internalThermostatUpdate(accessory, value, callback) :
+                           callback();
+                     });
+               }
                break;
             case "outlet":
                accessory.getService(Service.Outlet).getCharacteristic(Characteristic.On)
@@ -1771,4 +1773,4 @@ module.exports = function(homebridge) {
    Characteristic = homebridge.hap.Characteristic;
    UUIDGen = homebridge.hap.uuid;
    return eWeLink;
-};
+};
\ No newline at end of file

From b352daf404d0c732871964dc4f974f5bce9cd4fc Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 23 Aug 2020 13:06:05 +0100
Subject: [PATCH 0051/3183] 2.24.0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 16318a79..07fbec86 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
    "name": "homebridge-ewelink",
-   "version": "2.24.0-0",
+   "version": "2.24.0",
    "lockfileVersion": 1,
    "requires": true,
    "dependencies": {
diff --git a/package.json b/package.json
index f27e3e2e..e03ce3b9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
    "name": "homebridge-ewelink",
-   "version": "2.24.0-0",
+   "version": "2.24.0",
    "author": "bwp91",
    "contributors": [
       "gbro115",

From 9cf948cac5c57880204ce6788430683bfcef4ee8 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Mon, 24 Aug 2020 19:46:44 +0200
Subject: [PATCH 0052/3183] Create codeql-analysis.yml

---
 .github/workflows/codeql-analysis.yml | 54 +++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 .github/workflows/codeql-analysis.yml

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
new file mode 100644
index 00000000..7158717c
--- /dev/null
+++ b/.github/workflows/codeql-analysis.yml
@@ -0,0 +1,54 @@
+name: "CodeQL"
+
+on:
+  push:
+    branches: [master, ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [master]
+  schedule:
+    - cron: '0 1 * * 5'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+      with:
+        # We must fetch at least the immediate parents so that if this is
+        # a pull request then we can checkout the head.
+        fetch-depth: 2
+
+    # If this run was triggered by a pull request event, then checkout
+    # the head of the pull request instead of the merge commit.
+    - run: git checkout HEAD^2
+      if: ${{ github.event_name == 'pull_request' }}
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      # Override language selection by uncommenting this and choosing your languages
+      # with:
+      #   languages: go, javascript, csharp, python, cpp, java
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1

From 4e50f266f526d1af85c29b9e58f16fa3f8c9b04a Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 25 Aug 2020 16:29:53 +0100
Subject: [PATCH 0053/3183] improve lag

---
 lib/eWeLinkWS.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/eWeLinkWS.js b/lib/eWeLinkWS.js
index 95aea46d..cf35ae34 100644
--- a/lib/eWeLinkWS.js
+++ b/lib/eWeLinkWS.js
@@ -200,8 +200,8 @@ module.exports = class eWeLinkWS {
             return;
          }
          if (this.ws) {
-            callback();
             this.ws.send(req);
+            callback();
             if (this.debugReqRes) {
                let msg = JSON.stringify(json, null, 2).replace(json.apikey, "**hidden**").replace(json.apiKey, "**hidden**").replace(json.deviceid, "**hidden**");
                this.log.warn("Web socket message sent. This text is yellow for clarity.\n%s", msg);

From 50a6921cedd6bbc05be6ef3de223dc961c020228 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 25 Aug 2020 16:30:00 +0100
Subject: [PATCH 0054/3183] support for led device

---
 lib/constants.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/constants.js b/lib/constants.js
index 077cc40f..653f547c 100644
--- a/lib/constants.js
+++ b/lib/constants.js
@@ -6,7 +6,7 @@ module.exports = {
    devicesHideable: ["switch", "light", "valve"],
    devicesNonLAN: [22, 59, 102],
    devicesSingleSwitch: [1, 5, 6, 14, 15, 22, 24, 27, 32, 36, 44, 59],
-   devicesSingleSwitchLight: ["T1 1C", "L1", "B1", "B1_R2", "TX1C", "D1", "D1R1", "KING-M4", "Slampher"],
+   devicesSingleSwitchLight: ["T1 1C", "L1", "B1", "B1_R2", "TX1C", "D1", "D1R1", "KING-M4", "Slampher", "GTTA59"],
    devicesMultiSwitch: [2, 3, 4, 7, 8, 9, 29, 30, 31, 34, 41],
    devicesMultiSwitchLight: ["T1 2C", "T1 3C", "TX2C", "TX3C"],
    devicesBrightable: [36, 44],

From e0d3f3812a361e4f0c77d598e14a98a4a47b9256 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 25 Aug 2020 16:33:58 +0100
Subject: [PATCH 0055/3183] 2.24.1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 07fbec86..2732cb07 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
    "name": "homebridge-ewelink",
-   "version": "2.24.0",
+   "version": "2.24.1",
    "lockfileVersion": 1,
    "requires": true,
    "dependencies": {
diff --git a/package.json b/package.json
index e03ce3b9..9e42cfff 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
    "name": "homebridge-ewelink",
-   "version": "2.24.0",
+   "version": "2.24.1",
    "author": "bwp91",
    "contributors": [
       "gbro115",

From 0eaa483317fbbcd38169a942506009f87eed8ba0 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 28 Aug 2020 13:11:28 +0100
Subject: [PATCH 0056/3183] callback position

---
 lib/eWeLink.js   | 3 ++-
 lib/eWeLinkWS.js | 3 +--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index cb9464c2..4d69b335 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -672,7 +672,8 @@ class eWeLink {
       };
       let sendViaWS = () => {
          if (accessory.context.reachableWAN) {
-            this.wsClient.sendUpdate(payload, callback);
+            this.wsClient.sendUpdate(payload);
+            callback();
          } else {
             this.log.error("[%s] could not be updated as it appears to be offline.", accessory.displayName);
             callback("Device has failed to update");
diff --git a/lib/eWeLinkWS.js b/lib/eWeLinkWS.js
index cf35ae34..fb5ba293 100644
--- a/lib/eWeLinkWS.js
+++ b/lib/eWeLinkWS.js
@@ -183,7 +183,7 @@ module.exports = class eWeLinkWS {
          }
       });
    }
-   sendUpdate(json, callback) {
+   sendUpdate(json) {
       json = {
          ...json,
          ...{
@@ -201,7 +201,6 @@ module.exports = class eWeLinkWS {
          }
          if (this.ws) {
             this.ws.send(req);
-            callback();
             if (this.debugReqRes) {
                let msg = JSON.stringify(json, null, 2).replace(json.apikey, "**hidden**").replace(json.apiKey, "**hidden**").replace(json.deviceid, "**hidden**");
                this.log.warn("Web socket message sent. This text is yellow for clarity.\n%s", msg);

From 8859987af89637345ea864b12ef83c115962f341 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Sun, 30 Aug 2020 14:56:47 +0100
Subject: [PATCH 0057/3183] Update README.md

---
 README.md | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 31a356b8..003d8a37 100644
--- a/README.md
+++ b/README.md
@@ -14,9 +14,8 @@
  
 </span>
 
-## Documentation
+### Documentation
 Please refer to the [wiki](https://github.com/bwp91/homebridge-ewelink/wiki) for documentation.
 
-## Credits
-- To the original owner of this package @gbro115 for letting me take over. I will look after it as best as I can :)
-- More credits in the [wiki](https://github.com/bwp91/homebridge-ewelink/wiki/Credits).
+### Credit
+Thank you to the original owner of this package @gbro115 for letting me take over. I will look after it as best as I can :)

From f4cdc7c23a1ec771a5c61dd81cefc81a3d4a1e3b Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Sun, 30 Aug 2020 15:02:37 +0100
Subject: [PATCH 0058/3183] Update README.md

---
 README.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 003d8a37..3aa9e0e0 100644
--- a/README.md
+++ b/README.md
@@ -5,17 +5,18 @@
   
 # homebridge-ewelink 
 
+ Homebridge plugin to control eWeLink devices with original firmware.
+ 
  [![verified-by-homebridge](https://badgen.net/badge/homebridge/verified/purple)](https://github.com/homebridge/homebridge/wiki/Verified-Plugins)
  [![Discord](https://img.shields.io/discord/432663330281226270?color=728ED5&logo=discord&label=discord)](https://discord.com/channels/432663330281226270/742733745743855627)
  [![npm](https://img.shields.io/npm/dt/homebridge-ewelink)](https://www.npmjs.com/package/homebridge-ewelink)   
  [![npm](https://img.shields.io/npm/v/homebridge-ewelink/latest?label=release)](https://www.npmjs.com/package/homebridge-ewelink)
  [![npm](https://img.shields.io/npm/v/homebridge-ewelink/beta?label=beta)](https://www.npmjs.com/package/homebridge-ewelink)
 
- 
 </span>
 
 ### Documentation
 Please refer to the [wiki](https://github.com/bwp91/homebridge-ewelink/wiki) for documentation.
 
 ### Credit
-Thank you to the original owner of this package @gbro115 for letting me take over. I will look after it as best as I can :)
+To the original owner of this package @gbro115 for letting me take over. I will look after it as best as I can :)

From ee8674c0528219f447f33aae280ec712328903cd Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Sun, 30 Aug 2020 15:23:00 +0100
Subject: [PATCH 0059/3183] Update README.md

---
 README.md | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 3aa9e0e0..f0c86501 100644
--- a/README.md
+++ b/README.md
@@ -15,8 +15,18 @@
 
 </span>
 
-### Documentation
-Please refer to the [wiki](https://github.com/bwp91/homebridge-ewelink/wiki) for documentation.
-
-### Credit
-To the original owner of this package @gbro115 for letting me take over. I will look after it as best as I can :)
+### Setup
+* [Installation](https://github.com/bwp91/homebridge-ewelink/wiki/Installation)
+* [Configuration](https://github.com/bwp91/homebridge-ewelink/wiki/Configuration)
+* [Beta Version](https://github.com/bwp91/homebridge-ewelink/wiki/Beta-Version)
+### Features
+* [Supported Devices](https://github.com/bwp91/homebridge-ewelink/wiki/Supported-Devices)
+* [Connection Methods](https://github.com/bwp91/homebridge-ewelink/wiki/Connection-Methods)
+### How-to Guides
+* [How to copy Homebridge logs](https://github.com/bwp91/homebridge-ewelink/wiki/How-to-copy-Homebridge-logs)
+* [How to enable/disable plugin extended logging](https://github.com/bwp91/homebridge-ewelink/wiki/How-to-enable-disable-plugin-extended-logging)
+* [How to set up RF Bridge sensors](https://github.com/bwp91/homebridge-ewelink/wiki/How-to-set-up-RF-Bridge-sensors)
+### About
+* [Support Request](https://github.com/bwp91/homebridge-ewelink/issues)
+* [Roadmap](https://github.com/bwp91/homebridge-ewelink/wiki/Roadmap)
+* [Credits](https://github.com/bwp91/homebridge-ewelink/wiki/Credits)

From 6b2518d4749ea98f879720bd58d97e0d4a7da63a Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 5 Sep 2020 11:06:31 +0100
Subject: [PATCH 0060/3183] closeConnection checks

---
 lib/eWeLink.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index 4d69b335..6940cc0a 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -89,8 +89,12 @@ class eWeLink {
             }).catch(err => this.log.error("🔴  Cannot load %s - %s", cns.packageName, err));
       });
       this.api.on('shutdown', () => {
-         this.lanClient.closeConnection();
-         this.wsClient.closeConnection();
+         if (this.lanClient) {
+            this.lanClient.closeConnection();
+         }
+         if (this.wsClient) {
+            this.wsClient.closeConnection();
+         }
       });
    }
    initialiseDevice(device) {

From 870a4304c862e937c5f9c663f1019a7b0c51bef0 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 5 Sep 2020 15:22:06 +0100
Subject: [PATCH 0061/3183] link to wiki

---
 config.schema.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index c41d0656..9362768b 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -3,7 +3,7 @@
    "pluginType":"platform",
    "singular":true,
    "headerDisplay":"Homebridge plugin to control eWeLink devices with original firmware.",
-   "footerDisplay":"If you have any suggestions, please open an issue on [GitHub](https://github.com/bwp91/homebridge-ewelink/issues).",
+   "footerDisplay":"For help and support please visit our [GitHub Wiki](https://github.com/bwp91/homebridge-ewelink/wiki).",
    "schema":{
       "type":"object",
       "properties":{
@@ -298,4 +298,4 @@
          ]
       }
    ]
-}
+}
\ No newline at end of file

From d077ba4a6c0d0a0ed8136268e9517f84198c63af Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 5 Sep 2020 15:22:16 +0100
Subject: [PATCH 0062/3183] remove package name

---
 lib/constants.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/constants.js b/lib/constants.js
index 653f547c..1a11a419 100644
--- a/lib/constants.js
+++ b/lib/constants.js
@@ -2,7 +2,6 @@
 "use strict";
 module.exports = {
    appId: "oeVkj2lYFGnJu5XUtWisfW4utiN4u9Mq",
-   packageName: "homebridge-ewelink",
    devicesHideable: ["switch", "light", "valve"],
    devicesNonLAN: [22, 59, 102],
    devicesSingleSwitch: [1, 5, 6, 14, 15, 22, 24, 27, 32, 36, 44, 59],

From db052e3541fd04936b175627373aa7b318d375d9 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 5 Sep 2020 15:22:19 +0100
Subject: [PATCH 0063/3183] remove package name

---
 index.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/index.js b/index.js
index 3083dd2d..624be64e 100644
--- a/index.js
+++ b/index.js
@@ -1,7 +1,6 @@
 /* jshint esversion: 9, -W030, node: true */
 "use strict";
-const constants = require("./lib/constants");
 module.exports = function (homebridge) {
    let eWeLink = require("./lib/eWeLink.js")(homebridge);
-   homebridge.registerPlatform(constants.packageName, "eWeLink", eWeLink, true);
+   homebridge.registerPlatform("homebridge-ewelink", "eWeLink", eWeLink, true);
 };
\ No newline at end of file

From 2d90bbe787c1dc6fbb680d9e7b6a4b15c31eacc9 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 5 Sep 2020 15:22:33 +0100
Subject: [PATCH 0064/3183] remove package name

---
 lib/eWeLink.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index 6940cc0a..c780b194 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -12,7 +12,7 @@ class eWeLink {
          return;
       }
       if (!config || (!config.username || !config.password || !config.countryCode)) {
-         log.error("🔴  Cannot load %s - please check your eWeLink credentials in the plugin settings.", cns.packageName);
+         log.error("🔴  Cannot load homebridge-ewelink - please check your eWeLink credentials in the plugin settings.");
          return;
       }
       this.log = log;
@@ -86,7 +86,7 @@ class eWeLink {
                      this.log.warn("You have 'Request & Response Logging' enabled. This setting is not recommended for long-term use.");
                   }
                })();
-            }).catch(err => this.log.error("🔴  Cannot load %s - %s", cns.packageName, err));
+            }).catch(err => this.log.error("🔴  Cannot load homebridge-ewelink - %s", err));
       });
       this.api.on('shutdown', () => {
          if (this.lanClient) {
@@ -385,7 +385,7 @@ class eWeLink {
                throw "device is not supported by this plugin";
          }
          this.devicesInHB.set(hbDeviceId, accessory);
-         this.api.registerPlatformAccessories(cns.packageName, "eWeLink", [accessory]);
+         this.api.registerPlatformAccessories("homebridge-ewelink", "eWeLink", [accessory]);
          this.configureAccessory(accessory);
          this.log("[%s] has been added to Homebridge.", newDeviceName);
       } catch (err) {
@@ -662,7 +662,7 @@ class eWeLink {
    removeAccessory(accessory) {
       try {
          this.devicesInHB.delete(accessory.context.hbDeviceId);
-         this.api.unregisterPlatformAccessories(cns.packageName, "eWeLink", [accessory]);
+         this.api.unregisterPlatformAccessories("homebridge-ewelink", "eWeLink", [accessory]);
          this.log("[%s] has been removed from Homebridge.", accessory.displayName);
       } catch (err) {
          this.log.warn("[%s] needed to be removed but couldn't - [%s].", accessory.displayName, err);

From a78de6c08a9da858be283445877e923698f6fd0e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 5 Sep 2020 15:25:25 +0100
Subject: [PATCH 0065/3183] 2.24.2

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 2732cb07..c761890a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
    "name": "homebridge-ewelink",
-   "version": "2.24.1",
+   "version": "2.24.2",
    "lockfileVersion": 1,
    "requires": true,
    "dependencies": {
diff --git a/package.json b/package.json
index 9e42cfff..0fc56a42 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
    "name": "homebridge-ewelink",
-   "version": "2.24.1",
+   "version": "2.24.2",
    "author": "bwp91",
    "contributors": [
       "gbro115",

From 0e1e9c57373221c44f8bb7fc6cb6ec95d7e570dc Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 5 Sep 2020 15:42:19 +0100
Subject: [PATCH 0066/3183] update axios dep

---
 package-lock.json | 30 +++++++-----------------------
 package.json      |  2 +-
 2 files changed, 8 insertions(+), 24 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c761890a..6aaae582 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5,11 +5,11 @@
    "requires": true,
    "dependencies": {
       "axios": {
-         "version": "0.19.2",
-         "resolved": "https://registry.npmjs.org/axios/-/axios-0.19.2.tgz",
-         "integrity": "sha512-fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA==",
+         "version": "0.20.0",
+         "resolved": "https://registry.npmjs.org/axios/-/axios-0.20.0.tgz",
+         "integrity": "sha512-ANA4rr2BDcmmAQLOKft2fufrtuvlqR+cXNNinUmvfeSNCOF98PZL+7M/v1zIdGo7OLjEA9J2gXJL+j4zGsl0bA==",
          "requires": {
-            "follow-redirects": "1.5.10"
+            "follow-redirects": "^1.10.0"
          }
       },
       "color-convert": {
@@ -25,26 +25,10 @@
          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
       },
-      "debug": {
-         "version": "3.1.0",
-         "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-         "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
-         "requires": {
-            "ms": "2.0.0"
-         }
-      },
       "follow-redirects": {
-         "version": "1.5.10",
-         "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz",
-         "integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==",
-         "requires": {
-            "debug": "=3.1.0"
-         }
-      },
-      "ms": {
-         "version": "2.0.0",
-         "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-         "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+         "version": "1.13.0",
+         "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.0.tgz",
+         "integrity": "sha512-aq6gF1BEKje4a9i9+5jimNFIpq4Q1WiwBToeRK5NvZBd/TRsmW8BsJfOEGkr76TbOyPVD3OVDN910EcUNtRYEA=="
       },
       "node-dns-sd": {
          "version": "0.4.1",
diff --git a/package.json b/package.json
index 0fc56a42..a8d8bcaf 100644
--- a/package.json
+++ b/package.json
@@ -39,7 +39,7 @@
       "url": "https://github.com/bwp91/homebridge-ewelink"
    },
    "dependencies": {
-      "axios": "0.19.2",
+      "axios": "0.20.0",
       "color-convert": "2.0.1",
       "node-dns-sd": "0.4.1",
       "ws": "7.3.1"

From 7163dd6f63b9a4f57870d22fc6dd56ece20da8fd Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 6 Sep 2020 01:10:17 +0100
Subject: [PATCH 0067/3183] lan receive msg bug

---
 lib/eWeLinkLAN.js | 294 +++++++++++++++++++++++-----------------------
 1 file changed, 146 insertions(+), 148 deletions(-)

diff --git a/lib/eWeLinkLAN.js b/lib/eWeLinkLAN.js
index 1032afa0..b50b901f 100644
--- a/lib/eWeLinkLAN.js
+++ b/lib/eWeLinkLAN.js
@@ -6,165 +6,163 @@ const crypto = require("crypto");
 const dns = require("node-dns-sd");
 const eventemitter = require("events");
 module.exports = class eWeLinkLAN {
-   constructor(config, log, devices) {
-      this.config = config;
-      this.log = log;
-      this.devices = devices;
-      let deviceMap = new Map();
-      devices.forEach(device => {
-         deviceMap.set(device.deviceid, {
-            apiKey: device.devicekey,
-            online: false,
-            ip: null
-         });
-      });
-      this.deviceMap = deviceMap;
-      this.debug = this.config.debug || false;
-      this.debugReqRes = this.config.debugReqRes || false;
-      this.emitter = new eventemitter();
-   }
-   getHosts() {
-      return new Promise((resolve, reject) => {
-         dns.discover({
-            name: "_ewelink._tcp.local"
-         }).then(res => {
-            let onlineCount = 0;
-            res.forEach(device => {
-               let d, deviceId = device.fqdn.replace("._ewelink._tcp.local", "").replace("eWeLink_", "");
-               if ((d = this.deviceMap.get(deviceId))) {
-                  this.deviceMap.set(deviceId, {
-                     apiKey: d.apiKey,
-                     online: true,
-                     ip: device.address
-                  });
-                  onlineCount++;
-               }
+    constructor(config, log, devices) {
+        this.config = config;
+        this.log = log;
+        this.devices = devices;
+        let deviceMap = new Map();
+        devices.forEach(device => {
+            deviceMap.set(device.deviceid, {
+                apiKey: device.devicekey,
+                online: false,
+                ip: null
             });
-            resolve({
-               map: this.deviceMap,
-               count: onlineCount
+        });
+        this.deviceMap = deviceMap;
+        this.debug = this.config.debug || false;
+        this.debugReqRes = this.config.debugReqRes || false;
+        this.emitter = new eventemitter();
+    }
+    getHosts() {
+        return new Promise((resolve, reject) => {
+            dns.discover({
+                name: "_ewelink._tcp.local"
+            }).then(res => {
+                let onlineCount = 0;
+                res.forEach(device => {
+                    let d, deviceId = device.fqdn.replace("._ewelink._tcp.local", "").replace("eWeLink_", "");
+                    if ((d = this.deviceMap.get(deviceId))) {
+                        this.deviceMap.set(deviceId, {
+                            apiKey: d.apiKey,
+                            online: true,
+                            ip: device.address
+                        });
+                        onlineCount++;
+                    }
+                });
+                resolve({
+                    map: this.deviceMap,
+                    count: onlineCount
+                });
+            }).catch(err => {
+                reject(err);
             });
-         }).catch(err => {
-            reject(err);
-         });
-      });
-   }
-   startMonitor() {
-      dns.ondata = packet => {
-         if (packet.answers) {
-            packet.answers
-               .filter(value => value.name.includes("_ewelink._tcp.local"))
-               .forEach(value => {
-                  if (value.type === "TXT") {
-                     let rdata = value.rdata;
-                     if (this.deviceMap.hasOwnProperty(rdata.id)) {
-                        let deviceKey = this.deviceMap[rdata.id].apiKey,
-                           data = rdata.data1 +
-                           (rdata.hasOwnProperty("data2") ? rdata.data2 : "") +
-                           (rdata.hasOwnProperty("data3") ? rdata.data3 : "") +
-                           (rdata.hasOwnProperty("data4") ? rdata.data4 : ""),
-                           key = crypto.createHash("md5").update(Buffer.from(deviceKey, "utf8")).digest(),
-                           dText = crypto.createDecipheriv("aes-128-cbc", key, Buffer.from(rdata.iv, "base64")),
-                           pText = Buffer.concat([dText.update(Buffer.from(data, "base64")), dText.final()]).toString("utf8"),
-                           params;
+        });
+    }
+    startMonitor() {
+        dns.ondata = packet => {
+            if (packet.answers) {
+                packet.answers
+                    .filter(value => value.name.includes("_ewelink._tcp.local"))
+                    .filter(value => value.type === "TXT")
+                    .filter(value => this.deviceMap.has(value.rdata.id))
+                    .forEach(value => {
+                        let rdata = value.rdata,
+                            deviceKey = this.deviceMap.get(rdata.id).apiKey,
+                            data = rdata.data1 +
+                            (rdata.hasOwnProperty("data2") ? rdata.data2 : "") +
+                            (rdata.hasOwnProperty("data3") ? rdata.data3 : "") +
+                            (rdata.hasOwnProperty("data4") ? rdata.data4 : ""),
+                            key = crypto.createHash("md5").update(Buffer.from(deviceKey, "utf8")).digest(),
+                            dText = crypto.createDecipheriv("aes-128-cbc", key, Buffer.from(rdata.iv, "base64")),
+                            pText = Buffer.concat([dText.update(Buffer.from(data, "base64")), dText.final()]).toString("utf8"),
+                            params;
                         try {
-                           params = JSON.parse(pText);
+                            params = JSON.parse(pText);
                         } catch (e) {
-                           this.log.warn("[%s] An error occured reading the LAN message [%s]", rdata.id, e);
-                           return;
+                            this.log.warn("[%s] An error occured reading the LAN message [%s]", rdata.id, e);
+                            return;
                         }
                         for (let param in params) {
-                           if (params.hasOwnProperty(param)) {
-                              if (!constants.paramsToKeep.includes(param.replace(/[0-9]/g, ""))) {
-                                 delete params[param];
-                              }
-                           }
+                            if (params.hasOwnProperty(param)) {
+                                if (!constants.paramsToKeep.includes(param.replace(/[0-9]/g, ""))) {
+                                    delete params[param];
+                                }
+                            }
                         }
                         params.updateSource = "lan";
                         if (Object.keys(params).length > 0) {
-                           let returnTemplate = {
-                              deviceid: rdata.id,
-                              action: "update",
-                              params
-                           };
-                           if (this.debugReqRes) {
-                              let msg = JSON.stringify(returnTemplate, null, 2).replace(rdata.id, "**hidden**");
-                              this.log("LAN message received.\n%s", msg);
-                           } else if (this.debug) {
-                              this.log("LAN message received.");
-                           }
-                           this.emitter.emit("update", returnTemplate);
+                            let returnTemplate = {
+                                deviceid: rdata.id,
+                                action: "update",
+                                params
+                            };
+                            if (this.debugReqRes) {
+                                let msg = JSON.stringify(returnTemplate, null, 2).replace(rdata.id, "**hidden**");
+                                this.log("LAN message received.\n%s", msg);
+                            } else if (this.debug) {
+                                this.log("LAN message received.");
+                            }
+                            this.emitter.emit("update", returnTemplate);
                         }
-                     }
-                  }
-               });
-         }
-      };
-      return new Promise((resolve, reject) => {
-         dns.startMonitoring().then(() => {
-            resolve();
-         }).catch(err => {
-            reject(err);
-         });
-      });
-   }
-   sendUpdate(json) {
-      return new Promise((resolve, reject) => {
-         if (!this.deviceMap.get(json.deviceid).online) {
-            throw "device does not support LAN mode";
-         }
-         let apiKey, suffix, params = {};
-         if (json.params.hasOwnProperty("switches")) {
-            params.switches = json.params.switches;
-            suffix = "switches";
-         } else if (json.params.hasOwnProperty("switch")) {
-            params.switch = json.params.switch;
-            suffix = "switch";
-         } else {
-            throw "plugin does not support lan mode for this device yet - feel free to create a github issue";
-         }
-         if ((apiKey = this.deviceMap.get(json.deviceid).apiKey)) {
-            let key = crypto.createHash('md5').update(Buffer.from(apiKey, 'utf8')).digest(),
-               iv = crypto.randomBytes(16),
-               enc = crypto.createCipheriv('aes-128-cbc', key, iv),
-               data = {
-                  data: Buffer.concat([enc.update(JSON.stringify(params)), enc.final()]).toString('base64'),
-                  deviceid: json.deviceid,
-                  encrypt: true,
-                  iv: iv.toString('base64'),
-                  selfApikey: "123",
-                  sequence: Date.now().toString()
-               };
-            if (this.debugReqRes) {
-               let msg = JSON.stringify(json, null, 2).replace(json.apikey, "**hidden**").replace(json.apikey, "**hidden**").replace(json.deviceid, "**hidden**");
-               this.log.warn("LAN mode message sent. This text is yellow for clarity.\n%s", msg);
-            } else if (this.debug) {
-               this.log("LAN mode message sent.");
+                    });
             }
-            axios({
-               method: "post",
-               url: "http://" + this.deviceMap.get(json.deviceid).ip + ":8081/zeroconf/" + suffix,
-               headers: {
-                  Accept: "application/json",
-                  "Content-Type": "application/json"
-               },
-               data
-            }).then(res => {
-               if (res.data.hasOwnProperty("error") && res.data.error === 0) {
-                  resolve();
-               }
-               throw res.data;
+        };
+        return new Promise((resolve, reject) => {
+            dns.startMonitoring().then(() => {
+                resolve();
             }).catch(err => {
-               reject(err);
+                reject(err);
             });
-         }
-      });
-   }
-   receiveUpdate(f) {
-      this.emitter.addListener("update", f);
-   }
-   closeConnection() {
-      dns.stopMonitoring();
-      this.log("LAN monitoring stopped as part of Homebridge shutdown.");
-   }
+        });
+    }
+    sendUpdate(json) {
+        return new Promise((resolve, reject) => {
+            if (!this.deviceMap.get(json.deviceid).online) {
+                throw "device does not support LAN mode";
+            }
+            let apiKey, suffix, params = {};
+            if (json.params.hasOwnProperty("switches")) {
+                params.switches = json.params.switches;
+                suffix = "switches";
+            } else if (json.params.hasOwnProperty("switch")) {
+                params.switch = json.params.switch;
+                suffix = "switch";
+            } else {
+                throw "plugin does not support lan mode for this device yet - feel free to create a github issue";
+            }
+            if ((apiKey = this.deviceMap.get(json.deviceid).apiKey)) {
+                let key = crypto.createHash('md5').update(Buffer.from(apiKey, 'utf8')).digest(),
+                    iv = crypto.randomBytes(16),
+                    enc = crypto.createCipheriv('aes-128-cbc', key, iv),
+                    data = {
+                        data: Buffer.concat([enc.update(JSON.stringify(params)), enc.final()]).toString('base64'),
+                        deviceid: json.deviceid,
+                        encrypt: true,
+                        iv: iv.toString('base64'),
+                        selfApikey: "123",
+                        sequence: Date.now().toString()
+                    };
+                if (this.debugReqRes) {
+                    let msg = JSON.stringify(json, null, 2).replace(json.apikey, "**hidden**").replace(json.apikey, "**hidden**").replace(json.deviceid, "**hidden**");
+                    this.log.warn("LAN mode message sent. This text is yellow for clarity.\n%s", msg);
+                } else if (this.debug) {
+                    this.log("LAN mode message sent.");
+                }
+                axios({
+                    method: "post",
+                    url: "http://" + this.deviceMap.get(json.deviceid).ip + ":8081/zeroconf/" + suffix,
+                    headers: {
+                        Accept: "application/json",
+                        "Content-Type": "application/json"
+                    },
+                    data
+                }).then(res => {
+                    if (res.data.hasOwnProperty("error") && res.data.error === 0) {
+                        resolve();
+                    }
+                    throw res.data;
+                }).catch(err => {
+                    reject(err);
+                });
+            }
+        });
+    }
+    receiveUpdate(f) {
+        this.emitter.addListener("update", f);
+    }
+    closeConnection() {
+        dns.stopMonitoring();
+        this.log("LAN monitoring stopped as part of Homebridge shutdown.");
+    }
 };
\ No newline at end of file

From 722a754d29c521cf1d8f74f0bbe3afdc13b98295 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 6 Sep 2020 01:13:47 +0100
Subject: [PATCH 0068/3183] formatting

---
 lib/eWeLinkLAN.js | 306 +++++++++++++++++++++++-----------------------
 1 file changed, 153 insertions(+), 153 deletions(-)

diff --git a/lib/eWeLinkLAN.js b/lib/eWeLinkLAN.js
index b50b901f..098be312 100644
--- a/lib/eWeLinkLAN.js
+++ b/lib/eWeLinkLAN.js
@@ -6,163 +6,163 @@ const crypto = require("crypto");
 const dns = require("node-dns-sd");
 const eventemitter = require("events");
 module.exports = class eWeLinkLAN {
-    constructor(config, log, devices) {
-        this.config = config;
-        this.log = log;
-        this.devices = devices;
-        let deviceMap = new Map();
-        devices.forEach(device => {
-            deviceMap.set(device.deviceid, {
-                apiKey: device.devicekey,
-                online: false,
-                ip: null
+   constructor(config, log, devices) {
+      this.config = config;
+      this.log = log;
+      this.devices = devices;
+      let deviceMap = new Map();
+      devices.forEach(device => {
+         deviceMap.set(device.deviceid, {
+            apiKey: device.devicekey,
+            online: false,
+            ip: null
+         });
+      });
+      this.deviceMap = deviceMap;
+      this.debug = this.config.debug || false;
+      this.debugReqRes = this.config.debugReqRes || false;
+      this.emitter = new eventemitter();
+   }
+   getHosts() {
+      return new Promise((resolve, reject) => {
+         dns.discover({
+            name: "_ewelink._tcp.local"
+         }).then(res => {
+            let onlineCount = 0;
+            res.forEach(device => {
+               let d, deviceId = device.fqdn.replace("._ewelink._tcp.local", "").replace("eWeLink_", "");
+               if ((d = this.deviceMap.get(deviceId))) {
+                  this.deviceMap.set(deviceId, {
+                     apiKey: d.apiKey,
+                     online: true,
+                     ip: device.address
+                  });
+                  onlineCount++;
+               }
             });
-        });
-        this.deviceMap = deviceMap;
-        this.debug = this.config.debug || false;
-        this.debugReqRes = this.config.debugReqRes || false;
-        this.emitter = new eventemitter();
-    }
-    getHosts() {
-        return new Promise((resolve, reject) => {
-            dns.discover({
-                name: "_ewelink._tcp.local"
-            }).then(res => {
-                let onlineCount = 0;
-                res.forEach(device => {
-                    let d, deviceId = device.fqdn.replace("._ewelink._tcp.local", "").replace("eWeLink_", "");
-                    if ((d = this.deviceMap.get(deviceId))) {
-                        this.deviceMap.set(deviceId, {
-                            apiKey: d.apiKey,
-                            online: true,
-                            ip: device.address
-                        });
-                        onlineCount++;
-                    }
-                });
-                resolve({
-                    map: this.deviceMap,
-                    count: onlineCount
-                });
-            }).catch(err => {
-                reject(err);
+            resolve({
+               map: this.deviceMap,
+               count: onlineCount
             });
-        });
-    }
-    startMonitor() {
-        dns.ondata = packet => {
-            if (packet.answers) {
-                packet.answers
-                    .filter(value => value.name.includes("_ewelink._tcp.local"))
-                    .filter(value => value.type === "TXT")
-                    .filter(value => this.deviceMap.has(value.rdata.id))
-                    .forEach(value => {
-                        let rdata = value.rdata,
-                            deviceKey = this.deviceMap.get(rdata.id).apiKey,
-                            data = rdata.data1 +
-                            (rdata.hasOwnProperty("data2") ? rdata.data2 : "") +
-                            (rdata.hasOwnProperty("data3") ? rdata.data3 : "") +
-                            (rdata.hasOwnProperty("data4") ? rdata.data4 : ""),
-                            key = crypto.createHash("md5").update(Buffer.from(deviceKey, "utf8")).digest(),
-                            dText = crypto.createDecipheriv("aes-128-cbc", key, Buffer.from(rdata.iv, "base64")),
-                            pText = Buffer.concat([dText.update(Buffer.from(data, "base64")), dText.final()]).toString("utf8"),
-                            params;
-                        try {
-                            params = JSON.parse(pText);
-                        } catch (e) {
-                            this.log.warn("[%s] An error occured reading the LAN message [%s]", rdata.id, e);
-                            return;
-                        }
-                        for (let param in params) {
-                            if (params.hasOwnProperty(param)) {
-                                if (!constants.paramsToKeep.includes(param.replace(/[0-9]/g, ""))) {
-                                    delete params[param];
-                                }
-                            }
-                        }
-                        params.updateSource = "lan";
-                        if (Object.keys(params).length > 0) {
-                            let returnTemplate = {
-                                deviceid: rdata.id,
-                                action: "update",
-                                params
-                            };
-                            if (this.debugReqRes) {
-                                let msg = JSON.stringify(returnTemplate, null, 2).replace(rdata.id, "**hidden**");
-                                this.log("LAN message received.\n%s", msg);
-                            } else if (this.debug) {
-                                this.log("LAN message received.");
-                            }
-                            this.emitter.emit("update", returnTemplate);
+         }).catch(err => {
+            reject(err);
+         });
+      });
+   }
+   startMonitor() {
+      dns.ondata = packet => {
+         if (packet.answers) {
+            packet.answers
+               .filter(value => value.name.includes("_ewelink._tcp.local"))
+               .filter(value => value.type === "TXT")
+               .filter(value => this.deviceMap.has(value.rdata.id))
+               .forEach(value => {
+                  let rdata = value.rdata,
+                     deviceKey = this.deviceMap.get(rdata.id).apiKey,
+                     data = rdata.data1 +
+                     (rdata.hasOwnProperty("data2") ? rdata.data2 : "") +
+                     (rdata.hasOwnProperty("data3") ? rdata.data3 : "") +
+                     (rdata.hasOwnProperty("data4") ? rdata.data4 : ""),
+                     key = crypto.createHash("md5").update(Buffer.from(deviceKey, "utf8")).digest(),
+                     dText = crypto.createDecipheriv("aes-128-cbc", key, Buffer.from(rdata.iv, "base64")),
+                     pText = Buffer.concat([dText.update(Buffer.from(data, "base64")), dText.final()]).toString("utf8"),
+                     params;
+                  try {
+                     params = JSON.parse(pText);
+                  } catch (e) {
+                     this.log.warn("[%s] An error occured reading the LAN message [%s]", rdata.id, e);
+                     return;
+                  }
+                  for (let param in params) {
+                     if (params.hasOwnProperty(param)) {
+                        if (!constants.paramsToKeep.includes(param.replace(/[0-9]/g, ""))) {
+                           delete params[param];
                         }
-                    });
+                     }
+                  }
+                  params.updateSource = "lan";
+                  if (Object.keys(params).length > 0) {
+                     let returnTemplate = {
+                        deviceid: rdata.id,
+                        action: "update",
+                        params
+                     };
+                     if (this.debugReqRes) {
+                        let msg = JSON.stringify(returnTemplate, null, 2).replace(rdata.id, "**hidden**");
+                        this.log("LAN message received.\n%s", msg);
+                     } else if (this.debug) {
+                        this.log("LAN message received.");
+                     }
+                     this.emitter.emit("update", returnTemplate);
+                  }
+               });
+         }
+      };
+      return new Promise((resolve, reject) => {
+         dns.startMonitoring().then(() => {
+            resolve();
+         }).catch(err => {
+            reject(err);
+         });
+      });
+   }
+   sendUpdate(json) {
+      return new Promise((resolve, reject) => {
+         if (!this.deviceMap.get(json.deviceid).online) {
+            throw "device does not support LAN mode";
+         }
+         let apiKey, suffix, params = {};
+         if (json.params.hasOwnProperty("switches")) {
+            params.switches = json.params.switches;
+            suffix = "switches";
+         } else if (json.params.hasOwnProperty("switch")) {
+            params.switch = json.params.switch;
+            suffix = "switch";
+         } else {
+            throw "plugin does not support lan mode for this device yet - feel free to create a github issue";
+         }
+         if ((apiKey = this.deviceMap.get(json.deviceid).apiKey)) {
+            let key = crypto.createHash('md5').update(Buffer.from(apiKey, 'utf8')).digest(),
+               iv = crypto.randomBytes(16),
+               enc = crypto.createCipheriv('aes-128-cbc', key, iv),
+               data = {
+                  data: Buffer.concat([enc.update(JSON.stringify(params)), enc.final()]).toString('base64'),
+                  deviceid: json.deviceid,
+                  encrypt: true,
+                  iv: iv.toString('base64'),
+                  selfApikey: "123",
+                  sequence: Date.now().toString()
+               };
+            if (this.debugReqRes) {
+               let msg = JSON.stringify(json, null, 2).replace(json.apikey, "**hidden**").replace(json.apikey, "**hidden**").replace(json.deviceid, "**hidden**");
+               this.log.warn("LAN mode message sent. This text is yellow for clarity.\n%s", msg);
+            } else if (this.debug) {
+               this.log("LAN mode message sent.");
             }
-        };
-        return new Promise((resolve, reject) => {
-            dns.startMonitoring().then(() => {
-                resolve();
+            axios({
+               method: "post",
+               url: "http://" + this.deviceMap.get(json.deviceid).ip + ":8081/zeroconf/" + suffix,
+               headers: {
+                  Accept: "application/json",
+                  "Content-Type": "application/json"
+               },
+               data
+            }).then(res => {
+               if (res.data.hasOwnProperty("error") && res.data.error === 0) {
+                  resolve();
+               }
+               throw res.data;
             }).catch(err => {
-                reject(err);
+               reject(err);
             });
-        });
-    }
-    sendUpdate(json) {
-        return new Promise((resolve, reject) => {
-            if (!this.deviceMap.get(json.deviceid).online) {
-                throw "device does not support LAN mode";
-            }
-            let apiKey, suffix, params = {};
-            if (json.params.hasOwnProperty("switches")) {
-                params.switches = json.params.switches;
-                suffix = "switches";
-            } else if (json.params.hasOwnProperty("switch")) {
-                params.switch = json.params.switch;
-                suffix = "switch";
-            } else {
-                throw "plugin does not support lan mode for this device yet - feel free to create a github issue";
-            }
-            if ((apiKey = this.deviceMap.get(json.deviceid).apiKey)) {
-                let key = crypto.createHash('md5').update(Buffer.from(apiKey, 'utf8')).digest(),
-                    iv = crypto.randomBytes(16),
-                    enc = crypto.createCipheriv('aes-128-cbc', key, iv),
-                    data = {
-                        data: Buffer.concat([enc.update(JSON.stringify(params)), enc.final()]).toString('base64'),
-                        deviceid: json.deviceid,
-                        encrypt: true,
-                        iv: iv.toString('base64'),
-                        selfApikey: "123",
-                        sequence: Date.now().toString()
-                    };
-                if (this.debugReqRes) {
-                    let msg = JSON.stringify(json, null, 2).replace(json.apikey, "**hidden**").replace(json.apikey, "**hidden**").replace(json.deviceid, "**hidden**");
-                    this.log.warn("LAN mode message sent. This text is yellow for clarity.\n%s", msg);
-                } else if (this.debug) {
-                    this.log("LAN mode message sent.");
-                }
-                axios({
-                    method: "post",
-                    url: "http://" + this.deviceMap.get(json.deviceid).ip + ":8081/zeroconf/" + suffix,
-                    headers: {
-                        Accept: "application/json",
-                        "Content-Type": "application/json"
-                    },
-                    data
-                }).then(res => {
-                    if (res.data.hasOwnProperty("error") && res.data.error === 0) {
-                        resolve();
-                    }
-                    throw res.data;
-                }).catch(err => {
-                    reject(err);
-                });
-            }
-        });
-    }
-    receiveUpdate(f) {
-        this.emitter.addListener("update", f);
-    }
-    closeConnection() {
-        dns.stopMonitoring();
-        this.log("LAN monitoring stopped as part of Homebridge shutdown.");
-    }
+         }
+      });
+   }
+   receiveUpdate(f) {
+      this.emitter.addListener("update", f);
+   }
+   closeConnection() {
+      dns.stopMonitoring();
+      this.log("LAN monitoring stopped as part of Homebridge shutdown.");
+   }
 };
\ No newline at end of file

From ada5c535e49ee35bab65466a0954cfaae5c91a50 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 6 Sep 2020 01:25:13 +0100
Subject: [PATCH 0069/3183] close lan/ws on error

---
 lib/eWeLink.js    | 10 +++++++++-
 lib/eWeLinkLAN.js |  2 +-
 lib/eWeLinkWS.js  |  2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index c780b194..38b8fdc4 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -86,7 +86,15 @@ class eWeLink {
                      this.log.warn("You have 'Request & Response Logging' enabled. This setting is not recommended for long-term use.");
                   }
                })();
-            }).catch(err => this.log.error("🔴  Cannot load homebridge-ewelink - %s", err));
+            }).catch(err => {
+               this.log.error("🔴  Cannot load homebridge-ewelink - %s", err)
+               if (this.lanClient) {
+                  this.lanClient.closeConnection();
+               }
+               if (this.wsClient) {
+                  this.wsClient.closeConnection();
+               }
+            });
       });
       this.api.on('shutdown', () => {
          if (this.lanClient) {
diff --git a/lib/eWeLinkLAN.js b/lib/eWeLinkLAN.js
index 098be312..7a22f442 100644
--- a/lib/eWeLinkLAN.js
+++ b/lib/eWeLinkLAN.js
@@ -163,6 +163,6 @@ module.exports = class eWeLinkLAN {
    }
    closeConnection() {
       dns.stopMonitoring();
-      this.log("LAN monitoring stopped as part of Homebridge shutdown.");
+      this.log("LAN monitoring gracefully stopped.");
    }
 };
\ No newline at end of file
diff --git a/lib/eWeLinkWS.js b/lib/eWeLinkWS.js
index fb5ba293..73180031 100644
--- a/lib/eWeLinkWS.js
+++ b/lib/eWeLinkWS.js
@@ -151,7 +151,7 @@ module.exports = class eWeLinkWS {
       });
       this.ws.on("close", (e, m) => {
          if (m === "Stopping Homebridge") {
-            this.log("Web socket closed as part of Homebridge shutdown.");
+            this.log("Web socket gracefully closed.");
          } else {
             this.log.warn("Web socket closed - [%s - %s].", e, m);
             if (e !== 1000) {

From 204420cea8712b90538a99d1e3bce41491628575 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 6 Sep 2020 01:26:42 +0100
Subject: [PATCH 0070/3183] 2.24.3

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 6aaae582..e19dacd6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
    "name": "homebridge-ewelink",
-   "version": "2.24.2",
+   "version": "2.24.3",
    "lockfileVersion": 1,
    "requires": true,
    "dependencies": {
diff --git a/package.json b/package.json
index a8d8bcaf..ea228f70 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
    "name": "homebridge-ewelink",
-   "version": "2.24.2",
+   "version": "2.24.3",
    "author": "bwp91",
    "contributors": [
       "gbro115",

From bb7c39b940dce94a71e9ae2b32e0165f7df55799 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Sun, 6 Sep 2020 15:54:44 +0100
Subject: [PATCH 0071/3183] Update README.md

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index f0c86501..501eea7f 100644
--- a/README.md
+++ b/README.md
@@ -26,6 +26,7 @@
 * [How to copy Homebridge logs](https://github.com/bwp91/homebridge-ewelink/wiki/How-to-copy-Homebridge-logs)
 * [How to enable/disable plugin extended logging](https://github.com/bwp91/homebridge-ewelink/wiki/How-to-enable-disable-plugin-extended-logging)
 * [How to set up RF Bridge sensors](https://github.com/bwp91/homebridge-ewelink/wiki/How-to-set-up-RF-Bridge-sensors)
+* [How to set up Sonoff Camera (GK-200MP2-B)](https://github.com/bwp91/homebridge-ewelink/wiki/How-to-set-up-Sonoff-Camera)
 ### About
 * [Support Request](https://github.com/bwp91/homebridge-ewelink/issues)
 * [Roadmap](https://github.com/bwp91/homebridge-ewelink/wiki/Roadmap)

From 05951ebbbbf7735b51ae66b796b72e35a7d56a97 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 6 Sep 2020 16:28:24 +0100
Subject: [PATCH 0072/3183] garagedoor fix attempt

---
 lib/eWeLink.js | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index 38b8fdc4..2eb7de37 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -439,6 +439,7 @@ class eWeLink {
                   });
                break;
             case "garage":
+               accessory.context.inUse = false;
                accessory.getService(Service.GarageDoorOpener).getCharacteristic(Characteristic.TargetDoorState)
                   .on("set", (value, callback) => {
                      accessory.getService(Service.GarageDoorOpener).getCharacteristic(Characteristic.TargetDoorState).value !== value ?
@@ -865,6 +866,10 @@ class eWeLink {
    }
    internalGarageUpdate(accessory, value, callback) {
       try {
+         if (accessory.context.inUse) {
+            throw "it is currently in use";
+         }
+         accessory.context.inUse = true;
          if (!accessory.context.reachableWAN && !accessory.context.reachableLAN) {
             throw "it is currently offline";
          }
@@ -928,9 +933,11 @@ class eWeLink {
             setTimeout(() => {
                accessory.getService(Service.GarageDoorOpener)
                   .updateCharacteristic(Characteristic.CurrentDoorState, value === 0 ? 0 : 1);
+               accessory.context.inUse = false;
                callback();
             }, parseInt(garageConfig.operationTime) * 100);
          } else {
+            accessory.context.inUse = false;
             callback();
          }
       } catch (err) {
@@ -1395,6 +1402,10 @@ class eWeLink {
    }
    externalGarageUpdate(accessory, params) {
       try {
+         if (accessory.context.inUse) {
+            throw "it is currently in use";
+         }
+         accessory.context.inUse = true;
          let garageConfig, nSte;
          if (!(garageConfig = this.cusG.get(accessory.context.hbDeviceId))) {
             throw "group config missing";
@@ -1425,6 +1436,7 @@ class eWeLink {
                   .updateCharacteristic(Characteristic.CurrentDoorState, nSte - 2);
             }, parseInt(garageConfig.operationTime) * 100);
          }
+         accessory.context.inUse = false;
       } catch (err) {
          this.log.warn("[%s] could not be updated - [%s].", accessory.displayName, err);
       }

From b459a73051bc25e445f3e895b6d1e3eb7a66cb88 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 6 Sep 2020 16:29:40 +0100
Subject: [PATCH 0073/3183] 2.24.4-0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index e19dacd6..d6087665 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
    "name": "homebridge-ewelink",
-   "version": "2.24.3",
+   "version": "2.24.4-0",
    "lockfileVersion": 1,
    "requires": true,
    "dependencies": {
diff --git a/package.json b/package.json
index ea228f70..16e7198d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
    "name": "homebridge-ewelink",
-   "version": "2.24.3",
+   "version": "2.24.4-0",
    "author": "bwp91",
    "contributors": [
       "gbro115",

From 8fe8af13fefd0f73b0f191643c9295ab68a873a1 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Sun, 6 Sep 2020 17:59:09 +0100
Subject: [PATCH 0074/3183] Update README.md

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 501eea7f..cbd907d0 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,8 @@
 </span>
 
 ### Setup
-* [Installation](https://github.com/bwp91/homebridge-ewelink/wiki/Installation)
+* [Installation (Homebridge)](https://github.com/bwp91/homebridge-ewelink/wiki/Installation-(Homebridge))
+* [Installation (HOOBS)](https://github.com/bwp91/homebridge-ewelink/wiki/Installation-(HOOBS))
 * [Configuration](https://github.com/bwp91/homebridge-ewelink/wiki/Configuration)
 * [Beta Version](https://github.com/bwp91/homebridge-ewelink/wiki/Beta-Version)
 ### Features

From 0fe6611e678da03c34345d67b3e9ccbf667d9de1 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 6 Sep 2020 18:06:57 +0100
Subject: [PATCH 0075/3183] added kofi link

---
 package.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package.json b/package.json
index 16e7198d..a9cca3b7 100644
--- a/package.json
+++ b/package.json
@@ -45,6 +45,10 @@
       "ws": "7.3.1"
    },
    "funding": [
+      {
+         "type": "kofi",
+         "url": "https://ko-fi.com/bwp91"
+      },
       {
          "type": "patreon",
          "url": "https://www.patreon.com/bwp91"

From 9d95d70a998e4e4ef62a1791a3664c678c192329 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 7 Sep 2020 11:13:34 +0100
Subject: [PATCH 0076/3183] rename variable

---
 lib/eWeLink.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index 2eb7de37..2c3c4aea 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -44,7 +44,7 @@ class eWeLink {
                return this.lanClient.getHosts();
             }).then(res => { //*** Set up the LAN mode listener ***\\
                this.lanDevices = res.map;
-               this.lanDeviceOnline = res.count;
+               this.lanDevicesOnline = res.count;
                return this.lanClient.startMonitor();
             }).then(() => { //*** Use the device list to refresh Homebridge accessories ***\\
                (() => {
@@ -70,7 +70,7 @@ class eWeLink {
                   //*** Logging always helps to see if everything is okay so far ***\\
                   this.log("[%s] eWeLink devices were loaded from the Homebridge cache.", this.devicesInHB.size);
                   this.log("[%s] primary devices were loaded from your eWeLink account.", this.devicesInEwe.size);
-                  this.log("[%s] primary devices were discovered on your local network.", this.lanDeviceOnline);
+                  this.log("[%s] primary devices were discovered on your local network.", this.lanDevicesOnline);
                   //*** Remove Homebridge accessories that don't appear in eWeLink ***\\
                   this.devicesInHB.forEach(accessory => {
                      if (!this.devicesInEwe.has(accessory.context.eweDeviceId)) {

From 71a4000b42d563de4d16926daf5d2268ec8385cf Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 7 Sep 2020 11:13:57 +0100
Subject: [PATCH 0077/3183] feat: ip address update

---
 lib/eWeLinkLAN.js | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/lib/eWeLinkLAN.js b/lib/eWeLinkLAN.js
index 7a22f442..e6db8410 100644
--- a/lib/eWeLinkLAN.js
+++ b/lib/eWeLinkLAN.js
@@ -58,15 +58,25 @@ module.exports = class eWeLinkLAN {
                .filter(value => this.deviceMap.has(value.rdata.id))
                .forEach(value => {
                   let rdata = value.rdata,
-                     deviceKey = this.deviceMap.get(rdata.id).apiKey,
+                     deviceInfo = this.deviceMap.get(rdata.id),
                      data = rdata.data1 +
                      (rdata.hasOwnProperty("data2") ? rdata.data2 : "") +
                      (rdata.hasOwnProperty("data3") ? rdata.data3 : "") +
                      (rdata.hasOwnProperty("data4") ? rdata.data4 : ""),
-                     key = crypto.createHash("md5").update(Buffer.from(deviceKey, "utf8")).digest(),
+                     key = crypto.createHash("md5").update(Buffer.from(deviceInfo.apiKey, "utf8")).digest(),
                      dText = crypto.createDecipheriv("aes-128-cbc", key, Buffer.from(rdata.iv, "base64")),
                      pText = Buffer.concat([dText.update(Buffer.from(data, "base64")), dText.final()]).toString("utf8"),
                      params;
+                  if (packet.address !== deviceInfo.ip) {
+                     this.deviceMap.set(rdata.id, {
+                        apiKey: deviceInfo.apiKey,
+                        online: true,
+                        ip: packet.address
+                     });
+                     if (this.debug) {
+                        this.log.warn("[%s] updating IP address to [%s].", rdata.id, packet.address);
+                     }
+                  }
                   try {
                      params = JSON.parse(pText);
                   } catch (e) {

From 058982df175fe0359eba1219b142f3a0d7ce4630 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 7 Sep 2020 13:10:32 +0100
Subject: [PATCH 0078/3183] garage door bug fix?

---
 lib/eWeLink.js | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index 2c3c4aea..298a1ca6 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -87,7 +87,7 @@ class eWeLink {
                   }
                })();
             }).catch(err => {
-               this.log.error("🔴  Cannot load homebridge-ewelink - %s", err)
+               this.log.error("🔴  Cannot load homebridge-ewelink - %s", err);
                if (this.lanClient) {
                   this.lanClient.closeConnection();
                }
@@ -157,7 +157,7 @@ class eWeLink {
          } else if (cns.devicesZB.includes(device.extra.uiid)) {
             this.addAccessory(device, device.deviceid + "SWX", "zb_sub");
          } else if (cns.devicesCamera.includes(device.extra.uiid)) {
-            this.log.warn("[%s] please consider using homebridge-camera-ffmpeg to use this camera.", device.name);
+            this.log.warn("[%s] please see \"https://github.com/bwp91/homebridge-ewelink/wiki/How-to-set-up-Sonoff-Camera\".", device.name);
             return;
          } else {
             this.log.warn("[%s] cannot be added as it is not supported by this plugin. Please make a GitHub issue request.", device.name);
@@ -172,6 +172,7 @@ class eWeLink {
          accessory.getService(Service.AccessoryInformation).setCharacteristic(Characteristic.FirmwareRevision, device.params.fwVersion);
          accessory.context.reachableWAN = accessory.context.eweUIID !== 102 ? device.online : true; //*** DW2 ***\\
          accessory.context.reachableLAN = this.lanDevices.get(device.deviceid).online || false;
+         accessory.context.inUse = false;
          let str = accessory.context.reachableLAN ?
             "and locally with IP [" + this.lanDevices.get(device.deviceid).ip + "]" :
             "but LAN mode unavailable as unsupported/shared device";
@@ -439,7 +440,6 @@ class eWeLink {
                   });
                break;
             case "garage":
-               accessory.context.inUse = false;
                accessory.getService(Service.GarageDoorOpener).getCharacteristic(Characteristic.TargetDoorState)
                   .on("set", (value, callback) => {
                      accessory.getService(Service.GarageDoorOpener).getCharacteristic(Characteristic.TargetDoorState).value !== value ?
@@ -866,13 +866,16 @@ class eWeLink {
    }
    internalGarageUpdate(accessory, value, callback) {
       try {
-         if (accessory.context.inUse) {
-            throw "it is currently in use";
-         }
-         accessory.context.inUse = true;
          if (!accessory.context.reachableWAN && !accessory.context.reachableLAN) {
             throw "it is currently offline";
          }
+         if (accessory.context.inUse) {
+            let str = "[" + accessory.displayName + "] skipping update as it is currently moving.";
+            this.log.warn(str);
+            callback(str);
+            return;
+         }
+         accessory.context.inUse = true;
          let garageConfig;
          if (!(garageConfig = this.cusG.get(accessory.context.hbDeviceId))) {
             throw "group config missing";
@@ -894,6 +897,7 @@ class eWeLink {
             accessory.getService(Service.GarageDoorOpener)
                .updateCharacteristic(Characteristic.TargetDoorState, value)
                .updateCharacteristic(Characteristic.CurrentDoorState, value);
+            accessory.context.inUse = false;
             callback();
             return;
          }
@@ -941,6 +945,7 @@ class eWeLink {
             callback();
          }
       } catch (err) {
+         accessory.context.inUse = false;
          let str = "[" + accessory.displayName + "] could not be updated as " + err + ".";
          this.log.error(str);
          callback(str);
@@ -1403,7 +1408,9 @@ class eWeLink {
    externalGarageUpdate(accessory, params) {
       try {
          if (accessory.context.inUse) {
-            throw "it is currently in use";
+            let str = "[" + accessory.displayName + "] skipping update as it is currently moving.";
+            this.log.warn(str);
+            return;
          }
          accessory.context.inUse = true;
          let garageConfig, nSte;
@@ -1416,15 +1423,18 @@ class eWeLink {
          switch (garageConfig.setup) {
             case "oneSwitch":
                if (params.switch === "off" || garageConfig.sensorId) {
+                  accessory.context.inUse = false;
                   return;
                }
                nSte = [0, 2].includes(accessory.getService(Service.GarageDoorOpener).getCharacteristic(Characteristic.CurrentDoorState).value) ? 3 : 2;
                break;
             case "twoSwitch":
                if (params.switches[0].switch === "off" && params.switches[1].switch === "off") {
+                  accessory.context.inUse = false;
                   return;
                }
                // @TODO twoSwitch garage external update
+               accessory.context.inUse = false;
                return;
          }
          if (garageConfig.setup !== "oneSwitch" || !garageConfig.sensorId) {
@@ -1438,6 +1448,7 @@ class eWeLink {
          }
          accessory.context.inUse = false;
       } catch (err) {
+         accessory.context.inUse = false;
          this.log.warn("[%s] could not be updated - [%s].", accessory.displayName, err);
       }
    }

From e441e76347db9c8c5d1a48f01ea2561f54b11bce Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 7 Sep 2020 13:11:31 +0100
Subject: [PATCH 0079/3183] 2.24.4-1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d6087665..d082ba02 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
    "name": "homebridge-ewelink",
-   "version": "2.24.4-0",
+   "version": "2.24.4-1",
    "lockfileVersion": 1,
    "requires": true,
    "dependencies": {
diff --git a/package.json b/package.json
index a9cca3b7..1a370dc4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
    "name": "homebridge-ewelink",
-   "version": "2.24.4-0",
+   "version": "2.24.4-1",
    "author": "bwp91",
    "contributors": [
       "gbro115",

From 238a32a47a1f6ee73bfdfa1a987feb5157e4787b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 7 Sep 2020 18:04:28 +0100
Subject: [PATCH 0080/3183] remove inching setting

---
 config.schema.json | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 9362768b..5d56f513 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -143,12 +143,6 @@
                      "description":"Total time in deciseconds to fully open/close the blind/door. Count the time in seconds and multiply by 10, for example 100 for 10 seconds or 75 for 7.5 seconds.",
                      "default":100
                   },
-                  "inched":{
-                     "title":"Device Inching",
-                     "type":"boolean",
-                     "description":"If device inching is already setup in your eWeLink account then set this to true. Otherwise this plugin will send an 'off' command after half a second to mimic the inching behaviour.",
-                     "default":true
-                  },
                   "sensorId":{
                      "type":"string",
                      "title":"Sensor",
@@ -274,7 +268,6 @@
                   "groups[].deviceId",
                   "groups[].setup",
                   "groups[].operationTime",
-                  "groups[].inched",
                   "groups[].sensorId"
                ]
             }

From a15195d92bacbf8a07dead1a435954578aa02e99 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 7 Sep 2020 18:04:43 +0100
Subject: [PATCH 0081/3183] consistency in text

---
 lib/eWeLinkLAN.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/eWeLinkLAN.js b/lib/eWeLinkLAN.js
index e6db8410..8a2d82d3 100644
--- a/lib/eWeLinkLAN.js
+++ b/lib/eWeLinkLAN.js
@@ -145,9 +145,9 @@ module.exports = class eWeLinkLAN {
                };
             if (this.debugReqRes) {
                let msg = JSON.stringify(json, null, 2).replace(json.apikey, "**hidden**").replace(json.apikey, "**hidden**").replace(json.deviceid, "**hidden**");
-               this.log.warn("LAN mode message sent. This text is yellow for clarity.\n%s", msg);
+               this.log.warn("LAN message sent. This text is yellow for clarity.\n%s", msg);
             } else if (this.debug) {
-               this.log("LAN mode message sent.");
+               this.log("LAN message sent.");
             }
             axios({
                method: "post",

From 3cf55cfca10eb62b817631b9d62601e112b8b926 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 7 Sep 2020 18:35:30 +0100
Subject: [PATCH 0082/3183] garage door rewrites

---
 lib/eWeLink.js | 103 +++++++++++++++----------------------------------
 1 file changed, 31 insertions(+), 72 deletions(-)

diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index 298a1ca6..9b149e63 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -810,13 +810,13 @@ class eWeLink {
          if (blindConfig.type !== "blind" || !["oneSwitch", "twoSwitch"].includes(blindConfig.setup)) {
             throw "improper configuration";
          }
-         let pSte, params = {};
+         let oldPos, params = {};
          value = value >= 50 ? 100 : 0;
-         pSte = accessory.getService(Service.WindowCovering).getCharacteristic(Characteristic.PositionState).value;
-         if (value === pSte * 100) {
+         oldPos = accessory.getService(Service.WindowCovering).getCharacteristic(Characteristic.PositionState).value;
+         if (value === oldPos * 100) {
             accessory.getService(Service.WindowCovering)
                .updateCharacteristic(Characteristic.TargetPosition, value)
-               .updateCharacteristic(Characteristic.PositionState, pSte);
+               .updateCharacteristic(Characteristic.PositionState, oldPos);
             callback();
             return;
          }
@@ -836,22 +836,6 @@ class eWeLink {
          accessory.getService(Service.WindowCovering)
             .updateCharacteristic(Characteristic.TargetPosition, value)
             .updateCharacteristic(Characteristic.PositionState, (value / 100));
-         if (!blindConfig.inched || blindConfig.inched === "false") {
-            setTimeout(() => {
-               switch (blindConfig.setup) {
-                  case "oneSwitch":
-                     params.switch = "off";
-                     break;
-                  case "twoSwitch":
-                     params.switches[0].switch = "off";
-                     params.switches[1].switch = "off";
-                     break;
-               }
-               this.sendDeviceUpdate(accessory, params, function() {
-                  return;
-               });
-            }, 500);
-         }
          setTimeout(() => {
             accessory.getService(Service.WindowCovering)
                .updateCharacteristic(Characteristic.CurrentPosition, value)
@@ -866,16 +850,10 @@ class eWeLink {
    }
    internalGarageUpdate(accessory, value, callback) {
       try {
+         accessory.context.inUse = true;
          if (!accessory.context.reachableWAN && !accessory.context.reachableLAN) {
             throw "it is currently offline";
          }
-         if (accessory.context.inUse) {
-            let str = "[" + accessory.displayName + "] skipping update as it is currently moving.";
-            this.log.warn(str);
-            callback(str);
-            return;
-         }
-         accessory.context.inUse = true;
          let garageConfig;
          if (!(garageConfig = this.cusG.get(accessory.context.hbDeviceId))) {
             throw "group config missing";
@@ -885,65 +863,45 @@ class eWeLink {
          }
          let sensorDefinition = garageConfig.sensorId || false,
             sAccessory = false,
-            pSte,
+            oldPos,
+            newPos = value,
             params = {};
          if (sensorDefinition && !(sAccessory = this.devicesInHB.get(garageConfig.sensorId + "SWX"))) {
             throw "defined sensor doesn't exist";
          }
-         this.log("[%s] has received request to [%s].", accessory.displayName, value === 0 ? "open" : "close");
-         pSte = sAccessory ?
-            sAccessory.getService(Service.ContactSensor).getCharacteristic(Characteristic.ContactSensorState).value === 0 ? 1 : 0 : [0, 2].includes(accessory.getService(Service.GarageDoorOpener).getCharacteristic(Characteristic.CurrentDoorState).value) ? 0 : 1;
-         if (value === pSte) {
-            accessory.getService(Service.GarageDoorOpener)
-               .updateCharacteristic(Characteristic.TargetDoorState, value)
-               .updateCharacteristic(Characteristic.CurrentDoorState, value);
+         this.log("[%s] has received request to [%s].", accessory.displayName, newPos === 0 ? "open" : "close");
+         oldPos = sAccessory ?
+            sAccessory.getService(Service.ContactSensor).getCharacteristic(Characteristic.ContactSensorState).value === 0 ? 1 : 0 :
+            accessory.getService(Service.GarageDoorOpener).getCharacteristic(Characteristic.CurrentDoorState).value;
+         if (newPos === (oldPos % 2)) {
             accessory.context.inUse = false;
             callback();
             return;
          }
+         accessory.getService(Service.GarageDoorOpener)
+            .updateCharacteristic(Characteristic.TargetDoorState, newPos)
+            .updateCharacteristic(Characteristic.CurrentDoorState, newPos + 2);
          switch (garageConfig.setup) {
             case "oneSwitch":
                params.switch = "on";
                break;
             case "twoSwitch":
                params.switches = this.devicesInEwe.get(accessory.context.eweDeviceId).params.switches;
-               params.switches[0].switch = value === 0 ? "on" : "off";
-               params.switches[1].switch = value === 1 ? "on" : "off";
+               params.switches[0].switch = newPos === 0 ? "on" : "off";
+               params.switches[1].switch = newPos === 1 ? "on" : "off";
                break;
          }
          this.sendDeviceUpdate(accessory, params, function() {
             return;
          });
-         accessory.getService(Service.GarageDoorOpener)
-            .updateCharacteristic(Characteristic.TargetDoorState, value)
-            .updateCharacteristic(Characteristic.CurrentDoorState, value === 0 ? 2 : 3);
-         if (!garageConfig.inched || garageConfig.inched === "false") {
-            setTimeout(() => {
-               switch (garageConfig.setup) {
-                  case "oneSwitch":
-                     params.switch = "off";
-                     break;
-                  case "twoSwitch":
-                     params.switches[0].switch = "off";
-                     params.switches[1].switch = "off";
-                     break;
-               }
-               this.sendDeviceUpdate(accessory, params, function() {
-                  return;
-               });
-            }, 500);
-         }
-         if (!sAccessory) {
-            setTimeout(() => {
+         setTimeout(() => {
+            if (!sAccessory) {
                accessory.getService(Service.GarageDoorOpener)
-                  .updateCharacteristic(Characteristic.CurrentDoorState, value === 0 ? 0 : 1);
-               accessory.context.inUse = false;
-               callback();
-            }, parseInt(garageConfig.operationTime) * 100);
-         } else {
+                  .updateCharacteristic(Characteristic.CurrentDoorState, newPos === 0 ? 0 : 1);
+            }
             accessory.context.inUse = false;
-            callback();
-         }
+         }, parseInt(garageConfig.operationTime) * 100);
+         callback();
       } catch (err) {
          accessory.context.inUse = false;
          let str = "[" + accessory.displayName + "] could not be updated as " + err + ".";
@@ -1408,12 +1366,14 @@ class eWeLink {
    externalGarageUpdate(accessory, params) {
       try {
          if (accessory.context.inUse) {
-            let str = "[" + accessory.displayName + "] skipping update as it is currently moving.";
+            let str = "[" + accessory.displayName + "] ignoring update as it is already moving.";
             this.log.warn(str);
             return;
          }
          accessory.context.inUse = true;
-         let garageConfig, nSte;
+         let garageConfig,
+            oldPos = accessory.getService(Service.GarageDoorOpener).getCharacteristic(Characteristic.CurrentDoorState).value,
+            newPos = [0, 2].includes(oldPos) ? 3 : 2;
          if (!(garageConfig = this.cusG.get(accessory.context.hbDeviceId))) {
             throw "group config missing";
          }
@@ -1426,7 +1386,6 @@ class eWeLink {
                   accessory.context.inUse = false;
                   return;
                }
-               nSte = [0, 2].includes(accessory.getService(Service.GarageDoorOpener).getCharacteristic(Characteristic.CurrentDoorState).value) ? 3 : 2;
                break;
             case "twoSwitch":
                if (params.switches[0].switch === "off" && params.switches[1].switch === "off") {
@@ -1437,13 +1396,13 @@ class eWeLink {
                accessory.context.inUse = false;
                return;
          }
-         if (garageConfig.setup !== "oneSwitch" || !garageConfig.sensorId) {
+         if (!garageConfig.sensorId) {
             accessory.getService(Service.GarageDoorOpener)
-               .updateCharacteristic(Characteristic.CurrentDoorState, nSte)
-               .updateCharacteristic(Characteristic.TargetDoorState, nSte - 2);
+               .updateCharacteristic(Characteristic.CurrentDoorState, newPos)
+               .updateCharacteristic(Characteristic.TargetDoorState, newPos - 2);
             setTimeout(() => {
                accessory.getService(Service.GarageDoorOpener)
-                  .updateCharacteristic(Characteristic.CurrentDoorState, nSte - 2);
+                  .updateCharacteristic(Characteristic.CurrentDoorState, newPos - 2);
             }, parseInt(garageConfig.operationTime) * 100);
          }
          accessory.context.inUse = false;

From 4e09194256c315b5b84183b0217380a40485c5ad Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 7 Sep 2020 20:42:12 +0100
Subject: [PATCH 0083/3183] more garage improvements

---
 lib/eWeLink.js | 70 ++++++++++++++++++++++++++++----------------------
 1 file changed, 40 insertions(+), 30 deletions(-)

diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index 9b149e63..d6462e40 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -851,6 +851,7 @@ class eWeLink {
    internalGarageUpdate(accessory, value, callback) {
       try {
          accessory.context.inUse = true;
+         accessory.context.state = value;
          if (!accessory.context.reachableWAN && !accessory.context.reachableLAN) {
             throw "it is currently offline";
          }
@@ -865,7 +866,8 @@ class eWeLink {
             sAccessory = false,
             oldPos,
             newPos = value,
-            params = {};
+            params = {},
+            wsDelay = 0;
          if (sensorDefinition && !(sAccessory = this.devicesInHB.get(garageConfig.sensorId + "SWX"))) {
             throw "defined sensor doesn't exist";
          }
@@ -878,29 +880,39 @@ class eWeLink {
             callback();
             return;
          }
-         accessory.getService(Service.GarageDoorOpener)
-            .updateCharacteristic(Characteristic.TargetDoorState, newPos)
-            .updateCharacteristic(Characteristic.CurrentDoorState, newPos + 2);
-         switch (garageConfig.setup) {
-            case "oneSwitch":
-               params.switch = "on";
-               break;
-            case "twoSwitch":
-               params.switches = this.devicesInEwe.get(accessory.context.eweDeviceId).params.switches;
-               params.switches[0].switch = newPos === 0 ? "on" : "off";
-               params.switches[1].switch = newPos === 1 ? "on" : "off";
-               break;
+         if (garageConfig.setup === "oneSwitch" && [2, 3].includes(oldPos)) {
+            accessory.getService(Service.GarageDoorOpener)
+               .updateCharacteristic(Characteristic.CurrentDoorState, oldPos * 2 % 3 + 2);
+            wsDelay = 1500;
          }
-         this.sendDeviceUpdate(accessory, params, function() {
-            return;
-         });
          setTimeout(() => {
-            if (!sAccessory) {
+            // final check to continue
+            if (accessory.context.state === newPos) {
                accessory.getService(Service.GarageDoorOpener)
-                  .updateCharacteristic(Characteristic.CurrentDoorState, newPos === 0 ? 0 : 1);
+                  .updateCharacteristic(Characteristic.TargetDoorState, newPos)
+                  .updateCharacteristic(Characteristic.CurrentDoorState, newPos + 2);
+               switch (garageConfig.setup) {
+                  case "oneSwitch":
+                     params.switch = "on";
+                     break;
+                  case "twoSwitch":
+                     params.switches = this.devicesInEwe.get(accessory.context.eweDeviceId).params.switches;
+                     params.switches[0].switch = newPos === 0 ? "on" : "off";
+                     params.switches[1].switch = newPos === 1 ? "on" : "off";
+                     break;
+               }
+               this.sendDeviceUpdate(accessory, params, function() {
+                  return;
+               });
+               setTimeout(() => {
+                  if (!sAccessory) {
+                     accessory.getService(Service.GarageDoorOpener)
+                        .updateCharacteristic(Characteristic.CurrentDoorState, newPos === 0 ? 0 : 1);
+                  }
+                  accessory.context.inUse = false;
+               }, parseInt(garageConfig.operationTime) * 100);
             }
-            accessory.context.inUse = false;
-         }, parseInt(garageConfig.operationTime) * 100);
+         }, wsDelay);
          callback();
       } catch (err) {
          accessory.context.inUse = false;
@@ -1365,12 +1377,6 @@ class eWeLink {
    }
    externalGarageUpdate(accessory, params) {
       try {
-         if (accessory.context.inUse) {
-            let str = "[" + accessory.displayName + "] ignoring update as it is already moving.";
-            this.log.warn(str);
-            return;
-         }
-         accessory.context.inUse = true;
          let garageConfig,
             oldPos = accessory.getService(Service.GarageDoorOpener).getCharacteristic(Characteristic.CurrentDoorState).value,
             newPos = [0, 2].includes(oldPos) ? 3 : 2;
@@ -1383,19 +1389,20 @@ class eWeLink {
          switch (garageConfig.setup) {
             case "oneSwitch":
                if (params.switch === "off" || garageConfig.sensorId) {
-                  accessory.context.inUse = false;
                   return;
                }
                break;
             case "twoSwitch":
                if (params.switches[0].switch === "off" && params.switches[1].switch === "off") {
-                  accessory.context.inUse = false;
                   return;
                }
                // @TODO twoSwitch garage external update
-               accessory.context.inUse = false;
                return;
          }
+         if (accessory.context.inUse) {
+            return;
+         }
+         accessory.context.inUse = true;
          if (!garageConfig.sensorId) {
             accessory.getService(Service.GarageDoorOpener)
                .updateCharacteristic(Characteristic.CurrentDoorState, newPos)
@@ -1405,7 +1412,10 @@ class eWeLink {
                   .updateCharacteristic(Characteristic.CurrentDoorState, newPos - 2);
             }, parseInt(garageConfig.operationTime) * 100);
          }
-         accessory.context.inUse = false;
+         setTimeout(() => {
+            accessory.context.inUse = false;
+         }, parseInt(garageConfig.operationTime) * 100);
+
       } catch (err) {
          accessory.context.inUse = false;
          this.log.warn("[%s] could not be updated - [%s].", accessory.displayName, err);

From 726b759357dd8a9724aed4ae1a87aed7f23fd356 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 7 Sep 2020 20:43:11 +0100
Subject: [PATCH 0084/3183] 2.25.0-0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d082ba02..6b2b69da 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
    "name": "homebridge-ewelink",
-   "version": "2.24.4-1",
+   "version": "2.25.0-0",
    "lockfileVersion": 1,
    "requires": true,
    "dependencies": {
diff --git a/package.json b/package.json
index 1a370dc4..fa68bb8d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
    "name": "homebridge-ewelink",
-   "version": "2.24.4-1",
+   "version": "2.25.0-0",
    "author": "bwp91",
    "contributors": [
       "gbro115",

From df03e5f2309350239d014f178e0377f9846648d2 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 7 Sep 2020 21:37:45 +0100
Subject: [PATCH 0085/3183] initial lock support

---
 config.schema.json |  8 ++++-
 lib/eWeLink.js     | 83 +++++++++++++++++++++++++++++++++++++++++-----
 2 files changed, 82 insertions(+), 9 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 5d56f513..65074d0d 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -88,7 +88,7 @@
          "groups":{
             "type":"array",
             "title":"Custom Groups",
-            "description":"You can group channels of Sonoff devices to simulate another HomeKit accessory instead of having each switch separately. Currently only blinds and garage doors are supported.",
+            "description":"You can group channels of Sonoff devices to simulate another HomeKit accessory instead of having each switch separately. Currently only blinds, garage doors and locks are supported.",
             "items":{
                "type":"object",
                "properties":{
@@ -109,6 +109,12 @@
                            "enum":[
                               "garage"
                            ]
+                        },
+                        {
+                           "title":"Lock",
+                           "enum":[
+                              "lock"
+                           ]
                         }
                      ]
                   },
diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index d6462e40..87220176 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -123,6 +123,8 @@ class eWeLink {
             this.addAccessory(device, device.deviceid + "SWX", "blind");
          } else if (this.cusG.has(device.deviceid + "SWX") && this.cusG.get(device.deviceid + "SWX").type === "garage") {
             this.addAccessory(device, device.deviceid + "SWX", "garage");
+         } else if (this.cusG.has(device.deviceid + "SWX") && this.cusG.get(device.deviceid + "SWX").type === "lock") {
+            this.addAccessory(device, device.deviceid + "SWX", "lock");
          } else if (cns.devicesSensor.includes(device.extra.uiid)) {
             this.addAccessory(device, device.deviceid + "SWX", "sensor");
          } else if (cns.devicesFan.includes(device.extra.uiid)) {
@@ -277,6 +279,11 @@ class eWeLink {
                   .setCharacteristic(Characteristic.TargetDoorState, 1)
                   .setCharacteristic(Characteristic.ObstructionDetected, false);
                break;
+            case "lock":
+               accessory.addService(Service.LockMechanism)
+                  .setCharacteristic(Characteristic.LockCurrentState, 1)
+                  .setCharacteristic(Characteristic.LockTargetState, 1);
+               break;
             case "sensor":
                accessory.addService(Service.ContactSensor);
                break;
@@ -447,6 +454,14 @@ class eWeLink {
                         callback();
                   });
                break;
+            case "lock":
+               accessory.getService(Service.LockMechanism).getCharacteristic(Characteristic.LockTargetState)
+                  .on("set", (value, callback) => {
+                     accessory.getService(Service.LockMechanism).getCharacteristic(Characteristic.LockTargetState).value !== value ?
+                        this.internalLockUpdate(accessory, value, callback) :
+                        callback();
+                  });
+               break;
             case "fan":
                accessory.getService(Service.Fanv2).getCharacteristic(Characteristic.Active)
                   .on("set", (value, callback) => {
@@ -603,6 +618,11 @@ class eWeLink {
                this.externalGarageUpdate(accessory, newParams);
             }
             return true;
+         case "lock":
+            if (newParams.hasOwnProperty("switch")) {
+               this.externalLockUpdate(accessory, newParams);
+            }
+            return true;
          case "sensor":
             if (newParams.hasOwnProperty("switch")) {
                this.externalSensorUpdate(accessory, newParams);
@@ -850,8 +870,6 @@ class eWeLink {
    }
    internalGarageUpdate(accessory, value, callback) {
       try {
-         accessory.context.inUse = true;
-         accessory.context.state = value;
          if (!accessory.context.reachableWAN && !accessory.context.reachableLAN) {
             throw "it is currently offline";
          }
@@ -862,6 +880,8 @@ class eWeLink {
          if (garageConfig.type !== "garage" || !["oneSwitch", "twoSwitch"].includes(garageConfig.setup)) {
             throw "improper configuration";
          }
+         accessory.context.inUse = true;
+         accessory.context.state = value;
          let sensorDefinition = garageConfig.sensorId || false,
             sAccessory = false,
             oldPos,
@@ -921,6 +941,36 @@ class eWeLink {
          callback(str);
       }
    }
+   internalLockUpdate(accessory, value, callback) {
+      try {
+         if (!accessory.context.reachableWAN && !accessory.context.reachableLAN) {
+            throw "it is currently offline";
+         }
+         let lockConfig;
+         if (!(lockConfig = this.cusG.get(accessory.context.hbDeviceId))) {
+            throw "group config missing";
+         }
+         if (lockConfig.type !== "lock") {
+            throw "improper configuration";
+         }
+         accessory.context.inUse = true;
+         let params = {};
+         this.log("[%s] has received request to [%s].", accessory.displayName, value === 0 ? "unlock" : "lock");
+         accessory.getService(Service.LockMechanism)
+            .updateCharacteristic(Characteristic.LockTargetState, value);
+         params.switch = "on";
+         this.sendDeviceUpdate(accessory, params, callback);
+         setTimeout(() => {
+            accessory.context.inUse = false;
+            accessory.getService(Service.LockMechanism)
+               .updateCharacteristic(Characteristic.LockCurrentState, value);
+         }, 3000);
+      } catch (err) {
+         let str = "[" + accessory.displayName + "] could not be updated as " + err + ".";
+         this.log.error(str);
+         callback(str);
+      }
+   }
    internalFanUpdate(accessory, type, value, callback) {
       try {
          if (!accessory.context.reachableWAN && !accessory.context.reachableLAN) {
@@ -1388,20 +1438,17 @@ class eWeLink {
          }
          switch (garageConfig.setup) {
             case "oneSwitch":
-               if (params.switch === "off" || garageConfig.sensorId) {
+               if (params.switch === "off" || garageConfig.sensorId || accessory.context.inUse) {
                   return;
                }
                break;
             case "twoSwitch":
-               if (params.switches[0].switch === "off" && params.switches[1].switch === "off") {
+               if ((params.switches[0].switch === "off" && params.switches[1].switch === "off") || accessory.context.inUse) {
                   return;
                }
                // @TODO twoSwitch garage external update
                return;
          }
-         if (accessory.context.inUse) {
-            return;
-         }
          accessory.context.inUse = true;
          if (!garageConfig.sensorId) {
             accessory.getService(Service.GarageDoorOpener)
@@ -1415,12 +1462,32 @@ class eWeLink {
          setTimeout(() => {
             accessory.context.inUse = false;
          }, parseInt(garageConfig.operationTime) * 100);
-
       } catch (err) {
          accessory.context.inUse = false;
          this.log.warn("[%s] could not be updated - [%s].", accessory.displayName, err);
       }
    }
+   externalLockUpdate(accessory, params) {
+      try {
+         let lockConfig,
+            oldPos = accessory.getService(Service.LockMechanism).getCharacteristic(Characteristic.LockCurrentState).value,
+            newPos = oldPos === 0 ? 1 : 0;
+         if (!(lockConfig = this.cusG.get(accessory.context.hbDeviceId))) {
+            throw "group config missing";
+         }
+         if (lockConfig.type !== "lock") {
+            throw "improper configuration";
+         }
+         if (params.switch === "off" || accessory.context.inUse) {
+            return;
+         }
+         accessory.getService(Service.LockMechanism)
+            .updateCharacteristic(Characteristic.LockCurrentState, newPos)
+            .updateCharacteristic(Characteristic.LockTargetState, newPos);
+      } catch (err) {
+         this.log.warn("[%s] could not be updated - [%s].", accessory.displayName, err);
+      }
+   }
    externalSensorUpdate(accessory, params) {
       try {
          let oldState = accessory.getService(Service.ContactSensor).getCharacteristic(Characteristic.ContactSensorState).value,

From b51e09f7e0772851d888074f5c9963007eee86a6 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 7 Sep 2020 21:38:23 +0100
Subject: [PATCH 0086/3183] 2.25.0-1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 6b2b69da..f64d553a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
    "name": "homebridge-ewelink",
-   "version": "2.25.0-0",
+   "version": "2.25.0-1",
    "lockfileVersion": 1,
    "requires": true,
    "dependencies": {
diff --git a/package.json b/package.json
index fa68bb8d..1cdcd8e8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
    "name": "homebridge-ewelink",
-   "version": "2.25.0-0",
+   "version": "2.25.0-1",
    "author": "bwp91",
    "contributors": [
       "gbro115",

From c6cef109b8ff8b25c27702f52a4bdb6aeda5ee57 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 7 Sep 2020 22:59:01 +0100
Subject: [PATCH 0087/3183] changes to lock

---
 lib/eWeLink.js | 39 +++++++++++++++++++++------------------
 1 file changed, 21 insertions(+), 18 deletions(-)

diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index 87220176..f97540fd 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -456,11 +456,7 @@ class eWeLink {
                break;
             case "lock":
                accessory.getService(Service.LockMechanism).getCharacteristic(Characteristic.LockTargetState)
-                  .on("set", (value, callback) => {
-                     accessory.getService(Service.LockMechanism).getCharacteristic(Characteristic.LockTargetState).value !== value ?
-                        this.internalLockUpdate(accessory, value, callback) :
-                        callback();
-                  });
+                  .on("set", (value, callback) => this.internalLockUpdate(accessory, value, callback));
                break;
             case "fan":
                accessory.getService(Service.Fanv2).getCharacteristic(Characteristic.Active)
@@ -906,7 +902,6 @@ class eWeLink {
             wsDelay = 1500;
          }
          setTimeout(() => {
-            // final check to continue
             if (accessory.context.state === newPos) {
                accessory.getService(Service.GarageDoorOpener)
                   .updateCharacteristic(Characteristic.TargetDoorState, newPos)
@@ -946,7 +941,7 @@ class eWeLink {
          if (!accessory.context.reachableWAN && !accessory.context.reachableLAN) {
             throw "it is currently offline";
          }
-         let lockConfig;
+         let lockConfig, params = {};
          if (!(lockConfig = this.cusG.get(accessory.context.hbDeviceId))) {
             throw "group config missing";
          }
@@ -954,18 +949,20 @@ class eWeLink {
             throw "improper configuration";
          }
          accessory.context.inUse = true;
-         let params = {};
-         this.log("[%s] has received request to [%s].", accessory.displayName, value === 0 ? "unlock" : "lock");
+         this.log("[%s] has received request to unlock.", accessory.displayName);
          accessory.getService(Service.LockMechanism)
-            .updateCharacteristic(Characteristic.LockTargetState, value);
+            .updateCharacteristic(Characteristic.LockTargetState, 0)
+            .updateCharacteristic(Characteristic.LockCurrentState, 0);
          params.switch = "on";
          this.sendDeviceUpdate(accessory, params, callback);
          setTimeout(() => {
-            accessory.context.inUse = false;
             accessory.getService(Service.LockMechanism)
-               .updateCharacteristic(Characteristic.LockCurrentState, value);
-         }, 3000);
+               .updateCharacteristic(Characteristic.LockTargetState, 1)
+               .updateCharacteristic(Characteristic.LockCurrentState, 1);
+            accessory.context.inUse = false;
+         }, parseInt(lockConfig.operationTime) * 100);
       } catch (err) {
+         accessory.context.inUse = false;
          let str = "[" + accessory.displayName + "] could not be updated as " + err + ".";
          this.log.error(str);
          callback(str);
@@ -1469,9 +1466,7 @@ class eWeLink {
    }
    externalLockUpdate(accessory, params) {
       try {
-         let lockConfig,
-            oldPos = accessory.getService(Service.LockMechanism).getCharacteristic(Characteristic.LockCurrentState).value,
-            newPos = oldPos === 0 ? 1 : 0;
+         let lockConfig;
          if (!(lockConfig = this.cusG.get(accessory.context.hbDeviceId))) {
             throw "group config missing";
          }
@@ -1481,10 +1476,18 @@ class eWeLink {
          if (params.switch === "off" || accessory.context.inUse) {
             return;
          }
+         accessory.context.inUse = true;
          accessory.getService(Service.LockMechanism)
-            .updateCharacteristic(Characteristic.LockCurrentState, newPos)
-            .updateCharacteristic(Characteristic.LockTargetState, newPos);
+            .updateCharacteristic(Characteristic.LockCurrentState, 0)
+            .updateCharacteristic(Characteristic.LockTargetState, 0);
+         setTimeout(() => {
+            accessory.getService(Service.LockMechanism)
+               .updateCharacteristic(Characteristic.LockCurrentState, 1)
+               .updateCharacteristic(Characteristic.LockTargetState, 1);
+            accessory.context.inUse = false;
+         }, parseInt(lockConfig.operationTime) * 100);
       } catch (err) {
+         accessory.context.inUse = false;
          this.log.warn("[%s] could not be updated - [%s].", accessory.displayName, err);
       }
    }

From 9d3d76428c3029be135da751211019e0e4f7ca69 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 7 Sep 2020 23:20:56 +0100
Subject: [PATCH 0088/3183] #82 fix?

---
 lib/eWeLink.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index f97540fd..ded8ce26 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -729,9 +729,9 @@ class eWeLink {
          case "sysmsg":
             if ((accessory = this.devicesInHB.get(device.deviceid + "SWX") || this.devicesInHB.get(device.deviceid + "SW0"))) {
                let isX = accessory.context.hbDeviceId.substr(-1) === "X";
-               if (source === "ws" && accessory.context.reachableWAN !== device.params.online) {
+               if (source === "WS" && accessory.context.reachableWAN !== device.params.online) {
                   accessory.context.reachableWAN = device.params.online;
-                  this.log("[%s] has been reported [%s].", accessory.displayName, accessory.context.reachableWAN ? "online" : "offline");
+                  this.log("[%s] has been reported [%s] via [WS].", accessory.displayName, accessory.context.reachableWAN ? "online" : "offline");
                   this.devicesInHB.set(accessory.context.hbDeviceId, accessory);
                   if (accessory.context.reachableWAN) {
                      this.wsClient.requestUpdate(accessory);
@@ -750,11 +750,13 @@ class eWeLink {
             break;
          case "update":
             if ((accessory = this.devicesInHB.get(device.deviceid + "SWX") || this.devicesInHB.get(device.deviceid + "SW0"))) {
-               if (source === "ws" && !accessory.context.reachableWAN) {
+               if (source === "WS" && !accessory.context.reachableWAN) {
                   accessory.context.reachableWAN = true;
+                  this.log("[%s] has been reported [online] via [WS].", accessory.displayName);
                }
-               if (source === "lan" && !accessory.context.reachableLAN) {
+               if (source === "LAN" && !accessory.context.reachableLAN) {
                   accessory.context.reachableLAN = true;
+                  this.log("[%s] has been reported [online] via [LAN].", accessory.displayName);
                }
                if (this.config.debug) {
                   this.log("[%s] externally updated from above %s message and will be refreshed.", accessory.displayName, source);

From bb784067f196c39742a584e1ac45efc3101b5b16 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 7 Sep 2020 23:22:48 +0100
Subject: [PATCH 0089/3183] 2.25.0-2

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index f64d553a..13f0eb35 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
    "name": "homebridge-ewelink",
-   "version": "2.25.0-1",
+   "version": "2.25.0-2",
    "lockfileVersion": 1,
    "requires": true,
    "dependencies": {
diff --git a/package.json b/package.json
index 1cdcd8e8..bbe0307b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
    "name": "homebridge-ewelink",
-   "version": "2.25.0-1",
+   "version": "2.25.0-2",
    "author": "bwp91",
    "contributors": [
       "gbro115",

From 6d52c26eba25b8109071eeaa04f45c3299931d1b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 8 Sep 2020 07:42:23 +0100
Subject: [PATCH 0090/3183] log text consistency

---
 lib/eWeLinkWS.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/eWeLinkWS.js b/lib/eWeLinkWS.js
index 73180031..eb50d15e 100644
--- a/lib/eWeLinkWS.js
+++ b/lib/eWeLinkWS.js
@@ -203,7 +203,9 @@ module.exports = class eWeLinkWS {
             this.ws.send(req);
             if (this.debugReqRes) {
                let msg = JSON.stringify(json, null, 2).replace(json.apikey, "**hidden**").replace(json.apiKey, "**hidden**").replace(json.deviceid, "**hidden**");
-               this.log.warn("Web socket message sent. This text is yellow for clarity.\n%s", msg);
+               this.log.warn("WS message sent. This text is yellow for clarity.\n%s", msg);
+            } else if (this.debug) {
+               this.log("WS message sent.");
             }
             return;
          }
@@ -246,7 +248,9 @@ module.exports = class eWeLinkWS {
                this.ws.send(req);
                if (this.debugReqRes) {
                   let msg = JSON.stringify(json, null, 2).replace(json.apikey, "**hidden**").replace(json.apiKey, "**hidden**").replace(json.deviceid, "**hidden**");
-                  this.log.warn("Web socket message sent. This text is yellow for clarity.\n%s", msg);
+                  this.log.warn("WS message sent. This text is yellow for clarity.\n%s", msg);
+               } else if (this.debug) {
+                  this.log("WS message sent.");
                }
                return;
             }

From 6e33f28e984285066abb5cda76b3dc0a0eb764b4 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 8 Sep 2020 07:50:46 +0100
Subject: [PATCH 0091/3183] rename groups to custom types

---
 config.schema.json | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 65074d0d..4175f7cb 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -87,16 +87,21 @@
          },
          "groups":{
             "type":"array",
-            "title":"Custom Groups",
-            "description":"You can group channels of Sonoff devices to simulate another HomeKit accessory instead of having each switch separately. Currently only blinds, garage doors and locks are supported.",
+            "title":"Custom Device Types",
+            "description":"You can use this setting to set up custom device types within Homebridge. Currently only blinds, garage doors and locks are supported.",
             "items":{
                "type":"object",
                "properties":{
+                  "deviceId":{
+                     "type":"string",
+                     "title":"Device ID",
+                     "description":"Device ID from your eWeLink app (ten digits normally in the format 1000******)."
+                  },
                   "type":{
                      "type":"string",
                      "title":"Type",
                      "default":"null",
-                     "description":"A description of this group.",
+                     "description":"The new type for this device.",
                      "oneOf":[
                         {
                            "title":"Blind",
@@ -118,16 +123,11 @@
                         }
                      ]
                   },
-                  "deviceId":{
-                     "type":"string",
-                     "title":"Device ID",
-                     "description":"Device ID from your eWeLink app (ten digits normally in the format 1000******)."
-                  },
                   "setup":{
                      "type":"string",
                      "title":"Device Setup",
                      "default":"null",
-                     "description":"The device setup.",
+                     "description":"The device setup. Please ignore this setting for locks",
                      "oneOf":[
                         {
                            "title":"One Switch - for up and down",
@@ -146,13 +146,13 @@
                   "operationTime":{
                      "type":"number",
                      "title":"Operation Time",
-                     "description":"Total time in deciseconds to fully open/close the blind/door. Count the time in seconds and multiply by 10, for example 100 for 10 seconds or 75 for 7.5 seconds.",
+                     "description":"For blinds and garage doors this is the total time in deciseconds to fully open/close the device. For locks this is the time to show the Home app tile as unlocked. Count the time in seconds and multiply by 10, for example 100 for 10 seconds or 75 for 7.5 seconds.",
                      "default":100
                   },
                   "sensorId":{
                      "type":"string",
                      "title":"Sensor",
-                     "description":"A Sonoff DW2 sensor can be used for a 'one switch' setup. This is to determine the current open/closed state of this device. Please enter the 10 digit device ID. Otherwise leave this blank."
+                     "description":"A Sonoff DW2 sensor can optionally be used for blinds and garage doors. This is to determine the current open/closed state of the device. Please enter the 10 digit device ID. Otherwise leave this blank."
                   }
                }
             }
@@ -263,15 +263,15 @@
       {
          "key":"groups",
          "expandable":true,
-         "title":"Custom Groups",
-         "add":"Add Another Group",
+         "title":"Custom Device Types",
+         "add":"Add Another Type",
          "type":"array",
          "items":[
             {
                "type":"fieldset",
                "items":[
-                  "groups[].type",
                   "groups[].deviceId",
+                  "groups[].type",
                   "groups[].setup",
                   "groups[].operationTime",
                   "groups[].sensorId"

From fa43686eecfc88e8250778a2fd33898cb489e18c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 8 Sep 2020 09:16:03 +0100
Subject: [PATCH 0092/3183] add updateSource to params

---
 lib/constants.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/constants.js b/lib/constants.js
index 1a11a419..354c4736 100644
--- a/lib/constants.js
+++ b/lib/constants.js
@@ -20,7 +20,7 @@ module.exports = {
    devicesRFBridge: [28],
    devicesZBBridge: [66],
    devicesZB: [1000, 1770, 2026, 3026],
-   paramsToKeep: ["bright", "brightness", "channel", "cmd", "colorB", "colorG", "colorR", "currentHumidity", "currentTemperature", "fan", "humidity", "key", "light", "lock", "mainSwitch", "mode", "online", "rfChl", "rfList", "rfTrig", "sensorType", "speed", "state", "switch", "switches", "temperature", "type", "zyx_mode"],
+   paramsToKeep: ["bright", "brightness", "channel", "cmd", "colorB", "colorG", "colorR", "currentHumidity", "currentTemperature", "fan", "humidity", "key", "light", "lock", "mainSwitch", "mode", "online", "rfChl", "rfList", "rfTrig", "sensorType", "speed", "state", "switch", "switches", "temperature", "type", "updateSource", "zyx_mode"],
    chansFromUiid: {
       1: 1, // "SOCKET"                                  \\ 20, MINI, BASIC, S26
       2: 2, // "SOCKET_2"                                \\ 

From 16c22a26fd5b15fb27b78266a0354d60bcba4c60 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 8 Sep 2020 09:16:22 +0100
Subject: [PATCH 0093/3183] updateSource changes

---
 lib/eWeLinkLAN.js |  2 +-
 lib/eWeLinkWS.js  | 14 ++++++--------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/lib/eWeLinkLAN.js b/lib/eWeLinkLAN.js
index 8a2d82d3..89e1a337 100644
--- a/lib/eWeLinkLAN.js
+++ b/lib/eWeLinkLAN.js
@@ -90,7 +90,7 @@ module.exports = class eWeLinkLAN {
                         }
                      }
                   }
-                  params.updateSource = "lan";
+                  params.updateSource = "LAN";
                   if (Object.keys(params).length > 0) {
                      let returnTemplate = {
                         deviceid: rdata.id,
diff --git a/lib/eWeLinkWS.js b/lib/eWeLinkWS.js
index eb50d15e..8afe3926 100644
--- a/lib/eWeLinkWS.js
+++ b/lib/eWeLinkWS.js
@@ -96,9 +96,9 @@ module.exports = class eWeLinkWS {
                this.ws.send("ping");
             }, (device.config.hbInterval + 7) * 1000);
          } else if (device.hasOwnProperty("action")) {
+            device.params.updateSource = "WS";
             switch (device.action) {
                case "sysmsg":
-                  device.params.updateSource = "ws";
                   let returnTemplate = {
                      deviceid: device.deviceid,
                      action: "sysmsg",
@@ -113,20 +113,18 @@ module.exports = class eWeLinkWS {
                   this.emitter.emit("update", returnTemplate);
                   break;
                case "update":
-                  let params = device.params;
-                  for (let param in params) {
-                     if (params.hasOwnProperty(param)) {
+                  for (let param in device.params) {
+                     if (device.params.hasOwnProperty(param)) {
                         if (!constants.paramsToKeep.includes(param.replace(/[0-9]/g, ""))) {
-                           delete params[param];
+                           delete device.params[param];
                         }
                      }
                   }
-                  if (Object.keys(params).length > 0) {
-                     params.updateSource = "ws";
+                  if (Object.keys(device.params).length > 0) {
                      let returnTemplate = {
                         deviceid: device.deviceid,
                         action: "update",
-                        params
+                        params: device.params
                      };
                      if (this.debugReqRes) {
                         let msg = JSON.stringify(returnTemplate, null, 2).replace(device.deviceid, "**hidden**");

From b7b5947d7fbff9f692106db8c4a37ae912ea2107 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 8 Sep 2020 10:34:49 +0100
Subject: [PATCH 0094/3183] updates

---
 lib/constants.js  |   3 +-
 lib/eWeLink.js    | 322 ++++++++++++++++++----------------------------
 lib/eWeLinkLAN.js |   2 +-
 lib/eWeLinkWS.js  |   3 +-
 4 files changed, 129 insertions(+), 201 deletions(-)

diff --git a/lib/constants.js b/lib/constants.js
index 354c4736..534514f0 100644
--- a/lib/constants.js
+++ b/lib/constants.js
@@ -20,7 +20,8 @@ module.exports = {
    devicesRFBridge: [28],
    devicesZBBridge: [66],
    devicesZB: [1000, 1770, 2026, 3026],
-   paramsToKeep: ["bright", "brightness", "channel", "cmd", "colorB", "colorG", "colorR", "currentHumidity", "currentTemperature", "fan", "humidity", "key", "light", "lock", "mainSwitch", "mode", "online", "rfChl", "rfList", "rfTrig", "sensorType", "speed", "state", "switch", "switches", "temperature", "type", "updateSource", "zyx_mode"],
+   allowedGroups: ["blind", "garage", "lock"],
+   paramsToKeep: ["bright", "brightness", "channel", "cmd", "colorB", "colorG", "colorR", "currentHumidity", "currentTemperature", "fan", "humidity", "key", "light", "lock", "mainSwitch", "mode", "online", "rfChl", "rfList", "rfTrig", "sensorType", "speed", "state", "switch", "switches", "temperature", "type", "zyx_mode"],
    chansFromUiid: {
       1: 1, // "SOCKET"                                  \\ 20, MINI, BASIC, S26
       2: 2, // "SOCKET_2"                                \\ 
diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index ded8ce26..ddf238bb 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -37,6 +37,8 @@ class eWeLink {
                return this.httpClient.getDevices();
             }).then(res => { //*** Get device IP addresses for LAN mode ***\\
                this.httpDevices = res
+                  .filter(device => device.hasOwnProperty("extra"))
+                  .filter(device => device.extra.hasOwnProperty("uiid"))
                   .filter(device => !(this.config.hideDevFromHB || "").includes(device.deviceid))
                   .forEach(device => this.devicesInEwe.set(device.deviceid, device));
                this.httpDevices = res;
@@ -59,6 +61,7 @@ class eWeLink {
                   if (Object.keys(this.config.groups || []).length > 0) {
                      this.config.groups
                         .filter(g => g.hasOwnProperty("deviceId") && this.devicesInEwe.has(g.deviceId.toLowerCase()))
+                        .filter(g => g.hasOwnProperty("type") && cns.allowedGroups.includes(g.type))
                         .forEach(g => this.cusG.set(g.deviceId + "SWX", g));
                   }
                   //*** Make a map of RF Bridge custom sensors from Homebridge config ***\\
@@ -106,15 +109,8 @@ class eWeLink {
       });
    }
    initialiseDevice(device) {
-      if (!device.hasOwnProperty("extra") || !device.extra.hasOwnProperty("uiid")) {
-         let deviceName = device.hasOwnProperty("name") ?
-            device.name :
-            device.hasOwnProperty("deviceid") ? device.deviceid : "Unknown Device";
-         this.log.warn("[%s] could not be synchronised due to missing uiid parameter.", deviceName);
-         return;
-      }
       let accessory;
-      device.params.updateSource = "http";
+      device.params.updateSource = "HTTP";
       //*** First add the device if it isn't already in Homebridge. Yeah this code looks a mess :| ***\\
       if (!this.devicesInHB.has(device.deviceid + "SWX") && !this.devicesInHB.has(device.deviceid + "SW0")) {
          if (device.extra.uiid === 2 && device.brandName === "coolkit" && device.productModel === "0285") {
@@ -231,7 +227,7 @@ class eWeLink {
       if (["1", "2", "3", "4"].includes(switchNumber) && type !== "rf_sub") {
          newDeviceName += " SW" + switchNumber;
          if ((this.config.hideFromHB || "").includes(hbDeviceId) && cns.devicesHideable.includes(type)) {
-            this.log.warn("[%s] has not been added as per configuration", newDeviceName);
+            this.log.warn("[%s] will not be added as per configuration.", newDeviceName);
             return;
          }
       }
@@ -440,19 +436,11 @@ class eWeLink {
                   .setProps({
                      minStep: 100
                   })
-                  .on("set", (value, callback) => {
-                     accessory.getService(Service.WindowCovering).getCharacteristic(Characteristic.TargetPosition).value !== value ?
-                        this.internalBlindUpdate(accessory, value, callback) :
-                        callback();
-                  });
+                  .on("set", (value, callback) => this.internalBlindUpdate(accessory, value, callback));
                break;
             case "garage":
                accessory.getService(Service.GarageDoorOpener).getCharacteristic(Characteristic.TargetDoorState)
-                  .on("set", (value, callback) => {
-                     accessory.getService(Service.GarageDoorOpener).getCharacteristic(Characteristic.TargetDoorState).value !== value ?
-                        this.internalGarageUpdate(accessory, value, callback) :
-                        callback();
-                  });
+                  .on("set", (value, callback) => this.internalGarageUpdate(accessory, value, callback));
                break;
             case "lock":
                accessory.getService(Service.LockMechanism).getCharacteristic(Characteristic.LockTargetState)
@@ -460,82 +448,48 @@ class eWeLink {
                break;
             case "fan":
                accessory.getService(Service.Fanv2).getCharacteristic(Characteristic.Active)
-                  .on("set", (value, callback) => {
-                     accessory.getService(Service.Fanv2).getCharacteristic(Characteristic.Active).value !== value ?
-                        this.internalFanUpdate(accessory, "power", value, callback) :
-                        callback();
-                  });
+                  .on("set", (value, callback) => this.internalFanUpdate(accessory, "power", value, callback));
                accessory.getService(Service.Fanv2).getCharacteristic(Characteristic.RotationSpeed)
                   .setProps({
                      minStep: 33
                   })
-                  .on("set", (value, callback) => {
-                     accessory.getService(Service.Fanv2).getCharacteristic(Characteristic.RotationSpeed).value !== value ?
-                        this.internalFanUpdate(accessory, "speed", value, callback) :
-                        callback();
-                  });
+                  .on("set", (value, callback) => this.internalFanUpdate(accessory, "speed", value, callback));
                accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On)
-                  .on("set", (value, callback) => {
-                     accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On).value !== value ?
-                        this.internalFanUpdate(accessory, "light", value, callback) :
-                        callback();
-                  });
+                  .on("set", (value, callback) => this.internalFanUpdate(accessory, "light", value, callback));
                break;
             case "thermostat":
                if (!this.config.hideTHSwitch) {
                   accessory.getService(Service.Switch).getCharacteristic(Characteristic.On)
-                     .on("set", (value, callback) => {
-                        accessory.getService(Service.Switch).getCharacteristic(Characteristic.On).value !== value ?
-                           this.internalThermostatUpdate(accessory, value, callback) :
-                           callback();
-                     });
+                     .on("set", (value, callback) => this.internalThermostatUpdate(accessory, value, callback));
                }
                break;
             case "outlet":
                accessory.getService(Service.Outlet).getCharacteristic(Characteristic.On)
-                  .on("set", (value, callback) => {
-                     accessory.getService(Service.Outlet).getCharacteristic(Characteristic.On).value !== value ?
-                        this.internalOutletUpdate(accessory, value, callback) :
-                        callback();
-                  });
+                  .on("set", (value, callback) => this.internalOutletUpdate(accessory, value, callback));
                break;
             case "usb":
                accessory.getService(Service.Outlet).getCharacteristic(Characteristic.On)
-                  .on("set", (value, callback) => {
-                     accessory.getService(Service.Outlet).getCharacteristic(Characteristic.On).value !== value ?
-                        this.internalUSBUpdate(accessory, value, callback) :
-                        callback();
-                  });
+                  .on("set", (value, callback) => this.internalUSBUpdate(accessory, value, callback));
                break;
             case "scm":
                accessory.getService(Service.Switch).getCharacteristic(Characteristic.On)
-                  .on("set", (value, callback) => {
-                     accessory.getService(Service.Switch).getCharacteristic(Characteristic.On).value !== value ?
-                        this.internalSCMUpdate(accessory, value, callback) :
-                        callback();
-                  });
+                  .on("set", (value, callback) => this.internalSCMUpdate(accessory, value, callback));
                break;
             case "light":
                accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On)
-                  .on("set", (value, callback) => {
-                     accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On).value !== value ?
-                        this.internalLightbulbUpdate(accessory, value, callback) :
-                        callback();
-                  });
+                  .on("set", (value, callback) => this.internalLightbulbUpdate(accessory, value, callback));
                if (cns.devicesBrightable.includes(accessory.context.eweUIID)) {
                   accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.Brightness)
                      .on("set", (value, callback) => {
                         if (value > 0) {
                            if (!accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On).value) {
-                              this.internalLightbulbUpdate(accessory, true, callback);
+                              this.internalLightbulbUpdate(accessory, true, function() {
+                                 return;
+                              });
                            }
-                           accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.Brightness).value !== value ?
-                              this.internalBrightnessUpdate(accessory, value, callback) :
-                              callback();
+                           this.internalBrightnessUpdate(accessory, value, callback);
                         } else {
-                           accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On).value ?
-                              this.internalLightbulbUpdate(accessory, false, callback) :
-                              callback();
+                           this.internalLightbulbUpdate(accessory, false, callback);
                         }
                      });
                } else if (cns.devicesColourable.includes(accessory.context.eweUIID)) {
@@ -543,37 +497,24 @@ class eWeLink {
                      .on("set", (value, callback) => {
                         if (value > 0) {
                            if (!accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On).value) {
-                              this.internalLightbulbUpdate(accessory, true, callback);
+                              this.internalLightbulbUpdate(accessory, true, function() {
+                                 return;
+                              });
                            }
-                           accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.Brightness).value !== value ?
-                              this.internalHSBUpdate(accessory, "bri", value, callback) :
-                              callback();
+                           this.internalHSBUpdate(accessory, "bri", value, callback);
                         } else {
-                           accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On).value ?
-                              this.internalLightbulbUpdate(accessory, false, callback) :
-                              callback();
+                           this.internalLightbulbUpdate(accessory, false, callback);
                         }
                      });
                   accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.Hue)
-                     .on("set", (value, callback) => {
-                        accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.Hue).value !== value ?
-                           this.internalHSBUpdate(accessory, "hue", value, callback) :
-                           callback();
-                     });
+                     .on("set", (value, callback) => this.internalHSBUpdate(accessory, "hue", value, callback));
                   accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.Saturation)
-                     .on("set", (value, callback) => {
-                        accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.Saturation, value);
-                        callback();
-                     });
+                     .on("set", (value, callback) => callback());
                }
                break;
             case "switch":
                accessory.getService(Service.Switch).getCharacteristic(Characteristic.On)
-                  .on("set", (value, callback) => {
-                     accessory.getService(Service.Switch).getCharacteristic(Characteristic.On).value !== value ?
-                        this.internalSwitchUpdate(accessory, value, callback) :
-                        callback();
-                  });
+                  .on("set", (value, callback) => this.internalSwitchUpdate(accessory, value, callback));
                break;
             case "rf_sub":
                accessory.context.rfChls = accessory.context.rfChls || {};
@@ -582,9 +523,7 @@ class eWeLink {
                      accessory.getService(v).updateCharacteristic(Characteristic.On, false);
                      accessory.getService(v).getCharacteristic(Characteristic.On)
                         .on("set", (value, callback) => {
-                           value ?
-                              this.internalRFDeviceUpdate(accessory, k, callback) :
-                              callback();
+                           value ? this.internalRFDeviceUpdate(accessory, k, callback) : callback();
                         });
                   });
                }
@@ -708,13 +647,11 @@ class eWeLink {
             callback("Device has failed to update");
          }
       };
-      if (cns.devicesNonLAN.includes(accessory.context.eweUIID) || !this.lanDevices.get(accessory.context.eweDeviceId).online) {
+      if (cns.devicesNonLAN.includes(accessory.context.eweUIID) || !accessory.context.reachableLAN) {
          sendViaWS();
       } else {
          this.lanClient.sendUpdate(payload)
-            .then(res => {
-               callback();
-            })
+            .then(res => callback())
             .catch(err => {
                if (this.config.debug) {
                   this.log.warn("[%s] Reverting to web socket as %s.", accessory.displayName, err);
@@ -724,12 +661,12 @@ class eWeLink {
       }
    }
    receiveDeviceUpdate(device) {
-      let accessory, source = device.params.updateSource === "ws" ? "WS" : "LAN";
+      let accessory;
       switch (device.action) {
          case "sysmsg":
             if ((accessory = this.devicesInHB.get(device.deviceid + "SWX") || this.devicesInHB.get(device.deviceid + "SW0"))) {
                let isX = accessory.context.hbDeviceId.substr(-1) === "X";
-               if (source === "WS" && accessory.context.reachableWAN !== device.params.online) {
+               if (device.params.updateSource === "WS" && accessory.context.reachableWAN !== device.params.online) {
                   accessory.context.reachableWAN = device.params.online;
                   this.log("[%s] has been reported [%s] via [WS].", accessory.displayName, accessory.context.reachableWAN ? "online" : "offline");
                   this.devicesInHB.set(accessory.context.hbDeviceId, accessory);
@@ -750,23 +687,23 @@ class eWeLink {
             break;
          case "update":
             if ((accessory = this.devicesInHB.get(device.deviceid + "SWX") || this.devicesInHB.get(device.deviceid + "SW0"))) {
-               if (source === "WS" && !accessory.context.reachableWAN) {
+               if (device.params.updateSource === "WS" && !accessory.context.reachableWAN) {
                   accessory.context.reachableWAN = true;
                   this.log("[%s] has been reported [online] via [WS].", accessory.displayName);
                }
-               if (source === "LAN" && !accessory.context.reachableLAN) {
+               if (device.params.updateSource === "LAN" && !accessory.context.reachableLAN) {
                   accessory.context.reachableLAN = true;
                   this.log("[%s] has been reported [online] via [LAN].", accessory.displayName);
                }
                if (this.config.debug) {
-                  this.log("[%s] externally updated from above %s message and will be refreshed.", accessory.displayName, source);
+                  this.log("[%s] externally updated from above %s message and will be refreshed.", accessory.displayName, device.params.updateSource);
                }
                if (!this.refreshAccessory(accessory, device.params)) {
                   this.log.warn("[%s] cannot be refreshed. Please try removing accessory from the Homebridge cache along with any secondary devices (SW1, SW2, etc.). [debug:%s:%s]", accessory.displayName, accessory.context.type, accessory.context.channelCount);
                }
             } else {
                if (!(this.config.hideDevFromHB || "").includes(device.deviceid)) {
-                  this.log.warn("[%s] Accessory received via %s update does not exist in Homebridge. If it's a new accessory please restart Homebridge so it is added.", device.deviceid, source);
+                  this.log.warn("[%s] Accessory received via %s update does not exist in Homebridge. If it's a new accessory please restart Homebridge so it is added.", device.deviceid, device.params.updateSource);
                }
             }
             break;
@@ -924,7 +861,7 @@ class eWeLink {
                setTimeout(() => {
                   if (!sAccessory) {
                      accessory.getService(Service.GarageDoorOpener)
-                        .updateCharacteristic(Characteristic.CurrentDoorState, newPos === 0 ? 0 : 1);
+                        .updateCharacteristic(Characteristic.CurrentDoorState, newPos);
                   }
                   accessory.context.inUse = false;
                }, parseInt(garageConfig.operationTime) * 100);
@@ -1360,7 +1297,7 @@ class eWeLink {
             }
          });
       } catch (err) {
-         this.log.warn("[%s] could not be updated - [%s].", accessory.displayName, err);
+         this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
       }
    }
    internalRFDeviceUpdate(accessory, rfChl, callback) {
@@ -1421,7 +1358,7 @@ class eWeLink {
                .updateCharacteristic(Characteristic.CurrentPosition, nSte * 100);
          }, parseInt(blindConfig.operationTime) * 100);
       } catch (err) {
-         this.log.warn("[%s] could not be updated - [%s].", accessory.displayName, err);
+         this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
       }
    }
    externalGarageUpdate(accessory, params) {
@@ -1463,7 +1400,7 @@ class eWeLink {
          }, parseInt(garageConfig.operationTime) * 100);
       } catch (err) {
          accessory.context.inUse = false;
-         this.log.warn("[%s] could not be updated - [%s].", accessory.displayName, err);
+         this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
       }
    }
    externalLockUpdate(accessory, params) {
@@ -1490,7 +1427,7 @@ class eWeLink {
          }, parseInt(lockConfig.operationTime) * 100);
       } catch (err) {
          accessory.context.inUse = false;
-         this.log.warn("[%s] could not be updated - [%s].", accessory.displayName, err);
+         this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
       }
    }
    externalSensorUpdate(accessory, params) {
@@ -1525,7 +1462,7 @@ class eWeLink {
             }
          });
       } catch (err) {
-         this.log.warn("[%s] could not be updated - [%s].", accessory.displayName, err);
+         this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
       }
    }
    externalFanUpdate(accessory, params) {
@@ -1562,7 +1499,7 @@ class eWeLink {
             .updateCharacteristic(Characteristic.Active, status)
             .updateCharacteristic(Characteristic.RotationSpeed, speed);
       } catch (err) {
-         this.log.warn("[%s] could not be updated - [%s].", accessory.displayName, err);
+         this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
       }
    }
    externalThermostatUpdate(accessory, params) {
@@ -1580,28 +1517,28 @@ class eWeLink {
             accessory.getService(Service.HumiditySensor).updateCharacteristic(Characteristic.CurrentRelativeHumidity, currentHumi);
          }
       } catch (err) {
-         this.log.warn("[%s] could not be updated - [%s].", accessory.displayName, err);
+         this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
       }
    }
    externalOutletUpdate(accessory, params) {
       try {
          accessory.getService(Service.Outlet).updateCharacteristic(Characteristic.On, params.switch === "on");
       } catch (err) {
-         this.log.warn("[%s] could not be updated - [%s].", accessory.displayName, err);
+         this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
       }
    }
    externalUSBUpdate(accessory, params) {
       try {
          accessory.getService(Service.Outlet).updateCharacteristic(Characteristic.On, params.switches[0].switch === "on");
       } catch (err) {
-         this.log.warn("[%s] could not be updated - [%s].", accessory.displayName, err);
+         this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
       }
    }
    externalSCMUpdate(accessory, params) {
       try {
          accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, params.switches[0].switch === "on");
       } catch (err) {
-         this.log.warn("[%s] could not be updated - [%s].", accessory.displayName, err);
+         this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
       }
    }
    externalSingleLightUpdate(accessory, params) {
@@ -1665,7 +1602,7 @@ class eWeLink {
             accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, false);
          }
       } catch (err) {
-         this.log.warn("[%s] could not be updated - [%s].", accessory.displayName, err);
+         this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
       }
    }
    externalMultiLightUpdate(accessory, params) {
@@ -1683,14 +1620,14 @@ class eWeLink {
          }
          accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, primaryState);
       } catch (err) {
-         this.log.warn("[%s] could not be updated - [%s].", accessory.displayName, err);
+         this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
       }
    }
    externalSingleSwitchUpdate(accessory, params) {
       try {
          accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, params.switch === "on");
       } catch (err) {
-         this.log.warn("[%s] could not be updated - [%s].", accessory.displayName, err);
+         this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
       }
    }
    externalMultiSwitchUpdate(accessory, params) {
@@ -1708,12 +1645,12 @@ class eWeLink {
          }
          accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, primaryState);
       } catch (err) {
-         this.log.warn("[%s] could not be updated - [%s].", accessory.displayName, err);
+         this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
       }
    }
    externalRFDeviceUpdate(accessory, params) {
       try {
-         if (params.updateSource === "http") {
+         if (params.updateSource === "HTTP") {
             return;
          }
          let idToCheck = accessory.context.hbDeviceId.slice(0, -1),
@@ -1729,83 +1666,80 @@ class eWeLink {
                throw "rf button not found in Homebridge";
             }
          } else if (params.hasOwnProperty("cmd") && params.cmd === "trigger") { // RF Sensor
-            let rfChan = Object.keys(params).filter(name => /rfTrig/.test(name));
-            rfChan.forEach(chan => {
-               let chanNum = chan.substr(-1).toString(),
-                  accessoryNum = accessory.context.rfChlMap[chanNum],
-                  oAccessory;
-               if ((oAccessory = this.devicesInHB.get(idToCheck + accessoryNum))) {
-                  let timeOfMotion = new Date(params[chan]),
-                     timeDifference = (timeNow.getTime() - timeOfMotion.getTime()) / 1000;
-                  if (timeDifference < (this.config.sensorTimeDifference || 120)) {
-                     switch (oAccessory.context.sensorType) {
-                        case "button":
-                           break;
-                        case "water":
-                           oAccessory.getService(Service.LeakSensor).updateCharacteristic(Characteristic.LeakDetected, 1);
-                           setTimeout(() => {
-                              oAccessory.getService(Service.LeakSensor).updateCharacteristic(Characteristic.LeakDetected, 0);
-                           }, (this.config.sensorTimeLength || 2) * 1000);
-                           break;
-                        case "fire":
-                        case "smoke":
-                           oAccessory.getService(Service.SmokeSensor).updateCharacteristic(Characteristic.SmokeDetected, 1);
-                           setTimeout(() => {
-                              oAccessory.getService(Service.SmokeSensor).updateCharacteristic(Characteristic.SmokeDetected, 0);
-                           }, (this.config.sensorTimeLength || 2) * 1000);
-                           break;
-                        case "co":
-                           oAccessory.getService(Service.CarbonMonoxideSensor).updateCharacteristic(Characteristic.CarbonMonoxideDetected, 1);
-                           setTimeout(() => {
-                              oAccessory.getService(Service.CarbonMonoxideSensor).updateCharacteristic(Characteristic.CarbonMonoxideDetected, 0);
-                           }, (this.config.sensorTimeLength || 2) * 1000);
-                           break;
-                        case "co2":
-                           oAccessory.getService(Service.CarbonDioxideSensor).updateCharacteristic(Characteristic.CarbonDioxideDetected, 1);
-                           setTimeout(() => {
-                              oAccessory.getService(Service.CarbonDioxideSensor).updateCharacteristic(Characteristic.CarbonDioxideDetected, 0);
-                           }, (this.config.sensorTimeLength || 2) * 1000);
-                           break;
-                        case "contact":
-                           oAccessory.getService(Service.ContactSensor).updateCharacteristic(Characteristic.ContactSensorState, 1);
-                           setTimeout(() => {
-                              oAccessory.getService(Service.ContactSensor).updateCharacteristic(Characteristic.ContactSensorState, 0);
-                           }, (this.config.sensorTimeLength || 2) * 1000);
-                           break;
-                        case "occupancy":
-                           oAccessory.getService(Service.OccupancySensor).updateCharacteristic(Characteristic.OccupancyDetected, 1);
-                           setTimeout(() => {
-                              oAccessory.getService(Service.OccupancySensor).updateCharacteristic(Characteristic.OccupancyDetected, 0);
-                           }, (this.config.sensorTimeLength || 2) * 1000);
-                           break;
-                        default:
-                           oAccessory.getService(Service.MotionSensor).updateCharacteristic(Characteristic.MotionDetected, true);
-                           setTimeout(() => {
-                              oAccessory.getService(Service.MotionSensor).updateCharacteristic(Characteristic.MotionDetected, false);
-                           }, (this.config.sensorTimeLength || 2) * 1000);
-                           break;
-                     }
-                     if (this.config.debug) {
-                        this.log("[%s] has detected [%s].", oAccessory.displayName, oAccessory.context.sensorType);
+            Object.keys(params)
+               .filter(name => /rfTrig/.test(name))
+               .forEach(chan => {
+                  let chanNum = chan.substr(-1).toString(),
+                     accessoryNum = accessory.context.rfChlMap[chanNum],
+                     oAccessory;
+                  if ((oAccessory = this.devicesInHB.get(idToCheck + accessoryNum))) {
+                     let timeOfMotion = new Date(params[chan]),
+                        timeDifference = (timeNow.getTime() - timeOfMotion.getTime()) / 1000;
+                     if (timeDifference < (this.config.sensorTimeDifference || 120)) {
+                        switch (oAccessory.context.sensorType) {
+                           case "button":
+                              break;
+                           case "water":
+                              oAccessory.getService(Service.LeakSensor).updateCharacteristic(Characteristic.LeakDetected, 1);
+                              setTimeout(() => {
+                                 oAccessory.getService(Service.LeakSensor).updateCharacteristic(Characteristic.LeakDetected, 0);
+                              }, (this.config.sensorTimeLength || 2) * 1000);
+                              break;
+                           case "fire":
+                           case "smoke":
+                              oAccessory.getService(Service.SmokeSensor).updateCharacteristic(Characteristic.SmokeDetected, 1);
+                              setTimeout(() => {
+                                 oAccessory.getService(Service.SmokeSensor).updateCharacteristic(Characteristic.SmokeDetected, 0);
+                              }, (this.config.sensorTimeLength || 2) * 1000);
+                              break;
+                           case "co":
+                              oAccessory.getService(Service.CarbonMonoxideSensor).updateCharacteristic(Characteristic.CarbonMonoxideDetected, 1);
+                              setTimeout(() => {
+                                 oAccessory.getService(Service.CarbonMonoxideSensor).updateCharacteristic(Characteristic.CarbonMonoxideDetected, 0);
+                              }, (this.config.sensorTimeLength || 2) * 1000);
+                              break;
+                           case "co2":
+                              oAccessory.getService(Service.CarbonDioxideSensor).updateCharacteristic(Characteristic.CarbonDioxideDetected, 1);
+                              setTimeout(() => {
+                                 oAccessory.getService(Service.CarbonDioxideSensor).updateCharacteristic(Characteristic.CarbonDioxideDetected, 0);
+                              }, (this.config.sensorTimeLength || 2) * 1000);
+                              break;
+                           case "contact":
+                              oAccessory.getService(Service.ContactSensor).updateCharacteristic(Characteristic.ContactSensorState, 1);
+                              setTimeout(() => {
+                                 oAccessory.getService(Service.ContactSensor).updateCharacteristic(Characteristic.ContactSensorState, 0);
+                              }, (this.config.sensorTimeLength || 2) * 1000);
+                              break;
+                           case "occupancy":
+                              oAccessory.getService(Service.OccupancySensor).updateCharacteristic(Characteristic.OccupancyDetected, 1);
+                              setTimeout(() => {
+                                 oAccessory.getService(Service.OccupancySensor).updateCharacteristic(Characteristic.OccupancyDetected, 0);
+                              }, (this.config.sensorTimeLength || 2) * 1000);
+                              break;
+                           default:
+                              oAccessory.getService(Service.MotionSensor).updateCharacteristic(Characteristic.MotionDetected, true);
+                              setTimeout(() => {
+                                 oAccessory.getService(Service.MotionSensor).updateCharacteristic(Characteristic.MotionDetected, false);
+                              }, (this.config.sensorTimeLength || 2) * 1000);
+                              break;
+                        }
+                        if (this.config.debug) {
+                           this.log("[%s] has detected [%s].", oAccessory.displayName, oAccessory.context.sensorType);
+                        }
                      }
                   }
-               }
-            });
+               });
          }
       } catch (err) {
-         this.log.warn("[%s] could not be updated - [%s].", accessory.displayName, err);
+         this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
       }
    }
    externalZBDeviceUpdate(accessory, params) {
-      try {
+      try { //*** credit @tasict ***\\
          switch (accessory.context.eweUIID) {
             case 1000:
-               if (params.hasOwnProperty("key")) {
-                  if ([0, 1, 2].includes(params.key)) {
-                     accessory.getService(Service.StatelessProgrammableSwitch).updateCharacteristic(Characteristic.ProgrammableSwitchEvent, params.key); //*** credit @tasict ***\\
-                  } else {
-                     throw "unknown 'key' parameter received [" + params.key + "]";
-                  }
+               if (params.hasOwnProperty("key") && [0, 1, 2].includes(params.key)) {
+                  accessory.getService(Service.StatelessProgrammableSwitch).updateCharacteristic(Characteristic.ProgrammableSwitchEvent, params.key);
                }
                break;
             case 1770:
@@ -1819,28 +1753,20 @@ class eWeLink {
                }
                break;
             case 2026:
-               if (params.hasOwnProperty("motion")) {
-                  if ([0, 1].includes(params.lock)) {
-                     accessory.getService(Service.MotionSensor).updateCharacteristic(Characteristic.MotionDetected, params.motion);
-                  } else {
-                     throw "unknown 'motion' parameter received [" + params.motion + "]";
-                  }
+               if (params.hasOwnProperty("motion") && [0, 1].includes(params.lock)) {
+                  accessory.getService(Service.MotionSensor).updateCharacteristic(Characteristic.MotionDetected, params.motion);
                }
                break;
             case 3026:
-               if (params.hasOwnProperty("lock")) {
-                  if ([0, 1].includes(params.lock)) {
-                     accessory.getService(Service.ContactSensor).updateCharacteristic(Characteristic.ContactSensorState, params.lock);
-                  } else {
-                     throw "unknown 'lock' parameter received [" + params.lock + "]";
-                  }
+               if (params.hasOwnProperty("lock") && [0, 1].includes(params.lock)) {
+                  accessory.getService(Service.ContactSensor).updateCharacteristic(Characteristic.ContactSensorState, params.lock);
                }
                break;
             default:
-               throw "unsupported zigbee device type";
+               throw "unsupported zigbee device type [" + accessory.context.eweUIID + "]. Please create an issue on GitHub";
          }
       } catch (err) {
-         this.log.warn("[%s] could not be updated - [%s].", accessory.displayName, err);
+         this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
       }
    }
 }
diff --git a/lib/eWeLinkLAN.js b/lib/eWeLinkLAN.js
index 89e1a337..4582825b 100644
--- a/lib/eWeLinkLAN.js
+++ b/lib/eWeLinkLAN.js
@@ -90,8 +90,8 @@ module.exports = class eWeLinkLAN {
                         }
                      }
                   }
-                  params.updateSource = "LAN";
                   if (Object.keys(params).length > 0) {
+                     params.updateSource = "LAN";
                      let returnTemplate = {
                         deviceid: rdata.id,
                         action: "update",
diff --git a/lib/eWeLinkWS.js b/lib/eWeLinkWS.js
index 8afe3926..0052d5d6 100644
--- a/lib/eWeLinkWS.js
+++ b/lib/eWeLinkWS.js
@@ -96,9 +96,9 @@ module.exports = class eWeLinkWS {
                this.ws.send("ping");
             }, (device.config.hbInterval + 7) * 1000);
          } else if (device.hasOwnProperty("action")) {
-            device.params.updateSource = "WS";
             switch (device.action) {
                case "sysmsg":
+                  device.params.updateSource = "WS";
                   let returnTemplate = {
                      deviceid: device.deviceid,
                      action: "sysmsg",
@@ -121,6 +121,7 @@ module.exports = class eWeLinkWS {
                      }
                   }
                   if (Object.keys(device.params).length > 0) {
+                     device.params.updateSource = "WS";
                      let returnTemplate = {
                         deviceid: device.deviceid,
                         action: "update",

From 69ea1e39b60c4dac434d9f3fd53297db145ef43c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 8 Sep 2020 11:24:57 +0100
Subject: [PATCH 0095/3183] small changes

---
 lib/eWeLink.js | 46 ++++++++++++++++++++++++----------------------
 1 file changed, 24 insertions(+), 22 deletions(-)

diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index ddf238bb..969e215a 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -205,7 +205,7 @@ class eWeLink {
             }
          }
          if (rfBridgeChange) {
-            this.log.warn("[%s] bridge configuration changed - devices will be removed and readded.", accessory.displayName);
+            this.log.warn("[%s] bridge configuration changed so devices will be removed and readded.", accessory.displayName);
             for (let i = 0; i <= accessory.context.channelCount; i++) {
                let oAccessory = this.devicesInHB.get(device.deviceid + "SW" + i);
                this.removeAccessory(oAccessory);
@@ -390,18 +390,18 @@ class eWeLink {
                      accessory.addService(Service.ContactSensor);
                      break;
                   default:
-                     throw "unsupported zigbee device type with uiid [" + device.extra.uiid + "]";
+                     throw "unsupported zigbee device type [" + device.extra.uiid + "]. Please create an issue on GitHub";
                }
                break;
             default:
-               throw "device is not supported by this plugin";
+               throw "device is not supported by this plugin. Please create an issue on GitHub";
          }
          this.devicesInHB.set(hbDeviceId, accessory);
          this.api.registerPlatformAccessories("homebridge-ewelink", "eWeLink", [accessory]);
          this.configureAccessory(accessory);
          this.log("[%s] has been added to Homebridge.", newDeviceName);
       } catch (err) {
-         this.log.warn("[%s] could not be added - %s.", newDeviceName, err);
+         this.log.warn("[%s] could not be added as %s.", newDeviceName, err);
       }
    }
    configureAccessory(accessory) {
@@ -533,7 +533,7 @@ class eWeLink {
          accessory.context.reachableLAN = true;
          this.devicesInHB.set(accessory.context.hbDeviceId, accessory);
       } catch (err) {
-         this.log.warn("[%s] could not be refreshed - [%s].", accessory.displayName, err);
+         this.log.warn("[%s] could not be refreshed as %s.", accessory.displayName, err);
       }
    }
    refreshAccessory(accessory, newParams) {
@@ -629,7 +629,7 @@ class eWeLink {
          this.api.unregisterPlatformAccessories("homebridge-ewelink", "eWeLink", [accessory]);
          this.log("[%s] has been removed from Homebridge.", accessory.displayName);
       } catch (err) {
-         this.log.warn("[%s] needed to be removed but couldn't - [%s].", accessory.displayName, err);
+         this.log.warn("[%s] needed to be removed but couldn't as %s.", accessory.displayName, err);
       }
    }
    sendDeviceUpdate(accessory, params, callback) {
@@ -651,7 +651,7 @@ class eWeLink {
          sendViaWS();
       } else {
          this.lanClient.sendUpdate(payload)
-            .then(res => callback())
+            .then(() => callback())
             .catch(err => {
                if (this.config.debug) {
                   this.log.warn("[%s] Reverting to web socket as %s.", accessory.displayName, err);
@@ -666,12 +666,18 @@ class eWeLink {
          case "sysmsg":
             if ((accessory = this.devicesInHB.get(device.deviceid + "SWX") || this.devicesInHB.get(device.deviceid + "SW0"))) {
                let isX = accessory.context.hbDeviceId.substr(-1) === "X";
-               if (device.params.updateSource === "WS" && accessory.context.reachableWAN !== device.params.online) {
-                  accessory.context.reachableWAN = device.params.online;
-                  this.log("[%s] has been reported [%s] via [WS].", accessory.displayName, accessory.context.reachableWAN ? "online" : "offline");
-                  this.devicesInHB.set(accessory.context.hbDeviceId, accessory);
-                  if (accessory.context.reachableWAN) {
-                     this.wsClient.requestUpdate(accessory);
+               if (device.params.updateSource === "WS") {
+                  if (accessory.context.reachableWAN !== device.params.online) {
+                     accessory.context.reachableWAN = device.params.online;
+                     this.log("[%s] has been reported [%s] via [WS].", accessory.displayName, accessory.context.reachableWAN ? "online" : "offline");
+                     this.devicesInHB.set(accessory.context.hbDeviceId, accessory);
+                     if (accessory.context.reachableWAN) {
+                        this.wsClient.requestUpdate(accessory);
+                     }
+                  } else {
+                     if (this.debug) {
+                        this.log("[%s] Nothing to update from above WS message.", accessory.displayName);
+                     }
                   }
                }
                if (!isX) {
@@ -822,7 +828,7 @@ class eWeLink {
             oldPos,
             newPos = value,
             params = {},
-            wsDelay = 0;
+            delay = 0;
          if (sensorDefinition && !(sAccessory = this.devicesInHB.get(garageConfig.sensorId + "SWX"))) {
             throw "defined sensor doesn't exist";
          }
@@ -836,9 +842,8 @@ class eWeLink {
             return;
          }
          if (garageConfig.setup === "oneSwitch" && [2, 3].includes(oldPos)) {
-            accessory.getService(Service.GarageDoorOpener)
-               .updateCharacteristic(Characteristic.CurrentDoorState, oldPos * 2 % 3 + 2);
-            wsDelay = 1500;
+            accessory.getService(Service.GarageDoorOpener).updateCharacteristic(Characteristic.CurrentDoorState, oldPos * 2 % 3 + 2);
+            delay = 1500;
          }
          setTimeout(() => {
             if (accessory.context.state === newPos) {
@@ -860,13 +865,12 @@ class eWeLink {
                });
                setTimeout(() => {
                   if (!sAccessory) {
-                     accessory.getService(Service.GarageDoorOpener)
-                        .updateCharacteristic(Characteristic.CurrentDoorState, newPos);
+                     accessory.getService(Service.GarageDoorOpener).updateCharacteristic(Characteristic.CurrentDoorState, newPos);
                   }
                   accessory.context.inUse = false;
                }, parseInt(garageConfig.operationTime) * 100);
             }
-         }, wsDelay);
+         }, delay);
          callback();
       } catch (err) {
          accessory.context.inUse = false;
@@ -1762,8 +1766,6 @@ class eWeLink {
                   accessory.getService(Service.ContactSensor).updateCharacteristic(Characteristic.ContactSensorState, params.lock);
                }
                break;
-            default:
-               throw "unsupported zigbee device type [" + accessory.context.eweUIID + "]. Please create an issue on GitHub";
          }
       } catch (err) {
          this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);

From 4e1a204ec89f73b91a79f43eeb4d838b78fd0366 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 8 Sep 2020 11:26:02 +0100
Subject: [PATCH 0096/3183] 2.25.0-3

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 13f0eb35..2a277e50 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
    "name": "homebridge-ewelink",
-   "version": "2.25.0-2",
+   "version": "2.25.0-3",
    "lockfileVersion": 1,
    "requires": true,
    "dependencies": {
diff --git a/package.json b/package.json
index bbe0307b..42c59d5b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
    "name": "homebridge-ewelink",
-   "version": "2.25.0-2",
+   "version": "2.25.0-3",
    "author": "bwp91",
    "contributors": [
       "gbro115",

From 0f60d15462b848fcad41ea2a219b2cfc277049ec Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 8 Sep 2020 16:28:12 +0100
Subject: [PATCH 0097/3183] 2.25.0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 2a277e50..41e52d3d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
    "name": "homebridge-ewelink",
-   "version": "2.25.0-3",
+   "version": "2.25.0",
    "lockfileVersion": 1,
    "requires": true,
    "dependencies": {
diff --git a/package.json b/package.json
index 42c59d5b..f2e18280 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
    "name": "homebridge-ewelink",
-   "version": "2.25.0-3",
+   "version": "2.25.0",
    "author": "bwp91",
    "contributors": [
       "gbro115",

From 100e71094040a0e069e4c5926a10161a7e15af98 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 9 Sep 2020 06:42:44 +0100
Subject: [PATCH 0098/3183] bug: rf bridge with no devices

---
 lib/eWeLink.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index 969e215a..6e9fb4db 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -221,7 +221,7 @@ class eWeLink {
       }
    }
    addAccessory(device, hbDeviceId, type) {
-      let channelCount = type === "rf_pri" ? Object.keys(device.tags.zyx_info).length : cns.chansFromUiid[device.extra.uiid],
+      let channelCount = type === "rf_pri" ? Object.keys(device.tags.zyx_info || []).length : cns.chansFromUiid[device.extra.uiid],
          switchNumber = hbDeviceId.substr(-1).toString(),
          newDeviceName = type === "rf_sub" ? device.tags.zyx_info[switchNumber - 1].name : device.name;
       if (["1", "2", "3", "4"].includes(switchNumber) && type !== "rf_sub") {

From d616b3d14c62bc9efd6b0b101b77352b78c99ab4 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 9 Sep 2020 06:43:31 +0100
Subject: [PATCH 0099/3183] bug: can't close if not open

#85
---
 lib/eWeLinkWS.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/eWeLinkWS.js b/lib/eWeLinkWS.js
index 0052d5d6..a44b1431 100644
--- a/lib/eWeLinkWS.js
+++ b/lib/eWeLinkWS.js
@@ -275,6 +275,8 @@ module.exports = class eWeLinkWS {
       this.emitter.addListener("update", f);
    }
    closeConnection() {
-      this.ws.close(1000, "Stopping Homebridge");
+      if (this.ws && this.wsIsOpen) {
+         this.ws.close(1000, "Stopping Homebridge");
+      }
    }
 };
\ No newline at end of file

From a441bf4dc28964d02ae5d2769b81ef4b5b9a1e93 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 9 Sep 2020 06:43:58 +0100
Subject: [PATCH 0100/3183] feat: custom ip definition

---
 lib/eWeLinkLAN.js | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/lib/eWeLinkLAN.js b/lib/eWeLinkLAN.js
index 4582825b..f43869b7 100644
--- a/lib/eWeLinkLAN.js
+++ b/lib/eWeLinkLAN.js
@@ -10,12 +10,13 @@ module.exports = class eWeLinkLAN {
       this.config = config;
       this.log = log;
       this.devices = devices;
+      this.ipOverrides = this.config.ipOverride || {};
       let deviceMap = new Map();
       devices.forEach(device => {
          deviceMap.set(device.deviceid, {
             apiKey: device.devicekey,
-            online: false,
-            ip: null
+            online: this.ipOverrides.hasOwnProperty(device.deviceid) ? true : false,
+            ip: this.ipOverrides.hasOwnProperty(device.deviceid) ? this.ipOverrides[device.deviceid] : null
          });
       });
       this.deviceMap = deviceMap;
@@ -32,11 +33,13 @@ module.exports = class eWeLinkLAN {
             res.forEach(device => {
                let d, deviceId = device.fqdn.replace("._ewelink._tcp.local", "").replace("eWeLink_", "");
                if ((d = this.deviceMap.get(deviceId))) {
-                  this.deviceMap.set(deviceId, {
-                     apiKey: d.apiKey,
-                     online: true,
-                     ip: device.address
-                  });
+                  if (!this.ipOverrides.hasOwnProperty(deviceId)) {
+                     this.deviceMap.set(deviceId, {
+                        apiKey: d.apiKey,
+                        online: true,
+                        ip: device.address
+                     });
+                  }
                   onlineCount++;
                }
             });
@@ -67,7 +70,7 @@ module.exports = class eWeLinkLAN {
                      dText = crypto.createDecipheriv("aes-128-cbc", key, Buffer.from(rdata.iv, "base64")),
                      pText = Buffer.concat([dText.update(Buffer.from(data, "base64")), dText.final()]).toString("utf8"),
                      params;
-                  if (packet.address !== deviceInfo.ip) {
+                  if (packet.address !== deviceInfo.ip && !this.ipOverrides.hasOwnProperty(rdata.id)) {
                      this.deviceMap.set(rdata.id, {
                         apiKey: deviceInfo.apiKey,
                         online: true,

From cc4c55c664745f331f755f8891764cd4a7a9023a Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 9 Sep 2020 06:56:30 +0100
Subject: [PATCH 0101/3183] 2.25.1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 41e52d3d..ca38ffdb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
    "name": "homebridge-ewelink",
-   "version": "2.25.0",
+   "version": "2.25.1",
    "lockfileVersion": 1,
    "requires": true,
    "dependencies": {
diff --git a/package.json b/package.json
index f2e18280..d6d5a820 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
    "name": "homebridge-ewelink",
-   "version": "2.25.0",
+   "version": "2.25.1",
    "author": "bwp91",
    "contributors": [
       "gbro115",

From 77305516003e311ffc1a76d3e94cb52682e292f6 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 9 Sep 2020 20:00:33 +0100
Subject: [PATCH 0102/3183] bugs definition

---
 package.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package.json b/package.json
index d6d5a820..04d63730 100644
--- a/package.json
+++ b/package.json
@@ -38,6 +38,9 @@
       "type": "git",
       "url": "https://github.com/bwp91/homebridge-ewelink"
    },
+   "bugs": {
+      "url": "https://github.com/bwp91/homebridge-ewelink/issues"
+   },
    "dependencies": {
       "axios": "0.20.0",
       "color-convert": "2.0.1",

From 782806340b9364a0f7154011bce55ce0c623f05b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 9 Sep 2020 20:04:04 +0100
Subject: [PATCH 0103/3183] garage and rf bug fixes

---
 lib/eWeLink.js | 190 ++++++++++++++++++++++++-------------------------
 1 file changed, 95 insertions(+), 95 deletions(-)

diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index 6e9fb4db..397cee30 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -22,91 +22,91 @@ class eWeLink {
       this.devicesInEwe = new Map();
       this.cusG = new Map();
       this.cusS = new Map();
-      this.api.on("didFinishLaunching", () => {
-         this.log("Plugin has finished initialising. Starting synchronisation with eWeLink account.");
-         //*** Set up HTTP client and get the user HTTP host ***\\
-         this.httpClient = new eWeLinkHTTP(this.config, this.log);
-         this.httpClient.getHost()
-            .then(res => { //*** Use the HTTP API host to log into eWeLink ***\\
-               return this.httpClient.login();
-            }).then(res => { //*** Set up the web socket client ***\\
-               this.wsClient = new eWeLinkWS(this.config, this.log, res);
-               return this.wsClient.getHost();
-            }).then(() => { //*** Open web socket connection and get device list via HTTP ***\\
-               this.wsClient.login();
-               return this.httpClient.getDevices();
-            }).then(res => { //*** Get device IP addresses for LAN mode ***\\
-               this.httpDevices = res
-                  .filter(device => device.hasOwnProperty("extra"))
-                  .filter(device => device.extra.hasOwnProperty("uiid"))
-                  .filter(device => !(this.config.hideDevFromHB || "").includes(device.deviceid))
-                  .forEach(device => this.devicesInEwe.set(device.deviceid, device));
-               this.httpDevices = res;
-               this.lanClient = new eWeLinkLAN(this.config, this.log, this.httpDevices);
-               return this.lanClient.getHosts();
-            }).then(res => { //*** Set up the LAN mode listener ***\\
-               this.lanDevices = res.map;
-               this.lanDevicesOnline = res.count;
-               return this.lanClient.startMonitor();
-            }).then(() => { //*** Use the device list to refresh Homebridge accessories ***\\
-               (() => {
-                  //*** Remove all Homebridge accessories if none found ***\\
-                  if (Object.keys(this.httpDevices).length === 0 && Object.keys(this.lanDevices).length === 0) {
-                     Array.from(this.devicesInHB.values()).forEach(a => this.removeAccessory(a));
-                     this.devicesInHB.clear();
-                     this.log.warn("🟠  No devices were found registered to your eWeLink account so disabling plugin.");
-                     return;
-                  }
-                  //*** Make a map of custom groups from Homebridge config ***\\
-                  if (Object.keys(this.config.groups || []).length > 0) {
-                     this.config.groups
-                        .filter(g => g.hasOwnProperty("deviceId") && this.devicesInEwe.has(g.deviceId.toLowerCase()))
-                        .filter(g => g.hasOwnProperty("type") && cns.allowedGroups.includes(g.type))
-                        .forEach(g => this.cusG.set(g.deviceId + "SWX", g));
-                  }
-                  //*** Make a map of RF Bridge custom sensors from Homebridge config ***\\
-                  if (Object.keys(this.config.bridgeSensors || []).length > 0) {
-                     this.config.bridgeSensors
-                        .filter(s => s.hasOwnProperty("deviceId") && this.devicesInEwe.has(s.deviceId.toLowerCase()))
-                        .forEach(s => this.cusS.set(s.fullDeviceId, s));
-                  }
-                  //*** Logging always helps to see if everything is okay so far ***\\
-                  this.log("[%s] eWeLink devices were loaded from the Homebridge cache.", this.devicesInHB.size);
-                  this.log("[%s] primary devices were loaded from your eWeLink account.", this.devicesInEwe.size);
-                  this.log("[%s] primary devices were discovered on your local network.", this.lanDevicesOnline);
-                  //*** Remove Homebridge accessories that don't appear in eWeLink ***\\
-                  this.devicesInHB.forEach(accessory => {
-                     if (!this.devicesInEwe.has(accessory.context.eweDeviceId)) {
-                        this.removeAccessory(accessory);
+      this.api
+         .on("didFinishLaunching", () => {
+            this.log("Plugin has finished initialising. Starting synchronisation with eWeLink account.");
+            //*** Set up HTTP client and get the user HTTP host ***\\
+            this.httpClient = new eWeLinkHTTP(this.config, this.log);
+            this.httpClient.getHost()
+               .then(res => { //*** Use the HTTP API host to log into eWeLink ***\\
+                  return this.httpClient.login();
+               }).then(res => { //*** Set up the web socket client ***\\
+                  this.wsClient = new eWeLinkWS(this.config, this.log, res);
+                  return this.wsClient.getHost();
+               }).then(() => { //*** Open web socket connection and get device list via HTTP ***\\
+                  this.wsClient.login();
+                  return this.httpClient.getDevices();
+               }).then(res => { //*** Get device IP addresses for LAN mode ***\\
+                  this.httpDevices = res
+                     .filter(device => device.hasOwnProperty("extra") && device.extra.hasOwnProperty("uiid"))
+                     .filter(device => !(this.config.hideDevFromHB || "").includes(device.deviceid))
+                     .forEach(device => this.devicesInEwe.set(device.deviceid, device));
+                  this.httpDevices = res;
+                  this.lanClient = new eWeLinkLAN(this.config, this.log, this.httpDevices);
+                  return this.lanClient.getHosts();
+               }).then(res => { //*** Set up the LAN mode listener ***\\
+                  this.lanDevices = res.map;
+                  this.lanDevicesOnline = res.count;
+                  return this.lanClient.startMonitor();
+               }).then(() => { //*** Use the device list to refresh Homebridge accessories ***\\
+                  (() => {
+                     //*** Remove all Homebridge accessories if none found ***\\
+                     if (Object.keys(this.httpDevices).length === 0 && Object.keys(this.lanDevices).length === 0) {
+                        Array.from(this.devicesInHB.values()).forEach(a => this.removeAccessory(a));
+                        this.devicesInHB.clear();
+                        this.log.warn("🟠  No devices were found registered to your eWeLink account so disabling plugin.");
+                        return;
                      }
-                  });
-                  //*** Synchronise devices between eWeLink and Homebridge and set up ws/lan listeners ***\\
-                  this.devicesInEwe.forEach(device => this.initialiseDevice(device));
-                  this.wsClient.receiveUpdate(device => this.receiveDeviceUpdate(device));
-                  this.lanClient.receiveUpdate(device => this.receiveDeviceUpdate(device));
-                  this.log("🟢  eWeLink setup complete. If you're enjoying this package please consider a ⭐️  on GitHub!");
-                  if (this.config.debugReqRes) {
-                     this.log.warn("You have 'Request & Response Logging' enabled. This setting is not recommended for long-term use.");
+                     //*** Make a map of custom groups from Homebridge config ***\\
+                     if (Object.keys(this.config.groups || []).length > 0) {
+                        this.config.groups
+                           .filter(g => g.hasOwnProperty("deviceId") && this.devicesInEwe.has(g.deviceId.toLowerCase()))
+                           .filter(g => g.hasOwnProperty("type") && cns.allowedGroups.includes(g.type))
+                           .forEach(g => this.cusG.set(g.deviceId + "SWX", g));
+                     }
+                     //*** Make a map of RF Bridge custom sensors from Homebridge config ***\\
+                     if (Object.keys(this.config.bridgeSensors || []).length > 0) {
+                        this.config.bridgeSensors
+                           .filter(s => s.hasOwnProperty("deviceId") && this.devicesInEwe.has(s.deviceId.toLowerCase()))
+                           .forEach(s => this.cusS.set(s.fullDeviceId, s));
+                     }
+                     //*** Logging always helps to see if everything is okay so far ***\\
+                     this.log("[%s] eWeLink devices were loaded from the Homebridge cache.", this.devicesInHB.size);
+                     this.log("[%s] primary devices were loaded from your eWeLink account.", this.devicesInEwe.size);
+                     this.log("[%s] primary devices were discovered on your local network.", this.lanDevicesOnline);
+                     //*** Remove Homebridge accessories that don't appear in eWeLink ***\\
+                     this.devicesInHB.forEach(accessory => {
+                        if (!this.devicesInEwe.has(accessory.context.eweDeviceId)) {
+                           this.removeAccessory(accessory);
+                        }
+                     });
+                     //*** Synchronise devices between eWeLink and Homebridge and set up ws/lan listeners ***\\
+                     this.devicesInEwe.forEach(device => this.initialiseDevice(device));
+                     this.wsClient.receiveUpdate(device => this.receiveDeviceUpdate(device));
+                     this.lanClient.receiveUpdate(device => this.receiveDeviceUpdate(device));
+                     this.log("🟢  eWeLink setup complete. If you're enjoying this package please consider a ⭐️  on GitHub!");
+                     if (this.config.debugReqRes) {
+                        this.log.warn("You have 'Request & Response Logging' enabled. This setting is not recommended for long-term use.");
+                     }
+                  })();
+               }).catch(err => {
+                  this.log.error("🔴  Cannot load homebridge-ewelink - %s", err);
+                  if (this.lanClient) {
+                     this.lanClient.closeConnection();
                   }
-               })();
-            }).catch(err => {
-               this.log.error("🔴  Cannot load homebridge-ewelink - %s", err);
-               if (this.lanClient) {
-                  this.lanClient.closeConnection();
-               }
-               if (this.wsClient) {
-                  this.wsClient.closeConnection();
-               }
-            });
-      });
-      this.api.on('shutdown', () => {
-         if (this.lanClient) {
-            this.lanClient.closeConnection();
-         }
-         if (this.wsClient) {
-            this.wsClient.closeConnection();
-         }
-      });
+                  if (this.wsClient) {
+                     this.wsClient.closeConnection();
+                  }
+               });
+         })
+         .on('shutdown', () => {
+            if (this.lanClient) {
+               this.lanClient.closeConnection();
+            }
+            if (this.wsClient) {
+               this.wsClient.closeConnection();
+            }
+         });
    }
    initialiseDevice(device) {
       let accessory;
@@ -147,8 +147,10 @@ class eWeLink {
             }
          } else if (cns.devicesRFBridge.includes(device.extra.uiid)) {
             this.addAccessory(device, device.deviceid + "SW0", "rf_pri");
-            for (let i = 1; i <= Object.keys(device.tags.zyx_info).length; i++) {
-               this.addAccessory(device, device.deviceid + "SW" + i, "rf_sub");
+            if (Object.keys((device.tags && device.tags.zyx_info) || []).length > 0) {
+               for (let i = 1; i <= Object.keys(device.tags.zyx_info).length; i++) {
+                  this.addAccessory(device, device.deviceid + "SW" + i, "rf_sub");
+               }
             }
          } else if (cns.devicesZBBridge.includes(device.extra.uiid)) {
             this.addAccessory(device, device.deviceid + "SWX", "zb_pri");
@@ -221,7 +223,7 @@ class eWeLink {
       }
    }
    addAccessory(device, hbDeviceId, type) {
-      let channelCount = type === "rf_pri" ? Object.keys(device.tags.zyx_info || []).length : cns.chansFromUiid[device.extra.uiid],
+      let channelCount = type === "rf_pri" ? Object.keys((device.tags && device.tags.zyx_info) || []).length : cns.chansFromUiid[device.extra.uiid],
          switchNumber = hbDeviceId.substr(-1).toString(),
          newDeviceName = type === "rf_sub" ? device.tags.zyx_info[switchNumber - 1].name : device.name;
       if (["1", "2", "3", "4"].includes(switchNumber) && type !== "rf_sub") {
@@ -832,7 +834,6 @@ class eWeLink {
          if (sensorDefinition && !(sAccessory = this.devicesInHB.get(garageConfig.sensorId + "SWX"))) {
             throw "defined sensor doesn't exist";
          }
-         this.log("[%s] has received request to [%s].", accessory.displayName, newPos === 0 ? "open" : "close");
          oldPos = sAccessory ?
             sAccessory.getService(Service.ContactSensor).getCharacteristic(Characteristic.ContactSensorState).value === 0 ? 1 : 0 :
             accessory.getService(Service.GarageDoorOpener).getCharacteristic(Characteristic.CurrentDoorState).value;
@@ -1376,18 +1377,20 @@ class eWeLink {
          if (garageConfig.type !== "garage" || !["oneSwitch", "twoSwitch"].includes(garageConfig.setup)) {
             throw "improper configuration";
          }
+         if (accessory.context.inUse || garageConfig.sensorId) {
+            return;
+         }
          switch (garageConfig.setup) {
             case "oneSwitch":
-               if (params.switch === "off" || garageConfig.sensorId || accessory.context.inUse) {
+               if (params.switch === "off") {
                   return;
                }
                break;
             case "twoSwitch":
-               if ((params.switches[0].switch === "off" && params.switches[1].switch === "off") || accessory.context.inUse) {
+               if (params.switches[0].switch === params.switches[1].switch || params.switches[oldPos % 2].switch === "on") {
                   return;
                }
-               // @TODO twoSwitch garage external update
-               return;
+               break;
          }
          accessory.context.inUse = true;
          if (!garageConfig.sensorId) {
@@ -1440,7 +1443,6 @@ class eWeLink {
             newState = params.switch === "on" ? 1 : 0,
             oAccessory = false;
          accessory.getService(Service.ContactSensor).updateCharacteristic(Characteristic.ContactSensorState, newState);
-         this.log("[%s] sent update that it was [%s] and is now [%s].", accessory.displayName, oldState ? "apart" : "joined", newState ? "apart" : "joined");
          this.cusG.forEach(group => {
             if (group.sensorId === accessory.context.eweDeviceId && group.type === "garage") {
                if ((oAccessory = this.devicesInHB.get(group.deviceId + "SWX"))) {
@@ -1449,18 +1451,16 @@ class eWeLink {
                         oAccessory.getService(Service.GarageDoorOpener)
                            .updateCharacteristic(Characteristic.TargetDoorState, 1)
                            .updateCharacteristic(Characteristic.CurrentDoorState, 1);
-                        this.log("[%s] updating to [closed] based on sensor.", oAccessory.displayName);
                         break;
                      case 1:
                         setTimeout(() => {
                            oAccessory.getService(Service.GarageDoorOpener)
                               .updateCharacteristic(Characteristic.TargetDoorState, 0)
                               .updateCharacteristic(Characteristic.CurrentDoorState, 0);
-                           this.log("[%s] updating to [open] based on sensor.", oAccessory.displayName);
                         }, group.operationTime * 100);
                         break;
                      default:
-                        throw "unknown sensor status received";
+                        throw "unknown sensor status received [" + newState + "]";
                   }
                }
             }

From 069c3d4aca80865b5a71a58ecdd036d2eeebd8ae Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 9 Sep 2020 20:13:43 +0100
Subject: [PATCH 0104/3183] unused var

---
 lib/eWeLink.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index 397cee30..a5e87086 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -1439,8 +1439,7 @@ class eWeLink {
    }
    externalSensorUpdate(accessory, params) {
       try {
-         let oldState = accessory.getService(Service.ContactSensor).getCharacteristic(Characteristic.ContactSensorState).value,
-            newState = params.switch === "on" ? 1 : 0,
+         let newState = params.switch === "on" ? 1 : 0,
             oAccessory = false;
          accessory.getService(Service.ContactSensor).updateCharacteristic(Characteristic.ContactSensorState, newState);
          this.cusG.forEach(group => {

From 76050162243c895cd9757ecd1e5eab221d9eaabe Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 9 Sep 2020 20:15:16 +0100
Subject: [PATCH 0105/3183] 2.25.2

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ca38ffdb..d7a67f06 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
    "name": "homebridge-ewelink",
-   "version": "2.25.1",
+   "version": "2.25.2",
    "lockfileVersion": 1,
    "requires": true,
    "dependencies": {
diff --git a/package.json b/package.json
index 04d63730..17650b7e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
    "name": "homebridge-ewelink",
-   "version": "2.25.1",
+   "version": "2.25.2",
    "author": "bwp91",
    "contributors": [
       "gbro115",

From 140f355b975fc429f489354b920fa7c64cdadf27 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 10 Sep 2020 10:54:31 +0100
Subject: [PATCH 0106/3183] Update package.json

---
 package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package.json b/package.json
index 17650b7e..7e070066 100644
--- a/package.json
+++ b/package.json
@@ -27,6 +27,7 @@
    "keywords": [
       "homebridge",
       "homebridge-plugin",
+      "homekit",
       "sonoff",
       "ewelink"
    ],

From f694e1b622c36f39a26542c1a0944499faf6b670 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 11 Sep 2020 00:07:26 +0100
Subject: [PATCH 0107/3183] params per device type

---
 lib/constants.js | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/lib/constants.js b/lib/constants.js
index 534514f0..0a53039b 100644
--- a/lib/constants.js
+++ b/lib/constants.js
@@ -5,23 +5,39 @@ module.exports = {
    devicesHideable: ["switch", "light", "valve"],
    devicesNonLAN: [22, 59, 102],
    devicesSingleSwitch: [1, 5, 6, 14, 15, 22, 24, 27, 32, 36, 44, 59],
-   devicesSingleSwitchLight: ["T1 1C", "L1", "B1", "B1_R2", "TX1C", "D1", "D1R1", "KING-M4", "Slampher", "GTTA59"],
+   devicesSingleSwitchParams: ["switch"],
    devicesMultiSwitch: [2, 3, 4, 7, 8, 9, 29, 30, 31, 34, 41],
+   devicesMultiSwitchParams: ["switches"],
+   devicesSingleSwitchLight: ["T1 1C", "L1", "B1", "B1_R2", "TX1C", "D1", "D1R1", "KING-M4", "Slampher", "GTTA59"],
+   devicesSingleSwitchLightParams: ["switch", "state", "bright", "colorR", "brightness", "channel0", "channel2", "xyz_mode"],
    devicesMultiSwitchLight: ["T1 2C", "T1 3C", "TX2C", "TX3C"],
+   devicesMultiSwitchLightParams: ["switches"],
    devicesBrightable: [36, 44],
    devicesColourable: [22, 59],
    devicesSensor: [102],
+   devicesSensorParams: ["switch"],
    devicesThermostat: [15],
+   devicesThermostatParams: ["currentTemperature", "currentHumidity", "switch", "masterSwitch"],
    devicesFan: [34],
+   devicesFanParams: ["switches", "light", "fan", "speed"],
    devicesOutlet: [32],
+   devicesOutletParams: ["switch", "power", "voltage", "current"],
    devicesCamera: [87],
    devicesUSB: [77],
+   devicesUSBParams: ["switches"],
    devicesSCM: [78],
+   devicesSCMParams: ["switches"],
    devicesRFBridge: [28],
+   devicesRFBridgeParams: ["cmd"],
    devicesZBBridge: [66],
+   devicesZBBridgeParams: ["key", "temperature", "humidity", "motion", "lock"],
    devicesZB: [1000, 1770, 2026, 3026],
+   devicesValveParams: ["switches"],
+   devicesBlindParams: ["switch", "switches"],
+   devicesGarageParams: ["switch", "switches"],
+   devicesLockParams: ["switch"],
    allowedGroups: ["blind", "garage", "lock"],
-   paramsToKeep: ["bright", "brightness", "channel", "cmd", "colorB", "colorG", "colorR", "currentHumidity", "currentTemperature", "fan", "humidity", "key", "light", "lock", "mainSwitch", "mode", "online", "rfChl", "rfList", "rfTrig", "sensorType", "speed", "state", "switch", "switches", "temperature", "type", "zyx_mode"],
+   paramsToKeep: ["bright", "brightness", "channel", "cmd", "colorB", "colorG", "colorR", "current", "currentHumidity", "currentTemperature", "fan", "humidity", "key", "light", "lock", "mainSwitch", "mode", "online", "power", "rfChl", "rfList", "rfTrig", "sensorType", "speed", "state", "switch", "switches", "temperature", "type", "voltage", "zyx_mode"],
    chansFromUiid: {
       1: 1, // "SOCKET"                                  \\ 20, MINI, BASIC, S26
       2: 2, // "SOCKET_2"                                \\ 

From 4b823fa632718e1290ed510f582a55cd6ffa4d2d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 11 Sep 2020 00:07:43 +0100
Subject: [PATCH 0108/3183] deps for power readings

---
 package-lock.json | 575 ++++++++++++++++++++++++++++++++++++++++++++++
 package.json      |   2 +
 2 files changed, 577 insertions(+)

diff --git a/package-lock.json b/package-lock.json
index d7a67f06..0e0ca51e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4,6 +4,61 @@
    "lockfileVersion": 1,
    "requires": true,
    "dependencies": {
+      "@types/color-name": {
+         "version": "1.1.1",
+         "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz",
+         "integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ=="
+      },
+      "abort-controller": {
+         "version": "3.0.0",
+         "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz",
+         "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==",
+         "requires": {
+            "event-target-shim": "^5.0.0"
+         }
+      },
+      "agent-base": {
+         "version": "6.0.1",
+         "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.1.tgz",
+         "integrity": "sha512-01q25QQDwLSsyfhrKbn8yuur+JNw0H+0Y4JiGIKd3z9aYk/w/2kxD/Upc+t2ZBBSUNff50VjPsSW2YxM8QYKVg==",
+         "requires": {
+            "debug": "4"
+         },
+         "dependencies": {
+            "debug": {
+               "version": "4.1.1",
+               "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+               "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+               "requires": {
+                  "ms": "^2.1.1"
+               }
+            },
+            "ms": {
+               "version": "2.1.2",
+               "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+               "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+            }
+         }
+      },
+      "ansi-styles": {
+         "version": "4.2.1",
+         "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
+         "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+         "requires": {
+            "@types/color-name": "^1.1.1",
+            "color-convert": "^2.0.1"
+         }
+      },
+      "array-flatten": {
+         "version": "2.1.2",
+         "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz",
+         "integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ=="
+      },
+      "arrify": {
+         "version": "2.0.1",
+         "resolved": "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz",
+         "integrity": "sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug=="
+      },
       "axios": {
          "version": "0.20.0",
          "resolved": "https://registry.npmjs.org/axios/-/axios-0.20.0.tgz",
@@ -12,6 +67,48 @@
             "follow-redirects": "^1.10.0"
          }
       },
+      "base64-js": {
+         "version": "1.3.1",
+         "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz",
+         "integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g=="
+      },
+      "bignumber.js": {
+         "version": "9.0.0",
+         "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.0.0.tgz",
+         "integrity": "sha512-t/OYhhJ2SD+YGBQcjY8GzzDHEk9f3nerxjtfa6tlMXfe7frs/WozhvCNoGvpM0P3bNf3Gq5ZRMlGr5f3r4/N8A=="
+      },
+      "bonjour": {
+         "version": "3.5.0",
+         "resolved": "https://registry.npmjs.org/bonjour/-/bonjour-3.5.0.tgz",
+         "integrity": "sha1-jokKGD2O6aI5OzhExpGkK897yfU=",
+         "requires": {
+            "array-flatten": "^2.1.0",
+            "deep-equal": "^1.0.1",
+            "dns-equal": "^1.0.0",
+            "dns-txt": "^2.0.2",
+            "multicast-dns": "^6.0.1",
+            "multicast-dns-service-types": "^1.1.0"
+         }
+      },
+      "buffer-equal-constant-time": {
+         "version": "1.0.1",
+         "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz",
+         "integrity": "sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk="
+      },
+      "buffer-indexof": {
+         "version": "1.1.1",
+         "resolved": "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.1.tgz",
+         "integrity": "sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g=="
+      },
+      "chalk": {
+         "version": "4.1.0",
+         "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+         "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+         "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+         }
+      },
       "color-convert": {
          "version": "2.0.1",
          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
@@ -25,20 +122,498 @@
          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
       },
+      "debug": {
+         "version": "2.6.9",
+         "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+         "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+         "requires": {
+            "ms": "2.0.0"
+         }
+      },
+      "deep-equal": {
+         "version": "1.1.1",
+         "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz",
+         "integrity": "sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==",
+         "requires": {
+            "is-arguments": "^1.0.4",
+            "is-date-object": "^1.0.1",
+            "is-regex": "^1.0.4",
+            "object-is": "^1.0.1",
+            "object-keys": "^1.1.1",
+            "regexp.prototype.flags": "^1.2.0"
+         }
+      },
+      "define-properties": {
+         "version": "1.1.3",
+         "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
+         "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
+         "requires": {
+            "object-keys": "^1.0.12"
+         }
+      },
+      "dns-equal": {
+         "version": "1.0.0",
+         "resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz",
+         "integrity": "sha1-s55/HabrCnW6nBcySzR1PEfgZU0="
+      },
+      "dns-packet": {
+         "version": "1.3.1",
+         "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.1.tgz",
+         "integrity": "sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==",
+         "requires": {
+            "ip": "^1.1.0",
+            "safe-buffer": "^5.0.1"
+         }
+      },
+      "dns-txt": {
+         "version": "2.0.2",
+         "resolved": "https://registry.npmjs.org/dns-txt/-/dns-txt-2.0.2.tgz",
+         "integrity": "sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY=",
+         "requires": {
+            "buffer-indexof": "^1.0.0"
+         }
+      },
+      "ecdsa-sig-formatter": {
+         "version": "1.0.11",
+         "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz",
+         "integrity": "sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==",
+         "requires": {
+            "safe-buffer": "^5.0.1"
+         }
+      },
+      "es-abstract": {
+         "version": "1.17.6",
+         "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.6.tgz",
+         "integrity": "sha512-Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw==",
+         "requires": {
+            "es-to-primitive": "^1.2.1",
+            "function-bind": "^1.1.1",
+            "has": "^1.0.3",
+            "has-symbols": "^1.0.1",
+            "is-callable": "^1.2.0",
+            "is-regex": "^1.1.0",
+            "object-inspect": "^1.7.0",
+            "object-keys": "^1.1.1",
+            "object.assign": "^4.1.0",
+            "string.prototype.trimend": "^1.0.1",
+            "string.prototype.trimstart": "^1.0.1"
+         }
+      },
+      "es-to-primitive": {
+         "version": "1.2.1",
+         "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
+         "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
+         "requires": {
+            "is-callable": "^1.1.4",
+            "is-date-object": "^1.0.1",
+            "is-symbol": "^1.0.2"
+         }
+      },
+      "event-target-shim": {
+         "version": "5.0.1",
+         "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz",
+         "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ=="
+      },
+      "extend": {
+         "version": "3.0.2",
+         "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
+         "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
+      },
+      "fakegato-history": {
+         "version": "0.5.6",
+         "resolved": "https://registry.npmjs.org/fakegato-history/-/fakegato-history-0.5.6.tgz",
+         "integrity": "sha512-LlsOkiw9LntVlRlBkssD5ozhEkQzYuEJUlvXk5YAgBQcWzk19PQ5g+NoKfs6SRY1qAeC1onb65hes4mCvY+JmA==",
+         "requires": {
+            "debug": "^2.2.0",
+            "googleapis": ">39.1.0",
+            "moment": "*"
+         }
+      },
+      "fast-text-encoding": {
+         "version": "1.0.3",
+         "resolved": "https://registry.npmjs.org/fast-text-encoding/-/fast-text-encoding-1.0.3.tgz",
+         "integrity": "sha512-dtm4QZH9nZtcDt8qJiOH9fcQd1NAgi+K1O2DbE6GG1PPCK/BWfOH3idCTRQ4ImXRUOyopDEgDEnVEE7Y/2Wrig=="
+      },
       "follow-redirects": {
          "version": "1.13.0",
          "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.0.tgz",
          "integrity": "sha512-aq6gF1BEKje4a9i9+5jimNFIpq4Q1WiwBToeRK5NvZBd/TRsmW8BsJfOEGkr76TbOyPVD3OVDN910EcUNtRYEA=="
       },
+      "function-bind": {
+         "version": "1.1.1",
+         "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+         "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
+      },
+      "gaxios": {
+         "version": "3.1.0",
+         "resolved": "https://registry.npmjs.org/gaxios/-/gaxios-3.1.0.tgz",
+         "integrity": "sha512-DDTn3KXVJJigtz+g0J3vhcfbDbKtAroSTxauWsdnP57sM5KZ3d2c/3D9RKFJ86s43hfw6WULg6TXYw/AYiBlpA==",
+         "requires": {
+            "abort-controller": "^3.0.0",
+            "extend": "^3.0.2",
+            "https-proxy-agent": "^5.0.0",
+            "is-stream": "^2.0.0",
+            "node-fetch": "^2.3.0"
+         }
+      },
+      "gcp-metadata": {
+         "version": "4.1.4",
+         "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-4.1.4.tgz",
+         "integrity": "sha512-5J/GIH0yWt/56R3dNaNWPGQ/zXsZOddYECfJaqxFWgrZ9HC2Kvc5vl9upOgUUHKzURjAVf2N+f6tEJiojqXUuA==",
+         "requires": {
+            "gaxios": "^3.0.0",
+            "json-bigint": "^1.0.0"
+         }
+      },
+      "google-auth-library": {
+         "version": "6.0.6",
+         "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-6.0.6.tgz",
+         "integrity": "sha512-fWYdRdg55HSJoRq9k568jJA1lrhg9i2xgfhVIMJbskUmbDpJGHsbv9l41DGhCDXM21F9Kn4kUwdysgxSYBYJUw==",
+         "requires": {
+            "arrify": "^2.0.0",
+            "base64-js": "^1.3.0",
+            "ecdsa-sig-formatter": "^1.0.11",
+            "fast-text-encoding": "^1.0.0",
+            "gaxios": "^3.0.0",
+            "gcp-metadata": "^4.1.0",
+            "gtoken": "^5.0.0",
+            "jws": "^4.0.0",
+            "lru-cache": "^6.0.0"
+         }
+      },
+      "google-p12-pem": {
+         "version": "3.0.3",
+         "resolved": "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-3.0.3.tgz",
+         "integrity": "sha512-wS0ek4ZtFx/ACKYF3JhyGe5kzH7pgiQ7J5otlumqR9psmWMYc+U9cErKlCYVYHoUaidXHdZ2xbo34kB+S+24hA==",
+         "requires": {
+            "node-forge": "^0.10.0"
+         }
+      },
+      "googleapis": {
+         "version": "59.0.0",
+         "resolved": "https://registry.npmjs.org/googleapis/-/googleapis-59.0.0.tgz",
+         "integrity": "sha512-GV/E4KRN89a4GxSk7D7cwUfRYgcJHR05sOgm/WGdwc/u8dxNXG5lWmz9gF5ZwFGk2yKtVxL4VZNn4zBuZ6rmGg==",
+         "requires": {
+            "google-auth-library": "^6.0.0",
+            "googleapis-common": "^4.4.0"
+         }
+      },
+      "googleapis-common": {
+         "version": "4.4.0",
+         "resolved": "https://registry.npmjs.org/googleapis-common/-/googleapis-common-4.4.0.tgz",
+         "integrity": "sha512-Bgrs8/1OZQFFIfVuX38L9t48rPAkVUXttZy6NzhhXxFOEMSHgfFIjxou7RIXOkBHxmx2pVwct9WjKkbnqMYImQ==",
+         "requires": {
+            "extend": "^3.0.2",
+            "gaxios": "^3.0.0",
+            "google-auth-library": "^6.0.0",
+            "qs": "^6.7.0",
+            "url-template": "^2.0.8",
+            "uuid": "^8.0.0"
+         }
+      },
+      "gtoken": {
+         "version": "5.0.3",
+         "resolved": "https://registry.npmjs.org/gtoken/-/gtoken-5.0.3.tgz",
+         "integrity": "sha512-Nyd1wZCMRc2dj/mAD0LlfQLcAO06uKdpKJXvK85SGrF5+5+Bpfil9u/2aw35ltvEHjvl0h5FMKN5knEU+9JrOg==",
+         "requires": {
+            "gaxios": "^3.0.0",
+            "google-p12-pem": "^3.0.0",
+            "jws": "^4.0.0",
+            "mime": "^2.2.0"
+         }
+      },
+      "has": {
+         "version": "1.0.3",
+         "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+         "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+         "requires": {
+            "function-bind": "^1.1.1"
+         }
+      },
+      "has-flag": {
+         "version": "4.0.0",
+         "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+         "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
+      },
+      "has-symbols": {
+         "version": "1.0.1",
+         "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz",
+         "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg=="
+      },
+      "homebridge-lib": {
+         "version": "4.7.14",
+         "resolved": "https://registry.npmjs.org/homebridge-lib/-/homebridge-lib-4.7.14.tgz",
+         "integrity": "sha512-8eUGTVrCRd7WHwEH49CgqYUu2q9WjeTVDnEA5WXL2ZvPevTMCck5GcVIXtvVWxr9we8Ay0ybFp0N5RRlrIzH/g==",
+         "requires": {
+            "bonjour": "^3.5.0",
+            "chalk": "^4.1.0",
+            "debug": "^4.1.1",
+            "semver": "^7.3.2"
+         },
+         "dependencies": {
+            "debug": {
+               "version": "4.1.1",
+               "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+               "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+               "requires": {
+                  "ms": "^2.1.1"
+               }
+            },
+            "ms": {
+               "version": "2.1.2",
+               "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+               "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+            }
+         }
+      },
+      "https-proxy-agent": {
+         "version": "5.0.0",
+         "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
+         "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
+         "requires": {
+            "agent-base": "6",
+            "debug": "4"
+         },
+         "dependencies": {
+            "debug": {
+               "version": "4.1.1",
+               "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+               "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+               "requires": {
+                  "ms": "^2.1.1"
+               }
+            },
+            "ms": {
+               "version": "2.1.2",
+               "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+               "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+            }
+         }
+      },
+      "ip": {
+         "version": "1.1.5",
+         "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz",
+         "integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo="
+      },
+      "is-arguments": {
+         "version": "1.0.4",
+         "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.0.4.tgz",
+         "integrity": "sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA=="
+      },
+      "is-callable": {
+         "version": "1.2.1",
+         "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.1.tgz",
+         "integrity": "sha512-wliAfSzx6V+6WfMOmus1xy0XvSgf/dlStkvTfq7F0g4bOIW0PSUbnyse3NhDwdyYS1ozfUtAAySqTws3z9Eqgg=="
+      },
+      "is-date-object": {
+         "version": "1.0.2",
+         "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz",
+         "integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g=="
+      },
+      "is-regex": {
+         "version": "1.1.1",
+         "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.1.tgz",
+         "integrity": "sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==",
+         "requires": {
+            "has-symbols": "^1.0.1"
+         }
+      },
+      "is-stream": {
+         "version": "2.0.0",
+         "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz",
+         "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw=="
+      },
+      "is-symbol": {
+         "version": "1.0.3",
+         "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz",
+         "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==",
+         "requires": {
+            "has-symbols": "^1.0.1"
+         }
+      },
+      "json-bigint": {
+         "version": "1.0.0",
+         "resolved": "https://registry.npmjs.org/json-bigint/-/json-bigint-1.0.0.tgz",
+         "integrity": "sha512-SiPv/8VpZuWbvLSMtTDU8hEfrZWg/mH/nV/b4o0CYbSxu1UIQPLdwKOCIyLQX+VIPO5vrLX3i8qtqFyhdPSUSQ==",
+         "requires": {
+            "bignumber.js": "^9.0.0"
+         }
+      },
+      "jwa": {
+         "version": "2.0.0",
+         "resolved": "https://registry.npmjs.org/jwa/-/jwa-2.0.0.tgz",
+         "integrity": "sha512-jrZ2Qx916EA+fq9cEAeCROWPTfCwi1IVHqT2tapuqLEVVDKFDENFw1oL+MwrTvH6msKxsd1YTDVw6uKEcsrLEA==",
+         "requires": {
+            "buffer-equal-constant-time": "1.0.1",
+            "ecdsa-sig-formatter": "1.0.11",
+            "safe-buffer": "^5.0.1"
+         }
+      },
+      "jws": {
+         "version": "4.0.0",
+         "resolved": "https://registry.npmjs.org/jws/-/jws-4.0.0.tgz",
+         "integrity": "sha512-KDncfTmOZoOMTFG4mBlG0qUIOlc03fmzH+ru6RgYVZhPkyiy/92Owlt/8UEN+a4TXR1FQetfIpJE8ApdvdVxTg==",
+         "requires": {
+            "jwa": "^2.0.0",
+            "safe-buffer": "^5.0.1"
+         }
+      },
+      "lru-cache": {
+         "version": "6.0.0",
+         "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+         "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+         "requires": {
+            "yallist": "^4.0.0"
+         }
+      },
+      "mime": {
+         "version": "2.4.6",
+         "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.6.tgz",
+         "integrity": "sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA=="
+      },
+      "moment": {
+         "version": "2.27.0",
+         "resolved": "https://registry.npmjs.org/moment/-/moment-2.27.0.tgz",
+         "integrity": "sha512-al0MUK7cpIcglMv3YF13qSgdAIqxHTO7brRtaz3DlSULbqfazqkc5kEjNrLDOM7fsjshoFIihnU8snrP7zUvhQ=="
+      },
+      "ms": {
+         "version": "2.0.0",
+         "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+         "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+      },
+      "multicast-dns": {
+         "version": "6.2.3",
+         "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.3.tgz",
+         "integrity": "sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g==",
+         "requires": {
+            "dns-packet": "^1.3.1",
+            "thunky": "^1.0.2"
+         }
+      },
+      "multicast-dns-service-types": {
+         "version": "1.1.0",
+         "resolved": "https://registry.npmjs.org/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz",
+         "integrity": "sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE="
+      },
       "node-dns-sd": {
          "version": "0.4.1",
          "resolved": "https://registry.npmjs.org/node-dns-sd/-/node-dns-sd-0.4.1.tgz",
          "integrity": "sha512-x+WSuMgvDBQv24OCq75YHcZj1SOzvP5fU4Tz+PBUiVvVBsfc+9XAHAuIftaCpf2nPLl+ys71uZoGr/v9fVDa6A=="
       },
+      "node-fetch": {
+         "version": "2.6.1",
+         "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz",
+         "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw=="
+      },
+      "node-forge": {
+         "version": "0.10.0",
+         "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.10.0.tgz",
+         "integrity": "sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA=="
+      },
+      "object-inspect": {
+         "version": "1.8.0",
+         "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.8.0.tgz",
+         "integrity": "sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA=="
+      },
+      "object-is": {
+         "version": "1.1.2",
+         "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.2.tgz",
+         "integrity": "sha512-5lHCz+0uufF6wZ7CRFWJN3hp8Jqblpgve06U5CMQ3f//6iDjPr2PEo9MWCjEssDsa+UZEL4PkFpr+BMop6aKzQ==",
+         "requires": {
+            "define-properties": "^1.1.3",
+            "es-abstract": "^1.17.5"
+         }
+      },
+      "object-keys": {
+         "version": "1.1.1",
+         "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+         "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="
+      },
+      "object.assign": {
+         "version": "4.1.0",
+         "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz",
+         "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==",
+         "requires": {
+            "define-properties": "^1.1.2",
+            "function-bind": "^1.1.1",
+            "has-symbols": "^1.0.0",
+            "object-keys": "^1.0.11"
+         }
+      },
+      "qs": {
+         "version": "6.9.4",
+         "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.4.tgz",
+         "integrity": "sha512-A1kFqHekCTM7cz0udomYUoYNWjBebHm/5wzU/XqrBRBNWectVH0QIiN+NEcZ0Dte5hvzHwbr8+XQmguPhJ6WdQ=="
+      },
+      "regexp.prototype.flags": {
+         "version": "1.3.0",
+         "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz",
+         "integrity": "sha512-2+Q0C5g951OlYlJz6yu5/M33IcsESLlLfsyIaLJaG4FA2r4yP8MvVMJUUP/fVBkSpbbbZlS5gynbEWLipiiXiQ==",
+         "requires": {
+            "define-properties": "^1.1.3",
+            "es-abstract": "^1.17.0-next.1"
+         }
+      },
+      "safe-buffer": {
+         "version": "5.2.1",
+         "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+         "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
+      },
+      "semver": {
+         "version": "7.3.2",
+         "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz",
+         "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ=="
+      },
+      "string.prototype.trimend": {
+         "version": "1.0.1",
+         "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz",
+         "integrity": "sha512-LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g==",
+         "requires": {
+            "define-properties": "^1.1.3",
+            "es-abstract": "^1.17.5"
+         }
+      },
+      "string.prototype.trimstart": {
+         "version": "1.0.1",
+         "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz",
+         "integrity": "sha512-XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw==",
+         "requires": {
+            "define-properties": "^1.1.3",
+            "es-abstract": "^1.17.5"
+         }
+      },
+      "supports-color": {
+         "version": "7.2.0",
+         "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+         "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+         "requires": {
+            "has-flag": "^4.0.0"
+         }
+      },
+      "thunky": {
+         "version": "1.1.0",
+         "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz",
+         "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA=="
+      },
+      "url-template": {
+         "version": "2.0.8",
+         "resolved": "https://registry.npmjs.org/url-template/-/url-template-2.0.8.tgz",
+         "integrity": "sha1-/FZaPMy/93MMd19WQflVV5FDnyE="
+      },
+      "uuid": {
+         "version": "8.3.0",
+         "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.0.tgz",
+         "integrity": "sha512-fX6Z5o4m6XsXBdli9g7DtWgAx+osMsRRZFKma1mIUsLCz6vRvv+pz5VNbyu9UEDzpMWulZfvpgb/cmDXVulYFQ=="
+      },
       "ws": {
          "version": "7.3.1",
          "resolved": "https://registry.npmjs.org/ws/-/ws-7.3.1.tgz",
          "integrity": "sha512-D3RuNkynyHmEJIpD2qrgVkc9DQ23OrN/moAwZX4L8DfvszsJxpjQuUq3LMx6HoYji9fbIOBY18XWBsAux1ZZUA=="
+      },
+      "yallist": {
+         "version": "4.0.0",
+         "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+         "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
       }
    }
 }
diff --git a/package.json b/package.json
index 7e070066..21d8fd47 100644
--- a/package.json
+++ b/package.json
@@ -45,6 +45,8 @@
    "dependencies": {
       "axios": "0.20.0",
       "color-convert": "2.0.1",
+      "fakegato-history": "0.5.6",
+      "homebridge-lib": "4.7.14",
       "node-dns-sd": "0.4.1",
       "ws": "7.3.1"
    },

From 5cba7192f8d496cb90dd92469a8ac19053532f1d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 11 Sep 2020 00:08:01 +0100
Subject: [PATCH 0109/3183] code formatting

---
 lib/eWeLinkHTTP.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/lib/eWeLinkHTTP.js b/lib/eWeLinkHTTP.js
index f7701ed7..4756c48b 100644
--- a/lib/eWeLinkHTTP.js
+++ b/lib/eWeLinkHTTP.js
@@ -145,9 +145,7 @@ module.exports = class eWeLinkHTTP {
             }
             let deviceList = [];
             if (body.data.thingList && body.data.thingList.length > 0) {
-               body.data.thingList.forEach(device => {
-                  deviceList.push(device.itemData);
-               });
+               body.data.thingList.forEach(device => deviceList.push(device.itemData));
             }
             resolve(deviceList);
          }).catch(err => {

From c549111b91770a41e9325c496aeee167b39c1ffb Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 11 Sep 2020 00:09:32 +0100
Subject: [PATCH 0110/3183] eve readings

---
 lib/eWeLink.js | 64 ++++++++++++++++++++++++++++++++++----------------
 1 file changed, 44 insertions(+), 20 deletions(-)

diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index a5e87086..55212147 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -5,7 +5,9 @@ const convert = require("color-convert");
 const eWeLinkHTTP = require("./eWeLinkHTTP");
 const eWeLinkWS = require("./eWeLinkWS");
 const eWeLinkLAN = require("./eWeLinkLAN");
-let Accessory, Service, Characteristic, UUIDGen;
+const fakegato = require("fakegato-history");
+const hbLib = require("homebridge-lib");
+let Accessory, Characteristic, EveService, EveHistoryService, Service, UUIDGen;
 class eWeLink {
    constructor(log, config, api) {
       if (!log || !api) {
@@ -299,6 +301,11 @@ class eWeLink {
                }
                break;
             case "outlet":
+               accessory.addService(Service.Outlet);
+               accessory.getService(Service.Outlet).addCharacteristic(EveService.Characteristics.Voltage);
+               accessory.getService(Service.Outlet).addCharacteristic(EveService.Characteristics.CurrentConsumption);
+               accessory.getService(Service.Outlet).addCharacteristic(EveService.Characteristics.ElectricCurrent);
+               break;
             case "usb":
                accessory.addService(Service.Outlet);
                break;
@@ -541,85 +548,89 @@ class eWeLink {
    refreshAccessory(accessory, newParams) {
       switch (accessory.context.type) {
          case "valve":
-            if (Array.isArray(newParams.switches)) {
+            if (Object.keys(newParams).some(v => cns.devicesValveParams.includes(v)) && Array.isArray(newParams.switches)) {
                this.externalValveUpdate(accessory, newParams);
             }
             return true;
          case "blind":
-            if (Array.isArray(newParams.switches)) {
+            if (Object.keys(newParams).some(v => cns.devicesBlindParams.includes(v)) && Array.isArray(newParams.switches)) {
                this.externalBlindUpdate(accessory, newParams);
             }
             return true;
          case "garage":
-            if (newParams.hasOwnProperty("switch") || Array.isArray(newParams.switches)) {
+            if (Object.keys(newParams).some(v => cns.devicesGarageParams.includes(v)) && Array.isArray(newParams.switches)) {
                this.externalGarageUpdate(accessory, newParams);
             }
             return true;
          case "lock":
-            if (newParams.hasOwnProperty("switch")) {
+            if (Object.keys(newParams).some(v => cns.devicesLockParams.includes(v))) {
                this.externalLockUpdate(accessory, newParams);
             }
             return true;
          case "sensor":
-            if (newParams.hasOwnProperty("switch")) {
+            if (Object.keys(newParams).some(v => cns.devicesSensorParams.includes(v))) {
                this.externalSensorUpdate(accessory, newParams);
             }
             return true;
          case "fan":
-            if (Array.isArray(newParams.switches) || (newParams.hasOwnProperty("light") && newParams.hasOwnProperty("fan") && newParams.hasOwnProperty("speed"))) {
+            if (Object.keys(newParams).some(v => cns.devicesFanParams.includes(v))) {
                this.externalFanUpdate(accessory, newParams);
             }
             return true;
          case "thermostat":
-            if (newParams.hasOwnProperty("currentTemperature") || newParams.hasOwnProperty("currentHumidity") || newParams.hasOwnProperty("switch") || newParams.hasOwnProperty("masterSwitch")) {
+            if (Object.keys(newParams).some(v => cns.devicesThermostatParams.includes(v))) {
                this.externalThermostatUpdate(accessory, newParams);
             }
             return true;
          case "outlet":
-            if (newParams.hasOwnProperty("switch")) {
+            if (Object.keys(newParams).some(v => cns.devicesOutletParams.includes(v))) {
                this.externalOutletUpdate(accessory, newParams);
             }
             return true;
          case "usb":
-            if (Array.isArray(newParams.switches)) {
+            if (Object.keys(newParams).some(v => cns.devicesUSBParams.includes(v)) && Array.isArray(newParams.switches)) {
                this.externalUSBUpdate(accessory, newParams);
             }
             return true;
          case "scm":
-            if (Array.isArray(newParams.switches)) {
+            if (Object.keys(newParams).some(v => cns.devicesSCMParams.includes(v)) && Array.isArray(newParams.switches)) {
                this.externalSCMUpdate(accessory, newParams);
             }
             return true;
          case "light":
             if (cns.devicesSingleSwitch.includes(accessory.context.eweUIID) && cns.devicesSingleSwitchLight.includes(accessory.context.eweModel)) {
-               if (newParams.hasOwnProperty("switch") || newParams.hasOwnProperty("state") || newParams.hasOwnProperty("bright") || newParams.hasOwnProperty("colorR") || newParams.hasOwnProperty("brightness") || newParams.hasOwnProperty("channel0") || newParams.hasOwnProperty("channel2") || newParams.hasOwnProperty("zyx_mode")) {
+               if (Object.keys(newParams).some(v => cns.devicesSingleSwitchLightParams.includes(v))) {
                   this.externalSingleLightUpdate(accessory, newParams);
                }
             } else if (cns.devicesMultiSwitch.includes(accessory.context.eweUIID) && cns.devicesMultiSwitchLight.includes(accessory.context.eweModel)) {
-               if (Array.isArray(newParams.switches)) {
+               if (Object.keys(newParams).some(v => cns.devicesMultiSwitchLightParams.includes(v)) && Array.isArray(newParams.switches)) {
                   this.externalMultiLightUpdate(accessory, newParams);
                }
             }
             return true;
          case "switch":
             if (cns.devicesSingleSwitch.includes(accessory.context.eweUIID)) {
-               if (newParams.hasOwnProperty("switch")) {
+               if (Object.keys(newParams).some(v => cns.devicesSingleSwitchParams.includes(v))) {
                   this.externalSingleSwitchUpdate(accessory, newParams);
                }
             } else if (cns.devicesMultiSwitch.includes(accessory.context.eweUIID)) {
-               if (Array.isArray(newParams.switches)) {
+               if (Object.keys(newParams).some(v => cns.devicesMultiSwitchParams.includes(v)) && Array.isArray(newParams.switches)) {
                   this.externalMultiSwitchUpdate(accessory, newParams);
                }
             }
             return true;
          case "rf_pri":
-            this.externalRFDeviceUpdate(accessory, newParams);
+            if (Object.keys(newParams).some(v => cns.devicesRFBridgeParams.includes(v))) {
+               this.externalRFDeviceUpdate(accessory, newParams);
+            }
             return true;
          case "rf_sub":
          case "zb_pri":
             return true;
          case "zb_sub":
-            this.externalZBDeviceUpdate(accessory, newParams);
+            if (Object.keys(newParams).some(v => cns.devicesZBBridgeParams.includes(v))) {
+               this.externalZBDeviceUpdate(accessory, newParams);
+            }
             return true;
          default:
             return false;
@@ -988,7 +999,7 @@ class eWeLink {
          if (this.config.debug) {
             this.log("[%s] requesting to turn [%s].", accessory.displayName, value ? "on" : "off");
          }
-         accessory.getService(Service.Outlet).updateCharacteristic(Characteristic.On, value);
+         accessory.getService(Outlet).updateCharacteristic(Characteristic.On, value);
          this.sendDeviceUpdate(accessory, params, callback);
       } catch (err) {
          callback("[" + accessory.displayName + "] " + err + ".");
@@ -1525,7 +1536,18 @@ class eWeLink {
    }
    externalOutletUpdate(accessory, params) {
       try {
-         accessory.getService(Service.Outlet).updateCharacteristic(Characteristic.On, params.switch === "on");
+         if (params.hasOwnProperty("switch")) {
+            accessory.getService(Service.Outlet).updateCharacteristic(Characteristic.On, params.switch === "on");
+         }
+         if (params.hasOwnProperty("power")) {
+            accessory.getService(Service.Outlet).updateCharacteristic(EveService.Characteristics.CurrentConsumption, parseFloat(params.power));
+         }
+         if (params.hasOwnProperty("voltage")) {
+            accessory.getService(Service.Outlet).updateCharacteristic(EveService.Characteristics.Voltage, parseFloat(params.voltage));
+         }
+         if (params.hasOwnProperty("current")) {
+            accessory.getService(Service.Outlet).updateCharacteristic(EveService.Characteristics.ElectricCurrent, parseFloat(params.current));
+         }
       } catch (err) {
          this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
       }
@@ -1773,8 +1795,10 @@ class eWeLink {
 }
 module.exports = function(homebridge) {
    Accessory = homebridge.platformAccessory;
-   Service = homebridge.hap.Service;
    Characteristic = homebridge.hap.Characteristic;
+   EveService = new hbLib.EveHomeKitTypes(homebridge);
+   EveHistoryService = fakegato(homebridge);
+   Service = homebridge.hap.Service;
    UUIDGen = homebridge.hap.uuid;
    return eWeLink;
 };
\ No newline at end of file

From 671a970241975eebbc970de85ed3c2699d77d5e1 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 11 Sep 2020 00:12:23 +0100
Subject: [PATCH 0111/3183] 2.26.0-0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 0e0ca51e..873013f6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
    "name": "homebridge-ewelink",
-   "version": "2.25.2",
+   "version": "2.26.0-0",
    "lockfileVersion": 1,
    "requires": true,
    "dependencies": {
diff --git a/package.json b/package.json
index 21d8fd47..06f177bb 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
    "name": "homebridge-ewelink",
-   "version": "2.25.2",
+   "version": "2.26.0-0",
    "author": "bwp91",
    "contributors": [
       "gbro115",

From 74aeae4a564420da4f963b6e1f0a64c665860f88 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 11 Sep 2020 00:22:59 +0100
Subject: [PATCH 0112/3183] outlet type line 1001

---
 lib/eWeLink.js | 26 ++++++++------------------
 1 file changed, 8 insertions(+), 18 deletions(-)

diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index 55212147..9db0619b 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -30,9 +30,8 @@ class eWeLink {
             //*** Set up HTTP client and get the user HTTP host ***\\
             this.httpClient = new eWeLinkHTTP(this.config, this.log);
             this.httpClient.getHost()
-               .then(res => { //*** Use the HTTP API host to log into eWeLink ***\\
-                  return this.httpClient.login();
-               }).then(res => { //*** Set up the web socket client ***\\
+               .then(() => this.httpClient.login())
+               .then(res => { //*** Set up the web socket client ***\\
                   this.wsClient = new eWeLinkWS(this.config, this.log, res);
                   return this.wsClient.getHost();
                }).then(() => { //*** Open web socket connection and get device list via HTTP ***\\
@@ -999,7 +998,7 @@ class eWeLink {
          if (this.config.debug) {
             this.log("[%s] requesting to turn [%s].", accessory.displayName, value ? "on" : "off");
          }
-         accessory.getService(Outlet).updateCharacteristic(Characteristic.On, value);
+         accessory.getService(Service.Outlet).updateCharacteristic(Characteristic.On, value);
          this.sendDeviceUpdate(accessory, params, callback);
       } catch (err) {
          callback("[" + accessory.displayName + "] " + err + ".");
@@ -1141,9 +1140,7 @@ class eWeLink {
          if (this.config.debug) {
             this.log("[%s] updating brightness to [%s%].", accessory.displayName, value);
          }
-         setTimeout(() => {
-            this.sendDeviceUpdate(accessory, params, callback);
-         }, 250);
+         setTimeout(() => this.sendDeviceUpdate(accessory, params, callback), 250);
       } catch (err) {
          let str = "[" + accessory.displayName + "] could not be updated as " + err + ".";
          this.log.error(str);
@@ -1219,9 +1216,7 @@ class eWeLink {
             default:
                throw "unknown device UIID";
          }
-         setTimeout(() => {
-            this.sendDeviceUpdate(accessory, params, callback);
-         }, 250);
+         setTimeout(() => this.sendDeviceUpdate(accessory, params, callback), 250);
       } catch (err) {
          let str = "[" + accessory.displayName + "] could not be updated as " + err + ".";
          this.log.error(str);
@@ -1331,9 +1326,7 @@ class eWeLink {
          }
          accessory.getService(accessory.context.rfChls[rfChl]).updateCharacteristic(Characteristic.On, true);
          this.sendDeviceUpdate(accessory, params, callback);
-         setTimeout(() => {
-            accessory.getService(accessory.context.rfChls[rfChl]).updateCharacteristic(Characteristic.On, false);
-         }, 3000);
+         setTimeout(() => accessory.getService(accessory.context.rfChls[rfChl]).updateCharacteristic(Characteristic.On, false), 3000);
       } catch (err) {
          let str = "[" + accessory.displayName + " " + name + "] could not be updated as " + err + ".";
          this.log.error(str);
@@ -1409,8 +1402,7 @@ class eWeLink {
                .updateCharacteristic(Characteristic.CurrentDoorState, newPos)
                .updateCharacteristic(Characteristic.TargetDoorState, newPos - 2);
             setTimeout(() => {
-               accessory.getService(Service.GarageDoorOpener)
-                  .updateCharacteristic(Characteristic.CurrentDoorState, newPos - 2);
+               accessory.getService(Service.GarageDoorOpener).updateCharacteristic(Characteristic.CurrentDoorState, newPos - 2);
             }, parseInt(garageConfig.operationTime) * 100);
          }
          setTimeout(() => {
@@ -1684,9 +1676,7 @@ class eWeLink {
             let bAccessory;
             if ((bAccessory = this.devicesInHB.get(idToCheck + accessory.context.rfChlMap[params.rfChl]))) {
                bAccessory.getService(bAccessory.context.rfChls[params.rfChl]).updateCharacteristic(Characteristic.On, 1);
-               setTimeout(() => {
-                  bAccessory.getService(bAccessory.context.rfChls[params.rfChl]).updateCharacteristic(Characteristic.On, 0);
-               }, 3000);
+               setTimeout(() => bAccessory.getService(bAccessory.context.rfChls[params.rfChl]).updateCharacteristic(Characteristic.On, 0), 3000);
             } else {
                throw "rf button not found in Homebridge";
             }

From bb1eb3cfc2b6077f8f05891c737a742c513202f8 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 11 Sep 2020 14:08:18 +0100
Subject: [PATCH 0113/3183] Update index.js

---
 index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.js b/index.js
index 624be64e..4902dd17 100644
--- a/index.js
+++ b/index.js
@@ -1,6 +1,6 @@
 /* jshint esversion: 9, -W030, node: true */
 "use strict";
 module.exports = function (homebridge) {
-   let eWeLink = require("./lib/eWeLink.js")(homebridge);
+   const eWeLink = require("./lib/eWeLink.js")(homebridge);
    homebridge.registerPlatform("homebridge-ewelink", "eWeLink", eWeLink, true);
 };
\ No newline at end of file

From c967ba8b677a3476a04f33b8cd0baf2758a0a257 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 11 Sep 2020 14:09:13 +0100
Subject: [PATCH 0114/3183] refactoring

---
 lib/eWeLink.js | 182 ++++++++++++++++++++++++++-----------------------
 1 file changed, 98 insertions(+), 84 deletions(-)

diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index 9db0619b..b5c6ff68 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -1,20 +1,20 @@
 /* jshint esversion: 9, -W030, node: true */
 "use strict";
-const cns = require("./constants");
-const convert = require("color-convert");
-const eWeLinkHTTP = require("./eWeLinkHTTP");
-const eWeLinkWS = require("./eWeLinkWS");
-const eWeLinkLAN = require("./eWeLinkLAN");
-const fakegato = require("fakegato-history");
-const hbLib = require("homebridge-lib");
 let Accessory, Characteristic, EveService, EveHistoryService, Service, UUIDGen;
+const cns = require("./constants"),
+   convert = require("color-convert"),
+   eWeLinkHTTP = require("./eWeLinkHTTP"),
+   eWeLinkWS = require("./eWeLinkWS"),
+   eWeLinkLAN = require("./eWeLinkLAN"),
+   fakegato = require("fakegato-history"),
+   hbLib = require("homebridge-lib");
 class eWeLink {
    constructor(log, config, api) {
-      if (!log || !api) {
-         return;
-      }
-      if (!config || (!config.username || !config.password || !config.countryCode)) {
-         log.error("🔴  Cannot load homebridge-ewelink - please check your eWeLink credentials in the plugin settings.");
+      if (!log || !api || !config) return;
+      if (!config.username || !config.password || !config.countryCode) {
+         log.error("************** Cannot load homebridge-ewelink **************");
+         log.error("Your eWeLink credentials missing from the Homebridge config.");
+         log.error("************************************************************");
          return;
       }
       this.log = log;
@@ -24,6 +24,7 @@ class eWeLink {
       this.devicesInEwe = new Map();
       this.cusG = new Map();
       this.cusS = new Map();
+      this.eveLogPath = this.api.user.persistPath() + "/homebridge-ewelink";
       this.api
          .on("didFinishLaunching", () => {
             this.log("Plugin has finished initialising. Starting synchronisation with eWeLink account.");
@@ -40,10 +41,9 @@ class eWeLink {
                }).then(res => { //*** Get device IP addresses for LAN mode ***\\
                   this.httpDevices = res
                      .filter(device => device.hasOwnProperty("extra") && device.extra.hasOwnProperty("uiid"))
-                     .filter(device => !(this.config.hideDevFromHB || "").includes(device.deviceid))
-                     .forEach(device => this.devicesInEwe.set(device.deviceid, device));
-                  this.httpDevices = res;
+                     .filter(device => !(this.config.hideDevFromHB || "").includes(device.deviceid));
                   this.lanClient = new eWeLinkLAN(this.config, this.log, this.httpDevices);
+                  this.httpDevices.forEach(device => this.devicesInEwe.set(device.deviceid, device));
                   return this.lanClient.getHosts();
                }).then(res => { //*** Set up the LAN mode listener ***\\
                   this.lanDevices = res.map;
@@ -55,14 +55,16 @@ class eWeLink {
                      if (Object.keys(this.httpDevices).length === 0 && Object.keys(this.lanDevices).length === 0) {
                         Array.from(this.devicesInHB.values()).forEach(a => this.removeAccessory(a));
                         this.devicesInHB.clear();
-                        this.log.warn("🟠  No devices were found registered to your eWeLink account so disabling plugin.");
+                        this.log.warn("******* Not loading homebridge-ewelink *******");
+                        this.log.warn("No devices were found in your eWeLink account.");
+                        this.log.warn("**********************************************");
                         return;
                      }
                      //*** Make a map of custom groups from Homebridge config ***\\
                      if (Object.keys(this.config.groups || []).length > 0) {
                         this.config.groups
-                           .filter(g => g.hasOwnProperty("deviceId") && this.devicesInEwe.has(g.deviceId.toLowerCase()))
                            .filter(g => g.hasOwnProperty("type") && cns.allowedGroups.includes(g.type))
+                           .filter(g => g.hasOwnProperty("deviceId") && this.devicesInEwe.has(g.deviceId.toLowerCase()))
                            .forEach(g => this.cusG.set(g.deviceId + "SWX", g));
                      }
                      //*** Make a map of RF Bridge custom sensors from Homebridge config ***\\
@@ -76,42 +78,35 @@ class eWeLink {
                      this.log("[%s] primary devices were loaded from your eWeLink account.", this.devicesInEwe.size);
                      this.log("[%s] primary devices were discovered on your local network.", this.lanDevicesOnline);
                      //*** Remove Homebridge accessories that don't appear in eWeLink ***\\
-                     this.devicesInHB.forEach(accessory => {
-                        if (!this.devicesInEwe.has(accessory.context.eweDeviceId)) {
-                           this.removeAccessory(accessory);
+                     this.devicesInHB.forEach(a => {
+                        if (!this.devicesInEwe.has(a.context.eweDeviceId)) {
+                           this.removeAccessory(a);
                         }
                      });
                      //*** Synchronise devices between eWeLink and Homebridge and set up ws/lan listeners ***\\
-                     this.devicesInEwe.forEach(device => this.initialiseDevice(device));
-                     this.wsClient.receiveUpdate(device => this.receiveDeviceUpdate(device));
-                     this.lanClient.receiveUpdate(device => this.receiveDeviceUpdate(device));
-                     this.log("🟢  eWeLink setup complete. If you're enjoying this package please consider a ⭐️  on GitHub!");
+                     this.devicesInEwe.forEach(d => this.initialiseDevice(d));
+                     this.wsClient.receiveUpdate(d => this.receiveDeviceUpdate(d));
+                     this.lanClient.receiveUpdate(d => this.receiveDeviceUpdate(d));
+                     this.log("eWeLink setup complete. If you're enjoying this package please consider a ⭐️  on GitHub :).");
                      if (this.config.debugReqRes) {
                         this.log.warn("You have 'Request & Response Logging' enabled. This setting is not recommended for long-term use.");
                      }
                   })();
                }).catch(err => {
-                  this.log.error("🔴  Cannot load homebridge-ewelink - %s", err);
-                  if (this.lanClient) {
-                     this.lanClient.closeConnection();
-                  }
-                  if (this.wsClient) {
-                     this.wsClient.closeConnection();
-                  }
+                  this.log.error("************** Cannot load homebridge-ewelink **************");
+                  this.log.error(err);
+                  this.log.error("************************************************************");
+                  if (this.lanClient) this.lanClient.closeConnection();
+                  if (this.wsClient) this.wsClient.closeConnection();
                });
          })
          .on('shutdown', () => {
-            if (this.lanClient) {
-               this.lanClient.closeConnection();
-            }
-            if (this.wsClient) {
-               this.wsClient.closeConnection();
-            }
+            if (this.lanClient) this.lanClient.closeConnection();
+            if (this.wsClient) this.wsClient.closeConnection();
          });
    }
    initialiseDevice(device) {
       let accessory;
-      device.params.updateSource = "HTTP";
       //*** First add the device if it isn't already in Homebridge. Yeah this code looks a mess :| ***\\
       if (!this.devicesInHB.has(device.deviceid + "SWX") && !this.devicesInHB.has(device.deviceid + "SW0")) {
          if (device.extra.uiid === 2 && device.brandName === "coolkit" && device.productModel === "0285") {
@@ -170,8 +165,9 @@ class eWeLink {
          let isX = accessory.context.hbDeviceId.substr(-1) === "X",
             isRfBridge = cns.devicesRFBridge.includes(accessory.context.eweUIID),
             rfBridgeChange = false;
-         accessory.getService(Service.AccessoryInformation).setCharacteristic(Characteristic.FirmwareRevision, device.params.fwVersion);
-         accessory.context.reachableWAN = accessory.context.eweUIID !== 102 ? device.online : true; //*** DW2 ***\\
+         accessory.getService(Service.AccessoryInformation)
+            .setCharacteristic(Characteristic.FirmwareRevision, device.params.fwVersion);
+         accessory.context.reachableWAN = accessory.context.eweUIID !== 102 ? device.online : true;
          accessory.context.reachableLAN = this.lanDevices.get(device.deviceid).online || false;
          accessory.context.inUse = false;
          let str = accessory.context.reachableLAN ?
@@ -197,11 +193,10 @@ class eWeLink {
                }
                if (isRfBridge && oAccessory.context.sensorType !== "button") {
                   let ct = this.cusS.has(oAccessory.context.hbDeviceId) ? this.cusS.get(oAccessory.context.hbDeviceId).type : "motion";
-                  if (ct !== oAccessory.context.sensorType || typeof accessory.context.updated === "undefined") {
-                     rfBridgeChange = true;
-                  }
+                  if (ct !== oAccessory.context.sensorType) rfBridgeChange = true;
                }
-               oAccessory.getService(Service.AccessoryInformation).setCharacteristic(Characteristic.FirmwareRevision, device.params.fwVersion);
+               oAccessory.getService(Service.AccessoryInformation)
+                  .setCharacteristic(Characteristic.FirmwareRevision, device.params.fwVersion);
                oAccessory.context.reachableWAN = device.online;
                oAccessory.context.reachableLAN = this.lanDevices.get(device.deviceid).online || false;
                this.devicesInHB.set(oAccessory.context.hbDeviceId, oAccessory);
@@ -224,13 +219,15 @@ class eWeLink {
       }
    }
    addAccessory(device, hbDeviceId, type) {
-      let channelCount = type === "rf_pri" ? Object.keys((device.tags && device.tags.zyx_info) || []).length : cns.chansFromUiid[device.extra.uiid],
-         switchNumber = hbDeviceId.substr(-1).toString(),
-         newDeviceName = type === "rf_sub" ? device.tags.zyx_info[switchNumber - 1].name : device.name;
+      let switchNumber = hbDeviceId.substr(-1).toString(),
+         newDeviceName = type === "rf_sub" ? device.tags.zyx_info[switchNumber - 1].name : device.name,
+         channelCount = type === "rf_pri" ?
+         Object.keys((device.tags && device.tags.zyx_info) || []).length :
+         cns.chansFromUiid[device.extra.uiid];
       if (["1", "2", "3", "4"].includes(switchNumber) && type !== "rf_sub") {
          newDeviceName += " SW" + switchNumber;
          if ((this.config.hideFromHB || "").includes(hbDeviceId) && cns.devicesHideable.includes(type)) {
-            this.log.warn("[%s] will not be added as per configuration.", newDeviceName);
+            this.log("[%s] will not be added as per configuration.", newDeviceName);
             return;
          }
       }
@@ -291,18 +288,15 @@ class eWeLink {
                accessory.addService(Service.Lightbulb);
                break;
             case "thermostat":
-               if (!this.config.hideTHSwitch) {
-                  accessory.addService(Service.Switch);
-               }
+               if (!this.config.hideTHSwitch) accessory.addService(Service.Switch);
                accessory.addService(Service.TemperatureSensor);
-               if (device.params.sensorType !== "DS18B20") {
-                  accessory.addService(Service.HumiditySensor);
-               }
+               if (device.params.sensorType !== "DS18B20") accessory.addService(Service.HumiditySensor);
                break;
             case "outlet":
                accessory.addService(Service.Outlet);
                accessory.getService(Service.Outlet).addCharacteristic(EveService.Characteristics.Voltage);
                accessory.getService(Service.Outlet).addCharacteristic(EveService.Characteristics.CurrentConsumption);
+               accessory.getService(Service.Outlet).addCharacteristic(EveService.Characteristics.TotalConsumption);
                accessory.getService(Service.Outlet).addCharacteristic(EveService.Characteristics.ElectricCurrent);
                break;
             case "usb":
@@ -317,7 +311,6 @@ class eWeLink {
                break;
             case "rf_pri":
                accessory.context.rfChlMap = {};
-               accessory.context.updated = true;
                break;
             case "zb_pri":
                break;
@@ -334,20 +327,20 @@ class eWeLink {
                      accessory.context.sensorType = this.cusS.has(hbDeviceId) ? this.cusS.get(hbDeviceId).type : "motion";
                      break;
                   default:
-                     throw "RF device type is not supported";
+                     throw "unsupported rf device type [" + device.tags.zyx_info[parseInt(switchNumber) - 1].remote_type + "]. Please create an issue on GitHub";
                }
                let mAccessory = this.devicesInHB.get(device.deviceid + "SW0");
                device.tags.zyx_info[parseInt(switchNumber) - 1].buttonName.forEach(button => {
-                  let rfChan, name;
-                  Object.entries(button).forEach(([k, v]) => {
-                     rfChan = k;
-                     name = v;
+                  let rfData;
+                  Object.entries(button).forEach(([k, v]) => rfData = {
+                     rfChan: k,
+                     name: v
                   });
-                  accessory.context.rfChls[rfChan] = name;
-                  mAccessory.context.rfChlMap[rfChan] = switchNumber;
+                  accessory.context.rfChls[rfData.rfChan] = rfData.name;
+                  mAccessory.context.rfChlMap[rfData.rfChan] = switchNumber;
                   switch (accessory.context.sensorType) {
                      case "button":
-                        accessory.addService(Service.Switch, name, "switch" + rfChan);
+                        accessory.addService(Service.Switch, rfData.name, "switch" + rfData.rfChan);
                         break;
                      case "water":
                         accessory.addService(Service.LeakSensor);
@@ -413,19 +406,15 @@ class eWeLink {
       }
    }
    configureAccessory(accessory) {
-      if (!this.log) {
-         return;
-      }
+      if (!this.log) return;
       try {
+         accessory.context.reachableWAN = true;
+         accessory.context.reachableLAN = true;
          switch (accessory.context.type) {
             case "valve":
                ["A", "B"].forEach(v => {
                   accessory.getService("Valve " + v).getCharacteristic(Characteristic.Active)
-                     .on("set", (value, callback) => {
-                        accessory.getService("Valve " + v).getCharacteristic(Characteristic.Active).value !== value ?
-                           this.internalValveUpdate(accessory, "Valve " + v, value, callback) :
-                           callback();
-                     });
+                     .on("set", (value, callback) => this.internalValveUpdate(accessory, "Valve " + v, value, callback));
                   accessory.getService("Valve " + v).getCharacteristic(Characteristic.SetDuration)
                      .on("set", (value, callback) => {
                         if (accessory.getService("Valve " + v).getCharacteristic(Characteristic.InUse).value) {
@@ -433,7 +422,7 @@ class eWeLink {
                            clearTimeout(accessory.getService("Valve " + v).timer);
                            accessory.getService("Valve " + v).timer = setTimeout(() => {
                               accessory.getService("Valve " + v).setCharacteristic(Characteristic.Active, 0);
-                           }, (value * 1000));
+                           }, value * 1000);
                         }
                         callback();
                      });
@@ -441,10 +430,10 @@ class eWeLink {
                break;
             case "blind":
                accessory.getService(Service.WindowCovering).getCharacteristic(Characteristic.TargetPosition)
+                  .on("set", (value, callback) => this.internalBlindUpdate(accessory, value, callback))
                   .setProps({
                      minStep: 100
-                  })
-                  .on("set", (value, callback) => this.internalBlindUpdate(accessory, value, callback));
+                  });
                break;
             case "garage":
                accessory.getService(Service.GarageDoorOpener).getCharacteristic(Characteristic.TargetDoorState)
@@ -458,10 +447,10 @@ class eWeLink {
                accessory.getService(Service.Fanv2).getCharacteristic(Characteristic.Active)
                   .on("set", (value, callback) => this.internalFanUpdate(accessory, "power", value, callback));
                accessory.getService(Service.Fanv2).getCharacteristic(Characteristic.RotationSpeed)
+                  .on("set", (value, callback) => this.internalFanUpdate(accessory, "speed", value, callback))
                   .setProps({
                      minStep: 33
-                  })
-                  .on("set", (value, callback) => this.internalFanUpdate(accessory, "speed", value, callback));
+                  });
                accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On)
                   .on("set", (value, callback) => this.internalFanUpdate(accessory, "light", value, callback));
                break;
@@ -474,6 +463,12 @@ class eWeLink {
             case "outlet":
                accessory.getService(Service.Outlet).getCharacteristic(Characteristic.On)
                   .on("set", (value, callback) => this.internalOutletUpdate(accessory, value, callback));
+               accessory.log = this.log;
+               accessory.eveLogger = new EveHistoryService("energy", accessory, {
+                  storage: "fs",
+                  path: this.eveLogPath
+               });
+               accessory.context.totalEnergyTemp = 0;
                break;
             case "usb":
                accessory.getService(Service.Outlet).getCharacteristic(Characteristic.On)
@@ -537,8 +532,6 @@ class eWeLink {
                }
                break;
          }
-         accessory.context.reachableWAN = true;
-         accessory.context.reachableLAN = true;
          this.devicesInHB.set(accessory.context.hbDeviceId, accessory);
       } catch (err) {
          this.log.warn("[%s] could not be refreshed as %s.", accessory.displayName, err);
@@ -683,9 +676,7 @@ class eWeLink {
                      accessory.context.reachableWAN = device.params.online;
                      this.log("[%s] has been reported [%s] via [WS].", accessory.displayName, accessory.context.reachableWAN ? "online" : "offline");
                      this.devicesInHB.set(accessory.context.hbDeviceId, accessory);
-                     if (accessory.context.reachableWAN) {
-                        this.wsClient.requestUpdate(accessory);
-                     }
+                     if (accessory.context.reachableWAN) this.wsClient.requestUpdate(accessory);
                   } else {
                      if (this.debug) {
                         this.log("[%s] Nothing to update from above WS message.", accessory.displayName);
@@ -1533,6 +1524,31 @@ class eWeLink {
          }
          if (params.hasOwnProperty("power")) {
             accessory.getService(Service.Outlet).updateCharacteristic(EveService.Characteristics.CurrentConsumption, parseFloat(params.power));
+            accessory.getService(Service.Outlet).updateCharacteristic(Characteristic.OutletInUse, parseFloat(params.power) > 0);
+            if (accessory.eveLogger.isHistoryLoaded()) {
+               let extraPersistedData = accessory.eveLogger.getExtraPersistedData();
+               if (extraPersistedData !== undefined) {
+                  let totalEnergy = extraPersistedData.totalenergy + accessory.context.totalEnergyTemp + parseFloat(params.power) * (30000 / 1000) / 3600 / 1000;
+                  accessory.eveLogger.setExtraPersistedData({
+                     totalEnergy,
+                     lastReset: extraPersistedData.lastReset
+                  });
+               } else {
+                  let totalEnergy = accessory.context.totalEnergyTemp + parseFloat(params.power) * (30000 / 1000) / 3600 / 1000;
+                  accessory.eveLogger.setExtraPersistedData({
+                     totalEnergy,
+                     lastReset: 0
+                  });
+               }
+               accessory.context.totalEnergyTemp = 0;
+            } else {
+               accessory.context.totalEnergyTemp += parseFloat(params.power) * (30000 / 1000) / 3600 / 1000;
+               let totalEnergy = accessory.context.totalEnergyTemp;
+            }
+            accessory.eveLogger.addEntry({
+               time: Math.floor((new Date()).getTime() / 1000),
+               power: parseFloat(params.power)
+            });
          }
          if (params.hasOwnProperty("voltage")) {
             accessory.getService(Service.Outlet).updateCharacteristic(EveService.Characteristics.Voltage, parseFloat(params.voltage));
@@ -1667,9 +1683,7 @@ class eWeLink {
    }
    externalRFDeviceUpdate(accessory, params) {
       try {
-         if (params.updateSource === "HTTP") {
-            return;
-         }
+         if (!params.hasOwnProperty("updateSource")) return;
          let idToCheck = accessory.context.hbDeviceId.slice(0, -1),
             timeNow = new Date();
          if (params.hasOwnProperty("cmd") && params.cmd === "transmit" && params.hasOwnProperty("rfChl")) { // RF Button

From 05da65457b40afea4b6bad83b05bb200c5f3073c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 11 Sep 2020 14:10:01 +0100
Subject: [PATCH 0115/3183] 2.26.0-1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 873013f6..976b4433 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
    "name": "homebridge-ewelink",
-   "version": "2.26.0-0",
+   "version": "2.26.0-1",
    "lockfileVersion": 1,
    "requires": true,
    "dependencies": {
diff --git a/package.json b/package.json
index 06f177bb..2ffd7773 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
    "name": "homebridge-ewelink",
-   "version": "2.26.0-0",
+   "version": "2.26.0-1",
    "author": "bwp91",
    "contributors": [
       "gbro115",

From 157bba8ebf8933a90e3d6550845283426fa94aab Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 12 Sep 2020 13:37:04 +0100
Subject: [PATCH 0116/3183] add correcting-inteval dep

---
 package-lock.json | 5 +++++
 package.json      | 1 +
 2 files changed, 6 insertions(+)

diff --git a/package-lock.json b/package-lock.json
index 976b4433..529f274a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -122,6 +122,11 @@
          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
       },
+      "correcting-interval": {
+         "version": "2.0.0",
+         "resolved": "https://registry.npmjs.org/correcting-interval/-/correcting-interval-2.0.0.tgz",
+         "integrity": "sha1-iTdklFcN+C7axTQRHV8n/z6gstM="
+      },
       "debug": {
          "version": "2.6.9",
          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
diff --git a/package.json b/package.json
index 2ffd7773..fba6c4dd 100644
--- a/package.json
+++ b/package.json
@@ -45,6 +45,7 @@
    "dependencies": {
       "axios": "0.20.0",
       "color-convert": "2.0.1",
+      "correcting-interval": "2.0.0",
       "fakegato-history": "0.5.6",
       "homebridge-lib": "4.7.14",
       "node-dns-sd": "0.4.1",

From 6622c561a84e3ce00e7afcb34018a1c04c4e58a0 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 12 Sep 2020 13:37:48 +0100
Subject: [PATCH 0117/3183] EVE temp/power logging

---
 lib/eWeLink.js | 125 +++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 101 insertions(+), 24 deletions(-)

diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index b5c6ff68..338f40ba 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -3,6 +3,7 @@
 let Accessory, Characteristic, EveService, EveHistoryService, Service, UUIDGen;
 const cns = require("./constants"),
    convert = require("color-convert"),
+   corrInterval = require("correcting-interval"),
    eWeLinkHTTP = require("./eWeLinkHTTP"),
    eWeLinkWS = require("./eWeLinkWS"),
    eWeLinkLAN = require("./eWeLinkLAN"),
@@ -24,7 +25,7 @@ class eWeLink {
       this.devicesInEwe = new Map();
       this.cusG = new Map();
       this.cusS = new Map();
-      this.eveLogPath = this.api.user.persistPath() + "/homebridge-ewelink";
+      this.eveLogPath = this.api.user.storagePath() + "/persist/";
       this.api
          .on("didFinishLaunching", () => {
             this.log("Plugin has finished initialising. Starting synchronisation with eWeLink account.");
@@ -291,13 +292,32 @@ class eWeLink {
                if (!this.config.hideTHSwitch) accessory.addService(Service.Switch);
                accessory.addService(Service.TemperatureSensor);
                if (device.params.sensorType !== "DS18B20") accessory.addService(Service.HumiditySensor);
+               accessory.log = this.log;
+               accessory.eveLogger = new EveHistoryService("weather", accessory, {
+                  storage: "fs",
+                  path: this.eveLogPath
+               });
                break;
             case "outlet":
                accessory.addService(Service.Outlet);
                accessory.getService(Service.Outlet).addCharacteristic(EveService.Characteristics.Voltage);
                accessory.getService(Service.Outlet).addCharacteristic(EveService.Characteristics.CurrentConsumption);
-               accessory.getService(Service.Outlet).addCharacteristic(EveService.Characteristics.TotalConsumption);
                accessory.getService(Service.Outlet).addCharacteristic(EveService.Characteristics.ElectricCurrent);
+               accessory.getService(Service.Outlet).addCharacteristic(EveService.Characteristics.TotalConsumption);
+               accessory.getService(Service.Outlet).addCharacteristic(EveService.Characteristics.ResetTotal);
+               accessory.context = {
+                  ...accessory.context,
+                  ...{
+                     extraPersistedData: {},
+                     lastReset: 0,
+                     totalEnergy: 0,
+                     totalEnergyTemp: 0
+                  }
+               };
+               accessory.eveLogger = new EveHistoryService("energy", accessory, {
+                  storage: "fs",
+                  path: this.eveLogPath
+               });
                break;
             case "usb":
                accessory.addService(Service.Outlet);
@@ -459,6 +479,23 @@ class eWeLink {
                   accessory.getService(Service.Switch).getCharacteristic(Characteristic.On)
                      .on("set", (value, callback) => this.internalThermostatUpdate(accessory, value, callback));
                }
+               accessory.log = this.log;
+               accessory.eveLogger = new EveHistoryService("weather", accessory, {
+                  storage: "fs",
+                  path: this.eveLogPath
+               });
+               corrInterval.setCorrectingInterval(() => {
+                  let currentTemp = accessory.getService(Service.TemperatureSensor).getCharacteristic(Characteristic.CurrentTemperature).value,
+                     dataToAdd = {
+                        time: Date.now(),
+                        temp: currentTemp
+                     };
+                  if (accessory.getService(Service.HumiditySensor)) {
+                     dataToAdd.humidity = accessory.getService(Service.HumiditySensor).getCharacteristic(Characteristic.CurrentRelativeHumidity).value;
+                  }
+                  this.log.warn("[%s] 10 minute inteval recorded [%s°C].", accessory.displayName, currentTemp);
+                  accessory.eveLogger.addEntry(dataToAdd);
+               }, 60000);
                break;
             case "outlet":
                accessory.getService(Service.Outlet).getCharacteristic(Characteristic.On)
@@ -468,7 +505,60 @@ class eWeLink {
                   storage: "fs",
                   path: this.eveLogPath
                });
-               accessory.context.totalEnergyTemp = 0;
+               corrInterval.setCorrectingInterval(() => {
+                  let currentWatt = accessory.getService(Service.Outlet)
+                     .getCharacteristic(EveService.Characteristics.CurrentConsumption).value;
+                  this.log.warn("[%s] 10 minute inteval recorded [%sW].", accessory.displayName, currentWatt);
+                  if (accessory.eveLogger.isHistoryLoaded()) {
+                     accessory.context.extraPersistedData = accessory.eveLogger.getExtraPersistedData();
+                     if (accessory.context.extraPersistedData !== undefined) {
+                        accessory.context.totalEnergy = accessory.context.extraPersistedData.totalenergy + accessory.context.totalEnergyTemp + currentWatt * 10 / 3600 / 1000;
+                        accessory.eveLogger.setExtraPersistedData({
+                           totalenergy: accessory.context.totalEnergy,
+                           lastReset: accessory.context.extraPersistedData.lastReset
+                        });
+                     } else {
+                        accessory.context.totalEnergy = accessory.context.totalEnergyTemp + currentWatt * 10 / 3600 / 1000;
+                        accessory.eveLogger.setExtraPersistedData({
+                           totalenergy: accessory.context.totalEnergy,
+                           lastReset: 0
+                        });
+                     }
+                     accessory.context.totalEnergytemp = 0;
+                  } else {
+                     accessory.context.totalEnergyTemp += currentWatt * 10 / 3600 / 1000;
+                     accessory.context.totalEnergy = accessory.context.totalEnergyTemp;
+                  }
+                  accessory.eveLogger.addEntry({
+                     time: Date.now(),
+                     power: currentWatt
+                  });
+               }, 60000);
+               accessory.getService(Service.Outlet).getCharacteristic(EveService.Characteristics.TotalConsumption)
+                  .on("get", callback => {
+                     accessory.context.extraPersistedData = accessory.eveLogger.getExtraPersistedData();
+                     if (accessory.context.extraPersistedData !== undefined) {
+                        accessory.context.totalPower = accessory.context.extraPersistedData.totalPower;
+                     }
+                     callback(null, accessory.context.totalPower);
+                  });
+               accessory.getService(Service.Outlet).getCharacteristic(EveService.Characteristics.ResetTotal)
+                  .on("set", (value, callback) => {
+                     accessory.context.totalPower = 0;
+                     accessory.context.lastReset = value;
+                     accessory.eveLogger.setExtraPersistedData({
+                        totalPower: 0,
+                        lastReset: value
+                     });
+                     callback();
+                  })
+                  .on("get", callback => {
+                     accessory.context.extraPersistedData = accessory.eveLogger.getExtraPersistedData();
+                     if (accessory.context.extraPersistedData !== undefined) {
+                        accessory.context.lastReset = accessory.context.extraPersistedData.lastReset;
+                     }
+                     callback(null, accessory.context.lastReset);
+                  });
                break;
             case "usb":
                accessory.getService(Service.Outlet).getCharacteristic(Characteristic.On)
@@ -1505,14 +1595,21 @@ class eWeLink {
             let newState = params.hasOwnProperty("switch") ? params.switch === "on" : params.mainSwitch === "on";
             accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, newState);
          }
+         let eveLog = false;
          if (params.hasOwnProperty("currentTemperature") && accessory.getService(Service.TemperatureSensor)) {
             let currentTemp = params.currentTemperature !== "unavailable" ? params.currentTemperature : 0;
             accessory.getService(Service.TemperatureSensor).updateCharacteristic(Characteristic.CurrentTemperature, currentTemp);
+            eveLog = {
+               time: Date.now(),
+               temp: currentTemp
+            };
          }
          if (params.hasOwnProperty("currentHumidity") && accessory.getService(Service.HumiditySensor)) {
             let currentHumi = params.currentHumidity !== "unavailable" ? params.currentHumidity : 0;
             accessory.getService(Service.HumiditySensor).updateCharacteristic(Characteristic.CurrentRelativeHumidity, currentHumi);
+            eveLog.humidity = currentHumi;
          }
+         if (eveLog) accessory.eveLogger.addEntry(eveLog);
       } catch (err) {
          this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
       }
@@ -1525,28 +1622,8 @@ class eWeLink {
          if (params.hasOwnProperty("power")) {
             accessory.getService(Service.Outlet).updateCharacteristic(EveService.Characteristics.CurrentConsumption, parseFloat(params.power));
             accessory.getService(Service.Outlet).updateCharacteristic(Characteristic.OutletInUse, parseFloat(params.power) > 0);
-            if (accessory.eveLogger.isHistoryLoaded()) {
-               let extraPersistedData = accessory.eveLogger.getExtraPersistedData();
-               if (extraPersistedData !== undefined) {
-                  let totalEnergy = extraPersistedData.totalenergy + accessory.context.totalEnergyTemp + parseFloat(params.power) * (30000 / 1000) / 3600 / 1000;
-                  accessory.eveLogger.setExtraPersistedData({
-                     totalEnergy,
-                     lastReset: extraPersistedData.lastReset
-                  });
-               } else {
-                  let totalEnergy = accessory.context.totalEnergyTemp + parseFloat(params.power) * (30000 / 1000) / 3600 / 1000;
-                  accessory.eveLogger.setExtraPersistedData({
-                     totalEnergy,
-                     lastReset: 0
-                  });
-               }
-               accessory.context.totalEnergyTemp = 0;
-            } else {
-               accessory.context.totalEnergyTemp += parseFloat(params.power) * (30000 / 1000) / 3600 / 1000;
-               let totalEnergy = accessory.context.totalEnergyTemp;
-            }
             accessory.eveLogger.addEntry({
-               time: Math.floor((new Date()).getTime() / 1000),
+               time: Date.now(),
                power: parseFloat(params.power)
             });
          }

From f26836d8bdbbe266d5adfb377779d5cb1da588b3 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 12 Sep 2020 13:52:42 +0100
Subject: [PATCH 0118/3183] energy typo

---
 lib/eWeLink.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index 338f40ba..7dbc5f6f 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -538,13 +538,13 @@ class eWeLink {
                   .on("get", callback => {
                      accessory.context.extraPersistedData = accessory.eveLogger.getExtraPersistedData();
                      if (accessory.context.extraPersistedData !== undefined) {
-                        accessory.context.totalPower = accessory.context.extraPersistedData.totalPower;
+                        accessory.context.totalEnergy = accessory.context.extraPersistedData.totalPower;
                      }
-                     callback(null, accessory.context.totalPower);
+                     callback(null, accessory.context.totalEnergy);
                   });
                accessory.getService(Service.Outlet).getCharacteristic(EveService.Characteristics.ResetTotal)
                   .on("set", (value, callback) => {
-                     accessory.context.totalPower = 0;
+                     accessory.context.totalEnergy = 0;
                      accessory.context.lastReset = value;
                      accessory.eveLogger.setExtraPersistedData({
                         totalPower: 0,

From 55e1e17c72500ce2c5398973c71246ac011160e6 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 12 Sep 2020 13:53:17 +0100
Subject: [PATCH 0119/3183] 2.26.0-2

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 529f274a..9f86cb85 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
    "name": "homebridge-ewelink",
-   "version": "2.26.0-1",
+   "version": "2.26.0-2",
    "lockfileVersion": 1,
    "requires": true,
    "dependencies": {
diff --git a/package.json b/package.json
index fba6c4dd..92c69284 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
    "name": "homebridge-ewelink",
-   "version": "2.26.0-1",
+   "version": "2.26.0-2",
    "author": "bwp91",
    "contributors": [
       "gbro115",

From 2e3457c80a5bf6ad396fd38ed37918631f76993d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 12 Sep 2020 14:31:10 +0100
Subject: [PATCH 0120/3183] eve log bugs

---
 lib/eWeLink.js | 54 +++++++++++++++++++++++++-------------------------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index 7dbc5f6f..fd806aa3 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -493,7 +493,6 @@ class eWeLink {
                   if (accessory.getService(Service.HumiditySensor)) {
                      dataToAdd.humidity = accessory.getService(Service.HumiditySensor).getCharacteristic(Characteristic.CurrentRelativeHumidity).value;
                   }
-                  this.log.warn("[%s] 10 minute inteval recorded [%s°C].", accessory.displayName, currentTemp);
                   accessory.eveLogger.addEntry(dataToAdd);
                }, 60000);
                break;
@@ -506,9 +505,9 @@ class eWeLink {
                   path: this.eveLogPath
                });
                corrInterval.setCorrectingInterval(() => {
-                  let currentWatt = accessory.getService(Service.Outlet)
-                     .getCharacteristic(EveService.Characteristics.CurrentConsumption).value;
-                  this.log.warn("[%s] 10 minute inteval recorded [%sW].", accessory.displayName, currentWatt);
+                  let isOn = accessory.getService(Service.Outlet).getCharacteristic(Characteristic.On).value,
+                     currentWatt = isOn ? accessory.getService(Service.Outlet)
+                     .getCharacteristic(EveService.Characteristics.CurrentConsumption).value : 0;
                   if (accessory.eveLogger.isHistoryLoaded()) {
                      accessory.context.extraPersistedData = accessory.eveLogger.getExtraPersistedData();
                      if (accessory.context.extraPersistedData !== undefined) {
@@ -1371,27 +1370,6 @@ class eWeLink {
          callback(str);
       }
    }
-   externalValveUpdate(accessory, params) {
-      try {
-         ["A", "B"].forEach((v, k) => {
-            accessory.getService("Valve " + v)
-               .updateCharacteristic(Characteristic.Active, params.switches[k].switch === "on")
-               .updateCharacteristic(Characteristic.InUse, params.switches[k].switch === "on");
-            if (params.switches[k].switch === "on") {
-               let timer = accessory.getService("Valve " + v).getCharacteristic(Characteristic.SetDuration).value;
-               accessory.getService("Valve " + v).updateCharacteristic(Characteristic.RemainingDuration, timer);
-               accessory.getService("Valve " + v).timer = setTimeout(() => {
-                  accessory.getService("Valve " + v).setCharacteristic(Characteristic.Active, 0);
-               }, (timer * 1000));
-            } else {
-               accessory.getService("Valve " + v).updateCharacteristic(Characteristic.RemainingDuration, 0);
-               clearTimeout(accessory.getService("Valve " + v).timer);
-            }
-         });
-      } catch (err) {
-         this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
-      }
-   }
    internalRFDeviceUpdate(accessory, rfChl, callback) {
       try {
          if (!accessory.context.reachableWAN && !accessory.context.reachableLAN) {
@@ -1414,6 +1392,27 @@ class eWeLink {
          callback(str);
       }
    }
+   externalValveUpdate(accessory, params) {
+      try {
+         ["A", "B"].forEach((v, k) => {
+            accessory.getService("Valve " + v)
+               .updateCharacteristic(Characteristic.Active, params.switches[k].switch === "on")
+               .updateCharacteristic(Characteristic.InUse, params.switches[k].switch === "on");
+            if (params.switches[k].switch === "on") {
+               let timer = accessory.getService("Valve " + v).getCharacteristic(Characteristic.SetDuration).value;
+               accessory.getService("Valve " + v).updateCharacteristic(Characteristic.RemainingDuration, timer);
+               accessory.getService("Valve " + v).timer = setTimeout(() => {
+                  accessory.getService("Valve " + v).setCharacteristic(Characteristic.Active, 0);
+               }, (timer * 1000));
+            } else {
+               accessory.getService("Valve " + v).updateCharacteristic(Characteristic.RemainingDuration, 0);
+               clearTimeout(accessory.getService("Valve " + v).timer);
+            }
+         });
+      } catch (err) {
+         this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+      }
+   }
    externalBlindUpdate(accessory, params) {
       try {
          let blindConfig, nSte;
@@ -1601,7 +1600,7 @@ class eWeLink {
             accessory.getService(Service.TemperatureSensor).updateCharacteristic(Characteristic.CurrentTemperature, currentTemp);
             eveLog = {
                time: Date.now(),
-               temp: currentTemp
+               temp: parseFloat(currentTemp)
             };
          }
          if (params.hasOwnProperty("currentHumidity") && accessory.getService(Service.HumiditySensor)) {
@@ -1622,9 +1621,10 @@ class eWeLink {
          if (params.hasOwnProperty("power")) {
             accessory.getService(Service.Outlet).updateCharacteristic(EveService.Characteristics.CurrentConsumption, parseFloat(params.power));
             accessory.getService(Service.Outlet).updateCharacteristic(Characteristic.OutletInUse, parseFloat(params.power) > 0);
+            let isOn = accessory.getService(Service.Outlet).getCharacteristic(Characteristic.On).value;
             accessory.eveLogger.addEntry({
                time: Date.now(),
-               power: parseFloat(params.power)
+               power: isOn ? parseFloat(params.power) : 0
             });
          }
          if (params.hasOwnProperty("voltage")) {

From c85d865a3f01e9244ce78b54df14e3cbee21975f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 12 Sep 2020 14:49:22 +0100
Subject: [PATCH 0121/3183] eve final changes

---
 lib/eWeLink.js | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index fd806aa3..5c70de5f 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -485,16 +485,15 @@ class eWeLink {
                   path: this.eveLogPath
                });
                corrInterval.setCorrectingInterval(() => {
-                  let currentTemp = accessory.getService(Service.TemperatureSensor).getCharacteristic(Characteristic.CurrentTemperature).value,
-                     dataToAdd = {
-                        time: Date.now(),
-                        temp: currentTemp
-                     };
+                  let dataToAdd = {
+                     time: Date.now(),
+                     temp: accessory.getService(Service.TemperatureSensor).getCharacteristic(Characteristic.CurrentTemperature).value
+                  };
                   if (accessory.getService(Service.HumiditySensor)) {
                      dataToAdd.humidity = accessory.getService(Service.HumiditySensor).getCharacteristic(Characteristic.CurrentRelativeHumidity).value;
                   }
                   accessory.eveLogger.addEntry(dataToAdd);
-               }, 60000);
+               }, 600000);
                break;
             case "outlet":
                accessory.getService(Service.Outlet).getCharacteristic(Characteristic.On)
@@ -532,7 +531,7 @@ class eWeLink {
                      time: Date.now(),
                      power: currentWatt
                   });
-               }, 60000);
+               }, 600000);
                accessory.getService(Service.Outlet).getCharacteristic(EveService.Characteristics.TotalConsumption)
                   .on("get", callback => {
                      accessory.context.extraPersistedData = accessory.eveLogger.getExtraPersistedData();

From 23d53138e1ca9761234377b553f548f7dd236bd6 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 12 Sep 2020 15:12:44 +0100
Subject: [PATCH 0122/3183] eve log timer to 5 mins

---
 lib/eWeLink.js | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index 5c70de5f..2ef060cb 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -292,11 +292,6 @@ class eWeLink {
                if (!this.config.hideTHSwitch) accessory.addService(Service.Switch);
                accessory.addService(Service.TemperatureSensor);
                if (device.params.sensorType !== "DS18B20") accessory.addService(Service.HumiditySensor);
-               accessory.log = this.log;
-               accessory.eveLogger = new EveHistoryService("weather", accessory, {
-                  storage: "fs",
-                  path: this.eveLogPath
-               });
                break;
             case "outlet":
                accessory.addService(Service.Outlet);
@@ -314,10 +309,6 @@ class eWeLink {
                      totalEnergyTemp: 0
                   }
                };
-               accessory.eveLogger = new EveHistoryService("energy", accessory, {
-                  storage: "fs",
-                  path: this.eveLogPath
-               });
                break;
             case "usb":
                accessory.addService(Service.Outlet);
@@ -482,6 +473,7 @@ class eWeLink {
                accessory.log = this.log;
                accessory.eveLogger = new EveHistoryService("weather", accessory, {
                   storage: "fs",
+                  minutes: 5,
                   path: this.eveLogPath
                });
                corrInterval.setCorrectingInterval(() => {
@@ -493,7 +485,7 @@ class eWeLink {
                      dataToAdd.humidity = accessory.getService(Service.HumiditySensor).getCharacteristic(Characteristic.CurrentRelativeHumidity).value;
                   }
                   accessory.eveLogger.addEntry(dataToAdd);
-               }, 600000);
+               }, 300000);
                break;
             case "outlet":
                accessory.getService(Service.Outlet).getCharacteristic(Characteristic.On)
@@ -501,6 +493,7 @@ class eWeLink {
                accessory.log = this.log;
                accessory.eveLogger = new EveHistoryService("energy", accessory, {
                   storage: "fs",
+                  minutes: 5,
                   path: this.eveLogPath
                });
                corrInterval.setCorrectingInterval(() => {
@@ -531,7 +524,7 @@ class eWeLink {
                      time: Date.now(),
                      power: currentWatt
                   });
-               }, 600000);
+               }, 300000);
                accessory.getService(Service.Outlet).getCharacteristic(EveService.Characteristics.TotalConsumption)
                   .on("get", callback => {
                      accessory.context.extraPersistedData = accessory.eveLogger.getExtraPersistedData();

From 9e6f378e862de843871666419b1c03468d46aac5 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 12 Sep 2020 15:30:39 +0100
Subject: [PATCH 0123/3183] eve logging directory

---
 lib/eWeLink.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index 2ef060cb..4a1676ae 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -25,7 +25,7 @@ class eWeLink {
       this.devicesInEwe = new Map();
       this.cusG = new Map();
       this.cusS = new Map();
-      this.eveLogPath = this.api.user.storagePath() + "/persist/";
+      this.eveLogPath = this.api.user.storagePath() + "/homebridge-ewelink/";
       this.api
          .on("didFinishLaunching", () => {
             this.log("Plugin has finished initialising. Starting synchronisation with eWeLink account.");

From 82bf6886274a2e8c80c599582614e2ccbcd50875 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 12 Sep 2020 15:31:12 +0100
Subject: [PATCH 0124/3183] 2.26.0-3

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 9f86cb85..3075e4c5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
    "name": "homebridge-ewelink",
-   "version": "2.26.0-2",
+   "version": "2.26.0-3",
    "lockfileVersion": 1,
    "requires": true,
    "dependencies": {
diff --git a/package.json b/package.json
index 92c69284..a27267fd 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
    "name": "homebridge-ewelink",
-   "version": "2.26.0-2",
+   "version": "2.26.0-3",
    "author": "bwp91",
    "contributors": [
       "gbro115",

From a9c91778cf0d029a007f32bb31bc6c3280d449d9 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Sat, 12 Sep 2020 17:01:46 +0100
Subject: [PATCH 0125/3183] Create dependabot.yml

---
 .github/dependabot.yml | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 .github/dependabot.yml

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 00000000..8abca405
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,11 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "npm" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "daily"

From 7e867251c0386c30b22176102263c32c5356f811 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 12 Sep 2020 18:51:57 +0100
Subject: [PATCH 0126/3183] typos

---
 lib/eWeLink.js     |  7 ++++---
 lib/eWeLinkHTTP.js |  6 +++---
 lib/eWeLinkLAN.js  | 10 +++++-----
 lib/eWeLinkWS.js   |  8 ++++----
 4 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index 4a1676ae..27fa8ad0 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -13,14 +13,15 @@ class eWeLink {
    constructor(log, config, api) {
       if (!log || !api || !config) return;
       if (!config.username || !config.password || !config.countryCode) {
-         log.error("************** Cannot load homebridge-ewelink **************");
-         log.error("Your eWeLink credentials missing from the Homebridge config.");
-         log.error("************************************************************");
+         log.error("**************** Cannot load homebridge-ewelink ****************");
+         log.error("Your eWeLink credentials are missing from the Homebridge config.");
+         log.error("****************************************************************");
          return;
       }
       this.log = log;
       this.config = config;
       this.api = api;
+      this.debug = this.config.debug || false;
       this.devicesInHB = new Map();
       this.devicesInEwe = new Map();
       this.cusG = new Map();
diff --git a/lib/eWeLinkHTTP.js b/lib/eWeLinkHTTP.js
index 4756c48b..6df6fbb9 100644
--- a/lib/eWeLinkHTTP.js
+++ b/lib/eWeLinkHTTP.js
@@ -1,8 +1,8 @@
 /* jshint esversion: 9, -W030, node: true */
 "use strict";
-const axios = require("axios");
-const constants = require("./constants");
-const crypto = require("crypto");
+const axios = require("axios"),
+   constants = require("./constants"),
+   crypto = require("crypto");
 module.exports = class eWeLinkHTTP {
    constructor(config, log) {
       this.config = config;
diff --git a/lib/eWeLinkLAN.js b/lib/eWeLinkLAN.js
index f43869b7..f6ff9188 100644
--- a/lib/eWeLinkLAN.js
+++ b/lib/eWeLinkLAN.js
@@ -1,10 +1,10 @@
 /* jshint esversion: 9, -W030, node: true */
 "use strict";
-const axios = require("axios");
-const constants = require("./constants");
-const crypto = require("crypto");
-const dns = require("node-dns-sd");
-const eventemitter = require("events");
+const axios = require("axios"),
+   constants = require("./constants"),
+   crypto = require("crypto"),
+   dns = require("node-dns-sd"),
+   eventemitter = require("events");
 module.exports = class eWeLinkLAN {
    constructor(config, log, devices) {
       this.config = config;
diff --git a/lib/eWeLinkWS.js b/lib/eWeLinkWS.js
index a44b1431..9cb70c1c 100644
--- a/lib/eWeLinkWS.js
+++ b/lib/eWeLinkWS.js
@@ -1,9 +1,9 @@
 /* jshint esversion: 9, -W030, node: true */
 "use strict";
-const axios = require("axios");
-const constants = require("./constants");
-const eventemitter = require("events");
-const ws = require("ws");
+const axios = require("axios"),
+   constants = require("./constants"),
+   eventemitter = require("events"),
+   ws = require("ws");
 module.exports = class eWeLinkWS {
    constructor(config, log, res) {
       this.config = config;

From aaa15f6451a891a6ab263eca800ab75f3a640394 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Sun, 13 Sep 2020 10:23:09 +0100
Subject: [PATCH 0127/3183] Update README.md

---
 README.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index cbd907d0..6db17853 100644
--- a/README.md
+++ b/README.md
@@ -24,10 +24,11 @@
 * [Supported Devices](https://github.com/bwp91/homebridge-ewelink/wiki/Supported-Devices)
 * [Connection Methods](https://github.com/bwp91/homebridge-ewelink/wiki/Connection-Methods)
 ### How-to Guides
-* [How to copy Homebridge logs](https://github.com/bwp91/homebridge-ewelink/wiki/How-to-copy-Homebridge-logs)
-* [How to enable/disable plugin extended logging](https://github.com/bwp91/homebridge-ewelink/wiki/How-to-enable-disable-plugin-extended-logging)
 * [How to set up RF Bridge sensors](https://github.com/bwp91/homebridge-ewelink/wiki/How-to-set-up-RF-Bridge-sensors)
 * [How to set up Sonoff Camera (GK-200MP2-B)](https://github.com/bwp91/homebridge-ewelink/wiki/How-to-set-up-Sonoff-Camera)
+* [How to copy Homebridge logs](https://github.com/bwp91/homebridge-ewelink/wiki/How-to-copy-Homebridge-logs)
+* [How to enable/disable plugin extended logging](https://github.com/bwp91/homebridge-ewelink/wiki/How-to-enable-disable-plugin-extended-logging)
+* [How to remove an accessory from the cache](https://github.com/bwp91/homebridge-ewelink/wiki/How-to-remove-an-accessory-from-the-cache)
 ### About
 * [Support Request](https://github.com/bwp91/homebridge-ewelink/issues)
 * [Roadmap](https://github.com/bwp91/homebridge-ewelink/wiki/Roadmap)

From 6256c4c9c2eb59db88afaa47a3a7debd6d5a289a Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 13 Sep 2020 10:34:32 +0100
Subject: [PATCH 0128/3183] log check and outlet fix

---
 lib/eWeLink.js | 49 ++++++++++++++++++++++++++++++-------------------
 1 file changed, 30 insertions(+), 19 deletions(-)

diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index 27fa8ad0..2c596ad9 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -90,7 +90,7 @@ class eWeLink {
                      this.wsClient.receiveUpdate(d => this.receiveDeviceUpdate(d));
                      this.lanClient.receiveUpdate(d => this.receiveDeviceUpdate(d));
                      this.log("eWeLink setup complete. If you're enjoying this package please consider a ⭐️  on GitHub :).");
-                     if (this.config.debugReqRes) {
+                     if (this.config.debugReqRes || false) {
                         this.log.warn("You have 'Request & Response Logging' enabled. This setting is not recommended for long-term use.");
                      }
                   })();
@@ -497,6 +497,17 @@ class eWeLink {
                   minutes: 5,
                   path: this.eveLogPath
                });
+               if (!accessory.context.hasOwnProperty("lastReset")) {
+                  accessory.context = {
+                     ...accessory.context,
+                     ...{
+                        extraPersistedData: {},
+                        lastReset: 0,
+                        totalEnergy: 0,
+                        totalEnergyTemp: 0
+                     }
+                  };
+               }
                corrInterval.setCorrectingInterval(() => {
                   let isOn = accessory.getService(Service.Outlet).getCharacteristic(Characteristic.On).value,
                      currentWatt = isOn ? accessory.getService(Service.Outlet)
@@ -740,7 +751,7 @@ class eWeLink {
          this.lanClient.sendUpdate(payload)
             .then(() => callback())
             .catch(err => {
-               if (this.config.debug) {
+               if (this.debug) {
                   this.log.warn("[%s] Reverting to web socket as %s.", accessory.displayName, err);
                }
                sendViaWS();
@@ -786,7 +797,7 @@ class eWeLink {
                   accessory.context.reachableLAN = true;
                   this.log("[%s] has been reported [online] via [LAN].", accessory.displayName);
                }
-               if (this.config.debug) {
+               if (this.debug) {
                   this.log("[%s] externally updated from above %s message and will be refreshed.", accessory.displayName, device.params.updateSource);
                }
                if (!this.refreshAccessory(accessory, device.params)) {
@@ -1029,7 +1040,7 @@ class eWeLink {
          params.switches[1].switch = (newPower === 1 && newSpeed >= 33) ? "on" : "off";
          params.switches[2].switch = (newPower === 1 && newSpeed >= 66 && newSpeed < 99) ? "on" : "off";
          params.switches[3].switch = (newPower === 1 && newSpeed >= 99) ? "on" : "off";
-         if (this.config.debug) {
+         if (this.debug) {
             this.log.warn("Fan Update - setting " + type + " to " + value);
             this.log("[%s] new stats: power [%s], speed [%s%], light [%s].", accessory.displayName, newPower, newSpeed, newLight);
          }
@@ -1049,7 +1060,7 @@ class eWeLink {
             switch: value ? "on" : "off",
             mainSwitch: value ? "on" : "off"
          };
-         if (this.config.debug) {
+         if (this.debug) {
             this.log("[%s] updating to turn [%s].", accessory.displayName, value ? "on" : "off");
          }
          accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, value);
@@ -1068,7 +1079,7 @@ class eWeLink {
          let params = {
             switch: value ? "on" : "off"
          };
-         if (this.config.debug) {
+         if (this.debug) {
             this.log("[%s] requesting to turn [%s].", accessory.displayName, value ? "on" : "off");
          }
          accessory.getService(Service.Outlet).updateCharacteristic(Characteristic.On, value);
@@ -1086,7 +1097,7 @@ class eWeLink {
             switches: this.devicesInEwe.get(accessory.context.eweDeviceId).params.switches
          };
          params.switches[0].switch = value ? "on" : "off";
-         if (this.config.debug) {
+         if (this.debug) {
             this.log("[%s] requesting to turn [%s].", accessory.displayName, value ? "on" : "off");
          }
          accessory.getService(Service.Outlet).updateCharacteristic(Characteristic.On, value);
@@ -1104,7 +1115,7 @@ class eWeLink {
             switches: this.devicesInEwe.get(accessory.context.eweDeviceId).params.switches
          };
          params.switches[0].switch = value ? "on" : "off";
-         if (this.config.debug) {
+         if (this.debug) {
             this.log("[%s] requesting to turn [%s].", accessory.displayName, value ? "on" : "off");
          }
          accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, value);
@@ -1126,7 +1137,7 @@ class eWeLink {
                } else {
                   params.switch = value ? "on" : "off";
                }
-               if (this.config.debug) {
+               if (this.debug) {
                   this.log("[%s] updating to turn [%s].", accessory.displayName, value ? "on" : "off");
                }
                accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, value);
@@ -1137,7 +1148,7 @@ class eWeLink {
                params.switches[1].switch = value ? "on" : "off";
                params.switches[2].switch = value ? "on" : "off";
                params.switches[3].switch = value ? "on" : "off";
-               if (this.config.debug) {
+               if (this.debug) {
                   this.log("[%s] updating to turn group [%s].", accessory.displayName, value ? "on" : "off");
                }
                accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, value);
@@ -1152,7 +1163,7 @@ class eWeLink {
             case "2":
             case "3":
             case "4":
-               if (this.config.debug) {
+               if (this.debug) {
                   this.log("[%s] updating to turn [%s].", accessory.displayName, value ? "on" : "off");
                }
                accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, value);
@@ -1210,7 +1221,7 @@ class eWeLink {
             }
             accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.Brightness, value);
          }
-         if (this.config.debug) {
+         if (this.debug) {
             this.log("[%s] updating brightness to [%s%].", accessory.displayName, value);
          }
          setTimeout(() => this.sendDeviceUpdate(accessory, params, callback), 250);
@@ -1255,7 +1266,7 @@ class eWeLink {
                   default:
                      throw "unknown device UIID";
                }
-               if (this.config.debug) {
+               if (this.debug) {
                   this.log("[%s] updating hue to [%s°].", accessory.displayName, value);
                }
                accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.Hue, value);
@@ -1281,7 +1292,7 @@ class eWeLink {
                      };
                      break;
                }
-               if (this.config.debug) {
+               if (this.debug) {
                   this.log("[%s] updating brightness to [%s%].", accessory.displayName, value);
                }
                accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.Brightness, value);
@@ -1305,7 +1316,7 @@ class eWeLink {
          switch (accessory.context.switchNumber) {
             case "X":
                params.switch = value ? "on" : "off";
-               if (this.config.debug) {
+               if (this.debug) {
                   this.log("[%s] updating to turn [%s].", accessory.displayName, value ? "on" : "off");
                }
                accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, value);
@@ -1316,7 +1327,7 @@ class eWeLink {
                params.switches[1].switch = value ? "on" : "off";
                params.switches[2].switch = value ? "on" : "off";
                params.switches[3].switch = value ? "on" : "off";
-               if (this.config.debug) {
+               if (this.debug) {
                   this.log("[%s] updating to turn group [%s].", accessory.displayName, value ? "on" : "off");
                }
                accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, value);
@@ -1331,7 +1342,7 @@ class eWeLink {
             case "2":
             case "3":
             case "4":
-               if (this.config.debug) {
+               if (this.debug) {
                   this.log("[%s] updating to turn [%s].", accessory.displayName, value ? "on" : "off");
                }
                accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, value);
@@ -1373,7 +1384,7 @@ class eWeLink {
             cmd: "transmit",
             rfChl
          };
-         if (this.config.debug) {
+         if (this.debug) {
             this.log("[%s %s] mimicking RF button press.", accessory.displayName, accessory.context.rfChls[rfChl]);
          }
          accessory.getService(accessory.context.rfChls[rfChl]).updateCharacteristic(Characteristic.On, true);
@@ -1822,7 +1833,7 @@ class eWeLink {
                               }, (this.config.sensorTimeLength || 2) * 1000);
                               break;
                         }
-                        if (this.config.debug) {
+                        if (this.debug) {
                            this.log("[%s] has detected [%s].", oAccessory.displayName, oAccessory.context.sensorType);
                         }
                      }

From 6404f83cf4b91c9fcc22e0200a352ef8fc571ee6 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 13 Sep 2020 11:08:22 +0100
Subject: [PATCH 0129/3183] 2.26.0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 3075e4c5..cdf0592f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
    "name": "homebridge-ewelink",
-   "version": "2.26.0-3",
+   "version": "2.26.0",
    "lockfileVersion": 1,
    "requires": true,
    "dependencies": {
diff --git a/package.json b/package.json
index a27267fd..638621b7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
    "name": "homebridge-ewelink",
-   "version": "2.26.0-3",
+   "version": "2.26.0",
    "author": "bwp91",
    "contributors": [
       "gbro115",

From c76cf88d0b4d5d824f6049b6614d47a8f4929b1c Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Sun, 13 Sep 2020 11:13:53 +0100
Subject: [PATCH 0130/3183] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 6db17853..0225eb9e 100644
--- a/README.md
+++ b/README.md
@@ -30,6 +30,6 @@
 * [How to enable/disable plugin extended logging](https://github.com/bwp91/homebridge-ewelink/wiki/How-to-enable-disable-plugin-extended-logging)
 * [How to remove an accessory from the cache](https://github.com/bwp91/homebridge-ewelink/wiki/How-to-remove-an-accessory-from-the-cache)
 ### About
-* [Support Request](https://github.com/bwp91/homebridge-ewelink/issues)
+* [Support Request](https://github.com/bwp91/homebridge-ewelink/issues/new/choose)
 * [Roadmap](https://github.com/bwp91/homebridge-ewelink/wiki/Roadmap)
 * [Credits](https://github.com/bwp91/homebridge-ewelink/wiki/Credits)

From 808d5c46ae207b90b1835822eab9fd81b627c08f Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Mon, 14 Sep 2020 16:29:24 +0100
Subject: [PATCH 0131/3183] Create config.yml

---
 .github/ISSUE_TEMPLATE/config.yml | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE/config.yml

diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 00000000..d4cc064a
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Test
+    url: https://github.community/
+    about: Please ask and answer questions here.

From 0f50118d443dcd169d85a12cd8aebfe2e4fd6a83 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Mon, 14 Sep 2020 16:33:10 +0100
Subject: [PATCH 0132/3183] Update config.yml

---
 .github/ISSUE_TEMPLATE/config.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index d4cc064a..2194a932 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,5 +1,5 @@
 blank_issues_enabled: false
 contact_links:
-  - name: Test
-    url: https://github.community/
-    about: Please ask and answer questions here.
+  - name: Homebridge Discord
+    url: https://discord.gg/Z8jmyvb
+    about: Chat to me on Discord - my username is bwp91.

From 5cb0d109cfbfe74aa09f0f8beecb14ade83f6f18 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Mon, 14 Sep 2020 16:35:17 +0100
Subject: [PATCH 0133/3183] Create feedback.md

---
 .github/ISSUE_TEMPLATE/feedback.md | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE/feedback.md

diff --git a/.github/ISSUE_TEMPLATE/feedback.md b/.github/ISSUE_TEMPLATE/feedback.md
new file mode 100644
index 00000000..31941559
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feedback.md
@@ -0,0 +1,9 @@
+---
+name: Feedback
+about: Give feedback that I might have asked for.
+title: ''
+labels: ''
+assignees: ''
+
+---
+

From 1a047f21232fddbb5ee217e9e2f48e1e3dd1e940 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Mon, 14 Sep 2020 16:35:51 +0100
Subject: [PATCH 0134/3183] Update feature-request.md

---
 .github/ISSUE_TEMPLATE/feature-request.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/feature-request.md b/.github/ISSUE_TEMPLATE/feature-request.md
index 47b2c95b..5ba9ddfc 100644
--- a/.github/ISSUE_TEMPLATE/feature-request.md
+++ b/.github/ISSUE_TEMPLATE/feature-request.md
@@ -1,6 +1,6 @@
 ---
 name: Feature Request
-about: I have an idea for the package!
+about: I have an idea for the package or have a device that isn't supported.
 title: ''
 labels: ''
 assignees: ''

From e2fb269c652a0910cdc374a0095300948155bb9d Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Mon, 14 Sep 2020 16:36:21 +0100
Subject: [PATCH 0135/3183] Update new-issue.md

---
 .github/ISSUE_TEMPLATE/new-issue.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/new-issue.md b/.github/ISSUE_TEMPLATE/new-issue.md
index 32cfb7df..fb970abc 100644
--- a/.github/ISSUE_TEMPLATE/new-issue.md
+++ b/.github/ISSUE_TEMPLATE/new-issue.md
@@ -1,6 +1,6 @@
 ---
 name: New Issue
-about: I have a problem with the package!
+about: I have a problem with the package or it's showing an error.
 title: ''
 labels: ''
 assignees: ''

From 0bcba58c6713ac14bee6d6ed6acfe30beabb5228 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 14 Sep 2020 20:24:59 +0100
Subject: [PATCH 0136/3183] zb motion sensor bug

---
 lib/constants.js |  4 ++--
 lib/eWeLink.js   | 12 ++++++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/lib/constants.js b/lib/constants.js
index 0a53039b..34ce9a38 100644
--- a/lib/constants.js
+++ b/lib/constants.js
@@ -30,14 +30,14 @@ module.exports = {
    devicesRFBridge: [28],
    devicesRFBridgeParams: ["cmd"],
    devicesZBBridge: [66],
-   devicesZBBridgeParams: ["key", "temperature", "humidity", "motion", "lock"],
+   devicesZBBridgeParams: ["key", "temperature", "humidity", "motion", "lock", "trigTime"],
    devicesZB: [1000, 1770, 2026, 3026],
    devicesValveParams: ["switches"],
    devicesBlindParams: ["switch", "switches"],
    devicesGarageParams: ["switch", "switches"],
    devicesLockParams: ["switch"],
    allowedGroups: ["blind", "garage", "lock"],
-   paramsToKeep: ["bright", "brightness", "channel", "cmd", "colorB", "colorG", "colorR", "current", "currentHumidity", "currentTemperature", "fan", "humidity", "key", "light", "lock", "mainSwitch", "mode", "online", "power", "rfChl", "rfList", "rfTrig", "sensorType", "speed", "state", "switch", "switches", "temperature", "type", "voltage", "zyx_mode"],
+   paramsToKeep: ["bright", "brightness", "channel", "cmd", "colorB", "colorG", "colorR", "current", "currentHumidity", "currentTemperature", "fan", "humidity", "key", "light", "lock", "mainSwitch", "mode", "motion", "online", "power", "rfChl", "rfList", "rfTrig", "sensorType", "speed", "state", "switch", "switches", "temperature", "trigTime", "type", "voltage", "zyx_mode"],
    chansFromUiid: {
       1: 1, // "SOCKET"                                  \\ 20, MINI, BASIC, S26
       2: 2, // "SOCKET_2"                                \\ 
diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index 2c596ad9..ec37aeca 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -1863,8 +1863,16 @@ class eWeLink {
                }
                break;
             case 2026:
-               if (params.hasOwnProperty("motion") && [0, 1].includes(params.lock)) {
-                  accessory.getService(Service.MotionSensor).updateCharacteristic(Characteristic.MotionDetected, params.motion);
+               if (params.hasOwnProperty("motion") && params.motion === 1 && params.hasOwnProperty("trigTime")) {
+                  let timeNow = new Date(),
+                     timeDifference = (timeNow.getTime() - params.trigTime) / 1000;
+                  if (timeDifference < (this.config.sensorTimeDifference || 120)) {
+                     accessory.getService(Service.MotionSensor).updateCharacteristic(Characteristic.MotionDetected, 1);
+                     setTimeout(() => {
+                        accessory.getService(Service.MotionSensor).updateCharacteristic(Characteristic.MotionDetected, 0);
+                     }, (this.config.sensorTimeLength || 2) * 1000);
+                  }
+                  break;
                }
                break;
             case 3026:

From ae1aacb589e8d3ba6c57c15bfcec15c1a05b9c92 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 14 Sep 2020 20:26:32 +0100
Subject: [PATCH 0137/3183] 2.26.1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index cdf0592f..81baac0a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
    "name": "homebridge-ewelink",
-   "version": "2.26.0",
+   "version": "2.26.1",
    "lockfileVersion": 1,
    "requires": true,
    "dependencies": {
diff --git a/package.json b/package.json
index 638621b7..a572eac9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
    "name": "homebridge-ewelink",
-   "version": "2.26.0",
+   "version": "2.26.1",
    "author": "bwp91",
    "contributors": [
       "gbro115",

From 5d15ea647689a825927d5386d4353ca3dadc5b02 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 14 Sep 2020 23:17:13 +0100
Subject: [PATCH 0138/3183] implement sliders

---
 config.schema.json | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 4175f7cb..b3ce4afe 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -56,22 +56,25 @@
             "type":"integer",
             "title":"Sensor Length",
             "description":"The number of seconds which the sensor tile in the Home app will light up for if a sensor detects something.",
-            "default":"2",
-            "maximum":999
+            "default":60,
+            "minimum":1,
+            "maximum":120
          },
          "sensorTimeDifference":{
             "type":"integer",
             "title":"Sensor Lag",
             "description":"An offset in seconds to ignore any notifications if they is a delay between a sensor detecting something and Homebridge receiving the notification.",
-            "default":"120",
-            "maximum":999
+            "default":120,
+            "minimum":10,
+            "maximum":300
          },
          "valveTimeLength":{
             "type":"integer",
             "title":"Valve Duration",
             "description":"The default number of seconds that irrigation valves will run for.",
-            "default":"20",
-            "maximum":999
+            "default":20,
+            "minimum": 10,
+            "maximum":1800
          },
          "hideTHSwitch":{
             "title":"Hide TH10/TH16 Switch",
@@ -147,7 +150,9 @@
                      "type":"number",
                      "title":"Operation Time",
                      "description":"For blinds and garage doors this is the total time in deciseconds to fully open/close the device. For locks this is the time to show the Home app tile as unlocked. Count the time in seconds and multiply by 10, for example 100 for 10 seconds or 75 for 7.5 seconds.",
-                     "default":100
+                     "default":100,
+                     "minimum":10,
+                     "maximum":600
                   },
                   "sensorId":{
                      "type":"string",

From bf9d4ca1e7143a4fdf7a10b5f3a07311aeaeb102 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 14 Sep 2020 23:17:40 +0100
Subject: [PATCH 0139/3183] eve for zb temp sensor

---
 lib/eWeLink.js | 41 ++++++++++++++++++++++++++++++++++-------
 1 file changed, 34 insertions(+), 7 deletions(-)

diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index ec37aeca..50335be5 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -624,6 +624,24 @@ class eWeLink {
                   });
                }
                break;
+            case "zb_sub":
+               if (accessory.context.eweUIID === 1770) {
+                  accessory.log = this.log;
+                  accessory.eveLogger = new EveHistoryService("weather", accessory, {
+                     storage: "fs",
+                     minutes: 5,
+                     path: this.eveLogPath
+                  });
+                  corrInterval.setCorrectingInterval(() => {
+                     let dataToAdd = {
+                        time: Date.now(),
+                        temp: accessory.getService(Service.TemperatureSensor).getCharacteristic(Characteristic.CurrentTemperature).value,
+                        humidity: accessory.getService(Service.HumiditySensor).getCharacteristic(Characteristic.CurrentRelativeHumidity).value
+                     };
+                     accessory.eveLogger.addEntry(dataToAdd);
+                  }, 300000);
+               }
+               break;
          }
          this.devicesInHB.set(accessory.context.hbDeviceId, accessory);
       } catch (err) {
@@ -1598,21 +1616,22 @@ class eWeLink {
             let newState = params.hasOwnProperty("switch") ? params.switch === "on" : params.mainSwitch === "on";
             accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, newState);
          }
-         let eveLog = false;
+         let eveLog = {
+            time: Date.now()
+         };
          if (params.hasOwnProperty("currentTemperature") && accessory.getService(Service.TemperatureSensor)) {
             let currentTemp = params.currentTemperature !== "unavailable" ? params.currentTemperature : 0;
             accessory.getService(Service.TemperatureSensor).updateCharacteristic(Characteristic.CurrentTemperature, currentTemp);
-            eveLog = {
-               time: Date.now(),
-               temp: parseFloat(currentTemp)
-            };
+            eveLog.temp = parseFloat(currentTemp);
          }
          if (params.hasOwnProperty("currentHumidity") && accessory.getService(Service.HumiditySensor)) {
             let currentHumi = params.currentHumidity !== "unavailable" ? params.currentHumidity : 0;
             accessory.getService(Service.HumiditySensor).updateCharacteristic(Characteristic.CurrentRelativeHumidity, currentHumi);
-            eveLog.humidity = currentHumi;
+            eveLog.humidity = parseFloat(currentHumi);
+         }
+         if (eveLog.hasOwnProperty("temp") || eveLog.hasOwnProperty("humidity")) {
+            accessory.eveLogger.addEntry(eveLog);
          }
-         if (eveLog) accessory.eveLogger.addEntry(eveLog);
       } catch (err) {
          this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
       }
@@ -1853,13 +1872,21 @@ class eWeLink {
                }
                break;
             case 1770:
+               let eveLog = {
+                  time: Date.now()
+               };
                if (params.hasOwnProperty("temperature")) {
                   let currentTemp = parseInt(params.temperature) / 100;
                   accessory.getService(Service.TemperatureSensor).updateCharacteristic(Characteristic.CurrentTemperature, currentTemp);
+                  eveLog.temp = parseFloat(currentTemp);
                }
                if (params.hasOwnProperty("humidity")) {
                   let currentHumi = parseInt(params.humidity) / 100;
                   accessory.getService(Service.HumiditySensor).updateCharacteristic(Characteristic.CurrentRelativeHumidity, currentHumi);
+                  eveLog.humidity = parseFloat(currentHumi);
+               }
+               if (eveLog.hasOwnProperty("temp") || eveLog.hasOwnProperty("humidity")) {
+                  accessory.eveLogger.addEntry(eveLog);
                }
                break;
             case 2026:

From fe1c23d2933dbbc12fa673a5c7b584a2a0bc2153 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 15 Sep 2020 06:54:51 +0100
Subject: [PATCH 0140/3183] number -> integer

---
 config.schema.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config.schema.json b/config.schema.json
index b3ce4afe..664f3935 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -147,7 +147,7 @@
                      ]
                   },
                   "operationTime":{
-                     "type":"number",
+                     "type":"integer",
                      "title":"Operation Time",
                      "description":"For blinds and garage doors this is the total time in deciseconds to fully open/close the device. For locks this is the time to show the Home app tile as unlocked. Count the time in seconds and multiply by 10, for example 100 for 10 seconds or 75 for 7.5 seconds.",
                      "default":100,

From 0e5c58d86a03c10f61ae8b49603d06f698babca5 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 15 Sep 2020 06:56:08 +0100
Subject: [PATCH 0141/3183] 2.26.2

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 81baac0a..89e609db 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
    "name": "homebridge-ewelink",
-   "version": "2.26.1",
+   "version": "2.26.2",
    "lockfileVersion": 1,
    "requires": true,
    "dependencies": {
diff --git a/package.json b/package.json
index a572eac9..5e90fe89 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
    "name": "homebridge-ewelink",
-   "version": "2.26.1",
+   "version": "2.26.2",
    "author": "bwp91",
    "contributors": [
       "gbro115",

From 05bf298fa9f220694e0d7458cef72d4a1683e1bd Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 15 Sep 2020 08:10:48 +0100
Subject: [PATCH 0142/3183] allow battery parameter

---
 lib/constants.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/constants.js b/lib/constants.js
index 34ce9a38..464ac8ab 100644
--- a/lib/constants.js
+++ b/lib/constants.js
@@ -30,14 +30,14 @@ module.exports = {
    devicesRFBridge: [28],
    devicesRFBridgeParams: ["cmd"],
    devicesZBBridge: [66],
-   devicesZBBridgeParams: ["key", "temperature", "humidity", "motion", "lock", "trigTime"],
+   devicesZBBridgeParams: ["key", "temperature", "humidity", "motion", "lock", "trigTime", "battery"],
    devicesZB: [1000, 1770, 2026, 3026],
    devicesValveParams: ["switches"],
    devicesBlindParams: ["switch", "switches"],
    devicesGarageParams: ["switch", "switches"],
    devicesLockParams: ["switch"],
    allowedGroups: ["blind", "garage", "lock"],
-   paramsToKeep: ["bright", "brightness", "channel", "cmd", "colorB", "colorG", "colorR", "current", "currentHumidity", "currentTemperature", "fan", "humidity", "key", "light", "lock", "mainSwitch", "mode", "motion", "online", "power", "rfChl", "rfList", "rfTrig", "sensorType", "speed", "state", "switch", "switches", "temperature", "trigTime", "type", "voltage", "zyx_mode"],
+   paramsToKeep: ["battery", "bright", "brightness", "channel", "cmd", "colorB", "colorG", "colorR", "current", "currentHumidity", "currentTemperature", "fan", "humidity", "key", "light", "lock", "mainSwitch", "mode", "motion", "online", "power", "rfChl", "rfList", "rfTrig", "sensorType", "speed", "state", "switch", "switches", "temperature", "trigTime", "type", "voltage", "zyx_mode"],
    chansFromUiid: {
       1: 1, // "SOCKET"                                  \\ 20, MINI, BASIC, S26
       2: 2, // "SOCKET_2"                                \\ 

From 20340fd2f0be88eef1170c1cdfa0598f131748e6 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 15 Sep 2020 08:12:18 +0100
Subject: [PATCH 0143/3183] battery service for zb devices

---
 lib/eWeLink.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index 50335be5..f4b62df6 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -1865,6 +1865,11 @@ class eWeLink {
    }
    externalZBDeviceUpdate(accessory, params) {
       try { //*** credit @tasict ***\\
+         if (params.hasOwnProperty("battery")) {
+            let batteryService = accessory.getService(Service.BatteryService) || accessory.addService(Service.BatteryService);
+            batteryService.updateCharacteristic(Characteristic.BatteryLevel, params.battery);
+            batteryService.updateCharacteristic(Characteristic.StatusLowBattery, params.battery <= 25);
+         }
          switch (accessory.context.eweUIID) {
             case 1000:
                if (params.hasOwnProperty("key") && [0, 1, 2].includes(params.key)) {

From c9800aa437deef9613ddf08cccf311849b5b6d96 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 15 Sep 2020 09:47:24 +0100
Subject: [PATCH 0144/3183] clarify device format

---
 config.schema.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 664f3935..a6d6cd98 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -98,7 +98,7 @@
                   "deviceId":{
                      "type":"string",
                      "title":"Device ID",
-                     "description":"Device ID from your eWeLink app (ten digits normally in the format 1000******)."
+                     "description":"Device ID from your eWeLink app (ten digits normally in the format 1000ab23cd)."
                   },
                   "type":{
                      "type":"string",
@@ -157,7 +157,7 @@
                   "sensorId":{
                      "type":"string",
                      "title":"Sensor",
-                     "description":"A Sonoff DW2 sensor can optionally be used for blinds and garage doors. This is to determine the current open/closed state of the device. Please enter the 10 digit device ID. Otherwise leave this blank."
+                     "description":"A Sonoff DW2 sensor can optionally be used for blinds and garage doors. This is to determine the current open/closed state of the device. Please enter the 10 digit device ID (normally in the format 1000ab23cd). Otherwise leave this blank."
                   }
                }
             }

From 80c82f6c07a1c92bbc1b1f832f217ff3fcef6d47 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 15 Sep 2020 10:32:36 +0100
Subject: [PATCH 0145/3183] Update constants.js

---
 lib/constants.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/constants.js b/lib/constants.js
index 464ac8ab..3543d717 100644
--- a/lib/constants.js
+++ b/lib/constants.js
@@ -15,7 +15,7 @@ module.exports = {
    devicesBrightable: [36, 44],
    devicesColourable: [22, 59],
    devicesSensor: [102],
-   devicesSensorParams: ["switch"],
+   devicesSensorParams: ["switch", "battery", "type"],
    devicesThermostat: [15],
    devicesThermostatParams: ["currentTemperature", "currentHumidity", "switch", "masterSwitch"],
    devicesFan: [34],

From 31754a36a9fcf20eea37be3bf316f010f4055ccb Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 15 Sep 2020 10:33:15 +0100
Subject: [PATCH 0146/3183] DW2 battery

---
 lib/eWeLink.js | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index f4b62df6..8dec569e 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -109,6 +109,7 @@ class eWeLink {
    }
    initialiseDevice(device) {
       let accessory;
+      // if (device.extra.uiid === 102) this.log.warn(device);
       //*** First add the device if it isn't already in Homebridge. Yeah this code looks a mess :| ***\\
       if (!this.devicesInHB.has(device.deviceid + "SWX") && !this.devicesInHB.has(device.deviceid + "SW0")) {
          if (device.extra.uiid === 2 && device.brandName === "coolkit" && device.productModel === "0285") {
@@ -381,6 +382,7 @@ class eWeLink {
                });
                break;
             case "zb_sub": //*** credit @tasict ***\\
+               accessory.addService(Service.BatteryService);
                switch (device.extra.uiid) {
                   case 1000:
                      accessory.addService(Service.StatelessProgrammableSwitch);
@@ -944,7 +946,10 @@ class eWeLink {
             params = {},
             delay = 0;
          if (sensorDefinition && !(sAccessory = this.devicesInHB.get(garageConfig.sensorId + "SWX"))) {
-            throw "defined sensor doesn't exist";
+            throw "defined DW2 sensor doesn't exist";
+         }
+         if (sAccessory.context.type !== "sensor") {
+            throw "defined DW2 sensor isn't a sensor";
          }
          oldPos = sAccessory ?
             sAccessory.getService(Service.ContactSensor).getCharacteristic(Characteristic.ContactSensorState).value === 0 ? 1 : 0 :
@@ -1547,6 +1552,11 @@ class eWeLink {
          let newState = params.switch === "on" ? 1 : 0,
             oAccessory = false;
          accessory.getService(Service.ContactSensor).updateCharacteristic(Characteristic.ContactSensorState, newState);
+         if (params.hasOwnProperty("battery")) {
+            let batteryService = accessory.getService(Service.BatteryService) || accessory.addService(Service.BatteryService);
+            batteryService.updateCharacteristic(Characteristic.BatteryLevel, params.battery);
+            batteryService.updateCharacteristic(Characteristic.StatusLowBattery, params.battery <= 25);
+         }
          this.cusG.forEach(group => {
             if (group.sensorId === accessory.context.eweDeviceId && group.type === "garage") {
                if ((oAccessory = this.devicesInHB.get(group.deviceId + "SWX"))) {

From 81e566d75802c6443bff8a9936949fa4a7efc2d9 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 15 Sep 2020 10:48:04 +0100
Subject: [PATCH 0147/3183] appSecret to constants

---
 lib/constants.js   | 3 ++-
 lib/eWeLinkHTTP.js | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/constants.js b/lib/constants.js
index 3543d717..0751d683 100644
--- a/lib/constants.js
+++ b/lib/constants.js
@@ -1,7 +1,8 @@
 /* jshint esversion: 9, -W030, node: true */
 "use strict";
 module.exports = {
-   appId: "oeVkj2lYFGnJu5XUtWisfW4utiN4u9Mq",
+   appId: "Uw83EKZFxdif7XFXEsrpduz5YyjP7nTl", // "oeVkj2lYFGnJu5XUtWisfW4utiN4u9Mq"
+   appSecret: "mXLOjea0woSMvK9gw7Fjsy7YlFO4iSu6", // "6Nz4n0xA8s8qdxQf2GqurZj2Fs55FUvM"
    devicesHideable: ["switch", "light", "valve"],
    devicesNonLAN: [22, 59, 102],
    devicesSingleSwitch: [1, 5, 6, 14, 15, 22, 24, 27, 32, 36, 44, 59],
diff --git a/lib/eWeLinkHTTP.js b/lib/eWeLinkHTTP.js
index 6df6fbb9..0382542b 100644
--- a/lib/eWeLinkHTTP.js
+++ b/lib/eWeLinkHTTP.js
@@ -24,7 +24,7 @@ module.exports = class eWeLinkHTTP {
       } else if (this.debug) {
          this.log("Sending HTTP login request.");
       }
-      let dataToSign = crypto.createHmac("sha256", "6Nz4n0xA8s8qdxQf2GqurZj2Fs55FUvM").update(JSON.stringify(data)).digest("base64");
+      let dataToSign = crypto.createHmac("sha256", constants.appSecret).update(JSON.stringify(data)).digest("base64");
       return new Promise((resolve, reject) => {
          axios({
             url: "https://" + this.httpHost + "/v2/user/login",

From c9ce9c77993e542394fbc1fca4b5e90b935b4e1b Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Tue, 15 Sep 2020 12:55:11 +0100
Subject: [PATCH 0148/3183] Create stale.yml

---
 .github/stale.yml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 .github/stale.yml

diff --git a/.github/stale.yml b/.github/stale.yml
new file mode 100644
index 00000000..89b61309
--- /dev/null
+++ b/.github/stale.yml
@@ -0,0 +1,16 @@
+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 7
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 7
+# Issues with these labels will never be considered stale
+exemptLabels:
+# Label to use when marking an issue as stale
+staleLabel: inactive
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: >
+  This issue has been automatically marked as inactive because it has not had
+  recent activity. It will be closed if no further activity occurs. Thank you
+  for your contributions.
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: >
+  This issue has been automatically closed.

From 1b6f9c4560a9e10a890c4c55befc8ca9b02a25b4 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Tue, 15 Sep 2020 16:23:53 +0100
Subject: [PATCH 0149/3183] Update README.md

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 0225eb9e..60323284 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,8 @@
  
  [![verified-by-homebridge](https://badgen.net/badge/homebridge/verified/purple)](https://github.com/homebridge/homebridge/wiki/Verified-Plugins)
  [![Discord](https://img.shields.io/discord/432663330281226270?color=728ED5&logo=discord&label=discord)](https://discord.com/channels/432663330281226270/742733745743855627)
- [![npm](https://img.shields.io/npm/dt/homebridge-ewelink)](https://www.npmjs.com/package/homebridge-ewelink)   
+ [![code style: prettier](https://img.shields.io/badge/code_style-prettier-ff69b4.svg)](https://github.com/prettier/prettier)   
+ [![npm](https://img.shields.io/npm/dt/homebridge-ewelink)](https://www.npmjs.com/package/homebridge-ewelink)
  [![npm](https://img.shields.io/npm/v/homebridge-ewelink/latest?label=release)](https://www.npmjs.com/package/homebridge-ewelink)
  [![npm](https://img.shields.io/npm/v/homebridge-ewelink/beta?label=beta)](https://www.npmjs.com/package/homebridge-ewelink)
 

From bb1be253518800f38ff67aab154e10b45bc928d6 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 15 Sep 2020 16:25:56 +0100
Subject: [PATCH 0150/3183] prettier code

---
 .prettier.ignore   |    5 +
 .prettierrc.json   |    4 +
 config.schema.json |  558 +++---
 index.js           |    6 +-
 lib/constants.js   |  316 ++--
 lib/eWeLink.js     | 4061 +++++++++++++++++++++++---------------------
 lib/eWeLinkHTTP.js |  316 ++--
 lib/eWeLinkLAN.js  |  365 ++--
 lib/eWeLinkWS.js   |  551 +++---
 package-lock.json  | 1248 +++++++-------
 package.json       |  135 +-
 11 files changed, 3955 insertions(+), 3610 deletions(-)
 create mode 100644 .prettier.ignore
 create mode 100644 .prettierrc.json

diff --git a/.prettier.ignore b/.prettier.ignore
new file mode 100644
index 00000000..45fb205e
--- /dev/null
+++ b/.prettier.ignore
@@ -0,0 +1,5 @@
+.DS_Store
+.nova
+.github
+.npm
+node_modules/
\ No newline at end of file
diff --git a/.prettierrc.json b/.prettierrc.json
new file mode 100644
index 00000000..163a0a7e
--- /dev/null
+++ b/.prettierrc.json
@@ -0,0 +1,4 @@
+{
+  "arrowParens": "avoid",
+  "printWidth": 120
+}
diff --git a/config.schema.json b/config.schema.json
index a6d6cd98..ee24e05b 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -1,305 +1,269 @@
 {
-   "pluginAlias":"eWeLink",
-   "pluginType":"platform",
-   "singular":true,
-   "headerDisplay":"Homebridge plugin to control eWeLink devices with original firmware.",
-   "footerDisplay":"For help and support please visit our [GitHub Wiki](https://github.com/bwp91/homebridge-ewelink/wiki).",
-   "schema":{
-      "type":"object",
-      "properties":{
-         "name":{
-            "type":"string",
-            "default":"eWeLink"
-         },
-         "countryCode":{
-            "type":"string",
-            "title":"Country Code",
-            "description":"The telephone country code linked to your eWeLink account (without the +)."
-         },
-         "username":{
-            "type":"string",
-            "title":"Username",
-            "description":"The phone number or email address linked to your eWeLink account. If you use a phone number please enter the country code (with the +), for example +8613185260282."
-         },
-         "password":{
-            "type":"string",
-            "title":"Password",
-            "description":"The password for your eWeLink account."
-         },
-         "debug":{
-            "title":"Debug Logging",
-            "type":"boolean",
-            "required":true,
-            "description":"If enabled, more information will be added to the Homebridge log.",
-            "default":false
-         },
-         "debugReqRes":{
-            "title":"Request & Response Logging",
-            "type":"boolean",
-            "required":true,
-            "description":"If enabled, HTTP, web socket and LAN mode messages will be added to the log. Not recommended for long-term use.",
-            "default":false
-         },
-         "hideDevFromHB":{
-            "type":"string",
-            "title":"Hide Devices",
-            "description":"A list of eWeLink devices to hide from Homebridge. For example '10009553c8' or multiple devices separated with a comma '10009553c8,10009553c9'.",
-            "default":""
-         },
-         "hideFromHB":{
-            "type":"string",
-            "title":"Hide Device Channels",
-            "description":"A list of device channels to hide from Homebridge. For example '10009553c8SW1' or multiple channels separated with a comma '10009553c8SW1,10009553c9SW2'. Only channels from switches, lights and irrigation valves can be hidden.",
-            "default":""
-         },
-         "sensorTimeLength":{
-            "type":"integer",
-            "title":"Sensor Length",
-            "description":"The number of seconds which the sensor tile in the Home app will light up for if a sensor detects something.",
-            "default":60,
-            "minimum":1,
-            "maximum":120
-         },
-         "sensorTimeDifference":{
-            "type":"integer",
-            "title":"Sensor Lag",
-            "description":"An offset in seconds to ignore any notifications if they is a delay between a sensor detecting something and Homebridge receiving the notification.",
-            "default":120,
-            "minimum":10,
-            "maximum":300
-         },
-         "valveTimeLength":{
-            "type":"integer",
-            "title":"Valve Duration",
-            "description":"The default number of seconds that irrigation valves will run for.",
-            "default":20,
-            "minimum": 10,
-            "maximum":1800
-         },
-         "hideTHSwitch":{
-            "title":"Hide TH10/TH16 Switch",
-            "type":"boolean",
-            "description":"If enabled, the switch for the TH10/TH16 devices will be hidden from Homebridge.",
-            "default":false
-         },
-         "hideZBLDPress":{
-            "title":"Hide Double/Long Press",
-            "type":"boolean",
-            "description":"If enabled, double and long press options will be hidden for the ZigBee button.",
-            "default":false
-         },
-         "groups":{
-            "type":"array",
-            "title":"Custom Device Types",
-            "description":"You can use this setting to set up custom device types within Homebridge. Currently only blinds, garage doors and locks are supported.",
-            "items":{
-               "type":"object",
-               "properties":{
-                  "deviceId":{
-                     "type":"string",
-                     "title":"Device ID",
-                     "description":"Device ID from your eWeLink app (ten digits normally in the format 1000ab23cd)."
-                  },
-                  "type":{
-                     "type":"string",
-                     "title":"Type",
-                     "default":"null",
-                     "description":"The new type for this device.",
-                     "oneOf":[
-                        {
-                           "title":"Blind",
-                           "enum":[
-                              "blind"
-                           ]
-                        },
-                        {
-                           "title":"Garage Door",
-                           "enum":[
-                              "garage"
-                           ]
-                        },
-                        {
-                           "title":"Lock",
-                           "enum":[
-                              "lock"
-                           ]
-                        }
-                     ]
-                  },
-                  "setup":{
-                     "type":"string",
-                     "title":"Device Setup",
-                     "default":"null",
-                     "description":"The device setup. Please ignore this setting for locks",
-                     "oneOf":[
-                        {
-                           "title":"One Switch - for up and down",
-                           "enum":[
-                              "oneSwitch"
-                           ]
-                        },
-                        {
-                           "title":"Two Switches - one for up and one for down",
-                           "enum":[
-                              "twoSwitch"
-                           ]
-                        }
-                     ]
-                  },
-                  "operationTime":{
-                     "type":"integer",
-                     "title":"Operation Time",
-                     "description":"For blinds and garage doors this is the total time in deciseconds to fully open/close the device. For locks this is the time to show the Home app tile as unlocked. Count the time in seconds and multiply by 10, for example 100 for 10 seconds or 75 for 7.5 seconds.",
-                     "default":100,
-                     "minimum":10,
-                     "maximum":600
-                  },
-                  "sensorId":{
-                     "type":"string",
-                     "title":"Sensor",
-                     "description":"A Sonoff DW2 sensor can optionally be used for blinds and garage doors. This is to determine the current open/closed state of the device. Please enter the 10 digit device ID (normally in the format 1000ab23cd). Otherwise leave this blank."
-                  }
-               }
-            }
-         },
-         "bridgeSensors":{
-            "type":"array",
-            "title":"Sensors",
-            "description":"You can expose different types of sensors connected to your RF Bridge in HomeKit.",
-            "items":{
-               "type":"object",
-               "properties":{
-                  "deviceId":{
-                     "type":"string",
-                     "title":"RF Bridge Device ID",
-                     "description":"Device ID of your RF Bridge from your eWeLink app (10 digits normally in the format 1000******)."
-                  },
-                  "fullDeviceId":{
-                     "type":"string",
-                     "title":"Sensor Device ID",
-                     "description":"Device ID of the sensor from Homebridge (13 digits normally in the format 1000******SW*)."
-                  },
-                  "type":{
-                     "type":"string",
-                     "title":"Sensor Type",
-                     "default":"motion",
-                     "description":"Select the type of sensor you would like to expose this as in Homebridge.",
-                     "oneOf":[
-                        {
-                           "title":"Motion",
-                           "enum":[
-                              "motion"
-                           ]
-                        },
-                        {
-                           "title":"Smoke/Fire",
-                           "enum":[
-                              "smoke"
-                           ]
-                        },
-                        {
-                           "title":"Water/Leak",
-                           "enum":[
-                              "water"
-                           ]
-                        },
-                        {
-                           "title":"Carbon Monoxide",
-                           "enum":[
-                              "co"
-                           ]
-                        },
-                        {
-                           "title":"Carbon Dioxide",
-                           "enum":[
-                              "co2"
-                           ]
-                        },
-                        {
-                           "title":"Occupancy",
-                           "enum":[
-                              "occupancy"
-                           ]
-                        },
-                        {
-                           "title":"Contact",
-                           "enum":[
-                              "contact"
-                           ]
-                        }
-                     ]
-                  }
-               }
-            }
-         }
+  "pluginAlias": "eWeLink",
+  "pluginType": "platform",
+  "singular": true,
+  "headerDisplay": "Homebridge plugin to control eWeLink devices with original firmware.",
+  "footerDisplay": "For help and support please visit our [GitHub Wiki](https://github.com/bwp91/homebridge-ewelink/wiki).",
+  "schema": {
+    "type": "object",
+    "properties": {
+      "name": {
+        "type": "string",
+        "default": "eWeLink"
       },
-      "required":[
-         "countryCode",
-         "username",
-         "password"
-      ]
-   },
-   "layout":[
-      {
-         "type":"fieldset",
-         "items":[
-            "countryCode",
-            "username",
-            "password"
-         ]
+      "countryCode": {
+        "type": "string",
+        "title": "Country Code",
+        "description": "The telephone country code linked to your eWeLink account (without the +)."
+      },
+      "username": {
+        "type": "string",
+        "title": "Username",
+        "description": "The phone number or email address linked to your eWeLink account. If you use a phone number please enter the country code (with the +), for example +8613185260282."
+      },
+      "password": {
+        "type": "string",
+        "title": "Password",
+        "description": "The password for your eWeLink account."
+      },
+      "debug": {
+        "title": "Debug Logging",
+        "type": "boolean",
+        "required": true,
+        "description": "If enabled, more information will be added to the Homebridge log.",
+        "default": false
+      },
+      "debugReqRes": {
+        "title": "Request & Response Logging",
+        "type": "boolean",
+        "required": true,
+        "description": "If enabled, HTTP, web socket and LAN mode messages will be added to the log. Not recommended for long-term use.",
+        "default": false
+      },
+      "hideDevFromHB": {
+        "type": "string",
+        "title": "Hide Devices",
+        "description": "A list of eWeLink devices to hide from Homebridge. For example '10009553c8' or multiple devices separated with a comma '10009553c8,10009553c9'.",
+        "default": ""
       },
-      {
-         "type":"fieldset",
-         "title":"Optional",
-         "description":"Only adjust these settings if you know what you are doing.",
-         "expandable":true,
-         "items":[
-            "debug",
-            "debugReqRes",
-            "hideDevFromHB",
-            "hideFromHB",
-            "sensorTimeLength",
-            "sensorTimeDifference",
-            "valveTimeLength",
-            "hideTHSwitch",
-            "hideZBLDPress"
-         ]
+      "hideFromHB": {
+        "type": "string",
+        "title": "Hide Device Channels",
+        "description": "A list of device channels to hide from Homebridge. For example '10009553c8SW1' or multiple channels separated with a comma '10009553c8SW1,10009553c9SW2'. Only channels from switches, lights and irrigation valves can be hidden.",
+        "default": ""
       },
-      {
-         "key":"groups",
-         "expandable":true,
-         "title":"Custom Device Types",
-         "add":"Add Another Type",
-         "type":"array",
-         "items":[
-            {
-               "type":"fieldset",
-               "items":[
-                  "groups[].deviceId",
-                  "groups[].type",
-                  "groups[].setup",
-                  "groups[].operationTime",
-                  "groups[].sensorId"
-               ]
+      "sensorTimeLength": {
+        "type": "integer",
+        "title": "Sensor Length",
+        "description": "The number of seconds which the sensor tile in the Home app will light up for if a sensor detects something.",
+        "default": 60,
+        "minimum": 1,
+        "maximum": 120
+      },
+      "sensorTimeDifference": {
+        "type": "integer",
+        "title": "Sensor Lag",
+        "description": "An offset in seconds to ignore any notifications if they is a delay between a sensor detecting something and Homebridge receiving the notification.",
+        "default": 120,
+        "minimum": 10,
+        "maximum": 300
+      },
+      "valveTimeLength": {
+        "type": "integer",
+        "title": "Valve Duration",
+        "description": "The default number of seconds that irrigation valves will run for.",
+        "default": 20,
+        "minimum": 10,
+        "maximum": 1800
+      },
+      "hideTHSwitch": {
+        "title": "Hide TH10/TH16 Switch",
+        "type": "boolean",
+        "description": "If enabled, the switch for the TH10/TH16 devices will be hidden from Homebridge.",
+        "default": false
+      },
+      "hideZBLDPress": {
+        "title": "Hide Double/Long Press",
+        "type": "boolean",
+        "description": "If enabled, double and long press options will be hidden for the ZigBee button.",
+        "default": false
+      },
+      "groups": {
+        "type": "array",
+        "title": "Custom Device Types",
+        "description": "You can use this setting to set up custom device types within Homebridge. Currently only blinds, garage doors and locks are supported.",
+        "items": {
+          "type": "object",
+          "properties": {
+            "deviceId": {
+              "type": "string",
+              "title": "Device ID",
+              "description": "Device ID from your eWeLink app (ten digits normally in the format 1000ab23cd)."
+            },
+            "type": {
+              "type": "string",
+              "title": "Type",
+              "default": "null",
+              "description": "The new type for this device.",
+              "oneOf": [
+                {
+                  "title": "Blind",
+                  "enum": ["blind"]
+                },
+                {
+                  "title": "Garage Door",
+                  "enum": ["garage"]
+                },
+                {
+                  "title": "Lock",
+                  "enum": ["lock"]
+                }
+              ]
+            },
+            "setup": {
+              "type": "string",
+              "title": "Device Setup",
+              "default": "null",
+              "description": "The device setup. Please ignore this setting for locks",
+              "oneOf": [
+                {
+                  "title": "One Switch - for up and down",
+                  "enum": ["oneSwitch"]
+                },
+                {
+                  "title": "Two Switches - one for up and one for down",
+                  "enum": ["twoSwitch"]
+                }
+              ]
+            },
+            "operationTime": {
+              "type": "integer",
+              "title": "Operation Time",
+              "description": "For blinds and garage doors this is the total time in deciseconds to fully open/close the device. For locks this is the time to show the Home app tile as unlocked. Count the time in seconds and multiply by 10, for example 100 for 10 seconds or 75 for 7.5 seconds.",
+              "default": 100,
+              "minimum": 10,
+              "maximum": 600
+            },
+            "sensorId": {
+              "type": "string",
+              "title": "Sensor",
+              "description": "A Sonoff DW2 sensor can optionally be used for blinds and garage doors. This is to determine the current open/closed state of the device. Please enter the 10 digit device ID (normally in the format 1000ab23cd). Otherwise leave this blank."
             }
-         ]
+          }
+        }
       },
-      {
-         "key":"bridgeSensors",
-         "title":"RF Bridge Sensors",
-         "expandable":true,
-         "add":"Add Another Sensor",
-         "type":"array",
-         "items":[
-            {
-               "type":"fieldset",
-               "items":[
-                  "bridgeSensors[].deviceId",
-                  "bridgeSensors[].fullDeviceId",
-                  "bridgeSensors[].type"
-               ]
+      "bridgeSensors": {
+        "type": "array",
+        "title": "Sensors",
+        "description": "You can expose different types of sensors connected to your RF Bridge in HomeKit.",
+        "items": {
+          "type": "object",
+          "properties": {
+            "deviceId": {
+              "type": "string",
+              "title": "RF Bridge Device ID",
+              "description": "Device ID of your RF Bridge from your eWeLink app (10 digits normally in the format 1000******)."
+            },
+            "fullDeviceId": {
+              "type": "string",
+              "title": "Sensor Device ID",
+              "description": "Device ID of the sensor from Homebridge (13 digits normally in the format 1000******SW*)."
+            },
+            "type": {
+              "type": "string",
+              "title": "Sensor Type",
+              "default": "motion",
+              "description": "Select the type of sensor you would like to expose this as in Homebridge.",
+              "oneOf": [
+                {
+                  "title": "Motion",
+                  "enum": ["motion"]
+                },
+                {
+                  "title": "Smoke/Fire",
+                  "enum": ["smoke"]
+                },
+                {
+                  "title": "Water/Leak",
+                  "enum": ["water"]
+                },
+                {
+                  "title": "Carbon Monoxide",
+                  "enum": ["co"]
+                },
+                {
+                  "title": "Carbon Dioxide",
+                  "enum": ["co2"]
+                },
+                {
+                  "title": "Occupancy",
+                  "enum": ["occupancy"]
+                },
+                {
+                  "title": "Contact",
+                  "enum": ["contact"]
+                }
+              ]
             }
-         ]
+          }
+        }
       }
-   ]
-}
\ No newline at end of file
+    },
+    "required": ["countryCode", "username", "password"]
+  },
+  "layout": [
+    {
+      "type": "fieldset",
+      "items": ["countryCode", "username", "password"]
+    },
+    {
+      "type": "fieldset",
+      "title": "Optional",
+      "description": "Only adjust these settings if you know what you are doing.",
+      "expandable": true,
+      "items": [
+        "debug",
+        "debugReqRes",
+        "hideDevFromHB",
+        "hideFromHB",
+        "sensorTimeLength",
+        "sensorTimeDifference",
+        "valveTimeLength",
+        "hideTHSwitch",
+        "hideZBLDPress"
+      ]
+    },
+    {
+      "key": "groups",
+      "expandable": true,
+      "title": "Custom Device Types",
+      "add": "Add Another Type",
+      "type": "array",
+      "items": [
+        {
+          "type": "fieldset",
+          "items": [
+            "groups[].deviceId",
+            "groups[].type",
+            "groups[].setup",
+            "groups[].operationTime",
+            "groups[].sensorId"
+          ]
+        }
+      ]
+    },
+    {
+      "key": "bridgeSensors",
+      "title": "RF Bridge Sensors",
+      "expandable": true,
+      "add": "Add Another Sensor",
+      "type": "array",
+      "items": [
+        {
+          "type": "fieldset",
+          "items": ["bridgeSensors[].deviceId", "bridgeSensors[].fullDeviceId", "bridgeSensors[].type"]
+        }
+      ]
+    }
+  ]
+}
diff --git a/index.js b/index.js
index 4902dd17..d25bb094 100644
--- a/index.js
+++ b/index.js
@@ -1,6 +1,6 @@
 /* jshint esversion: 9, -W030, node: true */
 "use strict";
 module.exports = function (homebridge) {
-   const eWeLink = require("./lib/eWeLink.js")(homebridge);
-   homebridge.registerPlatform("homebridge-ewelink", "eWeLink", eWeLink, true);
-};
\ No newline at end of file
+  const eWeLink = require("./lib/eWeLink.js")(homebridge);
+  homebridge.registerPlatform("homebridge-ewelink", "eWeLink", eWeLink, true);
+};
diff --git a/lib/constants.js b/lib/constants.js
index 0751d683..c8a8f17f 100644
--- a/lib/constants.js
+++ b/lib/constants.js
@@ -1,138 +1,184 @@
 /* jshint esversion: 9, -W030, node: true */
 "use strict";
 module.exports = {
-   appId: "Uw83EKZFxdif7XFXEsrpduz5YyjP7nTl", // "oeVkj2lYFGnJu5XUtWisfW4utiN4u9Mq"
-   appSecret: "mXLOjea0woSMvK9gw7Fjsy7YlFO4iSu6", // "6Nz4n0xA8s8qdxQf2GqurZj2Fs55FUvM"
-   devicesHideable: ["switch", "light", "valve"],
-   devicesNonLAN: [22, 59, 102],
-   devicesSingleSwitch: [1, 5, 6, 14, 15, 22, 24, 27, 32, 36, 44, 59],
-   devicesSingleSwitchParams: ["switch"],
-   devicesMultiSwitch: [2, 3, 4, 7, 8, 9, 29, 30, 31, 34, 41],
-   devicesMultiSwitchParams: ["switches"],
-   devicesSingleSwitchLight: ["T1 1C", "L1", "B1", "B1_R2", "TX1C", "D1", "D1R1", "KING-M4", "Slampher", "GTTA59"],
-   devicesSingleSwitchLightParams: ["switch", "state", "bright", "colorR", "brightness", "channel0", "channel2", "xyz_mode"],
-   devicesMultiSwitchLight: ["T1 2C", "T1 3C", "TX2C", "TX3C"],
-   devicesMultiSwitchLightParams: ["switches"],
-   devicesBrightable: [36, 44],
-   devicesColourable: [22, 59],
-   devicesSensor: [102],
-   devicesSensorParams: ["switch", "battery", "type"],
-   devicesThermostat: [15],
-   devicesThermostatParams: ["currentTemperature", "currentHumidity", "switch", "masterSwitch"],
-   devicesFan: [34],
-   devicesFanParams: ["switches", "light", "fan", "speed"],
-   devicesOutlet: [32],
-   devicesOutletParams: ["switch", "power", "voltage", "current"],
-   devicesCamera: [87],
-   devicesUSB: [77],
-   devicesUSBParams: ["switches"],
-   devicesSCM: [78],
-   devicesSCMParams: ["switches"],
-   devicesRFBridge: [28],
-   devicesRFBridgeParams: ["cmd"],
-   devicesZBBridge: [66],
-   devicesZBBridgeParams: ["key", "temperature", "humidity", "motion", "lock", "trigTime", "battery"],
-   devicesZB: [1000, 1770, 2026, 3026],
-   devicesValveParams: ["switches"],
-   devicesBlindParams: ["switch", "switches"],
-   devicesGarageParams: ["switch", "switches"],
-   devicesLockParams: ["switch"],
-   allowedGroups: ["blind", "garage", "lock"],
-   paramsToKeep: ["battery", "bright", "brightness", "channel", "cmd", "colorB", "colorG", "colorR", "current", "currentHumidity", "currentTemperature", "fan", "humidity", "key", "light", "lock", "mainSwitch", "mode", "motion", "online", "power", "rfChl", "rfList", "rfTrig", "sensorType", "speed", "state", "switch", "switches", "temperature", "trigTime", "type", "voltage", "zyx_mode"],
-   chansFromUiid: {
-      1: 1, // "SOCKET"                                  \\ 20, MINI, BASIC, S26
-      2: 2, // "SOCKET_2"                                \\ 
-      3: 3, // "SOCKET_3"                                \\ 
-      4: 4, // "SOCKET_4",                               \\ 
-      5: 1, // "SOCKET_POWER"                            \\ 
-      6: 1, // "SWITCH"                                  \\ T1 1C, TX1C
-      7: 2, // "SWITCH_2"                                \\ T1 2C, TX2C
-      8: 3, // "SWITCH_3"                                \\ T1 3C, TX3C
-      9: 4, // "SWITCH_4"                                \\ 
-      10: 0, // "OSPF"                                   \\ 
-      11: 0, // "CURTAIN"                                \\ King Q4 Cover
-      12: 0, // "EW-RE"                                  \\ 
-      13: 0, // "FIREPLACE"                              \\ 
-      14: 1, // "SWITCH_CHANGE"                          \\ 
-      15: 1, // "THERMOSTAT"                             \\ TH10, TH16
-      16: 0, // "COLD_WARM_LED"                          \\ 
-      17: 0, // "THREE_GEAR_FAN"                         \\ 
-      18: 0, // "SENSORS_CENTER"                         \\ 
-      19: 0, // "HUMIDIFIER"                             \\ 
-      22: 1, // "RGB_BALL_LIGHT"                         \\ B1, B1_R2
-      23: 0, // "NEST_THERMOSTAT"                        \\ 
-      24: 1, // "GSM_SOCKET"                             \\
-      25: 0, // "AROMATHERAPY",                          \\ Diffuser
-      26: 0, // "RuiMiTeWenKongQi"                       \\
-      27: 1, // "GSM_UNLIMIT_SOCKET"                     \\
-      28: 1, // "RF_BRIDGE"                              \\ RFBridge, RF_Bridge
-      29: 2, // "GSM_SOCKET_2"                           \\
-      30: 3, // "GSM_SOCKET_3"                           \\
-      31: 4, // "GSM_SOCKET_4"                           \\
-      32: 1, // "POWER_DETECTION_SOCKET"                 \\ Pow_R2 POW
-      33: 0, // "LIGHT_BELT",                            \\
-      34: 4, // "FAN_LIGHT"                              \\ iFan02, iFan
-      35: 0, // "EZVIZ_CAMERA",                          \\
-      36: 1, // "SINGLE_CHANNEL_DIMMER_SWITCH"           \\ KING-M4
-      38: 0, // "HOME_KIT_BRIDGE",                       \\
-      40: 0, // "FUJIN_OPS"                              \\
-      41: 4, // "CUN_YOU_DOOR"                           \\
-      42: 0, // "SMART_BEDSIDE_AND_NEW_RGB_BALL_LIGHT"   \\ 
-      43: 0, // "?"                                      \\ 
-      44: 1, // "SNOFF_LIGHT"                            \\ D1
-      45: 0, // "DOWN_CEILING_LIGHT"                     \\
-      46: 0, // "AIR_CLEANER"                            \\
-      49: 0, // "MACHINE_BED"                            \\
-      51: 0, // "COLD_WARM_DESK_LIGHT"                   \\
-      52: 0, // "DOUBLE_COLOR_DEMO_LIGHT"                \\
-      53: 0, // "ELECTRIC_FAN_WITH_LAMP"                 \\
-      55: 0, // "SWEEPING_ROBOT"                         \\
-      56: 0, // "RGB_BALL_LIGHT_4"                       \\
-      57: 0, // "MONOCHROMATIC_BALL_LIGHT"               \\
-      59: 1, // "MUSIC_LIGHT_BELT"                       \\ L1
-      60: 0, // "NEW_HUMIDIFIER"                         \\
-      61: 0, // "KAI_WEI_ROUTER"                         \\
-      62: 0, // "MEARICAMERA"                            \\
-      64: 0, // "HeatingTable"                           \\
-      65: 0, // "CustomCamera"                           \\
-      66: 0, // "ZIGBEE_MAIN_DEVICE"                     \\
-      67: 0, // "RollingDoor"                            \\
-      68: 0, // "KOOCHUWAH"                              \\
-      69: 0, // "ATMOSPHERE_LAMP"                        \\
-      76: 0, // "YI_GE_ER_LAMP"                          \\
-      77: 4, // "SINGLE_SOCKET_MULTIPLE"                 \\ (1 socket device using data structure of four :()
-      78: 4, // "SINGLE_SWITCH_MULTIPLE"                 \\ (1 switch device using data structure of four :()
-      79: 0, // "CHRISTMAS_LIGHT"                        \\
-      80: 0, // "HANYUAN_AIR_CONDITION"                  \\
-      81: 1, // "GSM_SOCKET_NO_FLOW"                     \\
-      82: 2, // "GSM_SOCKET_2_NO_FLOW"                   \\
-      83: 3, // "GSM_SOCKET_3_NO_FLOW"                   \\
-      84: 4, // "GSM_SOCKET_4_NO_FLOW"                   \\
-      86: 0, // "CLEAR_BOOT"                             \\
-      87: 0, // "EWELINK_IOT_CAMERA"                     \\ GK-200MP2B
-      88: 0, // "YK_INFRARED"                            \\
-      89: 0, // "SMART_OPEN_MACHINE"                     \\
-      90: 0, // "GSM_RFBridge"                           \\
-      91: 0, // "ROLLING_DOOR_91"                        \\
-      93: 0, // "HTHD_AIR_CLEANER"                       \\
-      94: 0, // "YIAN_ELECTRIC_PROTECT"                  \\
-      98: 0, // "DOORBELL_RFBRIDGE"                      \\
-      102: 1, // "DOOR_MAGNETIC"                         \\ OPL-DMA, DW2
-      103: 0, // "WOTEWODE_TEM_LIGHT"                    \\
-      104: 0, // "WOTEWODE_RGB_TEM_LIGHT"                \\
-      107: 0, // "GSM_SOCKET_NO_FLOW"                    \\
-      109: 0, // "YK_INFRARED_2"                         \\
-      1000: 1, // "ZIGBEE_WIRELESS_SWITCH"               \\
-      1001: 0, // "BLADELESS_FAN"                        \\
-      1002: 0, // "NEW_HUMIDIFIER"                       \\
-      1003: 0, // "WARM_AIR_BLOWER"                      \\
-      1256: 1, // "ZIGBEE_SINGLE_SWITCH"                 \\
-      1770: 1, // "ZIGBEE_TEMPERATURE_SENSOR"            \\
-      2026: 1, // "ZIGBEE_MOBILE_SENSOR"                 \\
-      2256: 2, // "ZIGBEE_SWITCH_2"                      \\
-      3026: 1, // "ZIGBEE_DOOR_AND_WINDOW_SENSOR"        \\
-      3256: 3, // "ZIGBEE_SWITCH_3"                      \\
-      4026: 1, // "ZIGBEE_WATER_SENSOR"                  \\
-      4256: 4, // "ZIGBEE_SWITCH_4"                      \\
-   }
-};
\ No newline at end of file
+  // appId: "Uw83EKZFxdif7XFXEsrpduz5YyjP7nTl",
+  appId: "oeVkj2lYFGnJu5XUtWisfW4utiN4u9Mq",
+  // appSecret: "mXLOjea0woSMvK9gw7Fjsy7YlFO4iSu6",
+  appSecret: "6Nz4n0xA8s8qdxQf2GqurZj2Fs55FUvM",
+  devicesHideable: ["switch", "light", "valve"],
+  devicesNonLAN: [22, 59, 102],
+  devicesSingleSwitch: [1, 5, 6, 14, 15, 22, 24, 27, 32, 36, 44, 59],
+  devicesSingleSwitchParams: ["switch"],
+  devicesMultiSwitch: [2, 3, 4, 7, 8, 9, 29, 30, 31, 34, 41],
+  devicesMultiSwitchParams: ["switches"],
+  devicesSingleSwitchLight: ["T1 1C", "L1", "B1", "B1_R2", "TX1C", "D1", "D1R1", "KING-M4", "Slampher", "GTTA59"],
+  devicesSingleSwitchLightParams: [
+    "switch",
+    "state",
+    "bright",
+    "colorR",
+    "brightness",
+    "channel0",
+    "channel2",
+    "xyz_mode",
+  ],
+  devicesMultiSwitchLight: ["T1 2C", "T1 3C", "TX2C", "TX3C"],
+  devicesMultiSwitchLightParams: ["switches"],
+  devicesBrightable: [36, 44],
+  devicesColourable: [22, 59],
+  devicesSensor: [102],
+  devicesSensorParams: ["switch", "battery", "type"],
+  devicesThermostat: [15],
+  devicesThermostatParams: ["currentTemperature", "currentHumidity", "switch", "masterSwitch"],
+  devicesFan: [34],
+  devicesFanParams: ["switches", "light", "fan", "speed"],
+  devicesOutlet: [32],
+  devicesOutletParams: ["switch", "power", "voltage", "current"],
+  devicesCamera: [87],
+  devicesUSB: [77],
+  devicesUSBParams: ["switches"],
+  devicesSCM: [78],
+  devicesSCMParams: ["switches"],
+  devicesRFBridge: [28],
+  devicesRFBridgeParams: ["cmd"],
+  devicesZBBridge: [66],
+  devicesZBBridgeParams: ["key", "temperature", "humidity", "motion", "lock", "trigTime", "battery"],
+  devicesZB: [1000, 1770, 2026, 3026],
+  devicesValveParams: ["switches"],
+  devicesBlindParams: ["switch", "switches"],
+  devicesGarageParams: ["switch", "switches"],
+  devicesLockParams: ["switch"],
+  allowedGroups: ["blind", "garage", "lock"],
+  paramsToKeep: [
+    "battery",
+    "bright",
+    "brightness",
+    "channel",
+    "cmd",
+    "colorB",
+    "colorG",
+    "colorR",
+    "current",
+    "currentHumidity",
+    "currentTemperature",
+    "fan",
+    "humidity",
+    "key",
+    "light",
+    "lock",
+    "mainSwitch",
+    "mode",
+    "motion",
+    "online",
+    "power",
+    "rfChl",
+    "rfList",
+    "rfTrig",
+    "sensorType",
+    "speed",
+    "state",
+    "switch",
+    "switches",
+    "temperature",
+    "trigTime",
+    "type",
+    "voltage",
+    "zyx_mode",
+  ],
+  chansFromUiid: {
+    1: 1, // "SOCKET"                                  \\ 20, MINI, BASIC, S26
+    2: 2, // "SOCKET_2"                                \\
+    3: 3, // "SOCKET_3"                                \\
+    4: 4, // "SOCKET_4",                               \\
+    5: 1, // "SOCKET_POWER"                            \\
+    6: 1, // "SWITCH"                                  \\ T1 1C, TX1C
+    7: 2, // "SWITCH_2"                                \\ T1 2C, TX2C
+    8: 3, // "SWITCH_3"                                \\ T1 3C, TX3C
+    9: 4, // "SWITCH_4"                                \\
+    10: 0, // "OSPF"                                   \\
+    11: 0, // "CURTAIN"                                \\ King Q4 Cover
+    12: 0, // "EW-RE"                                  \\
+    13: 0, // "FIREPLACE"                              \\
+    14: 1, // "SWITCH_CHANGE"                          \\
+    15: 1, // "THERMOSTAT"                             \\ TH10, TH16
+    16: 0, // "COLD_WARM_LED"                          \\
+    17: 0, // "THREE_GEAR_FAN"                         \\
+    18: 0, // "SENSORS_CENTER"                         \\
+    19: 0, // "HUMIDIFIER"                             \\
+    22: 1, // "RGB_BALL_LIGHT"                         \\ B1, B1_R2
+    23: 0, // "NEST_THERMOSTAT"                        \\
+    24: 1, // "GSM_SOCKET"                             \\
+    25: 0, // "AROMATHERAPY",                          \\ Diffuser
+    26: 0, // "RuiMiTeWenKongQi"                       \\
+    27: 1, // "GSM_UNLIMIT_SOCKET"                     \\
+    28: 1, // "RF_BRIDGE"                              \\ RFBridge, RF_Bridge
+    29: 2, // "GSM_SOCKET_2"                           \\
+    30: 3, // "GSM_SOCKET_3"                           \\
+    31: 4, // "GSM_SOCKET_4"                           \\
+    32: 1, // "POWER_DETECTION_SOCKET"                 \\ Pow_R2 POW
+    33: 0, // "LIGHT_BELT",                            \\
+    34: 4, // "FAN_LIGHT"                              \\ iFan02, iFan
+    35: 0, // "EZVIZ_CAMERA",                          \\
+    36: 1, // "SINGLE_CHANNEL_DIMMER_SWITCH"           \\ KING-M4
+    38: 0, // "HOME_KIT_BRIDGE",                       \\
+    40: 0, // "FUJIN_OPS"                              \\
+    41: 4, // "CUN_YOU_DOOR"                           \\
+    42: 0, // "SMART_BEDSIDE_AND_NEW_RGB_BALL_LIGHT"   \\
+    43: 0, // "?"                                      \\
+    44: 1, // "SNOFF_LIGHT"                            \\ D1
+    45: 0, // "DOWN_CEILING_LIGHT"                     \\
+    46: 0, // "AIR_CLEANER"                            \\
+    49: 0, // "MACHINE_BED"                            \\
+    51: 0, // "COLD_WARM_DESK_LIGHT"                   \\
+    52: 0, // "DOUBLE_COLOR_DEMO_LIGHT"                \\
+    53: 0, // "ELECTRIC_FAN_WITH_LAMP"                 \\
+    55: 0, // "SWEEPING_ROBOT"                         \\
+    56: 0, // "RGB_BALL_LIGHT_4"                       \\
+    57: 0, // "MONOCHROMATIC_BALL_LIGHT"               \\
+    59: 1, // "MUSIC_LIGHT_BELT"                       \\ L1
+    60: 0, // "NEW_HUMIDIFIER"                         \\
+    61: 0, // "KAI_WEI_ROUTER"                         \\
+    62: 0, // "MEARICAMERA"                            \\
+    64: 0, // "HeatingTable"                           \\
+    65: 0, // "CustomCamera"                           \\
+    66: 0, // "ZIGBEE_MAIN_DEVICE"                     \\
+    67: 0, // "RollingDoor"                            \\
+    68: 0, // "KOOCHUWAH"                              \\
+    69: 0, // "ATMOSPHERE_LAMP"                        \\
+    76: 0, // "YI_GE_ER_LAMP"                          \\
+    77: 4, // "SINGLE_SOCKET_MULTIPLE"                 \\ (1 socket device using data structure of four :()
+    78: 4, // "SINGLE_SWITCH_MULTIPLE"                 \\ (1 switch device using data structure of four :()
+    79: 0, // "CHRISTMAS_LIGHT"                        \\
+    80: 0, // "HANYUAN_AIR_CONDITION"                  \\
+    81: 1, // "GSM_SOCKET_NO_FLOW"                     \\
+    82: 2, // "GSM_SOCKET_2_NO_FLOW"                   \\
+    83: 3, // "GSM_SOCKET_3_NO_FLOW"                   \\
+    84: 4, // "GSM_SOCKET_4_NO_FLOW"                   \\
+    86: 0, // "CLEAR_BOOT"                             \\
+    87: 0, // "EWELINK_IOT_CAMERA"                     \\ GK-200MP2B
+    88: 0, // "YK_INFRARED"                            \\
+    89: 0, // "SMART_OPEN_MACHINE"                     \\
+    90: 0, // "GSM_RFBridge"                           \\
+    91: 0, // "ROLLING_DOOR_91"                        \\
+    93: 0, // "HTHD_AIR_CLEANER"                       \\
+    94: 0, // "YIAN_ELECTRIC_PROTECT"                  \\
+    98: 0, // "DOORBELL_RFBRIDGE"                      \\
+    102: 1, // "DOOR_MAGNETIC"                         \\ OPL-DMA, DW2
+    103: 0, // "WOTEWODE_TEM_LIGHT"                    \\
+    104: 0, // "WOTEWODE_RGB_TEM_LIGHT"                \\
+    107: 0, // "GSM_SOCKET_NO_FLOW"                    \\
+    109: 0, // "YK_INFRARED_2"                         \\
+    1000: 1, // "ZIGBEE_WIRELESS_SWITCH"               \\
+    1001: 0, // "BLADELESS_FAN"                        \\
+    1002: 0, // "NEW_HUMIDIFIER"                       \\
+    1003: 0, // "WARM_AIR_BLOWER"                      \\
+    1256: 1, // "ZIGBEE_SINGLE_SWITCH"                 \\
+    1770: 1, // "ZIGBEE_TEMPERATURE_SENSOR"            \\
+    2026: 1, // "ZIGBEE_MOBILE_SENSOR"                 \\
+    2256: 2, // "ZIGBEE_SWITCH_2"                      \\
+    3026: 1, // "ZIGBEE_DOOR_AND_WINDOW_SENSOR"        \\
+    3256: 3, // "ZIGBEE_SWITCH_3"                      \\
+    4026: 1, // "ZIGBEE_WATER_SENSOR"                  \\
+    4256: 4, // "ZIGBEE_SWITCH_4"                      \\
+  },
+};
diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index 8dec569e..5b87acf8 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -2,1938 +2,2203 @@
 "use strict";
 let Accessory, Characteristic, EveService, EveHistoryService, Service, UUIDGen;
 const cns = require("./constants"),
-   convert = require("color-convert"),
-   corrInterval = require("correcting-interval"),
-   eWeLinkHTTP = require("./eWeLinkHTTP"),
-   eWeLinkWS = require("./eWeLinkWS"),
-   eWeLinkLAN = require("./eWeLinkLAN"),
-   fakegato = require("fakegato-history"),
-   hbLib = require("homebridge-lib");
+  convert = require("color-convert"),
+  corrInterval = require("correcting-interval"),
+  eWeLinkHTTP = require("./eWeLinkHTTP"),
+  eWeLinkWS = require("./eWeLinkWS"),
+  eWeLinkLAN = require("./eWeLinkLAN"),
+  fakegato = require("fakegato-history"),
+  hbLib = require("homebridge-lib");
 class eWeLink {
-   constructor(log, config, api) {
-      if (!log || !api || !config) return;
-      if (!config.username || !config.password || !config.countryCode) {
-         log.error("**************** Cannot load homebridge-ewelink ****************");
-         log.error("Your eWeLink credentials are missing from the Homebridge config.");
-         log.error("****************************************************************");
-         return;
-      }
-      this.log = log;
-      this.config = config;
-      this.api = api;
-      this.debug = this.config.debug || false;
-      this.devicesInHB = new Map();
-      this.devicesInEwe = new Map();
-      this.cusG = new Map();
-      this.cusS = new Map();
-      this.eveLogPath = this.api.user.storagePath() + "/homebridge-ewelink/";
-      this.api
-         .on("didFinishLaunching", () => {
-            this.log("Plugin has finished initialising. Starting synchronisation with eWeLink account.");
-            //*** Set up HTTP client and get the user HTTP host ***\\
-            this.httpClient = new eWeLinkHTTP(this.config, this.log);
-            this.httpClient.getHost()
-               .then(() => this.httpClient.login())
-               .then(res => { //*** Set up the web socket client ***\\
-                  this.wsClient = new eWeLinkWS(this.config, this.log, res);
-                  return this.wsClient.getHost();
-               }).then(() => { //*** Open web socket connection and get device list via HTTP ***\\
-                  this.wsClient.login();
-                  return this.httpClient.getDevices();
-               }).then(res => { //*** Get device IP addresses for LAN mode ***\\
-                  this.httpDevices = res
-                     .filter(device => device.hasOwnProperty("extra") && device.extra.hasOwnProperty("uiid"))
-                     .filter(device => !(this.config.hideDevFromHB || "").includes(device.deviceid));
-                  this.lanClient = new eWeLinkLAN(this.config, this.log, this.httpDevices);
-                  this.httpDevices.forEach(device => this.devicesInEwe.set(device.deviceid, device));
-                  return this.lanClient.getHosts();
-               }).then(res => { //*** Set up the LAN mode listener ***\\
-                  this.lanDevices = res.map;
-                  this.lanDevicesOnline = res.count;
-                  return this.lanClient.startMonitor();
-               }).then(() => { //*** Use the device list to refresh Homebridge accessories ***\\
-                  (() => {
-                     //*** Remove all Homebridge accessories if none found ***\\
-                     if (Object.keys(this.httpDevices).length === 0 && Object.keys(this.lanDevices).length === 0) {
-                        Array.from(this.devicesInHB.values()).forEach(a => this.removeAccessory(a));
-                        this.devicesInHB.clear();
-                        this.log.warn("******* Not loading homebridge-ewelink *******");
-                        this.log.warn("No devices were found in your eWeLink account.");
-                        this.log.warn("**********************************************");
-                        return;
-                     }
-                     //*** Make a map of custom groups from Homebridge config ***\\
-                     if (Object.keys(this.config.groups || []).length > 0) {
-                        this.config.groups
-                           .filter(g => g.hasOwnProperty("type") && cns.allowedGroups.includes(g.type))
-                           .filter(g => g.hasOwnProperty("deviceId") && this.devicesInEwe.has(g.deviceId.toLowerCase()))
-                           .forEach(g => this.cusG.set(g.deviceId + "SWX", g));
-                     }
-                     //*** Make a map of RF Bridge custom sensors from Homebridge config ***\\
-                     if (Object.keys(this.config.bridgeSensors || []).length > 0) {
-                        this.config.bridgeSensors
-                           .filter(s => s.hasOwnProperty("deviceId") && this.devicesInEwe.has(s.deviceId.toLowerCase()))
-                           .forEach(s => this.cusS.set(s.fullDeviceId, s));
-                     }
-                     //*** Logging always helps to see if everything is okay so far ***\\
-                     this.log("[%s] eWeLink devices were loaded from the Homebridge cache.", this.devicesInHB.size);
-                     this.log("[%s] primary devices were loaded from your eWeLink account.", this.devicesInEwe.size);
-                     this.log("[%s] primary devices were discovered on your local network.", this.lanDevicesOnline);
-                     //*** Remove Homebridge accessories that don't appear in eWeLink ***\\
-                     this.devicesInHB.forEach(a => {
-                        if (!this.devicesInEwe.has(a.context.eweDeviceId)) {
-                           this.removeAccessory(a);
-                        }
-                     });
-                     //*** Synchronise devices between eWeLink and Homebridge and set up ws/lan listeners ***\\
-                     this.devicesInEwe.forEach(d => this.initialiseDevice(d));
-                     this.wsClient.receiveUpdate(d => this.receiveDeviceUpdate(d));
-                     this.lanClient.receiveUpdate(d => this.receiveDeviceUpdate(d));
-                     this.log("eWeLink setup complete. If you're enjoying this package please consider a ⭐️  on GitHub :).");
-                     if (this.config.debugReqRes || false) {
-                        this.log.warn("You have 'Request & Response Logging' enabled. This setting is not recommended for long-term use.");
-                     }
-                  })();
-               }).catch(err => {
-                  this.log.error("************** Cannot load homebridge-ewelink **************");
-                  this.log.error(err);
-                  this.log.error("************************************************************");
-                  if (this.lanClient) this.lanClient.closeConnection();
-                  if (this.wsClient) this.wsClient.closeConnection();
-               });
-         })
-         .on('shutdown', () => {
+  constructor(log, config, api) {
+    if (!log || !api || !config) return;
+    if (!config.username || !config.password || !config.countryCode) {
+      log.error("**************** Cannot load homebridge-ewelink ****************");
+      log.error("Your eWeLink credentials are missing from the Homebridge config.");
+      log.error("****************************************************************");
+      return;
+    }
+    this.log = log;
+    this.config = config;
+    this.api = api;
+    this.debug = this.config.debug || false;
+    this.devicesInHB = new Map();
+    this.devicesInEwe = new Map();
+    this.cusG = new Map();
+    this.cusS = new Map();
+    this.eveLogPath = this.api.user.storagePath() + "/homebridge-ewelink/";
+    this.api
+      .on("didFinishLaunching", () => {
+        this.log("Plugin has finished initialising. Starting synchronisation with eWeLink account.");
+        //*** Set up HTTP client and get the user HTTP host ***\\
+        this.httpClient = new eWeLinkHTTP(this.config, this.log);
+        this.httpClient
+          .getHost()
+          .then(() => this.httpClient.login())
+          .then(res => {
+            //*** Set up the web socket client ***\\
+            this.wsClient = new eWeLinkWS(this.config, this.log, res);
+            return this.wsClient.getHost();
+          })
+          .then(() => {
+            //*** Open web socket connection and get device list via HTTP ***\\
+            this.wsClient.login();
+            return this.httpClient.getDevices();
+          })
+          .then(res => {
+            //*** Get device IP addresses for LAN mode ***\\
+            this.httpDevices = res
+              .filter(device => device.hasOwnProperty("extra") && device.extra.hasOwnProperty("uiid"))
+              .filter(device => !(this.config.hideDevFromHB || "").includes(device.deviceid));
+            this.lanClient = new eWeLinkLAN(this.config, this.log, this.httpDevices);
+            this.httpDevices.forEach(device => this.devicesInEwe.set(device.deviceid, device));
+            return this.lanClient.getHosts();
+          })
+          .then(res => {
+            //*** Set up the LAN mode listener ***\\
+            this.lanDevices = res.map;
+            this.lanDevicesOnline = res.count;
+            return this.lanClient.startMonitor();
+          })
+          .then(() => {
+            //*** Use the device list to refresh Homebridge accessories ***\\
+            (() => {
+              //*** Remove all Homebridge accessories if none found ***\\
+              if (Object.keys(this.httpDevices).length === 0 && Object.keys(this.lanDevices).length === 0) {
+                Array.from(this.devicesInHB.values()).forEach(a => this.removeAccessory(a));
+                this.devicesInHB.clear();
+                this.log.warn("******* Not loading homebridge-ewelink *******");
+                this.log.warn("No devices were found in your eWeLink account.");
+                this.log.warn("**********************************************");
+                return;
+              }
+              //*** Make a map of custom groups from Homebridge config ***\\
+              if (Object.keys(this.config.groups || []).length > 0) {
+                this.config.groups
+                  .filter(g => g.hasOwnProperty("type") && cns.allowedGroups.includes(g.type))
+                  .filter(g => g.hasOwnProperty("deviceId") && this.devicesInEwe.has(g.deviceId.toLowerCase()))
+                  .forEach(g => this.cusG.set(g.deviceId + "SWX", g));
+              }
+              //*** Make a map of RF Bridge custom sensors from Homebridge config ***\\
+              if (Object.keys(this.config.bridgeSensors || []).length > 0) {
+                this.config.bridgeSensors
+                  .filter(s => s.hasOwnProperty("deviceId") && this.devicesInEwe.has(s.deviceId.toLowerCase()))
+                  .forEach(s => this.cusS.set(s.fullDeviceId, s));
+              }
+              //*** Logging always helps to see if everything is okay so far ***\\
+              this.log("[%s] eWeLink devices were loaded from the Homebridge cache.", this.devicesInHB.size);
+              this.log("[%s] primary devices were loaded from your eWeLink account.", this.devicesInEwe.size);
+              this.log("[%s] primary devices were discovered on your local network.", this.lanDevicesOnline);
+              //*** Remove Homebridge accessories that don't appear in eWeLink ***\\
+              this.devicesInHB.forEach(a => {
+                if (!this.devicesInEwe.has(a.context.eweDeviceId)) {
+                  this.removeAccessory(a);
+                }
+              });
+              //*** Synchronise devices between eWeLink and Homebridge and set up ws/lan listeners ***\\
+              this.devicesInEwe.forEach(d => this.initialiseDevice(d));
+              this.wsClient.receiveUpdate(d => this.receiveDeviceUpdate(d));
+              this.lanClient.receiveUpdate(d => this.receiveDeviceUpdate(d));
+              this.log("eWeLink setup complete. If you're enjoying this package please consider a ⭐️  on GitHub :).");
+              if (this.config.debugReqRes || false) {
+                this.log.warn(
+                  "You have 'Request & Response Logging' enabled. This setting is not recommended for long-term use."
+                );
+              }
+            })();
+          })
+          .catch(err => {
+            this.log.error("************** Cannot load homebridge-ewelink **************");
+            this.log.error(err);
+            this.log.error("************************************************************");
             if (this.lanClient) this.lanClient.closeConnection();
             if (this.wsClient) this.wsClient.closeConnection();
-         });
-   }
-   initialiseDevice(device) {
-      let accessory;
-      // if (device.extra.uiid === 102) this.log.warn(device);
-      //*** First add the device if it isn't already in Homebridge. Yeah this code looks a mess :| ***\\
-      if (!this.devicesInHB.has(device.deviceid + "SWX") && !this.devicesInHB.has(device.deviceid + "SW0")) {
-         if (device.extra.uiid === 2 && device.brandName === "coolkit" && device.productModel === "0285") {
-            this.addAccessory(device, device.deviceid + "SWX", "valve");
-         } else if (this.cusG.has(device.deviceid + "SWX") && this.cusG.get(device.deviceid + "SWX").type === "blind") {
-            this.addAccessory(device, device.deviceid + "SWX", "blind");
-         } else if (this.cusG.has(device.deviceid + "SWX") && this.cusG.get(device.deviceid + "SWX").type === "garage") {
-            this.addAccessory(device, device.deviceid + "SWX", "garage");
-         } else if (this.cusG.has(device.deviceid + "SWX") && this.cusG.get(device.deviceid + "SWX").type === "lock") {
-            this.addAccessory(device, device.deviceid + "SWX", "lock");
-         } else if (cns.devicesSensor.includes(device.extra.uiid)) {
-            this.addAccessory(device, device.deviceid + "SWX", "sensor");
-         } else if (cns.devicesFan.includes(device.extra.uiid)) {
-            this.addAccessory(device, device.deviceid + "SWX", "fan");
-         } else if (cns.devicesThermostat.includes(device.extra.uiid)) {
-            this.addAccessory(device, device.deviceid + "SWX", "thermostat");
-         } else if (cns.devicesOutlet.includes(device.extra.uiid)) {
-            this.addAccessory(device, device.deviceid + "SWX", "outlet");
-         } else if (cns.devicesUSB.includes(device.extra.uiid)) {
-            this.addAccessory(device, device.deviceid + "SWX", "usb");
-         } else if (cns.devicesSCM.includes(device.extra.uiid)) {
-            this.addAccessory(device, device.deviceid + "SWX", "scm");
-         } else if (cns.devicesSingleSwitch.includes(device.extra.uiid) && cns.devicesSingleSwitchLight.includes(device.productModel)) {
-            this.addAccessory(device, device.deviceid + "SWX", "light");
-         } else if (cns.devicesMultiSwitch.includes(device.extra.uiid) && cns.devicesMultiSwitchLight.includes(device.productModel)) {
-            for (let i = 0; i <= cns.chansFromUiid[device.extra.uiid]; i++) {
-               this.addAccessory(device, device.deviceid + "SW" + i, "light");
-            }
-         } else if (cns.devicesSingleSwitch.includes(device.extra.uiid)) {
-            this.addAccessory(device, device.deviceid + "SWX", "switch");
-         } else if (cns.devicesMultiSwitch.includes(device.extra.uiid)) {
-            for (let i = 0; i <= cns.chansFromUiid[device.extra.uiid]; i++) {
-               this.addAccessory(device, device.deviceid + "SW" + i, "switch");
-            }
-         } else if (cns.devicesRFBridge.includes(device.extra.uiid)) {
-            this.addAccessory(device, device.deviceid + "SW0", "rf_pri");
-            if (Object.keys((device.tags && device.tags.zyx_info) || []).length > 0) {
-               for (let i = 1; i <= Object.keys(device.tags.zyx_info).length; i++) {
-                  this.addAccessory(device, device.deviceid + "SW" + i, "rf_sub");
-               }
+          });
+      })
+      .on("shutdown", () => {
+        if (this.lanClient) this.lanClient.closeConnection();
+        if (this.wsClient) this.wsClient.closeConnection();
+      });
+  }
+  initialiseDevice(device) {
+    let accessory;
+    // if (device.extra.uiid === 102) this.log.warn(device);
+    //*** First add the device if it isn't already in Homebridge. Yeah this code looks a mess :| ***\\
+    if (!this.devicesInHB.has(device.deviceid + "SWX") && !this.devicesInHB.has(device.deviceid + "SW0")) {
+      if (device.extra.uiid === 2 && device.brandName === "coolkit" && device.productModel === "0285") {
+        this.addAccessory(device, device.deviceid + "SWX", "valve");
+      } else if (this.cusG.has(device.deviceid + "SWX") && this.cusG.get(device.deviceid + "SWX").type === "blind") {
+        this.addAccessory(device, device.deviceid + "SWX", "blind");
+      } else if (this.cusG.has(device.deviceid + "SWX") && this.cusG.get(device.deviceid + "SWX").type === "garage") {
+        this.addAccessory(device, device.deviceid + "SWX", "garage");
+      } else if (this.cusG.has(device.deviceid + "SWX") && this.cusG.get(device.deviceid + "SWX").type === "lock") {
+        this.addAccessory(device, device.deviceid + "SWX", "lock");
+      } else if (cns.devicesSensor.includes(device.extra.uiid)) {
+        this.addAccessory(device, device.deviceid + "SWX", "sensor");
+      } else if (cns.devicesFan.includes(device.extra.uiid)) {
+        this.addAccessory(device, device.deviceid + "SWX", "fan");
+      } else if (cns.devicesThermostat.includes(device.extra.uiid)) {
+        this.addAccessory(device, device.deviceid + "SWX", "thermostat");
+      } else if (cns.devicesOutlet.includes(device.extra.uiid)) {
+        this.addAccessory(device, device.deviceid + "SWX", "outlet");
+      } else if (cns.devicesUSB.includes(device.extra.uiid)) {
+        this.addAccessory(device, device.deviceid + "SWX", "usb");
+      } else if (cns.devicesSCM.includes(device.extra.uiid)) {
+        this.addAccessory(device, device.deviceid + "SWX", "scm");
+      } else if (
+        cns.devicesSingleSwitch.includes(device.extra.uiid) &&
+        cns.devicesSingleSwitchLight.includes(device.productModel)
+      ) {
+        this.addAccessory(device, device.deviceid + "SWX", "light");
+      } else if (
+        cns.devicesMultiSwitch.includes(device.extra.uiid) &&
+        cns.devicesMultiSwitchLight.includes(device.productModel)
+      ) {
+        for (let i = 0; i <= cns.chansFromUiid[device.extra.uiid]; i++) {
+          this.addAccessory(device, device.deviceid + "SW" + i, "light");
+        }
+      } else if (cns.devicesSingleSwitch.includes(device.extra.uiid)) {
+        this.addAccessory(device, device.deviceid + "SWX", "switch");
+      } else if (cns.devicesMultiSwitch.includes(device.extra.uiid)) {
+        for (let i = 0; i <= cns.chansFromUiid[device.extra.uiid]; i++) {
+          this.addAccessory(device, device.deviceid + "SW" + i, "switch");
+        }
+      } else if (cns.devicesRFBridge.includes(device.extra.uiid)) {
+        this.addAccessory(device, device.deviceid + "SW0", "rf_pri");
+        if (Object.keys((device.tags && device.tags.zyx_info) || []).length > 0) {
+          for (let i = 1; i <= Object.keys(device.tags.zyx_info).length; i++) {
+            this.addAccessory(device, device.deviceid + "SW" + i, "rf_sub");
+          }
+        }
+      } else if (cns.devicesZBBridge.includes(device.extra.uiid)) {
+        this.addAccessory(device, device.deviceid + "SWX", "zb_pri");
+      } else if (cns.devicesZB.includes(device.extra.uiid)) {
+        this.addAccessory(device, device.deviceid + "SWX", "zb_sub");
+      } else if (cns.devicesCamera.includes(device.extra.uiid)) {
+        this.log.warn(
+          '[%s] please see "https://github.com/bwp91/homebridge-ewelink/wiki/How-to-set-up-Sonoff-Camera".',
+          device.name
+        );
+        return;
+      } else {
+        this.log.warn(
+          "[%s] cannot be added as it is not supported by this plugin. Please make a GitHub issue request.",
+          device.name
+        );
+        return;
+      }
+    }
+    //*** Next refresh the device ***\\
+    if ((accessory = this.devicesInHB.get(device.deviceid + "SWX") || this.devicesInHB.get(device.deviceid + "SW0"))) {
+      let isX = accessory.context.hbDeviceId.substr(-1) === "X",
+        isRfBridge = cns.devicesRFBridge.includes(accessory.context.eweUIID),
+        rfBridgeChange = false;
+      accessory
+        .getService(Service.AccessoryInformation)
+        .setCharacteristic(Characteristic.FirmwareRevision, device.params.fwVersion);
+      accessory.context.reachableWAN = accessory.context.eweUIID !== 102 ? device.online : true;
+      accessory.context.reachableLAN = this.lanDevices.get(device.deviceid).online || false;
+      accessory.context.inUse = false;
+      let str = accessory.context.reachableLAN
+        ? "and locally with IP [" + this.lanDevices.get(device.deviceid).ip + "]"
+        : "but LAN mode unavailable as unsupported/shared device";
+      this.log("[%s] found in eWeLink %s.", accessory.displayName, str);
+      this.devicesInHB.set(accessory.context.hbDeviceId, accessory);
+      if (!isX) {
+        for (let i = 1; i <= accessory.context.channelCount; i++) {
+          if (!this.devicesInHB.has(device.deviceid + "SW" + i)) {
+            if (cns.devicesHideable.includes(accessory.context.type)) {
+              if ((this.config.hideFromHB || "").includes(device.deviceid + "SW" + i)) {
+                continue;
+              } else {
+                this.addAccessory(device, device.deviceid + "SW" + i, "switch");
+              }
             }
-         } else if (cns.devicesZBBridge.includes(device.extra.uiid)) {
-            this.addAccessory(device, device.deviceid + "SWX", "zb_pri");
-         } else if (cns.devicesZB.includes(device.extra.uiid)) {
-            this.addAccessory(device, device.deviceid + "SWX", "zb_sub");
-         } else if (cns.devicesCamera.includes(device.extra.uiid)) {
-            this.log.warn("[%s] please see \"https://github.com/bwp91/homebridge-ewelink/wiki/How-to-set-up-Sonoff-Camera\".", device.name);
-            return;
-         } else {
-            this.log.warn("[%s] cannot be added as it is not supported by this plugin. Please make a GitHub issue request.", device.name);
-            return;
-         }
-      }
-      //*** Next refresh the device ***\\
-      if ((accessory = this.devicesInHB.get(device.deviceid + "SWX") || this.devicesInHB.get(device.deviceid + "SW0"))) {
-         let isX = accessory.context.hbDeviceId.substr(-1) === "X",
-            isRfBridge = cns.devicesRFBridge.includes(accessory.context.eweUIID),
-            rfBridgeChange = false;
-         accessory.getService(Service.AccessoryInformation)
+          }
+          let oAccessory = this.devicesInHB.get(device.deviceid + "SW" + i);
+          if (
+            (this.config.hideFromHB || "").includes(device.deviceid + "SW" + i) &&
+            cns.devicesHideable.includes(accessory.context.type)
+          ) {
+            this.removeAccessory(oAccessory);
+            continue;
+          }
+          if (isRfBridge && oAccessory.context.sensorType !== "button") {
+            let ct = this.cusS.has(oAccessory.context.hbDeviceId)
+              ? this.cusS.get(oAccessory.context.hbDeviceId).type
+              : "motion";
+            if (ct !== oAccessory.context.sensorType) rfBridgeChange = true;
+          }
+          oAccessory
+            .getService(Service.AccessoryInformation)
             .setCharacteristic(Characteristic.FirmwareRevision, device.params.fwVersion);
-         accessory.context.reachableWAN = accessory.context.eweUIID !== 102 ? device.online : true;
-         accessory.context.reachableLAN = this.lanDevices.get(device.deviceid).online || false;
-         accessory.context.inUse = false;
-         let str = accessory.context.reachableLAN ?
-            "and locally with IP [" + this.lanDevices.get(device.deviceid).ip + "]" :
-            "but LAN mode unavailable as unsupported/shared device";
-         this.log("[%s] found in eWeLink %s.", accessory.displayName, str);
-         this.devicesInHB.set(accessory.context.hbDeviceId, accessory);
-         if (!isX) {
-            for (let i = 1; i <= accessory.context.channelCount; i++) {
-               if (!this.devicesInHB.has(device.deviceid + "SW" + i)) {
-                  if (cns.devicesHideable.includes(accessory.context.type)) {
-                     if ((this.config.hideFromHB || "").includes(device.deviceid + "SW" + i)) {
-                        continue;
-                     } else {
-                        this.addAccessory(device, device.deviceid + "SW" + i, "switch");
-                     }
-                  }
-               }
-               let oAccessory = this.devicesInHB.get(device.deviceid + "SW" + i);
-               if ((this.config.hideFromHB || "").includes(device.deviceid + "SW" + i) && cns.devicesHideable.includes(accessory.context.type)) {
-                  this.removeAccessory(oAccessory);
-                  continue;
-               }
-               if (isRfBridge && oAccessory.context.sensorType !== "button") {
-                  let ct = this.cusS.has(oAccessory.context.hbDeviceId) ? this.cusS.get(oAccessory.context.hbDeviceId).type : "motion";
-                  if (ct !== oAccessory.context.sensorType) rfBridgeChange = true;
-               }
-               oAccessory.getService(Service.AccessoryInformation)
-                  .setCharacteristic(Characteristic.FirmwareRevision, device.params.fwVersion);
-               oAccessory.context.reachableWAN = device.online;
-               oAccessory.context.reachableLAN = this.lanDevices.get(device.deviceid).online || false;
-               this.devicesInHB.set(oAccessory.context.hbDeviceId, oAccessory);
-            }
-         }
-         if (rfBridgeChange) {
-            this.log.warn("[%s] bridge configuration changed so devices will be removed and readded.", accessory.displayName);
-            for (let i = 0; i <= accessory.context.channelCount; i++) {
-               let oAccessory = this.devicesInHB.get(device.deviceid + "SW" + i);
-               this.removeAccessory(oAccessory);
-            }
-            this.initialiseDevice(device);
-            return;
-         }
-         if (!this.refreshAccessory(accessory, device.params)) {
-            this.log.warn("[%s] could not be initialised. Please try removing accessory from the Homebridge cache along with any secondary devices (SW1, SW2, etc.) [debug:%s:%s].", accessory.displayName, accessory.context.type, accessory.context.channelCount);
-         }
-      } else {
-         this.log.warn("[%s] cannot be initialised as it wasn't found in Homebridge.", device.name);
-      }
-   }
-   addAccessory(device, hbDeviceId, type) {
-      let switchNumber = hbDeviceId.substr(-1).toString(),
-         newDeviceName = type === "rf_sub" ? device.tags.zyx_info[switchNumber - 1].name : device.name,
-         channelCount = type === "rf_pri" ?
-         Object.keys((device.tags && device.tags.zyx_info) || []).length :
-         cns.chansFromUiid[device.extra.uiid];
-      if (["1", "2", "3", "4"].includes(switchNumber) && type !== "rf_sub") {
-         newDeviceName += " SW" + switchNumber;
-         if ((this.config.hideFromHB || "").includes(hbDeviceId) && cns.devicesHideable.includes(type)) {
-            this.log("[%s] will not be added as per configuration.", newDeviceName);
-            return;
-         }
-      }
-      if ((this.config.nameOverride || {}).hasOwnProperty(hbDeviceId)) {
-         newDeviceName = this.config.nameOverride[hbDeviceId];
-      }
-      const accessory = new Accessory(newDeviceName, UUIDGen.generate(hbDeviceId).toString());
-      try {
-         accessory.getService(Service.AccessoryInformation)
-            .setCharacteristic(Characteristic.SerialNumber, hbDeviceId)
-            .setCharacteristic(Characteristic.Manufacturer, device.brandName)
-            .setCharacteristic(Characteristic.Model, device.productModel + " (" + device.extra.model + ")")
-            .setCharacteristic(Characteristic.FirmwareRevision, device.params.fwVersion)
-            .setCharacteristic(Characteristic.Identify, false);
-         accessory.context = {
-            hbDeviceId,
-            eweDeviceId: device.deviceid,
-            eweUIID: device.extra.uiid,
-            eweModel: device.productModel,
-            eweApiKey: device.apikey,
-            switchNumber,
-            channelCount,
-            type
-         };
-         switch (type) {
-            case "valve":
-               ["A", "B"].forEach(v => {
-                  accessory.addService(Service.Valve, "Valve " + v, "valve" + v.toLowerCase())
-                     .setCharacteristic(Characteristic.Active, 0)
-                     .setCharacteristic(Characteristic.InUse, 0)
-                     .setCharacteristic(Characteristic.ValveType, 1)
-                     .setCharacteristic(Characteristic.SetDuration, (this.config.valveTimeLength || 120))
-                     .addCharacteristic(Characteristic.RemainingDuration);
-               });
-               break;
-            case "blind":
-               accessory.addService(Service.WindowCovering)
-                  .setCharacteristic(Characteristic.CurrentPosition, 100)
-                  .setCharacteristic(Characteristic.TargetPosition, 100)
-                  .setCharacteristic(Characteristic.PositionState, 2);
-               break;
-            case "garage":
-               accessory.addService(Service.GarageDoorOpener)
-                  .setCharacteristic(Characteristic.CurrentDoorState, 1)
-                  .setCharacteristic(Characteristic.TargetDoorState, 1)
-                  .setCharacteristic(Characteristic.ObstructionDetected, false);
-               break;
-            case "lock":
-               accessory.addService(Service.LockMechanism)
-                  .setCharacteristic(Characteristic.LockCurrentState, 1)
-                  .setCharacteristic(Characteristic.LockTargetState, 1);
-               break;
-            case "sensor":
-               accessory.addService(Service.ContactSensor);
-               break;
-            case "fan":
-               accessory.addService(Service.Fanv2);
-               accessory.addService(Service.Lightbulb);
-               break;
-            case "thermostat":
-               if (!this.config.hideTHSwitch) accessory.addService(Service.Switch);
-               accessory.addService(Service.TemperatureSensor);
-               if (device.params.sensorType !== "DS18B20") accessory.addService(Service.HumiditySensor);
-               break;
-            case "outlet":
-               accessory.addService(Service.Outlet);
-               accessory.getService(Service.Outlet).addCharacteristic(EveService.Characteristics.Voltage);
-               accessory.getService(Service.Outlet).addCharacteristic(EveService.Characteristics.CurrentConsumption);
-               accessory.getService(Service.Outlet).addCharacteristic(EveService.Characteristics.ElectricCurrent);
-               accessory.getService(Service.Outlet).addCharacteristic(EveService.Characteristics.TotalConsumption);
-               accessory.getService(Service.Outlet).addCharacteristic(EveService.Characteristics.ResetTotal);
-               accessory.context = {
-                  ...accessory.context,
-                  ...{
-                     extraPersistedData: {},
-                     lastReset: 0,
-                     totalEnergy: 0,
-                     totalEnergyTemp: 0
-                  }
-               };
-               break;
-            case "usb":
-               accessory.addService(Service.Outlet);
-               break;
-            case "light":
-               accessory.addService(Service.Lightbulb);
-               break;
-            case "switch":
-            case "scm":
-               accessory.addService(Service.Switch);
-               break;
-            case "rf_pri":
-               accessory.context.rfChlMap = {};
-               break;
-            case "zb_pri":
-               break;
-            case "rf_sub":
-               accessory.context.rfChls = {};
-               switch (device.tags.zyx_info[parseInt(switchNumber) - 1].remote_type) {
-                  case "1":
-                  case "2":
-                  case "3":
-                  case "4":
-                     accessory.context.sensorType = "button";
-                     break;
-                  case "6":
-                     accessory.context.sensorType = this.cusS.has(hbDeviceId) ? this.cusS.get(hbDeviceId).type : "motion";
-                     break;
-                  default:
-                     throw "unsupported rf device type [" + device.tags.zyx_info[parseInt(switchNumber) - 1].remote_type + "]. Please create an issue on GitHub";
-               }
-               let mAccessory = this.devicesInHB.get(device.deviceid + "SW0");
-               device.tags.zyx_info[parseInt(switchNumber) - 1].buttonName.forEach(button => {
-                  let rfData;
-                  Object.entries(button).forEach(([k, v]) => rfData = {
-                     rfChan: k,
-                     name: v
-                  });
-                  accessory.context.rfChls[rfData.rfChan] = rfData.name;
-                  mAccessory.context.rfChlMap[rfData.rfChan] = switchNumber;
-                  switch (accessory.context.sensorType) {
-                     case "button":
-                        accessory.addService(Service.Switch, rfData.name, "switch" + rfData.rfChan);
-                        break;
-                     case "water":
-                        accessory.addService(Service.LeakSensor);
-                        break;
-                     case "fire":
-                     case "smoke":
-                        accessory.addService(Service.SmokeSensor);
-                        break;
-                     case "co":
-                        accessory.addService(Service.CarbonMonoxideSensor);
-                        break;
-                     case "co2":
-                        accessory.addService(Service.CarbonDioxideSensor);
-                        break;
-                     case "contact":
-                        accessory.addService(Service.ContactSensor);
-                        break;
-                     case "occupancy":
-                        accessory.addService(Service.OccupancySensor);
-                        break;
-                     default:
-                        accessory.addService(Service.MotionSensor);
-                        break;
-                  }
-                  this.devicesInHB.set(mAccessory.context.hbDeviceId, mAccessory);
-               });
-               break;
-            case "zb_sub": //*** credit @tasict ***\\
-               accessory.addService(Service.BatteryService);
-               switch (device.extra.uiid) {
-                  case 1000:
-                     accessory.addService(Service.StatelessProgrammableSwitch);
-                     if (this.config.hideZBLDPress) {
-                        accessory.getService(Service.StatelessProgrammableSwitch)
-                           .getCharacteristic(Characteristic.ProgrammableSwitchEvent)
-                           .setProps({
-                              validValues: [0]
-                           });
-                     }
-                     break;
-                  case 1770:
-                     accessory.addService(Service.TemperatureSensor);
-                     accessory.addService(Service.HumiditySensor);
-                     break;
-                  case 2026:
-                     accessory.addService(Service.MotionSensor);
-                     break;
-                  case 3026:
-                     accessory.addService(Service.ContactSensor);
-                     break;
-                  default:
-                     throw "unsupported zigbee device type [" + device.extra.uiid + "]. Please create an issue on GitHub";
-               }
-               break;
+          oAccessory.context.reachableWAN = device.online;
+          oAccessory.context.reachableLAN = this.lanDevices.get(device.deviceid).online || false;
+          this.devicesInHB.set(oAccessory.context.hbDeviceId, oAccessory);
+        }
+      }
+      if (rfBridgeChange) {
+        this.log.warn(
+          "[%s] bridge configuration changed so devices will be removed and readded.",
+          accessory.displayName
+        );
+        for (let i = 0; i <= accessory.context.channelCount; i++) {
+          let oAccessory = this.devicesInHB.get(device.deviceid + "SW" + i);
+          this.removeAccessory(oAccessory);
+        }
+        this.initialiseDevice(device);
+        return;
+      }
+      if (!this.refreshAccessory(accessory, device.params)) {
+        this.log.warn(
+          "[%s] could not be initialised. Please try removing accessory from the Homebridge cache along with any secondary devices (SW1, SW2, etc.) [debug:%s:%s].",
+          accessory.displayName,
+          accessory.context.type,
+          accessory.context.channelCount
+        );
+      }
+    } else {
+      this.log.warn("[%s] cannot be initialised as it wasn't found in Homebridge.", device.name);
+    }
+  }
+  addAccessory(device, hbDeviceId, type) {
+    let switchNumber = hbDeviceId.substr(-1).toString(),
+      newDeviceName = type === "rf_sub" ? device.tags.zyx_info[switchNumber - 1].name : device.name,
+      channelCount =
+        type === "rf_pri"
+          ? Object.keys((device.tags && device.tags.zyx_info) || []).length
+          : cns.chansFromUiid[device.extra.uiid];
+    if (["1", "2", "3", "4"].includes(switchNumber) && type !== "rf_sub") {
+      newDeviceName += " SW" + switchNumber;
+      if ((this.config.hideFromHB || "").includes(hbDeviceId) && cns.devicesHideable.includes(type)) {
+        this.log("[%s] will not be added as per configuration.", newDeviceName);
+        return;
+      }
+    }
+    if ((this.config.nameOverride || {}).hasOwnProperty(hbDeviceId)) {
+      newDeviceName = this.config.nameOverride[hbDeviceId];
+    }
+    const accessory = new Accessory(newDeviceName, UUIDGen.generate(hbDeviceId).toString());
+    try {
+      accessory
+        .getService(Service.AccessoryInformation)
+        .setCharacteristic(Characteristic.SerialNumber, hbDeviceId)
+        .setCharacteristic(Characteristic.Manufacturer, device.brandName)
+        .setCharacteristic(Characteristic.Model, device.productModel + " (" + device.extra.model + ")")
+        .setCharacteristic(Characteristic.FirmwareRevision, device.params.fwVersion)
+        .setCharacteristic(Characteristic.Identify, false);
+      accessory.context = {
+        hbDeviceId,
+        eweDeviceId: device.deviceid,
+        eweUIID: device.extra.uiid,
+        eweModel: device.productModel,
+        eweApiKey: device.apikey,
+        switchNumber,
+        channelCount,
+        type,
+      };
+      switch (type) {
+        case "valve":
+          ["A", "B"].forEach(v => {
+            accessory
+              .addService(Service.Valve, "Valve " + v, "valve" + v.toLowerCase())
+              .setCharacteristic(Characteristic.Active, 0)
+              .setCharacteristic(Characteristic.InUse, 0)
+              .setCharacteristic(Characteristic.ValveType, 1)
+              .setCharacteristic(Characteristic.SetDuration, this.config.valveTimeLength || 120)
+              .addCharacteristic(Characteristic.RemainingDuration);
+          });
+          break;
+        case "blind":
+          accessory
+            .addService(Service.WindowCovering)
+            .setCharacteristic(Characteristic.CurrentPosition, 100)
+            .setCharacteristic(Characteristic.TargetPosition, 100)
+            .setCharacteristic(Characteristic.PositionState, 2);
+          break;
+        case "garage":
+          accessory
+            .addService(Service.GarageDoorOpener)
+            .setCharacteristic(Characteristic.CurrentDoorState, 1)
+            .setCharacteristic(Characteristic.TargetDoorState, 1)
+            .setCharacteristic(Characteristic.ObstructionDetected, false);
+          break;
+        case "lock":
+          accessory
+            .addService(Service.LockMechanism)
+            .setCharacteristic(Characteristic.LockCurrentState, 1)
+            .setCharacteristic(Characteristic.LockTargetState, 1);
+          break;
+        case "sensor":
+          accessory.addService(Service.ContactSensor);
+          break;
+        case "fan":
+          accessory.addService(Service.Fanv2);
+          accessory.addService(Service.Lightbulb);
+          break;
+        case "thermostat":
+          if (!this.config.hideTHSwitch) accessory.addService(Service.Switch);
+          accessory.addService(Service.TemperatureSensor);
+          if (device.params.sensorType !== "DS18B20") accessory.addService(Service.HumiditySensor);
+          break;
+        case "outlet":
+          accessory.addService(Service.Outlet);
+          accessory.getService(Service.Outlet).addCharacteristic(EveService.Characteristics.Voltage);
+          accessory.getService(Service.Outlet).addCharacteristic(EveService.Characteristics.CurrentConsumption);
+          accessory.getService(Service.Outlet).addCharacteristic(EveService.Characteristics.ElectricCurrent);
+          accessory.getService(Service.Outlet).addCharacteristic(EveService.Characteristics.TotalConsumption);
+          accessory.getService(Service.Outlet).addCharacteristic(EveService.Characteristics.ResetTotal);
+          accessory.context = {
+            ...accessory.context,
+            ...{
+              extraPersistedData: {},
+              lastReset: 0,
+              totalEnergy: 0,
+              totalEnergyTemp: 0,
+            },
+          };
+          break;
+        case "usb":
+          accessory.addService(Service.Outlet);
+          break;
+        case "light":
+          accessory.addService(Service.Lightbulb);
+          break;
+        case "switch":
+        case "scm":
+          accessory.addService(Service.Switch);
+          break;
+        case "rf_pri":
+          accessory.context.rfChlMap = {};
+          break;
+        case "zb_pri":
+          break;
+        case "rf_sub":
+          accessory.context.rfChls = {};
+          switch (device.tags.zyx_info[parseInt(switchNumber) - 1].remote_type) {
+            case "1":
+            case "2":
+            case "3":
+            case "4":
+              accessory.context.sensorType = "button";
+              break;
+            case "6":
+              accessory.context.sensorType = this.cusS.has(hbDeviceId) ? this.cusS.get(hbDeviceId).type : "motion";
+              break;
             default:
-               throw "device is not supported by this plugin. Please create an issue on GitHub";
-         }
-         this.devicesInHB.set(hbDeviceId, accessory);
-         this.api.registerPlatformAccessories("homebridge-ewelink", "eWeLink", [accessory]);
-         this.configureAccessory(accessory);
-         this.log("[%s] has been added to Homebridge.", newDeviceName);
-      } catch (err) {
-         this.log.warn("[%s] could not be added as %s.", newDeviceName, err);
-      }
-   }
-   configureAccessory(accessory) {
-      if (!this.log) return;
-      try {
-         accessory.context.reachableWAN = true;
-         accessory.context.reachableLAN = true;
-         switch (accessory.context.type) {
-            case "valve":
-               ["A", "B"].forEach(v => {
-                  accessory.getService("Valve " + v).getCharacteristic(Characteristic.Active)
-                     .on("set", (value, callback) => this.internalValveUpdate(accessory, "Valve " + v, value, callback));
-                  accessory.getService("Valve " + v).getCharacteristic(Characteristic.SetDuration)
-                     .on("set", (value, callback) => {
-                        if (accessory.getService("Valve " + v).getCharacteristic(Characteristic.InUse).value) {
-                           accessory.getService("Valve " + v).updateCharacteristic(Characteristic.RemainingDuration, value);
-                           clearTimeout(accessory.getService("Valve " + v).timer);
-                           accessory.getService("Valve " + v).timer = setTimeout(() => {
-                              accessory.getService("Valve " + v).setCharacteristic(Characteristic.Active, 0);
-                           }, value * 1000);
-                        }
-                        callback();
-                     });
-               });
-               break;
-            case "blind":
-               accessory.getService(Service.WindowCovering).getCharacteristic(Characteristic.TargetPosition)
-                  .on("set", (value, callback) => this.internalBlindUpdate(accessory, value, callback))
-                  .setProps({
-                     minStep: 100
-                  });
-               break;
-            case "garage":
-               accessory.getService(Service.GarageDoorOpener).getCharacteristic(Characteristic.TargetDoorState)
-                  .on("set", (value, callback) => this.internalGarageUpdate(accessory, value, callback));
-               break;
-            case "lock":
-               accessory.getService(Service.LockMechanism).getCharacteristic(Characteristic.LockTargetState)
-                  .on("set", (value, callback) => this.internalLockUpdate(accessory, value, callback));
-               break;
-            case "fan":
-               accessory.getService(Service.Fanv2).getCharacteristic(Characteristic.Active)
-                  .on("set", (value, callback) => this.internalFanUpdate(accessory, "power", value, callback));
-               accessory.getService(Service.Fanv2).getCharacteristic(Characteristic.RotationSpeed)
-                  .on("set", (value, callback) => this.internalFanUpdate(accessory, "speed", value, callback))
+              throw (
+                "unsupported rf device type [" +
+                device.tags.zyx_info[parseInt(switchNumber) - 1].remote_type +
+                "]. Please create an issue on GitHub"
+              );
+          }
+          let mAccessory = this.devicesInHB.get(device.deviceid + "SW0");
+          device.tags.zyx_info[parseInt(switchNumber) - 1].buttonName.forEach(button => {
+            let rfData;
+            Object.entries(button).forEach(
+              ([k, v]) =>
+                (rfData = {
+                  rfChan: k,
+                  name: v,
+                })
+            );
+            accessory.context.rfChls[rfData.rfChan] = rfData.name;
+            mAccessory.context.rfChlMap[rfData.rfChan] = switchNumber;
+            switch (accessory.context.sensorType) {
+              case "button":
+                accessory.addService(Service.Switch, rfData.name, "switch" + rfData.rfChan);
+                break;
+              case "water":
+                accessory.addService(Service.LeakSensor);
+                break;
+              case "fire":
+              case "smoke":
+                accessory.addService(Service.SmokeSensor);
+                break;
+              case "co":
+                accessory.addService(Service.CarbonMonoxideSensor);
+                break;
+              case "co2":
+                accessory.addService(Service.CarbonDioxideSensor);
+                break;
+              case "contact":
+                accessory.addService(Service.ContactSensor);
+                break;
+              case "occupancy":
+                accessory.addService(Service.OccupancySensor);
+                break;
+              default:
+                accessory.addService(Service.MotionSensor);
+                break;
+            }
+            this.devicesInHB.set(mAccessory.context.hbDeviceId, mAccessory);
+          });
+          break;
+        case "zb_sub": //*** credit @tasict ***\\
+          accessory.addService(Service.BatteryService);
+          switch (device.extra.uiid) {
+            case 1000:
+              accessory.addService(Service.StatelessProgrammableSwitch);
+              if (this.config.hideZBLDPress) {
+                accessory
+                  .getService(Service.StatelessProgrammableSwitch)
+                  .getCharacteristic(Characteristic.ProgrammableSwitchEvent)
                   .setProps({
-                     minStep: 33
-                  });
-               accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On)
-                  .on("set", (value, callback) => this.internalFanUpdate(accessory, "light", value, callback));
-               break;
-            case "thermostat":
-               if (!this.config.hideTHSwitch) {
-                  accessory.getService(Service.Switch).getCharacteristic(Characteristic.On)
-                     .on("set", (value, callback) => this.internalThermostatUpdate(accessory, value, callback));
-               }
-               accessory.log = this.log;
-               accessory.eveLogger = new EveHistoryService("weather", accessory, {
-                  storage: "fs",
-                  minutes: 5,
-                  path: this.eveLogPath
-               });
-               corrInterval.setCorrectingInterval(() => {
-                  let dataToAdd = {
-                     time: Date.now(),
-                     temp: accessory.getService(Service.TemperatureSensor).getCharacteristic(Characteristic.CurrentTemperature).value
-                  };
-                  if (accessory.getService(Service.HumiditySensor)) {
-                     dataToAdd.humidity = accessory.getService(Service.HumiditySensor).getCharacteristic(Characteristic.CurrentRelativeHumidity).value;
-                  }
-                  accessory.eveLogger.addEntry(dataToAdd);
-               }, 300000);
-               break;
-            case "outlet":
-               accessory.getService(Service.Outlet).getCharacteristic(Characteristic.On)
-                  .on("set", (value, callback) => this.internalOutletUpdate(accessory, value, callback));
-               accessory.log = this.log;
-               accessory.eveLogger = new EveHistoryService("energy", accessory, {
-                  storage: "fs",
-                  minutes: 5,
-                  path: this.eveLogPath
-               });
-               if (!accessory.context.hasOwnProperty("lastReset")) {
-                  accessory.context = {
-                     ...accessory.context,
-                     ...{
-                        extraPersistedData: {},
-                        lastReset: 0,
-                        totalEnergy: 0,
-                        totalEnergyTemp: 0
-                     }
-                  };
-               }
-               corrInterval.setCorrectingInterval(() => {
-                  let isOn = accessory.getService(Service.Outlet).getCharacteristic(Characteristic.On).value,
-                     currentWatt = isOn ? accessory.getService(Service.Outlet)
-                     .getCharacteristic(EveService.Characteristics.CurrentConsumption).value : 0;
-                  if (accessory.eveLogger.isHistoryLoaded()) {
-                     accessory.context.extraPersistedData = accessory.eveLogger.getExtraPersistedData();
-                     if (accessory.context.extraPersistedData !== undefined) {
-                        accessory.context.totalEnergy = accessory.context.extraPersistedData.totalenergy + accessory.context.totalEnergyTemp + currentWatt * 10 / 3600 / 1000;
-                        accessory.eveLogger.setExtraPersistedData({
-                           totalenergy: accessory.context.totalEnergy,
-                           lastReset: accessory.context.extraPersistedData.lastReset
-                        });
-                     } else {
-                        accessory.context.totalEnergy = accessory.context.totalEnergyTemp + currentWatt * 10 / 3600 / 1000;
-                        accessory.eveLogger.setExtraPersistedData({
-                           totalenergy: accessory.context.totalEnergy,
-                           lastReset: 0
-                        });
-                     }
-                     accessory.context.totalEnergytemp = 0;
-                  } else {
-                     accessory.context.totalEnergyTemp += currentWatt * 10 / 3600 / 1000;
-                     accessory.context.totalEnergy = accessory.context.totalEnergyTemp;
-                  }
-                  accessory.eveLogger.addEntry({
-                     time: Date.now(),
-                     power: currentWatt
-                  });
-               }, 300000);
-               accessory.getService(Service.Outlet).getCharacteristic(EveService.Characteristics.TotalConsumption)
-                  .on("get", callback => {
-                     accessory.context.extraPersistedData = accessory.eveLogger.getExtraPersistedData();
-                     if (accessory.context.extraPersistedData !== undefined) {
-                        accessory.context.totalEnergy = accessory.context.extraPersistedData.totalPower;
-                     }
-                     callback(null, accessory.context.totalEnergy);
-                  });
-               accessory.getService(Service.Outlet).getCharacteristic(EveService.Characteristics.ResetTotal)
-                  .on("set", (value, callback) => {
-                     accessory.context.totalEnergy = 0;
-                     accessory.context.lastReset = value;
-                     accessory.eveLogger.setExtraPersistedData({
-                        totalPower: 0,
-                        lastReset: value
-                     });
-                     callback();
-                  })
-                  .on("get", callback => {
-                     accessory.context.extraPersistedData = accessory.eveLogger.getExtraPersistedData();
-                     if (accessory.context.extraPersistedData !== undefined) {
-                        accessory.context.lastReset = accessory.context.extraPersistedData.lastReset;
-                     }
-                     callback(null, accessory.context.lastReset);
+                    validValues: [0],
                   });
-               break;
-            case "usb":
-               accessory.getService(Service.Outlet).getCharacteristic(Characteristic.On)
-                  .on("set", (value, callback) => this.internalUSBUpdate(accessory, value, callback));
-               break;
-            case "scm":
-               accessory.getService(Service.Switch).getCharacteristic(Characteristic.On)
-                  .on("set", (value, callback) => this.internalSCMUpdate(accessory, value, callback));
-               break;
-            case "light":
-               accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On)
-                  .on("set", (value, callback) => this.internalLightbulbUpdate(accessory, value, callback));
-               if (cns.devicesBrightable.includes(accessory.context.eweUIID)) {
-                  accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.Brightness)
-                     .on("set", (value, callback) => {
-                        if (value > 0) {
-                           if (!accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On).value) {
-                              this.internalLightbulbUpdate(accessory, true, function() {
-                                 return;
-                              });
-                           }
-                           this.internalBrightnessUpdate(accessory, value, callback);
-                        } else {
-                           this.internalLightbulbUpdate(accessory, false, callback);
-                        }
-                     });
-               } else if (cns.devicesColourable.includes(accessory.context.eweUIID)) {
-                  accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.Brightness)
-                     .on("set", (value, callback) => {
-                        if (value > 0) {
-                           if (!accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On).value) {
-                              this.internalLightbulbUpdate(accessory, true, function() {
-                                 return;
-                              });
-                           }
-                           this.internalHSBUpdate(accessory, "bri", value, callback);
-                        } else {
-                           this.internalLightbulbUpdate(accessory, false, callback);
-                        }
-                     });
-                  accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.Hue)
-                     .on("set", (value, callback) => this.internalHSBUpdate(accessory, "hue", value, callback));
-                  accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.Saturation)
-                     .on("set", (value, callback) => callback());
-               }
-               break;
-            case "switch":
-               accessory.getService(Service.Switch).getCharacteristic(Characteristic.On)
-                  .on("set", (value, callback) => this.internalSwitchUpdate(accessory, value, callback));
-               break;
-            case "rf_sub":
-               accessory.context.rfChls = accessory.context.rfChls || {};
-               if (accessory.context.sensorType === "button") {
-                  Object.entries(accessory.context.rfChls).forEach(([k, v]) => {
-                     accessory.getService(v).updateCharacteristic(Characteristic.On, false);
-                     accessory.getService(v).getCharacteristic(Characteristic.On)
-                        .on("set", (value, callback) => {
-                           value ? this.internalRFDeviceUpdate(accessory, k, callback) : callback();
-                        });
-                  });
-               }
-               break;
-            case "zb_sub":
-               if (accessory.context.eweUIID === 1770) {
-                  accessory.log = this.log;
-                  accessory.eveLogger = new EveHistoryService("weather", accessory, {
-                     storage: "fs",
-                     minutes: 5,
-                     path: this.eveLogPath
-                  });
-                  corrInterval.setCorrectingInterval(() => {
-                     let dataToAdd = {
-                        time: Date.now(),
-                        temp: accessory.getService(Service.TemperatureSensor).getCharacteristic(Characteristic.CurrentTemperature).value,
-                        humidity: accessory.getService(Service.HumiditySensor).getCharacteristic(Characteristic.CurrentRelativeHumidity).value
-                     };
-                     accessory.eveLogger.addEntry(dataToAdd);
-                  }, 300000);
-               }
-               break;
-         }
-         this.devicesInHB.set(accessory.context.hbDeviceId, accessory);
-      } catch (err) {
-         this.log.warn("[%s] could not be refreshed as %s.", accessory.displayName, err);
-      }
-   }
-   refreshAccessory(accessory, newParams) {
+              }
+              break;
+            case 1770:
+              accessory.addService(Service.TemperatureSensor);
+              accessory.addService(Service.HumiditySensor);
+              break;
+            case 2026:
+              accessory.addService(Service.MotionSensor);
+              break;
+            case 3026:
+              accessory.addService(Service.ContactSensor);
+              break;
+            default:
+              throw "unsupported zigbee device type [" + device.extra.uiid + "]. Please create an issue on GitHub";
+          }
+          break;
+        default:
+          throw "device is not supported by this plugin. Please create an issue on GitHub";
+      }
+      this.devicesInHB.set(hbDeviceId, accessory);
+      this.api.registerPlatformAccessories("homebridge-ewelink", "eWeLink", [accessory]);
+      this.configureAccessory(accessory);
+      this.log("[%s] has been added to Homebridge.", newDeviceName);
+    } catch (err) {
+      this.log.warn("[%s] could not be added as %s.", newDeviceName, err);
+    }
+  }
+  configureAccessory(accessory) {
+    if (!this.log) return;
+    try {
+      accessory.context.reachableWAN = true;
+      accessory.context.reachableLAN = true;
       switch (accessory.context.type) {
-         case "valve":
-            if (Object.keys(newParams).some(v => cns.devicesValveParams.includes(v)) && Array.isArray(newParams.switches)) {
-               this.externalValveUpdate(accessory, newParams);
-            }
-            return true;
-         case "blind":
-            if (Object.keys(newParams).some(v => cns.devicesBlindParams.includes(v)) && Array.isArray(newParams.switches)) {
-               this.externalBlindUpdate(accessory, newParams);
-            }
-            return true;
-         case "garage":
-            if (Object.keys(newParams).some(v => cns.devicesGarageParams.includes(v)) && Array.isArray(newParams.switches)) {
-               this.externalGarageUpdate(accessory, newParams);
-            }
-            return true;
-         case "lock":
-            if (Object.keys(newParams).some(v => cns.devicesLockParams.includes(v))) {
-               this.externalLockUpdate(accessory, newParams);
-            }
-            return true;
-         case "sensor":
-            if (Object.keys(newParams).some(v => cns.devicesSensorParams.includes(v))) {
-               this.externalSensorUpdate(accessory, newParams);
-            }
-            return true;
-         case "fan":
-            if (Object.keys(newParams).some(v => cns.devicesFanParams.includes(v))) {
-               this.externalFanUpdate(accessory, newParams);
-            }
-            return true;
-         case "thermostat":
-            if (Object.keys(newParams).some(v => cns.devicesThermostatParams.includes(v))) {
-               this.externalThermostatUpdate(accessory, newParams);
-            }
-            return true;
-         case "outlet":
-            if (Object.keys(newParams).some(v => cns.devicesOutletParams.includes(v))) {
-               this.externalOutletUpdate(accessory, newParams);
-            }
-            return true;
-         case "usb":
-            if (Object.keys(newParams).some(v => cns.devicesUSBParams.includes(v)) && Array.isArray(newParams.switches)) {
-               this.externalUSBUpdate(accessory, newParams);
-            }
-            return true;
-         case "scm":
-            if (Object.keys(newParams).some(v => cns.devicesSCMParams.includes(v)) && Array.isArray(newParams.switches)) {
-               this.externalSCMUpdate(accessory, newParams);
-            }
-            return true;
-         case "light":
-            if (cns.devicesSingleSwitch.includes(accessory.context.eweUIID) && cns.devicesSingleSwitchLight.includes(accessory.context.eweModel)) {
-               if (Object.keys(newParams).some(v => cns.devicesSingleSwitchLightParams.includes(v))) {
-                  this.externalSingleLightUpdate(accessory, newParams);
-               }
-            } else if (cns.devicesMultiSwitch.includes(accessory.context.eweUIID) && cns.devicesMultiSwitchLight.includes(accessory.context.eweModel)) {
-               if (Object.keys(newParams).some(v => cns.devicesMultiSwitchLightParams.includes(v)) && Array.isArray(newParams.switches)) {
-                  this.externalMultiLightUpdate(accessory, newParams);
-               }
-            }
-            return true;
-         case "switch":
-            if (cns.devicesSingleSwitch.includes(accessory.context.eweUIID)) {
-               if (Object.keys(newParams).some(v => cns.devicesSingleSwitchParams.includes(v))) {
-                  this.externalSingleSwitchUpdate(accessory, newParams);
-               }
-            } else if (cns.devicesMultiSwitch.includes(accessory.context.eweUIID)) {
-               if (Object.keys(newParams).some(v => cns.devicesMultiSwitchParams.includes(v)) && Array.isArray(newParams.switches)) {
-                  this.externalMultiSwitchUpdate(accessory, newParams);
-               }
-            }
-            return true;
-         case "rf_pri":
-            if (Object.keys(newParams).some(v => cns.devicesRFBridgeParams.includes(v))) {
-               this.externalRFDeviceUpdate(accessory, newParams);
+        case "valve":
+          ["A", "B"].forEach(v => {
+            accessory
+              .getService("Valve " + v)
+              .getCharacteristic(Characteristic.Active)
+              .on("set", (value, callback) => this.internalValveUpdate(accessory, "Valve " + v, value, callback));
+            accessory
+              .getService("Valve " + v)
+              .getCharacteristic(Characteristic.SetDuration)
+              .on("set", (value, callback) => {
+                if (accessory.getService("Valve " + v).getCharacteristic(Characteristic.InUse).value) {
+                  accessory.getService("Valve " + v).updateCharacteristic(Characteristic.RemainingDuration, value);
+                  clearTimeout(accessory.getService("Valve " + v).timer);
+                  accessory.getService("Valve " + v).timer = setTimeout(() => {
+                    accessory.getService("Valve " + v).setCharacteristic(Characteristic.Active, 0);
+                  }, value * 1000);
+                }
+                callback();
+              });
+          });
+          break;
+        case "blind":
+          accessory
+            .getService(Service.WindowCovering)
+            .getCharacteristic(Characteristic.TargetPosition)
+            .on("set", (value, callback) => this.internalBlindUpdate(accessory, value, callback))
+            .setProps({
+              minStep: 100,
+            });
+          break;
+        case "garage":
+          accessory
+            .getService(Service.GarageDoorOpener)
+            .getCharacteristic(Characteristic.TargetDoorState)
+            .on("set", (value, callback) => this.internalGarageUpdate(accessory, value, callback));
+          break;
+        case "lock":
+          accessory
+            .getService(Service.LockMechanism)
+            .getCharacteristic(Characteristic.LockTargetState)
+            .on("set", (value, callback) => this.internalLockUpdate(accessory, value, callback));
+          break;
+        case "fan":
+          accessory
+            .getService(Service.Fanv2)
+            .getCharacteristic(Characteristic.Active)
+            .on("set", (value, callback) => this.internalFanUpdate(accessory, "power", value, callback));
+          accessory
+            .getService(Service.Fanv2)
+            .getCharacteristic(Characteristic.RotationSpeed)
+            .on("set", (value, callback) => this.internalFanUpdate(accessory, "speed", value, callback))
+            .setProps({
+              minStep: 33,
+            });
+          accessory
+            .getService(Service.Lightbulb)
+            .getCharacteristic(Characteristic.On)
+            .on("set", (value, callback) => this.internalFanUpdate(accessory, "light", value, callback));
+          break;
+        case "thermostat":
+          if (!this.config.hideTHSwitch) {
+            accessory
+              .getService(Service.Switch)
+              .getCharacteristic(Characteristic.On)
+              .on("set", (value, callback) => this.internalThermostatUpdate(accessory, value, callback));
+          }
+          accessory.log = this.log;
+          accessory.eveLogger = new EveHistoryService("weather", accessory, {
+            storage: "fs",
+            minutes: 5,
+            path: this.eveLogPath,
+          });
+          corrInterval.setCorrectingInterval(() => {
+            let dataToAdd = {
+              time: Date.now(),
+              temp: accessory.getService(Service.TemperatureSensor).getCharacteristic(Characteristic.CurrentTemperature)
+                .value,
+            };
+            if (accessory.getService(Service.HumiditySensor)) {
+              dataToAdd.humidity = accessory
+                .getService(Service.HumiditySensor)
+                .getCharacteristic(Characteristic.CurrentRelativeHumidity).value;
             }
-            return true;
-         case "rf_sub":
-         case "zb_pri":
-            return true;
-         case "zb_sub":
-            if (Object.keys(newParams).some(v => cns.devicesZBBridgeParams.includes(v))) {
-               this.externalZBDeviceUpdate(accessory, newParams);
+            accessory.eveLogger.addEntry(dataToAdd);
+          }, 300000);
+          break;
+        case "outlet":
+          accessory
+            .getService(Service.Outlet)
+            .getCharacteristic(Characteristic.On)
+            .on("set", (value, callback) => this.internalOutletUpdate(accessory, value, callback));
+          accessory.log = this.log;
+          accessory.eveLogger = new EveHistoryService("energy", accessory, {
+            storage: "fs",
+            minutes: 5,
+            path: this.eveLogPath,
+          });
+          if (!accessory.context.hasOwnProperty("lastReset")) {
+            accessory.context = {
+              ...accessory.context,
+              ...{
+                extraPersistedData: {},
+                lastReset: 0,
+                totalEnergy: 0,
+                totalEnergyTemp: 0,
+              },
+            };
+          }
+          corrInterval.setCorrectingInterval(() => {
+            let isOn = accessory.getService(Service.Outlet).getCharacteristic(Characteristic.On).value,
+              currentWatt = isOn
+                ? accessory.getService(Service.Outlet).getCharacteristic(EveService.Characteristics.CurrentConsumption)
+                    .value
+                : 0;
+            if (accessory.eveLogger.isHistoryLoaded()) {
+              accessory.context.extraPersistedData = accessory.eveLogger.getExtraPersistedData();
+              if (accessory.context.extraPersistedData !== undefined) {
+                accessory.context.totalEnergy =
+                  accessory.context.extraPersistedData.totalenergy +
+                  accessory.context.totalEnergyTemp +
+                  (currentWatt * 10) / 3600 / 1000;
+                accessory.eveLogger.setExtraPersistedData({
+                  totalenergy: accessory.context.totalEnergy,
+                  lastReset: accessory.context.extraPersistedData.lastReset,
+                });
+              } else {
+                accessory.context.totalEnergy = accessory.context.totalEnergyTemp + (currentWatt * 10) / 3600 / 1000;
+                accessory.eveLogger.setExtraPersistedData({
+                  totalenergy: accessory.context.totalEnergy,
+                  lastReset: 0,
+                });
+              }
+              accessory.context.totalEnergytemp = 0;
+            } else {
+              accessory.context.totalEnergyTemp += (currentWatt * 10) / 3600 / 1000;
+              accessory.context.totalEnergy = accessory.context.totalEnergyTemp;
             }
-            return true;
-         default:
-            return false;
-      }
-   }
-   removeAccessory(accessory) {
-      try {
-         this.devicesInHB.delete(accessory.context.hbDeviceId);
-         this.api.unregisterPlatformAccessories("homebridge-ewelink", "eWeLink", [accessory]);
-         this.log("[%s] has been removed from Homebridge.", accessory.displayName);
-      } catch (err) {
-         this.log.warn("[%s] needed to be removed but couldn't as %s.", accessory.displayName, err);
-      }
-   }
-   sendDeviceUpdate(accessory, params, callback) {
-      let payload = {
-         apikey: accessory.context.eweApiKey,
-         deviceid: accessory.context.eweDeviceId,
-         params
-      };
-      let sendViaWS = () => {
-         if (accessory.context.reachableWAN) {
-            this.wsClient.sendUpdate(payload);
-            callback();
-         } else {
-            this.log.error("[%s] could not be updated as it appears to be offline.", accessory.displayName);
-            callback("Device has failed to update");
-         }
-      };
-      if (cns.devicesNonLAN.includes(accessory.context.eweUIID) || !accessory.context.reachableLAN) {
-         sendViaWS();
-      } else {
-         this.lanClient.sendUpdate(payload)
-            .then(() => callback())
-            .catch(err => {
-               if (this.debug) {
-                  this.log.warn("[%s] Reverting to web socket as %s.", accessory.displayName, err);
-               }
-               sendViaWS();
+            accessory.eveLogger.addEntry({
+              time: Date.now(),
+              power: currentWatt,
             });
-      }
-   }
-   receiveDeviceUpdate(device) {
-      let accessory;
-      switch (device.action) {
-         case "sysmsg":
-            if ((accessory = this.devicesInHB.get(device.deviceid + "SWX") || this.devicesInHB.get(device.deviceid + "SW0"))) {
-               let isX = accessory.context.hbDeviceId.substr(-1) === "X";
-               if (device.params.updateSource === "WS") {
-                  if (accessory.context.reachableWAN !== device.params.online) {
-                     accessory.context.reachableWAN = device.params.online;
-                     this.log("[%s] has been reported [%s] via [WS].", accessory.displayName, accessory.context.reachableWAN ? "online" : "offline");
-                     this.devicesInHB.set(accessory.context.hbDeviceId, accessory);
-                     if (accessory.context.reachableWAN) this.wsClient.requestUpdate(accessory);
-                  } else {
-                     if (this.debug) {
-                        this.log("[%s] Nothing to update from above WS message.", accessory.displayName);
-                     }
+          }, 300000);
+          accessory
+            .getService(Service.Outlet)
+            .getCharacteristic(EveService.Characteristics.TotalConsumption)
+            .on("get", callback => {
+              accessory.context.extraPersistedData = accessory.eveLogger.getExtraPersistedData();
+              if (accessory.context.extraPersistedData !== undefined) {
+                accessory.context.totalEnergy = accessory.context.extraPersistedData.totalPower;
+              }
+              callback(null, accessory.context.totalEnergy);
+            });
+          accessory
+            .getService(Service.Outlet)
+            .getCharacteristic(EveService.Characteristics.ResetTotal)
+            .on("set", (value, callback) => {
+              accessory.context.totalEnergy = 0;
+              accessory.context.lastReset = value;
+              accessory.eveLogger.setExtraPersistedData({
+                totalPower: 0,
+                lastReset: value,
+              });
+              callback();
+            })
+            .on("get", callback => {
+              accessory.context.extraPersistedData = accessory.eveLogger.getExtraPersistedData();
+              if (accessory.context.extraPersistedData !== undefined) {
+                accessory.context.lastReset = accessory.context.extraPersistedData.lastReset;
+              }
+              callback(null, accessory.context.lastReset);
+            });
+          break;
+        case "usb":
+          accessory
+            .getService(Service.Outlet)
+            .getCharacteristic(Characteristic.On)
+            .on("set", (value, callback) => this.internalUSBUpdate(accessory, value, callback));
+          break;
+        case "scm":
+          accessory
+            .getService(Service.Switch)
+            .getCharacteristic(Characteristic.On)
+            .on("set", (value, callback) => this.internalSCMUpdate(accessory, value, callback));
+          break;
+        case "light":
+          accessory
+            .getService(Service.Lightbulb)
+            .getCharacteristic(Characteristic.On)
+            .on("set", (value, callback) => this.internalLightbulbUpdate(accessory, value, callback));
+          if (cns.devicesBrightable.includes(accessory.context.eweUIID)) {
+            accessory
+              .getService(Service.Lightbulb)
+              .getCharacteristic(Characteristic.Brightness)
+              .on("set", (value, callback) => {
+                if (value > 0) {
+                  if (!accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On).value) {
+                    this.internalLightbulbUpdate(accessory, true, function () {
+                      return;
+                    });
                   }
-               }
-               if (!isX) {
-                  for (let i = 1; i <= accessory.context.channelCount; i++) {
-                     if (this.devicesInHB.has(device.deviceid + "SW" + i)) {
-                        let oAccessory = this.devicesInHB.get(device.deviceid + "SW" + i);
-                        oAccessory.context.reachableWAN = device.params.online;
-                        this.devicesInHB.set(oAccessory.context.hbDeviceId, oAccessory);
-                     }
+                  this.internalBrightnessUpdate(accessory, value, callback);
+                } else {
+                  this.internalLightbulbUpdate(accessory, false, callback);
+                }
+              });
+          } else if (cns.devicesColourable.includes(accessory.context.eweUIID)) {
+            accessory
+              .getService(Service.Lightbulb)
+              .getCharacteristic(Characteristic.Brightness)
+              .on("set", (value, callback) => {
+                if (value > 0) {
+                  if (!accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On).value) {
+                    this.internalLightbulbUpdate(accessory, true, function () {
+                      return;
+                    });
                   }
-               }
-            }
-            break;
-         case "update":
-            if ((accessory = this.devicesInHB.get(device.deviceid + "SWX") || this.devicesInHB.get(device.deviceid + "SW0"))) {
-               if (device.params.updateSource === "WS" && !accessory.context.reachableWAN) {
-                  accessory.context.reachableWAN = true;
-                  this.log("[%s] has been reported [online] via [WS].", accessory.displayName);
-               }
-               if (device.params.updateSource === "LAN" && !accessory.context.reachableLAN) {
-                  accessory.context.reachableLAN = true;
-                  this.log("[%s] has been reported [online] via [LAN].", accessory.displayName);
-               }
-               if (this.debug) {
-                  this.log("[%s] externally updated from above %s message and will be refreshed.", accessory.displayName, device.params.updateSource);
-               }
-               if (!this.refreshAccessory(accessory, device.params)) {
-                  this.log.warn("[%s] cannot be refreshed. Please try removing accessory from the Homebridge cache along with any secondary devices (SW1, SW2, etc.). [debug:%s:%s]", accessory.displayName, accessory.context.type, accessory.context.channelCount);
-               }
+                  this.internalHSBUpdate(accessory, "bri", value, callback);
+                } else {
+                  this.internalLightbulbUpdate(accessory, false, callback);
+                }
+              });
+            accessory
+              .getService(Service.Lightbulb)
+              .getCharacteristic(Characteristic.Hue)
+              .on("set", (value, callback) => this.internalHSBUpdate(accessory, "hue", value, callback));
+            accessory
+              .getService(Service.Lightbulb)
+              .getCharacteristic(Characteristic.Saturation)
+              .on("set", (value, callback) => callback());
+          }
+          break;
+        case "switch":
+          accessory
+            .getService(Service.Switch)
+            .getCharacteristic(Characteristic.On)
+            .on("set", (value, callback) => this.internalSwitchUpdate(accessory, value, callback));
+          break;
+        case "rf_sub":
+          accessory.context.rfChls = accessory.context.rfChls || {};
+          if (accessory.context.sensorType === "button") {
+            Object.entries(accessory.context.rfChls).forEach(([k, v]) => {
+              accessory.getService(v).updateCharacteristic(Characteristic.On, false);
+              accessory
+                .getService(v)
+                .getCharacteristic(Characteristic.On)
+                .on("set", (value, callback) => {
+                  value ? this.internalRFDeviceUpdate(accessory, k, callback) : callback();
+                });
+            });
+          }
+          break;
+        case "zb_sub":
+          if (accessory.context.eweUIID === 1770) {
+            accessory.log = this.log;
+            accessory.eveLogger = new EveHistoryService("weather", accessory, {
+              storage: "fs",
+              minutes: 5,
+              path: this.eveLogPath,
+            });
+            corrInterval.setCorrectingInterval(() => {
+              let dataToAdd = {
+                time: Date.now(),
+                temp: accessory
+                  .getService(Service.TemperatureSensor)
+                  .getCharacteristic(Characteristic.CurrentTemperature).value,
+                humidity: accessory
+                  .getService(Service.HumiditySensor)
+                  .getCharacteristic(Characteristic.CurrentRelativeHumidity).value,
+              };
+              accessory.eveLogger.addEntry(dataToAdd);
+            }, 300000);
+          }
+          break;
+      }
+      this.devicesInHB.set(accessory.context.hbDeviceId, accessory);
+    } catch (err) {
+      this.log.warn("[%s] could not be refreshed as %s.", accessory.displayName, err);
+    }
+  }
+  refreshAccessory(accessory, newParams) {
+    switch (accessory.context.type) {
+      case "valve":
+        if (Object.keys(newParams).some(v => cns.devicesValveParams.includes(v)) && Array.isArray(newParams.switches)) {
+          this.externalValveUpdate(accessory, newParams);
+        }
+        return true;
+      case "blind":
+        if (Object.keys(newParams).some(v => cns.devicesBlindParams.includes(v)) && Array.isArray(newParams.switches)) {
+          this.externalBlindUpdate(accessory, newParams);
+        }
+        return true;
+      case "garage":
+        if (
+          Object.keys(newParams).some(v => cns.devicesGarageParams.includes(v)) &&
+          Array.isArray(newParams.switches)
+        ) {
+          this.externalGarageUpdate(accessory, newParams);
+        }
+        return true;
+      case "lock":
+        if (Object.keys(newParams).some(v => cns.devicesLockParams.includes(v))) {
+          this.externalLockUpdate(accessory, newParams);
+        }
+        return true;
+      case "sensor":
+        if (Object.keys(newParams).some(v => cns.devicesSensorParams.includes(v))) {
+          this.externalSensorUpdate(accessory, newParams);
+        }
+        return true;
+      case "fan":
+        if (Object.keys(newParams).some(v => cns.devicesFanParams.includes(v))) {
+          this.externalFanUpdate(accessory, newParams);
+        }
+        return true;
+      case "thermostat":
+        if (Object.keys(newParams).some(v => cns.devicesThermostatParams.includes(v))) {
+          this.externalThermostatUpdate(accessory, newParams);
+        }
+        return true;
+      case "outlet":
+        if (Object.keys(newParams).some(v => cns.devicesOutletParams.includes(v))) {
+          this.externalOutletUpdate(accessory, newParams);
+        }
+        return true;
+      case "usb":
+        if (Object.keys(newParams).some(v => cns.devicesUSBParams.includes(v)) && Array.isArray(newParams.switches)) {
+          this.externalUSBUpdate(accessory, newParams);
+        }
+        return true;
+      case "scm":
+        if (Object.keys(newParams).some(v => cns.devicesSCMParams.includes(v)) && Array.isArray(newParams.switches)) {
+          this.externalSCMUpdate(accessory, newParams);
+        }
+        return true;
+      case "light":
+        if (
+          cns.devicesSingleSwitch.includes(accessory.context.eweUIID) &&
+          cns.devicesSingleSwitchLight.includes(accessory.context.eweModel)
+        ) {
+          if (Object.keys(newParams).some(v => cns.devicesSingleSwitchLightParams.includes(v))) {
+            this.externalSingleLightUpdate(accessory, newParams);
+          }
+        } else if (
+          cns.devicesMultiSwitch.includes(accessory.context.eweUIID) &&
+          cns.devicesMultiSwitchLight.includes(accessory.context.eweModel)
+        ) {
+          if (
+            Object.keys(newParams).some(v => cns.devicesMultiSwitchLightParams.includes(v)) &&
+            Array.isArray(newParams.switches)
+          ) {
+            this.externalMultiLightUpdate(accessory, newParams);
+          }
+        }
+        return true;
+      case "switch":
+        if (cns.devicesSingleSwitch.includes(accessory.context.eweUIID)) {
+          if (Object.keys(newParams).some(v => cns.devicesSingleSwitchParams.includes(v))) {
+            this.externalSingleSwitchUpdate(accessory, newParams);
+          }
+        } else if (cns.devicesMultiSwitch.includes(accessory.context.eweUIID)) {
+          if (
+            Object.keys(newParams).some(v => cns.devicesMultiSwitchParams.includes(v)) &&
+            Array.isArray(newParams.switches)
+          ) {
+            this.externalMultiSwitchUpdate(accessory, newParams);
+          }
+        }
+        return true;
+      case "rf_pri":
+        if (Object.keys(newParams).some(v => cns.devicesRFBridgeParams.includes(v))) {
+          this.externalRFDeviceUpdate(accessory, newParams);
+        }
+        return true;
+      case "rf_sub":
+      case "zb_pri":
+        return true;
+      case "zb_sub":
+        if (Object.keys(newParams).some(v => cns.devicesZBBridgeParams.includes(v))) {
+          this.externalZBDeviceUpdate(accessory, newParams);
+        }
+        return true;
+      default:
+        return false;
+    }
+  }
+  removeAccessory(accessory) {
+    try {
+      this.devicesInHB.delete(accessory.context.hbDeviceId);
+      this.api.unregisterPlatformAccessories("homebridge-ewelink", "eWeLink", [accessory]);
+      this.log("[%s] has been removed from Homebridge.", accessory.displayName);
+    } catch (err) {
+      this.log.warn("[%s] needed to be removed but couldn't as %s.", accessory.displayName, err);
+    }
+  }
+  sendDeviceUpdate(accessory, params, callback) {
+    let payload = {
+      apikey: accessory.context.eweApiKey,
+      deviceid: accessory.context.eweDeviceId,
+      params,
+    };
+    let sendViaWS = () => {
+      if (accessory.context.reachableWAN) {
+        this.wsClient.sendUpdate(payload);
+        callback();
+      } else {
+        this.log.error("[%s] could not be updated as it appears to be offline.", accessory.displayName);
+        callback("Device has failed to update");
+      }
+    };
+    if (cns.devicesNonLAN.includes(accessory.context.eweUIID) || !accessory.context.reachableLAN) {
+      sendViaWS();
+    } else {
+      this.lanClient
+        .sendUpdate(payload)
+        .then(() => callback())
+        .catch(err => {
+          if (this.debug) {
+            this.log.warn("[%s] Reverting to web socket as %s.", accessory.displayName, err);
+          }
+          sendViaWS();
+        });
+    }
+  }
+  receiveDeviceUpdate(device) {
+    let accessory;
+    switch (device.action) {
+      case "sysmsg":
+        if (
+          (accessory = this.devicesInHB.get(device.deviceid + "SWX") || this.devicesInHB.get(device.deviceid + "SW0"))
+        ) {
+          let isX = accessory.context.hbDeviceId.substr(-1) === "X";
+          if (device.params.updateSource === "WS") {
+            if (accessory.context.reachableWAN !== device.params.online) {
+              accessory.context.reachableWAN = device.params.online;
+              this.log(
+                "[%s] has been reported [%s] via [WS].",
+                accessory.displayName,
+                accessory.context.reachableWAN ? "online" : "offline"
+              );
+              this.devicesInHB.set(accessory.context.hbDeviceId, accessory);
+              if (accessory.context.reachableWAN) this.wsClient.requestUpdate(accessory);
             } else {
-               if (!(this.config.hideDevFromHB || "").includes(device.deviceid)) {
-                  this.log.warn("[%s] Accessory received via %s update does not exist in Homebridge. If it's a new accessory please restart Homebridge so it is added.", device.deviceid, device.params.updateSource);
-               }
+              if (this.debug) {
+                this.log("[%s] Nothing to update from above WS message.", accessory.displayName);
+              }
             }
-            break;
+          }
+          if (!isX) {
+            for (let i = 1; i <= accessory.context.channelCount; i++) {
+              if (this.devicesInHB.has(device.deviceid + "SW" + i)) {
+                let oAccessory = this.devicesInHB.get(device.deviceid + "SW" + i);
+                oAccessory.context.reachableWAN = device.params.online;
+                this.devicesInHB.set(oAccessory.context.hbDeviceId, oAccessory);
+              }
+            }
+          }
+        }
+        break;
+      case "update":
+        if (
+          (accessory = this.devicesInHB.get(device.deviceid + "SWX") || this.devicesInHB.get(device.deviceid + "SW0"))
+        ) {
+          if (device.params.updateSource === "WS" && !accessory.context.reachableWAN) {
+            accessory.context.reachableWAN = true;
+            this.log("[%s] has been reported [online] via [WS].", accessory.displayName);
+          }
+          if (device.params.updateSource === "LAN" && !accessory.context.reachableLAN) {
+            accessory.context.reachableLAN = true;
+            this.log("[%s] has been reported [online] via [LAN].", accessory.displayName);
+          }
+          if (this.debug) {
+            this.log(
+              "[%s] externally updated from above %s message and will be refreshed.",
+              accessory.displayName,
+              device.params.updateSource
+            );
+          }
+          if (!this.refreshAccessory(accessory, device.params)) {
+            this.log.warn(
+              "[%s] cannot be refreshed. Please try removing accessory from the Homebridge cache along with any secondary devices (SW1, SW2, etc.). [debug:%s:%s]",
+              accessory.displayName,
+              accessory.context.type,
+              accessory.context.channelCount
+            );
+          }
+        } else {
+          if (!(this.config.hideDevFromHB || "").includes(device.deviceid)) {
+            this.log.warn(
+              "[%s] Accessory received via %s update does not exist in Homebridge. If it's a new accessory please restart Homebridge so it is added.",
+              device.deviceid,
+              device.params.updateSource
+            );
+          }
+        }
+        break;
+    }
+  }
+  internalValveUpdate(accessory, valve, value, callback) {
+    try {
+      if (!accessory.context.reachableWAN && !accessory.context.reachableLAN) {
+        throw "it is currently offline";
       }
-   }
-   internalValveUpdate(accessory, valve, value, callback) {
-      try {
-         if (!accessory.context.reachableWAN && !accessory.context.reachableLAN) {
-            throw "it is currently offline";
-         }
-         let params = {};
-         accessory.getService(valve)
-            .updateCharacteristic(Characteristic.Active, value)
-            .updateCharacteristic(Characteristic.InUse, value);
-         switch (value) {
-            case 0:
-               accessory.getService(valve).updateCharacteristic(Characteristic.RemainingDuration, 0);
-               clearTimeout(accessory.getService(valve).timer);
-               break;
-            case 1:
-               let timer = accessory.getService(valve).getCharacteristic(Characteristic.SetDuration).value;
-               accessory.getService(valve).updateCharacteristic(Characteristic.RemainingDuration, timer);
-               accessory.getService(valve).timer = setTimeout(() => {
-                  accessory.getService(valve).setCharacteristic(Characteristic.Active, 0);
-               }, (timer * 1000));
-               break;
-         }
-         params.switches = this.devicesInEwe.get(accessory.context.eweDeviceId).params.switches;
-         switch (valve) {
-            case "Valve A":
-               params.switches[0].switch = value ? "on" : "off";
-               params.switches[1].switch = accessory.getService("Valve B").getCharacteristic(Characteristic.Active).value ? "on" : "off";
-               break;
-            case "Valve B":
-               params.switches[0].switch = accessory.getService("Valve A").getCharacteristic(Characteristic.Active).value ? "on" : "off";
-               params.switches[1].switch = value ? "on" : "off";
-               break;
-            default:
-               throw "unknown valve [" + valve + "]";
-         }
-         params.switches[2].switch = "off";
-         params.switches[3].switch = "off";
-         this.sendDeviceUpdate(accessory, params, callback);
-      } catch (err) {
-         let str = "[" + accessory.displayName + "] could not be updated as " + err + ".";
-         this.log.error(str);
-         callback(str);
-      }
-   }
-   internalBlindUpdate(accessory, value, callback) {
-      try {
-         if (!accessory.context.reachableWAN && !accessory.context.reachableLAN) {
-            throw "it is currently offline";
-         }
-         let blindConfig;
-         if (!(blindConfig = this.cusG.get(accessory.context.hbDeviceId))) {
-            throw "group config missing";
-         }
-         if (blindConfig.type !== "blind" || !["oneSwitch", "twoSwitch"].includes(blindConfig.setup)) {
-            throw "improper configuration";
-         }
-         let oldPos, params = {};
-         value = value >= 50 ? 100 : 0;
-         oldPos = accessory.getService(Service.WindowCovering).getCharacteristic(Characteristic.PositionState).value;
-         if (value === oldPos * 100) {
-            accessory.getService(Service.WindowCovering)
-               .updateCharacteristic(Characteristic.TargetPosition, value)
-               .updateCharacteristic(Characteristic.PositionState, oldPos);
-            callback();
-            return;
-         }
-         switch (blindConfig.setup) {
+      let params = {};
+      accessory
+        .getService(valve)
+        .updateCharacteristic(Characteristic.Active, value)
+        .updateCharacteristic(Characteristic.InUse, value);
+      switch (value) {
+        case 0:
+          accessory.getService(valve).updateCharacteristic(Characteristic.RemainingDuration, 0);
+          clearTimeout(accessory.getService(valve).timer);
+          break;
+        case 1:
+          let timer = accessory.getService(valve).getCharacteristic(Characteristic.SetDuration).value;
+          accessory.getService(valve).updateCharacteristic(Characteristic.RemainingDuration, timer);
+          accessory.getService(valve).timer = setTimeout(() => {
+            accessory.getService(valve).setCharacteristic(Characteristic.Active, 0);
+          }, timer * 1000);
+          break;
+      }
+      params.switches = this.devicesInEwe.get(accessory.context.eweDeviceId).params.switches;
+      switch (valve) {
+        case "Valve A":
+          params.switches[0].switch = value ? "on" : "off";
+          params.switches[1].switch = accessory.getService("Valve B").getCharacteristic(Characteristic.Active).value
+            ? "on"
+            : "off";
+          break;
+        case "Valve B":
+          params.switches[0].switch = accessory.getService("Valve A").getCharacteristic(Characteristic.Active).value
+            ? "on"
+            : "off";
+          params.switches[1].switch = value ? "on" : "off";
+          break;
+        default:
+          throw "unknown valve [" + valve + "]";
+      }
+      params.switches[2].switch = "off";
+      params.switches[3].switch = "off";
+      this.sendDeviceUpdate(accessory, params, callback);
+    } catch (err) {
+      let str = "[" + accessory.displayName + "] could not be updated as " + err + ".";
+      this.log.error(str);
+      callback(str);
+    }
+  }
+  internalBlindUpdate(accessory, value, callback) {
+    try {
+      if (!accessory.context.reachableWAN && !accessory.context.reachableLAN) {
+        throw "it is currently offline";
+      }
+      let blindConfig;
+      if (!(blindConfig = this.cusG.get(accessory.context.hbDeviceId))) {
+        throw "group config missing";
+      }
+      if (blindConfig.type !== "blind" || !["oneSwitch", "twoSwitch"].includes(blindConfig.setup)) {
+        throw "improper configuration";
+      }
+      let oldPos,
+        params = {};
+      value = value >= 50 ? 100 : 0;
+      oldPos = accessory.getService(Service.WindowCovering).getCharacteristic(Characteristic.PositionState).value;
+      if (value === oldPos * 100) {
+        accessory
+          .getService(Service.WindowCovering)
+          .updateCharacteristic(Characteristic.TargetPosition, value)
+          .updateCharacteristic(Characteristic.PositionState, oldPos);
+        callback();
+        return;
+      }
+      switch (blindConfig.setup) {
+        case "oneSwitch":
+          params.switch = "on";
+          break;
+        case "twoSwitch":
+          params.switches = this.devicesInEwe.get(accessory.context.eweDeviceId).params.switches;
+          params.switches[0].switch = value === 100 ? "on" : "off";
+          params.switches[1].switch = value === 0 ? "on" : "off";
+          break;
+      }
+      this.sendDeviceUpdate(accessory, params, function () {
+        return;
+      });
+      accessory
+        .getService(Service.WindowCovering)
+        .updateCharacteristic(Characteristic.TargetPosition, value)
+        .updateCharacteristic(Characteristic.PositionState, value / 100);
+      setTimeout(() => {
+        accessory
+          .getService(Service.WindowCovering)
+          .updateCharacteristic(Characteristic.CurrentPosition, value)
+          .updateCharacteristic(Characteristic.PositionState, 2);
+        callback();
+      }, parseInt(blindConfig.operationTime) * 100);
+    } catch (err) {
+      let str = "[" + accessory.displayName + "] could not be updated as " + err + ".";
+      this.log.error(str);
+      callback(str);
+    }
+  }
+  internalGarageUpdate(accessory, value, callback) {
+    try {
+      if (!accessory.context.reachableWAN && !accessory.context.reachableLAN) {
+        throw "it is currently offline";
+      }
+      let garageConfig;
+      if (!(garageConfig = this.cusG.get(accessory.context.hbDeviceId))) {
+        throw "group config missing";
+      }
+      if (garageConfig.type !== "garage" || !["oneSwitch", "twoSwitch"].includes(garageConfig.setup)) {
+        throw "improper configuration";
+      }
+      accessory.context.inUse = true;
+      accessory.context.state = value;
+      let sensorDefinition = garageConfig.sensorId || false,
+        sAccessory = false,
+        oldPos,
+        newPos = value,
+        params = {},
+        delay = 0;
+      if (sensorDefinition && !(sAccessory = this.devicesInHB.get(garageConfig.sensorId + "SWX"))) {
+        throw "defined DW2 sensor doesn't exist";
+      }
+      if (sAccessory.context.type !== "sensor") {
+        throw "defined DW2 sensor isn't a sensor";
+      }
+      oldPos = sAccessory
+        ? sAccessory.getService(Service.ContactSensor).getCharacteristic(Characteristic.ContactSensorState).value === 0
+          ? 1
+          : 0
+        : accessory.getService(Service.GarageDoorOpener).getCharacteristic(Characteristic.CurrentDoorState).value;
+      if (newPos === oldPos % 2) {
+        accessory.context.inUse = false;
+        callback();
+        return;
+      }
+      if (garageConfig.setup === "oneSwitch" && [2, 3].includes(oldPos)) {
+        accessory
+          .getService(Service.GarageDoorOpener)
+          .updateCharacteristic(Characteristic.CurrentDoorState, ((oldPos * 2) % 3) + 2);
+        delay = 1500;
+      }
+      setTimeout(() => {
+        if (accessory.context.state === newPos) {
+          accessory
+            .getService(Service.GarageDoorOpener)
+            .updateCharacteristic(Characteristic.TargetDoorState, newPos)
+            .updateCharacteristic(Characteristic.CurrentDoorState, newPos + 2);
+          switch (garageConfig.setup) {
             case "oneSwitch":
-               params.switch = "on";
-               break;
+              params.switch = "on";
+              break;
             case "twoSwitch":
-               params.switches = this.devicesInEwe.get(accessory.context.eweDeviceId).params.switches;
-               params.switches[0].switch = value === 100 ? "on" : "off";
-               params.switches[1].switch = value === 0 ? "on" : "off";
-               break;
-         }
-         this.sendDeviceUpdate(accessory, params, function() {
-            return;
-         });
-         accessory.getService(Service.WindowCovering)
-            .updateCharacteristic(Characteristic.TargetPosition, value)
-            .updateCharacteristic(Characteristic.PositionState, (value / 100));
-         setTimeout(() => {
-            accessory.getService(Service.WindowCovering)
-               .updateCharacteristic(Characteristic.CurrentPosition, value)
-               .updateCharacteristic(Characteristic.PositionState, 2);
-            callback();
-         }, parseInt(blindConfig.operationTime) * 100);
-      } catch (err) {
-         let str = "[" + accessory.displayName + "] could not be updated as " + err + ".";
-         this.log.error(str);
-         callback(str);
-      }
-   }
-   internalGarageUpdate(accessory, value, callback) {
-      try {
-         if (!accessory.context.reachableWAN && !accessory.context.reachableLAN) {
-            throw "it is currently offline";
-         }
-         let garageConfig;
-         if (!(garageConfig = this.cusG.get(accessory.context.hbDeviceId))) {
-            throw "group config missing";
-         }
-         if (garageConfig.type !== "garage" || !["oneSwitch", "twoSwitch"].includes(garageConfig.setup)) {
-            throw "improper configuration";
-         }
-         accessory.context.inUse = true;
-         accessory.context.state = value;
-         let sensorDefinition = garageConfig.sensorId || false,
-            sAccessory = false,
-            oldPos,
-            newPos = value,
-            params = {},
-            delay = 0;
-         if (sensorDefinition && !(sAccessory = this.devicesInHB.get(garageConfig.sensorId + "SWX"))) {
-            throw "defined DW2 sensor doesn't exist";
-         }
-         if (sAccessory.context.type !== "sensor") {
-            throw "defined DW2 sensor isn't a sensor";
-         }
-         oldPos = sAccessory ?
-            sAccessory.getService(Service.ContactSensor).getCharacteristic(Characteristic.ContactSensorState).value === 0 ? 1 : 0 :
-            accessory.getService(Service.GarageDoorOpener).getCharacteristic(Characteristic.CurrentDoorState).value;
-         if (newPos === (oldPos % 2)) {
-            accessory.context.inUse = false;
-            callback();
+              params.switches = this.devicesInEwe.get(accessory.context.eweDeviceId).params.switches;
+              params.switches[0].switch = newPos === 0 ? "on" : "off";
+              params.switches[1].switch = newPos === 1 ? "on" : "off";
+              break;
+          }
+          this.sendDeviceUpdate(accessory, params, function () {
             return;
-         }
-         if (garageConfig.setup === "oneSwitch" && [2, 3].includes(oldPos)) {
-            accessory.getService(Service.GarageDoorOpener).updateCharacteristic(Characteristic.CurrentDoorState, oldPos * 2 % 3 + 2);
-            delay = 1500;
-         }
-         setTimeout(() => {
-            if (accessory.context.state === newPos) {
-               accessory.getService(Service.GarageDoorOpener)
-                  .updateCharacteristic(Characteristic.TargetDoorState, newPos)
-                  .updateCharacteristic(Characteristic.CurrentDoorState, newPos + 2);
-               switch (garageConfig.setup) {
-                  case "oneSwitch":
-                     params.switch = "on";
-                     break;
-                  case "twoSwitch":
-                     params.switches = this.devicesInEwe.get(accessory.context.eweDeviceId).params.switches;
-                     params.switches[0].switch = newPos === 0 ? "on" : "off";
-                     params.switches[1].switch = newPos === 1 ? "on" : "off";
-                     break;
-               }
-               this.sendDeviceUpdate(accessory, params, function() {
-                  return;
-               });
-               setTimeout(() => {
-                  if (!sAccessory) {
-                     accessory.getService(Service.GarageDoorOpener).updateCharacteristic(Characteristic.CurrentDoorState, newPos);
-                  }
-                  accessory.context.inUse = false;
-               }, parseInt(garageConfig.operationTime) * 100);
+          });
+          setTimeout(() => {
+            if (!sAccessory) {
+              accessory
+                .getService(Service.GarageDoorOpener)
+                .updateCharacteristic(Characteristic.CurrentDoorState, newPos);
             }
-         }, delay);
-         callback();
-      } catch (err) {
-         accessory.context.inUse = false;
-         let str = "[" + accessory.displayName + "] could not be updated as " + err + ".";
-         this.log.error(str);
-         callback(str);
-      }
-   }
-   internalLockUpdate(accessory, value, callback) {
-      try {
-         if (!accessory.context.reachableWAN && !accessory.context.reachableLAN) {
-            throw "it is currently offline";
-         }
-         let lockConfig, params = {};
-         if (!(lockConfig = this.cusG.get(accessory.context.hbDeviceId))) {
-            throw "group config missing";
-         }
-         if (lockConfig.type !== "lock") {
-            throw "improper configuration";
-         }
-         accessory.context.inUse = true;
-         this.log("[%s] has received request to unlock.", accessory.displayName);
-         accessory.getService(Service.LockMechanism)
-            .updateCharacteristic(Characteristic.LockTargetState, 0)
-            .updateCharacteristic(Characteristic.LockCurrentState, 0);
-         params.switch = "on";
-         this.sendDeviceUpdate(accessory, params, callback);
-         setTimeout(() => {
-            accessory.getService(Service.LockMechanism)
-               .updateCharacteristic(Characteristic.LockTargetState, 1)
-               .updateCharacteristic(Characteristic.LockCurrentState, 1);
             accessory.context.inUse = false;
-         }, parseInt(lockConfig.operationTime) * 100);
-      } catch (err) {
-         accessory.context.inUse = false;
-         let str = "[" + accessory.displayName + "] could not be updated as " + err + ".";
-         this.log.error(str);
-         callback(str);
-      }
-   }
-   internalFanUpdate(accessory, type, value, callback) {
-      try {
-         if (!accessory.context.reachableWAN && !accessory.context.reachableLAN) {
-            throw "it is currently offline";
-         }
-         let newPower, newSpeed, newLight;
-         switch (type) {
-            case "power":
-               newPower = value;
-               newSpeed = value ? 33 : 0;
-               newLight = accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On).value;
-               break;
-            case "speed":
-               newPower = value >= 33 ? 1 : 0;
-               newSpeed = value;
-               newLight = accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On).value;
-               break;
-            case "light":
-               newPower = accessory.getService(Service.Fanv2).getCharacteristic(Characteristic.Active).value;
-               newSpeed = accessory.getService(Service.Fanv2).getCharacteristic(Characteristic.RotationSpeed).value;
-               newLight = value;
-               break;
-         }
-         accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, newLight);
-         accessory.getService(Service.Fanv2)
-            .updateCharacteristic(Characteristic.Active, newPower)
-            .updateCharacteristic(Characteristic.RotationSpeed, newSpeed);
-         let params = {
-            switches: this.devicesInEwe.get(accessory.context.eweDeviceId).params.switches
-         };
-         params.switches[0].switch = newLight ? "on" : "off";
-         params.switches[1].switch = (newPower === 1 && newSpeed >= 33) ? "on" : "off";
-         params.switches[2].switch = (newPower === 1 && newSpeed >= 66 && newSpeed < 99) ? "on" : "off";
-         params.switches[3].switch = (newPower === 1 && newSpeed >= 99) ? "on" : "off";
-         if (this.debug) {
-            this.log.warn("Fan Update - setting " + type + " to " + value);
-            this.log("[%s] new stats: power [%s], speed [%s%], light [%s].", accessory.displayName, newPower, newSpeed, newLight);
-         }
-         this.sendDeviceUpdate(accessory, params, callback);
-      } catch (err) {
-         let str = "[" + accessory.displayName + "] could not be updated as " + err + ".";
-         this.log.error(str);
-         callback(str);
-      }
-   }
-   internalThermostatUpdate(accessory, value, callback) {
-      try {
-         if (!accessory.context.reachableWAN && !accessory.context.reachableLAN) {
-            throw "it is currently offline";
-         }
-         let params = {
-            switch: value ? "on" : "off",
-            mainSwitch: value ? "on" : "off"
-         };
-         if (this.debug) {
+          }, parseInt(garageConfig.operationTime) * 100);
+        }
+      }, delay);
+      callback();
+    } catch (err) {
+      accessory.context.inUse = false;
+      let str = "[" + accessory.displayName + "] could not be updated as " + err + ".";
+      this.log.error(str);
+      callback(str);
+    }
+  }
+  internalLockUpdate(accessory, value, callback) {
+    try {
+      if (!accessory.context.reachableWAN && !accessory.context.reachableLAN) {
+        throw "it is currently offline";
+      }
+      let lockConfig,
+        params = {};
+      if (!(lockConfig = this.cusG.get(accessory.context.hbDeviceId))) {
+        throw "group config missing";
+      }
+      if (lockConfig.type !== "lock") {
+        throw "improper configuration";
+      }
+      accessory.context.inUse = true;
+      this.log("[%s] has received request to unlock.", accessory.displayName);
+      accessory
+        .getService(Service.LockMechanism)
+        .updateCharacteristic(Characteristic.LockTargetState, 0)
+        .updateCharacteristic(Characteristic.LockCurrentState, 0);
+      params.switch = "on";
+      this.sendDeviceUpdate(accessory, params, callback);
+      setTimeout(() => {
+        accessory
+          .getService(Service.LockMechanism)
+          .updateCharacteristic(Characteristic.LockTargetState, 1)
+          .updateCharacteristic(Characteristic.LockCurrentState, 1);
+        accessory.context.inUse = false;
+      }, parseInt(lockConfig.operationTime) * 100);
+    } catch (err) {
+      accessory.context.inUse = false;
+      let str = "[" + accessory.displayName + "] could not be updated as " + err + ".";
+      this.log.error(str);
+      callback(str);
+    }
+  }
+  internalFanUpdate(accessory, type, value, callback) {
+    try {
+      if (!accessory.context.reachableWAN && !accessory.context.reachableLAN) {
+        throw "it is currently offline";
+      }
+      let newPower, newSpeed, newLight;
+      switch (type) {
+        case "power":
+          newPower = value;
+          newSpeed = value ? 33 : 0;
+          newLight = accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On).value;
+          break;
+        case "speed":
+          newPower = value >= 33 ? 1 : 0;
+          newSpeed = value;
+          newLight = accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On).value;
+          break;
+        case "light":
+          newPower = accessory.getService(Service.Fanv2).getCharacteristic(Characteristic.Active).value;
+          newSpeed = accessory.getService(Service.Fanv2).getCharacteristic(Characteristic.RotationSpeed).value;
+          newLight = value;
+          break;
+      }
+      accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, newLight);
+      accessory
+        .getService(Service.Fanv2)
+        .updateCharacteristic(Characteristic.Active, newPower)
+        .updateCharacteristic(Characteristic.RotationSpeed, newSpeed);
+      let params = {
+        switches: this.devicesInEwe.get(accessory.context.eweDeviceId).params.switches,
+      };
+      params.switches[0].switch = newLight ? "on" : "off";
+      params.switches[1].switch = newPower === 1 && newSpeed >= 33 ? "on" : "off";
+      params.switches[2].switch = newPower === 1 && newSpeed >= 66 && newSpeed < 99 ? "on" : "off";
+      params.switches[3].switch = newPower === 1 && newSpeed >= 99 ? "on" : "off";
+      if (this.debug) {
+        this.log.warn("Fan Update - setting " + type + " to " + value);
+        this.log(
+          "[%s] new stats: power [%s], speed [%s%], light [%s].",
+          accessory.displayName,
+          newPower,
+          newSpeed,
+          newLight
+        );
+      }
+      this.sendDeviceUpdate(accessory, params, callback);
+    } catch (err) {
+      let str = "[" + accessory.displayName + "] could not be updated as " + err + ".";
+      this.log.error(str);
+      callback(str);
+    }
+  }
+  internalThermostatUpdate(accessory, value, callback) {
+    try {
+      if (!accessory.context.reachableWAN && !accessory.context.reachableLAN) {
+        throw "it is currently offline";
+      }
+      let params = {
+        switch: value ? "on" : "off",
+        mainSwitch: value ? "on" : "off",
+      };
+      if (this.debug) {
+        this.log("[%s] updating to turn [%s].", accessory.displayName, value ? "on" : "off");
+      }
+      accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, value);
+      this.sendDeviceUpdate(accessory, params, callback);
+    } catch (err) {
+      let str = "[" + accessory.displayName + "] could not be updated as " + err + ".";
+      this.log.error(str);
+      callback(str);
+    }
+  }
+  internalOutletUpdate(accessory, value, callback) {
+    try {
+      if (!accessory.context.reachableWAN && !accessory.context.reachableLAN) {
+        throw "it is currently offline";
+      }
+      let params = {
+        switch: value ? "on" : "off",
+      };
+      if (this.debug) {
+        this.log("[%s] requesting to turn [%s].", accessory.displayName, value ? "on" : "off");
+      }
+      accessory.getService(Service.Outlet).updateCharacteristic(Characteristic.On, value);
+      this.sendDeviceUpdate(accessory, params, callback);
+    } catch (err) {
+      callback("[" + accessory.displayName + "] " + err + ".");
+    }
+  }
+  internalUSBUpdate(accessory, value, callback) {
+    try {
+      if (!accessory.context.reachableWAN && !accessory.context.reachableLAN) {
+        throw "it is currently offline";
+      }
+      let params = {
+        switches: this.devicesInEwe.get(accessory.context.eweDeviceId).params.switches,
+      };
+      params.switches[0].switch = value ? "on" : "off";
+      if (this.debug) {
+        this.log("[%s] requesting to turn [%s].", accessory.displayName, value ? "on" : "off");
+      }
+      accessory.getService(Service.Outlet).updateCharacteristic(Characteristic.On, value);
+      this.sendDeviceUpdate(accessory, params, callback);
+    } catch (err) {
+      callback("[" + accessory.displayName + "] " + err + ".");
+    }
+  }
+  internalSCMUpdate(accessory, value, callback) {
+    try {
+      if (!accessory.context.reachableWAN && !accessory.context.reachableLAN) {
+        throw "it is currently offline";
+      }
+      let params = {
+        switches: this.devicesInEwe.get(accessory.context.eweDeviceId).params.switches,
+      };
+      params.switches[0].switch = value ? "on" : "off";
+      if (this.debug) {
+        this.log("[%s] requesting to turn [%s].", accessory.displayName, value ? "on" : "off");
+      }
+      accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, value);
+      this.sendDeviceUpdate(accessory, params, callback);
+    } catch (err) {
+      callback("[" + accessory.displayName + "] " + err + ".");
+    }
+  }
+  internalLightbulbUpdate(accessory, value, callback) {
+    try {
+      if (!accessory.context.reachableWAN && !accessory.context.reachableLAN) {
+        throw "it is currently offline";
+      }
+      let oAccessory,
+        params = {};
+      switch (accessory.context.switchNumber) {
+        case "X":
+          if (accessory.context.eweUIID === 22) {
+            //*** B1 ***\\
+            params.state = value ? "on" : "off";
+          } else {
+            params.switch = value ? "on" : "off";
+          }
+          if (this.debug) {
             this.log("[%s] updating to turn [%s].", accessory.displayName, value ? "on" : "off");
-         }
-         accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, value);
-         this.sendDeviceUpdate(accessory, params, callback);
-      } catch (err) {
-         let str = "[" + accessory.displayName + "] could not be updated as " + err + ".";
-         this.log.error(str);
-         callback(str);
-      }
-   }
-   internalOutletUpdate(accessory, value, callback) {
-      try {
-         if (!accessory.context.reachableWAN && !accessory.context.reachableLAN) {
-            throw "it is currently offline";
-         }
-         let params = {
-            switch: value ? "on" : "off"
-         };
-         if (this.debug) {
-            this.log("[%s] requesting to turn [%s].", accessory.displayName, value ? "on" : "off");
-         }
-         accessory.getService(Service.Outlet).updateCharacteristic(Characteristic.On, value);
-         this.sendDeviceUpdate(accessory, params, callback);
-      } catch (err) {
-         callback("[" + accessory.displayName + "] " + err + ".");
-      }
-   }
-   internalUSBUpdate(accessory, value, callback) {
-      try {
-         if (!accessory.context.reachableWAN && !accessory.context.reachableLAN) {
-            throw "it is currently offline";
-         }
-         let params = {
-            switches: this.devicesInEwe.get(accessory.context.eweDeviceId).params.switches
-         };
-         params.switches[0].switch = value ? "on" : "off";
-         if (this.debug) {
-            this.log("[%s] requesting to turn [%s].", accessory.displayName, value ? "on" : "off");
-         }
-         accessory.getService(Service.Outlet).updateCharacteristic(Characteristic.On, value);
-         this.sendDeviceUpdate(accessory, params, callback);
-      } catch (err) {
-         callback("[" + accessory.displayName + "] " + err + ".");
-      }
-   }
-   internalSCMUpdate(accessory, value, callback) {
-      try {
-         if (!accessory.context.reachableWAN && !accessory.context.reachableLAN) {
-            throw "it is currently offline";
-         }
-         let params = {
-            switches: this.devicesInEwe.get(accessory.context.eweDeviceId).params.switches
-         };
-         params.switches[0].switch = value ? "on" : "off";
-         if (this.debug) {
-            this.log("[%s] requesting to turn [%s].", accessory.displayName, value ? "on" : "off");
-         }
-         accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, value);
-         this.sendDeviceUpdate(accessory, params, callback);
-      } catch (err) {
-         callback("[" + accessory.displayName + "] " + err + ".");
-      }
-   }
-   internalLightbulbUpdate(accessory, value, callback) {
-      try {
-         if (!accessory.context.reachableWAN && !accessory.context.reachableLAN) {
-            throw "it is currently offline";
-         }
-         let oAccessory, params = {};
-         switch (accessory.context.switchNumber) {
-            case "X":
-               if (accessory.context.eweUIID === 22) { //*** B1 ***\\
-                  params.state = value ? "on" : "off";
-               } else {
-                  params.switch = value ? "on" : "off";
-               }
-               if (this.debug) {
-                  this.log("[%s] updating to turn [%s].", accessory.displayName, value ? "on" : "off");
-               }
-               accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, value);
-               break;
-            case "0":
-               params.switches = this.devicesInEwe.get(accessory.context.eweDeviceId).params.switches;
-               params.switches[0].switch = value ? "on" : "off";
-               params.switches[1].switch = value ? "on" : "off";
-               params.switches[2].switch = value ? "on" : "off";
-               params.switches[3].switch = value ? "on" : "off";
-               if (this.debug) {
-                  this.log("[%s] updating to turn group [%s].", accessory.displayName, value ? "on" : "off");
-               }
-               accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, value);
-               for (let i = 1; i <= 4; i++) {
-                  if (this.devicesInHB.has(accessory.context.eweDeviceId + "SW" + i)) {
-                     oAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW" + i);
-                     oAccessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, value);
-                  }
-               }
-               break;
-            case "1":
-            case "2":
-            case "3":
-            case "4":
-               if (this.debug) {
-                  this.log("[%s] updating to turn [%s].", accessory.displayName, value ? "on" : "off");
-               }
-               accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, value);
-               let tAccessory,
-                  masterState = "off";
-               params.switches = this.devicesInEwe.get(accessory.context.eweDeviceId).params.switches;
-               for (let i = 1; i <= 4; i++) {
-                  if ((tAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW" + i))) {
-                     i === parseInt(accessory.context.switchNumber) ?
-                        params.switches[i - 1].switch = value ? "on" : "off" :
-                        params.switches[i - 1].switch = tAccessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On).value ? "on" : "off";
-                     if (tAccessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On).value) {
-                        masterState = "on";
-                     }
-                  } else {
-                     params.switches[i - 1].switch = "off";
-                  }
-               }
-               oAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW0");
-               oAccessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, masterState === "on");
-               break;
-            default:
-               throw "unknown switch number [" + accessory.context.switchNumber + "]";
-         }
-         this.sendDeviceUpdate(accessory, params, callback);
-      } catch (err) {
-         let str = "[" + accessory.displayName + "] could not be updated as " + err + ".";
-         this.log.error(str);
-         callback(str);
-      }
-   }
-   internalBrightnessUpdate(accessory, value, callback) {
-      try {
-         if (!accessory.context.reachableWAN && !accessory.context.reachableLAN) {
-            throw "it is currently offline";
-         }
-         let params = {};
-         if (value === 0) {
-            params.switch = "off";
-            accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, false);
-         } else {
-            if (!accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On).value) {
-               params.switch = "on";
+          }
+          accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, value);
+          break;
+        case "0":
+          params.switches = this.devicesInEwe.get(accessory.context.eweDeviceId).params.switches;
+          params.switches[0].switch = value ? "on" : "off";
+          params.switches[1].switch = value ? "on" : "off";
+          params.switches[2].switch = value ? "on" : "off";
+          params.switches[3].switch = value ? "on" : "off";
+          if (this.debug) {
+            this.log("[%s] updating to turn group [%s].", accessory.displayName, value ? "on" : "off");
+          }
+          accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, value);
+          for (let i = 1; i <= 4; i++) {
+            if (this.devicesInHB.has(accessory.context.eweDeviceId + "SW" + i)) {
+              oAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW" + i);
+              oAccessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, value);
             }
-            switch (accessory.context.eweUIID) {
-               case 36: //*** KING-M4 ***\\
-                  params.bright = Math.round(value * 9 / 10 + 10);
-                  break;
-               case 44: //*** D1 ***\\
-                  params.brightness = value;
-                  params.mode = 0;
-                  break;
-               default:
-                  throw "unknown device UIID";
+          }
+          break;
+        case "1":
+        case "2":
+        case "3":
+        case "4":
+          if (this.debug) {
+            this.log("[%s] updating to turn [%s].", accessory.displayName, value ? "on" : "off");
+          }
+          accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, value);
+          let tAccessory,
+            masterState = "off";
+          params.switches = this.devicesInEwe.get(accessory.context.eweDeviceId).params.switches;
+          for (let i = 1; i <= 4; i++) {
+            if ((tAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW" + i))) {
+              i === parseInt(accessory.context.switchNumber)
+                ? (params.switches[i - 1].switch = value ? "on" : "off")
+                : (params.switches[i - 1].switch = tAccessory
+                    .getService(Service.Lightbulb)
+                    .getCharacteristic(Characteristic.On).value
+                    ? "on"
+                    : "off");
+              if (tAccessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On).value) {
+                masterState = "on";
+              }
+            } else {
+              params.switches[i - 1].switch = "off";
             }
-            accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.Brightness, value);
-         }
-         if (this.debug) {
-            this.log("[%s] updating brightness to [%s%].", accessory.displayName, value);
-         }
-         setTimeout(() => this.sendDeviceUpdate(accessory, params, callback), 250);
-      } catch (err) {
-         let str = "[" + accessory.displayName + "] could not be updated as " + err + ".";
-         this.log.error(str);
-         callback(str);
-      }
-   }
-   internalHSBUpdate(accessory, type, value, callback) {
-      try {
-         if (!accessory.context.reachableWAN && !accessory.context.reachableLAN) {
-            throw "it is currently offline";
-         }
-         let newRGB,
-            params = {},
-            curHue = accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.Hue).value,
-            curSat = accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.Saturation).value;
-         switch (type) {
-            case "hue":
-               newRGB = convert.hsv.rgb(value, curSat, 100);
-               switch (accessory.context.eweUIID) {
-                  case 22: //*** B1 ***\\
-                     params = {
-                        zyx_mode: 2,
-                        type: "middle",
-                        channel0: "0",
-                        channel1: "0",
-                        channel2: newRGB[0].toString(),
-                        channel3: newRGB[1].toString(),
-                        channel4: newRGB[2].toString()
-                     };
-                     break;
-                  case 59: //*** L1 ***\\
-                     params = {
-                        mode: 1,
-                        colorR: newRGB[0],
-                        colorG: newRGB[1],
-                        colorB: newRGB[2]
-                     };
-                     break;
-                  default:
-                     throw "unknown device UIID";
-               }
-               if (this.debug) {
-                  this.log("[%s] updating hue to [%s°].", accessory.displayName, value);
-               }
-               accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.Hue, value);
-               break;
-            case "bri":
-               switch (accessory.context.eweUIID) {
-                  case 22: //*** B1 ***\\
-                     newRGB = convert.hsv.rgb(curHue, curSat, value);
-                     params = {
-                        zyx_mode: 2,
-                        type: "middle",
-                        channel0: "0",
-                        channel1: "0",
-                        channel2: newRGB[0].toString(),
-                        channel3: newRGB[1].toString(),
-                        channel4: newRGB[2].toString()
-                     };
-                     break;
-                  case 59: //*** L1 ***\\
-                     params = {
-                        mode: 1,
-                        bright: value
-                     };
-                     break;
-               }
-               if (this.debug) {
-                  this.log("[%s] updating brightness to [%s%].", accessory.displayName, value);
-               }
-               accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.Brightness, value);
-               break;
-            default:
-               throw "unknown device UIID";
-         }
-         setTimeout(() => this.sendDeviceUpdate(accessory, params, callback), 250);
-      } catch (err) {
-         let str = "[" + accessory.displayName + "] could not be updated as " + err + ".";
-         this.log.error(str);
-         callback(str);
-      }
-   }
-   internalSwitchUpdate(accessory, value, callback) {
-      try {
-         if (!accessory.context.reachableWAN && !accessory.context.reachableLAN) {
-            throw "it is currently offline";
-         }
-         let oAccessory, params = {};
-         switch (accessory.context.switchNumber) {
-            case "X":
-               params.switch = value ? "on" : "off";
-               if (this.debug) {
-                  this.log("[%s] updating to turn [%s].", accessory.displayName, value ? "on" : "off");
-               }
-               accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, value);
-               break;
-            case "0":
-               params.switches = this.devicesInEwe.get(accessory.context.eweDeviceId).params.switches;
-               params.switches[0].switch = value ? "on" : "off";
-               params.switches[1].switch = value ? "on" : "off";
-               params.switches[2].switch = value ? "on" : "off";
-               params.switches[3].switch = value ? "on" : "off";
-               if (this.debug) {
-                  this.log("[%s] updating to turn group [%s].", accessory.displayName, value ? "on" : "off");
-               }
-               accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, value);
-               for (let i = 1; i <= 4; i++) {
-                  if (this.devicesInHB.has(accessory.context.eweDeviceId + "SW" + i)) {
-                     oAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW" + i);
-                     oAccessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, value);
-                  }
-               }
-               break;
-            case "1":
-            case "2":
-            case "3":
-            case "4":
-               if (this.debug) {
-                  this.log("[%s] updating to turn [%s].", accessory.displayName, value ? "on" : "off");
-               }
-               accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, value);
-               let tAccessory,
-                  masterState = "off";
-               params.switches = this.devicesInEwe.get(accessory.context.eweDeviceId).params.switches;
-               for (let i = 1; i <= 4; i++) {
-                  if ((tAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW" + i))) {
-                     i === parseInt(accessory.context.switchNumber) ?
-                        params.switches[i - 1].switch = value ? "on" : "off" :
-                        params.switches[i - 1].switch = tAccessory.getService(Service.Switch).getCharacteristic(Characteristic.On).value ? "on" : "off";
-                     if (tAccessory.getService(Service.Switch).getCharacteristic(Characteristic.On).value) {
-                        masterState = "on";
-                     }
-                  } else {
-                     params.switches[i - 1].switch = "off";
-                  }
-               }
-               oAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW0");
-               oAccessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, masterState === "on");
-               break;
+          }
+          oAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW0");
+          oAccessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, masterState === "on");
+          break;
+        default:
+          throw "unknown switch number [" + accessory.context.switchNumber + "]";
+      }
+      this.sendDeviceUpdate(accessory, params, callback);
+    } catch (err) {
+      let str = "[" + accessory.displayName + "] could not be updated as " + err + ".";
+      this.log.error(str);
+      callback(str);
+    }
+  }
+  internalBrightnessUpdate(accessory, value, callback) {
+    try {
+      if (!accessory.context.reachableWAN && !accessory.context.reachableLAN) {
+        throw "it is currently offline";
+      }
+      let params = {};
+      if (value === 0) {
+        params.switch = "off";
+        accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, false);
+      } else {
+        if (!accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On).value) {
+          params.switch = "on";
+        }
+        switch (accessory.context.eweUIID) {
+          case 36: //*** KING-M4 ***\\
+            params.bright = Math.round((value * 9) / 10 + 10);
+            break;
+          case 44: //*** D1 ***\\
+            params.brightness = value;
+            params.mode = 0;
+            break;
+          default:
+            throw "unknown device UIID";
+        }
+        accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.Brightness, value);
+      }
+      if (this.debug) {
+        this.log("[%s] updating brightness to [%s%].", accessory.displayName, value);
+      }
+      setTimeout(() => this.sendDeviceUpdate(accessory, params, callback), 250);
+    } catch (err) {
+      let str = "[" + accessory.displayName + "] could not be updated as " + err + ".";
+      this.log.error(str);
+      callback(str);
+    }
+  }
+  internalHSBUpdate(accessory, type, value, callback) {
+    try {
+      if (!accessory.context.reachableWAN && !accessory.context.reachableLAN) {
+        throw "it is currently offline";
+      }
+      let newRGB,
+        params = {},
+        curHue = accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.Hue).value,
+        curSat = accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.Saturation).value;
+      switch (type) {
+        case "hue":
+          newRGB = convert.hsv.rgb(value, curSat, 100);
+          switch (accessory.context.eweUIID) {
+            case 22: //*** B1 ***\\
+              params = {
+                zyx_mode: 2,
+                type: "middle",
+                channel0: "0",
+                channel1: "0",
+                channel2: newRGB[0].toString(),
+                channel3: newRGB[1].toString(),
+                channel4: newRGB[2].toString(),
+              };
+              break;
+            case 59: //*** L1 ***\\
+              params = {
+                mode: 1,
+                colorR: newRGB[0],
+                colorG: newRGB[1],
+                colorB: newRGB[2],
+              };
+              break;
             default:
-               throw "unknown switch number [" + accessory.context.switchNumber + "]";
-         }
-         this.sendDeviceUpdate(accessory, params, callback);
-      } catch (err) {
-         let str = "[" + accessory.displayName + "] could not be updated as " + err + ".";
-         this.log.error(str);
-         callback(str);
-      }
-   }
-   internalRFDeviceUpdate(accessory, rfChl, callback) {
-      try {
-         if (!accessory.context.reachableWAN && !accessory.context.reachableLAN) {
-            throw "it is currently offline";
-         }
-         rfChl = parseInt(rfChl);
-         let params = {
-            cmd: "transmit",
-            rfChl
-         };
-         if (this.debug) {
-            this.log("[%s %s] mimicking RF button press.", accessory.displayName, accessory.context.rfChls[rfChl]);
-         }
-         accessory.getService(accessory.context.rfChls[rfChl]).updateCharacteristic(Characteristic.On, true);
-         this.sendDeviceUpdate(accessory, params, callback);
-         setTimeout(() => accessory.getService(accessory.context.rfChls[rfChl]).updateCharacteristic(Characteristic.On, false), 3000);
-      } catch (err) {
-         let str = "[" + accessory.displayName + " " + name + "] could not be updated as " + err + ".";
-         this.log.error(str);
-         callback(str);
-      }
-   }
-   externalValveUpdate(accessory, params) {
-      try {
-         ["A", "B"].forEach((v, k) => {
-            accessory.getService("Valve " + v)
-               .updateCharacteristic(Characteristic.Active, params.switches[k].switch === "on")
-               .updateCharacteristic(Characteristic.InUse, params.switches[k].switch === "on");
-            if (params.switches[k].switch === "on") {
-               let timer = accessory.getService("Valve " + v).getCharacteristic(Characteristic.SetDuration).value;
-               accessory.getService("Valve " + v).updateCharacteristic(Characteristic.RemainingDuration, timer);
-               accessory.getService("Valve " + v).timer = setTimeout(() => {
-                  accessory.getService("Valve " + v).setCharacteristic(Characteristic.Active, 0);
-               }, (timer * 1000));
+              throw "unknown device UIID";
+          }
+          if (this.debug) {
+            this.log("[%s] updating hue to [%s°].", accessory.displayName, value);
+          }
+          accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.Hue, value);
+          break;
+        case "bri":
+          switch (accessory.context.eweUIID) {
+            case 22: //*** B1 ***\\
+              newRGB = convert.hsv.rgb(curHue, curSat, value);
+              params = {
+                zyx_mode: 2,
+                type: "middle",
+                channel0: "0",
+                channel1: "0",
+                channel2: newRGB[0].toString(),
+                channel3: newRGB[1].toString(),
+                channel4: newRGB[2].toString(),
+              };
+              break;
+            case 59: //*** L1 ***\\
+              params = {
+                mode: 1,
+                bright: value,
+              };
+              break;
+          }
+          if (this.debug) {
+            this.log("[%s] updating brightness to [%s%].", accessory.displayName, value);
+          }
+          accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.Brightness, value);
+          break;
+        default:
+          throw "unknown device UIID";
+      }
+      setTimeout(() => this.sendDeviceUpdate(accessory, params, callback), 250);
+    } catch (err) {
+      let str = "[" + accessory.displayName + "] could not be updated as " + err + ".";
+      this.log.error(str);
+      callback(str);
+    }
+  }
+  internalSwitchUpdate(accessory, value, callback) {
+    try {
+      if (!accessory.context.reachableWAN && !accessory.context.reachableLAN) {
+        throw "it is currently offline";
+      }
+      let oAccessory,
+        params = {};
+      switch (accessory.context.switchNumber) {
+        case "X":
+          params.switch = value ? "on" : "off";
+          if (this.debug) {
+            this.log("[%s] updating to turn [%s].", accessory.displayName, value ? "on" : "off");
+          }
+          accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, value);
+          break;
+        case "0":
+          params.switches = this.devicesInEwe.get(accessory.context.eweDeviceId).params.switches;
+          params.switches[0].switch = value ? "on" : "off";
+          params.switches[1].switch = value ? "on" : "off";
+          params.switches[2].switch = value ? "on" : "off";
+          params.switches[3].switch = value ? "on" : "off";
+          if (this.debug) {
+            this.log("[%s] updating to turn group [%s].", accessory.displayName, value ? "on" : "off");
+          }
+          accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, value);
+          for (let i = 1; i <= 4; i++) {
+            if (this.devicesInHB.has(accessory.context.eweDeviceId + "SW" + i)) {
+              oAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW" + i);
+              oAccessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, value);
+            }
+          }
+          break;
+        case "1":
+        case "2":
+        case "3":
+        case "4":
+          if (this.debug) {
+            this.log("[%s] updating to turn [%s].", accessory.displayName, value ? "on" : "off");
+          }
+          accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, value);
+          let tAccessory,
+            masterState = "off";
+          params.switches = this.devicesInEwe.get(accessory.context.eweDeviceId).params.switches;
+          for (let i = 1; i <= 4; i++) {
+            if ((tAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW" + i))) {
+              i === parseInt(accessory.context.switchNumber)
+                ? (params.switches[i - 1].switch = value ? "on" : "off")
+                : (params.switches[i - 1].switch = tAccessory
+                    .getService(Service.Switch)
+                    .getCharacteristic(Characteristic.On).value
+                    ? "on"
+                    : "off");
+              if (tAccessory.getService(Service.Switch).getCharacteristic(Characteristic.On).value) {
+                masterState = "on";
+              }
             } else {
-               accessory.getService("Valve " + v).updateCharacteristic(Characteristic.RemainingDuration, 0);
-               clearTimeout(accessory.getService("Valve " + v).timer);
+              params.switches[i - 1].switch = "off";
             }
-         });
-      } catch (err) {
-         this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
-      }
-   }
-   externalBlindUpdate(accessory, params) {
-      try {
-         let blindConfig, nSte;
-         if (!(blindConfig = this.cusG.get(accessory.context.hbDeviceId))) {
-            throw "group config missing";
-         }
-         if (blindConfig.type !== "blind" || ["oneSwitch", "twoSwitch"].includes(blindConfig.setup)) {
-            throw "improper configuration";
-         }
-         switch (blindConfig.setup) {
-            case "oneSwitch":
-               if (params.switch === "off") {
-                  return;
-               }
-               nSte = accessory.getService(Service.WindowCovering).getCharacteristic(Characteristic.PositionState).value === 0 ? 1 : 0;
-               break;
-            case "twoSwitch":
-               if (params.switches[0].switch === "off" && params.switches[1].switch === "off") {
-                  return;
-               }
-               let switchUp = params.switches[0].switch === "on" ? -1 : 0, // matrix of numbers to get
-                  switchDown = params.switches[1].switch === "on" ? 0 : 2; // ... the correct HomeKit value
-               nSte = switchUp + switchDown;
-               break;
-         }
-         accessory.getService(Service.WindowCovering)
-            .updateCharacteristic(Characteristic.PositionState, nSte)
-            .updateCharacteristic(Characteristic.TargetPosition, nSte * 100);
-         setTimeout(() => {
-            accessory.getService(Service.WindowCovering)
-               .updateCharacteristic(Characteristic.PositionState, 2)
-               .updateCharacteristic(Characteristic.CurrentPosition, nSte * 100);
-         }, parseInt(blindConfig.operationTime) * 100);
-      } catch (err) {
-         this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
-      }
-   }
-   externalGarageUpdate(accessory, params) {
-      try {
-         let garageConfig,
-            oldPos = accessory.getService(Service.GarageDoorOpener).getCharacteristic(Characteristic.CurrentDoorState).value,
-            newPos = [0, 2].includes(oldPos) ? 3 : 2;
-         if (!(garageConfig = this.cusG.get(accessory.context.hbDeviceId))) {
-            throw "group config missing";
-         }
-         if (garageConfig.type !== "garage" || !["oneSwitch", "twoSwitch"].includes(garageConfig.setup)) {
-            throw "improper configuration";
-         }
-         if (accessory.context.inUse || garageConfig.sensorId) {
+          }
+          oAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW0");
+          oAccessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, masterState === "on");
+          break;
+        default:
+          throw "unknown switch number [" + accessory.context.switchNumber + "]";
+      }
+      this.sendDeviceUpdate(accessory, params, callback);
+    } catch (err) {
+      let str = "[" + accessory.displayName + "] could not be updated as " + err + ".";
+      this.log.error(str);
+      callback(str);
+    }
+  }
+  internalRFDeviceUpdate(accessory, rfChl, callback) {
+    try {
+      if (!accessory.context.reachableWAN && !accessory.context.reachableLAN) {
+        throw "it is currently offline";
+      }
+      rfChl = parseInt(rfChl);
+      let params = {
+        cmd: "transmit",
+        rfChl,
+      };
+      if (this.debug) {
+        this.log("[%s %s] mimicking RF button press.", accessory.displayName, accessory.context.rfChls[rfChl]);
+      }
+      accessory.getService(accessory.context.rfChls[rfChl]).updateCharacteristic(Characteristic.On, true);
+      this.sendDeviceUpdate(accessory, params, callback);
+      setTimeout(
+        () => accessory.getService(accessory.context.rfChls[rfChl]).updateCharacteristic(Characteristic.On, false),
+        3000
+      );
+    } catch (err) {
+      let str = "[" + accessory.displayName + " " + name + "] could not be updated as " + err + ".";
+      this.log.error(str);
+      callback(str);
+    }
+  }
+  externalValveUpdate(accessory, params) {
+    try {
+      ["A", "B"].forEach((v, k) => {
+        accessory
+          .getService("Valve " + v)
+          .updateCharacteristic(Characteristic.Active, params.switches[k].switch === "on")
+          .updateCharacteristic(Characteristic.InUse, params.switches[k].switch === "on");
+        if (params.switches[k].switch === "on") {
+          let timer = accessory.getService("Valve " + v).getCharacteristic(Characteristic.SetDuration).value;
+          accessory.getService("Valve " + v).updateCharacteristic(Characteristic.RemainingDuration, timer);
+          accessory.getService("Valve " + v).timer = setTimeout(() => {
+            accessory.getService("Valve " + v).setCharacteristic(Characteristic.Active, 0);
+          }, timer * 1000);
+        } else {
+          accessory.getService("Valve " + v).updateCharacteristic(Characteristic.RemainingDuration, 0);
+          clearTimeout(accessory.getService("Valve " + v).timer);
+        }
+      });
+    } catch (err) {
+      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+    }
+  }
+  externalBlindUpdate(accessory, params) {
+    try {
+      let blindConfig, nSte;
+      if (!(blindConfig = this.cusG.get(accessory.context.hbDeviceId))) {
+        throw "group config missing";
+      }
+      if (blindConfig.type !== "blind" || ["oneSwitch", "twoSwitch"].includes(blindConfig.setup)) {
+        throw "improper configuration";
+      }
+      switch (blindConfig.setup) {
+        case "oneSwitch":
+          if (params.switch === "off") {
             return;
-         }
-         switch (garageConfig.setup) {
-            case "oneSwitch":
-               if (params.switch === "off") {
-                  return;
-               }
-               break;
-            case "twoSwitch":
-               if (params.switches[0].switch === params.switches[1].switch || params.switches[oldPos % 2].switch === "on") {
-                  return;
-               }
-               break;
-         }
-         accessory.context.inUse = true;
-         if (!garageConfig.sensorId) {
-            accessory.getService(Service.GarageDoorOpener)
-               .updateCharacteristic(Characteristic.CurrentDoorState, newPos)
-               .updateCharacteristic(Characteristic.TargetDoorState, newPos - 2);
-            setTimeout(() => {
-               accessory.getService(Service.GarageDoorOpener).updateCharacteristic(Characteristic.CurrentDoorState, newPos - 2);
-            }, parseInt(garageConfig.operationTime) * 100);
-         }
-         setTimeout(() => {
-            accessory.context.inUse = false;
-         }, parseInt(garageConfig.operationTime) * 100);
-      } catch (err) {
-         accessory.context.inUse = false;
-         this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
-      }
-   }
-   externalLockUpdate(accessory, params) {
-      try {
-         let lockConfig;
-         if (!(lockConfig = this.cusG.get(accessory.context.hbDeviceId))) {
-            throw "group config missing";
-         }
-         if (lockConfig.type !== "lock") {
-            throw "improper configuration";
-         }
-         if (params.switch === "off" || accessory.context.inUse) {
+          }
+          nSte =
+            accessory.getService(Service.WindowCovering).getCharacteristic(Characteristic.PositionState).value === 0
+              ? 1
+              : 0;
+          break;
+        case "twoSwitch":
+          if (params.switches[0].switch === "off" && params.switches[1].switch === "off") {
             return;
-         }
-         accessory.context.inUse = true;
-         accessory.getService(Service.LockMechanism)
-            .updateCharacteristic(Characteristic.LockCurrentState, 0)
-            .updateCharacteristic(Characteristic.LockTargetState, 0);
-         setTimeout(() => {
-            accessory.getService(Service.LockMechanism)
-               .updateCharacteristic(Characteristic.LockCurrentState, 1)
-               .updateCharacteristic(Characteristic.LockTargetState, 1);
-            accessory.context.inUse = false;
-         }, parseInt(lockConfig.operationTime) * 100);
-      } catch (err) {
-         accessory.context.inUse = false;
-         this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
-      }
-   }
-   externalSensorUpdate(accessory, params) {
-      try {
-         let newState = params.switch === "on" ? 1 : 0,
-            oAccessory = false;
-         accessory.getService(Service.ContactSensor).updateCharacteristic(Characteristic.ContactSensorState, newState);
-         if (params.hasOwnProperty("battery")) {
-            let batteryService = accessory.getService(Service.BatteryService) || accessory.addService(Service.BatteryService);
-            batteryService.updateCharacteristic(Characteristic.BatteryLevel, params.battery);
-            batteryService.updateCharacteristic(Characteristic.StatusLowBattery, params.battery <= 25);
-         }
-         this.cusG.forEach(group => {
-            if (group.sensorId === accessory.context.eweDeviceId && group.type === "garage") {
-               if ((oAccessory = this.devicesInHB.get(group.deviceId + "SWX"))) {
-                  switch (newState) {
-                     case 0:
-                        oAccessory.getService(Service.GarageDoorOpener)
-                           .updateCharacteristic(Characteristic.TargetDoorState, 1)
-                           .updateCharacteristic(Characteristic.CurrentDoorState, 1);
-                        break;
-                     case 1:
-                        setTimeout(() => {
-                           oAccessory.getService(Service.GarageDoorOpener)
-                              .updateCharacteristic(Characteristic.TargetDoorState, 0)
-                              .updateCharacteristic(Characteristic.CurrentDoorState, 0);
-                        }, group.operationTime * 100);
-                        break;
-                     default:
-                        throw "unknown sensor status received [" + newState + "]";
-                  }
-               }
+          }
+          let switchUp = params.switches[0].switch === "on" ? -1 : 0, // matrix of numbers to get
+            switchDown = params.switches[1].switch === "on" ? 0 : 2; // ... the correct HomeKit value
+          nSte = switchUp + switchDown;
+          break;
+      }
+      accessory
+        .getService(Service.WindowCovering)
+        .updateCharacteristic(Characteristic.PositionState, nSte)
+        .updateCharacteristic(Characteristic.TargetPosition, nSte * 100);
+      setTimeout(() => {
+        accessory
+          .getService(Service.WindowCovering)
+          .updateCharacteristic(Characteristic.PositionState, 2)
+          .updateCharacteristic(Characteristic.CurrentPosition, nSte * 100);
+      }, parseInt(blindConfig.operationTime) * 100);
+    } catch (err) {
+      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+    }
+  }
+  externalGarageUpdate(accessory, params) {
+    try {
+      let garageConfig,
+        oldPos = accessory.getService(Service.GarageDoorOpener).getCharacteristic(Characteristic.CurrentDoorState)
+          .value,
+        newPos = [0, 2].includes(oldPos) ? 3 : 2;
+      if (!(garageConfig = this.cusG.get(accessory.context.hbDeviceId))) {
+        throw "group config missing";
+      }
+      if (garageConfig.type !== "garage" || !["oneSwitch", "twoSwitch"].includes(garageConfig.setup)) {
+        throw "improper configuration";
+      }
+      if (accessory.context.inUse || garageConfig.sensorId) {
+        return;
+      }
+      switch (garageConfig.setup) {
+        case "oneSwitch":
+          if (params.switch === "off") {
+            return;
+          }
+          break;
+        case "twoSwitch":
+          if (params.switches[0].switch === params.switches[1].switch || params.switches[oldPos % 2].switch === "on") {
+            return;
+          }
+          break;
+      }
+      accessory.context.inUse = true;
+      if (!garageConfig.sensorId) {
+        accessory
+          .getService(Service.GarageDoorOpener)
+          .updateCharacteristic(Characteristic.CurrentDoorState, newPos)
+          .updateCharacteristic(Characteristic.TargetDoorState, newPos - 2);
+        setTimeout(() => {
+          accessory
+            .getService(Service.GarageDoorOpener)
+            .updateCharacteristic(Characteristic.CurrentDoorState, newPos - 2);
+        }, parseInt(garageConfig.operationTime) * 100);
+      }
+      setTimeout(() => {
+        accessory.context.inUse = false;
+      }, parseInt(garageConfig.operationTime) * 100);
+    } catch (err) {
+      accessory.context.inUse = false;
+      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+    }
+  }
+  externalLockUpdate(accessory, params) {
+    try {
+      let lockConfig;
+      if (!(lockConfig = this.cusG.get(accessory.context.hbDeviceId))) {
+        throw "group config missing";
+      }
+      if (lockConfig.type !== "lock") {
+        throw "improper configuration";
+      }
+      if (params.switch === "off" || accessory.context.inUse) {
+        return;
+      }
+      accessory.context.inUse = true;
+      accessory
+        .getService(Service.LockMechanism)
+        .updateCharacteristic(Characteristic.LockCurrentState, 0)
+        .updateCharacteristic(Characteristic.LockTargetState, 0);
+      setTimeout(() => {
+        accessory
+          .getService(Service.LockMechanism)
+          .updateCharacteristic(Characteristic.LockCurrentState, 1)
+          .updateCharacteristic(Characteristic.LockTargetState, 1);
+        accessory.context.inUse = false;
+      }, parseInt(lockConfig.operationTime) * 100);
+    } catch (err) {
+      accessory.context.inUse = false;
+      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+    }
+  }
+  externalSensorUpdate(accessory, params) {
+    try {
+      let newState = params.switch === "on" ? 1 : 0,
+        oAccessory = false;
+      accessory.getService(Service.ContactSensor).updateCharacteristic(Characteristic.ContactSensorState, newState);
+      if (params.hasOwnProperty("battery")) {
+        let batteryService =
+          accessory.getService(Service.BatteryService) || accessory.addService(Service.BatteryService);
+        batteryService.updateCharacteristic(Characteristic.BatteryLevel, params.battery);
+        batteryService.updateCharacteristic(Characteristic.StatusLowBattery, params.battery <= 25);
+      }
+      this.cusG.forEach(group => {
+        if (group.sensorId === accessory.context.eweDeviceId && group.type === "garage") {
+          if ((oAccessory = this.devicesInHB.get(group.deviceId + "SWX"))) {
+            switch (newState) {
+              case 0:
+                oAccessory
+                  .getService(Service.GarageDoorOpener)
+                  .updateCharacteristic(Characteristic.TargetDoorState, 1)
+                  .updateCharacteristic(Characteristic.CurrentDoorState, 1);
+                break;
+              case 1:
+                setTimeout(() => {
+                  oAccessory
+                    .getService(Service.GarageDoorOpener)
+                    .updateCharacteristic(Characteristic.TargetDoorState, 0)
+                    .updateCharacteristic(Characteristic.CurrentDoorState, 0);
+                }, group.operationTime * 100);
+                break;
+              default:
+                throw "unknown sensor status received [" + newState + "]";
             }
-         });
-      } catch (err) {
-         this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
-      }
-   }
-   externalFanUpdate(accessory, params) {
-      try {
-         let light, status, speed;
-         if (Array.isArray(params.switches)) {
-            light = params.switches[0].switch === "on";
-            switch (params.switches[1].switch+params.switches[2].switch+params.switches[3].switch) {
-               default:
-                  status = 0;
-                  speed = 0;
-                  break;
-               case "onoffoff":
-                  status = 1;
-                  speed = 33;
-                  break;
-               case "ononoff":
-                  status = 1;
-                  speed = 66;
-                  break;
-               case "onoffon":
-                  status = 1;
-                  speed = 99;
+          }
+        }
+      });
+    } catch (err) {
+      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+    }
+  }
+  externalFanUpdate(accessory, params) {
+    try {
+      let light, status, speed;
+      if (Array.isArray(params.switches)) {
+        light = params.switches[0].switch === "on";
+        switch (params.switches[1].switch + params.switches[2].switch + params.switches[3].switch) {
+          default:
+            status = 0;
+            speed = 0;
+            break;
+          case "onoffoff":
+            status = 1;
+            speed = 33;
+            break;
+          case "ononoff":
+            status = 1;
+            speed = 66;
+            break;
+          case "onoffon":
+            status = 1;
+            speed = 99;
+        }
+      } else if (params.hasOwnProperty("light") && params.hasOwnProperty("fan") && params.hasOwnProperty("speed")) {
+        light = params.light === "on";
+        status = params.fan === "on" ? 1 : 0;
+        speed = params.speed * 33 * status;
+      } else {
+        throw "unknown parameters received";
+      }
+      accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, light);
+      accessory
+        .getService(Service.Fanv2)
+        .updateCharacteristic(Characteristic.Active, status)
+        .updateCharacteristic(Characteristic.RotationSpeed, speed);
+    } catch (err) {
+      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+    }
+  }
+  externalThermostatUpdate(accessory, params) {
+    try {
+      if (!this.config.hideTHSwitch && (params.hasOwnProperty("switch") || params.hasOwnProperty("mainSwitch"))) {
+        let newState = params.hasOwnProperty("switch") ? params.switch === "on" : params.mainSwitch === "on";
+        accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, newState);
+      }
+      let eveLog = {
+        time: Date.now(),
+      };
+      if (params.hasOwnProperty("currentTemperature") && accessory.getService(Service.TemperatureSensor)) {
+        let currentTemp = params.currentTemperature !== "unavailable" ? params.currentTemperature : 0;
+        accessory
+          .getService(Service.TemperatureSensor)
+          .updateCharacteristic(Characteristic.CurrentTemperature, currentTemp);
+        eveLog.temp = parseFloat(currentTemp);
+      }
+      if (params.hasOwnProperty("currentHumidity") && accessory.getService(Service.HumiditySensor)) {
+        let currentHumi = params.currentHumidity !== "unavailable" ? params.currentHumidity : 0;
+        accessory
+          .getService(Service.HumiditySensor)
+          .updateCharacteristic(Characteristic.CurrentRelativeHumidity, currentHumi);
+        eveLog.humidity = parseFloat(currentHumi);
+      }
+      if (eveLog.hasOwnProperty("temp") || eveLog.hasOwnProperty("humidity")) {
+        accessory.eveLogger.addEntry(eveLog);
+      }
+    } catch (err) {
+      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+    }
+  }
+  externalOutletUpdate(accessory, params) {
+    try {
+      if (params.hasOwnProperty("switch")) {
+        accessory.getService(Service.Outlet).updateCharacteristic(Characteristic.On, params.switch === "on");
+      }
+      if (params.hasOwnProperty("power")) {
+        accessory
+          .getService(Service.Outlet)
+          .updateCharacteristic(EveService.Characteristics.CurrentConsumption, parseFloat(params.power));
+        accessory
+          .getService(Service.Outlet)
+          .updateCharacteristic(Characteristic.OutletInUse, parseFloat(params.power) > 0);
+        let isOn = accessory.getService(Service.Outlet).getCharacteristic(Characteristic.On).value;
+        accessory.eveLogger.addEntry({
+          time: Date.now(),
+          power: isOn ? parseFloat(params.power) : 0,
+        });
+      }
+      if (params.hasOwnProperty("voltage")) {
+        accessory
+          .getService(Service.Outlet)
+          .updateCharacteristic(EveService.Characteristics.Voltage, parseFloat(params.voltage));
+      }
+      if (params.hasOwnProperty("current")) {
+        accessory
+          .getService(Service.Outlet)
+          .updateCharacteristic(EveService.Characteristics.ElectricCurrent, parseFloat(params.current));
+      }
+    } catch (err) {
+      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+    }
+  }
+  externalUSBUpdate(accessory, params) {
+    try {
+      accessory.getService(Service.Outlet).updateCharacteristic(Characteristic.On, params.switches[0].switch === "on");
+    } catch (err) {
+      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+    }
+  }
+  externalSCMUpdate(accessory, params) {
+    try {
+      accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, params.switches[0].switch === "on");
+    } catch (err) {
+      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+    }
+  }
+  externalSingleLightUpdate(accessory, params) {
+    try {
+      let newColour,
+        mode,
+        isOn = false;
+      if (accessory.context.eweUIID === 22 && params.hasOwnProperty("state")) {
+        isOn = params.state === "on";
+      } else if (accessory.context.eweUIID !== 22 && params.hasOwnProperty("switch")) {
+        isOn = params.switch === "on";
+      } else {
+        isOn = accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On).value;
+      }
+      if (isOn) {
+        accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, true);
+        switch (accessory.context.eweUIID) {
+          case 36: // KING-M4
+            if (params.hasOwnProperty("bright")) {
+              let nb = Math.round(((params.bright - 10) * 10) / 9); // eWeLink scale is 10-100 and HomeKit scale is 0-100.
+              accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.Brightness, nb);
             }
-         } else if (params.hasOwnProperty("light") && params.hasOwnProperty("fan") && params.hasOwnProperty("speed")) {
-            light = params.light === "on";
-            status = params.fan === "on" ? 1 : 0;
-            speed = params.speed * 33 * status;
-         } else {
-            throw "unknown parameters received";
-         }
-         accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, light);
-         accessory.getService(Service.Fanv2)
-            .updateCharacteristic(Characteristic.Active, status)
-            .updateCharacteristic(Characteristic.RotationSpeed, speed);
-      } catch (err) {
-         this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
-      }
-   }
-   externalThermostatUpdate(accessory, params) {
-      try {
-         if (!this.config.hideTHSwitch && (params.hasOwnProperty("switch") || params.hasOwnProperty("mainSwitch"))) {
-            let newState = params.hasOwnProperty("switch") ? params.switch === "on" : params.mainSwitch === "on";
-            accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, newState);
-         }
-         let eveLog = {
-            time: Date.now()
-         };
-         if (params.hasOwnProperty("currentTemperature") && accessory.getService(Service.TemperatureSensor)) {
-            let currentTemp = params.currentTemperature !== "unavailable" ? params.currentTemperature : 0;
-            accessory.getService(Service.TemperatureSensor).updateCharacteristic(Characteristic.CurrentTemperature, currentTemp);
-            eveLog.temp = parseFloat(currentTemp);
-         }
-         if (params.hasOwnProperty("currentHumidity") && accessory.getService(Service.HumiditySensor)) {
-            let currentHumi = params.currentHumidity !== "unavailable" ? params.currentHumidity : 0;
-            accessory.getService(Service.HumiditySensor).updateCharacteristic(Characteristic.CurrentRelativeHumidity, currentHumi);
-            eveLog.humidity = parseFloat(currentHumi);
-         }
-         if (eveLog.hasOwnProperty("temp") || eveLog.hasOwnProperty("humidity")) {
-            accessory.eveLogger.addEntry(eveLog);
-         }
-      } catch (err) {
-         this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
-      }
-   }
-   externalOutletUpdate(accessory, params) {
-      try {
-         if (params.hasOwnProperty("switch")) {
-            accessory.getService(Service.Outlet).updateCharacteristic(Characteristic.On, params.switch === "on");
-         }
-         if (params.hasOwnProperty("power")) {
-            accessory.getService(Service.Outlet).updateCharacteristic(EveService.Characteristics.CurrentConsumption, parseFloat(params.power));
-            accessory.getService(Service.Outlet).updateCharacteristic(Characteristic.OutletInUse, parseFloat(params.power) > 0);
-            let isOn = accessory.getService(Service.Outlet).getCharacteristic(Characteristic.On).value;
-            accessory.eveLogger.addEntry({
-               time: Date.now(),
-               power: isOn ? parseFloat(params.power) : 0
-            });
-         }
-         if (params.hasOwnProperty("voltage")) {
-            accessory.getService(Service.Outlet).updateCharacteristic(EveService.Characteristics.Voltage, parseFloat(params.voltage));
-         }
-         if (params.hasOwnProperty("current")) {
-            accessory.getService(Service.Outlet).updateCharacteristic(EveService.Characteristics.ElectricCurrent, parseFloat(params.current));
-         }
-      } catch (err) {
-         this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
-      }
-   }
-   externalUSBUpdate(accessory, params) {
-      try {
-         accessory.getService(Service.Outlet).updateCharacteristic(Characteristic.On, params.switches[0].switch === "on");
-      } catch (err) {
-         this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
-      }
-   }
-   externalSCMUpdate(accessory, params) {
-      try {
-         accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, params.switches[0].switch === "on");
-      } catch (err) {
-         this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
-      }
-   }
-   externalSingleLightUpdate(accessory, params) {
-      try {
-         let newColour, mode, isOn = false;
-         if (accessory.context.eweUIID === 22 && params.hasOwnProperty("state")) {
-            isOn = params.state === "on";
-         } else if (accessory.context.eweUIID !== 22 && params.hasOwnProperty("switch")) {
-            isOn = params.switch === "on";
-         } else {
-            isOn = accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On).value;
-         }
-         if (isOn) {
-            accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, true);
-            switch (accessory.context.eweUIID) {
-               case 36: // KING-M4
-                  if (params.hasOwnProperty("bright")) {
-                     let nb = Math.round((params.bright - 10) * 10 / 9); // eWeLink scale is 10-100 and HomeKit scale is 0-100.
-                     accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.Brightness, nb);
-                  }
-                  break;
-               case 44: // D1
-                  if (params.hasOwnProperty("brightness")) {
-                     accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.Brightness, params.brightness);
-                  }
-                  break;
-               case 22: // B1
-                  if (params.hasOwnProperty("zyx_mode")) {
-                     mode = parseInt(params.zyx_mode);
-                  } else if (params.hasOwnProperty("channel0") && (parseInt(params.channel0) + parseInt(params.channel1) > 0)) {
-                     mode = 1;
-                  } else {
-                     mode = 2;
-                  }
-                  if (mode === 2) {
-                     accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, true);
-                     newColour = convert.rgb.hsv(parseInt(params.channel2), parseInt(params.channel3), parseInt(params.channel4));
-                     accessory.getService(Service.Lightbulb)
-                        .updateCharacteristic(Characteristic.Hue, newColour[0])
-                        .updateCharacteristic(Characteristic.Saturation, 100)
-                        .updateCharacteristic(Characteristic.Brightness, 100);
-                  } else if (mode === 1) {
-                     throw "has been set to white mode which is not supported";
-                  }
-                  break;
-               case 59: // L1
-                  if (params.hasOwnProperty("bright")) {
-                     accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.Brightness, params.bright);
-                  }
-                  if (params.hasOwnProperty("colorR")) {
-                     newColour = convert.rgb.hsv(params.colorR, params.colorG, params.colorB);
-                     accessory.getService(Service.Lightbulb)
-                        .updateCharacteristic(Characteristic.Hue, newColour[0])
-                        .updateCharacteristic(Characteristic.Saturation, newColour[1]);
-                  }
-                  break;
-               default:
-                  return;
+            break;
+          case 44: // D1
+            if (params.hasOwnProperty("brightness")) {
+              accessory
+                .getService(Service.Lightbulb)
+                .updateCharacteristic(Characteristic.Brightness, params.brightness);
             }
-         } else {
-            accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, false);
-         }
-      } catch (err) {
-         this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
-      }
-   }
-   externalMultiLightUpdate(accessory, params) {
-      try {
-         let idToCheck = accessory.context.hbDeviceId.slice(0, -1),
-            primaryState = false;
-         for (let i = 1; i <= accessory.context.channelCount; i++) {
-            if (this.devicesInHB.has(idToCheck + i)) {
-               let oAccessory = this.devicesInHB.get(idToCheck + i);
-               oAccessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, params.switches[i - 1].switch === "on");
-               if (params.switches[i - 1].switch === "on") {
-                  primaryState = true;
-               }
+            break;
+          case 22: // B1
+            if (params.hasOwnProperty("zyx_mode")) {
+              mode = parseInt(params.zyx_mode);
+            } else if (params.hasOwnProperty("channel0") && parseInt(params.channel0) + parseInt(params.channel1) > 0) {
+              mode = 1;
+            } else {
+              mode = 2;
             }
-         }
-         accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, primaryState);
-      } catch (err) {
-         this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
-      }
-   }
-   externalSingleSwitchUpdate(accessory, params) {
-      try {
-         accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, params.switch === "on");
-      } catch (err) {
-         this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
-      }
-   }
-   externalMultiSwitchUpdate(accessory, params) {
-      try {
-         let idToCheck = accessory.context.hbDeviceId.slice(0, -1),
-            primaryState = false;
-         for (let i = 1; i <= accessory.context.channelCount; i++) {
-            if (this.devicesInHB.has(idToCheck + i)) {
-               let oAccessory = this.devicesInHB.get(idToCheck + i);
-               oAccessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, params.switches[i - 1].switch === "on");
-               if (params.switches[i - 1].switch === "on") {
-                  primaryState = true;
-               }
+            if (mode === 2) {
+              accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, true);
+              newColour = convert.rgb.hsv(
+                parseInt(params.channel2),
+                parseInt(params.channel3),
+                parseInt(params.channel4)
+              );
+              accessory
+                .getService(Service.Lightbulb)
+                .updateCharacteristic(Characteristic.Hue, newColour[0])
+                .updateCharacteristic(Characteristic.Saturation, 100)
+                .updateCharacteristic(Characteristic.Brightness, 100);
+            } else if (mode === 1) {
+              throw "has been set to white mode which is not supported";
             }
-         }
-         accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, primaryState);
-      } catch (err) {
-         this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
-      }
-   }
-   externalRFDeviceUpdate(accessory, params) {
-      try {
-         if (!params.hasOwnProperty("updateSource")) return;
-         let idToCheck = accessory.context.hbDeviceId.slice(0, -1),
-            timeNow = new Date();
-         if (params.hasOwnProperty("cmd") && params.cmd === "transmit" && params.hasOwnProperty("rfChl")) { // RF Button
-            let bAccessory;
-            if ((bAccessory = this.devicesInHB.get(idToCheck + accessory.context.rfChlMap[params.rfChl]))) {
-               bAccessory.getService(bAccessory.context.rfChls[params.rfChl]).updateCharacteristic(Characteristic.On, 1);
-               setTimeout(() => bAccessory.getService(bAccessory.context.rfChls[params.rfChl]).updateCharacteristic(Characteristic.On, 0), 3000);
-            } else {
-               throw "rf button not found in Homebridge";
+            break;
+          case 59: // L1
+            if (params.hasOwnProperty("bright")) {
+              accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.Brightness, params.bright);
             }
-         } else if (params.hasOwnProperty("cmd") && params.cmd === "trigger") { // RF Sensor
-            Object.keys(params)
-               .filter(name => /rfTrig/.test(name))
-               .forEach(chan => {
-                  let chanNum = chan.substr(-1).toString(),
-                     accessoryNum = accessory.context.rfChlMap[chanNum],
-                     oAccessory;
-                  if ((oAccessory = this.devicesInHB.get(idToCheck + accessoryNum))) {
-                     let timeOfMotion = new Date(params[chan]),
-                        timeDifference = (timeNow.getTime() - timeOfMotion.getTime()) / 1000;
-                     if (timeDifference < (this.config.sensorTimeDifference || 120)) {
-                        switch (oAccessory.context.sensorType) {
-                           case "button":
-                              break;
-                           case "water":
-                              oAccessory.getService(Service.LeakSensor).updateCharacteristic(Characteristic.LeakDetected, 1);
-                              setTimeout(() => {
-                                 oAccessory.getService(Service.LeakSensor).updateCharacteristic(Characteristic.LeakDetected, 0);
-                              }, (this.config.sensorTimeLength || 2) * 1000);
-                              break;
-                           case "fire":
-                           case "smoke":
-                              oAccessory.getService(Service.SmokeSensor).updateCharacteristic(Characteristic.SmokeDetected, 1);
-                              setTimeout(() => {
-                                 oAccessory.getService(Service.SmokeSensor).updateCharacteristic(Characteristic.SmokeDetected, 0);
-                              }, (this.config.sensorTimeLength || 2) * 1000);
-                              break;
-                           case "co":
-                              oAccessory.getService(Service.CarbonMonoxideSensor).updateCharacteristic(Characteristic.CarbonMonoxideDetected, 1);
-                              setTimeout(() => {
-                                 oAccessory.getService(Service.CarbonMonoxideSensor).updateCharacteristic(Characteristic.CarbonMonoxideDetected, 0);
-                              }, (this.config.sensorTimeLength || 2) * 1000);
-                              break;
-                           case "co2":
-                              oAccessory.getService(Service.CarbonDioxideSensor).updateCharacteristic(Characteristic.CarbonDioxideDetected, 1);
-                              setTimeout(() => {
-                                 oAccessory.getService(Service.CarbonDioxideSensor).updateCharacteristic(Characteristic.CarbonDioxideDetected, 0);
-                              }, (this.config.sensorTimeLength || 2) * 1000);
-                              break;
-                           case "contact":
-                              oAccessory.getService(Service.ContactSensor).updateCharacteristic(Characteristic.ContactSensorState, 1);
-                              setTimeout(() => {
-                                 oAccessory.getService(Service.ContactSensor).updateCharacteristic(Characteristic.ContactSensorState, 0);
-                              }, (this.config.sensorTimeLength || 2) * 1000);
-                              break;
-                           case "occupancy":
-                              oAccessory.getService(Service.OccupancySensor).updateCharacteristic(Characteristic.OccupancyDetected, 1);
-                              setTimeout(() => {
-                                 oAccessory.getService(Service.OccupancySensor).updateCharacteristic(Characteristic.OccupancyDetected, 0);
-                              }, (this.config.sensorTimeLength || 2) * 1000);
-                              break;
-                           default:
-                              oAccessory.getService(Service.MotionSensor).updateCharacteristic(Characteristic.MotionDetected, true);
-                              setTimeout(() => {
-                                 oAccessory.getService(Service.MotionSensor).updateCharacteristic(Characteristic.MotionDetected, false);
-                              }, (this.config.sensorTimeLength || 2) * 1000);
-                              break;
-                        }
-                        if (this.debug) {
-                           this.log("[%s] has detected [%s].", oAccessory.displayName, oAccessory.context.sensorType);
-                        }
-                     }
-                  }
-               });
-         }
-      } catch (err) {
-         this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
-      }
-   }
-   externalZBDeviceUpdate(accessory, params) {
-      try { //*** credit @tasict ***\\
-         if (params.hasOwnProperty("battery")) {
-            let batteryService = accessory.getService(Service.BatteryService) || accessory.addService(Service.BatteryService);
-            batteryService.updateCharacteristic(Characteristic.BatteryLevel, params.battery);
-            batteryService.updateCharacteristic(Characteristic.StatusLowBattery, params.battery <= 25);
-         }
-         switch (accessory.context.eweUIID) {
-            case 1000:
-               if (params.hasOwnProperty("key") && [0, 1, 2].includes(params.key)) {
-                  accessory.getService(Service.StatelessProgrammableSwitch).updateCharacteristic(Characteristic.ProgrammableSwitchEvent, params.key);
-               }
-               break;
-            case 1770:
-               let eveLog = {
-                  time: Date.now()
-               };
-               if (params.hasOwnProperty("temperature")) {
-                  let currentTemp = parseInt(params.temperature) / 100;
-                  accessory.getService(Service.TemperatureSensor).updateCharacteristic(Characteristic.CurrentTemperature, currentTemp);
-                  eveLog.temp = parseFloat(currentTemp);
-               }
-               if (params.hasOwnProperty("humidity")) {
-                  let currentHumi = parseInt(params.humidity) / 100;
-                  accessory.getService(Service.HumiditySensor).updateCharacteristic(Characteristic.CurrentRelativeHumidity, currentHumi);
-                  eveLog.humidity = parseFloat(currentHumi);
-               }
-               if (eveLog.hasOwnProperty("temp") || eveLog.hasOwnProperty("humidity")) {
-                  accessory.eveLogger.addEntry(eveLog);
-               }
-               break;
-            case 2026:
-               if (params.hasOwnProperty("motion") && params.motion === 1 && params.hasOwnProperty("trigTime")) {
-                  let timeNow = new Date(),
-                     timeDifference = (timeNow.getTime() - params.trigTime) / 1000;
-                  if (timeDifference < (this.config.sensorTimeDifference || 120)) {
-                     accessory.getService(Service.MotionSensor).updateCharacteristic(Characteristic.MotionDetected, 1);
-                     setTimeout(() => {
-                        accessory.getService(Service.MotionSensor).updateCharacteristic(Characteristic.MotionDetected, 0);
-                     }, (this.config.sensorTimeLength || 2) * 1000);
-                  }
-                  break;
-               }
-               break;
-            case 3026:
-               if (params.hasOwnProperty("lock") && [0, 1].includes(params.lock)) {
-                  accessory.getService(Service.ContactSensor).updateCharacteristic(Characteristic.ContactSensorState, params.lock);
-               }
-               break;
-         }
-      } catch (err) {
-         this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
-      }
-   }
+            if (params.hasOwnProperty("colorR")) {
+              newColour = convert.rgb.hsv(params.colorR, params.colorG, params.colorB);
+              accessory
+                .getService(Service.Lightbulb)
+                .updateCharacteristic(Characteristic.Hue, newColour[0])
+                .updateCharacteristic(Characteristic.Saturation, newColour[1]);
+            }
+            break;
+          default:
+            return;
+        }
+      } else {
+        accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, false);
+      }
+    } catch (err) {
+      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+    }
+  }
+  externalMultiLightUpdate(accessory, params) {
+    try {
+      let idToCheck = accessory.context.hbDeviceId.slice(0, -1),
+        primaryState = false;
+      for (let i = 1; i <= accessory.context.channelCount; i++) {
+        if (this.devicesInHB.has(idToCheck + i)) {
+          let oAccessory = this.devicesInHB.get(idToCheck + i);
+          oAccessory
+            .getService(Service.Lightbulb)
+            .updateCharacteristic(Characteristic.On, params.switches[i - 1].switch === "on");
+          if (params.switches[i - 1].switch === "on") {
+            primaryState = true;
+          }
+        }
+      }
+      accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, primaryState);
+    } catch (err) {
+      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+    }
+  }
+  externalSingleSwitchUpdate(accessory, params) {
+    try {
+      accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, params.switch === "on");
+    } catch (err) {
+      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+    }
+  }
+  externalMultiSwitchUpdate(accessory, params) {
+    try {
+      let idToCheck = accessory.context.hbDeviceId.slice(0, -1),
+        primaryState = false;
+      for (let i = 1; i <= accessory.context.channelCount; i++) {
+        if (this.devicesInHB.has(idToCheck + i)) {
+          let oAccessory = this.devicesInHB.get(idToCheck + i);
+          oAccessory
+            .getService(Service.Switch)
+            .updateCharacteristic(Characteristic.On, params.switches[i - 1].switch === "on");
+          if (params.switches[i - 1].switch === "on") {
+            primaryState = true;
+          }
+        }
+      }
+      accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, primaryState);
+    } catch (err) {
+      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+    }
+  }
+  externalRFDeviceUpdate(accessory, params) {
+    try {
+      if (!params.hasOwnProperty("updateSource")) return;
+      let idToCheck = accessory.context.hbDeviceId.slice(0, -1),
+        timeNow = new Date();
+      if (params.hasOwnProperty("cmd") && params.cmd === "transmit" && params.hasOwnProperty("rfChl")) {
+        // RF Button
+        let bAccessory;
+        if ((bAccessory = this.devicesInHB.get(idToCheck + accessory.context.rfChlMap[params.rfChl]))) {
+          bAccessory.getService(bAccessory.context.rfChls[params.rfChl]).updateCharacteristic(Characteristic.On, 1);
+          setTimeout(
+            () =>
+              bAccessory.getService(bAccessory.context.rfChls[params.rfChl]).updateCharacteristic(Characteristic.On, 0),
+            3000
+          );
+        } else {
+          throw "rf button not found in Homebridge";
+        }
+      } else if (params.hasOwnProperty("cmd") && params.cmd === "trigger") {
+        // RF Sensor
+        Object.keys(params)
+          .filter(name => /rfTrig/.test(name))
+          .forEach(chan => {
+            let chanNum = chan.substr(-1).toString(),
+              accessoryNum = accessory.context.rfChlMap[chanNum],
+              oAccessory;
+            if ((oAccessory = this.devicesInHB.get(idToCheck + accessoryNum))) {
+              let timeOfMotion = new Date(params[chan]),
+                diff = (timeNow.getTime() - timeOfMotion.getTime()) / 1000;
+              if (diff < (this.config.sensorTimeDifference || 120)) {
+                switch (oAccessory.context.sensorType) {
+                  case "button":
+                    break;
+                  case "water":
+                    oAccessory.getService(Service.LeakSensor).updateCharacteristic(Characteristic.LeakDetected, 1);
+                    setTimeout(() => {
+                      oAccessory.getService(Service.LeakSensor).updateCharacteristic(Characteristic.LeakDetected, 0);
+                    }, (this.config.sensorTimeLength || 2) * 1000);
+                    break;
+                  case "fire":
+                  case "smoke":
+                    oAccessory.getService(Service.SmokeSensor).updateCharacteristic(Characteristic.SmokeDetected, 1);
+                    setTimeout(() => {
+                      oAccessory.getService(Service.SmokeSensor).updateCharacteristic(Characteristic.SmokeDetected, 0);
+                    }, (this.config.sensorTimeLength || 2) * 1000);
+                    break;
+                  case "co":
+                    oAccessory
+                      .getService(Service.CarbonMonoxideSensor)
+                      .updateCharacteristic(Characteristic.CarbonMonoxideDetected, 1);
+                    setTimeout(() => {
+                      oAccessory
+                        .getService(Service.CarbonMonoxideSensor)
+                        .updateCharacteristic(Characteristic.CarbonMonoxideDetected, 0);
+                    }, (this.config.sensorTimeLength || 2) * 1000);
+                    break;
+                  case "co2":
+                    oAccessory
+                      .getService(Service.CarbonDioxideSensor)
+                      .updateCharacteristic(Characteristic.CarbonDioxideDetected, 1);
+                    setTimeout(() => {
+                      oAccessory
+                        .getService(Service.CarbonDioxideSensor)
+                        .updateCharacteristic(Characteristic.CarbonDioxideDetected, 0);
+                    }, (this.config.sensorTimeLength || 2) * 1000);
+                    break;
+                  case "contact":
+                    oAccessory
+                      .getService(Service.ContactSensor)
+                      .updateCharacteristic(Characteristic.ContactSensorState, 1);
+                    setTimeout(() => {
+                      oAccessory
+                        .getService(Service.ContactSensor)
+                        .updateCharacteristic(Characteristic.ContactSensorState, 0);
+                    }, (this.config.sensorTimeLength || 2) * 1000);
+                    break;
+                  case "occupancy":
+                    oAccessory
+                      .getService(Service.OccupancySensor)
+                      .updateCharacteristic(Characteristic.OccupancyDetected, 1);
+                    setTimeout(() => {
+                      oAccessory
+                        .getService(Service.OccupancySensor)
+                        .updateCharacteristic(Characteristic.OccupancyDetected, 0);
+                    }, (this.config.sensorTimeLength || 2) * 1000);
+                    break;
+                  default:
+                    oAccessory
+                      .getService(Service.MotionSensor)
+                      .updateCharacteristic(Characteristic.MotionDetected, true);
+                    setTimeout(() => {
+                      oAccessory
+                        .getService(Service.MotionSensor)
+                        .updateCharacteristic(Characteristic.MotionDetected, false);
+                    }, (this.config.sensorTimeLength || 2) * 1000);
+                    break;
+                }
+                if (this.debug) {
+                  this.log("[%s] has detected [%s].", oAccessory.displayName, oAccessory.context.sensorType);
+                }
+              }
+            }
+          });
+      }
+    } catch (err) {
+      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+    }
+  }
+  externalZBDeviceUpdate(accessory, params) {
+    try {
+      //*** credit @tasict ***\\
+      if (params.hasOwnProperty("battery")) {
+        let batteryService =
+          accessory.getService(Service.BatteryService) || accessory.addService(Service.BatteryService);
+        batteryService.updateCharacteristic(Characteristic.BatteryLevel, params.battery);
+        batteryService.updateCharacteristic(Characteristic.StatusLowBattery, params.battery <= 25);
+      }
+      switch (accessory.context.eweUIID) {
+        case 1000:
+          if (params.hasOwnProperty("key") && [0, 1, 2].includes(params.key)) {
+            accessory
+              .getService(Service.StatelessProgrammableSwitch)
+              .updateCharacteristic(Characteristic.ProgrammableSwitchEvent, params.key);
+          }
+          break;
+        case 1770:
+          let eveLog = {
+            time: Date.now(),
+          };
+          if (params.hasOwnProperty("temperature")) {
+            let currentTemp = parseInt(params.temperature) / 100;
+            accessory
+              .getService(Service.TemperatureSensor)
+              .updateCharacteristic(Characteristic.CurrentTemperature, currentTemp);
+            eveLog.temp = parseFloat(currentTemp);
+          }
+          if (params.hasOwnProperty("humidity")) {
+            let currentHumi = parseInt(params.humidity) / 100;
+            accessory
+              .getService(Service.HumiditySensor)
+              .updateCharacteristic(Characteristic.CurrentRelativeHumidity, currentHumi);
+            eveLog.humidity = parseFloat(currentHumi);
+          }
+          if (eveLog.hasOwnProperty("temp") || eveLog.hasOwnProperty("humidity")) {
+            accessory.eveLogger.addEntry(eveLog);
+          }
+          break;
+        case 2026:
+          if (params.hasOwnProperty("motion") && params.hasOwnProperty("trigTime")) {
+            let timeNow = new Date(),
+              diff = (timeNow.getTime() - params.trigTime) / 1000;
+            accessory
+              .getService(Service.MotionSensor)
+              .updateCharacteristic(
+                Characteristic.MotionDetected,
+                params.hasOwnProperty("updateSource") &&
+                  params.motion === 1 &&
+                  diff < (this.config.sensortimeDifference || 120)
+              );
+            break;
+          }
+          break;
+        case 3026:
+          if (params.hasOwnProperty("lock") && [0, 1].includes(params.lock)) {
+            accessory
+              .getService(Service.ContactSensor)
+              .updateCharacteristic(Characteristic.ContactSensorState, params.lock);
+          }
+          break;
+      }
+    } catch (err) {
+      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+    }
+  }
 }
-module.exports = function(homebridge) {
-   Accessory = homebridge.platformAccessory;
-   Characteristic = homebridge.hap.Characteristic;
-   EveService = new hbLib.EveHomeKitTypes(homebridge);
-   EveHistoryService = fakegato(homebridge);
-   Service = homebridge.hap.Service;
-   UUIDGen = homebridge.hap.uuid;
-   return eWeLink;
-};
\ No newline at end of file
+module.exports = function (homebridge) {
+  Accessory = homebridge.platformAccessory;
+  Characteristic = homebridge.hap.Characteristic;
+  EveService = new hbLib.EveHomeKitTypes(homebridge);
+  EveHistoryService = fakegato(homebridge);
+  Service = homebridge.hap.Service;
+  UUIDGen = homebridge.hap.uuid;
+  return eWeLink;
+};
diff --git a/lib/eWeLinkHTTP.js b/lib/eWeLinkHTTP.js
index 0382542b..57e12c2f 100644
--- a/lib/eWeLinkHTTP.js
+++ b/lib/eWeLinkHTTP.js
@@ -1,156 +1,176 @@
 /* jshint esversion: 9, -W030, node: true */
 "use strict";
 const axios = require("axios"),
-   constants = require("./constants"),
-   crypto = require("crypto");
+  constants = require("./constants"),
+  crypto = require("crypto");
 module.exports = class eWeLinkHTTP {
-   constructor(config, log) {
-      this.config = config;
-      this.log = log;
-      this.debug = this.config.debug || false;
-      this.debugReqRes = this.config.debugReqRes || false;
-   }
-   login() {
-      let data = {
-         countryCode: "+" + this.config.countryCode.toString().replace("+", "").replace(" ", ""),
-         password: this.config.password
-      };
-      this.config.username.includes("@") ?
-         data.email = this.config.username :
-         data.phoneNumber = this.config.username;
-      if (this.debugReqRes) {
-         let msg = JSON.stringify(data, null, 2).replace(this.config.password, "**hidden**").replace(this.config.username, "**hidden**");
-         this.log.warn("Sending HTTP login request. This text is yellow for clarity.\n%s", msg);
-      } else if (this.debug) {
-         this.log("Sending HTTP login request.");
-      }
-      let dataToSign = crypto.createHmac("sha256", constants.appSecret).update(JSON.stringify(data)).digest("base64");
-      return new Promise((resolve, reject) => {
-         axios({
-            url: "https://" + this.httpHost + "/v2/user/login",
-            method: "post",
-            headers: {
-               Authorization: "Sign " + dataToSign,
-               "Content-Type": "application/json",
-               Host: this.httpHost,
-               "X-CK-Appid": constants.appId,
-               "X-CK-Nonce": Math.random().toString(36).substr(2, 8)
-            },
-            data
-         }).then(res => {
-            let body = res.data;
-            if (body.hasOwnProperty("error") && body.error === 10004 && body.hasOwnProperty("data") && body.data.hasOwnProperty("region")) {
-               switch (body.data.region) {
-                  case "eu":
-                  case "us":
-                  case "as":
-                     this.httpHost = body.data.region + "-apia.coolkit.cc";
-                     break;
-                  case "cn":
-                     this.httpHost = "cn-apia.coolkit.cn";
-                     break;
-                  default:
-                     throw "No valid region received - [" + body.data.region + "].";
-               }
-               if (this.debug) {
-                  this.log("New HTTP API host received [%s].", this.httpHost);
-               }
-               resolve(this.login());
-               return;
-            }
-            if (!body.data.at) {
-               throw "Server did not respond with an authentication token. Please double check your eWeLink username and password in the Homebridge configuration.\n" + JSON.stringify(body, null, 2);
-            }
-            this.aToken = body.data.at;
-            this.apiKey = body.data.user.apikey;
-            resolve({
-               aToken: body.data.at,
-               apiKey: body.data.user.apikey,
-               httpHost: this.httpHost
-            });
-         }).catch(err => {
-            reject(err);
-         });
-      });
-   }
-   getHost() {
-      let data = {
-            appid: constants.appId,
-            country_code: this.config.countryCode.toString().replace("+", "").replace(" ", ""),
-            nonce: Math.random().toString(36).substr(2, 8),
-            ts: Math.floor(new Date().getTime() / 1000),
-            version: 8
-         },
-         dataToSign = [];
-      Object.keys(data).forEach(function(key) {
-         dataToSign.push({
-            key: key,
-            value: data[key]
-         });
-      });
-      dataToSign.sort(function(a, b) {
-         return a.key < b.key ? -1 : 1;
-      });
-      dataToSign = dataToSign.map(function(kv) {
-         return kv.key + "=" + kv.value;
-      }).join("&");
-      dataToSign = crypto.createHmac("sha256", "6Nz4n0xA8s8qdxQf2GqurZj2Fs55FUvM").update(dataToSign).digest("base64");
-      return new Promise((resolve, reject) => {
-         axios.get("https://api.coolkit.cc:8080/api/user/region", {
-            headers: {
-               Authorization: "Sign " + dataToSign,
-               "Content-Type": "application/json"
-            },
-            params: data
-         }).then(res => {
-            let body = res.data;
-            if (!body.region) {
-               throw "Server did not respond with a region.\n" + JSON.stringify(body, null, 2);
-            }
-            switch (body.region) {
-               case "eu":
-               case "us":
-               case "as":
-                  this.httpHost = body.region + "-apia.coolkit.cc";
-                  break;
-               case "cn":
-                  this.httpHost = "cn-apia.coolkit.cn";
-                  break;
-               default:
-                  throw "No valid region received - [" + body.region + "].";
+  constructor(config, log) {
+    this.config = config;
+    this.log = log;
+    this.debug = this.config.debug || false;
+    this.debugReqRes = this.config.debugReqRes || false;
+  }
+  login() {
+    let data = {
+      countryCode: "+" + this.config.countryCode.toString().replace("+", "").replace(" ", ""),
+      password: this.config.password,
+    };
+    this.config.username.includes("@")
+      ? (data.email = this.config.username)
+      : (data.phoneNumber = this.config.username);
+    if (this.debugReqRes) {
+      let msg = JSON.stringify(data, null, 2)
+        .replace(this.config.password, "**hidden**")
+        .replace(this.config.username, "**hidden**");
+      this.log.warn("Sending HTTP login request. This text is yellow for clarity.\n%s", msg);
+    } else if (this.debug) {
+      this.log("Sending HTTP login request.");
+    }
+    let dataToSign = crypto.createHmac("sha256", constants.appSecret).update(JSON.stringify(data)).digest("base64");
+    return new Promise((resolve, reject) => {
+      axios({
+        url: "https://" + this.httpHost + "/v2/user/login",
+        method: "post",
+        headers: {
+          Authorization: "Sign " + dataToSign,
+          "Content-Type": "application/json",
+          Host: this.httpHost,
+          "X-CK-Appid": constants.appId,
+          "X-CK-Nonce": Math.random().toString(36).substr(2, 8),
+        },
+        data,
+      })
+        .then(res => {
+          let body = res.data;
+          if (
+            body.hasOwnProperty("error") &&
+            body.error === 10004 &&
+            body.hasOwnProperty("data") &&
+            body.data.hasOwnProperty("region")
+          ) {
+            switch (body.data.region) {
+              case "eu":
+              case "us":
+              case "as":
+                this.httpHost = body.data.region + "-apia.coolkit.cc";
+                break;
+              case "cn":
+                this.httpHost = "cn-apia.coolkit.cn";
+                break;
+              default:
+                throw "No valid region received - [" + body.data.region + "].";
             }
             if (this.debug) {
-               this.log("HTTP API host received [%s].", this.httpHost);
-            }
-            resolve(this.httpHost);
-         }).catch(err => {
-            reject(err);
-         });
-      });
-   }
-   getDevices() {
-      return new Promise((resolve, reject) => {
-         axios.get("https://" + this.httpHost + "/v2/device/thing", {
-            headers: {
-               Authorization: "Bearer " + this.aToken,
-               "Content-Type": "application/json",
-               Host: this.httpHost,
-               "X-CK-Appid": constants.appId,
-               "X-CK-Nonce": Math.random().toString(36).substr(2, 8)
-            }
-         }).then(res => {
-            let body = res.data;
-            if (!body.hasOwnProperty("error") || (body.hasOwnProperty("error") && body.error !== 0)) {
-               throw JSON.stringify(body, null, 2);
-            }
-            let deviceList = [];
-            if (body.data.thingList && body.data.thingList.length > 0) {
-               body.data.thingList.forEach(device => deviceList.push(device.itemData));
+              this.log("New HTTP API host received [%s].", this.httpHost);
             }
-            resolve(deviceList);
-         }).catch(err => {
-            reject(err);
-         });
+            resolve(this.login());
+            return;
+          }
+          if (!body.data.at) {
+            throw (
+              "Server did not respond with an authentication token. Please double check your eWeLink username and password in the Homebridge configuration.\n" +
+              JSON.stringify(body, null, 2)
+            );
+          }
+          this.aToken = body.data.at;
+          this.apiKey = body.data.user.apikey;
+          resolve({
+            aToken: body.data.at,
+            apiKey: body.data.user.apikey,
+            httpHost: this.httpHost,
+          });
+        })
+        .catch(err => {
+          reject(err);
+        });
+    });
+  }
+  getHost() {
+    let data = {
+        appid: constants.appId,
+        country_code: this.config.countryCode.toString().replace("+", "").replace(" ", ""),
+        nonce: Math.random().toString(36).substr(2, 8),
+        ts: Math.floor(new Date().getTime() / 1000),
+        version: 8,
+      },
+      dataToSign = [];
+    Object.keys(data).forEach(function (key) {
+      dataToSign.push({
+        key: key,
+        value: data[key],
       });
-   }
-};
\ No newline at end of file
+    });
+    dataToSign.sort(function (a, b) {
+      return a.key < b.key ? -1 : 1;
+    });
+    dataToSign = dataToSign
+      .map(function (kv) {
+        return kv.key + "=" + kv.value;
+      })
+      .join("&");
+    dataToSign = crypto.createHmac("sha256", "6Nz4n0xA8s8qdxQf2GqurZj2Fs55FUvM").update(dataToSign).digest("base64");
+    return new Promise((resolve, reject) => {
+      axios
+        .get("https://api.coolkit.cc:8080/api/user/region", {
+          headers: {
+            Authorization: "Sign " + dataToSign,
+            "Content-Type": "application/json",
+          },
+          params: data,
+        })
+        .then(res => {
+          let body = res.data;
+          if (!body.region) {
+            throw "Server did not respond with a region.\n" + JSON.stringify(body, null, 2);
+          }
+          switch (body.region) {
+            case "eu":
+            case "us":
+            case "as":
+              this.httpHost = body.region + "-apia.coolkit.cc";
+              break;
+            case "cn":
+              this.httpHost = "cn-apia.coolkit.cn";
+              break;
+            default:
+              throw "No valid region received - [" + body.region + "].";
+          }
+          if (this.debug) {
+            this.log("HTTP API host received [%s].", this.httpHost);
+          }
+          resolve(this.httpHost);
+        })
+        .catch(err => {
+          reject(err);
+        });
+    });
+  }
+  getDevices() {
+    return new Promise((resolve, reject) => {
+      axios
+        .get("https://" + this.httpHost + "/v2/device/thing", {
+          headers: {
+            Authorization: "Bearer " + this.aToken,
+            "Content-Type": "application/json",
+            Host: this.httpHost,
+            "X-CK-Appid": constants.appId,
+            "X-CK-Nonce": Math.random().toString(36).substr(2, 8),
+          },
+        })
+        .then(res => {
+          let body = res.data;
+          if (!body.hasOwnProperty("error") || (body.hasOwnProperty("error") && body.error !== 0)) {
+            throw JSON.stringify(body, null, 2);
+          }
+          let deviceList = [];
+          if (body.data.thingList && body.data.thingList.length > 0) {
+            body.data.thingList.forEach(device => deviceList.push(device.itemData));
+          }
+          resolve(deviceList);
+        })
+        .catch(err => {
+          reject(err);
+        });
+    });
+  }
+};
diff --git a/lib/eWeLinkLAN.js b/lib/eWeLinkLAN.js
index f6ff9188..2bbbf005 100644
--- a/lib/eWeLinkLAN.js
+++ b/lib/eWeLinkLAN.js
@@ -1,181 +1,196 @@
 /* jshint esversion: 9, -W030, node: true */
 "use strict";
 const axios = require("axios"),
-   constants = require("./constants"),
-   crypto = require("crypto"),
-   dns = require("node-dns-sd"),
-   eventemitter = require("events");
+  constants = require("./constants"),
+  crypto = require("crypto"),
+  dns = require("node-dns-sd"),
+  eventemitter = require("events");
 module.exports = class eWeLinkLAN {
-   constructor(config, log, devices) {
-      this.config = config;
-      this.log = log;
-      this.devices = devices;
-      this.ipOverrides = this.config.ipOverride || {};
-      let deviceMap = new Map();
-      devices.forEach(device => {
-         deviceMap.set(device.deviceid, {
-            apiKey: device.devicekey,
-            online: this.ipOverrides.hasOwnProperty(device.deviceid) ? true : false,
-            ip: this.ipOverrides.hasOwnProperty(device.deviceid) ? this.ipOverrides[device.deviceid] : null
-         });
+  constructor(config, log, devices) {
+    this.config = config;
+    this.log = log;
+    this.devices = devices;
+    this.ipOverrides = this.config.ipOverride || {};
+    let deviceMap = new Map();
+    devices.forEach(device => {
+      deviceMap.set(device.deviceid, {
+        apiKey: device.devicekey,
+        online: this.ipOverrides.hasOwnProperty(device.deviceid) ? true : false,
+        ip: this.ipOverrides.hasOwnProperty(device.deviceid) ? this.ipOverrides[device.deviceid] : null,
       });
-      this.deviceMap = deviceMap;
-      this.debug = this.config.debug || false;
-      this.debugReqRes = this.config.debugReqRes || false;
-      this.emitter = new eventemitter();
-   }
-   getHosts() {
-      return new Promise((resolve, reject) => {
-         dns.discover({
-            name: "_ewelink._tcp.local"
-         }).then(res => {
-            let onlineCount = 0;
-            res.forEach(device => {
-               let d, deviceId = device.fqdn.replace("._ewelink._tcp.local", "").replace("eWeLink_", "");
-               if ((d = this.deviceMap.get(deviceId))) {
-                  if (!this.ipOverrides.hasOwnProperty(deviceId)) {
-                     this.deviceMap.set(deviceId, {
-                        apiKey: d.apiKey,
-                        online: true,
-                        ip: device.address
-                     });
-                  }
-                  onlineCount++;
-               }
-            });
-            resolve({
-               map: this.deviceMap,
-               count: onlineCount
-            });
-         }).catch(err => {
-            reject(err);
-         });
-      });
-   }
-   startMonitor() {
-      dns.ondata = packet => {
-         if (packet.answers) {
-            packet.answers
-               .filter(value => value.name.includes("_ewelink._tcp.local"))
-               .filter(value => value.type === "TXT")
-               .filter(value => this.deviceMap.has(value.rdata.id))
-               .forEach(value => {
-                  let rdata = value.rdata,
-                     deviceInfo = this.deviceMap.get(rdata.id),
-                     data = rdata.data1 +
-                     (rdata.hasOwnProperty("data2") ? rdata.data2 : "") +
-                     (rdata.hasOwnProperty("data3") ? rdata.data3 : "") +
-                     (rdata.hasOwnProperty("data4") ? rdata.data4 : ""),
-                     key = crypto.createHash("md5").update(Buffer.from(deviceInfo.apiKey, "utf8")).digest(),
-                     dText = crypto.createDecipheriv("aes-128-cbc", key, Buffer.from(rdata.iv, "base64")),
-                     pText = Buffer.concat([dText.update(Buffer.from(data, "base64")), dText.final()]).toString("utf8"),
-                     params;
-                  if (packet.address !== deviceInfo.ip && !this.ipOverrides.hasOwnProperty(rdata.id)) {
-                     this.deviceMap.set(rdata.id, {
-                        apiKey: deviceInfo.apiKey,
-                        online: true,
-                        ip: packet.address
-                     });
-                     if (this.debug) {
-                        this.log.warn("[%s] updating IP address to [%s].", rdata.id, packet.address);
-                     }
-                  }
-                  try {
-                     params = JSON.parse(pText);
-                  } catch (e) {
-                     this.log.warn("[%s] An error occured reading the LAN message [%s]", rdata.id, e);
-                     return;
-                  }
-                  for (let param in params) {
-                     if (params.hasOwnProperty(param)) {
-                        if (!constants.paramsToKeep.includes(param.replace(/[0-9]/g, ""))) {
-                           delete params[param];
-                        }
-                     }
-                  }
-                  if (Object.keys(params).length > 0) {
-                     params.updateSource = "LAN";
-                     let returnTemplate = {
-                        deviceid: rdata.id,
-                        action: "update",
-                        params
-                     };
-                     if (this.debugReqRes) {
-                        let msg = JSON.stringify(returnTemplate, null, 2).replace(rdata.id, "**hidden**");
-                        this.log("LAN message received.\n%s", msg);
-                     } else if (this.debug) {
-                        this.log("LAN message received.");
-                     }
-                     this.emitter.emit("update", returnTemplate);
-                  }
-               });
-         }
-      };
-      return new Promise((resolve, reject) => {
-         dns.startMonitoring().then(() => {
-            resolve();
-         }).catch(err => {
-            reject(err);
-         });
-      });
-   }
-   sendUpdate(json) {
-      return new Promise((resolve, reject) => {
-         if (!this.deviceMap.get(json.deviceid).online) {
-            throw "device does not support LAN mode";
-         }
-         let apiKey, suffix, params = {};
-         if (json.params.hasOwnProperty("switches")) {
-            params.switches = json.params.switches;
-            suffix = "switches";
-         } else if (json.params.hasOwnProperty("switch")) {
-            params.switch = json.params.switch;
-            suffix = "switch";
-         } else {
-            throw "plugin does not support lan mode for this device yet - feel free to create a github issue";
-         }
-         if ((apiKey = this.deviceMap.get(json.deviceid).apiKey)) {
-            let key = crypto.createHash('md5').update(Buffer.from(apiKey, 'utf8')).digest(),
-               iv = crypto.randomBytes(16),
-               enc = crypto.createCipheriv('aes-128-cbc', key, iv),
-               data = {
-                  data: Buffer.concat([enc.update(JSON.stringify(params)), enc.final()]).toString('base64'),
-                  deviceid: json.deviceid,
-                  encrypt: true,
-                  iv: iv.toString('base64'),
-                  selfApikey: "123",
-                  sequence: Date.now().toString()
-               };
-            if (this.debugReqRes) {
-               let msg = JSON.stringify(json, null, 2).replace(json.apikey, "**hidden**").replace(json.apikey, "**hidden**").replace(json.deviceid, "**hidden**");
-               this.log.warn("LAN message sent. This text is yellow for clarity.\n%s", msg);
-            } else if (this.debug) {
-               this.log("LAN message sent.");
+    });
+    this.deviceMap = deviceMap;
+    this.debug = this.config.debug || false;
+    this.debugReqRes = this.config.debugReqRes || false;
+    this.emitter = new eventemitter();
+  }
+  getHosts() {
+    return new Promise((resolve, reject) => {
+      dns
+        .discover({
+          name: "_ewelink._tcp.local",
+        })
+        .then(res => {
+          let onlineCount = 0;
+          res.forEach(device => {
+            let d,
+              deviceId = device.fqdn.replace("._ewelink._tcp.local", "").replace("eWeLink_", "");
+            if ((d = this.deviceMap.get(deviceId))) {
+              if (!this.ipOverrides.hasOwnProperty(deviceId)) {
+                this.deviceMap.set(deviceId, {
+                  apiKey: d.apiKey,
+                  online: true,
+                  ip: device.address,
+                });
+              }
+              onlineCount++;
             }
-            axios({
-               method: "post",
-               url: "http://" + this.deviceMap.get(json.deviceid).ip + ":8081/zeroconf/" + suffix,
-               headers: {
-                  Accept: "application/json",
-                  "Content-Type": "application/json"
-               },
-               data
-            }).then(res => {
-               if (res.data.hasOwnProperty("error") && res.data.error === 0) {
-                  resolve();
-               }
-               throw res.data;
-            }).catch(err => {
-               reject(err);
-            });
-         }
-      });
-   }
-   receiveUpdate(f) {
-      this.emitter.addListener("update", f);
-   }
-   closeConnection() {
-      dns.stopMonitoring();
-      this.log("LAN monitoring gracefully stopped.");
-   }
-};
\ No newline at end of file
+          });
+          resolve({
+            map: this.deviceMap,
+            count: onlineCount,
+          });
+        })
+        .catch(err => {
+          reject(err);
+        });
+    });
+  }
+  startMonitor() {
+    dns.ondata = packet => {
+      if (packet.answers) {
+        packet.answers
+          .filter(value => value.name.includes("_ewelink._tcp.local"))
+          .filter(value => value.type === "TXT")
+          .filter(value => this.deviceMap.has(value.rdata.id))
+          .forEach(value => {
+            let rdata = value.rdata,
+              deviceInfo = this.deviceMap.get(rdata.id),
+              data =
+                rdata.data1 +
+                (rdata.hasOwnProperty("data2") ? rdata.data2 : "") +
+                (rdata.hasOwnProperty("data3") ? rdata.data3 : "") +
+                (rdata.hasOwnProperty("data4") ? rdata.data4 : ""),
+              key = crypto.createHash("md5").update(Buffer.from(deviceInfo.apiKey, "utf8")).digest(),
+              dText = crypto.createDecipheriv("aes-128-cbc", key, Buffer.from(rdata.iv, "base64")),
+              pText = Buffer.concat([dText.update(Buffer.from(data, "base64")), dText.final()]).toString("utf8"),
+              params;
+            if (packet.address !== deviceInfo.ip && !this.ipOverrides.hasOwnProperty(rdata.id)) {
+              this.deviceMap.set(rdata.id, {
+                apiKey: deviceInfo.apiKey,
+                online: true,
+                ip: packet.address,
+              });
+              if (this.debug) {
+                this.log.warn("[%s] updating IP address to [%s].", rdata.id, packet.address);
+              }
+            }
+            try {
+              params = JSON.parse(pText);
+            } catch (e) {
+              this.log.warn("[%s] An error occured reading the LAN message [%s]", rdata.id, e);
+              return;
+            }
+            for (let param in params) {
+              if (params.hasOwnProperty(param)) {
+                if (!constants.paramsToKeep.includes(param.replace(/[0-9]/g, ""))) {
+                  delete params[param];
+                }
+              }
+            }
+            if (Object.keys(params).length > 0) {
+              params.updateSource = "LAN";
+              let returnTemplate = {
+                deviceid: rdata.id,
+                action: "update",
+                params,
+              };
+              if (this.debugReqRes) {
+                let msg = JSON.stringify(returnTemplate, null, 2).replace(rdata.id, "**hidden**");
+                this.log("LAN message received.\n%s", msg);
+              } else if (this.debug) {
+                this.log("LAN message received.");
+              }
+              this.emitter.emit("update", returnTemplate);
+            }
+          });
+      }
+    };
+    return new Promise((resolve, reject) => {
+      dns
+        .startMonitoring()
+        .then(() => {
+          resolve();
+        })
+        .catch(err => {
+          reject(err);
+        });
+    });
+  }
+  sendUpdate(json) {
+    return new Promise((resolve, reject) => {
+      if (!this.deviceMap.get(json.deviceid).online) {
+        throw "device does not support LAN mode";
+      }
+      let apiKey,
+        suffix,
+        params = {};
+      if (json.params.hasOwnProperty("switches")) {
+        params.switches = json.params.switches;
+        suffix = "switches";
+      } else if (json.params.hasOwnProperty("switch")) {
+        params.switch = json.params.switch;
+        suffix = "switch";
+      } else {
+        throw "plugin does not support lan mode for this device yet - feel free to create a github issue";
+      }
+      if ((apiKey = this.deviceMap.get(json.deviceid).apiKey)) {
+        let key = crypto.createHash("md5").update(Buffer.from(apiKey, "utf8")).digest(),
+          iv = crypto.randomBytes(16),
+          enc = crypto.createCipheriv("aes-128-cbc", key, iv),
+          data = {
+            data: Buffer.concat([enc.update(JSON.stringify(params)), enc.final()]).toString("base64"),
+            deviceid: json.deviceid,
+            encrypt: true,
+            iv: iv.toString("base64"),
+            selfApikey: "123",
+            sequence: Date.now().toString(),
+          };
+        if (this.debugReqRes) {
+          let msg = JSON.stringify(json, null, 2)
+            .replace(json.apikey, "**hidden**")
+            .replace(json.apikey, "**hidden**")
+            .replace(json.deviceid, "**hidden**");
+          this.log.warn("LAN message sent. This text is yellow for clarity.\n%s", msg);
+        } else if (this.debug) {
+          this.log("LAN message sent.");
+        }
+        axios({
+          method: "post",
+          url: "http://" + this.deviceMap.get(json.deviceid).ip + ":8081/zeroconf/" + suffix,
+          headers: {
+            Accept: "application/json",
+            "Content-Type": "application/json",
+          },
+          data,
+        })
+          .then(res => {
+            if (res.data.hasOwnProperty("error") && res.data.error === 0) {
+              resolve();
+            }
+            throw res.data;
+          })
+          .catch(err => {
+            reject(err);
+          });
+      }
+    });
+  }
+  receiveUpdate(f) {
+    this.emitter.addListener("update", f);
+  }
+  closeConnection() {
+    dns.stopMonitoring();
+    this.log("LAN monitoring gracefully stopped.");
+  }
+};
diff --git a/lib/eWeLinkWS.js b/lib/eWeLinkWS.js
index 9cb70c1c..86f08e3e 100644
--- a/lib/eWeLinkWS.js
+++ b/lib/eWeLinkWS.js
@@ -1,282 +1,299 @@
 /* jshint esversion: 9, -W030, node: true */
 "use strict";
 const axios = require("axios"),
-   constants = require("./constants"),
-   eventemitter = require("events"),
-   ws = require("ws");
+  constants = require("./constants"),
+  eventemitter = require("events"),
+  ws = require("ws");
 module.exports = class eWeLinkWS {
-   constructor(config, log, res) {
-      this.config = config;
-      this.log = log;
-      this.debug = this.config.debug || false;
-      this.debugReqRes = this.config.debugReqRes || false;
-      this.httpHost = res.httpHost;
-      this.aToken = res.aToken;
-      this.apiKey = res.apiKey;
-      this.wsIsOpen = false;
-      this.emitter = new eventemitter();
-      this.delaySend = 0;
-   }
-   getHost() {
-      return new Promise((resolve, reject) => {
-         axios({
-            method: "post",
-            url: "https://" + this.httpHost.replace("-api", "-disp") + "/dispatch/app",
-            headers: {
-               Authorization: "Bearer " + this.aToken,
-               "Content-Type": "application/json"
-            },
-            data: {
-               appid: constants.appId,
-               nonce: Math.random().toString(36).substr(2, 8),
-               ts: Math.floor(new Date().getTime() / 1000),
-               version: 8
-            }
-         }).then(res => {
-            let body = res.data;
-            if (!body.domain) {
-               throw "Server did not respond with a web socket host.";
-            }
-            if (this.debug) {
-               this.log("Web socket host received [%s].", body.domain);
-            }
-            this.wsHost = body.domain;
-            resolve(body.domain);
-         }).catch(err => {
-            reject(err);
-         });
-      });
-   }
-   login() {
-      this.ws = new ws("wss://" + this.wsHost + ":8080/api/ws");
-      this.ws.on("open", () => {
-         this.wsIsOpen = true;
-         let payload = {
-            action: "userOnline",
-            apikey: this.apiKey,
-            appid: constants.appId,
-            at: this.aToken,
-            nonce: Math.random().toString(36).substr(2, 8),
-            sequence: Math.floor(new Date()),
-            ts: Math.floor(new Date() / 1000),
-            userAgent: "app",
-            version: 8
-         };
-         this.ws.send(JSON.stringify(payload));
-         if (this.debugReqRes) {
-            let msg = JSON.stringify(payload, null, 2).replace(this.aToken, "**hidden**").replace(this.apiKey, "**hidden**");
-            this.log.warn("Sending WS login request. This text is yellow for clarity.\n%s", msg);
-         } else if (this.debug) {
-            this.log("Sending WS login request.");
-         }
-      });
-      this.ws.on("message", m => {
-         if (m === "pong") {
-            return;
-         }
-         let device;
-         try {
-            device = JSON.parse(m);
-         } catch (e) {
-            this.log.warn("An error occured reading the web socket message [%s]", e);
-            return;
-         }
-         // for requestUpdate response
-         if (device.hasOwnProperty("deviceid") && device.hasOwnProperty("params") && device.hasOwnProperty("error") && device.error === 0) {
-            device.action = "update";
-         } else if (device.hasOwnProperty("deviceid") && device.hasOwnProperty("error") && device.error === 504) {
-            device.action = "sysmsg";
-            device.params = {
-               online: false
+  constructor(config, log, res) {
+    this.config = config;
+    this.log = log;
+    this.debug = this.config.debug || false;
+    this.debugReqRes = this.config.debugReqRes || false;
+    this.httpHost = res.httpHost;
+    this.aToken = res.aToken;
+    this.apiKey = res.apiKey;
+    this.wsIsOpen = false;
+    this.emitter = new eventemitter();
+    this.delaySend = 0;
+  }
+  getHost() {
+    return new Promise((resolve, reject) => {
+      axios({
+        method: "post",
+        url: "https://" + this.httpHost.replace("-api", "-disp") + "/dispatch/app",
+        headers: {
+          Authorization: "Bearer " + this.aToken,
+          "Content-Type": "application/json",
+        },
+        data: {
+          appid: constants.appId,
+          nonce: Math.random().toString(36).substr(2, 8),
+          ts: Math.floor(new Date().getTime() / 1000),
+          version: 8,
+        },
+      })
+        .then(res => {
+          let body = res.data;
+          if (!body.domain) {
+            throw "Server did not respond with a web socket host.";
+          }
+          if (this.debug) {
+            this.log("Web socket host received [%s].", body.domain);
+          }
+          this.wsHost = body.domain;
+          resolve(body.domain);
+        })
+        .catch(err => {
+          reject(err);
+        });
+    });
+  }
+  login() {
+    this.ws = new ws("wss://" + this.wsHost + ":8080/api/ws");
+    this.ws.on("open", () => {
+      this.wsIsOpen = true;
+      let payload = {
+        action: "userOnline",
+        apikey: this.apiKey,
+        appid: constants.appId,
+        at: this.aToken,
+        nonce: Math.random().toString(36).substr(2, 8),
+        sequence: Math.floor(new Date()),
+        ts: Math.floor(new Date() / 1000),
+        userAgent: "app",
+        version: 8,
+      };
+      this.ws.send(JSON.stringify(payload));
+      if (this.debugReqRes) {
+        let msg = JSON.stringify(payload, null, 2)
+          .replace(this.aToken, "**hidden**")
+          .replace(this.apiKey, "**hidden**");
+        this.log.warn("Sending WS login request. This text is yellow for clarity.\n%s", msg);
+      } else if (this.debug) {
+        this.log("Sending WS login request.");
+      }
+    });
+    this.ws.on("message", m => {
+      if (m === "pong") {
+        return;
+      }
+      let device;
+      try {
+        device = JSON.parse(m);
+      } catch (e) {
+        this.log.warn("An error occured reading the web socket message [%s]", e);
+        return;
+      }
+      // for requestUpdate response
+      if (
+        device.hasOwnProperty("deviceid") &&
+        device.hasOwnProperty("params") &&
+        device.hasOwnProperty("error") &&
+        device.error === 0
+      ) {
+        device.action = "update";
+      } else if (device.hasOwnProperty("deviceid") && device.hasOwnProperty("error") && device.error === 504) {
+        device.action = "sysmsg";
+        device.params = {
+          online: false,
+        };
+      }
+      // for external updates
+      if (device.hasOwnProperty("config") && device.config.hb && device.config.hbInterval && !this.hbInterval) {
+        this.hbInterval = setInterval(() => {
+          this.ws.send("ping");
+        }, (device.config.hbInterval + 7) * 1000);
+      } else if (device.hasOwnProperty("action")) {
+        switch (device.action) {
+          case "sysmsg":
+            device.params.updateSource = "WS";
+            let returnTemplate = {
+              deviceid: device.deviceid,
+              action: "sysmsg",
+              params: device.params,
             };
-         }
-         // for external updates
-         if (device.hasOwnProperty("config") && device.config.hb && device.config.hbInterval && !this.hbInterval) {
-            this.hbInterval = setInterval(() => {
-               this.ws.send("ping");
-            }, (device.config.hbInterval + 7) * 1000);
-         } else if (device.hasOwnProperty("action")) {
-            switch (device.action) {
-               case "sysmsg":
-                  device.params.updateSource = "WS";
-                  let returnTemplate = {
-                     deviceid: device.deviceid,
-                     action: "sysmsg",
-                     params: device.params
-                  };
-                  if (this.debugReqRes) {
-                     let msg = JSON.stringify(returnTemplate, null, 2).replace(device.deviceid, "**hidden**");
-                     this.log("WS message received.\n%s", msg);
-                  } else if (this.debug) {
-                     this.log("WS message received.");
-                  }
-                  this.emitter.emit("update", returnTemplate);
-                  break;
-               case "update":
-                  for (let param in device.params) {
-                     if (device.params.hasOwnProperty(param)) {
-                        if (!constants.paramsToKeep.includes(param.replace(/[0-9]/g, ""))) {
-                           delete device.params[param];
-                        }
-                     }
-                  }
-                  if (Object.keys(device.params).length > 0) {
-                     device.params.updateSource = "WS";
-                     let returnTemplate = {
-                        deviceid: device.deviceid,
-                        action: "update",
-                        params: device.params
-                     };
-                     if (this.debugReqRes) {
-                        let msg = JSON.stringify(returnTemplate, null, 2).replace(device.deviceid, "**hidden**");
-                        this.log("WS message received.\n%s", msg);
-                     } else if (this.debug) {
-                        this.log("WS message received.");
-                     }
-                     this.emitter.emit("update", returnTemplate);
-                  }
-                  break;
-               default:
-                  this.log.warn("[%s] WS message has unknown action.\n" + JSON.stringify(device, null, 2), device.deviceid);
-                  return;
+            if (this.debugReqRes) {
+              let msg = JSON.stringify(returnTemplate, null, 2).replace(device.deviceid, "**hidden**");
+              this.log("WS message received.\n%s", msg);
+            } else if (this.debug) {
+              this.log("WS message received.");
             }
-         } else if (device.hasOwnProperty("error") && device.error === 0) {
-            // *** Safe to ignore these messages *** \\
-         } else {
-            if (this.debug) {
-               this.log.warn("WS unknown command received.\n" + JSON.stringify(device, null, 2));
+            this.emitter.emit("update", returnTemplate);
+            break;
+          case "update":
+            for (let param in device.params) {
+              if (device.params.hasOwnProperty(param)) {
+                if (!constants.paramsToKeep.includes(param.replace(/[0-9]/g, ""))) {
+                  delete device.params[param];
+                }
+              }
             }
-         }
-      });
-      this.ws.on("close", (e, m) => {
-         if (m === "Stopping Homebridge") {
-            this.log("Web socket gracefully closed.");
-         } else {
-            this.log.warn("Web socket closed - [%s - %s].", e, m);
-            if (e !== 1000) {
-               this.log("Web socket will try to reconnect in five seconds.");
-               setTimeout(() => {
-                  this.login();
-               }, 5000);
-            } else {
-               this.log("Please try restarting Homebridge so that this plugin can work again.");
+            if (Object.keys(device.params).length > 0) {
+              device.params.updateSource = "WS";
+              let returnTemplate = {
+                deviceid: device.deviceid,
+                action: "update",
+                params: device.params,
+              };
+              if (this.debugReqRes) {
+                let msg = JSON.stringify(returnTemplate, null, 2).replace(device.deviceid, "**hidden**");
+                this.log("WS message received.\n%s", msg);
+              } else if (this.debug) {
+                this.log("WS message received.");
+              }
+              this.emitter.emit("update", returnTemplate);
             }
-         }
-         this.wsIsOpen = false;
-         if (this.hbInterval) {
-            clearInterval(this.hbInterval);
-            this.hbInterval = null;
-         }
-         this.ws.removeAllListeners();
-      });
-      this.ws.on("error", (e) => {
-         this.log.error("Web socket error - [%s].", e);
-         if (e.code === "ECONNREFUSED") {
-            this.log.warn("Web socket will try to reconnect in five seconds then try the command again.");
-            this.ws.removeAllListeners();
-            setTimeout(() => {
-               this.login();
-            }, 5000);
-         } else {
-            this.log.warn("If this was unexpected then please try restarting Homebridge.");
-         }
-      });
-   }
-   sendUpdate(json) {
-      json = {
-         ...json,
-         ...{
-            action: "update",
-            sequence: Math.floor(new Date()),
-            userAgent: "app"
-         }
-      };
-      let sendOperation = req => {
-         if (!this.wsIsOpen) {
-            setTimeout(() => {
-               sendOperation(req);
-            }, 280);
+            break;
+          case "reportSubDevice":
             return;
-         }
-         if (this.ws) {
-            this.ws.send(req);
-            if (this.debugReqRes) {
-               let msg = JSON.stringify(json, null, 2).replace(json.apikey, "**hidden**").replace(json.apiKey, "**hidden**").replace(json.deviceid, "**hidden**");
-               this.log.warn("WS message sent. This text is yellow for clarity.\n%s", msg);
-            } else if (this.debug) {
-               this.log("WS message sent.");
-            }
+          default:
+            this.log.warn("[%s] WS message has unknown action.\n" + JSON.stringify(device, null, 2), device.deviceid);
             return;
-         }
-         this.delaySend = this.delaySend <= 0 ? 0 : this.delaySend -= 280;
-      };
-      let string = JSON.stringify(json);
-      if (this.wsIsOpen) {
-         setTimeout(sendOperation, this.delaySend, string);
-         this.delaySend += 280;
+        }
+      } else if (device.hasOwnProperty("error") && device.error === 0) {
+        // *** Safe to ignore these messages *** \\
       } else {
-         this.log.warn("Web socket is currently reconnecting. Command will be resent.");
-         let interval,
-            waitToSend = req => {
-               if (this.wsIsOpen) {
-                  clearInterval(interval);
-                  sendOperation(req);
-               }
-            };
-         interval = setInterval(waitToSend, 2500, string);
+        if (this.debug) {
+          this.log.warn("WS unknown command received.\n" + JSON.stringify(device, null, 2));
+        }
       }
-   }
-   requestUpdate(accessory) {
-      let json = {
-            action: "query",
-            apikey: accessory.context.eweApiKey,
-            deviceid: accessory.context.eweDeviceId,
-            params: [],
-            sequence: Math.floor(new Date()),
-            ts: 0,
-            userAgent: "app"
-         },
-         sendOperation = req => {
-            if (!this.wsIsOpen) {
-               setTimeout(() => {
-                  sendOperation(req);
-               }, 280);
-               return;
-            }
-            if (this.ws) {
-               this.ws.send(req);
-               if (this.debugReqRes) {
-                  let msg = JSON.stringify(json, null, 2).replace(json.apikey, "**hidden**").replace(json.apiKey, "**hidden**").replace(json.deviceid, "**hidden**");
-                  this.log.warn("WS message sent. This text is yellow for clarity.\n%s", msg);
-               } else if (this.debug) {
-                  this.log("WS message sent.");
-               }
-               return;
-            }
-            this.delaySend = this.delaySend <= 0 ? 0 : this.delaySend -= 280;
-         },
-         string = JSON.stringify(json);
-      if (this.wsIsOpen) {
-         setTimeout(sendOperation, this.delaySend, string);
-         this.delaySend += 280;
+    });
+    this.ws.on("close", (e, m) => {
+      if (m === "Stopping Homebridge") {
+        this.log("Web socket gracefully closed.");
       } else {
-         this.log.warn("Web socket is currently reconnecting. Command will be resent.");
-         let interval,
-            waitToSend = req => {
-               if (this.wsIsOpen) {
-                  clearInterval(interval);
-                  sendOperation(req);
-               }
-            };
-         interval = setInterval(waitToSend, 2500, string);
+        this.log.warn("Web socket closed - [%s - %s].", e, m);
+        if (e !== 1000) {
+          this.log("Web socket will try to reconnect in five seconds.");
+          setTimeout(() => {
+            this.login();
+          }, 5000);
+        } else {
+          this.log("Please try restarting Homebridge so that this plugin can work again.");
+        }
+      }
+      this.wsIsOpen = false;
+      if (this.hbInterval) {
+        clearInterval(this.hbInterval);
+        this.hbInterval = null;
+      }
+      this.ws.removeAllListeners();
+    });
+    this.ws.on("error", e => {
+      this.log.error("Web socket error - [%s].", e);
+      if (e.code === "ECONNREFUSED") {
+        this.log.warn("Web socket will try to reconnect in five seconds then try the command again.");
+        this.ws.removeAllListeners();
+        setTimeout(() => {
+          this.login();
+        }, 5000);
+      } else {
+        this.log.warn("If this was unexpected then please try restarting Homebridge.");
+      }
+    });
+  }
+  sendUpdate(json) {
+    json = {
+      ...json,
+      ...{
+        action: "update",
+        sequence: Math.floor(new Date()),
+        userAgent: "app",
+      },
+    };
+    let sendOperation = req => {
+      if (!this.wsIsOpen) {
+        setTimeout(() => {
+          sendOperation(req);
+        }, 280);
+        return;
       }
-   }
-   receiveUpdate(f) {
-      this.emitter.addListener("update", f);
-   }
-   closeConnection() {
-      if (this.ws && this.wsIsOpen) {
-         this.ws.close(1000, "Stopping Homebridge");
+      if (this.ws) {
+        this.ws.send(req);
+        if (this.debugReqRes) {
+          let msg = JSON.stringify(json, null, 2)
+            .replace(json.apikey, "**hidden**")
+            .replace(json.apiKey, "**hidden**")
+            .replace(json.deviceid, "**hidden**");
+          this.log.warn("WS message sent. This text is yellow for clarity.\n%s", msg);
+        } else if (this.debug) {
+          this.log("WS message sent.");
+        }
+        return;
       }
-   }
-};
\ No newline at end of file
+      this.delaySend = this.delaySend <= 0 ? 0 : (this.delaySend -= 280);
+    };
+    let string = JSON.stringify(json);
+    if (this.wsIsOpen) {
+      setTimeout(sendOperation, this.delaySend, string);
+      this.delaySend += 280;
+    } else {
+      this.log.warn("Web socket is currently reconnecting. Command will be resent.");
+      let interval,
+        waitToSend = req => {
+          if (this.wsIsOpen) {
+            clearInterval(interval);
+            sendOperation(req);
+          }
+        };
+      interval = setInterval(waitToSend, 2500, string);
+    }
+  }
+  requestUpdate(accessory) {
+    let json = {
+        action: "query",
+        apikey: accessory.context.eweApiKey,
+        deviceid: accessory.context.eweDeviceId,
+        params: [],
+        sequence: Math.floor(new Date()),
+        ts: 0,
+        userAgent: "app",
+      },
+      sendOperation = req => {
+        if (!this.wsIsOpen) {
+          setTimeout(() => {
+            sendOperation(req);
+          }, 280);
+          return;
+        }
+        if (this.ws) {
+          this.ws.send(req);
+          if (this.debugReqRes) {
+            let msg = JSON.stringify(json, null, 2)
+              .replace(json.apikey, "**hidden**")
+              .replace(json.apiKey, "**hidden**")
+              .replace(json.deviceid, "**hidden**");
+            this.log.warn("WS message sent. This text is yellow for clarity.\n%s", msg);
+          } else if (this.debug) {
+            this.log("WS message sent.");
+          }
+          return;
+        }
+        this.delaySend = this.delaySend <= 0 ? 0 : (this.delaySend -= 280);
+      },
+      string = JSON.stringify(json);
+    if (this.wsIsOpen) {
+      setTimeout(sendOperation, this.delaySend, string);
+      this.delaySend += 280;
+    } else {
+      this.log.warn("Web socket is currently reconnecting. Command will be resent.");
+      let interval,
+        waitToSend = req => {
+          if (this.wsIsOpen) {
+            clearInterval(interval);
+            sendOperation(req);
+          }
+        };
+      interval = setInterval(waitToSend, 2500, string);
+    }
+  }
+  receiveUpdate(f) {
+    this.emitter.addListener("update", f);
+  }
+  closeConnection() {
+    if (this.ws && this.wsIsOpen) {
+      this.ws.close(1000, "Stopping Homebridge");
+    }
+  }
+};
diff --git a/package-lock.json b/package-lock.json
index 89e609db..61a31ae5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,624 +1,630 @@
 {
-   "name": "homebridge-ewelink",
-   "version": "2.26.2",
-   "lockfileVersion": 1,
-   "requires": true,
-   "dependencies": {
-      "@types/color-name": {
-         "version": "1.1.1",
-         "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz",
-         "integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ=="
-      },
-      "abort-controller": {
-         "version": "3.0.0",
-         "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz",
-         "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==",
-         "requires": {
-            "event-target-shim": "^5.0.0"
-         }
-      },
-      "agent-base": {
-         "version": "6.0.1",
-         "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.1.tgz",
-         "integrity": "sha512-01q25QQDwLSsyfhrKbn8yuur+JNw0H+0Y4JiGIKd3z9aYk/w/2kxD/Upc+t2ZBBSUNff50VjPsSW2YxM8QYKVg==",
-         "requires": {
-            "debug": "4"
-         },
-         "dependencies": {
-            "debug": {
-               "version": "4.1.1",
-               "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-               "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-               "requires": {
-                  "ms": "^2.1.1"
-               }
-            },
-            "ms": {
-               "version": "2.1.2",
-               "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-               "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-            }
-         }
-      },
-      "ansi-styles": {
-         "version": "4.2.1",
-         "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-         "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
-         "requires": {
-            "@types/color-name": "^1.1.1",
-            "color-convert": "^2.0.1"
-         }
-      },
-      "array-flatten": {
-         "version": "2.1.2",
-         "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz",
-         "integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ=="
-      },
-      "arrify": {
-         "version": "2.0.1",
-         "resolved": "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz",
-         "integrity": "sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug=="
-      },
-      "axios": {
-         "version": "0.20.0",
-         "resolved": "https://registry.npmjs.org/axios/-/axios-0.20.0.tgz",
-         "integrity": "sha512-ANA4rr2BDcmmAQLOKft2fufrtuvlqR+cXNNinUmvfeSNCOF98PZL+7M/v1zIdGo7OLjEA9J2gXJL+j4zGsl0bA==",
-         "requires": {
-            "follow-redirects": "^1.10.0"
-         }
-      },
-      "base64-js": {
-         "version": "1.3.1",
-         "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz",
-         "integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g=="
-      },
-      "bignumber.js": {
-         "version": "9.0.0",
-         "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.0.0.tgz",
-         "integrity": "sha512-t/OYhhJ2SD+YGBQcjY8GzzDHEk9f3nerxjtfa6tlMXfe7frs/WozhvCNoGvpM0P3bNf3Gq5ZRMlGr5f3r4/N8A=="
-      },
-      "bonjour": {
-         "version": "3.5.0",
-         "resolved": "https://registry.npmjs.org/bonjour/-/bonjour-3.5.0.tgz",
-         "integrity": "sha1-jokKGD2O6aI5OzhExpGkK897yfU=",
-         "requires": {
-            "array-flatten": "^2.1.0",
-            "deep-equal": "^1.0.1",
-            "dns-equal": "^1.0.0",
-            "dns-txt": "^2.0.2",
-            "multicast-dns": "^6.0.1",
-            "multicast-dns-service-types": "^1.1.0"
-         }
-      },
-      "buffer-equal-constant-time": {
-         "version": "1.0.1",
-         "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz",
-         "integrity": "sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk="
-      },
-      "buffer-indexof": {
-         "version": "1.1.1",
-         "resolved": "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.1.tgz",
-         "integrity": "sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g=="
-      },
-      "chalk": {
-         "version": "4.1.0",
-         "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-         "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-         "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-         }
-      },
-      "color-convert": {
-         "version": "2.0.1",
-         "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-         "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-         "requires": {
-            "color-name": "~1.1.4"
-         }
-      },
-      "color-name": {
-         "version": "1.1.4",
-         "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-         "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-      },
-      "correcting-interval": {
-         "version": "2.0.0",
-         "resolved": "https://registry.npmjs.org/correcting-interval/-/correcting-interval-2.0.0.tgz",
-         "integrity": "sha1-iTdklFcN+C7axTQRHV8n/z6gstM="
-      },
-      "debug": {
-         "version": "2.6.9",
-         "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-         "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-         "requires": {
-            "ms": "2.0.0"
-         }
-      },
-      "deep-equal": {
-         "version": "1.1.1",
-         "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz",
-         "integrity": "sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==",
-         "requires": {
-            "is-arguments": "^1.0.4",
-            "is-date-object": "^1.0.1",
-            "is-regex": "^1.0.4",
-            "object-is": "^1.0.1",
-            "object-keys": "^1.1.1",
-            "regexp.prototype.flags": "^1.2.0"
-         }
-      },
-      "define-properties": {
-         "version": "1.1.3",
-         "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
-         "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
-         "requires": {
-            "object-keys": "^1.0.12"
-         }
-      },
-      "dns-equal": {
-         "version": "1.0.0",
-         "resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz",
-         "integrity": "sha1-s55/HabrCnW6nBcySzR1PEfgZU0="
-      },
-      "dns-packet": {
-         "version": "1.3.1",
-         "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.1.tgz",
-         "integrity": "sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==",
-         "requires": {
-            "ip": "^1.1.0",
-            "safe-buffer": "^5.0.1"
-         }
-      },
-      "dns-txt": {
-         "version": "2.0.2",
-         "resolved": "https://registry.npmjs.org/dns-txt/-/dns-txt-2.0.2.tgz",
-         "integrity": "sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY=",
-         "requires": {
-            "buffer-indexof": "^1.0.0"
-         }
-      },
-      "ecdsa-sig-formatter": {
-         "version": "1.0.11",
-         "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz",
-         "integrity": "sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==",
-         "requires": {
-            "safe-buffer": "^5.0.1"
-         }
-      },
-      "es-abstract": {
-         "version": "1.17.6",
-         "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.6.tgz",
-         "integrity": "sha512-Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw==",
-         "requires": {
-            "es-to-primitive": "^1.2.1",
-            "function-bind": "^1.1.1",
-            "has": "^1.0.3",
-            "has-symbols": "^1.0.1",
-            "is-callable": "^1.2.0",
-            "is-regex": "^1.1.0",
-            "object-inspect": "^1.7.0",
-            "object-keys": "^1.1.1",
-            "object.assign": "^4.1.0",
-            "string.prototype.trimend": "^1.0.1",
-            "string.prototype.trimstart": "^1.0.1"
-         }
-      },
-      "es-to-primitive": {
-         "version": "1.2.1",
-         "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
-         "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
-         "requires": {
-            "is-callable": "^1.1.4",
-            "is-date-object": "^1.0.1",
-            "is-symbol": "^1.0.2"
-         }
-      },
-      "event-target-shim": {
-         "version": "5.0.1",
-         "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz",
-         "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ=="
-      },
-      "extend": {
-         "version": "3.0.2",
-         "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
-         "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
-      },
-      "fakegato-history": {
-         "version": "0.5.6",
-         "resolved": "https://registry.npmjs.org/fakegato-history/-/fakegato-history-0.5.6.tgz",
-         "integrity": "sha512-LlsOkiw9LntVlRlBkssD5ozhEkQzYuEJUlvXk5YAgBQcWzk19PQ5g+NoKfs6SRY1qAeC1onb65hes4mCvY+JmA==",
-         "requires": {
-            "debug": "^2.2.0",
-            "googleapis": ">39.1.0",
-            "moment": "*"
-         }
-      },
-      "fast-text-encoding": {
-         "version": "1.0.3",
-         "resolved": "https://registry.npmjs.org/fast-text-encoding/-/fast-text-encoding-1.0.3.tgz",
-         "integrity": "sha512-dtm4QZH9nZtcDt8qJiOH9fcQd1NAgi+K1O2DbE6GG1PPCK/BWfOH3idCTRQ4ImXRUOyopDEgDEnVEE7Y/2Wrig=="
-      },
-      "follow-redirects": {
-         "version": "1.13.0",
-         "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.0.tgz",
-         "integrity": "sha512-aq6gF1BEKje4a9i9+5jimNFIpq4Q1WiwBToeRK5NvZBd/TRsmW8BsJfOEGkr76TbOyPVD3OVDN910EcUNtRYEA=="
-      },
-      "function-bind": {
-         "version": "1.1.1",
-         "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-         "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
-      },
-      "gaxios": {
-         "version": "3.1.0",
-         "resolved": "https://registry.npmjs.org/gaxios/-/gaxios-3.1.0.tgz",
-         "integrity": "sha512-DDTn3KXVJJigtz+g0J3vhcfbDbKtAroSTxauWsdnP57sM5KZ3d2c/3D9RKFJ86s43hfw6WULg6TXYw/AYiBlpA==",
-         "requires": {
-            "abort-controller": "^3.0.0",
-            "extend": "^3.0.2",
-            "https-proxy-agent": "^5.0.0",
-            "is-stream": "^2.0.0",
-            "node-fetch": "^2.3.0"
-         }
-      },
-      "gcp-metadata": {
-         "version": "4.1.4",
-         "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-4.1.4.tgz",
-         "integrity": "sha512-5J/GIH0yWt/56R3dNaNWPGQ/zXsZOddYECfJaqxFWgrZ9HC2Kvc5vl9upOgUUHKzURjAVf2N+f6tEJiojqXUuA==",
-         "requires": {
-            "gaxios": "^3.0.0",
-            "json-bigint": "^1.0.0"
-         }
-      },
-      "google-auth-library": {
-         "version": "6.0.6",
-         "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-6.0.6.tgz",
-         "integrity": "sha512-fWYdRdg55HSJoRq9k568jJA1lrhg9i2xgfhVIMJbskUmbDpJGHsbv9l41DGhCDXM21F9Kn4kUwdysgxSYBYJUw==",
-         "requires": {
-            "arrify": "^2.0.0",
-            "base64-js": "^1.3.0",
-            "ecdsa-sig-formatter": "^1.0.11",
-            "fast-text-encoding": "^1.0.0",
-            "gaxios": "^3.0.0",
-            "gcp-metadata": "^4.1.0",
-            "gtoken": "^5.0.0",
-            "jws": "^4.0.0",
-            "lru-cache": "^6.0.0"
-         }
-      },
-      "google-p12-pem": {
-         "version": "3.0.3",
-         "resolved": "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-3.0.3.tgz",
-         "integrity": "sha512-wS0ek4ZtFx/ACKYF3JhyGe5kzH7pgiQ7J5otlumqR9psmWMYc+U9cErKlCYVYHoUaidXHdZ2xbo34kB+S+24hA==",
-         "requires": {
-            "node-forge": "^0.10.0"
-         }
-      },
-      "googleapis": {
-         "version": "59.0.0",
-         "resolved": "https://registry.npmjs.org/googleapis/-/googleapis-59.0.0.tgz",
-         "integrity": "sha512-GV/E4KRN89a4GxSk7D7cwUfRYgcJHR05sOgm/WGdwc/u8dxNXG5lWmz9gF5ZwFGk2yKtVxL4VZNn4zBuZ6rmGg==",
-         "requires": {
-            "google-auth-library": "^6.0.0",
-            "googleapis-common": "^4.4.0"
-         }
-      },
-      "googleapis-common": {
-         "version": "4.4.0",
-         "resolved": "https://registry.npmjs.org/googleapis-common/-/googleapis-common-4.4.0.tgz",
-         "integrity": "sha512-Bgrs8/1OZQFFIfVuX38L9t48rPAkVUXttZy6NzhhXxFOEMSHgfFIjxou7RIXOkBHxmx2pVwct9WjKkbnqMYImQ==",
-         "requires": {
-            "extend": "^3.0.2",
-            "gaxios": "^3.0.0",
-            "google-auth-library": "^6.0.0",
-            "qs": "^6.7.0",
-            "url-template": "^2.0.8",
-            "uuid": "^8.0.0"
-         }
-      },
-      "gtoken": {
-         "version": "5.0.3",
-         "resolved": "https://registry.npmjs.org/gtoken/-/gtoken-5.0.3.tgz",
-         "integrity": "sha512-Nyd1wZCMRc2dj/mAD0LlfQLcAO06uKdpKJXvK85SGrF5+5+Bpfil9u/2aw35ltvEHjvl0h5FMKN5knEU+9JrOg==",
-         "requires": {
-            "gaxios": "^3.0.0",
-            "google-p12-pem": "^3.0.0",
-            "jws": "^4.0.0",
-            "mime": "^2.2.0"
-         }
-      },
-      "has": {
-         "version": "1.0.3",
-         "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-         "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-         "requires": {
-            "function-bind": "^1.1.1"
-         }
-      },
-      "has-flag": {
-         "version": "4.0.0",
-         "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-         "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
-      },
-      "has-symbols": {
-         "version": "1.0.1",
-         "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz",
-         "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg=="
-      },
-      "homebridge-lib": {
-         "version": "4.7.14",
-         "resolved": "https://registry.npmjs.org/homebridge-lib/-/homebridge-lib-4.7.14.tgz",
-         "integrity": "sha512-8eUGTVrCRd7WHwEH49CgqYUu2q9WjeTVDnEA5WXL2ZvPevTMCck5GcVIXtvVWxr9we8Ay0ybFp0N5RRlrIzH/g==",
-         "requires": {
-            "bonjour": "^3.5.0",
-            "chalk": "^4.1.0",
-            "debug": "^4.1.1",
-            "semver": "^7.3.2"
-         },
-         "dependencies": {
-            "debug": {
-               "version": "4.1.1",
-               "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-               "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-               "requires": {
-                  "ms": "^2.1.1"
-               }
-            },
-            "ms": {
-               "version": "2.1.2",
-               "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-               "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-            }
-         }
-      },
-      "https-proxy-agent": {
-         "version": "5.0.0",
-         "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
-         "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
-         "requires": {
-            "agent-base": "6",
-            "debug": "4"
-         },
-         "dependencies": {
-            "debug": {
-               "version": "4.1.1",
-               "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-               "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-               "requires": {
-                  "ms": "^2.1.1"
-               }
-            },
-            "ms": {
-               "version": "2.1.2",
-               "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-               "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-            }
-         }
-      },
-      "ip": {
-         "version": "1.1.5",
-         "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz",
-         "integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo="
-      },
-      "is-arguments": {
-         "version": "1.0.4",
-         "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.0.4.tgz",
-         "integrity": "sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA=="
-      },
-      "is-callable": {
-         "version": "1.2.1",
-         "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.1.tgz",
-         "integrity": "sha512-wliAfSzx6V+6WfMOmus1xy0XvSgf/dlStkvTfq7F0g4bOIW0PSUbnyse3NhDwdyYS1ozfUtAAySqTws3z9Eqgg=="
-      },
-      "is-date-object": {
-         "version": "1.0.2",
-         "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz",
-         "integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g=="
-      },
-      "is-regex": {
-         "version": "1.1.1",
-         "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.1.tgz",
-         "integrity": "sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==",
-         "requires": {
-            "has-symbols": "^1.0.1"
-         }
-      },
-      "is-stream": {
-         "version": "2.0.0",
-         "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz",
-         "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw=="
-      },
-      "is-symbol": {
-         "version": "1.0.3",
-         "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz",
-         "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==",
-         "requires": {
-            "has-symbols": "^1.0.1"
-         }
-      },
-      "json-bigint": {
-         "version": "1.0.0",
-         "resolved": "https://registry.npmjs.org/json-bigint/-/json-bigint-1.0.0.tgz",
-         "integrity": "sha512-SiPv/8VpZuWbvLSMtTDU8hEfrZWg/mH/nV/b4o0CYbSxu1UIQPLdwKOCIyLQX+VIPO5vrLX3i8qtqFyhdPSUSQ==",
-         "requires": {
-            "bignumber.js": "^9.0.0"
-         }
-      },
-      "jwa": {
-         "version": "2.0.0",
-         "resolved": "https://registry.npmjs.org/jwa/-/jwa-2.0.0.tgz",
-         "integrity": "sha512-jrZ2Qx916EA+fq9cEAeCROWPTfCwi1IVHqT2tapuqLEVVDKFDENFw1oL+MwrTvH6msKxsd1YTDVw6uKEcsrLEA==",
-         "requires": {
-            "buffer-equal-constant-time": "1.0.1",
-            "ecdsa-sig-formatter": "1.0.11",
-            "safe-buffer": "^5.0.1"
-         }
-      },
-      "jws": {
-         "version": "4.0.0",
-         "resolved": "https://registry.npmjs.org/jws/-/jws-4.0.0.tgz",
-         "integrity": "sha512-KDncfTmOZoOMTFG4mBlG0qUIOlc03fmzH+ru6RgYVZhPkyiy/92Owlt/8UEN+a4TXR1FQetfIpJE8ApdvdVxTg==",
-         "requires": {
-            "jwa": "^2.0.0",
-            "safe-buffer": "^5.0.1"
-         }
-      },
-      "lru-cache": {
-         "version": "6.0.0",
-         "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-         "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-         "requires": {
-            "yallist": "^4.0.0"
-         }
-      },
-      "mime": {
-         "version": "2.4.6",
-         "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.6.tgz",
-         "integrity": "sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA=="
-      },
-      "moment": {
-         "version": "2.27.0",
-         "resolved": "https://registry.npmjs.org/moment/-/moment-2.27.0.tgz",
-         "integrity": "sha512-al0MUK7cpIcglMv3YF13qSgdAIqxHTO7brRtaz3DlSULbqfazqkc5kEjNrLDOM7fsjshoFIihnU8snrP7zUvhQ=="
-      },
-      "ms": {
-         "version": "2.0.0",
-         "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-         "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-      },
-      "multicast-dns": {
-         "version": "6.2.3",
-         "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.3.tgz",
-         "integrity": "sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g==",
-         "requires": {
-            "dns-packet": "^1.3.1",
-            "thunky": "^1.0.2"
-         }
-      },
-      "multicast-dns-service-types": {
-         "version": "1.1.0",
-         "resolved": "https://registry.npmjs.org/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz",
-         "integrity": "sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE="
-      },
-      "node-dns-sd": {
-         "version": "0.4.1",
-         "resolved": "https://registry.npmjs.org/node-dns-sd/-/node-dns-sd-0.4.1.tgz",
-         "integrity": "sha512-x+WSuMgvDBQv24OCq75YHcZj1SOzvP5fU4Tz+PBUiVvVBsfc+9XAHAuIftaCpf2nPLl+ys71uZoGr/v9fVDa6A=="
-      },
-      "node-fetch": {
-         "version": "2.6.1",
-         "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz",
-         "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw=="
-      },
-      "node-forge": {
-         "version": "0.10.0",
-         "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.10.0.tgz",
-         "integrity": "sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA=="
-      },
-      "object-inspect": {
-         "version": "1.8.0",
-         "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.8.0.tgz",
-         "integrity": "sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA=="
-      },
-      "object-is": {
-         "version": "1.1.2",
-         "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.2.tgz",
-         "integrity": "sha512-5lHCz+0uufF6wZ7CRFWJN3hp8Jqblpgve06U5CMQ3f//6iDjPr2PEo9MWCjEssDsa+UZEL4PkFpr+BMop6aKzQ==",
-         "requires": {
-            "define-properties": "^1.1.3",
-            "es-abstract": "^1.17.5"
-         }
-      },
-      "object-keys": {
-         "version": "1.1.1",
-         "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-         "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="
-      },
-      "object.assign": {
-         "version": "4.1.0",
-         "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz",
-         "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==",
-         "requires": {
-            "define-properties": "^1.1.2",
-            "function-bind": "^1.1.1",
-            "has-symbols": "^1.0.0",
-            "object-keys": "^1.0.11"
-         }
-      },
-      "qs": {
-         "version": "6.9.4",
-         "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.4.tgz",
-         "integrity": "sha512-A1kFqHekCTM7cz0udomYUoYNWjBebHm/5wzU/XqrBRBNWectVH0QIiN+NEcZ0Dte5hvzHwbr8+XQmguPhJ6WdQ=="
-      },
-      "regexp.prototype.flags": {
-         "version": "1.3.0",
-         "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz",
-         "integrity": "sha512-2+Q0C5g951OlYlJz6yu5/M33IcsESLlLfsyIaLJaG4FA2r4yP8MvVMJUUP/fVBkSpbbbZlS5gynbEWLipiiXiQ==",
-         "requires": {
-            "define-properties": "^1.1.3",
-            "es-abstract": "^1.17.0-next.1"
-         }
-      },
-      "safe-buffer": {
-         "version": "5.2.1",
-         "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-         "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
-      },
-      "semver": {
-         "version": "7.3.2",
-         "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz",
-         "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ=="
-      },
-      "string.prototype.trimend": {
-         "version": "1.0.1",
-         "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz",
-         "integrity": "sha512-LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g==",
-         "requires": {
-            "define-properties": "^1.1.3",
-            "es-abstract": "^1.17.5"
-         }
-      },
-      "string.prototype.trimstart": {
-         "version": "1.0.1",
-         "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz",
-         "integrity": "sha512-XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw==",
-         "requires": {
-            "define-properties": "^1.1.3",
-            "es-abstract": "^1.17.5"
-         }
-      },
-      "supports-color": {
-         "version": "7.2.0",
-         "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-         "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-         "requires": {
-            "has-flag": "^4.0.0"
-         }
-      },
-      "thunky": {
-         "version": "1.1.0",
-         "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz",
-         "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA=="
-      },
-      "url-template": {
-         "version": "2.0.8",
-         "resolved": "https://registry.npmjs.org/url-template/-/url-template-2.0.8.tgz",
-         "integrity": "sha1-/FZaPMy/93MMd19WQflVV5FDnyE="
-      },
-      "uuid": {
-         "version": "8.3.0",
-         "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.0.tgz",
-         "integrity": "sha512-fX6Z5o4m6XsXBdli9g7DtWgAx+osMsRRZFKma1mIUsLCz6vRvv+pz5VNbyu9UEDzpMWulZfvpgb/cmDXVulYFQ=="
-      },
-      "ws": {
-         "version": "7.3.1",
-         "resolved": "https://registry.npmjs.org/ws/-/ws-7.3.1.tgz",
-         "integrity": "sha512-D3RuNkynyHmEJIpD2qrgVkc9DQ23OrN/moAwZX4L8DfvszsJxpjQuUq3LMx6HoYji9fbIOBY18XWBsAux1ZZUA=="
-      },
-      "yallist": {
-         "version": "4.0.0",
-         "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-         "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+  "name": "homebridge-ewelink",
+  "version": "2.26.2",
+  "lockfileVersion": 1,
+  "requires": true,
+  "dependencies": {
+    "@types/color-name": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz",
+      "integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ=="
+    },
+    "abort-controller": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz",
+      "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==",
+      "requires": {
+        "event-target-shim": "^5.0.0"
+      }
+    },
+    "agent-base": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.1.tgz",
+      "integrity": "sha512-01q25QQDwLSsyfhrKbn8yuur+JNw0H+0Y4JiGIKd3z9aYk/w/2kxD/Upc+t2ZBBSUNff50VjPsSW2YxM8QYKVg==",
+      "requires": {
+        "debug": "4"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+        }
+      }
+    },
+    "ansi-styles": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
+      "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+      "requires": {
+        "@types/color-name": "^1.1.1",
+        "color-convert": "^2.0.1"
+      }
+    },
+    "array-flatten": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz",
+      "integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ=="
+    },
+    "arrify": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz",
+      "integrity": "sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug=="
+    },
+    "axios": {
+      "version": "0.20.0",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-0.20.0.tgz",
+      "integrity": "sha512-ANA4rr2BDcmmAQLOKft2fufrtuvlqR+cXNNinUmvfeSNCOF98PZL+7M/v1zIdGo7OLjEA9J2gXJL+j4zGsl0bA==",
+      "requires": {
+        "follow-redirects": "^1.10.0"
+      }
+    },
+    "base64-js": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz",
+      "integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g=="
+    },
+    "bignumber.js": {
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.0.0.tgz",
+      "integrity": "sha512-t/OYhhJ2SD+YGBQcjY8GzzDHEk9f3nerxjtfa6tlMXfe7frs/WozhvCNoGvpM0P3bNf3Gq5ZRMlGr5f3r4/N8A=="
+    },
+    "bonjour": {
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/bonjour/-/bonjour-3.5.0.tgz",
+      "integrity": "sha1-jokKGD2O6aI5OzhExpGkK897yfU=",
+      "requires": {
+        "array-flatten": "^2.1.0",
+        "deep-equal": "^1.0.1",
+        "dns-equal": "^1.0.0",
+        "dns-txt": "^2.0.2",
+        "multicast-dns": "^6.0.1",
+        "multicast-dns-service-types": "^1.1.0"
+      }
+    },
+    "buffer-equal-constant-time": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz",
+      "integrity": "sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk="
+    },
+    "buffer-indexof": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.1.tgz",
+      "integrity": "sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g=="
+    },
+    "chalk": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+      "requires": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      }
+    },
+    "color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "requires": {
+        "color-name": "~1.1.4"
+      }
+    },
+    "color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+    },
+    "correcting-interval": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/correcting-interval/-/correcting-interval-2.0.0.tgz",
+      "integrity": "sha1-iTdklFcN+C7axTQRHV8n/z6gstM="
+    },
+    "debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "requires": {
+        "ms": "2.0.0"
+      }
+    },
+    "deep-equal": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz",
+      "integrity": "sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==",
+      "requires": {
+        "is-arguments": "^1.0.4",
+        "is-date-object": "^1.0.1",
+        "is-regex": "^1.0.4",
+        "object-is": "^1.0.1",
+        "object-keys": "^1.1.1",
+        "regexp.prototype.flags": "^1.2.0"
+      }
+    },
+    "define-properties": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
+      "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
+      "requires": {
+        "object-keys": "^1.0.12"
+      }
+    },
+    "dns-equal": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz",
+      "integrity": "sha1-s55/HabrCnW6nBcySzR1PEfgZU0="
+    },
+    "dns-packet": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.1.tgz",
+      "integrity": "sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==",
+      "requires": {
+        "ip": "^1.1.0",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "dns-txt": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/dns-txt/-/dns-txt-2.0.2.tgz",
+      "integrity": "sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY=",
+      "requires": {
+        "buffer-indexof": "^1.0.0"
+      }
+    },
+    "ecdsa-sig-formatter": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz",
+      "integrity": "sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==",
+      "requires": {
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "es-abstract": {
+      "version": "1.17.6",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.6.tgz",
+      "integrity": "sha512-Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw==",
+      "requires": {
+        "es-to-primitive": "^1.2.1",
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.1",
+        "is-callable": "^1.2.0",
+        "is-regex": "^1.1.0",
+        "object-inspect": "^1.7.0",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.0",
+        "string.prototype.trimend": "^1.0.1",
+        "string.prototype.trimstart": "^1.0.1"
+      }
+    },
+    "es-to-primitive": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
+      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
+      "requires": {
+        "is-callable": "^1.1.4",
+        "is-date-object": "^1.0.1",
+        "is-symbol": "^1.0.2"
+      }
+    },
+    "event-target-shim": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz",
+      "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ=="
+    },
+    "extend": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
+      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
+    },
+    "fakegato-history": {
+      "version": "0.5.6",
+      "resolved": "https://registry.npmjs.org/fakegato-history/-/fakegato-history-0.5.6.tgz",
+      "integrity": "sha512-LlsOkiw9LntVlRlBkssD5ozhEkQzYuEJUlvXk5YAgBQcWzk19PQ5g+NoKfs6SRY1qAeC1onb65hes4mCvY+JmA==",
+      "requires": {
+        "debug": "^2.2.0",
+        "googleapis": ">39.1.0",
+        "moment": "*"
+      }
+    },
+    "fast-text-encoding": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/fast-text-encoding/-/fast-text-encoding-1.0.3.tgz",
+      "integrity": "sha512-dtm4QZH9nZtcDt8qJiOH9fcQd1NAgi+K1O2DbE6GG1PPCK/BWfOH3idCTRQ4ImXRUOyopDEgDEnVEE7Y/2Wrig=="
+    },
+    "follow-redirects": {
+      "version": "1.13.0",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.0.tgz",
+      "integrity": "sha512-aq6gF1BEKje4a9i9+5jimNFIpq4Q1WiwBToeRK5NvZBd/TRsmW8BsJfOEGkr76TbOyPVD3OVDN910EcUNtRYEA=="
+    },
+    "function-bind": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
+    },
+    "gaxios": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/gaxios/-/gaxios-3.1.0.tgz",
+      "integrity": "sha512-DDTn3KXVJJigtz+g0J3vhcfbDbKtAroSTxauWsdnP57sM5KZ3d2c/3D9RKFJ86s43hfw6WULg6TXYw/AYiBlpA==",
+      "requires": {
+        "abort-controller": "^3.0.0",
+        "extend": "^3.0.2",
+        "https-proxy-agent": "^5.0.0",
+        "is-stream": "^2.0.0",
+        "node-fetch": "^2.3.0"
+      }
+    },
+    "gcp-metadata": {
+      "version": "4.1.4",
+      "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-4.1.4.tgz",
+      "integrity": "sha512-5J/GIH0yWt/56R3dNaNWPGQ/zXsZOddYECfJaqxFWgrZ9HC2Kvc5vl9upOgUUHKzURjAVf2N+f6tEJiojqXUuA==",
+      "requires": {
+        "gaxios": "^3.0.0",
+        "json-bigint": "^1.0.0"
+      }
+    },
+    "google-auth-library": {
+      "version": "6.0.6",
+      "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-6.0.6.tgz",
+      "integrity": "sha512-fWYdRdg55HSJoRq9k568jJA1lrhg9i2xgfhVIMJbskUmbDpJGHsbv9l41DGhCDXM21F9Kn4kUwdysgxSYBYJUw==",
+      "requires": {
+        "arrify": "^2.0.0",
+        "base64-js": "^1.3.0",
+        "ecdsa-sig-formatter": "^1.0.11",
+        "fast-text-encoding": "^1.0.0",
+        "gaxios": "^3.0.0",
+        "gcp-metadata": "^4.1.0",
+        "gtoken": "^5.0.0",
+        "jws": "^4.0.0",
+        "lru-cache": "^6.0.0"
+      }
+    },
+    "google-p12-pem": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-3.0.3.tgz",
+      "integrity": "sha512-wS0ek4ZtFx/ACKYF3JhyGe5kzH7pgiQ7J5otlumqR9psmWMYc+U9cErKlCYVYHoUaidXHdZ2xbo34kB+S+24hA==",
+      "requires": {
+        "node-forge": "^0.10.0"
+      }
+    },
+    "googleapis": {
+      "version": "59.0.0",
+      "resolved": "https://registry.npmjs.org/googleapis/-/googleapis-59.0.0.tgz",
+      "integrity": "sha512-GV/E4KRN89a4GxSk7D7cwUfRYgcJHR05sOgm/WGdwc/u8dxNXG5lWmz9gF5ZwFGk2yKtVxL4VZNn4zBuZ6rmGg==",
+      "requires": {
+        "google-auth-library": "^6.0.0",
+        "googleapis-common": "^4.4.0"
+      }
+    },
+    "googleapis-common": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/googleapis-common/-/googleapis-common-4.4.0.tgz",
+      "integrity": "sha512-Bgrs8/1OZQFFIfVuX38L9t48rPAkVUXttZy6NzhhXxFOEMSHgfFIjxou7RIXOkBHxmx2pVwct9WjKkbnqMYImQ==",
+      "requires": {
+        "extend": "^3.0.2",
+        "gaxios": "^3.0.0",
+        "google-auth-library": "^6.0.0",
+        "qs": "^6.7.0",
+        "url-template": "^2.0.8",
+        "uuid": "^8.0.0"
+      }
+    },
+    "gtoken": {
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/gtoken/-/gtoken-5.0.3.tgz",
+      "integrity": "sha512-Nyd1wZCMRc2dj/mAD0LlfQLcAO06uKdpKJXvK85SGrF5+5+Bpfil9u/2aw35ltvEHjvl0h5FMKN5knEU+9JrOg==",
+      "requires": {
+        "gaxios": "^3.0.0",
+        "google-p12-pem": "^3.0.0",
+        "jws": "^4.0.0",
+        "mime": "^2.2.0"
+      }
+    },
+    "has": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+      "requires": {
+        "function-bind": "^1.1.1"
+      }
+    },
+    "has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
+    },
+    "has-symbols": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz",
+      "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg=="
+    },
+    "homebridge-lib": {
+      "version": "4.7.14",
+      "resolved": "https://registry.npmjs.org/homebridge-lib/-/homebridge-lib-4.7.14.tgz",
+      "integrity": "sha512-8eUGTVrCRd7WHwEH49CgqYUu2q9WjeTVDnEA5WXL2ZvPevTMCck5GcVIXtvVWxr9we8Ay0ybFp0N5RRlrIzH/g==",
+      "requires": {
+        "bonjour": "^3.5.0",
+        "chalk": "^4.1.0",
+        "debug": "^4.1.1",
+        "semver": "^7.3.2"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+        }
+      }
+    },
+    "https-proxy-agent": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
+      "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
+      "requires": {
+        "agent-base": "6",
+        "debug": "4"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+        }
+      }
+    },
+    "ip": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz",
+      "integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo="
+    },
+    "is-arguments": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.0.4.tgz",
+      "integrity": "sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA=="
+    },
+    "is-callable": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.1.tgz",
+      "integrity": "sha512-wliAfSzx6V+6WfMOmus1xy0XvSgf/dlStkvTfq7F0g4bOIW0PSUbnyse3NhDwdyYS1ozfUtAAySqTws3z9Eqgg=="
+    },
+    "is-date-object": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz",
+      "integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g=="
+    },
+    "is-regex": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.1.tgz",
+      "integrity": "sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==",
+      "requires": {
+        "has-symbols": "^1.0.1"
+      }
+    },
+    "is-stream": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz",
+      "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw=="
+    },
+    "is-symbol": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz",
+      "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==",
+      "requires": {
+        "has-symbols": "^1.0.1"
+      }
+    },
+    "json-bigint": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/json-bigint/-/json-bigint-1.0.0.tgz",
+      "integrity": "sha512-SiPv/8VpZuWbvLSMtTDU8hEfrZWg/mH/nV/b4o0CYbSxu1UIQPLdwKOCIyLQX+VIPO5vrLX3i8qtqFyhdPSUSQ==",
+      "requires": {
+        "bignumber.js": "^9.0.0"
+      }
+    },
+    "jwa": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/jwa/-/jwa-2.0.0.tgz",
+      "integrity": "sha512-jrZ2Qx916EA+fq9cEAeCROWPTfCwi1IVHqT2tapuqLEVVDKFDENFw1oL+MwrTvH6msKxsd1YTDVw6uKEcsrLEA==",
+      "requires": {
+        "buffer-equal-constant-time": "1.0.1",
+        "ecdsa-sig-formatter": "1.0.11",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "jws": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/jws/-/jws-4.0.0.tgz",
+      "integrity": "sha512-KDncfTmOZoOMTFG4mBlG0qUIOlc03fmzH+ru6RgYVZhPkyiy/92Owlt/8UEN+a4TXR1FQetfIpJE8ApdvdVxTg==",
+      "requires": {
+        "jwa": "^2.0.0",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "requires": {
+        "yallist": "^4.0.0"
+      }
+    },
+    "mime": {
+      "version": "2.4.6",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.6.tgz",
+      "integrity": "sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA=="
+    },
+    "moment": {
+      "version": "2.27.0",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.27.0.tgz",
+      "integrity": "sha512-al0MUK7cpIcglMv3YF13qSgdAIqxHTO7brRtaz3DlSULbqfazqkc5kEjNrLDOM7fsjshoFIihnU8snrP7zUvhQ=="
+    },
+    "ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+    },
+    "multicast-dns": {
+      "version": "6.2.3",
+      "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.3.tgz",
+      "integrity": "sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g==",
+      "requires": {
+        "dns-packet": "^1.3.1",
+        "thunky": "^1.0.2"
+      }
+    },
+    "multicast-dns-service-types": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz",
+      "integrity": "sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE="
+    },
+    "node-dns-sd": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/node-dns-sd/-/node-dns-sd-0.4.1.tgz",
+      "integrity": "sha512-x+WSuMgvDBQv24OCq75YHcZj1SOzvP5fU4Tz+PBUiVvVBsfc+9XAHAuIftaCpf2nPLl+ys71uZoGr/v9fVDa6A=="
+    },
+    "node-fetch": {
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz",
+      "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw=="
+    },
+    "node-forge": {
+      "version": "0.10.0",
+      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.10.0.tgz",
+      "integrity": "sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA=="
+    },
+    "object-inspect": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.8.0.tgz",
+      "integrity": "sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA=="
+    },
+    "object-is": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.2.tgz",
+      "integrity": "sha512-5lHCz+0uufF6wZ7CRFWJN3hp8Jqblpgve06U5CMQ3f//6iDjPr2PEo9MWCjEssDsa+UZEL4PkFpr+BMop6aKzQ==",
+      "requires": {
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.5"
+      }
+    },
+    "object-keys": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="
+    },
+    "object.assign": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz",
+      "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==",
+      "requires": {
+        "define-properties": "^1.1.2",
+        "function-bind": "^1.1.1",
+        "has-symbols": "^1.0.0",
+        "object-keys": "^1.0.11"
+      }
+    },
+    "prettier": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.1.1.tgz",
+      "integrity": "sha512-9bY+5ZWCfqj3ghYBLxApy2zf6m+NJo5GzmLTpr9FsApsfjriNnS2dahWReHMi7qNPhhHl9SYHJs2cHZLgexNIw==",
+      "dev": true
+    },
+    "qs": {
+      "version": "6.9.4",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.4.tgz",
+      "integrity": "sha512-A1kFqHekCTM7cz0udomYUoYNWjBebHm/5wzU/XqrBRBNWectVH0QIiN+NEcZ0Dte5hvzHwbr8+XQmguPhJ6WdQ=="
+    },
+    "regexp.prototype.flags": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz",
+      "integrity": "sha512-2+Q0C5g951OlYlJz6yu5/M33IcsESLlLfsyIaLJaG4FA2r4yP8MvVMJUUP/fVBkSpbbbZlS5gynbEWLipiiXiQ==",
+      "requires": {
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.0-next.1"
+      }
+    },
+    "safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
+    },
+    "semver": {
+      "version": "7.3.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz",
+      "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ=="
+    },
+    "string.prototype.trimend": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz",
+      "integrity": "sha512-LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g==",
+      "requires": {
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.5"
+      }
+    },
+    "string.prototype.trimstart": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz",
+      "integrity": "sha512-XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw==",
+      "requires": {
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.5"
+      }
+    },
+    "supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "requires": {
+        "has-flag": "^4.0.0"
       }
-   }
+    },
+    "thunky": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz",
+      "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA=="
+    },
+    "url-template": {
+      "version": "2.0.8",
+      "resolved": "https://registry.npmjs.org/url-template/-/url-template-2.0.8.tgz",
+      "integrity": "sha1-/FZaPMy/93MMd19WQflVV5FDnyE="
+    },
+    "uuid": {
+      "version": "8.3.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.0.tgz",
+      "integrity": "sha512-fX6Z5o4m6XsXBdli9g7DtWgAx+osMsRRZFKma1mIUsLCz6vRvv+pz5VNbyu9UEDzpMWulZfvpgb/cmDXVulYFQ=="
+    },
+    "ws": {
+      "version": "7.3.1",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.3.1.tgz",
+      "integrity": "sha512-D3RuNkynyHmEJIpD2qrgVkc9DQ23OrN/moAwZX4L8DfvszsJxpjQuUq3LMx6HoYji9fbIOBY18XWBsAux1ZZUA=="
+    },
+    "yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+    }
+  }
 }
diff --git a/package.json b/package.json
index 5e90fe89..06d38b28 100644
--- a/package.json
+++ b/package.json
@@ -1,68 +1,71 @@
 {
-   "name": "homebridge-ewelink",
-   "version": "2.26.2",
-   "author": "bwp91",
-   "contributors": [
-      "gbro115",
-      "MrTomAsh",
-      "howanghk",
-      "LeJeko",
-      "aremishevsky-chegg",
-      "samkni",
-      "robsonfj",
-      "ramsesz",
-      "metarutaiga",
-      "janbuecker",
-      "jacopofranza",
-      "donavanbecker",
-      "dhutchison",
-      "danielk117",
-      "bassrock",
-      "VictorKrasnov",
-      "JuniorGenius",
-      "BobbySlope"
-   ],
-   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
-   "license": "MIT",
-   "keywords": [
-      "homebridge",
-      "homebridge-plugin",
-      "homekit",
-      "sonoff",
-      "ewelink"
-   ],
-   "engines": {
-      "node": ">=6.0.0",
-      "homebridge": ">=0.2.0"
-   },
-   "repository": {
-      "type": "git",
-      "url": "https://github.com/bwp91/homebridge-ewelink"
-   },
-   "bugs": {
-      "url": "https://github.com/bwp91/homebridge-ewelink/issues"
-   },
-   "dependencies": {
-      "axios": "0.20.0",
-      "color-convert": "2.0.1",
-      "correcting-interval": "2.0.0",
-      "fakegato-history": "0.5.6",
-      "homebridge-lib": "4.7.14",
-      "node-dns-sd": "0.4.1",
-      "ws": "7.3.1"
-   },
-   "funding": [
-      {
-         "type": "kofi",
-         "url": "https://ko-fi.com/bwp91"
-      },
-      {
-         "type": "patreon",
-         "url": "https://www.patreon.com/bwp91"
-      },
-      {
-         "type": "paypal",
-         "url": "https://www.paypal.me/BenPotter"
-      }
-   ]
+  "name": "homebridge-ewelink",
+  "version": "2.26.2",
+  "author": "bwp91",
+  "contributors": [
+    "gbro115",
+    "MrTomAsh",
+    "howanghk",
+    "LeJeko",
+    "aremishevsky-chegg",
+    "samkni",
+    "robsonfj",
+    "ramsesz",
+    "metarutaiga",
+    "janbuecker",
+    "jacopofranza",
+    "donavanbecker",
+    "dhutchison",
+    "danielk117",
+    "bassrock",
+    "VictorKrasnov",
+    "JuniorGenius",
+    "BobbySlope"
+  ],
+  "description": "Homebridge plugin to control eWeLink devices with original firmware.",
+  "license": "MIT",
+  "keywords": [
+    "homebridge",
+    "homebridge-plugin",
+    "homekit",
+    "sonoff",
+    "ewelink"
+  ],
+  "engines": {
+    "node": ">=6.0.0",
+    "homebridge": ">=0.2.0"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/bwp91/homebridge-ewelink"
+  },
+  "bugs": {
+    "url": "https://github.com/bwp91/homebridge-ewelink/issues"
+  },
+  "funding": [
+    {
+      "type": "kofi",
+      "url": "https://ko-fi.com/bwp91"
+    },
+    {
+      "type": "patreon",
+      "url": "https://www.patreon.com/bwp91"
+    },
+    {
+      "type": "paypal",
+      "url": "https://www.paypal.me/BenPotter"
+    }
+  ],
+  "dependencies": {
+    "axios": "0.20.0",
+    "color-convert": "2.0.1",
+    "correcting-interval": "2.0.0",
+    "fakegato-history": "0.5.6",
+    "homebridge-lib": "4.7.14",
+    "node-dns-sd": "0.4.1",
+    "ws": "7.3.1"
+  },
+  "devDependencies": {
+    "prettier": "2.1.1"
+  }
 }

From 42845071fa919551a64540ee964151f4498fa1e8 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 15 Sep 2020 18:09:07 +0100
Subject: [PATCH 0151/3183] prettier formatting

---
 .prettierrc.json   |    3 +-
 lib/constants.js   |   30 +-
 lib/eWeLink.js     | 1489 ++++++++++++++++++++++++++++++++++----------
 lib/eWeLinkHTTP.js |   38 +-
 lib/eWeLinkLAN.js  |   71 ++-
 lib/eWeLinkWS.js   |   80 ++-
 6 files changed, 1322 insertions(+), 389 deletions(-)

diff --git a/.prettierrc.json b/.prettierrc.json
index 163a0a7e..d68aa739 100644
--- a/.prettierrc.json
+++ b/.prettierrc.json
@@ -1,4 +1,3 @@
 {
-  "arrowParens": "avoid",
-  "printWidth": 120
+  "arrowParens": "avoid"
 }
diff --git a/lib/constants.js b/lib/constants.js
index c8a8f17f..34215ac6 100644
--- a/lib/constants.js
+++ b/lib/constants.js
@@ -11,7 +11,18 @@ module.exports = {
   devicesSingleSwitchParams: ["switch"],
   devicesMultiSwitch: [2, 3, 4, 7, 8, 9, 29, 30, 31, 34, 41],
   devicesMultiSwitchParams: ["switches"],
-  devicesSingleSwitchLight: ["T1 1C", "L1", "B1", "B1_R2", "TX1C", "D1", "D1R1", "KING-M4", "Slampher", "GTTA59"],
+  devicesSingleSwitchLight: [
+    "T1 1C",
+    "L1",
+    "B1",
+    "B1_R2",
+    "TX1C",
+    "D1",
+    "D1R1",
+    "KING-M4",
+    "Slampher",
+    "GTTA59",
+  ],
   devicesSingleSwitchLightParams: [
     "switch",
     "state",
@@ -29,7 +40,12 @@ module.exports = {
   devicesSensor: [102],
   devicesSensorParams: ["switch", "battery", "type"],
   devicesThermostat: [15],
-  devicesThermostatParams: ["currentTemperature", "currentHumidity", "switch", "masterSwitch"],
+  devicesThermostatParams: [
+    "currentTemperature",
+    "currentHumidity",
+    "switch",
+    "masterSwitch",
+  ],
   devicesFan: [34],
   devicesFanParams: ["switches", "light", "fan", "speed"],
   devicesOutlet: [32],
@@ -42,7 +58,15 @@ module.exports = {
   devicesRFBridge: [28],
   devicesRFBridgeParams: ["cmd"],
   devicesZBBridge: [66],
-  devicesZBBridgeParams: ["key", "temperature", "humidity", "motion", "lock", "trigTime", "battery"],
+  devicesZBBridgeParams: [
+    "key",
+    "temperature",
+    "humidity",
+    "motion",
+    "lock",
+    "trigTime",
+    "battery",
+  ],
   devicesZB: [1000, 1770, 2026, 3026],
   devicesValveParams: ["switches"],
   devicesBlindParams: ["switch", "switches"],
diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index 5b87acf8..0869e08a 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -13,9 +13,15 @@ class eWeLink {
   constructor(log, config, api) {
     if (!log || !api || !config) return;
     if (!config.username || !config.password || !config.countryCode) {
-      log.error("**************** Cannot load homebridge-ewelink ****************");
-      log.error("Your eWeLink credentials are missing from the Homebridge config.");
-      log.error("****************************************************************");
+      log.error(
+        "**************** Cannot load homebridge-ewelink ****************"
+      );
+      log.error(
+        "Your eWeLink credentials are missing from the Homebridge config."
+      );
+      log.error(
+        "****************************************************************"
+      );
       return;
     }
     this.log = log;
@@ -29,7 +35,9 @@ class eWeLink {
     this.eveLogPath = this.api.user.storagePath() + "/homebridge-ewelink/";
     this.api
       .on("didFinishLaunching", () => {
-        this.log("Plugin has finished initialising. Starting synchronisation with eWeLink account.");
+        this.log(
+          "Plugin has finished initialising. Starting synchronisation with eWeLink account."
+        );
         //*** Set up HTTP client and get the user HTTP host ***\\
         this.httpClient = new eWeLinkHTTP(this.config, this.log);
         this.httpClient
@@ -48,10 +56,23 @@ class eWeLink {
           .then(res => {
             //*** Get device IP addresses for LAN mode ***\\
             this.httpDevices = res
-              .filter(device => device.hasOwnProperty("extra") && device.extra.hasOwnProperty("uiid"))
-              .filter(device => !(this.config.hideDevFromHB || "").includes(device.deviceid));
-            this.lanClient = new eWeLinkLAN(this.config, this.log, this.httpDevices);
-            this.httpDevices.forEach(device => this.devicesInEwe.set(device.deviceid, device));
+              .filter(
+                device =>
+                  device.hasOwnProperty("extra") &&
+                  device.extra.hasOwnProperty("uiid")
+              )
+              .filter(
+                device =>
+                  !(this.config.hideDevFromHB || "").includes(device.deviceid)
+              );
+            this.lanClient = new eWeLinkLAN(
+              this.config,
+              this.log,
+              this.httpDevices
+            );
+            this.httpDevices.forEach(device =>
+              this.devicesInEwe.set(device.deviceid, device)
+            );
             return this.lanClient.getHosts();
           })
           .then(res => {
@@ -64,8 +85,13 @@ class eWeLink {
             //*** Use the device list to refresh Homebridge accessories ***\\
             (() => {
               //*** Remove all Homebridge accessories if none found ***\\
-              if (Object.keys(this.httpDevices).length === 0 && Object.keys(this.lanDevices).length === 0) {
-                Array.from(this.devicesInHB.values()).forEach(a => this.removeAccessory(a));
+              if (
+                Object.keys(this.httpDevices).length === 0 &&
+                Object.keys(this.lanDevices).length === 0
+              ) {
+                Array.from(this.devicesInHB.values()).forEach(a =>
+                  this.removeAccessory(a)
+                );
                 this.devicesInHB.clear();
                 this.log.warn("******* Not loading homebridge-ewelink *******");
                 this.log.warn("No devices were found in your eWeLink account.");
@@ -75,20 +101,41 @@ class eWeLink {
               //*** Make a map of custom groups from Homebridge config ***\\
               if (Object.keys(this.config.groups || []).length > 0) {
                 this.config.groups
-                  .filter(g => g.hasOwnProperty("type") && cns.allowedGroups.includes(g.type))
-                  .filter(g => g.hasOwnProperty("deviceId") && this.devicesInEwe.has(g.deviceId.toLowerCase()))
+                  .filter(
+                    g =>
+                      g.hasOwnProperty("type") &&
+                      cns.allowedGroups.includes(g.type)
+                  )
+                  .filter(
+                    g =>
+                      g.hasOwnProperty("deviceId") &&
+                      this.devicesInEwe.has(g.deviceId.toLowerCase())
+                  )
                   .forEach(g => this.cusG.set(g.deviceId + "SWX", g));
               }
               //*** Make a map of RF Bridge custom sensors from Homebridge config ***\\
               if (Object.keys(this.config.bridgeSensors || []).length > 0) {
                 this.config.bridgeSensors
-                  .filter(s => s.hasOwnProperty("deviceId") && this.devicesInEwe.has(s.deviceId.toLowerCase()))
+                  .filter(
+                    s =>
+                      s.hasOwnProperty("deviceId") &&
+                      this.devicesInEwe.has(s.deviceId.toLowerCase())
+                  )
                   .forEach(s => this.cusS.set(s.fullDeviceId, s));
               }
               //*** Logging always helps to see if everything is okay so far ***\\
-              this.log("[%s] eWeLink devices were loaded from the Homebridge cache.", this.devicesInHB.size);
-              this.log("[%s] primary devices were loaded from your eWeLink account.", this.devicesInEwe.size);
-              this.log("[%s] primary devices were discovered on your local network.", this.lanDevicesOnline);
+              this.log(
+                "[%s] eWeLink devices were loaded from the Homebridge cache.",
+                this.devicesInHB.size
+              );
+              this.log(
+                "[%s] primary devices were loaded from your eWeLink account.",
+                this.devicesInEwe.size
+              );
+              this.log(
+                "[%s] primary devices were discovered on your local network.",
+                this.lanDevicesOnline
+              );
               //*** Remove Homebridge accessories that don't appear in eWeLink ***\\
               this.devicesInHB.forEach(a => {
                 if (!this.devicesInEwe.has(a.context.eweDeviceId)) {
@@ -99,7 +146,9 @@ class eWeLink {
               this.devicesInEwe.forEach(d => this.initialiseDevice(d));
               this.wsClient.receiveUpdate(d => this.receiveDeviceUpdate(d));
               this.lanClient.receiveUpdate(d => this.receiveDeviceUpdate(d));
-              this.log("eWeLink setup complete. If you're enjoying this package please consider a ⭐️  on GitHub :).");
+              this.log(
+                "eWeLink setup complete. If you're enjoying this package please consider a ⭐️  on GitHub :)."
+              );
               if (this.config.debugReqRes || false) {
                 this.log.warn(
                   "You have 'Request & Response Logging' enabled. This setting is not recommended for long-term use."
@@ -108,9 +157,13 @@ class eWeLink {
             })();
           })
           .catch(err => {
-            this.log.error("************** Cannot load homebridge-ewelink **************");
+            this.log.error(
+              "************** Cannot load homebridge-ewelink **************"
+            );
             this.log.error(err);
-            this.log.error("************************************************************");
+            this.log.error(
+              "************************************************************"
+            );
             if (this.lanClient) this.lanClient.closeConnection();
             if (this.wsClient) this.wsClient.closeConnection();
           });
@@ -122,16 +175,31 @@ class eWeLink {
   }
   initialiseDevice(device) {
     let accessory;
-    // if (device.extra.uiid === 102) this.log.warn(device);
     //*** First add the device if it isn't already in Homebridge. Yeah this code looks a mess :| ***\\
-    if (!this.devicesInHB.has(device.deviceid + "SWX") && !this.devicesInHB.has(device.deviceid + "SW0")) {
-      if (device.extra.uiid === 2 && device.brandName === "coolkit" && device.productModel === "0285") {
+    if (
+      !this.devicesInHB.has(device.deviceid + "SWX") &&
+      !this.devicesInHB.has(device.deviceid + "SW0")
+    ) {
+      if (
+        device.extra.uiid === 2 &&
+        device.brandName === "coolkit" &&
+        device.productModel === "0285"
+      ) {
         this.addAccessory(device, device.deviceid + "SWX", "valve");
-      } else if (this.cusG.has(device.deviceid + "SWX") && this.cusG.get(device.deviceid + "SWX").type === "blind") {
+      } else if (
+        this.cusG.has(device.deviceid + "SWX") &&
+        this.cusG.get(device.deviceid + "SWX").type === "blind"
+      ) {
         this.addAccessory(device, device.deviceid + "SWX", "blind");
-      } else if (this.cusG.has(device.deviceid + "SWX") && this.cusG.get(device.deviceid + "SWX").type === "garage") {
+      } else if (
+        this.cusG.has(device.deviceid + "SWX") &&
+        this.cusG.get(device.deviceid + "SWX").type === "garage"
+      ) {
         this.addAccessory(device, device.deviceid + "SWX", "garage");
-      } else if (this.cusG.has(device.deviceid + "SWX") && this.cusG.get(device.deviceid + "SWX").type === "lock") {
+      } else if (
+        this.cusG.has(device.deviceid + "SWX") &&
+        this.cusG.get(device.deviceid + "SWX").type === "lock"
+      ) {
         this.addAccessory(device, device.deviceid + "SWX", "lock");
       } else if (cns.devicesSensor.includes(device.extra.uiid)) {
         this.addAccessory(device, device.deviceid + "SWX", "sensor");
@@ -165,7 +233,9 @@ class eWeLink {
         }
       } else if (cns.devicesRFBridge.includes(device.extra.uiid)) {
         this.addAccessory(device, device.deviceid + "SW0", "rf_pri");
-        if (Object.keys((device.tags && device.tags.zyx_info) || []).length > 0) {
+        if (
+          Object.keys((device.tags && device.tags.zyx_info) || []).length > 0
+        ) {
           for (let i = 1; i <= Object.keys(device.tags.zyx_info).length; i++) {
             this.addAccessory(device, device.deviceid + "SW" + i, "rf_sub");
           }
@@ -189,18 +259,29 @@ class eWeLink {
       }
     }
     //*** Next refresh the device ***\\
-    if ((accessory = this.devicesInHB.get(device.deviceid + "SWX") || this.devicesInHB.get(device.deviceid + "SW0"))) {
+    if (
+      (accessory =
+        this.devicesInHB.get(device.deviceid + "SWX") ||
+        this.devicesInHB.get(device.deviceid + "SW0"))
+    ) {
       let isX = accessory.context.hbDeviceId.substr(-1) === "X",
         isRfBridge = cns.devicesRFBridge.includes(accessory.context.eweUIID),
         rfBridgeChange = false;
       accessory
         .getService(Service.AccessoryInformation)
-        .setCharacteristic(Characteristic.FirmwareRevision, device.params.fwVersion);
-      accessory.context.reachableWAN = accessory.context.eweUIID !== 102 ? device.online : true;
-      accessory.context.reachableLAN = this.lanDevices.get(device.deviceid).online || false;
+        .setCharacteristic(
+          Characteristic.FirmwareRevision,
+          device.params.fwVersion
+        );
+      accessory.context.reachableWAN =
+        accessory.context.eweUIID !== 102 ? device.online : true;
+      accessory.context.reachableLAN =
+        this.lanDevices.get(device.deviceid).online || false;
       accessory.context.inUse = false;
       let str = accessory.context.reachableLAN
-        ? "and locally with IP [" + this.lanDevices.get(device.deviceid).ip + "]"
+        ? "and locally with IP [" +
+          this.lanDevices.get(device.deviceid).ip +
+          "]"
         : "but LAN mode unavailable as unsupported/shared device";
       this.log("[%s] found in eWeLink %s.", accessory.displayName, str);
       this.devicesInHB.set(accessory.context.hbDeviceId, accessory);
@@ -208,7 +289,11 @@ class eWeLink {
         for (let i = 1; i <= accessory.context.channelCount; i++) {
           if (!this.devicesInHB.has(device.deviceid + "SW" + i)) {
             if (cns.devicesHideable.includes(accessory.context.type)) {
-              if ((this.config.hideFromHB || "").includes(device.deviceid + "SW" + i)) {
+              if (
+                (this.config.hideFromHB || "").includes(
+                  device.deviceid + "SW" + i
+                )
+              ) {
                 continue;
               } else {
                 this.addAccessory(device, device.deviceid + "SW" + i, "switch");
@@ -217,7 +302,9 @@ class eWeLink {
           }
           let oAccessory = this.devicesInHB.get(device.deviceid + "SW" + i);
           if (
-            (this.config.hideFromHB || "").includes(device.deviceid + "SW" + i) &&
+            (this.config.hideFromHB || "").includes(
+              device.deviceid + "SW" + i
+            ) &&
             cns.devicesHideable.includes(accessory.context.type)
           ) {
             this.removeAccessory(oAccessory);
@@ -231,9 +318,13 @@ class eWeLink {
           }
           oAccessory
             .getService(Service.AccessoryInformation)
-            .setCharacteristic(Characteristic.FirmwareRevision, device.params.fwVersion);
+            .setCharacteristic(
+              Characteristic.FirmwareRevision,
+              device.params.fwVersion
+            );
           oAccessory.context.reachableWAN = device.online;
-          oAccessory.context.reachableLAN = this.lanDevices.get(device.deviceid).online || false;
+          oAccessory.context.reachableLAN =
+            this.lanDevices.get(device.deviceid).online || false;
           this.devicesInHB.set(oAccessory.context.hbDeviceId, oAccessory);
         }
       }
@@ -258,19 +349,28 @@ class eWeLink {
         );
       }
     } else {
-      this.log.warn("[%s] cannot be initialised as it wasn't found in Homebridge.", device.name);
+      this.log.warn(
+        "[%s] cannot be initialised as it wasn't found in Homebridge.",
+        device.name
+      );
     }
   }
   addAccessory(device, hbDeviceId, type) {
     let switchNumber = hbDeviceId.substr(-1).toString(),
-      newDeviceName = type === "rf_sub" ? device.tags.zyx_info[switchNumber - 1].name : device.name,
+      newDeviceName =
+        type === "rf_sub"
+          ? device.tags.zyx_info[switchNumber - 1].name
+          : device.name,
       channelCount =
         type === "rf_pri"
           ? Object.keys((device.tags && device.tags.zyx_info) || []).length
           : cns.chansFromUiid[device.extra.uiid];
     if (["1", "2", "3", "4"].includes(switchNumber) && type !== "rf_sub") {
       newDeviceName += " SW" + switchNumber;
-      if ((this.config.hideFromHB || "").includes(hbDeviceId) && cns.devicesHideable.includes(type)) {
+      if (
+        (this.config.hideFromHB || "").includes(hbDeviceId) &&
+        cns.devicesHideable.includes(type)
+      ) {
         this.log("[%s] will not be added as per configuration.", newDeviceName);
         return;
       }
@@ -278,14 +378,23 @@ class eWeLink {
     if ((this.config.nameOverride || {}).hasOwnProperty(hbDeviceId)) {
       newDeviceName = this.config.nameOverride[hbDeviceId];
     }
-    const accessory = new Accessory(newDeviceName, UUIDGen.generate(hbDeviceId).toString());
+    const accessory = new Accessory(
+      newDeviceName,
+      UUIDGen.generate(hbDeviceId).toString()
+    );
     try {
       accessory
         .getService(Service.AccessoryInformation)
         .setCharacteristic(Characteristic.SerialNumber, hbDeviceId)
         .setCharacteristic(Characteristic.Manufacturer, device.brandName)
-        .setCharacteristic(Characteristic.Model, device.productModel + " (" + device.extra.model + ")")
-        .setCharacteristic(Characteristic.FirmwareRevision, device.params.fwVersion)
+        .setCharacteristic(
+          Characteristic.Model,
+          device.productModel + " (" + device.extra.model + ")"
+        )
+        .setCharacteristic(
+          Characteristic.FirmwareRevision,
+          device.params.fwVersion
+        )
         .setCharacteristic(Characteristic.Identify, false);
       accessory.context = {
         hbDeviceId,
@@ -301,11 +410,18 @@ class eWeLink {
         case "valve":
           ["A", "B"].forEach(v => {
             accessory
-              .addService(Service.Valve, "Valve " + v, "valve" + v.toLowerCase())
+              .addService(
+                Service.Valve,
+                "Valve " + v,
+                "valve" + v.toLowerCase()
+              )
               .setCharacteristic(Characteristic.Active, 0)
               .setCharacteristic(Characteristic.InUse, 0)
               .setCharacteristic(Characteristic.ValveType, 1)
-              .setCharacteristic(Characteristic.SetDuration, this.config.valveTimeLength || 120)
+              .setCharacteristic(
+                Characteristic.SetDuration,
+                this.config.valveTimeLength || 120
+              )
               .addCharacteristic(Characteristic.RemainingDuration);
           });
           break;
@@ -339,15 +455,26 @@ class eWeLink {
         case "thermostat":
           if (!this.config.hideTHSwitch) accessory.addService(Service.Switch);
           accessory.addService(Service.TemperatureSensor);
-          if (device.params.sensorType !== "DS18B20") accessory.addService(Service.HumiditySensor);
+          if (device.params.sensorType !== "DS18B20")
+            accessory.addService(Service.HumiditySensor);
           break;
         case "outlet":
           accessory.addService(Service.Outlet);
-          accessory.getService(Service.Outlet).addCharacteristic(EveService.Characteristics.Voltage);
-          accessory.getService(Service.Outlet).addCharacteristic(EveService.Characteristics.CurrentConsumption);
-          accessory.getService(Service.Outlet).addCharacteristic(EveService.Characteristics.ElectricCurrent);
-          accessory.getService(Service.Outlet).addCharacteristic(EveService.Characteristics.TotalConsumption);
-          accessory.getService(Service.Outlet).addCharacteristic(EveService.Characteristics.ResetTotal);
+          accessory
+            .getService(Service.Outlet)
+            .addCharacteristic(EveService.Characteristics.Voltage);
+          accessory
+            .getService(Service.Outlet)
+            .addCharacteristic(EveService.Characteristics.CurrentConsumption);
+          accessory
+            .getService(Service.Outlet)
+            .addCharacteristic(EveService.Characteristics.ElectricCurrent);
+          accessory
+            .getService(Service.Outlet)
+            .addCharacteristic(EveService.Characteristics.TotalConsumption);
+          accessory
+            .getService(Service.Outlet)
+            .addCharacteristic(EveService.Characteristics.ResetTotal);
           accessory.context = {
             ...accessory.context,
             ...{
@@ -375,7 +502,9 @@ class eWeLink {
           break;
         case "rf_sub":
           accessory.context.rfChls = {};
-          switch (device.tags.zyx_info[parseInt(switchNumber) - 1].remote_type) {
+          switch (
+            device.tags.zyx_info[parseInt(switchNumber) - 1].remote_type
+          ) {
             case "1":
             case "2":
             case "3":
@@ -383,7 +512,9 @@ class eWeLink {
               accessory.context.sensorType = "button";
               break;
             case "6":
-              accessory.context.sensorType = this.cusS.has(hbDeviceId) ? this.cusS.get(hbDeviceId).type : "motion";
+              accessory.context.sensorType = this.cusS.has(hbDeviceId)
+                ? this.cusS.get(hbDeviceId).type
+                : "motion";
               break;
             default:
               throw (
@@ -393,46 +524,52 @@ class eWeLink {
               );
           }
           let mAccessory = this.devicesInHB.get(device.deviceid + "SW0");
-          device.tags.zyx_info[parseInt(switchNumber) - 1].buttonName.forEach(button => {
-            let rfData;
-            Object.entries(button).forEach(
-              ([k, v]) =>
-                (rfData = {
-                  rfChan: k,
-                  name: v,
-                })
-            );
-            accessory.context.rfChls[rfData.rfChan] = rfData.name;
-            mAccessory.context.rfChlMap[rfData.rfChan] = switchNumber;
-            switch (accessory.context.sensorType) {
-              case "button":
-                accessory.addService(Service.Switch, rfData.name, "switch" + rfData.rfChan);
-                break;
-              case "water":
-                accessory.addService(Service.LeakSensor);
-                break;
-              case "fire":
-              case "smoke":
-                accessory.addService(Service.SmokeSensor);
-                break;
-              case "co":
-                accessory.addService(Service.CarbonMonoxideSensor);
-                break;
-              case "co2":
-                accessory.addService(Service.CarbonDioxideSensor);
-                break;
-              case "contact":
-                accessory.addService(Service.ContactSensor);
-                break;
-              case "occupancy":
-                accessory.addService(Service.OccupancySensor);
-                break;
-              default:
-                accessory.addService(Service.MotionSensor);
-                break;
+          device.tags.zyx_info[parseInt(switchNumber) - 1].buttonName.forEach(
+            button => {
+              let rfData;
+              Object.entries(button).forEach(
+                ([k, v]) =>
+                  (rfData = {
+                    rfChan: k,
+                    name: v,
+                  })
+              );
+              accessory.context.rfChls[rfData.rfChan] = rfData.name;
+              mAccessory.context.rfChlMap[rfData.rfChan] = switchNumber;
+              switch (accessory.context.sensorType) {
+                case "button":
+                  accessory.addService(
+                    Service.Switch,
+                    rfData.name,
+                    "switch" + rfData.rfChan
+                  );
+                  break;
+                case "water":
+                  accessory.addService(Service.LeakSensor);
+                  break;
+                case "fire":
+                case "smoke":
+                  accessory.addService(Service.SmokeSensor);
+                  break;
+                case "co":
+                  accessory.addService(Service.CarbonMonoxideSensor);
+                  break;
+                case "co2":
+                  accessory.addService(Service.CarbonDioxideSensor);
+                  break;
+                case "contact":
+                  accessory.addService(Service.ContactSensor);
+                  break;
+                case "occupancy":
+                  accessory.addService(Service.OccupancySensor);
+                  break;
+                default:
+                  accessory.addService(Service.MotionSensor);
+                  break;
+              }
+              this.devicesInHB.set(mAccessory.context.hbDeviceId, mAccessory);
             }
-            this.devicesInHB.set(mAccessory.context.hbDeviceId, mAccessory);
-          });
+          );
           break;
         case "zb_sub": //*** credit @tasict ***\\
           accessory.addService(Service.BatteryService);
@@ -459,14 +596,20 @@ class eWeLink {
               accessory.addService(Service.ContactSensor);
               break;
             default:
-              throw "unsupported zigbee device type [" + device.extra.uiid + "]. Please create an issue on GitHub";
+              throw (
+                "unsupported zigbee device type [" +
+                device.extra.uiid +
+                "]. Please create an issue on GitHub"
+              );
           }
           break;
         default:
           throw "device is not supported by this plugin. Please create an issue on GitHub";
       }
       this.devicesInHB.set(hbDeviceId, accessory);
-      this.api.registerPlatformAccessories("homebridge-ewelink", "eWeLink", [accessory]);
+      this.api.registerPlatformAccessories("homebridge-ewelink", "eWeLink", [
+        accessory,
+      ]);
       this.configureAccessory(accessory);
       this.log("[%s] has been added to Homebridge.", newDeviceName);
     } catch (err) {
@@ -484,16 +627,34 @@ class eWeLink {
             accessory
               .getService("Valve " + v)
               .getCharacteristic(Characteristic.Active)
-              .on("set", (value, callback) => this.internalValveUpdate(accessory, "Valve " + v, value, callback));
+              .on("set", (value, callback) =>
+                this.internalValveUpdate(
+                  accessory,
+                  "Valve " + v,
+                  value,
+                  callback
+                )
+              );
             accessory
               .getService("Valve " + v)
               .getCharacteristic(Characteristic.SetDuration)
               .on("set", (value, callback) => {
-                if (accessory.getService("Valve " + v).getCharacteristic(Characteristic.InUse).value) {
-                  accessory.getService("Valve " + v).updateCharacteristic(Characteristic.RemainingDuration, value);
+                if (
+                  accessory
+                    .getService("Valve " + v)
+                    .getCharacteristic(Characteristic.InUse).value
+                ) {
+                  accessory
+                    .getService("Valve " + v)
+                    .updateCharacteristic(
+                      Characteristic.RemainingDuration,
+                      value
+                    );
                   clearTimeout(accessory.getService("Valve " + v).timer);
                   accessory.getService("Valve " + v).timer = setTimeout(() => {
-                    accessory.getService("Valve " + v).setCharacteristic(Characteristic.Active, 0);
+                    accessory
+                      .getService("Valve " + v)
+                      .setCharacteristic(Characteristic.Active, 0);
                   }, value * 1000);
                 }
                 callback();
@@ -504,7 +665,9 @@ class eWeLink {
           accessory
             .getService(Service.WindowCovering)
             .getCharacteristic(Characteristic.TargetPosition)
-            .on("set", (value, callback) => this.internalBlindUpdate(accessory, value, callback))
+            .on("set", (value, callback) =>
+              this.internalBlindUpdate(accessory, value, callback)
+            )
             .setProps({
               minStep: 100,
             });
@@ -513,37 +676,49 @@ class eWeLink {
           accessory
             .getService(Service.GarageDoorOpener)
             .getCharacteristic(Characteristic.TargetDoorState)
-            .on("set", (value, callback) => this.internalGarageUpdate(accessory, value, callback));
+            .on("set", (value, callback) =>
+              this.internalGarageUpdate(accessory, value, callback)
+            );
           break;
         case "lock":
           accessory
             .getService(Service.LockMechanism)
             .getCharacteristic(Characteristic.LockTargetState)
-            .on("set", (value, callback) => this.internalLockUpdate(accessory, value, callback));
+            .on("set", (value, callback) =>
+              this.internalLockUpdate(accessory, value, callback)
+            );
           break;
         case "fan":
           accessory
             .getService(Service.Fanv2)
             .getCharacteristic(Characteristic.Active)
-            .on("set", (value, callback) => this.internalFanUpdate(accessory, "power", value, callback));
+            .on("set", (value, callback) =>
+              this.internalFanUpdate(accessory, "power", value, callback)
+            );
           accessory
             .getService(Service.Fanv2)
             .getCharacteristic(Characteristic.RotationSpeed)
-            .on("set", (value, callback) => this.internalFanUpdate(accessory, "speed", value, callback))
+            .on("set", (value, callback) =>
+              this.internalFanUpdate(accessory, "speed", value, callback)
+            )
             .setProps({
               minStep: 33,
             });
           accessory
             .getService(Service.Lightbulb)
             .getCharacteristic(Characteristic.On)
-            .on("set", (value, callback) => this.internalFanUpdate(accessory, "light", value, callback));
+            .on("set", (value, callback) =>
+              this.internalFanUpdate(accessory, "light", value, callback)
+            );
           break;
         case "thermostat":
           if (!this.config.hideTHSwitch) {
             accessory
               .getService(Service.Switch)
               .getCharacteristic(Characteristic.On)
-              .on("set", (value, callback) => this.internalThermostatUpdate(accessory, value, callback));
+              .on("set", (value, callback) =>
+                this.internalThermostatUpdate(accessory, value, callback)
+              );
           }
           accessory.log = this.log;
           accessory.eveLogger = new EveHistoryService("weather", accessory, {
@@ -554,13 +729,16 @@ class eWeLink {
           corrInterval.setCorrectingInterval(() => {
             let dataToAdd = {
               time: Date.now(),
-              temp: accessory.getService(Service.TemperatureSensor).getCharacteristic(Characteristic.CurrentTemperature)
-                .value,
+              temp: accessory
+                .getService(Service.TemperatureSensor)
+                .getCharacteristic(Characteristic.CurrentTemperature).value,
             };
             if (accessory.getService(Service.HumiditySensor)) {
               dataToAdd.humidity = accessory
                 .getService(Service.HumiditySensor)
-                .getCharacteristic(Characteristic.CurrentRelativeHumidity).value;
+                .getCharacteristic(
+                  Characteristic.CurrentRelativeHumidity
+                ).value;
             }
             accessory.eveLogger.addEntry(dataToAdd);
           }, 300000);
@@ -569,7 +747,9 @@ class eWeLink {
           accessory
             .getService(Service.Outlet)
             .getCharacteristic(Characteristic.On)
-            .on("set", (value, callback) => this.internalOutletUpdate(accessory, value, callback));
+            .on("set", (value, callback) =>
+              this.internalOutletUpdate(accessory, value, callback)
+            );
           accessory.log = this.log;
           accessory.eveLogger = new EveHistoryService("energy", accessory, {
             storage: "fs",
@@ -588,10 +768,15 @@ class eWeLink {
             };
           }
           corrInterval.setCorrectingInterval(() => {
-            let isOn = accessory.getService(Service.Outlet).getCharacteristic(Characteristic.On).value,
+            let isOn = accessory
+                .getService(Service.Outlet)
+                .getCharacteristic(Characteristic.On).value,
               currentWatt = isOn
-                ? accessory.getService(Service.Outlet).getCharacteristic(EveService.Characteristics.CurrentConsumption)
-                    .value
+                ? accessory
+                    .getService(Service.Outlet)
+                    .getCharacteristic(
+                      EveService.Characteristics.CurrentConsumption
+                    ).value
                 : 0;
             if (accessory.eveLogger.isHistoryLoaded()) {
               accessory.context.extraPersistedData = accessory.eveLogger.getExtraPersistedData();
@@ -605,7 +790,9 @@ class eWeLink {
                   lastReset: accessory.context.extraPersistedData.lastReset,
                 });
               } else {
-                accessory.context.totalEnergy = accessory.context.totalEnergyTemp + (currentWatt * 10) / 3600 / 1000;
+                accessory.context.totalEnergy =
+                  accessory.context.totalEnergyTemp +
+                  (currentWatt * 10) / 3600 / 1000;
                 accessory.eveLogger.setExtraPersistedData({
                   totalenergy: accessory.context.totalEnergy,
                   lastReset: 0,
@@ -613,7 +800,8 @@ class eWeLink {
               }
               accessory.context.totalEnergytemp = 0;
             } else {
-              accessory.context.totalEnergyTemp += (currentWatt * 10) / 3600 / 1000;
+              accessory.context.totalEnergyTemp +=
+                (currentWatt * 10) / 3600 / 1000;
               accessory.context.totalEnergy = accessory.context.totalEnergyTemp;
             }
             accessory.eveLogger.addEntry({
@@ -627,7 +815,8 @@ class eWeLink {
             .on("get", callback => {
               accessory.context.extraPersistedData = accessory.eveLogger.getExtraPersistedData();
               if (accessory.context.extraPersistedData !== undefined) {
-                accessory.context.totalEnergy = accessory.context.extraPersistedData.totalPower;
+                accessory.context.totalEnergy =
+                  accessory.context.extraPersistedData.totalPower;
               }
               callback(null, accessory.context.totalEnergy);
             });
@@ -646,7 +835,8 @@ class eWeLink {
             .on("get", callback => {
               accessory.context.extraPersistedData = accessory.eveLogger.getExtraPersistedData();
               if (accessory.context.extraPersistedData !== undefined) {
-                accessory.context.lastReset = accessory.context.extraPersistedData.lastReset;
+                accessory.context.lastReset =
+                  accessory.context.extraPersistedData.lastReset;
               }
               callback(null, accessory.context.lastReset);
             });
@@ -655,26 +845,36 @@ class eWeLink {
           accessory
             .getService(Service.Outlet)
             .getCharacteristic(Characteristic.On)
-            .on("set", (value, callback) => this.internalUSBUpdate(accessory, value, callback));
+            .on("set", (value, callback) =>
+              this.internalUSBUpdate(accessory, value, callback)
+            );
           break;
         case "scm":
           accessory
             .getService(Service.Switch)
             .getCharacteristic(Characteristic.On)
-            .on("set", (value, callback) => this.internalSCMUpdate(accessory, value, callback));
+            .on("set", (value, callback) =>
+              this.internalSCMUpdate(accessory, value, callback)
+            );
           break;
         case "light":
           accessory
             .getService(Service.Lightbulb)
             .getCharacteristic(Characteristic.On)
-            .on("set", (value, callback) => this.internalLightbulbUpdate(accessory, value, callback));
+            .on("set", (value, callback) =>
+              this.internalLightbulbUpdate(accessory, value, callback)
+            );
           if (cns.devicesBrightable.includes(accessory.context.eweUIID)) {
             accessory
               .getService(Service.Lightbulb)
               .getCharacteristic(Characteristic.Brightness)
               .on("set", (value, callback) => {
                 if (value > 0) {
-                  if (!accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On).value) {
+                  if (
+                    !accessory
+                      .getService(Service.Lightbulb)
+                      .getCharacteristic(Characteristic.On).value
+                  ) {
                     this.internalLightbulbUpdate(accessory, true, function () {
                       return;
                     });
@@ -684,13 +884,19 @@ class eWeLink {
                   this.internalLightbulbUpdate(accessory, false, callback);
                 }
               });
-          } else if (cns.devicesColourable.includes(accessory.context.eweUIID)) {
+          } else if (
+            cns.devicesColourable.includes(accessory.context.eweUIID)
+          ) {
             accessory
               .getService(Service.Lightbulb)
               .getCharacteristic(Characteristic.Brightness)
               .on("set", (value, callback) => {
                 if (value > 0) {
-                  if (!accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On).value) {
+                  if (
+                    !accessory
+                      .getService(Service.Lightbulb)
+                      .getCharacteristic(Characteristic.On).value
+                  ) {
                     this.internalLightbulbUpdate(accessory, true, function () {
                       return;
                     });
@@ -703,7 +909,9 @@ class eWeLink {
             accessory
               .getService(Service.Lightbulb)
               .getCharacteristic(Characteristic.Hue)
-              .on("set", (value, callback) => this.internalHSBUpdate(accessory, "hue", value, callback));
+              .on("set", (value, callback) =>
+                this.internalHSBUpdate(accessory, "hue", value, callback)
+              );
             accessory
               .getService(Service.Lightbulb)
               .getCharacteristic(Characteristic.Saturation)
@@ -714,18 +922,24 @@ class eWeLink {
           accessory
             .getService(Service.Switch)
             .getCharacteristic(Characteristic.On)
-            .on("set", (value, callback) => this.internalSwitchUpdate(accessory, value, callback));
+            .on("set", (value, callback) =>
+              this.internalSwitchUpdate(accessory, value, callback)
+            );
           break;
         case "rf_sub":
           accessory.context.rfChls = accessory.context.rfChls || {};
           if (accessory.context.sensorType === "button") {
             Object.entries(accessory.context.rfChls).forEach(([k, v]) => {
-              accessory.getService(v).updateCharacteristic(Characteristic.On, false);
+              accessory
+                .getService(v)
+                .updateCharacteristic(Characteristic.On, false);
               accessory
                 .getService(v)
                 .getCharacteristic(Characteristic.On)
                 .on("set", (value, callback) => {
-                  value ? this.internalRFDeviceUpdate(accessory, k, callback) : callback();
+                  value
+                    ? this.internalRFDeviceUpdate(accessory, k, callback)
+                    : callback();
                 });
             });
           }
@@ -746,7 +960,8 @@ class eWeLink {
                   .getCharacteristic(Characteristic.CurrentTemperature).value,
                 humidity: accessory
                   .getService(Service.HumiditySensor)
-                  .getCharacteristic(Characteristic.CurrentRelativeHumidity).value,
+                  .getCharacteristic(Characteristic.CurrentRelativeHumidity)
+                  .value,
               };
               accessory.eveLogger.addEntry(dataToAdd);
             }, 300000);
@@ -755,61 +970,95 @@ class eWeLink {
       }
       this.devicesInHB.set(accessory.context.hbDeviceId, accessory);
     } catch (err) {
-      this.log.warn("[%s] could not be refreshed as %s.", accessory.displayName, err);
+      this.log.warn(
+        "[%s] could not be refreshed as %s.",
+        accessory.displayName,
+        err
+      );
     }
   }
   refreshAccessory(accessory, newParams) {
     switch (accessory.context.type) {
       case "valve":
-        if (Object.keys(newParams).some(v => cns.devicesValveParams.includes(v)) && Array.isArray(newParams.switches)) {
+        if (
+          Object.keys(newParams).some(v =>
+            cns.devicesValveParams.includes(v)
+          ) &&
+          Array.isArray(newParams.switches)
+        ) {
           this.externalValveUpdate(accessory, newParams);
         }
         return true;
       case "blind":
-        if (Object.keys(newParams).some(v => cns.devicesBlindParams.includes(v)) && Array.isArray(newParams.switches)) {
+        if (
+          Object.keys(newParams).some(v =>
+            cns.devicesBlindParams.includes(v)
+          ) &&
+          Array.isArray(newParams.switches)
+        ) {
           this.externalBlindUpdate(accessory, newParams);
         }
         return true;
       case "garage":
         if (
-          Object.keys(newParams).some(v => cns.devicesGarageParams.includes(v)) &&
+          Object.keys(newParams).some(v =>
+            cns.devicesGarageParams.includes(v)
+          ) &&
           Array.isArray(newParams.switches)
         ) {
           this.externalGarageUpdate(accessory, newParams);
         }
         return true;
       case "lock":
-        if (Object.keys(newParams).some(v => cns.devicesLockParams.includes(v))) {
+        if (
+          Object.keys(newParams).some(v => cns.devicesLockParams.includes(v))
+        ) {
           this.externalLockUpdate(accessory, newParams);
         }
         return true;
       case "sensor":
-        if (Object.keys(newParams).some(v => cns.devicesSensorParams.includes(v))) {
+        if (
+          Object.keys(newParams).some(v => cns.devicesSensorParams.includes(v))
+        ) {
           this.externalSensorUpdate(accessory, newParams);
         }
         return true;
       case "fan":
-        if (Object.keys(newParams).some(v => cns.devicesFanParams.includes(v))) {
+        if (
+          Object.keys(newParams).some(v => cns.devicesFanParams.includes(v))
+        ) {
           this.externalFanUpdate(accessory, newParams);
         }
         return true;
       case "thermostat":
-        if (Object.keys(newParams).some(v => cns.devicesThermostatParams.includes(v))) {
+        if (
+          Object.keys(newParams).some(v =>
+            cns.devicesThermostatParams.includes(v)
+          )
+        ) {
           this.externalThermostatUpdate(accessory, newParams);
         }
         return true;
       case "outlet":
-        if (Object.keys(newParams).some(v => cns.devicesOutletParams.includes(v))) {
+        if (
+          Object.keys(newParams).some(v => cns.devicesOutletParams.includes(v))
+        ) {
           this.externalOutletUpdate(accessory, newParams);
         }
         return true;
       case "usb":
-        if (Object.keys(newParams).some(v => cns.devicesUSBParams.includes(v)) && Array.isArray(newParams.switches)) {
+        if (
+          Object.keys(newParams).some(v => cns.devicesUSBParams.includes(v)) &&
+          Array.isArray(newParams.switches)
+        ) {
           this.externalUSBUpdate(accessory, newParams);
         }
         return true;
       case "scm":
-        if (Object.keys(newParams).some(v => cns.devicesSCMParams.includes(v)) && Array.isArray(newParams.switches)) {
+        if (
+          Object.keys(newParams).some(v => cns.devicesSCMParams.includes(v)) &&
+          Array.isArray(newParams.switches)
+        ) {
           this.externalSCMUpdate(accessory, newParams);
         }
         return true;
@@ -818,7 +1067,11 @@ class eWeLink {
           cns.devicesSingleSwitch.includes(accessory.context.eweUIID) &&
           cns.devicesSingleSwitchLight.includes(accessory.context.eweModel)
         ) {
-          if (Object.keys(newParams).some(v => cns.devicesSingleSwitchLightParams.includes(v))) {
+          if (
+            Object.keys(newParams).some(v =>
+              cns.devicesSingleSwitchLightParams.includes(v)
+            )
+          ) {
             this.externalSingleLightUpdate(accessory, newParams);
           }
         } else if (
@@ -826,7 +1079,9 @@ class eWeLink {
           cns.devicesMultiSwitchLight.includes(accessory.context.eweModel)
         ) {
           if (
-            Object.keys(newParams).some(v => cns.devicesMultiSwitchLightParams.includes(v)) &&
+            Object.keys(newParams).some(v =>
+              cns.devicesMultiSwitchLightParams.includes(v)
+            ) &&
             Array.isArray(newParams.switches)
           ) {
             this.externalMultiLightUpdate(accessory, newParams);
@@ -835,12 +1090,18 @@ class eWeLink {
         return true;
       case "switch":
         if (cns.devicesSingleSwitch.includes(accessory.context.eweUIID)) {
-          if (Object.keys(newParams).some(v => cns.devicesSingleSwitchParams.includes(v))) {
+          if (
+            Object.keys(newParams).some(v =>
+              cns.devicesSingleSwitchParams.includes(v)
+            )
+          ) {
             this.externalSingleSwitchUpdate(accessory, newParams);
           }
         } else if (cns.devicesMultiSwitch.includes(accessory.context.eweUIID)) {
           if (
-            Object.keys(newParams).some(v => cns.devicesMultiSwitchParams.includes(v)) &&
+            Object.keys(newParams).some(v =>
+              cns.devicesMultiSwitchParams.includes(v)
+            ) &&
             Array.isArray(newParams.switches)
           ) {
             this.externalMultiSwitchUpdate(accessory, newParams);
@@ -848,7 +1109,11 @@ class eWeLink {
         }
         return true;
       case "rf_pri":
-        if (Object.keys(newParams).some(v => cns.devicesRFBridgeParams.includes(v))) {
+        if (
+          Object.keys(newParams).some(v =>
+            cns.devicesRFBridgeParams.includes(v)
+          )
+        ) {
           this.externalRFDeviceUpdate(accessory, newParams);
         }
         return true;
@@ -856,7 +1121,11 @@ class eWeLink {
       case "zb_pri":
         return true;
       case "zb_sub":
-        if (Object.keys(newParams).some(v => cns.devicesZBBridgeParams.includes(v))) {
+        if (
+          Object.keys(newParams).some(v =>
+            cns.devicesZBBridgeParams.includes(v)
+          )
+        ) {
           this.externalZBDeviceUpdate(accessory, newParams);
         }
         return true;
@@ -867,10 +1136,16 @@ class eWeLink {
   removeAccessory(accessory) {
     try {
       this.devicesInHB.delete(accessory.context.hbDeviceId);
-      this.api.unregisterPlatformAccessories("homebridge-ewelink", "eWeLink", [accessory]);
+      this.api.unregisterPlatformAccessories("homebridge-ewelink", "eWeLink", [
+        accessory,
+      ]);
       this.log("[%s] has been removed from Homebridge.", accessory.displayName);
     } catch (err) {
-      this.log.warn("[%s] needed to be removed but couldn't as %s.", accessory.displayName, err);
+      this.log.warn(
+        "[%s] needed to be removed but couldn't as %s.",
+        accessory.displayName,
+        err
+      );
     }
   }
   sendDeviceUpdate(accessory, params, callback) {
@@ -884,11 +1159,17 @@ class eWeLink {
         this.wsClient.sendUpdate(payload);
         callback();
       } else {
-        this.log.error("[%s] could not be updated as it appears to be offline.", accessory.displayName);
+        this.log.error(
+          "[%s] could not be updated as it appears to be offline.",
+          accessory.displayName
+        );
         callback("Device has failed to update");
       }
     };
-    if (cns.devicesNonLAN.includes(accessory.context.eweUIID) || !accessory.context.reachableLAN) {
+    if (
+      cns.devicesNonLAN.includes(accessory.context.eweUIID) ||
+      !accessory.context.reachableLAN
+    ) {
       sendViaWS();
     } else {
       this.lanClient
@@ -896,7 +1177,11 @@ class eWeLink {
         .then(() => callback())
         .catch(err => {
           if (this.debug) {
-            this.log.warn("[%s] Reverting to web socket as %s.", accessory.displayName, err);
+            this.log.warn(
+              "[%s] Reverting to web socket as %s.",
+              accessory.displayName,
+              err
+            );
           }
           sendViaWS();
         });
@@ -907,7 +1192,9 @@ class eWeLink {
     switch (device.action) {
       case "sysmsg":
         if (
-          (accessory = this.devicesInHB.get(device.deviceid + "SWX") || this.devicesInHB.get(device.deviceid + "SW0"))
+          (accessory =
+            this.devicesInHB.get(device.deviceid + "SWX") ||
+            this.devicesInHB.get(device.deviceid + "SW0"))
         ) {
           let isX = accessory.context.hbDeviceId.substr(-1) === "X";
           if (device.params.updateSource === "WS") {
@@ -919,17 +1206,23 @@ class eWeLink {
                 accessory.context.reachableWAN ? "online" : "offline"
               );
               this.devicesInHB.set(accessory.context.hbDeviceId, accessory);
-              if (accessory.context.reachableWAN) this.wsClient.requestUpdate(accessory);
+              if (accessory.context.reachableWAN)
+                this.wsClient.requestUpdate(accessory);
             } else {
               if (this.debug) {
-                this.log("[%s] Nothing to update from above WS message.", accessory.displayName);
+                this.log(
+                  "[%s] Nothing to update from above WS message.",
+                  accessory.displayName
+                );
               }
             }
           }
           if (!isX) {
             for (let i = 1; i <= accessory.context.channelCount; i++) {
               if (this.devicesInHB.has(device.deviceid + "SW" + i)) {
-                let oAccessory = this.devicesInHB.get(device.deviceid + "SW" + i);
+                let oAccessory = this.devicesInHB.get(
+                  device.deviceid + "SW" + i
+                );
                 oAccessory.context.reachableWAN = device.params.online;
                 this.devicesInHB.set(oAccessory.context.hbDeviceId, oAccessory);
               }
@@ -939,15 +1232,29 @@ class eWeLink {
         break;
       case "update":
         if (
-          (accessory = this.devicesInHB.get(device.deviceid + "SWX") || this.devicesInHB.get(device.deviceid + "SW0"))
+          (accessory =
+            this.devicesInHB.get(device.deviceid + "SWX") ||
+            this.devicesInHB.get(device.deviceid + "SW0"))
         ) {
-          if (device.params.updateSource === "WS" && !accessory.context.reachableWAN) {
+          if (
+            device.params.updateSource === "WS" &&
+            !accessory.context.reachableWAN
+          ) {
             accessory.context.reachableWAN = true;
-            this.log("[%s] has been reported [online] via [WS].", accessory.displayName);
+            this.log(
+              "[%s] has been reported [online] via [WS].",
+              accessory.displayName
+            );
           }
-          if (device.params.updateSource === "LAN" && !accessory.context.reachableLAN) {
+          if (
+            device.params.updateSource === "LAN" &&
+            !accessory.context.reachableLAN
+          ) {
             accessory.context.reachableLAN = true;
-            this.log("[%s] has been reported [online] via [LAN].", accessory.displayName);
+            this.log(
+              "[%s] has been reported [online] via [LAN].",
+              accessory.displayName
+            );
           }
           if (this.debug) {
             this.log(
@@ -988,27 +1295,41 @@ class eWeLink {
         .updateCharacteristic(Characteristic.InUse, value);
       switch (value) {
         case 0:
-          accessory.getService(valve).updateCharacteristic(Characteristic.RemainingDuration, 0);
+          accessory
+            .getService(valve)
+            .updateCharacteristic(Characteristic.RemainingDuration, 0);
           clearTimeout(accessory.getService(valve).timer);
           break;
         case 1:
-          let timer = accessory.getService(valve).getCharacteristic(Characteristic.SetDuration).value;
-          accessory.getService(valve).updateCharacteristic(Characteristic.RemainingDuration, timer);
+          let timer = accessory
+            .getService(valve)
+            .getCharacteristic(Characteristic.SetDuration).value;
+          accessory
+            .getService(valve)
+            .updateCharacteristic(Characteristic.RemainingDuration, timer);
           accessory.getService(valve).timer = setTimeout(() => {
-            accessory.getService(valve).setCharacteristic(Characteristic.Active, 0);
+            accessory
+              .getService(valve)
+              .setCharacteristic(Characteristic.Active, 0);
           }, timer * 1000);
           break;
       }
-      params.switches = this.devicesInEwe.get(accessory.context.eweDeviceId).params.switches;
+      params.switches = this.devicesInEwe.get(
+        accessory.context.eweDeviceId
+      ).params.switches;
       switch (valve) {
         case "Valve A":
           params.switches[0].switch = value ? "on" : "off";
-          params.switches[1].switch = accessory.getService("Valve B").getCharacteristic(Characteristic.Active).value
+          params.switches[1].switch = accessory
+            .getService("Valve B")
+            .getCharacteristic(Characteristic.Active).value
             ? "on"
             : "off";
           break;
         case "Valve B":
-          params.switches[0].switch = accessory.getService("Valve A").getCharacteristic(Characteristic.Active).value
+          params.switches[0].switch = accessory
+            .getService("Valve A")
+            .getCharacteristic(Characteristic.Active).value
             ? "on"
             : "off";
           params.switches[1].switch = value ? "on" : "off";
@@ -1020,7 +1341,8 @@ class eWeLink {
       params.switches[3].switch = "off";
       this.sendDeviceUpdate(accessory, params, callback);
     } catch (err) {
-      let str = "[" + accessory.displayName + "] could not be updated as " + err + ".";
+      let str =
+        "[" + accessory.displayName + "] could not be updated as " + err + ".";
       this.log.error(str);
       callback(str);
     }
@@ -1034,13 +1356,18 @@ class eWeLink {
       if (!(blindConfig = this.cusG.get(accessory.context.hbDeviceId))) {
         throw "group config missing";
       }
-      if (blindConfig.type !== "blind" || !["oneSwitch", "twoSwitch"].includes(blindConfig.setup)) {
+      if (
+        blindConfig.type !== "blind" ||
+        !["oneSwitch", "twoSwitch"].includes(blindConfig.setup)
+      ) {
         throw "improper configuration";
       }
       let oldPos,
         params = {};
       value = value >= 50 ? 100 : 0;
-      oldPos = accessory.getService(Service.WindowCovering).getCharacteristic(Characteristic.PositionState).value;
+      oldPos = accessory
+        .getService(Service.WindowCovering)
+        .getCharacteristic(Characteristic.PositionState).value;
       if (value === oldPos * 100) {
         accessory
           .getService(Service.WindowCovering)
@@ -1054,7 +1381,9 @@ class eWeLink {
           params.switch = "on";
           break;
         case "twoSwitch":
-          params.switches = this.devicesInEwe.get(accessory.context.eweDeviceId).params.switches;
+          params.switches = this.devicesInEwe.get(
+            accessory.context.eweDeviceId
+          ).params.switches;
           params.switches[0].switch = value === 100 ? "on" : "off";
           params.switches[1].switch = value === 0 ? "on" : "off";
           break;
@@ -1074,7 +1403,8 @@ class eWeLink {
         callback();
       }, parseInt(blindConfig.operationTime) * 100);
     } catch (err) {
-      let str = "[" + accessory.displayName + "] could not be updated as " + err + ".";
+      let str =
+        "[" + accessory.displayName + "] could not be updated as " + err + ".";
       this.log.error(str);
       callback(str);
     }
@@ -1088,7 +1418,10 @@ class eWeLink {
       if (!(garageConfig = this.cusG.get(accessory.context.hbDeviceId))) {
         throw "group config missing";
       }
-      if (garageConfig.type !== "garage" || !["oneSwitch", "twoSwitch"].includes(garageConfig.setup)) {
+      if (
+        garageConfig.type !== "garage" ||
+        !["oneSwitch", "twoSwitch"].includes(garageConfig.setup)
+      ) {
         throw "improper configuration";
       }
       accessory.context.inUse = true;
@@ -1099,17 +1432,24 @@ class eWeLink {
         newPos = value,
         params = {},
         delay = 0;
-      if (sensorDefinition && !(sAccessory = this.devicesInHB.get(garageConfig.sensorId + "SWX"))) {
+      if (
+        sensorDefinition &&
+        !(sAccessory = this.devicesInHB.get(garageConfig.sensorId + "SWX"))
+      ) {
         throw "defined DW2 sensor doesn't exist";
       }
       if (sAccessory.context.type !== "sensor") {
         throw "defined DW2 sensor isn't a sensor";
       }
       oldPos = sAccessory
-        ? sAccessory.getService(Service.ContactSensor).getCharacteristic(Characteristic.ContactSensorState).value === 0
+        ? sAccessory
+            .getService(Service.ContactSensor)
+            .getCharacteristic(Characteristic.ContactSensorState).value === 0
           ? 1
           : 0
-        : accessory.getService(Service.GarageDoorOpener).getCharacteristic(Characteristic.CurrentDoorState).value;
+        : accessory
+            .getService(Service.GarageDoorOpener)
+            .getCharacteristic(Characteristic.CurrentDoorState).value;
       if (newPos === oldPos % 2) {
         accessory.context.inUse = false;
         callback();
@@ -1118,7 +1458,10 @@ class eWeLink {
       if (garageConfig.setup === "oneSwitch" && [2, 3].includes(oldPos)) {
         accessory
           .getService(Service.GarageDoorOpener)
-          .updateCharacteristic(Characteristic.CurrentDoorState, ((oldPos * 2) % 3) + 2);
+          .updateCharacteristic(
+            Characteristic.CurrentDoorState,
+            ((oldPos * 2) % 3) + 2
+          );
         delay = 1500;
       }
       setTimeout(() => {
@@ -1132,7 +1475,9 @@ class eWeLink {
               params.switch = "on";
               break;
             case "twoSwitch":
-              params.switches = this.devicesInEwe.get(accessory.context.eweDeviceId).params.switches;
+              params.switches = this.devicesInEwe.get(
+                accessory.context.eweDeviceId
+              ).params.switches;
               params.switches[0].switch = newPos === 0 ? "on" : "off";
               params.switches[1].switch = newPos === 1 ? "on" : "off";
               break;
@@ -1153,7 +1498,8 @@ class eWeLink {
       callback();
     } catch (err) {
       accessory.context.inUse = false;
-      let str = "[" + accessory.displayName + "] could not be updated as " + err + ".";
+      let str =
+        "[" + accessory.displayName + "] could not be updated as " + err + ".";
       this.log.error(str);
       callback(str);
     }
@@ -1188,7 +1534,8 @@ class eWeLink {
       }, parseInt(lockConfig.operationTime) * 100);
     } catch (err) {
       accessory.context.inUse = false;
-      let str = "[" + accessory.displayName + "] could not be updated as " + err + ".";
+      let str =
+        "[" + accessory.displayName + "] could not be updated as " + err + ".";
       this.log.error(str);
       callback(str);
     }
@@ -1203,31 +1550,45 @@ class eWeLink {
         case "power":
           newPower = value;
           newSpeed = value ? 33 : 0;
-          newLight = accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On).value;
+          newLight = accessory
+            .getService(Service.Lightbulb)
+            .getCharacteristic(Characteristic.On).value;
           break;
         case "speed":
           newPower = value >= 33 ? 1 : 0;
           newSpeed = value;
-          newLight = accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On).value;
+          newLight = accessory
+            .getService(Service.Lightbulb)
+            .getCharacteristic(Characteristic.On).value;
           break;
         case "light":
-          newPower = accessory.getService(Service.Fanv2).getCharacteristic(Characteristic.Active).value;
-          newSpeed = accessory.getService(Service.Fanv2).getCharacteristic(Characteristic.RotationSpeed).value;
+          newPower = accessory
+            .getService(Service.Fanv2)
+            .getCharacteristic(Characteristic.Active).value;
+          newSpeed = accessory
+            .getService(Service.Fanv2)
+            .getCharacteristic(Characteristic.RotationSpeed).value;
           newLight = value;
           break;
       }
-      accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, newLight);
+      accessory
+        .getService(Service.Lightbulb)
+        .updateCharacteristic(Characteristic.On, newLight);
       accessory
         .getService(Service.Fanv2)
         .updateCharacteristic(Characteristic.Active, newPower)
         .updateCharacteristic(Characteristic.RotationSpeed, newSpeed);
       let params = {
-        switches: this.devicesInEwe.get(accessory.context.eweDeviceId).params.switches,
+        switches: this.devicesInEwe.get(accessory.context.eweDeviceId).params
+          .switches,
       };
       params.switches[0].switch = newLight ? "on" : "off";
-      params.switches[1].switch = newPower === 1 && newSpeed >= 33 ? "on" : "off";
-      params.switches[2].switch = newPower === 1 && newSpeed >= 66 && newSpeed < 99 ? "on" : "off";
-      params.switches[3].switch = newPower === 1 && newSpeed >= 99 ? "on" : "off";
+      params.switches[1].switch =
+        newPower === 1 && newSpeed >= 33 ? "on" : "off";
+      params.switches[2].switch =
+        newPower === 1 && newSpeed >= 66 && newSpeed < 99 ? "on" : "off";
+      params.switches[3].switch =
+        newPower === 1 && newSpeed >= 99 ? "on" : "off";
       if (this.debug) {
         this.log.warn("Fan Update - setting " + type + " to " + value);
         this.log(
@@ -1240,7 +1601,8 @@ class eWeLink {
       }
       this.sendDeviceUpdate(accessory, params, callback);
     } catch (err) {
-      let str = "[" + accessory.displayName + "] could not be updated as " + err + ".";
+      let str =
+        "[" + accessory.displayName + "] could not be updated as " + err + ".";
       this.log.error(str);
       callback(str);
     }
@@ -1255,12 +1617,19 @@ class eWeLink {
         mainSwitch: value ? "on" : "off",
       };
       if (this.debug) {
-        this.log("[%s] updating to turn [%s].", accessory.displayName, value ? "on" : "off");
+        this.log(
+          "[%s] updating to turn [%s].",
+          accessory.displayName,
+          value ? "on" : "off"
+        );
       }
-      accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, value);
+      accessory
+        .getService(Service.Switch)
+        .updateCharacteristic(Characteristic.On, value);
       this.sendDeviceUpdate(accessory, params, callback);
     } catch (err) {
-      let str = "[" + accessory.displayName + "] could not be updated as " + err + ".";
+      let str =
+        "[" + accessory.displayName + "] could not be updated as " + err + ".";
       this.log.error(str);
       callback(str);
     }
@@ -1274,9 +1643,15 @@ class eWeLink {
         switch: value ? "on" : "off",
       };
       if (this.debug) {
-        this.log("[%s] requesting to turn [%s].", accessory.displayName, value ? "on" : "off");
+        this.log(
+          "[%s] requesting to turn [%s].",
+          accessory.displayName,
+          value ? "on" : "off"
+        );
       }
-      accessory.getService(Service.Outlet).updateCharacteristic(Characteristic.On, value);
+      accessory
+        .getService(Service.Outlet)
+        .updateCharacteristic(Characteristic.On, value);
       this.sendDeviceUpdate(accessory, params, callback);
     } catch (err) {
       callback("[" + accessory.displayName + "] " + err + ".");
@@ -1288,13 +1663,20 @@ class eWeLink {
         throw "it is currently offline";
       }
       let params = {
-        switches: this.devicesInEwe.get(accessory.context.eweDeviceId).params.switches,
+        switches: this.devicesInEwe.get(accessory.context.eweDeviceId).params
+          .switches,
       };
       params.switches[0].switch = value ? "on" : "off";
       if (this.debug) {
-        this.log("[%s] requesting to turn [%s].", accessory.displayName, value ? "on" : "off");
+        this.log(
+          "[%s] requesting to turn [%s].",
+          accessory.displayName,
+          value ? "on" : "off"
+        );
       }
-      accessory.getService(Service.Outlet).updateCharacteristic(Characteristic.On, value);
+      accessory
+        .getService(Service.Outlet)
+        .updateCharacteristic(Characteristic.On, value);
       this.sendDeviceUpdate(accessory, params, callback);
     } catch (err) {
       callback("[" + accessory.displayName + "] " + err + ".");
@@ -1306,13 +1688,20 @@ class eWeLink {
         throw "it is currently offline";
       }
       let params = {
-        switches: this.devicesInEwe.get(accessory.context.eweDeviceId).params.switches,
+        switches: this.devicesInEwe.get(accessory.context.eweDeviceId).params
+          .switches,
       };
       params.switches[0].switch = value ? "on" : "off";
       if (this.debug) {
-        this.log("[%s] requesting to turn [%s].", accessory.displayName, value ? "on" : "off");
+        this.log(
+          "[%s] requesting to turn [%s].",
+          accessory.displayName,
+          value ? "on" : "off"
+        );
       }
-      accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, value);
+      accessory
+        .getService(Service.Switch)
+        .updateCharacteristic(Characteristic.On, value);
       this.sendDeviceUpdate(accessory, params, callback);
     } catch (err) {
       callback("[" + accessory.displayName + "] " + err + ".");
@@ -1334,24 +1723,44 @@ class eWeLink {
             params.switch = value ? "on" : "off";
           }
           if (this.debug) {
-            this.log("[%s] updating to turn [%s].", accessory.displayName, value ? "on" : "off");
+            this.log(
+              "[%s] updating to turn [%s].",
+              accessory.displayName,
+              value ? "on" : "off"
+            );
           }
-          accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, value);
+          accessory
+            .getService(Service.Lightbulb)
+            .updateCharacteristic(Characteristic.On, value);
           break;
         case "0":
-          params.switches = this.devicesInEwe.get(accessory.context.eweDeviceId).params.switches;
+          params.switches = this.devicesInEwe.get(
+            accessory.context.eweDeviceId
+          ).params.switches;
           params.switches[0].switch = value ? "on" : "off";
           params.switches[1].switch = value ? "on" : "off";
           params.switches[2].switch = value ? "on" : "off";
           params.switches[3].switch = value ? "on" : "off";
           if (this.debug) {
-            this.log("[%s] updating to turn group [%s].", accessory.displayName, value ? "on" : "off");
+            this.log(
+              "[%s] updating to turn group [%s].",
+              accessory.displayName,
+              value ? "on" : "off"
+            );
           }
-          accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, value);
+          accessory
+            .getService(Service.Lightbulb)
+            .updateCharacteristic(Characteristic.On, value);
           for (let i = 1; i <= 4; i++) {
-            if (this.devicesInHB.has(accessory.context.eweDeviceId + "SW" + i)) {
-              oAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW" + i);
-              oAccessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, value);
+            if (
+              this.devicesInHB.has(accessory.context.eweDeviceId + "SW" + i)
+            ) {
+              oAccessory = this.devicesInHB.get(
+                accessory.context.eweDeviceId + "SW" + i
+              );
+              oAccessory
+                .getService(Service.Lightbulb)
+                .updateCharacteristic(Characteristic.On, value);
             }
           }
           break;
@@ -1360,14 +1769,26 @@ class eWeLink {
         case "3":
         case "4":
           if (this.debug) {
-            this.log("[%s] updating to turn [%s].", accessory.displayName, value ? "on" : "off");
+            this.log(
+              "[%s] updating to turn [%s].",
+              accessory.displayName,
+              value ? "on" : "off"
+            );
           }
-          accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, value);
+          accessory
+            .getService(Service.Lightbulb)
+            .updateCharacteristic(Characteristic.On, value);
           let tAccessory,
             masterState = "off";
-          params.switches = this.devicesInEwe.get(accessory.context.eweDeviceId).params.switches;
+          params.switches = this.devicesInEwe.get(
+            accessory.context.eweDeviceId
+          ).params.switches;
           for (let i = 1; i <= 4; i++) {
-            if ((tAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW" + i))) {
+            if (
+              (tAccessory = this.devicesInHB.get(
+                accessory.context.eweDeviceId + "SW" + i
+              ))
+            ) {
               i === parseInt(accessory.context.switchNumber)
                 ? (params.switches[i - 1].switch = value ? "on" : "off")
                 : (params.switches[i - 1].switch = tAccessory
@@ -1375,22 +1796,33 @@ class eWeLink {
                     .getCharacteristic(Characteristic.On).value
                     ? "on"
                     : "off");
-              if (tAccessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On).value) {
+              if (
+                tAccessory
+                  .getService(Service.Lightbulb)
+                  .getCharacteristic(Characteristic.On).value
+              ) {
                 masterState = "on";
               }
             } else {
               params.switches[i - 1].switch = "off";
             }
           }
-          oAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW0");
-          oAccessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, masterState === "on");
+          oAccessory = this.devicesInHB.get(
+            accessory.context.eweDeviceId + "SW0"
+          );
+          oAccessory
+            .getService(Service.Lightbulb)
+            .updateCharacteristic(Characteristic.On, masterState === "on");
           break;
         default:
-          throw "unknown switch number [" + accessory.context.switchNumber + "]";
+          throw (
+            "unknown switch number [" + accessory.context.switchNumber + "]"
+          );
       }
       this.sendDeviceUpdate(accessory, params, callback);
     } catch (err) {
-      let str = "[" + accessory.displayName + "] could not be updated as " + err + ".";
+      let str =
+        "[" + accessory.displayName + "] could not be updated as " + err + ".";
       this.log.error(str);
       callback(str);
     }
@@ -1403,9 +1835,15 @@ class eWeLink {
       let params = {};
       if (value === 0) {
         params.switch = "off";
-        accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, false);
+        accessory
+          .getService(Service.Lightbulb)
+          .updateCharacteristic(Characteristic.On, false);
       } else {
-        if (!accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On).value) {
+        if (
+          !accessory
+            .getService(Service.Lightbulb)
+            .getCharacteristic(Characteristic.On).value
+        ) {
           params.switch = "on";
         }
         switch (accessory.context.eweUIID) {
@@ -1419,14 +1857,21 @@ class eWeLink {
           default:
             throw "unknown device UIID";
         }
-        accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.Brightness, value);
+        accessory
+          .getService(Service.Lightbulb)
+          .updateCharacteristic(Characteristic.Brightness, value);
       }
       if (this.debug) {
-        this.log("[%s] updating brightness to [%s%].", accessory.displayName, value);
+        this.log(
+          "[%s] updating brightness to [%s%].",
+          accessory.displayName,
+          value
+        );
       }
       setTimeout(() => this.sendDeviceUpdate(accessory, params, callback), 250);
     } catch (err) {
-      let str = "[" + accessory.displayName + "] could not be updated as " + err + ".";
+      let str =
+        "[" + accessory.displayName + "] could not be updated as " + err + ".";
       this.log.error(str);
       callback(str);
     }
@@ -1438,8 +1883,12 @@ class eWeLink {
       }
       let newRGB,
         params = {},
-        curHue = accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.Hue).value,
-        curSat = accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.Saturation).value;
+        curHue = accessory
+          .getService(Service.Lightbulb)
+          .getCharacteristic(Characteristic.Hue).value,
+        curSat = accessory
+          .getService(Service.Lightbulb)
+          .getCharacteristic(Characteristic.Saturation).value;
       switch (type) {
         case "hue":
           newRGB = convert.hsv.rgb(value, curSat, 100);
@@ -1467,9 +1916,15 @@ class eWeLink {
               throw "unknown device UIID";
           }
           if (this.debug) {
-            this.log("[%s] updating hue to [%s°].", accessory.displayName, value);
+            this.log(
+              "[%s] updating hue to [%s°].",
+              accessory.displayName,
+              value
+            );
           }
-          accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.Hue, value);
+          accessory
+            .getService(Service.Lightbulb)
+            .updateCharacteristic(Characteristic.Hue, value);
           break;
         case "bri":
           switch (accessory.context.eweUIID) {
@@ -1493,16 +1948,23 @@ class eWeLink {
               break;
           }
           if (this.debug) {
-            this.log("[%s] updating brightness to [%s%].", accessory.displayName, value);
+            this.log(
+              "[%s] updating brightness to [%s%].",
+              accessory.displayName,
+              value
+            );
           }
-          accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.Brightness, value);
+          accessory
+            .getService(Service.Lightbulb)
+            .updateCharacteristic(Characteristic.Brightness, value);
           break;
         default:
           throw "unknown device UIID";
       }
       setTimeout(() => this.sendDeviceUpdate(accessory, params, callback), 250);
     } catch (err) {
-      let str = "[" + accessory.displayName + "] could not be updated as " + err + ".";
+      let str =
+        "[" + accessory.displayName + "] could not be updated as " + err + ".";
       this.log.error(str);
       callback(str);
     }
@@ -1518,24 +1980,44 @@ class eWeLink {
         case "X":
           params.switch = value ? "on" : "off";
           if (this.debug) {
-            this.log("[%s] updating to turn [%s].", accessory.displayName, value ? "on" : "off");
+            this.log(
+              "[%s] updating to turn [%s].",
+              accessory.displayName,
+              value ? "on" : "off"
+            );
           }
-          accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, value);
+          accessory
+            .getService(Service.Switch)
+            .updateCharacteristic(Characteristic.On, value);
           break;
         case "0":
-          params.switches = this.devicesInEwe.get(accessory.context.eweDeviceId).params.switches;
+          params.switches = this.devicesInEwe.get(
+            accessory.context.eweDeviceId
+          ).params.switches;
           params.switches[0].switch = value ? "on" : "off";
           params.switches[1].switch = value ? "on" : "off";
           params.switches[2].switch = value ? "on" : "off";
           params.switches[3].switch = value ? "on" : "off";
           if (this.debug) {
-            this.log("[%s] updating to turn group [%s].", accessory.displayName, value ? "on" : "off");
+            this.log(
+              "[%s] updating to turn group [%s].",
+              accessory.displayName,
+              value ? "on" : "off"
+            );
           }
-          accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, value);
+          accessory
+            .getService(Service.Switch)
+            .updateCharacteristic(Characteristic.On, value);
           for (let i = 1; i <= 4; i++) {
-            if (this.devicesInHB.has(accessory.context.eweDeviceId + "SW" + i)) {
-              oAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW" + i);
-              oAccessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, value);
+            if (
+              this.devicesInHB.has(accessory.context.eweDeviceId + "SW" + i)
+            ) {
+              oAccessory = this.devicesInHB.get(
+                accessory.context.eweDeviceId + "SW" + i
+              );
+              oAccessory
+                .getService(Service.Switch)
+                .updateCharacteristic(Characteristic.On, value);
             }
           }
           break;
@@ -1544,14 +2026,26 @@ class eWeLink {
         case "3":
         case "4":
           if (this.debug) {
-            this.log("[%s] updating to turn [%s].", accessory.displayName, value ? "on" : "off");
+            this.log(
+              "[%s] updating to turn [%s].",
+              accessory.displayName,
+              value ? "on" : "off"
+            );
           }
-          accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, value);
+          accessory
+            .getService(Service.Switch)
+            .updateCharacteristic(Characteristic.On, value);
           let tAccessory,
             masterState = "off";
-          params.switches = this.devicesInEwe.get(accessory.context.eweDeviceId).params.switches;
+          params.switches = this.devicesInEwe.get(
+            accessory.context.eweDeviceId
+          ).params.switches;
           for (let i = 1; i <= 4; i++) {
-            if ((tAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW" + i))) {
+            if (
+              (tAccessory = this.devicesInHB.get(
+                accessory.context.eweDeviceId + "SW" + i
+              ))
+            ) {
               i === parseInt(accessory.context.switchNumber)
                 ? (params.switches[i - 1].switch = value ? "on" : "off")
                 : (params.switches[i - 1].switch = tAccessory
@@ -1559,22 +2053,33 @@ class eWeLink {
                     .getCharacteristic(Characteristic.On).value
                     ? "on"
                     : "off");
-              if (tAccessory.getService(Service.Switch).getCharacteristic(Characteristic.On).value) {
+              if (
+                tAccessory
+                  .getService(Service.Switch)
+                  .getCharacteristic(Characteristic.On).value
+              ) {
                 masterState = "on";
               }
             } else {
               params.switches[i - 1].switch = "off";
             }
           }
-          oAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW0");
-          oAccessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, masterState === "on");
+          oAccessory = this.devicesInHB.get(
+            accessory.context.eweDeviceId + "SW0"
+          );
+          oAccessory
+            .getService(Service.Switch)
+            .updateCharacteristic(Characteristic.On, masterState === "on");
           break;
         default:
-          throw "unknown switch number [" + accessory.context.switchNumber + "]";
+          throw (
+            "unknown switch number [" + accessory.context.switchNumber + "]"
+          );
       }
       this.sendDeviceUpdate(accessory, params, callback);
     } catch (err) {
-      let str = "[" + accessory.displayName + "] could not be updated as " + err + ".";
+      let str =
+        "[" + accessory.displayName + "] could not be updated as " + err + ".";
       this.log.error(str);
       callback(str);
     }
@@ -1590,16 +2095,32 @@ class eWeLink {
         rfChl,
       };
       if (this.debug) {
-        this.log("[%s %s] mimicking RF button press.", accessory.displayName, accessory.context.rfChls[rfChl]);
+        this.log(
+          "[%s %s] mimicking RF button press.",
+          accessory.displayName,
+          accessory.context.rfChls[rfChl]
+        );
       }
-      accessory.getService(accessory.context.rfChls[rfChl]).updateCharacteristic(Characteristic.On, true);
+      accessory
+        .getService(accessory.context.rfChls[rfChl])
+        .updateCharacteristic(Characteristic.On, true);
       this.sendDeviceUpdate(accessory, params, callback);
       setTimeout(
-        () => accessory.getService(accessory.context.rfChls[rfChl]).updateCharacteristic(Characteristic.On, false),
+        () =>
+          accessory
+            .getService(accessory.context.rfChls[rfChl])
+            .updateCharacteristic(Characteristic.On, false),
         3000
       );
     } catch (err) {
-      let str = "[" + accessory.displayName + " " + name + "] could not be updated as " + err + ".";
+      let str =
+        "[" +
+        accessory.displayName +
+        " " +
+        name +
+        "] could not be updated as " +
+        err +
+        ".";
       this.log.error(str);
       callback(str);
     }
@@ -1609,21 +2130,39 @@ class eWeLink {
       ["A", "B"].forEach((v, k) => {
         accessory
           .getService("Valve " + v)
-          .updateCharacteristic(Characteristic.Active, params.switches[k].switch === "on")
-          .updateCharacteristic(Characteristic.InUse, params.switches[k].switch === "on");
+          .updateCharacteristic(
+            Characteristic.Active,
+            params.switches[k].switch === "on"
+          )
+          .updateCharacteristic(
+            Characteristic.InUse,
+            params.switches[k].switch === "on"
+          );
         if (params.switches[k].switch === "on") {
-          let timer = accessory.getService("Valve " + v).getCharacteristic(Characteristic.SetDuration).value;
-          accessory.getService("Valve " + v).updateCharacteristic(Characteristic.RemainingDuration, timer);
+          let timer = accessory
+            .getService("Valve " + v)
+            .getCharacteristic(Characteristic.SetDuration).value;
+          accessory
+            .getService("Valve " + v)
+            .updateCharacteristic(Characteristic.RemainingDuration, timer);
           accessory.getService("Valve " + v).timer = setTimeout(() => {
-            accessory.getService("Valve " + v).setCharacteristic(Characteristic.Active, 0);
+            accessory
+              .getService("Valve " + v)
+              .setCharacteristic(Characteristic.Active, 0);
           }, timer * 1000);
         } else {
-          accessory.getService("Valve " + v).updateCharacteristic(Characteristic.RemainingDuration, 0);
+          accessory
+            .getService("Valve " + v)
+            .updateCharacteristic(Characteristic.RemainingDuration, 0);
           clearTimeout(accessory.getService("Valve " + v).timer);
         }
       });
     } catch (err) {
-      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+      this.log.warn(
+        "[%s] could not be updated as %s.",
+        accessory.displayName,
+        err
+      );
     }
   }
   externalBlindUpdate(accessory, params) {
@@ -1632,7 +2171,10 @@ class eWeLink {
       if (!(blindConfig = this.cusG.get(accessory.context.hbDeviceId))) {
         throw "group config missing";
       }
-      if (blindConfig.type !== "blind" || ["oneSwitch", "twoSwitch"].includes(blindConfig.setup)) {
+      if (
+        blindConfig.type !== "blind" ||
+        ["oneSwitch", "twoSwitch"].includes(blindConfig.setup)
+      ) {
         throw "improper configuration";
       }
       switch (blindConfig.setup) {
@@ -1641,12 +2183,17 @@ class eWeLink {
             return;
           }
           nSte =
-            accessory.getService(Service.WindowCovering).getCharacteristic(Characteristic.PositionState).value === 0
+            accessory
+              .getService(Service.WindowCovering)
+              .getCharacteristic(Characteristic.PositionState).value === 0
               ? 1
               : 0;
           break;
         case "twoSwitch":
-          if (params.switches[0].switch === "off" && params.switches[1].switch === "off") {
+          if (
+            params.switches[0].switch === "off" &&
+            params.switches[1].switch === "off"
+          ) {
             return;
           }
           let switchUp = params.switches[0].switch === "on" ? -1 : 0, // matrix of numbers to get
@@ -1665,19 +2212,27 @@ class eWeLink {
           .updateCharacteristic(Characteristic.CurrentPosition, nSte * 100);
       }, parseInt(blindConfig.operationTime) * 100);
     } catch (err) {
-      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+      this.log.warn(
+        "[%s] could not be updated as %s.",
+        accessory.displayName,
+        err
+      );
     }
   }
   externalGarageUpdate(accessory, params) {
     try {
       let garageConfig,
-        oldPos = accessory.getService(Service.GarageDoorOpener).getCharacteristic(Characteristic.CurrentDoorState)
-          .value,
+        oldPos = accessory
+          .getService(Service.GarageDoorOpener)
+          .getCharacteristic(Characteristic.CurrentDoorState).value,
         newPos = [0, 2].includes(oldPos) ? 3 : 2;
       if (!(garageConfig = this.cusG.get(accessory.context.hbDeviceId))) {
         throw "group config missing";
       }
-      if (garageConfig.type !== "garage" || !["oneSwitch", "twoSwitch"].includes(garageConfig.setup)) {
+      if (
+        garageConfig.type !== "garage" ||
+        !["oneSwitch", "twoSwitch"].includes(garageConfig.setup)
+      ) {
         throw "improper configuration";
       }
       if (accessory.context.inUse || garageConfig.sensorId) {
@@ -1690,7 +2245,10 @@ class eWeLink {
           }
           break;
         case "twoSwitch":
-          if (params.switches[0].switch === params.switches[1].switch || params.switches[oldPos % 2].switch === "on") {
+          if (
+            params.switches[0].switch === params.switches[1].switch ||
+            params.switches[oldPos % 2].switch === "on"
+          ) {
             return;
           }
           break;
@@ -1712,7 +2270,11 @@ class eWeLink {
       }, parseInt(garageConfig.operationTime) * 100);
     } catch (err) {
       accessory.context.inUse = false;
-      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+      this.log.warn(
+        "[%s] could not be updated as %s.",
+        accessory.displayName,
+        err
+      );
     }
   }
   externalLockUpdate(accessory, params) {
@@ -1741,22 +2303,39 @@ class eWeLink {
       }, parseInt(lockConfig.operationTime) * 100);
     } catch (err) {
       accessory.context.inUse = false;
-      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+      this.log.warn(
+        "[%s] could not be updated as %s.",
+        accessory.displayName,
+        err
+      );
     }
   }
   externalSensorUpdate(accessory, params) {
     try {
-      let newState = params.switch === "on" ? 1 : 0,
-        oAccessory = false;
-      accessory.getService(Service.ContactSensor).updateCharacteristic(Characteristic.ContactSensorState, newState);
       if (params.hasOwnProperty("battery")) {
         let batteryService =
-          accessory.getService(Service.BatteryService) || accessory.addService(Service.BatteryService);
-        batteryService.updateCharacteristic(Characteristic.BatteryLevel, params.battery);
-        batteryService.updateCharacteristic(Characteristic.StatusLowBattery, params.battery <= 25);
+            accessory.getService(Service.BatteryService) ||
+            accessory.addService(Service.BatteryService),
+          scaledBattery = Math.round(params.battery * 33.3);
+        batteryService.updateCharacteristic(
+          Characteristic.BatteryLevel,
+          scaledBattery
+        );
+        batteryService.updateCharacteristic(
+          Characteristic.StatusLowBattery,
+          scaledBattery < 25
+        );
       }
+      let newState = params.switch === "on" ? 1 : 0,
+        oAccessory = false;
+      accessory
+        .getService(Service.ContactSensor)
+        .updateCharacteristic(Characteristic.ContactSensorState, newState);
       this.cusG.forEach(group => {
-        if (group.sensorId === accessory.context.eweDeviceId && group.type === "garage") {
+        if (
+          group.sensorId === accessory.context.eweDeviceId &&
+          group.type === "garage"
+        ) {
           if ((oAccessory = this.devicesInHB.get(group.deviceId + "SWX"))) {
             switch (newState) {
               case 0:
@@ -1780,7 +2359,11 @@ class eWeLink {
         }
       });
     } catch (err) {
-      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+      this.log.warn(
+        "[%s] could not be updated as %s.",
+        accessory.displayName,
+        err
+      );
     }
   }
   externalFanUpdate(accessory, params) {
@@ -1788,7 +2371,11 @@ class eWeLink {
       let light, status, speed;
       if (Array.isArray(params.switches)) {
         light = params.switches[0].switch === "on";
-        switch (params.switches[1].switch + params.switches[2].switch + params.switches[3].switch) {
+        switch (
+          params.switches[1].switch +
+          params.switches[2].switch +
+          params.switches[3].switch
+        ) {
           default:
             status = 0;
             speed = 0;
@@ -1805,65 +2392,109 @@ class eWeLink {
             status = 1;
             speed = 99;
         }
-      } else if (params.hasOwnProperty("light") && params.hasOwnProperty("fan") && params.hasOwnProperty("speed")) {
+      } else if (
+        params.hasOwnProperty("light") &&
+        params.hasOwnProperty("fan") &&
+        params.hasOwnProperty("speed")
+      ) {
         light = params.light === "on";
         status = params.fan === "on" ? 1 : 0;
         speed = params.speed * 33 * status;
       } else {
         throw "unknown parameters received";
       }
-      accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, light);
+      accessory
+        .getService(Service.Lightbulb)
+        .updateCharacteristic(Characteristic.On, light);
       accessory
         .getService(Service.Fanv2)
         .updateCharacteristic(Characteristic.Active, status)
         .updateCharacteristic(Characteristic.RotationSpeed, speed);
     } catch (err) {
-      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+      this.log.warn(
+        "[%s] could not be updated as %s.",
+        accessory.displayName,
+        err
+      );
     }
   }
   externalThermostatUpdate(accessory, params) {
     try {
-      if (!this.config.hideTHSwitch && (params.hasOwnProperty("switch") || params.hasOwnProperty("mainSwitch"))) {
-        let newState = params.hasOwnProperty("switch") ? params.switch === "on" : params.mainSwitch === "on";
-        accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, newState);
+      if (
+        !this.config.hideTHSwitch &&
+        (params.hasOwnProperty("switch") || params.hasOwnProperty("mainSwitch"))
+      ) {
+        let newState = params.hasOwnProperty("switch")
+          ? params.switch === "on"
+          : params.mainSwitch === "on";
+        accessory
+          .getService(Service.Switch)
+          .updateCharacteristic(Characteristic.On, newState);
       }
       let eveLog = {
         time: Date.now(),
       };
-      if (params.hasOwnProperty("currentTemperature") && accessory.getService(Service.TemperatureSensor)) {
-        let currentTemp = params.currentTemperature !== "unavailable" ? params.currentTemperature : 0;
+      if (
+        params.hasOwnProperty("currentTemperature") &&
+        accessory.getService(Service.TemperatureSensor)
+      ) {
+        let currentTemp =
+          params.currentTemperature !== "unavailable"
+            ? params.currentTemperature
+            : 0;
         accessory
           .getService(Service.TemperatureSensor)
           .updateCharacteristic(Characteristic.CurrentTemperature, currentTemp);
         eveLog.temp = parseFloat(currentTemp);
       }
-      if (params.hasOwnProperty("currentHumidity") && accessory.getService(Service.HumiditySensor)) {
-        let currentHumi = params.currentHumidity !== "unavailable" ? params.currentHumidity : 0;
+      if (
+        params.hasOwnProperty("currentHumidity") &&
+        accessory.getService(Service.HumiditySensor)
+      ) {
+        let currentHumi =
+          params.currentHumidity !== "unavailable" ? params.currentHumidity : 0;
         accessory
           .getService(Service.HumiditySensor)
-          .updateCharacteristic(Characteristic.CurrentRelativeHumidity, currentHumi);
+          .updateCharacteristic(
+            Characteristic.CurrentRelativeHumidity,
+            currentHumi
+          );
         eveLog.humidity = parseFloat(currentHumi);
       }
       if (eveLog.hasOwnProperty("temp") || eveLog.hasOwnProperty("humidity")) {
         accessory.eveLogger.addEntry(eveLog);
       }
     } catch (err) {
-      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+      this.log.warn(
+        "[%s] could not be updated as %s.",
+        accessory.displayName,
+        err
+      );
     }
   }
   externalOutletUpdate(accessory, params) {
     try {
       if (params.hasOwnProperty("switch")) {
-        accessory.getService(Service.Outlet).updateCharacteristic(Characteristic.On, params.switch === "on");
+        accessory
+          .getService(Service.Outlet)
+          .updateCharacteristic(Characteristic.On, params.switch === "on");
       }
       if (params.hasOwnProperty("power")) {
         accessory
           .getService(Service.Outlet)
-          .updateCharacteristic(EveService.Characteristics.CurrentConsumption, parseFloat(params.power));
+          .updateCharacteristic(
+            EveService.Characteristics.CurrentConsumption,
+            parseFloat(params.power)
+          );
         accessory
           .getService(Service.Outlet)
-          .updateCharacteristic(Characteristic.OutletInUse, parseFloat(params.power) > 0);
-        let isOn = accessory.getService(Service.Outlet).getCharacteristic(Characteristic.On).value;
+          .updateCharacteristic(
+            Characteristic.OutletInUse,
+            parseFloat(params.power) > 0
+          );
+        let isOn = accessory
+          .getService(Service.Outlet)
+          .getCharacteristic(Characteristic.On).value;
         accessory.eveLogger.addEntry({
           time: Date.now(),
           power: isOn ? parseFloat(params.power) : 0,
@@ -1872,29 +2503,57 @@ class eWeLink {
       if (params.hasOwnProperty("voltage")) {
         accessory
           .getService(Service.Outlet)
-          .updateCharacteristic(EveService.Characteristics.Voltage, parseFloat(params.voltage));
+          .updateCharacteristic(
+            EveService.Characteristics.Voltage,
+            parseFloat(params.voltage)
+          );
       }
       if (params.hasOwnProperty("current")) {
         accessory
           .getService(Service.Outlet)
-          .updateCharacteristic(EveService.Characteristics.ElectricCurrent, parseFloat(params.current));
+          .updateCharacteristic(
+            EveService.Characteristics.ElectricCurrent,
+            parseFloat(params.current)
+          );
       }
     } catch (err) {
-      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+      this.log.warn(
+        "[%s] could not be updated as %s.",
+        accessory.displayName,
+        err
+      );
     }
   }
   externalUSBUpdate(accessory, params) {
     try {
-      accessory.getService(Service.Outlet).updateCharacteristic(Characteristic.On, params.switches[0].switch === "on");
+      accessory
+        .getService(Service.Outlet)
+        .updateCharacteristic(
+          Characteristic.On,
+          params.switches[0].switch === "on"
+        );
     } catch (err) {
-      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+      this.log.warn(
+        "[%s] could not be updated as %s.",
+        accessory.displayName,
+        err
+      );
     }
   }
   externalSCMUpdate(accessory, params) {
     try {
-      accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, params.switches[0].switch === "on");
+      accessory
+        .getService(Service.Switch)
+        .updateCharacteristic(
+          Characteristic.On,
+          params.switches[0].switch === "on"
+        );
     } catch (err) {
-      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+      this.log.warn(
+        "[%s] could not be updated as %s.",
+        accessory.displayName,
+        err
+      );
     }
   }
   externalSingleLightUpdate(accessory, params) {
@@ -1904,37 +2563,54 @@ class eWeLink {
         isOn = false;
       if (accessory.context.eweUIID === 22 && params.hasOwnProperty("state")) {
         isOn = params.state === "on";
-      } else if (accessory.context.eweUIID !== 22 && params.hasOwnProperty("switch")) {
+      } else if (
+        accessory.context.eweUIID !== 22 &&
+        params.hasOwnProperty("switch")
+      ) {
         isOn = params.switch === "on";
       } else {
-        isOn = accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On).value;
+        isOn = accessory
+          .getService(Service.Lightbulb)
+          .getCharacteristic(Characteristic.On).value;
       }
       if (isOn) {
-        accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, true);
+        accessory
+          .getService(Service.Lightbulb)
+          .updateCharacteristic(Characteristic.On, true);
         switch (accessory.context.eweUIID) {
           case 36: // KING-M4
             if (params.hasOwnProperty("bright")) {
               let nb = Math.round(((params.bright - 10) * 10) / 9); // eWeLink scale is 10-100 and HomeKit scale is 0-100.
-              accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.Brightness, nb);
+              accessory
+                .getService(Service.Lightbulb)
+                .updateCharacteristic(Characteristic.Brightness, nb);
             }
             break;
           case 44: // D1
             if (params.hasOwnProperty("brightness")) {
               accessory
                 .getService(Service.Lightbulb)
-                .updateCharacteristic(Characteristic.Brightness, params.brightness);
+                .updateCharacteristic(
+                  Characteristic.Brightness,
+                  params.brightness
+                );
             }
             break;
           case 22: // B1
             if (params.hasOwnProperty("zyx_mode")) {
               mode = parseInt(params.zyx_mode);
-            } else if (params.hasOwnProperty("channel0") && parseInt(params.channel0) + parseInt(params.channel1) > 0) {
+            } else if (
+              params.hasOwnProperty("channel0") &&
+              parseInt(params.channel0) + parseInt(params.channel1) > 0
+            ) {
               mode = 1;
             } else {
               mode = 2;
             }
             if (mode === 2) {
-              accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, true);
+              accessory
+                .getService(Service.Lightbulb)
+                .updateCharacteristic(Characteristic.On, true);
               newColour = convert.rgb.hsv(
                 parseInt(params.channel2),
                 parseInt(params.channel3),
@@ -1951,10 +2627,16 @@ class eWeLink {
             break;
           case 59: // L1
             if (params.hasOwnProperty("bright")) {
-              accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.Brightness, params.bright);
+              accessory
+                .getService(Service.Lightbulb)
+                .updateCharacteristic(Characteristic.Brightness, params.bright);
             }
             if (params.hasOwnProperty("colorR")) {
-              newColour = convert.rgb.hsv(params.colorR, params.colorG, params.colorB);
+              newColour = convert.rgb.hsv(
+                params.colorR,
+                params.colorG,
+                params.colorB
+              );
               accessory
                 .getService(Service.Lightbulb)
                 .updateCharacteristic(Characteristic.Hue, newColour[0])
@@ -1965,10 +2647,16 @@ class eWeLink {
             return;
         }
       } else {
-        accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, false);
+        accessory
+          .getService(Service.Lightbulb)
+          .updateCharacteristic(Characteristic.On, false);
       }
     } catch (err) {
-      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+      this.log.warn(
+        "[%s] could not be updated as %s.",
+        accessory.displayName,
+        err
+      );
     }
   }
   externalMultiLightUpdate(accessory, params) {
@@ -1980,22 +2668,37 @@ class eWeLink {
           let oAccessory = this.devicesInHB.get(idToCheck + i);
           oAccessory
             .getService(Service.Lightbulb)
-            .updateCharacteristic(Characteristic.On, params.switches[i - 1].switch === "on");
+            .updateCharacteristic(
+              Characteristic.On,
+              params.switches[i - 1].switch === "on"
+            );
           if (params.switches[i - 1].switch === "on") {
             primaryState = true;
           }
         }
       }
-      accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, primaryState);
+      accessory
+        .getService(Service.Lightbulb)
+        .updateCharacteristic(Characteristic.On, primaryState);
     } catch (err) {
-      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+      this.log.warn(
+        "[%s] could not be updated as %s.",
+        accessory.displayName,
+        err
+      );
     }
   }
   externalSingleSwitchUpdate(accessory, params) {
     try {
-      accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, params.switch === "on");
+      accessory
+        .getService(Service.Switch)
+        .updateCharacteristic(Characteristic.On, params.switch === "on");
     } catch (err) {
-      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+      this.log.warn(
+        "[%s] could not be updated as %s.",
+        accessory.displayName,
+        err
+      );
     }
   }
   externalMultiSwitchUpdate(accessory, params) {
@@ -2007,15 +2710,24 @@ class eWeLink {
           let oAccessory = this.devicesInHB.get(idToCheck + i);
           oAccessory
             .getService(Service.Switch)
-            .updateCharacteristic(Characteristic.On, params.switches[i - 1].switch === "on");
+            .updateCharacteristic(
+              Characteristic.On,
+              params.switches[i - 1].switch === "on"
+            );
           if (params.switches[i - 1].switch === "on") {
             primaryState = true;
           }
         }
       }
-      accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, primaryState);
+      accessory
+        .getService(Service.Switch)
+        .updateCharacteristic(Characteristic.On, primaryState);
     } catch (err) {
-      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+      this.log.warn(
+        "[%s] could not be updated as %s.",
+        accessory.displayName,
+        err
+      );
     }
   }
   externalRFDeviceUpdate(accessory, params) {
@@ -2023,14 +2735,26 @@ class eWeLink {
       if (!params.hasOwnProperty("updateSource")) return;
       let idToCheck = accessory.context.hbDeviceId.slice(0, -1),
         timeNow = new Date();
-      if (params.hasOwnProperty("cmd") && params.cmd === "transmit" && params.hasOwnProperty("rfChl")) {
+      if (
+        params.hasOwnProperty("cmd") &&
+        params.cmd === "transmit" &&
+        params.hasOwnProperty("rfChl")
+      ) {
         // RF Button
         let bAccessory;
-        if ((bAccessory = this.devicesInHB.get(idToCheck + accessory.context.rfChlMap[params.rfChl]))) {
-          bAccessory.getService(bAccessory.context.rfChls[params.rfChl]).updateCharacteristic(Characteristic.On, 1);
+        if (
+          (bAccessory = this.devicesInHB.get(
+            idToCheck + accessory.context.rfChlMap[params.rfChl]
+          ))
+        ) {
+          bAccessory
+            .getService(bAccessory.context.rfChls[params.rfChl])
+            .updateCharacteristic(Characteristic.On, 1);
           setTimeout(
             () =>
-              bAccessory.getService(bAccessory.context.rfChls[params.rfChl]).updateCharacteristic(Characteristic.On, 0),
+              bAccessory
+                .getService(bAccessory.context.rfChls[params.rfChl])
+                .updateCharacteristic(Characteristic.On, 0),
             3000
           );
         } else {
@@ -2052,78 +2776,124 @@ class eWeLink {
                   case "button":
                     break;
                   case "water":
-                    oAccessory.getService(Service.LeakSensor).updateCharacteristic(Characteristic.LeakDetected, 1);
+                    oAccessory
+                      .getService(Service.LeakSensor)
+                      .updateCharacteristic(Characteristic.LeakDetected, 1);
                     setTimeout(() => {
-                      oAccessory.getService(Service.LeakSensor).updateCharacteristic(Characteristic.LeakDetected, 0);
+                      oAccessory
+                        .getService(Service.LeakSensor)
+                        .updateCharacteristic(Characteristic.LeakDetected, 0);
                     }, (this.config.sensorTimeLength || 2) * 1000);
                     break;
                   case "fire":
                   case "smoke":
-                    oAccessory.getService(Service.SmokeSensor).updateCharacteristic(Characteristic.SmokeDetected, 1);
+                    oAccessory
+                      .getService(Service.SmokeSensor)
+                      .updateCharacteristic(Characteristic.SmokeDetected, 1);
                     setTimeout(() => {
-                      oAccessory.getService(Service.SmokeSensor).updateCharacteristic(Characteristic.SmokeDetected, 0);
+                      oAccessory
+                        .getService(Service.SmokeSensor)
+                        .updateCharacteristic(Characteristic.SmokeDetected, 0);
                     }, (this.config.sensorTimeLength || 2) * 1000);
                     break;
                   case "co":
                     oAccessory
                       .getService(Service.CarbonMonoxideSensor)
-                      .updateCharacteristic(Characteristic.CarbonMonoxideDetected, 1);
+                      .updateCharacteristic(
+                        Characteristic.CarbonMonoxideDetected,
+                        1
+                      );
                     setTimeout(() => {
                       oAccessory
                         .getService(Service.CarbonMonoxideSensor)
-                        .updateCharacteristic(Characteristic.CarbonMonoxideDetected, 0);
+                        .updateCharacteristic(
+                          Characteristic.CarbonMonoxideDetected,
+                          0
+                        );
                     }, (this.config.sensorTimeLength || 2) * 1000);
                     break;
                   case "co2":
                     oAccessory
                       .getService(Service.CarbonDioxideSensor)
-                      .updateCharacteristic(Characteristic.CarbonDioxideDetected, 1);
+                      .updateCharacteristic(
+                        Characteristic.CarbonDioxideDetected,
+                        1
+                      );
                     setTimeout(() => {
                       oAccessory
                         .getService(Service.CarbonDioxideSensor)
-                        .updateCharacteristic(Characteristic.CarbonDioxideDetected, 0);
+                        .updateCharacteristic(
+                          Characteristic.CarbonDioxideDetected,
+                          0
+                        );
                     }, (this.config.sensorTimeLength || 2) * 1000);
                     break;
                   case "contact":
                     oAccessory
                       .getService(Service.ContactSensor)
-                      .updateCharacteristic(Characteristic.ContactSensorState, 1);
+                      .updateCharacteristic(
+                        Characteristic.ContactSensorState,
+                        1
+                      );
                     setTimeout(() => {
                       oAccessory
                         .getService(Service.ContactSensor)
-                        .updateCharacteristic(Characteristic.ContactSensorState, 0);
+                        .updateCharacteristic(
+                          Characteristic.ContactSensorState,
+                          0
+                        );
                     }, (this.config.sensorTimeLength || 2) * 1000);
                     break;
                   case "occupancy":
                     oAccessory
                       .getService(Service.OccupancySensor)
-                      .updateCharacteristic(Characteristic.OccupancyDetected, 1);
+                      .updateCharacteristic(
+                        Characteristic.OccupancyDetected,
+                        1
+                      );
                     setTimeout(() => {
                       oAccessory
                         .getService(Service.OccupancySensor)
-                        .updateCharacteristic(Characteristic.OccupancyDetected, 0);
+                        .updateCharacteristic(
+                          Characteristic.OccupancyDetected,
+                          0
+                        );
                     }, (this.config.sensorTimeLength || 2) * 1000);
                     break;
                   default:
                     oAccessory
                       .getService(Service.MotionSensor)
-                      .updateCharacteristic(Characteristic.MotionDetected, true);
+                      .updateCharacteristic(
+                        Characteristic.MotionDetected,
+                        true
+                      );
                     setTimeout(() => {
                       oAccessory
                         .getService(Service.MotionSensor)
-                        .updateCharacteristic(Characteristic.MotionDetected, false);
+                        .updateCharacteristic(
+                          Characteristic.MotionDetected,
+                          false
+                        );
                     }, (this.config.sensorTimeLength || 2) * 1000);
                     break;
                 }
                 if (this.debug) {
-                  this.log("[%s] has detected [%s].", oAccessory.displayName, oAccessory.context.sensorType);
+                  this.log(
+                    "[%s] has detected [%s].",
+                    oAccessory.displayName,
+                    oAccessory.context.sensorType
+                  );
                 }
               }
             }
           });
       }
     } catch (err) {
-      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+      this.log.warn(
+        "[%s] could not be updated as %s.",
+        accessory.displayName,
+        err
+      );
     }
   }
   externalZBDeviceUpdate(accessory, params) {
@@ -2131,16 +2901,26 @@ class eWeLink {
       //*** credit @tasict ***\\
       if (params.hasOwnProperty("battery")) {
         let batteryService =
-          accessory.getService(Service.BatteryService) || accessory.addService(Service.BatteryService);
-        batteryService.updateCharacteristic(Characteristic.BatteryLevel, params.battery);
-        batteryService.updateCharacteristic(Characteristic.StatusLowBattery, params.battery <= 25);
+          accessory.getService(Service.BatteryService) ||
+          accessory.addService(Service.BatteryService);
+        batteryService.updateCharacteristic(
+          Characteristic.BatteryLevel,
+          params.battery
+        );
+        batteryService.updateCharacteristic(
+          Characteristic.StatusLowBattery,
+          params.battery < 25
+        );
       }
       switch (accessory.context.eweUIID) {
         case 1000:
           if (params.hasOwnProperty("key") && [0, 1, 2].includes(params.key)) {
             accessory
               .getService(Service.StatelessProgrammableSwitch)
-              .updateCharacteristic(Characteristic.ProgrammableSwitchEvent, params.key);
+              .updateCharacteristic(
+                Characteristic.ProgrammableSwitchEvent,
+                params.key
+              );
           }
           break;
         case 1770:
@@ -2151,22 +2931,34 @@ class eWeLink {
             let currentTemp = parseInt(params.temperature) / 100;
             accessory
               .getService(Service.TemperatureSensor)
-              .updateCharacteristic(Characteristic.CurrentTemperature, currentTemp);
+              .updateCharacteristic(
+                Characteristic.CurrentTemperature,
+                currentTemp
+              );
             eveLog.temp = parseFloat(currentTemp);
           }
           if (params.hasOwnProperty("humidity")) {
             let currentHumi = parseInt(params.humidity) / 100;
             accessory
               .getService(Service.HumiditySensor)
-              .updateCharacteristic(Characteristic.CurrentRelativeHumidity, currentHumi);
+              .updateCharacteristic(
+                Characteristic.CurrentRelativeHumidity,
+                currentHumi
+              );
             eveLog.humidity = parseFloat(currentHumi);
           }
-          if (eveLog.hasOwnProperty("temp") || eveLog.hasOwnProperty("humidity")) {
+          if (
+            eveLog.hasOwnProperty("temp") ||
+            eveLog.hasOwnProperty("humidity")
+          ) {
             accessory.eveLogger.addEntry(eveLog);
           }
           break;
         case 2026:
-          if (params.hasOwnProperty("motion") && params.hasOwnProperty("trigTime")) {
+          if (
+            params.hasOwnProperty("motion") &&
+            params.hasOwnProperty("trigTime")
+          ) {
             let timeNow = new Date(),
               diff = (timeNow.getTime() - params.trigTime) / 1000;
             accessory
@@ -2184,12 +2976,19 @@ class eWeLink {
           if (params.hasOwnProperty("lock") && [0, 1].includes(params.lock)) {
             accessory
               .getService(Service.ContactSensor)
-              .updateCharacteristic(Characteristic.ContactSensorState, params.lock);
+              .updateCharacteristic(
+                Characteristic.ContactSensorState,
+                params.lock
+              );
           }
           break;
       }
     } catch (err) {
-      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+      this.log.warn(
+        "[%s] could not be updated as %s.",
+        accessory.displayName,
+        err
+      );
     }
   }
 }
diff --git a/lib/eWeLinkHTTP.js b/lib/eWeLinkHTTP.js
index 57e12c2f..093bd0f2 100644
--- a/lib/eWeLinkHTTP.js
+++ b/lib/eWeLinkHTTP.js
@@ -12,7 +12,9 @@ module.exports = class eWeLinkHTTP {
   }
   login() {
     let data = {
-      countryCode: "+" + this.config.countryCode.toString().replace("+", "").replace(" ", ""),
+      countryCode:
+        "+" +
+        this.config.countryCode.toString().replace("+", "").replace(" ", ""),
       password: this.config.password,
     };
     this.config.username.includes("@")
@@ -22,11 +24,17 @@ module.exports = class eWeLinkHTTP {
       let msg = JSON.stringify(data, null, 2)
         .replace(this.config.password, "**hidden**")
         .replace(this.config.username, "**hidden**");
-      this.log.warn("Sending HTTP login request. This text is yellow for clarity.\n%s", msg);
+      this.log.warn(
+        "Sending HTTP login request. This text is yellow for clarity.\n%s",
+        msg
+      );
     } else if (this.debug) {
       this.log("Sending HTTP login request.");
     }
-    let dataToSign = crypto.createHmac("sha256", constants.appSecret).update(JSON.stringify(data)).digest("base64");
+    let dataToSign = crypto
+      .createHmac("sha256", constants.appSecret)
+      .update(JSON.stringify(data))
+      .digest("base64");
     return new Promise((resolve, reject) => {
       axios({
         url: "https://" + this.httpHost + "/v2/user/login",
@@ -88,7 +96,10 @@ module.exports = class eWeLinkHTTP {
   getHost() {
     let data = {
         appid: constants.appId,
-        country_code: this.config.countryCode.toString().replace("+", "").replace(" ", ""),
+        country_code: this.config.countryCode
+          .toString()
+          .replace("+", "")
+          .replace(" ", ""),
         nonce: Math.random().toString(36).substr(2, 8),
         ts: Math.floor(new Date().getTime() / 1000),
         version: 8,
@@ -108,7 +119,10 @@ module.exports = class eWeLinkHTTP {
         return kv.key + "=" + kv.value;
       })
       .join("&");
-    dataToSign = crypto.createHmac("sha256", "6Nz4n0xA8s8qdxQf2GqurZj2Fs55FUvM").update(dataToSign).digest("base64");
+    dataToSign = crypto
+      .createHmac("sha256", "6Nz4n0xA8s8qdxQf2GqurZj2Fs55FUvM")
+      .update(dataToSign)
+      .digest("base64");
     return new Promise((resolve, reject) => {
       axios
         .get("https://api.coolkit.cc:8080/api/user/region", {
@@ -121,7 +135,10 @@ module.exports = class eWeLinkHTTP {
         .then(res => {
           let body = res.data;
           if (!body.region) {
-            throw "Server did not respond with a region.\n" + JSON.stringify(body, null, 2);
+            throw (
+              "Server did not respond with a region.\n" +
+              JSON.stringify(body, null, 2)
+            );
           }
           switch (body.region) {
             case "eu":
@@ -159,12 +176,17 @@ module.exports = class eWeLinkHTTP {
         })
         .then(res => {
           let body = res.data;
-          if (!body.hasOwnProperty("error") || (body.hasOwnProperty("error") && body.error !== 0)) {
+          if (
+            !body.hasOwnProperty("error") ||
+            (body.hasOwnProperty("error") && body.error !== 0)
+          ) {
             throw JSON.stringify(body, null, 2);
           }
           let deviceList = [];
           if (body.data.thingList && body.data.thingList.length > 0) {
-            body.data.thingList.forEach(device => deviceList.push(device.itemData));
+            body.data.thingList.forEach(device =>
+              deviceList.push(device.itemData)
+            );
           }
           resolve(deviceList);
         })
diff --git a/lib/eWeLinkLAN.js b/lib/eWeLinkLAN.js
index 2bbbf005..25baee53 100644
--- a/lib/eWeLinkLAN.js
+++ b/lib/eWeLinkLAN.js
@@ -16,7 +16,9 @@ module.exports = class eWeLinkLAN {
       deviceMap.set(device.deviceid, {
         apiKey: device.devicekey,
         online: this.ipOverrides.hasOwnProperty(device.deviceid) ? true : false,
-        ip: this.ipOverrides.hasOwnProperty(device.deviceid) ? this.ipOverrides[device.deviceid] : null,
+        ip: this.ipOverrides.hasOwnProperty(device.deviceid)
+          ? this.ipOverrides[device.deviceid]
+          : null,
       });
     });
     this.deviceMap = deviceMap;
@@ -34,7 +36,9 @@ module.exports = class eWeLinkLAN {
           let onlineCount = 0;
           res.forEach(device => {
             let d,
-              deviceId = device.fqdn.replace("._ewelink._tcp.local", "").replace("eWeLink_", "");
+              deviceId = device.fqdn
+                .replace("._ewelink._tcp.local", "")
+                .replace("eWeLink_", "");
             if ((d = this.deviceMap.get(deviceId))) {
               if (!this.ipOverrides.hasOwnProperty(deviceId)) {
                 this.deviceMap.set(deviceId, {
@@ -71,29 +75,52 @@ module.exports = class eWeLinkLAN {
                 (rdata.hasOwnProperty("data2") ? rdata.data2 : "") +
                 (rdata.hasOwnProperty("data3") ? rdata.data3 : "") +
                 (rdata.hasOwnProperty("data4") ? rdata.data4 : ""),
-              key = crypto.createHash("md5").update(Buffer.from(deviceInfo.apiKey, "utf8")).digest(),
-              dText = crypto.createDecipheriv("aes-128-cbc", key, Buffer.from(rdata.iv, "base64")),
-              pText = Buffer.concat([dText.update(Buffer.from(data, "base64")), dText.final()]).toString("utf8"),
+              key = crypto
+                .createHash("md5")
+                .update(Buffer.from(deviceInfo.apiKey, "utf8"))
+                .digest(),
+              dText = crypto.createDecipheriv(
+                "aes-128-cbc",
+                key,
+                Buffer.from(rdata.iv, "base64")
+              ),
+              pText = Buffer.concat([
+                dText.update(Buffer.from(data, "base64")),
+                dText.final(),
+              ]).toString("utf8"),
               params;
-            if (packet.address !== deviceInfo.ip && !this.ipOverrides.hasOwnProperty(rdata.id)) {
+            if (
+              packet.address !== deviceInfo.ip &&
+              !this.ipOverrides.hasOwnProperty(rdata.id)
+            ) {
               this.deviceMap.set(rdata.id, {
                 apiKey: deviceInfo.apiKey,
                 online: true,
                 ip: packet.address,
               });
               if (this.debug) {
-                this.log.warn("[%s] updating IP address to [%s].", rdata.id, packet.address);
+                this.log.warn(
+                  "[%s] updating IP address to [%s].",
+                  rdata.id,
+                  packet.address
+                );
               }
             }
             try {
               params = JSON.parse(pText);
             } catch (e) {
-              this.log.warn("[%s] An error occured reading the LAN message [%s]", rdata.id, e);
+              this.log.warn(
+                "[%s] An error occured reading the LAN message [%s]",
+                rdata.id,
+                e
+              );
               return;
             }
             for (let param in params) {
               if (params.hasOwnProperty(param)) {
-                if (!constants.paramsToKeep.includes(param.replace(/[0-9]/g, ""))) {
+                if (
+                  !constants.paramsToKeep.includes(param.replace(/[0-9]/g, ""))
+                ) {
                   delete params[param];
                 }
               }
@@ -106,7 +133,10 @@ module.exports = class eWeLinkLAN {
                 params,
               };
               if (this.debugReqRes) {
-                let msg = JSON.stringify(returnTemplate, null, 2).replace(rdata.id, "**hidden**");
+                let msg = JSON.stringify(returnTemplate, null, 2).replace(
+                  rdata.id,
+                  "**hidden**"
+                );
                 this.log("LAN message received.\n%s", msg);
               } else if (this.debug) {
                 this.log("LAN message received.");
@@ -145,11 +175,17 @@ module.exports = class eWeLinkLAN {
         throw "plugin does not support lan mode for this device yet - feel free to create a github issue";
       }
       if ((apiKey = this.deviceMap.get(json.deviceid).apiKey)) {
-        let key = crypto.createHash("md5").update(Buffer.from(apiKey, "utf8")).digest(),
+        let key = crypto
+            .createHash("md5")
+            .update(Buffer.from(apiKey, "utf8"))
+            .digest(),
           iv = crypto.randomBytes(16),
           enc = crypto.createCipheriv("aes-128-cbc", key, iv),
           data = {
-            data: Buffer.concat([enc.update(JSON.stringify(params)), enc.final()]).toString("base64"),
+            data: Buffer.concat([
+              enc.update(JSON.stringify(params)),
+              enc.final(),
+            ]).toString("base64"),
             deviceid: json.deviceid,
             encrypt: true,
             iv: iv.toString("base64"),
@@ -161,13 +197,20 @@ module.exports = class eWeLinkLAN {
             .replace(json.apikey, "**hidden**")
             .replace(json.apikey, "**hidden**")
             .replace(json.deviceid, "**hidden**");
-          this.log.warn("LAN message sent. This text is yellow for clarity.\n%s", msg);
+          this.log.warn(
+            "LAN message sent. This text is yellow for clarity.\n%s",
+            msg
+          );
         } else if (this.debug) {
           this.log("LAN message sent.");
         }
         axios({
           method: "post",
-          url: "http://" + this.deviceMap.get(json.deviceid).ip + ":8081/zeroconf/" + suffix,
+          url:
+            "http://" +
+            this.deviceMap.get(json.deviceid).ip +
+            ":8081/zeroconf/" +
+            suffix,
           headers: {
             Accept: "application/json",
             "Content-Type": "application/json",
diff --git a/lib/eWeLinkWS.js b/lib/eWeLinkWS.js
index 86f08e3e..56fbeb64 100644
--- a/lib/eWeLinkWS.js
+++ b/lib/eWeLinkWS.js
@@ -21,7 +21,8 @@ module.exports = class eWeLinkWS {
     return new Promise((resolve, reject) => {
       axios({
         method: "post",
-        url: "https://" + this.httpHost.replace("-api", "-disp") + "/dispatch/app",
+        url:
+          "https://" + this.httpHost.replace("-api", "-disp") + "/dispatch/app",
         headers: {
           Authorization: "Bearer " + this.aToken,
           "Content-Type": "application/json",
@@ -69,7 +70,10 @@ module.exports = class eWeLinkWS {
         let msg = JSON.stringify(payload, null, 2)
           .replace(this.aToken, "**hidden**")
           .replace(this.apiKey, "**hidden**");
-        this.log.warn("Sending WS login request. This text is yellow for clarity.\n%s", msg);
+        this.log.warn(
+          "Sending WS login request. This text is yellow for clarity.\n%s",
+          msg
+        );
       } else if (this.debug) {
         this.log("Sending WS login request.");
       }
@@ -82,7 +86,10 @@ module.exports = class eWeLinkWS {
       try {
         device = JSON.parse(m);
       } catch (e) {
-        this.log.warn("An error occured reading the web socket message [%s]", e);
+        this.log.warn(
+          "An error occured reading the web socket message [%s]",
+          e
+        );
         return;
       }
       // for requestUpdate response
@@ -93,14 +100,23 @@ module.exports = class eWeLinkWS {
         device.error === 0
       ) {
         device.action = "update";
-      } else if (device.hasOwnProperty("deviceid") && device.hasOwnProperty("error") && device.error === 504) {
+      } else if (
+        device.hasOwnProperty("deviceid") &&
+        device.hasOwnProperty("error") &&
+        device.error === 504
+      ) {
         device.action = "sysmsg";
         device.params = {
           online: false,
         };
       }
       // for external updates
-      if (device.hasOwnProperty("config") && device.config.hb && device.config.hbInterval && !this.hbInterval) {
+      if (
+        device.hasOwnProperty("config") &&
+        device.config.hb &&
+        device.config.hbInterval &&
+        !this.hbInterval
+      ) {
         this.hbInterval = setInterval(() => {
           this.ws.send("ping");
         }, (device.config.hbInterval + 7) * 1000);
@@ -114,7 +130,10 @@ module.exports = class eWeLinkWS {
               params: device.params,
             };
             if (this.debugReqRes) {
-              let msg = JSON.stringify(returnTemplate, null, 2).replace(device.deviceid, "**hidden**");
+              let msg = JSON.stringify(returnTemplate, null, 2).replace(
+                device.deviceid,
+                "**hidden**"
+              );
               this.log("WS message received.\n%s", msg);
             } else if (this.debug) {
               this.log("WS message received.");
@@ -124,7 +143,9 @@ module.exports = class eWeLinkWS {
           case "update":
             for (let param in device.params) {
               if (device.params.hasOwnProperty(param)) {
-                if (!constants.paramsToKeep.includes(param.replace(/[0-9]/g, ""))) {
+                if (
+                  !constants.paramsToKeep.includes(param.replace(/[0-9]/g, ""))
+                ) {
                   delete device.params[param];
                 }
               }
@@ -137,7 +158,10 @@ module.exports = class eWeLinkWS {
                 params: device.params,
               };
               if (this.debugReqRes) {
-                let msg = JSON.stringify(returnTemplate, null, 2).replace(device.deviceid, "**hidden**");
+                let msg = JSON.stringify(returnTemplate, null, 2).replace(
+                  device.deviceid,
+                  "**hidden**"
+                );
                 this.log("WS message received.\n%s", msg);
               } else if (this.debug) {
                 this.log("WS message received.");
@@ -148,14 +172,20 @@ module.exports = class eWeLinkWS {
           case "reportSubDevice":
             return;
           default:
-            this.log.warn("[%s] WS message has unknown action.\n" + JSON.stringify(device, null, 2), device.deviceid);
+            this.log.warn(
+              "[%s] WS message has unknown action.\n" +
+                JSON.stringify(device, null, 2),
+              device.deviceid
+            );
             return;
         }
       } else if (device.hasOwnProperty("error") && device.error === 0) {
         // *** Safe to ignore these messages *** \\
       } else {
         if (this.debug) {
-          this.log.warn("WS unknown command received.\n" + JSON.stringify(device, null, 2));
+          this.log.warn(
+            "WS unknown command received.\n" + JSON.stringify(device, null, 2)
+          );
         }
       }
     });
@@ -170,7 +200,9 @@ module.exports = class eWeLinkWS {
             this.login();
           }, 5000);
         } else {
-          this.log("Please try restarting Homebridge so that this plugin can work again.");
+          this.log(
+            "Please try restarting Homebridge so that this plugin can work again."
+          );
         }
       }
       this.wsIsOpen = false;
@@ -183,13 +215,17 @@ module.exports = class eWeLinkWS {
     this.ws.on("error", e => {
       this.log.error("Web socket error - [%s].", e);
       if (e.code === "ECONNREFUSED") {
-        this.log.warn("Web socket will try to reconnect in five seconds then try the command again.");
+        this.log.warn(
+          "Web socket will try to reconnect in five seconds then try the command again."
+        );
         this.ws.removeAllListeners();
         setTimeout(() => {
           this.login();
         }, 5000);
       } else {
-        this.log.warn("If this was unexpected then please try restarting Homebridge.");
+        this.log.warn(
+          "If this was unexpected then please try restarting Homebridge."
+        );
       }
     });
   }
@@ -216,7 +252,10 @@ module.exports = class eWeLinkWS {
             .replace(json.apikey, "**hidden**")
             .replace(json.apiKey, "**hidden**")
             .replace(json.deviceid, "**hidden**");
-          this.log.warn("WS message sent. This text is yellow for clarity.\n%s", msg);
+          this.log.warn(
+            "WS message sent. This text is yellow for clarity.\n%s",
+            msg
+          );
         } else if (this.debug) {
           this.log("WS message sent.");
         }
@@ -229,7 +268,9 @@ module.exports = class eWeLinkWS {
       setTimeout(sendOperation, this.delaySend, string);
       this.delaySend += 280;
     } else {
-      this.log.warn("Web socket is currently reconnecting. Command will be resent.");
+      this.log.warn(
+        "Web socket is currently reconnecting. Command will be resent."
+      );
       let interval,
         waitToSend = req => {
           if (this.wsIsOpen) {
@@ -264,7 +305,10 @@ module.exports = class eWeLinkWS {
               .replace(json.apikey, "**hidden**")
               .replace(json.apiKey, "**hidden**")
               .replace(json.deviceid, "**hidden**");
-            this.log.warn("WS message sent. This text is yellow for clarity.\n%s", msg);
+            this.log.warn(
+              "WS message sent. This text is yellow for clarity.\n%s",
+              msg
+            );
           } else if (this.debug) {
             this.log("WS message sent.");
           }
@@ -277,7 +321,9 @@ module.exports = class eWeLinkWS {
       setTimeout(sendOperation, this.delaySend, string);
       this.delaySend += 280;
     } else {
-      this.log.warn("Web socket is currently reconnecting. Command will be resent.");
+      this.log.warn(
+        "Web socket is currently reconnecting. Command will be resent."
+      );
       let interval,
         waitToSend = req => {
           if (this.wsIsOpen) {

From f176305ab47bd3824c8f02a94c4abb4329756d85 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 15 Sep 2020 18:20:19 +0100
Subject: [PATCH 0152/3183] Update eWeLinkHTTP.js

---
 lib/eWeLinkHTTP.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/eWeLinkHTTP.js b/lib/eWeLinkHTTP.js
index 093bd0f2..1aafd1e4 100644
--- a/lib/eWeLinkHTTP.js
+++ b/lib/eWeLinkHTTP.js
@@ -120,7 +120,7 @@ module.exports = class eWeLinkHTTP {
       })
       .join("&");
     dataToSign = crypto
-      .createHmac("sha256", "6Nz4n0xA8s8qdxQf2GqurZj2Fs55FUvM")
+      .createHmac("sha256", constants.appSecret)
       .update(dataToSign)
       .digest("base64");
     return new Promise((resolve, reject) => {

From fb71abd9869024b0fb01d4d1a93c763d1e5e6bd5 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 15 Sep 2020 18:26:32 +0100
Subject: [PATCH 0153/3183] dw2 add battery

---
 lib/eWeLink.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index 0869e08a..13c6d210 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -447,6 +447,7 @@ class eWeLink {
           break;
         case "sensor":
           accessory.addService(Service.ContactSensor);
+          accessory.addService(Service.BatteryService);
           break;
         case "fan":
           accessory.addService(Service.Fanv2);

From fb75298a74a77458152ccf99a7b9041cc6f32bb6 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 15 Sep 2020 18:26:45 +0100
Subject: [PATCH 0154/3183] remove "type" from sensor params

---
 lib/constants.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/constants.js b/lib/constants.js
index 34215ac6..d8892025 100644
--- a/lib/constants.js
+++ b/lib/constants.js
@@ -38,7 +38,7 @@ module.exports = {
   devicesBrightable: [36, 44],
   devicesColourable: [22, 59],
   devicesSensor: [102],
-  devicesSensorParams: ["switch", "battery", "type"],
+  devicesSensorParams: ["switch", "battery"],
   devicesThermostat: [15],
   devicesThermostatParams: [
     "currentTemperature",

From 175a4e119a9526394b18e8db33f575c55da75365 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 15 Sep 2020 19:04:03 +0100
Subject: [PATCH 0155/3183] 2.27.0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 61a31ae5..71955065 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "2.26.2",
+  "version": "2.27.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 06d38b28..90ba8792 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "2.26.2",
+  "version": "2.27.0",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From a8725d0b82686f25fafa5e3c4337bb6b5d8cade3 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Tue, 15 Sep 2020 23:05:51 +0100
Subject: [PATCH 0156/3183] Update README.md

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 60323284..f85ca40c 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,8 @@
  [![code style: prettier](https://img.shields.io/badge/code_style-prettier-ff69b4.svg)](https://github.com/prettier/prettier)   
  [![npm](https://img.shields.io/npm/dt/homebridge-ewelink)](https://www.npmjs.com/package/homebridge-ewelink)
  [![npm](https://img.shields.io/npm/v/homebridge-ewelink/latest?label=release)](https://www.npmjs.com/package/homebridge-ewelink)
- [![npm](https://img.shields.io/npm/v/homebridge-ewelink/beta?label=beta)](https://www.npmjs.com/package/homebridge-ewelink)
+ [![npm](https://img.shields.io/npm/v/homebridge-ewelink/beta?label=beta)](https://www.npmjs.com/package/homebridge-ewelink)   
+ [![Contribute](https://img.shields.io/badge/contribute-a%20drink-yellow)](https://ko-fi.com/bwp91)
 
 </span>
 

From 7232c7dca41bdcc4699c804844ad79a17d8f05ca Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Tue, 15 Sep 2020 23:07:37 +0100
Subject: [PATCH 0157/3183] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index f85ca40c..79d92ff6 100644
--- a/README.md
+++ b/README.md
@@ -10,9 +10,9 @@
  [![verified-by-homebridge](https://badgen.net/badge/homebridge/verified/purple)](https://github.com/homebridge/homebridge/wiki/Verified-Plugins)
  [![Discord](https://img.shields.io/discord/432663330281226270?color=728ED5&logo=discord&label=discord)](https://discord.com/channels/432663330281226270/742733745743855627)
  [![code style: prettier](https://img.shields.io/badge/code_style-prettier-ff69b4.svg)](https://github.com/prettier/prettier)   
- [![npm](https://img.shields.io/npm/dt/homebridge-ewelink)](https://www.npmjs.com/package/homebridge-ewelink)
  [![npm](https://img.shields.io/npm/v/homebridge-ewelink/latest?label=release)](https://www.npmjs.com/package/homebridge-ewelink)
  [![npm](https://img.shields.io/npm/v/homebridge-ewelink/beta?label=beta)](https://www.npmjs.com/package/homebridge-ewelink)   
+ [![npm](https://img.shields.io/npm/dt/homebridge-ewelink)](https://www.npmjs.com/package/homebridge-ewelink)
  [![Contribute](https://img.shields.io/badge/contribute-a%20drink-yellow)](https://ko-fi.com/bwp91)
 
 </span>

From 4c24c9f3bbe93bddfd333db580defdc116d150e5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 16 Sep 2020 05:47:00 +0000
Subject: [PATCH 0158/3183] Bump prettier from 2.1.1 to 2.1.2

Bumps [prettier](https://github.com/prettier/prettier) from 2.1.1 to 2.1.2.
- [Release notes](https://github.com/prettier/prettier/releases)
- [Changelog](https://github.com/prettier/prettier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/prettier/prettier/compare/2.1.1...2.1.2)

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 6 +++---
 package.json      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 71955065..3e66d828 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -546,9 +546,9 @@
       }
     },
     "prettier": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.1.1.tgz",
-      "integrity": "sha512-9bY+5ZWCfqj3ghYBLxApy2zf6m+NJo5GzmLTpr9FsApsfjriNnS2dahWReHMi7qNPhhHl9SYHJs2cHZLgexNIw==",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.1.2.tgz",
+      "integrity": "sha512-16c7K+x4qVlJg9rEbXl7HEGmQyZlG4R9AgP+oHKRMsMsuk8s+ATStlf1NpDqyBI1HpVyfjLOeMhH2LvuNvV5Vg==",
       "dev": true
     },
     "qs": {
diff --git a/package.json b/package.json
index 90ba8792..015ed59c 100644
--- a/package.json
+++ b/package.json
@@ -66,6 +66,6 @@
     "ws": "7.3.1"
   },
   "devDependencies": {
-    "prettier": "2.1.1"
+    "prettier": "2.1.2"
   }
 }

From 556a0e048249a7e8c423f052a6b8283318389b73 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 16 Sep 2020 13:57:48 +0100
Subject: [PATCH 0159/3183] 3.0 initial changes

---
 .prettierrc.json   |    3 +-
 lib/constants.js   |    7 +-
 lib/eWeLink.js     | 1389 +++++++++++++-------------------------------
 lib/eWeLinkHTTP.js |  241 ++++----
 lib/eWeLinkLAN.js  |   91 +--
 lib/eWeLinkWS.js   |  156 ++---
 6 files changed, 624 insertions(+), 1263 deletions(-)

diff --git a/.prettierrc.json b/.prettierrc.json
index d68aa739..87f5e5e8 100644
--- a/.prettierrc.json
+++ b/.prettierrc.json
@@ -1,3 +1,4 @@
 {
-  "arrowParens": "avoid"
+  "arrowParens": "avoid",
+  "printWidth": 100
 }
diff --git a/lib/constants.js b/lib/constants.js
index d8892025..fe7fcb40 100644
--- a/lib/constants.js
+++ b/lib/constants.js
@@ -40,12 +40,7 @@ module.exports = {
   devicesSensor: [102],
   devicesSensorParams: ["switch", "battery"],
   devicesThermostat: [15],
-  devicesThermostatParams: [
-    "currentTemperature",
-    "currentHumidity",
-    "switch",
-    "masterSwitch",
-  ],
+  devicesThermostatParams: ["currentTemperature", "currentHumidity", "switch", "masterSwitch"],
   devicesFan: [34],
   devicesFanParams: ["switches", "light", "fan", "speed"],
   devicesOutlet: [32],
diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index 13c6d210..855a0402 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -13,15 +13,9 @@ class eWeLink {
   constructor(log, config, api) {
     if (!log || !api || !config) return;
     if (!config.username || !config.password || !config.countryCode) {
-      log.error(
-        "**************** Cannot load homebridge-ewelink ****************"
-      );
-      log.error(
-        "Your eWeLink credentials are missing from the Homebridge config."
-      );
-      log.error(
-        "****************************************************************"
-      );
+      log.error("*********** Cannot load homebridge-ewelink ***********");
+      log.error("eWeLink credentials missing from the Homebridge config.");
+      log.error("*******************************************************");
       return;
     }
     this.log = log;
@@ -29,153 +23,103 @@ class eWeLink {
     this.api = api;
     this.debug = this.config.debug || false;
     this.devicesInHB = new Map();
-    this.devicesInEwe = new Map();
+    this.devicesInEW = new Map();
     this.cusG = new Map();
     this.cusS = new Map();
     this.eveLogPath = this.api.user.storagePath() + "/homebridge-ewelink/";
     this.api
-      .on("didFinishLaunching", () => {
-        this.log(
-          "Plugin has finished initialising. Starting synchronisation with eWeLink account."
-        );
-        //*** Set up HTTP client and get the user HTTP host ***\\
-        this.httpClient = new eWeLinkHTTP(this.config, this.log);
-        this.httpClient
-          .getHost()
-          .then(() => this.httpClient.login())
-          .then(res => {
-            //*** Set up the web socket client ***\\
-            this.wsClient = new eWeLinkWS(this.config, this.log, res);
-            return this.wsClient.getHost();
-          })
-          .then(() => {
-            //*** Open web socket connection and get device list via HTTP ***\\
-            this.wsClient.login();
-            return this.httpClient.getDevices();
-          })
-          .then(res => {
-            //*** Get device IP addresses for LAN mode ***\\
-            this.httpDevices = res
-              .filter(
-                device =>
-                  device.hasOwnProperty("extra") &&
-                  device.extra.hasOwnProperty("uiid")
-              )
-              .filter(
-                device =>
-                  !(this.config.hideDevFromHB || "").includes(device.deviceid)
-              );
-            this.lanClient = new eWeLinkLAN(
-              this.config,
-              this.log,
-              this.httpDevices
-            );
-            this.httpDevices.forEach(device =>
-              this.devicesInEwe.set(device.deviceid, device)
-            );
-            return this.lanClient.getHosts();
-          })
-          .then(res => {
-            //*** Set up the LAN mode listener ***\\
-            this.lanDevices = res.map;
-            this.lanDevicesOnline = res.count;
-            return this.lanClient.startMonitor();
-          })
-          .then(() => {
-            //*** Use the device list to refresh Homebridge accessories ***\\
-            (() => {
-              //*** Remove all Homebridge accessories if none found ***\\
-              if (
-                Object.keys(this.httpDevices).length === 0 &&
-                Object.keys(this.lanDevices).length === 0
-              ) {
-                Array.from(this.devicesInHB.values()).forEach(a =>
-                  this.removeAccessory(a)
-                );
-                this.devicesInHB.clear();
-                this.log.warn("******* Not loading homebridge-ewelink *******");
-                this.log.warn("No devices were found in your eWeLink account.");
-                this.log.warn("**********************************************");
-                return;
-              }
-              //*** Make a map of custom groups from Homebridge config ***\\
-              if (Object.keys(this.config.groups || []).length > 0) {
-                this.config.groups
-                  .filter(
-                    g =>
-                      g.hasOwnProperty("type") &&
-                      cns.allowedGroups.includes(g.type)
-                  )
-                  .filter(
-                    g =>
-                      g.hasOwnProperty("deviceId") &&
-                      this.devicesInEwe.has(g.deviceId.toLowerCase())
-                  )
-                  .forEach(g => this.cusG.set(g.deviceId + "SWX", g));
-              }
-              //*** Make a map of RF Bridge custom sensors from Homebridge config ***\\
-              if (Object.keys(this.config.bridgeSensors || []).length > 0) {
-                this.config.bridgeSensors
-                  .filter(
-                    s =>
-                      s.hasOwnProperty("deviceId") &&
-                      this.devicesInEwe.has(s.deviceId.toLowerCase())
-                  )
-                  .forEach(s => this.cusS.set(s.fullDeviceId, s));
-              }
-              //*** Logging always helps to see if everything is okay so far ***\\
-              this.log(
-                "[%s] eWeLink devices were loaded from the Homebridge cache.",
-                this.devicesInHB.size
-              );
-              this.log(
-                "[%s] primary devices were loaded from your eWeLink account.",
-                this.devicesInEwe.size
-              );
-              this.log(
-                "[%s] primary devices were discovered on your local network.",
-                this.lanDevicesOnline
-              );
-              //*** Remove Homebridge accessories that don't appear in eWeLink ***\\
-              this.devicesInHB.forEach(a => {
-                if (!this.devicesInEwe.has(a.context.eweDeviceId)) {
-                  this.removeAccessory(a);
-                }
-              });
-              //*** Synchronise devices between eWeLink and Homebridge and set up ws/lan listeners ***\\
-              this.devicesInEwe.forEach(d => this.initialiseDevice(d));
-              this.wsClient.receiveUpdate(d => this.receiveDeviceUpdate(d));
-              this.lanClient.receiveUpdate(d => this.receiveDeviceUpdate(d));
-              this.log(
-                "eWeLink setup complete. If you're enjoying this package please consider a ⭐️  on GitHub :)."
-              );
-              if (this.config.debugReqRes || false) {
-                this.log.warn(
-                  "You have 'Request & Response Logging' enabled. This setting is not recommended for long-term use."
-                );
-              }
-            })();
-          })
-          .catch(err => {
-            this.log.error(
-              "************** Cannot load homebridge-ewelink **************"
-            );
-            this.log.error(err);
-            this.log.error(
-              "************************************************************"
-            );
-            if (this.lanClient) this.lanClient.closeConnection();
-            if (this.wsClient) this.wsClient.closeConnection();
+      .on("didFinishLaunching", () => this.eWeLinkSync())
+      .on("shutdown", () => {
+        if (this.lanClient) this.lanClient.closeConnection();
+        if (this.wsClient) this.wsClient.closeConnection();
+      });
+  }
+  eWeLinkSync() {
+    this.log("Plugin has finished initialising. Synching with eWeLink.");
+    this.httpClient = new eWeLinkHTTP(this.config, this.log);
+    this.httpClient
+      .getHost()
+      .then(() => this.httpClient.login())
+      .then(res => {
+        this.authData = res;
+        return this.httpClient.getDevices();
+      })
+      .then(res => {
+        this.httpDevices = res
+          .filter(d => d.hasOwnProperty("extra") && d.extra.hasOwnProperty("uiid"))
+          .filter(d => !(this.config.hideDevFromHB || "").includes(d.deviceid));
+        this.httpDevices.forEach(device => this.devicesInEW.set(device.deviceid, device));
+        this.wsClient = new eWeLinkWS(this.config, this.log, this.authData);
+        return this.wsClient.getHost();
+      })
+      .then(() => {
+        this.wsClient.login();
+        this.lanClient = new eWeLinkLAN(this.config, this.log, this.httpDevices);
+        return this.lanClient.getHosts();
+      })
+      .then(res => {
+        this.lanDevices = res.map;
+        this.lanCount = res.count;
+        return this.lanClient.startMonitor();
+      })
+      .then(() => {
+        (() => {
+          //*** Remove all Homebridge accessories if none found ***\\
+          if (
+            Object.keys(this.httpDevices).length === 0 &&
+            Object.keys(this.lanDevices).length === 0
+          ) {
+            Array.from(this.devicesInHB.values()).forEach(a => this.removeAccessory(a));
+            this.devicesInHB.clear();
+            this.log.warn("******* Not loading homebridge-ewelink *******");
+            this.log.warn("No devices were found in your eWeLink account.");
+            this.log.warn("**********************************************");
+            return;
+          }
+          //*** Make a map of custom groups from Homebridge config ***\\
+          if (Object.keys(this.config.groups || []).length > 0) {
+            this.config.groups
+              .filter(g => g.hasOwnProperty("type") && cns.allowedGroups.includes(g.type))
+              .filter(g => g.hasOwnProperty("deviceId") && this.devicesInEW.has(g.deviceId))
+              .forEach(g => this.cusG.set(g.deviceId + "SWX", g));
+          }
+          //*** Make a map of RF Bridge custom sensors from Homebridge config ***\\
+          if (Object.keys(this.config.bridgeSensors || []).length > 0) {
+            this.config.bridgeSensors
+              .filter(s => s.hasOwnProperty("deviceId") && this.devicesInEW.has(s.deviceId))
+              .forEach(s => this.cusS.set(s.fullDeviceId, s));
+          }
+          //*** Logging always helps to see if everything is okay so far ***\\
+          this.log("[%s] eWeLink devices loaded from the Homebridge cache.", this.devicesInHB.size);
+          this.log("[%s] primary devices loaded from your eWeLink account.", this.devicesInEW.size);
+          this.log("[%s] primary devices were discovered on your local network.", this.lanCount);
+          //*** Remove Homebridge accessories that don't appear in eWeLink ***\\
+          this.devicesInHB.forEach(a => {
+            if (!this.devicesInEW.has(a.context.eweDeviceId)) {
+              this.removeAccessory(a);
+            }
           });
+          //*** Synchronise devices between eWeLink and Homebridge and set up ws/lan listeners ***\\
+          this.devicesInEW.forEach(d => this.initialiseDevice(d));
+          this.wsClient.receiveUpdate(d => this.receiveDeviceUpdate(d));
+          this.lanClient.receiveUpdate(d => this.receiveDeviceUpdate(d));
+          this.log("eWeLink sync complete. Don't forget to ⭐️  this plugin on GitHub!");
+          if (this.config.debugReqRes || false) {
+            this.log.warn("Note: 'Request & Response Logging' is not advised for long-term use.");
+          }
+        })();
       })
-      .on("shutdown", () => {
+      .catch(err => {
+        this.log.error("************** Cannot load homebridge-ewelink **************");
+        this.log.error(err);
+        this.log.error("************************************************************");
         if (this.lanClient) this.lanClient.closeConnection();
         if (this.wsClient) this.wsClient.closeConnection();
       });
   }
   initialiseDevice(device) {
     let accessory;
-    //*** First add the device if it isn't already in Homebridge. Yeah this code looks a mess :| ***\\
+    //*** First add the device if it isn't already in Homebridge ***\\
     if (
       !this.devicesInHB.has(device.deviceid + "SWX") &&
       !this.devicesInHB.has(device.deviceid + "SW0")
@@ -233,9 +177,7 @@ class eWeLink {
         }
       } else if (cns.devicesRFBridge.includes(device.extra.uiid)) {
         this.addAccessory(device, device.deviceid + "SW0", "rf_pri");
-        if (
-          Object.keys((device.tags && device.tags.zyx_info) || []).length > 0
-        ) {
+        if (Object.keys((device.tags && device.tags.zyx_info) || []).length > 0) {
           for (let i = 1; i <= Object.keys(device.tags.zyx_info).length; i++) {
             this.addAccessory(device, device.deviceid + "SW" + i, "rf_sub");
           }
@@ -269,31 +211,20 @@ class eWeLink {
         rfBridgeChange = false;
       accessory
         .getService(Service.AccessoryInformation)
-        .setCharacteristic(
-          Characteristic.FirmwareRevision,
-          device.params.fwVersion
-        );
-      accessory.context.reachableWAN =
-        accessory.context.eweUIID !== 102 ? device.online : true;
-      accessory.context.reachableLAN =
-        this.lanDevices.get(device.deviceid).online || false;
+        .setCharacteristic(Characteristic.FirmwareRevision, device.params.fwVersion);
+      accessory.context.reachableWAN = accessory.context.eweUIID !== 102 ? device.online : true;
+      accessory.context.reachableLAN = this.lanDevices.get(device.deviceid).online || false;
       accessory.context.inUse = false;
       let str = accessory.context.reachableLAN
-        ? "and locally with IP [" +
-          this.lanDevices.get(device.deviceid).ip +
-          "]"
-        : "but LAN mode unavailable as unsupported/shared device";
+        ? "and locally with IP [" + this.lanDevices.get(device.deviceid).ip + "]"
+        : "but LAN mode unavailable as offline/unsupported/shared device";
       this.log("[%s] found in eWeLink %s.", accessory.displayName, str);
       this.devicesInHB.set(accessory.context.hbDeviceId, accessory);
       if (!isX) {
         for (let i = 1; i <= accessory.context.channelCount; i++) {
           if (!this.devicesInHB.has(device.deviceid + "SW" + i)) {
             if (cns.devicesHideable.includes(accessory.context.type)) {
-              if (
-                (this.config.hideFromHB || "").includes(
-                  device.deviceid + "SW" + i
-                )
-              ) {
+              if ((this.config.hideFromHB || "").includes(device.deviceid + "SW" + i)) {
                 continue;
               } else {
                 this.addAccessory(device, device.deviceid + "SW" + i, "switch");
@@ -302,9 +233,7 @@ class eWeLink {
           }
           let oAccessory = this.devicesInHB.get(device.deviceid + "SW" + i);
           if (
-            (this.config.hideFromHB || "").includes(
-              device.deviceid + "SW" + i
-            ) &&
+            (this.config.hideFromHB || "").includes(device.deviceid + "SW" + i) &&
             cns.devicesHideable.includes(accessory.context.type)
           ) {
             this.removeAccessory(oAccessory);
@@ -318,13 +247,9 @@ class eWeLink {
           }
           oAccessory
             .getService(Service.AccessoryInformation)
-            .setCharacteristic(
-              Characteristic.FirmwareRevision,
-              device.params.fwVersion
-            );
+            .setCharacteristic(Characteristic.FirmwareRevision, device.params.fwVersion);
           oAccessory.context.reachableWAN = device.online;
-          oAccessory.context.reachableLAN =
-            this.lanDevices.get(device.deviceid).online || false;
+          oAccessory.context.reachableLAN = this.lanDevices.get(device.deviceid).online || false;
           this.devicesInHB.set(oAccessory.context.hbDeviceId, oAccessory);
         }
       }
@@ -349,18 +274,12 @@ class eWeLink {
         );
       }
     } else {
-      this.log.warn(
-        "[%s] cannot be initialised as it wasn't found in Homebridge.",
-        device.name
-      );
+      this.log.warn("[%s] cannot be initialised as it wasn't found in Homebridge.", device.name);
     }
   }
   addAccessory(device, hbDeviceId, type) {
     let switchNumber = hbDeviceId.substr(-1).toString(),
-      newDeviceName =
-        type === "rf_sub"
-          ? device.tags.zyx_info[switchNumber - 1].name
-          : device.name,
+      newDeviceName = type === "rf_sub" ? device.tags.zyx_info[switchNumber - 1].name : device.name,
       channelCount =
         type === "rf_pri"
           ? Object.keys((device.tags && device.tags.zyx_info) || []).length
@@ -378,10 +297,7 @@ class eWeLink {
     if ((this.config.nameOverride || {}).hasOwnProperty(hbDeviceId)) {
       newDeviceName = this.config.nameOverride[hbDeviceId];
     }
-    const accessory = new Accessory(
-      newDeviceName,
-      UUIDGen.generate(hbDeviceId).toString()
-    );
+    const accessory = new Accessory(newDeviceName, UUIDGen.generate(hbDeviceId).toString());
     try {
       accessory
         .getService(Service.AccessoryInformation)
@@ -391,10 +307,7 @@ class eWeLink {
           Characteristic.Model,
           device.productModel + " (" + device.extra.model + ")"
         )
-        .setCharacteristic(
-          Characteristic.FirmwareRevision,
-          device.params.fwVersion
-        )
+        .setCharacteristic(Characteristic.FirmwareRevision, device.params.fwVersion)
         .setCharacteristic(Characteristic.Identify, false);
       accessory.context = {
         hbDeviceId,
@@ -410,18 +323,11 @@ class eWeLink {
         case "valve":
           ["A", "B"].forEach(v => {
             accessory
-              .addService(
-                Service.Valve,
-                "Valve " + v,
-                "valve" + v.toLowerCase()
-              )
+              .addService(Service.Valve, "Valve " + v, "valve" + v.toLowerCase())
               .setCharacteristic(Characteristic.Active, 0)
               .setCharacteristic(Characteristic.InUse, 0)
               .setCharacteristic(Characteristic.ValveType, 1)
-              .setCharacteristic(
-                Characteristic.SetDuration,
-                this.config.valveTimeLength || 120
-              )
+              .setCharacteristic(Characteristic.SetDuration, this.config.valveTimeLength || 120)
               .addCharacteristic(Characteristic.RemainingDuration);
           });
           break;
@@ -456,8 +362,7 @@ class eWeLink {
         case "thermostat":
           if (!this.config.hideTHSwitch) accessory.addService(Service.Switch);
           accessory.addService(Service.TemperatureSensor);
-          if (device.params.sensorType !== "DS18B20")
-            accessory.addService(Service.HumiditySensor);
+          if (device.params.sensorType !== "DS18B20") accessory.addService(Service.HumiditySensor);
           break;
         case "outlet":
           accessory.addService(Service.Outlet);
@@ -503,9 +408,7 @@ class eWeLink {
           break;
         case "rf_sub":
           accessory.context.rfChls = {};
-          switch (
-            device.tags.zyx_info[parseInt(switchNumber) - 1].remote_type
-          ) {
+          switch (device.tags.zyx_info[parseInt(switchNumber) - 1].remote_type) {
             case "1":
             case "2":
             case "3":
@@ -525,52 +428,46 @@ class eWeLink {
               );
           }
           let mAccessory = this.devicesInHB.get(device.deviceid + "SW0");
-          device.tags.zyx_info[parseInt(switchNumber) - 1].buttonName.forEach(
-            button => {
-              let rfData;
-              Object.entries(button).forEach(
-                ([k, v]) =>
-                  (rfData = {
-                    rfChan: k,
-                    name: v,
-                  })
-              );
-              accessory.context.rfChls[rfData.rfChan] = rfData.name;
-              mAccessory.context.rfChlMap[rfData.rfChan] = switchNumber;
-              switch (accessory.context.sensorType) {
-                case "button":
-                  accessory.addService(
-                    Service.Switch,
-                    rfData.name,
-                    "switch" + rfData.rfChan
-                  );
-                  break;
-                case "water":
-                  accessory.addService(Service.LeakSensor);
-                  break;
-                case "fire":
-                case "smoke":
-                  accessory.addService(Service.SmokeSensor);
-                  break;
-                case "co":
-                  accessory.addService(Service.CarbonMonoxideSensor);
-                  break;
-                case "co2":
-                  accessory.addService(Service.CarbonDioxideSensor);
-                  break;
-                case "contact":
-                  accessory.addService(Service.ContactSensor);
-                  break;
-                case "occupancy":
-                  accessory.addService(Service.OccupancySensor);
-                  break;
-                default:
-                  accessory.addService(Service.MotionSensor);
-                  break;
-              }
-              this.devicesInHB.set(mAccessory.context.hbDeviceId, mAccessory);
+          device.tags.zyx_info[parseInt(switchNumber) - 1].buttonName.forEach(button => {
+            let rfData;
+            Object.entries(button).forEach(
+              ([k, v]) =>
+                (rfData = {
+                  rfChan: k,
+                  name: v,
+                })
+            );
+            accessory.context.rfChls[rfData.rfChan] = rfData.name;
+            mAccessory.context.rfChlMap[rfData.rfChan] = switchNumber;
+            switch (accessory.context.sensorType) {
+              case "button":
+                accessory.addService(Service.Switch, rfData.name, "switch" + rfData.rfChan);
+                break;
+              case "water":
+                accessory.addService(Service.LeakSensor);
+                break;
+              case "fire":
+              case "smoke":
+                accessory.addService(Service.SmokeSensor);
+                break;
+              case "co":
+                accessory.addService(Service.CarbonMonoxideSensor);
+                break;
+              case "co2":
+                accessory.addService(Service.CarbonDioxideSensor);
+                break;
+              case "contact":
+                accessory.addService(Service.ContactSensor);
+                break;
+              case "occupancy":
+                accessory.addService(Service.OccupancySensor);
+                break;
+              default:
+                accessory.addService(Service.MotionSensor);
+                break;
             }
-          );
+            this.devicesInHB.set(mAccessory.context.hbDeviceId, mAccessory);
+          });
           break;
         case "zb_sub": //*** credit @tasict ***\\
           accessory.addService(Service.BatteryService);
@@ -608,9 +505,7 @@ class eWeLink {
           throw "device is not supported by this plugin. Please create an issue on GitHub";
       }
       this.devicesInHB.set(hbDeviceId, accessory);
-      this.api.registerPlatformAccessories("homebridge-ewelink", "eWeLink", [
-        accessory,
-      ]);
+      this.api.registerPlatformAccessories("homebridge-ewelink", "eWeLink", [accessory]);
       this.configureAccessory(accessory);
       this.log("[%s] has been added to Homebridge.", newDeviceName);
     } catch (err) {
@@ -629,33 +524,21 @@ class eWeLink {
               .getService("Valve " + v)
               .getCharacteristic(Characteristic.Active)
               .on("set", (value, callback) =>
-                this.internalValveUpdate(
-                  accessory,
-                  "Valve " + v,
-                  value,
-                  callback
-                )
+                this.internalValveUpdate(accessory, "Valve " + v, value, callback)
               );
             accessory
               .getService("Valve " + v)
               .getCharacteristic(Characteristic.SetDuration)
               .on("set", (value, callback) => {
                 if (
-                  accessory
-                    .getService("Valve " + v)
-                    .getCharacteristic(Characteristic.InUse).value
+                  accessory.getService("Valve " + v).getCharacteristic(Characteristic.InUse).value
                 ) {
                   accessory
                     .getService("Valve " + v)
-                    .updateCharacteristic(
-                      Characteristic.RemainingDuration,
-                      value
-                    );
+                    .updateCharacteristic(Characteristic.RemainingDuration, value);
                   clearTimeout(accessory.getService("Valve " + v).timer);
                   accessory.getService("Valve " + v).timer = setTimeout(() => {
-                    accessory
-                      .getService("Valve " + v)
-                      .setCharacteristic(Characteristic.Active, 0);
+                    accessory.getService("Valve " + v).setCharacteristic(Characteristic.Active, 0);
                   }, value * 1000);
                 }
                 callback();
@@ -666,9 +549,7 @@ class eWeLink {
           accessory
             .getService(Service.WindowCovering)
             .getCharacteristic(Characteristic.TargetPosition)
-            .on("set", (value, callback) =>
-              this.internalBlindUpdate(accessory, value, callback)
-            )
+            .on("set", (value, callback) => this.internalBlindUpdate(accessory, value, callback))
             .setProps({
               minStep: 100,
             });
@@ -677,17 +558,13 @@ class eWeLink {
           accessory
             .getService(Service.GarageDoorOpener)
             .getCharacteristic(Characteristic.TargetDoorState)
-            .on("set", (value, callback) =>
-              this.internalGarageUpdate(accessory, value, callback)
-            );
+            .on("set", (value, callback) => this.internalGarageUpdate(accessory, value, callback));
           break;
         case "lock":
           accessory
             .getService(Service.LockMechanism)
             .getCharacteristic(Characteristic.LockTargetState)
-            .on("set", (value, callback) =>
-              this.internalLockUpdate(accessory, value, callback)
-            );
+            .on("set", (value, callback) => this.internalLockUpdate(accessory, value, callback));
           break;
         case "fan":
           accessory
@@ -737,9 +614,7 @@ class eWeLink {
             if (accessory.getService(Service.HumiditySensor)) {
               dataToAdd.humidity = accessory
                 .getService(Service.HumiditySensor)
-                .getCharacteristic(
-                  Characteristic.CurrentRelativeHumidity
-                ).value;
+                .getCharacteristic(Characteristic.CurrentRelativeHumidity).value;
             }
             accessory.eveLogger.addEntry(dataToAdd);
           }, 300000);
@@ -748,9 +623,7 @@ class eWeLink {
           accessory
             .getService(Service.Outlet)
             .getCharacteristic(Characteristic.On)
-            .on("set", (value, callback) =>
-              this.internalOutletUpdate(accessory, value, callback)
-            );
+            .on("set", (value, callback) => this.internalOutletUpdate(accessory, value, callback));
           accessory.log = this.log;
           accessory.eveLogger = new EveHistoryService("energy", accessory, {
             storage: "fs",
@@ -769,15 +642,12 @@ class eWeLink {
             };
           }
           corrInterval.setCorrectingInterval(() => {
-            let isOn = accessory
-                .getService(Service.Outlet)
-                .getCharacteristic(Characteristic.On).value,
+            let isOn = accessory.getService(Service.Outlet).getCharacteristic(Characteristic.On)
+                .value,
               currentWatt = isOn
                 ? accessory
                     .getService(Service.Outlet)
-                    .getCharacteristic(
-                      EveService.Characteristics.CurrentConsumption
-                    ).value
+                    .getCharacteristic(EveService.Characteristics.CurrentConsumption).value
                 : 0;
             if (accessory.eveLogger.isHistoryLoaded()) {
               accessory.context.extraPersistedData = accessory.eveLogger.getExtraPersistedData();
@@ -792,8 +662,7 @@ class eWeLink {
                 });
               } else {
                 accessory.context.totalEnergy =
-                  accessory.context.totalEnergyTemp +
-                  (currentWatt * 10) / 3600 / 1000;
+                  accessory.context.totalEnergyTemp + (currentWatt * 10) / 3600 / 1000;
                 accessory.eveLogger.setExtraPersistedData({
                   totalenergy: accessory.context.totalEnergy,
                   lastReset: 0,
@@ -801,8 +670,7 @@ class eWeLink {
               }
               accessory.context.totalEnergytemp = 0;
             } else {
-              accessory.context.totalEnergyTemp +=
-                (currentWatt * 10) / 3600 / 1000;
+              accessory.context.totalEnergyTemp += (currentWatt * 10) / 3600 / 1000;
               accessory.context.totalEnergy = accessory.context.totalEnergyTemp;
             }
             accessory.eveLogger.addEntry({
@@ -816,8 +684,7 @@ class eWeLink {
             .on("get", callback => {
               accessory.context.extraPersistedData = accessory.eveLogger.getExtraPersistedData();
               if (accessory.context.extraPersistedData !== undefined) {
-                accessory.context.totalEnergy =
-                  accessory.context.extraPersistedData.totalPower;
+                accessory.context.totalEnergy = accessory.context.extraPersistedData.totalPower;
               }
               callback(null, accessory.context.totalEnergy);
             });
@@ -836,8 +703,7 @@ class eWeLink {
             .on("get", callback => {
               accessory.context.extraPersistedData = accessory.eveLogger.getExtraPersistedData();
               if (accessory.context.extraPersistedData !== undefined) {
-                accessory.context.lastReset =
-                  accessory.context.extraPersistedData.lastReset;
+                accessory.context.lastReset = accessory.context.extraPersistedData.lastReset;
               }
               callback(null, accessory.context.lastReset);
             });
@@ -846,17 +712,13 @@ class eWeLink {
           accessory
             .getService(Service.Outlet)
             .getCharacteristic(Characteristic.On)
-            .on("set", (value, callback) =>
-              this.internalUSBUpdate(accessory, value, callback)
-            );
+            .on("set", (value, callback) => this.internalUSBUpdate(accessory, value, callback));
           break;
         case "scm":
           accessory
             .getService(Service.Switch)
             .getCharacteristic(Characteristic.On)
-            .on("set", (value, callback) =>
-              this.internalSCMUpdate(accessory, value, callback)
-            );
+            .on("set", (value, callback) => this.internalSCMUpdate(accessory, value, callback));
           break;
         case "light":
           accessory
@@ -872,9 +734,8 @@ class eWeLink {
               .on("set", (value, callback) => {
                 if (value > 0) {
                   if (
-                    !accessory
-                      .getService(Service.Lightbulb)
-                      .getCharacteristic(Characteristic.On).value
+                    !accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On)
+                      .value
                   ) {
                     this.internalLightbulbUpdate(accessory, true, function () {
                       return;
@@ -885,18 +746,15 @@ class eWeLink {
                   this.internalLightbulbUpdate(accessory, false, callback);
                 }
               });
-          } else if (
-            cns.devicesColourable.includes(accessory.context.eweUIID)
-          ) {
+          } else if (cns.devicesColourable.includes(accessory.context.eweUIID)) {
             accessory
               .getService(Service.Lightbulb)
               .getCharacteristic(Characteristic.Brightness)
               .on("set", (value, callback) => {
                 if (value > 0) {
                   if (
-                    !accessory
-                      .getService(Service.Lightbulb)
-                      .getCharacteristic(Characteristic.On).value
+                    !accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On)
+                      .value
                   ) {
                     this.internalLightbulbUpdate(accessory, true, function () {
                       return;
@@ -923,24 +781,18 @@ class eWeLink {
           accessory
             .getService(Service.Switch)
             .getCharacteristic(Characteristic.On)
-            .on("set", (value, callback) =>
-              this.internalSwitchUpdate(accessory, value, callback)
-            );
+            .on("set", (value, callback) => this.internalSwitchUpdate(accessory, value, callback));
           break;
         case "rf_sub":
           accessory.context.rfChls = accessory.context.rfChls || {};
           if (accessory.context.sensorType === "button") {
             Object.entries(accessory.context.rfChls).forEach(([k, v]) => {
-              accessory
-                .getService(v)
-                .updateCharacteristic(Characteristic.On, false);
+              accessory.getService(v).updateCharacteristic(Characteristic.On, false);
               accessory
                 .getService(v)
                 .getCharacteristic(Characteristic.On)
                 .on("set", (value, callback) => {
-                  value
-                    ? this.internalRFDeviceUpdate(accessory, k, callback)
-                    : callback();
+                  value ? this.internalRFDeviceUpdate(accessory, k, callback) : callback();
                 });
             });
           }
@@ -961,8 +813,7 @@ class eWeLink {
                   .getCharacteristic(Characteristic.CurrentTemperature).value,
                 humidity: accessory
                   .getService(Service.HumiditySensor)
-                  .getCharacteristic(Characteristic.CurrentRelativeHumidity)
-                  .value,
+                  .getCharacteristic(Characteristic.CurrentRelativeHumidity).value,
               };
               accessory.eveLogger.addEntry(dataToAdd);
             }, 300000);
@@ -971,20 +822,14 @@ class eWeLink {
       }
       this.devicesInHB.set(accessory.context.hbDeviceId, accessory);
     } catch (err) {
-      this.log.warn(
-        "[%s] could not be refreshed as %s.",
-        accessory.displayName,
-        err
-      );
+      this.log.warn("[%s] could not be refreshed as %s.", accessory.displayName, err);
     }
   }
   refreshAccessory(accessory, newParams) {
     switch (accessory.context.type) {
       case "valve":
         if (
-          Object.keys(newParams).some(v =>
-            cns.devicesValveParams.includes(v)
-          ) &&
+          Object.keys(newParams).some(v => cns.devicesValveParams.includes(v)) &&
           Array.isArray(newParams.switches)
         ) {
           this.externalValveUpdate(accessory, newParams);
@@ -992,9 +837,7 @@ class eWeLink {
         return true;
       case "blind":
         if (
-          Object.keys(newParams).some(v =>
-            cns.devicesBlindParams.includes(v)
-          ) &&
+          Object.keys(newParams).some(v => cns.devicesBlindParams.includes(v)) &&
           Array.isArray(newParams.switches)
         ) {
           this.externalBlindUpdate(accessory, newParams);
@@ -1002,48 +845,34 @@ class eWeLink {
         return true;
       case "garage":
         if (
-          Object.keys(newParams).some(v =>
-            cns.devicesGarageParams.includes(v)
-          ) &&
+          Object.keys(newParams).some(v => cns.devicesGarageParams.includes(v)) &&
           Array.isArray(newParams.switches)
         ) {
           this.externalGarageUpdate(accessory, newParams);
         }
         return true;
       case "lock":
-        if (
-          Object.keys(newParams).some(v => cns.devicesLockParams.includes(v))
-        ) {
+        if (Object.keys(newParams).some(v => cns.devicesLockParams.includes(v))) {
           this.externalLockUpdate(accessory, newParams);
         }
         return true;
       case "sensor":
-        if (
-          Object.keys(newParams).some(v => cns.devicesSensorParams.includes(v))
-        ) {
+        if (Object.keys(newParams).some(v => cns.devicesSensorParams.includes(v))) {
           this.externalSensorUpdate(accessory, newParams);
         }
         return true;
       case "fan":
-        if (
-          Object.keys(newParams).some(v => cns.devicesFanParams.includes(v))
-        ) {
+        if (Object.keys(newParams).some(v => cns.devicesFanParams.includes(v))) {
           this.externalFanUpdate(accessory, newParams);
         }
         return true;
       case "thermostat":
-        if (
-          Object.keys(newParams).some(v =>
-            cns.devicesThermostatParams.includes(v)
-          )
-        ) {
+        if (Object.keys(newParams).some(v => cns.devicesThermostatParams.includes(v))) {
           this.externalThermostatUpdate(accessory, newParams);
         }
         return true;
       case "outlet":
-        if (
-          Object.keys(newParams).some(v => cns.devicesOutletParams.includes(v))
-        ) {
+        if (Object.keys(newParams).some(v => cns.devicesOutletParams.includes(v))) {
           this.externalOutletUpdate(accessory, newParams);
         }
         return true;
@@ -1068,11 +897,7 @@ class eWeLink {
           cns.devicesSingleSwitch.includes(accessory.context.eweUIID) &&
           cns.devicesSingleSwitchLight.includes(accessory.context.eweModel)
         ) {
-          if (
-            Object.keys(newParams).some(v =>
-              cns.devicesSingleSwitchLightParams.includes(v)
-            )
-          ) {
+          if (Object.keys(newParams).some(v => cns.devicesSingleSwitchLightParams.includes(v))) {
             this.externalSingleLightUpdate(accessory, newParams);
           }
         } else if (
@@ -1080,9 +905,7 @@ class eWeLink {
           cns.devicesMultiSwitchLight.includes(accessory.context.eweModel)
         ) {
           if (
-            Object.keys(newParams).some(v =>
-              cns.devicesMultiSwitchLightParams.includes(v)
-            ) &&
+            Object.keys(newParams).some(v => cns.devicesMultiSwitchLightParams.includes(v)) &&
             Array.isArray(newParams.switches)
           ) {
             this.externalMultiLightUpdate(accessory, newParams);
@@ -1091,18 +914,12 @@ class eWeLink {
         return true;
       case "switch":
         if (cns.devicesSingleSwitch.includes(accessory.context.eweUIID)) {
-          if (
-            Object.keys(newParams).some(v =>
-              cns.devicesSingleSwitchParams.includes(v)
-            )
-          ) {
+          if (Object.keys(newParams).some(v => cns.devicesSingleSwitchParams.includes(v))) {
             this.externalSingleSwitchUpdate(accessory, newParams);
           }
         } else if (cns.devicesMultiSwitch.includes(accessory.context.eweUIID)) {
           if (
-            Object.keys(newParams).some(v =>
-              cns.devicesMultiSwitchParams.includes(v)
-            ) &&
+            Object.keys(newParams).some(v => cns.devicesMultiSwitchParams.includes(v)) &&
             Array.isArray(newParams.switches)
           ) {
             this.externalMultiSwitchUpdate(accessory, newParams);
@@ -1110,11 +927,7 @@ class eWeLink {
         }
         return true;
       case "rf_pri":
-        if (
-          Object.keys(newParams).some(v =>
-            cns.devicesRFBridgeParams.includes(v)
-          )
-        ) {
+        if (Object.keys(newParams).some(v => cns.devicesRFBridgeParams.includes(v))) {
           this.externalRFDeviceUpdate(accessory, newParams);
         }
         return true;
@@ -1122,11 +935,7 @@ class eWeLink {
       case "zb_pri":
         return true;
       case "zb_sub":
-        if (
-          Object.keys(newParams).some(v =>
-            cns.devicesZBBridgeParams.includes(v)
-          )
-        ) {
+        if (Object.keys(newParams).some(v => cns.devicesZBBridgeParams.includes(v))) {
           this.externalZBDeviceUpdate(accessory, newParams);
         }
         return true;
@@ -1137,16 +946,10 @@ class eWeLink {
   removeAccessory(accessory) {
     try {
       this.devicesInHB.delete(accessory.context.hbDeviceId);
-      this.api.unregisterPlatformAccessories("homebridge-ewelink", "eWeLink", [
-        accessory,
-      ]);
+      this.api.unregisterPlatformAccessories("homebridge-ewelink", "eWeLink", [accessory]);
       this.log("[%s] has been removed from Homebridge.", accessory.displayName);
     } catch (err) {
-      this.log.warn(
-        "[%s] needed to be removed but couldn't as %s.",
-        accessory.displayName,
-        err
-      );
+      this.log.warn("[%s] needed to be removed but couldn't as %s.", accessory.displayName, err);
     }
   }
   sendDeviceUpdate(accessory, params, callback) {
@@ -1167,10 +970,7 @@ class eWeLink {
         callback("Device has failed to update");
       }
     };
-    if (
-      cns.devicesNonLAN.includes(accessory.context.eweUIID) ||
-      !accessory.context.reachableLAN
-    ) {
+    if (cns.devicesNonLAN.includes(accessory.context.eweUIID) || !accessory.context.reachableLAN) {
       sendViaWS();
     } else {
       this.lanClient
@@ -1178,110 +978,81 @@ class eWeLink {
         .then(() => callback())
         .catch(err => {
           if (this.debug) {
-            this.log.warn(
-              "[%s] Reverting to web socket as %s.",
-              accessory.displayName,
-              err
-            );
+            this.log.warn("[%s] Reverting to web socket as %s.", accessory.displayName, err);
           }
           sendViaWS();
         });
     }
   }
   receiveDeviceUpdate(device) {
-    let accessory;
-    switch (device.action) {
-      case "sysmsg":
-        if (
-          (accessory =
-            this.devicesInHB.get(device.deviceid + "SWX") ||
-            this.devicesInHB.get(device.deviceid + "SW0"))
-        ) {
-          let isX = accessory.context.hbDeviceId.substr(-1) === "X";
-          if (device.params.updateSource === "WS") {
-            if (accessory.context.reachableWAN !== device.params.online) {
-              accessory.context.reachableWAN = device.params.online;
-              this.log(
-                "[%s] has been reported [%s] via [WS].",
-                accessory.displayName,
-                accessory.context.reachableWAN ? "online" : "offline"
-              );
-              this.devicesInHB.set(accessory.context.hbDeviceId, accessory);
-              if (accessory.context.reachableWAN)
-                this.wsClient.requestUpdate(accessory);
-            } else {
-              if (this.debug) {
-                this.log(
-                  "[%s] Nothing to update from above WS message.",
-                  accessory.displayName
-                );
-              }
-            }
-          }
-          if (!isX) {
-            for (let i = 1; i <= accessory.context.channelCount; i++) {
-              if (this.devicesInHB.has(device.deviceid + "SW" + i)) {
-                let oAccessory = this.devicesInHB.get(
-                  device.deviceid + "SW" + i
-                );
-                oAccessory.context.reachableWAN = device.params.online;
-                this.devicesInHB.set(oAccessory.context.hbDeviceId, oAccessory);
-              }
-            }
-          }
+    let accessory,
+      deviceId = device.deviceid,
+      statusChange = false;
+    if (
+      (accessory = this.devicesInHB.get(deviceId + "SWX") || this.devicesInHB.get(deviceId + "SW0"))
+    ) {
+      let isX = accessory.context.hbDeviceId.substr(-1) === "X";
+
+      if (device.params.updateSource === "WS") {
+        if (device.params.online != accessory.context.reachableWAN) {
+          accessory.context.reachableWAN = device.params.online;
+          this.devicesInHB.set(accessory.context.hbDeviceId, accessory);
+          if (accessory.context.reachableWAN) this.wsClient.requestUpdate(accessory);
+          statusChange = true;
+          this.log.warn(
+            "[%s] has been reported [%s] via [WS].",
+            accessory.displayName,
+            accessory.context.reachableWAN ? "online" : "offline"
+          );
         }
-        break;
-      case "update":
-        if (
-          (accessory =
-            this.devicesInHB.get(device.deviceid + "SWX") ||
-            this.devicesInHB.get(device.deviceid + "SW0"))
-        ) {
-          if (
-            device.params.updateSource === "WS" &&
-            !accessory.context.reachableWAN
-          ) {
-            accessory.context.reachableWAN = true;
-            this.log(
-              "[%s] has been reported [online] via [WS].",
-              accessory.displayName
-            );
-          }
-          if (
-            device.params.updateSource === "LAN" &&
-            !accessory.context.reachableLAN
-          ) {
-            accessory.context.reachableLAN = true;
-            this.log(
-              "[%s] has been reported [online] via [LAN].",
-              accessory.displayName
-            );
-          }
-          if (this.debug) {
-            this.log(
-              "[%s] externally updated from above %s message and will be refreshed.",
-              accessory.displayName,
-              device.params.updateSource
-            );
-          }
-          if (!this.refreshAccessory(accessory, device.params)) {
-            this.log.warn(
-              "[%s] cannot be refreshed. Please try removing accessory from the Homebridge cache along with any secondary devices (SW1, SW2, etc.). [debug:%s:%s]",
-              accessory.displayName,
-              accessory.context.type,
-              accessory.context.channelCount
-            );
-          }
-        } else {
-          if (!(this.config.hideDevFromHB || "").includes(device.deviceid)) {
-            this.log.warn(
-              "[%s] Accessory received via %s update does not exist in Homebridge. If it's a new accessory please restart Homebridge so it is added.",
-              device.deviceid,
-              device.params.updateSource
-            );
+      }
+
+      if (device.params.updateSource === "LAN") {
+        if (!accessory.context.reachableLAN) {
+          accessory.context.reachableLAN = true;
+          this.devicesInHB.set(accessory.context.hbDeviceId, accessory);
+          this.wsClient.requestUpdate(accessory);
+          statusChange = true;
+          this.log.warn("[%s] has been reported [online] via [LAN].", accessory.displayName);
+        }
+        if (statusChange && !isX) {
+          for (let i = 1; i <= accessory.context.channelCount; i++) {
+            if (this.devicesInHB.has(deviceId + "SW" + i)) {
+              let oAccessory = this.devicesInHB.get(deviceId + "SW" + i);
+              oAccessory.context.reachableWAN = device.params.online;
+              oAccessory.context.reachableLAN = true;
+              this.devicesInHB.set(oAccessory.context.hbDeviceId, oAccessory);
+            }
           }
         }
-        break;
+      }
+      if (this.debug) {
+        this.log(
+          "[%s] externally updated from above %s message and will be refreshed.",
+          accessory.displayName,
+          device.params.updateSource
+        );
+      }
+      if (!this.refreshAccessory(accessory, device.params)) {
+        this.log.warn(
+          "[%s] cannot be refreshed. Please try removing accessory from the Homebridge cache along with any secondary devices (SW1, SW2, etc.). [debug:%s:%s]",
+          accessory.displayName,
+          accessory.context.type,
+          accessory.context.channelCount
+        );
+      }
+    } else {
+      if (!(this.config.hideDevFromHB || "").includes(deviceId)) {
+        this.log.warn(
+          "[%s] update received via %s does not exist in Homebridge so device will be added.",
+          deviceId,
+          device.params.updateSource
+        );
+        this.httpClient
+          .getDevice(deviceId)
+          .then(res => this.initialiseDevice(res))
+          .catch(err => this.log.error("[%s] error getting info [%s]", deviceId, err));
+      }
     }
   }
   internalValveUpdate(accessory, valve, value, callback) {
@@ -1296,28 +1067,19 @@ class eWeLink {
         .updateCharacteristic(Characteristic.InUse, value);
       switch (value) {
         case 0:
-          accessory
-            .getService(valve)
-            .updateCharacteristic(Characteristic.RemainingDuration, 0);
+          accessory.getService(valve).updateCharacteristic(Characteristic.RemainingDuration, 0);
           clearTimeout(accessory.getService(valve).timer);
           break;
         case 1:
-          let timer = accessory
-            .getService(valve)
-            .getCharacteristic(Characteristic.SetDuration).value;
-          accessory
-            .getService(valve)
-            .updateCharacteristic(Characteristic.RemainingDuration, timer);
+          let timer = accessory.getService(valve).getCharacteristic(Characteristic.SetDuration)
+            .value;
+          accessory.getService(valve).updateCharacteristic(Characteristic.RemainingDuration, timer);
           accessory.getService(valve).timer = setTimeout(() => {
-            accessory
-              .getService(valve)
-              .setCharacteristic(Characteristic.Active, 0);
+            accessory.getService(valve).setCharacteristic(Characteristic.Active, 0);
           }, timer * 1000);
           break;
       }
-      params.switches = this.devicesInEwe.get(
-        accessory.context.eweDeviceId
-      ).params.switches;
+      params.switches = this.devicesInEW.get(accessory.context.eweDeviceId).params.switches;
       switch (valve) {
         case "Valve A":
           params.switches[0].switch = value ? "on" : "off";
@@ -1342,8 +1104,7 @@ class eWeLink {
       params.switches[3].switch = "off";
       this.sendDeviceUpdate(accessory, params, callback);
     } catch (err) {
-      let str =
-        "[" + accessory.displayName + "] could not be updated as " + err + ".";
+      let str = "[" + accessory.displayName + "] could not be updated as " + err + ".";
       this.log.error(str);
       callback(str);
     }
@@ -1357,10 +1118,7 @@ class eWeLink {
       if (!(blindConfig = this.cusG.get(accessory.context.hbDeviceId))) {
         throw "group config missing";
       }
-      if (
-        blindConfig.type !== "blind" ||
-        !["oneSwitch", "twoSwitch"].includes(blindConfig.setup)
-      ) {
+      if (blindConfig.type !== "blind" || !["oneSwitch", "twoSwitch"].includes(blindConfig.setup)) {
         throw "improper configuration";
       }
       let oldPos,
@@ -1382,9 +1140,7 @@ class eWeLink {
           params.switch = "on";
           break;
         case "twoSwitch":
-          params.switches = this.devicesInEwe.get(
-            accessory.context.eweDeviceId
-          ).params.switches;
+          params.switches = this.devicesInEW.get(accessory.context.eweDeviceId).params.switches;
           params.switches[0].switch = value === 100 ? "on" : "off";
           params.switches[1].switch = value === 0 ? "on" : "off";
           break;
@@ -1404,8 +1160,7 @@ class eWeLink {
         callback();
       }, parseInt(blindConfig.operationTime) * 100);
     } catch (err) {
-      let str =
-        "[" + accessory.displayName + "] could not be updated as " + err + ".";
+      let str = "[" + accessory.displayName + "] could not be updated as " + err + ".";
       this.log.error(str);
       callback(str);
     }
@@ -1433,10 +1188,7 @@ class eWeLink {
         newPos = value,
         params = {},
         delay = 0;
-      if (
-        sensorDefinition &&
-        !(sAccessory = this.devicesInHB.get(garageConfig.sensorId + "SWX"))
-      ) {
+      if (sensorDefinition && !(sAccessory = this.devicesInHB.get(garageConfig.sensorId + "SWX"))) {
         throw "defined DW2 sensor doesn't exist";
       }
       if (sAccessory.context.type !== "sensor") {
@@ -1459,10 +1211,7 @@ class eWeLink {
       if (garageConfig.setup === "oneSwitch" && [2, 3].includes(oldPos)) {
         accessory
           .getService(Service.GarageDoorOpener)
-          .updateCharacteristic(
-            Characteristic.CurrentDoorState,
-            ((oldPos * 2) % 3) + 2
-          );
+          .updateCharacteristic(Characteristic.CurrentDoorState, ((oldPos * 2) % 3) + 2);
         delay = 1500;
       }
       setTimeout(() => {
@@ -1476,9 +1225,7 @@ class eWeLink {
               params.switch = "on";
               break;
             case "twoSwitch":
-              params.switches = this.devicesInEwe.get(
-                accessory.context.eweDeviceId
-              ).params.switches;
+              params.switches = this.devicesInEW.get(accessory.context.eweDeviceId).params.switches;
               params.switches[0].switch = newPos === 0 ? "on" : "off";
               params.switches[1].switch = newPos === 1 ? "on" : "off";
               break;
@@ -1499,8 +1246,7 @@ class eWeLink {
       callback();
     } catch (err) {
       accessory.context.inUse = false;
-      let str =
-        "[" + accessory.displayName + "] could not be updated as " + err + ".";
+      let str = "[" + accessory.displayName + "] could not be updated as " + err + ".";
       this.log.error(str);
       callback(str);
     }
@@ -1535,8 +1281,7 @@ class eWeLink {
       }, parseInt(lockConfig.operationTime) * 100);
     } catch (err) {
       accessory.context.inUse = false;
-      let str =
-        "[" + accessory.displayName + "] could not be updated as " + err + ".";
+      let str = "[" + accessory.displayName + "] could not be updated as " + err + ".";
       this.log.error(str);
       callback(str);
     }
@@ -1551,45 +1296,36 @@ class eWeLink {
         case "power":
           newPower = value;
           newSpeed = value ? 33 : 0;
-          newLight = accessory
-            .getService(Service.Lightbulb)
-            .getCharacteristic(Characteristic.On).value;
+          newLight = accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On)
+            .value;
           break;
         case "speed":
           newPower = value >= 33 ? 1 : 0;
           newSpeed = value;
-          newLight = accessory
-            .getService(Service.Lightbulb)
-            .getCharacteristic(Characteristic.On).value;
+          newLight = accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On)
+            .value;
           break;
         case "light":
-          newPower = accessory
-            .getService(Service.Fanv2)
-            .getCharacteristic(Characteristic.Active).value;
+          newPower = accessory.getService(Service.Fanv2).getCharacteristic(Characteristic.Active)
+            .value;
           newSpeed = accessory
             .getService(Service.Fanv2)
             .getCharacteristic(Characteristic.RotationSpeed).value;
           newLight = value;
           break;
       }
-      accessory
-        .getService(Service.Lightbulb)
-        .updateCharacteristic(Characteristic.On, newLight);
+      accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, newLight);
       accessory
         .getService(Service.Fanv2)
         .updateCharacteristic(Characteristic.Active, newPower)
         .updateCharacteristic(Characteristic.RotationSpeed, newSpeed);
       let params = {
-        switches: this.devicesInEwe.get(accessory.context.eweDeviceId).params
-          .switches,
+        switches: this.devicesInEW.get(accessory.context.eweDeviceId).params.switches,
       };
       params.switches[0].switch = newLight ? "on" : "off";
-      params.switches[1].switch =
-        newPower === 1 && newSpeed >= 33 ? "on" : "off";
-      params.switches[2].switch =
-        newPower === 1 && newSpeed >= 66 && newSpeed < 99 ? "on" : "off";
-      params.switches[3].switch =
-        newPower === 1 && newSpeed >= 99 ? "on" : "off";
+      params.switches[1].switch = newPower === 1 && newSpeed >= 33 ? "on" : "off";
+      params.switches[2].switch = newPower === 1 && newSpeed >= 66 && newSpeed < 99 ? "on" : "off";
+      params.switches[3].switch = newPower === 1 && newSpeed >= 99 ? "on" : "off";
       if (this.debug) {
         this.log.warn("Fan Update - setting " + type + " to " + value);
         this.log(
@@ -1602,8 +1338,7 @@ class eWeLink {
       }
       this.sendDeviceUpdate(accessory, params, callback);
     } catch (err) {
-      let str =
-        "[" + accessory.displayName + "] could not be updated as " + err + ".";
+      let str = "[" + accessory.displayName + "] could not be updated as " + err + ".";
       this.log.error(str);
       callback(str);
     }
@@ -1618,19 +1353,12 @@ class eWeLink {
         mainSwitch: value ? "on" : "off",
       };
       if (this.debug) {
-        this.log(
-          "[%s] updating to turn [%s].",
-          accessory.displayName,
-          value ? "on" : "off"
-        );
+        this.log("[%s] updating to turn [%s].", accessory.displayName, value ? "on" : "off");
       }
-      accessory
-        .getService(Service.Switch)
-        .updateCharacteristic(Characteristic.On, value);
+      accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, value);
       this.sendDeviceUpdate(accessory, params, callback);
     } catch (err) {
-      let str =
-        "[" + accessory.displayName + "] could not be updated as " + err + ".";
+      let str = "[" + accessory.displayName + "] could not be updated as " + err + ".";
       this.log.error(str);
       callback(str);
     }
@@ -1644,15 +1372,9 @@ class eWeLink {
         switch: value ? "on" : "off",
       };
       if (this.debug) {
-        this.log(
-          "[%s] requesting to turn [%s].",
-          accessory.displayName,
-          value ? "on" : "off"
-        );
+        this.log("[%s] requesting to turn [%s].", accessory.displayName, value ? "on" : "off");
       }
-      accessory
-        .getService(Service.Outlet)
-        .updateCharacteristic(Characteristic.On, value);
+      accessory.getService(Service.Outlet).updateCharacteristic(Characteristic.On, value);
       this.sendDeviceUpdate(accessory, params, callback);
     } catch (err) {
       callback("[" + accessory.displayName + "] " + err + ".");
@@ -1664,20 +1386,13 @@ class eWeLink {
         throw "it is currently offline";
       }
       let params = {
-        switches: this.devicesInEwe.get(accessory.context.eweDeviceId).params
-          .switches,
+        switches: this.devicesInEW.get(accessory.context.eweDeviceId).params.switches,
       };
       params.switches[0].switch = value ? "on" : "off";
       if (this.debug) {
-        this.log(
-          "[%s] requesting to turn [%s].",
-          accessory.displayName,
-          value ? "on" : "off"
-        );
+        this.log("[%s] requesting to turn [%s].", accessory.displayName, value ? "on" : "off");
       }
-      accessory
-        .getService(Service.Outlet)
-        .updateCharacteristic(Characteristic.On, value);
+      accessory.getService(Service.Outlet).updateCharacteristic(Characteristic.On, value);
       this.sendDeviceUpdate(accessory, params, callback);
     } catch (err) {
       callback("[" + accessory.displayName + "] " + err + ".");
@@ -1689,20 +1404,13 @@ class eWeLink {
         throw "it is currently offline";
       }
       let params = {
-        switches: this.devicesInEwe.get(accessory.context.eweDeviceId).params
-          .switches,
+        switches: this.devicesInEW.get(accessory.context.eweDeviceId).params.switches,
       };
       params.switches[0].switch = value ? "on" : "off";
       if (this.debug) {
-        this.log(
-          "[%s] requesting to turn [%s].",
-          accessory.displayName,
-          value ? "on" : "off"
-        );
+        this.log("[%s] requesting to turn [%s].", accessory.displayName, value ? "on" : "off");
       }
-      accessory
-        .getService(Service.Switch)
-        .updateCharacteristic(Characteristic.On, value);
+      accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, value);
       this.sendDeviceUpdate(accessory, params, callback);
     } catch (err) {
       callback("[" + accessory.displayName + "] " + err + ".");
@@ -1724,20 +1432,12 @@ class eWeLink {
             params.switch = value ? "on" : "off";
           }
           if (this.debug) {
-            this.log(
-              "[%s] updating to turn [%s].",
-              accessory.displayName,
-              value ? "on" : "off"
-            );
+            this.log("[%s] updating to turn [%s].", accessory.displayName, value ? "on" : "off");
           }
-          accessory
-            .getService(Service.Lightbulb)
-            .updateCharacteristic(Characteristic.On, value);
+          accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, value);
           break;
         case "0":
-          params.switches = this.devicesInEwe.get(
-            accessory.context.eweDeviceId
-          ).params.switches;
+          params.switches = this.devicesInEW.get(accessory.context.eweDeviceId).params.switches;
           params.switches[0].switch = value ? "on" : "off";
           params.switches[1].switch = value ? "on" : "off";
           params.switches[2].switch = value ? "on" : "off";
@@ -1749,16 +1449,10 @@ class eWeLink {
               value ? "on" : "off"
             );
           }
-          accessory
-            .getService(Service.Lightbulb)
-            .updateCharacteristic(Characteristic.On, value);
+          accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, value);
           for (let i = 1; i <= 4; i++) {
-            if (
-              this.devicesInHB.has(accessory.context.eweDeviceId + "SW" + i)
-            ) {
-              oAccessory = this.devicesInHB.get(
-                accessory.context.eweDeviceId + "SW" + i
-              );
+            if (this.devicesInHB.has(accessory.context.eweDeviceId + "SW" + i)) {
+              oAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW" + i);
               oAccessory
                 .getService(Service.Lightbulb)
                 .updateCharacteristic(Characteristic.On, value);
@@ -1770,26 +1464,14 @@ class eWeLink {
         case "3":
         case "4":
           if (this.debug) {
-            this.log(
-              "[%s] updating to turn [%s].",
-              accessory.displayName,
-              value ? "on" : "off"
-            );
+            this.log("[%s] updating to turn [%s].", accessory.displayName, value ? "on" : "off");
           }
-          accessory
-            .getService(Service.Lightbulb)
-            .updateCharacteristic(Characteristic.On, value);
+          accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, value);
           let tAccessory,
             masterState = "off";
-          params.switches = this.devicesInEwe.get(
-            accessory.context.eweDeviceId
-          ).params.switches;
+          params.switches = this.devicesInEW.get(accessory.context.eweDeviceId).params.switches;
           for (let i = 1; i <= 4; i++) {
-            if (
-              (tAccessory = this.devicesInHB.get(
-                accessory.context.eweDeviceId + "SW" + i
-              ))
-            ) {
+            if ((tAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW" + i))) {
               i === parseInt(accessory.context.switchNumber)
                 ? (params.switches[i - 1].switch = value ? "on" : "off")
                 : (params.switches[i - 1].switch = tAccessory
@@ -1798,9 +1480,7 @@ class eWeLink {
                     ? "on"
                     : "off");
               if (
-                tAccessory
-                  .getService(Service.Lightbulb)
-                  .getCharacteristic(Characteristic.On).value
+                tAccessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On).value
               ) {
                 masterState = "on";
               }
@@ -1808,22 +1488,17 @@ class eWeLink {
               params.switches[i - 1].switch = "off";
             }
           }
-          oAccessory = this.devicesInHB.get(
-            accessory.context.eweDeviceId + "SW0"
-          );
+          oAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW0");
           oAccessory
             .getService(Service.Lightbulb)
             .updateCharacteristic(Characteristic.On, masterState === "on");
           break;
         default:
-          throw (
-            "unknown switch number [" + accessory.context.switchNumber + "]"
-          );
+          throw "unknown switch number [" + accessory.context.switchNumber + "]";
       }
       this.sendDeviceUpdate(accessory, params, callback);
     } catch (err) {
-      let str =
-        "[" + accessory.displayName + "] could not be updated as " + err + ".";
+      let str = "[" + accessory.displayName + "] could not be updated as " + err + ".";
       this.log.error(str);
       callback(str);
     }
@@ -1836,15 +1511,9 @@ class eWeLink {
       let params = {};
       if (value === 0) {
         params.switch = "off";
-        accessory
-          .getService(Service.Lightbulb)
-          .updateCharacteristic(Characteristic.On, false);
+        accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, false);
       } else {
-        if (
-          !accessory
-            .getService(Service.Lightbulb)
-            .getCharacteristic(Characteristic.On).value
-        ) {
+        if (!accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On).value) {
           params.switch = "on";
         }
         switch (accessory.context.eweUIID) {
@@ -1863,16 +1532,11 @@ class eWeLink {
           .updateCharacteristic(Characteristic.Brightness, value);
       }
       if (this.debug) {
-        this.log(
-          "[%s] updating brightness to [%s%].",
-          accessory.displayName,
-          value
-        );
+        this.log("[%s] updating brightness to [%s%].", accessory.displayName, value);
       }
       setTimeout(() => this.sendDeviceUpdate(accessory, params, callback), 250);
     } catch (err) {
-      let str =
-        "[" + accessory.displayName + "] could not be updated as " + err + ".";
+      let str = "[" + accessory.displayName + "] could not be updated as " + err + ".";
       this.log.error(str);
       callback(str);
     }
@@ -1884,9 +1548,8 @@ class eWeLink {
       }
       let newRGB,
         params = {},
-        curHue = accessory
-          .getService(Service.Lightbulb)
-          .getCharacteristic(Characteristic.Hue).value,
+        curHue = accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.Hue)
+          .value,
         curSat = accessory
           .getService(Service.Lightbulb)
           .getCharacteristic(Characteristic.Saturation).value;
@@ -1917,15 +1580,9 @@ class eWeLink {
               throw "unknown device UIID";
           }
           if (this.debug) {
-            this.log(
-              "[%s] updating hue to [%s°].",
-              accessory.displayName,
-              value
-            );
+            this.log("[%s] updating hue to [%s°].", accessory.displayName, value);
           }
-          accessory
-            .getService(Service.Lightbulb)
-            .updateCharacteristic(Characteristic.Hue, value);
+          accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.Hue, value);
           break;
         case "bri":
           switch (accessory.context.eweUIID) {
@@ -1949,11 +1606,7 @@ class eWeLink {
               break;
           }
           if (this.debug) {
-            this.log(
-              "[%s] updating brightness to [%s%].",
-              accessory.displayName,
-              value
-            );
+            this.log("[%s] updating brightness to [%s%].", accessory.displayName, value);
           }
           accessory
             .getService(Service.Lightbulb)
@@ -1964,8 +1617,7 @@ class eWeLink {
       }
       setTimeout(() => this.sendDeviceUpdate(accessory, params, callback), 250);
     } catch (err) {
-      let str =
-        "[" + accessory.displayName + "] could not be updated as " + err + ".";
+      let str = "[" + accessory.displayName + "] could not be updated as " + err + ".";
       this.log.error(str);
       callback(str);
     }
@@ -1981,20 +1633,12 @@ class eWeLink {
         case "X":
           params.switch = value ? "on" : "off";
           if (this.debug) {
-            this.log(
-              "[%s] updating to turn [%s].",
-              accessory.displayName,
-              value ? "on" : "off"
-            );
+            this.log("[%s] updating to turn [%s].", accessory.displayName, value ? "on" : "off");
           }
-          accessory
-            .getService(Service.Switch)
-            .updateCharacteristic(Characteristic.On, value);
+          accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, value);
           break;
         case "0":
-          params.switches = this.devicesInEwe.get(
-            accessory.context.eweDeviceId
-          ).params.switches;
+          params.switches = this.devicesInEW.get(accessory.context.eweDeviceId).params.switches;
           params.switches[0].switch = value ? "on" : "off";
           params.switches[1].switch = value ? "on" : "off";
           params.switches[2].switch = value ? "on" : "off";
@@ -2006,19 +1650,11 @@ class eWeLink {
               value ? "on" : "off"
             );
           }
-          accessory
-            .getService(Service.Switch)
-            .updateCharacteristic(Characteristic.On, value);
+          accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, value);
           for (let i = 1; i <= 4; i++) {
-            if (
-              this.devicesInHB.has(accessory.context.eweDeviceId + "SW" + i)
-            ) {
-              oAccessory = this.devicesInHB.get(
-                accessory.context.eweDeviceId + "SW" + i
-              );
-              oAccessory
-                .getService(Service.Switch)
-                .updateCharacteristic(Characteristic.On, value);
+            if (this.devicesInHB.has(accessory.context.eweDeviceId + "SW" + i)) {
+              oAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW" + i);
+              oAccessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, value);
             }
           }
           break;
@@ -2027,26 +1663,14 @@ class eWeLink {
         case "3":
         case "4":
           if (this.debug) {
-            this.log(
-              "[%s] updating to turn [%s].",
-              accessory.displayName,
-              value ? "on" : "off"
-            );
+            this.log("[%s] updating to turn [%s].", accessory.displayName, value ? "on" : "off");
           }
-          accessory
-            .getService(Service.Switch)
-            .updateCharacteristic(Characteristic.On, value);
+          accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, value);
           let tAccessory,
             masterState = "off";
-          params.switches = this.devicesInEwe.get(
-            accessory.context.eweDeviceId
-          ).params.switches;
+          params.switches = this.devicesInEW.get(accessory.context.eweDeviceId).params.switches;
           for (let i = 1; i <= 4; i++) {
-            if (
-              (tAccessory = this.devicesInHB.get(
-                accessory.context.eweDeviceId + "SW" + i
-              ))
-            ) {
+            if ((tAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW" + i))) {
               i === parseInt(accessory.context.switchNumber)
                 ? (params.switches[i - 1].switch = value ? "on" : "off")
                 : (params.switches[i - 1].switch = tAccessory
@@ -2055,9 +1679,7 @@ class eWeLink {
                     ? "on"
                     : "off");
               if (
-                tAccessory
-                  .getService(Service.Switch)
-                  .getCharacteristic(Characteristic.On).value
+                tAccessory.getService(Service.Switch).getCharacteristic(Characteristic.On).value
               ) {
                 masterState = "on";
               }
@@ -2065,22 +1687,17 @@ class eWeLink {
               params.switches[i - 1].switch = "off";
             }
           }
-          oAccessory = this.devicesInHB.get(
-            accessory.context.eweDeviceId + "SW0"
-          );
+          oAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW0");
           oAccessory
             .getService(Service.Switch)
             .updateCharacteristic(Characteristic.On, masterState === "on");
           break;
         default:
-          throw (
-            "unknown switch number [" + accessory.context.switchNumber + "]"
-          );
+          throw "unknown switch number [" + accessory.context.switchNumber + "]";
       }
       this.sendDeviceUpdate(accessory, params, callback);
     } catch (err) {
-      let str =
-        "[" + accessory.displayName + "] could not be updated as " + err + ".";
+      let str = "[" + accessory.displayName + "] could not be updated as " + err + ".";
       this.log.error(str);
       callback(str);
     }
@@ -2114,14 +1731,7 @@ class eWeLink {
         3000
       );
     } catch (err) {
-      let str =
-        "[" +
-        accessory.displayName +
-        " " +
-        name +
-        "] could not be updated as " +
-        err +
-        ".";
+      let str = "[" + accessory.displayName + " " + name + "] could not be updated as " + err + ".";
       this.log.error(str);
       callback(str);
     }
@@ -2131,14 +1741,8 @@ class eWeLink {
       ["A", "B"].forEach((v, k) => {
         accessory
           .getService("Valve " + v)
-          .updateCharacteristic(
-            Characteristic.Active,
-            params.switches[k].switch === "on"
-          )
-          .updateCharacteristic(
-            Characteristic.InUse,
-            params.switches[k].switch === "on"
-          );
+          .updateCharacteristic(Characteristic.Active, params.switches[k].switch === "on")
+          .updateCharacteristic(Characteristic.InUse, params.switches[k].switch === "on");
         if (params.switches[k].switch === "on") {
           let timer = accessory
             .getService("Valve " + v)
@@ -2147,9 +1751,7 @@ class eWeLink {
             .getService("Valve " + v)
             .updateCharacteristic(Characteristic.RemainingDuration, timer);
           accessory.getService("Valve " + v).timer = setTimeout(() => {
-            accessory
-              .getService("Valve " + v)
-              .setCharacteristic(Characteristic.Active, 0);
+            accessory.getService("Valve " + v).setCharacteristic(Characteristic.Active, 0);
           }, timer * 1000);
         } else {
           accessory
@@ -2159,11 +1761,7 @@ class eWeLink {
         }
       });
     } catch (err) {
-      this.log.warn(
-        "[%s] could not be updated as %s.",
-        accessory.displayName,
-        err
-      );
+      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
     }
   }
   externalBlindUpdate(accessory, params) {
@@ -2172,10 +1770,7 @@ class eWeLink {
       if (!(blindConfig = this.cusG.get(accessory.context.hbDeviceId))) {
         throw "group config missing";
       }
-      if (
-        blindConfig.type !== "blind" ||
-        ["oneSwitch", "twoSwitch"].includes(blindConfig.setup)
-      ) {
+      if (blindConfig.type !== "blind" || ["oneSwitch", "twoSwitch"].includes(blindConfig.setup)) {
         throw "improper configuration";
       }
       switch (blindConfig.setup) {
@@ -2191,10 +1786,7 @@ class eWeLink {
               : 0;
           break;
         case "twoSwitch":
-          if (
-            params.switches[0].switch === "off" &&
-            params.switches[1].switch === "off"
-          ) {
+          if (params.switches[0].switch === "off" && params.switches[1].switch === "off") {
             return;
           }
           let switchUp = params.switches[0].switch === "on" ? -1 : 0, // matrix of numbers to get
@@ -2213,11 +1805,7 @@ class eWeLink {
           .updateCharacteristic(Characteristic.CurrentPosition, nSte * 100);
       }, parseInt(blindConfig.operationTime) * 100);
     } catch (err) {
-      this.log.warn(
-        "[%s] could not be updated as %s.",
-        accessory.displayName,
-        err
-      );
+      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
     }
   }
   externalGarageUpdate(accessory, params) {
@@ -2271,11 +1859,7 @@ class eWeLink {
       }, parseInt(garageConfig.operationTime) * 100);
     } catch (err) {
       accessory.context.inUse = false;
-      this.log.warn(
-        "[%s] could not be updated as %s.",
-        accessory.displayName,
-        err
-      );
+      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
     }
   }
   externalLockUpdate(accessory, params) {
@@ -2304,11 +1888,7 @@ class eWeLink {
       }, parseInt(lockConfig.operationTime) * 100);
     } catch (err) {
       accessory.context.inUse = false;
-      this.log.warn(
-        "[%s] could not be updated as %s.",
-        accessory.displayName,
-        err
-      );
+      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
     }
   }
   externalSensorUpdate(accessory, params) {
@@ -2318,14 +1898,8 @@ class eWeLink {
             accessory.getService(Service.BatteryService) ||
             accessory.addService(Service.BatteryService),
           scaledBattery = Math.round(params.battery * 33.3);
-        batteryService.updateCharacteristic(
-          Characteristic.BatteryLevel,
-          scaledBattery
-        );
-        batteryService.updateCharacteristic(
-          Characteristic.StatusLowBattery,
-          scaledBattery < 25
-        );
+        batteryService.updateCharacteristic(Characteristic.BatteryLevel, scaledBattery);
+        batteryService.updateCharacteristic(Characteristic.StatusLowBattery, scaledBattery < 25);
       }
       let newState = params.switch === "on" ? 1 : 0,
         oAccessory = false;
@@ -2333,10 +1907,7 @@ class eWeLink {
         .getService(Service.ContactSensor)
         .updateCharacteristic(Characteristic.ContactSensorState, newState);
       this.cusG.forEach(group => {
-        if (
-          group.sensorId === accessory.context.eweDeviceId &&
-          group.type === "garage"
-        ) {
+        if (group.sensorId === accessory.context.eweDeviceId && group.type === "garage") {
           if ((oAccessory = this.devicesInHB.get(group.deviceId + "SWX"))) {
             switch (newState) {
               case 0:
@@ -2360,11 +1931,7 @@ class eWeLink {
         }
       });
     } catch (err) {
-      this.log.warn(
-        "[%s] could not be updated as %s.",
-        accessory.displayName,
-        err
-      );
+      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
     }
   }
   externalFanUpdate(accessory, params) {
@@ -2372,11 +1939,7 @@ class eWeLink {
       let light, status, speed;
       if (Array.isArray(params.switches)) {
         light = params.switches[0].switch === "on";
-        switch (
-          params.switches[1].switch +
-          params.switches[2].switch +
-          params.switches[3].switch
-        ) {
+        switch (params.switches[1].switch + params.switches[2].switch + params.switches[3].switch) {
           default:
             status = 0;
             speed = 0;
@@ -2404,19 +1967,13 @@ class eWeLink {
       } else {
         throw "unknown parameters received";
       }
-      accessory
-        .getService(Service.Lightbulb)
-        .updateCharacteristic(Characteristic.On, light);
+      accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, light);
       accessory
         .getService(Service.Fanv2)
         .updateCharacteristic(Characteristic.Active, status)
         .updateCharacteristic(Characteristic.RotationSpeed, speed);
     } catch (err) {
-      this.log.warn(
-        "[%s] could not be updated as %s.",
-        accessory.displayName,
-        err
-      );
+      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
     }
   }
   externalThermostatUpdate(accessory, params) {
@@ -2428,9 +1985,7 @@ class eWeLink {
         let newState = params.hasOwnProperty("switch")
           ? params.switch === "on"
           : params.mainSwitch === "on";
-        accessory
-          .getService(Service.Switch)
-          .updateCharacteristic(Characteristic.On, newState);
+        accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, newState);
       }
       let eveLog = {
         time: Date.now(),
@@ -2440,9 +1995,7 @@ class eWeLink {
         accessory.getService(Service.TemperatureSensor)
       ) {
         let currentTemp =
-          params.currentTemperature !== "unavailable"
-            ? params.currentTemperature
-            : 0;
+          params.currentTemperature !== "unavailable" ? params.currentTemperature : 0;
         accessory
           .getService(Service.TemperatureSensor)
           .updateCharacteristic(Characteristic.CurrentTemperature, currentTemp);
@@ -2452,25 +2005,17 @@ class eWeLink {
         params.hasOwnProperty("currentHumidity") &&
         accessory.getService(Service.HumiditySensor)
       ) {
-        let currentHumi =
-          params.currentHumidity !== "unavailable" ? params.currentHumidity : 0;
+        let currentHumi = params.currentHumidity !== "unavailable" ? params.currentHumidity : 0;
         accessory
           .getService(Service.HumiditySensor)
-          .updateCharacteristic(
-            Characteristic.CurrentRelativeHumidity,
-            currentHumi
-          );
+          .updateCharacteristic(Characteristic.CurrentRelativeHumidity, currentHumi);
         eveLog.humidity = parseFloat(currentHumi);
       }
       if (eveLog.hasOwnProperty("temp") || eveLog.hasOwnProperty("humidity")) {
         accessory.eveLogger.addEntry(eveLog);
       }
     } catch (err) {
-      this.log.warn(
-        "[%s] could not be updated as %s.",
-        accessory.displayName,
-        err
-      );
+      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
     }
   }
   externalOutletUpdate(accessory, params) {
@@ -2489,13 +2034,8 @@ class eWeLink {
           );
         accessory
           .getService(Service.Outlet)
-          .updateCharacteristic(
-            Characteristic.OutletInUse,
-            parseFloat(params.power) > 0
-          );
-        let isOn = accessory
-          .getService(Service.Outlet)
-          .getCharacteristic(Characteristic.On).value;
+          .updateCharacteristic(Characteristic.OutletInUse, parseFloat(params.power) > 0);
+        let isOn = accessory.getService(Service.Outlet).getCharacteristic(Characteristic.On).value;
         accessory.eveLogger.addEntry({
           time: Date.now(),
           power: isOn ? parseFloat(params.power) : 0,
@@ -2504,10 +2044,7 @@ class eWeLink {
       if (params.hasOwnProperty("voltage")) {
         accessory
           .getService(Service.Outlet)
-          .updateCharacteristic(
-            EveService.Characteristics.Voltage,
-            parseFloat(params.voltage)
-          );
+          .updateCharacteristic(EveService.Characteristics.Voltage, parseFloat(params.voltage));
       }
       if (params.hasOwnProperty("current")) {
         accessory
@@ -2518,43 +2055,25 @@ class eWeLink {
           );
       }
     } catch (err) {
-      this.log.warn(
-        "[%s] could not be updated as %s.",
-        accessory.displayName,
-        err
-      );
+      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
     }
   }
   externalUSBUpdate(accessory, params) {
     try {
       accessory
         .getService(Service.Outlet)
-        .updateCharacteristic(
-          Characteristic.On,
-          params.switches[0].switch === "on"
-        );
+        .updateCharacteristic(Characteristic.On, params.switches[0].switch === "on");
     } catch (err) {
-      this.log.warn(
-        "[%s] could not be updated as %s.",
-        accessory.displayName,
-        err
-      );
+      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
     }
   }
   externalSCMUpdate(accessory, params) {
     try {
       accessory
         .getService(Service.Switch)
-        .updateCharacteristic(
-          Characteristic.On,
-          params.switches[0].switch === "on"
-        );
+        .updateCharacteristic(Characteristic.On, params.switches[0].switch === "on");
     } catch (err) {
-      this.log.warn(
-        "[%s] could not be updated as %s.",
-        accessory.displayName,
-        err
-      );
+      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
     }
   }
   externalSingleLightUpdate(accessory, params) {
@@ -2564,20 +2083,13 @@ class eWeLink {
         isOn = false;
       if (accessory.context.eweUIID === 22 && params.hasOwnProperty("state")) {
         isOn = params.state === "on";
-      } else if (
-        accessory.context.eweUIID !== 22 &&
-        params.hasOwnProperty("switch")
-      ) {
+      } else if (accessory.context.eweUIID !== 22 && params.hasOwnProperty("switch")) {
         isOn = params.switch === "on";
       } else {
-        isOn = accessory
-          .getService(Service.Lightbulb)
-          .getCharacteristic(Characteristic.On).value;
+        isOn = accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On).value;
       }
       if (isOn) {
-        accessory
-          .getService(Service.Lightbulb)
-          .updateCharacteristic(Characteristic.On, true);
+        accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, true);
         switch (accessory.context.eweUIID) {
           case 36: // KING-M4
             if (params.hasOwnProperty("bright")) {
@@ -2591,10 +2103,7 @@ class eWeLink {
             if (params.hasOwnProperty("brightness")) {
               accessory
                 .getService(Service.Lightbulb)
-                .updateCharacteristic(
-                  Characteristic.Brightness,
-                  params.brightness
-                );
+                .updateCharacteristic(Characteristic.Brightness, params.brightness);
             }
             break;
           case 22: // B1
@@ -2609,9 +2118,7 @@ class eWeLink {
               mode = 2;
             }
             if (mode === 2) {
-              accessory
-                .getService(Service.Lightbulb)
-                .updateCharacteristic(Characteristic.On, true);
+              accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, true);
               newColour = convert.rgb.hsv(
                 parseInt(params.channel2),
                 parseInt(params.channel3),
@@ -2633,11 +2140,7 @@ class eWeLink {
                 .updateCharacteristic(Characteristic.Brightness, params.bright);
             }
             if (params.hasOwnProperty("colorR")) {
-              newColour = convert.rgb.hsv(
-                params.colorR,
-                params.colorG,
-                params.colorB
-              );
+              newColour = convert.rgb.hsv(params.colorR, params.colorG, params.colorB);
               accessory
                 .getService(Service.Lightbulb)
                 .updateCharacteristic(Characteristic.Hue, newColour[0])
@@ -2648,16 +2151,10 @@ class eWeLink {
             return;
         }
       } else {
-        accessory
-          .getService(Service.Lightbulb)
-          .updateCharacteristic(Characteristic.On, false);
+        accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, false);
       }
     } catch (err) {
-      this.log.warn(
-        "[%s] could not be updated as %s.",
-        accessory.displayName,
-        err
-      );
+      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
     }
   }
   externalMultiLightUpdate(accessory, params) {
@@ -2669,24 +2166,15 @@ class eWeLink {
           let oAccessory = this.devicesInHB.get(idToCheck + i);
           oAccessory
             .getService(Service.Lightbulb)
-            .updateCharacteristic(
-              Characteristic.On,
-              params.switches[i - 1].switch === "on"
-            );
+            .updateCharacteristic(Characteristic.On, params.switches[i - 1].switch === "on");
           if (params.switches[i - 1].switch === "on") {
             primaryState = true;
           }
         }
       }
-      accessory
-        .getService(Service.Lightbulb)
-        .updateCharacteristic(Characteristic.On, primaryState);
+      accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, primaryState);
     } catch (err) {
-      this.log.warn(
-        "[%s] could not be updated as %s.",
-        accessory.displayName,
-        err
-      );
+      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
     }
   }
   externalSingleSwitchUpdate(accessory, params) {
@@ -2695,11 +2183,7 @@ class eWeLink {
         .getService(Service.Switch)
         .updateCharacteristic(Characteristic.On, params.switch === "on");
     } catch (err) {
-      this.log.warn(
-        "[%s] could not be updated as %s.",
-        accessory.displayName,
-        err
-      );
+      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
     }
   }
   externalMultiSwitchUpdate(accessory, params) {
@@ -2711,24 +2195,15 @@ class eWeLink {
           let oAccessory = this.devicesInHB.get(idToCheck + i);
           oAccessory
             .getService(Service.Switch)
-            .updateCharacteristic(
-              Characteristic.On,
-              params.switches[i - 1].switch === "on"
-            );
+            .updateCharacteristic(Characteristic.On, params.switches[i - 1].switch === "on");
           if (params.switches[i - 1].switch === "on") {
             primaryState = true;
           }
         }
       }
-      accessory
-        .getService(Service.Switch)
-        .updateCharacteristic(Characteristic.On, primaryState);
+      accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, primaryState);
     } catch (err) {
-      this.log.warn(
-        "[%s] could not be updated as %s.",
-        accessory.displayName,
-        err
-      );
+      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
     }
   }
   externalRFDeviceUpdate(accessory, params) {
@@ -2744,9 +2219,7 @@ class eWeLink {
         // RF Button
         let bAccessory;
         if (
-          (bAccessory = this.devicesInHB.get(
-            idToCheck + accessory.context.rfChlMap[params.rfChl]
-          ))
+          (bAccessory = this.devicesInHB.get(idToCheck + accessory.context.rfChlMap[params.rfChl]))
         ) {
           bAccessory
             .getService(bAccessory.context.rfChls[params.rfChl])
@@ -2800,81 +2273,51 @@ class eWeLink {
                   case "co":
                     oAccessory
                       .getService(Service.CarbonMonoxideSensor)
-                      .updateCharacteristic(
-                        Characteristic.CarbonMonoxideDetected,
-                        1
-                      );
+                      .updateCharacteristic(Characteristic.CarbonMonoxideDetected, 1);
                     setTimeout(() => {
                       oAccessory
                         .getService(Service.CarbonMonoxideSensor)
-                        .updateCharacteristic(
-                          Characteristic.CarbonMonoxideDetected,
-                          0
-                        );
+                        .updateCharacteristic(Characteristic.CarbonMonoxideDetected, 0);
                     }, (this.config.sensorTimeLength || 2) * 1000);
                     break;
                   case "co2":
                     oAccessory
                       .getService(Service.CarbonDioxideSensor)
-                      .updateCharacteristic(
-                        Characteristic.CarbonDioxideDetected,
-                        1
-                      );
+                      .updateCharacteristic(Characteristic.CarbonDioxideDetected, 1);
                     setTimeout(() => {
                       oAccessory
                         .getService(Service.CarbonDioxideSensor)
-                        .updateCharacteristic(
-                          Characteristic.CarbonDioxideDetected,
-                          0
-                        );
+                        .updateCharacteristic(Characteristic.CarbonDioxideDetected, 0);
                     }, (this.config.sensorTimeLength || 2) * 1000);
                     break;
                   case "contact":
                     oAccessory
                       .getService(Service.ContactSensor)
-                      .updateCharacteristic(
-                        Characteristic.ContactSensorState,
-                        1
-                      );
+                      .updateCharacteristic(Characteristic.ContactSensorState, 1);
                     setTimeout(() => {
                       oAccessory
                         .getService(Service.ContactSensor)
-                        .updateCharacteristic(
-                          Characteristic.ContactSensorState,
-                          0
-                        );
+                        .updateCharacteristic(Characteristic.ContactSensorState, 0);
                     }, (this.config.sensorTimeLength || 2) * 1000);
                     break;
                   case "occupancy":
                     oAccessory
                       .getService(Service.OccupancySensor)
-                      .updateCharacteristic(
-                        Characteristic.OccupancyDetected,
-                        1
-                      );
+                      .updateCharacteristic(Characteristic.OccupancyDetected, 1);
                     setTimeout(() => {
                       oAccessory
                         .getService(Service.OccupancySensor)
-                        .updateCharacteristic(
-                          Characteristic.OccupancyDetected,
-                          0
-                        );
+                        .updateCharacteristic(Characteristic.OccupancyDetected, 0);
                     }, (this.config.sensorTimeLength || 2) * 1000);
                     break;
                   default:
                     oAccessory
                       .getService(Service.MotionSensor)
-                      .updateCharacteristic(
-                        Characteristic.MotionDetected,
-                        true
-                      );
+                      .updateCharacteristic(Characteristic.MotionDetected, true);
                     setTimeout(() => {
                       oAccessory
                         .getService(Service.MotionSensor)
-                        .updateCharacteristic(
-                          Characteristic.MotionDetected,
-                          false
-                        );
+                        .updateCharacteristic(Characteristic.MotionDetected, false);
                     }, (this.config.sensorTimeLength || 2) * 1000);
                     break;
                 }
@@ -2890,11 +2333,7 @@ class eWeLink {
           });
       }
     } catch (err) {
-      this.log.warn(
-        "[%s] could not be updated as %s.",
-        accessory.displayName,
-        err
-      );
+      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
     }
   }
   externalZBDeviceUpdate(accessory, params) {
@@ -2904,24 +2343,15 @@ class eWeLink {
         let batteryService =
           accessory.getService(Service.BatteryService) ||
           accessory.addService(Service.BatteryService);
-        batteryService.updateCharacteristic(
-          Characteristic.BatteryLevel,
-          params.battery
-        );
-        batteryService.updateCharacteristic(
-          Characteristic.StatusLowBattery,
-          params.battery < 25
-        );
+        batteryService.updateCharacteristic(Characteristic.BatteryLevel, params.battery);
+        batteryService.updateCharacteristic(Characteristic.StatusLowBattery, params.battery < 25);
       }
       switch (accessory.context.eweUIID) {
         case 1000:
           if (params.hasOwnProperty("key") && [0, 1, 2].includes(params.key)) {
             accessory
               .getService(Service.StatelessProgrammableSwitch)
-              .updateCharacteristic(
-                Characteristic.ProgrammableSwitchEvent,
-                params.key
-              );
+              .updateCharacteristic(Characteristic.ProgrammableSwitchEvent, params.key);
           }
           break;
         case 1770:
@@ -2932,34 +2362,22 @@ class eWeLink {
             let currentTemp = parseInt(params.temperature) / 100;
             accessory
               .getService(Service.TemperatureSensor)
-              .updateCharacteristic(
-                Characteristic.CurrentTemperature,
-                currentTemp
-              );
+              .updateCharacteristic(Characteristic.CurrentTemperature, currentTemp);
             eveLog.temp = parseFloat(currentTemp);
           }
           if (params.hasOwnProperty("humidity")) {
             let currentHumi = parseInt(params.humidity) / 100;
             accessory
               .getService(Service.HumiditySensor)
-              .updateCharacteristic(
-                Characteristic.CurrentRelativeHumidity,
-                currentHumi
-              );
+              .updateCharacteristic(Characteristic.CurrentRelativeHumidity, currentHumi);
             eveLog.humidity = parseFloat(currentHumi);
           }
-          if (
-            eveLog.hasOwnProperty("temp") ||
-            eveLog.hasOwnProperty("humidity")
-          ) {
+          if (eveLog.hasOwnProperty("temp") || eveLog.hasOwnProperty("humidity")) {
             accessory.eveLogger.addEntry(eveLog);
           }
           break;
         case 2026:
-          if (
-            params.hasOwnProperty("motion") &&
-            params.hasOwnProperty("trigTime")
-          ) {
+          if (params.hasOwnProperty("motion") && params.hasOwnProperty("trigTime")) {
             let timeNow = new Date(),
               diff = (timeNow.getTime() - params.trigTime) / 1000;
             accessory
@@ -2977,19 +2395,12 @@ class eWeLink {
           if (params.hasOwnProperty("lock") && [0, 1].includes(params.lock)) {
             accessory
               .getService(Service.ContactSensor)
-              .updateCharacteristic(
-                Characteristic.ContactSensorState,
-                params.lock
-              );
+              .updateCharacteristic(Characteristic.ContactSensorState, params.lock);
           }
           break;
       }
     } catch (err) {
-      this.log.warn(
-        "[%s] could not be updated as %s.",
-        accessory.displayName,
-        err
-      );
+      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
     }
   }
 }
diff --git a/lib/eWeLinkHTTP.js b/lib/eWeLinkHTTP.js
index 1aafd1e4..24b1a69d 100644
--- a/lib/eWeLinkHTTP.js
+++ b/lib/eWeLinkHTTP.js
@@ -5,29 +5,92 @@ const axios = require("axios"),
   crypto = require("crypto");
 module.exports = class eWeLinkHTTP {
   constructor(config, log) {
-    this.config = config;
     this.log = log;
-    this.debug = this.config.debug || false;
-    this.debugReqRes = this.config.debugReqRes || false;
+    this.debug = config.debug || false;
+    this.debugReqRes = config.debugReqRes || false;
+    this.username = config.username.toString();
+    this.password = config.password.toString();
+    this.cCode = "+" + config.countryCode.toString().replace("+", "").replace(" ", "");
+  }
+  getHost() {
+    let data = {
+        appid: constants.appId,
+        country_code: this.cCode,
+        nonce: Math.random().toString(36).substr(2, 8),
+        ts: Math.floor(new Date().getTime() / 1000),
+        version: 8,
+      },
+      dataToSign = [];
+    Object.keys(data).forEach(k => {
+      dataToSign.push({
+        key: k,
+        value: data.k,
+      });
+    });
+    dataToSign.sort((a, b) => (a.key < b.key ? -1 : 1));
+    dataToSign = dataToSign.map(k => k.key + "=" + k.value).join("&");
+    dataToSign = crypto
+      .createHmac("sha256", constants.appSecret)
+      .update(dataToSign)
+      .digest("base64");
+    if (this.debugReqRes) {
+      let msg = JSON.stringify(data, null, 2);
+      this.log.warn("Sending HTTP getHost request. This text is yellow for clarity.\n%s", msg);
+    } else if (this.debug) {
+      this.log("Sending HTTP getHost request.");
+    }
+    return new Promise((resolve, reject) => {
+      axios
+        .get("https://api.coolkit.cc:8080/api/user/region", {
+          headers: {
+            Authorization: "Sign " + dataToSign,
+            "Content-Type": "application/json",
+          },
+          params: data,
+        })
+        .then(res => {
+          let body = res.data;
+          if (!body.region) {
+            throw "Server did not respond with a region.\n" + JSON.stringify(body, null, 2);
+          }
+          switch (body.region) {
+            case "eu":
+            case "us":
+            case "as":
+              this.httpHost = body.region + "-apia.coolkit.cc";
+              break;
+            case "cn":
+              this.httpHost = "cn-apia.coolkit.cn";
+              break;
+            default:
+              throw "No valid region received - [" + body.region + "].";
+          }
+          if (this.debug) {
+            this.log("HTTP API host received [%s].", this.httpHost);
+          }
+          resolve(this.httpHost);
+        })
+        .catch(err => {
+          if (err.hasOwnProperty("code") && ["ENOTFOUND", "ETIMEDOUT"].includes(err.code)) {
+            this.log.warn("Unable to reach eWeLink. Retrying in 30 seconds.");
+            this.delay().then(() => resolve(this.getHost()));
+          } else {
+            reject(err.message || err);
+          }
+        });
+    });
   }
   login() {
     let data = {
-      countryCode:
-        "+" +
-        this.config.countryCode.toString().replace("+", "").replace(" ", ""),
-      password: this.config.password,
+      countryCode: this.cCode,
+      password: this.password,
     };
-    this.config.username.includes("@")
-      ? (data.email = this.config.username)
-      : (data.phoneNumber = this.config.username);
+    this.username.includes("@") ? (data.email = this.username) : (data.phoneNumber = this.username);
     if (this.debugReqRes) {
       let msg = JSON.stringify(data, null, 2)
-        .replace(this.config.password, "**hidden**")
-        .replace(this.config.username, "**hidden**");
-      this.log.warn(
-        "Sending HTTP login request. This text is yellow for clarity.\n%s",
-        msg
-      );
+        .replace(this.password, "**hidden**")
+        .replace(this.username, "**hidden**");
+      this.log.warn("Sending HTTP login request. This text is yellow for clarity.\n%s", msg);
     } else if (this.debug) {
       this.log("Sending HTTP login request.");
     }
@@ -56,17 +119,18 @@ module.exports = class eWeLinkHTTP {
             body.hasOwnProperty("data") &&
             body.data.hasOwnProperty("region")
           ) {
-            switch (body.data.region) {
+            let givenRegion = body.data.region;
+            switch (givenRegion) {
               case "eu":
               case "us":
               case "as":
-                this.httpHost = body.data.region + "-apia.coolkit.cc";
+                this.httpHost = givenRegion + "-apia.coolkit.cc";
                 break;
               case "cn":
                 this.httpHost = "cn-apia.coolkit.cn";
                 break;
               default:
-                throw "No valid region received - [" + body.data.region + "].";
+                throw "No valid region received - [" + givenRegion + "].";
             }
             if (this.debug) {
               this.log("New HTTP API host received [%s].", this.httpHost);
@@ -75,10 +139,7 @@ module.exports = class eWeLinkHTTP {
             return;
           }
           if (!body.data.at) {
-            throw (
-              "Server did not respond with an authentication token. Please double check your eWeLink username and password in the Homebridge configuration.\n" +
-              JSON.stringify(body, null, 2)
-            );
+            throw "No auth token received.\n" + JSON.stringify(body, null, 2);
           }
           this.aToken = body.data.at;
           this.apiKey = body.data.user.apikey;
@@ -88,111 +149,95 @@ module.exports = class eWeLinkHTTP {
             httpHost: this.httpHost,
           });
         })
-        .catch(err => {
-          reject(err);
-        });
+        .catch(err => reject(err.message || err));
     });
   }
-  getHost() {
-    let data = {
-        appid: constants.appId,
-        country_code: this.config.countryCode
-          .toString()
-          .replace("+", "")
-          .replace(" ", ""),
-        nonce: Math.random().toString(36).substr(2, 8),
-        ts: Math.floor(new Date().getTime() / 1000),
-        version: 8,
-      },
-      dataToSign = [];
-    Object.keys(data).forEach(function (key) {
-      dataToSign.push({
-        key: key,
-        value: data[key],
-      });
-    });
-    dataToSign.sort(function (a, b) {
-      return a.key < b.key ? -1 : 1;
-    });
-    dataToSign = dataToSign
-      .map(function (kv) {
-        return kv.key + "=" + kv.value;
-      })
-      .join("&");
-    dataToSign = crypto
-      .createHmac("sha256", constants.appSecret)
-      .update(dataToSign)
-      .digest("base64");
+  getDevices() {
     return new Promise((resolve, reject) => {
       axios
-        .get("https://api.coolkit.cc:8080/api/user/region", {
+        .get("https://" + this.httpHost + "/v2/device/thing", {
           headers: {
-            Authorization: "Sign " + dataToSign,
+            Authorization: "Bearer " + this.aToken,
             "Content-Type": "application/json",
+            Host: this.httpHost,
+            "X-CK-Appid": constants.appId,
+            "X-CK-Nonce": Math.random().toString(36).substr(2, 8),
           },
-          params: data,
         })
         .then(res => {
           let body = res.data;
-          if (!body.region) {
-            throw (
-              "Server did not respond with a region.\n" +
-              JSON.stringify(body, null, 2)
-            );
-          }
-          switch (body.region) {
-            case "eu":
-            case "us":
-            case "as":
-              this.httpHost = body.region + "-apia.coolkit.cc";
-              break;
-            case "cn":
-              this.httpHost = "cn-apia.coolkit.cn";
-              break;
-            default:
-              throw "No valid region received - [" + body.region + "].";
+          if (
+            !body.hasOwnProperty("data") ||
+            !body.hasOwnProperty("error") ||
+            (body.hasOwnProperty("error") && body.error !== 0)
+          ) {
+            throw JSON.stringify(body, null, 2);
           }
-          if (this.debug) {
-            this.log("HTTP API host received [%s].", this.httpHost);
+          let deviceList = [];
+          if (body.data.thingList && body.data.thingList.length > 0) {
+            body.data.thingList.forEach(device => deviceList.push(device.itemData));
           }
-          resolve(this.httpHost);
+          resolve(deviceList);
         })
         .catch(err => {
-          reject(err);
+          if (err.hasOwnProperty("code") && ["ENOTFOUND", "ETIMEDOUT"].includes(err.code)) {
+            this.log.warn("Unable to reach eWeLink. Retrying in 30 seconds.");
+            this.delay().then(() => resolve(this.getDevices()));
+          } else {
+            reject(err.message || err);
+          }
         });
     });
   }
-  getDevices() {
+
+  getDevice(deviceId) {
     return new Promise((resolve, reject) => {
-      axios
-        .get("https://" + this.httpHost + "/v2/device/thing", {
-          headers: {
-            Authorization: "Bearer " + this.aToken,
-            "Content-Type": "application/json",
-            Host: this.httpHost,
-            "X-CK-Appid": constants.appId,
-            "X-CK-Nonce": Math.random().toString(36).substr(2, 8),
-          },
-        })
+      axios({
+        url: "https://" + this.httpHost + "/v2/device/thing",
+        method: "post",
+        headers: {
+          Authorization: "Bearer " + this.aToken,
+          "Content-Type": "application/json",
+          Host: this.httpHost,
+          "X-CK-Appid": constants.appId,
+          "X-CK-Nonce": Math.random().toString(36).substr(2, 8),
+        },
+        data: {
+          thingList: [
+            {
+              itemType: 1,
+              id: deviceId,
+            },
+          ],
+        },
+      })
         .then(res => {
           let body = res.data;
           if (
+            !body.hasOwnProperty("data") ||
             !body.hasOwnProperty("error") ||
             (body.hasOwnProperty("error") && body.error !== 0)
           ) {
             throw JSON.stringify(body, null, 2);
           }
-          let deviceList = [];
-          if (body.data.thingList && body.data.thingList.length > 0) {
-            body.data.thingList.forEach(device =>
-              deviceList.push(device.itemData)
-            );
+          if (body.data.thingList && body.data.thingList.length === 1) {
+            resolve(body.data.thingList[0].itemData);
+          } else {
+            throw "device not found in eWeLink";
           }
-          resolve(deviceList);
         })
         .catch(err => {
-          reject(err);
+          if (err.hasOwnProperty("code") && ["ENOTFOUND", "ETIMEDOUT"].includes(err.code)) {
+            this.log.warn("Unable to reach eWeLink. Retrying in 30 seconds.");
+            this.delay().then(() => resolve(this.getDevice(deviceId)));
+          } else {
+            reject(err.message || err);
+          }
         });
     });
   }
+
+  delay() {
+    return new Promise(resolve => setTimeout(resolve, 30000));
+  }
 };
diff --git a/lib/eWeLinkLAN.js b/lib/eWeLinkLAN.js
index 25baee53..567c372d 100644
--- a/lib/eWeLinkLAN.js
+++ b/lib/eWeLinkLAN.js
@@ -1,19 +1,18 @@
 /* jshint esversion: 9, -W030, node: true */
 "use strict";
 const axios = require("axios"),
-  constants = require("./constants"),
+  cns = require("./constants"),
   crypto = require("crypto"),
   dns = require("node-dns-sd"),
   eventemitter = require("events");
 module.exports = class eWeLinkLAN {
   constructor(config, log, devices) {
-    this.config = config;
     this.log = log;
     this.devices = devices;
-    this.ipOverrides = this.config.ipOverride || {};
-    let deviceMap = new Map();
+    this.ipOverrides = config.ipOverride || {};
+    this.deviceMap = new Map();
     devices.forEach(device => {
-      deviceMap.set(device.deviceid, {
+      this.deviceMap.set(device.deviceid, {
         apiKey: device.devicekey,
         online: this.ipOverrides.hasOwnProperty(device.deviceid) ? true : false,
         ip: this.ipOverrides.hasOwnProperty(device.deviceid)
@@ -21,9 +20,8 @@ module.exports = class eWeLinkLAN {
           : null,
       });
     });
-    this.deviceMap = deviceMap;
-    this.debug = this.config.debug || false;
-    this.debugReqRes = this.config.debugReqRes || false;
+    this.debug = config.debug || false;
+    this.debugReqRes = config.debugReqRes || false;
     this.emitter = new eventemitter();
   }
   getHosts() {
@@ -36,9 +34,7 @@ module.exports = class eWeLinkLAN {
           let onlineCount = 0;
           res.forEach(device => {
             let d,
-              deviceId = device.fqdn
-                .replace("._ewelink._tcp.local", "")
-                .replace("eWeLink_", "");
+              deviceId = device.fqdn.replace("._ewelink._tcp.local", "").replace("eWeLink_", "");
             if ((d = this.deviceMap.get(deviceId))) {
               if (!this.ipOverrides.hasOwnProperty(deviceId)) {
                 this.deviceMap.set(deviceId, {
@@ -55,9 +51,7 @@ module.exports = class eWeLinkLAN {
             count: onlineCount,
           });
         })
-        .catch(err => {
-          reject(err);
-        });
+        .catch(err => reject(err));
     });
   }
   startMonitor() {
@@ -79,64 +73,44 @@ module.exports = class eWeLinkLAN {
                 .createHash("md5")
                 .update(Buffer.from(deviceInfo.apiKey, "utf8"))
                 .digest(),
-              dText = crypto.createDecipheriv(
-                "aes-128-cbc",
-                key,
-                Buffer.from(rdata.iv, "base64")
-              ),
+              dText = crypto.createDecipheriv("aes-128-cbc", key, Buffer.from(rdata.iv, "base64")),
               pText = Buffer.concat([
                 dText.update(Buffer.from(data, "base64")),
                 dText.final(),
               ]).toString("utf8"),
               params;
-            if (
-              packet.address !== deviceInfo.ip &&
-              !this.ipOverrides.hasOwnProperty(rdata.id)
-            ) {
+            if (packet.address !== deviceInfo.ip && !this.ipOverrides.hasOwnProperty(rdata.id)) {
               this.deviceMap.set(rdata.id, {
                 apiKey: deviceInfo.apiKey,
                 online: true,
                 ip: packet.address,
               });
               if (this.debug) {
-                this.log.warn(
-                  "[%s] updating IP address to [%s].",
-                  rdata.id,
-                  packet.address
-                );
+                this.log.warn("[%s] updating IP address to [%s].", rdata.id, packet.address);
               }
             }
             try {
               params = JSON.parse(pText);
             } catch (e) {
-              this.log.warn(
-                "[%s] An error occured reading the LAN message [%s]",
-                rdata.id,
-                e
-              );
+              this.log.warn("[%s] An error occured reading the LAN message [%s]", rdata.id, e);
               return;
             }
             for (let param in params) {
               if (params.hasOwnProperty(param)) {
-                if (
-                  !constants.paramsToKeep.includes(param.replace(/[0-9]/g, ""))
-                ) {
+                if (!cns.paramsToKeep.includes(param.replace(/[0-9]/g, ""))) {
                   delete params[param];
                 }
               }
             }
             if (Object.keys(params).length > 0) {
               params.updateSource = "LAN";
+              params.online = true;
               let returnTemplate = {
                 deviceid: rdata.id,
-                action: "update",
                 params,
               };
               if (this.debugReqRes) {
-                let msg = JSON.stringify(returnTemplate, null, 2).replace(
-                  rdata.id,
-                  "**hidden**"
-                );
+                let msg = JSON.stringify(returnTemplate, null, 2).replace(rdata.id, "**hidden**");
                 this.log("LAN message received.\n%s", msg);
               } else if (this.debug) {
                 this.log("LAN message received.");
@@ -149,12 +123,8 @@ module.exports = class eWeLinkLAN {
     return new Promise((resolve, reject) => {
       dns
         .startMonitoring()
-        .then(() => {
-          resolve();
-        })
-        .catch(err => {
-          reject(err);
-        });
+        .then(() => resolve())
+        .catch(err => reject(err));
     });
   }
   sendUpdate(json) {
@@ -175,17 +145,13 @@ module.exports = class eWeLinkLAN {
         throw "plugin does not support lan mode for this device yet - feel free to create a github issue";
       }
       if ((apiKey = this.deviceMap.get(json.deviceid).apiKey)) {
-        let key = crypto
-            .createHash("md5")
-            .update(Buffer.from(apiKey, "utf8"))
-            .digest(),
+        let key = crypto.createHash("md5").update(Buffer.from(apiKey, "utf8")).digest(),
           iv = crypto.randomBytes(16),
           enc = crypto.createCipheriv("aes-128-cbc", key, iv),
           data = {
-            data: Buffer.concat([
-              enc.update(JSON.stringify(params)),
-              enc.final(),
-            ]).toString("base64"),
+            data: Buffer.concat([enc.update(JSON.stringify(params)), enc.final()]).toString(
+              "base64"
+            ),
             deviceid: json.deviceid,
             encrypt: true,
             iv: iv.toString("base64"),
@@ -197,20 +163,13 @@ module.exports = class eWeLinkLAN {
             .replace(json.apikey, "**hidden**")
             .replace(json.apikey, "**hidden**")
             .replace(json.deviceid, "**hidden**");
-          this.log.warn(
-            "LAN message sent. This text is yellow for clarity.\n%s",
-            msg
-          );
+          this.log.warn("LAN message sent. This text is yellow for clarity.\n%s", msg);
         } else if (this.debug) {
           this.log("LAN message sent.");
         }
         axios({
           method: "post",
-          url:
-            "http://" +
-            this.deviceMap.get(json.deviceid).ip +
-            ":8081/zeroconf/" +
-            suffix,
+          url: "http://" + this.deviceMap.get(json.deviceid).ip + ":8081/zeroconf/" + suffix,
           headers: {
             Accept: "application/json",
             "Content-Type": "application/json",
@@ -223,9 +182,7 @@ module.exports = class eWeLinkLAN {
             }
             throw res.data;
           })
-          .catch(err => {
-            reject(err);
-          });
+          .catch(err => reject(err));
       }
     });
   }
diff --git a/lib/eWeLinkWS.js b/lib/eWeLinkWS.js
index 56fbeb64..29d265cc 100644
--- a/lib/eWeLinkWS.js
+++ b/lib/eWeLinkWS.js
@@ -1,7 +1,7 @@
 /* jshint esversion: 9, -W030, node: true */
 "use strict";
 const axios = require("axios"),
-  constants = require("./constants"),
+  cns = require("./constants"),
   eventemitter = require("events"),
   ws = require("ws");
 module.exports = class eWeLinkWS {
@@ -21,14 +21,13 @@ module.exports = class eWeLinkWS {
     return new Promise((resolve, reject) => {
       axios({
         method: "post",
-        url:
-          "https://" + this.httpHost.replace("-api", "-disp") + "/dispatch/app",
+        url: "https://" + this.httpHost.replace("-api", "-disp") + "/dispatch/app",
         headers: {
           Authorization: "Bearer " + this.aToken,
           "Content-Type": "application/json",
         },
         data: {
-          appid: constants.appId,
+          appid: cns.appId,
           nonce: Math.random().toString(36).substr(2, 8),
           ts: Math.floor(new Date().getTime() / 1000),
           version: 8,
@@ -46,7 +45,12 @@ module.exports = class eWeLinkWS {
           resolve(body.domain);
         })
         .catch(err => {
-          reject(err);
+          if (err.hasOwnProperty("code") && ["ENOTFOUND", "ETIMEDOUT"].includes(err.code)) {
+            this.log.warn("Unable to reach eWeLink. Retrying in 30 seconds.");
+            this.delay().then(() => resolve(this.getDevices()));
+          } else {
+            reject(err.message || err);
+          }
         });
     });
   }
@@ -57,7 +61,7 @@ module.exports = class eWeLinkWS {
       let payload = {
         action: "userOnline",
         apikey: this.apiKey,
-        appid: constants.appId,
+        appid: cns.appId,
         at: this.aToken,
         nonce: Math.random().toString(36).substr(2, 8),
         sequence: Math.floor(new Date()),
@@ -70,91 +74,60 @@ module.exports = class eWeLinkWS {
         let msg = JSON.stringify(payload, null, 2)
           .replace(this.aToken, "**hidden**")
           .replace(this.apiKey, "**hidden**");
-        this.log.warn(
-          "Sending WS login request. This text is yellow for clarity.\n%s",
-          msg
-        );
+        this.log.warn("Sending WS login request. This text is yellow for clarity.\n%s", msg);
       } else if (this.debug) {
         this.log("Sending WS login request.");
       }
     });
     this.ws.on("message", m => {
-      if (m === "pong") {
-        return;
-      }
-      let device;
+      if (m === "pong") return;
+      let device,
+        onlineStatus = true;
       try {
         device = JSON.parse(m);
-      } catch (e) {
-        this.log.warn(
-          "An error occured reading the web socket message [%s]",
-          e
-        );
+      } catch (err) {
+        this.log.warn("An error occured reading the WS message [%s]", err);
         return;
       }
-      // for requestUpdate response
-      if (
-        device.hasOwnProperty("deviceid") &&
-        device.hasOwnProperty("params") &&
-        device.hasOwnProperty("error") &&
-        device.error === 0
-      ) {
-        device.action = "update";
-      } else if (
-        device.hasOwnProperty("deviceid") &&
-        device.hasOwnProperty("error") &&
-        device.error === 504
-      ) {
-        device.action = "sysmsg";
-        device.params = {
-          online: false,
-        };
-      }
-      // for external updates
+      //*** for heartbeat response ***\\
       if (
         device.hasOwnProperty("config") &&
         device.config.hb &&
         device.config.hbInterval &&
         !this.hbInterval
       ) {
-        this.hbInterval = setInterval(() => {
-          this.ws.send("ping");
-        }, (device.config.hbInterval + 7) * 1000);
-      } else if (device.hasOwnProperty("action")) {
+        this.hbInterval = setInterval(
+          () => this.ws.send("ping"),
+          (device.config.hbInterval + 7) * 1000
+        );
+        return;
+      }
+      if (!device.hasOwnProperty("params")) device.params = {};
+      //*** for requestUpdate response ***\\
+      if (device.hasOwnProperty("deviceid") && device.hasOwnProperty("error")) {
+        device.action = "update";
+        onlineStatus = device.error === 0;
+      }
+      //*** for all updates including above ***\\
+      if (device.hasOwnProperty("action")) {
         switch (device.action) {
+          case "update":
           case "sysmsg":
-            device.params.updateSource = "WS";
-            let returnTemplate = {
-              deviceid: device.deviceid,
-              action: "sysmsg",
-              params: device.params,
-            };
-            if (this.debugReqRes) {
-              let msg = JSON.stringify(returnTemplate, null, 2).replace(
-                device.deviceid,
-                "**hidden**"
-              );
-              this.log("WS message received.\n%s", msg);
-            } else if (this.debug) {
-              this.log("WS message received.");
+            if (device.action === "sysmsg" && device.params.hasOwnProperty("online")) {
+              onlineStatus = device.params.online;
             }
-            this.emitter.emit("update", returnTemplate);
-            break;
-          case "update":
             for (let param in device.params) {
               if (device.params.hasOwnProperty(param)) {
-                if (
-                  !constants.paramsToKeep.includes(param.replace(/[0-9]/g, ""))
-                ) {
+                if (!cns.paramsToKeep.includes(param.replace(/[0-9]/g, ""))) {
                   delete device.params[param];
                 }
               }
             }
+            device.params.online = onlineStatus;
+            device.params.updateSource = "WS";
             if (Object.keys(device.params).length > 0) {
-              device.params.updateSource = "WS";
               let returnTemplate = {
                 deviceid: device.deviceid,
-                action: "update",
                 params: device.params,
               };
               if (this.debugReqRes) {
@@ -173,8 +146,7 @@ module.exports = class eWeLinkWS {
             return;
           default:
             this.log.warn(
-              "[%s] WS message has unknown action.\n" +
-                JSON.stringify(device, null, 2),
+              "[%s] WS message has unknown action.\n" + JSON.stringify(device, null, 2),
               device.deviceid
             );
             return;
@@ -183,9 +155,7 @@ module.exports = class eWeLinkWS {
         // *** Safe to ignore these messages *** \\
       } else {
         if (this.debug) {
-          this.log.warn(
-            "WS unknown command received.\n" + JSON.stringify(device, null, 2)
-          );
+          this.log.warn("WS unknown command received.\n" + JSON.stringify(device, null, 2));
         }
       }
     });
@@ -193,16 +163,13 @@ module.exports = class eWeLinkWS {
       if (m === "Stopping Homebridge") {
         this.log("Web socket gracefully closed.");
       } else {
-        this.log.warn("Web socket closed - [%s - %s].", e, m);
+        this.log.warn("Web socket closed - [%s%s].", e, m ? " - " + m : "");
         if (e !== 1000) {
           this.log("Web socket will try to reconnect in five seconds.");
-          setTimeout(() => {
-            this.login();
-          }, 5000);
+          this.ws.removeAllListeners();
+          setTimeout(() => this.login(), 5000);
         } else {
-          this.log(
-            "Please try restarting Homebridge so that this plugin can work again."
-          );
+          this.log("Please try restarting Homebridge so that this plugin can work again.");
         }
       }
       this.wsIsOpen = false;
@@ -219,13 +186,9 @@ module.exports = class eWeLinkWS {
           "Web socket will try to reconnect in five seconds then try the command again."
         );
         this.ws.removeAllListeners();
-        setTimeout(() => {
-          this.login();
-        }, 5000);
+        setTimeout(() => this.login(), 5000);
       } else {
-        this.log.warn(
-          "If this was unexpected then please try restarting Homebridge."
-        );
+        this.log.warn("If this was unexpected then please try restarting Homebridge.");
       }
     });
   }
@@ -240,9 +203,7 @@ module.exports = class eWeLinkWS {
     };
     let sendOperation = req => {
       if (!this.wsIsOpen) {
-        setTimeout(() => {
-          sendOperation(req);
-        }, 280);
+        setTimeout(() => sendOperation(req), 280);
         return;
       }
       if (this.ws) {
@@ -252,10 +213,7 @@ module.exports = class eWeLinkWS {
             .replace(json.apikey, "**hidden**")
             .replace(json.apiKey, "**hidden**")
             .replace(json.deviceid, "**hidden**");
-          this.log.warn(
-            "WS message sent. This text is yellow for clarity.\n%s",
-            msg
-          );
+          this.log.warn("WS message sent. This text is yellow for clarity.\n%s", msg);
         } else if (this.debug) {
           this.log("WS message sent.");
         }
@@ -268,9 +226,7 @@ module.exports = class eWeLinkWS {
       setTimeout(sendOperation, this.delaySend, string);
       this.delaySend += 280;
     } else {
-      this.log.warn(
-        "Web socket is currently reconnecting. Command will be resent."
-      );
+      this.log.warn("Web socket is currently reconnecting. Command will be resent.");
       let interval,
         waitToSend = req => {
           if (this.wsIsOpen) {
@@ -293,9 +249,7 @@ module.exports = class eWeLinkWS {
       },
       sendOperation = req => {
         if (!this.wsIsOpen) {
-          setTimeout(() => {
-            sendOperation(req);
-          }, 280);
+          setTimeout(() => sendOperation(req), 280);
           return;
         }
         if (this.ws) {
@@ -305,10 +259,7 @@ module.exports = class eWeLinkWS {
               .replace(json.apikey, "**hidden**")
               .replace(json.apiKey, "**hidden**")
               .replace(json.deviceid, "**hidden**");
-            this.log.warn(
-              "WS message sent. This text is yellow for clarity.\n%s",
-              msg
-            );
+            this.log.warn("WS message sent. This text is yellow for clarity.\n%s", msg);
           } else if (this.debug) {
             this.log("WS message sent.");
           }
@@ -321,9 +272,7 @@ module.exports = class eWeLinkWS {
       setTimeout(sendOperation, this.delaySend, string);
       this.delaySend += 280;
     } else {
-      this.log.warn(
-        "Web socket is currently reconnecting. Command will be resent."
-      );
+      this.log.warn("Web socket is currently reconnecting. Command will be resent.");
       let interval,
         waitToSend = req => {
           if (this.wsIsOpen) {
@@ -342,4 +291,7 @@ module.exports = class eWeLinkWS {
       this.ws.close(1000, "Stopping Homebridge");
     }
   }
+  delay() {
+    return new Promise(resolve => setTimeout(resolve, 30000));
+  }
 };

From 37ad909a3b4104b217af6396f08ac39fd4f14b05 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 16 Sep 2020 14:01:01 +0100
Subject: [PATCH 0160/3183] syntax error

---
 lib/eWeLink.js | 32 ++++++++++++++------------------
 1 file changed, 14 insertions(+), 18 deletions(-)

diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index 855a0402..b1735aef 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -992,7 +992,6 @@ class eWeLink {
       (accessory = this.devicesInHB.get(deviceId + "SWX") || this.devicesInHB.get(deviceId + "SW0"))
     ) {
       let isX = accessory.context.hbDeviceId.substr(-1) === "X";
-
       if (device.params.updateSource === "WS") {
         if (device.params.online != accessory.context.reachableWAN) {
           accessory.context.reachableWAN = device.params.online;
@@ -1006,23 +1005,20 @@ class eWeLink {
           );
         }
       }
-
-      if (device.params.updateSource === "LAN") {
-        if (!accessory.context.reachableLAN) {
-          accessory.context.reachableLAN = true;
-          this.devicesInHB.set(accessory.context.hbDeviceId, accessory);
-          this.wsClient.requestUpdate(accessory);
-          statusChange = true;
-          this.log.warn("[%s] has been reported [online] via [LAN].", accessory.displayName);
-        }
-        if (statusChange && !isX) {
-          for (let i = 1; i <= accessory.context.channelCount; i++) {
-            if (this.devicesInHB.has(deviceId + "SW" + i)) {
-              let oAccessory = this.devicesInHB.get(deviceId + "SW" + i);
-              oAccessory.context.reachableWAN = device.params.online;
-              oAccessory.context.reachableLAN = true;
-              this.devicesInHB.set(oAccessory.context.hbDeviceId, oAccessory);
-            }
+      if (device.params.updateSource === "LAN" && !accessory.context.reachableLAN) {
+        accessory.context.reachableLAN = true;
+        this.devicesInHB.set(accessory.context.hbDeviceId, accessory);
+        this.wsClient.requestUpdate(accessory);
+        statusChange = true;
+        this.log.warn("[%s] has been reported [online] via [LAN].", accessory.displayName);
+      }
+      if (statusChange && !isX) {
+        for (let i = 1; i <= accessory.context.channelCount; i++) {
+          if (this.devicesInHB.has(deviceId + "SW" + i)) {
+            let oAccessory = this.devicesInHB.get(deviceId + "SW" + i);
+            oAccessory.context.reachableWAN = device.params.online;
+            oAccessory.context.reachableLAN = true;
+            this.devicesInHB.set(oAccessory.context.hbDeviceId, oAccessory);
           }
         }
       }

From 02f84ed46fb5a002c2df06fc203ebf5c74f1faff Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 16 Sep 2020 14:04:31 +0100
Subject: [PATCH 0161/3183] lan check

---
 lib/eWeLink.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index b1735aef..23a75865 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -1017,7 +1017,9 @@ class eWeLink {
           if (this.devicesInHB.has(deviceId + "SW" + i)) {
             let oAccessory = this.devicesInHB.get(deviceId + "SW" + i);
             oAccessory.context.reachableWAN = device.params.online;
-            oAccessory.context.reachableLAN = true;
+            if (device.params.updateSource === "LAN") {
+              oAccessory.context.reachableLAN = true;
+            }
             this.devicesInHB.set(oAccessory.context.hbDeviceId, oAccessory);
           }
         }

From 3a9962f6f2f7f2893b4d4aa1fa89c0a105018764 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 16 Sep 2020 16:49:39 +0100
Subject: [PATCH 0162/3183] Revert "lan check"

This reverts commit 02f84ed46fb5a002c2df06fc203ebf5c74f1faff.
---
 lib/eWeLink.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index 23a75865..b1735aef 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -1017,9 +1017,7 @@ class eWeLink {
           if (this.devicesInHB.has(deviceId + "SW" + i)) {
             let oAccessory = this.devicesInHB.get(deviceId + "SW" + i);
             oAccessory.context.reachableWAN = device.params.online;
-            if (device.params.updateSource === "LAN") {
-              oAccessory.context.reachableLAN = true;
-            }
+            oAccessory.context.reachableLAN = true;
             this.devicesInHB.set(oAccessory.context.hbDeviceId, oAccessory);
           }
         }

From e098bd63228b87a003ff8539908260d6fdf4cffa Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 16 Sep 2020 16:49:42 +0100
Subject: [PATCH 0163/3183] Revert "syntax error"

This reverts commit 37ad909a3b4104b217af6396f08ac39fd4f14b05.
---
 lib/eWeLink.js | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index b1735aef..855a0402 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -992,6 +992,7 @@ class eWeLink {
       (accessory = this.devicesInHB.get(deviceId + "SWX") || this.devicesInHB.get(deviceId + "SW0"))
     ) {
       let isX = accessory.context.hbDeviceId.substr(-1) === "X";
+
       if (device.params.updateSource === "WS") {
         if (device.params.online != accessory.context.reachableWAN) {
           accessory.context.reachableWAN = device.params.online;
@@ -1005,20 +1006,23 @@ class eWeLink {
           );
         }
       }
-      if (device.params.updateSource === "LAN" && !accessory.context.reachableLAN) {
-        accessory.context.reachableLAN = true;
-        this.devicesInHB.set(accessory.context.hbDeviceId, accessory);
-        this.wsClient.requestUpdate(accessory);
-        statusChange = true;
-        this.log.warn("[%s] has been reported [online] via [LAN].", accessory.displayName);
-      }
-      if (statusChange && !isX) {
-        for (let i = 1; i <= accessory.context.channelCount; i++) {
-          if (this.devicesInHB.has(deviceId + "SW" + i)) {
-            let oAccessory = this.devicesInHB.get(deviceId + "SW" + i);
-            oAccessory.context.reachableWAN = device.params.online;
-            oAccessory.context.reachableLAN = true;
-            this.devicesInHB.set(oAccessory.context.hbDeviceId, oAccessory);
+
+      if (device.params.updateSource === "LAN") {
+        if (!accessory.context.reachableLAN) {
+          accessory.context.reachableLAN = true;
+          this.devicesInHB.set(accessory.context.hbDeviceId, accessory);
+          this.wsClient.requestUpdate(accessory);
+          statusChange = true;
+          this.log.warn("[%s] has been reported [online] via [LAN].", accessory.displayName);
+        }
+        if (statusChange && !isX) {
+          for (let i = 1; i <= accessory.context.channelCount; i++) {
+            if (this.devicesInHB.has(deviceId + "SW" + i)) {
+              let oAccessory = this.devicesInHB.get(deviceId + "SW" + i);
+              oAccessory.context.reachableWAN = device.params.online;
+              oAccessory.context.reachableLAN = true;
+              this.devicesInHB.set(oAccessory.context.hbDeviceId, oAccessory);
+            }
           }
         }
       }

From 9507b0bed4f99ab07fd69d404fefc6663bbedd84 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 16 Sep 2020 16:49:45 +0100
Subject: [PATCH 0164/3183] Revert "3.0 initial changes"

This reverts commit 556a0e048249a7e8c423f052a6b8283318389b73.
---
 .prettierrc.json   |    3 +-
 lib/constants.js   |    7 +-
 lib/eWeLink.js     | 1389 +++++++++++++++++++++++++++++++-------------
 lib/eWeLinkHTTP.js |  241 ++++----
 lib/eWeLinkLAN.js  |   91 ++-
 lib/eWeLinkWS.js   |  156 +++--
 6 files changed, 1263 insertions(+), 624 deletions(-)

diff --git a/.prettierrc.json b/.prettierrc.json
index 87f5e5e8..d68aa739 100644
--- a/.prettierrc.json
+++ b/.prettierrc.json
@@ -1,4 +1,3 @@
 {
-  "arrowParens": "avoid",
-  "printWidth": 100
+  "arrowParens": "avoid"
 }
diff --git a/lib/constants.js b/lib/constants.js
index fe7fcb40..d8892025 100644
--- a/lib/constants.js
+++ b/lib/constants.js
@@ -40,7 +40,12 @@ module.exports = {
   devicesSensor: [102],
   devicesSensorParams: ["switch", "battery"],
   devicesThermostat: [15],
-  devicesThermostatParams: ["currentTemperature", "currentHumidity", "switch", "masterSwitch"],
+  devicesThermostatParams: [
+    "currentTemperature",
+    "currentHumidity",
+    "switch",
+    "masterSwitch",
+  ],
   devicesFan: [34],
   devicesFanParams: ["switches", "light", "fan", "speed"],
   devicesOutlet: [32],
diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index 855a0402..13c6d210 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -13,9 +13,15 @@ class eWeLink {
   constructor(log, config, api) {
     if (!log || !api || !config) return;
     if (!config.username || !config.password || !config.countryCode) {
-      log.error("*********** Cannot load homebridge-ewelink ***********");
-      log.error("eWeLink credentials missing from the Homebridge config.");
-      log.error("*******************************************************");
+      log.error(
+        "**************** Cannot load homebridge-ewelink ****************"
+      );
+      log.error(
+        "Your eWeLink credentials are missing from the Homebridge config."
+      );
+      log.error(
+        "****************************************************************"
+      );
       return;
     }
     this.log = log;
@@ -23,103 +29,153 @@ class eWeLink {
     this.api = api;
     this.debug = this.config.debug || false;
     this.devicesInHB = new Map();
-    this.devicesInEW = new Map();
+    this.devicesInEwe = new Map();
     this.cusG = new Map();
     this.cusS = new Map();
     this.eveLogPath = this.api.user.storagePath() + "/homebridge-ewelink/";
     this.api
-      .on("didFinishLaunching", () => this.eWeLinkSync())
-      .on("shutdown", () => {
-        if (this.lanClient) this.lanClient.closeConnection();
-        if (this.wsClient) this.wsClient.closeConnection();
-      });
-  }
-  eWeLinkSync() {
-    this.log("Plugin has finished initialising. Synching with eWeLink.");
-    this.httpClient = new eWeLinkHTTP(this.config, this.log);
-    this.httpClient
-      .getHost()
-      .then(() => this.httpClient.login())
-      .then(res => {
-        this.authData = res;
-        return this.httpClient.getDevices();
-      })
-      .then(res => {
-        this.httpDevices = res
-          .filter(d => d.hasOwnProperty("extra") && d.extra.hasOwnProperty("uiid"))
-          .filter(d => !(this.config.hideDevFromHB || "").includes(d.deviceid));
-        this.httpDevices.forEach(device => this.devicesInEW.set(device.deviceid, device));
-        this.wsClient = new eWeLinkWS(this.config, this.log, this.authData);
-        return this.wsClient.getHost();
-      })
-      .then(() => {
-        this.wsClient.login();
-        this.lanClient = new eWeLinkLAN(this.config, this.log, this.httpDevices);
-        return this.lanClient.getHosts();
-      })
-      .then(res => {
-        this.lanDevices = res.map;
-        this.lanCount = res.count;
-        return this.lanClient.startMonitor();
-      })
-      .then(() => {
-        (() => {
-          //*** Remove all Homebridge accessories if none found ***\\
-          if (
-            Object.keys(this.httpDevices).length === 0 &&
-            Object.keys(this.lanDevices).length === 0
-          ) {
-            Array.from(this.devicesInHB.values()).forEach(a => this.removeAccessory(a));
-            this.devicesInHB.clear();
-            this.log.warn("******* Not loading homebridge-ewelink *******");
-            this.log.warn("No devices were found in your eWeLink account.");
-            this.log.warn("**********************************************");
-            return;
-          }
-          //*** Make a map of custom groups from Homebridge config ***\\
-          if (Object.keys(this.config.groups || []).length > 0) {
-            this.config.groups
-              .filter(g => g.hasOwnProperty("type") && cns.allowedGroups.includes(g.type))
-              .filter(g => g.hasOwnProperty("deviceId") && this.devicesInEW.has(g.deviceId))
-              .forEach(g => this.cusG.set(g.deviceId + "SWX", g));
-          }
-          //*** Make a map of RF Bridge custom sensors from Homebridge config ***\\
-          if (Object.keys(this.config.bridgeSensors || []).length > 0) {
-            this.config.bridgeSensors
-              .filter(s => s.hasOwnProperty("deviceId") && this.devicesInEW.has(s.deviceId))
-              .forEach(s => this.cusS.set(s.fullDeviceId, s));
-          }
-          //*** Logging always helps to see if everything is okay so far ***\\
-          this.log("[%s] eWeLink devices loaded from the Homebridge cache.", this.devicesInHB.size);
-          this.log("[%s] primary devices loaded from your eWeLink account.", this.devicesInEW.size);
-          this.log("[%s] primary devices were discovered on your local network.", this.lanCount);
-          //*** Remove Homebridge accessories that don't appear in eWeLink ***\\
-          this.devicesInHB.forEach(a => {
-            if (!this.devicesInEW.has(a.context.eweDeviceId)) {
-              this.removeAccessory(a);
-            }
+      .on("didFinishLaunching", () => {
+        this.log(
+          "Plugin has finished initialising. Starting synchronisation with eWeLink account."
+        );
+        //*** Set up HTTP client and get the user HTTP host ***\\
+        this.httpClient = new eWeLinkHTTP(this.config, this.log);
+        this.httpClient
+          .getHost()
+          .then(() => this.httpClient.login())
+          .then(res => {
+            //*** Set up the web socket client ***\\
+            this.wsClient = new eWeLinkWS(this.config, this.log, res);
+            return this.wsClient.getHost();
+          })
+          .then(() => {
+            //*** Open web socket connection and get device list via HTTP ***\\
+            this.wsClient.login();
+            return this.httpClient.getDevices();
+          })
+          .then(res => {
+            //*** Get device IP addresses for LAN mode ***\\
+            this.httpDevices = res
+              .filter(
+                device =>
+                  device.hasOwnProperty("extra") &&
+                  device.extra.hasOwnProperty("uiid")
+              )
+              .filter(
+                device =>
+                  !(this.config.hideDevFromHB || "").includes(device.deviceid)
+              );
+            this.lanClient = new eWeLinkLAN(
+              this.config,
+              this.log,
+              this.httpDevices
+            );
+            this.httpDevices.forEach(device =>
+              this.devicesInEwe.set(device.deviceid, device)
+            );
+            return this.lanClient.getHosts();
+          })
+          .then(res => {
+            //*** Set up the LAN mode listener ***\\
+            this.lanDevices = res.map;
+            this.lanDevicesOnline = res.count;
+            return this.lanClient.startMonitor();
+          })
+          .then(() => {
+            //*** Use the device list to refresh Homebridge accessories ***\\
+            (() => {
+              //*** Remove all Homebridge accessories if none found ***\\
+              if (
+                Object.keys(this.httpDevices).length === 0 &&
+                Object.keys(this.lanDevices).length === 0
+              ) {
+                Array.from(this.devicesInHB.values()).forEach(a =>
+                  this.removeAccessory(a)
+                );
+                this.devicesInHB.clear();
+                this.log.warn("******* Not loading homebridge-ewelink *******");
+                this.log.warn("No devices were found in your eWeLink account.");
+                this.log.warn("**********************************************");
+                return;
+              }
+              //*** Make a map of custom groups from Homebridge config ***\\
+              if (Object.keys(this.config.groups || []).length > 0) {
+                this.config.groups
+                  .filter(
+                    g =>
+                      g.hasOwnProperty("type") &&
+                      cns.allowedGroups.includes(g.type)
+                  )
+                  .filter(
+                    g =>
+                      g.hasOwnProperty("deviceId") &&
+                      this.devicesInEwe.has(g.deviceId.toLowerCase())
+                  )
+                  .forEach(g => this.cusG.set(g.deviceId + "SWX", g));
+              }
+              //*** Make a map of RF Bridge custom sensors from Homebridge config ***\\
+              if (Object.keys(this.config.bridgeSensors || []).length > 0) {
+                this.config.bridgeSensors
+                  .filter(
+                    s =>
+                      s.hasOwnProperty("deviceId") &&
+                      this.devicesInEwe.has(s.deviceId.toLowerCase())
+                  )
+                  .forEach(s => this.cusS.set(s.fullDeviceId, s));
+              }
+              //*** Logging always helps to see if everything is okay so far ***\\
+              this.log(
+                "[%s] eWeLink devices were loaded from the Homebridge cache.",
+                this.devicesInHB.size
+              );
+              this.log(
+                "[%s] primary devices were loaded from your eWeLink account.",
+                this.devicesInEwe.size
+              );
+              this.log(
+                "[%s] primary devices were discovered on your local network.",
+                this.lanDevicesOnline
+              );
+              //*** Remove Homebridge accessories that don't appear in eWeLink ***\\
+              this.devicesInHB.forEach(a => {
+                if (!this.devicesInEwe.has(a.context.eweDeviceId)) {
+                  this.removeAccessory(a);
+                }
+              });
+              //*** Synchronise devices between eWeLink and Homebridge and set up ws/lan listeners ***\\
+              this.devicesInEwe.forEach(d => this.initialiseDevice(d));
+              this.wsClient.receiveUpdate(d => this.receiveDeviceUpdate(d));
+              this.lanClient.receiveUpdate(d => this.receiveDeviceUpdate(d));
+              this.log(
+                "eWeLink setup complete. If you're enjoying this package please consider a ⭐️  on GitHub :)."
+              );
+              if (this.config.debugReqRes || false) {
+                this.log.warn(
+                  "You have 'Request & Response Logging' enabled. This setting is not recommended for long-term use."
+                );
+              }
+            })();
+          })
+          .catch(err => {
+            this.log.error(
+              "************** Cannot load homebridge-ewelink **************"
+            );
+            this.log.error(err);
+            this.log.error(
+              "************************************************************"
+            );
+            if (this.lanClient) this.lanClient.closeConnection();
+            if (this.wsClient) this.wsClient.closeConnection();
           });
-          //*** Synchronise devices between eWeLink and Homebridge and set up ws/lan listeners ***\\
-          this.devicesInEW.forEach(d => this.initialiseDevice(d));
-          this.wsClient.receiveUpdate(d => this.receiveDeviceUpdate(d));
-          this.lanClient.receiveUpdate(d => this.receiveDeviceUpdate(d));
-          this.log("eWeLink sync complete. Don't forget to ⭐️  this plugin on GitHub!");
-          if (this.config.debugReqRes || false) {
-            this.log.warn("Note: 'Request & Response Logging' is not advised for long-term use.");
-          }
-        })();
       })
-      .catch(err => {
-        this.log.error("************** Cannot load homebridge-ewelink **************");
-        this.log.error(err);
-        this.log.error("************************************************************");
+      .on("shutdown", () => {
         if (this.lanClient) this.lanClient.closeConnection();
         if (this.wsClient) this.wsClient.closeConnection();
       });
   }
   initialiseDevice(device) {
     let accessory;
-    //*** First add the device if it isn't already in Homebridge ***\\
+    //*** First add the device if it isn't already in Homebridge. Yeah this code looks a mess :| ***\\
     if (
       !this.devicesInHB.has(device.deviceid + "SWX") &&
       !this.devicesInHB.has(device.deviceid + "SW0")
@@ -177,7 +233,9 @@ class eWeLink {
         }
       } else if (cns.devicesRFBridge.includes(device.extra.uiid)) {
         this.addAccessory(device, device.deviceid + "SW0", "rf_pri");
-        if (Object.keys((device.tags && device.tags.zyx_info) || []).length > 0) {
+        if (
+          Object.keys((device.tags && device.tags.zyx_info) || []).length > 0
+        ) {
           for (let i = 1; i <= Object.keys(device.tags.zyx_info).length; i++) {
             this.addAccessory(device, device.deviceid + "SW" + i, "rf_sub");
           }
@@ -211,20 +269,31 @@ class eWeLink {
         rfBridgeChange = false;
       accessory
         .getService(Service.AccessoryInformation)
-        .setCharacteristic(Characteristic.FirmwareRevision, device.params.fwVersion);
-      accessory.context.reachableWAN = accessory.context.eweUIID !== 102 ? device.online : true;
-      accessory.context.reachableLAN = this.lanDevices.get(device.deviceid).online || false;
+        .setCharacteristic(
+          Characteristic.FirmwareRevision,
+          device.params.fwVersion
+        );
+      accessory.context.reachableWAN =
+        accessory.context.eweUIID !== 102 ? device.online : true;
+      accessory.context.reachableLAN =
+        this.lanDevices.get(device.deviceid).online || false;
       accessory.context.inUse = false;
       let str = accessory.context.reachableLAN
-        ? "and locally with IP [" + this.lanDevices.get(device.deviceid).ip + "]"
-        : "but LAN mode unavailable as offline/unsupported/shared device";
+        ? "and locally with IP [" +
+          this.lanDevices.get(device.deviceid).ip +
+          "]"
+        : "but LAN mode unavailable as unsupported/shared device";
       this.log("[%s] found in eWeLink %s.", accessory.displayName, str);
       this.devicesInHB.set(accessory.context.hbDeviceId, accessory);
       if (!isX) {
         for (let i = 1; i <= accessory.context.channelCount; i++) {
           if (!this.devicesInHB.has(device.deviceid + "SW" + i)) {
             if (cns.devicesHideable.includes(accessory.context.type)) {
-              if ((this.config.hideFromHB || "").includes(device.deviceid + "SW" + i)) {
+              if (
+                (this.config.hideFromHB || "").includes(
+                  device.deviceid + "SW" + i
+                )
+              ) {
                 continue;
               } else {
                 this.addAccessory(device, device.deviceid + "SW" + i, "switch");
@@ -233,7 +302,9 @@ class eWeLink {
           }
           let oAccessory = this.devicesInHB.get(device.deviceid + "SW" + i);
           if (
-            (this.config.hideFromHB || "").includes(device.deviceid + "SW" + i) &&
+            (this.config.hideFromHB || "").includes(
+              device.deviceid + "SW" + i
+            ) &&
             cns.devicesHideable.includes(accessory.context.type)
           ) {
             this.removeAccessory(oAccessory);
@@ -247,9 +318,13 @@ class eWeLink {
           }
           oAccessory
             .getService(Service.AccessoryInformation)
-            .setCharacteristic(Characteristic.FirmwareRevision, device.params.fwVersion);
+            .setCharacteristic(
+              Characteristic.FirmwareRevision,
+              device.params.fwVersion
+            );
           oAccessory.context.reachableWAN = device.online;
-          oAccessory.context.reachableLAN = this.lanDevices.get(device.deviceid).online || false;
+          oAccessory.context.reachableLAN =
+            this.lanDevices.get(device.deviceid).online || false;
           this.devicesInHB.set(oAccessory.context.hbDeviceId, oAccessory);
         }
       }
@@ -274,12 +349,18 @@ class eWeLink {
         );
       }
     } else {
-      this.log.warn("[%s] cannot be initialised as it wasn't found in Homebridge.", device.name);
+      this.log.warn(
+        "[%s] cannot be initialised as it wasn't found in Homebridge.",
+        device.name
+      );
     }
   }
   addAccessory(device, hbDeviceId, type) {
     let switchNumber = hbDeviceId.substr(-1).toString(),
-      newDeviceName = type === "rf_sub" ? device.tags.zyx_info[switchNumber - 1].name : device.name,
+      newDeviceName =
+        type === "rf_sub"
+          ? device.tags.zyx_info[switchNumber - 1].name
+          : device.name,
       channelCount =
         type === "rf_pri"
           ? Object.keys((device.tags && device.tags.zyx_info) || []).length
@@ -297,7 +378,10 @@ class eWeLink {
     if ((this.config.nameOverride || {}).hasOwnProperty(hbDeviceId)) {
       newDeviceName = this.config.nameOverride[hbDeviceId];
     }
-    const accessory = new Accessory(newDeviceName, UUIDGen.generate(hbDeviceId).toString());
+    const accessory = new Accessory(
+      newDeviceName,
+      UUIDGen.generate(hbDeviceId).toString()
+    );
     try {
       accessory
         .getService(Service.AccessoryInformation)
@@ -307,7 +391,10 @@ class eWeLink {
           Characteristic.Model,
           device.productModel + " (" + device.extra.model + ")"
         )
-        .setCharacteristic(Characteristic.FirmwareRevision, device.params.fwVersion)
+        .setCharacteristic(
+          Characteristic.FirmwareRevision,
+          device.params.fwVersion
+        )
         .setCharacteristic(Characteristic.Identify, false);
       accessory.context = {
         hbDeviceId,
@@ -323,11 +410,18 @@ class eWeLink {
         case "valve":
           ["A", "B"].forEach(v => {
             accessory
-              .addService(Service.Valve, "Valve " + v, "valve" + v.toLowerCase())
+              .addService(
+                Service.Valve,
+                "Valve " + v,
+                "valve" + v.toLowerCase()
+              )
               .setCharacteristic(Characteristic.Active, 0)
               .setCharacteristic(Characteristic.InUse, 0)
               .setCharacteristic(Characteristic.ValveType, 1)
-              .setCharacteristic(Characteristic.SetDuration, this.config.valveTimeLength || 120)
+              .setCharacteristic(
+                Characteristic.SetDuration,
+                this.config.valveTimeLength || 120
+              )
               .addCharacteristic(Characteristic.RemainingDuration);
           });
           break;
@@ -362,7 +456,8 @@ class eWeLink {
         case "thermostat":
           if (!this.config.hideTHSwitch) accessory.addService(Service.Switch);
           accessory.addService(Service.TemperatureSensor);
-          if (device.params.sensorType !== "DS18B20") accessory.addService(Service.HumiditySensor);
+          if (device.params.sensorType !== "DS18B20")
+            accessory.addService(Service.HumiditySensor);
           break;
         case "outlet":
           accessory.addService(Service.Outlet);
@@ -408,7 +503,9 @@ class eWeLink {
           break;
         case "rf_sub":
           accessory.context.rfChls = {};
-          switch (device.tags.zyx_info[parseInt(switchNumber) - 1].remote_type) {
+          switch (
+            device.tags.zyx_info[parseInt(switchNumber) - 1].remote_type
+          ) {
             case "1":
             case "2":
             case "3":
@@ -428,46 +525,52 @@ class eWeLink {
               );
           }
           let mAccessory = this.devicesInHB.get(device.deviceid + "SW0");
-          device.tags.zyx_info[parseInt(switchNumber) - 1].buttonName.forEach(button => {
-            let rfData;
-            Object.entries(button).forEach(
-              ([k, v]) =>
-                (rfData = {
-                  rfChan: k,
-                  name: v,
-                })
-            );
-            accessory.context.rfChls[rfData.rfChan] = rfData.name;
-            mAccessory.context.rfChlMap[rfData.rfChan] = switchNumber;
-            switch (accessory.context.sensorType) {
-              case "button":
-                accessory.addService(Service.Switch, rfData.name, "switch" + rfData.rfChan);
-                break;
-              case "water":
-                accessory.addService(Service.LeakSensor);
-                break;
-              case "fire":
-              case "smoke":
-                accessory.addService(Service.SmokeSensor);
-                break;
-              case "co":
-                accessory.addService(Service.CarbonMonoxideSensor);
-                break;
-              case "co2":
-                accessory.addService(Service.CarbonDioxideSensor);
-                break;
-              case "contact":
-                accessory.addService(Service.ContactSensor);
-                break;
-              case "occupancy":
-                accessory.addService(Service.OccupancySensor);
-                break;
-              default:
-                accessory.addService(Service.MotionSensor);
-                break;
+          device.tags.zyx_info[parseInt(switchNumber) - 1].buttonName.forEach(
+            button => {
+              let rfData;
+              Object.entries(button).forEach(
+                ([k, v]) =>
+                  (rfData = {
+                    rfChan: k,
+                    name: v,
+                  })
+              );
+              accessory.context.rfChls[rfData.rfChan] = rfData.name;
+              mAccessory.context.rfChlMap[rfData.rfChan] = switchNumber;
+              switch (accessory.context.sensorType) {
+                case "button":
+                  accessory.addService(
+                    Service.Switch,
+                    rfData.name,
+                    "switch" + rfData.rfChan
+                  );
+                  break;
+                case "water":
+                  accessory.addService(Service.LeakSensor);
+                  break;
+                case "fire":
+                case "smoke":
+                  accessory.addService(Service.SmokeSensor);
+                  break;
+                case "co":
+                  accessory.addService(Service.CarbonMonoxideSensor);
+                  break;
+                case "co2":
+                  accessory.addService(Service.CarbonDioxideSensor);
+                  break;
+                case "contact":
+                  accessory.addService(Service.ContactSensor);
+                  break;
+                case "occupancy":
+                  accessory.addService(Service.OccupancySensor);
+                  break;
+                default:
+                  accessory.addService(Service.MotionSensor);
+                  break;
+              }
+              this.devicesInHB.set(mAccessory.context.hbDeviceId, mAccessory);
             }
-            this.devicesInHB.set(mAccessory.context.hbDeviceId, mAccessory);
-          });
+          );
           break;
         case "zb_sub": //*** credit @tasict ***\\
           accessory.addService(Service.BatteryService);
@@ -505,7 +608,9 @@ class eWeLink {
           throw "device is not supported by this plugin. Please create an issue on GitHub";
       }
       this.devicesInHB.set(hbDeviceId, accessory);
-      this.api.registerPlatformAccessories("homebridge-ewelink", "eWeLink", [accessory]);
+      this.api.registerPlatformAccessories("homebridge-ewelink", "eWeLink", [
+        accessory,
+      ]);
       this.configureAccessory(accessory);
       this.log("[%s] has been added to Homebridge.", newDeviceName);
     } catch (err) {
@@ -524,21 +629,33 @@ class eWeLink {
               .getService("Valve " + v)
               .getCharacteristic(Characteristic.Active)
               .on("set", (value, callback) =>
-                this.internalValveUpdate(accessory, "Valve " + v, value, callback)
+                this.internalValveUpdate(
+                  accessory,
+                  "Valve " + v,
+                  value,
+                  callback
+                )
               );
             accessory
               .getService("Valve " + v)
               .getCharacteristic(Characteristic.SetDuration)
               .on("set", (value, callback) => {
                 if (
-                  accessory.getService("Valve " + v).getCharacteristic(Characteristic.InUse).value
+                  accessory
+                    .getService("Valve " + v)
+                    .getCharacteristic(Characteristic.InUse).value
                 ) {
                   accessory
                     .getService("Valve " + v)
-                    .updateCharacteristic(Characteristic.RemainingDuration, value);
+                    .updateCharacteristic(
+                      Characteristic.RemainingDuration,
+                      value
+                    );
                   clearTimeout(accessory.getService("Valve " + v).timer);
                   accessory.getService("Valve " + v).timer = setTimeout(() => {
-                    accessory.getService("Valve " + v).setCharacteristic(Characteristic.Active, 0);
+                    accessory
+                      .getService("Valve " + v)
+                      .setCharacteristic(Characteristic.Active, 0);
                   }, value * 1000);
                 }
                 callback();
@@ -549,7 +666,9 @@ class eWeLink {
           accessory
             .getService(Service.WindowCovering)
             .getCharacteristic(Characteristic.TargetPosition)
-            .on("set", (value, callback) => this.internalBlindUpdate(accessory, value, callback))
+            .on("set", (value, callback) =>
+              this.internalBlindUpdate(accessory, value, callback)
+            )
             .setProps({
               minStep: 100,
             });
@@ -558,13 +677,17 @@ class eWeLink {
           accessory
             .getService(Service.GarageDoorOpener)
             .getCharacteristic(Characteristic.TargetDoorState)
-            .on("set", (value, callback) => this.internalGarageUpdate(accessory, value, callback));
+            .on("set", (value, callback) =>
+              this.internalGarageUpdate(accessory, value, callback)
+            );
           break;
         case "lock":
           accessory
             .getService(Service.LockMechanism)
             .getCharacteristic(Characteristic.LockTargetState)
-            .on("set", (value, callback) => this.internalLockUpdate(accessory, value, callback));
+            .on("set", (value, callback) =>
+              this.internalLockUpdate(accessory, value, callback)
+            );
           break;
         case "fan":
           accessory
@@ -614,7 +737,9 @@ class eWeLink {
             if (accessory.getService(Service.HumiditySensor)) {
               dataToAdd.humidity = accessory
                 .getService(Service.HumiditySensor)
-                .getCharacteristic(Characteristic.CurrentRelativeHumidity).value;
+                .getCharacteristic(
+                  Characteristic.CurrentRelativeHumidity
+                ).value;
             }
             accessory.eveLogger.addEntry(dataToAdd);
           }, 300000);
@@ -623,7 +748,9 @@ class eWeLink {
           accessory
             .getService(Service.Outlet)
             .getCharacteristic(Characteristic.On)
-            .on("set", (value, callback) => this.internalOutletUpdate(accessory, value, callback));
+            .on("set", (value, callback) =>
+              this.internalOutletUpdate(accessory, value, callback)
+            );
           accessory.log = this.log;
           accessory.eveLogger = new EveHistoryService("energy", accessory, {
             storage: "fs",
@@ -642,12 +769,15 @@ class eWeLink {
             };
           }
           corrInterval.setCorrectingInterval(() => {
-            let isOn = accessory.getService(Service.Outlet).getCharacteristic(Characteristic.On)
-                .value,
+            let isOn = accessory
+                .getService(Service.Outlet)
+                .getCharacteristic(Characteristic.On).value,
               currentWatt = isOn
                 ? accessory
                     .getService(Service.Outlet)
-                    .getCharacteristic(EveService.Characteristics.CurrentConsumption).value
+                    .getCharacteristic(
+                      EveService.Characteristics.CurrentConsumption
+                    ).value
                 : 0;
             if (accessory.eveLogger.isHistoryLoaded()) {
               accessory.context.extraPersistedData = accessory.eveLogger.getExtraPersistedData();
@@ -662,7 +792,8 @@ class eWeLink {
                 });
               } else {
                 accessory.context.totalEnergy =
-                  accessory.context.totalEnergyTemp + (currentWatt * 10) / 3600 / 1000;
+                  accessory.context.totalEnergyTemp +
+                  (currentWatt * 10) / 3600 / 1000;
                 accessory.eveLogger.setExtraPersistedData({
                   totalenergy: accessory.context.totalEnergy,
                   lastReset: 0,
@@ -670,7 +801,8 @@ class eWeLink {
               }
               accessory.context.totalEnergytemp = 0;
             } else {
-              accessory.context.totalEnergyTemp += (currentWatt * 10) / 3600 / 1000;
+              accessory.context.totalEnergyTemp +=
+                (currentWatt * 10) / 3600 / 1000;
               accessory.context.totalEnergy = accessory.context.totalEnergyTemp;
             }
             accessory.eveLogger.addEntry({
@@ -684,7 +816,8 @@ class eWeLink {
             .on("get", callback => {
               accessory.context.extraPersistedData = accessory.eveLogger.getExtraPersistedData();
               if (accessory.context.extraPersistedData !== undefined) {
-                accessory.context.totalEnergy = accessory.context.extraPersistedData.totalPower;
+                accessory.context.totalEnergy =
+                  accessory.context.extraPersistedData.totalPower;
               }
               callback(null, accessory.context.totalEnergy);
             });
@@ -703,7 +836,8 @@ class eWeLink {
             .on("get", callback => {
               accessory.context.extraPersistedData = accessory.eveLogger.getExtraPersistedData();
               if (accessory.context.extraPersistedData !== undefined) {
-                accessory.context.lastReset = accessory.context.extraPersistedData.lastReset;
+                accessory.context.lastReset =
+                  accessory.context.extraPersistedData.lastReset;
               }
               callback(null, accessory.context.lastReset);
             });
@@ -712,13 +846,17 @@ class eWeLink {
           accessory
             .getService(Service.Outlet)
             .getCharacteristic(Characteristic.On)
-            .on("set", (value, callback) => this.internalUSBUpdate(accessory, value, callback));
+            .on("set", (value, callback) =>
+              this.internalUSBUpdate(accessory, value, callback)
+            );
           break;
         case "scm":
           accessory
             .getService(Service.Switch)
             .getCharacteristic(Characteristic.On)
-            .on("set", (value, callback) => this.internalSCMUpdate(accessory, value, callback));
+            .on("set", (value, callback) =>
+              this.internalSCMUpdate(accessory, value, callback)
+            );
           break;
         case "light":
           accessory
@@ -734,8 +872,9 @@ class eWeLink {
               .on("set", (value, callback) => {
                 if (value > 0) {
                   if (
-                    !accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On)
-                      .value
+                    !accessory
+                      .getService(Service.Lightbulb)
+                      .getCharacteristic(Characteristic.On).value
                   ) {
                     this.internalLightbulbUpdate(accessory, true, function () {
                       return;
@@ -746,15 +885,18 @@ class eWeLink {
                   this.internalLightbulbUpdate(accessory, false, callback);
                 }
               });
-          } else if (cns.devicesColourable.includes(accessory.context.eweUIID)) {
+          } else if (
+            cns.devicesColourable.includes(accessory.context.eweUIID)
+          ) {
             accessory
               .getService(Service.Lightbulb)
               .getCharacteristic(Characteristic.Brightness)
               .on("set", (value, callback) => {
                 if (value > 0) {
                   if (
-                    !accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On)
-                      .value
+                    !accessory
+                      .getService(Service.Lightbulb)
+                      .getCharacteristic(Characteristic.On).value
                   ) {
                     this.internalLightbulbUpdate(accessory, true, function () {
                       return;
@@ -781,18 +923,24 @@ class eWeLink {
           accessory
             .getService(Service.Switch)
             .getCharacteristic(Characteristic.On)
-            .on("set", (value, callback) => this.internalSwitchUpdate(accessory, value, callback));
+            .on("set", (value, callback) =>
+              this.internalSwitchUpdate(accessory, value, callback)
+            );
           break;
         case "rf_sub":
           accessory.context.rfChls = accessory.context.rfChls || {};
           if (accessory.context.sensorType === "button") {
             Object.entries(accessory.context.rfChls).forEach(([k, v]) => {
-              accessory.getService(v).updateCharacteristic(Characteristic.On, false);
+              accessory
+                .getService(v)
+                .updateCharacteristic(Characteristic.On, false);
               accessory
                 .getService(v)
                 .getCharacteristic(Characteristic.On)
                 .on("set", (value, callback) => {
-                  value ? this.internalRFDeviceUpdate(accessory, k, callback) : callback();
+                  value
+                    ? this.internalRFDeviceUpdate(accessory, k, callback)
+                    : callback();
                 });
             });
           }
@@ -813,7 +961,8 @@ class eWeLink {
                   .getCharacteristic(Characteristic.CurrentTemperature).value,
                 humidity: accessory
                   .getService(Service.HumiditySensor)
-                  .getCharacteristic(Characteristic.CurrentRelativeHumidity).value,
+                  .getCharacteristic(Characteristic.CurrentRelativeHumidity)
+                  .value,
               };
               accessory.eveLogger.addEntry(dataToAdd);
             }, 300000);
@@ -822,14 +971,20 @@ class eWeLink {
       }
       this.devicesInHB.set(accessory.context.hbDeviceId, accessory);
     } catch (err) {
-      this.log.warn("[%s] could not be refreshed as %s.", accessory.displayName, err);
+      this.log.warn(
+        "[%s] could not be refreshed as %s.",
+        accessory.displayName,
+        err
+      );
     }
   }
   refreshAccessory(accessory, newParams) {
     switch (accessory.context.type) {
       case "valve":
         if (
-          Object.keys(newParams).some(v => cns.devicesValveParams.includes(v)) &&
+          Object.keys(newParams).some(v =>
+            cns.devicesValveParams.includes(v)
+          ) &&
           Array.isArray(newParams.switches)
         ) {
           this.externalValveUpdate(accessory, newParams);
@@ -837,7 +992,9 @@ class eWeLink {
         return true;
       case "blind":
         if (
-          Object.keys(newParams).some(v => cns.devicesBlindParams.includes(v)) &&
+          Object.keys(newParams).some(v =>
+            cns.devicesBlindParams.includes(v)
+          ) &&
           Array.isArray(newParams.switches)
         ) {
           this.externalBlindUpdate(accessory, newParams);
@@ -845,34 +1002,48 @@ class eWeLink {
         return true;
       case "garage":
         if (
-          Object.keys(newParams).some(v => cns.devicesGarageParams.includes(v)) &&
+          Object.keys(newParams).some(v =>
+            cns.devicesGarageParams.includes(v)
+          ) &&
           Array.isArray(newParams.switches)
         ) {
           this.externalGarageUpdate(accessory, newParams);
         }
         return true;
       case "lock":
-        if (Object.keys(newParams).some(v => cns.devicesLockParams.includes(v))) {
+        if (
+          Object.keys(newParams).some(v => cns.devicesLockParams.includes(v))
+        ) {
           this.externalLockUpdate(accessory, newParams);
         }
         return true;
       case "sensor":
-        if (Object.keys(newParams).some(v => cns.devicesSensorParams.includes(v))) {
+        if (
+          Object.keys(newParams).some(v => cns.devicesSensorParams.includes(v))
+        ) {
           this.externalSensorUpdate(accessory, newParams);
         }
         return true;
       case "fan":
-        if (Object.keys(newParams).some(v => cns.devicesFanParams.includes(v))) {
+        if (
+          Object.keys(newParams).some(v => cns.devicesFanParams.includes(v))
+        ) {
           this.externalFanUpdate(accessory, newParams);
         }
         return true;
       case "thermostat":
-        if (Object.keys(newParams).some(v => cns.devicesThermostatParams.includes(v))) {
+        if (
+          Object.keys(newParams).some(v =>
+            cns.devicesThermostatParams.includes(v)
+          )
+        ) {
           this.externalThermostatUpdate(accessory, newParams);
         }
         return true;
       case "outlet":
-        if (Object.keys(newParams).some(v => cns.devicesOutletParams.includes(v))) {
+        if (
+          Object.keys(newParams).some(v => cns.devicesOutletParams.includes(v))
+        ) {
           this.externalOutletUpdate(accessory, newParams);
         }
         return true;
@@ -897,7 +1068,11 @@ class eWeLink {
           cns.devicesSingleSwitch.includes(accessory.context.eweUIID) &&
           cns.devicesSingleSwitchLight.includes(accessory.context.eweModel)
         ) {
-          if (Object.keys(newParams).some(v => cns.devicesSingleSwitchLightParams.includes(v))) {
+          if (
+            Object.keys(newParams).some(v =>
+              cns.devicesSingleSwitchLightParams.includes(v)
+            )
+          ) {
             this.externalSingleLightUpdate(accessory, newParams);
           }
         } else if (
@@ -905,7 +1080,9 @@ class eWeLink {
           cns.devicesMultiSwitchLight.includes(accessory.context.eweModel)
         ) {
           if (
-            Object.keys(newParams).some(v => cns.devicesMultiSwitchLightParams.includes(v)) &&
+            Object.keys(newParams).some(v =>
+              cns.devicesMultiSwitchLightParams.includes(v)
+            ) &&
             Array.isArray(newParams.switches)
           ) {
             this.externalMultiLightUpdate(accessory, newParams);
@@ -914,12 +1091,18 @@ class eWeLink {
         return true;
       case "switch":
         if (cns.devicesSingleSwitch.includes(accessory.context.eweUIID)) {
-          if (Object.keys(newParams).some(v => cns.devicesSingleSwitchParams.includes(v))) {
+          if (
+            Object.keys(newParams).some(v =>
+              cns.devicesSingleSwitchParams.includes(v)
+            )
+          ) {
             this.externalSingleSwitchUpdate(accessory, newParams);
           }
         } else if (cns.devicesMultiSwitch.includes(accessory.context.eweUIID)) {
           if (
-            Object.keys(newParams).some(v => cns.devicesMultiSwitchParams.includes(v)) &&
+            Object.keys(newParams).some(v =>
+              cns.devicesMultiSwitchParams.includes(v)
+            ) &&
             Array.isArray(newParams.switches)
           ) {
             this.externalMultiSwitchUpdate(accessory, newParams);
@@ -927,7 +1110,11 @@ class eWeLink {
         }
         return true;
       case "rf_pri":
-        if (Object.keys(newParams).some(v => cns.devicesRFBridgeParams.includes(v))) {
+        if (
+          Object.keys(newParams).some(v =>
+            cns.devicesRFBridgeParams.includes(v)
+          )
+        ) {
           this.externalRFDeviceUpdate(accessory, newParams);
         }
         return true;
@@ -935,7 +1122,11 @@ class eWeLink {
       case "zb_pri":
         return true;
       case "zb_sub":
-        if (Object.keys(newParams).some(v => cns.devicesZBBridgeParams.includes(v))) {
+        if (
+          Object.keys(newParams).some(v =>
+            cns.devicesZBBridgeParams.includes(v)
+          )
+        ) {
           this.externalZBDeviceUpdate(accessory, newParams);
         }
         return true;
@@ -946,10 +1137,16 @@ class eWeLink {
   removeAccessory(accessory) {
     try {
       this.devicesInHB.delete(accessory.context.hbDeviceId);
-      this.api.unregisterPlatformAccessories("homebridge-ewelink", "eWeLink", [accessory]);
+      this.api.unregisterPlatformAccessories("homebridge-ewelink", "eWeLink", [
+        accessory,
+      ]);
       this.log("[%s] has been removed from Homebridge.", accessory.displayName);
     } catch (err) {
-      this.log.warn("[%s] needed to be removed but couldn't as %s.", accessory.displayName, err);
+      this.log.warn(
+        "[%s] needed to be removed but couldn't as %s.",
+        accessory.displayName,
+        err
+      );
     }
   }
   sendDeviceUpdate(accessory, params, callback) {
@@ -970,7 +1167,10 @@ class eWeLink {
         callback("Device has failed to update");
       }
     };
-    if (cns.devicesNonLAN.includes(accessory.context.eweUIID) || !accessory.context.reachableLAN) {
+    if (
+      cns.devicesNonLAN.includes(accessory.context.eweUIID) ||
+      !accessory.context.reachableLAN
+    ) {
       sendViaWS();
     } else {
       this.lanClient
@@ -978,81 +1178,110 @@ class eWeLink {
         .then(() => callback())
         .catch(err => {
           if (this.debug) {
-            this.log.warn("[%s] Reverting to web socket as %s.", accessory.displayName, err);
+            this.log.warn(
+              "[%s] Reverting to web socket as %s.",
+              accessory.displayName,
+              err
+            );
           }
           sendViaWS();
         });
     }
   }
   receiveDeviceUpdate(device) {
-    let accessory,
-      deviceId = device.deviceid,
-      statusChange = false;
-    if (
-      (accessory = this.devicesInHB.get(deviceId + "SWX") || this.devicesInHB.get(deviceId + "SW0"))
-    ) {
-      let isX = accessory.context.hbDeviceId.substr(-1) === "X";
-
-      if (device.params.updateSource === "WS") {
-        if (device.params.online != accessory.context.reachableWAN) {
-          accessory.context.reachableWAN = device.params.online;
-          this.devicesInHB.set(accessory.context.hbDeviceId, accessory);
-          if (accessory.context.reachableWAN) this.wsClient.requestUpdate(accessory);
-          statusChange = true;
-          this.log.warn(
-            "[%s] has been reported [%s] via [WS].",
-            accessory.displayName,
-            accessory.context.reachableWAN ? "online" : "offline"
-          );
-        }
-      }
-
-      if (device.params.updateSource === "LAN") {
-        if (!accessory.context.reachableLAN) {
-          accessory.context.reachableLAN = true;
-          this.devicesInHB.set(accessory.context.hbDeviceId, accessory);
-          this.wsClient.requestUpdate(accessory);
-          statusChange = true;
-          this.log.warn("[%s] has been reported [online] via [LAN].", accessory.displayName);
-        }
-        if (statusChange && !isX) {
-          for (let i = 1; i <= accessory.context.channelCount; i++) {
-            if (this.devicesInHB.has(deviceId + "SW" + i)) {
-              let oAccessory = this.devicesInHB.get(deviceId + "SW" + i);
-              oAccessory.context.reachableWAN = device.params.online;
-              oAccessory.context.reachableLAN = true;
-              this.devicesInHB.set(oAccessory.context.hbDeviceId, oAccessory);
+    let accessory;
+    switch (device.action) {
+      case "sysmsg":
+        if (
+          (accessory =
+            this.devicesInHB.get(device.deviceid + "SWX") ||
+            this.devicesInHB.get(device.deviceid + "SW0"))
+        ) {
+          let isX = accessory.context.hbDeviceId.substr(-1) === "X";
+          if (device.params.updateSource === "WS") {
+            if (accessory.context.reachableWAN !== device.params.online) {
+              accessory.context.reachableWAN = device.params.online;
+              this.log(
+                "[%s] has been reported [%s] via [WS].",
+                accessory.displayName,
+                accessory.context.reachableWAN ? "online" : "offline"
+              );
+              this.devicesInHB.set(accessory.context.hbDeviceId, accessory);
+              if (accessory.context.reachableWAN)
+                this.wsClient.requestUpdate(accessory);
+            } else {
+              if (this.debug) {
+                this.log(
+                  "[%s] Nothing to update from above WS message.",
+                  accessory.displayName
+                );
+              }
+            }
+          }
+          if (!isX) {
+            for (let i = 1; i <= accessory.context.channelCount; i++) {
+              if (this.devicesInHB.has(device.deviceid + "SW" + i)) {
+                let oAccessory = this.devicesInHB.get(
+                  device.deviceid + "SW" + i
+                );
+                oAccessory.context.reachableWAN = device.params.online;
+                this.devicesInHB.set(oAccessory.context.hbDeviceId, oAccessory);
+              }
             }
           }
         }
-      }
-      if (this.debug) {
-        this.log(
-          "[%s] externally updated from above %s message and will be refreshed.",
-          accessory.displayName,
-          device.params.updateSource
-        );
-      }
-      if (!this.refreshAccessory(accessory, device.params)) {
-        this.log.warn(
-          "[%s] cannot be refreshed. Please try removing accessory from the Homebridge cache along with any secondary devices (SW1, SW2, etc.). [debug:%s:%s]",
-          accessory.displayName,
-          accessory.context.type,
-          accessory.context.channelCount
-        );
-      }
-    } else {
-      if (!(this.config.hideDevFromHB || "").includes(deviceId)) {
-        this.log.warn(
-          "[%s] update received via %s does not exist in Homebridge so device will be added.",
-          deviceId,
-          device.params.updateSource
-        );
-        this.httpClient
-          .getDevice(deviceId)
-          .then(res => this.initialiseDevice(res))
-          .catch(err => this.log.error("[%s] error getting info [%s]", deviceId, err));
-      }
+        break;
+      case "update":
+        if (
+          (accessory =
+            this.devicesInHB.get(device.deviceid + "SWX") ||
+            this.devicesInHB.get(device.deviceid + "SW0"))
+        ) {
+          if (
+            device.params.updateSource === "WS" &&
+            !accessory.context.reachableWAN
+          ) {
+            accessory.context.reachableWAN = true;
+            this.log(
+              "[%s] has been reported [online] via [WS].",
+              accessory.displayName
+            );
+          }
+          if (
+            device.params.updateSource === "LAN" &&
+            !accessory.context.reachableLAN
+          ) {
+            accessory.context.reachableLAN = true;
+            this.log(
+              "[%s] has been reported [online] via [LAN].",
+              accessory.displayName
+            );
+          }
+          if (this.debug) {
+            this.log(
+              "[%s] externally updated from above %s message and will be refreshed.",
+              accessory.displayName,
+              device.params.updateSource
+            );
+          }
+          if (!this.refreshAccessory(accessory, device.params)) {
+            this.log.warn(
+              "[%s] cannot be refreshed. Please try removing accessory from the Homebridge cache along with any secondary devices (SW1, SW2, etc.). [debug:%s:%s]",
+              accessory.displayName,
+              accessory.context.type,
+              accessory.context.channelCount
+            );
+          }
+        } else {
+          if (!(this.config.hideDevFromHB || "").includes(device.deviceid)) {
+            this.log.warn(
+              "[%s] Accessory received via %s update does not exist in Homebridge. If it's a new accessory please restart Homebridge so it is added.",
+              device.deviceid,
+              device.params.updateSource
+            );
+          }
+        }
+        break;
     }
   }
   internalValveUpdate(accessory, valve, value, callback) {
@@ -1067,19 +1296,28 @@ class eWeLink {
         .updateCharacteristic(Characteristic.InUse, value);
       switch (value) {
         case 0:
-          accessory.getService(valve).updateCharacteristic(Characteristic.RemainingDuration, 0);
+          accessory
+            .getService(valve)
+            .updateCharacteristic(Characteristic.RemainingDuration, 0);
           clearTimeout(accessory.getService(valve).timer);
           break;
         case 1:
-          let timer = accessory.getService(valve).getCharacteristic(Characteristic.SetDuration)
-            .value;
-          accessory.getService(valve).updateCharacteristic(Characteristic.RemainingDuration, timer);
+          let timer = accessory
+            .getService(valve)
+            .getCharacteristic(Characteristic.SetDuration).value;
+          accessory
+            .getService(valve)
+            .updateCharacteristic(Characteristic.RemainingDuration, timer);
           accessory.getService(valve).timer = setTimeout(() => {
-            accessory.getService(valve).setCharacteristic(Characteristic.Active, 0);
+            accessory
+              .getService(valve)
+              .setCharacteristic(Characteristic.Active, 0);
           }, timer * 1000);
           break;
       }
-      params.switches = this.devicesInEW.get(accessory.context.eweDeviceId).params.switches;
+      params.switches = this.devicesInEwe.get(
+        accessory.context.eweDeviceId
+      ).params.switches;
       switch (valve) {
         case "Valve A":
           params.switches[0].switch = value ? "on" : "off";
@@ -1104,7 +1342,8 @@ class eWeLink {
       params.switches[3].switch = "off";
       this.sendDeviceUpdate(accessory, params, callback);
     } catch (err) {
-      let str = "[" + accessory.displayName + "] could not be updated as " + err + ".";
+      let str =
+        "[" + accessory.displayName + "] could not be updated as " + err + ".";
       this.log.error(str);
       callback(str);
     }
@@ -1118,7 +1357,10 @@ class eWeLink {
       if (!(blindConfig = this.cusG.get(accessory.context.hbDeviceId))) {
         throw "group config missing";
       }
-      if (blindConfig.type !== "blind" || !["oneSwitch", "twoSwitch"].includes(blindConfig.setup)) {
+      if (
+        blindConfig.type !== "blind" ||
+        !["oneSwitch", "twoSwitch"].includes(blindConfig.setup)
+      ) {
         throw "improper configuration";
       }
       let oldPos,
@@ -1140,7 +1382,9 @@ class eWeLink {
           params.switch = "on";
           break;
         case "twoSwitch":
-          params.switches = this.devicesInEW.get(accessory.context.eweDeviceId).params.switches;
+          params.switches = this.devicesInEwe.get(
+            accessory.context.eweDeviceId
+          ).params.switches;
           params.switches[0].switch = value === 100 ? "on" : "off";
           params.switches[1].switch = value === 0 ? "on" : "off";
           break;
@@ -1160,7 +1404,8 @@ class eWeLink {
         callback();
       }, parseInt(blindConfig.operationTime) * 100);
     } catch (err) {
-      let str = "[" + accessory.displayName + "] could not be updated as " + err + ".";
+      let str =
+        "[" + accessory.displayName + "] could not be updated as " + err + ".";
       this.log.error(str);
       callback(str);
     }
@@ -1188,7 +1433,10 @@ class eWeLink {
         newPos = value,
         params = {},
         delay = 0;
-      if (sensorDefinition && !(sAccessory = this.devicesInHB.get(garageConfig.sensorId + "SWX"))) {
+      if (
+        sensorDefinition &&
+        !(sAccessory = this.devicesInHB.get(garageConfig.sensorId + "SWX"))
+      ) {
         throw "defined DW2 sensor doesn't exist";
       }
       if (sAccessory.context.type !== "sensor") {
@@ -1211,7 +1459,10 @@ class eWeLink {
       if (garageConfig.setup === "oneSwitch" && [2, 3].includes(oldPos)) {
         accessory
           .getService(Service.GarageDoorOpener)
-          .updateCharacteristic(Characteristic.CurrentDoorState, ((oldPos * 2) % 3) + 2);
+          .updateCharacteristic(
+            Characteristic.CurrentDoorState,
+            ((oldPos * 2) % 3) + 2
+          );
         delay = 1500;
       }
       setTimeout(() => {
@@ -1225,7 +1476,9 @@ class eWeLink {
               params.switch = "on";
               break;
             case "twoSwitch":
-              params.switches = this.devicesInEW.get(accessory.context.eweDeviceId).params.switches;
+              params.switches = this.devicesInEwe.get(
+                accessory.context.eweDeviceId
+              ).params.switches;
               params.switches[0].switch = newPos === 0 ? "on" : "off";
               params.switches[1].switch = newPos === 1 ? "on" : "off";
               break;
@@ -1246,7 +1499,8 @@ class eWeLink {
       callback();
     } catch (err) {
       accessory.context.inUse = false;
-      let str = "[" + accessory.displayName + "] could not be updated as " + err + ".";
+      let str =
+        "[" + accessory.displayName + "] could not be updated as " + err + ".";
       this.log.error(str);
       callback(str);
     }
@@ -1281,7 +1535,8 @@ class eWeLink {
       }, parseInt(lockConfig.operationTime) * 100);
     } catch (err) {
       accessory.context.inUse = false;
-      let str = "[" + accessory.displayName + "] could not be updated as " + err + ".";
+      let str =
+        "[" + accessory.displayName + "] could not be updated as " + err + ".";
       this.log.error(str);
       callback(str);
     }
@@ -1296,36 +1551,45 @@ class eWeLink {
         case "power":
           newPower = value;
           newSpeed = value ? 33 : 0;
-          newLight = accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On)
-            .value;
+          newLight = accessory
+            .getService(Service.Lightbulb)
+            .getCharacteristic(Characteristic.On).value;
           break;
         case "speed":
           newPower = value >= 33 ? 1 : 0;
           newSpeed = value;
-          newLight = accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On)
-            .value;
+          newLight = accessory
+            .getService(Service.Lightbulb)
+            .getCharacteristic(Characteristic.On).value;
           break;
         case "light":
-          newPower = accessory.getService(Service.Fanv2).getCharacteristic(Characteristic.Active)
-            .value;
+          newPower = accessory
+            .getService(Service.Fanv2)
+            .getCharacteristic(Characteristic.Active).value;
           newSpeed = accessory
             .getService(Service.Fanv2)
             .getCharacteristic(Characteristic.RotationSpeed).value;
           newLight = value;
           break;
       }
-      accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, newLight);
+      accessory
+        .getService(Service.Lightbulb)
+        .updateCharacteristic(Characteristic.On, newLight);
       accessory
         .getService(Service.Fanv2)
         .updateCharacteristic(Characteristic.Active, newPower)
         .updateCharacteristic(Characteristic.RotationSpeed, newSpeed);
       let params = {
-        switches: this.devicesInEW.get(accessory.context.eweDeviceId).params.switches,
+        switches: this.devicesInEwe.get(accessory.context.eweDeviceId).params
+          .switches,
       };
       params.switches[0].switch = newLight ? "on" : "off";
-      params.switches[1].switch = newPower === 1 && newSpeed >= 33 ? "on" : "off";
-      params.switches[2].switch = newPower === 1 && newSpeed >= 66 && newSpeed < 99 ? "on" : "off";
-      params.switches[3].switch = newPower === 1 && newSpeed >= 99 ? "on" : "off";
+      params.switches[1].switch =
+        newPower === 1 && newSpeed >= 33 ? "on" : "off";
+      params.switches[2].switch =
+        newPower === 1 && newSpeed >= 66 && newSpeed < 99 ? "on" : "off";
+      params.switches[3].switch =
+        newPower === 1 && newSpeed >= 99 ? "on" : "off";
       if (this.debug) {
         this.log.warn("Fan Update - setting " + type + " to " + value);
         this.log(
@@ -1338,7 +1602,8 @@ class eWeLink {
       }
       this.sendDeviceUpdate(accessory, params, callback);
     } catch (err) {
-      let str = "[" + accessory.displayName + "] could not be updated as " + err + ".";
+      let str =
+        "[" + accessory.displayName + "] could not be updated as " + err + ".";
       this.log.error(str);
       callback(str);
     }
@@ -1353,12 +1618,19 @@ class eWeLink {
         mainSwitch: value ? "on" : "off",
       };
       if (this.debug) {
-        this.log("[%s] updating to turn [%s].", accessory.displayName, value ? "on" : "off");
+        this.log(
+          "[%s] updating to turn [%s].",
+          accessory.displayName,
+          value ? "on" : "off"
+        );
       }
-      accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, value);
+      accessory
+        .getService(Service.Switch)
+        .updateCharacteristic(Characteristic.On, value);
       this.sendDeviceUpdate(accessory, params, callback);
     } catch (err) {
-      let str = "[" + accessory.displayName + "] could not be updated as " + err + ".";
+      let str =
+        "[" + accessory.displayName + "] could not be updated as " + err + ".";
       this.log.error(str);
       callback(str);
     }
@@ -1372,9 +1644,15 @@ class eWeLink {
         switch: value ? "on" : "off",
       };
       if (this.debug) {
-        this.log("[%s] requesting to turn [%s].", accessory.displayName, value ? "on" : "off");
+        this.log(
+          "[%s] requesting to turn [%s].",
+          accessory.displayName,
+          value ? "on" : "off"
+        );
       }
-      accessory.getService(Service.Outlet).updateCharacteristic(Characteristic.On, value);
+      accessory
+        .getService(Service.Outlet)
+        .updateCharacteristic(Characteristic.On, value);
       this.sendDeviceUpdate(accessory, params, callback);
     } catch (err) {
       callback("[" + accessory.displayName + "] " + err + ".");
@@ -1386,13 +1664,20 @@ class eWeLink {
         throw "it is currently offline";
       }
       let params = {
-        switches: this.devicesInEW.get(accessory.context.eweDeviceId).params.switches,
+        switches: this.devicesInEwe.get(accessory.context.eweDeviceId).params
+          .switches,
       };
       params.switches[0].switch = value ? "on" : "off";
       if (this.debug) {
-        this.log("[%s] requesting to turn [%s].", accessory.displayName, value ? "on" : "off");
+        this.log(
+          "[%s] requesting to turn [%s].",
+          accessory.displayName,
+          value ? "on" : "off"
+        );
       }
-      accessory.getService(Service.Outlet).updateCharacteristic(Characteristic.On, value);
+      accessory
+        .getService(Service.Outlet)
+        .updateCharacteristic(Characteristic.On, value);
       this.sendDeviceUpdate(accessory, params, callback);
     } catch (err) {
       callback("[" + accessory.displayName + "] " + err + ".");
@@ -1404,13 +1689,20 @@ class eWeLink {
         throw "it is currently offline";
       }
       let params = {
-        switches: this.devicesInEW.get(accessory.context.eweDeviceId).params.switches,
+        switches: this.devicesInEwe.get(accessory.context.eweDeviceId).params
+          .switches,
       };
       params.switches[0].switch = value ? "on" : "off";
       if (this.debug) {
-        this.log("[%s] requesting to turn [%s].", accessory.displayName, value ? "on" : "off");
+        this.log(
+          "[%s] requesting to turn [%s].",
+          accessory.displayName,
+          value ? "on" : "off"
+        );
       }
-      accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, value);
+      accessory
+        .getService(Service.Switch)
+        .updateCharacteristic(Characteristic.On, value);
       this.sendDeviceUpdate(accessory, params, callback);
     } catch (err) {
       callback("[" + accessory.displayName + "] " + err + ".");
@@ -1432,12 +1724,20 @@ class eWeLink {
             params.switch = value ? "on" : "off";
           }
           if (this.debug) {
-            this.log("[%s] updating to turn [%s].", accessory.displayName, value ? "on" : "off");
+            this.log(
+              "[%s] updating to turn [%s].",
+              accessory.displayName,
+              value ? "on" : "off"
+            );
           }
-          accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, value);
+          accessory
+            .getService(Service.Lightbulb)
+            .updateCharacteristic(Characteristic.On, value);
           break;
         case "0":
-          params.switches = this.devicesInEW.get(accessory.context.eweDeviceId).params.switches;
+          params.switches = this.devicesInEwe.get(
+            accessory.context.eweDeviceId
+          ).params.switches;
           params.switches[0].switch = value ? "on" : "off";
           params.switches[1].switch = value ? "on" : "off";
           params.switches[2].switch = value ? "on" : "off";
@@ -1449,10 +1749,16 @@ class eWeLink {
               value ? "on" : "off"
             );
           }
-          accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, value);
+          accessory
+            .getService(Service.Lightbulb)
+            .updateCharacteristic(Characteristic.On, value);
           for (let i = 1; i <= 4; i++) {
-            if (this.devicesInHB.has(accessory.context.eweDeviceId + "SW" + i)) {
-              oAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW" + i);
+            if (
+              this.devicesInHB.has(accessory.context.eweDeviceId + "SW" + i)
+            ) {
+              oAccessory = this.devicesInHB.get(
+                accessory.context.eweDeviceId + "SW" + i
+              );
               oAccessory
                 .getService(Service.Lightbulb)
                 .updateCharacteristic(Characteristic.On, value);
@@ -1464,14 +1770,26 @@ class eWeLink {
         case "3":
         case "4":
           if (this.debug) {
-            this.log("[%s] updating to turn [%s].", accessory.displayName, value ? "on" : "off");
+            this.log(
+              "[%s] updating to turn [%s].",
+              accessory.displayName,
+              value ? "on" : "off"
+            );
           }
-          accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, value);
+          accessory
+            .getService(Service.Lightbulb)
+            .updateCharacteristic(Characteristic.On, value);
           let tAccessory,
             masterState = "off";
-          params.switches = this.devicesInEW.get(accessory.context.eweDeviceId).params.switches;
+          params.switches = this.devicesInEwe.get(
+            accessory.context.eweDeviceId
+          ).params.switches;
           for (let i = 1; i <= 4; i++) {
-            if ((tAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW" + i))) {
+            if (
+              (tAccessory = this.devicesInHB.get(
+                accessory.context.eweDeviceId + "SW" + i
+              ))
+            ) {
               i === parseInt(accessory.context.switchNumber)
                 ? (params.switches[i - 1].switch = value ? "on" : "off")
                 : (params.switches[i - 1].switch = tAccessory
@@ -1480,7 +1798,9 @@ class eWeLink {
                     ? "on"
                     : "off");
               if (
-                tAccessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On).value
+                tAccessory
+                  .getService(Service.Lightbulb)
+                  .getCharacteristic(Characteristic.On).value
               ) {
                 masterState = "on";
               }
@@ -1488,17 +1808,22 @@ class eWeLink {
               params.switches[i - 1].switch = "off";
             }
           }
-          oAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW0");
+          oAccessory = this.devicesInHB.get(
+            accessory.context.eweDeviceId + "SW0"
+          );
           oAccessory
             .getService(Service.Lightbulb)
             .updateCharacteristic(Characteristic.On, masterState === "on");
           break;
         default:
-          throw "unknown switch number [" + accessory.context.switchNumber + "]";
+          throw (
+            "unknown switch number [" + accessory.context.switchNumber + "]"
+          );
       }
       this.sendDeviceUpdate(accessory, params, callback);
     } catch (err) {
-      let str = "[" + accessory.displayName + "] could not be updated as " + err + ".";
+      let str =
+        "[" + accessory.displayName + "] could not be updated as " + err + ".";
       this.log.error(str);
       callback(str);
     }
@@ -1511,9 +1836,15 @@ class eWeLink {
       let params = {};
       if (value === 0) {
         params.switch = "off";
-        accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, false);
+        accessory
+          .getService(Service.Lightbulb)
+          .updateCharacteristic(Characteristic.On, false);
       } else {
-        if (!accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On).value) {
+        if (
+          !accessory
+            .getService(Service.Lightbulb)
+            .getCharacteristic(Characteristic.On).value
+        ) {
           params.switch = "on";
         }
         switch (accessory.context.eweUIID) {
@@ -1532,11 +1863,16 @@ class eWeLink {
           .updateCharacteristic(Characteristic.Brightness, value);
       }
       if (this.debug) {
-        this.log("[%s] updating brightness to [%s%].", accessory.displayName, value);
+        this.log(
+          "[%s] updating brightness to [%s%].",
+          accessory.displayName,
+          value
+        );
       }
       setTimeout(() => this.sendDeviceUpdate(accessory, params, callback), 250);
     } catch (err) {
-      let str = "[" + accessory.displayName + "] could not be updated as " + err + ".";
+      let str =
+        "[" + accessory.displayName + "] could not be updated as " + err + ".";
       this.log.error(str);
       callback(str);
     }
@@ -1548,8 +1884,9 @@ class eWeLink {
       }
       let newRGB,
         params = {},
-        curHue = accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.Hue)
-          .value,
+        curHue = accessory
+          .getService(Service.Lightbulb)
+          .getCharacteristic(Characteristic.Hue).value,
         curSat = accessory
           .getService(Service.Lightbulb)
           .getCharacteristic(Characteristic.Saturation).value;
@@ -1580,9 +1917,15 @@ class eWeLink {
               throw "unknown device UIID";
           }
           if (this.debug) {
-            this.log("[%s] updating hue to [%s°].", accessory.displayName, value);
+            this.log(
+              "[%s] updating hue to [%s°].",
+              accessory.displayName,
+              value
+            );
           }
-          accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.Hue, value);
+          accessory
+            .getService(Service.Lightbulb)
+            .updateCharacteristic(Characteristic.Hue, value);
           break;
         case "bri":
           switch (accessory.context.eweUIID) {
@@ -1606,7 +1949,11 @@ class eWeLink {
               break;
           }
           if (this.debug) {
-            this.log("[%s] updating brightness to [%s%].", accessory.displayName, value);
+            this.log(
+              "[%s] updating brightness to [%s%].",
+              accessory.displayName,
+              value
+            );
           }
           accessory
             .getService(Service.Lightbulb)
@@ -1617,7 +1964,8 @@ class eWeLink {
       }
       setTimeout(() => this.sendDeviceUpdate(accessory, params, callback), 250);
     } catch (err) {
-      let str = "[" + accessory.displayName + "] could not be updated as " + err + ".";
+      let str =
+        "[" + accessory.displayName + "] could not be updated as " + err + ".";
       this.log.error(str);
       callback(str);
     }
@@ -1633,12 +1981,20 @@ class eWeLink {
         case "X":
           params.switch = value ? "on" : "off";
           if (this.debug) {
-            this.log("[%s] updating to turn [%s].", accessory.displayName, value ? "on" : "off");
+            this.log(
+              "[%s] updating to turn [%s].",
+              accessory.displayName,
+              value ? "on" : "off"
+            );
           }
-          accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, value);
+          accessory
+            .getService(Service.Switch)
+            .updateCharacteristic(Characteristic.On, value);
           break;
         case "0":
-          params.switches = this.devicesInEW.get(accessory.context.eweDeviceId).params.switches;
+          params.switches = this.devicesInEwe.get(
+            accessory.context.eweDeviceId
+          ).params.switches;
           params.switches[0].switch = value ? "on" : "off";
           params.switches[1].switch = value ? "on" : "off";
           params.switches[2].switch = value ? "on" : "off";
@@ -1650,11 +2006,19 @@ class eWeLink {
               value ? "on" : "off"
             );
           }
-          accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, value);
+          accessory
+            .getService(Service.Switch)
+            .updateCharacteristic(Characteristic.On, value);
           for (let i = 1; i <= 4; i++) {
-            if (this.devicesInHB.has(accessory.context.eweDeviceId + "SW" + i)) {
-              oAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW" + i);
-              oAccessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, value);
+            if (
+              this.devicesInHB.has(accessory.context.eweDeviceId + "SW" + i)
+            ) {
+              oAccessory = this.devicesInHB.get(
+                accessory.context.eweDeviceId + "SW" + i
+              );
+              oAccessory
+                .getService(Service.Switch)
+                .updateCharacteristic(Characteristic.On, value);
             }
           }
           break;
@@ -1663,14 +2027,26 @@ class eWeLink {
         case "3":
         case "4":
           if (this.debug) {
-            this.log("[%s] updating to turn [%s].", accessory.displayName, value ? "on" : "off");
+            this.log(
+              "[%s] updating to turn [%s].",
+              accessory.displayName,
+              value ? "on" : "off"
+            );
           }
-          accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, value);
+          accessory
+            .getService(Service.Switch)
+            .updateCharacteristic(Characteristic.On, value);
           let tAccessory,
             masterState = "off";
-          params.switches = this.devicesInEW.get(accessory.context.eweDeviceId).params.switches;
+          params.switches = this.devicesInEwe.get(
+            accessory.context.eweDeviceId
+          ).params.switches;
           for (let i = 1; i <= 4; i++) {
-            if ((tAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW" + i))) {
+            if (
+              (tAccessory = this.devicesInHB.get(
+                accessory.context.eweDeviceId + "SW" + i
+              ))
+            ) {
               i === parseInt(accessory.context.switchNumber)
                 ? (params.switches[i - 1].switch = value ? "on" : "off")
                 : (params.switches[i - 1].switch = tAccessory
@@ -1679,7 +2055,9 @@ class eWeLink {
                     ? "on"
                     : "off");
               if (
-                tAccessory.getService(Service.Switch).getCharacteristic(Characteristic.On).value
+                tAccessory
+                  .getService(Service.Switch)
+                  .getCharacteristic(Characteristic.On).value
               ) {
                 masterState = "on";
               }
@@ -1687,17 +2065,22 @@ class eWeLink {
               params.switches[i - 1].switch = "off";
             }
           }
-          oAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW0");
+          oAccessory = this.devicesInHB.get(
+            accessory.context.eweDeviceId + "SW0"
+          );
           oAccessory
             .getService(Service.Switch)
             .updateCharacteristic(Characteristic.On, masterState === "on");
           break;
         default:
-          throw "unknown switch number [" + accessory.context.switchNumber + "]";
+          throw (
+            "unknown switch number [" + accessory.context.switchNumber + "]"
+          );
       }
       this.sendDeviceUpdate(accessory, params, callback);
     } catch (err) {
-      let str = "[" + accessory.displayName + "] could not be updated as " + err + ".";
+      let str =
+        "[" + accessory.displayName + "] could not be updated as " + err + ".";
       this.log.error(str);
       callback(str);
     }
@@ -1731,7 +2114,14 @@ class eWeLink {
         3000
       );
     } catch (err) {
-      let str = "[" + accessory.displayName + " " + name + "] could not be updated as " + err + ".";
+      let str =
+        "[" +
+        accessory.displayName +
+        " " +
+        name +
+        "] could not be updated as " +
+        err +
+        ".";
       this.log.error(str);
       callback(str);
     }
@@ -1741,8 +2131,14 @@ class eWeLink {
       ["A", "B"].forEach((v, k) => {
         accessory
           .getService("Valve " + v)
-          .updateCharacteristic(Characteristic.Active, params.switches[k].switch === "on")
-          .updateCharacteristic(Characteristic.InUse, params.switches[k].switch === "on");
+          .updateCharacteristic(
+            Characteristic.Active,
+            params.switches[k].switch === "on"
+          )
+          .updateCharacteristic(
+            Characteristic.InUse,
+            params.switches[k].switch === "on"
+          );
         if (params.switches[k].switch === "on") {
           let timer = accessory
             .getService("Valve " + v)
@@ -1751,7 +2147,9 @@ class eWeLink {
             .getService("Valve " + v)
             .updateCharacteristic(Characteristic.RemainingDuration, timer);
           accessory.getService("Valve " + v).timer = setTimeout(() => {
-            accessory.getService("Valve " + v).setCharacteristic(Characteristic.Active, 0);
+            accessory
+              .getService("Valve " + v)
+              .setCharacteristic(Characteristic.Active, 0);
           }, timer * 1000);
         } else {
           accessory
@@ -1761,7 +2159,11 @@ class eWeLink {
         }
       });
     } catch (err) {
-      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+      this.log.warn(
+        "[%s] could not be updated as %s.",
+        accessory.displayName,
+        err
+      );
     }
   }
   externalBlindUpdate(accessory, params) {
@@ -1770,7 +2172,10 @@ class eWeLink {
       if (!(blindConfig = this.cusG.get(accessory.context.hbDeviceId))) {
         throw "group config missing";
       }
-      if (blindConfig.type !== "blind" || ["oneSwitch", "twoSwitch"].includes(blindConfig.setup)) {
+      if (
+        blindConfig.type !== "blind" ||
+        ["oneSwitch", "twoSwitch"].includes(blindConfig.setup)
+      ) {
         throw "improper configuration";
       }
       switch (blindConfig.setup) {
@@ -1786,7 +2191,10 @@ class eWeLink {
               : 0;
           break;
         case "twoSwitch":
-          if (params.switches[0].switch === "off" && params.switches[1].switch === "off") {
+          if (
+            params.switches[0].switch === "off" &&
+            params.switches[1].switch === "off"
+          ) {
             return;
           }
           let switchUp = params.switches[0].switch === "on" ? -1 : 0, // matrix of numbers to get
@@ -1805,7 +2213,11 @@ class eWeLink {
           .updateCharacteristic(Characteristic.CurrentPosition, nSte * 100);
       }, parseInt(blindConfig.operationTime) * 100);
     } catch (err) {
-      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+      this.log.warn(
+        "[%s] could not be updated as %s.",
+        accessory.displayName,
+        err
+      );
     }
   }
   externalGarageUpdate(accessory, params) {
@@ -1859,7 +2271,11 @@ class eWeLink {
       }, parseInt(garageConfig.operationTime) * 100);
     } catch (err) {
       accessory.context.inUse = false;
-      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+      this.log.warn(
+        "[%s] could not be updated as %s.",
+        accessory.displayName,
+        err
+      );
     }
   }
   externalLockUpdate(accessory, params) {
@@ -1888,7 +2304,11 @@ class eWeLink {
       }, parseInt(lockConfig.operationTime) * 100);
     } catch (err) {
       accessory.context.inUse = false;
-      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+      this.log.warn(
+        "[%s] could not be updated as %s.",
+        accessory.displayName,
+        err
+      );
     }
   }
   externalSensorUpdate(accessory, params) {
@@ -1898,8 +2318,14 @@ class eWeLink {
             accessory.getService(Service.BatteryService) ||
             accessory.addService(Service.BatteryService),
           scaledBattery = Math.round(params.battery * 33.3);
-        batteryService.updateCharacteristic(Characteristic.BatteryLevel, scaledBattery);
-        batteryService.updateCharacteristic(Characteristic.StatusLowBattery, scaledBattery < 25);
+        batteryService.updateCharacteristic(
+          Characteristic.BatteryLevel,
+          scaledBattery
+        );
+        batteryService.updateCharacteristic(
+          Characteristic.StatusLowBattery,
+          scaledBattery < 25
+        );
       }
       let newState = params.switch === "on" ? 1 : 0,
         oAccessory = false;
@@ -1907,7 +2333,10 @@ class eWeLink {
         .getService(Service.ContactSensor)
         .updateCharacteristic(Characteristic.ContactSensorState, newState);
       this.cusG.forEach(group => {
-        if (group.sensorId === accessory.context.eweDeviceId && group.type === "garage") {
+        if (
+          group.sensorId === accessory.context.eweDeviceId &&
+          group.type === "garage"
+        ) {
           if ((oAccessory = this.devicesInHB.get(group.deviceId + "SWX"))) {
             switch (newState) {
               case 0:
@@ -1931,7 +2360,11 @@ class eWeLink {
         }
       });
     } catch (err) {
-      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+      this.log.warn(
+        "[%s] could not be updated as %s.",
+        accessory.displayName,
+        err
+      );
     }
   }
   externalFanUpdate(accessory, params) {
@@ -1939,7 +2372,11 @@ class eWeLink {
       let light, status, speed;
       if (Array.isArray(params.switches)) {
         light = params.switches[0].switch === "on";
-        switch (params.switches[1].switch + params.switches[2].switch + params.switches[3].switch) {
+        switch (
+          params.switches[1].switch +
+          params.switches[2].switch +
+          params.switches[3].switch
+        ) {
           default:
             status = 0;
             speed = 0;
@@ -1967,13 +2404,19 @@ class eWeLink {
       } else {
         throw "unknown parameters received";
       }
-      accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, light);
+      accessory
+        .getService(Service.Lightbulb)
+        .updateCharacteristic(Characteristic.On, light);
       accessory
         .getService(Service.Fanv2)
         .updateCharacteristic(Characteristic.Active, status)
         .updateCharacteristic(Characteristic.RotationSpeed, speed);
     } catch (err) {
-      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+      this.log.warn(
+        "[%s] could not be updated as %s.",
+        accessory.displayName,
+        err
+      );
     }
   }
   externalThermostatUpdate(accessory, params) {
@@ -1985,7 +2428,9 @@ class eWeLink {
         let newState = params.hasOwnProperty("switch")
           ? params.switch === "on"
           : params.mainSwitch === "on";
-        accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, newState);
+        accessory
+          .getService(Service.Switch)
+          .updateCharacteristic(Characteristic.On, newState);
       }
       let eveLog = {
         time: Date.now(),
@@ -1995,7 +2440,9 @@ class eWeLink {
         accessory.getService(Service.TemperatureSensor)
       ) {
         let currentTemp =
-          params.currentTemperature !== "unavailable" ? params.currentTemperature : 0;
+          params.currentTemperature !== "unavailable"
+            ? params.currentTemperature
+            : 0;
         accessory
           .getService(Service.TemperatureSensor)
           .updateCharacteristic(Characteristic.CurrentTemperature, currentTemp);
@@ -2005,17 +2452,25 @@ class eWeLink {
         params.hasOwnProperty("currentHumidity") &&
         accessory.getService(Service.HumiditySensor)
       ) {
-        let currentHumi = params.currentHumidity !== "unavailable" ? params.currentHumidity : 0;
+        let currentHumi =
+          params.currentHumidity !== "unavailable" ? params.currentHumidity : 0;
         accessory
           .getService(Service.HumiditySensor)
-          .updateCharacteristic(Characteristic.CurrentRelativeHumidity, currentHumi);
+          .updateCharacteristic(
+            Characteristic.CurrentRelativeHumidity,
+            currentHumi
+          );
         eveLog.humidity = parseFloat(currentHumi);
       }
       if (eveLog.hasOwnProperty("temp") || eveLog.hasOwnProperty("humidity")) {
         accessory.eveLogger.addEntry(eveLog);
       }
     } catch (err) {
-      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+      this.log.warn(
+        "[%s] could not be updated as %s.",
+        accessory.displayName,
+        err
+      );
     }
   }
   externalOutletUpdate(accessory, params) {
@@ -2034,8 +2489,13 @@ class eWeLink {
           );
         accessory
           .getService(Service.Outlet)
-          .updateCharacteristic(Characteristic.OutletInUse, parseFloat(params.power) > 0);
-        let isOn = accessory.getService(Service.Outlet).getCharacteristic(Characteristic.On).value;
+          .updateCharacteristic(
+            Characteristic.OutletInUse,
+            parseFloat(params.power) > 0
+          );
+        let isOn = accessory
+          .getService(Service.Outlet)
+          .getCharacteristic(Characteristic.On).value;
         accessory.eveLogger.addEntry({
           time: Date.now(),
           power: isOn ? parseFloat(params.power) : 0,
@@ -2044,7 +2504,10 @@ class eWeLink {
       if (params.hasOwnProperty("voltage")) {
         accessory
           .getService(Service.Outlet)
-          .updateCharacteristic(EveService.Characteristics.Voltage, parseFloat(params.voltage));
+          .updateCharacteristic(
+            EveService.Characteristics.Voltage,
+            parseFloat(params.voltage)
+          );
       }
       if (params.hasOwnProperty("current")) {
         accessory
@@ -2055,25 +2518,43 @@ class eWeLink {
           );
       }
     } catch (err) {
-      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+      this.log.warn(
+        "[%s] could not be updated as %s.",
+        accessory.displayName,
+        err
+      );
     }
   }
   externalUSBUpdate(accessory, params) {
     try {
       accessory
         .getService(Service.Outlet)
-        .updateCharacteristic(Characteristic.On, params.switches[0].switch === "on");
+        .updateCharacteristic(
+          Characteristic.On,
+          params.switches[0].switch === "on"
+        );
     } catch (err) {
-      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+      this.log.warn(
+        "[%s] could not be updated as %s.",
+        accessory.displayName,
+        err
+      );
     }
   }
   externalSCMUpdate(accessory, params) {
     try {
       accessory
         .getService(Service.Switch)
-        .updateCharacteristic(Characteristic.On, params.switches[0].switch === "on");
+        .updateCharacteristic(
+          Characteristic.On,
+          params.switches[0].switch === "on"
+        );
     } catch (err) {
-      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+      this.log.warn(
+        "[%s] could not be updated as %s.",
+        accessory.displayName,
+        err
+      );
     }
   }
   externalSingleLightUpdate(accessory, params) {
@@ -2083,13 +2564,20 @@ class eWeLink {
         isOn = false;
       if (accessory.context.eweUIID === 22 && params.hasOwnProperty("state")) {
         isOn = params.state === "on";
-      } else if (accessory.context.eweUIID !== 22 && params.hasOwnProperty("switch")) {
+      } else if (
+        accessory.context.eweUIID !== 22 &&
+        params.hasOwnProperty("switch")
+      ) {
         isOn = params.switch === "on";
       } else {
-        isOn = accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On).value;
+        isOn = accessory
+          .getService(Service.Lightbulb)
+          .getCharacteristic(Characteristic.On).value;
       }
       if (isOn) {
-        accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, true);
+        accessory
+          .getService(Service.Lightbulb)
+          .updateCharacteristic(Characteristic.On, true);
         switch (accessory.context.eweUIID) {
           case 36: // KING-M4
             if (params.hasOwnProperty("bright")) {
@@ -2103,7 +2591,10 @@ class eWeLink {
             if (params.hasOwnProperty("brightness")) {
               accessory
                 .getService(Service.Lightbulb)
-                .updateCharacteristic(Characteristic.Brightness, params.brightness);
+                .updateCharacteristic(
+                  Characteristic.Brightness,
+                  params.brightness
+                );
             }
             break;
           case 22: // B1
@@ -2118,7 +2609,9 @@ class eWeLink {
               mode = 2;
             }
             if (mode === 2) {
-              accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, true);
+              accessory
+                .getService(Service.Lightbulb)
+                .updateCharacteristic(Characteristic.On, true);
               newColour = convert.rgb.hsv(
                 parseInt(params.channel2),
                 parseInt(params.channel3),
@@ -2140,7 +2633,11 @@ class eWeLink {
                 .updateCharacteristic(Characteristic.Brightness, params.bright);
             }
             if (params.hasOwnProperty("colorR")) {
-              newColour = convert.rgb.hsv(params.colorR, params.colorG, params.colorB);
+              newColour = convert.rgb.hsv(
+                params.colorR,
+                params.colorG,
+                params.colorB
+              );
               accessory
                 .getService(Service.Lightbulb)
                 .updateCharacteristic(Characteristic.Hue, newColour[0])
@@ -2151,10 +2648,16 @@ class eWeLink {
             return;
         }
       } else {
-        accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, false);
+        accessory
+          .getService(Service.Lightbulb)
+          .updateCharacteristic(Characteristic.On, false);
       }
     } catch (err) {
-      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+      this.log.warn(
+        "[%s] could not be updated as %s.",
+        accessory.displayName,
+        err
+      );
     }
   }
   externalMultiLightUpdate(accessory, params) {
@@ -2166,15 +2669,24 @@ class eWeLink {
           let oAccessory = this.devicesInHB.get(idToCheck + i);
           oAccessory
             .getService(Service.Lightbulb)
-            .updateCharacteristic(Characteristic.On, params.switches[i - 1].switch === "on");
+            .updateCharacteristic(
+              Characteristic.On,
+              params.switches[i - 1].switch === "on"
+            );
           if (params.switches[i - 1].switch === "on") {
             primaryState = true;
           }
         }
       }
-      accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, primaryState);
+      accessory
+        .getService(Service.Lightbulb)
+        .updateCharacteristic(Characteristic.On, primaryState);
     } catch (err) {
-      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+      this.log.warn(
+        "[%s] could not be updated as %s.",
+        accessory.displayName,
+        err
+      );
     }
   }
   externalSingleSwitchUpdate(accessory, params) {
@@ -2183,7 +2695,11 @@ class eWeLink {
         .getService(Service.Switch)
         .updateCharacteristic(Characteristic.On, params.switch === "on");
     } catch (err) {
-      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+      this.log.warn(
+        "[%s] could not be updated as %s.",
+        accessory.displayName,
+        err
+      );
     }
   }
   externalMultiSwitchUpdate(accessory, params) {
@@ -2195,15 +2711,24 @@ class eWeLink {
           let oAccessory = this.devicesInHB.get(idToCheck + i);
           oAccessory
             .getService(Service.Switch)
-            .updateCharacteristic(Characteristic.On, params.switches[i - 1].switch === "on");
+            .updateCharacteristic(
+              Characteristic.On,
+              params.switches[i - 1].switch === "on"
+            );
           if (params.switches[i - 1].switch === "on") {
             primaryState = true;
           }
         }
       }
-      accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, primaryState);
+      accessory
+        .getService(Service.Switch)
+        .updateCharacteristic(Characteristic.On, primaryState);
     } catch (err) {
-      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+      this.log.warn(
+        "[%s] could not be updated as %s.",
+        accessory.displayName,
+        err
+      );
     }
   }
   externalRFDeviceUpdate(accessory, params) {
@@ -2219,7 +2744,9 @@ class eWeLink {
         // RF Button
         let bAccessory;
         if (
-          (bAccessory = this.devicesInHB.get(idToCheck + accessory.context.rfChlMap[params.rfChl]))
+          (bAccessory = this.devicesInHB.get(
+            idToCheck + accessory.context.rfChlMap[params.rfChl]
+          ))
         ) {
           bAccessory
             .getService(bAccessory.context.rfChls[params.rfChl])
@@ -2273,51 +2800,81 @@ class eWeLink {
                   case "co":
                     oAccessory
                       .getService(Service.CarbonMonoxideSensor)
-                      .updateCharacteristic(Characteristic.CarbonMonoxideDetected, 1);
+                      .updateCharacteristic(
+                        Characteristic.CarbonMonoxideDetected,
+                        1
+                      );
                     setTimeout(() => {
                       oAccessory
                         .getService(Service.CarbonMonoxideSensor)
-                        .updateCharacteristic(Characteristic.CarbonMonoxideDetected, 0);
+                        .updateCharacteristic(
+                          Characteristic.CarbonMonoxideDetected,
+                          0
+                        );
                     }, (this.config.sensorTimeLength || 2) * 1000);
                     break;
                   case "co2":
                     oAccessory
                       .getService(Service.CarbonDioxideSensor)
-                      .updateCharacteristic(Characteristic.CarbonDioxideDetected, 1);
+                      .updateCharacteristic(
+                        Characteristic.CarbonDioxideDetected,
+                        1
+                      );
                     setTimeout(() => {
                       oAccessory
                         .getService(Service.CarbonDioxideSensor)
-                        .updateCharacteristic(Characteristic.CarbonDioxideDetected, 0);
+                        .updateCharacteristic(
+                          Characteristic.CarbonDioxideDetected,
+                          0
+                        );
                     }, (this.config.sensorTimeLength || 2) * 1000);
                     break;
                   case "contact":
                     oAccessory
                       .getService(Service.ContactSensor)
-                      .updateCharacteristic(Characteristic.ContactSensorState, 1);
+                      .updateCharacteristic(
+                        Characteristic.ContactSensorState,
+                        1
+                      );
                     setTimeout(() => {
                       oAccessory
                         .getService(Service.ContactSensor)
-                        .updateCharacteristic(Characteristic.ContactSensorState, 0);
+                        .updateCharacteristic(
+                          Characteristic.ContactSensorState,
+                          0
+                        );
                     }, (this.config.sensorTimeLength || 2) * 1000);
                     break;
                   case "occupancy":
                     oAccessory
                       .getService(Service.OccupancySensor)
-                      .updateCharacteristic(Characteristic.OccupancyDetected, 1);
+                      .updateCharacteristic(
+                        Characteristic.OccupancyDetected,
+                        1
+                      );
                     setTimeout(() => {
                       oAccessory
                         .getService(Service.OccupancySensor)
-                        .updateCharacteristic(Characteristic.OccupancyDetected, 0);
+                        .updateCharacteristic(
+                          Characteristic.OccupancyDetected,
+                          0
+                        );
                     }, (this.config.sensorTimeLength || 2) * 1000);
                     break;
                   default:
                     oAccessory
                       .getService(Service.MotionSensor)
-                      .updateCharacteristic(Characteristic.MotionDetected, true);
+                      .updateCharacteristic(
+                        Characteristic.MotionDetected,
+                        true
+                      );
                     setTimeout(() => {
                       oAccessory
                         .getService(Service.MotionSensor)
-                        .updateCharacteristic(Characteristic.MotionDetected, false);
+                        .updateCharacteristic(
+                          Characteristic.MotionDetected,
+                          false
+                        );
                     }, (this.config.sensorTimeLength || 2) * 1000);
                     break;
                 }
@@ -2333,7 +2890,11 @@ class eWeLink {
           });
       }
     } catch (err) {
-      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+      this.log.warn(
+        "[%s] could not be updated as %s.",
+        accessory.displayName,
+        err
+      );
     }
   }
   externalZBDeviceUpdate(accessory, params) {
@@ -2343,15 +2904,24 @@ class eWeLink {
         let batteryService =
           accessory.getService(Service.BatteryService) ||
           accessory.addService(Service.BatteryService);
-        batteryService.updateCharacteristic(Characteristic.BatteryLevel, params.battery);
-        batteryService.updateCharacteristic(Characteristic.StatusLowBattery, params.battery < 25);
+        batteryService.updateCharacteristic(
+          Characteristic.BatteryLevel,
+          params.battery
+        );
+        batteryService.updateCharacteristic(
+          Characteristic.StatusLowBattery,
+          params.battery < 25
+        );
       }
       switch (accessory.context.eweUIID) {
         case 1000:
           if (params.hasOwnProperty("key") && [0, 1, 2].includes(params.key)) {
             accessory
               .getService(Service.StatelessProgrammableSwitch)
-              .updateCharacteristic(Characteristic.ProgrammableSwitchEvent, params.key);
+              .updateCharacteristic(
+                Characteristic.ProgrammableSwitchEvent,
+                params.key
+              );
           }
           break;
         case 1770:
@@ -2362,22 +2932,34 @@ class eWeLink {
             let currentTemp = parseInt(params.temperature) / 100;
             accessory
               .getService(Service.TemperatureSensor)
-              .updateCharacteristic(Characteristic.CurrentTemperature, currentTemp);
+              .updateCharacteristic(
+                Characteristic.CurrentTemperature,
+                currentTemp
+              );
             eveLog.temp = parseFloat(currentTemp);
           }
           if (params.hasOwnProperty("humidity")) {
             let currentHumi = parseInt(params.humidity) / 100;
             accessory
               .getService(Service.HumiditySensor)
-              .updateCharacteristic(Characteristic.CurrentRelativeHumidity, currentHumi);
+              .updateCharacteristic(
+                Characteristic.CurrentRelativeHumidity,
+                currentHumi
+              );
             eveLog.humidity = parseFloat(currentHumi);
           }
-          if (eveLog.hasOwnProperty("temp") || eveLog.hasOwnProperty("humidity")) {
+          if (
+            eveLog.hasOwnProperty("temp") ||
+            eveLog.hasOwnProperty("humidity")
+          ) {
             accessory.eveLogger.addEntry(eveLog);
           }
           break;
         case 2026:
-          if (params.hasOwnProperty("motion") && params.hasOwnProperty("trigTime")) {
+          if (
+            params.hasOwnProperty("motion") &&
+            params.hasOwnProperty("trigTime")
+          ) {
             let timeNow = new Date(),
               diff = (timeNow.getTime() - params.trigTime) / 1000;
             accessory
@@ -2395,12 +2977,19 @@ class eWeLink {
           if (params.hasOwnProperty("lock") && [0, 1].includes(params.lock)) {
             accessory
               .getService(Service.ContactSensor)
-              .updateCharacteristic(Characteristic.ContactSensorState, params.lock);
+              .updateCharacteristic(
+                Characteristic.ContactSensorState,
+                params.lock
+              );
           }
           break;
       }
     } catch (err) {
-      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+      this.log.warn(
+        "[%s] could not be updated as %s.",
+        accessory.displayName,
+        err
+      );
     }
   }
 }
diff --git a/lib/eWeLinkHTTP.js b/lib/eWeLinkHTTP.js
index 24b1a69d..1aafd1e4 100644
--- a/lib/eWeLinkHTTP.js
+++ b/lib/eWeLinkHTTP.js
@@ -5,92 +5,29 @@ const axios = require("axios"),
   crypto = require("crypto");
 module.exports = class eWeLinkHTTP {
   constructor(config, log) {
+    this.config = config;
     this.log = log;
-    this.debug = config.debug || false;
-    this.debugReqRes = config.debugReqRes || false;
-    this.username = config.username.toString();
-    this.password = config.password.toString();
-    this.cCode = "+" + config.countryCode.toString().replace("+", "").replace(" ", "");
-  }
-  getHost() {
-    let data = {
-        appid: constants.appId,
-        country_code: this.cCode,
-        nonce: Math.random().toString(36).substr(2, 8),
-        ts: Math.floor(new Date().getTime() / 1000),
-        version: 8,
-      },
-      dataToSign = [];
-    Object.keys(data).forEach(k => {
-      dataToSign.push({
-        key: k,
-        value: data.k,
-      });
-    });
-    dataToSign.sort((a, b) => (a.key < b.key ? -1 : 1));
-    dataToSign = dataToSign.map(k => k.key + "=" + k.value).join("&");
-    dataToSign = crypto
-      .createHmac("sha256", constants.appSecret)
-      .update(dataToSign)
-      .digest("base64");
-    if (this.debugReqRes) {
-      let msg = JSON.stringify(data, null, 2);
-      this.log.warn("Sending HTTP getHost request. This text is yellow for clarity.\n%s", msg);
-    } else if (this.debug) {
-      this.log("Sending HTTP getHost request.");
-    }
-    return new Promise((resolve, reject) => {
-      axios
-        .get("https://api.coolkit.cc:8080/api/user/region", {
-          headers: {
-            Authorization: "Sign " + dataToSign,
-            "Content-Type": "application/json",
-          },
-          params: data,
-        })
-        .then(res => {
-          let body = res.data;
-          if (!body.region) {
-            throw "Server did not respond with a region.\n" + JSON.stringify(body, null, 2);
-          }
-          switch (body.region) {
-            case "eu":
-            case "us":
-            case "as":
-              this.httpHost = body.region + "-apia.coolkit.cc";
-              break;
-            case "cn":
-              this.httpHost = "cn-apia.coolkit.cn";
-              break;
-            default:
-              throw "No valid region received - [" + body.region + "].";
-          }
-          if (this.debug) {
-            this.log("HTTP API host received [%s].", this.httpHost);
-          }
-          resolve(this.httpHost);
-        })
-        .catch(err => {
-          if (err.hasOwnProperty("code") && ["ENOTFOUND", "ETIMEDOUT"].includes(err.code)) {
-            this.log.warn("Unable to reach eWeLink. Retrying in 30 seconds.");
-            this.delay().then(() => resolve(this.getHost()));
-          } else {
-            reject(err.message || err);
-          }
-        });
-    });
+    this.debug = this.config.debug || false;
+    this.debugReqRes = this.config.debugReqRes || false;
   }
   login() {
     let data = {
-      countryCode: this.cCode,
-      password: this.password,
+      countryCode:
+        "+" +
+        this.config.countryCode.toString().replace("+", "").replace(" ", ""),
+      password: this.config.password,
     };
-    this.username.includes("@") ? (data.email = this.username) : (data.phoneNumber = this.username);
+    this.config.username.includes("@")
+      ? (data.email = this.config.username)
+      : (data.phoneNumber = this.config.username);
     if (this.debugReqRes) {
       let msg = JSON.stringify(data, null, 2)
-        .replace(this.password, "**hidden**")
-        .replace(this.username, "**hidden**");
-      this.log.warn("Sending HTTP login request. This text is yellow for clarity.\n%s", msg);
+        .replace(this.config.password, "**hidden**")
+        .replace(this.config.username, "**hidden**");
+      this.log.warn(
+        "Sending HTTP login request. This text is yellow for clarity.\n%s",
+        msg
+      );
     } else if (this.debug) {
       this.log("Sending HTTP login request.");
     }
@@ -119,18 +56,17 @@ module.exports = class eWeLinkHTTP {
             body.hasOwnProperty("data") &&
             body.data.hasOwnProperty("region")
           ) {
-            let givenRegion = body.data.region;
-            switch (givenRegion) {
+            switch (body.data.region) {
               case "eu":
               case "us":
               case "as":
-                this.httpHost = givenRegion + "-apia.coolkit.cc";
+                this.httpHost = body.data.region + "-apia.coolkit.cc";
                 break;
               case "cn":
                 this.httpHost = "cn-apia.coolkit.cn";
                 break;
               default:
-                throw "No valid region received - [" + givenRegion + "].";
+                throw "No valid region received - [" + body.data.region + "].";
             }
             if (this.debug) {
               this.log("New HTTP API host received [%s].", this.httpHost);
@@ -139,7 +75,10 @@ module.exports = class eWeLinkHTTP {
             return;
           }
           if (!body.data.at) {
-            throw "No auth token received.\n" + JSON.stringify(body, null, 2);
+            throw (
+              "Server did not respond with an authentication token. Please double check your eWeLink username and password in the Homebridge configuration.\n" +
+              JSON.stringify(body, null, 2)
+            );
           }
           this.aToken = body.data.at;
           this.apiKey = body.data.user.apikey;
@@ -149,95 +88,111 @@ module.exports = class eWeLinkHTTP {
             httpHost: this.httpHost,
           });
         })
-        .catch(err => reject(err.message || err));
+        .catch(err => {
+          reject(err);
+        });
     });
   }
-  getDevices() {
+  getHost() {
+    let data = {
+        appid: constants.appId,
+        country_code: this.config.countryCode
+          .toString()
+          .replace("+", "")
+          .replace(" ", ""),
+        nonce: Math.random().toString(36).substr(2, 8),
+        ts: Math.floor(new Date().getTime() / 1000),
+        version: 8,
+      },
+      dataToSign = [];
+    Object.keys(data).forEach(function (key) {
+      dataToSign.push({
+        key: key,
+        value: data[key],
+      });
+    });
+    dataToSign.sort(function (a, b) {
+      return a.key < b.key ? -1 : 1;
+    });
+    dataToSign = dataToSign
+      .map(function (kv) {
+        return kv.key + "=" + kv.value;
+      })
+      .join("&");
+    dataToSign = crypto
+      .createHmac("sha256", constants.appSecret)
+      .update(dataToSign)
+      .digest("base64");
     return new Promise((resolve, reject) => {
       axios
-        .get("https://" + this.httpHost + "/v2/device/thing", {
+        .get("https://api.coolkit.cc:8080/api/user/region", {
           headers: {
-            Authorization: "Bearer " + this.aToken,
+            Authorization: "Sign " + dataToSign,
             "Content-Type": "application/json",
-            Host: this.httpHost,
-            "X-CK-Appid": constants.appId,
-            "X-CK-Nonce": Math.random().toString(36).substr(2, 8),
           },
+          params: data,
         })
         .then(res => {
           let body = res.data;
-          if (
-            !body.hasOwnProperty("data") ||
-            !body.hasOwnProperty("error") ||
-            (body.hasOwnProperty("error") && body.error !== 0)
-          ) {
-            throw JSON.stringify(body, null, 2);
+          if (!body.region) {
+            throw (
+              "Server did not respond with a region.\n" +
+              JSON.stringify(body, null, 2)
+            );
           }
-          let deviceList = [];
-          if (body.data.thingList && body.data.thingList.length > 0) {
-            body.data.thingList.forEach(device => deviceList.push(device.itemData));
+          switch (body.region) {
+            case "eu":
+            case "us":
+            case "as":
+              this.httpHost = body.region + "-apia.coolkit.cc";
+              break;
+            case "cn":
+              this.httpHost = "cn-apia.coolkit.cn";
+              break;
+            default:
+              throw "No valid region received - [" + body.region + "].";
           }
-          resolve(deviceList);
+          if (this.debug) {
+            this.log("HTTP API host received [%s].", this.httpHost);
+          }
+          resolve(this.httpHost);
         })
         .catch(err => {
-          if (err.hasOwnProperty("code") && ["ENOTFOUND", "ETIMEDOUT"].includes(err.code)) {
-            this.log.warn("Unable to reach eWeLink. Retrying in 30 seconds.");
-            this.delay().then(() => resolve(this.getDevices()));
-          } else {
-            reject(err.message || err);
-          }
+          reject(err);
         });
     });
   }
-
-  getDevice(deviceId) {
+  getDevices() {
     return new Promise((resolve, reject) => {
-      axios({
-        url: "https://" + this.httpHost + "/v2/device/thing",
-        method: "post",
-        headers: {
-          Authorization: "Bearer " + this.aToken,
-          "Content-Type": "application/json",
-          Host: this.httpHost,
-          "X-CK-Appid": constants.appId,
-          "X-CK-Nonce": Math.random().toString(36).substr(2, 8),
-        },
-        data: {
-          thingList: [
-            {
-              itemType: 1,
-              id: deviceId,
-            },
-          ],
-        },
-      })
+      axios
+        .get("https://" + this.httpHost + "/v2/device/thing", {
+          headers: {
+            Authorization: "Bearer " + this.aToken,
+            "Content-Type": "application/json",
+            Host: this.httpHost,
+            "X-CK-Appid": constants.appId,
+            "X-CK-Nonce": Math.random().toString(36).substr(2, 8),
+          },
+        })
         .then(res => {
           let body = res.data;
           if (
-            !body.hasOwnProperty("data") ||
             !body.hasOwnProperty("error") ||
             (body.hasOwnProperty("error") && body.error !== 0)
           ) {
             throw JSON.stringify(body, null, 2);
           }
-          if (body.data.thingList && body.data.thingList.length === 1) {
-            resolve(body.data.thingList[0].itemData);
-          } else {
-            throw "device not found in eWeLink";
+          let deviceList = [];
+          if (body.data.thingList && body.data.thingList.length > 0) {
+            body.data.thingList.forEach(device =>
+              deviceList.push(device.itemData)
+            );
           }
+          resolve(deviceList);
         })
         .catch(err => {
-          if (err.hasOwnProperty("code") && ["ENOTFOUND", "ETIMEDOUT"].includes(err.code)) {
-            this.log.warn("Unable to reach eWeLink. Retrying in 30 seconds.");
-            this.delay().then(() => resolve(this.getDevice(deviceId)));
-          } else {
-            reject(err.message || err);
-          }
+          reject(err);
         });
     });
   }
-
-  delay() {
-    return new Promise(resolve => setTimeout(resolve, 30000));
-  }
 };
diff --git a/lib/eWeLinkLAN.js b/lib/eWeLinkLAN.js
index 567c372d..25baee53 100644
--- a/lib/eWeLinkLAN.js
+++ b/lib/eWeLinkLAN.js
@@ -1,18 +1,19 @@
 /* jshint esversion: 9, -W030, node: true */
 "use strict";
 const axios = require("axios"),
-  cns = require("./constants"),
+  constants = require("./constants"),
   crypto = require("crypto"),
   dns = require("node-dns-sd"),
   eventemitter = require("events");
 module.exports = class eWeLinkLAN {
   constructor(config, log, devices) {
+    this.config = config;
     this.log = log;
     this.devices = devices;
-    this.ipOverrides = config.ipOverride || {};
-    this.deviceMap = new Map();
+    this.ipOverrides = this.config.ipOverride || {};
+    let deviceMap = new Map();
     devices.forEach(device => {
-      this.deviceMap.set(device.deviceid, {
+      deviceMap.set(device.deviceid, {
         apiKey: device.devicekey,
         online: this.ipOverrides.hasOwnProperty(device.deviceid) ? true : false,
         ip: this.ipOverrides.hasOwnProperty(device.deviceid)
@@ -20,8 +21,9 @@ module.exports = class eWeLinkLAN {
           : null,
       });
     });
-    this.debug = config.debug || false;
-    this.debugReqRes = config.debugReqRes || false;
+    this.deviceMap = deviceMap;
+    this.debug = this.config.debug || false;
+    this.debugReqRes = this.config.debugReqRes || false;
     this.emitter = new eventemitter();
   }
   getHosts() {
@@ -34,7 +36,9 @@ module.exports = class eWeLinkLAN {
           let onlineCount = 0;
           res.forEach(device => {
             let d,
-              deviceId = device.fqdn.replace("._ewelink._tcp.local", "").replace("eWeLink_", "");
+              deviceId = device.fqdn
+                .replace("._ewelink._tcp.local", "")
+                .replace("eWeLink_", "");
             if ((d = this.deviceMap.get(deviceId))) {
               if (!this.ipOverrides.hasOwnProperty(deviceId)) {
                 this.deviceMap.set(deviceId, {
@@ -51,7 +55,9 @@ module.exports = class eWeLinkLAN {
             count: onlineCount,
           });
         })
-        .catch(err => reject(err));
+        .catch(err => {
+          reject(err);
+        });
     });
   }
   startMonitor() {
@@ -73,44 +79,64 @@ module.exports = class eWeLinkLAN {
                 .createHash("md5")
                 .update(Buffer.from(deviceInfo.apiKey, "utf8"))
                 .digest(),
-              dText = crypto.createDecipheriv("aes-128-cbc", key, Buffer.from(rdata.iv, "base64")),
+              dText = crypto.createDecipheriv(
+                "aes-128-cbc",
+                key,
+                Buffer.from(rdata.iv, "base64")
+              ),
               pText = Buffer.concat([
                 dText.update(Buffer.from(data, "base64")),
                 dText.final(),
               ]).toString("utf8"),
               params;
-            if (packet.address !== deviceInfo.ip && !this.ipOverrides.hasOwnProperty(rdata.id)) {
+            if (
+              packet.address !== deviceInfo.ip &&
+              !this.ipOverrides.hasOwnProperty(rdata.id)
+            ) {
               this.deviceMap.set(rdata.id, {
                 apiKey: deviceInfo.apiKey,
                 online: true,
                 ip: packet.address,
               });
               if (this.debug) {
-                this.log.warn("[%s] updating IP address to [%s].", rdata.id, packet.address);
+                this.log.warn(
+                  "[%s] updating IP address to [%s].",
+                  rdata.id,
+                  packet.address
+                );
               }
             }
             try {
               params = JSON.parse(pText);
             } catch (e) {
-              this.log.warn("[%s] An error occured reading the LAN message [%s]", rdata.id, e);
+              this.log.warn(
+                "[%s] An error occured reading the LAN message [%s]",
+                rdata.id,
+                e
+              );
               return;
             }
             for (let param in params) {
               if (params.hasOwnProperty(param)) {
-                if (!cns.paramsToKeep.includes(param.replace(/[0-9]/g, ""))) {
+                if (
+                  !constants.paramsToKeep.includes(param.replace(/[0-9]/g, ""))
+                ) {
                   delete params[param];
                 }
               }
             }
             if (Object.keys(params).length > 0) {
               params.updateSource = "LAN";
-              params.online = true;
               let returnTemplate = {
                 deviceid: rdata.id,
+                action: "update",
                 params,
               };
               if (this.debugReqRes) {
-                let msg = JSON.stringify(returnTemplate, null, 2).replace(rdata.id, "**hidden**");
+                let msg = JSON.stringify(returnTemplate, null, 2).replace(
+                  rdata.id,
+                  "**hidden**"
+                );
                 this.log("LAN message received.\n%s", msg);
               } else if (this.debug) {
                 this.log("LAN message received.");
@@ -123,8 +149,12 @@ module.exports = class eWeLinkLAN {
     return new Promise((resolve, reject) => {
       dns
         .startMonitoring()
-        .then(() => resolve())
-        .catch(err => reject(err));
+        .then(() => {
+          resolve();
+        })
+        .catch(err => {
+          reject(err);
+        });
     });
   }
   sendUpdate(json) {
@@ -145,13 +175,17 @@ module.exports = class eWeLinkLAN {
         throw "plugin does not support lan mode for this device yet - feel free to create a github issue";
       }
       if ((apiKey = this.deviceMap.get(json.deviceid).apiKey)) {
-        let key = crypto.createHash("md5").update(Buffer.from(apiKey, "utf8")).digest(),
+        let key = crypto
+            .createHash("md5")
+            .update(Buffer.from(apiKey, "utf8"))
+            .digest(),
           iv = crypto.randomBytes(16),
           enc = crypto.createCipheriv("aes-128-cbc", key, iv),
           data = {
-            data: Buffer.concat([enc.update(JSON.stringify(params)), enc.final()]).toString(
-              "base64"
-            ),
+            data: Buffer.concat([
+              enc.update(JSON.stringify(params)),
+              enc.final(),
+            ]).toString("base64"),
             deviceid: json.deviceid,
             encrypt: true,
             iv: iv.toString("base64"),
@@ -163,13 +197,20 @@ module.exports = class eWeLinkLAN {
             .replace(json.apikey, "**hidden**")
             .replace(json.apikey, "**hidden**")
             .replace(json.deviceid, "**hidden**");
-          this.log.warn("LAN message sent. This text is yellow for clarity.\n%s", msg);
+          this.log.warn(
+            "LAN message sent. This text is yellow for clarity.\n%s",
+            msg
+          );
         } else if (this.debug) {
           this.log("LAN message sent.");
         }
         axios({
           method: "post",
-          url: "http://" + this.deviceMap.get(json.deviceid).ip + ":8081/zeroconf/" + suffix,
+          url:
+            "http://" +
+            this.deviceMap.get(json.deviceid).ip +
+            ":8081/zeroconf/" +
+            suffix,
           headers: {
             Accept: "application/json",
             "Content-Type": "application/json",
@@ -182,7 +223,9 @@ module.exports = class eWeLinkLAN {
             }
             throw res.data;
           })
-          .catch(err => reject(err));
+          .catch(err => {
+            reject(err);
+          });
       }
     });
   }
diff --git a/lib/eWeLinkWS.js b/lib/eWeLinkWS.js
index 29d265cc..56fbeb64 100644
--- a/lib/eWeLinkWS.js
+++ b/lib/eWeLinkWS.js
@@ -1,7 +1,7 @@
 /* jshint esversion: 9, -W030, node: true */
 "use strict";
 const axios = require("axios"),
-  cns = require("./constants"),
+  constants = require("./constants"),
   eventemitter = require("events"),
   ws = require("ws");
 module.exports = class eWeLinkWS {
@@ -21,13 +21,14 @@ module.exports = class eWeLinkWS {
     return new Promise((resolve, reject) => {
       axios({
         method: "post",
-        url: "https://" + this.httpHost.replace("-api", "-disp") + "/dispatch/app",
+        url:
+          "https://" + this.httpHost.replace("-api", "-disp") + "/dispatch/app",
         headers: {
           Authorization: "Bearer " + this.aToken,
           "Content-Type": "application/json",
         },
         data: {
-          appid: cns.appId,
+          appid: constants.appId,
           nonce: Math.random().toString(36).substr(2, 8),
           ts: Math.floor(new Date().getTime() / 1000),
           version: 8,
@@ -45,12 +46,7 @@ module.exports = class eWeLinkWS {
           resolve(body.domain);
         })
         .catch(err => {
-          if (err.hasOwnProperty("code") && ["ENOTFOUND", "ETIMEDOUT"].includes(err.code)) {
-            this.log.warn("Unable to reach eWeLink. Retrying in 30 seconds.");
-            this.delay().then(() => resolve(this.getDevices()));
-          } else {
-            reject(err.message || err);
-          }
+          reject(err);
         });
     });
   }
@@ -61,7 +57,7 @@ module.exports = class eWeLinkWS {
       let payload = {
         action: "userOnline",
         apikey: this.apiKey,
-        appid: cns.appId,
+        appid: constants.appId,
         at: this.aToken,
         nonce: Math.random().toString(36).substr(2, 8),
         sequence: Math.floor(new Date()),
@@ -74,60 +70,91 @@ module.exports = class eWeLinkWS {
         let msg = JSON.stringify(payload, null, 2)
           .replace(this.aToken, "**hidden**")
           .replace(this.apiKey, "**hidden**");
-        this.log.warn("Sending WS login request. This text is yellow for clarity.\n%s", msg);
+        this.log.warn(
+          "Sending WS login request. This text is yellow for clarity.\n%s",
+          msg
+        );
       } else if (this.debug) {
         this.log("Sending WS login request.");
       }
     });
     this.ws.on("message", m => {
-      if (m === "pong") return;
-      let device,
-        onlineStatus = true;
+      if (m === "pong") {
+        return;
+      }
+      let device;
       try {
         device = JSON.parse(m);
-      } catch (err) {
-        this.log.warn("An error occured reading the WS message [%s]", err);
+      } catch (e) {
+        this.log.warn(
+          "An error occured reading the web socket message [%s]",
+          e
+        );
         return;
       }
-      //*** for heartbeat response ***\\
+      // for requestUpdate response
+      if (
+        device.hasOwnProperty("deviceid") &&
+        device.hasOwnProperty("params") &&
+        device.hasOwnProperty("error") &&
+        device.error === 0
+      ) {
+        device.action = "update";
+      } else if (
+        device.hasOwnProperty("deviceid") &&
+        device.hasOwnProperty("error") &&
+        device.error === 504
+      ) {
+        device.action = "sysmsg";
+        device.params = {
+          online: false,
+        };
+      }
+      // for external updates
       if (
         device.hasOwnProperty("config") &&
         device.config.hb &&
         device.config.hbInterval &&
         !this.hbInterval
       ) {
-        this.hbInterval = setInterval(
-          () => this.ws.send("ping"),
-          (device.config.hbInterval + 7) * 1000
-        );
-        return;
-      }
-      if (!device.hasOwnProperty("params")) device.params = {};
-      //*** for requestUpdate response ***\\
-      if (device.hasOwnProperty("deviceid") && device.hasOwnProperty("error")) {
-        device.action = "update";
-        onlineStatus = device.error === 0;
-      }
-      //*** for all updates including above ***\\
-      if (device.hasOwnProperty("action")) {
+        this.hbInterval = setInterval(() => {
+          this.ws.send("ping");
+        }, (device.config.hbInterval + 7) * 1000);
+      } else if (device.hasOwnProperty("action")) {
         switch (device.action) {
-          case "update":
           case "sysmsg":
-            if (device.action === "sysmsg" && device.params.hasOwnProperty("online")) {
-              onlineStatus = device.params.online;
+            device.params.updateSource = "WS";
+            let returnTemplate = {
+              deviceid: device.deviceid,
+              action: "sysmsg",
+              params: device.params,
+            };
+            if (this.debugReqRes) {
+              let msg = JSON.stringify(returnTemplate, null, 2).replace(
+                device.deviceid,
+                "**hidden**"
+              );
+              this.log("WS message received.\n%s", msg);
+            } else if (this.debug) {
+              this.log("WS message received.");
             }
+            this.emitter.emit("update", returnTemplate);
+            break;
+          case "update":
             for (let param in device.params) {
               if (device.params.hasOwnProperty(param)) {
-                if (!cns.paramsToKeep.includes(param.replace(/[0-9]/g, ""))) {
+                if (
+                  !constants.paramsToKeep.includes(param.replace(/[0-9]/g, ""))
+                ) {
                   delete device.params[param];
                 }
               }
             }
-            device.params.online = onlineStatus;
-            device.params.updateSource = "WS";
             if (Object.keys(device.params).length > 0) {
+              device.params.updateSource = "WS";
               let returnTemplate = {
                 deviceid: device.deviceid,
+                action: "update",
                 params: device.params,
               };
               if (this.debugReqRes) {
@@ -146,7 +173,8 @@ module.exports = class eWeLinkWS {
             return;
           default:
             this.log.warn(
-              "[%s] WS message has unknown action.\n" + JSON.stringify(device, null, 2),
+              "[%s] WS message has unknown action.\n" +
+                JSON.stringify(device, null, 2),
               device.deviceid
             );
             return;
@@ -155,7 +183,9 @@ module.exports = class eWeLinkWS {
         // *** Safe to ignore these messages *** \\
       } else {
         if (this.debug) {
-          this.log.warn("WS unknown command received.\n" + JSON.stringify(device, null, 2));
+          this.log.warn(
+            "WS unknown command received.\n" + JSON.stringify(device, null, 2)
+          );
         }
       }
     });
@@ -163,13 +193,16 @@ module.exports = class eWeLinkWS {
       if (m === "Stopping Homebridge") {
         this.log("Web socket gracefully closed.");
       } else {
-        this.log.warn("Web socket closed - [%s%s].", e, m ? " - " + m : "");
+        this.log.warn("Web socket closed - [%s - %s].", e, m);
         if (e !== 1000) {
           this.log("Web socket will try to reconnect in five seconds.");
-          this.ws.removeAllListeners();
-          setTimeout(() => this.login(), 5000);
+          setTimeout(() => {
+            this.login();
+          }, 5000);
         } else {
-          this.log("Please try restarting Homebridge so that this plugin can work again.");
+          this.log(
+            "Please try restarting Homebridge so that this plugin can work again."
+          );
         }
       }
       this.wsIsOpen = false;
@@ -186,9 +219,13 @@ module.exports = class eWeLinkWS {
           "Web socket will try to reconnect in five seconds then try the command again."
         );
         this.ws.removeAllListeners();
-        setTimeout(() => this.login(), 5000);
+        setTimeout(() => {
+          this.login();
+        }, 5000);
       } else {
-        this.log.warn("If this was unexpected then please try restarting Homebridge.");
+        this.log.warn(
+          "If this was unexpected then please try restarting Homebridge."
+        );
       }
     });
   }
@@ -203,7 +240,9 @@ module.exports = class eWeLinkWS {
     };
     let sendOperation = req => {
       if (!this.wsIsOpen) {
-        setTimeout(() => sendOperation(req), 280);
+        setTimeout(() => {
+          sendOperation(req);
+        }, 280);
         return;
       }
       if (this.ws) {
@@ -213,7 +252,10 @@ module.exports = class eWeLinkWS {
             .replace(json.apikey, "**hidden**")
             .replace(json.apiKey, "**hidden**")
             .replace(json.deviceid, "**hidden**");
-          this.log.warn("WS message sent. This text is yellow for clarity.\n%s", msg);
+          this.log.warn(
+            "WS message sent. This text is yellow for clarity.\n%s",
+            msg
+          );
         } else if (this.debug) {
           this.log("WS message sent.");
         }
@@ -226,7 +268,9 @@ module.exports = class eWeLinkWS {
       setTimeout(sendOperation, this.delaySend, string);
       this.delaySend += 280;
     } else {
-      this.log.warn("Web socket is currently reconnecting. Command will be resent.");
+      this.log.warn(
+        "Web socket is currently reconnecting. Command will be resent."
+      );
       let interval,
         waitToSend = req => {
           if (this.wsIsOpen) {
@@ -249,7 +293,9 @@ module.exports = class eWeLinkWS {
       },
       sendOperation = req => {
         if (!this.wsIsOpen) {
-          setTimeout(() => sendOperation(req), 280);
+          setTimeout(() => {
+            sendOperation(req);
+          }, 280);
           return;
         }
         if (this.ws) {
@@ -259,7 +305,10 @@ module.exports = class eWeLinkWS {
               .replace(json.apikey, "**hidden**")
               .replace(json.apiKey, "**hidden**")
               .replace(json.deviceid, "**hidden**");
-            this.log.warn("WS message sent. This text is yellow for clarity.\n%s", msg);
+            this.log.warn(
+              "WS message sent. This text is yellow for clarity.\n%s",
+              msg
+            );
           } else if (this.debug) {
             this.log("WS message sent.");
           }
@@ -272,7 +321,9 @@ module.exports = class eWeLinkWS {
       setTimeout(sendOperation, this.delaySend, string);
       this.delaySend += 280;
     } else {
-      this.log.warn("Web socket is currently reconnecting. Command will be resent.");
+      this.log.warn(
+        "Web socket is currently reconnecting. Command will be resent."
+      );
       let interval,
         waitToSend = req => {
           if (this.wsIsOpen) {
@@ -291,7 +342,4 @@ module.exports = class eWeLinkWS {
       this.ws.close(1000, "Stopping Homebridge");
     }
   }
-  delay() {
-    return new Promise(resolve => setTimeout(resolve, 30000));
-  }
 };

From d6bb05899b2bd2851730bbabb987d08a6f11653f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 16 Sep 2020 16:58:55 +0100
Subject: [PATCH 0165/3183] zb door sensor battery

---
 lib/eWeLink.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index 13c6d210..38a71cdf 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -2901,6 +2901,12 @@ class eWeLink {
     try {
       //*** credit @tasict ***\\
       if (params.hasOwnProperty("battery")) {
+        if (
+          accessory.context.eweUIID === 3026 &&
+          (this.config.ZBDWBatt || false)
+        ) {
+          params.battery *= 10;
+        }
         let batteryService =
           accessory.getService(Service.BatteryService) ||
           accessory.addService(Service.BatteryService);

From cf6c8ff3514ded399f341668ea6a7ea42203b849 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 16 Sep 2020 17:01:23 +0100
Subject: [PATCH 0166/3183] prettier line length

---
 .prettierrc.json   |    3 +-
 lib/constants.js   |    7 +-
 lib/eWeLink.js     | 1082 +++++++++++---------------------------------
 lib/eWeLinkHTTP.js |   28 +-
 lib/eWeLinkLAN.js  |   59 +--
 lib/eWeLinkWS.js   |   50 +-
 6 files changed, 298 insertions(+), 931 deletions(-)

diff --git a/.prettierrc.json b/.prettierrc.json
index d68aa739..87f5e5e8 100644
--- a/.prettierrc.json
+++ b/.prettierrc.json
@@ -1,3 +1,4 @@
 {
-  "arrowParens": "avoid"
+  "arrowParens": "avoid",
+  "printWidth": 100
 }
diff --git a/lib/constants.js b/lib/constants.js
index d8892025..fe7fcb40 100644
--- a/lib/constants.js
+++ b/lib/constants.js
@@ -40,12 +40,7 @@ module.exports = {
   devicesSensor: [102],
   devicesSensorParams: ["switch", "battery"],
   devicesThermostat: [15],
-  devicesThermostatParams: [
-    "currentTemperature",
-    "currentHumidity",
-    "switch",
-    "masterSwitch",
-  ],
+  devicesThermostatParams: ["currentTemperature", "currentHumidity", "switch", "masterSwitch"],
   devicesFan: [34],
   devicesFanParams: ["switches", "light", "fan", "speed"],
   devicesOutlet: [32],
diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index 38a71cdf..10049c96 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -13,15 +13,9 @@ class eWeLink {
   constructor(log, config, api) {
     if (!log || !api || !config) return;
     if (!config.username || !config.password || !config.countryCode) {
-      log.error(
-        "**************** Cannot load homebridge-ewelink ****************"
-      );
-      log.error(
-        "Your eWeLink credentials are missing from the Homebridge config."
-      );
-      log.error(
-        "****************************************************************"
-      );
+      log.error("**************** Cannot load homebridge-ewelink ****************");
+      log.error("Your eWeLink credentials are missing from the Homebridge config.");
+      log.error("****************************************************************");
       return;
     }
     this.log = log;
@@ -57,22 +51,11 @@ class eWeLink {
             //*** Get device IP addresses for LAN mode ***\\
             this.httpDevices = res
               .filter(
-                device =>
-                  device.hasOwnProperty("extra") &&
-                  device.extra.hasOwnProperty("uiid")
+                device => device.hasOwnProperty("extra") && device.extra.hasOwnProperty("uiid")
               )
-              .filter(
-                device =>
-                  !(this.config.hideDevFromHB || "").includes(device.deviceid)
-              );
-            this.lanClient = new eWeLinkLAN(
-              this.config,
-              this.log,
-              this.httpDevices
-            );
-            this.httpDevices.forEach(device =>
-              this.devicesInEwe.set(device.deviceid, device)
-            );
+              .filter(device => !(this.config.hideDevFromHB || "").includes(device.deviceid));
+            this.lanClient = new eWeLinkLAN(this.config, this.log, this.httpDevices);
+            this.httpDevices.forEach(device => this.devicesInEwe.set(device.deviceid, device));
             return this.lanClient.getHosts();
           })
           .then(res => {
@@ -89,9 +72,7 @@ class eWeLink {
                 Object.keys(this.httpDevices).length === 0 &&
                 Object.keys(this.lanDevices).length === 0
               ) {
-                Array.from(this.devicesInHB.values()).forEach(a =>
-                  this.removeAccessory(a)
-                );
+                Array.from(this.devicesInHB.values()).forEach(a => this.removeAccessory(a));
                 this.devicesInHB.clear();
                 this.log.warn("******* Not loading homebridge-ewelink *******");
                 this.log.warn("No devices were found in your eWeLink account.");
@@ -101,11 +82,7 @@ class eWeLink {
               //*** Make a map of custom groups from Homebridge config ***\\
               if (Object.keys(this.config.groups || []).length > 0) {
                 this.config.groups
-                  .filter(
-                    g =>
-                      g.hasOwnProperty("type") &&
-                      cns.allowedGroups.includes(g.type)
-                  )
+                  .filter(g => g.hasOwnProperty("type") && cns.allowedGroups.includes(g.type))
                   .filter(
                     g =>
                       g.hasOwnProperty("deviceId") &&
@@ -157,13 +134,9 @@ class eWeLink {
             })();
           })
           .catch(err => {
-            this.log.error(
-              "************** Cannot load homebridge-ewelink **************"
-            );
+            this.log.error("************** Cannot load homebridge-ewelink **************");
             this.log.error(err);
-            this.log.error(
-              "************************************************************"
-            );
+            this.log.error("************************************************************");
             if (this.lanClient) this.lanClient.closeConnection();
             if (this.wsClient) this.wsClient.closeConnection();
           });
@@ -233,9 +206,7 @@ class eWeLink {
         }
       } else if (cns.devicesRFBridge.includes(device.extra.uiid)) {
         this.addAccessory(device, device.deviceid + "SW0", "rf_pri");
-        if (
-          Object.keys((device.tags && device.tags.zyx_info) || []).length > 0
-        ) {
+        if (Object.keys((device.tags && device.tags.zyx_info) || []).length > 0) {
           for (let i = 1; i <= Object.keys(device.tags.zyx_info).length; i++) {
             this.addAccessory(device, device.deviceid + "SW" + i, "rf_sub");
           }
@@ -269,19 +240,12 @@ class eWeLink {
         rfBridgeChange = false;
       accessory
         .getService(Service.AccessoryInformation)
-        .setCharacteristic(
-          Characteristic.FirmwareRevision,
-          device.params.fwVersion
-        );
-      accessory.context.reachableWAN =
-        accessory.context.eweUIID !== 102 ? device.online : true;
-      accessory.context.reachableLAN =
-        this.lanDevices.get(device.deviceid).online || false;
+        .setCharacteristic(Characteristic.FirmwareRevision, device.params.fwVersion);
+      accessory.context.reachableWAN = accessory.context.eweUIID !== 102 ? device.online : true;
+      accessory.context.reachableLAN = this.lanDevices.get(device.deviceid).online || false;
       accessory.context.inUse = false;
       let str = accessory.context.reachableLAN
-        ? "and locally with IP [" +
-          this.lanDevices.get(device.deviceid).ip +
-          "]"
+        ? "and locally with IP [" + this.lanDevices.get(device.deviceid).ip + "]"
         : "but LAN mode unavailable as unsupported/shared device";
       this.log("[%s] found in eWeLink %s.", accessory.displayName, str);
       this.devicesInHB.set(accessory.context.hbDeviceId, accessory);
@@ -289,11 +253,7 @@ class eWeLink {
         for (let i = 1; i <= accessory.context.channelCount; i++) {
           if (!this.devicesInHB.has(device.deviceid + "SW" + i)) {
             if (cns.devicesHideable.includes(accessory.context.type)) {
-              if (
-                (this.config.hideFromHB || "").includes(
-                  device.deviceid + "SW" + i
-                )
-              ) {
+              if ((this.config.hideFromHB || "").includes(device.deviceid + "SW" + i)) {
                 continue;
               } else {
                 this.addAccessory(device, device.deviceid + "SW" + i, "switch");
@@ -302,9 +262,7 @@ class eWeLink {
           }
           let oAccessory = this.devicesInHB.get(device.deviceid + "SW" + i);
           if (
-            (this.config.hideFromHB || "").includes(
-              device.deviceid + "SW" + i
-            ) &&
+            (this.config.hideFromHB || "").includes(device.deviceid + "SW" + i) &&
             cns.devicesHideable.includes(accessory.context.type)
           ) {
             this.removeAccessory(oAccessory);
@@ -318,13 +276,9 @@ class eWeLink {
           }
           oAccessory
             .getService(Service.AccessoryInformation)
-            .setCharacteristic(
-              Characteristic.FirmwareRevision,
-              device.params.fwVersion
-            );
+            .setCharacteristic(Characteristic.FirmwareRevision, device.params.fwVersion);
           oAccessory.context.reachableWAN = device.online;
-          oAccessory.context.reachableLAN =
-            this.lanDevices.get(device.deviceid).online || false;
+          oAccessory.context.reachableLAN = this.lanDevices.get(device.deviceid).online || false;
           this.devicesInHB.set(oAccessory.context.hbDeviceId, oAccessory);
         }
       }
@@ -349,18 +303,12 @@ class eWeLink {
         );
       }
     } else {
-      this.log.warn(
-        "[%s] cannot be initialised as it wasn't found in Homebridge.",
-        device.name
-      );
+      this.log.warn("[%s] cannot be initialised as it wasn't found in Homebridge.", device.name);
     }
   }
   addAccessory(device, hbDeviceId, type) {
     let switchNumber = hbDeviceId.substr(-1).toString(),
-      newDeviceName =
-        type === "rf_sub"
-          ? device.tags.zyx_info[switchNumber - 1].name
-          : device.name,
+      newDeviceName = type === "rf_sub" ? device.tags.zyx_info[switchNumber - 1].name : device.name,
       channelCount =
         type === "rf_pri"
           ? Object.keys((device.tags && device.tags.zyx_info) || []).length
@@ -378,10 +326,7 @@ class eWeLink {
     if ((this.config.nameOverride || {}).hasOwnProperty(hbDeviceId)) {
       newDeviceName = this.config.nameOverride[hbDeviceId];
     }
-    const accessory = new Accessory(
-      newDeviceName,
-      UUIDGen.generate(hbDeviceId).toString()
-    );
+    const accessory = new Accessory(newDeviceName, UUIDGen.generate(hbDeviceId).toString());
     try {
       accessory
         .getService(Service.AccessoryInformation)
@@ -391,10 +336,7 @@ class eWeLink {
           Characteristic.Model,
           device.productModel + " (" + device.extra.model + ")"
         )
-        .setCharacteristic(
-          Characteristic.FirmwareRevision,
-          device.params.fwVersion
-        )
+        .setCharacteristic(Characteristic.FirmwareRevision, device.params.fwVersion)
         .setCharacteristic(Characteristic.Identify, false);
       accessory.context = {
         hbDeviceId,
@@ -410,18 +352,11 @@ class eWeLink {
         case "valve":
           ["A", "B"].forEach(v => {
             accessory
-              .addService(
-                Service.Valve,
-                "Valve " + v,
-                "valve" + v.toLowerCase()
-              )
+              .addService(Service.Valve, "Valve " + v, "valve" + v.toLowerCase())
               .setCharacteristic(Characteristic.Active, 0)
               .setCharacteristic(Characteristic.InUse, 0)
               .setCharacteristic(Characteristic.ValveType, 1)
-              .setCharacteristic(
-                Characteristic.SetDuration,
-                this.config.valveTimeLength || 120
-              )
+              .setCharacteristic(Characteristic.SetDuration, this.config.valveTimeLength || 120)
               .addCharacteristic(Characteristic.RemainingDuration);
           });
           break;
@@ -456,8 +391,7 @@ class eWeLink {
         case "thermostat":
           if (!this.config.hideTHSwitch) accessory.addService(Service.Switch);
           accessory.addService(Service.TemperatureSensor);
-          if (device.params.sensorType !== "DS18B20")
-            accessory.addService(Service.HumiditySensor);
+          if (device.params.sensorType !== "DS18B20") accessory.addService(Service.HumiditySensor);
           break;
         case "outlet":
           accessory.addService(Service.Outlet);
@@ -503,9 +437,7 @@ class eWeLink {
           break;
         case "rf_sub":
           accessory.context.rfChls = {};
-          switch (
-            device.tags.zyx_info[parseInt(switchNumber) - 1].remote_type
-          ) {
+          switch (device.tags.zyx_info[parseInt(switchNumber) - 1].remote_type) {
             case "1":
             case "2":
             case "3":
@@ -525,52 +457,46 @@ class eWeLink {
               );
           }
           let mAccessory = this.devicesInHB.get(device.deviceid + "SW0");
-          device.tags.zyx_info[parseInt(switchNumber) - 1].buttonName.forEach(
-            button => {
-              let rfData;
-              Object.entries(button).forEach(
-                ([k, v]) =>
-                  (rfData = {
-                    rfChan: k,
-                    name: v,
-                  })
-              );
-              accessory.context.rfChls[rfData.rfChan] = rfData.name;
-              mAccessory.context.rfChlMap[rfData.rfChan] = switchNumber;
-              switch (accessory.context.sensorType) {
-                case "button":
-                  accessory.addService(
-                    Service.Switch,
-                    rfData.name,
-                    "switch" + rfData.rfChan
-                  );
-                  break;
-                case "water":
-                  accessory.addService(Service.LeakSensor);
-                  break;
-                case "fire":
-                case "smoke":
-                  accessory.addService(Service.SmokeSensor);
-                  break;
-                case "co":
-                  accessory.addService(Service.CarbonMonoxideSensor);
-                  break;
-                case "co2":
-                  accessory.addService(Service.CarbonDioxideSensor);
-                  break;
-                case "contact":
-                  accessory.addService(Service.ContactSensor);
-                  break;
-                case "occupancy":
-                  accessory.addService(Service.OccupancySensor);
-                  break;
-                default:
-                  accessory.addService(Service.MotionSensor);
-                  break;
-              }
-              this.devicesInHB.set(mAccessory.context.hbDeviceId, mAccessory);
+          device.tags.zyx_info[parseInt(switchNumber) - 1].buttonName.forEach(button => {
+            let rfData;
+            Object.entries(button).forEach(
+              ([k, v]) =>
+                (rfData = {
+                  rfChan: k,
+                  name: v,
+                })
+            );
+            accessory.context.rfChls[rfData.rfChan] = rfData.name;
+            mAccessory.context.rfChlMap[rfData.rfChan] = switchNumber;
+            switch (accessory.context.sensorType) {
+              case "button":
+                accessory.addService(Service.Switch, rfData.name, "switch" + rfData.rfChan);
+                break;
+              case "water":
+                accessory.addService(Service.LeakSensor);
+                break;
+              case "fire":
+              case "smoke":
+                accessory.addService(Service.SmokeSensor);
+                break;
+              case "co":
+                accessory.addService(Service.CarbonMonoxideSensor);
+                break;
+              case "co2":
+                accessory.addService(Service.CarbonDioxideSensor);
+                break;
+              case "contact":
+                accessory.addService(Service.ContactSensor);
+                break;
+              case "occupancy":
+                accessory.addService(Service.OccupancySensor);
+                break;
+              default:
+                accessory.addService(Service.MotionSensor);
+                break;
             }
-          );
+            this.devicesInHB.set(mAccessory.context.hbDeviceId, mAccessory);
+          });
           break;
         case "zb_sub": //*** credit @tasict ***\\
           accessory.addService(Service.BatteryService);
@@ -608,9 +534,7 @@ class eWeLink {
           throw "device is not supported by this plugin. Please create an issue on GitHub";
       }
       this.devicesInHB.set(hbDeviceId, accessory);
-      this.api.registerPlatformAccessories("homebridge-ewelink", "eWeLink", [
-        accessory,
-      ]);
+      this.api.registerPlatformAccessories("homebridge-ewelink", "eWeLink", [accessory]);
       this.configureAccessory(accessory);
       this.log("[%s] has been added to Homebridge.", newDeviceName);
     } catch (err) {
@@ -629,33 +553,21 @@ class eWeLink {
               .getService("Valve " + v)
               .getCharacteristic(Characteristic.Active)
               .on("set", (value, callback) =>
-                this.internalValveUpdate(
-                  accessory,
-                  "Valve " + v,
-                  value,
-                  callback
-                )
+                this.internalValveUpdate(accessory, "Valve " + v, value, callback)
               );
             accessory
               .getService("Valve " + v)
               .getCharacteristic(Characteristic.SetDuration)
               .on("set", (value, callback) => {
                 if (
-                  accessory
-                    .getService("Valve " + v)
-                    .getCharacteristic(Characteristic.InUse).value
+                  accessory.getService("Valve " + v).getCharacteristic(Characteristic.InUse).value
                 ) {
                   accessory
                     .getService("Valve " + v)
-                    .updateCharacteristic(
-                      Characteristic.RemainingDuration,
-                      value
-                    );
+                    .updateCharacteristic(Characteristic.RemainingDuration, value);
                   clearTimeout(accessory.getService("Valve " + v).timer);
                   accessory.getService("Valve " + v).timer = setTimeout(() => {
-                    accessory
-                      .getService("Valve " + v)
-                      .setCharacteristic(Characteristic.Active, 0);
+                    accessory.getService("Valve " + v).setCharacteristic(Characteristic.Active, 0);
                   }, value * 1000);
                 }
                 callback();
@@ -666,9 +578,7 @@ class eWeLink {
           accessory
             .getService(Service.WindowCovering)
             .getCharacteristic(Characteristic.TargetPosition)
-            .on("set", (value, callback) =>
-              this.internalBlindUpdate(accessory, value, callback)
-            )
+            .on("set", (value, callback) => this.internalBlindUpdate(accessory, value, callback))
             .setProps({
               minStep: 100,
             });
@@ -677,17 +587,13 @@ class eWeLink {
           accessory
             .getService(Service.GarageDoorOpener)
             .getCharacteristic(Characteristic.TargetDoorState)
-            .on("set", (value, callback) =>
-              this.internalGarageUpdate(accessory, value, callback)
-            );
+            .on("set", (value, callback) => this.internalGarageUpdate(accessory, value, callback));
           break;
         case "lock":
           accessory
             .getService(Service.LockMechanism)
             .getCharacteristic(Characteristic.LockTargetState)
-            .on("set", (value, callback) =>
-              this.internalLockUpdate(accessory, value, callback)
-            );
+            .on("set", (value, callback) => this.internalLockUpdate(accessory, value, callback));
           break;
         case "fan":
           accessory
@@ -737,9 +643,7 @@ class eWeLink {
             if (accessory.getService(Service.HumiditySensor)) {
               dataToAdd.humidity = accessory
                 .getService(Service.HumiditySensor)
-                .getCharacteristic(
-                  Characteristic.CurrentRelativeHumidity
-                ).value;
+                .getCharacteristic(Characteristic.CurrentRelativeHumidity).value;
             }
             accessory.eveLogger.addEntry(dataToAdd);
           }, 300000);
@@ -748,9 +652,7 @@ class eWeLink {
           accessory
             .getService(Service.Outlet)
             .getCharacteristic(Characteristic.On)
-            .on("set", (value, callback) =>
-              this.internalOutletUpdate(accessory, value, callback)
-            );
+            .on("set", (value, callback) => this.internalOutletUpdate(accessory, value, callback));
           accessory.log = this.log;
           accessory.eveLogger = new EveHistoryService("energy", accessory, {
             storage: "fs",
@@ -769,15 +671,12 @@ class eWeLink {
             };
           }
           corrInterval.setCorrectingInterval(() => {
-            let isOn = accessory
-                .getService(Service.Outlet)
-                .getCharacteristic(Characteristic.On).value,
+            let isOn = accessory.getService(Service.Outlet).getCharacteristic(Characteristic.On)
+                .value,
               currentWatt = isOn
                 ? accessory
                     .getService(Service.Outlet)
-                    .getCharacteristic(
-                      EveService.Characteristics.CurrentConsumption
-                    ).value
+                    .getCharacteristic(EveService.Characteristics.CurrentConsumption).value
                 : 0;
             if (accessory.eveLogger.isHistoryLoaded()) {
               accessory.context.extraPersistedData = accessory.eveLogger.getExtraPersistedData();
@@ -792,8 +691,7 @@ class eWeLink {
                 });
               } else {
                 accessory.context.totalEnergy =
-                  accessory.context.totalEnergyTemp +
-                  (currentWatt * 10) / 3600 / 1000;
+                  accessory.context.totalEnergyTemp + (currentWatt * 10) / 3600 / 1000;
                 accessory.eveLogger.setExtraPersistedData({
                   totalenergy: accessory.context.totalEnergy,
                   lastReset: 0,
@@ -801,8 +699,7 @@ class eWeLink {
               }
               accessory.context.totalEnergytemp = 0;
             } else {
-              accessory.context.totalEnergyTemp +=
-                (currentWatt * 10) / 3600 / 1000;
+              accessory.context.totalEnergyTemp += (currentWatt * 10) / 3600 / 1000;
               accessory.context.totalEnergy = accessory.context.totalEnergyTemp;
             }
             accessory.eveLogger.addEntry({
@@ -816,8 +713,7 @@ class eWeLink {
             .on("get", callback => {
               accessory.context.extraPersistedData = accessory.eveLogger.getExtraPersistedData();
               if (accessory.context.extraPersistedData !== undefined) {
-                accessory.context.totalEnergy =
-                  accessory.context.extraPersistedData.totalPower;
+                accessory.context.totalEnergy = accessory.context.extraPersistedData.totalPower;
               }
               callback(null, accessory.context.totalEnergy);
             });
@@ -836,8 +732,7 @@ class eWeLink {
             .on("get", callback => {
               accessory.context.extraPersistedData = accessory.eveLogger.getExtraPersistedData();
               if (accessory.context.extraPersistedData !== undefined) {
-                accessory.context.lastReset =
-                  accessory.context.extraPersistedData.lastReset;
+                accessory.context.lastReset = accessory.context.extraPersistedData.lastReset;
               }
               callback(null, accessory.context.lastReset);
             });
@@ -846,17 +741,13 @@ class eWeLink {
           accessory
             .getService(Service.Outlet)
             .getCharacteristic(Characteristic.On)
-            .on("set", (value, callback) =>
-              this.internalUSBUpdate(accessory, value, callback)
-            );
+            .on("set", (value, callback) => this.internalUSBUpdate(accessory, value, callback));
           break;
         case "scm":
           accessory
             .getService(Service.Switch)
             .getCharacteristic(Characteristic.On)
-            .on("set", (value, callback) =>
-              this.internalSCMUpdate(accessory, value, callback)
-            );
+            .on("set", (value, callback) => this.internalSCMUpdate(accessory, value, callback));
           break;
         case "light":
           accessory
@@ -872,9 +763,8 @@ class eWeLink {
               .on("set", (value, callback) => {
                 if (value > 0) {
                   if (
-                    !accessory
-                      .getService(Service.Lightbulb)
-                      .getCharacteristic(Characteristic.On).value
+                    !accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On)
+                      .value
                   ) {
                     this.internalLightbulbUpdate(accessory, true, function () {
                       return;
@@ -885,18 +775,15 @@ class eWeLink {
                   this.internalLightbulbUpdate(accessory, false, callback);
                 }
               });
-          } else if (
-            cns.devicesColourable.includes(accessory.context.eweUIID)
-          ) {
+          } else if (cns.devicesColourable.includes(accessory.context.eweUIID)) {
             accessory
               .getService(Service.Lightbulb)
               .getCharacteristic(Characteristic.Brightness)
               .on("set", (value, callback) => {
                 if (value > 0) {
                   if (
-                    !accessory
-                      .getService(Service.Lightbulb)
-                      .getCharacteristic(Characteristic.On).value
+                    !accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On)
+                      .value
                   ) {
                     this.internalLightbulbUpdate(accessory, true, function () {
                       return;
@@ -923,24 +810,18 @@ class eWeLink {
           accessory
             .getService(Service.Switch)
             .getCharacteristic(Characteristic.On)
-            .on("set", (value, callback) =>
-              this.internalSwitchUpdate(accessory, value, callback)
-            );
+            .on("set", (value, callback) => this.internalSwitchUpdate(accessory, value, callback));
           break;
         case "rf_sub":
           accessory.context.rfChls = accessory.context.rfChls || {};
           if (accessory.context.sensorType === "button") {
             Object.entries(accessory.context.rfChls).forEach(([k, v]) => {
-              accessory
-                .getService(v)
-                .updateCharacteristic(Characteristic.On, false);
+              accessory.getService(v).updateCharacteristic(Characteristic.On, false);
               accessory
                 .getService(v)
                 .getCharacteristic(Characteristic.On)
                 .on("set", (value, callback) => {
-                  value
-                    ? this.internalRFDeviceUpdate(accessory, k, callback)
-                    : callback();
+                  value ? this.internalRFDeviceUpdate(accessory, k, callback) : callback();
                 });
             });
           }
@@ -961,8 +842,7 @@ class eWeLink {
                   .getCharacteristic(Characteristic.CurrentTemperature).value,
                 humidity: accessory
                   .getService(Service.HumiditySensor)
-                  .getCharacteristic(Characteristic.CurrentRelativeHumidity)
-                  .value,
+                  .getCharacteristic(Characteristic.CurrentRelativeHumidity).value,
               };
               accessory.eveLogger.addEntry(dataToAdd);
             }, 300000);
@@ -971,20 +851,14 @@ class eWeLink {
       }
       this.devicesInHB.set(accessory.context.hbDeviceId, accessory);
     } catch (err) {
-      this.log.warn(
-        "[%s] could not be refreshed as %s.",
-        accessory.displayName,
-        err
-      );
+      this.log.warn("[%s] could not be refreshed as %s.", accessory.displayName, err);
     }
   }
   refreshAccessory(accessory, newParams) {
     switch (accessory.context.type) {
       case "valve":
         if (
-          Object.keys(newParams).some(v =>
-            cns.devicesValveParams.includes(v)
-          ) &&
+          Object.keys(newParams).some(v => cns.devicesValveParams.includes(v)) &&
           Array.isArray(newParams.switches)
         ) {
           this.externalValveUpdate(accessory, newParams);
@@ -992,9 +866,7 @@ class eWeLink {
         return true;
       case "blind":
         if (
-          Object.keys(newParams).some(v =>
-            cns.devicesBlindParams.includes(v)
-          ) &&
+          Object.keys(newParams).some(v => cns.devicesBlindParams.includes(v)) &&
           Array.isArray(newParams.switches)
         ) {
           this.externalBlindUpdate(accessory, newParams);
@@ -1002,48 +874,34 @@ class eWeLink {
         return true;
       case "garage":
         if (
-          Object.keys(newParams).some(v =>
-            cns.devicesGarageParams.includes(v)
-          ) &&
+          Object.keys(newParams).some(v => cns.devicesGarageParams.includes(v)) &&
           Array.isArray(newParams.switches)
         ) {
           this.externalGarageUpdate(accessory, newParams);
         }
         return true;
       case "lock":
-        if (
-          Object.keys(newParams).some(v => cns.devicesLockParams.includes(v))
-        ) {
+        if (Object.keys(newParams).some(v => cns.devicesLockParams.includes(v))) {
           this.externalLockUpdate(accessory, newParams);
         }
         return true;
       case "sensor":
-        if (
-          Object.keys(newParams).some(v => cns.devicesSensorParams.includes(v))
-        ) {
+        if (Object.keys(newParams).some(v => cns.devicesSensorParams.includes(v))) {
           this.externalSensorUpdate(accessory, newParams);
         }
         return true;
       case "fan":
-        if (
-          Object.keys(newParams).some(v => cns.devicesFanParams.includes(v))
-        ) {
+        if (Object.keys(newParams).some(v => cns.devicesFanParams.includes(v))) {
           this.externalFanUpdate(accessory, newParams);
         }
         return true;
       case "thermostat":
-        if (
-          Object.keys(newParams).some(v =>
-            cns.devicesThermostatParams.includes(v)
-          )
-        ) {
+        if (Object.keys(newParams).some(v => cns.devicesThermostatParams.includes(v))) {
           this.externalThermostatUpdate(accessory, newParams);
         }
         return true;
       case "outlet":
-        if (
-          Object.keys(newParams).some(v => cns.devicesOutletParams.includes(v))
-        ) {
+        if (Object.keys(newParams).some(v => cns.devicesOutletParams.includes(v))) {
           this.externalOutletUpdate(accessory, newParams);
         }
         return true;
@@ -1068,11 +926,7 @@ class eWeLink {
           cns.devicesSingleSwitch.includes(accessory.context.eweUIID) &&
           cns.devicesSingleSwitchLight.includes(accessory.context.eweModel)
         ) {
-          if (
-            Object.keys(newParams).some(v =>
-              cns.devicesSingleSwitchLightParams.includes(v)
-            )
-          ) {
+          if (Object.keys(newParams).some(v => cns.devicesSingleSwitchLightParams.includes(v))) {
             this.externalSingleLightUpdate(accessory, newParams);
           }
         } else if (
@@ -1080,9 +934,7 @@ class eWeLink {
           cns.devicesMultiSwitchLight.includes(accessory.context.eweModel)
         ) {
           if (
-            Object.keys(newParams).some(v =>
-              cns.devicesMultiSwitchLightParams.includes(v)
-            ) &&
+            Object.keys(newParams).some(v => cns.devicesMultiSwitchLightParams.includes(v)) &&
             Array.isArray(newParams.switches)
           ) {
             this.externalMultiLightUpdate(accessory, newParams);
@@ -1091,18 +943,12 @@ class eWeLink {
         return true;
       case "switch":
         if (cns.devicesSingleSwitch.includes(accessory.context.eweUIID)) {
-          if (
-            Object.keys(newParams).some(v =>
-              cns.devicesSingleSwitchParams.includes(v)
-            )
-          ) {
+          if (Object.keys(newParams).some(v => cns.devicesSingleSwitchParams.includes(v))) {
             this.externalSingleSwitchUpdate(accessory, newParams);
           }
         } else if (cns.devicesMultiSwitch.includes(accessory.context.eweUIID)) {
           if (
-            Object.keys(newParams).some(v =>
-              cns.devicesMultiSwitchParams.includes(v)
-            ) &&
+            Object.keys(newParams).some(v => cns.devicesMultiSwitchParams.includes(v)) &&
             Array.isArray(newParams.switches)
           ) {
             this.externalMultiSwitchUpdate(accessory, newParams);
@@ -1110,11 +956,7 @@ class eWeLink {
         }
         return true;
       case "rf_pri":
-        if (
-          Object.keys(newParams).some(v =>
-            cns.devicesRFBridgeParams.includes(v)
-          )
-        ) {
+        if (Object.keys(newParams).some(v => cns.devicesRFBridgeParams.includes(v))) {
           this.externalRFDeviceUpdate(accessory, newParams);
         }
         return true;
@@ -1122,11 +964,7 @@ class eWeLink {
       case "zb_pri":
         return true;
       case "zb_sub":
-        if (
-          Object.keys(newParams).some(v =>
-            cns.devicesZBBridgeParams.includes(v)
-          )
-        ) {
+        if (Object.keys(newParams).some(v => cns.devicesZBBridgeParams.includes(v))) {
           this.externalZBDeviceUpdate(accessory, newParams);
         }
         return true;
@@ -1137,16 +975,10 @@ class eWeLink {
   removeAccessory(accessory) {
     try {
       this.devicesInHB.delete(accessory.context.hbDeviceId);
-      this.api.unregisterPlatformAccessories("homebridge-ewelink", "eWeLink", [
-        accessory,
-      ]);
+      this.api.unregisterPlatformAccessories("homebridge-ewelink", "eWeLink", [accessory]);
       this.log("[%s] has been removed from Homebridge.", accessory.displayName);
     } catch (err) {
-      this.log.warn(
-        "[%s] needed to be removed but couldn't as %s.",
-        accessory.displayName,
-        err
-      );
+      this.log.warn("[%s] needed to be removed but couldn't as %s.", accessory.displayName, err);
     }
   }
   sendDeviceUpdate(accessory, params, callback) {
@@ -1167,10 +999,7 @@ class eWeLink {
         callback("Device has failed to update");
       }
     };
-    if (
-      cns.devicesNonLAN.includes(accessory.context.eweUIID) ||
-      !accessory.context.reachableLAN
-    ) {
+    if (cns.devicesNonLAN.includes(accessory.context.eweUIID) || !accessory.context.reachableLAN) {
       sendViaWS();
     } else {
       this.lanClient
@@ -1178,11 +1007,7 @@ class eWeLink {
         .then(() => callback())
         .catch(err => {
           if (this.debug) {
-            this.log.warn(
-              "[%s] Reverting to web socket as %s.",
-              accessory.displayName,
-              err
-            );
+            this.log.warn("[%s] Reverting to web socket as %s.", accessory.displayName, err);
           }
           sendViaWS();
         });
@@ -1207,23 +1032,17 @@ class eWeLink {
                 accessory.context.reachableWAN ? "online" : "offline"
               );
               this.devicesInHB.set(accessory.context.hbDeviceId, accessory);
-              if (accessory.context.reachableWAN)
-                this.wsClient.requestUpdate(accessory);
+              if (accessory.context.reachableWAN) this.wsClient.requestUpdate(accessory);
             } else {
               if (this.debug) {
-                this.log(
-                  "[%s] Nothing to update from above WS message.",
-                  accessory.displayName
-                );
+                this.log("[%s] Nothing to update from above WS message.", accessory.displayName);
               }
             }
           }
           if (!isX) {
             for (let i = 1; i <= accessory.context.channelCount; i++) {
               if (this.devicesInHB.has(device.deviceid + "SW" + i)) {
-                let oAccessory = this.devicesInHB.get(
-                  device.deviceid + "SW" + i
-                );
+                let oAccessory = this.devicesInHB.get(device.deviceid + "SW" + i);
                 oAccessory.context.reachableWAN = device.params.online;
                 this.devicesInHB.set(oAccessory.context.hbDeviceId, oAccessory);
               }
@@ -1237,25 +1056,13 @@ class eWeLink {
             this.devicesInHB.get(device.deviceid + "SWX") ||
             this.devicesInHB.get(device.deviceid + "SW0"))
         ) {
-          if (
-            device.params.updateSource === "WS" &&
-            !accessory.context.reachableWAN
-          ) {
+          if (device.params.updateSource === "WS" && !accessory.context.reachableWAN) {
             accessory.context.reachableWAN = true;
-            this.log(
-              "[%s] has been reported [online] via [WS].",
-              accessory.displayName
-            );
+            this.log("[%s] has been reported [online] via [WS].", accessory.displayName);
           }
-          if (
-            device.params.updateSource === "LAN" &&
-            !accessory.context.reachableLAN
-          ) {
+          if (device.params.updateSource === "LAN" && !accessory.context.reachableLAN) {
             accessory.context.reachableLAN = true;
-            this.log(
-              "[%s] has been reported [online] via [LAN].",
-              accessory.displayName
-            );
+            this.log("[%s] has been reported [online] via [LAN].", accessory.displayName);
           }
           if (this.debug) {
             this.log(
@@ -1296,28 +1103,19 @@ class eWeLink {
         .updateCharacteristic(Characteristic.InUse, value);
       switch (value) {
         case 0:
-          accessory
-            .getService(valve)
-            .updateCharacteristic(Characteristic.RemainingDuration, 0);
+          accessory.getService(valve).updateCharacteristic(Characteristic.RemainingDuration, 0);
           clearTimeout(accessory.getService(valve).timer);
           break;
         case 1:
-          let timer = accessory
-            .getService(valve)
-            .getCharacteristic(Characteristic.SetDuration).value;
-          accessory
-            .getService(valve)
-            .updateCharacteristic(Characteristic.RemainingDuration, timer);
+          let timer = accessory.getService(valve).getCharacteristic(Characteristic.SetDuration)
+            .value;
+          accessory.getService(valve).updateCharacteristic(Characteristic.RemainingDuration, timer);
           accessory.getService(valve).timer = setTimeout(() => {
-            accessory
-              .getService(valve)
-              .setCharacteristic(Characteristic.Active, 0);
+            accessory.getService(valve).setCharacteristic(Characteristic.Active, 0);
           }, timer * 1000);
           break;
       }
-      params.switches = this.devicesInEwe.get(
-        accessory.context.eweDeviceId
-      ).params.switches;
+      params.switches = this.devicesInEwe.get(accessory.context.eweDeviceId).params.switches;
       switch (valve) {
         case "Valve A":
           params.switches[0].switch = value ? "on" : "off";
@@ -1342,8 +1140,7 @@ class eWeLink {
       params.switches[3].switch = "off";
       this.sendDeviceUpdate(accessory, params, callback);
     } catch (err) {
-      let str =
-        "[" + accessory.displayName + "] could not be updated as " + err + ".";
+      let str = "[" + accessory.displayName + "] could not be updated as " + err + ".";
       this.log.error(str);
       callback(str);
     }
@@ -1357,10 +1154,7 @@ class eWeLink {
       if (!(blindConfig = this.cusG.get(accessory.context.hbDeviceId))) {
         throw "group config missing";
       }
-      if (
-        blindConfig.type !== "blind" ||
-        !["oneSwitch", "twoSwitch"].includes(blindConfig.setup)
-      ) {
+      if (blindConfig.type !== "blind" || !["oneSwitch", "twoSwitch"].includes(blindConfig.setup)) {
         throw "improper configuration";
       }
       let oldPos,
@@ -1382,9 +1176,7 @@ class eWeLink {
           params.switch = "on";
           break;
         case "twoSwitch":
-          params.switches = this.devicesInEwe.get(
-            accessory.context.eweDeviceId
-          ).params.switches;
+          params.switches = this.devicesInEwe.get(accessory.context.eweDeviceId).params.switches;
           params.switches[0].switch = value === 100 ? "on" : "off";
           params.switches[1].switch = value === 0 ? "on" : "off";
           break;
@@ -1404,8 +1196,7 @@ class eWeLink {
         callback();
       }, parseInt(blindConfig.operationTime) * 100);
     } catch (err) {
-      let str =
-        "[" + accessory.displayName + "] could not be updated as " + err + ".";
+      let str = "[" + accessory.displayName + "] could not be updated as " + err + ".";
       this.log.error(str);
       callback(str);
     }
@@ -1433,10 +1224,7 @@ class eWeLink {
         newPos = value,
         params = {},
         delay = 0;
-      if (
-        sensorDefinition &&
-        !(sAccessory = this.devicesInHB.get(garageConfig.sensorId + "SWX"))
-      ) {
+      if (sensorDefinition && !(sAccessory = this.devicesInHB.get(garageConfig.sensorId + "SWX"))) {
         throw "defined DW2 sensor doesn't exist";
       }
       if (sAccessory.context.type !== "sensor") {
@@ -1459,10 +1247,7 @@ class eWeLink {
       if (garageConfig.setup === "oneSwitch" && [2, 3].includes(oldPos)) {
         accessory
           .getService(Service.GarageDoorOpener)
-          .updateCharacteristic(
-            Characteristic.CurrentDoorState,
-            ((oldPos * 2) % 3) + 2
-          );
+          .updateCharacteristic(Characteristic.CurrentDoorState, ((oldPos * 2) % 3) + 2);
         delay = 1500;
       }
       setTimeout(() => {
@@ -1499,8 +1284,7 @@ class eWeLink {
       callback();
     } catch (err) {
       accessory.context.inUse = false;
-      let str =
-        "[" + accessory.displayName + "] could not be updated as " + err + ".";
+      let str = "[" + accessory.displayName + "] could not be updated as " + err + ".";
       this.log.error(str);
       callback(str);
     }
@@ -1535,8 +1319,7 @@ class eWeLink {
       }, parseInt(lockConfig.operationTime) * 100);
     } catch (err) {
       accessory.context.inUse = false;
-      let str =
-        "[" + accessory.displayName + "] could not be updated as " + err + ".";
+      let str = "[" + accessory.displayName + "] could not be updated as " + err + ".";
       this.log.error(str);
       callback(str);
     }
@@ -1551,45 +1334,36 @@ class eWeLink {
         case "power":
           newPower = value;
           newSpeed = value ? 33 : 0;
-          newLight = accessory
-            .getService(Service.Lightbulb)
-            .getCharacteristic(Characteristic.On).value;
+          newLight = accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On)
+            .value;
           break;
         case "speed":
           newPower = value >= 33 ? 1 : 0;
           newSpeed = value;
-          newLight = accessory
-            .getService(Service.Lightbulb)
-            .getCharacteristic(Characteristic.On).value;
+          newLight = accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On)
+            .value;
           break;
         case "light":
-          newPower = accessory
-            .getService(Service.Fanv2)
-            .getCharacteristic(Characteristic.Active).value;
+          newPower = accessory.getService(Service.Fanv2).getCharacteristic(Characteristic.Active)
+            .value;
           newSpeed = accessory
             .getService(Service.Fanv2)
             .getCharacteristic(Characteristic.RotationSpeed).value;
           newLight = value;
           break;
       }
-      accessory
-        .getService(Service.Lightbulb)
-        .updateCharacteristic(Characteristic.On, newLight);
+      accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, newLight);
       accessory
         .getService(Service.Fanv2)
         .updateCharacteristic(Characteristic.Active, newPower)
         .updateCharacteristic(Characteristic.RotationSpeed, newSpeed);
       let params = {
-        switches: this.devicesInEwe.get(accessory.context.eweDeviceId).params
-          .switches,
+        switches: this.devicesInEwe.get(accessory.context.eweDeviceId).params.switches,
       };
       params.switches[0].switch = newLight ? "on" : "off";
-      params.switches[1].switch =
-        newPower === 1 && newSpeed >= 33 ? "on" : "off";
-      params.switches[2].switch =
-        newPower === 1 && newSpeed >= 66 && newSpeed < 99 ? "on" : "off";
-      params.switches[3].switch =
-        newPower === 1 && newSpeed >= 99 ? "on" : "off";
+      params.switches[1].switch = newPower === 1 && newSpeed >= 33 ? "on" : "off";
+      params.switches[2].switch = newPower === 1 && newSpeed >= 66 && newSpeed < 99 ? "on" : "off";
+      params.switches[3].switch = newPower === 1 && newSpeed >= 99 ? "on" : "off";
       if (this.debug) {
         this.log.warn("Fan Update - setting " + type + " to " + value);
         this.log(
@@ -1602,8 +1376,7 @@ class eWeLink {
       }
       this.sendDeviceUpdate(accessory, params, callback);
     } catch (err) {
-      let str =
-        "[" + accessory.displayName + "] could not be updated as " + err + ".";
+      let str = "[" + accessory.displayName + "] could not be updated as " + err + ".";
       this.log.error(str);
       callback(str);
     }
@@ -1618,19 +1391,12 @@ class eWeLink {
         mainSwitch: value ? "on" : "off",
       };
       if (this.debug) {
-        this.log(
-          "[%s] updating to turn [%s].",
-          accessory.displayName,
-          value ? "on" : "off"
-        );
+        this.log("[%s] updating to turn [%s].", accessory.displayName, value ? "on" : "off");
       }
-      accessory
-        .getService(Service.Switch)
-        .updateCharacteristic(Characteristic.On, value);
+      accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, value);
       this.sendDeviceUpdate(accessory, params, callback);
     } catch (err) {
-      let str =
-        "[" + accessory.displayName + "] could not be updated as " + err + ".";
+      let str = "[" + accessory.displayName + "] could not be updated as " + err + ".";
       this.log.error(str);
       callback(str);
     }
@@ -1644,15 +1410,9 @@ class eWeLink {
         switch: value ? "on" : "off",
       };
       if (this.debug) {
-        this.log(
-          "[%s] requesting to turn [%s].",
-          accessory.displayName,
-          value ? "on" : "off"
-        );
+        this.log("[%s] requesting to turn [%s].", accessory.displayName, value ? "on" : "off");
       }
-      accessory
-        .getService(Service.Outlet)
-        .updateCharacteristic(Characteristic.On, value);
+      accessory.getService(Service.Outlet).updateCharacteristic(Characteristic.On, value);
       this.sendDeviceUpdate(accessory, params, callback);
     } catch (err) {
       callback("[" + accessory.displayName + "] " + err + ".");
@@ -1664,20 +1424,13 @@ class eWeLink {
         throw "it is currently offline";
       }
       let params = {
-        switches: this.devicesInEwe.get(accessory.context.eweDeviceId).params
-          .switches,
+        switches: this.devicesInEwe.get(accessory.context.eweDeviceId).params.switches,
       };
       params.switches[0].switch = value ? "on" : "off";
       if (this.debug) {
-        this.log(
-          "[%s] requesting to turn [%s].",
-          accessory.displayName,
-          value ? "on" : "off"
-        );
+        this.log("[%s] requesting to turn [%s].", accessory.displayName, value ? "on" : "off");
       }
-      accessory
-        .getService(Service.Outlet)
-        .updateCharacteristic(Characteristic.On, value);
+      accessory.getService(Service.Outlet).updateCharacteristic(Characteristic.On, value);
       this.sendDeviceUpdate(accessory, params, callback);
     } catch (err) {
       callback("[" + accessory.displayName + "] " + err + ".");
@@ -1689,20 +1442,13 @@ class eWeLink {
         throw "it is currently offline";
       }
       let params = {
-        switches: this.devicesInEwe.get(accessory.context.eweDeviceId).params
-          .switches,
+        switches: this.devicesInEwe.get(accessory.context.eweDeviceId).params.switches,
       };
       params.switches[0].switch = value ? "on" : "off";
       if (this.debug) {
-        this.log(
-          "[%s] requesting to turn [%s].",
-          accessory.displayName,
-          value ? "on" : "off"
-        );
+        this.log("[%s] requesting to turn [%s].", accessory.displayName, value ? "on" : "off");
       }
-      accessory
-        .getService(Service.Switch)
-        .updateCharacteristic(Characteristic.On, value);
+      accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, value);
       this.sendDeviceUpdate(accessory, params, callback);
     } catch (err) {
       callback("[" + accessory.displayName + "] " + err + ".");
@@ -1724,20 +1470,12 @@ class eWeLink {
             params.switch = value ? "on" : "off";
           }
           if (this.debug) {
-            this.log(
-              "[%s] updating to turn [%s].",
-              accessory.displayName,
-              value ? "on" : "off"
-            );
+            this.log("[%s] updating to turn [%s].", accessory.displayName, value ? "on" : "off");
           }
-          accessory
-            .getService(Service.Lightbulb)
-            .updateCharacteristic(Characteristic.On, value);
+          accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, value);
           break;
         case "0":
-          params.switches = this.devicesInEwe.get(
-            accessory.context.eweDeviceId
-          ).params.switches;
+          params.switches = this.devicesInEwe.get(accessory.context.eweDeviceId).params.switches;
           params.switches[0].switch = value ? "on" : "off";
           params.switches[1].switch = value ? "on" : "off";
           params.switches[2].switch = value ? "on" : "off";
@@ -1749,16 +1487,10 @@ class eWeLink {
               value ? "on" : "off"
             );
           }
-          accessory
-            .getService(Service.Lightbulb)
-            .updateCharacteristic(Characteristic.On, value);
+          accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, value);
           for (let i = 1; i <= 4; i++) {
-            if (
-              this.devicesInHB.has(accessory.context.eweDeviceId + "SW" + i)
-            ) {
-              oAccessory = this.devicesInHB.get(
-                accessory.context.eweDeviceId + "SW" + i
-              );
+            if (this.devicesInHB.has(accessory.context.eweDeviceId + "SW" + i)) {
+              oAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW" + i);
               oAccessory
                 .getService(Service.Lightbulb)
                 .updateCharacteristic(Characteristic.On, value);
@@ -1770,26 +1502,14 @@ class eWeLink {
         case "3":
         case "4":
           if (this.debug) {
-            this.log(
-              "[%s] updating to turn [%s].",
-              accessory.displayName,
-              value ? "on" : "off"
-            );
+            this.log("[%s] updating to turn [%s].", accessory.displayName, value ? "on" : "off");
           }
-          accessory
-            .getService(Service.Lightbulb)
-            .updateCharacteristic(Characteristic.On, value);
+          accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, value);
           let tAccessory,
             masterState = "off";
-          params.switches = this.devicesInEwe.get(
-            accessory.context.eweDeviceId
-          ).params.switches;
+          params.switches = this.devicesInEwe.get(accessory.context.eweDeviceId).params.switches;
           for (let i = 1; i <= 4; i++) {
-            if (
-              (tAccessory = this.devicesInHB.get(
-                accessory.context.eweDeviceId + "SW" + i
-              ))
-            ) {
+            if ((tAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW" + i))) {
               i === parseInt(accessory.context.switchNumber)
                 ? (params.switches[i - 1].switch = value ? "on" : "off")
                 : (params.switches[i - 1].switch = tAccessory
@@ -1798,9 +1518,7 @@ class eWeLink {
                     ? "on"
                     : "off");
               if (
-                tAccessory
-                  .getService(Service.Lightbulb)
-                  .getCharacteristic(Characteristic.On).value
+                tAccessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On).value
               ) {
                 masterState = "on";
               }
@@ -1808,22 +1526,17 @@ class eWeLink {
               params.switches[i - 1].switch = "off";
             }
           }
-          oAccessory = this.devicesInHB.get(
-            accessory.context.eweDeviceId + "SW0"
-          );
+          oAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW0");
           oAccessory
             .getService(Service.Lightbulb)
             .updateCharacteristic(Characteristic.On, masterState === "on");
           break;
         default:
-          throw (
-            "unknown switch number [" + accessory.context.switchNumber + "]"
-          );
+          throw "unknown switch number [" + accessory.context.switchNumber + "]";
       }
       this.sendDeviceUpdate(accessory, params, callback);
     } catch (err) {
-      let str =
-        "[" + accessory.displayName + "] could not be updated as " + err + ".";
+      let str = "[" + accessory.displayName + "] could not be updated as " + err + ".";
       this.log.error(str);
       callback(str);
     }
@@ -1836,15 +1549,9 @@ class eWeLink {
       let params = {};
       if (value === 0) {
         params.switch = "off";
-        accessory
-          .getService(Service.Lightbulb)
-          .updateCharacteristic(Characteristic.On, false);
+        accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, false);
       } else {
-        if (
-          !accessory
-            .getService(Service.Lightbulb)
-            .getCharacteristic(Characteristic.On).value
-        ) {
+        if (!accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On).value) {
           params.switch = "on";
         }
         switch (accessory.context.eweUIID) {
@@ -1863,16 +1570,11 @@ class eWeLink {
           .updateCharacteristic(Characteristic.Brightness, value);
       }
       if (this.debug) {
-        this.log(
-          "[%s] updating brightness to [%s%].",
-          accessory.displayName,
-          value
-        );
+        this.log("[%s] updating brightness to [%s%].", accessory.displayName, value);
       }
       setTimeout(() => this.sendDeviceUpdate(accessory, params, callback), 250);
     } catch (err) {
-      let str =
-        "[" + accessory.displayName + "] could not be updated as " + err + ".";
+      let str = "[" + accessory.displayName + "] could not be updated as " + err + ".";
       this.log.error(str);
       callback(str);
     }
@@ -1884,9 +1586,8 @@ class eWeLink {
       }
       let newRGB,
         params = {},
-        curHue = accessory
-          .getService(Service.Lightbulb)
-          .getCharacteristic(Characteristic.Hue).value,
+        curHue = accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.Hue)
+          .value,
         curSat = accessory
           .getService(Service.Lightbulb)
           .getCharacteristic(Characteristic.Saturation).value;
@@ -1917,15 +1618,9 @@ class eWeLink {
               throw "unknown device UIID";
           }
           if (this.debug) {
-            this.log(
-              "[%s] updating hue to [%s°].",
-              accessory.displayName,
-              value
-            );
+            this.log("[%s] updating hue to [%s°].", accessory.displayName, value);
           }
-          accessory
-            .getService(Service.Lightbulb)
-            .updateCharacteristic(Characteristic.Hue, value);
+          accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.Hue, value);
           break;
         case "bri":
           switch (accessory.context.eweUIID) {
@@ -1949,11 +1644,7 @@ class eWeLink {
               break;
           }
           if (this.debug) {
-            this.log(
-              "[%s] updating brightness to [%s%].",
-              accessory.displayName,
-              value
-            );
+            this.log("[%s] updating brightness to [%s%].", accessory.displayName, value);
           }
           accessory
             .getService(Service.Lightbulb)
@@ -1964,8 +1655,7 @@ class eWeLink {
       }
       setTimeout(() => this.sendDeviceUpdate(accessory, params, callback), 250);
     } catch (err) {
-      let str =
-        "[" + accessory.displayName + "] could not be updated as " + err + ".";
+      let str = "[" + accessory.displayName + "] could not be updated as " + err + ".";
       this.log.error(str);
       callback(str);
     }
@@ -1981,20 +1671,12 @@ class eWeLink {
         case "X":
           params.switch = value ? "on" : "off";
           if (this.debug) {
-            this.log(
-              "[%s] updating to turn [%s].",
-              accessory.displayName,
-              value ? "on" : "off"
-            );
+            this.log("[%s] updating to turn [%s].", accessory.displayName, value ? "on" : "off");
           }
-          accessory
-            .getService(Service.Switch)
-            .updateCharacteristic(Characteristic.On, value);
+          accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, value);
           break;
         case "0":
-          params.switches = this.devicesInEwe.get(
-            accessory.context.eweDeviceId
-          ).params.switches;
+          params.switches = this.devicesInEwe.get(accessory.context.eweDeviceId).params.switches;
           params.switches[0].switch = value ? "on" : "off";
           params.switches[1].switch = value ? "on" : "off";
           params.switches[2].switch = value ? "on" : "off";
@@ -2006,19 +1688,11 @@ class eWeLink {
               value ? "on" : "off"
             );
           }
-          accessory
-            .getService(Service.Switch)
-            .updateCharacteristic(Characteristic.On, value);
+          accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, value);
           for (let i = 1; i <= 4; i++) {
-            if (
-              this.devicesInHB.has(accessory.context.eweDeviceId + "SW" + i)
-            ) {
-              oAccessory = this.devicesInHB.get(
-                accessory.context.eweDeviceId + "SW" + i
-              );
-              oAccessory
-                .getService(Service.Switch)
-                .updateCharacteristic(Characteristic.On, value);
+            if (this.devicesInHB.has(accessory.context.eweDeviceId + "SW" + i)) {
+              oAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW" + i);
+              oAccessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, value);
             }
           }
           break;
@@ -2027,26 +1701,14 @@ class eWeLink {
         case "3":
         case "4":
           if (this.debug) {
-            this.log(
-              "[%s] updating to turn [%s].",
-              accessory.displayName,
-              value ? "on" : "off"
-            );
+            this.log("[%s] updating to turn [%s].", accessory.displayName, value ? "on" : "off");
           }
-          accessory
-            .getService(Service.Switch)
-            .updateCharacteristic(Characteristic.On, value);
+          accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, value);
           let tAccessory,
             masterState = "off";
-          params.switches = this.devicesInEwe.get(
-            accessory.context.eweDeviceId
-          ).params.switches;
+          params.switches = this.devicesInEwe.get(accessory.context.eweDeviceId).params.switches;
           for (let i = 1; i <= 4; i++) {
-            if (
-              (tAccessory = this.devicesInHB.get(
-                accessory.context.eweDeviceId + "SW" + i
-              ))
-            ) {
+            if ((tAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW" + i))) {
               i === parseInt(accessory.context.switchNumber)
                 ? (params.switches[i - 1].switch = value ? "on" : "off")
                 : (params.switches[i - 1].switch = tAccessory
@@ -2055,9 +1717,7 @@ class eWeLink {
                     ? "on"
                     : "off");
               if (
-                tAccessory
-                  .getService(Service.Switch)
-                  .getCharacteristic(Characteristic.On).value
+                tAccessory.getService(Service.Switch).getCharacteristic(Characteristic.On).value
               ) {
                 masterState = "on";
               }
@@ -2065,22 +1725,17 @@ class eWeLink {
               params.switches[i - 1].switch = "off";
             }
           }
-          oAccessory = this.devicesInHB.get(
-            accessory.context.eweDeviceId + "SW0"
-          );
+          oAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW0");
           oAccessory
             .getService(Service.Switch)
             .updateCharacteristic(Characteristic.On, masterState === "on");
           break;
         default:
-          throw (
-            "unknown switch number [" + accessory.context.switchNumber + "]"
-          );
+          throw "unknown switch number [" + accessory.context.switchNumber + "]";
       }
       this.sendDeviceUpdate(accessory, params, callback);
     } catch (err) {
-      let str =
-        "[" + accessory.displayName + "] could not be updated as " + err + ".";
+      let str = "[" + accessory.displayName + "] could not be updated as " + err + ".";
       this.log.error(str);
       callback(str);
     }
@@ -2114,14 +1769,7 @@ class eWeLink {
         3000
       );
     } catch (err) {
-      let str =
-        "[" +
-        accessory.displayName +
-        " " +
-        name +
-        "] could not be updated as " +
-        err +
-        ".";
+      let str = "[" + accessory.displayName + " " + name + "] could not be updated as " + err + ".";
       this.log.error(str);
       callback(str);
     }
@@ -2131,14 +1779,8 @@ class eWeLink {
       ["A", "B"].forEach((v, k) => {
         accessory
           .getService("Valve " + v)
-          .updateCharacteristic(
-            Characteristic.Active,
-            params.switches[k].switch === "on"
-          )
-          .updateCharacteristic(
-            Characteristic.InUse,
-            params.switches[k].switch === "on"
-          );
+          .updateCharacteristic(Characteristic.Active, params.switches[k].switch === "on")
+          .updateCharacteristic(Characteristic.InUse, params.switches[k].switch === "on");
         if (params.switches[k].switch === "on") {
           let timer = accessory
             .getService("Valve " + v)
@@ -2147,9 +1789,7 @@ class eWeLink {
             .getService("Valve " + v)
             .updateCharacteristic(Characteristic.RemainingDuration, timer);
           accessory.getService("Valve " + v).timer = setTimeout(() => {
-            accessory
-              .getService("Valve " + v)
-              .setCharacteristic(Characteristic.Active, 0);
+            accessory.getService("Valve " + v).setCharacteristic(Characteristic.Active, 0);
           }, timer * 1000);
         } else {
           accessory
@@ -2159,11 +1799,7 @@ class eWeLink {
         }
       });
     } catch (err) {
-      this.log.warn(
-        "[%s] could not be updated as %s.",
-        accessory.displayName,
-        err
-      );
+      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
     }
   }
   externalBlindUpdate(accessory, params) {
@@ -2172,10 +1808,7 @@ class eWeLink {
       if (!(blindConfig = this.cusG.get(accessory.context.hbDeviceId))) {
         throw "group config missing";
       }
-      if (
-        blindConfig.type !== "blind" ||
-        ["oneSwitch", "twoSwitch"].includes(blindConfig.setup)
-      ) {
+      if (blindConfig.type !== "blind" || ["oneSwitch", "twoSwitch"].includes(blindConfig.setup)) {
         throw "improper configuration";
       }
       switch (blindConfig.setup) {
@@ -2191,10 +1824,7 @@ class eWeLink {
               : 0;
           break;
         case "twoSwitch":
-          if (
-            params.switches[0].switch === "off" &&
-            params.switches[1].switch === "off"
-          ) {
+          if (params.switches[0].switch === "off" && params.switches[1].switch === "off") {
             return;
           }
           let switchUp = params.switches[0].switch === "on" ? -1 : 0, // matrix of numbers to get
@@ -2213,11 +1843,7 @@ class eWeLink {
           .updateCharacteristic(Characteristic.CurrentPosition, nSte * 100);
       }, parseInt(blindConfig.operationTime) * 100);
     } catch (err) {
-      this.log.warn(
-        "[%s] could not be updated as %s.",
-        accessory.displayName,
-        err
-      );
+      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
     }
   }
   externalGarageUpdate(accessory, params) {
@@ -2271,11 +1897,7 @@ class eWeLink {
       }, parseInt(garageConfig.operationTime) * 100);
     } catch (err) {
       accessory.context.inUse = false;
-      this.log.warn(
-        "[%s] could not be updated as %s.",
-        accessory.displayName,
-        err
-      );
+      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
     }
   }
   externalLockUpdate(accessory, params) {
@@ -2304,11 +1926,7 @@ class eWeLink {
       }, parseInt(lockConfig.operationTime) * 100);
     } catch (err) {
       accessory.context.inUse = false;
-      this.log.warn(
-        "[%s] could not be updated as %s.",
-        accessory.displayName,
-        err
-      );
+      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
     }
   }
   externalSensorUpdate(accessory, params) {
@@ -2318,14 +1936,8 @@ class eWeLink {
             accessory.getService(Service.BatteryService) ||
             accessory.addService(Service.BatteryService),
           scaledBattery = Math.round(params.battery * 33.3);
-        batteryService.updateCharacteristic(
-          Characteristic.BatteryLevel,
-          scaledBattery
-        );
-        batteryService.updateCharacteristic(
-          Characteristic.StatusLowBattery,
-          scaledBattery < 25
-        );
+        batteryService.updateCharacteristic(Characteristic.BatteryLevel, scaledBattery);
+        batteryService.updateCharacteristic(Characteristic.StatusLowBattery, scaledBattery < 25);
       }
       let newState = params.switch === "on" ? 1 : 0,
         oAccessory = false;
@@ -2333,10 +1945,7 @@ class eWeLink {
         .getService(Service.ContactSensor)
         .updateCharacteristic(Characteristic.ContactSensorState, newState);
       this.cusG.forEach(group => {
-        if (
-          group.sensorId === accessory.context.eweDeviceId &&
-          group.type === "garage"
-        ) {
+        if (group.sensorId === accessory.context.eweDeviceId && group.type === "garage") {
           if ((oAccessory = this.devicesInHB.get(group.deviceId + "SWX"))) {
             switch (newState) {
               case 0:
@@ -2360,11 +1969,7 @@ class eWeLink {
         }
       });
     } catch (err) {
-      this.log.warn(
-        "[%s] could not be updated as %s.",
-        accessory.displayName,
-        err
-      );
+      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
     }
   }
   externalFanUpdate(accessory, params) {
@@ -2372,11 +1977,7 @@ class eWeLink {
       let light, status, speed;
       if (Array.isArray(params.switches)) {
         light = params.switches[0].switch === "on";
-        switch (
-          params.switches[1].switch +
-          params.switches[2].switch +
-          params.switches[3].switch
-        ) {
+        switch (params.switches[1].switch + params.switches[2].switch + params.switches[3].switch) {
           default:
             status = 0;
             speed = 0;
@@ -2404,19 +2005,13 @@ class eWeLink {
       } else {
         throw "unknown parameters received";
       }
-      accessory
-        .getService(Service.Lightbulb)
-        .updateCharacteristic(Characteristic.On, light);
+      accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, light);
       accessory
         .getService(Service.Fanv2)
         .updateCharacteristic(Characteristic.Active, status)
         .updateCharacteristic(Characteristic.RotationSpeed, speed);
     } catch (err) {
-      this.log.warn(
-        "[%s] could not be updated as %s.",
-        accessory.displayName,
-        err
-      );
+      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
     }
   }
   externalThermostatUpdate(accessory, params) {
@@ -2428,9 +2023,7 @@ class eWeLink {
         let newState = params.hasOwnProperty("switch")
           ? params.switch === "on"
           : params.mainSwitch === "on";
-        accessory
-          .getService(Service.Switch)
-          .updateCharacteristic(Characteristic.On, newState);
+        accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, newState);
       }
       let eveLog = {
         time: Date.now(),
@@ -2440,9 +2033,7 @@ class eWeLink {
         accessory.getService(Service.TemperatureSensor)
       ) {
         let currentTemp =
-          params.currentTemperature !== "unavailable"
-            ? params.currentTemperature
-            : 0;
+          params.currentTemperature !== "unavailable" ? params.currentTemperature : 0;
         accessory
           .getService(Service.TemperatureSensor)
           .updateCharacteristic(Characteristic.CurrentTemperature, currentTemp);
@@ -2452,25 +2043,17 @@ class eWeLink {
         params.hasOwnProperty("currentHumidity") &&
         accessory.getService(Service.HumiditySensor)
       ) {
-        let currentHumi =
-          params.currentHumidity !== "unavailable" ? params.currentHumidity : 0;
+        let currentHumi = params.currentHumidity !== "unavailable" ? params.currentHumidity : 0;
         accessory
           .getService(Service.HumiditySensor)
-          .updateCharacteristic(
-            Characteristic.CurrentRelativeHumidity,
-            currentHumi
-          );
+          .updateCharacteristic(Characteristic.CurrentRelativeHumidity, currentHumi);
         eveLog.humidity = parseFloat(currentHumi);
       }
       if (eveLog.hasOwnProperty("temp") || eveLog.hasOwnProperty("humidity")) {
         accessory.eveLogger.addEntry(eveLog);
       }
     } catch (err) {
-      this.log.warn(
-        "[%s] could not be updated as %s.",
-        accessory.displayName,
-        err
-      );
+      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
     }
   }
   externalOutletUpdate(accessory, params) {
@@ -2489,13 +2072,8 @@ class eWeLink {
           );
         accessory
           .getService(Service.Outlet)
-          .updateCharacteristic(
-            Characteristic.OutletInUse,
-            parseFloat(params.power) > 0
-          );
-        let isOn = accessory
-          .getService(Service.Outlet)
-          .getCharacteristic(Characteristic.On).value;
+          .updateCharacteristic(Characteristic.OutletInUse, parseFloat(params.power) > 0);
+        let isOn = accessory.getService(Service.Outlet).getCharacteristic(Characteristic.On).value;
         accessory.eveLogger.addEntry({
           time: Date.now(),
           power: isOn ? parseFloat(params.power) : 0,
@@ -2504,10 +2082,7 @@ class eWeLink {
       if (params.hasOwnProperty("voltage")) {
         accessory
           .getService(Service.Outlet)
-          .updateCharacteristic(
-            EveService.Characteristics.Voltage,
-            parseFloat(params.voltage)
-          );
+          .updateCharacteristic(EveService.Characteristics.Voltage, parseFloat(params.voltage));
       }
       if (params.hasOwnProperty("current")) {
         accessory
@@ -2518,43 +2093,25 @@ class eWeLink {
           );
       }
     } catch (err) {
-      this.log.warn(
-        "[%s] could not be updated as %s.",
-        accessory.displayName,
-        err
-      );
+      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
     }
   }
   externalUSBUpdate(accessory, params) {
     try {
       accessory
         .getService(Service.Outlet)
-        .updateCharacteristic(
-          Characteristic.On,
-          params.switches[0].switch === "on"
-        );
+        .updateCharacteristic(Characteristic.On, params.switches[0].switch === "on");
     } catch (err) {
-      this.log.warn(
-        "[%s] could not be updated as %s.",
-        accessory.displayName,
-        err
-      );
+      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
     }
   }
   externalSCMUpdate(accessory, params) {
     try {
       accessory
         .getService(Service.Switch)
-        .updateCharacteristic(
-          Characteristic.On,
-          params.switches[0].switch === "on"
-        );
+        .updateCharacteristic(Characteristic.On, params.switches[0].switch === "on");
     } catch (err) {
-      this.log.warn(
-        "[%s] could not be updated as %s.",
-        accessory.displayName,
-        err
-      );
+      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
     }
   }
   externalSingleLightUpdate(accessory, params) {
@@ -2564,20 +2121,13 @@ class eWeLink {
         isOn = false;
       if (accessory.context.eweUIID === 22 && params.hasOwnProperty("state")) {
         isOn = params.state === "on";
-      } else if (
-        accessory.context.eweUIID !== 22 &&
-        params.hasOwnProperty("switch")
-      ) {
+      } else if (accessory.context.eweUIID !== 22 && params.hasOwnProperty("switch")) {
         isOn = params.switch === "on";
       } else {
-        isOn = accessory
-          .getService(Service.Lightbulb)
-          .getCharacteristic(Characteristic.On).value;
+        isOn = accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On).value;
       }
       if (isOn) {
-        accessory
-          .getService(Service.Lightbulb)
-          .updateCharacteristic(Characteristic.On, true);
+        accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, true);
         switch (accessory.context.eweUIID) {
           case 36: // KING-M4
             if (params.hasOwnProperty("bright")) {
@@ -2591,10 +2141,7 @@ class eWeLink {
             if (params.hasOwnProperty("brightness")) {
               accessory
                 .getService(Service.Lightbulb)
-                .updateCharacteristic(
-                  Characteristic.Brightness,
-                  params.brightness
-                );
+                .updateCharacteristic(Characteristic.Brightness, params.brightness);
             }
             break;
           case 22: // B1
@@ -2609,9 +2156,7 @@ class eWeLink {
               mode = 2;
             }
             if (mode === 2) {
-              accessory
-                .getService(Service.Lightbulb)
-                .updateCharacteristic(Characteristic.On, true);
+              accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, true);
               newColour = convert.rgb.hsv(
                 parseInt(params.channel2),
                 parseInt(params.channel3),
@@ -2633,11 +2178,7 @@ class eWeLink {
                 .updateCharacteristic(Characteristic.Brightness, params.bright);
             }
             if (params.hasOwnProperty("colorR")) {
-              newColour = convert.rgb.hsv(
-                params.colorR,
-                params.colorG,
-                params.colorB
-              );
+              newColour = convert.rgb.hsv(params.colorR, params.colorG, params.colorB);
               accessory
                 .getService(Service.Lightbulb)
                 .updateCharacteristic(Characteristic.Hue, newColour[0])
@@ -2648,16 +2189,10 @@ class eWeLink {
             return;
         }
       } else {
-        accessory
-          .getService(Service.Lightbulb)
-          .updateCharacteristic(Characteristic.On, false);
+        accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, false);
       }
     } catch (err) {
-      this.log.warn(
-        "[%s] could not be updated as %s.",
-        accessory.displayName,
-        err
-      );
+      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
     }
   }
   externalMultiLightUpdate(accessory, params) {
@@ -2669,24 +2204,15 @@ class eWeLink {
           let oAccessory = this.devicesInHB.get(idToCheck + i);
           oAccessory
             .getService(Service.Lightbulb)
-            .updateCharacteristic(
-              Characteristic.On,
-              params.switches[i - 1].switch === "on"
-            );
+            .updateCharacteristic(Characteristic.On, params.switches[i - 1].switch === "on");
           if (params.switches[i - 1].switch === "on") {
             primaryState = true;
           }
         }
       }
-      accessory
-        .getService(Service.Lightbulb)
-        .updateCharacteristic(Characteristic.On, primaryState);
+      accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, primaryState);
     } catch (err) {
-      this.log.warn(
-        "[%s] could not be updated as %s.",
-        accessory.displayName,
-        err
-      );
+      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
     }
   }
   externalSingleSwitchUpdate(accessory, params) {
@@ -2695,11 +2221,7 @@ class eWeLink {
         .getService(Service.Switch)
         .updateCharacteristic(Characteristic.On, params.switch === "on");
     } catch (err) {
-      this.log.warn(
-        "[%s] could not be updated as %s.",
-        accessory.displayName,
-        err
-      );
+      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
     }
   }
   externalMultiSwitchUpdate(accessory, params) {
@@ -2711,24 +2233,15 @@ class eWeLink {
           let oAccessory = this.devicesInHB.get(idToCheck + i);
           oAccessory
             .getService(Service.Switch)
-            .updateCharacteristic(
-              Characteristic.On,
-              params.switches[i - 1].switch === "on"
-            );
+            .updateCharacteristic(Characteristic.On, params.switches[i - 1].switch === "on");
           if (params.switches[i - 1].switch === "on") {
             primaryState = true;
           }
         }
       }
-      accessory
-        .getService(Service.Switch)
-        .updateCharacteristic(Characteristic.On, primaryState);
+      accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, primaryState);
     } catch (err) {
-      this.log.warn(
-        "[%s] could not be updated as %s.",
-        accessory.displayName,
-        err
-      );
+      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
     }
   }
   externalRFDeviceUpdate(accessory, params) {
@@ -2744,9 +2257,7 @@ class eWeLink {
         // RF Button
         let bAccessory;
         if (
-          (bAccessory = this.devicesInHB.get(
-            idToCheck + accessory.context.rfChlMap[params.rfChl]
-          ))
+          (bAccessory = this.devicesInHB.get(idToCheck + accessory.context.rfChlMap[params.rfChl]))
         ) {
           bAccessory
             .getService(bAccessory.context.rfChls[params.rfChl])
@@ -2800,81 +2311,51 @@ class eWeLink {
                   case "co":
                     oAccessory
                       .getService(Service.CarbonMonoxideSensor)
-                      .updateCharacteristic(
-                        Characteristic.CarbonMonoxideDetected,
-                        1
-                      );
+                      .updateCharacteristic(Characteristic.CarbonMonoxideDetected, 1);
                     setTimeout(() => {
                       oAccessory
                         .getService(Service.CarbonMonoxideSensor)
-                        .updateCharacteristic(
-                          Characteristic.CarbonMonoxideDetected,
-                          0
-                        );
+                        .updateCharacteristic(Characteristic.CarbonMonoxideDetected, 0);
                     }, (this.config.sensorTimeLength || 2) * 1000);
                     break;
                   case "co2":
                     oAccessory
                       .getService(Service.CarbonDioxideSensor)
-                      .updateCharacteristic(
-                        Characteristic.CarbonDioxideDetected,
-                        1
-                      );
+                      .updateCharacteristic(Characteristic.CarbonDioxideDetected, 1);
                     setTimeout(() => {
                       oAccessory
                         .getService(Service.CarbonDioxideSensor)
-                        .updateCharacteristic(
-                          Characteristic.CarbonDioxideDetected,
-                          0
-                        );
+                        .updateCharacteristic(Characteristic.CarbonDioxideDetected, 0);
                     }, (this.config.sensorTimeLength || 2) * 1000);
                     break;
                   case "contact":
                     oAccessory
                       .getService(Service.ContactSensor)
-                      .updateCharacteristic(
-                        Characteristic.ContactSensorState,
-                        1
-                      );
+                      .updateCharacteristic(Characteristic.ContactSensorState, 1);
                     setTimeout(() => {
                       oAccessory
                         .getService(Service.ContactSensor)
-                        .updateCharacteristic(
-                          Characteristic.ContactSensorState,
-                          0
-                        );
+                        .updateCharacteristic(Characteristic.ContactSensorState, 0);
                     }, (this.config.sensorTimeLength || 2) * 1000);
                     break;
                   case "occupancy":
                     oAccessory
                       .getService(Service.OccupancySensor)
-                      .updateCharacteristic(
-                        Characteristic.OccupancyDetected,
-                        1
-                      );
+                      .updateCharacteristic(Characteristic.OccupancyDetected, 1);
                     setTimeout(() => {
                       oAccessory
                         .getService(Service.OccupancySensor)
-                        .updateCharacteristic(
-                          Characteristic.OccupancyDetected,
-                          0
-                        );
+                        .updateCharacteristic(Characteristic.OccupancyDetected, 0);
                     }, (this.config.sensorTimeLength || 2) * 1000);
                     break;
                   default:
                     oAccessory
                       .getService(Service.MotionSensor)
-                      .updateCharacteristic(
-                        Characteristic.MotionDetected,
-                        true
-                      );
+                      .updateCharacteristic(Characteristic.MotionDetected, true);
                     setTimeout(() => {
                       oAccessory
                         .getService(Service.MotionSensor)
-                        .updateCharacteristic(
-                          Characteristic.MotionDetected,
-                          false
-                        );
+                        .updateCharacteristic(Characteristic.MotionDetected, false);
                     }, (this.config.sensorTimeLength || 2) * 1000);
                     break;
                 }
@@ -2890,44 +2371,28 @@ class eWeLink {
           });
       }
     } catch (err) {
-      this.log.warn(
-        "[%s] could not be updated as %s.",
-        accessory.displayName,
-        err
-      );
+      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
     }
   }
   externalZBDeviceUpdate(accessory, params) {
     try {
       //*** credit @tasict ***\\
       if (params.hasOwnProperty("battery")) {
-        if (
-          accessory.context.eweUIID === 3026 &&
-          (this.config.ZBDWBatt || false)
-        ) {
+        if (accessory.context.eweUIID === 3026 && (this.config.ZBDWBatt || false)) {
           params.battery *= 10;
         }
         let batteryService =
           accessory.getService(Service.BatteryService) ||
           accessory.addService(Service.BatteryService);
-        batteryService.updateCharacteristic(
-          Characteristic.BatteryLevel,
-          params.battery
-        );
-        batteryService.updateCharacteristic(
-          Characteristic.StatusLowBattery,
-          params.battery < 25
-        );
+        batteryService.updateCharacteristic(Characteristic.BatteryLevel, params.battery);
+        batteryService.updateCharacteristic(Characteristic.StatusLowBattery, params.battery < 25);
       }
       switch (accessory.context.eweUIID) {
         case 1000:
           if (params.hasOwnProperty("key") && [0, 1, 2].includes(params.key)) {
             accessory
               .getService(Service.StatelessProgrammableSwitch)
-              .updateCharacteristic(
-                Characteristic.ProgrammableSwitchEvent,
-                params.key
-              );
+              .updateCharacteristic(Characteristic.ProgrammableSwitchEvent, params.key);
           }
           break;
         case 1770:
@@ -2938,34 +2403,22 @@ class eWeLink {
             let currentTemp = parseInt(params.temperature) / 100;
             accessory
               .getService(Service.TemperatureSensor)
-              .updateCharacteristic(
-                Characteristic.CurrentTemperature,
-                currentTemp
-              );
+              .updateCharacteristic(Characteristic.CurrentTemperature, currentTemp);
             eveLog.temp = parseFloat(currentTemp);
           }
           if (params.hasOwnProperty("humidity")) {
             let currentHumi = parseInt(params.humidity) / 100;
             accessory
               .getService(Service.HumiditySensor)
-              .updateCharacteristic(
-                Characteristic.CurrentRelativeHumidity,
-                currentHumi
-              );
+              .updateCharacteristic(Characteristic.CurrentRelativeHumidity, currentHumi);
             eveLog.humidity = parseFloat(currentHumi);
           }
-          if (
-            eveLog.hasOwnProperty("temp") ||
-            eveLog.hasOwnProperty("humidity")
-          ) {
+          if (eveLog.hasOwnProperty("temp") || eveLog.hasOwnProperty("humidity")) {
             accessory.eveLogger.addEntry(eveLog);
           }
           break;
         case 2026:
-          if (
-            params.hasOwnProperty("motion") &&
-            params.hasOwnProperty("trigTime")
-          ) {
+          if (params.hasOwnProperty("motion") && params.hasOwnProperty("trigTime")) {
             let timeNow = new Date(),
               diff = (timeNow.getTime() - params.trigTime) / 1000;
             accessory
@@ -2983,19 +2436,12 @@ class eWeLink {
           if (params.hasOwnProperty("lock") && [0, 1].includes(params.lock)) {
             accessory
               .getService(Service.ContactSensor)
-              .updateCharacteristic(
-                Characteristic.ContactSensorState,
-                params.lock
-              );
+              .updateCharacteristic(Characteristic.ContactSensorState, params.lock);
           }
           break;
       }
     } catch (err) {
-      this.log.warn(
-        "[%s] could not be updated as %s.",
-        accessory.displayName,
-        err
-      );
+      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
     }
   }
 }
diff --git a/lib/eWeLinkHTTP.js b/lib/eWeLinkHTTP.js
index 1aafd1e4..dc8370a4 100644
--- a/lib/eWeLinkHTTP.js
+++ b/lib/eWeLinkHTTP.js
@@ -12,9 +12,7 @@ module.exports = class eWeLinkHTTP {
   }
   login() {
     let data = {
-      countryCode:
-        "+" +
-        this.config.countryCode.toString().replace("+", "").replace(" ", ""),
+      countryCode: "+" + this.config.countryCode.toString().replace("+", "").replace(" ", ""),
       password: this.config.password,
     };
     this.config.username.includes("@")
@@ -24,10 +22,7 @@ module.exports = class eWeLinkHTTP {
       let msg = JSON.stringify(data, null, 2)
         .replace(this.config.password, "**hidden**")
         .replace(this.config.username, "**hidden**");
-      this.log.warn(
-        "Sending HTTP login request. This text is yellow for clarity.\n%s",
-        msg
-      );
+      this.log.warn("Sending HTTP login request. This text is yellow for clarity.\n%s", msg);
     } else if (this.debug) {
       this.log("Sending HTTP login request.");
     }
@@ -96,10 +91,7 @@ module.exports = class eWeLinkHTTP {
   getHost() {
     let data = {
         appid: constants.appId,
-        country_code: this.config.countryCode
-          .toString()
-          .replace("+", "")
-          .replace(" ", ""),
+        country_code: this.config.countryCode.toString().replace("+", "").replace(" ", ""),
         nonce: Math.random().toString(36).substr(2, 8),
         ts: Math.floor(new Date().getTime() / 1000),
         version: 8,
@@ -135,10 +127,7 @@ module.exports = class eWeLinkHTTP {
         .then(res => {
           let body = res.data;
           if (!body.region) {
-            throw (
-              "Server did not respond with a region.\n" +
-              JSON.stringify(body, null, 2)
-            );
+            throw "Server did not respond with a region.\n" + JSON.stringify(body, null, 2);
           }
           switch (body.region) {
             case "eu":
@@ -176,17 +165,12 @@ module.exports = class eWeLinkHTTP {
         })
         .then(res => {
           let body = res.data;
-          if (
-            !body.hasOwnProperty("error") ||
-            (body.hasOwnProperty("error") && body.error !== 0)
-          ) {
+          if (!body.hasOwnProperty("error") || (body.hasOwnProperty("error") && body.error !== 0)) {
             throw JSON.stringify(body, null, 2);
           }
           let deviceList = [];
           if (body.data.thingList && body.data.thingList.length > 0) {
-            body.data.thingList.forEach(device =>
-              deviceList.push(device.itemData)
-            );
+            body.data.thingList.forEach(device => deviceList.push(device.itemData));
           }
           resolve(deviceList);
         })
diff --git a/lib/eWeLinkLAN.js b/lib/eWeLinkLAN.js
index 25baee53..9701fa06 100644
--- a/lib/eWeLinkLAN.js
+++ b/lib/eWeLinkLAN.js
@@ -36,9 +36,7 @@ module.exports = class eWeLinkLAN {
           let onlineCount = 0;
           res.forEach(device => {
             let d,
-              deviceId = device.fqdn
-                .replace("._ewelink._tcp.local", "")
-                .replace("eWeLink_", "");
+              deviceId = device.fqdn.replace("._ewelink._tcp.local", "").replace("eWeLink_", "");
             if ((d = this.deviceMap.get(deviceId))) {
               if (!this.ipOverrides.hasOwnProperty(deviceId)) {
                 this.deviceMap.set(deviceId, {
@@ -79,48 +77,31 @@ module.exports = class eWeLinkLAN {
                 .createHash("md5")
                 .update(Buffer.from(deviceInfo.apiKey, "utf8"))
                 .digest(),
-              dText = crypto.createDecipheriv(
-                "aes-128-cbc",
-                key,
-                Buffer.from(rdata.iv, "base64")
-              ),
+              dText = crypto.createDecipheriv("aes-128-cbc", key, Buffer.from(rdata.iv, "base64")),
               pText = Buffer.concat([
                 dText.update(Buffer.from(data, "base64")),
                 dText.final(),
               ]).toString("utf8"),
               params;
-            if (
-              packet.address !== deviceInfo.ip &&
-              !this.ipOverrides.hasOwnProperty(rdata.id)
-            ) {
+            if (packet.address !== deviceInfo.ip && !this.ipOverrides.hasOwnProperty(rdata.id)) {
               this.deviceMap.set(rdata.id, {
                 apiKey: deviceInfo.apiKey,
                 online: true,
                 ip: packet.address,
               });
               if (this.debug) {
-                this.log.warn(
-                  "[%s] updating IP address to [%s].",
-                  rdata.id,
-                  packet.address
-                );
+                this.log.warn("[%s] updating IP address to [%s].", rdata.id, packet.address);
               }
             }
             try {
               params = JSON.parse(pText);
             } catch (e) {
-              this.log.warn(
-                "[%s] An error occured reading the LAN message [%s]",
-                rdata.id,
-                e
-              );
+              this.log.warn("[%s] An error occured reading the LAN message [%s]", rdata.id, e);
               return;
             }
             for (let param in params) {
               if (params.hasOwnProperty(param)) {
-                if (
-                  !constants.paramsToKeep.includes(param.replace(/[0-9]/g, ""))
-                ) {
+                if (!constants.paramsToKeep.includes(param.replace(/[0-9]/g, ""))) {
                   delete params[param];
                 }
               }
@@ -133,10 +114,7 @@ module.exports = class eWeLinkLAN {
                 params,
               };
               if (this.debugReqRes) {
-                let msg = JSON.stringify(returnTemplate, null, 2).replace(
-                  rdata.id,
-                  "**hidden**"
-                );
+                let msg = JSON.stringify(returnTemplate, null, 2).replace(rdata.id, "**hidden**");
                 this.log("LAN message received.\n%s", msg);
               } else if (this.debug) {
                 this.log("LAN message received.");
@@ -175,17 +153,13 @@ module.exports = class eWeLinkLAN {
         throw "plugin does not support lan mode for this device yet - feel free to create a github issue";
       }
       if ((apiKey = this.deviceMap.get(json.deviceid).apiKey)) {
-        let key = crypto
-            .createHash("md5")
-            .update(Buffer.from(apiKey, "utf8"))
-            .digest(),
+        let key = crypto.createHash("md5").update(Buffer.from(apiKey, "utf8")).digest(),
           iv = crypto.randomBytes(16),
           enc = crypto.createCipheriv("aes-128-cbc", key, iv),
           data = {
-            data: Buffer.concat([
-              enc.update(JSON.stringify(params)),
-              enc.final(),
-            ]).toString("base64"),
+            data: Buffer.concat([enc.update(JSON.stringify(params)), enc.final()]).toString(
+              "base64"
+            ),
             deviceid: json.deviceid,
             encrypt: true,
             iv: iv.toString("base64"),
@@ -197,20 +171,13 @@ module.exports = class eWeLinkLAN {
             .replace(json.apikey, "**hidden**")
             .replace(json.apikey, "**hidden**")
             .replace(json.deviceid, "**hidden**");
-          this.log.warn(
-            "LAN message sent. This text is yellow for clarity.\n%s",
-            msg
-          );
+          this.log.warn("LAN message sent. This text is yellow for clarity.\n%s", msg);
         } else if (this.debug) {
           this.log("LAN message sent.");
         }
         axios({
           method: "post",
-          url:
-            "http://" +
-            this.deviceMap.get(json.deviceid).ip +
-            ":8081/zeroconf/" +
-            suffix,
+          url: "http://" + this.deviceMap.get(json.deviceid).ip + ":8081/zeroconf/" + suffix,
           headers: {
             Accept: "application/json",
             "Content-Type": "application/json",
diff --git a/lib/eWeLinkWS.js b/lib/eWeLinkWS.js
index 56fbeb64..70e0a209 100644
--- a/lib/eWeLinkWS.js
+++ b/lib/eWeLinkWS.js
@@ -21,8 +21,7 @@ module.exports = class eWeLinkWS {
     return new Promise((resolve, reject) => {
       axios({
         method: "post",
-        url:
-          "https://" + this.httpHost.replace("-api", "-disp") + "/dispatch/app",
+        url: "https://" + this.httpHost.replace("-api", "-disp") + "/dispatch/app",
         headers: {
           Authorization: "Bearer " + this.aToken,
           "Content-Type": "application/json",
@@ -70,10 +69,7 @@ module.exports = class eWeLinkWS {
         let msg = JSON.stringify(payload, null, 2)
           .replace(this.aToken, "**hidden**")
           .replace(this.apiKey, "**hidden**");
-        this.log.warn(
-          "Sending WS login request. This text is yellow for clarity.\n%s",
-          msg
-        );
+        this.log.warn("Sending WS login request. This text is yellow for clarity.\n%s", msg);
       } else if (this.debug) {
         this.log("Sending WS login request.");
       }
@@ -86,10 +82,7 @@ module.exports = class eWeLinkWS {
       try {
         device = JSON.parse(m);
       } catch (e) {
-        this.log.warn(
-          "An error occured reading the web socket message [%s]",
-          e
-        );
+        this.log.warn("An error occured reading the web socket message [%s]", e);
         return;
       }
       // for requestUpdate response
@@ -143,9 +136,7 @@ module.exports = class eWeLinkWS {
           case "update":
             for (let param in device.params) {
               if (device.params.hasOwnProperty(param)) {
-                if (
-                  !constants.paramsToKeep.includes(param.replace(/[0-9]/g, ""))
-                ) {
+                if (!constants.paramsToKeep.includes(param.replace(/[0-9]/g, ""))) {
                   delete device.params[param];
                 }
               }
@@ -173,8 +164,7 @@ module.exports = class eWeLinkWS {
             return;
           default:
             this.log.warn(
-              "[%s] WS message has unknown action.\n" +
-                JSON.stringify(device, null, 2),
+              "[%s] WS message has unknown action.\n" + JSON.stringify(device, null, 2),
               device.deviceid
             );
             return;
@@ -183,9 +173,7 @@ module.exports = class eWeLinkWS {
         // *** Safe to ignore these messages *** \\
       } else {
         if (this.debug) {
-          this.log.warn(
-            "WS unknown command received.\n" + JSON.stringify(device, null, 2)
-          );
+          this.log.warn("WS unknown command received.\n" + JSON.stringify(device, null, 2));
         }
       }
     });
@@ -200,9 +188,7 @@ module.exports = class eWeLinkWS {
             this.login();
           }, 5000);
         } else {
-          this.log(
-            "Please try restarting Homebridge so that this plugin can work again."
-          );
+          this.log("Please try restarting Homebridge so that this plugin can work again.");
         }
       }
       this.wsIsOpen = false;
@@ -223,9 +209,7 @@ module.exports = class eWeLinkWS {
           this.login();
         }, 5000);
       } else {
-        this.log.warn(
-          "If this was unexpected then please try restarting Homebridge."
-        );
+        this.log.warn("If this was unexpected then please try restarting Homebridge.");
       }
     });
   }
@@ -252,10 +236,7 @@ module.exports = class eWeLinkWS {
             .replace(json.apikey, "**hidden**")
             .replace(json.apiKey, "**hidden**")
             .replace(json.deviceid, "**hidden**");
-          this.log.warn(
-            "WS message sent. This text is yellow for clarity.\n%s",
-            msg
-          );
+          this.log.warn("WS message sent. This text is yellow for clarity.\n%s", msg);
         } else if (this.debug) {
           this.log("WS message sent.");
         }
@@ -268,9 +249,7 @@ module.exports = class eWeLinkWS {
       setTimeout(sendOperation, this.delaySend, string);
       this.delaySend += 280;
     } else {
-      this.log.warn(
-        "Web socket is currently reconnecting. Command will be resent."
-      );
+      this.log.warn("Web socket is currently reconnecting. Command will be resent.");
       let interval,
         waitToSend = req => {
           if (this.wsIsOpen) {
@@ -305,10 +284,7 @@ module.exports = class eWeLinkWS {
               .replace(json.apikey, "**hidden**")
               .replace(json.apiKey, "**hidden**")
               .replace(json.deviceid, "**hidden**");
-            this.log.warn(
-              "WS message sent. This text is yellow for clarity.\n%s",
-              msg
-            );
+            this.log.warn("WS message sent. This text is yellow for clarity.\n%s", msg);
           } else if (this.debug) {
             this.log("WS message sent.");
           }
@@ -321,9 +297,7 @@ module.exports = class eWeLinkWS {
       setTimeout(sendOperation, this.delaySend, string);
       this.delaySend += 280;
     } else {
-      this.log.warn(
-        "Web socket is currently reconnecting. Command will be resent."
-      );
+      this.log.warn("Web socket is currently reconnecting. Command will be resent.");
       let interval,
         waitToSend = req => {
           if (this.wsIsOpen) {

From 8e782a76f3bdff90e7babdcb5d733919653617d4 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 16 Sep 2020 17:05:55 +0100
Subject: [PATCH 0167/3183] 2.27.1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 3e66d828..bc44c562 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "2.27.0",
+  "version": "2.27.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 015ed59c..88b3db2a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "2.27.0",
+  "version": "2.27.1",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 169ae4df8b4ac8fe44be1cd2352d128f1ffb314c Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Thu, 17 Sep 2020 14:44:38 +0100
Subject: [PATCH 0168/3183] Update eWeLink.js

---
 lib/eWeLink.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index 10049c96..8eafef3e 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -1227,7 +1227,7 @@ class eWeLink {
       if (sensorDefinition && !(sAccessory = this.devicesInHB.get(garageConfig.sensorId + "SWX"))) {
         throw "defined DW2 sensor doesn't exist";
       }
-      if (sAccessory.context.type !== "sensor") {
+      if (sensorDefinition && sAccessory.context.type !== "sensor") {
         throw "defined DW2 sensor isn't a sensor";
       }
       oldPos = sAccessory

From a6b79031173339879adbae64012ba7fd52e5b8ec Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 17 Sep 2020 14:45:24 +0100
Subject: [PATCH 0169/3183] 2.27.2

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index bc44c562..93c75ca5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "2.27.1",
+  "version": "2.27.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 88b3db2a..7750d662 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "2.27.1",
+  "version": "2.27.2",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 14bc1f792134b57da5938b2708880bbc39a08b16 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Sat, 19 Sep 2020 22:40:36 +0100
Subject: [PATCH 0170/3183] Update config.yml

---
 .github/ISSUE_TEMPLATE/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 2194a932..af5ef704 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,5 +1,5 @@
 blank_issues_enabled: false
 contact_links:
   - name: Homebridge Discord
-    url: https://discord.gg/Z8jmyvb
+    url: https://discord.gg/7X36mdw
     about: Chat to me on Discord - my username is bwp91.

From 404148f91f5dc90e2825a040e25a1e1134fbb0d2 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 20 Sep 2020 13:02:42 +0100
Subject: [PATCH 0171/3183] initial 3.0 beta

---
 config.schema.json |   13 +-
 lib/constants.js   |    2 +-
 lib/eWeLink.js     | 1673 ++++++++++++++++++++++----------------------
 lib/eWeLinkHTTP.js |  286 +++++---
 lib/eWeLinkLAN.js  |   36 +-
 lib/eWeLinkWS.js   |  330 +++++----
 package-lock.json  |    5 +
 package.json       |    1 +
 8 files changed, 1201 insertions(+), 1145 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index ee24e05b..e9a2b321 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -46,6 +46,12 @@
         "description": "A list of eWeLink devices to hide from Homebridge. For example '10009553c8' or multiple devices separated with a comma '10009553c8,10009553c9'.",
         "default": ""
       },
+      "hideMasters": {
+        "type": "boolean",
+        "title": "Hide Master Switches",
+        "description": "If enabled, the 'SW0' accessory of multi-channel light and switch devices will be hidden from Homebridge.",
+        "default": false
+      },
       "hideFromHB": {
         "type": "string",
         "title": "Hide Device Channels",
@@ -225,6 +231,7 @@
         "debug",
         "debugReqRes",
         "hideDevFromHB",
+        "hideMasters",
         "hideFromHB",
         "sensorTimeLength",
         "sensorTimeDifference",
@@ -261,7 +268,11 @@
       "items": [
         {
           "type": "fieldset",
-          "items": ["bridgeSensors[].deviceId", "bridgeSensors[].fullDeviceId", "bridgeSensors[].type"]
+          "items": [
+            "bridgeSensors[].deviceId",
+            "bridgeSensors[].fullDeviceId",
+            "bridgeSensors[].type"
+          ]
         }
       ]
     }
diff --git a/lib/constants.js b/lib/constants.js
index fe7fcb40..a89a48c0 100644
--- a/lib/constants.js
+++ b/lib/constants.js
@@ -5,7 +5,7 @@ module.exports = {
   appId: "oeVkj2lYFGnJu5XUtWisfW4utiN4u9Mq",
   // appSecret: "mXLOjea0woSMvK9gw7Fjsy7YlFO4iSu6",
   appSecret: "6Nz4n0xA8s8qdxQf2GqurZj2Fs55FUvM",
-  devicesHideable: ["switch", "light", "valve"],
+  devicesHideable: ["switch", "light"],
   devicesNonLAN: [22, 59, 102],
   devicesSingleSwitch: [1, 5, 6, 14, 15, 22, 24, 27, 32, 36, 44, 59],
   devicesSingleSwitchParams: ["switch"],
diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index 8eafef3e..d8b093a1 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -13,9 +13,9 @@ class eWeLink {
   constructor(log, config, api) {
     if (!log || !api || !config) return;
     if (!config.username || !config.password || !config.countryCode) {
-      log.error("**************** Cannot load homebridge-ewelink ****************");
-      log.error("Your eWeLink credentials are missing from the Homebridge config.");
-      log.error("****************************************************************");
+      log.error("*********** Cannot load homebridge-ewelink ***********");
+      log.error("eWeLink credentials missing from the Homebridge config.");
+      log.error("*******************************************************");
       return;
     }
     this.log = log;
@@ -23,257 +23,247 @@ class eWeLink {
     this.api = api;
     this.debug = this.config.debug || false;
     this.devicesInHB = new Map();
-    this.devicesInEwe = new Map();
+    this.devicesInEW = new Map();
     this.cusG = new Map();
     this.cusS = new Map();
+    this.hiddenMasters = [];
     this.eveLogPath = this.api.user.storagePath() + "/homebridge-ewelink/";
     this.api
-      .on("didFinishLaunching", () => {
-        this.log(
-          "Plugin has finished initialising. Starting synchronisation with eWeLink account."
-        );
-        //*** Set up HTTP client and get the user HTTP host ***\\
-        this.httpClient = new eWeLinkHTTP(this.config, this.log);
-        this.httpClient
-          .getHost()
-          .then(() => this.httpClient.login())
-          .then(res => {
-            //*** Set up the web socket client ***\\
-            this.wsClient = new eWeLinkWS(this.config, this.log, res);
-            return this.wsClient.getHost();
-          })
-          .then(() => {
-            //*** Open web socket connection and get device list via HTTP ***\\
-            this.wsClient.login();
-            return this.httpClient.getDevices();
-          })
-          .then(res => {
-            //*** Get device IP addresses for LAN mode ***\\
-            this.httpDevices = res
-              .filter(
-                device => device.hasOwnProperty("extra") && device.extra.hasOwnProperty("uiid")
-              )
-              .filter(device => !(this.config.hideDevFromHB || "").includes(device.deviceid));
-            this.lanClient = new eWeLinkLAN(this.config, this.log, this.httpDevices);
-            this.httpDevices.forEach(device => this.devicesInEwe.set(device.deviceid, device));
-            return this.lanClient.getHosts();
-          })
-          .then(res => {
-            //*** Set up the LAN mode listener ***\\
-            this.lanDevices = res.map;
-            this.lanDevicesOnline = res.count;
-            return this.lanClient.startMonitor();
-          })
-          .then(() => {
-            //*** Use the device list to refresh Homebridge accessories ***\\
-            (() => {
-              //*** Remove all Homebridge accessories if none found ***\\
-              if (
-                Object.keys(this.httpDevices).length === 0 &&
-                Object.keys(this.lanDevices).length === 0
-              ) {
-                Array.from(this.devicesInHB.values()).forEach(a => this.removeAccessory(a));
-                this.devicesInHB.clear();
-                this.log.warn("******* Not loading homebridge-ewelink *******");
-                this.log.warn("No devices were found in your eWeLink account.");
-                this.log.warn("**********************************************");
-                return;
-              }
-              //*** Make a map of custom groups from Homebridge config ***\\
-              if (Object.keys(this.config.groups || []).length > 0) {
-                this.config.groups
-                  .filter(g => g.hasOwnProperty("type") && cns.allowedGroups.includes(g.type))
-                  .filter(
-                    g =>
-                      g.hasOwnProperty("deviceId") &&
-                      this.devicesInEwe.has(g.deviceId.toLowerCase())
-                  )
-                  .forEach(g => this.cusG.set(g.deviceId + "SWX", g));
-              }
-              //*** Make a map of RF Bridge custom sensors from Homebridge config ***\\
-              if (Object.keys(this.config.bridgeSensors || []).length > 0) {
-                this.config.bridgeSensors
-                  .filter(
-                    s =>
-                      s.hasOwnProperty("deviceId") &&
-                      this.devicesInEwe.has(s.deviceId.toLowerCase())
-                  )
-                  .forEach(s => this.cusS.set(s.fullDeviceId, s));
-              }
-              //*** Logging always helps to see if everything is okay so far ***\\
-              this.log(
-                "[%s] eWeLink devices were loaded from the Homebridge cache.",
-                this.devicesInHB.size
-              );
-              this.log(
-                "[%s] primary devices were loaded from your eWeLink account.",
-                this.devicesInEwe.size
-              );
-              this.log(
-                "[%s] primary devices were discovered on your local network.",
-                this.lanDevicesOnline
-              );
-              //*** Remove Homebridge accessories that don't appear in eWeLink ***\\
-              this.devicesInHB.forEach(a => {
-                if (!this.devicesInEwe.has(a.context.eweDeviceId)) {
-                  this.removeAccessory(a);
-                }
-              });
-              //*** Synchronise devices between eWeLink and Homebridge and set up ws/lan listeners ***\\
-              this.devicesInEwe.forEach(d => this.initialiseDevice(d));
-              this.wsClient.receiveUpdate(d => this.receiveDeviceUpdate(d));
-              this.lanClient.receiveUpdate(d => this.receiveDeviceUpdate(d));
-              this.log(
-                "eWeLink setup complete. If you're enjoying this package please consider a ⭐️  on GitHub :)."
-              );
-              if (this.config.debugReqRes || false) {
-                this.log.warn(
-                  "You have 'Request & Response Logging' enabled. This setting is not recommended for long-term use."
-                );
-              }
-            })();
-          })
-          .catch(err => {
-            this.log.error("************** Cannot load homebridge-ewelink **************");
-            this.log.error(err);
-            this.log.error("************************************************************");
-            if (this.lanClient) this.lanClient.closeConnection();
-            if (this.wsClient) this.wsClient.closeConnection();
+      .on("didFinishLaunching", () => this.eWeLinkSync())
+      .on("shutdown", () => {
+        if (this.lanClient) this.lanClient.closeConnection();
+        if (this.wsClient) this.wsClient.closeConnection();
+      });
+  }
+  eWeLinkSync() {
+    this.log("Plugin has finished initialising. Synching with eWeLink.");
+    this.httpClient = new eWeLinkHTTP(this.config, this.log);
+    this.httpClient
+      .getHost()
+      .then(() => this.httpClient.login())
+      .then(res => {
+        this.authData = res;
+        return this.httpClient.getDevices();
+      })
+      .then(res => {
+        res.forEach(device => this.devicesInEW.set(device.deviceid, device));
+        this.wsClient = new eWeLinkWS(this.config, this.log, this.authData);
+        this.lanClient = new eWeLinkLAN(this.config, this.log, res);
+        return this.wsClient.getHost();
+      })
+      .then(() => {
+        this.wsClient.login();
+        return this.lanClient.getHosts();
+      })
+      .then(res => {
+        this.lanDevices = res.map;
+        this.lanCount = res.count;
+        return this.lanClient.startMonitor();
+      })
+      .then(() => {
+        (() => {
+          //*** Make a map of custom groups from Homebridge config ***\\
+          if (Object.keys(this.config.groups || []).length > 0) {
+            this.config.groups
+              .filter(g => g.hasOwnProperty("type") && cns.allowedGroups.includes(g.type))
+              .filter(g => g.hasOwnProperty("deviceId") && this.devicesInEW.has(g.deviceId))
+              .forEach(g => this.cusG.set(g.deviceId + "SWX", g));
+          }
+          //*** Make a map of RF Bridge custom sensors from Homebridge config ***\\
+          if (Object.keys(this.config.bridgeSensors || []).length > 0) {
+            this.config.bridgeSensors
+              .filter(s => s.hasOwnProperty("deviceId") && this.devicesInEW.has(s.deviceId))
+              .forEach(s => this.cusS.set(s.fullDeviceId, s));
+          }
+          //*** Logging always helps to see if everything is okay so far ***\\
+          this.log("[%s] eWeLink devices loaded from the Homebridge cache.", this.devicesInHB.size);
+          this.log("[%s] primary devices loaded from your eWeLink account.", this.devicesInEW.size);
+          this.log("[%s] primary devices were discovered on your local network.", this.lanCount);
+          //*** Remove Homebridge accessories that don't appear in eWeLink ***\\
+          this.devicesInHB.forEach(a => {
+            if (!this.devicesInEW.has(a.context.eweDeviceId)) {
+              this.removeAccessory(a);
+            }
           });
+          //*** Synchronise devices between eWeLink and Homebridge and set up ws/lan listeners ***\\
+          this.devicesInEW.forEach(d => this.initialiseDevice(d));
+          this.wsClient.receiveUpdate(d => this.receiveDeviceUpdate(d));
+          this.lanClient.receiveUpdate(d => this.receiveDeviceUpdate(d));
+          this.log("eWeLink sync complete. Don't forget to ⭐️  this plugin on GitHub!");
+          if (this.config.debugReqRes || false) {
+            this.log.warn("Note: 'Request & Response Logging' is not advised for long-term use.");
+          }
+        })();
       })
-      .on("shutdown", () => {
+      .catch(err => {
+        this.log.error("************** Cannot load homebridge-ewelink **************");
+        this.log.error(err);
+        this.log.error("************************************************************");
         if (this.lanClient) this.lanClient.closeConnection();
         if (this.wsClient) this.wsClient.closeConnection();
       });
   }
   initialiseDevice(device) {
     let accessory;
-    //*** First add the device if it isn't already in Homebridge. Yeah this code looks a mess :| ***\\
+    //*** First add the device if it isn't already in Homebridge ***\\
+
+    //*** IRRIGATION VALVES ***\\
     if (
-      !this.devicesInHB.has(device.deviceid + "SWX") &&
-      !this.devicesInHB.has(device.deviceid + "SW0")
+      device.extra.uiid === 2 &&
+      device.brandName === "coolkit" &&
+      device.productModel === "0285"
     ) {
-      if (
-        device.extra.uiid === 2 &&
-        device.brandName === "coolkit" &&
-        device.productModel === "0285"
-      ) {
-        this.addAccessory(device, device.deviceid + "SWX", "valve");
-      } else if (
-        this.cusG.has(device.deviceid + "SWX") &&
-        this.cusG.get(device.deviceid + "SWX").type === "blind"
-      ) {
-        this.addAccessory(device, device.deviceid + "SWX", "blind");
-      } else if (
-        this.cusG.has(device.deviceid + "SWX") &&
-        this.cusG.get(device.deviceid + "SWX").type === "garage"
-      ) {
-        this.addAccessory(device, device.deviceid + "SWX", "garage");
-      } else if (
-        this.cusG.has(device.deviceid + "SWX") &&
-        this.cusG.get(device.deviceid + "SWX").type === "lock"
-      ) {
-        this.addAccessory(device, device.deviceid + "SWX", "lock");
-      } else if (cns.devicesSensor.includes(device.extra.uiid)) {
-        this.addAccessory(device, device.deviceid + "SWX", "sensor");
-      } else if (cns.devicesFan.includes(device.extra.uiid)) {
-        this.addAccessory(device, device.deviceid + "SWX", "fan");
-      } else if (cns.devicesThermostat.includes(device.extra.uiid)) {
-        this.addAccessory(device, device.deviceid + "SWX", "thermostat");
-      } else if (cns.devicesOutlet.includes(device.extra.uiid)) {
-        this.addAccessory(device, device.deviceid + "SWX", "outlet");
-      } else if (cns.devicesUSB.includes(device.extra.uiid)) {
-        this.addAccessory(device, device.deviceid + "SWX", "usb");
-      } else if (cns.devicesSCM.includes(device.extra.uiid)) {
-        this.addAccessory(device, device.deviceid + "SWX", "scm");
-      } else if (
-        cns.devicesSingleSwitch.includes(device.extra.uiid) &&
-        cns.devicesSingleSwitchLight.includes(device.productModel)
-      ) {
-        this.addAccessory(device, device.deviceid + "SWX", "light");
-      } else if (
-        cns.devicesMultiSwitch.includes(device.extra.uiid) &&
-        cns.devicesMultiSwitchLight.includes(device.productModel)
-      ) {
-        for (let i = 0; i <= cns.chansFromUiid[device.extra.uiid]; i++) {
-          this.addAccessory(device, device.deviceid + "SW" + i, "light");
-        }
-      } else if (cns.devicesSingleSwitch.includes(device.extra.uiid)) {
-        this.addAccessory(device, device.deviceid + "SWX", "switch");
-      } else if (cns.devicesMultiSwitch.includes(device.extra.uiid)) {
-        for (let i = 0; i <= cns.chansFromUiid[device.extra.uiid]; i++) {
-          this.addAccessory(device, device.deviceid + "SW" + i, "switch");
+      accessory = this.devicesInHB.has(device.deviceid + "SWX")
+        ? this.devicesInHB.get(device.deviceid + "SWX")
+        : this.addAccessory(device, device.deviceid + "SWX", "valve");
+    }
+
+    //*** WINDOW BLINDS ***\\
+    else if (
+      this.cusG.has(device.deviceid + "SWX") &&
+      this.cusG.get(device.deviceid + "SWX").type === "blind"
+    ) {
+      accessory = this.devicesInHB.has(device.deviceid + "SWX")
+        ? this.devicesInHB.get(device.deviceid + "SWX")
+        : this.addAccessory(device, device.deviceid + "SWX", "blind");
+    }
+
+    //*** GARAGES ***\\
+    else if (
+      this.cusG.has(device.deviceid + "SWX") &&
+      this.cusG.get(device.deviceid + "SWX").type === "garage"
+    ) {
+      accessory = this.devicesInHB.has(device.deviceid + "SWX")
+        ? this.devicesInHB.get(device.deviceid + "SWX")
+        : this.addAccessory(device, device.deviceid + "SWX", "garage");
+    }
+
+    //*** LOCKS ***\\
+    else if (
+      this.cusG.has(device.deviceid + "SWX") &&
+      this.cusG.get(device.deviceid + "SWX").type === "lock"
+    ) {
+      accessory = this.devicesInHB.has(device.deviceid + "SWX")
+        ? this.devicesInHB.get(device.deviceid + "SWX")
+        : this.addAccessory(device, device.deviceid + "SWX", "lock");
+    }
+
+    //*** DW2 SENSORS ***\\
+    else if (cns.devicesSensor.includes(device.extra.uiid)) {
+      accessory = this.devicesInHB.has(device.deviceid + "SWX")
+        ? this.devicesInHB.get(device.deviceid + "SWX")
+        : this.addAccessory(device, device.deviceid + "SWX", "sensor");
+    }
+
+    //*** FANS ***\\
+    else if (cns.devicesFan.includes(device.extra.uiid)) {
+      accessory = this.devicesInHB.has(device.deviceid + "SWX")
+        ? this.devicesInHB.get(device.deviceid + "SWX")
+        : this.addAccessory(device, device.deviceid + "SWX", "fan");
+    }
+
+    //*** THERMOSTATS ***\\
+    else if (cns.devicesThermostat.includes(device.extra.uiid)) {
+      accessory = this.devicesInHB.has(device.deviceid + "SWX")
+        ? this.devicesInHB.get(device.deviceid + "SWX")
+        : this.addAccessory(device, device.deviceid + "SWX", "thermostat");
+    }
+
+    //*** OUTLETS ***\\
+    else if (cns.devicesOutlet.includes(device.extra.uiid)) {
+      accessory = this.devicesInHB.has(device.deviceid + "SWX")
+        ? this.devicesInHB.get(device.deviceid + "SWX")
+        : this.addAccessory(device, device.deviceid + "SWX", "outlet");
+    }
+
+    //*** USB OUTLETS ***\\
+    else if (cns.devicesUSB.includes(device.extra.uiid)) {
+      accessory = this.devicesInHB.has(device.deviceid + "SWX")
+        ? this.devicesInHB.get(device.deviceid + "SWX")
+        : this.addAccessory(device, device.deviceid + "SWX", "usb");
+    }
+
+    //*** SINGLE CHANNEL [MULTI CHANNEL HARDWARE] ***\\
+    else if (cns.devicesSCM.includes(device.extra.uiid)) {
+      accessory = this.devicesInHB.has(device.deviceid + "SWX")
+        ? this.devicesInHB.get(device.deviceid + "SWX")
+        : this.addAccessory(device, device.deviceid + "SWX", "scm");
+    }
+
+    //*** SINGLE CHANNEL LIGHTS ***\\
+    else if (
+      cns.devicesSingleSwitch.includes(device.extra.uiid) &&
+      cns.devicesSingleSwitchLight.includes(device.productModel)
+    ) {
+      accessory = this.devicesInHB.has(device.deviceid + "SWX")
+        ? this.devicesInHB.get(device.deviceid + "SWX")
+        : this.addAccessory(device, device.deviceid + "SWX", "light");
+    }
+
+    //*** MULTI CHANNEL LIGHTS ***\\
+    else if (
+      cns.devicesMultiSwitch.includes(device.extra.uiid) &&
+      cns.devicesMultiSwitchLight.includes(device.productModel)
+    ) {
+      if (this.config.hideMasters) {
+        if (this.devicesInHB.has(device.deviceid + "SW0")) {
+          this.removeAccessory(this.devicesInHB.get(device.deviceid + "SW0"));
         }
-      } else if (cns.devicesRFBridge.includes(device.extra.uiid)) {
-        this.addAccessory(device, device.deviceid + "SW0", "rf_pri");
-        if (Object.keys((device.tags && device.tags.zyx_info) || []).length > 0) {
-          for (let i = 1; i <= Object.keys(device.tags.zyx_info).length; i++) {
-            this.addAccessory(device, device.deviceid + "SW" + i, "rf_sub");
+        this.hiddenMasters.push(device.deviceid);
+        accessory = this.addAccessory(device, device.deviceid + "SW0", "light", true);
+      } else {
+        accessory = this.devicesInHB.has(device.deviceid + "SW0")
+          ? this.devicesInHB.get(device.deviceid + "SW0")
+          : this.addAccessory(device, device.deviceid + "SW0", "light");
+      }
+      for (let i = 1; i <= cns.chansFromUiid[device.extra.uiid]; i++) {
+        if ((this.config.hideFromHB || "").includes(device.deviceid + "SW" + i)) {
+          if (this.devicesInHB.has(device.deviceid + "SW" + i)) {
+            this.removeAccessory(this.devicesInHB.get(device.deviceid + "SW" + i));
           }
+        } else {
+          let oAccessory = this.devicesInHB.has(device.deviceid + "SW" + i)
+            ? this.devicesInHB.get(device.deviceid + "SW" + i)
+            : this.addAccessory(device, device.deviceid + "SW" + i, "light");
+          oAccessory
+            .getService(Service.AccessoryInformation)
+            .setCharacteristic(Characteristic.FirmwareRevision, device.params.fwVersion);
+          oAccessory.context.reachableWAN = device.online;
+          oAccessory.context.reachableLAN = this.lanDevices.get(device.deviceid).online || false;
+          this.devicesInHB.set(oAccessory.context.hbDeviceId, oAccessory);
         }
-      } else if (cns.devicesZBBridge.includes(device.extra.uiid)) {
-        this.addAccessory(device, device.deviceid + "SWX", "zb_pri");
-      } else if (cns.devicesZB.includes(device.extra.uiid)) {
-        this.addAccessory(device, device.deviceid + "SWX", "zb_sub");
-      } else if (cns.devicesCamera.includes(device.extra.uiid)) {
-        this.log.warn(
-          '[%s] please see "https://github.com/bwp91/homebridge-ewelink/wiki/How-to-set-up-Sonoff-Camera".',
-          device.name
-        );
-        return;
-      } else {
-        this.log.warn(
-          "[%s] cannot be added as it is not supported by this plugin. Please make a GitHub issue request.",
-          device.name
-        );
-        return;
       }
     }
-    //*** Next refresh the device ***\\
-    if (
-      (accessory =
-        this.devicesInHB.get(device.deviceid + "SWX") ||
-        this.devicesInHB.get(device.deviceid + "SW0"))
-    ) {
-      let isX = accessory.context.hbDeviceId.substr(-1) === "X",
-        isRfBridge = cns.devicesRFBridge.includes(accessory.context.eweUIID),
-        rfBridgeChange = false;
-      accessory
-        .getService(Service.AccessoryInformation)
-        .setCharacteristic(Characteristic.FirmwareRevision, device.params.fwVersion);
-      accessory.context.reachableWAN = accessory.context.eweUIID !== 102 ? device.online : true;
-      accessory.context.reachableLAN = this.lanDevices.get(device.deviceid).online || false;
-      accessory.context.inUse = false;
-      let str = accessory.context.reachableLAN
-        ? "and locally with IP [" + this.lanDevices.get(device.deviceid).ip + "]"
-        : "but LAN mode unavailable as unsupported/shared device";
-      this.log("[%s] found in eWeLink %s.", accessory.displayName, str);
-      this.devicesInHB.set(accessory.context.hbDeviceId, accessory);
-      if (!isX) {
-        for (let i = 1; i <= accessory.context.channelCount; i++) {
-          if (!this.devicesInHB.has(device.deviceid + "SW" + i)) {
-            if (cns.devicesHideable.includes(accessory.context.type)) {
-              if ((this.config.hideFromHB || "").includes(device.deviceid + "SW" + i)) {
-                continue;
-              } else {
-                this.addAccessory(device, device.deviceid + "SW" + i, "switch");
-              }
-            }
-          }
-          let oAccessory = this.devicesInHB.get(device.deviceid + "SW" + i);
-          if (
-            (this.config.hideFromHB || "").includes(device.deviceid + "SW" + i) &&
-            cns.devicesHideable.includes(accessory.context.type)
-          ) {
-            this.removeAccessory(oAccessory);
-            continue;
-          }
-          if (isRfBridge && oAccessory.context.sensorType !== "button") {
-            let ct = this.cusS.has(oAccessory.context.hbDeviceId)
-              ? this.cusS.get(oAccessory.context.hbDeviceId).type
-              : "motion";
-            if (ct !== oAccessory.context.sensorType) rfBridgeChange = true;
+
+    //*** SINGLE CHANNEL SWITCHES ***\\
+    else if (cns.devicesSingleSwitch.includes(device.extra.uiid)) {
+      accessory = this.devicesInHB.has(device.deviceid + "SWX")
+        ? this.devicesInHB.get(device.deviceid + "SWX")
+        : this.addAccessory(device, device.deviceid + "SWX", "switch");
+    }
+
+    //*** MULTI CHANNEL SWITCHES ***\\
+    else if (cns.devicesMultiSwitch.includes(device.extra.uiid)) {
+      if (this.config.hideMasters) {
+        if (this.devicesInHB.has(device.deviceid + "SW0")) {
+          this.removeAccessory(this.devicesInHB.get(device.deviceid + "SW0"));
+        }
+        this.hiddenMasters.push(device.deviceid);
+        accessory = this.addAccessory(device, device.deviceid + "SW0", "switch", true);
+      } else {
+        accessory = this.devicesInHB.has(device.deviceid + "SW0")
+          ? this.devicesInHB.get(device.deviceid + "SW0")
+          : this.addAccessory(device, device.deviceid + "SW0", "switch");
+      }
+      for (let i = 1; i <= cns.chansFromUiid[device.extra.uiid]; i++) {
+        if ((this.config.hideFromHB || "").includes(device.deviceid + "SW" + i)) {
+          if (this.devicesInHB.has(device.deviceid + "SW" + i)) {
+            this.removeAccessory(this.devicesInHB.get(device.deviceid + "SW" + i));
           }
+        } else {
+          let oAccessory = this.devicesInHB.has(device.deviceid + "SW" + i)
+            ? this.devicesInHB.get(device.deviceid + "SW" + i)
+            : this.addAccessory(device, device.deviceid + "SW" + i, "switch");
           oAccessory
             .getService(Service.AccessoryInformation)
             .setCharacteristic(Characteristic.FirmwareRevision, device.params.fwVersion);
@@ -282,31 +272,118 @@ class eWeLink {
           this.devicesInHB.set(oAccessory.context.hbDeviceId, oAccessory);
         }
       }
-      if (rfBridgeChange) {
-        this.log.warn(
-          "[%s] bridge configuration changed so devices will be removed and readded.",
-          accessory.displayName
-        );
-        for (let i = 0; i <= accessory.context.channelCount; i++) {
-          let oAccessory = this.devicesInHB.get(device.deviceid + "SW" + i);
-          this.removeAccessory(oAccessory);
+    }
+
+    //*** RF BRIDGES ***\\
+    else if (cns.devicesRFBridge.includes(device.extra.uiid)) {
+      accessory = this.devicesInHB.has(device.deviceid + "SW0")
+        ? this.devicesInHB.get(device.deviceid + "SW0")
+        : this.addAccessory(device, device.deviceid + "SW0", "rf_pri");
+      if (Object.keys((device.tags && device.tags.zyx_info) || []).length > 0) {
+        let rfBridgeChange = false;
+        for (let i = 1; i <= Object.keys(device.tags.zyx_info).length; i++) {
+          let oAccessory = this.devicesInHB.has(device.deviceid + "SW" + i)
+            ? this.devicesInHB.get(device.deviceid + "SW" + i)
+            : this.addAccessory(device, device.deviceid + "SW" + i, "rf_sub");
+          oAccessory
+            .getService(Service.AccessoryInformation)
+            .setCharacteristic(Characteristic.FirmwareRevision, device.params.fwVersion);
+          oAccessory.context.reachableWAN = device.online;
+          oAccessory.context.reachableLAN = this.lanDevices.get(device.deviceid).online || false;
+          this.devicesInHB.set(oAccessory.context.hbDeviceId, oAccessory);
+          if (oAccessory.context.sensorType !== "button" && !rfBridgeChange) {
+            let ct = this.cusS.has(oAccessory.context.hbDeviceId)
+              ? this.cusS.get(oAccessory.context.hbDeviceId).type
+              : "motion";
+            if (ct !== oAccessory.context.sensorType) rfBridgeChange = true;
+          }
+        }
+        if (rfBridgeChange) {
+          this.log.warn(
+            "[%s] bridge configuration changed so devices will be removed and readded.",
+            accessory.displayName
+          );
+          for (let i = 0; i <= accessory.context.channelCount; i++) {
+            let oAccessory = this.devicesInHB.get(device.deviceid + "SW" + i);
+            this.removeAccessory(oAccessory);
+          }
+          this.initialiseDevice(device);
+          return;
         }
-        this.initialiseDevice(device);
-        return;
       }
-      if (!this.refreshAccessory(accessory, device.params)) {
-        this.log.warn(
-          "[%s] could not be initialised. Please try removing accessory from the Homebridge cache along with any secondary devices (SW1, SW2, etc.) [debug:%s:%s].",
-          accessory.displayName,
-          accessory.context.type,
-          accessory.context.channelCount
-        );
+    }
+
+    //*** ZIGBEE BRIDGES ***\\
+    else if (cns.devicesZBBridge.includes(device.extra.uiid)) {
+      accessory = this.devicesInHB.has(device.deviceid + "SWX")
+        ? this.devicesInHB.get(device.deviceid + "SWX")
+        : this.addAccessory(device, device.deviceid + "SWX", "zb_pri");
+    }
+
+    //*** ZIGBEE DEVICES ***\\
+    else if (cns.devicesZB.includes(device.extra.uiid)) {
+      accessory = this.devicesInHB.has(device.deviceid + "SWX")
+        ? this.devicesInHB.get(device.deviceid + "SWX")
+        : this.addAccessory(device, device.deviceid + "SWX", "zb_sub");
+    }
+
+    //*** SONOFF CAMERAS ***\\
+    else if (cns.devicesCamera.includes(device.extra.uiid)) {
+      this.log.warn(
+        ' → [%s] please see "https://github.com/bwp91/homebridge-ewelink/wiki/How-to-set-up-Sonoff-Camera".',
+        device.name
+      );
+      return;
+    }
+
+    //*** ALL OTHER = UNSUPPORTED ***\\
+    else {
+      this.log.warn(
+        " → [%s] cannot be added as it is not supported by this plugin. Please make a GitHub issue request.",
+        device.name
+      );
+      return;
+    }
+
+    if (!accessory) {
+      return;
+    }
+    //*** Next refresh the device ***\\
+    if (!this.hiddenMasters.includes(device.deviceid)) {
+      accessory
+        .getService(Service.AccessoryInformation)
+        .setCharacteristic(Characteristic.FirmwareRevision, device.params.fwVersion);
+    }
+    accessory.context.reachableWAN = device.online;
+    accessory.context.reachableLAN = this.lanDevices.get(device.deviceid).online || false;
+    accessory.context.inUse = false;
+
+    let str = accessory.context.reachableLAN
+      ? "and found locally with IP [" + this.lanDevices.get(device.deviceid).ip + "]"
+      : "but LAN mode unavailable as device ";
+    if (!accessory.context.reachableLAN) {
+      if (cns.devicesNonLAN.includes(device.extra.uiid)) {
+        str += "doesn't support it";
+      } else if (device.hasOwnProperty("sharedBy") && device.sharedBy.hasOwnProperty("email")) {
+        str += "is shared (" + device.sharedBy.email + ")";
+      } else {
+        str += "is unreachable";
       }
-    } else {
-      this.log.warn("[%s] cannot be initialised as it wasn't found in Homebridge.", device.name);
+    }
+
+    this.log(" → [%s] initialised %s.", device.name, str);
+    this.devicesInHB.set(accessory.context.hbDeviceId, accessory);
+
+    if (!this.refreshAccessory(accessory, device.params)) {
+      this.log.warn(
+        "[%s] could not be initialised. Please try removing accessory from the Homebridge cache along with any secondary devices (SW1, SW2, etc.) [debug:%s:%s].",
+        accessory.displayName,
+        accessory.context.type,
+        accessory.context.channelCount
+      );
     }
   }
-  addAccessory(device, hbDeviceId, type) {
+  addAccessory(device, hbDeviceId, type, hidden = false) {
     let switchNumber = hbDeviceId.substr(-1).toString(),
       newDeviceName = type === "rf_sub" ? device.tags.zyx_info[switchNumber - 1].name : device.name,
       channelCount =
@@ -315,29 +392,24 @@ class eWeLink {
           : cns.chansFromUiid[device.extra.uiid];
     if (["1", "2", "3", "4"].includes(switchNumber) && type !== "rf_sub") {
       newDeviceName += " SW" + switchNumber;
-      if (
-        (this.config.hideFromHB || "").includes(hbDeviceId) &&
-        cns.devicesHideable.includes(type)
-      ) {
-        this.log("[%s] will not be added as per configuration.", newDeviceName);
-        return;
-      }
     }
     if ((this.config.nameOverride || {}).hasOwnProperty(hbDeviceId)) {
       newDeviceName = this.config.nameOverride[hbDeviceId];
     }
-    const accessory = new Accessory(newDeviceName, UUIDGen.generate(hbDeviceId).toString());
     try {
-      accessory
-        .getService(Service.AccessoryInformation)
-        .setCharacteristic(Characteristic.SerialNumber, hbDeviceId)
-        .setCharacteristic(Characteristic.Manufacturer, device.brandName)
-        .setCharacteristic(
-          Characteristic.Model,
-          device.productModel + " (" + device.extra.model + ")"
-        )
-        .setCharacteristic(Characteristic.FirmwareRevision, device.params.fwVersion)
-        .setCharacteristic(Characteristic.Identify, false);
+      const accessory = new Accessory(newDeviceName, UUIDGen.generate(hbDeviceId).toString());
+      if (!hidden) {
+        accessory
+          .getService(Service.AccessoryInformation)
+          .setCharacteristic(Characteristic.SerialNumber, hbDeviceId)
+          .setCharacteristic(Characteristic.Manufacturer, device.brandName)
+          .setCharacteristic(
+            Characteristic.Model,
+            device.productModel + " (" + device.extra.model + ")"
+          )
+          .setCharacteristic(Characteristic.FirmwareRevision, device.params.fwVersion)
+          .setCharacteristic(Characteristic.Identify, false);
+      }
       accessory.context = {
         hbDeviceId,
         eweDeviceId: device.deviceid,
@@ -348,197 +420,15 @@ class eWeLink {
         channelCount,
         type,
       };
-      switch (type) {
-        case "valve":
-          ["A", "B"].forEach(v => {
-            accessory
-              .addService(Service.Valve, "Valve " + v, "valve" + v.toLowerCase())
-              .setCharacteristic(Characteristic.Active, 0)
-              .setCharacteristic(Characteristic.InUse, 0)
-              .setCharacteristic(Characteristic.ValveType, 1)
-              .setCharacteristic(Characteristic.SetDuration, this.config.valveTimeLength || 120)
-              .addCharacteristic(Characteristic.RemainingDuration);
-          });
-          break;
-        case "blind":
-          accessory
-            .addService(Service.WindowCovering)
-            .setCharacteristic(Characteristic.CurrentPosition, 100)
-            .setCharacteristic(Characteristic.TargetPosition, 100)
-            .setCharacteristic(Characteristic.PositionState, 2);
-          break;
-        case "garage":
-          accessory
-            .addService(Service.GarageDoorOpener)
-            .setCharacteristic(Characteristic.CurrentDoorState, 1)
-            .setCharacteristic(Characteristic.TargetDoorState, 1)
-            .setCharacteristic(Characteristic.ObstructionDetected, false);
-          break;
-        case "lock":
-          accessory
-            .addService(Service.LockMechanism)
-            .setCharacteristic(Characteristic.LockCurrentState, 1)
-            .setCharacteristic(Characteristic.LockTargetState, 1);
-          break;
-        case "sensor":
-          accessory.addService(Service.ContactSensor);
-          accessory.addService(Service.BatteryService);
-          break;
-        case "fan":
-          accessory.addService(Service.Fanv2);
-          accessory.addService(Service.Lightbulb);
-          break;
-        case "thermostat":
-          if (!this.config.hideTHSwitch) accessory.addService(Service.Switch);
-          accessory.addService(Service.TemperatureSensor);
-          if (device.params.sensorType !== "DS18B20") accessory.addService(Service.HumiditySensor);
-          break;
-        case "outlet":
-          accessory.addService(Service.Outlet);
-          accessory
-            .getService(Service.Outlet)
-            .addCharacteristic(EveService.Characteristics.Voltage);
-          accessory
-            .getService(Service.Outlet)
-            .addCharacteristic(EveService.Characteristics.CurrentConsumption);
-          accessory
-            .getService(Service.Outlet)
-            .addCharacteristic(EveService.Characteristics.ElectricCurrent);
-          accessory
-            .getService(Service.Outlet)
-            .addCharacteristic(EveService.Characteristics.TotalConsumption);
-          accessory
-            .getService(Service.Outlet)
-            .addCharacteristic(EveService.Characteristics.ResetTotal);
-          accessory.context = {
-            ...accessory.context,
-            ...{
-              extraPersistedData: {},
-              lastReset: 0,
-              totalEnergy: 0,
-              totalEnergyTemp: 0,
-            },
-          };
-          break;
-        case "usb":
-          accessory.addService(Service.Outlet);
-          break;
-        case "light":
-          accessory.addService(Service.Lightbulb);
-          break;
-        case "switch":
-        case "scm":
-          accessory.addService(Service.Switch);
-          break;
-        case "rf_pri":
-          accessory.context.rfChlMap = {};
-          break;
-        case "zb_pri":
-          break;
-        case "rf_sub":
-          accessory.context.rfChls = {};
-          switch (device.tags.zyx_info[parseInt(switchNumber) - 1].remote_type) {
-            case "1":
-            case "2":
-            case "3":
-            case "4":
-              accessory.context.sensorType = "button";
-              break;
-            case "6":
-              accessory.context.sensorType = this.cusS.has(hbDeviceId)
-                ? this.cusS.get(hbDeviceId).type
-                : "motion";
-              break;
-            default:
-              throw (
-                "unsupported rf device type [" +
-                device.tags.zyx_info[parseInt(switchNumber) - 1].remote_type +
-                "]. Please create an issue on GitHub"
-              );
-          }
-          let mAccessory = this.devicesInHB.get(device.deviceid + "SW0");
-          device.tags.zyx_info[parseInt(switchNumber) - 1].buttonName.forEach(button => {
-            let rfData;
-            Object.entries(button).forEach(
-              ([k, v]) =>
-                (rfData = {
-                  rfChan: k,
-                  name: v,
-                })
-            );
-            accessory.context.rfChls[rfData.rfChan] = rfData.name;
-            mAccessory.context.rfChlMap[rfData.rfChan] = switchNumber;
-            switch (accessory.context.sensorType) {
-              case "button":
-                accessory.addService(Service.Switch, rfData.name, "switch" + rfData.rfChan);
-                break;
-              case "water":
-                accessory.addService(Service.LeakSensor);
-                break;
-              case "fire":
-              case "smoke":
-                accessory.addService(Service.SmokeSensor);
-                break;
-              case "co":
-                accessory.addService(Service.CarbonMonoxideSensor);
-                break;
-              case "co2":
-                accessory.addService(Service.CarbonDioxideSensor);
-                break;
-              case "contact":
-                accessory.addService(Service.ContactSensor);
-                break;
-              case "occupancy":
-                accessory.addService(Service.OccupancySensor);
-                break;
-              default:
-                accessory.addService(Service.MotionSensor);
-                break;
-            }
-            this.devicesInHB.set(mAccessory.context.hbDeviceId, mAccessory);
-          });
-          break;
-        case "zb_sub": //*** credit @tasict ***\\
-          accessory.addService(Service.BatteryService);
-          switch (device.extra.uiid) {
-            case 1000:
-              accessory.addService(Service.StatelessProgrammableSwitch);
-              if (this.config.hideZBLDPress) {
-                accessory
-                  .getService(Service.StatelessProgrammableSwitch)
-                  .getCharacteristic(Characteristic.ProgrammableSwitchEvent)
-                  .setProps({
-                    validValues: [0],
-                  });
-              }
-              break;
-            case 1770:
-              accessory.addService(Service.TemperatureSensor);
-              accessory.addService(Service.HumiditySensor);
-              break;
-            case 2026:
-              accessory.addService(Service.MotionSensor);
-              break;
-            case 3026:
-              accessory.addService(Service.ContactSensor);
-              break;
-            default:
-              throw (
-                "unsupported zigbee device type [" +
-                device.extra.uiid +
-                "]. Please create an issue on GitHub"
-              );
-          }
-          break;
-        default:
-          throw "device is not supported by this plugin. Please create an issue on GitHub";
+      if (!hidden) {
+        this.api.registerPlatformAccessories("homebridge-ewelink", "eWeLink", [accessory]);
+        this.configureAccessory(accessory);
+        this.log(" → [%s] has been added to Homebridge.", newDeviceName);
       }
-      this.devicesInHB.set(hbDeviceId, accessory);
-      this.api.registerPlatformAccessories("homebridge-ewelink", "eWeLink", [accessory]);
-      this.configureAccessory(accessory);
-      this.log("[%s] has been added to Homebridge.", newDeviceName);
+      return accessory;
     } catch (err) {
-      this.log.warn("[%s] could not be added as %s.", newDeviceName, err);
+      this.log.warn(" → [%s] could not be added as %s.", newDeviceName, err);
+      return false;
     }
   }
   configureAccessory(accessory) {
@@ -549,25 +439,30 @@ class eWeLink {
       switch (accessory.context.type) {
         case "valve":
           ["A", "B"].forEach(v => {
-            accessory
-              .getService("Valve " + v)
+            let valveService;
+            if (!(valveService = accessory.getService("Valve " + v))) {
+              accessory
+                .addService(Service.Valve, "Valve " + v, "valve" + v.toLowerCase())
+                .setCharacteristic(Characteristic.Active, 0)
+                .setCharacteristic(Characteristic.InUse, 0)
+                .setCharacteristic(Characteristic.ValveType, 1)
+                .setCharacteristic(Characteristic.SetDuration, this.config.valveTimeLength || 120)
+                .addCharacteristic(Characteristic.RemainingDuration);
+              valveService = accessory.getService("Valve " + v);
+            }
+            valveService
               .getCharacteristic(Characteristic.Active)
               .on("set", (value, callback) =>
                 this.internalValveUpdate(accessory, "Valve " + v, value, callback)
               );
-            accessory
-              .getService("Valve " + v)
+            valveService
               .getCharacteristic(Characteristic.SetDuration)
               .on("set", (value, callback) => {
-                if (
-                  accessory.getService("Valve " + v).getCharacteristic(Characteristic.InUse).value
-                ) {
-                  accessory
-                    .getService("Valve " + v)
-                    .updateCharacteristic(Characteristic.RemainingDuration, value);
-                  clearTimeout(accessory.getService("Valve " + v).timer);
-                  accessory.getService("Valve " + v).timer = setTimeout(() => {
-                    accessory.getService("Valve " + v).setCharacteristic(Characteristic.Active, 0);
+                if (valveService.getCharacteristic(Characteristic.InUse).value) {
+                  valveService.updateCharacteristic(Characteristic.RemainingDuration, value);
+                  clearTimeout(valveService.timer);
+                  valveService.timer = setTimeout(() => {
+                    valveService.setCharacteristic(Characteristic.Active, 0);
                   }, value * 1000);
                 }
                 callback();
@@ -575,8 +470,16 @@ class eWeLink {
           });
           break;
         case "blind":
-          accessory
-            .getService(Service.WindowCovering)
+          let wcService;
+          if (!(wcService = accessory.getService(Service.WindowCovering))) {
+            accessory
+              .addService(Service.WindowCovering)
+              .setCharacteristic(Characteristic.CurrentPosition, 100)
+              .setCharacteristic(Characteristic.TargetPosition, 100)
+              .setCharacteristic(Characteristic.PositionState, 2);
+            wcService = accessory.getService(Service.WindowCovering);
+          }
+          wcService
             .getCharacteristic(Characteristic.TargetPosition)
             .on("set", (value, callback) => this.internalBlindUpdate(accessory, value, callback))
             .setProps({
@@ -584,26 +487,44 @@ class eWeLink {
             });
           break;
         case "garage":
-          accessory
-            .getService(Service.GarageDoorOpener)
+          let gdService;
+          if (!(gdService = accessory.getService(Service.GarageDoorOpener))) {
+            accessory
+              .addService(Service.GarageDoorOpener)
+              .setCharacteristic(Characteristic.CurrentDoorState, 1)
+              .setCharacteristic(Characteristic.TargetDoorState, 1)
+              .setCharacteristic(Characteristic.ObstructionDetected, false);
+            gdService = accessory.getService(Service.GarageDoorOpener);
+          }
+          gdService
             .getCharacteristic(Characteristic.TargetDoorState)
             .on("set", (value, callback) => this.internalGarageUpdate(accessory, value, callback));
           break;
         case "lock":
-          accessory
-            .getService(Service.LockMechanism)
+          let lmService =
+            accessory.getService(Service.LockMechanism) ||
+            accessory.addService(Service.LockMechanism);
+          lmService
             .getCharacteristic(Characteristic.LockTargetState)
             .on("set", (value, callback) => this.internalLockUpdate(accessory, value, callback));
           break;
+        case "sensor":
+          accessory.getService(Service.ContactSensor) ||
+            accessory.addService(Service.ContactSensor);
+          accessory.getService(Service.BatteryService) ||
+            accessory.addService(Service.BatteryService);
+          break;
         case "fan":
-          accessory
-            .getService(Service.Fanv2)
+          let fanService =
+              accessory.getService(Service.Fanv2) || accessory.addService(Service.Fanv2),
+            fanLightService =
+              accessory.getService(Service.Lightbulb) || accessory.addService(Service.Lightbulb);
+          fanService
             .getCharacteristic(Characteristic.Active)
             .on("set", (value, callback) =>
               this.internalFanUpdate(accessory, "power", value, callback)
             );
-          accessory
-            .getService(Service.Fanv2)
+          fanService
             .getCharacteristic(Characteristic.RotationSpeed)
             .on("set", (value, callback) =>
               this.internalFanUpdate(accessory, "speed", value, callback)
@@ -611,17 +532,26 @@ class eWeLink {
             .setProps({
               minStep: 33,
             });
-          accessory
-            .getService(Service.Lightbulb)
+          fanLightService
             .getCharacteristic(Characteristic.On)
             .on("set", (value, callback) =>
               this.internalFanUpdate(accessory, "light", value, callback)
             );
           break;
         case "thermostat":
+          let tempService =
+              accessory.getService(Service.TemperatureSensor) ||
+              accessory.addService(Service.TemperatureSensor),
+            humiService = false;
+          if (this.devicesInEW.get(accessory.context.eweDeviceId).params.sensorType !== "DS18B20") {
+            humiService =
+              accessory.getService(Service.HumiditySensor) ||
+              accessory.addService(Service.HumiditySensor);
+          }
           if (!this.config.hideTHSwitch) {
-            accessory
-              .getService(Service.Switch)
+            let switchService =
+              accessory.getService(Service.Switch) || accessory.addService(Service.Switch);
+            switchService
               .getCharacteristic(Characteristic.On)
               .on("set", (value, callback) =>
                 this.internalThermostatUpdate(accessory, value, callback)
@@ -636,30 +566,24 @@ class eWeLink {
           corrInterval.setCorrectingInterval(() => {
             let dataToAdd = {
               time: Date.now(),
-              temp: accessory
-                .getService(Service.TemperatureSensor)
-                .getCharacteristic(Characteristic.CurrentTemperature).value,
+              temp: tempService.getCharacteristic(Characteristic.CurrentTemperature).value,
             };
-            if (accessory.getService(Service.HumiditySensor)) {
-              dataToAdd.humidity = accessory
-                .getService(Service.HumiditySensor)
-                .getCharacteristic(Characteristic.CurrentRelativeHumidity).value;
+            if (humiService) {
+              humiService.getCharacteristic(Characteristic.CurrentRelativeHumidity).value;
             }
             accessory.eveLogger.addEntry(dataToAdd);
           }, 300000);
           break;
         case "outlet":
-          accessory
-            .getService(Service.Outlet)
-            .getCharacteristic(Characteristic.On)
-            .on("set", (value, callback) => this.internalOutletUpdate(accessory, value, callback));
-          accessory.log = this.log;
-          accessory.eveLogger = new EveHistoryService("energy", accessory, {
-            storage: "fs",
-            minutes: 5,
-            path: this.eveLogPath,
-          });
-          if (!accessory.context.hasOwnProperty("lastReset")) {
+          let outletService;
+          if (!(outletService = accessory.getService(Service.Outlet))) {
+            accessory.addService(Service.Outlet);
+            outletService = accessory.getService(Service.Outlet);
+            outletService.addCharacteristic(EveService.Characteristics.Voltage);
+            outletService.addCharacteristic(EveService.Characteristics.CurrentConsumption);
+            outletService.addCharacteristic(EveService.Characteristics.ElectricCurrent);
+            outletService.addCharacteristic(EveService.Characteristics.TotalConsumption);
+            outletService.addCharacteristic(EveService.Characteristics.ResetTotal);
             accessory.context = {
               ...accessory.context,
               ...{
@@ -670,13 +594,20 @@ class eWeLink {
               },
             };
           }
+          outletService
+            .getCharacteristic(Characteristic.On)
+            .on("set", (value, callback) => this.internalOutletUpdate(accessory, value, callback));
+          accessory.log = this.log;
+          accessory.eveLogger = new EveHistoryService("energy", accessory, {
+            storage: "fs",
+            minutes: 5,
+            path: this.eveLogPath,
+          });
           corrInterval.setCorrectingInterval(() => {
-            let isOn = accessory.getService(Service.Outlet).getCharacteristic(Characteristic.On)
-                .value,
+            let isOn = outletService.getCharacteristic(Characteristic.On).value,
               currentWatt = isOn
-                ? accessory
-                    .getService(Service.Outlet)
-                    .getCharacteristic(EveService.Characteristics.CurrentConsumption).value
+                ? outletService.getCharacteristic(EveService.Characteristics.CurrentConsumption)
+                    .value
                 : 0;
             if (accessory.eveLogger.isHistoryLoaded()) {
               accessory.context.extraPersistedData = accessory.eveLogger.getExtraPersistedData();
@@ -707,8 +638,7 @@ class eWeLink {
               power: currentWatt,
             });
           }, 300000);
-          accessory
-            .getService(Service.Outlet)
+          outletService
             .getCharacteristic(EveService.Characteristics.TotalConsumption)
             .on("get", callback => {
               accessory.context.extraPersistedData = accessory.eveLogger.getExtraPersistedData();
@@ -717,8 +647,7 @@ class eWeLink {
               }
               callback(null, accessory.context.totalEnergy);
             });
-          accessory
-            .getService(Service.Outlet)
+          outletService
             .getCharacteristic(EveService.Characteristics.ResetTotal)
             .on("set", (value, callback) => {
               accessory.context.totalEnergy = 0;
@@ -738,34 +667,33 @@ class eWeLink {
             });
           break;
         case "usb":
-          accessory
-            .getService(Service.Outlet)
+          let usbService =
+            accessory.getService(Service.Outlet) || accessory.addService(Service.Outlet);
+          usbService
             .getCharacteristic(Characteristic.On)
             .on("set", (value, callback) => this.internalUSBUpdate(accessory, value, callback));
           break;
         case "scm":
-          accessory
-            .getService(Service.Switch)
+          let scmService =
+            accessory.getService(Service.Switch) || accessory.addService(Service.Switch);
+          scmService
             .getCharacteristic(Characteristic.On)
             .on("set", (value, callback) => this.internalSCMUpdate(accessory, value, callback));
           break;
         case "light":
-          accessory
-            .getService(Service.Lightbulb)
+          let lightService =
+            accessory.getService(Service.Lightbulb) || accessory.addService(Service.Lightbulb);
+          lightService
             .getCharacteristic(Characteristic.On)
             .on("set", (value, callback) =>
               this.internalLightbulbUpdate(accessory, value, callback)
             );
           if (cns.devicesBrightable.includes(accessory.context.eweUIID)) {
-            accessory
-              .getService(Service.Lightbulb)
+            lightService
               .getCharacteristic(Characteristic.Brightness)
               .on("set", (value, callback) => {
                 if (value > 0) {
-                  if (
-                    !accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On)
-                      .value
-                  ) {
+                  if (!lightService.getCharacteristic(Characteristic.On).value) {
                     this.internalLightbulbUpdate(accessory, true, function () {
                       return;
                     });
@@ -776,15 +704,11 @@ class eWeLink {
                 }
               });
           } else if (cns.devicesColourable.includes(accessory.context.eweUIID)) {
-            accessory
-              .getService(Service.Lightbulb)
+            lightService
               .getCharacteristic(Characteristic.Brightness)
               .on("set", (value, callback) => {
                 if (value > 0) {
-                  if (
-                    !accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On)
-                      .value
-                  ) {
+                  if (!lightService.getCharacteristic(Characteristic.On).value) {
                     this.internalLightbulbUpdate(accessory, true, function () {
                       return;
                     });
@@ -794,25 +718,102 @@ class eWeLink {
                   this.internalLightbulbUpdate(accessory, false, callback);
                 }
               });
-            accessory
-              .getService(Service.Lightbulb)
+            lightService
               .getCharacteristic(Characteristic.Hue)
               .on("set", (value, callback) =>
                 this.internalHSBUpdate(accessory, "hue", value, callback)
               );
-            accessory
-              .getService(Service.Lightbulb)
+            lightService
               .getCharacteristic(Characteristic.Saturation)
               .on("set", (value, callback) => callback());
           }
           break;
         case "switch":
-          accessory
-            .getService(Service.Switch)
+          let switchService =
+            accessory.getService(Service.Switch) || accessory.addService(Service.Switch);
+          switchService
             .getCharacteristic(Characteristic.On)
             .on("set", (value, callback) => this.internalSwitchUpdate(accessory, value, callback));
           break;
+        case "rf_pri":
+          if (!accessory.context.hasOwnProperty("rfChlMap")) {
+            accessory.context.rfChlMap = {};
+          }
+          break;
         case "rf_sub":
+          if (!accessory.context.hasOwnProperty("rfChls")) {
+            accessory.context.rfChls = {};
+          }
+          switch (
+            this.devicesInEW.get(accessory.context.eweDeviceId).tags.zyx_info[
+              parseInt(accessory.context.switchNumber) - 1
+            ].remote_type
+          ) {
+            case "1":
+            case "2":
+            case "3":
+            case "4":
+              accessory.context.sensorType = "button";
+              break;
+            case "6":
+              accessory.context.sensorType = this.cusS.has(accessory.context.hbDeviceId)
+                ? this.cusS.get(accessory.context.hbDeviceId).type
+                : "motion";
+              break;
+          }
+          let mAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW0");
+          this.devicesInEW
+            .get(mAccessory.context.eweDeviceId)
+            .tags.zyx_info[parseInt(accessory.context.switchNumber) - 1].buttonName.forEach(
+              button => {
+                let rfData;
+                Object.entries(button).forEach(
+                  ([k, v]) =>
+                    (rfData = {
+                      rfChan: k,
+                      name: v,
+                    })
+                );
+                accessory.context.rfChls[rfData.rfChan] = rfData.name;
+                mAccessory.context.rfChlMap[rfData.rfChan] = accessory.context.switchNumber;
+                this.devicesInHB.set(mAccessory.context.hbDeviceId, mAccessory);
+                switch (accessory.context.sensorType) {
+                  case "button":
+                    accessory.getService(rfData.name) ||
+                      accessory.addService(Service.Switch, rfData.name, "switch" + rfData.rfChan);
+                    break;
+                  case "water":
+                    accessory.getService(Service.LeakSensor) ||
+                      accessory.addService(Service.LeakSensor);
+                    break;
+                  case "fire":
+                  case "smoke":
+                    accessory.getService(Service.SmokeSensor) ||
+                      accessory.addService(Service.SmokeSensor);
+                    break;
+                  case "co":
+                    accessory.getService(Service.CarbonMonoxideSensor) ||
+                      accessory.addService(Service.CarbonMonoxideSensor);
+                    break;
+                  case "co2":
+                    accessory.getService(Service.CarbonDioxideSensor) ||
+                      accessory.addService(Service.CarbonDioxideSensor);
+                    break;
+                  case "contact":
+                    accessory.getService(Service.ContactSensor) ||
+                      accessory.addService(Service.ContactSensor);
+                    break;
+                  case "occupancy":
+                    accessory.getService(Service.OccupancySensor) ||
+                      accessory.addService(Service.OccupancySensor);
+                    break;
+                  default:
+                    accessory.getService(Service.MotionSensor) ||
+                      accessory.addService(Service.MotionSensor);
+                    break;
+                }
+              }
+            );
           accessory.context.rfChls = accessory.context.rfChls || {};
           if (accessory.context.sensorType === "button") {
             Object.entries(accessory.context.rfChls).forEach(([k, v]) => {
@@ -825,27 +826,53 @@ class eWeLink {
                 });
             });
           }
+
           break;
-        case "zb_sub":
-          if (accessory.context.eweUIID === 1770) {
-            accessory.log = this.log;
-            accessory.eveLogger = new EveHistoryService("weather", accessory, {
-              storage: "fs",
-              minutes: 5,
-              path: this.eveLogPath,
-            });
-            corrInterval.setCorrectingInterval(() => {
-              let dataToAdd = {
-                time: Date.now(),
-                temp: accessory
-                  .getService(Service.TemperatureSensor)
-                  .getCharacteristic(Characteristic.CurrentTemperature).value,
-                humidity: accessory
-                  .getService(Service.HumiditySensor)
-                  .getCharacteristic(Characteristic.CurrentRelativeHumidity).value,
-              };
-              accessory.eveLogger.addEntry(dataToAdd);
-            }, 300000);
+        case "zb_sub": //*** credit @tasict ***\\
+          accessory.getService(Service.BatteryService) ||
+            accessory.addService(Service.BatteryService);
+          switch (accessory.context.eweUIID) {
+            case 1000:
+              let zbspsService =
+                accessory.getService(Service.StatelessProgrammableSwitch) ||
+                accessory.addService(Service.StatelessProgrammableSwitch);
+              if (this.config.hideZBLDPress) {
+                zbspsService.getCharacteristic(Characteristic.ProgrammableSwitchEvent).setProps({
+                  validValues: [0],
+                });
+              }
+              break;
+            case 1770:
+              let zbTempService =
+                accessory.getService(Service.TemperatureSensor) ||
+                accessory.addService(Service.TemperatureSensor);
+              let zbHumiService =
+                accessory.getService(Service.HumiditySensor) ||
+                accessory.addService(Service.HumiditySensor);
+              accessory.log = this.log;
+              accessory.eveLogger = new EveHistoryService("weather", accessory, {
+                storage: "fs",
+                minutes: 5,
+                path: this.eveLogPath,
+              });
+              corrInterval.setCorrectingInterval(() => {
+                let dataToAdd = {
+                  time: Date.now(),
+                  temp: zbTempService.getCharacteristic(Characteristic.CurrentTemperature).value,
+                  humidity: zbHumiService.getCharacteristic(Characteristic.CurrentRelativeHumidity)
+                    .value,
+                };
+                accessory.eveLogger.addEntry(dataToAdd);
+              }, 300000);
+              break;
+            case 2026:
+              accessory.getService(Service.MotionSensor) ||
+                accessory.addService(Service.MotionSensor);
+              break;
+            case 3026:
+              accessory.getService(Service.ContactSensor) ||
+                accessory.addService(Service.ContactSensor);
+              break;
           }
           break;
       }
@@ -974,11 +1001,11 @@ class eWeLink {
   }
   removeAccessory(accessory) {
     try {
-      this.devicesInHB.delete(accessory.context.hbDeviceId);
       this.api.unregisterPlatformAccessories("homebridge-ewelink", "eWeLink", [accessory]);
-      this.log("[%s] has been removed from Homebridge.", accessory.displayName);
+      this.devicesInHB.delete(accessory.context.hbDeviceId);
+      this.log(" → [%s] was removed from Homebridge.", accessory.displayName);
     } catch (err) {
-      this.log.warn("[%s] needed to be removed but couldn't as %s.", accessory.displayName, err);
+      this.log.warn(" → [%s] wasn't removed as %s.", accessory.displayName, err);
     }
   }
   sendDeviceUpdate(accessory, params, callback) {
@@ -989,8 +1016,10 @@ class eWeLink {
     };
     let sendViaWS = () => {
       if (accessory.context.reachableWAN) {
-        this.wsClient.sendUpdate(payload);
-        callback();
+        this.wsClient
+          .sendUpdate(payload)
+          .then(() => callback())
+          .catch(err => callback(err));
       } else {
         this.log.error(
           "[%s] could not be updated as it appears to be offline.",
@@ -1014,81 +1043,73 @@ class eWeLink {
     }
   }
   receiveDeviceUpdate(device) {
-    let accessory;
-    switch (device.action) {
-      case "sysmsg":
-        if (
-          (accessory =
-            this.devicesInHB.get(device.deviceid + "SWX") ||
-            this.devicesInHB.get(device.deviceid + "SW0"))
-        ) {
-          let isX = accessory.context.hbDeviceId.substr(-1) === "X";
-          if (device.params.updateSource === "WS") {
-            if (accessory.context.reachableWAN !== device.params.online) {
-              accessory.context.reachableWAN = device.params.online;
-              this.log(
-                "[%s] has been reported [%s] via [WS].",
-                accessory.displayName,
-                accessory.context.reachableWAN ? "online" : "offline"
-              );
-              this.devicesInHB.set(accessory.context.hbDeviceId, accessory);
-              if (accessory.context.reachableWAN) this.wsClient.requestUpdate(accessory);
-            } else {
-              if (this.debug) {
-                this.log("[%s] Nothing to update from above WS message.", accessory.displayName);
-              }
-            }
-          }
-          if (!isX) {
-            for (let i = 1; i <= accessory.context.channelCount; i++) {
-              if (this.devicesInHB.has(device.deviceid + "SW" + i)) {
-                let oAccessory = this.devicesInHB.get(device.deviceid + "SW" + i);
-                oAccessory.context.reachableWAN = device.params.online;
-                this.devicesInHB.set(oAccessory.context.hbDeviceId, oAccessory);
-              }
-            }
-          }
+    let accessory,
+      deviceId = device.deviceid,
+      reachableChange = false;
+    if (
+      (accessory = this.devicesInHB.get(deviceId + "SWX") || this.devicesInHB.get(deviceId + "SW0"))
+    ) {
+      let isX = accessory.context.hbDeviceId.substr(-1) === "X";
+      if (device.params.updateSource === "WS") {
+        if (device.params.online != accessory.context.reachableWAN) {
+          accessory.context.reachableWAN = device.params.online;
+          this.devicesInHB.set(accessory.context.hbDeviceId, accessory);
+          if (accessory.context.reachableWAN)
+            this.wsClient.requestUpdate(accessory).catch(() => {});
+          reachableChange = true;
+          this.log.warn(
+            "[%s] has been reported [%s] via [WS].",
+            accessory.displayName,
+            accessory.context.reachableWAN ? "online" : "offline"
+          );
         }
-        break;
-      case "update":
-        if (
-          (accessory =
-            this.devicesInHB.get(device.deviceid + "SWX") ||
-            this.devicesInHB.get(device.deviceid + "SW0"))
-        ) {
-          if (device.params.updateSource === "WS" && !accessory.context.reachableWAN) {
-            accessory.context.reachableWAN = true;
-            this.log("[%s] has been reported [online] via [WS].", accessory.displayName);
-          }
-          if (device.params.updateSource === "LAN" && !accessory.context.reachableLAN) {
-            accessory.context.reachableLAN = true;
-            this.log("[%s] has been reported [online] via [LAN].", accessory.displayName);
-          }
-          if (this.debug) {
-            this.log(
-              "[%s] externally updated from above %s message and will be refreshed.",
-              accessory.displayName,
-              device.params.updateSource
-            );
-          }
-          if (!this.refreshAccessory(accessory, device.params)) {
-            this.log.warn(
-              "[%s] cannot be refreshed. Please try removing accessory from the Homebridge cache along with any secondary devices (SW1, SW2, etc.). [debug:%s:%s]",
-              accessory.displayName,
-              accessory.context.type,
-              accessory.context.channelCount
-            );
-          }
-        } else {
-          if (!(this.config.hideDevFromHB || "").includes(device.deviceid)) {
-            this.log.warn(
-              "[%s] Accessory received via %s update does not exist in Homebridge. If it's a new accessory please restart Homebridge so it is added.",
-              device.deviceid,
-              device.params.updateSource
-            );
+      }
+      if (device.params.updateSource === "LAN" && !accessory.context.reachableLAN) {
+        accessory.context.reachableLAN = true;
+        this.devicesInHB.set(accessory.context.hbDeviceId, accessory);
+        this.wsClient.requestUpdate(accessory).catch(() => {});
+        reachableChange = true;
+        this.log.warn("[%s] has been reported [online] via [LAN].", accessory.displayName);
+      }
+      if (reachableChange && !isX) {
+        for (let i = 1; i <= accessory.context.channelCount; i++) {
+          if (this.devicesInHB.has(deviceId + "SW" + i)) {
+            let oAccessory = this.devicesInHB.get(deviceId + "SW" + i);
+            oAccessory.context.reachableWAN = device.params.online;
+            if (device.params.updateSource === "LAN") {
+              oAccessory.context.reachableLAN = true;
+            }
+            this.devicesInHB.set(oAccessory.context.hbDeviceId, oAccessory);
           }
         }
-        break;
+      }
+      if (this.debug) {
+        this.log(
+          "[%s] externally updated from above %s message and will be refreshed.",
+          accessory.displayName,
+          device.params.updateSource
+        );
+      }
+      if (!this.refreshAccessory(accessory, device.params)) {
+        this.log.warn(
+          "[%s] cannot be refreshed. Please try removing accessory from the Homebridge cache along with any secondary devices (SW1, SW2, etc.). [debug:%s:%s]",
+          accessory.displayName,
+          accessory.context.type,
+          accessory.context.channelCount
+        );
+      }
+    } else {
+      if (!(this.config.hideDevFromHB || "").includes(deviceId)) {
+        this.log.warn(
+          "[%s] update received via %s does not exist in Homebridge so device will be added.",
+          deviceId,
+          device.params.updateSource
+        );
+        this.httpClient
+          .getDevice(deviceId)
+          .then(res => this.initialiseDevice(res))
+          .catch(err => this.log.error("[%s] error getting info [%s]", deviceId, err));
+      }
     }
   }
   internalValveUpdate(accessory, valve, value, callback) {
@@ -1096,26 +1117,26 @@ class eWeLink {
       if (!accessory.context.reachableWAN && !accessory.context.reachableLAN) {
         throw "it is currently offline";
       }
-      let params = {};
-      accessory
-        .getService(valve)
+      let params = {},
+        serviceValve = accessory.getService(valve);
+      serviceValve
         .updateCharacteristic(Characteristic.Active, value)
         .updateCharacteristic(Characteristic.InUse, value);
       switch (value) {
         case 0:
-          accessory.getService(valve).updateCharacteristic(Characteristic.RemainingDuration, 0);
+          serviceValve.updateCharacteristic(Characteristic.RemainingDuration, 0);
           clearTimeout(accessory.getService(valve).timer);
           break;
         case 1:
-          let timer = accessory.getService(valve).getCharacteristic(Characteristic.SetDuration)
-            .value;
-          accessory.getService(valve).updateCharacteristic(Characteristic.RemainingDuration, timer);
-          accessory.getService(valve).timer = setTimeout(() => {
-            accessory.getService(valve).setCharacteristic(Characteristic.Active, 0);
-          }, timer * 1000);
+          let timer = serviceValve.getCharacteristic(Characteristic.SetDuration).value;
+          serviceValve.updateCharacteristic(Characteristic.RemainingDuration, timer);
+          serviceValve.timer = setTimeout(
+            () => serviceValve.setCharacteristic(Characteristic.Active, 0),
+            timer * 1000
+          );
           break;
       }
-      params.switches = this.devicesInEwe.get(accessory.context.eweDeviceId).params.switches;
+      params.switches = this.devicesInEW.get(accessory.context.eweDeviceId).params.switches;
       switch (valve) {
         case "Valve A":
           params.switches[0].switch = value ? "on" : "off";
@@ -1158,14 +1179,12 @@ class eWeLink {
         throw "improper configuration";
       }
       let oldPos,
-        params = {};
+        params = {},
+        wcService = accessory.getService(Service.WindowCovering);
       value = value >= 50 ? 100 : 0;
-      oldPos = accessory
-        .getService(Service.WindowCovering)
-        .getCharacteristic(Characteristic.PositionState).value;
+      oldPos = wcService.getCharacteristic(Characteristic.PositionState).value;
       if (value === oldPos * 100) {
-        accessory
-          .getService(Service.WindowCovering)
+        wcService
           .updateCharacteristic(Characteristic.TargetPosition, value)
           .updateCharacteristic(Characteristic.PositionState, oldPos);
         callback();
@@ -1176,7 +1195,7 @@ class eWeLink {
           params.switch = "on";
           break;
         case "twoSwitch":
-          params.switches = this.devicesInEwe.get(accessory.context.eweDeviceId).params.switches;
+          params.switches = this.devicesInEW.get(accessory.context.eweDeviceId).params.switches;
           params.switches[0].switch = value === 100 ? "on" : "off";
           params.switches[1].switch = value === 0 ? "on" : "off";
           break;
@@ -1184,13 +1203,11 @@ class eWeLink {
       this.sendDeviceUpdate(accessory, params, function () {
         return;
       });
-      accessory
-        .getService(Service.WindowCovering)
+      wcService
         .updateCharacteristic(Characteristic.TargetPosition, value)
         .updateCharacteristic(Characteristic.PositionState, value / 100);
       setTimeout(() => {
-        accessory
-          .getService(Service.WindowCovering)
+        wcService
           .updateCharacteristic(Characteristic.CurrentPosition, value)
           .updateCharacteristic(Characteristic.PositionState, 2);
         callback();
@@ -1223,7 +1240,8 @@ class eWeLink {
         oldPos,
         newPos = value,
         params = {},
-        delay = 0;
+        delay = 0,
+        gdService = accessory.getService(Service.GarageDoorOpener);
       if (sensorDefinition && !(sAccessory = this.devicesInHB.get(garageConfig.sensorId + "SWX"))) {
         throw "defined DW2 sensor doesn't exist";
       }
@@ -1236,24 +1254,19 @@ class eWeLink {
             .getCharacteristic(Characteristic.ContactSensorState).value === 0
           ? 1
           : 0
-        : accessory
-            .getService(Service.GarageDoorOpener)
-            .getCharacteristic(Characteristic.CurrentDoorState).value;
+        : gdService.getCharacteristic(Characteristic.CurrentDoorState).value;
       if (newPos === oldPos % 2) {
         accessory.context.inUse = false;
         callback();
         return;
       }
       if (garageConfig.setup === "oneSwitch" && [2, 3].includes(oldPos)) {
-        accessory
-          .getService(Service.GarageDoorOpener)
-          .updateCharacteristic(Characteristic.CurrentDoorState, ((oldPos * 2) % 3) + 2);
+        gdService.updateCharacteristic(Characteristic.CurrentDoorState, ((oldPos * 2) % 3) + 2);
         delay = 1500;
       }
       setTimeout(() => {
         if (accessory.context.state === newPos) {
-          accessory
-            .getService(Service.GarageDoorOpener)
+          gdService
             .updateCharacteristic(Characteristic.TargetDoorState, newPos)
             .updateCharacteristic(Characteristic.CurrentDoorState, newPos + 2);
           switch (garageConfig.setup) {
@@ -1261,9 +1274,7 @@ class eWeLink {
               params.switch = "on";
               break;
             case "twoSwitch":
-              params.switches = this.devicesInEwe.get(
-                accessory.context.eweDeviceId
-              ).params.switches;
+              params.switches = this.devicesInEW.get(accessory.context.eweDeviceId).params.switches;
               params.switches[0].switch = newPos === 0 ? "on" : "off";
               params.switches[1].switch = newPos === 1 ? "on" : "off";
               break;
@@ -1273,9 +1284,7 @@ class eWeLink {
           });
           setTimeout(() => {
             if (!sAccessory) {
-              accessory
-                .getService(Service.GarageDoorOpener)
-                .updateCharacteristic(Characteristic.CurrentDoorState, newPos);
+              gdService.updateCharacteristic(Characteristic.CurrentDoorState, newPos);
             }
             accessory.context.inUse = false;
           }, parseInt(garageConfig.operationTime) * 100);
@@ -1295,7 +1304,8 @@ class eWeLink {
         throw "it is currently offline";
       }
       let lockConfig,
-        params = {};
+        params = {},
+        lmService = accessory.getService(Service.LockMechanism);
       if (!(lockConfig = this.cusG.get(accessory.context.hbDeviceId))) {
         throw "group config missing";
       }
@@ -1304,15 +1314,13 @@ class eWeLink {
       }
       accessory.context.inUse = true;
       this.log("[%s] has received request to unlock.", accessory.displayName);
-      accessory
-        .getService(Service.LockMechanism)
+      lmService
         .updateCharacteristic(Characteristic.LockTargetState, 0)
         .updateCharacteristic(Characteristic.LockCurrentState, 0);
       params.switch = "on";
       this.sendDeviceUpdate(accessory, params, callback);
       setTimeout(() => {
-        accessory
-          .getService(Service.LockMechanism)
+        lmService
           .updateCharacteristic(Characteristic.LockTargetState, 1)
           .updateCharacteristic(Characteristic.LockCurrentState, 1);
         accessory.context.inUse = false;
@@ -1329,36 +1337,34 @@ class eWeLink {
       if (!accessory.context.reachableWAN && !accessory.context.reachableLAN) {
         throw "it is currently offline";
       }
-      let newPower, newSpeed, newLight;
+      let newPower,
+        newSpeed,
+        newLight,
+        lightService = accessory.getService(Service.Lightbulb),
+        fanService = accessory.getService(Service.Fanv2);
       switch (type) {
         case "power":
           newPower = value;
           newSpeed = value ? 33 : 0;
-          newLight = accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On)
-            .value;
+          newLight = lightService.getCharacteristic(Characteristic.On).value;
           break;
         case "speed":
           newPower = value >= 33 ? 1 : 0;
           newSpeed = value;
-          newLight = accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On)
-            .value;
+          newLight = lightService.getCharacteristic(Characteristic.On).value;
           break;
         case "light":
-          newPower = accessory.getService(Service.Fanv2).getCharacteristic(Characteristic.Active)
-            .value;
-          newSpeed = accessory
-            .getService(Service.Fanv2)
-            .getCharacteristic(Characteristic.RotationSpeed).value;
+          newPower = fanService.getCharacteristic(Characteristic.Active).value;
+          newSpeed = fanService.getCharacteristic(Characteristic.RotationSpeed).value;
           newLight = value;
           break;
       }
-      accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, newLight);
-      accessory
-        .getService(Service.Fanv2)
+      lightService.updateCharacteristic(Characteristic.On, newLight);
+      fanService
         .updateCharacteristic(Characteristic.Active, newPower)
         .updateCharacteristic(Characteristic.RotationSpeed, newSpeed);
       let params = {
-        switches: this.devicesInEwe.get(accessory.context.eweDeviceId).params.switches,
+        switches: this.devicesInEW.get(accessory.context.eweDeviceId).params.switches,
       };
       params.switches[0].switch = newLight ? "on" : "off";
       params.switches[1].switch = newPower === 1 && newSpeed >= 33 ? "on" : "off";
@@ -1387,13 +1393,14 @@ class eWeLink {
         throw "it is currently offline";
       }
       let params = {
-        switch: value ? "on" : "off",
-        mainSwitch: value ? "on" : "off",
-      };
+          switch: value ? "on" : "off",
+          mainSwitch: value ? "on" : "off",
+        },
+        switchService = accessory.getService(Service.Switch);
       if (this.debug) {
         this.log("[%s] updating to turn [%s].", accessory.displayName, value ? "on" : "off");
       }
-      accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, value);
+      switchService.updateCharacteristic(Characteristic.On, value);
       this.sendDeviceUpdate(accessory, params, callback);
     } catch (err) {
       let str = "[" + accessory.displayName + "] could not be updated as " + err + ".";
@@ -1407,12 +1414,13 @@ class eWeLink {
         throw "it is currently offline";
       }
       let params = {
-        switch: value ? "on" : "off",
-      };
+          switch: value ? "on" : "off",
+        },
+        outletService = accessory.getService(Service.Outlet);
       if (this.debug) {
         this.log("[%s] requesting to turn [%s].", accessory.displayName, value ? "on" : "off");
       }
-      accessory.getService(Service.Outlet).updateCharacteristic(Characteristic.On, value);
+      outletService.updateCharacteristic(Characteristic.On, value);
       this.sendDeviceUpdate(accessory, params, callback);
     } catch (err) {
       callback("[" + accessory.displayName + "] " + err + ".");
@@ -1424,13 +1432,14 @@ class eWeLink {
         throw "it is currently offline";
       }
       let params = {
-        switches: this.devicesInEwe.get(accessory.context.eweDeviceId).params.switches,
-      };
+          switches: this.devicesInEW.get(accessory.context.eweDeviceId).params.switches,
+        },
+        outletService = accessory.getService(Service.Outlet);
       params.switches[0].switch = value ? "on" : "off";
       if (this.debug) {
         this.log("[%s] requesting to turn [%s].", accessory.displayName, value ? "on" : "off");
       }
-      accessory.getService(Service.Outlet).updateCharacteristic(Characteristic.On, value);
+      outletService.updateCharacteristic(Characteristic.On, value);
       this.sendDeviceUpdate(accessory, params, callback);
     } catch (err) {
       callback("[" + accessory.displayName + "] " + err + ".");
@@ -1442,13 +1451,14 @@ class eWeLink {
         throw "it is currently offline";
       }
       let params = {
-        switches: this.devicesInEwe.get(accessory.context.eweDeviceId).params.switches,
-      };
+          switches: this.devicesInEW.get(accessory.context.eweDeviceId).params.switches,
+        },
+        switchService = accessory.getService(Service.Switch);
       params.switches[0].switch = value ? "on" : "off";
       if (this.debug) {
         this.log("[%s] requesting to turn [%s].", accessory.displayName, value ? "on" : "off");
       }
-      accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, value);
+      switchService.updateCharacteristic(Characteristic.On, value);
       this.sendDeviceUpdate(accessory, params, callback);
     } catch (err) {
       callback("[" + accessory.displayName + "] " + err + ".");
@@ -1460,7 +1470,8 @@ class eWeLink {
         throw "it is currently offline";
       }
       let oAccessory,
-        params = {};
+        params = {},
+        lightService = accessory.getService(Service.Lightbulb);
       switch (accessory.context.switchNumber) {
         case "X":
           if (accessory.context.eweUIID === 22) {
@@ -1472,10 +1483,10 @@ class eWeLink {
           if (this.debug) {
             this.log("[%s] updating to turn [%s].", accessory.displayName, value ? "on" : "off");
           }
-          accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, value);
+          lightService.updateCharacteristic(Characteristic.On, value);
           break;
         case "0":
-          params.switches = this.devicesInEwe.get(accessory.context.eweDeviceId).params.switches;
+          params.switches = this.devicesInEW.get(accessory.context.eweDeviceId).params.switches;
           params.switches[0].switch = value ? "on" : "off";
           params.switches[1].switch = value ? "on" : "off";
           params.switches[2].switch = value ? "on" : "off";
@@ -1487,7 +1498,7 @@ class eWeLink {
               value ? "on" : "off"
             );
           }
-          accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, value);
+          lightService.updateCharacteristic(Characteristic.On, value);
           for (let i = 1; i <= 4; i++) {
             if (this.devicesInHB.has(accessory.context.eweDeviceId + "SW" + i)) {
               oAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW" + i);
@@ -1504,10 +1515,10 @@ class eWeLink {
           if (this.debug) {
             this.log("[%s] updating to turn [%s].", accessory.displayName, value ? "on" : "off");
           }
-          accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, value);
+          lightService.updateCharacteristic(Characteristic.On, value);
           let tAccessory,
             masterState = "off";
-          params.switches = this.devicesInEwe.get(accessory.context.eweDeviceId).params.switches;
+          params.switches = this.devicesInEW.get(accessory.context.eweDeviceId).params.switches;
           for (let i = 1; i <= 4; i++) {
             if ((tAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW" + i))) {
               i === parseInt(accessory.context.switchNumber)
@@ -1526,10 +1537,12 @@ class eWeLink {
               params.switches[i - 1].switch = "off";
             }
           }
-          oAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW0");
-          oAccessory
-            .getService(Service.Lightbulb)
-            .updateCharacteristic(Characteristic.On, masterState === "on");
+          if (!this.hiddenMasters.includes(accessory.context.eweDeviceId)) {
+            oAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW0");
+            oAccessory
+              .getService(Service.Lightbulb)
+              .updateCharacteristic(Characteristic.On, masterState === "on");
+          }
           break;
         default:
           throw "unknown switch number [" + accessory.context.switchNumber + "]";
@@ -1546,12 +1559,13 @@ class eWeLink {
       if (!accessory.context.reachableWAN && !accessory.context.reachableLAN) {
         throw "it is currently offline";
       }
-      let params = {};
+      let params = {},
+        lightService = accessory.getService(Service.Lightbulb);
       if (value === 0) {
         params.switch = "off";
-        accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, false);
+        lightService.updateCharacteristic(Characteristic.On, false);
       } else {
-        if (!accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On).value) {
+        if (!lightService.getCharacteristic(Characteristic.On).value) {
           params.switch = "on";
         }
         switch (accessory.context.eweUIID) {
@@ -1565,9 +1579,7 @@ class eWeLink {
           default:
             throw "unknown device UIID";
         }
-        accessory
-          .getService(Service.Lightbulb)
-          .updateCharacteristic(Characteristic.Brightness, value);
+        lightService.updateCharacteristic(Characteristic.Brightness, value);
       }
       if (this.debug) {
         this.log("[%s] updating brightness to [%s%].", accessory.displayName, value);
@@ -1586,11 +1598,9 @@ class eWeLink {
       }
       let newRGB,
         params = {},
-        curHue = accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.Hue)
-          .value,
-        curSat = accessory
-          .getService(Service.Lightbulb)
-          .getCharacteristic(Characteristic.Saturation).value;
+        lightService = accessory.getService(Service.Lightbulb),
+        curHue = lightService.getCharacteristic(Characteristic.Hue).value,
+        curSat = lightService.getCharacteristic(Characteristic.Saturation).value;
       switch (type) {
         case "hue":
           newRGB = convert.hsv.rgb(value, curSat, 100);
@@ -1620,7 +1630,7 @@ class eWeLink {
           if (this.debug) {
             this.log("[%s] updating hue to [%s°].", accessory.displayName, value);
           }
-          accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.Hue, value);
+          lightService.updateCharacteristic(Characteristic.Hue, value);
           break;
         case "bri":
           switch (accessory.context.eweUIID) {
@@ -1646,9 +1656,7 @@ class eWeLink {
           if (this.debug) {
             this.log("[%s] updating brightness to [%s%].", accessory.displayName, value);
           }
-          accessory
-            .getService(Service.Lightbulb)
-            .updateCharacteristic(Characteristic.Brightness, value);
+          lightService.updateCharacteristic(Characteristic.Brightness, value);
           break;
         default:
           throw "unknown device UIID";
@@ -1666,17 +1674,18 @@ class eWeLink {
         throw "it is currently offline";
       }
       let oAccessory,
-        params = {};
+        params = {},
+        switchService = accessory.getService(Service.Switch);
       switch (accessory.context.switchNumber) {
         case "X":
           params.switch = value ? "on" : "off";
           if (this.debug) {
             this.log("[%s] updating to turn [%s].", accessory.displayName, value ? "on" : "off");
           }
-          accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, value);
+          switchService.updateCharacteristic(Characteristic.On, value);
           break;
         case "0":
-          params.switches = this.devicesInEwe.get(accessory.context.eweDeviceId).params.switches;
+          params.switches = this.devicesInEW.get(accessory.context.eweDeviceId).params.switches;
           params.switches[0].switch = value ? "on" : "off";
           params.switches[1].switch = value ? "on" : "off";
           params.switches[2].switch = value ? "on" : "off";
@@ -1688,7 +1697,7 @@ class eWeLink {
               value ? "on" : "off"
             );
           }
-          accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, value);
+          switchService.updateCharacteristic(Characteristic.On, value);
           for (let i = 1; i <= 4; i++) {
             if (this.devicesInHB.has(accessory.context.eweDeviceId + "SW" + i)) {
               oAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW" + i);
@@ -1703,10 +1712,10 @@ class eWeLink {
           if (this.debug) {
             this.log("[%s] updating to turn [%s].", accessory.displayName, value ? "on" : "off");
           }
-          accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, value);
+          switchService.updateCharacteristic(Characteristic.On, value);
           let tAccessory,
             masterState = "off";
-          params.switches = this.devicesInEwe.get(accessory.context.eweDeviceId).params.switches;
+          params.switches = this.devicesInEW.get(accessory.context.eweDeviceId).params.switches;
           for (let i = 1; i <= 4; i++) {
             if ((tAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW" + i))) {
               i === parseInt(accessory.context.switchNumber)
@@ -1725,10 +1734,12 @@ class eWeLink {
               params.switches[i - 1].switch = "off";
             }
           }
-          oAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW0");
-          oAccessory
-            .getService(Service.Switch)
-            .updateCharacteristic(Characteristic.On, masterState === "on");
+          if (!this.hiddenMasters.includes(accessory.context.eweDeviceId)) {
+            oAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW0");
+            oAccessory
+              .getService(Service.Switch)
+              .updateCharacteristic(Characteristic.On, masterState === "on");
+          }
           break;
         default:
           throw "unknown switch number [" + accessory.context.switchNumber + "]";
@@ -1747,9 +1758,10 @@ class eWeLink {
       }
       rfChl = parseInt(rfChl);
       let params = {
-        cmd: "transmit",
-        rfChl,
-      };
+          cmd: "transmit",
+          rfChl,
+        },
+        rfService = accessory.getService(accessory.context.rfChls[rfChl]);
       if (this.debug) {
         this.log(
           "[%s %s] mimicking RF button press.",
@@ -1757,17 +1769,9 @@ class eWeLink {
           accessory.context.rfChls[rfChl]
         );
       }
-      accessory
-        .getService(accessory.context.rfChls[rfChl])
-        .updateCharacteristic(Characteristic.On, true);
+      rfService.updateCharacteristic(Characteristic.On, true);
       this.sendDeviceUpdate(accessory, params, callback);
-      setTimeout(
-        () =>
-          accessory
-            .getService(accessory.context.rfChls[rfChl])
-            .updateCharacteristic(Characteristic.On, false),
-        3000
-      );
+      setTimeout(() => rfService.updateCharacteristic(Characteristic.On, false), 3000);
     } catch (err) {
       let str = "[" + accessory.displayName + " " + name + "] could not be updated as " + err + ".";
       this.log.error(str);
@@ -1777,25 +1781,19 @@ class eWeLink {
   externalValveUpdate(accessory, params) {
     try {
       ["A", "B"].forEach((v, k) => {
-        accessory
-          .getService("Valve " + v)
+        let valveService = accessory.getService("Valve " + v);
+        valveService
           .updateCharacteristic(Characteristic.Active, params.switches[k].switch === "on")
           .updateCharacteristic(Characteristic.InUse, params.switches[k].switch === "on");
         if (params.switches[k].switch === "on") {
-          let timer = accessory
-            .getService("Valve " + v)
-            .getCharacteristic(Characteristic.SetDuration).value;
-          accessory
-            .getService("Valve " + v)
-            .updateCharacteristic(Characteristic.RemainingDuration, timer);
-          accessory.getService("Valve " + v).timer = setTimeout(() => {
-            accessory.getService("Valve " + v).setCharacteristic(Characteristic.Active, 0);
+          let timer = valveService.getCharacteristic(Characteristic.SetDuration).value;
+          valveService.updateCharacteristic(Characteristic.RemainingDuration, timer);
+          valveService.timer = setTimeout(() => {
+            valveService.setCharacteristic(Characteristic.Active, 0);
           }, timer * 1000);
         } else {
-          accessory
-            .getService("Valve " + v)
-            .updateCharacteristic(Characteristic.RemainingDuration, 0);
-          clearTimeout(accessory.getService("Valve " + v).timer);
+          valveService.updateCharacteristic(Characteristic.RemainingDuration, 0);
+          clearTimeout(valveService.timer);
         }
       });
     } catch (err) {
@@ -1804,7 +1802,9 @@ class eWeLink {
   }
   externalBlindUpdate(accessory, params) {
     try {
-      let blindConfig, nSte;
+      let blindConfig,
+        nSte,
+        wcService = accessory.getService(Service.WindowCovering);
       if (!(blindConfig = this.cusG.get(accessory.context.hbDeviceId))) {
         throw "group config missing";
       }
@@ -1816,12 +1816,7 @@ class eWeLink {
           if (params.switch === "off") {
             return;
           }
-          nSte =
-            accessory
-              .getService(Service.WindowCovering)
-              .getCharacteristic(Characteristic.PositionState).value === 0
-              ? 1
-              : 0;
+          nSte = wcService.getCharacteristic(Characteristic.PositionState).value === 0 ? 1 : 0;
           break;
         case "twoSwitch":
           if (params.switches[0].switch === "off" && params.switches[1].switch === "off") {
@@ -1832,13 +1827,11 @@ class eWeLink {
           nSte = switchUp + switchDown;
           break;
       }
-      accessory
-        .getService(Service.WindowCovering)
+      wcService
         .updateCharacteristic(Characteristic.PositionState, nSte)
         .updateCharacteristic(Characteristic.TargetPosition, nSte * 100);
       setTimeout(() => {
-        accessory
-          .getService(Service.WindowCovering)
+        wcService
           .updateCharacteristic(Characteristic.PositionState, 2)
           .updateCharacteristic(Characteristic.CurrentPosition, nSte * 100);
       }, parseInt(blindConfig.operationTime) * 100);
@@ -1849,9 +1842,8 @@ class eWeLink {
   externalGarageUpdate(accessory, params) {
     try {
       let garageConfig,
-        oldPos = accessory
-          .getService(Service.GarageDoorOpener)
-          .getCharacteristic(Characteristic.CurrentDoorState).value,
+        gcService = accessory.getService(Service.GarageDoorOpener),
+        oldPos = gcService.getCharacteristic(Characteristic.CurrentDoorState).value,
         newPos = [0, 2].includes(oldPos) ? 3 : 2;
       if (!(garageConfig = this.cusG.get(accessory.context.hbDeviceId))) {
         throw "group config missing";
@@ -1882,14 +1874,11 @@ class eWeLink {
       }
       accessory.context.inUse = true;
       if (!garageConfig.sensorId) {
-        accessory
-          .getService(Service.GarageDoorOpener)
+        gcService
           .updateCharacteristic(Characteristic.CurrentDoorState, newPos)
           .updateCharacteristic(Characteristic.TargetDoorState, newPos - 2);
         setTimeout(() => {
-          accessory
-            .getService(Service.GarageDoorOpener)
-            .updateCharacteristic(Characteristic.CurrentDoorState, newPos - 2);
+          gcService.updateCharacteristic(Characteristic.CurrentDoorState, newPos - 2);
         }, parseInt(garageConfig.operationTime) * 100);
       }
       setTimeout(() => {
@@ -1902,7 +1891,8 @@ class eWeLink {
   }
   externalLockUpdate(accessory, params) {
     try {
-      let lockConfig;
+      let lockConfig,
+        lmService = accessory.getService(Service.LockMechanism);
       if (!(lockConfig = this.cusG.get(accessory.context.hbDeviceId))) {
         throw "group config missing";
       }
@@ -1913,13 +1903,11 @@ class eWeLink {
         return;
       }
       accessory.context.inUse = true;
-      accessory
-        .getService(Service.LockMechanism)
+      lmService
         .updateCharacteristic(Characteristic.LockCurrentState, 0)
         .updateCharacteristic(Characteristic.LockTargetState, 0);
       setTimeout(() => {
-        accessory
-          .getService(Service.LockMechanism)
+        lmService
           .updateCharacteristic(Characteristic.LockCurrentState, 1)
           .updateCharacteristic(Characteristic.LockTargetState, 1);
         accessory.context.inUse = false;
@@ -1940,10 +1928,9 @@ class eWeLink {
         batteryService.updateCharacteristic(Characteristic.StatusLowBattery, scaledBattery < 25);
       }
       let newState = params.switch === "on" ? 1 : 0,
-        oAccessory = false;
-      accessory
-        .getService(Service.ContactSensor)
-        .updateCharacteristic(Characteristic.ContactSensorState, newState);
+        oAccessory = false,
+        contactService = accessory.getService(Service.ContactSensor);
+      contactService.updateCharacteristic(Characteristic.ContactSensorState, newState);
       this.cusG.forEach(group => {
         if (group.sensorId === accessory.context.eweDeviceId && group.type === "garage") {
           if ((oAccessory = this.devicesInHB.get(group.deviceId + "SWX"))) {
@@ -1974,7 +1961,11 @@ class eWeLink {
   }
   externalFanUpdate(accessory, params) {
     try {
-      let light, status, speed;
+      let light,
+        status,
+        speed,
+        lightService = accessory.getService(Service.Lightbulb),
+        fanService = accessory.getService(Service.Fanv2);
       if (Array.isArray(params.switches)) {
         light = params.switches[0].switch === "on";
         switch (params.switches[1].switch + params.switches[2].switch + params.switches[3].switch) {
@@ -2005,9 +1996,8 @@ class eWeLink {
       } else {
         throw "unknown parameters received";
       }
-      accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, light);
-      accessory
-        .getService(Service.Fanv2)
+      lightService.updateCharacteristic(Characteristic.On, light);
+      fanService
         .updateCharacteristic(Characteristic.Active, status)
         .updateCharacteristic(Characteristic.RotationSpeed, speed);
     } catch (err) {
@@ -2021,9 +2011,10 @@ class eWeLink {
         (params.hasOwnProperty("switch") || params.hasOwnProperty("mainSwitch"))
       ) {
         let newState = params.hasOwnProperty("switch")
-          ? params.switch === "on"
-          : params.mainSwitch === "on";
-        accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, newState);
+            ? params.switch === "on"
+            : params.mainSwitch === "on",
+          switchService = accessory.getService(Service.Switch);
+        switchService.updateCharacteristic(Characteristic.On, newState);
       }
       let eveLog = {
         time: Date.now(),
@@ -2058,21 +2049,19 @@ class eWeLink {
   }
   externalOutletUpdate(accessory, params) {
     try {
+      let outletService = accessory.getService(Service.Outlet);
       if (params.hasOwnProperty("switch")) {
-        accessory
-          .getService(Service.Outlet)
-          .updateCharacteristic(Characteristic.On, params.switch === "on");
+        outletService.updateCharacteristic(Characteristic.On, params.switch === "on");
       }
       if (params.hasOwnProperty("power")) {
-        accessory
-          .getService(Service.Outlet)
-          .updateCharacteristic(
-            EveService.Characteristics.CurrentConsumption,
-            parseFloat(params.power)
-          );
-        accessory
-          .getService(Service.Outlet)
-          .updateCharacteristic(Characteristic.OutletInUse, parseFloat(params.power) > 0);
+        outletService.updateCharacteristic(
+          EveService.Characteristics.CurrentConsumption,
+          parseFloat(params.power)
+        );
+        outletService.updateCharacteristic(
+          Characteristic.OutletInUse,
+          parseFloat(params.power) > 0
+        );
         let isOn = accessory.getService(Service.Outlet).getCharacteristic(Characteristic.On).value;
         accessory.eveLogger.addEntry({
           time: Date.now(),
@@ -2080,17 +2069,16 @@ class eWeLink {
         });
       }
       if (params.hasOwnProperty("voltage")) {
-        accessory
-          .getService(Service.Outlet)
-          .updateCharacteristic(EveService.Characteristics.Voltage, parseFloat(params.voltage));
+        outletService.updateCharacteristic(
+          EveService.Characteristics.Voltage,
+          parseFloat(params.voltage)
+        );
       }
       if (params.hasOwnProperty("current")) {
-        accessory
-          .getService(Service.Outlet)
-          .updateCharacteristic(
-            EveService.Characteristics.ElectricCurrent,
-            parseFloat(params.current)
-          );
+        outletService.updateCharacteristic(
+          EveService.Characteristics.ElectricCurrent,
+          parseFloat(params.current)
+        );
       }
     } catch (err) {
       this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
@@ -2118,30 +2106,27 @@ class eWeLink {
     try {
       let newColour,
         mode,
-        isOn = false;
+        isOn = false,
+        lightService = accessory.getService(Service.Lightbulb);
       if (accessory.context.eweUIID === 22 && params.hasOwnProperty("state")) {
         isOn = params.state === "on";
       } else if (accessory.context.eweUIID !== 22 && params.hasOwnProperty("switch")) {
         isOn = params.switch === "on";
       } else {
-        isOn = accessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On).value;
+        isOn = lightService.getCharacteristic(Characteristic.On).value;
       }
       if (isOn) {
-        accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, true);
+        lightService.updateCharacteristic(Characteristic.On, true);
         switch (accessory.context.eweUIID) {
           case 36: // KING-M4
             if (params.hasOwnProperty("bright")) {
               let nb = Math.round(((params.bright - 10) * 10) / 9); // eWeLink scale is 10-100 and HomeKit scale is 0-100.
-              accessory
-                .getService(Service.Lightbulb)
-                .updateCharacteristic(Characteristic.Brightness, nb);
+              lightService.updateCharacteristic(Characteristic.Brightness, nb);
             }
             break;
           case 44: // D1
             if (params.hasOwnProperty("brightness")) {
-              accessory
-                .getService(Service.Lightbulb)
-                .updateCharacteristic(Characteristic.Brightness, params.brightness);
+              lightService.updateCharacteristic(Characteristic.Brightness, params.brightness);
             }
             break;
           case 22: // B1
@@ -2156,14 +2141,13 @@ class eWeLink {
               mode = 2;
             }
             if (mode === 2) {
-              accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, true);
+              lightService.updateCharacteristic(Characteristic.On, true);
               newColour = convert.rgb.hsv(
                 parseInt(params.channel2),
                 parseInt(params.channel3),
                 parseInt(params.channel4)
               );
-              accessory
-                .getService(Service.Lightbulb)
+              lightService
                 .updateCharacteristic(Characteristic.Hue, newColour[0])
                 .updateCharacteristic(Characteristic.Saturation, 100)
                 .updateCharacteristic(Characteristic.Brightness, 100);
@@ -2173,14 +2157,11 @@ class eWeLink {
             break;
           case 59: // L1
             if (params.hasOwnProperty("bright")) {
-              accessory
-                .getService(Service.Lightbulb)
-                .updateCharacteristic(Characteristic.Brightness, params.bright);
+              lightService.updateCharacteristic(Characteristic.Brightness, params.bright);
             }
             if (params.hasOwnProperty("colorR")) {
               newColour = convert.rgb.hsv(params.colorR, params.colorG, params.colorB);
-              accessory
-                .getService(Service.Lightbulb)
+              lightService
                 .updateCharacteristic(Characteristic.Hue, newColour[0])
                 .updateCharacteristic(Characteristic.Saturation, newColour[1]);
             }
@@ -2189,7 +2170,7 @@ class eWeLink {
             return;
         }
       } else {
-        accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, false);
+        lightService.updateCharacteristic(Characteristic.On, false);
       }
     } catch (err) {
       this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
@@ -2210,7 +2191,11 @@ class eWeLink {
           }
         }
       }
-      accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, primaryState);
+      if (!this.hiddenMasters.includes(accessory.context.eweDeviceId)) {
+        accessory
+          .getService(Service.Lightbulb)
+          .updateCharacteristic(Characteristic.On, primaryState);
+      }
     } catch (err) {
       this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
     }
@@ -2239,7 +2224,9 @@ class eWeLink {
           }
         }
       }
-      accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, primaryState);
+      if (!this.hiddenMasters.includes(accessory.context.eweDeviceId)) {
+        accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, primaryState);
+      }
     } catch (err) {
       this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
     }
diff --git a/lib/eWeLinkHTTP.js b/lib/eWeLinkHTTP.js
index dc8370a4..48ffefb8 100644
--- a/lib/eWeLinkHTTP.js
+++ b/lib/eWeLinkHTTP.js
@@ -5,124 +5,51 @@ const axios = require("axios"),
   crypto = require("crypto");
 module.exports = class eWeLinkHTTP {
   constructor(config, log) {
-    this.config = config;
     this.log = log;
-    this.debug = this.config.debug || false;
-    this.debugReqRes = this.config.debugReqRes || false;
+    this.debug = config.debug || false;
+    this.debugReqRes = config.debugReqRes || false;
+    this.username = config.username.toString();
+    this.password = config.password.toString();
+    this.hideDevFromHB = (config.hideDevFromHB || "").toString();
+    this.cCode = "+" + config.countryCode.toString().replace("+", "").replace(" ", "");
   }
-  login() {
-    let data = {
-      countryCode: "+" + this.config.countryCode.toString().replace("+", "").replace(" ", ""),
-      password: this.config.password,
-    };
-    this.config.username.includes("@")
-      ? (data.email = this.config.username)
-      : (data.phoneNumber = this.config.username);
-    if (this.debugReqRes) {
-      let msg = JSON.stringify(data, null, 2)
-        .replace(this.config.password, "**hidden**")
-        .replace(this.config.username, "**hidden**");
-      this.log.warn("Sending HTTP login request. This text is yellow for clarity.\n%s", msg);
-    } else if (this.debug) {
-      this.log("Sending HTTP login request.");
-    }
-    let dataToSign = crypto
-      .createHmac("sha256", constants.appSecret)
-      .update(JSON.stringify(data))
-      .digest("base64");
+  getHost() {
     return new Promise((resolve, reject) => {
-      axios({
-        url: "https://" + this.httpHost + "/v2/user/login",
-        method: "post",
-        headers: {
-          Authorization: "Sign " + dataToSign,
-          "Content-Type": "application/json",
-          Host: this.httpHost,
-          "X-CK-Appid": constants.appId,
-          "X-CK-Nonce": Math.random().toString(36).substr(2, 8),
+      let params = {
+          appid: constants.appId,
+          country_code: this.cCode,
+          nonce: Math.random().toString(36).substr(2, 8),
+          ts: Math.floor(new Date().getTime() / 1000),
+          version: 8,
         },
-        data,
-      })
-        .then(res => {
-          let body = res.data;
-          if (
-            body.hasOwnProperty("error") &&
-            body.error === 10004 &&
-            body.hasOwnProperty("data") &&
-            body.data.hasOwnProperty("region")
-          ) {
-            switch (body.data.region) {
-              case "eu":
-              case "us":
-              case "as":
-                this.httpHost = body.data.region + "-apia.coolkit.cc";
-                break;
-              case "cn":
-                this.httpHost = "cn-apia.coolkit.cn";
-                break;
-              default:
-                throw "No valid region received - [" + body.data.region + "].";
-            }
-            if (this.debug) {
-              this.log("New HTTP API host received [%s].", this.httpHost);
-            }
-            resolve(this.login());
-            return;
-          }
-          if (!body.data.at) {
-            throw (
-              "Server did not respond with an authentication token. Please double check your eWeLink username and password in the Homebridge configuration.\n" +
-              JSON.stringify(body, null, 2)
-            );
-          }
-          this.aToken = body.data.at;
-          this.apiKey = body.data.user.apikey;
-          resolve({
-            aToken: body.data.at,
-            apiKey: body.data.user.apikey,
-            httpHost: this.httpHost,
-          });
-        })
-        .catch(err => {
-          reject(err);
+        dataToSign = [];
+      Object.keys(params).forEach(k => {
+        dataToSign.push({
+          key: k,
+          value: params.k,
         });
-    });
-  }
-  getHost() {
-    let data = {
-        appid: constants.appId,
-        country_code: this.config.countryCode.toString().replace("+", "").replace(" ", ""),
-        nonce: Math.random().toString(36).substr(2, 8),
-        ts: Math.floor(new Date().getTime() / 1000),
-        version: 8,
-      },
-      dataToSign = [];
-    Object.keys(data).forEach(function (key) {
-      dataToSign.push({
-        key: key,
-        value: data[key],
       });
-    });
-    dataToSign.sort(function (a, b) {
-      return a.key < b.key ? -1 : 1;
-    });
-    dataToSign = dataToSign
-      .map(function (kv) {
-        return kv.key + "=" + kv.value;
-      })
-      .join("&");
-    dataToSign = crypto
-      .createHmac("sha256", constants.appSecret)
-      .update(dataToSign)
-      .digest("base64");
-    return new Promise((resolve, reject) => {
+      dataToSign.sort((a, b) => (a.key < b.key ? -1 : 1));
+      dataToSign = dataToSign.map(k => k.key + "=" + k.value).join("&");
+      dataToSign = crypto
+        .createHmac("sha256", constants.appSecret)
+        .update(dataToSign)
+        .digest("base64");
+      if (this.debugReqRes) {
+        this.log.warn(
+          "Sending HTTP getHost request. This text is yellow for clarity.\n%s",
+          JSON.stringify(params, null, 2)
+        );
+      } else if (this.debug) {
+        this.log("Sending HTTP getHost request.");
+      }
       axios
         .get("https://api.coolkit.cc:8080/api/user/region", {
           headers: {
             Authorization: "Sign " + dataToSign,
             "Content-Type": "application/json",
           },
-          params: data,
+          params,
         })
         .then(res => {
           let body = res.data;
@@ -147,10 +74,87 @@ module.exports = class eWeLinkHTTP {
           resolve(this.httpHost);
         })
         .catch(err => {
-          reject(err);
+          if (err.hasOwnProperty("code") && ["ENOTFOUND", "ETIMEDOUT"].includes(err.code)) {
+            this.log.warn("Unable to reach eWeLink. Retrying in 30 seconds.");
+            this.delay().then(() => resolve(this.getHost()));
+          } else {
+            reject(err.message || err);
+          }
         });
     });
   }
+  login() {
+    return new Promise((resolve, reject) => {
+      let data = {
+        countryCode: this.cCode,
+        password: this.password,
+      };
+      this.username.includes("@")
+        ? (data.email = this.username)
+        : (data.phoneNumber = this.username);
+      if (this.debugReqRes) {
+        let msg = JSON.stringify(data, null, 2)
+          .replace(this.password, "**hidden**")
+          .replace(this.username, "**hidden**");
+        this.log.warn("Sending HTTP login request. This text is yellow for clarity.\n%s", msg);
+      } else if (this.debug) {
+        this.log("Sending HTTP login request.");
+      }
+      let dataToSign = crypto
+        .createHmac("sha256", constants.appSecret)
+        .update(JSON.stringify(data))
+        .digest("base64");
+      axios
+        .post("https://" + this.httpHost + "/v2/user/login", data, {
+          headers: {
+            Authorization: "Sign " + dataToSign,
+            "Content-Type": "application/json",
+            Host: this.httpHost,
+            "X-CK-Appid": constants.appId,
+            "X-CK-Nonce": Math.random().toString(36).substr(2, 8),
+          },
+        })
+        .then(res => {
+          let body = res.data;
+          if (
+            body.hasOwnProperty("error") &&
+            body.error === 10004 &&
+            body.hasOwnProperty("data") &&
+            body.data.hasOwnProperty("region")
+          ) {
+            let givenRegion = body.data.region;
+            switch (givenRegion) {
+              case "eu":
+              case "us":
+              case "as":
+                this.httpHost = givenRegion + "-apia.coolkit.cc";
+                break;
+              case "cn":
+                this.httpHost = "cn-apia.coolkit.cn";
+                break;
+              default:
+                throw "No valid region received - [" + givenRegion + "].";
+            }
+            if (this.debug) {
+              this.log("New HTTP API host received [%s].", this.httpHost);
+            }
+            resolve(this.login());
+            return;
+          }
+          if (!body.data.at) {
+            throw "No auth token received.\n" + JSON.stringify(body, null, 2);
+          }
+          this.aToken = body.data.at;
+          this.apiKey = body.data.user.apikey;
+          resolve({
+            aToken: this.aToken,
+            apiKey: this.apiKey,
+            httpHost: this.httpHost,
+          });
+        })
+        .catch(err => reject(err.message || err));
+    });
+  }
   getDevices() {
     return new Promise((resolve, reject) => {
       axios
@@ -165,18 +169,82 @@ module.exports = class eWeLinkHTTP {
         })
         .then(res => {
           let body = res.data;
-          if (!body.hasOwnProperty("error") || (body.hasOwnProperty("error") && body.error !== 0)) {
+          if (
+            !body.hasOwnProperty("data") ||
+            !body.hasOwnProperty("error") ||
+            (body.hasOwnProperty("error") && body.error !== 0)
+          ) {
             throw JSON.stringify(body, null, 2);
           }
           let deviceList = [];
           if (body.data.thingList && body.data.thingList.length > 0) {
             body.data.thingList.forEach(device => deviceList.push(device.itemData));
           }
+          deviceList
+            .filter(d => d.hasOwnProperty("extra") && d.extra.hasOwnProperty("uiid"))
+            .filter(d => !this.hideDevFromHB.includes(d.deviceid));
           resolve(deviceList);
         })
         .catch(err => {
-          reject(err);
+          if (err.hasOwnProperty("code") && ["ENOTFOUND", "ETIMEDOUT"].includes(err.code)) {
+            this.log.warn("Unable to reach eWeLink. Retrying in 30 seconds.");
+            this.delay().then(() => resolve(this.getDevices()));
+          } else {
+            reject(err.message || err);
+          }
+        });
+    });
+  }
+
+  getDevice(deviceId) {
+    return new Promise((resolve, reject) => {
+      axios
+        .post(
+          "https://" + this.httpHost + "/v2/device/thing",
+          {
+            thingList: [
+              {
+                itemType: 1,
+                id: deviceId,
+              },
+            ],
+          },
+          {
+            headers: {
+              Authorization: "Bearer " + this.aToken,
+              "Content-Type": "application/json",
+              Host: this.httpHost,
+              "X-CK-Appid": constants.appId,
+              "X-CK-Nonce": Math.random().toString(36).substr(2, 8),
+            },
+          }
+        )
+        .then(res => {
+          let body = res.data;
+          if (
+            !body.hasOwnProperty("data") ||
+            !body.hasOwnProperty("error") ||
+            (body.hasOwnProperty("error") && body.error !== 0)
+          ) {
+            throw JSON.stringify(body, null, 2);
+          }
+          if (body.data.thingList && body.data.thingList.length === 1) {
+            resolve(body.data.thingList[0].itemData);
+          } else {
+            throw "device not found in eWeLink";
+          }
+        })
+        .catch(err => {
+          if (err.hasOwnProperty("code") && ["ENOTFOUND", "ETIMEDOUT"].includes(err.code)) {
+            this.log.warn("Unable to reach eWeLink. Retrying in 30 seconds.");
+            this.delay().then(() => resolve(this.getDevice(deviceId)));
+          } else {
+            reject(err.message || err);
+          }
         });
     });
   }
+  delay() {
+    return new Promise(resolve => setTimeout(resolve, 30000));
+  }
 };
diff --git a/lib/eWeLinkLAN.js b/lib/eWeLinkLAN.js
index 9701fa06..c996e682 100644
--- a/lib/eWeLinkLAN.js
+++ b/lib/eWeLinkLAN.js
@@ -1,19 +1,18 @@
 /* jshint esversion: 9, -W030, node: true */
 "use strict";
 const axios = require("axios"),
-  constants = require("./constants"),
+  cns = require("./constants"),
   crypto = require("crypto"),
   dns = require("node-dns-sd"),
   eventemitter = require("events");
 module.exports = class eWeLinkLAN {
   constructor(config, log, devices) {
-    this.config = config;
     this.log = log;
     this.devices = devices;
-    this.ipOverrides = this.config.ipOverride || {};
-    let deviceMap = new Map();
+    this.ipOverrides = config.ipOverride || {};
+    this.deviceMap = new Map();
     devices.forEach(device => {
-      deviceMap.set(device.deviceid, {
+      this.deviceMap.set(device.deviceid, {
         apiKey: device.devicekey,
         online: this.ipOverrides.hasOwnProperty(device.deviceid) ? true : false,
         ip: this.ipOverrides.hasOwnProperty(device.deviceid)
@@ -21,9 +20,8 @@ module.exports = class eWeLinkLAN {
           : null,
       });
     });
-    this.deviceMap = deviceMap;
-    this.debug = this.config.debug || false;
-    this.debugReqRes = this.config.debugReqRes || false;
+    this.debug = config.debug || false;
+    this.debugReqRes = config.debugReqRes || false;
     this.emitter = new eventemitter();
   }
   getHosts() {
@@ -53,9 +51,7 @@ module.exports = class eWeLinkLAN {
             count: onlineCount,
           });
         })
-        .catch(err => {
-          reject(err);
-        });
+        .catch(err => reject(err));
     });
   }
   startMonitor() {
@@ -101,16 +97,16 @@ module.exports = class eWeLinkLAN {
             }
             for (let param in params) {
               if (params.hasOwnProperty(param)) {
-                if (!constants.paramsToKeep.includes(param.replace(/[0-9]/g, ""))) {
+                if (!cns.paramsToKeep.includes(param.replace(/[0-9]/g, ""))) {
                   delete params[param];
                 }
               }
             }
             if (Object.keys(params).length > 0) {
               params.updateSource = "LAN";
+              params.online = true;
               let returnTemplate = {
                 deviceid: rdata.id,
-                action: "update",
                 params,
               };
               if (this.debugReqRes) {
@@ -127,18 +123,14 @@ module.exports = class eWeLinkLAN {
     return new Promise((resolve, reject) => {
       dns
         .startMonitoring()
-        .then(() => {
-          resolve();
-        })
-        .catch(err => {
-          reject(err);
-        });
+        .then(() => resolve())
+        .catch(err => reject(err));
     });
   }
   sendUpdate(json) {
     return new Promise((resolve, reject) => {
       if (!this.deviceMap.get(json.deviceid).online) {
-        throw "device does not support LAN mode";
+        throw "device isn't reachable by LAN mode";
       }
       let apiKey,
         suffix,
@@ -190,9 +182,7 @@ module.exports = class eWeLinkLAN {
             }
             throw res.data;
           })
-          .catch(err => {
-            reject(err);
-          });
+          .catch(err => reject(err));
       }
     });
   }
diff --git a/lib/eWeLinkWS.js b/lib/eWeLinkWS.js
index 70e0a209..1d8cab1c 100644
--- a/lib/eWeLinkWS.js
+++ b/lib/eWeLinkWS.js
@@ -1,9 +1,10 @@
 /* jshint esversion: 9, -W030, node: true */
 "use strict";
 const axios = require("axios"),
-  constants = require("./constants"),
+  cns = require("./constants"),
   eventemitter = require("events"),
-  ws = require("ws");
+  ws = require("ws"),
+  wsp = require("websocket-as-promised");
 module.exports = class eWeLinkWS {
   constructor(config, log, res) {
     this.config = config;
@@ -27,7 +28,7 @@ module.exports = class eWeLinkWS {
           "Content-Type": "application/json",
         },
         data: {
-          appid: constants.appId,
+          appid: cns.appId,
           nonce: Math.random().toString(36).substr(2, 8),
           ts: Math.floor(new Date().getTime() / 1000),
           version: 8,
@@ -45,26 +46,47 @@ module.exports = class eWeLinkWS {
           resolve(body.domain);
         })
         .catch(err => {
-          reject(err);
+          if (err.hasOwnProperty("code") && ["ENOTFOUND", "ETIMEDOUT"].includes(err.code)) {
+            this.log.warn("Unable to reach eWeLink. Retrying in 30 seconds.");
+            this.delay().then(() => resolve(this.getDevices()));
+          } else {
+            reject(err.message || err);
+          }
         });
     });
   }
   login() {
-    this.ws = new ws("wss://" + this.wsHost + ":8080/api/ws");
-    this.ws.on("open", () => {
+    this.wsp = new wsp("wss://" + this.wsHost + ":8080/api/ws", {
+      createWebSocket: url => new ws(url),
+      extractMessageData: event => event,
+      attachRequestId: (data, requestId) =>
+        Object.assign(
+          {
+            sequence: requestId,
+          },
+          data
+        ),
+      extractRequestId: data => data && data.sequence,
+      packMessage: data => JSON.stringify(data),
+      unpackMessage: data => {
+        return data === "pong" ? data : JSON.parse(data);
+      },
+    });
+    this.wsp.open();
+    this.wsp.onOpen.addListener(() => {
       this.wsIsOpen = true;
-      let payload = {
-        action: "userOnline",
-        apikey: this.apiKey,
-        appid: constants.appId,
-        at: this.aToken,
-        nonce: Math.random().toString(36).substr(2, 8),
-        sequence: Math.floor(new Date()),
-        ts: Math.floor(new Date() / 1000),
-        userAgent: "app",
-        version: 8,
-      };
-      this.ws.send(JSON.stringify(payload));
+      let sequence = Math.floor(new Date()).toString(),
+        payload = {
+          action: "userOnline",
+          apikey: this.apiKey,
+          appid: cns.appId,
+          at: this.aToken,
+          nonce: Math.random().toString(36).substr(2, 8),
+          sequence,
+          ts: Math.floor(new Date() / 1000),
+          userAgent: "app",
+          version: 8,
+        };
       if (this.debugReqRes) {
         let msg = JSON.stringify(payload, null, 2)
           .replace(this.aToken, "**hidden**")
@@ -73,79 +95,55 @@ module.exports = class eWeLinkWS {
       } else if (this.debug) {
         this.log("Sending WS login request.");
       }
+      this.wsp
+        .sendRequest(payload, {
+          requestId: sequence,
+        })
+        .then(res => {
+          if (
+            res.hasOwnProperty("config") &&
+            res.config.hb &&
+            res.config.hbInterval &&
+            !this.hbInterval
+          ) {
+            this.hbInterval = setInterval(() => {
+              this.wsp.send("ping");
+            }, (res.config.hbInterval + 7) * 1000);
+          } else {
+            throw "Unknown parameters received";
+          }
+        })
+        .catch(err => {
+          this.log.error("WS login failed [%s].", err);
+        });
     });
-    this.ws.on("message", m => {
-      if (m === "pong") {
-        return;
-      }
-      let device;
-      try {
-        device = JSON.parse(m);
-      } catch (e) {
-        this.log.warn("An error occured reading the web socket message [%s]", e);
-        return;
-      }
-      // for requestUpdate response
-      if (
-        device.hasOwnProperty("deviceid") &&
-        device.hasOwnProperty("params") &&
-        device.hasOwnProperty("error") &&
-        device.error === 0
-      ) {
+    this.wsp.onUnpackedMessage.addListener(device => {
+      if (device === "pong") return;
+      let onlineStatus = true;
+      if (!device.hasOwnProperty("params")) device.params = {};
+      if (device.hasOwnProperty("deviceid") && device.hasOwnProperty("error")) {
         device.action = "update";
-      } else if (
-        device.hasOwnProperty("deviceid") &&
-        device.hasOwnProperty("error") &&
-        device.error === 504
-      ) {
-        device.action = "sysmsg";
-        device.params = {
-          online: false,
-        };
+        onlineStatus = device.error === 0;
       }
-      // for external updates
-      if (
-        device.hasOwnProperty("config") &&
-        device.config.hb &&
-        device.config.hbInterval &&
-        !this.hbInterval
-      ) {
-        this.hbInterval = setInterval(() => {
-          this.ws.send("ping");
-        }, (device.config.hbInterval + 7) * 1000);
-      } else if (device.hasOwnProperty("action")) {
+      if (device.hasOwnProperty("action")) {
         switch (device.action) {
+          case "update":
           case "sysmsg":
-            device.params.updateSource = "WS";
-            let returnTemplate = {
-              deviceid: device.deviceid,
-              action: "sysmsg",
-              params: device.params,
-            };
-            if (this.debugReqRes) {
-              let msg = JSON.stringify(returnTemplate, null, 2).replace(
-                device.deviceid,
-                "**hidden**"
-              );
-              this.log("WS message received.\n%s", msg);
-            } else if (this.debug) {
-              this.log("WS message received.");
+            if (device.action === "sysmsg" && device.params.hasOwnProperty("online")) {
+              onlineStatus = device.params.online;
             }
-            this.emitter.emit("update", returnTemplate);
-            break;
-          case "update":
             for (let param in device.params) {
               if (device.params.hasOwnProperty(param)) {
-                if (!constants.paramsToKeep.includes(param.replace(/[0-9]/g, ""))) {
+                if (!cns.paramsToKeep.includes(param.replace(/[0-9]/g, ""))) {
                   delete device.params[param];
                 }
               }
             }
+            device.params.online = onlineStatus;
+            device.params.updateSource = "WS";
             if (Object.keys(device.params).length > 0) {
-              device.params.updateSource = "WS";
               let returnTemplate = {
                 deviceid: device.deviceid,
-                action: "update",
                 params: device.params,
               };
               if (this.debugReqRes) {
@@ -177,16 +175,14 @@ module.exports = class eWeLinkWS {
         }
       }
     });
-    this.ws.on("close", (e, m) => {
-      if (m === "Stopping Homebridge") {
+    this.wsp.onClose.addListener(e => {
+      if (e.reason === "Stopping Homebridge") {
         this.log("Web socket gracefully closed.");
       } else {
-        this.log.warn("Web socket closed - [%s - %s].", e, m);
+        this.log.warn("Web socket closed - [%s - %s].", e.code, e.reason);
         if (e !== 1000) {
           this.log("Web socket will try to reconnect in five seconds.");
-          setTimeout(() => {
-            this.login();
-          }, 5000);
+          setTimeout(() => this.login(), 5000);
         } else {
           this.log("Please try restarting Homebridge so that this plugin can work again.");
         }
@@ -196,89 +192,88 @@ module.exports = class eWeLinkWS {
         clearInterval(this.hbInterval);
         this.hbInterval = null;
       }
-      this.ws.removeAllListeners();
+      this.wsp.removeAllListeners();
     });
-    this.ws.on("error", e => {
+    this.wsp.onError.addListener(e => {
       this.log.error("Web socket error - [%s].", e);
       if (e.code === "ECONNREFUSED") {
         this.log.warn(
           "Web socket will try to reconnect in five seconds then try the command again."
         );
-        this.ws.removeAllListeners();
-        setTimeout(() => {
-          this.login();
-        }, 5000);
+        this.wsp.removeAllListeners();
+        setTimeout(() => this.login(), 5000);
       } else {
         this.log.warn("If this was unexpected then please try restarting Homebridge.");
       }
     });
   }
   sendUpdate(json) {
-    json = {
-      ...json,
-      ...{
-        action: "update",
-        sequence: Math.floor(new Date()),
-        userAgent: "app",
-      },
-    };
-    let sendOperation = req => {
-      if (!this.wsIsOpen) {
-        setTimeout(() => {
-          sendOperation(req);
-        }, 280);
-        return;
-      }
-      if (this.ws) {
-        this.ws.send(req);
-        if (this.debugReqRes) {
-          let msg = JSON.stringify(json, null, 2)
-            .replace(json.apikey, "**hidden**")
-            .replace(json.apiKey, "**hidden**")
-            .replace(json.deviceid, "**hidden**");
-          this.log.warn("WS message sent. This text is yellow for clarity.\n%s", msg);
-        } else if (this.debug) {
-          this.log("WS message sent.");
+    return new Promise((resolve, reject) => {
+      let sequence = Math.floor(new Date()).toString();
+      json = {
+        ...json,
+        ...{
+          action: "update",
+          sequence,
+          userAgent: "app",
+        },
+      };
+      let sendOperation = () => {
+        this.wsp
+          .sendRequest(json, {
+            requestId: sequence,
+          })
+          .then(device => {
+            if (this.debugReqRes) {
+              let msg = JSON.stringify(json, null, 2)
+                .replace(json.apikey, "**hidden**")
+                .replace(json.apiKey, "**hidden**")
+                .replace(json.deviceid, "**hidden**");
+              this.log.warn("WS message sent. This text is yellow for clarity.\n%s", msg);
+            } else if (this.debug) {
+              this.log("WS message sent.");
+            }
+            device.error = device.hasOwnProperty("error") ? device.error : 504; // mimic ewelink device offline
+            switch (device.error) {
+              case 0:
+                resolve();
+                break;
+              case 504:
+              default:
+                throw "Unknown response";
+            }
+          })
+          .catch(err => reject("Device update failed [" + err + "]."));
+      };
+      let checkToSend = () => {
+        if (this.wsp && this.wsIsOpen) {
+          sendOperation();
+        } else {
+          this.delay(2500).then(() => {
+            if (this.debug) {
+              this.log.warn("Will resend command when WS is reconnected.");
+            }
+            checkToSend();
+          });
         }
-        return;
-      }
-      this.delaySend = this.delaySend <= 0 ? 0 : (this.delaySend -= 280);
-    };
-    let string = JSON.stringify(json);
-    if (this.wsIsOpen) {
-      setTimeout(sendOperation, this.delaySend, string);
-      this.delaySend += 280;
-    } else {
-      this.log.warn("Web socket is currently reconnecting. Command will be resent.");
-      let interval,
-        waitToSend = req => {
-          if (this.wsIsOpen) {
-            clearInterval(interval);
-            sendOperation(req);
-          }
-        };
-      interval = setInterval(waitToSend, 2500, string);
-    }
+      };
+      checkToSend();
+    });
   }
   requestUpdate(accessory) {
-    let json = {
-        action: "query",
-        apikey: accessory.context.eweApiKey,
-        deviceid: accessory.context.eweDeviceId,
-        params: [],
-        sequence: Math.floor(new Date()),
-        ts: 0,
-        userAgent: "app",
-      },
-      sendOperation = req => {
-        if (!this.wsIsOpen) {
-          setTimeout(() => {
-            sendOperation(req);
-          }, 280);
-          return;
-        }
-        if (this.ws) {
-          this.ws.send(req);
+    return new Promise(resolve => {
+      let sequence = Math.floor(new Date()).toString(),
+        json = {
+          action: "query",
+          apikey: accessory.context.eweApiKey,
+          deviceid: accessory.context.eweDeviceId,
+          params: [],
+          sequence,
+          ts: 0,
+          userAgent: "app",
+        },
+        sendOperation = () => {
+          this.wsp.send(json);
           if (this.debugReqRes) {
             let msg = JSON.stringify(json, null, 2)
               .replace(json.apikey, "**hidden**")
@@ -288,32 +283,31 @@ module.exports = class eWeLinkWS {
           } else if (this.debug) {
             this.log("WS message sent.");
           }
-          return;
-        }
-        this.delaySend = this.delaySend <= 0 ? 0 : (this.delaySend -= 280);
-      },
-      string = JSON.stringify(json);
-    if (this.wsIsOpen) {
-      setTimeout(sendOperation, this.delaySend, string);
-      this.delaySend += 280;
-    } else {
-      this.log.warn("Web socket is currently reconnecting. Command will be resent.");
-      let interval,
-        waitToSend = req => {
-          if (this.wsIsOpen) {
-            clearInterval(interval);
-            sendOperation(req);
+        },
+        checkToSend = () => {
+          if (this.wsp && this.wsIsOpen) {
+            sendOperation();
+          } else {
+            this.delay(2500).then(() => {
+              if (this.debug) {
+                this.log.warn("Will resend command when WS is reconnected.");
+              }
+              checkToSend();
+            });
           }
         };
-      interval = setInterval(waitToSend, 2500, string);
-    }
+      checkToSend();
+    });
   }
   receiveUpdate(f) {
     this.emitter.addListener("update", f);
   }
   closeConnection() {
     if (this.ws && this.wsIsOpen) {
-      this.ws.close(1000, "Stopping Homebridge");
+      this.wsp.close(1000, "Stopping Homebridge");
     }
   }
+  delay(ms) {
+    return new Promise(resolve => setTimeout(resolve, ms));
+  }
 };
diff --git a/package-lock.json b/package-lock.json
index 93c75ca5..f6b09335 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -122,6 +122,11 @@
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
     },
+    "color-temp": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/color-temp/-/color-temp-0.0.2.tgz",
+      "integrity": "sha1-GxTzI9nLdq0fn1p140DWHW2WA/s="
+    },
     "correcting-interval": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/correcting-interval/-/correcting-interval-2.0.0.tgz",
diff --git a/package.json b/package.json
index 7750d662..b54b8f8c 100644
--- a/package.json
+++ b/package.json
@@ -59,6 +59,7 @@
   "dependencies": {
     "axios": "0.20.0",
     "color-convert": "2.0.1",
+    "color-temp": "0.0.2",
     "correcting-interval": "2.0.0",
     "fakegato-history": "0.5.6",
     "homebridge-lib": "4.7.14",

From f3528162a218eb9015e5e641951609ed53eb4074 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 20 Sep 2020 13:10:32 +0100
Subject: [PATCH 0172/3183] 3.0.0-0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index f6b09335..b2ff8a53 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "2.27.2",
+  "version": "3.0.0-0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index b54b8f8c..52cd1d9a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "2.27.2",
+  "version": "3.0.0-0",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From b7bb52fe7a8cf74f486b1be8774b1704c6c27fb6 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 20 Sep 2020 15:12:43 +0100
Subject: [PATCH 0173/3183] update deps

---
 package-lock.json | 54 +++++++++++++++++++++++++++++++++++------------
 package.json      |  2 +-
 2 files changed, 41 insertions(+), 15 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b2ff8a53..e100f5ec 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -351,9 +351,9 @@
       "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg=="
     },
     "homebridge-lib": {
-      "version": "4.7.14",
-      "resolved": "https://registry.npmjs.org/homebridge-lib/-/homebridge-lib-4.7.14.tgz",
-      "integrity": "sha512-8eUGTVrCRd7WHwEH49CgqYUu2q9WjeTVDnEA5WXL2ZvPevTMCck5GcVIXtvVWxr9we8Ay0ybFp0N5RRlrIzH/g==",
+      "version": "4.7.15",
+      "resolved": "https://registry.npmjs.org/homebridge-lib/-/homebridge-lib-4.7.15.tgz",
+      "integrity": "sha512-654DQEwyhcHbZ1++1qv0k4lhoYWaZsHcriFRts4XHnGFQOgdO1G6VyP3hUjt/+y5FemoRVjqf6Tv0/IKNPDC4w==",
       "requires": {
         "bonjour": "^3.5.0",
         "chalk": "^4.1.0",
@@ -362,11 +362,11 @@
       },
       "dependencies": {
         "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
+          "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
           "requires": {
-            "ms": "^2.1.1"
+            "ms": "2.1.2"
           }
         },
         "ms": {
@@ -420,6 +420,11 @@
       "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz",
       "integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g=="
     },
+    "is-negative-zero": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.0.tgz",
+      "integrity": "sha1-lVOxIbD6wohp2p7UWeIMdUN4hGE="
+    },
     "is-regex": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.1.tgz",
@@ -540,14 +545,35 @@
       "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="
     },
     "object.assign": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz",
-      "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==",
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.1.tgz",
+      "integrity": "sha512-VT/cxmx5yaoHSOTSyrCygIDFco+RsibY2NM0a4RdEeY/4KgqezwFtK1yr3U67xYhqJSlASm2pKhLVzPj2lr4bA==",
       "requires": {
-        "define-properties": "^1.1.2",
-        "function-bind": "^1.1.1",
-        "has-symbols": "^1.0.0",
-        "object-keys": "^1.0.11"
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.18.0-next.0",
+        "has-symbols": "^1.0.1",
+        "object-keys": "^1.1.1"
+      },
+      "dependencies": {
+        "es-abstract": {
+          "version": "1.18.0-next.0",
+          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.0.tgz",
+          "integrity": "sha512-elZXTZXKn51hUBdJjSZGYRujuzilgXo8vSPQzjGYXLvSlGiCo8VO8ZGV3kjo9a0WNJJ57hENagwbtlRuHuzkcQ==",
+          "requires": {
+            "es-to-primitive": "^1.2.1",
+            "function-bind": "^1.1.1",
+            "has": "^1.0.3",
+            "has-symbols": "^1.0.1",
+            "is-callable": "^1.2.0",
+            "is-negative-zero": "^2.0.0",
+            "is-regex": "^1.1.1",
+            "object-inspect": "^1.8.0",
+            "object-keys": "^1.1.1",
+            "object.assign": "^4.1.0",
+            "string.prototype.trimend": "^1.0.1",
+            "string.prototype.trimstart": "^1.0.1"
+          }
+        }
       }
     },
     "prettier": {
diff --git a/package.json b/package.json
index 52cd1d9a..0ebc8b68 100644
--- a/package.json
+++ b/package.json
@@ -62,7 +62,7 @@
     "color-temp": "0.0.2",
     "correcting-interval": "2.0.0",
     "fakegato-history": "0.5.6",
-    "homebridge-lib": "4.7.14",
+    "homebridge-lib": "4.7.15",
     "node-dns-sd": "0.4.1",
     "ws": "7.3.1"
   },

From 63799d1d7cbe48004aa0ff8a88a6caf40acf97d8 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 20 Sep 2020 15:13:31 +0100
Subject: [PATCH 0174/3183] syntax error

---
 lib/eWeLinkWS.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/eWeLinkWS.js b/lib/eWeLinkWS.js
index 1d8cab1c..fd077cff 100644
--- a/lib/eWeLinkWS.js
+++ b/lib/eWeLinkWS.js
@@ -303,7 +303,7 @@ module.exports = class eWeLinkWS {
     this.emitter.addListener("update", f);
   }
   closeConnection() {
-    if (this.ws && this.wsIsOpen) {
+    if (this.wsp && this.wsIsOpen) {
       this.wsp.close(1000, "Stopping Homebridge");
     }
   }

From b08561b41b86cdfe26a72da48126fcf85ede6972 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 20 Sep 2020 15:13:46 +0100
Subject: [PATCH 0175/3183] batt

---
 config.schema.json |  9 +++++++++
 lib/eWeLink.js     | 10 ++++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index e9a2b321..e1d15c4d 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -58,6 +58,14 @@
         "description": "A list of device channels to hide from Homebridge. For example '10009553c8SW1' or multiple channels separated with a comma '10009553c8SW1,10009553c9SW2'. Only channels from switches, lights and irrigation valves can be hidden.",
         "default": ""
       },
+      "lowBattThreshold": {
+        "type": "integer",
+        "title": "Low Battery Threshold",
+        "description": "Homebridge will set the low battery status for supported devices when the device battery reaches this pecentage level.",
+        "default": 25,
+        "minimum": 5,
+        "maximum": 50
+      },
       "sensorTimeLength": {
         "type": "integer",
         "title": "Sensor Length",
@@ -233,6 +241,7 @@
         "hideDevFromHB",
         "hideMasters",
         "hideFromHB",
+        "lowBattThreshold",
         "sensorTimeLength",
         "sensorTimeDifference",
         "valveTimeLength",
diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index d8b093a1..16af13da 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -1925,7 +1925,10 @@ class eWeLink {
             accessory.addService(Service.BatteryService),
           scaledBattery = Math.round(params.battery * 33.3);
         batteryService.updateCharacteristic(Characteristic.BatteryLevel, scaledBattery);
-        batteryService.updateCharacteristic(Characteristic.StatusLowBattery, scaledBattery < 25);
+        batteryService.updateCharacteristic(
+          Characteristic.StatusLowBattery,
+          scaledBattery < (this.config.lowBattThreshold || 25)
+        );
       }
       let newState = params.switch === "on" ? 1 : 0,
         oAccessory = false,
@@ -2372,7 +2375,10 @@ class eWeLink {
           accessory.getService(Service.BatteryService) ||
           accessory.addService(Service.BatteryService);
         batteryService.updateCharacteristic(Characteristic.BatteryLevel, params.battery);
-        batteryService.updateCharacteristic(Characteristic.StatusLowBattery, params.battery < 25);
+        batteryService.updateCharacteristic(
+          Characteristic.StatusLowBattery,
+          params.battery < (this.config.lowBattThreshold || 25)
+        );
       }
       switch (accessory.context.eweUIID) {
         case 1000:

From ae2e12a83a2c3cda25fdc80d373f29c31e7b89a2 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 21 Sep 2020 11:31:58 +0100
Subject: [PATCH 0176/3183] 3.0.0-1 bump

---
 lib/constants.js   |   2 +-
 lib/eWeLink.js     | 386 ++++++++++++++++++++-------------------------
 lib/eWeLinkHTTP.js |  13 +-
 lib/eWeLinkWS.js   |  11 +-
 package-lock.json  |  70 ++++----
 package.json       |   1 +
 6 files changed, 227 insertions(+), 256 deletions(-)

diff --git a/lib/constants.js b/lib/constants.js
index a89a48c0..faa906f4 100644
--- a/lib/constants.js
+++ b/lib/constants.js
@@ -6,7 +6,7 @@ module.exports = {
   // appSecret: "mXLOjea0woSMvK9gw7Fjsy7YlFO4iSu6",
   appSecret: "6Nz4n0xA8s8qdxQf2GqurZj2Fs55FUvM",
   devicesHideable: ["switch", "light"],
-  devicesNonLAN: [22, 59, 102],
+  devicesNonLAN: [22, 28, 59, 102],
   devicesSingleSwitch: [1, 5, 6, 14, 15, 22, 24, 27, 32, 36, 44, 59],
   devicesSingleSwitchParams: ["switch"],
   devicesMultiSwitch: [2, 3, 4, 7, 8, 9, 29, 30, 31, 34, 41],
diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index 16af13da..fd4aa371 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -166,7 +166,9 @@ class eWeLink {
     else if (cns.devicesThermostat.includes(device.extra.uiid)) {
       accessory = this.devicesInHB.has(device.deviceid + "SWX")
         ? this.devicesInHB.get(device.deviceid + "SWX")
-        : this.addAccessory(device, device.deviceid + "SWX", "thermostat");
+        : this.addAccessory(device, device.deviceid + "SWX", "thermostat", false, {
+            sensorType: device.params.sensorType,
+          });
     }
 
     //*** OUTLETS ***\\
@@ -276,55 +278,94 @@ class eWeLink {
 
     //*** RF BRIDGES ***\\
     else if (cns.devicesRFBridge.includes(device.extra.uiid)) {
+      let accessory,
+        rfChlCounter = 0,
+        rfMap = [];
+
+      if (device.hasOwnProperty("tags") && device.tags.hasOwnProperty("zyx_info")) {
+        device.tags.zyx_info.forEach(remote =>
+          rfMap.push({
+            name: remote.name,
+            type: remote.remote_type,
+            buttons: Object.assign({}, ...remote.buttonName),
+          })
+        );
+      }
+
       accessory = this.devicesInHB.has(device.deviceid + "SW0")
         ? this.devicesInHB.get(device.deviceid + "SW0")
-        : this.addAccessory(device, device.deviceid + "SW0", "rf_pri");
-      if (Object.keys((device.tags && device.tags.zyx_info) || []).length > 0) {
-        let rfBridgeChange = false;
-        for (let i = 1; i <= Object.keys(device.tags.zyx_info).length; i++) {
-          let oAccessory = this.devicesInHB.has(device.deviceid + "SW" + i)
-            ? this.devicesInHB.get(device.deviceid + "SW" + i)
-            : this.addAccessory(device, device.deviceid + "SW" + i, "rf_sub");
-          oAccessory
-            .getService(Service.AccessoryInformation)
-            .setCharacteristic(Characteristic.FirmwareRevision, device.params.fwVersion);
-          oAccessory.context.reachableWAN = device.online;
-          oAccessory.context.reachableLAN = this.lanDevices.get(device.deviceid).online || false;
-          this.devicesInHB.set(oAccessory.context.hbDeviceId, oAccessory);
-          if (oAccessory.context.sensorType !== "button" && !rfBridgeChange) {
-            let ct = this.cusS.has(oAccessory.context.hbDeviceId)
-              ? this.cusS.get(oAccessory.context.hbDeviceId).type
+        : this.addAccessory(device, device.deviceid + "SW0", "rf_pri", true, {
+            rfMap,
+          });
+
+      this.log.error(JSON.stringify(accessory.context, null, 2));
+
+      rfMap.forEach(subDevice => {
+        let swNumber = rfChlCounter + 1,
+          subAccessory,
+          subType,
+          subExtraContext = {};
+        switch (subDevice.type) {
+          case "1":
+          case "2":
+          case "3":
+          case "4":
+            subType = "button";
+            break;
+          case "6":
+            subType = this.cusS.has(device.deviceid + "SW" + swNumber)
+              ? this.cusS.get(device.deviceid + "SW" + swNumber).type
               : "motion";
-            if (ct !== oAccessory.context.sensorType) rfBridgeChange = true;
-          }
+            break;
+          default:
+            return;
         }
-        if (rfBridgeChange) {
-          this.log.warn(
-            "[%s] bridge configuration changed so devices will be removed and readded.",
-            accessory.displayName
-          );
-          for (let i = 0; i <= accessory.context.channelCount; i++) {
-            let oAccessory = this.devicesInHB.get(device.deviceid + "SW" + i);
-            this.removeAccessory(oAccessory);
+        subExtraContext = {
+          buttons: subDevice.buttons,
+          subType,
+          swNumber,
+        };
+        if ((subAccessory = this.devicesInHB.get(device.deviceid + "SW" + swNumber))) {
+          if (
+            subAccessory.context.subType !== subType ||
+            subAccessory.context.swNumber !== swNumber
+          ) {
+            this.removeAccessory(subAccessory);
           }
-          this.initialiseDevice(device);
-          return;
         }
-      }
+
+        subAccessory = this.devicesInHB.has(device.deviceid + "SW" + swNumber)
+          ? this.devicesInHB.get(device.deviceid + "SW" + swNumber)
+          : this.addAccessory(
+              device,
+              device.deviceid + "SW" + swNumber,
+              "rf_sub",
+              false,
+              subExtraContext
+            );
+        subAccessory
+          .getService(Service.AccessoryInformation)
+          .setCharacteristic(Characteristic.FirmwareRevision, device.params.fwVersion);
+        subAccessory.context.reachableWAN = device.online;
+        subAccessory.context.reachableLAN = false;
+        this.devicesInHB.set(subAccessory.context.hbDeviceId, subAccessory);
+        this.log.warn(JSON.stringify(subAccessory.context, null, 2));
+        rfChlCounter += Object.keys(subDevice.buttons || {}).length;
+      });
+      accessory.context.channelCount = rfChlCounter;
+      this.devicesInHB.set(accessory.context.hbDeviceId, accessory);
     }
 
     //*** ZIGBEE BRIDGES ***\\
     else if (cns.devicesZBBridge.includes(device.extra.uiid)) {
-      accessory = this.devicesInHB.has(device.deviceid + "SWX")
-        ? this.devicesInHB.get(device.deviceid + "SWX")
-        : this.addAccessory(device, device.deviceid + "SWX", "zb_pri");
+      // Nothing to do here but needed to avoid the below not supported error
     }
 
     //*** ZIGBEE DEVICES ***\\
     else if (cns.devicesZB.includes(device.extra.uiid)) {
       accessory = this.devicesInHB.has(device.deviceid + "SWX")
         ? this.devicesInHB.get(device.deviceid + "SWX")
-        : this.addAccessory(device, device.deviceid + "SWX", "zb_sub");
+        : this.addAccessory(device, device.deviceid + "SWX", "zb_dev");
     }
 
     //*** SONOFF CAMERAS ***\\
@@ -383,7 +424,7 @@ class eWeLink {
       );
     }
   }
-  addAccessory(device, hbDeviceId, type, hidden = false) {
+  addAccessory(device, hbDeviceId, type, hidden = false, extraContext = {}) {
     let switchNumber = hbDeviceId.substr(-1).toString(),
       newDeviceName = type === "rf_sub" ? device.tags.zyx_info[switchNumber - 1].name : device.name,
       channelCount =
@@ -411,14 +452,17 @@ class eWeLink {
           .setCharacteristic(Characteristic.Identify, false);
       }
       accessory.context = {
-        hbDeviceId,
-        eweDeviceId: device.deviceid,
-        eweUIID: device.extra.uiid,
-        eweModel: device.productModel,
-        eweApiKey: device.apikey,
-        switchNumber,
-        channelCount,
-        type,
+        ...{
+          hbDeviceId,
+          eweDeviceId: device.deviceid,
+          eweUIID: device.extra.uiid,
+          eweModel: device.productModel,
+          eweApiKey: device.apikey,
+          switchNumber,
+          channelCount,
+          type,
+        },
+        ...extraContext,
       };
       if (!hidden) {
         this.api.registerPlatformAccessories("homebridge-ewelink", "eWeLink", [accessory]);
@@ -474,8 +518,8 @@ class eWeLink {
           if (!(wcService = accessory.getService(Service.WindowCovering))) {
             accessory
               .addService(Service.WindowCovering)
-              .setCharacteristic(Characteristic.CurrentPosition, 100)
-              .setCharacteristic(Characteristic.TargetPosition, 100)
+              .setCharacteristic(Characteristic.CurrentPosition, 0)
+              .setCharacteristic(Characteristic.TargetPosition, 0)
               .setCharacteristic(Characteristic.PositionState, 2);
             wcService = accessory.getService(Service.WindowCovering);
           }
@@ -543,7 +587,7 @@ class eWeLink {
               accessory.getService(Service.TemperatureSensor) ||
               accessory.addService(Service.TemperatureSensor),
             humiService = false;
-          if (this.devicesInEW.get(accessory.context.eweDeviceId).params.sensorType !== "DS18B20") {
+          if (accessory.context.sensorType !== "DS18B20") {
             humiService =
               accessory.getService(Service.HumiditySensor) ||
               accessory.addService(Service.HumiditySensor);
@@ -735,100 +779,52 @@ class eWeLink {
             .getCharacteristic(Characteristic.On)
             .on("set", (value, callback) => this.internalSwitchUpdate(accessory, value, callback));
           break;
-        case "rf_pri":
-          if (!accessory.context.hasOwnProperty("rfChlMap")) {
-            accessory.context.rfChlMap = {};
-          }
-          break;
         case "rf_sub":
-          if (!accessory.context.hasOwnProperty("rfChls")) {
-            accessory.context.rfChls = {};
-          }
-          switch (
-            this.devicesInEW.get(accessory.context.eweDeviceId).tags.zyx_info[
-              parseInt(accessory.context.switchNumber) - 1
-            ].remote_type
-          ) {
-            case "1":
-            case "2":
-            case "3":
-            case "4":
-              accessory.context.sensorType = "button";
+          switch (accessory.context.subType) {
+            case "water":
+              accessory.getService(Service.LeakSensor) || accessory.addService(Service.LeakSensor);
               break;
-            case "6":
-              accessory.context.sensorType = this.cusS.has(accessory.context.hbDeviceId)
-                ? this.cusS.get(accessory.context.hbDeviceId).type
-                : "motion";
+            case "fire":
+            case "smoke":
+              accessory.getService(Service.SmokeSensor) ||
+                accessory.addService(Service.SmokeSensor);
+              break;
+            case "co":
+              accessory.getService(Service.CarbonMonoxideSensor) ||
+                accessory.addService(Service.CarbonMonoxideSensor);
+              break;
+            case "co2":
+              accessory.getService(Service.CarbonDioxideSensor) ||
+                accessory.addService(Service.CarbonDioxideSensor);
+              break;
+            case "contact":
+              accessory.getService(Service.ContactSensor) ||
+                accessory.addService(Service.ContactSensor);
+              break;
+            case "occupancy":
+              accessory.getService(Service.OccupancySensor) ||
+                accessory.addService(Service.OccupancySensor);
+              break;
+            default:
+              accessory.getService(Service.MotionSensor) ||
+                accessory.addService(Service.MotionSensor);
+              break;
+            case "button":
+              Object.entries(accessory.context.buttons).forEach(([chan, name]) => {
+                accessory.getService(name) ||
+                  accessory.addService(Service.Switch, name, "switch" + chan);
+                accessory.getService(name).updateCharacteristic(Characteristic.On, false);
+                accessory
+                  .getService(name)
+                  .getCharacteristic(Characteristic.On)
+                  .on("set", (value, callback) => {
+                    value ? this.internalRFDeviceUpdate(accessory, k, callback) : callback();
+                  });
+              });
               break;
           }
-          let mAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW0");
-          this.devicesInEW
-            .get(mAccessory.context.eweDeviceId)
-            .tags.zyx_info[parseInt(accessory.context.switchNumber) - 1].buttonName.forEach(
-              button => {
-                let rfData;
-                Object.entries(button).forEach(
-                  ([k, v]) =>
-                    (rfData = {
-                      rfChan: k,
-                      name: v,
-                    })
-                );
-                accessory.context.rfChls[rfData.rfChan] = rfData.name;
-                mAccessory.context.rfChlMap[rfData.rfChan] = accessory.context.switchNumber;
-                this.devicesInHB.set(mAccessory.context.hbDeviceId, mAccessory);
-                switch (accessory.context.sensorType) {
-                  case "button":
-                    accessory.getService(rfData.name) ||
-                      accessory.addService(Service.Switch, rfData.name, "switch" + rfData.rfChan);
-                    break;
-                  case "water":
-                    accessory.getService(Service.LeakSensor) ||
-                      accessory.addService(Service.LeakSensor);
-                    break;
-                  case "fire":
-                  case "smoke":
-                    accessory.getService(Service.SmokeSensor) ||
-                      accessory.addService(Service.SmokeSensor);
-                    break;
-                  case "co":
-                    accessory.getService(Service.CarbonMonoxideSensor) ||
-                      accessory.addService(Service.CarbonMonoxideSensor);
-                    break;
-                  case "co2":
-                    accessory.getService(Service.CarbonDioxideSensor) ||
-                      accessory.addService(Service.CarbonDioxideSensor);
-                    break;
-                  case "contact":
-                    accessory.getService(Service.ContactSensor) ||
-                      accessory.addService(Service.ContactSensor);
-                    break;
-                  case "occupancy":
-                    accessory.getService(Service.OccupancySensor) ||
-                      accessory.addService(Service.OccupancySensor);
-                    break;
-                  default:
-                    accessory.getService(Service.MotionSensor) ||
-                      accessory.addService(Service.MotionSensor);
-                    break;
-                }
-              }
-            );
-          accessory.context.rfChls = accessory.context.rfChls || {};
-          if (accessory.context.sensorType === "button") {
-            Object.entries(accessory.context.rfChls).forEach(([k, v]) => {
-              accessory.getService(v).updateCharacteristic(Characteristic.On, false);
-              accessory
-                .getService(v)
-                .getCharacteristic(Characteristic.On)
-                .on("set", (value, callback) => {
-                  value ? this.internalRFDeviceUpdate(accessory, k, callback) : callback();
-                });
-            });
-          }
-
           break;
-        case "zb_sub": //*** credit @tasict ***\\
+        case "zb_dev": //*** credit @tasict ***\\
           accessory.getService(Service.BatteryService) ||
             accessory.addService(Service.BatteryService);
           switch (accessory.context.eweUIID) {
@@ -988,9 +984,8 @@ class eWeLink {
         }
         return true;
       case "rf_sub":
-      case "zb_pri":
         return true;
-      case "zb_sub":
+      case "zb_dev":
         if (Object.keys(newParams).some(v => cns.devicesZBBridgeParams.includes(v))) {
           this.externalZBDeviceUpdate(accessory, newParams);
         }
@@ -1808,7 +1803,7 @@ class eWeLink {
       if (!(blindConfig = this.cusG.get(accessory.context.hbDeviceId))) {
         throw "group config missing";
       }
-      if (blindConfig.type !== "blind" || ["oneSwitch", "twoSwitch"].includes(blindConfig.setup)) {
+      if (blindConfig.type !== "blind" || !["oneSwitch", "twoSwitch"].includes(blindConfig.setup)) {
         throw "improper configuration";
       }
       switch (blindConfig.setup) {
@@ -2237,25 +2232,27 @@ class eWeLink {
   externalRFDeviceUpdate(accessory, params) {
     try {
       if (!params.hasOwnProperty("updateSource")) return;
-      let idToCheck = accessory.context.hbDeviceId.slice(0, -1),
-        timeNow = new Date();
+      let timeNow = new Date();
       if (
         params.hasOwnProperty("cmd") &&
         params.cmd === "transmit" &&
         params.hasOwnProperty("rfChl")
       ) {
-        // RF Button
-        let bAccessory;
-        if (
-          (bAccessory = this.devicesInHB.get(idToCheck + accessory.context.rfChlMap[params.rfChl]))
-        ) {
-          bAccessory
-            .getService(bAccessory.context.rfChls[params.rfChl])
+        //*** RF Button ***\\
+        let oAccessory,
+          accObject = this.devicesInHB
+            .filter(a => a.context.type === "rf_sub")
+            .filter(a => a.context.eweDeviceId === accessory.context.eweDeviceId)
+            .filter(a => a.context.buttons.hasOwnProperty(params.rfChl));
+
+        if ((oAccessory = accObject[0])) {
+          oAccessory
+            .getService(oAccessory.context.buttons[params.rfChl])
             .updateCharacteristic(Characteristic.On, 1);
           setTimeout(
             () =>
-              bAccessory
-                .getService(bAccessory.context.rfChls[params.rfChl])
+              oAccessory
+                .getService(oAccessory.context.buttons[params.rfChl])
                 .updateCharacteristic(Characteristic.On, 0),
             3000
           );
@@ -2263,92 +2260,59 @@ class eWeLink {
           throw "rf button not found in Homebridge";
         }
       } else if (params.hasOwnProperty("cmd") && params.cmd === "trigger") {
-        // RF Sensor
+        //*** RF Sensor ***\\
         Object.keys(params)
           .filter(name => /rfTrig/.test(name))
           .forEach(chan => {
-            let chanNum = chan.substr(-1).toString(),
-              accessoryNum = accessory.context.rfChlMap[chanNum],
-              oAccessory;
-            if ((oAccessory = this.devicesInHB.get(idToCheck + accessoryNum))) {
+            let rfChanToUpdate = chan.substr(-1).toString(),
+              oAccessory,
+              accObject = this.devicesInHB
+                .filter(acc => acc.context.type === "rf_sub")
+                .filter(acc => acc.context.eweDeviceId === accessory.context.eweDeviceId)
+                .filter(acc => acc.context.buttons.hasOwnProperty(rfChanToUpdate));
+            if ((oAccessory = accObject[0])) {
               let timeOfMotion = new Date(params[chan]),
-                diff = (timeNow.getTime() - timeOfMotion.getTime()) / 1000;
+                diff = (timeNow.getTime() - timeOfMotion.getTime()) / 1000,
+                serv,
+                char;
               if (diff < (this.config.sensorTimeDifference || 120)) {
                 switch (oAccessory.context.sensorType) {
                   case "button":
                     break;
                   case "water":
-                    oAccessory
-                      .getService(Service.LeakSensor)
-                      .updateCharacteristic(Characteristic.LeakDetected, 1);
-                    setTimeout(() => {
-                      oAccessory
-                        .getService(Service.LeakSensor)
-                        .updateCharacteristic(Characteristic.LeakDetected, 0);
-                    }, (this.config.sensorTimeLength || 2) * 1000);
+                    serv = Service.LeakSensor;
+                    char = Characteristic.LeakDetected;
                     break;
                   case "fire":
                   case "smoke":
-                    oAccessory
-                      .getService(Service.SmokeSensor)
-                      .updateCharacteristic(Characteristic.SmokeDetected, 1);
-                    setTimeout(() => {
-                      oAccessory
-                        .getService(Service.SmokeSensor)
-                        .updateCharacteristic(Characteristic.SmokeDetected, 0);
-                    }, (this.config.sensorTimeLength || 2) * 1000);
+                    serv = Service.SmokeSensor;
+                    char = Characteristic.LeakDetected;
                     break;
                   case "co":
-                    oAccessory
-                      .getService(Service.CarbonMonoxideSensor)
-                      .updateCharacteristic(Characteristic.CarbonMonoxideDetected, 1);
-                    setTimeout(() => {
-                      oAccessory
-                        .getService(Service.CarbonMonoxideSensor)
-                        .updateCharacteristic(Characteristic.CarbonMonoxideDetected, 0);
-                    }, (this.config.sensorTimeLength || 2) * 1000);
+                    serv = Service.CarbonMonoxideSensor;
+                    char = Characteristic.CarbonMonoxideDetected;
                     break;
                   case "co2":
-                    oAccessory
-                      .getService(Service.CarbonDioxideSensor)
-                      .updateCharacteristic(Characteristic.CarbonDioxideDetected, 1);
-                    setTimeout(() => {
-                      oAccessory
-                        .getService(Service.CarbonDioxideSensor)
-                        .updateCharacteristic(Characteristic.CarbonDioxideDetected, 0);
-                    }, (this.config.sensorTimeLength || 2) * 1000);
+                    serv = Service.CarbonDioxideSensor;
+                    char = Characteristic.CarbonDioxideDetected;
                     break;
                   case "contact":
-                    oAccessory
-                      .getService(Service.ContactSensor)
-                      .updateCharacteristic(Characteristic.ContactSensorState, 1);
-                    setTimeout(() => {
-                      oAccessory
-                        .getService(Service.ContactSensor)
-                        .updateCharacteristic(Characteristic.ContactSensorState, 0);
-                    }, (this.config.sensorTimeLength || 2) * 1000);
+                    serv = Service.ContactSensor;
+                    char = Characteristic.ContactSensorState;
                     break;
                   case "occupancy":
-                    oAccessory
-                      .getService(Service.OccupancySensor)
-                      .updateCharacteristic(Characteristic.OccupancyDetected, 1);
-                    setTimeout(() => {
-                      oAccessory
-                        .getService(Service.OccupancySensor)
-                        .updateCharacteristic(Characteristic.OccupancyDetected, 0);
-                    }, (this.config.sensorTimeLength || 2) * 1000);
+                    serv = Service.OccupancySensor;
+                    char = Characteristic.OccupancyDetected;
                     break;
                   default:
-                    oAccessory
-                      .getService(Service.MotionSensor)
-                      .updateCharacteristic(Characteristic.MotionDetected, true);
-                    setTimeout(() => {
-                      oAccessory
-                        .getService(Service.MotionSensor)
-                        .updateCharacteristic(Characteristic.MotionDetected, false);
-                    }, (this.config.sensorTimeLength || 2) * 1000);
+                    serv = Service.MotionSensor;
+                    char = Characteristic.MotionDetected;
                     break;
                 }
+                oAccessory.getService(serv).updateCharacteristic(char, 1);
+                setTimeout(() => {
+                  oAccessory.getService(serv).updateCharacteristic(char, 0);
+                }, (this.config.sensorTimeLength || 2) * 1000);
                 if (this.debug) {
                   this.log(
                     "[%s] has detected [%s].",
diff --git a/lib/eWeLinkHTTP.js b/lib/eWeLinkHTTP.js
index 48ffefb8..7f2410b0 100644
--- a/lib/eWeLinkHTTP.js
+++ b/lib/eWeLinkHTTP.js
@@ -74,8 +74,11 @@ module.exports = class eWeLinkHTTP {
           resolve(this.httpHost);
         })
         .catch(err => {
-          if (err.hasOwnProperty("code") && ["ENOTFOUND", "ETIMEDOUT"].includes(err.code)) {
-            this.log.warn("Unable to reach eWeLink. Retrying in 30 seconds.");
+          if (
+            err.hasOwnProperty("code") &&
+            ["ENOTFOUND", "ETIMEDOUT", "EAI_AGAIN"].includes(err.code)
+          ) {
+            this.log.warn("Unable to reach eWeLink. Retrying in 15 seconds.");
             this.delay().then(() => resolve(this.getHost()));
           } else {
             reject(err.message || err);
@@ -187,7 +190,7 @@ module.exports = class eWeLinkHTTP {
         })
         .catch(err => {
           if (err.hasOwnProperty("code") && ["ENOTFOUND", "ETIMEDOUT"].includes(err.code)) {
-            this.log.warn("Unable to reach eWeLink. Retrying in 30 seconds.");
+            this.log.warn("Unable to reach eWeLink. Retrying in 15 seconds.");
             this.delay().then(() => resolve(this.getDevices()));
           } else {
             reject(err.message || err);
@@ -236,7 +239,7 @@ module.exports = class eWeLinkHTTP {
         })
         .catch(err => {
           if (err.hasOwnProperty("code") && ["ENOTFOUND", "ETIMEDOUT"].includes(err.code)) {
-            this.log.warn("Unable to reach eWeLink. Retrying in 30 seconds.");
+            this.log.warn("Unable to reach eWeLink. Retrying in 15 seconds.");
             this.delay().then(() => resolve(this.getDevice(deviceId)));
           } else {
             reject(err.message || err);
@@ -245,6 +248,6 @@ module.exports = class eWeLinkHTTP {
     });
   }
   delay() {
-    return new Promise(resolve => setTimeout(resolve, 30000));
+    return new Promise(resolve => setTimeout(resolve, 15000));
   }
 };
diff --git a/lib/eWeLinkWS.js b/lib/eWeLinkWS.js
index fd077cff..df427482 100644
--- a/lib/eWeLinkWS.js
+++ b/lib/eWeLinkWS.js
@@ -175,11 +175,9 @@ module.exports = class eWeLinkWS {
         }
       }
     });
-    this.wsp.onClose.addListener(e => {
-      if (e.reason === "Stopping Homebridge") {
-        this.log("Web socket gracefully closed.");
-      } else {
-        this.log.warn("Web socket closed - [%s - %s].", e.code, e.reason);
+    this.wsp.onClose.addListener((e, m) => {
+      if (e !== 1005) {
+        this.log.warn("Web socket closed [%s].", e);
         if (e !== 1000) {
           this.log("Web socket will try to reconnect in five seconds.");
           setTimeout(() => this.login(), 5000);
@@ -304,7 +302,8 @@ module.exports = class eWeLinkWS {
   }
   closeConnection() {
     if (this.wsp && this.wsIsOpen) {
-      this.wsp.close(1000, "Stopping Homebridge");
+      this.wsp.close();
+      this.log("Web socket gracefully closed.");
     }
   }
   delay(ms) {
diff --git a/package-lock.json b/package-lock.json
index e100f5ec..7cd45f9b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -109,6 +109,11 @@
         "supports-color": "^7.1.0"
       }
     },
+    "chnl": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/chnl/-/chnl-1.2.0.tgz",
+      "integrity": "sha512-g5gJb59edwCliFbX2j7G6sBfY4sX9YLy211yctONI2GRaiX0f2zIbKWmBm+sPqFNEpM7Ljzm7IJX/xrjiEbPrw=="
+    },
     "color-convert": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
@@ -420,11 +425,6 @@
       "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz",
       "integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g=="
     },
-    "is-negative-zero": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.0.tgz",
-      "integrity": "sha1-lVOxIbD6wohp2p7UWeIMdUN4hGE="
-    },
     "is-regex": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.1.tgz",
@@ -545,35 +545,14 @@
       "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="
     },
     "object.assign": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.1.tgz",
-      "integrity": "sha512-VT/cxmx5yaoHSOTSyrCygIDFco+RsibY2NM0a4RdEeY/4KgqezwFtK1yr3U67xYhqJSlASm2pKhLVzPj2lr4bA==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz",
+      "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==",
       "requires": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.18.0-next.0",
-        "has-symbols": "^1.0.1",
-        "object-keys": "^1.1.1"
-      },
-      "dependencies": {
-        "es-abstract": {
-          "version": "1.18.0-next.0",
-          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.0.tgz",
-          "integrity": "sha512-elZXTZXKn51hUBdJjSZGYRujuzilgXo8vSPQzjGYXLvSlGiCo8VO8ZGV3kjo9a0WNJJ57hENagwbtlRuHuzkcQ==",
-          "requires": {
-            "es-to-primitive": "^1.2.1",
-            "function-bind": "^1.1.1",
-            "has": "^1.0.3",
-            "has-symbols": "^1.0.1",
-            "is-callable": "^1.2.0",
-            "is-negative-zero": "^2.0.0",
-            "is-regex": "^1.1.1",
-            "object-inspect": "^1.8.0",
-            "object-keys": "^1.1.1",
-            "object.assign": "^4.1.0",
-            "string.prototype.trimend": "^1.0.1",
-            "string.prototype.trimstart": "^1.0.1"
-          }
-        }
+        "define-properties": "^1.1.2",
+        "function-bind": "^1.1.1",
+        "has-symbols": "^1.0.0",
+        "object-keys": "^1.0.11"
       }
     },
     "prettier": {
@@ -582,6 +561,21 @@
       "integrity": "sha512-16c7K+x4qVlJg9rEbXl7HEGmQyZlG4R9AgP+oHKRMsMsuk8s+ATStlf1NpDqyBI1HpVyfjLOeMhH2LvuNvV5Vg==",
       "dev": true
     },
+    "promise-controller": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/promise-controller/-/promise-controller-1.0.0.tgz",
+      "integrity": "sha512-goA0zA9L91tuQbUmiMinSYqlyUtEgg4fxJcjYnLYOQnrktb4o4UqciXDNXiRUPiDBPACmsr1k8jDW4r7UDq9Qw=="
+    },
+    "promise.prototype.finally": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/promise.prototype.finally/-/promise.prototype.finally-3.1.2.tgz",
+      "integrity": "sha512-A2HuJWl2opDH0EafgdjwEw7HysI8ff/n4lW4QEVBCUXFk9QeGecBWv0Deph0UmLe3tTNYegz8MOjsVuE6SMoJA==",
+      "requires": {
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.0-next.0",
+        "function-bind": "^1.1.1"
+      }
+    },
     "qs": {
       "version": "6.9.4",
       "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.4.tgz",
@@ -647,6 +641,16 @@
       "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.0.tgz",
       "integrity": "sha512-fX6Z5o4m6XsXBdli9g7DtWgAx+osMsRRZFKma1mIUsLCz6vRvv+pz5VNbyu9UEDzpMWulZfvpgb/cmDXVulYFQ=="
     },
+    "websocket-as-promised": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/websocket-as-promised/-/websocket-as-promised-1.0.1.tgz",
+      "integrity": "sha512-+gBevna4yxisb8cigL8NxcS8s241cvfMeyy1fNFcFgBcX/6vknMT84MwMmBNLYmsYH2giVoxOSEiAeeb7txFOw==",
+      "requires": {
+        "chnl": "^1.0.0",
+        "promise-controller": "^1.0.0",
+        "promise.prototype.finally": "^3.1.1"
+      }
+    },
     "ws": {
       "version": "7.3.1",
       "resolved": "https://registry.npmjs.org/ws/-/ws-7.3.1.tgz",
diff --git a/package.json b/package.json
index 0ebc8b68..251d9f95 100644
--- a/package.json
+++ b/package.json
@@ -64,6 +64,7 @@
     "fakegato-history": "0.5.6",
     "homebridge-lib": "4.7.15",
     "node-dns-sd": "0.4.1",
+    "websocket-as-promised": "1.0.1",
     "ws": "7.3.1"
   },
   "devDependencies": {

From cd9bb9efa0a93df33b27b92db1462a4ad460f9db Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 21 Sep 2020 11:34:16 +0100
Subject: [PATCH 0177/3183] 3.0.0-1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 7cd45f9b..d113ad56 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.0.0-0",
+  "version": "3.0.0-1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 251d9f95..db5f1146 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.0.0-0",
+  "version": "3.0.0-1",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 66b924f74f712a2c9b3f1054f5ea4bc99fe513c1 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Mon, 21 Sep 2020 11:43:55 +0100
Subject: [PATCH 0178/3183] Update stale.yml

---
 .github/stale.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/stale.yml b/.github/stale.yml
index 89b61309..c75e5812 100644
--- a/.github/stale.yml
+++ b/.github/stale.yml
@@ -4,6 +4,8 @@ daysUntilStale: 7
 daysUntilClose: 7
 # Issues with these labels will never be considered stale
 exemptLabels:
+  - "feedback wanted"
+  - "don't close"
 # Label to use when marking an issue as stale
 staleLabel: inactive
 # Comment to post when marking an issue as stale. Set to `false` to disable

From ebd9a69ef0b6b829e4973ad7269a603f149b96bf Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 21 Sep 2020 15:18:00 +0100
Subject: [PATCH 0179/3183] misc

---
 index.js           | 2 +-
 lib/constants.js   | 2 +-
 lib/eWeLinkHTTP.js | 2 +-
 lib/eWeLinkLAN.js  | 2 +-
 lib/eWeLinkWS.js   | 2 +-
 package.json       | 4 ++--
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/index.js b/index.js
index d25bb094..01e13ba7 100644
--- a/index.js
+++ b/index.js
@@ -1,4 +1,4 @@
-/* jshint esversion: 9, -W030, node: true */
+/* jshint esversion: 9, -W014, -W030, node: true */
 "use strict";
 module.exports = function (homebridge) {
   const eWeLink = require("./lib/eWeLink.js")(homebridge);
diff --git a/lib/constants.js b/lib/constants.js
index faa906f4..3da14a6e 100644
--- a/lib/constants.js
+++ b/lib/constants.js
@@ -1,4 +1,4 @@
-/* jshint esversion: 9, -W030, node: true */
+/* jshint esversion: 9, -W014, -W030, node: true */
 "use strict";
 module.exports = {
   // appId: "Uw83EKZFxdif7XFXEsrpduz5YyjP7nTl",
diff --git a/lib/eWeLinkHTTP.js b/lib/eWeLinkHTTP.js
index 7f2410b0..817bbade 100644
--- a/lib/eWeLinkHTTP.js
+++ b/lib/eWeLinkHTTP.js
@@ -1,4 +1,4 @@
-/* jshint esversion: 9, -W030, node: true */
+/* jshint esversion: 9, -W014, -W030, node: true */
 "use strict";
 const axios = require("axios"),
   constants = require("./constants"),
diff --git a/lib/eWeLinkLAN.js b/lib/eWeLinkLAN.js
index c996e682..3923e97d 100644
--- a/lib/eWeLinkLAN.js
+++ b/lib/eWeLinkLAN.js
@@ -1,4 +1,4 @@
-/* jshint esversion: 9, -W030, node: true */
+/* jshint esversion: 9, -W014, -W030, node: true */
 "use strict";
 const axios = require("axios"),
   cns = require("./constants"),
diff --git a/lib/eWeLinkWS.js b/lib/eWeLinkWS.js
index df427482..31192209 100644
--- a/lib/eWeLinkWS.js
+++ b/lib/eWeLinkWS.js
@@ -1,4 +1,4 @@
-/* jshint esversion: 9, -W030, node: true */
+/* jshint esversion: 9, -W014, -W030, node: true */
 "use strict";
 const axios = require("axios"),
   cns = require("./constants"),
diff --git a/package.json b/package.json
index db5f1146..f7f0b9d9 100644
--- a/package.json
+++ b/package.json
@@ -32,8 +32,8 @@
     "ewelink"
   ],
   "engines": {
-    "node": ">=6.0.0",
-    "homebridge": ">=0.2.0"
+    "node": ">=10.0.0",
+    "homebridge": ">=1.0.0"
   },
   "repository": {
     "type": "git",

From 45e6502e0d201f4d3ca3bcd44cc3dc126f303fda Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 21 Sep 2020 15:18:22 +0100
Subject: [PATCH 0180/3183] rf

---
 lib/eWeLink.js | 53 +++++++++++++++++++++++++++-----------------------
 1 file changed, 29 insertions(+), 24 deletions(-)

diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index fd4aa371..23f4b93c 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -1,4 +1,4 @@
-/* jshint esversion: 9, -W030, node: true */
+/* jshint esversion: 9, -W014, -W030, node: true */
 "use strict";
 let Accessory, Characteristic, EveService, EveHistoryService, Service, UUIDGen;
 const cns = require("./constants"),
@@ -411,10 +411,8 @@ class eWeLink {
         str += "is unreachable";
       }
     }
-
     this.log(" → [%s] initialised %s.", device.name, str);
     this.devicesInHB.set(accessory.context.hbDeviceId, accessory);
-
     if (!this.refreshAccessory(accessory, device.params)) {
       this.log.warn(
         "[%s] could not be initialised. Please try removing accessory from the Homebridge cache along with any secondary devices (SW1, SW2, etc.) [debug:%s:%s].",
@@ -818,7 +816,7 @@ class eWeLink {
                   .getService(name)
                   .getCharacteristic(Characteristic.On)
                   .on("set", (value, callback) => {
-                    value ? this.internalRFDeviceUpdate(accessory, k, callback) : callback();
+                    value ? this.internalRFUpdate(accessory, chan, name, callback) : callback();
                   });
               });
               break;
@@ -980,14 +978,14 @@ class eWeLink {
         return true;
       case "rf_pri":
         if (Object.keys(newParams).some(v => cns.devicesRFBridgeParams.includes(v))) {
-          this.externalRFDeviceUpdate(accessory, newParams);
+          this.externalRFUpdate(accessory, newParams);
         }
         return true;
       case "rf_sub":
         return true;
       case "zb_dev":
         if (Object.keys(newParams).some(v => cns.devicesZBBridgeParams.includes(v))) {
-          this.externalZBDeviceUpdate(accessory, newParams);
+          this.externalZBUpdate(accessory, newParams);
         }
         return true;
       default:
@@ -1746,7 +1744,7 @@ class eWeLink {
       callback(str);
     }
   }
-  internalRFDeviceUpdate(accessory, rfChl, callback) {
+  internalRFUpdate(accessory, rfChl, service, callback) {
     try {
       if (!accessory.context.reachableWAN && !accessory.context.reachableLAN) {
         throw "it is currently offline";
@@ -1756,7 +1754,7 @@ class eWeLink {
           cmd: "transmit",
           rfChl,
         },
-        rfService = accessory.getService(accessory.context.rfChls[rfChl]);
+        rfService = accessory.getService(service);
       if (this.debug) {
         this.log(
           "[%s %s] mimicking RF button press.",
@@ -2229,23 +2227,28 @@ class eWeLink {
       this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
     }
   }
-  externalRFDeviceUpdate(accessory, params) {
+  externalRFUpdate(accessory, params) {
     try {
       if (!params.hasOwnProperty("updateSource")) return;
-      let timeNow = new Date();
+      let timeNow = new Date(),
+        oAccessory = false;
       if (
         params.hasOwnProperty("cmd") &&
         params.cmd === "transmit" &&
         params.hasOwnProperty("rfChl")
       ) {
         //*** RF Button ***\\
-        let oAccessory,
-          accObject = this.devicesInHB
-            .filter(a => a.context.type === "rf_sub")
-            .filter(a => a.context.eweDeviceId === accessory.context.eweDeviceId)
-            .filter(a => a.context.buttons.hasOwnProperty(params.rfChl));
+        // the device needed is SW% corresponding to params.rfChl
 
-        if ((oAccessory = accObject[0])) {
+        this.devicesInHB.forEach(acc => {
+          if (
+            acc.context.eweDeviceId === accessory.context.eweDeviceId &&
+            acc.context.buttons.hasOwnProperty(params.rfChl.toString())
+          ) {
+            oAccessory = acc;
+          }
+        });
+        if (oAccessory) {
           oAccessory
             .getService(oAccessory.context.buttons[params.rfChl])
             .updateCharacteristic(Characteristic.On, 1);
@@ -2264,13 +2267,15 @@ class eWeLink {
         Object.keys(params)
           .filter(name => /rfTrig/.test(name))
           .forEach(chan => {
-            let rfChanToUpdate = chan.substr(-1).toString(),
-              oAccessory,
-              accObject = this.devicesInHB
-                .filter(acc => acc.context.type === "rf_sub")
-                .filter(acc => acc.context.eweDeviceId === accessory.context.eweDeviceId)
-                .filter(acc => acc.context.buttons.hasOwnProperty(rfChanToUpdate));
-            if ((oAccessory = accObject[0])) {
+            this.devicesInHB.forEach(acc => {
+              if (
+                acc.context.eweDeviceId === accessory.context.eweDeviceId &&
+                acc.context.buttons.hasOwnProperty(chan.substr(-1).toString())
+              ) {
+                oAccessory = acc;
+              }
+            });
+            if (oAccessory) {
               let timeOfMotion = new Date(params[chan]),
                 diff = (timeNow.getTime() - timeOfMotion.getTime()) / 1000,
                 serv,
@@ -2328,7 +2333,7 @@ class eWeLink {
       this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
     }
   }
-  externalZBDeviceUpdate(accessory, params) {
+  externalZBUpdate(accessory, params) {
     try {
       //*** credit @tasict ***\\
       if (params.hasOwnProperty("battery")) {

From a0bdc5a0a8e9e92cf266c2aa7367bbfe1e4cf8b9 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 21 Sep 2020 15:32:53 +0100
Subject: [PATCH 0181/3183] check th sensor

---
 lib/eWeLink.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index 23f4b93c..e0bd27c2 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -169,6 +169,10 @@ class eWeLink {
         : this.addAccessory(device, device.deviceid + "SWX", "thermostat", false, {
             sensorType: device.params.sensorType,
           });
+      if (accessory.context.sensorType !== device.params.sensorType) {
+        accessory.context.sensorType = device.params.sensorType;
+        this.devicesInHB.set(accessory.context.hbDeviceId, accessory);
+      }
     }
 
     //*** OUTLETS ***\\
@@ -589,6 +593,10 @@ class eWeLink {
             humiService =
               accessory.getService(Service.HumiditySensor) ||
               accessory.addService(Service.HumiditySensor);
+          } else {
+            if (accessory.getService(Service.HumiditySensor)) {
+              accessory.removeService(Service.HumiditySensor);
+            }
           }
           if (!this.config.hideTHSwitch) {
             let switchService =

From 73fd656d8c6fae673dda170ae737858ca5e8710c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 21 Sep 2020 17:31:34 +0100
Subject: [PATCH 0182/3183] blinds

---
 lib/eWeLink.js | 37 ++++++++++++++++++++++++++++++-------
 1 file changed, 30 insertions(+), 7 deletions(-)

diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index e0bd27c2..07123396 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -1179,6 +1179,7 @@ class eWeLink {
       if (blindConfig.type !== "blind" || !["oneSwitch", "twoSwitch"].includes(blindConfig.setup)) {
         throw "improper configuration";
       }
+
       let oldPos,
         params = {},
         wcService = accessory.getService(Service.WindowCovering);
@@ -1191,6 +1192,10 @@ class eWeLink {
         callback();
         return;
       }
+
+      // target position -> 0 for closed 100 for open (value)
+      // current position -> 0 going down, 1 going up
+
       switch (blindConfig.setup) {
         case "oneSwitch":
           params.switch = "on";
@@ -1211,8 +1216,22 @@ class eWeLink {
         wcService
           .updateCharacteristic(Characteristic.CurrentPosition, value)
           .updateCharacteristic(Characteristic.PositionState, 2);
-        callback();
+
+        switch (blindConfig.setup) {
+          case "oneSwitch":
+            params.switch = "off";
+            break;
+          case "twoSwitch":
+            params.switches = this.devicesInEW.get(accessory.context.eweDeviceId).params.switches;
+            params.switches[0].switch = "off";
+            params.switches[1].switch = "off";
+            break;
+        }
+        this.sendDeviceUpdate(accessory, params, function () {
+          return;
+        });
       }, parseInt(blindConfig.operationTime) * 100);
+      callback();
     } catch (err) {
       let str = "[" + accessory.displayName + "] could not be updated as " + err + ".";
       this.log.error(str);
@@ -1804,7 +1823,7 @@ class eWeLink {
   externalBlindUpdate(accessory, params) {
     try {
       let blindConfig,
-        nSte,
+        newPosition,
         wcService = accessory.getService(Service.WindowCovering);
       if (!(blindConfig = this.cusG.get(accessory.context.hbDeviceId))) {
         throw "group config missing";
@@ -1812,12 +1831,16 @@ class eWeLink {
       if (blindConfig.type !== "blind" || !["oneSwitch", "twoSwitch"].includes(blindConfig.setup)) {
         throw "improper configuration";
       }
+      // target position -> 0 for closed 100 for open (value)
+      // current position -> 0 going down, 1 going up
+
       switch (blindConfig.setup) {
         case "oneSwitch":
           if (params.switch === "off") {
             return;
           }
-          nSte = wcService.getCharacteristic(Characteristic.PositionState).value === 0 ? 1 : 0;
+          newPosition =
+            wcService.getCharacteristic(Characteristic.PositionState).value === 0 ? 1 : 0;
           break;
         case "twoSwitch":
           if (params.switches[0].switch === "off" && params.switches[1].switch === "off") {
@@ -1825,16 +1848,16 @@ class eWeLink {
           }
           let switchUp = params.switches[0].switch === "on" ? -1 : 0, // matrix of numbers to get
             switchDown = params.switches[1].switch === "on" ? 0 : 2; // ... the correct HomeKit value
-          nSte = switchUp + switchDown;
+          newPosition = switchUp + switchDown;
           break;
       }
       wcService
-        .updateCharacteristic(Characteristic.PositionState, nSte)
-        .updateCharacteristic(Characteristic.TargetPosition, nSte * 100);
+        .updateCharacteristic(Characteristic.PositionState, newPosition)
+        .updateCharacteristic(Characteristic.TargetPosition, newPosition * 100);
       setTimeout(() => {
         wcService
           .updateCharacteristic(Characteristic.PositionState, 2)
-          .updateCharacteristic(Characteristic.CurrentPosition, nSte * 100);
+          .updateCharacteristic(Characteristic.CurrentPosition, newPosition * 100);
       }, parseInt(blindConfig.operationTime) * 100);
     } catch (err) {
       this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);

From 6f734f81a7317711a246d883c4d6b8e545156b12 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 21 Sep 2020 17:34:28 +0100
Subject: [PATCH 0183/3183] 3.0.0-2

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d113ad56..447393fd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.0.0-1",
+  "version": "3.0.0-2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index f7f0b9d9..d1803b2b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.0.0-1",
+  "version": "3.0.0-2",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 03e4a232e860c0a9e473a30a030feea7b2e9ca07 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 21 Sep 2020 18:20:34 +0100
Subject: [PATCH 0184/3183] http change

---
 lib/eWeLink.js | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index 07123396..2a9a2f2e 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -417,13 +417,15 @@ class eWeLink {
     }
     this.log(" → [%s] initialised %s.", device.name, str);
     this.devicesInHB.set(accessory.context.hbDeviceId, accessory);
-    if (!this.refreshAccessory(accessory, device.params)) {
-      this.log.warn(
-        "[%s] could not be initialised. Please try removing accessory from the Homebridge cache along with any secondary devices (SW1, SW2, etc.) [debug:%s:%s].",
-        accessory.displayName,
-        accessory.context.type,
-        accessory.context.channelCount
-      );
+    if (!(this.config.disableHTTPRefresh || false)) {
+      if (!this.refreshAccessory(accessory, device.params)) {
+        this.log.warn(
+          "[%s] could not be initialised. Please try removing accessory from the Homebridge cache along with any secondary devices (SW1, SW2, etc.) [debug:%s:%s].",
+          accessory.displayName,
+          accessory.context.type,
+          accessory.context.channelCount
+        );
+      }
     }
   }
   addAccessory(device, hbDeviceId, type, hidden = false, extraContext = {}) {

From 6671e0203b01c9266280c1da7847852e66791235 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 21 Sep 2020 18:21:50 +0100
Subject: [PATCH 0185/3183] 3.0.0-3

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 447393fd..d5c2bc87 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.0.0-2",
+  "version": "3.0.0-3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index d1803b2b..a442dbb2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.0.0-2",
+  "version": "3.0.0-3",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 21e7b7a8c0ec12d7c535e61587d054609a0c8010 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 21 Sep 2020 19:03:29 +0100
Subject: [PATCH 0186/3183] blinds to twoSwitch only

---
 config.schema.json |  4 ++--
 lib/eWeLink.js     | 56 +++++++++++++---------------------------------
 2 files changed, 18 insertions(+), 42 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index e1d15c4d..f44541f9 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -138,7 +138,7 @@
               "type": "string",
               "title": "Device Setup",
               "default": "null",
-              "description": "The device setup. Please ignore this setting for locks",
+              "description": "The device setup. Blinds must be set up with two switches. Please ignore this setting for locks.",
               "oneOf": [
                 {
                   "title": "One Switch - for up and down",
@@ -161,7 +161,7 @@
             "sensorId": {
               "type": "string",
               "title": "Sensor",
-              "description": "A Sonoff DW2 sensor can optionally be used for blinds and garage doors. This is to determine the current open/closed state of the device. Please enter the 10 digit device ID (normally in the format 1000ab23cd). Otherwise leave this blank."
+              "description": "A Sonoff DW2 sensor can optionally be used for garage doors. This is to determine the current open/closed state of the garage door. Please enter the 10 digit device ID (normally in the format 1000ab23cd). Otherwise leave this blank."
             }
           }
         }
diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index 2a9a2f2e..e8952e3a 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -1178,7 +1178,7 @@ class eWeLink {
       if (!(blindConfig = this.cusG.get(accessory.context.hbDeviceId))) {
         throw "group config missing";
       }
-      if (blindConfig.type !== "blind" || !["oneSwitch", "twoSwitch"].includes(blindConfig.setup)) {
+      if (blindConfig.type !== "blind" || blindConfig.setup !== "twoSwitch") {
         throw "improper configuration";
       }
 
@@ -1198,16 +1198,11 @@ class eWeLink {
       // target position -> 0 for closed 100 for open (value)
       // current position -> 0 going down, 1 going up
 
-      switch (blindConfig.setup) {
-        case "oneSwitch":
-          params.switch = "on";
-          break;
-        case "twoSwitch":
-          params.switches = this.devicesInEW.get(accessory.context.eweDeviceId).params.switches;
-          params.switches[0].switch = value === 100 ? "on" : "off";
-          params.switches[1].switch = value === 0 ? "on" : "off";
-          break;
-      }
+      params.switches = this.devicesInEW.get(accessory.context.eweDeviceId).params.switches;
+      params.switches[0].switch = value === 100 ? "on" : "off";
+      params.switches[1].switch = value === 0 ? "on" : "off";
+      break;
+
       this.sendDeviceUpdate(accessory, params, function () {
         return;
       });
@@ -1218,17 +1213,9 @@ class eWeLink {
         wcService
           .updateCharacteristic(Characteristic.CurrentPosition, value)
           .updateCharacteristic(Characteristic.PositionState, 2);
-
-        switch (blindConfig.setup) {
-          case "oneSwitch":
-            params.switch = "off";
-            break;
-          case "twoSwitch":
-            params.switches = this.devicesInEW.get(accessory.context.eweDeviceId).params.switches;
-            params.switches[0].switch = "off";
-            params.switches[1].switch = "off";
-            break;
-        }
+        params.switches = this.devicesInEW.get(accessory.context.eweDeviceId).params.switches;
+        params.switches[0].switch = "off";
+        params.switches[1].switch = "off";
         this.sendDeviceUpdate(accessory, params, function () {
           return;
         });
@@ -1830,29 +1817,18 @@ class eWeLink {
       if (!(blindConfig = this.cusG.get(accessory.context.hbDeviceId))) {
         throw "group config missing";
       }
-      if (blindConfig.type !== "blind" || !["oneSwitch", "twoSwitch"].includes(blindConfig.setup)) {
+      if (blindConfig.type !== "blind" || blindConfig.setup !== "twoSwitch") {
         throw "improper configuration";
       }
       // target position -> 0 for closed 100 for open (value)
       // current position -> 0 going down, 1 going up
-
-      switch (blindConfig.setup) {
-        case "oneSwitch":
-          if (params.switch === "off") {
-            return;
-          }
-          newPosition =
-            wcService.getCharacteristic(Characteristic.PositionState).value === 0 ? 1 : 0;
-          break;
-        case "twoSwitch":
-          if (params.switches[0].switch === "off" && params.switches[1].switch === "off") {
-            return;
-          }
-          let switchUp = params.switches[0].switch === "on" ? -1 : 0, // matrix of numbers to get
-            switchDown = params.switches[1].switch === "on" ? 0 : 2; // ... the correct HomeKit value
-          newPosition = switchUp + switchDown;
-          break;
+      if (params.switches[0].switch === "off" && params.switches[1].switch === "off") {
+        return;
       }
+      let switchUp = params.switches[0].switch === "on" ? -1 : 0, // matrix of numbers to get
+        switchDown = params.switches[1].switch === "on" ? 0 : 2; // ... the correct HomeKit value
+      newPosition = switchUp + switchDown;
+
       wcService
         .updateCharacteristic(Characteristic.PositionState, newPosition)
         .updateCharacteristic(Characteristic.TargetPosition, newPosition * 100);

From 8749a526cda23ecb4e52a77fb5ebe82c10aa4fb2 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 22 Sep 2020 08:25:04 +0100
Subject: [PATCH 0187/3183] king q4 try

---
 lib/constants.js |  5 ++-
 lib/eWeLink.js   | 91 +++++++++++++++++++++++++++++++++++++++++++++---
 2 files changed, 91 insertions(+), 5 deletions(-)

diff --git a/lib/constants.js b/lib/constants.js
index 3da14a6e..75e59b9e 100644
--- a/lib/constants.js
+++ b/lib/constants.js
@@ -37,6 +37,8 @@ module.exports = {
   devicesMultiSwitchLightParams: ["switches"],
   devicesBrightable: [36, 44],
   devicesColourable: [22, 59],
+  devicesCurtain: [11],
+  devicesCurtainParams: ["switch", "setclose"],
   devicesSensor: [102],
   devicesSensorParams: ["switch", "battery"],
   devicesThermostat: [15],
@@ -94,6 +96,7 @@ module.exports = {
     "rfList",
     "rfTrig",
     "sensorType",
+    "setclose",
     "speed",
     "state",
     "switch",
@@ -115,7 +118,7 @@ module.exports = {
     8: 3, // "SWITCH_3"                                \\ T1 3C, TX3C
     9: 4, // "SWITCH_4"                                \\
     10: 0, // "OSPF"                                   \\
-    11: 0, // "CURTAIN"                                \\ King Q4 Cover
+    11: 1, // "CURTAIN"                                \\ King Q4 Cover
     12: 0, // "EW-RE"                                  \\
     13: 0, // "FIREPLACE"                              \\
     14: 1, // "SWITCH_CHANGE"                          \\
diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index e8952e3a..cdd80fca 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -125,7 +125,11 @@ class eWeLink {
     ) {
       accessory = this.devicesInHB.has(device.deviceid + "SWX")
         ? this.devicesInHB.get(device.deviceid + "SWX")
-        : this.addAccessory(device, device.deviceid + "SWX", "blind");
+        : this.addAccessory(device, device.deviceid + "SWX", "blind", false, {
+            cacheLastPosition: 0,
+            cachePositionState: 2,
+            cacheTargetPosition: 0,
+          });
     }
 
     //*** GARAGES ***\\
@@ -148,6 +152,13 @@ class eWeLink {
         : this.addAccessory(device, device.deviceid + "SWX", "lock");
     }
 
+    //*** CURTAINS ***\\
+    else if (cns.devicesCurtain.includes(device.extra.uiid)) {
+      accessory = this.devicesInHB.has(device.deviceid + "SWX")
+        ? this.devicesInHB.get(device.deviceid + "SWX")
+        : this.addAccessory(device, device.deviceid + "SWX", "curtain");
+    }
+
     //*** DW2 SENSORS ***\\
     else if (cns.devicesSensor.includes(device.extra.uiid)) {
       accessory = this.devicesInHB.has(device.deviceid + "SWX")
@@ -534,6 +545,23 @@ class eWeLink {
               minStep: 100,
             });
           break;
+        case "curtain":
+          let cService;
+          if (!(cService = accessory.getService(Service.WindowCovering))) {
+            accessory
+              .addService(Service.WindowCovering)
+              .setCharacteristic(Characteristic.CurrentPosition, 0)
+              .setCharacteristic(Characteristic.TargetPosition, 0)
+              .setCharacteristic(Characteristic.PositionState, 2);
+            cService = accessory.getService(Service.WindowCovering);
+          }
+          cService
+            .getCharacteristic(Characteristic.TargetPosition)
+            .on("set", (value, callback) => this.internalCurtainUpdate(accessory, value, callback))
+            .setProps({
+              minStep: 100,
+            });
+          break;
         case "garage":
           let gdService;
           if (!(gdService = accessory.getService(Service.GarageDoorOpener))) {
@@ -916,6 +944,11 @@ class eWeLink {
           this.externalLockUpdate(accessory, newParams);
         }
         return true;
+      case "curtain":
+        if (Object.keys(newParams).some(v => cns.devicesCurtainParams.includes(v))) {
+          this.externalCurtainUpdate(accessory, newParams);
+        }
+        return true;
       case "sensor":
         if (Object.keys(newParams).some(v => cns.devicesSensorParams.includes(v))) {
           this.externalSensorUpdate(accessory, newParams);
@@ -1201,7 +1234,6 @@ class eWeLink {
       params.switches = this.devicesInEW.get(accessory.context.eweDeviceId).params.switches;
       params.switches[0].switch = value === 100 ? "on" : "off";
       params.switches[1].switch = value === 0 ? "on" : "off";
-      break;
 
       this.sendDeviceUpdate(accessory, params, function () {
         return;
@@ -1341,6 +1373,40 @@ class eWeLink {
       callback(str);
     }
   }
+  internalCurtainUpdate(accessory, value, callback) {
+    try {
+      if (!accessory.context.reachableWAN && !accessory.context.reachableLAN) {
+        throw "it is currently offline";
+      }
+      let params,
+        cService = accessory.getService(Service.WindowCovering),
+        prevPos = accessory.context.prevPos;
+
+      if (value === prevPos) {
+        //nothing to do as no change
+        callback();
+        return;
+      }
+      if (value === 0 || value === 100) {
+        // so to fully open, our $value will be 100, we send switch: "on"
+        //    to fully shut, our $value will be   0, we send switch: "off"
+        params = { switch: value === 100 ? "on" : "off" };
+      } else {
+        // for a  % midway,  scale the $value >--< 100 and setclose: newVal AS INT
+        params = { setclose: Math.abs(100 - value) };
+      }
+      cService
+        .updateCharacteristic(Characteristic.TargetPosition, value)
+        .updateCharacteristic(Characteristic.PositionState, value > prevPos ? 1 : 0);
+      // TargetPosition -> 0 for closed 100 for open (value)
+      // CurrentPosition -> 0 for closed 100 for open
+      // PositionState -> 0 going down, 1 going up, 2 = stopped
+
+      this.sendDeviceUpdate(accessory, params, callback);
+    } catch (err) {
+      callback("[" + accessory.displayName + "] " + err + ".");
+    }
+  }
   internalFanUpdate(accessory, type, value, callback) {
     try {
       if (!accessory.context.reachableWAN && !accessory.context.reachableLAN) {
@@ -1820,8 +1886,9 @@ class eWeLink {
       if (blindConfig.type !== "blind" || blindConfig.setup !== "twoSwitch") {
         throw "improper configuration";
       }
-      // target position -> 0 for closed 100 for open (value)
-      // current position -> 0 going down, 1 going up
+      // TargetPosition -> 0 for closed 100 for open (value)
+      // CurrentPosition -> 0 for closed 100 for open
+      // PositionState -> 0 going down, 1 going up, 2 = stopped
       if (params.switches[0].switch === "off" && params.switches[1].switch === "off") {
         return;
       }
@@ -1919,6 +1986,22 @@ class eWeLink {
       this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
     }
   }
+  externalCurtainUpdate(accessory, params) {
+    try {
+      let cService = accessory.getService(Service.WindowCovering);
+      if (params.hasOwnProperty("switch") && params.hasOwnProperty("setclose")) {
+        cService
+          .updateCharacteristic(
+            Characteristic.TargetPosition,
+            Math.abs(100 - parseInt(params.setclose))
+          )
+          .updateCharacteristic(Characteristic.PositionState, 2);
+        return;
+      }
+    } catch (err) {
+      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+    }
+  }
   externalSensorUpdate(accessory, params) {
     try {
       if (params.hasOwnProperty("battery")) {

From f7cd49c889b3d42eef98a207cd2daed99febc630 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 22 Sep 2020 16:13:19 +0100
Subject: [PATCH 0188/3183] 3.0.0-4 updates

---
 lib/eWeLink.js     | 866 ++++++++++++++++++++++++---------------------
 lib/eWeLinkHTTP.js |  14 +-
 lib/eWeLinkLAN.js  |   8 +-
 lib/eWeLinkWS.js   |  22 +-
 4 files changed, 496 insertions(+), 414 deletions(-)

diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index cdd80fca..acd6c6a7 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -33,6 +33,7 @@ class eWeLink {
       .on("shutdown", () => {
         if (this.lanClient) this.lanClient.closeConnection();
         if (this.wsClient) this.wsClient.closeConnection();
+        if (this.wsRefresh) clearInterval(this.wsRefresh);
       });
   }
   eWeLinkSync() {
@@ -53,6 +54,18 @@ class eWeLink {
       })
       .then(() => {
         this.wsClient.login();
+        this.wsRefresh = setInterval(() => {
+          if (this.wsClient) {
+            this.wsClient
+              .getHost()
+              .then(() => this.wsClient.closeConnection())
+              .then(() => {
+                return new Promise(resolve => setTimeout(resolve, 250));
+              })
+              .then(() => this.wsClient.login())
+              .catch(err => this.log.warn(err));
+          }
+        }, 1800000);
         return this.lanClient.getHosts();
       })
       .then(res => {
@@ -106,7 +119,6 @@ class eWeLink {
   initialiseDevice(device) {
     let accessory;
     //*** First add the device if it isn't already in Homebridge ***\\
-
     //*** IRRIGATION VALVES ***\\
     if (
       device.extra.uiid === 2 &&
@@ -117,7 +129,6 @@ class eWeLink {
         ? this.devicesInHB.get(device.deviceid + "SWX")
         : this.addAccessory(device, device.deviceid + "SWX", "valve");
     }
-
     //*** WINDOW BLINDS ***\\
     else if (
       this.cusG.has(device.deviceid + "SWX") &&
@@ -131,7 +142,6 @@ class eWeLink {
             cacheTargetPosition: 0,
           });
     }
-
     //*** GARAGES ***\\
     else if (
       this.cusG.has(device.deviceid + "SWX") &&
@@ -141,7 +151,6 @@ class eWeLink {
         ? this.devicesInHB.get(device.deviceid + "SWX")
         : this.addAccessory(device, device.deviceid + "SWX", "garage");
     }
-
     //*** LOCKS ***\\
     else if (
       this.cusG.has(device.deviceid + "SWX") &&
@@ -151,28 +160,26 @@ class eWeLink {
         ? this.devicesInHB.get(device.deviceid + "SWX")
         : this.addAccessory(device, device.deviceid + "SWX", "lock");
     }
-
     //*** CURTAINS ***\\
     else if (cns.devicesCurtain.includes(device.extra.uiid)) {
       accessory = this.devicesInHB.has(device.deviceid + "SWX")
         ? this.devicesInHB.get(device.deviceid + "SWX")
-        : this.addAccessory(device, device.deviceid + "SWX", "curtain");
+        : this.addAccessory(device, device.deviceid + "SWX", "curtain", false, {
+            prevPos: 0,
+          });
     }
-
     //*** DW2 SENSORS ***\\
     else if (cns.devicesSensor.includes(device.extra.uiid)) {
       accessory = this.devicesInHB.has(device.deviceid + "SWX")
         ? this.devicesInHB.get(device.deviceid + "SWX")
         : this.addAccessory(device, device.deviceid + "SWX", "sensor");
     }
-
     //*** FANS ***\\
     else if (cns.devicesFan.includes(device.extra.uiid)) {
       accessory = this.devicesInHB.has(device.deviceid + "SWX")
         ? this.devicesInHB.get(device.deviceid + "SWX")
         : this.addAccessory(device, device.deviceid + "SWX", "fan");
     }
-
     //*** THERMOSTATS ***\\
     else if (cns.devicesThermostat.includes(device.extra.uiid)) {
       accessory = this.devicesInHB.has(device.deviceid + "SWX")
@@ -185,28 +192,27 @@ class eWeLink {
         this.devicesInHB.set(accessory.context.hbDeviceId, accessory);
       }
     }
-
     //*** OUTLETS ***\\
-    else if (cns.devicesOutlet.includes(device.extra.uiid)) {
+    else if (
+      cns.devicesOutlet.includes(device.extra.uiid) ||
+      device.productModel === "Sonoff Pow"
+    ) {
       accessory = this.devicesInHB.has(device.deviceid + "SWX")
         ? this.devicesInHB.get(device.deviceid + "SWX")
         : this.addAccessory(device, device.deviceid + "SWX", "outlet");
     }
-
     //*** USB OUTLETS ***\\
     else if (cns.devicesUSB.includes(device.extra.uiid)) {
       accessory = this.devicesInHB.has(device.deviceid + "SWX")
         ? this.devicesInHB.get(device.deviceid + "SWX")
         : this.addAccessory(device, device.deviceid + "SWX", "usb");
     }
-
     //*** SINGLE CHANNEL [MULTI CHANNEL HARDWARE] ***\\
     else if (cns.devicesSCM.includes(device.extra.uiid)) {
       accessory = this.devicesInHB.has(device.deviceid + "SWX")
         ? this.devicesInHB.get(device.deviceid + "SWX")
         : this.addAccessory(device, device.deviceid + "SWX", "scm");
     }
-
     //*** SINGLE CHANNEL LIGHTS ***\\
     else if (
       cns.devicesSingleSwitch.includes(device.extra.uiid) &&
@@ -216,7 +222,6 @@ class eWeLink {
         ? this.devicesInHB.get(device.deviceid + "SWX")
         : this.addAccessory(device, device.deviceid + "SWX", "light");
     }
-
     //*** MULTI CHANNEL LIGHTS ***\\
     else if (
       cns.devicesMultiSwitch.includes(device.extra.uiid) &&
@@ -251,14 +256,12 @@ class eWeLink {
         }
       }
     }
-
     //*** SINGLE CHANNEL SWITCHES ***\\
     else if (cns.devicesSingleSwitch.includes(device.extra.uiid)) {
       accessory = this.devicesInHB.has(device.deviceid + "SWX")
         ? this.devicesInHB.get(device.deviceid + "SWX")
         : this.addAccessory(device, device.deviceid + "SWX", "switch");
     }
-
     //*** MULTI CHANNEL SWITCHES ***\\
     else if (cns.devicesMultiSwitch.includes(device.extra.uiid)) {
       if (this.config.hideMasters) {
@@ -290,13 +293,11 @@ class eWeLink {
         }
       }
     }
-
     //*** RF BRIDGES ***\\
     else if (cns.devicesRFBridge.includes(device.extra.uiid)) {
       let accessory,
         rfChlCounter = 0,
         rfMap = [];
-
       if (device.hasOwnProperty("tags") && device.tags.hasOwnProperty("zyx_info")) {
         device.tags.zyx_info.forEach(remote =>
           rfMap.push({
@@ -306,15 +307,12 @@ class eWeLink {
           })
         );
       }
-
       accessory = this.devicesInHB.has(device.deviceid + "SW0")
         ? this.devicesInHB.get(device.deviceid + "SW0")
         : this.addAccessory(device, device.deviceid + "SW0", "rf_pri", true, {
             rfMap,
           });
-
       this.log.error(JSON.stringify(accessory.context, null, 2));
-
       rfMap.forEach(subDevice => {
         let swNumber = rfChlCounter + 1,
           subAccessory,
@@ -348,7 +346,6 @@ class eWeLink {
             this.removeAccessory(subAccessory);
           }
         }
-
         subAccessory = this.devicesInHB.has(device.deviceid + "SW" + swNumber)
           ? this.devicesInHB.get(device.deviceid + "SW" + swNumber)
           : this.addAccessory(
@@ -370,19 +367,16 @@ class eWeLink {
       accessory.context.channelCount = rfChlCounter;
       this.devicesInHB.set(accessory.context.hbDeviceId, accessory);
     }
-
     //*** ZIGBEE BRIDGES ***\\
     else if (cns.devicesZBBridge.includes(device.extra.uiid)) {
       // Nothing to do here but needed to avoid the below not supported error
     }
-
     //*** ZIGBEE DEVICES ***\\
     else if (cns.devicesZB.includes(device.extra.uiid)) {
       accessory = this.devicesInHB.has(device.deviceid + "SWX")
         ? this.devicesInHB.get(device.deviceid + "SWX")
         : this.addAccessory(device, device.deviceid + "SWX", "zb_dev");
     }
-
     //*** SONOFF CAMERAS ***\\
     else if (cns.devicesCamera.includes(device.extra.uiid)) {
       this.log.warn(
@@ -391,7 +385,6 @@ class eWeLink {
       );
       return;
     }
-
     //*** ALL OTHER = UNSUPPORTED ***\\
     else {
       this.log.warn(
@@ -400,7 +393,6 @@ class eWeLink {
       );
       return;
     }
-
     if (!accessory) {
       return;
     }
@@ -413,7 +405,6 @@ class eWeLink {
     accessory.context.reachableWAN = device.online;
     accessory.context.reachableLAN = this.lanDevices.get(device.deviceid).online || false;
     accessory.context.inUse = false;
-
     let str = accessory.context.reachableLAN
       ? "and found locally with IP [" + this.lanDevices.get(device.deviceid).ip + "]"
       : "but LAN mode unavailable as device ";
@@ -1044,39 +1035,40 @@ class eWeLink {
       this.log.warn(" → [%s] wasn't removed as %s.", accessory.displayName, err);
     }
   }
-  sendDeviceUpdate(accessory, params, callback) {
-    let payload = {
-      apikey: accessory.context.eweApiKey,
-      deviceid: accessory.context.eweDeviceId,
-      params,
-    };
-    let sendViaWS = () => {
-      if (accessory.context.reachableWAN) {
-        this.wsClient
-          .sendUpdate(payload)
-          .then(() => callback())
-          .catch(err => callback(err));
+  sendDeviceUpdate(accessory, params) {
+    return new Promise((resolve, reject) => {
+      let payload = {
+        apikey: accessory.context.eweApiKey,
+        deviceid: accessory.context.eweDeviceId,
+        params,
+      };
+      let sendViaWS = () => {
+        if (accessory.context.reachableWAN) {
+          this.wsClient
+            .sendUpdate(payload)
+            .then(() => resolve())
+            .catch(err => reject(err));
+        } else {
+          reject("it is unreachable");
+        }
+      };
+      if (
+        cns.devicesNonLAN.includes(accessory.context.eweUIID) ||
+        !accessory.context.reachableLAN
+      ) {
+        sendViaWS();
       } else {
-        this.log.error(
-          "[%s] could not be updated as it appears to be offline.",
-          accessory.displayName
-        );
-        callback("Device has failed to update");
+        this.lanClient
+          .sendUpdate(payload)
+          .then(() => resolve())
+          .catch(err => {
+            if (this.debug) {
+              this.log.warn("[%s] Reverting to web socket as %s.", accessory.displayName, err);
+            }
+            sendViaWS();
+          });
       }
-    };
-    if (cns.devicesNonLAN.includes(accessory.context.eweUIID) || !accessory.context.reachableLAN) {
-      sendViaWS();
-    } else {
-      this.lanClient
-        .sendUpdate(payload)
-        .then(() => callback())
-        .catch(err => {
-          if (this.debug) {
-            this.log.warn("[%s] Reverting to web socket as %s.", accessory.displayName, err);
-          }
-          sendViaWS();
-        });
-    }
+    });
   }
   receiveDeviceUpdate(device) {
     let accessory,
@@ -1149,29 +1141,10 @@ class eWeLink {
     }
   }
   internalValveUpdate(accessory, valve, value, callback) {
+    callback();
     try {
-      if (!accessory.context.reachableWAN && !accessory.context.reachableLAN) {
-        throw "it is currently offline";
-      }
       let params = {},
         serviceValve = accessory.getService(valve);
-      serviceValve
-        .updateCharacteristic(Characteristic.Active, value)
-        .updateCharacteristic(Characteristic.InUse, value);
-      switch (value) {
-        case 0:
-          serviceValve.updateCharacteristic(Characteristic.RemainingDuration, 0);
-          clearTimeout(accessory.getService(valve).timer);
-          break;
-        case 1:
-          let timer = serviceValve.getCharacteristic(Characteristic.SetDuration).value;
-          serviceValve.updateCharacteristic(Characteristic.RemainingDuration, timer);
-          serviceValve.timer = setTimeout(
-            () => serviceValve.setCharacteristic(Characteristic.Active, 0),
-            timer * 1000
-          );
-          break;
-      }
       params.switches = this.devicesInEW.get(accessory.context.eweDeviceId).params.switches;
       switch (valve) {
         case "Valve A":
@@ -1190,80 +1163,103 @@ class eWeLink {
             : "off";
           params.switches[1].switch = value ? "on" : "off";
           break;
-        default:
-          throw "unknown valve [" + valve + "]";
       }
       params.switches[2].switch = "off";
       params.switches[3].switch = "off";
-      this.sendDeviceUpdate(accessory, params, callback);
+      //2. send the request
+      //3a. update the accessory if (2) is resolved
+      //3b. revert the device status if (2) is rejected with a requestDeviceStatus.
+      this.sendDeviceUpdate(accessory, params)
+        .then(() => {
+          serviceValve
+            .updateCharacteristic(Characteristic.Active, value)
+            .updateCharacteristic(Characteristic.InUse, value);
+          switch (value) {
+            case 0:
+              serviceValve.updateCharacteristic(Characteristic.RemainingDuration, 0);
+              clearTimeout(accessory.getService(valve).timer);
+              break;
+            case 1:
+              let timer = serviceValve.getCharacteristic(Characteristic.SetDuration).value;
+              serviceValve.updateCharacteristic(Characteristic.RemainingDuration, timer);
+              serviceValve.timer = setTimeout(
+                () => serviceValve.setCharacteristic(Characteristic.Active, 0),
+                timer * 1000
+              );
+              break;
+          }
+        })
+        .catch(err => {
+          throw err;
+        });
     } catch (err) {
-      let str = "[" + accessory.displayName + "] could not be updated as " + err + ".";
-      this.log.error(str);
-      callback(str);
+      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+      if (accessory.context.reachableWAN) {
+        this.wsClient.requestUpdate(accessory).catch(() => {});
+        this.log.warn(
+          "[%s] requesting previous state to revert Homebridge status.",
+          accessory.displayName
+        );
+      }
     }
   }
   internalBlindUpdate(accessory, value, callback) {
+    callback();
     try {
-      if (!accessory.context.reachableWAN && !accessory.context.reachableLAN) {
-        throw "it is currently offline";
-      }
-      let blindConfig;
+      let blindConfig,
+        params = {},
+        wcService = accessory.getService(Service.WindowCovering),
+        oldPos = wcService.getCharacteristic(Characteristic.PositionState).value;
       if (!(blindConfig = this.cusG.get(accessory.context.hbDeviceId))) {
         throw "group config missing";
       }
       if (blindConfig.type !== "blind" || blindConfig.setup !== "twoSwitch") {
         throw "improper configuration";
       }
-
-      let oldPos,
-        params = {},
-        wcService = accessory.getService(Service.WindowCovering);
       value = value >= 50 ? 100 : 0;
-      oldPos = wcService.getCharacteristic(Characteristic.PositionState).value;
-      if (value === oldPos * 100) {
-        wcService
-          .updateCharacteristic(Characteristic.TargetPosition, value)
-          .updateCharacteristic(Characteristic.PositionState, oldPos);
-        callback();
-        return;
-      }
-
+      if (value === oldPos * 100) return;
       // target position -> 0 for closed 100 for open (value)
       // current position -> 0 going down, 1 going up
-
       params.switches = this.devicesInEW.get(accessory.context.eweDeviceId).params.switches;
       params.switches[0].switch = value === 100 ? "on" : "off";
       params.switches[1].switch = value === 0 ? "on" : "off";
-
-      this.sendDeviceUpdate(accessory, params, function () {
-        return;
-      });
-      wcService
-        .updateCharacteristic(Characteristic.TargetPosition, value)
-        .updateCharacteristic(Characteristic.PositionState, value / 100);
-      setTimeout(() => {
-        wcService
-          .updateCharacteristic(Characteristic.CurrentPosition, value)
-          .updateCharacteristic(Characteristic.PositionState, 2);
-        params.switches = this.devicesInEW.get(accessory.context.eweDeviceId).params.switches;
-        params.switches[0].switch = "off";
-        params.switches[1].switch = "off";
-        this.sendDeviceUpdate(accessory, params, function () {
-          return;
+      this.sendDeviceUpdate(accessory, params)
+        .then(() => {
+          wcService
+            .updateCharacteristic(Characteristic.TargetPosition, value)
+            .updateCharacteristic(Characteristic.PositionState, value / 100);
+          return new Promise(resolve =>
+            setTimeout(resolve, parseInt(blindConfig.operationTime) * 100)
+          );
+        })
+        .then(() => {
+          params.switches = this.devicesInEW.get(accessory.context.eweDeviceId).params.switches;
+          params.switches[0].switch = "off";
+          params.switches[1].switch = "off";
+          return this.sendDeviceUpdate(accessory, params);
+        })
+        .then(() => {
+          wcService
+            .updateCharacteristic(Characteristic.CurrentPosition, value)
+            .updateCharacteristic(Characteristic.PositionState, 2);
+        })
+        .catch(err => {
+          throw err;
         });
-      }, parseInt(blindConfig.operationTime) * 100);
-      callback();
     } catch (err) {
-      let str = "[" + accessory.displayName + "] could not be updated as " + err + ".";
-      this.log.error(str);
-      callback(str);
+      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+      if (accessory.context.reachableWAN) {
+        this.wsClient.requestUpdate(accessory).catch(() => {});
+        this.log.warn(
+          "[%s] requesting previous state to revert Homebridge status.",
+          accessory.displayName
+        );
+      }
     }
   }
   internalGarageUpdate(accessory, value, callback) {
+    callback();
     try {
-      if (!accessory.context.reachableWAN && !accessory.context.reachableLAN) {
-        throw "it is currently offline";
-      }
       let garageConfig;
       if (!(garageConfig = this.cusG.get(accessory.context.hbDeviceId))) {
         throw "group config missing";
@@ -1274,8 +1270,6 @@ class eWeLink {
       ) {
         throw "improper configuration";
       }
-      accessory.context.inUse = true;
-      accessory.context.state = value;
       let sensorDefinition = garageConfig.sensorId || false,
         sAccessory = false,
         oldPos,
@@ -1296,17 +1290,17 @@ class eWeLink {
           ? 1
           : 0
         : gdService.getCharacteristic(Characteristic.CurrentDoorState).value;
-      if (newPos === oldPos % 2) {
-        accessory.context.inUse = false;
-        callback();
-        return;
-      }
+      if (newPos === oldPos % 2) return;
+      accessory.context.inUse = true;
+      accessory.context.state = value;
       if (garageConfig.setup === "oneSwitch" && [2, 3].includes(oldPos)) {
         gdService.updateCharacteristic(Characteristic.CurrentDoorState, ((oldPos * 2) % 3) + 2);
         delay = 1500;
       }
-      setTimeout(() => {
-        if (accessory.context.state === newPos) {
+      if (accessory.context.state !== newPos) return;
+      let delayPromise = new Promise(resolve => setTimeout(resolve, delay));
+      delayPromise
+        .then(() => {
           gdService
             .updateCharacteristic(Characteristic.TargetDoorState, newPos)
             .updateCharacteristic(Characteristic.CurrentDoorState, newPos + 2);
@@ -1320,32 +1314,41 @@ class eWeLink {
               params.switches[1].switch = newPos === 1 ? "on" : "off";
               break;
           }
-          this.sendDeviceUpdate(accessory, params, function () {
-            return;
-          });
-          setTimeout(() => {
-            if (!sAccessory) {
-              gdService.updateCharacteristic(Characteristic.CurrentDoorState, newPos);
-            }
-            accessory.context.inUse = false;
-          }, parseInt(garageConfig.operationTime) * 100);
-        }
-      }, delay);
-      callback();
+          return this.sendDeviceUpdate(accessory, params);
+        })
+        .then(() => {
+          return new Promise(resolve =>
+            setTimeout(resolve, parseInt(garageConfig.operationTime) * 100)
+          );
+        })
+        .then(() => {
+          if (!sAccessory) {
+            gdService.updateCharacteristic(Characteristic.CurrentDoorState, newPos);
+          }
+          accessory.context.inUse = false;
+        })
+        .catch(err => {
+          throw err;
+        });
     } catch (err) {
+      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
       accessory.context.inUse = false;
-      let str = "[" + accessory.displayName + "] could not be updated as " + err + ".";
-      this.log.error(str);
-      callback(str);
+      if (accessory.context.reachableWAN) {
+        this.wsClient.requestUpdate(accessory).catch(() => {});
+        this.log.warn(
+          "[%s] requesting previous state to revert Homebridge status.",
+          accessory.displayName
+        );
+      }
     }
   }
   internalLockUpdate(accessory, value, callback) {
+    callback();
     try {
-      if (!accessory.context.reachableWAN && !accessory.context.reachableLAN) {
-        throw "it is currently offline";
-      }
       let lockConfig,
-        params = {},
+        params = {
+          switch: "on",
+        },
         lmService = accessory.getService(Service.LockMechanism);
       if (!(lockConfig = this.cusG.get(accessory.context.hbDeviceId))) {
         throw "group config missing";
@@ -1354,64 +1357,79 @@ class eWeLink {
         throw "improper configuration";
       }
       accessory.context.inUse = true;
-      this.log("[%s] has received request to unlock.", accessory.displayName);
-      lmService
-        .updateCharacteristic(Characteristic.LockTargetState, 0)
-        .updateCharacteristic(Characteristic.LockCurrentState, 0);
-      params.switch = "on";
-      this.sendDeviceUpdate(accessory, params, callback);
-      setTimeout(() => {
-        lmService
-          .updateCharacteristic(Characteristic.LockTargetState, 1)
-          .updateCharacteristic(Characteristic.LockCurrentState, 1);
-        accessory.context.inUse = false;
-      }, parseInt(lockConfig.operationTime) * 100);
+      this.sendDeviceUpdate(accessory, params)
+        .then(() => {
+          lmService
+            .updateCharacteristic(Characteristic.LockTargetState, 0)
+            .updateCharacteristic(Characteristic.LockCurrentState, 0);
+          setTimeout(() => {
+            lmService
+              .updateCharacteristic(Characteristic.LockTargetState, 1)
+              .updateCharacteristic(Characteristic.LockCurrentState, 1);
+            accessory.context.inUse = false;
+          }, parseInt(lockConfig.operationTime) * 100);
+        })
+        .catch(err => {
+          throw err;
+        });
     } catch (err) {
+      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
       accessory.context.inUse = false;
-      let str = "[" + accessory.displayName + "] could not be updated as " + err + ".";
-      this.log.error(str);
-      callback(str);
+      if (accessory.context.reachableWAN) {
+        this.wsClient.requestUpdate(accessory).catch(() => {});
+        this.log.warn(
+          "[%s] requesting previous state to revert Homebridge status.",
+          accessory.displayName
+        );
+      }
     }
   }
   internalCurtainUpdate(accessory, value, callback) {
+    callback();
     try {
-      if (!accessory.context.reachableWAN && !accessory.context.reachableLAN) {
-        throw "it is currently offline";
-      }
       let params,
         cService = accessory.getService(Service.WindowCovering),
         prevPos = accessory.context.prevPos;
-
-      if (value === prevPos) {
-        //nothing to do as no change
-        callback();
-        return;
-      }
+      if (value === prevPos) return;
       if (value === 0 || value === 100) {
         // so to fully open, our $value will be 100, we send switch: "on"
         //    to fully shut, our $value will be   0, we send switch: "off"
-        params = { switch: value === 100 ? "on" : "off" };
+        params = {
+          switch: value === 100 ? "on" : "off",
+        };
       } else {
         // for a  % midway,  scale the $value >--< 100 and setclose: newVal AS INT
-        params = { setclose: Math.abs(100 - value) };
+        params = {
+          setclose: Math.abs(100 - value),
+        };
       }
-      cService
-        .updateCharacteristic(Characteristic.TargetPosition, value)
-        .updateCharacteristic(Characteristic.PositionState, value > prevPos ? 1 : 0);
-      // TargetPosition -> 0 for closed 100 for open (value)
-      // CurrentPosition -> 0 for closed 100 for open
-      // PositionState -> 0 going down, 1 going up, 2 = stopped
-
-      this.sendDeviceUpdate(accessory, params, callback);
+      this.sendDeviceUpdate(accessory, params)
+        .then(() => {
+          cService
+            .updateCharacteristic(Characteristic.TargetPosition, value)
+            .updateCharacteristic(Characteristic.PositionState, value > prevPos ? 1 : 0);
+          // TargetPosition -> 0 for closed 100 for open (value)
+          // CurrentPosition -> 0 for closed 100 for open
+          // PositionState -> 0 going down, 1 going up, 2 = stopped
+          accessory.context.prevPos = value;
+        })
+        .catch(err => {
+          throw err;
+        });
     } catch (err) {
-      callback("[" + accessory.displayName + "] " + err + ".");
+      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+      if (accessory.context.reachableWAN) {
+        this.wsClient.requestUpdate(accessory).catch(() => {});
+        this.log.warn(
+          "[%s] requesting previous state to revert Homebridge status.",
+          accessory.displayName
+        );
+      }
     }
   }
   internalFanUpdate(accessory, type, value, callback) {
+    callback();
     try {
-      if (!accessory.context.reachableWAN && !accessory.context.reachableLAN) {
-        throw "it is currently offline";
-      }
       let newPower,
         newSpeed,
         newLight,
@@ -1434,10 +1452,6 @@ class eWeLink {
           newLight = value;
           break;
       }
-      lightService.updateCharacteristic(Characteristic.On, newLight);
-      fanService
-        .updateCharacteristic(Characteristic.Active, newPower)
-        .updateCharacteristic(Characteristic.RotationSpeed, newSpeed);
       let params = {
         switches: this.devicesInEW.get(accessory.context.eweDeviceId).params.switches,
       };
@@ -1445,105 +1459,133 @@ class eWeLink {
       params.switches[1].switch = newPower === 1 && newSpeed >= 33 ? "on" : "off";
       params.switches[2].switch = newPower === 1 && newSpeed >= 66 && newSpeed < 99 ? "on" : "off";
       params.switches[3].switch = newPower === 1 && newSpeed >= 99 ? "on" : "off";
-      if (this.debug) {
-        this.log.warn("Fan Update - setting " + type + " to " + value);
-        this.log(
-          "[%s] new stats: power [%s], speed [%s%], light [%s].",
-          accessory.displayName,
-          newPower,
-          newSpeed,
-          newLight
+      this.sendDeviceUpdate(accessory, params)
+        .then(() => {
+          lightService.updateCharacteristic(Characteristic.On, newLight);
+          fanService
+            .updateCharacteristic(Characteristic.Active, newPower)
+            .updateCharacteristic(Characteristic.RotationSpeed, newSpeed);
+        })
+        .catch(err => {
+          throw err;
+        });
+    } catch (err) {
+      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+      if (accessory.context.reachableWAN) {
+        this.wsClient.requestUpdate(accessory).catch(() => {});
+        this.log.warn(
+          "[%s] requesting previous state to revert Homebridge status.",
+          accessory.displayName
         );
       }
-      this.sendDeviceUpdate(accessory, params, callback);
-    } catch (err) {
-      let str = "[" + accessory.displayName + "] could not be updated as " + err + ".";
-      this.log.error(str);
-      callback(str);
     }
   }
   internalThermostatUpdate(accessory, value, callback) {
+    callback();
     try {
-      if (!accessory.context.reachableWAN && !accessory.context.reachableLAN) {
-        throw "it is currently offline";
-      }
       let params = {
           switch: value ? "on" : "off",
           mainSwitch: value ? "on" : "off",
         },
         switchService = accessory.getService(Service.Switch);
-      if (this.debug) {
-        this.log("[%s] updating to turn [%s].", accessory.displayName, value ? "on" : "off");
-      }
-      switchService.updateCharacteristic(Characteristic.On, value);
-      this.sendDeviceUpdate(accessory, params, callback);
+      this.sendDeviceUpdate(accessory, params)
+        .then(() => {
+          switchService.updateCharacteristic(Characteristic.On, value);
+        })
+        .catch(err => {
+          throw err;
+        });
     } catch (err) {
-      let str = "[" + accessory.displayName + "] could not be updated as " + err + ".";
-      this.log.error(str);
-      callback(str);
+      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+      if (accessory.context.reachableWAN) {
+        this.wsClient.requestUpdate(accessory).catch(() => {});
+        this.log.warn(
+          "[%s] requesting previous state to revert Homebridge status.",
+          accessory.displayName
+        );
+      }
     }
   }
   internalOutletUpdate(accessory, value, callback) {
+    callback();
     try {
-      if (!accessory.context.reachableWAN && !accessory.context.reachableLAN) {
-        throw "it is currently offline";
-      }
       let params = {
           switch: value ? "on" : "off",
         },
         outletService = accessory.getService(Service.Outlet);
-      if (this.debug) {
-        this.log("[%s] requesting to turn [%s].", accessory.displayName, value ? "on" : "off");
-      }
-      outletService.updateCharacteristic(Characteristic.On, value);
-      this.sendDeviceUpdate(accessory, params, callback);
+      this.sendDeviceUpdate(accessory, params)
+        .then(() => {
+          outletService.updateCharacteristic(Characteristic.On, value);
+        })
+        .catch(err => {
+          throw err;
+        });
     } catch (err) {
-      callback("[" + accessory.displayName + "] " + err + ".");
+      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+      if (accessory.context.reachableWAN) {
+        this.wsClient.requestUpdate(accessory).catch(() => {});
+        this.log.warn(
+          "[%s] requesting previous state to revert Homebridge status.",
+          accessory.displayName
+        );
+      }
     }
   }
   internalUSBUpdate(accessory, value, callback) {
+    callback();
     try {
-      if (!accessory.context.reachableWAN && !accessory.context.reachableLAN) {
-        throw "it is currently offline";
-      }
       let params = {
           switches: this.devicesInEW.get(accessory.context.eweDeviceId).params.switches,
         },
         outletService = accessory.getService(Service.Outlet);
       params.switches[0].switch = value ? "on" : "off";
-      if (this.debug) {
-        this.log("[%s] requesting to turn [%s].", accessory.displayName, value ? "on" : "off");
-      }
-      outletService.updateCharacteristic(Characteristic.On, value);
-      this.sendDeviceUpdate(accessory, params, callback);
+      this.sendDeviceUpdate(accessory, params)
+        .then(() => {
+          outletService.updateCharacteristic(Characteristic.On, value);
+        })
+        .catch(err => {
+          throw err;
+        });
     } catch (err) {
-      callback("[" + accessory.displayName + "] " + err + ".");
+      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+      if (accessory.context.reachableWAN) {
+        this.wsClient.requestUpdate(accessory).catch(() => {});
+        this.log.warn(
+          "[%s] requesting previous state to revert Homebridge status.",
+          accessory.displayName
+        );
+      }
     }
   }
   internalSCMUpdate(accessory, value, callback) {
+    callback();
     try {
-      if (!accessory.context.reachableWAN && !accessory.context.reachableLAN) {
-        throw "it is currently offline";
-      }
       let params = {
           switches: this.devicesInEW.get(accessory.context.eweDeviceId).params.switches,
         },
         switchService = accessory.getService(Service.Switch);
       params.switches[0].switch = value ? "on" : "off";
-      if (this.debug) {
-        this.log("[%s] requesting to turn [%s].", accessory.displayName, value ? "on" : "off");
-      }
-      switchService.updateCharacteristic(Characteristic.On, value);
-      this.sendDeviceUpdate(accessory, params, callback);
+      this.sendDeviceUpdate(accessory, params)
+        .then(() => {
+          switchService.updateCharacteristic(Characteristic.On, value);
+        })
+        .catch(err => {
+          throw err;
+        });
     } catch (err) {
-      callback("[" + accessory.displayName + "] " + err + ".");
+      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+      if (accessory.context.reachableWAN) {
+        this.wsClient.requestUpdate(accessory).catch(() => {});
+        this.log.warn(
+          "[%s] requesting previous state to revert Homebridge status.",
+          accessory.displayName
+        );
+      }
     }
   }
   internalLightbulbUpdate(accessory, value, callback) {
+    callback();
     try {
-      if (!accessory.context.reachableWAN && !accessory.context.reachableLAN) {
-        throw "it is currently offline";
-      }
       let oAccessory,
         params = {},
         lightService = accessory.getService(Service.Lightbulb);
@@ -1555,10 +1597,6 @@ class eWeLink {
           } else {
             params.switch = value ? "on" : "off";
           }
-          if (this.debug) {
-            this.log("[%s] updating to turn [%s].", accessory.displayName, value ? "on" : "off");
-          }
-          lightService.updateCharacteristic(Characteristic.On, value);
           break;
         case "0":
           params.switches = this.devicesInEW.get(accessory.context.eweDeviceId).params.switches;
@@ -1566,79 +1604,88 @@ class eWeLink {
           params.switches[1].switch = value ? "on" : "off";
           params.switches[2].switch = value ? "on" : "off";
           params.switches[3].switch = value ? "on" : "off";
-          if (this.debug) {
-            this.log(
-              "[%s] updating to turn group [%s].",
-              accessory.displayName,
-              value ? "on" : "off"
-            );
-          }
-          lightService.updateCharacteristic(Characteristic.On, value);
-          for (let i = 1; i <= 4; i++) {
-            if (this.devicesInHB.has(accessory.context.eweDeviceId + "SW" + i)) {
-              oAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW" + i);
-              oAccessory
-                .getService(Service.Lightbulb)
-                .updateCharacteristic(Characteristic.On, value);
-            }
-          }
           break;
         case "1":
         case "2":
         case "3":
         case "4":
-          if (this.debug) {
-            this.log("[%s] updating to turn [%s].", accessory.displayName, value ? "on" : "off");
-          }
-          lightService.updateCharacteristic(Characteristic.On, value);
-          let tAccessory,
-            masterState = "off";
           params.switches = this.devicesInEW.get(accessory.context.eweDeviceId).params.switches;
           for (let i = 1; i <= 4; i++) {
-            if ((tAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW" + i))) {
+            if ((oAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW" + i))) {
               i === parseInt(accessory.context.switchNumber)
                 ? (params.switches[i - 1].switch = value ? "on" : "off")
-                : (params.switches[i - 1].switch = tAccessory
+                : (params.switches[i - 1].switch = oAccessory
                     .getService(Service.Lightbulb)
                     .getCharacteristic(Characteristic.On).value
                     ? "on"
                     : "off");
-              if (
-                tAccessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On).value
-              ) {
-                masterState = "on";
-              }
             } else {
               params.switches[i - 1].switch = "off";
             }
           }
-          if (!this.hiddenMasters.includes(accessory.context.eweDeviceId)) {
-            oAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW0");
-            oAccessory
-              .getService(Service.Lightbulb)
-              .updateCharacteristic(Characteristic.On, masterState === "on");
-          }
           break;
-        default:
-          throw "unknown switch number [" + accessory.context.switchNumber + "]";
       }
-      this.sendDeviceUpdate(accessory, params, callback);
+      this.sendDeviceUpdate(accessory, params)
+        .then(() => {
+          switch (accessory.context.switchNumber) {
+            case "X":
+              lightService.updateCharacteristic(Characteristic.On, value);
+              break;
+            case "0":
+              for (let i = 0; i <= 4; i++) {
+                if ((oAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW" + i))) {
+                  oAccessory
+                    .getService(Service.Lightbulb)
+                    .updateCharacteristic(Characteristic.On, value);
+                }
+              }
+              break;
+            case "1":
+            case "2":
+            case "3":
+            case "4":
+              lightService.updateCharacteristic(Characteristic.On, value);
+              let masterState = "off";
+              for (let i = 1; i <= 4; i++) {
+                if ((oAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW" + i))) {
+                  if (
+                    oAccessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On)
+                      .value
+                  ) {
+                    masterState = "on";
+                  }
+                }
+              }
+              if (!this.hiddenMasters.includes(accessory.context.eweDeviceId)) {
+                oAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW0");
+                oAccessory
+                  .getService(Service.Lightbulb)
+                  .updateCharacteristic(Characteristic.On, masterState === "on");
+              }
+              break;
+          }
+        })
+        .catch(err => {
+          throw err;
+        });
     } catch (err) {
-      let str = "[" + accessory.displayName + "] could not be updated as " + err + ".";
-      this.log.error(str);
-      callback(str);
+      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+      if (accessory.context.reachableWAN) {
+        this.wsClient.requestUpdate(accessory).catch(() => {});
+        this.log.warn(
+          "[%s] requesting previous state to revert Homebridge status.",
+          accessory.displayName
+        );
+      }
     }
   }
   internalBrightnessUpdate(accessory, value, callback) {
+    callback();
     try {
-      if (!accessory.context.reachableWAN && !accessory.context.reachableLAN) {
-        throw "it is currently offline";
-      }
       let params = {},
         lightService = accessory.getService(Service.Lightbulb);
       if (value === 0) {
         params.switch = "off";
-        lightService.updateCharacteristic(Characteristic.On, false);
       } else {
         if (!lightService.getCharacteristic(Characteristic.On).value) {
           params.switch = "on";
@@ -1651,22 +1698,34 @@ class eWeLink {
             params.brightness = value;
             params.mode = 0;
             break;
-          default:
-            throw "unknown device UIID";
         }
-        lightService.updateCharacteristic(Characteristic.Brightness, value);
       }
-      if (this.debug) {
-        this.log("[%s] updating brightness to [%s%].", accessory.displayName, value);
-      }
-      setTimeout(() => this.sendDeviceUpdate(accessory, params, callback), 250);
+      setTimeout(() => {
+        this.sendDeviceUpdate(accessory, params)
+          .then(() => {
+            if (value === 0) {
+              lightService.updateCharacteristic(Characteristic.On, false);
+            } else {
+              lightService.updateCharacteristic(Characteristic.Brightness, value);
+            }
+          })
+          .catch(err => {
+            throw err;
+          });
+      }, 250);
     } catch (err) {
-      let str = "[" + accessory.displayName + "] could not be updated as " + err + ".";
-      this.log.error(str);
-      callback(str);
+      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+      if (accessory.context.reachableWAN) {
+        this.wsClient.requestUpdate(accessory).catch(() => {});
+        this.log.warn(
+          "[%s] requesting previous state to revert Homebridge status.",
+          accessory.displayName
+        );
+      }
     }
   }
   internalHSBUpdate(accessory, type, value, callback) {
+    callback();
     try {
       if (!accessory.context.reachableWAN && !accessory.context.reachableLAN) {
         throw "it is currently offline";
@@ -1699,13 +1758,7 @@ class eWeLink {
                 colorB: newRGB[2],
               };
               break;
-            default:
-              throw "unknown device UIID";
-          }
-          if (this.debug) {
-            this.log("[%s] updating hue to [%s°].", accessory.displayName, value);
           }
-          lightService.updateCharacteristic(Characteristic.Hue, value);
           break;
         case "bri":
           switch (accessory.context.eweUIID) {
@@ -1728,36 +1781,44 @@ class eWeLink {
               };
               break;
           }
-          if (this.debug) {
-            this.log("[%s] updating brightness to [%s%].", accessory.displayName, value);
-          }
-          lightService.updateCharacteristic(Characteristic.Brightness, value);
           break;
-        default:
-          throw "unknown device UIID";
       }
-      setTimeout(() => this.sendDeviceUpdate(accessory, params, callback), 250);
+      setTimeout(() => {
+        this.sendDeviceUpdate(accessory, params)
+          .then(() => {
+            switch (type) {
+              case "hue":
+                lightService.updateCharacteristic(Characteristic.Hue, value);
+                break;
+              case "bri":
+                lightService.updateCharacteristic(Characteristic.Brightness, value);
+                break;
+            }
+          })
+          .catch(err => {
+            throw err;
+          });
+      }, 250);
     } catch (err) {
-      let str = "[" + accessory.displayName + "] could not be updated as " + err + ".";
-      this.log.error(str);
-      callback(str);
+      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+      if (accessory.context.reachableWAN) {
+        this.wsClient.requestUpdate(accessory).catch(() => {});
+        this.log.warn(
+          "[%s] requesting previous state to revert Homebridge status.",
+          accessory.displayName
+        );
+      }
     }
   }
   internalSwitchUpdate(accessory, value, callback) {
+    callback();
     try {
-      if (!accessory.context.reachableWAN && !accessory.context.reachableLAN) {
-        throw "it is currently offline";
-      }
       let oAccessory,
         params = {},
         switchService = accessory.getService(Service.Switch);
       switch (accessory.context.switchNumber) {
         case "X":
           params.switch = value ? "on" : "off";
-          if (this.debug) {
-            this.log("[%s] updating to turn [%s].", accessory.displayName, value ? "on" : "off");
-          }
-          switchService.updateCharacteristic(Characteristic.On, value);
           break;
         case "0":
           params.switches = this.devicesInEW.get(accessory.context.eweDeviceId).params.switches;
@@ -1765,92 +1826,105 @@ class eWeLink {
           params.switches[1].switch = value ? "on" : "off";
           params.switches[2].switch = value ? "on" : "off";
           params.switches[3].switch = value ? "on" : "off";
-          if (this.debug) {
-            this.log(
-              "[%s] updating to turn group [%s].",
-              accessory.displayName,
-              value ? "on" : "off"
-            );
-          }
-          switchService.updateCharacteristic(Characteristic.On, value);
-          for (let i = 1; i <= 4; i++) {
-            if (this.devicesInHB.has(accessory.context.eweDeviceId + "SW" + i)) {
-              oAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW" + i);
-              oAccessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, value);
-            }
-          }
           break;
         case "1":
         case "2":
         case "3":
         case "4":
-          if (this.debug) {
-            this.log("[%s] updating to turn [%s].", accessory.displayName, value ? "on" : "off");
-          }
-          switchService.updateCharacteristic(Characteristic.On, value);
-          let tAccessory,
-            masterState = "off";
           params.switches = this.devicesInEW.get(accessory.context.eweDeviceId).params.switches;
           for (let i = 1; i <= 4; i++) {
-            if ((tAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW" + i))) {
+            if ((oAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW" + i))) {
               i === parseInt(accessory.context.switchNumber)
                 ? (params.switches[i - 1].switch = value ? "on" : "off")
-                : (params.switches[i - 1].switch = tAccessory
+                : (params.switches[i - 1].switch = oAccessory
                     .getService(Service.Switch)
                     .getCharacteristic(Characteristic.On).value
                     ? "on"
                     : "off");
-              if (
-                tAccessory.getService(Service.Switch).getCharacteristic(Characteristic.On).value
-              ) {
-                masterState = "on";
-              }
             } else {
               params.switches[i - 1].switch = "off";
             }
           }
-          if (!this.hiddenMasters.includes(accessory.context.eweDeviceId)) {
-            oAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW0");
-            oAccessory
-              .getService(Service.Switch)
-              .updateCharacteristic(Characteristic.On, masterState === "on");
-          }
           break;
-        default:
-          throw "unknown switch number [" + accessory.context.switchNumber + "]";
       }
-      this.sendDeviceUpdate(accessory, params, callback);
+      this.sendDeviceUpdate(accessory, params)
+        .then(() => {
+          switch (accessory.context.switchNumber) {
+            case "X":
+              switchService.updateCharacteristic(Characteristic.On, value);
+              break;
+            case "0":
+              for (let i = 0; i <= 4; i++) {
+                if ((oAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW" + i))) {
+                  oAccessory
+                    .getService(Service.Switch)
+                    .updateCharacteristic(Characteristic.On, value);
+                }
+              }
+              break;
+            case "1":
+            case "2":
+            case "3":
+            case "4":
+              switchService.updateCharacteristic(Characteristic.On, value);
+              let masterState = "off";
+              for (let i = 1; i <= 4; i++) {
+                if ((oAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW" + i))) {
+                  if (
+                    oAccessory.getService(Service.Switch).getCharacteristic(Characteristic.On).value
+                  ) {
+                    masterState = "on";
+                  }
+                }
+              }
+              if (!this.hiddenMasters.includes(accessory.context.eweDeviceId)) {
+                oAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW0");
+                oAccessory
+                  .getService(Service.Switch)
+                  .updateCharacteristic(Characteristic.On, masterState === "on");
+              }
+              break;
+          }
+        })
+        .catch(err => {
+          throw err;
+        });
     } catch (err) {
-      let str = "[" + accessory.displayName + "] could not be updated as " + err + ".";
-      this.log.error(str);
-      callback(str);
+      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+      if (accessory.context.reachableWAN) {
+        this.wsClient.requestUpdate(accessory).catch(() => {});
+        this.log.warn(
+          "[%s] requesting previous state to revert Homebridge status.",
+          accessory.displayName
+        );
+      }
     }
   }
   internalRFUpdate(accessory, rfChl, service, callback) {
+    callback();
     try {
-      if (!accessory.context.reachableWAN && !accessory.context.reachableLAN) {
-        throw "it is currently offline";
-      }
-      rfChl = parseInt(rfChl);
       let params = {
           cmd: "transmit",
-          rfChl,
+          rfChl: parseInt(rfChl),
         },
         rfService = accessory.getService(service);
-      if (this.debug) {
-        this.log(
-          "[%s %s] mimicking RF button press.",
-          accessory.displayName,
-          accessory.context.rfChls[rfChl]
+      this.sendDeviceUpdate(accessory, params)
+        .then(() => {
+          rfService.updateCharacteristic(Characteristic.On, true);
+          setTimeout(() => rfService.updateCharacteristic(Characteristic.On, false), 3000);
+        })
+        .catch(err => {
+          throw err;
+        });
+    } catch (err) {
+      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+      if (accessory.context.reachableWAN) {
+        this.wsClient.requestUpdate(accessory).catch(() => {});
+        this.log.warn(
+          "[%s] requesting previous state to revert Homebridge status.",
+          accessory.displayName
         );
       }
-      rfService.updateCharacteristic(Characteristic.On, true);
-      this.sendDeviceUpdate(accessory, params, callback);
-      setTimeout(() => rfService.updateCharacteristic(Characteristic.On, false), 3000);
-    } catch (err) {
-      let str = "[" + accessory.displayName + " " + name + "] could not be updated as " + err + ".";
-      this.log.error(str);
-      callback(str);
     }
   }
   externalValveUpdate(accessory, params) {
@@ -1895,7 +1969,6 @@ class eWeLink {
       let switchUp = params.switches[0].switch === "on" ? -1 : 0, // matrix of numbers to get
         switchDown = params.switches[1].switch === "on" ? 0 : 2; // ... the correct HomeKit value
       newPosition = switchUp + switchDown;
-
       wcService
         .updateCharacteristic(Characteristic.PositionState, newPosition)
         .updateCharacteristic(Characteristic.TargetPosition, newPosition * 100);
@@ -1990,12 +2063,12 @@ class eWeLink {
     try {
       let cService = accessory.getService(Service.WindowCovering);
       if (params.hasOwnProperty("switch") && params.hasOwnProperty("setclose")) {
+        let newPos = Math.abs(100 - parseInt(params.setclose));
         cService
-          .updateCharacteristic(
-            Characteristic.TargetPosition,
-            Math.abs(100 - parseInt(params.setclose))
-          )
+          .updateCharacteristic(Characteristic.TargetPosition, newPos)
+          .updateCharacteristic(Characteristic.CurrentPosition, newPos)
           .updateCharacteristic(Characteristic.PositionState, 2);
+        accessory.context.prevPos = Math.abs(100 - parseInt(params.setclose));
         return;
       }
     } catch (err) {
@@ -2148,7 +2221,7 @@ class eWeLink {
         );
         outletService.updateCharacteristic(
           Characteristic.OutletInUse,
-          parseFloat(params.power) > 0
+          parseFloat(params.power) > (this.config.inUsePowerThreshold || 0)
         );
         let isOn = accessory.getService(Service.Outlet).getCharacteristic(Characteristic.On).value;
         accessory.eveLogger.addEntry({
@@ -2331,7 +2404,6 @@ class eWeLink {
       ) {
         //*** RF Button ***\\
         // the device needed is SW% corresponding to params.rfChl
-
         this.devicesInHB.forEach(acc => {
           if (
             acc.context.eweDeviceId === accessory.context.eweDeviceId &&
diff --git a/lib/eWeLinkHTTP.js b/lib/eWeLinkHTTP.js
index 817bbade..3301c18e 100644
--- a/lib/eWeLinkHTTP.js
+++ b/lib/eWeLinkHTTP.js
@@ -54,7 +54,7 @@ module.exports = class eWeLinkHTTP {
         .then(res => {
           let body = res.data;
           if (!body.region) {
-            throw "Server did not respond with a region.\n" + JSON.stringify(body, null, 2);
+            reject("Server did not respond with a region.\n" + JSON.stringify(body, null, 2));
           }
           switch (body.region) {
             case "eu":
@@ -66,7 +66,7 @@ module.exports = class eWeLinkHTTP {
               this.httpHost = "cn-apia.coolkit.cn";
               break;
             default:
-              throw "No valid region received - [" + body.region + "].";
+              reject("No valid region received - [" + body.region + "].");
           }
           if (this.debug) {
             this.log("HTTP API host received [%s].", this.httpHost);
@@ -136,7 +136,7 @@ module.exports = class eWeLinkHTTP {
                 this.httpHost = "cn-apia.coolkit.cn";
                 break;
               default:
-                throw "No valid region received - [" + givenRegion + "].";
+                reject("No valid region received - [" + givenRegion + "].");
             }
             if (this.debug) {
               this.log("New HTTP API host received [%s].", this.httpHost);
@@ -145,7 +145,7 @@ module.exports = class eWeLinkHTTP {
             return;
           }
           if (!body.data.at) {
-            throw "No auth token received.\n" + JSON.stringify(body, null, 2);
+            reject("No auth token received.\n" + JSON.stringify(body, null, 2));
           }
           this.aToken = body.data.at;
           this.apiKey = body.data.user.apikey;
@@ -177,7 +177,7 @@ module.exports = class eWeLinkHTTP {
             !body.hasOwnProperty("error") ||
             (body.hasOwnProperty("error") && body.error !== 0)
           ) {
-            throw JSON.stringify(body, null, 2);
+            reject(JSON.stringify(body, null, 2));
           }
           let deviceList = [];
           if (body.data.thingList && body.data.thingList.length > 0) {
@@ -229,12 +229,12 @@ module.exports = class eWeLinkHTTP {
             !body.hasOwnProperty("error") ||
             (body.hasOwnProperty("error") && body.error !== 0)
           ) {
-            throw JSON.stringify(body, null, 2);
+            reject(JSON.stringify(body, null, 2));
           }
           if (body.data.thingList && body.data.thingList.length === 1) {
             resolve(body.data.thingList[0].itemData);
           } else {
-            throw "device not found in eWeLink";
+            reject("device not found in eWeLink");
           }
         })
         .catch(err => {
diff --git a/lib/eWeLinkLAN.js b/lib/eWeLinkLAN.js
index 3923e97d..da6bfe8d 100644
--- a/lib/eWeLinkLAN.js
+++ b/lib/eWeLinkLAN.js
@@ -130,7 +130,7 @@ module.exports = class eWeLinkLAN {
   sendUpdate(json) {
     return new Promise((resolve, reject) => {
       if (!this.deviceMap.get(json.deviceid).online) {
-        throw "device isn't reachable by LAN mode";
+        reject("device isn't reachable by LAN mode");
       }
       let apiKey,
         suffix,
@@ -142,7 +142,9 @@ module.exports = class eWeLinkLAN {
         params.switch = json.params.switch;
         suffix = "switch";
       } else {
-        throw "plugin does not support lan mode for this device yet - feel free to create a github issue";
+        reject(
+          "plugin does not support lan mode for this device yet - feel free to create a github issue"
+        );
       }
       if ((apiKey = this.deviceMap.get(json.deviceid).apiKey)) {
         let key = crypto.createHash("md5").update(Buffer.from(apiKey, "utf8")).digest(),
@@ -180,7 +182,7 @@ module.exports = class eWeLinkLAN {
             if (res.data.hasOwnProperty("error") && res.data.error === 0) {
               resolve();
             }
-            throw res.data;
+            reject(res.data);
           })
           .catch(err => reject(err));
       }
diff --git a/lib/eWeLinkWS.js b/lib/eWeLinkWS.js
index 31192209..e925836c 100644
--- a/lib/eWeLinkWS.js
+++ b/lib/eWeLinkWS.js
@@ -37,7 +37,7 @@ module.exports = class eWeLinkWS {
         .then(res => {
           let body = res.data;
           if (!body.domain) {
-            throw "Server did not respond with a web socket host.";
+            reject("Server did not respond with a web socket host.");
           }
           if (this.debug) {
             this.log("Web socket host received [%s].", body.domain);
@@ -176,6 +176,7 @@ module.exports = class eWeLinkWS {
       }
     });
     this.wsp.onClose.addListener((e, m) => {
+      this.wsIsOpen = false;
       if (e !== 1005) {
         this.log.warn("Web socket closed [%s].", e);
         if (e !== 1000) {
@@ -185,7 +186,6 @@ module.exports = class eWeLinkWS {
           this.log("Please try restarting Homebridge so that this plugin can work again.");
         }
       }
-      this.wsIsOpen = false;
       if (this.hbInterval) {
         clearInterval(this.hbInterval);
         this.hbInterval = null;
@@ -238,7 +238,7 @@ module.exports = class eWeLinkWS {
                 break;
               case 504:
               default:
-                throw "Unknown response";
+                reject("Unknown response");
             }
           })
           .catch(err => reject("Device update failed [" + err + "]."));
@@ -301,10 +301,18 @@ module.exports = class eWeLinkWS {
     this.emitter.addListener("update", f);
   }
   closeConnection() {
-    if (this.wsp && this.wsIsOpen) {
-      this.wsp.close();
-      this.log("Web socket gracefully closed.");
-    }
+    return new Promise((resolve, reject) => {
+      if (this.wsp && this.wsIsOpen) {
+        this.wsp
+          .close()
+          .then(() => {
+            this.log("Web socket gracefully closed.");
+            resolve();
+          })
+          .catch(err => reject(err));
+      }
+      resolve();
+    });
   }
   delay(ms) {
     return new Promise(resolve => setTimeout(resolve, ms));

From 0ddfa292fc874167325e09e7990c830e21de9af9 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 22 Sep 2020 16:14:03 +0100
Subject: [PATCH 0189/3183] 3.0.0-4

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d5c2bc87..2760225f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.0.0-3",
+  "version": "3.0.0-4",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index a442dbb2..a08b6aa2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.0.0-3",
+  "version": "3.0.0-4",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 906c2a55ee5d87c7a5f2223c273885ae0152e3a7 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 22 Sep 2020 16:56:02 +0100
Subject: [PATCH 0190/3183] next

---
 lib/eWeLink.js     |  5 +----
 lib/eWeLinkHTTP.js | 14 +++++++-------
 lib/eWeLinkWS.js   |  4 ++--
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index acd6c6a7..b779d1e3 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -548,10 +548,7 @@ class eWeLink {
           }
           cService
             .getCharacteristic(Characteristic.TargetPosition)
-            .on("set", (value, callback) => this.internalCurtainUpdate(accessory, value, callback))
-            .setProps({
-              minStep: 100,
-            });
+            .on("set", (value, callback) => this.internalCurtainUpdate(accessory, value, callback));
           break;
         case "garage":
           let gdService;
diff --git a/lib/eWeLinkHTTP.js b/lib/eWeLinkHTTP.js
index 3301c18e..817bbade 100644
--- a/lib/eWeLinkHTTP.js
+++ b/lib/eWeLinkHTTP.js
@@ -54,7 +54,7 @@ module.exports = class eWeLinkHTTP {
         .then(res => {
           let body = res.data;
           if (!body.region) {
-            reject("Server did not respond with a region.\n" + JSON.stringify(body, null, 2));
+            throw "Server did not respond with a region.\n" + JSON.stringify(body, null, 2);
           }
           switch (body.region) {
             case "eu":
@@ -66,7 +66,7 @@ module.exports = class eWeLinkHTTP {
               this.httpHost = "cn-apia.coolkit.cn";
               break;
             default:
-              reject("No valid region received - [" + body.region + "].");
+              throw "No valid region received - [" + body.region + "].";
           }
           if (this.debug) {
             this.log("HTTP API host received [%s].", this.httpHost);
@@ -136,7 +136,7 @@ module.exports = class eWeLinkHTTP {
                 this.httpHost = "cn-apia.coolkit.cn";
                 break;
               default:
-                reject("No valid region received - [" + givenRegion + "].");
+                throw "No valid region received - [" + givenRegion + "].";
             }
             if (this.debug) {
               this.log("New HTTP API host received [%s].", this.httpHost);
@@ -145,7 +145,7 @@ module.exports = class eWeLinkHTTP {
             return;
           }
           if (!body.data.at) {
-            reject("No auth token received.\n" + JSON.stringify(body, null, 2));
+            throw "No auth token received.\n" + JSON.stringify(body, null, 2);
           }
           this.aToken = body.data.at;
           this.apiKey = body.data.user.apikey;
@@ -177,7 +177,7 @@ module.exports = class eWeLinkHTTP {
             !body.hasOwnProperty("error") ||
             (body.hasOwnProperty("error") && body.error !== 0)
           ) {
-            reject(JSON.stringify(body, null, 2));
+            throw JSON.stringify(body, null, 2);
           }
           let deviceList = [];
           if (body.data.thingList && body.data.thingList.length > 0) {
@@ -229,12 +229,12 @@ module.exports = class eWeLinkHTTP {
             !body.hasOwnProperty("error") ||
             (body.hasOwnProperty("error") && body.error !== 0)
           ) {
-            reject(JSON.stringify(body, null, 2));
+            throw JSON.stringify(body, null, 2);
           }
           if (body.data.thingList && body.data.thingList.length === 1) {
             resolve(body.data.thingList[0].itemData);
           } else {
-            reject("device not found in eWeLink");
+            throw "device not found in eWeLink";
           }
         })
         .catch(err => {
diff --git a/lib/eWeLinkWS.js b/lib/eWeLinkWS.js
index e925836c..e99df8fd 100644
--- a/lib/eWeLinkWS.js
+++ b/lib/eWeLinkWS.js
@@ -37,7 +37,7 @@ module.exports = class eWeLinkWS {
         .then(res => {
           let body = res.data;
           if (!body.domain) {
-            reject("Server did not respond with a web socket host.");
+            throw "Server did not respond with a web socket host.";
           }
           if (this.debug) {
             this.log("Web socket host received [%s].", body.domain);
@@ -238,7 +238,7 @@ module.exports = class eWeLinkWS {
                 break;
               case 504:
               default:
-                reject("Unknown response");
+                throw "Unknown response";
             }
           })
           .catch(err => reject("Device update failed [" + err + "]."));

From de2bc9fe077ab87fe1e6fb1d0e2390a024731a65 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 22 Sep 2020 16:56:45 +0100
Subject: [PATCH 0191/3183] 3.0.0-5

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 2760225f..e096c48a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.0.0-4",
+  "version": "3.0.0-5",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index a08b6aa2..38bcdaab 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.0.0-4",
+  "version": "3.0.0-5",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From e807c07d1786f4b149ea58d3feb4bbee03102e38 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 22 Sep 2020 22:23:23 +0100
Subject: [PATCH 0192/3183] 3.0 new settings

---
 config.schema.json | 36 +++++++++++++++++++++++++++++++-----
 1 file changed, 31 insertions(+), 5 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index f44541f9..f1e23146 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -55,9 +55,15 @@
       "hideFromHB": {
         "type": "string",
         "title": "Hide Device Channels",
-        "description": "A list of device channels to hide from Homebridge. For example '10009553c8SW1' or multiple channels separated with a comma '10009553c8SW1,10009553c9SW2'. Only channels from switches, lights and irrigation valves can be hidden.",
+        "description": "A list of SW1, SW2, SW3 and SW4 to hide from Homebridge. For example '10009553c8SW1' or multiple channels separated with a comma '10009553c8SW1,10009553c9SW2'. Only channels from switches and lights can be hidden. This setting cannot be used to hide master devices (SW0).",
         "default": ""
       },
+      "disableHTTPRefresh": {
+        "type": "boolean",
+        "title": "Disable Initial Device Refresh",
+        "description": "If enabled, devices will not be refreshed with their most recent status from eWeLink when Homebridge starts. This setting can be useful for users who block their devices from accessing the internet.",
+        "default": false
+      },
       "lowBattThreshold": {
         "type": "integer",
         "title": "Low Battery Threshold",
@@ -90,14 +96,22 @@
         "minimum": 10,
         "maximum": 1800
       },
+      "inUsePowerThreshold": {
+        "type": "integer",
+        "title": "Outlet 'In Use' Threshold",
+        "description": "Homebridge will set the 'In Use' status of outlet devices to true when the wattage is above this number.",
+        "default": 0,
+        "minimum": 0,
+        "maximum": 100
+      },
       "hideTHSwitch": {
-        "title": "Hide TH10/TH16 Switch",
+        "title": "TH10/TH16 Hide Switch",
         "type": "boolean",
         "description": "If enabled, the switch for the TH10/TH16 devices will be hidden from Homebridge.",
         "default": false
       },
       "hideZBLDPress": {
-        "title": "Hide Double/Long Press",
+        "title": "Zigbee Button Hide Double/Long Press",
         "type": "boolean",
         "description": "If enabled, double and long press options will be hidden for the ZigBee button.",
         "default": false
@@ -228,12 +242,14 @@
   "layout": [
     {
       "type": "fieldset",
+      "title": "Required Settings",
+      "description": "These are the basic settings that are required for this plugin to work.",
       "items": ["countryCode", "username", "password"]
     },
     {
       "type": "fieldset",
-      "title": "Optional",
-      "description": "Only adjust these settings if you know what you are doing.",
+      "title": "Optional Settings (General)",
+      "description": "A variety of optional settings for general use of this plugin.",
       "expandable": true,
       "items": [
         "debug",
@@ -241,7 +257,17 @@
         "hideDevFromHB",
         "hideMasters",
         "hideFromHB",
+        "disableHTTPRefresh"
+      ]
+    },
+    {
+      "type": "fieldset",
+      "title": "Optional Settings (Device Specific)",
+      "description": "A variety of optional settings for specific device types.",
+      "expandable": true,
+      "items": [
         "lowBattThreshold",
+        "inUsePowerThreshold",
         "sensorTimeLength",
         "sensorTimeDifference",
         "valveTimeLength",

From 5799bc1af6bc7469d93954b618a6850368b63625 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 22 Sep 2020 22:41:09 +0100
Subject: [PATCH 0193/3183] Update eWeLinkHTTP.js

---
 lib/eWeLinkHTTP.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/eWeLinkHTTP.js b/lib/eWeLinkHTTP.js
index 817bbade..beb48f3b 100644
--- a/lib/eWeLinkHTTP.js
+++ b/lib/eWeLinkHTTP.js
@@ -198,7 +198,6 @@ module.exports = class eWeLinkHTTP {
         });
     });
   }
-
   getDevice(deviceId) {
     return new Promise((resolve, reject) => {
       axios

From 79ab91a2ec32d58ff3417777640cb977d231c571 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 22 Sep 2020 22:41:38 +0100
Subject: [PATCH 0194/3183] add device to lan map

---
 lib/eWeLink.js    | 11 ++++++++---
 lib/eWeLinkLAN.js |  9 +++++++++
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index b779d1e3..c355fc74 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -403,7 +403,9 @@ class eWeLink {
         .setCharacteristic(Characteristic.FirmwareRevision, device.params.fwVersion);
     }
     accessory.context.reachableWAN = device.online;
-    accessory.context.reachableLAN = this.lanDevices.get(device.deviceid).online || false;
+    accessory.context.reachableLAN = this.lanDevices.has(device.deviceid)
+      ? this.lanDevices.get(device.deviceid).online
+      : false;
     accessory.context.inUse = false;
     let str = accessory.context.reachableLAN
       ? "and found locally with IP [" + this.lanDevices.get(device.deviceid).ip + "]"
@@ -1132,7 +1134,10 @@ class eWeLink {
         );
         this.httpClient
           .getDevice(deviceId)
-          .then(res => this.initialiseDevice(res))
+          .then(device => {
+            this.initialiseDevice(device);
+            this.lanClient.addDeviceToMap(device);
+          })
           .catch(err => this.log.error("[%s] error getting info [%s]", deviceId, err));
       }
     }
@@ -2550,7 +2555,7 @@ class eWeLink {
                 Characteristic.MotionDetected,
                 params.hasOwnProperty("updateSource") &&
                   params.motion === 1 &&
-                  diff < (this.config.sensortimeDifference || 120)
+                  diff < (this.config.sensorTimeDifference || 120)
               );
             break;
           }
diff --git a/lib/eWeLinkLAN.js b/lib/eWeLinkLAN.js
index da6bfe8d..6958c166 100644
--- a/lib/eWeLinkLAN.js
+++ b/lib/eWeLinkLAN.js
@@ -191,6 +191,15 @@ module.exports = class eWeLinkLAN {
   receiveUpdate(f) {
     this.emitter.addListener("update", f);
   }
+  addDeviceToMap(device) {
+    this.deviceMap.set(device.deviceid, {
+      apiKey: device.devicekey,
+      online: this.ipOverrides.hasOwnProperty(device.deviceid) ? true : false,
+      ip: this.ipOverrides.hasOwnProperty(device.deviceid)
+        ? this.ipOverrides[device.deviceid]
+        : null,
+    });
+  }
   closeConnection() {
     dns.stopMonitoring();
     this.log("LAN monitoring gracefully stopped.");

From e47c72478813e2a6479bc20e6f03b059f9d463a5 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 22 Sep 2020 22:50:50 +0100
Subject: [PATCH 0195/3183] format blind service

---
 lib/eWeLink.js | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index c355fc74..c9e4b958 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -533,10 +533,7 @@ class eWeLink {
           }
           wcService
             .getCharacteristic(Characteristic.TargetPosition)
-            .on("set", (value, callback) => this.internalBlindUpdate(accessory, value, callback))
-            .setProps({
-              minStep: 100,
-            });
+            .on("set", (value, callback) => this.internalBlindUpdate(accessory, value, callback));
           break;
         case "curtain":
           let cService;
@@ -1168,9 +1165,6 @@ class eWeLink {
       }
       params.switches[2].switch = "off";
       params.switches[3].switch = "off";
-      //2. send the request
-      //3a. update the accessory if (2) is resolved
-      //3b. revert the device status if (2) is rejected with a requestDeviceStatus.
       this.sendDeviceUpdate(accessory, params)
         .then(() => {
           serviceValve

From 7408bff113cf22ec69677d4bac794034cfa4f911 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 22 Sep 2020 22:56:36 +0100
Subject: [PATCH 0196/3183] code formatting

---
 lib/eWeLinkWS.js | 321 +----------------------------------------------
 1 file changed, 1 insertion(+), 320 deletions(-)

diff --git a/lib/eWeLinkWS.js b/lib/eWeLinkWS.js
index e99df8fd..8bca24bb 100644
--- a/lib/eWeLinkWS.js
+++ b/lib/eWeLinkWS.js
@@ -1,320 +1 @@
-/* jshint esversion: 9, -W014, -W030, node: true */
-"use strict";
-const axios = require("axios"),
-  cns = require("./constants"),
-  eventemitter = require("events"),
-  ws = require("ws"),
-  wsp = require("websocket-as-promised");
-module.exports = class eWeLinkWS {
-  constructor(config, log, res) {
-    this.config = config;
-    this.log = log;
-    this.debug = this.config.debug || false;
-    this.debugReqRes = this.config.debugReqRes || false;
-    this.httpHost = res.httpHost;
-    this.aToken = res.aToken;
-    this.apiKey = res.apiKey;
-    this.wsIsOpen = false;
-    this.emitter = new eventemitter();
-    this.delaySend = 0;
-  }
-  getHost() {
-    return new Promise((resolve, reject) => {
-      axios({
-        method: "post",
-        url: "https://" + this.httpHost.replace("-api", "-disp") + "/dispatch/app",
-        headers: {
-          Authorization: "Bearer " + this.aToken,
-          "Content-Type": "application/json",
-        },
-        data: {
-          appid: cns.appId,
-          nonce: Math.random().toString(36).substr(2, 8),
-          ts: Math.floor(new Date().getTime() / 1000),
-          version: 8,
-        },
-      })
-        .then(res => {
-          let body = res.data;
-          if (!body.domain) {
-            throw "Server did not respond with a web socket host.";
-          }
-          if (this.debug) {
-            this.log("Web socket host received [%s].", body.domain);
-          }
-          this.wsHost = body.domain;
-          resolve(body.domain);
-        })
-        .catch(err => {
-          if (err.hasOwnProperty("code") && ["ENOTFOUND", "ETIMEDOUT"].includes(err.code)) {
-            this.log.warn("Unable to reach eWeLink. Retrying in 30 seconds.");
-            this.delay().then(() => resolve(this.getDevices()));
-          } else {
-            reject(err.message || err);
-          }
-        });
-    });
-  }
-  login() {
-    this.wsp = new wsp("wss://" + this.wsHost + ":8080/api/ws", {
-      createWebSocket: url => new ws(url),
-      extractMessageData: event => event,
-      attachRequestId: (data, requestId) =>
-        Object.assign(
-          {
-            sequence: requestId,
-          },
-          data
-        ),
-      extractRequestId: data => data && data.sequence,
-      packMessage: data => JSON.stringify(data),
-      unpackMessage: data => {
-        return data === "pong" ? data : JSON.parse(data);
-      },
-    });
-    this.wsp.open();
-    this.wsp.onOpen.addListener(() => {
-      this.wsIsOpen = true;
-      let sequence = Math.floor(new Date()).toString(),
-        payload = {
-          action: "userOnline",
-          apikey: this.apiKey,
-          appid: cns.appId,
-          at: this.aToken,
-          nonce: Math.random().toString(36).substr(2, 8),
-          sequence,
-          ts: Math.floor(new Date() / 1000),
-          userAgent: "app",
-          version: 8,
-        };
-      if (this.debugReqRes) {
-        let msg = JSON.stringify(payload, null, 2)
-          .replace(this.aToken, "**hidden**")
-          .replace(this.apiKey, "**hidden**");
-        this.log.warn("Sending WS login request. This text is yellow for clarity.\n%s", msg);
-      } else if (this.debug) {
-        this.log("Sending WS login request.");
-      }
-      this.wsp
-        .sendRequest(payload, {
-          requestId: sequence,
-        })
-        .then(res => {
-          if (
-            res.hasOwnProperty("config") &&
-            res.config.hb &&
-            res.config.hbInterval &&
-            !this.hbInterval
-          ) {
-            this.hbInterval = setInterval(() => {
-              this.wsp.send("ping");
-            }, (res.config.hbInterval + 7) * 1000);
-          } else {
-            throw "Unknown parameters received";
-          }
-        })
-        .catch(err => {
-          this.log.error("WS login failed [%s].", err);
-        });
-    });
-    this.wsp.onUnpackedMessage.addListener(device => {
-      if (device === "pong") return;
-      let onlineStatus = true;
-      if (!device.hasOwnProperty("params")) device.params = {};
-      if (device.hasOwnProperty("deviceid") && device.hasOwnProperty("error")) {
-        device.action = "update";
-        onlineStatus = device.error === 0;
-      }
-      if (device.hasOwnProperty("action")) {
-        switch (device.action) {
-          case "update":
-          case "sysmsg":
-            if (device.action === "sysmsg" && device.params.hasOwnProperty("online")) {
-              onlineStatus = device.params.online;
-            }
-            for (let param in device.params) {
-              if (device.params.hasOwnProperty(param)) {
-                if (!cns.paramsToKeep.includes(param.replace(/[0-9]/g, ""))) {
-                  delete device.params[param];
-                }
-              }
-            }
-            device.params.online = onlineStatus;
-            device.params.updateSource = "WS";
-            if (Object.keys(device.params).length > 0) {
-              let returnTemplate = {
-                deviceid: device.deviceid,
-                params: device.params,
-              };
-              if (this.debugReqRes) {
-                let msg = JSON.stringify(returnTemplate, null, 2).replace(
-                  device.deviceid,
-                  "**hidden**"
-                );
-                this.log("WS message received.\n%s", msg);
-              } else if (this.debug) {
-                this.log("WS message received.");
-              }
-              this.emitter.emit("update", returnTemplate);
-            }
-            break;
-          case "reportSubDevice":
-            return;
-          default:
-            this.log.warn(
-              "[%s] WS message has unknown action.\n" + JSON.stringify(device, null, 2),
-              device.deviceid
-            );
-            return;
-        }
-      } else if (device.hasOwnProperty("error") && device.error === 0) {
-        // *** Safe to ignore these messages *** \\
-      } else {
-        if (this.debug) {
-          this.log.warn("WS unknown command received.\n" + JSON.stringify(device, null, 2));
-        }
-      }
-    });
-    this.wsp.onClose.addListener((e, m) => {
-      this.wsIsOpen = false;
-      if (e !== 1005) {
-        this.log.warn("Web socket closed [%s].", e);
-        if (e !== 1000) {
-          this.log("Web socket will try to reconnect in five seconds.");
-          setTimeout(() => this.login(), 5000);
-        } else {
-          this.log("Please try restarting Homebridge so that this plugin can work again.");
-        }
-      }
-      if (this.hbInterval) {
-        clearInterval(this.hbInterval);
-        this.hbInterval = null;
-      }
-      this.wsp.removeAllListeners();
-    });
-    this.wsp.onError.addListener(e => {
-      this.log.error("Web socket error - [%s].", e);
-      if (e.code === "ECONNREFUSED") {
-        this.log.warn(
-          "Web socket will try to reconnect in five seconds then try the command again."
-        );
-        this.wsp.removeAllListeners();
-        setTimeout(() => this.login(), 5000);
-      } else {
-        this.log.warn("If this was unexpected then please try restarting Homebridge.");
-      }
-    });
-  }
-  sendUpdate(json) {
-    return new Promise((resolve, reject) => {
-      let sequence = Math.floor(new Date()).toString();
-      json = {
-        ...json,
-        ...{
-          action: "update",
-          sequence,
-          userAgent: "app",
-        },
-      };
-      let sendOperation = () => {
-        this.wsp
-          .sendRequest(json, {
-            requestId: sequence,
-          })
-          .then(device => {
-            if (this.debugReqRes) {
-              let msg = JSON.stringify(json, null, 2)
-                .replace(json.apikey, "**hidden**")
-                .replace(json.apiKey, "**hidden**")
-                .replace(json.deviceid, "**hidden**");
-              this.log.warn("WS message sent. This text is yellow for clarity.\n%s", msg);
-            } else if (this.debug) {
-              this.log("WS message sent.");
-            }
-            device.error = device.hasOwnProperty("error") ? device.error : 504; // mimic ewelink device offline
-            switch (device.error) {
-              case 0:
-                resolve();
-                break;
-              case 504:
-              default:
-                throw "Unknown response";
-            }
-          })
-          .catch(err => reject("Device update failed [" + err + "]."));
-      };
-      let checkToSend = () => {
-        if (this.wsp && this.wsIsOpen) {
-          sendOperation();
-        } else {
-          this.delay(2500).then(() => {
-            if (this.debug) {
-              this.log.warn("Will resend command when WS is reconnected.");
-            }
-            checkToSend();
-          });
-        }
-      };
-      checkToSend();
-    });
-  }
-  requestUpdate(accessory) {
-    return new Promise(resolve => {
-      let sequence = Math.floor(new Date()).toString(),
-        json = {
-          action: "query",
-          apikey: accessory.context.eweApiKey,
-          deviceid: accessory.context.eweDeviceId,
-          params: [],
-          sequence,
-          ts: 0,
-          userAgent: "app",
-        },
-        sendOperation = () => {
-          this.wsp.send(json);
-          if (this.debugReqRes) {
-            let msg = JSON.stringify(json, null, 2)
-              .replace(json.apikey, "**hidden**")
-              .replace(json.apiKey, "**hidden**")
-              .replace(json.deviceid, "**hidden**");
-            this.log.warn("WS message sent. This text is yellow for clarity.\n%s", msg);
-          } else if (this.debug) {
-            this.log("WS message sent.");
-          }
-        },
-        checkToSend = () => {
-          if (this.wsp && this.wsIsOpen) {
-            sendOperation();
-          } else {
-            this.delay(2500).then(() => {
-              if (this.debug) {
-                this.log.warn("Will resend command when WS is reconnected.");
-              }
-              checkToSend();
-            });
-          }
-        };
-      checkToSend();
-    });
-  }
-  receiveUpdate(f) {
-    this.emitter.addListener("update", f);
-  }
-  closeConnection() {
-    return new Promise((resolve, reject) => {
-      if (this.wsp && this.wsIsOpen) {
-        this.wsp
-          .close()
-          .then(() => {
-            this.log("Web socket gracefully closed.");
-            resolve();
-          })
-          .catch(err => reject(err));
-      }
-      resolve();
-    });
-  }
-  delay(ms) {
-    return new Promise(resolve => setTimeout(resolve, ms));
-  }
-};
+zb_dev;

From 8aec5f067ec5e39859e90be9c38678541daccf99 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 22 Sep 2020 22:57:44 +0100
Subject: [PATCH 0197/3183] 3.0.0-6

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index e096c48a..fbe82755 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.0.0-5",
+  "version": "3.0.0-6",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 38bcdaab..9d03ce36 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.0.0-5",
+  "version": "3.0.0-6",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 651ec7ad329a337dbfa76c8f0cc431aaf595797d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 23 Sep 2020 09:44:02 +0100
Subject: [PATCH 0198/3183] remove lan count

---
 lib/eWeLinkLAN.js | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/lib/eWeLinkLAN.js b/lib/eWeLinkLAN.js
index 6958c166..68aa7eb7 100644
--- a/lib/eWeLinkLAN.js
+++ b/lib/eWeLinkLAN.js
@@ -31,7 +31,6 @@ module.exports = class eWeLinkLAN {
           name: "_ewelink._tcp.local",
         })
         .then(res => {
-          let onlineCount = 0;
           res.forEach(device => {
             let d,
               deviceId = device.fqdn.replace("._ewelink._tcp.local", "").replace("eWeLink_", "");
@@ -43,13 +42,9 @@ module.exports = class eWeLinkLAN {
                   ip: device.address,
                 });
               }
-              onlineCount++;
             }
           });
-          resolve({
-            map: this.deviceMap,
-            count: onlineCount,
-          });
+          resolve(this.deviceMap);
         })
         .catch(err => reject(err));
     });

From 286387f143ceb715e181f4a7969fa78bb7ae72f9 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 23 Sep 2020 09:44:12 +0100
Subject: [PATCH 0199/3183] Update eWeLinkWS.js

---
 lib/eWeLinkWS.js | 321 ++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 320 insertions(+), 1 deletion(-)

diff --git a/lib/eWeLinkWS.js b/lib/eWeLinkWS.js
index 8bca24bb..e99df8fd 100644
--- a/lib/eWeLinkWS.js
+++ b/lib/eWeLinkWS.js
@@ -1 +1,320 @@
-zb_dev;
+/* jshint esversion: 9, -W014, -W030, node: true */
+"use strict";
+const axios = require("axios"),
+  cns = require("./constants"),
+  eventemitter = require("events"),
+  ws = require("ws"),
+  wsp = require("websocket-as-promised");
+module.exports = class eWeLinkWS {
+  constructor(config, log, res) {
+    this.config = config;
+    this.log = log;
+    this.debug = this.config.debug || false;
+    this.debugReqRes = this.config.debugReqRes || false;
+    this.httpHost = res.httpHost;
+    this.aToken = res.aToken;
+    this.apiKey = res.apiKey;
+    this.wsIsOpen = false;
+    this.emitter = new eventemitter();
+    this.delaySend = 0;
+  }
+  getHost() {
+    return new Promise((resolve, reject) => {
+      axios({
+        method: "post",
+        url: "https://" + this.httpHost.replace("-api", "-disp") + "/dispatch/app",
+        headers: {
+          Authorization: "Bearer " + this.aToken,
+          "Content-Type": "application/json",
+        },
+        data: {
+          appid: cns.appId,
+          nonce: Math.random().toString(36).substr(2, 8),
+          ts: Math.floor(new Date().getTime() / 1000),
+          version: 8,
+        },
+      })
+        .then(res => {
+          let body = res.data;
+          if (!body.domain) {
+            throw "Server did not respond with a web socket host.";
+          }
+          if (this.debug) {
+            this.log("Web socket host received [%s].", body.domain);
+          }
+          this.wsHost = body.domain;
+          resolve(body.domain);
+        })
+        .catch(err => {
+          if (err.hasOwnProperty("code") && ["ENOTFOUND", "ETIMEDOUT"].includes(err.code)) {
+            this.log.warn("Unable to reach eWeLink. Retrying in 30 seconds.");
+            this.delay().then(() => resolve(this.getDevices()));
+          } else {
+            reject(err.message || err);
+          }
+        });
+    });
+  }
+  login() {
+    this.wsp = new wsp("wss://" + this.wsHost + ":8080/api/ws", {
+      createWebSocket: url => new ws(url),
+      extractMessageData: event => event,
+      attachRequestId: (data, requestId) =>
+        Object.assign(
+          {
+            sequence: requestId,
+          },
+          data
+        ),
+      extractRequestId: data => data && data.sequence,
+      packMessage: data => JSON.stringify(data),
+      unpackMessage: data => {
+        return data === "pong" ? data : JSON.parse(data);
+      },
+    });
+    this.wsp.open();
+    this.wsp.onOpen.addListener(() => {
+      this.wsIsOpen = true;
+      let sequence = Math.floor(new Date()).toString(),
+        payload = {
+          action: "userOnline",
+          apikey: this.apiKey,
+          appid: cns.appId,
+          at: this.aToken,
+          nonce: Math.random().toString(36).substr(2, 8),
+          sequence,
+          ts: Math.floor(new Date() / 1000),
+          userAgent: "app",
+          version: 8,
+        };
+      if (this.debugReqRes) {
+        let msg = JSON.stringify(payload, null, 2)
+          .replace(this.aToken, "**hidden**")
+          .replace(this.apiKey, "**hidden**");
+        this.log.warn("Sending WS login request. This text is yellow for clarity.\n%s", msg);
+      } else if (this.debug) {
+        this.log("Sending WS login request.");
+      }
+      this.wsp
+        .sendRequest(payload, {
+          requestId: sequence,
+        })
+        .then(res => {
+          if (
+            res.hasOwnProperty("config") &&
+            res.config.hb &&
+            res.config.hbInterval &&
+            !this.hbInterval
+          ) {
+            this.hbInterval = setInterval(() => {
+              this.wsp.send("ping");
+            }, (res.config.hbInterval + 7) * 1000);
+          } else {
+            throw "Unknown parameters received";
+          }
+        })
+        .catch(err => {
+          this.log.error("WS login failed [%s].", err);
+        });
+    });
+    this.wsp.onUnpackedMessage.addListener(device => {
+      if (device === "pong") return;
+      let onlineStatus = true;
+      if (!device.hasOwnProperty("params")) device.params = {};
+      if (device.hasOwnProperty("deviceid") && device.hasOwnProperty("error")) {
+        device.action = "update";
+        onlineStatus = device.error === 0;
+      }
+      if (device.hasOwnProperty("action")) {
+        switch (device.action) {
+          case "update":
+          case "sysmsg":
+            if (device.action === "sysmsg" && device.params.hasOwnProperty("online")) {
+              onlineStatus = device.params.online;
+            }
+            for (let param in device.params) {
+              if (device.params.hasOwnProperty(param)) {
+                if (!cns.paramsToKeep.includes(param.replace(/[0-9]/g, ""))) {
+                  delete device.params[param];
+                }
+              }
+            }
+            device.params.online = onlineStatus;
+            device.params.updateSource = "WS";
+            if (Object.keys(device.params).length > 0) {
+              let returnTemplate = {
+                deviceid: device.deviceid,
+                params: device.params,
+              };
+              if (this.debugReqRes) {
+                let msg = JSON.stringify(returnTemplate, null, 2).replace(
+                  device.deviceid,
+                  "**hidden**"
+                );
+                this.log("WS message received.\n%s", msg);
+              } else if (this.debug) {
+                this.log("WS message received.");
+              }
+              this.emitter.emit("update", returnTemplate);
+            }
+            break;
+          case "reportSubDevice":
+            return;
+          default:
+            this.log.warn(
+              "[%s] WS message has unknown action.\n" + JSON.stringify(device, null, 2),
+              device.deviceid
+            );
+            return;
+        }
+      } else if (device.hasOwnProperty("error") && device.error === 0) {
+        // *** Safe to ignore these messages *** \\
+      } else {
+        if (this.debug) {
+          this.log.warn("WS unknown command received.\n" + JSON.stringify(device, null, 2));
+        }
+      }
+    });
+    this.wsp.onClose.addListener((e, m) => {
+      this.wsIsOpen = false;
+      if (e !== 1005) {
+        this.log.warn("Web socket closed [%s].", e);
+        if (e !== 1000) {
+          this.log("Web socket will try to reconnect in five seconds.");
+          setTimeout(() => this.login(), 5000);
+        } else {
+          this.log("Please try restarting Homebridge so that this plugin can work again.");
+        }
+      }
+      if (this.hbInterval) {
+        clearInterval(this.hbInterval);
+        this.hbInterval = null;
+      }
+      this.wsp.removeAllListeners();
+    });
+    this.wsp.onError.addListener(e => {
+      this.log.error("Web socket error - [%s].", e);
+      if (e.code === "ECONNREFUSED") {
+        this.log.warn(
+          "Web socket will try to reconnect in five seconds then try the command again."
+        );
+        this.wsp.removeAllListeners();
+        setTimeout(() => this.login(), 5000);
+      } else {
+        this.log.warn("If this was unexpected then please try restarting Homebridge.");
+      }
+    });
+  }
+  sendUpdate(json) {
+    return new Promise((resolve, reject) => {
+      let sequence = Math.floor(new Date()).toString();
+      json = {
+        ...json,
+        ...{
+          action: "update",
+          sequence,
+          userAgent: "app",
+        },
+      };
+      let sendOperation = () => {
+        this.wsp
+          .sendRequest(json, {
+            requestId: sequence,
+          })
+          .then(device => {
+            if (this.debugReqRes) {
+              let msg = JSON.stringify(json, null, 2)
+                .replace(json.apikey, "**hidden**")
+                .replace(json.apiKey, "**hidden**")
+                .replace(json.deviceid, "**hidden**");
+              this.log.warn("WS message sent. This text is yellow for clarity.\n%s", msg);
+            } else if (this.debug) {
+              this.log("WS message sent.");
+            }
+            device.error = device.hasOwnProperty("error") ? device.error : 504; // mimic ewelink device offline
+            switch (device.error) {
+              case 0:
+                resolve();
+                break;
+              case 504:
+              default:
+                throw "Unknown response";
+            }
+          })
+          .catch(err => reject("Device update failed [" + err + "]."));
+      };
+      let checkToSend = () => {
+        if (this.wsp && this.wsIsOpen) {
+          sendOperation();
+        } else {
+          this.delay(2500).then(() => {
+            if (this.debug) {
+              this.log.warn("Will resend command when WS is reconnected.");
+            }
+            checkToSend();
+          });
+        }
+      };
+      checkToSend();
+    });
+  }
+  requestUpdate(accessory) {
+    return new Promise(resolve => {
+      let sequence = Math.floor(new Date()).toString(),
+        json = {
+          action: "query",
+          apikey: accessory.context.eweApiKey,
+          deviceid: accessory.context.eweDeviceId,
+          params: [],
+          sequence,
+          ts: 0,
+          userAgent: "app",
+        },
+        sendOperation = () => {
+          this.wsp.send(json);
+          if (this.debugReqRes) {
+            let msg = JSON.stringify(json, null, 2)
+              .replace(json.apikey, "**hidden**")
+              .replace(json.apiKey, "**hidden**")
+              .replace(json.deviceid, "**hidden**");
+            this.log.warn("WS message sent. This text is yellow for clarity.\n%s", msg);
+          } else if (this.debug) {
+            this.log("WS message sent.");
+          }
+        },
+        checkToSend = () => {
+          if (this.wsp && this.wsIsOpen) {
+            sendOperation();
+          } else {
+            this.delay(2500).then(() => {
+              if (this.debug) {
+                this.log.warn("Will resend command when WS is reconnected.");
+              }
+              checkToSend();
+            });
+          }
+        };
+      checkToSend();
+    });
+  }
+  receiveUpdate(f) {
+    this.emitter.addListener("update", f);
+  }
+  closeConnection() {
+    return new Promise((resolve, reject) => {
+      if (this.wsp && this.wsIsOpen) {
+        this.wsp
+          .close()
+          .then(() => {
+            this.log("Web socket gracefully closed.");
+            resolve();
+          })
+          .catch(err => reject(err));
+      }
+      resolve();
+    });
+  }
+  delay(ms) {
+    return new Promise(resolve => setTimeout(resolve, ms));
+  }
+};

From 6a011a41f5f8792dd5b72bc91eb34c9eeb0d9619 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 23 Sep 2020 09:44:33 +0100
Subject: [PATCH 0200/3183] reorder functions for ease

---
 lib/eWeLink.js | 1078 ++++++++++++++++++++++++------------------------
 1 file changed, 539 insertions(+), 539 deletions(-)

diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index c9e4b958..76fe7030 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -69,8 +69,7 @@ class eWeLink {
         return this.lanClient.getHosts();
       })
       .then(res => {
-        this.lanDevices = res.map;
-        this.lanCount = res.count;
+        this.lanDevices = res;
         return this.lanClient.startMonitor();
       })
       .then(() => {
@@ -91,7 +90,6 @@ class eWeLink {
           //*** Logging always helps to see if everything is okay so far ***\\
           this.log("[%s] eWeLink devices loaded from the Homebridge cache.", this.devicesInHB.size);
           this.log("[%s] primary devices loaded from your eWeLink account.", this.devicesInEW.size);
-          this.log("[%s] primary devices were discovered on your local network.", this.lanCount);
           //*** Remove Homebridge accessories that don't appear in eWeLink ***\\
           this.devicesInHB.forEach(a => {
             if (!this.devicesInEW.has(a.context.eweDeviceId)) {
@@ -118,7 +116,6 @@ class eWeLink {
   }
   initialiseDevice(device) {
     let accessory;
-    //*** First add the device if it isn't already in Homebridge ***\\
     //*** IRRIGATION VALVES ***\\
     if (
       device.extra.uiid === 2 &&
@@ -129,6 +126,14 @@ class eWeLink {
         ? this.devicesInHB.get(device.deviceid + "SWX")
         : this.addAccessory(device, device.deviceid + "SWX", "valve");
     }
+    //*** CURTAINS ***\\
+    else if (cns.devicesCurtain.includes(device.extra.uiid)) {
+      accessory = this.devicesInHB.has(device.deviceid + "SWX")
+        ? this.devicesInHB.get(device.deviceid + "SWX")
+        : this.addAccessory(device, device.deviceid + "SWX", "curtain", false, {
+            prevPos: 0,
+          });
+    }
     //*** WINDOW BLINDS ***\\
     else if (
       this.cusG.has(device.deviceid + "SWX") &&
@@ -142,7 +147,7 @@ class eWeLink {
             cacheTargetPosition: 0,
           });
     }
-    //*** GARAGES ***\\
+    //*** GARAGE DOORS ***\\
     else if (
       this.cusG.has(device.deviceid + "SWX") &&
       this.cusG.get(device.deviceid + "SWX").type === "garage"
@@ -160,15 +165,7 @@ class eWeLink {
         ? this.devicesInHB.get(device.deviceid + "SWX")
         : this.addAccessory(device, device.deviceid + "SWX", "lock");
     }
-    //*** CURTAINS ***\\
-    else if (cns.devicesCurtain.includes(device.extra.uiid)) {
-      accessory = this.devicesInHB.has(device.deviceid + "SWX")
-        ? this.devicesInHB.get(device.deviceid + "SWX")
-        : this.addAccessory(device, device.deviceid + "SWX", "curtain", false, {
-            prevPos: 0,
-          });
-    }
-    //*** DW2 SENSORS ***\\
+    //*** SENSORS (DW2) ***\\
     else if (cns.devicesSensor.includes(device.extra.uiid)) {
       accessory = this.devicesInHB.has(device.deviceid + "SWX")
         ? this.devicesInHB.get(device.deviceid + "SWX")
@@ -393,10 +390,7 @@ class eWeLink {
       );
       return;
     }
-    if (!accessory) {
-      return;
-    }
-    //*** Next refresh the device ***\\
+    if (!accessory) return;
     if (!this.hiddenMasters.includes(device.deviceid)) {
       accessory
         .getService(Service.AccessoryInformation)
@@ -429,6 +423,9 @@ class eWeLink {
           accessory.context.type,
           accessory.context.channelCount
         );
+        this.log.warn(
+          'If you are unsure how to do this, please see "https://github.com/bwp91/homebridge-ewelink/wiki/How-to-remove-an-accessory-from-the-cache'
+        );
       }
     }
   }
@@ -521,33 +518,33 @@ class eWeLink {
               });
           });
           break;
-        case "blind":
-          let wcService;
-          if (!(wcService = accessory.getService(Service.WindowCovering))) {
+        case "curtain":
+          let cService;
+          if (!(cService = accessory.getService(Service.WindowCovering))) {
             accessory
               .addService(Service.WindowCovering)
               .setCharacteristic(Characteristic.CurrentPosition, 0)
               .setCharacteristic(Characteristic.TargetPosition, 0)
               .setCharacteristic(Characteristic.PositionState, 2);
-            wcService = accessory.getService(Service.WindowCovering);
+            cService = accessory.getService(Service.WindowCovering);
           }
-          wcService
+          cService
             .getCharacteristic(Characteristic.TargetPosition)
-            .on("set", (value, callback) => this.internalBlindUpdate(accessory, value, callback));
+            .on("set", (value, callback) => this.internalCurtainUpdate(accessory, value, callback));
           break;
-        case "curtain":
-          let cService;
-          if (!(cService = accessory.getService(Service.WindowCovering))) {
+        case "blind":
+          let wcService;
+          if (!(wcService = accessory.getService(Service.WindowCovering))) {
             accessory
               .addService(Service.WindowCovering)
               .setCharacteristic(Characteristic.CurrentPosition, 0)
               .setCharacteristic(Characteristic.TargetPosition, 0)
               .setCharacteristic(Characteristic.PositionState, 2);
-            cService = accessory.getService(Service.WindowCovering);
+            wcService = accessory.getService(Service.WindowCovering);
           }
-          cService
+          wcService
             .getCharacteristic(Characteristic.TargetPosition)
-            .on("set", (value, callback) => this.internalCurtainUpdate(accessory, value, callback));
+            .on("set", (value, callback) => this.internalBlindUpdate(accessory, value, callback));
           break;
         case "garage":
           let gdService;
@@ -910,6 +907,11 @@ class eWeLink {
           this.externalValveUpdate(accessory, newParams);
         }
         return true;
+      case "curtain":
+        if (Object.keys(newParams).some(v => cns.devicesCurtainParams.includes(v))) {
+          this.externalCurtainUpdate(accessory, newParams);
+        }
+        return true;
       case "blind":
         if (
           Object.keys(newParams).some(v => cns.devicesBlindParams.includes(v)) &&
@@ -931,11 +933,6 @@ class eWeLink {
           this.externalLockUpdate(accessory, newParams);
         }
         return true;
-      case "curtain":
-        if (Object.keys(newParams).some(v => cns.devicesCurtainParams.includes(v))) {
-          this.externalCurtainUpdate(accessory, newParams);
-        }
-        return true;
       case "sensor":
         if (Object.keys(newParams).some(v => cns.devicesSensorParams.includes(v))) {
           this.externalSensorUpdate(accessory, newParams);
@@ -1121,6 +1118,9 @@ class eWeLink {
           accessory.context.type,
           accessory.context.channelCount
         );
+        this.log.warn(
+          'If you are unsure how to do this, please see "https://github.com/bwp91/homebridge-ewelink/wiki/How-to-remove-an-accessory-from-the-cache'
+        );
       }
     } else {
       if (!(this.config.hideDevFromHB || "").includes(deviceId)) {
@@ -1135,7 +1135,13 @@ class eWeLink {
             this.initialiseDevice(device);
             this.lanClient.addDeviceToMap(device);
           })
-          .catch(err => this.log.error("[%s] error getting info [%s]", deviceId, err));
+          .catch(err => {
+            this.log.error("[%s] error getting info [%s]", deviceId, err);
+            this.log.error(
+              "[%s] Please try restarting Homebridge so this device is added.",
+              deviceId
+            );
+          });
       }
     }
   }
@@ -1199,6 +1205,81 @@ class eWeLink {
       }
     }
   }
+  externalValveUpdate(accessory, params) {
+    try {
+      ["A", "B"].forEach((v, k) => {
+        let valveService = accessory.getService("Valve " + v);
+        valveService
+          .updateCharacteristic(Characteristic.Active, params.switches[k].switch === "on")
+          .updateCharacteristic(Characteristic.InUse, params.switches[k].switch === "on");
+        if (params.switches[k].switch === "on") {
+          let timer = valveService.getCharacteristic(Characteristic.SetDuration).value;
+          valveService.updateCharacteristic(Characteristic.RemainingDuration, timer);
+          valveService.timer = setTimeout(() => {
+            valveService.setCharacteristic(Characteristic.Active, 0);
+          }, timer * 1000);
+        } else {
+          valveService.updateCharacteristic(Characteristic.RemainingDuration, 0);
+          clearTimeout(valveService.timer);
+        }
+      });
+    } catch (err) {
+      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+    }
+  }
+  internalCurtainUpdate(accessory, value, callback) {
+    callback();
+    try {
+      let params,
+        cService = accessory.getService(Service.WindowCovering),
+        prevPos = accessory.context.prevPos;
+      if (value === prevPos) return;
+      if (value === 0 || value === 100) {
+        params = {
+          switch: value === 100 ? "on" : "off",
+        };
+      } else {
+        params = {
+          setclose: Math.abs(100 - value),
+        };
+      }
+      this.sendDeviceUpdate(accessory, params)
+        .then(() => {
+          cService
+            .updateCharacteristic(Characteristic.TargetPosition, value)
+            .updateCharacteristic(Characteristic.PositionState, value > prevPos ? 1 : 0);
+          accessory.context.prevPos = value;
+        })
+        .catch(err => {
+          throw err;
+        });
+    } catch (err) {
+      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+      if (accessory.context.reachableWAN) {
+        this.wsClient.requestUpdate(accessory).catch(() => {});
+        this.log.warn(
+          "[%s] requesting previous state to revert Homebridge status.",
+          accessory.displayName
+        );
+      }
+    }
+  }
+  externalCurtainUpdate(accessory, params) {
+    try {
+      let cService = accessory.getService(Service.WindowCovering);
+      if (params.hasOwnProperty("switch") && params.hasOwnProperty("setclose")) {
+        let newPos = Math.abs(100 - parseInt(params.setclose));
+        cService
+          .updateCharacteristic(Characteristic.TargetPosition, newPos)
+          .updateCharacteristic(Characteristic.CurrentPosition, newPos)
+          .updateCharacteristic(Characteristic.PositionState, 2);
+        accessory.context.prevPos = Math.abs(100 - parseInt(params.setclose));
+        return;
+      }
+    } catch (err) {
+      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+    }
+  }
   internalBlindUpdate(accessory, value, callback) {
     callback();
     try {
@@ -1253,6 +1334,38 @@ class eWeLink {
       }
     }
   }
+  externalBlindUpdate(accessory, params) {
+    try {
+      let blindConfig,
+        newPosition,
+        wcService = accessory.getService(Service.WindowCovering);
+      if (!(blindConfig = this.cusG.get(accessory.context.hbDeviceId))) {
+        throw "group config missing";
+      }
+      if (blindConfig.type !== "blind" || blindConfig.setup !== "twoSwitch") {
+        throw "improper configuration";
+      }
+      // TargetPosition -> 0 for closed 100 for open (value)
+      // CurrentPosition -> 0 for closed 100 for open
+      // PositionState -> 0 going down, 1 going up, 2 = stopped
+      if (params.switches[0].switch === "off" && params.switches[1].switch === "off") {
+        return;
+      }
+      let switchUp = params.switches[0].switch === "on" ? -1 : 0, // matrix of numbers to get
+        switchDown = params.switches[1].switch === "on" ? 0 : 2; // ... the correct HomeKit value
+      newPosition = switchUp + switchDown;
+      wcService
+        .updateCharacteristic(Characteristic.PositionState, newPosition)
+        .updateCharacteristic(Characteristic.TargetPosition, newPosition * 100);
+      setTimeout(() => {
+        wcService
+          .updateCharacteristic(Characteristic.PositionState, 2)
+          .updateCharacteristic(Characteristic.CurrentPosition, newPosition * 100);
+      }, parseInt(blindConfig.operationTime) * 100);
+    } catch (err) {
+      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+    }
+  }
   internalGarageUpdate(accessory, value, callback) {
     callback();
     try {
@@ -1338,6 +1451,56 @@ class eWeLink {
       }
     }
   }
+  externalGarageUpdate(accessory, params) {
+    try {
+      let garageConfig,
+        gcService = accessory.getService(Service.GarageDoorOpener),
+        oldPos = gcService.getCharacteristic(Characteristic.CurrentDoorState).value,
+        newPos = [0, 2].includes(oldPos) ? 3 : 2;
+      if (!(garageConfig = this.cusG.get(accessory.context.hbDeviceId))) {
+        throw "group config missing";
+      }
+      if (
+        garageConfig.type !== "garage" ||
+        !["oneSwitch", "twoSwitch"].includes(garageConfig.setup)
+      ) {
+        throw "improper configuration";
+      }
+      if (accessory.context.inUse || garageConfig.sensorId) {
+        return;
+      }
+      switch (garageConfig.setup) {
+        case "oneSwitch":
+          if (params.switch === "off") {
+            return;
+          }
+          break;
+        case "twoSwitch":
+          if (
+            params.switches[0].switch === params.switches[1].switch ||
+            params.switches[oldPos % 2].switch === "on"
+          ) {
+            return;
+          }
+          break;
+      }
+      accessory.context.inUse = true;
+      if (!garageConfig.sensorId) {
+        gcService
+          .updateCharacteristic(Characteristic.CurrentDoorState, newPos)
+          .updateCharacteristic(Characteristic.TargetDoorState, newPos - 2);
+        setTimeout(() => {
+          gcService.updateCharacteristic(Characteristic.CurrentDoorState, newPos - 2);
+        }, parseInt(garageConfig.operationTime) * 100);
+      }
+      setTimeout(() => {
+        accessory.context.inUse = false;
+      }, parseInt(garageConfig.operationTime) * 100);
+    } catch (err) {
+      accessory.context.inUse = false;
+      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+    }
+  }
   internalLockUpdate(accessory, value, callback) {
     callback();
     try {
@@ -1380,48 +1543,78 @@ class eWeLink {
       }
     }
   }
-  internalCurtainUpdate(accessory, value, callback) {
-    callback();
+  externalLockUpdate(accessory, params) {
     try {
-      let params,
-        cService = accessory.getService(Service.WindowCovering),
-        prevPos = accessory.context.prevPos;
-      if (value === prevPos) return;
-      if (value === 0 || value === 100) {
-        // so to fully open, our $value will be 100, we send switch: "on"
-        //    to fully shut, our $value will be   0, we send switch: "off"
-        params = {
-          switch: value === 100 ? "on" : "off",
-        };
-      } else {
-        // for a  % midway,  scale the $value >--< 100 and setclose: newVal AS INT
-        params = {
-          setclose: Math.abs(100 - value),
-        };
+      let lockConfig,
+        lmService = accessory.getService(Service.LockMechanism);
+      if (!(lockConfig = this.cusG.get(accessory.context.hbDeviceId))) {
+        throw "group config missing";
       }
-      this.sendDeviceUpdate(accessory, params)
-        .then(() => {
-          cService
-            .updateCharacteristic(Characteristic.TargetPosition, value)
-            .updateCharacteristic(Characteristic.PositionState, value > prevPos ? 1 : 0);
-          // TargetPosition -> 0 for closed 100 for open (value)
-          // CurrentPosition -> 0 for closed 100 for open
-          // PositionState -> 0 going down, 1 going up, 2 = stopped
-          accessory.context.prevPos = value;
-        })
-        .catch(err => {
-          throw err;
-        });
-    } catch (err) {
-      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
-      if (accessory.context.reachableWAN) {
-        this.wsClient.requestUpdate(accessory).catch(() => {});
-        this.log.warn(
-          "[%s] requesting previous state to revert Homebridge status.",
-          accessory.displayName
-        );
+      if (lockConfig.type !== "lock") {
+        throw "improper configuration";
       }
-    }
+      if (params.switch === "off" || accessory.context.inUse) {
+        return;
+      }
+      accessory.context.inUse = true;
+      lmService
+        .updateCharacteristic(Characteristic.LockCurrentState, 0)
+        .updateCharacteristic(Characteristic.LockTargetState, 0);
+      setTimeout(() => {
+        lmService
+          .updateCharacteristic(Characteristic.LockCurrentState, 1)
+          .updateCharacteristic(Characteristic.LockTargetState, 1);
+        accessory.context.inUse = false;
+      }, parseInt(lockConfig.operationTime) * 100);
+    } catch (err) {
+      accessory.context.inUse = false;
+      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+    }
+  }
+  externalSensorUpdate(accessory, params) {
+    try {
+      if (params.hasOwnProperty("battery")) {
+        let batteryService =
+            accessory.getService(Service.BatteryService) ||
+            accessory.addService(Service.BatteryService),
+          scaledBattery = Math.round(params.battery * 33.3);
+        batteryService.updateCharacteristic(Characteristic.BatteryLevel, scaledBattery);
+        batteryService.updateCharacteristic(
+          Characteristic.StatusLowBattery,
+          scaledBattery < (this.config.lowBattThreshold || 25)
+        );
+      }
+      let newState = params.switch === "on" ? 1 : 0,
+        oAccessory = false,
+        contactService = accessory.getService(Service.ContactSensor);
+      contactService.updateCharacteristic(Characteristic.ContactSensorState, newState);
+      this.cusG.forEach(group => {
+        if (group.sensorId === accessory.context.eweDeviceId && group.type === "garage") {
+          if ((oAccessory = this.devicesInHB.get(group.deviceId + "SWX"))) {
+            switch (newState) {
+              case 0:
+                oAccessory
+                  .getService(Service.GarageDoorOpener)
+                  .updateCharacteristic(Characteristic.TargetDoorState, 1)
+                  .updateCharacteristic(Characteristic.CurrentDoorState, 1);
+                break;
+              case 1:
+                setTimeout(() => {
+                  oAccessory
+                    .getService(Service.GarageDoorOpener)
+                    .updateCharacteristic(Characteristic.TargetDoorState, 0)
+                    .updateCharacteristic(Characteristic.CurrentDoorState, 0);
+                }, group.operationTime * 100);
+                break;
+              default:
+                throw "unknown sensor status received [" + newState + "]";
+            }
+          }
+        }
+      });
+    } catch (err) {
+      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+    }
   }
   internalFanUpdate(accessory, type, value, callback) {
     callback();
@@ -1476,6 +1669,51 @@ class eWeLink {
       }
     }
   }
+  externalFanUpdate(accessory, params) {
+    try {
+      let light,
+        status,
+        speed,
+        lightService = accessory.getService(Service.Lightbulb),
+        fanService = accessory.getService(Service.Fanv2);
+      if (Array.isArray(params.switches)) {
+        light = params.switches[0].switch === "on";
+        switch (params.switches[1].switch + params.switches[2].switch + params.switches[3].switch) {
+          default:
+            status = 0;
+            speed = 0;
+            break;
+          case "onoffoff":
+            status = 1;
+            speed = 33;
+            break;
+          case "ononoff":
+            status = 1;
+            speed = 66;
+            break;
+          case "onoffon":
+            status = 1;
+            speed = 99;
+        }
+      } else if (
+        params.hasOwnProperty("light") &&
+        params.hasOwnProperty("fan") &&
+        params.hasOwnProperty("speed")
+      ) {
+        light = params.light === "on";
+        status = params.fan === "on" ? 1 : 0;
+        speed = params.speed * 33 * status;
+      } else {
+        throw "unknown parameters received";
+      }
+      lightService.updateCharacteristic(Characteristic.On, light);
+      fanService
+        .updateCharacteristic(Characteristic.Active, status)
+        .updateCharacteristic(Characteristic.RotationSpeed, speed);
+    } catch (err) {
+      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+    }
+  }
   internalThermostatUpdate(accessory, value, callback) {
     callback();
     try {
@@ -1502,6 +1740,49 @@ class eWeLink {
       }
     }
   }
+  externalThermostatUpdate(accessory, params) {
+    try {
+      if (
+        !this.config.hideTHSwitch &&
+        (params.hasOwnProperty("switch") || params.hasOwnProperty("mainSwitch"))
+      ) {
+        let newState = params.hasOwnProperty("switch")
+            ? params.switch === "on"
+            : params.mainSwitch === "on",
+          switchService = accessory.getService(Service.Switch);
+        switchService.updateCharacteristic(Characteristic.On, newState);
+      }
+      let eveLog = {
+        time: Date.now(),
+      };
+      if (
+        params.hasOwnProperty("currentTemperature") &&
+        accessory.getService(Service.TemperatureSensor)
+      ) {
+        let currentTemp =
+          params.currentTemperature !== "unavailable" ? params.currentTemperature : 0;
+        accessory
+          .getService(Service.TemperatureSensor)
+          .updateCharacteristic(Characteristic.CurrentTemperature, currentTemp);
+        eveLog.temp = parseFloat(currentTemp);
+      }
+      if (
+        params.hasOwnProperty("currentHumidity") &&
+        accessory.getService(Service.HumiditySensor)
+      ) {
+        let currentHumi = params.currentHumidity !== "unavailable" ? params.currentHumidity : 0;
+        accessory
+          .getService(Service.HumiditySensor)
+          .updateCharacteristic(Characteristic.CurrentRelativeHumidity, currentHumi);
+        eveLog.humidity = parseFloat(currentHumi);
+      }
+      if (eveLog.hasOwnProperty("temp") || eveLog.hasOwnProperty("humidity")) {
+        accessory.eveLogger.addEntry(eveLog);
+      }
+    } catch (err) {
+      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+    }
+  }
   internalOutletUpdate(accessory, value, callback) {
     callback();
     try {
@@ -1527,6 +1808,43 @@ class eWeLink {
       }
     }
   }
+  externalOutletUpdate(accessory, params) {
+    try {
+      let outletService = accessory.getService(Service.Outlet);
+      if (params.hasOwnProperty("switch")) {
+        outletService.updateCharacteristic(Characteristic.On, params.switch === "on");
+      }
+      if (params.hasOwnProperty("power")) {
+        outletService.updateCharacteristic(
+          EveService.Characteristics.CurrentConsumption,
+          parseFloat(params.power)
+        );
+        outletService.updateCharacteristic(
+          Characteristic.OutletInUse,
+          parseFloat(params.power) > (this.config.inUsePowerThreshold || 0)
+        );
+        let isOn = accessory.getService(Service.Outlet).getCharacteristic(Characteristic.On).value;
+        accessory.eveLogger.addEntry({
+          time: Date.now(),
+          power: isOn ? parseFloat(params.power) : 0,
+        });
+      }
+      if (params.hasOwnProperty("voltage")) {
+        outletService.updateCharacteristic(
+          EveService.Characteristics.Voltage,
+          parseFloat(params.voltage)
+        );
+      }
+      if (params.hasOwnProperty("current")) {
+        outletService.updateCharacteristic(
+          EveService.Characteristics.ElectricCurrent,
+          parseFloat(params.current)
+        );
+      }
+    } catch (err) {
+      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+    }
+  }
   internalUSBUpdate(accessory, value, callback) {
     callback();
     try {
@@ -1553,6 +1871,15 @@ class eWeLink {
       }
     }
   }
+  externalUSBUpdate(accessory, params) {
+    try {
+      accessory
+        .getService(Service.Outlet)
+        .updateCharacteristic(Characteristic.On, params.switches[0].switch === "on");
+    } catch (err) {
+      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+    }
+  }
   internalSCMUpdate(accessory, value, callback) {
     callback();
     try {
@@ -1579,6 +1906,15 @@ class eWeLink {
       }
     }
   }
+  externalSCMUpdate(accessory, params) {
+    try {
+      accessory
+        .getService(Service.Switch)
+        .updateCharacteristic(Characteristic.On, params.switches[0].switch === "on");
+    } catch (err) {
+      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+    }
+  }
   internalLightbulbUpdate(accessory, value, callback) {
     callback();
     try {
@@ -1806,471 +2142,18 @@ class eWeLink {
       }
     }
   }
-  internalSwitchUpdate(accessory, value, callback) {
-    callback();
+  externalSingleLightUpdate(accessory, params) {
     try {
-      let oAccessory,
-        params = {},
-        switchService = accessory.getService(Service.Switch);
-      switch (accessory.context.switchNumber) {
-        case "X":
-          params.switch = value ? "on" : "off";
-          break;
-        case "0":
-          params.switches = this.devicesInEW.get(accessory.context.eweDeviceId).params.switches;
-          params.switches[0].switch = value ? "on" : "off";
-          params.switches[1].switch = value ? "on" : "off";
-          params.switches[2].switch = value ? "on" : "off";
-          params.switches[3].switch = value ? "on" : "off";
-          break;
-        case "1":
-        case "2":
-        case "3":
-        case "4":
-          params.switches = this.devicesInEW.get(accessory.context.eweDeviceId).params.switches;
-          for (let i = 1; i <= 4; i++) {
-            if ((oAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW" + i))) {
-              i === parseInt(accessory.context.switchNumber)
-                ? (params.switches[i - 1].switch = value ? "on" : "off")
-                : (params.switches[i - 1].switch = oAccessory
-                    .getService(Service.Switch)
-                    .getCharacteristic(Characteristic.On).value
-                    ? "on"
-                    : "off");
-            } else {
-              params.switches[i - 1].switch = "off";
-            }
-          }
-          break;
-      }
-      this.sendDeviceUpdate(accessory, params)
-        .then(() => {
-          switch (accessory.context.switchNumber) {
-            case "X":
-              switchService.updateCharacteristic(Characteristic.On, value);
-              break;
-            case "0":
-              for (let i = 0; i <= 4; i++) {
-                if ((oAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW" + i))) {
-                  oAccessory
-                    .getService(Service.Switch)
-                    .updateCharacteristic(Characteristic.On, value);
-                }
-              }
-              break;
-            case "1":
-            case "2":
-            case "3":
-            case "4":
-              switchService.updateCharacteristic(Characteristic.On, value);
-              let masterState = "off";
-              for (let i = 1; i <= 4; i++) {
-                if ((oAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW" + i))) {
-                  if (
-                    oAccessory.getService(Service.Switch).getCharacteristic(Characteristic.On).value
-                  ) {
-                    masterState = "on";
-                  }
-                }
-              }
-              if (!this.hiddenMasters.includes(accessory.context.eweDeviceId)) {
-                oAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW0");
-                oAccessory
-                  .getService(Service.Switch)
-                  .updateCharacteristic(Characteristic.On, masterState === "on");
-              }
-              break;
-          }
-        })
-        .catch(err => {
-          throw err;
-        });
-    } catch (err) {
-      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
-      if (accessory.context.reachableWAN) {
-        this.wsClient.requestUpdate(accessory).catch(() => {});
-        this.log.warn(
-          "[%s] requesting previous state to revert Homebridge status.",
-          accessory.displayName
-        );
-      }
-    }
-  }
-  internalRFUpdate(accessory, rfChl, service, callback) {
-    callback();
-    try {
-      let params = {
-          cmd: "transmit",
-          rfChl: parseInt(rfChl),
-        },
-        rfService = accessory.getService(service);
-      this.sendDeviceUpdate(accessory, params)
-        .then(() => {
-          rfService.updateCharacteristic(Characteristic.On, true);
-          setTimeout(() => rfService.updateCharacteristic(Characteristic.On, false), 3000);
-        })
-        .catch(err => {
-          throw err;
-        });
-    } catch (err) {
-      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
-      if (accessory.context.reachableWAN) {
-        this.wsClient.requestUpdate(accessory).catch(() => {});
-        this.log.warn(
-          "[%s] requesting previous state to revert Homebridge status.",
-          accessory.displayName
-        );
-      }
-    }
-  }
-  externalValveUpdate(accessory, params) {
-    try {
-      ["A", "B"].forEach((v, k) => {
-        let valveService = accessory.getService("Valve " + v);
-        valveService
-          .updateCharacteristic(Characteristic.Active, params.switches[k].switch === "on")
-          .updateCharacteristic(Characteristic.InUse, params.switches[k].switch === "on");
-        if (params.switches[k].switch === "on") {
-          let timer = valveService.getCharacteristic(Characteristic.SetDuration).value;
-          valveService.updateCharacteristic(Characteristic.RemainingDuration, timer);
-          valveService.timer = setTimeout(() => {
-            valveService.setCharacteristic(Characteristic.Active, 0);
-          }, timer * 1000);
-        } else {
-          valveService.updateCharacteristic(Characteristic.RemainingDuration, 0);
-          clearTimeout(valveService.timer);
-        }
-      });
-    } catch (err) {
-      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
-    }
-  }
-  externalBlindUpdate(accessory, params) {
-    try {
-      let blindConfig,
-        newPosition,
-        wcService = accessory.getService(Service.WindowCovering);
-      if (!(blindConfig = this.cusG.get(accessory.context.hbDeviceId))) {
-        throw "group config missing";
-      }
-      if (blindConfig.type !== "blind" || blindConfig.setup !== "twoSwitch") {
-        throw "improper configuration";
-      }
-      // TargetPosition -> 0 for closed 100 for open (value)
-      // CurrentPosition -> 0 for closed 100 for open
-      // PositionState -> 0 going down, 1 going up, 2 = stopped
-      if (params.switches[0].switch === "off" && params.switches[1].switch === "off") {
-        return;
-      }
-      let switchUp = params.switches[0].switch === "on" ? -1 : 0, // matrix of numbers to get
-        switchDown = params.switches[1].switch === "on" ? 0 : 2; // ... the correct HomeKit value
-      newPosition = switchUp + switchDown;
-      wcService
-        .updateCharacteristic(Characteristic.PositionState, newPosition)
-        .updateCharacteristic(Characteristic.TargetPosition, newPosition * 100);
-      setTimeout(() => {
-        wcService
-          .updateCharacteristic(Characteristic.PositionState, 2)
-          .updateCharacteristic(Characteristic.CurrentPosition, newPosition * 100);
-      }, parseInt(blindConfig.operationTime) * 100);
-    } catch (err) {
-      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
-    }
-  }
-  externalGarageUpdate(accessory, params) {
-    try {
-      let garageConfig,
-        gcService = accessory.getService(Service.GarageDoorOpener),
-        oldPos = gcService.getCharacteristic(Characteristic.CurrentDoorState).value,
-        newPos = [0, 2].includes(oldPos) ? 3 : 2;
-      if (!(garageConfig = this.cusG.get(accessory.context.hbDeviceId))) {
-        throw "group config missing";
-      }
-      if (
-        garageConfig.type !== "garage" ||
-        !["oneSwitch", "twoSwitch"].includes(garageConfig.setup)
-      ) {
-        throw "improper configuration";
-      }
-      if (accessory.context.inUse || garageConfig.sensorId) {
-        return;
-      }
-      switch (garageConfig.setup) {
-        case "oneSwitch":
-          if (params.switch === "off") {
-            return;
-          }
-          break;
-        case "twoSwitch":
-          if (
-            params.switches[0].switch === params.switches[1].switch ||
-            params.switches[oldPos % 2].switch === "on"
-          ) {
-            return;
-          }
-          break;
-      }
-      accessory.context.inUse = true;
-      if (!garageConfig.sensorId) {
-        gcService
-          .updateCharacteristic(Characteristic.CurrentDoorState, newPos)
-          .updateCharacteristic(Characteristic.TargetDoorState, newPos - 2);
-        setTimeout(() => {
-          gcService.updateCharacteristic(Characteristic.CurrentDoorState, newPos - 2);
-        }, parseInt(garageConfig.operationTime) * 100);
-      }
-      setTimeout(() => {
-        accessory.context.inUse = false;
-      }, parseInt(garageConfig.operationTime) * 100);
-    } catch (err) {
-      accessory.context.inUse = false;
-      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
-    }
-  }
-  externalLockUpdate(accessory, params) {
-    try {
-      let lockConfig,
-        lmService = accessory.getService(Service.LockMechanism);
-      if (!(lockConfig = this.cusG.get(accessory.context.hbDeviceId))) {
-        throw "group config missing";
-      }
-      if (lockConfig.type !== "lock") {
-        throw "improper configuration";
-      }
-      if (params.switch === "off" || accessory.context.inUse) {
-        return;
-      }
-      accessory.context.inUse = true;
-      lmService
-        .updateCharacteristic(Characteristic.LockCurrentState, 0)
-        .updateCharacteristic(Characteristic.LockTargetState, 0);
-      setTimeout(() => {
-        lmService
-          .updateCharacteristic(Characteristic.LockCurrentState, 1)
-          .updateCharacteristic(Characteristic.LockTargetState, 1);
-        accessory.context.inUse = false;
-      }, parseInt(lockConfig.operationTime) * 100);
-    } catch (err) {
-      accessory.context.inUse = false;
-      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
-    }
-  }
-  externalCurtainUpdate(accessory, params) {
-    try {
-      let cService = accessory.getService(Service.WindowCovering);
-      if (params.hasOwnProperty("switch") && params.hasOwnProperty("setclose")) {
-        let newPos = Math.abs(100 - parseInt(params.setclose));
-        cService
-          .updateCharacteristic(Characteristic.TargetPosition, newPos)
-          .updateCharacteristic(Characteristic.CurrentPosition, newPos)
-          .updateCharacteristic(Characteristic.PositionState, 2);
-        accessory.context.prevPos = Math.abs(100 - parseInt(params.setclose));
-        return;
-      }
-    } catch (err) {
-      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
-    }
-  }
-  externalSensorUpdate(accessory, params) {
-    try {
-      if (params.hasOwnProperty("battery")) {
-        let batteryService =
-            accessory.getService(Service.BatteryService) ||
-            accessory.addService(Service.BatteryService),
-          scaledBattery = Math.round(params.battery * 33.3);
-        batteryService.updateCharacteristic(Characteristic.BatteryLevel, scaledBattery);
-        batteryService.updateCharacteristic(
-          Characteristic.StatusLowBattery,
-          scaledBattery < (this.config.lowBattThreshold || 25)
-        );
-      }
-      let newState = params.switch === "on" ? 1 : 0,
-        oAccessory = false,
-        contactService = accessory.getService(Service.ContactSensor);
-      contactService.updateCharacteristic(Characteristic.ContactSensorState, newState);
-      this.cusG.forEach(group => {
-        if (group.sensorId === accessory.context.eweDeviceId && group.type === "garage") {
-          if ((oAccessory = this.devicesInHB.get(group.deviceId + "SWX"))) {
-            switch (newState) {
-              case 0:
-                oAccessory
-                  .getService(Service.GarageDoorOpener)
-                  .updateCharacteristic(Characteristic.TargetDoorState, 1)
-                  .updateCharacteristic(Characteristic.CurrentDoorState, 1);
-                break;
-              case 1:
-                setTimeout(() => {
-                  oAccessory
-                    .getService(Service.GarageDoorOpener)
-                    .updateCharacteristic(Characteristic.TargetDoorState, 0)
-                    .updateCharacteristic(Characteristic.CurrentDoorState, 0);
-                }, group.operationTime * 100);
-                break;
-              default:
-                throw "unknown sensor status received [" + newState + "]";
-            }
-          }
-        }
-      });
-    } catch (err) {
-      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
-    }
-  }
-  externalFanUpdate(accessory, params) {
-    try {
-      let light,
-        status,
-        speed,
-        lightService = accessory.getService(Service.Lightbulb),
-        fanService = accessory.getService(Service.Fanv2);
-      if (Array.isArray(params.switches)) {
-        light = params.switches[0].switch === "on";
-        switch (params.switches[1].switch + params.switches[2].switch + params.switches[3].switch) {
-          default:
-            status = 0;
-            speed = 0;
-            break;
-          case "onoffoff":
-            status = 1;
-            speed = 33;
-            break;
-          case "ononoff":
-            status = 1;
-            speed = 66;
-            break;
-          case "onoffon":
-            status = 1;
-            speed = 99;
-        }
-      } else if (
-        params.hasOwnProperty("light") &&
-        params.hasOwnProperty("fan") &&
-        params.hasOwnProperty("speed")
-      ) {
-        light = params.light === "on";
-        status = params.fan === "on" ? 1 : 0;
-        speed = params.speed * 33 * status;
-      } else {
-        throw "unknown parameters received";
-      }
-      lightService.updateCharacteristic(Characteristic.On, light);
-      fanService
-        .updateCharacteristic(Characteristic.Active, status)
-        .updateCharacteristic(Characteristic.RotationSpeed, speed);
-    } catch (err) {
-      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
-    }
-  }
-  externalThermostatUpdate(accessory, params) {
-    try {
-      if (
-        !this.config.hideTHSwitch &&
-        (params.hasOwnProperty("switch") || params.hasOwnProperty("mainSwitch"))
-      ) {
-        let newState = params.hasOwnProperty("switch")
-            ? params.switch === "on"
-            : params.mainSwitch === "on",
-          switchService = accessory.getService(Service.Switch);
-        switchService.updateCharacteristic(Characteristic.On, newState);
-      }
-      let eveLog = {
-        time: Date.now(),
-      };
-      if (
-        params.hasOwnProperty("currentTemperature") &&
-        accessory.getService(Service.TemperatureSensor)
-      ) {
-        let currentTemp =
-          params.currentTemperature !== "unavailable" ? params.currentTemperature : 0;
-        accessory
-          .getService(Service.TemperatureSensor)
-          .updateCharacteristic(Characteristic.CurrentTemperature, currentTemp);
-        eveLog.temp = parseFloat(currentTemp);
-      }
-      if (
-        params.hasOwnProperty("currentHumidity") &&
-        accessory.getService(Service.HumiditySensor)
-      ) {
-        let currentHumi = params.currentHumidity !== "unavailable" ? params.currentHumidity : 0;
-        accessory
-          .getService(Service.HumiditySensor)
-          .updateCharacteristic(Characteristic.CurrentRelativeHumidity, currentHumi);
-        eveLog.humidity = parseFloat(currentHumi);
-      }
-      if (eveLog.hasOwnProperty("temp") || eveLog.hasOwnProperty("humidity")) {
-        accessory.eveLogger.addEntry(eveLog);
-      }
-    } catch (err) {
-      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
-    }
-  }
-  externalOutletUpdate(accessory, params) {
-    try {
-      let outletService = accessory.getService(Service.Outlet);
-      if (params.hasOwnProperty("switch")) {
-        outletService.updateCharacteristic(Characteristic.On, params.switch === "on");
-      }
-      if (params.hasOwnProperty("power")) {
-        outletService.updateCharacteristic(
-          EveService.Characteristics.CurrentConsumption,
-          parseFloat(params.power)
-        );
-        outletService.updateCharacteristic(
-          Characteristic.OutletInUse,
-          parseFloat(params.power) > (this.config.inUsePowerThreshold || 0)
-        );
-        let isOn = accessory.getService(Service.Outlet).getCharacteristic(Characteristic.On).value;
-        accessory.eveLogger.addEntry({
-          time: Date.now(),
-          power: isOn ? parseFloat(params.power) : 0,
-        });
-      }
-      if (params.hasOwnProperty("voltage")) {
-        outletService.updateCharacteristic(
-          EveService.Characteristics.Voltage,
-          parseFloat(params.voltage)
-        );
-      }
-      if (params.hasOwnProperty("current")) {
-        outletService.updateCharacteristic(
-          EveService.Characteristics.ElectricCurrent,
-          parseFloat(params.current)
-        );
-      }
-    } catch (err) {
-      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
-    }
-  }
-  externalUSBUpdate(accessory, params) {
-    try {
-      accessory
-        .getService(Service.Outlet)
-        .updateCharacteristic(Characteristic.On, params.switches[0].switch === "on");
-    } catch (err) {
-      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
-    }
-  }
-  externalSCMUpdate(accessory, params) {
-    try {
-      accessory
-        .getService(Service.Switch)
-        .updateCharacteristic(Characteristic.On, params.switches[0].switch === "on");
-    } catch (err) {
-      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
-    }
-  }
-  externalSingleLightUpdate(accessory, params) {
-    try {
-      let newColour,
-        mode,
-        isOn = false,
-        lightService = accessory.getService(Service.Lightbulb);
-      if (accessory.context.eweUIID === 22 && params.hasOwnProperty("state")) {
-        isOn = params.state === "on";
-      } else if (accessory.context.eweUIID !== 22 && params.hasOwnProperty("switch")) {
-        isOn = params.switch === "on";
-      } else {
-        isOn = lightService.getCharacteristic(Characteristic.On).value;
+      let newColour,
+        mode,
+        isOn = false,
+        lightService = accessory.getService(Service.Lightbulb);
+      if (accessory.context.eweUIID === 22 && params.hasOwnProperty("state")) {
+        isOn = params.state === "on";
+      } else if (accessory.context.eweUIID !== 22 && params.hasOwnProperty("switch")) {
+        isOn = params.switch === "on";
+      } else {
+        isOn = lightService.getCharacteristic(Characteristic.On).value;
       }
       if (isOn) {
         lightService.updateCharacteristic(Characteristic.On, true);
@@ -2357,6 +2240,96 @@ class eWeLink {
       this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
     }
   }
+  internalSwitchUpdate(accessory, value, callback) {
+    callback();
+    try {
+      let oAccessory,
+        params = {},
+        switchService = accessory.getService(Service.Switch);
+      switch (accessory.context.switchNumber) {
+        case "X":
+          params.switch = value ? "on" : "off";
+          break;
+        case "0":
+          params.switches = this.devicesInEW.get(accessory.context.eweDeviceId).params.switches;
+          params.switches[0].switch = value ? "on" : "off";
+          params.switches[1].switch = value ? "on" : "off";
+          params.switches[2].switch = value ? "on" : "off";
+          params.switches[3].switch = value ? "on" : "off";
+          break;
+        case "1":
+        case "2":
+        case "3":
+        case "4":
+          params.switches = this.devicesInEW.get(accessory.context.eweDeviceId).params.switches;
+          for (let i = 1; i <= 4; i++) {
+            if ((oAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW" + i))) {
+              i === parseInt(accessory.context.switchNumber)
+                ? (params.switches[i - 1].switch = value ? "on" : "off")
+                : (params.switches[i - 1].switch = oAccessory
+                    .getService(Service.Switch)
+                    .getCharacteristic(Characteristic.On).value
+                    ? "on"
+                    : "off");
+            } else {
+              params.switches[i - 1].switch = "off";
+            }
+          }
+          break;
+      }
+      this.sendDeviceUpdate(accessory, params)
+        .then(() => {
+          switch (accessory.context.switchNumber) {
+            case "X":
+              switchService.updateCharacteristic(Characteristic.On, value);
+              break;
+            case "0":
+              for (let i = 0; i <= 4; i++) {
+                if ((oAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW" + i))) {
+                  oAccessory
+                    .getService(Service.Switch)
+                    .updateCharacteristic(Characteristic.On, value);
+                }
+              }
+              break;
+            case "1":
+            case "2":
+            case "3":
+            case "4":
+              switchService.updateCharacteristic(Characteristic.On, value);
+              let masterState = "off";
+              for (let i = 1; i <= 4; i++) {
+                if ((oAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW" + i))) {
+                  if (
+                    oAccessory.getService(Service.Switch).getCharacteristic(Characteristic.On).value
+                  ) {
+                    masterState = "on";
+                  }
+                }
+              }
+              if (!this.hiddenMasters.includes(accessory.context.eweDeviceId)) {
+                oAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW0");
+                oAccessory
+                  .getService(Service.Switch)
+                  .updateCharacteristic(Characteristic.On, masterState === "on");
+              }
+              break;
+          }
+        })
+        .catch(err => {
+          throw err;
+        });
+    } catch (err) {
+      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+      if (accessory.context.reachableWAN) {
+        this.wsClient.requestUpdate(accessory).catch(() => {});
+        this.log.warn(
+          "[%s] requesting previous state to revert Homebridge status.",
+          accessory.displayName
+        );
+      }
+    }
+  }
   externalSingleSwitchUpdate(accessory, params) {
     try {
       accessory
@@ -2388,6 +2361,33 @@ class eWeLink {
       this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
     }
   }
+  internalRFUpdate(accessory, rfChl, service, callback) {
+    callback();
+    try {
+      let params = {
+          cmd: "transmit",
+          rfChl: parseInt(rfChl),
+        },
+        rfService = accessory.getService(service);
+      this.sendDeviceUpdate(accessory, params)
+        .then(() => {
+          rfService.updateCharacteristic(Characteristic.On, true);
+          setTimeout(() => rfService.updateCharacteristic(Characteristic.On, false), 3000);
+        })
+        .catch(err => {
+          throw err;
+        });
+    } catch (err) {
+      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+      if (accessory.context.reachableWAN) {
+        this.wsClient.requestUpdate(accessory).catch(() => {});
+        this.log.warn(
+          "[%s] requesting previous state to revert Homebridge status.",
+          accessory.displayName
+        );
+      }
+    }
+  }
   externalRFUpdate(accessory, params) {
     try {
       if (!params.hasOwnProperty("updateSource")) return;

From faefd89cb5d566ff0325dd8bde99760e480b253e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 23 Sep 2020 11:56:38 +0100
Subject: [PATCH 0201/3183] 3.0.0-7

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index fbe82755..c0bf7d5d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.0.0-6",
+  "version": "3.0.0-7",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 9d03ce36..60292074 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.0.0-6",
+  "version": "3.0.0-7",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 1746d4c46772876195d2fd32308c1c701f264d54 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 23 Sep 2020 13:43:02 +0100
Subject: [PATCH 0202/3183] blind and garage caching

---
 lib/constants.js |  1 +
 lib/eWeLink.js   | 83 ++++++++++++++++++++++++++++++++++++++++--------
 2 files changed, 71 insertions(+), 13 deletions(-)

diff --git a/lib/constants.js b/lib/constants.js
index 75e59b9e..75bdeaf1 100644
--- a/lib/constants.js
+++ b/lib/constants.js
@@ -9,6 +9,7 @@ module.exports = {
   devicesNonLAN: [22, 28, 59, 102],
   devicesSingleSwitch: [1, 5, 6, 14, 15, 22, 24, 27, 32, 36, 44, 59],
   devicesSingleSwitchParams: ["switch"],
+  devicesSingleSwitchOutlet: ["Sonoff Pow"],
   devicesMultiSwitch: [2, 3, 4, 7, 8, 9, 29, 30, 31, 34, 41],
   devicesMultiSwitchParams: ["switches"],
   devicesSingleSwitchLight: [
diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index 76fe7030..ea6fb02f 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -131,8 +131,18 @@ class eWeLink {
       accessory = this.devicesInHB.has(device.deviceid + "SWX")
         ? this.devicesInHB.get(device.deviceid + "SWX")
         : this.addAccessory(device, device.deviceid + "SWX", "curtain", false, {
-            prevPos: 0,
+            cacheCurrentPosition: 0,
           });
+      //*** @UPGRADE from v2 -> v3  23.09.2020 ***\\
+      if (accessory.context.hasOwnProperty("prevPos")) {
+        accessory.context.cacheCurrentPosition = accessory.context.prevPos;
+        delete accessory.context.prevPos;
+        //*** @ENDUPGRADE ***\\
+      }
+      if (!accessory.context.hasOwnProperty("cacheCurrentPosition")) {
+        accessory.context.cacheCurrentPosition = 0;
+        //*** @ENDUPGRADE ***\\
+      }
     }
     //*** WINDOW BLINDS ***\\
     else if (
@@ -142,10 +152,17 @@ class eWeLink {
       accessory = this.devicesInHB.has(device.deviceid + "SWX")
         ? this.devicesInHB.get(device.deviceid + "SWX")
         : this.addAccessory(device, device.deviceid + "SWX", "blind", false, {
-            cacheLastPosition: 0,
+            cacheCurrentPosition: 0,
             cachePositionState: 2,
             cacheTargetPosition: 0,
           });
+      //*** @UPGRADE from v2 -> v3  23.09.2020 ***\\
+      if (!accessory.context.hasOwnProperty("cacheCurrentPosition")) {
+        accessory.context.cacheCurrentPosition = 0;
+        accessory.context.cachePositionState = 2;
+        accessory.context.cacheTargetPosition = 0;
+      }
+      //*** @ENDUPGRADE ***\\
     }
     //*** GARAGE DOORS ***\\
     else if (
@@ -154,7 +171,16 @@ class eWeLink {
     ) {
       accessory = this.devicesInHB.has(device.deviceid + "SWX")
         ? this.devicesInHB.get(device.deviceid + "SWX")
-        : this.addAccessory(device, device.deviceid + "SWX", "garage");
+        : this.addAccessory(device, device.deviceid + "SWX", "garage", false, {
+            cacheCurrentDoorState: 1,
+            cacheTargetDoorState: 1,
+          });
+      //*** @UPGRADE from v2 -> v3  23.09.2020 ***\\
+      if (!accessory.context.hasOwnProperty("cacheCurrentDoorState")) {
+        accessory.context.cacheCurrentDoorState = 1;
+        accessory.context.cacheTargetDoorState = 1;
+      }
+      //*** @ENDUPGRADE ***\\
     }
     //*** LOCKS ***\\
     else if (
@@ -184,6 +210,11 @@ class eWeLink {
         : this.addAccessory(device, device.deviceid + "SWX", "thermostat", false, {
             sensorType: device.params.sensorType,
           });
+      //*** @UPGRADE from v2 -> v3  23.09.2020 ***\\
+      if (!accessory.context.hasOwnProperty("sensorType")) {
+        accessory.context.sensorType = device.params.sensorType;
+      }
+      //*** @ENDUPGRADE ***\\
       if (accessory.context.sensorType !== device.params.sensorType) {
         accessory.context.sensorType = device.params.sensorType;
         this.devicesInHB.set(accessory.context.hbDeviceId, accessory);
@@ -192,7 +223,8 @@ class eWeLink {
     //*** OUTLETS ***\\
     else if (
       cns.devicesOutlet.includes(device.extra.uiid) ||
-      device.productModel === "Sonoff Pow"
+      (cns.devicesSingleSwitch.includes(device.extra.uiid) &&
+        cns.devicesSingleSwitchOutlet.includes(device.productModel))
     ) {
       accessory = this.devicesInHB.has(device.deviceid + "SWX")
         ? this.devicesInHB.get(device.deviceid + "SWX")
@@ -367,12 +399,22 @@ class eWeLink {
     //*** ZIGBEE BRIDGES ***\\
     else if (cns.devicesZBBridge.includes(device.extra.uiid)) {
       // Nothing to do here but needed to avoid the below not supported error
+      //*** @UPGRADE from v2 -> v3  23.09.2020 ***\\
+      if ((accessory = this.devicesInHB.get(device.deviceid + "SWX"))) {
+        this.removeAccessory(accessory);
+      }
+      //*** @ENDUPGRADE ***\\
     }
     //*** ZIGBEE DEVICES ***\\
     else if (cns.devicesZB.includes(device.extra.uiid)) {
       accessory = this.devicesInHB.has(device.deviceid + "SWX")
         ? this.devicesInHB.get(device.deviceid + "SWX")
         : this.addAccessory(device, device.deviceid + "SWX", "zb_dev");
+      //*** @UPGRADE from v2 -> v3  23.09.2020 ***\\
+      if (accessory.context.type === "zb_sub") {
+        accessory.context.type = "zb_dev";
+      }
+      //*** @ENDUPGRADE ***\\
     }
     //*** SONOFF CAMERAS ***\\
     else if (cns.devicesCamera.includes(device.extra.uiid)) {
@@ -1232,7 +1274,7 @@ class eWeLink {
     try {
       let params,
         cService = accessory.getService(Service.WindowCovering),
-        prevPos = accessory.context.prevPos;
+        prevPos = accessory.context.cacheCurrentPosition;
       if (value === prevPos) return;
       if (value === 0 || value === 100) {
         params = {
@@ -1248,7 +1290,7 @@ class eWeLink {
           cService
             .updateCharacteristic(Characteristic.TargetPosition, value)
             .updateCharacteristic(Characteristic.PositionState, value > prevPos ? 1 : 0);
-          accessory.context.prevPos = value;
+          accessory.context.cacheCurrentPosition = value;
         })
         .catch(err => {
           throw err;
@@ -1273,7 +1315,7 @@ class eWeLink {
           .updateCharacteristic(Characteristic.TargetPosition, newPos)
           .updateCharacteristic(Characteristic.CurrentPosition, newPos)
           .updateCharacteristic(Characteristic.PositionState, 2);
-        accessory.context.prevPos = Math.abs(100 - parseInt(params.setclose));
+        accessory.context.cacheCurrentPosition = Math.abs(100 - parseInt(params.setclose));
         return;
       }
     } catch (err) {
@@ -1286,7 +1328,7 @@ class eWeLink {
       let blindConfig,
         params = {},
         wcService = accessory.getService(Service.WindowCovering),
-        oldPos = wcService.getCharacteristic(Characteristic.PositionState).value;
+        oldPos = accessory.context.cachePositionState;
       if (!(blindConfig = this.cusG.get(accessory.context.hbDeviceId))) {
         throw "group config missing";
       }
@@ -1297,6 +1339,9 @@ class eWeLink {
       if (value === oldPos * 100) return;
       // target position -> 0 for closed 100 for open (value)
       // current position -> 0 going down, 1 going up
+      accessory.context.cacheCurrentPosition = wcService.getCharacteristic(
+        Characteristic.CurrentPosition
+      ).value;
       params.switches = this.devicesInEW.get(accessory.context.eweDeviceId).params.switches;
       params.switches[0].switch = value === 100 ? "on" : "off";
       params.switches[1].switch = value === 0 ? "on" : "off";
@@ -1305,6 +1350,8 @@ class eWeLink {
           wcService
             .updateCharacteristic(Characteristic.TargetPosition, value)
             .updateCharacteristic(Characteristic.PositionState, value / 100);
+          accessory.context.cachePositionState = value / 100;
+          accessory.context.cacheTargetPosition = value;
           return new Promise(resolve =>
             setTimeout(resolve, parseInt(blindConfig.operationTime) * 100)
           );
@@ -1319,6 +1366,8 @@ class eWeLink {
           wcService
             .updateCharacteristic(Characteristic.CurrentPosition, value)
             .updateCharacteristic(Characteristic.PositionState, 2);
+          accessory.context.cachePositionState = 2;
+          accessory.context.cacheCurrentPosition = value;
         })
         .catch(err => {
           throw err;
@@ -1345,9 +1394,6 @@ class eWeLink {
       if (blindConfig.type !== "blind" || blindConfig.setup !== "twoSwitch") {
         throw "improper configuration";
       }
-      // TargetPosition -> 0 for closed 100 for open (value)
-      // CurrentPosition -> 0 for closed 100 for open
-      // PositionState -> 0 going down, 1 going up, 2 = stopped
       if (params.switches[0].switch === "off" && params.switches[1].switch === "off") {
         return;
       }
@@ -1357,10 +1403,14 @@ class eWeLink {
       wcService
         .updateCharacteristic(Characteristic.PositionState, newPosition)
         .updateCharacteristic(Characteristic.TargetPosition, newPosition * 100);
+      accessory.context.cachePositionState = newPosition;
+      accessory.context.cacheTargetPosition = newPosition * 100;
       setTimeout(() => {
         wcService
           .updateCharacteristic(Characteristic.PositionState, 2)
           .updateCharacteristic(Characteristic.CurrentPosition, newPosition * 100);
+        accessory.context.cachePositionState = 2;
+        accessory.context.cacheCurrentPosition = newPosition * 100;
       }, parseInt(blindConfig.operationTime) * 100);
     } catch (err) {
       this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
@@ -1398,12 +1448,13 @@ class eWeLink {
             .getCharacteristic(Characteristic.ContactSensorState).value === 0
           ? 1
           : 0
-        : gdService.getCharacteristic(Characteristic.CurrentDoorState).value;
+        : accessory.context.cacheCurrentDoorState;
       if (newPos === oldPos % 2) return;
       accessory.context.inUse = true;
       accessory.context.state = value;
       if (garageConfig.setup === "oneSwitch" && [2, 3].includes(oldPos)) {
         gdService.updateCharacteristic(Characteristic.CurrentDoorState, ((oldPos * 2) % 3) + 2);
+        accessory.context.cacheCurrentDoorState = ((oldPos * 2) % 3) + 2;
         delay = 1500;
       }
       if (accessory.context.state !== newPos) return;
@@ -1413,6 +1464,8 @@ class eWeLink {
           gdService
             .updateCharacteristic(Characteristic.TargetDoorState, newPos)
             .updateCharacteristic(Characteristic.CurrentDoorState, newPos + 2);
+          accessory.context.cacheTargetDoorState = newPos;
+          accessory.context.cacheCurrentDoorState = newPos + 2;
           switch (garageConfig.setup) {
             case "oneSwitch":
               params.switch = "on";
@@ -1433,6 +1486,7 @@ class eWeLink {
         .then(() => {
           if (!sAccessory) {
             gdService.updateCharacteristic(Characteristic.CurrentDoorState, newPos);
+            accessory.context.cacheCurrentDoorState = newPos;
           }
           accessory.context.inUse = false;
         })
@@ -1455,7 +1509,7 @@ class eWeLink {
     try {
       let garageConfig,
         gcService = accessory.getService(Service.GarageDoorOpener),
-        oldPos = gcService.getCharacteristic(Characteristic.CurrentDoorState).value,
+        oldPos = accessory.context.cacheCurrentDoorState,
         newPos = [0, 2].includes(oldPos) ? 3 : 2;
       if (!(garageConfig = this.cusG.get(accessory.context.hbDeviceId))) {
         throw "group config missing";
@@ -1489,8 +1543,11 @@ class eWeLink {
         gcService
           .updateCharacteristic(Characteristic.CurrentDoorState, newPos)
           .updateCharacteristic(Characteristic.TargetDoorState, newPos - 2);
+        accessory.context.cacheCurrentDoorState = newPos;
+        accessory.context.cacheTargetDoorState = newPos - 2;
         setTimeout(() => {
           gcService.updateCharacteristic(Characteristic.CurrentDoorState, newPos - 2);
+          accessory.context.cacheCurrentDoorState = newPos - 2;
         }, parseInt(garageConfig.operationTime) * 100);
       }
       setTimeout(() => {

From 08b7b9a31011a1715ef4098af74e3f1964079503 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 23 Sep 2020 13:50:37 +0100
Subject: [PATCH 0203/3183] 3.0.0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c0bf7d5d..5f52a260 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.0.0-7",
+  "version": "3.0.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 60292074..497d1edf 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.0.0-7",
+  "version": "3.0.0",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From c6a1a4a45a5c667fdf861e88dc06112f68d38538 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 23 Sep 2020 18:41:57 +0100
Subject: [PATCH 0204/3183] Update eWeLink.js

---
 lib/eWeLink.js | 57 +++++++++++++++++++++++++++++---------------------
 1 file changed, 33 insertions(+), 24 deletions(-)

diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index ea6fb02f..aaa22f0f 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -1071,38 +1071,47 @@ class eWeLink {
     }
   }
   sendDeviceUpdate(accessory, params) {
-    return new Promise((resolve, reject) => {
-      let payload = {
+    let payload = {
         apikey: accessory.context.eweApiKey,
         deviceid: accessory.context.eweDeviceId,
         params,
+      },
+      delayPromise = new Promise(resolve => setTimeout(resolve, Math.random() * 150 + 350)),
+      sendViaWS = () => {
+        return new Promise((resolve, reject) => {
+          if (accessory.context.reachableWAN) {
+            this.wsClient
+              .sendUpdate(payload)
+              .then(() => resolve())
+              .catch(err => reject(err));
+          } else {
+            reject("it is unreachable");
+          }
+        });
       };
-      let sendViaWS = () => {
-        if (accessory.context.reachableWAN) {
-          this.wsClient
-            .sendUpdate(payload)
+    return new Promise((resolve, reject) => {
+      delayPromise.then(() => {
+        if (
+          cns.devicesNonLAN.includes(accessory.context.eweUIID) ||
+          !accessory.context.reachableLAN
+        ) {
+          sendViaWS()
             .then(() => resolve())
             .catch(err => reject(err));
         } else {
-          reject("it is unreachable");
+          this.lanClient
+            .sendUpdate(payload)
+            .then(() => resolve())
+            .catch(err => {
+              if (this.debug) {
+                this.log.warn("[%s] Reverting to web socket as %s.", accessory.displayName, err);
+              }
+              sendViaWS()
+                .then(() => resolve())
+                .catch(err => reject(err));
+            });
         }
-      };
-      if (
-        cns.devicesNonLAN.includes(accessory.context.eweUIID) ||
-        !accessory.context.reachableLAN
-      ) {
-        sendViaWS();
-      } else {
-        this.lanClient
-          .sendUpdate(payload)
-          .then(() => resolve())
-          .catch(err => {
-            if (this.debug) {
-              this.log.warn("[%s] Reverting to web socket as %s.", accessory.displayName, err);
-            }
-            sendViaWS();
-          });
-      }
+      });
     });
   }
   receiveDeviceUpdate(device) {

From a484e29fddc23f88b52a77e67b23573591b0ab71 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 23 Sep 2020 18:42:40 +0100
Subject: [PATCH 0205/3183] 3.0.1-0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 5f52a260..4b4267f1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.0.0",
+  "version": "3.0.1-0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 497d1edf..f8f82af6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.0.0",
+  "version": "3.0.1-0",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From ef8b19d04546f715c0607c99ddb8d0df3c531cdc Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 24 Sep 2020 14:29:30 +0100
Subject: [PATCH 0206/3183] more updates

---
 lib/eWeLink.js    | 192 +++++++++++++++++++++++++++-------------------
 lib/eWeLinkLAN.js |   6 +-
 lib/eWeLinkWS.js  |  45 +++++------
 3 files changed, 132 insertions(+), 111 deletions(-)

diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index aaa22f0f..9b29b4da 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -1,6 +1,6 @@
 /* jshint esversion: 9, -W014, -W030, node: true */
 "use strict";
-let Accessory, Characteristic, EveService, EveHistoryService, Service, UUIDGen;
+let Accessory, Characteristic, EveService, EveHistoryService, Service;
 const cns = require("./constants"),
   convert = require("color-convert"),
   corrInterval = require("correcting-interval"),
@@ -485,7 +485,10 @@ class eWeLink {
       newDeviceName = this.config.nameOverride[hbDeviceId];
     }
     try {
-      const accessory = new Accessory(newDeviceName, UUIDGen.generate(hbDeviceId).toString());
+      const accessory = new Accessory(
+        newDeviceName,
+        this.api.hap.uuid.generate(hbDeviceId).toString()
+      );
       if (!hidden) {
         accessory
           .getService(Service.AccessoryInformation)
@@ -1071,46 +1074,30 @@ class eWeLink {
     }
   }
   sendDeviceUpdate(accessory, params) {
-    let payload = {
-        apikey: accessory.context.eweApiKey,
-        deviceid: accessory.context.eweDeviceId,
-        params,
-      },
-      delayPromise = new Promise(resolve => setTimeout(resolve, Math.random() * 150 + 350)),
-      sendViaWS = () => {
-        return new Promise((resolve, reject) => {
-          if (accessory.context.reachableWAN) {
-            this.wsClient
-              .sendUpdate(payload)
-              .then(() => resolve())
-              .catch(err => reject(err));
-          } else {
-            reject("it is unreachable");
-          }
-        });
-      };
     return new Promise((resolve, reject) => {
+      let payload = {
+          apikey: accessory.context.eweApiKey,
+          deviceid: accessory.context.eweDeviceId,
+          params,
+        },
+        delayPromise = new Promise(resolve => setTimeout(resolve, Math.random() * 100 + 200));
       delayPromise.then(() => {
-        if (
-          cns.devicesNonLAN.includes(accessory.context.eweUIID) ||
-          !accessory.context.reachableLAN
-        ) {
-          sendViaWS()
-            .then(() => resolve())
-            .catch(err => reject(err));
-        } else {
-          this.lanClient
-            .sendUpdate(payload)
-            .then(() => resolve())
-            .catch(err => {
-              if (this.debug) {
-                this.log.warn("[%s] Reverting to web socket as %s.", accessory.displayName, err);
-              }
-              sendViaWS()
+        this.lanClient
+          .sendUpdate(payload)
+          .then(() => resolve())
+          .catch(err => {
+            if (this.debug) {
+              this.log.warn("[%s] Reverting to web socket as %s.", accessory.displayName, err);
+            }
+            if (accessory.context.reachableWAN) {
+              this.wsClient
+                .sendUpdate(payload)
                 .then(() => resolve())
                 .catch(err => reject(err));
-            });
-        }
+            } else {
+              reject("it is unreachable");
+            }
+          });
       });
     });
   }
@@ -1283,23 +1270,24 @@ class eWeLink {
     try {
       let params,
         cService = accessory.getService(Service.WindowCovering),
-        prevPos = accessory.context.cacheCurrentPosition;
-      if (value === prevPos) return;
-      if (value === 0 || value === 100) {
+        prevPos = accessory.context.cacheCurrentPosition,
+        newPos = value;
+      if (newPos === prevPos) return;
+      if (newPos === 0 || newPos === 100) {
         params = {
-          switch: value === 100 ? "on" : "off",
+          switch: newPos === 100 ? "on" : "off",
         };
       } else {
         params = {
-          setclose: Math.abs(100 - value),
+          setclose: Math.abs(100 - newPos),
         };
       }
       this.sendDeviceUpdate(accessory, params)
         .then(() => {
           cService
-            .updateCharacteristic(Characteristic.TargetPosition, value)
-            .updateCharacteristic(Characteristic.PositionState, value > prevPos ? 1 : 0);
-          accessory.context.cacheCurrentPosition = value;
+            .updateCharacteristic(Characteristic.TargetPosition, newPos)
+            .updateCharacteristic(Characteristic.PositionState, newPos > prevPos ? 1 : 0);
+          accessory.context.cacheCurrentPosition = newPos;
         })
         .catch(err => {
           throw err;
@@ -1324,7 +1312,7 @@ class eWeLink {
           .updateCharacteristic(Characteristic.TargetPosition, newPos)
           .updateCharacteristic(Characteristic.CurrentPosition, newPos)
           .updateCharacteristic(Characteristic.PositionState, 2);
-        accessory.context.cacheCurrentPosition = Math.abs(100 - parseInt(params.setclose));
+        accessory.context.cacheCurrentPosition = newPos;
         return;
       }
     } catch (err) {
@@ -1337,52 +1325,81 @@ class eWeLink {
       let blindConfig,
         params = {},
         wcService = accessory.getService(Service.WindowCovering),
-        oldPos = accessory.context.cachePositionState;
+        prevState = accessory.context.cachePositionState,
+        prevPos = accessory.context.cacheCurrentPosition,
+        newTarget = value,
+        timeNow = Date.now();
       if (!(blindConfig = this.cusG.get(accessory.context.hbDeviceId))) {
         throw "group config missing";
       }
       if (blindConfig.type !== "blind" || blindConfig.setup !== "twoSwitch") {
         throw "improper configuration";
       }
-      value = value >= 50 ? 100 : 0;
-      if (value === oldPos * 100) return;
-      // target position -> 0 for closed 100 for open (value)
-      // current position -> 0 going down, 1 going up
-      accessory.context.cacheCurrentPosition = wcService.getCharacteristic(
-        Characteristic.CurrentPosition
-      ).value;
-      params.switches = this.devicesInEW.get(accessory.context.eweDeviceId).params.switches;
-      params.switches[0].switch = value === 100 ? "on" : "off";
-      params.switches[1].switch = value === 0 ? "on" : "off";
+      if (newTarget === prevPos) return;
+      params.switches = [
+        {
+          switch: "off",
+          outlet: 0,
+        },
+        {
+          switch: "off",
+          outlet: 1,
+        },
+        {
+          switch: "off",
+          outlet: 2,
+        },
+        {
+          switch: "off",
+          outlet: 3,
+        },
+      ];
+      let logger = str => this.log.warn("[%s] %s.", accessory.displayName, str);
+      accessory.context.inUse = true;
+      if (prevState !== 2) {
+        this.log.warn(
+          "[%s] tried to move the blinds to [%s%] but they are already moving.",
+          accessory.displayName,
+          newTarget
+        );
+        wcService.updateCharacteristic(
+          Characteristic.TargetPosition,
+          accessory.context.cacheTargetPosition
+        );
+        return;
+      }
+      wcService.updateCharacteristic(Characteristic.TargetPosition, newTarget);
+      accessory.context.cacheTargetPosition = newTarget;
+      let moveUp = newTarget > prevPos,
+        duration = Math.round(Math.abs(newTarget - prevPos) * blindConfig.operationTime);
+      accessory.context.startTimestamp = timeNow;
+      accessory.context.targetTimestamp = timeNow + duration;
+      params.switches[0].switch = moveUp ? "on" : "off";
+      params.switches[1].switch = moveUp ? "off" : "on";
       this.sendDeviceUpdate(accessory, params)
         .then(() => {
-          wcService
-            .updateCharacteristic(Characteristic.TargetPosition, value)
-            .updateCharacteristic(Characteristic.PositionState, value / 100);
-          accessory.context.cachePositionState = value / 100;
-          accessory.context.cacheTargetPosition = value;
-          return new Promise(resolve =>
-            setTimeout(resolve, parseInt(blindConfig.operationTime) * 100)
-          );
+          wcService.updateCharacteristic(Characteristic.PositionState, moveUp ? 0 : 1);
+          accessory.context.cachePositionState = moveUp ? 0 : 1;
+          return new Promise(resolve => setTimeout(resolve, duration));
         })
         .then(() => {
-          params.switches = this.devicesInEW.get(accessory.context.eweDeviceId).params.switches;
           params.switches[0].switch = "off";
           params.switches[1].switch = "off";
           return this.sendDeviceUpdate(accessory, params);
         })
         .then(() => {
-          wcService
-            .updateCharacteristic(Characteristic.CurrentPosition, value)
-            .updateCharacteristic(Characteristic.PositionState, 2);
+          wcService.updateCharacteristic(Characteristic.PositionState, 2);
+          wcService.updateCharacteristic(Characteristic.CurrentPosition, newTarget);
+          accessory.context.cacheCurrentPosition = newTarget;
           accessory.context.cachePositionState = 2;
-          accessory.context.cacheCurrentPosition = value;
+          accessory.context.inUse = false;
         })
         .catch(err => {
           throw err;
         });
     } catch (err) {
       this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+      accessory.context.inUse = false;
       if (accessory.context.reachableWAN) {
         this.wsClient.requestUpdate(accessory).catch(() => {});
         this.log.warn(
@@ -1403,6 +1420,20 @@ class eWeLink {
       if (blindConfig.type !== "blind" || blindConfig.setup !== "twoSwitch") {
         throw "improper configuration";
       }
+      if (!params.hasOwnProperty("updateSource")) {
+        wcService
+          .updateCharacteristic(Characteristic.PositionState, accessory.context.cachePositionState)
+          .updateCharacteristic(
+            Characteristic.TargetPosition,
+            accessory.context.cacheTargetPosition
+          )
+          .updateCharacteristic(
+            Characteristic.CurrentPosition,
+            accessory.context.cacheCurrentPosition
+          );
+        return;
+      }
+      if (accessory.context.inUse) return;
       if (params.switches[0].switch === "off" && params.switches[1].switch === "off") {
         return;
       }
@@ -1440,7 +1471,7 @@ class eWeLink {
       }
       let sensorDefinition = garageConfig.sensorId || false,
         sAccessory = false,
-        oldPos,
+        prevState,
         newPos = value,
         params = {},
         delay = 0,
@@ -1451,19 +1482,19 @@ class eWeLink {
       if (sensorDefinition && sAccessory.context.type !== "sensor") {
         throw "defined DW2 sensor isn't a sensor";
       }
-      oldPos = sAccessory
+      prevState = sAccessory
         ? sAccessory
             .getService(Service.ContactSensor)
             .getCharacteristic(Characteristic.ContactSensorState).value === 0
           ? 1
           : 0
         : accessory.context.cacheCurrentDoorState;
-      if (newPos === oldPos % 2) return;
+      if (newPos === prevState % 2) return;
       accessory.context.inUse = true;
       accessory.context.state = value;
-      if (garageConfig.setup === "oneSwitch" && [2, 3].includes(oldPos)) {
-        gdService.updateCharacteristic(Characteristic.CurrentDoorState, ((oldPos * 2) % 3) + 2);
-        accessory.context.cacheCurrentDoorState = ((oldPos * 2) % 3) + 2;
+      if (garageConfig.setup === "oneSwitch" && [2, 3].includes(prevState)) {
+        gdService.updateCharacteristic(Characteristic.CurrentDoorState, ((prevState * 2) % 3) + 2);
+        accessory.context.cacheCurrentDoorState = ((prevState * 2) % 3) + 2;
         delay = 1500;
       }
       if (accessory.context.state !== newPos) return;
@@ -1518,8 +1549,8 @@ class eWeLink {
     try {
       let garageConfig,
         gcService = accessory.getService(Service.GarageDoorOpener),
-        oldPos = accessory.context.cacheCurrentDoorState,
-        newPos = [0, 2].includes(oldPos) ? 3 : 2;
+        prevState = accessory.context.cacheCurrentDoorState,
+        newPos = [0, 2].includes(prevState) ? 3 : 2;
       if (!(garageConfig = this.cusG.get(accessory.context.hbDeviceId))) {
         throw "group config missing";
       }
@@ -1541,7 +1572,7 @@ class eWeLink {
         case "twoSwitch":
           if (
             params.switches[0].switch === params.switches[1].switch ||
-            params.switches[oldPos % 2].switch === "on"
+            params.switches[prevState % 2].switch === "on"
           ) {
             return;
           }
@@ -2639,6 +2670,5 @@ module.exports = function (homebridge) {
   EveService = new hbLib.EveHomeKitTypes(homebridge);
   EveHistoryService = fakegato(homebridge);
   Service = homebridge.hap.Service;
-  UUIDGen = homebridge.hap.uuid;
   return eWeLink;
 };
diff --git a/lib/eWeLinkLAN.js b/lib/eWeLinkLAN.js
index 68aa7eb7..56a983ec 100644
--- a/lib/eWeLinkLAN.js
+++ b/lib/eWeLinkLAN.js
@@ -125,7 +125,7 @@ module.exports = class eWeLinkLAN {
   sendUpdate(json) {
     return new Promise((resolve, reject) => {
       if (!this.deviceMap.get(json.deviceid).online) {
-        reject("device isn't reachable by LAN mode");
+        throw "device isn't reachable by LAN mode";
       }
       let apiKey,
         suffix,
@@ -137,9 +137,7 @@ module.exports = class eWeLinkLAN {
         params.switch = json.params.switch;
         suffix = "switch";
       } else {
-        reject(
-          "plugin does not support lan mode for this device yet - feel free to create a github issue"
-        );
+        throw "plugin does not support lan mode for this device yet - feel free to create a github issue";
       }
       if ((apiKey = this.deviceMap.get(json.deviceid).apiKey)) {
         let key = crypto.createHash("md5").update(Buffer.from(apiKey, "utf8")).digest(),
diff --git a/lib/eWeLinkWS.js b/lib/eWeLinkWS.js
index e99df8fd..6f30b2ea 100644
--- a/lib/eWeLinkWS.js
+++ b/lib/eWeLinkWS.js
@@ -207,18 +207,18 @@ module.exports = class eWeLinkWS {
   }
   sendUpdate(json) {
     return new Promise((resolve, reject) => {
-      let sequence = Math.floor(new Date()).toString();
-      json = {
-        ...json,
-        ...{
-          action: "update",
-          sequence,
-          userAgent: "app",
-        },
-      };
-      let sendOperation = () => {
+      let sequence = Math.floor(new Date()).toString(),
+        jsonToSend = {
+          ...json,
+          ...{
+            action: "update",
+            sequence,
+            userAgent: "app",
+          },
+        };
+      if (this.wsp && this.wsIsOpen) {
         this.wsp
-          .sendRequest(json, {
+          .sendRequest(jsonToSend, {
             requestId: sequence,
           })
           .then(device => {
@@ -236,26 +236,19 @@ module.exports = class eWeLinkWS {
               case 0:
                 resolve();
                 break;
-              case 504:
               default:
                 throw "Unknown response";
             }
           })
           .catch(err => reject("Device update failed [" + err + "]."));
-      };
-      let checkToSend = () => {
-        if (this.wsp && this.wsIsOpen) {
-          sendOperation();
-        } else {
-          this.delay(2500).then(() => {
-            if (this.debug) {
-              this.log.warn("Will resend command when WS is reconnected.");
-            }
-            checkToSend();
-          });
-        }
-      };
-      checkToSend();
+      } else {
+        this.delay(2500).then(() => {
+          if (this.debug) {
+            this.log.warn("Will resend command when WS is reconnected.");
+          }
+          resolve(this.sendUpdate(json));
+        });
+      }
     });
   }
   requestUpdate(accessory) {

From ea8ae45de9cc50a5a9f3d51dac4667dd639ac79c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 24 Sep 2020 14:30:38 +0100
Subject: [PATCH 0207/3183] 3.0.1-1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 4b4267f1..1ec031ed 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.0.1-0",
+  "version": "3.0.1-1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index f8f82af6..f5a71fc9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.0.1-0",
+  "version": "3.0.1-1",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 622ce4a1df1330f8a33340f8d50a4bcb9486b3fc Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 24 Sep 2020 17:10:29 +0100
Subject: [PATCH 0208/3183] fixing broken promises

---
 lib/eWeLink.js     | 98 ++++++++++++++++++++++------------------------
 lib/eWeLinkHTTP.js | 32 +++++++++------
 lib/eWeLinkLAN.js  |  4 +-
 3 files changed, 67 insertions(+), 67 deletions(-)

diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index 9b29b4da..db8502ed 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -59,9 +59,7 @@ class eWeLink {
             this.wsClient
               .getHost()
               .then(() => this.wsClient.closeConnection())
-              .then(() => {
-                return new Promise(resolve => setTimeout(resolve, 250));
-              })
+              .then(() => Promise(resolve => setTimeout(resolve, 250)))
               .then(() => this.wsClient.login())
               .catch(err => this.log.warn(err));
           }
@@ -1081,24 +1079,22 @@ class eWeLink {
           params,
         },
         delayPromise = new Promise(resolve => setTimeout(resolve, Math.random() * 100 + 200));
-      delayPromise.then(() => {
-        this.lanClient
-          .sendUpdate(payload)
-          .then(() => resolve())
-          .catch(err => {
+      delayPromise
+        .then(() => this.lanClient.sendUpdate(payload))
+        .then(() => resolve())
+        .catch(err => {
+          if (accessory.context.reachableWAN) {
             if (this.debug) {
               this.log.warn("[%s] Reverting to web socket as %s.", accessory.displayName, err);
             }
-            if (accessory.context.reachableWAN) {
-              this.wsClient
-                .sendUpdate(payload)
-                .then(() => resolve())
-                .catch(err => reject(err));
-            } else {
-              reject("it is unreachable");
-            }
-          });
-      });
+            this.wsClient
+              .sendUpdate(payload)
+              .then(() => resolve())
+              .catch(err => reject(err));
+          } else {
+            reject("it is unreachable");
+          }
+        });
     });
   }
   receiveDeviceUpdate(device) {
@@ -1518,11 +1514,9 @@ class eWeLink {
           }
           return this.sendDeviceUpdate(accessory, params);
         })
-        .then(() => {
-          return new Promise(resolve =>
-            setTimeout(resolve, parseInt(garageConfig.operationTime) * 100)
-          );
-        })
+        .then(() =>
+          Promise(resolve => setTimeout(resolve, parseInt(garageConfig.operationTime) * 100))
+        )
         .then(() => {
           if (!sAccessory) {
             gdService.updateCharacteristic(Characteristic.CurrentDoorState, newPos);
@@ -2129,19 +2123,19 @@ class eWeLink {
             break;
         }
       }
-      setTimeout(() => {
-        this.sendDeviceUpdate(accessory, params)
-          .then(() => {
-            if (value === 0) {
-              lightService.updateCharacteristic(Characteristic.On, false);
-            } else {
-              lightService.updateCharacteristic(Characteristic.Brightness, value);
-            }
-          })
-          .catch(err => {
-            throw err;
-          });
-      }, 250);
+      let delayPromise = new Promise(resolve => setTimeout(resolve, 250));
+      delayPromise
+        .then(() => this.sendDeviceUpdate(accessory, params))
+        .then(() => {
+          if (value === 0) {
+            lightService.updateCharacteristic(Characteristic.On, false);
+          } else {
+            lightService.updateCharacteristic(Characteristic.Brightness, value);
+          }
+        })
+        .catch(err => {
+          throw err;
+        });
     } catch (err) {
       this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
       if (accessory.context.reachableWAN) {
@@ -2212,22 +2206,22 @@ class eWeLink {
           }
           break;
       }
-      setTimeout(() => {
-        this.sendDeviceUpdate(accessory, params)
-          .then(() => {
-            switch (type) {
-              case "hue":
-                lightService.updateCharacteristic(Characteristic.Hue, value);
-                break;
-              case "bri":
-                lightService.updateCharacteristic(Characteristic.Brightness, value);
-                break;
-            }
-          })
-          .catch(err => {
-            throw err;
-          });
-      }, 250);
+      let delayPromise = new Promise(resolve => setTimeout(resolve, 250));
+      delayPromise
+        .then(() => this.sendDeviceUpdate(accessory, params))
+        .then(() => {
+          switch (type) {
+            case "hue":
+              lightService.updateCharacteristic(Characteristic.Hue, value);
+              break;
+            case "bri":
+              lightService.updateCharacteristic(Characteristic.Brightness, value);
+              break;
+          }
+        })
+        .catch(err => {
+          throw err;
+        });
     } catch (err) {
       this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
       if (accessory.context.reachableWAN) {
diff --git a/lib/eWeLinkHTTP.js b/lib/eWeLinkHTTP.js
index beb48f3b..36d099cf 100644
--- a/lib/eWeLinkHTTP.js
+++ b/lib/eWeLinkHTTP.js
@@ -78,7 +78,7 @@ module.exports = class eWeLinkHTTP {
             err.hasOwnProperty("code") &&
             ["ENOTFOUND", "ETIMEDOUT", "EAI_AGAIN"].includes(err.code)
           ) {
-            this.log.warn("Unable to reach eWeLink. Retrying in 15 seconds.");
+            this.log.warn("Unable to reach eWeLink. Retrying in 30 seconds.");
             this.delay().then(() => resolve(this.getHost()));
           } else {
             reject(err.message || err);
@@ -144,16 +144,22 @@ module.exports = class eWeLinkHTTP {
             resolve(this.login());
             return;
           }
-          if (!body.data.at) {
-            throw "No auth token received.\n" + JSON.stringify(body, null, 2);
+          if (body.data.at) {
+            this.aToken = body.data.at;
+            this.apiKey = body.data.user.apikey;
+            resolve({
+              aToken: this.aToken,
+              apiKey: this.apiKey,
+              httpHost: this.httpHost,
+            });
+          } else {
+            if (body.error === 500) {
+              this.log.warn("An eWeLink error [500] occured. Retrying in 30 seconds.");
+              this.delay().then(() => resolve(this.login()));
+            } else {
+              throw "No auth token received.\n" + JSON.stringify(body, null, 2);
+            }
           }
-          this.aToken = body.data.at;
-          this.apiKey = body.data.user.apikey;
-          resolve({
-            aToken: this.aToken,
-            apiKey: this.apiKey,
-            httpHost: this.httpHost,
-          });
         })
         .catch(err => reject(err.message || err));
     });
@@ -190,7 +196,7 @@ module.exports = class eWeLinkHTTP {
         })
         .catch(err => {
           if (err.hasOwnProperty("code") && ["ENOTFOUND", "ETIMEDOUT"].includes(err.code)) {
-            this.log.warn("Unable to reach eWeLink. Retrying in 15 seconds.");
+            this.log.warn("Unable to reach eWeLink. Retrying in 30 seconds.");
             this.delay().then(() => resolve(this.getDevices()));
           } else {
             reject(err.message || err);
@@ -238,7 +244,7 @@ module.exports = class eWeLinkHTTP {
         })
         .catch(err => {
           if (err.hasOwnProperty("code") && ["ENOTFOUND", "ETIMEDOUT"].includes(err.code)) {
-            this.log.warn("Unable to reach eWeLink. Retrying in 15 seconds.");
+            this.log.warn("Unable to reach eWeLink. Retrying in 30 seconds.");
             this.delay().then(() => resolve(this.getDevice(deviceId)));
           } else {
             reject(err.message || err);
@@ -247,6 +253,6 @@ module.exports = class eWeLinkHTTP {
     });
   }
   delay() {
-    return new Promise(resolve => setTimeout(resolve, 15000));
+    return new Promise(resolve => setTimeout(resolve, 30000));
   }
 };
diff --git a/lib/eWeLinkLAN.js b/lib/eWeLinkLAN.js
index 56a983ec..647e2c1c 100644
--- a/lib/eWeLinkLAN.js
+++ b/lib/eWeLinkLAN.js
@@ -125,7 +125,7 @@ module.exports = class eWeLinkLAN {
   sendUpdate(json) {
     return new Promise((resolve, reject) => {
       if (!this.deviceMap.get(json.deviceid).online) {
-        throw "device isn't reachable by LAN mode";
+        throw "device isn't reachable via LAN mode";
       }
       let apiKey,
         suffix,
@@ -137,7 +137,7 @@ module.exports = class eWeLinkLAN {
         params.switch = json.params.switch;
         suffix = "switch";
       } else {
-        throw "plugin does not support lan mode for this device yet - feel free to create a github issue";
+        throw "device isn't reachable via LAN mode";
       }
       if ((apiKey = this.deviceMap.get(json.deviceid).apiKey)) {
         let key = crypto.createHash("md5").update(Buffer.from(apiKey, "utf8")).digest(),

From fa841abb6dfdd224b7216725b6bc3b2e951f0913 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 24 Sep 2020 17:11:49 +0100
Subject: [PATCH 0209/3183] 3.0.1-2

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 1ec031ed..88ddc263 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.0.1-1",
+  "version": "3.0.1-2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index f5a71fc9..91e793dc 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.0.1-1",
+  "version": "3.0.1-2",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From b6f81f48cd3f5cf652854f64c4d04964c399b65b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 24 Sep 2020 19:36:08 +0100
Subject: [PATCH 0210/3183] promises

---
 lib/constants.js |   2 +-
 lib/eWeLink.js   | 170 +++++++++++++++++++++++++----------------------
 lib/eWeLinkWS.js |   2 +-
 3 files changed, 91 insertions(+), 83 deletions(-)

diff --git a/lib/constants.js b/lib/constants.js
index 75bdeaf1..9e1ce0d4 100644
--- a/lib/constants.js
+++ b/lib/constants.js
@@ -9,7 +9,7 @@ module.exports = {
   devicesNonLAN: [22, 28, 59, 102],
   devicesSingleSwitch: [1, 5, 6, 14, 15, 22, 24, 27, 32, 36, 44, 59],
   devicesSingleSwitchParams: ["switch"],
-  devicesSingleSwitchOutlet: ["Sonoff Pow"],
+  devicesSingleSwitchOutlet: ["Sonoff Pow", "S26"],
   devicesMultiSwitch: [2, 3, 4, 7, 8, 9, 29, 30, 31, 34, 41],
   devicesMultiSwitchParams: ["switches"],
   devicesSingleSwitchLight: [
diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index db8502ed..08ece724 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -59,7 +59,7 @@ class eWeLink {
             this.wsClient
               .getHost()
               .then(() => this.wsClient.closeConnection())
-              .then(() => Promise(resolve => setTimeout(resolve, 250)))
+              .then(() => new Promise(resolve => setTimeout(resolve, 250)))
               .then(() => this.wsClient.login())
               .catch(err => this.log.warn(err));
           }
@@ -686,92 +686,96 @@ class eWeLink {
           if (!(outletService = accessory.getService(Service.Outlet))) {
             accessory.addService(Service.Outlet);
             outletService = accessory.getService(Service.Outlet);
-            outletService.addCharacteristic(EveService.Characteristics.Voltage);
-            outletService.addCharacteristic(EveService.Characteristics.CurrentConsumption);
-            outletService.addCharacteristic(EveService.Characteristics.ElectricCurrent);
-            outletService.addCharacteristic(EveService.Characteristics.TotalConsumption);
-            outletService.addCharacteristic(EveService.Characteristics.ResetTotal);
-            accessory.context = {
-              ...accessory.context,
-              ...{
-                extraPersistedData: {},
-                lastReset: 0,
-                totalEnergy: 0,
-                totalEnergyTemp: 0,
-              },
-            };
+            if (accessory.context.eweModel !== "S26" && !(this.config.disableEveLogging || false)) {
+              outletService.addCharacteristic(EveService.Characteristics.Voltage);
+              outletService.addCharacteristic(EveService.Characteristics.CurrentConsumption);
+              outletService.addCharacteristic(EveService.Characteristics.ElectricCurrent);
+              outletService.addCharacteristic(EveService.Characteristics.TotalConsumption);
+              outletService.addCharacteristic(EveService.Characteristics.ResetTotal);
+              accessory.context = {
+                ...accessory.context,
+                ...{
+                  extraPersistedData: {},
+                  lastReset: 0,
+                  totalEnergy: 0,
+                  totalEnergyTemp: 0,
+                },
+              };
+            }
           }
           outletService
             .getCharacteristic(Characteristic.On)
             .on("set", (value, callback) => this.internalOutletUpdate(accessory, value, callback));
-          accessory.log = this.log;
-          accessory.eveLogger = new EveHistoryService("energy", accessory, {
-            storage: "fs",
-            minutes: 5,
-            path: this.eveLogPath,
-          });
-          corrInterval.setCorrectingInterval(() => {
-            let isOn = outletService.getCharacteristic(Characteristic.On).value,
-              currentWatt = isOn
-                ? outletService.getCharacteristic(EveService.Characteristics.CurrentConsumption)
-                    .value
-                : 0;
-            if (accessory.eveLogger.isHistoryLoaded()) {
-              accessory.context.extraPersistedData = accessory.eveLogger.getExtraPersistedData();
-              if (accessory.context.extraPersistedData !== undefined) {
-                accessory.context.totalEnergy =
-                  accessory.context.extraPersistedData.totalenergy +
-                  accessory.context.totalEnergyTemp +
-                  (currentWatt * 10) / 3600 / 1000;
-                accessory.eveLogger.setExtraPersistedData({
-                  totalenergy: accessory.context.totalEnergy,
-                  lastReset: accessory.context.extraPersistedData.lastReset,
-                });
+          if (accessory.context.eweModel !== "S26" && !(this.config.disableEveLogging || false)) {
+            accessory.log = this.log;
+            accessory.eveLogger = new EveHistoryService("energy", accessory, {
+              storage: "fs",
+              minutes: 5,
+              path: this.eveLogPath,
+            });
+            corrInterval.setCorrectingInterval(() => {
+              let isOn = outletService.getCharacteristic(Characteristic.On).value,
+                currentWatt = isOn
+                  ? outletService.getCharacteristic(EveService.Characteristics.CurrentConsumption)
+                      .value
+                  : 0;
+              if (accessory.eveLogger.isHistoryLoaded()) {
+                accessory.context.extraPersistedData = accessory.eveLogger.getExtraPersistedData();
+                if (accessory.context.extraPersistedData !== undefined) {
+                  accessory.context.totalEnergy =
+                    accessory.context.extraPersistedData.totalenergy +
+                    accessory.context.totalEnergyTemp +
+                    (currentWatt * 10) / 3600 / 1000;
+                  accessory.eveLogger.setExtraPersistedData({
+                    totalenergy: accessory.context.totalEnergy,
+                    lastReset: accessory.context.extraPersistedData.lastReset,
+                  });
+                } else {
+                  accessory.context.totalEnergy =
+                    accessory.context.totalEnergyTemp + (currentWatt * 10) / 3600 / 1000;
+                  accessory.eveLogger.setExtraPersistedData({
+                    totalenergy: accessory.context.totalEnergy,
+                    lastReset: 0,
+                  });
+                }
+                accessory.context.totalEnergytemp = 0;
               } else {
-                accessory.context.totalEnergy =
-                  accessory.context.totalEnergyTemp + (currentWatt * 10) / 3600 / 1000;
+                accessory.context.totalEnergyTemp += (currentWatt * 10) / 3600 / 1000;
+                accessory.context.totalEnergy = accessory.context.totalEnergyTemp;
+              }
+              accessory.eveLogger.addEntry({
+                time: Date.now(),
+                power: currentWatt,
+              });
+            }, 300000);
+            outletService
+              .getCharacteristic(EveService.Characteristics.TotalConsumption)
+              .on("get", callback => {
+                accessory.context.extraPersistedData = accessory.eveLogger.getExtraPersistedData();
+                if (accessory.context.extraPersistedData !== undefined) {
+                  accessory.context.totalEnergy = accessory.context.extraPersistedData.totalPower;
+                }
+                callback(null, accessory.context.totalEnergy);
+              });
+            outletService
+              .getCharacteristic(EveService.Characteristics.ResetTotal)
+              .on("set", (value, callback) => {
+                accessory.context.totalEnergy = 0;
+                accessory.context.lastReset = value;
                 accessory.eveLogger.setExtraPersistedData({
-                  totalenergy: accessory.context.totalEnergy,
-                  lastReset: 0,
+                  totalPower: 0,
+                  lastReset: value,
                 });
-              }
-              accessory.context.totalEnergytemp = 0;
-            } else {
-              accessory.context.totalEnergyTemp += (currentWatt * 10) / 3600 / 1000;
-              accessory.context.totalEnergy = accessory.context.totalEnergyTemp;
-            }
-            accessory.eveLogger.addEntry({
-              time: Date.now(),
-              power: currentWatt,
-            });
-          }, 300000);
-          outletService
-            .getCharacteristic(EveService.Characteristics.TotalConsumption)
-            .on("get", callback => {
-              accessory.context.extraPersistedData = accessory.eveLogger.getExtraPersistedData();
-              if (accessory.context.extraPersistedData !== undefined) {
-                accessory.context.totalEnergy = accessory.context.extraPersistedData.totalPower;
-              }
-              callback(null, accessory.context.totalEnergy);
-            });
-          outletService
-            .getCharacteristic(EveService.Characteristics.ResetTotal)
-            .on("set", (value, callback) => {
-              accessory.context.totalEnergy = 0;
-              accessory.context.lastReset = value;
-              accessory.eveLogger.setExtraPersistedData({
-                totalPower: 0,
-                lastReset: value,
+                callback();
+              })
+              .on("get", callback => {
+                accessory.context.extraPersistedData = accessory.eveLogger.getExtraPersistedData();
+                if (accessory.context.extraPersistedData !== undefined) {
+                  accessory.context.lastReset = accessory.context.extraPersistedData.lastReset;
+                }
+                callback(null, accessory.context.lastReset);
               });
-              callback();
-            })
-            .on("get", callback => {
-              accessory.context.extraPersistedData = accessory.eveLogger.getExtraPersistedData();
-              if (accessory.context.extraPersistedData !== undefined) {
-                accessory.context.lastReset = accessory.context.extraPersistedData.lastReset;
-              }
-              callback(null, accessory.context.lastReset);
-            });
+          }
           break;
         case "usb":
           let usbService =
@@ -1514,8 +1518,9 @@ class eWeLink {
           }
           return this.sendDeviceUpdate(accessory, params);
         })
-        .then(() =>
-          Promise(resolve => setTimeout(resolve, parseInt(garageConfig.operationTime) * 100))
+        .then(
+          () =>
+            new Promise(resolve => setTimeout(resolve, parseInt(garageConfig.operationTime) * 100))
         )
         .then(() => {
           if (!sAccessory) {
@@ -1904,6 +1909,9 @@ class eWeLink {
       let outletService = accessory.getService(Service.Outlet);
       if (params.hasOwnProperty("switch")) {
         outletService.updateCharacteristic(Characteristic.On, params.switch === "on");
+        if (accessory.context.eweModel === "S26" || this.config.disableEveLogging || false) {
+          outletService.updateCharacteristic(Characteristic.OutletInUse, params.switch === "on");
+        }
       }
       if (params.hasOwnProperty("power")) {
         outletService.updateCharacteristic(
diff --git a/lib/eWeLinkWS.js b/lib/eWeLinkWS.js
index 6f30b2ea..bdfae75d 100644
--- a/lib/eWeLinkWS.js
+++ b/lib/eWeLinkWS.js
@@ -237,7 +237,7 @@ module.exports = class eWeLinkWS {
                 resolve();
                 break;
               default:
-                throw "Unknown response";
+                reject("Unknown response");
             }
           })
           .catch(err => reject("Device update failed [" + err + "]."));

From 68a1cd2e04e02e7b919e93bb2cdd4c64b22cb530 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 25 Sep 2020 05:48:34 +0100
Subject: [PATCH 0211/3183] Update eWeLinkLAN.js

---
 lib/eWeLinkLAN.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/eWeLinkLAN.js b/lib/eWeLinkLAN.js
index 647e2c1c..09c6f749 100644
--- a/lib/eWeLinkLAN.js
+++ b/lib/eWeLinkLAN.js
@@ -174,8 +174,9 @@ module.exports = class eWeLinkLAN {
           .then(res => {
             if (res.data.hasOwnProperty("error") && res.data.error === 0) {
               resolve();
+            } else {
+              throw res.data;
             }
-            reject(res.data);
           })
           .catch(err => reject(err));
       }

From 92005bcec9cbfb121f1d8eb6927b4b7179192a18 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 25 Sep 2020 05:48:37 +0100
Subject: [PATCH 0212/3183] Update eWeLinkWS.js

---
 lib/eWeLinkWS.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/eWeLinkWS.js b/lib/eWeLinkWS.js
index bdfae75d..6f30b2ea 100644
--- a/lib/eWeLinkWS.js
+++ b/lib/eWeLinkWS.js
@@ -237,7 +237,7 @@ module.exports = class eWeLinkWS {
                 resolve();
                 break;
               default:
-                reject("Unknown response");
+                throw "Unknown response";
             }
           })
           .catch(err => reject("Device update failed [" + err + "]."));

From aa319b12a02da919af83ae6bf93667b7116b2012 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Fri, 25 Sep 2020 06:12:46 +0100
Subject: [PATCH 0213/3183] Create discord.md

---
 lib/discord.md | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 lib/discord.md

diff --git a/lib/discord.md b/lib/discord.md
new file mode 100644
index 00000000..c53fcd66
--- /dev/null
+++ b/lib/discord.md
@@ -0,0 +1,26 @@
+Situation: I am trying to control a smart plug which itself is not plugged in.
+`Characteristic.On` calls `internalOutletUpdate()` for it's `.on("set")` event.
+When trying to turn the outlet on I receive the warning at the end of this file.
+
+
+Code can be seen at:
+https://github.com/bwp91/homebridge-ewelink/tree/master/lib
+
+In a nutshell:
+
+* /eWeLink.js line 1078 `internalOutletUpdate()`, which calls
+* /eWeLink.js line 1310 `sendDeviceUpdate()`, which calls
+  * /eWeLinkLAN.js line 125 `sendUpdate()`, and if this fails,
+  * /eWeLinkWS.js line 208 `sendUpdate()`
+
+```
+(node:1229) UnhandledPromiseRejectionWarning: it is unreachable
+    at emitUnhandledRejectionWarning (internal/process/promises.js:170:15)
+    at processPromiseRejections (internal/process/promises.js:247:11)
+    at processTicksAndRejections (internal/process/task_queues.js:94:32)
+(node:1229) UnhandledPromiseRejectionWarning: Unhandled promise rejection. This error originated either by throwing inside of an async function without a catch block, or by rejecting a promise which was not handled with .catch(). To terminate the node process on unhandled promise rejection, use the CLI flag `--unhandled-rejections=strict` (see https://nodejs.org/api/cli.html#cli_unhandled_rejections_mode). (rejection id: 3)
+(node:1229) [DEP0018] DeprecationWarning: Unhandled promise rejections are deprecated. In the future, promise rejections that are not handled will terminate the Node.js process with a non-zero exit code.
+    at emitDeprecationWarning (internal/process/promises.js:180:11)
+    at processPromiseRejections (internal/process/promises.js:249:13)
+    at processTicksAndRejections (internal/process/task_queues.js:94:32)
+```

From 93861cae2fa9a97ff780145508c9168e32b1c485 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 25 Sep 2020 10:29:40 +0100
Subject: [PATCH 0214/3183] fix catch errors

---
 lib/eWeLink.js | 210 ++++++++++---------------------------------------
 1 file changed, 41 insertions(+), 169 deletions(-)

diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index 08ece724..1edf88c3 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -1096,7 +1096,7 @@ class eWeLink {
               .then(() => resolve())
               .catch(err => reject(err));
           } else {
-            reject("it is unreachable");
+            reject("it is unreachable. I's status will be corrected once it is reachable");
           }
         });
     });
@@ -1183,6 +1183,16 @@ class eWeLink {
       }
     }
   }
+  requestDeviceRefresh(accessory, err) {
+    this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+    if (accessory.context.reachableWAN) {
+      this.wsClient.requestUpdate(accessory).catch(() => {});
+      this.log.warn(
+        "[%s] requesting previous state to revert Homebridge status.",
+        accessory.displayName
+      );
+    }
+  }
   internalValveUpdate(accessory, valve, value, callback) {
     callback();
     try {
@@ -1229,18 +1239,9 @@ class eWeLink {
               break;
           }
         })
-        .catch(err => {
-          throw err;
-        });
+        .catch(err => this.requestDeviceRefresh(accessory, err));
     } catch (err) {
-      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
-      if (accessory.context.reachableWAN) {
-        this.wsClient.requestUpdate(accessory).catch(() => {});
-        this.log.warn(
-          "[%s] requesting previous state to revert Homebridge status.",
-          accessory.displayName
-        );
-      }
+      this.requestDeviceRefresh(accessory, err);
     }
   }
   externalValveUpdate(accessory, params) {
@@ -1289,18 +1290,9 @@ class eWeLink {
             .updateCharacteristic(Characteristic.PositionState, newPos > prevPos ? 1 : 0);
           accessory.context.cacheCurrentPosition = newPos;
         })
-        .catch(err => {
-          throw err;
-        });
+        .catch(err => this.requestDeviceRefresh(accessory, err));
     } catch (err) {
-      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
-      if (accessory.context.reachableWAN) {
-        this.wsClient.requestUpdate(accessory).catch(() => {});
-        this.log.warn(
-          "[%s] requesting previous state to revert Homebridge status.",
-          accessory.displayName
-        );
-      }
+      this.requestDeviceRefresh(accessory, err);
     }
   }
   externalCurtainUpdate(accessory, params) {
@@ -1394,19 +1386,9 @@ class eWeLink {
           accessory.context.cachePositionState = 2;
           accessory.context.inUse = false;
         })
-        .catch(err => {
-          throw err;
-        });
+        .catch(err => this.requestDeviceRefresh(accessory, err));
     } catch (err) {
-      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
-      accessory.context.inUse = false;
-      if (accessory.context.reachableWAN) {
-        this.wsClient.requestUpdate(accessory).catch(() => {});
-        this.log.warn(
-          "[%s] requesting previous state to revert Homebridge status.",
-          accessory.displayName
-        );
-      }
+      this.requestDeviceRefresh(accessory, err);
     }
   }
   externalBlindUpdate(accessory, params) {
@@ -1529,19 +1511,9 @@ class eWeLink {
           }
           accessory.context.inUse = false;
         })
-        .catch(err => {
-          throw err;
-        });
+        .catch(err => this.requestDeviceRefresh(accessory, err));
     } catch (err) {
-      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
-      accessory.context.inUse = false;
-      if (accessory.context.reachableWAN) {
-        this.wsClient.requestUpdate(accessory).catch(() => {});
-        this.log.warn(
-          "[%s] requesting previous state to revert Homebridge status.",
-          accessory.displayName
-        );
-      }
+      this.requestDeviceRefresh(accessory, err);
     }
   }
   externalGarageUpdate(accessory, params) {
@@ -1624,19 +1596,9 @@ class eWeLink {
             accessory.context.inUse = false;
           }, parseInt(lockConfig.operationTime) * 100);
         })
-        .catch(err => {
-          throw err;
-        });
+        .catch(err => this.requestDeviceRefresh(accessory, err));
     } catch (err) {
-      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
-      accessory.context.inUse = false;
-      if (accessory.context.reachableWAN) {
-        this.wsClient.requestUpdate(accessory).catch(() => {});
-        this.log.warn(
-          "[%s] requesting previous state to revert Homebridge status.",
-          accessory.displayName
-        );
-      }
+      this.requestDeviceRefresh(accessory, err);
     }
   }
   externalLockUpdate(accessory, params) {
@@ -1751,18 +1713,9 @@ class eWeLink {
             .updateCharacteristic(Characteristic.Active, newPower)
             .updateCharacteristic(Characteristic.RotationSpeed, newSpeed);
         })
-        .catch(err => {
-          throw err;
-        });
+        .catch(err => this.requestDeviceRefresh(accessory, err));
     } catch (err) {
-      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
-      if (accessory.context.reachableWAN) {
-        this.wsClient.requestUpdate(accessory).catch(() => {});
-        this.log.warn(
-          "[%s] requesting previous state to revert Homebridge status.",
-          accessory.displayName
-        );
-      }
+      this.requestDeviceRefresh(accessory, err);
     }
   }
   externalFanUpdate(accessory, params) {
@@ -1822,18 +1775,9 @@ class eWeLink {
         .then(() => {
           switchService.updateCharacteristic(Characteristic.On, value);
         })
-        .catch(err => {
-          throw err;
-        });
+        .catch(err => this.requestDeviceRefresh(accessory, err));
     } catch (err) {
-      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
-      if (accessory.context.reachableWAN) {
-        this.wsClient.requestUpdate(accessory).catch(() => {});
-        this.log.warn(
-          "[%s] requesting previous state to revert Homebridge status.",
-          accessory.displayName
-        );
-      }
+      this.requestDeviceRefresh(accessory, err);
     }
   }
   externalThermostatUpdate(accessory, params) {
@@ -1890,18 +1834,9 @@ class eWeLink {
         .then(() => {
           outletService.updateCharacteristic(Characteristic.On, value);
         })
-        .catch(err => {
-          throw err;
-        });
+        .catch(err => this.requestDeviceRefresh(accessory, err));
     } catch (err) {
-      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
-      if (accessory.context.reachableWAN) {
-        this.wsClient.requestUpdate(accessory).catch(() => {});
-        this.log.warn(
-          "[%s] requesting previous state to revert Homebridge status.",
-          accessory.displayName
-        );
-      }
+      this.requestDeviceRefresh(accessory, err);
     }
   }
   externalOutletUpdate(accessory, params) {
@@ -1956,18 +1891,9 @@ class eWeLink {
         .then(() => {
           outletService.updateCharacteristic(Characteristic.On, value);
         })
-        .catch(err => {
-          throw err;
-        });
+        .catch(err => this.requestDeviceRefresh(accessory, err));
     } catch (err) {
-      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
-      if (accessory.context.reachableWAN) {
-        this.wsClient.requestUpdate(accessory).catch(() => {});
-        this.log.warn(
-          "[%s] requesting previous state to revert Homebridge status.",
-          accessory.displayName
-        );
-      }
+      this.requestDeviceRefresh(accessory, err);
     }
   }
   externalUSBUpdate(accessory, params) {
@@ -1991,18 +1917,9 @@ class eWeLink {
         .then(() => {
           switchService.updateCharacteristic(Characteristic.On, value);
         })
-        .catch(err => {
-          throw err;
-        });
+        .catch(err => this.requestDeviceRefresh(accessory, err));
     } catch (err) {
-      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
-      if (accessory.context.reachableWAN) {
-        this.wsClient.requestUpdate(accessory).catch(() => {});
-        this.log.warn(
-          "[%s] requesting previous state to revert Homebridge status.",
-          accessory.displayName
-        );
-      }
+      this.requestDeviceRefresh(accessory, err);
     }
   }
   externalSCMUpdate(accessory, params) {
@@ -2096,18 +2013,9 @@ class eWeLink {
               break;
           }
         })
-        .catch(err => {
-          throw err;
-        });
+        .catch(err => this.requestDeviceRefresh(accessory, err));
     } catch (err) {
-      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
-      if (accessory.context.reachableWAN) {
-        this.wsClient.requestUpdate(accessory).catch(() => {});
-        this.log.warn(
-          "[%s] requesting previous state to revert Homebridge status.",
-          accessory.displayName
-        );
-      }
+      this.requestDeviceRefresh(accessory, err);
     }
   }
   internalBrightnessUpdate(accessory, value, callback) {
@@ -2141,18 +2049,9 @@ class eWeLink {
             lightService.updateCharacteristic(Characteristic.Brightness, value);
           }
         })
-        .catch(err => {
-          throw err;
-        });
+        .catch(err => this.requestDeviceRefresh(accessory, err));
     } catch (err) {
-      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
-      if (accessory.context.reachableWAN) {
-        this.wsClient.requestUpdate(accessory).catch(() => {});
-        this.log.warn(
-          "[%s] requesting previous state to revert Homebridge status.",
-          accessory.displayName
-        );
-      }
+      this.requestDeviceRefresh(accessory, err);
     }
   }
   internalHSBUpdate(accessory, type, value, callback) {
@@ -2227,18 +2126,9 @@ class eWeLink {
               break;
           }
         })
-        .catch(err => {
-          throw err;
-        });
+        .catch(err => this.requestDeviceRefresh(accessory, err));
     } catch (err) {
-      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
-      if (accessory.context.reachableWAN) {
-        this.wsClient.requestUpdate(accessory).catch(() => {});
-        this.log.warn(
-          "[%s] requesting previous state to revert Homebridge status.",
-          accessory.displayName
-        );
-      }
+      this.requestDeviceRefresh(accessory, err);
     }
   }
   externalSingleLightUpdate(accessory, params) {
@@ -2415,18 +2305,9 @@ class eWeLink {
               break;
           }
         })
-        .catch(err => {
-          throw err;
-        });
+        .catch(err => this.requestDeviceRefresh(accessory, err));
     } catch (err) {
-      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
-      if (accessory.context.reachableWAN) {
-        this.wsClient.requestUpdate(accessory).catch(() => {});
-        this.log.warn(
-          "[%s] requesting previous state to revert Homebridge status.",
-          accessory.displayName
-        );
-      }
+      this.requestDeviceRefresh(accessory, err);
     }
   }
   externalSingleSwitchUpdate(accessory, params) {
@@ -2473,18 +2354,9 @@ class eWeLink {
           rfService.updateCharacteristic(Characteristic.On, true);
           setTimeout(() => rfService.updateCharacteristic(Characteristic.On, false), 3000);
         })
-        .catch(err => {
-          throw err;
-        });
+        .catch(err => this.requestDeviceRefresh(accessory, err));
     } catch (err) {
-      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
-      if (accessory.context.reachableWAN) {
-        this.wsClient.requestUpdate(accessory).catch(() => {});
-        this.log.warn(
-          "[%s] requesting previous state to revert Homebridge status.",
-          accessory.displayName
-        );
-      }
+      this.requestDeviceRefresh(accessory, err);
     }
   }
   externalRFUpdate(accessory, params) {

From 56d51191ee3b7085fd669f86bce8263a6450e156 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 25 Sep 2020 10:35:44 +0100
Subject: [PATCH 0215/3183] 3.0.1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 88ddc263..24611c34 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.0.1-2",
+  "version": "3.0.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 91e793dc..82cf0b07 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.0.1-2",
+  "version": "3.0.1",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From b206f415ffe4adb4904b642e7b32b685bd9e41e0 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 25 Sep 2020 14:45:56 +0100
Subject: [PATCH 0216/3183] async/awaits

---
 lib/discord.md     |  26 --
 lib/eWeLink.js     | 751 +++++++++++++++++++++------------------------
 lib/eWeLinkHTTP.js | 348 +++++++++++----------
 lib/eWeLinkLAN.js  | 158 +++++-----
 lib/eWeLinkWS.js   | 196 ++++++------
 lib/utils.js       |   7 +
 package-lock.json  |   5 +
 package.json       |   1 +
 8 files changed, 706 insertions(+), 786 deletions(-)
 delete mode 100644 lib/discord.md
 create mode 100644 lib/utils.js

diff --git a/lib/discord.md b/lib/discord.md
deleted file mode 100644
index c53fcd66..00000000
--- a/lib/discord.md
+++ /dev/null
@@ -1,26 +0,0 @@
-Situation: I am trying to control a smart plug which itself is not plugged in.
-`Characteristic.On` calls `internalOutletUpdate()` for it's `.on("set")` event.
-When trying to turn the outlet on I receive the warning at the end of this file.
-
-
-Code can be seen at:
-https://github.com/bwp91/homebridge-ewelink/tree/master/lib
-
-In a nutshell:
-
-* /eWeLink.js line 1078 `internalOutletUpdate()`, which calls
-* /eWeLink.js line 1310 `sendDeviceUpdate()`, which calls
-  * /eWeLinkLAN.js line 125 `sendUpdate()`, and if this fails,
-  * /eWeLinkWS.js line 208 `sendUpdate()`
-
-```
-(node:1229) UnhandledPromiseRejectionWarning: it is unreachable
-    at emitUnhandledRejectionWarning (internal/process/promises.js:170:15)
-    at processPromiseRejections (internal/process/promises.js:247:11)
-    at processTicksAndRejections (internal/process/task_queues.js:94:32)
-(node:1229) UnhandledPromiseRejectionWarning: Unhandled promise rejection. This error originated either by throwing inside of an async function without a catch block, or by rejecting a promise which was not handled with .catch(). To terminate the node process on unhandled promise rejection, use the CLI flag `--unhandled-rejections=strict` (see https://nodejs.org/api/cli.html#cli_unhandled_rejections_mode). (rejection id: 3)
-(node:1229) [DEP0018] DeprecationWarning: Unhandled promise rejections are deprecated. In the future, promise rejections that are not handled will terminate the Node.js process with a non-zero exit code.
-    at emitDeprecationWarning (internal/process/promises.js:180:11)
-    at processPromiseRejections (internal/process/promises.js:249:13)
-    at processTicksAndRejections (internal/process/task_queues.js:94:32)
-```
diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index 1edf88c3..d66cbdaf 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -8,7 +8,9 @@ const cns = require("./constants"),
   eWeLinkWS = require("./eWeLinkWS"),
   eWeLinkLAN = require("./eWeLinkLAN"),
   fakegato = require("fakegato-history"),
-  hbLib = require("homebridge-lib");
+  hbLib = require("homebridge-lib"),
+  promInterval = require("interval-promise"),
+  utils = require("./utils");
 class eWeLink {
   constructor(log, config, api) {
     if (!log || !api || !config) return;
@@ -28,89 +30,89 @@ class eWeLink {
     this.cusS = new Map();
     this.hiddenMasters = [];
     this.eveLogPath = this.api.user.storagePath() + "/homebridge-ewelink/";
+    this.wsRefreshFlag = true;
     this.api
       .on("didFinishLaunching", () => this.eWeLinkSync())
       .on("shutdown", () => {
         if (this.lanClient) this.lanClient.closeConnection();
         if (this.wsClient) this.wsClient.closeConnection();
-        if (this.wsRefresh) clearInterval(this.wsRefresh);
+        this.wsRefreshFlag = false;
       });
   }
-  eWeLinkSync() {
-    this.log("Plugin has finished initialising. Synching with eWeLink.");
-    this.httpClient = new eWeLinkHTTP(this.config, this.log);
-    this.httpClient
-      .getHost()
-      .then(() => this.httpClient.login())
-      .then(res => {
-        this.authData = res;
-        return this.httpClient.getDevices();
-      })
-      .then(res => {
-        res.forEach(device => this.devicesInEW.set(device.deviceid, device));
-        this.wsClient = new eWeLinkWS(this.config, this.log, this.authData);
-        this.lanClient = new eWeLinkLAN(this.config, this.log, res);
-        return this.wsClient.getHost();
-      })
-      .then(() => {
-        this.wsClient.login();
-        this.wsRefresh = setInterval(() => {
-          if (this.wsClient) {
-            this.wsClient
-              .getHost()
-              .then(() => this.wsClient.closeConnection())
-              .then(() => new Promise(resolve => setTimeout(resolve, 250)))
-              .then(() => this.wsClient.login())
-              .catch(err => this.log.warn(err));
-          }
-        }, 1800000);
-        return this.lanClient.getHosts();
-      })
-      .then(res => {
-        this.lanDevices = res;
-        return this.lanClient.startMonitor();
-      })
-      .then(() => {
-        (() => {
-          //*** Make a map of custom groups from Homebridge config ***\\
-          if (Object.keys(this.config.groups || []).length > 0) {
-            this.config.groups
-              .filter(g => g.hasOwnProperty("type") && cns.allowedGroups.includes(g.type))
-              .filter(g => g.hasOwnProperty("deviceId") && this.devicesInEW.has(g.deviceId))
-              .forEach(g => this.cusG.set(g.deviceId + "SWX", g));
-          }
-          //*** Make a map of RF Bridge custom sensors from Homebridge config ***\\
-          if (Object.keys(this.config.bridgeSensors || []).length > 0) {
-            this.config.bridgeSensors
-              .filter(s => s.hasOwnProperty("deviceId") && this.devicesInEW.has(s.deviceId))
-              .forEach(s => this.cusS.set(s.fullDeviceId, s));
+  async eWeLinkSync() {
+    try {
+      this.log("Plugin has finished initialising. Synching with eWeLink.");
+      this.httpClient = new eWeLinkHTTP(this.config, this.log);
+      await this.httpClient.getHost();
+      this.authData = await this.httpClient.login();
+      let deviceList = await this.httpClient.getDevices();
+      deviceList.forEach(device => this.devicesInEW.set(device.deviceid, device));
+      this.wsClient = new eWeLinkWS(this.config, this.log, this.authData);
+      this.lanClient = new eWeLinkLAN(this.config, this.log, deviceList);
+      await this.wsClient.getHost();
+      this.wsClient.login();
+      this.lanDevices = await this.lanClient.getHosts();
+      await this.lanClient.startMonitor();
+      (() => {
+        //*** Make a map of custom groups from Homebridge config ***\\
+        if (Object.keys(this.config.groups || []).length > 0) {
+          this.config.groups
+            .filter(g => g.hasOwnProperty("type") && cns.allowedGroups.includes(g.type))
+            .filter(g => g.hasOwnProperty("deviceId") && this.devicesInEW.has(g.deviceId))
+            .forEach(g => this.cusG.set(g.deviceId + "SWX", g));
+        }
+        //*** Make a map of RF Bridge custom sensors from Homebridge config ***\\
+        if (Object.keys(this.config.bridgeSensors || []).length > 0) {
+          this.config.bridgeSensors
+            .filter(s => s.hasOwnProperty("deviceId") && this.devicesInEW.has(s.deviceId))
+            .forEach(s => this.cusS.set(s.fullDeviceId, s));
+        }
+        //*** Logging always helps to see if everything is okay so far ***\\
+        this.log("[%s] eWeLink devices loaded from the Homebridge cache.", this.devicesInHB.size);
+        this.log("[%s] primary devices loaded from your eWeLink account.", this.devicesInEW.size);
+        //*** Remove Homebridge accessories that don't appear in eWeLink ***\\
+        this.devicesInHB.forEach(a => {
+          if (!this.devicesInEW.has(a.context.eweDeviceId)) {
+            this.removeAccessory(a);
           }
-          //*** Logging always helps to see if everything is okay so far ***\\
-          this.log("[%s] eWeLink devices loaded from the Homebridge cache.", this.devicesInHB.size);
-          this.log("[%s] primary devices loaded from your eWeLink account.", this.devicesInEW.size);
-          //*** Remove Homebridge accessories that don't appear in eWeLink ***\\
-          this.devicesInHB.forEach(a => {
-            if (!this.devicesInEW.has(a.context.eweDeviceId)) {
-              this.removeAccessory(a);
+        });
+        //*** Synchronise devices between eWeLink and Homebridge and set up ws/lan listeners ***\\
+        this.devicesInEW.forEach(d => this.initialiseDevice(d));
+        this.wsClient.receiveUpdate(d => this.receiveDeviceUpdate(d));
+        this.lanClient.receiveUpdate(d => this.receiveDeviceUpdate(d));
+        this.wsRefresh = promInterval(
+          async () => {
+            if (this.wsRefreshFlag) {
+              try {
+                if (this.wsClient) {
+                  await this.wsClient.getHost();
+                  await this.wsClient.closeConnection();
+                  await utils.sleep(250);
+                  await this.wsClient.login();
+                }
+              } catch (err) {
+                this.log.warn(err);
+              }
             }
-          });
-          //*** Synchronise devices between eWeLink and Homebridge and set up ws/lan listeners ***\\
-          this.devicesInEW.forEach(d => this.initialiseDevice(d));
-          this.wsClient.receiveUpdate(d => this.receiveDeviceUpdate(d));
-          this.lanClient.receiveUpdate(d => this.receiveDeviceUpdate(d));
-          this.log("eWeLink sync complete. Don't forget to ⭐️  this plugin on GitHub!");
-          if (this.config.debugReqRes || false) {
-            this.log.warn("Note: 'Request & Response Logging' is not advised for long-term use.");
+          },
+          1800000,
+          {
+            stopOnError: false,
           }
-        })();
-      })
-      .catch(err => {
-        this.log.error("************** Cannot load homebridge-ewelink **************");
-        this.log.error(err);
-        this.log.error("************************************************************");
-        if (this.lanClient) this.lanClient.closeConnection();
-        if (this.wsClient) this.wsClient.closeConnection();
-      });
+        );
+        this.log("eWeLink sync complete. Don't forget to ⭐️  this plugin on GitHub!");
+        if (this.config.debugReqRes || false) {
+          this.log.warn("Note: 'Request & Response Logging' is not advised for long-term use.");
+        }
+      })();
+    } catch (err) {
+      this.log.error("************** Cannot load homebridge-ewelink **************");
+      this.log.error(err);
+      this.log.error("************************************************************");
+      if (this.lanClient) this.lanClient.closeConnection();
+      if (this.wsClient) this.wsClient.closeConnection();
+      this.wsRefreshFlag = false;
+    }
   }
   initialiseDevice(device) {
     let accessory;
@@ -664,22 +666,24 @@ class eWeLink {
                 this.internalThermostatUpdate(accessory, value, callback)
               );
           }
-          accessory.log = this.log;
-          accessory.eveLogger = new EveHistoryService("weather", accessory, {
-            storage: "fs",
-            minutes: 5,
-            path: this.eveLogPath,
-          });
-          corrInterval.setCorrectingInterval(() => {
-            let dataToAdd = {
-              time: Date.now(),
-              temp: tempService.getCharacteristic(Characteristic.CurrentTemperature).value,
-            };
-            if (humiService) {
-              humiService.getCharacteristic(Characteristic.CurrentRelativeHumidity).value;
-            }
-            accessory.eveLogger.addEntry(dataToAdd);
-          }, 300000);
+          if (!(this.config.disableEveLogging || false)) {
+            accessory.log = this.log;
+            accessory.eveLogger = new EveHistoryService("weather", accessory, {
+              storage: "fs",
+              minutes: 5,
+              path: this.eveLogPath,
+            });
+            corrInterval.setCorrectingInterval(() => {
+              let dataToAdd = {
+                time: Date.now(),
+                temp: tempService.getCharacteristic(Characteristic.CurrentTemperature).value,
+              };
+              if (humiService) {
+                humiService.getCharacteristic(Characteristic.CurrentRelativeHumidity).value;
+              }
+              accessory.eveLogger.addEntry(dataToAdd);
+            }, 300000);
+          }
           break;
         case "outlet":
           let outletService;
@@ -1076,32 +1080,34 @@ class eWeLink {
     }
   }
   sendDeviceUpdate(accessory, params) {
-    return new Promise((resolve, reject) => {
+    return new Promise(async (resolve, reject) => {
       let payload = {
-          apikey: accessory.context.eweApiKey,
-          deviceid: accessory.context.eweDeviceId,
-          params,
-        },
-        delayPromise = new Promise(resolve => setTimeout(resolve, Math.random() * 100 + 200));
-      delayPromise
-        .then(() => this.lanClient.sendUpdate(payload))
-        .then(() => resolve())
-        .catch(err => {
-          if (accessory.context.reachableWAN) {
-            if (this.debug) {
-              this.log.warn("[%s] Reverting to web socket as %s.", accessory.displayName, err);
-            }
-            this.wsClient
-              .sendUpdate(payload)
-              .then(() => resolve())
-              .catch(err => reject(err));
-          } else {
-            reject("it is unreachable. I's status will be corrected once it is reachable");
+        apikey: accessory.context.eweApiKey,
+        deviceid: accessory.context.eweDeviceId,
+        params,
+      };
+      try {
+        await utils.sleep(Math.random() * 100 + 200);
+        await this.lanClient.sendUpdate(payload);
+        resolve();
+      } catch (err) {
+        if (accessory.context.reachableWAN) {
+          if (this.debug) {
+            this.log.warn("[%s] Reverting to web socket as %s.", accessory.displayName, err);
           }
-        });
+          try {
+            await this.wsClient.sendUpdate(payload);
+            resolve();
+          } catch (err) {
+            reject(err);
+          }
+        } else {
+          reject("it is unreachable. I's status will be corrected once it is reachable");
+        }
+      }
     });
   }
-  receiveDeviceUpdate(device) {
+  async receiveDeviceUpdate(device) {
     let accessory,
       deviceId = device.deviceid,
       reachableChange = false;
@@ -1167,33 +1173,33 @@ class eWeLink {
           deviceId,
           device.params.updateSource
         );
-        this.httpClient
-          .getDevice(deviceId)
-          .then(device => {
-            this.initialiseDevice(device);
-            this.lanClient.addDeviceToMap(device);
-          })
-          .catch(err => {
-            this.log.error("[%s] error getting info [%s]", deviceId, err);
-            this.log.error(
-              "[%s] Please try restarting Homebridge so this device is added.",
-              deviceId
-            );
-          });
+        try {
+          let device = await this.httpClient.getDevice(deviceId);
+          this.initialiseDevice(device);
+          this.lanClient.addDeviceToMap(device);
+        } catch (err) {
+          this.log.error("[%s] error getting info [%s]", deviceId, err);
+          this.log.error(
+            "[%s] Please try restarting Homebridge so this device is added.",
+            deviceId
+          );
+        }
       }
     }
   }
-  requestDeviceRefresh(accessory, err) {
+  async requestDeviceRefresh(accessory, err) {
     this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
     if (accessory.context.reachableWAN) {
-      this.wsClient.requestUpdate(accessory).catch(() => {});
-      this.log.warn(
-        "[%s] requesting previous state to revert Homebridge status.",
-        accessory.displayName
-      );
+      try {
+        await this.wsClient.requestUpdate(accessory);
+        this.log.warn(
+          "[%s] requesting previous state to revert Homebridge status.",
+          accessory.displayName
+        );
+      } catch (err) {}
     }
   }
-  internalValveUpdate(accessory, valve, value, callback) {
+  async internalValveUpdate(accessory, valve, value, callback) {
     callback();
     try {
       let params = {},
@@ -1219,27 +1225,24 @@ class eWeLink {
       }
       params.switches[2].switch = "off";
       params.switches[3].switch = "off";
-      this.sendDeviceUpdate(accessory, params)
-        .then(() => {
-          serviceValve
-            .updateCharacteristic(Characteristic.Active, value)
-            .updateCharacteristic(Characteristic.InUse, value);
-          switch (value) {
-            case 0:
-              serviceValve.updateCharacteristic(Characteristic.RemainingDuration, 0);
-              clearTimeout(accessory.getService(valve).timer);
-              break;
-            case 1:
-              let timer = serviceValve.getCharacteristic(Characteristic.SetDuration).value;
-              serviceValve.updateCharacteristic(Characteristic.RemainingDuration, timer);
-              serviceValve.timer = setTimeout(
-                () => serviceValve.setCharacteristic(Characteristic.Active, 0),
-                timer * 1000
-              );
-              break;
-          }
-        })
-        .catch(err => this.requestDeviceRefresh(accessory, err));
+      await this.sendDeviceUpdate(accessory, params);
+      serviceValve
+        .updateCharacteristic(Characteristic.Active, value)
+        .updateCharacteristic(Characteristic.InUse, value);
+      switch (value) {
+        case 0:
+          serviceValve.updateCharacteristic(Characteristic.RemainingDuration, 0);
+          clearTimeout(accessory.getService(valve).timer);
+          break;
+        case 1:
+          let timer = serviceValve.getCharacteristic(Characteristic.SetDuration).value;
+          serviceValve.updateCharacteristic(Characteristic.RemainingDuration, timer);
+          serviceValve.timer = setTimeout(
+            () => serviceValve.setCharacteristic(Characteristic.Active, 0),
+            timer * 1000
+          );
+          break;
+      }
     } catch (err) {
       this.requestDeviceRefresh(accessory, err);
     }
@@ -1266,7 +1269,7 @@ class eWeLink {
       this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
     }
   }
-  internalCurtainUpdate(accessory, value, callback) {
+  async internalCurtainUpdate(accessory, value, callback) {
     callback();
     try {
       let params,
@@ -1283,14 +1286,11 @@ class eWeLink {
           setclose: Math.abs(100 - newPos),
         };
       }
-      this.sendDeviceUpdate(accessory, params)
-        .then(() => {
-          cService
-            .updateCharacteristic(Characteristic.TargetPosition, newPos)
-            .updateCharacteristic(Characteristic.PositionState, newPos > prevPos ? 1 : 0);
-          accessory.context.cacheCurrentPosition = newPos;
-        })
-        .catch(err => this.requestDeviceRefresh(accessory, err));
+      await this.sendDeviceUpdate(accessory, params);
+      cService
+        .updateCharacteristic(Characteristic.TargetPosition, newPos)
+        .updateCharacteristic(Characteristic.PositionState, newPos > prevPos ? 1 : 0);
+      accessory.context.cacheCurrentPosition = newPos;
     } catch (err) {
       this.requestDeviceRefresh(accessory, err);
     }
@@ -1311,7 +1311,7 @@ class eWeLink {
       this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
     }
   }
-  internalBlindUpdate(accessory, value, callback) {
+  async internalBlindUpdate(accessory, value, callback) {
     callback();
     try {
       let blindConfig,
@@ -1346,7 +1346,6 @@ class eWeLink {
           outlet: 3,
         },
       ];
-      let logger = str => this.log.warn("[%s] %s.", accessory.displayName, str);
       accessory.context.inUse = true;
       if (prevState !== 2) {
         this.log.warn(
@@ -1368,25 +1367,18 @@ class eWeLink {
       accessory.context.targetTimestamp = timeNow + duration;
       params.switches[0].switch = moveUp ? "on" : "off";
       params.switches[1].switch = moveUp ? "off" : "on";
-      this.sendDeviceUpdate(accessory, params)
-        .then(() => {
-          wcService.updateCharacteristic(Characteristic.PositionState, moveUp ? 0 : 1);
-          accessory.context.cachePositionState = moveUp ? 0 : 1;
-          return new Promise(resolve => setTimeout(resolve, duration));
-        })
-        .then(() => {
-          params.switches[0].switch = "off";
-          params.switches[1].switch = "off";
-          return this.sendDeviceUpdate(accessory, params);
-        })
-        .then(() => {
-          wcService.updateCharacteristic(Characteristic.PositionState, 2);
-          wcService.updateCharacteristic(Characteristic.CurrentPosition, newTarget);
-          accessory.context.cacheCurrentPosition = newTarget;
-          accessory.context.cachePositionState = 2;
-          accessory.context.inUse = false;
-        })
-        .catch(err => this.requestDeviceRefresh(accessory, err));
+      await this.sendDeviceUpdate(accessory, params);
+      wcService.updateCharacteristic(Characteristic.PositionState, moveUp ? 0 : 1);
+      accessory.context.cachePositionState = moveUp ? 0 : 1;
+      await utils.sleep(duration);
+      params.switches[0].switch = "off";
+      params.switches[1].switch = "off";
+      await this.sendDeviceUpdate(accessory, params);
+      wcService.updateCharacteristic(Characteristic.PositionState, 2);
+      wcService.updateCharacteristic(Characteristic.CurrentPosition, newTarget);
+      accessory.context.cacheCurrentPosition = newTarget;
+      accessory.context.cachePositionState = 2;
+      accessory.context.inUse = false;
     } catch (err) {
       this.requestDeviceRefresh(accessory, err);
     }
@@ -1438,7 +1430,7 @@ class eWeLink {
       this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
     }
   }
-  internalGarageUpdate(accessory, value, callback) {
+  async internalGarageUpdate(accessory, value, callback) {
     callback();
     try {
       let garageConfig;
@@ -1480,38 +1472,29 @@ class eWeLink {
         delay = 1500;
       }
       if (accessory.context.state !== newPos) return;
-      let delayPromise = new Promise(resolve => setTimeout(resolve, delay));
-      delayPromise
-        .then(() => {
-          gdService
-            .updateCharacteristic(Characteristic.TargetDoorState, newPos)
-            .updateCharacteristic(Characteristic.CurrentDoorState, newPos + 2);
-          accessory.context.cacheTargetDoorState = newPos;
-          accessory.context.cacheCurrentDoorState = newPos + 2;
-          switch (garageConfig.setup) {
-            case "oneSwitch":
-              params.switch = "on";
-              break;
-            case "twoSwitch":
-              params.switches = this.devicesInEW.get(accessory.context.eweDeviceId).params.switches;
-              params.switches[0].switch = newPos === 0 ? "on" : "off";
-              params.switches[1].switch = newPos === 1 ? "on" : "off";
-              break;
-          }
-          return this.sendDeviceUpdate(accessory, params);
-        })
-        .then(
-          () =>
-            new Promise(resolve => setTimeout(resolve, parseInt(garageConfig.operationTime) * 100))
-        )
-        .then(() => {
-          if (!sAccessory) {
-            gdService.updateCharacteristic(Characteristic.CurrentDoorState, newPos);
-            accessory.context.cacheCurrentDoorState = newPos;
-          }
-          accessory.context.inUse = false;
-        })
-        .catch(err => this.requestDeviceRefresh(accessory, err));
+      await utils.sleep(delay);
+      gdService
+        .updateCharacteristic(Characteristic.TargetDoorState, newPos)
+        .updateCharacteristic(Characteristic.CurrentDoorState, newPos + 2);
+      accessory.context.cacheTargetDoorState = newPos;
+      accessory.context.cacheCurrentDoorState = newPos + 2;
+      switch (garageConfig.setup) {
+        case "oneSwitch":
+          params.switch = "on";
+          break;
+        case "twoSwitch":
+          params.switches = this.devicesInEW.get(accessory.context.eweDeviceId).params.switches;
+          params.switches[0].switch = newPos === 0 ? "on" : "off";
+          params.switches[1].switch = newPos === 1 ? "on" : "off";
+          break;
+      }
+      await this.sendDeviceUpdate(accessory, params);
+      await utils.sleep(garageConfig.operationTime * 100);
+      if (!sAccessory) {
+        gdService.updateCharacteristic(Characteristic.CurrentDoorState, newPos);
+        accessory.context.cacheCurrentDoorState = newPos;
+      }
+      accessory.context.inUse = false;
     } catch (err) {
       this.requestDeviceRefresh(accessory, err);
     }
@@ -1569,7 +1552,7 @@ class eWeLink {
       this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
     }
   }
-  internalLockUpdate(accessory, value, callback) {
+  async internalLockUpdate(accessory, value, callback) {
     callback();
     try {
       let lockConfig,
@@ -1584,19 +1567,15 @@ class eWeLink {
         throw "improper configuration";
       }
       accessory.context.inUse = true;
-      this.sendDeviceUpdate(accessory, params)
-        .then(() => {
-          lmService
-            .updateCharacteristic(Characteristic.LockTargetState, 0)
-            .updateCharacteristic(Characteristic.LockCurrentState, 0);
-          setTimeout(() => {
-            lmService
-              .updateCharacteristic(Characteristic.LockTargetState, 1)
-              .updateCharacteristic(Characteristic.LockCurrentState, 1);
-            accessory.context.inUse = false;
-          }, parseInt(lockConfig.operationTime) * 100);
-        })
-        .catch(err => this.requestDeviceRefresh(accessory, err));
+      await this.sendDeviceUpdate(accessory, params);
+      lmService
+        .updateCharacteristic(Characteristic.LockTargetState, 0)
+        .updateCharacteristic(Characteristic.LockCurrentState, 0);
+      await utils.sleep(lockConfig.operationTime * 100);
+      lmService
+        .updateCharacteristic(Characteristic.LockTargetState, 1)
+        .updateCharacteristic(Characteristic.LockCurrentState, 1);
+      accessory.context.inUse = false;
     } catch (err) {
       this.requestDeviceRefresh(accessory, err);
     }
@@ -1674,7 +1653,7 @@ class eWeLink {
       this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
     }
   }
-  internalFanUpdate(accessory, type, value, callback) {
+  async internalFanUpdate(accessory, type, value, callback) {
     callback();
     try {
       let newPower,
@@ -1706,14 +1685,11 @@ class eWeLink {
       params.switches[1].switch = newPower === 1 && newSpeed >= 33 ? "on" : "off";
       params.switches[2].switch = newPower === 1 && newSpeed >= 66 && newSpeed < 99 ? "on" : "off";
       params.switches[3].switch = newPower === 1 && newSpeed >= 99 ? "on" : "off";
-      this.sendDeviceUpdate(accessory, params)
-        .then(() => {
-          lightService.updateCharacteristic(Characteristic.On, newLight);
-          fanService
-            .updateCharacteristic(Characteristic.Active, newPower)
-            .updateCharacteristic(Characteristic.RotationSpeed, newSpeed);
-        })
-        .catch(err => this.requestDeviceRefresh(accessory, err));
+      await this.sendDeviceUpdate(accessory, params);
+      lightService.updateCharacteristic(Characteristic.On, newLight);
+      fanService
+        .updateCharacteristic(Characteristic.Active, newPower)
+        .updateCharacteristic(Characteristic.RotationSpeed, newSpeed);
     } catch (err) {
       this.requestDeviceRefresh(accessory, err);
     }
@@ -1763,7 +1739,7 @@ class eWeLink {
       this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
     }
   }
-  internalThermostatUpdate(accessory, value, callback) {
+  async internalThermostatUpdate(accessory, value, callback) {
     callback();
     try {
       let params = {
@@ -1771,11 +1747,8 @@ class eWeLink {
           mainSwitch: value ? "on" : "off",
         },
         switchService = accessory.getService(Service.Switch);
-      this.sendDeviceUpdate(accessory, params)
-        .then(() => {
-          switchService.updateCharacteristic(Characteristic.On, value);
-        })
-        .catch(err => this.requestDeviceRefresh(accessory, err));
+      await this.sendDeviceUpdate(accessory, params);
+      switchService.updateCharacteristic(Characteristic.On, value);
     } catch (err) {
       this.requestDeviceRefresh(accessory, err);
     }
@@ -1792,49 +1765,48 @@ class eWeLink {
           switchService = accessory.getService(Service.Switch);
         switchService.updateCharacteristic(Characteristic.On, newState);
       }
-      let eveLog = {
-        time: Date.now(),
-      };
-      if (
-        params.hasOwnProperty("currentTemperature") &&
-        accessory.getService(Service.TemperatureSensor)
-      ) {
-        let currentTemp =
-          params.currentTemperature !== "unavailable" ? params.currentTemperature : 0;
-        accessory
-          .getService(Service.TemperatureSensor)
-          .updateCharacteristic(Characteristic.CurrentTemperature, currentTemp);
-        eveLog.temp = parseFloat(currentTemp);
-      }
-      if (
-        params.hasOwnProperty("currentHumidity") &&
-        accessory.getService(Service.HumiditySensor)
-      ) {
-        let currentHumi = params.currentHumidity !== "unavailable" ? params.currentHumidity : 0;
-        accessory
-          .getService(Service.HumiditySensor)
-          .updateCharacteristic(Characteristic.CurrentRelativeHumidity, currentHumi);
-        eveLog.humidity = parseFloat(currentHumi);
-      }
-      if (eveLog.hasOwnProperty("temp") || eveLog.hasOwnProperty("humidity")) {
-        accessory.eveLogger.addEntry(eveLog);
+      if (!(this.config.disableEveLogging || false)) {
+        let eveLog = {
+          time: Date.now(),
+        };
+        if (
+          params.hasOwnProperty("currentTemperature") &&
+          accessory.getService(Service.TemperatureSensor)
+        ) {
+          let currentTemp =
+            params.currentTemperature !== "unavailable" ? params.currentTemperature : 0;
+          accessory
+            .getService(Service.TemperatureSensor)
+            .updateCharacteristic(Characteristic.CurrentTemperature, currentTemp);
+          eveLog.temp = parseFloat(currentTemp);
+        }
+        if (
+          params.hasOwnProperty("currentHumidity") &&
+          accessory.getService(Service.HumiditySensor)
+        ) {
+          let currentHumi = params.currentHumidity !== "unavailable" ? params.currentHumidity : 0;
+          accessory
+            .getService(Service.HumiditySensor)
+            .updateCharacteristic(Characteristic.CurrentRelativeHumidity, currentHumi);
+          eveLog.humidity = parseFloat(currentHumi);
+        }
+        if (eveLog.hasOwnProperty("temp") || eveLog.hasOwnProperty("humidity")) {
+          accessory.eveLogger.addEntry(eveLog);
+        }
       }
     } catch (err) {
       this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
     }
   }
-  internalOutletUpdate(accessory, value, callback) {
+  async internalOutletUpdate(accessory, value, callback) {
     callback();
     try {
       let params = {
           switch: value ? "on" : "off",
         },
         outletService = accessory.getService(Service.Outlet);
-      this.sendDeviceUpdate(accessory, params)
-        .then(() => {
-          outletService.updateCharacteristic(Characteristic.On, value);
-        })
-        .catch(err => this.requestDeviceRefresh(accessory, err));
+      await this.sendDeviceUpdate(accessory, params);
+      outletService.updateCharacteristic(Characteristic.On, value);
     } catch (err) {
       this.requestDeviceRefresh(accessory, err);
     }
@@ -1879,7 +1851,7 @@ class eWeLink {
       this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
     }
   }
-  internalUSBUpdate(accessory, value, callback) {
+  async internalUSBUpdate(accessory, value, callback) {
     callback();
     try {
       let params = {
@@ -1887,11 +1859,8 @@ class eWeLink {
         },
         outletService = accessory.getService(Service.Outlet);
       params.switches[0].switch = value ? "on" : "off";
-      this.sendDeviceUpdate(accessory, params)
-        .then(() => {
-          outletService.updateCharacteristic(Characteristic.On, value);
-        })
-        .catch(err => this.requestDeviceRefresh(accessory, err));
+      await this.sendDeviceUpdate(accessory, params);
+      outletService.updateCharacteristic(Characteristic.On, value);
     } catch (err) {
       this.requestDeviceRefresh(accessory, err);
     }
@@ -1905,7 +1874,7 @@ class eWeLink {
       this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
     }
   }
-  internalSCMUpdate(accessory, value, callback) {
+  async internalSCMUpdate(accessory, value, callback) {
     callback();
     try {
       let params = {
@@ -1913,11 +1882,8 @@ class eWeLink {
         },
         switchService = accessory.getService(Service.Switch);
       params.switches[0].switch = value ? "on" : "off";
-      this.sendDeviceUpdate(accessory, params)
-        .then(() => {
-          switchService.updateCharacteristic(Characteristic.On, value);
-        })
-        .catch(err => this.requestDeviceRefresh(accessory, err));
+      await this.sendDeviceUpdate(accessory, params);
+      switchService.updateCharacteristic(Characteristic.On, value);
     } catch (err) {
       this.requestDeviceRefresh(accessory, err);
     }
@@ -1931,7 +1897,7 @@ class eWeLink {
       this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
     }
   }
-  internalLightbulbUpdate(accessory, value, callback) {
+  async internalLightbulbUpdate(accessory, value, callback) {
     callback();
     try {
       let oAccessory,
@@ -1973,52 +1939,48 @@ class eWeLink {
           }
           break;
       }
-      this.sendDeviceUpdate(accessory, params)
-        .then(() => {
-          switch (accessory.context.switchNumber) {
-            case "X":
-              lightService.updateCharacteristic(Characteristic.On, value);
-              break;
-            case "0":
-              for (let i = 0; i <= 4; i++) {
-                if ((oAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW" + i))) {
-                  oAccessory
-                    .getService(Service.Lightbulb)
-                    .updateCharacteristic(Characteristic.On, value);
-                }
-              }
-              break;
-            case "1":
-            case "2":
-            case "3":
-            case "4":
-              lightService.updateCharacteristic(Characteristic.On, value);
-              let masterState = "off";
-              for (let i = 1; i <= 4; i++) {
-                if ((oAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW" + i))) {
-                  if (
-                    oAccessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On)
-                      .value
-                  ) {
-                    masterState = "on";
-                  }
-                }
-              }
-              if (!this.hiddenMasters.includes(accessory.context.eweDeviceId)) {
-                oAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW0");
-                oAccessory
-                  .getService(Service.Lightbulb)
-                  .updateCharacteristic(Characteristic.On, masterState === "on");
+      await this.sendDeviceUpdate(accessory, params);
+      switch (accessory.context.switchNumber) {
+        case "X":
+          lightService.updateCharacteristic(Characteristic.On, value);
+          break;
+        case "0":
+          for (let i = 0; i <= 4; i++) {
+            if ((oAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW" + i))) {
+              oAccessory
+                .getService(Service.Lightbulb)
+                .updateCharacteristic(Characteristic.On, value);
+            }
+          }
+          break;
+        case "1":
+        case "2":
+        case "3":
+        case "4":
+          lightService.updateCharacteristic(Characteristic.On, value);
+          let masterState = "off";
+          for (let i = 1; i <= 4; i++) {
+            if ((oAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW" + i))) {
+              if (
+                oAccessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On).value
+              ) {
+                masterState = "on";
               }
-              break;
+            }
+          }
+          if (!this.hiddenMasters.includes(accessory.context.eweDeviceId)) {
+            oAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW0");
+            oAccessory
+              .getService(Service.Lightbulb)
+              .updateCharacteristic(Characteristic.On, masterState === "on");
           }
-        })
-        .catch(err => this.requestDeviceRefresh(accessory, err));
+          break;
+      }
     } catch (err) {
       this.requestDeviceRefresh(accessory, err);
     }
   }
-  internalBrightnessUpdate(accessory, value, callback) {
+  async internalBrightnessUpdate(accessory, value, callback) {
     callback();
     try {
       let params = {},
@@ -2039,22 +2001,18 @@ class eWeLink {
             break;
         }
       }
-      let delayPromise = new Promise(resolve => setTimeout(resolve, 250));
-      delayPromise
-        .then(() => this.sendDeviceUpdate(accessory, params))
-        .then(() => {
-          if (value === 0) {
-            lightService.updateCharacteristic(Characteristic.On, false);
-          } else {
-            lightService.updateCharacteristic(Characteristic.Brightness, value);
-          }
-        })
-        .catch(err => this.requestDeviceRefresh(accessory, err));
+      await utils.sleep(250);
+      await this.sendDeviceUpdate(accessory, params);
+      if (value === 0) {
+        lightService.updateCharacteristic(Characteristic.On, false);
+      } else {
+        lightService.updateCharacteristic(Characteristic.Brightness, value);
+      }
     } catch (err) {
       this.requestDeviceRefresh(accessory, err);
     }
   }
-  internalHSBUpdate(accessory, type, value, callback) {
+  async internalHSBUpdate(accessory, type, value, callback) {
     callback();
     try {
       if (!accessory.context.reachableWAN && !accessory.context.reachableLAN) {
@@ -2113,20 +2071,16 @@ class eWeLink {
           }
           break;
       }
-      let delayPromise = new Promise(resolve => setTimeout(resolve, 250));
-      delayPromise
-        .then(() => this.sendDeviceUpdate(accessory, params))
-        .then(() => {
-          switch (type) {
-            case "hue":
-              lightService.updateCharacteristic(Characteristic.Hue, value);
-              break;
-            case "bri":
-              lightService.updateCharacteristic(Characteristic.Brightness, value);
-              break;
-          }
-        })
-        .catch(err => this.requestDeviceRefresh(accessory, err));
+      await utils.sleep(250);
+      await this.sendDeviceUpdate(accessory, params);
+      switch (type) {
+        case "hue":
+          lightService.updateCharacteristic(Characteristic.Hue, value);
+          break;
+        case "bri":
+          lightService.updateCharacteristic(Characteristic.Brightness, value);
+          break;
+      }
     } catch (err) {
       this.requestDeviceRefresh(accessory, err);
     }
@@ -2229,7 +2183,7 @@ class eWeLink {
       this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
     }
   }
-  internalSwitchUpdate(accessory, value, callback) {
+  async internalSwitchUpdate(accessory, value, callback) {
     callback();
     try {
       let oAccessory,
@@ -2266,46 +2220,41 @@ class eWeLink {
           }
           break;
       }
-      this.sendDeviceUpdate(accessory, params)
-        .then(() => {
-          switch (accessory.context.switchNumber) {
-            case "X":
-              switchService.updateCharacteristic(Characteristic.On, value);
-              break;
-            case "0":
-              for (let i = 0; i <= 4; i++) {
-                if ((oAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW" + i))) {
-                  oAccessory
-                    .getService(Service.Switch)
-                    .updateCharacteristic(Characteristic.On, value);
-                }
-              }
-              break;
-            case "1":
-            case "2":
-            case "3":
-            case "4":
-              switchService.updateCharacteristic(Characteristic.On, value);
-              let masterState = "off";
-              for (let i = 1; i <= 4; i++) {
-                if ((oAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW" + i))) {
-                  if (
-                    oAccessory.getService(Service.Switch).getCharacteristic(Characteristic.On).value
-                  ) {
-                    masterState = "on";
-                  }
-                }
-              }
-              if (!this.hiddenMasters.includes(accessory.context.eweDeviceId)) {
-                oAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW0");
-                oAccessory
-                  .getService(Service.Switch)
-                  .updateCharacteristic(Characteristic.On, masterState === "on");
+      await this.sendDeviceUpdate(accessory, params);
+      switch (accessory.context.switchNumber) {
+        case "X":
+          switchService.updateCharacteristic(Characteristic.On, value);
+          break;
+        case "0":
+          for (let i = 0; i <= 4; i++) {
+            if ((oAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW" + i))) {
+              oAccessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, value);
+            }
+          }
+          break;
+        case "1":
+        case "2":
+        case "3":
+        case "4":
+          switchService.updateCharacteristic(Characteristic.On, value);
+          let masterState = "off";
+          for (let i = 1; i <= 4; i++) {
+            if ((oAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW" + i))) {
+              if (
+                oAccessory.getService(Service.Switch).getCharacteristic(Characteristic.On).value
+              ) {
+                masterState = "on";
               }
-              break;
+            }
+          }
+          if (!this.hiddenMasters.includes(accessory.context.eweDeviceId)) {
+            oAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW0");
+            oAccessory
+              .getService(Service.Switch)
+              .updateCharacteristic(Characteristic.On, masterState === "on");
           }
-        })
-        .catch(err => this.requestDeviceRefresh(accessory, err));
+          break;
+      }
     } catch (err) {
       this.requestDeviceRefresh(accessory, err);
     }
@@ -2341,7 +2290,7 @@ class eWeLink {
       this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
     }
   }
-  internalRFUpdate(accessory, rfChl, service, callback) {
+  async internalRFUpdate(accessory, rfChl, service, callback) {
     callback();
     try {
       let params = {
@@ -2349,12 +2298,10 @@ class eWeLink {
           rfChl: parseInt(rfChl),
         },
         rfService = accessory.getService(service);
-      this.sendDeviceUpdate(accessory, params)
-        .then(() => {
-          rfService.updateCharacteristic(Characteristic.On, true);
-          setTimeout(() => rfService.updateCharacteristic(Characteristic.On, false), 3000);
-        })
-        .catch(err => this.requestDeviceRefresh(accessory, err));
+      await this.sendDeviceUpdate(accessory, params);
+      rfService.updateCharacteristic(Characteristic.On, true);
+      await utils.sleep(3000);
+      rfService.updateCharacteristic(Characteristic.On, false);
     } catch (err) {
       this.requestDeviceRefresh(accessory, err);
     }
diff --git a/lib/eWeLinkHTTP.js b/lib/eWeLinkHTTP.js
index 36d099cf..4076d982 100644
--- a/lib/eWeLinkHTTP.js
+++ b/lib/eWeLinkHTTP.js
@@ -2,7 +2,8 @@
 "use strict";
 const axios = require("axios"),
   constants = require("./constants"),
-  crypto = require("crypto");
+  crypto = require("crypto"),
+  utils = require("./utils");
 module.exports = class eWeLinkHTTP {
   constructor(config, log) {
     this.log = log;
@@ -14,7 +15,7 @@ module.exports = class eWeLinkHTTP {
     this.cCode = "+" + config.countryCode.toString().replace("+", "").replace(" ", "");
   }
   getHost() {
-    return new Promise((resolve, reject) => {
+    return new Promise(async (resolve, reject) => {
       let params = {
           appid: constants.appId,
           country_code: this.cCode,
@@ -23,92 +24,91 @@ module.exports = class eWeLinkHTTP {
           version: 8,
         },
         dataToSign = [];
-      Object.keys(params).forEach(k => {
-        dataToSign.push({
-          key: k,
-          value: params.k,
+      try {
+        Object.keys(params).forEach(k => {
+          dataToSign.push({
+            key: k,
+            value: params.k,
+          });
         });
-      });
-      dataToSign.sort((a, b) => (a.key < b.key ? -1 : 1));
-      dataToSign = dataToSign.map(k => k.key + "=" + k.value).join("&");
-      dataToSign = crypto
-        .createHmac("sha256", constants.appSecret)
-        .update(dataToSign)
-        .digest("base64");
-      if (this.debugReqRes) {
-        this.log.warn(
-          "Sending HTTP getHost request. This text is yellow for clarity.\n%s",
-          JSON.stringify(params, null, 2)
-        );
-      } else if (this.debug) {
-        this.log("Sending HTTP getHost request.");
-      }
-      axios
-        .get("https://api.coolkit.cc:8080/api/user/region", {
+        dataToSign.sort((a, b) => (a.key < b.key ? -1 : 1));
+        dataToSign = dataToSign.map(k => k.key + "=" + k.value).join("&");
+        dataToSign = crypto
+          .createHmac("sha256", constants.appSecret)
+          .update(dataToSign)
+          .digest("base64");
+        if (this.debugReqRes) {
+          this.log.warn(
+            "Sending HTTP getHost request. This text is yellow for clarity.\n%s",
+            JSON.stringify(params, null, 2)
+          );
+        } else if (this.debug) {
+          this.log("Sending HTTP getHost request.");
+        }
+        let res = await axios.get("https://api.coolkit.cc:8080/api/user/region", {
           headers: {
             Authorization: "Sign " + dataToSign,
             "Content-Type": "application/json",
           },
           params,
-        })
-        .then(res => {
-          let body = res.data;
-          if (!body.region) {
-            throw "Server did not respond with a region.\n" + JSON.stringify(body, null, 2);
-          }
-          switch (body.region) {
-            case "eu":
-            case "us":
-            case "as":
-              this.httpHost = body.region + "-apia.coolkit.cc";
-              break;
-            case "cn":
-              this.httpHost = "cn-apia.coolkit.cn";
-              break;
-            default:
-              throw "No valid region received - [" + body.region + "].";
-          }
-          if (this.debug) {
-            this.log("HTTP API host received [%s].", this.httpHost);
-          }
-          resolve(this.httpHost);
-        })
-        .catch(err => {
-          if (
-            err.hasOwnProperty("code") &&
-            ["ENOTFOUND", "ETIMEDOUT", "EAI_AGAIN"].includes(err.code)
-          ) {
-            this.log.warn("Unable to reach eWeLink. Retrying in 30 seconds.");
-            this.delay().then(() => resolve(this.getHost()));
-          } else {
-            reject(err.message || err);
-          }
         });
+        let body = res.data;
+        if (!body.region) {
+          throw "Server did not respond with a region.\n" + JSON.stringify(body, null, 2);
+        }
+        switch (body.region) {
+          case "eu":
+          case "us":
+          case "as":
+            this.httpHost = body.region + "-apia.coolkit.cc";
+            break;
+          case "cn":
+            this.httpHost = "cn-apia.coolkit.cn";
+            break;
+          default:
+            throw "No valid region received - [" + body.region + "].";
+        }
+        if (this.debug) {
+          this.log("HTTP API host received [%s].", this.httpHost);
+        }
+        resolve(this.httpHost);
+      } catch (err) {
+        if (
+          err.hasOwnProperty("code") &&
+          ["ENOTFOUND", "ETIMEDOUT", "EAI_AGAIN"].includes(err.code)
+        ) {
+          this.log.warn("Unable to reach eWeLink. Retrying in 30 seconds.");
+          await utils.sleep(30000);
+          resolve(this.getHost());
+        } else {
+          reject(err.message || err);
+        }
+      }
     });
   }
   login() {
-    return new Promise((resolve, reject) => {
+    return new Promise(async (resolve, reject) => {
       let data = {
         countryCode: this.cCode,
         password: this.password,
       };
-      this.username.includes("@")
-        ? (data.email = this.username)
-        : (data.phoneNumber = this.username);
-      if (this.debugReqRes) {
-        let msg = JSON.stringify(data, null, 2)
-          .replace(this.password, "**hidden**")
-          .replace(this.username, "**hidden**");
-        this.log.warn("Sending HTTP login request. This text is yellow for clarity.\n%s", msg);
-      } else if (this.debug) {
-        this.log("Sending HTTP login request.");
-      }
-      let dataToSign = crypto
-        .createHmac("sha256", constants.appSecret)
-        .update(JSON.stringify(data))
-        .digest("base64");
-      axios
-        .post("https://" + this.httpHost + "/v2/user/login", data, {
+      try {
+        this.username.includes("@")
+          ? (data.email = this.username)
+          : (data.phoneNumber = this.username);
+        if (this.debugReqRes) {
+          let msg = JSON.stringify(data, null, 2)
+            .replace(this.password, "**hidden**")
+            .replace(this.username, "**hidden**");
+          this.log.warn("Sending HTTP login request. This text is yellow for clarity.\n%s", msg);
+        } else if (this.debug) {
+          this.log("Sending HTTP login request.");
+        }
+        let dataToSign = crypto
+          .createHmac("sha256", constants.appSecret)
+          .update(JSON.stringify(data))
+          .digest("base64");
+        let res = await axios.post("https://" + this.httpHost + "/v2/user/login", data, {
           headers: {
             Authorization: "Sign " + dataToSign,
             "Content-Type": "application/json",
@@ -116,58 +116,59 @@ module.exports = class eWeLinkHTTP {
             "X-CK-Appid": constants.appId,
             "X-CK-Nonce": Math.random().toString(36).substr(2, 8),
           },
-        })
-        .then(res => {
-          let body = res.data;
-          if (
-            body.hasOwnProperty("error") &&
-            body.error === 10004 &&
-            body.hasOwnProperty("data") &&
-            body.data.hasOwnProperty("region")
-          ) {
-            let givenRegion = body.data.region;
-            switch (givenRegion) {
-              case "eu":
-              case "us":
-              case "as":
-                this.httpHost = givenRegion + "-apia.coolkit.cc";
-                break;
-              case "cn":
-                this.httpHost = "cn-apia.coolkit.cn";
-                break;
-              default:
-                throw "No valid region received - [" + givenRegion + "].";
-            }
-            if (this.debug) {
-              this.log("New HTTP API host received [%s].", this.httpHost);
-            }
-            resolve(this.login());
-            return;
+        });
+        let body = res.data;
+        if (
+          body.hasOwnProperty("error") &&
+          body.error === 10004 &&
+          body.hasOwnProperty("data") &&
+          body.data.hasOwnProperty("region")
+        ) {
+          let givenRegion = body.data.region;
+          switch (givenRegion) {
+            case "eu":
+            case "us":
+            case "as":
+              this.httpHost = givenRegion + "-apia.coolkit.cc";
+              break;
+            case "cn":
+              this.httpHost = "cn-apia.coolkit.cn";
+              break;
+            default:
+              throw "No valid region received - [" + givenRegion + "].";
+          }
+          if (this.debug) {
+            this.log("New HTTP API host received [%s].", this.httpHost);
           }
-          if (body.data.at) {
-            this.aToken = body.data.at;
-            this.apiKey = body.data.user.apikey;
-            resolve({
-              aToken: this.aToken,
-              apiKey: this.apiKey,
-              httpHost: this.httpHost,
-            });
+          resolve(this.login());
+          return;
+        }
+        if (body.data.at) {
+          this.aToken = body.data.at;
+          this.apiKey = body.data.user.apikey;
+          resolve({
+            aToken: this.aToken,
+            apiKey: this.apiKey,
+            httpHost: this.httpHost,
+          });
+        } else {
+          if (body.error === 500) {
+            this.log.warn("An eWeLink error [500] occured. Retrying in 30 seconds.");
+            await utils.sleep(30000);
+            resolve(this.login());
           } else {
-            if (body.error === 500) {
-              this.log.warn("An eWeLink error [500] occured. Retrying in 30 seconds.");
-              this.delay().then(() => resolve(this.login()));
-            } else {
-              throw "No auth token received.\n" + JSON.stringify(body, null, 2);
-            }
+            throw "No auth token received.\n" + JSON.stringify(body, null, 2);
           }
-        })
-        .catch(err => reject(err.message || err));
+        }
+      } catch (err) {
+        reject(err.message || err);
+      }
     });
   }
   getDevices() {
-    return new Promise((resolve, reject) => {
-      axios
-        .get("https://" + this.httpHost + "/v2/device/thing", {
+    return new Promise(async (resolve, reject) => {
+      try {
+        let res = await axios.get("https://" + this.httpHost + "/v2/device/thing", {
           headers: {
             Authorization: "Bearer " + this.aToken,
             "Content-Type": "application/json",
@@ -175,39 +176,38 @@ module.exports = class eWeLinkHTTP {
             "X-CK-Appid": constants.appId,
             "X-CK-Nonce": Math.random().toString(36).substr(2, 8),
           },
-        })
-        .then(res => {
-          let body = res.data;
-          if (
-            !body.hasOwnProperty("data") ||
-            !body.hasOwnProperty("error") ||
-            (body.hasOwnProperty("error") && body.error !== 0)
-          ) {
-            throw JSON.stringify(body, null, 2);
-          }
-          let deviceList = [];
-          if (body.data.thingList && body.data.thingList.length > 0) {
-            body.data.thingList.forEach(device => deviceList.push(device.itemData));
-          }
-          deviceList
-            .filter(d => d.hasOwnProperty("extra") && d.extra.hasOwnProperty("uiid"))
-            .filter(d => !this.hideDevFromHB.includes(d.deviceid));
-          resolve(deviceList);
-        })
-        .catch(err => {
-          if (err.hasOwnProperty("code") && ["ENOTFOUND", "ETIMEDOUT"].includes(err.code)) {
-            this.log.warn("Unable to reach eWeLink. Retrying in 30 seconds.");
-            this.delay().then(() => resolve(this.getDevices()));
-          } else {
-            reject(err.message || err);
-          }
         });
+        let body = res.data;
+        if (
+          !body.hasOwnProperty("data") ||
+          !body.hasOwnProperty("error") ||
+          (body.hasOwnProperty("error") && body.error !== 0)
+        ) {
+          throw JSON.stringify(body, null, 2);
+        }
+        let deviceList = [];
+        if (body.data.thingList && body.data.thingList.length > 0) {
+          body.data.thingList.forEach(device => deviceList.push(device.itemData));
+        }
+        deviceList
+          .filter(d => d.hasOwnProperty("extra") && d.extra.hasOwnProperty("uiid"))
+          .filter(d => !this.hideDevFromHB.includes(d.deviceid));
+        resolve(deviceList);
+      } catch (err) {
+        if (err.hasOwnProperty("code") && ["ENOTFOUND", "ETIMEDOUT"].includes(err.code)) {
+          this.log.warn("Unable to reach eWeLink. Retrying in 30 seconds.");
+          await utils.sleep(30000);
+          resolve(this.getDevices());
+        } else {
+          reject(err.message || err);
+        }
+      }
     });
   }
   getDevice(deviceId) {
-    return new Promise((resolve, reject) => {
-      axios
-        .post(
+    return new Promise(async (resolve, reject) => {
+      try {
+        let res = await axios.post(
           "https://" + this.httpHost + "/v2/device/thing",
           {
             thingList: [
@@ -226,33 +226,29 @@ module.exports = class eWeLinkHTTP {
               "X-CK-Nonce": Math.random().toString(36).substr(2, 8),
             },
           }
-        )
-        .then(res => {
-          let body = res.data;
-          if (
-            !body.hasOwnProperty("data") ||
-            !body.hasOwnProperty("error") ||
-            (body.hasOwnProperty("error") && body.error !== 0)
-          ) {
-            throw JSON.stringify(body, null, 2);
-          }
-          if (body.data.thingList && body.data.thingList.length === 1) {
-            resolve(body.data.thingList[0].itemData);
-          } else {
-            throw "device not found in eWeLink";
-          }
-        })
-        .catch(err => {
-          if (err.hasOwnProperty("code") && ["ENOTFOUND", "ETIMEDOUT"].includes(err.code)) {
-            this.log.warn("Unable to reach eWeLink. Retrying in 30 seconds.");
-            this.delay().then(() => resolve(this.getDevice(deviceId)));
-          } else {
-            reject(err.message || err);
-          }
-        });
+        );
+        let body = res.data;
+        if (
+          !body.hasOwnProperty("data") ||
+          !body.hasOwnProperty("error") ||
+          (body.hasOwnProperty("error") && body.error !== 0)
+        ) {
+          throw JSON.stringify(body, null, 2);
+        }
+        if (body.data.thingList && body.data.thingList.length === 1) {
+          resolve(body.data.thingList[0].itemData);
+        } else {
+          throw "device not found in eWeLink";
+        }
+      } catch (err) {
+        if (err.hasOwnProperty("code") && ["ENOTFOUND", "ETIMEDOUT"].includes(err.code)) {
+          this.log.warn("Unable to reach eWeLink. Retrying in 30 seconds.");
+          await utils.sleep(30000);
+          resolve(this.getDevice(deviceId));
+        } else {
+          reject(err.message || err);
+        }
+      }
     });
   }
-  delay() {
-    return new Promise(resolve => setTimeout(resolve, 30000));
-  }
 };
diff --git a/lib/eWeLinkLAN.js b/lib/eWeLinkLAN.js
index 09c6f749..b046db46 100644
--- a/lib/eWeLinkLAN.js
+++ b/lib/eWeLinkLAN.js
@@ -25,28 +25,28 @@ module.exports = class eWeLinkLAN {
     this.emitter = new eventemitter();
   }
   getHosts() {
-    return new Promise((resolve, reject) => {
-      dns
-        .discover({
+    return new Promise(async (resolve, reject) => {
+      try {
+        let res = await dns.discover({
           name: "_ewelink._tcp.local",
-        })
-        .then(res => {
-          res.forEach(device => {
-            let d,
-              deviceId = device.fqdn.replace("._ewelink._tcp.local", "").replace("eWeLink_", "");
-            if ((d = this.deviceMap.get(deviceId))) {
-              if (!this.ipOverrides.hasOwnProperty(deviceId)) {
-                this.deviceMap.set(deviceId, {
-                  apiKey: d.apiKey,
-                  online: true,
-                  ip: device.address,
-                });
-              }
+        });
+        res.forEach(device => {
+          let d,
+            deviceId = device.fqdn.replace("._ewelink._tcp.local", "").replace("eWeLink_", "");
+          if ((d = this.deviceMap.get(deviceId))) {
+            if (!this.ipOverrides.hasOwnProperty(deviceId)) {
+              this.deviceMap.set(deviceId, {
+                apiKey: d.apiKey,
+                online: true,
+                ip: device.address,
+              });
             }
-          });
-          resolve(this.deviceMap);
-        })
-        .catch(err => reject(err));
+          }
+        });
+        resolve(this.deviceMap);
+      } catch (err) {
+        reject(err);
+      }
     });
   }
   startMonitor() {
@@ -115,70 +115,66 @@ module.exports = class eWeLinkLAN {
           });
       }
     };
-    return new Promise((resolve, reject) => {
-      dns
-        .startMonitoring()
-        .then(() => resolve())
-        .catch(err => reject(err));
-    });
+    dns.startMonitoring();
   }
   sendUpdate(json) {
-    return new Promise((resolve, reject) => {
-      if (!this.deviceMap.get(json.deviceid).online) {
-        throw "device isn't reachable via LAN mode";
-      }
-      let apiKey,
-        suffix,
-        params = {};
-      if (json.params.hasOwnProperty("switches")) {
-        params.switches = json.params.switches;
-        suffix = "switches";
-      } else if (json.params.hasOwnProperty("switch")) {
-        params.switch = json.params.switch;
-        suffix = "switch";
-      } else {
-        throw "device isn't reachable via LAN mode";
-      }
-      if ((apiKey = this.deviceMap.get(json.deviceid).apiKey)) {
-        let key = crypto.createHash("md5").update(Buffer.from(apiKey, "utf8")).digest(),
-          iv = crypto.randomBytes(16),
-          enc = crypto.createCipheriv("aes-128-cbc", key, iv),
-          data = {
-            data: Buffer.concat([enc.update(JSON.stringify(params)), enc.final()]).toString(
-              "base64"
-            ),
-            deviceid: json.deviceid,
-            encrypt: true,
-            iv: iv.toString("base64"),
-            selfApikey: "123",
-            sequence: Date.now().toString(),
-          };
-        if (this.debugReqRes) {
-          let msg = JSON.stringify(json, null, 2)
-            .replace(json.apikey, "**hidden**")
-            .replace(json.apikey, "**hidden**")
-            .replace(json.deviceid, "**hidden**");
-          this.log.warn("LAN message sent. This text is yellow for clarity.\n%s", msg);
-        } else if (this.debug) {
-          this.log("LAN message sent.");
+    return new Promise(async (resolve, reject) => {
+      try {
+        if (!this.deviceMap.get(json.deviceid).online) {
+          throw "device isn't reachable via LAN mode";
         }
-        axios({
-          method: "post",
-          url: "http://" + this.deviceMap.get(json.deviceid).ip + ":8081/zeroconf/" + suffix,
-          headers: {
-            Accept: "application/json",
-            "Content-Type": "application/json",
-          },
-          data,
-        })
-          .then(res => {
-            if (res.data.hasOwnProperty("error") && res.data.error === 0) {
-              resolve();
-            } else {
-              throw res.data;
-            }
-          })
-          .catch(err => reject(err));
+        let apiKey,
+          suffix,
+          params = {};
+        if (json.params.hasOwnProperty("switches")) {
+          params.switches = json.params.switches;
+          suffix = "switches";
+        } else if (json.params.hasOwnProperty("switch")) {
+          params.switch = json.params.switch;
+          suffix = "switch";
+        } else {
+          throw "device isn't reachable via LAN mode";
+        }
+        if ((apiKey = this.deviceMap.get(json.deviceid).apiKey)) {
+          let key = crypto.createHash("md5").update(Buffer.from(apiKey, "utf8")).digest(),
+            iv = crypto.randomBytes(16),
+            enc = crypto.createCipheriv("aes-128-cbc", key, iv),
+            data = {
+              data: Buffer.concat([enc.update(JSON.stringify(params)), enc.final()]).toString(
+                "base64"
+              ),
+              deviceid: json.deviceid,
+              encrypt: true,
+              iv: iv.toString("base64"),
+              selfApikey: "123",
+              sequence: Date.now().toString(),
+            };
+          if (this.debugReqRes) {
+            let msg = JSON.stringify(json, null, 2)
+              .replace(json.apikey, "**hidden**")
+              .replace(json.apikey, "**hidden**")
+              .replace(json.deviceid, "**hidden**");
+            this.log.warn("LAN message sent. This text is yellow for clarity.\n%s", msg);
+          } else if (this.debug) {
+            this.log("LAN message sent.");
+          }
+          let res = await axios({
+            method: "post",
+            url: "http://" + this.deviceMap.get(json.deviceid).ip + ":8081/zeroconf/" + suffix,
+            headers: {
+              Accept: "application/json",
+              "Content-Type": "application/json",
+            },
+            data,
+          });
+          if (res.data.hasOwnProperty("error") && res.data.error === 0) {
+            resolve();
+          } else {
+            throw res.data;
+          }
+        }
+      } catch (err) {
+        reject(err);
       }
     });
   }
diff --git a/lib/eWeLinkWS.js b/lib/eWeLinkWS.js
index 6f30b2ea..f6a63e26 100644
--- a/lib/eWeLinkWS.js
+++ b/lib/eWeLinkWS.js
@@ -3,6 +3,7 @@
 const axios = require("axios"),
   cns = require("./constants"),
   eventemitter = require("events"),
+  utils = require("./utils"),
   ws = require("ws"),
   wsp = require("websocket-as-promised");
 module.exports = class eWeLinkWS {
@@ -19,40 +20,40 @@ module.exports = class eWeLinkWS {
     this.delaySend = 0;
   }
   getHost() {
-    return new Promise((resolve, reject) => {
-      axios({
-        method: "post",
-        url: "https://" + this.httpHost.replace("-api", "-disp") + "/dispatch/app",
-        headers: {
-          Authorization: "Bearer " + this.aToken,
-          "Content-Type": "application/json",
-        },
-        data: {
-          appid: cns.appId,
-          nonce: Math.random().toString(36).substr(2, 8),
-          ts: Math.floor(new Date().getTime() / 1000),
-          version: 8,
-        },
-      })
-        .then(res => {
-          let body = res.data;
-          if (!body.domain) {
-            throw "Server did not respond with a web socket host.";
-          }
-          if (this.debug) {
-            this.log("Web socket host received [%s].", body.domain);
-          }
-          this.wsHost = body.domain;
-          resolve(body.domain);
-        })
-        .catch(err => {
-          if (err.hasOwnProperty("code") && ["ENOTFOUND", "ETIMEDOUT"].includes(err.code)) {
-            this.log.warn("Unable to reach eWeLink. Retrying in 30 seconds.");
-            this.delay().then(() => resolve(this.getDevices()));
-          } else {
-            reject(err.message || err);
-          }
+    return new Promise(async (resolve, reject) => {
+      try {
+        let res = await axios({
+          method: "post",
+          url: "https://" + this.httpHost.replace("-api", "-disp") + "/dispatch/app",
+          headers: {
+            Authorization: "Bearer " + this.aToken,
+            "Content-Type": "application/json",
+          },
+          data: {
+            appid: cns.appId,
+            nonce: Math.random().toString(36).substr(2, 8),
+            ts: Math.floor(new Date().getTime() / 1000),
+            version: 8,
+          },
         });
+        let body = res.data;
+        if (!body.domain) {
+          throw "Server did not respond with a web socket host.";
+        }
+        if (this.debug) {
+          this.log("Web socket host received [%s].", body.domain);
+        }
+        this.wsHost = body.domain;
+        resolve(body.domain);
+      } catch (err) {
+        if (err.hasOwnProperty("code") && ["ENOTFOUND", "ETIMEDOUT"].includes(err.code)) {
+          this.log.warn("Unable to reach eWeLink. Retrying in 30 seconds.");
+          await utils.sleep(30000);
+          resolve(this.getDevices());
+        } else {
+          reject(err.message || err);
+        }
+      }
     });
   }
   login() {
@@ -73,7 +74,7 @@ module.exports = class eWeLinkWS {
       },
     });
     this.wsp.open();
-    this.wsp.onOpen.addListener(() => {
+    this.wsp.onOpen.addListener(async () => {
       this.wsIsOpen = true;
       let sequence = Math.floor(new Date()).toString(),
         payload = {
@@ -95,27 +96,25 @@ module.exports = class eWeLinkWS {
       } else if (this.debug) {
         this.log("Sending WS login request.");
       }
-      this.wsp
-        .sendRequest(payload, {
+      try {
+        let res = await this.wsp.sendRequest(payload, {
           requestId: sequence,
-        })
-        .then(res => {
-          if (
-            res.hasOwnProperty("config") &&
-            res.config.hb &&
-            res.config.hbInterval &&
-            !this.hbInterval
-          ) {
-            this.hbInterval = setInterval(() => {
-              this.wsp.send("ping");
-            }, (res.config.hbInterval + 7) * 1000);
-          } else {
-            throw "Unknown parameters received";
-          }
-        })
-        .catch(err => {
-          this.log.error("WS login failed [%s].", err);
         });
+        if (
+          res.hasOwnProperty("config") &&
+          res.config.hb &&
+          res.config.hbInterval &&
+          !this.hbInterval
+        ) {
+          this.hbInterval = setInterval(() => {
+            this.wsp.send("ping");
+          }, (res.config.hbInterval + 7) * 1000);
+        } else {
+          throw "Unknown parameters received";
+        }
+      } catch (err) {
+        this.log.error("WS login failed [%s].", err);
+      }
     });
     this.wsp.onUnpackedMessage.addListener(device => {
       if (device === "pong") return;
@@ -206,7 +205,7 @@ module.exports = class eWeLinkWS {
     });
   }
   sendUpdate(json) {
-    return new Promise((resolve, reject) => {
+    return new Promise(async (resolve, reject) => {
       let sequence = Math.floor(new Date()).toString(),
         jsonToSend = {
           ...json,
@@ -217,37 +216,36 @@ module.exports = class eWeLinkWS {
           },
         };
       if (this.wsp && this.wsIsOpen) {
-        this.wsp
-          .sendRequest(jsonToSend, {
+        try {
+          let device = await this.wsp.sendRequest(jsonToSend, {
             requestId: sequence,
-          })
-          .then(device => {
-            if (this.debugReqRes) {
-              let msg = JSON.stringify(json, null, 2)
-                .replace(json.apikey, "**hidden**")
-                .replace(json.apiKey, "**hidden**")
-                .replace(json.deviceid, "**hidden**");
-              this.log.warn("WS message sent. This text is yellow for clarity.\n%s", msg);
-            } else if (this.debug) {
-              this.log("WS message sent.");
-            }
-            device.error = device.hasOwnProperty("error") ? device.error : 504; // mimic ewelink device offline
-            switch (device.error) {
-              case 0:
-                resolve();
-                break;
-              default:
-                throw "Unknown response";
-            }
-          })
-          .catch(err => reject("Device update failed [" + err + "]."));
-      } else {
-        this.delay(2500).then(() => {
-          if (this.debug) {
-            this.log.warn("Will resend command when WS is reconnected.");
+          });
+          if (this.debugReqRes) {
+            let msg = JSON.stringify(json, null, 2)
+              .replace(json.apikey, "**hidden**")
+              .replace(json.apiKey, "**hidden**")
+              .replace(json.deviceid, "**hidden**");
+            this.log.warn("WS message sent. This text is yellow for clarity.\n%s", msg);
+          } else if (this.debug) {
+            this.log("WS message sent.");
           }
-          resolve(this.sendUpdate(json));
-        });
+          device.error = device.hasOwnProperty("error") ? device.error : 504; // mimic ewelink device offline
+          switch (device.error) {
+            case 0:
+              resolve();
+              break;
+            default:
+              throw "Unknown response";
+          }
+        } catch (err) {
+          reject("Device update failed [" + err + "].");
+        }
+      } else {
+        if (this.debug) {
+          this.log.warn("Command will be resent when WS is reconnected.");
+        }
+        await utils.sleep(30000);
+        resolve(this.sendUpdate(json));
       }
     });
   }
@@ -275,16 +273,15 @@ module.exports = class eWeLinkWS {
             this.log("WS message sent.");
           }
         },
-        checkToSend = () => {
+        checkToSend = async () => {
           if (this.wsp && this.wsIsOpen) {
             sendOperation();
           } else {
-            this.delay(2500).then(() => {
-              if (this.debug) {
-                this.log.warn("Will resend command when WS is reconnected.");
-              }
-              checkToSend();
-            });
+            await utils.sleep(2500);
+            if (this.debug) {
+              this.log.warn("Will resend command when WS is reconnected.");
+            }
+            checkToSend();
           }
         };
       checkToSend();
@@ -294,20 +291,17 @@ module.exports = class eWeLinkWS {
     this.emitter.addListener("update", f);
   }
   closeConnection() {
-    return new Promise((resolve, reject) => {
+    return new Promise(async (resolve, reject) => {
       if (this.wsp && this.wsIsOpen) {
-        this.wsp
-          .close()
-          .then(() => {
-            this.log("Web socket gracefully closed.");
-            resolve();
-          })
-          .catch(err => reject(err));
+        try {
+          await this.wsp.close();
+          this.log("Web socket gracefully closed.");
+          resolve();
+        } catch (err) {
+          reject(err);
+        }
       }
       resolve();
     });
   }
-  delay(ms) {
-    return new Promise(resolve => setTimeout(resolve, ms));
-  }
 };
diff --git a/lib/utils.js b/lib/utils.js
new file mode 100644
index 00000000..5cb638ad
--- /dev/null
+++ b/lib/utils.js
@@ -0,0 +1,7 @@
+/* jshint esversion: 9, -W014, -W030, node: true */
+"use strict";
+module.exports = {
+  sleep: ms => {
+    return new Promise(resolve => setTimeout(resolve, ms));
+  },
+};
diff --git a/package-lock.json b/package-lock.json
index 24611c34..4560d366 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -405,6 +405,11 @@
         }
       }
     },
+    "interval-promise": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/interval-promise/-/interval-promise-1.4.0.tgz",
+      "integrity": "sha512-PUwEmGqUglJhb6M01JNvMDvxr4DA8FCeYoYCLHPEcBBZiq/8yOpCchfs1VJui7fXj69l170gAxzF1FeSA0nSlg=="
+    },
     "ip": {
       "version": "1.1.5",
       "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz",
diff --git a/package.json b/package.json
index 82cf0b07..46a2e2e3 100644
--- a/package.json
+++ b/package.json
@@ -63,6 +63,7 @@
     "correcting-interval": "2.0.0",
     "fakegato-history": "0.5.6",
     "homebridge-lib": "4.7.15",
+    "interval-promise": "1.4.0",
     "node-dns-sd": "0.4.1",
     "websocket-as-promised": "1.0.1",
     "ws": "7.3.1"

From 07c13122da42c915959bbeeccd1bc481a8521e3e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 25 Sep 2020 15:44:08 +0100
Subject: [PATCH 0217/3183] requestUpdate bugfix

---
 lib/eWeLinkWS.js | 47 +++++++++++++++++++++--------------------------
 1 file changed, 21 insertions(+), 26 deletions(-)

diff --git a/lib/eWeLinkWS.js b/lib/eWeLinkWS.js
index f6a63e26..a9df48ca 100644
--- a/lib/eWeLinkWS.js
+++ b/lib/eWeLinkWS.js
@@ -238,7 +238,7 @@ module.exports = class eWeLinkWS {
               throw "Unknown response";
           }
         } catch (err) {
-          reject("Device update failed [" + err + "].");
+          reject("device update failed [" + err + "]");
         }
       } else {
         if (this.debug) {
@@ -250,7 +250,7 @@ module.exports = class eWeLinkWS {
     });
   }
   requestUpdate(accessory) {
-    return new Promise(resolve => {
+    return new Promise(async resolve => {
       let sequence = Math.floor(new Date()).toString(),
         json = {
           action: "query",
@@ -260,31 +260,26 @@ module.exports = class eWeLinkWS {
           sequence,
           ts: 0,
           userAgent: "app",
-        },
-        sendOperation = () => {
-          this.wsp.send(json);
-          if (this.debugReqRes) {
-            let msg = JSON.stringify(json, null, 2)
-              .replace(json.apikey, "**hidden**")
-              .replace(json.apiKey, "**hidden**")
-              .replace(json.deviceid, "**hidden**");
-            this.log.warn("WS message sent. This text is yellow for clarity.\n%s", msg);
-          } else if (this.debug) {
-            this.log("WS message sent.");
-          }
-        },
-        checkToSend = async () => {
-          if (this.wsp && this.wsIsOpen) {
-            sendOperation();
-          } else {
-            await utils.sleep(2500);
-            if (this.debug) {
-              this.log.warn("Will resend command when WS is reconnected.");
-            }
-            checkToSend();
-          }
         };
-      checkToSend();
+
+      if (this.wsp && this.wsIsOpen) {
+        this.wsp.send(JSON.stringify(json));
+        if (this.debugReqRes) {
+          let msg = JSON.stringify(json, null, 2)
+            .replace(json.apikey, "**hidden**")
+            .replace(json.apiKey, "**hidden**")
+            .replace(json.deviceid, "**hidden**");
+          this.log.warn("WS message sent. This text is yellow for clarity.\n%s", msg);
+        } else if (this.debug) {
+          this.log("WS message sent.");
+        }
+      } else {
+        if (this.debug) {
+          this.log.warn("Command will be resent when WS is reconnected.");
+        }
+        await utils.sleep(30000);
+        resolve(this.requestUpdate(accessory));
+      }
     });
   }
   receiveUpdate(f) {

From 78ddb14eee5db355bc7f15d058750a9b8f48f781 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 25 Sep 2020 15:44:24 +0100
Subject: [PATCH 0218/3183] improved logging

---
 lib/eWeLink.js | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index d66cbdaf..7bc0cc34 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -1193,10 +1193,15 @@ class eWeLink {
       try {
         await this.wsClient.requestUpdate(accessory);
         this.log.warn(
-          "[%s] requesting previous state to revert Homebridge status.",
+          "[%s] requesting previous state to revert Homebridge state.",
           accessory.displayName
         );
       } catch (err) {}
+    } else {
+      this.log.warn(
+        "[%s] Homebridge state will be synced once the device comes back online.",
+        accessory.displayName
+      );
     }
   }
   async internalValveUpdate(accessory, valve, value, callback) {
@@ -1346,19 +1351,23 @@ class eWeLink {
           outlet: 3,
         },
       ];
-      accessory.context.inUse = true;
-      if (prevState !== 2) {
+
+      if (prevState !== 2 || accessory.context.inUse) {
+        await utils.sleep(500);
         this.log.warn(
           "[%s] tried to move the blinds to [%s%] but they are already moving.",
           accessory.displayName,
           newTarget
         );
-        wcService.updateCharacteristic(
-          Characteristic.TargetPosition,
-          accessory.context.cacheTargetPosition
-        );
+        wcService
+          .updateCharacteristic(
+            Characteristic.TargetPosition,
+            accessory.context.cacheTargetPosition
+          )
+          .updateCharacteristic(Characteristic.PositionState, accessory.context.cachePositionState);
         return;
       }
+      accessory.context.inUse = true;
       wcService.updateCharacteristic(Characteristic.TargetPosition, newTarget);
       accessory.context.cacheTargetPosition = newTarget;
       let moveUp = newTarget > prevPos,

From 8436eb28f7924ee36979af6b642f5150a395a2ff Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 25 Sep 2020 15:45:28 +0100
Subject: [PATCH 0219/3183] 3.0.2

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 4560d366..16b95537 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 46a2e2e3..cf8c488f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From fe636c6ad2a1f6b3d1c5f1d7874f9fd36189d6d1 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 26 Sep 2020 17:49:41 +0100
Subject: [PATCH 0220/3183] blinds relative %

---
 .prettierrc.json   |   2 +-
 lib/constants.js   |  41 ++--
 lib/eWeLink.js     | 584 ++++++++++++++-------------------------------
 lib/eWeLinkHTTP.js |  19 +-
 lib/eWeLinkLAN.js  |  22 +-
 lib/eWeLinkWS.js   |  21 +-
 6 files changed, 209 insertions(+), 480 deletions(-)

diff --git a/.prettierrc.json b/.prettierrc.json
index 87f5e5e8..163a0a7e 100644
--- a/.prettierrc.json
+++ b/.prettierrc.json
@@ -1,4 +1,4 @@
 {
   "arrowParens": "avoid",
-  "printWidth": 100
+  "printWidth": 120
 }
diff --git a/lib/constants.js b/lib/constants.js
index 9e1ce0d4..555488c5 100644
--- a/lib/constants.js
+++ b/lib/constants.js
@@ -12,18 +12,7 @@ module.exports = {
   devicesSingleSwitchOutlet: ["Sonoff Pow", "S26"],
   devicesMultiSwitch: [2, 3, 4, 7, 8, 9, 29, 30, 31, 34, 41],
   devicesMultiSwitchParams: ["switches"],
-  devicesSingleSwitchLight: [
-    "T1 1C",
-    "L1",
-    "B1",
-    "B1_R2",
-    "TX1C",
-    "D1",
-    "D1R1",
-    "KING-M4",
-    "Slampher",
-    "GTTA59",
-  ],
+  devicesSingleSwitchLight: ["T1 1C", "L1", "B1", "B1_R2", "TX1C", "D1", "D1R1", "KING-M4", "Slampher", "GTTA59"],
   devicesSingleSwitchLightParams: [
     "switch",
     "state",
@@ -56,15 +45,7 @@ module.exports = {
   devicesRFBridge: [28],
   devicesRFBridgeParams: ["cmd"],
   devicesZBBridge: [66],
-  devicesZBBridgeParams: [
-    "key",
-    "temperature",
-    "humidity",
-    "motion",
-    "lock",
-    "trigTime",
-    "battery",
-  ],
+  devicesZBBridgeParams: ["key", "temperature", "humidity", "motion", "lock", "trigTime", "battery"],
   devicesZB: [1000, 1770, 2026, 3026],
   devicesValveParams: ["switches"],
   devicesBlindParams: ["switch", "switches"],
@@ -108,6 +89,24 @@ module.exports = {
     "voltage",
     "zyx_mode",
   ],
+  defaultMultiSwitchOff: [
+    {
+      switch: "off",
+      outlet: 0,
+    },
+    {
+      switch: "off",
+      outlet: 1,
+    },
+    {
+      switch: "off",
+      outlet: 2,
+    },
+    {
+      switch: "off",
+      outlet: 3,
+    },
+  ],
   chansFromUiid: {
     1: 1, // "SOCKET"                                  \\ 20, MINI, BASIC, S26
     2: 2, // "SOCKET_2"                                \\
diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index 7bc0cc34..57e64c9d 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -116,18 +116,9 @@ class eWeLink {
   }
   initialiseDevice(device) {
     let accessory;
-    //*** IRRIGATION VALVES ***\\
-    if (
-      device.extra.uiid === 2 &&
-      device.brandName === "coolkit" &&
-      device.productModel === "0285"
-    ) {
-      accessory = this.devicesInHB.has(device.deviceid + "SWX")
-        ? this.devicesInHB.get(device.deviceid + "SWX")
-        : this.addAccessory(device, device.deviceid + "SWX", "valve");
-    }
+
     //*** CURTAINS ***\\
-    else if (cns.devicesCurtain.includes(device.extra.uiid)) {
+    if (cns.devicesCurtain.includes(device.extra.uiid)) {
       accessory = this.devicesInHB.has(device.deviceid + "SWX")
         ? this.devicesInHB.get(device.deviceid + "SWX")
         : this.addAccessory(device, device.deviceid + "SWX", "curtain", false, {
@@ -145,10 +136,7 @@ class eWeLink {
       }
     }
     //*** WINDOW BLINDS ***\\
-    else if (
-      this.cusG.has(device.deviceid + "SWX") &&
-      this.cusG.get(device.deviceid + "SWX").type === "blind"
-    ) {
+    else if (this.cusG.has(device.deviceid + "SWX") && this.cusG.get(device.deviceid + "SWX").type === "blind") {
       accessory = this.devicesInHB.has(device.deviceid + "SWX")
         ? this.devicesInHB.get(device.deviceid + "SWX")
         : this.addAccessory(device, device.deviceid + "SWX", "blind", false, {
@@ -165,10 +153,7 @@ class eWeLink {
       //*** @ENDUPGRADE ***\\
     }
     //*** GARAGE DOORS ***\\
-    else if (
-      this.cusG.has(device.deviceid + "SWX") &&
-      this.cusG.get(device.deviceid + "SWX").type === "garage"
-    ) {
+    else if (this.cusG.has(device.deviceid + "SWX") && this.cusG.get(device.deviceid + "SWX").type === "garage") {
       accessory = this.devicesInHB.has(device.deviceid + "SWX")
         ? this.devicesInHB.get(device.deviceid + "SWX")
         : this.addAccessory(device, device.deviceid + "SWX", "garage", false, {
@@ -182,14 +167,11 @@ class eWeLink {
       }
       //*** @ENDUPGRADE ***\\
     }
-    //*** LOCKS ***\\
-    else if (
-      this.cusG.has(device.deviceid + "SWX") &&
-      this.cusG.get(device.deviceid + "SWX").type === "lock"
-    ) {
-      accessory = this.devicesInHB.has(device.deviceid + "SWX")
+    //*** SINGLE LOCKS ***\\
+    else if (this.cusG.has(device.deviceid + "SWX") && this.cusG.get(device.deviceid + "SWX").type === "lock") {
+      let lockConfig = (accessory = this.devicesInHB.has(device.deviceid + "SWX")
         ? this.devicesInHB.get(device.deviceid + "SWX")
-        : this.addAccessory(device, device.deviceid + "SWX", "lock");
+        : this.addAccessory(device, device.deviceid + "SWX", "lock"));
     }
     //*** SENSORS (DW2) ***\\
     else if (cns.devicesSensor.includes(device.extra.uiid)) {
@@ -197,6 +179,12 @@ class eWeLink {
         ? this.devicesInHB.get(device.deviceid + "SWX")
         : this.addAccessory(device, device.deviceid + "SWX", "sensor");
     }
+    //*** IRRIGATION VALVES ***\\
+    else if (device.extra.uiid === 2 && device.brandName === "coolkit" && device.productModel === "0285") {
+      accessory = this.devicesInHB.has(device.deviceid + "SWX")
+        ? this.devicesInHB.get(device.deviceid + "SWX")
+        : this.addAccessory(device, device.deviceid + "SWX", "valve");
+    }
     //*** FANS ***\\
     else if (cns.devicesFan.includes(device.extra.uiid)) {
       accessory = this.devicesInHB.has(device.deviceid + "SWX")
@@ -368,22 +356,13 @@ class eWeLink {
           swNumber,
         };
         if ((subAccessory = this.devicesInHB.get(device.deviceid + "SW" + swNumber))) {
-          if (
-            subAccessory.context.subType !== subType ||
-            subAccessory.context.swNumber !== swNumber
-          ) {
+          if (subAccessory.context.subType !== subType || subAccessory.context.swNumber !== swNumber) {
             this.removeAccessory(subAccessory);
           }
         }
         subAccessory = this.devicesInHB.has(device.deviceid + "SW" + swNumber)
           ? this.devicesInHB.get(device.deviceid + "SW" + swNumber)
-          : this.addAccessory(
-              device,
-              device.deviceid + "SW" + swNumber,
-              "rf_sub",
-              false,
-              subExtraContext
-            );
+          : this.addAccessory(device, device.deviceid + "SW" + swNumber, "rf_sub", false, subExtraContext);
         subAccessory
           .getService(Service.AccessoryInformation)
           .setCharacteristic(Characteristic.FirmwareRevision, device.params.fwVersion);
@@ -485,19 +464,13 @@ class eWeLink {
       newDeviceName = this.config.nameOverride[hbDeviceId];
     }
     try {
-      const accessory = new Accessory(
-        newDeviceName,
-        this.api.hap.uuid.generate(hbDeviceId).toString()
-      );
+      const accessory = new Accessory(newDeviceName, this.api.hap.uuid.generate(hbDeviceId).toString());
       if (!hidden) {
         accessory
           .getService(Service.AccessoryInformation)
           .setCharacteristic(Characteristic.SerialNumber, hbDeviceId)
           .setCharacteristic(Characteristic.Manufacturer, device.brandName)
-          .setCharacteristic(
-            Characteristic.Model,
-            device.productModel + " (" + device.extra.model + ")"
-          )
+          .setCharacteristic(Characteristic.Model, device.productModel + " (" + device.extra.model + ")")
           .setCharacteristic(Characteristic.FirmwareRevision, device.params.fwVersion)
           .setCharacteristic(Characteristic.Identify, false);
       }
@@ -546,21 +519,17 @@ class eWeLink {
             }
             valveService
               .getCharacteristic(Characteristic.Active)
-              .on("set", (value, callback) =>
-                this.internalValveUpdate(accessory, "Valve " + v, value, callback)
-              );
-            valveService
-              .getCharacteristic(Characteristic.SetDuration)
-              .on("set", (value, callback) => {
-                if (valveService.getCharacteristic(Characteristic.InUse).value) {
-                  valveService.updateCharacteristic(Characteristic.RemainingDuration, value);
-                  clearTimeout(valveService.timer);
-                  valveService.timer = setTimeout(() => {
-                    valveService.setCharacteristic(Characteristic.Active, 0);
-                  }, value * 1000);
-                }
-                callback();
-              });
+              .on("set", (value, callback) => this.internalValveUpdate(accessory, "Valve " + v, value, callback));
+            valveService.getCharacteristic(Characteristic.SetDuration).on("set", (value, callback) => {
+              if (valveService.getCharacteristic(Characteristic.InUse).value) {
+                valveService.updateCharacteristic(Characteristic.RemainingDuration, value);
+                clearTimeout(valveService.timer);
+                valveService.timer = setTimeout(() => {
+                  valveService.setCharacteristic(Characteristic.Active, 0);
+                }, value * 1000);
+              }
+              callback();
+            });
           });
           break;
         case "curtain":
@@ -606,65 +575,47 @@ class eWeLink {
             .on("set", (value, callback) => this.internalGarageUpdate(accessory, value, callback));
           break;
         case "lock":
-          let lmService =
-            accessory.getService(Service.LockMechanism) ||
-            accessory.addService(Service.LockMechanism);
+          let lmService = accessory.getService(Service.LockMechanism) || accessory.addService(Service.LockMechanism);
           lmService
             .getCharacteristic(Characteristic.LockTargetState)
             .on("set", (value, callback) => this.internalLockUpdate(accessory, value, callback));
           break;
         case "sensor":
-          accessory.getService(Service.ContactSensor) ||
-            accessory.addService(Service.ContactSensor);
-          accessory.getService(Service.BatteryService) ||
-            accessory.addService(Service.BatteryService);
+          accessory.getService(Service.ContactSensor) || accessory.addService(Service.ContactSensor);
+          accessory.getService(Service.BatteryService) || accessory.addService(Service.BatteryService);
           break;
         case "fan":
-          let fanService =
-              accessory.getService(Service.Fanv2) || accessory.addService(Service.Fanv2),
-            fanLightService =
-              accessory.getService(Service.Lightbulb) || accessory.addService(Service.Lightbulb);
+          let fanService = accessory.getService(Service.Fanv2) || accessory.addService(Service.Fanv2),
+            fanLightService = accessory.getService(Service.Lightbulb) || accessory.addService(Service.Lightbulb);
           fanService
             .getCharacteristic(Characteristic.Active)
-            .on("set", (value, callback) =>
-              this.internalFanUpdate(accessory, "power", value, callback)
-            );
+            .on("set", (value, callback) => this.internalFanUpdate(accessory, "power", value, callback));
           fanService
             .getCharacteristic(Characteristic.RotationSpeed)
-            .on("set", (value, callback) =>
-              this.internalFanUpdate(accessory, "speed", value, callback)
-            )
+            .on("set", (value, callback) => this.internalFanUpdate(accessory, "speed", value, callback))
             .setProps({
               minStep: 33,
             });
           fanLightService
             .getCharacteristic(Characteristic.On)
-            .on("set", (value, callback) =>
-              this.internalFanUpdate(accessory, "light", value, callback)
-            );
+            .on("set", (value, callback) => this.internalFanUpdate(accessory, "light", value, callback));
           break;
         case "thermostat":
           let tempService =
-              accessory.getService(Service.TemperatureSensor) ||
-              accessory.addService(Service.TemperatureSensor),
+              accessory.getService(Service.TemperatureSensor) || accessory.addService(Service.TemperatureSensor),
             humiService = false;
           if (accessory.context.sensorType !== "DS18B20") {
-            humiService =
-              accessory.getService(Service.HumiditySensor) ||
-              accessory.addService(Service.HumiditySensor);
+            humiService = accessory.getService(Service.HumiditySensor) || accessory.addService(Service.HumiditySensor);
           } else {
             if (accessory.getService(Service.HumiditySensor)) {
               accessory.removeService(Service.HumiditySensor);
             }
           }
           if (!this.config.hideTHSwitch) {
-            let switchService =
-              accessory.getService(Service.Switch) || accessory.addService(Service.Switch);
+            let switchService = accessory.getService(Service.Switch) || accessory.addService(Service.Switch);
             switchService
               .getCharacteristic(Characteristic.On)
-              .on("set", (value, callback) =>
-                this.internalThermostatUpdate(accessory, value, callback)
-              );
+              .on("set", (value, callback) => this.internalThermostatUpdate(accessory, value, callback));
           }
           if (!(this.config.disableEveLogging || false)) {
             accessory.log = this.log;
@@ -720,8 +671,7 @@ class eWeLink {
             corrInterval.setCorrectingInterval(() => {
               let isOn = outletService.getCharacteristic(Characteristic.On).value,
                 currentWatt = isOn
-                  ? outletService.getCharacteristic(EveService.Characteristics.CurrentConsumption)
-                      .value
+                  ? outletService.getCharacteristic(EveService.Characteristics.CurrentConsumption).value
                   : 0;
               if (accessory.eveLogger.isHistoryLoaded()) {
                 accessory.context.extraPersistedData = accessory.eveLogger.getExtraPersistedData();
@@ -735,8 +685,7 @@ class eWeLink {
                     lastReset: accessory.context.extraPersistedData.lastReset,
                   });
                 } else {
-                  accessory.context.totalEnergy =
-                    accessory.context.totalEnergyTemp + (currentWatt * 10) / 3600 / 1000;
+                  accessory.context.totalEnergy = accessory.context.totalEnergyTemp + (currentWatt * 10) / 3600 / 1000;
                   accessory.eveLogger.setExtraPersistedData({
                     totalenergy: accessory.context.totalEnergy,
                     lastReset: 0,
@@ -752,15 +701,13 @@ class eWeLink {
                 power: currentWatt,
               });
             }, 300000);
-            outletService
-              .getCharacteristic(EveService.Characteristics.TotalConsumption)
-              .on("get", callback => {
-                accessory.context.extraPersistedData = accessory.eveLogger.getExtraPersistedData();
-                if (accessory.context.extraPersistedData !== undefined) {
-                  accessory.context.totalEnergy = accessory.context.extraPersistedData.totalPower;
-                }
-                callback(null, accessory.context.totalEnergy);
-              });
+            outletService.getCharacteristic(EveService.Characteristics.TotalConsumption).on("get", callback => {
+              accessory.context.extraPersistedData = accessory.eveLogger.getExtraPersistedData();
+              if (accessory.context.extraPersistedData !== undefined) {
+                accessory.context.totalEnergy = accessory.context.extraPersistedData.totalPower;
+              }
+              callback(null, accessory.context.totalEnergy);
+            });
             outletService
               .getCharacteristic(EveService.Characteristics.ResetTotal)
               .on("set", (value, callback) => {
@@ -782,70 +729,56 @@ class eWeLink {
           }
           break;
         case "usb":
-          let usbService =
-            accessory.getService(Service.Outlet) || accessory.addService(Service.Outlet);
+          let usbService = accessory.getService(Service.Outlet) || accessory.addService(Service.Outlet);
           usbService
             .getCharacteristic(Characteristic.On)
             .on("set", (value, callback) => this.internalUSBUpdate(accessory, value, callback));
           break;
         case "scm":
-          let scmService =
-            accessory.getService(Service.Switch) || accessory.addService(Service.Switch);
+          let scmService = accessory.getService(Service.Switch) || accessory.addService(Service.Switch);
           scmService
             .getCharacteristic(Characteristic.On)
             .on("set", (value, callback) => this.internalSCMUpdate(accessory, value, callback));
           break;
         case "light":
-          let lightService =
-            accessory.getService(Service.Lightbulb) || accessory.addService(Service.Lightbulb);
+          let lightService = accessory.getService(Service.Lightbulb) || accessory.addService(Service.Lightbulb);
           lightService
             .getCharacteristic(Characteristic.On)
-            .on("set", (value, callback) =>
-              this.internalLightbulbUpdate(accessory, value, callback)
-            );
+            .on("set", (value, callback) => this.internalLightbulbUpdate(accessory, value, callback));
           if (cns.devicesBrightable.includes(accessory.context.eweUIID)) {
-            lightService
-              .getCharacteristic(Characteristic.Brightness)
-              .on("set", (value, callback) => {
-                if (value > 0) {
-                  if (!lightService.getCharacteristic(Characteristic.On).value) {
-                    this.internalLightbulbUpdate(accessory, true, function () {
-                      return;
-                    });
-                  }
-                  this.internalBrightnessUpdate(accessory, value, callback);
-                } else {
-                  this.internalLightbulbUpdate(accessory, false, callback);
+            lightService.getCharacteristic(Characteristic.Brightness).on("set", (value, callback) => {
+              if (value > 0) {
+                if (!lightService.getCharacteristic(Characteristic.On).value) {
+                  this.internalLightbulbUpdate(accessory, true, function () {
+                    return;
+                  });
                 }
-              });
+                this.internalBrightnessUpdate(accessory, value, callback);
+              } else {
+                this.internalLightbulbUpdate(accessory, false, callback);
+              }
+            });
           } else if (cns.devicesColourable.includes(accessory.context.eweUIID)) {
-            lightService
-              .getCharacteristic(Characteristic.Brightness)
-              .on("set", (value, callback) => {
-                if (value > 0) {
-                  if (!lightService.getCharacteristic(Characteristic.On).value) {
-                    this.internalLightbulbUpdate(accessory, true, function () {
-                      return;
-                    });
-                  }
-                  this.internalHSBUpdate(accessory, "bri", value, callback);
-                } else {
-                  this.internalLightbulbUpdate(accessory, false, callback);
+            lightService.getCharacteristic(Characteristic.Brightness).on("set", (value, callback) => {
+              if (value > 0) {
+                if (!lightService.getCharacteristic(Characteristic.On).value) {
+                  this.internalLightbulbUpdate(accessory, true, function () {
+                    return;
+                  });
                 }
-              });
+                this.internalHSBUpdate(accessory, "bri", value, callback);
+              } else {
+                this.internalLightbulbUpdate(accessory, false, callback);
+              }
+            });
             lightService
               .getCharacteristic(Characteristic.Hue)
-              .on("set", (value, callback) =>
-                this.internalHSBUpdate(accessory, "hue", value, callback)
-              );
-            lightService
-              .getCharacteristic(Characteristic.Saturation)
-              .on("set", (value, callback) => callback());
+              .on("set", (value, callback) => this.internalHSBUpdate(accessory, "hue", value, callback));
+            lightService.getCharacteristic(Characteristic.Saturation).on("set", (value, callback) => callback());
           }
           break;
         case "switch":
-          let switchService =
-            accessory.getService(Service.Switch) || accessory.addService(Service.Switch);
+          let switchService = accessory.getService(Service.Switch) || accessory.addService(Service.Switch);
           switchService
             .getCharacteristic(Characteristic.On)
             .on("set", (value, callback) => this.internalSwitchUpdate(accessory, value, callback));
@@ -857,33 +790,26 @@ class eWeLink {
               break;
             case "fire":
             case "smoke":
-              accessory.getService(Service.SmokeSensor) ||
-                accessory.addService(Service.SmokeSensor);
+              accessory.getService(Service.SmokeSensor) || accessory.addService(Service.SmokeSensor);
               break;
             case "co":
-              accessory.getService(Service.CarbonMonoxideSensor) ||
-                accessory.addService(Service.CarbonMonoxideSensor);
+              accessory.getService(Service.CarbonMonoxideSensor) || accessory.addService(Service.CarbonMonoxideSensor);
               break;
             case "co2":
-              accessory.getService(Service.CarbonDioxideSensor) ||
-                accessory.addService(Service.CarbonDioxideSensor);
+              accessory.getService(Service.CarbonDioxideSensor) || accessory.addService(Service.CarbonDioxideSensor);
               break;
             case "contact":
-              accessory.getService(Service.ContactSensor) ||
-                accessory.addService(Service.ContactSensor);
+              accessory.getService(Service.ContactSensor) || accessory.addService(Service.ContactSensor);
               break;
             case "occupancy":
-              accessory.getService(Service.OccupancySensor) ||
-                accessory.addService(Service.OccupancySensor);
+              accessory.getService(Service.OccupancySensor) || accessory.addService(Service.OccupancySensor);
               break;
             default:
-              accessory.getService(Service.MotionSensor) ||
-                accessory.addService(Service.MotionSensor);
+              accessory.getService(Service.MotionSensor) || accessory.addService(Service.MotionSensor);
               break;
             case "button":
               Object.entries(accessory.context.buttons).forEach(([chan, name]) => {
-                accessory.getService(name) ||
-                  accessory.addService(Service.Switch, name, "switch" + chan);
+                accessory.getService(name) || accessory.addService(Service.Switch, name, "switch" + chan);
                 accessory.getService(name).updateCharacteristic(Characteristic.On, false);
                 accessory
                   .getService(name)
@@ -896,8 +822,7 @@ class eWeLink {
           }
           break;
         case "zb_dev": //*** credit @tasict ***\\
-          accessory.getService(Service.BatteryService) ||
-            accessory.addService(Service.BatteryService);
+          accessory.getService(Service.BatteryService) || accessory.addService(Service.BatteryService);
           switch (accessory.context.eweUIID) {
             case 1000:
               let zbspsService =
@@ -911,11 +836,9 @@ class eWeLink {
               break;
             case 1770:
               let zbTempService =
-                accessory.getService(Service.TemperatureSensor) ||
-                accessory.addService(Service.TemperatureSensor);
+                accessory.getService(Service.TemperatureSensor) || accessory.addService(Service.TemperatureSensor);
               let zbHumiService =
-                accessory.getService(Service.HumiditySensor) ||
-                accessory.addService(Service.HumiditySensor);
+                accessory.getService(Service.HumiditySensor) || accessory.addService(Service.HumiditySensor);
               accessory.log = this.log;
               accessory.eveLogger = new EveHistoryService("weather", accessory, {
                 storage: "fs",
@@ -926,19 +849,16 @@ class eWeLink {
                 let dataToAdd = {
                   time: Date.now(),
                   temp: zbTempService.getCharacteristic(Characteristic.CurrentTemperature).value,
-                  humidity: zbHumiService.getCharacteristic(Characteristic.CurrentRelativeHumidity)
-                    .value,
+                  humidity: zbHumiService.getCharacteristic(Characteristic.CurrentRelativeHumidity).value,
                 };
                 accessory.eveLogger.addEntry(dataToAdd);
               }, 300000);
               break;
             case 2026:
-              accessory.getService(Service.MotionSensor) ||
-                accessory.addService(Service.MotionSensor);
+              accessory.getService(Service.MotionSensor) || accessory.addService(Service.MotionSensor);
               break;
             case 3026:
-              accessory.getService(Service.ContactSensor) ||
-                accessory.addService(Service.ContactSensor);
+              accessory.getService(Service.ContactSensor) || accessory.addService(Service.ContactSensor);
               break;
           }
           break;
@@ -951,10 +871,7 @@ class eWeLink {
   refreshAccessory(accessory, newParams) {
     switch (accessory.context.type) {
       case "valve":
-        if (
-          Object.keys(newParams).some(v => cns.devicesValveParams.includes(v)) &&
-          Array.isArray(newParams.switches)
-        ) {
+        if (Object.keys(newParams).some(v => cns.devicesValveParams.includes(v)) && Array.isArray(newParams.switches)) {
           this.externalValveUpdate(accessory, newParams);
         }
         return true;
@@ -964,10 +881,7 @@ class eWeLink {
         }
         return true;
       case "blind":
-        if (
-          Object.keys(newParams).some(v => cns.devicesBlindParams.includes(v)) &&
-          Array.isArray(newParams.switches)
-        ) {
+        if (Object.keys(newParams).some(v => cns.devicesBlindParams.includes(v)) && Array.isArray(newParams.switches)) {
           this.externalBlindUpdate(accessory, newParams);
         }
         return true;
@@ -1005,18 +919,12 @@ class eWeLink {
         }
         return true;
       case "usb":
-        if (
-          Object.keys(newParams).some(v => cns.devicesUSBParams.includes(v)) &&
-          Array.isArray(newParams.switches)
-        ) {
+        if (Object.keys(newParams).some(v => cns.devicesUSBParams.includes(v)) && Array.isArray(newParams.switches)) {
           this.externalUSBUpdate(accessory, newParams);
         }
         return true;
       case "scm":
-        if (
-          Object.keys(newParams).some(v => cns.devicesSCMParams.includes(v)) &&
-          Array.isArray(newParams.switches)
-        ) {
+        if (Object.keys(newParams).some(v => cns.devicesSCMParams.includes(v)) && Array.isArray(newParams.switches)) {
           this.externalSCMUpdate(accessory, newParams);
         }
         return true;
@@ -1111,16 +1019,13 @@ class eWeLink {
     let accessory,
       deviceId = device.deviceid,
       reachableChange = false;
-    if (
-      (accessory = this.devicesInHB.get(deviceId + "SWX") || this.devicesInHB.get(deviceId + "SW0"))
-    ) {
+    if ((accessory = this.devicesInHB.get(deviceId + "SWX") || this.devicesInHB.get(deviceId + "SW0"))) {
       let isX = accessory.context.hbDeviceId.substr(-1) === "X";
       if (device.params.updateSource === "WS") {
         if (device.params.online != accessory.context.reachableWAN) {
           accessory.context.reachableWAN = device.params.online;
           this.devicesInHB.set(accessory.context.hbDeviceId, accessory);
-          if (accessory.context.reachableWAN)
-            this.wsClient.requestUpdate(accessory).catch(() => {});
+          if (accessory.context.reachableWAN) this.wsClient.requestUpdate(accessory).catch(() => {});
           reachableChange = true;
           this.log.warn(
             "[%s] has been reported [%s] via [WS].",
@@ -1179,10 +1084,7 @@ class eWeLink {
           this.lanClient.addDeviceToMap(device);
         } catch (err) {
           this.log.error("[%s] error getting info [%s]", deviceId, err);
-          this.log.error(
-            "[%s] Please try restarting Homebridge so this device is added.",
-            deviceId
-          );
+          this.log.error("[%s] Please try restarting Homebridge so this device is added.", deviceId);
         }
       }
     }
@@ -1192,16 +1094,10 @@ class eWeLink {
     if (accessory.context.reachableWAN) {
       try {
         await this.wsClient.requestUpdate(accessory);
-        this.log.warn(
-          "[%s] requesting previous state to revert Homebridge state.",
-          accessory.displayName
-        );
+        this.log.warn("[%s] requesting previous state to revert Homebridge state.", accessory.displayName);
       } catch (err) {}
     } else {
-      this.log.warn(
-        "[%s] Homebridge state will be synced once the device comes back online.",
-        accessory.displayName
-      );
+      this.log.warn("[%s] Homebridge state will be synced once the device comes back online.", accessory.displayName);
     }
   }
   async internalValveUpdate(accessory, valve, value, callback) {
@@ -1213,16 +1109,12 @@ class eWeLink {
       switch (valve) {
         case "Valve A":
           params.switches[0].switch = value ? "on" : "off";
-          params.switches[1].switch = accessory
-            .getService("Valve B")
-            .getCharacteristic(Characteristic.Active).value
+          params.switches[1].switch = accessory.getService("Valve B").getCharacteristic(Characteristic.Active).value
             ? "on"
             : "off";
           break;
         case "Valve B":
-          params.switches[0].switch = accessory
-            .getService("Valve A")
-            .getCharacteristic(Characteristic.Active).value
+          params.switches[0].switch = accessory.getService("Valve A").getCharacteristic(Characteristic.Active).value
             ? "on"
             : "off";
           params.switches[1].switch = value ? "on" : "off";
@@ -1231,9 +1123,7 @@ class eWeLink {
       params.switches[2].switch = "off";
       params.switches[3].switch = "off";
       await this.sendDeviceUpdate(accessory, params);
-      serviceValve
-        .updateCharacteristic(Characteristic.Active, value)
-        .updateCharacteristic(Characteristic.InUse, value);
+      serviceValve.updateCharacteristic(Characteristic.Active, value).updateCharacteristic(Characteristic.InUse, value);
       switch (value) {
         case 0:
           serviceValve.updateCharacteristic(Characteristic.RemainingDuration, 0);
@@ -1242,10 +1132,7 @@ class eWeLink {
         case 1:
           let timer = serviceValve.getCharacteristic(Characteristic.SetDuration).value;
           serviceValve.updateCharacteristic(Characteristic.RemainingDuration, timer);
-          serviceValve.timer = setTimeout(
-            () => serviceValve.setCharacteristic(Characteristic.Active, 0),
-            timer * 1000
-          );
+          serviceValve.timer = setTimeout(() => serviceValve.setCharacteristic(Characteristic.Active, 0), timer * 1000);
           break;
       }
     } catch (err) {
@@ -1323,118 +1210,63 @@ class eWeLink {
         params = {},
         wcService = accessory.getService(Service.WindowCovering),
         prevState = accessory.context.cachePositionState,
-        prevPos = accessory.context.cacheCurrentPosition,
+        prevPosition = accessory.context.cacheCurrentPosition,
+        prevTarget = accessory.context.cacheTargetPosition,
         newTarget = value,
-        timeNow = Date.now();
+        updateKey = Math.random().toString(36).substr(2, 8);
       if (!(blindConfig = this.cusG.get(accessory.context.hbDeviceId))) {
         throw "group config missing";
       }
       if (blindConfig.type !== "blind" || blindConfig.setup !== "twoSwitch") {
         throw "improper configuration";
       }
-      if (newTarget === prevPos) return;
-      params.switches = [
-        {
-          switch: "off",
-          outlet: 0,
-        },
-        {
-          switch: "off",
-          outlet: 1,
-        },
-        {
-          switch: "off",
-          outlet: 2,
-        },
-        {
-          switch: "off",
-          outlet: 3,
-        },
-      ];
-
-      if (prevState !== 2 || accessory.context.inUse) {
-        await utils.sleep(500);
-        this.log.warn(
-          "[%s] tried to move the blinds to [%s%] but they are already moving.",
-          accessory.displayName,
-          newTarget
-        );
-        wcService
-          .updateCharacteristic(
-            Characteristic.TargetPosition,
-            accessory.context.cacheTargetPosition
-          )
-          .updateCharacteristic(Characteristic.PositionState, accessory.context.cachePositionState);
-        return;
-      }
-      accessory.context.inUse = true;
-      wcService.updateCharacteristic(Characteristic.TargetPosition, newTarget);
-      accessory.context.cacheTargetPosition = newTarget;
-      let moveUp = newTarget > prevPos,
-        duration = Math.round(Math.abs(newTarget - prevPos) * blindConfig.operationTime);
-      accessory.context.startTimestamp = timeNow;
-      accessory.context.targetTimestamp = timeNow + duration;
-      params.switches[0].switch = moveUp ? "on" : "off";
-      params.switches[1].switch = moveUp ? "off" : "on";
-      await this.sendDeviceUpdate(accessory, params);
-      wcService.updateCharacteristic(Characteristic.PositionState, moveUp ? 0 : 1);
-      accessory.context.cachePositionState = moveUp ? 0 : 1;
-      await utils.sleep(duration);
-      params.switches[0].switch = "off";
-      params.switches[1].switch = "off";
+      if (newTarget === prevPosition) return;
+      params.switches = cns.defaultMultiSwitchOff;
+      accessory.context.updateKey = updateKey;
+      let percentStepPerDecisecond = blindConfig.operationTime / 100;
+      if (prevState !== 2) {
+        await this.sendDeviceUpdate(accessory, params);
+        let beenMovingAlreadyFor = Math.floor(Date.now() / 100) - accessory.context.cacheLastStartTime;
+        let positionPercentChange = Math.round(beenMovingAlreadyFor * percentStepPerDecisecond);
+        if (prevState === 1) {
+          prevPosition = prevPosition + positionPercentChange;
+        } else {
+          prevPosition = prevPosition - positionPercentChange;
+        }
+        wcService.updateCharacteristic(Characteristic.CurrentPosition, prevPosition);
+        accessory.context.cacheCurrentPosition = prevPosition;
+      }
+      let diffPosition = newTarget - prevPosition;
+      let setToMoveUp = diffPosition > 0;
+      let decisecondsToMove = Math.round(Math.abs(diffPosition) * percentStepPerDecisecond);
+      params.switches[0].switch = setToMoveUp ? "on" : "off";
+      params.switches[1].switch = setToMoveUp ? "off" : "on";
       await this.sendDeviceUpdate(accessory, params);
-      wcService.updateCharacteristic(Characteristic.PositionState, 2);
-      wcService.updateCharacteristic(Characteristic.CurrentPosition, newTarget);
-      accessory.context.cacheCurrentPosition = newTarget;
-      accessory.context.cachePositionState = 2;
-      accessory.context.inUse = false;
+      wcService
+        .updateCharacteristic(Characteristic.TargetPosition, newTarget)
+        .updateCharacteristic(Characteristic.PositionState, setToMoveUp);
+      accessory.context.cacheTargetPosition = newTarget;
+      accessory.context.cachePositionState = setToMoveUp;
+      accessory.context.cacheLastStartTime = Math.floor(Date.now() / 100);
+      this.log.warn(decisecondsToMove + " movement time in deciseconds");
+      await utils.sleep(decisecondsToMove * 100);
+      if (accessory.context.updateKey === updateKey) {
+        params.switches[0].switch = "off";
+        params.switches[1].switch = "off";
+        await this.sendDeviceUpdate(accessory, params);
+        wcService.updateCharacteristic(Characteristic.PositionState, 2);
+        wcService.updateCharacteristic(Characteristic.CurrentPosition, newTarget);
+        accessory.context.cachePositionState = 2;
+        accessory.context.cacheCurrentPosition = newTarget;
+        accessory.context.inUse = false;
+      }
     } catch (err) {
       this.requestDeviceRefresh(accessory, err);
     }
   }
   externalBlindUpdate(accessory, params) {
     try {
-      let blindConfig,
-        newPosition,
-        wcService = accessory.getService(Service.WindowCovering);
-      if (!(blindConfig = this.cusG.get(accessory.context.hbDeviceId))) {
-        throw "group config missing";
-      }
-      if (blindConfig.type !== "blind" || blindConfig.setup !== "twoSwitch") {
-        throw "improper configuration";
-      }
-      if (!params.hasOwnProperty("updateSource")) {
-        wcService
-          .updateCharacteristic(Characteristic.PositionState, accessory.context.cachePositionState)
-          .updateCharacteristic(
-            Characteristic.TargetPosition,
-            accessory.context.cacheTargetPosition
-          )
-          .updateCharacteristic(
-            Characteristic.CurrentPosition,
-            accessory.context.cacheCurrentPosition
-          );
-        return;
-      }
-      if (accessory.context.inUse) return;
-      if (params.switches[0].switch === "off" && params.switches[1].switch === "off") {
-        return;
-      }
-      let switchUp = params.switches[0].switch === "on" ? -1 : 0, // matrix of numbers to get
-        switchDown = params.switches[1].switch === "on" ? 0 : 2; // ... the correct HomeKit value
-      newPosition = switchUp + switchDown;
-      wcService
-        .updateCharacteristic(Characteristic.PositionState, newPosition)
-        .updateCharacteristic(Characteristic.TargetPosition, newPosition * 100);
-      accessory.context.cachePositionState = newPosition;
-      accessory.context.cacheTargetPosition = newPosition * 100;
-      setTimeout(() => {
-        wcService
-          .updateCharacteristic(Characteristic.PositionState, 2)
-          .updateCharacteristic(Characteristic.CurrentPosition, newPosition * 100);
-        accessory.context.cachePositionState = 2;
-        accessory.context.cacheCurrentPosition = newPosition * 100;
-      }, parseInt(blindConfig.operationTime) * 100);
+      //
     } catch (err) {
       this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
     }
@@ -1446,10 +1278,7 @@ class eWeLink {
       if (!(garageConfig = this.cusG.get(accessory.context.hbDeviceId))) {
         throw "group config missing";
       }
-      if (
-        garageConfig.type !== "garage" ||
-        !["oneSwitch", "twoSwitch"].includes(garageConfig.setup)
-      ) {
+      if (garageConfig.type !== "garage" || !["oneSwitch", "twoSwitch"].includes(garageConfig.setup)) {
         throw "improper configuration";
       }
       let sensorDefinition = garageConfig.sensorId || false,
@@ -1466,9 +1295,7 @@ class eWeLink {
         throw "defined DW2 sensor isn't a sensor";
       }
       prevState = sAccessory
-        ? sAccessory
-            .getService(Service.ContactSensor)
-            .getCharacteristic(Characteristic.ContactSensorState).value === 0
+        ? sAccessory.getService(Service.ContactSensor).getCharacteristic(Characteristic.ContactSensorState).value === 0
           ? 1
           : 0
         : accessory.context.cacheCurrentDoorState;
@@ -1517,10 +1344,7 @@ class eWeLink {
       if (!(garageConfig = this.cusG.get(accessory.context.hbDeviceId))) {
         throw "group config missing";
       }
-      if (
-        garageConfig.type !== "garage" ||
-        !["oneSwitch", "twoSwitch"].includes(garageConfig.setup)
-      ) {
+      if (garageConfig.type !== "garage" || !["oneSwitch", "twoSwitch"].includes(garageConfig.setup)) {
         throw "improper configuration";
       }
       if (accessory.context.inUse || garageConfig.sensorId) {
@@ -1621,8 +1445,7 @@ class eWeLink {
     try {
       if (params.hasOwnProperty("battery")) {
         let batteryService =
-            accessory.getService(Service.BatteryService) ||
-            accessory.addService(Service.BatteryService),
+            accessory.getService(Service.BatteryService) || accessory.addService(Service.BatteryService),
           scaledBattery = Math.round(params.battery * 33.3);
         batteryService.updateCharacteristic(Characteristic.BatteryLevel, scaledBattery);
         batteryService.updateCharacteristic(
@@ -1729,11 +1552,7 @@ class eWeLink {
             status = 1;
             speed = 99;
         }
-      } else if (
-        params.hasOwnProperty("light") &&
-        params.hasOwnProperty("fan") &&
-        params.hasOwnProperty("speed")
-      ) {
+      } else if (params.hasOwnProperty("light") && params.hasOwnProperty("fan") && params.hasOwnProperty("speed")) {
         light = params.light === "on";
         status = params.fan === "on" ? 1 : 0;
         speed = params.speed * 33 * status;
@@ -1764,13 +1583,8 @@ class eWeLink {
   }
   externalThermostatUpdate(accessory, params) {
     try {
-      if (
-        !this.config.hideTHSwitch &&
-        (params.hasOwnProperty("switch") || params.hasOwnProperty("mainSwitch"))
-      ) {
-        let newState = params.hasOwnProperty("switch")
-            ? params.switch === "on"
-            : params.mainSwitch === "on",
+      if (!this.config.hideTHSwitch && (params.hasOwnProperty("switch") || params.hasOwnProperty("mainSwitch"))) {
+        let newState = params.hasOwnProperty("switch") ? params.switch === "on" : params.mainSwitch === "on",
           switchService = accessory.getService(Service.Switch);
         switchService.updateCharacteristic(Characteristic.On, newState);
       }
@@ -1778,21 +1592,14 @@ class eWeLink {
         let eveLog = {
           time: Date.now(),
         };
-        if (
-          params.hasOwnProperty("currentTemperature") &&
-          accessory.getService(Service.TemperatureSensor)
-        ) {
-          let currentTemp =
-            params.currentTemperature !== "unavailable" ? params.currentTemperature : 0;
+        if (params.hasOwnProperty("currentTemperature") && accessory.getService(Service.TemperatureSensor)) {
+          let currentTemp = params.currentTemperature !== "unavailable" ? params.currentTemperature : 0;
           accessory
             .getService(Service.TemperatureSensor)
             .updateCharacteristic(Characteristic.CurrentTemperature, currentTemp);
           eveLog.temp = parseFloat(currentTemp);
         }
-        if (
-          params.hasOwnProperty("currentHumidity") &&
-          accessory.getService(Service.HumiditySensor)
-        ) {
+        if (params.hasOwnProperty("currentHumidity") && accessory.getService(Service.HumiditySensor)) {
           let currentHumi = params.currentHumidity !== "unavailable" ? params.currentHumidity : 0;
           accessory
             .getService(Service.HumiditySensor)
@@ -1830,10 +1637,7 @@ class eWeLink {
         }
       }
       if (params.hasOwnProperty("power")) {
-        outletService.updateCharacteristic(
-          EveService.Characteristics.CurrentConsumption,
-          parseFloat(params.power)
-        );
+        outletService.updateCharacteristic(EveService.Characteristics.CurrentConsumption, parseFloat(params.power));
         outletService.updateCharacteristic(
           Characteristic.OutletInUse,
           parseFloat(params.power) > (this.config.inUsePowerThreshold || 0)
@@ -1845,16 +1649,10 @@ class eWeLink {
         });
       }
       if (params.hasOwnProperty("voltage")) {
-        outletService.updateCharacteristic(
-          EveService.Characteristics.Voltage,
-          parseFloat(params.voltage)
-        );
+        outletService.updateCharacteristic(EveService.Characteristics.Voltage, parseFloat(params.voltage));
       }
       if (params.hasOwnProperty("current")) {
-        outletService.updateCharacteristic(
-          EveService.Characteristics.ElectricCurrent,
-          parseFloat(params.current)
-        );
+        outletService.updateCharacteristic(EveService.Characteristics.ElectricCurrent, parseFloat(params.current));
       }
     } catch (err) {
       this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
@@ -1876,9 +1674,7 @@ class eWeLink {
   }
   externalUSBUpdate(accessory, params) {
     try {
-      accessory
-        .getService(Service.Outlet)
-        .updateCharacteristic(Characteristic.On, params.switches[0].switch === "on");
+      accessory.getService(Service.Outlet).updateCharacteristic(Characteristic.On, params.switches[0].switch === "on");
     } catch (err) {
       this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
     }
@@ -1899,9 +1695,7 @@ class eWeLink {
   }
   externalSCMUpdate(accessory, params) {
     try {
-      accessory
-        .getService(Service.Switch)
-        .updateCharacteristic(Characteristic.On, params.switches[0].switch === "on");
+      accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, params.switches[0].switch === "on");
     } catch (err) {
       this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
     }
@@ -1956,9 +1750,7 @@ class eWeLink {
         case "0":
           for (let i = 0; i <= 4; i++) {
             if ((oAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW" + i))) {
-              oAccessory
-                .getService(Service.Lightbulb)
-                .updateCharacteristic(Characteristic.On, value);
+              oAccessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, value);
             }
           }
           break;
@@ -1970,18 +1762,14 @@ class eWeLink {
           let masterState = "off";
           for (let i = 1; i <= 4; i++) {
             if ((oAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW" + i))) {
-              if (
-                oAccessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On).value
-              ) {
+              if (oAccessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On).value) {
                 masterState = "on";
               }
             }
           }
           if (!this.hiddenMasters.includes(accessory.context.eweDeviceId)) {
             oAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW0");
-            oAccessory
-              .getService(Service.Lightbulb)
-              .updateCharacteristic(Characteristic.On, masterState === "on");
+            oAccessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, masterState === "on");
           }
           break;
       }
@@ -2124,10 +1912,7 @@ class eWeLink {
           case 22: // B1
             if (params.hasOwnProperty("zyx_mode")) {
               mode = parseInt(params.zyx_mode);
-            } else if (
-              params.hasOwnProperty("channel0") &&
-              parseInt(params.channel0) + parseInt(params.channel1) > 0
-            ) {
+            } else if (params.hasOwnProperty("channel0") && parseInt(params.channel0) + parseInt(params.channel1) > 0) {
               mode = 1;
             } else {
               mode = 2;
@@ -2184,9 +1969,7 @@ class eWeLink {
         }
       }
       if (!this.hiddenMasters.includes(accessory.context.eweDeviceId)) {
-        accessory
-          .getService(Service.Lightbulb)
-          .updateCharacteristic(Characteristic.On, primaryState);
+        accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, primaryState);
       }
     } catch (err) {
       this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
@@ -2249,18 +2032,14 @@ class eWeLink {
           let masterState = "off";
           for (let i = 1; i <= 4; i++) {
             if ((oAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW" + i))) {
-              if (
-                oAccessory.getService(Service.Switch).getCharacteristic(Characteristic.On).value
-              ) {
+              if (oAccessory.getService(Service.Switch).getCharacteristic(Characteristic.On).value) {
                 masterState = "on";
               }
             }
           }
           if (!this.hiddenMasters.includes(accessory.context.eweDeviceId)) {
             oAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW0");
-            oAccessory
-              .getService(Service.Switch)
-              .updateCharacteristic(Characteristic.On, masterState === "on");
+            oAccessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, masterState === "on");
           }
           break;
       }
@@ -2270,9 +2049,7 @@ class eWeLink {
   }
   externalSingleSwitchUpdate(accessory, params) {
     try {
-      accessory
-        .getService(Service.Switch)
-        .updateCharacteristic(Characteristic.On, params.switch === "on");
+      accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, params.switch === "on");
     } catch (err) {
       this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
     }
@@ -2320,11 +2097,7 @@ class eWeLink {
       if (!params.hasOwnProperty("updateSource")) return;
       let timeNow = new Date(),
         oAccessory = false;
-      if (
-        params.hasOwnProperty("cmd") &&
-        params.cmd === "transmit" &&
-        params.hasOwnProperty("rfChl")
-      ) {
+      if (params.hasOwnProperty("cmd") && params.cmd === "transmit" && params.hasOwnProperty("rfChl")) {
         //*** RF Button ***\\
         // the device needed is SW% corresponding to params.rfChl
         this.devicesInHB.forEach(acc => {
@@ -2336,9 +2109,7 @@ class eWeLink {
           }
         });
         if (oAccessory) {
-          oAccessory
-            .getService(oAccessory.context.buttons[params.rfChl])
-            .updateCharacteristic(Characteristic.On, 1);
+          oAccessory.getService(oAccessory.context.buttons[params.rfChl]).updateCharacteristic(Characteristic.On, 1);
           setTimeout(
             () =>
               oAccessory
@@ -2406,11 +2177,7 @@ class eWeLink {
                   oAccessory.getService(serv).updateCharacteristic(char, 0);
                 }, (this.config.sensorTimeLength || 2) * 1000);
                 if (this.debug) {
-                  this.log(
-                    "[%s] has detected [%s].",
-                    oAccessory.displayName,
-                    oAccessory.context.sensorType
-                  );
+                  this.log("[%s] has detected [%s].", oAccessory.displayName, oAccessory.context.sensorType);
                 }
               }
             }
@@ -2428,8 +2195,7 @@ class eWeLink {
           params.battery *= 10;
         }
         let batteryService =
-          accessory.getService(Service.BatteryService) ||
-          accessory.addService(Service.BatteryService);
+          accessory.getService(Service.BatteryService) || accessory.addService(Service.BatteryService);
         batteryService.updateCharacteristic(Characteristic.BatteryLevel, params.battery);
         batteryService.updateCharacteristic(
           Characteristic.StatusLowBattery,
diff --git a/lib/eWeLinkHTTP.js b/lib/eWeLinkHTTP.js
index 4076d982..03e24b06 100644
--- a/lib/eWeLinkHTTP.js
+++ b/lib/eWeLinkHTTP.js
@@ -33,10 +33,7 @@ module.exports = class eWeLinkHTTP {
         });
         dataToSign.sort((a, b) => (a.key < b.key ? -1 : 1));
         dataToSign = dataToSign.map(k => k.key + "=" + k.value).join("&");
-        dataToSign = crypto
-          .createHmac("sha256", constants.appSecret)
-          .update(dataToSign)
-          .digest("base64");
+        dataToSign = crypto.createHmac("sha256", constants.appSecret).update(dataToSign).digest("base64");
         if (this.debugReqRes) {
           this.log.warn(
             "Sending HTTP getHost request. This text is yellow for clarity.\n%s",
@@ -73,10 +70,7 @@ module.exports = class eWeLinkHTTP {
         }
         resolve(this.httpHost);
       } catch (err) {
-        if (
-          err.hasOwnProperty("code") &&
-          ["ENOTFOUND", "ETIMEDOUT", "EAI_AGAIN"].includes(err.code)
-        ) {
+        if (err.hasOwnProperty("code") && ["ENOTFOUND", "ETIMEDOUT", "EAI_AGAIN"].includes(err.code)) {
           this.log.warn("Unable to reach eWeLink. Retrying in 30 seconds.");
           await utils.sleep(30000);
           resolve(this.getHost());
@@ -93,9 +87,7 @@ module.exports = class eWeLinkHTTP {
         password: this.password,
       };
       try {
-        this.username.includes("@")
-          ? (data.email = this.username)
-          : (data.phoneNumber = this.username);
+        this.username.includes("@") ? (data.email = this.username) : (data.phoneNumber = this.username);
         if (this.debugReqRes) {
           let msg = JSON.stringify(data, null, 2)
             .replace(this.password, "**hidden**")
@@ -104,10 +96,7 @@ module.exports = class eWeLinkHTTP {
         } else if (this.debug) {
           this.log("Sending HTTP login request.");
         }
-        let dataToSign = crypto
-          .createHmac("sha256", constants.appSecret)
-          .update(JSON.stringify(data))
-          .digest("base64");
+        let dataToSign = crypto.createHmac("sha256", constants.appSecret).update(JSON.stringify(data)).digest("base64");
         let res = await axios.post("https://" + this.httpHost + "/v2/user/login", data, {
           headers: {
             Authorization: "Sign " + dataToSign,
diff --git a/lib/eWeLinkLAN.js b/lib/eWeLinkLAN.js
index b046db46..70d0c13c 100644
--- a/lib/eWeLinkLAN.js
+++ b/lib/eWeLinkLAN.js
@@ -15,9 +15,7 @@ module.exports = class eWeLinkLAN {
       this.deviceMap.set(device.deviceid, {
         apiKey: device.devicekey,
         online: this.ipOverrides.hasOwnProperty(device.deviceid) ? true : false,
-        ip: this.ipOverrides.hasOwnProperty(device.deviceid)
-          ? this.ipOverrides[device.deviceid]
-          : null,
+        ip: this.ipOverrides.hasOwnProperty(device.deviceid) ? this.ipOverrides[device.deviceid] : null,
       });
     });
     this.debug = config.debug || false;
@@ -64,15 +62,9 @@ module.exports = class eWeLinkLAN {
                 (rdata.hasOwnProperty("data2") ? rdata.data2 : "") +
                 (rdata.hasOwnProperty("data3") ? rdata.data3 : "") +
                 (rdata.hasOwnProperty("data4") ? rdata.data4 : ""),
-              key = crypto
-                .createHash("md5")
-                .update(Buffer.from(deviceInfo.apiKey, "utf8"))
-                .digest(),
+              key = crypto.createHash("md5").update(Buffer.from(deviceInfo.apiKey, "utf8")).digest(),
               dText = crypto.createDecipheriv("aes-128-cbc", key, Buffer.from(rdata.iv, "base64")),
-              pText = Buffer.concat([
-                dText.update(Buffer.from(data, "base64")),
-                dText.final(),
-              ]).toString("utf8"),
+              pText = Buffer.concat([dText.update(Buffer.from(data, "base64")), dText.final()]).toString("utf8"),
               params;
             if (packet.address !== deviceInfo.ip && !this.ipOverrides.hasOwnProperty(rdata.id)) {
               this.deviceMap.set(rdata.id, {
@@ -140,9 +132,7 @@ module.exports = class eWeLinkLAN {
             iv = crypto.randomBytes(16),
             enc = crypto.createCipheriv("aes-128-cbc", key, iv),
             data = {
-              data: Buffer.concat([enc.update(JSON.stringify(params)), enc.final()]).toString(
-                "base64"
-              ),
+              data: Buffer.concat([enc.update(JSON.stringify(params)), enc.final()]).toString("base64"),
               deviceid: json.deviceid,
               encrypt: true,
               iv: iv.toString("base64"),
@@ -185,9 +175,7 @@ module.exports = class eWeLinkLAN {
     this.deviceMap.set(device.deviceid, {
       apiKey: device.devicekey,
       online: this.ipOverrides.hasOwnProperty(device.deviceid) ? true : false,
-      ip: this.ipOverrides.hasOwnProperty(device.deviceid)
-        ? this.ipOverrides[device.deviceid]
-        : null,
+      ip: this.ipOverrides.hasOwnProperty(device.deviceid) ? this.ipOverrides[device.deviceid] : null,
     });
   }
   closeConnection() {
diff --git a/lib/eWeLinkWS.js b/lib/eWeLinkWS.js
index a9df48ca..c3201325 100644
--- a/lib/eWeLinkWS.js
+++ b/lib/eWeLinkWS.js
@@ -100,12 +100,7 @@ module.exports = class eWeLinkWS {
         let res = await this.wsp.sendRequest(payload, {
           requestId: sequence,
         });
-        if (
-          res.hasOwnProperty("config") &&
-          res.config.hb &&
-          res.config.hbInterval &&
-          !this.hbInterval
-        ) {
+        if (res.hasOwnProperty("config") && res.config.hb && res.config.hbInterval && !this.hbInterval) {
           this.hbInterval = setInterval(() => {
             this.wsp.send("ping");
           }, (res.config.hbInterval + 7) * 1000);
@@ -146,10 +141,7 @@ module.exports = class eWeLinkWS {
                 params: device.params,
               };
               if (this.debugReqRes) {
-                let msg = JSON.stringify(returnTemplate, null, 2).replace(
-                  device.deviceid,
-                  "**hidden**"
-                );
+                let msg = JSON.stringify(returnTemplate, null, 2).replace(device.deviceid, "**hidden**");
                 this.log("WS message received.\n%s", msg);
               } else if (this.debug) {
                 this.log("WS message received.");
@@ -160,10 +152,7 @@ module.exports = class eWeLinkWS {
           case "reportSubDevice":
             return;
           default:
-            this.log.warn(
-              "[%s] WS message has unknown action.\n" + JSON.stringify(device, null, 2),
-              device.deviceid
-            );
+            this.log.warn("[%s] WS message has unknown action.\n" + JSON.stringify(device, null, 2), device.deviceid);
             return;
         }
       } else if (device.hasOwnProperty("error") && device.error === 0) {
@@ -194,9 +183,7 @@ module.exports = class eWeLinkWS {
     this.wsp.onError.addListener(e => {
       this.log.error("Web socket error - [%s].", e);
       if (e.code === "ECONNREFUSED") {
-        this.log.warn(
-          "Web socket will try to reconnect in five seconds then try the command again."
-        );
+        this.log.warn("Web socket will try to reconnect in five seconds then try the command again.");
         this.wsp.removeAllListeners();
         setTimeout(() => this.login(), 5000);
       } else {

From 11ae9127ac5266b2b30311fb5ab8389270089594 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 26 Sep 2020 17:51:24 +0100
Subject: [PATCH 0221/3183] 3.0.3-0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 16b95537..0f7c5732 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.0.2",
+  "version": "3.0.3-0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index cf8c488f..761b4ca3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.0.2",
+  "version": "3.0.3-0",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From a6e3b516f5a167d9d171185361f58e8a24adf6ed Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 26 Sep 2020 18:55:39 +0100
Subject: [PATCH 0222/3183] blinds rel % fix

---
 lib/eWeLink.js | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index 57e64c9d..53bc6241 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -1211,7 +1211,6 @@ class eWeLink {
         wcService = accessory.getService(Service.WindowCovering),
         prevState = accessory.context.cachePositionState,
         prevPosition = accessory.context.cacheCurrentPosition,
-        prevTarget = accessory.context.cacheTargetPosition,
         newTarget = value,
         updateKey = Math.random().toString(36).substr(2, 8);
       if (!(blindConfig = this.cusG.get(accessory.context.hbDeviceId))) {
@@ -1226,12 +1225,13 @@ class eWeLink {
       let percentStepPerDecisecond = blindConfig.operationTime / 100;
       if (prevState !== 2) {
         await this.sendDeviceUpdate(accessory, params);
-        let beenMovingAlreadyFor = Math.floor(Date.now() / 100) - accessory.context.cacheLastStartTime;
-        let positionPercentChange = Math.round(beenMovingAlreadyFor * percentStepPerDecisecond);
-        if (prevState === 1) {
-          prevPosition = prevPosition + positionPercentChange;
+        let positionPercentChange = Math.round(
+          Math.floor(Date.now() / 100) - accessory.context.cacheLastStartTime * percentStepPerDecisecond
+        );
+        if ((prevState === 0 && newTarget > prevPosition) || (prevState === 1 && newTarget < prevPosition)) {
+          prevPosition += positionPercentChange;
         } else {
-          prevPosition = prevPosition - positionPercentChange;
+          prevPosition -= positionPercentChange;
         }
         wcService.updateCharacteristic(Characteristic.CurrentPosition, prevPosition);
         accessory.context.cacheCurrentPosition = prevPosition;
@@ -1258,7 +1258,6 @@ class eWeLink {
         wcService.updateCharacteristic(Characteristic.CurrentPosition, newTarget);
         accessory.context.cachePositionState = 2;
         accessory.context.cacheCurrentPosition = newTarget;
-        accessory.context.inUse = false;
       }
     } catch (err) {
       this.requestDeviceRefresh(accessory, err);
@@ -1266,7 +1265,6 @@ class eWeLink {
   }
   externalBlindUpdate(accessory, params) {
     try {
-      //
     } catch (err) {
       this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
     }

From f6ca880243168b4db2ac15f275b377e3d90a02b0 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 26 Sep 2020 18:56:15 +0100
Subject: [PATCH 0223/3183] 3.0.3-1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 0f7c5732..cf967598 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.0.3-0",
+  "version": "3.0.3-1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 761b4ca3..a50beb2b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.0.3-0",
+  "version": "3.0.3-1",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 825bfbcded98d7ae5953cae6eef3a13e3d10c814 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 26 Sep 2020 20:54:39 +0100
Subject: [PATCH 0224/3183] separate devices

---
 lib/constants.js         |    1 -
 lib/device/blind.js      |   73 +++
 lib/device/curtain.js    |   52 ++
 lib/device/fan.js        |   92 +++
 lib/device/garage.js     |  125 ++++
 lib/device/light.js      |  287 +++++++++
 lib/device/lock.js       |   67 ++
 lib/device/outlet.js     |   56 ++
 lib/device/rf-sub.js     |  122 ++++
 lib/device/scm.js        |   32 +
 lib/device/sensor.js     |   54 ++
 lib/device/switch.js     |  111 ++++
 lib/device/thermostat.js |   58 ++
 lib/device/usb.js        |   31 +
 lib/device/valve.js      |   71 ++
 lib/device/zb-dev.js     |   82 +++
 lib/eWeLink.js           | 1327 +++-----------------------------------
 17 files changed, 1412 insertions(+), 1229 deletions(-)
 create mode 100644 lib/device/blind.js
 create mode 100644 lib/device/curtain.js
 create mode 100644 lib/device/fan.js
 create mode 100644 lib/device/garage.js
 create mode 100644 lib/device/light.js
 create mode 100644 lib/device/lock.js
 create mode 100644 lib/device/outlet.js
 create mode 100644 lib/device/rf-sub.js
 create mode 100644 lib/device/scm.js
 create mode 100644 lib/device/sensor.js
 create mode 100644 lib/device/switch.js
 create mode 100644 lib/device/thermostat.js
 create mode 100644 lib/device/usb.js
 create mode 100644 lib/device/valve.js
 create mode 100644 lib/device/zb-dev.js

diff --git a/lib/constants.js b/lib/constants.js
index 555488c5..803a3423 100644
--- a/lib/constants.js
+++ b/lib/constants.js
@@ -48,7 +48,6 @@ module.exports = {
   devicesZBBridgeParams: ["key", "temperature", "humidity", "motion", "lock", "trigTime", "battery"],
   devicesZB: [1000, 1770, 2026, 3026],
   devicesValveParams: ["switches"],
-  devicesBlindParams: ["switch", "switches"],
   devicesGarageParams: ["switch", "switches"],
   devicesLockParams: ["switch"],
   allowedGroups: ["blind", "garage", "lock"],
diff --git a/lib/device/blind.js b/lib/device/blind.js
new file mode 100644
index 00000000..8057a852
--- /dev/null
+++ b/lib/device/blind.js
@@ -0,0 +1,73 @@
+/* jshint esversion: 9, -W014, -W030, node: true */
+"use strict";
+let Characteristic, Service;
+const cns = require("./../constants"),
+  utils = require("./../utils");
+module.exports = class deviceBlind {
+  constructor(platform) {
+    this.platform = platform;
+    Service = platform.api.hap.Service;
+    Characteristic = platform.api.hap.Characteristic;
+  }
+
+  async internalBlindUpdate(accessory, value, callback) {
+    callback();
+    try {
+      let blindConfig,
+        params = {},
+        wcService = accessory.getService(Service.WindowCovering),
+        prevState = accessory.context.cachePositionState,
+        prevPosition = accessory.context.cacheCurrentPosition,
+        newTarget = value,
+        updateKey = Math.random().toString(36).substr(2, 8);
+      if (!(blindConfig = this.cusG.get(accessory.context.hbDeviceId))) {
+        throw "group config missing";
+      }
+      if (blindConfig.type !== "blind" || blindConfig.setup !== "twoSwitch") {
+        throw "improper configuration";
+      }
+      if (newTarget === prevPosition) return;
+      params.switches = cns.defaultMultiSwitchOff;
+      accessory.context.updateKey = updateKey;
+      let percentStepPerDecisecond = blindConfig.operationTime / 100;
+      if (prevState !== 2) {
+        await this.platform.sendDeviceUpdate(accessory, params);
+        let positionPercentChange = Math.round(
+          Math.floor(Date.now() / 100) - accessory.context.cacheLastStartTime * percentStepPerDecisecond
+        );
+        if ((prevState === 0 && newTarget > prevPosition) || (prevState === 1 && newTarget < prevPosition)) {
+          prevPosition += positionPercentChange;
+        } else {
+          prevPosition -= positionPercentChange;
+        }
+        wcService.updateCharacteristic(Characteristic.CurrentPosition, prevPosition);
+        accessory.context.cacheCurrentPosition = prevPosition;
+      }
+      let diffPosition = newTarget - prevPosition;
+      let setToMoveUp = diffPosition > 0;
+      let decisecondsToMove = Math.round(Math.abs(diffPosition) * percentStepPerDecisecond);
+      params.switches[0].switch = setToMoveUp ? "on" : "off";
+      params.switches[1].switch = setToMoveUp ? "off" : "on";
+      await this.platform.sendDeviceUpdate(accessory, params);
+      wcService
+        .updateCharacteristic(Characteristic.TargetPosition, newTarget)
+        .updateCharacteristic(Characteristic.PositionState, setToMoveUp);
+      accessory.context.cacheTargetPosition = newTarget;
+      accessory.context.cachePositionState = setToMoveUp;
+      accessory.context.cacheLastStartTime = Math.floor(Date.now() / 100);
+      this.platform.log.warn(decisecondsToMove + " movement time in deciseconds");
+      await utils.sleep(decisecondsToMove * 100);
+      if (accessory.context.updateKey === updateKey) {
+        params.switches[0].switch = "off";
+        params.switches[1].switch = "off";
+        await this.platform.sendDeviceUpdate(accessory, params);
+        wcService.updateCharacteristic(Characteristic.PositionState, 2);
+        wcService.updateCharacteristic(Characteristic.CurrentPosition, newTarget);
+        accessory.context.cachePositionState = 2;
+        accessory.context.cacheCurrentPosition = newTarget;
+      }
+    } catch (err) {
+      this.platform.requestDeviceRefresh(accessory, err);
+    }
+  }
+};
diff --git a/lib/device/curtain.js b/lib/device/curtain.js
new file mode 100644
index 00000000..d7a8cf8a
--- /dev/null
+++ b/lib/device/curtain.js
@@ -0,0 +1,52 @@
+/* jshint esversion: 9, -W014, -W030, node: true */
+"use strict";
+let Characteristic, Service;
+module.exports = class deviceCurtain {
+  constructor(platform) {
+    this.platform = platform;
+    Service = platform.api.hap.Service;
+    Characteristic = platform.api.hap.Characteristic;
+  }
+  async internalCurtainUpdate(accessory, value, callback) {
+    callback();
+    try {
+      let params,
+        cService = accessory.getService(Service.WindowCovering),
+        prevPos = accessory.context.cacheCurrentPosition,
+        newPos = value;
+      if (newPos === prevPos) return;
+      if (newPos === 0 || newPos === 100) {
+        params = {
+          switch: newPos === 100 ? "on" : "off",
+        };
+      } else {
+        params = {
+          setclose: Math.abs(100 - newPos),
+        };
+      }
+      await this.platform.sendDeviceUpdate(accessory, params);
+      cService
+        .updateCharacteristic(Characteristic.TargetPosition, newPos)
+        .updateCharacteristic(Characteristic.PositionState, newPos > prevPos ? 1 : 0);
+      accessory.context.cacheCurrentPosition = newPos;
+    } catch (err) {
+      this.platform.requestDeviceRefresh(accessory, err);
+    }
+  }
+  externalCurtainUpdate(accessory, params) {
+    try {
+      let cService = accessory.getService(Service.WindowCovering);
+      if (params.hasOwnProperty("switch") && params.hasOwnProperty("setclose")) {
+        let newPos = Math.abs(100 - parseInt(params.setclose));
+        cService
+          .updateCharacteristic(Characteristic.TargetPosition, newPos)
+          .updateCharacteristic(Characteristic.CurrentPosition, newPos)
+          .updateCharacteristic(Characteristic.PositionState, 2);
+        accessory.context.cacheCurrentPosition = newPos;
+        return;
+      }
+    } catch (err) {
+      this.platform.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+    }
+  }
+};
diff --git a/lib/device/fan.js b/lib/device/fan.js
new file mode 100644
index 00000000..2c12a5e7
--- /dev/null
+++ b/lib/device/fan.js
@@ -0,0 +1,92 @@
+/* jshint esversion: 9, -W014, -W030, node: true */
+"use strict";
+let Characteristic, Service;
+module.exports = class deviceFan {
+  constructor(platform) {
+    this.platform = platform;
+    Service = platform.api.hap.Service;
+    Characteristic = platform.api.hap.Characteristic;
+  }
+  async internalFanUpdate(accessory, type, value, callback) {
+    callback();
+    try {
+      let newPower,
+        newSpeed,
+        newLight,
+        lightService = accessory.getService(Service.Lightbulb),
+        fanService = accessory.getService(Service.Fanv2);
+      switch (type) {
+        case "power":
+          newPower = value;
+          newSpeed = value ? 33 : 0;
+          newLight = lightService.getCharacteristic(Characteristic.On).value;
+          break;
+        case "speed":
+          newPower = value >= 33 ? 1 : 0;
+          newSpeed = value;
+          newLight = lightService.getCharacteristic(Characteristic.On).value;
+          break;
+        case "light":
+          newPower = fanService.getCharacteristic(Characteristic.Active).value;
+          newSpeed = fanService.getCharacteristic(Characteristic.RotationSpeed).value;
+          newLight = value;
+          break;
+      }
+      let params = {
+        switches: this.platform.devicesInEW.get(accessory.context.eweDeviceId).params.switches,
+      };
+      params.switches[0].switch = newLight ? "on" : "off";
+      params.switches[1].switch = newPower === 1 && newSpeed >= 33 ? "on" : "off";
+      params.switches[2].switch = newPower === 1 && newSpeed >= 66 && newSpeed < 99 ? "on" : "off";
+      params.switches[3].switch = newPower === 1 && newSpeed >= 99 ? "on" : "off";
+      await this.platform.sendDeviceUpdate(accessory, params);
+      lightService.updateCharacteristic(Characteristic.On, newLight);
+      fanService
+        .updateCharacteristic(Characteristic.Active, newPower)
+        .updateCharacteristic(Characteristic.RotationSpeed, newSpeed);
+    } catch (err) {
+      this.platform.requestDeviceRefresh(accessory, err);
+    }
+  }
+  externalFanUpdate(accessory, params) {
+    try {
+      let light,
+        status,
+        speed,
+        lightService = accessory.getService(Service.Lightbulb),
+        fanService = accessory.getService(Service.Fanv2);
+      if (Array.isArray(params.switches)) {
+        light = params.switches[0].switch === "on";
+        switch (params.switches[1].switch + params.switches[2].switch + params.switches[3].switch) {
+          default:
+            status = 0;
+            speed = 0;
+            break;
+          case "onoffoff":
+            status = 1;
+            speed = 33;
+            break;
+          case "ononoff":
+            status = 1;
+            speed = 66;
+            break;
+          case "onoffon":
+            status = 1;
+            speed = 99;
+        }
+      } else if (params.hasOwnProperty("light") && params.hasOwnProperty("fan") && params.hasOwnProperty("speed")) {
+        light = params.light === "on";
+        status = params.fan === "on" ? 1 : 0;
+        speed = params.speed * 33 * status;
+      } else {
+        throw "unknown parameters received";
+      }
+      lightService.updateCharacteristic(Characteristic.On, light);
+      fanService
+        .updateCharacteristic(Characteristic.Active, status)
+        .updateCharacteristic(Characteristic.RotationSpeed, speed);
+    } catch (err) {
+      this.platform.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+    }
+  }
+};
diff --git a/lib/device/garage.js b/lib/device/garage.js
new file mode 100644
index 00000000..e888c551
--- /dev/null
+++ b/lib/device/garage.js
@@ -0,0 +1,125 @@
+/* jshint esversion: 9, -W014, -W030, node: true */
+"use strict";
+let Characteristic, Service;
+const utils = require("./../utils");
+module.exports = class deviceGarage {
+  constructor(platform) {
+    this.platform = platform;
+    Service = platform.api.hap.Service;
+    Characteristic = platform.api.hap.Characteristic;
+  }
+  async internalGarageUpdate(accessory, value, callback) {
+    callback();
+    try {
+      let garageConfig;
+      if (!(garageConfig = this.platform.cusG.get(accessory.context.hbDeviceId))) {
+        throw "group config missing";
+      }
+      if (garageConfig.type !== "garage" || !["oneSwitch", "twoSwitch"].includes(garageConfig.setup)) {
+        throw "improper configuration";
+      }
+      let sensorDefinition = garageConfig.sensorId || false,
+        sAccessory = false,
+        prevState,
+        newPos = value,
+        params = {},
+        delay = 0,
+        gdService = accessory.getService(Service.GarageDoorOpener);
+      if (sensorDefinition && !(sAccessory = this.platform.devicesInHB.get(garageConfig.sensorId + "SWX"))) {
+        throw "defined DW2 sensor doesn't exist";
+      }
+      if (sensorDefinition && sAccessory.context.type !== "sensor") {
+        throw "defined DW2 sensor isn't a sensor";
+      }
+      prevState = sAccessory
+        ? sAccessory.getService(Service.ContactSensor).getCharacteristic(Characteristic.ContactSensorState).value === 0
+          ? 1
+          : 0
+        : accessory.context.cacheCurrentDoorState;
+      if (newPos === prevState % 2) return;
+      accessory.context.inUse = true;
+      accessory.context.state = value;
+      if (garageConfig.setup === "oneSwitch" && [2, 3].includes(prevState)) {
+        gdService.updateCharacteristic(Characteristic.CurrentDoorState, ((prevState * 2) % 3) + 2);
+        accessory.context.cacheCurrentDoorState = ((prevState * 2) % 3) + 2;
+        delay = 1500;
+      }
+      if (accessory.context.state !== newPos) return;
+      await utils.sleep(delay);
+      gdService
+        .updateCharacteristic(Characteristic.TargetDoorState, newPos)
+        .updateCharacteristic(Characteristic.CurrentDoorState, newPos + 2);
+      accessory.context.cacheTargetDoorState = newPos;
+      accessory.context.cacheCurrentDoorState = newPos + 2;
+      switch (garageConfig.setup) {
+        case "oneSwitch":
+          params.switch = "on";
+          break;
+        case "twoSwitch":
+          params.switches = this.platform.devicesInEW.get(accessory.context.eweDeviceId).params.switches;
+          params.switches[0].switch = newPos === 0 ? "on" : "off";
+          params.switches[1].switch = newPos === 1 ? "on" : "off";
+          break;
+      }
+      await this.platform.sendDeviceUpdate(accessory, params);
+      await utils.sleep(garageConfig.operationTime * 100);
+      if (!sAccessory) {
+        gdService.updateCharacteristic(Characteristic.CurrentDoorState, newPos);
+        accessory.context.cacheCurrentDoorState = newPos;
+      }
+      accessory.context.inUse = false;
+    } catch (err) {
+      this.platform.requestDeviceRefresh(accessory, err);
+    }
+  }
+  externalGarageUpdate(accessory, params) {
+    try {
+      let garageConfig,
+        gcService = accessory.getService(Service.GarageDoorOpener),
+        prevState = accessory.context.cacheCurrentDoorState,
+        newPos = [0, 2].includes(prevState) ? 3 : 2;
+      if (!(garageConfig = this.platform.cusG.get(accessory.context.hbDeviceId))) {
+        throw "group config missing";
+      }
+      if (garageConfig.type !== "garage" || !["oneSwitch", "twoSwitch"].includes(garageConfig.setup)) {
+        throw "improper configuration";
+      }
+      if (accessory.context.inUse || garageConfig.sensorId) {
+        return;
+      }
+      switch (garageConfig.setup) {
+        case "oneSwitch":
+          if (params.switch === "off") {
+            return;
+          }
+          break;
+        case "twoSwitch":
+          if (
+            params.switches[0].switch === params.switches[1].switch ||
+            params.switches[prevState % 2].switch === "on"
+          ) {
+            return;
+          }
+          break;
+      }
+      accessory.context.inUse = true;
+      if (!garageConfig.sensorId) {
+        gcService
+          .updateCharacteristic(Characteristic.CurrentDoorState, newPos)
+          .updateCharacteristic(Characteristic.TargetDoorState, newPos - 2);
+        accessory.context.cacheCurrentDoorState = newPos;
+        accessory.context.cacheTargetDoorState = newPos - 2;
+        setTimeout(() => {
+          gcService.updateCharacteristic(Characteristic.CurrentDoorState, newPos - 2);
+          accessory.context.cacheCurrentDoorState = newPos - 2;
+        }, parseInt(garageConfig.operationTime) * 100);
+      }
+      setTimeout(() => {
+        accessory.context.inUse = false;
+      }, parseInt(garageConfig.operationTime) * 100);
+    } catch (err) {
+      accessory.context.inUse = false;
+      this.platform.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+    }
+  }
+};
diff --git a/lib/device/light.js b/lib/device/light.js
new file mode 100644
index 00000000..ac838310
--- /dev/null
+++ b/lib/device/light.js
@@ -0,0 +1,287 @@
+/* jshint esversion: 9, -W014, -W030, node: true */
+"use strict";
+let Characteristic, Service;
+const convert = require("color-convert"),
+  utils = require("./../utils");
+module.exports = class deviceLight {
+  constructor(platform) {
+    this.platform = platform;
+    Service = platform.api.hap.Service;
+    Characteristic = platform.api.hap.Characteristic;
+  }
+  async internalLightbulbUpdate(accessory, value, callback) {
+    callback();
+    try {
+      let oAccessory,
+        params = {},
+        lightService = accessory.getService(Service.Lightbulb);
+      switch (accessory.context.switchNumber) {
+        case "X":
+          if (accessory.context.eweUIID === 22) {
+            //*** B1 ***\\
+            params.state = value ? "on" : "off";
+          } else {
+            params.switch = value ? "on" : "off";
+          }
+          break;
+        case "0":
+          params.switches = this.platform.devicesInEW.get(accessory.context.eweDeviceId).params.switches;
+          params.switches[0].switch = value ? "on" : "off";
+          params.switches[1].switch = value ? "on" : "off";
+          params.switches[2].switch = value ? "on" : "off";
+          params.switches[3].switch = value ? "on" : "off";
+          break;
+        case "1":
+        case "2":
+        case "3":
+        case "4":
+          params.switches = this.platform.devicesInEW.get(accessory.context.eweDeviceId).params.switches;
+          for (let i = 1; i <= 4; i++) {
+            if ((oAccessory = this.platform.devicesInHB.get(accessory.context.eweDeviceId + "SW" + i))) {
+              i === parseInt(accessory.context.switchNumber)
+                ? (params.switches[i - 1].switch = value ? "on" : "off")
+                : (params.switches[i - 1].switch = oAccessory
+                    .getService(Service.Lightbulb)
+                    .getCharacteristic(Characteristic.On).value
+                    ? "on"
+                    : "off");
+            } else {
+              params.switches[i - 1].switch = "off";
+            }
+          }
+          break;
+      }
+      await this.platform.sendDeviceUpdate(accessory, params);
+      switch (accessory.context.switchNumber) {
+        case "X":
+          lightService.updateCharacteristic(Characteristic.On, value);
+          break;
+        case "0":
+          for (let i = 0; i <= 4; i++) {
+            if ((oAccessory = this.platform.devicesInHB.get(accessory.context.eweDeviceId + "SW" + i))) {
+              oAccessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, value);
+            }
+          }
+          break;
+        case "1":
+        case "2":
+        case "3":
+        case "4":
+          lightService.updateCharacteristic(Characteristic.On, value);
+          let masterState = "off";
+          for (let i = 1; i <= 4; i++) {
+            if ((oAccessory = this.platform.devicesInHB.get(accessory.context.eweDeviceId + "SW" + i))) {
+              if (oAccessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On).value) {
+                masterState = "on";
+              }
+            }
+          }
+          if (!this.platform.hiddenMasters.includes(accessory.context.eweDeviceId)) {
+            oAccessory = this.platform.devicesInHB.get(accessory.context.eweDeviceId + "SW0");
+            oAccessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, masterState === "on");
+          }
+          break;
+      }
+    } catch (err) {
+      this.platform.requestDeviceRefresh(accessory, err);
+    }
+  }
+  async internalBrightnessUpdate(accessory, value, callback) {
+    callback();
+    try {
+      let params = {},
+        lightService = accessory.getService(Service.Lightbulb);
+      if (value === 0) {
+        params.switch = "off";
+      } else {
+        if (!lightService.getCharacteristic(Characteristic.On).value) {
+          params.switch = "on";
+        }
+        switch (accessory.context.eweUIID) {
+          case 36: //*** KING-M4 ***\\
+            params.bright = Math.round((value * 9) / 10 + 10);
+            break;
+          case 44: //*** D1 ***\\
+            params.brightness = value;
+            params.mode = 0;
+            break;
+        }
+      }
+      await utils.sleep(250);
+      await this.platform.sendDeviceUpdate(accessory, params);
+      if (value === 0) {
+        lightService.updateCharacteristic(Characteristic.On, false);
+      } else {
+        lightService.updateCharacteristic(Characteristic.Brightness, value);
+      }
+    } catch (err) {
+      this.platform.requestDeviceRefresh(accessory, err);
+    }
+  }
+  async internalHSBUpdate(accessory, type, value, callback) {
+    callback();
+    try {
+      if (!accessory.context.reachableWAN && !accessory.context.reachableLAN) {
+        throw "it is currently offline";
+      }
+      let newRGB,
+        params = {},
+        lightService = accessory.getService(Service.Lightbulb),
+        curHue = lightService.getCharacteristic(Characteristic.Hue).value,
+        curSat = lightService.getCharacteristic(Characteristic.Saturation).value;
+      switch (type) {
+        case "hue":
+          newRGB = convert.hsv.rgb(value, curSat, 100);
+          switch (accessory.context.eweUIID) {
+            case 22: //*** B1 ***\\
+              params = {
+                zyx_mode: 2,
+                type: "middle",
+                channel0: "0",
+                channel1: "0",
+                channel2: newRGB[0].toString(),
+                channel3: newRGB[1].toString(),
+                channel4: newRGB[2].toString(),
+              };
+              break;
+            case 59: //*** L1 ***\\
+              params = {
+                mode: 1,
+                colorR: newRGB[0],
+                colorG: newRGB[1],
+                colorB: newRGB[2],
+              };
+              break;
+          }
+          break;
+        case "bri":
+          switch (accessory.context.eweUIID) {
+            case 22: //*** B1 ***\\
+              newRGB = convert.hsv.rgb(curHue, curSat, value);
+              params = {
+                zyx_mode: 2,
+                type: "middle",
+                channel0: "0",
+                channel1: "0",
+                channel2: newRGB[0].toString(),
+                channel3: newRGB[1].toString(),
+                channel4: newRGB[2].toString(),
+              };
+              break;
+            case 59: //*** L1 ***\\
+              params = {
+                mode: 1,
+                bright: value,
+              };
+              break;
+          }
+          break;
+      }
+      await utils.sleep(250);
+      await this.platform.sendDeviceUpdate(accessory, params);
+      switch (type) {
+        case "hue":
+          lightService.updateCharacteristic(Characteristic.Hue, value);
+          break;
+        case "bri":
+          lightService.updateCharacteristic(Characteristic.Brightness, value);
+          break;
+      }
+    } catch (err) {
+      this.platform.requestDeviceRefresh(accessory, err);
+    }
+  }
+  externalSingleLightUpdate(accessory, params) {
+    try {
+      let newColour,
+        mode,
+        isOn = false,
+        lightService = accessory.getService(Service.Lightbulb);
+      if (accessory.context.eweUIID === 22 && params.hasOwnProperty("state")) {
+        isOn = params.state === "on";
+      } else if (accessory.context.eweUIID !== 22 && params.hasOwnProperty("switch")) {
+        isOn = params.switch === "on";
+      } else {
+        isOn = lightService.getCharacteristic(Characteristic.On).value;
+      }
+      if (isOn) {
+        lightService.updateCharacteristic(Characteristic.On, true);
+        switch (accessory.context.eweUIID) {
+          case 36: // KING-M4
+            if (params.hasOwnProperty("bright")) {
+              let nb = Math.round(((params.bright - 10) * 10) / 9); // eWeLink scale is 10-100 and HomeKit scale is 0-100.
+              lightService.updateCharacteristic(Characteristic.Brightness, nb);
+            }
+            break;
+          case 44: // D1
+            if (params.hasOwnProperty("brightness")) {
+              lightService.updateCharacteristic(Characteristic.Brightness, params.brightness);
+            }
+            break;
+          case 22: // B1
+            if (params.hasOwnProperty("zyx_mode")) {
+              mode = parseInt(params.zyx_mode);
+            } else if (params.hasOwnProperty("channel0") && parseInt(params.channel0) + parseInt(params.channel1) > 0) {
+              mode = 1;
+            } else {
+              mode = 2;
+            }
+            if (mode === 2) {
+              lightService.updateCharacteristic(Characteristic.On, true);
+              newColour = convert.rgb.hsv(
+                parseInt(params.channel2),
+                parseInt(params.channel3),
+                parseInt(params.channel4)
+              );
+              lightService
+                .updateCharacteristic(Characteristic.Hue, newColour[0])
+                .updateCharacteristic(Characteristic.Saturation, 100)
+                .updateCharacteristic(Characteristic.Brightness, 100);
+            } else if (mode === 1) {
+              throw "has been set to white mode which is not supported";
+            }
+            break;
+          case 59: // L1
+            if (params.hasOwnProperty("bright")) {
+              lightService.updateCharacteristic(Characteristic.Brightness, params.bright);
+            }
+            if (params.hasOwnProperty("colorR")) {
+              newColour = convert.rgb.hsv(params.colorR, params.colorG, params.colorB);
+              lightService
+                .updateCharacteristic(Characteristic.Hue, newColour[0])
+                .updateCharacteristic(Characteristic.Saturation, newColour[1]);
+            }
+            break;
+          default:
+            return;
+        }
+      } else {
+        lightService.updateCharacteristic(Characteristic.On, false);
+      }
+    } catch (err) {
+      this.platform.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+    }
+  }
+  externalMultiLightUpdate(accessory, params) {
+    try {
+      let idToCheck = accessory.context.hbDeviceId.slice(0, -1),
+        primaryState = false;
+      for (let i = 1; i <= accessory.context.channelCount; i++) {
+        if (this.platform.devicesInHB.has(idToCheck + i)) {
+          let oAccessory = this.platform.devicesInHB.get(idToCheck + i);
+          oAccessory
+            .getService(Service.Lightbulb)
+            .updateCharacteristic(Characteristic.On, params.switches[i - 1].switch === "on");
+          if (params.switches[i - 1].switch === "on") {
+            primaryState = true;
+          }
+        }
+      }
+      if (!this.platform.hiddenMasters.includes(accessory.context.eweDeviceId)) {
+        accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, primaryState);
+      }
+    } catch (err) {
+      this.platform.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+    }
+  }
+};
diff --git a/lib/device/lock.js b/lib/device/lock.js
new file mode 100644
index 00000000..ac74af5e
--- /dev/null
+++ b/lib/device/lock.js
@@ -0,0 +1,67 @@
+/* jshint esversion: 9, -W014, -W030, node: true */
+"use strict";
+let Characteristic, Service;
+const utils = require("./../utils");
+module.exports = class deviceLock {
+  constructor(platform) {
+    this.platform = platform;
+    Service = platform.api.hap.Service;
+    Characteristic = platform.api.hap.Characteristic;
+  }
+  async internalLockUpdate(accessory, value, callback) {
+    callback();
+    try {
+      let lockConfig,
+        params = {
+          switch: "on",
+        },
+        lmService = accessory.getService(Service.LockMechanism);
+      if (!(lockConfig = this.platform.cusG.get(accessory.context.hbDeviceId))) {
+        throw "group config missing";
+      }
+      if (lockConfig.type !== "lock") {
+        throw "improper configuration";
+      }
+      accessory.context.inUse = true;
+      await this.platform.sendDeviceUpdate(accessory, params);
+      lmService
+        .updateCharacteristic(Characteristic.LockTargetState, 0)
+        .updateCharacteristic(Characteristic.LockCurrentState, 0);
+      await utils.sleep(lockConfig.operationTime * 100);
+      lmService
+        .updateCharacteristic(Characteristic.LockTargetState, 1)
+        .updateCharacteristic(Characteristic.LockCurrentState, 1);
+      accessory.context.inUse = false;
+    } catch (err) {
+      this.platform.requestDeviceRefresh(accessory, err);
+    }
+  }
+  externalLockUpdate(accessory, params) {
+    try {
+      let lockConfig,
+        lmService = accessory.getService(Service.LockMechanism);
+      if (!(lockConfig = this.platform.cusG.get(accessory.context.hbDeviceId))) {
+        throw "group config missing";
+      }
+      if (lockConfig.type !== "lock") {
+        throw "improper configuration";
+      }
+      if (params.switch === "off" || accessory.context.inUse) {
+        return;
+      }
+      accessory.context.inUse = true;
+      lmService
+        .updateCharacteristic(Characteristic.LockCurrentState, 0)
+        .updateCharacteristic(Characteristic.LockTargetState, 0);
+      setTimeout(() => {
+        lmService
+          .updateCharacteristic(Characteristic.LockCurrentState, 1)
+          .updateCharacteristic(Characteristic.LockTargetState, 1);
+        accessory.context.inUse = false;
+      }, parseInt(lockConfig.operationTime) * 100);
+    } catch (err) {
+      accessory.context.inUse = false;
+      this.platform.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+    }
+  }
+};
diff --git a/lib/device/outlet.js b/lib/device/outlet.js
new file mode 100644
index 00000000..a1d7145b
--- /dev/null
+++ b/lib/device/outlet.js
@@ -0,0 +1,56 @@
+/* jshint esversion: 9, -W014, -W030, node: true */
+"use strict";
+let Characteristic, EveService, Service;
+const hbLib = require("homebridge-lib");
+module.exports = class deviceOutlet {
+  constructor(platform, homebridge) {
+    this.platform = platform;
+    Service = platform.api.hap.Service;
+    Characteristic = platform.api.hap.Characteristic;
+    EveService = new hbLib.EveHomeKitTypes(platform.api);
+  }
+  async internalOutletUpdate(accessory, value, callback) {
+    callback();
+    try {
+      let params = {
+          switch: value ? "on" : "off",
+        },
+        outletService = accessory.getService(Service.Outlet);
+      await this.platform.sendDeviceUpdate(accessory, params);
+      outletService.updateCharacteristic(Characteristic.On, value);
+    } catch (err) {
+      this.platform.requestDeviceRefresh(accessory, err);
+    }
+  }
+  externalOutletUpdate(accessory, params) {
+    try {
+      let outletService = accessory.getService(Service.Outlet);
+      if (params.hasOwnProperty("switch")) {
+        outletService.updateCharacteristic(Characteristic.On, params.switch === "on");
+        if (accessory.context.eweModel === "S26" || this.platform.config.disableEveLogging || false) {
+          outletService.updateCharacteristic(Characteristic.OutletInUse, params.switch === "on");
+        }
+      }
+      if (params.hasOwnProperty("power")) {
+        outletService.updateCharacteristic(EveService.Characteristics.CurrentConsumption, parseFloat(params.power));
+        outletService.updateCharacteristic(
+          Characteristic.OutletInUse,
+          parseFloat(params.power) > (this.platform.config.inUsePowerThreshold || 0)
+        );
+        let isOn = accessory.getService(Service.Outlet).getCharacteristic(Characteristic.On).value;
+        accessory.eveLogger.addEntry({
+          time: Date.now(),
+          power: isOn ? parseFloat(params.power) : 0,
+        });
+      }
+      if (params.hasOwnProperty("voltage")) {
+        outletService.updateCharacteristic(EveService.Characteristics.Voltage, parseFloat(params.voltage));
+      }
+      if (params.hasOwnProperty("current")) {
+        outletService.updateCharacteristic(EveService.Characteristics.ElectricCurrent, parseFloat(params.current));
+      }
+    } catch (err) {
+      this.platform.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+    }
+  }
+};
diff --git a/lib/device/rf-sub.js b/lib/device/rf-sub.js
new file mode 100644
index 00000000..59dcfb06
--- /dev/null
+++ b/lib/device/rf-sub.js
@@ -0,0 +1,122 @@
+/* jshint esversion: 9, -W014, -W030, node: true */
+"use strict";
+let Characteristic, Service;
+const utils = require("./../utils");
+module.exports = class deviceRFSub {
+  constructor(platform) {
+    this.platform = platform;
+    Service = platform.api.hap.Service;
+    Characteristic = platform.api.hap.Characteristic;
+  }
+  async internalRFUpdate(accessory, rfChl, service, callback) {
+    callback();
+    try {
+      let params = {
+          cmd: "transmit",
+          rfChl: parseInt(rfChl),
+        },
+        rfService = accessory.getService(service);
+      await this.platform.sendDeviceUpdate(accessory, params);
+      rfService.updateCharacteristic(Characteristic.On, true);
+      await utils.sleep(3000);
+      rfService.updateCharacteristic(Characteristic.On, false);
+    } catch (err) {
+      this.platform.requestDeviceRefresh(accessory, err);
+    }
+  }
+  externalRFUpdate(accessory, params) {
+    try {
+      if (!params.hasOwnProperty("updateSource")) return;
+      let timeNow = new Date(),
+        oAccessory = false;
+      if (params.hasOwnProperty("cmd") && params.cmd === "transmit" && params.hasOwnProperty("rfChl")) {
+        //*** RF Button ***\\
+        // the device needed is SW% corresponding to params.rfChl
+        this.platform.devicesInHB.forEach(acc => {
+          if (
+            acc.context.eweDeviceId === accessory.context.eweDeviceId &&
+            acc.context.buttons.hasOwnProperty(params.rfChl.toString())
+          ) {
+            oAccessory = acc;
+          }
+        });
+        if (oAccessory) {
+          oAccessory.getService(oAccessory.context.buttons[params.rfChl]).updateCharacteristic(Characteristic.On, 1);
+          setTimeout(
+            () =>
+              oAccessory
+                .getService(oAccessory.context.buttons[params.rfChl])
+                .updateCharacteristic(Characteristic.On, 0),
+            3000
+          );
+        } else {
+          throw "rf button not found in Homebridge";
+        }
+      } else if (params.hasOwnProperty("cmd") && params.cmd === "trigger") {
+        //*** RF Sensor ***\\
+        Object.keys(params)
+          .filter(name => /rfTrig/.test(name))
+          .forEach(chan => {
+            this.platform.devicesInHB.forEach(acc => {
+              if (
+                acc.context.eweDeviceId === accessory.context.eweDeviceId &&
+                acc.context.buttons.hasOwnProperty(chan.substr(-1).toString())
+              ) {
+                oAccessory = acc;
+              }
+            });
+            if (oAccessory) {
+              let timeOfMotion = new Date(params[chan]),
+                diff = (timeNow.getTime() - timeOfMotion.getTime()) / 1000,
+                serv,
+                char;
+              if (diff < (this.platform.config.sensorTimeDifference || 120)) {
+                switch (oAccessory.context.sensorType) {
+                  case "button":
+                    break;
+                  case "water":
+                    serv = Service.LeakSensor;
+                    char = Characteristic.LeakDetected;
+                    break;
+                  case "fire":
+                  case "smoke":
+                    serv = Service.SmokeSensor;
+                    char = Characteristic.LeakDetected;
+                    break;
+                  case "co":
+                    serv = Service.CarbonMonoxideSensor;
+                    char = Characteristic.CarbonMonoxideDetected;
+                    break;
+                  case "co2":
+                    serv = Service.CarbonDioxideSensor;
+                    char = Characteristic.CarbonDioxideDetected;
+                    break;
+                  case "contact":
+                    serv = Service.ContactSensor;
+                    char = Characteristic.ContactSensorState;
+                    break;
+                  case "occupancy":
+                    serv = Service.OccupancySensor;
+                    char = Characteristic.OccupancyDetected;
+                    break;
+                  default:
+                    serv = Service.MotionSensor;
+                    char = Characteristic.MotionDetected;
+                    break;
+                }
+                oAccessory.getService(serv).updateCharacteristic(char, 1);
+                setTimeout(() => {
+                  oAccessory.getService(serv).updateCharacteristic(char, 0);
+                }, (this.platform.config.sensorTimeLength || 2) * 1000);
+                if (this.platform.debug) {
+                  this.platform.log("[%s] has detected [%s].", oAccessory.displayName, oAccessory.context.sensorType);
+                }
+              }
+            }
+          });
+      }
+    } catch (err) {
+      this.platform.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+    }
+  }
+};
diff --git a/lib/device/scm.js b/lib/device/scm.js
new file mode 100644
index 00000000..e424e8eb
--- /dev/null
+++ b/lib/device/scm.js
@@ -0,0 +1,32 @@
+/* jshint esversion: 9, -W014, -W030, node: true */
+"use strict";
+let Characteristic, Service;
+module.exports = class deviceSCM {
+  constructor(platform) {
+    this.platform = platform;
+    Service = platform.api.hap.Service;
+    Characteristic = platform.api.hap.Characteristic;
+  }
+
+  async internalSCMUpdate(accessory, value, callback) {
+    callback();
+    try {
+      let params = {
+          switches: this.platform.devicesInEW.get(accessory.context.eweDeviceId).params.switches,
+        },
+        switchService = accessory.getService(Service.Switch);
+      params.switches[0].switch = value ? "on" : "off";
+      await this.platform.sendDeviceUpdate(accessory, params);
+      switchService.updateCharacteristic(Characteristic.On, value);
+    } catch (err) {
+      this.platform.requestDeviceRefresh(accessory, err);
+    }
+  }
+  externalSCMUpdate(accessory, params) {
+    try {
+      accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, params.switches[0].switch === "on");
+    } catch (err) {
+      this.platform.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+    }
+  }
+};
diff --git a/lib/device/sensor.js b/lib/device/sensor.js
new file mode 100644
index 00000000..391d7f08
--- /dev/null
+++ b/lib/device/sensor.js
@@ -0,0 +1,54 @@
+/* jshint esversion: 9, -W014, -W030, node: true */
+"use strict";
+let Characteristic, Service;
+module.exports = class deviceSensor {
+  constructor(platform) {
+    this.platform = platform;
+    Service = platform.api.hap.Service;
+    Characteristic = platform.api.hap.Characteristic;
+  }
+  externalSensorUpdate(accessory, params) {
+    try {
+      if (params.hasOwnProperty("battery")) {
+        let batteryService =
+            accessory.getService(Service.BatteryService) || accessory.addService(Service.BatteryService),
+          scaledBattery = Math.round(params.battery * 33.3);
+        batteryService.updateCharacteristic(Characteristic.BatteryLevel, scaledBattery);
+        batteryService.updateCharacteristic(
+          Characteristic.StatusLowBattery,
+          scaledBattery < (this.platform.config.lowBattThreshold || 25)
+        );
+      }
+      let newState = params.switch === "on" ? 1 : 0,
+        oAccessory = false,
+        contactService = accessory.getService(Service.ContactSensor);
+      contactService.updateCharacteristic(Characteristic.ContactSensorState, newState);
+      this.platform.cusG.forEach(group => {
+        if (group.sensorId === accessory.context.eweDeviceId && group.type === "garage") {
+          if ((oAccessory = this.platform.devicesInHB.get(group.deviceId + "SWX"))) {
+            switch (newState) {
+              case 0:
+                oAccessory
+                  .getService(Service.GarageDoorOpener)
+                  .updateCharacteristic(Characteristic.TargetDoorState, 1)
+                  .updateCharacteristic(Characteristic.CurrentDoorState, 1);
+                break;
+              case 1:
+                setTimeout(() => {
+                  oAccessory
+                    .getService(Service.GarageDoorOpener)
+                    .updateCharacteristic(Characteristic.TargetDoorState, 0)
+                    .updateCharacteristic(Characteristic.CurrentDoorState, 0);
+                }, group.operationTime * 100);
+                break;
+              default:
+                throw "unknown sensor status received [" + newState + "]";
+            }
+          }
+        }
+      });
+    } catch (err) {
+      this.platform.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+    }
+  }
+};
diff --git a/lib/device/switch.js b/lib/device/switch.js
new file mode 100644
index 00000000..e446492a
--- /dev/null
+++ b/lib/device/switch.js
@@ -0,0 +1,111 @@
+/* jshint esversion: 9, -W014, -W030, node: true */
+"use strict";
+let Characteristic, Service;
+module.exports = class deviceSwitch {
+  constructor(platform) {
+    this.platform = platform;
+    Service = platform.api.hap.Service;
+    Characteristic = platform.api.hap.Characteristic;
+  }
+  async internalSwitchUpdate(accessory, value, callback) {
+    callback();
+    try {
+      let oAccessory,
+        params = {},
+        switchService = accessory.getService(Service.Switch);
+      switch (accessory.context.switchNumber) {
+        case "X":
+          params.switch = value ? "on" : "off";
+          break;
+        case "0":
+          params.switches = this.platform.devicesInEW.get(accessory.context.eweDeviceId).params.switches;
+          params.switches[0].switch = value ? "on" : "off";
+          params.switches[1].switch = value ? "on" : "off";
+          params.switches[2].switch = value ? "on" : "off";
+          params.switches[3].switch = value ? "on" : "off";
+          break;
+        case "1":
+        case "2":
+        case "3":
+        case "4":
+          params.switches = this.platform.devicesInEW.get(accessory.context.eweDeviceId).params.switches;
+          for (let i = 1; i <= 4; i++) {
+            if ((oAccessory = this.platform.devicesInHB.get(accessory.context.eweDeviceId + "SW" + i))) {
+              i === parseInt(accessory.context.switchNumber)
+                ? (params.switches[i - 1].switch = value ? "on" : "off")
+                : (params.switches[i - 1].switch = oAccessory
+                    .getService(Service.Switch)
+                    .getCharacteristic(Characteristic.On).value
+                    ? "on"
+                    : "off");
+            } else {
+              params.switches[i - 1].switch = "off";
+            }
+          }
+          break;
+      }
+      await this.platform.sendDeviceUpdate(accessory, params);
+      switch (accessory.context.switchNumber) {
+        case "X":
+          switchService.updateCharacteristic(Characteristic.On, value);
+          break;
+        case "0":
+          for (let i = 0; i <= 4; i++) {
+            if ((oAccessory = this.platform.devicesInHB.get(accessory.context.eweDeviceId + "SW" + i))) {
+              oAccessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, value);
+            }
+          }
+          break;
+        case "1":
+        case "2":
+        case "3":
+        case "4":
+          switchService.updateCharacteristic(Characteristic.On, value);
+          let masterState = "off";
+          for (let i = 1; i <= 4; i++) {
+            if ((oAccessory = this.platform.devicesInHB.get(accessory.context.eweDeviceId + "SW" + i))) {
+              if (oAccessory.getService(Service.Switch).getCharacteristic(Characteristic.On).value) {
+                masterState = "on";
+              }
+            }
+          }
+          if (!this.platform.hiddenMasters.includes(accessory.context.eweDeviceId)) {
+            oAccessory = this.platform.devicesInHB.get(accessory.context.eweDeviceId + "SW0");
+            oAccessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, masterState === "on");
+          }
+          break;
+      }
+    } catch (err) {
+      this.platform.requestDeviceRefresh(accessory, err);
+    }
+  }
+  externalSingleSwitchUpdate(accessory, params) {
+    try {
+      accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, params.switch === "on");
+    } catch (err) {
+      this.platform.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+    }
+  }
+  externalMultiSwitchUpdate(accessory, params) {
+    try {
+      let idToCheck = accessory.context.hbDeviceId.slice(0, -1),
+        primaryState = false;
+      for (let i = 1; i <= accessory.context.channelCount; i++) {
+        if (this.platform.devicesInHB.has(idToCheck + i)) {
+          let oAccessory = this.platform.devicesInHB.get(idToCheck + i);
+          oAccessory
+            .getService(Service.Switch)
+            .updateCharacteristic(Characteristic.On, params.switches[i - 1].switch === "on");
+          if (params.switches[i - 1].switch === "on") {
+            primaryState = true;
+          }
+        }
+      }
+      if (!this.platform.hiddenMasters.includes(accessory.context.eweDeviceId)) {
+        accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, primaryState);
+      }
+    } catch (err) {
+      this.platform.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+    }
+  }
+};
diff --git a/lib/device/thermostat.js b/lib/device/thermostat.js
new file mode 100644
index 00000000..dfc0baec
--- /dev/null
+++ b/lib/device/thermostat.js
@@ -0,0 +1,58 @@
+/* jshint esversion: 9, -W014, -W030, node: true */
+"use strict";
+let Characteristic, Service;
+module.exports = class deviceThermostat {
+  constructor(platform, homebridge) {
+    this.platform = platform;
+  }
+  async internalThermostatUpdate(accessory, value, callback) {
+    callback();
+    try {
+      let params = {
+          switch: value ? "on" : "off",
+          mainSwitch: value ? "on" : "off",
+        },
+        switchService = accessory.getService(Service.Switch);
+      await this.platform.sendDeviceUpdate(accessory, params);
+      switchService.updateCharacteristic(Characteristic.On, value);
+    } catch (err) {
+      this.platform.requestDeviceRefresh(accessory, err);
+    }
+  }
+  externalThermostatUpdate(accessory, params) {
+    try {
+      if (
+        !this.platform.config.hideTHSwitch &&
+        (params.hasOwnProperty("switch") || params.hasOwnProperty("mainSwitch"))
+      ) {
+        let newState = params.hasOwnProperty("switch") ? params.switch === "on" : params.mainSwitch === "on",
+          switchService = accessory.getService(Service.Switch);
+        switchService.updateCharacteristic(Characteristic.On, newState);
+      }
+      if (!(this.platform.config.disableEveLogging || false)) {
+        let eveLog = {
+          time: Date.now(),
+        };
+        if (params.hasOwnProperty("currentTemperature") && accessory.getService(Service.TemperatureSensor)) {
+          let currentTemp = params.currentTemperature !== "unavailable" ? params.currentTemperature : 0;
+          accessory
+            .getService(Service.TemperatureSensor)
+            .updateCharacteristic(Characteristic.CurrentTemperature, currentTemp);
+          eveLog.temp = parseFloat(currentTemp);
+        }
+        if (params.hasOwnProperty("currentHumidity") && accessory.getService(Service.HumiditySensor)) {
+          let currentHumi = params.currentHumidity !== "unavailable" ? params.currentHumidity : 0;
+          accessory
+            .getService(Service.HumiditySensor)
+            .updateCharacteristic(Characteristic.CurrentRelativeHumidity, currentHumi);
+          eveLog.humidity = parseFloat(currentHumi);
+        }
+        if (eveLog.hasOwnProperty("temp") || eveLog.hasOwnProperty("humidity")) {
+          accessory.eveLogger.addEntry(eveLog);
+        }
+      }
+    } catch (err) {
+      this.platform.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+    }
+  }
+};
diff --git a/lib/device/usb.js b/lib/device/usb.js
new file mode 100644
index 00000000..7d6e244f
--- /dev/null
+++ b/lib/device/usb.js
@@ -0,0 +1,31 @@
+/* jshint esversion: 9, -W014, -W030, node: true */
+"use strict";
+let Characteristic, Service;
+module.exports = class deviceUSB {
+  constructor(platform) {
+    this.platform = platform;
+    Service = platform.api.hap.Service;
+    Characteristic = platform.api.hap.Characteristic;
+  }
+  async internalUSBUpdate(accessory, value, callback) {
+    callback();
+    try {
+      let params = {
+          switches: this.platform.devicesInEW.get(accessory.context.eweDeviceId).params.switches,
+        },
+        outletService = accessory.getService(Service.Outlet);
+      params.switches[0].switch = value ? "on" : "off";
+      await this.platform.sendDeviceUpdate(accessory, params);
+      outletService.updateCharacteristic(Characteristic.On, value);
+    } catch (err) {
+      this.platform.requestDeviceRefresh(accessory, err);
+    }
+  }
+  externalUSBUpdate(accessory, params) {
+    try {
+      accessory.getService(Service.Outlet).updateCharacteristic(Characteristic.On, params.switches[0].switch === "on");
+    } catch (err) {
+      this.platform.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+    }
+  }
+};
diff --git a/lib/device/valve.js b/lib/device/valve.js
new file mode 100644
index 00000000..6336871d
--- /dev/null
+++ b/lib/device/valve.js
@@ -0,0 +1,71 @@
+/* jshint esversion: 9, -W014, -W030, node: true */
+"use strict";
+let Characteristic, Service;
+module.exports = class deviceValve {
+  constructor(platform) {
+    this.platform = platform;
+    Service = platform.api.hap.Service;
+    Characteristic = platform.api.hap.Characteristic;
+  }
+  async internalValveUpdate(accessory, valve, value, callback) {
+    callback();
+    try {
+      let params = {},
+        serviceValve = accessory.getService(valve);
+      params.switches = this.platform.devicesInEW.get(accessory.context.eweDeviceId).params.switches;
+      switch (valve) {
+        case "Valve A":
+          params.switches[0].switch = value ? "on" : "off";
+          params.switches[1].switch = accessory.getService("Valve B").getCharacteristic(Characteristic.Active).value
+            ? "on"
+            : "off";
+          break;
+        case "Valve B":
+          params.switches[0].switch = accessory.getService("Valve A").getCharacteristic(Characteristic.Active).value
+            ? "on"
+            : "off";
+          params.switches[1].switch = value ? "on" : "off";
+          break;
+      }
+      params.switches[2].switch = "off";
+      params.switches[3].switch = "off";
+      await this.platform.sendDeviceUpdate(accessory, params);
+      serviceValve.updateCharacteristic(Characteristic.Active, value).updateCharacteristic(Characteristic.InUse, value);
+      switch (value) {
+        case 0:
+          serviceValve.updateCharacteristic(Characteristic.RemainingDuration, 0);
+          clearTimeout(accessory.getService(valve).timer);
+          break;
+        case 1:
+          let timer = serviceValve.getCharacteristic(Characteristic.SetDuration).value;
+          serviceValve.updateCharacteristic(Characteristic.RemainingDuration, timer);
+          serviceValve.timer = setTimeout(() => serviceValve.setCharacteristic(Characteristic.Active, 0), timer * 1000);
+          break;
+      }
+    } catch (err) {
+      this.platform.requestDeviceRefresh(accessory, err);
+    }
+  }
+  externalValveUpdate(accessory, params) {
+    try {
+      ["A", "B"].forEach((v, k) => {
+        let valveService = accessory.getService("Valve " + v);
+        valveService
+          .updateCharacteristic(Characteristic.Active, params.switches[k].switch === "on")
+          .updateCharacteristic(Characteristic.InUse, params.switches[k].switch === "on");
+        if (params.switches[k].switch === "on") {
+          let timer = valveService.getCharacteristic(Characteristic.SetDuration).value;
+          valveService.updateCharacteristic(Characteristic.RemainingDuration, timer);
+          valveService.timer = setTimeout(() => {
+            valveService.setCharacteristic(Characteristic.Active, 0);
+          }, timer * 1000);
+        } else {
+          valveService.updateCharacteristic(Characteristic.RemainingDuration, 0);
+          clearTimeout(valveService.timer);
+        }
+      });
+    } catch (err) {
+      this.platform.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+    }
+  }
+};
diff --git a/lib/device/zb-dev.js b/lib/device/zb-dev.js
new file mode 100644
index 00000000..07e64a8f
--- /dev/null
+++ b/lib/device/zb-dev.js
@@ -0,0 +1,82 @@
+/* jshint esversion: 9, -W014, -W030, node: true */
+"use strict";
+let Characteristic, Service;
+module.exports = class deviceZBDev {
+  constructor(platform) {
+    this.platform = platform;
+    Service = platform.api.hap.Service;
+    Characteristic = platform.api.hap.Characteristic;
+  }
+  externalZBUpdate(accessory, params) {
+    try {
+      //*** credit @tasict ***\\
+      if (params.hasOwnProperty("battery")) {
+        if (accessory.context.eweUIID === 3026 && (this.platform.config.ZBDWBatt || false)) {
+          params.battery *= 10;
+        }
+        let batteryService =
+          accessory.getService(Service.BatteryService) || accessory.addService(Service.BatteryService);
+        batteryService.updateCharacteristic(Characteristic.BatteryLevel, params.battery);
+        batteryService.updateCharacteristic(
+          Characteristic.StatusLowBattery,
+          params.battery < (this.platform.config.lowBattThreshold || 25)
+        );
+      }
+      switch (accessory.context.eweUIID) {
+        case 1000:
+          if (params.hasOwnProperty("key") && [0, 1, 2].includes(params.key)) {
+            accessory
+              .getService(Service.StatelessProgrammableSwitch)
+              .updateCharacteristic(Characteristic.ProgrammableSwitchEvent, params.key);
+          }
+          break;
+        case 1770:
+          let eveLog = {
+            time: Date.now(),
+          };
+          if (params.hasOwnProperty("temperature")) {
+            let currentTemp = parseInt(params.temperature) / 100;
+            accessory
+              .getService(Service.TemperatureSensor)
+              .updateCharacteristic(Characteristic.CurrentTemperature, currentTemp);
+            eveLog.temp = parseFloat(currentTemp);
+          }
+          if (params.hasOwnProperty("humidity")) {
+            let currentHumi = parseInt(params.humidity) / 100;
+            accessory
+              .getService(Service.HumiditySensor)
+              .updateCharacteristic(Characteristic.CurrentRelativeHumidity, currentHumi);
+            eveLog.humidity = parseFloat(currentHumi);
+          }
+          if (eveLog.hasOwnProperty("temp") || eveLog.hasOwnProperty("humidity")) {
+            accessory.eveLogger.addEntry(eveLog);
+          }
+          break;
+        case 2026:
+          if (params.hasOwnProperty("motion") && params.hasOwnProperty("trigTime")) {
+            let timeNow = new Date(),
+              diff = (timeNow.getTime() - params.trigTime) / 1000;
+            accessory
+              .getService(Service.MotionSensor)
+              .updateCharacteristic(
+                Characteristic.MotionDetected,
+                params.hasOwnProperty("updateSource") &&
+                  params.motion === 1 &&
+                  diff < (this.platform.config.sensorTimeDifference || 120)
+              );
+            break;
+          }
+          break;
+        case 3026:
+          if (params.hasOwnProperty("lock") && [0, 1].includes(params.lock)) {
+            accessory
+              .getService(Service.ContactSensor)
+              .updateCharacteristic(Characteristic.ContactSensorState, params.lock);
+          }
+          break;
+      }
+    } catch (err) {
+      this.platform.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+    }
+  }
+};
diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index 53bc6241..f5ca8134 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -2,8 +2,22 @@
 "use strict";
 let Accessory, Characteristic, EveService, EveHistoryService, Service;
 const cns = require("./constants"),
-  convert = require("color-convert"),
   corrInterval = require("correcting-interval"),
+  deviceCurtain = require("./device/curtain"),
+  deviceBlind = require("./device/blind"),
+  deviceGarage = require("./device/garage"),
+  deviceLock = require("./device/lock"),
+  deviceValve = require("./device/valve"),
+  deviceSensor = require("./device/sensor"),
+  deviceFan = require("./device/fan"),
+  deviceThermostat = require("./device/thermostat"),
+  deviceOutlet = require("./device/outlet"),
+  deviceUSB = require("./device/usb"),
+  deviceSCM = require("./device/scm"),
+  deviceLight = require("./device/light"),
+  deviceSwitch = require("./device/switch"),
+  deviceRFSub = require("./device/rf-sub"),
+  deviceZBDev = require("./device/zb-dev"),
   eWeLinkHTTP = require("./eWeLinkHTTP"),
   eWeLinkWS = require("./eWeLinkWS"),
   eWeLinkLAN = require("./eWeLinkLAN"),
@@ -169,9 +183,9 @@ class eWeLink {
     }
     //*** SINGLE LOCKS ***\\
     else if (this.cusG.has(device.deviceid + "SWX") && this.cusG.get(device.deviceid + "SWX").type === "lock") {
-      let lockConfig = (accessory = this.devicesInHB.has(device.deviceid + "SWX")
+      accessory = this.devicesInHB.has(device.deviceid + "SWX")
         ? this.devicesInHB.get(device.deviceid + "SWX")
-        : this.addAccessory(device, device.deviceid + "SWX", "lock"));
+        : this.addAccessory(device, device.deviceid + "SWX", "lock");
     }
     //*** SENSORS (DW2) ***\\
     else if (cns.devicesSensor.includes(device.extra.uiid)) {
@@ -504,35 +518,8 @@ class eWeLink {
       accessory.context.reachableWAN = true;
       accessory.context.reachableLAN = true;
       switch (accessory.context.type) {
-        case "valve":
-          ["A", "B"].forEach(v => {
-            let valveService;
-            if (!(valveService = accessory.getService("Valve " + v))) {
-              accessory
-                .addService(Service.Valve, "Valve " + v, "valve" + v.toLowerCase())
-                .setCharacteristic(Characteristic.Active, 0)
-                .setCharacteristic(Characteristic.InUse, 0)
-                .setCharacteristic(Characteristic.ValveType, 1)
-                .setCharacteristic(Characteristic.SetDuration, this.config.valveTimeLength || 120)
-                .addCharacteristic(Characteristic.RemainingDuration);
-              valveService = accessory.getService("Valve " + v);
-            }
-            valveService
-              .getCharacteristic(Characteristic.Active)
-              .on("set", (value, callback) => this.internalValveUpdate(accessory, "Valve " + v, value, callback));
-            valveService.getCharacteristic(Characteristic.SetDuration).on("set", (value, callback) => {
-              if (valveService.getCharacteristic(Characteristic.InUse).value) {
-                valveService.updateCharacteristic(Characteristic.RemainingDuration, value);
-                clearTimeout(valveService.timer);
-                valveService.timer = setTimeout(() => {
-                  valveService.setCharacteristic(Characteristic.Active, 0);
-                }, value * 1000);
-              }
-              callback();
-            });
-          });
-          break;
         case "curtain":
+          accessory.control = new deviceCurtain(this);
           let cService;
           if (!(cService = accessory.getService(Service.WindowCovering))) {
             accessory
@@ -544,9 +531,10 @@ class eWeLink {
           }
           cService
             .getCharacteristic(Characteristic.TargetPosition)
-            .on("set", (value, callback) => this.internalCurtainUpdate(accessory, value, callback));
+            .on("set", (value, callback) => accessory.control.internalCurtainUpdate(accessory, value, callback));
           break;
         case "blind":
+          accessory.control = new deviceBlind(this);
           let wcService;
           if (!(wcService = accessory.getService(Service.WindowCovering))) {
             accessory
@@ -558,9 +546,10 @@ class eWeLink {
           }
           wcService
             .getCharacteristic(Characteristic.TargetPosition)
-            .on("set", (value, callback) => this.internalBlindUpdate(accessory, value, callback));
+            .on("set", (value, callback) => accessory.control.internalBlindUpdate(accessory, value, callback));
           break;
         case "garage":
+          accessory.control = new deviceGarage(this);
           let gdService;
           if (!(gdService = accessory.getService(Service.GarageDoorOpener))) {
             accessory
@@ -572,35 +561,70 @@ class eWeLink {
           }
           gdService
             .getCharacteristic(Characteristic.TargetDoorState)
-            .on("set", (value, callback) => this.internalGarageUpdate(accessory, value, callback));
+            .on("set", (value, callback) => accessory.control.internalGarageUpdate(accessory, value, callback));
           break;
         case "lock":
+          accessory.control = new deviceLock(this);
           let lmService = accessory.getService(Service.LockMechanism) || accessory.addService(Service.LockMechanism);
           lmService
             .getCharacteristic(Characteristic.LockTargetState)
-            .on("set", (value, callback) => this.internalLockUpdate(accessory, value, callback));
+            .on("set", (value, callback) => accessory.control.internalLockUpdate(accessory, value, callback));
+          break;
+        case "valve":
+          accessory.control = new deviceValve(this);
+          ["A", "B"].forEach(v => {
+            let valveService;
+            if (!(valveService = accessory.getService("Valve " + v))) {
+              accessory
+                .addService(Service.Valve, "Valve " + v, "valve" + v.toLowerCase())
+                .setCharacteristic(Characteristic.Active, 0)
+                .setCharacteristic(Characteristic.InUse, 0)
+                .setCharacteristic(Characteristic.ValveType, 1)
+                .setCharacteristic(Characteristic.SetDuration, this.config.valveTimeLength || 120)
+                .addCharacteristic(Characteristic.RemainingDuration);
+              valveService = accessory.getService("Valve " + v);
+            }
+            valveService
+              .getCharacteristic(Characteristic.Active)
+              .on("set", (value, callback) =>
+                accessory.control.internalValveUpdate(accessory, "Valve " + v, value, callback)
+              );
+            valveService.getCharacteristic(Characteristic.SetDuration).on("set", (value, callback) => {
+              if (valveService.getCharacteristic(Characteristic.InUse).value) {
+                valveService.updateCharacteristic(Characteristic.RemainingDuration, value);
+                clearTimeout(valveService.timer);
+                valveService.timer = setTimeout(() => {
+                  valveService.setCharacteristic(Characteristic.Active, 0);
+                }, value * 1000);
+              }
+              callback();
+            });
+          });
           break;
         case "sensor":
+          accessory.control = new deviceSensor(this);
           accessory.getService(Service.ContactSensor) || accessory.addService(Service.ContactSensor);
           accessory.getService(Service.BatteryService) || accessory.addService(Service.BatteryService);
           break;
         case "fan":
+          accessory.control = new deviceFan(this);
           let fanService = accessory.getService(Service.Fanv2) || accessory.addService(Service.Fanv2),
             fanLightService = accessory.getService(Service.Lightbulb) || accessory.addService(Service.Lightbulb);
           fanService
             .getCharacteristic(Characteristic.Active)
-            .on("set", (value, callback) => this.internalFanUpdate(accessory, "power", value, callback));
+            .on("set", (value, callback) => accessory.control.internalFanUpdate(accessory, "power", value, callback));
           fanService
             .getCharacteristic(Characteristic.RotationSpeed)
-            .on("set", (value, callback) => this.internalFanUpdate(accessory, "speed", value, callback))
+            .on("set", (value, callback) => accessory.control.internalFanUpdate(accessory, "speed", value, callback))
             .setProps({
               minStep: 33,
             });
           fanLightService
             .getCharacteristic(Characteristic.On)
-            .on("set", (value, callback) => this.internalFanUpdate(accessory, "light", value, callback));
+            .on("set", (value, callback) => accessory.control.internalFanUpdate(accessory, "light", value, callback));
           break;
         case "thermostat":
+          accessory.control = new deviceThermostat(this);
           let tempService =
               accessory.getService(Service.TemperatureSensor) || accessory.addService(Service.TemperatureSensor),
             humiService = false;
@@ -615,7 +639,7 @@ class eWeLink {
             let switchService = accessory.getService(Service.Switch) || accessory.addService(Service.Switch);
             switchService
               .getCharacteristic(Characteristic.On)
-              .on("set", (value, callback) => this.internalThermostatUpdate(accessory, value, callback));
+              .on("set", (value, callback) => accessory.control.internalThermostatUpdate(accessory, value, callback));
           }
           if (!(this.config.disableEveLogging || false)) {
             accessory.log = this.log;
@@ -637,6 +661,7 @@ class eWeLink {
           }
           break;
         case "outlet":
+          accessory.control = new deviceOutlet(this);
           let outletService;
           if (!(outletService = accessory.getService(Service.Outlet))) {
             accessory.addService(Service.Outlet);
@@ -660,7 +685,7 @@ class eWeLink {
           }
           outletService
             .getCharacteristic(Characteristic.On)
-            .on("set", (value, callback) => this.internalOutletUpdate(accessory, value, callback));
+            .on("set", (value, callback) => accessory.control.internalOutletUpdate(accessory, value, callback));
           if (accessory.context.eweModel !== "S26" && !(this.config.disableEveLogging || false)) {
             accessory.log = this.log;
             accessory.eveLogger = new EveHistoryService("energy", accessory, {
@@ -729,61 +754,66 @@ class eWeLink {
           }
           break;
         case "usb":
+          accessory.control = new deviceUSB(this);
           let usbService = accessory.getService(Service.Outlet) || accessory.addService(Service.Outlet);
           usbService
             .getCharacteristic(Characteristic.On)
-            .on("set", (value, callback) => this.internalUSBUpdate(accessory, value, callback));
+            .on("set", (value, callback) => accessory.control.internalUSBUpdate(accessory, value, callback));
           break;
         case "scm":
+          accessory.control = new deviceSCM(this);
           let scmService = accessory.getService(Service.Switch) || accessory.addService(Service.Switch);
           scmService
             .getCharacteristic(Characteristic.On)
-            .on("set", (value, callback) => this.internalSCMUpdate(accessory, value, callback));
+            .on("set", (value, callback) => accessory.control.internalSCMUpdate(accessory, value, callback));
           break;
         case "light":
+          accessory.control = new deviceLight(this);
           let lightService = accessory.getService(Service.Lightbulb) || accessory.addService(Service.Lightbulb);
           lightService
             .getCharacteristic(Characteristic.On)
-            .on("set", (value, callback) => this.internalLightbulbUpdate(accessory, value, callback));
+            .on("set", (value, callback) => accessory.control.internalLightbulbUpdate(accessory, value, callback));
           if (cns.devicesBrightable.includes(accessory.context.eweUIID)) {
             lightService.getCharacteristic(Characteristic.Brightness).on("set", (value, callback) => {
               if (value > 0) {
                 if (!lightService.getCharacteristic(Characteristic.On).value) {
-                  this.internalLightbulbUpdate(accessory, true, function () {
+                  accessory.control.internalLightbulbUpdate(accessory, true, function () {
                     return;
                   });
                 }
-                this.internalBrightnessUpdate(accessory, value, callback);
+                accessory.control.internalBrightnessUpdate(accessory, value, callback);
               } else {
-                this.internalLightbulbUpdate(accessory, false, callback);
+                accessory.control.internalLightbulbUpdate(accessory, false, callback);
               }
             });
           } else if (cns.devicesColourable.includes(accessory.context.eweUIID)) {
             lightService.getCharacteristic(Characteristic.Brightness).on("set", (value, callback) => {
               if (value > 0) {
                 if (!lightService.getCharacteristic(Characteristic.On).value) {
-                  this.internalLightbulbUpdate(accessory, true, function () {
+                  accessory.control.internalLightbulbUpdate(accessory, true, function () {
                     return;
                   });
                 }
-                this.internalHSBUpdate(accessory, "bri", value, callback);
+                accessory.control.internalHSBUpdate(accessory, "bri", value, callback);
               } else {
-                this.internalLightbulbUpdate(accessory, false, callback);
+                accessory.control.internalLightbulbUpdate(accessory, false, callback);
               }
             });
             lightService
               .getCharacteristic(Characteristic.Hue)
-              .on("set", (value, callback) => this.internalHSBUpdate(accessory, "hue", value, callback));
+              .on("set", (value, callback) => accessory.control.internalHSBUpdate(accessory, "hue", value, callback));
             lightService.getCharacteristic(Characteristic.Saturation).on("set", (value, callback) => callback());
           }
           break;
         case "switch":
+          accessory.control = new deviceSwitch(this);
           let switchService = accessory.getService(Service.Switch) || accessory.addService(Service.Switch);
           switchService
             .getCharacteristic(Characteristic.On)
-            .on("set", (value, callback) => this.internalSwitchUpdate(accessory, value, callback));
+            .on("set", (value, callback) => accessory.control.internalSwitchUpdate(accessory, value, callback));
           break;
         case "rf_sub":
+          accessory.control = new deviceRFSub(this);
           switch (accessory.context.subType) {
             case "water":
               accessory.getService(Service.LeakSensor) || accessory.addService(Service.LeakSensor);
@@ -815,13 +845,14 @@ class eWeLink {
                   .getService(name)
                   .getCharacteristic(Characteristic.On)
                   .on("set", (value, callback) => {
-                    value ? this.internalRFUpdate(accessory, chan, name, callback) : callback();
+                    value ? accessory.control.internalRFUpdate(accessory, chan, name, callback) : callback();
                   });
               });
               break;
           }
           break;
         case "zb_dev": //*** credit @tasict ***\\
+          accessory.control = new deviceZBDev(this);
           accessory.getService(Service.BatteryService) || accessory.addService(Service.BatteryService);
           switch (accessory.context.eweUIID) {
             case 1000:
@@ -872,60 +903,57 @@ class eWeLink {
     switch (accessory.context.type) {
       case "valve":
         if (Object.keys(newParams).some(v => cns.devicesValveParams.includes(v)) && Array.isArray(newParams.switches)) {
-          this.externalValveUpdate(accessory, newParams);
+          accessory.control.externalValveUpdate(accessory, newParams);
         }
         return true;
       case "curtain":
         if (Object.keys(newParams).some(v => cns.devicesCurtainParams.includes(v))) {
-          this.externalCurtainUpdate(accessory, newParams);
+          accessory.control.externalCurtainUpdate(accessory, newParams);
         }
         return true;
       case "blind":
-        if (Object.keys(newParams).some(v => cns.devicesBlindParams.includes(v)) && Array.isArray(newParams.switches)) {
-          this.externalBlindUpdate(accessory, newParams);
-        }
         return true;
       case "garage":
         if (
           Object.keys(newParams).some(v => cns.devicesGarageParams.includes(v)) &&
           Array.isArray(newParams.switches)
         ) {
-          this.externalGarageUpdate(accessory, newParams);
+          accessory.control.externalGarageUpdate(accessory, newParams);
         }
         return true;
       case "lock":
         if (Object.keys(newParams).some(v => cns.devicesLockParams.includes(v))) {
-          this.externalLockUpdate(accessory, newParams);
+          accessory.control.externalLockUpdate(accessory, newParams);
         }
         return true;
       case "sensor":
         if (Object.keys(newParams).some(v => cns.devicesSensorParams.includes(v))) {
-          this.externalSensorUpdate(accessory, newParams);
+          accessory.control.externalSensorUpdate(accessory, newParams);
         }
         return true;
       case "fan":
         if (Object.keys(newParams).some(v => cns.devicesFanParams.includes(v))) {
-          this.externalFanUpdate(accessory, newParams);
+          accessory.control.externalFanUpdate(accessory, newParams);
         }
         return true;
       case "thermostat":
         if (Object.keys(newParams).some(v => cns.devicesThermostatParams.includes(v))) {
-          this.externalThermostatUpdate(accessory, newParams);
+          accessory.control.externalThermostatUpdate(accessory, newParams);
         }
         return true;
       case "outlet":
         if (Object.keys(newParams).some(v => cns.devicesOutletParams.includes(v))) {
-          this.externalOutletUpdate(accessory, newParams);
+          accessory.control.externalOutletUpdate(accessory, newParams);
         }
         return true;
       case "usb":
         if (Object.keys(newParams).some(v => cns.devicesUSBParams.includes(v)) && Array.isArray(newParams.switches)) {
-          this.externalUSBUpdate(accessory, newParams);
+          accessory.control.externalUSBUpdate(accessory, newParams);
         }
         return true;
       case "scm":
         if (Object.keys(newParams).some(v => cns.devicesSCMParams.includes(v)) && Array.isArray(newParams.switches)) {
-          this.externalSCMUpdate(accessory, newParams);
+          accessory.control.externalSCMUpdate(accessory, newParams);
         }
         return true;
       case "light":
@@ -934,7 +962,7 @@ class eWeLink {
           cns.devicesSingleSwitchLight.includes(accessory.context.eweModel)
         ) {
           if (Object.keys(newParams).some(v => cns.devicesSingleSwitchLightParams.includes(v))) {
-            this.externalSingleLightUpdate(accessory, newParams);
+            accessory.control.externalSingleLightUpdate(accessory, newParams);
           }
         } else if (
           cns.devicesMultiSwitch.includes(accessory.context.eweUIID) &&
@@ -944,34 +972,34 @@ class eWeLink {
             Object.keys(newParams).some(v => cns.devicesMultiSwitchLightParams.includes(v)) &&
             Array.isArray(newParams.switches)
           ) {
-            this.externalMultiLightUpdate(accessory, newParams);
+            accessory.control.externalMultiLightUpdate(accessory, newParams);
           }
         }
         return true;
       case "switch":
         if (cns.devicesSingleSwitch.includes(accessory.context.eweUIID)) {
           if (Object.keys(newParams).some(v => cns.devicesSingleSwitchParams.includes(v))) {
-            this.externalSingleSwitchUpdate(accessory, newParams);
+            accessory.control.externalSingleSwitchUpdate(accessory, newParams);
           }
         } else if (cns.devicesMultiSwitch.includes(accessory.context.eweUIID)) {
           if (
             Object.keys(newParams).some(v => cns.devicesMultiSwitchParams.includes(v)) &&
             Array.isArray(newParams.switches)
           ) {
-            this.externalMultiSwitchUpdate(accessory, newParams);
+            accessory.control.externalMultiSwitchUpdate(accessory, newParams);
           }
         }
         return true;
       case "rf_pri":
         if (Object.keys(newParams).some(v => cns.devicesRFBridgeParams.includes(v))) {
-          this.externalRFUpdate(accessory, newParams);
+          accessory.control.externalRFUpdate(accessory, newParams);
         }
         return true;
       case "rf_sub":
         return true;
       case "zb_dev":
         if (Object.keys(newParams).some(v => cns.devicesZBBridgeParams.includes(v))) {
-          this.externalZBUpdate(accessory, newParams);
+          accessory.control.externalZBUpdate(accessory, newParams);
         }
         return true;
       default:
@@ -1100,1163 +1128,6 @@ class eWeLink {
       this.log.warn("[%s] Homebridge state will be synced once the device comes back online.", accessory.displayName);
     }
   }
-  async internalValveUpdate(accessory, valve, value, callback) {
-    callback();
-    try {
-      let params = {},
-        serviceValve = accessory.getService(valve);
-      params.switches = this.devicesInEW.get(accessory.context.eweDeviceId).params.switches;
-      switch (valve) {
-        case "Valve A":
-          params.switches[0].switch = value ? "on" : "off";
-          params.switches[1].switch = accessory.getService("Valve B").getCharacteristic(Characteristic.Active).value
-            ? "on"
-            : "off";
-          break;
-        case "Valve B":
-          params.switches[0].switch = accessory.getService("Valve A").getCharacteristic(Characteristic.Active).value
-            ? "on"
-            : "off";
-          params.switches[1].switch = value ? "on" : "off";
-          break;
-      }
-      params.switches[2].switch = "off";
-      params.switches[3].switch = "off";
-      await this.sendDeviceUpdate(accessory, params);
-      serviceValve.updateCharacteristic(Characteristic.Active, value).updateCharacteristic(Characteristic.InUse, value);
-      switch (value) {
-        case 0:
-          serviceValve.updateCharacteristic(Characteristic.RemainingDuration, 0);
-          clearTimeout(accessory.getService(valve).timer);
-          break;
-        case 1:
-          let timer = serviceValve.getCharacteristic(Characteristic.SetDuration).value;
-          serviceValve.updateCharacteristic(Characteristic.RemainingDuration, timer);
-          serviceValve.timer = setTimeout(() => serviceValve.setCharacteristic(Characteristic.Active, 0), timer * 1000);
-          break;
-      }
-    } catch (err) {
-      this.requestDeviceRefresh(accessory, err);
-    }
-  }
-  externalValveUpdate(accessory, params) {
-    try {
-      ["A", "B"].forEach((v, k) => {
-        let valveService = accessory.getService("Valve " + v);
-        valveService
-          .updateCharacteristic(Characteristic.Active, params.switches[k].switch === "on")
-          .updateCharacteristic(Characteristic.InUse, params.switches[k].switch === "on");
-        if (params.switches[k].switch === "on") {
-          let timer = valveService.getCharacteristic(Characteristic.SetDuration).value;
-          valveService.updateCharacteristic(Characteristic.RemainingDuration, timer);
-          valveService.timer = setTimeout(() => {
-            valveService.setCharacteristic(Characteristic.Active, 0);
-          }, timer * 1000);
-        } else {
-          valveService.updateCharacteristic(Characteristic.RemainingDuration, 0);
-          clearTimeout(valveService.timer);
-        }
-      });
-    } catch (err) {
-      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
-    }
-  }
-  async internalCurtainUpdate(accessory, value, callback) {
-    callback();
-    try {
-      let params,
-        cService = accessory.getService(Service.WindowCovering),
-        prevPos = accessory.context.cacheCurrentPosition,
-        newPos = value;
-      if (newPos === prevPos) return;
-      if (newPos === 0 || newPos === 100) {
-        params = {
-          switch: newPos === 100 ? "on" : "off",
-        };
-      } else {
-        params = {
-          setclose: Math.abs(100 - newPos),
-        };
-      }
-      await this.sendDeviceUpdate(accessory, params);
-      cService
-        .updateCharacteristic(Characteristic.TargetPosition, newPos)
-        .updateCharacteristic(Characteristic.PositionState, newPos > prevPos ? 1 : 0);
-      accessory.context.cacheCurrentPosition = newPos;
-    } catch (err) {
-      this.requestDeviceRefresh(accessory, err);
-    }
-  }
-  externalCurtainUpdate(accessory, params) {
-    try {
-      let cService = accessory.getService(Service.WindowCovering);
-      if (params.hasOwnProperty("switch") && params.hasOwnProperty("setclose")) {
-        let newPos = Math.abs(100 - parseInt(params.setclose));
-        cService
-          .updateCharacteristic(Characteristic.TargetPosition, newPos)
-          .updateCharacteristic(Characteristic.CurrentPosition, newPos)
-          .updateCharacteristic(Characteristic.PositionState, 2);
-        accessory.context.cacheCurrentPosition = newPos;
-        return;
-      }
-    } catch (err) {
-      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
-    }
-  }
-  async internalBlindUpdate(accessory, value, callback) {
-    callback();
-    try {
-      let blindConfig,
-        params = {},
-        wcService = accessory.getService(Service.WindowCovering),
-        prevState = accessory.context.cachePositionState,
-        prevPosition = accessory.context.cacheCurrentPosition,
-        newTarget = value,
-        updateKey = Math.random().toString(36).substr(2, 8);
-      if (!(blindConfig = this.cusG.get(accessory.context.hbDeviceId))) {
-        throw "group config missing";
-      }
-      if (blindConfig.type !== "blind" || blindConfig.setup !== "twoSwitch") {
-        throw "improper configuration";
-      }
-      if (newTarget === prevPosition) return;
-      params.switches = cns.defaultMultiSwitchOff;
-      accessory.context.updateKey = updateKey;
-      let percentStepPerDecisecond = blindConfig.operationTime / 100;
-      if (prevState !== 2) {
-        await this.sendDeviceUpdate(accessory, params);
-        let positionPercentChange = Math.round(
-          Math.floor(Date.now() / 100) - accessory.context.cacheLastStartTime * percentStepPerDecisecond
-        );
-        if ((prevState === 0 && newTarget > prevPosition) || (prevState === 1 && newTarget < prevPosition)) {
-          prevPosition += positionPercentChange;
-        } else {
-          prevPosition -= positionPercentChange;
-        }
-        wcService.updateCharacteristic(Characteristic.CurrentPosition, prevPosition);
-        accessory.context.cacheCurrentPosition = prevPosition;
-      }
-      let diffPosition = newTarget - prevPosition;
-      let setToMoveUp = diffPosition > 0;
-      let decisecondsToMove = Math.round(Math.abs(diffPosition) * percentStepPerDecisecond);
-      params.switches[0].switch = setToMoveUp ? "on" : "off";
-      params.switches[1].switch = setToMoveUp ? "off" : "on";
-      await this.sendDeviceUpdate(accessory, params);
-      wcService
-        .updateCharacteristic(Characteristic.TargetPosition, newTarget)
-        .updateCharacteristic(Characteristic.PositionState, setToMoveUp);
-      accessory.context.cacheTargetPosition = newTarget;
-      accessory.context.cachePositionState = setToMoveUp;
-      accessory.context.cacheLastStartTime = Math.floor(Date.now() / 100);
-      this.log.warn(decisecondsToMove + " movement time in deciseconds");
-      await utils.sleep(decisecondsToMove * 100);
-      if (accessory.context.updateKey === updateKey) {
-        params.switches[0].switch = "off";
-        params.switches[1].switch = "off";
-        await this.sendDeviceUpdate(accessory, params);
-        wcService.updateCharacteristic(Characteristic.PositionState, 2);
-        wcService.updateCharacteristic(Characteristic.CurrentPosition, newTarget);
-        accessory.context.cachePositionState = 2;
-        accessory.context.cacheCurrentPosition = newTarget;
-      }
-    } catch (err) {
-      this.requestDeviceRefresh(accessory, err);
-    }
-  }
-  externalBlindUpdate(accessory, params) {
-    try {
-    } catch (err) {
-      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
-    }
-  }
-  async internalGarageUpdate(accessory, value, callback) {
-    callback();
-    try {
-      let garageConfig;
-      if (!(garageConfig = this.cusG.get(accessory.context.hbDeviceId))) {
-        throw "group config missing";
-      }
-      if (garageConfig.type !== "garage" || !["oneSwitch", "twoSwitch"].includes(garageConfig.setup)) {
-        throw "improper configuration";
-      }
-      let sensorDefinition = garageConfig.sensorId || false,
-        sAccessory = false,
-        prevState,
-        newPos = value,
-        params = {},
-        delay = 0,
-        gdService = accessory.getService(Service.GarageDoorOpener);
-      if (sensorDefinition && !(sAccessory = this.devicesInHB.get(garageConfig.sensorId + "SWX"))) {
-        throw "defined DW2 sensor doesn't exist";
-      }
-      if (sensorDefinition && sAccessory.context.type !== "sensor") {
-        throw "defined DW2 sensor isn't a sensor";
-      }
-      prevState = sAccessory
-        ? sAccessory.getService(Service.ContactSensor).getCharacteristic(Characteristic.ContactSensorState).value === 0
-          ? 1
-          : 0
-        : accessory.context.cacheCurrentDoorState;
-      if (newPos === prevState % 2) return;
-      accessory.context.inUse = true;
-      accessory.context.state = value;
-      if (garageConfig.setup === "oneSwitch" && [2, 3].includes(prevState)) {
-        gdService.updateCharacteristic(Characteristic.CurrentDoorState, ((prevState * 2) % 3) + 2);
-        accessory.context.cacheCurrentDoorState = ((prevState * 2) % 3) + 2;
-        delay = 1500;
-      }
-      if (accessory.context.state !== newPos) return;
-      await utils.sleep(delay);
-      gdService
-        .updateCharacteristic(Characteristic.TargetDoorState, newPos)
-        .updateCharacteristic(Characteristic.CurrentDoorState, newPos + 2);
-      accessory.context.cacheTargetDoorState = newPos;
-      accessory.context.cacheCurrentDoorState = newPos + 2;
-      switch (garageConfig.setup) {
-        case "oneSwitch":
-          params.switch = "on";
-          break;
-        case "twoSwitch":
-          params.switches = this.devicesInEW.get(accessory.context.eweDeviceId).params.switches;
-          params.switches[0].switch = newPos === 0 ? "on" : "off";
-          params.switches[1].switch = newPos === 1 ? "on" : "off";
-          break;
-      }
-      await this.sendDeviceUpdate(accessory, params);
-      await utils.sleep(garageConfig.operationTime * 100);
-      if (!sAccessory) {
-        gdService.updateCharacteristic(Characteristic.CurrentDoorState, newPos);
-        accessory.context.cacheCurrentDoorState = newPos;
-      }
-      accessory.context.inUse = false;
-    } catch (err) {
-      this.requestDeviceRefresh(accessory, err);
-    }
-  }
-  externalGarageUpdate(accessory, params) {
-    try {
-      let garageConfig,
-        gcService = accessory.getService(Service.GarageDoorOpener),
-        prevState = accessory.context.cacheCurrentDoorState,
-        newPos = [0, 2].includes(prevState) ? 3 : 2;
-      if (!(garageConfig = this.cusG.get(accessory.context.hbDeviceId))) {
-        throw "group config missing";
-      }
-      if (garageConfig.type !== "garage" || !["oneSwitch", "twoSwitch"].includes(garageConfig.setup)) {
-        throw "improper configuration";
-      }
-      if (accessory.context.inUse || garageConfig.sensorId) {
-        return;
-      }
-      switch (garageConfig.setup) {
-        case "oneSwitch":
-          if (params.switch === "off") {
-            return;
-          }
-          break;
-        case "twoSwitch":
-          if (
-            params.switches[0].switch === params.switches[1].switch ||
-            params.switches[prevState % 2].switch === "on"
-          ) {
-            return;
-          }
-          break;
-      }
-      accessory.context.inUse = true;
-      if (!garageConfig.sensorId) {
-        gcService
-          .updateCharacteristic(Characteristic.CurrentDoorState, newPos)
-          .updateCharacteristic(Characteristic.TargetDoorState, newPos - 2);
-        accessory.context.cacheCurrentDoorState = newPos;
-        accessory.context.cacheTargetDoorState = newPos - 2;
-        setTimeout(() => {
-          gcService.updateCharacteristic(Characteristic.CurrentDoorState, newPos - 2);
-          accessory.context.cacheCurrentDoorState = newPos - 2;
-        }, parseInt(garageConfig.operationTime) * 100);
-      }
-      setTimeout(() => {
-        accessory.context.inUse = false;
-      }, parseInt(garageConfig.operationTime) * 100);
-    } catch (err) {
-      accessory.context.inUse = false;
-      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
-    }
-  }
-  async internalLockUpdate(accessory, value, callback) {
-    callback();
-    try {
-      let lockConfig,
-        params = {
-          switch: "on",
-        },
-        lmService = accessory.getService(Service.LockMechanism);
-      if (!(lockConfig = this.cusG.get(accessory.context.hbDeviceId))) {
-        throw "group config missing";
-      }
-      if (lockConfig.type !== "lock") {
-        throw "improper configuration";
-      }
-      accessory.context.inUse = true;
-      await this.sendDeviceUpdate(accessory, params);
-      lmService
-        .updateCharacteristic(Characteristic.LockTargetState, 0)
-        .updateCharacteristic(Characteristic.LockCurrentState, 0);
-      await utils.sleep(lockConfig.operationTime * 100);
-      lmService
-        .updateCharacteristic(Characteristic.LockTargetState, 1)
-        .updateCharacteristic(Characteristic.LockCurrentState, 1);
-      accessory.context.inUse = false;
-    } catch (err) {
-      this.requestDeviceRefresh(accessory, err);
-    }
-  }
-  externalLockUpdate(accessory, params) {
-    try {
-      let lockConfig,
-        lmService = accessory.getService(Service.LockMechanism);
-      if (!(lockConfig = this.cusG.get(accessory.context.hbDeviceId))) {
-        throw "group config missing";
-      }
-      if (lockConfig.type !== "lock") {
-        throw "improper configuration";
-      }
-      if (params.switch === "off" || accessory.context.inUse) {
-        return;
-      }
-      accessory.context.inUse = true;
-      lmService
-        .updateCharacteristic(Characteristic.LockCurrentState, 0)
-        .updateCharacteristic(Characteristic.LockTargetState, 0);
-      setTimeout(() => {
-        lmService
-          .updateCharacteristic(Characteristic.LockCurrentState, 1)
-          .updateCharacteristic(Characteristic.LockTargetState, 1);
-        accessory.context.inUse = false;
-      }, parseInt(lockConfig.operationTime) * 100);
-    } catch (err) {
-      accessory.context.inUse = false;
-      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
-    }
-  }
-  externalSensorUpdate(accessory, params) {
-    try {
-      if (params.hasOwnProperty("battery")) {
-        let batteryService =
-            accessory.getService(Service.BatteryService) || accessory.addService(Service.BatteryService),
-          scaledBattery = Math.round(params.battery * 33.3);
-        batteryService.updateCharacteristic(Characteristic.BatteryLevel, scaledBattery);
-        batteryService.updateCharacteristic(
-          Characteristic.StatusLowBattery,
-          scaledBattery < (this.config.lowBattThreshold || 25)
-        );
-      }
-      let newState = params.switch === "on" ? 1 : 0,
-        oAccessory = false,
-        contactService = accessory.getService(Service.ContactSensor);
-      contactService.updateCharacteristic(Characteristic.ContactSensorState, newState);
-      this.cusG.forEach(group => {
-        if (group.sensorId === accessory.context.eweDeviceId && group.type === "garage") {
-          if ((oAccessory = this.devicesInHB.get(group.deviceId + "SWX"))) {
-            switch (newState) {
-              case 0:
-                oAccessory
-                  .getService(Service.GarageDoorOpener)
-                  .updateCharacteristic(Characteristic.TargetDoorState, 1)
-                  .updateCharacteristic(Characteristic.CurrentDoorState, 1);
-                break;
-              case 1:
-                setTimeout(() => {
-                  oAccessory
-                    .getService(Service.GarageDoorOpener)
-                    .updateCharacteristic(Characteristic.TargetDoorState, 0)
-                    .updateCharacteristic(Characteristic.CurrentDoorState, 0);
-                }, group.operationTime * 100);
-                break;
-              default:
-                throw "unknown sensor status received [" + newState + "]";
-            }
-          }
-        }
-      });
-    } catch (err) {
-      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
-    }
-  }
-  async internalFanUpdate(accessory, type, value, callback) {
-    callback();
-    try {
-      let newPower,
-        newSpeed,
-        newLight,
-        lightService = accessory.getService(Service.Lightbulb),
-        fanService = accessory.getService(Service.Fanv2);
-      switch (type) {
-        case "power":
-          newPower = value;
-          newSpeed = value ? 33 : 0;
-          newLight = lightService.getCharacteristic(Characteristic.On).value;
-          break;
-        case "speed":
-          newPower = value >= 33 ? 1 : 0;
-          newSpeed = value;
-          newLight = lightService.getCharacteristic(Characteristic.On).value;
-          break;
-        case "light":
-          newPower = fanService.getCharacteristic(Characteristic.Active).value;
-          newSpeed = fanService.getCharacteristic(Characteristic.RotationSpeed).value;
-          newLight = value;
-          break;
-      }
-      let params = {
-        switches: this.devicesInEW.get(accessory.context.eweDeviceId).params.switches,
-      };
-      params.switches[0].switch = newLight ? "on" : "off";
-      params.switches[1].switch = newPower === 1 && newSpeed >= 33 ? "on" : "off";
-      params.switches[2].switch = newPower === 1 && newSpeed >= 66 && newSpeed < 99 ? "on" : "off";
-      params.switches[3].switch = newPower === 1 && newSpeed >= 99 ? "on" : "off";
-      await this.sendDeviceUpdate(accessory, params);
-      lightService.updateCharacteristic(Characteristic.On, newLight);
-      fanService
-        .updateCharacteristic(Characteristic.Active, newPower)
-        .updateCharacteristic(Characteristic.RotationSpeed, newSpeed);
-    } catch (err) {
-      this.requestDeviceRefresh(accessory, err);
-    }
-  }
-  externalFanUpdate(accessory, params) {
-    try {
-      let light,
-        status,
-        speed,
-        lightService = accessory.getService(Service.Lightbulb),
-        fanService = accessory.getService(Service.Fanv2);
-      if (Array.isArray(params.switches)) {
-        light = params.switches[0].switch === "on";
-        switch (params.switches[1].switch + params.switches[2].switch + params.switches[3].switch) {
-          default:
-            status = 0;
-            speed = 0;
-            break;
-          case "onoffoff":
-            status = 1;
-            speed = 33;
-            break;
-          case "ononoff":
-            status = 1;
-            speed = 66;
-            break;
-          case "onoffon":
-            status = 1;
-            speed = 99;
-        }
-      } else if (params.hasOwnProperty("light") && params.hasOwnProperty("fan") && params.hasOwnProperty("speed")) {
-        light = params.light === "on";
-        status = params.fan === "on" ? 1 : 0;
-        speed = params.speed * 33 * status;
-      } else {
-        throw "unknown parameters received";
-      }
-      lightService.updateCharacteristic(Characteristic.On, light);
-      fanService
-        .updateCharacteristic(Characteristic.Active, status)
-        .updateCharacteristic(Characteristic.RotationSpeed, speed);
-    } catch (err) {
-      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
-    }
-  }
-  async internalThermostatUpdate(accessory, value, callback) {
-    callback();
-    try {
-      let params = {
-          switch: value ? "on" : "off",
-          mainSwitch: value ? "on" : "off",
-        },
-        switchService = accessory.getService(Service.Switch);
-      await this.sendDeviceUpdate(accessory, params);
-      switchService.updateCharacteristic(Characteristic.On, value);
-    } catch (err) {
-      this.requestDeviceRefresh(accessory, err);
-    }
-  }
-  externalThermostatUpdate(accessory, params) {
-    try {
-      if (!this.config.hideTHSwitch && (params.hasOwnProperty("switch") || params.hasOwnProperty("mainSwitch"))) {
-        let newState = params.hasOwnProperty("switch") ? params.switch === "on" : params.mainSwitch === "on",
-          switchService = accessory.getService(Service.Switch);
-        switchService.updateCharacteristic(Characteristic.On, newState);
-      }
-      if (!(this.config.disableEveLogging || false)) {
-        let eveLog = {
-          time: Date.now(),
-        };
-        if (params.hasOwnProperty("currentTemperature") && accessory.getService(Service.TemperatureSensor)) {
-          let currentTemp = params.currentTemperature !== "unavailable" ? params.currentTemperature : 0;
-          accessory
-            .getService(Service.TemperatureSensor)
-            .updateCharacteristic(Characteristic.CurrentTemperature, currentTemp);
-          eveLog.temp = parseFloat(currentTemp);
-        }
-        if (params.hasOwnProperty("currentHumidity") && accessory.getService(Service.HumiditySensor)) {
-          let currentHumi = params.currentHumidity !== "unavailable" ? params.currentHumidity : 0;
-          accessory
-            .getService(Service.HumiditySensor)
-            .updateCharacteristic(Characteristic.CurrentRelativeHumidity, currentHumi);
-          eveLog.humidity = parseFloat(currentHumi);
-        }
-        if (eveLog.hasOwnProperty("temp") || eveLog.hasOwnProperty("humidity")) {
-          accessory.eveLogger.addEntry(eveLog);
-        }
-      }
-    } catch (err) {
-      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
-    }
-  }
-  async internalOutletUpdate(accessory, value, callback) {
-    callback();
-    try {
-      let params = {
-          switch: value ? "on" : "off",
-        },
-        outletService = accessory.getService(Service.Outlet);
-      await this.sendDeviceUpdate(accessory, params);
-      outletService.updateCharacteristic(Characteristic.On, value);
-    } catch (err) {
-      this.requestDeviceRefresh(accessory, err);
-    }
-  }
-  externalOutletUpdate(accessory, params) {
-    try {
-      let outletService = accessory.getService(Service.Outlet);
-      if (params.hasOwnProperty("switch")) {
-        outletService.updateCharacteristic(Characteristic.On, params.switch === "on");
-        if (accessory.context.eweModel === "S26" || this.config.disableEveLogging || false) {
-          outletService.updateCharacteristic(Characteristic.OutletInUse, params.switch === "on");
-        }
-      }
-      if (params.hasOwnProperty("power")) {
-        outletService.updateCharacteristic(EveService.Characteristics.CurrentConsumption, parseFloat(params.power));
-        outletService.updateCharacteristic(
-          Characteristic.OutletInUse,
-          parseFloat(params.power) > (this.config.inUsePowerThreshold || 0)
-        );
-        let isOn = accessory.getService(Service.Outlet).getCharacteristic(Characteristic.On).value;
-        accessory.eveLogger.addEntry({
-          time: Date.now(),
-          power: isOn ? parseFloat(params.power) : 0,
-        });
-      }
-      if (params.hasOwnProperty("voltage")) {
-        outletService.updateCharacteristic(EveService.Characteristics.Voltage, parseFloat(params.voltage));
-      }
-      if (params.hasOwnProperty("current")) {
-        outletService.updateCharacteristic(EveService.Characteristics.ElectricCurrent, parseFloat(params.current));
-      }
-    } catch (err) {
-      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
-    }
-  }
-  async internalUSBUpdate(accessory, value, callback) {
-    callback();
-    try {
-      let params = {
-          switches: this.devicesInEW.get(accessory.context.eweDeviceId).params.switches,
-        },
-        outletService = accessory.getService(Service.Outlet);
-      params.switches[0].switch = value ? "on" : "off";
-      await this.sendDeviceUpdate(accessory, params);
-      outletService.updateCharacteristic(Characteristic.On, value);
-    } catch (err) {
-      this.requestDeviceRefresh(accessory, err);
-    }
-  }
-  externalUSBUpdate(accessory, params) {
-    try {
-      accessory.getService(Service.Outlet).updateCharacteristic(Characteristic.On, params.switches[0].switch === "on");
-    } catch (err) {
-      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
-    }
-  }
-  async internalSCMUpdate(accessory, value, callback) {
-    callback();
-    try {
-      let params = {
-          switches: this.devicesInEW.get(accessory.context.eweDeviceId).params.switches,
-        },
-        switchService = accessory.getService(Service.Switch);
-      params.switches[0].switch = value ? "on" : "off";
-      await this.sendDeviceUpdate(accessory, params);
-      switchService.updateCharacteristic(Characteristic.On, value);
-    } catch (err) {
-      this.requestDeviceRefresh(accessory, err);
-    }
-  }
-  externalSCMUpdate(accessory, params) {
-    try {
-      accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, params.switches[0].switch === "on");
-    } catch (err) {
-      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
-    }
-  }
-  async internalLightbulbUpdate(accessory, value, callback) {
-    callback();
-    try {
-      let oAccessory,
-        params = {},
-        lightService = accessory.getService(Service.Lightbulb);
-      switch (accessory.context.switchNumber) {
-        case "X":
-          if (accessory.context.eweUIID === 22) {
-            //*** B1 ***\\
-            params.state = value ? "on" : "off";
-          } else {
-            params.switch = value ? "on" : "off";
-          }
-          break;
-        case "0":
-          params.switches = this.devicesInEW.get(accessory.context.eweDeviceId).params.switches;
-          params.switches[0].switch = value ? "on" : "off";
-          params.switches[1].switch = value ? "on" : "off";
-          params.switches[2].switch = value ? "on" : "off";
-          params.switches[3].switch = value ? "on" : "off";
-          break;
-        case "1":
-        case "2":
-        case "3":
-        case "4":
-          params.switches = this.devicesInEW.get(accessory.context.eweDeviceId).params.switches;
-          for (let i = 1; i <= 4; i++) {
-            if ((oAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW" + i))) {
-              i === parseInt(accessory.context.switchNumber)
-                ? (params.switches[i - 1].switch = value ? "on" : "off")
-                : (params.switches[i - 1].switch = oAccessory
-                    .getService(Service.Lightbulb)
-                    .getCharacteristic(Characteristic.On).value
-                    ? "on"
-                    : "off");
-            } else {
-              params.switches[i - 1].switch = "off";
-            }
-          }
-          break;
-      }
-      await this.sendDeviceUpdate(accessory, params);
-      switch (accessory.context.switchNumber) {
-        case "X":
-          lightService.updateCharacteristic(Characteristic.On, value);
-          break;
-        case "0":
-          for (let i = 0; i <= 4; i++) {
-            if ((oAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW" + i))) {
-              oAccessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, value);
-            }
-          }
-          break;
-        case "1":
-        case "2":
-        case "3":
-        case "4":
-          lightService.updateCharacteristic(Characteristic.On, value);
-          let masterState = "off";
-          for (let i = 1; i <= 4; i++) {
-            if ((oAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW" + i))) {
-              if (oAccessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On).value) {
-                masterState = "on";
-              }
-            }
-          }
-          if (!this.hiddenMasters.includes(accessory.context.eweDeviceId)) {
-            oAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW0");
-            oAccessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, masterState === "on");
-          }
-          break;
-      }
-    } catch (err) {
-      this.requestDeviceRefresh(accessory, err);
-    }
-  }
-  async internalBrightnessUpdate(accessory, value, callback) {
-    callback();
-    try {
-      let params = {},
-        lightService = accessory.getService(Service.Lightbulb);
-      if (value === 0) {
-        params.switch = "off";
-      } else {
-        if (!lightService.getCharacteristic(Characteristic.On).value) {
-          params.switch = "on";
-        }
-        switch (accessory.context.eweUIID) {
-          case 36: //*** KING-M4 ***\\
-            params.bright = Math.round((value * 9) / 10 + 10);
-            break;
-          case 44: //*** D1 ***\\
-            params.brightness = value;
-            params.mode = 0;
-            break;
-        }
-      }
-      await utils.sleep(250);
-      await this.sendDeviceUpdate(accessory, params);
-      if (value === 0) {
-        lightService.updateCharacteristic(Characteristic.On, false);
-      } else {
-        lightService.updateCharacteristic(Characteristic.Brightness, value);
-      }
-    } catch (err) {
-      this.requestDeviceRefresh(accessory, err);
-    }
-  }
-  async internalHSBUpdate(accessory, type, value, callback) {
-    callback();
-    try {
-      if (!accessory.context.reachableWAN && !accessory.context.reachableLAN) {
-        throw "it is currently offline";
-      }
-      let newRGB,
-        params = {},
-        lightService = accessory.getService(Service.Lightbulb),
-        curHue = lightService.getCharacteristic(Characteristic.Hue).value,
-        curSat = lightService.getCharacteristic(Characteristic.Saturation).value;
-      switch (type) {
-        case "hue":
-          newRGB = convert.hsv.rgb(value, curSat, 100);
-          switch (accessory.context.eweUIID) {
-            case 22: //*** B1 ***\\
-              params = {
-                zyx_mode: 2,
-                type: "middle",
-                channel0: "0",
-                channel1: "0",
-                channel2: newRGB[0].toString(),
-                channel3: newRGB[1].toString(),
-                channel4: newRGB[2].toString(),
-              };
-              break;
-            case 59: //*** L1 ***\\
-              params = {
-                mode: 1,
-                colorR: newRGB[0],
-                colorG: newRGB[1],
-                colorB: newRGB[2],
-              };
-              break;
-          }
-          break;
-        case "bri":
-          switch (accessory.context.eweUIID) {
-            case 22: //*** B1 ***\\
-              newRGB = convert.hsv.rgb(curHue, curSat, value);
-              params = {
-                zyx_mode: 2,
-                type: "middle",
-                channel0: "0",
-                channel1: "0",
-                channel2: newRGB[0].toString(),
-                channel3: newRGB[1].toString(),
-                channel4: newRGB[2].toString(),
-              };
-              break;
-            case 59: //*** L1 ***\\
-              params = {
-                mode: 1,
-                bright: value,
-              };
-              break;
-          }
-          break;
-      }
-      await utils.sleep(250);
-      await this.sendDeviceUpdate(accessory, params);
-      switch (type) {
-        case "hue":
-          lightService.updateCharacteristic(Characteristic.Hue, value);
-          break;
-        case "bri":
-          lightService.updateCharacteristic(Characteristic.Brightness, value);
-          break;
-      }
-    } catch (err) {
-      this.requestDeviceRefresh(accessory, err);
-    }
-  }
-  externalSingleLightUpdate(accessory, params) {
-    try {
-      let newColour,
-        mode,
-        isOn = false,
-        lightService = accessory.getService(Service.Lightbulb);
-      if (accessory.context.eweUIID === 22 && params.hasOwnProperty("state")) {
-        isOn = params.state === "on";
-      } else if (accessory.context.eweUIID !== 22 && params.hasOwnProperty("switch")) {
-        isOn = params.switch === "on";
-      } else {
-        isOn = lightService.getCharacteristic(Characteristic.On).value;
-      }
-      if (isOn) {
-        lightService.updateCharacteristic(Characteristic.On, true);
-        switch (accessory.context.eweUIID) {
-          case 36: // KING-M4
-            if (params.hasOwnProperty("bright")) {
-              let nb = Math.round(((params.bright - 10) * 10) / 9); // eWeLink scale is 10-100 and HomeKit scale is 0-100.
-              lightService.updateCharacteristic(Characteristic.Brightness, nb);
-            }
-            break;
-          case 44: // D1
-            if (params.hasOwnProperty("brightness")) {
-              lightService.updateCharacteristic(Characteristic.Brightness, params.brightness);
-            }
-            break;
-          case 22: // B1
-            if (params.hasOwnProperty("zyx_mode")) {
-              mode = parseInt(params.zyx_mode);
-            } else if (params.hasOwnProperty("channel0") && parseInt(params.channel0) + parseInt(params.channel1) > 0) {
-              mode = 1;
-            } else {
-              mode = 2;
-            }
-            if (mode === 2) {
-              lightService.updateCharacteristic(Characteristic.On, true);
-              newColour = convert.rgb.hsv(
-                parseInt(params.channel2),
-                parseInt(params.channel3),
-                parseInt(params.channel4)
-              );
-              lightService
-                .updateCharacteristic(Characteristic.Hue, newColour[0])
-                .updateCharacteristic(Characteristic.Saturation, 100)
-                .updateCharacteristic(Characteristic.Brightness, 100);
-            } else if (mode === 1) {
-              throw "has been set to white mode which is not supported";
-            }
-            break;
-          case 59: // L1
-            if (params.hasOwnProperty("bright")) {
-              lightService.updateCharacteristic(Characteristic.Brightness, params.bright);
-            }
-            if (params.hasOwnProperty("colorR")) {
-              newColour = convert.rgb.hsv(params.colorR, params.colorG, params.colorB);
-              lightService
-                .updateCharacteristic(Characteristic.Hue, newColour[0])
-                .updateCharacteristic(Characteristic.Saturation, newColour[1]);
-            }
-            break;
-          default:
-            return;
-        }
-      } else {
-        lightService.updateCharacteristic(Characteristic.On, false);
-      }
-    } catch (err) {
-      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
-    }
-  }
-  externalMultiLightUpdate(accessory, params) {
-    try {
-      let idToCheck = accessory.context.hbDeviceId.slice(0, -1),
-        primaryState = false;
-      for (let i = 1; i <= accessory.context.channelCount; i++) {
-        if (this.devicesInHB.has(idToCheck + i)) {
-          let oAccessory = this.devicesInHB.get(idToCheck + i);
-          oAccessory
-            .getService(Service.Lightbulb)
-            .updateCharacteristic(Characteristic.On, params.switches[i - 1].switch === "on");
-          if (params.switches[i - 1].switch === "on") {
-            primaryState = true;
-          }
-        }
-      }
-      if (!this.hiddenMasters.includes(accessory.context.eweDeviceId)) {
-        accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, primaryState);
-      }
-    } catch (err) {
-      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
-    }
-  }
-  async internalSwitchUpdate(accessory, value, callback) {
-    callback();
-    try {
-      let oAccessory,
-        params = {},
-        switchService = accessory.getService(Service.Switch);
-      switch (accessory.context.switchNumber) {
-        case "X":
-          params.switch = value ? "on" : "off";
-          break;
-        case "0":
-          params.switches = this.devicesInEW.get(accessory.context.eweDeviceId).params.switches;
-          params.switches[0].switch = value ? "on" : "off";
-          params.switches[1].switch = value ? "on" : "off";
-          params.switches[2].switch = value ? "on" : "off";
-          params.switches[3].switch = value ? "on" : "off";
-          break;
-        case "1":
-        case "2":
-        case "3":
-        case "4":
-          params.switches = this.devicesInEW.get(accessory.context.eweDeviceId).params.switches;
-          for (let i = 1; i <= 4; i++) {
-            if ((oAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW" + i))) {
-              i === parseInt(accessory.context.switchNumber)
-                ? (params.switches[i - 1].switch = value ? "on" : "off")
-                : (params.switches[i - 1].switch = oAccessory
-                    .getService(Service.Switch)
-                    .getCharacteristic(Characteristic.On).value
-                    ? "on"
-                    : "off");
-            } else {
-              params.switches[i - 1].switch = "off";
-            }
-          }
-          break;
-      }
-      await this.sendDeviceUpdate(accessory, params);
-      switch (accessory.context.switchNumber) {
-        case "X":
-          switchService.updateCharacteristic(Characteristic.On, value);
-          break;
-        case "0":
-          for (let i = 0; i <= 4; i++) {
-            if ((oAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW" + i))) {
-              oAccessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, value);
-            }
-          }
-          break;
-        case "1":
-        case "2":
-        case "3":
-        case "4":
-          switchService.updateCharacteristic(Characteristic.On, value);
-          let masterState = "off";
-          for (let i = 1; i <= 4; i++) {
-            if ((oAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW" + i))) {
-              if (oAccessory.getService(Service.Switch).getCharacteristic(Characteristic.On).value) {
-                masterState = "on";
-              }
-            }
-          }
-          if (!this.hiddenMasters.includes(accessory.context.eweDeviceId)) {
-            oAccessory = this.devicesInHB.get(accessory.context.eweDeviceId + "SW0");
-            oAccessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, masterState === "on");
-          }
-          break;
-      }
-    } catch (err) {
-      this.requestDeviceRefresh(accessory, err);
-    }
-  }
-  externalSingleSwitchUpdate(accessory, params) {
-    try {
-      accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, params.switch === "on");
-    } catch (err) {
-      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
-    }
-  }
-  externalMultiSwitchUpdate(accessory, params) {
-    try {
-      let idToCheck = accessory.context.hbDeviceId.slice(0, -1),
-        primaryState = false;
-      for (let i = 1; i <= accessory.context.channelCount; i++) {
-        if (this.devicesInHB.has(idToCheck + i)) {
-          let oAccessory = this.devicesInHB.get(idToCheck + i);
-          oAccessory
-            .getService(Service.Switch)
-            .updateCharacteristic(Characteristic.On, params.switches[i - 1].switch === "on");
-          if (params.switches[i - 1].switch === "on") {
-            primaryState = true;
-          }
-        }
-      }
-      if (!this.hiddenMasters.includes(accessory.context.eweDeviceId)) {
-        accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, primaryState);
-      }
-    } catch (err) {
-      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
-    }
-  }
-  async internalRFUpdate(accessory, rfChl, service, callback) {
-    callback();
-    try {
-      let params = {
-          cmd: "transmit",
-          rfChl: parseInt(rfChl),
-        },
-        rfService = accessory.getService(service);
-      await this.sendDeviceUpdate(accessory, params);
-      rfService.updateCharacteristic(Characteristic.On, true);
-      await utils.sleep(3000);
-      rfService.updateCharacteristic(Characteristic.On, false);
-    } catch (err) {
-      this.requestDeviceRefresh(accessory, err);
-    }
-  }
-  externalRFUpdate(accessory, params) {
-    try {
-      if (!params.hasOwnProperty("updateSource")) return;
-      let timeNow = new Date(),
-        oAccessory = false;
-      if (params.hasOwnProperty("cmd") && params.cmd === "transmit" && params.hasOwnProperty("rfChl")) {
-        //*** RF Button ***\\
-        // the device needed is SW% corresponding to params.rfChl
-        this.devicesInHB.forEach(acc => {
-          if (
-            acc.context.eweDeviceId === accessory.context.eweDeviceId &&
-            acc.context.buttons.hasOwnProperty(params.rfChl.toString())
-          ) {
-            oAccessory = acc;
-          }
-        });
-        if (oAccessory) {
-          oAccessory.getService(oAccessory.context.buttons[params.rfChl]).updateCharacteristic(Characteristic.On, 1);
-          setTimeout(
-            () =>
-              oAccessory
-                .getService(oAccessory.context.buttons[params.rfChl])
-                .updateCharacteristic(Characteristic.On, 0),
-            3000
-          );
-        } else {
-          throw "rf button not found in Homebridge";
-        }
-      } else if (params.hasOwnProperty("cmd") && params.cmd === "trigger") {
-        //*** RF Sensor ***\\
-        Object.keys(params)
-          .filter(name => /rfTrig/.test(name))
-          .forEach(chan => {
-            this.devicesInHB.forEach(acc => {
-              if (
-                acc.context.eweDeviceId === accessory.context.eweDeviceId &&
-                acc.context.buttons.hasOwnProperty(chan.substr(-1).toString())
-              ) {
-                oAccessory = acc;
-              }
-            });
-            if (oAccessory) {
-              let timeOfMotion = new Date(params[chan]),
-                diff = (timeNow.getTime() - timeOfMotion.getTime()) / 1000,
-                serv,
-                char;
-              if (diff < (this.config.sensorTimeDifference || 120)) {
-                switch (oAccessory.context.sensorType) {
-                  case "button":
-                    break;
-                  case "water":
-                    serv = Service.LeakSensor;
-                    char = Characteristic.LeakDetected;
-                    break;
-                  case "fire":
-                  case "smoke":
-                    serv = Service.SmokeSensor;
-                    char = Characteristic.LeakDetected;
-                    break;
-                  case "co":
-                    serv = Service.CarbonMonoxideSensor;
-                    char = Characteristic.CarbonMonoxideDetected;
-                    break;
-                  case "co2":
-                    serv = Service.CarbonDioxideSensor;
-                    char = Characteristic.CarbonDioxideDetected;
-                    break;
-                  case "contact":
-                    serv = Service.ContactSensor;
-                    char = Characteristic.ContactSensorState;
-                    break;
-                  case "occupancy":
-                    serv = Service.OccupancySensor;
-                    char = Characteristic.OccupancyDetected;
-                    break;
-                  default:
-                    serv = Service.MotionSensor;
-                    char = Characteristic.MotionDetected;
-                    break;
-                }
-                oAccessory.getService(serv).updateCharacteristic(char, 1);
-                setTimeout(() => {
-                  oAccessory.getService(serv).updateCharacteristic(char, 0);
-                }, (this.config.sensorTimeLength || 2) * 1000);
-                if (this.debug) {
-                  this.log("[%s] has detected [%s].", oAccessory.displayName, oAccessory.context.sensorType);
-                }
-              }
-            }
-          });
-      }
-    } catch (err) {
-      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
-    }
-  }
-  externalZBUpdate(accessory, params) {
-    try {
-      //*** credit @tasict ***\\
-      if (params.hasOwnProperty("battery")) {
-        if (accessory.context.eweUIID === 3026 && (this.config.ZBDWBatt || false)) {
-          params.battery *= 10;
-        }
-        let batteryService =
-          accessory.getService(Service.BatteryService) || accessory.addService(Service.BatteryService);
-        batteryService.updateCharacteristic(Characteristic.BatteryLevel, params.battery);
-        batteryService.updateCharacteristic(
-          Characteristic.StatusLowBattery,
-          params.battery < (this.config.lowBattThreshold || 25)
-        );
-      }
-      switch (accessory.context.eweUIID) {
-        case 1000:
-          if (params.hasOwnProperty("key") && [0, 1, 2].includes(params.key)) {
-            accessory
-              .getService(Service.StatelessProgrammableSwitch)
-              .updateCharacteristic(Characteristic.ProgrammableSwitchEvent, params.key);
-          }
-          break;
-        case 1770:
-          let eveLog = {
-            time: Date.now(),
-          };
-          if (params.hasOwnProperty("temperature")) {
-            let currentTemp = parseInt(params.temperature) / 100;
-            accessory
-              .getService(Service.TemperatureSensor)
-              .updateCharacteristic(Characteristic.CurrentTemperature, currentTemp);
-            eveLog.temp = parseFloat(currentTemp);
-          }
-          if (params.hasOwnProperty("humidity")) {
-            let currentHumi = parseInt(params.humidity) / 100;
-            accessory
-              .getService(Service.HumiditySensor)
-              .updateCharacteristic(Characteristic.CurrentRelativeHumidity, currentHumi);
-            eveLog.humidity = parseFloat(currentHumi);
-          }
-          if (eveLog.hasOwnProperty("temp") || eveLog.hasOwnProperty("humidity")) {
-            accessory.eveLogger.addEntry(eveLog);
-          }
-          break;
-        case 2026:
-          if (params.hasOwnProperty("motion") && params.hasOwnProperty("trigTime")) {
-            let timeNow = new Date(),
-              diff = (timeNow.getTime() - params.trigTime) / 1000;
-            accessory
-              .getService(Service.MotionSensor)
-              .updateCharacteristic(
-                Characteristic.MotionDetected,
-                params.hasOwnProperty("updateSource") &&
-                  params.motion === 1 &&
-                  diff < (this.config.sensorTimeDifference || 120)
-              );
-            break;
-          }
-          break;
-        case 3026:
-          if (params.hasOwnProperty("lock") && [0, 1].includes(params.lock)) {
-            accessory
-              .getService(Service.ContactSensor)
-              .updateCharacteristic(Characteristic.ContactSensorState, params.lock);
-          }
-          break;
-      }
-    } catch (err) {
-      this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
-    }
-  }
 }
 module.exports = function (homebridge) {
   Accessory = homebridge.platformAccessory;

From 7e33edf6faeaa3bccc1148526823dda000bcb171 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 26 Sep 2020 22:19:23 +0100
Subject: [PATCH 0225/3183] blinds

---
 lib/device/blind.js | 87 ++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 74 insertions(+), 13 deletions(-)

diff --git a/lib/device/blind.js b/lib/device/blind.js
index 8057a852..bb9b5725 100644
--- a/lib/device/blind.js
+++ b/lib/device/blind.js
@@ -18,9 +18,12 @@ module.exports = class deviceBlind {
         wcService = accessory.getService(Service.WindowCovering),
         prevState = accessory.context.cachePositionState,
         prevPosition = accessory.context.cacheCurrentPosition,
+        prevFixedPosition = accessory.context.cacheLastFixedPosition,
         newTarget = value,
         updateKey = Math.random().toString(36).substr(2, 8);
-      if (!(blindConfig = this.cusG.get(accessory.context.hbDeviceId))) {
+      if (
+        !(blindConfig = this.platform.cusG.get(accessory.context.hbDeviceId))
+      ) {
         throw "group config missing";
       }
       if (blindConfig.type !== "blind" || blindConfig.setup !== "twoSwitch") {
@@ -30,41 +33,99 @@ module.exports = class deviceBlind {
       params.switches = cns.defaultMultiSwitchOff;
       accessory.context.updateKey = updateKey;
       let percentStepPerDecisecond = blindConfig.operationTime / 100;
+
+      //
+      //
+
+      this.platform.log("============================");
+      this.platform.log("============================");
+      this.platform.log("Starting main calculation...");
+      this.platform.log("Moving from [%s%] to [%s%].", prevPosition, newTarget);
+
+      //
+      //
+
       if (prevState !== 2) {
-        await this.platform.sendDeviceUpdate(accessory, params);
+        // await this.platform.sendDeviceUpdate(accessory, params);
         let positionPercentChange = Math.round(
-          Math.floor(Date.now() / 100) - accessory.context.cacheLastStartTime * percentStepPerDecisecond
+          (Math.floor(Date.now() / 100) -
+            accessory.context.cacheLastStartTime) *
+            percentStepPerDecisecond
         );
-        if ((prevState === 0 && newTarget > prevPosition) || (prevState === 1 && newTarget < prevPosition)) {
-          prevPosition += positionPercentChange;
+        if (
+          (prevState === 0 && newTarget < prevPosition) ||
+          (prevState === 1 && newTarget > prevPosition)
+        ) {
+          prevPosition = Math.abs(prevPosition - positionPercentChange);
         } else {
-          prevPosition -= positionPercentChange;
+          prevPosition = Math.abs(prevPosition + positionPercentChange);
         }
-        wcService.updateCharacteristic(Characteristic.CurrentPosition, prevPosition);
+        wcService.updateCharacteristic(
+          Characteristic.CurrentPosition,
+          prevPosition
+        );
+        this.platform.log.warn("But...");
+        this.platform.log.warn(
+          "Blind was already moving %s when it was changed and was probably around %s%",
+          prevState === 1 ? "up" : "down",
+          prevPosition
+        );
+        this.platform.log.warn(
+          "Blind was already moving from time %s when it was changed at %s time",
+          accessory.context.cacheLastStartTime,
+          Math.floor(Date.now() / 100)
+        );
+        this.platform.log.warn(
+          "Giving a difference of %s seconds",
+          (Math.floor(Date.now() / 100) -
+            accessory.context.cacheLastStartTime) /
+            10
+        );
+        this.platform.log.warn(
+          "This works out as a position change of %s%",
+          positionPercentChange
+        );
+
         accessory.context.cacheCurrentPosition = prevPosition;
       }
+
       let diffPosition = newTarget - prevPosition;
       let setToMoveUp = diffPosition > 0;
-      let decisecondsToMove = Math.round(Math.abs(diffPosition) * percentStepPerDecisecond);
+      let decisecondsToMove = Math.round(
+        Math.abs(diffPosition) * percentStepPerDecisecond
+      );
+      this.platform.log(
+        "So we need to move %s from the previous state of %s for about %s seconds",
+        setToMoveUp ? "up" : "down",
+        prevState === 0
+          ? "moving down"
+          : prevState === 1
+          ? "moving up"
+          : "stopped",
+        decisecondsToMove / 10
+      );
       params.switches[0].switch = setToMoveUp ? "on" : "off";
       params.switches[1].switch = setToMoveUp ? "off" : "on";
-      await this.platform.sendDeviceUpdate(accessory, params);
+      // await this.platform.sendDeviceUpdate(accessory, params);
       wcService
         .updateCharacteristic(Characteristic.TargetPosition, newTarget)
         .updateCharacteristic(Characteristic.PositionState, setToMoveUp);
       accessory.context.cacheTargetPosition = newTarget;
-      accessory.context.cachePositionState = setToMoveUp;
+      accessory.context.cachePositionState = setToMoveUp ? 1 : 0;
       accessory.context.cacheLastStartTime = Math.floor(Date.now() / 100);
-      this.platform.log.warn(decisecondsToMove + " movement time in deciseconds");
       await utils.sleep(decisecondsToMove * 100);
       if (accessory.context.updateKey === updateKey) {
         params.switches[0].switch = "off";
         params.switches[1].switch = "off";
-        await this.platform.sendDeviceUpdate(accessory, params);
+        // await this.platform.sendDeviceUpdate(accessory, params);
         wcService.updateCharacteristic(Characteristic.PositionState, 2);
-        wcService.updateCharacteristic(Characteristic.CurrentPosition, newTarget);
+        wcService.updateCharacteristic(
+          Characteristic.CurrentPosition,
+          newTarget
+        );
         accessory.context.cachePositionState = 2;
         accessory.context.cacheCurrentPosition = newTarget;
+        accessory.context.cacheLastFixedPosition = newTarget;
       }
     } catch (err) {
       this.platform.requestDeviceRefresh(accessory, err);

From a322e981c076fefff52296283324cef28f3013e3 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 26 Sep 2020 22:20:01 +0100
Subject: [PATCH 0226/3183] formatting

---
 lib/device/blind.js | 42 +++++++++---------------------------------
 1 file changed, 9 insertions(+), 33 deletions(-)

diff --git a/lib/device/blind.js b/lib/device/blind.js
index bb9b5725..73615c4e 100644
--- a/lib/device/blind.js
+++ b/lib/device/blind.js
@@ -21,9 +21,7 @@ module.exports = class deviceBlind {
         prevFixedPosition = accessory.context.cacheLastFixedPosition,
         newTarget = value,
         updateKey = Math.random().toString(36).substr(2, 8);
-      if (
-        !(blindConfig = this.platform.cusG.get(accessory.context.hbDeviceId))
-      ) {
+      if (!(blindConfig = this.platform.cusG.get(accessory.context.hbDeviceId))) {
         throw "group config missing";
       }
       if (blindConfig.type !== "blind" || blindConfig.setup !== "twoSwitch") {
@@ -48,22 +46,14 @@ module.exports = class deviceBlind {
       if (prevState !== 2) {
         // await this.platform.sendDeviceUpdate(accessory, params);
         let positionPercentChange = Math.round(
-          (Math.floor(Date.now() / 100) -
-            accessory.context.cacheLastStartTime) *
-            percentStepPerDecisecond
+          (Math.floor(Date.now() / 100) - accessory.context.cacheLastStartTime) * percentStepPerDecisecond
         );
-        if (
-          (prevState === 0 && newTarget < prevPosition) ||
-          (prevState === 1 && newTarget > prevPosition)
-        ) {
+        if ((prevState === 0 && newTarget < prevPosition) || (prevState === 1 && newTarget > prevPosition)) {
           prevPosition = Math.abs(prevPosition - positionPercentChange);
         } else {
           prevPosition = Math.abs(prevPosition + positionPercentChange);
         }
-        wcService.updateCharacteristic(
-          Characteristic.CurrentPosition,
-          prevPosition
-        );
+        wcService.updateCharacteristic(Characteristic.CurrentPosition, prevPosition);
         this.platform.log.warn("But...");
         this.platform.log.warn(
           "Blind was already moving %s when it was changed and was probably around %s%",
@@ -77,31 +67,20 @@ module.exports = class deviceBlind {
         );
         this.platform.log.warn(
           "Giving a difference of %s seconds",
-          (Math.floor(Date.now() / 100) -
-            accessory.context.cacheLastStartTime) /
-            10
-        );
-        this.platform.log.warn(
-          "This works out as a position change of %s%",
-          positionPercentChange
+          (Math.floor(Date.now() / 100) - accessory.context.cacheLastStartTime) / 10
         );
+        this.platform.log.warn("This works out as a position change of %s%", positionPercentChange);
 
         accessory.context.cacheCurrentPosition = prevPosition;
       }
 
       let diffPosition = newTarget - prevPosition;
       let setToMoveUp = diffPosition > 0;
-      let decisecondsToMove = Math.round(
-        Math.abs(diffPosition) * percentStepPerDecisecond
-      );
+      let decisecondsToMove = Math.round(Math.abs(diffPosition) * percentStepPerDecisecond);
       this.platform.log(
         "So we need to move %s from the previous state of %s for about %s seconds",
         setToMoveUp ? "up" : "down",
-        prevState === 0
-          ? "moving down"
-          : prevState === 1
-          ? "moving up"
-          : "stopped",
+        prevState === 0 ? "moving down" : prevState === 1 ? "moving up" : "stopped",
         decisecondsToMove / 10
       );
       params.switches[0].switch = setToMoveUp ? "on" : "off";
@@ -119,10 +98,7 @@ module.exports = class deviceBlind {
         params.switches[1].switch = "off";
         // await this.platform.sendDeviceUpdate(accessory, params);
         wcService.updateCharacteristic(Characteristic.PositionState, 2);
-        wcService.updateCharacteristic(
-          Characteristic.CurrentPosition,
-          newTarget
-        );
+        wcService.updateCharacteristic(Characteristic.CurrentPosition, newTarget);
         accessory.context.cachePositionState = 2;
         accessory.context.cacheCurrentPosition = newTarget;
         accessory.context.cacheLastFixedPosition = newTarget;

From fc49a009ea9ce229050cb192cbafbbb486cd54c6 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 26 Sep 2020 22:20:43 +0100
Subject: [PATCH 0227/3183] 3.0.3-2

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index cf967598..4325215d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.0.3-1",
+  "version": "3.0.3-2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index a50beb2b..71511ffd 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.0.3-1",
+  "version": "3.0.3-2",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From aff2c9e5626a9b7d6f66dfc70494e665e2d83bf5 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 26 Sep 2020 22:30:00 +0100
Subject: [PATCH 0228/3183] Update blind.js

---
 lib/device/blind.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/device/blind.js b/lib/device/blind.js
index 73615c4e..9d36d708 100644
--- a/lib/device/blind.js
+++ b/lib/device/blind.js
@@ -44,7 +44,7 @@ module.exports = class deviceBlind {
       //
 
       if (prevState !== 2) {
-        // await this.platform.sendDeviceUpdate(accessory, params);
+        await this.platform.sendDeviceUpdate(accessory, params);
         let positionPercentChange = Math.round(
           (Math.floor(Date.now() / 100) - accessory.context.cacheLastStartTime) * percentStepPerDecisecond
         );
@@ -85,7 +85,7 @@ module.exports = class deviceBlind {
       );
       params.switches[0].switch = setToMoveUp ? "on" : "off";
       params.switches[1].switch = setToMoveUp ? "off" : "on";
-      // await this.platform.sendDeviceUpdate(accessory, params);
+      await this.platform.sendDeviceUpdate(accessory, params);
       wcService
         .updateCharacteristic(Characteristic.TargetPosition, newTarget)
         .updateCharacteristic(Characteristic.PositionState, setToMoveUp);
@@ -96,7 +96,7 @@ module.exports = class deviceBlind {
       if (accessory.context.updateKey === updateKey) {
         params.switches[0].switch = "off";
         params.switches[1].switch = "off";
-        // await this.platform.sendDeviceUpdate(accessory, params);
+        await this.platform.sendDeviceUpdate(accessory, params);
         wcService.updateCharacteristic(Characteristic.PositionState, 2);
         wcService.updateCharacteristic(Characteristic.CurrentPosition, newTarget);
         accessory.context.cachePositionState = 2;

From 22833940e95044673193ad94de8c8820f2e500fa Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 26 Sep 2020 22:31:28 +0100
Subject: [PATCH 0229/3183] 3.0.3-3

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 4325215d..8937010e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.0.3-2",
+  "version": "3.0.3-3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 71511ffd..2b7e84c0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.0.3-2",
+  "version": "3.0.3-3",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 55172e1f222e12ef9f4916c7c10bf573724628b6 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 27 Sep 2020 00:13:38 +0100
Subject: [PATCH 0230/3183] Update blind.js

---
 lib/device/blind.js | 57 +++++++++++++++++----------------------------
 1 file changed, 22 insertions(+), 35 deletions(-)

diff --git a/lib/device/blind.js b/lib/device/blind.js
index 9d36d708..4e205161 100644
--- a/lib/device/blind.js
+++ b/lib/device/blind.js
@@ -9,7 +9,6 @@ module.exports = class deviceBlind {
     Service = platform.api.hap.Service;
     Characteristic = platform.api.hap.Characteristic;
   }
-
   async internalBlindUpdate(accessory, value, callback) {
     callback();
     try {
@@ -18,7 +17,6 @@ module.exports = class deviceBlind {
         wcService = accessory.getService(Service.WindowCovering),
         prevState = accessory.context.cachePositionState,
         prevPosition = accessory.context.cacheCurrentPosition,
-        prevFixedPosition = accessory.context.cacheLastFixedPosition,
         newTarget = value,
         updateKey = Math.random().toString(36).substr(2, 8);
       if (!(blindConfig = this.platform.cusG.get(accessory.context.hbDeviceId))) {
@@ -31,49 +29,39 @@ module.exports = class deviceBlind {
       params.switches = cns.defaultMultiSwitchOff;
       accessory.context.updateKey = updateKey;
       let percentStepPerDecisecond = blindConfig.operationTime / 100;
-
       //
       //
-
       this.platform.log("============================");
       this.platform.log("============================");
       this.platform.log("Starting main calculation...");
-      this.platform.log("Moving from [%s%] to [%s%].", prevPosition, newTarget);
-
       //
       //
-
       if (prevState !== 2) {
         await this.platform.sendDeviceUpdate(accessory, params);
-        let positionPercentChange = Math.round(
-          (Math.floor(Date.now() / 100) - accessory.context.cacheLastStartTime) * percentStepPerDecisecond
-        );
-        if ((prevState === 0 && newTarget < prevPosition) || (prevState === 1 && newTarget > prevPosition)) {
-          prevPosition = Math.abs(prevPosition - positionPercentChange);
+        let positionPercentChange = Math.floor(Date.now() / 100) - accessory.context.cacheLastStartTime;
+        positionPercentChange = Math.floor(percentStepPerDecisecond * positionPercentChange);
+        if (prevState === 0) {
+          // moving down
+          prevPosition -= positionPercentChange;
         } else {
-          prevPosition = Math.abs(prevPosition + positionPercentChange);
+          prevPosition += positionPercentChange;
         }
         wcService.updateCharacteristic(Characteristic.CurrentPosition, prevPosition);
-        this.platform.log.warn("But...");
+        accessory.context.cacheCurrentPosition = prevPosition;
+        this.platform.log.warn("Moving from [%s%] to [%s]", prevPosition, newTarget);
         this.platform.log.warn(
           "Blind was already moving %s when it was changed and was probably around %s%",
           prevState === 1 ? "up" : "down",
           prevPosition
         );
         this.platform.log.warn(
-          "Blind was already moving from time %s when it was changed at %s time",
-          accessory.context.cacheLastStartTime,
-          Math.floor(Date.now() / 100)
-        );
-        this.platform.log.warn(
-          "Giving a difference of %s seconds",
-          (Math.floor(Date.now() / 100) - accessory.context.cacheLastStartTime) / 10
+          "Giving a difference of %s seconds -  a position change of %s%",
+          (Math.floor(Date.now() / 100) - accessory.context.cacheLastStartTime) / 10,
+          positionPercentChange
         );
-        this.platform.log.warn("This works out as a position change of %s%", positionPercentChange);
-
-        accessory.context.cacheCurrentPosition = prevPosition;
+      } else {
+        this.platform.log("Moving from [%s%] to [%s%].", prevPosition, newTarget);
       }
-
       let diffPosition = newTarget - prevPosition;
       let setToMoveUp = diffPosition > 0;
       let decisecondsToMove = Math.round(Math.abs(diffPosition) * percentStepPerDecisecond);
@@ -92,17 +80,16 @@ module.exports = class deviceBlind {
       accessory.context.cacheTargetPosition = newTarget;
       accessory.context.cachePositionState = setToMoveUp ? 1 : 0;
       accessory.context.cacheLastStartTime = Math.floor(Date.now() / 100);
+      if (accessory.context.updateKey !== updateKey) return;
       await utils.sleep(decisecondsToMove * 100);
-      if (accessory.context.updateKey === updateKey) {
-        params.switches[0].switch = "off";
-        params.switches[1].switch = "off";
-        await this.platform.sendDeviceUpdate(accessory, params);
-        wcService.updateCharacteristic(Characteristic.PositionState, 2);
-        wcService.updateCharacteristic(Characteristic.CurrentPosition, newTarget);
-        accessory.context.cachePositionState = 2;
-        accessory.context.cacheCurrentPosition = newTarget;
-        accessory.context.cacheLastFixedPosition = newTarget;
-      }
+      if (accessory.context.updateKey !== updateKey) return;
+      params.switches[0].switch = "off";
+      params.switches[1].switch = "off";
+      await this.platform.sendDeviceUpdate(accessory, params);
+      wcService.updateCharacteristic(Characteristic.PositionState, 2);
+      wcService.updateCharacteristic(Characteristic.CurrentPosition, newTarget);
+      accessory.context.cachePositionState = 2;
+      accessory.context.cacheCurrentPosition = newTarget;
     } catch (err) {
       this.platform.requestDeviceRefresh(accessory, err);
     }

From 996850df5f75fa4a585e3c14b98ada50de64b0f7 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 27 Sep 2020 00:14:08 +0100
Subject: [PATCH 0231/3183] Update blind.js

---
 lib/device/blind.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/device/blind.js b/lib/device/blind.js
index 4e205161..377fb763 100644
--- a/lib/device/blind.js
+++ b/lib/device/blind.js
@@ -48,7 +48,7 @@ module.exports = class deviceBlind {
         }
         wcService.updateCharacteristic(Characteristic.CurrentPosition, prevPosition);
         accessory.context.cacheCurrentPosition = prevPosition;
-        this.platform.log.warn("Moving from [%s%] to [%s]", prevPosition, newTarget);
+        this.platform.log.warn("Moving from [%s%] to [%s%]", prevPosition, newTarget);
         this.platform.log.warn(
           "Blind was already moving %s when it was changed and was probably around %s%",
           prevState === 1 ? "up" : "down",

From 5879e1b7a61a42691c3931988618c3b1afca09ee Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 27 Sep 2020 00:14:51 +0100
Subject: [PATCH 0232/3183] 3.0.3-4

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 8937010e..a05cbda3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.0.3-3",
+  "version": "3.0.3-4",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 2b7e84c0..81643c16 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.0.3-3",
+  "version": "3.0.3-4",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From cba99517e8c2d66a27602cdc767116bf9261ef12 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 27 Sep 2020 02:20:59 +0100
Subject: [PATCH 0233/3183] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 79d92ff6..d8a98c3f 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@
  
  [![verified-by-homebridge](https://badgen.net/badge/homebridge/verified/purple)](https://github.com/homebridge/homebridge/wiki/Verified-Plugins)
  [![Discord](https://img.shields.io/discord/432663330281226270?color=728ED5&logo=discord&label=discord)](https://discord.com/channels/432663330281226270/742733745743855627)
- [![code style: prettier](https://img.shields.io/badge/code_style-prettier-ff69b4.svg)](https://github.com/prettier/prettier)   
+ [![JavaScript Style Guide](https://img.shields.io/badge/code_style-standard-brightgreen.svg)](https://standardjs.com)   
  [![npm](https://img.shields.io/npm/v/homebridge-ewelink/latest?label=release)](https://www.npmjs.com/package/homebridge-ewelink)
  [![npm](https://img.shields.io/npm/v/homebridge-ewelink/beta?label=beta)](https://www.npmjs.com/package/homebridge-ewelink)   
  [![npm](https://img.shields.io/npm/dt/homebridge-ewelink)](https://www.npmjs.com/package/homebridge-ewelink)

From 9da0ed7433bf951a59a9ca80bdbd2fe6e6ce2437 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 27 Sep 2020 02:24:39 +0100
Subject: [PATCH 0234/3183] standard js

---
 .prettier.ignore   |    5 -
 .prettierrc.json   |    4 -
 config.schema.json |   62 +-
 index.js           |    9 +-
 lib/constants.js   |  137 ++---
 lib/eWeLink.js     | 1456 ++++++++++++++++++++++----------------------
 lib/eWeLinkHTTP.js |  460 +++++++-------
 lib/eWeLinkLAN.js  |  287 ++++-----
 lib/eWeLinkWS.js   |  492 ++++++++-------
 lib/utils.js       |    9 +-
 package-lock.json  |    6 -
 package.json       |    3 -
 12 files changed, 1462 insertions(+), 1468 deletions(-)
 delete mode 100644 .prettier.ignore
 delete mode 100644 .prettierrc.json

diff --git a/.prettier.ignore b/.prettier.ignore
deleted file mode 100644
index 45fb205e..00000000
--- a/.prettier.ignore
+++ /dev/null
@@ -1,5 +0,0 @@
-.DS_Store
-.nova
-.github
-.npm
-node_modules/
\ No newline at end of file
diff --git a/.prettierrc.json b/.prettierrc.json
deleted file mode 100644
index 163a0a7e..00000000
--- a/.prettierrc.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "arrowParens": "avoid",
-  "printWidth": 120
-}
diff --git a/config.schema.json b/config.schema.json
index f1e23146..037b6c42 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -136,15 +136,21 @@
               "oneOf": [
                 {
                   "title": "Blind",
-                  "enum": ["blind"]
+                  "enum": [
+                    "blind"
+                  ]
                 },
                 {
                   "title": "Garage Door",
-                  "enum": ["garage"]
+                  "enum": [
+                    "garage"
+                  ]
                 },
                 {
                   "title": "Lock",
-                  "enum": ["lock"]
+                  "enum": [
+                    "lock"
+                  ]
                 }
               ]
             },
@@ -156,11 +162,15 @@
               "oneOf": [
                 {
                   "title": "One Switch - for up and down",
-                  "enum": ["oneSwitch"]
+                  "enum": [
+                    "oneSwitch"
+                  ]
                 },
                 {
                   "title": "Two Switches - one for up and one for down",
-                  "enum": ["twoSwitch"]
+                  "enum": [
+                    "twoSwitch"
+                  ]
                 }
               ]
             },
@@ -205,31 +215,45 @@
               "oneOf": [
                 {
                   "title": "Motion",
-                  "enum": ["motion"]
+                  "enum": [
+                    "motion"
+                  ]
                 },
                 {
                   "title": "Smoke/Fire",
-                  "enum": ["smoke"]
+                  "enum": [
+                    "smoke"
+                  ]
                 },
                 {
                   "title": "Water/Leak",
-                  "enum": ["water"]
+                  "enum": [
+                    "water"
+                  ]
                 },
                 {
                   "title": "Carbon Monoxide",
-                  "enum": ["co"]
+                  "enum": [
+                    "co"
+                  ]
                 },
                 {
                   "title": "Carbon Dioxide",
-                  "enum": ["co2"]
+                  "enum": [
+                    "co2"
+                  ]
                 },
                 {
                   "title": "Occupancy",
-                  "enum": ["occupancy"]
+                  "enum": [
+                    "occupancy"
+                  ]
                 },
                 {
                   "title": "Contact",
-                  "enum": ["contact"]
+                  "enum": [
+                    "contact"
+                  ]
                 }
               ]
             }
@@ -237,14 +261,22 @@
         }
       }
     },
-    "required": ["countryCode", "username", "password"]
+    "required": [
+      "countryCode",
+      "username",
+      "password"
+    ]
   },
   "layout": [
     {
       "type": "fieldset",
       "title": "Required Settings",
       "description": "These are the basic settings that are required for this plugin to work.",
-      "items": ["countryCode", "username", "password"]
+      "items": [
+        "countryCode",
+        "username",
+        "password"
+      ]
     },
     {
       "type": "fieldset",
@@ -312,4 +344,4 @@
       ]
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/index.js b/index.js
index 01e13ba7..bff9ae59 100644
--- a/index.js
+++ b/index.js
@@ -1,6 +1,5 @@
-/* jshint esversion: 9, -W014, -W030, node: true */
-"use strict";
+'use strict'
 module.exports = function (homebridge) {
-  const eWeLink = require("./lib/eWeLink.js")(homebridge);
-  homebridge.registerPlatform("homebridge-ewelink", "eWeLink", eWeLink, true);
-};
+  const eWeLink = require('./lib/eWeLink.js')(homebridge)
+  homebridge.registerPlatform('homebridge-ewelink', 'eWeLink', eWeLink, true)
+}
diff --git a/lib/constants.js b/lib/constants.js
index 803a3423..1ec671bc 100644
--- a/lib/constants.js
+++ b/lib/constants.js
@@ -1,110 +1,61 @@
-/* jshint esversion: 9, -W014, -W030, node: true */
-"use strict";
+'use strict'
 module.exports = {
-  // appId: "Uw83EKZFxdif7XFXEsrpduz5YyjP7nTl",
-  appId: "oeVkj2lYFGnJu5XUtWisfW4utiN4u9Mq",
-  // appSecret: "mXLOjea0woSMvK9gw7Fjsy7YlFO4iSu6",
-  appSecret: "6Nz4n0xA8s8qdxQf2GqurZj2Fs55FUvM",
-  devicesHideable: ["switch", "light"],
+  appId: 'oeVkj2lYFGnJu5XUtWisfW4utiN4u9Mq',
+  appSecret: '6Nz4n0xA8s8qdxQf2GqurZj2Fs55FUvM',
+  devicesHideable: ['switch', 'light'],
   devicesNonLAN: [22, 28, 59, 102],
   devicesSingleSwitch: [1, 5, 6, 14, 15, 22, 24, 27, 32, 36, 44, 59],
-  devicesSingleSwitchParams: ["switch"],
-  devicesSingleSwitchOutlet: ["Sonoff Pow", "S26"],
+  devicesSingleSwitchParams: ['switch'],
+  devicesSingleSwitchOutlet: ['Sonoff Pow', 'S26'],
   devicesMultiSwitch: [2, 3, 4, 7, 8, 9, 29, 30, 31, 34, 41],
-  devicesMultiSwitchParams: ["switches"],
-  devicesSingleSwitchLight: ["T1 1C", "L1", "B1", "B1_R2", "TX1C", "D1", "D1R1", "KING-M4", "Slampher", "GTTA59"],
-  devicesSingleSwitchLightParams: [
-    "switch",
-    "state",
-    "bright",
-    "colorR",
-    "brightness",
-    "channel0",
-    "channel2",
-    "xyz_mode",
-  ],
-  devicesMultiSwitchLight: ["T1 2C", "T1 3C", "TX2C", "TX3C"],
-  devicesMultiSwitchLightParams: ["switches"],
+  devicesMultiSwitchParams: ['switches'],
+  devicesSingleSwitchLight: ['T1 1C', 'L1', 'B1', 'B1_R2', 'TX1C', 'D1', 'D1R1', 'KING-M4', 'Slampher', 'GTTA59'],
+  devicesSingleSwitchLightParams: ['switch', 'state', 'bright', 'colorR', 'brightness', 'channel0', 'channel2', 'xyz_mode'],
+  devicesMultiSwitchLight: ['T1 2C', 'T1 3C', 'TX2C', 'TX3C'],
+  devicesMultiSwitchLightParams: ['switches'],
   devicesBrightable: [36, 44],
   devicesColourable: [22, 59],
   devicesCurtain: [11],
-  devicesCurtainParams: ["switch", "setclose"],
+  devicesCurtainParams: ['switch', 'setclose'],
   devicesSensor: [102],
-  devicesSensorParams: ["switch", "battery"],
+  devicesSensorParams: ['switch', 'battery'],
   devicesThermostat: [15],
-  devicesThermostatParams: ["currentTemperature", "currentHumidity", "switch", "masterSwitch"],
+  devicesThermostatParams: ['currentTemperature', 'currentHumidity', 'switch', 'masterSwitch'],
   devicesFan: [34],
-  devicesFanParams: ["switches", "light", "fan", "speed"],
+  devicesFanParams: ['switches', 'light', 'fan', 'speed'],
   devicesOutlet: [32],
-  devicesOutletParams: ["switch", "power", "voltage", "current"],
+  devicesOutletParams: ['switch', 'power', 'voltage', 'current'],
   devicesCamera: [87],
   devicesUSB: [77],
-  devicesUSBParams: ["switches"],
+  devicesUSBParams: ['switches'],
   devicesSCM: [78],
-  devicesSCMParams: ["switches"],
+  devicesSCMParams: ['switches'],
   devicesRFBridge: [28],
-  devicesRFBridgeParams: ["cmd"],
+  devicesRFBridgeParams: ['cmd'],
   devicesZBBridge: [66],
-  devicesZBBridgeParams: ["key", "temperature", "humidity", "motion", "lock", "trigTime", "battery"],
+  devicesZBBridgeParams: ['key', 'temperature', 'humidity', 'motion', 'lock', 'trigTime', 'battery'],
   devicesZB: [1000, 1770, 2026, 3026],
-  devicesValveParams: ["switches"],
-  devicesGarageParams: ["switch", "switches"],
-  devicesLockParams: ["switch"],
-  allowedGroups: ["blind", "garage", "lock"],
-  paramsToKeep: [
-    "battery",
-    "bright",
-    "brightness",
-    "channel",
-    "cmd",
-    "colorB",
-    "colorG",
-    "colorR",
-    "current",
-    "currentHumidity",
-    "currentTemperature",
-    "fan",
-    "humidity",
-    "key",
-    "light",
-    "lock",
-    "mainSwitch",
-    "mode",
-    "motion",
-    "online",
-    "power",
-    "rfChl",
-    "rfList",
-    "rfTrig",
-    "sensorType",
-    "setclose",
-    "speed",
-    "state",
-    "switch",
-    "switches",
-    "temperature",
-    "trigTime",
-    "type",
-    "voltage",
-    "zyx_mode",
-  ],
-  defaultMultiSwitchOff: [
-    {
-      switch: "off",
-      outlet: 0,
-    },
-    {
-      switch: "off",
-      outlet: 1,
-    },
-    {
-      switch: "off",
-      outlet: 2,
-    },
-    {
-      switch: "off",
-      outlet: 3,
-    },
+  devicesValveParams: ['switches'],
+  devicesGarageParams: ['switch', 'switches'],
+  devicesLockParams: ['switch'],
+  allowedGroups: ['blind', 'garage', 'lock'],
+  paramsToKeep: ['battery', 'bright', 'brightness', 'channel', 'cmd', 'colorB', 'colorG', 'colorR', 'current', 'currentHumidity', 'currentTemperature', 'fan', 'humidity', 'key', 'light', 'lock', 'mainSwitch', 'mode', 'motion', 'online', 'power', 'rfChl', 'rfList', 'rfTrig', 'sensorType', 'setclose', 'speed', 'state', 'switch', 'switches', 'temperature', 'trigTime', 'type', 'voltage', 'zyx_mode'],
+  defaultMultiSwitchOff: [{
+    switch: 'off',
+    outlet: 0
+  },
+  {
+    switch: 'off',
+    outlet: 1
+  },
+  {
+    switch: 'off',
+    outlet: 2
+  },
+  {
+    switch: 'off',
+    outlet: 3
+  }
   ],
   chansFromUiid: {
     1: 1, // "SOCKET"                                  \\ 20, MINI, BASIC, S26
@@ -200,6 +151,6 @@ module.exports = {
     3026: 1, // "ZIGBEE_DOOR_AND_WINDOW_SENSOR"        \\
     3256: 3, // "ZIGBEE_SWITCH_3"                      \\
     4026: 1, // "ZIGBEE_WATER_SENSOR"                  \\
-    4256: 4, // "ZIGBEE_SWITCH_4"                      \\
-  },
-};
+    4256: 4 // "ZIGBEE_SWITCH_4"                      \\
+  }
+}
diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index f5ca8134..7ea7569b 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -1,492 +1,453 @@
-/* jshint esversion: 9, -W014, -W030, node: true */
-"use strict";
-let Accessory, Characteristic, EveService, EveHistoryService, Service;
-const cns = require("./constants"),
-  corrInterval = require("correcting-interval"),
-  deviceCurtain = require("./device/curtain"),
-  deviceBlind = require("./device/blind"),
-  deviceGarage = require("./device/garage"),
-  deviceLock = require("./device/lock"),
-  deviceValve = require("./device/valve"),
-  deviceSensor = require("./device/sensor"),
-  deviceFan = require("./device/fan"),
-  deviceThermostat = require("./device/thermostat"),
-  deviceOutlet = require("./device/outlet"),
-  deviceUSB = require("./device/usb"),
-  deviceSCM = require("./device/scm"),
-  deviceLight = require("./device/light"),
-  deviceSwitch = require("./device/switch"),
-  deviceRFSub = require("./device/rf-sub"),
-  deviceZBDev = require("./device/zb-dev"),
-  eWeLinkHTTP = require("./eWeLinkHTTP"),
-  eWeLinkWS = require("./eWeLinkWS"),
-  eWeLinkLAN = require("./eWeLinkLAN"),
-  fakegato = require("fakegato-history"),
-  hbLib = require("homebridge-lib"),
-  promInterval = require("interval-promise"),
-  utils = require("./utils");
+'use strict'
+let Accessory, Characteristic, EveService, EveHistoryService, Service
+const cns = require('./constants')
+const corrInterval = require('correcting-interval')
+const DeviceCurtain = require('./device/curtain')
+const DeviceBlind = require('./device/blind')
+const DeviceGarage = require('./device/garage')
+const DeviceLock = require('./device/lock')
+const DeviceValve = require('./device/valve')
+const DeviceSensor = require('./device/sensor')
+const DeviceFan = require('./device/fan')
+const DeviceThermostat = require('./device/thermostat')
+const DeviceOutlet = require('./device/outlet')
+const DeviceUSB = require('./device/usb')
+const DeviceSCM = require('./device/scm')
+const DeviceLight = require('./device/light')
+const DeviceSwitch = require('./device/switch')
+const DeviceRFSub = require('./device/rf-sub')
+const DeviceZBDev = require('./device/zb-dev')
+const EWeLinkHTTP = require('./eWeLinkHTTP')
+const EWeLinkWS = require('./eWeLinkWS')
+const EWeLinkLAN = require('./eWeLinkLAN')
+const fakegato = require('fakegato-history')
+const hbLib = require('homebridge-lib')
+const promInterval = require('interval-promise')
+const utils = require('./utils')
 class eWeLink {
-  constructor(log, config, api) {
-    if (!log || !api || !config) return;
+  constructor (log, config, api) {
+    if (!log || !api || !config) return
     if (!config.username || !config.password || !config.countryCode) {
-      log.error("*********** Cannot load homebridge-ewelink ***********");
-      log.error("eWeLink credentials missing from the Homebridge config.");
-      log.error("*******************************************************");
-      return;
+      log.error('*********** Cannot load homebridge-ewelink ***********')
+      log.error('eWeLink credentials missing from the Homebridge config.')
+      log.error('*******************************************************')
+      return
     }
-    this.log = log;
-    this.config = config;
-    this.api = api;
-    this.debug = this.config.debug || false;
-    this.devicesInHB = new Map();
-    this.devicesInEW = new Map();
-    this.cusG = new Map();
-    this.cusS = new Map();
-    this.hiddenMasters = [];
-    this.eveLogPath = this.api.user.storagePath() + "/homebridge-ewelink/";
-    this.wsRefreshFlag = true;
+    this.log = log
+    this.config = config
+    this.api = api
+    this.debug = this.config.debug || false
+    this.devicesInHB = new Map()
+    this.devicesInEW = new Map()
+    this.cusG = new Map()
+    this.cusS = new Map()
+    this.hiddenMasters = []
+    this.eveLogPath = this.api.user.storagePath() + '/homebridge-ewelink/'
+    this.wsRefreshFlag = true
     this.api
-      .on("didFinishLaunching", () => this.eWeLinkSync())
-      .on("shutdown", () => {
-        if (this.lanClient) this.lanClient.closeConnection();
-        if (this.wsClient) this.wsClient.closeConnection();
-        this.wsRefreshFlag = false;
-      });
+      .on('didFinishLaunching', () => this.eWeLinkSync())
+      .on('shutdown', () => {
+        if (this.lanClient) this.lanClient.closeConnection()
+        if (this.wsClient) this.wsClient.closeConnection()
+        this.wsRefreshFlag = false
+      })
   }
-  async eWeLinkSync() {
+
+  async eWeLinkSync () {
     try {
-      this.log("Plugin has finished initialising. Synching with eWeLink.");
-      this.httpClient = new eWeLinkHTTP(this.config, this.log);
-      await this.httpClient.getHost();
-      this.authData = await this.httpClient.login();
-      let deviceList = await this.httpClient.getDevices();
-      deviceList.forEach(device => this.devicesInEW.set(device.deviceid, device));
-      this.wsClient = new eWeLinkWS(this.config, this.log, this.authData);
-      this.lanClient = new eWeLinkLAN(this.config, this.log, deviceList);
-      await this.wsClient.getHost();
-      this.wsClient.login();
-      this.lanDevices = await this.lanClient.getHosts();
+      this.log('Plugin has finished initialising. Synching with eWeLink.')
+      this.httpClient = new EWeLinkHTTP(this.config, this.log)
+      await this.httpClient.getHost()
+      this.authData = await this.httpClient.login()
+      const deviceList = await this.httpClient.getDevices()
+      deviceList.forEach(device => this.devicesInEW.set(device.deviceid, device))
+      this.wsClient = new EWeLinkWS(this.config, this.log, this.authData)
+      this.lanClient = new EWeLinkLAN(this.config, this.log, deviceList)
+      await this.wsClient.getHost()
+      this.wsClient.login()
+      this.lanDevices = await this.lanClient.getHosts()
       await this.lanClient.startMonitor();
       (() => {
-        //*** Make a map of custom groups from Homebridge config ***\\
+        //* ** Make a map of custom groups from Homebridge config ***\\
         if (Object.keys(this.config.groups || []).length > 0) {
           this.config.groups
-            .filter(g => g.hasOwnProperty("type") && cns.allowedGroups.includes(g.type))
-            .filter(g => g.hasOwnProperty("deviceId") && this.devicesInEW.has(g.deviceId))
-            .forEach(g => this.cusG.set(g.deviceId + "SWX", g));
+            .filter(g => Object.prototype.hasOwnProperty.call(g, 'type') && cns.allowedGroups.includes(g.type))
+            .filter(g => Object.prototype.hasOwnProperty.call(g, 'deviceId') && this.devicesInEW.has(g.deviceId))
+            .forEach(g => this.cusG.set(g.deviceId + 'SWX', g))
         }
-        //*** Make a map of RF Bridge custom sensors from Homebridge config ***\\
+        //* ** Make a map of RF Bridge custom sensors from Homebridge config ***\\
         if (Object.keys(this.config.bridgeSensors || []).length > 0) {
           this.config.bridgeSensors
-            .filter(s => s.hasOwnProperty("deviceId") && this.devicesInEW.has(s.deviceId))
-            .forEach(s => this.cusS.set(s.fullDeviceId, s));
+            .filter(s => Object.prototype.hasOwnProperty.call(s, 'deviceId') && this.devicesInEW.has(s.deviceId))
+            .forEach(s => this.cusS.set(s.fullDeviceId, s))
         }
-        //*** Logging always helps to see if everything is okay so far ***\\
-        this.log("[%s] eWeLink devices loaded from the Homebridge cache.", this.devicesInHB.size);
-        this.log("[%s] primary devices loaded from your eWeLink account.", this.devicesInEW.size);
-        //*** Remove Homebridge accessories that don't appear in eWeLink ***\\
+        //* ** Logging always helps to see if everything is okay so far ***\\
+        this.log('[%s] eWeLink devices loaded from the Homebridge cache.', this.devicesInHB.size)
+        this.log('[%s] primary devices loaded from your eWeLink account.', this.devicesInEW.size)
+        //* ** Remove Homebridge accessories that don't appear in eWeLink ***\\
         this.devicesInHB.forEach(a => {
           if (!this.devicesInEW.has(a.context.eweDeviceId)) {
-            this.removeAccessory(a);
+            this.removeAccessory(a)
           }
-        });
-        //*** Synchronise devices between eWeLink and Homebridge and set up ws/lan listeners ***\\
-        this.devicesInEW.forEach(d => this.initialiseDevice(d));
-        this.wsClient.receiveUpdate(d => this.receiveDeviceUpdate(d));
-        this.lanClient.receiveUpdate(d => this.receiveDeviceUpdate(d));
+        })
+        //* ** Synchronise devices between eWeLink and Homebridge and set up ws/lan listeners ***\\
+        this.devicesInEW.forEach(d => this.initialiseDevice(d))
+        this.wsClient.receiveUpdate(d => this.receiveDeviceUpdate(d))
+        this.lanClient.receiveUpdate(d => this.receiveDeviceUpdate(d))
         this.wsRefresh = promInterval(
           async () => {
             if (this.wsRefreshFlag) {
               try {
                 if (this.wsClient) {
-                  await this.wsClient.getHost();
-                  await this.wsClient.closeConnection();
-                  await utils.sleep(250);
-                  await this.wsClient.login();
+                  await this.wsClient.getHost()
+                  await this.wsClient.closeConnection()
+                  await utils.sleep(250)
+                  await this.wsClient.login()
                 }
               } catch (err) {
-                this.log.warn(err);
+                this.log.warn(err)
               }
             }
           },
-          1800000,
-          {
-            stopOnError: false,
+          1800000, {
+            stopOnError: false
           }
-        );
-        this.log("eWeLink sync complete. Don't forget to ⭐️  this plugin on GitHub!");
+        )
+        this.log("eWeLink sync complete. Don't forget to ⭐️  this plugin on GitHub!")
         if (this.config.debugReqRes || false) {
-          this.log.warn("Note: 'Request & Response Logging' is not advised for long-term use.");
+          this.log.warn("Note: 'Request & Response Logging' is not advised for long-term use.")
         }
-      })();
+      })()
     } catch (err) {
-      this.log.error("************** Cannot load homebridge-ewelink **************");
-      this.log.error(err);
-      this.log.error("************************************************************");
-      if (this.lanClient) this.lanClient.closeConnection();
-      if (this.wsClient) this.wsClient.closeConnection();
-      this.wsRefreshFlag = false;
+      this.log.error('************** Cannot load homebridge-ewelink **************')
+      this.log.error(err)
+      this.log.error('************************************************************')
+      if (this.lanClient) this.lanClient.closeConnection()
+      if (this.wsClient) this.wsClient.closeConnection()
+      this.wsRefreshFlag = false
     }
   }
-  initialiseDevice(device) {
-    let accessory;
 
-    //*** CURTAINS ***\\
+  initialiseDevice (device) {
+    let accessory
+    //* ** CURTAINS ***\\
     if (cns.devicesCurtain.includes(device.extra.uiid)) {
-      accessory = this.devicesInHB.has(device.deviceid + "SWX")
-        ? this.devicesInHB.get(device.deviceid + "SWX")
-        : this.addAccessory(device, device.deviceid + "SWX", "curtain", false, {
-            cacheCurrentPosition: 0,
-          });
-      //*** @UPGRADE from v2 -> v3  23.09.2020 ***\\
-      if (accessory.context.hasOwnProperty("prevPos")) {
-        accessory.context.cacheCurrentPosition = accessory.context.prevPos;
-        delete accessory.context.prevPos;
-        //*** @ENDUPGRADE ***\\
+      accessory = this.devicesInHB.has(device.deviceid + 'SWX')
+        ? this.devicesInHB.get(device.deviceid + 'SWX')
+        : this.addAccessory(device, device.deviceid + 'SWX', 'curtain', false, {
+          cacheCurrentPosition: 0
+        })
+      //* ** @UPGRADE from v2 -> v3  23.09.2020 ***\\
+      if (Object.prototype.hasOwnProperty.call(accessory.context, 'prevPos')) {
+        accessory.context.cacheCurrentPosition = accessory.context.prevPos
+        delete accessory.context.prevPos
+        //* ** @ENDUPGRADE ***\\
       }
-      if (!accessory.context.hasOwnProperty("cacheCurrentPosition")) {
-        accessory.context.cacheCurrentPosition = 0;
-        //*** @ENDUPGRADE ***\\
+      if (!Object.prototype.hasOwnProperty.call(accessory.context, 'cacheCurrentPosition')) {
+        accessory.context.cacheCurrentPosition = 0
+        //* ** @ENDUPGRADE ***\\
       }
-    }
-    //*** WINDOW BLINDS ***\\
-    else if (this.cusG.has(device.deviceid + "SWX") && this.cusG.get(device.deviceid + "SWX").type === "blind") {
-      accessory = this.devicesInHB.has(device.deviceid + "SWX")
-        ? this.devicesInHB.get(device.deviceid + "SWX")
-        : this.addAccessory(device, device.deviceid + "SWX", "blind", false, {
-            cacheCurrentPosition: 0,
-            cachePositionState: 2,
-            cacheTargetPosition: 0,
-          });
-      //*** @UPGRADE from v2 -> v3  23.09.2020 ***\\
-      if (!accessory.context.hasOwnProperty("cacheCurrentPosition")) {
-        accessory.context.cacheCurrentPosition = 0;
-        accessory.context.cachePositionState = 2;
-        accessory.context.cacheTargetPosition = 0;
+    } else if (this.cusG.has(device.deviceid + 'SWX') && this.cusG.get(device.deviceid + 'SWX').type === 'blind') {
+      accessory = this.devicesInHB.has(device.deviceid + 'SWX')
+        ? this.devicesInHB.get(device.deviceid + 'SWX')
+        : this.addAccessory(device, device.deviceid + 'SWX', 'blind', false, {
+          cacheCurrentPosition: 0,
+          cachePositionState: 2,
+          cacheTargetPosition: 0
+        })
+      //* ** @UPGRADE from v2 -> v3  23.09.2020 ***\\
+      if (!Object.prototype.hasOwnProperty.call(accessory.context, 'cacheCurrentPosition')) {
+        accessory.context.cacheCurrentPosition = 0
+        accessory.context.cachePositionState = 2
+        accessory.context.cacheTargetPosition = 0
       }
-      //*** @ENDUPGRADE ***\\
-    }
-    //*** GARAGE DOORS ***\\
-    else if (this.cusG.has(device.deviceid + "SWX") && this.cusG.get(device.deviceid + "SWX").type === "garage") {
-      accessory = this.devicesInHB.has(device.deviceid + "SWX")
-        ? this.devicesInHB.get(device.deviceid + "SWX")
-        : this.addAccessory(device, device.deviceid + "SWX", "garage", false, {
-            cacheCurrentDoorState: 1,
-            cacheTargetDoorState: 1,
-          });
-      //*** @UPGRADE from v2 -> v3  23.09.2020 ***\\
-      if (!accessory.context.hasOwnProperty("cacheCurrentDoorState")) {
-        accessory.context.cacheCurrentDoorState = 1;
-        accessory.context.cacheTargetDoorState = 1;
+      //* ** @ENDUPGRADE ***\\
+    } else if (this.cusG.has(device.deviceid + 'SWX') && this.cusG.get(device.deviceid + 'SWX').type === 'garage') {
+      accessory = this.devicesInHB.has(device.deviceid + 'SWX')
+        ? this.devicesInHB.get(device.deviceid + 'SWX')
+        : this.addAccessory(device, device.deviceid + 'SWX', 'garage', false, {
+          cacheCurrentDoorState: 1,
+          cacheTargetDoorState: 1
+        })
+      //* ** @UPGRADE from v2 -> v3  23.09.2020 ***\\
+      if (!Object.prototype.hasOwnProperty.call(accessory.context, 'cacheCurrentDoorState')) {
+        accessory.context.cacheCurrentDoorState = 1
+        accessory.context.cacheTargetDoorState = 1
       }
-      //*** @ENDUPGRADE ***\\
-    }
-    //*** SINGLE LOCKS ***\\
-    else if (this.cusG.has(device.deviceid + "SWX") && this.cusG.get(device.deviceid + "SWX").type === "lock") {
-      accessory = this.devicesInHB.has(device.deviceid + "SWX")
-        ? this.devicesInHB.get(device.deviceid + "SWX")
-        : this.addAccessory(device, device.deviceid + "SWX", "lock");
-    }
-    //*** SENSORS (DW2) ***\\
-    else if (cns.devicesSensor.includes(device.extra.uiid)) {
-      accessory = this.devicesInHB.has(device.deviceid + "SWX")
-        ? this.devicesInHB.get(device.deviceid + "SWX")
-        : this.addAccessory(device, device.deviceid + "SWX", "sensor");
-    }
-    //*** IRRIGATION VALVES ***\\
-    else if (device.extra.uiid === 2 && device.brandName === "coolkit" && device.productModel === "0285") {
-      accessory = this.devicesInHB.has(device.deviceid + "SWX")
-        ? this.devicesInHB.get(device.deviceid + "SWX")
-        : this.addAccessory(device, device.deviceid + "SWX", "valve");
-    }
-    //*** FANS ***\\
-    else if (cns.devicesFan.includes(device.extra.uiid)) {
-      accessory = this.devicesInHB.has(device.deviceid + "SWX")
-        ? this.devicesInHB.get(device.deviceid + "SWX")
-        : this.addAccessory(device, device.deviceid + "SWX", "fan");
-    }
-    //*** THERMOSTATS ***\\
-    else if (cns.devicesThermostat.includes(device.extra.uiid)) {
-      accessory = this.devicesInHB.has(device.deviceid + "SWX")
-        ? this.devicesInHB.get(device.deviceid + "SWX")
-        : this.addAccessory(device, device.deviceid + "SWX", "thermostat", false, {
-            sensorType: device.params.sensorType,
-          });
-      //*** @UPGRADE from v2 -> v3  23.09.2020 ***\\
-      if (!accessory.context.hasOwnProperty("sensorType")) {
-        accessory.context.sensorType = device.params.sensorType;
+      //* ** @ENDUPGRADE ***\\
+    } else if (this.cusG.has(device.deviceid + 'SWX') && this.cusG.get(device.deviceid + 'SWX').type === 'lock') {
+      accessory = this.devicesInHB.has(device.deviceid + 'SWX')
+        ? this.devicesInHB.get(device.deviceid + 'SWX')
+        : this.addAccessory(device, device.deviceid + 'SWX', 'lock')
+    } else if (cns.devicesSensor.includes(device.extra.uiid)) {
+      accessory = this.devicesInHB.has(device.deviceid + 'SWX')
+        ? this.devicesInHB.get(device.deviceid + 'SWX')
+        : this.addAccessory(device, device.deviceid + 'SWX', 'sensor')
+    } else if (device.extra.uiid === 2 && device.brandName === 'coolkit' && device.productModel === '0285') {
+      accessory = this.devicesInHB.has(device.deviceid + 'SWX')
+        ? this.devicesInHB.get(device.deviceid + 'SWX')
+        : this.addAccessory(device, device.deviceid + 'SWX', 'valve')
+    } else if (cns.devicesFan.includes(device.extra.uiid)) {
+      accessory = this.devicesInHB.has(device.deviceid + 'SWX')
+        ? this.devicesInHB.get(device.deviceid + 'SWX')
+        : this.addAccessory(device, device.deviceid + 'SWX', 'fan')
+    } else if (cns.devicesThermostat.includes(device.extra.uiid)) {
+      accessory = this.devicesInHB.has(device.deviceid + 'SWX')
+        ? this.devicesInHB.get(device.deviceid + 'SWX')
+        : this.addAccessory(device, device.deviceid + 'SWX', 'thermostat', false, {
+          sensorType: device.params.sensorType
+        })
+      //* ** @UPGRADE from v2 -> v3  23.09.2020 ***\\
+      if (!Object.prototype.hasOwnProperty.call(accessory.context, 'sensorType')) {
+        accessory.context.sensorType = device.params.sensorType
       }
-      //*** @ENDUPGRADE ***\\
+      //* ** @ENDUPGRADE ***\\
       if (accessory.context.sensorType !== device.params.sensorType) {
-        accessory.context.sensorType = device.params.sensorType;
-        this.devicesInHB.set(accessory.context.hbDeviceId, accessory);
+        accessory.context.sensorType = device.params.sensorType
+        this.devicesInHB.set(accessory.context.hbDeviceId, accessory)
       }
-    }
-    //*** OUTLETS ***\\
-    else if (
+    } else if (
       cns.devicesOutlet.includes(device.extra.uiid) ||
       (cns.devicesSingleSwitch.includes(device.extra.uiid) &&
         cns.devicesSingleSwitchOutlet.includes(device.productModel))
     ) {
-      accessory = this.devicesInHB.has(device.deviceid + "SWX")
-        ? this.devicesInHB.get(device.deviceid + "SWX")
-        : this.addAccessory(device, device.deviceid + "SWX", "outlet");
-    }
-    //*** USB OUTLETS ***\\
-    else if (cns.devicesUSB.includes(device.extra.uiid)) {
-      accessory = this.devicesInHB.has(device.deviceid + "SWX")
-        ? this.devicesInHB.get(device.deviceid + "SWX")
-        : this.addAccessory(device, device.deviceid + "SWX", "usb");
-    }
-    //*** SINGLE CHANNEL [MULTI CHANNEL HARDWARE] ***\\
-    else if (cns.devicesSCM.includes(device.extra.uiid)) {
-      accessory = this.devicesInHB.has(device.deviceid + "SWX")
-        ? this.devicesInHB.get(device.deviceid + "SWX")
-        : this.addAccessory(device, device.deviceid + "SWX", "scm");
-    }
-    //*** SINGLE CHANNEL LIGHTS ***\\
-    else if (
+      accessory = this.devicesInHB.has(device.deviceid + 'SWX')
+        ? this.devicesInHB.get(device.deviceid + 'SWX')
+        : this.addAccessory(device, device.deviceid + 'SWX', 'outlet')
+    } else if (cns.devicesUSB.includes(device.extra.uiid)) {
+      accessory = this.devicesInHB.has(device.deviceid + 'SWX')
+        ? this.devicesInHB.get(device.deviceid + 'SWX')
+        : this.addAccessory(device, device.deviceid + 'SWX', 'usb')
+    } else if (cns.devicesSCM.includes(device.extra.uiid)) {
+      accessory = this.devicesInHB.has(device.deviceid + 'SWX')
+        ? this.devicesInHB.get(device.deviceid + 'SWX')
+        : this.addAccessory(device, device.deviceid + 'SWX', 'scm')
+    } else if (
       cns.devicesSingleSwitch.includes(device.extra.uiid) &&
       cns.devicesSingleSwitchLight.includes(device.productModel)
     ) {
-      accessory = this.devicesInHB.has(device.deviceid + "SWX")
-        ? this.devicesInHB.get(device.deviceid + "SWX")
-        : this.addAccessory(device, device.deviceid + "SWX", "light");
-    }
-    //*** MULTI CHANNEL LIGHTS ***\\
-    else if (
+      accessory = this.devicesInHB.has(device.deviceid + 'SWX')
+        ? this.devicesInHB.get(device.deviceid + 'SWX')
+        : this.addAccessory(device, device.deviceid + 'SWX', 'light')
+    } else if (
       cns.devicesMultiSwitch.includes(device.extra.uiid) &&
       cns.devicesMultiSwitchLight.includes(device.productModel)
     ) {
       if (this.config.hideMasters) {
-        if (this.devicesInHB.has(device.deviceid + "SW0")) {
-          this.removeAccessory(this.devicesInHB.get(device.deviceid + "SW0"));
+        if (this.devicesInHB.has(device.deviceid + 'SW0')) {
+          this.removeAccessory(this.devicesInHB.get(device.deviceid + 'SW0'))
         }
-        this.hiddenMasters.push(device.deviceid);
-        accessory = this.addAccessory(device, device.deviceid + "SW0", "light", true);
+        this.hiddenMasters.push(device.deviceid)
+        accessory = this.addAccessory(device, device.deviceid + 'SW0', 'light', true)
       } else {
-        accessory = this.devicesInHB.has(device.deviceid + "SW0")
-          ? this.devicesInHB.get(device.deviceid + "SW0")
-          : this.addAccessory(device, device.deviceid + "SW0", "light");
+        accessory = this.devicesInHB.has(device.deviceid + 'SW0')
+          ? this.devicesInHB.get(device.deviceid + 'SW0')
+          : this.addAccessory(device, device.deviceid + 'SW0', 'light')
       }
       for (let i = 1; i <= cns.chansFromUiid[device.extra.uiid]; i++) {
-        if ((this.config.hideFromHB || "").includes(device.deviceid + "SW" + i)) {
-          if (this.devicesInHB.has(device.deviceid + "SW" + i)) {
-            this.removeAccessory(this.devicesInHB.get(device.deviceid + "SW" + i));
+        if ((this.config.hideFromHB || '').includes(device.deviceid + 'SW' + i)) {
+          if (this.devicesInHB.has(device.deviceid + 'SW' + i)) {
+            this.removeAccessory(this.devicesInHB.get(device.deviceid + 'SW' + i))
           }
         } else {
-          let oAccessory = this.devicesInHB.has(device.deviceid + "SW" + i)
-            ? this.devicesInHB.get(device.deviceid + "SW" + i)
-            : this.addAccessory(device, device.deviceid + "SW" + i, "light");
+          const oAccessory = this.devicesInHB.has(device.deviceid + 'SW' + i)
+            ? this.devicesInHB.get(device.deviceid + 'SW' + i)
+            : this.addAccessory(device, device.deviceid + 'SW' + i, 'light')
           oAccessory
             .getService(Service.AccessoryInformation)
-            .setCharacteristic(Characteristic.FirmwareRevision, device.params.fwVersion);
-          oAccessory.context.reachableWAN = device.online;
-          oAccessory.context.reachableLAN = this.lanDevices.get(device.deviceid).online || false;
-          this.devicesInHB.set(oAccessory.context.hbDeviceId, oAccessory);
+            .setCharacteristic(Characteristic.FirmwareRevision, device.params.fwVersion)
+          oAccessory.context.reachableWAN = device.online
+          oAccessory.context.reachableLAN = this.lanDevices.get(device.deviceid).online || false
+          this.devicesInHB.set(oAccessory.context.hbDeviceId, oAccessory)
         }
       }
-    }
-    //*** SINGLE CHANNEL SWITCHES ***\\
-    else if (cns.devicesSingleSwitch.includes(device.extra.uiid)) {
-      accessory = this.devicesInHB.has(device.deviceid + "SWX")
-        ? this.devicesInHB.get(device.deviceid + "SWX")
-        : this.addAccessory(device, device.deviceid + "SWX", "switch");
-    }
-    //*** MULTI CHANNEL SWITCHES ***\\
-    else if (cns.devicesMultiSwitch.includes(device.extra.uiid)) {
+    } else if (cns.devicesSingleSwitch.includes(device.extra.uiid)) {
+      accessory = this.devicesInHB.has(device.deviceid + 'SWX')
+        ? this.devicesInHB.get(device.deviceid + 'SWX')
+        : this.addAccessory(device, device.deviceid + 'SWX', 'switch')
+    } else if (cns.devicesMultiSwitch.includes(device.extra.uiid)) {
       if (this.config.hideMasters) {
-        if (this.devicesInHB.has(device.deviceid + "SW0")) {
-          this.removeAccessory(this.devicesInHB.get(device.deviceid + "SW0"));
+        if (this.devicesInHB.has(device.deviceid + 'SW0')) {
+          this.removeAccessory(this.devicesInHB.get(device.deviceid + 'SW0'))
         }
-        this.hiddenMasters.push(device.deviceid);
-        accessory = this.addAccessory(device, device.deviceid + "SW0", "switch", true);
+        this.hiddenMasters.push(device.deviceid)
+        accessory = this.addAccessory(device, device.deviceid + 'SW0', 'switch', true)
       } else {
-        accessory = this.devicesInHB.has(device.deviceid + "SW0")
-          ? this.devicesInHB.get(device.deviceid + "SW0")
-          : this.addAccessory(device, device.deviceid + "SW0", "switch");
+        accessory = this.devicesInHB.has(device.deviceid + 'SW0')
+          ? this.devicesInHB.get(device.deviceid + 'SW0')
+          : this.addAccessory(device, device.deviceid + 'SW0', 'switch')
       }
       for (let i = 1; i <= cns.chansFromUiid[device.extra.uiid]; i++) {
-        if ((this.config.hideFromHB || "").includes(device.deviceid + "SW" + i)) {
-          if (this.devicesInHB.has(device.deviceid + "SW" + i)) {
-            this.removeAccessory(this.devicesInHB.get(device.deviceid + "SW" + i));
+        if ((this.config.hideFromHB || '').includes(device.deviceid + 'SW' + i)) {
+          if (this.devicesInHB.has(device.deviceid + 'SW' + i)) {
+            this.removeAccessory(this.devicesInHB.get(device.deviceid + 'SW' + i))
           }
         } else {
-          let oAccessory = this.devicesInHB.has(device.deviceid + "SW" + i)
-            ? this.devicesInHB.get(device.deviceid + "SW" + i)
-            : this.addAccessory(device, device.deviceid + "SW" + i, "switch");
+          const oAccessory = this.devicesInHB.has(device.deviceid + 'SW' + i)
+            ? this.devicesInHB.get(device.deviceid + 'SW' + i)
+            : this.addAccessory(device, device.deviceid + 'SW' + i, 'switch')
           oAccessory
             .getService(Service.AccessoryInformation)
-            .setCharacteristic(Characteristic.FirmwareRevision, device.params.fwVersion);
-          oAccessory.context.reachableWAN = device.online;
-          oAccessory.context.reachableLAN = this.lanDevices.get(device.deviceid).online || false;
-          this.devicesInHB.set(oAccessory.context.hbDeviceId, oAccessory);
+            .setCharacteristic(Characteristic.FirmwareRevision, device.params.fwVersion)
+          oAccessory.context.reachableWAN = device.online
+          oAccessory.context.reachableLAN = this.lanDevices.get(device.deviceid).online || false
+          this.devicesInHB.set(oAccessory.context.hbDeviceId, oAccessory)
         }
       }
-    }
-    //*** RF BRIDGES ***\\
-    else if (cns.devicesRFBridge.includes(device.extra.uiid)) {
-      let accessory,
-        rfChlCounter = 0,
-        rfMap = [];
-      if (device.hasOwnProperty("tags") && device.tags.hasOwnProperty("zyx_info")) {
+    } else if (cns.devicesRFBridge.includes(device.extra.uiid)) {
+      let rfChlCounter = 0
+      const rfMap = []
+      if (Object.prototype.hasOwnProperty.call(device, 'tags') && Object.prototype.hasOwnProperty.call(device.tags, 'zyx_info')) {
         device.tags.zyx_info.forEach(remote =>
           rfMap.push({
             name: remote.name,
             type: remote.remote_type,
-            buttons: Object.assign({}, ...remote.buttonName),
+            buttons: Object.assign({}, ...remote.buttonName)
           })
-        );
+        )
       }
-      accessory = this.devicesInHB.has(device.deviceid + "SW0")
-        ? this.devicesInHB.get(device.deviceid + "SW0")
-        : this.addAccessory(device, device.deviceid + "SW0", "rf_pri", true, {
-            rfMap,
-          });
-      this.log.error(JSON.stringify(accessory.context, null, 2));
+      const accessory = this.devicesInHB.has(device.deviceid + 'SW0')
+        ? this.devicesInHB.get(device.deviceid + 'SW0')
+        : this.addAccessory(device, device.deviceid + 'SW0', 'rf_pri', true, {
+          rfMap
+        })
+      this.log.error(JSON.stringify(accessory.context, null, 2))
       rfMap.forEach(subDevice => {
-        let swNumber = rfChlCounter + 1,
-          subAccessory,
-          subType,
-          subExtraContext = {};
+        const swNumber = rfChlCounter + 1
+        let subAccessory
+        let subType
+        let subExtraContext = {}
         switch (subDevice.type) {
-          case "1":
-          case "2":
-          case "3":
-          case "4":
-            subType = "button";
-            break;
-          case "6":
-            subType = this.cusS.has(device.deviceid + "SW" + swNumber)
-              ? this.cusS.get(device.deviceid + "SW" + swNumber).type
-              : "motion";
-            break;
+          case '1':
+          case '2':
+          case '3':
+          case '4':
+            subType = 'button'
+            break
+          case '6':
+            subType = this.cusS.has(device.deviceid + 'SW' + swNumber)
+              ? this.cusS.get(device.deviceid + 'SW' + swNumber).type
+              : 'motion'
+            break
           default:
-            return;
+            return
         }
         subExtraContext = {
           buttons: subDevice.buttons,
           subType,
-          swNumber,
-        };
-        if ((subAccessory = this.devicesInHB.get(device.deviceid + "SW" + swNumber))) {
+          swNumber
+        }
+        if ((subAccessory = this.devicesInHB.get(device.deviceid + 'SW' + swNumber))) {
           if (subAccessory.context.subType !== subType || subAccessory.context.swNumber !== swNumber) {
-            this.removeAccessory(subAccessory);
+            this.removeAccessory(subAccessory)
           }
         }
-        subAccessory = this.devicesInHB.has(device.deviceid + "SW" + swNumber)
-          ? this.devicesInHB.get(device.deviceid + "SW" + swNumber)
-          : this.addAccessory(device, device.deviceid + "SW" + swNumber, "rf_sub", false, subExtraContext);
+        subAccessory = this.devicesInHB.has(device.deviceid + 'SW' + swNumber)
+          ? this.devicesInHB.get(device.deviceid + 'SW' + swNumber)
+          : this.addAccessory(device, device.deviceid + 'SW' + swNumber, 'rf_sub', false, subExtraContext)
         subAccessory
           .getService(Service.AccessoryInformation)
-          .setCharacteristic(Characteristic.FirmwareRevision, device.params.fwVersion);
-        subAccessory.context.reachableWAN = device.online;
-        subAccessory.context.reachableLAN = false;
-        this.devicesInHB.set(subAccessory.context.hbDeviceId, subAccessory);
-        this.log.warn(JSON.stringify(subAccessory.context, null, 2));
-        rfChlCounter += Object.keys(subDevice.buttons || {}).length;
-      });
-      accessory.context.channelCount = rfChlCounter;
-      this.devicesInHB.set(accessory.context.hbDeviceId, accessory);
-    }
-    //*** ZIGBEE BRIDGES ***\\
-    else if (cns.devicesZBBridge.includes(device.extra.uiid)) {
+          .setCharacteristic(Characteristic.FirmwareRevision, device.params.fwVersion)
+        subAccessory.context.reachableWAN = device.online
+        subAccessory.context.reachableLAN = false
+        this.devicesInHB.set(subAccessory.context.hbDeviceId, subAccessory)
+        this.log.warn(JSON.stringify(subAccessory.context, null, 2))
+        rfChlCounter += Object.keys(subDevice.buttons || {}).length
+      })
+      accessory.context.channelCount = rfChlCounter
+      this.devicesInHB.set(accessory.context.hbDeviceId, accessory)
+    } else if (cns.devicesZBBridge.includes(device.extra.uiid)) {
       // Nothing to do here but needed to avoid the below not supported error
-      //*** @UPGRADE from v2 -> v3  23.09.2020 ***\\
-      if ((accessory = this.devicesInHB.get(device.deviceid + "SWX"))) {
-        this.removeAccessory(accessory);
+      //* ** @UPGRADE from v2 -> v3  23.09.2020 ***\\
+      if ((accessory = this.devicesInHB.get(device.deviceid + 'SWX'))) {
+        this.removeAccessory(accessory)
       }
-      //*** @ENDUPGRADE ***\\
-    }
-    //*** ZIGBEE DEVICES ***\\
-    else if (cns.devicesZB.includes(device.extra.uiid)) {
-      accessory = this.devicesInHB.has(device.deviceid + "SWX")
-        ? this.devicesInHB.get(device.deviceid + "SWX")
-        : this.addAccessory(device, device.deviceid + "SWX", "zb_dev");
-      //*** @UPGRADE from v2 -> v3  23.09.2020 ***\\
-      if (accessory.context.type === "zb_sub") {
-        accessory.context.type = "zb_dev";
+      //* ** @ENDUPGRADE ***\\
+    } else if (cns.devicesZB.includes(device.extra.uiid)) {
+      accessory = this.devicesInHB.has(device.deviceid + 'SWX')
+        ? this.devicesInHB.get(device.deviceid + 'SWX')
+        : this.addAccessory(device, device.deviceid + 'SWX', 'zb_dev')
+      //* ** @UPGRADE from v2 -> v3  23.09.2020 ***\\
+      if (accessory.context.type === 'zb_sub') {
+        accessory.context.type = 'zb_dev'
       }
-      //*** @ENDUPGRADE ***\\
-    }
-    //*** SONOFF CAMERAS ***\\
-    else if (cns.devicesCamera.includes(device.extra.uiid)) {
+      //* ** @ENDUPGRADE ***\\
+    } else if (cns.devicesCamera.includes(device.extra.uiid)) {
       this.log.warn(
         ' → [%s] please see "https://github.com/bwp91/homebridge-ewelink/wiki/How-to-set-up-Sonoff-Camera".',
         device.name
-      );
-      return;
-    }
-    //*** ALL OTHER = UNSUPPORTED ***\\
-    else {
+      )
+      return
+    } else {
       this.log.warn(
-        " → [%s] cannot be added as it is not supported by this plugin. Please make a GitHub issue request.",
+        ' → [%s] cannot be added as it is not supported by this plugin. Please make a GitHub issue request.',
         device.name
-      );
-      return;
+      )
+      return
     }
-    if (!accessory) return;
+    if (!accessory) return
     if (!this.hiddenMasters.includes(device.deviceid)) {
       accessory
         .getService(Service.AccessoryInformation)
-        .setCharacteristic(Characteristic.FirmwareRevision, device.params.fwVersion);
+        .setCharacteristic(Characteristic.FirmwareRevision, device.params.fwVersion)
     }
-    accessory.context.reachableWAN = device.online;
+    accessory.context.reachableWAN = device.online
     accessory.context.reachableLAN = this.lanDevices.has(device.deviceid)
       ? this.lanDevices.get(device.deviceid).online
-      : false;
-    accessory.context.inUse = false;
+      : false
+    accessory.context.inUse = false
     let str = accessory.context.reachableLAN
-      ? "and found locally with IP [" + this.lanDevices.get(device.deviceid).ip + "]"
-      : "but LAN mode unavailable as device ";
+      ? 'and found locally with IP [' + this.lanDevices.get(device.deviceid).ip + ']'
+      : 'but LAN mode unavailable as device '
     if (!accessory.context.reachableLAN) {
       if (cns.devicesNonLAN.includes(device.extra.uiid)) {
-        str += "doesn't support it";
-      } else if (device.hasOwnProperty("sharedBy") && device.sharedBy.hasOwnProperty("email")) {
-        str += "is shared (" + device.sharedBy.email + ")";
+        str += "doesn't support it"
+      } else if (Object.prototype.hasOwnProperty.call(device, 'sharedBy') && Object.prototype.hasOwnProperty.call(device.sharedBy, 'email')) {
+        str += 'is shared (' + device.sharedBy.email + ')'
       } else {
-        str += "is unreachable";
+        str += 'is unreachable'
       }
     }
-    this.log(" → [%s] initialised %s.", device.name, str);
-    this.devicesInHB.set(accessory.context.hbDeviceId, accessory);
+    this.log(' → [%s] initialised %s.', device.name, str)
+    this.devicesInHB.set(accessory.context.hbDeviceId, accessory)
     if (!(this.config.disableHTTPRefresh || false)) {
       if (!this.refreshAccessory(accessory, device.params)) {
         this.log.warn(
-          "[%s] could not be initialised. Please try removing accessory from the Homebridge cache along with any secondary devices (SW1, SW2, etc.) [debug:%s:%s].",
+          '[%s] could not be initialised. Please try removing accessory from the Homebridge cache along with any secondary devices (SW1, SW2, etc.) [debug:%s:%s].',
           accessory.displayName,
           accessory.context.type,
           accessory.context.channelCount
-        );
+        )
         this.log.warn(
           'If you are unsure how to do this, please see "https://github.com/bwp91/homebridge-ewelink/wiki/How-to-remove-an-accessory-from-the-cache'
-        );
+        )
       }
     }
   }
-  addAccessory(device, hbDeviceId, type, hidden = false, extraContext = {}) {
-    let switchNumber = hbDeviceId.substr(-1).toString(),
-      newDeviceName = type === "rf_sub" ? device.tags.zyx_info[switchNumber - 1].name : device.name,
-      channelCount =
-        type === "rf_pri"
-          ? Object.keys((device.tags && device.tags.zyx_info) || []).length
-          : cns.chansFromUiid[device.extra.uiid];
-    if (["1", "2", "3", "4"].includes(switchNumber) && type !== "rf_sub") {
-      newDeviceName += " SW" + switchNumber;
+
+  addAccessory (device, hbDeviceId, type, hidden = false, extraContext = {}) {
+    const switchNumber = hbDeviceId.substr(-1).toString()
+    let newDeviceName = type === 'rf_sub' ? device.tags.zyx_info[switchNumber - 1].name : device.name
+    const channelCount =
+      type === 'rf_pri'
+        ? Object.keys((device.tags && device.tags.zyx_info) || []).length
+        : cns.chansFromUiid[device.extra.uiid]
+    if (['1', '2', '3', '4'].includes(switchNumber) && type !== 'rf_sub') {
+      newDeviceName += ' SW' + switchNumber
     }
-    if ((this.config.nameOverride || {}).hasOwnProperty(hbDeviceId)) {
-      newDeviceName = this.config.nameOverride[hbDeviceId];
+    if (Object.prototype.hasOwnProperty.call(this.config.nameOverride || {}, hbDeviceId)) {
+      newDeviceName = this.config.nameOverride[hbDeviceId]
     }
     try {
-      const accessory = new Accessory(newDeviceName, this.api.hap.uuid.generate(hbDeviceId).toString());
+      const accessory = new Accessory(newDeviceName, this.api.hap.uuid.generate(hbDeviceId).toString())
       if (!hidden) {
         accessory
           .getService(Service.AccessoryInformation)
           .setCharacteristic(Characteristic.SerialNumber, hbDeviceId)
           .setCharacteristic(Characteristic.Manufacturer, device.brandName)
-          .setCharacteristic(Characteristic.Model, device.productModel + " (" + device.extra.model + ")")
+          .setCharacteristic(Characteristic.Model, device.productModel + ' (' + device.extra.model + ')')
           .setCharacteristic(Characteristic.FirmwareRevision, device.params.fwVersion)
-          .setCharacteristic(Characteristic.Identify, false);
+          .setCharacteristic(Characteristic.Identify, false)
       }
       accessory.context = {
         ...{
@@ -497,472 +458,487 @@ class eWeLink {
           eweApiKey: device.apikey,
           switchNumber,
           channelCount,
-          type,
+          type
         },
-        ...extraContext,
-      };
+        ...extraContext
+      }
       if (!hidden) {
-        this.api.registerPlatformAccessories("homebridge-ewelink", "eWeLink", [accessory]);
-        this.configureAccessory(accessory);
-        this.log(" → [%s] has been added to Homebridge.", newDeviceName);
+        this.api.registerPlatformAccessories('homebridge-ewelink', 'eWeLink', [accessory])
+        this.configureAccessory(accessory)
+        this.log(' → [%s] has been added to Homebridge.', newDeviceName)
       }
-      return accessory;
+      return accessory
     } catch (err) {
-      this.log.warn(" → [%s] could not be added as %s.", newDeviceName, err);
-      return false;
+      this.log.warn(' → [%s] could not be added as %s.', newDeviceName, err)
+      return false
     }
   }
-  configureAccessory(accessory) {
-    if (!this.log) return;
+
+  configureAccessory (accessory) {
+    if (!this.log) return
     try {
-      accessory.context.reachableWAN = true;
-      accessory.context.reachableLAN = true;
+      accessory.context.reachableWAN = true
+      accessory.context.reachableLAN = true
       switch (accessory.context.type) {
-        case "curtain":
-          accessory.control = new deviceCurtain(this);
-          let cService;
+        case 'curtain': {
+          accessory.control = new DeviceCurtain(this)
+          let cService
           if (!(cService = accessory.getService(Service.WindowCovering))) {
             accessory
               .addService(Service.WindowCovering)
               .setCharacteristic(Characteristic.CurrentPosition, 0)
               .setCharacteristic(Characteristic.TargetPosition, 0)
-              .setCharacteristic(Characteristic.PositionState, 2);
-            cService = accessory.getService(Service.WindowCovering);
+              .setCharacteristic(Characteristic.PositionState, 2)
+            cService = accessory.getService(Service.WindowCovering)
           }
           cService
             .getCharacteristic(Characteristic.TargetPosition)
-            .on("set", (value, callback) => accessory.control.internalCurtainUpdate(accessory, value, callback));
-          break;
-        case "blind":
-          accessory.control = new deviceBlind(this);
-          let wcService;
+            .on('set', (value, callback) => accessory.control.internalCurtainUpdate(accessory, value, callback))
+          break
+        }
+        case 'blind': {
+          accessory.control = new DeviceBlind(this)
+          let wcService
           if (!(wcService = accessory.getService(Service.WindowCovering))) {
             accessory
               .addService(Service.WindowCovering)
               .setCharacteristic(Characteristic.CurrentPosition, 0)
               .setCharacteristic(Characteristic.TargetPosition, 0)
-              .setCharacteristic(Characteristic.PositionState, 2);
-            wcService = accessory.getService(Service.WindowCovering);
+              .setCharacteristic(Characteristic.PositionState, 2)
+            wcService = accessory.getService(Service.WindowCovering)
           }
           wcService
             .getCharacteristic(Characteristic.TargetPosition)
-            .on("set", (value, callback) => accessory.control.internalBlindUpdate(accessory, value, callback));
-          break;
-        case "garage":
-          accessory.control = new deviceGarage(this);
-          let gdService;
+            .on('set', (value, callback) => accessory.control.internalBlindUpdate(accessory, value, callback))
+          break
+        }
+        case 'garage': {
+          accessory.control = new DeviceGarage(this)
+          let gdService
           if (!(gdService = accessory.getService(Service.GarageDoorOpener))) {
             accessory
               .addService(Service.GarageDoorOpener)
               .setCharacteristic(Characteristic.CurrentDoorState, 1)
               .setCharacteristic(Characteristic.TargetDoorState, 1)
-              .setCharacteristic(Characteristic.ObstructionDetected, false);
-            gdService = accessory.getService(Service.GarageDoorOpener);
+              .setCharacteristic(Characteristic.ObstructionDetected, false)
+            gdService = accessory.getService(Service.GarageDoorOpener)
           }
           gdService
             .getCharacteristic(Characteristic.TargetDoorState)
-            .on("set", (value, callback) => accessory.control.internalGarageUpdate(accessory, value, callback));
-          break;
-        case "lock":
-          accessory.control = new deviceLock(this);
-          let lmService = accessory.getService(Service.LockMechanism) || accessory.addService(Service.LockMechanism);
+            .on('set', (value, callback) => accessory.control.internalGarageUpdate(accessory, value, callback))
+          break
+        }
+        case 'lock': {
+          accessory.control = new DeviceLock(this)
+          const lmService = accessory.getService(Service.LockMechanism) || accessory.addService(Service.LockMechanism)
           lmService
             .getCharacteristic(Characteristic.LockTargetState)
-            .on("set", (value, callback) => accessory.control.internalLockUpdate(accessory, value, callback));
-          break;
-        case "valve":
-          accessory.control = new deviceValve(this);
-          ["A", "B"].forEach(v => {
-            let valveService;
-            if (!(valveService = accessory.getService("Valve " + v))) {
+            .on('set', (value, callback) => accessory.control.internalLockUpdate(accessory, value, callback))
+          break
+        }
+        case 'valve': {
+          accessory.control = new DeviceValve(this);
+          ['A', 'B'].forEach(v => {
+            let valveService
+            if (!(valveService = accessory.getService('Valve ' + v))) {
               accessory
-                .addService(Service.Valve, "Valve " + v, "valve" + v.toLowerCase())
+                .addService(Service.Valve, 'Valve ' + v, 'valve' + v.toLowerCase())
                 .setCharacteristic(Characteristic.Active, 0)
                 .setCharacteristic(Characteristic.InUse, 0)
                 .setCharacteristic(Characteristic.ValveType, 1)
                 .setCharacteristic(Characteristic.SetDuration, this.config.valveTimeLength || 120)
-                .addCharacteristic(Characteristic.RemainingDuration);
-              valveService = accessory.getService("Valve " + v);
+                .addCharacteristic(Characteristic.RemainingDuration)
+              valveService = accessory.getService('Valve ' + v)
             }
             valveService
               .getCharacteristic(Characteristic.Active)
-              .on("set", (value, callback) =>
-                accessory.control.internalValveUpdate(accessory, "Valve " + v, value, callback)
-              );
-            valveService.getCharacteristic(Characteristic.SetDuration).on("set", (value, callback) => {
+              .on('set', (value, callback) =>
+                accessory.control.internalValveUpdate(accessory, 'Valve ' + v, value, callback)
+              )
+            valveService.getCharacteristic(Characteristic.SetDuration).on('set', (value, callback) => {
               if (valveService.getCharacteristic(Characteristic.InUse).value) {
-                valveService.updateCharacteristic(Characteristic.RemainingDuration, value);
-                clearTimeout(valveService.timer);
+                valveService.updateCharacteristic(Characteristic.RemainingDuration, value)
+                clearTimeout(valveService.timer)
                 valveService.timer = setTimeout(() => {
-                  valveService.setCharacteristic(Characteristic.Active, 0);
-                }, value * 1000);
+                  valveService.setCharacteristic(Characteristic.Active, 0)
+                }, value * 1000)
               }
-              callback();
-            });
-          });
-          break;
-        case "sensor":
-          accessory.control = new deviceSensor(this);
-          accessory.getService(Service.ContactSensor) || accessory.addService(Service.ContactSensor);
-          accessory.getService(Service.BatteryService) || accessory.addService(Service.BatteryService);
-          break;
-        case "fan":
-          accessory.control = new deviceFan(this);
-          let fanService = accessory.getService(Service.Fanv2) || accessory.addService(Service.Fanv2),
-            fanLightService = accessory.getService(Service.Lightbulb) || accessory.addService(Service.Lightbulb);
+              callback()
+            })
+          })
+          break
+        }
+        case 'sensor': {
+          accessory.control = new DeviceSensor(this)
+          accessory.getService(Service.ContactSensor) || accessory.addService(Service.ContactSensor)
+          accessory.getService(Service.BatteryService) || accessory.addService(Service.BatteryService)
+          break
+        }
+        case 'fan': {
+          accessory.control = new DeviceFan(this)
+          const fanService = accessory.getService(Service.Fanv2) || accessory.addService(Service.Fanv2)
+          const fanLightService = accessory.getService(Service.Lightbulb) || accessory.addService(Service.Lightbulb)
           fanService
             .getCharacteristic(Characteristic.Active)
-            .on("set", (value, callback) => accessory.control.internalFanUpdate(accessory, "power", value, callback));
+            .on('set', (value, callback) => accessory.control.internalFanUpdate(accessory, 'power', value, callback))
           fanService
             .getCharacteristic(Characteristic.RotationSpeed)
-            .on("set", (value, callback) => accessory.control.internalFanUpdate(accessory, "speed", value, callback))
+            .on('set', (value, callback) => accessory.control.internalFanUpdate(accessory, 'speed', value, callback))
             .setProps({
-              minStep: 33,
-            });
+              minStep: 33
+            })
           fanLightService
             .getCharacteristic(Characteristic.On)
-            .on("set", (value, callback) => accessory.control.internalFanUpdate(accessory, "light", value, callback));
-          break;
-        case "thermostat":
-          accessory.control = new deviceThermostat(this);
-          let tempService =
-              accessory.getService(Service.TemperatureSensor) || accessory.addService(Service.TemperatureSensor),
-            humiService = false;
-          if (accessory.context.sensorType !== "DS18B20") {
-            humiService = accessory.getService(Service.HumiditySensor) || accessory.addService(Service.HumiditySensor);
+            .on('set', (value, callback) => accessory.control.internalFanUpdate(accessory, 'light', value, callback))
+          break
+        }
+        case 'thermostat': {
+          accessory.control = new DeviceThermostat(this)
+          const tempService =
+            accessory.getService(Service.TemperatureSensor) || accessory.addService(Service.TemperatureSensor)
+          let humiService = false
+          if (accessory.context.sensorType !== 'DS18B20') {
+            humiService = accessory.getService(Service.HumiditySensor) || accessory.addService(Service.HumiditySensor)
           } else {
             if (accessory.getService(Service.HumiditySensor)) {
-              accessory.removeService(Service.HumiditySensor);
+              accessory.removeService(Service.HumiditySensor)
             }
           }
           if (!this.config.hideTHSwitch) {
-            let switchService = accessory.getService(Service.Switch) || accessory.addService(Service.Switch);
+            const switchService = accessory.getService(Service.Switch) || accessory.addService(Service.Switch)
             switchService
               .getCharacteristic(Characteristic.On)
-              .on("set", (value, callback) => accessory.control.internalThermostatUpdate(accessory, value, callback));
+              .on('set', (value, callback) => accessory.control.internalThermostatUpdate(accessory, value, callback))
           }
           if (!(this.config.disableEveLogging || false)) {
-            accessory.log = this.log;
-            accessory.eveLogger = new EveHistoryService("weather", accessory, {
-              storage: "fs",
+            accessory.log = this.log
+            accessory.eveLogger = new EveHistoryService('weather', accessory, {
+              storage: 'fs',
               minutes: 5,
-              path: this.eveLogPath,
-            });
+              path: this.eveLogPath
+            })
             corrInterval.setCorrectingInterval(() => {
-              let dataToAdd = {
+              const dataToAdd = {
                 time: Date.now(),
-                temp: tempService.getCharacteristic(Characteristic.CurrentTemperature).value,
-              };
+                temp: tempService.getCharacteristic(Characteristic.CurrentTemperature).value
+              }
               if (humiService) {
-                humiService.getCharacteristic(Characteristic.CurrentRelativeHumidity).value;
+                dataToAdd.humidity = humiService.getCharacteristic(Characteristic.CurrentRelativeHumidity).value
               }
-              accessory.eveLogger.addEntry(dataToAdd);
-            }, 300000);
+              accessory.eveLogger.addEntry(dataToAdd)
+            }, 300000)
           }
-          break;
-        case "outlet":
-          accessory.control = new deviceOutlet(this);
-          let outletService;
+          break
+        }
+        case 'outlet': {
+          accessory.control = new DeviceOutlet(this)
+          let outletService
           if (!(outletService = accessory.getService(Service.Outlet))) {
-            accessory.addService(Service.Outlet);
-            outletService = accessory.getService(Service.Outlet);
-            if (accessory.context.eweModel !== "S26" && !(this.config.disableEveLogging || false)) {
-              outletService.addCharacteristic(EveService.Characteristics.Voltage);
-              outletService.addCharacteristic(EveService.Characteristics.CurrentConsumption);
-              outletService.addCharacteristic(EveService.Characteristics.ElectricCurrent);
-              outletService.addCharacteristic(EveService.Characteristics.TotalConsumption);
-              outletService.addCharacteristic(EveService.Characteristics.ResetTotal);
+            accessory.addService(Service.Outlet)
+            outletService = accessory.getService(Service.Outlet)
+            if (accessory.context.eweModel !== 'S26' && !(this.config.disableEveLogging || false)) {
+              outletService.addCharacteristic(EveService.Characteristics.Voltage)
+              outletService.addCharacteristic(EveService.Characteristics.CurrentConsumption)
+              outletService.addCharacteristic(EveService.Characteristics.ElectricCurrent)
+              outletService.addCharacteristic(EveService.Characteristics.TotalConsumption)
+              outletService.addCharacteristic(EveService.Characteristics.ResetTotal)
               accessory.context = {
                 ...accessory.context,
                 ...{
                   extraPersistedData: {},
                   lastReset: 0,
                   totalEnergy: 0,
-                  totalEnergyTemp: 0,
-                },
-              };
+                  totalEnergyTemp: 0
+                }
+              }
             }
           }
           outletService
             .getCharacteristic(Characteristic.On)
-            .on("set", (value, callback) => accessory.control.internalOutletUpdate(accessory, value, callback));
-          if (accessory.context.eweModel !== "S26" && !(this.config.disableEveLogging || false)) {
-            accessory.log = this.log;
-            accessory.eveLogger = new EveHistoryService("energy", accessory, {
-              storage: "fs",
+            .on('set', (value, callback) => accessory.control.internalOutletUpdate(accessory, value, callback))
+          if (accessory.context.eweModel !== 'S26' && !(this.config.disableEveLogging || false)) {
+            accessory.log = this.log
+            accessory.eveLogger = new EveHistoryService('energy', accessory, {
+              storage: 'fs',
               minutes: 5,
-              path: this.eveLogPath,
-            });
+              path: this.eveLogPath
+            })
             corrInterval.setCorrectingInterval(() => {
-              let isOn = outletService.getCharacteristic(Characteristic.On).value,
-                currentWatt = isOn
-                  ? outletService.getCharacteristic(EveService.Characteristics.CurrentConsumption).value
-                  : 0;
+              const isOn = outletService.getCharacteristic(Characteristic.On).value
+              const currentWatt = isOn
+                ? outletService.getCharacteristic(EveService.Characteristics.CurrentConsumption).value
+                : 0
               if (accessory.eveLogger.isHistoryLoaded()) {
-                accessory.context.extraPersistedData = accessory.eveLogger.getExtraPersistedData();
+                accessory.context.extraPersistedData = accessory.eveLogger.getExtraPersistedData()
                 if (accessory.context.extraPersistedData !== undefined) {
                   accessory.context.totalEnergy =
                     accessory.context.extraPersistedData.totalenergy +
                     accessory.context.totalEnergyTemp +
-                    (currentWatt * 10) / 3600 / 1000;
+                    (currentWatt * 10) / 3600 / 1000
                   accessory.eveLogger.setExtraPersistedData({
                     totalenergy: accessory.context.totalEnergy,
-                    lastReset: accessory.context.extraPersistedData.lastReset,
-                  });
+                    lastReset: accessory.context.extraPersistedData.lastReset
+                  })
                 } else {
-                  accessory.context.totalEnergy = accessory.context.totalEnergyTemp + (currentWatt * 10) / 3600 / 1000;
+                  accessory.context.totalEnergy = accessory.context.totalEnergyTemp + (currentWatt * 10) / 3600 / 1000
                   accessory.eveLogger.setExtraPersistedData({
                     totalenergy: accessory.context.totalEnergy,
-                    lastReset: 0,
-                  });
+                    lastReset: 0
+                  })
                 }
-                accessory.context.totalEnergytemp = 0;
+                accessory.context.totalEnergytemp = 0
               } else {
-                accessory.context.totalEnergyTemp += (currentWatt * 10) / 3600 / 1000;
-                accessory.context.totalEnergy = accessory.context.totalEnergyTemp;
+                accessory.context.totalEnergyTemp += (currentWatt * 10) / 3600 / 1000
+                accessory.context.totalEnergy = accessory.context.totalEnergyTemp
               }
               accessory.eveLogger.addEntry({
                 time: Date.now(),
-                power: currentWatt,
-              });
-            }, 300000);
-            outletService.getCharacteristic(EveService.Characteristics.TotalConsumption).on("get", callback => {
-              accessory.context.extraPersistedData = accessory.eveLogger.getExtraPersistedData();
+                power: currentWatt
+              })
+            }, 300000)
+            outletService.getCharacteristic(EveService.Characteristics.TotalConsumption).on('get', callback => {
+              accessory.context.extraPersistedData = accessory.eveLogger.getExtraPersistedData()
               if (accessory.context.extraPersistedData !== undefined) {
-                accessory.context.totalEnergy = accessory.context.extraPersistedData.totalPower;
+                accessory.context.totalEnergy = accessory.context.extraPersistedData.totalPower
               }
-              callback(null, accessory.context.totalEnergy);
-            });
+              callback(null, accessory.context.totalEnergy)
+            })
             outletService
               .getCharacteristic(EveService.Characteristics.ResetTotal)
-              .on("set", (value, callback) => {
-                accessory.context.totalEnergy = 0;
-                accessory.context.lastReset = value;
+              .on('set', (value, callback) => {
+                accessory.context.totalEnergy = 0
+                accessory.context.lastReset = value
                 accessory.eveLogger.setExtraPersistedData({
                   totalPower: 0,
-                  lastReset: value,
-                });
-                callback();
+                  lastReset: value
+                })
+                callback()
               })
-              .on("get", callback => {
-                accessory.context.extraPersistedData = accessory.eveLogger.getExtraPersistedData();
+              .on('get', callback => {
+                accessory.context.extraPersistedData = accessory.eveLogger.getExtraPersistedData()
                 if (accessory.context.extraPersistedData !== undefined) {
-                  accessory.context.lastReset = accessory.context.extraPersistedData.lastReset;
+                  accessory.context.lastReset = accessory.context.extraPersistedData.lastReset
                 }
-                callback(null, accessory.context.lastReset);
-              });
+                callback(null, accessory.context.lastReset)
+              })
           }
-          break;
-        case "usb":
-          accessory.control = new deviceUSB(this);
-          let usbService = accessory.getService(Service.Outlet) || accessory.addService(Service.Outlet);
+          break
+        }
+        case 'usb': {
+          accessory.control = new DeviceUSB(this)
+          const usbService = accessory.getService(Service.Outlet) || accessory.addService(Service.Outlet)
           usbService
             .getCharacteristic(Characteristic.On)
-            .on("set", (value, callback) => accessory.control.internalUSBUpdate(accessory, value, callback));
-          break;
-        case "scm":
-          accessory.control = new deviceSCM(this);
-          let scmService = accessory.getService(Service.Switch) || accessory.addService(Service.Switch);
+            .on('set', (value, callback) => accessory.control.internalUSBUpdate(accessory, value, callback))
+          break
+        }
+        case 'scm': {
+          accessory.control = new DeviceSCM(this)
+          const scmService = accessory.getService(Service.Switch) || accessory.addService(Service.Switch)
           scmService
             .getCharacteristic(Characteristic.On)
-            .on("set", (value, callback) => accessory.control.internalSCMUpdate(accessory, value, callback));
-          break;
-        case "light":
-          accessory.control = new deviceLight(this);
-          let lightService = accessory.getService(Service.Lightbulb) || accessory.addService(Service.Lightbulb);
+            .on('set', (value, callback) => accessory.control.internalSCMUpdate(accessory, value, callback))
+          break
+        }
+        case 'light': {
+          accessory.control = new DeviceLight(this)
+          const lightService = accessory.getService(Service.Lightbulb) || accessory.addService(Service.Lightbulb)
           lightService
             .getCharacteristic(Characteristic.On)
-            .on("set", (value, callback) => accessory.control.internalLightbulbUpdate(accessory, value, callback));
+            .on('set', (value, callback) => accessory.control.internalLightbulbUpdate(accessory, value, callback))
           if (cns.devicesBrightable.includes(accessory.context.eweUIID)) {
-            lightService.getCharacteristic(Characteristic.Brightness).on("set", (value, callback) => {
+            lightService.getCharacteristic(Characteristic.Brightness).on('set', (value, callback) => {
               if (value > 0) {
                 if (!lightService.getCharacteristic(Characteristic.On).value) {
-                  accessory.control.internalLightbulbUpdate(accessory, true, function () {
-                    return;
-                  });
+                  accessory.control.internalLightbulbUpdate(accessory, true, function () {})
                 }
-                accessory.control.internalBrightnessUpdate(accessory, value, callback);
+                accessory.control.internalBrightnessUpdate(accessory, value, callback)
               } else {
-                accessory.control.internalLightbulbUpdate(accessory, false, callback);
+                accessory.control.internalLightbulbUpdate(accessory, false, callback)
               }
-            });
+            })
           } else if (cns.devicesColourable.includes(accessory.context.eweUIID)) {
-            lightService.getCharacteristic(Characteristic.Brightness).on("set", (value, callback) => {
+            lightService.getCharacteristic(Characteristic.Brightness).on('set', (value, callback) => {
               if (value > 0) {
                 if (!lightService.getCharacteristic(Characteristic.On).value) {
-                  accessory.control.internalLightbulbUpdate(accessory, true, function () {
-                    return;
-                  });
+                  accessory.control.internalLightbulbUpdate(accessory, true, function () {})
                 }
-                accessory.control.internalHSBUpdate(accessory, "bri", value, callback);
+                accessory.control.internalHSBUpdate(accessory, 'bri', value, callback)
               } else {
-                accessory.control.internalLightbulbUpdate(accessory, false, callback);
+                accessory.control.internalLightbulbUpdate(accessory, false, callback)
               }
-            });
+            })
             lightService
               .getCharacteristic(Characteristic.Hue)
-              .on("set", (value, callback) => accessory.control.internalHSBUpdate(accessory, "hue", value, callback));
-            lightService.getCharacteristic(Characteristic.Saturation).on("set", (value, callback) => callback());
+              .on('set', (value, callback) => accessory.control.internalHSBUpdate(accessory, 'hue', value, callback))
+            lightService.getCharacteristic(Characteristic.Saturation).on('set', (value, callback) => callback())
           }
-          break;
-        case "switch":
-          accessory.control = new deviceSwitch(this);
-          let switchService = accessory.getService(Service.Switch) || accessory.addService(Service.Switch);
+          break
+        }
+        case 'switch': {
+          accessory.control = new DeviceSwitch(this)
+          const switchService = accessory.getService(Service.Switch) || accessory.addService(Service.Switch)
           switchService
             .getCharacteristic(Characteristic.On)
-            .on("set", (value, callback) => accessory.control.internalSwitchUpdate(accessory, value, callback));
-          break;
-        case "rf_sub":
-          accessory.control = new deviceRFSub(this);
+            .on('set', (value, callback) => accessory.control.internalSwitchUpdate(accessory, value, callback))
+          break
+        }
+        case 'rf_sub': {
+          accessory.control = new DeviceRFSub(this)
           switch (accessory.context.subType) {
-            case "water":
-              accessory.getService(Service.LeakSensor) || accessory.addService(Service.LeakSensor);
-              break;
-            case "fire":
-            case "smoke":
-              accessory.getService(Service.SmokeSensor) || accessory.addService(Service.SmokeSensor);
-              break;
-            case "co":
-              accessory.getService(Service.CarbonMonoxideSensor) || accessory.addService(Service.CarbonMonoxideSensor);
-              break;
-            case "co2":
-              accessory.getService(Service.CarbonDioxideSensor) || accessory.addService(Service.CarbonDioxideSensor);
-              break;
-            case "contact":
-              accessory.getService(Service.ContactSensor) || accessory.addService(Service.ContactSensor);
-              break;
-            case "occupancy":
-              accessory.getService(Service.OccupancySensor) || accessory.addService(Service.OccupancySensor);
-              break;
+            case 'water':
+              accessory.getService(Service.LeakSensor) || accessory.addService(Service.LeakSensor)
+              break
+            case 'fire':
+            case 'smoke':
+              accessory.getService(Service.SmokeSensor) || accessory.addService(Service.SmokeSensor)
+              break
+            case 'co':
+              accessory.getService(Service.CarbonMonoxideSensor) || accessory.addService(Service.CarbonMonoxideSensor)
+              break
+            case 'co2':
+              accessory.getService(Service.CarbonDioxideSensor) || accessory.addService(Service.CarbonDioxideSensor)
+              break
+            case 'contact':
+              accessory.getService(Service.ContactSensor) || accessory.addService(Service.ContactSensor)
+              break
+            case 'occupancy':
+              accessory.getService(Service.OccupancySensor) || accessory.addService(Service.OccupancySensor)
+              break
             default:
-              accessory.getService(Service.MotionSensor) || accessory.addService(Service.MotionSensor);
-              break;
-            case "button":
+              accessory.getService(Service.MotionSensor) || accessory.addService(Service.MotionSensor)
+              break
+            case 'button':
               Object.entries(accessory.context.buttons).forEach(([chan, name]) => {
-                accessory.getService(name) || accessory.addService(Service.Switch, name, "switch" + chan);
-                accessory.getService(name).updateCharacteristic(Characteristic.On, false);
+                accessory.getService(name) || accessory.addService(Service.Switch, name, 'switch' + chan)
+                accessory.getService(name).updateCharacteristic(Characteristic.On, false)
                 accessory
                   .getService(name)
                   .getCharacteristic(Characteristic.On)
-                  .on("set", (value, callback) => {
-                    value ? accessory.control.internalRFUpdate(accessory, chan, name, callback) : callback();
-                  });
-              });
-              break;
+                  .on('set', (value, callback) => {
+                    value ? accessory.control.internalRFUpdate(accessory, chan, name, callback) : callback()
+                  })
+              })
+              break
           }
-          break;
-        case "zb_dev": //*** credit @tasict ***\\
-          accessory.control = new deviceZBDev(this);
-          accessory.getService(Service.BatteryService) || accessory.addService(Service.BatteryService);
+          break
+        }
+        case 'zb_dev': { //* ** credit @tasict ***\\
+          accessory.control = new DeviceZBDev(this)
+          accessory.getService(Service.BatteryService) || accessory.addService(Service.BatteryService)
           switch (accessory.context.eweUIID) {
-            case 1000:
-              let zbspsService =
+            case 1000: {
+              const zbspsService =
                 accessory.getService(Service.StatelessProgrammableSwitch) ||
-                accessory.addService(Service.StatelessProgrammableSwitch);
+                accessory.addService(Service.StatelessProgrammableSwitch)
               if (this.config.hideZBLDPress) {
                 zbspsService.getCharacteristic(Characteristic.ProgrammableSwitchEvent).setProps({
-                  validValues: [0],
-                });
+                  validValues: [0]
+                })
               }
-              break;
-            case 1770:
-              let zbTempService =
-                accessory.getService(Service.TemperatureSensor) || accessory.addService(Service.TemperatureSensor);
-              let zbHumiService =
-                accessory.getService(Service.HumiditySensor) || accessory.addService(Service.HumiditySensor);
-              accessory.log = this.log;
-              accessory.eveLogger = new EveHistoryService("weather", accessory, {
-                storage: "fs",
+              break
+            }
+            case 1770: {
+              const zbTempService =
+                accessory.getService(Service.TemperatureSensor) || accessory.addService(Service.TemperatureSensor)
+              const zbHumiService =
+                accessory.getService(Service.HumiditySensor) || accessory.addService(Service.HumiditySensor)
+              accessory.log = this.log
+              accessory.eveLogger = new EveHistoryService('weather', accessory, {
+                storage: 'fs',
                 minutes: 5,
-                path: this.eveLogPath,
-              });
+                path: this.eveLogPath
+              })
               corrInterval.setCorrectingInterval(() => {
-                let dataToAdd = {
+                const dataToAdd = {
                   time: Date.now(),
                   temp: zbTempService.getCharacteristic(Characteristic.CurrentTemperature).value,
-                  humidity: zbHumiService.getCharacteristic(Characteristic.CurrentRelativeHumidity).value,
-                };
-                accessory.eveLogger.addEntry(dataToAdd);
-              }, 300000);
-              break;
+                  humidity: zbHumiService.getCharacteristic(Characteristic.CurrentRelativeHumidity).value
+                }
+                accessory.eveLogger.addEntry(dataToAdd)
+              }, 300000)
+              break
+            }
             case 2026:
-              accessory.getService(Service.MotionSensor) || accessory.addService(Service.MotionSensor);
-              break;
+              accessory.getService(Service.MotionSensor) || accessory.addService(Service.MotionSensor)
+              break
             case 3026:
-              accessory.getService(Service.ContactSensor) || accessory.addService(Service.ContactSensor);
-              break;
+              accessory.getService(Service.ContactSensor) || accessory.addService(Service.ContactSensor)
+              break
           }
-          break;
+          break
+        }
       }
-      this.devicesInHB.set(accessory.context.hbDeviceId, accessory);
+      this.devicesInHB.set(accessory.context.hbDeviceId, accessory)
     } catch (err) {
-      this.log.warn("[%s] could not be refreshed as %s.", accessory.displayName, err);
+      this.log.warn('[%s] could not be refreshed as %s.', accessory.displayName, err)
     }
   }
-  refreshAccessory(accessory, newParams) {
+
+  refreshAccessory (accessory, newParams) {
     switch (accessory.context.type) {
-      case "valve":
+      case 'valve':
         if (Object.keys(newParams).some(v => cns.devicesValveParams.includes(v)) && Array.isArray(newParams.switches)) {
-          accessory.control.externalValveUpdate(accessory, newParams);
+          accessory.control.externalValveUpdate(accessory, newParams)
         }
-        return true;
-      case "curtain":
+        return true
+      case 'curtain':
         if (Object.keys(newParams).some(v => cns.devicesCurtainParams.includes(v))) {
-          accessory.control.externalCurtainUpdate(accessory, newParams);
+          accessory.control.externalCurtainUpdate(accessory, newParams)
         }
-        return true;
-      case "blind":
-        return true;
-      case "garage":
+        return true
+      case 'blind':
+        return true
+      case 'garage':
         if (
           Object.keys(newParams).some(v => cns.devicesGarageParams.includes(v)) &&
           Array.isArray(newParams.switches)
         ) {
-          accessory.control.externalGarageUpdate(accessory, newParams);
+          accessory.control.externalGarageUpdate(accessory, newParams)
         }
-        return true;
-      case "lock":
+        return true
+      case 'lock':
         if (Object.keys(newParams).some(v => cns.devicesLockParams.includes(v))) {
-          accessory.control.externalLockUpdate(accessory, newParams);
+          accessory.control.externalLockUpdate(accessory, newParams)
         }
-        return true;
-      case "sensor":
+        return true
+      case 'sensor':
         if (Object.keys(newParams).some(v => cns.devicesSensorParams.includes(v))) {
-          accessory.control.externalSensorUpdate(accessory, newParams);
+          accessory.control.externalSensorUpdate(accessory, newParams)
         }
-        return true;
-      case "fan":
+        return true
+      case 'fan':
         if (Object.keys(newParams).some(v => cns.devicesFanParams.includes(v))) {
-          accessory.control.externalFanUpdate(accessory, newParams);
+          accessory.control.externalFanUpdate(accessory, newParams)
         }
-        return true;
-      case "thermostat":
+        return true
+      case 'thermostat':
         if (Object.keys(newParams).some(v => cns.devicesThermostatParams.includes(v))) {
-          accessory.control.externalThermostatUpdate(accessory, newParams);
+          accessory.control.externalThermostatUpdate(accessory, newParams)
         }
-        return true;
-      case "outlet":
+        return true
+      case 'outlet':
         if (Object.keys(newParams).some(v => cns.devicesOutletParams.includes(v))) {
-          accessory.control.externalOutletUpdate(accessory, newParams);
+          accessory.control.externalOutletUpdate(accessory, newParams)
         }
-        return true;
-      case "usb":
+        return true
+      case 'usb':
         if (Object.keys(newParams).some(v => cns.devicesUSBParams.includes(v)) && Array.isArray(newParams.switches)) {
-          accessory.control.externalUSBUpdate(accessory, newParams);
+          accessory.control.externalUSBUpdate(accessory, newParams)
         }
-        return true;
-      case "scm":
+        return true
+      case 'scm':
         if (Object.keys(newParams).some(v => cns.devicesSCMParams.includes(v)) && Array.isArray(newParams.switches)) {
-          accessory.control.externalSCMUpdate(accessory, newParams);
+          accessory.control.externalSCMUpdate(accessory, newParams)
         }
-        return true;
-      case "light":
+        return true
+      case 'light':
         if (
           cns.devicesSingleSwitch.includes(accessory.context.eweUIID) &&
           cns.devicesSingleSwitchLight.includes(accessory.context.eweModel)
         ) {
           if (Object.keys(newParams).some(v => cns.devicesSingleSwitchLightParams.includes(v))) {
-            accessory.control.externalSingleLightUpdate(accessory, newParams);
+            accessory.control.externalSingleLightUpdate(accessory, newParams)
           }
         } else if (
           cns.devicesMultiSwitch.includes(accessory.context.eweUIID) &&
@@ -972,168 +948,170 @@ class eWeLink {
             Object.keys(newParams).some(v => cns.devicesMultiSwitchLightParams.includes(v)) &&
             Array.isArray(newParams.switches)
           ) {
-            accessory.control.externalMultiLightUpdate(accessory, newParams);
+            accessory.control.externalMultiLightUpdate(accessory, newParams)
           }
         }
-        return true;
-      case "switch":
+        return true
+      case 'switch':
         if (cns.devicesSingleSwitch.includes(accessory.context.eweUIID)) {
           if (Object.keys(newParams).some(v => cns.devicesSingleSwitchParams.includes(v))) {
-            accessory.control.externalSingleSwitchUpdate(accessory, newParams);
+            accessory.control.externalSingleSwitchUpdate(accessory, newParams)
           }
         } else if (cns.devicesMultiSwitch.includes(accessory.context.eweUIID)) {
           if (
             Object.keys(newParams).some(v => cns.devicesMultiSwitchParams.includes(v)) &&
             Array.isArray(newParams.switches)
           ) {
-            accessory.control.externalMultiSwitchUpdate(accessory, newParams);
+            accessory.control.externalMultiSwitchUpdate(accessory, newParams)
           }
         }
-        return true;
-      case "rf_pri":
+        return true
+      case 'rf_pri':
         if (Object.keys(newParams).some(v => cns.devicesRFBridgeParams.includes(v))) {
-          accessory.control.externalRFUpdate(accessory, newParams);
+          accessory.control.externalRFUpdate(accessory, newParams)
         }
-        return true;
-      case "rf_sub":
-        return true;
-      case "zb_dev":
+        return true
+      case 'rf_sub':
+        return true
+      case 'zb_dev':
         if (Object.keys(newParams).some(v => cns.devicesZBBridgeParams.includes(v))) {
-          accessory.control.externalZBUpdate(accessory, newParams);
+          accessory.control.externalZBUpdate(accessory, newParams)
         }
-        return true;
+        return true
       default:
-        return false;
+        return false
     }
   }
-  removeAccessory(accessory) {
+
+  removeAccessory (accessory) {
     try {
-      this.api.unregisterPlatformAccessories("homebridge-ewelink", "eWeLink", [accessory]);
-      this.devicesInHB.delete(accessory.context.hbDeviceId);
-      this.log(" → [%s] was removed from Homebridge.", accessory.displayName);
+      this.api.unregisterPlatformAccessories('homebridge-ewelink', 'eWeLink', [accessory])
+      this.devicesInHB.delete(accessory.context.hbDeviceId)
+      this.log(' → [%s] was removed from Homebridge.', accessory.displayName)
     } catch (err) {
-      this.log.warn(" → [%s] wasn't removed as %s.", accessory.displayName, err);
+      this.log.warn(" → [%s] wasn't removed as %s.", accessory.displayName, err)
     }
   }
-  sendDeviceUpdate(accessory, params) {
-    return new Promise(async (resolve, reject) => {
-      let payload = {
-        apikey: accessory.context.eweApiKey,
-        deviceid: accessory.context.eweDeviceId,
-        params,
-      };
-      try {
-        await utils.sleep(Math.random() * 100 + 200);
-        await this.lanClient.sendUpdate(payload);
-        resolve();
-      } catch (err) {
-        if (accessory.context.reachableWAN) {
-          if (this.debug) {
-            this.log.warn("[%s] Reverting to web socket as %s.", accessory.displayName, err);
-          }
-          try {
-            await this.wsClient.sendUpdate(payload);
-            resolve();
-          } catch (err) {
-            reject(err);
-          }
-        } else {
-          reject("it is unreachable. I's status will be corrected once it is reachable");
+
+  async sendDeviceUpdate (accessory, params) {
+    const payload = {
+      apikey: accessory.context.eweApiKey,
+      deviceid: accessory.context.eweDeviceId,
+      params
+    }
+    try {
+      await utils.sleep(Math.random() * 100 + 200)
+      await this.lanClient.sendUpdate(payload)
+      return
+    } catch (err) {
+      if (accessory.context.reachableWAN) {
+        if (this.debug) {
+          this.log.warn('[%s] Reverting to web socket as %s.', accessory.displayName, err)
         }
+        try {
+          await this.wsClient.sendUpdate(payload)
+          return
+        } catch (err) {
+          throw new Error(err)
+        }
+      } else {
+        throw new Error("it is unreachable. I's status will be corrected once it is reachable")
       }
-    });
+    }
   }
-  async receiveDeviceUpdate(device) {
-    let accessory,
-      deviceId = device.deviceid,
-      reachableChange = false;
-    if ((accessory = this.devicesInHB.get(deviceId + "SWX") || this.devicesInHB.get(deviceId + "SW0"))) {
-      let isX = accessory.context.hbDeviceId.substr(-1) === "X";
-      if (device.params.updateSource === "WS") {
-        if (device.params.online != accessory.context.reachableWAN) {
-          accessory.context.reachableWAN = device.params.online;
-          this.devicesInHB.set(accessory.context.hbDeviceId, accessory);
-          if (accessory.context.reachableWAN) this.wsClient.requestUpdate(accessory).catch(() => {});
-          reachableChange = true;
+
+  async receiveDeviceUpdate (device) {
+    let accessory
+    const deviceId = device.deviceid
+    let reachableChange = false
+    if ((accessory = this.devicesInHB.get(deviceId + 'SWX') || this.devicesInHB.get(deviceId + 'SW0'))) {
+      const isX = accessory.context.hbDeviceId.substr(-1) === 'X'
+      if (device.params.updateSource === 'WS') {
+        if (device.params.online !== accessory.context.reachableWAN) {
+          accessory.context.reachableWAN = device.params.online
+          this.devicesInHB.set(accessory.context.hbDeviceId, accessory)
+          if (accessory.context.reachableWAN) this.wsClient.requestUpdate(accessory).catch(() => {})
+          reachableChange = true
           this.log.warn(
-            "[%s] has been reported [%s] via [WS].",
+            '[%s] has been reported [%s] via [WS].',
             accessory.displayName,
-            accessory.context.reachableWAN ? "online" : "offline"
-          );
+            accessory.context.reachableWAN ? 'online' : 'offline'
+          )
         }
       }
-      if (device.params.updateSource === "LAN" && !accessory.context.reachableLAN) {
-        accessory.context.reachableLAN = true;
-        this.devicesInHB.set(accessory.context.hbDeviceId, accessory);
-        this.wsClient.requestUpdate(accessory).catch(() => {});
-        reachableChange = true;
-        this.log.warn("[%s] has been reported [online] via [LAN].", accessory.displayName);
+      if (device.params.updateSource === 'LAN' && !accessory.context.reachableLAN) {
+        accessory.context.reachableLAN = true
+        this.devicesInHB.set(accessory.context.hbDeviceId, accessory)
+        this.wsClient.requestUpdate(accessory).catch(() => {})
+        reachableChange = true
+        this.log.warn('[%s] has been reported [online] via [LAN].', accessory.displayName)
       }
       if (reachableChange && !isX) {
         for (let i = 1; i <= accessory.context.channelCount; i++) {
-          if (this.devicesInHB.has(deviceId + "SW" + i)) {
-            let oAccessory = this.devicesInHB.get(deviceId + "SW" + i);
-            oAccessory.context.reachableWAN = device.params.online;
-            if (device.params.updateSource === "LAN") {
-              oAccessory.context.reachableLAN = true;
+          if (this.devicesInHB.has(deviceId + 'SW' + i)) {
+            const oAccessory = this.devicesInHB.get(deviceId + 'SW' + i)
+            oAccessory.context.reachableWAN = device.params.online
+            if (device.params.updateSource === 'LAN') {
+              oAccessory.context.reachableLAN = true
             }
-            this.devicesInHB.set(oAccessory.context.hbDeviceId, oAccessory);
+            this.devicesInHB.set(oAccessory.context.hbDeviceId, oAccessory)
           }
         }
       }
       if (this.debug) {
         this.log(
-          "[%s] externally updated from above %s message and will be refreshed.",
+          '[%s] externally updated from above %s message and will be refreshed.',
           accessory.displayName,
           device.params.updateSource
-        );
+        )
       }
       if (!this.refreshAccessory(accessory, device.params)) {
         this.log.warn(
-          "[%s] cannot be refreshed. Please try removing accessory from the Homebridge cache along with any secondary devices (SW1, SW2, etc.). [debug:%s:%s]",
+          '[%s] cannot be refreshed. Please try removing accessory from the Homebridge cache along with any secondary devices (SW1, SW2, etc.). [debug:%s:%s]',
           accessory.displayName,
           accessory.context.type,
           accessory.context.channelCount
-        );
+        )
         this.log.warn(
           'If you are unsure how to do this, please see "https://github.com/bwp91/homebridge-ewelink/wiki/How-to-remove-an-accessory-from-the-cache'
-        );
+        )
       }
     } else {
-      if (!(this.config.hideDevFromHB || "").includes(deviceId)) {
+      if (!(this.config.hideDevFromHB || '').includes(deviceId)) {
         this.log.warn(
-          "[%s] update received via %s does not exist in Homebridge so device will be added.",
+          '[%s] update received via %s does not exist in Homebridge so device will be added.',
           deviceId,
           device.params.updateSource
-        );
+        )
         try {
-          let device = await this.httpClient.getDevice(deviceId);
-          this.initialiseDevice(device);
-          this.lanClient.addDeviceToMap(device);
+          const device = await this.httpClient.getDevice(deviceId)
+          this.initialiseDevice(device)
+          this.lanClient.addDeviceToMap(device)
         } catch (err) {
-          this.log.error("[%s] error getting info [%s]", deviceId, err);
-          this.log.error("[%s] Please try restarting Homebridge so this device is added.", deviceId);
+          this.log.error('[%s] error getting info [%s]', deviceId, err)
+          this.log.error('[%s] Please try restarting Homebridge so this device is added.', deviceId)
         }
       }
     }
   }
-  async requestDeviceRefresh(accessory, err) {
-    this.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+
+  async requestDeviceRefresh (accessory, err) {
+    this.log.warn('[%s] could not be updated as %s.', accessory.displayName, err)
     if (accessory.context.reachableWAN) {
       try {
-        await this.wsClient.requestUpdate(accessory);
-        this.log.warn("[%s] requesting previous state to revert Homebridge state.", accessory.displayName);
+        await this.wsClient.requestUpdate(accessory)
+        this.log.warn('[%s] requesting previous state to revert Homebridge state.', accessory.displayName)
       } catch (err) {}
     } else {
-      this.log.warn("[%s] Homebridge state will be synced once the device comes back online.", accessory.displayName);
+      this.log.warn('[%s] Homebridge state will be synced once the device comes back online.', accessory.displayName)
     }
   }
 }
 module.exports = function (homebridge) {
-  Accessory = homebridge.platformAccessory;
-  Characteristic = homebridge.hap.Characteristic;
-  EveService = new hbLib.EveHomeKitTypes(homebridge);
-  EveHistoryService = fakegato(homebridge);
-  Service = homebridge.hap.Service;
-  return eWeLink;
-};
+  Accessory = homebridge.platformAccessory
+  Characteristic = homebridge.hap.Characteristic
+  EveService = new hbLib.EveHomeKitTypes(homebridge)
+  EveHistoryService = fakegato(homebridge)
+  Service = homebridge.hap.Service
+  return eWeLink
+}
diff --git a/lib/eWeLinkHTTP.js b/lib/eWeLinkHTTP.js
index 03e24b06..61572545 100644
--- a/lib/eWeLinkHTTP.js
+++ b/lib/eWeLinkHTTP.js
@@ -1,243 +1,267 @@
-/* jshint esversion: 9, -W014, -W030, node: true */
-"use strict";
-const axios = require("axios"),
-  constants = require("./constants"),
-  crypto = require("crypto"),
-  utils = require("./utils");
+'use strict'
+const axios = require('axios')
+const constants = require('./constants')
+const crypto = require('crypto')
+const utils = require('./utils')
 module.exports = class eWeLinkHTTP {
-  constructor(config, log) {
-    this.log = log;
-    this.debug = config.debug || false;
-    this.debugReqRes = config.debugReqRes || false;
-    this.username = config.username.toString();
-    this.password = config.password.toString();
-    this.hideDevFromHB = (config.hideDevFromHB || "").toString();
-    this.cCode = "+" + config.countryCode.toString().replace("+", "").replace(" ", "");
+  constructor (config, log) {
+    this.log = log
+    this.debug = config.debug || false
+    this.debugReqRes = config.debugReqRes || false
+    this.username = config.username.toString()
+    this.password = config.password.toString()
+    this.hideDevFromHB = (config.hideDevFromHB || '').toString()
+    this.cCode =
+      '+' + config.countryCode.toString().replace('+', '').replace(' ', '')
   }
-  getHost() {
-    return new Promise(async (resolve, reject) => {
-      let params = {
-          appid: constants.appId,
-          country_code: this.cCode,
-          nonce: Math.random().toString(36).substr(2, 8),
-          ts: Math.floor(new Date().getTime() / 1000),
-          version: 8,
-        },
-        dataToSign = [];
-      try {
-        Object.keys(params).forEach(k => {
-          dataToSign.push({
-            key: k,
-            value: params.k,
-          });
-        });
-        dataToSign.sort((a, b) => (a.key < b.key ? -1 : 1));
-        dataToSign = dataToSign.map(k => k.key + "=" + k.value).join("&");
-        dataToSign = crypto.createHmac("sha256", constants.appSecret).update(dataToSign).digest("base64");
-        if (this.debugReqRes) {
-          this.log.warn(
-            "Sending HTTP getHost request. This text is yellow for clarity.\n%s",
-            JSON.stringify(params, null, 2)
-          );
-        } else if (this.debug) {
-          this.log("Sending HTTP getHost request.");
-        }
-        let res = await axios.get("https://api.coolkit.cc:8080/api/user/region", {
+
+  async getHost () {
+    const params = {
+      appid: constants.appId,
+      country_code: this.cCode,
+      nonce: Math.random().toString(36).substr(2, 8),
+      ts: Math.floor(new Date().getTime() / 1000),
+      version: 8
+    }
+    let dataToSign = []
+    try {
+      Object.keys(params).forEach((k) => {
+        dataToSign.push({
+          key: k,
+          value: params.k
+        })
+      })
+      dataToSign.sort((a, b) => (a.key < b.key ? -1 : 1))
+      dataToSign = dataToSign.map((k) => k.key + '=' + k.value).join('&')
+      dataToSign = crypto
+        .createHmac('sha256', constants.appSecret)
+        .update(dataToSign)
+        .digest('base64')
+      if (this.debugReqRes) {
+        this.log.warn(
+          'Sending HTTP getHost request. This text is yellow for clarity.\n%s',
+          JSON.stringify(params, null, 2)
+        )
+      } else if (this.debug) {
+        this.log('Sending HTTP getHost request.')
+      }
+      const res = await axios.get(
+        'https://api.coolkit.cc:8080/api/user/region', {
           headers: {
-            Authorization: "Sign " + dataToSign,
-            "Content-Type": "application/json",
+            Authorization: 'Sign ' + dataToSign,
+            'Content-Type': 'application/json'
           },
-          params,
-        });
-        let body = res.data;
-        if (!body.region) {
-          throw "Server did not respond with a region.\n" + JSON.stringify(body, null, 2);
+          params
         }
-        switch (body.region) {
-          case "eu":
-          case "us":
-          case "as":
-            this.httpHost = body.region + "-apia.coolkit.cc";
-            break;
-          case "cn":
-            this.httpHost = "cn-apia.coolkit.cn";
-            break;
+      )
+      const body = res.data
+      if (!body.region) {
+        throw new Error(
+          'Server did not respond with a region.\n' +
+          JSON.stringify(body, null, 2)
+        )
+      }
+      switch (body.region) {
+        case 'eu':
+        case 'us':
+        case 'as':
+          this.httpHost = body.region + '-apia.coolkit.cc'
+          break
+        case 'cn':
+          this.httpHost = 'cn-apia.coolkit.cn'
+          break
+        default:
+          throw new Error('No valid region received - [' + body.region + '].')
+      }
+      if (this.debug) {
+        this.log('HTTP API host received [%s].', this.httpHost)
+      }
+      return this.httpHost
+    } catch (err) {
+      if (
+        Object.prototype.hasOwnProperty.call(err, 'code') && ['ENOTFOUND', 'ETIMEDOUT', 'EAI_AGAIN'].includes(err.code)
+      ) {
+        this.log.warn('Unable to reach eWeLink. Retrying in 30 seconds.')
+        await utils.sleep(30000)
+        return this.getHost()
+      } else {
+        throw new Error(err.message || err)
+      }
+    }
+  }
+
+  async login () {
+    const data = {
+      countryCode: this.cCode,
+      password: this.password
+    }
+    try {
+      this.username.includes('@')
+        ? (data.email = this.username)
+        : (data.phoneNumber = this.username)
+      if (this.debugReqRes) {
+        const msg = JSON.stringify(data, null, 2)
+          .replace(this.password, '**hidden**')
+          .replace(this.username, '**hidden**')
+        this.log.warn(
+          'Sending HTTP login request. This text is yellow for clarity.\n%s',
+          msg
+        )
+      } else if (this.debug) {
+        this.log('Sending HTTP login request.')
+      }
+      const dataToSign = crypto
+        .createHmac('sha256', constants.appSecret)
+        .update(JSON.stringify(data))
+        .digest('base64')
+      const res = await axios.post(
+        'https://' + this.httpHost + '/v2/user/login',
+        data, {
+          headers: {
+            Authorization: 'Sign ' + dataToSign,
+            'Content-Type': 'application/json',
+            Host: this.httpHost,
+            'X-CK-Appid': constants.appId,
+            'X-CK-Nonce': Math.random().toString(36).substr(2, 8)
+          }
+        }
+      )
+      const body = res.data
+      if (
+        Object.prototype.hasOwnProperty.call(body, 'error') &&
+        body.error === 10004 &&
+        Object.prototype.hasOwnProperty.call(body, 'data') &&
+        Object.prototype.hasOwnProperty.call(body.data, 'region')
+      ) {
+        const givenRegion = body.data.region
+        switch (givenRegion) {
+          case 'eu':
+          case 'us':
+          case 'as':
+            this.httpHost = givenRegion + '-apia.coolkit.cc'
+            break
+          case 'cn':
+            this.httpHost = 'cn-apia.coolkit.cn'
+            break
           default:
-            throw "No valid region received - [" + body.region + "].";
+            throw new Error('No valid region received - [' + givenRegion + '].')
         }
         if (this.debug) {
-          this.log("HTTP API host received [%s].", this.httpHost);
+          this.log('New HTTP API host received [%s].', this.httpHost)
+        }
+        return this.login()
+      }
+      if (body.data.at) {
+        this.aToken = body.data.at
+        this.apiKey = body.data.user.apikey
+        return {
+          aToken: this.aToken,
+          apiKey: this.apiKey,
+          httpHost: this.httpHost
         }
-        resolve(this.httpHost);
-      } catch (err) {
-        if (err.hasOwnProperty("code") && ["ENOTFOUND", "ETIMEDOUT", "EAI_AGAIN"].includes(err.code)) {
-          this.log.warn("Unable to reach eWeLink. Retrying in 30 seconds.");
-          await utils.sleep(30000);
-          resolve(this.getHost());
+      } else {
+        if (body.error === 500) {
+          this.log.warn(
+            'An eWeLink error [500] occured. Retrying in 30 seconds.'
+          )
+          await utils.sleep(30000)
+          return this.login()
         } else {
-          reject(err.message || err);
+          throw new Error('No auth token received.\n' + JSON.stringify(body, null, 2))
         }
       }
-    });
+    } catch (err) {
+      throw new Error(err.message || err)
+    }
   }
-  login() {
-    return new Promise(async (resolve, reject) => {
-      let data = {
-        countryCode: this.cCode,
-        password: this.password,
-      };
-      try {
-        this.username.includes("@") ? (data.email = this.username) : (data.phoneNumber = this.username);
-        if (this.debugReqRes) {
-          let msg = JSON.stringify(data, null, 2)
-            .replace(this.password, "**hidden**")
-            .replace(this.username, "**hidden**");
-          this.log.warn("Sending HTTP login request. This text is yellow for clarity.\n%s", msg);
-        } else if (this.debug) {
-          this.log("Sending HTTP login request.");
-        }
-        let dataToSign = crypto.createHmac("sha256", constants.appSecret).update(JSON.stringify(data)).digest("base64");
-        let res = await axios.post("https://" + this.httpHost + "/v2/user/login", data, {
+
+  async getDevices () {
+    try {
+      const res = await axios.get(
+        'https://' + this.httpHost + '/v2/device/thing', {
           headers: {
-            Authorization: "Sign " + dataToSign,
-            "Content-Type": "application/json",
+            Authorization: 'Bearer ' + this.aToken,
+            'Content-Type': 'application/json',
             Host: this.httpHost,
-            "X-CK-Appid": constants.appId,
-            "X-CK-Nonce": Math.random().toString(36).substr(2, 8),
-          },
-        });
-        let body = res.data;
-        if (
-          body.hasOwnProperty("error") &&
-          body.error === 10004 &&
-          body.hasOwnProperty("data") &&
-          body.data.hasOwnProperty("region")
-        ) {
-          let givenRegion = body.data.region;
-          switch (givenRegion) {
-            case "eu":
-            case "us":
-            case "as":
-              this.httpHost = givenRegion + "-apia.coolkit.cc";
-              break;
-            case "cn":
-              this.httpHost = "cn-apia.coolkit.cn";
-              break;
-            default:
-              throw "No valid region received - [" + givenRegion + "].";
-          }
-          if (this.debug) {
-            this.log("New HTTP API host received [%s].", this.httpHost);
+            'X-CK-Appid': constants.appId,
+            'X-CK-Nonce': Math.random().toString(36).substr(2, 8)
           }
-          resolve(this.login());
-          return;
         }
-        if (body.data.at) {
-          this.aToken = body.data.at;
-          this.apiKey = body.data.user.apikey;
-          resolve({
-            aToken: this.aToken,
-            apiKey: this.apiKey,
-            httpHost: this.httpHost,
-          });
-        } else {
-          if (body.error === 500) {
-            this.log.warn("An eWeLink error [500] occured. Retrying in 30 seconds.");
-            await utils.sleep(30000);
-            resolve(this.login());
-          } else {
-            throw "No auth token received.\n" + JSON.stringify(body, null, 2);
-          }
-        }
-      } catch (err) {
-        reject(err.message || err);
+      )
+      const body = res.data
+      if (
+        !Object.prototype.hasOwnProperty.call(body, 'data') ||
+        !Object.prototype.hasOwnProperty.call(body, 'error') ||
+        (Object.prototype.hasOwnProperty.call(body, 'error') && body.error !== 0)
+      ) {
+        throw new Error(JSON.stringify(body, null, 2))
+      }
+      const deviceList = []
+      if (body.data.thingList && body.data.thingList.length > 0) {
+        body.data.thingList.forEach((device) =>
+          deviceList.push(device.itemData)
+        )
+      }
+      deviceList
+        .filter(
+          (d) => Object.prototype.hasOwnProperty.call(d, 'extra') && Object.prototype.hasOwnProperty.call(d.extra, 'uiid')
+        )
+        .filter((d) => !this.hideDevFromHB.includes(d.deviceid))
+      return deviceList
+    } catch (err) {
+      if (
+        Object.prototype.hasOwnProperty.call(err, 'code') && ['ENOTFOUND', 'ETIMEDOUT'].includes(err.code)
+      ) {
+        this.log.warn('Unable to reach eWeLink. Retrying in 30 seconds.')
+        await utils.sleep(30000)
+        return this.getDevices()
+      } else {
+        throw new Error(err.message || err)
       }
-    });
+    }
   }
-  getDevices() {
-    return new Promise(async (resolve, reject) => {
-      try {
-        let res = await axios.get("https://" + this.httpHost + "/v2/device/thing", {
+
+  async getDevice (deviceId) {
+    try {
+      const res = await axios.post(
+        'https://' + this.httpHost + '/v2/device/thing', {
+          thingList: [{
+            itemType: 1,
+            id: deviceId
+          }]
+        }, {
           headers: {
-            Authorization: "Bearer " + this.aToken,
-            "Content-Type": "application/json",
+            Authorization: 'Bearer ' + this.aToken,
+            'Content-Type': 'application/json',
             Host: this.httpHost,
-            "X-CK-Appid": constants.appId,
-            "X-CK-Nonce": Math.random().toString(36).substr(2, 8),
-          },
-        });
-        let body = res.data;
-        if (
-          !body.hasOwnProperty("data") ||
-          !body.hasOwnProperty("error") ||
-          (body.hasOwnProperty("error") && body.error !== 0)
-        ) {
-          throw JSON.stringify(body, null, 2);
-        }
-        let deviceList = [];
-        if (body.data.thingList && body.data.thingList.length > 0) {
-          body.data.thingList.forEach(device => deviceList.push(device.itemData));
-        }
-        deviceList
-          .filter(d => d.hasOwnProperty("extra") && d.extra.hasOwnProperty("uiid"))
-          .filter(d => !this.hideDevFromHB.includes(d.deviceid));
-        resolve(deviceList);
-      } catch (err) {
-        if (err.hasOwnProperty("code") && ["ENOTFOUND", "ETIMEDOUT"].includes(err.code)) {
-          this.log.warn("Unable to reach eWeLink. Retrying in 30 seconds.");
-          await utils.sleep(30000);
-          resolve(this.getDevices());
-        } else {
-          reject(err.message || err);
-        }
-      }
-    });
-  }
-  getDevice(deviceId) {
-    return new Promise(async (resolve, reject) => {
-      try {
-        let res = await axios.post(
-          "https://" + this.httpHost + "/v2/device/thing",
-          {
-            thingList: [
-              {
-                itemType: 1,
-                id: deviceId,
-              },
-            ],
-          },
-          {
-            headers: {
-              Authorization: "Bearer " + this.aToken,
-              "Content-Type": "application/json",
-              Host: this.httpHost,
-              "X-CK-Appid": constants.appId,
-              "X-CK-Nonce": Math.random().toString(36).substr(2, 8),
-            },
+            'X-CK-Appid': constants.appId,
+            'X-CK-Nonce': Math.random().toString(36).substr(2, 8)
           }
-        );
-        let body = res.data;
-        if (
-          !body.hasOwnProperty("data") ||
-          !body.hasOwnProperty("error") ||
-          (body.hasOwnProperty("error") && body.error !== 0)
-        ) {
-          throw JSON.stringify(body, null, 2);
-        }
-        if (body.data.thingList && body.data.thingList.length === 1) {
-          resolve(body.data.thingList[0].itemData);
-        } else {
-          throw "device not found in eWeLink";
-        }
-      } catch (err) {
-        if (err.hasOwnProperty("code") && ["ENOTFOUND", "ETIMEDOUT"].includes(err.code)) {
-          this.log.warn("Unable to reach eWeLink. Retrying in 30 seconds.");
-          await utils.sleep(30000);
-          resolve(this.getDevice(deviceId));
-        } else {
-          reject(err.message || err);
         }
+      )
+      const body = res.data
+      if (
+        !Object.prototype.hasOwnProperty.call(body, 'data') ||
+        !Object.prototype.hasOwnProperty.call(body, 'error') ||
+        (Object.prototype.hasOwnProperty.call(body, 'error') && body.error !== 0)
+      ) {
+        throw new Error(JSON.stringify(body, null, 2))
+      }
+      if (body.data.thingList && body.data.thingList.length === 1) {
+        return body.data.thingList[0].itemData
+      } else {
+        throw new Error('device not found in eWeLink')
+      }
+    } catch (err) {
+      if (
+        Object.prototype.hasOwnProperty.call(err, 'code') && ['ENOTFOUND', 'ETIMEDOUT'].includes(err.code)
+      ) {
+        this.log.warn('Unable to reach eWeLink. Retrying in 30 seconds.')
+        await utils.sleep(30000)
+        return this.getDevice(deviceId)
+      } else {
+        throw new Error(err.message || err)
       }
-    });
+    }
   }
-};
+}
diff --git a/lib/eWeLinkLAN.js b/lib/eWeLinkLAN.js
index 70d0c13c..a14d8cda 100644
--- a/lib/eWeLinkLAN.js
+++ b/lib/eWeLinkLAN.js
@@ -1,185 +1,186 @@
-/* jshint esversion: 9, -W014, -W030, node: true */
-"use strict";
-const axios = require("axios"),
-  cns = require("./constants"),
-  crypto = require("crypto"),
-  dns = require("node-dns-sd"),
-  eventemitter = require("events");
+'use strict'
+const axios = require('axios')
+const cns = require('./constants')
+const crypto = require('crypto')
+const dns = require('node-dns-sd')
+const EventEmitter = require('events')
 module.exports = class eWeLinkLAN {
-  constructor(config, log, devices) {
-    this.log = log;
-    this.devices = devices;
-    this.ipOverrides = config.ipOverride || {};
-    this.deviceMap = new Map();
+  constructor (config, log, devices) {
+    this.log = log
+    this.devices = devices
+    this.ipOverrides = config.ipOverride || {}
+    this.deviceMap = new Map()
     devices.forEach(device => {
       this.deviceMap.set(device.deviceid, {
         apiKey: device.devicekey,
-        online: this.ipOverrides.hasOwnProperty(device.deviceid) ? true : false,
-        ip: this.ipOverrides.hasOwnProperty(device.deviceid) ? this.ipOverrides[device.deviceid] : null,
-      });
-    });
-    this.debug = config.debug || false;
-    this.debugReqRes = config.debugReqRes || false;
-    this.emitter = new eventemitter();
+        online: !!Object.prototype.hasOwnProperty.call(this.ipOverrides, device.deviceid),
+        ip: Object.prototype.hasOwnProperty.call(this.ipOverrides, device.deviceid) ? this.ipOverrides[device.deviceid] : null
+      })
+    })
+    this.debug = config.debug || false
+    this.debugReqRes = config.debugReqRes || false
+    this.emitter = new EventEmitter()
   }
-  getHosts() {
-    return new Promise(async (resolve, reject) => {
-      try {
-        let res = await dns.discover({
-          name: "_ewelink._tcp.local",
-        });
-        res.forEach(device => {
-          let d,
-            deviceId = device.fqdn.replace("._ewelink._tcp.local", "").replace("eWeLink_", "");
-          if ((d = this.deviceMap.get(deviceId))) {
-            if (!this.ipOverrides.hasOwnProperty(deviceId)) {
-              this.deviceMap.set(deviceId, {
-                apiKey: d.apiKey,
-                online: true,
-                ip: device.address,
-              });
-            }
+
+  async getHosts () {
+    try {
+      const res = await dns.discover({
+        name: '_ewelink._tcp.local'
+      })
+      res.forEach(device => {
+        let d
+        const deviceId = device.fqdn.replace('._ewelink._tcp.local', '').replace('eWeLink_', '')
+        if ((d = this.deviceMap.get(deviceId))) {
+          if (!Object.prototype.hasOwnProperty.call(this.ipOverrides, deviceId)) {
+            this.deviceMap.set(deviceId, {
+              apiKey: d.apiKey,
+              online: true,
+              ip: device.address
+            })
           }
-        });
-        resolve(this.deviceMap);
-      } catch (err) {
-        reject(err);
-      }
-    });
+        }
+      })
+      return this.deviceMap
+    } catch (err) {
+      throw new Error(err)
+    }
   }
-  startMonitor() {
+
+  startMonitor () {
     dns.ondata = packet => {
       if (packet.answers) {
         packet.answers
-          .filter(value => value.name.includes("_ewelink._tcp.local"))
-          .filter(value => value.type === "TXT")
+          .filter(value => value.name.includes('_ewelink._tcp.local'))
+          .filter(value => value.type === 'TXT')
           .filter(value => this.deviceMap.has(value.rdata.id))
           .forEach(value => {
-            let rdata = value.rdata,
-              deviceInfo = this.deviceMap.get(rdata.id),
-              data =
-                rdata.data1 +
-                (rdata.hasOwnProperty("data2") ? rdata.data2 : "") +
-                (rdata.hasOwnProperty("data3") ? rdata.data3 : "") +
-                (rdata.hasOwnProperty("data4") ? rdata.data4 : ""),
-              key = crypto.createHash("md5").update(Buffer.from(deviceInfo.apiKey, "utf8")).digest(),
-              dText = crypto.createDecipheriv("aes-128-cbc", key, Buffer.from(rdata.iv, "base64")),
-              pText = Buffer.concat([dText.update(Buffer.from(data, "base64")), dText.final()]).toString("utf8"),
-              params;
-            if (packet.address !== deviceInfo.ip && !this.ipOverrides.hasOwnProperty(rdata.id)) {
+            const rdata = value.rdata
+            const deviceInfo = this.deviceMap.get(rdata.id)
+            const data =
+              rdata.data1 +
+              (Object.prototype.hasOwnProperty.call(rdata, 'data2') ? rdata.data2 : '') +
+              (Object.prototype.hasOwnProperty.call(rdata, 'data3') ? rdata.data3 : '') +
+              (Object.prototype.hasOwnProperty.call(rdata, 'data4') ? rdata.data4 : '')
+            const key = crypto.createHash('md5').update(Buffer.from(deviceInfo.apiKey, 'utf8')).digest()
+            const dText = crypto.createDecipheriv('aes-128-cbc', key, Buffer.from(rdata.iv, 'base64'))
+            const pText = Buffer.concat([dText.update(Buffer.from(data, 'base64')), dText.final()]).toString('utf8')
+            let params
+            if (packet.address !== deviceInfo.ip && !Object.prototype.hasOwnProperty.call(this.ipOverrides, rdata.id)) {
               this.deviceMap.set(rdata.id, {
                 apiKey: deviceInfo.apiKey,
                 online: true,
-                ip: packet.address,
-              });
+                ip: packet.address
+              })
               if (this.debug) {
-                this.log.warn("[%s] updating IP address to [%s].", rdata.id, packet.address);
+                this.log.warn('[%s] updating IP address to [%s].', rdata.id, packet.address)
               }
             }
             try {
-              params = JSON.parse(pText);
+              params = JSON.parse(pText)
             } catch (e) {
-              this.log.warn("[%s] An error occured reading the LAN message [%s]", rdata.id, e);
-              return;
+              this.log.warn('[%s] An error occured reading the LAN message [%s]', rdata.id, e)
+              return
             }
-            for (let param in params) {
-              if (params.hasOwnProperty(param)) {
-                if (!cns.paramsToKeep.includes(param.replace(/[0-9]/g, ""))) {
-                  delete params[param];
+            for (const param in params) {
+              if (Object.prototype.hasOwnProperty.call(params, param)) {
+                if (!cns.paramsToKeep.includes(param.replace(/[0-9]/g, ''))) {
+                  delete params[param]
                 }
               }
             }
             if (Object.keys(params).length > 0) {
-              params.updateSource = "LAN";
-              params.online = true;
-              let returnTemplate = {
+              params.updateSource = 'LAN'
+              params.online = true
+              const returnTemplate = {
                 deviceid: rdata.id,
-                params,
-              };
+                params
+              }
               if (this.debugReqRes) {
-                let msg = JSON.stringify(returnTemplate, null, 2).replace(rdata.id, "**hidden**");
-                this.log("LAN message received.\n%s", msg);
+                const msg = JSON.stringify(returnTemplate, null, 2).replace(rdata.id, '**hidden**')
+                this.log('LAN message received.\n%s', msg)
               } else if (this.debug) {
-                this.log("LAN message received.");
+                this.log('LAN message received.')
               }
-              this.emitter.emit("update", returnTemplate);
+              this.emitter.emit('update', returnTemplate)
             }
-          });
+          })
       }
-    };
-    dns.startMonitoring();
+    }
+    dns.startMonitoring()
   }
-  sendUpdate(json) {
-    return new Promise(async (resolve, reject) => {
-      try {
-        if (!this.deviceMap.get(json.deviceid).online) {
-          throw "device isn't reachable via LAN mode";
+
+  async sendUpdate (json) {
+    try {
+      if (!this.deviceMap.get(json.deviceid).online) {
+        throw new Error("device isn't reachable via LAN mode")
+      }
+      let apiKey
+      let suffix
+      const params = {}
+      if (Object.prototype.hasOwnProperty.call(json.params, 'switches')) {
+        params.switches = json.params.switches
+        suffix = 'switches'
+      } else if (Object.prototype.hasOwnProperty.call(json.params, 'switch')) {
+        params.switch = json.params.switch
+        suffix = 'switch'
+      } else {
+        throw new Error("device isn't reachable via LAN mode")
+      }
+      if ((apiKey = this.deviceMap.get(json.deviceid).apiKey)) {
+        const key = crypto.createHash('md5').update(Buffer.from(apiKey, 'utf8')).digest()
+        const iv = crypto.randomBytes(16)
+        const enc = crypto.createCipheriv('aes-128-cbc', key, iv)
+        const data = {
+          data: Buffer.concat([enc.update(JSON.stringify(params)), enc.final()]).toString('base64'),
+          deviceid: json.deviceid,
+          encrypt: true,
+          iv: iv.toString('base64'),
+          selfApikey: '123',
+          sequence: Date.now().toString()
         }
-        let apiKey,
-          suffix,
-          params = {};
-        if (json.params.hasOwnProperty("switches")) {
-          params.switches = json.params.switches;
-          suffix = "switches";
-        } else if (json.params.hasOwnProperty("switch")) {
-          params.switch = json.params.switch;
-          suffix = "switch";
-        } else {
-          throw "device isn't reachable via LAN mode";
+        if (this.debugReqRes) {
+          const msg = JSON.stringify(json, null, 2)
+            .replace(json.apikey, '**hidden**')
+            .replace(json.apikey, '**hidden**')
+            .replace(json.deviceid, '**hidden**')
+          this.log.warn('LAN message sent. This text is yellow for clarity.\n%s', msg)
+        } else if (this.debug) {
+          this.log('LAN message sent.')
         }
-        if ((apiKey = this.deviceMap.get(json.deviceid).apiKey)) {
-          let key = crypto.createHash("md5").update(Buffer.from(apiKey, "utf8")).digest(),
-            iv = crypto.randomBytes(16),
-            enc = crypto.createCipheriv("aes-128-cbc", key, iv),
-            data = {
-              data: Buffer.concat([enc.update(JSON.stringify(params)), enc.final()]).toString("base64"),
-              deviceid: json.deviceid,
-              encrypt: true,
-              iv: iv.toString("base64"),
-              selfApikey: "123",
-              sequence: Date.now().toString(),
-            };
-          if (this.debugReqRes) {
-            let msg = JSON.stringify(json, null, 2)
-              .replace(json.apikey, "**hidden**")
-              .replace(json.apikey, "**hidden**")
-              .replace(json.deviceid, "**hidden**");
-            this.log.warn("LAN message sent. This text is yellow for clarity.\n%s", msg);
-          } else if (this.debug) {
-            this.log("LAN message sent.");
-          }
-          let res = await axios({
-            method: "post",
-            url: "http://" + this.deviceMap.get(json.deviceid).ip + ":8081/zeroconf/" + suffix,
-            headers: {
-              Accept: "application/json",
-              "Content-Type": "application/json",
-            },
-            data,
-          });
-          if (res.data.hasOwnProperty("error") && res.data.error === 0) {
-            resolve();
-          } else {
-            throw res.data;
-          }
+        const res = await axios({
+          method: 'post',
+          url: 'http://' + this.deviceMap.get(json.deviceid).ip + ':8081/zeroconf/' + suffix,
+          headers: {
+            Accept: 'application/json',
+            'Content-Type': 'application/json'
+          },
+          data
+        })
+        if (Object.prototype.hasOwnProperty.call(res.data, 'error') && res.data.error === 0) {
+          return
+        } else {
+          throw new Error(res.data)
         }
-      } catch (err) {
-        reject(err);
       }
-    });
+    } catch (err) {
+      throw new Error(err)
+    }
   }
-  receiveUpdate(f) {
-    this.emitter.addListener("update", f);
+
+  receiveUpdate (f) {
+    this.emitter.addListener('update', f)
   }
-  addDeviceToMap(device) {
+
+  addDeviceToMap (device) {
     this.deviceMap.set(device.deviceid, {
       apiKey: device.devicekey,
-      online: this.ipOverrides.hasOwnProperty(device.deviceid) ? true : false,
-      ip: this.ipOverrides.hasOwnProperty(device.deviceid) ? this.ipOverrides[device.deviceid] : null,
-    });
+      online: !!Object.prototype.hasOwnProperty.call(this.ipOverrides, device.deviceid),
+      ip: Object.prototype.hasOwnProperty.call(this.ipOverrides, device.deviceid) ? this.ipOverrides[device.deviceid] : null
+    })
   }
-  closeConnection() {
-    dns.stopMonitoring();
-    this.log("LAN monitoring gracefully stopped.");
+
+  closeConnection () {
+    dns.stopMonitoring()
+    this.log('LAN monitoring gracefully stopped.')
   }
-};
+}
diff --git a/lib/eWeLinkWS.js b/lib/eWeLinkWS.js
index c3201325..647eb091 100644
--- a/lib/eWeLinkWS.js
+++ b/lib/eWeLinkWS.js
@@ -1,289 +1,317 @@
-/* jshint esversion: 9, -W014, -W030, node: true */
-"use strict";
-const axios = require("axios"),
-  cns = require("./constants"),
-  eventemitter = require("events"),
-  utils = require("./utils"),
-  ws = require("ws"),
-  wsp = require("websocket-as-promised");
+'use strict'
+const axios = require('axios')
+const cns = require('./constants')
+const EventEmitter = require('events')
+const utils = require('./utils')
+const WS = require('ws')
+const WSP = require('websocket-as-promised')
 module.exports = class eWeLinkWS {
-  constructor(config, log, res) {
-    this.config = config;
-    this.log = log;
-    this.debug = this.config.debug || false;
-    this.debugReqRes = this.config.debugReqRes || false;
-    this.httpHost = res.httpHost;
-    this.aToken = res.aToken;
-    this.apiKey = res.apiKey;
-    this.wsIsOpen = false;
-    this.emitter = new eventemitter();
-    this.delaySend = 0;
+  constructor (config, log, res) {
+    this.config = config
+    this.log = log
+    this.debug = this.config.debug || false
+    this.debugReqRes = this.config.debugReqRes || false
+    this.httpHost = res.httpHost
+    this.aToken = res.aToken
+    this.apiKey = res.apiKey
+    this.wsIsOpen = false
+    this.emitter = new EventEmitter()
+    this.delaySend = 0
   }
-  getHost() {
-    return new Promise(async (resolve, reject) => {
-      try {
-        let res = await axios({
-          method: "post",
-          url: "https://" + this.httpHost.replace("-api", "-disp") + "/dispatch/app",
-          headers: {
-            Authorization: "Bearer " + this.aToken,
-            "Content-Type": "application/json",
-          },
-          data: {
-            appid: cns.appId,
-            nonce: Math.random().toString(36).substr(2, 8),
-            ts: Math.floor(new Date().getTime() / 1000),
-            version: 8,
-          },
-        });
-        let body = res.data;
-        if (!body.domain) {
-          throw "Server did not respond with a web socket host.";
-        }
-        if (this.debug) {
-          this.log("Web socket host received [%s].", body.domain);
-        }
-        this.wsHost = body.domain;
-        resolve(body.domain);
-      } catch (err) {
-        if (err.hasOwnProperty("code") && ["ENOTFOUND", "ETIMEDOUT"].includes(err.code)) {
-          this.log.warn("Unable to reach eWeLink. Retrying in 30 seconds.");
-          await utils.sleep(30000);
-          resolve(this.getDevices());
-        } else {
-          reject(err.message || err);
+
+  async getHost () {
+    try {
+      const res = await axios({
+        method: 'post',
+        url: 'https://' +
+          this.httpHost.replace('-api', '-disp') +
+          '/dispatch/app',
+        headers: {
+          Authorization: 'Bearer ' + this.aToken,
+          'Content-Type': 'application/json'
+        },
+        data: {
+          appid: cns.appId,
+          nonce: Math.random().toString(36).substr(2, 8),
+          ts: Math.floor(new Date().getTime() / 1000),
+          version: 8
         }
+      })
+      const body = res.data
+      if (!body.domain) {
+        throw new Error('Server did not respond with a web socket host.')
       }
-    });
+      if (this.debug) {
+        this.log('Web socket host received [%s].', body.domain)
+      }
+      this.wsHost = body.domain
+      return body.domain
+    } catch (err) {
+      if (
+        Object.prototype.hasOwnProperty.call(err, 'code') && ['ENOTFOUND', 'ETIMEDOUT'].includes(err.code)
+      ) {
+        this.log.warn('Unable to reach eWeLink. Retrying in 30 seconds.')
+        await utils.sleep(30000)
+        return this.getDevices()
+      } else {
+        throw new Error(err.message || err)
+      }
+    }
   }
-  login() {
-    this.wsp = new wsp("wss://" + this.wsHost + ":8080/api/ws", {
-      createWebSocket: url => new ws(url),
-      extractMessageData: event => event,
+
+  login () {
+    this.wsp = new WSP('wss://' + this.wsHost + ':8080/api/ws', {
+      createWebSocket: (url) => new WS(url),
+      extractMessageData: (event) => event,
       attachRequestId: (data, requestId) =>
-        Object.assign(
-          {
-            sequence: requestId,
-          },
-          data
+        Object.assign({
+          sequence: requestId
+        },
+        data
         ),
-      extractRequestId: data => data && data.sequence,
-      packMessage: data => JSON.stringify(data),
-      unpackMessage: data => {
-        return data === "pong" ? data : JSON.parse(data);
-      },
-    });
-    this.wsp.open();
+      extractRequestId: (data) => data && data.sequence,
+      packMessage: (data) => JSON.stringify(data),
+      unpackMessage: (data) => {
+        return data === 'pong' ? data : JSON.parse(data)
+      }
+    })
+    this.wsp.open()
     this.wsp.onOpen.addListener(async () => {
-      this.wsIsOpen = true;
-      let sequence = Math.floor(new Date()).toString(),
-        payload = {
-          action: "userOnline",
-          apikey: this.apiKey,
-          appid: cns.appId,
-          at: this.aToken,
-          nonce: Math.random().toString(36).substr(2, 8),
-          sequence,
-          ts: Math.floor(new Date() / 1000),
-          userAgent: "app",
-          version: 8,
-        };
+      this.wsIsOpen = true
+      const sequence = Math.floor(new Date()).toString()
+      const payload = {
+        action: 'userOnline',
+        apikey: this.apiKey,
+        appid: cns.appId,
+        at: this.aToken,
+        nonce: Math.random().toString(36).substr(2, 8),
+        sequence,
+        ts: Math.floor(new Date() / 1000),
+        userAgent: 'app',
+        version: 8
+      }
       if (this.debugReqRes) {
-        let msg = JSON.stringify(payload, null, 2)
-          .replace(this.aToken, "**hidden**")
-          .replace(this.apiKey, "**hidden**");
-        this.log.warn("Sending WS login request. This text is yellow for clarity.\n%s", msg);
+        const msg = JSON.stringify(payload, null, 2)
+          .replace(this.aToken, '**hidden**')
+          .replace(this.apiKey, '**hidden**')
+        this.log.warn(
+          'Sending WS login request. This text is yellow for clarity.\n%s',
+          msg
+        )
       } else if (this.debug) {
-        this.log("Sending WS login request.");
+        this.log('Sending WS login request.')
       }
       try {
-        let res = await this.wsp.sendRequest(payload, {
-          requestId: sequence,
-        });
-        if (res.hasOwnProperty("config") && res.config.hb && res.config.hbInterval && !this.hbInterval) {
+        const res = await this.wsp.sendRequest(payload, {
+          requestId: sequence
+        })
+        if (
+          Object.prototype.hasOwnProperty.call(res, 'config') &&
+          res.config.hb &&
+          res.config.hbInterval &&
+          !this.hbInterval
+        ) {
           this.hbInterval = setInterval(() => {
-            this.wsp.send("ping");
-          }, (res.config.hbInterval + 7) * 1000);
+            this.wsp.send('ping')
+          }, (res.config.hbInterval + 7) * 1000)
         } else {
-          throw "Unknown parameters received";
+          throw new Error('Unknown parameters received')
         }
       } catch (err) {
-        this.log.error("WS login failed [%s].", err);
+        this.log.error('WS login failed [%s].', err)
       }
-    });
-    this.wsp.onUnpackedMessage.addListener(device => {
-      if (device === "pong") return;
-      let onlineStatus = true;
-      if (!device.hasOwnProperty("params")) device.params = {};
-      if (device.hasOwnProperty("deviceid") && device.hasOwnProperty("error")) {
-        device.action = "update";
-        onlineStatus = device.error === 0;
+    })
+    this.wsp.onUnpackedMessage.addListener((device) => {
+      if (device === 'pong') return
+      let onlineStatus = true
+      if (!Object.prototype.hasOwnProperty.call(device, 'params')) device.params = {}
+      if (Object.prototype.hasOwnProperty.call(device, 'deviceid') && Object.prototype.hasOwnProperty.call(device, 'error')) {
+        device.action = 'update'
+        onlineStatus = device.error === 0
       }
-      if (device.hasOwnProperty("action")) {
+      if (Object.prototype.hasOwnProperty.call(device, 'action')) {
         switch (device.action) {
-          case "update":
-          case "sysmsg":
-            if (device.action === "sysmsg" && device.params.hasOwnProperty("online")) {
-              onlineStatus = device.params.online;
+          case 'update':
+          case 'sysmsg':
+            if (
+              device.action === 'sysmsg' &&
+              Object.prototype.hasOwnProperty.call(device.params, 'online')
+            ) {
+              onlineStatus = device.params.online
             }
-            for (let param in device.params) {
-              if (device.params.hasOwnProperty(param)) {
-                if (!cns.paramsToKeep.includes(param.replace(/[0-9]/g, ""))) {
-                  delete device.params[param];
+            for (const param in device.params) {
+              if (Object.prototype.hasOwnProperty.call(device.params, param)) {
+                if (!cns.paramsToKeep.includes(param.replace(/[0-9]/g, ''))) {
+                  delete device.params[param]
                 }
               }
             }
-            device.params.online = onlineStatus;
-            device.params.updateSource = "WS";
+            device.params.online = onlineStatus
+            device.params.updateSource = 'WS'
             if (Object.keys(device.params).length > 0) {
-              let returnTemplate = {
+              const returnTemplate = {
                 deviceid: device.deviceid,
-                params: device.params,
-              };
+                params: device.params
+              }
               if (this.debugReqRes) {
-                let msg = JSON.stringify(returnTemplate, null, 2).replace(device.deviceid, "**hidden**");
-                this.log("WS message received.\n%s", msg);
+                const msg = JSON.stringify(returnTemplate, null, 2).replace(
+                  device.deviceid,
+                  '**hidden**'
+                )
+                this.log('WS message received.\n%s', msg)
               } else if (this.debug) {
-                this.log("WS message received.");
+                this.log('WS message received.')
               }
-              this.emitter.emit("update", returnTemplate);
+              this.emitter.emit('update', returnTemplate)
             }
-            break;
-          case "reportSubDevice":
-            return;
+            break
+          case 'reportSubDevice':
+            return
           default:
-            this.log.warn("[%s] WS message has unknown action.\n" + JSON.stringify(device, null, 2), device.deviceid);
-            return;
+            this.log.warn(
+              '[%s] WS message has unknown action.\n' +
+              JSON.stringify(device, null, 2),
+              device.deviceid
+            )
         }
-      } else if (device.hasOwnProperty("error") && device.error === 0) {
+      } else if (Object.prototype.hasOwnProperty.call(device, 'error') && device.error === 0) {
         // *** Safe to ignore these messages *** \\
       } else {
         if (this.debug) {
-          this.log.warn("WS unknown command received.\n" + JSON.stringify(device, null, 2));
+          this.log.warn(
+            'WS unknown command received.\n' + JSON.stringify(device, null, 2)
+          )
         }
       }
-    });
+    })
     this.wsp.onClose.addListener((e, m) => {
-      this.wsIsOpen = false;
+      this.wsIsOpen = false
       if (e !== 1005) {
-        this.log.warn("Web socket closed [%s].", e);
+        this.log.warn('Web socket closed [%s].', e)
         if (e !== 1000) {
-          this.log("Web socket will try to reconnect in five seconds.");
-          setTimeout(() => this.login(), 5000);
+          this.log('Web socket will try to reconnect in five seconds.')
+          setTimeout(() => this.login(), 5000)
         } else {
-          this.log("Please try restarting Homebridge so that this plugin can work again.");
+          this.log(
+            'Please try restarting Homebridge so that this plugin can work again.'
+          )
         }
       }
       if (this.hbInterval) {
-        clearInterval(this.hbInterval);
-        this.hbInterval = null;
+        clearInterval(this.hbInterval)
+        this.hbInterval = null
       }
-      this.wsp.removeAllListeners();
-    });
-    this.wsp.onError.addListener(e => {
-      this.log.error("Web socket error - [%s].", e);
-      if (e.code === "ECONNREFUSED") {
-        this.log.warn("Web socket will try to reconnect in five seconds then try the command again.");
-        this.wsp.removeAllListeners();
-        setTimeout(() => this.login(), 5000);
-      } else {
-        this.log.warn("If this was unexpected then please try restarting Homebridge.");
-      }
-    });
-  }
-  sendUpdate(json) {
-    return new Promise(async (resolve, reject) => {
-      let sequence = Math.floor(new Date()).toString(),
-        jsonToSend = {
-          ...json,
-          ...{
-            action: "update",
-            sequence,
-            userAgent: "app",
-          },
-        };
-      if (this.wsp && this.wsIsOpen) {
-        try {
-          let device = await this.wsp.sendRequest(jsonToSend, {
-            requestId: sequence,
-          });
-          if (this.debugReqRes) {
-            let msg = JSON.stringify(json, null, 2)
-              .replace(json.apikey, "**hidden**")
-              .replace(json.apiKey, "**hidden**")
-              .replace(json.deviceid, "**hidden**");
-            this.log.warn("WS message sent. This text is yellow for clarity.\n%s", msg);
-          } else if (this.debug) {
-            this.log("WS message sent.");
-          }
-          device.error = device.hasOwnProperty("error") ? device.error : 504; // mimic ewelink device offline
-          switch (device.error) {
-            case 0:
-              resolve();
-              break;
-            default:
-              throw "Unknown response";
-          }
-        } catch (err) {
-          reject("device update failed [" + err + "]");
-        }
+      this.wsp.removeAllListeners()
+    })
+    this.wsp.onError.addListener((e) => {
+      this.log.error('Web socket error - [%s].', e)
+      if (e.code === 'ECONNREFUSED') {
+        this.log.warn(
+          'Web socket will try to reconnect in five seconds then try the command again.'
+        )
+        this.wsp.removeAllListeners()
+        setTimeout(() => this.login(), 5000)
       } else {
-        if (this.debug) {
-          this.log.warn("Command will be resent when WS is reconnected.");
-        }
-        await utils.sleep(30000);
-        resolve(this.sendUpdate(json));
+        this.log.warn(
+          'If this was unexpected then please try restarting Homebridge.'
+        )
       }
-    });
+    })
   }
-  requestUpdate(accessory) {
-    return new Promise(async resolve => {
-      let sequence = Math.floor(new Date()).toString(),
-        json = {
-          action: "query",
-          apikey: accessory.context.eweApiKey,
-          deviceid: accessory.context.eweDeviceId,
-          params: [],
-          sequence,
-          ts: 0,
-          userAgent: "app",
-        };
 
-      if (this.wsp && this.wsIsOpen) {
-        this.wsp.send(JSON.stringify(json));
+  async sendUpdate (json) {
+    const sequence = Math.floor(new Date()).toString()
+    const jsonToSend = {
+      ...json,
+      ...{
+        action: 'update',
+        sequence,
+        userAgent: 'app'
+      }
+    }
+    if (this.wsp && this.wsIsOpen) {
+      try {
+        const device = await this.wsp.sendRequest(jsonToSend, {
+          requestId: sequence
+        })
         if (this.debugReqRes) {
-          let msg = JSON.stringify(json, null, 2)
-            .replace(json.apikey, "**hidden**")
-            .replace(json.apiKey, "**hidden**")
-            .replace(json.deviceid, "**hidden**");
-          this.log.warn("WS message sent. This text is yellow for clarity.\n%s", msg);
+          const msg = JSON.stringify(json, null, 2)
+            .replace(json.apikey, '**hidden**')
+            .replace(json.apiKey, '**hidden**')
+            .replace(json.deviceid, '**hidden**')
+          this.log.warn(
+            'WS message sent. This text is yellow for clarity.\n%s',
+            msg
+          )
         } else if (this.debug) {
-          this.log("WS message sent.");
+          this.log('WS message sent.')
         }
-      } else {
-        if (this.debug) {
-          this.log.warn("Command will be resent when WS is reconnected.");
+        device.error = Object.prototype.hasOwnProperty.call(device, 'error') ? device.error : 504
+        switch (device.error) {
+          case 0:
+            return
+          default:
+            throw new Error('Unknown response')
         }
-        await utils.sleep(30000);
-        resolve(this.requestUpdate(accessory));
+      } catch (err) {
+        throw new Error('device update failed [' + err + ']')
       }
-    });
+    } else {
+      if (this.debug) {
+        this.log.warn('Command will be resent when WS is reconnected.')
+      }
+      await utils.sleep(30000)
+      return this.sendUpdate(json)
+    }
   }
-  receiveUpdate(f) {
-    this.emitter.addListener("update", f);
+
+  async requestUpdate (accessory) {
+    const sequence = Math.floor(new Date()).toString()
+    const json = {
+      action: 'query',
+      apikey: accessory.context.eweApiKey,
+      deviceid: accessory.context.eweDeviceId,
+      params: [],
+      sequence,
+      ts: 0,
+      userAgent: 'app'
+    }
+    if (this.wsp && this.wsIsOpen) {
+      this.wsp.send(JSON.stringify(json))
+      if (this.debugReqRes) {
+        const msg = JSON.stringify(json, null, 2)
+          .replace(json.apikey, '**hidden**')
+          .replace(json.apiKey, '**hidden**')
+          .replace(json.deviceid, '**hidden**')
+        this.log.warn(
+          'WS message sent. This text is yellow for clarity.\n%s',
+          msg
+        )
+      } else if (this.debug) {
+        this.log('WS message sent.')
+      }
+    } else {
+      if (this.debug) {
+        this.log.warn('Command will be resent when WS is reconnected.')
+      }
+      await utils.sleep(30000)
+      return this.requestUpdate(accessory)
+    }
   }
-  closeConnection() {
-    return new Promise(async (resolve, reject) => {
-      if (this.wsp && this.wsIsOpen) {
-        try {
-          await this.wsp.close();
-          this.log("Web socket gracefully closed.");
-          resolve();
-        } catch (err) {
-          reject(err);
-        }
+
+  receiveUpdate (f) {
+    this.emitter.addListener('update', f)
+  }
+
+  async closeConnection () {
+    if (this.wsp && this.wsIsOpen) {
+      try {
+        await this.wsp.close()
+        this.log('Web socket gracefully closed.')
+        return
+      } catch (err) {
+        throw new Error(err)
       }
-      resolve();
-    });
+    }
   }
-};
+}
diff --git a/lib/utils.js b/lib/utils.js
index 5cb638ad..bf3698e8 100644
--- a/lib/utils.js
+++ b/lib/utils.js
@@ -1,7 +1,6 @@
-/* jshint esversion: 9, -W014, -W030, node: true */
-"use strict";
+'use strict'
 module.exports = {
   sleep: ms => {
-    return new Promise(resolve => setTimeout(resolve, ms));
-  },
-};
+    return new Promise(resolve => setTimeout(resolve, ms))
+  }
+}
diff --git a/package-lock.json b/package-lock.json
index a05cbda3..d667effe 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -560,12 +560,6 @@
         "object-keys": "^1.0.11"
       }
     },
-    "prettier": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.1.2.tgz",
-      "integrity": "sha512-16c7K+x4qVlJg9rEbXl7HEGmQyZlG4R9AgP+oHKRMsMsuk8s+ATStlf1NpDqyBI1HpVyfjLOeMhH2LvuNvV5Vg==",
-      "dev": true
-    },
     "promise-controller": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/promise-controller/-/promise-controller-1.0.0.tgz",
diff --git a/package.json b/package.json
index 81643c16..c27caff6 100644
--- a/package.json
+++ b/package.json
@@ -67,8 +67,5 @@
     "node-dns-sd": "0.4.1",
     "websocket-as-promised": "1.0.1",
     "ws": "7.3.1"
-  },
-  "devDependencies": {
-    "prettier": "2.1.2"
   }
 }

From 007a70d42653ba9fb89854c0d1340489d4fa8b8a Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 27 Sep 2020 08:32:16 +0100
Subject: [PATCH 0235/3183] standard code style

---
 lib/device/blind.js      | 136 ++++++++--------
 lib/device/curtain.js    |  63 +++----
 lib/device/fan.js        | 141 ++++++++--------
 lib/device/garage.js     | 164 +++++++++----------
 lib/device/light.js      | 344 ++++++++++++++++++++-------------------
 lib/device/lock.js       |  83 +++++-----
 lib/device/outlet.js     |  73 +++++----
 lib/device/rf-sub.js     | 157 +++++++++---------
 lib/device/scm.js        |  42 ++---
 lib/device/sensor.js     |  58 +++----
 lib/device/switch.js     | 139 ++++++++--------
 lib/device/thermostat.js |  71 ++++----
 lib/device/usb.js        |  43 ++---
 lib/device/valve.js      | 105 ++++++------
 lib/device/zb-dev.js     |  91 ++++++-----
 15 files changed, 862 insertions(+), 848 deletions(-)

diff --git a/lib/device/blind.js b/lib/device/blind.js
index 377fb763..13ea726e 100644
--- a/lib/device/blind.js
+++ b/lib/device/blind.js
@@ -1,97 +1,97 @@
-/* jshint esversion: 9, -W014, -W030, node: true */
-"use strict";
-let Characteristic, Service;
-const cns = require("./../constants"),
-  utils = require("./../utils");
+'use strict'
+let Characteristic, Service
+const cns = require('./../constants')
+const utils = require('./../utils')
 module.exports = class deviceBlind {
-  constructor(platform) {
-    this.platform = platform;
-    Service = platform.api.hap.Service;
-    Characteristic = platform.api.hap.Characteristic;
+  constructor (platform) {
+    this.platform = platform
+    Service = platform.api.hap.Service
+    Characteristic = platform.api.hap.Characteristic
   }
-  async internalBlindUpdate(accessory, value, callback) {
-    callback();
+
+  async internalBlindUpdate (accessory, value, callback) {
+    callback()
     try {
-      let blindConfig,
-        params = {},
-        wcService = accessory.getService(Service.WindowCovering),
-        prevState = accessory.context.cachePositionState,
-        prevPosition = accessory.context.cacheCurrentPosition,
-        newTarget = value,
-        updateKey = Math.random().toString(36).substr(2, 8);
+      let blindConfig
+      const params = {}
+      const wcService = accessory.getService(Service.WindowCovering)
+      const prevState = accessory.context.cachePositionState
+      let prevPosition = accessory.context.cacheCurrentPosition
+      const newTarget = value
+      const updateKey = Math.random().toString(36).substr(2, 8)
       if (!(blindConfig = this.platform.cusG.get(accessory.context.hbDeviceId))) {
-        throw "group config missing";
+        throw new Error('group config missing')
       }
-      if (blindConfig.type !== "blind" || blindConfig.setup !== "twoSwitch") {
-        throw "improper configuration";
+      if (blindConfig.type !== 'blind' || blindConfig.setup !== 'twoSwitch') {
+        throw new Error('improper configuration')
       }
-      if (newTarget === prevPosition) return;
-      params.switches = cns.defaultMultiSwitchOff;
-      accessory.context.updateKey = updateKey;
-      let percentStepPerDecisecond = blindConfig.operationTime / 100;
+      if (newTarget === prevPosition) return
+      params.switches = cns.defaultMultiSwitchOff
+      accessory.context.updateKey = updateKey
+      const percentStepPerDecisecond = blindConfig.operationTime / 100
       //
       //
-      this.platform.log("============================");
-      this.platform.log("============================");
-      this.platform.log("Starting main calculation...");
+      this.platform.log('============================')
+      this.platform.log('============================')
+      this.platform.log('Starting main calculation...')
       //
       //
       if (prevState !== 2) {
-        await this.platform.sendDeviceUpdate(accessory, params);
-        let positionPercentChange = Math.floor(Date.now() / 100) - accessory.context.cacheLastStartTime;
-        positionPercentChange = Math.floor(percentStepPerDecisecond * positionPercentChange);
+        await this.platform.sendDeviceUpdate(accessory, params)
+        let positionPercentChange = Math.floor(Date.now() / 100) - accessory.context.cacheLastStartTime
+        positionPercentChange = Math.floor(percentStepPerDecisecond * positionPercentChange)
         if (prevState === 0) {
           // moving down
-          prevPosition -= positionPercentChange;
+          prevPosition -= positionPercentChange
         } else {
-          prevPosition += positionPercentChange;
+          prevPosition += positionPercentChange
         }
-        wcService.updateCharacteristic(Characteristic.CurrentPosition, prevPosition);
-        accessory.context.cacheCurrentPosition = prevPosition;
-        this.platform.log.warn("Moving from [%s%] to [%s%]", prevPosition, newTarget);
+        wcService.updateCharacteristic(Characteristic.CurrentPosition, prevPosition)
+        accessory.context.cacheCurrentPosition = prevPosition
+        this.platform.log.warn('Moving from [%s%] to [%s%]', prevPosition, newTarget)
         this.platform.log.warn(
-          "Blind was already moving %s when it was changed and was probably around %s%",
-          prevState === 1 ? "up" : "down",
+          'Blind was already moving %s when it was changed and was probably around %s%',
+          prevState === 1 ? 'up' : 'down',
           prevPosition
-        );
+        )
         this.platform.log.warn(
-          "Giving a difference of %s seconds -  a position change of %s%",
+          'Giving a difference of %s seconds -  a position change of %s%',
           (Math.floor(Date.now() / 100) - accessory.context.cacheLastStartTime) / 10,
           positionPercentChange
-        );
+        )
       } else {
-        this.platform.log("Moving from [%s%] to [%s%].", prevPosition, newTarget);
+        this.platform.log('Moving from [%s%] to [%s%].', prevPosition, newTarget)
       }
-      let diffPosition = newTarget - prevPosition;
-      let setToMoveUp = diffPosition > 0;
-      let decisecondsToMove = Math.round(Math.abs(diffPosition) * percentStepPerDecisecond);
+      const diffPosition = newTarget - prevPosition
+      const setToMoveUp = diffPosition > 0
+      const decisecondsToMove = Math.round(Math.abs(diffPosition) * percentStepPerDecisecond)
       this.platform.log(
-        "So we need to move %s from the previous state of %s for about %s seconds",
-        setToMoveUp ? "up" : "down",
-        prevState === 0 ? "moving down" : prevState === 1 ? "moving up" : "stopped",
+        'So we need to move %s from the previous state of %s for about %s seconds',
+        setToMoveUp ? 'up' : 'down',
+        prevState === 0 ? 'moving down' : prevState === 1 ? 'moving up' : 'stopped',
         decisecondsToMove / 10
-      );
-      params.switches[0].switch = setToMoveUp ? "on" : "off";
-      params.switches[1].switch = setToMoveUp ? "off" : "on";
-      await this.platform.sendDeviceUpdate(accessory, params);
+      )
+      params.switches[0].switch = setToMoveUp ? 'on' : 'off'
+      params.switches[1].switch = setToMoveUp ? 'off' : 'on'
+      await this.platform.sendDeviceUpdate(accessory, params)
       wcService
         .updateCharacteristic(Characteristic.TargetPosition, newTarget)
-        .updateCharacteristic(Characteristic.PositionState, setToMoveUp);
-      accessory.context.cacheTargetPosition = newTarget;
-      accessory.context.cachePositionState = setToMoveUp ? 1 : 0;
-      accessory.context.cacheLastStartTime = Math.floor(Date.now() / 100);
-      if (accessory.context.updateKey !== updateKey) return;
-      await utils.sleep(decisecondsToMove * 100);
-      if (accessory.context.updateKey !== updateKey) return;
-      params.switches[0].switch = "off";
-      params.switches[1].switch = "off";
-      await this.platform.sendDeviceUpdate(accessory, params);
-      wcService.updateCharacteristic(Characteristic.PositionState, 2);
-      wcService.updateCharacteristic(Characteristic.CurrentPosition, newTarget);
-      accessory.context.cachePositionState = 2;
-      accessory.context.cacheCurrentPosition = newTarget;
+        .updateCharacteristic(Characteristic.PositionState, setToMoveUp)
+      accessory.context.cacheTargetPosition = newTarget
+      accessory.context.cachePositionState = setToMoveUp ? 1 : 0
+      accessory.context.cacheLastStartTime = Math.floor(Date.now() / 100)
+      if (accessory.context.updateKey !== updateKey) return
+      await utils.sleep(decisecondsToMove * 100)
+      if (accessory.context.updateKey !== updateKey) return
+      params.switches[0].switch = 'off'
+      params.switches[1].switch = 'off'
+      await this.platform.sendDeviceUpdate(accessory, params)
+      wcService.updateCharacteristic(Characteristic.PositionState, 2)
+      wcService.updateCharacteristic(Characteristic.CurrentPosition, newTarget)
+      accessory.context.cachePositionState = 2
+      accessory.context.cacheCurrentPosition = newTarget
     } catch (err) {
-      this.platform.requestDeviceRefresh(accessory, err);
+      this.platform.requestDeviceRefresh(accessory, err)
     }
   }
-};
+}
diff --git a/lib/device/curtain.js b/lib/device/curtain.js
index d7a8cf8a..95ab6086 100644
--- a/lib/device/curtain.js
+++ b/lib/device/curtain.js
@@ -1,52 +1,53 @@
-/* jshint esversion: 9, -W014, -W030, node: true */
-"use strict";
-let Characteristic, Service;
+'use strict'
+let Characteristic, Service
 module.exports = class deviceCurtain {
-  constructor(platform) {
-    this.platform = platform;
-    Service = platform.api.hap.Service;
-    Characteristic = platform.api.hap.Characteristic;
+  constructor (platform) {
+    this.platform = platform
+    Service = platform.api.hap.Service
+    Characteristic = platform.api.hap.Characteristic
   }
-  async internalCurtainUpdate(accessory, value, callback) {
-    callback();
+
+  async internalCurtainUpdate (accessory, value, callback) {
+    callback()
     try {
-      let params,
-        cService = accessory.getService(Service.WindowCovering),
-        prevPos = accessory.context.cacheCurrentPosition,
-        newPos = value;
-      if (newPos === prevPos) return;
+      let params
+      const cService = accessory.getService(Service.WindowCovering)
+      const prevPos = accessory.context.cacheCurrentPosition
+      const newPos = value
+      if (newPos === prevPos) return
       if (newPos === 0 || newPos === 100) {
         params = {
-          switch: newPos === 100 ? "on" : "off",
-        };
+          switch: newPos === 100 ? 'on' : 'off'
+        }
       } else {
         params = {
-          setclose: Math.abs(100 - newPos),
-        };
+          setclose: Math.abs(100 - newPos)
+        }
       }
-      await this.platform.sendDeviceUpdate(accessory, params);
+      await this.platform.sendDeviceUpdate(accessory, params)
       cService
         .updateCharacteristic(Characteristic.TargetPosition, newPos)
-        .updateCharacteristic(Characteristic.PositionState, newPos > prevPos ? 1 : 0);
-      accessory.context.cacheCurrentPosition = newPos;
+        .updateCharacteristic(Characteristic.PositionState, newPos > prevPos ? 1 : 0)
+      accessory.context.cacheCurrentPosition = newPos
     } catch (err) {
-      this.platform.requestDeviceRefresh(accessory, err);
+      this.platform.requestDeviceRefresh(accessory, err)
     }
   }
-  externalCurtainUpdate(accessory, params) {
+
+  externalCurtainUpdate (accessory, params) {
     try {
-      let cService = accessory.getService(Service.WindowCovering);
-      if (params.hasOwnProperty("switch") && params.hasOwnProperty("setclose")) {
-        let newPos = Math.abs(100 - parseInt(params.setclose));
+      const cService = accessory.getService(Service.WindowCovering)
+      if (Object.prototype.hasOwnProperty.call(params, 'switch') && Object.prototype.hasOwnProperty.call(params, 'setclose')) {
+        const newPos = Math.abs(100 - parseInt(params.setclose))
         cService
           .updateCharacteristic(Characteristic.TargetPosition, newPos)
           .updateCharacteristic(Characteristic.CurrentPosition, newPos)
-          .updateCharacteristic(Characteristic.PositionState, 2);
-        accessory.context.cacheCurrentPosition = newPos;
-        return;
+          .updateCharacteristic(Characteristic.PositionState, 2)
+        accessory.context.cacheCurrentPosition = newPos
+        return
       }
     } catch (err) {
-      this.platform.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+      this.platform.log.warn('[%s] could not be updated as %s.', accessory.displayName, err)
     }
   }
-};
+}
diff --git a/lib/device/fan.js b/lib/device/fan.js
index 2c12a5e7..09323633 100644
--- a/lib/device/fan.js
+++ b/lib/device/fan.js
@@ -1,92 +1,93 @@
-/* jshint esversion: 9, -W014, -W030, node: true */
-"use strict";
-let Characteristic, Service;
+'use strict'
+let Characteristic, Service
 module.exports = class deviceFan {
-  constructor(platform) {
-    this.platform = platform;
-    Service = platform.api.hap.Service;
-    Characteristic = platform.api.hap.Characteristic;
+  constructor (platform) {
+    this.platform = platform
+    Service = platform.api.hap.Service
+    Characteristic = platform.api.hap.Characteristic
   }
-  async internalFanUpdate(accessory, type, value, callback) {
-    callback();
+
+  async internalFanUpdate (accessory, type, value, callback) {
+    callback()
     try {
-      let newPower,
-        newSpeed,
-        newLight,
-        lightService = accessory.getService(Service.Lightbulb),
-        fanService = accessory.getService(Service.Fanv2);
+      let newPower
+      let newSpeed
+      let newLight
+      const lightService = accessory.getService(Service.Lightbulb)
+      const fanService = accessory.getService(Service.Fanv2)
       switch (type) {
-        case "power":
-          newPower = value;
-          newSpeed = value ? 33 : 0;
-          newLight = lightService.getCharacteristic(Characteristic.On).value;
-          break;
-        case "speed":
-          newPower = value >= 33 ? 1 : 0;
-          newSpeed = value;
-          newLight = lightService.getCharacteristic(Characteristic.On).value;
-          break;
-        case "light":
-          newPower = fanService.getCharacteristic(Characteristic.Active).value;
-          newSpeed = fanService.getCharacteristic(Characteristic.RotationSpeed).value;
-          newLight = value;
-          break;
+        case 'power':
+          newPower = value
+          newSpeed = value ? 33 : 0
+          newLight = lightService.getCharacteristic(Characteristic.On).value
+          break
+        case 'speed':
+          newPower = value >= 33 ? 1 : 0
+          newSpeed = value
+          newLight = lightService.getCharacteristic(Characteristic.On).value
+          break
+        case 'light':
+          newPower = fanService.getCharacteristic(Characteristic.Active).value
+          newSpeed = fanService.getCharacteristic(Characteristic.RotationSpeed).value
+          newLight = value
+          break
       }
-      let params = {
-        switches: this.platform.devicesInEW.get(accessory.context.eweDeviceId).params.switches,
-      };
-      params.switches[0].switch = newLight ? "on" : "off";
-      params.switches[1].switch = newPower === 1 && newSpeed >= 33 ? "on" : "off";
-      params.switches[2].switch = newPower === 1 && newSpeed >= 66 && newSpeed < 99 ? "on" : "off";
-      params.switches[3].switch = newPower === 1 && newSpeed >= 99 ? "on" : "off";
-      await this.platform.sendDeviceUpdate(accessory, params);
-      lightService.updateCharacteristic(Characteristic.On, newLight);
+      const params = {
+        switches: this.platform.devicesInEW.get(accessory.context.eweDeviceId).params.switches
+      }
+      params.switches[0].switch = newLight ? 'on' : 'off'
+      params.switches[1].switch = newPower === 1 && newSpeed >= 33 ? 'on' : 'off'
+      params.switches[2].switch = newPower === 1 && newSpeed >= 66 && newSpeed < 99 ? 'on' : 'off'
+      params.switches[3].switch = newPower === 1 && newSpeed >= 99 ? 'on' : 'off'
+      await this.platform.sendDeviceUpdate(accessory, params)
+      lightService.updateCharacteristic(Characteristic.On, newLight)
       fanService
         .updateCharacteristic(Characteristic.Active, newPower)
-        .updateCharacteristic(Characteristic.RotationSpeed, newSpeed);
+        .updateCharacteristic(Characteristic.RotationSpeed, newSpeed)
     } catch (err) {
-      this.platform.requestDeviceRefresh(accessory, err);
+      this.platform.requestDeviceRefresh(accessory, err)
     }
   }
-  externalFanUpdate(accessory, params) {
+
+  externalFanUpdate (accessory, params) {
     try {
-      let light,
-        status,
-        speed,
-        lightService = accessory.getService(Service.Lightbulb),
-        fanService = accessory.getService(Service.Fanv2);
+      let light
+      let status
+      let speed
+      const lightService = accessory.getService(Service.Lightbulb)
+      const fanService = accessory.getService(Service.Fanv2)
       if (Array.isArray(params.switches)) {
-        light = params.switches[0].switch === "on";
+        light = params.switches[0].switch === 'on'
         switch (params.switches[1].switch + params.switches[2].switch + params.switches[3].switch) {
           default:
-            status = 0;
-            speed = 0;
-            break;
-          case "onoffoff":
-            status = 1;
-            speed = 33;
-            break;
-          case "ononoff":
-            status = 1;
-            speed = 66;
-            break;
-          case "onoffon":
-            status = 1;
-            speed = 99;
+            status = 0
+            speed = 0
+            break
+          case 'onoffoff':
+            status = 1
+            speed = 33
+            break
+          case 'ononoff':
+            status = 1
+            speed = 66
+            break
+          case 'onoffon':
+            status = 1
+            speed = 99
         }
-      } else if (params.hasOwnProperty("light") && params.hasOwnProperty("fan") && params.hasOwnProperty("speed")) {
-        light = params.light === "on";
-        status = params.fan === "on" ? 1 : 0;
-        speed = params.speed * 33 * status;
+      } else if (Object.prototype.hasOwnProperty.call(params, 'light') && Object.prototype.hasOwnProperty.call(params, 'fan') && Object.prototype.hasOwnProperty.call(params, 'speed')) {
+        light = params.light === 'on'
+        status = params.fan === 'on' ? 1 : 0
+        speed = params.speed * 33 * status
       } else {
-        throw "unknown parameters received";
+        throw new Error('unknown parameters received')
       }
-      lightService.updateCharacteristic(Characteristic.On, light);
+      lightService.updateCharacteristic(Characteristic.On, light)
       fanService
         .updateCharacteristic(Characteristic.Active, status)
-        .updateCharacteristic(Characteristic.RotationSpeed, speed);
+        .updateCharacteristic(Characteristic.RotationSpeed, speed)
     } catch (err) {
-      this.platform.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+      this.platform.log.warn('[%s] could not be updated as %s.', accessory.displayName, err)
     }
   }
-};
+}
diff --git a/lib/device/garage.js b/lib/device/garage.js
index e888c551..30ec61ec 100644
--- a/lib/device/garage.js
+++ b/lib/device/garage.js
@@ -1,125 +1,125 @@
-/* jshint esversion: 9, -W014, -W030, node: true */
-"use strict";
-let Characteristic, Service;
-const utils = require("./../utils");
+'use strict'
+let Characteristic, Service
+const utils = require('./../utils')
 module.exports = class deviceGarage {
-  constructor(platform) {
-    this.platform = platform;
-    Service = platform.api.hap.Service;
-    Characteristic = platform.api.hap.Characteristic;
+  constructor (platform) {
+    this.platform = platform
+    Service = platform.api.hap.Service
+    Characteristic = platform.api.hap.Characteristic
   }
-  async internalGarageUpdate(accessory, value, callback) {
-    callback();
+
+  async internalGarageUpdate (accessory, value, callback) {
+    callback()
     try {
-      let garageConfig;
+      let garageConfig
       if (!(garageConfig = this.platform.cusG.get(accessory.context.hbDeviceId))) {
-        throw "group config missing";
+        throw new Error('group config missing')
       }
-      if (garageConfig.type !== "garage" || !["oneSwitch", "twoSwitch"].includes(garageConfig.setup)) {
-        throw "improper configuration";
+      if (garageConfig.type !== 'garage' || !['oneSwitch', 'twoSwitch'].includes(garageConfig.setup)) {
+        throw new Error('improper configuration')
       }
-      let sensorDefinition = garageConfig.sensorId || false,
-        sAccessory = false,
-        prevState,
-        newPos = value,
-        params = {},
-        delay = 0,
-        gdService = accessory.getService(Service.GarageDoorOpener);
-      if (sensorDefinition && !(sAccessory = this.platform.devicesInHB.get(garageConfig.sensorId + "SWX"))) {
-        throw "defined DW2 sensor doesn't exist";
+      const sensorDefinition = garageConfig.sensorId || false
+      let sAccessory = false
+      const newPos = value
+      const params = {}
+      let delay = 0
+      const gdService = accessory.getService(Service.GarageDoorOpener)
+      if (sensorDefinition && !(sAccessory = this.platform.devicesInHB.get(garageConfig.sensorId + 'SWX'))) {
+        throw new Error("defined DW2 sensor doesn't exist")
       }
-      if (sensorDefinition && sAccessory.context.type !== "sensor") {
-        throw "defined DW2 sensor isn't a sensor";
+      if (sensorDefinition && sAccessory.context.type !== 'sensor') {
+        throw new Error("defined DW2 sensor isn't a sensor")
       }
-      prevState = sAccessory
+      const prevState = sAccessory
         ? sAccessory.getService(Service.ContactSensor).getCharacteristic(Characteristic.ContactSensorState).value === 0
           ? 1
           : 0
-        : accessory.context.cacheCurrentDoorState;
-      if (newPos === prevState % 2) return;
-      accessory.context.inUse = true;
-      accessory.context.state = value;
-      if (garageConfig.setup === "oneSwitch" && [2, 3].includes(prevState)) {
-        gdService.updateCharacteristic(Characteristic.CurrentDoorState, ((prevState * 2) % 3) + 2);
-        accessory.context.cacheCurrentDoorState = ((prevState * 2) % 3) + 2;
-        delay = 1500;
+        : accessory.context.cacheCurrentDoorState
+      if (newPos === prevState % 2) return
+      accessory.context.inUse = true
+      accessory.context.state = value
+      if (garageConfig.setup === 'oneSwitch' && [2, 3].includes(prevState)) {
+        gdService.updateCharacteristic(Characteristic.CurrentDoorState, ((prevState * 2) % 3) + 2)
+        accessory.context.cacheCurrentDoorState = ((prevState * 2) % 3) + 2
+        delay = 1500
       }
-      if (accessory.context.state !== newPos) return;
-      await utils.sleep(delay);
+      if (accessory.context.state !== newPos) return
+      await utils.sleep(delay)
       gdService
         .updateCharacteristic(Characteristic.TargetDoorState, newPos)
-        .updateCharacteristic(Characteristic.CurrentDoorState, newPos + 2);
-      accessory.context.cacheTargetDoorState = newPos;
-      accessory.context.cacheCurrentDoorState = newPos + 2;
+        .updateCharacteristic(Characteristic.CurrentDoorState, newPos + 2)
+      accessory.context.cacheTargetDoorState = newPos
+      accessory.context.cacheCurrentDoorState = newPos + 2
       switch (garageConfig.setup) {
-        case "oneSwitch":
-          params.switch = "on";
-          break;
-        case "twoSwitch":
-          params.switches = this.platform.devicesInEW.get(accessory.context.eweDeviceId).params.switches;
-          params.switches[0].switch = newPos === 0 ? "on" : "off";
-          params.switches[1].switch = newPos === 1 ? "on" : "off";
-          break;
+        case 'oneSwitch':
+          params.switch = 'on'
+          break
+        case 'twoSwitch':
+          params.switches = this.platform.devicesInEW.get(accessory.context.eweDeviceId).params.switches
+          params.switches[0].switch = newPos === 0 ? 'on' : 'off'
+          params.switches[1].switch = newPos === 1 ? 'on' : 'off'
+          break
       }
-      await this.platform.sendDeviceUpdate(accessory, params);
-      await utils.sleep(garageConfig.operationTime * 100);
+      await this.platform.sendDeviceUpdate(accessory, params)
+      await utils.sleep(garageConfig.operationTime * 100)
       if (!sAccessory) {
-        gdService.updateCharacteristic(Characteristic.CurrentDoorState, newPos);
-        accessory.context.cacheCurrentDoorState = newPos;
+        gdService.updateCharacteristic(Characteristic.CurrentDoorState, newPos)
+        accessory.context.cacheCurrentDoorState = newPos
       }
-      accessory.context.inUse = false;
+      accessory.context.inUse = false
     } catch (err) {
-      this.platform.requestDeviceRefresh(accessory, err);
+      this.platform.requestDeviceRefresh(accessory, err)
     }
   }
-  externalGarageUpdate(accessory, params) {
+
+  externalGarageUpdate (accessory, params) {
     try {
-      let garageConfig,
-        gcService = accessory.getService(Service.GarageDoorOpener),
-        prevState = accessory.context.cacheCurrentDoorState,
-        newPos = [0, 2].includes(prevState) ? 3 : 2;
+      let garageConfig
+      const gcService = accessory.getService(Service.GarageDoorOpener)
+      const prevState = accessory.context.cacheCurrentDoorState
+      const newPos = [0, 2].includes(prevState) ? 3 : 2
       if (!(garageConfig = this.platform.cusG.get(accessory.context.hbDeviceId))) {
-        throw "group config missing";
+        throw new Error('group config missing')
       }
-      if (garageConfig.type !== "garage" || !["oneSwitch", "twoSwitch"].includes(garageConfig.setup)) {
-        throw "improper configuration";
+      if (garageConfig.type !== 'garage' || !['oneSwitch', 'twoSwitch'].includes(garageConfig.setup)) {
+        throw new Error('improper configuration')
       }
       if (accessory.context.inUse || garageConfig.sensorId) {
-        return;
+        return
       }
       switch (garageConfig.setup) {
-        case "oneSwitch":
-          if (params.switch === "off") {
-            return;
+        case 'oneSwitch':
+          if (params.switch === 'off') {
+            return
           }
-          break;
-        case "twoSwitch":
+          break
+        case 'twoSwitch':
           if (
             params.switches[0].switch === params.switches[1].switch ||
-            params.switches[prevState % 2].switch === "on"
+            params.switches[prevState % 2].switch === 'on'
           ) {
-            return;
+            return
           }
-          break;
+          break
       }
-      accessory.context.inUse = true;
+      accessory.context.inUse = true
       if (!garageConfig.sensorId) {
         gcService
           .updateCharacteristic(Characteristic.CurrentDoorState, newPos)
-          .updateCharacteristic(Characteristic.TargetDoorState, newPos - 2);
-        accessory.context.cacheCurrentDoorState = newPos;
-        accessory.context.cacheTargetDoorState = newPos - 2;
+          .updateCharacteristic(Characteristic.TargetDoorState, newPos - 2)
+        accessory.context.cacheCurrentDoorState = newPos
+        accessory.context.cacheTargetDoorState = newPos - 2
         setTimeout(() => {
-          gcService.updateCharacteristic(Characteristic.CurrentDoorState, newPos - 2);
-          accessory.context.cacheCurrentDoorState = newPos - 2;
-        }, parseInt(garageConfig.operationTime) * 100);
+          gcService.updateCharacteristic(Characteristic.CurrentDoorState, newPos - 2)
+          accessory.context.cacheCurrentDoorState = newPos - 2
+        }, parseInt(garageConfig.operationTime) * 100)
       }
       setTimeout(() => {
-        accessory.context.inUse = false;
-      }, parseInt(garageConfig.operationTime) * 100);
+        accessory.context.inUse = false
+      }, parseInt(garageConfig.operationTime) * 100)
     } catch (err) {
-      accessory.context.inUse = false;
-      this.platform.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+      accessory.context.inUse = false
+      this.platform.log.warn('[%s] could not be updated as %s.', accessory.displayName, err)
     }
   }
-};
+}
diff --git a/lib/device/light.js b/lib/device/light.js
index ac838310..42006e45 100644
--- a/lib/device/light.js
+++ b/lib/device/light.js
@@ -1,287 +1,289 @@
-/* jshint esversion: 9, -W014, -W030, node: true */
-"use strict";
-let Characteristic, Service;
-const convert = require("color-convert"),
-  utils = require("./../utils");
+'use strict'
+let Characteristic, Service
+const convert = require('color-convert')
+const utils = require('./../utils')
 module.exports = class deviceLight {
-  constructor(platform) {
-    this.platform = platform;
-    Service = platform.api.hap.Service;
-    Characteristic = platform.api.hap.Characteristic;
+  constructor (platform) {
+    this.platform = platform
+    Service = platform.api.hap.Service
+    Characteristic = platform.api.hap.Characteristic
   }
-  async internalLightbulbUpdate(accessory, value, callback) {
-    callback();
+
+  async internalLightbulbUpdate (accessory, value, callback) {
+    callback()
     try {
-      let oAccessory,
-        params = {},
-        lightService = accessory.getService(Service.Lightbulb);
+      let oAccessory
+      const params = {}
+      const lightService = accessory.getService(Service.Lightbulb)
       switch (accessory.context.switchNumber) {
-        case "X":
+        case 'X':
           if (accessory.context.eweUIID === 22) {
-            //*** B1 ***\\
-            params.state = value ? "on" : "off";
+            //* ** B1 ***\\
+            params.state = value ? 'on' : 'off'
           } else {
-            params.switch = value ? "on" : "off";
+            params.switch = value ? 'on' : 'off'
           }
-          break;
-        case "0":
-          params.switches = this.platform.devicesInEW.get(accessory.context.eweDeviceId).params.switches;
-          params.switches[0].switch = value ? "on" : "off";
-          params.switches[1].switch = value ? "on" : "off";
-          params.switches[2].switch = value ? "on" : "off";
-          params.switches[3].switch = value ? "on" : "off";
-          break;
-        case "1":
-        case "2":
-        case "3":
-        case "4":
-          params.switches = this.platform.devicesInEW.get(accessory.context.eweDeviceId).params.switches;
+          break
+        case '0':
+          params.switches = this.platform.devicesInEW.get(accessory.context.eweDeviceId).params.switches
+          params.switches[0].switch = value ? 'on' : 'off'
+          params.switches[1].switch = value ? 'on' : 'off'
+          params.switches[2].switch = value ? 'on' : 'off'
+          params.switches[3].switch = value ? 'on' : 'off'
+          break
+        case '1':
+        case '2':
+        case '3':
+        case '4':
+          params.switches = this.platform.devicesInEW.get(accessory.context.eweDeviceId).params.switches
           for (let i = 1; i <= 4; i++) {
-            if ((oAccessory = this.platform.devicesInHB.get(accessory.context.eweDeviceId + "SW" + i))) {
+            if ((oAccessory = this.platform.devicesInHB.get(accessory.context.eweDeviceId + 'SW' + i))) {
               i === parseInt(accessory.context.switchNumber)
-                ? (params.switches[i - 1].switch = value ? "on" : "off")
+                ? (params.switches[i - 1].switch = value ? 'on' : 'off')
                 : (params.switches[i - 1].switch = oAccessory
-                    .getService(Service.Lightbulb)
-                    .getCharacteristic(Characteristic.On).value
-                    ? "on"
-                    : "off");
+                  .getService(Service.Lightbulb)
+                  .getCharacteristic(Characteristic.On).value
+                  ? 'on'
+                  : 'off')
             } else {
-              params.switches[i - 1].switch = "off";
+              params.switches[i - 1].switch = 'off'
             }
           }
-          break;
+          break
       }
-      await this.platform.sendDeviceUpdate(accessory, params);
+      await this.platform.sendDeviceUpdate(accessory, params)
       switch (accessory.context.switchNumber) {
-        case "X":
-          lightService.updateCharacteristic(Characteristic.On, value);
-          break;
-        case "0":
+        case 'X':
+          lightService.updateCharacteristic(Characteristic.On, value)
+          break
+        case '0':
           for (let i = 0; i <= 4; i++) {
-            if ((oAccessory = this.platform.devicesInHB.get(accessory.context.eweDeviceId + "SW" + i))) {
-              oAccessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, value);
+            if ((oAccessory = this.platform.devicesInHB.get(accessory.context.eweDeviceId + 'SW' + i))) {
+              oAccessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, value)
             }
           }
-          break;
-        case "1":
-        case "2":
-        case "3":
-        case "4":
-          lightService.updateCharacteristic(Characteristic.On, value);
-          let masterState = "off";
+          break
+        case '1':
+        case '2':
+        case '3':
+        case '4': {
+          lightService.updateCharacteristic(Characteristic.On, value)
+          let masterState = 'off'
           for (let i = 1; i <= 4; i++) {
-            if ((oAccessory = this.platform.devicesInHB.get(accessory.context.eweDeviceId + "SW" + i))) {
+            if ((oAccessory = this.platform.devicesInHB.get(accessory.context.eweDeviceId + 'SW' + i))) {
               if (oAccessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On).value) {
-                masterState = "on";
+                masterState = 'on'
               }
             }
           }
           if (!this.platform.hiddenMasters.includes(accessory.context.eweDeviceId)) {
-            oAccessory = this.platform.devicesInHB.get(accessory.context.eweDeviceId + "SW0");
-            oAccessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, masterState === "on");
+            oAccessory = this.platform.devicesInHB.get(accessory.context.eweDeviceId + 'SW0')
+            oAccessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, masterState === 'on')
           }
-          break;
+          break
+        }
       }
     } catch (err) {
-      this.platform.requestDeviceRefresh(accessory, err);
+      this.platform.requestDeviceRefresh(accessory, err)
     }
   }
-  async internalBrightnessUpdate(accessory, value, callback) {
-    callback();
+
+  async internalBrightnessUpdate (accessory, value, callback) {
+    callback()
     try {
-      let params = {},
-        lightService = accessory.getService(Service.Lightbulb);
+      const params = {}
+      const lightService = accessory.getService(Service.Lightbulb)
       if (value === 0) {
-        params.switch = "off";
+        params.switch = 'off'
       } else {
         if (!lightService.getCharacteristic(Characteristic.On).value) {
-          params.switch = "on";
+          params.switch = 'on'
         }
         switch (accessory.context.eweUIID) {
-          case 36: //*** KING-M4 ***\\
-            params.bright = Math.round((value * 9) / 10 + 10);
-            break;
-          case 44: //*** D1 ***\\
-            params.brightness = value;
-            params.mode = 0;
-            break;
+          case 36: //* ** KING-M4 ***\\
+            params.bright = Math.round((value * 9) / 10 + 10)
+            break
+          case 44: //* ** D1 ***\\
+            params.brightness = value
+            params.mode = 0
+            break
         }
       }
-      await utils.sleep(250);
-      await this.platform.sendDeviceUpdate(accessory, params);
+      await utils.sleep(250)
+      await this.platform.sendDeviceUpdate(accessory, params)
       if (value === 0) {
-        lightService.updateCharacteristic(Characteristic.On, false);
+        lightService.updateCharacteristic(Characteristic.On, false)
       } else {
-        lightService.updateCharacteristic(Characteristic.Brightness, value);
+        lightService.updateCharacteristic(Characteristic.Brightness, value)
       }
     } catch (err) {
-      this.platform.requestDeviceRefresh(accessory, err);
+      this.platform.requestDeviceRefresh(accessory, err)
     }
   }
-  async internalHSBUpdate(accessory, type, value, callback) {
-    callback();
+
+  async internalHSBUpdate (accessory, type, value, callback) {
+    callback()
     try {
-      if (!accessory.context.reachableWAN && !accessory.context.reachableLAN) {
-        throw "it is currently offline";
-      }
-      let newRGB,
-        params = {},
-        lightService = accessory.getService(Service.Lightbulb),
-        curHue = lightService.getCharacteristic(Characteristic.Hue).value,
-        curSat = lightService.getCharacteristic(Characteristic.Saturation).value;
+      let newRGB
+      let params = {}
+      const lightService = accessory.getService(Service.Lightbulb)
+      const curHue = lightService.getCharacteristic(Characteristic.Hue).value
+      const curSat = lightService.getCharacteristic(Characteristic.Saturation).value
       switch (type) {
-        case "hue":
-          newRGB = convert.hsv.rgb(value, curSat, 100);
+        case 'hue':
+          newRGB = convert.hsv.rgb(value, curSat, 100)
           switch (accessory.context.eweUIID) {
-            case 22: //*** B1 ***\\
+            case 22: //* ** B1 ***\\
               params = {
                 zyx_mode: 2,
-                type: "middle",
-                channel0: "0",
-                channel1: "0",
+                type: 'middle',
+                channel0: '0',
+                channel1: '0',
                 channel2: newRGB[0].toString(),
                 channel3: newRGB[1].toString(),
-                channel4: newRGB[2].toString(),
-              };
-              break;
-            case 59: //*** L1 ***\\
+                channel4: newRGB[2].toString()
+              }
+              break
+            case 59: //* ** L1 ***\\
               params = {
                 mode: 1,
                 colorR: newRGB[0],
                 colorG: newRGB[1],
-                colorB: newRGB[2],
-              };
-              break;
+                colorB: newRGB[2]
+              }
+              break
           }
-          break;
-        case "bri":
+          break
+        case 'bri':
           switch (accessory.context.eweUIID) {
-            case 22: //*** B1 ***\\
-              newRGB = convert.hsv.rgb(curHue, curSat, value);
+            case 22: //* ** B1 ***\\
+              newRGB = convert.hsv.rgb(curHue, curSat, value)
               params = {
                 zyx_mode: 2,
-                type: "middle",
-                channel0: "0",
-                channel1: "0",
+                type: 'middle',
+                channel0: '0',
+                channel1: '0',
                 channel2: newRGB[0].toString(),
                 channel3: newRGB[1].toString(),
-                channel4: newRGB[2].toString(),
-              };
-              break;
-            case 59: //*** L1 ***\\
+                channel4: newRGB[2].toString()
+              }
+              break
+            case 59: //* ** L1 ***\\
               params = {
                 mode: 1,
-                bright: value,
-              };
-              break;
+                bright: value
+              }
+              break
           }
-          break;
+          break
       }
-      await utils.sleep(250);
-      await this.platform.sendDeviceUpdate(accessory, params);
+      await utils.sleep(250)
+      await this.platform.sendDeviceUpdate(accessory, params)
       switch (type) {
-        case "hue":
-          lightService.updateCharacteristic(Characteristic.Hue, value);
-          break;
-        case "bri":
-          lightService.updateCharacteristic(Characteristic.Brightness, value);
-          break;
+        case 'hue':
+          lightService.updateCharacteristic(Characteristic.Hue, value)
+          break
+        case 'bri':
+          lightService.updateCharacteristic(Characteristic.Brightness, value)
+          break
       }
     } catch (err) {
-      this.platform.requestDeviceRefresh(accessory, err);
+      this.platform.requestDeviceRefresh(accessory, err)
     }
   }
-  externalSingleLightUpdate(accessory, params) {
+
+  externalSingleLightUpdate (accessory, params) {
     try {
-      let newColour,
-        mode,
-        isOn = false,
-        lightService = accessory.getService(Service.Lightbulb);
-      if (accessory.context.eweUIID === 22 && params.hasOwnProperty("state")) {
-        isOn = params.state === "on";
-      } else if (accessory.context.eweUIID !== 22 && params.hasOwnProperty("switch")) {
-        isOn = params.switch === "on";
+      let newColour
+      let mode
+      let isOn = false
+      const lightService = accessory.getService(Service.Lightbulb)
+      if (accessory.context.eweUIID === 22 && Object.prototype.hasOwnProperty.call(params, 'state')) {
+        isOn = params.state === 'on'
+      } else if (accessory.context.eweUIID !== 22 && Object.prototype.hasOwnProperty.call(params, 'switch')) {
+        isOn = params.switch === 'on'
       } else {
-        isOn = lightService.getCharacteristic(Characteristic.On).value;
+        isOn = lightService.getCharacteristic(Characteristic.On).value
       }
       if (isOn) {
-        lightService.updateCharacteristic(Characteristic.On, true);
+        lightService.updateCharacteristic(Characteristic.On, true)
         switch (accessory.context.eweUIID) {
           case 36: // KING-M4
-            if (params.hasOwnProperty("bright")) {
-              let nb = Math.round(((params.bright - 10) * 10) / 9); // eWeLink scale is 10-100 and HomeKit scale is 0-100.
-              lightService.updateCharacteristic(Characteristic.Brightness, nb);
+            if (Object.prototype.hasOwnProperty.call(params, 'bright')) {
+              const nb = Math.round(((params.bright - 10) * 10) / 9) // eWeLink scale is 10-100 and HomeKit scale is 0-100.
+              lightService.updateCharacteristic(Characteristic.Brightness, nb)
             }
-            break;
+            break
           case 44: // D1
-            if (params.hasOwnProperty("brightness")) {
-              lightService.updateCharacteristic(Characteristic.Brightness, params.brightness);
+            if (Object.prototype.hasOwnProperty.call(params, 'brightness')) {
+              lightService.updateCharacteristic(Characteristic.Brightness, params.brightness)
             }
-            break;
+            break
           case 22: // B1
-            if (params.hasOwnProperty("zyx_mode")) {
-              mode = parseInt(params.zyx_mode);
-            } else if (params.hasOwnProperty("channel0") && parseInt(params.channel0) + parseInt(params.channel1) > 0) {
-              mode = 1;
+            if (Object.prototype.hasOwnProperty.call(params, 'zyx_mode')) {
+              mode = parseInt(params.zyx_mode)
+            } else if (Object.prototype.hasOwnProperty.call(params, 'channel0') && parseInt(params.channel0) + parseInt(params.channel1) > 0) {
+              mode = 1
             } else {
-              mode = 2;
+              mode = 2
             }
             if (mode === 2) {
-              lightService.updateCharacteristic(Characteristic.On, true);
+              lightService.updateCharacteristic(Characteristic.On, true)
               newColour = convert.rgb.hsv(
                 parseInt(params.channel2),
                 parseInt(params.channel3),
                 parseInt(params.channel4)
-              );
+              )
               lightService
                 .updateCharacteristic(Characteristic.Hue, newColour[0])
                 .updateCharacteristic(Characteristic.Saturation, 100)
-                .updateCharacteristic(Characteristic.Brightness, 100);
+                .updateCharacteristic(Characteristic.Brightness, 100)
             } else if (mode === 1) {
-              throw "has been set to white mode which is not supported";
+              throw new Error('has been set to white mode which is not supported')
             }
-            break;
+            break
           case 59: // L1
-            if (params.hasOwnProperty("bright")) {
-              lightService.updateCharacteristic(Characteristic.Brightness, params.bright);
+            if (Object.prototype.hasOwnProperty.call(params, 'bright')) {
+              lightService.updateCharacteristic(Characteristic.Brightness, params.bright)
             }
-            if (params.hasOwnProperty("colorR")) {
-              newColour = convert.rgb.hsv(params.colorR, params.colorG, params.colorB);
+            if (Object.prototype.hasOwnProperty.call(params, 'colorR')) {
+              newColour = convert.rgb.hsv(params.colorR, params.colorG, params.colorB)
               lightService
                 .updateCharacteristic(Characteristic.Hue, newColour[0])
-                .updateCharacteristic(Characteristic.Saturation, newColour[1]);
+                .updateCharacteristic(Characteristic.Saturation, newColour[1])
             }
-            break;
+            break
           default:
-            return;
+            return
         }
       } else {
-        lightService.updateCharacteristic(Characteristic.On, false);
+        lightService.updateCharacteristic(Characteristic.On, false)
       }
     } catch (err) {
-      this.platform.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+      this.platform.log.warn('[%s] could not be updated as %s.', accessory.displayName, err)
     }
   }
-  externalMultiLightUpdate(accessory, params) {
+
+  externalMultiLightUpdate (accessory, params) {
     try {
-      let idToCheck = accessory.context.hbDeviceId.slice(0, -1),
-        primaryState = false;
+      const idToCheck = accessory.context.hbDeviceId.slice(0, -1)
+      let primaryState = false
       for (let i = 1; i <= accessory.context.channelCount; i++) {
         if (this.platform.devicesInHB.has(idToCheck + i)) {
-          let oAccessory = this.platform.devicesInHB.get(idToCheck + i);
+          const oAccessory = this.platform.devicesInHB.get(idToCheck + i)
           oAccessory
             .getService(Service.Lightbulb)
-            .updateCharacteristic(Characteristic.On, params.switches[i - 1].switch === "on");
-          if (params.switches[i - 1].switch === "on") {
-            primaryState = true;
+            .updateCharacteristic(Characteristic.On, params.switches[i - 1].switch === 'on')
+          if (params.switches[i - 1].switch === 'on') {
+            primaryState = true
           }
         }
       }
       if (!this.platform.hiddenMasters.includes(accessory.context.eweDeviceId)) {
-        accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, primaryState);
+        accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, primaryState)
       }
     } catch (err) {
-      this.platform.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+      this.platform.log.warn('[%s] could not be updated as %s.', accessory.displayName, err)
     }
   }
-};
+}
diff --git a/lib/device/lock.js b/lib/device/lock.js
index ac74af5e..93278892 100644
--- a/lib/device/lock.js
+++ b/lib/device/lock.js
@@ -1,67 +1,68 @@
-/* jshint esversion: 9, -W014, -W030, node: true */
-"use strict";
-let Characteristic, Service;
-const utils = require("./../utils");
+'use strict'
+let Characteristic, Service
+const utils = require('./../utils')
 module.exports = class deviceLock {
-  constructor(platform) {
-    this.platform = platform;
-    Service = platform.api.hap.Service;
-    Characteristic = platform.api.hap.Characteristic;
+  constructor (platform) {
+    this.platform = platform
+    Service = platform.api.hap.Service
+    Characteristic = platform.api.hap.Characteristic
   }
-  async internalLockUpdate(accessory, value, callback) {
-    callback();
+
+  async internalLockUpdate (accessory, value, callback) {
+    callback()
     try {
-      let lockConfig,
-        params = {
-          switch: "on",
-        },
-        lmService = accessory.getService(Service.LockMechanism);
+      let lockConfig
+      const params = {
+        switch: 'on'
+      }
+      const lmService = accessory.getService(Service.LockMechanism)
       if (!(lockConfig = this.platform.cusG.get(accessory.context.hbDeviceId))) {
-        throw "group config missing";
+        throw new Error('group config missing')
       }
-      if (lockConfig.type !== "lock") {
-        throw "improper configuration";
+      if (lockConfig.type !== 'lock') {
+        throw new Error('improper configuration')
       }
-      accessory.context.inUse = true;
-      await this.platform.sendDeviceUpdate(accessory, params);
+      accessory.context.inUse = true
+      await this.platform.sendDeviceUpdate(accessory, params)
       lmService
         .updateCharacteristic(Characteristic.LockTargetState, 0)
-        .updateCharacteristic(Characteristic.LockCurrentState, 0);
-      await utils.sleep(lockConfig.operationTime * 100);
+        .updateCharacteristic(Characteristic.LockCurrentState, 0)
+      await utils.sleep(lockConfig.operationTime * 100)
       lmService
         .updateCharacteristic(Characteristic.LockTargetState, 1)
-        .updateCharacteristic(Characteristic.LockCurrentState, 1);
-      accessory.context.inUse = false;
+        .updateCharacteristic(Characteristic.LockCurrentState, 1)
+      accessory.context.inUse = false
     } catch (err) {
-      this.platform.requestDeviceRefresh(accessory, err);
+      this.platform.requestDeviceRefresh(accessory, err)
     }
   }
-  externalLockUpdate(accessory, params) {
+
+  externalLockUpdate (accessory, params) {
     try {
-      let lockConfig,
-        lmService = accessory.getService(Service.LockMechanism);
+      let lockConfig
+      const lmService = accessory.getService(Service.LockMechanism)
       if (!(lockConfig = this.platform.cusG.get(accessory.context.hbDeviceId))) {
-        throw "group config missing";
+        throw new Error('group config missing')
       }
-      if (lockConfig.type !== "lock") {
-        throw "improper configuration";
+      if (lockConfig.type !== 'lock') {
+        throw new Error('improper configuration')
       }
-      if (params.switch === "off" || accessory.context.inUse) {
-        return;
+      if (params.switch === 'off' || accessory.context.inUse) {
+        return
       }
-      accessory.context.inUse = true;
+      accessory.context.inUse = true
       lmService
         .updateCharacteristic(Characteristic.LockCurrentState, 0)
-        .updateCharacteristic(Characteristic.LockTargetState, 0);
+        .updateCharacteristic(Characteristic.LockTargetState, 0)
       setTimeout(() => {
         lmService
           .updateCharacteristic(Characteristic.LockCurrentState, 1)
-          .updateCharacteristic(Characteristic.LockTargetState, 1);
-        accessory.context.inUse = false;
-      }, parseInt(lockConfig.operationTime) * 100);
+          .updateCharacteristic(Characteristic.LockTargetState, 1)
+        accessory.context.inUse = false
+      }, parseInt(lockConfig.operationTime) * 100)
     } catch (err) {
-      accessory.context.inUse = false;
-      this.platform.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+      accessory.context.inUse = false
+      this.platform.log.warn('[%s] could not be updated as %s.', accessory.displayName, err)
     }
   }
-};
+}
diff --git a/lib/device/outlet.js b/lib/device/outlet.js
index a1d7145b..8696dc36 100644
--- a/lib/device/outlet.js
+++ b/lib/device/outlet.js
@@ -1,56 +1,57 @@
-/* jshint esversion: 9, -W014, -W030, node: true */
-"use strict";
-let Characteristic, EveService, Service;
-const hbLib = require("homebridge-lib");
+'use strict'
+let Characteristic, EveService, Service
+const hbLib = require('homebridge-lib')
 module.exports = class deviceOutlet {
-  constructor(platform, homebridge) {
-    this.platform = platform;
-    Service = platform.api.hap.Service;
-    Characteristic = platform.api.hap.Characteristic;
-    EveService = new hbLib.EveHomeKitTypes(platform.api);
+  constructor (platform, homebridge) {
+    this.platform = platform
+    Service = platform.api.hap.Service
+    Characteristic = platform.api.hap.Characteristic
+    EveService = new hbLib.EveHomeKitTypes(platform.api)
   }
-  async internalOutletUpdate(accessory, value, callback) {
-    callback();
+
+  async internalOutletUpdate (accessory, value, callback) {
+    callback()
     try {
-      let params = {
-          switch: value ? "on" : "off",
-        },
-        outletService = accessory.getService(Service.Outlet);
-      await this.platform.sendDeviceUpdate(accessory, params);
-      outletService.updateCharacteristic(Characteristic.On, value);
+      const params = {
+        switch: value ? 'on' : 'off'
+      }
+      const outletService = accessory.getService(Service.Outlet)
+      await this.platform.sendDeviceUpdate(accessory, params)
+      outletService.updateCharacteristic(Characteristic.On, value)
     } catch (err) {
-      this.platform.requestDeviceRefresh(accessory, err);
+      this.platform.requestDeviceRefresh(accessory, err)
     }
   }
-  externalOutletUpdate(accessory, params) {
+
+  externalOutletUpdate (accessory, params) {
     try {
-      let outletService = accessory.getService(Service.Outlet);
-      if (params.hasOwnProperty("switch")) {
-        outletService.updateCharacteristic(Characteristic.On, params.switch === "on");
-        if (accessory.context.eweModel === "S26" || this.platform.config.disableEveLogging || false) {
-          outletService.updateCharacteristic(Characteristic.OutletInUse, params.switch === "on");
+      const outletService = accessory.getService(Service.Outlet)
+      if (Object.prototype.hasOwnProperty.call(params, 'switch')) {
+        outletService.updateCharacteristic(Characteristic.On, params.switch === 'on')
+        if (accessory.context.eweModel === 'S26' || this.platform.config.disableEveLogging || false) {
+          outletService.updateCharacteristic(Characteristic.OutletInUse, params.switch === 'on')
         }
       }
-      if (params.hasOwnProperty("power")) {
-        outletService.updateCharacteristic(EveService.Characteristics.CurrentConsumption, parseFloat(params.power));
+      if (Object.prototype.hasOwnProperty.call(params, 'power')) {
+        outletService.updateCharacteristic(EveService.Characteristics.CurrentConsumption, parseFloat(params.power))
         outletService.updateCharacteristic(
           Characteristic.OutletInUse,
           parseFloat(params.power) > (this.platform.config.inUsePowerThreshold || 0)
-        );
-        let isOn = accessory.getService(Service.Outlet).getCharacteristic(Characteristic.On).value;
+        )
+        const isOn = accessory.getService(Service.Outlet).getCharacteristic(Characteristic.On).value
         accessory.eveLogger.addEntry({
           time: Date.now(),
-          power: isOn ? parseFloat(params.power) : 0,
-        });
+          power: isOn ? parseFloat(params.power) : 0
+        })
       }
-      if (params.hasOwnProperty("voltage")) {
-        outletService.updateCharacteristic(EveService.Characteristics.Voltage, parseFloat(params.voltage));
+      if (Object.prototype.hasOwnProperty.call(params, 'voltage')) {
+        outletService.updateCharacteristic(EveService.Characteristics.Voltage, parseFloat(params.voltage))
       }
-      if (params.hasOwnProperty("current")) {
-        outletService.updateCharacteristic(EveService.Characteristics.ElectricCurrent, parseFloat(params.current));
+      if (Object.prototype.hasOwnProperty.call(params, 'current')) {
+        outletService.updateCharacteristic(EveService.Characteristics.ElectricCurrent, parseFloat(params.current))
       }
     } catch (err) {
-      this.platform.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+      this.platform.log.warn('[%s] could not be updated as %s.', accessory.displayName, err)
     }
   }
-};
+}
diff --git a/lib/device/rf-sub.js b/lib/device/rf-sub.js
index 59dcfb06..3bf3320c 100644
--- a/lib/device/rf-sub.js
+++ b/lib/device/rf-sub.js
@@ -1,122 +1,123 @@
-/* jshint esversion: 9, -W014, -W030, node: true */
-"use strict";
-let Characteristic, Service;
-const utils = require("./../utils");
+'use strict'
+let Characteristic, Service
+const utils = require('./../utils')
 module.exports = class deviceRFSub {
-  constructor(platform) {
-    this.platform = platform;
-    Service = platform.api.hap.Service;
-    Characteristic = platform.api.hap.Characteristic;
+  constructor (platform) {
+    this.platform = platform
+    Service = platform.api.hap.Service
+    Characteristic = platform.api.hap.Characteristic
   }
-  async internalRFUpdate(accessory, rfChl, service, callback) {
-    callback();
+
+  async internalRFUpdate (accessory, rfChl, service, callback) {
+    callback()
     try {
-      let params = {
-          cmd: "transmit",
-          rfChl: parseInt(rfChl),
-        },
-        rfService = accessory.getService(service);
-      await this.platform.sendDeviceUpdate(accessory, params);
-      rfService.updateCharacteristic(Characteristic.On, true);
-      await utils.sleep(3000);
-      rfService.updateCharacteristic(Characteristic.On, false);
+      const params = {
+        cmd: 'transmit',
+        rfChl: parseInt(rfChl)
+      }
+      const rfService = accessory.getService(service)
+      await this.platform.sendDeviceUpdate(accessory, params)
+      rfService.updateCharacteristic(Characteristic.On, true)
+      await utils.sleep(3000)
+      rfService.updateCharacteristic(Characteristic.On, false)
     } catch (err) {
-      this.platform.requestDeviceRefresh(accessory, err);
+      this.platform.requestDeviceRefresh(accessory, err)
     }
   }
-  externalRFUpdate(accessory, params) {
+
+  externalRFUpdate (accessory, params) {
     try {
-      if (!params.hasOwnProperty("updateSource")) return;
-      let timeNow = new Date(),
-        oAccessory = false;
-      if (params.hasOwnProperty("cmd") && params.cmd === "transmit" && params.hasOwnProperty("rfChl")) {
-        //*** RF Button ***\\
+      if (!Object.prototype.hasOwnProperty.call(params, 'updateSource')) return
+      const timeNow = new Date()
+      let oAccessory = false
+      if (Object.prototype.hasOwnProperty.call(params, 'cmd') && params.cmd === 'transmit' && Object.prototype.hasOwnProperty.call(params, 'rfChl')) {
+        //* ** RF Button ***\\
         // the device needed is SW% corresponding to params.rfChl
         this.platform.devicesInHB.forEach(acc => {
           if (
             acc.context.eweDeviceId === accessory.context.eweDeviceId &&
-            acc.context.buttons.hasOwnProperty(params.rfChl.toString())
+            Object.prototype.hasOwnProperty.call(acc.context.buttons, params.rfChl.toString())
           ) {
-            oAccessory = acc;
+            oAccessory = acc
           }
-        });
+        })
         if (oAccessory) {
-          oAccessory.getService(oAccessory.context.buttons[params.rfChl]).updateCharacteristic(Characteristic.On, 1);
+          oAccessory.getService(oAccessory.context.buttons[params.rfChl]).updateCharacteristic(Characteristic.On, 1)
           setTimeout(
             () =>
               oAccessory
                 .getService(oAccessory.context.buttons[params.rfChl])
                 .updateCharacteristic(Characteristic.On, 0),
             3000
-          );
+          )
         } else {
-          throw "rf button not found in Homebridge";
+          throw new Error('rf button not found in Homebridge')
         }
-      } else if (params.hasOwnProperty("cmd") && params.cmd === "trigger") {
-        //*** RF Sensor ***\\
+      } else if (Object.prototype.hasOwnProperty.call(params, 'cmd') && params.cmd === 'trigger') {
+        //* ** RF Sensor ***\\
         Object.keys(params)
           .filter(name => /rfTrig/.test(name))
           .forEach(chan => {
             this.platform.devicesInHB.forEach(acc => {
               if (
                 acc.context.eweDeviceId === accessory.context.eweDeviceId &&
-                acc.context.buttons.hasOwnProperty(chan.substr(-1).toString())
+                Object.prototype.hasOwnProperty.call(acc.context.buttons, chan.substr(-1).toString())
               ) {
-                oAccessory = acc;
+                oAccessory = acc
               }
-            });
+            })
             if (oAccessory) {
-              let timeOfMotion = new Date(params[chan]),
-                diff = (timeNow.getTime() - timeOfMotion.getTime()) / 1000,
-                serv,
-                char;
+              const timeOfMotion = new Date(params[chan])
+              const diff = (timeNow.getTime() - timeOfMotion.getTime()) / 1000
+              let serv
+              let char
               if (diff < (this.platform.config.sensorTimeDifference || 120)) {
                 switch (oAccessory.context.sensorType) {
-                  case "button":
-                    break;
-                  case "water":
-                    serv = Service.LeakSensor;
-                    char = Characteristic.LeakDetected;
-                    break;
-                  case "fire":
-                  case "smoke":
-                    serv = Service.SmokeSensor;
-                    char = Characteristic.LeakDetected;
-                    break;
-                  case "co":
-                    serv = Service.CarbonMonoxideSensor;
-                    char = Characteristic.CarbonMonoxideDetected;
-                    break;
-                  case "co2":
-                    serv = Service.CarbonDioxideSensor;
-                    char = Characteristic.CarbonDioxideDetected;
-                    break;
-                  case "contact":
-                    serv = Service.ContactSensor;
-                    char = Characteristic.ContactSensorState;
-                    break;
-                  case "occupancy":
-                    serv = Service.OccupancySensor;
-                    char = Characteristic.OccupancyDetected;
-                    break;
+                  case 'button':
+                    break
+                  case 'water':
+                    serv = Service.LeakSensor
+                    char = Characteristic.LeakDetected
+                    break
+                  case 'fire':
+                  case 'smoke':
+                    serv = Service.SmokeSensor
+                    char = Characteristic.LeakDetected
+                    break
+                  case 'co':
+                    serv = Service.CarbonMonoxideSensor
+                    char = Characteristic.CarbonMonoxideDetected
+                    break
+                  case 'co2':
+                    serv = Service.CarbonDioxideSensor
+                    char = Characteristic.CarbonDioxideDetected
+                    break
+                  case 'contact':
+                    serv = Service.ContactSensor
+                    char = Characteristic.ContactSensorState
+                    break
+                  case 'occupancy':
+                    serv = Service.OccupancySensor
+                    char = Characteristic.OccupancyDetected
+                    break
                   default:
-                    serv = Service.MotionSensor;
-                    char = Characteristic.MotionDetected;
-                    break;
+                    serv = Service.MotionSensor
+                    char = Characteristic.MotionDetected
+                    break
                 }
-                oAccessory.getService(serv).updateCharacteristic(char, 1);
+                oAccessory.getService(serv).updateCharacteristic(char, 1)
                 setTimeout(() => {
-                  oAccessory.getService(serv).updateCharacteristic(char, 0);
-                }, (this.platform.config.sensorTimeLength || 2) * 1000);
+                  oAccessory.getService(serv).updateCharacteristic(char, 0)
+                }, (this.platform.config.sensorTimeLength || 2) * 1000)
                 if (this.platform.debug) {
-                  this.platform.log("[%s] has detected [%s].", oAccessory.displayName, oAccessory.context.sensorType);
+                  this.platform.log('[%s] has detected [%s].', oAccessory.displayName, oAccessory.context.sensorType)
                 }
               }
             }
-          });
+          })
       }
     } catch (err) {
-      this.platform.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+      this.platform.log.warn('[%s] could not be updated as %s.', accessory.displayName, err)
     }
   }
-};
+}
diff --git a/lib/device/scm.js b/lib/device/scm.js
index e424e8eb..276c385f 100644
--- a/lib/device/scm.js
+++ b/lib/device/scm.js
@@ -1,32 +1,32 @@
-/* jshint esversion: 9, -W014, -W030, node: true */
-"use strict";
-let Characteristic, Service;
+'use strict'
+let Characteristic, Service
 module.exports = class deviceSCM {
-  constructor(platform) {
-    this.platform = platform;
-    Service = platform.api.hap.Service;
-    Characteristic = platform.api.hap.Characteristic;
+  constructor (platform) {
+    this.platform = platform
+    Service = platform.api.hap.Service
+    Characteristic = platform.api.hap.Characteristic
   }
 
-  async internalSCMUpdate(accessory, value, callback) {
-    callback();
+  async internalSCMUpdate (accessory, value, callback) {
+    callback()
     try {
-      let params = {
-          switches: this.platform.devicesInEW.get(accessory.context.eweDeviceId).params.switches,
-        },
-        switchService = accessory.getService(Service.Switch);
-      params.switches[0].switch = value ? "on" : "off";
-      await this.platform.sendDeviceUpdate(accessory, params);
-      switchService.updateCharacteristic(Characteristic.On, value);
+      const params = {
+        switches: this.platform.devicesInEW.get(accessory.context.eweDeviceId).params.switches
+      }
+      const switchService = accessory.getService(Service.Switch)
+      params.switches[0].switch = value ? 'on' : 'off'
+      await this.platform.sendDeviceUpdate(accessory, params)
+      switchService.updateCharacteristic(Characteristic.On, value)
     } catch (err) {
-      this.platform.requestDeviceRefresh(accessory, err);
+      this.platform.requestDeviceRefresh(accessory, err)
     }
   }
-  externalSCMUpdate(accessory, params) {
+
+  externalSCMUpdate (accessory, params) {
     try {
-      accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, params.switches[0].switch === "on");
+      accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, params.switches[0].switch === 'on')
     } catch (err) {
-      this.platform.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+      this.platform.log.warn('[%s] could not be updated as %s.', accessory.displayName, err)
     }
   }
-};
+}
diff --git a/lib/device/sensor.js b/lib/device/sensor.js
index 391d7f08..b16f3a5c 100644
--- a/lib/device/sensor.js
+++ b/lib/device/sensor.js
@@ -1,54 +1,54 @@
-/* jshint esversion: 9, -W014, -W030, node: true */
-"use strict";
-let Characteristic, Service;
+'use strict'
+let Characteristic, Service
 module.exports = class deviceSensor {
-  constructor(platform) {
-    this.platform = platform;
-    Service = platform.api.hap.Service;
-    Characteristic = platform.api.hap.Characteristic;
+  constructor (platform) {
+    this.platform = platform
+    Service = platform.api.hap.Service
+    Characteristic = platform.api.hap.Characteristic
   }
-  externalSensorUpdate(accessory, params) {
+
+  externalSensorUpdate (accessory, params) {
     try {
-      if (params.hasOwnProperty("battery")) {
-        let batteryService =
-            accessory.getService(Service.BatteryService) || accessory.addService(Service.BatteryService),
-          scaledBattery = Math.round(params.battery * 33.3);
-        batteryService.updateCharacteristic(Characteristic.BatteryLevel, scaledBattery);
+      if (Object.prototype.hasOwnProperty.call(params, 'battery')) {
+        const batteryService =
+            accessory.getService(Service.BatteryService) || accessory.addService(Service.BatteryService)
+        const scaledBattery = Math.round(params.battery * 33.3)
+        batteryService.updateCharacteristic(Characteristic.BatteryLevel, scaledBattery)
         batteryService.updateCharacteristic(
           Characteristic.StatusLowBattery,
           scaledBattery < (this.platform.config.lowBattThreshold || 25)
-        );
+        )
       }
-      let newState = params.switch === "on" ? 1 : 0,
-        oAccessory = false,
-        contactService = accessory.getService(Service.ContactSensor);
-      contactService.updateCharacteristic(Characteristic.ContactSensorState, newState);
+      const newState = params.switch === 'on' ? 1 : 0
+      let oAccessory = false
+      const contactService = accessory.getService(Service.ContactSensor)
+      contactService.updateCharacteristic(Characteristic.ContactSensorState, newState)
       this.platform.cusG.forEach(group => {
-        if (group.sensorId === accessory.context.eweDeviceId && group.type === "garage") {
-          if ((oAccessory = this.platform.devicesInHB.get(group.deviceId + "SWX"))) {
+        if (group.sensorId === accessory.context.eweDeviceId && group.type === 'garage') {
+          if ((oAccessory = this.platform.devicesInHB.get(group.deviceId + 'SWX'))) {
             switch (newState) {
               case 0:
                 oAccessory
                   .getService(Service.GarageDoorOpener)
                   .updateCharacteristic(Characteristic.TargetDoorState, 1)
-                  .updateCharacteristic(Characteristic.CurrentDoorState, 1);
-                break;
+                  .updateCharacteristic(Characteristic.CurrentDoorState, 1)
+                break
               case 1:
                 setTimeout(() => {
                   oAccessory
                     .getService(Service.GarageDoorOpener)
                     .updateCharacteristic(Characteristic.TargetDoorState, 0)
-                    .updateCharacteristic(Characteristic.CurrentDoorState, 0);
-                }, group.operationTime * 100);
-                break;
+                    .updateCharacteristic(Characteristic.CurrentDoorState, 0)
+                }, group.operationTime * 100)
+                break
               default:
-                throw "unknown sensor status received [" + newState + "]";
+                throw new Error('unknown sensor status received [' + newState + ']')
             }
           }
         }
-      });
+      })
     } catch (err) {
-      this.platform.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+      this.platform.log.warn('[%s] could not be updated as %s.', accessory.displayName, err)
     }
   }
-};
+}
diff --git a/lib/device/switch.js b/lib/device/switch.js
index e446492a..0f49f802 100644
--- a/lib/device/switch.js
+++ b/lib/device/switch.js
@@ -1,111 +1,114 @@
-/* jshint esversion: 9, -W014, -W030, node: true */
-"use strict";
-let Characteristic, Service;
+'use strict'
+let Characteristic, Service
 module.exports = class deviceSwitch {
-  constructor(platform) {
-    this.platform = platform;
-    Service = platform.api.hap.Service;
-    Characteristic = platform.api.hap.Characteristic;
+  constructor (platform) {
+    this.platform = platform
+    Service = platform.api.hap.Service
+    Characteristic = platform.api.hap.Characteristic
   }
-  async internalSwitchUpdate(accessory, value, callback) {
-    callback();
+
+  async internalSwitchUpdate (accessory, value, callback) {
+    callback()
     try {
-      let oAccessory,
-        params = {},
-        switchService = accessory.getService(Service.Switch);
+      let oAccessory
+      const params = {}
+      const switchService = accessory.getService(Service.Switch)
       switch (accessory.context.switchNumber) {
-        case "X":
-          params.switch = value ? "on" : "off";
-          break;
-        case "0":
-          params.switches = this.platform.devicesInEW.get(accessory.context.eweDeviceId).params.switches;
-          params.switches[0].switch = value ? "on" : "off";
-          params.switches[1].switch = value ? "on" : "off";
-          params.switches[2].switch = value ? "on" : "off";
-          params.switches[3].switch = value ? "on" : "off";
-          break;
-        case "1":
-        case "2":
-        case "3":
-        case "4":
-          params.switches = this.platform.devicesInEW.get(accessory.context.eweDeviceId).params.switches;
+        case 'X':
+          params.switch = value ? 'on' : 'off'
+          break
+        case '0':
+          params.switches = this.platform.devicesInEW.get(accessory.context.eweDeviceId).params.switches
+          params.switches[0].switch = value ? 'on' : 'off'
+          params.switches[1].switch = value ? 'on' : 'off'
+          params.switches[2].switch = value ? 'on' : 'off'
+          params.switches[3].switch = value ? 'on' : 'off'
+          break
+        case '1':
+        case '2':
+        case '3':
+        case '4':
+          params.switches = this.platform.devicesInEW.get(accessory.context.eweDeviceId).params.switches
           for (let i = 1; i <= 4; i++) {
-            if ((oAccessory = this.platform.devicesInHB.get(accessory.context.eweDeviceId + "SW" + i))) {
+            if ((oAccessory = this.platform.devicesInHB.get(accessory.context.eweDeviceId + 'SW' + i))) {
               i === parseInt(accessory.context.switchNumber)
-                ? (params.switches[i - 1].switch = value ? "on" : "off")
+                ? (params.switches[i - 1].switch = value ? 'on' : 'off')
                 : (params.switches[i - 1].switch = oAccessory
-                    .getService(Service.Switch)
-                    .getCharacteristic(Characteristic.On).value
-                    ? "on"
-                    : "off");
+                  .getService(Service.Switch)
+                  .getCharacteristic(Characteristic.On).value
+                  ? 'on'
+                  : 'off')
             } else {
-              params.switches[i - 1].switch = "off";
+              params.switches[i - 1].switch = 'off'
             }
           }
-          break;
+          break
       }
-      await this.platform.sendDeviceUpdate(accessory, params);
+      await this.platform.sendDeviceUpdate(accessory, params)
       switch (accessory.context.switchNumber) {
-        case "X":
-          switchService.updateCharacteristic(Characteristic.On, value);
-          break;
-        case "0":
+        case 'X':
+          switchService.updateCharacteristic(Characteristic.On, value)
+          break
+        case '0':
           for (let i = 0; i <= 4; i++) {
-            if ((oAccessory = this.platform.devicesInHB.get(accessory.context.eweDeviceId + "SW" + i))) {
-              oAccessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, value);
+            if ((oAccessory = this.platform.devicesInHB.get(accessory.context.eweDeviceId + 'SW' + i))) {
+              oAccessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, value)
             }
           }
-          break;
-        case "1":
-        case "2":
-        case "3":
-        case "4":
-          switchService.updateCharacteristic(Characteristic.On, value);
-          let masterState = "off";
+          break
+        case '1':
+        case '2':
+        case '3':
+        case '4': {
+          switchService.updateCharacteristic(Characteristic.On, value)
+          let masterState = 'off'
           for (let i = 1; i <= 4; i++) {
-            if ((oAccessory = this.platform.devicesInHB.get(accessory.context.eweDeviceId + "SW" + i))) {
+            if ((oAccessory = this.platform.devicesInHB.get(accessory.context.eweDeviceId + 'SW' + i))) {
               if (oAccessory.getService(Service.Switch).getCharacteristic(Characteristic.On).value) {
-                masterState = "on";
+                masterState = 'on'
               }
             }
           }
           if (!this.platform.hiddenMasters.includes(accessory.context.eweDeviceId)) {
-            oAccessory = this.platform.devicesInHB.get(accessory.context.eweDeviceId + "SW0");
-            oAccessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, masterState === "on");
+            oAccessory = this.platform.devicesInHB.get(accessory.context.eweDeviceId + 'SW0')
+            oAccessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, masterState === 'on')
           }
-          break;
+          break
+        }
       }
     } catch (err) {
-      this.platform.requestDeviceRefresh(accessory, err);
+      this.platform.requestDeviceRefresh(accessory, err)
     }
   }
-  externalSingleSwitchUpdate(accessory, params) {
+
+  externalSingleSwitchUpdate (accessory, params) {
     try {
-      accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, params.switch === "on");
+      accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, params.switch === 'on')
     } catch (err) {
-      this.platform.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+      this.platform.log.warn('[%s] could not be updated as %s.', accessory.displayName, err)
     }
   }
-  externalMultiSwitchUpdate(accessory, params) {
+
+  externalMultiSwitchUpdate (accessory, params) {
     try {
-      let idToCheck = accessory.context.hbDeviceId.slice(0, -1),
-        primaryState = false;
+      const idToCheck = accessory.context.hbDeviceId.slice(0, -1)
+      let primaryState = false
       for (let i = 1; i <= accessory.context.channelCount; i++) {
         if (this.platform.devicesInHB.has(idToCheck + i)) {
-          let oAccessory = this.platform.devicesInHB.get(idToCheck + i);
+          const oAccessory = this.platform.devicesInHB.get(idToCheck + i)
           oAccessory
             .getService(Service.Switch)
-            .updateCharacteristic(Characteristic.On, params.switches[i - 1].switch === "on");
-          if (params.switches[i - 1].switch === "on") {
-            primaryState = true;
+            .updateCharacteristic(Characteristic.On, params.switches[i - 1].switch === 'on')
+          if (params.switches[i - 1].switch === 'on') {
+            primaryState = true
           }
         }
       }
       if (!this.platform.hiddenMasters.includes(accessory.context.eweDeviceId)) {
-        accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, primaryState);
+        accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, primaryState)
       }
     } catch (err) {
-      this.platform.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+      this.platform.log.warn('[%s] could not be updated as %s.', accessory.displayName, err)
     }
   }
-};
+}
diff --git a/lib/device/thermostat.js b/lib/device/thermostat.js
index dfc0baec..fe076368 100644
--- a/lib/device/thermostat.js
+++ b/lib/device/thermostat.js
@@ -1,58 +1,59 @@
-/* jshint esversion: 9, -W014, -W030, node: true */
-"use strict";
-let Characteristic, Service;
+'use strict'
+let Characteristic, Service
 module.exports = class deviceThermostat {
-  constructor(platform, homebridge) {
-    this.platform = platform;
+  constructor (platform, homebridge) {
+    this.platform = platform
   }
-  async internalThermostatUpdate(accessory, value, callback) {
-    callback();
+
+  async internalThermostatUpdate (accessory, value, callback) {
+    callback()
     try {
-      let params = {
-          switch: value ? "on" : "off",
-          mainSwitch: value ? "on" : "off",
-        },
-        switchService = accessory.getService(Service.Switch);
-      await this.platform.sendDeviceUpdate(accessory, params);
-      switchService.updateCharacteristic(Characteristic.On, value);
+      const params = {
+        switch: value ? 'on' : 'off',
+        mainSwitch: value ? 'on' : 'off'
+      }
+      const switchService = accessory.getService(Service.Switch)
+      await this.platform.sendDeviceUpdate(accessory, params)
+      switchService.updateCharacteristic(Characteristic.On, value)
     } catch (err) {
-      this.platform.requestDeviceRefresh(accessory, err);
+      this.platform.requestDeviceRefresh(accessory, err)
     }
   }
-  externalThermostatUpdate(accessory, params) {
+
+  externalThermostatUpdate (accessory, params) {
     try {
       if (
         !this.platform.config.hideTHSwitch &&
-        (params.hasOwnProperty("switch") || params.hasOwnProperty("mainSwitch"))
+        (Object.prototype.hasOwnProperty.call(params, 'switch') || Object.prototype.hasOwnProperty.call(params, 'mainSwitch'))
       ) {
-        let newState = params.hasOwnProperty("switch") ? params.switch === "on" : params.mainSwitch === "on",
-          switchService = accessory.getService(Service.Switch);
-        switchService.updateCharacteristic(Characteristic.On, newState);
+        const newState = Object.prototype.hasOwnProperty.call(params, 'switch') ? params.switch === 'on' : params.mainSwitch === 'on'
+        const switchService = accessory.getService(Service.Switch)
+        switchService.updateCharacteristic(Characteristic.On, newState)
       }
       if (!(this.platform.config.disableEveLogging || false)) {
-        let eveLog = {
-          time: Date.now(),
-        };
-        if (params.hasOwnProperty("currentTemperature") && accessory.getService(Service.TemperatureSensor)) {
-          let currentTemp = params.currentTemperature !== "unavailable" ? params.currentTemperature : 0;
+        const eveLog = {
+          time: Date.now()
+        }
+        if (Object.prototype.hasOwnProperty.call(params, 'currentTemperature') && accessory.getService(Service.TemperatureSensor)) {
+          const currentTemp = params.currentTemperature !== 'unavailable' ? params.currentTemperature : 0
           accessory
             .getService(Service.TemperatureSensor)
-            .updateCharacteristic(Characteristic.CurrentTemperature, currentTemp);
-          eveLog.temp = parseFloat(currentTemp);
+            .updateCharacteristic(Characteristic.CurrentTemperature, currentTemp)
+          eveLog.temp = parseFloat(currentTemp)
         }
-        if (params.hasOwnProperty("currentHumidity") && accessory.getService(Service.HumiditySensor)) {
-          let currentHumi = params.currentHumidity !== "unavailable" ? params.currentHumidity : 0;
+        if (Object.prototype.hasOwnProperty.call(params, 'currentHumidity') && accessory.getService(Service.HumiditySensor)) {
+          const currentHumi = params.currentHumidity !== 'unavailable' ? params.currentHumidity : 0
           accessory
             .getService(Service.HumiditySensor)
-            .updateCharacteristic(Characteristic.CurrentRelativeHumidity, currentHumi);
-          eveLog.humidity = parseFloat(currentHumi);
+            .updateCharacteristic(Characteristic.CurrentRelativeHumidity, currentHumi)
+          eveLog.humidity = parseFloat(currentHumi)
         }
-        if (eveLog.hasOwnProperty("temp") || eveLog.hasOwnProperty("humidity")) {
-          accessory.eveLogger.addEntry(eveLog);
+        if (Object.prototype.hasOwnProperty.call(eveLog, 'temp') || Object.prototype.hasOwnProperty.call(eveLog, 'humidity')) {
+          accessory.eveLogger.addEntry(eveLog)
         }
       }
     } catch (err) {
-      this.platform.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+      this.platform.log.warn('[%s] could not be updated as %s.', accessory.displayName, err)
     }
   }
-};
+}
diff --git a/lib/device/usb.js b/lib/device/usb.js
index 7d6e244f..d78cf020 100644
--- a/lib/device/usb.js
+++ b/lib/device/usb.js
@@ -1,31 +1,32 @@
-/* jshint esversion: 9, -W014, -W030, node: true */
-"use strict";
-let Characteristic, Service;
+'use strict'
+let Characteristic, Service
 module.exports = class deviceUSB {
-  constructor(platform) {
-    this.platform = platform;
-    Service = platform.api.hap.Service;
-    Characteristic = platform.api.hap.Characteristic;
+  constructor (platform) {
+    this.platform = platform
+    Service = platform.api.hap.Service
+    Characteristic = platform.api.hap.Characteristic
   }
-  async internalUSBUpdate(accessory, value, callback) {
-    callback();
+
+  async internalUSBUpdate (accessory, value, callback) {
+    callback()
     try {
-      let params = {
-          switches: this.platform.devicesInEW.get(accessory.context.eweDeviceId).params.switches,
-        },
-        outletService = accessory.getService(Service.Outlet);
-      params.switches[0].switch = value ? "on" : "off";
-      await this.platform.sendDeviceUpdate(accessory, params);
-      outletService.updateCharacteristic(Characteristic.On, value);
+      const params = {
+        switches: this.platform.devicesInEW.get(accessory.context.eweDeviceId).params.switches
+      }
+      const outletService = accessory.getService(Service.Outlet)
+      params.switches[0].switch = value ? 'on' : 'off'
+      await this.platform.sendDeviceUpdate(accessory, params)
+      outletService.updateCharacteristic(Characteristic.On, value)
     } catch (err) {
-      this.platform.requestDeviceRefresh(accessory, err);
+      this.platform.requestDeviceRefresh(accessory, err)
     }
   }
-  externalUSBUpdate(accessory, params) {
+
+  externalUSBUpdate (accessory, params) {
     try {
-      accessory.getService(Service.Outlet).updateCharacteristic(Characteristic.On, params.switches[0].switch === "on");
+      accessory.getService(Service.Outlet).updateCharacteristic(Characteristic.On, params.switches[0].switch === 'on')
     } catch (err) {
-      this.platform.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+      this.platform.log.warn('[%s] could not be updated as %s.', accessory.displayName, err)
     }
   }
-};
+}
diff --git a/lib/device/valve.js b/lib/device/valve.js
index 6336871d..121f139e 100644
--- a/lib/device/valve.js
+++ b/lib/device/valve.js
@@ -1,71 +1,72 @@
-/* jshint esversion: 9, -W014, -W030, node: true */
-"use strict";
-let Characteristic, Service;
+'use strict'
+let Characteristic
 module.exports = class deviceValve {
-  constructor(platform) {
-    this.platform = platform;
-    Service = platform.api.hap.Service;
-    Characteristic = platform.api.hap.Characteristic;
+  constructor (platform) {
+    this.platform = platform
+    Characteristic = platform.api.hap.Characteristic
   }
-  async internalValveUpdate(accessory, valve, value, callback) {
-    callback();
+
+  async internalValveUpdate (accessory, valve, value, callback) {
+    callback()
     try {
-      let params = {},
-        serviceValve = accessory.getService(valve);
-      params.switches = this.platform.devicesInEW.get(accessory.context.eweDeviceId).params.switches;
+      const params = {}
+      const serviceValve = accessory.getService(valve)
+      params.switches = this.platform.devicesInEW.get(accessory.context.eweDeviceId).params.switches
       switch (valve) {
-        case "Valve A":
-          params.switches[0].switch = value ? "on" : "off";
-          params.switches[1].switch = accessory.getService("Valve B").getCharacteristic(Characteristic.Active).value
-            ? "on"
-            : "off";
-          break;
-        case "Valve B":
-          params.switches[0].switch = accessory.getService("Valve A").getCharacteristic(Characteristic.Active).value
-            ? "on"
-            : "off";
-          params.switches[1].switch = value ? "on" : "off";
-          break;
+        case 'Valve A':
+          params.switches[0].switch = value ? 'on' : 'off'
+          params.switches[1].switch = accessory.getService('Valve B').getCharacteristic(Characteristic.Active).value
+            ? 'on'
+            : 'off'
+          break
+        case 'Valve B':
+          params.switches[0].switch = accessory.getService('Valve A').getCharacteristic(Characteristic.Active).value
+            ? 'on'
+            : 'off'
+          params.switches[1].switch = value ? 'on' : 'off'
+          break
       }
-      params.switches[2].switch = "off";
-      params.switches[3].switch = "off";
-      await this.platform.sendDeviceUpdate(accessory, params);
-      serviceValve.updateCharacteristic(Characteristic.Active, value).updateCharacteristic(Characteristic.InUse, value);
+      params.switches[2].switch = 'off'
+      params.switches[3].switch = 'off'
+      await this.platform.sendDeviceUpdate(accessory, params)
+      serviceValve.updateCharacteristic(Characteristic.Active, value).updateCharacteristic(Characteristic.InUse, value)
       switch (value) {
         case 0:
-          serviceValve.updateCharacteristic(Characteristic.RemainingDuration, 0);
-          clearTimeout(accessory.getService(valve).timer);
-          break;
-        case 1:
-          let timer = serviceValve.getCharacteristic(Characteristic.SetDuration).value;
-          serviceValve.updateCharacteristic(Characteristic.RemainingDuration, timer);
-          serviceValve.timer = setTimeout(() => serviceValve.setCharacteristic(Characteristic.Active, 0), timer * 1000);
-          break;
+          serviceValve.updateCharacteristic(Characteristic.RemainingDuration, 0)
+          clearTimeout(accessory.getService(valve).timer)
+          break
+        case 1: {
+          const timer = serviceValve.getCharacteristic(Characteristic.SetDuration).value
+          serviceValve.updateCharacteristic(Characteristic.RemainingDuration, timer)
+          serviceValve.timer = setTimeout(() => serviceValve.setCharacteristic(Characteristic.Active, 0), timer * 1000)
+          break
+        }
       }
     } catch (err) {
-      this.platform.requestDeviceRefresh(accessory, err);
+      this.platform.requestDeviceRefresh(accessory, err)
     }
   }
-  externalValveUpdate(accessory, params) {
+
+  externalValveUpdate (accessory, params) {
     try {
-      ["A", "B"].forEach((v, k) => {
-        let valveService = accessory.getService("Valve " + v);
+      ['A', 'B'].forEach((v, k) => {
+        const valveService = accessory.getService('Valve ' + v)
         valveService
-          .updateCharacteristic(Characteristic.Active, params.switches[k].switch === "on")
-          .updateCharacteristic(Characteristic.InUse, params.switches[k].switch === "on");
-        if (params.switches[k].switch === "on") {
-          let timer = valveService.getCharacteristic(Characteristic.SetDuration).value;
-          valveService.updateCharacteristic(Characteristic.RemainingDuration, timer);
+          .updateCharacteristic(Characteristic.Active, params.switches[k].switch === 'on')
+          .updateCharacteristic(Characteristic.InUse, params.switches[k].switch === 'on')
+        if (params.switches[k].switch === 'on') {
+          const timer = valveService.getCharacteristic(Characteristic.SetDuration).value
+          valveService.updateCharacteristic(Characteristic.RemainingDuration, timer)
           valveService.timer = setTimeout(() => {
-            valveService.setCharacteristic(Characteristic.Active, 0);
-          }, timer * 1000);
+            valveService.setCharacteristic(Characteristic.Active, 0)
+          }, timer * 1000)
         } else {
-          valveService.updateCharacteristic(Characteristic.RemainingDuration, 0);
-          clearTimeout(valveService.timer);
+          valveService.updateCharacteristic(Characteristic.RemainingDuration, 0)
+          clearTimeout(valveService.timer)
         }
-      });
+      })
     } catch (err) {
-      this.platform.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+      this.platform.log.warn('[%s] could not be updated as %s.', accessory.displayName, err)
     }
   }
-};
+}
diff --git a/lib/device/zb-dev.js b/lib/device/zb-dev.js
index 07e64a8f..d4b2f58e 100644
--- a/lib/device/zb-dev.js
+++ b/lib/device/zb-dev.js
@@ -1,82 +1,83 @@
-/* jshint esversion: 9, -W014, -W030, node: true */
-"use strict";
-let Characteristic, Service;
+'use strict'
+let Characteristic, Service
 module.exports = class deviceZBDev {
-  constructor(platform) {
-    this.platform = platform;
-    Service = platform.api.hap.Service;
-    Characteristic = platform.api.hap.Characteristic;
+  constructor (platform) {
+    this.platform = platform
+    Service = platform.api.hap.Service
+    Characteristic = platform.api.hap.Characteristic
   }
-  externalZBUpdate(accessory, params) {
+
+  externalZBUpdate (accessory, params) {
     try {
-      //*** credit @tasict ***\\
-      if (params.hasOwnProperty("battery")) {
+      //* ** credit @tasict ***\\
+      if (Object.prototype.hasOwnProperty.call(params, 'battery')) {
         if (accessory.context.eweUIID === 3026 && (this.platform.config.ZBDWBatt || false)) {
-          params.battery *= 10;
+          params.battery *= 10
         }
-        let batteryService =
-          accessory.getService(Service.BatteryService) || accessory.addService(Service.BatteryService);
-        batteryService.updateCharacteristic(Characteristic.BatteryLevel, params.battery);
+        const batteryService =
+          accessory.getService(Service.BatteryService) || accessory.addService(Service.BatteryService)
+        batteryService.updateCharacteristic(Characteristic.BatteryLevel, params.battery)
         batteryService.updateCharacteristic(
           Characteristic.StatusLowBattery,
           params.battery < (this.platform.config.lowBattThreshold || 25)
-        );
+        )
       }
       switch (accessory.context.eweUIID) {
         case 1000:
-          if (params.hasOwnProperty("key") && [0, 1, 2].includes(params.key)) {
+          if (Object.prototype.hasOwnProperty.call(params, 'key') && [0, 1, 2].includes(params.key)) {
             accessory
               .getService(Service.StatelessProgrammableSwitch)
-              .updateCharacteristic(Characteristic.ProgrammableSwitchEvent, params.key);
+              .updateCharacteristic(Characteristic.ProgrammableSwitchEvent, params.key)
           }
-          break;
-        case 1770:
-          let eveLog = {
-            time: Date.now(),
-          };
-          if (params.hasOwnProperty("temperature")) {
-            let currentTemp = parseInt(params.temperature) / 100;
+          break
+        case 1770: {
+          const eveLog = {
+            time: Date.now()
+          }
+          if (Object.prototype.hasOwnProperty.call(params, 'temperature')) {
+            const currentTemp = parseInt(params.temperature) / 100
             accessory
               .getService(Service.TemperatureSensor)
-              .updateCharacteristic(Characteristic.CurrentTemperature, currentTemp);
-            eveLog.temp = parseFloat(currentTemp);
+              .updateCharacteristic(Characteristic.CurrentTemperature, currentTemp)
+            eveLog.temp = parseFloat(currentTemp)
           }
-          if (params.hasOwnProperty("humidity")) {
-            let currentHumi = parseInt(params.humidity) / 100;
+          if (Object.prototype.hasOwnProperty.call(params, 'humidity')) {
+            const currentHumi = parseInt(params.humidity) / 100
             accessory
               .getService(Service.HumiditySensor)
-              .updateCharacteristic(Characteristic.CurrentRelativeHumidity, currentHumi);
-            eveLog.humidity = parseFloat(currentHumi);
+              .updateCharacteristic(Characteristic.CurrentRelativeHumidity, currentHumi)
+            eveLog.humidity = parseFloat(currentHumi)
           }
-          if (eveLog.hasOwnProperty("temp") || eveLog.hasOwnProperty("humidity")) {
-            accessory.eveLogger.addEntry(eveLog);
+          if (Object.prototype.hasOwnProperty.call(eveLog, 'temp') || Object.prototype.hasOwnProperty.call(eveLog, 'humidity')) {
+            accessory.eveLogger.addEntry(eveLog)
           }
-          break;
+          break
+        }
         case 2026:
-          if (params.hasOwnProperty("motion") && params.hasOwnProperty("trigTime")) {
-            let timeNow = new Date(),
-              diff = (timeNow.getTime() - params.trigTime) / 1000;
+          if (Object.prototype.hasOwnProperty.call(params, 'motion') && Object.prototype.hasOwnProperty.call(params, 'trigTime')) {
+            const timeNow = new Date()
+            const diff = (timeNow.getTime() - params.trigTime) / 1000
             accessory
               .getService(Service.MotionSensor)
               .updateCharacteristic(
                 Characteristic.MotionDetected,
-                params.hasOwnProperty("updateSource") &&
+                Object.prototype.hasOwnProperty.call(params, 'updateSource') &&
                   params.motion === 1 &&
                   diff < (this.platform.config.sensorTimeDifference || 120)
-              );
-            break;
+              )
+            break
           }
-          break;
+          break
         case 3026:
-          if (params.hasOwnProperty("lock") && [0, 1].includes(params.lock)) {
+          if (Object.prototype.hasOwnProperty.call(params, 'lock') && [0, 1].includes(params.lock)) {
             accessory
               .getService(Service.ContactSensor)
-              .updateCharacteristic(Characteristic.ContactSensorState, params.lock);
+              .updateCharacteristic(Characteristic.ContactSensorState, params.lock)
           }
-          break;
+          break
       }
     } catch (err) {
-      this.platform.log.warn("[%s] could not be updated as %s.", accessory.displayName, err);
+      this.platform.log.warn('[%s] could not be updated as %s.', accessory.displayName, err)
     }
   }
-};
+}

From ab86a1f6df73a4d87593e48db8fd80b32e22be55 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 27 Sep 2020 09:38:46 +0100
Subject: [PATCH 0236/3183] irrigation to custom group

---
 config.schema.json  | 20 +++++++++-----------
 lib/constants.js    |  2 +-
 lib/device/valve.js | 14 ++++++++++++++
 lib/eWeLink.js      |  7 ++++---
 4 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 037b6c42..5e99588c 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -88,14 +88,6 @@
         "minimum": 10,
         "maximum": 300
       },
-      "valveTimeLength": {
-        "type": "integer",
-        "title": "Valve Duration",
-        "description": "The default number of seconds that irrigation valves will run for.",
-        "default": 20,
-        "minimum": 10,
-        "maximum": 1800
-      },
       "inUsePowerThreshold": {
         "type": "integer",
         "title": "Outlet 'In Use' Threshold",
@@ -151,6 +143,12 @@
                   "enum": [
                     "lock"
                   ]
+                },
+                {
+                  "title": "Irrigation",
+                  "enum": [
+                    "valve"
+                  ]
                 }
               ]
             },
@@ -158,7 +156,7 @@
               "type": "string",
               "title": "Device Setup",
               "default": "null",
-              "description": "The device setup. Blinds must be set up with two switches. Please ignore this setting for locks.",
+              "description": "The device setup. Blinds must be set up with two switches. Please ignore this setting for locks and irrigation.",
               "oneOf": [
                 {
                   "title": "One Switch - for up and down",
@@ -176,8 +174,8 @@
             },
             "operationTime": {
               "type": "integer",
-              "title": "Operation Time",
-              "description": "For blinds and garage doors this is the total time in deciseconds to fully open/close the device. For locks this is the time to show the Home app tile as unlocked. Count the time in seconds and multiply by 10, for example 100 for 10 seconds or 75 for 7.5 seconds.",
+              "title": "Operation Time (Deciseconds)",
+              "description": "Blinds/garage doors: the time to fully open/close the device. Locks: the time to show as unlocked. Irrigation: the time the valves will open for. This setting is in deciseconds - count the time in seconds and multiply by 10, for example 100 for 10 seconds or 75 for 7.5 seconds.",
               "default": 100,
               "minimum": 10,
               "maximum": 600
diff --git a/lib/constants.js b/lib/constants.js
index 1ec671bc..72090079 100644
--- a/lib/constants.js
+++ b/lib/constants.js
@@ -2,6 +2,7 @@
 module.exports = {
   appId: 'oeVkj2lYFGnJu5XUtWisfW4utiN4u9Mq',
   appSecret: '6Nz4n0xA8s8qdxQf2GqurZj2Fs55FUvM',
+  allowedGroups: ['blind', 'garage', 'lock', 'valve'],
   devicesHideable: ['switch', 'light'],
   devicesNonLAN: [22, 28, 59, 102],
   devicesSingleSwitch: [1, 5, 6, 14, 15, 22, 24, 27, 32, 36, 44, 59],
@@ -38,7 +39,6 @@ module.exports = {
   devicesValveParams: ['switches'],
   devicesGarageParams: ['switch', 'switches'],
   devicesLockParams: ['switch'],
-  allowedGroups: ['blind', 'garage', 'lock'],
   paramsToKeep: ['battery', 'bright', 'brightness', 'channel', 'cmd', 'colorB', 'colorG', 'colorR', 'current', 'currentHumidity', 'currentTemperature', 'fan', 'humidity', 'key', 'light', 'lock', 'mainSwitch', 'mode', 'motion', 'online', 'power', 'rfChl', 'rfList', 'rfTrig', 'sensorType', 'setclose', 'speed', 'state', 'switch', 'switches', 'temperature', 'trigTime', 'type', 'voltage', 'zyx_mode'],
   defaultMultiSwitchOff: [{
     switch: 'off',
diff --git a/lib/device/valve.js b/lib/device/valve.js
index 121f139e..84129895 100644
--- a/lib/device/valve.js
+++ b/lib/device/valve.js
@@ -9,7 +9,14 @@ module.exports = class deviceValve {
   async internalValveUpdate (accessory, valve, value, callback) {
     callback()
     try {
+      let valveConfig
       const params = {}
+      if (!(valveConfig = this.platform.cusG.get(accessory.context.hbDeviceId))) {
+        throw new Error('group config missing')
+      }
+      if (valveConfig.type !== 'valve') {
+        throw new Error('improper configuration')
+      }
       const serviceValve = accessory.getService(valve)
       params.switches = this.platform.devicesInEW.get(accessory.context.eweDeviceId).params.switches
       switch (valve) {
@@ -49,6 +56,13 @@ module.exports = class deviceValve {
 
   externalValveUpdate (accessory, params) {
     try {
+      let valveConfig
+      if (!(valveConfig = this.platform.cusG.get(accessory.context.hbDeviceId))) {
+        throw new Error('group config missing')
+      }
+      if (valveConfig.type !== 'valve') {
+        throw new Error('improper configuration')
+      }
       ['A', 'B'].forEach((v, k) => {
         const valveService = accessory.getService('Valve ' + v)
         valveService
diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index 7ea7569b..30a78aed 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -28,7 +28,7 @@ class eWeLink {
   constructor (log, config, api) {
     if (!log || !api || !config) return
     if (!config.username || !config.password || !config.countryCode) {
-      log.error('*********** Cannot load homebridge-ewelink ***********')
+      log.error('*********** Cannot load homebridge-ewelink ************')
       log.error('eWeLink credentials missing from the Homebridge config.')
       log.error('*******************************************************')
       return
@@ -183,7 +183,7 @@ class eWeLink {
       accessory = this.devicesInHB.has(device.deviceid + 'SWX')
         ? this.devicesInHB.get(device.deviceid + 'SWX')
         : this.addAccessory(device, device.deviceid + 'SWX', 'sensor')
-    } else if (device.extra.uiid === 2 && device.brandName === 'coolkit' && device.productModel === '0285') {
+    } else if (this.cusG.has(device.deviceid + 'SWX') && this.cusG.get(device.deviceid + 'SWX').type === 'valve') {
       accessory = this.devicesInHB.has(device.deviceid + 'SWX')
         ? this.devicesInHB.get(device.deviceid + 'SWX')
         : this.addAccessory(device, device.deviceid + 'SWX', 'valve')
@@ -538,6 +538,7 @@ class eWeLink {
         }
         case 'valve': {
           accessory.control = new DeviceValve(this);
+          let valveConfig = this.platform.cusG.get(accessory.context.hbDeviceId)
           ['A', 'B'].forEach(v => {
             let valveService
             if (!(valveService = accessory.getService('Valve ' + v))) {
@@ -546,7 +547,7 @@ class eWeLink {
                 .setCharacteristic(Characteristic.Active, 0)
                 .setCharacteristic(Characteristic.InUse, 0)
                 .setCharacteristic(Characteristic.ValveType, 1)
-                .setCharacteristic(Characteristic.SetDuration, this.config.valveTimeLength || 120)
+                .setCharacteristic(Characteristic.SetDuration, Math.round(valveConfig.operationTime / 10) || 120)
                 .addCharacteristic(Characteristic.RemainingDuration)
               valveService = accessory.getService('Valve ' + v)
             }

From af7271c7785e6cb278d8c0c9ceb5a99bbf18072c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 27 Sep 2020 10:18:02 +0100
Subject: [PATCH 0237/3183] irrigation valve bug

---
 lib/device/valve.js |  3 ++-
 lib/eWeLink.js      | 17 +++++++++--------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/lib/device/valve.js b/lib/device/valve.js
index 84129895..9feff0c4 100644
--- a/lib/device/valve.js
+++ b/lib/device/valve.js
@@ -63,7 +63,8 @@ module.exports = class deviceValve {
       if (valveConfig.type !== 'valve') {
         throw new Error('improper configuration')
       }
-      ['A', 'B'].forEach((v, k) => {
+      const arr = ['A', 'B']
+      arr.forEach((v, k) => {
         const valveService = accessory.getService('Valve ' + v)
         valveService
           .updateCharacteristic(Characteristic.Active, params.switches[k].switch === 'on')
diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index 30a78aed..8281a2d7 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -179,14 +179,14 @@ class eWeLink {
       accessory = this.devicesInHB.has(device.deviceid + 'SWX')
         ? this.devicesInHB.get(device.deviceid + 'SWX')
         : this.addAccessory(device, device.deviceid + 'SWX', 'lock')
-    } else if (cns.devicesSensor.includes(device.extra.uiid)) {
-      accessory = this.devicesInHB.has(device.deviceid + 'SWX')
-        ? this.devicesInHB.get(device.deviceid + 'SWX')
-        : this.addAccessory(device, device.deviceid + 'SWX', 'sensor')
     } else if (this.cusG.has(device.deviceid + 'SWX') && this.cusG.get(device.deviceid + 'SWX').type === 'valve') {
       accessory = this.devicesInHB.has(device.deviceid + 'SWX')
         ? this.devicesInHB.get(device.deviceid + 'SWX')
         : this.addAccessory(device, device.deviceid + 'SWX', 'valve')
+    } else if (cns.devicesSensor.includes(device.extra.uiid)) {
+      accessory = this.devicesInHB.has(device.deviceid + 'SWX')
+        ? this.devicesInHB.get(device.deviceid + 'SWX')
+        : this.addAccessory(device, device.deviceid + 'SWX', 'sensor')
     } else if (cns.devicesFan.includes(device.extra.uiid)) {
       accessory = this.devicesInHB.has(device.deviceid + 'SWX')
         ? this.devicesInHB.get(device.deviceid + 'SWX')
@@ -537,9 +537,10 @@ class eWeLink {
           break
         }
         case 'valve': {
-          accessory.control = new DeviceValve(this);
-          let valveConfig = this.platform.cusG.get(accessory.context.hbDeviceId)
-          ['A', 'B'].forEach(v => {
+          accessory.control = new DeviceValve(this)
+          const valveConfig = this.cusG.get(accessory.context.hbDeviceId)
+          const arr = ['A', 'B']
+          arr.forEach(v => {
             let valveService
             if (!(valveService = accessory.getService('Valve ' + v))) {
               accessory
@@ -872,7 +873,7 @@ class eWeLink {
       }
       this.devicesInHB.set(accessory.context.hbDeviceId, accessory)
     } catch (err) {
-      this.log.warn('[%s] could not be refreshed as %s.', accessory.displayName, err)
+      this.log.warn('[%s] could not be configured as %s.', accessory.displayName, err)
     }
   }
 

From dfcfb64257ebb21c973b0f65b2e4c8ac4337f2d8 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 27 Sep 2020 10:41:27 +0100
Subject: [PATCH 0238/3183] 3.1.0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d667effe..2dcb3e8d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.0.3-4",
+  "version": "3.1.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index c27caff6..1554d21e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.0.3-4",
+  "version": "3.1.0",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 12066e1ca040b36cfee424be2c787076cf3578e9 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 27 Sep 2020 12:18:13 +0100
Subject: [PATCH 0239/3183] Update eWeLink.js

---
 lib/eWeLink.js | 97 +++++++++++++++++++++++++++++++++-----------------
 1 file changed, 65 insertions(+), 32 deletions(-)

diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index 8281a2d7..4e1fbdbf 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -90,7 +90,7 @@ class eWeLink {
             this.removeAccessory(a)
           }
         })
-        //* ** Synchronise devices between eWeLink and Homebridge and set up ws/lan listeners ***\\
+        //* ** Synchronise devices between eWeLink and Homebridge and set up WS/LAN listeners ***\\
         this.devicesInEW.forEach(d => this.initialiseDevice(d))
         this.wsClient.receiveUpdate(d => this.receiveDeviceUpdate(d))
         this.lanClient.receiveUpdate(d => this.receiveDeviceUpdate(d))
@@ -596,8 +596,7 @@ class eWeLink {
         }
         case 'thermostat': {
           accessory.control = new DeviceThermostat(this)
-          const tempService =
-            accessory.getService(Service.TemperatureSensor) || accessory.addService(Service.TemperatureSensor)
+          const tempService = accessory.getService(Service.TemperatureSensor) || accessory.addService(Service.TemperatureSensor)
           let humiService = false
           if (accessory.context.sensorType !== 'DS18B20') {
             humiService = accessory.getService(Service.HumiditySensor) || accessory.addService(Service.HumiditySensor)
@@ -698,13 +697,15 @@ class eWeLink {
                 power: currentWatt
               })
             }, 300000)
-            outletService.getCharacteristic(EveService.Characteristics.TotalConsumption).on('get', callback => {
-              accessory.context.extraPersistedData = accessory.eveLogger.getExtraPersistedData()
-              if (accessory.context.extraPersistedData !== undefined) {
-                accessory.context.totalEnergy = accessory.context.extraPersistedData.totalPower
-              }
-              callback(null, accessory.context.totalEnergy)
-            })
+            outletService
+              .getCharacteristic(EveService.Characteristics.TotalConsumption)
+              .on('get', callback => {
+                accessory.context.extraPersistedData = accessory.eveLogger.getExtraPersistedData()
+                if (accessory.context.extraPersistedData !== undefined) {
+                  accessory.context.totalEnergy = accessory.context.extraPersistedData.totalPower
+                }
+                callback(null, accessory.context.totalEnergy)
+              })
             outletService
               .getCharacteristic(EveService.Characteristics.ResetTotal)
               .on('set', (value, callback) => {
@@ -880,12 +881,16 @@ class eWeLink {
   refreshAccessory (accessory, newParams) {
     switch (accessory.context.type) {
       case 'valve':
-        if (Object.keys(newParams).some(v => cns.devicesValveParams.includes(v)) && Array.isArray(newParams.switches)) {
+        if (Object.keys(newParams).some(v => {
+          cns.devicesValveParams.includes(v)
+        }) && Array.isArray(newParams.switches)) {
           accessory.control.externalValveUpdate(accessory, newParams)
         }
         return true
       case 'curtain':
-        if (Object.keys(newParams).some(v => cns.devicesCurtainParams.includes(v))) {
+        if (Object.keys(newParams).some(v => {
+          cns.devicesCurtainParams.includes(v)
+        })) {
           accessory.control.externalCurtainUpdate(accessory, newParams)
         }
         return true
@@ -893,62 +898,82 @@ class eWeLink {
         return true
       case 'garage':
         if (
-          Object.keys(newParams).some(v => cns.devicesGarageParams.includes(v)) &&
-          Array.isArray(newParams.switches)
+          Object.keys(newParams).some(v => {
+            cns.devicesGarageParams.includes(v)
+          }) &&
+        Array.isArray(newParams.switches)
         ) {
           accessory.control.externalGarageUpdate(accessory, newParams)
         }
         return true
       case 'lock':
-        if (Object.keys(newParams).some(v => cns.devicesLockParams.includes(v))) {
+        if (Object.keys(newParams).some(v => {
+          cns.devicesLockParams.includes(v)
+        })) {
           accessory.control.externalLockUpdate(accessory, newParams)
         }
         return true
       case 'sensor':
-        if (Object.keys(newParams).some(v => cns.devicesSensorParams.includes(v))) {
+        if (Object.keys(newParams).some(v => {
+          cns.devicesSensorParams.includes(v)
+        })) {
           accessory.control.externalSensorUpdate(accessory, newParams)
         }
         return true
       case 'fan':
-        if (Object.keys(newParams).some(v => cns.devicesFanParams.includes(v))) {
+        if (Object.keys(newParams).some(v => {
+          cns.devicesFanParams.includes(v)
+        })) {
           accessory.control.externalFanUpdate(accessory, newParams)
         }
         return true
       case 'thermostat':
-        if (Object.keys(newParams).some(v => cns.devicesThermostatParams.includes(v))) {
+        if (Object.keys(newParams).some(v => {
+          cns.devicesThermostatParams.includes(v)
+        })) {
           accessory.control.externalThermostatUpdate(accessory, newParams)
         }
         return true
       case 'outlet':
-        if (Object.keys(newParams).some(v => cns.devicesOutletParams.includes(v))) {
+        if (Object.keys(newParams).some(v => {
+          cns.devicesOutletParams.includes(v)
+        })) {
           accessory.control.externalOutletUpdate(accessory, newParams)
         }
         return true
       case 'usb':
-        if (Object.keys(newParams).some(v => cns.devicesUSBParams.includes(v)) && Array.isArray(newParams.switches)) {
+        if (Object.keys(newParams).some(v => {
+          cns.devicesUSBParams.includes(v)
+        }) && Array.isArray(newParams.switches)) {
           accessory.control.externalUSBUpdate(accessory, newParams)
         }
         return true
       case 'scm':
-        if (Object.keys(newParams).some(v => cns.devicesSCMParams.includes(v)) && Array.isArray(newParams.switches)) {
+        if (Object.keys(newParams).some(v => {
+          cns.devicesSCMParams.includes(v)
+        }) && Array.isArray(newParams.switches)) {
           accessory.control.externalSCMUpdate(accessory, newParams)
         }
         return true
       case 'light':
         if (
           cns.devicesSingleSwitch.includes(accessory.context.eweUIID) &&
-          cns.devicesSingleSwitchLight.includes(accessory.context.eweModel)
+        cns.devicesSingleSwitchLight.includes(accessory.context.eweModel)
         ) {
-          if (Object.keys(newParams).some(v => cns.devicesSingleSwitchLightParams.includes(v))) {
+          if (Object.keys(newParams).some(v => {
+            cns.devicesSingleSwitchLightParams.includes(v)
+          })) {
             accessory.control.externalSingleLightUpdate(accessory, newParams)
           }
         } else if (
           cns.devicesMultiSwitch.includes(accessory.context.eweUIID) &&
-          cns.devicesMultiSwitchLight.includes(accessory.context.eweModel)
+        cns.devicesMultiSwitchLight.includes(accessory.context.eweModel)
         ) {
           if (
-            Object.keys(newParams).some(v => cns.devicesMultiSwitchLightParams.includes(v)) &&
-            Array.isArray(newParams.switches)
+            Object.keys(newParams).some(v => {
+              cns.devicesMultiSwitchLightParams.includes(v)
+            }) &&
+          Array.isArray(newParams.switches)
           ) {
             accessory.control.externalMultiLightUpdate(accessory, newParams)
           }
@@ -956,27 +981,35 @@ class eWeLink {
         return true
       case 'switch':
         if (cns.devicesSingleSwitch.includes(accessory.context.eweUIID)) {
-          if (Object.keys(newParams).some(v => cns.devicesSingleSwitchParams.includes(v))) {
+          if (Object.keys(newParams).some(v => {
+            cns.devicesSingleSwitchParams.includes(v)
+          })) {
             accessory.control.externalSingleSwitchUpdate(accessory, newParams)
           }
         } else if (cns.devicesMultiSwitch.includes(accessory.context.eweUIID)) {
           if (
-            Object.keys(newParams).some(v => cns.devicesMultiSwitchParams.includes(v)) &&
-            Array.isArray(newParams.switches)
+            Object.keys(newParams).some(v => {
+              cns.devicesMultiSwitchParams.includes(v)
+            }) &&
+          Array.isArray(newParams.switches)
           ) {
             accessory.control.externalMultiSwitchUpdate(accessory, newParams)
           }
         }
         return true
       case 'rf_pri':
-        if (Object.keys(newParams).some(v => cns.devicesRFBridgeParams.includes(v))) {
+        if (Object.keys(newParams).some(v => {
+          cns.devicesRFBridgeParams.includes(v)
+        })) {
           accessory.control.externalRFUpdate(accessory, newParams)
         }
         return true
       case 'rf_sub':
         return true
       case 'zb_dev':
-        if (Object.keys(newParams).some(v => cns.devicesZBBridgeParams.includes(v))) {
+        if (Object.keys(newParams).some(v => {
+          cns.devicesZBBridgeParams.includes(v)
+        })) {
           accessory.control.externalZBUpdate(accessory, newParams)
         }
         return true
@@ -1017,7 +1050,7 @@ class eWeLink {
           throw new Error(err)
         }
       } else {
-        throw new Error("it is unreachable. I's status will be corrected once it is reachable")
+        throw new Error("it is unreachable. It's status will be corrected once it is reachable")
       }
     }
   }

From febc689ac8b34b6a390db38a98b258bf16fd87e3 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 27 Sep 2020 12:22:10 +0100
Subject: [PATCH 0240/3183] Update eWeLink.js

---
 lib/eWeLink.js | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index 4e1fbdbf..b4f5e8a8 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -900,8 +900,7 @@ class eWeLink {
         if (
           Object.keys(newParams).some(v => {
             cns.devicesGarageParams.includes(v)
-          }) &&
-        Array.isArray(newParams.switches)
+          }) && Array.isArray(newParams.switches)
         ) {
           accessory.control.externalGarageUpdate(accessory, newParams)
         }
@@ -958,7 +957,7 @@ class eWeLink {
       case 'light':
         if (
           cns.devicesSingleSwitch.includes(accessory.context.eweUIID) &&
-        cns.devicesSingleSwitchLight.includes(accessory.context.eweModel)
+          cns.devicesSingleSwitchLight.includes(accessory.context.eweModel)
         ) {
           if (Object.keys(newParams).some(v => {
             cns.devicesSingleSwitchLightParams.includes(v)
@@ -967,13 +966,12 @@ class eWeLink {
           }
         } else if (
           cns.devicesMultiSwitch.includes(accessory.context.eweUIID) &&
-        cns.devicesMultiSwitchLight.includes(accessory.context.eweModel)
+          cns.devicesMultiSwitchLight.includes(accessory.context.eweModel)
         ) {
           if (
             Object.keys(newParams).some(v => {
               cns.devicesMultiSwitchLightParams.includes(v)
-            }) &&
-          Array.isArray(newParams.switches)
+            }) && Array.isArray(newParams.switches)
           ) {
             accessory.control.externalMultiLightUpdate(accessory, newParams)
           }
@@ -990,8 +988,7 @@ class eWeLink {
           if (
             Object.keys(newParams).some(v => {
               cns.devicesMultiSwitchParams.includes(v)
-            }) &&
-          Array.isArray(newParams.switches)
+            }) && Array.isArray(newParams.switches)
           ) {
             accessory.control.externalMultiSwitchUpdate(accessory, newParams)
           }

From 575fcd7c36cc25ca746aa78bf8b0bbdfe8885c9e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 27 Sep 2020 12:23:33 +0100
Subject: [PATCH 0241/3183] 3.1.1-0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 2dcb3e8d..1152196f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.1.0",
+  "version": "3.1.1-0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 1554d21e..7e30e8f7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.1.0",
+  "version": "3.1.1-0",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 6034b461a24d43950a086cb7854c7c796a320fea Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 27 Sep 2020 15:43:09 +0100
Subject: [PATCH 0242/3183] catch lan stop error

---
 lib/eWeLinkLAN.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/eWeLinkLAN.js b/lib/eWeLinkLAN.js
index a14d8cda..d0982e59 100644
--- a/lib/eWeLinkLAN.js
+++ b/lib/eWeLinkLAN.js
@@ -180,7 +180,9 @@ module.exports = class eWeLinkLAN {
   }
 
   closeConnection () {
-    dns.stopMonitoring()
+    dns.stopMonitoring().catch(err) => {
+      if (this.debug) this.log.warn(err);
+    })
     this.log('LAN monitoring gracefully stopped.')
   }
 }

From 33bbc5dc34b6b8878f96c1cff90a6bc874c76d05 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 27 Sep 2020 15:44:55 +0100
Subject: [PATCH 0243/3183] 3.1.1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 1152196f..e5221ca0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.1.1-0",
+  "version": "3.1.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 7e30e8f7..3b696966 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.1.1-0",
+  "version": "3.1.1",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From f4f2330e8a338ad47cdaa43a614701db7f35938b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 27 Sep 2020 15:53:03 +0100
Subject: [PATCH 0244/3183] Update eWeLinkLAN.js

---
 lib/eWeLinkLAN.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/eWeLinkLAN.js b/lib/eWeLinkLAN.js
index d0982e59..f2f49e1f 100644
--- a/lib/eWeLinkLAN.js
+++ b/lib/eWeLinkLAN.js
@@ -180,7 +180,7 @@ module.exports = class eWeLinkLAN {
   }
 
   closeConnection () {
-    dns.stopMonitoring().catch(err) => {
+    dns.stopMonitoring().catch(err => {
       if (this.debug) this.log.warn(err);
     })
     this.log('LAN monitoring gracefully stopped.')

From c9e1f5aa77f8642c79c4ad3e779887bae801dc70 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 27 Sep 2020 15:53:38 +0100
Subject: [PATCH 0245/3183] 3.1.2

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index e5221ca0..0b9fccd4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.1.1",
+  "version": "3.1.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 3b696966..f7d967f0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.1.1",
+  "version": "3.1.2",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 2962a8f8f4731f10e6c8d7c445171358213066f7 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Sun, 27 Sep 2020 16:42:44 +0100
Subject: [PATCH 0246/3183] Update README.md

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index d8a98c3f..1c683be2 100644
--- a/README.md
+++ b/README.md
@@ -35,3 +35,5 @@
 * [Support Request](https://github.com/bwp91/homebridge-ewelink/issues/new/choose)
 * [Roadmap](https://github.com/bwp91/homebridge-ewelink/wiki/Roadmap)
 * [Credits](https://github.com/bwp91/homebridge-ewelink/wiki/Credits)
+### Disclaimer
+I am in no way affiliated with eWeLink nor any of the device brands (like Sonoff) and this plugin is a personal project that I maintain in my free time.

From 3c4e603b0785f9f5fb5d77ace0a396d919422f66 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 27 Sep 2020 21:46:02 +0100
Subject: [PATCH 0247/3183] random fixes

---
 lib/device/thermostat.js |  40 +++++++-------
 lib/eWeLink.js           | 111 +++++++--------------------------------
 lib/eWeLinkHTTP.js       |   8 +--
 lib/eWeLinkLAN.js        |  16 +++---
 lib/eWeLinkWS.js         |   4 +-
 5 files changed, 56 insertions(+), 123 deletions(-)

diff --git a/lib/device/thermostat.js b/lib/device/thermostat.js
index fe076368..a5d5f2b0 100644
--- a/lib/device/thermostat.js
+++ b/lib/device/thermostat.js
@@ -1,8 +1,10 @@
 'use strict'
 let Characteristic, Service
 module.exports = class deviceThermostat {
-  constructor (platform, homebridge) {
+  constructor (platform) {
     this.platform = platform
+    Service = platform.api.hap.Service
+    Characteristic = platform.api.hap.Characteristic
   }
 
   async internalThermostatUpdate (accessory, value, callback) {
@@ -30,24 +32,24 @@ module.exports = class deviceThermostat {
         const switchService = accessory.getService(Service.Switch)
         switchService.updateCharacteristic(Characteristic.On, newState)
       }
-      if (!(this.platform.config.disableEveLogging || false)) {
-        const eveLog = {
-          time: Date.now()
-        }
-        if (Object.prototype.hasOwnProperty.call(params, 'currentTemperature') && accessory.getService(Service.TemperatureSensor)) {
-          const currentTemp = params.currentTemperature !== 'unavailable' ? params.currentTemperature : 0
-          accessory
-            .getService(Service.TemperatureSensor)
-            .updateCharacteristic(Characteristic.CurrentTemperature, currentTemp)
-          eveLog.temp = parseFloat(currentTemp)
-        }
-        if (Object.prototype.hasOwnProperty.call(params, 'currentHumidity') && accessory.getService(Service.HumiditySensor)) {
-          const currentHumi = params.currentHumidity !== 'unavailable' ? params.currentHumidity : 0
-          accessory
-            .getService(Service.HumiditySensor)
-            .updateCharacteristic(Characteristic.CurrentRelativeHumidity, currentHumi)
-          eveLog.humidity = parseFloat(currentHumi)
-        }
+      const eveLog = {
+        time: Date.now()
+      }
+      if (Object.prototype.hasOwnProperty.call(params, 'currentTemperature') && accessory.getService(Service.TemperatureSensor)) {
+        const currentTemp = parseFloat(params.currentTemperature !== 'unavailable' ? params.currentTemperature : 0)
+        accessory
+          .getService(Service.TemperatureSensor)
+          .updateCharacteristic(Characteristic.CurrentTemperature, currentTemp)
+        eveLog.temp = currentTemp
+      }
+      if (Object.prototype.hasOwnProperty.call(params, 'currentHumidity') && accessory.getService(Service.HumiditySensor)) {
+        const currentHumi = parseFloat(params.currentHumidity !== 'unavailable' ? params.currentHumidity : 0)
+        accessory
+          .getService(Service.HumiditySensor)
+          .updateCharacteristic(Characteristic.CurrentRelativeHumidity, currentHumi)
+        eveLog.humidity = currentHumi
+      }
+      if (!this.platform.config.disableEveLogging) {
         if (Object.prototype.hasOwnProperty.call(eveLog, 'temp') || Object.prototype.hasOwnProperty.call(eveLog, 'humidity')) {
           accessory.eveLogger.addEntry(eveLog)
         }
diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index b4f5e8a8..fa08826e 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -311,7 +311,7 @@ class eWeLink {
         : this.addAccessory(device, device.deviceid + 'SW0', 'rf_pri', true, {
           rfMap
         })
-      this.log.error(JSON.stringify(accessory.context, null, 2))
+      // this.log.error(JSON.stringify(accessory.context, null, 2))
       rfMap.forEach(subDevice => {
         const swNumber = rfChlCounter + 1
         let subAccessory
@@ -351,7 +351,7 @@ class eWeLink {
         subAccessory.context.reachableWAN = device.online
         subAccessory.context.reachableLAN = false
         this.devicesInHB.set(subAccessory.context.hbDeviceId, subAccessory)
-        this.log.warn(JSON.stringify(subAccessory.context, null, 2))
+        // this.log.warn(JSON.stringify(subAccessory.context, null, 2))
         rfChlCounter += Object.keys(subDevice.buttons || {}).length
       })
       accessory.context.channelCount = rfChlCounter
@@ -410,7 +410,7 @@ class eWeLink {
     }
     this.log(' → [%s] initialised %s.', device.name, str)
     this.devicesInHB.set(accessory.context.hbDeviceId, accessory)
-    if (!(this.config.disableHTTPRefresh || false)) {
+    if (!this.config.disableHTTPRefresh && !(accessory.context.switchNumber === '0' && this.hiddenMasters.includes(device.deviceid))) {
       if (!this.refreshAccessory(accessory, device.params)) {
         this.log.warn(
           '[%s] could not be initialised. Please try removing accessory from the Homebridge cache along with any secondary devices (SW1, SW2, etc.) [debug:%s:%s].',
@@ -881,134 +881,64 @@ class eWeLink {
   refreshAccessory (accessory, newParams) {
     switch (accessory.context.type) {
       case 'valve':
-        if (Object.keys(newParams).some(v => {
-          cns.devicesValveParams.includes(v)
-        }) && Array.isArray(newParams.switches)) {
-          accessory.control.externalValveUpdate(accessory, newParams)
-        }
+        accessory.control.externalValveUpdate(accessory, newParams)
         return true
       case 'curtain':
-        if (Object.keys(newParams).some(v => {
-          cns.devicesCurtainParams.includes(v)
-        })) {
-          accessory.control.externalCurtainUpdate(accessory, newParams)
-        }
+        accessory.control.externalCurtainUpdate(accessory, newParams)
         return true
       case 'blind':
         return true
       case 'garage':
-        if (
-          Object.keys(newParams).some(v => {
-            cns.devicesGarageParams.includes(v)
-          }) && Array.isArray(newParams.switches)
-        ) {
-          accessory.control.externalGarageUpdate(accessory, newParams)
-        }
+        accessory.control.externalGarageUpdate(accessory, newParams)
         return true
       case 'lock':
-        if (Object.keys(newParams).some(v => {
-          cns.devicesLockParams.includes(v)
-        })) {
-          accessory.control.externalLockUpdate(accessory, newParams)
-        }
+        accessory.control.externalLockUpdate(accessory, newParams)
         return true
       case 'sensor':
-        if (Object.keys(newParams).some(v => {
-          cns.devicesSensorParams.includes(v)
-        })) {
-          accessory.control.externalSensorUpdate(accessory, newParams)
-        }
+        accessory.control.externalSensorUpdate(accessory, newParams)
         return true
       case 'fan':
-        if (Object.keys(newParams).some(v => {
-          cns.devicesFanParams.includes(v)
-        })) {
-          accessory.control.externalFanUpdate(accessory, newParams)
-        }
+        accessory.control.externalFanUpdate(accessory, newParams)
         return true
       case 'thermostat':
-        if (Object.keys(newParams).some(v => {
-          cns.devicesThermostatParams.includes(v)
-        })) {
-          accessory.control.externalThermostatUpdate(accessory, newParams)
-        }
+        accessory.control.externalThermostatUpdate(accessory, newParams)
         return true
       case 'outlet':
-        if (Object.keys(newParams).some(v => {
-          cns.devicesOutletParams.includes(v)
-        })) {
-          accessory.control.externalOutletUpdate(accessory, newParams)
-        }
+        accessory.control.externalOutletUpdate(accessory, newParams)
         return true
       case 'usb':
-        if (Object.keys(newParams).some(v => {
-          cns.devicesUSBParams.includes(v)
-        }) && Array.isArray(newParams.switches)) {
-          accessory.control.externalUSBUpdate(accessory, newParams)
-        }
+        accessory.control.externalUSBUpdate(accessory, newParams)
         return true
       case 'scm':
-        if (Object.keys(newParams).some(v => {
-          cns.devicesSCMParams.includes(v)
-        }) && Array.isArray(newParams.switches)) {
-          accessory.control.externalSCMUpdate(accessory, newParams)
-        }
+        accessory.control.externalSCMUpdate(accessory, newParams)
         return true
       case 'light':
         if (
           cns.devicesSingleSwitch.includes(accessory.context.eweUIID) &&
           cns.devicesSingleSwitchLight.includes(accessory.context.eweModel)
         ) {
-          if (Object.keys(newParams).some(v => {
-            cns.devicesSingleSwitchLightParams.includes(v)
-          })) {
-            accessory.control.externalSingleLightUpdate(accessory, newParams)
-          }
+          accessory.control.externalSingleLightUpdate(accessory, newParams)
         } else if (
           cns.devicesMultiSwitch.includes(accessory.context.eweUIID) &&
           cns.devicesMultiSwitchLight.includes(accessory.context.eweModel)
         ) {
-          if (
-            Object.keys(newParams).some(v => {
-              cns.devicesMultiSwitchLightParams.includes(v)
-            }) && Array.isArray(newParams.switches)
-          ) {
-            accessory.control.externalMultiLightUpdate(accessory, newParams)
-          }
+          accessory.control.externalMultiLightUpdate(accessory, newParams)
         }
         return true
       case 'switch':
         if (cns.devicesSingleSwitch.includes(accessory.context.eweUIID)) {
-          if (Object.keys(newParams).some(v => {
-            cns.devicesSingleSwitchParams.includes(v)
-          })) {
-            accessory.control.externalSingleSwitchUpdate(accessory, newParams)
-          }
+          accessory.control.externalSingleSwitchUpdate(accessory, newParams)
         } else if (cns.devicesMultiSwitch.includes(accessory.context.eweUIID)) {
-          if (
-            Object.keys(newParams).some(v => {
-              cns.devicesMultiSwitchParams.includes(v)
-            }) && Array.isArray(newParams.switches)
-          ) {
-            accessory.control.externalMultiSwitchUpdate(accessory, newParams)
-          }
+          accessory.control.externalMultiSwitchUpdate(accessory, newParams)
         }
         return true
       case 'rf_pri':
-        if (Object.keys(newParams).some(v => {
-          cns.devicesRFBridgeParams.includes(v)
-        })) {
-          accessory.control.externalRFUpdate(accessory, newParams)
-        }
+        accessory.control.externalRFUpdate(accessory, newParams)
         return true
       case 'rf_sub':
         return true
       case 'zb_dev':
-        if (Object.keys(newParams).some(v => {
-          cns.devicesZBBridgeParams.includes(v)
-        })) {
-          accessory.control.externalZBUpdate(accessory, newParams)
-        }
+        accessory.control.externalZBUpdate(accessory, newParams)
         return true
       default:
         return false
@@ -1034,11 +964,10 @@ class eWeLink {
     try {
       await utils.sleep(Math.random() * 100 + 200)
       await this.lanClient.sendUpdate(payload)
-      return
     } catch (err) {
       if (accessory.context.reachableWAN) {
         if (this.debug) {
-          this.log.warn('[%s] Reverting to web socket as %s.', accessory.displayName, err)
+          this.log.warn('[%s] Reverting to web socket as %s.', accessory.displayName, err.message)
         }
         try {
           await this.wsClient.sendUpdate(payload)
diff --git a/lib/eWeLinkHTTP.js b/lib/eWeLinkHTTP.js
index 61572545..292de844 100644
--- a/lib/eWeLinkHTTP.js
+++ b/lib/eWeLinkHTTP.js
@@ -85,7 +85,7 @@ module.exports = class eWeLinkHTTP {
         await utils.sleep(30000)
         return this.getHost()
       } else {
-        throw new Error(err.message || err)
+        throw err
       }
     }
   }
@@ -171,7 +171,7 @@ module.exports = class eWeLinkHTTP {
         }
       }
     } catch (err) {
-      throw new Error(err.message || err)
+      throw err
     }
   }
 
@@ -216,7 +216,7 @@ module.exports = class eWeLinkHTTP {
         await utils.sleep(30000)
         return this.getDevices()
       } else {
-        throw new Error(err.message || err)
+        throw err
       }
     }
   }
@@ -260,7 +260,7 @@ module.exports = class eWeLinkHTTP {
         await utils.sleep(30000)
         return this.getDevice(deviceId)
       } else {
-        throw new Error(err.message || err)
+        throw err
       }
     }
   }
diff --git a/lib/eWeLinkLAN.js b/lib/eWeLinkLAN.js
index f2f49e1f..5a121315 100644
--- a/lib/eWeLinkLAN.js
+++ b/lib/eWeLinkLAN.js
@@ -42,7 +42,7 @@ module.exports = class eWeLinkLAN {
       })
       return this.deviceMap
     } catch (err) {
-      throw new Error(err)
+      throw err
     }
   }
 
@@ -163,7 +163,7 @@ module.exports = class eWeLinkLAN {
         }
       }
     } catch (err) {
-      throw new Error(err)
+      throw err
     }
   }
 
@@ -179,10 +179,12 @@ module.exports = class eWeLinkLAN {
     })
   }
 
-  closeConnection () {
-    dns.stopMonitoring().catch(err => {
-      if (this.debug) this.log.warn(err);
-    })
-    this.log('LAN monitoring gracefully stopped.')
+  async closeConnection () {
+    try {
+      await dns.stopMonitoring()
+      this.log('LAN monitoring gracefully stopped.')
+    } catch (err) {
+      throw err
+    }
   }
 }
diff --git a/lib/eWeLinkWS.js b/lib/eWeLinkWS.js
index 647eb091..9478517b 100644
--- a/lib/eWeLinkWS.js
+++ b/lib/eWeLinkWS.js
@@ -54,7 +54,7 @@ module.exports = class eWeLinkWS {
         await utils.sleep(30000)
         return this.getDevices()
       } else {
-        throw new Error(err.message || err)
+        throw err
       }
     }
   }
@@ -310,7 +310,7 @@ module.exports = class eWeLinkWS {
         this.log('Web socket gracefully closed.')
         return
       } catch (err) {
-        throw new Error(err)
+        throw err
       }
     }
   }

From 66909899291bc842a6b66e1b112f78ad3e63b225 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 27 Sep 2020 21:46:42 +0100
Subject: [PATCH 0248/3183] 3.1.3-0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 0b9fccd4..95960a98 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.1.2",
+  "version": "3.1.3-0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index f7d967f0..0b048b64 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.1.2",
+  "version": "3.1.3-0",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From c0173c8edf0575114268c9cda9b8c2ad0aa7b2a0 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 27 Sep 2020 22:09:22 +0100
Subject: [PATCH 0249/3183] Update eWeLink.js

---
 lib/eWeLink.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index fa08826e..1e818b4e 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -201,6 +201,11 @@ class eWeLink {
       if (!Object.prototype.hasOwnProperty.call(accessory.context, 'sensorType')) {
         accessory.context.sensorType = device.params.sensorType
       }
+      if (accessory.context.sensorType === 'DS18B20') {
+        if (accessory.getService(Service.HumiditySensor)) {
+          accessory.removeService(Service.HumiditySensor)
+        }
+      }
       //* ** @ENDUPGRADE ***\\
       if (accessory.context.sensorType !== device.params.sensorType) {
         accessory.context.sensorType = device.params.sensorType
@@ -600,10 +605,6 @@ class eWeLink {
           let humiService = false
           if (accessory.context.sensorType !== 'DS18B20') {
             humiService = accessory.getService(Service.HumiditySensor) || accessory.addService(Service.HumiditySensor)
-          } else {
-            if (accessory.getService(Service.HumiditySensor)) {
-              accessory.removeService(Service.HumiditySensor)
-            }
           }
           if (!this.config.hideTHSwitch) {
             const switchService = accessory.getService(Service.Switch) || accessory.addService(Service.Switch)
@@ -611,7 +612,7 @@ class eWeLink {
               .getCharacteristic(Characteristic.On)
               .on('set', (value, callback) => accessory.control.internalThermostatUpdate(accessory, value, callback))
           }
-          if (!(this.config.disableEveLogging || false)) {
+          if (!this.config.disableEveLogging) {
             accessory.log = this.log
             accessory.eveLogger = new EveHistoryService('weather', accessory, {
               storage: 'fs',

From ab59289c483ab6a0c14042aba2bb9e9ce2195121 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 27 Sep 2020 22:10:07 +0100
Subject: [PATCH 0250/3183] 3.1.3-1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 95960a98..b79c5a20 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.1.3-0",
+  "version": "3.1.3-1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 0b048b64..1700b110 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.1.3-0",
+  "version": "3.1.3-1",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 48d97100d0d90c2d2ed3d108e320380c1dd4c7cf Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 27 Sep 2020 22:22:13 +0100
Subject: [PATCH 0251/3183] no-useless-catch

---
 lib/eWeLinkHTTP.js | 140 ++++++++++++++++++++++-----------------------
 lib/eWeLinkLAN.js  | 140 ++++++++++++++++++++-------------------------
 lib/eWeLinkWS.js   |   9 +--
 3 files changed, 133 insertions(+), 156 deletions(-)

diff --git a/lib/eWeLinkHTTP.js b/lib/eWeLinkHTTP.js
index 292de844..10df3508 100644
--- a/lib/eWeLinkHTTP.js
+++ b/lib/eWeLinkHTTP.js
@@ -95,83 +95,79 @@ module.exports = class eWeLinkHTTP {
       countryCode: this.cCode,
       password: this.password
     }
-    try {
-      this.username.includes('@')
-        ? (data.email = this.username)
-        : (data.phoneNumber = this.username)
-      if (this.debugReqRes) {
-        const msg = JSON.stringify(data, null, 2)
-          .replace(this.password, '**hidden**')
-          .replace(this.username, '**hidden**')
-        this.log.warn(
-          'Sending HTTP login request. This text is yellow for clarity.\n%s',
-          msg
-        )
-      } else if (this.debug) {
-        this.log('Sending HTTP login request.')
-      }
-      const dataToSign = crypto
-        .createHmac('sha256', constants.appSecret)
-        .update(JSON.stringify(data))
-        .digest('base64')
-      const res = await axios.post(
-        'https://' + this.httpHost + '/v2/user/login',
-        data, {
-          headers: {
-            Authorization: 'Sign ' + dataToSign,
-            'Content-Type': 'application/json',
-            Host: this.httpHost,
-            'X-CK-Appid': constants.appId,
-            'X-CK-Nonce': Math.random().toString(36).substr(2, 8)
-          }
-        }
+    this.username.includes('@')
+      ? (data.email = this.username)
+      : (data.phoneNumber = this.username)
+    if (this.debugReqRes) {
+      const msg = JSON.stringify(data, null, 2)
+        .replace(this.password, '**hidden**')
+        .replace(this.username, '**hidden**')
+      this.log.warn(
+        'Sending HTTP login request. This text is yellow for clarity.\n%s',
+        msg
       )
-      const body = res.data
-      if (
-        Object.prototype.hasOwnProperty.call(body, 'error') &&
-        body.error === 10004 &&
-        Object.prototype.hasOwnProperty.call(body, 'data') &&
-        Object.prototype.hasOwnProperty.call(body.data, 'region')
-      ) {
-        const givenRegion = body.data.region
-        switch (givenRegion) {
-          case 'eu':
-          case 'us':
-          case 'as':
-            this.httpHost = givenRegion + '-apia.coolkit.cc'
-            break
-          case 'cn':
-            this.httpHost = 'cn-apia.coolkit.cn'
-            break
-          default:
-            throw new Error('No valid region received - [' + givenRegion + '].')
-        }
-        if (this.debug) {
-          this.log('New HTTP API host received [%s].', this.httpHost)
+    } else if (this.debug) {
+      this.log('Sending HTTP login request.')
+    }
+    const dataToSign = crypto
+      .createHmac('sha256', constants.appSecret)
+      .update(JSON.stringify(data))
+      .digest('base64')
+    const res = await axios.post(
+      'https://' + this.httpHost + '/v2/user/login',
+      data, {
+        headers: {
+          Authorization: 'Sign ' + dataToSign,
+          'Content-Type': 'application/json',
+          Host: this.httpHost,
+          'X-CK-Appid': constants.appId,
+          'X-CK-Nonce': Math.random().toString(36).substr(2, 8)
         }
-        return this.login()
       }
-      if (body.data.at) {
-        this.aToken = body.data.at
-        this.apiKey = body.data.user.apikey
-        return {
-          aToken: this.aToken,
-          apiKey: this.apiKey,
-          httpHost: this.httpHost
-        }
+    )
+    const body = res.data
+    if (
+      Object.prototype.hasOwnProperty.call(body, 'error') &&
+      body.error === 10004 &&
+      Object.prototype.hasOwnProperty.call(body, 'data') &&
+      Object.prototype.hasOwnProperty.call(body.data, 'region')
+    ) {
+      const givenRegion = body.data.region
+      switch (givenRegion) {
+        case 'eu':
+        case 'us':
+        case 'as':
+          this.httpHost = givenRegion + '-apia.coolkit.cc'
+          break
+        case 'cn':
+          this.httpHost = 'cn-apia.coolkit.cn'
+          break
+        default:
+          throw new Error('No valid region received - [' + givenRegion + '].')
+      }
+      if (this.debug) {
+        this.log('New HTTP API host received [%s].', this.httpHost)
+      }
+      return this.login()
+    }
+    if (body.data.at) {
+      this.aToken = body.data.at
+      this.apiKey = body.data.user.apikey
+      return {
+        aToken: this.aToken,
+        apiKey: this.apiKey,
+        httpHost: this.httpHost
+      }
+    } else {
+      if (body.error === 500) {
+        this.log.warn(
+          'An eWeLink error [500] occured. Retrying in 30 seconds.'
+        )
+        await utils.sleep(30000)
+        return this.login()
       } else {
-        if (body.error === 500) {
-          this.log.warn(
-            'An eWeLink error [500] occured. Retrying in 30 seconds.'
-          )
-          await utils.sleep(30000)
-          return this.login()
-        } else {
-          throw new Error('No auth token received.\n' + JSON.stringify(body, null, 2))
-        }
+        throw new Error('No auth token received.\n' + JSON.stringify(body, null, 2))
       }
-    } catch (err) {
-      throw err
     }
   }
 
diff --git a/lib/eWeLinkLAN.js b/lib/eWeLinkLAN.js
index 5a121315..7d4a7226 100644
--- a/lib/eWeLinkLAN.js
+++ b/lib/eWeLinkLAN.js
@@ -23,27 +23,23 @@ module.exports = class eWeLinkLAN {
   }
 
   async getHosts () {
-    try {
-      const res = await dns.discover({
-        name: '_ewelink._tcp.local'
-      })
-      res.forEach(device => {
-        let d
-        const deviceId = device.fqdn.replace('._ewelink._tcp.local', '').replace('eWeLink_', '')
-        if ((d = this.deviceMap.get(deviceId))) {
-          if (!Object.prototype.hasOwnProperty.call(this.ipOverrides, deviceId)) {
-            this.deviceMap.set(deviceId, {
-              apiKey: d.apiKey,
-              online: true,
-              ip: device.address
-            })
-          }
+    const res = await dns.discover({
+      name: '_ewelink._tcp.local'
+    })
+    res.forEach(device => {
+      let d
+      const deviceId = device.fqdn.replace('._ewelink._tcp.local', '').replace('eWeLink_', '')
+      if ((d = this.deviceMap.get(deviceId))) {
+        if (!Object.prototype.hasOwnProperty.call(this.ipOverrides, deviceId)) {
+          this.deviceMap.set(deviceId, {
+            apiKey: d.apiKey,
+            online: true,
+            ip: device.address
+          })
         }
-      })
-      return this.deviceMap
-    } catch (err) {
-      throw err
-    }
+      }
+    })
+    return this.deviceMap
   }
 
   startMonitor () {
@@ -110,60 +106,54 @@ module.exports = class eWeLinkLAN {
   }
 
   async sendUpdate (json) {
-    try {
-      if (!this.deviceMap.get(json.deviceid).online) {
-        throw new Error("device isn't reachable via LAN mode")
+    if (!this.deviceMap.get(json.deviceid).online) {
+      throw new Error("device isn't reachable via LAN mode")
+    }
+    let apiKey
+    let suffix
+    const params = {}
+    if (Object.prototype.hasOwnProperty.call(json.params, 'switches')) {
+      params.switches = json.params.switches
+      suffix = 'switches'
+    } else if (Object.prototype.hasOwnProperty.call(json.params, 'switch')) {
+      params.switch = json.params.switch
+      suffix = 'switch'
+    } else {
+      throw new Error("device isn't reachable via LAN mode")
+    }
+    if ((apiKey = this.deviceMap.get(json.deviceid).apiKey)) {
+      const key = crypto.createHash('md5').update(Buffer.from(apiKey, 'utf8')).digest()
+      const iv = crypto.randomBytes(16)
+      const enc = crypto.createCipheriv('aes-128-cbc', key, iv)
+      const data = {
+        data: Buffer.concat([enc.update(JSON.stringify(params)), enc.final()]).toString('base64'),
+        deviceid: json.deviceid,
+        encrypt: true,
+        iv: iv.toString('base64'),
+        selfApikey: '123',
+        sequence: Date.now().toString()
       }
-      let apiKey
-      let suffix
-      const params = {}
-      if (Object.prototype.hasOwnProperty.call(json.params, 'switches')) {
-        params.switches = json.params.switches
-        suffix = 'switches'
-      } else if (Object.prototype.hasOwnProperty.call(json.params, 'switch')) {
-        params.switch = json.params.switch
-        suffix = 'switch'
-      } else {
-        throw new Error("device isn't reachable via LAN mode")
+      if (this.debugReqRes) {
+        const msg = JSON.stringify(json, null, 2)
+          .replace(json.apikey, '**hidden**')
+          .replace(json.apikey, '**hidden**')
+          .replace(json.deviceid, '**hidden**')
+        this.log.warn('LAN message sent. This text is yellow for clarity.\n%s', msg)
+      } else if (this.debug) {
+        this.log('LAN message sent.')
       }
-      if ((apiKey = this.deviceMap.get(json.deviceid).apiKey)) {
-        const key = crypto.createHash('md5').update(Buffer.from(apiKey, 'utf8')).digest()
-        const iv = crypto.randomBytes(16)
-        const enc = crypto.createCipheriv('aes-128-cbc', key, iv)
-        const data = {
-          data: Buffer.concat([enc.update(JSON.stringify(params)), enc.final()]).toString('base64'),
-          deviceid: json.deviceid,
-          encrypt: true,
-          iv: iv.toString('base64'),
-          selfApikey: '123',
-          sequence: Date.now().toString()
-        }
-        if (this.debugReqRes) {
-          const msg = JSON.stringify(json, null, 2)
-            .replace(json.apikey, '**hidden**')
-            .replace(json.apikey, '**hidden**')
-            .replace(json.deviceid, '**hidden**')
-          this.log.warn('LAN message sent. This text is yellow for clarity.\n%s', msg)
-        } else if (this.debug) {
-          this.log('LAN message sent.')
-        }
-        const res = await axios({
-          method: 'post',
-          url: 'http://' + this.deviceMap.get(json.deviceid).ip + ':8081/zeroconf/' + suffix,
-          headers: {
-            Accept: 'application/json',
-            'Content-Type': 'application/json'
-          },
-          data
-        })
-        if (Object.prototype.hasOwnProperty.call(res.data, 'error') && res.data.error === 0) {
-          return
-        } else {
-          throw new Error(res.data)
-        }
+      const res = await axios({
+        method: 'post',
+        url: 'http://' + this.deviceMap.get(json.deviceid).ip + ':8081/zeroconf/' + suffix,
+        headers: {
+          Accept: 'application/json',
+          'Content-Type': 'application/json'
+        },
+        data
+      })
+      if (!Object.prototype.hasOwnProperty.call(res.data, 'error') || res.data.error !== 0) {
+        throw new Error(res.data)
       }
-    } catch (err) {
-      throw err
     }
   }
 
@@ -180,11 +170,7 @@ module.exports = class eWeLinkLAN {
   }
 
   async closeConnection () {
-    try {
-      await dns.stopMonitoring()
-      this.log('LAN monitoring gracefully stopped.')
-    } catch (err) {
-      throw err
-    }
+    await dns.stopMonitoring()
+    this.log('LAN monitoring gracefully stopped.')
   }
 }
diff --git a/lib/eWeLinkWS.js b/lib/eWeLinkWS.js
index 9478517b..137035d2 100644
--- a/lib/eWeLinkWS.js
+++ b/lib/eWeLinkWS.js
@@ -305,13 +305,8 @@ module.exports = class eWeLinkWS {
 
   async closeConnection () {
     if (this.wsp && this.wsIsOpen) {
-      try {
-        await this.wsp.close()
-        this.log('Web socket gracefully closed.')
-        return
-      } catch (err) {
-        throw err
-      }
+      await this.wsp.close()
+      this.log('Web socket gracefully closed.')
     }
   }
 }

From 013f1941ad9b73497cc3fa814eedd855415a54ca Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 27 Sep 2020 22:32:31 +0100
Subject: [PATCH 0252/3183] error handling

---
 lib/eWeLink.js   | 7 +------
 lib/eWeLinkWS.js | 2 +-
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index 1e818b4e..7393124f 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -970,12 +970,7 @@ class eWeLink {
         if (this.debug) {
           this.log.warn('[%s] Reverting to web socket as %s.', accessory.displayName, err.message)
         }
-        try {
-          await this.wsClient.sendUpdate(payload)
-          return
-        } catch (err) {
-          throw new Error(err)
-        }
+        await this.wsClient.sendUpdate(payload)
       } else {
         throw new Error("it is unreachable. It's status will be corrected once it is reachable")
       }
diff --git a/lib/eWeLinkWS.js b/lib/eWeLinkWS.js
index 137035d2..a6adfc5b 100644
--- a/lib/eWeLinkWS.js
+++ b/lib/eWeLinkWS.js
@@ -254,7 +254,7 @@ module.exports = class eWeLinkWS {
             throw new Error('Unknown response')
         }
       } catch (err) {
-        throw new Error('device update failed [' + err + ']')
+        throw new Error('device update failed [' + err.message + ']')
       }
     } else {
       if (this.debug) {

From c186dea4aa99be2f897fe623214c5e69014ad691 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 27 Sep 2020 22:41:49 +0100
Subject: [PATCH 0253/3183] 3.1.3

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b79c5a20..429c84d8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.1.3-1",
+  "version": "3.1.3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 1700b110..12f96bd0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.1.3-1",
+  "version": "3.1.3",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From a6218f03169b68135f3f831083fd81417c125fea Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 28 Sep 2020 10:20:53 +0100
Subject: [PATCH 0254/3183] cleaning up + improved error

---
 lib/constants.js         |   1 +
 lib/device/blind.js      |  29 +------
 lib/device/curtain.js    |  19 +++--
 lib/device/fan.js        |   4 +-
 lib/device/garage.js     |   7 +-
 lib/device/light.js      |  16 ++--
 lib/device/lock.js       |   5 +-
 lib/device/outlet.js     |  26 +++---
 lib/device/rf-sub.js     |   9 +-
 lib/device/scm.js        |   8 +-
 lib/device/sensor.js     |   5 +-
 lib/device/switch.js     |  13 +--
 lib/device/thermostat.js |   4 +-
 lib/device/usb.js        |   8 +-
 lib/device/valve.js      |   5 +-
 lib/device/zb-dev.js     |   6 +-
 lib/eWeLink.js           |  42 ++++++----
 lib/eWeLinkHTTP.js       | 172 ++++++++++++++-------------------------
 lib/eWeLinkLAN.js        |  19 +++--
 lib/eWeLinkWS.js         | 112 ++++++++-----------------
 20 files changed, 209 insertions(+), 301 deletions(-)

diff --git a/lib/constants.js b/lib/constants.js
index 72090079..ba6d44fa 100644
--- a/lib/constants.js
+++ b/lib/constants.js
@@ -2,6 +2,7 @@
 module.exports = {
   appId: 'oeVkj2lYFGnJu5XUtWisfW4utiN4u9Mq',
   appSecret: '6Nz4n0xA8s8qdxQf2GqurZj2Fs55FUvM',
+  httpRetryCodes: ['ENOTFOUND', 'ETIMEDOUT', 'EAI_AGAIN'],
   allowedGroups: ['blind', 'garage', 'lock', 'valve'],
   devicesHideable: ['switch', 'light'],
   devicesNonLAN: [22, 28, 59, 102],
diff --git a/lib/device/blind.js b/lib/device/blind.js
index 13ea726e..9223338a 100644
--- a/lib/device/blind.js
+++ b/lib/device/blind.js
@@ -29,48 +29,21 @@ module.exports = class deviceBlind {
       params.switches = cns.defaultMultiSwitchOff
       accessory.context.updateKey = updateKey
       const percentStepPerDecisecond = blindConfig.operationTime / 100
-      //
-      //
-      this.platform.log('============================')
-      this.platform.log('============================')
-      this.platform.log('Starting main calculation...')
-      //
-      //
       if (prevState !== 2) {
         await this.platform.sendDeviceUpdate(accessory, params)
         let positionPercentChange = Math.floor(Date.now() / 100) - accessory.context.cacheLastStartTime
         positionPercentChange = Math.floor(percentStepPerDecisecond * positionPercentChange)
         if (prevState === 0) {
-          // moving down
           prevPosition -= positionPercentChange
         } else {
           prevPosition += positionPercentChange
         }
         wcService.updateCharacteristic(Characteristic.CurrentPosition, prevPosition)
         accessory.context.cacheCurrentPosition = prevPosition
-        this.platform.log.warn('Moving from [%s%] to [%s%]', prevPosition, newTarget)
-        this.platform.log.warn(
-          'Blind was already moving %s when it was changed and was probably around %s%',
-          prevState === 1 ? 'up' : 'down',
-          prevPosition
-        )
-        this.platform.log.warn(
-          'Giving a difference of %s seconds -  a position change of %s%',
-          (Math.floor(Date.now() / 100) - accessory.context.cacheLastStartTime) / 10,
-          positionPercentChange
-        )
-      } else {
-        this.platform.log('Moving from [%s%] to [%s%].', prevPosition, newTarget)
       }
       const diffPosition = newTarget - prevPosition
       const setToMoveUp = diffPosition > 0
       const decisecondsToMove = Math.round(Math.abs(diffPosition) * percentStepPerDecisecond)
-      this.platform.log(
-        'So we need to move %s from the previous state of %s for about %s seconds',
-        setToMoveUp ? 'up' : 'down',
-        prevState === 0 ? 'moving down' : prevState === 1 ? 'moving up' : 'stopped',
-        decisecondsToMove / 10
-      )
       params.switches[0].switch = setToMoveUp ? 'on' : 'off'
       params.switches[1].switch = setToMoveUp ? 'off' : 'on'
       await this.platform.sendDeviceUpdate(accessory, params)
@@ -91,7 +64,7 @@ module.exports = class deviceBlind {
       accessory.context.cachePositionState = 2
       accessory.context.cacheCurrentPosition = newTarget
     } catch (err) {
-      this.platform.requestDeviceRefresh(accessory, err)
+      this.platform.deviceUpdateError(accessory, err, true)
     }
   }
 }
diff --git a/lib/device/curtain.js b/lib/device/curtain.js
index 95ab6086..73e5fc3f 100644
--- a/lib/device/curtain.js
+++ b/lib/device/curtain.js
@@ -30,24 +30,25 @@ module.exports = class deviceCurtain {
         .updateCharacteristic(Characteristic.PositionState, newPos > prevPos ? 1 : 0)
       accessory.context.cacheCurrentPosition = newPos
     } catch (err) {
-      this.platform.requestDeviceRefresh(accessory, err)
+      this.platform.deviceUpdateError(accessory, err, true)
     }
   }
 
   externalCurtainUpdate (accessory, params) {
     try {
       const cService = accessory.getService(Service.WindowCovering)
-      if (Object.prototype.hasOwnProperty.call(params, 'switch') && Object.prototype.hasOwnProperty.call(params, 'setclose')) {
-        const newPos = Math.abs(100 - parseInt(params.setclose))
-        cService
-          .updateCharacteristic(Characteristic.TargetPosition, newPos)
-          .updateCharacteristic(Characteristic.CurrentPosition, newPos)
-          .updateCharacteristic(Characteristic.PositionState, 2)
-        accessory.context.cacheCurrentPosition = newPos
+      if (!Object.prototype.hasOwnProperty.call(params, 'switch') && !Object.prototype.hasOwnProperty.call(params, 'setclose')) {
         return
       }
+      const newPos = Math.abs(100 - parseInt(params.setclose))
+      cService
+        .updateCharacteristic(Characteristic.TargetPosition, newPos)
+        .updateCharacteristic(Characteristic.CurrentPosition, newPos)
+        .updateCharacteristic(Characteristic.PositionState, 2)
+      accessory.context.cacheCurrentPosition = newPos
+      return
     } catch (err) {
-      this.platform.log.warn('[%s] could not be updated as %s.', accessory.displayName, err)
+      this.platform.deviceUpdateError(accessory, err, false)
     }
   }
 }
diff --git a/lib/device/fan.js b/lib/device/fan.js
index 09323633..9e829390 100644
--- a/lib/device/fan.js
+++ b/lib/device/fan.js
@@ -45,7 +45,7 @@ module.exports = class deviceFan {
         .updateCharacteristic(Characteristic.Active, newPower)
         .updateCharacteristic(Characteristic.RotationSpeed, newSpeed)
     } catch (err) {
-      this.platform.requestDeviceRefresh(accessory, err)
+      this.platform.deviceUpdateError(accessory, err, true)
     }
   }
 
@@ -87,7 +87,7 @@ module.exports = class deviceFan {
         .updateCharacteristic(Characteristic.Active, status)
         .updateCharacteristic(Characteristic.RotationSpeed, speed)
     } catch (err) {
-      this.platform.log.warn('[%s] could not be updated as %s.', accessory.displayName, err)
+      this.platform.deviceUpdateError(accessory, err, false)
     }
   }
 }
diff --git a/lib/device/garage.js b/lib/device/garage.js
index 30ec61ec..5f4cd1dc 100644
--- a/lib/device/garage.js
+++ b/lib/device/garage.js
@@ -68,12 +68,15 @@ module.exports = class deviceGarage {
       }
       accessory.context.inUse = false
     } catch (err) {
-      this.platform.requestDeviceRefresh(accessory, err)
+      this.platform.deviceUpdateError(accessory, err, true)
     }
   }
 
   externalGarageUpdate (accessory, params) {
     try {
+      if (!Object.prototype.hasOwnProperty.call(params, 'switch') && !Object.prototype.hasOwnProperty.call(params, 'switches')) {
+        return
+      }
       let garageConfig
       const gcService = accessory.getService(Service.GarageDoorOpener)
       const prevState = accessory.context.cacheCurrentDoorState
@@ -119,7 +122,7 @@ module.exports = class deviceGarage {
       }, parseInt(garageConfig.operationTime) * 100)
     } catch (err) {
       accessory.context.inUse = false
-      this.platform.log.warn('[%s] could not be updated as %s.', accessory.displayName, err)
+      this.platform.deviceUpdateError(accessory, err, false)
     }
   }
 }
diff --git a/lib/device/light.js b/lib/device/light.js
index 42006e45..cd8fe085 100644
--- a/lib/device/light.js
+++ b/lib/device/light.js
@@ -1,5 +1,6 @@
 'use strict'
 let Characteristic, Service
+const cns = require('./../constants')
 const convert = require('color-convert')
 const utils = require('./../utils')
 module.exports = class deviceLight {
@@ -25,7 +26,7 @@ module.exports = class deviceLight {
           }
           break
         case '0':
-          params.switches = this.platform.devicesInEW.get(accessory.context.eweDeviceId).params.switches
+          params.switches = cns.defaultMultiSwitchOff
           params.switches[0].switch = value ? 'on' : 'off'
           params.switches[1].switch = value ? 'on' : 'off'
           params.switches[2].switch = value ? 'on' : 'off'
@@ -35,7 +36,7 @@ module.exports = class deviceLight {
         case '2':
         case '3':
         case '4':
-          params.switches = this.platform.devicesInEW.get(accessory.context.eweDeviceId).params.switches
+          params.switches = cns.defaultMultiSwitchOff
           for (let i = 1; i <= 4; i++) {
             if ((oAccessory = this.platform.devicesInHB.get(accessory.context.eweDeviceId + 'SW' + i))) {
               i === parseInt(accessory.context.switchNumber)
@@ -84,7 +85,7 @@ module.exports = class deviceLight {
         }
       }
     } catch (err) {
-      this.platform.requestDeviceRefresh(accessory, err)
+      this.platform.deviceUpdateError(accessory, err, true)
     }
   }
 
@@ -117,7 +118,7 @@ module.exports = class deviceLight {
         lightService.updateCharacteristic(Characteristic.Brightness, value)
       }
     } catch (err) {
-      this.platform.requestDeviceRefresh(accessory, err)
+      this.platform.deviceUpdateError(accessory, err, true)
     }
   }
 
@@ -188,7 +189,7 @@ module.exports = class deviceLight {
           break
       }
     } catch (err) {
-      this.platform.requestDeviceRefresh(accessory, err)
+      this.platform.deviceUpdateError(accessory, err, true)
     }
   }
 
@@ -260,12 +261,13 @@ module.exports = class deviceLight {
         lightService.updateCharacteristic(Characteristic.On, false)
       }
     } catch (err) {
-      this.platform.log.warn('[%s] could not be updated as %s.', accessory.displayName, err)
+      this.platform.deviceUpdateError(accessory, err, false)
     }
   }
 
   externalMultiLightUpdate (accessory, params) {
     try {
+      if (!Object.prototype.hasOwnProperty.call(params, 'switches')) return
       const idToCheck = accessory.context.hbDeviceId.slice(0, -1)
       let primaryState = false
       for (let i = 1; i <= accessory.context.channelCount; i++) {
@@ -283,7 +285,7 @@ module.exports = class deviceLight {
         accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, primaryState)
       }
     } catch (err) {
-      this.platform.log.warn('[%s] could not be updated as %s.', accessory.displayName, err)
+      this.platform.deviceUpdateError(accessory, err, false)
     }
   }
 }
diff --git a/lib/device/lock.js b/lib/device/lock.js
index 93278892..e82e3882 100644
--- a/lib/device/lock.js
+++ b/lib/device/lock.js
@@ -33,12 +33,13 @@ module.exports = class deviceLock {
         .updateCharacteristic(Characteristic.LockCurrentState, 1)
       accessory.context.inUse = false
     } catch (err) {
-      this.platform.requestDeviceRefresh(accessory, err)
+      this.platform.deviceUpdateError(accessory, err, true)
     }
   }
 
   externalLockUpdate (accessory, params) {
     try {
+      if (!Object.prototype.hasOwnProperty.call(params, 'switch')) return
       let lockConfig
       const lmService = accessory.getService(Service.LockMechanism)
       if (!(lockConfig = this.platform.cusG.get(accessory.context.hbDeviceId))) {
@@ -62,7 +63,7 @@ module.exports = class deviceLock {
       }, parseInt(lockConfig.operationTime) * 100)
     } catch (err) {
       accessory.context.inUse = false
-      this.platform.log.warn('[%s] could not be updated as %s.', accessory.displayName, err)
+      this.platform.deviceUpdateError(accessory, err, false)
     }
   }
 }
diff --git a/lib/device/outlet.js b/lib/device/outlet.js
index 8696dc36..c244e42f 100644
--- a/lib/device/outlet.js
+++ b/lib/device/outlet.js
@@ -19,7 +19,7 @@ module.exports = class deviceOutlet {
       await this.platform.sendDeviceUpdate(accessory, params)
       outletService.updateCharacteristic(Characteristic.On, value)
     } catch (err) {
-      this.platform.requestDeviceRefresh(accessory, err)
+      this.platform.deviceUpdateError(accessory, err, true)
     }
   }
 
@@ -28,21 +28,23 @@ module.exports = class deviceOutlet {
       const outletService = accessory.getService(Service.Outlet)
       if (Object.prototype.hasOwnProperty.call(params, 'switch')) {
         outletService.updateCharacteristic(Characteristic.On, params.switch === 'on')
-        if (accessory.context.eweModel === 'S26' || this.platform.config.disableEveLogging || false) {
+        if (accessory.context.eweModel === 'S26' || this.platform.config.disableEveLogging) {
           outletService.updateCharacteristic(Characteristic.OutletInUse, params.switch === 'on')
         }
       }
       if (Object.prototype.hasOwnProperty.call(params, 'power')) {
         outletService.updateCharacteristic(EveService.Characteristics.CurrentConsumption, parseFloat(params.power))
-        outletService.updateCharacteristic(
-          Characteristic.OutletInUse,
-          parseFloat(params.power) > (this.platform.config.inUsePowerThreshold || 0)
-        )
-        const isOn = accessory.getService(Service.Outlet).getCharacteristic(Characteristic.On).value
-        accessory.eveLogger.addEntry({
-          time: Date.now(),
-          power: isOn ? parseFloat(params.power) : 0
-        })
+        if (accessory.context.eweModel !== 'S26' && !this.platform.config.disableEveLogging) {
+          outletService.updateCharacteristic(
+            Characteristic.OutletInUse,
+            parseFloat(params.power) > (this.platform.config.inUsePowerThreshold || 0)
+          )
+          const isOn = accessory.getService(Service.Outlet).getCharacteristic(Characteristic.On).value
+          accessory.eveLogger.addEntry({
+            time: Date.now(),
+            power: isOn ? parseFloat(params.power) : 0
+          })
+        }
       }
       if (Object.prototype.hasOwnProperty.call(params, 'voltage')) {
         outletService.updateCharacteristic(EveService.Characteristics.Voltage, parseFloat(params.voltage))
@@ -51,7 +53,7 @@ module.exports = class deviceOutlet {
         outletService.updateCharacteristic(EveService.Characteristics.ElectricCurrent, parseFloat(params.current))
       }
     } catch (err) {
-      this.platform.log.warn('[%s] could not be updated as %s.', accessory.displayName, err)
+      this.platform.deviceUpdateError(accessory, err, false)
     }
   }
 }
diff --git a/lib/device/rf-sub.js b/lib/device/rf-sub.js
index 3bf3320c..e1800637 100644
--- a/lib/device/rf-sub.js
+++ b/lib/device/rf-sub.js
@@ -21,7 +21,7 @@ module.exports = class deviceRFSub {
       await utils.sleep(3000)
       rfService.updateCharacteristic(Characteristic.On, false)
     } catch (err) {
-      this.platform.requestDeviceRefresh(accessory, err)
+      this.platform.deviceUpdateError(accessory, err, true)
     }
   }
 
@@ -31,8 +31,6 @@ module.exports = class deviceRFSub {
       const timeNow = new Date()
       let oAccessory = false
       if (Object.prototype.hasOwnProperty.call(params, 'cmd') && params.cmd === 'transmit' && Object.prototype.hasOwnProperty.call(params, 'rfChl')) {
-        //* ** RF Button ***\\
-        // the device needed is SW% corresponding to params.rfChl
         this.platform.devicesInHB.forEach(acc => {
           if (
             acc.context.eweDeviceId === accessory.context.eweDeviceId &&
@@ -109,15 +107,12 @@ module.exports = class deviceRFSub {
                 setTimeout(() => {
                   oAccessory.getService(serv).updateCharacteristic(char, 0)
                 }, (this.platform.config.sensorTimeLength || 2) * 1000)
-                if (this.platform.debug) {
-                  this.platform.log('[%s] has detected [%s].', oAccessory.displayName, oAccessory.context.sensorType)
-                }
               }
             }
           })
       }
     } catch (err) {
-      this.platform.log.warn('[%s] could not be updated as %s.', accessory.displayName, err)
+      this.platform.deviceUpdateError(accessory, err, false)
     }
   }
 }
diff --git a/lib/device/scm.js b/lib/device/scm.js
index 276c385f..501bdb29 100644
--- a/lib/device/scm.js
+++ b/lib/device/scm.js
@@ -1,5 +1,6 @@
 'use strict'
 let Characteristic, Service
+const cns = require('./../constants')
 module.exports = class deviceSCM {
   constructor (platform) {
     this.platform = platform
@@ -11,22 +12,23 @@ module.exports = class deviceSCM {
     callback()
     try {
       const params = {
-        switches: this.platform.devicesInEW.get(accessory.context.eweDeviceId).params.switches
+        switches: cns.defaultMultiSwitchOff
       }
       const switchService = accessory.getService(Service.Switch)
       params.switches[0].switch = value ? 'on' : 'off'
       await this.platform.sendDeviceUpdate(accessory, params)
       switchService.updateCharacteristic(Characteristic.On, value)
     } catch (err) {
-      this.platform.requestDeviceRefresh(accessory, err)
+      this.platform.deviceUpdateError(accessory, err, true)
     }
   }
 
   externalSCMUpdate (accessory, params) {
     try {
+      if (!Object.prototype.hasOwnProperty.call(params, 'switches')) return
       accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, params.switches[0].switch === 'on')
     } catch (err) {
-      this.platform.log.warn('[%s] could not be updated as %s.', accessory.displayName, err)
+      this.platform.deviceUpdateError(accessory, err, false)
     }
   }
 }
diff --git a/lib/device/sensor.js b/lib/device/sensor.js
index b16f3a5c..844bca01 100644
--- a/lib/device/sensor.js
+++ b/lib/device/sensor.js
@@ -19,6 +19,7 @@ module.exports = class deviceSensor {
           scaledBattery < (this.platform.config.lowBattThreshold || 25)
         )
       }
+      if (!Object.prototype.hasOwnProperty.call(params, 'switch')) return
       const newState = params.switch === 'on' ? 1 : 0
       let oAccessory = false
       const contactService = accessory.getService(Service.ContactSensor)
@@ -41,14 +42,12 @@ module.exports = class deviceSensor {
                     .updateCharacteristic(Characteristic.CurrentDoorState, 0)
                 }, group.operationTime * 100)
                 break
-              default:
-                throw new Error('unknown sensor status received [' + newState + ']')
             }
           }
         }
       })
     } catch (err) {
-      this.platform.log.warn('[%s] could not be updated as %s.', accessory.displayName, err)
+      this.platform.deviceUpdateError(accessory, err, false)
     }
   }
 }
diff --git a/lib/device/switch.js b/lib/device/switch.js
index 0f49f802..9a70c3c1 100644
--- a/lib/device/switch.js
+++ b/lib/device/switch.js
@@ -1,5 +1,6 @@
 'use strict'
 let Characteristic, Service
+const cns = require('./../constants')
 module.exports = class deviceSwitch {
   constructor (platform) {
     this.platform = platform
@@ -18,7 +19,7 @@ module.exports = class deviceSwitch {
           params.switch = value ? 'on' : 'off'
           break
         case '0':
-          params.switches = this.platform.devicesInEW.get(accessory.context.eweDeviceId).params.switches
+          params.switches = cns.defaultMultiSwitchOff
           params.switches[0].switch = value ? 'on' : 'off'
           params.switches[1].switch = value ? 'on' : 'off'
           params.switches[2].switch = value ? 'on' : 'off'
@@ -28,7 +29,7 @@ module.exports = class deviceSwitch {
         case '2':
         case '3':
         case '4':
-          params.switches = this.platform.devicesInEW.get(accessory.context.eweDeviceId).params.switches
+          params.switches = cns.defaultMultiSwitchOff
           for (let i = 1; i <= 4; i++) {
             if ((oAccessory = this.platform.devicesInHB.get(accessory.context.eweDeviceId + 'SW' + i))) {
               i === parseInt(accessory.context.switchNumber)
@@ -77,20 +78,22 @@ module.exports = class deviceSwitch {
         }
       }
     } catch (err) {
-      this.platform.requestDeviceRefresh(accessory, err)
+      this.platform.deviceUpdateError(accessory, err, true)
     }
   }
 
   externalSingleSwitchUpdate (accessory, params) {
     try {
+      if (!Object.prototype.hasOwnProperty.call(params, 'switch')) return
       accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, params.switch === 'on')
     } catch (err) {
-      this.platform.log.warn('[%s] could not be updated as %s.', accessory.displayName, err)
+      this.platform.deviceUpdateError(accessory, err, false)
     }
   }
 
   externalMultiSwitchUpdate (accessory, params) {
     try {
+      if (!Object.prototype.hasOwnProperty.call(params, 'switches')) return
       const idToCheck = accessory.context.hbDeviceId.slice(0, -1)
       let primaryState = false
       for (let i = 1; i <= accessory.context.channelCount; i++) {
@@ -108,7 +111,7 @@ module.exports = class deviceSwitch {
         accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, primaryState)
       }
     } catch (err) {
-      this.platform.log.warn('[%s] could not be updated as %s.', accessory.displayName, err)
+      this.platform.deviceUpdateError(accessory, err, false)
     }
   }
 }
diff --git a/lib/device/thermostat.js b/lib/device/thermostat.js
index a5d5f2b0..ba86d219 100644
--- a/lib/device/thermostat.js
+++ b/lib/device/thermostat.js
@@ -18,7 +18,7 @@ module.exports = class deviceThermostat {
       await this.platform.sendDeviceUpdate(accessory, params)
       switchService.updateCharacteristic(Characteristic.On, value)
     } catch (err) {
-      this.platform.requestDeviceRefresh(accessory, err)
+      this.platform.deviceUpdateError(accessory, err, true)
     }
   }
 
@@ -55,7 +55,7 @@ module.exports = class deviceThermostat {
         }
       }
     } catch (err) {
-      this.platform.log.warn('[%s] could not be updated as %s.', accessory.displayName, err)
+      this.platform.deviceUpdateError(accessory, err, false)
     }
   }
 }
diff --git a/lib/device/usb.js b/lib/device/usb.js
index d78cf020..67a58833 100644
--- a/lib/device/usb.js
+++ b/lib/device/usb.js
@@ -1,5 +1,6 @@
 'use strict'
 let Characteristic, Service
+const cns = require('./../constants')
 module.exports = class deviceUSB {
   constructor (platform) {
     this.platform = platform
@@ -11,22 +12,23 @@ module.exports = class deviceUSB {
     callback()
     try {
       const params = {
-        switches: this.platform.devicesInEW.get(accessory.context.eweDeviceId).params.switches
+        switches: cns.defaultMultiSwitchOff
       }
       const outletService = accessory.getService(Service.Outlet)
       params.switches[0].switch = value ? 'on' : 'off'
       await this.platform.sendDeviceUpdate(accessory, params)
       outletService.updateCharacteristic(Characteristic.On, value)
     } catch (err) {
-      this.platform.requestDeviceRefresh(accessory, err)
+      this.platform.deviceUpdateError(accessory, err, true)
     }
   }
 
   externalUSBUpdate (accessory, params) {
     try {
+      if (!Object.prototype.hasOwnProperty.call(params, 'switches')) return
       accessory.getService(Service.Outlet).updateCharacteristic(Characteristic.On, params.switches[0].switch === 'on')
     } catch (err) {
-      this.platform.log.warn('[%s] could not be updated as %s.', accessory.displayName, err)
+      this.platform.deviceUpdateError(accessory, err, false)
     }
   }
 }
diff --git a/lib/device/valve.js b/lib/device/valve.js
index 9feff0c4..c7d1dab8 100644
--- a/lib/device/valve.js
+++ b/lib/device/valve.js
@@ -50,12 +50,13 @@ module.exports = class deviceValve {
         }
       }
     } catch (err) {
-      this.platform.requestDeviceRefresh(accessory, err)
+      this.platform.deviceUpdateError(accessory, err, true)
     }
   }
 
   externalValveUpdate (accessory, params) {
     try {
+      if (!Object.prototype.hasOwnProperty.call(params, 'switches')) return
       let valveConfig
       if (!(valveConfig = this.platform.cusG.get(accessory.context.hbDeviceId))) {
         throw new Error('group config missing')
@@ -81,7 +82,7 @@ module.exports = class deviceValve {
         }
       })
     } catch (err) {
-      this.platform.log.warn('[%s] could not be updated as %s.', accessory.displayName, err)
+      this.platform.deviceUpdateError(accessory, err, false)
     }
   }
 }
diff --git a/lib/device/zb-dev.js b/lib/device/zb-dev.js
index d4b2f58e..365cedb8 100644
--- a/lib/device/zb-dev.js
+++ b/lib/device/zb-dev.js
@@ -11,7 +11,7 @@ module.exports = class deviceZBDev {
     try {
       //* ** credit @tasict ***\\
       if (Object.prototype.hasOwnProperty.call(params, 'battery')) {
-        if (accessory.context.eweUIID === 3026 && (this.platform.config.ZBDWBatt || false)) {
+        if (accessory.context.eweUIID === 3026 && this.platform.config.ZBDWBatt) {
           params.battery *= 10
         }
         const batteryService =
@@ -75,9 +75,11 @@ module.exports = class deviceZBDev {
               .updateCharacteristic(Characteristic.ContactSensorState, params.lock)
           }
           break
+        default:
+          throw new Error('Zigbee device type not supported [uiid ' + accessory.context.eweUIID + ']')
       }
     } catch (err) {
-      this.platform.log.warn('[%s] could not be updated as %s.', accessory.displayName, err)
+      this.platform.deviceUpdateError(accessory, err, false)
     }
   }
 }
diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index 7393124f..3fd6d668 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -120,7 +120,7 @@ class eWeLink {
       })()
     } catch (err) {
       this.log.error('************** Cannot load homebridge-ewelink **************')
-      this.log.error(err)
+      this.log.error(this.debug ? err : err.message)
       this.log.error('************************************************************')
       if (this.lanClient) this.lanClient.closeConnection()
       if (this.wsClient) this.wsClient.closeConnection()
@@ -638,7 +638,7 @@ class eWeLink {
           if (!(outletService = accessory.getService(Service.Outlet))) {
             accessory.addService(Service.Outlet)
             outletService = accessory.getService(Service.Outlet)
-            if (accessory.context.eweModel !== 'S26' && !(this.config.disableEveLogging || false)) {
+            if (accessory.context.eweModel !== 'S26' && !this.config.disableEveLogging) {
               outletService.addCharacteristic(EveService.Characteristics.Voltage)
               outletService.addCharacteristic(EveService.Characteristics.CurrentConsumption)
               outletService.addCharacteristic(EveService.Characteristics.ElectricCurrent)
@@ -658,7 +658,7 @@ class eWeLink {
           outletService
             .getCharacteristic(Characteristic.On)
             .on('set', (value, callback) => accessory.control.internalOutletUpdate(accessory, value, callback))
-          if (accessory.context.eweModel !== 'S26' && !(this.config.disableEveLogging || false)) {
+          if (accessory.context.eweModel !== 'S26' && !this.config.disableEveLogging) {
             accessory.log = this.log
             accessory.eveLogger = new EveHistoryService('energy', accessory, {
               storage: 'fs',
@@ -968,7 +968,7 @@ class eWeLink {
     } catch (err) {
       if (accessory.context.reachableWAN) {
         if (this.debug) {
-          this.log.warn('[%s] Reverting to web socket as %s.', accessory.displayName, err.message)
+          this.log.warn('[%s] Reverting to web socket as LAN mode warning - %s.', accessory.displayName, this.debug ? err : err.message)
         }
         await this.wsClient.sendUpdate(payload)
       } else {
@@ -987,21 +987,31 @@ class eWeLink {
         if (device.params.online !== accessory.context.reachableWAN) {
           accessory.context.reachableWAN = device.params.online
           this.devicesInHB.set(accessory.context.hbDeviceId, accessory)
-          if (accessory.context.reachableWAN) this.wsClient.requestUpdate(accessory).catch(() => {})
           reachableChange = true
           this.log.warn(
             '[%s] has been reported [%s] via [WS].',
             accessory.displayName,
             accessory.context.reachableWAN ? 'online' : 'offline'
           )
+          if (accessory.context.reachableWAN) {
+            try {
+              this.wsClient.requestUpdate(accessory)
+            } catch (err) {
+              this.log.warn('[%s] update could not be requested as %s', accessory.displayName, this.debug ? err.message : err)
+            }
+          }
         }
       }
       if (device.params.updateSource === 'LAN' && !accessory.context.reachableLAN) {
         accessory.context.reachableLAN = true
         this.devicesInHB.set(accessory.context.hbDeviceId, accessory)
-        this.wsClient.requestUpdate(accessory).catch(() => {})
         reachableChange = true
         this.log.warn('[%s] has been reported [online] via [LAN].', accessory.displayName)
+        try {
+          this.wsClient.requestUpdate(accessory)
+        } catch (err) {
+          this.log.warn('[%s] update could not be requested as %s', accessory.displayName, this.debug ? err.message : err)
+        }
       }
       if (reachableChange && !isX) {
         for (let i = 1; i <= accessory.context.channelCount; i++) {
@@ -1052,15 +1062,17 @@ class eWeLink {
     }
   }
 
-  async requestDeviceRefresh (accessory, err) {
-    this.log.warn('[%s] could not be updated as %s.', accessory.displayName, err)
-    if (accessory.context.reachableWAN) {
-      try {
-        await this.wsClient.requestUpdate(accessory)
-        this.log.warn('[%s] requesting previous state to revert Homebridge state.', accessory.displayName)
-      } catch (err) {}
-    } else {
-      this.log.warn('[%s] Homebridge state will be synced once the device comes back online.', accessory.displayName)
+  async deviceUpdateError (accessory, err, requestRefresh) {
+    this.log.warn('[%s] could not be updated as %s.', accessory.displayName, this.debug ? err : err.message)
+    if (requestRefresh) {
+      if (accessory.context.reachableWAN) {
+        try {
+          await this.wsClient.requestUpdate(accessory)
+          this.log.warn('[%s] requesting previous state to revert Homebridge state.', accessory.displayName)
+        } catch (err) {}
+      } else {
+        this.log.warn('[%s] Homebridge state will be synced once the device comes back online.', accessory.displayName)
+      }
     }
   }
 }
diff --git a/lib/eWeLinkHTTP.js b/lib/eWeLinkHTTP.js
index 10df3508..c3497f4b 100644
--- a/lib/eWeLinkHTTP.js
+++ b/lib/eWeLinkHTTP.js
@@ -1,6 +1,6 @@
 'use strict'
 const axios = require('axios')
-const constants = require('./constants')
+const cns = require('./constants')
 const crypto = require('crypto')
 const utils = require('./utils')
 module.exports = class eWeLinkHTTP {
@@ -11,13 +11,12 @@ module.exports = class eWeLinkHTTP {
     this.username = config.username.toString()
     this.password = config.password.toString()
     this.hideDevFromHB = (config.hideDevFromHB || '').toString()
-    this.cCode =
-      '+' + config.countryCode.toString().replace('+', '').replace(' ', '')
+    this.cCode = '+' + config.countryCode.toString().replace('+', '').replace(' ', '')
   }
 
   async getHost () {
     const params = {
-      appid: constants.appId,
+      appid: cns.appId,
       country_code: this.cCode,
       nonce: Math.random().toString(36).substr(2, 8),
       ts: Math.floor(new Date().getTime() / 1000),
@@ -33,33 +32,22 @@ module.exports = class eWeLinkHTTP {
       })
       dataToSign.sort((a, b) => (a.key < b.key ? -1 : 1))
       dataToSign = dataToSign.map((k) => k.key + '=' + k.value).join('&')
-      dataToSign = crypto
-        .createHmac('sha256', constants.appSecret)
-        .update(dataToSign)
-        .digest('base64')
+      dataToSign = crypto.createHmac('sha256', cns.appSecret).update(dataToSign).digest('base64')
       if (this.debugReqRes) {
-        this.log.warn(
-          'Sending HTTP getHost request. This text is yellow for clarity.\n%s',
-          JSON.stringify(params, null, 2)
-        )
+        this.log.warn('Sending HTTP getHost request. This text is yellow for clarity.\n%s', JSON.stringify(params, null, 2))
       } else if (this.debug) {
         this.log('Sending HTTP getHost request.')
       }
-      const res = await axios.get(
-        'https://api.coolkit.cc:8080/api/user/region', {
-          headers: {
-            Authorization: 'Sign ' + dataToSign,
-            'Content-Type': 'application/json'
-          },
-          params
-        }
-      )
+      const res = await axios.get('https://api.coolkit.cc:8080/api/user/region', {
+        headers: {
+          Authorization: 'Sign ' + dataToSign,
+          'Content-Type': 'application/json'
+        },
+        params
+      })
       const body = res.data
       if (!body.region) {
-        throw new Error(
-          'Server did not respond with a region.\n' +
-          JSON.stringify(body, null, 2)
-        )
+        throw new Error('Server did not respond with a region.\n' + JSON.stringify(body, null, 2))
       }
       switch (body.region) {
         case 'eu':
@@ -78,14 +66,12 @@ module.exports = class eWeLinkHTTP {
       }
       return this.httpHost
     } catch (err) {
-      if (
-        Object.prototype.hasOwnProperty.call(err, 'code') && ['ENOTFOUND', 'ETIMEDOUT', 'EAI_AGAIN'].includes(err.code)
-      ) {
+      if (Object.prototype.hasOwnProperty.call(err, 'code') && cns.httpRetryCodes.includes(err.code)) {
         this.log.warn('Unable to reach eWeLink. Retrying in 30 seconds.')
         await utils.sleep(30000)
         return this.getHost()
       } else {
-        throw err
+        return err
       }
     }
   }
@@ -95,43 +81,25 @@ module.exports = class eWeLinkHTTP {
       countryCode: this.cCode,
       password: this.password
     }
-    this.username.includes('@')
-      ? (data.email = this.username)
-      : (data.phoneNumber = this.username)
+    this.username.includes('@') ? (data.email = this.username) : (data.phoneNumber = this.username)
     if (this.debugReqRes) {
-      const msg = JSON.stringify(data, null, 2)
-        .replace(this.password, '**hidden**')
-        .replace(this.username, '**hidden**')
-      this.log.warn(
-        'Sending HTTP login request. This text is yellow for clarity.\n%s',
-        msg
-      )
+      const msg = JSON.stringify(data, null, 2).replace(this.password, '**hidden**').replace(this.username, '**hidden**')
+      this.log.warn('Sending HTTP login request. This text is yellow for clarity.\n%s', msg)
     } else if (this.debug) {
       this.log('Sending HTTP login request.')
     }
-    const dataToSign = crypto
-      .createHmac('sha256', constants.appSecret)
-      .update(JSON.stringify(data))
-      .digest('base64')
-    const res = await axios.post(
-      'https://' + this.httpHost + '/v2/user/login',
-      data, {
-        headers: {
-          Authorization: 'Sign ' + dataToSign,
-          'Content-Type': 'application/json',
-          Host: this.httpHost,
-          'X-CK-Appid': constants.appId,
-          'X-CK-Nonce': Math.random().toString(36).substr(2, 8)
-        }
-      }
-    )
+    const dataToSign = crypto.createHmac('sha256', cns.appSecret).update(JSON.stringify(data)).digest('base64')
+    const res = await axios.post('https://' + this.httpHost + '/v2/user/login', data, {
+      headers: {
+        Authorization: 'Sign ' + dataToSign,
+        'Content-Type': 'application/json',
+        Host: this.httpHost,
+        'X-CK-Appid': cns.appId,
+        'X-CK-Nonce': Math.random().toString(36).substr(2, 8)
+      }
+    })
     const body = res.data
-    if (
-      Object.prototype.hasOwnProperty.call(body, 'error') &&
-      body.error === 10004 &&
-      Object.prototype.hasOwnProperty.call(body, 'data') &&
-      Object.prototype.hasOwnProperty.call(body.data, 'region')
-    ) {
+    if (Object.prototype.hasOwnProperty.call(body, 'error') && body.error === 10004 && Object.prototype.hasOwnProperty.call(body, 'data') && Object.prototype.hasOwnProperty.call(body.data, 'region')) {
       const givenRegion = body.data.region
       switch (givenRegion) {
         case 'eu':
@@ -160,9 +128,7 @@ module.exports = class eWeLinkHTTP {
       }
     } else {
       if (body.error === 500) {
-        this.log.warn(
-          'An eWeLink error [500] occured. Retrying in 30 seconds.'
-        )
+        this.log.warn('An eWeLink error [500] occured. Retrying in 30 seconds.')
         await utils.sleep(30000)
         return this.login()
       } else {
@@ -173,74 +139,56 @@ module.exports = class eWeLinkHTTP {
 
   async getDevices () {
     try {
-      const res = await axios.get(
-        'https://' + this.httpHost + '/v2/device/thing', {
-          headers: {
-            Authorization: 'Bearer ' + this.aToken,
-            'Content-Type': 'application/json',
-            Host: this.httpHost,
-            'X-CK-Appid': constants.appId,
-            'X-CK-Nonce': Math.random().toString(36).substr(2, 8)
-          }
+      const res = await axios.get('https://' + this.httpHost + '/v2/device/thing', {
+        headers: {
+          Authorization: 'Bearer ' + this.aToken,
+          'Content-Type': 'application/json',
+          Host: this.httpHost,
+          'X-CK-Appid': cns.appId,
+          'X-CK-Nonce': Math.random().toString(36).substr(2, 8)
         }
-      )
+      })
       const body = res.data
-      if (
-        !Object.prototype.hasOwnProperty.call(body, 'data') ||
-        !Object.prototype.hasOwnProperty.call(body, 'error') ||
-        (Object.prototype.hasOwnProperty.call(body, 'error') && body.error !== 0)
-      ) {
+      if (!Object.prototype.hasOwnProperty.call(body, 'data') || !Object.prototype.hasOwnProperty.call(body, 'error') || (Object.prototype.hasOwnProperty.call(body, 'error') && body.error !== 0)) {
         throw new Error(JSON.stringify(body, null, 2))
       }
       const deviceList = []
       if (body.data.thingList && body.data.thingList.length > 0) {
-        body.data.thingList.forEach((device) =>
-          deviceList.push(device.itemData)
-        )
+        body.data.thingList.forEach((device) => deviceList.push(device.itemData))
       }
       deviceList
-        .filter(
-          (d) => Object.prototype.hasOwnProperty.call(d, 'extra') && Object.prototype.hasOwnProperty.call(d.extra, 'uiid')
-        )
+        .filter((d) => Object.prototype.hasOwnProperty.call(d, 'extra') && Object.prototype.hasOwnProperty.call(d.extra, 'uiid'))
         .filter((d) => !this.hideDevFromHB.includes(d.deviceid))
       return deviceList
     } catch (err) {
-      if (
-        Object.prototype.hasOwnProperty.call(err, 'code') && ['ENOTFOUND', 'ETIMEDOUT'].includes(err.code)
-      ) {
+      if (Object.prototype.hasOwnProperty.call(err, 'code') && cns.httpRetryCodes.includes(err.code)) {
         this.log.warn('Unable to reach eWeLink. Retrying in 30 seconds.')
         await utils.sleep(30000)
         return this.getDevices()
       } else {
-        throw err
+        return err
       }
     }
   }
 
   async getDevice (deviceId) {
     try {
-      const res = await axios.post(
-        'https://' + this.httpHost + '/v2/device/thing', {
-          thingList: [{
-            itemType: 1,
-            id: deviceId
-          }]
-        }, {
-          headers: {
-            Authorization: 'Bearer ' + this.aToken,
-            'Content-Type': 'application/json',
-            Host: this.httpHost,
-            'X-CK-Appid': constants.appId,
-            'X-CK-Nonce': Math.random().toString(36).substr(2, 8)
-          }
+      const res = await axios.post('https://' + this.httpHost + '/v2/device/thing', {
+        thingList: [{
+          itemType: 1,
+          id: deviceId
+        }]
+      }, {
+        headers: {
+          Authorization: 'Bearer ' + this.aToken,
+          'Content-Type': 'application/json',
+          Host: this.httpHost,
+          'X-CK-Appid': cns.appId,
+          'X-CK-Nonce': Math.random().toString(36).substr(2, 8)
         }
-      )
+      })
       const body = res.data
-      if (
-        !Object.prototype.hasOwnProperty.call(body, 'data') ||
-        !Object.prototype.hasOwnProperty.call(body, 'error') ||
-        (Object.prototype.hasOwnProperty.call(body, 'error') && body.error !== 0)
-      ) {
+      if (!Object.prototype.hasOwnProperty.call(body, 'data') || !Object.prototype.hasOwnProperty.call(body, 'error') || (Object.prototype.hasOwnProperty.call(body, 'error') && body.error !== 0)) {
         throw new Error(JSON.stringify(body, null, 2))
       }
       if (body.data.thingList && body.data.thingList.length === 1) {
@@ -249,14 +197,12 @@ module.exports = class eWeLinkHTTP {
         throw new Error('device not found in eWeLink')
       }
     } catch (err) {
-      if (
-        Object.prototype.hasOwnProperty.call(err, 'code') && ['ENOTFOUND', 'ETIMEDOUT'].includes(err.code)
-      ) {
+      if (Object.prototype.hasOwnProperty.call(err, 'code') && cns.httpRetryCodes.includes(err.code)) {
         this.log.warn('Unable to reach eWeLink. Retrying in 30 seconds.')
         await utils.sleep(30000)
         return this.getDevice(deviceId)
       } else {
-        throw err
+        return err
       }
     }
   }
diff --git a/lib/eWeLinkLAN.js b/lib/eWeLinkLAN.js
index 7d4a7226..73e97cea 100644
--- a/lib/eWeLinkLAN.js
+++ b/lib/eWeLinkLAN.js
@@ -7,8 +7,12 @@ const EventEmitter = require('events')
 module.exports = class eWeLinkLAN {
   constructor (config, log, devices) {
     this.log = log
+    this.config = config
+    this.debug = this.config.debug || false
+    this.debugReqRes = this.config.debugReqRes || false
+    this.ipOverrides = this.config.ipOverride || {}
+    this.emitter = new EventEmitter()
     this.devices = devices
-    this.ipOverrides = config.ipOverride || {}
     this.deviceMap = new Map()
     devices.forEach(device => {
       this.deviceMap.set(device.deviceid, {
@@ -17,9 +21,6 @@ module.exports = class eWeLinkLAN {
         ip: Object.prototype.hasOwnProperty.call(this.ipOverrides, device.deviceid) ? this.ipOverrides[device.deviceid] : null
       })
     })
-    this.debug = config.debug || false
-    this.debugReqRes = config.debugReqRes || false
-    this.emitter = new EventEmitter()
   }
 
   async getHosts () {
@@ -42,7 +43,7 @@ module.exports = class eWeLinkLAN {
     return this.deviceMap
   }
 
-  startMonitor () {
+  async startMonitor () {
     dns.ondata = packet => {
       if (packet.answers) {
         packet.answers
@@ -170,7 +171,11 @@ module.exports = class eWeLinkLAN {
   }
 
   async closeConnection () {
-    await dns.stopMonitoring()
-    this.log('LAN monitoring gracefully stopped.')
+    try {
+      await dns.stopMonitoring()
+      this.log('LAN monitoring gracefully stopped.')
+    } catch (err) {
+      this.log.warn('LAN monitoring could not be stopped as %s', this.debug ? err : err.message)
+    }
   }
 }
diff --git a/lib/eWeLinkWS.js b/lib/eWeLinkWS.js
index a6adfc5b..92f46dab 100644
--- a/lib/eWeLinkWS.js
+++ b/lib/eWeLinkWS.js
@@ -23,9 +23,7 @@ module.exports = class eWeLinkWS {
     try {
       const res = await axios({
         method: 'post',
-        url: 'https://' +
-          this.httpHost.replace('-api', '-disp') +
-          '/dispatch/app',
+        url: 'https://' + this.httpHost.replace('-api', '-disp') + '/dispatch/app',
         headers: {
           Authorization: 'Bearer ' + this.aToken,
           'Content-Type': 'application/json'
@@ -47,14 +45,12 @@ module.exports = class eWeLinkWS {
       this.wsHost = body.domain
       return body.domain
     } catch (err) {
-      if (
-        Object.prototype.hasOwnProperty.call(err, 'code') && ['ENOTFOUND', 'ETIMEDOUT'].includes(err.code)
-      ) {
+      if (Object.prototype.hasOwnProperty.call(err, 'code') && cns.httpRetryCodes.includes(err.code)) {
         this.log.warn('Unable to reach eWeLink. Retrying in 30 seconds.')
         await utils.sleep(30000)
         return this.getDevices()
       } else {
-        throw err
+        return err
       }
     }
   }
@@ -63,12 +59,9 @@ module.exports = class eWeLinkWS {
     this.wsp = new WSP('wss://' + this.wsHost + ':8080/api/ws', {
       createWebSocket: (url) => new WS(url),
       extractMessageData: (event) => event,
-      attachRequestId: (data, requestId) =>
-        Object.assign({
-          sequence: requestId
-        },
-        data
-        ),
+      attachRequestId: (data, requestId) => Object.assign({
+        sequence: requestId
+      }, data),
       extractRequestId: (data) => data && data.sequence,
       packMessage: (data) => JSON.stringify(data),
       unpackMessage: (data) => {
@@ -91,13 +84,8 @@ module.exports = class eWeLinkWS {
         version: 8
       }
       if (this.debugReqRes) {
-        const msg = JSON.stringify(payload, null, 2)
-          .replace(this.aToken, '**hidden**')
-          .replace(this.apiKey, '**hidden**')
-        this.log.warn(
-          'Sending WS login request. This text is yellow for clarity.\n%s',
-          msg
-        )
+        const msg = JSON.stringify(payload, null, 2).replace(this.aToken, '**hidden**').replace(this.apiKey, '**hidden**')
+        this.log.warn('Sending WS login request. This text is yellow for clarity.\n%s', msg)
       } else if (this.debug) {
         this.log('Sending WS login request.')
       }
@@ -105,12 +93,7 @@ module.exports = class eWeLinkWS {
         const res = await this.wsp.sendRequest(payload, {
           requestId: sequence
         })
-        if (
-          Object.prototype.hasOwnProperty.call(res, 'config') &&
-          res.config.hb &&
-          res.config.hbInterval &&
-          !this.hbInterval
-        ) {
+        if (Object.prototype.hasOwnProperty.call(res, 'config') && res.config.hb && res.config.hbInterval && !this.hbInterval) {
           this.hbInterval = setInterval(() => {
             this.wsp.send('ping')
           }, (res.config.hbInterval + 7) * 1000)
@@ -118,7 +101,7 @@ module.exports = class eWeLinkWS {
           throw new Error('Unknown parameters received')
         }
       } catch (err) {
-        this.log.error('WS login failed [%s].', err)
+        this.log.error('WS login failed [%s].', this.debug ? err : err.message)
       }
     })
     this.wsp.onUnpackedMessage.addListener((device) => {
@@ -133,10 +116,7 @@ module.exports = class eWeLinkWS {
         switch (device.action) {
           case 'update':
           case 'sysmsg':
-            if (
-              device.action === 'sysmsg' &&
-              Object.prototype.hasOwnProperty.call(device.params, 'online')
-            ) {
+            if (device.action === 'sysmsg' && Object.prototype.hasOwnProperty.call(device.params, 'online')) {
               onlineStatus = device.params.online
             }
             for (const param in device.params) {
@@ -154,10 +134,7 @@ module.exports = class eWeLinkWS {
                 params: device.params
               }
               if (this.debugReqRes) {
-                const msg = JSON.stringify(returnTemplate, null, 2).replace(
-                  device.deviceid,
-                  '**hidden**'
-                )
+                const msg = JSON.stringify(returnTemplate, null, 2).replace(device.deviceid, '**hidden**')
                 this.log('WS message received.\n%s', msg)
               } else if (this.debug) {
                 this.log('WS message received.')
@@ -168,33 +145,25 @@ module.exports = class eWeLinkWS {
           case 'reportSubDevice':
             return
           default:
-            this.log.warn(
-              '[%s] WS message has unknown action.\n' +
-              JSON.stringify(device, null, 2),
-              device.deviceid
-            )
+            this.log.warn('[%s] WS message has unknown action.\n' + JSON.stringify(device, null, 2), device.deviceid)
         }
       } else if (Object.prototype.hasOwnProperty.call(device, 'error') && device.error === 0) {
         // *** Safe to ignore these messages *** \\
       } else {
         if (this.debug) {
-          this.log.warn(
-            'WS unknown command received.\n' + JSON.stringify(device, null, 2)
-          )
+          this.log.warn('WS unknown command received.\n' + JSON.stringify(device, null, 2))
         }
       }
     })
-    this.wsp.onClose.addListener((e, m) => {
+    this.wsp.onClose.addListener(e => {
       this.wsIsOpen = false
-      if (e !== 1005) {
-        this.log.warn('Web socket closed [%s].', e)
-        if (e !== 1000) {
+      if (e.code !== 1005) {
+        this.log.warn('Web socket closed [%s - %s].', e.code, e.reason)
+        if (e.code !== 1000) {
           this.log('Web socket will try to reconnect in five seconds.')
           setTimeout(() => this.login(), 5000)
         } else {
-          this.log(
-            'Please try restarting Homebridge so that this plugin can work again.'
-          )
+          this.log('Please try restarting Homebridge so that this plugin can work again.')
         }
       }
       if (this.hbInterval) {
@@ -203,18 +172,14 @@ module.exports = class eWeLinkWS {
       }
       this.wsp.removeAllListeners()
     })
-    this.wsp.onError.addListener((e) => {
-      this.log.error('Web socket error - [%s].', e)
+    this.wsp.onError.addListener(e => {
+      this.log.warn('Web socket error - [%s].', e)
       if (e.code === 'ECONNREFUSED') {
-        this.log.warn(
-          'Web socket will try to reconnect in five seconds then try the command again.'
-        )
+        this.log.warn('Web socket will try to reconnect in five seconds then try the command again.')
         this.wsp.removeAllListeners()
         setTimeout(() => this.login(), 5000)
       } else {
-        this.log.warn(
-          'If this was unexpected then please try restarting Homebridge.'
-        )
+        this.log.warn('If this was unexpected then please try restarting Homebridge.')
       }
     })
   }
@@ -235,14 +200,8 @@ module.exports = class eWeLinkWS {
           requestId: sequence
         })
         if (this.debugReqRes) {
-          const msg = JSON.stringify(json, null, 2)
-            .replace(json.apikey, '**hidden**')
-            .replace(json.apiKey, '**hidden**')
-            .replace(json.deviceid, '**hidden**')
-          this.log.warn(
-            'WS message sent. This text is yellow for clarity.\n%s',
-            msg
-          )
+          const msg = JSON.stringify(json, null, 2).replace(json.apikey, '**hidden**').replace(json.apiKey, '**hidden**').replace(json.deviceid, '**hidden**')
+          this.log.warn('WS message sent. This text is yellow for clarity.\n%s', msg)
         } else if (this.debug) {
           this.log('WS message sent.')
         }
@@ -254,7 +213,8 @@ module.exports = class eWeLinkWS {
             throw new Error('Unknown response')
         }
       } catch (err) {
-        throw new Error('device update failed [' + err.message + ']')
+        const msg = this.debug ? err : err.message
+        return new Error('device update failed as ' + msg)
       }
     } else {
       if (this.debug) {
@@ -279,14 +239,8 @@ module.exports = class eWeLinkWS {
     if (this.wsp && this.wsIsOpen) {
       this.wsp.send(JSON.stringify(json))
       if (this.debugReqRes) {
-        const msg = JSON.stringify(json, null, 2)
-          .replace(json.apikey, '**hidden**')
-          .replace(json.apiKey, '**hidden**')
-          .replace(json.deviceid, '**hidden**')
-        this.log.warn(
-          'WS message sent. This text is yellow for clarity.\n%s',
-          msg
-        )
+        const msg = JSON.stringify(json, null, 2).replace(json.apikey, '**hidden**').replace(json.apiKey, '**hidden**').replace(json.deviceid, '**hidden**')
+        this.log.warn('WS message sent. This text is yellow for clarity.\n%s', msg)
       } else if (this.debug) {
         this.log('WS message sent.')
       }
@@ -305,8 +259,12 @@ module.exports = class eWeLinkWS {
 
   async closeConnection () {
     if (this.wsp && this.wsIsOpen) {
-      await this.wsp.close()
-      this.log('Web socket gracefully closed.')
+      try {
+        await this.wsp.close()
+        this.log('Web socket gracefully closed.')
+      } catch (err) {
+        this.log.warn('Web socket could not be closed as %s', this.debug ? err : err.message)
+      }
     }
   }
 }

From 4940049ae5caddfd6c385bf9f9f868a72e5dd1ce Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 28 Sep 2020 10:22:43 +0100
Subject: [PATCH 0255/3183] 3.1.4

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 429c84d8..da735c95 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.1.3",
+  "version": "3.1.4",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 12f96bd0..e2d5e794 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.1.3",
+  "version": "3.1.4",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 4b444002f28802d5a69f4e2f66b9efa9e009d2a7 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 28 Sep 2020 11:17:25 +0100
Subject: [PATCH 0256/3183] setup + shutdown

---
 lib/eWeLink.js    | 30 ++++++++++++++++++++----------
 lib/eWeLinkLAN.js |  8 ++------
 lib/eWeLinkWS.js  |  8 ++------
 3 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index 3fd6d668..5e06b1af 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -45,15 +45,11 @@ class eWeLink {
     this.eveLogPath = this.api.user.storagePath() + '/homebridge-ewelink/'
     this.wsRefreshFlag = true
     this.api
-      .on('didFinishLaunching', () => this.eWeLinkSync())
-      .on('shutdown', () => {
-        if (this.lanClient) this.lanClient.closeConnection()
-        if (this.wsClient) this.wsClient.closeConnection()
-        this.wsRefreshFlag = false
-      })
+      .on('didFinishLaunching', () => this.eWeLinkSetup())
+      .on('shutdown', () => this.eWeLinkShutdown())
   }
 
-  async eWeLinkSync () {
+  async eWeLinkSetup () {
     try {
       this.log('Plugin has finished initialising. Synching with eWeLink.')
       this.httpClient = new EWeLinkHTTP(this.config, this.log)
@@ -105,7 +101,7 @@ class eWeLink {
                   await this.wsClient.login()
                 }
               } catch (err) {
-                this.log.warn(err)
+                this.log.warn(this.debug ? err : err.message)
               }
             }
           },
@@ -122,12 +118,26 @@ class eWeLink {
       this.log.error('************** Cannot load homebridge-ewelink **************')
       this.log.error(this.debug ? err : err.message)
       this.log.error('************************************************************')
-      if (this.lanClient) this.lanClient.closeConnection()
-      if (this.wsClient) this.wsClient.closeConnection()
+      try {
+        if (this.lanClient) await this.lanClient.closeConnection()
+        if (this.wsClient) await this.wsClient.closeConnection()
+      } catch (err) {
+        this.log.warn(this.debug ? err : err.message)
+      }
       this.wsRefreshFlag = false
     }
   }
 
+  async eWeLinkShutdown () {
+    try {
+      if (this.lanClient) await this.lanClient.closeConnection()
+      if (this.wsClient) await this.wsClient.closeConnection()
+    } catch (err) {
+      this.log.warn(this.debug ? err : err.message)
+    }
+    this.wsRefreshFlag = false
+  }
+
   initialiseDevice (device) {
     let accessory
     //* ** CURTAINS ***\\
diff --git a/lib/eWeLinkLAN.js b/lib/eWeLinkLAN.js
index 73e97cea..855819fd 100644
--- a/lib/eWeLinkLAN.js
+++ b/lib/eWeLinkLAN.js
@@ -171,11 +171,7 @@ module.exports = class eWeLinkLAN {
   }
 
   async closeConnection () {
-    try {
-      await dns.stopMonitoring()
-      this.log('LAN monitoring gracefully stopped.')
-    } catch (err) {
-      this.log.warn('LAN monitoring could not be stopped as %s', this.debug ? err : err.message)
-    }
+    await dns.stopMonitoring()
+    this.log('LAN monitoring gracefully stopped.')
   }
 }
diff --git a/lib/eWeLinkWS.js b/lib/eWeLinkWS.js
index 92f46dab..086856d3 100644
--- a/lib/eWeLinkWS.js
+++ b/lib/eWeLinkWS.js
@@ -259,12 +259,8 @@ module.exports = class eWeLinkWS {
 
   async closeConnection () {
     if (this.wsp && this.wsIsOpen) {
-      try {
-        await this.wsp.close()
-        this.log('Web socket gracefully closed.')
-      } catch (err) {
-        this.log.warn('Web socket could not be closed as %s', this.debug ? err : err.message)
-      }
+      await this.wsp.close()
+      this.log('Web socket gracefully closed.')
     }
   }
 }

From f3d340d4060217ae68b10f868d733fe236ac495f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 28 Sep 2020 11:55:39 +0100
Subject: [PATCH 0257/3183] log changes

---
 lib/eWeLinkLAN.js |  2 +-
 lib/eWeLinkWS.js  | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/eWeLinkLAN.js b/lib/eWeLinkLAN.js
index 855819fd..67bfbae3 100644
--- a/lib/eWeLinkLAN.js
+++ b/lib/eWeLinkLAN.js
@@ -172,6 +172,6 @@ module.exports = class eWeLinkLAN {
 
   async closeConnection () {
     await dns.stopMonitoring()
-    this.log('LAN monitoring gracefully stopped.')
+    if (this.debug) this.log('LAN monitoring gracefully stopped.')
   }
 }
diff --git a/lib/eWeLinkWS.js b/lib/eWeLinkWS.js
index 086856d3..3c305920 100644
--- a/lib/eWeLinkWS.js
+++ b/lib/eWeLinkWS.js
@@ -98,7 +98,7 @@ module.exports = class eWeLinkWS {
             this.wsp.send('ping')
           }, (res.config.hbInterval + 7) * 1000)
         } else {
-          throw new Error('Unknown parameters received')
+          throw new Error('Unknown parameters received\n' + res)
         }
       } catch (err) {
         this.log.error('WS login failed [%s].', this.debug ? err : err.message)
@@ -157,9 +157,9 @@ module.exports = class eWeLinkWS {
     })
     this.wsp.onClose.addListener(e => {
       this.wsIsOpen = false
-      if (e.code !== 1005) {
-        this.log.warn('Web socket closed [%s - %s].', e.code, e.reason)
-        if (e.code !== 1000) {
+      if (e !== 1005) {
+        this.log.warn('Web socket closed [%s].', e)
+        if (e !== 1000) {
           this.log('Web socket will try to reconnect in five seconds.')
           setTimeout(() => this.login(), 5000)
         } else {
@@ -260,7 +260,7 @@ module.exports = class eWeLinkWS {
   async closeConnection () {
     if (this.wsp && this.wsIsOpen) {
       await this.wsp.close()
-      this.log('Web socket gracefully closed.')
+      if (this.debug) this.log('Web socket gracefully closed.')
     }
   }
 }

From 283121e81ade308625dfa926937ddba1365a858c Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Mon, 28 Sep 2020 20:58:05 +0100
Subject: [PATCH 0258/3183] Update FUNDING.yml

---
 .github/FUNDING.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
index 9444c69e..9ccddac1 100644
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1,3 +1,4 @@
+github: bwp91
 patreon: bwp91
 ko_fi: bwp91
-custom: ["https://www.paypal.me/BenPotter"]
+custom: https://www.paypal.me/BenPotter

From 7d9cd2ed191bcfa26417c1568745a62eb5baf2a6 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 28 Sep 2020 22:27:05 +0100
Subject: [PATCH 0259/3183] Update eWeLink.js

---
 lib/eWeLink.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index 5e06b1af..b07aea8f 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -97,7 +97,7 @@ class eWeLink {
                 if (this.wsClient) {
                   await this.wsClient.getHost()
                   await this.wsClient.closeConnection()
-                  await utils.sleep(250)
+                  await utils.sleep(500)
                   await this.wsClient.login()
                 }
               } catch (err) {
@@ -105,7 +105,7 @@ class eWeLink {
               }
             }
           },
-          1800000, {
+          3600000, {
             stopOnError: false
           }
         )

From f9477090c1ece42f8974bc2b0818a44ba9fae557 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 29 Sep 2020 08:54:55 +0100
Subject: [PATCH 0260/3183] hideMasters bug

---
 lib/eWeLink.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index b07aea8f..e34924a6 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -97,7 +97,7 @@ class eWeLink {
                 if (this.wsClient) {
                   await this.wsClient.getHost()
                   await this.wsClient.closeConnection()
-                  await utils.sleep(500)
+                  await utils.sleep(250)
                   await this.wsClient.login()
                 }
               } catch (err) {
@@ -105,7 +105,7 @@ class eWeLink {
               }
             }
           },
-          3600000, {
+          1800000, {
             stopOnError: false
           }
         )
@@ -477,7 +477,10 @@ class eWeLink {
         },
         ...extraContext
       }
-      if (!hidden) {
+      if (hidden) {
+        if (type === 'light') accessory.control = new DeviceLight(this)
+        if (type === 'switch') accessory.control = new DeviceSwitch(this)
+      } else {
         this.api.registerPlatformAccessories('homebridge-ewelink', 'eWeLink', [accessory])
         this.configureAccessory(accessory)
         this.log(' → [%s] has been added to Homebridge.', newDeviceName)

From d24da5c354f79d1950da251783fd6c360efc1f89 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 29 Sep 2020 08:56:55 +0100
Subject: [PATCH 0261/3183] 3.1.5

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index da735c95..745f3ceb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.1.4",
+  "version": "3.1.5",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index e2d5e794..3f36e1b5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.1.4",
+  "version": "3.1.5",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 88a84f3d2ce4d99c0f61092d47e0d02ba58e30b1 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 29 Sep 2020 15:57:36 +0100
Subject: [PATCH 0262/3183] rf sensor fix

---
 lib/device/{rf-sub.js => rf-bridge.js} |  3 ++-
 lib/eWeLink.js                         | 12 ++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)
 rename lib/device/{rf-sub.js => rf-bridge.js} (97%)

diff --git a/lib/device/rf-sub.js b/lib/device/rf-bridge.js
similarity index 97%
rename from lib/device/rf-sub.js
rename to lib/device/rf-bridge.js
index e1800637..18704edd 100644
--- a/lib/device/rf-sub.js
+++ b/lib/device/rf-bridge.js
@@ -1,7 +1,7 @@
 'use strict'
 let Characteristic, Service
 const utils = require('./../utils')
-module.exports = class deviceRFSub {
+module.exports = class deviceRFBridge {
   constructor (platform) {
     this.platform = platform
     Service = platform.api.hap.Service
@@ -59,6 +59,7 @@ module.exports = class deviceRFSub {
             this.platform.devicesInHB.forEach(acc => {
               if (
                 acc.context.eweDeviceId === accessory.context.eweDeviceId &&
+                Object.prototype.hasOwnProperty.call(acc.context, 'buttons') &&
                 Object.prototype.hasOwnProperty.call(acc.context.buttons, chan.substr(-1).toString())
               ) {
                 oAccessory = acc
diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index e34924a6..c7012c01 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -15,7 +15,7 @@ const DeviceUSB = require('./device/usb')
 const DeviceSCM = require('./device/scm')
 const DeviceLight = require('./device/light')
 const DeviceSwitch = require('./device/switch')
-const DeviceRFSub = require('./device/rf-sub')
+const DeviceRFBridge = require('./device/rf-bridge')
 const DeviceZBDev = require('./device/zb-dev')
 const EWeLinkHTTP = require('./eWeLinkHTTP')
 const EWeLinkWS = require('./eWeLinkWS')
@@ -254,6 +254,7 @@ class eWeLink {
         }
         this.hiddenMasters.push(device.deviceid)
         accessory = this.addAccessory(device, device.deviceid + 'SW0', 'light', true)
+        accessory.control = new DeviceLight(this)
       } else {
         accessory = this.devicesInHB.has(device.deviceid + 'SW0')
           ? this.devicesInHB.get(device.deviceid + 'SW0')
@@ -287,6 +288,7 @@ class eWeLink {
         }
         this.hiddenMasters.push(device.deviceid)
         accessory = this.addAccessory(device, device.deviceid + 'SW0', 'switch', true)
+        accessory.control = new DeviceSwitch(this)
       } else {
         accessory = this.devicesInHB.has(device.deviceid + 'SW0')
           ? this.devicesInHB.get(device.deviceid + 'SW0')
@@ -326,6 +328,7 @@ class eWeLink {
         : this.addAccessory(device, device.deviceid + 'SW0', 'rf_pri', true, {
           rfMap
         })
+      accessory.control = new DeviceRFBridge(this)
       // this.log.error(JSON.stringify(accessory.context, null, 2))
       rfMap.forEach(subDevice => {
         const swNumber = rfChlCounter + 1
@@ -477,10 +480,7 @@ class eWeLink {
         },
         ...extraContext
       }
-      if (hidden) {
-        if (type === 'light') accessory.control = new DeviceLight(this)
-        if (type === 'switch') accessory.control = new DeviceSwitch(this)
-      } else {
+      if (!hidden) {
         this.api.registerPlatformAccessories('homebridge-ewelink', 'eWeLink', [accessory])
         this.configureAccessory(accessory)
         this.log(' → [%s] has been added to Homebridge.', newDeviceName)
@@ -801,7 +801,7 @@ class eWeLink {
           break
         }
         case 'rf_sub': {
-          accessory.control = new DeviceRFSub(this)
+          accessory.control = new DeviceRFBridge(this)
           switch (accessory.context.subType) {
             case 'water':
               accessory.getService(Service.LeakSensor) || accessory.addService(Service.LeakSensor)

From 21ce252e20749ebee659792d6239fc0cab338fb7 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 29 Sep 2020 16:10:34 +0100
Subject: [PATCH 0263/3183] subType fix

---
 lib/device/rf-bridge.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/device/rf-bridge.js b/lib/device/rf-bridge.js
index 18704edd..cb49dd63 100644
--- a/lib/device/rf-bridge.js
+++ b/lib/device/rf-bridge.js
@@ -71,7 +71,7 @@ module.exports = class deviceRFBridge {
               let serv
               let char
               if (diff < (this.platform.config.sensorTimeDifference || 120)) {
-                switch (oAccessory.context.sensorType) {
+                switch (oAccessory.context.subType) {
                   case 'button':
                     break
                   case 'water':

From 30ae0be2b8566864f362501ac0ab5344c1f456c4 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 29 Sep 2020 16:11:09 +0100
Subject: [PATCH 0264/3183] 3.1.6

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 745f3ceb..b2a0e397 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.1.5",
+  "version": "3.1.6",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 3f36e1b5..94fe430b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.1.5",
+  "version": "3.1.6",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 1607087dcf431dd21e4e08f2584e17b4c3afd05a Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 29 Sep 2020 18:38:49 +0100
Subject: [PATCH 0265/3183] Update package.json

---
 package.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package.json b/package.json
index 94fe430b..34f1b04d 100644
--- a/package.json
+++ b/package.json
@@ -54,6 +54,10 @@
     {
       "type": "paypal",
       "url": "https://www.paypal.me/BenPotter"
+    },
+    {
+      "type": "github",
+      "url": "https://github.com/sponsors/bwp91"
     }
   ],
   "dependencies": {

From d4e1b057e2d3ea8b0a3fe8d3193a938e73415713 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 30 Sep 2020 01:41:39 +0100
Subject: [PATCH 0266/3183] node-dns-sd dep

---
 package-lock.json | 5 ++---
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b2a0e397..630834c2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -516,9 +516,8 @@
       "integrity": "sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE="
     },
     "node-dns-sd": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/node-dns-sd/-/node-dns-sd-0.4.1.tgz",
-      "integrity": "sha512-x+WSuMgvDBQv24OCq75YHcZj1SOzvP5fU4Tz+PBUiVvVBsfc+9XAHAuIftaCpf2nPLl+ys71uZoGr/v9fVDa6A=="
+      "version": "github:bwp91/node-dns-sd#0babcfdd9a9512283df41f184e5f569e63f786fd",
+      "from": "github:bwp91/node-dns-sd"
     },
     "node-fetch": {
       "version": "2.6.1",
diff --git a/package.json b/package.json
index 34f1b04d..e94394e4 100644
--- a/package.json
+++ b/package.json
@@ -68,7 +68,7 @@
     "fakegato-history": "0.5.6",
     "homebridge-lib": "4.7.15",
     "interval-promise": "1.4.0",
-    "node-dns-sd": "0.4.1",
+    "node-dns-sd": "bwp91/node-dns-sd",
     "websocket-as-promised": "1.0.1",
     "ws": "7.3.1"
   }

From 80bb88b2a9dd0dcfa65e12ea65b08c149a5efc06 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 30 Sep 2020 01:48:06 +0100
Subject: [PATCH 0267/3183] return correct devicelist

---
 lib/eWeLinkHTTP.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/eWeLinkHTTP.js b/lib/eWeLinkHTTP.js
index c3497f4b..45e2b6f4 100644
--- a/lib/eWeLinkHTTP.js
+++ b/lib/eWeLinkHTTP.js
@@ -153,13 +153,14 @@ module.exports = class eWeLinkHTTP {
         throw new Error(JSON.stringify(body, null, 2))
       }
       const deviceList = []
+      const returnList = []
       if (body.data.thingList && body.data.thingList.length > 0) {
         body.data.thingList.forEach((device) => deviceList.push(device.itemData))
       }
-      deviceList
+      returnList = deviceList
         .filter((d) => Object.prototype.hasOwnProperty.call(d, 'extra') && Object.prototype.hasOwnProperty.call(d.extra, 'uiid'))
         .filter((d) => !this.hideDevFromHB.includes(d.deviceid))
-      return deviceList
+      return returnList
     } catch (err) {
       if (Object.prototype.hasOwnProperty.call(err, 'code') && cns.httpRetryCodes.includes(err.code)) {
         this.log.warn('Unable to reach eWeLink. Retrying in 30 seconds.')

From 3676f41da938f42b0872c6bfba999aa1be39428c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 30 Sep 2020 01:52:35 +0100
Subject: [PATCH 0268/3183] Update eWeLinkHTTP.js

---
 lib/eWeLinkHTTP.js | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/lib/eWeLinkHTTP.js b/lib/eWeLinkHTTP.js
index 45e2b6f4..c5d3bbcf 100644
--- a/lib/eWeLinkHTTP.js
+++ b/lib/eWeLinkHTTP.js
@@ -153,14 +153,18 @@ module.exports = class eWeLinkHTTP {
         throw new Error(JSON.stringify(body, null, 2))
       }
       const deviceList = []
-      const returnList = []
       if (body.data.thingList && body.data.thingList.length > 0) {
-        body.data.thingList.forEach((device) => deviceList.push(device.itemData))
+        body.data.thingList.forEach(d => {
+          if (
+            Object.prototype.hasOwnProperty.call(d, 'extra') &&
+            Object.prototype.hasOwnProperty.call(d.extra, 'uiid') &&
+            !this.hideDevFromHB.includes(d.deviceid)
+          ) {
+            deviceList.push(d.itemData)
+          }
+        })
       }
-      returnList = deviceList
-        .filter((d) => Object.prototype.hasOwnProperty.call(d, 'extra') && Object.prototype.hasOwnProperty.call(d.extra, 'uiid'))
-        .filter((d) => !this.hideDevFromHB.includes(d.deviceid))
-      return returnList
+      return deviceList
     } catch (err) {
       if (Object.prototype.hasOwnProperty.call(err, 'code') && cns.httpRetryCodes.includes(err.code)) {
         this.log.warn('Unable to reach eWeLink. Retrying in 30 seconds.')

From f18345dbb8200dce2bc49b86651bc366b1394283 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 30 Sep 2020 02:01:56 +0100
Subject: [PATCH 0269/3183] fix deviceList

---
 lib/eWeLinkHTTP.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/eWeLinkHTTP.js b/lib/eWeLinkHTTP.js
index c5d3bbcf..a40122a9 100644
--- a/lib/eWeLinkHTTP.js
+++ b/lib/eWeLinkHTTP.js
@@ -156,9 +156,10 @@ module.exports = class eWeLinkHTTP {
       if (body.data.thingList && body.data.thingList.length > 0) {
         body.data.thingList.forEach(d => {
           if (
-            Object.prototype.hasOwnProperty.call(d, 'extra') &&
-            Object.prototype.hasOwnProperty.call(d.extra, 'uiid') &&
-            !this.hideDevFromHB.includes(d.deviceid)
+            Object.prototype.hasOwnProperty.call(d, 'itemData') &&
+            Object.prototype.hasOwnProperty.call(d.itemData, 'extra') &&
+            Object.prototype.hasOwnProperty.call(d.itemData.extra, 'uiid') &&
+            !this.hideDevFromHB.includes(d.itemData.deviceid)
           ) {
             deviceList.push(d.itemData)
           }

From b6fe1aafd05dd23bf48737c9595fc34a47000f78 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 30 Sep 2020 06:50:21 +0100
Subject: [PATCH 0270/3183] node-dns-sd dep

---
 package-lock.json | 5 +++--
 package.json      | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 630834c2..e81a9949 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -516,8 +516,9 @@
       "integrity": "sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE="
     },
     "node-dns-sd": {
-      "version": "github:bwp91/node-dns-sd#0babcfdd9a9512283df41f184e5f569e63f786fd",
-      "from": "github:bwp91/node-dns-sd"
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/node-dns-sd/-/node-dns-sd-0.4.2.tgz",
+      "integrity": "sha512-fZvDqy19zyaiSXajmRjwue1VWLrJcy8bTV/LJVtAx8DeEFVlXRBMyZknW+q6CEfiW8Y4MQDDKh9x5wF32BHAHQ=="
     },
     "node-fetch": {
       "version": "2.6.1",
diff --git a/package.json b/package.json
index e94394e4..96a831d3 100644
--- a/package.json
+++ b/package.json
@@ -68,7 +68,7 @@
     "fakegato-history": "0.5.6",
     "homebridge-lib": "4.7.15",
     "interval-promise": "1.4.0",
-    "node-dns-sd": "bwp91/node-dns-sd",
+    "node-dns-sd": "0.4.2",
     "websocket-as-promised": "1.0.1",
     "ws": "7.3.1"
   }

From 78ee826163b356158633c1e84cf09cc67de66188 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 30 Sep 2020 06:51:51 +0100
Subject: [PATCH 0271/3183] 3.1.7

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index e81a9949..f42e1988 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.1.6",
+  "version": "3.1.7",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 96a831d3..256697ec 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.1.6",
+  "version": "3.1.7",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 71308867b5f37811269e66f71c7f997839c39460 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Wed, 30 Sep 2020 08:55:41 +0100
Subject: [PATCH 0272/3183] Update README.md

---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 1c683be2..02449b11 100644
--- a/README.md
+++ b/README.md
@@ -7,12 +7,12 @@
 
  Homebridge plugin to control eWeLink devices with original firmware.
  
- [![verified-by-homebridge](https://badgen.net/badge/homebridge/verified/purple)](https://github.com/homebridge/homebridge/wiki/Verified-Plugins)
- [![Discord](https://img.shields.io/discord/432663330281226270?color=728ED5&logo=discord&label=discord)](https://discord.com/channels/432663330281226270/742733745743855627)
- [![JavaScript Style Guide](https://img.shields.io/badge/code_style-standard-brightgreen.svg)](https://standardjs.com)   
+ [![verified-by-homebridge](https://badgen.net/badge/homebridge/verified/purple)](https://github.com/homebridge/homebridge/wiki/Verified-Plugins)   
  [![npm](https://img.shields.io/npm/v/homebridge-ewelink/latest?label=release)](https://www.npmjs.com/package/homebridge-ewelink)
  [![npm](https://img.shields.io/npm/v/homebridge-ewelink/beta?label=beta)](https://www.npmjs.com/package/homebridge-ewelink)   
  [![npm](https://img.shields.io/npm/dt/homebridge-ewelink)](https://www.npmjs.com/package/homebridge-ewelink)
+ [![JavaScript Style Guide](https://img.shields.io/badge/code_style-standard-brightgreen.svg)](https://standardjs.com)
+ [![Discord](https://img.shields.io/discord/432663330281226270?color=728ED5&logo=discord&label=discord)](https://discord.com/channels/432663330281226270/742733745743855627)
  [![Contribute](https://img.shields.io/badge/contribute-a%20drink-yellow)](https://ko-fi.com/bwp91)
 
 </span>

From 3f7af86ae8e576db796a7fddb1dc95c223ce6af9 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Wed, 30 Sep 2020 08:55:53 +0100
Subject: [PATCH 0273/3183] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 02449b11..33b6d570 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@
  [![npm](https://img.shields.io/npm/v/homebridge-ewelink/latest?label=release)](https://www.npmjs.com/package/homebridge-ewelink)
  [![npm](https://img.shields.io/npm/v/homebridge-ewelink/beta?label=beta)](https://www.npmjs.com/package/homebridge-ewelink)   
  [![npm](https://img.shields.io/npm/dt/homebridge-ewelink)](https://www.npmjs.com/package/homebridge-ewelink)
- [![JavaScript Style Guide](https://img.shields.io/badge/code_style-standard-brightgreen.svg)](https://standardjs.com)
+ [![JavaScript Style Guide](https://img.shields.io/badge/code_style-standard-brightgreen.svg)](https://standardjs.com)   
  [![Discord](https://img.shields.io/discord/432663330281226270?color=728ED5&logo=discord&label=discord)](https://discord.com/channels/432663330281226270/742733745743855627)
  [![Contribute](https://img.shields.io/badge/contribute-a%20drink-yellow)](https://ko-fi.com/bwp91)
 

From 1c5e5c6a1edc89e8a2b55d4d34dc96446e530989 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 30 Sep 2020 11:18:16 +0100
Subject: [PATCH 0274/3183] eachen garage door

---
 config.schema.json          |  6 +++++
 lib/constants.js            |  2 +-
 lib/device/garage-eachen.js | 52 +++++++++++++++++++++++++++++++++++++
 lib/eWeLink.js              | 24 +++++++++++++++++
 4 files changed, 83 insertions(+), 1 deletion(-)
 create mode 100644 lib/device/garage-eachen.js

diff --git a/config.schema.json b/config.schema.json
index 5e99588c..e3c794e0 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -138,6 +138,12 @@
                     "garage"
                   ]
                 },
+                {
+                  "title": "Garage Door (Eachen)",
+                  "enum": [
+                    "garage_eachen"
+                  ]
+                },
                 {
                   "title": "Lock",
                   "enum": [
diff --git a/lib/constants.js b/lib/constants.js
index ba6d44fa..0f618fb6 100644
--- a/lib/constants.js
+++ b/lib/constants.js
@@ -3,7 +3,7 @@ module.exports = {
   appId: 'oeVkj2lYFGnJu5XUtWisfW4utiN4u9Mq',
   appSecret: '6Nz4n0xA8s8qdxQf2GqurZj2Fs55FUvM',
   httpRetryCodes: ['ENOTFOUND', 'ETIMEDOUT', 'EAI_AGAIN'],
-  allowedGroups: ['blind', 'garage', 'lock', 'valve'],
+  allowedGroups: ['blind', 'garage', 'garage_eachen', 'lock', 'valve'],
   devicesHideable: ['switch', 'light'],
   devicesNonLAN: [22, 28, 59, 102],
   devicesSingleSwitch: [1, 5, 6, 14, 15, 22, 24, 27, 32, 36, 44, 59],
diff --git a/lib/device/garage-eachen.js b/lib/device/garage-eachen.js
new file mode 100644
index 00000000..22c6c3eb
--- /dev/null
+++ b/lib/device/garage-eachen.js
@@ -0,0 +1,52 @@
+'use strict'
+let Characteristic, Service
+const utils = require('./../utils')
+module.exports = class deviceGarageEachen {
+  constructor (platform) {
+    this.platform = platform
+    Service = platform.api.hap.Service
+    Characteristic = platform.api.hap.Characteristic
+  }
+
+  async internalGarageEachenUpdate (accessory, value, callback) {
+    callback()
+    try {
+      let garageConfig
+      if (!(garageConfig = this.platform.cusG.get(accessory.context.hbDeviceId))) {
+        throw new Error('group config missing')
+      }
+      const params = {}
+      const newPos = value
+      const gdService = accessory.getService(Service.GarageDoorOpener)
+      const prevState = gdService.getCharacteristic(Characteristic.CurrentDoorState).value
+      if (newPos === prevState % 2) return
+      accessory.context.inUse = true
+      gdService
+        .updateCharacteristic(Characteristic.TargetDoorState, newPos)
+        .updateCharacteristic(Characteristic.CurrentDoorState, newPos + 2)
+      // newPos can be 0 TO open and 1 TO CLOSE
+      // params.switch === 'on' TO open and 'off' TO close
+      // HK 0 for open 1 for closed
+      params.switch = value === 0 ? 'on' : 'off'
+      await this.platform.sendDeviceUpdate(accessory, params)
+      await utils.sleep(garageConfig.operationTime * 100)
+      gdService.updateCharacteristic(Characteristic.CurrentDoorState, newPos)
+      accessory.context.inUse = false
+    } catch (err) {
+      this.platform.deviceUpdateError(accessory, err, true)
+    }
+  }
+
+  externalGarageEachenUpdate (accessory, params) {
+    try {
+      if (!Object.prototype.hasOwnProperty.call(params, 'switch') || accessory.context.inUse) {
+        return
+      }
+      const gdService = accessory.getService(Service.GarageDoorOpener)
+      gdService.updateCharacteristic(Characteristic.CurrentDoorState, params.switch === 'on' ? 0 : 1)
+      gdService.updateCharacteristic(Characteristic.TargetDoorState, params.switch === 'on' ? 0 : 1)
+    } catch (err) {
+      this.platform.deviceUpdateError(accessory, err, false)
+    }
+  }
+}
diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index c7012c01..216a93af 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -5,6 +5,7 @@ const corrInterval = require('correcting-interval')
 const DeviceCurtain = require('./device/curtain')
 const DeviceBlind = require('./device/blind')
 const DeviceGarage = require('./device/garage')
+const DeviceGarageEachen = require('./device/garage-eachen')
 const DeviceLock = require('./device/lock')
 const DeviceValve = require('./device/valve')
 const DeviceSensor = require('./device/sensor')
@@ -185,6 +186,10 @@ class eWeLink {
         accessory.context.cacheTargetDoorState = 1
       }
       //* ** @ENDUPGRADE ***\\
+    } else if (this.cusG.has(device.deviceid + 'SWX') && this.cusG.get(device.deviceid + 'SWX').type === 'garage_eachen') {
+      accessory = this.devicesInHB.has(device.deviceid + 'SWX')
+        ? this.devicesInHB.get(device.deviceid + 'SWX')
+        : this.addAccessory(device, device.deviceid + 'SWX', 'garage_eachen')
     } else if (this.cusG.has(device.deviceid + 'SWX') && this.cusG.get(device.deviceid + 'SWX').type === 'lock') {
       accessory = this.devicesInHB.has(device.deviceid + 'SWX')
         ? this.devicesInHB.get(device.deviceid + 'SWX')
@@ -546,6 +551,22 @@ class eWeLink {
             .on('set', (value, callback) => accessory.control.internalGarageUpdate(accessory, value, callback))
           break
         }
+        case 'garage_eachen': {
+          accessory.control = new DeviceGarageEachen(this)
+          let gdeService
+          if (!(gdeService = accessory.getService(Service.GarageDoorOpener))) {
+            accessory
+              .addService(Service.GarageDoorOpener)
+              .setCharacteristic(Characteristic.CurrentDoorState, 1)
+              .setCharacteristic(Characteristic.TargetDoorState, 1)
+              .setCharacteristic(Characteristic.ObstructionDetected, false)
+            gdeService = accessory.getService(Service.GarageDoorOpener)
+          }
+          gdeService
+            .getCharacteristic(Characteristic.TargetDoorState)
+            .on('set', (value, callback) => accessory.control.internalGarageEachenUpdate(accessory, value, callback))
+          break
+        }
         case 'lock': {
           accessory.control = new DeviceLock(this)
           const lmService = accessory.getService(Service.LockMechanism) || accessory.addService(Service.LockMechanism)
@@ -905,6 +926,9 @@ class eWeLink {
       case 'garage':
         accessory.control.externalGarageUpdate(accessory, newParams)
         return true
+      case 'garage_eachen':
+        accessory.control.externalGarageEachenUpdate(accessory, newParams)
+        return true
       case 'lock':
         accessory.control.externalLockUpdate(accessory, newParams)
         return true

From 76f8549888651267bba5d64e38d21a7f06717e7f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 30 Sep 2020 11:19:24 +0100
Subject: [PATCH 0275/3183] 3.2.0-0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index f42e1988..9c316094 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.1.7",
+  "version": "3.2.0-0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 256697ec..5fe27906 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.1.7",
+  "version": "3.2.0-0",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 418bd33ecfa61369ad1d9de0e4d16aca2ca5d470 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 30 Sep 2020 12:41:15 +0100
Subject: [PATCH 0276/3183] clean up

---
 lib/device/garage-eachen.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/lib/device/garage-eachen.js b/lib/device/garage-eachen.js
index 22c6c3eb..e3b683a2 100644
--- a/lib/device/garage-eachen.js
+++ b/lib/device/garage-eachen.js
@@ -24,15 +24,13 @@ module.exports = class deviceGarageEachen {
       gdService
         .updateCharacteristic(Characteristic.TargetDoorState, newPos)
         .updateCharacteristic(Characteristic.CurrentDoorState, newPos + 2)
-      // newPos can be 0 TO open and 1 TO CLOSE
-      // params.switch === 'on' TO open and 'off' TO close
-      // HK 0 for open 1 for closed
       params.switch = value === 0 ? 'on' : 'off'
       await this.platform.sendDeviceUpdate(accessory, params)
       await utils.sleep(garageConfig.operationTime * 100)
       gdService.updateCharacteristic(Characteristic.CurrentDoorState, newPos)
       accessory.context.inUse = false
     } catch (err) {
+      accessory.context.inUse = false
       this.platform.deviceUpdateError(accessory, err, true)
     }
   }

From 1e81de777fe02300fa720e30bcb95fd4568b4379 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 30 Sep 2020 18:12:27 +0100
Subject: [PATCH 0277/3183] improved ui for custom setups

---
 config.schema.json | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index e3c794e0..24211140 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -127,31 +127,31 @@
               "description": "The new type for this device.",
               "oneOf": [
                 {
-                  "title": "Blind",
+                  "title": "Blind (Generic Setup)",
                   "enum": [
                     "blind"
                   ]
                 },
                 {
-                  "title": "Garage Door",
+                  "title": "Garage Door (Generic Setup)",
                   "enum": [
                     "garage"
                   ]
                 },
                 {
-                  "title": "Garage Door (Eachen)",
+                  "title": "Garage Door (Eachen GD-DC5)",
                   "enum": [
                     "garage_eachen"
                   ]
                 },
                 {
-                  "title": "Lock",
+                  "title": "Lock (Generic Setup)",
                   "enum": [
                     "lock"
                   ]
                 },
                 {
-                  "title": "Irrigation",
+                  "title": "Irrigation (Generic Setup)",
                   "enum": [
                     "valve"
                   ]
@@ -162,7 +162,10 @@
               "type": "string",
               "title": "Device Setup",
               "default": "null",
-              "description": "The device setup. Blinds must be set up with two switches. Please ignore this setting for locks and irrigation.",
+              "description": "The setup for your garage doors.",
+              "condition": {
+                "functionBody": "return (model.groups[arrayIndices] && model.groups[arrayIndices].type==='garage')"
+              },
               "oneOf": [
                 {
                   "title": "One Switch - for up and down",
@@ -189,7 +192,10 @@
             "sensorId": {
               "type": "string",
               "title": "Sensor",
-              "description": "A Sonoff DW2 sensor can optionally be used for garage doors. This is to determine the current open/closed state of the garage door. Please enter the 10 digit device ID (normally in the format 1000ab23cd). Otherwise leave this blank."
+              "description": "A Sonoff DW2 sensor can optionally be used for garage doors. This is to determine the current open/closed state of the garage door. Please enter the 10 digit device ID (normally in the format 1000ab23cd). Otherwise leave this blank.",
+              "condition": {
+                "functionBody": "return (model.groups[arrayIndices] && model.groups[arrayIndices].type==='garage')"
+              }
             }
           }
         }

From 20cbbe6be8220a7cf1defb9f8ceedc4e4df0b8fe Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 1 Oct 2020 09:05:09 +0100
Subject: [PATCH 0278/3183] consistent function names

---
 lib/device/blind.js         |   8 +-
 lib/device/curtain.js       |   4 +-
 lib/device/fan.js           |   4 +-
 lib/device/garage-eachen.js |  14 +-
 lib/device/garage.js        |   4 +-
 lib/device/light.js         | 406 +++++++++++++++++-------------------
 lib/device/lock.js          |   4 +-
 lib/device/outlet.js        |   4 +-
 lib/device/rf-bridge.js     |   4 +-
 lib/device/scm.js           |   4 +-
 lib/device/sensor.js        |   2 +-
 lib/device/switch.js        |  46 ++--
 lib/device/thermostat.js    |   4 +-
 lib/device/usb.js           |   4 +-
 lib/device/valve.js         |   4 +-
 lib/device/zb-dev.js        |   2 +-
 16 files changed, 256 insertions(+), 262 deletions(-)

diff --git a/lib/device/blind.js b/lib/device/blind.js
index 9223338a..6584d7b3 100644
--- a/lib/device/blind.js
+++ b/lib/device/blind.js
@@ -9,7 +9,7 @@ module.exports = class deviceBlind {
     Characteristic = platform.api.hap.Characteristic
   }
 
-  async internalBlindUpdate (accessory, value, callback) {
+  async internalUpdate (accessory, value, callback) {
     callback()
     try {
       let blindConfig
@@ -22,7 +22,7 @@ module.exports = class deviceBlind {
       if (!(blindConfig = this.platform.cusG.get(accessory.context.hbDeviceId))) {
         throw new Error('group config missing')
       }
-      if (blindConfig.type !== 'blind' || blindConfig.setup !== 'twoSwitch') {
+      if (blindConfig.type !== 'blind') {
         throw new Error('improper configuration')
       }
       if (newTarget === prevPosition) return
@@ -67,4 +67,8 @@ module.exports = class deviceBlind {
       this.platform.deviceUpdateError(accessory, err, true)
     }
   }
+
+  externalUpdate (accessory, params) {
+    return true
+  }
 }
diff --git a/lib/device/curtain.js b/lib/device/curtain.js
index 73e5fc3f..1b5d07cb 100644
--- a/lib/device/curtain.js
+++ b/lib/device/curtain.js
@@ -7,7 +7,7 @@ module.exports = class deviceCurtain {
     Characteristic = platform.api.hap.Characteristic
   }
 
-  async internalCurtainUpdate (accessory, value, callback) {
+  async internalUpdate (accessory, value, callback) {
     callback()
     try {
       let params
@@ -34,7 +34,7 @@ module.exports = class deviceCurtain {
     }
   }
 
-  externalCurtainUpdate (accessory, params) {
+  externalUpdate (accessory, params) {
     try {
       const cService = accessory.getService(Service.WindowCovering)
       if (!Object.prototype.hasOwnProperty.call(params, 'switch') && !Object.prototype.hasOwnProperty.call(params, 'setclose')) {
diff --git a/lib/device/fan.js b/lib/device/fan.js
index 9e829390..16221475 100644
--- a/lib/device/fan.js
+++ b/lib/device/fan.js
@@ -7,7 +7,7 @@ module.exports = class deviceFan {
     Characteristic = platform.api.hap.Characteristic
   }
 
-  async internalFanUpdate (accessory, type, value, callback) {
+  async internalUpdate (accessory, type, value, callback) {
     callback()
     try {
       let newPower
@@ -49,7 +49,7 @@ module.exports = class deviceFan {
     }
   }
 
-  externalFanUpdate (accessory, params) {
+  externalUpdate (accessory, params) {
     try {
       let light
       let status
diff --git a/lib/device/garage-eachen.js b/lib/device/garage-eachen.js
index e3b683a2..dc27d4e6 100644
--- a/lib/device/garage-eachen.js
+++ b/lib/device/garage-eachen.js
@@ -8,13 +8,16 @@ module.exports = class deviceGarageEachen {
     Characteristic = platform.api.hap.Characteristic
   }
 
-  async internalGarageEachenUpdate (accessory, value, callback) {
+  async internalUpdate (accessory, value, callback) {
     callback()
     try {
       let garageConfig
       if (!(garageConfig = this.platform.cusG.get(accessory.context.hbDeviceId))) {
         throw new Error('group config missing')
       }
+      if (garageConfig.type !== 'garage_eachen') {
+        throw new Error('improper configuration')
+      }
       const params = {}
       const newPos = value
       const gdService = accessory.getService(Service.GarageDoorOpener)
@@ -35,11 +38,18 @@ module.exports = class deviceGarageEachen {
     }
   }
 
-  externalGarageEachenUpdate (accessory, params) {
+  externalUpdate (accessory, params) {
     try {
       if (!Object.prototype.hasOwnProperty.call(params, 'switch') || accessory.context.inUse) {
         return
       }
+      let garageConfig
+      if (!(garageConfig = this.platform.cusG.get(accessory.context.hbDeviceId))) {
+        throw new Error('group config missing')
+      }
+      if (garageConfig.type !== 'garage_eachen') {
+        throw new Error('improper configuration')
+      }
       const gdService = accessory.getService(Service.GarageDoorOpener)
       gdService.updateCharacteristic(Characteristic.CurrentDoorState, params.switch === 'on' ? 0 : 1)
       gdService.updateCharacteristic(Characteristic.TargetDoorState, params.switch === 'on' ? 0 : 1)
diff --git a/lib/device/garage.js b/lib/device/garage.js
index 5f4cd1dc..4c1270dc 100644
--- a/lib/device/garage.js
+++ b/lib/device/garage.js
@@ -8,7 +8,7 @@ module.exports = class deviceGarage {
     Characteristic = platform.api.hap.Characteristic
   }
 
-  async internalGarageUpdate (accessory, value, callback) {
+  async internalUpdate (accessory, value, callback) {
     callback()
     try {
       let garageConfig
@@ -72,7 +72,7 @@ module.exports = class deviceGarage {
     }
   }
 
-  externalGarageUpdate (accessory, params) {
+  externalUpdate (accessory, params) {
     try {
       if (!Object.prototype.hasOwnProperty.call(params, 'switch') && !Object.prototype.hasOwnProperty.call(params, 'switches')) {
         return
diff --git a/lib/device/light.js b/lib/device/light.js
index cd8fe085..3b210f76 100644
--- a/lib/device/light.js
+++ b/lib/device/light.js
@@ -10,131 +10,117 @@ module.exports = class deviceLight {
     Characteristic = platform.api.hap.Characteristic
   }
 
-  async internalLightbulbUpdate (accessory, value, callback) {
+  async internalUpdate (accessory, type, value, callback) {
     callback()
     try {
       let oAccessory
-      const params = {}
+      let newRGB
+      let params = {}
       const lightService = accessory.getService(Service.Lightbulb)
-      switch (accessory.context.switchNumber) {
-        case 'X':
-          if (accessory.context.eweUIID === 22) {
-            //* ** B1 ***\\
-            params.state = value ? 'on' : 'off'
-          } else {
-            params.switch = value ? 'on' : 'off'
+      switch (type) {
+        case 'onoff':
+          switch (accessory.context.switchNumber) {
+            case 'X':
+              if (accessory.context.eweUIID === 22) {
+              //* ** B1 ***\\
+                params.state = value ? 'on' : 'off'
+              } else {
+                params.switch = value ? 'on' : 'off'
+              }
+              break
+            case '0':
+              params.switches = cns.defaultMultiSwitchOff
+              params.switches[0].switch = value ? 'on' : 'off'
+              params.switches[1].switch = value ? 'on' : 'off'
+              params.switches[2].switch = value ? 'on' : 'off'
+              params.switches[3].switch = value ? 'on' : 'off'
+              break
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+              params.switches = cns.defaultMultiSwitchOff
+              for (let i = 1; i <= 4; i++) {
+                if ((oAccessory = this.platform.devicesInHB.get(accessory.context.eweDeviceId + 'SW' + i))) {
+                  i === parseInt(accessory.context.switchNumber)
+                    ? (params.switches[i - 1].switch = value ? 'on' : 'off')
+                    : (params.switches[i - 1].switch = oAccessory
+                      .getService(Service.Lightbulb)
+                      .getCharacteristic(Characteristic.On).value
+                      ? 'on'
+                      : 'off')
+                } else {
+                  params.switches[i - 1].switch = 'off'
+                }
+              }
+              break
           }
-          break
-        case '0':
-          params.switches = cns.defaultMultiSwitchOff
-          params.switches[0].switch = value ? 'on' : 'off'
-          params.switches[1].switch = value ? 'on' : 'off'
-          params.switches[2].switch = value ? 'on' : 'off'
-          params.switches[3].switch = value ? 'on' : 'off'
-          break
-        case '1':
-        case '2':
-        case '3':
-        case '4':
-          params.switches = cns.defaultMultiSwitchOff
-          for (let i = 1; i <= 4; i++) {
-            if ((oAccessory = this.platform.devicesInHB.get(accessory.context.eweDeviceId + 'SW' + i))) {
-              i === parseInt(accessory.context.switchNumber)
-                ? (params.switches[i - 1].switch = value ? 'on' : 'off')
-                : (params.switches[i - 1].switch = oAccessory
-                  .getService(Service.Lightbulb)
-                  .getCharacteristic(Characteristic.On).value
-                  ? 'on'
-                  : 'off')
-            } else {
-              params.switches[i - 1].switch = 'off'
+          await this.platform.sendDeviceUpdate(accessory, params)
+          switch (accessory.context.switchNumber) {
+            case 'X':
+              lightService.updateCharacteristic(Characteristic.On, value)
+              break
+            case '0':
+              for (let i = 0; i <= 4; i++) {
+                if ((oAccessory = this.platform.devicesInHB.get(accessory.context.eweDeviceId + 'SW' + i))) {
+                  oAccessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, value)
+                }
+              }
+              break
+            case '1':
+            case '2':
+            case '3':
+            case '4': {
+              lightService.updateCharacteristic(Characteristic.On, value)
+              let masterState = 'off'
+              for (let i = 1; i <= 4; i++) {
+                if ((oAccessory = this.platform.devicesInHB.get(accessory.context.eweDeviceId + 'SW' + i))) {
+                  if (oAccessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On).value) {
+                    masterState = 'on'
+                  }
+                }
+              }
+              if (!this.platform.hiddenMasters.includes(accessory.context.eweDeviceId)) {
+                oAccessory = this.platform.devicesInHB.get(accessory.context.eweDeviceId + 'SW0')
+                oAccessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, masterState === 'on')
+              }
+              break
             }
           }
           break
-      }
-      await this.platform.sendDeviceUpdate(accessory, params)
-      switch (accessory.context.switchNumber) {
-        case 'X':
-          lightService.updateCharacteristic(Characteristic.On, value)
-          break
-        case '0':
-          for (let i = 0; i <= 4; i++) {
-            if ((oAccessory = this.platform.devicesInHB.get(accessory.context.eweDeviceId + 'SW' + i))) {
-              oAccessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, value)
+        case 'brightness':
+          if (value === 0) {
+            params.switch = 'off'
+          } else {
+            if (!lightService.getCharacteristic(Characteristic.On).value) {
+              params.switch = 'on'
             }
-          }
-          break
-        case '1':
-        case '2':
-        case '3':
-        case '4': {
-          lightService.updateCharacteristic(Characteristic.On, value)
-          let masterState = 'off'
-          for (let i = 1; i <= 4; i++) {
-            if ((oAccessory = this.platform.devicesInHB.get(accessory.context.eweDeviceId + 'SW' + i))) {
-              if (oAccessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On).value) {
-                masterState = 'on'
-              }
+            switch (accessory.context.eweUIID) {
+              case 36: //* ** KING-M4 ***\\
+                params.bright = Math.round((value * 9) / 10 + 10)
+                break
+              case 44: //* ** D1 ***\\
+                params.brightness = value
+                params.mode = 0
+                break
             }
           }
-          if (!this.platform.hiddenMasters.includes(accessory.context.eweDeviceId)) {
-            oAccessory = this.platform.devicesInHB.get(accessory.context.eweDeviceId + 'SW0')
-            oAccessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, masterState === 'on')
+          await utils.sleep(250)
+          await this.platform.sendDeviceUpdate(accessory, params)
+          if (value === 0) {
+            lightService.updateCharacteristic(Characteristic.On, false)
+          } else {
+            lightService.updateCharacteristic(Characteristic.Brightness, value)
           }
           break
-        }
-      }
-    } catch (err) {
-      this.platform.deviceUpdateError(accessory, err, true)
-    }
-  }
-
-  async internalBrightnessUpdate (accessory, value, callback) {
-    callback()
-    try {
-      const params = {}
-      const lightService = accessory.getService(Service.Lightbulb)
-      if (value === 0) {
-        params.switch = 'off'
-      } else {
-        if (!lightService.getCharacteristic(Characteristic.On).value) {
-          params.switch = 'on'
-        }
-        switch (accessory.context.eweUIID) {
-          case 36: //* ** KING-M4 ***\\
-            params.bright = Math.round((value * 9) / 10 + 10)
-            break
-          case 44: //* ** D1 ***\\
-            params.brightness = value
-            params.mode = 0
-            break
-        }
-      }
-      await utils.sleep(250)
-      await this.platform.sendDeviceUpdate(accessory, params)
-      if (value === 0) {
-        lightService.updateCharacteristic(Characteristic.On, false)
-      } else {
-        lightService.updateCharacteristic(Characteristic.Brightness, value)
-      }
-    } catch (err) {
-      this.platform.deviceUpdateError(accessory, err, true)
-    }
-  }
-
-  async internalHSBUpdate (accessory, type, value, callback) {
-    callback()
-    try {
-      let newRGB
-      let params = {}
-      const lightService = accessory.getService(Service.Lightbulb)
-      const curHue = lightService.getCharacteristic(Characteristic.Hue).value
-      const curSat = lightService.getCharacteristic(Characteristic.Saturation).value
-      switch (type) {
-        case 'hue':
-          newRGB = convert.hsv.rgb(value, curSat, 100)
+        case 'c_brightness':
           switch (accessory.context.eweUIID) {
             case 22: //* ** B1 ***\\
+              newRGB = convert.hsv.rgb(
+                lightService.getCharacteristic(Characteristic.Hue).value,
+                lightService.getCharacteristic(Characteristic.Saturation).value,
+                value
+              )
               params = {
                 zyx_mode: 2,
                 type: 'middle',
@@ -148,17 +134,18 @@ module.exports = class deviceLight {
             case 59: //* ** L1 ***\\
               params = {
                 mode: 1,
-                colorR: newRGB[0],
-                colorG: newRGB[1],
-                colorB: newRGB[2]
+                bright: value
               }
               break
           }
+          await utils.sleep(250)
+          await this.platform.sendDeviceUpdate(accessory, params)
+          lightService.updateCharacteristic(Characteristic.Brightness, value)
           break
-        case 'bri':
+        case 'c_hue':
+          newRGB = convert.hsv.rgb(value, lightService.getCharacteristic(Characteristic.Saturation).value, 100)
           switch (accessory.context.eweUIID) {
             case 22: //* ** B1 ***\\
-              newRGB = convert.hsv.rgb(curHue, curSat, value)
               params = {
                 zyx_mode: 2,
                 type: 'middle',
@@ -172,117 +159,114 @@ module.exports = class deviceLight {
             case 59: //* ** L1 ***\\
               params = {
                 mode: 1,
-                bright: value
+                colorR: newRGB[0],
+                colorG: newRGB[1],
+                colorB: newRGB[2]
               }
               break
           }
-          break
-      }
-      await utils.sleep(250)
-      await this.platform.sendDeviceUpdate(accessory, params)
-      switch (type) {
-        case 'hue':
+          await utils.sleep(250)
+          await this.platform.sendDeviceUpdate(accessory, params)
           lightService.updateCharacteristic(Characteristic.Hue, value)
           break
-        case 'bri':
-          lightService.updateCharacteristic(Characteristic.Brightness, value)
-          break
       }
     } catch (err) {
       this.platform.deviceUpdateError(accessory, err, true)
     }
   }
 
-  externalSingleLightUpdate (accessory, params) {
+  externalUpdate (accessory, params) {
     try {
-      let newColour
-      let mode
-      let isOn = false
-      const lightService = accessory.getService(Service.Lightbulb)
-      if (accessory.context.eweUIID === 22 && Object.prototype.hasOwnProperty.call(params, 'state')) {
-        isOn = params.state === 'on'
-      } else if (accessory.context.eweUIID !== 22 && Object.prototype.hasOwnProperty.call(params, 'switch')) {
-        isOn = params.switch === 'on'
-      } else {
-        isOn = lightService.getCharacteristic(Characteristic.On).value
-      }
-      if (isOn) {
-        lightService.updateCharacteristic(Characteristic.On, true)
-        switch (accessory.context.eweUIID) {
-          case 36: // KING-M4
-            if (Object.prototype.hasOwnProperty.call(params, 'bright')) {
-              const nb = Math.round(((params.bright - 10) * 10) / 9) // eWeLink scale is 10-100 and HomeKit scale is 0-100.
-              lightService.updateCharacteristic(Characteristic.Brightness, nb)
-            }
-            break
-          case 44: // D1
-            if (Object.prototype.hasOwnProperty.call(params, 'brightness')) {
-              lightService.updateCharacteristic(Characteristic.Brightness, params.brightness)
-            }
-            break
-          case 22: // B1
-            if (Object.prototype.hasOwnProperty.call(params, 'zyx_mode')) {
-              mode = parseInt(params.zyx_mode)
-            } else if (Object.prototype.hasOwnProperty.call(params, 'channel0') && parseInt(params.channel0) + parseInt(params.channel1) > 0) {
-              mode = 1
-            } else {
-              mode = 2
-            }
-            if (mode === 2) {
-              lightService.updateCharacteristic(Characteristic.On, true)
-              newColour = convert.rgb.hsv(
-                parseInt(params.channel2),
-                parseInt(params.channel3),
-                parseInt(params.channel4)
-              )
-              lightService
-                .updateCharacteristic(Characteristic.Hue, newColour[0])
-                .updateCharacteristic(Characteristic.Saturation, 100)
-                .updateCharacteristic(Characteristic.Brightness, 100)
-            } else if (mode === 1) {
-              throw new Error('has been set to white mode which is not supported')
-            }
-            break
-          case 59: // L1
-            if (Object.prototype.hasOwnProperty.call(params, 'bright')) {
-              lightService.updateCharacteristic(Characteristic.Brightness, params.bright)
-            }
-            if (Object.prototype.hasOwnProperty.call(params, 'colorR')) {
-              newColour = convert.rgb.hsv(params.colorR, params.colorG, params.colorB)
-              lightService
-                .updateCharacteristic(Characteristic.Hue, newColour[0])
-                .updateCharacteristic(Characteristic.Saturation, newColour[1])
-            }
-            break
-          default:
-            return
+      if (
+        cns.devicesSingleSwitch.includes(accessory.context.eweUIID) &&
+        cns.devicesSingleSwitchLight.includes(accessory.context.eweModel)
+      ) {
+        let newColour
+        let mode
+        let isOn = false
+        const lightService = accessory.getService(Service.Lightbulb)
+        if (accessory.context.eweUIID === 22 && Object.prototype.hasOwnProperty.call(params, 'state')) {
+          isOn = params.state === 'on'
+        } else if (accessory.context.eweUIID !== 22 && Object.prototype.hasOwnProperty.call(params, 'switch')) {
+          isOn = params.switch === 'on'
+        } else {
+          isOn = lightService.getCharacteristic(Characteristic.On).value
         }
-      } else {
-        lightService.updateCharacteristic(Characteristic.On, false)
-      }
-    } catch (err) {
-      this.platform.deviceUpdateError(accessory, err, false)
-    }
-  }
-
-  externalMultiLightUpdate (accessory, params) {
-    try {
-      if (!Object.prototype.hasOwnProperty.call(params, 'switches')) return
-      const idToCheck = accessory.context.hbDeviceId.slice(0, -1)
-      let primaryState = false
-      for (let i = 1; i <= accessory.context.channelCount; i++) {
-        if (this.platform.devicesInHB.has(idToCheck + i)) {
-          const oAccessory = this.platform.devicesInHB.get(idToCheck + i)
-          oAccessory
-            .getService(Service.Lightbulb)
-            .updateCharacteristic(Characteristic.On, params.switches[i - 1].switch === 'on')
-          if (params.switches[i - 1].switch === 'on') {
-            primaryState = true
+        if (isOn) {
+          lightService.updateCharacteristic(Characteristic.On, true)
+          switch (accessory.context.eweUIID) {
+            case 36: // KING-M4
+              if (Object.prototype.hasOwnProperty.call(params, 'bright')) {
+                const nb = Math.round(((params.bright - 10) * 10) / 9) // eWeLink scale is 10-100 and HomeKit scale is 0-100.
+                lightService.updateCharacteristic(Characteristic.Brightness, nb)
+              }
+              break
+            case 44: // D1
+              if (Object.prototype.hasOwnProperty.call(params, 'brightness')) {
+                lightService.updateCharacteristic(Characteristic.Brightness, params.brightness)
+              }
+              break
+            case 22: // B1
+              if (Object.prototype.hasOwnProperty.call(params, 'zyx_mode')) {
+                mode = parseInt(params.zyx_mode)
+              } else if (Object.prototype.hasOwnProperty.call(params, 'channel0') && parseInt(params.channel0) + parseInt(params.channel1) > 0) {
+                mode = 1
+              } else {
+                mode = 2
+              }
+              if (mode === 2) {
+                lightService.updateCharacteristic(Characteristic.On, true)
+                newColour = convert.rgb.hsv(
+                  parseInt(params.channel2),
+                  parseInt(params.channel3),
+                  parseInt(params.channel4)
+                )
+                lightService
+                  .updateCharacteristic(Characteristic.Hue, newColour[0])
+                  .updateCharacteristic(Characteristic.Saturation, 100)
+                  .updateCharacteristic(Characteristic.Brightness, 100)
+              } else if (mode === 1) {
+                throw new Error('has been set to white mode which is not supported')
+              }
+              break
+            case 59: // L1
+              if (Object.prototype.hasOwnProperty.call(params, 'bright')) {
+                lightService.updateCharacteristic(Characteristic.Brightness, params.bright)
+              }
+              if (Object.prototype.hasOwnProperty.call(params, 'colorR')) {
+                newColour = convert.rgb.hsv(params.colorR, params.colorG, params.colorB)
+                lightService
+                  .updateCharacteristic(Characteristic.Hue, newColour[0])
+                  .updateCharacteristic(Characteristic.Saturation, newColour[1])
+              }
+              break
+            default:
+              return
           }
+        } else {
+          lightService.updateCharacteristic(Characteristic.On, false)
+        }
+      } else if (
+        cns.devicesMultiSwitch.includes(accessory.context.eweUIID) &&
+        cns.devicesMultiSwitchLight.includes(accessory.context.eweModel)
+      ) {
+        if (!Object.prototype.hasOwnProperty.call(params, 'switches')) return
+        const idToCheck = accessory.context.hbDeviceId.slice(0, -1)
+        let primaryState = false
+        for (let i = 1; i <= accessory.context.channelCount; i++) {
+          if (this.platform.devicesInHB.has(idToCheck + i)) {
+            const oAccessory = this.platform.devicesInHB.get(idToCheck + i)
+            oAccessory
+              .getService(Service.Lightbulb)
+              .updateCharacteristic(Characteristic.On, params.switches[i - 1].switch === 'on')
+            if (params.switches[i - 1].switch === 'on') {
+              primaryState = true
+            }
+          }
+        }
+        if (!this.platform.hiddenMasters.includes(accessory.context.eweDeviceId)) {
+          accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, primaryState)
         }
-      }
-      if (!this.platform.hiddenMasters.includes(accessory.context.eweDeviceId)) {
-        accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, primaryState)
       }
     } catch (err) {
       this.platform.deviceUpdateError(accessory, err, false)
diff --git a/lib/device/lock.js b/lib/device/lock.js
index e82e3882..8a4972be 100644
--- a/lib/device/lock.js
+++ b/lib/device/lock.js
@@ -8,7 +8,7 @@ module.exports = class deviceLock {
     Characteristic = platform.api.hap.Characteristic
   }
 
-  async internalLockUpdate (accessory, value, callback) {
+  async internalUpdate (accessory, value, callback) {
     callback()
     try {
       let lockConfig
@@ -37,7 +37,7 @@ module.exports = class deviceLock {
     }
   }
 
-  externalLockUpdate (accessory, params) {
+  externalUpdate (accessory, params) {
     try {
       if (!Object.prototype.hasOwnProperty.call(params, 'switch')) return
       let lockConfig
diff --git a/lib/device/outlet.js b/lib/device/outlet.js
index c244e42f..56e31434 100644
--- a/lib/device/outlet.js
+++ b/lib/device/outlet.js
@@ -9,7 +9,7 @@ module.exports = class deviceOutlet {
     EveService = new hbLib.EveHomeKitTypes(platform.api)
   }
 
-  async internalOutletUpdate (accessory, value, callback) {
+  async internalUpdate (accessory, value, callback) {
     callback()
     try {
       const params = {
@@ -23,7 +23,7 @@ module.exports = class deviceOutlet {
     }
   }
 
-  externalOutletUpdate (accessory, params) {
+  externalUpdate (accessory, params) {
     try {
       const outletService = accessory.getService(Service.Outlet)
       if (Object.prototype.hasOwnProperty.call(params, 'switch')) {
diff --git a/lib/device/rf-bridge.js b/lib/device/rf-bridge.js
index cb49dd63..2e988d4c 100644
--- a/lib/device/rf-bridge.js
+++ b/lib/device/rf-bridge.js
@@ -8,7 +8,7 @@ module.exports = class deviceRFBridge {
     Characteristic = platform.api.hap.Characteristic
   }
 
-  async internalRFUpdate (accessory, rfChl, service, callback) {
+  async internalUpdate (accessory, rfChl, service, callback) {
     callback()
     try {
       const params = {
@@ -25,7 +25,7 @@ module.exports = class deviceRFBridge {
     }
   }
 
-  externalRFUpdate (accessory, params) {
+  externalUpdate (accessory, params) {
     try {
       if (!Object.prototype.hasOwnProperty.call(params, 'updateSource')) return
       const timeNow = new Date()
diff --git a/lib/device/scm.js b/lib/device/scm.js
index 501bdb29..98dc1357 100644
--- a/lib/device/scm.js
+++ b/lib/device/scm.js
@@ -8,7 +8,7 @@ module.exports = class deviceSCM {
     Characteristic = platform.api.hap.Characteristic
   }
 
-  async internalSCMUpdate (accessory, value, callback) {
+  async internalUpdate (accessory, value, callback) {
     callback()
     try {
       const params = {
@@ -23,7 +23,7 @@ module.exports = class deviceSCM {
     }
   }
 
-  externalSCMUpdate (accessory, params) {
+  externalUpdate (accessory, params) {
     try {
       if (!Object.prototype.hasOwnProperty.call(params, 'switches')) return
       accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, params.switches[0].switch === 'on')
diff --git a/lib/device/sensor.js b/lib/device/sensor.js
index 844bca01..47a4bd2b 100644
--- a/lib/device/sensor.js
+++ b/lib/device/sensor.js
@@ -7,7 +7,7 @@ module.exports = class deviceSensor {
     Characteristic = platform.api.hap.Characteristic
   }
 
-  externalSensorUpdate (accessory, params) {
+  externalUpdate (accessory, params) {
     try {
       if (Object.prototype.hasOwnProperty.call(params, 'battery')) {
         const batteryService =
diff --git a/lib/device/switch.js b/lib/device/switch.js
index 9a70c3c1..a7422968 100644
--- a/lib/device/switch.js
+++ b/lib/device/switch.js
@@ -8,7 +8,7 @@ module.exports = class deviceSwitch {
     Characteristic = platform.api.hap.Characteristic
   }
 
-  async internalSwitchUpdate (accessory, value, callback) {
+  async internalUpdate (accessory, value, callback) {
     callback()
     try {
       let oAccessory
@@ -82,33 +82,29 @@ module.exports = class deviceSwitch {
     }
   }
 
-  externalSingleSwitchUpdate (accessory, params) {
+  externalUpdate (accessory, params) {
     try {
-      if (!Object.prototype.hasOwnProperty.call(params, 'switch')) return
-      accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, params.switch === 'on')
-    } catch (err) {
-      this.platform.deviceUpdateError(accessory, err, false)
-    }
-  }
-
-  externalMultiSwitchUpdate (accessory, params) {
-    try {
-      if (!Object.prototype.hasOwnProperty.call(params, 'switches')) return
-      const idToCheck = accessory.context.hbDeviceId.slice(0, -1)
-      let primaryState = false
-      for (let i = 1; i <= accessory.context.channelCount; i++) {
-        if (this.platform.devicesInHB.has(idToCheck + i)) {
-          const oAccessory = this.platform.devicesInHB.get(idToCheck + i)
-          oAccessory
-            .getService(Service.Switch)
-            .updateCharacteristic(Characteristic.On, params.switches[i - 1].switch === 'on')
-          if (params.switches[i - 1].switch === 'on') {
-            primaryState = true
+      if (cns.devicesSingleSwitch.includes(accessory.context.eweUIID)) {
+        if (!Object.prototype.hasOwnProperty.call(params, 'switch')) return
+        accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, params.switch === 'on')
+      } else if (cns.devicesMultiSwitch.includes(accessory.context.eweUIID)) {
+        if (!Object.prototype.hasOwnProperty.call(params, 'switches')) return
+        const idToCheck = accessory.context.hbDeviceId.slice(0, -1)
+        let primaryState = false
+        for (let i = 1; i <= accessory.context.channelCount; i++) {
+          if (this.platform.devicesInHB.has(idToCheck + i)) {
+            const oAccessory = this.platform.devicesInHB.get(idToCheck + i)
+            oAccessory
+              .getService(Service.Switch)
+              .updateCharacteristic(Characteristic.On, params.switches[i - 1].switch === 'on')
+            if (params.switches[i - 1].switch === 'on') {
+              primaryState = true
+            }
           }
         }
-      }
-      if (!this.platform.hiddenMasters.includes(accessory.context.eweDeviceId)) {
-        accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, primaryState)
+        if (!this.platform.hiddenMasters.includes(accessory.context.eweDeviceId)) {
+          accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, primaryState)
+        }
       }
     } catch (err) {
       this.platform.deviceUpdateError(accessory, err, false)
diff --git a/lib/device/thermostat.js b/lib/device/thermostat.js
index ba86d219..b987d601 100644
--- a/lib/device/thermostat.js
+++ b/lib/device/thermostat.js
@@ -7,7 +7,7 @@ module.exports = class deviceThermostat {
     Characteristic = platform.api.hap.Characteristic
   }
 
-  async internalThermostatUpdate (accessory, value, callback) {
+  async internalUpdate (accessory, value, callback) {
     callback()
     try {
       const params = {
@@ -22,7 +22,7 @@ module.exports = class deviceThermostat {
     }
   }
 
-  externalThermostatUpdate (accessory, params) {
+  externalUpdate (accessory, params) {
     try {
       if (
         !this.platform.config.hideTHSwitch &&
diff --git a/lib/device/usb.js b/lib/device/usb.js
index 67a58833..a2305136 100644
--- a/lib/device/usb.js
+++ b/lib/device/usb.js
@@ -8,7 +8,7 @@ module.exports = class deviceUSB {
     Characteristic = platform.api.hap.Characteristic
   }
 
-  async internalUSBUpdate (accessory, value, callback) {
+  async internalUpdate (accessory, value, callback) {
     callback()
     try {
       const params = {
@@ -23,7 +23,7 @@ module.exports = class deviceUSB {
     }
   }
 
-  externalUSBUpdate (accessory, params) {
+  externalUpdate (accessory, params) {
     try {
       if (!Object.prototype.hasOwnProperty.call(params, 'switches')) return
       accessory.getService(Service.Outlet).updateCharacteristic(Characteristic.On, params.switches[0].switch === 'on')
diff --git a/lib/device/valve.js b/lib/device/valve.js
index c7d1dab8..8522fd19 100644
--- a/lib/device/valve.js
+++ b/lib/device/valve.js
@@ -6,7 +6,7 @@ module.exports = class deviceValve {
     Characteristic = platform.api.hap.Characteristic
   }
 
-  async internalValveUpdate (accessory, valve, value, callback) {
+  async internalUpdate (accessory, valve, value, callback) {
     callback()
     try {
       let valveConfig
@@ -54,7 +54,7 @@ module.exports = class deviceValve {
     }
   }
 
-  externalValveUpdate (accessory, params) {
+  externalUpdate (accessory, params) {
     try {
       if (!Object.prototype.hasOwnProperty.call(params, 'switches')) return
       let valveConfig
diff --git a/lib/device/zb-dev.js b/lib/device/zb-dev.js
index 365cedb8..d4e9cec5 100644
--- a/lib/device/zb-dev.js
+++ b/lib/device/zb-dev.js
@@ -7,7 +7,7 @@ module.exports = class deviceZBDev {
     Characteristic = platform.api.hap.Characteristic
   }
 
-  externalZBUpdate (accessory, params) {
+  externalUpdate (accessory, params) {
     try {
       //* ** credit @tasict ***\\
       if (Object.prototype.hasOwnProperty.call(params, 'battery')) {

From 8c9ab90b1d2042435faa05785a9f627307c8d0d9 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 1 Oct 2020 09:05:28 +0100
Subject: [PATCH 0279/3183] code cleanups

---
 lib/eWeLink.js | 276 +++++++++++--------------------------------------
 1 file changed, 58 insertions(+), 218 deletions(-)

diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index 216a93af..92ff7214 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -29,9 +29,8 @@ class eWeLink {
   constructor (log, config, api) {
     if (!log || !api || !config) return
     if (!config.username || !config.password || !config.countryCode) {
-      log.error('*********** Cannot load homebridge-ewelink ************')
-      log.error('eWeLink credentials missing from the Homebridge config.')
-      log.error('*******************************************************')
+      log.error('************* Cannot load homebridge-ewelink *************')
+      log.error('*** eWeLink credentials missing from Homebridge config ***')
       return
     }
     this.log = log
@@ -65,29 +64,22 @@ class eWeLink {
       this.lanDevices = await this.lanClient.getHosts()
       await this.lanClient.startMonitor();
       (() => {
-        //* ** Make a map of custom groups from Homebridge config ***\\
         if (Object.keys(this.config.groups || []).length > 0) {
           this.config.groups
             .filter(g => Object.prototype.hasOwnProperty.call(g, 'type') && cns.allowedGroups.includes(g.type))
             .filter(g => Object.prototype.hasOwnProperty.call(g, 'deviceId') && this.devicesInEW.has(g.deviceId))
             .forEach(g => this.cusG.set(g.deviceId + 'SWX', g))
         }
-        //* ** Make a map of RF Bridge custom sensors from Homebridge config ***\\
         if (Object.keys(this.config.bridgeSensors || []).length > 0) {
           this.config.bridgeSensors
             .filter(s => Object.prototype.hasOwnProperty.call(s, 'deviceId') && this.devicesInEW.has(s.deviceId))
             .forEach(s => this.cusS.set(s.fullDeviceId, s))
         }
-        //* ** Logging always helps to see if everything is okay so far ***\\
         this.log('[%s] eWeLink devices loaded from the Homebridge cache.', this.devicesInHB.size)
         this.log('[%s] primary devices loaded from your eWeLink account.', this.devicesInEW.size)
-        //* ** Remove Homebridge accessories that don't appear in eWeLink ***\\
         this.devicesInHB.forEach(a => {
-          if (!this.devicesInEW.has(a.context.eweDeviceId)) {
-            this.removeAccessory(a)
-          }
+          if (!this.devicesInEW.has(a.context.eweDeviceId)) this.removeAccessory(a)
         })
-        //* ** Synchronise devices between eWeLink and Homebridge and set up WS/LAN listeners ***\\
         this.devicesInEW.forEach(d => this.initialiseDevice(d))
         this.wsClient.receiveUpdate(d => this.receiveDeviceUpdate(d))
         this.lanClient.receiveUpdate(d => this.receiveDeviceUpdate(d))
@@ -111,17 +103,16 @@ class eWeLink {
           }
         )
         this.log("eWeLink sync complete. Don't forget to ⭐️  this plugin on GitHub!")
-        if (this.config.debugReqRes || false) {
+        if (this.config.debugReqRes) {
           this.log.warn("Note: 'Request & Response Logging' is not advised for long-term use.")
         }
       })()
     } catch (err) {
-      this.log.error('************** Cannot load homebridge-ewelink **************')
+      this.log.error('************* Cannot load homebridge-ewelink *************')
       this.log.error(this.debug ? err : err.message)
-      this.log.error('************************************************************')
       try {
-        if (this.lanClient) await this.lanClient.closeConnection()
-        if (this.wsClient) await this.wsClient.closeConnection()
+        if (this.lanClient) this.lanClient.closeConnection()
+        if (this.wsClient) this.wsClient.closeConnection()
       } catch (err) {
         this.log.warn(this.debug ? err : err.message)
       }
@@ -129,10 +120,10 @@ class eWeLink {
     }
   }
 
-  async eWeLinkShutdown () {
+  eWeLinkShutdown () {
     try {
-      if (this.lanClient) await this.lanClient.closeConnection()
-      if (this.wsClient) await this.wsClient.closeConnection()
+      if (this.lanClient) this.lanClient.closeConnection()
+      if (this.wsClient) this.wsClient.closeConnection()
     } catch (err) {
       this.log.warn(this.debug ? err : err.message)
     }
@@ -141,23 +132,12 @@ class eWeLink {
 
   initialiseDevice (device) {
     let accessory
-    //* ** CURTAINS ***\\
     if (cns.devicesCurtain.includes(device.extra.uiid)) {
       accessory = this.devicesInHB.has(device.deviceid + 'SWX')
         ? this.devicesInHB.get(device.deviceid + 'SWX')
         : this.addAccessory(device, device.deviceid + 'SWX', 'curtain', false, {
           cacheCurrentPosition: 0
         })
-      //* ** @UPGRADE from v2 -> v3  23.09.2020 ***\\
-      if (Object.prototype.hasOwnProperty.call(accessory.context, 'prevPos')) {
-        accessory.context.cacheCurrentPosition = accessory.context.prevPos
-        delete accessory.context.prevPos
-        //* ** @ENDUPGRADE ***\\
-      }
-      if (!Object.prototype.hasOwnProperty.call(accessory.context, 'cacheCurrentPosition')) {
-        accessory.context.cacheCurrentPosition = 0
-        //* ** @ENDUPGRADE ***\\
-      }
     } else if (this.cusG.has(device.deviceid + 'SWX') && this.cusG.get(device.deviceid + 'SWX').type === 'blind') {
       accessory = this.devicesInHB.has(device.deviceid + 'SWX')
         ? this.devicesInHB.get(device.deviceid + 'SWX')
@@ -166,13 +146,6 @@ class eWeLink {
           cachePositionState: 2,
           cacheTargetPosition: 0
         })
-      //* ** @UPGRADE from v2 -> v3  23.09.2020 ***\\
-      if (!Object.prototype.hasOwnProperty.call(accessory.context, 'cacheCurrentPosition')) {
-        accessory.context.cacheCurrentPosition = 0
-        accessory.context.cachePositionState = 2
-        accessory.context.cacheTargetPosition = 0
-      }
-      //* ** @ENDUPGRADE ***\\
     } else if (this.cusG.has(device.deviceid + 'SWX') && this.cusG.get(device.deviceid + 'SWX').type === 'garage') {
       accessory = this.devicesInHB.has(device.deviceid + 'SWX')
         ? this.devicesInHB.get(device.deviceid + 'SWX')
@@ -180,12 +153,6 @@ class eWeLink {
           cacheCurrentDoorState: 1,
           cacheTargetDoorState: 1
         })
-      //* ** @UPGRADE from v2 -> v3  23.09.2020 ***\\
-      if (!Object.prototype.hasOwnProperty.call(accessory.context, 'cacheCurrentDoorState')) {
-        accessory.context.cacheCurrentDoorState = 1
-        accessory.context.cacheTargetDoorState = 1
-      }
-      //* ** @ENDUPGRADE ***\\
     } else if (this.cusG.has(device.deviceid + 'SWX') && this.cusG.get(device.deviceid + 'SWX').type === 'garage_eachen') {
       accessory = this.devicesInHB.has(device.deviceid + 'SWX')
         ? this.devicesInHB.get(device.deviceid + 'SWX')
@@ -212,16 +179,6 @@ class eWeLink {
         : this.addAccessory(device, device.deviceid + 'SWX', 'thermostat', false, {
           sensorType: device.params.sensorType
         })
-      //* ** @UPGRADE from v2 -> v3  23.09.2020 ***\\
-      if (!Object.prototype.hasOwnProperty.call(accessory.context, 'sensorType')) {
-        accessory.context.sensorType = device.params.sensorType
-      }
-      if (accessory.context.sensorType === 'DS18B20') {
-        if (accessory.getService(Service.HumiditySensor)) {
-          accessory.removeService(Service.HumiditySensor)
-        }
-      }
-      //* ** @ENDUPGRADE ***\\
       if (accessory.context.sensorType !== device.params.sensorType) {
         accessory.context.sensorType = device.params.sensorType
         this.devicesInHB.set(accessory.context.hbDeviceId, accessory)
@@ -334,7 +291,7 @@ class eWeLink {
           rfMap
         })
       accessory.control = new DeviceRFBridge(this)
-      // this.log.error(JSON.stringify(accessory.context, null, 2))
+      this.hiddenMasters.push(device.deviceid)
       rfMap.forEach(subDevice => {
         const swNumber = rfChlCounter + 1
         let subAccessory
@@ -374,42 +331,23 @@ class eWeLink {
         subAccessory.context.reachableWAN = device.online
         subAccessory.context.reachableLAN = false
         this.devicesInHB.set(subAccessory.context.hbDeviceId, subAccessory)
-        // this.log.warn(JSON.stringify(subAccessory.context, null, 2))
         rfChlCounter += Object.keys(subDevice.buttons || {}).length
       })
       accessory.context.channelCount = rfChlCounter
       this.devicesInHB.set(accessory.context.hbDeviceId, accessory)
-    } else if (cns.devicesZBBridge.includes(device.extra.uiid)) {
-      // Nothing to do here but needed to avoid the below not supported error
-      //* ** @UPGRADE from v2 -> v3  23.09.2020 ***\\
-      if ((accessory = this.devicesInHB.get(device.deviceid + 'SWX'))) {
-        this.removeAccessory(accessory)
-      }
-      //* ** @ENDUPGRADE ***\\
     } else if (cns.devicesZB.includes(device.extra.uiid)) {
       accessory = this.devicesInHB.has(device.deviceid + 'SWX')
         ? this.devicesInHB.get(device.deviceid + 'SWX')
         : this.addAccessory(device, device.deviceid + 'SWX', 'zb_dev')
-      //* ** @UPGRADE from v2 -> v3  23.09.2020 ***\\
-      if (accessory.context.type === 'zb_sub') {
-        accessory.context.type = 'zb_dev'
-      }
-      //* ** @ENDUPGRADE ***\\
     } else if (cns.devicesCamera.includes(device.extra.uiid)) {
-      this.log.warn(
-        ' → [%s] please see "https://github.com/bwp91/homebridge-ewelink/wiki/How-to-set-up-Sonoff-Camera".',
-        device.name
-      )
+      this.log.warn(' → [%s] please see the homebridge-ewelink wiki for details to enable the camera', device.name)
       return
-    } else {
-      this.log.warn(
-        ' → [%s] cannot be added as it is not supported by this plugin. Please make a GitHub issue request.',
-        device.name
-      )
+    } else if (!cns.devicesZBBridge.includes(device.extra.uiid)) {
+      this.log.warn(' → [%s] has not been added as it is not supported. Please make a GitHub issue request.', device.name)
       return
     }
     if (!accessory) return
-    if (!this.hiddenMasters.includes(device.deviceid)) {
+    if (this.hiddenMasters.includes(device.deviceid)) {
       accessory
         .getService(Service.AccessoryInformation)
         .setCharacteristic(Characteristic.FirmwareRevision, device.params.fwVersion)
@@ -433,18 +371,11 @@ class eWeLink {
     }
     this.log(' → [%s] initialised %s.', device.name, str)
     this.devicesInHB.set(accessory.context.hbDeviceId, accessory)
-    if (!this.config.disableHTTPRefresh && !(accessory.context.switchNumber === '0' && this.hiddenMasters.includes(device.deviceid))) {
-      if (!this.refreshAccessory(accessory, device.params)) {
-        this.log.warn(
-          '[%s] could not be initialised. Please try removing accessory from the Homebridge cache along with any secondary devices (SW1, SW2, etc.) [debug:%s:%s].',
-          accessory.displayName,
-          accessory.context.type,
-          accessory.context.channelCount
-        )
-        this.log.warn(
-          'If you are unsure how to do this, please see "https://github.com/bwp91/homebridge-ewelink/wiki/How-to-remove-an-accessory-from-the-cache'
-        )
-      }
+    if (this.config.disableHTTPRefresh) return
+    try {
+      accessory.control.externalUpdate(accessory, device.params)
+    } catch (err) {
+      this.log.warn('[%s] could not be initialised as %s.', accessory.displayName, this.debug ? err : err.message)
     }
   }
 
@@ -516,7 +447,7 @@ class eWeLink {
           }
           cService
             .getCharacteristic(Characteristic.TargetPosition)
-            .on('set', (value, callback) => accessory.control.internalCurtainUpdate(accessory, value, callback))
+            .on('set', (value, callback) => accessory.control.internalUpdate(accessory, value, callback))
           break
         }
         case 'blind': {
@@ -532,7 +463,7 @@ class eWeLink {
           }
           wcService
             .getCharacteristic(Characteristic.TargetPosition)
-            .on('set', (value, callback) => accessory.control.internalBlindUpdate(accessory, value, callback))
+            .on('set', (value, callback) => accessory.control.internalUpdate(accessory, value, callback))
           break
         }
         case 'garage': {
@@ -548,7 +479,7 @@ class eWeLink {
           }
           gdService
             .getCharacteristic(Characteristic.TargetDoorState)
-            .on('set', (value, callback) => accessory.control.internalGarageUpdate(accessory, value, callback))
+            .on('set', (value, callback) => accessory.control.internalUpdate(accessory, value, callback))
           break
         }
         case 'garage_eachen': {
@@ -564,7 +495,7 @@ class eWeLink {
           }
           gdeService
             .getCharacteristic(Characteristic.TargetDoorState)
-            .on('set', (value, callback) => accessory.control.internalGarageEachenUpdate(accessory, value, callback))
+            .on('set', (value, callback) => accessory.control.internalUpdate(accessory, value, callback))
           break
         }
         case 'lock': {
@@ -572,7 +503,7 @@ class eWeLink {
           const lmService = accessory.getService(Service.LockMechanism) || accessory.addService(Service.LockMechanism)
           lmService
             .getCharacteristic(Characteristic.LockTargetState)
-            .on('set', (value, callback) => accessory.control.internalLockUpdate(accessory, value, callback))
+            .on('set', (value, callback) => accessory.control.internalUpdate(accessory, value, callback))
           break
         }
         case 'valve': {
@@ -594,7 +525,7 @@ class eWeLink {
             valveService
               .getCharacteristic(Characteristic.Active)
               .on('set', (value, callback) =>
-                accessory.control.internalValveUpdate(accessory, 'Valve ' + v, value, callback)
+                accessory.control.internalUpdate(accessory, 'Valve ' + v, value, callback)
               )
             valveService.getCharacteristic(Characteristic.SetDuration).on('set', (value, callback) => {
               if (valveService.getCharacteristic(Characteristic.InUse).value) {
@@ -621,16 +552,16 @@ class eWeLink {
           const fanLightService = accessory.getService(Service.Lightbulb) || accessory.addService(Service.Lightbulb)
           fanService
             .getCharacteristic(Characteristic.Active)
-            .on('set', (value, callback) => accessory.control.internalFanUpdate(accessory, 'power', value, callback))
+            .on('set', (value, callback) => accessory.control.internalUpdate(accessory, 'power', value, callback))
           fanService
             .getCharacteristic(Characteristic.RotationSpeed)
-            .on('set', (value, callback) => accessory.control.internalFanUpdate(accessory, 'speed', value, callback))
+            .on('set', (value, callback) => accessory.control.internalUpdate(accessory, 'speed', value, callback))
             .setProps({
               minStep: 33
             })
           fanLightService
             .getCharacteristic(Characteristic.On)
-            .on('set', (value, callback) => accessory.control.internalFanUpdate(accessory, 'light', value, callback))
+            .on('set', (value, callback) => accessory.control.internalUpdate(accessory, 'light', value, callback))
           break
         }
         case 'thermostat': {
@@ -644,7 +575,7 @@ class eWeLink {
             const switchService = accessory.getService(Service.Switch) || accessory.addService(Service.Switch)
             switchService
               .getCharacteristic(Characteristic.On)
-              .on('set', (value, callback) => accessory.control.internalThermostatUpdate(accessory, value, callback))
+              .on('set', (value, callback) => accessory.control.internalUpdate(accessory, value, callback))
           }
           if (!this.config.disableEveLogging) {
             accessory.log = this.log
@@ -691,7 +622,7 @@ class eWeLink {
           }
           outletService
             .getCharacteristic(Characteristic.On)
-            .on('set', (value, callback) => accessory.control.internalOutletUpdate(accessory, value, callback))
+            .on('set', (value, callback) => accessory.control.internalUpdate(accessory, value, callback))
           if (accessory.context.eweModel !== 'S26' && !this.config.disableEveLogging) {
             accessory.log = this.log
             accessory.eveLogger = new EveHistoryService('energy', accessory, {
@@ -767,7 +698,7 @@ class eWeLink {
           const usbService = accessory.getService(Service.Outlet) || accessory.addService(Service.Outlet)
           usbService
             .getCharacteristic(Characteristic.On)
-            .on('set', (value, callback) => accessory.control.internalUSBUpdate(accessory, value, callback))
+            .on('set', (value, callback) => accessory.control.internalUpdate(accessory, value, callback))
           break
         }
         case 'scm': {
@@ -775,7 +706,7 @@ class eWeLink {
           const scmService = accessory.getService(Service.Switch) || accessory.addService(Service.Switch)
           scmService
             .getCharacteristic(Characteristic.On)
-            .on('set', (value, callback) => accessory.control.internalSCMUpdate(accessory, value, callback))
+            .on('set', (value, callback) => accessory.control.internalUpdate(accessory, value, callback))
           break
         }
         case 'light': {
@@ -783,32 +714,32 @@ class eWeLink {
           const lightService = accessory.getService(Service.Lightbulb) || accessory.addService(Service.Lightbulb)
           lightService
             .getCharacteristic(Characteristic.On)
-            .on('set', (value, callback) => accessory.control.internalLightbulbUpdate(accessory, value, callback))
+            .on('set', (value, callback) => accessory.control.internalUpdate(accessory, 'onoff', value, callback))
           if (cns.devicesBrightable.includes(accessory.context.eweUIID)) {
             lightService.getCharacteristic(Characteristic.Brightness).on('set', (value, callback) => {
               if (value > 0) {
                 if (!lightService.getCharacteristic(Characteristic.On).value) {
-                  accessory.control.internalLightbulbUpdate(accessory, true, function () {})
+                  accessory.control.internalUpdate(accessory, 'onoff', true, function () {})
                 }
-                accessory.control.internalBrightnessUpdate(accessory, value, callback)
+                accessory.control.internalUpdate(accessory, 'brightness', value, callback)
               } else {
-                accessory.control.internalLightbulbUpdate(accessory, false, callback)
+                accessory.control.internalUpdate(accessory, 'onoff', false, callback)
               }
             })
           } else if (cns.devicesColourable.includes(accessory.context.eweUIID)) {
             lightService.getCharacteristic(Characteristic.Brightness).on('set', (value, callback) => {
               if (value > 0) {
                 if (!lightService.getCharacteristic(Characteristic.On).value) {
-                  accessory.control.internalLightbulbUpdate(accessory, true, function () {})
+                  accessory.control.internalUpdate(accessory, 'onoff', true, function () {})
                 }
-                accessory.control.internalHSBUpdate(accessory, 'bri', value, callback)
+                accessory.control.internalUpdate(accessory, 'c_brightness', value, callback)
               } else {
-                accessory.control.internalLightbulbUpdate(accessory, false, callback)
+                accessory.control.internalUpdate(accessory, 'onoff', false, callback)
               }
             })
             lightService
               .getCharacteristic(Characteristic.Hue)
-              .on('set', (value, callback) => accessory.control.internalHSBUpdate(accessory, 'hue', value, callback))
+              .on('set', (value, callback) => accessory.control.internalUpdate(accessory, 'c_hue', value, callback))
             lightService.getCharacteristic(Characteristic.Saturation).on('set', (value, callback) => callback())
           }
           break
@@ -818,7 +749,7 @@ class eWeLink {
           const switchService = accessory.getService(Service.Switch) || accessory.addService(Service.Switch)
           switchService
             .getCharacteristic(Characteristic.On)
-            .on('set', (value, callback) => accessory.control.internalSwitchUpdate(accessory, value, callback))
+            .on('set', (value, callback) => accessory.control.internalUpdate(accessory, value, callback))
           break
         }
         case 'rf_sub': {
@@ -850,11 +781,9 @@ class eWeLink {
               Object.entries(accessory.context.buttons).forEach(([chan, name]) => {
                 accessory.getService(name) || accessory.addService(Service.Switch, name, 'switch' + chan)
                 accessory.getService(name).updateCharacteristic(Characteristic.On, false)
-                accessory
-                  .getService(name)
-                  .getCharacteristic(Characteristic.On)
+                accessory.getService(name).getCharacteristic(Characteristic.On)
                   .on('set', (value, callback) => {
-                    value ? accessory.control.internalRFUpdate(accessory, chan, name, callback) : callback()
+                    value ? accessory.control.internalUpdate(accessory, chan, name, callback) : callback()
                   })
               })
               break
@@ -913,76 +842,6 @@ class eWeLink {
     }
   }
 
-  refreshAccessory (accessory, newParams) {
-    switch (accessory.context.type) {
-      case 'valve':
-        accessory.control.externalValveUpdate(accessory, newParams)
-        return true
-      case 'curtain':
-        accessory.control.externalCurtainUpdate(accessory, newParams)
-        return true
-      case 'blind':
-        return true
-      case 'garage':
-        accessory.control.externalGarageUpdate(accessory, newParams)
-        return true
-      case 'garage_eachen':
-        accessory.control.externalGarageEachenUpdate(accessory, newParams)
-        return true
-      case 'lock':
-        accessory.control.externalLockUpdate(accessory, newParams)
-        return true
-      case 'sensor':
-        accessory.control.externalSensorUpdate(accessory, newParams)
-        return true
-      case 'fan':
-        accessory.control.externalFanUpdate(accessory, newParams)
-        return true
-      case 'thermostat':
-        accessory.control.externalThermostatUpdate(accessory, newParams)
-        return true
-      case 'outlet':
-        accessory.control.externalOutletUpdate(accessory, newParams)
-        return true
-      case 'usb':
-        accessory.control.externalUSBUpdate(accessory, newParams)
-        return true
-      case 'scm':
-        accessory.control.externalSCMUpdate(accessory, newParams)
-        return true
-      case 'light':
-        if (
-          cns.devicesSingleSwitch.includes(accessory.context.eweUIID) &&
-          cns.devicesSingleSwitchLight.includes(accessory.context.eweModel)
-        ) {
-          accessory.control.externalSingleLightUpdate(accessory, newParams)
-        } else if (
-          cns.devicesMultiSwitch.includes(accessory.context.eweUIID) &&
-          cns.devicesMultiSwitchLight.includes(accessory.context.eweModel)
-        ) {
-          accessory.control.externalMultiLightUpdate(accessory, newParams)
-        }
-        return true
-      case 'switch':
-        if (cns.devicesSingleSwitch.includes(accessory.context.eweUIID)) {
-          accessory.control.externalSingleSwitchUpdate(accessory, newParams)
-        } else if (cns.devicesMultiSwitch.includes(accessory.context.eweUIID)) {
-          accessory.control.externalMultiSwitchUpdate(accessory, newParams)
-        }
-        return true
-      case 'rf_pri':
-        accessory.control.externalRFUpdate(accessory, newParams)
-        return true
-      case 'rf_sub':
-        return true
-      case 'zb_dev':
-        accessory.control.externalZBUpdate(accessory, newParams)
-        return true
-      default:
-        return false
-    }
-  }
-
   removeAccessory (accessory) {
     try {
       this.api.unregisterPlatformAccessories('homebridge-ewelink', 'eWeLink', [accessory])
@@ -1025,11 +884,7 @@ class eWeLink {
           accessory.context.reachableWAN = device.params.online
           this.devicesInHB.set(accessory.context.hbDeviceId, accessory)
           reachableChange = true
-          this.log.warn(
-            '[%s] has been reported [%s] via [WS].',
-            accessory.displayName,
-            accessory.context.reachableWAN ? 'online' : 'offline'
-          )
+          this.log.warn('[%s] reported [%sline] via [WS].', accessory.displayName, accessory.context.reachableWAN ? 'on' : 'off')
           if (accessory.context.reachableWAN) {
             try {
               this.wsClient.requestUpdate(accessory)
@@ -1063,38 +918,23 @@ class eWeLink {
         }
       }
       if (this.debug) {
-        this.log(
-          '[%s] externally updated from above %s message and will be refreshed.',
-          accessory.displayName,
-          device.params.updateSource
-        )
+        this.log('[%s] %s update received and will be refreshed.', accessory.displayName, device.params.updateSource)
       }
-      if (!this.refreshAccessory(accessory, device.params)) {
-        this.log.warn(
-          '[%s] cannot be refreshed. Please try removing accessory from the Homebridge cache along with any secondary devices (SW1, SW2, etc.). [debug:%s:%s]',
-          accessory.displayName,
-          accessory.context.type,
-          accessory.context.channelCount
-        )
-        this.log.warn(
-          'If you are unsure how to do this, please see "https://github.com/bwp91/homebridge-ewelink/wiki/How-to-remove-an-accessory-from-the-cache'
-        )
+      try {
+        accessory.control.externalUpdate(accessory, device.params)
+      } catch (err) {
+        this.log.warn('[%s] could not be refreshed as %s.', accessory.displayName, this.debug ? err : err.message)
       }
     } else {
-      if (!(this.config.hideDevFromHB || '').includes(deviceId)) {
-        this.log.warn(
-          '[%s] update received via %s does not exist in Homebridge so device will be added.',
-          deviceId,
-          device.params.updateSource
-        )
-        try {
-          const device = await this.httpClient.getDevice(deviceId)
-          this.initialiseDevice(device)
-          this.lanClient.addDeviceToMap(device)
-        } catch (err) {
-          this.log.error('[%s] error getting info [%s]', deviceId, err)
-          this.log.error('[%s] Please try restarting Homebridge so this device is added.', deviceId)
+      try {
+        if (!(this.config.hideDevFromHB || '').includes(deviceId)) {
+          this.log.warn('[%s] %s update received for new device which will be added.', deviceId, device.params.updateSource)
+          const newDevice = await this.httpClient.getDevice(deviceId)
+          this.initialiseDevice(newDevice)
+          this.lanClient.addDeviceToMap(newDevice)
         }
+      } catch (err) {
+        this.log.warn('[%s] error getting info [%s]. Restart Homebeidge to add device.', deviceId, err.message)
       }
     }
   }

From eb78373fd907dd61f686205ef667bd4fe2b7628b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 1 Oct 2020 09:07:43 +0100
Subject: [PATCH 0280/3183] 3.2.0-1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 9c316094..463b984a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.2.0-0",
+  "version": "3.2.0-1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 5fe27906..af23f2ff 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.2.0-0",
+  "version": "3.2.0-1",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 450fe6ee139e5ad4cc6fd50eb2a7d4eb6c80ad75 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 1 Oct 2020 10:39:27 +0100
Subject: [PATCH 0281/3183] code format

---
 lib/eWeLink.js | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index 92ff7214..8a6cf223 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -51,7 +51,7 @@ class eWeLink {
 
   async eWeLinkSetup () {
     try {
-      this.log('Plugin has finished initialising. Synching with eWeLink.')
+      this.log('Plugin has finished initialising. Syncing with eWeLink.')
       this.httpClient = new EWeLinkHTTP(this.config, this.log)
       await this.httpClient.getHost()
       this.authData = await this.httpClient.login()
@@ -102,7 +102,7 @@ class eWeLink {
             stopOnError: false
           }
         )
-        this.log("eWeLink sync complete. Don't forget to ⭐️  this plugin on GitHub!")
+        this.log("eWeLink sync complete. Don't forget to ⭐️  this plugin on GitHub if you're finding it useful!")
         if (this.config.debugReqRes) {
           this.log.warn("Note: 'Request & Response Logging' is not advised for long-term use.")
         }
@@ -183,11 +183,7 @@ class eWeLink {
         accessory.context.sensorType = device.params.sensorType
         this.devicesInHB.set(accessory.context.hbDeviceId, accessory)
       }
-    } else if (
-      cns.devicesOutlet.includes(device.extra.uiid) ||
-      (cns.devicesSingleSwitch.includes(device.extra.uiid) &&
-        cns.devicesSingleSwitchOutlet.includes(device.productModel))
-    ) {
+    } else if (cns.devicesOutlet.includes(device.extra.uiid) || (cns.devicesSingleSwitch.includes(device.extra.uiid) && cns.devicesSingleSwitchOutlet.includes(device.productModel))) {
       accessory = this.devicesInHB.has(device.deviceid + 'SWX')
         ? this.devicesInHB.get(device.deviceid + 'SWX')
         : this.addAccessory(device, device.deviceid + 'SWX', 'outlet')
@@ -199,17 +195,11 @@ class eWeLink {
       accessory = this.devicesInHB.has(device.deviceid + 'SWX')
         ? this.devicesInHB.get(device.deviceid + 'SWX')
         : this.addAccessory(device, device.deviceid + 'SWX', 'scm')
-    } else if (
-      cns.devicesSingleSwitch.includes(device.extra.uiid) &&
-      cns.devicesSingleSwitchLight.includes(device.productModel)
-    ) {
+    } else if (cns.devicesSingleSwitch.includes(device.extra.uiid) && cns.devicesSingleSwitchLight.includes(device.productModel)) {
       accessory = this.devicesInHB.has(device.deviceid + 'SWX')
         ? this.devicesInHB.get(device.deviceid + 'SWX')
         : this.addAccessory(device, device.deviceid + 'SWX', 'light')
-    } else if (
-      cns.devicesMultiSwitch.includes(device.extra.uiid) &&
-      cns.devicesMultiSwitchLight.includes(device.productModel)
-    ) {
+    } else if (cns.devicesMultiSwitch.includes(device.extra.uiid) && cns.devicesMultiSwitchLight.includes(device.productModel)) {
       if (this.config.hideMasters) {
         if (this.devicesInHB.has(device.deviceid + 'SW0')) {
           this.removeAccessory(this.devicesInHB.get(device.deviceid + 'SW0'))

From c70c327c74c8d3b6c38cf438b6a222b9c2ef1dd3 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 1 Oct 2020 10:43:36 +0100
Subject: [PATCH 0282/3183] logic error

---
 lib/eWeLink.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index 8a6cf223..fa86bde0 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -337,7 +337,7 @@ class eWeLink {
       return
     }
     if (!accessory) return
-    if (this.hiddenMasters.includes(device.deviceid)) {
+    if (!this.hiddenMasters.includes(device.deviceid)) {
       accessory
         .getService(Service.AccessoryInformation)
         .setCharacteristic(Characteristic.FirmwareRevision, device.params.fwVersion)

From dc7dc7895ad86067da8589c9bd79079af8ba0509 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Thu, 1 Oct 2020 10:49:16 +0100
Subject: [PATCH 0283/3183] Update FUNDING.yml

---
 .github/FUNDING.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
index 9ccddac1..72a6f9c3 100644
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1,4 +1,4 @@
 github: bwp91
 patreon: bwp91
 ko_fi: bwp91
-custom: https://www.paypal.me/BenPotter
+custom: ["https://www.paypal.me/BenPotter", "https://www.gofundme.com/f/aspergers-has-rules-my-life"]

From 770808a09eccc7549d3a3f9c6780013b09584ff2 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Thu, 1 Oct 2020 10:50:17 +0100
Subject: [PATCH 0284/3183] Update FUNDING.yml

---
 .github/FUNDING.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
index 72a6f9c3..0729bbfe 100644
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1,4 +1,4 @@
 github: bwp91
 patreon: bwp91
 ko_fi: bwp91
-custom: ["https://www.paypal.me/BenPotter", "https://www.gofundme.com/f/aspergers-has-rules-my-life"]
+custom: ["https://www.paypal.me/BenPotter", "https://www.gofundme.com/f/bwp91"]

From 7173da66ce4e34f2b65d436f71d948c4705d6dde Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 1 Oct 2020 10:54:45 +0100
Subject: [PATCH 0285/3183] Update package.json

---
 package.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package.json b/package.json
index af23f2ff..fd2e214f 100644
--- a/package.json
+++ b/package.json
@@ -58,6 +58,10 @@
     {
       "type": "github",
       "url": "https://github.com/sponsors/bwp91"
+    },
+    {
+      "type": "gofundme",
+      "url": "https://www.gofundme.com/f/bwp91"
     }
   ],
   "dependencies": {

From 64d6f0d3e5fc704494ae9141c046a767df9ab43d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 1 Oct 2020 12:01:56 +0100
Subject: [PATCH 0286/3183] clarify custom device types

---
 config.schema.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 24211140..5732a4f1 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -111,7 +111,7 @@
       "groups": {
         "type": "array",
         "title": "Custom Device Types",
-        "description": "You can use this setting to set up custom device types within Homebridge. Currently only blinds, garage doors and locks are supported.",
+        "description": "You can use this setting to set up custom simulated HomeKit accessories from a generic single/multi-switch device.",
         "items": {
           "type": "object",
           "properties": {
@@ -127,31 +127,31 @@
               "description": "The new type for this device.",
               "oneOf": [
                 {
-                  "title": "Blind (Generic Setup)",
+                  "title": "Blind (using channel 0 for 'UP' and channel 1 for 'DOWN' of a multi-channel device)",
                   "enum": [
                     "blind"
                   ]
                 },
                 {
-                  "title": "Garage Door (Generic Setup)",
+                  "title": "Garage Door (using a single/multi-channel device)",
                   "enum": [
                     "garage"
                   ]
                 },
                 {
-                  "title": "Garage Door (Eachen GD-DC5)",
+                  "title": "Garage Door (using the Eachen GD-DC5)",
                   "enum": [
                     "garage_eachen"
                   ]
                 },
                 {
-                  "title": "Lock (Generic Setup)",
+                  "title": "Lock (using a single channel device)",
                   "enum": [
                     "lock"
                   ]
                 },
                 {
-                  "title": "Irrigation (Generic Setup)",
+                  "title": "Irrigation (using channels 0 and 1 of a multi-channel device)",
                   "enum": [
                     "valve"
                   ]
@@ -320,7 +320,7 @@
     {
       "key": "groups",
       "expandable": true,
-      "title": "Custom Device Types",
+      "title": "Custom Device Simulations",
       "add": "Add Another Type",
       "type": "array",
       "items": [

From 351455c6685f32ea03dfe644d3cfcc54ec2987ac Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 1 Oct 2020 14:30:45 +0100
Subject: [PATCH 0287/3183] code reformat

---
 lib/device/blind.js         |  14 +-
 lib/device/curtain.js       |  14 +-
 lib/device/fan.js           |  16 +-
 lib/device/garage-eachen.js |  14 +-
 lib/device/garage.js        |  14 +-
 lib/device/light.js         |  33 ++-
 lib/device/lock.js          |   6 +-
 lib/device/outlet.js        |  99 +++++++-
 lib/device/rf-bridge.js     |  36 ++-
 lib/device/scm.js           |   6 +-
 lib/device/sensor.js        |   4 +-
 lib/device/switch.js        |   6 +-
 lib/device/thermostat.js    |  36 ++-
 lib/device/usb.js           |   6 +-
 lib/device/valve.js         |  34 ++-
 lib/device/zb-dev.js        |  48 +++-
 lib/eWeLink.js              | 438 ++++--------------------------------
 17 files changed, 407 insertions(+), 417 deletions(-)

diff --git a/lib/device/blind.js b/lib/device/blind.js
index 6584d7b3..242eeaaf 100644
--- a/lib/device/blind.js
+++ b/lib/device/blind.js
@@ -3,10 +3,22 @@ let Characteristic, Service
 const cns = require('./../constants')
 const utils = require('./../utils')
 module.exports = class deviceBlind {
-  constructor (platform) {
+  constructor (platform, accessory) {
     this.platform = platform
     Service = platform.api.hap.Service
     Characteristic = platform.api.hap.Characteristic
+    let wcService
+    if (!(wcService = accessory.getService(Service.WindowCovering))) {
+      accessory
+        .addService(Service.WindowCovering)
+        .setCharacteristic(Characteristic.CurrentPosition, 0)
+        .setCharacteristic(Characteristic.TargetPosition, 0)
+        .setCharacteristic(Characteristic.PositionState, 2)
+      wcService = accessory.getService(Service.WindowCovering)
+    }
+    wcService
+      .getCharacteristic(Characteristic.TargetPosition)
+      .on('set', (value, callback) => this.internalUpdate(accessory, value, callback))
   }
 
   async internalUpdate (accessory, value, callback) {
diff --git a/lib/device/curtain.js b/lib/device/curtain.js
index 1b5d07cb..d96de66a 100644
--- a/lib/device/curtain.js
+++ b/lib/device/curtain.js
@@ -1,10 +1,22 @@
 'use strict'
 let Characteristic, Service
 module.exports = class deviceCurtain {
-  constructor (platform) {
+  constructor (platform, accessory) {
     this.platform = platform
     Service = platform.api.hap.Service
     Characteristic = platform.api.hap.Characteristic
+    let cService
+    if (!(cService = accessory.getService(Service.WindowCovering))) {
+      accessory
+        .addService(Service.WindowCovering)
+        .setCharacteristic(Characteristic.CurrentPosition, 0)
+        .setCharacteristic(Characteristic.TargetPosition, 0)
+        .setCharacteristic(Characteristic.PositionState, 2)
+      cService = accessory.getService(Service.WindowCovering)
+    }
+    cService
+      .getCharacteristic(Characteristic.TargetPosition)
+      .on('set', (value, callback) => this.internalUpdate(accessory, value, callback))
   }
 
   async internalUpdate (accessory, value, callback) {
diff --git a/lib/device/fan.js b/lib/device/fan.js
index 16221475..2eac5d9b 100644
--- a/lib/device/fan.js
+++ b/lib/device/fan.js
@@ -1,10 +1,24 @@
 'use strict'
 let Characteristic, Service
 module.exports = class deviceFan {
-  constructor (platform) {
+  constructor (platform, accessory) {
     this.platform = platform
     Service = platform.api.hap.Service
     Characteristic = platform.api.hap.Characteristic
+    const fanService = accessory.getService(Service.Fanv2) || accessory.addService(Service.Fanv2)
+    const fanLightService = accessory.getService(Service.Lightbulb) || accessory.addService(Service.Lightbulb)
+    fanService
+      .getCharacteristic(Characteristic.Active)
+      .on('set', (value, callback) => this.internalUpdate(accessory, 'power', value, callback))
+    fanService
+      .getCharacteristic(Characteristic.RotationSpeed)
+      .on('set', (value, callback) => this.internalUpdate(accessory, 'speed', value, callback))
+      .setProps({
+        minStep: 33
+      })
+    fanLightService
+      .getCharacteristic(Characteristic.On)
+      .on('set', (value, callback) => this.internalUpdate(accessory, 'light', value, callback))
   }
 
   async internalUpdate (accessory, type, value, callback) {
diff --git a/lib/device/garage-eachen.js b/lib/device/garage-eachen.js
index dc27d4e6..91bd7e81 100644
--- a/lib/device/garage-eachen.js
+++ b/lib/device/garage-eachen.js
@@ -2,10 +2,22 @@
 let Characteristic, Service
 const utils = require('./../utils')
 module.exports = class deviceGarageEachen {
-  constructor (platform) {
+  constructor (platform, accessory) {
     this.platform = platform
     Service = platform.api.hap.Service
     Characteristic = platform.api.hap.Characteristic
+    let gdeService
+    if (!(gdeService = accessory.getService(Service.GarageDoorOpener))) {
+      accessory
+        .addService(Service.GarageDoorOpener)
+        .setCharacteristic(Characteristic.CurrentDoorState, 1)
+        .setCharacteristic(Characteristic.TargetDoorState, 1)
+        .setCharacteristic(Characteristic.ObstructionDetected, false)
+      gdeService = accessory.getService(Service.GarageDoorOpener)
+    }
+    gdeService
+      .getCharacteristic(Characteristic.TargetDoorState)
+      .on('set', (value, callback) => this.internalUpdate(accessory, value, callback))
   }
 
   async internalUpdate (accessory, value, callback) {
diff --git a/lib/device/garage.js b/lib/device/garage.js
index 4c1270dc..599316e7 100644
--- a/lib/device/garage.js
+++ b/lib/device/garage.js
@@ -2,10 +2,22 @@
 let Characteristic, Service
 const utils = require('./../utils')
 module.exports = class deviceGarage {
-  constructor (platform) {
+  constructor (platform, accessory) {
     this.platform = platform
     Service = platform.api.hap.Service
     Characteristic = platform.api.hap.Characteristic
+    let gdService
+    if (!(gdService = accessory.getService(Service.GarageDoorOpener))) {
+      accessory
+        .addService(Service.GarageDoorOpener)
+        .setCharacteristic(Characteristic.CurrentDoorState, 1)
+        .setCharacteristic(Characteristic.TargetDoorState, 1)
+        .setCharacteristic(Characteristic.ObstructionDetected, false)
+      gdService = accessory.getService(Service.GarageDoorOpener)
+    }
+    gdService
+      .getCharacteristic(Characteristic.TargetDoorState)
+      .on('set', (value, callback) => this.internalUpdate(accessory, value, callback))
   }
 
   async internalUpdate (accessory, value, callback) {
diff --git a/lib/device/light.js b/lib/device/light.js
index 3b210f76..7d67c7d0 100644
--- a/lib/device/light.js
+++ b/lib/device/light.js
@@ -4,10 +4,41 @@ const cns = require('./../constants')
 const convert = require('color-convert')
 const utils = require('./../utils')
 module.exports = class deviceLight {
-  constructor (platform) {
+  constructor (platform, accessory) {
     this.platform = platform
     Service = platform.api.hap.Service
     Characteristic = platform.api.hap.Characteristic
+    const lightService = accessory.getService(Service.Lightbulb) || accessory.addService(Service.Lightbulb)
+    lightService
+      .getCharacteristic(Characteristic.On)
+      .on('set', (value, callback) => this.internalUpdate(accessory, 'onoff', value, callback))
+    if (cns.devicesBrightable.includes(accessory.context.eweUIID)) {
+      lightService.getCharacteristic(Characteristic.Brightness).on('set', (value, callback) => {
+        if (value > 0) {
+          if (!lightService.getCharacteristic(Characteristic.On).value) {
+            this.internalUpdate(accessory, 'onoff', true, function () {})
+          }
+          this.internalUpdate(accessory, 'brightness', value, callback)
+        } else {
+          this.internalUpdate(accessory, 'onoff', false, callback)
+        }
+      })
+    } else if (cns.devicesColourable.includes(accessory.context.eweUIID)) {
+      lightService.getCharacteristic(Characteristic.Brightness).on('set', (value, callback) => {
+        if (value > 0) {
+          if (!lightService.getCharacteristic(Characteristic.On).value) {
+            this.internalUpdate(accessory, 'onoff', true, function () {})
+          }
+          this.internalUpdate(accessory, 'c_brightness', value, callback)
+        } else {
+          this.internalUpdate(accessory, 'onoff', false, callback)
+        }
+      })
+      lightService
+        .getCharacteristic(Characteristic.Hue)
+        .on('set', (value, callback) => this.internalUpdate(accessory, 'c_hue', value, callback))
+      lightService.getCharacteristic(Characteristic.Saturation).on('set', (value, callback) => callback())
+    }
   }
 
   async internalUpdate (accessory, type, value, callback) {
diff --git a/lib/device/lock.js b/lib/device/lock.js
index 8a4972be..b335b281 100644
--- a/lib/device/lock.js
+++ b/lib/device/lock.js
@@ -2,10 +2,14 @@
 let Characteristic, Service
 const utils = require('./../utils')
 module.exports = class deviceLock {
-  constructor (platform) {
+  constructor (platform, accessory) {
     this.platform = platform
     Service = platform.api.hap.Service
     Characteristic = platform.api.hap.Characteristic
+    const lmService = accessory.getService(Service.LockMechanism) || accessory.addService(Service.LockMechanism)
+    lmService
+      .getCharacteristic(Characteristic.LockTargetState)
+      .on('set', (value, callback) => this.internalUpdate(accessory, value, callback))
   }
 
   async internalUpdate (accessory, value, callback) {
diff --git a/lib/device/outlet.js b/lib/device/outlet.js
index 56e31434..9941c0ee 100644
--- a/lib/device/outlet.js
+++ b/lib/device/outlet.js
@@ -1,12 +1,107 @@
 'use strict'
-let Characteristic, EveService, Service
+let Characteristic, EveHistoryService, EveService, Service
+const corrInterval = require('correcting-interval')
+const fakegato = require('fakegato-history')
 const hbLib = require('homebridge-lib')
 module.exports = class deviceOutlet {
-  constructor (platform, homebridge) {
+  constructor (platform, accessory) {
     this.platform = platform
     Service = platform.api.hap.Service
     Characteristic = platform.api.hap.Characteristic
     EveService = new hbLib.EveHomeKitTypes(platform.api)
+    EveHistoryService = fakegato(platform.api)
+    let outletService
+    if (!(outletService = accessory.getService(Service.Outlet))) {
+      accessory.addService(Service.Outlet)
+      outletService = accessory.getService(Service.Outlet)
+      if (accessory.context.eweModel !== 'S26' && !this.platform.config.disableEveLogging) {
+        outletService.addCharacteristic(EveService.Characteristics.Voltage)
+        outletService.addCharacteristic(EveService.Characteristics.CurrentConsumption)
+        outletService.addCharacteristic(EveService.Characteristics.ElectricCurrent)
+        outletService.addCharacteristic(EveService.Characteristics.TotalConsumption)
+        outletService.addCharacteristic(EveService.Characteristics.ResetTotal)
+        accessory.context = {
+          ...accessory.context,
+          ...{
+            extraPersistedData: {},
+            lastReset: 0,
+            totalEnergy: 0,
+            totalEnergyTemp: 0
+          }
+        }
+      }
+    }
+    outletService
+      .getCharacteristic(Characteristic.On)
+      .on('set', (value, callback) => this.internalUpdate(accessory, value, callback))
+    if (accessory.context.eweModel !== 'S26' && !this.platform.config.disableEveLogging) {
+      accessory.log = this.platform.log
+      accessory.eveLogger = new EveHistoryService('energy', accessory, {
+        storage: 'fs',
+        minutes: 5,
+        path: this.platform.eveLogPath
+      })
+      corrInterval.setCorrectingInterval(() => {
+        const isOn = outletService.getCharacteristic(Characteristic.On).value
+        const currentWatt = isOn
+          ? outletService.getCharacteristic(EveService.Characteristics.CurrentConsumption).value
+          : 0
+        if (accessory.eveLogger.isHistoryLoaded()) {
+          accessory.context.extraPersistedData = accessory.eveLogger.getExtraPersistedData()
+          if (accessory.context.extraPersistedData !== undefined) {
+            accessory.context.totalEnergy =
+              accessory.context.extraPersistedData.totalenergy +
+              accessory.context.totalEnergyTemp +
+              (currentWatt * 10) / 3600 / 1000
+            accessory.eveLogger.setExtraPersistedData({
+              totalenergy: accessory.context.totalEnergy,
+              lastReset: accessory.context.extraPersistedData.lastReset
+            })
+          } else {
+            accessory.context.totalEnergy = accessory.context.totalEnergyTemp + (currentWatt * 10) / 3600 / 1000
+            accessory.eveLogger.setExtraPersistedData({
+              totalenergy: accessory.context.totalEnergy,
+              lastReset: 0
+            })
+          }
+          accessory.context.totalEnergytemp = 0
+        } else {
+          accessory.context.totalEnergyTemp += (currentWatt * 10) / 3600 / 1000
+          accessory.context.totalEnergy = accessory.context.totalEnergyTemp
+        }
+        accessory.eveLogger.addEntry({
+          time: Date.now(),
+          power: currentWatt
+        })
+      }, 300000)
+      outletService
+        .getCharacteristic(EveService.Characteristics.TotalConsumption)
+        .on('get', callback => {
+          accessory.context.extraPersistedData = accessory.eveLogger.getExtraPersistedData()
+          if (accessory.context.extraPersistedData !== undefined) {
+            accessory.context.totalEnergy = accessory.context.extraPersistedData.totalPower
+          }
+          callback(null, accessory.context.totalEnergy)
+        })
+      outletService
+        .getCharacteristic(EveService.Characteristics.ResetTotal)
+        .on('set', (value, callback) => {
+          accessory.context.totalEnergy = 0
+          accessory.context.lastReset = value
+          accessory.eveLogger.setExtraPersistedData({
+            totalPower: 0,
+            lastReset: value
+          })
+          callback()
+        })
+        .on('get', callback => {
+          accessory.context.extraPersistedData = accessory.eveLogger.getExtraPersistedData()
+          if (accessory.context.extraPersistedData !== undefined) {
+            accessory.context.lastReset = accessory.context.extraPersistedData.lastReset
+          }
+          callback(null, accessory.context.lastReset)
+        })
+    }
   }
 
   async internalUpdate (accessory, value, callback) {
diff --git a/lib/device/rf-bridge.js b/lib/device/rf-bridge.js
index 2e988d4c..59f267ce 100644
--- a/lib/device/rf-bridge.js
+++ b/lib/device/rf-bridge.js
@@ -2,10 +2,44 @@
 let Characteristic, Service
 const utils = require('./../utils')
 module.exports = class deviceRFBridge {
-  constructor (platform) {
+  constructor (platform, accessory) {
     this.platform = platform
     Service = platform.api.hap.Service
     Characteristic = platform.api.hap.Characteristic
+    switch (accessory.context.subType) {
+      case 'water':
+        accessory.getService(Service.LeakSensor) || accessory.addService(Service.LeakSensor)
+        break
+      case 'fire':
+      case 'smoke':
+        accessory.getService(Service.SmokeSensor) || accessory.addService(Service.SmokeSensor)
+        break
+      case 'co':
+        accessory.getService(Service.CarbonMonoxideSensor) || accessory.addService(Service.CarbonMonoxideSensor)
+        break
+      case 'co2':
+        accessory.getService(Service.CarbonDioxideSensor) || accessory.addService(Service.CarbonDioxideSensor)
+        break
+      case 'contact':
+        accessory.getService(Service.ContactSensor) || accessory.addService(Service.ContactSensor)
+        break
+      case 'occupancy':
+        accessory.getService(Service.OccupancySensor) || accessory.addService(Service.OccupancySensor)
+        break
+      default:
+        accessory.getService(Service.MotionSensor) || accessory.addService(Service.MotionSensor)
+        break
+      case 'button':
+        Object.entries(accessory.context.buttons).forEach(([chan, name]) => {
+          accessory.getService(name) || accessory.addService(Service.Switch, name, 'switch' + chan)
+          accessory.getService(name).updateCharacteristic(Characteristic.On, false)
+          accessory.getService(name).getCharacteristic(Characteristic.On)
+            .on('set', (value, callback) => {
+              value ? this.internalUpdate(accessory, chan, name, callback) : callback()
+            })
+        })
+        break
+    }
   }
 
   async internalUpdate (accessory, rfChl, service, callback) {
diff --git a/lib/device/scm.js b/lib/device/scm.js
index 98dc1357..577c2e69 100644
--- a/lib/device/scm.js
+++ b/lib/device/scm.js
@@ -2,10 +2,14 @@
 let Characteristic, Service
 const cns = require('./../constants')
 module.exports = class deviceSCM {
-  constructor (platform) {
+  constructor (platform, accessory) {
     this.platform = platform
     Service = platform.api.hap.Service
     Characteristic = platform.api.hap.Characteristic
+    const scmService = accessory.getService(Service.Switch) || accessory.addService(Service.Switch)
+    scmService
+      .getCharacteristic(Characteristic.On)
+      .on('set', (value, callback) => this.internalUpdate(accessory, value, callback))
   }
 
   async internalUpdate (accessory, value, callback) {
diff --git a/lib/device/sensor.js b/lib/device/sensor.js
index 47a4bd2b..5c3741b4 100644
--- a/lib/device/sensor.js
+++ b/lib/device/sensor.js
@@ -1,10 +1,12 @@
 'use strict'
 let Characteristic, Service
 module.exports = class deviceSensor {
-  constructor (platform) {
+  constructor (platform, accessory) {
     this.platform = platform
     Service = platform.api.hap.Service
     Characteristic = platform.api.hap.Characteristic
+    accessory.getService(Service.ContactSensor) || accessory.addService(Service.ContactSensor)
+    accessory.getService(Service.BatteryService) || accessory.addService(Service.BatteryService)
   }
 
   externalUpdate (accessory, params) {
diff --git a/lib/device/switch.js b/lib/device/switch.js
index a7422968..19c7a331 100644
--- a/lib/device/switch.js
+++ b/lib/device/switch.js
@@ -2,10 +2,14 @@
 let Characteristic, Service
 const cns = require('./../constants')
 module.exports = class deviceSwitch {
-  constructor (platform) {
+  constructor (platform, accessory) {
     this.platform = platform
     Service = platform.api.hap.Service
     Characteristic = platform.api.hap.Characteristic
+    const switchService = accessory.getService(Service.Switch) || accessory.addService(Service.Switch)
+    switchService
+      .getCharacteristic(Characteristic.On)
+      .on('set', (value, callback) => this.internalUpdate(accessory, value, callback))
   }
 
   async internalUpdate (accessory, value, callback) {
diff --git a/lib/device/thermostat.js b/lib/device/thermostat.js
index b987d601..ed36e577 100644
--- a/lib/device/thermostat.js
+++ b/lib/device/thermostat.js
@@ -1,10 +1,42 @@
 'use strict'
-let Characteristic, Service
+let Characteristic, EveHistoryService, Service
+const corrInterval = require('correcting-interval')
+const fakegato = require('fakegato-history')
 module.exports = class deviceThermostat {
-  constructor (platform) {
+  constructor (platform, accessory) {
     this.platform = platform
     Service = platform.api.hap.Service
     Characteristic = platform.api.hap.Characteristic
+    EveHistoryService = fakegato(platform.api)
+    const tempService = accessory.getService(Service.TemperatureSensor) || accessory.addService(Service.TemperatureSensor)
+    let humiService = false
+    if (accessory.context.sensorType !== 'DS18B20') {
+      humiService = accessory.getService(Service.HumiditySensor) || accessory.addService(Service.HumiditySensor)
+    }
+    if (!this.platform.config.hideTHSwitch) {
+      const switchService = accessory.getService(Service.Switch) || accessory.addService(Service.Switch)
+      switchService
+        .getCharacteristic(Characteristic.On)
+        .on('set', (value, callback) => this.internalUpdate(accessory, value, callback))
+    }
+    if (!this.platform.config.disableEveLogging) {
+      accessory.log = this.platform.log
+      accessory.eveLogger = new EveHistoryService('weather', accessory, {
+        storage: 'fs',
+        minutes: 5,
+        path: this.platform.eveLogPath
+      })
+      corrInterval.setCorrectingInterval(() => {
+        const dataToAdd = {
+          time: Date.now(),
+          temp: tempService.getCharacteristic(Characteristic.CurrentTemperature).value
+        }
+        if (humiService) {
+          dataToAdd.humidity = humiService.getCharacteristic(Characteristic.CurrentRelativeHumidity).value
+        }
+        accessory.eveLogger.addEntry(dataToAdd)
+      }, 300000)
+    }
   }
 
   async internalUpdate (accessory, value, callback) {
diff --git a/lib/device/usb.js b/lib/device/usb.js
index a2305136..13a2c87b 100644
--- a/lib/device/usb.js
+++ b/lib/device/usb.js
@@ -2,10 +2,14 @@
 let Characteristic, Service
 const cns = require('./../constants')
 module.exports = class deviceUSB {
-  constructor (platform) {
+  constructor (platform, accessory) {
     this.platform = platform
     Service = platform.api.hap.Service
     Characteristic = platform.api.hap.Characteristic
+    const usbService = accessory.getService(Service.Outlet) || accessory.addService(Service.Outlet)
+    usbService
+      .getCharacteristic(Characteristic.On)
+      .on('set', (value, callback) => this.internalUpdate(accessory, value, callback))
   }
 
   async internalUpdate (accessory, value, callback) {
diff --git a/lib/device/valve.js b/lib/device/valve.js
index 8522fd19..8363706d 100644
--- a/lib/device/valve.js
+++ b/lib/device/valve.js
@@ -1,9 +1,39 @@
 'use strict'
-let Characteristic
+let Characteristic, Service
 module.exports = class deviceValve {
-  constructor (platform) {
+  constructor (platform, accessory) {
     this.platform = platform
+    Service = platform.api.hap.Service
     Characteristic = platform.api.hap.Characteristic
+    const arr = ['A', 'B']
+    arr.forEach(v => {
+      let valveService
+      if (!(valveService = accessory.getService('Valve ' + v))) {
+        accessory
+          .addService(Service.Valve, 'Valve ' + v, 'valve' + v.toLowerCase())
+          .setCharacteristic(Characteristic.Active, 0)
+          .setCharacteristic(Characteristic.InUse, 0)
+          .setCharacteristic(Characteristic.ValveType, 1)
+          .setCharacteristic(Characteristic.SetDuration, Math.round((accessory.context.operationTime  || 1200) / 10))
+          .addCharacteristic(Characteristic.RemainingDuration)
+        valveService = accessory.getService('Valve ' + v)
+      }
+      valveService
+        .getCharacteristic(Characteristic.Active)
+        .on('set', (value, callback) =>
+          this.internalUpdate(accessory, 'Valve ' + v, value, callback)
+        )
+      valveService.getCharacteristic(Characteristic.SetDuration).on('set', (value, callback) => {
+        if (valveService.getCharacteristic(Characteristic.InUse).value) {
+          valveService.updateCharacteristic(Characteristic.RemainingDuration, value)
+          clearTimeout(valveService.timer)
+          valveService.timer = setTimeout(() => {
+            valveService.setCharacteristic(Characteristic.Active, 0)
+          }, value * 1000)
+        }
+        callback()
+      })
+    })
   }
 
   async internalUpdate (accessory, valve, value, callback) {
diff --git a/lib/device/zb-dev.js b/lib/device/zb-dev.js
index d4e9cec5..21c309a2 100644
--- a/lib/device/zb-dev.js
+++ b/lib/device/zb-dev.js
@@ -1,10 +1,54 @@
 'use strict'
-let Characteristic, Service
+let Characteristic, Service, EveHistoryService
+const corrInterval = require('correcting-interval')
+const fakegato = require('fakegato-history')
 module.exports = class deviceZBDev {
-  constructor (platform) {
+  constructor (platform, accessory) {
     this.platform = platform
     Service = platform.api.hap.Service
     Characteristic = platform.api.hap.Characteristic
+    EveHistoryService = fakegato(platform.api)
+    accessory.getService(Service.BatteryService) || accessory.addService(Service.BatteryService)
+    switch (accessory.context.eweUIID) {
+      case 1000: {
+        const zbspsService =
+          accessory.getService(Service.StatelessProgrammableSwitch) ||
+          accessory.addService(Service.StatelessProgrammableSwitch)
+        if (this.platform.config.hideZBLDPress) {
+          zbspsService.getCharacteristic(Characteristic.ProgrammableSwitchEvent).setProps({
+            validValues: [0]
+          })
+        }
+        break
+      }
+      case 1770: {
+        const zbTempService =
+          accessory.getService(Service.TemperatureSensor) || accessory.addService(Service.TemperatureSensor)
+        const zbHumiService =
+          accessory.getService(Service.HumiditySensor) || accessory.addService(Service.HumiditySensor)
+        accessory.log = this.platform.log
+        accessory.eveLogger = new EveHistoryService('weather', accessory, {
+          storage: 'fs',
+          minutes: 5,
+          path: this.platform.eveLogPath
+        })
+        corrInterval.setCorrectingInterval(() => {
+          const dataToAdd = {
+            time: Date.now(),
+            temp: zbTempService.getCharacteristic(Characteristic.CurrentTemperature).value,
+            humidity: zbHumiService.getCharacteristic(Characteristic.CurrentRelativeHumidity).value
+          }
+          accessory.eveLogger.addEntry(dataToAdd)
+        }, 300000)
+        break
+      }
+      case 2026:
+        accessory.getService(Service.MotionSensor) || accessory.addService(Service.MotionSensor)
+        break
+      case 3026:
+        accessory.getService(Service.ContactSensor) || accessory.addService(Service.ContactSensor)
+        break
+    }
   }
 
   externalUpdate (accessory, params) {
diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index fa86bde0..cc2310a3 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -1,7 +1,6 @@
 'use strict'
-let Accessory, Characteristic, EveService, EveHistoryService, Service
+let Characteristic, Service
 const cns = require('./constants')
-const corrInterval = require('correcting-interval')
 const DeviceCurtain = require('./device/curtain')
 const DeviceBlind = require('./device/blind')
 const DeviceGarage = require('./device/garage')
@@ -21,8 +20,6 @@ const DeviceZBDev = require('./device/zb-dev')
 const EWeLinkHTTP = require('./eWeLinkHTTP')
 const EWeLinkWS = require('./eWeLinkWS')
 const EWeLinkLAN = require('./eWeLinkLAN')
-const fakegato = require('fakegato-history')
-const hbLib = require('homebridge-lib')
 const promInterval = require('interval-promise')
 const utils = require('./utils')
 class eWeLink {
@@ -164,7 +161,10 @@ class eWeLink {
     } else if (this.cusG.has(device.deviceid + 'SWX') && this.cusG.get(device.deviceid + 'SWX').type === 'valve') {
       accessory = this.devicesInHB.has(device.deviceid + 'SWX')
         ? this.devicesInHB.get(device.deviceid + 'SWX')
-        : this.addAccessory(device, device.deviceid + 'SWX', 'valve')
+        : this.addAccessory(device, device.deviceid + 'SWX', 'valve', false, {
+          operationTime: this.cusG.get(device.deviceid + 'SWX').operationTime
+        })
+        accessory.context.operationTime = this.cusG.get(device.deviceid + 'SWX').operationTime
     } else if (cns.devicesSensor.includes(device.extra.uiid)) {
       accessory = this.devicesInHB.has(device.deviceid + 'SWX')
         ? this.devicesInHB.get(device.deviceid + 'SWX')
@@ -206,7 +206,7 @@ class eWeLink {
         }
         this.hiddenMasters.push(device.deviceid)
         accessory = this.addAccessory(device, device.deviceid + 'SW0', 'light', true)
-        accessory.control = new DeviceLight(this)
+        accessory.control = new DeviceLight(this, accessory)
       } else {
         accessory = this.devicesInHB.has(device.deviceid + 'SW0')
           ? this.devicesInHB.get(device.deviceid + 'SW0')
@@ -240,7 +240,7 @@ class eWeLink {
         }
         this.hiddenMasters.push(device.deviceid)
         accessory = this.addAccessory(device, device.deviceid + 'SW0', 'switch', true)
-        accessory.control = new DeviceSwitch(this)
+        accessory.control = new DeviceSwitch(this, accessory)
       } else {
         accessory = this.devicesInHB.has(device.deviceid + 'SW0')
           ? this.devicesInHB.get(device.deviceid + 'SW0')
@@ -280,7 +280,7 @@ class eWeLink {
         : this.addAccessory(device, device.deviceid + 'SW0', 'rf_pri', true, {
           rfMap
         })
-      accessory.control = new DeviceRFBridge(this)
+      accessory.control = new DeviceRFBridge(this, accessory)
       this.hiddenMasters.push(device.deviceid)
       rfMap.forEach(subDevice => {
         const swNumber = rfChlCounter + 1
@@ -383,7 +383,7 @@ class eWeLink {
       newDeviceName = this.config.nameOverride[hbDeviceId]
     }
     try {
-      const accessory = new Accessory(newDeviceName, this.api.hap.uuid.generate(hbDeviceId).toString())
+      const accessory = new this.api.platformAccessory(newDeviceName, this.api.hap.uuid.generate(hbDeviceId).toString())
       if (!hidden) {
         accessory
           .getService(Service.AccessoryInformation)
@@ -424,407 +424,54 @@ class eWeLink {
       accessory.context.reachableWAN = true
       accessory.context.reachableLAN = true
       switch (accessory.context.type) {
-        case 'curtain': {
-          accessory.control = new DeviceCurtain(this)
-          let cService
-          if (!(cService = accessory.getService(Service.WindowCovering))) {
-            accessory
-              .addService(Service.WindowCovering)
-              .setCharacteristic(Characteristic.CurrentPosition, 0)
-              .setCharacteristic(Characteristic.TargetPosition, 0)
-              .setCharacteristic(Characteristic.PositionState, 2)
-            cService = accessory.getService(Service.WindowCovering)
-          }
-          cService
-            .getCharacteristic(Characteristic.TargetPosition)
-            .on('set', (value, callback) => accessory.control.internalUpdate(accessory, value, callback))
+        case 'curtain':
+          accessory.control = new DeviceCurtain(this, accessory)
           break
-        }
-        case 'blind': {
-          accessory.control = new DeviceBlind(this)
-          let wcService
-          if (!(wcService = accessory.getService(Service.WindowCovering))) {
-            accessory
-              .addService(Service.WindowCovering)
-              .setCharacteristic(Characteristic.CurrentPosition, 0)
-              .setCharacteristic(Characteristic.TargetPosition, 0)
-              .setCharacteristic(Characteristic.PositionState, 2)
-            wcService = accessory.getService(Service.WindowCovering)
-          }
-          wcService
-            .getCharacteristic(Characteristic.TargetPosition)
-            .on('set', (value, callback) => accessory.control.internalUpdate(accessory, value, callback))
+        case 'blind':
+          accessory.control = new DeviceBlind(this, accessory)
           break
-        }
-        case 'garage': {
-          accessory.control = new DeviceGarage(this)
-          let gdService
-          if (!(gdService = accessory.getService(Service.GarageDoorOpener))) {
-            accessory
-              .addService(Service.GarageDoorOpener)
-              .setCharacteristic(Characteristic.CurrentDoorState, 1)
-              .setCharacteristic(Characteristic.TargetDoorState, 1)
-              .setCharacteristic(Characteristic.ObstructionDetected, false)
-            gdService = accessory.getService(Service.GarageDoorOpener)
-          }
-          gdService
-            .getCharacteristic(Characteristic.TargetDoorState)
-            .on('set', (value, callback) => accessory.control.internalUpdate(accessory, value, callback))
+        case 'garage':
+          accessory.control = new DeviceGarage(this, accessory)
           break
-        }
-        case 'garage_eachen': {
-          accessory.control = new DeviceGarageEachen(this)
-          let gdeService
-          if (!(gdeService = accessory.getService(Service.GarageDoorOpener))) {
-            accessory
-              .addService(Service.GarageDoorOpener)
-              .setCharacteristic(Characteristic.CurrentDoorState, 1)
-              .setCharacteristic(Characteristic.TargetDoorState, 1)
-              .setCharacteristic(Characteristic.ObstructionDetected, false)
-            gdeService = accessory.getService(Service.GarageDoorOpener)
-          }
-          gdeService
-            .getCharacteristic(Characteristic.TargetDoorState)
-            .on('set', (value, callback) => accessory.control.internalUpdate(accessory, value, callback))
+        case 'garage_eachen':
+          accessory.control = new DeviceGarageEachen(this, accessory)
           break
-        }
-        case 'lock': {
-          accessory.control = new DeviceLock(this)
-          const lmService = accessory.getService(Service.LockMechanism) || accessory.addService(Service.LockMechanism)
-          lmService
-            .getCharacteristic(Characteristic.LockTargetState)
-            .on('set', (value, callback) => accessory.control.internalUpdate(accessory, value, callback))
+        case 'lock':
+          accessory.control = new DeviceLock(this, accessory)
           break
-        }
-        case 'valve': {
-          accessory.control = new DeviceValve(this)
-          const valveConfig = this.cusG.get(accessory.context.hbDeviceId)
-          const arr = ['A', 'B']
-          arr.forEach(v => {
-            let valveService
-            if (!(valveService = accessory.getService('Valve ' + v))) {
-              accessory
-                .addService(Service.Valve, 'Valve ' + v, 'valve' + v.toLowerCase())
-                .setCharacteristic(Characteristic.Active, 0)
-                .setCharacteristic(Characteristic.InUse, 0)
-                .setCharacteristic(Characteristic.ValveType, 1)
-                .setCharacteristic(Characteristic.SetDuration, Math.round(valveConfig.operationTime / 10) || 120)
-                .addCharacteristic(Characteristic.RemainingDuration)
-              valveService = accessory.getService('Valve ' + v)
-            }
-            valveService
-              .getCharacteristic(Characteristic.Active)
-              .on('set', (value, callback) =>
-                accessory.control.internalUpdate(accessory, 'Valve ' + v, value, callback)
-              )
-            valveService.getCharacteristic(Characteristic.SetDuration).on('set', (value, callback) => {
-              if (valveService.getCharacteristic(Characteristic.InUse).value) {
-                valveService.updateCharacteristic(Characteristic.RemainingDuration, value)
-                clearTimeout(valveService.timer)
-                valveService.timer = setTimeout(() => {
-                  valveService.setCharacteristic(Characteristic.Active, 0)
-                }, value * 1000)
-              }
-              callback()
-            })
-          })
+        case 'valve':
+          accessory.control = new DeviceValve(this, accessory)
           break
-        }
-        case 'sensor': {
-          accessory.control = new DeviceSensor(this)
-          accessory.getService(Service.ContactSensor) || accessory.addService(Service.ContactSensor)
-          accessory.getService(Service.BatteryService) || accessory.addService(Service.BatteryService)
+        case 'sensor':
+          accessory.control = new DeviceSensor(this, accessory)
           break
-        }
-        case 'fan': {
-          accessory.control = new DeviceFan(this)
-          const fanService = accessory.getService(Service.Fanv2) || accessory.addService(Service.Fanv2)
-          const fanLightService = accessory.getService(Service.Lightbulb) || accessory.addService(Service.Lightbulb)
-          fanService
-            .getCharacteristic(Characteristic.Active)
-            .on('set', (value, callback) => accessory.control.internalUpdate(accessory, 'power', value, callback))
-          fanService
-            .getCharacteristic(Characteristic.RotationSpeed)
-            .on('set', (value, callback) => accessory.control.internalUpdate(accessory, 'speed', value, callback))
-            .setProps({
-              minStep: 33
-            })
-          fanLightService
-            .getCharacteristic(Characteristic.On)
-            .on('set', (value, callback) => accessory.control.internalUpdate(accessory, 'light', value, callback))
+        case 'fan':
+          accessory.control = new DeviceFan(this, accessory)
           break
-        }
-        case 'thermostat': {
-          accessory.control = new DeviceThermostat(this)
-          const tempService = accessory.getService(Service.TemperatureSensor) || accessory.addService(Service.TemperatureSensor)
-          let humiService = false
-          if (accessory.context.sensorType !== 'DS18B20') {
-            humiService = accessory.getService(Service.HumiditySensor) || accessory.addService(Service.HumiditySensor)
-          }
-          if (!this.config.hideTHSwitch) {
-            const switchService = accessory.getService(Service.Switch) || accessory.addService(Service.Switch)
-            switchService
-              .getCharacteristic(Characteristic.On)
-              .on('set', (value, callback) => accessory.control.internalUpdate(accessory, value, callback))
-          }
-          if (!this.config.disableEveLogging) {
-            accessory.log = this.log
-            accessory.eveLogger = new EveHistoryService('weather', accessory, {
-              storage: 'fs',
-              minutes: 5,
-              path: this.eveLogPath
-            })
-            corrInterval.setCorrectingInterval(() => {
-              const dataToAdd = {
-                time: Date.now(),
-                temp: tempService.getCharacteristic(Characteristic.CurrentTemperature).value
-              }
-              if (humiService) {
-                dataToAdd.humidity = humiService.getCharacteristic(Characteristic.CurrentRelativeHumidity).value
-              }
-              accessory.eveLogger.addEntry(dataToAdd)
-            }, 300000)
-          }
+        case 'thermostat':
+          accessory.control = new DeviceThermostat(this, accessory)
           break
-        }
-        case 'outlet': {
-          accessory.control = new DeviceOutlet(this)
-          let outletService
-          if (!(outletService = accessory.getService(Service.Outlet))) {
-            accessory.addService(Service.Outlet)
-            outletService = accessory.getService(Service.Outlet)
-            if (accessory.context.eweModel !== 'S26' && !this.config.disableEveLogging) {
-              outletService.addCharacteristic(EveService.Characteristics.Voltage)
-              outletService.addCharacteristic(EveService.Characteristics.CurrentConsumption)
-              outletService.addCharacteristic(EveService.Characteristics.ElectricCurrent)
-              outletService.addCharacteristic(EveService.Characteristics.TotalConsumption)
-              outletService.addCharacteristic(EveService.Characteristics.ResetTotal)
-              accessory.context = {
-                ...accessory.context,
-                ...{
-                  extraPersistedData: {},
-                  lastReset: 0,
-                  totalEnergy: 0,
-                  totalEnergyTemp: 0
-                }
-              }
-            }
-          }
-          outletService
-            .getCharacteristic(Characteristic.On)
-            .on('set', (value, callback) => accessory.control.internalUpdate(accessory, value, callback))
-          if (accessory.context.eweModel !== 'S26' && !this.config.disableEveLogging) {
-            accessory.log = this.log
-            accessory.eveLogger = new EveHistoryService('energy', accessory, {
-              storage: 'fs',
-              minutes: 5,
-              path: this.eveLogPath
-            })
-            corrInterval.setCorrectingInterval(() => {
-              const isOn = outletService.getCharacteristic(Characteristic.On).value
-              const currentWatt = isOn
-                ? outletService.getCharacteristic(EveService.Characteristics.CurrentConsumption).value
-                : 0
-              if (accessory.eveLogger.isHistoryLoaded()) {
-                accessory.context.extraPersistedData = accessory.eveLogger.getExtraPersistedData()
-                if (accessory.context.extraPersistedData !== undefined) {
-                  accessory.context.totalEnergy =
-                    accessory.context.extraPersistedData.totalenergy +
-                    accessory.context.totalEnergyTemp +
-                    (currentWatt * 10) / 3600 / 1000
-                  accessory.eveLogger.setExtraPersistedData({
-                    totalenergy: accessory.context.totalEnergy,
-                    lastReset: accessory.context.extraPersistedData.lastReset
-                  })
-                } else {
-                  accessory.context.totalEnergy = accessory.context.totalEnergyTemp + (currentWatt * 10) / 3600 / 1000
-                  accessory.eveLogger.setExtraPersistedData({
-                    totalenergy: accessory.context.totalEnergy,
-                    lastReset: 0
-                  })
-                }
-                accessory.context.totalEnergytemp = 0
-              } else {
-                accessory.context.totalEnergyTemp += (currentWatt * 10) / 3600 / 1000
-                accessory.context.totalEnergy = accessory.context.totalEnergyTemp
-              }
-              accessory.eveLogger.addEntry({
-                time: Date.now(),
-                power: currentWatt
-              })
-            }, 300000)
-            outletService
-              .getCharacteristic(EveService.Characteristics.TotalConsumption)
-              .on('get', callback => {
-                accessory.context.extraPersistedData = accessory.eveLogger.getExtraPersistedData()
-                if (accessory.context.extraPersistedData !== undefined) {
-                  accessory.context.totalEnergy = accessory.context.extraPersistedData.totalPower
-                }
-                callback(null, accessory.context.totalEnergy)
-              })
-            outletService
-              .getCharacteristic(EveService.Characteristics.ResetTotal)
-              .on('set', (value, callback) => {
-                accessory.context.totalEnergy = 0
-                accessory.context.lastReset = value
-                accessory.eveLogger.setExtraPersistedData({
-                  totalPower: 0,
-                  lastReset: value
-                })
-                callback()
-              })
-              .on('get', callback => {
-                accessory.context.extraPersistedData = accessory.eveLogger.getExtraPersistedData()
-                if (accessory.context.extraPersistedData !== undefined) {
-                  accessory.context.lastReset = accessory.context.extraPersistedData.lastReset
-                }
-                callback(null, accessory.context.lastReset)
-              })
-          }
+        case 'outlet':
+          accessory.control = new DeviceOutlet(this, accessory)
           break
-        }
-        case 'usb': {
-          accessory.control = new DeviceUSB(this)
-          const usbService = accessory.getService(Service.Outlet) || accessory.addService(Service.Outlet)
-          usbService
-            .getCharacteristic(Characteristic.On)
-            .on('set', (value, callback) => accessory.control.internalUpdate(accessory, value, callback))
+        case 'usb':
+          accessory.control = new DeviceUSB(this, accessory)
           break
-        }
-        case 'scm': {
-          accessory.control = new DeviceSCM(this)
-          const scmService = accessory.getService(Service.Switch) || accessory.addService(Service.Switch)
-          scmService
-            .getCharacteristic(Characteristic.On)
-            .on('set', (value, callback) => accessory.control.internalUpdate(accessory, value, callback))
+        case 'scm':
+          accessory.control = new DeviceSCM(this, accessory)
           break
-        }
-        case 'light': {
-          accessory.control = new DeviceLight(this)
-          const lightService = accessory.getService(Service.Lightbulb) || accessory.addService(Service.Lightbulb)
-          lightService
-            .getCharacteristic(Characteristic.On)
-            .on('set', (value, callback) => accessory.control.internalUpdate(accessory, 'onoff', value, callback))
-          if (cns.devicesBrightable.includes(accessory.context.eweUIID)) {
-            lightService.getCharacteristic(Characteristic.Brightness).on('set', (value, callback) => {
-              if (value > 0) {
-                if (!lightService.getCharacteristic(Characteristic.On).value) {
-                  accessory.control.internalUpdate(accessory, 'onoff', true, function () {})
-                }
-                accessory.control.internalUpdate(accessory, 'brightness', value, callback)
-              } else {
-                accessory.control.internalUpdate(accessory, 'onoff', false, callback)
-              }
-            })
-          } else if (cns.devicesColourable.includes(accessory.context.eweUIID)) {
-            lightService.getCharacteristic(Characteristic.Brightness).on('set', (value, callback) => {
-              if (value > 0) {
-                if (!lightService.getCharacteristic(Characteristic.On).value) {
-                  accessory.control.internalUpdate(accessory, 'onoff', true, function () {})
-                }
-                accessory.control.internalUpdate(accessory, 'c_brightness', value, callback)
-              } else {
-                accessory.control.internalUpdate(accessory, 'onoff', false, callback)
-              }
-            })
-            lightService
-              .getCharacteristic(Characteristic.Hue)
-              .on('set', (value, callback) => accessory.control.internalUpdate(accessory, 'c_hue', value, callback))
-            lightService.getCharacteristic(Characteristic.Saturation).on('set', (value, callback) => callback())
-          }
+        case 'light':
+          accessory.control = new DeviceLight(this, accessory)
           break
-        }
-        case 'switch': {
-          accessory.control = new DeviceSwitch(this)
-          const switchService = accessory.getService(Service.Switch) || accessory.addService(Service.Switch)
-          switchService
-            .getCharacteristic(Characteristic.On)
-            .on('set', (value, callback) => accessory.control.internalUpdate(accessory, value, callback))
+        case 'switch':
+          accessory.control = new DeviceSwitch(this, accessory)
           break
-        }
-        case 'rf_sub': {
-          accessory.control = new DeviceRFBridge(this)
-          switch (accessory.context.subType) {
-            case 'water':
-              accessory.getService(Service.LeakSensor) || accessory.addService(Service.LeakSensor)
-              break
-            case 'fire':
-            case 'smoke':
-              accessory.getService(Service.SmokeSensor) || accessory.addService(Service.SmokeSensor)
-              break
-            case 'co':
-              accessory.getService(Service.CarbonMonoxideSensor) || accessory.addService(Service.CarbonMonoxideSensor)
-              break
-            case 'co2':
-              accessory.getService(Service.CarbonDioxideSensor) || accessory.addService(Service.CarbonDioxideSensor)
-              break
-            case 'contact':
-              accessory.getService(Service.ContactSensor) || accessory.addService(Service.ContactSensor)
-              break
-            case 'occupancy':
-              accessory.getService(Service.OccupancySensor) || accessory.addService(Service.OccupancySensor)
-              break
-            default:
-              accessory.getService(Service.MotionSensor) || accessory.addService(Service.MotionSensor)
-              break
-            case 'button':
-              Object.entries(accessory.context.buttons).forEach(([chan, name]) => {
-                accessory.getService(name) || accessory.addService(Service.Switch, name, 'switch' + chan)
-                accessory.getService(name).updateCharacteristic(Characteristic.On, false)
-                accessory.getService(name).getCharacteristic(Characteristic.On)
-                  .on('set', (value, callback) => {
-                    value ? accessory.control.internalUpdate(accessory, chan, name, callback) : callback()
-                  })
-              })
-              break
-          }
+        case 'rf_sub':
+          accessory.control = new DeviceRFBridge(this, accessory)
           break
-        }
-        case 'zb_dev': { //* ** credit @tasict ***\\
-          accessory.control = new DeviceZBDev(this)
-          accessory.getService(Service.BatteryService) || accessory.addService(Service.BatteryService)
-          switch (accessory.context.eweUIID) {
-            case 1000: {
-              const zbspsService =
-                accessory.getService(Service.StatelessProgrammableSwitch) ||
-                accessory.addService(Service.StatelessProgrammableSwitch)
-              if (this.config.hideZBLDPress) {
-                zbspsService.getCharacteristic(Characteristic.ProgrammableSwitchEvent).setProps({
-                  validValues: [0]
-                })
-              }
-              break
-            }
-            case 1770: {
-              const zbTempService =
-                accessory.getService(Service.TemperatureSensor) || accessory.addService(Service.TemperatureSensor)
-              const zbHumiService =
-                accessory.getService(Service.HumiditySensor) || accessory.addService(Service.HumiditySensor)
-              accessory.log = this.log
-              accessory.eveLogger = new EveHistoryService('weather', accessory, {
-                storage: 'fs',
-                minutes: 5,
-                path: this.eveLogPath
-              })
-              corrInterval.setCorrectingInterval(() => {
-                const dataToAdd = {
-                  time: Date.now(),
-                  temp: zbTempService.getCharacteristic(Characteristic.CurrentTemperature).value,
-                  humidity: zbHumiService.getCharacteristic(Characteristic.CurrentRelativeHumidity).value
-                }
-                accessory.eveLogger.addEntry(dataToAdd)
-              }, 300000)
-              break
-            }
-            case 2026:
-              accessory.getService(Service.MotionSensor) || accessory.addService(Service.MotionSensor)
-              break
-            case 3026:
-              accessory.getService(Service.ContactSensor) || accessory.addService(Service.ContactSensor)
-              break
-          }
+        case 'zb_dev': //* ** credit @tasict ***\\
+          accessory.control = new DeviceZBDev(this, accessory)
           break
-        }
       }
       this.devicesInHB.set(accessory.context.hbDeviceId, accessory)
     } catch (err) {
@@ -944,10 +591,7 @@ class eWeLink {
   }
 }
 module.exports = function (homebridge) {
-  Accessory = homebridge.platformAccessory
   Characteristic = homebridge.hap.Characteristic
-  EveService = new hbLib.EveHomeKitTypes(homebridge)
-  EveHistoryService = fakegato(homebridge)
   Service = homebridge.hap.Service
   return eWeLink
 }

From ad4de39b217648e6f5f7c501d9a034b1caf66ce5 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 1 Oct 2020 16:15:57 +0100
Subject: [PATCH 0288/3183] code overhaul

---
 lib/constants.js    |  18 +-
 lib/device/valve.js |   3 +-
 lib/eWeLink.js      | 547 ++++++++++++++++++++------------------------
 3 files changed, 251 insertions(+), 317 deletions(-)

diff --git a/lib/constants.js b/lib/constants.js
index 0f618fb6..b23eb05b 100644
--- a/lib/constants.js
+++ b/lib/constants.js
@@ -7,39 +7,23 @@ module.exports = {
   devicesHideable: ['switch', 'light'],
   devicesNonLAN: [22, 28, 59, 102],
   devicesSingleSwitch: [1, 5, 6, 14, 15, 22, 24, 27, 32, 36, 44, 59],
-  devicesSingleSwitchParams: ['switch'],
-  devicesSingleSwitchOutlet: ['Sonoff Pow', 'S26'],
   devicesMultiSwitch: [2, 3, 4, 7, 8, 9, 29, 30, 31, 34, 41],
-  devicesMultiSwitchParams: ['switches'],
   devicesSingleSwitchLight: ['T1 1C', 'L1', 'B1', 'B1_R2', 'TX1C', 'D1', 'D1R1', 'KING-M4', 'Slampher', 'GTTA59'],
-  devicesSingleSwitchLightParams: ['switch', 'state', 'bright', 'colorR', 'brightness', 'channel0', 'channel2', 'xyz_mode'],
   devicesMultiSwitchLight: ['T1 2C', 'T1 3C', 'TX2C', 'TX3C'],
-  devicesMultiSwitchLightParams: ['switches'],
+  devicesSingleSwitchOutlet: ['Sonoff Pow', 'S26'],
   devicesBrightable: [36, 44],
   devicesColourable: [22, 59],
   devicesCurtain: [11],
-  devicesCurtainParams: ['switch', 'setclose'],
   devicesSensor: [102],
-  devicesSensorParams: ['switch', 'battery'],
   devicesThermostat: [15],
-  devicesThermostatParams: ['currentTemperature', 'currentHumidity', 'switch', 'masterSwitch'],
   devicesFan: [34],
-  devicesFanParams: ['switches', 'light', 'fan', 'speed'],
   devicesOutlet: [32],
-  devicesOutletParams: ['switch', 'power', 'voltage', 'current'],
   devicesCamera: [87],
   devicesUSB: [77],
-  devicesUSBParams: ['switches'],
   devicesSCM: [78],
-  devicesSCMParams: ['switches'],
   devicesRFBridge: [28],
-  devicesRFBridgeParams: ['cmd'],
   devicesZBBridge: [66],
-  devicesZBBridgeParams: ['key', 'temperature', 'humidity', 'motion', 'lock', 'trigTime', 'battery'],
   devicesZB: [1000, 1770, 2026, 3026],
-  devicesValveParams: ['switches'],
-  devicesGarageParams: ['switch', 'switches'],
-  devicesLockParams: ['switch'],
   paramsToKeep: ['battery', 'bright', 'brightness', 'channel', 'cmd', 'colorB', 'colorG', 'colorR', 'current', 'currentHumidity', 'currentTemperature', 'fan', 'humidity', 'key', 'light', 'lock', 'mainSwitch', 'mode', 'motion', 'online', 'power', 'rfChl', 'rfList', 'rfTrig', 'sensorType', 'setclose', 'speed', 'state', 'switch', 'switches', 'temperature', 'trigTime', 'type', 'voltage', 'zyx_mode'],
   defaultMultiSwitchOff: [{
     switch: 'off',
diff --git a/lib/device/valve.js b/lib/device/valve.js
index 8363706d..9aab7584 100644
--- a/lib/device/valve.js
+++ b/lib/device/valve.js
@@ -8,13 +8,14 @@ module.exports = class deviceValve {
     const arr = ['A', 'B']
     arr.forEach(v => {
       let valveService
+      const valveConfig = this.platform.cusG.get(accessory.context.hbDeviceId)
       if (!(valveService = accessory.getService('Valve ' + v))) {
         accessory
           .addService(Service.Valve, 'Valve ' + v, 'valve' + v.toLowerCase())
           .setCharacteristic(Characteristic.Active, 0)
           .setCharacteristic(Characteristic.InUse, 0)
           .setCharacteristic(Characteristic.ValveType, 1)
-          .setCharacteristic(Characteristic.SetDuration, Math.round((accessory.context.operationTime  || 1200) / 10))
+          .setCharacteristic(Characteristic.SetDuration, Math.round((valveConfig.operationTime || 1200) / 10))
           .addCharacteristic(Characteristic.RemainingDuration)
         valveService = accessory.getService('Valve ' + v)
       }
diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index cc2310a3..2e4d277d 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -94,10 +94,7 @@ class eWeLink {
                 this.log.warn(this.debug ? err : err.message)
               }
             }
-          },
-          1800000, {
-            stopOnError: false
-          }
+          }, 1800000, { stopOnError: false }
         )
         this.log("eWeLink sync complete. Don't forget to ⭐️  this plugin on GitHub if you're finding it useful!")
         if (this.config.debugReqRes) {
@@ -129,247 +126,257 @@ class eWeLink {
 
   initialiseDevice (device) {
     let accessory
-    if (cns.devicesCurtain.includes(device.extra.uiid)) {
-      accessory = this.devicesInHB.has(device.deviceid + 'SWX')
-        ? this.devicesInHB.get(device.deviceid + 'SWX')
-        : this.addAccessory(device, device.deviceid + 'SWX', 'curtain', false, {
-          cacheCurrentPosition: 0
-        })
-    } else if (this.cusG.has(device.deviceid + 'SWX') && this.cusG.get(device.deviceid + 'SWX').type === 'blind') {
-      accessory = this.devicesInHB.has(device.deviceid + 'SWX')
-        ? this.devicesInHB.get(device.deviceid + 'SWX')
-        : this.addAccessory(device, device.deviceid + 'SWX', 'blind', false, {
-          cacheCurrentPosition: 0,
-          cachePositionState: 2,
-          cacheTargetPosition: 0
-        })
-    } else if (this.cusG.has(device.deviceid + 'SWX') && this.cusG.get(device.deviceid + 'SWX').type === 'garage') {
-      accessory = this.devicesInHB.has(device.deviceid + 'SWX')
-        ? this.devicesInHB.get(device.deviceid + 'SWX')
-        : this.addAccessory(device, device.deviceid + 'SWX', 'garage', false, {
-          cacheCurrentDoorState: 1,
-          cacheTargetDoorState: 1
-        })
-    } else if (this.cusG.has(device.deviceid + 'SWX') && this.cusG.get(device.deviceid + 'SWX').type === 'garage_eachen') {
-      accessory = this.devicesInHB.has(device.deviceid + 'SWX')
-        ? this.devicesInHB.get(device.deviceid + 'SWX')
-        : this.addAccessory(device, device.deviceid + 'SWX', 'garage_eachen')
-    } else if (this.cusG.has(device.deviceid + 'SWX') && this.cusG.get(device.deviceid + 'SWX').type === 'lock') {
-      accessory = this.devicesInHB.has(device.deviceid + 'SWX')
-        ? this.devicesInHB.get(device.deviceid + 'SWX')
-        : this.addAccessory(device, device.deviceid + 'SWX', 'lock')
-    } else if (this.cusG.has(device.deviceid + 'SWX') && this.cusG.get(device.deviceid + 'SWX').type === 'valve') {
-      accessory = this.devicesInHB.has(device.deviceid + 'SWX')
-        ? this.devicesInHB.get(device.deviceid + 'SWX')
-        : this.addAccessory(device, device.deviceid + 'SWX', 'valve', false, {
-          operationTime: this.cusG.get(device.deviceid + 'SWX').operationTime
-        })
-        accessory.context.operationTime = this.cusG.get(device.deviceid + 'SWX').operationTime
-    } else if (cns.devicesSensor.includes(device.extra.uiid)) {
-      accessory = this.devicesInHB.has(device.deviceid + 'SWX')
-        ? this.devicesInHB.get(device.deviceid + 'SWX')
-        : this.addAccessory(device, device.deviceid + 'SWX', 'sensor')
-    } else if (cns.devicesFan.includes(device.extra.uiid)) {
-      accessory = this.devicesInHB.has(device.deviceid + 'SWX')
-        ? this.devicesInHB.get(device.deviceid + 'SWX')
-        : this.addAccessory(device, device.deviceid + 'SWX', 'fan')
-    } else if (cns.devicesThermostat.includes(device.extra.uiid)) {
-      accessory = this.devicesInHB.has(device.deviceid + 'SWX')
-        ? this.devicesInHB.get(device.deviceid + 'SWX')
-        : this.addAccessory(device, device.deviceid + 'SWX', 'thermostat', false, {
-          sensorType: device.params.sensorType
-        })
-      if (accessory.context.sensorType !== device.params.sensorType) {
-        accessory.context.sensorType = device.params.sensorType
-        this.devicesInHB.set(accessory.context.hbDeviceId, accessory)
-      }
-    } else if (cns.devicesOutlet.includes(device.extra.uiid) || (cns.devicesSingleSwitch.includes(device.extra.uiid) && cns.devicesSingleSwitchOutlet.includes(device.productModel))) {
-      accessory = this.devicesInHB.has(device.deviceid + 'SWX')
-        ? this.devicesInHB.get(device.deviceid + 'SWX')
-        : this.addAccessory(device, device.deviceid + 'SWX', 'outlet')
-    } else if (cns.devicesUSB.includes(device.extra.uiid)) {
-      accessory = this.devicesInHB.has(device.deviceid + 'SWX')
-        ? this.devicesInHB.get(device.deviceid + 'SWX')
-        : this.addAccessory(device, device.deviceid + 'SWX', 'usb')
-    } else if (cns.devicesSCM.includes(device.extra.uiid)) {
-      accessory = this.devicesInHB.has(device.deviceid + 'SWX')
-        ? this.devicesInHB.get(device.deviceid + 'SWX')
-        : this.addAccessory(device, device.deviceid + 'SWX', 'scm')
-    } else if (cns.devicesSingleSwitch.includes(device.extra.uiid) && cns.devicesSingleSwitchLight.includes(device.productModel)) {
-      accessory = this.devicesInHB.has(device.deviceid + 'SWX')
-        ? this.devicesInHB.get(device.deviceid + 'SWX')
-        : this.addAccessory(device, device.deviceid + 'SWX', 'light')
-    } else if (cns.devicesMultiSwitch.includes(device.extra.uiid) && cns.devicesMultiSwitchLight.includes(device.productModel)) {
-      if (this.config.hideMasters) {
-        if (this.devicesInHB.has(device.deviceid + 'SW0')) {
-          this.removeAccessory(this.devicesInHB.get(device.deviceid + 'SW0'))
+    try {
+      if (cns.devicesCurtain.includes(device.extra.uiid)) {
+        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
+          ? this.devicesInHB.get(device.deviceid + 'SWX')
+          : this.addAccessory(device, device.deviceid + 'SWX', false, { cacheCurrentPosition: 0 })
+        accessory.control = new DeviceCurtain(this, accessory)
+      } else if (this.cusG.has(device.deviceid + 'SWX') && this.cusG.get(device.deviceid + 'SWX').type === 'blind') {
+        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
+          ? this.devicesInHB.get(device.deviceid + 'SWX')
+          : this.addAccessory(device, device.deviceid + 'SWX', false, {
+            cacheCurrentPosition: 0,
+            cachePositionState: 2,
+            cacheTargetPosition: 0
+          })
+        accessory.control = new DeviceBlind(this, accessory)
+      } else if (this.cusG.has(device.deviceid + 'SWX') && this.cusG.get(device.deviceid + 'SWX').type === 'garage') {
+        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
+          ? this.devicesInHB.get(device.deviceid + 'SWX')
+          : this.addAccessory(device, device.deviceid + 'SWX', false, {
+            cacheCurrentDoorState: 1,
+            cacheTargetDoorState: 1
+          })
+        accessory.control = new DeviceGarage(this, accessory)
+      } else if (this.cusG.has(device.deviceid + 'SWX') && this.cusG.get(device.deviceid + 'SWX').type === 'garage_eachen') {
+        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
+          ? this.devicesInHB.get(device.deviceid + 'SWX')
+          : this.addAccessory(device, device.deviceid + 'SWX')
+        accessory.control = new DeviceGarageEachen(this, accessory)
+      } else if (this.cusG.has(device.deviceid + 'SWX') && this.cusG.get(device.deviceid + 'SWX').type === 'lock') {
+        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
+          ? this.devicesInHB.get(device.deviceid + 'SWX')
+          : this.addAccessory(device, device.deviceid + 'SWX')
+        accessory.control = new DeviceLock(this, accessory)
+      } else if (this.cusG.has(device.deviceid + 'SWX') && this.cusG.get(device.deviceid + 'SWX').type === 'valve') {
+        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
+          ? this.devicesInHB.get(device.deviceid + 'SWX')
+          : this.addAccessory(device, device.deviceid + 'SWX')
+        accessory.control = new DeviceValve(this, accessory)
+      } else if (cns.devicesSensor.includes(device.extra.uiid)) {
+        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
+          ? this.devicesInHB.get(device.deviceid + 'SWX')
+          : this.addAccessory(device, device.deviceid + 'SWX', false, { type: 'sensor' })
+        accessory.control = new DeviceSensor(this, accessory)
+      } else if (cns.devicesFan.includes(device.extra.uiid)) {
+        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
+          ? this.devicesInHB.get(device.deviceid + 'SWX')
+          : this.addAccessory(device, device.deviceid + 'SWX')
+        accessory.control = new DeviceFan(this, accessory)
+      } else if (cns.devicesThermostat.includes(device.extra.uiid)) {
+        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
+          ? this.devicesInHB.get(device.deviceid + 'SWX')
+          : this.addAccessory(device, device.deviceid + 'SWX', false, {
+            sensorType: device.params.sensorType
+          })
+        if (accessory.context.sensorType !== device.params.sensorType) {
+          accessory.context.sensorType = device.params.sensorType
         }
-        this.hiddenMasters.push(device.deviceid)
-        accessory = this.addAccessory(device, device.deviceid + 'SW0', 'light', true)
+        accessory.control = new DeviceThermostat(this, accessory)
+      } else if (cns.devicesOutlet.includes(device.extra.uiid) || (cns.devicesSingleSwitch.includes(device.extra.uiid) && cns.devicesSingleSwitchOutlet.includes(device.productModel))) {
+        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
+          ? this.devicesInHB.get(device.deviceid + 'SWX')
+          : this.addAccessory(device, device.deviceid + 'SWX')
+        accessory.control = new DeviceOutlet(this, accessory)
+      } else if (cns.devicesUSB.includes(device.extra.uiid)) {
+        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
+          ? this.devicesInHB.get(device.deviceid + 'SWX')
+          : this.addAccessory(device, device.deviceid + 'SWX')
+        accessory.control = new DeviceUSB(this, accessory)
+      } else if (cns.devicesSCM.includes(device.extra.uiid)) {
+        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
+          ? this.devicesInHB.get(device.deviceid + 'SWX')
+          : this.addAccessory(device, device.deviceid + 'SWX')
+        accessory.control = new DeviceSCM(this, accessory)
+      } else if (cns.devicesSingleSwitch.includes(device.extra.uiid) && cns.devicesSingleSwitchLight.includes(device.productModel)) {
+        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
+          ? this.devicesInHB.get(device.deviceid + 'SWX')
+          : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new DeviceLight(this, accessory)
-      } else {
-        accessory = this.devicesInHB.has(device.deviceid + 'SW0')
-          ? this.devicesInHB.get(device.deviceid + 'SW0')
-          : this.addAccessory(device, device.deviceid + 'SW0', 'light')
-      }
-      for (let i = 1; i <= cns.chansFromUiid[device.extra.uiid]; i++) {
-        if ((this.config.hideFromHB || '').includes(device.deviceid + 'SW' + i)) {
-          if (this.devicesInHB.has(device.deviceid + 'SW' + i)) {
-            this.removeAccessory(this.devicesInHB.get(device.deviceid + 'SW' + i))
+      } else if (cns.devicesMultiSwitch.includes(device.extra.uiid) && cns.devicesMultiSwitchLight.includes(device.productModel)) {
+        if (this.config.hideMasters) {
+          if (this.devicesInHB.has(device.deviceid + 'SW0')) {
+            this.removeAccessory(this.devicesInHB.get(device.deviceid + 'SW0'))
           }
+          this.hiddenMasters.push(device.deviceid)
+          accessory = this.addAccessory(device, device.deviceid + 'SW0', true)
         } else {
-          const oAccessory = this.devicesInHB.has(device.deviceid + 'SW' + i)
-            ? this.devicesInHB.get(device.deviceid + 'SW' + i)
-            : this.addAccessory(device, device.deviceid + 'SW' + i, 'light')
-          oAccessory
-            .getService(Service.AccessoryInformation)
-            .setCharacteristic(Characteristic.FirmwareRevision, device.params.fwVersion)
-          oAccessory.context.reachableWAN = device.online
-          oAccessory.context.reachableLAN = this.lanDevices.get(device.deviceid).online || false
-          this.devicesInHB.set(oAccessory.context.hbDeviceId, oAccessory)
+          accessory = this.devicesInHB.has(device.deviceid + 'SW0')
+            ? this.devicesInHB.get(device.deviceid + 'SW0')
+            : this.addAccessory(device, device.deviceid + 'SW0')
         }
-      }
-    } else if (cns.devicesSingleSwitch.includes(device.extra.uiid)) {
-      accessory = this.devicesInHB.has(device.deviceid + 'SWX')
-        ? this.devicesInHB.get(device.deviceid + 'SWX')
-        : this.addAccessory(device, device.deviceid + 'SWX', 'switch')
-    } else if (cns.devicesMultiSwitch.includes(device.extra.uiid)) {
-      if (this.config.hideMasters) {
-        if (this.devicesInHB.has(device.deviceid + 'SW0')) {
-          this.removeAccessory(this.devicesInHB.get(device.deviceid + 'SW0'))
+        accessory.control = new DeviceLight(this, accessory)
+        for (let i = 1; i <= cns.chansFromUiid[device.extra.uiid]; i++) {
+          if ((this.config.hideFromHB || '').includes(device.deviceid + 'SW' + i)) {
+            if (this.devicesInHB.has(device.deviceid + 'SW' + i)) {
+              this.removeAccessory(this.devicesInHB.get(device.deviceid + 'SW' + i))
+            }
+          } else {
+            const oAccessory = this.devicesInHB.has(device.deviceid + 'SW' + i)
+              ? this.devicesInHB.get(device.deviceid + 'SW' + i)
+              : this.addAccessory(device, device.deviceid + 'SW' + i)
+            oAccessory
+              .getService(Service.AccessoryInformation)
+              .setCharacteristic(Characteristic.FirmwareRevision, device.params.fwVersion)
+            oAccessory.context.reachableWAN = device.online
+            oAccessory.context.reachableLAN = this.lanDevices.get(device.deviceid).online || false
+            this.devicesInHB.set(oAccessory.context.hbDeviceId, oAccessory)
+            oAccessory.control = new DeviceLight(this, oAccessory)
+          }
         }
-        this.hiddenMasters.push(device.deviceid)
-        accessory = this.addAccessory(device, device.deviceid + 'SW0', 'switch', true)
+      } else if (cns.devicesSingleSwitch.includes(device.extra.uiid)) {
+        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
+          ? this.devicesInHB.get(device.deviceid + 'SWX')
+          : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new DeviceSwitch(this, accessory)
-      } else {
-        accessory = this.devicesInHB.has(device.deviceid + 'SW0')
-          ? this.devicesInHB.get(device.deviceid + 'SW0')
-          : this.addAccessory(device, device.deviceid + 'SW0', 'switch')
-      }
-      for (let i = 1; i <= cns.chansFromUiid[device.extra.uiid]; i++) {
-        if ((this.config.hideFromHB || '').includes(device.deviceid + 'SW' + i)) {
-          if (this.devicesInHB.has(device.deviceid + 'SW' + i)) {
-            this.removeAccessory(this.devicesInHB.get(device.deviceid + 'SW' + i))
+      } else if (cns.devicesMultiSwitch.includes(device.extra.uiid)) {
+        if (this.config.hideMasters) {
+          if (this.devicesInHB.has(device.deviceid + 'SW0')) {
+            this.removeAccessory(this.devicesInHB.get(device.deviceid + 'SW0'))
           }
+          this.hiddenMasters.push(device.deviceid)
+          accessory = this.addAccessory(device, device.deviceid + 'SW0', true)
         } else {
-          const oAccessory = this.devicesInHB.has(device.deviceid + 'SW' + i)
-            ? this.devicesInHB.get(device.deviceid + 'SW' + i)
-            : this.addAccessory(device, device.deviceid + 'SW' + i, 'switch')
-          oAccessory
-            .getService(Service.AccessoryInformation)
-            .setCharacteristic(Characteristic.FirmwareRevision, device.params.fwVersion)
-          oAccessory.context.reachableWAN = device.online
-          oAccessory.context.reachableLAN = this.lanDevices.get(device.deviceid).online || false
-          this.devicesInHB.set(oAccessory.context.hbDeviceId, oAccessory)
+          accessory = this.devicesInHB.has(device.deviceid + 'SW0')
+            ? this.devicesInHB.get(device.deviceid + 'SW0')
+            : this.addAccessory(device, device.deviceid + 'SW0')
         }
-      }
-    } else if (cns.devicesRFBridge.includes(device.extra.uiid)) {
-      let rfChlCounter = 0
-      const rfMap = []
-      if (Object.prototype.hasOwnProperty.call(device, 'tags') && Object.prototype.hasOwnProperty.call(device.tags, 'zyx_info')) {
-        device.tags.zyx_info.forEach(remote =>
-          rfMap.push({
-            name: remote.name,
-            type: remote.remote_type,
-            buttons: Object.assign({}, ...remote.buttonName)
-          })
-        )
-      }
-      const accessory = this.devicesInHB.has(device.deviceid + 'SW0')
-        ? this.devicesInHB.get(device.deviceid + 'SW0')
-        : this.addAccessory(device, device.deviceid + 'SW0', 'rf_pri', true, {
-          rfMap
-        })
-      accessory.control = new DeviceRFBridge(this, accessory)
-      this.hiddenMasters.push(device.deviceid)
-      rfMap.forEach(subDevice => {
-        const swNumber = rfChlCounter + 1
-        let subAccessory
-        let subType
-        let subExtraContext = {}
-        switch (subDevice.type) {
-          case '1':
-          case '2':
-          case '3':
-          case '4':
-            subType = 'button'
-            break
-          case '6':
-            subType = this.cusS.has(device.deviceid + 'SW' + swNumber)
-              ? this.cusS.get(device.deviceid + 'SW' + swNumber).type
-              : 'motion'
-            break
-          default:
-            return
+        accessory.control = new DeviceSwitch(this, accessory)
+        for (let i = 1; i <= cns.chansFromUiid[device.extra.uiid]; i++) {
+          if ((this.config.hideFromHB || '').includes(device.deviceid + 'SW' + i)) {
+            if (this.devicesInHB.has(device.deviceid + 'SW' + i)) {
+              this.removeAccessory(this.devicesInHB.get(device.deviceid + 'SW' + i))
+            }
+          } else {
+            const oAccessory = this.devicesInHB.has(device.deviceid + 'SW' + i)
+              ? this.devicesInHB.get(device.deviceid + 'SW' + i)
+              : this.addAccessory(device, device.deviceid + 'SW' + i)
+            oAccessory
+              .getService(Service.AccessoryInformation)
+              .setCharacteristic(Characteristic.FirmwareRevision, device.params.fwVersion)
+            oAccessory.context.reachableWAN = device.online
+            oAccessory.context.reachableLAN = this.lanDevices.get(device.deviceid).online || false
+            this.devicesInHB.set(oAccessory.context.hbDeviceId, oAccessory)
+            oAccessory.control = new DeviceSwitch(this, oAccessory)
+          }
         }
-        subExtraContext = {
-          buttons: subDevice.buttons,
-          subType,
-          swNumber
+      } else if (cns.devicesRFBridge.includes(device.extra.uiid)) {
+        let rfChlCounter = 0
+        const rfMap = []
+        if (Object.prototype.hasOwnProperty.call(device, 'tags') && Object.prototype.hasOwnProperty.call(device.tags, 'zyx_info')) {
+          device.tags.zyx_info.forEach(remote =>
+            rfMap.push({
+              name: remote.name,
+              type: remote.remote_type,
+              buttons: Object.assign({}, ...remote.buttonName)
+            })
+          )
         }
-        if ((subAccessory = this.devicesInHB.get(device.deviceid + 'SW' + swNumber))) {
-          if (subAccessory.context.subType !== subType || subAccessory.context.swNumber !== swNumber) {
-            this.removeAccessory(subAccessory)
+        accessory = this.devicesInHB.has(device.deviceid + 'SW0')
+          ? this.devicesInHB.get(device.deviceid + 'SW0')
+          : this.addAccessory(device, device.deviceid + 'SW0', true, {
+            rfMap
+          }, 'rf_pri')
+        accessory.control = new DeviceRFBridge(this, accessory)
+        this.hiddenMasters.push(device.deviceid)
+        rfMap.forEach(subDevice => {
+          const swNumber = rfChlCounter + 1
+          let subAccessory
+          let subType
+          let subExtraContext = {}
+          switch (subDevice.type) {
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+              subType = 'button'
+              break
+            case '6':
+              subType = this.cusS.has(device.deviceid + 'SW' + swNumber)
+                ? this.cusS.get(device.deviceid + 'SW' + swNumber).type
+                : 'motion'
+              break
+            default:
+              return
           }
-        }
-        subAccessory = this.devicesInHB.has(device.deviceid + 'SW' + swNumber)
-          ? this.devicesInHB.get(device.deviceid + 'SW' + swNumber)
-          : this.addAccessory(device, device.deviceid + 'SW' + swNumber, 'rf_sub', false, subExtraContext)
-        subAccessory
+          subExtraContext = {
+            buttons: subDevice.buttons,
+            subType,
+            swNumber
+          }
+          if ((subAccessory = this.devicesInHB.get(device.deviceid + 'SW' + swNumber))) {
+            if (subAccessory.context.subType !== subType || subAccessory.context.swNumber !== swNumber) {
+              this.removeAccessory(subAccessory)
+            }
+          }
+          subAccessory = this.devicesInHB.has(device.deviceid + 'SW' + swNumber)
+            ? this.devicesInHB.get(device.deviceid + 'SW' + swNumber)
+            : this.addAccessory(device, device.deviceid + 'SW' + swNumber, false, subExtraContext, 'rf_sub')
+          subAccessory
+            .getService(Service.AccessoryInformation)
+            .setCharacteristic(Characteristic.FirmwareRevision, device.params.fwVersion)
+          subAccessory.context.reachableWAN = device.online
+          subAccessory.context.reachableLAN = false
+          this.devicesInHB.set(subAccessory.context.hbDeviceId, subAccessory)
+          subAccessory.control = new DeviceRFBridge(this, subAccessory)
+          rfChlCounter += Object.keys(subDevice.buttons || {}).length
+        })
+        accessory.context.channelCount = rfChlCounter
+        this.devicesInHB.set(accessory.context.hbDeviceId, accessory)
+      } else if (cns.devicesZB.includes(device.extra.uiid)) {
+        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
+          ? this.devicesInHB.get(device.deviceid + 'SWX')
+          : this.addAccessory(device, device.deviceid + 'SWX')
+        accessory.control = new DeviceZBDev(this, accessory)
+      } else if (cns.devicesCamera.includes(device.extra.uiid)) {
+        this.log.warn(' → [%s] please see the homebridge-ewelink wiki for details to enable the camera', device.name)
+        return
+      } else if (!cns.devicesZBBridge.includes(device.extra.uiid)) {
+        this.log.warn(' → [%s] has not been added as it is not supported. Please make a GitHub issue request.', device.name)
+        return
+      }
+      if (!this.hiddenMasters.includes(device.deviceid)) {
+        accessory
           .getService(Service.AccessoryInformation)
           .setCharacteristic(Characteristic.FirmwareRevision, device.params.fwVersion)
-        subAccessory.context.reachableWAN = device.online
-        subAccessory.context.reachableLAN = false
-        this.devicesInHB.set(subAccessory.context.hbDeviceId, subAccessory)
-        rfChlCounter += Object.keys(subDevice.buttons || {}).length
-      })
-      accessory.context.channelCount = rfChlCounter
-      this.devicesInHB.set(accessory.context.hbDeviceId, accessory)
-    } else if (cns.devicesZB.includes(device.extra.uiid)) {
-      accessory = this.devicesInHB.has(device.deviceid + 'SWX')
-        ? this.devicesInHB.get(device.deviceid + 'SWX')
-        : this.addAccessory(device, device.deviceid + 'SWX', 'zb_dev')
-    } else if (cns.devicesCamera.includes(device.extra.uiid)) {
-      this.log.warn(' → [%s] please see the homebridge-ewelink wiki for details to enable the camera', device.name)
-      return
-    } else if (!cns.devicesZBBridge.includes(device.extra.uiid)) {
-      this.log.warn(' → [%s] has not been added as it is not supported. Please make a GitHub issue request.', device.name)
-      return
-    }
-    if (!accessory) return
-    if (!this.hiddenMasters.includes(device.deviceid)) {
-      accessory
-        .getService(Service.AccessoryInformation)
-        .setCharacteristic(Characteristic.FirmwareRevision, device.params.fwVersion)
-    }
-    accessory.context.reachableWAN = device.online
-    accessory.context.reachableLAN = this.lanDevices.has(device.deviceid)
-      ? this.lanDevices.get(device.deviceid).online
-      : false
-    accessory.context.inUse = false
-    let str = accessory.context.reachableLAN
-      ? 'and found locally with IP [' + this.lanDevices.get(device.deviceid).ip + ']'
-      : 'but LAN mode unavailable as device '
-    if (!accessory.context.reachableLAN) {
-      if (cns.devicesNonLAN.includes(device.extra.uiid)) {
-        str += "doesn't support it"
-      } else if (Object.prototype.hasOwnProperty.call(device, 'sharedBy') && Object.prototype.hasOwnProperty.call(device.sharedBy, 'email')) {
-        str += 'is shared (' + device.sharedBy.email + ')'
-      } else {
-        str += 'is unreachable'
       }
-    }
-    this.log(' → [%s] initialised %s.', device.name, str)
-    this.devicesInHB.set(accessory.context.hbDeviceId, accessory)
-    if (this.config.disableHTTPRefresh) return
-    try {
-      accessory.control.externalUpdate(accessory, device.params)
+      accessory.context.reachableWAN = device.online
+      accessory.context.reachableLAN = this.lanDevices.has(device.deviceid)
+        ? this.lanDevices.get(device.deviceid).online
+        : false
+      accessory.context.inUse = false
+      let str = accessory.context.reachableLAN
+        ? 'and found locally with IP [' + this.lanDevices.get(device.deviceid).ip + ']'
+        : 'but LAN mode unavailable as device '
+      if (!accessory.context.reachableLAN) {
+        if (cns.devicesNonLAN.includes(device.extra.uiid)) {
+          str += "doesn't support it"
+        } else if (Object.prototype.hasOwnProperty.call(device, 'sharedBy') && Object.prototype.hasOwnProperty.call(device.sharedBy, 'email')) {
+          str += 'is shared (' + device.sharedBy.email + ')'
+        } else {
+          str += 'is unreachable'
+        }
+      }
+      if (!this.config.disableHTTPRefresh) accessory.control.externalUpdate(accessory, device.params)
+      this.devicesInHB.set(accessory.context.hbDeviceId, accessory)
+      this.log(' → [%s] initialised %s.', device.name, str)
     } catch (err) {
       this.log.warn('[%s] could not be initialised as %s.', accessory.displayName, this.debug ? err : err.message)
     }
   }
 
-  addAccessory (device, hbDeviceId, type, hidden = false, extraContext = {}) {
+  addAccessory (device, hbDeviceId, hidden = false, extraContext = {}, type = '') {
     const switchNumber = hbDeviceId.substr(-1).toString()
     let newDeviceName = type === 'rf_sub' ? device.tags.zyx_info[switchNumber - 1].name : device.name
     const channelCount =
@@ -401,14 +408,12 @@ class eWeLink {
           eweModel: device.productModel,
           eweApiKey: device.apikey,
           switchNumber,
-          channelCount,
-          type
+          channelCount
         },
         ...extraContext
       }
       if (!hidden) {
         this.api.registerPlatformAccessories('homebridge-ewelink', 'eWeLink', [accessory])
-        this.configureAccessory(accessory)
         this.log(' → [%s] has been added to Homebridge.', newDeviceName)
       }
       return accessory
@@ -418,77 +423,6 @@ class eWeLink {
     }
   }
 
-  configureAccessory (accessory) {
-    if (!this.log) return
-    try {
-      accessory.context.reachableWAN = true
-      accessory.context.reachableLAN = true
-      switch (accessory.context.type) {
-        case 'curtain':
-          accessory.control = new DeviceCurtain(this, accessory)
-          break
-        case 'blind':
-          accessory.control = new DeviceBlind(this, accessory)
-          break
-        case 'garage':
-          accessory.control = new DeviceGarage(this, accessory)
-          break
-        case 'garage_eachen':
-          accessory.control = new DeviceGarageEachen(this, accessory)
-          break
-        case 'lock':
-          accessory.control = new DeviceLock(this, accessory)
-          break
-        case 'valve':
-          accessory.control = new DeviceValve(this, accessory)
-          break
-        case 'sensor':
-          accessory.control = new DeviceSensor(this, accessory)
-          break
-        case 'fan':
-          accessory.control = new DeviceFan(this, accessory)
-          break
-        case 'thermostat':
-          accessory.control = new DeviceThermostat(this, accessory)
-          break
-        case 'outlet':
-          accessory.control = new DeviceOutlet(this, accessory)
-          break
-        case 'usb':
-          accessory.control = new DeviceUSB(this, accessory)
-          break
-        case 'scm':
-          accessory.control = new DeviceSCM(this, accessory)
-          break
-        case 'light':
-          accessory.control = new DeviceLight(this, accessory)
-          break
-        case 'switch':
-          accessory.control = new DeviceSwitch(this, accessory)
-          break
-        case 'rf_sub':
-          accessory.control = new DeviceRFBridge(this, accessory)
-          break
-        case 'zb_dev': //* ** credit @tasict ***\\
-          accessory.control = new DeviceZBDev(this, accessory)
-          break
-      }
-      this.devicesInHB.set(accessory.context.hbDeviceId, accessory)
-    } catch (err) {
-      this.log.warn('[%s] could not be configured as %s.', accessory.displayName, err)
-    }
-  }
-
-  removeAccessory (accessory) {
-    try {
-      this.api.unregisterPlatformAccessories('homebridge-ewelink', 'eWeLink', [accessory])
-      this.devicesInHB.delete(accessory.context.hbDeviceId)
-      this.log(' → [%s] was removed from Homebridge.', accessory.displayName)
-    } catch (err) {
-      this.log.warn(" → [%s] wasn't removed as %s.", accessory.displayName, err)
-    }
-  }
-
   async sendDeviceUpdate (accessory, params) {
     const payload = {
       apikey: accessory.context.eweApiKey,
@@ -571,7 +505,7 @@ class eWeLink {
           this.lanClient.addDeviceToMap(newDevice)
         }
       } catch (err) {
-        this.log.warn('[%s] error getting info [%s]. Restart Homebeidge to add device.', deviceId, err.message)
+        this.log.warn('[%s] error getting info [%s]. Restart Homebridge to add device.', deviceId, err.message)
       }
     }
   }
@@ -589,6 +523,21 @@ class eWeLink {
       }
     }
   }
+
+  configureAccessory (accessory) {
+    if (!this.log) return
+    this.devicesInHB.set(accessory.context.hbDeviceId, accessory)
+  }
+
+  removeAccessory (accessory) {
+    try {
+      this.api.unregisterPlatformAccessories('homebridge-ewelink', 'eWeLink', [accessory])
+      this.devicesInHB.delete(accessory.context.hbDeviceId)
+      this.log(' → [%s] was removed from Homebridge.', accessory.displayName)
+    } catch (err) {
+      this.log.warn(" → [%s] wasn't removed as %s.", accessory.displayName, err)
+    }
+  }
 }
 module.exports = function (homebridge) {
   Characteristic = homebridge.hap.Characteristic

From 2642cd19bccc3d2984a90e1c8156f6bf5f7beecc Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 1 Oct 2020 16:20:03 +0100
Subject: [PATCH 0289/3183] 3.2.0-2

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 463b984a..5290496b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.2.0-1",
+  "version": "3.2.0-2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index fd2e214f..58aea4f0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.2.0-1",
+  "version": "3.2.0-2",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From c5ebf8f03c32fdc61e57136b976ff3c9c9f7cc63 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 1 Oct 2020 17:32:38 +0100
Subject: [PATCH 0290/3183] 3.2.0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 5290496b..832f0d92 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.2.0-2",
+  "version": "3.2.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 58aea4f0..f11902c2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.2.0-2",
+  "version": "3.2.0",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 690f5c48890216f64df9ac42afd3d070557a8589 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 1 Oct 2020 19:13:20 +0100
Subject: [PATCH 0291/3183] rename section

---
 config.schema.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 5732a4f1..fe60e161 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -312,7 +312,6 @@
         "inUsePowerThreshold",
         "sensorTimeLength",
         "sensorTimeDifference",
-        "valveTimeLength",
         "hideTHSwitch",
         "hideZBLDPress"
       ]
@@ -320,7 +319,7 @@
     {
       "key": "groups",
       "expandable": true,
-      "title": "Custom Device Simulations",
+      "title": "Custom Accessory Simulations",
       "add": "Add Another Type",
       "type": "array",
       "items": [

From dcbec76d7d5790dca81e2f1083bd7e82b51ed565 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Thu, 1 Oct 2020 19:14:32 +0100
Subject: [PATCH 0292/3183] Update README.md

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 33b6d570..138c863d 100644
--- a/README.md
+++ b/README.md
@@ -24,6 +24,7 @@
 * [Beta Version](https://github.com/bwp91/homebridge-ewelink/wiki/Beta-Version)
 ### Features
 * [Supported Devices](https://github.com/bwp91/homebridge-ewelink/wiki/Supported-Devices)
+* [Custom Accessory Simulations](https://github.com/bwp91/homebridge-ewelink/wiki/Custom-Accessory-Simulations)
 * [Connection Methods](https://github.com/bwp91/homebridge-ewelink/wiki/Connection-Methods)
 ### How-to Guides
 * [How to set up RF Bridge sensors](https://github.com/bwp91/homebridge-ewelink/wiki/How-to-set-up-RF-Bridge-sensors)

From 1c1c6cd614cca80c5de425cc6d99579713f0c786 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 1 Oct 2020 19:16:41 +0100
Subject: [PATCH 0293/3183] Update config.schema.json

---
 config.schema.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index fe60e161..74ce6699 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -110,7 +110,7 @@
       },
       "groups": {
         "type": "array",
-        "title": "Custom Device Types",
+        "title": "Accessory Simulations",
         "description": "You can use this setting to set up custom simulated HomeKit accessories from a generic single/multi-switch device.",
         "items": {
           "type": "object",
@@ -319,7 +319,7 @@
     {
       "key": "groups",
       "expandable": true,
-      "title": "Custom Accessory Simulations",
+      "title": "Accessory Simulations",
       "add": "Add Another Type",
       "type": "array",
       "items": [

From e361c0cb49af9691c8ecef78aea4aca3278b8661 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Thu, 1 Oct 2020 19:17:43 +0100
Subject: [PATCH 0294/3183] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 138c863d..4f0e0eb3 100644
--- a/README.md
+++ b/README.md
@@ -24,7 +24,7 @@
 * [Beta Version](https://github.com/bwp91/homebridge-ewelink/wiki/Beta-Version)
 ### Features
 * [Supported Devices](https://github.com/bwp91/homebridge-ewelink/wiki/Supported-Devices)
-* [Custom Accessory Simulations](https://github.com/bwp91/homebridge-ewelink/wiki/Custom-Accessory-Simulations)
+* [Accessory Simulations](https://github.com/bwp91/homebridge-ewelink/wiki/Accessory-Simulations)
 * [Connection Methods](https://github.com/bwp91/homebridge-ewelink/wiki/Connection-Methods)
 ### How-to Guides
 * [How to set up RF Bridge sensors](https://github.com/bwp91/homebridge-ewelink/wiki/How-to-set-up-RF-Bridge-sensors)

From ab0099437af5681d08b733bc502f2cd6bdb91c2b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 1 Oct 2020 19:45:08 +0100
Subject: [PATCH 0295/3183] Update config.schema.json

---
 config.schema.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config.schema.json b/config.schema.json
index 74ce6699..d28e2210 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -55,7 +55,7 @@
       "hideFromHB": {
         "type": "string",
         "title": "Hide Device Channels",
-        "description": "A list of SW1, SW2, SW3 and SW4 to hide from Homebridge. For example '10009553c8SW1' or multiple channels separated with a comma '10009553c8SW1,10009553c9SW2'. Only channels from switches and lights can be hidden. This setting cannot be used to hide master devices (SW0).",
+        "description": "A list of SW1, SW2, SW3 and SW4 to hide from Homebridge. For example '10009553c8SW1' or multiple channels separated with a comma '10009553c8SW1,10009553c9SW2'. Only channels from lights and switches can be hidden.",
         "default": ""
       },
       "disableHTTPRefresh": {

From 6b608ae5ccb7acc2211135136aef2687f9673e4d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 1 Oct 2020 21:06:16 +0100
Subject: [PATCH 0296/3183] .

---
 lib/eWeLink.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index 2e4d277d..a2adc494 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -340,7 +340,7 @@ class eWeLink {
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new DeviceZBDev(this, accessory)
       } else if (cns.devicesCamera.includes(device.extra.uiid)) {
-        this.log.warn(' → [%s] please see the homebridge-ewelink wiki for details to enable the camera', device.name)
+        this.log.warn(' → [%s] please see the homebridge-ewelink wiki for details to enable the camera.', device.name)
         return
       } else if (!cns.devicesZBBridge.includes(device.extra.uiid)) {
         this.log.warn(' → [%s] has not been added as it is not supported. Please make a GitHub issue request.', device.name)

From cb9b3a4db7f41434f5c7fbece358e7d73c6f3d6d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 1 Oct 2020 22:34:38 +0100
Subject: [PATCH 0297/3183] keywords

---
 package.json | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index f11902c2..7abb45cf 100644
--- a/package.json
+++ b/package.json
@@ -27,9 +27,13 @@
   "keywords": [
     "homebridge",
     "homebridge-plugin",
-    "homekit",
     "sonoff",
-    "ewelink"
+    "homekit",
+    "siri",
+    "ewelink",
+    "homebridge-ewelink",
+    "hoobs",
+    "eachen"
   ],
   "engines": {
     "node": ">=10.0.0",

From 60097185629f3d8cbd537f43c8d324f086e6fd80 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 2 Oct 2020 11:48:56 +0100
Subject: [PATCH 0298/3183] log ws message

---
 lib/eWeLinkWS.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/eWeLinkWS.js b/lib/eWeLinkWS.js
index 3c305920..5d585aa8 100644
--- a/lib/eWeLinkWS.js
+++ b/lib/eWeLinkWS.js
@@ -196,15 +196,15 @@ module.exports = class eWeLinkWS {
     }
     if (this.wsp && this.wsIsOpen) {
       try {
-        const device = await this.wsp.sendRequest(jsonToSend, {
-          requestId: sequence
-        })
         if (this.debugReqRes) {
           const msg = JSON.stringify(json, null, 2).replace(json.apikey, '**hidden**').replace(json.apiKey, '**hidden**').replace(json.deviceid, '**hidden**')
           this.log.warn('WS message sent. This text is yellow for clarity.\n%s', msg)
         } else if (this.debug) {
           this.log('WS message sent.')
         }
+        const device = await this.wsp.sendRequest(jsonToSend, {
+          requestId: sequence
+        })
         device.error = Object.prototype.hasOwnProperty.call(device, 'error') ? device.error : 504
         switch (device.error) {
           case 0:

From d830462b5756c6a58c4d5c113b707cec72bf1137 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 2 Oct 2020 11:49:08 +0100
Subject: [PATCH 0299/3183] button fixes

---
 lib/device/rf-bridge.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/device/rf-bridge.js b/lib/device/rf-bridge.js
index 59f267ce..b2124215 100644
--- a/lib/device/rf-bridge.js
+++ b/lib/device/rf-bridge.js
@@ -50,10 +50,10 @@ module.exports = class deviceRFBridge {
         rfChl: parseInt(rfChl)
       }
       const rfService = accessory.getService(service)
-      await this.platform.sendDeviceUpdate(accessory, params)
       rfService.updateCharacteristic(Characteristic.On, true)
-      await utils.sleep(3000)
+      await utils.sleep(1000)
       rfService.updateCharacteristic(Characteristic.On, false)
+      await this.platform.sendDeviceUpdate(accessory, params)
     } catch (err) {
       this.platform.deviceUpdateError(accessory, err, true)
     }
@@ -68,6 +68,7 @@ module.exports = class deviceRFBridge {
         this.platform.devicesInHB.forEach(acc => {
           if (
             acc.context.eweDeviceId === accessory.context.eweDeviceId &&
+            Object.prototype.hasOwnProperty.call(acc.context, 'buttons') &&
             Object.prototype.hasOwnProperty.call(acc.context.buttons, params.rfChl.toString())
           ) {
             oAccessory = acc
@@ -107,7 +108,7 @@ module.exports = class deviceRFBridge {
               if (diff < (this.platform.config.sensorTimeDifference || 120)) {
                 switch (oAccessory.context.subType) {
                   case 'button':
-                    break
+                    return
                   case 'water':
                     serv = Service.LeakSensor
                     char = Characteristic.LeakDetected

From a6c1f448b889366620432c2c2c03930aa023296b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 2 Oct 2020 11:52:21 +0100
Subject: [PATCH 0300/3183] 3.2.1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 832f0d92..bed97bc7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.2.0",
+  "version": "3.2.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 7abb45cf..1ffe3219 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.2.0",
+  "version": "3.2.1",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 70cf1b69b40ff00db6126563f77f6fbb760c8aa2 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 2 Oct 2020 14:41:55 +0100
Subject: [PATCH 0301/3183] remove old switches on change to custom

---
 lib/eWeLink.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index a2adc494..b602d7a4 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -127,6 +127,16 @@ class eWeLink {
   initialiseDevice (device) {
     let accessory
     try {
+      if (this.cusG.has(device.deviceid + 'SWX')) {
+        const all = ['X', '0', '1', '2', '3', '4']
+        all.forEach(v => {
+          if (this.devicesInHB.has(device.deviceid + 'SW' + v)) {
+            if (this.devicesInHB.get(device.deviceid + 'SW' + v).getService(Service.Switch)) {
+              this.removeAccessory(this.devicesInHB.get(device.deviceid + 'SW' + v))
+            }
+          }
+        })
+      }
       if (cns.devicesCurtain.includes(device.extra.uiid)) {
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')

From 8063075bf73f14c297c648d687cbb6827a14a9e1 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 2 Oct 2020 16:44:17 +0100
Subject: [PATCH 0302/3183] catch no displayName

---
 lib/eWeLink.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index b602d7a4..b862c315 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -382,7 +382,7 @@ class eWeLink {
       this.devicesInHB.set(accessory.context.hbDeviceId, accessory)
       this.log(' → [%s] initialised %s.', device.name, str)
     } catch (err) {
-      this.log.warn('[%s] could not be initialised as %s.', accessory.displayName, this.debug ? err : err.message)
+      this.log.warn('[%s] could not be initialised as %s.', accessory.displayName || device.name, this.debug ? err : err.message)
     }
   }
 

From bfc574ec967fa31593196090efb3ac3c672635f9 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 2 Oct 2020 16:44:30 +0100
Subject: [PATCH 0303/3183] remove outlet switch if exists

---
 lib/constants.js     |  2 +-
 lib/device/outlet.js | 12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/lib/constants.js b/lib/constants.js
index b23eb05b..27f4f0ce 100644
--- a/lib/constants.js
+++ b/lib/constants.js
@@ -10,7 +10,7 @@ module.exports = {
   devicesMultiSwitch: [2, 3, 4, 7, 8, 9, 29, 30, 31, 34, 41],
   devicesSingleSwitchLight: ['T1 1C', 'L1', 'B1', 'B1_R2', 'TX1C', 'D1', 'D1R1', 'KING-M4', 'Slampher', 'GTTA59'],
   devicesMultiSwitchLight: ['T1 2C', 'T1 3C', 'TX2C', 'TX3C'],
-  devicesSingleSwitchOutlet: ['Sonoff Pow', 'S26'],
+  devicesSingleSwitchOutlet: ['Sonoff Pow', 'S20', 'S26', 'S55'],
   devicesBrightable: [36, 44],
   devicesColourable: [22, 59],
   devicesCurtain: [11],
diff --git a/lib/device/outlet.js b/lib/device/outlet.js
index 9941c0ee..29cd1938 100644
--- a/lib/device/outlet.js
+++ b/lib/device/outlet.js
@@ -1,5 +1,6 @@
 'use strict'
 let Characteristic, EveHistoryService, EveService, Service
+const cns = require('./../constants')
 const corrInterval = require('correcting-interval')
 const fakegato = require('fakegato-history')
 const hbLib = require('homebridge-lib')
@@ -10,11 +11,14 @@ module.exports = class deviceOutlet {
     Characteristic = platform.api.hap.Characteristic
     EveService = new hbLib.EveHomeKitTypes(platform.api)
     EveHistoryService = fakegato(platform.api)
+    if (accessory.getService(Service.Switch)) {
+      accessory.removeService(Service.Switch)
+    }
     let outletService
     if (!(outletService = accessory.getService(Service.Outlet))) {
       accessory.addService(Service.Outlet)
       outletService = accessory.getService(Service.Outlet)
-      if (accessory.context.eweModel !== 'S26' && !this.platform.config.disableEveLogging) {
+      if (!cns.devicesSingleSwitchOutlet.includes(accessory.context.eweModel) && !this.platform.config.disableEveLogging) {
         outletService.addCharacteristic(EveService.Characteristics.Voltage)
         outletService.addCharacteristic(EveService.Characteristics.CurrentConsumption)
         outletService.addCharacteristic(EveService.Characteristics.ElectricCurrent)
@@ -34,7 +38,7 @@ module.exports = class deviceOutlet {
     outletService
       .getCharacteristic(Characteristic.On)
       .on('set', (value, callback) => this.internalUpdate(accessory, value, callback))
-    if (accessory.context.eweModel !== 'S26' && !this.platform.config.disableEveLogging) {
+    if (!cns.devicesSingleSwitchOutlet.includes(accessory.context.eweModel) && !this.platform.config.disableEveLogging) {
       accessory.log = this.platform.log
       accessory.eveLogger = new EveHistoryService('energy', accessory, {
         storage: 'fs',
@@ -123,13 +127,13 @@ module.exports = class deviceOutlet {
       const outletService = accessory.getService(Service.Outlet)
       if (Object.prototype.hasOwnProperty.call(params, 'switch')) {
         outletService.updateCharacteristic(Characteristic.On, params.switch === 'on')
-        if (accessory.context.eweModel === 'S26' || this.platform.config.disableEveLogging) {
+        if (cns.devicesSingleSwitchOutlet.includes(accessory.context.eweModel) || this.platform.config.disableEveLogging) {
           outletService.updateCharacteristic(Characteristic.OutletInUse, params.switch === 'on')
         }
       }
       if (Object.prototype.hasOwnProperty.call(params, 'power')) {
         outletService.updateCharacteristic(EveService.Characteristics.CurrentConsumption, parseFloat(params.power))
-        if (accessory.context.eweModel !== 'S26' && !this.platform.config.disableEveLogging) {
+        if (!cns.devicesSingleSwitchOutlet.includes(accessory.context.eweModel) && !this.platform.config.disableEveLogging) {
           outletService.updateCharacteristic(
             Characteristic.OutletInUse,
             parseFloat(params.power) > (this.platform.config.inUsePowerThreshold || 0)

From 125713f62b8cded77b023a1fbf50b6f467dbb13a Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 2 Oct 2020 16:46:33 +0100
Subject: [PATCH 0304/3183] 3.2.2

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index bed97bc7..64f8b6ec 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.2.1",
+  "version": "3.2.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 1ffe3219..434c0146 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.2.1",
+  "version": "3.2.2",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 997d2b4c2555ace7d218f522565619f2a2d7778d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 2 Oct 2020 17:16:31 +0100
Subject: [PATCH 0305/3183] Update eWeLink.js

---
 lib/eWeLink.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index b862c315..c7e8ee8c 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -382,7 +382,10 @@ class eWeLink {
       this.devicesInHB.set(accessory.context.hbDeviceId, accessory)
       this.log(' → [%s] initialised %s.', device.name, str)
     } catch (err) {
-      this.log.warn('[%s] could not be initialised as %s.', accessory.displayName || device.name, this.debug ? err : err.message)
+      const deviceName = accessory && Object.prototype.hasOwnProperty.call(accessory, 'displayName')
+        ? accessory.displayName
+        : device.name
+      this.log.warn('[%s] could not be initialised as %s.', deviceName, this.debug ? err : err.message)
     }
   }
 

From ac2a6127de415e30125d6c0214d8c74ee54b9949 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 2 Oct 2020 17:16:55 +0100
Subject: [PATCH 0306/3183] 3.2.3

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 64f8b6ec..a1f6ebb6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.2.2",
+  "version": "3.2.3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 434c0146..41507cb7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.2.2",
+  "version": "3.2.3",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 38288f2a787e36563bfc20d795e4bfcd1eccaa97 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 3 Oct 2020 14:21:22 +0100
Subject: [PATCH 0307/3183] remove outlet switch fix

---
 lib/device/outlet.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/device/outlet.js b/lib/device/outlet.js
index 29cd1938..bb86951d 100644
--- a/lib/device/outlet.js
+++ b/lib/device/outlet.js
@@ -12,7 +12,7 @@ module.exports = class deviceOutlet {
     EveService = new hbLib.EveHomeKitTypes(platform.api)
     EveHistoryService = fakegato(platform.api)
     if (accessory.getService(Service.Switch)) {
-      accessory.removeService(Service.Switch)
+      accessory.removeService(accessory.getService(Service.Switch))
     }
     let outletService
     if (!(outletService = accessory.getService(Service.Outlet))) {

From 3dd376b7d9b9f4d374db0fe730e7bf5ca4491de9 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 3 Oct 2020 14:22:26 +0100
Subject: [PATCH 0308/3183] code format

---
 lib/device/garage-eachen.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/device/garage-eachen.js b/lib/device/garage-eachen.js
index 91bd7e81..3d08ba86 100644
--- a/lib/device/garage-eachen.js
+++ b/lib/device/garage-eachen.js
@@ -62,9 +62,9 @@ module.exports = class deviceGarageEachen {
       if (garageConfig.type !== 'garage_eachen') {
         throw new Error('improper configuration')
       }
-      const gdService = accessory.getService(Service.GarageDoorOpener)
-      gdService.updateCharacteristic(Characteristic.CurrentDoorState, params.switch === 'on' ? 0 : 1)
-      gdService.updateCharacteristic(Characteristic.TargetDoorState, params.switch === 'on' ? 0 : 1)
+      accessory.getService(Service.GarageDoorOpener)
+        .updateCharacteristic(Characteristic.CurrentDoorState, params.switch === 'on' ? 0 : 1)
+        .updateCharacteristic(Characteristic.TargetDoorState, params.switch === 'on' ? 0 : 1)
     } catch (err) {
       this.platform.deviceUpdateError(accessory, err, false)
     }

From e97e178c350454a49c0f0062624d372342435657 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 3 Oct 2020 14:33:43 +0100
Subject: [PATCH 0309/3183] remove zb bridge device check

---
 lib/eWeLink.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index c7e8ee8c..c054ee19 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -344,6 +344,10 @@ class eWeLink {
         })
         accessory.context.channelCount = rfChlCounter
         this.devicesInHB.set(accessory.context.hbDeviceId, accessory)
+      } else if (cns.devicesZBBridge.includes(device.extra.uiid)) {
+        if (this.devicesInHB.has(device.deviceid + 'SW0')) {
+          this.removeAccessory(this.devicesInHB.get(device.deviceid + 'SW0'))
+        }
       } else if (cns.devicesZB.includes(device.extra.uiid)) {
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
@@ -352,7 +356,7 @@ class eWeLink {
       } else if (cns.devicesCamera.includes(device.extra.uiid)) {
         this.log.warn(' → [%s] please see the homebridge-ewelink wiki for details to enable the camera.', device.name)
         return
-      } else if (!cns.devicesZBBridge.includes(device.extra.uiid)) {
+      } else {
         this.log.warn(' → [%s] has not been added as it is not supported. Please make a GitHub issue request.', device.name)
         return
       }

From 3a860f7859498d6860cf63c357b61778d1fbe68e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 3 Oct 2020 14:44:26 +0100
Subject: [PATCH 0310/3183] 3.2.4

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index a1f6ebb6..51a19856 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.2.3",
+  "version": "3.2.4",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 41507cb7..4a18f3e2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.2.3",
+  "version": "3.2.4",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From a88b9316997c2a122c89d629f88ceacad9e2de2d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 3 Oct 2020 19:28:23 +0100
Subject: [PATCH 0311/3183] lan-> ws improvements

---
 lib/eWeLink.js    |  9 ++---
 lib/eWeLinkLAN.js | 95 +++++++++++++++++++++++++----------------------
 2 files changed, 54 insertions(+), 50 deletions(-)

diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index c054ee19..57d8470c 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -446,13 +446,12 @@ class eWeLink {
       deviceid: accessory.context.eweDeviceId,
       params
     }
-    try {
-      await utils.sleep(Math.random() * 100 + 200)
-      await this.lanClient.sendUpdate(payload)
-    } catch (err) {
+    await utils.sleep(Math.random() * 100 + 200)
+    const res = await this.lanClient.sendUpdate(payload)
+    if (res !== 'ok') {
       if (accessory.context.reachableWAN) {
         if (this.debug) {
-          this.log.warn('[%s] Reverting to web socket as LAN mode warning - %s.', accessory.displayName, this.debug ? err : err.message)
+          this.log('[%s] Reverting to web socket as %s.', accessory.displayName, res)
         }
         await this.wsClient.sendUpdate(payload)
       } else {
diff --git a/lib/eWeLinkLAN.js b/lib/eWeLinkLAN.js
index 67bfbae3..df0655c6 100644
--- a/lib/eWeLinkLAN.js
+++ b/lib/eWeLinkLAN.js
@@ -107,54 +107,59 @@ module.exports = class eWeLinkLAN {
   }
 
   async sendUpdate (json) {
-    if (!this.deviceMap.get(json.deviceid).online) {
-      throw new Error("device isn't reachable via LAN mode")
-    }
-    let apiKey
-    let suffix
-    const params = {}
-    if (Object.prototype.hasOwnProperty.call(json.params, 'switches')) {
-      params.switches = json.params.switches
-      suffix = 'switches'
-    } else if (Object.prototype.hasOwnProperty.call(json.params, 'switch')) {
-      params.switch = json.params.switch
-      suffix = 'switch'
-    } else {
-      throw new Error("device isn't reachable via LAN mode")
-    }
-    if ((apiKey = this.deviceMap.get(json.deviceid).apiKey)) {
-      const key = crypto.createHash('md5').update(Buffer.from(apiKey, 'utf8')).digest()
-      const iv = crypto.randomBytes(16)
-      const enc = crypto.createCipheriv('aes-128-cbc', key, iv)
-      const data = {
-        data: Buffer.concat([enc.update(JSON.stringify(params)), enc.final()]).toString('base64'),
-        deviceid: json.deviceid,
-        encrypt: true,
-        iv: iv.toString('base64'),
-        selfApikey: '123',
-        sequence: Date.now().toString()
+    try {
+      if (!this.deviceMap.get(json.deviceid).online) {
+        throw new Error("device isn't reachable via LAN mode")
       }
-      if (this.debugReqRes) {
-        const msg = JSON.stringify(json, null, 2)
-          .replace(json.apikey, '**hidden**')
-          .replace(json.apikey, '**hidden**')
-          .replace(json.deviceid, '**hidden**')
-        this.log.warn('LAN message sent. This text is yellow for clarity.\n%s', msg)
-      } else if (this.debug) {
-        this.log('LAN message sent.')
+      let apiKey
+      let suffix
+      const params = {}
+      if (Object.prototype.hasOwnProperty.call(json.params, 'switches')) {
+        params.switches = json.params.switches
+        suffix = 'switches'
+      } else if (Object.prototype.hasOwnProperty.call(json.params, 'switch')) {
+        params.switch = json.params.switch
+        suffix = 'switch'
+      } else {
+        throw new Error("device isn't reachable via LAN mode")
       }
-      const res = await axios({
-        method: 'post',
-        url: 'http://' + this.deviceMap.get(json.deviceid).ip + ':8081/zeroconf/' + suffix,
-        headers: {
-          Accept: 'application/json',
-          'Content-Type': 'application/json'
-        },
-        data
-      })
-      if (!Object.prototype.hasOwnProperty.call(res.data, 'error') || res.data.error !== 0) {
-        throw new Error(res.data)
+      if ((apiKey = this.deviceMap.get(json.deviceid).apiKey)) {
+        const key = crypto.createHash('md5').update(Buffer.from(apiKey, 'utf8')).digest()
+        const iv = crypto.randomBytes(16)
+        const enc = crypto.createCipheriv('aes-128-cbc', key, iv)
+        const data = {
+          data: Buffer.concat([enc.update(JSON.stringify(params)), enc.final()]).toString('base64'),
+          deviceid: json.deviceid,
+          encrypt: true,
+          iv: iv.toString('base64'),
+          selfApikey: '123',
+          sequence: Date.now().toString()
+        }
+        if (this.debugReqRes) {
+          const msg = JSON.stringify(json, null, 2)
+            .replace(json.apikey, '**hidden**')
+            .replace(json.apikey, '**hidden**')
+            .replace(json.deviceid, '**hidden**')
+          this.log.warn('LAN message sent. This text is yellow for clarity.\n%s', msg)
+        } else if (this.debug) {
+          this.log('LAN message sent.')
+        }
+        const res = await axios({
+          method: 'post',
+          url: 'http://' + this.deviceMap.get(json.deviceid).ip + ':8081/zeroconf/' + suffix,
+          headers: {
+            Accept: 'application/json',
+            'Content-Type': 'application/json'
+          },
+          data
+        })
+        if (!Object.prototype.hasOwnProperty.call(res.data, 'error') || res.data.error !== 0) {
+          throw new Error(res.data)
+        }
+        return 'ok'
       }
+    } catch (err) {
+      return err.message
     }
   }
 

From 7ffabbbc26b1c5db4d2fdeb826c8aa61613b59da Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 3 Oct 2020 19:50:37 +0100
Subject: [PATCH 0312/3183] hide custom SW0

---
 config.schema.json | 10 +++++-----
 lib/eWeLink.js     |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index d28e2210..7e27b86d 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -43,19 +43,19 @@
       "hideDevFromHB": {
         "type": "string",
         "title": "Hide Devices",
-        "description": "A list of eWeLink devices to hide from Homebridge. For example '10009553c8' or multiple devices separated with a comma '10009553c8,10009553c9'.",
+        "description": "A list of eWeLink devices to hide from Homebridge. For example '10009553c8' or multiple separated with a comma '10009553c8,10009553c9'.",
         "default": ""
       },
       "hideMasters": {
-        "type": "boolean",
-        "title": "Hide Master Switches",
-        "description": "If enabled, the 'SW0' accessory of multi-channel light and switch devices will be hidden from Homebridge.",
+        "type": "string",
+        "title": "Hide Master Lights/Switches",
+        "description": "A list of SW0 lights/switches to hide from Homebridge. For example '10009553c8' or multiple separated with a comma '10009553c8,10009553c9'.",
         "default": false
       },
       "hideFromHB": {
         "type": "string",
         "title": "Hide Device Channels",
-        "description": "A list of SW1, SW2, SW3 and SW4 to hide from Homebridge. For example '10009553c8SW1' or multiple channels separated with a comma '10009553c8SW1,10009553c9SW2'. Only channels from lights and switches can be hidden.",
+        "description": "A list of SW1, SW2, SW3 and SW4 channels to hide from Homebridge. For example '10009553c8SW1' or multiple separated with a comma '10009553c8SW1,10009553c9SW2'.",
         "default": ""
       },
       "disableHTTPRefresh": {
diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index 57d8470c..8ef86134 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -215,7 +215,7 @@ class eWeLink {
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new DeviceLight(this, accessory)
       } else if (cns.devicesMultiSwitch.includes(device.extra.uiid) && cns.devicesMultiSwitchLight.includes(device.productModel)) {
-        if (this.config.hideMasters) {
+        if ((this.config.hideMasters || '').includes(device.deviceid)) {
           if (this.devicesInHB.has(device.deviceid + 'SW0')) {
             this.removeAccessory(this.devicesInHB.get(device.deviceid + 'SW0'))
           }
@@ -251,7 +251,7 @@ class eWeLink {
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new DeviceSwitch(this, accessory)
       } else if (cns.devicesMultiSwitch.includes(device.extra.uiid)) {
-        if (this.config.hideMasters) {
+        if ((this.config.hideMasters || '').includes(device.deviceid)) {
           if (this.devicesInHB.has(device.deviceid + 'SW0')) {
             this.removeAccessory(this.devicesInHB.get(device.deviceid + 'SW0'))
           }

From 2f3fe0cc2ef239bb561a081e41efa7d67c19cea5 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 3 Oct 2020 20:38:02 +0100
Subject: [PATCH 0313/3183] 3.3.0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 51a19856..249642de 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.2.4",
+  "version": "3.3.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 4a18f3e2..733f7ef9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.2.4",
+  "version": "3.3.0",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 66d0c93eb8b00439ef3a29fd109aa3ad6c5fe07b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 3 Oct 2020 21:57:34 +0100
Subject: [PATCH 0314/3183] notifications fix

---
 lib/device/garage-eachen.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/lib/device/garage-eachen.js b/lib/device/garage-eachen.js
index 3d08ba86..85953acb 100644
--- a/lib/device/garage-eachen.js
+++ b/lib/device/garage-eachen.js
@@ -41,7 +41,7 @@ module.exports = class deviceGarageEachen {
         .updateCharacteristic(Characteristic.CurrentDoorState, newPos + 2)
       params.switch = value === 0 ? 'on' : 'off'
       await this.platform.sendDeviceUpdate(accessory, params)
-      await utils.sleep(garageConfig.operationTime * 100)
+      await utils.sleep(Math.max(garageConfig.operationTime * 100, 1000))
       gdService.updateCharacteristic(Characteristic.CurrentDoorState, newPos)
       accessory.context.inUse = false
     } catch (err) {
@@ -50,7 +50,7 @@ module.exports = class deviceGarageEachen {
     }
   }
 
-  externalUpdate (accessory, params) {
+  async externalUpdate (accessory, params) {
     try {
       if (!Object.prototype.hasOwnProperty.call(params, 'switch') || accessory.context.inUse) {
         return
@@ -62,9 +62,10 @@ module.exports = class deviceGarageEachen {
       if (garageConfig.type !== 'garage_eachen') {
         throw new Error('improper configuration')
       }
-      accessory.getService(Service.GarageDoorOpener)
-        .updateCharacteristic(Characteristic.CurrentDoorState, params.switch === 'on' ? 0 : 1)
-        .updateCharacteristic(Characteristic.TargetDoorState, params.switch === 'on' ? 0 : 1)
+      const gdService = accessory.getService(Service.GarageDoorOpener)
+      gdService.updateCharacteristic(Characteristic.TargetDoorState, params.switch === 'on' ? 0 : 1)
+      await utils.sleep(1000)
+      gdService.updateCharacteristic(Characteristic.CurrentDoorState, params.switch === 'on' ? 0 : 1)
     } catch (err) {
       this.platform.deviceUpdateError(accessory, err, false)
     }

From c25269676751e26dd146d613b791992675e4d137 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 3 Oct 2020 21:58:32 +0100
Subject: [PATCH 0315/3183] 3.3.1-0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 249642de..e421ac5d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.3.0",
+  "version": "3.3.1-0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 733f7ef9..1d63b615 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.3.0",
+  "version": "3.3.1-0",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From a28c15d69dfa491bbf613aae98ffff6b3423fda2 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 3 Oct 2020 22:30:10 +0100
Subject: [PATCH 0316/3183] async externalUpdate

---
 lib/device/blind.js      |  2 +-
 lib/device/curtain.js    |  2 +-
 lib/device/fan.js        |  2 +-
 lib/device/garage.js     | 21 ++++++++++-----------
 lib/device/light.js      |  2 +-
 lib/device/lock.js       | 15 +++++++--------
 lib/device/outlet.js     |  2 +-
 lib/device/rf-bridge.js  |  2 +-
 lib/device/scm.js        |  2 +-
 lib/device/sensor.js     | 14 +++++++-------
 lib/device/switch.js     |  2 +-
 lib/device/thermostat.js |  2 +-
 lib/device/usb.js        |  2 +-
 lib/device/valve.js      |  2 +-
 lib/device/zb-dev.js     |  2 +-
 15 files changed, 36 insertions(+), 38 deletions(-)

diff --git a/lib/device/blind.js b/lib/device/blind.js
index 242eeaaf..3259d21a 100644
--- a/lib/device/blind.js
+++ b/lib/device/blind.js
@@ -80,7 +80,7 @@ module.exports = class deviceBlind {
     }
   }
 
-  externalUpdate (accessory, params) {
+  async externalUpdate (accessory, params) {
     return true
   }
 }
diff --git a/lib/device/curtain.js b/lib/device/curtain.js
index d96de66a..2f5f7c6c 100644
--- a/lib/device/curtain.js
+++ b/lib/device/curtain.js
@@ -46,7 +46,7 @@ module.exports = class deviceCurtain {
     }
   }
 
-  externalUpdate (accessory, params) {
+  async externalUpdate (accessory, params) {
     try {
       const cService = accessory.getService(Service.WindowCovering)
       if (!Object.prototype.hasOwnProperty.call(params, 'switch') && !Object.prototype.hasOwnProperty.call(params, 'setclose')) {
diff --git a/lib/device/fan.js b/lib/device/fan.js
index 2eac5d9b..045e0b64 100644
--- a/lib/device/fan.js
+++ b/lib/device/fan.js
@@ -63,7 +63,7 @@ module.exports = class deviceFan {
     }
   }
 
-  externalUpdate (accessory, params) {
+  async externalUpdate (accessory, params) {
     try {
       let light
       let status
diff --git a/lib/device/garage.js b/lib/device/garage.js
index 599316e7..5341153c 100644
--- a/lib/device/garage.js
+++ b/lib/device/garage.js
@@ -73,7 +73,7 @@ module.exports = class deviceGarage {
           break
       }
       await this.platform.sendDeviceUpdate(accessory, params)
-      await utils.sleep(garageConfig.operationTime * 100)
+      await utils.sleep(Math.max(garageConfig.operationTime * 100, 1000))
       if (!sAccessory) {
         gdService.updateCharacteristic(Characteristic.CurrentDoorState, newPos)
         accessory.context.cacheCurrentDoorState = newPos
@@ -84,7 +84,7 @@ module.exports = class deviceGarage {
     }
   }
 
-  externalUpdate (accessory, params) {
+  async externalUpdate (accessory, params) {
     try {
       if (!Object.prototype.hasOwnProperty.call(params, 'switch') && !Object.prototype.hasOwnProperty.call(params, 'switches')) {
         return
@@ -118,20 +118,19 @@ module.exports = class deviceGarage {
           break
       }
       accessory.context.inUse = true
-      if (!garageConfig.sensorId) {
+      if (garageConfig.sensorId) {
+        await utils.sleep(Math.max(garageConfig.operationTime * 100, 1000))
+      } else {
         gcService
-          .updateCharacteristic(Characteristic.CurrentDoorState, newPos)
           .updateCharacteristic(Characteristic.TargetDoorState, newPos - 2)
+          .updateCharacteristic(Characteristic.CurrentDoorState, newPos)
         accessory.context.cacheCurrentDoorState = newPos
         accessory.context.cacheTargetDoorState = newPos - 2
-        setTimeout(() => {
-          gcService.updateCharacteristic(Characteristic.CurrentDoorState, newPos - 2)
-          accessory.context.cacheCurrentDoorState = newPos - 2
-        }, parseInt(garageConfig.operationTime) * 100)
+        await utils.sleep(Math.max(garageConfig.operationTime * 100, 1000))
+        gcService.updateCharacteristic(Characteristic.CurrentDoorState, newPos - 2)
+        accessory.context.cacheCurrentDoorState = newPos - 2
       }
-      setTimeout(() => {
-        accessory.context.inUse = false
-      }, parseInt(garageConfig.operationTime) * 100)
+      accessory.context.inUse = false
     } catch (err) {
       accessory.context.inUse = false
       this.platform.deviceUpdateError(accessory, err, false)
diff --git a/lib/device/light.js b/lib/device/light.js
index 7d67c7d0..066b0daf 100644
--- a/lib/device/light.js
+++ b/lib/device/light.js
@@ -206,7 +206,7 @@ module.exports = class deviceLight {
     }
   }
 
-  externalUpdate (accessory, params) {
+  async externalUpdate (accessory, params) {
     try {
       if (
         cns.devicesSingleSwitch.includes(accessory.context.eweUIID) &&
diff --git a/lib/device/lock.js b/lib/device/lock.js
index b335b281..6996f00b 100644
--- a/lib/device/lock.js
+++ b/lib/device/lock.js
@@ -31,7 +31,7 @@ module.exports = class deviceLock {
       lmService
         .updateCharacteristic(Characteristic.LockTargetState, 0)
         .updateCharacteristic(Characteristic.LockCurrentState, 0)
-      await utils.sleep(lockConfig.operationTime * 100)
+      await utils.sleep(Math.max(lockConfig.operationTime * 100, 1000))
       lmService
         .updateCharacteristic(Characteristic.LockTargetState, 1)
         .updateCharacteristic(Characteristic.LockCurrentState, 1)
@@ -41,7 +41,7 @@ module.exports = class deviceLock {
     }
   }
 
-  externalUpdate (accessory, params) {
+  async externalUpdate (accessory, params) {
     try {
       if (!Object.prototype.hasOwnProperty.call(params, 'switch')) return
       let lockConfig
@@ -59,12 +59,11 @@ module.exports = class deviceLock {
       lmService
         .updateCharacteristic(Characteristic.LockCurrentState, 0)
         .updateCharacteristic(Characteristic.LockTargetState, 0)
-      setTimeout(() => {
-        lmService
-          .updateCharacteristic(Characteristic.LockCurrentState, 1)
-          .updateCharacteristic(Characteristic.LockTargetState, 1)
-        accessory.context.inUse = false
-      }, parseInt(lockConfig.operationTime) * 100)
+      await utils.sleep(Math.max(lockConfig.operationTime * 100, 1000))
+      lmService
+        .updateCharacteristic(Characteristic.LockCurrentState, 1)
+        .updateCharacteristic(Characteristic.LockTargetState, 1)
+      accessory.context.inUse = false
     } catch (err) {
       accessory.context.inUse = false
       this.platform.deviceUpdateError(accessory, err, false)
diff --git a/lib/device/outlet.js b/lib/device/outlet.js
index bb86951d..fe05aebe 100644
--- a/lib/device/outlet.js
+++ b/lib/device/outlet.js
@@ -122,7 +122,7 @@ module.exports = class deviceOutlet {
     }
   }
 
-  externalUpdate (accessory, params) {
+  async externalUpdate (accessory, params) {
     try {
       const outletService = accessory.getService(Service.Outlet)
       if (Object.prototype.hasOwnProperty.call(params, 'switch')) {
diff --git a/lib/device/rf-bridge.js b/lib/device/rf-bridge.js
index b2124215..0f60a023 100644
--- a/lib/device/rf-bridge.js
+++ b/lib/device/rf-bridge.js
@@ -59,7 +59,7 @@ module.exports = class deviceRFBridge {
     }
   }
 
-  externalUpdate (accessory, params) {
+  async externalUpdate (accessory, params) {
     try {
       if (!Object.prototype.hasOwnProperty.call(params, 'updateSource')) return
       const timeNow = new Date()
diff --git a/lib/device/scm.js b/lib/device/scm.js
index 577c2e69..8c62b37f 100644
--- a/lib/device/scm.js
+++ b/lib/device/scm.js
@@ -27,7 +27,7 @@ module.exports = class deviceSCM {
     }
   }
 
-  externalUpdate (accessory, params) {
+  async externalUpdate (accessory, params) {
     try {
       if (!Object.prototype.hasOwnProperty.call(params, 'switches')) return
       accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, params.switches[0].switch === 'on')
diff --git a/lib/device/sensor.js b/lib/device/sensor.js
index 5c3741b4..83d4cd5e 100644
--- a/lib/device/sensor.js
+++ b/lib/device/sensor.js
@@ -1,5 +1,6 @@
 'use strict'
 let Characteristic, Service
+const utils = require('./../utils')
 module.exports = class deviceSensor {
   constructor (platform, accessory) {
     this.platform = platform
@@ -9,7 +10,7 @@ module.exports = class deviceSensor {
     accessory.getService(Service.BatteryService) || accessory.addService(Service.BatteryService)
   }
 
-  externalUpdate (accessory, params) {
+  async externalUpdate (accessory, params) {
     try {
       if (Object.prototype.hasOwnProperty.call(params, 'battery')) {
         const batteryService =
@@ -37,12 +38,11 @@ module.exports = class deviceSensor {
                   .updateCharacteristic(Characteristic.CurrentDoorState, 1)
                 break
               case 1:
-                setTimeout(() => {
-                  oAccessory
-                    .getService(Service.GarageDoorOpener)
-                    .updateCharacteristic(Characteristic.TargetDoorState, 0)
-                    .updateCharacteristic(Characteristic.CurrentDoorState, 0)
-                }, group.operationTime * 100)
+                await utils.sleep(Math.max(group.operationTime * 100, 1000))
+                oAccessory
+                  .getService(Service.GarageDoorOpener)
+                  .updateCharacteristic(Characteristic.TargetDoorState, 0)
+                  .updateCharacteristic(Characteristic.CurrentDoorState, 0)
                 break
             }
           }
diff --git a/lib/device/switch.js b/lib/device/switch.js
index 19c7a331..97ee0293 100644
--- a/lib/device/switch.js
+++ b/lib/device/switch.js
@@ -86,7 +86,7 @@ module.exports = class deviceSwitch {
     }
   }
 
-  externalUpdate (accessory, params) {
+  async externalUpdate (accessory, params) {
     try {
       if (cns.devicesSingleSwitch.includes(accessory.context.eweUIID)) {
         if (!Object.prototype.hasOwnProperty.call(params, 'switch')) return
diff --git a/lib/device/thermostat.js b/lib/device/thermostat.js
index ed36e577..5fd997ac 100644
--- a/lib/device/thermostat.js
+++ b/lib/device/thermostat.js
@@ -54,7 +54,7 @@ module.exports = class deviceThermostat {
     }
   }
 
-  externalUpdate (accessory, params) {
+  async externalUpdate (accessory, params) {
     try {
       if (
         !this.platform.config.hideTHSwitch &&
diff --git a/lib/device/usb.js b/lib/device/usb.js
index 13a2c87b..6c230010 100644
--- a/lib/device/usb.js
+++ b/lib/device/usb.js
@@ -27,7 +27,7 @@ module.exports = class deviceUSB {
     }
   }
 
-  externalUpdate (accessory, params) {
+  async externalUpdate (accessory, params) {
     try {
       if (!Object.prototype.hasOwnProperty.call(params, 'switches')) return
       accessory.getService(Service.Outlet).updateCharacteristic(Characteristic.On, params.switches[0].switch === 'on')
diff --git a/lib/device/valve.js b/lib/device/valve.js
index 9aab7584..67bf6d30 100644
--- a/lib/device/valve.js
+++ b/lib/device/valve.js
@@ -85,7 +85,7 @@ module.exports = class deviceValve {
     }
   }
 
-  externalUpdate (accessory, params) {
+  async externalUpdate (accessory, params) {
     try {
       if (!Object.prototype.hasOwnProperty.call(params, 'switches')) return
       let valveConfig
diff --git a/lib/device/zb-dev.js b/lib/device/zb-dev.js
index 21c309a2..478544b1 100644
--- a/lib/device/zb-dev.js
+++ b/lib/device/zb-dev.js
@@ -51,7 +51,7 @@ module.exports = class deviceZBDev {
     }
   }
 
-  externalUpdate (accessory, params) {
+  async externalUpdate (accessory, params) {
     try {
       //* ** credit @tasict ***\\
       if (Object.prototype.hasOwnProperty.call(params, 'battery')) {

From f2355e3bfa438c3991d5046789afeae2c4c964e4 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 4 Oct 2020 11:05:47 +0100
Subject: [PATCH 0317/3183] double notifications fix

---
 lib/device/garage-eachen.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/device/garage-eachen.js b/lib/device/garage-eachen.js
index 85953acb..4a4af8be 100644
--- a/lib/device/garage-eachen.js
+++ b/lib/device/garage-eachen.js
@@ -62,11 +62,14 @@ module.exports = class deviceGarageEachen {
       if (garageConfig.type !== 'garage_eachen') {
         throw new Error('improper configuration')
       }
+      accessory.context.inUse = true
       const gdService = accessory.getService(Service.GarageDoorOpener)
       gdService.updateCharacteristic(Characteristic.TargetDoorState, params.switch === 'on' ? 0 : 1)
-      await utils.sleep(1000)
+      await utils.sleep(1500)
       gdService.updateCharacteristic(Characteristic.CurrentDoorState, params.switch === 'on' ? 0 : 1)
+      accessory.context.inUse = false
     } catch (err) {
+      accessory.context.inUse = false
       this.platform.deviceUpdateError(accessory, err, false)
     }
   }

From 5275e07be5df1a7a1aa9f9570fdc58b470aa4275 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 4 Oct 2020 11:06:34 +0100
Subject: [PATCH 0318/3183] 3.3.1-1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index e421ac5d..65ca6ac4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.3.1-0",
+  "version": "3.3.1-1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 1d63b615..cc2fd61d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.3.1-0",
+  "version": "3.3.1-1",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 9fa831eaf8df07ab83df21d101c4f72fc525dbde Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 4 Oct 2020 11:14:26 +0100
Subject: [PATCH 0319/3183] Update garage-eachen.js

---
 lib/device/garage-eachen.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/device/garage-eachen.js b/lib/device/garage-eachen.js
index 4a4af8be..584319c2 100644
--- a/lib/device/garage-eachen.js
+++ b/lib/device/garage-eachen.js
@@ -65,7 +65,7 @@ module.exports = class deviceGarageEachen {
       accessory.context.inUse = true
       const gdService = accessory.getService(Service.GarageDoorOpener)
       gdService.updateCharacteristic(Characteristic.TargetDoorState, params.switch === 'on' ? 0 : 1)
-      await utils.sleep(1500)
+      await utils.sleep(Math.max(garageConfig.operationTime * 100, 1000))
       gdService.updateCharacteristic(Characteristic.CurrentDoorState, params.switch === 'on' ? 0 : 1)
       accessory.context.inUse = false
     } catch (err) {

From 32ded0523a2181749047528031c1106adc2259b8 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 4 Oct 2020 11:15:28 +0100
Subject: [PATCH 0320/3183] 3.3.1-2

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 65ca6ac4..9593ffe4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.3.1-1",
+  "version": "3.3.1-2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index cc2fd61d..0bf467e4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.3.1-1",
+  "version": "3.3.1-2",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From a819f2c51d28eb3b036ec60b573f475c1d11b40a Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 4 Oct 2020 11:23:01 +0100
Subject: [PATCH 0321/3183] Update sensor.js

---
 lib/device/sensor.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/device/sensor.js b/lib/device/sensor.js
index 83d4cd5e..dac9afc2 100644
--- a/lib/device/sensor.js
+++ b/lib/device/sensor.js
@@ -27,7 +27,7 @@ module.exports = class deviceSensor {
       let oAccessory = false
       const contactService = accessory.getService(Service.ContactSensor)
       contactService.updateCharacteristic(Characteristic.ContactSensorState, newState)
-      this.platform.cusG.forEach(group => {
+      this.platform.cusG.forEach(async group => {
         if (group.sensorId === accessory.context.eweDeviceId && group.type === 'garage') {
           if ((oAccessory = this.platform.devicesInHB.get(group.deviceId + 'SWX'))) {
             switch (newState) {

From a2bb9ccf0cb2e663cf989b753f8a6fb55a399d16 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 4 Oct 2020 11:23:31 +0100
Subject: [PATCH 0322/3183] 3.3.1-3

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 9593ffe4..38a4ffea 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.3.1-2",
+  "version": "3.3.1-3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 0bf467e4..7334fd6b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.3.1-2",
+  "version": "3.3.1-3",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 737f54d5591b29ea36959e0442bb23d178f7e3bc Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 4 Oct 2020 13:36:35 +0100
Subject: [PATCH 0323/3183] settimeout to await

---
 lib/device/rf-bridge.js |  7 +++----
 lib/eWeLinkWS.js        | 10 ++++++----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/lib/device/rf-bridge.js b/lib/device/rf-bridge.js
index 0f60a023..a791b1ef 100644
--- a/lib/device/rf-bridge.js
+++ b/lib/device/rf-bridge.js
@@ -90,7 +90,7 @@ module.exports = class deviceRFBridge {
         //* ** RF Sensor ***\\
         Object.keys(params)
           .filter(name => /rfTrig/.test(name))
-          .forEach(chan => {
+          .forEach(async chan => {
             this.platform.devicesInHB.forEach(acc => {
               if (
                 acc.context.eweDeviceId === accessory.context.eweDeviceId &&
@@ -140,9 +140,8 @@ module.exports = class deviceRFBridge {
                     break
                 }
                 oAccessory.getService(serv).updateCharacteristic(char, 1)
-                setTimeout(() => {
-                  oAccessory.getService(serv).updateCharacteristic(char, 0)
-                }, (this.platform.config.sensorTimeLength || 2) * 1000)
+                await utils.sleep((this.platform.config.sensorTimeLength || 2) * 1000)
+                oAccessory.getService(serv).updateCharacteristic(char, 0)
               }
             }
           })
diff --git a/lib/eWeLinkWS.js b/lib/eWeLinkWS.js
index 5d585aa8..91633aef 100644
--- a/lib/eWeLinkWS.js
+++ b/lib/eWeLinkWS.js
@@ -155,13 +155,14 @@ module.exports = class eWeLinkWS {
         }
       }
     })
-    this.wsp.onClose.addListener(e => {
+    this.wsp.onClose.addListener(async e => {
       this.wsIsOpen = false
       if (e !== 1005) {
         this.log.warn('Web socket closed [%s].', e)
         if (e !== 1000) {
           this.log('Web socket will try to reconnect in five seconds.')
-          setTimeout(() => this.login(), 5000)
+          await utils.sleep(5000)
+          this.login()
         } else {
           this.log('Please try restarting Homebridge so that this plugin can work again.')
         }
@@ -172,12 +173,13 @@ module.exports = class eWeLinkWS {
       }
       this.wsp.removeAllListeners()
     })
-    this.wsp.onError.addListener(e => {
+    this.wsp.onError.addListener(async e => {
       this.log.warn('Web socket error - [%s].', e)
       if (e.code === 'ECONNREFUSED') {
         this.log.warn('Web socket will try to reconnect in five seconds then try the command again.')
         this.wsp.removeAllListeners()
-        setTimeout(() => this.login(), 5000)
+        await utils.sleep(5000)
+        this.login()
       } else {
         this.log.warn('If this was unexpected then please try restarting Homebridge.')
       }

From b2932c17cc2e1d69afa0a79dced046b7a1e95281 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 4 Oct 2020 13:54:21 +0100
Subject: [PATCH 0324/3183] Create i

---
 docs/i | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 docs/i

diff --git a/docs/i b/docs/i
new file mode 100644
index 00000000..e69de29b

From bac625c0c50dfddaefe47a5b3cbc223d64856526 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 4 Oct 2020 13:54:53 +0100
Subject: [PATCH 0325/3183] Delete i

---
 docs/i | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 docs/i

diff --git a/docs/i b/docs/i
deleted file mode 100644
index e69de29b..00000000

From 38eb388ad8024db3151415f92116762b9fa2f36a Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Sun, 4 Oct 2020 13:56:27 +0100
Subject: [PATCH 0326/3183] Create .gitkeep

---
 docs/.gitkeep | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 docs/.gitkeep

diff --git a/docs/.gitkeep b/docs/.gitkeep
new file mode 100644
index 00000000..8b137891
--- /dev/null
+++ b/docs/.gitkeep
@@ -0,0 +1 @@
+

From 373e69d27da7ddda4bc3c1212e8a79a954112785 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Sun, 4 Oct 2020 13:56:46 +0100
Subject: [PATCH 0327/3183] Set theme jekyll-theme-cayman

---
 docs/_config.yml | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 docs/_config.yml

diff --git a/docs/_config.yml b/docs/_config.yml
new file mode 100644
index 00000000..c4192631
--- /dev/null
+++ b/docs/_config.yml
@@ -0,0 +1 @@
+theme: jekyll-theme-cayman
\ No newline at end of file

From f6dccd6129c5e3faeff8f2d430f9ea2db195b1c2 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 4 Oct 2020 14:04:30 +0100
Subject: [PATCH 0328/3183] Create index.md

---
 docs/index.md | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 docs/index.md

diff --git a/docs/index.md b/docs/index.md
new file mode 100644
index 00000000..4f0e0eb3
--- /dev/null
+++ b/docs/index.md
@@ -0,0 +1,40 @@
+<p align="center">
+   <a href="https://github.com/homebridge/verified/blob/master/verified-plugins.json"><img alt="Homebridge Verified" src="https://user-images.githubusercontent.com/43026681/90361629-9af86200-e056-11ea-8553-4e4e5c4b5a54.png" width="500px"></a>
+</p>
+<span align="center">
+  
+# homebridge-ewelink 
+
+ Homebridge plugin to control eWeLink devices with original firmware.
+ 
+ [![verified-by-homebridge](https://badgen.net/badge/homebridge/verified/purple)](https://github.com/homebridge/homebridge/wiki/Verified-Plugins)   
+ [![npm](https://img.shields.io/npm/v/homebridge-ewelink/latest?label=release)](https://www.npmjs.com/package/homebridge-ewelink)
+ [![npm](https://img.shields.io/npm/v/homebridge-ewelink/beta?label=beta)](https://www.npmjs.com/package/homebridge-ewelink)   
+ [![npm](https://img.shields.io/npm/dt/homebridge-ewelink)](https://www.npmjs.com/package/homebridge-ewelink)
+ [![JavaScript Style Guide](https://img.shields.io/badge/code_style-standard-brightgreen.svg)](https://standardjs.com)   
+ [![Discord](https://img.shields.io/discord/432663330281226270?color=728ED5&logo=discord&label=discord)](https://discord.com/channels/432663330281226270/742733745743855627)
+ [![Contribute](https://img.shields.io/badge/contribute-a%20drink-yellow)](https://ko-fi.com/bwp91)
+
+</span>
+
+### Setup
+* [Installation (Homebridge)](https://github.com/bwp91/homebridge-ewelink/wiki/Installation-(Homebridge))
+* [Installation (HOOBS)](https://github.com/bwp91/homebridge-ewelink/wiki/Installation-(HOOBS))
+* [Configuration](https://github.com/bwp91/homebridge-ewelink/wiki/Configuration)
+* [Beta Version](https://github.com/bwp91/homebridge-ewelink/wiki/Beta-Version)
+### Features
+* [Supported Devices](https://github.com/bwp91/homebridge-ewelink/wiki/Supported-Devices)
+* [Accessory Simulations](https://github.com/bwp91/homebridge-ewelink/wiki/Accessory-Simulations)
+* [Connection Methods](https://github.com/bwp91/homebridge-ewelink/wiki/Connection-Methods)
+### How-to Guides
+* [How to set up RF Bridge sensors](https://github.com/bwp91/homebridge-ewelink/wiki/How-to-set-up-RF-Bridge-sensors)
+* [How to set up Sonoff Camera (GK-200MP2-B)](https://github.com/bwp91/homebridge-ewelink/wiki/How-to-set-up-Sonoff-Camera)
+* [How to copy Homebridge logs](https://github.com/bwp91/homebridge-ewelink/wiki/How-to-copy-Homebridge-logs)
+* [How to enable/disable plugin extended logging](https://github.com/bwp91/homebridge-ewelink/wiki/How-to-enable-disable-plugin-extended-logging)
+* [How to remove an accessory from the cache](https://github.com/bwp91/homebridge-ewelink/wiki/How-to-remove-an-accessory-from-the-cache)
+### About
+* [Support Request](https://github.com/bwp91/homebridge-ewelink/issues/new/choose)
+* [Roadmap](https://github.com/bwp91/homebridge-ewelink/wiki/Roadmap)
+* [Credits](https://github.com/bwp91/homebridge-ewelink/wiki/Credits)
+### Disclaimer
+I am in no way affiliated with eWeLink nor any of the device brands (like Sonoff) and this plugin is a personal project that I maintain in my free time.

From ee583f3d5a425579279163610f4fd8ae7a13c70a Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 4 Oct 2020 14:08:16 +0100
Subject: [PATCH 0329/3183] Create index.html

---
 docs/index.html | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 docs/index.html

diff --git a/docs/index.html b/docs/index.html
new file mode 100644
index 00000000..61e831cf
--- /dev/null
+++ b/docs/index.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+  <meta name="viewport" content="width=device-width,initial-scale=1">
+  <meta charset="UTF-8">
+  <link rel="stylesheet" href="//cdn.jsdelivr.net/npm/docsify/themes/vue.css">
+</head>
+<body>
+  <div id="app"></div>
+  <script>
+    window.$docsify = {
+      coverpage: true,
+      homepage: 'index.md',
+      loadSidebar: true,
+      name: 'homebridge-ewelink',
+      repo: 'https://github.com/bwp91/homebridge-ewelink'
+    }
+  </script>
+  <script src="//cdn.jsdelivr.net/npm/docsify/lib/docsify.min.js"></script>
+</body>
+</html>
\ No newline at end of file

From b0a0cdf4084ae9b6999eefe460864eacf87a9957 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 4 Oct 2020 14:10:03 +0100
Subject: [PATCH 0330/3183] Delete .gitkeep

---
 docs/.gitkeep | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 docs/.gitkeep

diff --git a/docs/.gitkeep b/docs/.gitkeep
deleted file mode 100644
index 8b137891..00000000
--- a/docs/.gitkeep
+++ /dev/null
@@ -1 +0,0 @@
-

From c3c5dadc6297747a761b5e13ccd0483565689c7b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 4 Oct 2020 14:10:05 +0100
Subject: [PATCH 0331/3183] Delete _config.yml

---
 docs/_config.yml | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 docs/_config.yml

diff --git a/docs/_config.yml b/docs/_config.yml
deleted file mode 100644
index c4192631..00000000
--- a/docs/_config.yml
+++ /dev/null
@@ -1 +0,0 @@
-theme: jekyll-theme-cayman
\ No newline at end of file

From d729ca3cac8dc2bdf64131af2536fb65002a784c Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Sun, 4 Oct 2020 14:12:40 +0100
Subject: [PATCH 0332/3183] Create .nojekyll

---
 docs/.nojekyll | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 docs/.nojekyll

diff --git a/docs/.nojekyll b/docs/.nojekyll
new file mode 100644
index 00000000..8b137891
--- /dev/null
+++ b/docs/.nojekyll
@@ -0,0 +1 @@
+

From 7d1ae2beb17bf4d06b4212167cef5cfa1cc19cc7 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 4 Oct 2020 14:14:48 +0100
Subject: [PATCH 0333/3183] Update index.html

---
 docs/index.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docs/index.html b/docs/index.html
index 61e831cf..09e9f917 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -10,7 +10,6 @@
   <div id="app"></div>
   <script>
     window.$docsify = {
-      coverpage: true,
       homepage: 'index.md',
       loadSidebar: true,
       name: 'homebridge-ewelink',

From 1dcd26c30820d40fbe42485197bdd3d83731f137 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 4 Oct 2020 14:18:07 +0100
Subject: [PATCH 0334/3183] Create _sidebar.md

---
 docs/_sidebar.md | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 docs/_sidebar.md

diff --git a/docs/_sidebar.md b/docs/_sidebar.md
new file mode 100644
index 00000000..29813366
--- /dev/null
+++ b/docs/_sidebar.md
@@ -0,0 +1,15 @@
+**Setup**
+* [[Installation (Homebridge)]]
+* [[Installation (HOOBS)]]
+* [[Configuration]]
+* [[Beta Version]]
+
+**Features**
+* [[Supported Devices]]
+* [[Accessory Simulations]]
+* [[Connection Methods]]
+
+**About**
+* [Support Request](https://github.com/bwp91/homebridge-ewelink/issues/new/choose)
+* [[Roadmap]]
+* [[Credits]]
\ No newline at end of file

From 49a2c4ff962e5d9113f751e36904e8660133387c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 4 Oct 2020 14:21:56 +0100
Subject: [PATCH 0335/3183] delete docs

---
 docs/.nojekyll   |  1 -
 docs/_sidebar.md | 15 ---------------
 docs/index.html  | 21 ---------------------
 docs/index.md    | 40 ----------------------------------------
 4 files changed, 77 deletions(-)
 delete mode 100644 docs/.nojekyll
 delete mode 100644 docs/_sidebar.md
 delete mode 100644 docs/index.html
 delete mode 100644 docs/index.md

diff --git a/docs/.nojekyll b/docs/.nojekyll
deleted file mode 100644
index 8b137891..00000000
--- a/docs/.nojekyll
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/docs/_sidebar.md b/docs/_sidebar.md
deleted file mode 100644
index 29813366..00000000
--- a/docs/_sidebar.md
+++ /dev/null
@@ -1,15 +0,0 @@
-**Setup**
-* [[Installation (Homebridge)]]
-* [[Installation (HOOBS)]]
-* [[Configuration]]
-* [[Beta Version]]
-
-**Features**
-* [[Supported Devices]]
-* [[Accessory Simulations]]
-* [[Connection Methods]]
-
-**About**
-* [Support Request](https://github.com/bwp91/homebridge-ewelink/issues/new/choose)
-* [[Roadmap]]
-* [[Credits]]
\ No newline at end of file
diff --git a/docs/index.html b/docs/index.html
deleted file mode 100644
index 09e9f917..00000000
--- a/docs/index.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-  <meta name="viewport" content="width=device-width,initial-scale=1">
-  <meta charset="UTF-8">
-  <link rel="stylesheet" href="//cdn.jsdelivr.net/npm/docsify/themes/vue.css">
-</head>
-<body>
-  <div id="app"></div>
-  <script>
-    window.$docsify = {
-      homepage: 'index.md',
-      loadSidebar: true,
-      name: 'homebridge-ewelink',
-      repo: 'https://github.com/bwp91/homebridge-ewelink'
-    }
-  </script>
-  <script src="//cdn.jsdelivr.net/npm/docsify/lib/docsify.min.js"></script>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/index.md b/docs/index.md
deleted file mode 100644
index 4f0e0eb3..00000000
--- a/docs/index.md
+++ /dev/null
@@ -1,40 +0,0 @@
-<p align="center">
-   <a href="https://github.com/homebridge/verified/blob/master/verified-plugins.json"><img alt="Homebridge Verified" src="https://user-images.githubusercontent.com/43026681/90361629-9af86200-e056-11ea-8553-4e4e5c4b5a54.png" width="500px"></a>
-</p>
-<span align="center">
-  
-# homebridge-ewelink 
-
- Homebridge plugin to control eWeLink devices with original firmware.
- 
- [![verified-by-homebridge](https://badgen.net/badge/homebridge/verified/purple)](https://github.com/homebridge/homebridge/wiki/Verified-Plugins)   
- [![npm](https://img.shields.io/npm/v/homebridge-ewelink/latest?label=release)](https://www.npmjs.com/package/homebridge-ewelink)
- [![npm](https://img.shields.io/npm/v/homebridge-ewelink/beta?label=beta)](https://www.npmjs.com/package/homebridge-ewelink)   
- [![npm](https://img.shields.io/npm/dt/homebridge-ewelink)](https://www.npmjs.com/package/homebridge-ewelink)
- [![JavaScript Style Guide](https://img.shields.io/badge/code_style-standard-brightgreen.svg)](https://standardjs.com)   
- [![Discord](https://img.shields.io/discord/432663330281226270?color=728ED5&logo=discord&label=discord)](https://discord.com/channels/432663330281226270/742733745743855627)
- [![Contribute](https://img.shields.io/badge/contribute-a%20drink-yellow)](https://ko-fi.com/bwp91)
-
-</span>
-
-### Setup
-* [Installation (Homebridge)](https://github.com/bwp91/homebridge-ewelink/wiki/Installation-(Homebridge))
-* [Installation (HOOBS)](https://github.com/bwp91/homebridge-ewelink/wiki/Installation-(HOOBS))
-* [Configuration](https://github.com/bwp91/homebridge-ewelink/wiki/Configuration)
-* [Beta Version](https://github.com/bwp91/homebridge-ewelink/wiki/Beta-Version)
-### Features
-* [Supported Devices](https://github.com/bwp91/homebridge-ewelink/wiki/Supported-Devices)
-* [Accessory Simulations](https://github.com/bwp91/homebridge-ewelink/wiki/Accessory-Simulations)
-* [Connection Methods](https://github.com/bwp91/homebridge-ewelink/wiki/Connection-Methods)
-### How-to Guides
-* [How to set up RF Bridge sensors](https://github.com/bwp91/homebridge-ewelink/wiki/How-to-set-up-RF-Bridge-sensors)
-* [How to set up Sonoff Camera (GK-200MP2-B)](https://github.com/bwp91/homebridge-ewelink/wiki/How-to-set-up-Sonoff-Camera)
-* [How to copy Homebridge logs](https://github.com/bwp91/homebridge-ewelink/wiki/How-to-copy-Homebridge-logs)
-* [How to enable/disable plugin extended logging](https://github.com/bwp91/homebridge-ewelink/wiki/How-to-enable-disable-plugin-extended-logging)
-* [How to remove an accessory from the cache](https://github.com/bwp91/homebridge-ewelink/wiki/How-to-remove-an-accessory-from-the-cache)
-### About
-* [Support Request](https://github.com/bwp91/homebridge-ewelink/issues/new/choose)
-* [Roadmap](https://github.com/bwp91/homebridge-ewelink/wiki/Roadmap)
-* [Credits](https://github.com/bwp91/homebridge-ewelink/wiki/Credits)
-### Disclaimer
-I am in no way affiliated with eWeLink nor any of the device brands (like Sonoff) and this plugin is a personal project that I maintain in my free time.

From 58cfe356aed5f9ed4ef857d7cc5c6ac5040410ce Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Sun, 4 Oct 2020 16:12:48 +0100
Subject: [PATCH 0336/3183] Update FUNDING.yml

---
 .github/FUNDING.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
index 0729bbfe..aa62079e 100644
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1,4 +1,4 @@
 github: bwp91
 patreon: bwp91
 ko_fi: bwp91
-custom: ["https://www.paypal.me/BenPotter", "https://www.gofundme.com/f/bwp91"]
+custom: ["https://www.paypal.me/BenPotter"]

From 71946d37655423719f85cbbf26e4f2c633356923 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Sun, 4 Oct 2020 16:14:28 +0100
Subject: [PATCH 0337/3183] Update README.md

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 4f0e0eb3..dcbde453 100644
--- a/README.md
+++ b/README.md
@@ -33,6 +33,7 @@
 * [How to enable/disable plugin extended logging](https://github.com/bwp91/homebridge-ewelink/wiki/How-to-enable-disable-plugin-extended-logging)
 * [How to remove an accessory from the cache](https://github.com/bwp91/homebridge-ewelink/wiki/How-to-remove-an-accessory-from-the-cache)
 ### About
+* [About Me](https://github.com/sponsors/bwp91)
 * [Support Request](https://github.com/bwp91/homebridge-ewelink/issues/new/choose)
 * [Roadmap](https://github.com/bwp91/homebridge-ewelink/wiki/Roadmap)
 * [Credits](https://github.com/bwp91/homebridge-ewelink/wiki/Credits)

From e761dbc64442bfa884f0c52c696e55ddf071b795 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Sun, 4 Oct 2020 16:35:01 +0100
Subject: [PATCH 0338/3183] Update package.json

---
 package.json | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/package.json b/package.json
index 7334fd6b..bf30e1ac 100644
--- a/package.json
+++ b/package.json
@@ -47,6 +47,10 @@
     "url": "https://github.com/bwp91/homebridge-ewelink/issues"
   },
   "funding": [
+    {
+      "type": "github",
+      "url": "https://github.com/sponsors/bwp91"
+    },
     {
       "type": "kofi",
       "url": "https://ko-fi.com/bwp91"
@@ -58,14 +62,6 @@
     {
       "type": "paypal",
       "url": "https://www.paypal.me/BenPotter"
-    },
-    {
-      "type": "github",
-      "url": "https://github.com/sponsors/bwp91"
-    },
-    {
-      "type": "gofundme",
-      "url": "https://www.gofundme.com/f/bwp91"
     }
   ],
   "dependencies": {

From 8299bdcfd7a3bab41b98f7004b4311fb145ca6e8 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Sun, 4 Oct 2020 16:43:04 +0100
Subject: [PATCH 0339/3183] Update README.md

---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index dcbde453..af89e280 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,6 @@
  [![npm](https://img.shields.io/npm/dt/homebridge-ewelink)](https://www.npmjs.com/package/homebridge-ewelink)
  [![JavaScript Style Guide](https://img.shields.io/badge/code_style-standard-brightgreen.svg)](https://standardjs.com)   
  [![Discord](https://img.shields.io/discord/432663330281226270?color=728ED5&logo=discord&label=discord)](https://discord.com/channels/432663330281226270/742733745743855627)
- [![Contribute](https://img.shields.io/badge/contribute-a%20drink-yellow)](https://ko-fi.com/bwp91)
 
 </span>
 

From 98e8f7f8dcc0641340ceaafb4498b286676ae56d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 4 Oct 2020 17:22:39 +0100
Subject: [PATCH 0340/3183] Update config.schema.json

---
 config.schema.json | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 7e27b86d..8d850422 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -111,7 +111,7 @@
       "groups": {
         "type": "array",
         "title": "Accessory Simulations",
-        "description": "You can use this setting to set up custom simulated HomeKit accessories from a generic single/multi-switch device.",
+        "description": "You can use this setting to set up custom simulated HomeKit accessories from a generic single/multi-switch device. For more information please see the wiki.",
         "items": {
           "type": "object",
           "properties": {
@@ -127,31 +127,31 @@
               "description": "The new type for this device.",
               "oneOf": [
                 {
-                  "title": "Blind (using channel 0 for 'UP' and channel 1 for 'DOWN' of a multi-channel device)",
+                  "title": "Garage Door (using Eachen GD-DC5)",
                   "enum": [
-                    "blind"
+                    "garage_eachen"
                   ]
                 },
                 {
-                  "title": "Garage Door (using a single/multi-channel device)",
+                  "title": "Garage Door (using single/multi-channel device)",
                   "enum": [
                     "garage"
                   ]
                 },
                 {
-                  "title": "Garage Door (using the Eachen GD-DC5)",
+                  "title": "Window Blind (using multi-channel device)",
                   "enum": [
-                    "garage_eachen"
+                    "blind"
                   ]
                 },
                 {
-                  "title": "Lock (using a single channel device)",
+                  "title": "Lock (using single channel device)",
                   "enum": [
                     "lock"
                   ]
                 },
                 {
-                  "title": "Irrigation (using channels 0 and 1 of a multi-channel device)",
+                  "title": "Irrigation/Sprinkler (using multi-channel device)",
                   "enum": [
                     "valve"
                   ]

From c8f87e0165f35f2e0fc9318284ad2765c577f0e2 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 4 Oct 2020 17:24:46 +0100
Subject: [PATCH 0341/3183] 3.3.1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 38a4ffea..4c1b1d1b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.3.1-3",
+  "version": "3.3.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index bf30e1ac..8f4350cc 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.3.1-3",
+  "version": "3.3.1",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 94a2229c5714513cb63fe31ba11f71c098ab0633 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 5 Oct 2020 09:12:07 +0100
Subject: [PATCH 0342/3183] remove zb bridge device

---
 lib/eWeLink.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index 8ef86134..35f06348 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -345,8 +345,8 @@ class eWeLink {
         accessory.context.channelCount = rfChlCounter
         this.devicesInHB.set(accessory.context.hbDeviceId, accessory)
       } else if (cns.devicesZBBridge.includes(device.extra.uiid)) {
-        if (this.devicesInHB.has(device.deviceid + 'SW0')) {
-          this.removeAccessory(this.devicesInHB.get(device.deviceid + 'SW0'))
+        if (this.devicesInHB.has(device.deviceid + 'SWX')) {
+          this.removeAccessory(this.devicesInHB.get(device.deviceid + 'SWX'))
         }
       } else if (cns.devicesZB.includes(device.extra.uiid)) {
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')

From b51a2373419786f63ac8f1d1cced5897d4b797c3 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 5 Oct 2020 09:13:06 +0100
Subject: [PATCH 0343/3183] 3.3.2-0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 4c1b1d1b..06075130 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.3.1",
+  "version": "3.3.2-0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 8f4350cc..b7c3de7c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.3.1",
+  "version": "3.3.2-0",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 7b360120431250d30c4c9745ec2a5d24d516d0d6 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 5 Oct 2020 09:30:02 +0100
Subject: [PATCH 0344/3183] Update eWeLink.js

---
 lib/eWeLink.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index 35f06348..89191bcb 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -348,6 +348,7 @@ class eWeLink {
         if (this.devicesInHB.has(device.deviceid + 'SWX')) {
           this.removeAccessory(this.devicesInHB.get(device.deviceid + 'SWX'))
         }
+        return
       } else if (cns.devicesZB.includes(device.extra.uiid)) {
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')

From 24a72abfb0b57b53bf01906c2b05b5a7c9411f70 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 5 Oct 2020 09:30:36 +0100
Subject: [PATCH 0345/3183] 3.3.2-1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 06075130..f474f3e1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.3.2-0",
+  "version": "3.3.2-1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index b7c3de7c..32148d1d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.3.2-0",
+  "version": "3.3.2-1",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 462ee9cc2c2b6a35b84b3a4c221696758fb89097 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 5 Oct 2020 10:09:03 +0100
Subject: [PATCH 0346/3183] 3.3.2

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index f474f3e1..a4071715 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.3.2-1",
+  "version": "3.3.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 32148d1d..85f9cfdb 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.3.2-1",
+  "version": "3.3.2",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 36a68b5675f593523a6f51befc67e97a1d9e8669 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 5 Oct 2020 12:52:48 +0100
Subject: [PATCH 0347/3183] Update eWeLinkWS.js

---
 lib/eWeLinkWS.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/eWeLinkWS.js b/lib/eWeLinkWS.js
index 91633aef..70223826 100644
--- a/lib/eWeLinkWS.js
+++ b/lib/eWeLinkWS.js
@@ -162,7 +162,7 @@ module.exports = class eWeLinkWS {
         if (e !== 1000) {
           this.log('Web socket will try to reconnect in five seconds.')
           await utils.sleep(5000)
-          this.login()
+          await this.login()
         } else {
           this.log('Please try restarting Homebridge so that this plugin can work again.')
         }
@@ -179,7 +179,7 @@ module.exports = class eWeLinkWS {
         this.log.warn('Web socket will try to reconnect in five seconds then try the command again.')
         this.wsp.removeAllListeners()
         await utils.sleep(5000)
-        this.login()
+        await this.login()
       } else {
         this.log.warn('If this was unexpected then please try restarting Homebridge.')
       }
@@ -193,13 +193,14 @@ module.exports = class eWeLinkWS {
       ...{
         action: 'update',
         sequence,
+        ts: 0,
         userAgent: 'app'
       }
     }
     if (this.wsp && this.wsIsOpen) {
       try {
         if (this.debugReqRes) {
-          const msg = JSON.stringify(json, null, 2).replace(json.apikey, '**hidden**').replace(json.apiKey, '**hidden**').replace(json.deviceid, '**hidden**')
+          const msg = JSON.stringify(jsonToSend, null, 2).replace(json.apikey, '**hidden**').replace(json.apiKey, '**hidden**').replace(json.deviceid, '**hidden**')
           this.log.warn('WS message sent. This text is yellow for clarity.\n%s', msg)
         } else if (this.debug) {
           this.log('WS message sent.')

From c091a73f23936646ba9094bba5f69c80ee984a42 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 5 Oct 2020 13:31:41 +0100
Subject: [PATCH 0348/3183] Update fan.js

---
 lib/device/fan.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/device/fan.js b/lib/device/fan.js
index 045e0b64..b0938678 100644
--- a/lib/device/fan.js
+++ b/lib/device/fan.js
@@ -94,7 +94,7 @@ module.exports = class deviceFan {
         status = params.fan === 'on' ? 1 : 0
         speed = params.speed * 33 * status
       } else {
-        throw new Error('unknown parameters received')
+        return
       }
       lightService.updateCharacteristic(Characteristic.On, light)
       fanService

From ca85c3043cc4280429a4d690c8cdf0892deeaa32 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 5 Oct 2020 13:33:13 +0100
Subject: [PATCH 0349/3183] 3.3.3

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index a4071715..010e51ee 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.3.2",
+  "version": "3.3.3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 85f9cfdb..5556796a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.3.2",
+  "version": "3.3.3",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 640dd8aeca27c18706d82ba730819dae5b997545 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 5 Oct 2020 15:35:24 +0100
Subject: [PATCH 0350/3183] ws improvements

---
 lib/eWeLinkWS.js | 41 ++++++++++++++++++++++-------------------
 1 file changed, 22 insertions(+), 19 deletions(-)

diff --git a/lib/eWeLinkWS.js b/lib/eWeLinkWS.js
index 70223826..e215542d 100644
--- a/lib/eWeLinkWS.js
+++ b/lib/eWeLinkWS.js
@@ -104,13 +104,16 @@ module.exports = class eWeLinkWS {
         this.log.error('WS login failed [%s].', this.debug ? err : err.message)
       }
     })
-    this.wsp.onUnpackedMessage.addListener((device) => {
+    this.wsp.onUnpackedMessage.addListener(device => {
       if (device === 'pong') return
       let onlineStatus = true
       if (!Object.prototype.hasOwnProperty.call(device, 'params')) device.params = {}
       if (Object.prototype.hasOwnProperty.call(device, 'deviceid') && Object.prototype.hasOwnProperty.call(device, 'error')) {
         device.action = 'update'
         onlineStatus = device.error === 0
+        if (this.debug) {
+          this.log.warn('WS message received.\n%s', JSON.stringify(device, null, 2).replace(this.apiKey, '**hidden**'))
+        }
       }
       if (Object.prototype.hasOwnProperty.call(device, 'action')) {
         switch (device.action) {
@@ -157,32 +160,32 @@ module.exports = class eWeLinkWS {
     })
     this.wsp.onClose.addListener(async e => {
       this.wsIsOpen = false
-      if (e !== 1005) {
-        this.log.warn('Web socket closed [%s].', e)
-        if (e !== 1000) {
-          this.log('Web socket will try to reconnect in five seconds.')
-          await utils.sleep(5000)
-          await this.login()
-        } else {
-          this.log('Please try restarting Homebridge so that this plugin can work again.')
-        }
-      }
       if (this.hbInterval) {
         clearInterval(this.hbInterval)
         this.hbInterval = null
       }
       this.wsp.removeAllListeners()
+      if (e === 1005) return
+      if (this.debug) {
+        this.log.warn('Web socket closed - [%s].', e)
+        this.log.warn('Web socket will try to reconnect in five seconds.')
+      }
+      await utils.sleep(5000)
+      await this.login()
     })
     this.wsp.onError.addListener(async e => {
-      this.log.warn('Web socket error - [%s].', e)
-      if (e.code === 'ECONNREFUSED') {
-        this.log.warn('Web socket will try to reconnect in five seconds then try the command again.')
-        this.wsp.removeAllListeners()
-        await utils.sleep(5000)
-        await this.login()
-      } else {
-        this.log.warn('If this was unexpected then please try restarting Homebridge.')
+      this.wsIsOpen = false
+      if (this.hbInterval) {
+        clearInterval(this.hbInterval)
+        this.hbInterval = null
+      }
+      this.wsp.removeAllListeners()
+      if (this.debug) {      
+        this.log.warn('Web socket error - [%s].', e)
+        this.log.warn('Web socket will try to reconnect in five seconds.')
       }
+      await utils.sleep(5000)
+      await this.login()
     })
   }
 

From c1ccc5d175b4d153395b08b343f628a2c7d90d1b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 5 Oct 2020 15:58:05 +0100
Subject: [PATCH 0351/3183] limit logging

---
 lib/eWeLinkHTTP.js | 16 ++++++++++++----
 lib/eWeLinkLAN.js  |  4 +++-
 lib/eWeLinkWS.js   | 10 +++++++---
 3 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/lib/eWeLinkHTTP.js b/lib/eWeLinkHTTP.js
index a40122a9..011d25fb 100644
--- a/lib/eWeLinkHTTP.js
+++ b/lib/eWeLinkHTTP.js
@@ -67,7 +67,9 @@ module.exports = class eWeLinkHTTP {
       return this.httpHost
     } catch (err) {
       if (Object.prototype.hasOwnProperty.call(err, 'code') && cns.httpRetryCodes.includes(err.code)) {
-        this.log.warn('Unable to reach eWeLink. Retrying in 30 seconds.')
+        if (this.debug) {
+          this.log.warn('Unable to reach eWeLink. Retrying in 30 seconds.')
+        }
         await utils.sleep(30000)
         return this.getHost()
       } else {
@@ -128,7 +130,9 @@ module.exports = class eWeLinkHTTP {
       }
     } else {
       if (body.error === 500) {
-        this.log.warn('An eWeLink error [500] occured. Retrying in 30 seconds.')
+        if (this.debug) {
+          this.log.warn('An eWeLink error [500] occured. Retrying in 30 seconds.')
+        }
         await utils.sleep(30000)
         return this.login()
       } else {
@@ -168,7 +172,9 @@ module.exports = class eWeLinkHTTP {
       return deviceList
     } catch (err) {
       if (Object.prototype.hasOwnProperty.call(err, 'code') && cns.httpRetryCodes.includes(err.code)) {
-        this.log.warn('Unable to reach eWeLink. Retrying in 30 seconds.')
+        if (this.debug) {
+          this.log.warn('Unable to reach eWeLink. Retrying in 30 seconds.')
+        }
         await utils.sleep(30000)
         return this.getDevices()
       } else {
@@ -204,7 +210,9 @@ module.exports = class eWeLinkHTTP {
       }
     } catch (err) {
       if (Object.prototype.hasOwnProperty.call(err, 'code') && cns.httpRetryCodes.includes(err.code)) {
-        this.log.warn('Unable to reach eWeLink. Retrying in 30 seconds.')
+        if (this.debug) {
+          this.log.warn('Unable to reach eWeLink. Retrying in 30 seconds.')
+        }
         await utils.sleep(30000)
         return this.getDevice(deviceId)
       } else {
diff --git a/lib/eWeLinkLAN.js b/lib/eWeLinkLAN.js
index df0655c6..83a37197 100644
--- a/lib/eWeLinkLAN.js
+++ b/lib/eWeLinkLAN.js
@@ -75,7 +75,9 @@ module.exports = class eWeLinkLAN {
             try {
               params = JSON.parse(pText)
             } catch (e) {
-              this.log.warn('[%s] An error occured reading the LAN message [%s]', rdata.id, e)
+              if (this.debug) {
+                this.log.warn('[%s] An error occured reading the LAN message [%s]', rdata.id, e)
+              }
               return
             }
             for (const param in params) {
diff --git a/lib/eWeLinkWS.js b/lib/eWeLinkWS.js
index e215542d..1a091f64 100644
--- a/lib/eWeLinkWS.js
+++ b/lib/eWeLinkWS.js
@@ -46,7 +46,9 @@ module.exports = class eWeLinkWS {
       return body.domain
     } catch (err) {
       if (Object.prototype.hasOwnProperty.call(err, 'code') && cns.httpRetryCodes.includes(err.code)) {
-        this.log.warn('Unable to reach eWeLink. Retrying in 30 seconds.')
+        if (this.debug) {
+          this.log.warn('Unable to reach eWeLink. Retrying in 30 seconds.')
+        }
         await utils.sleep(30000)
         return this.getDevices()
       } else {
@@ -148,7 +150,9 @@ module.exports = class eWeLinkWS {
           case 'reportSubDevice':
             return
           default:
-            this.log.warn('[%s] WS message has unknown action.\n' + JSON.stringify(device, null, 2), device.deviceid)
+            if (this.debug) {
+              this.log.warn('[%s] WS message has unknown action.\n' + JSON.stringify(device, null, 2), device.deviceid)
+            }
         }
       } else if (Object.prototype.hasOwnProperty.call(device, 'error') && device.error === 0) {
         // *** Safe to ignore these messages *** \\
@@ -180,7 +184,7 @@ module.exports = class eWeLinkWS {
         this.hbInterval = null
       }
       this.wsp.removeAllListeners()
-      if (this.debug) {      
+      if (this.debug) {
         this.log.warn('Web socket error - [%s].', e)
         this.log.warn('Web socket will try to reconnect in five seconds.')
       }

From 388d5d3ec54bb0082b3b74bf35dff03cde2b139d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 5 Oct 2020 16:01:06 +0100
Subject: [PATCH 0352/3183] 3.4.0-0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 010e51ee..14da6f99 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.3.3",
+  "version": "3.4.0-0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 5556796a..0c354d93 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.3.3",
+  "version": "3.4.0-0",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 6d63ebf20cb5059baea2e188b8955e89360d9a71 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 5 Oct 2020 18:27:54 +0100
Subject: [PATCH 0353/3183] hide log for no error

---
 lib/eWeLinkWS.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/eWeLinkWS.js b/lib/eWeLinkWS.js
index 1a091f64..baba2465 100644
--- a/lib/eWeLinkWS.js
+++ b/lib/eWeLinkWS.js
@@ -113,7 +113,7 @@ module.exports = class eWeLinkWS {
       if (Object.prototype.hasOwnProperty.call(device, 'deviceid') && Object.prototype.hasOwnProperty.call(device, 'error')) {
         device.action = 'update'
         onlineStatus = device.error === 0
-        if (this.debug) {
+        if (device.error !== 0 && this.debug) {
           this.log.warn('WS message received.\n%s', JSON.stringify(device, null, 2).replace(this.apiKey, '**hidden**'))
         }
       }

From 694fd71cacdec7e04d10f759d4aa76f6f932c1ed Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 5 Oct 2020 18:28:38 +0100
Subject: [PATCH 0354/3183] try lan mode ifan03

---
 lib/device/fan.js | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/lib/device/fan.js b/lib/device/fan.js
index b0938678..7c1d534a 100644
--- a/lib/device/fan.js
+++ b/lib/device/fan.js
@@ -1,5 +1,6 @@
 'use strict'
 let Characteristic, Service
+const cns = require('./../constants')
 module.exports = class deviceFan {
   constructor (platform, accessory) {
     this.platform = platform
@@ -27,6 +28,7 @@ module.exports = class deviceFan {
       let newPower
       let newSpeed
       let newLight
+      let params = {}
       const lightService = accessory.getService(Service.Lightbulb)
       const fanService = accessory.getService(Service.Fanv2)
       switch (type) {
@@ -46,13 +48,19 @@ module.exports = class deviceFan {
           newLight = value
           break
       }
-      const params = {
-        switches: this.platform.devicesInEW.get(accessory.context.eweDeviceId).params.switches
+      if (accessory.context.eweModel === 'iFan03' && accessory.context.reachableLAN) {
+        
+        params.light = newLight ? 'on' : 'off'
+        params.fan = newPower === 1 && newSpeed >= 33 ? 'on' : 'off'
+        params.speed = newSpeed / 33
+        
+      } else {
+        params.switches = cns.defaultMultiSwitchOff
+        params.switches[0].switch = newLight ? 'on' : 'off'
+        params.switches[1].switch = newPower === 1 && newSpeed >= 33 ? 'on' : 'off'
+        params.switches[2].switch = newPower === 1 && newSpeed >= 66 && newSpeed < 99 ? 'on' : 'off'
+        params.switches[3].switch = newPower === 1 && newSpeed >= 99 ? 'on' : 'off'
       }
-      params.switches[0].switch = newLight ? 'on' : 'off'
-      params.switches[1].switch = newPower === 1 && newSpeed >= 33 ? 'on' : 'off'
-      params.switches[2].switch = newPower === 1 && newSpeed >= 66 && newSpeed < 99 ? 'on' : 'off'
-      params.switches[3].switch = newPower === 1 && newSpeed >= 99 ? 'on' : 'off'
       await this.platform.sendDeviceUpdate(accessory, params)
       lightService.updateCharacteristic(Characteristic.On, newLight)
       fanService

From c504528905b58ff0baf4235389a678e430dd9bcb Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 5 Oct 2020 18:29:58 +0100
Subject: [PATCH 0355/3183] Update fan.js

---
 lib/device/fan.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/lib/device/fan.js b/lib/device/fan.js
index 7c1d534a..229f1d96 100644
--- a/lib/device/fan.js
+++ b/lib/device/fan.js
@@ -28,7 +28,7 @@ module.exports = class deviceFan {
       let newPower
       let newSpeed
       let newLight
-      let params = {}
+      const params = {}
       const lightService = accessory.getService(Service.Lightbulb)
       const fanService = accessory.getService(Service.Fanv2)
       switch (type) {
@@ -49,11 +49,9 @@ module.exports = class deviceFan {
           break
       }
       if (accessory.context.eweModel === 'iFan03' && accessory.context.reachableLAN) {
-        
         params.light = newLight ? 'on' : 'off'
         params.fan = newPower === 1 && newSpeed >= 33 ? 'on' : 'off'
         params.speed = newSpeed / 33
-        
       } else {
         params.switches = cns.defaultMultiSwitchOff
         params.switches[0].switch = newLight ? 'on' : 'off'

From b6abac5061bf04a90e342cf0764ea1732d56d47e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 5 Oct 2020 18:30:40 +0100
Subject: [PATCH 0356/3183] 3.4.0-1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 14da6f99..37b5a602 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.4.0-0",
+  "version": "3.4.0-1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 0c354d93..08efe5da 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.4.0-0",
+  "version": "3.4.0-1",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 325b61e937005f765cc65e437a95cee068340079 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 5 Oct 2020 19:07:26 +0100
Subject: [PATCH 0357/3183] ifan test lan mode

---
 lib/device/fan.js | 10 ++++++++--
 lib/eWeLinkLAN.js | 11 ++++++++++-
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/lib/device/fan.js b/lib/device/fan.js
index 229f1d96..6e9c3725 100644
--- a/lib/device/fan.js
+++ b/lib/device/fan.js
@@ -28,7 +28,6 @@ module.exports = class deviceFan {
       let newPower
       let newSpeed
       let newLight
-      const params = {}
       const lightService = accessory.getService(Service.Lightbulb)
       const fanService = accessory.getService(Service.Fanv2)
       switch (type) {
@@ -49,17 +48,24 @@ module.exports = class deviceFan {
           break
       }
       if (accessory.context.eweModel === 'iFan03' && accessory.context.reachableLAN) {
+        let params = {}
         params.light = newLight ? 'on' : 'off'
+        await this.platform.sendDeviceUpdate(accessory, params)
+        params = {}
         params.fan = newPower === 1 && newSpeed >= 33 ? 'on' : 'off'
+        await this.platform.sendDeviceUpdate(accessory, params)
+        params = {}
         params.speed = newSpeed / 33
+        await this.platform.sendDeviceUpdate(accessory, params)
       } else {
+        const params = {}
         params.switches = cns.defaultMultiSwitchOff
         params.switches[0].switch = newLight ? 'on' : 'off'
         params.switches[1].switch = newPower === 1 && newSpeed >= 33 ? 'on' : 'off'
         params.switches[2].switch = newPower === 1 && newSpeed >= 66 && newSpeed < 99 ? 'on' : 'off'
         params.switches[3].switch = newPower === 1 && newSpeed >= 99 ? 'on' : 'off'
+        await this.platform.sendDeviceUpdate(accessory, params)
       }
-      await this.platform.sendDeviceUpdate(accessory, params)
       lightService.updateCharacteristic(Characteristic.On, newLight)
       fanService
         .updateCharacteristic(Characteristic.Active, newPower)
diff --git a/lib/eWeLinkLAN.js b/lib/eWeLinkLAN.js
index 83a37197..b29abd92 100644
--- a/lib/eWeLinkLAN.js
+++ b/lib/eWeLinkLAN.js
@@ -122,8 +122,17 @@ module.exports = class eWeLinkLAN {
       } else if (Object.prototype.hasOwnProperty.call(json.params, 'switch')) {
         params.switch = json.params.switch
         suffix = 'switch'
+      } else if (Object.prototype.hasOwnProperty.call(json.params, 'light')) {
+        params.light = json.params.light
+        suffix = 'light'
+      } else if (Object.prototype.hasOwnProperty.call(json.params, 'fan')) {
+        params.fan = json.params.fan
+        suffix = 'fan'
+      } else if (Object.prototype.hasOwnProperty.call(json.params, 'speed')) {
+        params.speed = json.params.speed
+        suffix = 'speed'
       } else {
-        throw new Error("device isn't reachable via LAN mode")
+        throw new Error("device isn't configurable via LAN mode")
       }
       if ((apiKey = this.deviceMap.get(json.deviceid).apiKey)) {
         const key = crypto.createHash('md5').update(Buffer.from(apiKey, 'utf8')).digest()

From 5c1b41a57cb91d735b2c595c2872370cff0c9396 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 5 Oct 2020 19:08:16 +0100
Subject: [PATCH 0358/3183] 3.4.0-2

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 37b5a602..826bf69b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.4.0-1",
+  "version": "3.4.0-2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 08efe5da..45900bec 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.4.0-1",
+  "version": "3.4.0-2",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From c6eb692e88c1643300d40fd5be8d3f62f4690870 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 5 Oct 2020 20:00:19 +0100
Subject: [PATCH 0359/3183] Update fan.js

---
 lib/device/fan.js | 38 ++++++++++++++++++++++++++++----------
 1 file changed, 28 insertions(+), 10 deletions(-)

diff --git a/lib/device/fan.js b/lib/device/fan.js
index 6e9c3725..b8f3ec04 100644
--- a/lib/device/fan.js
+++ b/lib/device/fan.js
@@ -20,6 +20,9 @@ module.exports = class deviceFan {
     fanLightService
       .getCharacteristic(Characteristic.On)
       .on('set', (value, callback) => this.internalUpdate(accessory, 'light', value, callback))
+    if (!Object.prototype.hasOwnProperty.call(accessory.context, 'cacheRotationSpeed')) {
+      accessory.context.cacheRotationSpeed = 33
+    }
   }
 
   async internalUpdate (accessory, type, value, callback) {
@@ -30,33 +33,47 @@ module.exports = class deviceFan {
       let newLight
       const lightService = accessory.getService(Service.Lightbulb)
       const fanService = accessory.getService(Service.Fanv2)
+      const params = {}
+      if (type === 'speed') {
+        if (value > 0 && value <= 33) value = 33
+        else if (value > 33 && value <= 66) value = 66
+        else if (value > 66) value = 99
+      }
       switch (type) {
         case 'power':
           newPower = value
-          newSpeed = value ? 33 : 0
+          newSpeed = value ? accessory.context.cacheRotationSpeed : 0
           newLight = lightService.getCharacteristic(Characteristic.On).value
+          if (accessory.context.eweModel === 'iFan03' && accessory.context.reachableLAN) {
+            params.fan = newPower === 1 ? 'on' : 'off'
+            await this.platform.sendDeviceUpdate(accessory, params)
+          }
           break
         case 'speed':
           newPower = value >= 33 ? 1 : 0
           newSpeed = value
           newLight = lightService.getCharacteristic(Characteristic.On).value
+          if (accessory.context.eweModel === 'iFan03' && accessory.context.reachableLAN) {
+            if (newPower) {
+              params.speed = accessory.context.cacheRotationSpeed / 33
+            } else {
+              params.fan = 'off'
+            }
+            await this.platform.sendDeviceUpdate(accessory, params)
+          }
           break
         case 'light':
           newPower = fanService.getCharacteristic(Characteristic.Active).value
           newSpeed = fanService.getCharacteristic(Characteristic.RotationSpeed).value
           newLight = value
+          if (accessory.context.eweModel === 'iFan03' && accessory.context.reachableLAN) {
+            params.light = newLight ? 'on' : 'off'
+            await this.platform.sendDeviceUpdate(accessory, params)
+          }
           break
       }
       if (accessory.context.eweModel === 'iFan03' && accessory.context.reachableLAN) {
-        let params = {}
-        params.light = newLight ? 'on' : 'off'
-        await this.platform.sendDeviceUpdate(accessory, params)
-        params = {}
-        params.fan = newPower === 1 && newSpeed >= 33 ? 'on' : 'off'
-        await this.platform.sendDeviceUpdate(accessory, params)
-        params = {}
-        params.speed = newSpeed / 33
-        await this.platform.sendDeviceUpdate(accessory, params)
+        // done
       } else {
         const params = {}
         params.switches = cns.defaultMultiSwitchOff
@@ -112,6 +129,7 @@ module.exports = class deviceFan {
       fanService
         .updateCharacteristic(Characteristic.Active, status)
         .updateCharacteristic(Characteristic.RotationSpeed, speed)
+      if (speed !== 0) accessory.context.cacheRotationSpeed = speed
     } catch (err) {
       this.platform.deviceUpdateError(accessory, err, false)
     }

From d6be2b7d1f828e4debe6ef7acce9d6a2b231239c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 5 Oct 2020 20:01:13 +0100
Subject: [PATCH 0360/3183] 3.4.0-3

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 826bf69b..a2d9e30f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.4.0-2",
+  "version": "3.4.0-3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 45900bec..2ba4ee62 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.4.0-2",
+  "version": "3.4.0-3",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 8eaab1d9c10dd97fa7689726b852bd43421502dd Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 5 Oct 2020 21:56:39 +0100
Subject: [PATCH 0361/3183] Update eWeLink.js

---
 lib/eWeLink.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index 89191bcb..1d377181 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -447,7 +447,6 @@ class eWeLink {
       deviceid: accessory.context.eweDeviceId,
       params
     }
-    await utils.sleep(Math.random() * 100 + 200)
     const res = await this.lanClient.sendUpdate(payload)
     if (res !== 'ok') {
       if (accessory.context.reachableWAN) {

From 8ef33b5c650d462097fd29e81835ceb5474df7b5 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 5 Oct 2020 21:56:52 +0100
Subject: [PATCH 0362/3183] revert ifan03 lan mode

---
 lib/device/fan.js | 49 ++++++++++-------------------------------------
 lib/eWeLinkLAN.js |  9 ---------
 2 files changed, 10 insertions(+), 48 deletions(-)

diff --git a/lib/device/fan.js b/lib/device/fan.js
index b8f3ec04..5629d422 100644
--- a/lib/device/fan.js
+++ b/lib/device/fan.js
@@ -1,6 +1,7 @@
 'use strict'
 let Characteristic, Service
 const cns = require('./../constants')
+const utils = require('./../utils')
 module.exports = class deviceFan {
   constructor (platform, accessory) {
     this.platform = platform
@@ -20,9 +21,6 @@ module.exports = class deviceFan {
     fanLightService
       .getCharacteristic(Characteristic.On)
       .on('set', (value, callback) => this.internalUpdate(accessory, 'light', value, callback))
-    if (!Object.prototype.hasOwnProperty.call(accessory.context, 'cacheRotationSpeed')) {
-      accessory.context.cacheRotationSpeed = 33
-    }
   }
 
   async internalUpdate (accessory, type, value, callback) {
@@ -33,56 +31,30 @@ module.exports = class deviceFan {
       let newLight
       const lightService = accessory.getService(Service.Lightbulb)
       const fanService = accessory.getService(Service.Fanv2)
-      const params = {}
-      if (type === 'speed') {
-        if (value > 0 && value <= 33) value = 33
-        else if (value > 33 && value <= 66) value = 66
-        else if (value > 66) value = 99
-      }
+      const params = { switches: cns.defaultMultiSwitchOff }
       switch (type) {
         case 'power':
           newPower = value
-          newSpeed = value ? accessory.context.cacheRotationSpeed : 0
+          newSpeed = value ? 33 : 0
           newLight = lightService.getCharacteristic(Characteristic.On).value
-          if (accessory.context.eweModel === 'iFan03' && accessory.context.reachableLAN) {
-            params.fan = newPower === 1 ? 'on' : 'off'
-            await this.platform.sendDeviceUpdate(accessory, params)
-          }
           break
         case 'speed':
           newPower = value >= 33 ? 1 : 0
           newSpeed = value
           newLight = lightService.getCharacteristic(Characteristic.On).value
-          if (accessory.context.eweModel === 'iFan03' && accessory.context.reachableLAN) {
-            if (newPower) {
-              params.speed = accessory.context.cacheRotationSpeed / 33
-            } else {
-              params.fan = 'off'
-            }
-            await this.platform.sendDeviceUpdate(accessory, params)
-          }
+          await utils.sleep(500)
           break
         case 'light':
           newPower = fanService.getCharacteristic(Characteristic.Active).value
           newSpeed = fanService.getCharacteristic(Characteristic.RotationSpeed).value
           newLight = value
-          if (accessory.context.eweModel === 'iFan03' && accessory.context.reachableLAN) {
-            params.light = newLight ? 'on' : 'off'
-            await this.platform.sendDeviceUpdate(accessory, params)
-          }
           break
       }
-      if (accessory.context.eweModel === 'iFan03' && accessory.context.reachableLAN) {
-        // done
-      } else {
-        const params = {}
-        params.switches = cns.defaultMultiSwitchOff
-        params.switches[0].switch = newLight ? 'on' : 'off'
-        params.switches[1].switch = newPower === 1 && newSpeed >= 33 ? 'on' : 'off'
-        params.switches[2].switch = newPower === 1 && newSpeed >= 66 && newSpeed < 99 ? 'on' : 'off'
-        params.switches[3].switch = newPower === 1 && newSpeed >= 99 ? 'on' : 'off'
-        await this.platform.sendDeviceUpdate(accessory, params)
-      }
+      params.switches[0].switch = newLight ? 'on' : 'off'
+      params.switches[1].switch = newPower === 1 && newSpeed >= 33 ? 'on' : 'off'
+      params.switches[2].switch = newPower === 1 && newSpeed >= 66 && newSpeed < 99 ? 'on' : 'off'
+      params.switches[3].switch = newPower === 1 && newSpeed >= 99 ? 'on' : 'off'
+      await this.platform.sendDeviceUpdate(accessory, params)
       lightService.updateCharacteristic(Characteristic.On, newLight)
       fanService
         .updateCharacteristic(Characteristic.Active, newPower)
@@ -129,9 +101,8 @@ module.exports = class deviceFan {
       fanService
         .updateCharacteristic(Characteristic.Active, status)
         .updateCharacteristic(Characteristic.RotationSpeed, speed)
-      if (speed !== 0) accessory.context.cacheRotationSpeed = speed
     } catch (err) {
       this.platform.deviceUpdateError(accessory, err, false)
     }
   }
-}
+}
\ No newline at end of file
diff --git a/lib/eWeLinkLAN.js b/lib/eWeLinkLAN.js
index b29abd92..c9e977ff 100644
--- a/lib/eWeLinkLAN.js
+++ b/lib/eWeLinkLAN.js
@@ -122,15 +122,6 @@ module.exports = class eWeLinkLAN {
       } else if (Object.prototype.hasOwnProperty.call(json.params, 'switch')) {
         params.switch = json.params.switch
         suffix = 'switch'
-      } else if (Object.prototype.hasOwnProperty.call(json.params, 'light')) {
-        params.light = json.params.light
-        suffix = 'light'
-      } else if (Object.prototype.hasOwnProperty.call(json.params, 'fan')) {
-        params.fan = json.params.fan
-        suffix = 'fan'
-      } else if (Object.prototype.hasOwnProperty.call(json.params, 'speed')) {
-        params.speed = json.params.speed
-        suffix = 'speed'
       } else {
         throw new Error("device isn't configurable via LAN mode")
       }

From 20a2d27f8b7e61cf133c3a909fd86cc1977c06ce Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 5 Oct 2020 22:04:04 +0100
Subject: [PATCH 0363/3183] Update fan.js

---
 lib/device/fan.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/device/fan.js b/lib/device/fan.js
index 5629d422..3c97c192 100644
--- a/lib/device/fan.js
+++ b/lib/device/fan.js
@@ -105,4 +105,4 @@ module.exports = class deviceFan {
       this.platform.deviceUpdateError(accessory, err, false)
     }
   }
-}
\ No newline at end of file
+}

From 290b6fb1be7215c1ac7ab7de6b584cff92231c1f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 5 Oct 2020 22:04:40 +0100
Subject: [PATCH 0364/3183] 3.4.0-4

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index a2d9e30f..cfd33573 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.4.0-3",
+  "version": "3.4.0-4",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 2ba4ee62..8f3d1938 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.4.0-3",
+  "version": "3.4.0-4",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 453fe724f779062892f83bb3c4fbe84b7a1d002e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 6 Oct 2020 09:19:00 +0100
Subject: [PATCH 0365/3183] code formatting

---
 lib/constants.js   |  28 +++++++++-
 lib/eWeLink.js     | 131 ++++++++++++++++++++++++++++++++++-----------
 lib/eWeLinkHTTP.js |  31 +++++++----
 lib/eWeLinkLAN.js  |  13 ++---
 lib/eWeLinkWS.js   |  45 ++++++----------
 5 files changed, 165 insertions(+), 83 deletions(-)

diff --git a/lib/constants.js b/lib/constants.js
index 27f4f0ce..5596f43f 100644
--- a/lib/constants.js
+++ b/lib/constants.js
@@ -24,7 +24,19 @@ module.exports = {
   devicesRFBridge: [28],
   devicesZBBridge: [66],
   devicesZB: [1000, 1770, 2026, 3026],
-  paramsToKeep: ['battery', 'bright', 'brightness', 'channel', 'cmd', 'colorB', 'colorG', 'colorR', 'current', 'currentHumidity', 'currentTemperature', 'fan', 'humidity', 'key', 'light', 'lock', 'mainSwitch', 'mode', 'motion', 'online', 'power', 'rfChl', 'rfList', 'rfTrig', 'sensorType', 'setclose', 'speed', 'state', 'switch', 'switches', 'temperature', 'trigTime', 'type', 'voltage', 'zyx_mode'],
+  paramsToKeep: [
+    'battery', 'bright', 'brightness',
+    'channel', 'cmd', 'colorB', 'colorG',
+    'colorR', 'current', 'currentHumidity',
+    'currentTemperature', 'fan', 'humidity',
+    'key', 'light', 'lock', 'mainSwitch',
+    'mode', 'motion', 'online', 'power',
+    'rfChl', 'rfList', 'rfTrig',
+    'sensorType', 'setclose', 'speed',
+    'state', 'switch', 'switches',
+    'temperature', 'trigTime', 'type',
+    'voltage', 'zyx_mode'
+  ],
   defaultMultiSwitchOff: [{
     switch: 'off',
     outlet: 0
@@ -42,6 +54,18 @@ module.exports = {
     outlet: 3
   }
   ],
+  defaultCurtainCache: {
+    cacheCurrentPosition: 0
+  },
+  defaultBlindCache: {
+    cacheCurrentPosition: 0,
+    cachePositionState: 2,
+    cacheTargetPosition: 0
+  },
+  defaultGarageCache: {
+    cacheCurrentDoorState: 1,
+    cacheTargetDoorState: 1
+  },
   chansFromUiid: {
     1: 1, // "SOCKET"                                  \\ 20, MINI, BASIC, S26
     2: 2, // "SOCKET_2"                                \\
@@ -100,7 +124,7 @@ module.exports = {
     65: 0, // "CustomCamera"                           \\
     66: 0, // "ZIGBEE_MAIN_DEVICE"                     \\
     67: 0, // "RollingDoor"                            \\
-    68: 0, // "KOOCHUWAH"                              \\
+    68: 0, // "KOOCHUWAH"                              \\ a whhaaaaat?
     69: 0, // "ATMOSPHERE_LAMP"                        \\
     76: 0, // "YI_GE_ER_LAMP"                          \\
     77: 4, // "SINGLE_SOCKET_MULTIPLE"                 \\ (1 socket device using data structure of four :()
diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index 1d377181..ba0235a8 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -128,93 +128,137 @@ class eWeLink {
     let accessory
     try {
       if (this.cusG.has(device.deviceid + 'SWX')) {
-        const all = ['X', '0', '1', '2', '3', '4']
-        all.forEach(v => {
-          if (this.devicesInHB.has(device.deviceid + 'SW' + v)) {
-            if (this.devicesInHB.get(device.deviceid + 'SW' + v).getService(Service.Switch)) {
-              this.removeAccessory(this.devicesInHB.get(device.deviceid + 'SW' + v))
+        ;['X', '0', '1', '2', '3', '4'].forEach(sw => {
+          if (this.devicesInHB.has(device.deviceid + 'SW' + sw)) {
+            if (this.devicesInHB.get(device.deviceid + 'SW' + sw).getService(Service.Switch)) {
+              this.removeAccessory(this.devicesInHB.get(device.deviceid + 'SW' + sw))
             }
           }
         })
       }
       if (cns.devicesCurtain.includes(device.extra.uiid)) {
+        /***********************
+        BLINDS [EWELINK UIID 11]
+        ***********************/
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
-          : this.addAccessory(device, device.deviceid + 'SWX', false, { cacheCurrentPosition: 0 })
+          : this.addAccessory(device, device.deviceid + 'SWX', false, cns.defaultCurtainCache)
         accessory.control = new DeviceCurtain(this, accessory)
+        /**********************/
       } else if (this.cusG.has(device.deviceid + 'SWX') && this.cusG.get(device.deviceid + 'SWX').type === 'blind') {
+        /****************************
+        BLINDS [ACCESSORY SIMULATION]
+        ****************************/
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
-          : this.addAccessory(device, device.deviceid + 'SWX', false, {
-            cacheCurrentPosition: 0,
-            cachePositionState: 2,
-            cacheTargetPosition: 0
-          })
+          : this.addAccessory(device, device.deviceid + 'SWX', false, cns.defaultBlindCache)
         accessory.control = new DeviceBlind(this, accessory)
+        /***************************/
       } else if (this.cusG.has(device.deviceid + 'SWX') && this.cusG.get(device.deviceid + 'SWX').type === 'garage') {
+        /**********************************
+        GARAGE DOORS [ACCESSORY SIMULATION]
+        **********************************/
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
-          : this.addAccessory(device, device.deviceid + 'SWX', false, {
-            cacheCurrentDoorState: 1,
-            cacheTargetDoorState: 1
-          })
+          : this.addAccessory(device, device.deviceid + 'SWX', false, cns.defaultGarageCache)
         accessory.control = new DeviceGarage(this, accessory)
+        /*********************************/
       } else if (this.cusG.has(device.deviceid + 'SWX') && this.cusG.get(device.deviceid + 'SWX').type === 'garage_eachen') {
+        /***************************
+        GARAGE DOORS [EACHEN GD-DC5]
+        ***************************/
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new DeviceGarageEachen(this, accessory)
+        /**************************/
       } else if (this.cusG.has(device.deviceid + 'SWX') && this.cusG.get(device.deviceid + 'SWX').type === 'lock') {
+        /***************************
+        LOCKS [ACCESSORY SIMULATION]
+        ***************************/
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new DeviceLock(this, accessory)
+        /**************************/
       } else if (this.cusG.has(device.deviceid + 'SWX') && this.cusG.get(device.deviceid + 'SWX').type === 'valve') {
+        /****************************
+        VALVES [ACCESSORY SIMULATION]
+        ****************************/
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new DeviceValve(this, accessory)
+        /***************************/
       } else if (cns.devicesSensor.includes(device.extra.uiid)) {
+        /*******************
+        SENSORS [SONOFF DW2]
+        *******************/
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
           : this.addAccessory(device, device.deviceid + 'SWX', false, { type: 'sensor' })
         accessory.control = new DeviceSensor(this, accessory)
+        /******************/
       } else if (cns.devicesFan.includes(device.extra.uiid)) {
+        /***
+        FANS
+        ***/
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new DeviceFan(this, accessory)
+        /**/
       } else if (cns.devicesThermostat.includes(device.extra.uiid)) {
+        /**********
+        THERMOSTATS
+        **********/
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
           : this.addAccessory(device, device.deviceid + 'SWX', false, {
             sensorType: device.params.sensorType
           })
-        if (accessory.context.sensorType !== device.params.sensorType) {
-          accessory.context.sensorType = device.params.sensorType
-        }
         accessory.control = new DeviceThermostat(this, accessory)
+        /*********/
       } else if (cns.devicesOutlet.includes(device.extra.uiid) || (cns.devicesSingleSwitch.includes(device.extra.uiid) && cns.devicesSingleSwitchOutlet.includes(device.productModel))) {
+        /******
+        OUTLETS
+        ******/
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new DeviceOutlet(this, accessory)
+        /*****/
       } else if (cns.devicesUSB.includes(device.extra.uiid)) {
+        /**********
+        USB OUTLETS
+        **********/
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new DeviceUSB(this, accessory)
+        /*********/
       } else if (cns.devicesSCM.includes(device.extra.uiid)) {
+        /*********************************
+        SINGLE CHL [MULTIPLE CHL HARDWARE]
+        *********************************/
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new DeviceSCM(this, accessory)
+        /********************************/
       } else if (cns.devicesSingleSwitch.includes(device.extra.uiid) && cns.devicesSingleSwitchLight.includes(device.productModel)) {
+        /**********************
+        LIGHTS [SINGLE CHANNEL]
+        **********************/
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new DeviceLight(this, accessory)
+        /*********************/
       } else if (cns.devicesMultiSwitch.includes(device.extra.uiid) && cns.devicesMultiSwitchLight.includes(device.productModel)) {
+        /*********************
+        LIGHTS [MULTI CHANNEL]
+        *********************/
         if ((this.config.hideMasters || '').includes(device.deviceid)) {
           if (this.devicesInHB.has(device.deviceid + 'SW0')) {
             this.removeAccessory(this.devicesInHB.get(device.deviceid + 'SW0'))
@@ -245,12 +289,20 @@ class eWeLink {
             oAccessory.control = new DeviceLight(this, oAccessory)
           }
         }
+        /********************/
       } else if (cns.devicesSingleSwitch.includes(device.extra.uiid)) {
+        /************************
+        SWITCHES [SINGLE CHANNEL]
+        ************************/
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new DeviceSwitch(this, accessory)
+        /***********************/
       } else if (cns.devicesMultiSwitch.includes(device.extra.uiid)) {
+        /***********************
+        SWITCHES [MULTI CHANNEL]
+        ***********************/
         if ((this.config.hideMasters || '').includes(device.deviceid)) {
           if (this.devicesInHB.has(device.deviceid + 'SW0')) {
             this.removeAccessory(this.devicesInHB.get(device.deviceid + 'SW0'))
@@ -281,7 +333,11 @@ class eWeLink {
             oAccessory.control = new DeviceSwitch(this, oAccessory)
           }
         }
+        /**********************/
       } else if (cns.devicesRFBridge.includes(device.extra.uiid)) {
+        /*********************
+        RF BRIDGE + SUBDEVICES
+        *********************/
         let rfChlCounter = 0
         const rfMap = []
         if (Object.prototype.hasOwnProperty.call(device, 'tags') && Object.prototype.hasOwnProperty.call(device.tags, 'zyx_info')) {
@@ -305,20 +361,14 @@ class eWeLink {
           let subAccessory
           let subType
           let subExtraContext = {}
-          switch (subDevice.type) {
-            case '1':
-            case '2':
-            case '3':
-            case '4':
-              subType = 'button'
-              break
-            case '6':
-              subType = this.cusS.has(device.deviceid + 'SW' + swNumber)
-                ? this.cusS.get(device.deviceid + 'SW' + swNumber).type
-                : 'motion'
-              break
-            default:
-              return
+          if (['1', '2', '3', '4'].includes(subDevice.type)) {
+            subType = 'button'
+          } else if (subDevice.type === '6') {
+            subType = this.cusS.has(device.deviceid + 'SW' + swNumber)
+              ? this.cusS.get(device.deviceid + 'SW' + swNumber).type
+              : 'motion'
+          } else {
+            return
           }
           subExtraContext = {
             buttons: subDevice.buttons,
@@ -344,22 +394,39 @@ class eWeLink {
         })
         accessory.context.channelCount = rfChlCounter
         this.devicesInHB.set(accessory.context.hbDeviceId, accessory)
+        /********************/
       } else if (cns.devicesZBBridge.includes(device.extra.uiid)) {
+        /************
+        ZIGBEE BRIDGE
+        ************/
         if (this.devicesInHB.has(device.deviceid + 'SWX')) {
           this.removeAccessory(this.devicesInHB.get(device.deviceid + 'SWX'))
         }
         return
+        /***********/
       } else if (cns.devicesZB.includes(device.extra.uiid)) {
+        /****************
+        ZIGBEE SUBDEVICES
+        ****************/
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new DeviceZBDev(this, accessory)
+        /***************/
       } else if (cns.devicesCamera.includes(device.extra.uiid)) {
+        /******
+        CAMERAS
+        ******/
         this.log.warn(' → [%s] please see the homebridge-ewelink wiki for details to enable the camera.', device.name)
         return
+        /*****/
       } else {
+        /**********
+        UNSUPPORTED
+        **********/
         this.log.warn(' → [%s] has not been added as it is not supported. Please make a GitHub issue request.', device.name)
         return
+        /*********/
       }
       if (!this.hiddenMasters.includes(device.deviceid)) {
         accessory
diff --git a/lib/eWeLinkHTTP.js b/lib/eWeLinkHTTP.js
index 011d25fb..0026d303 100644
--- a/lib/eWeLinkHTTP.js
+++ b/lib/eWeLinkHTTP.js
@@ -24,19 +24,19 @@ module.exports = class eWeLinkHTTP {
     }
     let dataToSign = []
     try {
-      Object.keys(params).forEach((k) => {
+      Object.keys(params).forEach(k => {
         dataToSign.push({
           key: k,
           value: params.k
         })
       })
       dataToSign.sort((a, b) => (a.key < b.key ? -1 : 1))
-      dataToSign = dataToSign.map((k) => k.key + '=' + k.value).join('&')
+      dataToSign = dataToSign.map(k => k.key + '=' + k.value).join('&')
       dataToSign = crypto.createHmac('sha256', cns.appSecret).update(dataToSign).digest('base64')
       if (this.debugReqRes) {
-        this.log.warn('Sending HTTP getHost request. This text is yellow for clarity.\n%s', JSON.stringify(params, null, 2))
+        this.log.warn('Sending HTTP getHost() request. This text is yellow for clarity.\n%s', JSON.stringify(params, null, 2))
       } else if (this.debug) {
-        this.log('Sending HTTP getHost request.')
+        this.log('Sending HTTP getHost() request.')
       }
       const res = await axios.get('https://api.coolkit.cc:8080/api/user/region', {
         headers: {
@@ -86,9 +86,9 @@ module.exports = class eWeLinkHTTP {
     this.username.includes('@') ? (data.email = this.username) : (data.phoneNumber = this.username)
     if (this.debugReqRes) {
       const msg = JSON.stringify(data, null, 2).replace(this.password, '**hidden**').replace(this.username, '**hidden**')
-      this.log.warn('Sending HTTP login request. This text is yellow for clarity.\n%s', msg)
+      this.log.warn('Sending HTTP login() request. This text is yellow for clarity.\n%s', msg)
     } else if (this.debug) {
-      this.log('Sending HTTP login request.')
+      this.log('Sending HTTP login() request.')
     }
     const dataToSign = crypto.createHmac('sha256', cns.appSecret).update(JSON.stringify(data)).digest('base64')
     const res = await axios.post('https://' + this.httpHost + '/v2/user/login', data, {
@@ -101,7 +101,12 @@ module.exports = class eWeLinkHTTP {
       }
     })
     const body = res.data
-    if (Object.prototype.hasOwnProperty.call(body, 'error') && body.error === 10004 && Object.prototype.hasOwnProperty.call(body, 'data') && Object.prototype.hasOwnProperty.call(body.data, 'region')) {
+    if (
+      Object.prototype.hasOwnProperty.call(body, 'error') &&
+      body.error === 10004 &&
+      Object.prototype.hasOwnProperty.call(body, 'data') &&
+      Object.prototype.hasOwnProperty.call(body.data, 'region')
+    ) {
       const givenRegion = body.data.region
       switch (givenRegion) {
         case 'eu':
@@ -153,7 +158,11 @@ module.exports = class eWeLinkHTTP {
         }
       })
       const body = res.data
-      if (!Object.prototype.hasOwnProperty.call(body, 'data') || !Object.prototype.hasOwnProperty.call(body, 'error') || (Object.prototype.hasOwnProperty.call(body, 'error') && body.error !== 0)) {
+      if (
+        !Object.prototype.hasOwnProperty.call(body, 'data') ||
+        !Object.prototype.hasOwnProperty.call(body, 'error') ||
+        (Object.prototype.hasOwnProperty.call(body, 'error') && body.error !== 0)
+      ) {
         throw new Error(JSON.stringify(body, null, 2))
       }
       const deviceList = []
@@ -200,7 +209,11 @@ module.exports = class eWeLinkHTTP {
         }
       })
       const body = res.data
-      if (!Object.prototype.hasOwnProperty.call(body, 'data') || !Object.prototype.hasOwnProperty.call(body, 'error') || (Object.prototype.hasOwnProperty.call(body, 'error') && body.error !== 0)) {
+      if (
+        !Object.prototype.hasOwnProperty.call(body, 'data') ||
+        !Object.prototype.hasOwnProperty.call(body, 'error') ||
+        (Object.prototype.hasOwnProperty.call(body, 'error') && body.error !== 0)
+      ) {
         throw new Error(JSON.stringify(body, null, 2))
       }
       if (body.data.thingList && body.data.thingList.length === 1) {
diff --git a/lib/eWeLinkLAN.js b/lib/eWeLinkLAN.js
index c9e977ff..d0a043b0 100644
--- a/lib/eWeLinkLAN.js
+++ b/lib/eWeLinkLAN.js
@@ -24,9 +24,7 @@ module.exports = class eWeLinkLAN {
   }
 
   async getHosts () {
-    const res = await dns.discover({
-      name: '_ewelink._tcp.local'
-    })
+    const res = await dns.discover({ name: '_ewelink._tcp.local' })
     res.forEach(device => {
       let d
       const deviceId = device.fqdn.replace('._ewelink._tcp.local', '').replace('eWeLink_', '')
@@ -68,16 +66,12 @@ module.exports = class eWeLinkLAN {
                 online: true,
                 ip: packet.address
               })
-              if (this.debug) {
-                this.log.warn('[%s] updating IP address to [%s].', rdata.id, packet.address)
-              }
+              if (this.debug) this.log.warn('[%s] updating IP address to [%s].', rdata.id, packet.address)
             }
             try {
               params = JSON.parse(pText)
             } catch (e) {
-              if (this.debug) {
-                this.log.warn('[%s] An error occured reading the LAN message [%s]', rdata.id, e)
-              }
+              if (this.debug) this.log.warn('[%s] An error occured reading the LAN message [%s]', rdata.id, e)
               return
             }
             for (const param in params) {
@@ -139,7 +133,6 @@ module.exports = class eWeLinkLAN {
         }
         if (this.debugReqRes) {
           const msg = JSON.stringify(json, null, 2)
-            .replace(json.apikey, '**hidden**')
             .replace(json.apikey, '**hidden**')
             .replace(json.deviceid, '**hidden**')
           this.log.warn('LAN message sent. This text is yellow for clarity.\n%s', msg)
diff --git a/lib/eWeLinkWS.js b/lib/eWeLinkWS.js
index baba2465..4a6ef090 100644
--- a/lib/eWeLinkWS.js
+++ b/lib/eWeLinkWS.js
@@ -16,7 +16,6 @@ module.exports = class eWeLinkWS {
     this.apiKey = res.apiKey
     this.wsIsOpen = false
     this.emitter = new EventEmitter()
-    this.delaySend = 0
   }
 
   async getHost () {
@@ -39,16 +38,12 @@ module.exports = class eWeLinkWS {
       if (!body.domain) {
         throw new Error('Server did not respond with a web socket host.')
       }
-      if (this.debug) {
-        this.log('Web socket host received [%s].', body.domain)
-      }
+      if (this.debug) this.log('Web socket host received [%s].', body.domain)
       this.wsHost = body.domain
       return body.domain
     } catch (err) {
       if (Object.prototype.hasOwnProperty.call(err, 'code') && cns.httpRetryCodes.includes(err.code)) {
-        if (this.debug) {
-          this.log.warn('Unable to reach eWeLink. Retrying in 30 seconds.')
-        }
+        if (this.debug) this.log.warn('Unable to reach eWeLink. Retrying in 30 seconds.')
         await utils.sleep(30000)
         return this.getDevices()
       } else {
@@ -59,16 +54,12 @@ module.exports = class eWeLinkWS {
 
   login () {
     this.wsp = new WSP('wss://' + this.wsHost + ':8080/api/ws', {
-      createWebSocket: (url) => new WS(url),
-      extractMessageData: (event) => event,
-      attachRequestId: (data, requestId) => Object.assign({
-        sequence: requestId
-      }, data),
-      extractRequestId: (data) => data && data.sequence,
-      packMessage: (data) => JSON.stringify(data),
-      unpackMessage: (data) => {
-        return data === 'pong' ? data : JSON.parse(data)
-      }
+      createWebSocket: url => new WS(url),
+      extractMessageData: event => event,
+      attachRequestId: (data, requestId) => Object.assign({ sequence: requestId }, data),
+      extractRequestId: data => data && data.sequence,
+      packMessage: data => JSON.stringify(data),
+      unpackMessage: data => data === 'pong' ? data : JSON.parse(data)
     })
     this.wsp.open()
     this.wsp.onOpen.addListener(async () => {
@@ -92,9 +83,7 @@ module.exports = class eWeLinkWS {
         this.log('Sending WS login request.')
       }
       try {
-        const res = await this.wsp.sendRequest(payload, {
-          requestId: sequence
-        })
+        const res = await this.wsp.sendRequest(payload, { requestId: sequence })
         if (Object.prototype.hasOwnProperty.call(res, 'config') && res.config.hb && res.config.hbInterval && !this.hbInterval) {
           this.hbInterval = setInterval(() => {
             this.wsp.send('ping')
@@ -157,9 +146,7 @@ module.exports = class eWeLinkWS {
       } else if (Object.prototype.hasOwnProperty.call(device, 'error') && device.error === 0) {
         // *** Safe to ignore these messages *** \\
       } else {
-        if (this.debug) {
-          this.log.warn('WS unknown command received.\n' + JSON.stringify(device, null, 2))
-        }
+        if (this.debug) this.log.warn('WS unknown command received.\n' + JSON.stringify(device, null, 2))
       }
     })
     this.wsp.onClose.addListener(async e => {
@@ -212,9 +199,7 @@ module.exports = class eWeLinkWS {
         } else if (this.debug) {
           this.log('WS message sent.')
         }
-        const device = await this.wsp.sendRequest(jsonToSend, {
-          requestId: sequence
-        })
+        const device = await this.wsp.sendRequest(jsonToSend, { requestId: sequence })
         device.error = Object.prototype.hasOwnProperty.call(device, 'error') ? device.error : 504
         switch (device.error) {
           case 0:
@@ -249,15 +234,15 @@ module.exports = class eWeLinkWS {
     if (this.wsp && this.wsIsOpen) {
       this.wsp.send(JSON.stringify(json))
       if (this.debugReqRes) {
-        const msg = JSON.stringify(json, null, 2).replace(json.apikey, '**hidden**').replace(json.apiKey, '**hidden**').replace(json.deviceid, '**hidden**')
+        const msg = JSON.stringify(json, null, 2)
+          .replace(json.apiKey, '**hidden**')
+          .replace(json.deviceid, '**hidden**')
         this.log.warn('WS message sent. This text is yellow for clarity.\n%s', msg)
       } else if (this.debug) {
         this.log('WS message sent.')
       }
     } else {
-      if (this.debug) {
-        this.log.warn('Command will be resent when WS is reconnected.')
-      }
+      if (this.debug) this.log.warn('Command will be resent when WS is reconnected.')
       await utils.sleep(30000)
       return this.requestUpdate(accessory)
     }

From 7fab41c20f2a15601b0aa3146a6cef2228fe6ee5 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 6 Oct 2020 09:19:12 +0100
Subject: [PATCH 0366/3183] delay fan speed request

---
 lib/device/fan.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/device/fan.js b/lib/device/fan.js
index 3c97c192..54192e8a 100644
--- a/lib/device/fan.js
+++ b/lib/device/fan.js
@@ -42,7 +42,7 @@ module.exports = class deviceFan {
           newPower = value >= 33 ? 1 : 0
           newSpeed = value
           newLight = lightService.getCharacteristic(Characteristic.On).value
-          await utils.sleep(500)
+          await utils.sleep(1000)
           break
         case 'light':
           newPower = fanService.getCharacteristic(Characteristic.Active).value

From 4eb237360cc91e4a430542076257ff55d6b53909 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 6 Oct 2020 09:19:56 +0100
Subject: [PATCH 0367/3183] 3.4.0-5

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index cfd33573..9b45a1df 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.4.0-4",
+  "version": "3.4.0-5",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 8f3d1938..654264ab 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.4.0-4",
+  "version": "3.4.0-5",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 662c5588dc5951d10c7591590f9a3c70b208861b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 6 Oct 2020 09:47:22 +0100
Subject: [PATCH 0368/3183] disable ifan lan mode

---
 lib/constants.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/constants.js b/lib/constants.js
index 5596f43f..fa7a1e88 100644
--- a/lib/constants.js
+++ b/lib/constants.js
@@ -5,7 +5,7 @@ module.exports = {
   httpRetryCodes: ['ENOTFOUND', 'ETIMEDOUT', 'EAI_AGAIN'],
   allowedGroups: ['blind', 'garage', 'garage_eachen', 'lock', 'valve'],
   devicesHideable: ['switch', 'light'],
-  devicesNonLAN: [22, 28, 59, 102],
+  devicesNonLAN: [22, 28, 34, 59, 102],
   devicesSingleSwitch: [1, 5, 6, 14, 15, 22, 24, 27, 32, 36, 44, 59],
   devicesMultiSwitch: [2, 3, 4, 7, 8, 9, 29, 30, 31, 34, 41],
   devicesSingleSwitchLight: ['T1 1C', 'L1', 'B1', 'B1_R2', 'TX1C', 'D1', 'D1R1', 'KING-M4', 'Slampher', 'GTTA59'],

From 522b9df1e35a4ccd58ed0a62946a33dd5aa9ba12 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 6 Oct 2020 09:47:30 +0100
Subject: [PATCH 0369/3183] delay to power not speed

---
 lib/device/fan.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/device/fan.js b/lib/device/fan.js
index 54192e8a..7ce45545 100644
--- a/lib/device/fan.js
+++ b/lib/device/fan.js
@@ -37,12 +37,12 @@ module.exports = class deviceFan {
           newPower = value
           newSpeed = value ? 33 : 0
           newLight = lightService.getCharacteristic(Characteristic.On).value
+          await utils.sleep(500)
           break
         case 'speed':
           newPower = value >= 33 ? 1 : 0
           newSpeed = value
           newLight = lightService.getCharacteristic(Characteristic.On).value
-          await utils.sleep(1000)
           break
         case 'light':
           newPower = fanService.getCharacteristic(Characteristic.Active).value

From 7cf7a8577a27a1ab0ab8af226f50406b567590ef Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 6 Oct 2020 09:48:31 +0100
Subject: [PATCH 0370/3183] 3.4.0-6

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 9b45a1df..c5cd0baa 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.4.0-5",
+  "version": "3.4.0-6",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 654264ab..69e4604b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.4.0-5",
+  "version": "3.4.0-6",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 4469086379ea412d20724a89bcaad5a31297144d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 6 Oct 2020 10:00:59 +0100
Subject: [PATCH 0371/3183] skip lan for non supported

---
 lib/eWeLink.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index ba0235a8..89c4a133 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -514,7 +514,12 @@ class eWeLink {
       deviceid: accessory.context.eweDeviceId,
       params
     }
-    const res = await this.lanClient.sendUpdate(payload)
+    let res
+    if (cns.devicesNonLAN.includes(accessory.context.eweUIID)) {
+      res = "device doesn't support LAN mode"
+    } else {
+      res = await this.lanClient.sendUpdate(payload)
+    }
     if (res !== 'ok') {
       if (accessory.context.reachableWAN) {
         if (this.debug) {

From b4b5b79311b3f7a1106817a652f22df3a9281b37 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 6 Oct 2020 10:01:09 +0100
Subject: [PATCH 0372/3183] ignore lan update

---
 lib/device/fan.js | 27 ++++++++++-----------------
 1 file changed, 10 insertions(+), 17 deletions(-)

diff --git a/lib/device/fan.js b/lib/device/fan.js
index 7ce45545..6c11ee32 100644
--- a/lib/device/fan.js
+++ b/lib/device/fan.js
@@ -66,13 +66,12 @@ module.exports = class deviceFan {
 
   async externalUpdate (accessory, params) {
     try {
-      let light
-      let status
-      let speed
-      const lightService = accessory.getService(Service.Lightbulb)
-      const fanService = accessory.getService(Service.Fanv2)
-      if (Array.isArray(params.switches)) {
-        light = params.switches[0].switch === 'on'
+      if (params.switches && Array.isArray(params.switches)) {
+        const lightService = accessory.getService(Service.Lightbulb)
+        const fanService = accessory.getService(Service.Fanv2)
+        const light = params.switches[0].switch === 'on'
+        let status
+        let speed
         switch (params.switches[1].switch + params.switches[2].switch + params.switches[3].switch) {
           default:
             status = 0
@@ -90,17 +89,11 @@ module.exports = class deviceFan {
             status = 1
             speed = 99
         }
-      } else if (Object.prototype.hasOwnProperty.call(params, 'light') && Object.prototype.hasOwnProperty.call(params, 'fan') && Object.prototype.hasOwnProperty.call(params, 'speed')) {
-        light = params.light === 'on'
-        status = params.fan === 'on' ? 1 : 0
-        speed = params.speed * 33 * status
-      } else {
-        return
+        lightService.updateCharacteristic(Characteristic.On, light)
+        fanService
+          .updateCharacteristic(Characteristic.Active, status)
+          .updateCharacteristic(Characteristic.RotationSpeed, speed)
       }
-      lightService.updateCharacteristic(Characteristic.On, light)
-      fanService
-        .updateCharacteristic(Characteristic.Active, status)
-        .updateCharacteristic(Characteristic.RotationSpeed, speed)
     } catch (err) {
       this.platform.deviceUpdateError(accessory, err, false)
     }

From 9c70f754f58876e00292ac0d860a20c61312f688 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 6 Oct 2020 10:01:43 +0100
Subject: [PATCH 0373/3183] 3.4.0-7

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c5cd0baa..48dda852 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.4.0-6",
+  "version": "3.4.0-7",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 69e4604b..f7f18159 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.4.0-6",
+  "version": "3.4.0-7",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 727bd76602625b9754bbc978aeeb121e7031a0f8 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 6 Oct 2020 10:05:31 +0100
Subject: [PATCH 0374/3183] Update fan.js

---
 lib/device/fan.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/device/fan.js b/lib/device/fan.js
index 6c11ee32..cbe2dc77 100644
--- a/lib/device/fan.js
+++ b/lib/device/fan.js
@@ -37,12 +37,12 @@ module.exports = class deviceFan {
           newPower = value
           newSpeed = value ? 33 : 0
           newLight = lightService.getCharacteristic(Characteristic.On).value
-          await utils.sleep(500)
           break
         case 'speed':
           newPower = value >= 33 ? 1 : 0
           newSpeed = value
           newLight = lightService.getCharacteristic(Characteristic.On).value
+          await utils.sleep(500)
           break
         case 'light':
           newPower = fanService.getCharacteristic(Characteristic.Active).value

From e352372812baa0cf15397375a901eb53c94ef86f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 6 Oct 2020 10:06:07 +0100
Subject: [PATCH 0375/3183] 3.4.0-8

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 48dda852..848def5f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.4.0-7",
+  "version": "3.4.0-8",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index f7f18159..8a30734b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.4.0-7",
+  "version": "3.4.0-8",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 71ff7a89bfc339e497f949f1023fa9f72ec68494 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 6 Oct 2020 10:23:35 +0100
Subject: [PATCH 0376/3183] debug fan

---
 lib/device/fan.js | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/lib/device/fan.js b/lib/device/fan.js
index cbe2dc77..d5b87fc1 100644
--- a/lib/device/fan.js
+++ b/lib/device/fan.js
@@ -59,6 +59,14 @@ module.exports = class deviceFan {
       fanService
         .updateCharacteristic(Characteristic.Active, newPower)
         .updateCharacteristic(Characteristic.RotationSpeed, newSpeed)
+      this.platform.log.error('**********************************************')
+      this.platform.log.error(
+        'INTERNAL FAN UPDATE: light [%s] power [%s] speed [%s%]',
+        newLight ? 'on' : 'off',
+        newPower ? 'on' : 'off',
+        newSpeed
+      )
+      this.platform.log.error('**********************************************')
     } catch (err) {
       this.platform.deviceUpdateError(accessory, err, true)
     }
@@ -93,6 +101,15 @@ module.exports = class deviceFan {
         fanService
           .updateCharacteristic(Characteristic.Active, status)
           .updateCharacteristic(Characteristic.RotationSpeed, speed)
+
+        this.platform.log.error('**********************************************')
+        this.platform.log.error(
+          'EXTERNAL FAN UPDATE: light [%s] power [%s] speed [%s%]',
+          light ? 'on' : 'off',
+          status ? 'on' : 'off',
+          speed
+        )
+        this.platform.log.error('**********************************************')
       }
     } catch (err) {
       this.platform.deviceUpdateError(accessory, err, false)

From 45df959c4254606fb29ba977e6c9a80c1e05a3f5 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 6 Oct 2020 10:23:44 +0100
Subject: [PATCH 0377/3183] remove fan lan params

---
 lib/constants.js | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/lib/constants.js b/lib/constants.js
index fa7a1e88..5418c20d 100644
--- a/lib/constants.js
+++ b/lib/constants.js
@@ -28,14 +28,13 @@ module.exports = {
     'battery', 'bright', 'brightness',
     'channel', 'cmd', 'colorB', 'colorG',
     'colorR', 'current', 'currentHumidity',
-    'currentTemperature', 'fan', 'humidity',
-    'key', 'light', 'lock', 'mainSwitch',
-    'mode', 'motion', 'online', 'power',
-    'rfChl', 'rfList', 'rfTrig',
-    'sensorType', 'setclose', 'speed',
-    'state', 'switch', 'switches',
-    'temperature', 'trigTime', 'type',
-    'voltage', 'zyx_mode'
+    'currentTemperature', 'humidity',
+    'key', 'lock', 'mainSwitch', 'mode',
+    'motion', 'online', 'power', 'rfChl',
+    'rfList', 'rfTrig', 'sensorType',
+    'setclose', 'state', 'switch',
+    'switches', 'temperature', 'trigTime',
+    'type', 'voltage', 'zyx_mode'
   ],
   defaultMultiSwitchOff: [{
     switch: 'off',

From a719e3d93b2614c58da9657fdf6ad6d3102ceca7 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 6 Oct 2020 10:24:44 +0100
Subject: [PATCH 0378/3183] 3.4.0-9

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 848def5f..b413d338 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.4.0-8",
+  "version": "3.4.0-9",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 8a30734b..0bf49a57 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.4.0-8",
+  "version": "3.4.0-9",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 79a3058553ac1a0714afc27721f97b632bc5efe7 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 6 Oct 2020 11:04:01 +0100
Subject: [PATCH 0379/3183] Update fan.js

---
 lib/device/fan.js | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/lib/device/fan.js b/lib/device/fan.js
index d5b87fc1..3e12cc04 100644
--- a/lib/device/fan.js
+++ b/lib/device/fan.js
@@ -11,7 +11,7 @@ module.exports = class deviceFan {
     const fanLightService = accessory.getService(Service.Lightbulb) || accessory.addService(Service.Lightbulb)
     fanService
       .getCharacteristic(Characteristic.Active)
-      .on('set', (value, callback) => this.internalUpdate(accessory, 'power', value, callback))
+      .on('set', (value, callback) => callback())
     fanService
       .getCharacteristic(Characteristic.RotationSpeed)
       .on('set', (value, callback) => this.internalUpdate(accessory, 'speed', value, callback))
@@ -33,16 +33,10 @@ module.exports = class deviceFan {
       const fanService = accessory.getService(Service.Fanv2)
       const params = { switches: cns.defaultMultiSwitchOff }
       switch (type) {
-        case 'power':
-          newPower = value
-          newSpeed = value ? 33 : 0
-          newLight = lightService.getCharacteristic(Characteristic.On).value
-          break
         case 'speed':
           newPower = value >= 33 ? 1 : 0
           newSpeed = value
           newLight = lightService.getCharacteristic(Characteristic.On).value
-          await utils.sleep(500)
           break
         case 'light':
           newPower = fanService.getCharacteristic(Characteristic.Active).value
@@ -54,12 +48,13 @@ module.exports = class deviceFan {
       params.switches[1].switch = newPower === 1 && newSpeed >= 33 ? 'on' : 'off'
       params.switches[2].switch = newPower === 1 && newSpeed >= 66 && newSpeed < 99 ? 'on' : 'off'
       params.switches[3].switch = newPower === 1 && newSpeed >= 99 ? 'on' : 'off'
-      await this.platform.sendDeviceUpdate(accessory, params)
+      
       lightService.updateCharacteristic(Characteristic.On, newLight)
       fanService
         .updateCharacteristic(Characteristic.Active, newPower)
         .updateCharacteristic(Characteristic.RotationSpeed, newSpeed)
       this.platform.log.error('**********************************************')
+      this.platform.log.error('updating %s characteristic', type)
       this.platform.log.error(
         'INTERNAL FAN UPDATE: light [%s] power [%s] speed [%s%]',
         newLight ? 'on' : 'off',
@@ -67,6 +62,7 @@ module.exports = class deviceFan {
         newSpeed
       )
       this.platform.log.error('**********************************************')
+      await this.platform.sendDeviceUpdate(accessory, params)
     } catch (err) {
       this.platform.deviceUpdateError(accessory, err, true)
     }

From 767d00c29ffd880622d35583dbf3be23a5d5d90e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 6 Oct 2020 11:05:34 +0100
Subject: [PATCH 0380/3183] 3.4.0-10

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b413d338..2d5bc597 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.4.0-9",
+  "version": "3.4.0-10",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 0bf49a57..9c647b74 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.4.0-9",
+  "version": "3.4.0-10",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From ec916dc98d2d891e424b2d06418a379638cd665a Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 6 Oct 2020 11:33:39 +0100
Subject: [PATCH 0381/3183] Update fan.js

---
 lib/device/fan.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/device/fan.js b/lib/device/fan.js
index 3e12cc04..80c56311 100644
--- a/lib/device/fan.js
+++ b/lib/device/fan.js
@@ -11,7 +11,13 @@ module.exports = class deviceFan {
     const fanLightService = accessory.getService(Service.Lightbulb) || accessory.addService(Service.Lightbulb)
     fanService
       .getCharacteristic(Characteristic.Active)
-      .on('set', (value, callback) => callback())
+      .on('set', async (value, callback) => {
+        callback()
+        if (value === 0) {
+          await utils.sleep(500)
+          fanService.setCharacteristic(Characteristic.RotationSpeed, 0)
+        }
+      })
     fanService
       .getCharacteristic(Characteristic.RotationSpeed)
       .on('set', (value, callback) => this.internalUpdate(accessory, 'speed', value, callback))

From 2b987ae3b146dd09b5f750832fca2c4553d49a90 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 6 Oct 2020 11:34:36 +0100
Subject: [PATCH 0382/3183] 3.4.0-11

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 2d5bc597..7def0a7e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.4.0-10",
+  "version": "3.4.0-11",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 9c647b74..4c0894c7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.4.0-10",
+  "version": "3.4.0-11",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 5ccc96f0d2f59cc0d94f117579309326b5af97bb Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 6 Oct 2020 12:58:29 +0100
Subject: [PATCH 0383/3183] new utils function

---
 lib/device/blind.js         |  2 +-
 lib/device/curtain.js       |  3 ++-
 lib/device/fan.js           |  2 +-
 lib/device/garage-eachen.js |  2 +-
 lib/device/garage.js        |  2 +-
 lib/device/light.js         | 18 +++++++++---------
 lib/device/lock.js          |  2 +-
 lib/device/outlet.js        |  9 +++++----
 lib/device/rf-bridge.js     | 14 +++++++-------
 lib/device/scm.js           |  3 ++-
 lib/device/sensor.js        |  4 ++--
 lib/device/switch.js        |  5 +++--
 lib/device/thermostat.js    | 11 ++++++-----
 lib/device/usb.js           |  3 ++-
 lib/device/valve.js         |  3 ++-
 lib/device/zb-dev.js        | 17 +++++++++--------
 lib/utils.js                |  3 +++
 17 files changed, 57 insertions(+), 46 deletions(-)

diff --git a/lib/device/blind.js b/lib/device/blind.js
index 3259d21a..06e88c34 100644
--- a/lib/device/blind.js
+++ b/lib/device/blind.js
@@ -81,6 +81,6 @@ module.exports = class deviceBlind {
   }
 
   async externalUpdate (accessory, params) {
-    return true
+    return
   }
 }
diff --git a/lib/device/curtain.js b/lib/device/curtain.js
index 2f5f7c6c..6e16002c 100644
--- a/lib/device/curtain.js
+++ b/lib/device/curtain.js
@@ -1,5 +1,6 @@
 'use strict'
 let Characteristic, Service
+const utils = require('./../utils')
 module.exports = class deviceCurtain {
   constructor (platform, accessory) {
     this.platform = platform
@@ -49,7 +50,7 @@ module.exports = class deviceCurtain {
   async externalUpdate (accessory, params) {
     try {
       const cService = accessory.getService(Service.WindowCovering)
-      if (!Object.prototype.hasOwnProperty.call(params, 'switch') && !Object.prototype.hasOwnProperty.call(params, 'setclose')) {
+      if (!utils.hasProperty(params, 'switch') && !utils.hasProperty(params, 'setclose')) {
         return
       }
       const newPos = Math.abs(100 - parseInt(params.setclose))
diff --git a/lib/device/fan.js b/lib/device/fan.js
index 80c56311..b3f35499 100644
--- a/lib/device/fan.js
+++ b/lib/device/fan.js
@@ -54,7 +54,7 @@ module.exports = class deviceFan {
       params.switches[1].switch = newPower === 1 && newSpeed >= 33 ? 'on' : 'off'
       params.switches[2].switch = newPower === 1 && newSpeed >= 66 && newSpeed < 99 ? 'on' : 'off'
       params.switches[3].switch = newPower === 1 && newSpeed >= 99 ? 'on' : 'off'
-      
+
       lightService.updateCharacteristic(Characteristic.On, newLight)
       fanService
         .updateCharacteristic(Characteristic.Active, newPower)
diff --git a/lib/device/garage-eachen.js b/lib/device/garage-eachen.js
index 584319c2..1551541d 100644
--- a/lib/device/garage-eachen.js
+++ b/lib/device/garage-eachen.js
@@ -52,7 +52,7 @@ module.exports = class deviceGarageEachen {
 
   async externalUpdate (accessory, params) {
     try {
-      if (!Object.prototype.hasOwnProperty.call(params, 'switch') || accessory.context.inUse) {
+      if (!utils.hasProperty(params, 'switch') || accessory.context.inUse) {
         return
       }
       let garageConfig
diff --git a/lib/device/garage.js b/lib/device/garage.js
index 5341153c..d4f6a46c 100644
--- a/lib/device/garage.js
+++ b/lib/device/garage.js
@@ -86,7 +86,7 @@ module.exports = class deviceGarage {
 
   async externalUpdate (accessory, params) {
     try {
-      if (!Object.prototype.hasOwnProperty.call(params, 'switch') && !Object.prototype.hasOwnProperty.call(params, 'switches')) {
+      if (!utils.hasProperty(params, 'switch') && !utils.hasProperty(params, 'switches')) {
         return
       }
       let garageConfig
diff --git a/lib/device/light.js b/lib/device/light.js
index 066b0daf..6ee8f58b 100644
--- a/lib/device/light.js
+++ b/lib/device/light.js
@@ -216,9 +216,9 @@ module.exports = class deviceLight {
         let mode
         let isOn = false
         const lightService = accessory.getService(Service.Lightbulb)
-        if (accessory.context.eweUIID === 22 && Object.prototype.hasOwnProperty.call(params, 'state')) {
+        if (accessory.context.eweUIID === 22 && utils.hasProperty(params, 'state')) {
           isOn = params.state === 'on'
-        } else if (accessory.context.eweUIID !== 22 && Object.prototype.hasOwnProperty.call(params, 'switch')) {
+        } else if (accessory.context.eweUIID !== 22 && utils.hasProperty(params, 'switch')) {
           isOn = params.switch === 'on'
         } else {
           isOn = lightService.getCharacteristic(Characteristic.On).value
@@ -227,20 +227,20 @@ module.exports = class deviceLight {
           lightService.updateCharacteristic(Characteristic.On, true)
           switch (accessory.context.eweUIID) {
             case 36: // KING-M4
-              if (Object.prototype.hasOwnProperty.call(params, 'bright')) {
+              if (utils.hasProperty(params, 'bright')) {
                 const nb = Math.round(((params.bright - 10) * 10) / 9) // eWeLink scale is 10-100 and HomeKit scale is 0-100.
                 lightService.updateCharacteristic(Characteristic.Brightness, nb)
               }
               break
             case 44: // D1
-              if (Object.prototype.hasOwnProperty.call(params, 'brightness')) {
+              if (utils.hasProperty(params, 'brightness')) {
                 lightService.updateCharacteristic(Characteristic.Brightness, params.brightness)
               }
               break
             case 22: // B1
-              if (Object.prototype.hasOwnProperty.call(params, 'zyx_mode')) {
+              if (utils.hasProperty(params, 'zyx_mode')) {
                 mode = parseInt(params.zyx_mode)
-              } else if (Object.prototype.hasOwnProperty.call(params, 'channel0') && parseInt(params.channel0) + parseInt(params.channel1) > 0) {
+              } else if (utils.hasProperty(params, 'channel0') && parseInt(params.channel0) + parseInt(params.channel1) > 0) {
                 mode = 1
               } else {
                 mode = 2
@@ -261,10 +261,10 @@ module.exports = class deviceLight {
               }
               break
             case 59: // L1
-              if (Object.prototype.hasOwnProperty.call(params, 'bright')) {
+              if (utils.hasProperty(params, 'bright')) {
                 lightService.updateCharacteristic(Characteristic.Brightness, params.bright)
               }
-              if (Object.prototype.hasOwnProperty.call(params, 'colorR')) {
+              if (utils.hasProperty(params, 'colorR')) {
                 newColour = convert.rgb.hsv(params.colorR, params.colorG, params.colorB)
                 lightService
                   .updateCharacteristic(Characteristic.Hue, newColour[0])
@@ -281,7 +281,7 @@ module.exports = class deviceLight {
         cns.devicesMultiSwitch.includes(accessory.context.eweUIID) &&
         cns.devicesMultiSwitchLight.includes(accessory.context.eweModel)
       ) {
-        if (!Object.prototype.hasOwnProperty.call(params, 'switches')) return
+        if (!utils.hasProperty(params, 'switches')) return
         const idToCheck = accessory.context.hbDeviceId.slice(0, -1)
         let primaryState = false
         for (let i = 1; i <= accessory.context.channelCount; i++) {
diff --git a/lib/device/lock.js b/lib/device/lock.js
index 6996f00b..eed6ef29 100644
--- a/lib/device/lock.js
+++ b/lib/device/lock.js
@@ -43,7 +43,7 @@ module.exports = class deviceLock {
 
   async externalUpdate (accessory, params) {
     try {
-      if (!Object.prototype.hasOwnProperty.call(params, 'switch')) return
+      if (!utils.hasProperty(params, 'switch')) return
       let lockConfig
       const lmService = accessory.getService(Service.LockMechanism)
       if (!(lockConfig = this.platform.cusG.get(accessory.context.hbDeviceId))) {
diff --git a/lib/device/outlet.js b/lib/device/outlet.js
index fe05aebe..ae2a1419 100644
--- a/lib/device/outlet.js
+++ b/lib/device/outlet.js
@@ -4,6 +4,7 @@ const cns = require('./../constants')
 const corrInterval = require('correcting-interval')
 const fakegato = require('fakegato-history')
 const hbLib = require('homebridge-lib')
+const utils = require('./../utils')
 module.exports = class deviceOutlet {
   constructor (platform, accessory) {
     this.platform = platform
@@ -125,13 +126,13 @@ module.exports = class deviceOutlet {
   async externalUpdate (accessory, params) {
     try {
       const outletService = accessory.getService(Service.Outlet)
-      if (Object.prototype.hasOwnProperty.call(params, 'switch')) {
+      if (utils.hasProperty(params, 'switch')) {
         outletService.updateCharacteristic(Characteristic.On, params.switch === 'on')
         if (cns.devicesSingleSwitchOutlet.includes(accessory.context.eweModel) || this.platform.config.disableEveLogging) {
           outletService.updateCharacteristic(Characteristic.OutletInUse, params.switch === 'on')
         }
       }
-      if (Object.prototype.hasOwnProperty.call(params, 'power')) {
+      if (utils.hasProperty(params, 'power')) {
         outletService.updateCharacteristic(EveService.Characteristics.CurrentConsumption, parseFloat(params.power))
         if (!cns.devicesSingleSwitchOutlet.includes(accessory.context.eweModel) && !this.platform.config.disableEveLogging) {
           outletService.updateCharacteristic(
@@ -145,10 +146,10 @@ module.exports = class deviceOutlet {
           })
         }
       }
-      if (Object.prototype.hasOwnProperty.call(params, 'voltage')) {
+      if (utils.hasProperty(params, 'voltage')) {
         outletService.updateCharacteristic(EveService.Characteristics.Voltage, parseFloat(params.voltage))
       }
-      if (Object.prototype.hasOwnProperty.call(params, 'current')) {
+      if (utils.hasProperty(params, 'current')) {
         outletService.updateCharacteristic(EveService.Characteristics.ElectricCurrent, parseFloat(params.current))
       }
     } catch (err) {
diff --git a/lib/device/rf-bridge.js b/lib/device/rf-bridge.js
index a791b1ef..d1072925 100644
--- a/lib/device/rf-bridge.js
+++ b/lib/device/rf-bridge.js
@@ -61,15 +61,15 @@ module.exports = class deviceRFBridge {
 
   async externalUpdate (accessory, params) {
     try {
-      if (!Object.prototype.hasOwnProperty.call(params, 'updateSource')) return
+      if (!utils.hasProperty(params, 'updateSource')) return
       const timeNow = new Date()
       let oAccessory = false
-      if (Object.prototype.hasOwnProperty.call(params, 'cmd') && params.cmd === 'transmit' && Object.prototype.hasOwnProperty.call(params, 'rfChl')) {
+      if (utils.hasProperty(params, 'cmd') && params.cmd === 'transmit' && utils.hasProperty(params, 'rfChl')) {
         this.platform.devicesInHB.forEach(acc => {
           if (
             acc.context.eweDeviceId === accessory.context.eweDeviceId &&
-            Object.prototype.hasOwnProperty.call(acc.context, 'buttons') &&
-            Object.prototype.hasOwnProperty.call(acc.context.buttons, params.rfChl.toString())
+            utils.hasProperty(acc.context, 'buttons') &&
+            utils.hasProperty(acc.context.buttons, params.rfChl.toString())
           ) {
             oAccessory = acc
           }
@@ -86,7 +86,7 @@ module.exports = class deviceRFBridge {
         } else {
           throw new Error('rf button not found in Homebridge')
         }
-      } else if (Object.prototype.hasOwnProperty.call(params, 'cmd') && params.cmd === 'trigger') {
+      } else if (utils.hasProperty(params, 'cmd') && params.cmd === 'trigger') {
         //* ** RF Sensor ***\\
         Object.keys(params)
           .filter(name => /rfTrig/.test(name))
@@ -94,8 +94,8 @@ module.exports = class deviceRFBridge {
             this.platform.devicesInHB.forEach(acc => {
               if (
                 acc.context.eweDeviceId === accessory.context.eweDeviceId &&
-                Object.prototype.hasOwnProperty.call(acc.context, 'buttons') &&
-                Object.prototype.hasOwnProperty.call(acc.context.buttons, chan.substr(-1).toString())
+                utils.hasProperty(acc.context, 'buttons') &&
+                utils.hasProperty(acc.context.buttons, chan.substr(-1).toString())
               ) {
                 oAccessory = acc
               }
diff --git a/lib/device/scm.js b/lib/device/scm.js
index 8c62b37f..8f22a3e2 100644
--- a/lib/device/scm.js
+++ b/lib/device/scm.js
@@ -1,6 +1,7 @@
 'use strict'
 let Characteristic, Service
 const cns = require('./../constants')
+const utils = require('./../utils')
 module.exports = class deviceSCM {
   constructor (platform, accessory) {
     this.platform = platform
@@ -29,7 +30,7 @@ module.exports = class deviceSCM {
 
   async externalUpdate (accessory, params) {
     try {
-      if (!Object.prototype.hasOwnProperty.call(params, 'switches')) return
+      if (!utils.hasProperty(params, 'switches')) return
       accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, params.switches[0].switch === 'on')
     } catch (err) {
       this.platform.deviceUpdateError(accessory, err, false)
diff --git a/lib/device/sensor.js b/lib/device/sensor.js
index dac9afc2..f8eb9c6e 100644
--- a/lib/device/sensor.js
+++ b/lib/device/sensor.js
@@ -12,7 +12,7 @@ module.exports = class deviceSensor {
 
   async externalUpdate (accessory, params) {
     try {
-      if (Object.prototype.hasOwnProperty.call(params, 'battery')) {
+      if (utils.hasProperty(params, 'battery')) {
         const batteryService =
             accessory.getService(Service.BatteryService) || accessory.addService(Service.BatteryService)
         const scaledBattery = Math.round(params.battery * 33.3)
@@ -22,7 +22,7 @@ module.exports = class deviceSensor {
           scaledBattery < (this.platform.config.lowBattThreshold || 25)
         )
       }
-      if (!Object.prototype.hasOwnProperty.call(params, 'switch')) return
+      if (!utils.hasProperty(params, 'switch')) return
       const newState = params.switch === 'on' ? 1 : 0
       let oAccessory = false
       const contactService = accessory.getService(Service.ContactSensor)
diff --git a/lib/device/switch.js b/lib/device/switch.js
index 97ee0293..ceb5f110 100644
--- a/lib/device/switch.js
+++ b/lib/device/switch.js
@@ -1,6 +1,7 @@
 'use strict'
 let Characteristic, Service
 const cns = require('./../constants')
+const utils = require('./../utils')
 module.exports = class deviceSwitch {
   constructor (platform, accessory) {
     this.platform = platform
@@ -89,10 +90,10 @@ module.exports = class deviceSwitch {
   async externalUpdate (accessory, params) {
     try {
       if (cns.devicesSingleSwitch.includes(accessory.context.eweUIID)) {
-        if (!Object.prototype.hasOwnProperty.call(params, 'switch')) return
+        if (!utils.hasProperty(params, 'switch')) return
         accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, params.switch === 'on')
       } else if (cns.devicesMultiSwitch.includes(accessory.context.eweUIID)) {
-        if (!Object.prototype.hasOwnProperty.call(params, 'switches')) return
+        if (!utils.hasProperty(params, 'switches')) return
         const idToCheck = accessory.context.hbDeviceId.slice(0, -1)
         let primaryState = false
         for (let i = 1; i <= accessory.context.channelCount; i++) {
diff --git a/lib/device/thermostat.js b/lib/device/thermostat.js
index 5fd997ac..934314a8 100644
--- a/lib/device/thermostat.js
+++ b/lib/device/thermostat.js
@@ -2,6 +2,7 @@
 let Characteristic, EveHistoryService, Service
 const corrInterval = require('correcting-interval')
 const fakegato = require('fakegato-history')
+const utils = require('./../utils')
 module.exports = class deviceThermostat {
   constructor (platform, accessory) {
     this.platform = platform
@@ -58,23 +59,23 @@ module.exports = class deviceThermostat {
     try {
       if (
         !this.platform.config.hideTHSwitch &&
-        (Object.prototype.hasOwnProperty.call(params, 'switch') || Object.prototype.hasOwnProperty.call(params, 'mainSwitch'))
+        (utils.hasProperty(params, 'switch') || utils.hasProperty(params, 'mainSwitch'))
       ) {
-        const newState = Object.prototype.hasOwnProperty.call(params, 'switch') ? params.switch === 'on' : params.mainSwitch === 'on'
+        const newState = utils.hasProperty(params, 'switch') ? params.switch === 'on' : params.mainSwitch === 'on'
         const switchService = accessory.getService(Service.Switch)
         switchService.updateCharacteristic(Characteristic.On, newState)
       }
       const eveLog = {
         time: Date.now()
       }
-      if (Object.prototype.hasOwnProperty.call(params, 'currentTemperature') && accessory.getService(Service.TemperatureSensor)) {
+      if (utils.hasProperty(params, 'currentTemperature') && accessory.getService(Service.TemperatureSensor)) {
         const currentTemp = parseFloat(params.currentTemperature !== 'unavailable' ? params.currentTemperature : 0)
         accessory
           .getService(Service.TemperatureSensor)
           .updateCharacteristic(Characteristic.CurrentTemperature, currentTemp)
         eveLog.temp = currentTemp
       }
-      if (Object.prototype.hasOwnProperty.call(params, 'currentHumidity') && accessory.getService(Service.HumiditySensor)) {
+      if (utils.hasProperty(params, 'currentHumidity') && accessory.getService(Service.HumiditySensor)) {
         const currentHumi = parseFloat(params.currentHumidity !== 'unavailable' ? params.currentHumidity : 0)
         accessory
           .getService(Service.HumiditySensor)
@@ -82,7 +83,7 @@ module.exports = class deviceThermostat {
         eveLog.humidity = currentHumi
       }
       if (!this.platform.config.disableEveLogging) {
-        if (Object.prototype.hasOwnProperty.call(eveLog, 'temp') || Object.prototype.hasOwnProperty.call(eveLog, 'humidity')) {
+        if (utils.hasProperty(eveLog, 'temp') || utils.hasProperty(eveLog, 'humidity')) {
           accessory.eveLogger.addEntry(eveLog)
         }
       }
diff --git a/lib/device/usb.js b/lib/device/usb.js
index 6c230010..eda32d7c 100644
--- a/lib/device/usb.js
+++ b/lib/device/usb.js
@@ -1,6 +1,7 @@
 'use strict'
 let Characteristic, Service
 const cns = require('./../constants')
+const utils = require('./../utils')
 module.exports = class deviceUSB {
   constructor (platform, accessory) {
     this.platform = platform
@@ -29,7 +30,7 @@ module.exports = class deviceUSB {
 
   async externalUpdate (accessory, params) {
     try {
-      if (!Object.prototype.hasOwnProperty.call(params, 'switches')) return
+      if (!utils.hasProperty(params, 'switches')) return
       accessory.getService(Service.Outlet).updateCharacteristic(Characteristic.On, params.switches[0].switch === 'on')
     } catch (err) {
       this.platform.deviceUpdateError(accessory, err, false)
diff --git a/lib/device/valve.js b/lib/device/valve.js
index 67bf6d30..ee41f284 100644
--- a/lib/device/valve.js
+++ b/lib/device/valve.js
@@ -1,5 +1,6 @@
 'use strict'
 let Characteristic, Service
+const utils = require('./../utils')
 module.exports = class deviceValve {
   constructor (platform, accessory) {
     this.platform = platform
@@ -87,7 +88,7 @@ module.exports = class deviceValve {
 
   async externalUpdate (accessory, params) {
     try {
-      if (!Object.prototype.hasOwnProperty.call(params, 'switches')) return
+      if (!utils.hasProperty(params, 'switches')) return
       let valveConfig
       if (!(valveConfig = this.platform.cusG.get(accessory.context.hbDeviceId))) {
         throw new Error('group config missing')
diff --git a/lib/device/zb-dev.js b/lib/device/zb-dev.js
index 478544b1..e1ca5434 100644
--- a/lib/device/zb-dev.js
+++ b/lib/device/zb-dev.js
@@ -2,6 +2,7 @@
 let Characteristic, Service, EveHistoryService
 const corrInterval = require('correcting-interval')
 const fakegato = require('fakegato-history')
+const utils = require('./../utils')
 module.exports = class deviceZBDev {
   constructor (platform, accessory) {
     this.platform = platform
@@ -54,7 +55,7 @@ module.exports = class deviceZBDev {
   async externalUpdate (accessory, params) {
     try {
       //* ** credit @tasict ***\\
-      if (Object.prototype.hasOwnProperty.call(params, 'battery')) {
+      if (utils.hasProperty(params, 'battery')) {
         if (accessory.context.eweUIID === 3026 && this.platform.config.ZBDWBatt) {
           params.battery *= 10
         }
@@ -68,7 +69,7 @@ module.exports = class deviceZBDev {
       }
       switch (accessory.context.eweUIID) {
         case 1000:
-          if (Object.prototype.hasOwnProperty.call(params, 'key') && [0, 1, 2].includes(params.key)) {
+          if (utils.hasProperty(params, 'key') && [0, 1, 2].includes(params.key)) {
             accessory
               .getService(Service.StatelessProgrammableSwitch)
               .updateCharacteristic(Characteristic.ProgrammableSwitchEvent, params.key)
@@ -78,34 +79,34 @@ module.exports = class deviceZBDev {
           const eveLog = {
             time: Date.now()
           }
-          if (Object.prototype.hasOwnProperty.call(params, 'temperature')) {
+          if (utils.hasProperty(params, 'temperature')) {
             const currentTemp = parseInt(params.temperature) / 100
             accessory
               .getService(Service.TemperatureSensor)
               .updateCharacteristic(Characteristic.CurrentTemperature, currentTemp)
             eveLog.temp = parseFloat(currentTemp)
           }
-          if (Object.prototype.hasOwnProperty.call(params, 'humidity')) {
+          if (utils.hasProperty(params, 'humidity')) {
             const currentHumi = parseInt(params.humidity) / 100
             accessory
               .getService(Service.HumiditySensor)
               .updateCharacteristic(Characteristic.CurrentRelativeHumidity, currentHumi)
             eveLog.humidity = parseFloat(currentHumi)
           }
-          if (Object.prototype.hasOwnProperty.call(eveLog, 'temp') || Object.prototype.hasOwnProperty.call(eveLog, 'humidity')) {
+          if (utils.hasProperty(eveLog, 'temp') || utils.hasProperty(eveLog, 'humidity')) {
             accessory.eveLogger.addEntry(eveLog)
           }
           break
         }
         case 2026:
-          if (Object.prototype.hasOwnProperty.call(params, 'motion') && Object.prototype.hasOwnProperty.call(params, 'trigTime')) {
+          if (utils.hasProperty(params, 'motion') && utils.hasProperty(params, 'trigTime')) {
             const timeNow = new Date()
             const diff = (timeNow.getTime() - params.trigTime) / 1000
             accessory
               .getService(Service.MotionSensor)
               .updateCharacteristic(
                 Characteristic.MotionDetected,
-                Object.prototype.hasOwnProperty.call(params, 'updateSource') &&
+                utils.hasProperty(params, 'updateSource') &&
                   params.motion === 1 &&
                   diff < (this.platform.config.sensorTimeDifference || 120)
               )
@@ -113,7 +114,7 @@ module.exports = class deviceZBDev {
           }
           break
         case 3026:
-          if (Object.prototype.hasOwnProperty.call(params, 'lock') && [0, 1].includes(params.lock)) {
+          if (utils.hasProperty(params, 'lock') && [0, 1].includes(params.lock)) {
             accessory
               .getService(Service.ContactSensor)
               .updateCharacteristic(Characteristic.ContactSensorState, params.lock)
diff --git a/lib/utils.js b/lib/utils.js
index bf3698e8..eef849c6 100644
--- a/lib/utils.js
+++ b/lib/utils.js
@@ -2,5 +2,8 @@
 module.exports = {
   sleep: ms => {
     return new Promise(resolve => setTimeout(resolve, ms))
+  },
+  hasProperty: (obj, prop) => {
+    return Object.prototype.hasOwnProperty.call(obj, prop)
   }
 }

From cd9b5bd1f38ad1da2950d17cd78e155b1dd62b44 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 6 Oct 2020 12:58:42 +0100
Subject: [PATCH 0384/3183] shorter line lengths

---
 lib/constants.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/constants.js b/lib/constants.js
index 5418c20d..3f189523 100644
--- a/lib/constants.js
+++ b/lib/constants.js
@@ -8,7 +8,11 @@ module.exports = {
   devicesNonLAN: [22, 28, 34, 59, 102],
   devicesSingleSwitch: [1, 5, 6, 14, 15, 22, 24, 27, 32, 36, 44, 59],
   devicesMultiSwitch: [2, 3, 4, 7, 8, 9, 29, 30, 31, 34, 41],
-  devicesSingleSwitchLight: ['T1 1C', 'L1', 'B1', 'B1_R2', 'TX1C', 'D1', 'D1R1', 'KING-M4', 'Slampher', 'GTTA59'],
+  devicesSingleSwitchLight: [
+    'T1 1C', 'L1', 'B1',
+    'B1_R2', 'TX1C', 'D1', 'D1R1',
+    'KING-M4', 'Slampher', 'GTTA59'
+  ],
   devicesMultiSwitchLight: ['T1 2C', 'T1 3C', 'TX2C', 'TX3C'],
   devicesSingleSwitchOutlet: ['Sonoff Pow', 'S20', 'S26', 'S55'],
   devicesBrightable: [36, 44],

From 4a54669d3c677a72bce8b65a353c403f515a1bc2 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 6 Oct 2020 12:59:00 +0100
Subject: [PATCH 0385/3183] new utils function

---
 lib/eWeLink.js     | 14 +++++++-------
 lib/eWeLinkHTTP.js | 30 +++++++++++++++---------------
 lib/eWeLinkLAN.js  | 27 ++++++++++++++-------------
 lib/eWeLinkWS.js   | 18 +++++++++---------
 4 files changed, 45 insertions(+), 44 deletions(-)

diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index 89c4a133..b7ce7233 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -63,13 +63,13 @@ class eWeLink {
       (() => {
         if (Object.keys(this.config.groups || []).length > 0) {
           this.config.groups
-            .filter(g => Object.prototype.hasOwnProperty.call(g, 'type') && cns.allowedGroups.includes(g.type))
-            .filter(g => Object.prototype.hasOwnProperty.call(g, 'deviceId') && this.devicesInEW.has(g.deviceId))
+            .filter(g => utils.hasProperty(g, 'type') && cns.allowedGroups.includes(g.type))
+            .filter(g => utils.hasProperty(g, 'deviceId') && this.devicesInEW.has(g.deviceId))
             .forEach(g => this.cusG.set(g.deviceId + 'SWX', g))
         }
         if (Object.keys(this.config.bridgeSensors || []).length > 0) {
           this.config.bridgeSensors
-            .filter(s => Object.prototype.hasOwnProperty.call(s, 'deviceId') && this.devicesInEW.has(s.deviceId))
+            .filter(s => utils.hasProperty(s, 'deviceId') && this.devicesInEW.has(s.deviceId))
             .forEach(s => this.cusS.set(s.fullDeviceId, s))
         }
         this.log('[%s] eWeLink devices loaded from the Homebridge cache.', this.devicesInHB.size)
@@ -340,7 +340,7 @@ class eWeLink {
         *********************/
         let rfChlCounter = 0
         const rfMap = []
-        if (Object.prototype.hasOwnProperty.call(device, 'tags') && Object.prototype.hasOwnProperty.call(device.tags, 'zyx_info')) {
+        if (utils.hasProperty(device, 'tags') && utils.hasProperty(device.tags, 'zyx_info')) {
           device.tags.zyx_info.forEach(remote =>
             rfMap.push({
               name: remote.name,
@@ -444,7 +444,7 @@ class eWeLink {
       if (!accessory.context.reachableLAN) {
         if (cns.devicesNonLAN.includes(device.extra.uiid)) {
           str += "doesn't support it"
-        } else if (Object.prototype.hasOwnProperty.call(device, 'sharedBy') && Object.prototype.hasOwnProperty.call(device.sharedBy, 'email')) {
+        } else if (utils.hasProperty(device, 'sharedBy') && utils.hasProperty(device.sharedBy, 'email')) {
           str += 'is shared (' + device.sharedBy.email + ')'
         } else {
           str += 'is unreachable'
@@ -454,7 +454,7 @@ class eWeLink {
       this.devicesInHB.set(accessory.context.hbDeviceId, accessory)
       this.log(' → [%s] initialised %s.', device.name, str)
     } catch (err) {
-      const deviceName = accessory && Object.prototype.hasOwnProperty.call(accessory, 'displayName')
+      const deviceName = accessory && utils.hasProperty(accessory, 'displayName')
         ? accessory.displayName
         : device.name
       this.log.warn('[%s] could not be initialised as %s.', deviceName, this.debug ? err : err.message)
@@ -471,7 +471,7 @@ class eWeLink {
     if (['1', '2', '3', '4'].includes(switchNumber) && type !== 'rf_sub') {
       newDeviceName += ' SW' + switchNumber
     }
-    if (Object.prototype.hasOwnProperty.call(this.config.nameOverride || {}, hbDeviceId)) {
+    if (utils.hasProperty(this.config.nameOverride || {}, hbDeviceId)) {
       newDeviceName = this.config.nameOverride[hbDeviceId]
     }
     try {
diff --git a/lib/eWeLinkHTTP.js b/lib/eWeLinkHTTP.js
index 0026d303..6f46e8cc 100644
--- a/lib/eWeLinkHTTP.js
+++ b/lib/eWeLinkHTTP.js
@@ -66,7 +66,7 @@ module.exports = class eWeLinkHTTP {
       }
       return this.httpHost
     } catch (err) {
-      if (Object.prototype.hasOwnProperty.call(err, 'code') && cns.httpRetryCodes.includes(err.code)) {
+      if (utils.hasProperty(err, 'code') && cns.httpRetryCodes.includes(err.code)) {
         if (this.debug) {
           this.log.warn('Unable to reach eWeLink. Retrying in 30 seconds.')
         }
@@ -102,10 +102,10 @@ module.exports = class eWeLinkHTTP {
     })
     const body = res.data
     if (
-      Object.prototype.hasOwnProperty.call(body, 'error') &&
+      utils.hasProperty(body, 'error') &&
       body.error === 10004 &&
-      Object.prototype.hasOwnProperty.call(body, 'data') &&
-      Object.prototype.hasOwnProperty.call(body.data, 'region')
+      utils.hasProperty(body, 'data') &&
+      utils.hasProperty(body.data, 'region')
     ) {
       const givenRegion = body.data.region
       switch (givenRegion) {
@@ -159,9 +159,9 @@ module.exports = class eWeLinkHTTP {
       })
       const body = res.data
       if (
-        !Object.prototype.hasOwnProperty.call(body, 'data') ||
-        !Object.prototype.hasOwnProperty.call(body, 'error') ||
-        (Object.prototype.hasOwnProperty.call(body, 'error') && body.error !== 0)
+        !utils.hasProperty(body, 'data') ||
+        !utils.hasProperty(body, 'error') ||
+        (utils.hasProperty(body, 'error') && body.error !== 0)
       ) {
         throw new Error(JSON.stringify(body, null, 2))
       }
@@ -169,9 +169,9 @@ module.exports = class eWeLinkHTTP {
       if (body.data.thingList && body.data.thingList.length > 0) {
         body.data.thingList.forEach(d => {
           if (
-            Object.prototype.hasOwnProperty.call(d, 'itemData') &&
-            Object.prototype.hasOwnProperty.call(d.itemData, 'extra') &&
-            Object.prototype.hasOwnProperty.call(d.itemData.extra, 'uiid') &&
+            utils.hasProperty(d, 'itemData') &&
+            utils.hasProperty(d.itemData, 'extra') &&
+            utils.hasProperty(d.itemData.extra, 'uiid') &&
             !this.hideDevFromHB.includes(d.itemData.deviceid)
           ) {
             deviceList.push(d.itemData)
@@ -180,7 +180,7 @@ module.exports = class eWeLinkHTTP {
       }
       return deviceList
     } catch (err) {
-      if (Object.prototype.hasOwnProperty.call(err, 'code') && cns.httpRetryCodes.includes(err.code)) {
+      if (utils.hasProperty(err, 'code') && cns.httpRetryCodes.includes(err.code)) {
         if (this.debug) {
           this.log.warn('Unable to reach eWeLink. Retrying in 30 seconds.')
         }
@@ -210,9 +210,9 @@ module.exports = class eWeLinkHTTP {
       })
       const body = res.data
       if (
-        !Object.prototype.hasOwnProperty.call(body, 'data') ||
-        !Object.prototype.hasOwnProperty.call(body, 'error') ||
-        (Object.prototype.hasOwnProperty.call(body, 'error') && body.error !== 0)
+        !utils.hasProperty(body, 'data') ||
+        !utils.hasProperty(body, 'error') ||
+        (utils.hasProperty(body, 'error') && body.error !== 0)
       ) {
         throw new Error(JSON.stringify(body, null, 2))
       }
@@ -222,7 +222,7 @@ module.exports = class eWeLinkHTTP {
         throw new Error('device not found in eWeLink')
       }
     } catch (err) {
-      if (Object.prototype.hasOwnProperty.call(err, 'code') && cns.httpRetryCodes.includes(err.code)) {
+      if (utils.hasProperty(err, 'code') && cns.httpRetryCodes.includes(err.code)) {
         if (this.debug) {
           this.log.warn('Unable to reach eWeLink. Retrying in 30 seconds.')
         }
diff --git a/lib/eWeLinkLAN.js b/lib/eWeLinkLAN.js
index d0a043b0..2982f371 100644
--- a/lib/eWeLinkLAN.js
+++ b/lib/eWeLinkLAN.js
@@ -4,6 +4,7 @@ const cns = require('./constants')
 const crypto = require('crypto')
 const dns = require('node-dns-sd')
 const EventEmitter = require('events')
+const utils = require('./utils')
 module.exports = class eWeLinkLAN {
   constructor (config, log, devices) {
     this.log = log
@@ -17,8 +18,8 @@ module.exports = class eWeLinkLAN {
     devices.forEach(device => {
       this.deviceMap.set(device.deviceid, {
         apiKey: device.devicekey,
-        online: !!Object.prototype.hasOwnProperty.call(this.ipOverrides, device.deviceid),
-        ip: Object.prototype.hasOwnProperty.call(this.ipOverrides, device.deviceid) ? this.ipOverrides[device.deviceid] : null
+        online: !!utils.hasProperty(this.ipOverrides, device.deviceid),
+        ip: utils.hasProperty(this.ipOverrides, device.deviceid) ? this.ipOverrides[device.deviceid] : null
       })
     })
   }
@@ -29,7 +30,7 @@ module.exports = class eWeLinkLAN {
       let d
       const deviceId = device.fqdn.replace('._ewelink._tcp.local', '').replace('eWeLink_', '')
       if ((d = this.deviceMap.get(deviceId))) {
-        if (!Object.prototype.hasOwnProperty.call(this.ipOverrides, deviceId)) {
+        if (!utils.hasProperty(this.ipOverrides, deviceId)) {
           this.deviceMap.set(deviceId, {
             apiKey: d.apiKey,
             online: true,
@@ -53,14 +54,14 @@ module.exports = class eWeLinkLAN {
             const deviceInfo = this.deviceMap.get(rdata.id)
             const data =
               rdata.data1 +
-              (Object.prototype.hasOwnProperty.call(rdata, 'data2') ? rdata.data2 : '') +
-              (Object.prototype.hasOwnProperty.call(rdata, 'data3') ? rdata.data3 : '') +
-              (Object.prototype.hasOwnProperty.call(rdata, 'data4') ? rdata.data4 : '')
+              (utils.hasProperty(rdata, 'data2') ? rdata.data2 : '') +
+              (utils.hasProperty(rdata, 'data3') ? rdata.data3 : '') +
+              (utils.hasProperty(rdata, 'data4') ? rdata.data4 : '')
             const key = crypto.createHash('md5').update(Buffer.from(deviceInfo.apiKey, 'utf8')).digest()
             const dText = crypto.createDecipheriv('aes-128-cbc', key, Buffer.from(rdata.iv, 'base64'))
             const pText = Buffer.concat([dText.update(Buffer.from(data, 'base64')), dText.final()]).toString('utf8')
             let params
-            if (packet.address !== deviceInfo.ip && !Object.prototype.hasOwnProperty.call(this.ipOverrides, rdata.id)) {
+            if (packet.address !== deviceInfo.ip && !utils.hasProperty(this.ipOverrides, rdata.id)) {
               this.deviceMap.set(rdata.id, {
                 apiKey: deviceInfo.apiKey,
                 online: true,
@@ -75,7 +76,7 @@ module.exports = class eWeLinkLAN {
               return
             }
             for (const param in params) {
-              if (Object.prototype.hasOwnProperty.call(params, param)) {
+              if (utils.hasProperty(params, param)) {
                 if (!cns.paramsToKeep.includes(param.replace(/[0-9]/g, ''))) {
                   delete params[param]
                 }
@@ -110,10 +111,10 @@ module.exports = class eWeLinkLAN {
       let apiKey
       let suffix
       const params = {}
-      if (Object.prototype.hasOwnProperty.call(json.params, 'switches')) {
+      if (utils.hasProperty(json.params, 'switches')) {
         params.switches = json.params.switches
         suffix = 'switches'
-      } else if (Object.prototype.hasOwnProperty.call(json.params, 'switch')) {
+      } else if (utils.hasProperty(json.params, 'switch')) {
         params.switch = json.params.switch
         suffix = 'switch'
       } else {
@@ -148,7 +149,7 @@ module.exports = class eWeLinkLAN {
           },
           data
         })
-        if (!Object.prototype.hasOwnProperty.call(res.data, 'error') || res.data.error !== 0) {
+        if (!utils.hasProperty(res.data, 'error') || res.data.error !== 0) {
           throw new Error(res.data)
         }
         return 'ok'
@@ -165,8 +166,8 @@ module.exports = class eWeLinkLAN {
   addDeviceToMap (device) {
     this.deviceMap.set(device.deviceid, {
       apiKey: device.devicekey,
-      online: !!Object.prototype.hasOwnProperty.call(this.ipOverrides, device.deviceid),
-      ip: Object.prototype.hasOwnProperty.call(this.ipOverrides, device.deviceid) ? this.ipOverrides[device.deviceid] : null
+      online: !!utils.hasProperty(this.ipOverrides, device.deviceid),
+      ip: utils.hasProperty(this.ipOverrides, device.deviceid) ? this.ipOverrides[device.deviceid] : null
     })
   }
 
diff --git a/lib/eWeLinkWS.js b/lib/eWeLinkWS.js
index 4a6ef090..670317ee 100644
--- a/lib/eWeLinkWS.js
+++ b/lib/eWeLinkWS.js
@@ -42,7 +42,7 @@ module.exports = class eWeLinkWS {
       this.wsHost = body.domain
       return body.domain
     } catch (err) {
-      if (Object.prototype.hasOwnProperty.call(err, 'code') && cns.httpRetryCodes.includes(err.code)) {
+      if (utils.hasProperty(err, 'code') && cns.httpRetryCodes.includes(err.code)) {
         if (this.debug) this.log.warn('Unable to reach eWeLink. Retrying in 30 seconds.')
         await utils.sleep(30000)
         return this.getDevices()
@@ -84,7 +84,7 @@ module.exports = class eWeLinkWS {
       }
       try {
         const res = await this.wsp.sendRequest(payload, { requestId: sequence })
-        if (Object.prototype.hasOwnProperty.call(res, 'config') && res.config.hb && res.config.hbInterval && !this.hbInterval) {
+        if (utils.hasProperty(res, 'config') && res.config.hb && res.config.hbInterval && !this.hbInterval) {
           this.hbInterval = setInterval(() => {
             this.wsp.send('ping')
           }, (res.config.hbInterval + 7) * 1000)
@@ -98,23 +98,23 @@ module.exports = class eWeLinkWS {
     this.wsp.onUnpackedMessage.addListener(device => {
       if (device === 'pong') return
       let onlineStatus = true
-      if (!Object.prototype.hasOwnProperty.call(device, 'params')) device.params = {}
-      if (Object.prototype.hasOwnProperty.call(device, 'deviceid') && Object.prototype.hasOwnProperty.call(device, 'error')) {
+      if (!utils.hasProperty(device, 'params')) device.params = {}
+      if (utils.hasProperty(device, 'deviceid') && utils.hasProperty(device, 'error')) {
         device.action = 'update'
         onlineStatus = device.error === 0
         if (device.error !== 0 && this.debug) {
           this.log.warn('WS message received.\n%s', JSON.stringify(device, null, 2).replace(this.apiKey, '**hidden**'))
         }
       }
-      if (Object.prototype.hasOwnProperty.call(device, 'action')) {
+      if (utils.hasProperty(device, 'action')) {
         switch (device.action) {
           case 'update':
           case 'sysmsg':
-            if (device.action === 'sysmsg' && Object.prototype.hasOwnProperty.call(device.params, 'online')) {
+            if (device.action === 'sysmsg' && utils.hasProperty(device.params, 'online')) {
               onlineStatus = device.params.online
             }
             for (const param in device.params) {
-              if (Object.prototype.hasOwnProperty.call(device.params, param)) {
+              if (utils.hasProperty(device.params, param)) {
                 if (!cns.paramsToKeep.includes(param.replace(/[0-9]/g, ''))) {
                   delete device.params[param]
                 }
@@ -143,7 +143,7 @@ module.exports = class eWeLinkWS {
               this.log.warn('[%s] WS message has unknown action.\n' + JSON.stringify(device, null, 2), device.deviceid)
             }
         }
-      } else if (Object.prototype.hasOwnProperty.call(device, 'error') && device.error === 0) {
+      } else if (utils.hasProperty(device, 'error') && device.error === 0) {
         // *** Safe to ignore these messages *** \\
       } else {
         if (this.debug) this.log.warn('WS unknown command received.\n' + JSON.stringify(device, null, 2))
@@ -200,7 +200,7 @@ module.exports = class eWeLinkWS {
           this.log('WS message sent.')
         }
         const device = await this.wsp.sendRequest(jsonToSend, { requestId: sequence })
-        device.error = Object.prototype.hasOwnProperty.call(device, 'error') ? device.error : 504
+        device.error = utils.hasProperty(device, 'error') ? device.error : 504
         switch (device.error) {
           case 0:
             return

From 72cf1d1ffcfb2637bebf432289d41a2684c52579 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 6 Oct 2020 13:01:52 +0100
Subject: [PATCH 0386/3183] standard js

---
 lib/device/blind.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/device/blind.js b/lib/device/blind.js
index 06e88c34..fca991d9 100644
--- a/lib/device/blind.js
+++ b/lib/device/blind.js
@@ -81,6 +81,6 @@ module.exports = class deviceBlind {
   }
 
   async externalUpdate (accessory, params) {
-    return
+
   }
 }

From 9d0ea34c9d3e7f32722e8a3bc0525a667b29ccb7 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 6 Oct 2020 13:08:42 +0100
Subject: [PATCH 0387/3183] Update eWeLinkWS.js

---
 lib/eWeLinkWS.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/eWeLinkWS.js b/lib/eWeLinkWS.js
index 670317ee..9a2b5bcb 100644
--- a/lib/eWeLinkWS.js
+++ b/lib/eWeLinkWS.js
@@ -162,7 +162,7 @@ module.exports = class eWeLinkWS {
         this.log.warn('Web socket will try to reconnect in five seconds.')
       }
       await utils.sleep(5000)
-      await this.login()
+      return this.login()
     })
     this.wsp.onError.addListener(async e => {
       this.wsIsOpen = false
@@ -176,7 +176,7 @@ module.exports = class eWeLinkWS {
         this.log.warn('Web socket will try to reconnect in five seconds.')
       }
       await utils.sleep(5000)
-      await this.login()
+      return this.login()
     })
   }
 

From c48a61398d2f0d8ac9c858f64d3f1262d167a321 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 6 Oct 2020 13:12:25 +0100
Subject: [PATCH 0388/3183] remove extra debugging

---
 lib/device/fan.js | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/lib/device/fan.js b/lib/device/fan.js
index b3f35499..3919cdc3 100644
--- a/lib/device/fan.js
+++ b/lib/device/fan.js
@@ -59,15 +59,6 @@ module.exports = class deviceFan {
       fanService
         .updateCharacteristic(Characteristic.Active, newPower)
         .updateCharacteristic(Characteristic.RotationSpeed, newSpeed)
-      this.platform.log.error('**********************************************')
-      this.platform.log.error('updating %s characteristic', type)
-      this.platform.log.error(
-        'INTERNAL FAN UPDATE: light [%s] power [%s] speed [%s%]',
-        newLight ? 'on' : 'off',
-        newPower ? 'on' : 'off',
-        newSpeed
-      )
-      this.platform.log.error('**********************************************')
       await this.platform.sendDeviceUpdate(accessory, params)
     } catch (err) {
       this.platform.deviceUpdateError(accessory, err, true)
@@ -103,15 +94,6 @@ module.exports = class deviceFan {
         fanService
           .updateCharacteristic(Characteristic.Active, status)
           .updateCharacteristic(Characteristic.RotationSpeed, speed)
-
-        this.platform.log.error('**********************************************')
-        this.platform.log.error(
-          'EXTERNAL FAN UPDATE: light [%s] power [%s] speed [%s%]',
-          light ? 'on' : 'off',
-          status ? 'on' : 'off',
-          speed
-        )
-        this.platform.log.error('**********************************************')
       }
     } catch (err) {
       this.platform.deviceUpdateError(accessory, err, false)

From 9aeaa3018305a5f4e0f738ca494493e0edf2751e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 6 Oct 2020 13:18:01 +0100
Subject: [PATCH 0389/3183] 3.4.0-12

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 7def0a7e..5def99ad 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.4.0-11",
+  "version": "3.4.0-12",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 4c0894c7..da59138e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.4.0-11",
+  "version": "3.4.0-12",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From fe02e57c490c1d2852ce4b9fb43072308eb84897 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 6 Oct 2020 13:52:54 +0100
Subject: [PATCH 0390/3183] try: ignore multiple updates

---
 lib/device/garage-eachen.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/device/garage-eachen.js b/lib/device/garage-eachen.js
index 1551541d..0d0c6dc0 100644
--- a/lib/device/garage-eachen.js
+++ b/lib/device/garage-eachen.js
@@ -43,6 +43,7 @@ module.exports = class deviceGarageEachen {
       await this.platform.sendDeviceUpdate(accessory, params)
       await utils.sleep(Math.max(garageConfig.operationTime * 100, 1000))
       gdService.updateCharacteristic(Characteristic.CurrentDoorState, newPos)
+      await utils.sleep(2000)
       accessory.context.inUse = false
     } catch (err) {
       accessory.context.inUse = false

From 95344cb46007a0089d44867cfadc0d34f3f1ec5c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 6 Oct 2020 13:53:49 +0100
Subject: [PATCH 0391/3183] 3.4.0-13

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 5def99ad..91832c12 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.4.0-12",
+  "version": "3.4.0-13",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index da59138e..7f0a4e71 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.4.0-12",
+  "version": "3.4.0-13",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From db01c5b1e7d163a8746bfaac02b71e8a1660dcac Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 6 Oct 2020 22:23:24 +0100
Subject: [PATCH 0392/3183] 3.4.0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 91832c12..c48f6a73 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.4.0-13",
+  "version": "3.4.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 7f0a4e71..c70f6512 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.4.0-13",
+  "version": "3.4.0",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 72122f6649bee36f5d2b322402e6ea08dec02e08 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 7 Oct 2020 08:30:05 +0100
Subject: [PATCH 0393/3183] new disable setting

---
 lib/eWeLink.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index b7ce7233..c0e172e7 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -48,6 +48,12 @@ class eWeLink {
 
   async eWeLinkSetup () {
     try {
+      if (this.config.disablePlugin) {
+        this.devicesInHB.forEach(a => this.removeAccessory(a))
+        this.log.warn('******* Not loading homebridge-ewelink *******')
+        this.log.warn('*** To change this, set doNotLoad to false ***')
+        return
+      }
       this.log('Plugin has finished initialising. Syncing with eWeLink.')
       this.httpClient = new EWeLinkHTTP(this.config, this.log)
       await this.httpClient.getHost()

From 34f786932e5498611ed1972391911b88d6470536 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 7 Oct 2020 10:23:50 +0100
Subject: [PATCH 0394/3183] hidden channels follow behaviour

---
 lib/device/light.js  | 19 +++++++++----------
 lib/device/switch.js | 19 +++++++++----------
 lib/eWeLink.js       | 42 ++++++++++++++++++++++--------------------
 3 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/lib/device/light.js b/lib/device/light.js
index 6ee8f58b..aead63ec 100644
--- a/lib/device/light.js
+++ b/lib/device/light.js
@@ -73,13 +73,11 @@ module.exports = class deviceLight {
               params.switches = cns.defaultMultiSwitchOff
               for (let i = 1; i <= 4; i++) {
                 if ((oAccessory = this.platform.devicesInHB.get(accessory.context.eweDeviceId + 'SW' + i))) {
-                  i === parseInt(accessory.context.switchNumber)
-                    ? (params.switches[i - 1].switch = value ? 'on' : 'off')
-                    : (params.switches[i - 1].switch = oAccessory
-                      .getService(Service.Lightbulb)
-                      .getCharacteristic(Characteristic.On).value
-                      ? 'on'
-                      : 'off')
+                  if (i === parseInt(accessory.context.switchNumber)) {
+                    params.switches[i - 1].switch = value ? 'on' : 'off'
+                  } else {
+                    params.switches[i - 1].switch = oAccessory.context.cacheOn ? 'on' : 'off'
+                  }
                 } else {
                   params.switches[i - 1].switch = 'off'
                 }
@@ -285,14 +283,15 @@ module.exports = class deviceLight {
         const idToCheck = accessory.context.hbDeviceId.slice(0, -1)
         let primaryState = false
         for (let i = 1; i <= accessory.context.channelCount; i++) {
+          if (params.switches[i - 1].switch === 'on') {
+            primaryState = true
+          }
           if (this.platform.devicesInHB.has(idToCheck + i)) {
             const oAccessory = this.platform.devicesInHB.get(idToCheck + i)
+            oAccessory.context.cacheOn = params.switches[i - 1].switch === 'on'
             oAccessory
               .getService(Service.Lightbulb)
               .updateCharacteristic(Characteristic.On, params.switches[i - 1].switch === 'on')
-            if (params.switches[i - 1].switch === 'on') {
-              primaryState = true
-            }
           }
         }
         if (!this.platform.hiddenMasters.includes(accessory.context.eweDeviceId)) {
diff --git a/lib/device/switch.js b/lib/device/switch.js
index ceb5f110..45e150e9 100644
--- a/lib/device/switch.js
+++ b/lib/device/switch.js
@@ -37,13 +37,11 @@ module.exports = class deviceSwitch {
           params.switches = cns.defaultMultiSwitchOff
           for (let i = 1; i <= 4; i++) {
             if ((oAccessory = this.platform.devicesInHB.get(accessory.context.eweDeviceId + 'SW' + i))) {
-              i === parseInt(accessory.context.switchNumber)
-                ? (params.switches[i - 1].switch = value ? 'on' : 'off')
-                : (params.switches[i - 1].switch = oAccessory
-                  .getService(Service.Switch)
-                  .getCharacteristic(Characteristic.On).value
-                  ? 'on'
-                  : 'off')
+              if (i === parseInt(accessory.context.switchNumber)) {
+                params.switches[i - 1].switch = value ? 'on' : 'off'
+              } else {
+                params.switches[i - 1].switch = oAccessory.context.cacheOn ? 'on' : 'off'
+              }
             } else {
               params.switches[i - 1].switch = 'off'
             }
@@ -97,14 +95,15 @@ module.exports = class deviceSwitch {
         const idToCheck = accessory.context.hbDeviceId.slice(0, -1)
         let primaryState = false
         for (let i = 1; i <= accessory.context.channelCount; i++) {
+          if (params.switches[i - 1].switch === 'on') {
+            primaryState = true
+          }
           if (this.platform.devicesInHB.has(idToCheck + i)) {
             const oAccessory = this.platform.devicesInHB.get(idToCheck + i)
+            oAccessory.context.cacheOn = params.switches[i - 1].switch === 'on'
             oAccessory
               .getService(Service.Switch)
               .updateCharacteristic(Characteristic.On, params.switches[i - 1].switch === 'on')
-            if (params.switches[i - 1].switch === 'on') {
-              primaryState = true
-            }
           }
         }
         if (!this.platform.hiddenMasters.includes(accessory.context.eweDeviceId)) {
diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index c0e172e7..2a772c5b 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -132,6 +132,7 @@ class eWeLink {
 
   initialiseDevice (device) {
     let accessory
+    let oAccessory
     try {
       if (this.cusG.has(device.deviceid + 'SWX')) {
         ;['X', '0', '1', '2', '3', '4'].forEach(sw => {
@@ -282,18 +283,19 @@ class eWeLink {
             if (this.devicesInHB.has(device.deviceid + 'SW' + i)) {
               this.removeAccessory(this.devicesInHB.get(device.deviceid + 'SW' + i))
             }
+            oAccessory = this.addAccessory(device, device.deviceid + 'SW' + i, true)
           } else {
-            const oAccessory = this.devicesInHB.has(device.deviceid + 'SW' + i)
+            oAccessory = this.devicesInHB.has(device.deviceid + 'SW' + i)
               ? this.devicesInHB.get(device.deviceid + 'SW' + i)
               : this.addAccessory(device, device.deviceid + 'SW' + i)
             oAccessory
               .getService(Service.AccessoryInformation)
               .setCharacteristic(Characteristic.FirmwareRevision, device.params.fwVersion)
-            oAccessory.context.reachableWAN = device.online
-            oAccessory.context.reachableLAN = this.lanDevices.get(device.deviceid).online || false
-            this.devicesInHB.set(oAccessory.context.hbDeviceId, oAccessory)
-            oAccessory.control = new DeviceLight(this, oAccessory)
           }
+          oAccessory.context.reachableWAN = device.online
+          oAccessory.context.reachableLAN = this.lanDevices.get(device.deviceid).online || false
+          this.devicesInHB.set(oAccessory.context.hbDeviceId, oAccessory)
+          oAccessory.control = new DeviceLight(this, oAccessory)
         }
         /********************/
       } else if (cns.devicesSingleSwitch.includes(device.extra.uiid)) {
@@ -326,18 +328,19 @@ class eWeLink {
             if (this.devicesInHB.has(device.deviceid + 'SW' + i)) {
               this.removeAccessory(this.devicesInHB.get(device.deviceid + 'SW' + i))
             }
+            oAccessory = this.addAccessory(device, device.deviceid + 'SW' + i, true)
           } else {
-            const oAccessory = this.devicesInHB.has(device.deviceid + 'SW' + i)
+            oAccessory = this.devicesInHB.has(device.deviceid + 'SW' + i)
               ? this.devicesInHB.get(device.deviceid + 'SW' + i)
               : this.addAccessory(device, device.deviceid + 'SW' + i)
             oAccessory
               .getService(Service.AccessoryInformation)
               .setCharacteristic(Characteristic.FirmwareRevision, device.params.fwVersion)
-            oAccessory.context.reachableWAN = device.online
-            oAccessory.context.reachableLAN = this.lanDevices.get(device.deviceid).online || false
-            this.devicesInHB.set(oAccessory.context.hbDeviceId, oAccessory)
-            oAccessory.control = new DeviceSwitch(this, oAccessory)
           }
+          oAccessory.context.reachableWAN = device.online
+          oAccessory.context.reachableLAN = this.lanDevices.get(device.deviceid).online || false
+          this.devicesInHB.set(oAccessory.context.hbDeviceId, oAccessory)
+          oAccessory.control = new DeviceLight(this, oAccessory)
         }
         /**********************/
       } else if (cns.devicesRFBridge.includes(device.extra.uiid)) {
@@ -364,7 +367,6 @@ class eWeLink {
         this.hiddenMasters.push(device.deviceid)
         rfMap.forEach(subDevice => {
           const swNumber = rfChlCounter + 1
-          let subAccessory
           let subType
           let subExtraContext = {}
           if (['1', '2', '3', '4'].includes(subDevice.type)) {
@@ -381,21 +383,21 @@ class eWeLink {
             subType,
             swNumber
           }
-          if ((subAccessory = this.devicesInHB.get(device.deviceid + 'SW' + swNumber))) {
-            if (subAccessory.context.subType !== subType || subAccessory.context.swNumber !== swNumber) {
-              this.removeAccessory(subAccessory)
+          if ((oAccessory = this.devicesInHB.get(device.deviceid + 'SW' + swNumber))) {
+            if (oAccessory.context.subType !== subType || oAccessory.context.swNumber !== swNumber) {
+              this.removeAccessory(oAccessory)
             }
           }
-          subAccessory = this.devicesInHB.has(device.deviceid + 'SW' + swNumber)
+          oAccessory = this.devicesInHB.has(device.deviceid + 'SW' + swNumber)
             ? this.devicesInHB.get(device.deviceid + 'SW' + swNumber)
             : this.addAccessory(device, device.deviceid + 'SW' + swNumber, false, subExtraContext, 'rf_sub')
-          subAccessory
+          oAccessory
             .getService(Service.AccessoryInformation)
             .setCharacteristic(Characteristic.FirmwareRevision, device.params.fwVersion)
-          subAccessory.context.reachableWAN = device.online
-          subAccessory.context.reachableLAN = false
-          this.devicesInHB.set(subAccessory.context.hbDeviceId, subAccessory)
-          subAccessory.control = new DeviceRFBridge(this, subAccessory)
+          oAccessory.context.reachableWAN = device.online
+          oAccessory.context.reachableLAN = false
+          this.devicesInHB.set(oAccessory.context.hbDeviceId, oAccessory)
+          oAccessory.control = new DeviceRFBridge(this, oAccessory)
           rfChlCounter += Object.keys(subDevice.buttons || {}).length
         })
         accessory.context.channelCount = rfChlCounter

From e0f2b132abeea0adf3e17a079fdf879db2d7194d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 7 Oct 2020 16:59:03 +0100
Subject: [PATCH 0395/3183] formatting

---
 lib/eWeLink.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index 2a772c5b..a37f8724 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -1,5 +1,5 @@
 'use strict'
-let Characteristic, Service
+let Accessory, Characteristic, Service
 const cns = require('./constants')
 const DeviceCurtain = require('./device/curtain')
 const DeviceBlind = require('./device/blind')
@@ -50,8 +50,8 @@ class eWeLink {
     try {
       if (this.config.disablePlugin) {
         this.devicesInHB.forEach(a => this.removeAccessory(a))
-        this.log.warn('******* Not loading homebridge-ewelink *******')
-        this.log.warn('*** To change this, set doNotLoad to false ***')
+        this.log.warn('********* Not loading homebridge-ewelink *********')
+        this.log.warn('*** To change this, set disablePlugin to false ***')
         return
       }
       this.log('Plugin has finished initialising. Syncing with eWeLink.')
@@ -465,7 +465,7 @@ class eWeLink {
       const deviceName = accessory && utils.hasProperty(accessory, 'displayName')
         ? accessory.displayName
         : device.name
-      this.log.warn('[%s] could not be initialised as %s.', deviceName, this.debug ? err : err.message)
+      this.log.warn(' → [%s] could not be initialised as %s.', deviceName, this.debug ? err : err.message)
     }
   }
 
@@ -483,7 +483,7 @@ class eWeLink {
       newDeviceName = this.config.nameOverride[hbDeviceId]
     }
     try {
-      const accessory = new this.api.platformAccessory(newDeviceName, this.api.hap.uuid.generate(hbDeviceId).toString())
+      const accessory = new Accessory(newDeviceName, this.api.hap.uuid.generate(hbDeviceId).toString())
       if (!hidden) {
         accessory
           .getService(Service.AccessoryInformation)
@@ -636,6 +636,7 @@ class eWeLink {
   }
 }
 module.exports = function (homebridge) {
+  Accessory = homebridge.platformAccessory
   Characteristic = homebridge.hap.Characteristic
   Service = homebridge.hap.Service
   return eWeLink

From c34168b90f33c08546be157d5cfa1ec3cba50c31 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 7 Oct 2020 17:00:06 +0100
Subject: [PATCH 0396/3183] 3.5.0-0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c48f6a73..204052b2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.4.0",
+  "version": "3.5.0-0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index c70f6512..ed97b740 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.4.0",
+  "version": "3.5.0-0",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From e06e2905ab69539f63a22e2bebf77edafa31af5b Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Wed, 7 Oct 2020 21:21:58 +0100
Subject: [PATCH 0397/3183] Update stale.yml

---
 .github/stale.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/stale.yml b/.github/stale.yml
index c75e5812..cd68e851 100644
--- a/.github/stale.yml
+++ b/.github/stale.yml
@@ -1,7 +1,7 @@
 # Number of days of inactivity before an issue becomes stale
 daysUntilStale: 7
 # Number of days of inactivity before a stale issue is closed
-daysUntilClose: 7
+daysUntilClose: 3
 # Issues with these labels will never be considered stale
 exemptLabels:
   - "feedback wanted"

From 7d39c1de6030c8974a6f283a8c338581a93b1ecf Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Thu, 8 Oct 2020 14:37:50 +0100
Subject: [PATCH 0398/3183] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index af89e280..36b19707 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 <p align="center">
-   <a href="https://github.com/homebridge/verified/blob/master/verified-plugins.json"><img alt="Homebridge Verified" src="https://user-images.githubusercontent.com/43026681/90361629-9af86200-e056-11ea-8553-4e4e5c4b5a54.png" width="500px"></a>
+   <a href="https://github.com/homebridge/verified/blob/master/verified-plugins.json"><img alt="Homebridge Verified" src="https://user-images.githubusercontent.com/43026681/90361629-9af86200-e056-11ea-8553-4e4e5c4b5a54.png" width="600px"></a>
 </p>
 <span align="center">
   

From 4e9670d4be340b5897a8e4a770528f7bcd97e01a Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Thu, 8 Oct 2020 14:39:47 +0100
Subject: [PATCH 0399/3183] Update README.md

---
 README.md | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 36b19707..cb40d4ab 100644
--- a/README.md
+++ b/README.md
@@ -5,14 +5,14 @@
   
 # homebridge-ewelink 
 
- Homebridge plugin to control eWeLink devices with original firmware.
+Homebridge plugin to control eWeLink devices with original firmware.
  
- [![verified-by-homebridge](https://badgen.net/badge/homebridge/verified/purple)](https://github.com/homebridge/homebridge/wiki/Verified-Plugins)   
- [![npm](https://img.shields.io/npm/v/homebridge-ewelink/latest?label=release)](https://www.npmjs.com/package/homebridge-ewelink)
- [![npm](https://img.shields.io/npm/v/homebridge-ewelink/beta?label=beta)](https://www.npmjs.com/package/homebridge-ewelink)   
- [![npm](https://img.shields.io/npm/dt/homebridge-ewelink)](https://www.npmjs.com/package/homebridge-ewelink)
- [![JavaScript Style Guide](https://img.shields.io/badge/code_style-standard-brightgreen.svg)](https://standardjs.com)   
- [![Discord](https://img.shields.io/discord/432663330281226270?color=728ED5&logo=discord&label=discord)](https://discord.com/channels/432663330281226270/742733745743855627)
+[![verified-by-homebridge](https://badgen.net/badge/homebridge/verified/purple)](https://github.com/homebridge/homebridge/wiki/Verified-Plugins)   
+[![npm](https://img.shields.io/npm/v/homebridge-ewelink/latest?label=release)](https://www.npmjs.com/package/homebridge-ewelink)
+[![npm](https://img.shields.io/npm/v/homebridge-ewelink/beta?label=beta)](https://www.npmjs.com/package/homebridge-ewelink)   
+[![npm](https://img.shields.io/npm/dt/homebridge-ewelink)](https://www.npmjs.com/package/homebridge-ewelink)
+[![JavaScript Style Guide](https://img.shields.io/badge/code_style-standard-brightgreen.svg)](https://standardjs.com)   
+[![Discord](https://img.shields.io/discord/432663330281226270?color=728ED5&logo=discord&label=discord)](https://discord.com/channels/432663330281226270/742733745743855627)
 
 </span>
 

From 5f0cb9870819f894f9e95d549f449ae00cb8d853 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Thu, 8 Oct 2020 14:41:00 +0100
Subject: [PATCH 0400/3183] Update README.md

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index cb40d4ab..c1593981 100644
--- a/README.md
+++ b/README.md
@@ -6,10 +6,10 @@
 # homebridge-ewelink 
 
 Homebridge plugin to control eWeLink devices with original firmware.
- 
+
 [![verified-by-homebridge](https://badgen.net/badge/homebridge/verified/purple)](https://github.com/homebridge/homebridge/wiki/Verified-Plugins)   
 [![npm](https://img.shields.io/npm/v/homebridge-ewelink/latest?label=release)](https://www.npmjs.com/package/homebridge-ewelink)
-[![npm](https://img.shields.io/npm/v/homebridge-ewelink/beta?label=beta)](https://www.npmjs.com/package/homebridge-ewelink)   
+[![npm](https://img.shields.io/npm/v/homebridge-ewelink/beta?label=beta)](https://github.com/bwp91/homebridge-ewelink/wiki/Beta-Version)   
 [![npm](https://img.shields.io/npm/dt/homebridge-ewelink)](https://www.npmjs.com/package/homebridge-ewelink)
 [![JavaScript Style Guide](https://img.shields.io/badge/code_style-standard-brightgreen.svg)](https://standardjs.com)   
 [![Discord](https://img.shields.io/discord/432663330281226270?color=728ED5&logo=discord&label=discord)](https://discord.com/channels/432663330281226270/742733745743855627)

From d6cf04150e7931353facebc4935f1215d4ccd967 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 8 Oct 2020 14:50:46 +0100
Subject: [PATCH 0401/3183] Update garage-eachen.js

---
 lib/device/garage-eachen.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/device/garage-eachen.js b/lib/device/garage-eachen.js
index 0d0c6dc0..71ec2c5e 100644
--- a/lib/device/garage-eachen.js
+++ b/lib/device/garage-eachen.js
@@ -43,7 +43,6 @@ module.exports = class deviceGarageEachen {
       await this.platform.sendDeviceUpdate(accessory, params)
       await utils.sleep(Math.max(garageConfig.operationTime * 100, 1000))
       gdService.updateCharacteristic(Characteristic.CurrentDoorState, newPos)
-      await utils.sleep(2000)
       accessory.context.inUse = false
     } catch (err) {
       accessory.context.inUse = false
@@ -68,6 +67,7 @@ module.exports = class deviceGarageEachen {
       gdService.updateCharacteristic(Characteristic.TargetDoorState, params.switch === 'on' ? 0 : 1)
       await utils.sleep(Math.max(garageConfig.operationTime * 100, 1000))
       gdService.updateCharacteristic(Characteristic.CurrentDoorState, params.switch === 'on' ? 0 : 1)
+      await utils.sleep(2500)
       accessory.context.inUse = false
     } catch (err) {
       accessory.context.inUse = false

From 7e262a432d7db8161400a037ee1d7455bf51e37e Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Thu, 8 Oct 2020 14:59:14 +0100
Subject: [PATCH 0402/3183] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index c1593981..1d7026bd 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@
 Homebridge plugin to control eWeLink devices with original firmware.
 
 [![verified-by-homebridge](https://badgen.net/badge/homebridge/verified/purple)](https://github.com/homebridge/homebridge/wiki/Verified-Plugins)   
-[![npm](https://img.shields.io/npm/v/homebridge-ewelink/latest?label=release)](https://www.npmjs.com/package/homebridge-ewelink)
+[![npm](https://img.shields.io/npm/v/homebridge-ewelink/latest?label=latest)](https://www.npmjs.com/package/homebridge-ewelink)
 [![npm](https://img.shields.io/npm/v/homebridge-ewelink/beta?label=beta)](https://github.com/bwp91/homebridge-ewelink/wiki/Beta-Version)   
 [![npm](https://img.shields.io/npm/dt/homebridge-ewelink)](https://www.npmjs.com/package/homebridge-ewelink)
 [![JavaScript Style Guide](https://img.shields.io/badge/code_style-standard-brightgreen.svg)](https://standardjs.com)   

From ca0a2deaa277f29251a218009bcc76ed4e587c5b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 9 Oct 2020 07:38:30 +0100
Subject: [PATCH 0403/3183] Update outlet.js

---
 lib/device/outlet.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/device/outlet.js b/lib/device/outlet.js
index ae2a1419..26a8da12 100644
--- a/lib/device/outlet.js
+++ b/lib/device/outlet.js
@@ -78,6 +78,11 @@ module.exports = class deviceOutlet {
           time: Date.now(),
           power: currentWatt
         })
+        
+        accessory.eveLogger.addEntry({
+          time: Date.now(),
+          status: 1
+        })
       }, 300000)
       outletService
         .getCharacteristic(EveService.Characteristics.TotalConsumption)

From f30b3dc59e9160b3870373dabb38b8b9f983b7b5 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 9 Oct 2020 07:39:12 +0100
Subject: [PATCH 0404/3183] 3.5.0-1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 204052b2..37cfbad5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.5.0-0",
+  "version": "3.5.0-1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index ed97b740..41024cef 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.5.0-0",
+  "version": "3.5.0-1",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 580a98c9df7c5e0c47ca2e868bed31659d4fdab3 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 9 Oct 2020 08:04:30 +0100
Subject: [PATCH 0405/3183] Update outlet.js

---
 lib/device/outlet.js | 165 ++++++++++++++++++++++++-------------------
 1 file changed, 92 insertions(+), 73 deletions(-)

diff --git a/lib/device/outlet.js b/lib/device/outlet.js
index 26a8da12..f5cfde80 100644
--- a/lib/device/outlet.js
+++ b/lib/device/outlet.js
@@ -39,79 +39,98 @@ module.exports = class deviceOutlet {
     outletService
       .getCharacteristic(Characteristic.On)
       .on('set', (value, callback) => this.internalUpdate(accessory, value, callback))
-    if (!cns.devicesSingleSwitchOutlet.includes(accessory.context.eweModel) && !this.platform.config.disableEveLogging) {
-      accessory.log = this.platform.log
-      accessory.eveLogger = new EveHistoryService('energy', accessory, {
-        storage: 'fs',
-        minutes: 5,
-        path: this.platform.eveLogPath
-      })
-      corrInterval.setCorrectingInterval(() => {
-        const isOn = outletService.getCharacteristic(Characteristic.On).value
-        const currentWatt = isOn
-          ? outletService.getCharacteristic(EveService.Characteristics.CurrentConsumption).value
-          : 0
-        if (accessory.eveLogger.isHistoryLoaded()) {
-          accessory.context.extraPersistedData = accessory.eveLogger.getExtraPersistedData()
-          if (accessory.context.extraPersistedData !== undefined) {
-            accessory.context.totalEnergy =
-              accessory.context.extraPersistedData.totalenergy +
-              accessory.context.totalEnergyTemp +
-              (currentWatt * 10) / 3600 / 1000
-            accessory.eveLogger.setExtraPersistedData({
-              totalenergy: accessory.context.totalEnergy,
-              lastReset: accessory.context.extraPersistedData.lastReset
-            })
-          } else {
-            accessory.context.totalEnergy = accessory.context.totalEnergyTemp + (currentWatt * 10) / 3600 / 1000
-            accessory.eveLogger.setExtraPersistedData({
-              totalenergy: accessory.context.totalEnergy,
-              lastReset: 0
-            })
-          }
-          accessory.context.totalEnergytemp = 0
-        } else {
-          accessory.context.totalEnergyTemp += (currentWatt * 10) / 3600 / 1000
-          accessory.context.totalEnergy = accessory.context.totalEnergyTemp
-        }
-        accessory.eveLogger.addEntry({
-          time: Date.now(),
-          power: currentWatt
-        })
-        
-        accessory.eveLogger.addEntry({
-          time: Date.now(),
-          status: 1
-        })
-      }, 300000)
-      outletService
-        .getCharacteristic(EveService.Characteristics.TotalConsumption)
-        .on('get', callback => {
-          accessory.context.extraPersistedData = accessory.eveLogger.getExtraPersistedData()
-          if (accessory.context.extraPersistedData !== undefined) {
-            accessory.context.totalEnergy = accessory.context.extraPersistedData.totalPower
-          }
-          callback(null, accessory.context.totalEnergy)
-        })
-      outletService
-        .getCharacteristic(EveService.Characteristics.ResetTotal)
-        .on('set', (value, callback) => {
-          accessory.context.totalEnergy = 0
-          accessory.context.lastReset = value
-          accessory.eveLogger.setExtraPersistedData({
-            totalPower: 0,
-            lastReset: value
-          })
-          callback()
-        })
-        .on('get', callback => {
-          accessory.context.extraPersistedData = accessory.eveLogger.getExtraPersistedData()
-          if (accessory.context.extraPersistedData !== undefined) {
-            accessory.context.lastReset = accessory.context.extraPersistedData.lastReset
-          }
-          callback(null, accessory.context.lastReset)
-        })
-    }
+      if (!cns.devicesSingleSwitchOutlet.includes(accessory.context.eweModel) && !this.platform.config.disableEveLogging) {
+              accessory.log = this.platform.log
+              accessory.eveLogger = new EveHistoryService('energy', accessory, {
+                storage: 'fs',
+                minutes: 5,
+                path: this.platform.eveLogPath
+              })
+              corrInterval.setCorrectingInterval(() => {
+                const isOn = outletService.getCharacteristic(Characteristic.On).value
+                const currentWatt = isOn
+                  ? outletService.getCharacteristic(EveService.Characteristics.CurrentConsumption).value
+                  : 0
+                if (accessory.eveLogger.isHistoryLoaded()) {
+                  accessory.context.extraPersistedData = accessory.eveLogger.getExtraPersistedData()
+                  if (accessory.context.extraPersistedData !== undefined) {
+                    accessory.context.totalEnergy =
+                      accessory.context.extraPersistedData.totalenergy +
+                      accessory.context.totalEnergyTemp +
+                      (currentWatt * 10) / 3600 / 1000
+                    accessory.eveLogger.setExtraPersistedData({
+                      totalenergy: accessory.context.totalEnergy,
+                      lastReset: accessory.context.extraPersistedData.lastReset
+                    })
+                  } else {
+                    accessory.context.totalEnergy = accessory.context.totalEnergyTemp + (currentWatt * 10) / 3600 / 1000
+                    accessory.eveLogger.setExtraPersistedData({
+                      totalenergy: accessory.context.totalEnergy,
+                      lastReset: 0
+                    })
+                  }
+                  accessory.context.totalEnergytemp = 0
+                } else {
+                  accessory.context.totalEnergyTemp += (currentWatt * 10) / 3600 / 1000
+                  accessory.context.totalEnergy = accessory.context.totalEnergyTemp
+                }
+                accessory.eveLogger.addEntry({
+                  time: Date.now(),
+                  power: currentWatt
+                })
+                
+                accessory.eveLogger.addEntry({
+                  time: Date.now(),
+                  status: 1
+                })
+              }, 300000)
+              outletService
+                .getCharacteristic(EveService.Characteristics.TotalConsumption)
+                .on('get', callback => {
+                  accessory.context.extraPersistedData = accessory.eveLogger.getExtraPersistedData()
+                  if (accessory.context.extraPersistedData !== undefined) {
+                    accessory.context.totalEnergy = accessory.context.extraPersistedData.totalPower
+                  }
+                  callback(null, accessory.context.totalEnergy)
+                })
+              outletService
+                .getCharacteristic(EveService.Characteristics.ResetTotal)
+                .on('set', (value, callback) => {
+                  accessory.context.totalEnergy = 0
+                  accessory.context.lastReset = value
+                  accessory.eveLogger.setExtraPersistedData({
+                    totalPower: 0,
+                    lastReset: value
+                  })
+                  callback()
+                })
+                .on('get', callback => {
+                  accessory.context.extraPersistedData = accessory.eveLogger.getExtraPersistedData()
+                  if (accessory.context.extraPersistedData !== undefined) {
+                    accessory.context.lastReset = accessory.context.extraPersistedData.lastReset
+                  }
+                  callback(null, accessory.context.lastReset)
+                })
+            }
+            
+            
+            
+            
+            if (cns.devicesSingleSwitchOutlet.includes(accessory.context.eweModel)) {
+              accessory.log = this.platform.log
+              accessory.eveLogger = new EveHistoryService('energy', accessory, {
+                storage: 'fs',
+                minutes: 5,
+                path: this.platform.eveLogPath
+              })
+              corrInterval.setCorrectingInterval(() => {
+                accessory.eveLogger.addEntry({
+                  time: Date.now(),
+                  status: 1
+                })
+              }, 30000)
+            }
+            
   }
 
   async internalUpdate (accessory, value, callback) {

From deaa44f2b6baac5371fa4868f5f22b7b3a3a56fa Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 9 Oct 2020 08:05:34 +0100
Subject: [PATCH 0406/3183] 3.5.0-2

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 37cfbad5..a7e3eab8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.5.0-1",
+  "version": "3.5.0-2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 41024cef..cb674db7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.5.0-1",
+  "version": "3.5.0-2",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 39f4e5f9de4699fd12ecc0a0d7bbbc35d5db4fcf Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 9 Oct 2020 08:43:08 +0100
Subject: [PATCH 0407/3183] Update outlet.js

---
 lib/device/outlet.js | 160 ++++++++++++++++++-------------------------
 1 file changed, 68 insertions(+), 92 deletions(-)

diff --git a/lib/device/outlet.js b/lib/device/outlet.js
index f5cfde80..ae2a1419 100644
--- a/lib/device/outlet.js
+++ b/lib/device/outlet.js
@@ -39,98 +39,74 @@ module.exports = class deviceOutlet {
     outletService
       .getCharacteristic(Characteristic.On)
       .on('set', (value, callback) => this.internalUpdate(accessory, value, callback))
-      if (!cns.devicesSingleSwitchOutlet.includes(accessory.context.eweModel) && !this.platform.config.disableEveLogging) {
-              accessory.log = this.platform.log
-              accessory.eveLogger = new EveHistoryService('energy', accessory, {
-                storage: 'fs',
-                minutes: 5,
-                path: this.platform.eveLogPath
-              })
-              corrInterval.setCorrectingInterval(() => {
-                const isOn = outletService.getCharacteristic(Characteristic.On).value
-                const currentWatt = isOn
-                  ? outletService.getCharacteristic(EveService.Characteristics.CurrentConsumption).value
-                  : 0
-                if (accessory.eveLogger.isHistoryLoaded()) {
-                  accessory.context.extraPersistedData = accessory.eveLogger.getExtraPersistedData()
-                  if (accessory.context.extraPersistedData !== undefined) {
-                    accessory.context.totalEnergy =
-                      accessory.context.extraPersistedData.totalenergy +
-                      accessory.context.totalEnergyTemp +
-                      (currentWatt * 10) / 3600 / 1000
-                    accessory.eveLogger.setExtraPersistedData({
-                      totalenergy: accessory.context.totalEnergy,
-                      lastReset: accessory.context.extraPersistedData.lastReset
-                    })
-                  } else {
-                    accessory.context.totalEnergy = accessory.context.totalEnergyTemp + (currentWatt * 10) / 3600 / 1000
-                    accessory.eveLogger.setExtraPersistedData({
-                      totalenergy: accessory.context.totalEnergy,
-                      lastReset: 0
-                    })
-                  }
-                  accessory.context.totalEnergytemp = 0
-                } else {
-                  accessory.context.totalEnergyTemp += (currentWatt * 10) / 3600 / 1000
-                  accessory.context.totalEnergy = accessory.context.totalEnergyTemp
-                }
-                accessory.eveLogger.addEntry({
-                  time: Date.now(),
-                  power: currentWatt
-                })
-                
-                accessory.eveLogger.addEntry({
-                  time: Date.now(),
-                  status: 1
-                })
-              }, 300000)
-              outletService
-                .getCharacteristic(EveService.Characteristics.TotalConsumption)
-                .on('get', callback => {
-                  accessory.context.extraPersistedData = accessory.eveLogger.getExtraPersistedData()
-                  if (accessory.context.extraPersistedData !== undefined) {
-                    accessory.context.totalEnergy = accessory.context.extraPersistedData.totalPower
-                  }
-                  callback(null, accessory.context.totalEnergy)
-                })
-              outletService
-                .getCharacteristic(EveService.Characteristics.ResetTotal)
-                .on('set', (value, callback) => {
-                  accessory.context.totalEnergy = 0
-                  accessory.context.lastReset = value
-                  accessory.eveLogger.setExtraPersistedData({
-                    totalPower: 0,
-                    lastReset: value
-                  })
-                  callback()
-                })
-                .on('get', callback => {
-                  accessory.context.extraPersistedData = accessory.eveLogger.getExtraPersistedData()
-                  if (accessory.context.extraPersistedData !== undefined) {
-                    accessory.context.lastReset = accessory.context.extraPersistedData.lastReset
-                  }
-                  callback(null, accessory.context.lastReset)
-                })
-            }
-            
-            
-            
-            
-            if (cns.devicesSingleSwitchOutlet.includes(accessory.context.eweModel)) {
-              accessory.log = this.platform.log
-              accessory.eveLogger = new EveHistoryService('energy', accessory, {
-                storage: 'fs',
-                minutes: 5,
-                path: this.platform.eveLogPath
-              })
-              corrInterval.setCorrectingInterval(() => {
-                accessory.eveLogger.addEntry({
-                  time: Date.now(),
-                  status: 1
-                })
-              }, 30000)
-            }
-            
+    if (!cns.devicesSingleSwitchOutlet.includes(accessory.context.eweModel) && !this.platform.config.disableEveLogging) {
+      accessory.log = this.platform.log
+      accessory.eveLogger = new EveHistoryService('energy', accessory, {
+        storage: 'fs',
+        minutes: 5,
+        path: this.platform.eveLogPath
+      })
+      corrInterval.setCorrectingInterval(() => {
+        const isOn = outletService.getCharacteristic(Characteristic.On).value
+        const currentWatt = isOn
+          ? outletService.getCharacteristic(EveService.Characteristics.CurrentConsumption).value
+          : 0
+        if (accessory.eveLogger.isHistoryLoaded()) {
+          accessory.context.extraPersistedData = accessory.eveLogger.getExtraPersistedData()
+          if (accessory.context.extraPersistedData !== undefined) {
+            accessory.context.totalEnergy =
+              accessory.context.extraPersistedData.totalenergy +
+              accessory.context.totalEnergyTemp +
+              (currentWatt * 10) / 3600 / 1000
+            accessory.eveLogger.setExtraPersistedData({
+              totalenergy: accessory.context.totalEnergy,
+              lastReset: accessory.context.extraPersistedData.lastReset
+            })
+          } else {
+            accessory.context.totalEnergy = accessory.context.totalEnergyTemp + (currentWatt * 10) / 3600 / 1000
+            accessory.eveLogger.setExtraPersistedData({
+              totalenergy: accessory.context.totalEnergy,
+              lastReset: 0
+            })
+          }
+          accessory.context.totalEnergytemp = 0
+        } else {
+          accessory.context.totalEnergyTemp += (currentWatt * 10) / 3600 / 1000
+          accessory.context.totalEnergy = accessory.context.totalEnergyTemp
+        }
+        accessory.eveLogger.addEntry({
+          time: Date.now(),
+          power: currentWatt
+        })
+      }, 300000)
+      outletService
+        .getCharacteristic(EveService.Characteristics.TotalConsumption)
+        .on('get', callback => {
+          accessory.context.extraPersistedData = accessory.eveLogger.getExtraPersistedData()
+          if (accessory.context.extraPersistedData !== undefined) {
+            accessory.context.totalEnergy = accessory.context.extraPersistedData.totalPower
+          }
+          callback(null, accessory.context.totalEnergy)
+        })
+      outletService
+        .getCharacteristic(EveService.Characteristics.ResetTotal)
+        .on('set', (value, callback) => {
+          accessory.context.totalEnergy = 0
+          accessory.context.lastReset = value
+          accessory.eveLogger.setExtraPersistedData({
+            totalPower: 0,
+            lastReset: value
+          })
+          callback()
+        })
+        .on('get', callback => {
+          accessory.context.extraPersistedData = accessory.eveLogger.getExtraPersistedData()
+          if (accessory.context.extraPersistedData !== undefined) {
+            accessory.context.lastReset = accessory.context.extraPersistedData.lastReset
+          }
+          callback(null, accessory.context.lastReset)
+        })
+    }
   }
 
   async internalUpdate (accessory, value, callback) {

From 9c9f198bab8440517693bc68bfe7acf7660ee36f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 9 Oct 2020 09:04:49 +0100
Subject: [PATCH 0408/3183] 3.5.0-3

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index a7e3eab8..86608c7a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.5.0-2",
+  "version": "3.5.0-3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index cb674db7..13337680 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.5.0-2",
+  "version": "3.5.0-3",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From ef57e19b766f15ae1bc85c2918be719cc9f78901 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 9 Oct 2020 10:11:02 +0100
Subject: [PATCH 0409/3183] deps

---
 package-lock.json | 70 +++++++++++++++++++++++++++++++++++------------
 package.json      |  6 ++--
 2 files changed, 56 insertions(+), 20 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 86608c7a..239bfb30 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4,11 +4,6 @@
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
-    "@types/color-name": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz",
-      "integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ=="
-    },
     "abort-controller": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz",
@@ -41,11 +36,10 @@
       }
     },
     "ansi-styles": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-      "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "requires": {
-        "@types/color-name": "^1.1.1",
         "color-convert": "^2.0.1"
       }
     },
@@ -356,13 +350,13 @@
       "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg=="
     },
     "homebridge-lib": {
-      "version": "4.7.15",
-      "resolved": "https://registry.npmjs.org/homebridge-lib/-/homebridge-lib-4.7.15.tgz",
-      "integrity": "sha512-654DQEwyhcHbZ1++1qv0k4lhoYWaZsHcriFRts4XHnGFQOgdO1G6VyP3hUjt/+y5FemoRVjqf6Tv0/IKNPDC4w==",
+      "version": "4.7.16",
+      "resolved": "https://registry.npmjs.org/homebridge-lib/-/homebridge-lib-4.7.16.tgz",
+      "integrity": "sha512-+MYkMUUjP7mPdGT9fJU6ifjvg1SinCUlmdrzjPQZaoe119EN28d0bQSr1jpaVjWW1bqVo+KJT+ap5vnfAgFp1g==",
       "requires": {
         "bonjour": "^3.5.0",
         "chalk": "^4.1.0",
-        "debug": "^4.1.1",
+        "debug": "^4.2.0",
         "semver": "^7.3.2"
       },
       "dependencies": {
@@ -430,6 +424,11 @@
       "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz",
       "integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g=="
     },
+    "is-negative-zero": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.0.tgz",
+      "integrity": "sha1-lVOxIbD6wohp2p7UWeIMdUN4hGE="
+    },
     "is-regex": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.1.tgz",
@@ -536,12 +535,49 @@
       "integrity": "sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA=="
     },
     "object-is": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.2.tgz",
-      "integrity": "sha512-5lHCz+0uufF6wZ7CRFWJN3hp8Jqblpgve06U5CMQ3f//6iDjPr2PEo9MWCjEssDsa+UZEL4PkFpr+BMop6aKzQ==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.3.tgz",
+      "integrity": "sha512-teyqLvFWzLkq5B9ki8FVWA902UER2qkxmdA4nLf+wjOLAWgxzCWZNCxpDq9MvE8MmhWNr+I8w3BN49Vx36Y6Xg==",
       "requires": {
         "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.5"
+        "es-abstract": "^1.18.0-next.1"
+      },
+      "dependencies": {
+        "es-abstract": {
+          "version": "1.18.0-next.1",
+          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.1.tgz",
+          "integrity": "sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==",
+          "requires": {
+            "es-to-primitive": "^1.2.1",
+            "function-bind": "^1.1.1",
+            "has": "^1.0.3",
+            "has-symbols": "^1.0.1",
+            "is-callable": "^1.2.2",
+            "is-negative-zero": "^2.0.0",
+            "is-regex": "^1.1.1",
+            "object-inspect": "^1.8.0",
+            "object-keys": "^1.1.1",
+            "object.assign": "^4.1.1",
+            "string.prototype.trimend": "^1.0.1",
+            "string.prototype.trimstart": "^1.0.1"
+          }
+        },
+        "is-callable": {
+          "version": "1.2.2",
+          "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.2.tgz",
+          "integrity": "sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA=="
+        },
+        "object.assign": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.1.tgz",
+          "integrity": "sha512-VT/cxmx5yaoHSOTSyrCygIDFco+RsibY2NM0a4RdEeY/4KgqezwFtK1yr3U67xYhqJSlASm2pKhLVzPj2lr4bA==",
+          "requires": {
+            "define-properties": "^1.1.3",
+            "es-abstract": "^1.18.0-next.0",
+            "has-symbols": "^1.0.1",
+            "object-keys": "^1.1.1"
+          }
+        }
       }
     },
     "object-keys": {
diff --git a/package.json b/package.json
index 13337680..71c7d9b8 100644
--- a/package.json
+++ b/package.json
@@ -36,8 +36,8 @@
     "eachen"
   ],
   "engines": {
-    "node": ">=10.0.0",
-    "homebridge": ">=1.0.0"
+    "homebridge": "^1.1.0",
+    "node": "^12.19.0"
   },
   "repository": {
     "type": "git",
@@ -70,7 +70,7 @@
     "color-temp": "0.0.2",
     "correcting-interval": "2.0.0",
     "fakegato-history": "0.5.6",
-    "homebridge-lib": "4.7.15",
+    "homebridge-lib": "4.7.16",
     "interval-promise": "1.4.0",
     "node-dns-sd": "0.4.2",
     "websocket-as-promised": "1.0.1",

From 3b048dd69367ef0c8e5528cfe0b1dacd9f26fc40 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 9 Oct 2020 10:11:38 +0100
Subject: [PATCH 0410/3183] 3.5.0-4

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 239bfb30..4999c061 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.5.0-3",
+  "version": "3.5.0-4",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 71c7d9b8..6b5261bc 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.5.0-3",
+  "version": "3.5.0-4",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 37606b05ee9af90a2eec9a00e8eb21f4ccf4bcb0 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 9 Oct 2020 10:18:49 +0100
Subject: [PATCH 0411/3183] remove dep

---
 package-lock.json | 5 -----
 package.json      | 1 -
 2 files changed, 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 4999c061..71f3dc33 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -121,11 +121,6 @@
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
     },
-    "color-temp": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/color-temp/-/color-temp-0.0.2.tgz",
-      "integrity": "sha1-GxTzI9nLdq0fn1p140DWHW2WA/s="
-    },
     "correcting-interval": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/correcting-interval/-/correcting-interval-2.0.0.tgz",
diff --git a/package.json b/package.json
index 6b5261bc..260940ca 100644
--- a/package.json
+++ b/package.json
@@ -67,7 +67,6 @@
   "dependencies": {
     "axios": "0.20.0",
     "color-convert": "2.0.1",
-    "color-temp": "0.0.2",
     "correcting-interval": "2.0.0",
     "fakegato-history": "0.5.6",
     "homebridge-lib": "4.7.16",

From 903f6ad77c92033206ec85ecf50786e1a5931008 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 9 Oct 2020 10:28:38 +0100
Subject: [PATCH 0412/3183] Update package.json

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 260940ca..2183f266 100644
--- a/package.json
+++ b/package.json
@@ -36,8 +36,8 @@
     "eachen"
   ],
   "engines": {
-    "homebridge": "^1.1.0",
-    "node": "^12.19.0"
+    "homebridge": ">=1.1.0",
+    "node": ">=12.19.0"
   },
   "repository": {
     "type": "git",

From eb177617d25cfcc5341fe0ec446e4c417d28dd63 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 9 Oct 2020 15:38:59 +0100
Subject: [PATCH 0413/3183] Update eWeLink.js

---
 lib/eWeLink.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index a37f8724..edec3e72 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -340,7 +340,7 @@ class eWeLink {
           oAccessory.context.reachableWAN = device.online
           oAccessory.context.reachableLAN = this.lanDevices.get(device.deviceid).online || false
           this.devicesInHB.set(oAccessory.context.hbDeviceId, oAccessory)
-          oAccessory.control = new DeviceLight(this, oAccessory)
+          oAccessory.control = new DeviceSwitch(this, oAccessory)
         }
         /**********************/
       } else if (cns.devicesRFBridge.includes(device.extra.uiid)) {

From c8b049ec4c346ee588bd1e56c4de08c266f7e686 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 9 Oct 2020 15:39:37 +0100
Subject: [PATCH 0414/3183] 3.5.0-5

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 71f3dc33..a7c021dc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.5.0-4",
+  "version": "3.5.0-5",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 2183f266..0703ec51 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.5.0-4",
+  "version": "3.5.0-5",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From cea1c79008e18599d421d31344c7a9d50847c3da Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 10 Oct 2020 09:26:12 +0100
Subject: [PATCH 0415/3183] awaits

---
 lib/eWeLinkHTTP.js | 10 +++++-----
 lib/eWeLinkWS.js   | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/lib/eWeLinkHTTP.js b/lib/eWeLinkHTTP.js
index 6f46e8cc..9a05d605 100644
--- a/lib/eWeLinkHTTP.js
+++ b/lib/eWeLinkHTTP.js
@@ -71,7 +71,7 @@ module.exports = class eWeLinkHTTP {
           this.log.warn('Unable to reach eWeLink. Retrying in 30 seconds.')
         }
         await utils.sleep(30000)
-        return this.getHost()
+        return await this.getHost()
       } else {
         return err
       }
@@ -123,7 +123,7 @@ module.exports = class eWeLinkHTTP {
       if (this.debug) {
         this.log('New HTTP API host received [%s].', this.httpHost)
       }
-      return this.login()
+      return await this.login()
     }
     if (body.data.at) {
       this.aToken = body.data.at
@@ -139,7 +139,7 @@ module.exports = class eWeLinkHTTP {
           this.log.warn('An eWeLink error [500] occured. Retrying in 30 seconds.')
         }
         await utils.sleep(30000)
-        return this.login()
+        return await this.login()
       } else {
         throw new Error('No auth token received.\n' + JSON.stringify(body, null, 2))
       }
@@ -185,7 +185,7 @@ module.exports = class eWeLinkHTTP {
           this.log.warn('Unable to reach eWeLink. Retrying in 30 seconds.')
         }
         await utils.sleep(30000)
-        return this.getDevices()
+        return await this.getDevices()
       } else {
         return err
       }
@@ -227,7 +227,7 @@ module.exports = class eWeLinkHTTP {
           this.log.warn('Unable to reach eWeLink. Retrying in 30 seconds.')
         }
         await utils.sleep(30000)
-        return this.getDevice(deviceId)
+        return await this.getDevice(deviceId)
       } else {
         return err
       }
diff --git a/lib/eWeLinkWS.js b/lib/eWeLinkWS.js
index 9a2b5bcb..f8f441ff 100644
--- a/lib/eWeLinkWS.js
+++ b/lib/eWeLinkWS.js
@@ -45,7 +45,7 @@ module.exports = class eWeLinkWS {
       if (utils.hasProperty(err, 'code') && cns.httpRetryCodes.includes(err.code)) {
         if (this.debug) this.log.warn('Unable to reach eWeLink. Retrying in 30 seconds.')
         await utils.sleep(30000)
-        return this.getDevices()
+        return await this.getDevices()
       } else {
         return err
       }
@@ -162,7 +162,7 @@ module.exports = class eWeLinkWS {
         this.log.warn('Web socket will try to reconnect in five seconds.')
       }
       await utils.sleep(5000)
-      return this.login()
+      return await this.login()
     })
     this.wsp.onError.addListener(async e => {
       this.wsIsOpen = false
@@ -176,7 +176,7 @@ module.exports = class eWeLinkWS {
         this.log.warn('Web socket will try to reconnect in five seconds.')
       }
       await utils.sleep(5000)
-      return this.login()
+      return await this.login()
     })
   }
 
@@ -216,7 +216,7 @@ module.exports = class eWeLinkWS {
         this.log.warn('Command will be resent when WS is reconnected.')
       }
       await utils.sleep(30000)
-      return this.sendUpdate(json)
+      return await this.sendUpdate(json)
     }
   }
 
@@ -244,7 +244,7 @@ module.exports = class eWeLinkWS {
     } else {
       if (this.debug) this.log.warn('Command will be resent when WS is reconnected.')
       await utils.sleep(30000)
-      return this.requestUpdate(accessory)
+      return await this.requestUpdate(accessory)
     }
   }
 

From 53c8f3de0025a82fdbd708404d31ae6871a74a08 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 10 Oct 2020 09:27:19 +0100
Subject: [PATCH 0416/3183] 3.5.0-6

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index a7c021dc..d02eadff 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.5.0-5",
+  "version": "3.5.0-6",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 0703ec51..03ca724f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.5.0-5",
+  "version": "3.5.0-6",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 58ffb962211a5795ea17db4f65cb9ead1ae4f139 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 10 Oct 2020 09:29:50 +0100
Subject: [PATCH 0417/3183] catch error pinging

---
 lib/eWeLinkWS.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/eWeLinkWS.js b/lib/eWeLinkWS.js
index f8f441ff..1ed8e157 100644
--- a/lib/eWeLinkWS.js
+++ b/lib/eWeLinkWS.js
@@ -86,7 +86,11 @@ module.exports = class eWeLinkWS {
         const res = await this.wsp.sendRequest(payload, { requestId: sequence })
         if (utils.hasProperty(res, 'config') && res.config.hb && res.config.hbInterval && !this.hbInterval) {
           this.hbInterval = setInterval(() => {
-            this.wsp.send('ping')
+            try {
+              this.wsp.send('ping')
+            } catch (err) {
+              if (this.debug) this.log('Error sending ping - %.', err.message)
+            }
           }, (res.config.hbInterval + 7) * 1000)
         } else {
           throw new Error('Unknown parameters received\n' + res)

From db4a260887c1e1b92c362e4bc88196a4acd76f09 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 10 Oct 2020 09:30:41 +0100
Subject: [PATCH 0418/3183] 3.5.0-7

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d02eadff..f6394443 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.5.0-6",
+  "version": "3.5.0-7",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 03ca724f..d15c0bd4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.5.0-6",
+  "version": "3.5.0-7",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 123c2ae9b4f3a201226b70d8d3ab098a4a73ee5f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 10 Oct 2020 10:57:16 +0100
Subject: [PATCH 0419/3183] view ws error msg

---
 lib/eWeLinkWS.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/eWeLinkWS.js b/lib/eWeLinkWS.js
index 1ed8e157..d2ac5395 100644
--- a/lib/eWeLinkWS.js
+++ b/lib/eWeLinkWS.js
@@ -93,7 +93,7 @@ module.exports = class eWeLinkWS {
             }
           }, (res.config.hbInterval + 7) * 1000)
         } else {
-          throw new Error('Unknown parameters received\n' + res)
+          throw new Error('Unknown parameters received\n' + JSON.stringify(res, null, 2))
         }
       } catch (err) {
         this.log.error('WS login failed [%s].', this.debug ? err : err.message)

From b421cd90059424518c42b2da2122a38e3d4e2a89 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 10 Oct 2020 10:57:51 +0100
Subject: [PATCH 0420/3183] 3.5.0-8

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index f6394443..e027f127 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.5.0-7",
+  "version": "3.5.0-8",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index d15c0bd4..1844ed14 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.5.0-7",
+  "version": "3.5.0-8",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From b29a3451fbc7103ca9d8610f30fbb52a7eb51e2f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 10 Oct 2020 11:57:33 +0100
Subject: [PATCH 0421/3183] Update eWeLinkWS.js

---
 lib/eWeLinkWS.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/eWeLinkWS.js b/lib/eWeLinkWS.js
index d2ac5395..0c595723 100644
--- a/lib/eWeLinkWS.js
+++ b/lib/eWeLinkWS.js
@@ -84,7 +84,8 @@ module.exports = class eWeLinkWS {
       }
       try {
         const res = await this.wsp.sendRequest(payload, { requestId: sequence })
-        if (utils.hasProperty(res, 'config') && res.config.hb && res.config.hbInterval && !this.hbInterval) {
+        if (utils.hasProperty(res, 'config') && res.config.hb && res.config.hbInterval) {
+          if (this.hbInterval) clearInterval(this.hbInterval)
           this.hbInterval = setInterval(() => {
             try {
               this.wsp.send('ping')

From 43619339a71f9bb1bccc8139e56047b2e41b6316 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 10 Oct 2020 11:58:24 +0100
Subject: [PATCH 0422/3183] 3.5.0-9

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index e027f127..2a2ca5fc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.5.0-8",
+  "version": "3.5.0-9",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 1844ed14..7297a24e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.5.0-8",
+  "version": "3.5.0-9",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 290cce6be909ebd8b73b40f6f1473c5a04bd4bfa Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 10 Oct 2020 12:41:37 +0100
Subject: [PATCH 0423/3183] correct function

---
 lib/eWeLinkWS.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/eWeLinkWS.js b/lib/eWeLinkWS.js
index 0c595723..88cfbb04 100644
--- a/lib/eWeLinkWS.js
+++ b/lib/eWeLinkWS.js
@@ -45,7 +45,7 @@ module.exports = class eWeLinkWS {
       if (utils.hasProperty(err, 'code') && cns.httpRetryCodes.includes(err.code)) {
         if (this.debug) this.log.warn('Unable to reach eWeLink. Retrying in 30 seconds.')
         await utils.sleep(30000)
-        return await this.getDevices()
+        return await this.getHost()
       } else {
         return err
       }

From 1c8801ae1d5f2a75b062fc5395d608b03f32545a Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 10 Oct 2020 12:41:44 +0100
Subject: [PATCH 0424/3183] ; placement

---
 lib/eWeLink.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index edec3e72..95cdcf35 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -65,8 +65,8 @@ class eWeLink {
       await this.wsClient.getHost()
       this.wsClient.login()
       this.lanDevices = await this.lanClient.getHosts()
-      await this.lanClient.startMonitor();
-      (() => {
+      await this.lanClient.startMonitor()
+      ;(() => {
         if (Object.keys(this.config.groups || []).length > 0) {
           this.config.groups
             .filter(g => utils.hasProperty(g, 'type') && cns.allowedGroups.includes(g.type))

From e84e10e9efc37a872d79d671ecf87a7bbb917235 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 10 Oct 2020 12:42:17 +0100
Subject: [PATCH 0425/3183] 3.5.0-10

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 2a2ca5fc..dd31fa7e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.5.0-9",
+  "version": "3.5.0-10",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 7297a24e..6002d4d0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.5.0-9",
+  "version": "3.5.0-10",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 8a92e70850eeddce6c17a507b03a816f4d64266f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 10 Oct 2020 15:24:05 +0100
Subject: [PATCH 0426/3183] revert extra sleep

---
 lib/device/garage-eachen.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/device/garage-eachen.js b/lib/device/garage-eachen.js
index 71ec2c5e..1551541d 100644
--- a/lib/device/garage-eachen.js
+++ b/lib/device/garage-eachen.js
@@ -67,7 +67,6 @@ module.exports = class deviceGarageEachen {
       gdService.updateCharacteristic(Characteristic.TargetDoorState, params.switch === 'on' ? 0 : 1)
       await utils.sleep(Math.max(garageConfig.operationTime * 100, 1000))
       gdService.updateCharacteristic(Characteristic.CurrentDoorState, params.switch === 'on' ? 0 : 1)
-      await utils.sleep(2500)
       accessory.context.inUse = false
     } catch (err) {
       accessory.context.inUse = false

From f09f776e9728fe405a50725350c731f8848fbbac Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 10 Oct 2020 15:24:46 +0100
Subject: [PATCH 0427/3183] 3.5.0-11

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index dd31fa7e..cb6933b4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.5.0-10",
+  "version": "3.5.0-11",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 6002d4d0..99060f29 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.5.0-10",
+  "version": "3.5.0-11",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 5c945546b7470b9797193686839231c01d5673c2 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 10 Oct 2020 15:28:07 +0100
Subject: [PATCH 0428/3183] Update garage-eachen.js

---
 lib/device/garage-eachen.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/device/garage-eachen.js b/lib/device/garage-eachen.js
index 1551541d..f7d7cc27 100644
--- a/lib/device/garage-eachen.js
+++ b/lib/device/garage-eachen.js
@@ -41,7 +41,7 @@ module.exports = class deviceGarageEachen {
         .updateCharacteristic(Characteristic.CurrentDoorState, newPos + 2)
       params.switch = value === 0 ? 'on' : 'off'
       await this.platform.sendDeviceUpdate(accessory, params)
-      await utils.sleep(Math.max(garageConfig.operationTime * 100, 1000))
+      await utils.sleep(garageConfig.operationTime * 100)
       gdService.updateCharacteristic(Characteristic.CurrentDoorState, newPos)
       accessory.context.inUse = false
     } catch (err) {
@@ -65,7 +65,7 @@ module.exports = class deviceGarageEachen {
       accessory.context.inUse = true
       const gdService = accessory.getService(Service.GarageDoorOpener)
       gdService.updateCharacteristic(Characteristic.TargetDoorState, params.switch === 'on' ? 0 : 1)
-      await utils.sleep(Math.max(garageConfig.operationTime * 100, 1000))
+      await utils.sleep(garageConfig.operationTime * 100)
       gdService.updateCharacteristic(Characteristic.CurrentDoorState, params.switch === 'on' ? 0 : 1)
       accessory.context.inUse = false
     } catch (err) {

From e8d57737915f6fc7295fd8229baae79551a27d3f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 10 Oct 2020 15:28:53 +0100
Subject: [PATCH 0429/3183] 3.5.0-12

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index cb6933b4..a6c06f55 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.5.0-11",
+  "version": "3.5.0-12",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 99060f29..d9c73880 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.5.0-11",
+  "version": "3.5.0-12",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 33235e9f40cae3257682ee44c8f049918cd1b5a7 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 10 Oct 2020 16:12:43 +0100
Subject: [PATCH 0430/3183] Update garage-eachen.js

---
 lib/device/garage-eachen.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/device/garage-eachen.js b/lib/device/garage-eachen.js
index f7d7cc27..b87ce171 100644
--- a/lib/device/garage-eachen.js
+++ b/lib/device/garage-eachen.js
@@ -41,8 +41,10 @@ module.exports = class deviceGarageEachen {
         .updateCharacteristic(Characteristic.CurrentDoorState, newPos + 2)
       params.switch = value === 0 ? 'on' : 'off'
       await this.platform.sendDeviceUpdate(accessory, params)
-      await utils.sleep(garageConfig.operationTime * 100)
-      gdService.updateCharacteristic(Characteristic.CurrentDoorState, newPos)
+      if (newPos === 0) {
+        await utils.sleep(garageConfig.operationTime * 100)
+        gdService.updateCharacteristic(Characteristic.CurrentDoorState, newPos)
+      }
       accessory.context.inUse = false
     } catch (err) {
       accessory.context.inUse = false

From 84b4dcc5e2c7e956b0d1e97542a825c19f4263f4 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 10 Oct 2020 16:32:46 +0100
Subject: [PATCH 0431/3183] Update garage-eachen.js

---
 lib/device/garage-eachen.js | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/lib/device/garage-eachen.js b/lib/device/garage-eachen.js
index b87ce171..832634ce 100644
--- a/lib/device/garage-eachen.js
+++ b/lib/device/garage-eachen.js
@@ -42,6 +42,7 @@ module.exports = class deviceGarageEachen {
       params.switch = value === 0 ? 'on' : 'off'
       await this.platform.sendDeviceUpdate(accessory, params)
       if (newPos === 0) {
+        // garage door to open.
         await utils.sleep(garageConfig.operationTime * 100)
         gdService.updateCharacteristic(Characteristic.CurrentDoorState, newPos)
       }
@@ -64,10 +65,20 @@ module.exports = class deviceGarageEachen {
       if (garageConfig.type !== 'garage_eachen') {
         throw new Error('improper configuration')
       }
-      accessory.context.inUse = true
       const gdService = accessory.getService(Service.GarageDoorOpener)
+
+      if (params.switch === 'off' && gdService.getCharacteristic(Characteristic.CurrentDoorState).value === 3) {
+        return
+      }
+      if (params.switch === 'on' && gdService.getCharacteristic(Characteristic.CurrentDoorState).value === 2) {
+        return
+      }
+
+      accessory.context.inUse = true
       gdService.updateCharacteristic(Characteristic.TargetDoorState, params.switch === 'on' ? 0 : 1)
-      await utils.sleep(garageConfig.operationTime * 100)
+      if (params.switch === 'on') {
+        await utils.sleep(garageConfig.operationTime * 100)
+      }
       gdService.updateCharacteristic(Characteristic.CurrentDoorState, params.switch === 'on' ? 0 : 1)
       accessory.context.inUse = false
     } catch (err) {

From 1b5daf21ac4ac7f666a4633257a59a84aee796fe Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 10 Oct 2020 16:33:18 +0100
Subject: [PATCH 0432/3183] 3.5.0-13

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index a6c06f55..65642fc9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.5.0-12",
+  "version": "3.5.0-13",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index d9c73880..14911228 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.5.0-12",
+  "version": "3.5.0-13",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 864bfe4e575ca99dcdbfdd1f7b8063eb97c0e50a Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 10 Oct 2020 16:55:45 +0100
Subject: [PATCH 0433/3183] Update garage-eachen.js

---
 lib/device/garage-eachen.js | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/lib/device/garage-eachen.js b/lib/device/garage-eachen.js
index 832634ce..5c31e2c1 100644
--- a/lib/device/garage-eachen.js
+++ b/lib/device/garage-eachen.js
@@ -18,6 +18,8 @@ module.exports = class deviceGarageEachen {
     gdeService
       .getCharacteristic(Characteristic.TargetDoorState)
       .on('set', (value, callback) => this.internalUpdate(accessory, value, callback))
+    accessory.context.ignoreNextOffUpdate = false
+    accessory.context.ignoreNextOnUpdate = false
   }
 
   async internalUpdate (accessory, value, callback) {
@@ -35,27 +37,24 @@ module.exports = class deviceGarageEachen {
       const gdService = accessory.getService(Service.GarageDoorOpener)
       const prevState = gdService.getCharacteristic(Characteristic.CurrentDoorState).value
       if (newPos === prevState % 2) return
-      accessory.context.inUse = true
       gdService
         .updateCharacteristic(Characteristic.TargetDoorState, newPos)
         .updateCharacteristic(Characteristic.CurrentDoorState, newPos + 2)
       params.switch = value === 0 ? 'on' : 'off'
       await this.platform.sendDeviceUpdate(accessory, params)
-      if (newPos === 0) {
-        // garage door to open.
-        await utils.sleep(garageConfig.operationTime * 100)
-        gdService.updateCharacteristic(Characteristic.CurrentDoorState, newPos)
+      if (newPos === 1) {
+        // garage door to close
+        accessory.context.ignoreNextOffUpdate = true
+        accessory.context.ignoreNextOnUpdate = true
       }
-      accessory.context.inUse = false
     } catch (err) {
-      accessory.context.inUse = false
       this.platform.deviceUpdateError(accessory, err, true)
     }
   }
 
   async externalUpdate (accessory, params) {
     try {
-      if (!utils.hasProperty(params, 'switch') || accessory.context.inUse) {
+      if (!utils.hasProperty(params, 'switch')) {
         return
       }
       let garageConfig
@@ -67,22 +66,21 @@ module.exports = class deviceGarageEachen {
       }
       const gdService = accessory.getService(Service.GarageDoorOpener)
 
-      if (params.switch === 'off' && gdService.getCharacteristic(Characteristic.CurrentDoorState).value === 3) {
+      if (params.switch === 'off' && accessory.context.ignoreNextOffUpdate) {
+        accessory.context.ignoreNextOffUpdate = false
         return
       }
-      if (params.switch === 'on' && gdService.getCharacteristic(Characteristic.CurrentDoorState).value === 2) {
+      if (params.switch === 'on' && accessory.context.ignoreNextOnUpdate) {
+        accessory.context.ignoreNextOnUpdate = false
         return
       }
 
-      accessory.context.inUse = true
       gdService.updateCharacteristic(Characteristic.TargetDoorState, params.switch === 'on' ? 0 : 1)
       if (params.switch === 'on') {
         await utils.sleep(garageConfig.operationTime * 100)
       }
       gdService.updateCharacteristic(Characteristic.CurrentDoorState, params.switch === 'on' ? 0 : 1)
-      accessory.context.inUse = false
     } catch (err) {
-      accessory.context.inUse = false
       this.platform.deviceUpdateError(accessory, err, false)
     }
   }

From 198f5f04b7cbdc381ac8b07040af07b35c596d1b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 10 Oct 2020 16:56:28 +0100
Subject: [PATCH 0434/3183] 3.5.0-14

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 65642fc9..9227dd27 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.5.0-13",
+  "version": "3.5.0-14",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 14911228..d1dc5160 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.5.0-13",
+  "version": "3.5.0-14",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 1d6846c490c95cb162c1224ed2f812f18e705460 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 10 Oct 2020 17:11:37 +0100
Subject: [PATCH 0435/3183] Revert "Update garage-eachen.js"

This reverts commit 864bfe4e575ca99dcdbfdd1f7b8063eb97c0e50a.
---
 lib/device/garage-eachen.js | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/lib/device/garage-eachen.js b/lib/device/garage-eachen.js
index 5c31e2c1..832634ce 100644
--- a/lib/device/garage-eachen.js
+++ b/lib/device/garage-eachen.js
@@ -18,8 +18,6 @@ module.exports = class deviceGarageEachen {
     gdeService
       .getCharacteristic(Characteristic.TargetDoorState)
       .on('set', (value, callback) => this.internalUpdate(accessory, value, callback))
-    accessory.context.ignoreNextOffUpdate = false
-    accessory.context.ignoreNextOnUpdate = false
   }
 
   async internalUpdate (accessory, value, callback) {
@@ -37,24 +35,27 @@ module.exports = class deviceGarageEachen {
       const gdService = accessory.getService(Service.GarageDoorOpener)
       const prevState = gdService.getCharacteristic(Characteristic.CurrentDoorState).value
       if (newPos === prevState % 2) return
+      accessory.context.inUse = true
       gdService
         .updateCharacteristic(Characteristic.TargetDoorState, newPos)
         .updateCharacteristic(Characteristic.CurrentDoorState, newPos + 2)
       params.switch = value === 0 ? 'on' : 'off'
       await this.platform.sendDeviceUpdate(accessory, params)
-      if (newPos === 1) {
-        // garage door to close
-        accessory.context.ignoreNextOffUpdate = true
-        accessory.context.ignoreNextOnUpdate = true
+      if (newPos === 0) {
+        // garage door to open.
+        await utils.sleep(garageConfig.operationTime * 100)
+        gdService.updateCharacteristic(Characteristic.CurrentDoorState, newPos)
       }
+      accessory.context.inUse = false
     } catch (err) {
+      accessory.context.inUse = false
       this.platform.deviceUpdateError(accessory, err, true)
     }
   }
 
   async externalUpdate (accessory, params) {
     try {
-      if (!utils.hasProperty(params, 'switch')) {
+      if (!utils.hasProperty(params, 'switch') || accessory.context.inUse) {
         return
       }
       let garageConfig
@@ -66,21 +67,22 @@ module.exports = class deviceGarageEachen {
       }
       const gdService = accessory.getService(Service.GarageDoorOpener)
 
-      if (params.switch === 'off' && accessory.context.ignoreNextOffUpdate) {
-        accessory.context.ignoreNextOffUpdate = false
+      if (params.switch === 'off' && gdService.getCharacteristic(Characteristic.CurrentDoorState).value === 3) {
         return
       }
-      if (params.switch === 'on' && accessory.context.ignoreNextOnUpdate) {
-        accessory.context.ignoreNextOnUpdate = false
+      if (params.switch === 'on' && gdService.getCharacteristic(Characteristic.CurrentDoorState).value === 2) {
         return
       }
 
+      accessory.context.inUse = true
       gdService.updateCharacteristic(Characteristic.TargetDoorState, params.switch === 'on' ? 0 : 1)
       if (params.switch === 'on') {
         await utils.sleep(garageConfig.operationTime * 100)
       }
       gdService.updateCharacteristic(Characteristic.CurrentDoorState, params.switch === 'on' ? 0 : 1)
+      accessory.context.inUse = false
     } catch (err) {
+      accessory.context.inUse = false
       this.platform.deviceUpdateError(accessory, err, false)
     }
   }

From eedb916626da65d2ac6c545243024b72d5b60880 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 10 Oct 2020 17:31:49 +0100
Subject: [PATCH 0436/3183] Update garage-eachen.js

---
 lib/device/garage-eachen.js | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/lib/device/garage-eachen.js b/lib/device/garage-eachen.js
index 832634ce..b97ed272 100644
--- a/lib/device/garage-eachen.js
+++ b/lib/device/garage-eachen.js
@@ -18,6 +18,7 @@ module.exports = class deviceGarageEachen {
     gdeService
       .getCharacteristic(Characteristic.TargetDoorState)
       .on('set', (value, callback) => this.internalUpdate(accessory, value, callback))
+    accessory.context.ignoreNextOff = false
   }
 
   async internalUpdate (accessory, value, callback) {
@@ -35,20 +36,15 @@ module.exports = class deviceGarageEachen {
       const gdService = accessory.getService(Service.GarageDoorOpener)
       const prevState = gdService.getCharacteristic(Characteristic.CurrentDoorState).value
       if (newPos === prevState % 2) return
-      accessory.context.inUse = true
       gdService
         .updateCharacteristic(Characteristic.TargetDoorState, newPos)
         .updateCharacteristic(Characteristic.CurrentDoorState, newPos + 2)
       params.switch = value === 0 ? 'on' : 'off'
-      await this.platform.sendDeviceUpdate(accessory, params)
-      if (newPos === 0) {
-        // garage door to open.
-        await utils.sleep(garageConfig.operationTime * 100)
-        gdService.updateCharacteristic(Characteristic.CurrentDoorState, newPos)
+      if (newPos === 1) {
+        accessory.context.ignoreNextOff = true
       }
-      accessory.context.inUse = false
+      await this.platform.sendDeviceUpdate(accessory, params)
     } catch (err) {
-      accessory.context.inUse = false
       this.platform.deviceUpdateError(accessory, err, true)
     }
   }
@@ -67,22 +63,29 @@ module.exports = class deviceGarageEachen {
       }
       const gdService = accessory.getService(Service.GarageDoorOpener)
 
-      if (params.switch === 'off' && gdService.getCharacteristic(Characteristic.CurrentDoorState).value === 3) {
+      if (params.switch === 'on' && gdService.getCharacteristic(Characteristic.CurrentDoorState).value === 2) {
+        // ON received when door is in fact closing (this is just the sensor behaviour) IGNORE
         return
       }
-      if (params.switch === 'on' && gdService.getCharacteristic(Characteristic.CurrentDoorState).value === 2) {
+
+      // TWO CASES TO IGNORE THE OFF -> when HKContolled bool is true OR if controlled externally when G is open
+
+      if (
+        params.switch === 'off' &&
+        (accessory.context.ignoreNextOff || gdService.getCharacteristic(Characteristic.CurrentDoorState).value === 0)
+      ) {
+        accessory.context.ignoreNextOff = false
         return
       }
 
-      accessory.context.inUse = true
-      gdService.updateCharacteristic(Characteristic.TargetDoorState, params.switch === 'on' ? 0 : 1)
+      if ([0, 1].includes(gdService.getCharacteristic(Characteristic.CurrentDoorState).value)) {
+        gdService.updateCharacteristic(Characteristic.TargetDoorState, params.switch === 'on' ? 0 : 1)
+      }
       if (params.switch === 'on') {
         await utils.sleep(garageConfig.operationTime * 100)
       }
       gdService.updateCharacteristic(Characteristic.CurrentDoorState, params.switch === 'on' ? 0 : 1)
-      accessory.context.inUse = false
     } catch (err) {
-      accessory.context.inUse = false
       this.platform.deviceUpdateError(accessory, err, false)
     }
   }

From fd5c15414a189d8b67f7052b3b6e6e99bd230360 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 10 Oct 2020 17:32:17 +0100
Subject: [PATCH 0437/3183] 3.5.0-15

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 9227dd27..3c966f38 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.5.0-14",
+  "version": "3.5.0-15",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index d1dc5160..aae1cdd1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.5.0-14",
+  "version": "3.5.0-15",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 33c8dacd7b1980c44d6ffd1146aff580a7c7d207 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 10 Oct 2020 18:02:17 +0100
Subject: [PATCH 0438/3183] Update garage-eachen.js

---
 lib/device/garage-eachen.js | 41 ++++++++++++++-----------------------
 1 file changed, 15 insertions(+), 26 deletions(-)

diff --git a/lib/device/garage-eachen.js b/lib/device/garage-eachen.js
index b97ed272..ee1f311e 100644
--- a/lib/device/garage-eachen.js
+++ b/lib/device/garage-eachen.js
@@ -18,7 +18,6 @@ module.exports = class deviceGarageEachen {
     gdeService
       .getCharacteristic(Characteristic.TargetDoorState)
       .on('set', (value, callback) => this.internalUpdate(accessory, value, callback))
-    accessory.context.ignoreNextOff = false
   }
 
   async internalUpdate (accessory, value, callback) {
@@ -36,15 +35,20 @@ module.exports = class deviceGarageEachen {
       const gdService = accessory.getService(Service.GarageDoorOpener)
       const prevState = gdService.getCharacteristic(Characteristic.CurrentDoorState).value
       if (newPos === prevState % 2) return
+      accessory.context.inUse = true
+      params.switch = value === 0 ? 'on' : 'off'
+      await this.platform.sendDeviceUpdate(accessory, params)
       gdService
         .updateCharacteristic(Characteristic.TargetDoorState, newPos)
         .updateCharacteristic(Characteristic.CurrentDoorState, newPos + 2)
-      params.switch = value === 0 ? 'on' : 'off'
-      if (newPos === 1) {
-        accessory.context.ignoreNextOff = true
+      await utils.sleep(3000)
+      accessory.context.inUse = false
+      if (newPos === 0) {
+        await utils.sleep(Math.max((garageConfig.operationTime - 30) * 100, 0))
+        gdService.updateCharacteristic(Characteristic.CurrentDoorState, 1)
       }
-      await this.platform.sendDeviceUpdate(accessory, params)
     } catch (err) {
+      accessory.context.inUse = false
       this.platform.deviceUpdateError(accessory, err, true)
     }
   }
@@ -61,32 +65,17 @@ module.exports = class deviceGarageEachen {
       if (garageConfig.type !== 'garage_eachen') {
         throw new Error('improper configuration')
       }
+      accessory.context.inUse = true
       const gdService = accessory.getService(Service.GarageDoorOpener)
-
-      if (params.switch === 'on' && gdService.getCharacteristic(Characteristic.CurrentDoorState).value === 2) {
-        // ON received when door is in fact closing (this is just the sensor behaviour) IGNORE
-        return
-      }
-
-      // TWO CASES TO IGNORE THE OFF -> when HKContolled bool is true OR if controlled externally when G is open
-
-      if (
-        params.switch === 'off' &&
-        (accessory.context.ignoreNextOff || gdService.getCharacteristic(Characteristic.CurrentDoorState).value === 0)
-      ) {
-        accessory.context.ignoreNextOff = false
-        return
-      }
-
-      if ([0, 1].includes(gdService.getCharacteristic(Characteristic.CurrentDoorState).value)) {
-        gdService.updateCharacteristic(Characteristic.TargetDoorState, params.switch === 'on' ? 0 : 1)
-      }
+      gdService.updateCharacteristic(Characteristic.TargetDoorState, params.switch === 'on' ? 0 : 1)
       if (params.switch === 'on') {
-        await utils.sleep(garageConfig.operationTime * 100)
+        await utils.sleep(Math.max(garageConfig.operationTime * 100, 3000))
       }
       gdService.updateCharacteristic(Characteristic.CurrentDoorState, params.switch === 'on' ? 0 : 1)
+      accessory.context.inUse = false
     } catch (err) {
+      accessory.context.inUse = false
       this.platform.deviceUpdateError(accessory, err, false)
     }
   }
-}
+}
\ No newline at end of file

From 187ed499d57383f056159bddd433c3d3478c23ae Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 10 Oct 2020 18:03:10 +0100
Subject: [PATCH 0439/3183] 3.5.0-16

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 3c966f38..f97191dd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.5.0-15",
+  "version": "3.5.0-16",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index aae1cdd1..fc620267 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.5.0-15",
+  "version": "3.5.0-16",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From b0fed467a2f89a05772f30883166345191991032 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 10 Oct 2020 18:27:39 +0100
Subject: [PATCH 0440/3183] Update garage-eachen.js

---
 lib/device/garage-eachen.js | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/lib/device/garage-eachen.js b/lib/device/garage-eachen.js
index ee1f311e..3976104b 100644
--- a/lib/device/garage-eachen.js
+++ b/lib/device/garage-eachen.js
@@ -45,7 +45,7 @@ module.exports = class deviceGarageEachen {
       accessory.context.inUse = false
       if (newPos === 0) {
         await utils.sleep(Math.max((garageConfig.operationTime - 30) * 100, 0))
-        gdService.updateCharacteristic(Characteristic.CurrentDoorState, 1)
+        gdService.updateCharacteristic(Characteristic.CurrentDoorState, 0)
       }
     } catch (err) {
       accessory.context.inUse = false
@@ -67,15 +67,13 @@ module.exports = class deviceGarageEachen {
       }
       accessory.context.inUse = true
       const gdService = accessory.getService(Service.GarageDoorOpener)
-      gdService.updateCharacteristic(Characteristic.TargetDoorState, params.switch === 'on' ? 0 : 1)
-      if (params.switch === 'on') {
-        await utils.sleep(Math.max(garageConfig.operationTime * 100, 3000))
-      }
-      gdService.updateCharacteristic(Characteristic.CurrentDoorState, params.switch === 'on' ? 0 : 1)
+      gdService
+        .updateCharacteristic(Characteristic.TargetDoorState, params.switch === 'on' ? 0 : 1)
+        .updateCharacteristic(Characteristic.CurrentDoorState, params.switch === 'on' ? 0 : 1)
       accessory.context.inUse = false
     } catch (err) {
       accessory.context.inUse = false
       this.platform.deviceUpdateError(accessory, err, false)
     }
   }
-}
\ No newline at end of file
+}

From 6914f44053593894689bbcdd04a093d5b7a7a285 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 10 Oct 2020 18:28:20 +0100
Subject: [PATCH 0441/3183] 3.5.0-17

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index f97191dd..4897cd01 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.5.0-16",
+  "version": "3.5.0-17",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index fc620267..cc67243b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.5.0-16",
+  "version": "3.5.0-17",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 0d43c869ee6b25d78c2cbe6a99eeaceb76ad662f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 10 Oct 2020 18:58:48 +0100
Subject: [PATCH 0442/3183] change delay to 2 secs

---
 lib/device/garage-eachen.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/device/garage-eachen.js b/lib/device/garage-eachen.js
index 3976104b..00a5dc5f 100644
--- a/lib/device/garage-eachen.js
+++ b/lib/device/garage-eachen.js
@@ -41,10 +41,10 @@ module.exports = class deviceGarageEachen {
       gdService
         .updateCharacteristic(Characteristic.TargetDoorState, newPos)
         .updateCharacteristic(Characteristic.CurrentDoorState, newPos + 2)
-      await utils.sleep(3000)
+      await utils.sleep(2000)
       accessory.context.inUse = false
       if (newPos === 0) {
-        await utils.sleep(Math.max((garageConfig.operationTime - 30) * 100, 0))
+        await utils.sleep(Math.max((garageConfig.operationTime - 20) * 100, 0))
         gdService.updateCharacteristic(Characteristic.CurrentDoorState, 0)
       }
     } catch (err) {

From 2b9a5f468dba8cba7ecbb65a5a6c2fbf88cf656e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 10 Oct 2020 19:22:39 +0100
Subject: [PATCH 0443/3183] formatting

---
 lib/device/garage-eachen.js | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/lib/device/garage-eachen.js b/lib/device/garage-eachen.js
index 00a5dc5f..7983fff2 100644
--- a/lib/device/garage-eachen.js
+++ b/lib/device/garage-eachen.js
@@ -30,20 +30,17 @@ module.exports = class deviceGarageEachen {
       if (garageConfig.type !== 'garage_eachen') {
         throw new Error('improper configuration')
       }
-      const params = {}
-      const newPos = value
+      const params = { switch: value === 0 ? 'on' : 'off' }
       const gdService = accessory.getService(Service.GarageDoorOpener)
-      const prevState = gdService.getCharacteristic(Characteristic.CurrentDoorState).value
-      if (newPos === prevState % 2) return
+      if (value === gdService.getCharacteristic(Characteristic.CurrentDoorState).value % 2) return
       accessory.context.inUse = true
-      params.switch = value === 0 ? 'on' : 'off'
       await this.platform.sendDeviceUpdate(accessory, params)
       gdService
-        .updateCharacteristic(Characteristic.TargetDoorState, newPos)
-        .updateCharacteristic(Characteristic.CurrentDoorState, newPos + 2)
+        .updateCharacteristic(Characteristic.TargetDoorState, value)
+        .updateCharacteristic(Characteristic.CurrentDoorState, value + 2)
       await utils.sleep(2000)
       accessory.context.inUse = false
-      if (newPos === 0) {
+      if (value === 0) {
         await utils.sleep(Math.max((garageConfig.operationTime - 20) * 100, 0))
         gdService.updateCharacteristic(Characteristic.CurrentDoorState, 0)
       }

From 9ea5c346332e192a62dd97edcb589f7350ff5f4e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 10 Oct 2020 19:23:38 +0100
Subject: [PATCH 0444/3183] 3.5.0-18

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 4897cd01..92b7df67 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.5.0-17",
+  "version": "3.5.0-18",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index cc67243b..9ef1e846 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.5.0-17",
+  "version": "3.5.0-18",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From cfb39a970c909cffdab4d12105ac9aa36254fc01 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 11 Oct 2020 09:17:50 +0100
Subject: [PATCH 0445/3183] 3.5.0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 92b7df67..056b8787 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.5.0-18",
+  "version": "3.5.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 9ef1e846..b043e40a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.5.0-18",
+  "version": "3.5.0",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From cf823987d1d256d0230b75e5da222c69e7f6a335 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 11 Oct 2020 11:17:11 +0100
Subject: [PATCH 0446/3183] hide channels change

---
 config.schema.json | 15 ++++-----------
 lib/eWeLink.js     | 12 ++++++++----
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 8d850422..a3c41c19 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -46,18 +46,12 @@
         "description": "A list of eWeLink devices to hide from Homebridge. For example '10009553c8' or multiple separated with a comma '10009553c8,10009553c9'.",
         "default": ""
       },
-      "hideMasters": {
+      "hideChanFromHB": {
         "type": "string",
-        "title": "Hide Master Lights/Switches",
-        "description": "A list of SW0 lights/switches to hide from Homebridge. For example '10009553c8' or multiple separated with a comma '10009553c8,10009553c9'.",
+        "title": "Hide Light/Switch Channels",
+        "description": "A list of light/switch channels to hide from Homebridge. For example '10009553c8SW0' or multiple separated with a comma '10009553c8SW0,10009553c9SW2'.",
         "default": false
       },
-      "hideFromHB": {
-        "type": "string",
-        "title": "Hide Device Channels",
-        "description": "A list of SW1, SW2, SW3 and SW4 channels to hide from Homebridge. For example '10009553c8SW1' or multiple separated with a comma '10009553c8SW1,10009553c9SW2'.",
-        "default": ""
-      },
       "disableHTTPRefresh": {
         "type": "boolean",
         "title": "Disable Initial Device Refresh",
@@ -297,8 +291,6 @@
         "debug",
         "debugReqRes",
         "hideDevFromHB",
-        "hideMasters",
-        "hideFromHB",
         "disableHTTPRefresh"
       ]
     },
@@ -308,6 +300,7 @@
       "description": "A variety of optional settings for specific device types.",
       "expandable": true,
       "items": [
+        "hideChanFromHB",
         "lowBattThreshold",
         "inUsePowerThreshold",
         "sensorTimeLength",
diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index 95cdcf35..32adccec 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -41,6 +41,10 @@ class eWeLink {
     this.hiddenMasters = []
     this.eveLogPath = this.api.user.storagePath() + '/homebridge-ewelink/'
     this.wsRefreshFlag = true
+    
+    //*** UPGRADE **\\
+    this.config.hideChanFromHB += this.config.hideMasters + ',' + this.config.hideFromHB
+    //**************\\
     this.api
       .on('didFinishLaunching', () => this.eWeLinkSetup())
       .on('shutdown', () => this.eWeLinkShutdown())
@@ -266,7 +270,7 @@ class eWeLink {
         /*********************
         LIGHTS [MULTI CHANNEL]
         *********************/
-        if ((this.config.hideMasters || '').includes(device.deviceid)) {
+        if ((this.config.hideChanFromHB.split(',') || []).includes(device.deviceid)) {
           if (this.devicesInHB.has(device.deviceid + 'SW0')) {
             this.removeAccessory(this.devicesInHB.get(device.deviceid + 'SW0'))
           }
@@ -279,7 +283,7 @@ class eWeLink {
         }
         accessory.control = new DeviceLight(this, accessory)
         for (let i = 1; i <= cns.chansFromUiid[device.extra.uiid]; i++) {
-          if ((this.config.hideFromHB || '').includes(device.deviceid + 'SW' + i)) {
+          if ((this.config.hideChanFromHB.split(',') || []).includes(device.deviceid + 'SW' + i)) {
             if (this.devicesInHB.has(device.deviceid + 'SW' + i)) {
               this.removeAccessory(this.devicesInHB.get(device.deviceid + 'SW' + i))
             }
@@ -311,7 +315,7 @@ class eWeLink {
         /***********************
         SWITCHES [MULTI CHANNEL]
         ***********************/
-        if ((this.config.hideMasters || '').includes(device.deviceid)) {
+        if ((this.config.hideChanFromHB.split(',') || []).includes(device.deviceid)) {
           if (this.devicesInHB.has(device.deviceid + 'SW0')) {
             this.removeAccessory(this.devicesInHB.get(device.deviceid + 'SW0'))
           }
@@ -324,7 +328,7 @@ class eWeLink {
         }
         accessory.control = new DeviceSwitch(this, accessory)
         for (let i = 1; i <= cns.chansFromUiid[device.extra.uiid]; i++) {
-          if ((this.config.hideFromHB || '').includes(device.deviceid + 'SW' + i)) {
+          if ((this.config.hideChanFromHB.split(',') || []).includes(device.deviceid + 'SW' + i)) {
             if (this.devicesInHB.has(device.deviceid + 'SW' + i)) {
               this.removeAccessory(this.devicesInHB.get(device.deviceid + 'SW' + i))
             }

From 2c0da5be526e7eff39501abb608fc5fd7d3ed005 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 11 Oct 2020 11:24:52 +0100
Subject: [PATCH 0447/3183] reorganise settings

---
 config.schema.json | 44 ++++++++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index a3c41c19..c79c591d 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -58,6 +58,20 @@
         "description": "If enabled, devices will not be refreshed with their most recent status from eWeLink when Homebridge starts. This setting can be useful for users who block their devices from accessing the internet.",
         "default": false
       },
+      "inUsePowerThreshold": {
+        "type": "integer",
+        "title": "Outlet 'In Use' Threshold",
+        "description": "Homebridge will set the 'In Use' status of outlet devices to true when the wattage is above this number.",
+        "default": 0,
+        "minimum": 0,
+        "maximum": 100
+      },
+      "hideTHSwitch": {
+        "title": "TH10/TH16 Hide Switch",
+        "type": "boolean",
+        "description": "If enabled, the switch for the TH10/TH16 devices will be hidden from Homebridge.",
+        "default": false
+      },
       "lowBattThreshold": {
         "type": "integer",
         "title": "Low Battery Threshold",
@@ -69,7 +83,7 @@
       "sensorTimeLength": {
         "type": "integer",
         "title": "Sensor Length",
-        "description": "The number of seconds which the sensor tile in the Home app will light up for if a sensor detects something.",
+        "description": "The number of seconds which the sensor tile in the Home app will light up for if a sensor detects something. This setting applies to sensors connected to RF/Zigbee Bridges.",
         "default": 60,
         "minimum": 1,
         "maximum": 120
@@ -77,25 +91,11 @@
       "sensorTimeDifference": {
         "type": "integer",
         "title": "Sensor Lag",
-        "description": "An offset in seconds to ignore any notifications if they is a delay between a sensor detecting something and Homebridge receiving the notification.",
+        "description": "An offset in seconds to ignore any notifications if they is a delay between a sensor detecting something and Homebridge receiving the notification. This setting applies to sensors connected to RF/Zigbee Bridges.",
         "default": 120,
         "minimum": 10,
         "maximum": 300
       },
-      "inUsePowerThreshold": {
-        "type": "integer",
-        "title": "Outlet 'In Use' Threshold",
-        "description": "Homebridge will set the 'In Use' status of outlet devices to true when the wattage is above this number.",
-        "default": 0,
-        "minimum": 0,
-        "maximum": 100
-      },
-      "hideTHSwitch": {
-        "title": "TH10/TH16 Hide Switch",
-        "type": "boolean",
-        "description": "If enabled, the switch for the TH10/TH16 devices will be hidden from Homebridge.",
-        "default": false
-      },
       "hideZBLDPress": {
         "title": "Zigbee Button Hide Double/Long Press",
         "type": "boolean",
@@ -204,12 +204,12 @@
             "deviceId": {
               "type": "string",
               "title": "RF Bridge Device ID",
-              "description": "Device ID of your RF Bridge from your eWeLink app (10 digits normally in the format 1000******)."
+              "description": "Device ID of your RF Bridge from your eWeLink app (10 digits normally in the format 1000ab23cd)."
             },
             "fullDeviceId": {
               "type": "string",
               "title": "Sensor Device ID",
-              "description": "Device ID of the sensor from Homebridge (13 digits normally in the format 1000******SW*)."
+              "description": "Device ID of the sensor from Homebridge (13 digits normally in the format 1000ab23cdSW2)."
             },
             "type": {
               "type": "string",
@@ -290,8 +290,8 @@
       "items": [
         "debug",
         "debugReqRes",
-        "hideDevFromHB",
-        "disableHTTPRefresh"
+        "disableHTTPRefresh",
+        "hideDevFromHB"
       ]
     },
     {
@@ -301,11 +301,11 @@
       "expandable": true,
       "items": [
         "hideChanFromHB",
-        "lowBattThreshold",
         "inUsePowerThreshold",
+        "hideTHSwitch",
+        "lowBattThreshold",
         "sensorTimeLength",
         "sensorTimeDifference",
-        "hideTHSwitch",
         "hideZBLDPress"
       ]
     },

From a3d0d76ffb469a1987c85b8ca868f64a5af8a314 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 11 Oct 2020 14:30:32 +0100
Subject: [PATCH 0448/3183] skeleton for 2 garage doors

---
 config.schema.json       | 14 ++++++++++----
 lib/constants.js         |  8 +++++++-
 lib/device/garage-two.js | 42 ++++++++++++++++++++++++++++++++++++++++
 lib/eWeLink.js           | 12 +++++++++++-
 4 files changed, 70 insertions(+), 6 deletions(-)
 create mode 100644 lib/device/garage-two.js

diff --git a/config.schema.json b/config.schema.json
index c79c591d..806e073c 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -121,15 +121,21 @@
               "description": "The new type for this device.",
               "oneOf": [
                 {
-                  "title": "Garage Door (using Eachen GD-DC5)",
+                  "title": "1 Garage Door (using single/multi-channel device)",
                   "enum": [
-                    "garage_eachen"
+                    "garage"
                   ]
                 },
                 {
-                  "title": "Garage Door (using single/multi-channel device)",
+                  "title": "2 Garage Doors (using multi-channel device)",
                   "enum": [
-                    "garage"
+                    "garage_two"
+                  ]
+                },
+                {
+                  "title": "Garage Door (using Eachen GD-DC5)",
+                  "enum": [
+                    "garage_eachen"
                   ]
                 },
                 {
diff --git a/lib/constants.js b/lib/constants.js
index 3f189523..c364dbb4 100644
--- a/lib/constants.js
+++ b/lib/constants.js
@@ -3,7 +3,7 @@ module.exports = {
   appId: 'oeVkj2lYFGnJu5XUtWisfW4utiN4u9Mq',
   appSecret: '6Nz4n0xA8s8qdxQf2GqurZj2Fs55FUvM',
   httpRetryCodes: ['ENOTFOUND', 'ETIMEDOUT', 'EAI_AGAIN'],
-  allowedGroups: ['blind', 'garage', 'garage_eachen', 'lock', 'valve'],
+  allowedGroups: ['blind', 'garage', 'garage_two', 'garage_eachen', 'lock', 'valve'],
   devicesHideable: ['switch', 'light'],
   devicesNonLAN: [22, 28, 34, 59, 102],
   devicesSingleSwitch: [1, 5, 6, 14, 15, 22, 24, 27, 32, 36, 44, 59],
@@ -69,6 +69,12 @@ module.exports = {
     cacheCurrentDoorState: 1,
     cacheTargetDoorState: 1
   },
+  defaultGarageTwoCache: {
+    cacheOneCurrentDoorState: 1,
+    cacheOneTargetDoorState: 1,
+    cacheTwoCurrentDoorState: 1,
+    cacheTwoTargetDoorState: 1
+  },
   chansFromUiid: {
     1: 1, // "SOCKET"                                  \\ 20, MINI, BASIC, S26
     2: 2, // "SOCKET_2"                                \\
diff --git a/lib/device/garage-two.js b/lib/device/garage-two.js
new file mode 100644
index 00000000..a0a79b87
--- /dev/null
+++ b/lib/device/garage-two.js
@@ -0,0 +1,42 @@
+'use strict'
+let Characteristic, Service
+const utils = require('./../utils')
+module.exports = class deviceGarageTwo {
+  constructor (platform, accessory) {
+    this.platform = platform
+    Service = platform.api.hap.Service
+    Characteristic = platform.api.hap.Characteristic
+    const arr = ['1', '2']
+    arr.forEach(v => {
+      let gdService
+      if (!(gdService = accessory.getService('Garage ' + v))) {
+        accessory
+          .addService(Service.GarageDoorOpener, 'Garage ' + v, 'garage' + v)
+          .setCharacteristic(Characteristic.CurrentDoorState, 1)
+          .setCharacteristic(Characteristic.TargetDoorState, 1)
+          .setCharacteristic(Characteristic.ObstructionDetected, false)
+        gdService = accessory.getService('Garage ' + v))
+      }
+      gdService
+        .getCharacteristic(Characteristic.TargetDoorState)
+        .on('set', (value, callback) => this.internalUpdate(accessory, 'Garage' + v, value, callback))
+    })
+  }
+
+  async internalUpdate (accessory, garage, value, callback) {
+    callback()
+    try {
+
+    } catch (err) {
+      this.platform.deviceUpdateError(accessory, err, true)
+    }
+  }
+
+  async externalUpdate (accessory, params) {
+    try {
+
+    } catch (err) {
+      this.platform.deviceUpdateError(accessory, err, false)
+    }
+  }
+}
diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index 32adccec..b3144da5 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -4,6 +4,7 @@ const cns = require('./constants')
 const DeviceCurtain = require('./device/curtain')
 const DeviceBlind = require('./device/blind')
 const DeviceGarage = require('./device/garage')
+const DeviceGarageTwo = require('./device/garage-two')
 const DeviceGarageEachen = require('./device/garage-eachen')
 const DeviceLock = require('./device/lock')
 const DeviceValve = require('./device/valve')
@@ -167,13 +168,22 @@ class eWeLink {
         /***************************/
       } else if (this.cusG.has(device.deviceid + 'SWX') && this.cusG.get(device.deviceid + 'SWX').type === 'garage') {
         /**********************************
-        GARAGE DOORS [ACCESSORY SIMULATION]
+        GARAGE DOORS [ONE] [ACCESSORY SIMULATION]
         **********************************/
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
           : this.addAccessory(device, device.deviceid + 'SWX', false, cns.defaultGarageCache)
         accessory.control = new DeviceGarage(this, accessory)
         /*********************************/
+      } else if (this.cusG.has(device.deviceid + 'SWX') && this.cusG.get(device.deviceid + 'SWX').type === 'garage_two') {
+        /**********************************
+        GARAGE DOORS [TWO] [ACCESSORY SIMULATION]
+        **********************************/
+        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
+          ? this.devicesInHB.get(device.deviceid + 'SWX')
+          : this.addAccessory(device, device.deviceid + 'SWX', false, cns.defaultGarageTwoCache)
+        accessory.control = new DeviceGarageTwo(this, accessory)
+        /*********************************/
       } else if (this.cusG.has(device.deviceid + 'SWX') && this.cusG.get(device.deviceid + 'SWX').type === 'garage_eachen') {
         /***************************
         GARAGE DOORS [EACHEN GD-DC5]

From 1369aac25241551404d4a466011339553b5ba597 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 11 Oct 2020 14:36:13 +0100
Subject: [PATCH 0449/3183] skeleton for 2 garage doors #2

---
 config.schema.json       | 4 ++--
 lib/device/garage-two.js | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 806e073c..aad99e26 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -133,7 +133,7 @@
                   ]
                 },
                 {
-                  "title": "Garage Door (using Eachen GD-DC5)",
+                  "title": "1 Garage Door (using Eachen GD-DC5)",
                   "enum": [
                     "garage_eachen"
                   ]
@@ -194,7 +194,7 @@
               "title": "Sensor",
               "description": "A Sonoff DW2 sensor can optionally be used for garage doors. This is to determine the current open/closed state of the garage door. Please enter the 10 digit device ID (normally in the format 1000ab23cd). Otherwise leave this blank.",
               "condition": {
-                "functionBody": "return (model.groups[arrayIndices] && model.groups[arrayIndices].type==='garage')"
+                "functionBody": "return (model.groups[arrayIndices] && (model.groups[arrayIndices].type==='garage' || model.groups[arrayIndices].type==='garage_two'))"
               }
             }
           }
diff --git a/lib/device/garage-two.js b/lib/device/garage-two.js
index a0a79b87..adee0f0f 100644
--- a/lib/device/garage-two.js
+++ b/lib/device/garage-two.js
@@ -15,7 +15,7 @@ module.exports = class deviceGarageTwo {
           .setCharacteristic(Characteristic.CurrentDoorState, 1)
           .setCharacteristic(Characteristic.TargetDoorState, 1)
           .setCharacteristic(Characteristic.ObstructionDetected, false)
-        gdService = accessory.getService('Garage ' + v))
+        gdService = accessory.getService('Garage ' + v)
       }
       gdService
         .getCharacteristic(Characteristic.TargetDoorState)

From 35aeb1f5da80867be183660d3a680dc3ecd71129 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 11 Oct 2020 14:50:24 +0100
Subject: [PATCH 0450/3183] garage-two externalUpdate 1

---
 lib/device/garage-two.js | 72 ++++++++++++++++++++++++++++++++++++++--
 1 file changed, 69 insertions(+), 3 deletions(-)

diff --git a/lib/device/garage-two.js b/lib/device/garage-two.js
index adee0f0f..6605ec05 100644
--- a/lib/device/garage-two.js
+++ b/lib/device/garage-two.js
@@ -6,8 +6,7 @@ module.exports = class deviceGarageTwo {
     this.platform = platform
     Service = platform.api.hap.Service
     Characteristic = platform.api.hap.Characteristic
-    const arr = ['1', '2']
-    arr.forEach(v => {
+    ;['1', '2'].forEach(v => {
       let gdService
       if (!(gdService = accessory.getService('Garage ' + v))) {
         accessory
@@ -34,7 +33,74 @@ module.exports = class deviceGarageTwo {
 
   async externalUpdate (accessory, params) {
     try {
-
+      if (!utils.hasProperty(params, 'switches')) {
+        return
+      }
+      let garageConfig
+      if (!(garageConfig = this.platform.cusG.get(accessory.context.hbDeviceId))) {
+        throw new Error('group config missing')
+      }
+      if (garageConfig.type !== 'garage_two') {
+        throw new Error('improper configuration')
+      }
+      if (accessory.context.inUse || garageConfig.sensorId) {
+        return
+      }
+      
+      ;['1', '2'].forEach((v, k) => {
+        const gcService = accessory.getService('Garage' + v)
+        const prevState = k === 0
+          ? accessory.context.cacheOneCurrentDoorState
+          : accessory.context.cacheTwoCurrentDoorState
+        const newPos = [0, 2].includes(prevState) ? 3 : 2
+        switch (v) {
+          case 'Garage 1':
+            if (
+              params.switches[0].switch === params.switches[1].switch ||
+              params.switches[prevState % 2].switch === 'on'
+            ) {
+              return
+            }
+            break
+          case 'Garage 2':
+            if (
+              params.switches[2].switch === params.switches[3].switch ||
+              params.switches[(prevState % 2) + 2].switch === 'on'
+            ) {
+              return
+            }
+            break
+        }
+        accessory.context.inUse = true
+        if (garageConfig.sensorId) {
+          await utils.sleep(Math.max(garageConfig.operationTime * 100, 1000))
+        } else {
+          gcService
+            .updateCharacteristic(Characteristic.TargetDoorState, newPos - 2)
+            .updateCharacteristic(Characteristic.CurrentDoorState, newPos)
+          switch (v) {
+            case 'Garage 1':
+              accessory.context.cacheOneCurrentDoorState = newPos
+              accessory.context.cacheTwoTargetDoorState = newPos - 2
+              break
+            case 'Garage 2':
+              accessory.context.cacheTwoCurrentDoorState = newPos
+              accessory.context.cacheTwoTargetDoorState = newPos - 2
+              break
+          }
+          await utils.sleep(Math.max(garageConfig.operationTime * 100, 1000))
+          gcService.updateCharacteristic(Characteristic.CurrentDoorState, newPos - 2)
+          switch (v) {
+            case 'Garage 1':
+              accessory.context.cacheOneCurrentDoorState = newPos - 2
+              break
+            case 'Garage 2':
+              accessory.context.cacheTwoCurrentDoorState = newPos - 2
+              break
+          }
+        }
+      })
+      accessory.context.inUse = false
     } catch (err) {
       this.platform.deviceUpdateError(accessory, err, false)
     }

From 9ebec9c583620ca13663ce6b1f1b7905c7a52b44 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 11 Oct 2020 15:00:51 +0100
Subject: [PATCH 0451/3183] garage-two externalUpdate 2

---
 lib/device/garage-two.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/device/garage-two.js b/lib/device/garage-two.js
index 6605ec05..e57149c0 100644
--- a/lib/device/garage-two.js
+++ b/lib/device/garage-two.js
@@ -31,7 +31,7 @@ module.exports = class deviceGarageTwo {
     }
   }
 
-  async externalUpdate (accessory, params) {
+  externalUpdate (accessory, params) {
     try {
       if (!utils.hasProperty(params, 'switches')) {
         return
@@ -46,8 +46,8 @@ module.exports = class deviceGarageTwo {
       if (accessory.context.inUse || garageConfig.sensorId) {
         return
       }
-      
-      ;['1', '2'].forEach((v, k) => {
+
+      ;['1', '2'].forEach(async (v, k) => {
         const gcService = accessory.getService('Garage' + v)
         const prevState = k === 0
           ? accessory.context.cacheOneCurrentDoorState

From 5ae4bfbf9c5fa8e1ad78042a044ceb9513477be6 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 11 Oct 2020 15:00:58 +0100
Subject: [PATCH 0452/3183] formatting

---
 lib/eWeLink.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index b3144da5..10f03af3 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -42,10 +42,10 @@ class eWeLink {
     this.hiddenMasters = []
     this.eveLogPath = this.api.user.storagePath() + '/homebridge-ewelink/'
     this.wsRefreshFlag = true
-    
-    //*** UPGRADE **\\
+
+    //* ** UPGRADE **\\
     this.config.hideChanFromHB += this.config.hideMasters + ',' + this.config.hideFromHB
-    //**************\\
+    //* *************\\
     this.api
       .on('didFinishLaunching', () => this.eWeLinkSetup())
       .on('shutdown', () => this.eWeLinkShutdown())

From de1e5ac6a461c19f5aec115c2ba24f544385d592 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 11 Oct 2020 15:03:43 +0100
Subject: [PATCH 0453/3183] 3.6.0-0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 056b8787..7eeaa3d0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.5.0",
+  "version": "3.6.0-0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index b043e40a..b09c0517 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.5.0",
+  "version": "3.6.0-0",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From a12c2db9dc62298632f8a384b20fe35564456ecc Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 12 Oct 2020 04:35:52 +0100
Subject: [PATCH 0454/3183] garage-two internal update

---
 lib/device/garage-two.js | 79 +++++++++++++++++++++++++++++++++++++++-
 1 file changed, 77 insertions(+), 2 deletions(-)

diff --git a/lib/device/garage-two.js b/lib/device/garage-two.js
index e57149c0..21fa2d4c 100644
--- a/lib/device/garage-two.js
+++ b/lib/device/garage-two.js
@@ -25,7 +25,82 @@ module.exports = class deviceGarageTwo {
   async internalUpdate (accessory, garage, value, callback) {
     callback()
     try {
-
+      let garageConfig
+      if (!(garageConfig = this.platform.cusG.get(accessory.context.hbDeviceId))) {
+        throw new Error('group config missing')
+      }
+      if (garageConfig.type !== 'garage_two') {
+        throw new Error('improper configuration')
+      }
+      let sensorDefinition = garageConfig.sensorId || false
+      if (sensorDefinition) {
+        const sensors = garageConfig.sensorId.split(',')
+        switch (garage) {
+          case 'Garage 1': {
+            sensorDefinition = sensors[0] || false
+            break
+          }
+          case 'Garage 2': {
+            sensorDefinition = sensors[1] || false
+            break
+          }
+        }
+      }
+      let sAccessory = false
+      const newPos = value
+      const params = {}
+      const gdService = accessory.getService(garage)
+      if (sensorDefinition && !(sAccessory = this.platform.devicesInHB.get(garageConfig.sensorId + 'SWX'))) {
+        throw new Error("defined DW2 sensor doesn't exist")
+      }
+      if (sensorDefinition && sAccessory.context.type !== 'sensor') {
+        throw new Error("defined DW2 sensor isn't a sensor")
+      }
+      const prevState = sAccessory
+        ? sAccessory.getService(Service.ContactSensor).getCharacteristic(Characteristic.ContactSensorState).value === 0
+          ? 1
+          : 0
+        : garage === 'Garage 1'
+          ? accessory.context.cacheOneCurrentDoorState
+          : accessory.context.cacheTwoCurrentDoorState
+      if (newPos === prevState % 2) return
+      accessory.context.inUse = true
+      gdService
+        .updateCharacteristic(Characteristic.TargetDoorState, newPos)
+        .updateCharacteristic(Characteristic.CurrentDoorState, newPos + 2)
+      params.switches = accessory.context.switchState
+      switch (garage) {
+        case 'Garage 1': {
+          accessory.context.cacheOneTargetDoorState = newPos
+          accessory.context.cacheOneCurrentDoorState = newPos + 2
+          params.switches[0].switch = newPos === 0 ? 'on' : 'off'
+          params.switches[1].switch = newPos === 1 ? 'on' : 'off'
+          break
+        }
+        case 'Garage 2': {
+          accessory.context.cacheTwoTargetDoorState = newPos
+          accessory.context.cacheTwoCurrentDoorState = newPos + 2
+          params.switches[2].switch = newPos === 0 ? 'on' : 'off'
+          params.switches[3].switch = newPos === 1 ? 'on' : 'off'
+          break
+        }
+      }
+      await this.platform.sendDeviceUpdate(accessory, params)
+      await utils.sleep(Math.max(garageConfig.operationTime * 100, 1000))
+      if (!sAccessory) {
+        gdService.updateCharacteristic(Characteristic.CurrentDoorState, newPos)
+        switch (garage) {
+          case 'Garage 1': {
+            accessory.context.cacheOneCurrentDoorState = newPos
+            break
+          }
+          case 'Garage 2': {
+            accessory.context.cacheTwoCurrentDoorState = newPos
+            break
+          }
+        }
+      }
+      accessory.context.inUse = false
     } catch (err) {
       this.platform.deviceUpdateError(accessory, err, true)
     }
@@ -46,7 +121,7 @@ module.exports = class deviceGarageTwo {
       if (accessory.context.inUse || garageConfig.sensorId) {
         return
       }
-
+      accessory.context.switchState = params.switches
       ;['1', '2'].forEach(async (v, k) => {
         const gcService = accessory.getService('Garage' + v)
         const prevState = k === 0

From 31e9718f88d2172dc47d8c41dcdc2f11c9948551 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 12 Oct 2020 04:40:57 +0100
Subject: [PATCH 0455/3183] 3.6.0-1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 7eeaa3d0..fb31f9da 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.6.0-0",
+  "version": "3.6.0-1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index b09c0517..1d13b435 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.6.0-0",
+  "version": "3.6.0-1",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From b14db31ca57ee4f17414b2614ec04897dbdef110 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 12 Oct 2020 10:11:05 +0100
Subject: [PATCH 0456/3183] garage-two externalUpdate 3

---
 lib/device/garage-two.js | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/lib/device/garage-two.js b/lib/device/garage-two.js
index 21fa2d4c..c647f167 100644
--- a/lib/device/garage-two.js
+++ b/lib/device/garage-two.js
@@ -122,14 +122,15 @@ module.exports = class deviceGarageTwo {
         return
       }
       accessory.context.switchState = params.switches
-      ;['1', '2'].forEach(async (v, k) => {
-        const gcService = accessory.getService('Garage' + v)
-        const prevState = k === 0
+      this.platform.log.warn(accessory.context.switchState)
+      ;['1', '2'].forEach(async v => {
+        const gcService = accessory.getService('Garage ' + v)
+        const prevState = v === '1'
           ? accessory.context.cacheOneCurrentDoorState
           : accessory.context.cacheTwoCurrentDoorState
         const newPos = [0, 2].includes(prevState) ? 3 : 2
         switch (v) {
-          case 'Garage 1':
+          case '1':
             if (
               params.switches[0].switch === params.switches[1].switch ||
               params.switches[prevState % 2].switch === 'on'
@@ -137,7 +138,7 @@ module.exports = class deviceGarageTwo {
               return
             }
             break
-          case 'Garage 2':
+          case '2':
             if (
               params.switches[2].switch === params.switches[3].switch ||
               params.switches[(prevState % 2) + 2].switch === 'on'
@@ -154,11 +155,11 @@ module.exports = class deviceGarageTwo {
             .updateCharacteristic(Characteristic.TargetDoorState, newPos - 2)
             .updateCharacteristic(Characteristic.CurrentDoorState, newPos)
           switch (v) {
-            case 'Garage 1':
+            case '1':
               accessory.context.cacheOneCurrentDoorState = newPos
               accessory.context.cacheTwoTargetDoorState = newPos - 2
               break
-            case 'Garage 2':
+            case '2':
               accessory.context.cacheTwoCurrentDoorState = newPos
               accessory.context.cacheTwoTargetDoorState = newPos - 2
               break
@@ -166,10 +167,10 @@ module.exports = class deviceGarageTwo {
           await utils.sleep(Math.max(garageConfig.operationTime * 100, 1000))
           gcService.updateCharacteristic(Characteristic.CurrentDoorState, newPos - 2)
           switch (v) {
-            case 'Garage 1':
+            case '1':
               accessory.context.cacheOneCurrentDoorState = newPos - 2
               break
-            case 'Garage 2':
+            case '2':
               accessory.context.cacheTwoCurrentDoorState = newPos - 2
               break
           }

From f491fb9916d92ab1d6d8f98009f15fe298c3807b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 12 Oct 2020 10:11:17 +0100
Subject: [PATCH 0457/3183] option to disable eve logging

---
 config.schema.json | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/config.schema.json b/config.schema.json
index aad99e26..b70ca21d 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -58,6 +58,12 @@
         "description": "If enabled, devices will not be refreshed with their most recent status from eWeLink when Homebridge starts. This setting can be useful for users who block their devices from accessing the internet.",
         "default": false
       },
+      "disableEveLogging": {
+        "type": "boolean",
+        "title": "Disable Eve Logging",
+        "description": "If enabled, switch, thermostat and power readings will not be logged to the Eve App.",
+        "default": false
+      },
       "inUsePowerThreshold": {
         "type": "integer",
         "title": "Outlet 'In Use' Threshold",
@@ -307,6 +313,7 @@
       "expandable": true,
       "items": [
         "hideChanFromHB",
+        "disableEveLogging",
         "inUsePowerThreshold",
         "hideTHSwitch",
         "lowBattThreshold",

From 0dd560b29cbb48d432defc43db4a503398a9c497 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 12 Oct 2020 10:16:49 +0100
Subject: [PATCH 0458/3183] switch eve logging

---
 lib/device/switch.js | 38 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 37 insertions(+), 1 deletion(-)

diff --git a/lib/device/switch.js b/lib/device/switch.js
index 45e150e9..f287025f 100644
--- a/lib/device/switch.js
+++ b/lib/device/switch.js
@@ -1,16 +1,34 @@
 'use strict'
-let Characteristic, Service
+let Characteristic, EveHistoryService, Service
 const cns = require('./../constants')
+const corrInterval = require('correcting-interval')
+const fakegato = require('fakegato-history')
 const utils = require('./../utils')
 module.exports = class deviceSwitch {
   constructor (platform, accessory) {
     this.platform = platform
     Service = platform.api.hap.Service
     Characteristic = platform.api.hap.Characteristic
+    EveHistoryService = fakegato(platform.api)
     const switchService = accessory.getService(Service.Switch) || accessory.addService(Service.Switch)
     switchService
       .getCharacteristic(Characteristic.On)
       .on('set', (value, callback) => this.internalUpdate(accessory, value, callback))
+    if (!this.platform.config.disableEveLogging) {
+      accessory.log = this.platform.log
+      accessory.eveLogger = new EveHistoryService('energy', accessory, {
+        storage: 'fs',
+        minutes: 5,
+        path: this.platform.eveLogPath
+      })
+      corrInterval.setCorrectingInterval(() => {
+        const isOn = switchService.getCharacteristic(Characteristic.On).value
+        accessory.eveLogger.addEntry({
+          time: Date.now(),
+          status: isOn ? 1 : 0
+        })
+      }, 300000)
+    }
   }
 
   async internalUpdate (accessory, value, callback) {
@@ -90,6 +108,12 @@ module.exports = class deviceSwitch {
       if (cns.devicesSingleSwitch.includes(accessory.context.eweUIID)) {
         if (!utils.hasProperty(params, 'switch')) return
         accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, params.switch === 'on')
+        if (!this.platform.config.disableEveLogging) {
+          accessory.eveLogger.addEntry({
+            time: Date.now(),
+            status: params.switch === 'on' ? 1 : 0
+          })
+        }
       } else if (cns.devicesMultiSwitch.includes(accessory.context.eweUIID)) {
         if (!utils.hasProperty(params, 'switches')) return
         const idToCheck = accessory.context.hbDeviceId.slice(0, -1)
@@ -104,10 +128,22 @@ module.exports = class deviceSwitch {
             oAccessory
               .getService(Service.Switch)
               .updateCharacteristic(Characteristic.On, params.switches[i - 1].switch === 'on')
+            if (!this.platform.config.disableEveLogging) {
+              accessory.eveLogger.addEntry({
+                time: Date.now(),
+                status: params.switches[i - 1].switch === 'on' ? 1 : 0
+              })
+            }
           }
         }
         if (!this.platform.hiddenMasters.includes(accessory.context.eweDeviceId)) {
           accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, primaryState)
+          if (!this.platform.config.disableEveLogging) {
+            accessory.eveLogger.addEntry({
+              time: Date.now(),
+              status: primaryState ? 1 : 0
+            })
+          }
         }
       }
     } catch (err) {

From ad6a474b81d4412e3d53250cfed87617db4134bb Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 12 Oct 2020 13:42:08 +0100
Subject: [PATCH 0459/3183] update deps

---
 package-lock.json | 81 +++++++++++++++++++++++------------------------
 package.json      |  2 +-
 2 files changed, 41 insertions(+), 42 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index fb31f9da..fcf3e199 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21,11 +21,11 @@
       },
       "dependencies": {
         "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
+          "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
           "requires": {
-            "ms": "^2.1.1"
+            "ms": "2.1.2"
           }
         },
         "ms": {
@@ -67,9 +67,9 @@
       "integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g=="
     },
     "bignumber.js": {
-      "version": "9.0.0",
-      "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.0.0.tgz",
-      "integrity": "sha512-t/OYhhJ2SD+YGBQcjY8GzzDHEk9f3nerxjtfa6tlMXfe7frs/WozhvCNoGvpM0P3bNf3Gq5ZRMlGr5f3r4/N8A=="
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.0.1.tgz",
+      "integrity": "sha512-IdZR9mh6ahOBv/hYGiXyVuyCetmGJhtYkqLBpTStdhEGjegpPlUawydyaF3pbIOFynJTpllEs+NP+CS9jKFLjA=="
     },
     "bonjour": {
       "version": "3.5.0",
@@ -224,9 +224,8 @@
       "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
     },
     "fakegato-history": {
-      "version": "0.5.6",
-      "resolved": "https://registry.npmjs.org/fakegato-history/-/fakegato-history-0.5.6.tgz",
-      "integrity": "sha512-LlsOkiw9LntVlRlBkssD5ozhEkQzYuEJUlvXk5YAgBQcWzk19PQ5g+NoKfs6SRY1qAeC1onb65hes4mCvY+JmA==",
+      "version": "github:simont77/fakegato-history#bc07b298838ec98a88ba07f519c4af53b9ce4230",
+      "from": "github:simont77/fakegato-history#Updated-Energy",
       "requires": {
         "debug": "^2.2.0",
         "googleapis": ">39.1.0",
@@ -249,9 +248,9 @@
       "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
     },
     "gaxios": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/gaxios/-/gaxios-3.1.0.tgz",
-      "integrity": "sha512-DDTn3KXVJJigtz+g0J3vhcfbDbKtAroSTxauWsdnP57sM5KZ3d2c/3D9RKFJ86s43hfw6WULg6TXYw/AYiBlpA==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/gaxios/-/gaxios-3.2.0.tgz",
+      "integrity": "sha512-+6WPeVzPvOshftpxJwRi2Ozez80tn/hdtOUag7+gajDHRJvAblKxTFSSMPtr2hmnLy7p0mvYz0rMXLBl8pSO7Q==",
       "requires": {
         "abort-controller": "^3.0.0",
         "extend": "^3.0.2",
@@ -261,18 +260,18 @@
       }
     },
     "gcp-metadata": {
-      "version": "4.1.4",
-      "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-4.1.4.tgz",
-      "integrity": "sha512-5J/GIH0yWt/56R3dNaNWPGQ/zXsZOddYECfJaqxFWgrZ9HC2Kvc5vl9upOgUUHKzURjAVf2N+f6tEJiojqXUuA==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-4.2.0.tgz",
+      "integrity": "sha512-vQZD57cQkqIA6YPGXM/zc+PIZfNRFdukWGsGZ5+LcJzesi5xp6Gn7a02wRJi4eXPyArNMIYpPET4QMxGqtlk6Q==",
       "requires": {
         "gaxios": "^3.0.0",
         "json-bigint": "^1.0.0"
       }
     },
     "google-auth-library": {
-      "version": "6.0.6",
-      "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-6.0.6.tgz",
-      "integrity": "sha512-fWYdRdg55HSJoRq9k568jJA1lrhg9i2xgfhVIMJbskUmbDpJGHsbv9l41DGhCDXM21F9Kn4kUwdysgxSYBYJUw==",
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-6.1.1.tgz",
+      "integrity": "sha512-0WfExOx3FrLYnY88RICQxvpaNzdwjz44OsHqHkIoAJfjY6Jck6CZRl1ASWadk+wbJ0LhkQ8rNY4zZebKml4Ghg==",
       "requires": {
         "arrify": "^2.0.0",
         "base64-js": "^1.3.0",
@@ -280,7 +279,7 @@
         "fast-text-encoding": "^1.0.0",
         "gaxios": "^3.0.0",
         "gcp-metadata": "^4.1.0",
-        "gtoken": "^5.0.0",
+        "gtoken": "^5.0.4",
         "jws": "^4.0.0",
         "lru-cache": "^6.0.0"
       }
@@ -294,21 +293,21 @@
       }
     },
     "googleapis": {
-      "version": "59.0.0",
-      "resolved": "https://registry.npmjs.org/googleapis/-/googleapis-59.0.0.tgz",
-      "integrity": "sha512-GV/E4KRN89a4GxSk7D7cwUfRYgcJHR05sOgm/WGdwc/u8dxNXG5lWmz9gF5ZwFGk2yKtVxL4VZNn4zBuZ6rmGg==",
+      "version": "61.0.0",
+      "resolved": "https://registry.npmjs.org/googleapis/-/googleapis-61.0.0.tgz",
+      "integrity": "sha512-aXaNgWKaALiYrfwrJ0ZYhRo2abyIBcqUjyNMgkbghKJMiCeOwcktlaGseH6JbPlCxXYCE8ZDfvAQqVNsf+6/RA==",
       "requires": {
         "google-auth-library": "^6.0.0",
         "googleapis-common": "^4.4.0"
       }
     },
     "googleapis-common": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/googleapis-common/-/googleapis-common-4.4.0.tgz",
-      "integrity": "sha512-Bgrs8/1OZQFFIfVuX38L9t48rPAkVUXttZy6NzhhXxFOEMSHgfFIjxou7RIXOkBHxmx2pVwct9WjKkbnqMYImQ==",
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/googleapis-common/-/googleapis-common-4.4.1.tgz",
+      "integrity": "sha512-F1QcH8oU7TOuZex9p+XW7TeyLY0332NwBwJ3dZoN+51pXZXB5JjrKswrpgbhuREuIe8xAy8J1rlmFqxeP2mFfA==",
       "requires": {
         "extend": "^3.0.2",
-        "gaxios": "^3.0.0",
+        "gaxios": "^3.2.0",
         "google-auth-library": "^6.0.0",
         "qs": "^6.7.0",
         "url-template": "^2.0.8",
@@ -316,12 +315,12 @@
       }
     },
     "gtoken": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/gtoken/-/gtoken-5.0.3.tgz",
-      "integrity": "sha512-Nyd1wZCMRc2dj/mAD0LlfQLcAO06uKdpKJXvK85SGrF5+5+Bpfil9u/2aw35ltvEHjvl0h5FMKN5knEU+9JrOg==",
+      "version": "5.0.4",
+      "resolved": "https://registry.npmjs.org/gtoken/-/gtoken-5.0.4.tgz",
+      "integrity": "sha512-U9wnSp4GZ7ov6zRdPuRHG4TuqEWqRRgT1gfXGNArhzBUn9byrPeH8uTmBWU/ZiWJJvTEmkjhDIC3mqHWdVi3xQ==",
       "requires": {
         "gaxios": "^3.0.0",
-        "google-p12-pem": "^3.0.0",
+        "google-p12-pem": "^3.0.3",
         "jws": "^4.0.0",
         "mime": "^2.2.0"
       }
@@ -380,11 +379,11 @@
       },
       "dependencies": {
         "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
+          "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
           "requires": {
-            "ms": "^2.1.1"
+            "ms": "2.1.2"
           }
         },
         "ms": {
@@ -486,9 +485,9 @@
       "integrity": "sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA=="
     },
     "moment": {
-      "version": "2.27.0",
-      "resolved": "https://registry.npmjs.org/moment/-/moment-2.27.0.tgz",
-      "integrity": "sha512-al0MUK7cpIcglMv3YF13qSgdAIqxHTO7brRtaz3DlSULbqfazqkc5kEjNrLDOM7fsjshoFIihnU8snrP7zUvhQ=="
+      "version": "2.29.1",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz",
+      "integrity": "sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ=="
     },
     "ms": {
       "version": "2.0.0",
@@ -667,9 +666,9 @@
       "integrity": "sha1-/FZaPMy/93MMd19WQflVV5FDnyE="
     },
     "uuid": {
-      "version": "8.3.0",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.0.tgz",
-      "integrity": "sha512-fX6Z5o4m6XsXBdli9g7DtWgAx+osMsRRZFKma1mIUsLCz6vRvv+pz5VNbyu9UEDzpMWulZfvpgb/cmDXVulYFQ=="
+      "version": "8.3.1",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.1.tgz",
+      "integrity": "sha512-FOmRr+FmWEIG8uhZv6C2bTgEVXsHk08kE7mPlrBbEe+c3r9pjceVPgupIfNIhc4yx55H69OXANrUaSuu9eInKg=="
     },
     "websocket-as-promised": {
       "version": "1.0.1",
diff --git a/package.json b/package.json
index 1d13b435..cc91d5b7 100644
--- a/package.json
+++ b/package.json
@@ -68,7 +68,7 @@
     "axios": "0.20.0",
     "color-convert": "2.0.1",
     "correcting-interval": "2.0.0",
-    "fakegato-history": "0.5.6",
+    "fakegato-history": "simont77/fakegato-history#Updated-Energy",
     "homebridge-lib": "4.7.16",
     "interval-promise": "1.4.0",
     "node-dns-sd": "0.4.2",

From 0116834d729d05e902d3832cafc9a41f48df5cfc Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 12 Oct 2020 15:52:10 +0100
Subject: [PATCH 0460/3183] upgrade config

---
 config.schema.json | 28 ++++++++++++++++++++++++++++
 lib/eWeLink.js     |  8 +++++++-
 lib/eWeLinkLAN.js  | 13 ++++++-------
 3 files changed, 41 insertions(+), 8 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index b70ca21d..fa9d4669 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -108,6 +108,34 @@
         "description": "If enabled, double and long press options will be hidden for the ZigBee button.",
         "default": false
       },
+      "nameOverride": {
+        "type": "array",
+        "items": {
+          "type": "object",
+          "properties": {
+            "fullDeviceId": {
+              "type": "string"
+            },
+            "deviceName": {
+              "type": "string"
+            }
+          }
+        }
+      },
+      "ipOverride": {
+        "type": "array",
+        "items": {
+          "type": "object",
+          "properties": {
+            "deviceId": {
+              "type": "string"
+            },
+            "deviceIP": {
+              "type": "string"
+            }
+          }
+        }
+      },
       "groups": {
         "type": "array",
         "title": "Accessory Simulations",
diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index 10f03af3..db82f375 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -45,6 +45,12 @@ class eWeLink {
 
     //* ** UPGRADE **\\
     this.config.hideChanFromHB += this.config.hideMasters + ',' + this.config.hideFromHB
+    this.nameOverrideTmp = {}
+    this.ipOverrideTmp = {}
+    this.config.nameOverride.forEach(x => this.nameOverrideTmp[x.key] = x.value)
+    this.config.ipOverride.forEach(x => this.ipOverrideTmp[x.key] = x.value)
+    this.config.nameOverride = this.nameOverrideTmp
+    this.config.ipOverride = this.ipOverrideTmp
     //* *************\\
     this.api
       .on('didFinishLaunching', () => this.eWeLinkSetup())
@@ -493,7 +499,7 @@ class eWeLink {
     if (['1', '2', '3', '4'].includes(switchNumber) && type !== 'rf_sub') {
       newDeviceName += ' SW' + switchNumber
     }
-    if (utils.hasProperty(this.config.nameOverride || {}, hbDeviceId)) {
+    if (utils.hasProperty(this.config.nameOverride, hbDeviceId)) {
       newDeviceName = this.config.nameOverride[hbDeviceId]
     }
     try {
diff --git a/lib/eWeLinkLAN.js b/lib/eWeLinkLAN.js
index 2982f371..b06e257a 100644
--- a/lib/eWeLinkLAN.js
+++ b/lib/eWeLinkLAN.js
@@ -11,15 +11,14 @@ module.exports = class eWeLinkLAN {
     this.config = config
     this.debug = this.config.debug || false
     this.debugReqRes = this.config.debugReqRes || false
-    this.ipOverrides = this.config.ipOverride || {}
     this.emitter = new EventEmitter()
     this.devices = devices
     this.deviceMap = new Map()
     devices.forEach(device => {
       this.deviceMap.set(device.deviceid, {
         apiKey: device.devicekey,
-        online: !!utils.hasProperty(this.ipOverrides, device.deviceid),
-        ip: utils.hasProperty(this.ipOverrides, device.deviceid) ? this.ipOverrides[device.deviceid] : null
+        online: utils.hasProperty(this.config.ipOverride, device.deviceid),
+        ip: utils.hasProperty(this.config.ipOverride, device.deviceid) ? this.config.ipOverride[device.deviceid] : null
       })
     })
   }
@@ -30,7 +29,7 @@ module.exports = class eWeLinkLAN {
       let d
       const deviceId = device.fqdn.replace('._ewelink._tcp.local', '').replace('eWeLink_', '')
       if ((d = this.deviceMap.get(deviceId))) {
-        if (!utils.hasProperty(this.ipOverrides, deviceId)) {
+        if (!utils.hasProperty(this.config.ipOverride, deviceId)) {
           this.deviceMap.set(deviceId, {
             apiKey: d.apiKey,
             online: true,
@@ -61,7 +60,7 @@ module.exports = class eWeLinkLAN {
             const dText = crypto.createDecipheriv('aes-128-cbc', key, Buffer.from(rdata.iv, 'base64'))
             const pText = Buffer.concat([dText.update(Buffer.from(data, 'base64')), dText.final()]).toString('utf8')
             let params
-            if (packet.address !== deviceInfo.ip && !utils.hasProperty(this.ipOverrides, rdata.id)) {
+            if (packet.address !== deviceInfo.ip && !utils.hasProperty(this.config.ipOverride, rdata.id)) {
               this.deviceMap.set(rdata.id, {
                 apiKey: deviceInfo.apiKey,
                 online: true,
@@ -166,8 +165,8 @@ module.exports = class eWeLinkLAN {
   addDeviceToMap (device) {
     this.deviceMap.set(device.deviceid, {
       apiKey: device.devicekey,
-      online: !!utils.hasProperty(this.ipOverrides, device.deviceid),
-      ip: utils.hasProperty(this.ipOverrides, device.deviceid) ? this.ipOverrides[device.deviceid] : null
+      online: utils.hasProperty(this.config.ipOverride, device.deviceid),
+      ip: utils.hasProperty(this.config.ipOverride, device.deviceid) ? this.config.ipOverride[device.deviceid] : null
     })
   }
 

From 62df4f915d2929c8bceca325f50b7b9f12383344 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 12 Oct 2020 16:03:23 +0100
Subject: [PATCH 0461/3183] Update eWeLink.js

---
 lib/eWeLink.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index db82f375..7ca0c121 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -47,8 +47,8 @@ class eWeLink {
     this.config.hideChanFromHB += this.config.hideMasters + ',' + this.config.hideFromHB
     this.nameOverrideTmp = {}
     this.ipOverrideTmp = {}
-    this.config.nameOverride.forEach(x => this.nameOverrideTmp[x.key] = x.value)
-    this.config.ipOverride.forEach(x => this.ipOverrideTmp[x.key] = x.value)
+    this.config.nameOverride.forEach(x => (this.nameOverrideTmp[x.key] = x.value))
+    this.config.ipOverride.forEach(x => (this.ipOverrideTmp[x.key] = x.value))
     this.config.nameOverride = this.nameOverrideTmp
     this.config.ipOverride = this.ipOverrideTmp
     //* *************\\

From aa80dc2769ed2e658083eb70d633586fa4a7536f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 13 Oct 2020 06:06:48 +0100
Subject: [PATCH 0462/3183] Update config.schema.json

---
 config.schema.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config.schema.json b/config.schema.json
index fa9d4669..31b651c1 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -50,7 +50,7 @@
         "type": "string",
         "title": "Hide Light/Switch Channels",
         "description": "A list of light/switch channels to hide from Homebridge. For example '10009553c8SW0' or multiple separated with a comma '10009553c8SW0,10009553c9SW2'.",
-        "default": false
+        "default": ""
       },
       "disableHTTPRefresh": {
         "type": "boolean",

From 616db674a5561cf499c1f2906b3b3798ada24d2e Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Wed, 14 Oct 2020 08:16:42 +0100
Subject: [PATCH 0463/3183] Update README.md

---
 README.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/README.md b/README.md
index 1d7026bd..dbed106a 100644
--- a/README.md
+++ b/README.md
@@ -16,6 +16,9 @@ Homebridge plugin to control eWeLink devices with original firmware.
 
 </span>
 
+### Homebridge
+To use this plugin, you will need to already have Homebridge installed. Please refer to the [Homebridge website](https://homebridge.io) for more information and installation instructions.
+
 ### Setup
 * [Installation (Homebridge)](https://github.com/bwp91/homebridge-ewelink/wiki/Installation-(Homebridge))
 * [Installation (HOOBS)](https://github.com/bwp91/homebridge-ewelink/wiki/Installation-(HOOBS))

From f234aade28ca13d3d3bf583e819c95000e0d242d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 14 Oct 2020 14:47:11 +0100
Subject: [PATCH 0464/3183] jshint options

---
 index.js                    |  1 +
 lib/constants.js            |  1 +
 lib/device/blind.js         |  1 +
 lib/device/curtain.js       |  1 +
 lib/device/fan.js           |  1 +
 lib/device/garage-eachen.js |  1 +
 lib/device/garage-two.js    |  1 +
 lib/device/garage.js        |  1 +
 lib/device/light.js         |  1 +
 lib/device/lock.js          |  1 +
 lib/device/outlet.js        |  1 +
 lib/device/rf-bridge.js     | 24 ++++++++++++------------
 lib/device/scm.js           |  1 +
 lib/device/sensor.js        |  5 +++--
 lib/device/switch.js        |  1 +
 lib/device/thermostat.js    |  1 +
 lib/device/usb.js           |  1 +
 lib/device/valve.js         |  1 +
 lib/device/zb-dev.js        |  7 ++++---
 lib/eWeLink.js              |  6 +++---
 lib/eWeLinkHTTP.js          |  7 ++++++-
 lib/eWeLinkLAN.js           |  1 +
 lib/eWeLinkWS.js            |  1 +
 lib/utils.js                |  1 +
 24 files changed, 47 insertions(+), 21 deletions(-)

diff --git a/index.js b/index.js
index bff9ae59..c815dcbd 100644
--- a/index.js
+++ b/index.js
@@ -1,3 +1,4 @@
+/* jshint -W014, -W033, esversion: 9 */
 'use strict'
 module.exports = function (homebridge) {
   const eWeLink = require('./lib/eWeLink.js')(homebridge)
diff --git a/lib/constants.js b/lib/constants.js
index c364dbb4..1c92339c 100644
--- a/lib/constants.js
+++ b/lib/constants.js
@@ -1,3 +1,4 @@
+/* jshint -W014, -W033, esversion: 9 */
 'use strict'
 module.exports = {
   appId: 'oeVkj2lYFGnJu5XUtWisfW4utiN4u9Mq',
diff --git a/lib/device/blind.js b/lib/device/blind.js
index fca991d9..ec90d22d 100644
--- a/lib/device/blind.js
+++ b/lib/device/blind.js
@@ -1,3 +1,4 @@
+/* jshint -W014, -W033, esversion: 9 */
 'use strict'
 let Characteristic, Service
 const cns = require('./../constants')
diff --git a/lib/device/curtain.js b/lib/device/curtain.js
index 6e16002c..18ebcbb5 100644
--- a/lib/device/curtain.js
+++ b/lib/device/curtain.js
@@ -1,3 +1,4 @@
+/* jshint -W014, -W033, esversion: 9 */
 'use strict'
 let Characteristic, Service
 const utils = require('./../utils')
diff --git a/lib/device/fan.js b/lib/device/fan.js
index 3919cdc3..b84aed51 100644
--- a/lib/device/fan.js
+++ b/lib/device/fan.js
@@ -1,3 +1,4 @@
+/* jshint -W014, -W033, esversion: 9 */
 'use strict'
 let Characteristic, Service
 const cns = require('./../constants')
diff --git a/lib/device/garage-eachen.js b/lib/device/garage-eachen.js
index 7983fff2..42e5d085 100644
--- a/lib/device/garage-eachen.js
+++ b/lib/device/garage-eachen.js
@@ -1,3 +1,4 @@
+/* jshint -W014, -W033, esversion: 9 */
 'use strict'
 let Characteristic, Service
 const utils = require('./../utils')
diff --git a/lib/device/garage-two.js b/lib/device/garage-two.js
index c647f167..931220f4 100644
--- a/lib/device/garage-two.js
+++ b/lib/device/garage-two.js
@@ -1,3 +1,4 @@
+/* jshint -W014, -W033, esversion: 9 */
 'use strict'
 let Characteristic, Service
 const utils = require('./../utils')
diff --git a/lib/device/garage.js b/lib/device/garage.js
index d4f6a46c..d11cccbf 100644
--- a/lib/device/garage.js
+++ b/lib/device/garage.js
@@ -1,3 +1,4 @@
+/* jshint -W014, -W033, esversion: 9 */
 'use strict'
 let Characteristic, Service
 const utils = require('./../utils')
diff --git a/lib/device/light.js b/lib/device/light.js
index aead63ec..14125bf1 100644
--- a/lib/device/light.js
+++ b/lib/device/light.js
@@ -1,3 +1,4 @@
+/* jshint -W014, -W033, esversion: 9 */
 'use strict'
 let Characteristic, Service
 const cns = require('./../constants')
diff --git a/lib/device/lock.js b/lib/device/lock.js
index eed6ef29..7ccb89ae 100644
--- a/lib/device/lock.js
+++ b/lib/device/lock.js
@@ -1,3 +1,4 @@
+/* jshint -W014, -W033, esversion: 9 */
 'use strict'
 let Characteristic, Service
 const utils = require('./../utils')
diff --git a/lib/device/outlet.js b/lib/device/outlet.js
index ae2a1419..ea799489 100644
--- a/lib/device/outlet.js
+++ b/lib/device/outlet.js
@@ -1,3 +1,4 @@
+/* jshint -W014, -W033, esversion: 9 */
 'use strict'
 let Characteristic, EveHistoryService, EveService, Service
 const cns = require('./../constants')
diff --git a/lib/device/rf-bridge.js b/lib/device/rf-bridge.js
index d1072925..e52a6b60 100644
--- a/lib/device/rf-bridge.js
+++ b/lib/device/rf-bridge.js
@@ -1,3 +1,4 @@
+/* jshint -W014, -W033, esversion: 9 */
 'use strict'
 let Characteristic, Service
 const utils = require('./../utils')
@@ -8,43 +9,42 @@ module.exports = class deviceRFBridge {
     Characteristic = platform.api.hap.Characteristic
     switch (accessory.context.subType) {
       case 'water':
-        accessory.getService(Service.LeakSensor) || accessory.addService(Service.LeakSensor)
+        if (!accessory.getService(Service.LeakSensor)) accessory.addService(Service.LeakSensor)
         break
       case 'fire':
       case 'smoke':
-        accessory.getService(Service.SmokeSensor) || accessory.addService(Service.SmokeSensor)
+        if (!accessory.getService(Service.SmokeSensor)) accessory.addService(Service.SmokeSensor)
         break
       case 'co':
-        accessory.getService(Service.CarbonMonoxideSensor) || accessory.addService(Service.CarbonMonoxideSensor)
+        if (!accessory.getService(Service.CarbonMonoxideSensor))  accessory.addService(Service.CarbonMonoxideSensor)
         break
       case 'co2':
-        accessory.getService(Service.CarbonDioxideSensor) || accessory.addService(Service.CarbonDioxideSensor)
+        if (!accessory.getService(Service.CarbonDioxideSensor)) accessory.addService(Service.CarbonDioxideSensor)
         break
       case 'contact':
-        accessory.getService(Service.ContactSensor) || accessory.addService(Service.ContactSensor)
+        if (!accessory.getService(Service.ContactSensor)) accessory.addService(Service.ContactSensor)
         break
       case 'occupancy':
-        accessory.getService(Service.OccupancySensor) || accessory.addService(Service.OccupancySensor)
+        if (!accessory.getService(Service.OccupancySensor)) accessory.addService(Service.OccupancySensor)
         break
       default:
-        accessory.getService(Service.MotionSensor) || accessory.addService(Service.MotionSensor)
+        if (!accessory.getService(Service.MotionSensor)) accessory.addService(Service.MotionSensor)
         break
       case 'button':
         Object.entries(accessory.context.buttons).forEach(([chan, name]) => {
-          accessory.getService(name) || accessory.addService(Service.Switch, name, 'switch' + chan)
+          if (!accessory.getService(name)) accessory.addService(Service.Switch, name, 'switch' + chan)
           accessory.getService(name).updateCharacteristic(Characteristic.On, false)
           accessory.getService(name).getCharacteristic(Characteristic.On)
-            .on('set', (value, callback) => {
-              value ? this.internalUpdate(accessory, chan, name, callback) : callback()
-            })
+            .on('set', (value, callback) => this.internalUpdate(accessory, chan, name, value, callback))
         })
         break
     }
   }
 
-  async internalUpdate (accessory, rfChl, service, callback) {
+  async internalUpdate (accessory, rfChl, service, value, callback) {
     callback()
     try {
+      if (!value) return
       const params = {
         cmd: 'transmit',
         rfChl: parseInt(rfChl)
diff --git a/lib/device/scm.js b/lib/device/scm.js
index 8f22a3e2..9e4e1165 100644
--- a/lib/device/scm.js
+++ b/lib/device/scm.js
@@ -1,3 +1,4 @@
+/* jshint -W014, -W033, esversion: 9 */
 'use strict'
 let Characteristic, Service
 const cns = require('./../constants')
diff --git a/lib/device/sensor.js b/lib/device/sensor.js
index f8eb9c6e..0ded5346 100644
--- a/lib/device/sensor.js
+++ b/lib/device/sensor.js
@@ -1,3 +1,4 @@
+/* jshint -W014, -W033, esversion: 9 */
 'use strict'
 let Characteristic, Service
 const utils = require('./../utils')
@@ -6,8 +7,8 @@ module.exports = class deviceSensor {
     this.platform = platform
     Service = platform.api.hap.Service
     Characteristic = platform.api.hap.Characteristic
-    accessory.getService(Service.ContactSensor) || accessory.addService(Service.ContactSensor)
-    accessory.getService(Service.BatteryService) || accessory.addService(Service.BatteryService)
+    if (!accessory.getService(Service.ContactSensor)) accessory.addService(Service.ContactSensor)
+    if (!accessory.getService(Service.BatteryService)) accessory.addService(Service.BatteryService)
   }
 
   async externalUpdate (accessory, params) {
diff --git a/lib/device/switch.js b/lib/device/switch.js
index f287025f..c9371a79 100644
--- a/lib/device/switch.js
+++ b/lib/device/switch.js
@@ -1,3 +1,4 @@
+/* jshint -W014, -W033, esversion: 9 */
 'use strict'
 let Characteristic, EveHistoryService, Service
 const cns = require('./../constants')
diff --git a/lib/device/thermostat.js b/lib/device/thermostat.js
index 934314a8..92a81340 100644
--- a/lib/device/thermostat.js
+++ b/lib/device/thermostat.js
@@ -1,3 +1,4 @@
+/* jshint -W014, -W033, esversion: 9 */
 'use strict'
 let Characteristic, EveHistoryService, Service
 const corrInterval = require('correcting-interval')
diff --git a/lib/device/usb.js b/lib/device/usb.js
index eda32d7c..7089bb03 100644
--- a/lib/device/usb.js
+++ b/lib/device/usb.js
@@ -1,3 +1,4 @@
+/* jshint -W014, -W033, esversion: 9 */
 'use strict'
 let Characteristic, Service
 const cns = require('./../constants')
diff --git a/lib/device/valve.js b/lib/device/valve.js
index ee41f284..23e38061 100644
--- a/lib/device/valve.js
+++ b/lib/device/valve.js
@@ -1,3 +1,4 @@
+/* jshint -W014, -W033, esversion: 9 */
 'use strict'
 let Characteristic, Service
 const utils = require('./../utils')
diff --git a/lib/device/zb-dev.js b/lib/device/zb-dev.js
index e1ca5434..83f70153 100644
--- a/lib/device/zb-dev.js
+++ b/lib/device/zb-dev.js
@@ -1,3 +1,4 @@
+/* jshint -W014, -W033, esversion: 9 */
 'use strict'
 let Characteristic, Service, EveHistoryService
 const corrInterval = require('correcting-interval')
@@ -9,7 +10,7 @@ module.exports = class deviceZBDev {
     Service = platform.api.hap.Service
     Characteristic = platform.api.hap.Characteristic
     EveHistoryService = fakegato(platform.api)
-    accessory.getService(Service.BatteryService) || accessory.addService(Service.BatteryService)
+    if (!accessory.getService(Service.BatteryService)) accessory.addService(Service.BatteryService)
     switch (accessory.context.eweUIID) {
       case 1000: {
         const zbspsService =
@@ -44,10 +45,10 @@ module.exports = class deviceZBDev {
         break
       }
       case 2026:
-        accessory.getService(Service.MotionSensor) || accessory.addService(Service.MotionSensor)
+        if (!accessory.getService(Service.MotionSensor)) accessory.addService(Service.MotionSensor)
         break
       case 3026:
-        accessory.getService(Service.ContactSensor) || accessory.addService(Service.ContactSensor)
+        if (!accessory.getService(Service.ContactSensor)) accessory.addService(Service.ContactSensor)
         break
     }
   }
diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index 7ca0c121..3ca56137 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -1,3 +1,4 @@
+/* jshint -W014, -W033, esversion: 9 */
 'use strict'
 let Accessory, Characteristic, Service
 const cns = require('./constants')
@@ -42,15 +43,14 @@ class eWeLink {
     this.hiddenMasters = []
     this.eveLogPath = this.api.user.storagePath() + '/homebridge-ewelink/'
     this.wsRefreshFlag = true
-
-    //* ** UPGRADE **\\
-    this.config.hideChanFromHB += this.config.hideMasters + ',' + this.config.hideFromHB
     this.nameOverrideTmp = {}
     this.ipOverrideTmp = {}
     this.config.nameOverride.forEach(x => (this.nameOverrideTmp[x.key] = x.value))
     this.config.ipOverride.forEach(x => (this.ipOverrideTmp[x.key] = x.value))
     this.config.nameOverride = this.nameOverrideTmp
     this.config.ipOverride = this.ipOverrideTmp
+    //* ** UPGRADE **\\
+    this.config.hideChanFromHB += this.config.hideMasters + ',' + this.config.hideFromHB
     //* *************\\
     this.api
       .on('didFinishLaunching', () => this.eWeLinkSetup())
diff --git a/lib/eWeLinkHTTP.js b/lib/eWeLinkHTTP.js
index 9a05d605..e311f53b 100644
--- a/lib/eWeLinkHTTP.js
+++ b/lib/eWeLinkHTTP.js
@@ -1,3 +1,4 @@
+/* jshint -W014, -W033, esversion: 9 */
 'use strict'
 const axios = require('axios')
 const cns = require('./constants')
@@ -83,7 +84,11 @@ module.exports = class eWeLinkHTTP {
       countryCode: this.cCode,
       password: this.password
     }
-    this.username.includes('@') ? (data.email = this.username) : (data.phoneNumber = this.username)
+    if (this.username.includes('@')) {
+      data.email = this.username
+    } else {
+      data.phoneNumber = this.username
+    }
     if (this.debugReqRes) {
       const msg = JSON.stringify(data, null, 2).replace(this.password, '**hidden**').replace(this.username, '**hidden**')
       this.log.warn('Sending HTTP login() request. This text is yellow for clarity.\n%s', msg)
diff --git a/lib/eWeLinkLAN.js b/lib/eWeLinkLAN.js
index b06e257a..a04cdbcd 100644
--- a/lib/eWeLinkLAN.js
+++ b/lib/eWeLinkLAN.js
@@ -1,3 +1,4 @@
+/* jshint -W014, -W033, esversion: 9 */
 'use strict'
 const axios = require('axios')
 const cns = require('./constants')
diff --git a/lib/eWeLinkWS.js b/lib/eWeLinkWS.js
index 88cfbb04..50d0fe19 100644
--- a/lib/eWeLinkWS.js
+++ b/lib/eWeLinkWS.js
@@ -1,3 +1,4 @@
+/* jshint -W014, -W033, esversion: 9 */
 'use strict'
 const axios = require('axios')
 const cns = require('./constants')
diff --git a/lib/utils.js b/lib/utils.js
index eef849c6..4cd84223 100644
--- a/lib/utils.js
+++ b/lib/utils.js
@@ -1,3 +1,4 @@
+/* jshint -W014, -W033, esversion: 9 */
 'use strict'
 module.exports = {
   sleep: ms => {

From 9e4e38ceee95bcbc85955328360d329c0c2668ae Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 14 Oct 2020 14:47:19 +0100
Subject: [PATCH 0465/3183] tidy up

---
 config.schema.json | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 31b651c1..e34e5776 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -14,43 +14,42 @@
       "countryCode": {
         "type": "string",
         "title": "Country Code",
+        "required": true,
         "description": "The telephone country code linked to your eWeLink account (without the +)."
       },
       "username": {
         "type": "string",
         "title": "Username",
+        "required": true,
         "description": "The phone number or email address linked to your eWeLink account. If you use a phone number please enter the country code (with the +), for example +8613185260282."
       },
       "password": {
         "type": "string",
         "title": "Password",
+        "required": true,
         "description": "The password for your eWeLink account."
       },
       "debug": {
         "title": "Debug Logging",
         "type": "boolean",
-        "required": true,
         "description": "If enabled, more information will be added to the Homebridge log.",
         "default": false
       },
       "debugReqRes": {
         "title": "Request & Response Logging",
         "type": "boolean",
-        "required": true,
         "description": "If enabled, HTTP, web socket and LAN mode messages will be added to the log. Not recommended for long-term use.",
         "default": false
       },
       "hideDevFromHB": {
         "type": "string",
         "title": "Hide Devices",
-        "description": "A list of eWeLink devices to hide from Homebridge. For example '10009553c8' or multiple separated with a comma '10009553c8,10009553c9'.",
-        "default": ""
+        "description": "A list of eWeLink devices to hide from Homebridge. For example '10009553c8' or multiple separated with a comma '10009553c8,10009553c9'."
       },
       "hideChanFromHB": {
         "type": "string",
         "title": "Hide Light/Switch Channels",
-        "description": "A list of light/switch channels to hide from Homebridge. For example '10009553c8SW0' or multiple separated with a comma '10009553c8SW0,10009553c9SW2'.",
-        "default": ""
+        "description": "A list of light/switch channels to hide from Homebridge. For example '10009553c8SW0' or multiple separated with a comma '10009553c8SW0,10009553c9SW2'."
       },
       "disableHTTPRefresh": {
         "type": "boolean",
@@ -136,6 +135,9 @@
           }
         }
       },
+      "disablePlugin": {
+        "type": "boolean"
+      },
       "groups": {
         "type": "array",
         "title": "Accessory Simulations",
@@ -151,7 +153,6 @@
             "type": {
               "type": "string",
               "title": "Type",
-              "default": "null",
               "description": "The new type for this device.",
               "oneOf": [
                 {
@@ -195,7 +196,6 @@
             "setup": {
               "type": "string",
               "title": "Device Setup",
-              "default": "null",
               "description": "The setup for your garage doors.",
               "condition": {
                 "functionBody": "return (model.groups[arrayIndices] && model.groups[arrayIndices].type==='garage')"
@@ -254,7 +254,6 @@
             "type": {
               "type": "string",
               "title": "Sensor Type",
-              "default": "motion",
               "description": "Select the type of sensor you would like to expose this as in Homebridge.",
               "oneOf": [
                 {
@@ -304,12 +303,7 @@
           }
         }
       }
-    },
-    "required": [
-      "countryCode",
-      "username",
-      "password"
-    ]
+    }
   },
   "layout": [
     {

From 733aaff29587d9c1bc8acb72db4816e101af8293 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 14 Oct 2020 14:47:26 +0100
Subject: [PATCH 0466/3183] Homebridge info

---
 README.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/README.md b/README.md
index 1d7026bd..dbed106a 100644
--- a/README.md
+++ b/README.md
@@ -16,6 +16,9 @@ Homebridge plugin to control eWeLink devices with original firmware.
 
 </span>
 
+### Homebridge
+To use this plugin, you will need to already have Homebridge installed. Please refer to the [Homebridge website](https://homebridge.io) for more information and installation instructions.
+
 ### Setup
 * [Installation (Homebridge)](https://github.com/bwp91/homebridge-ewelink/wiki/Installation-(Homebridge))
 * [Installation (HOOBS)](https://github.com/bwp91/homebridge-ewelink/wiki/Installation-(HOOBS))

From 8c504753187cba7da65f5e095d2917a041ca90ea Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 14 Oct 2020 15:28:43 +0100
Subject: [PATCH 0467/3183] revert switch logging (for now)

---
 lib/device/switch.js | 40 ++--------------------------------------
 1 file changed, 2 insertions(+), 38 deletions(-)

diff --git a/lib/device/switch.js b/lib/device/switch.js
index c9371a79..8ab31ae1 100644
--- a/lib/device/switch.js
+++ b/lib/device/switch.js
@@ -1,35 +1,17 @@
 /* jshint -W014, -W033, esversion: 9 */
 'use strict'
-let Characteristic, EveHistoryService, Service
+let Characteristic, Service
 const cns = require('./../constants')
-const corrInterval = require('correcting-interval')
-const fakegato = require('fakegato-history')
 const utils = require('./../utils')
 module.exports = class deviceSwitch {
   constructor (platform, accessory) {
     this.platform = platform
     Service = platform.api.hap.Service
     Characteristic = platform.api.hap.Characteristic
-    EveHistoryService = fakegato(platform.api)
     const switchService = accessory.getService(Service.Switch) || accessory.addService(Service.Switch)
     switchService
       .getCharacteristic(Characteristic.On)
       .on('set', (value, callback) => this.internalUpdate(accessory, value, callback))
-    if (!this.platform.config.disableEveLogging) {
-      accessory.log = this.platform.log
-      accessory.eveLogger = new EveHistoryService('energy', accessory, {
-        storage: 'fs',
-        minutes: 5,
-        path: this.platform.eveLogPath
-      })
-      corrInterval.setCorrectingInterval(() => {
-        const isOn = switchService.getCharacteristic(Characteristic.On).value
-        accessory.eveLogger.addEntry({
-          time: Date.now(),
-          status: isOn ? 1 : 0
-        })
-      }, 300000)
-    }
   }
 
   async internalUpdate (accessory, value, callback) {
@@ -109,12 +91,6 @@ module.exports = class deviceSwitch {
       if (cns.devicesSingleSwitch.includes(accessory.context.eweUIID)) {
         if (!utils.hasProperty(params, 'switch')) return
         accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, params.switch === 'on')
-        if (!this.platform.config.disableEveLogging) {
-          accessory.eveLogger.addEntry({
-            time: Date.now(),
-            status: params.switch === 'on' ? 1 : 0
-          })
-        }
       } else if (cns.devicesMultiSwitch.includes(accessory.context.eweUIID)) {
         if (!utils.hasProperty(params, 'switches')) return
         const idToCheck = accessory.context.hbDeviceId.slice(0, -1)
@@ -129,26 +105,14 @@ module.exports = class deviceSwitch {
             oAccessory
               .getService(Service.Switch)
               .updateCharacteristic(Characteristic.On, params.switches[i - 1].switch === 'on')
-            if (!this.platform.config.disableEveLogging) {
-              accessory.eveLogger.addEntry({
-                time: Date.now(),
-                status: params.switches[i - 1].switch === 'on' ? 1 : 0
-              })
-            }
           }
         }
         if (!this.platform.hiddenMasters.includes(accessory.context.eweDeviceId)) {
           accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, primaryState)
-          if (!this.platform.config.disableEveLogging) {
-            accessory.eveLogger.addEntry({
-              time: Date.now(),
-              status: primaryState ? 1 : 0
-            })
-          }
         }
       }
     } catch (err) {
       this.platform.deviceUpdateError(accessory, err, false)
     }
   }
-}
+}
\ No newline at end of file

From e65ed2ec15b8693949e73cb7db8af9183bca587b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 14 Oct 2020 15:28:50 +0100
Subject: [PATCH 0468/3183] versions

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index cc91d5b7..1d13b435 100644
--- a/package.json
+++ b/package.json
@@ -68,7 +68,7 @@
     "axios": "0.20.0",
     "color-convert": "2.0.1",
     "correcting-interval": "2.0.0",
-    "fakegato-history": "simont77/fakegato-history#Updated-Energy",
+    "fakegato-history": "0.5.6",
     "homebridge-lib": "4.7.16",
     "interval-promise": "1.4.0",
     "node-dns-sd": "0.4.2",

From f8babc9bb5156a084fe181b00dded5fb65f20078 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 14 Oct 2020 15:30:05 +0100
Subject: [PATCH 0469/3183] standard js formatting

---
 lib/device/rf-bridge.js | 2 +-
 lib/device/switch.js    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/device/rf-bridge.js b/lib/device/rf-bridge.js
index e52a6b60..5a7ff260 100644
--- a/lib/device/rf-bridge.js
+++ b/lib/device/rf-bridge.js
@@ -16,7 +16,7 @@ module.exports = class deviceRFBridge {
         if (!accessory.getService(Service.SmokeSensor)) accessory.addService(Service.SmokeSensor)
         break
       case 'co':
-        if (!accessory.getService(Service.CarbonMonoxideSensor))  accessory.addService(Service.CarbonMonoxideSensor)
+        if (!accessory.getService(Service.CarbonMonoxideSensor)) accessory.addService(Service.CarbonMonoxideSensor)
         break
       case 'co2':
         if (!accessory.getService(Service.CarbonDioxideSensor)) accessory.addService(Service.CarbonDioxideSensor)
diff --git a/lib/device/switch.js b/lib/device/switch.js
index 8ab31ae1..095f2901 100644
--- a/lib/device/switch.js
+++ b/lib/device/switch.js
@@ -115,4 +115,4 @@ module.exports = class deviceSwitch {
       this.platform.deviceUpdateError(accessory, err, false)
     }
   }
-}
\ No newline at end of file
+}

From c1424499e14c2269fa1e23a6010e1fe73b338c4f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 14 Oct 2020 15:33:19 +0100
Subject: [PATCH 0470/3183] Update package-lock.json

---
 package-lock.json | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index fcf3e199..79f3a722 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -224,8 +224,9 @@
       "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
     },
     "fakegato-history": {
-      "version": "github:simont77/fakegato-history#bc07b298838ec98a88ba07f519c4af53b9ce4230",
-      "from": "github:simont77/fakegato-history#Updated-Energy",
+      "version": "0.5.6",
+      "resolved": "https://registry.npmjs.org/fakegato-history/-/fakegato-history-0.5.6.tgz",
+      "integrity": "sha512-LlsOkiw9LntVlRlBkssD5ozhEkQzYuEJUlvXk5YAgBQcWzk19PQ5g+NoKfs6SRY1qAeC1onb65hes4mCvY+JmA==",
       "requires": {
         "debug": "^2.2.0",
         "googleapis": ">39.1.0",

From 8c3f72cfd92d5ba84a2103e5819ac2a6f996f2d2 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 14 Oct 2020 15:42:12 +0100
Subject: [PATCH 0471/3183] prop names

---
 lib/eWeLink.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index 3ca56137..64655c5d 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -45,8 +45,8 @@ class eWeLink {
     this.wsRefreshFlag = true
     this.nameOverrideTmp = {}
     this.ipOverrideTmp = {}
-    this.config.nameOverride.forEach(x => (this.nameOverrideTmp[x.key] = x.value))
-    this.config.ipOverride.forEach(x => (this.ipOverrideTmp[x.key] = x.value))
+    if (this.config.nameOverride) this.config.nameOverride.forEach(x => (this.nameOverrideTmp[x.fullDeviceId] = x.deviceName))
+    if (this.config.ipOverride) this.config.ipOverride.forEach(x => (this.ipOverrideTmp[x.deviceId] = x.deviceIP))
     this.config.nameOverride = this.nameOverrideTmp
     this.config.ipOverride = this.ipOverrideTmp
     //* ** UPGRADE **\\

From df729ebffdf0888207e525cc4d106df9d7518593 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 14 Oct 2020 15:47:05 +0100
Subject: [PATCH 0472/3183] check exists

---
 lib/eWeLink.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index 64655c5d..e585c259 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -286,7 +286,7 @@ class eWeLink {
         /*********************
         LIGHTS [MULTI CHANNEL]
         *********************/
-        if ((this.config.hideChanFromHB.split(',') || []).includes(device.deviceid)) {
+        if ((this.config.hideChanFromHB || "").split(',').includes(device.deviceid)) {
           if (this.devicesInHB.has(device.deviceid + 'SW0')) {
             this.removeAccessory(this.devicesInHB.get(device.deviceid + 'SW0'))
           }
@@ -299,7 +299,7 @@ class eWeLink {
         }
         accessory.control = new DeviceLight(this, accessory)
         for (let i = 1; i <= cns.chansFromUiid[device.extra.uiid]; i++) {
-          if ((this.config.hideChanFromHB.split(',') || []).includes(device.deviceid + 'SW' + i)) {
+          if ((this.config.hideChanFromHB || "").split(',').includes(device.deviceid + 'SW' + i)) {
             if (this.devicesInHB.has(device.deviceid + 'SW' + i)) {
               this.removeAccessory(this.devicesInHB.get(device.deviceid + 'SW' + i))
             }
@@ -331,7 +331,7 @@ class eWeLink {
         /***********************
         SWITCHES [MULTI CHANNEL]
         ***********************/
-        if ((this.config.hideChanFromHB.split(',') || []).includes(device.deviceid)) {
+        if ((this.config.hideChanFromHB || "").split(',').includes(device.deviceid)) {
           if (this.devicesInHB.has(device.deviceid + 'SW0')) {
             this.removeAccessory(this.devicesInHB.get(device.deviceid + 'SW0'))
           }
@@ -344,7 +344,7 @@ class eWeLink {
         }
         accessory.control = new DeviceSwitch(this, accessory)
         for (let i = 1; i <= cns.chansFromUiid[device.extra.uiid]; i++) {
-          if ((this.config.hideChanFromHB.split(',') || []).includes(device.deviceid + 'SW' + i)) {
+          if ((this.config.hideChanFromHB || "").split(',').includes(device.deviceid + 'SW' + i)) {
             if (this.devicesInHB.has(device.deviceid + 'SW' + i)) {
               this.removeAccessory(this.devicesInHB.get(device.deviceid + 'SW' + i))
             }

From ef28194054eb096300fdc5da9c519a514f1638ff Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 14 Oct 2020 15:50:26 +0100
Subject: [PATCH 0473/3183] standard js formatting

---
 lib/eWeLink.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/eWeLink.js b/lib/eWeLink.js
index e585c259..26aa3c9a 100644
--- a/lib/eWeLink.js
+++ b/lib/eWeLink.js
@@ -286,7 +286,7 @@ class eWeLink {
         /*********************
         LIGHTS [MULTI CHANNEL]
         *********************/
-        if ((this.config.hideChanFromHB || "").split(',').includes(device.deviceid)) {
+        if ((this.config.hideChanFromHB || '').split(',').includes(device.deviceid)) {
           if (this.devicesInHB.has(device.deviceid + 'SW0')) {
             this.removeAccessory(this.devicesInHB.get(device.deviceid + 'SW0'))
           }
@@ -299,7 +299,7 @@ class eWeLink {
         }
         accessory.control = new DeviceLight(this, accessory)
         for (let i = 1; i <= cns.chansFromUiid[device.extra.uiid]; i++) {
-          if ((this.config.hideChanFromHB || "").split(',').includes(device.deviceid + 'SW' + i)) {
+          if ((this.config.hideChanFromHB || '').split(',').includes(device.deviceid + 'SW' + i)) {
             if (this.devicesInHB.has(device.deviceid + 'SW' + i)) {
               this.removeAccessory(this.devicesInHB.get(device.deviceid + 'SW' + i))
             }
@@ -331,7 +331,7 @@ class eWeLink {
         /***********************
         SWITCHES [MULTI CHANNEL]
         ***********************/
-        if ((this.config.hideChanFromHB || "").split(',').includes(device.deviceid)) {
+        if ((this.config.hideChanFromHB || '').split(',').includes(device.deviceid)) {
           if (this.devicesInHB.has(device.deviceid + 'SW0')) {
             this.removeAccessory(this.devicesInHB.get(device.deviceid + 'SW0'))
           }
@@ -344,7 +344,7 @@ class eWeLink {
         }
         accessory.control = new DeviceSwitch(this, accessory)
         for (let i = 1; i <= cns.chansFromUiid[device.extra.uiid]; i++) {
-          if ((this.config.hideChanFromHB || "").split(',').includes(device.deviceid + 'SW' + i)) {
+          if ((this.config.hideChanFromHB || '').split(',').includes(device.deviceid + 'SW' + i)) {
             if (this.devicesInHB.has(device.deviceid + 'SW' + i)) {
               this.removeAccessory(this.devicesInHB.get(device.deviceid + 'SW' + i))
             }

From 0879081a2158f7b28e5addc381f9c4459bf4c0bd Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 14 Oct 2020 15:51:09 +0100
Subject: [PATCH 0474/3183] 3.6.0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 79f3a722..28a4db2c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.6.0-1",
+  "version": "3.6.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 1d13b435..e093926d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.6.0-1",
+  "version": "3.6.0",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From cb3f9bb6f2c97844f591cf76e04cd50d5c9a9f0a Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Wed, 14 Oct 2020 22:42:08 +0100
Subject: [PATCH 0475/3183] Update README.md

---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index dbed106a..4fb13bae 100644
--- a/README.md
+++ b/README.md
@@ -37,7 +37,6 @@ To use this plugin, you will need to already have Homebridge installed. Please r
 ### About
 * [About Me](https://github.com/sponsors/bwp91)
 * [Support Request](https://github.com/bwp91/homebridge-ewelink/issues/new/choose)
-* [Roadmap](https://github.com/bwp91/homebridge-ewelink/wiki/Roadmap)
 * [Credits](https://github.com/bwp91/homebridge-ewelink/wiki/Credits)
 ### Disclaimer
 I am in no way affiliated with eWeLink nor any of the device brands (like Sonoff) and this plugin is a personal project that I maintain in my free time.

From c429a5722fac3cad3a1f3d9ac2389750432974a9 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 15 Oct 2020 11:09:35 +0100
Subject: [PATCH 0476/3183] file reorganisation 1

---
 index.js                                |   7 +-
 lib/device/blind.js                     |  79 +++++-----
 lib/device/curtain.js                   |  56 +++----
 lib/device/fan.js                       |   8 +-
 lib/device/garage-eachen.js             |   9 +-
 lib/device/garage-two.js                |  11 +-
 lib/device/garage.js                    |  13 +-
 lib/device/light.js                     | 190 ++++++++++++------------
 lib/device/lock.js                      |   9 +-
 lib/device/outlet.js                    |  96 ++++++------
 lib/device/rf-bridge.js                 |  21 +--
 lib/device/scm.js                       |   8 +-
 lib/device/sensor.js                    |   9 +-
 lib/device/switch.js                    |  16 +-
 lib/device/thermostat.js                |  13 +-
 lib/device/usb.js                       |   8 +-
 lib/device/valve.js                     |   5 +-
 lib/device/zb-dev.js                    |  19 +--
 lib/{eWeLinkHTTP.js => ewelink-http.js} |  54 +++----
 lib/{eWeLinkLAN.js => ewelink-lan.js}   |  36 ++---
 lib/{eWeLink.js => ewelink-platform.js} | 121 ++++++++-------
 lib/{eWeLinkWS.js => ewelink-ws.js}     |  50 +++----
 lib/{constants.js => helpers.js}        |   7 +
 lib/utils.js                            |  10 --
 24 files changed, 428 insertions(+), 427 deletions(-)
 rename lib/{eWeLinkHTTP.js => ewelink-http.js} (81%)
 rename lib/{eWeLinkLAN.js => ewelink-lan.js} (81%)
 rename lib/{eWeLink.js => ewelink-platform.js} (86%)
 rename lib/{eWeLinkWS.js => ewelink-ws.js} (85%)
 rename lib/{constants.js => helpers.js} (97%)
 delete mode 100644 lib/utils.js

diff --git a/index.js b/index.js
index c815dcbd..11038152 100644
--- a/index.js
+++ b/index.js
@@ -1,6 +1,7 @@
 /* jshint -W014, -W033, esversion: 9 */
+/* eslint-disable new-cap */
 'use strict'
-module.exports = function (homebridge) {
-  const eWeLink = require('./lib/eWeLink.js')(homebridge)
-  homebridge.registerPlatform('homebridge-ewelink', 'eWeLink', eWeLink, true)
+const eWeLinkPlatform = require('./lib/ewelink-platform.js')
+module.exports = (hb) => {
+  hb.registerPlatform('homebridge-ewelink', 'eWeLink', eWeLinkPlatform, true)
 }
diff --git a/lib/device/blind.js b/lib/device/blind.js
index ec90d22d..b65d9538 100644
--- a/lib/device/blind.js
+++ b/lib/device/blind.js
@@ -1,87 +1,86 @@
 /* jshint -W014, -W033, esversion: 9 */
+/* eslint-disable new-cap */
 'use strict'
-let Characteristic, Service
-const cns = require('./../constants')
-const utils = require('./../utils')
+const helpers = require('./../helpers')
 module.exports = class deviceBlind {
   constructor (platform, accessory) {
     this.platform = platform
-    Service = platform.api.hap.Service
-    Characteristic = platform.api.hap.Characteristic
+    this.Service = platform.api.hap.Service
+    this.Characteristic = platform.api.hap.Characteristic
     let wcService
-    if (!(wcService = accessory.getService(Service.WindowCovering))) {
+    if (!(wcService = accessory.getService(this.Service.WindowCovering))) {
       accessory
-        .addService(Service.WindowCovering)
-        .setCharacteristic(Characteristic.CurrentPosition, 0)
-        .setCharacteristic(Characteristic.TargetPosition, 0)
-        .setCharacteristic(Characteristic.PositionState, 2)
-      wcService = accessory.getService(Service.WindowCovering)
+        .addService(this.Service.WindowCovering)
+        .setCharacteristic(this.Characteristic.CurrentPosition, 0)
+        .setCharacteristic(this.Characteristic.TargetPosition, 0)
+        .setCharacteristic(this.Characteristic.PositionState, 2)
+      wcService = accessory.getService(this.Service.WindowCovering)
     }
     wcService
-      .getCharacteristic(Characteristic.TargetPosition)
-      .on('set', (value, callback) => this.internalUpdate(accessory, value, callback))
+      .getCharacteristic(this.Characteristic.TargetPosition)
+      .on('set', (value, callback) => this.internalUpdate(value, callback))
   }
 
-  async internalUpdate (accessory, value, callback) {
+  async internalUpdate (value, callback) {
     callback()
     try {
       let blindConfig
       const params = {}
-      const wcService = accessory.getService(Service.WindowCovering)
-      const prevState = accessory.context.cachePositionState
-      let prevPosition = accessory.context.cacheCurrentPosition
+      const wcService = this.accessory.getService(this.Service.WindowCovering)
+      const prevState = this.accessory.context.cachePositionState
+      let prevPosition = this.accessory.context.cacheCurrentPosition
       const newTarget = value
       const updateKey = Math.random().toString(36).substr(2, 8)
-      if (!(blindConfig = this.platform.cusG.get(accessory.context.hbDeviceId))) {
+      if (!(blindConfig = this.platform.cusG.get(this.accessory.context.hbDeviceId))) {
         throw new Error('group config missing')
       }
       if (blindConfig.type !== 'blind') {
         throw new Error('improper configuration')
       }
       if (newTarget === prevPosition) return
-      params.switches = cns.defaultMultiSwitchOff
-      accessory.context.updateKey = updateKey
+      params.switches = helpers.defaultMultiSwitchOff
+      this.accessory.context.updateKey = updateKey
       const percentStepPerDecisecond = blindConfig.operationTime / 100
       if (prevState !== 2) {
-        await this.platform.sendDeviceUpdate(accessory, params)
-        let positionPercentChange = Math.floor(Date.now() / 100) - accessory.context.cacheLastStartTime
+        await this.platform.sendDeviceUpdate(this.accessory, params)
+        let positionPercentChange = Math.floor(Date.now() / 100) - this.accessory.context.cacheLastStartTime
         positionPercentChange = Math.floor(percentStepPerDecisecond * positionPercentChange)
         if (prevState === 0) {
           prevPosition -= positionPercentChange
         } else {
           prevPosition += positionPercentChange
         }
-        wcService.updateCharacteristic(Characteristic.CurrentPosition, prevPosition)
-        accessory.context.cacheCurrentPosition = prevPosition
+        wcService.updateCharacteristic(this.Characteristic.CurrentPosition, prevPosition)
+        this.accessory.context.cacheCurrentPosition = prevPosition
       }
       const diffPosition = newTarget - prevPosition
       const setToMoveUp = diffPosition > 0
       const decisecondsToMove = Math.round(Math.abs(diffPosition) * percentStepPerDecisecond)
       params.switches[0].switch = setToMoveUp ? 'on' : 'off'
       params.switches[1].switch = setToMoveUp ? 'off' : 'on'
-      await this.platform.sendDeviceUpdate(accessory, params)
+      await this.platform.sendDeviceUpdate(this.accessory, params)
       wcService
-        .updateCharacteristic(Characteristic.TargetPosition, newTarget)
-        .updateCharacteristic(Characteristic.PositionState, setToMoveUp)
-      accessory.context.cacheTargetPosition = newTarget
-      accessory.context.cachePositionState = setToMoveUp ? 1 : 0
-      accessory.context.cacheLastStartTime = Math.floor(Date.now() / 100)
-      if (accessory.context.updateKey !== updateKey) return
-      await utils.sleep(decisecondsToMove * 100)
-      if (accessory.context.updateKey !== updateKey) return
+        .updateCharacteristic(this.Characteristic.TargetPosition, newTarget)
+        .updateCharacteristic(this.Characteristic.PositionState, setToMoveUp)
+      this.accessory.context.cacheTargetPosition = newTarget
+      this.accessory.context.cachePositionState = setToMoveUp ? 1 : 0
+      this.accessory.context.cacheLastStartTime = Math.floor(Date.now() / 100)
+      if (this.accessory.context.updateKey !== updateKey) return
+      await helpers.sleep(decisecondsToMove * 100)
+      if (this.accessory.context.updateKey !== updateKey) return
       params.switches[0].switch = 'off'
       params.switches[1].switch = 'off'
-      await this.platform.sendDeviceUpdate(accessory, params)
-      wcService.updateCharacteristic(Characteristic.PositionState, 2)
-      wcService.updateCharacteristic(Characteristic.CurrentPosition, newTarget)
-      accessory.context.cachePositionState = 2
-      accessory.context.cacheCurrentPosition = newTarget
+      await this.platform.sendDeviceUpdate(this.accessory, params)
+      wcService.updateCharacteristic(this.Characteristic.PositionState, 2)
+      wcService.updateCharacteristic(this.Characteristic.CurrentPosition, newTarget)
+      this.accessory.context.cachePositionState = 2
+      this.accessory.context.cacheCurrentPosition = newTarget
     } catch (err) {
-      this.platform.deviceUpdateError(accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true)
     }
   }
 
-  async externalUpdate (accessory, params) {
+  async externalUpdate (params) {
 
   }
 }
diff --git a/lib/device/curtain.js b/lib/device/curtain.js
index 18ebcbb5..49d45da4 100644
--- a/lib/device/curtain.js
+++ b/lib/device/curtain.js
@@ -1,32 +1,32 @@
 /* jshint -W014, -W033, esversion: 9 */
+/* eslint-disable new-cap */
 'use strict'
-let Characteristic, Service
-const utils = require('./../utils')
+const helpers = require('./../helpers')
 module.exports = class deviceCurtain {
   constructor (platform, accessory) {
     this.platform = platform
-    Service = platform.api.hap.Service
-    Characteristic = platform.api.hap.Characteristic
+    this.Service = platform.api.hap.Service
+    this.Characteristic = platform.api.hap.Characteristic
     let cService
-    if (!(cService = accessory.getService(Service.WindowCovering))) {
+    if (!(cService = accessory.getService(this.Service.WindowCovering))) {
       accessory
-        .addService(Service.WindowCovering)
-        .setCharacteristic(Characteristic.CurrentPosition, 0)
-        .setCharacteristic(Characteristic.TargetPosition, 0)
-        .setCharacteristic(Characteristic.PositionState, 2)
-      cService = accessory.getService(Service.WindowCovering)
+        .addService(this.Service.WindowCovering)
+        .setCharacteristic(this.Characteristic.CurrentPosition, 0)
+        .setCharacteristic(this.Characteristic.TargetPosition, 0)
+        .setCharacteristic(this.Characteristic.PositionState, 2)
+      cService = accessory.getService(this.Service.WindowCovering)
     }
     cService
-      .getCharacteristic(Characteristic.TargetPosition)
-      .on('set', (value, callback) => this.internalUpdate(accessory, value, callback))
+      .getCharacteristic(this.Characteristic.TargetPosition)
+      .on('set', (value, callback) => this.internalUpdate(value, callback))
   }
 
-  async internalUpdate (accessory, value, callback) {
+  async internalUpdate (value, callback) {
     callback()
     try {
       let params
-      const cService = accessory.getService(Service.WindowCovering)
-      const prevPos = accessory.context.cacheCurrentPosition
+      const cService = this.accessory.getService(this.Service.WindowCovering)
+      const prevPos = this.accessory.context.cacheCurrentPosition
       const newPos = value
       if (newPos === prevPos) return
       if (newPos === 0 || newPos === 100) {
@@ -38,31 +38,31 @@ module.exports = class deviceCurtain {
           setclose: Math.abs(100 - newPos)
         }
       }
-      await this.platform.sendDeviceUpdate(accessory, params)
+      await this.platform.sendDeviceUpdate(this.accessory, params)
       cService
-        .updateCharacteristic(Characteristic.TargetPosition, newPos)
-        .updateCharacteristic(Characteristic.PositionState, newPos > prevPos ? 1 : 0)
-      accessory.context.cacheCurrentPosition = newPos
+        .updateCharacteristic(this.Characteristic.TargetPosition, newPos)
+        .updateCharacteristic(this.Characteristic.PositionState, newPos > prevPos ? 1 : 0)
+      this.accessory.context.cacheCurrentPosition = newPos
     } catch (err) {
-      this.platform.deviceUpdateError(accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true)
     }
   }
 
-  async externalUpdate (accessory, params) {
+  async externalUpdate (params) {
     try {
-      const cService = accessory.getService(Service.WindowCovering)
-      if (!utils.hasProperty(params, 'switch') && !utils.hasProperty(params, 'setclose')) {
+      const cService = this.accessory.getService(this.Service.WindowCovering)
+      if (!helpers.hasProperty(params, 'switch') && !helpers.hasProperty(params, 'setclose')) {
         return
       }
       const newPos = Math.abs(100 - parseInt(params.setclose))
       cService
-        .updateCharacteristic(Characteristic.TargetPosition, newPos)
-        .updateCharacteristic(Characteristic.CurrentPosition, newPos)
-        .updateCharacteristic(Characteristic.PositionState, 2)
-      accessory.context.cacheCurrentPosition = newPos
+        .updateCharacteristic(this.Characteristic.TargetPosition, newPos)
+        .updateCharacteristic(this.Characteristic.CurrentPosition, newPos)
+        .updateCharacteristic(this.Characteristic.PositionState, 2)
+      this.accessory.context.cacheCurrentPosition = newPos
       return
     } catch (err) {
-      this.platform.deviceUpdateError(accessory, err, false)
+      this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
 }
diff --git a/lib/device/fan.js b/lib/device/fan.js
index b84aed51..c6f51864 100644
--- a/lib/device/fan.js
+++ b/lib/device/fan.js
@@ -1,8 +1,8 @@
 /* jshint -W014, -W033, esversion: 9 */
+/* eslint-disable new-cap */
 'use strict'
 let Characteristic, Service
-const cns = require('./../constants')
-const utils = require('./../utils')
+const helpers = require('./../helpers')
 module.exports = class deviceFan {
   constructor (platform, accessory) {
     this.platform = platform
@@ -15,7 +15,7 @@ module.exports = class deviceFan {
       .on('set', async (value, callback) => {
         callback()
         if (value === 0) {
-          await utils.sleep(500)
+          await helpers.sleep(500)
           fanService.setCharacteristic(Characteristic.RotationSpeed, 0)
         }
       })
@@ -38,7 +38,7 @@ module.exports = class deviceFan {
       let newLight
       const lightService = accessory.getService(Service.Lightbulb)
       const fanService = accessory.getService(Service.Fanv2)
-      const params = { switches: cns.defaultMultiSwitchOff }
+      const params = { switches: helpers.defaultMultiSwitchOff }
       switch (type) {
         case 'speed':
           newPower = value >= 33 ? 1 : 0
diff --git a/lib/device/garage-eachen.js b/lib/device/garage-eachen.js
index 42e5d085..0f58b636 100644
--- a/lib/device/garage-eachen.js
+++ b/lib/device/garage-eachen.js
@@ -1,7 +1,8 @@
 /* jshint -W014, -W033, esversion: 9 */
+/* eslint-disable new-cap */
 'use strict'
 let Characteristic, Service
-const utils = require('./../utils')
+const helpers = require('./../helpers')
 module.exports = class deviceGarageEachen {
   constructor (platform, accessory) {
     this.platform = platform
@@ -39,10 +40,10 @@ module.exports = class deviceGarageEachen {
       gdService
         .updateCharacteristic(Characteristic.TargetDoorState, value)
         .updateCharacteristic(Characteristic.CurrentDoorState, value + 2)
-      await utils.sleep(2000)
+      await helpers.sleep(2000)
       accessory.context.inUse = false
       if (value === 0) {
-        await utils.sleep(Math.max((garageConfig.operationTime - 20) * 100, 0))
+        await helpers.sleep(Math.max((garageConfig.operationTime - 20) * 100, 0))
         gdService.updateCharacteristic(Characteristic.CurrentDoorState, 0)
       }
     } catch (err) {
@@ -53,7 +54,7 @@ module.exports = class deviceGarageEachen {
 
   async externalUpdate (accessory, params) {
     try {
-      if (!utils.hasProperty(params, 'switch') || accessory.context.inUse) {
+      if (!helpers.hasProperty(params, 'switch') || accessory.context.inUse) {
         return
       }
       let garageConfig
diff --git a/lib/device/garage-two.js b/lib/device/garage-two.js
index 931220f4..36b18405 100644
--- a/lib/device/garage-two.js
+++ b/lib/device/garage-two.js
@@ -1,7 +1,8 @@
 /* jshint -W014, -W033, esversion: 9 */
+/* eslint-disable new-cap */
 'use strict'
 let Characteristic, Service
-const utils = require('./../utils')
+const helpers = require('./../helpers')
 module.exports = class deviceGarageTwo {
   constructor (platform, accessory) {
     this.platform = platform
@@ -87,7 +88,7 @@ module.exports = class deviceGarageTwo {
         }
       }
       await this.platform.sendDeviceUpdate(accessory, params)
-      await utils.sleep(Math.max(garageConfig.operationTime * 100, 1000))
+      await helpers.sleep(Math.max(garageConfig.operationTime * 100, 1000))
       if (!sAccessory) {
         gdService.updateCharacteristic(Characteristic.CurrentDoorState, newPos)
         switch (garage) {
@@ -109,7 +110,7 @@ module.exports = class deviceGarageTwo {
 
   externalUpdate (accessory, params) {
     try {
-      if (!utils.hasProperty(params, 'switches')) {
+      if (!helpers.hasProperty(params, 'switches')) {
         return
       }
       let garageConfig
@@ -150,7 +151,7 @@ module.exports = class deviceGarageTwo {
         }
         accessory.context.inUse = true
         if (garageConfig.sensorId) {
-          await utils.sleep(Math.max(garageConfig.operationTime * 100, 1000))
+          await helpers.sleep(Math.max(garageConfig.operationTime * 100, 1000))
         } else {
           gcService
             .updateCharacteristic(Characteristic.TargetDoorState, newPos - 2)
@@ -165,7 +166,7 @@ module.exports = class deviceGarageTwo {
               accessory.context.cacheTwoTargetDoorState = newPos - 2
               break
           }
-          await utils.sleep(Math.max(garageConfig.operationTime * 100, 1000))
+          await helpers.sleep(Math.max(garageConfig.operationTime * 100, 1000))
           gcService.updateCharacteristic(Characteristic.CurrentDoorState, newPos - 2)
           switch (v) {
             case '1':
diff --git a/lib/device/garage.js b/lib/device/garage.js
index d11cccbf..39eab6f3 100644
--- a/lib/device/garage.js
+++ b/lib/device/garage.js
@@ -1,7 +1,8 @@
 /* jshint -W014, -W033, esversion: 9 */
+/* eslint-disable new-cap */
 'use strict'
 let Characteristic, Service
-const utils = require('./../utils')
+const helpers = require('./../helpers')
 module.exports = class deviceGarage {
   constructor (platform, accessory) {
     this.platform = platform
@@ -57,7 +58,7 @@ module.exports = class deviceGarage {
         delay = 1500
       }
       if (accessory.context.state !== newPos) return
-      await utils.sleep(delay)
+      await helpers.sleep(delay)
       gdService
         .updateCharacteristic(Characteristic.TargetDoorState, newPos)
         .updateCharacteristic(Characteristic.CurrentDoorState, newPos + 2)
@@ -74,7 +75,7 @@ module.exports = class deviceGarage {
           break
       }
       await this.platform.sendDeviceUpdate(accessory, params)
-      await utils.sleep(Math.max(garageConfig.operationTime * 100, 1000))
+      await helpers.sleep(Math.max(garageConfig.operationTime * 100, 1000))
       if (!sAccessory) {
         gdService.updateCharacteristic(Characteristic.CurrentDoorState, newPos)
         accessory.context.cacheCurrentDoorState = newPos
@@ -87,7 +88,7 @@ module.exports = class deviceGarage {
 
   async externalUpdate (accessory, params) {
     try {
-      if (!utils.hasProperty(params, 'switch') && !utils.hasProperty(params, 'switches')) {
+      if (!helpers.hasProperty(params, 'switch') && !helpers.hasProperty(params, 'switches')) {
         return
       }
       let garageConfig
@@ -120,14 +121,14 @@ module.exports = class deviceGarage {
       }
       accessory.context.inUse = true
       if (garageConfig.sensorId) {
-        await utils.sleep(Math.max(garageConfig.operationTime * 100, 1000))
+        await helpers.sleep(Math.max(garageConfig.operationTime * 100, 1000))
       } else {
         gcService
           .updateCharacteristic(Characteristic.TargetDoorState, newPos - 2)
           .updateCharacteristic(Characteristic.CurrentDoorState, newPos)
         accessory.context.cacheCurrentDoorState = newPos
         accessory.context.cacheTargetDoorState = newPos - 2
-        await utils.sleep(Math.max(garageConfig.operationTime * 100, 1000))
+        await helpers.sleep(Math.max(garageConfig.operationTime * 100, 1000))
         gcService.updateCharacteristic(Characteristic.CurrentDoorState, newPos - 2)
         accessory.context.cacheCurrentDoorState = newPos - 2
       }
diff --git a/lib/device/light.js b/lib/device/light.js
index 14125bf1..6d426caf 100644
--- a/lib/device/light.js
+++ b/lib/device/light.js
@@ -1,59 +1,59 @@
 /* jshint -W014, -W033, esversion: 9 */
+/* eslint-disable new-cap */
 'use strict'
-let Characteristic, Service
-const cns = require('./../constants')
 const convert = require('color-convert')
-const utils = require('./../utils')
+const helpers = require('./../helpers')
 module.exports = class deviceLight {
   constructor (platform, accessory) {
     this.platform = platform
-    Service = platform.api.hap.Service
-    Characteristic = platform.api.hap.Characteristic
-    const lightService = accessory.getService(Service.Lightbulb) || accessory.addService(Service.Lightbulb)
+    this.accessory = accessory
+    this.Service = platform.api.hap.Service
+    this.Characteristic = platform.api.hap.Characteristic
+    const lightService = accessory.getService(this.Service.Lightbulb) || accessory.addService(this.Service.Lightbulb)
     lightService
-      .getCharacteristic(Characteristic.On)
-      .on('set', (value, callback) => this.internalUpdate(accessory, 'onoff', value, callback))
-    if (cns.devicesBrightable.includes(accessory.context.eweUIID)) {
-      lightService.getCharacteristic(Characteristic.Brightness).on('set', (value, callback) => {
+      .getCharacteristic(this.Characteristic.On)
+      .on('set', (value, callback) => this.internalUpdate('onoff', value, callback))
+    if (helpers.devicesBrightable.includes(accessory.context.eweUIID)) {
+      lightService.getCharacteristic(this.Characteristic.Brightness).on('set', (value, callback) => {
         if (value > 0) {
-          if (!lightService.getCharacteristic(Characteristic.On).value) {
-            this.internalUpdate(accessory, 'onoff', true, function () {})
+          if (!lightService.getCharacteristic(this.Characteristic.On).value) {
+            this.internalUpdate('onoff', true, function () {})
           }
-          this.internalUpdate(accessory, 'brightness', value, callback)
+          this.internalUpdate('brightness', value, callback)
         } else {
-          this.internalUpdate(accessory, 'onoff', false, callback)
+          this.internalUpdate('onoff', false, callback)
         }
       })
-    } else if (cns.devicesColourable.includes(accessory.context.eweUIID)) {
-      lightService.getCharacteristic(Characteristic.Brightness).on('set', (value, callback) => {
+    } else if (helpers.devicesColourable.includes(accessory.context.eweUIID)) {
+      lightService.getCharacteristic(this.Characteristic.Brightness).on('set', (value, callback) => {
         if (value > 0) {
-          if (!lightService.getCharacteristic(Characteristic.On).value) {
-            this.internalUpdate(accessory, 'onoff', true, function () {})
+          if (!lightService.getCharacteristic(this.Characteristic.On).value) {
+            this.internalUpdate('onoff', true, function () {})
           }
-          this.internalUpdate(accessory, 'c_brightness', value, callback)
+          this.internalUpdate('c_brightness', value, callback)
         } else {
-          this.internalUpdate(accessory, 'onoff', false, callback)
+          this.internalUpdate('onoff', false, callback)
         }
       })
       lightService
-        .getCharacteristic(Characteristic.Hue)
-        .on('set', (value, callback) => this.internalUpdate(accessory, 'c_hue', value, callback))
-      lightService.getCharacteristic(Characteristic.Saturation).on('set', (value, callback) => callback())
+        .getCharacteristic(this.Characteristic.Hue)
+        .on('set', (value, callback) => this.internalUpdate('c_hue', value, callback))
+      lightService.getCharacteristic(this.Characteristic.Saturation).on('set', (value, callback) => callback())
     }
   }
 
-  async internalUpdate (accessory, type, value, callback) {
+  async internalUpdate (type, value, callback) {
     callback()
     try {
       let oAccessory
       let newRGB
       let params = {}
-      const lightService = accessory.getService(Service.Lightbulb)
+      const lightService = this.accessory.getService(this.Service.Lightbulb)
       switch (type) {
         case 'onoff':
-          switch (accessory.context.switchNumber) {
+          switch (this.accessory.context.switchNumber) {
             case 'X':
-              if (accessory.context.eweUIID === 22) {
+              if (this.accessory.context.eweUIID === 22) {
               //* ** B1 ***\\
                 params.state = value ? 'on' : 'off'
               } else {
@@ -61,7 +61,7 @@ module.exports = class deviceLight {
               }
               break
             case '0':
-              params.switches = cns.defaultMultiSwitchOff
+              params.switches = helpers.defaultMultiSwitchOff
               params.switches[0].switch = value ? 'on' : 'off'
               params.switches[1].switch = value ? 'on' : 'off'
               params.switches[2].switch = value ? 'on' : 'off'
@@ -71,10 +71,10 @@ module.exports = class deviceLight {
             case '2':
             case '3':
             case '4':
-              params.switches = cns.defaultMultiSwitchOff
+              params.switches = helpers.defaultMultiSwitchOff
               for (let i = 1; i <= 4; i++) {
-                if ((oAccessory = this.platform.devicesInHB.get(accessory.context.eweDeviceId + 'SW' + i))) {
-                  if (i === parseInt(accessory.context.switchNumber)) {
+                if ((oAccessory = this.platform.devicesInHB.get(this.accessory.context.eweDeviceId + 'SW' + i))) {
+                  if (i === parseInt(this.accessory.context.switchNumber)) {
                     params.switches[i - 1].switch = value ? 'on' : 'off'
                   } else {
                     params.switches[i - 1].switch = oAccessory.context.cacheOn ? 'on' : 'off'
@@ -85,15 +85,15 @@ module.exports = class deviceLight {
               }
               break
           }
-          await this.platform.sendDeviceUpdate(accessory, params)
-          switch (accessory.context.switchNumber) {
+          await this.platform.sendDeviceUpdate(this.accessory, params)
+          switch (this.accessory.context.switchNumber) {
             case 'X':
-              lightService.updateCharacteristic(Characteristic.On, value)
+              lightService.updateCharacteristic(this.Characteristic.On, value)
               break
             case '0':
               for (let i = 0; i <= 4; i++) {
-                if ((oAccessory = this.platform.devicesInHB.get(accessory.context.eweDeviceId + 'SW' + i))) {
-                  oAccessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, value)
+                if ((oAccessory = this.platform.devicesInHB.get(this.accessory.context.eweDeviceId + 'SW' + i))) {
+                  oAccessory.getService(this.Service.Lightbulb).updateCharacteristic(this.Characteristic.On, value)
                 }
               }
               break
@@ -101,18 +101,18 @@ module.exports = class deviceLight {
             case '2':
             case '3':
             case '4': {
-              lightService.updateCharacteristic(Characteristic.On, value)
+              lightService.updateCharacteristic(this.Characteristic.On, value)
               let masterState = 'off'
               for (let i = 1; i <= 4; i++) {
-                if ((oAccessory = this.platform.devicesInHB.get(accessory.context.eweDeviceId + 'SW' + i))) {
-                  if (oAccessory.getService(Service.Lightbulb).getCharacteristic(Characteristic.On).value) {
+                if ((oAccessory = this.platform.devicesInHB.get(this.accessory.context.eweDeviceId + 'SW' + i))) {
+                  if (oAccessory.getService(this.Service.Lightbulb).getCharacteristic(this.Characteristic.On).value) {
                     masterState = 'on'
                   }
                 }
               }
-              if (!this.platform.hiddenMasters.includes(accessory.context.eweDeviceId)) {
-                oAccessory = this.platform.devicesInHB.get(accessory.context.eweDeviceId + 'SW0')
-                oAccessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, masterState === 'on')
+              if (!this.platform.hiddenMasters.includes(this.accessory.context.eweDeviceId)) {
+                oAccessory = this.platform.devicesInHB.get(this.accessory.context.eweDeviceId + 'SW0')
+                oAccessory.getService(this.Service.Lightbulb).updateCharacteristic(this.Characteristic.On, masterState === 'on')
               }
               break
             }
@@ -122,10 +122,10 @@ module.exports = class deviceLight {
           if (value === 0) {
             params.switch = 'off'
           } else {
-            if (!lightService.getCharacteristic(Characteristic.On).value) {
+            if (!lightService.getCharacteristic(this.Characteristic.On).value) {
               params.switch = 'on'
             }
-            switch (accessory.context.eweUIID) {
+            switch (this.accessory.context.eweUIID) {
               case 36: //* ** KING-M4 ***\\
                 params.bright = Math.round((value * 9) / 10 + 10)
                 break
@@ -135,20 +135,20 @@ module.exports = class deviceLight {
                 break
             }
           }
-          await utils.sleep(250)
-          await this.platform.sendDeviceUpdate(accessory, params)
+          await helpers.sleep(250)
+          await this.platform.sendDeviceUpdate(this.accessory, params)
           if (value === 0) {
-            lightService.updateCharacteristic(Characteristic.On, false)
+            lightService.updateCharacteristic(this.Characteristic.On, false)
           } else {
-            lightService.updateCharacteristic(Characteristic.Brightness, value)
+            lightService.updateCharacteristic(this.Characteristic.Brightness, value)
           }
           break
         case 'c_brightness':
-          switch (accessory.context.eweUIID) {
+          switch (this.accessory.context.eweUIID) {
             case 22: //* ** B1 ***\\
               newRGB = convert.hsv.rgb(
-                lightService.getCharacteristic(Characteristic.Hue).value,
-                lightService.getCharacteristic(Characteristic.Saturation).value,
+                lightService.getCharacteristic(this.Characteristic.Hue).value,
+                lightService.getCharacteristic(this.Characteristic.Saturation).value,
                 value
               )
               params = {
@@ -168,13 +168,13 @@ module.exports = class deviceLight {
               }
               break
           }
-          await utils.sleep(250)
-          await this.platform.sendDeviceUpdate(accessory, params)
-          lightService.updateCharacteristic(Characteristic.Brightness, value)
+          await helpers.sleep(250)
+          await this.platform.sendDeviceUpdate(this.accessory, params)
+          lightService.updateCharacteristic(this.Characteristic.Brightness, value)
           break
         case 'c_hue':
-          newRGB = convert.hsv.rgb(value, lightService.getCharacteristic(Characteristic.Saturation).value, 100)
-          switch (accessory.context.eweUIID) {
+          newRGB = convert.hsv.rgb(value, lightService.getCharacteristic(this.Characteristic.Saturation).value, 100)
+          switch (this.accessory.context.eweUIID) {
             case 22: //* ** B1 ***\\
               params = {
                 zyx_mode: 2,
@@ -195,95 +195,95 @@ module.exports = class deviceLight {
               }
               break
           }
-          await utils.sleep(250)
-          await this.platform.sendDeviceUpdate(accessory, params)
-          lightService.updateCharacteristic(Characteristic.Hue, value)
+          await helpers.sleep(250)
+          await this.platform.sendDeviceUpdate(this.accessory, params)
+          lightService.updateCharacteristic(this.Characteristic.Hue, value)
           break
       }
     } catch (err) {
-      this.platform.deviceUpdateError(accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true)
     }
   }
 
-  async externalUpdate (accessory, params) {
+  async externalUpdate (params) {
     try {
       if (
-        cns.devicesSingleSwitch.includes(accessory.context.eweUIID) &&
-        cns.devicesSingleSwitchLight.includes(accessory.context.eweModel)
+        helpers.devicesSingleSwitch.includes(this.accessory.context.eweUIID) &&
+        helpers.devicesSingleSwitchLight.includes(this.accessory.context.eweModel)
       ) {
         let newColour
         let mode
         let isOn = false
-        const lightService = accessory.getService(Service.Lightbulb)
-        if (accessory.context.eweUIID === 22 && utils.hasProperty(params, 'state')) {
+        const lightService = this.accessory.getService(this.Service.Lightbulb)
+        if (this.accessory.context.eweUIID === 22 && helpers.hasProperty(params, 'state')) {
           isOn = params.state === 'on'
-        } else if (accessory.context.eweUIID !== 22 && utils.hasProperty(params, 'switch')) {
+        } else if (this.accessory.context.eweUIID !== 22 && helpers.hasProperty(params, 'switch')) {
           isOn = params.switch === 'on'
         } else {
-          isOn = lightService.getCharacteristic(Characteristic.On).value
+          isOn = lightService.getCharacteristic(this.Characteristic.On).value
         }
         if (isOn) {
-          lightService.updateCharacteristic(Characteristic.On, true)
-          switch (accessory.context.eweUIID) {
+          lightService.updateCharacteristic(this.Characteristic.On, true)
+          switch (this.accessory.context.eweUIID) {
             case 36: // KING-M4
-              if (utils.hasProperty(params, 'bright')) {
+              if (helpers.hasProperty(params, 'bright')) {
                 const nb = Math.round(((params.bright - 10) * 10) / 9) // eWeLink scale is 10-100 and HomeKit scale is 0-100.
-                lightService.updateCharacteristic(Characteristic.Brightness, nb)
+                lightService.updateCharacteristic(this.Characteristic.Brightness, nb)
               }
               break
             case 44: // D1
-              if (utils.hasProperty(params, 'brightness')) {
-                lightService.updateCharacteristic(Characteristic.Brightness, params.brightness)
+              if (helpers.hasProperty(params, 'brightness')) {
+                lightService.updateCharacteristic(this.Characteristic.Brightness, params.brightness)
               }
               break
             case 22: // B1
-              if (utils.hasProperty(params, 'zyx_mode')) {
+              if (helpers.hasProperty(params, 'zyx_mode')) {
                 mode = parseInt(params.zyx_mode)
-              } else if (utils.hasProperty(params, 'channel0') && parseInt(params.channel0) + parseInt(params.channel1) > 0) {
+              } else if (helpers.hasProperty(params, 'channel0') && parseInt(params.channel0) + parseInt(params.channel1) > 0) {
                 mode = 1
               } else {
                 mode = 2
               }
               if (mode === 2) {
-                lightService.updateCharacteristic(Characteristic.On, true)
+                lightService.updateCharacteristic(this.Characteristic.On, true)
                 newColour = convert.rgb.hsv(
                   parseInt(params.channel2),
                   parseInt(params.channel3),
                   parseInt(params.channel4)
                 )
                 lightService
-                  .updateCharacteristic(Characteristic.Hue, newColour[0])
-                  .updateCharacteristic(Characteristic.Saturation, 100)
-                  .updateCharacteristic(Characteristic.Brightness, 100)
+                  .updateCharacteristic(this.Characteristic.Hue, newColour[0])
+                  .updateCharacteristic(this.Characteristic.Saturation, 100)
+                  .updateCharacteristic(this.Characteristic.Brightness, 100)
               } else if (mode === 1) {
                 throw new Error('has been set to white mode which is not supported')
               }
               break
             case 59: // L1
-              if (utils.hasProperty(params, 'bright')) {
-                lightService.updateCharacteristic(Characteristic.Brightness, params.bright)
+              if (helpers.hasProperty(params, 'bright')) {
+                lightService.updateCharacteristic(this.Characteristic.Brightness, params.bright)
               }
-              if (utils.hasProperty(params, 'colorR')) {
+              if (helpers.hasProperty(params, 'colorR')) {
                 newColour = convert.rgb.hsv(params.colorR, params.colorG, params.colorB)
                 lightService
-                  .updateCharacteristic(Characteristic.Hue, newColour[0])
-                  .updateCharacteristic(Characteristic.Saturation, newColour[1])
+                  .updateCharacteristic(this.Characteristic.Hue, newColour[0])
+                  .updateCharacteristic(this.Characteristic.Saturation, newColour[1])
               }
               break
             default:
               return
           }
         } else {
-          lightService.updateCharacteristic(Characteristic.On, false)
+          lightService.updateCharacteristic(this.Characteristic.On, false)
         }
       } else if (
-        cns.devicesMultiSwitch.includes(accessory.context.eweUIID) &&
-        cns.devicesMultiSwitchLight.includes(accessory.context.eweModel)
+        helpers.devicesMultiSwitch.includes(this.accessory.context.eweUIID) &&
+        helpers.devicesMultiSwitchLight.includes(this.accessory.context.eweModel)
       ) {
-        if (!utils.hasProperty(params, 'switches')) return
-        const idToCheck = accessory.context.hbDeviceId.slice(0, -1)
+        if (!helpers.hasProperty(params, 'switches')) return
+        const idToCheck = this.accessory.context.hbDeviceId.slice(0, -1)
         let primaryState = false
-        for (let i = 1; i <= accessory.context.channelCount; i++) {
+        for (let i = 1; i <= this.accessory.context.channelCount; i++) {
           if (params.switches[i - 1].switch === 'on') {
             primaryState = true
           }
@@ -291,16 +291,16 @@ module.exports = class deviceLight {
             const oAccessory = this.platform.devicesInHB.get(idToCheck + i)
             oAccessory.context.cacheOn = params.switches[i - 1].switch === 'on'
             oAccessory
-              .getService(Service.Lightbulb)
-              .updateCharacteristic(Characteristic.On, params.switches[i - 1].switch === 'on')
+              .getService(this.Service.Lightbulb)
+              .updateCharacteristic(this.Characteristic.On, params.switches[i - 1].switch === 'on')
           }
         }
-        if (!this.platform.hiddenMasters.includes(accessory.context.eweDeviceId)) {
-          accessory.getService(Service.Lightbulb).updateCharacteristic(Characteristic.On, primaryState)
+        if (!this.platform.hiddenMasters.includes(this.accessory.context.eweDeviceId)) {
+          this.accessory.getService(this.Service.Lightbulb).updateCharacteristic(this.Characteristic.On, primaryState)
         }
       }
     } catch (err) {
-      this.platform.deviceUpdateError(accessory, err, false)
+      this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
 }
diff --git a/lib/device/lock.js b/lib/device/lock.js
index 7ccb89ae..614c4e68 100644
--- a/lib/device/lock.js
+++ b/lib/device/lock.js
@@ -1,7 +1,8 @@
 /* jshint -W014, -W033, esversion: 9 */
+/* eslint-disable new-cap */
 'use strict'
 let Characteristic, Service
-const utils = require('./../utils')
+const helpers = require('./../helpers')
 module.exports = class deviceLock {
   constructor (platform, accessory) {
     this.platform = platform
@@ -32,7 +33,7 @@ module.exports = class deviceLock {
       lmService
         .updateCharacteristic(Characteristic.LockTargetState, 0)
         .updateCharacteristic(Characteristic.LockCurrentState, 0)
-      await utils.sleep(Math.max(lockConfig.operationTime * 100, 1000))
+      await helpers.sleep(Math.max(lockConfig.operationTime * 100, 1000))
       lmService
         .updateCharacteristic(Characteristic.LockTargetState, 1)
         .updateCharacteristic(Characteristic.LockCurrentState, 1)
@@ -44,7 +45,7 @@ module.exports = class deviceLock {
 
   async externalUpdate (accessory, params) {
     try {
-      if (!utils.hasProperty(params, 'switch')) return
+      if (!helpers.hasProperty(params, 'switch')) return
       let lockConfig
       const lmService = accessory.getService(Service.LockMechanism)
       if (!(lockConfig = this.platform.cusG.get(accessory.context.hbDeviceId))) {
@@ -60,7 +61,7 @@ module.exports = class deviceLock {
       lmService
         .updateCharacteristic(Characteristic.LockCurrentState, 0)
         .updateCharacteristic(Characteristic.LockTargetState, 0)
-      await utils.sleep(Math.max(lockConfig.operationTime * 100, 1000))
+      await helpers.sleep(Math.max(lockConfig.operationTime * 100, 1000))
       lmService
         .updateCharacteristic(Characteristic.LockCurrentState, 1)
         .updateCharacteristic(Characteristic.LockTargetState, 1)
diff --git a/lib/device/outlet.js b/lib/device/outlet.js
index ea799489..9330cf65 100644
--- a/lib/device/outlet.js
+++ b/lib/device/outlet.js
@@ -1,31 +1,31 @@
 /* jshint -W014, -W033, esversion: 9 */
+/* eslint-disable new-cap */
 'use strict'
-let Characteristic, EveHistoryService, EveService, Service
-const cns = require('./../constants')
 const corrInterval = require('correcting-interval')
 const fakegato = require('fakegato-history')
 const hbLib = require('homebridge-lib')
-const utils = require('./../utils')
+const helpers = require('./../helpers')
 module.exports = class deviceOutlet {
   constructor (platform, accessory) {
     this.platform = platform
-    Service = platform.api.hap.Service
-    Characteristic = platform.api.hap.Characteristic
-    EveService = new hbLib.EveHomeKitTypes(platform.api)
-    EveHistoryService = fakegato(platform.api)
-    if (accessory.getService(Service.Switch)) {
-      accessory.removeService(accessory.getService(Service.Switch))
+    this.accessory = accessory
+    this.Service = platform.api.hap.Service
+    this.Characteristic = platform.api.hap.Characteristic
+    this.EveCharacteristics = new hbLib.EveHomeKitTypes(platform.api).Characteristics
+    this.EveHistoryService = fakegato(platform.api)
+    if (accessory.getService(this.Service.Switch)) {
+      accessory.removeService(accessory.getService(this.Service.Switch))
     }
     let outletService
-    if (!(outletService = accessory.getService(Service.Outlet))) {
-      accessory.addService(Service.Outlet)
-      outletService = accessory.getService(Service.Outlet)
-      if (!cns.devicesSingleSwitchOutlet.includes(accessory.context.eweModel) && !this.platform.config.disableEveLogging) {
-        outletService.addCharacteristic(EveService.Characteristics.Voltage)
-        outletService.addCharacteristic(EveService.Characteristics.CurrentConsumption)
-        outletService.addCharacteristic(EveService.Characteristics.ElectricCurrent)
-        outletService.addCharacteristic(EveService.Characteristics.TotalConsumption)
-        outletService.addCharacteristic(EveService.Characteristics.ResetTotal)
+    if (!(outletService = accessory.getService(this.Service.Outlet))) {
+      accessory.addService(this.Service.Outlet)
+      outletService = accessory.getService(this.Service.Outlet)
+      if (!helpers.devicesSingleSwitchOutlet.includes(accessory.context.eweModel) && !this.platform.config.disableEveLogging) {
+        outletService.addCharacteristic(this.EveCharacteristics.Voltage)
+        outletService.addCharacteristic(this.EveCharacteristics.CurrentConsumption)
+        outletService.addCharacteristic(this.EveCharacteristics.ElectricCurrent)
+        outletService.addCharacteristic(this.EveCharacteristics.TotalConsumption)
+        outletService.addCharacteristic(this.EveCharacteristics.ResetTotal)
         accessory.context = {
           ...accessory.context,
           ...{
@@ -38,19 +38,19 @@ module.exports = class deviceOutlet {
       }
     }
     outletService
-      .getCharacteristic(Characteristic.On)
-      .on('set', (value, callback) => this.internalUpdate(accessory, value, callback))
-    if (!cns.devicesSingleSwitchOutlet.includes(accessory.context.eweModel) && !this.platform.config.disableEveLogging) {
+      .getCharacteristic(this.Characteristic.On)
+      .on('set', (value, callback) => this.internalUpdate(value, callback))
+    if (!helpers.devicesSingleSwitchOutlet.includes(accessory.context.eweModel) && !this.platform.config.disableEveLogging) {
       accessory.log = this.platform.log
-      accessory.eveLogger = new EveHistoryService('energy', accessory, {
+      accessory.eveLogger = new this.EveHistoryService('energy', accessory, {
         storage: 'fs',
         minutes: 5,
         path: this.platform.eveLogPath
       })
       corrInterval.setCorrectingInterval(() => {
-        const isOn = outletService.getCharacteristic(Characteristic.On).value
+        const isOn = outletService.getCharacteristic(this.Characteristic.On).value
         const currentWatt = isOn
-          ? outletService.getCharacteristic(EveService.Characteristics.CurrentConsumption).value
+          ? outletService.getCharacteristic(this.EveCharacteristics.CurrentConsumption).value
           : 0
         if (accessory.eveLogger.isHistoryLoaded()) {
           accessory.context.extraPersistedData = accessory.eveLogger.getExtraPersistedData()
@@ -81,7 +81,7 @@ module.exports = class deviceOutlet {
         })
       }, 300000)
       outletService
-        .getCharacteristic(EveService.Characteristics.TotalConsumption)
+        .getCharacteristic(this.EveCharacteristics.TotalConsumption)
         .on('get', callback => {
           accessory.context.extraPersistedData = accessory.eveLogger.getExtraPersistedData()
           if (accessory.context.extraPersistedData !== undefined) {
@@ -90,7 +90,7 @@ module.exports = class deviceOutlet {
           callback(null, accessory.context.totalEnergy)
         })
       outletService
-        .getCharacteristic(EveService.Characteristics.ResetTotal)
+        .getCharacteristic(this.EveCharacteristics.ResetTotal)
         .on('set', (value, callback) => {
           accessory.context.totalEnergy = 0
           accessory.context.lastReset = value
@@ -110,51 +110,51 @@ module.exports = class deviceOutlet {
     }
   }
 
-  async internalUpdate (accessory, value, callback) {
+  async internalUpdate (value, callback) {
     callback()
     try {
       const params = {
         switch: value ? 'on' : 'off'
       }
-      const outletService = accessory.getService(Service.Outlet)
-      await this.platform.sendDeviceUpdate(accessory, params)
-      outletService.updateCharacteristic(Characteristic.On, value)
+      const outletService = this.accessory.getService(this.Service.Outlet)
+      await this.platform.sendDeviceUpdate(this.accessory, params)
+      outletService.updateCharacteristic(this.Characteristic.On, value)
     } catch (err) {
-      this.platform.deviceUpdateError(accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true)
     }
   }
 
-  async externalUpdate (accessory, params) {
+  async externalUpdate (params) {
     try {
-      const outletService = accessory.getService(Service.Outlet)
-      if (utils.hasProperty(params, 'switch')) {
-        outletService.updateCharacteristic(Characteristic.On, params.switch === 'on')
-        if (cns.devicesSingleSwitchOutlet.includes(accessory.context.eweModel) || this.platform.config.disableEveLogging) {
-          outletService.updateCharacteristic(Characteristic.OutletInUse, params.switch === 'on')
+      const outletService = this.accessory.getService(this.Service.Outlet)
+      if (helpers.hasProperty(params, 'switch')) {
+        outletService.updateCharacteristic(this.Characteristic.On, params.switch === 'on')
+        if (helpers.devicesSingleSwitchOutlet.includes(this.accessory.context.eweModel) || this.platform.config.disableEveLogging) {
+          outletService.updateCharacteristic(this.Characteristic.OutletInUse, params.switch === 'on')
         }
       }
-      if (utils.hasProperty(params, 'power')) {
-        outletService.updateCharacteristic(EveService.Characteristics.CurrentConsumption, parseFloat(params.power))
-        if (!cns.devicesSingleSwitchOutlet.includes(accessory.context.eweModel) && !this.platform.config.disableEveLogging) {
+      if (helpers.hasProperty(params, 'power')) {
+        outletService.updateCharacteristic(this.EveCharacteristics.CurrentConsumption, parseFloat(params.power))
+        if (!helpers.devicesSingleSwitchOutlet.includes(this.accessory.context.eweModel) && !this.platform.config.disableEveLogging) {
           outletService.updateCharacteristic(
-            Characteristic.OutletInUse,
+            this.Characteristic.OutletInUse,
             parseFloat(params.power) > (this.platform.config.inUsePowerThreshold || 0)
           )
-          const isOn = accessory.getService(Service.Outlet).getCharacteristic(Characteristic.On).value
-          accessory.eveLogger.addEntry({
+          const isOn = this.accessory.getService(this.Service.Outlet).getCharacteristic(this.Characteristic.On).value
+          this.accessory.eveLogger.addEntry({
             time: Date.now(),
             power: isOn ? parseFloat(params.power) : 0
           })
         }
       }
-      if (utils.hasProperty(params, 'voltage')) {
-        outletService.updateCharacteristic(EveService.Characteristics.Voltage, parseFloat(params.voltage))
+      if (helpers.hasProperty(params, 'voltage')) {
+        outletService.updateCharacteristic(this.EveCharacteristics.Voltage, parseFloat(params.voltage))
       }
-      if (utils.hasProperty(params, 'current')) {
-        outletService.updateCharacteristic(EveService.Characteristics.ElectricCurrent, parseFloat(params.current))
+      if (helpers.hasProperty(params, 'current')) {
+        outletService.updateCharacteristic(this.EveCharacteristics.ElectricCurrent, parseFloat(params.current))
       }
     } catch (err) {
-      this.platform.deviceUpdateError(accessory, err, false)
+      this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
 }
diff --git a/lib/device/rf-bridge.js b/lib/device/rf-bridge.js
index 5a7ff260..559e3a75 100644
--- a/lib/device/rf-bridge.js
+++ b/lib/device/rf-bridge.js
@@ -1,7 +1,8 @@
 /* jshint -W014, -W033, esversion: 9 */
+/* eslint-disable new-cap */
 'use strict'
 let Characteristic, Service
-const utils = require('./../utils')
+const helpers = require('./../helpers')
 module.exports = class deviceRFBridge {
   constructor (platform, accessory) {
     this.platform = platform
@@ -51,7 +52,7 @@ module.exports = class deviceRFBridge {
       }
       const rfService = accessory.getService(service)
       rfService.updateCharacteristic(Characteristic.On, true)
-      await utils.sleep(1000)
+      await helpers.sleep(1000)
       rfService.updateCharacteristic(Characteristic.On, false)
       await this.platform.sendDeviceUpdate(accessory, params)
     } catch (err) {
@@ -61,15 +62,15 @@ module.exports = class deviceRFBridge {
 
   async externalUpdate (accessory, params) {
     try {
-      if (!utils.hasProperty(params, 'updateSource')) return
+      if (!helpers.hasProperty(params, 'updateSource')) return
       const timeNow = new Date()
       let oAccessory = false
-      if (utils.hasProperty(params, 'cmd') && params.cmd === 'transmit' && utils.hasProperty(params, 'rfChl')) {
+      if (helpers.hasProperty(params, 'cmd') && params.cmd === 'transmit' && helpers.hasProperty(params, 'rfChl')) {
         this.platform.devicesInHB.forEach(acc => {
           if (
             acc.context.eweDeviceId === accessory.context.eweDeviceId &&
-            utils.hasProperty(acc.context, 'buttons') &&
-            utils.hasProperty(acc.context.buttons, params.rfChl.toString())
+            helpers.hasProperty(acc.context, 'buttons') &&
+            helpers.hasProperty(acc.context.buttons, params.rfChl.toString())
           ) {
             oAccessory = acc
           }
@@ -86,7 +87,7 @@ module.exports = class deviceRFBridge {
         } else {
           throw new Error('rf button not found in Homebridge')
         }
-      } else if (utils.hasProperty(params, 'cmd') && params.cmd === 'trigger') {
+      } else if (helpers.hasProperty(params, 'cmd') && params.cmd === 'trigger') {
         //* ** RF Sensor ***\\
         Object.keys(params)
           .filter(name => /rfTrig/.test(name))
@@ -94,8 +95,8 @@ module.exports = class deviceRFBridge {
             this.platform.devicesInHB.forEach(acc => {
               if (
                 acc.context.eweDeviceId === accessory.context.eweDeviceId &&
-                utils.hasProperty(acc.context, 'buttons') &&
-                utils.hasProperty(acc.context.buttons, chan.substr(-1).toString())
+                helpers.hasProperty(acc.context, 'buttons') &&
+                helpers.hasProperty(acc.context.buttons, chan.substr(-1).toString())
               ) {
                 oAccessory = acc
               }
@@ -140,7 +141,7 @@ module.exports = class deviceRFBridge {
                     break
                 }
                 oAccessory.getService(serv).updateCharacteristic(char, 1)
-                await utils.sleep((this.platform.config.sensorTimeLength || 2) * 1000)
+                await helpers.sleep((this.platform.config.sensorTimeLength || 2) * 1000)
                 oAccessory.getService(serv).updateCharacteristic(char, 0)
               }
             }
diff --git a/lib/device/scm.js b/lib/device/scm.js
index 9e4e1165..b49d5915 100644
--- a/lib/device/scm.js
+++ b/lib/device/scm.js
@@ -1,8 +1,8 @@
 /* jshint -W014, -W033, esversion: 9 */
+/* eslint-disable new-cap */
 'use strict'
 let Characteristic, Service
-const cns = require('./../constants')
-const utils = require('./../utils')
+const helpers = require('./../helpers')
 module.exports = class deviceSCM {
   constructor (platform, accessory) {
     this.platform = platform
@@ -18,7 +18,7 @@ module.exports = class deviceSCM {
     callback()
     try {
       const params = {
-        switches: cns.defaultMultiSwitchOff
+        switches: helpers.defaultMultiSwitchOff
       }
       const switchService = accessory.getService(Service.Switch)
       params.switches[0].switch = value ? 'on' : 'off'
@@ -31,7 +31,7 @@ module.exports = class deviceSCM {
 
   async externalUpdate (accessory, params) {
     try {
-      if (!utils.hasProperty(params, 'switches')) return
+      if (!helpers.hasProperty(params, 'switches')) return
       accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, params.switches[0].switch === 'on')
     } catch (err) {
       this.platform.deviceUpdateError(accessory, err, false)
diff --git a/lib/device/sensor.js b/lib/device/sensor.js
index 0ded5346..d0e3e273 100644
--- a/lib/device/sensor.js
+++ b/lib/device/sensor.js
@@ -1,7 +1,8 @@
 /* jshint -W014, -W033, esversion: 9 */
+/* eslint-disable new-cap */
 'use strict'
 let Characteristic, Service
-const utils = require('./../utils')
+const helpers = require('./../helpers')
 module.exports = class deviceSensor {
   constructor (platform, accessory) {
     this.platform = platform
@@ -13,7 +14,7 @@ module.exports = class deviceSensor {
 
   async externalUpdate (accessory, params) {
     try {
-      if (utils.hasProperty(params, 'battery')) {
+      if (helpers.hasProperty(params, 'battery')) {
         const batteryService =
             accessory.getService(Service.BatteryService) || accessory.addService(Service.BatteryService)
         const scaledBattery = Math.round(params.battery * 33.3)
@@ -23,7 +24,7 @@ module.exports = class deviceSensor {
           scaledBattery < (this.platform.config.lowBattThreshold || 25)
         )
       }
-      if (!utils.hasProperty(params, 'switch')) return
+      if (!helpers.hasProperty(params, 'switch')) return
       const newState = params.switch === 'on' ? 1 : 0
       let oAccessory = false
       const contactService = accessory.getService(Service.ContactSensor)
@@ -39,7 +40,7 @@ module.exports = class deviceSensor {
                   .updateCharacteristic(Characteristic.CurrentDoorState, 1)
                 break
               case 1:
-                await utils.sleep(Math.max(group.operationTime * 100, 1000))
+                await helpers.sleep(Math.max(group.operationTime * 100, 1000))
                 oAccessory
                   .getService(Service.GarageDoorOpener)
                   .updateCharacteristic(Characteristic.TargetDoorState, 0)
diff --git a/lib/device/switch.js b/lib/device/switch.js
index 095f2901..dc05d49f 100644
--- a/lib/device/switch.js
+++ b/lib/device/switch.js
@@ -1,8 +1,8 @@
 /* jshint -W014, -W033, esversion: 9 */
+/* eslint-disable new-cap */
 'use strict'
 let Characteristic, Service
-const cns = require('./../constants')
-const utils = require('./../utils')
+const helpers = require('./../helpers')
 module.exports = class deviceSwitch {
   constructor (platform, accessory) {
     this.platform = platform
@@ -25,7 +25,7 @@ module.exports = class deviceSwitch {
           params.switch = value ? 'on' : 'off'
           break
         case '0':
-          params.switches = cns.defaultMultiSwitchOff
+          params.switches = helpers.defaultMultiSwitchOff
           params.switches[0].switch = value ? 'on' : 'off'
           params.switches[1].switch = value ? 'on' : 'off'
           params.switches[2].switch = value ? 'on' : 'off'
@@ -35,7 +35,7 @@ module.exports = class deviceSwitch {
         case '2':
         case '3':
         case '4':
-          params.switches = cns.defaultMultiSwitchOff
+          params.switches = helpers.defaultMultiSwitchOff
           for (let i = 1; i <= 4; i++) {
             if ((oAccessory = this.platform.devicesInHB.get(accessory.context.eweDeviceId + 'SW' + i))) {
               if (i === parseInt(accessory.context.switchNumber)) {
@@ -88,11 +88,11 @@ module.exports = class deviceSwitch {
 
   async externalUpdate (accessory, params) {
     try {
-      if (cns.devicesSingleSwitch.includes(accessory.context.eweUIID)) {
-        if (!utils.hasProperty(params, 'switch')) return
+      if (helpers.devicesSingleSwitch.includes(accessory.context.eweUIID)) {
+        if (!helpers.hasProperty(params, 'switch')) return
         accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, params.switch === 'on')
-      } else if (cns.devicesMultiSwitch.includes(accessory.context.eweUIID)) {
-        if (!utils.hasProperty(params, 'switches')) return
+      } else if (helpers.devicesMultiSwitch.includes(accessory.context.eweUIID)) {
+        if (!helpers.hasProperty(params, 'switches')) return
         const idToCheck = accessory.context.hbDeviceId.slice(0, -1)
         let primaryState = false
         for (let i = 1; i <= accessory.context.channelCount; i++) {
diff --git a/lib/device/thermostat.js b/lib/device/thermostat.js
index 92a81340..14e412be 100644
--- a/lib/device/thermostat.js
+++ b/lib/device/thermostat.js
@@ -1,9 +1,10 @@
 /* jshint -W014, -W033, esversion: 9 */
+/* eslint-disable new-cap */
 'use strict'
 let Characteristic, EveHistoryService, Service
 const corrInterval = require('correcting-interval')
 const fakegato = require('fakegato-history')
-const utils = require('./../utils')
+const helpers = require('./../helpers')
 module.exports = class deviceThermostat {
   constructor (platform, accessory) {
     this.platform = platform
@@ -60,23 +61,23 @@ module.exports = class deviceThermostat {
     try {
       if (
         !this.platform.config.hideTHSwitch &&
-        (utils.hasProperty(params, 'switch') || utils.hasProperty(params, 'mainSwitch'))
+        (helpers.hasProperty(params, 'switch') || helpers.hasProperty(params, 'mainSwitch'))
       ) {
-        const newState = utils.hasProperty(params, 'switch') ? params.switch === 'on' : params.mainSwitch === 'on'
+        const newState = helpers.hasProperty(params, 'switch') ? params.switch === 'on' : params.mainSwitch === 'on'
         const switchService = accessory.getService(Service.Switch)
         switchService.updateCharacteristic(Characteristic.On, newState)
       }
       const eveLog = {
         time: Date.now()
       }
-      if (utils.hasProperty(params, 'currentTemperature') && accessory.getService(Service.TemperatureSensor)) {
+      if (helpers.hasProperty(params, 'currentTemperature') && accessory.getService(Service.TemperatureSensor)) {
         const currentTemp = parseFloat(params.currentTemperature !== 'unavailable' ? params.currentTemperature : 0)
         accessory
           .getService(Service.TemperatureSensor)
           .updateCharacteristic(Characteristic.CurrentTemperature, currentTemp)
         eveLog.temp = currentTemp
       }
-      if (utils.hasProperty(params, 'currentHumidity') && accessory.getService(Service.HumiditySensor)) {
+      if (helpers.hasProperty(params, 'currentHumidity') && accessory.getService(Service.HumiditySensor)) {
         const currentHumi = parseFloat(params.currentHumidity !== 'unavailable' ? params.currentHumidity : 0)
         accessory
           .getService(Service.HumiditySensor)
@@ -84,7 +85,7 @@ module.exports = class deviceThermostat {
         eveLog.humidity = currentHumi
       }
       if (!this.platform.config.disableEveLogging) {
-        if (utils.hasProperty(eveLog, 'temp') || utils.hasProperty(eveLog, 'humidity')) {
+        if (helpers.hasProperty(eveLog, 'temp') || helpers.hasProperty(eveLog, 'humidity')) {
           accessory.eveLogger.addEntry(eveLog)
         }
       }
diff --git a/lib/device/usb.js b/lib/device/usb.js
index 7089bb03..0600b2fd 100644
--- a/lib/device/usb.js
+++ b/lib/device/usb.js
@@ -1,8 +1,8 @@
 /* jshint -W014, -W033, esversion: 9 */
+/* eslint-disable new-cap */
 'use strict'
 let Characteristic, Service
-const cns = require('./../constants')
-const utils = require('./../utils')
+const helpers = require('./../helpers')
 module.exports = class deviceUSB {
   constructor (platform, accessory) {
     this.platform = platform
@@ -18,7 +18,7 @@ module.exports = class deviceUSB {
     callback()
     try {
       const params = {
-        switches: cns.defaultMultiSwitchOff
+        switches: helpers.defaultMultiSwitchOff
       }
       const outletService = accessory.getService(Service.Outlet)
       params.switches[0].switch = value ? 'on' : 'off'
@@ -31,7 +31,7 @@ module.exports = class deviceUSB {
 
   async externalUpdate (accessory, params) {
     try {
-      if (!utils.hasProperty(params, 'switches')) return
+      if (!helpers.hasProperty(params, 'switches')) return
       accessory.getService(Service.Outlet).updateCharacteristic(Characteristic.On, params.switches[0].switch === 'on')
     } catch (err) {
       this.platform.deviceUpdateError(accessory, err, false)
diff --git a/lib/device/valve.js b/lib/device/valve.js
index 23e38061..4995d267 100644
--- a/lib/device/valve.js
+++ b/lib/device/valve.js
@@ -1,7 +1,8 @@
 /* jshint -W014, -W033, esversion: 9 */
+/* eslint-disable new-cap */
 'use strict'
 let Characteristic, Service
-const utils = require('./../utils')
+const helpers = require('./../helpers')
 module.exports = class deviceValve {
   constructor (platform, accessory) {
     this.platform = platform
@@ -89,7 +90,7 @@ module.exports = class deviceValve {
 
   async externalUpdate (accessory, params) {
     try {
-      if (!utils.hasProperty(params, 'switches')) return
+      if (!helpers.hasProperty(params, 'switches')) return
       let valveConfig
       if (!(valveConfig = this.platform.cusG.get(accessory.context.hbDeviceId))) {
         throw new Error('group config missing')
diff --git a/lib/device/zb-dev.js b/lib/device/zb-dev.js
index 83f70153..1a9562c1 100644
--- a/lib/device/zb-dev.js
+++ b/lib/device/zb-dev.js
@@ -1,9 +1,10 @@
 /* jshint -W014, -W033, esversion: 9 */
+/* eslint-disable new-cap */
 'use strict'
 let Characteristic, Service, EveHistoryService
 const corrInterval = require('correcting-interval')
 const fakegato = require('fakegato-history')
-const utils = require('./../utils')
+const helpers = require('./../helpers')
 module.exports = class deviceZBDev {
   constructor (platform, accessory) {
     this.platform = platform
@@ -56,7 +57,7 @@ module.exports = class deviceZBDev {
   async externalUpdate (accessory, params) {
     try {
       //* ** credit @tasict ***\\
-      if (utils.hasProperty(params, 'battery')) {
+      if (helpers.hasProperty(params, 'battery')) {
         if (accessory.context.eweUIID === 3026 && this.platform.config.ZBDWBatt) {
           params.battery *= 10
         }
@@ -70,7 +71,7 @@ module.exports = class deviceZBDev {
       }
       switch (accessory.context.eweUIID) {
         case 1000:
-          if (utils.hasProperty(params, 'key') && [0, 1, 2].includes(params.key)) {
+          if (helpers.hasProperty(params, 'key') && [0, 1, 2].includes(params.key)) {
             accessory
               .getService(Service.StatelessProgrammableSwitch)
               .updateCharacteristic(Characteristic.ProgrammableSwitchEvent, params.key)
@@ -80,34 +81,34 @@ module.exports = class deviceZBDev {
           const eveLog = {
             time: Date.now()
           }
-          if (utils.hasProperty(params, 'temperature')) {
+          if (helpers.hasProperty(params, 'temperature')) {
             const currentTemp = parseInt(params.temperature) / 100
             accessory
               .getService(Service.TemperatureSensor)
               .updateCharacteristic(Characteristic.CurrentTemperature, currentTemp)
             eveLog.temp = parseFloat(currentTemp)
           }
-          if (utils.hasProperty(params, 'humidity')) {
+          if (helpers.hasProperty(params, 'humidity')) {
             const currentHumi = parseInt(params.humidity) / 100
             accessory
               .getService(Service.HumiditySensor)
               .updateCharacteristic(Characteristic.CurrentRelativeHumidity, currentHumi)
             eveLog.humidity = parseFloat(currentHumi)
           }
-          if (utils.hasProperty(eveLog, 'temp') || utils.hasProperty(eveLog, 'humidity')) {
+          if (helpers.hasProperty(eveLog, 'temp') || helpers.hasProperty(eveLog, 'humidity')) {
             accessory.eveLogger.addEntry(eveLog)
           }
           break
         }
         case 2026:
-          if (utils.hasProperty(params, 'motion') && utils.hasProperty(params, 'trigTime')) {
+          if (helpers.hasProperty(params, 'motion') && helpers.hasProperty(params, 'trigTime')) {
             const timeNow = new Date()
             const diff = (timeNow.getTime() - params.trigTime) / 1000
             accessory
               .getService(Service.MotionSensor)
               .updateCharacteristic(
                 Characteristic.MotionDetected,
-                utils.hasProperty(params, 'updateSource') &&
+                helpers.hasProperty(params, 'updateSource') &&
                   params.motion === 1 &&
                   diff < (this.platform.config.sensorTimeDifference || 120)
               )
@@ -115,7 +116,7 @@ module.exports = class deviceZBDev {
           }
           break
         case 3026:
-          if (utils.hasProperty(params, 'lock') && [0, 1].includes(params.lock)) {
+          if (helpers.hasProperty(params, 'lock') && [0, 1].includes(params.lock)) {
             accessory
               .getService(Service.ContactSensor)
               .updateCharacteristic(Characteristic.ContactSensorState, params.lock)
diff --git a/lib/eWeLinkHTTP.js b/lib/ewelink-http.js
similarity index 81%
rename from lib/eWeLinkHTTP.js
rename to lib/ewelink-http.js
index e311f53b..4ac13318 100644
--- a/lib/eWeLinkHTTP.js
+++ b/lib/ewelink-http.js
@@ -1,9 +1,9 @@
 /* jshint -W014, -W033, esversion: 9 */
+/* eslint-disable new-cap */
 'use strict'
 const axios = require('axios')
-const cns = require('./constants')
 const crypto = require('crypto')
-const utils = require('./utils')
+const helpers = require('./helpers')
 module.exports = class eWeLinkHTTP {
   constructor (config, log) {
     this.log = log
@@ -17,7 +17,7 @@ module.exports = class eWeLinkHTTP {
 
   async getHost () {
     const params = {
-      appid: cns.appId,
+      appid: helpers.appId,
       country_code: this.cCode,
       nonce: Math.random().toString(36).substr(2, 8),
       ts: Math.floor(new Date().getTime() / 1000),
@@ -33,7 +33,7 @@ module.exports = class eWeLinkHTTP {
       })
       dataToSign.sort((a, b) => (a.key < b.key ? -1 : 1))
       dataToSign = dataToSign.map(k => k.key + '=' + k.value).join('&')
-      dataToSign = crypto.createHmac('sha256', cns.appSecret).update(dataToSign).digest('base64')
+      dataToSign = crypto.createHmac('sha256', helpers.appSecret).update(dataToSign).digest('base64')
       if (this.debugReqRes) {
         this.log.warn('Sending HTTP getHost() request. This text is yellow for clarity.\n%s', JSON.stringify(params, null, 2))
       } else if (this.debug) {
@@ -67,11 +67,11 @@ module.exports = class eWeLinkHTTP {
       }
       return this.httpHost
     } catch (err) {
-      if (utils.hasProperty(err, 'code') && cns.httpRetryCodes.includes(err.code)) {
+      if (helpers.hasProperty(err, 'code') && helpers.httpRetryCodes.includes(err.code)) {
         if (this.debug) {
           this.log.warn('Unable to reach eWeLink. Retrying in 30 seconds.')
         }
-        await utils.sleep(30000)
+        await helpers.sleep(30000)
         return await this.getHost()
       } else {
         return err
@@ -95,22 +95,22 @@ module.exports = class eWeLinkHTTP {
     } else if (this.debug) {
       this.log('Sending HTTP login() request.')
     }
-    const dataToSign = crypto.createHmac('sha256', cns.appSecret).update(JSON.stringify(data)).digest('base64')
+    const dataToSign = crypto.createHmac('sha256', helpers.appSecret).update(JSON.stringify(data)).digest('base64')
     const res = await axios.post('https://' + this.httpHost + '/v2/user/login', data, {
       headers: {
         Authorization: 'Sign ' + dataToSign,
         'Content-Type': 'application/json',
         Host: this.httpHost,
-        'X-CK-Appid': cns.appId,
+        'X-CK-Appid': helpers.appId,
         'X-CK-Nonce': Math.random().toString(36).substr(2, 8)
       }
     })
     const body = res.data
     if (
-      utils.hasProperty(body, 'error') &&
+      helpers.hasProperty(body, 'error') &&
       body.error === 10004 &&
-      utils.hasProperty(body, 'data') &&
-      utils.hasProperty(body.data, 'region')
+      helpers.hasProperty(body, 'data') &&
+      helpers.hasProperty(body.data, 'region')
     ) {
       const givenRegion = body.data.region
       switch (givenRegion) {
@@ -143,7 +143,7 @@ module.exports = class eWeLinkHTTP {
         if (this.debug) {
           this.log.warn('An eWeLink error [500] occured. Retrying in 30 seconds.')
         }
-        await utils.sleep(30000)
+        await helpers.sleep(30000)
         return await this.login()
       } else {
         throw new Error('No auth token received.\n' + JSON.stringify(body, null, 2))
@@ -158,15 +158,15 @@ module.exports = class eWeLinkHTTP {
           Authorization: 'Bearer ' + this.aToken,
           'Content-Type': 'application/json',
           Host: this.httpHost,
-          'X-CK-Appid': cns.appId,
+          'X-CK-Appid': helpers.appId,
           'X-CK-Nonce': Math.random().toString(36).substr(2, 8)
         }
       })
       const body = res.data
       if (
-        !utils.hasProperty(body, 'data') ||
-        !utils.hasProperty(body, 'error') ||
-        (utils.hasProperty(body, 'error') && body.error !== 0)
+        !helpers.hasProperty(body, 'data') ||
+        !helpers.hasProperty(body, 'error') ||
+        (helpers.hasProperty(body, 'error') && body.error !== 0)
       ) {
         throw new Error(JSON.stringify(body, null, 2))
       }
@@ -174,9 +174,9 @@ module.exports = class eWeLinkHTTP {
       if (body.data.thingList && body.data.thingList.length > 0) {
         body.data.thingList.forEach(d => {
           if (
-            utils.hasProperty(d, 'itemData') &&
-            utils.hasProperty(d.itemData, 'extra') &&
-            utils.hasProperty(d.itemData.extra, 'uiid') &&
+            helpers.hasProperty(d, 'itemData') &&
+            helpers.hasProperty(d.itemData, 'extra') &&
+            helpers.hasProperty(d.itemData.extra, 'uiid') &&
             !this.hideDevFromHB.includes(d.itemData.deviceid)
           ) {
             deviceList.push(d.itemData)
@@ -185,11 +185,11 @@ module.exports = class eWeLinkHTTP {
       }
       return deviceList
     } catch (err) {
-      if (utils.hasProperty(err, 'code') && cns.httpRetryCodes.includes(err.code)) {
+      if (helpers.hasProperty(err, 'code') && helpers.httpRetryCodes.includes(err.code)) {
         if (this.debug) {
           this.log.warn('Unable to reach eWeLink. Retrying in 30 seconds.')
         }
-        await utils.sleep(30000)
+        await helpers.sleep(30000)
         return await this.getDevices()
       } else {
         return err
@@ -209,15 +209,15 @@ module.exports = class eWeLinkHTTP {
           Authorization: 'Bearer ' + this.aToken,
           'Content-Type': 'application/json',
           Host: this.httpHost,
-          'X-CK-Appid': cns.appId,
+          'X-CK-Appid': helpers.appId,
           'X-CK-Nonce': Math.random().toString(36).substr(2, 8)
         }
       })
       const body = res.data
       if (
-        !utils.hasProperty(body, 'data') ||
-        !utils.hasProperty(body, 'error') ||
-        (utils.hasProperty(body, 'error') && body.error !== 0)
+        !helpers.hasProperty(body, 'data') ||
+        !helpers.hasProperty(body, 'error') ||
+        (helpers.hasProperty(body, 'error') && body.error !== 0)
       ) {
         throw new Error(JSON.stringify(body, null, 2))
       }
@@ -227,11 +227,11 @@ module.exports = class eWeLinkHTTP {
         throw new Error('device not found in eWeLink')
       }
     } catch (err) {
-      if (utils.hasProperty(err, 'code') && cns.httpRetryCodes.includes(err.code)) {
+      if (helpers.hasProperty(err, 'code') && helpers.httpRetryCodes.includes(err.code)) {
         if (this.debug) {
           this.log.warn('Unable to reach eWeLink. Retrying in 30 seconds.')
         }
-        await utils.sleep(30000)
+        await helpers.sleep(30000)
         return await this.getDevice(deviceId)
       } else {
         return err
diff --git a/lib/eWeLinkLAN.js b/lib/ewelink-lan.js
similarity index 81%
rename from lib/eWeLinkLAN.js
rename to lib/ewelink-lan.js
index a04cdbcd..41810271 100644
--- a/lib/eWeLinkLAN.js
+++ b/lib/ewelink-lan.js
@@ -1,25 +1,25 @@
 /* jshint -W014, -W033, esversion: 9 */
+/* eslint-disable new-cap */
 'use strict'
 const axios = require('axios')
-const cns = require('./constants')
 const crypto = require('crypto')
 const dns = require('node-dns-sd')
-const EventEmitter = require('events')
-const utils = require('./utils')
+const eventEmitter = require('events')
+const helpers = require('./helpers')
 module.exports = class eWeLinkLAN {
   constructor (config, log, devices) {
     this.log = log
     this.config = config
     this.debug = this.config.debug || false
     this.debugReqRes = this.config.debugReqRes || false
-    this.emitter = new EventEmitter()
+    this.emitter = new eventEmitter()
     this.devices = devices
     this.deviceMap = new Map()
     devices.forEach(device => {
       this.deviceMap.set(device.deviceid, {
         apiKey: device.devicekey,
-        online: utils.hasProperty(this.config.ipOverride, device.deviceid),
-        ip: utils.hasProperty(this.config.ipOverride, device.deviceid) ? this.config.ipOverride[device.deviceid] : null
+        online: helpers.hasProperty(this.config.ipOverride, device.deviceid),
+        ip: helpers.hasProperty(this.config.ipOverride, device.deviceid) ? this.config.ipOverride[device.deviceid] : null
       })
     })
   }
@@ -30,7 +30,7 @@ module.exports = class eWeLinkLAN {
       let d
       const deviceId = device.fqdn.replace('._ewelink._tcp.local', '').replace('eWeLink_', '')
       if ((d = this.deviceMap.get(deviceId))) {
-        if (!utils.hasProperty(this.config.ipOverride, deviceId)) {
+        if (!helpers.hasProperty(this.config.ipOverride, deviceId)) {
           this.deviceMap.set(deviceId, {
             apiKey: d.apiKey,
             online: true,
@@ -54,14 +54,14 @@ module.exports = class eWeLinkLAN {
             const deviceInfo = this.deviceMap.get(rdata.id)
             const data =
               rdata.data1 +
-              (utils.hasProperty(rdata, 'data2') ? rdata.data2 : '') +
-              (utils.hasProperty(rdata, 'data3') ? rdata.data3 : '') +
-              (utils.hasProperty(rdata, 'data4') ? rdata.data4 : '')
+              (helpers.hasProperty(rdata, 'data2') ? rdata.data2 : '') +
+              (helpers.hasProperty(rdata, 'data3') ? rdata.data3 : '') +
+              (helpers.hasProperty(rdata, 'data4') ? rdata.data4 : '')
             const key = crypto.createHash('md5').update(Buffer.from(deviceInfo.apiKey, 'utf8')).digest()
             const dText = crypto.createDecipheriv('aes-128-cbc', key, Buffer.from(rdata.iv, 'base64'))
             const pText = Buffer.concat([dText.update(Buffer.from(data, 'base64')), dText.final()]).toString('utf8')
             let params
-            if (packet.address !== deviceInfo.ip && !utils.hasProperty(this.config.ipOverride, rdata.id)) {
+            if (packet.address !== deviceInfo.ip && !helpers.hasProperty(this.config.ipOverride, rdata.id)) {
               this.deviceMap.set(rdata.id, {
                 apiKey: deviceInfo.apiKey,
                 online: true,
@@ -76,8 +76,8 @@ module.exports = class eWeLinkLAN {
               return
             }
             for (const param in params) {
-              if (utils.hasProperty(params, param)) {
-                if (!cns.paramsToKeep.includes(param.replace(/[0-9]/g, ''))) {
+              if (helpers.hasProperty(params, param)) {
+                if (!helpers.paramsToKeep.includes(param.replace(/[0-9]/g, ''))) {
                   delete params[param]
                 }
               }
@@ -111,10 +111,10 @@ module.exports = class eWeLinkLAN {
       let apiKey
       let suffix
       const params = {}
-      if (utils.hasProperty(json.params, 'switches')) {
+      if (helpers.hasProperty(json.params, 'switches')) {
         params.switches = json.params.switches
         suffix = 'switches'
-      } else if (utils.hasProperty(json.params, 'switch')) {
+      } else if (helpers.hasProperty(json.params, 'switch')) {
         params.switch = json.params.switch
         suffix = 'switch'
       } else {
@@ -149,7 +149,7 @@ module.exports = class eWeLinkLAN {
           },
           data
         })
-        if (!utils.hasProperty(res.data, 'error') || res.data.error !== 0) {
+        if (!helpers.hasProperty(res.data, 'error') || res.data.error !== 0) {
           throw new Error(res.data)
         }
         return 'ok'
@@ -166,8 +166,8 @@ module.exports = class eWeLinkLAN {
   addDeviceToMap (device) {
     this.deviceMap.set(device.deviceid, {
       apiKey: device.devicekey,
-      online: utils.hasProperty(this.config.ipOverride, device.deviceid),
-      ip: utils.hasProperty(this.config.ipOverride, device.deviceid) ? this.config.ipOverride[device.deviceid] : null
+      online: helpers.hasProperty(this.config.ipOverride, device.deviceid),
+      ip: helpers.hasProperty(this.config.ipOverride, device.deviceid) ? this.config.ipOverride[device.deviceid] : null
     })
   }
 
diff --git a/lib/eWeLink.js b/lib/ewelink-platform.js
similarity index 86%
rename from lib/eWeLink.js
rename to lib/ewelink-platform.js
index 26aa3c9a..54c9aef1 100644
--- a/lib/eWeLink.js
+++ b/lib/ewelink-platform.js
@@ -1,7 +1,6 @@
 /* jshint -W014, -W033, esversion: 9 */
+/* eslint-disable new-cap */
 'use strict'
-let Accessory, Characteristic, Service
-const cns = require('./constants')
 const DeviceCurtain = require('./device/curtain')
 const DeviceBlind = require('./device/blind')
 const DeviceGarage = require('./device/garage')
@@ -19,12 +18,12 @@ const DeviceLight = require('./device/light')
 const DeviceSwitch = require('./device/switch')
 const DeviceRFBridge = require('./device/rf-bridge')
 const DeviceZBDev = require('./device/zb-dev')
-const EWeLinkHTTP = require('./eWeLinkHTTP')
-const EWeLinkWS = require('./eWeLinkWS')
-const EWeLinkLAN = require('./eWeLinkLAN')
+const EWeLinkHTTP = require('./ewelink-http')
+const EWeLinkLAN = require('./ewelink-lan')
+const EWeLinkWS = require('./ewelink-ws')
+const helpers = require('./helpers')
 const promInterval = require('interval-promise')
-const utils = require('./utils')
-class eWeLink {
+module.exports = class eWeLinkPlatform {
   constructor (log, config, api) {
     if (!log || !api || !config) return
     if (!config.username || !config.password || !config.countryCode) {
@@ -35,6 +34,8 @@ class eWeLink {
     this.log = log
     this.config = config
     this.api = api
+    this.Characteristic = api.hap.Characteristic
+    this.Service = api.hap.Service
     this.debug = this.config.debug || false
     this.devicesInHB = new Map()
     this.devicesInEW = new Map()
@@ -80,13 +81,13 @@ class eWeLink {
       ;(() => {
         if (Object.keys(this.config.groups || []).length > 0) {
           this.config.groups
-            .filter(g => utils.hasProperty(g, 'type') && cns.allowedGroups.includes(g.type))
-            .filter(g => utils.hasProperty(g, 'deviceId') && this.devicesInEW.has(g.deviceId))
+            .filter(g => helpers.hasProperty(g, 'type') && helpers.allowedGroups.includes(g.type))
+            .filter(g => helpers.hasProperty(g, 'deviceId') && this.devicesInEW.has(g.deviceId))
             .forEach(g => this.cusG.set(g.deviceId + 'SWX', g))
         }
         if (Object.keys(this.config.bridgeSensors || []).length > 0) {
           this.config.bridgeSensors
-            .filter(s => utils.hasProperty(s, 'deviceId') && this.devicesInEW.has(s.deviceId))
+            .filter(s => helpers.hasProperty(s, 'deviceId') && this.devicesInEW.has(s.deviceId))
             .forEach(s => this.cusS.set(s.fullDeviceId, s))
         }
         this.log('[%s] eWeLink devices loaded from the Homebridge cache.', this.devicesInHB.size)
@@ -104,7 +105,7 @@ class eWeLink {
                 if (this.wsClient) {
                   await this.wsClient.getHost()
                   await this.wsClient.closeConnection()
-                  await utils.sleep(250)
+                  await helpers.sleep(250)
                   await this.wsClient.login()
                 }
               } catch (err) {
@@ -148,19 +149,19 @@ class eWeLink {
       if (this.cusG.has(device.deviceid + 'SWX')) {
         ;['X', '0', '1', '2', '3', '4'].forEach(sw => {
           if (this.devicesInHB.has(device.deviceid + 'SW' + sw)) {
-            if (this.devicesInHB.get(device.deviceid + 'SW' + sw).getService(Service.Switch)) {
+            if (this.devicesInHB.get(device.deviceid + 'SW' + sw).getService(this.Service.Switch)) {
               this.removeAccessory(this.devicesInHB.get(device.deviceid + 'SW' + sw))
             }
           }
         })
       }
-      if (cns.devicesCurtain.includes(device.extra.uiid)) {
+      if (helpers.devicesCurtain.includes(device.extra.uiid)) {
         /***********************
         BLINDS [EWELINK UIID 11]
         ***********************/
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
-          : this.addAccessory(device, device.deviceid + 'SWX', false, cns.defaultCurtainCache)
+          : this.addAccessory(device, device.deviceid + 'SWX', false, helpers.defaultCurtainCache)
         accessory.control = new DeviceCurtain(this, accessory)
         /**********************/
       } else if (this.cusG.has(device.deviceid + 'SWX') && this.cusG.get(device.deviceid + 'SWX').type === 'blind') {
@@ -169,7 +170,7 @@ class eWeLink {
         ****************************/
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
-          : this.addAccessory(device, device.deviceid + 'SWX', false, cns.defaultBlindCache)
+          : this.addAccessory(device, device.deviceid + 'SWX', false, helpers.defaultBlindCache)
         accessory.control = new DeviceBlind(this, accessory)
         /***************************/
       } else if (this.cusG.has(device.deviceid + 'SWX') && this.cusG.get(device.deviceid + 'SWX').type === 'garage') {
@@ -178,7 +179,7 @@ class eWeLink {
         **********************************/
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
-          : this.addAccessory(device, device.deviceid + 'SWX', false, cns.defaultGarageCache)
+          : this.addAccessory(device, device.deviceid + 'SWX', false, helpers.defaultGarageCache)
         accessory.control = new DeviceGarage(this, accessory)
         /*********************************/
       } else if (this.cusG.has(device.deviceid + 'SWX') && this.cusG.get(device.deviceid + 'SWX').type === 'garage_two') {
@@ -187,7 +188,7 @@ class eWeLink {
         **********************************/
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
-          : this.addAccessory(device, device.deviceid + 'SWX', false, cns.defaultGarageTwoCache)
+          : this.addAccessory(device, device.deviceid + 'SWX', false, helpers.defaultGarageTwoCache)
         accessory.control = new DeviceGarageTwo(this, accessory)
         /*********************************/
       } else if (this.cusG.has(device.deviceid + 'SWX') && this.cusG.get(device.deviceid + 'SWX').type === 'garage_eachen') {
@@ -217,7 +218,7 @@ class eWeLink {
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new DeviceValve(this, accessory)
         /***************************/
-      } else if (cns.devicesSensor.includes(device.extra.uiid)) {
+      } else if (helpers.devicesSensor.includes(device.extra.uiid)) {
         /*******************
         SENSORS [SONOFF DW2]
         *******************/
@@ -226,7 +227,7 @@ class eWeLink {
           : this.addAccessory(device, device.deviceid + 'SWX', false, { type: 'sensor' })
         accessory.control = new DeviceSensor(this, accessory)
         /******************/
-      } else if (cns.devicesFan.includes(device.extra.uiid)) {
+      } else if (helpers.devicesFan.includes(device.extra.uiid)) {
         /***
         FANS
         ***/
@@ -235,7 +236,7 @@ class eWeLink {
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new DeviceFan(this, accessory)
         /**/
-      } else if (cns.devicesThermostat.includes(device.extra.uiid)) {
+      } else if (helpers.devicesThermostat.includes(device.extra.uiid)) {
         /**********
         THERMOSTATS
         **********/
@@ -246,7 +247,7 @@ class eWeLink {
           })
         accessory.control = new DeviceThermostat(this, accessory)
         /*********/
-      } else if (cns.devicesOutlet.includes(device.extra.uiid) || (cns.devicesSingleSwitch.includes(device.extra.uiid) && cns.devicesSingleSwitchOutlet.includes(device.productModel))) {
+      } else if (helpers.devicesOutlet.includes(device.extra.uiid) || (helpers.devicesSingleSwitch.includes(device.extra.uiid) && helpers.devicesSingleSwitchOutlet.includes(device.productModel))) {
         /******
         OUTLETS
         ******/
@@ -255,7 +256,7 @@ class eWeLink {
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new DeviceOutlet(this, accessory)
         /*****/
-      } else if (cns.devicesUSB.includes(device.extra.uiid)) {
+      } else if (helpers.devicesUSB.includes(device.extra.uiid)) {
         /**********
         USB OUTLETS
         **********/
@@ -264,7 +265,7 @@ class eWeLink {
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new DeviceUSB(this, accessory)
         /*********/
-      } else if (cns.devicesSCM.includes(device.extra.uiid)) {
+      } else if (helpers.devicesSCM.includes(device.extra.uiid)) {
         /*********************************
         SINGLE CHL [MULTIPLE CHL HARDWARE]
         *********************************/
@@ -273,7 +274,7 @@ class eWeLink {
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new DeviceSCM(this, accessory)
         /********************************/
-      } else if (cns.devicesSingleSwitch.includes(device.extra.uiid) && cns.devicesSingleSwitchLight.includes(device.productModel)) {
+      } else if (helpers.devicesSingleSwitch.includes(device.extra.uiid) && helpers.devicesSingleSwitchLight.includes(device.productModel)) {
         /**********************
         LIGHTS [SINGLE CHANNEL]
         **********************/
@@ -282,7 +283,7 @@ class eWeLink {
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new DeviceLight(this, accessory)
         /*********************/
-      } else if (cns.devicesMultiSwitch.includes(device.extra.uiid) && cns.devicesMultiSwitchLight.includes(device.productModel)) {
+      } else if (helpers.devicesMultiSwitch.includes(device.extra.uiid) && helpers.devicesMultiSwitchLight.includes(device.productModel)) {
         /*********************
         LIGHTS [MULTI CHANNEL]
         *********************/
@@ -298,7 +299,7 @@ class eWeLink {
             : this.addAccessory(device, device.deviceid + 'SW0')
         }
         accessory.control = new DeviceLight(this, accessory)
-        for (let i = 1; i <= cns.chansFromUiid[device.extra.uiid]; i++) {
+        for (let i = 1; i <= helpers.chansFromUiid[device.extra.uiid]; i++) {
           if ((this.config.hideChanFromHB || '').split(',').includes(device.deviceid + 'SW' + i)) {
             if (this.devicesInHB.has(device.deviceid + 'SW' + i)) {
               this.removeAccessory(this.devicesInHB.get(device.deviceid + 'SW' + i))
@@ -309,8 +310,8 @@ class eWeLink {
               ? this.devicesInHB.get(device.deviceid + 'SW' + i)
               : this.addAccessory(device, device.deviceid + 'SW' + i)
             oAccessory
-              .getService(Service.AccessoryInformation)
-              .setCharacteristic(Characteristic.FirmwareRevision, device.params.fwVersion)
+              .getService(this.Service.AccessoryInformation)
+              .setCharacteristic(this.Characteristic.FirmwareRevision, device.params.fwVersion)
           }
           oAccessory.context.reachableWAN = device.online
           oAccessory.context.reachableLAN = this.lanDevices.get(device.deviceid).online || false
@@ -318,7 +319,7 @@ class eWeLink {
           oAccessory.control = new DeviceLight(this, oAccessory)
         }
         /********************/
-      } else if (cns.devicesSingleSwitch.includes(device.extra.uiid)) {
+      } else if (helpers.devicesSingleSwitch.includes(device.extra.uiid)) {
         /************************
         SWITCHES [SINGLE CHANNEL]
         ************************/
@@ -327,7 +328,7 @@ class eWeLink {
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new DeviceSwitch(this, accessory)
         /***********************/
-      } else if (cns.devicesMultiSwitch.includes(device.extra.uiid)) {
+      } else if (helpers.devicesMultiSwitch.includes(device.extra.uiid)) {
         /***********************
         SWITCHES [MULTI CHANNEL]
         ***********************/
@@ -343,7 +344,7 @@ class eWeLink {
             : this.addAccessory(device, device.deviceid + 'SW0')
         }
         accessory.control = new DeviceSwitch(this, accessory)
-        for (let i = 1; i <= cns.chansFromUiid[device.extra.uiid]; i++) {
+        for (let i = 1; i <= helpers.chansFromUiid[device.extra.uiid]; i++) {
           if ((this.config.hideChanFromHB || '').split(',').includes(device.deviceid + 'SW' + i)) {
             if (this.devicesInHB.has(device.deviceid + 'SW' + i)) {
               this.removeAccessory(this.devicesInHB.get(device.deviceid + 'SW' + i))
@@ -354,8 +355,8 @@ class eWeLink {
               ? this.devicesInHB.get(device.deviceid + 'SW' + i)
               : this.addAccessory(device, device.deviceid + 'SW' + i)
             oAccessory
-              .getService(Service.AccessoryInformation)
-              .setCharacteristic(Characteristic.FirmwareRevision, device.params.fwVersion)
+              .getService(this.Service.AccessoryInformation)
+              .setCharacteristic(this.Characteristic.FirmwareRevision, device.params.fwVersion)
           }
           oAccessory.context.reachableWAN = device.online
           oAccessory.context.reachableLAN = this.lanDevices.get(device.deviceid).online || false
@@ -363,13 +364,13 @@ class eWeLink {
           oAccessory.control = new DeviceSwitch(this, oAccessory)
         }
         /**********************/
-      } else if (cns.devicesRFBridge.includes(device.extra.uiid)) {
+      } else if (helpers.devicesRFBridge.includes(device.extra.uiid)) {
         /*********************
         RF BRIDGE + SUBDEVICES
         *********************/
         let rfChlCounter = 0
         const rfMap = []
-        if (utils.hasProperty(device, 'tags') && utils.hasProperty(device.tags, 'zyx_info')) {
+        if (helpers.hasProperty(device, 'tags') && helpers.hasProperty(device.tags, 'zyx_info')) {
           device.tags.zyx_info.forEach(remote =>
             rfMap.push({
               name: remote.name,
@@ -412,8 +413,8 @@ class eWeLink {
             ? this.devicesInHB.get(device.deviceid + 'SW' + swNumber)
             : this.addAccessory(device, device.deviceid + 'SW' + swNumber, false, subExtraContext, 'rf_sub')
           oAccessory
-            .getService(Service.AccessoryInformation)
-            .setCharacteristic(Characteristic.FirmwareRevision, device.params.fwVersion)
+            .getService(this.Service.AccessoryInformation)
+            .setCharacteristic(this.Characteristic.FirmwareRevision, device.params.fwVersion)
           oAccessory.context.reachableWAN = device.online
           oAccessory.context.reachableLAN = false
           this.devicesInHB.set(oAccessory.context.hbDeviceId, oAccessory)
@@ -423,7 +424,7 @@ class eWeLink {
         accessory.context.channelCount = rfChlCounter
         this.devicesInHB.set(accessory.context.hbDeviceId, accessory)
         /********************/
-      } else if (cns.devicesZBBridge.includes(device.extra.uiid)) {
+      } else if (helpers.devicesZBBridge.includes(device.extra.uiid)) {
         /************
         ZIGBEE BRIDGE
         ************/
@@ -432,7 +433,7 @@ class eWeLink {
         }
         return
         /***********/
-      } else if (cns.devicesZB.includes(device.extra.uiid)) {
+      } else if (helpers.devicesZB.includes(device.extra.uiid)) {
         /****************
         ZIGBEE SUBDEVICES
         ****************/
@@ -441,7 +442,7 @@ class eWeLink {
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new DeviceZBDev(this, accessory)
         /***************/
-      } else if (cns.devicesCamera.includes(device.extra.uiid)) {
+      } else if (helpers.devicesCamera.includes(device.extra.uiid)) {
         /******
         CAMERAS
         ******/
@@ -458,8 +459,8 @@ class eWeLink {
       }
       if (!this.hiddenMasters.includes(device.deviceid)) {
         accessory
-          .getService(Service.AccessoryInformation)
-          .setCharacteristic(Characteristic.FirmwareRevision, device.params.fwVersion)
+          .getService(this.Service.AccessoryInformation)
+          .setCharacteristic(this.Characteristic.FirmwareRevision, device.params.fwVersion)
       }
       accessory.context.reachableWAN = device.online
       accessory.context.reachableLAN = this.lanDevices.has(device.deviceid)
@@ -470,19 +471,19 @@ class eWeLink {
         ? 'and found locally with IP [' + this.lanDevices.get(device.deviceid).ip + ']'
         : 'but LAN mode unavailable as device '
       if (!accessory.context.reachableLAN) {
-        if (cns.devicesNonLAN.includes(device.extra.uiid)) {
+        if (helpers.devicesNonLAN.includes(device.extra.uiid)) {
           str += "doesn't support it"
-        } else if (utils.hasProperty(device, 'sharedBy') && utils.hasProperty(device.sharedBy, 'email')) {
+        } else if (helpers.hasProperty(device, 'sharedBy') && helpers.hasProperty(device.sharedBy, 'email')) {
           str += 'is shared (' + device.sharedBy.email + ')'
         } else {
           str += 'is unreachable'
         }
       }
-      if (!this.config.disableHTTPRefresh) accessory.control.externalUpdate(accessory, device.params)
+      if (!this.config.disableHTTPRefresh) accessory.control.externalUpdate(device.params)
       this.devicesInHB.set(accessory.context.hbDeviceId, accessory)
       this.log(' → [%s] initialised %s.', device.name, str)
     } catch (err) {
-      const deviceName = accessory && utils.hasProperty(accessory, 'displayName')
+      const deviceName = accessory && helpers.hasProperty(accessory, 'displayName')
         ? accessory.displayName
         : device.name
       this.log.warn(' → [%s] could not be initialised as %s.', deviceName, this.debug ? err : err.message)
@@ -495,23 +496,23 @@ class eWeLink {
     const channelCount =
       type === 'rf_pri'
         ? Object.keys((device.tags && device.tags.zyx_info) || []).length
-        : cns.chansFromUiid[device.extra.uiid]
+        : helpers.chansFromUiid[device.extra.uiid]
     if (['1', '2', '3', '4'].includes(switchNumber) && type !== 'rf_sub') {
       newDeviceName += ' SW' + switchNumber
     }
-    if (utils.hasProperty(this.config.nameOverride, hbDeviceId)) {
+    if (helpers.hasProperty(this.config.nameOverride, hbDeviceId)) {
       newDeviceName = this.config.nameOverride[hbDeviceId]
     }
     try {
-      const accessory = new Accessory(newDeviceName, this.api.hap.uuid.generate(hbDeviceId).toString())
+      const accessory = new this.api.platformAccessory(newDeviceName, this.api.hap.uuid.generate(hbDeviceId).toString())
       if (!hidden) {
         accessory
-          .getService(Service.AccessoryInformation)
-          .setCharacteristic(Characteristic.SerialNumber, hbDeviceId)
-          .setCharacteristic(Characteristic.Manufacturer, device.brandName)
-          .setCharacteristic(Characteristic.Model, device.productModel + ' (' + device.extra.model + ')')
-          .setCharacteristic(Characteristic.FirmwareRevision, device.params.fwVersion)
-          .setCharacteristic(Characteristic.Identify, false)
+          .getService(this.Service.AccessoryInformation)
+          .setCharacteristic(this.Characteristic.SerialNumber, hbDeviceId)
+          .setCharacteristic(this.Characteristic.Manufacturer, device.brandName)
+          .setCharacteristic(this.Characteristic.Model, device.productModel + ' (' + device.extra.model + ')')
+          .setCharacteristic(this.Characteristic.FirmwareRevision, device.params.fwVersion)
+          .setCharacteristic(this.Characteristic.Identify, false)
       }
       accessory.context = {
         ...{
@@ -543,7 +544,7 @@ class eWeLink {
       params
     }
     let res
-    if (cns.devicesNonLAN.includes(accessory.context.eweUIID)) {
+    if (helpers.devicesNonLAN.includes(accessory.context.eweUIID)) {
       res = "device doesn't support LAN mode"
     } else {
       res = await this.lanClient.sendUpdate(payload)
@@ -608,7 +609,7 @@ class eWeLink {
         this.log('[%s] %s update received and will be refreshed.', accessory.displayName, device.params.updateSource)
       }
       try {
-        accessory.control.externalUpdate(accessory, device.params)
+        accessory.control.externalUpdate(device.params)
       } catch (err) {
         this.log.warn('[%s] could not be refreshed as %s.', accessory.displayName, this.debug ? err : err.message)
       }
@@ -655,9 +656,3 @@ class eWeLink {
     }
   }
 }
-module.exports = function (homebridge) {
-  Accessory = homebridge.platformAccessory
-  Characteristic = homebridge.hap.Characteristic
-  Service = homebridge.hap.Service
-  return eWeLink
-}
diff --git a/lib/eWeLinkWS.js b/lib/ewelink-ws.js
similarity index 85%
rename from lib/eWeLinkWS.js
rename to lib/ewelink-ws.js
index 50d0fe19..04f4a0d4 100644
--- a/lib/eWeLinkWS.js
+++ b/lib/ewelink-ws.js
@@ -1,11 +1,11 @@
 /* jshint -W014, -W033, esversion: 9 */
+/* eslint-disable new-cap */
 'use strict'
 const axios = require('axios')
-const cns = require('./constants')
-const EventEmitter = require('events')
-const utils = require('./utils')
-const WS = require('ws')
-const WSP = require('websocket-as-promised')
+const eventEmitter = require('events')
+const helpers = require('./helpers')
+const ws = require('ws')
+const wsp = require('websocket-as-promised')
 module.exports = class eWeLinkWS {
   constructor (config, log, res) {
     this.config = config
@@ -16,7 +16,7 @@ module.exports = class eWeLinkWS {
     this.aToken = res.aToken
     this.apiKey = res.apiKey
     this.wsIsOpen = false
-    this.emitter = new EventEmitter()
+    this.emitter = new eventEmitter()
   }
 
   async getHost () {
@@ -29,7 +29,7 @@ module.exports = class eWeLinkWS {
           'Content-Type': 'application/json'
         },
         data: {
-          appid: cns.appId,
+          appid: helpers.appId,
           nonce: Math.random().toString(36).substr(2, 8),
           ts: Math.floor(new Date().getTime() / 1000),
           version: 8
@@ -43,9 +43,9 @@ module.exports = class eWeLinkWS {
       this.wsHost = body.domain
       return body.domain
     } catch (err) {
-      if (utils.hasProperty(err, 'code') && cns.httpRetryCodes.includes(err.code)) {
+      if (helpers.hasProperty(err, 'code') && helpers.httpRetryCodes.includes(err.code)) {
         if (this.debug) this.log.warn('Unable to reach eWeLink. Retrying in 30 seconds.')
-        await utils.sleep(30000)
+        await helpers.sleep(30000)
         return await this.getHost()
       } else {
         return err
@@ -54,8 +54,8 @@ module.exports = class eWeLinkWS {
   }
 
   login () {
-    this.wsp = new WSP('wss://' + this.wsHost + ':8080/api/ws', {
-      createWebSocket: url => new WS(url),
+    this.wsp = new wsp('wss://' + this.wsHost + ':8080/api/ws', {
+      createWebSocket: url => new ws(url),
       extractMessageData: event => event,
       attachRequestId: (data, requestId) => Object.assign({ sequence: requestId }, data),
       extractRequestId: data => data && data.sequence,
@@ -69,7 +69,7 @@ module.exports = class eWeLinkWS {
       const payload = {
         action: 'userOnline',
         apikey: this.apiKey,
-        appid: cns.appId,
+        appid: helpers.appId,
         at: this.aToken,
         nonce: Math.random().toString(36).substr(2, 8),
         sequence,
@@ -85,7 +85,7 @@ module.exports = class eWeLinkWS {
       }
       try {
         const res = await this.wsp.sendRequest(payload, { requestId: sequence })
-        if (utils.hasProperty(res, 'config') && res.config.hb && res.config.hbInterval) {
+        if (helpers.hasProperty(res, 'config') && res.config.hb && res.config.hbInterval) {
           if (this.hbInterval) clearInterval(this.hbInterval)
           this.hbInterval = setInterval(() => {
             try {
@@ -104,24 +104,24 @@ module.exports = class eWeLinkWS {
     this.wsp.onUnpackedMessage.addListener(device => {
       if (device === 'pong') return
       let onlineStatus = true
-      if (!utils.hasProperty(device, 'params')) device.params = {}
-      if (utils.hasProperty(device, 'deviceid') && utils.hasProperty(device, 'error')) {
+      if (!helpers.hasProperty(device, 'params')) device.params = {}
+      if (helpers.hasProperty(device, 'deviceid') && helpers.hasProperty(device, 'error')) {
         device.action = 'update'
         onlineStatus = device.error === 0
         if (device.error !== 0 && this.debug) {
           this.log.warn('WS message received.\n%s', JSON.stringify(device, null, 2).replace(this.apiKey, '**hidden**'))
         }
       }
-      if (utils.hasProperty(device, 'action')) {
+      if (helpers.hasProperty(device, 'action')) {
         switch (device.action) {
           case 'update':
           case 'sysmsg':
-            if (device.action === 'sysmsg' && utils.hasProperty(device.params, 'online')) {
+            if (device.action === 'sysmsg' && helpers.hasProperty(device.params, 'online')) {
               onlineStatus = device.params.online
             }
             for (const param in device.params) {
-              if (utils.hasProperty(device.params, param)) {
-                if (!cns.paramsToKeep.includes(param.replace(/[0-9]/g, ''))) {
+              if (helpers.hasProperty(device.params, param)) {
+                if (!helpers.paramsToKeep.includes(param.replace(/[0-9]/g, ''))) {
                   delete device.params[param]
                 }
               }
@@ -149,7 +149,7 @@ module.exports = class eWeLinkWS {
               this.log.warn('[%s] WS message has unknown action.\n' + JSON.stringify(device, null, 2), device.deviceid)
             }
         }
-      } else if (utils.hasProperty(device, 'error') && device.error === 0) {
+      } else if (helpers.hasProperty(device, 'error') && device.error === 0) {
         // *** Safe to ignore these messages *** \\
       } else {
         if (this.debug) this.log.warn('WS unknown command received.\n' + JSON.stringify(device, null, 2))
@@ -167,7 +167,7 @@ module.exports = class eWeLinkWS {
         this.log.warn('Web socket closed - [%s].', e)
         this.log.warn('Web socket will try to reconnect in five seconds.')
       }
-      await utils.sleep(5000)
+      await helpers.sleep(5000)
       return await this.login()
     })
     this.wsp.onError.addListener(async e => {
@@ -181,7 +181,7 @@ module.exports = class eWeLinkWS {
         this.log.warn('Web socket error - [%s].', e)
         this.log.warn('Web socket will try to reconnect in five seconds.')
       }
-      await utils.sleep(5000)
+      await helpers.sleep(5000)
       return await this.login()
     })
   }
@@ -206,7 +206,7 @@ module.exports = class eWeLinkWS {
           this.log('WS message sent.')
         }
         const device = await this.wsp.sendRequest(jsonToSend, { requestId: sequence })
-        device.error = utils.hasProperty(device, 'error') ? device.error : 504
+        device.error = helpers.hasProperty(device, 'error') ? device.error : 504
         switch (device.error) {
           case 0:
             return
@@ -221,7 +221,7 @@ module.exports = class eWeLinkWS {
       if (this.debug) {
         this.log.warn('Command will be resent when WS is reconnected.')
       }
-      await utils.sleep(30000)
+      await helpers.sleep(30000)
       return await this.sendUpdate(json)
     }
   }
@@ -249,7 +249,7 @@ module.exports = class eWeLinkWS {
       }
     } else {
       if (this.debug) this.log.warn('Command will be resent when WS is reconnected.')
-      await utils.sleep(30000)
+      await helpers.sleep(30000)
       return await this.requestUpdate(accessory)
     }
   }
diff --git a/lib/constants.js b/lib/helpers.js
similarity index 97%
rename from lib/constants.js
rename to lib/helpers.js
index 1c92339c..b88b9be5 100644
--- a/lib/constants.js
+++ b/lib/helpers.js
@@ -1,6 +1,13 @@
 /* jshint -W014, -W033, esversion: 9 */
+/* eslint-disable new-cap */
 'use strict'
 module.exports = {
+  sleep: ms => {
+    return new Promise(resolve => setTimeout(resolve, ms))
+  },
+  hasProperty: (obj, prop) => {
+    return Object.prototype.hasOwnProperty.call(obj, prop)
+  },
   appId: 'oeVkj2lYFGnJu5XUtWisfW4utiN4u9Mq',
   appSecret: '6Nz4n0xA8s8qdxQf2GqurZj2Fs55FUvM',
   httpRetryCodes: ['ENOTFOUND', 'ETIMEDOUT', 'EAI_AGAIN'],
diff --git a/lib/utils.js b/lib/utils.js
deleted file mode 100644
index 4cd84223..00000000
--- a/lib/utils.js
+++ /dev/null
@@ -1,10 +0,0 @@
-/* jshint -W014, -W033, esversion: 9 */
-'use strict'
-module.exports = {
-  sleep: ms => {
-    return new Promise(resolve => setTimeout(resolve, ms))
-  },
-  hasProperty: (obj, prop) => {
-    return Object.prototype.hasOwnProperty.call(obj, prop)
-  }
-}

From c4e14f5fbafdbc3945b9c64009849df0d888047c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 15 Oct 2020 11:45:23 +0100
Subject: [PATCH 0477/3183] file reorganisation 2

---
 lib/device/fan.js           |  58 ++++++++++-----------
 lib/device/garage-eachen.js |  68 ++++++++++++------------
 lib/device/garage-two.js    | 100 +++++++++++++++++-------------------
 lib/device/garage.js        |  94 +++++++++++++++++----------------
 lib/device/lock.js          |  62 +++++++++++-----------
 lib/device/rf-bridge.js     |  87 +++++++++++++++----------------
 lib/device/scm.js           |  32 ++++++------
 lib/device/sensor.js        |  38 +++++++-------
 8 files changed, 261 insertions(+), 278 deletions(-)

diff --git a/lib/device/fan.js b/lib/device/fan.js
index c6f51864..dd72b1a4 100644
--- a/lib/device/fan.js
+++ b/lib/device/fan.js
@@ -1,53 +1,53 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
-let Characteristic, Service
 const helpers = require('./../helpers')
 module.exports = class deviceFan {
   constructor (platform, accessory) {
     this.platform = platform
-    Service = platform.api.hap.Service
-    Characteristic = platform.api.hap.Characteristic
-    const fanService = accessory.getService(Service.Fanv2) || accessory.addService(Service.Fanv2)
-    const fanLightService = accessory.getService(Service.Lightbulb) || accessory.addService(Service.Lightbulb)
+    this.accessory = accessory
+    this.Service = platform.api.hap.Service
+    this.Characteristic = platform.api.hap.Characteristic
+    const fanService = accessory.getService(this.Service.Fanv2) || accessory.addService(this.Service.Fanv2)
+    const fanLightService = accessory.getService(this.Service.Lightbulb) || accessory.addService(this.Service.Lightbulb)
     fanService
-      .getCharacteristic(Characteristic.Active)
+      .getCharacteristic(this.Characteristic.Active)
       .on('set', async (value, callback) => {
         callback()
         if (value === 0) {
           await helpers.sleep(500)
-          fanService.setCharacteristic(Characteristic.RotationSpeed, 0)
+          fanService.setCharacteristic(this.Characteristic.RotationSpeed, 0)
         }
       })
     fanService
-      .getCharacteristic(Characteristic.RotationSpeed)
-      .on('set', (value, callback) => this.internalUpdate(accessory, 'speed', value, callback))
+      .getCharacteristic(this.Characteristic.RotationSpeed)
+      .on('set', (value, callback) => this.internalUpdate('speed', value, callback))
       .setProps({
         minStep: 33
       })
     fanLightService
-      .getCharacteristic(Characteristic.On)
-      .on('set', (value, callback) => this.internalUpdate(accessory, 'light', value, callback))
+      .getCharacteristic(this.Characteristic.On)
+      .on('set', (value, callback) => this.internalUpdate('light', value, callback))
   }
 
-  async internalUpdate (accessory, type, value, callback) {
+  async internalUpdate (type, value, callback) {
     callback()
     try {
       let newPower
       let newSpeed
       let newLight
-      const lightService = accessory.getService(Service.Lightbulb)
-      const fanService = accessory.getService(Service.Fanv2)
+      const lightService = this.accessory.getService(this.Service.Lightbulb)
+      const fanService = this.accessory.getService(this.Service.Fanv2)
       const params = { switches: helpers.defaultMultiSwitchOff }
       switch (type) {
         case 'speed':
           newPower = value >= 33 ? 1 : 0
           newSpeed = value
-          newLight = lightService.getCharacteristic(Characteristic.On).value
+          newLight = lightService.getCharacteristic(this.Characteristic.On).value
           break
         case 'light':
-          newPower = fanService.getCharacteristic(Characteristic.Active).value
-          newSpeed = fanService.getCharacteristic(Characteristic.RotationSpeed).value
+          newPower = fanService.getCharacteristic(this.Characteristic.Active).value
+          newSpeed = fanService.getCharacteristic(this.Characteristic.RotationSpeed).value
           newLight = value
           break
       }
@@ -56,21 +56,21 @@ module.exports = class deviceFan {
       params.switches[2].switch = newPower === 1 && newSpeed >= 66 && newSpeed < 99 ? 'on' : 'off'
       params.switches[3].switch = newPower === 1 && newSpeed >= 99 ? 'on' : 'off'
 
-      lightService.updateCharacteristic(Characteristic.On, newLight)
+      lightService.updateCharacteristic(this.Characteristic.On, newLight)
       fanService
-        .updateCharacteristic(Characteristic.Active, newPower)
-        .updateCharacteristic(Characteristic.RotationSpeed, newSpeed)
-      await this.platform.sendDeviceUpdate(accessory, params)
+        .updateCharacteristic(this.Characteristic.Active, newPower)
+        .updateCharacteristic(this.Characteristic.RotationSpeed, newSpeed)
+      await this.platform.sendDeviceUpdate(this.accessory, params)
     } catch (err) {
-      this.platform.deviceUpdateError(accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true)
     }
   }
 
-  async externalUpdate (accessory, params) {
+  async externalUpdate (params) {
     try {
       if (params.switches && Array.isArray(params.switches)) {
-        const lightService = accessory.getService(Service.Lightbulb)
-        const fanService = accessory.getService(Service.Fanv2)
+        const lightService = this.accessory.getService(this.Service.Lightbulb)
+        const fanService = this.accessory.getService(this.Service.Fanv2)
         const light = params.switches[0].switch === 'on'
         let status
         let speed
@@ -91,13 +91,13 @@ module.exports = class deviceFan {
             status = 1
             speed = 99
         }
-        lightService.updateCharacteristic(Characteristic.On, light)
+        lightService.updateCharacteristic(this.Characteristic.On, light)
         fanService
-          .updateCharacteristic(Characteristic.Active, status)
-          .updateCharacteristic(Characteristic.RotationSpeed, speed)
+          .updateCharacteristic(this.Characteristic.Active, status)
+          .updateCharacteristic(this.Characteristic.RotationSpeed, speed)
       }
     } catch (err) {
-      this.platform.deviceUpdateError(accessory, err, false)
+      this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
 }
diff --git a/lib/device/garage-eachen.js b/lib/device/garage-eachen.js
index 0f58b636..3dc5fa7d 100644
--- a/lib/device/garage-eachen.js
+++ b/lib/device/garage-eachen.js
@@ -1,78 +1,76 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
-let Characteristic, Service
 const helpers = require('./../helpers')
 module.exports = class deviceGarageEachen {
   constructor (platform, accessory) {
     this.platform = platform
-    Service = platform.api.hap.Service
-    Characteristic = platform.api.hap.Characteristic
+    this.accessory = accessory
+    this.Service = platform.api.hap.Service
+    this.Characteristic = platform.api.hap.Characteristic
     let gdeService
-    if (!(gdeService = accessory.getService(Service.GarageDoorOpener))) {
+    if (!(gdeService = accessory.getService(this.Service.GarageDoorOpener))) {
       accessory
-        .addService(Service.GarageDoorOpener)
-        .setCharacteristic(Characteristic.CurrentDoorState, 1)
-        .setCharacteristic(Characteristic.TargetDoorState, 1)
-        .setCharacteristic(Characteristic.ObstructionDetected, false)
-      gdeService = accessory.getService(Service.GarageDoorOpener)
+        .addService(this.Service.GarageDoorOpener)
+        .setCharacteristic(this.Characteristic.CurrentDoorState, 1)
+        .setCharacteristic(this.Characteristic.TargetDoorState, 1)
+        .setCharacteristic(this.Characteristic.ObstructionDetected, false)
+      gdeService = accessory.getService(this.Service.GarageDoorOpener)
     }
     gdeService
-      .getCharacteristic(Characteristic.TargetDoorState)
-      .on('set', (value, callback) => this.internalUpdate(accessory, value, callback))
+      .getCharacteristic(this.Characteristic.TargetDoorState)
+      .on('set', (value, callback) => this.internalUpdate(value, callback))
   }
 
-  async internalUpdate (accessory, value, callback) {
+  async internalUpdate (value, callback) {
     callback()
     try {
       let garageConfig
-      if (!(garageConfig = this.platform.cusG.get(accessory.context.hbDeviceId))) {
+      if (!(garageConfig = this.platform.cusG.get(this.accessory.context.hbDeviceId))) {
         throw new Error('group config missing')
       }
       if (garageConfig.type !== 'garage_eachen') {
         throw new Error('improper configuration')
       }
       const params = { switch: value === 0 ? 'on' : 'off' }
-      const gdService = accessory.getService(Service.GarageDoorOpener)
-      if (value === gdService.getCharacteristic(Characteristic.CurrentDoorState).value % 2) return
-      accessory.context.inUse = true
-      await this.platform.sendDeviceUpdate(accessory, params)
+      const gdService = this.accessory.getService(this.Service.GarageDoorOpener)
+      if (value === gdService.getCharacteristic(this.Characteristic.CurrentDoorState).value % 2) return
+      this.accessory.context.inUse = true
+      await this.platform.sendDeviceUpdate(this.accessory, params)
       gdService
-        .updateCharacteristic(Characteristic.TargetDoorState, value)
-        .updateCharacteristic(Characteristic.CurrentDoorState, value + 2)
+        .updateCharacteristic(this.Characteristic.TargetDoorState, value)
+        .updateCharacteristic(this.Characteristic.CurrentDoorState, value + 2)
       await helpers.sleep(2000)
-      accessory.context.inUse = false
+      this.accessory.context.inUse = false
       if (value === 0) {
         await helpers.sleep(Math.max((garageConfig.operationTime - 20) * 100, 0))
-        gdService.updateCharacteristic(Characteristic.CurrentDoorState, 0)
+        gdService.updateCharacteristic(this.Characteristic.CurrentDoorState, 0)
       }
     } catch (err) {
-      accessory.context.inUse = false
-      this.platform.deviceUpdateError(accessory, err, true)
+      this.accessory.context.inUse = false
+      this.platform.deviceUpdateError(this.accessory, err, true)
     }
   }
 
-  async externalUpdate (accessory, params) {
+  async externalUpdate (params) {
     try {
-      if (!helpers.hasProperty(params, 'switch') || accessory.context.inUse) {
-        return
-      }
+      if (!helpers.hasProperty(params, 'switch') || this.accessory.context.inUse) return
       let garageConfig
-      if (!(garageConfig = this.platform.cusG.get(accessory.context.hbDeviceId))) {
+      if (!(garageConfig = this.platform.cusG.get(this.accessory.context.hbDeviceId))) {
         throw new Error('group config missing')
       }
       if (garageConfig.type !== 'garage_eachen') {
         throw new Error('improper configuration')
       }
-      accessory.context.inUse = true
-      const gdService = accessory.getService(Service.GarageDoorOpener)
+      this.accessory.context.inUse = true
+      const gdService = this.accessory.getService(this.Service.GarageDoorOpener)
       gdService
-        .updateCharacteristic(Characteristic.TargetDoorState, params.switch === 'on' ? 0 : 1)
-        .updateCharacteristic(Characteristic.CurrentDoorState, params.switch === 'on' ? 0 : 1)
-      accessory.context.inUse = false
+        .updateCharacteristic(this.Characteristic.TargetDoorState, params.switch === 'on' ? 0 : 1)
+        .updateCharacteristic(this.Characteristic.CurrentDoorState, params.switch === 'on' ? 0 : 1)
+      this.accessory.context.inUse = false
     } catch (err) {
-      accessory.context.inUse = false
-      this.platform.deviceUpdateError(accessory, err, false)
+      this.accessory.context.inUse = false
+      this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
 }
diff --git a/lib/device/garage-two.js b/lib/device/garage-two.js
index 36b18405..6e456abe 100644
--- a/lib/device/garage-two.js
+++ b/lib/device/garage-two.js
@@ -1,34 +1,34 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
-let Characteristic, Service
 const helpers = require('./../helpers')
 module.exports = class deviceGarageTwo {
   constructor (platform, accessory) {
     this.platform = platform
-    Service = platform.api.hap.Service
-    Characteristic = platform.api.hap.Characteristic
+    this.accessory = accessory
+    this.Service = platform.api.hap.Service
+    this.Characteristic = platform.api.hap.Characteristic
     ;['1', '2'].forEach(v => {
       let gdService
       if (!(gdService = accessory.getService('Garage ' + v))) {
         accessory
-          .addService(Service.GarageDoorOpener, 'Garage ' + v, 'garage' + v)
-          .setCharacteristic(Characteristic.CurrentDoorState, 1)
-          .setCharacteristic(Characteristic.TargetDoorState, 1)
-          .setCharacteristic(Characteristic.ObstructionDetected, false)
+          .addService(this.Service.GarageDoorOpener, 'Garage ' + v, 'garage' + v)
+          .setCharacteristic(this.Characteristic.CurrentDoorState, 1)
+          .setCharacteristic(this.Characteristic.TargetDoorState, 1)
+          .setCharacteristic(this.Characteristic.ObstructionDetected, false)
         gdService = accessory.getService('Garage ' + v)
       }
       gdService
-        .getCharacteristic(Characteristic.TargetDoorState)
-        .on('set', (value, callback) => this.internalUpdate(accessory, 'Garage' + v, value, callback))
+        .getCharacteristic(this.Characteristic.TargetDoorState)
+        .on('set', (value, callback) => this.internalUpdate('Garage' + v, value, callback))
     })
   }
 
-  async internalUpdate (accessory, garage, value, callback) {
+  async internalUpdate (garage, value, callback) {
     callback()
     try {
       let garageConfig
-      if (!(garageConfig = this.platform.cusG.get(accessory.context.hbDeviceId))) {
+      if (!(garageConfig = this.platform.cusG.get(this.accessory.context.hbDeviceId))) {
         throw new Error('group config missing')
       }
       if (garageConfig.type !== 'garage_two') {
@@ -50,8 +50,8 @@ module.exports = class deviceGarageTwo {
       }
       let sAccessory = false
       const newPos = value
-      const params = {}
-      const gdService = accessory.getService(garage)
+      const params = { switches: this.accessory.context.switchState }
+      const gdService = this.accessory.getService(garage)
       if (sensorDefinition && !(sAccessory = this.platform.devicesInHB.get(garageConfig.sensorId + 'SWX'))) {
         throw new Error("defined DW2 sensor doesn't exist")
       }
@@ -59,77 +59,73 @@ module.exports = class deviceGarageTwo {
         throw new Error("defined DW2 sensor isn't a sensor")
       }
       const prevState = sAccessory
-        ? sAccessory.getService(Service.ContactSensor).getCharacteristic(Characteristic.ContactSensorState).value === 0
+        ? sAccessory.getService(this.Service.ContactSensor).getCharacteristic(this.Characteristic.ContactSensorState).value === 0
           ? 1
           : 0
         : garage === 'Garage 1'
-          ? accessory.context.cacheOneCurrentDoorState
-          : accessory.context.cacheTwoCurrentDoorState
+          ? this.accessory.context.cacheOneCurrentDoorState
+          : this.accessory.context.cacheTwoCurrentDoorState
       if (newPos === prevState % 2) return
-      accessory.context.inUse = true
+      this.accessory.context.inUse = true
       gdService
-        .updateCharacteristic(Characteristic.TargetDoorState, newPos)
-        .updateCharacteristic(Characteristic.CurrentDoorState, newPos + 2)
-      params.switches = accessory.context.switchState
+        .updateCharacteristic(this.Characteristic.TargetDoorState, newPos)
+        .updateCharacteristic(this.Characteristic.CurrentDoorState, newPos + 2)
       switch (garage) {
         case 'Garage 1': {
-          accessory.context.cacheOneTargetDoorState = newPos
-          accessory.context.cacheOneCurrentDoorState = newPos + 2
+          this.accessory.context.cacheOneTargetDoorState = newPos
+          this.accessory.context.cacheOneCurrentDoorState = newPos + 2
           params.switches[0].switch = newPos === 0 ? 'on' : 'off'
           params.switches[1].switch = newPos === 1 ? 'on' : 'off'
           break
         }
         case 'Garage 2': {
-          accessory.context.cacheTwoTargetDoorState = newPos
-          accessory.context.cacheTwoCurrentDoorState = newPos + 2
+          this.accessory.context.cacheTwoTargetDoorState = newPos
+          this.accessory.context.cacheTwoCurrentDoorState = newPos + 2
           params.switches[2].switch = newPos === 0 ? 'on' : 'off'
           params.switches[3].switch = newPos === 1 ? 'on' : 'off'
           break
         }
       }
-      await this.platform.sendDeviceUpdate(accessory, params)
+      await this.platform.sendDeviceUpdate(this.accessory, params)
       await helpers.sleep(Math.max(garageConfig.operationTime * 100, 1000))
       if (!sAccessory) {
-        gdService.updateCharacteristic(Characteristic.CurrentDoorState, newPos)
+        gdService.updateCharacteristic(this.Characteristic.CurrentDoorState, newPos)
         switch (garage) {
           case 'Garage 1': {
-            accessory.context.cacheOneCurrentDoorState = newPos
+            this.accessory.context.cacheOneCurrentDoorState = newPos
             break
           }
           case 'Garage 2': {
-            accessory.context.cacheTwoCurrentDoorState = newPos
+            this.accessory.context.cacheTwoCurrentDoorState = newPos
             break
           }
         }
       }
-      accessory.context.inUse = false
+      this.accessory.context.inUse = false
     } catch (err) {
-      this.platform.deviceUpdateError(accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true)
     }
   }
 
-  externalUpdate (accessory, params) {
+  externalUpdate (params) {
     try {
       if (!helpers.hasProperty(params, 'switches')) {
         return
       }
       let garageConfig
-      if (!(garageConfig = this.platform.cusG.get(accessory.context.hbDeviceId))) {
+      if (!(garageConfig = this.platform.cusG.get(this.accessory.context.hbDeviceId))) {
         throw new Error('group config missing')
       }
       if (garageConfig.type !== 'garage_two') {
         throw new Error('improper configuration')
       }
-      if (accessory.context.inUse || garageConfig.sensorId) {
-        return
-      }
-      accessory.context.switchState = params.switches
-      this.platform.log.warn(accessory.context.switchState)
+      if (this.accessory.context.inUse || garageConfig.sensorId) return
+      this.accessory.context.switchState = params.switches
       ;['1', '2'].forEach(async v => {
-        const gcService = accessory.getService('Garage ' + v)
+        const gcService = this.accessory.getService('Garage ' + v)
         const prevState = v === '1'
-          ? accessory.context.cacheOneCurrentDoorState
-          : accessory.context.cacheTwoCurrentDoorState
+          ? this.accessory.context.cacheOneCurrentDoorState
+          : this.accessory.context.cacheTwoCurrentDoorState
         const newPos = [0, 2].includes(prevState) ? 3 : 2
         switch (v) {
           case '1':
@@ -149,38 +145,38 @@ module.exports = class deviceGarageTwo {
             }
             break
         }
-        accessory.context.inUse = true
+        this.accessory.context.inUse = true
         if (garageConfig.sensorId) {
           await helpers.sleep(Math.max(garageConfig.operationTime * 100, 1000))
         } else {
           gcService
-            .updateCharacteristic(Characteristic.TargetDoorState, newPos - 2)
-            .updateCharacteristic(Characteristic.CurrentDoorState, newPos)
+            .updateCharacteristic(this.Characteristic.TargetDoorState, newPos - 2)
+            .updateCharacteristic(this.Characteristic.CurrentDoorState, newPos)
           switch (v) {
             case '1':
-              accessory.context.cacheOneCurrentDoorState = newPos
-              accessory.context.cacheTwoTargetDoorState = newPos - 2
+              this.accessory.context.cacheOneCurrentDoorState = newPos
+              this.accessory.context.cacheTwoTargetDoorState = newPos - 2
               break
             case '2':
-              accessory.context.cacheTwoCurrentDoorState = newPos
-              accessory.context.cacheTwoTargetDoorState = newPos - 2
+              this.accessory.context.cacheTwoCurrentDoorState = newPos
+              this.accessory.context.cacheTwoTargetDoorState = newPos - 2
               break
           }
           await helpers.sleep(Math.max(garageConfig.operationTime * 100, 1000))
-          gcService.updateCharacteristic(Characteristic.CurrentDoorState, newPos - 2)
+          gcService.updateCharacteristic(this.Characteristic.CurrentDoorState, newPos - 2)
           switch (v) {
             case '1':
-              accessory.context.cacheOneCurrentDoorState = newPos - 2
+              this.accessory.context.cacheOneCurrentDoorState = newPos - 2
               break
             case '2':
-              accessory.context.cacheTwoCurrentDoorState = newPos - 2
+              this.accessory.context.cacheTwoCurrentDoorState = newPos - 2
               break
           }
         }
       })
-      accessory.context.inUse = false
+      this.accessory.context.inUse = false
     } catch (err) {
-      this.platform.deviceUpdateError(accessory, err, false)
+      this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
 }
diff --git a/lib/device/garage.js b/lib/device/garage.js
index 39eab6f3..ad5f3945 100644
--- a/lib/device/garage.js
+++ b/lib/device/garage.js
@@ -1,32 +1,32 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
-let Characteristic, Service
 const helpers = require('./../helpers')
 module.exports = class deviceGarage {
   constructor (platform, accessory) {
     this.platform = platform
-    Service = platform.api.hap.Service
-    Characteristic = platform.api.hap.Characteristic
+    this.accessory = accessory
+    this.Service = platform.api.hap.Service
+    this.Characteristic = platform.api.hap.Characteristic
     let gdService
-    if (!(gdService = accessory.getService(Service.GarageDoorOpener))) {
+    if (!(gdService = accessory.getService(this.Service.GarageDoorOpener))) {
       accessory
-        .addService(Service.GarageDoorOpener)
-        .setCharacteristic(Characteristic.CurrentDoorState, 1)
-        .setCharacteristic(Characteristic.TargetDoorState, 1)
-        .setCharacteristic(Characteristic.ObstructionDetected, false)
-      gdService = accessory.getService(Service.GarageDoorOpener)
+        .addService(this.Service.GarageDoorOpener)
+        .setCharacteristic(this.Characteristic.CurrentDoorState, 1)
+        .setCharacteristic(this.Characteristic.TargetDoorState, 1)
+        .setCharacteristic(this.Characteristic.ObstructionDetected, false)
+      gdService = accessory.getService(this.Service.GarageDoorOpener)
     }
     gdService
-      .getCharacteristic(Characteristic.TargetDoorState)
-      .on('set', (value, callback) => this.internalUpdate(accessory, value, callback))
+      .getCharacteristic(this.Characteristic.TargetDoorState)
+      .on('set', (value, callback) => this.internalUpdate(value, callback))
   }
 
-  async internalUpdate (accessory, value, callback) {
+  async internalUpdate (value, callback) {
     callback()
     try {
       let garageConfig
-      if (!(garageConfig = this.platform.cusG.get(accessory.context.hbDeviceId))) {
+      if (!(garageConfig = this.platform.cusG.get(this.accessory.context.hbDeviceId))) {
         throw new Error('group config missing')
       }
       if (garageConfig.type !== 'garage' || !['oneSwitch', 'twoSwitch'].includes(garageConfig.setup)) {
@@ -37,7 +37,7 @@ module.exports = class deviceGarage {
       const newPos = value
       const params = {}
       let delay = 0
-      const gdService = accessory.getService(Service.GarageDoorOpener)
+      const gdService = this.accessory.getService(this.Service.GarageDoorOpener)
       if (sensorDefinition && !(sAccessory = this.platform.devicesInHB.get(garageConfig.sensorId + 'SWX'))) {
         throw new Error("defined DW2 sensor doesn't exist")
       }
@@ -45,65 +45,63 @@ module.exports = class deviceGarage {
         throw new Error("defined DW2 sensor isn't a sensor")
       }
       const prevState = sAccessory
-        ? sAccessory.getService(Service.ContactSensor).getCharacteristic(Characteristic.ContactSensorState).value === 0
+        ? sAccessory.getService(this.Service.ContactSensor).getCharacteristic(this.Characteristic.ContactSensorState).value === 0
           ? 1
           : 0
-        : accessory.context.cacheCurrentDoorState
+        : this.accessory.context.cacheCurrentDoorState
       if (newPos === prevState % 2) return
-      accessory.context.inUse = true
-      accessory.context.state = value
+      this.accessory.context.inUse = true
+      this.accessory.context.state = value
       if (garageConfig.setup === 'oneSwitch' && [2, 3].includes(prevState)) {
-        gdService.updateCharacteristic(Characteristic.CurrentDoorState, ((prevState * 2) % 3) + 2)
-        accessory.context.cacheCurrentDoorState = ((prevState * 2) % 3) + 2
+        gdService.updateCharacteristic(this.Characteristic.CurrentDoorState, ((prevState * 2) % 3) + 2)
+        this.accessory.context.cacheCurrentDoorState = ((prevState * 2) % 3) + 2
         delay = 1500
       }
-      if (accessory.context.state !== newPos) return
+      if (this.accessory.context.state !== newPos) return
       await helpers.sleep(delay)
       gdService
-        .updateCharacteristic(Characteristic.TargetDoorState, newPos)
-        .updateCharacteristic(Characteristic.CurrentDoorState, newPos + 2)
-      accessory.context.cacheTargetDoorState = newPos
-      accessory.context.cacheCurrentDoorState = newPos + 2
+        .updateCharacteristic(this.Characteristic.TargetDoorState, newPos)
+        .updateCharacteristic(this.Characteristic.CurrentDoorState, newPos + 2)
+      this.accessory.context.cacheTargetDoorState = newPos
+      this.accessory.context.cacheCurrentDoorState = newPos + 2
       switch (garageConfig.setup) {
         case 'oneSwitch':
           params.switch = 'on'
           break
         case 'twoSwitch':
-          params.switches = this.platform.devicesInEW.get(accessory.context.eweDeviceId).params.switches
+          params.switches = helpers.defaultMultiSwitchOff
           params.switches[0].switch = newPos === 0 ? 'on' : 'off'
           params.switches[1].switch = newPos === 1 ? 'on' : 'off'
           break
       }
-      await this.platform.sendDeviceUpdate(accessory, params)
+      await this.platform.sendDeviceUpdate(this.accessory, params)
       await helpers.sleep(Math.max(garageConfig.operationTime * 100, 1000))
       if (!sAccessory) {
-        gdService.updateCharacteristic(Characteristic.CurrentDoorState, newPos)
-        accessory.context.cacheCurrentDoorState = newPos
+        gdService.updateCharacteristic(this.Characteristic.CurrentDoorState, newPos)
+        this.accessory.context.cacheCurrentDoorState = newPos
       }
-      accessory.context.inUse = false
+      this.accessory.context.inUse = false
     } catch (err) {
-      this.platform.deviceUpdateError(accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true)
     }
   }
 
-  async externalUpdate (accessory, params) {
+  async externalUpdate (params) {
     try {
       if (!helpers.hasProperty(params, 'switch') && !helpers.hasProperty(params, 'switches')) {
         return
       }
       let garageConfig
-      const gcService = accessory.getService(Service.GarageDoorOpener)
-      const prevState = accessory.context.cacheCurrentDoorState
+      const gcService = this.accessory.getService(this.Service.GarageDoorOpener)
+      const prevState = this.accessory.context.cacheCurrentDoorState
       const newPos = [0, 2].includes(prevState) ? 3 : 2
-      if (!(garageConfig = this.platform.cusG.get(accessory.context.hbDeviceId))) {
+      if (!(garageConfig = this.platform.cusG.get(this.accessory.context.hbDeviceId))) {
         throw new Error('group config missing')
       }
       if (garageConfig.type !== 'garage' || !['oneSwitch', 'twoSwitch'].includes(garageConfig.setup)) {
         throw new Error('improper configuration')
       }
-      if (accessory.context.inUse || garageConfig.sensorId) {
-        return
-      }
+      if (this.accessory.context.inUse || garageConfig.sensorId) return
       switch (garageConfig.setup) {
         case 'oneSwitch':
           if (params.switch === 'off') {
@@ -119,23 +117,23 @@ module.exports = class deviceGarage {
           }
           break
       }
-      accessory.context.inUse = true
+      this.accessory.context.inUse = true
       if (garageConfig.sensorId) {
         await helpers.sleep(Math.max(garageConfig.operationTime * 100, 1000))
       } else {
         gcService
-          .updateCharacteristic(Characteristic.TargetDoorState, newPos - 2)
-          .updateCharacteristic(Characteristic.CurrentDoorState, newPos)
-        accessory.context.cacheCurrentDoorState = newPos
-        accessory.context.cacheTargetDoorState = newPos - 2
+          .updateCharacteristic(this.Characteristic.TargetDoorState, newPos - 2)
+          .updateCharacteristic(this.Characteristic.CurrentDoorState, newPos)
+        this.accessory.context.cacheCurrentDoorState = newPos
+        this.accessory.context.cacheTargetDoorState = newPos - 2
         await helpers.sleep(Math.max(garageConfig.operationTime * 100, 1000))
-        gcService.updateCharacteristic(Characteristic.CurrentDoorState, newPos - 2)
-        accessory.context.cacheCurrentDoorState = newPos - 2
+        gcService.updateCharacteristic(this.Characteristic.CurrentDoorState, newPos - 2)
+        this.accessory.context.cacheCurrentDoorState = newPos - 2
       }
-      accessory.context.inUse = false
+      this.accessory.context.inUse = false
     } catch (err) {
-      accessory.context.inUse = false
-      this.platform.deviceUpdateError(accessory, err, false)
+      this.accessory.context.inUse = false
+      this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
 }
diff --git a/lib/device/lock.js b/lib/device/lock.js
index 614c4e68..8114e730 100644
--- a/lib/device/lock.js
+++ b/lib/device/lock.js
@@ -1,74 +1,72 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
-let Characteristic, Service
 const helpers = require('./../helpers')
 module.exports = class deviceLock {
   constructor (platform, accessory) {
     this.platform = platform
-    Service = platform.api.hap.Service
-    Characteristic = platform.api.hap.Characteristic
-    const lmService = accessory.getService(Service.LockMechanism) || accessory.addService(Service.LockMechanism)
+    this.accessory = accessory
+    this.Service = platform.api.hap.Service
+    this.Characteristic = platform.api.hap.Characteristic
+    const lmService = accessory.getService(this.Service.LockMechanism) || accessory.addService(this.Service.LockMechanism)
     lmService
-      .getCharacteristic(Characteristic.LockTargetState)
-      .on('set', (value, callback) => this.internalUpdate(accessory, value, callback))
+      .getCharacteristic(this.Characteristic.LockTargetState)
+      .on('set', (value, callback) => this.internalUpdate(value, callback))
   }
 
-  async internalUpdate (accessory, value, callback) {
+  async internalUpdate (value, callback) {
     callback()
     try {
       let lockConfig
-      const params = {
-        switch: 'on'
-      }
-      const lmService = accessory.getService(Service.LockMechanism)
-      if (!(lockConfig = this.platform.cusG.get(accessory.context.hbDeviceId))) {
+      const params = { switch: 'on' }
+      const lmService = this.accessory.getService(this.Service.LockMechanism)
+      if (!(lockConfig = this.platform.cusG.get(this.accessory.context.hbDeviceId))) {
         throw new Error('group config missing')
       }
       if (lockConfig.type !== 'lock') {
         throw new Error('improper configuration')
       }
-      accessory.context.inUse = true
-      await this.platform.sendDeviceUpdate(accessory, params)
+      this.accessory.context.inUse = true
+      await this.platform.sendDeviceUpdate(this.accessory, params)
       lmService
-        .updateCharacteristic(Characteristic.LockTargetState, 0)
-        .updateCharacteristic(Characteristic.LockCurrentState, 0)
+        .updateCharacteristic(this.Characteristic.LockTargetState, 0)
+        .updateCharacteristic(this.Characteristic.LockCurrentState, 0)
       await helpers.sleep(Math.max(lockConfig.operationTime * 100, 1000))
       lmService
-        .updateCharacteristic(Characteristic.LockTargetState, 1)
-        .updateCharacteristic(Characteristic.LockCurrentState, 1)
-      accessory.context.inUse = false
+        .updateCharacteristic(this.Characteristic.LockTargetState, 1)
+        .updateCharacteristic(this.Characteristic.LockCurrentState, 1)
+      this.accessory.context.inUse = false
     } catch (err) {
-      this.platform.deviceUpdateError(accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true)
     }
   }
 
-  async externalUpdate (accessory, params) {
+  async externalUpdate (params) {
     try {
       if (!helpers.hasProperty(params, 'switch')) return
       let lockConfig
-      const lmService = accessory.getService(Service.LockMechanism)
-      if (!(lockConfig = this.platform.cusG.get(accessory.context.hbDeviceId))) {
+      const lmService = this.accessory.getService(this.Service.LockMechanism)
+      if (!(lockConfig = this.platform.cusG.get(this.accessory.context.hbDeviceId))) {
         throw new Error('group config missing')
       }
       if (lockConfig.type !== 'lock') {
         throw new Error('improper configuration')
       }
-      if (params.switch === 'off' || accessory.context.inUse) {
+      if (params.switch === 'off' || this.accessory.context.inUse) {
         return
       }
-      accessory.context.inUse = true
+      this.accessory.context.inUse = true
       lmService
-        .updateCharacteristic(Characteristic.LockCurrentState, 0)
-        .updateCharacteristic(Characteristic.LockTargetState, 0)
+        .updateCharacteristic(this.Characteristic.LockCurrentState, 0)
+        .updateCharacteristic(this.Characteristic.LockTargetState, 0)
       await helpers.sleep(Math.max(lockConfig.operationTime * 100, 1000))
       lmService
-        .updateCharacteristic(Characteristic.LockCurrentState, 1)
-        .updateCharacteristic(Characteristic.LockTargetState, 1)
-      accessory.context.inUse = false
+        .updateCharacteristic(this.Characteristic.LockCurrentState, 1)
+        .updateCharacteristic(this.Characteristic.LockTargetState, 1)
+      this.accessory.context.inUse = false
     } catch (err) {
-      accessory.context.inUse = false
-      this.platform.deviceUpdateError(accessory, err, false)
+      this.accessory.context.inUse = false
+      this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
 }
diff --git a/lib/device/rf-bridge.js b/lib/device/rf-bridge.js
index 559e3a75..fe821fbb 100644
--- a/lib/device/rf-bridge.js
+++ b/lib/device/rf-bridge.js
@@ -1,48 +1,48 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
-let Characteristic, Service
 const helpers = require('./../helpers')
 module.exports = class deviceRFBridge {
   constructor (platform, accessory) {
     this.platform = platform
-    Service = platform.api.hap.Service
-    Characteristic = platform.api.hap.Characteristic
+    this.accessory = accessory
+    this.Service = platform.api.hap.Service
+    this.Characteristic = platform.api.hap.Characteristic
     switch (accessory.context.subType) {
       case 'water':
-        if (!accessory.getService(Service.LeakSensor)) accessory.addService(Service.LeakSensor)
+        if (!accessory.getService(this.Service.LeakSensor)) accessory.addService(this.Service.LeakSensor)
         break
       case 'fire':
       case 'smoke':
-        if (!accessory.getService(Service.SmokeSensor)) accessory.addService(Service.SmokeSensor)
+        if (!accessory.getService(this.Service.SmokeSensor)) accessory.addService(this.Service.SmokeSensor)
         break
       case 'co':
-        if (!accessory.getService(Service.CarbonMonoxideSensor)) accessory.addService(Service.CarbonMonoxideSensor)
+        if (!accessory.getService(this.Service.CarbonMonoxideSensor)) accessory.addService(this.Service.CarbonMonoxideSensor)
         break
       case 'co2':
-        if (!accessory.getService(Service.CarbonDioxideSensor)) accessory.addService(Service.CarbonDioxideSensor)
+        if (!accessory.getService(this.Service.CarbonDioxideSensor)) accessory.addService(this.Service.CarbonDioxideSensor)
         break
       case 'contact':
-        if (!accessory.getService(Service.ContactSensor)) accessory.addService(Service.ContactSensor)
+        if (!accessory.getService(this.Service.ContactSensor)) accessory.addService(this.Service.ContactSensor)
         break
       case 'occupancy':
-        if (!accessory.getService(Service.OccupancySensor)) accessory.addService(Service.OccupancySensor)
+        if (!accessory.getService(this.Service.OccupancySensor)) accessory.addService(this.Service.OccupancySensor)
         break
       default:
-        if (!accessory.getService(Service.MotionSensor)) accessory.addService(Service.MotionSensor)
+        if (!accessory.getService(this.Service.MotionSensor)) accessory.addService(this.Service.MotionSensor)
         break
       case 'button':
         Object.entries(accessory.context.buttons).forEach(([chan, name]) => {
-          if (!accessory.getService(name)) accessory.addService(Service.Switch, name, 'switch' + chan)
-          accessory.getService(name).updateCharacteristic(Characteristic.On, false)
-          accessory.getService(name).getCharacteristic(Characteristic.On)
-            .on('set', (value, callback) => this.internalUpdate(accessory, chan, name, value, callback))
+          if (!accessory.getService(name)) accessory.addService(this.Service.Switch, name, 'switch' + chan)
+          accessory.getService(name).updateCharacteristic(this.Characteristic.On, false)
+          accessory.getService(name).getCharacteristic(this.Characteristic.On)
+            .on('set', (value, callback) => this.internalUpdate(chan, name, value, callback))
         })
         break
     }
   }
 
-  async internalUpdate (accessory, rfChl, service, value, callback) {
+  async internalUpdate (rfChl, service, value, callback) {
     callback()
     try {
       if (!value) return
@@ -50,17 +50,17 @@ module.exports = class deviceRFBridge {
         cmd: 'transmit',
         rfChl: parseInt(rfChl)
       }
-      const rfService = accessory.getService(service)
-      rfService.updateCharacteristic(Characteristic.On, true)
+      const rfService = this.accessory.getService(service)
+      rfService.updateCharacteristic(this.Characteristic.On, true)
       await helpers.sleep(1000)
-      rfService.updateCharacteristic(Characteristic.On, false)
-      await this.platform.sendDeviceUpdate(accessory, params)
+      rfService.updateCharacteristic(this.Characteristic.On, false)
+      await this.platform.sendDeviceUpdate(this.accessory, params)
     } catch (err) {
-      this.platform.deviceUpdateError(accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true)
     }
   }
 
-  async externalUpdate (accessory, params) {
+  async externalUpdate (params) {
     try {
       if (!helpers.hasProperty(params, 'updateSource')) return
       const timeNow = new Date()
@@ -68,7 +68,7 @@ module.exports = class deviceRFBridge {
       if (helpers.hasProperty(params, 'cmd') && params.cmd === 'transmit' && helpers.hasProperty(params, 'rfChl')) {
         this.platform.devicesInHB.forEach(acc => {
           if (
-            acc.context.eweDeviceId === accessory.context.eweDeviceId &&
+            acc.context.eweDeviceId === this.accessory.context.eweDeviceId &&
             helpers.hasProperty(acc.context, 'buttons') &&
             helpers.hasProperty(acc.context.buttons, params.rfChl.toString())
           ) {
@@ -76,14 +76,9 @@ module.exports = class deviceRFBridge {
           }
         })
         if (oAccessory) {
-          oAccessory.getService(oAccessory.context.buttons[params.rfChl]).updateCharacteristic(Characteristic.On, 1)
-          setTimeout(
-            () =>
-              oAccessory
-                .getService(oAccessory.context.buttons[params.rfChl])
-                .updateCharacteristic(Characteristic.On, 0),
-            3000
-          )
+          oAccessory.getService(oAccessory.context.buttons[params.rfChl]).updateCharacteristic(this.Characteristic.On, 1)
+          helpers.sleep(3000)
+          oAccessory.getService(oAccessory.context.buttons[params.rfChl]).updateCharacteristic(this.Characteristic.On, 0)
         } else {
           throw new Error('rf button not found in Homebridge')
         }
@@ -94,7 +89,7 @@ module.exports = class deviceRFBridge {
           .forEach(async chan => {
             this.platform.devicesInHB.forEach(acc => {
               if (
-                acc.context.eweDeviceId === accessory.context.eweDeviceId &&
+                acc.context.eweDeviceId === this.accessory.context.eweDeviceId &&
                 helpers.hasProperty(acc.context, 'buttons') &&
                 helpers.hasProperty(acc.context.buttons, chan.substr(-1).toString())
               ) {
@@ -111,33 +106,33 @@ module.exports = class deviceRFBridge {
                   case 'button':
                     return
                   case 'water':
-                    serv = Service.LeakSensor
-                    char = Characteristic.LeakDetected
+                    serv = this.Service.LeakSensor
+                    char = this.Characteristic.LeakDetected
                     break
                   case 'fire':
                   case 'smoke':
-                    serv = Service.SmokeSensor
-                    char = Characteristic.LeakDetected
+                    serv = this.Service.SmokeSensor
+                    char = this.Characteristic.LeakDetected
                     break
                   case 'co':
-                    serv = Service.CarbonMonoxideSensor
-                    char = Characteristic.CarbonMonoxideDetected
+                    serv = this.Service.CarbonMonoxideSensor
+                    char = this.Characteristic.CarbonMonoxideDetected
                     break
                   case 'co2':
-                    serv = Service.CarbonDioxideSensor
-                    char = Characteristic.CarbonDioxideDetected
+                    serv = this.Service.CarbonDioxideSensor
+                    char = this.Characteristic.CarbonDioxideDetected
                     break
                   case 'contact':
-                    serv = Service.ContactSensor
-                    char = Characteristic.ContactSensorState
+                    serv = this.Service.ContactSensor
+                    char = this.Characteristic.ContactSensorState
                     break
                   case 'occupancy':
-                    serv = Service.OccupancySensor
-                    char = Characteristic.OccupancyDetected
+                    serv = this.Service.OccupancySensor
+                    char = this.Characteristic.OccupancyDetected
                     break
                   default:
-                    serv = Service.MotionSensor
-                    char = Characteristic.MotionDetected
+                    serv = this.Service.MotionSensor
+                    char = this.Characteristic.MotionDetected
                     break
                 }
                 oAccessory.getService(serv).updateCharacteristic(char, 1)
@@ -148,7 +143,7 @@ module.exports = class deviceRFBridge {
           })
       }
     } catch (err) {
-      this.platform.deviceUpdateError(accessory, err, false)
+      this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
 }
diff --git a/lib/device/scm.js b/lib/device/scm.js
index b49d5915..9c7d809d 100644
--- a/lib/device/scm.js
+++ b/lib/device/scm.js
@@ -1,40 +1,38 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
-let Characteristic, Service
 const helpers = require('./../helpers')
 module.exports = class deviceSCM {
   constructor (platform, accessory) {
     this.platform = platform
-    Service = platform.api.hap.Service
-    Characteristic = platform.api.hap.Characteristic
-    const scmService = accessory.getService(Service.Switch) || accessory.addService(Service.Switch)
+    this.accessory = accessory
+    this.Service = platform.api.hap.Service
+    this.Characteristic = platform.api.hap.Characteristic
+    const scmService = accessory.getService(this.Service.Switch) || accessory.addService(this.Service.Switch)
     scmService
-      .getCharacteristic(Characteristic.On)
-      .on('set', (value, callback) => this.internalUpdate(accessory, value, callback))
+      .getCharacteristic(this.Characteristic.On)
+      .on('set', (value, callback) => this.internalUpdate(value, callback))
   }
 
-  async internalUpdate (accessory, value, callback) {
+  async internalUpdate (value, callback) {
     callback()
     try {
-      const params = {
-        switches: helpers.defaultMultiSwitchOff
-      }
-      const switchService = accessory.getService(Service.Switch)
+      const params = { switches: helpers.defaultMultiSwitchOff }
+      const switchService = this.accessory.getService(this.Service.Switch)
       params.switches[0].switch = value ? 'on' : 'off'
-      await this.platform.sendDeviceUpdate(accessory, params)
-      switchService.updateCharacteristic(Characteristic.On, value)
+      await this.platform.sendDeviceUpdate(this.accessory, params)
+      switchService.updateCharacteristic(this.Characteristic.On, value)
     } catch (err) {
-      this.platform.deviceUpdateError(accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true)
     }
   }
 
-  async externalUpdate (accessory, params) {
+  async externalUpdate (params) {
     try {
       if (!helpers.hasProperty(params, 'switches')) return
-      accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, params.switches[0].switch === 'on')
+      this.accessory.getService(this.Service.Switch).updateCharacteristic(this.Characteristic.On, params.switches[0].switch === 'on')
     } catch (err) {
-      this.platform.deviceUpdateError(accessory, err, false)
+      this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
 }
diff --git a/lib/device/sensor.js b/lib/device/sensor.js
index d0e3e273..488de3e5 100644
--- a/lib/device/sensor.js
+++ b/lib/device/sensor.js
@@ -1,57 +1,57 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
-let Characteristic, Service
 const helpers = require('./../helpers')
 module.exports = class deviceSensor {
   constructor (platform, accessory) {
     this.platform = platform
-    Service = platform.api.hap.Service
-    Characteristic = platform.api.hap.Characteristic
-    if (!accessory.getService(Service.ContactSensor)) accessory.addService(Service.ContactSensor)
-    if (!accessory.getService(Service.BatteryService)) accessory.addService(Service.BatteryService)
+    this.accessory = accessory
+    this.Service = platform.api.hap.Service
+    this.Characteristic = platform.api.hap.Characteristic
+    if (!accessory.getService(this.Service.ContactSensor)) accessory.addService(this.Service.ContactSensor)
+    if (!accessory.getService(this.Service.BatteryService)) accessory.addService(this.Service.BatteryService)
   }
 
-  async externalUpdate (accessory, params) {
+  async externalUpdate (params) {
     try {
       if (helpers.hasProperty(params, 'battery')) {
         const batteryService =
-            accessory.getService(Service.BatteryService) || accessory.addService(Service.BatteryService)
+            this.accessory.getService(this.Service.BatteryService) || this.accessory.addService(this.Service.BatteryService)
         const scaledBattery = Math.round(params.battery * 33.3)
-        batteryService.updateCharacteristic(Characteristic.BatteryLevel, scaledBattery)
+        batteryService.updateCharacteristic(this.Characteristic.BatteryLevel, scaledBattery)
         batteryService.updateCharacteristic(
-          Characteristic.StatusLowBattery,
+          this.Characteristic.StatusLowBattery,
           scaledBattery < (this.platform.config.lowBattThreshold || 25)
         )
       }
       if (!helpers.hasProperty(params, 'switch')) return
       const newState = params.switch === 'on' ? 1 : 0
       let oAccessory = false
-      const contactService = accessory.getService(Service.ContactSensor)
-      contactService.updateCharacteristic(Characteristic.ContactSensorState, newState)
+      const contactService = this.accessory.getService(this.Service.ContactSensor)
+      contactService.updateCharacteristic(this.Characteristic.ContactSensorState, newState)
       this.platform.cusG.forEach(async group => {
-        if (group.sensorId === accessory.context.eweDeviceId && group.type === 'garage') {
+        if (group.sensorId === this.accessory.context.eweDeviceId && group.type === 'garage') {
           if ((oAccessory = this.platform.devicesInHB.get(group.deviceId + 'SWX'))) {
             switch (newState) {
               case 0:
                 oAccessory
-                  .getService(Service.GarageDoorOpener)
-                  .updateCharacteristic(Characteristic.TargetDoorState, 1)
-                  .updateCharacteristic(Characteristic.CurrentDoorState, 1)
+                  .getService(this.Service.GarageDoorOpener)
+                  .updateCharacteristic(this.Characteristic.TargetDoorState, 1)
+                  .updateCharacteristic(this.Characteristic.CurrentDoorState, 1)
                 break
               case 1:
                 await helpers.sleep(Math.max(group.operationTime * 100, 1000))
                 oAccessory
-                  .getService(Service.GarageDoorOpener)
-                  .updateCharacteristic(Characteristic.TargetDoorState, 0)
-                  .updateCharacteristic(Characteristic.CurrentDoorState, 0)
+                  .getService(this.Service.GarageDoorOpener)
+                  .updateCharacteristic(this.Characteristic.TargetDoorState, 0)
+                  .updateCharacteristic(this.Characteristic.CurrentDoorState, 0)
                 break
             }
           }
         }
       })
     } catch (err) {
-      this.platform.deviceUpdateError(accessory, err, false)
+      this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
 }

From df69c8f746338bed1c60bb63ea13c5d2e03caf80 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 15 Oct 2020 13:00:44 +0100
Subject: [PATCH 0478/3183] file reorganisation 3

---
 lib/device/switch.js     |  68 +++++++++++------------
 lib/device/thermostat.js |  64 +++++++++++-----------
 lib/device/usb.js        |  32 +++++------
 lib/device/valve.js      | 115 +++++++++++++++++++--------------------
 lib/device/zb-dev.js     | 111 +++++++++++++++++++------------------
 5 files changed, 192 insertions(+), 198 deletions(-)

diff --git a/lib/device/switch.js b/lib/device/switch.js
index dc05d49f..a18c6fea 100644
--- a/lib/device/switch.js
+++ b/lib/device/switch.js
@@ -1,26 +1,26 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
-let Characteristic, Service
 const helpers = require('./../helpers')
 module.exports = class deviceSwitch {
   constructor (platform, accessory) {
     this.platform = platform
-    Service = platform.api.hap.Service
-    Characteristic = platform.api.hap.Characteristic
-    const switchService = accessory.getService(Service.Switch) || accessory.addService(Service.Switch)
+    this.accessory = accessory
+    this.Service = platform.api.hap.Service
+    this.Characteristic = platform.api.hap.Characteristic
+    const switchService = accessory.getService(this.Service.Switch) || accessory.addService(this.Service.Switch)
     switchService
-      .getCharacteristic(Characteristic.On)
-      .on('set', (value, callback) => this.internalUpdate(accessory, value, callback))
+      .getCharacteristic(this.Characteristic.On)
+      .on('set', (value, callback) => this.internalUpdate(value, callback))
   }
 
-  async internalUpdate (accessory, value, callback) {
+  async internalUpdate (value, callback) {
     callback()
     try {
       let oAccessory
       const params = {}
-      const switchService = accessory.getService(Service.Switch)
-      switch (accessory.context.switchNumber) {
+      const switchService = this.accessory.getService(this.Service.Switch)
+      switch (this.accessory.context.switchNumber) {
         case 'X':
           params.switch = value ? 'on' : 'off'
           break
@@ -37,8 +37,8 @@ module.exports = class deviceSwitch {
         case '4':
           params.switches = helpers.defaultMultiSwitchOff
           for (let i = 1; i <= 4; i++) {
-            if ((oAccessory = this.platform.devicesInHB.get(accessory.context.eweDeviceId + 'SW' + i))) {
-              if (i === parseInt(accessory.context.switchNumber)) {
+            if ((oAccessory = this.platform.devicesInHB.get(this.accessory.context.eweDeviceId + 'SW' + i))) {
+              if (i === parseInt(this.accessory.context.switchNumber)) {
                 params.switches[i - 1].switch = value ? 'on' : 'off'
               } else {
                 params.switches[i - 1].switch = oAccessory.context.cacheOn ? 'on' : 'off'
@@ -49,15 +49,15 @@ module.exports = class deviceSwitch {
           }
           break
       }
-      await this.platform.sendDeviceUpdate(accessory, params)
-      switch (accessory.context.switchNumber) {
+      await this.platform.sendDeviceUpdate(this.accessory, params)
+      switch (this.accessory.context.switchNumber) {
         case 'X':
-          switchService.updateCharacteristic(Characteristic.On, value)
+          switchService.updateCharacteristic(this.Characteristic.On, value)
           break
         case '0':
           for (let i = 0; i <= 4; i++) {
-            if ((oAccessory = this.platform.devicesInHB.get(accessory.context.eweDeviceId + 'SW' + i))) {
-              oAccessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, value)
+            if ((oAccessory = this.platform.devicesInHB.get(this.accessory.context.eweDeviceId + 'SW' + i))) {
+              oAccessory.getService(this.Service.Switch).updateCharacteristic(this.Characteristic.On, value)
             }
           }
           break
@@ -65,37 +65,37 @@ module.exports = class deviceSwitch {
         case '2':
         case '3':
         case '4': {
-          switchService.updateCharacteristic(Characteristic.On, value)
+          switchService.updateCharacteristic(this.Characteristic.On, value)
           let masterState = 'off'
           for (let i = 1; i <= 4; i++) {
-            if ((oAccessory = this.platform.devicesInHB.get(accessory.context.eweDeviceId + 'SW' + i))) {
-              if (oAccessory.getService(Service.Switch).getCharacteristic(Characteristic.On).value) {
+            if ((oAccessory = this.platform.devicesInHB.get(this.accessory.context.eweDeviceId + 'SW' + i))) {
+              if (oAccessory.getService(this.Service.Switch).getCharacteristic(this.Characteristic.On).value) {
                 masterState = 'on'
               }
             }
           }
-          if (!this.platform.hiddenMasters.includes(accessory.context.eweDeviceId)) {
-            oAccessory = this.platform.devicesInHB.get(accessory.context.eweDeviceId + 'SW0')
-            oAccessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, masterState === 'on')
+          if (!this.platform.hiddenMasters.includes(this.accessory.context.eweDeviceId)) {
+            oAccessory = this.platform.devicesInHB.get(this.accessory.context.eweDeviceId + 'SW0')
+            oAccessory.getService(this.Service.Switch).updateCharacteristic(this.Characteristic.On, masterState === 'on')
           }
           break
         }
       }
     } catch (err) {
-      this.platform.deviceUpdateError(accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true)
     }
   }
 
-  async externalUpdate (accessory, params) {
+  async externalUpdate (params) {
     try {
-      if (helpers.devicesSingleSwitch.includes(accessory.context.eweUIID)) {
+      if (helpers.devicesSingleSwitch.includes(this.accessory.context.eweUIID)) {
         if (!helpers.hasProperty(params, 'switch')) return
-        accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, params.switch === 'on')
-      } else if (helpers.devicesMultiSwitch.includes(accessory.context.eweUIID)) {
+        this.accessory.getService(this.Service.Switch).updateCharacteristic(this.Characteristic.On, params.switch === 'on')
+      } else if (helpers.devicesMultiSwitch.includes(this.accessory.context.eweUIID)) {
         if (!helpers.hasProperty(params, 'switches')) return
-        const idToCheck = accessory.context.hbDeviceId.slice(0, -1)
+        const idToCheck = this.accessory.context.hbDeviceId.slice(0, -1)
         let primaryState = false
-        for (let i = 1; i <= accessory.context.channelCount; i++) {
+        for (let i = 1; i <= this.accessory.context.channelCount; i++) {
           if (params.switches[i - 1].switch === 'on') {
             primaryState = true
           }
@@ -103,16 +103,16 @@ module.exports = class deviceSwitch {
             const oAccessory = this.platform.devicesInHB.get(idToCheck + i)
             oAccessory.context.cacheOn = params.switches[i - 1].switch === 'on'
             oAccessory
-              .getService(Service.Switch)
-              .updateCharacteristic(Characteristic.On, params.switches[i - 1].switch === 'on')
+              .getService(this.Service.Switch)
+              .updateCharacteristic(this.Characteristic.On, params.switches[i - 1].switch === 'on')
           }
         }
-        if (!this.platform.hiddenMasters.includes(accessory.context.eweDeviceId)) {
-          accessory.getService(Service.Switch).updateCharacteristic(Characteristic.On, primaryState)
+        if (!this.platform.hiddenMasters.includes(this.accessory.context.eweDeviceId)) {
+          this.accessory.getService(this.Service.Switch).updateCharacteristic(this.Characteristic.On, primaryState)
         }
       }
     } catch (err) {
-      this.platform.deviceUpdateError(accessory, err, false)
+      this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
 }
diff --git a/lib/device/thermostat.js b/lib/device/thermostat.js
index 14e412be..bea10d51 100644
--- a/lib/device/thermostat.js
+++ b/lib/device/thermostat.js
@@ -1,30 +1,30 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
-let Characteristic, EveHistoryService, Service
 const corrInterval = require('correcting-interval')
 const fakegato = require('fakegato-history')
 const helpers = require('./../helpers')
 module.exports = class deviceThermostat {
   constructor (platform, accessory) {
     this.platform = platform
-    Service = platform.api.hap.Service
-    Characteristic = platform.api.hap.Characteristic
-    EveHistoryService = fakegato(platform.api)
-    const tempService = accessory.getService(Service.TemperatureSensor) || accessory.addService(Service.TemperatureSensor)
+    this.accessory = accessory
+    this.Service = platform.api.hap.Service
+    this.Characteristic = platform.api.hap.Characteristic
+    this.EveHistoryService = fakegato(platform.api)
+    const tempService = accessory.getService(this.Service.TemperatureSensor) || accessory.addService(this.Service.TemperatureSensor)
     let humiService = false
     if (accessory.context.sensorType !== 'DS18B20') {
-      humiService = accessory.getService(Service.HumiditySensor) || accessory.addService(Service.HumiditySensor)
+      humiService = accessory.getService(this.Service.HumiditySensor) || accessory.addService(this.Service.HumiditySensor)
     }
     if (!this.platform.config.hideTHSwitch) {
-      const switchService = accessory.getService(Service.Switch) || accessory.addService(Service.Switch)
+      const switchService = accessory.getService(this.Service.Switch) || accessory.addService(this.Service.Switch)
       switchService
-        .getCharacteristic(Characteristic.On)
-        .on('set', (value, callback) => this.internalUpdate(accessory, value, callback))
+        .getCharacteristic(this.Characteristic.On)
+        .on('set', (value, callback) => this.internalUpdate(value, callback))
     }
     if (!this.platform.config.disableEveLogging) {
       accessory.log = this.platform.log
-      accessory.eveLogger = new EveHistoryService('weather', accessory, {
+      accessory.eveLogger = new this.EveHistoryService('weather', accessory, {
         storage: 'fs',
         minutes: 5,
         path: this.platform.eveLogPath
@@ -32,65 +32,63 @@ module.exports = class deviceThermostat {
       corrInterval.setCorrectingInterval(() => {
         const dataToAdd = {
           time: Date.now(),
-          temp: tempService.getCharacteristic(Characteristic.CurrentTemperature).value
+          temp: tempService.getCharacteristic(this.Characteristic.CurrentTemperature).value
         }
         if (humiService) {
-          dataToAdd.humidity = humiService.getCharacteristic(Characteristic.CurrentRelativeHumidity).value
+          dataToAdd.humidity = humiService.getCharacteristic(this.Characteristic.CurrentRelativeHumidity).value
         }
         accessory.eveLogger.addEntry(dataToAdd)
       }, 300000)
     }
   }
 
-  async internalUpdate (accessory, value, callback) {
+  async internalUpdate (value, callback) {
     callback()
     try {
       const params = {
         switch: value ? 'on' : 'off',
         mainSwitch: value ? 'on' : 'off'
       }
-      const switchService = accessory.getService(Service.Switch)
-      await this.platform.sendDeviceUpdate(accessory, params)
-      switchService.updateCharacteristic(Characteristic.On, value)
+      const switchService = this.accessory.getService(this.Service.Switch)
+      await this.platform.sendDeviceUpdate(this.accessory, params)
+      switchService.updateCharacteristic(this.Characteristic.On, value)
     } catch (err) {
-      this.platform.deviceUpdateError(accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true)
     }
   }
 
-  async externalUpdate (accessory, params) {
+  async externalUpdate (params) {
     try {
       if (
         !this.platform.config.hideTHSwitch &&
         (helpers.hasProperty(params, 'switch') || helpers.hasProperty(params, 'mainSwitch'))
       ) {
         const newState = helpers.hasProperty(params, 'switch') ? params.switch === 'on' : params.mainSwitch === 'on'
-        const switchService = accessory.getService(Service.Switch)
-        switchService.updateCharacteristic(Characteristic.On, newState)
+        const switchService = this.accessory.getService(this.Service.Switch)
+        switchService.updateCharacteristic(this.Characteristic.On, newState)
       }
-      const eveLog = {
-        time: Date.now()
-      }
-      if (helpers.hasProperty(params, 'currentTemperature') && accessory.getService(Service.TemperatureSensor)) {
+      const eveLog = { time: Date.now() }
+      if (helpers.hasProperty(params, 'currentTemperature') && this.accessory.getService(this.Service.TemperatureSensor)) {
         const currentTemp = parseFloat(params.currentTemperature !== 'unavailable' ? params.currentTemperature : 0)
-        accessory
-          .getService(Service.TemperatureSensor)
-          .updateCharacteristic(Characteristic.CurrentTemperature, currentTemp)
+        this.accessory
+          .getService(this.Service.TemperatureSensor)
+          .updateCharacteristic(this.Characteristic.CurrentTemperature, currentTemp)
         eveLog.temp = currentTemp
       }
-      if (helpers.hasProperty(params, 'currentHumidity') && accessory.getService(Service.HumiditySensor)) {
+      if (helpers.hasProperty(params, 'currentHumidity') && this.accessory.getService(this.Service.HumiditySensor)) {
         const currentHumi = parseFloat(params.currentHumidity !== 'unavailable' ? params.currentHumidity : 0)
-        accessory
-          .getService(Service.HumiditySensor)
-          .updateCharacteristic(Characteristic.CurrentRelativeHumidity, currentHumi)
+        this.accessory
+          .getService(this.Service.HumiditySensor)
+          .updateCharacteristic(this.Characteristic.CurrentRelativeHumidity, currentHumi)
         eveLog.humidity = currentHumi
       }
       if (!this.platform.config.disableEveLogging) {
         if (helpers.hasProperty(eveLog, 'temp') || helpers.hasProperty(eveLog, 'humidity')) {
-          accessory.eveLogger.addEntry(eveLog)
+          this.accessory.eveLogger.addEntry(eveLog)
         }
       }
     } catch (err) {
-      this.platform.deviceUpdateError(accessory, err, false)
+      this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
 }
diff --git a/lib/device/usb.js b/lib/device/usb.js
index 0600b2fd..9274407d 100644
--- a/lib/device/usb.js
+++ b/lib/device/usb.js
@@ -1,40 +1,38 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
-let Characteristic, Service
 const helpers = require('./../helpers')
 module.exports = class deviceUSB {
   constructor (platform, accessory) {
     this.platform = platform
-    Service = platform.api.hap.Service
-    Characteristic = platform.api.hap.Characteristic
-    const usbService = accessory.getService(Service.Outlet) || accessory.addService(Service.Outlet)
+    this.accessory = accessory
+    this.Service = platform.api.hap.Service
+    this.Characteristic = platform.api.hap.Characteristic
+    const usbService = accessory.getService(this.Service.Outlet) || accessory.addService(this.Service.Outlet)
     usbService
-      .getCharacteristic(Characteristic.On)
-      .on('set', (value, callback) => this.internalUpdate(accessory, value, callback))
+      .getCharacteristic(this.Characteristic.On)
+      .on('set', (value, callback) => this.internalUpdate(value, callback))
   }
 
-  async internalUpdate (accessory, value, callback) {
+  async internalUpdate (value, callback) {
     callback()
     try {
-      const params = {
-        switches: helpers.defaultMultiSwitchOff
-      }
-      const outletService = accessory.getService(Service.Outlet)
+      const params = { switches: helpers.defaultMultiSwitchOff }
+      const outletService = this.accessory.getService(this.Service.Outlet)
       params.switches[0].switch = value ? 'on' : 'off'
-      await this.platform.sendDeviceUpdate(accessory, params)
-      outletService.updateCharacteristic(Characteristic.On, value)
+      await this.platform.sendDeviceUpdate(this.accessory, params)
+      outletService.updateCharacteristic(this.Characteristic.On, value)
     } catch (err) {
-      this.platform.deviceUpdateError(accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true)
     }
   }
 
-  async externalUpdate (accessory, params) {
+  async externalUpdate (params) {
     try {
       if (!helpers.hasProperty(params, 'switches')) return
-      accessory.getService(Service.Outlet).updateCharacteristic(Characteristic.On, params.switches[0].switch === 'on')
+      this.accessory.getService(this.Service.Outlet).updateCharacteristic(this.Characteristic.On, params.switches[0].switch === 'on')
     } catch (err) {
-      this.platform.deviceUpdateError(accessory, err, false)
+      this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
 }
diff --git a/lib/device/valve.js b/lib/device/valve.js
index 4995d267..a1ff0f05 100644
--- a/lib/device/valve.js
+++ b/lib/device/valve.js
@@ -1,122 +1,117 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
-let Characteristic, Service
 const helpers = require('./../helpers')
 module.exports = class deviceValve {
   constructor (platform, accessory) {
     this.platform = platform
-    Service = platform.api.hap.Service
-    Characteristic = platform.api.hap.Characteristic
-    const arr = ['A', 'B']
-    arr.forEach(v => {
+    this.accessory = accessory
+    this.Service = platform.api.hap.Service
+    this.Characteristic = platform.api.hap.Characteristic
+    ;['A', 'B'].forEach(v => {
       let valveService
-      const valveConfig = this.platform.cusG.get(accessory.context.hbDeviceId)
-      if (!(valveService = accessory.getService('Valve ' + v))) {
-        accessory
-          .addService(Service.Valve, 'Valve ' + v, 'valve' + v.toLowerCase())
-          .setCharacteristic(Characteristic.Active, 0)
-          .setCharacteristic(Characteristic.InUse, 0)
-          .setCharacteristic(Characteristic.ValveType, 1)
-          .setCharacteristic(Characteristic.SetDuration, Math.round((valveConfig.operationTime || 1200) / 10))
-          .addCharacteristic(Characteristic.RemainingDuration)
-        valveService = accessory.getService('Valve ' + v)
+      const valveConfig = this.platform.cusG.get(this.accessory.context.hbDeviceId)
+      if (!(valveService = this.accessory.getService('Valve ' + v))) {
+        this.accessory
+          .addService(this.Service.Valve, 'Valve ' + v, 'valve' + v.toLowerCase())
+          .setCharacteristic(this.Characteristic.Active, 0)
+          .setCharacteristic(this.Characteristic.InUse, 0)
+          .setCharacteristic(this.Characteristic.ValveType, 1)
+          .setCharacteristic(this.Characteristic.SetDuration, Math.round((valveConfig.operationTime || 1200) / 10))
+          .addCharacteristic(this.Characteristic.RemainingDuration)
+        valveService = this.accessory.getService('Valve ' + v)
       }
       valveService
-        .getCharacteristic(Characteristic.Active)
-        .on('set', (value, callback) =>
-          this.internalUpdate(accessory, 'Valve ' + v, value, callback)
-        )
-      valveService.getCharacteristic(Characteristic.SetDuration).on('set', (value, callback) => {
-        if (valveService.getCharacteristic(Characteristic.InUse).value) {
-          valveService.updateCharacteristic(Characteristic.RemainingDuration, value)
-          clearTimeout(valveService.timer)
-          valveService.timer = setTimeout(() => {
-            valveService.setCharacteristic(Characteristic.Active, 0)
-          }, value * 1000)
-        }
-        callback()
-      })
+        .getCharacteristic(this.Characteristic.Active)
+        .on('set', (value, callback) => this.internalUpdate('Valve ' + v, value, callback))
+      valveService
+        .getCharacteristic(this.Characteristic.SetDuration)
+        .on('set', (value, callback) => {
+          if (valveService.getCharacteristic(this.Characteristic.InUse).value) {
+            valveService.updateCharacteristic(this.Characteristic.RemainingDuration, value)
+            clearTimeout(valveService.timer)
+            valveService.timer = setTimeout(() => {
+              valveService.setCharacteristic(this.Characteristic.Active, 0)
+            }, value * 1000)
+          }
+          callback()
+        })
     })
   }
 
-  async internalUpdate (accessory, valve, value, callback) {
+  async internalUpdate (valve, value, callback) {
     callback()
     try {
       let valveConfig
-      const params = {}
-      if (!(valveConfig = this.platform.cusG.get(accessory.context.hbDeviceId))) {
+      const params = { switches: helpers.defaultMultiSwitchOff }
+      if (!(valveConfig = this.platform.cusG.get(this.accessory.context.hbDeviceId))) {
         throw new Error('group config missing')
       }
       if (valveConfig.type !== 'valve') {
         throw new Error('improper configuration')
       }
-      const serviceValve = accessory.getService(valve)
-      params.switches = this.platform.devicesInEW.get(accessory.context.eweDeviceId).params.switches
+      const serviceValve = this.accessory.getService(valve)
       switch (valve) {
         case 'Valve A':
           params.switches[0].switch = value ? 'on' : 'off'
-          params.switches[1].switch = accessory.getService('Valve B').getCharacteristic(Characteristic.Active).value
+          params.switches[1].switch = this.accessory.getService('Valve B').getCharacteristic(this.Characteristic.Active).value
             ? 'on'
             : 'off'
           break
         case 'Valve B':
-          params.switches[0].switch = accessory.getService('Valve A').getCharacteristic(Characteristic.Active).value
+          params.switches[0].switch = this.accessory.getService('Valve A').getCharacteristic(this.Characteristic.Active).value
             ? 'on'
             : 'off'
           params.switches[1].switch = value ? 'on' : 'off'
           break
       }
-      params.switches[2].switch = 'off'
-      params.switches[3].switch = 'off'
-      await this.platform.sendDeviceUpdate(accessory, params)
-      serviceValve.updateCharacteristic(Characteristic.Active, value).updateCharacteristic(Characteristic.InUse, value)
+      await this.platform.sendDeviceUpdate(this.accessory, params)
+      serviceValve
+        .updateCharacteristic(this.Characteristic.Active, value)
+        .updateCharacteristic(this.Characteristic.InUse, value)
       switch (value) {
         case 0:
-          serviceValve.updateCharacteristic(Characteristic.RemainingDuration, 0)
-          clearTimeout(accessory.getService(valve).timer)
+          serviceValve.updateCharacteristic(this.Characteristic.RemainingDuration, 0)
+          clearTimeout(this.accessory.getService(valve).timer)
           break
         case 1: {
-          const timer = serviceValve.getCharacteristic(Characteristic.SetDuration).value
-          serviceValve.updateCharacteristic(Characteristic.RemainingDuration, timer)
-          serviceValve.timer = setTimeout(() => serviceValve.setCharacteristic(Characteristic.Active, 0), timer * 1000)
+          const timer = serviceValve.getCharacteristic(this.Characteristic.SetDuration).value
+          serviceValve.updateCharacteristic(this.Characteristic.RemainingDuration, timer)
+          serviceValve.timer = setTimeout(() => serviceValve.setCharacteristic(this.Characteristic.Active, 0), timer * 1000)
           break
         }
       }
     } catch (err) {
-      this.platform.deviceUpdateError(accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true)
     }
   }
 
-  async externalUpdate (accessory, params) {
+  async externalUpdate (params) {
     try {
       if (!helpers.hasProperty(params, 'switches')) return
       let valveConfig
-      if (!(valveConfig = this.platform.cusG.get(accessory.context.hbDeviceId))) {
+      if (!(valveConfig = this.platform.cusG.get(this.accessory.context.hbDeviceId))) {
         throw new Error('group config missing')
       }
       if (valveConfig.type !== 'valve') {
         throw new Error('improper configuration')
       }
-      const arr = ['A', 'B']
-      arr.forEach((v, k) => {
-        const valveService = accessory.getService('Valve ' + v)
+      ;['A', 'B'].forEach((v, k) => {
+        const valveService = this.accessory.getService('Valve ' + v)
         valveService
-          .updateCharacteristic(Characteristic.Active, params.switches[k].switch === 'on')
-          .updateCharacteristic(Characteristic.InUse, params.switches[k].switch === 'on')
+          .updateCharacteristic(this.Characteristic.Active, params.switches[k].switch === 'on')
+          .updateCharacteristic(this.Characteristic.InUse, params.switches[k].switch === 'on')
         if (params.switches[k].switch === 'on') {
-          const timer = valveService.getCharacteristic(Characteristic.SetDuration).value
-          valveService.updateCharacteristic(Characteristic.RemainingDuration, timer)
-          valveService.timer = setTimeout(() => {
-            valveService.setCharacteristic(Characteristic.Active, 0)
-          }, timer * 1000)
+          const timer = valveService.getCharacteristic(this.Characteristic.SetDuration).value
+          valveService.updateCharacteristic(this.Characteristic.RemainingDuration, timer)
+          valveService.timer = setTimeout(() => valveService.setCharacteristic(this.Characteristic.Active, 0), timer * 1000)
         } else {
-          valveService.updateCharacteristic(Characteristic.RemainingDuration, 0)
+          valveService.updateCharacteristic(this.Characteristic.RemainingDuration, 0)
           clearTimeout(valveService.timer)
         }
       })
     } catch (err) {
-      this.platform.deviceUpdateError(accessory, err, false)
+      this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
 }
diff --git a/lib/device/zb-dev.js b/lib/device/zb-dev.js
index 1a9562c1..bbd171ad 100644
--- a/lib/device/zb-dev.js
+++ b/lib/device/zb-dev.js
@@ -1,24 +1,24 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
-let Characteristic, Service, EveHistoryService
 const corrInterval = require('correcting-interval')
 const fakegato = require('fakegato-history')
 const helpers = require('./../helpers')
 module.exports = class deviceZBDev {
   constructor (platform, accessory) {
     this.platform = platform
-    Service = platform.api.hap.Service
-    Characteristic = platform.api.hap.Characteristic
-    EveHistoryService = fakegato(platform.api)
-    if (!accessory.getService(Service.BatteryService)) accessory.addService(Service.BatteryService)
+    this.accessory = accessory
+    this.Service = platform.api.hap.Service
+    this.Characteristic = platform.api.hap.Characteristic
+    this.EveHistoryService = fakegato(platform.api)
+    if (!accessory.getService(this.Service.BatteryService)) accessory.addService(this.Service.BatteryService)
     switch (accessory.context.eweUIID) {
       case 1000: {
         const zbspsService =
-          accessory.getService(Service.StatelessProgrammableSwitch) ||
-          accessory.addService(Service.StatelessProgrammableSwitch)
+          accessory.getService(this.Service.StatelessProgrammableSwitch) ||
+          accessory.addService(this.Service.StatelessProgrammableSwitch)
         if (this.platform.config.hideZBLDPress) {
-          zbspsService.getCharacteristic(Characteristic.ProgrammableSwitchEvent).setProps({
+          zbspsService.getCharacteristic(this.Characteristic.ProgrammableSwitchEvent).setProps({
             validValues: [0]
           })
         }
@@ -26,77 +26,80 @@ module.exports = class deviceZBDev {
       }
       case 1770: {
         const zbTempService =
-          accessory.getService(Service.TemperatureSensor) || accessory.addService(Service.TemperatureSensor)
+          accessory.getService(this.Service.TemperatureSensor) || accessory.addService(this.Service.TemperatureSensor)
         const zbHumiService =
-          accessory.getService(Service.HumiditySensor) || accessory.addService(Service.HumiditySensor)
-        accessory.log = this.platform.log
-        accessory.eveLogger = new EveHistoryService('weather', accessory, {
-          storage: 'fs',
-          minutes: 5,
-          path: this.platform.eveLogPath
-        })
-        corrInterval.setCorrectingInterval(() => {
-          const dataToAdd = {
-            time: Date.now(),
-            temp: zbTempService.getCharacteristic(Characteristic.CurrentTemperature).value,
-            humidity: zbHumiService.getCharacteristic(Characteristic.CurrentRelativeHumidity).value
-          }
-          accessory.eveLogger.addEntry(dataToAdd)
-        }, 300000)
+          accessory.getService(this.Service.HumiditySensor) || accessory.addService(this.Service.HumiditySensor)
+        if (!this.platform.config.disableEveLogging) {
+          accessory.log = this.platform.log
+          accessory.eveLogger = new this.EveHistoryService('weather', accessory, {
+            storage: 'fs',
+            minutes: 5,
+            path: this.platform.eveLogPath
+          })
+          corrInterval.setCorrectingInterval(() => {
+            const dataToAdd = {
+              time: Date.now(),
+              temp: zbTempService.getCharacteristic(this.Characteristic.CurrentTemperature).value,
+              humidity: zbHumiService.getCharacteristic(this.Characteristic.CurrentRelativeHumidity).value
+            }
+            accessory.eveLogger.addEntry(dataToAdd)
+          }, 300000)
+        }
         break
       }
       case 2026:
-        if (!accessory.getService(Service.MotionSensor)) accessory.addService(Service.MotionSensor)
+        if (!accessory.getService(this.Service.MotionSensor)) accessory.addService(this.Service.MotionSensor)
         break
       case 3026:
-        if (!accessory.getService(Service.ContactSensor)) accessory.addService(Service.ContactSensor)
+        if (!accessory.getService(this.Service.ContactSensor)) accessory.addService(this.Service.ContactSensor)
         break
     }
   }
 
-  async externalUpdate (accessory, params) {
+  async externalUpdate (params) {
     try {
       //* ** credit @tasict ***\\
       if (helpers.hasProperty(params, 'battery')) {
-        if (accessory.context.eweUIID === 3026 && this.platform.config.ZBDWBatt) {
+        if (this.accessory.context.eweUIID === 3026 && this.platform.config.ZBDWBatt) {
           params.battery *= 10
         }
         const batteryService =
-          accessory.getService(Service.BatteryService) || accessory.addService(Service.BatteryService)
-        batteryService.updateCharacteristic(Characteristic.BatteryLevel, params.battery)
+          this.accessory.getService(this.Service.BatteryService) || this.accessory.addService(this.Service.BatteryService)
+        batteryService.updateCharacteristic(this.Characteristic.BatteryLevel, params.battery)
         batteryService.updateCharacteristic(
-          Characteristic.StatusLowBattery,
+          this.Characteristic.StatusLowBattery,
           params.battery < (this.platform.config.lowBattThreshold || 25)
         )
       }
-      switch (accessory.context.eweUIID) {
+      switch (this.accessory.context.eweUIID) {
         case 1000:
           if (helpers.hasProperty(params, 'key') && [0, 1, 2].includes(params.key)) {
-            accessory
-              .getService(Service.StatelessProgrammableSwitch)
-              .updateCharacteristic(Characteristic.ProgrammableSwitchEvent, params.key)
+            this.accessory
+              .getService(this.Service.StatelessProgrammableSwitch)
+              .updateCharacteristic(this.Characteristic.ProgrammableSwitchEvent, params.key)
           }
           break
         case 1770: {
-          const eveLog = {
-            time: Date.now()
-          }
+          const eveLog = { time: Date.now() }
           if (helpers.hasProperty(params, 'temperature')) {
             const currentTemp = parseInt(params.temperature) / 100
-            accessory
-              .getService(Service.TemperatureSensor)
-              .updateCharacteristic(Characteristic.CurrentTemperature, currentTemp)
+            this.accessory
+              .getService(this.Service.TemperatureSensor)
+              .updateCharacteristic(this.Characteristic.CurrentTemperature, currentTemp)
             eveLog.temp = parseFloat(currentTemp)
           }
           if (helpers.hasProperty(params, 'humidity')) {
             const currentHumi = parseInt(params.humidity) / 100
-            accessory
-              .getService(Service.HumiditySensor)
-              .updateCharacteristic(Characteristic.CurrentRelativeHumidity, currentHumi)
+            this.accessory
+              .getService(this.Service.HumiditySensor)
+              .updateCharacteristic(this.Characteristic.CurrentRelativeHumidity, currentHumi)
             eveLog.humidity = parseFloat(currentHumi)
           }
-          if (helpers.hasProperty(eveLog, 'temp') || helpers.hasProperty(eveLog, 'humidity')) {
-            accessory.eveLogger.addEntry(eveLog)
+          if (
+            !this.platform.config.disableEveLogging &&
+            (helpers.hasProperty(eveLog, 'temp') || helpers.hasProperty(eveLog, 'humidity'))
+          ) {
+            this.accessory.eveLogger.addEntry(eveLog)
           }
           break
         }
@@ -104,10 +107,10 @@ module.exports = class deviceZBDev {
           if (helpers.hasProperty(params, 'motion') && helpers.hasProperty(params, 'trigTime')) {
             const timeNow = new Date()
             const diff = (timeNow.getTime() - params.trigTime) / 1000
-            accessory
-              .getService(Service.MotionSensor)
+            this.accessory
+              .getService(this.Service.MotionSensor)
               .updateCharacteristic(
-                Characteristic.MotionDetected,
+                this.Characteristic.MotionDetected,
                 helpers.hasProperty(params, 'updateSource') &&
                   params.motion === 1 &&
                   diff < (this.platform.config.sensorTimeDifference || 120)
@@ -117,16 +120,16 @@ module.exports = class deviceZBDev {
           break
         case 3026:
           if (helpers.hasProperty(params, 'lock') && [0, 1].includes(params.lock)) {
-            accessory
-              .getService(Service.ContactSensor)
-              .updateCharacteristic(Characteristic.ContactSensorState, params.lock)
+            this.accessory
+              .getService(this.Service.ContactSensor)
+              .updateCharacteristic(this.Characteristic.ContactSensorState, params.lock)
           }
           break
         default:
-          throw new Error('Zigbee device type not supported [uiid ' + accessory.context.eweUIID + ']')
+          throw new Error('Zigbee device type not supported [uiid ' + this.accessory.context.eweUIID + ']')
       }
     } catch (err) {
-      this.platform.deviceUpdateError(accessory, err, false)
+      this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
 }

From c5a0f0eb9e6f943d6131176727280906497c256a Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 15 Oct 2020 13:01:55 +0100
Subject: [PATCH 0479/3183] 3.6.1-0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 28a4db2c..bc68f03f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.6.0",
+  "version": "3.6.1-0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index e093926d..91e99bb0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.6.0",
+  "version": "3.6.1-0",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 2099e93b424e11dfa701c9de27c85a0eca4b6161 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 15 Oct 2020 13:49:30 +0100
Subject: [PATCH 0480/3183] move line

---
 lib/device/blind.js         | 1 +
 lib/device/curtain.js       | 1 +
 lib/device/fan.js           | 2 +-
 lib/device/garage-eachen.js | 2 +-
 lib/device/garage-two.js    | 2 +-
 lib/device/garage.js        | 2 +-
 lib/device/light.js         | 2 +-
 lib/device/lock.js          | 2 +-
 lib/device/outlet.js        | 2 +-
 lib/device/rf-bridge.js     | 2 +-
 lib/device/scm.js           | 2 +-
 lib/device/sensor.js        | 2 +-
 lib/device/switch.js        | 2 +-
 lib/device/thermostat.js    | 2 +-
 lib/device/usb.js           | 2 +-
 lib/device/valve.js         | 2 +-
 lib/device/zb-dev.js        | 2 +-
 17 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/lib/device/blind.js b/lib/device/blind.js
index b65d9538..31e7bc82 100644
--- a/lib/device/blind.js
+++ b/lib/device/blind.js
@@ -19,6 +19,7 @@ module.exports = class deviceBlind {
     wcService
       .getCharacteristic(this.Characteristic.TargetPosition)
       .on('set', (value, callback) => this.internalUpdate(value, callback))
+    this.accessory = accessory
   }
 
   async internalUpdate (value, callback) {
diff --git a/lib/device/curtain.js b/lib/device/curtain.js
index 49d45da4..645a38f8 100644
--- a/lib/device/curtain.js
+++ b/lib/device/curtain.js
@@ -19,6 +19,7 @@ module.exports = class deviceCurtain {
     cService
       .getCharacteristic(this.Characteristic.TargetPosition)
       .on('set', (value, callback) => this.internalUpdate(value, callback))
+    this.accessory = accessory
   }
 
   async internalUpdate (value, callback) {
diff --git a/lib/device/fan.js b/lib/device/fan.js
index dd72b1a4..48037085 100644
--- a/lib/device/fan.js
+++ b/lib/device/fan.js
@@ -5,7 +5,6 @@ const helpers = require('./../helpers')
 module.exports = class deviceFan {
   constructor (platform, accessory) {
     this.platform = platform
-    this.accessory = accessory
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
     const fanService = accessory.getService(this.Service.Fanv2) || accessory.addService(this.Service.Fanv2)
@@ -28,6 +27,7 @@ module.exports = class deviceFan {
     fanLightService
       .getCharacteristic(this.Characteristic.On)
       .on('set', (value, callback) => this.internalUpdate('light', value, callback))
+    this.accessory = accessory
   }
 
   async internalUpdate (type, value, callback) {
diff --git a/lib/device/garage-eachen.js b/lib/device/garage-eachen.js
index 3dc5fa7d..1c7fb8bf 100644
--- a/lib/device/garage-eachen.js
+++ b/lib/device/garage-eachen.js
@@ -5,7 +5,6 @@ const helpers = require('./../helpers')
 module.exports = class deviceGarageEachen {
   constructor (platform, accessory) {
     this.platform = platform
-    this.accessory = accessory
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
     let gdeService
@@ -20,6 +19,7 @@ module.exports = class deviceGarageEachen {
     gdeService
       .getCharacteristic(this.Characteristic.TargetDoorState)
       .on('set', (value, callback) => this.internalUpdate(value, callback))
+    this.accessory = accessory
   }
 
   async internalUpdate (value, callback) {
diff --git a/lib/device/garage-two.js b/lib/device/garage-two.js
index 6e456abe..fa02653c 100644
--- a/lib/device/garage-two.js
+++ b/lib/device/garage-two.js
@@ -5,7 +5,6 @@ const helpers = require('./../helpers')
 module.exports = class deviceGarageTwo {
   constructor (platform, accessory) {
     this.platform = platform
-    this.accessory = accessory
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
     ;['1', '2'].forEach(v => {
@@ -22,6 +21,7 @@ module.exports = class deviceGarageTwo {
         .getCharacteristic(this.Characteristic.TargetDoorState)
         .on('set', (value, callback) => this.internalUpdate('Garage' + v, value, callback))
     })
+    this.accessory = accessory
   }
 
   async internalUpdate (garage, value, callback) {
diff --git a/lib/device/garage.js b/lib/device/garage.js
index ad5f3945..38d31896 100644
--- a/lib/device/garage.js
+++ b/lib/device/garage.js
@@ -5,7 +5,6 @@ const helpers = require('./../helpers')
 module.exports = class deviceGarage {
   constructor (platform, accessory) {
     this.platform = platform
-    this.accessory = accessory
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
     let gdService
@@ -20,6 +19,7 @@ module.exports = class deviceGarage {
     gdService
       .getCharacteristic(this.Characteristic.TargetDoorState)
       .on('set', (value, callback) => this.internalUpdate(value, callback))
+    this.accessory = accessory
   }
 
   async internalUpdate (value, callback) {
diff --git a/lib/device/light.js b/lib/device/light.js
index 6d426caf..6a1ba5de 100644
--- a/lib/device/light.js
+++ b/lib/device/light.js
@@ -6,7 +6,6 @@ const helpers = require('./../helpers')
 module.exports = class deviceLight {
   constructor (platform, accessory) {
     this.platform = platform
-    this.accessory = accessory
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
     const lightService = accessory.getService(this.Service.Lightbulb) || accessory.addService(this.Service.Lightbulb)
@@ -40,6 +39,7 @@ module.exports = class deviceLight {
         .on('set', (value, callback) => this.internalUpdate('c_hue', value, callback))
       lightService.getCharacteristic(this.Characteristic.Saturation).on('set', (value, callback) => callback())
     }
+    this.accessory = accessory
   }
 
   async internalUpdate (type, value, callback) {
diff --git a/lib/device/lock.js b/lib/device/lock.js
index 8114e730..24c8c6ec 100644
--- a/lib/device/lock.js
+++ b/lib/device/lock.js
@@ -5,13 +5,13 @@ const helpers = require('./../helpers')
 module.exports = class deviceLock {
   constructor (platform, accessory) {
     this.platform = platform
-    this.accessory = accessory
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
     const lmService = accessory.getService(this.Service.LockMechanism) || accessory.addService(this.Service.LockMechanism)
     lmService
       .getCharacteristic(this.Characteristic.LockTargetState)
       .on('set', (value, callback) => this.internalUpdate(value, callback))
+    this.accessory = accessory
   }
 
   async internalUpdate (value, callback) {
diff --git a/lib/device/outlet.js b/lib/device/outlet.js
index 9330cf65..ae80e022 100644
--- a/lib/device/outlet.js
+++ b/lib/device/outlet.js
@@ -8,7 +8,6 @@ const helpers = require('./../helpers')
 module.exports = class deviceOutlet {
   constructor (platform, accessory) {
     this.platform = platform
-    this.accessory = accessory
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
     this.EveCharacteristics = new hbLib.EveHomeKitTypes(platform.api).Characteristics
@@ -108,6 +107,7 @@ module.exports = class deviceOutlet {
           callback(null, accessory.context.lastReset)
         })
     }
+    this.accessory = accessory
   }
 
   async internalUpdate (value, callback) {
diff --git a/lib/device/rf-bridge.js b/lib/device/rf-bridge.js
index fe821fbb..9270cd89 100644
--- a/lib/device/rf-bridge.js
+++ b/lib/device/rf-bridge.js
@@ -5,7 +5,6 @@ const helpers = require('./../helpers')
 module.exports = class deviceRFBridge {
   constructor (platform, accessory) {
     this.platform = platform
-    this.accessory = accessory
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
     switch (accessory.context.subType) {
@@ -40,6 +39,7 @@ module.exports = class deviceRFBridge {
         })
         break
     }
+    this.accessory = accessory
   }
 
   async internalUpdate (rfChl, service, value, callback) {
diff --git a/lib/device/scm.js b/lib/device/scm.js
index 9c7d809d..961b1b83 100644
--- a/lib/device/scm.js
+++ b/lib/device/scm.js
@@ -5,13 +5,13 @@ const helpers = require('./../helpers')
 module.exports = class deviceSCM {
   constructor (platform, accessory) {
     this.platform = platform
-    this.accessory = accessory
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
     const scmService = accessory.getService(this.Service.Switch) || accessory.addService(this.Service.Switch)
     scmService
       .getCharacteristic(this.Characteristic.On)
       .on('set', (value, callback) => this.internalUpdate(value, callback))
+    this.accessory = accessory
   }
 
   async internalUpdate (value, callback) {
diff --git a/lib/device/sensor.js b/lib/device/sensor.js
index 488de3e5..ee5ae854 100644
--- a/lib/device/sensor.js
+++ b/lib/device/sensor.js
@@ -5,11 +5,11 @@ const helpers = require('./../helpers')
 module.exports = class deviceSensor {
   constructor (platform, accessory) {
     this.platform = platform
-    this.accessory = accessory
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
     if (!accessory.getService(this.Service.ContactSensor)) accessory.addService(this.Service.ContactSensor)
     if (!accessory.getService(this.Service.BatteryService)) accessory.addService(this.Service.BatteryService)
+    this.accessory = accessory
   }
 
   async externalUpdate (params) {
diff --git a/lib/device/switch.js b/lib/device/switch.js
index a18c6fea..9cea49b7 100644
--- a/lib/device/switch.js
+++ b/lib/device/switch.js
@@ -5,13 +5,13 @@ const helpers = require('./../helpers')
 module.exports = class deviceSwitch {
   constructor (platform, accessory) {
     this.platform = platform
-    this.accessory = accessory
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
     const switchService = accessory.getService(this.Service.Switch) || accessory.addService(this.Service.Switch)
     switchService
       .getCharacteristic(this.Characteristic.On)
       .on('set', (value, callback) => this.internalUpdate(value, callback))
+    this.accessory = accessory
   }
 
   async internalUpdate (value, callback) {
diff --git a/lib/device/thermostat.js b/lib/device/thermostat.js
index bea10d51..eed8ccba 100644
--- a/lib/device/thermostat.js
+++ b/lib/device/thermostat.js
@@ -7,7 +7,6 @@ const helpers = require('./../helpers')
 module.exports = class deviceThermostat {
   constructor (platform, accessory) {
     this.platform = platform
-    this.accessory = accessory
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
     this.EveHistoryService = fakegato(platform.api)
@@ -40,6 +39,7 @@ module.exports = class deviceThermostat {
         accessory.eveLogger.addEntry(dataToAdd)
       }, 300000)
     }
+    this.accessory = accessory
   }
 
   async internalUpdate (value, callback) {
diff --git a/lib/device/usb.js b/lib/device/usb.js
index 9274407d..695d0391 100644
--- a/lib/device/usb.js
+++ b/lib/device/usb.js
@@ -5,13 +5,13 @@ const helpers = require('./../helpers')
 module.exports = class deviceUSB {
   constructor (platform, accessory) {
     this.platform = platform
-    this.accessory = accessory
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
     const usbService = accessory.getService(this.Service.Outlet) || accessory.addService(this.Service.Outlet)
     usbService
       .getCharacteristic(this.Characteristic.On)
       .on('set', (value, callback) => this.internalUpdate(value, callback))
+    this.accessory = accessory
   }
 
   async internalUpdate (value, callback) {
diff --git a/lib/device/valve.js b/lib/device/valve.js
index a1ff0f05..d5993430 100644
--- a/lib/device/valve.js
+++ b/lib/device/valve.js
@@ -5,7 +5,6 @@ const helpers = require('./../helpers')
 module.exports = class deviceValve {
   constructor (platform, accessory) {
     this.platform = platform
-    this.accessory = accessory
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
     ;['A', 'B'].forEach(v => {
@@ -37,6 +36,7 @@ module.exports = class deviceValve {
           callback()
         })
     })
+    this.accessory = accessory
   }
 
   async internalUpdate (valve, value, callback) {
diff --git a/lib/device/zb-dev.js b/lib/device/zb-dev.js
index bbd171ad..bda0352e 100644
--- a/lib/device/zb-dev.js
+++ b/lib/device/zb-dev.js
@@ -7,7 +7,6 @@ const helpers = require('./../helpers')
 module.exports = class deviceZBDev {
   constructor (platform, accessory) {
     this.platform = platform
-    this.accessory = accessory
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
     this.EveHistoryService = fakegato(platform.api)
@@ -54,6 +53,7 @@ module.exports = class deviceZBDev {
         if (!accessory.getService(this.Service.ContactSensor)) accessory.addService(this.Service.ContactSensor)
         break
     }
+    this.accessory = accessory
   }
 
   async externalUpdate (params) {

From 122ee3e38e4fe4b902bfdd54549212756b400b17 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 15 Oct 2020 13:57:29 +0100
Subject: [PATCH 0481/3183] 3.6.1-1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index bc68f03f..52248ae4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.6.1-0",
+  "version": "3.6.1-1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 91e99bb0..a2511d6b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.6.1-0",
+  "version": "3.6.1-1",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 2410609334d68bade5d1de59cb1e0bf0fa2c4e70 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 15 Oct 2020 15:28:07 +0100
Subject: [PATCH 0482/3183] master switch hide

---
 lib/ewelink-platform.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/ewelink-platform.js b/lib/ewelink-platform.js
index 54c9aef1..6e14c89e 100644
--- a/lib/ewelink-platform.js
+++ b/lib/ewelink-platform.js
@@ -287,7 +287,7 @@ module.exports = class eWeLinkPlatform {
         /*********************
         LIGHTS [MULTI CHANNEL]
         *********************/
-        if ((this.config.hideChanFromHB || '').split(',').includes(device.deviceid)) {
+        if ((this.config.hideChanFromHB || '').split(',').includes(device.deviceid + 'SW0')) {
           if (this.devicesInHB.has(device.deviceid + 'SW0')) {
             this.removeAccessory(this.devicesInHB.get(device.deviceid + 'SW0'))
           }
@@ -332,7 +332,7 @@ module.exports = class eWeLinkPlatform {
         /***********************
         SWITCHES [MULTI CHANNEL]
         ***********************/
-        if ((this.config.hideChanFromHB || '').split(',').includes(device.deviceid)) {
+        if ((this.config.hideChanFromHB || '').split(',').includes(device.deviceid + 'SW0')) {
           if (this.devicesInHB.has(device.deviceid + 'SW0')) {
             this.removeAccessory(this.devicesInHB.get(device.deviceid + 'SW0'))
           }

From 52f90f4ed6b607eea374e5fd67de0bab6b51987f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 15 Oct 2020 15:28:58 +0100
Subject: [PATCH 0483/3183] 3.6.1-2

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 52248ae4..b60b8144 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.6.1-1",
+  "version": "3.6.1-2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index a2511d6b..6d138e57 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.6.1-1",
+  "version": "3.6.1-2",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 441917f076ab68b8c18deb0d1c0bc8b538f56bc0 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 15 Oct 2020 15:34:58 +0100
Subject: [PATCH 0484/3183] Update ewelink-platform.js

---
 lib/ewelink-platform.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ewelink-platform.js b/lib/ewelink-platform.js
index 6e14c89e..39833c3e 100644
--- a/lib/ewelink-platform.js
+++ b/lib/ewelink-platform.js
@@ -51,7 +51,7 @@ module.exports = class eWeLinkPlatform {
     this.config.nameOverride = this.nameOverrideTmp
     this.config.ipOverride = this.ipOverrideTmp
     //* ** UPGRADE **\\
-    this.config.hideChanFromHB += this.config.hideMasters + ',' + this.config.hideFromHB
+    this.config.hideChanFromHB += ',' + this.config.hideMasters + ',' + this.config.hideFromHB
     //* *************\\
     this.api
       .on('didFinishLaunching', () => this.eWeLinkSetup())

From 31d342ecc69a63191d08d058f1058ec97159f7e7 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 15 Oct 2020 15:36:03 +0100
Subject: [PATCH 0485/3183] 3.6.1-3

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b60b8144..3efa271b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.6.1-2",
+  "version": "3.6.1-3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 6d138e57..9c7b027d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.6.1-2",
+  "version": "3.6.1-3",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 30e2188f9083e75081b1ce8ec99cde1fd6e13a2b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 15 Oct 2020 15:39:21 +0100
Subject: [PATCH 0486/3183] 3.6.1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 3efa271b..badac319 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.6.1-3",
+  "version": "3.6.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 9c7b027d..ea4bf74c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.6.1-3",
+  "version": "3.6.1",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From d9a99940f5743e21a8e67599832001658727e06e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 16 Oct 2020 07:44:51 +0100
Subject: [PATCH 0487/3183] update wsp dep

---
 package-lock.json | 10 +++++-----
 package.json      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index badac319..b046aa00 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -672,13 +672,13 @@
       "integrity": "sha512-FOmRr+FmWEIG8uhZv6C2bTgEVXsHk08kE7mPlrBbEe+c3r9pjceVPgupIfNIhc4yx55H69OXANrUaSuu9eInKg=="
     },
     "websocket-as-promised": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/websocket-as-promised/-/websocket-as-promised-1.0.1.tgz",
-      "integrity": "sha512-+gBevna4yxisb8cigL8NxcS8s241cvfMeyy1fNFcFgBcX/6vknMT84MwMmBNLYmsYH2giVoxOSEiAeeb7txFOw==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/websocket-as-promised/-/websocket-as-promised-1.1.0.tgz",
+      "integrity": "sha512-agq8bPsPFKBWinKQkoXwY7LoBYe+2fQ7Gnuxx964+BTIiyAdL130FnB60bXuVQdUCdaS17R/MyRaaO4WIqtl4Q==",
       "requires": {
-        "chnl": "^1.0.0",
+        "chnl": "^1.2.0",
         "promise-controller": "^1.0.0",
-        "promise.prototype.finally": "^3.1.1"
+        "promise.prototype.finally": "^3.1.2"
       }
     },
     "ws": {
diff --git a/package.json b/package.json
index ea4bf74c..9fdbb103 100644
--- a/package.json
+++ b/package.json
@@ -72,7 +72,7 @@
     "homebridge-lib": "4.7.16",
     "interval-promise": "1.4.0",
     "node-dns-sd": "0.4.2",
-    "websocket-as-promised": "1.0.1",
+    "websocket-as-promised": "1.1.0",
     "ws": "7.3.1"
   }
 }

From d8a30f98c7bea1405d47ba06ab70623fb8e9eb58 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 16 Oct 2020 07:45:03 +0100
Subject: [PATCH 0488/3183] add reason for ws closure

---
 lib/ewelink-ws.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ewelink-ws.js b/lib/ewelink-ws.js
index 04f4a0d4..d49f5d0f 100644
--- a/lib/ewelink-ws.js
+++ b/lib/ewelink-ws.js
@@ -260,7 +260,7 @@ module.exports = class eWeLinkWS {
 
   async closeConnection () {
     if (this.wsp && this.wsIsOpen) {
-      await this.wsp.close()
+      await this.wsp.close(1005, 'Normal Closure')
       if (this.debug) this.log('Web socket gracefully closed.')
     }
   }

From 5d7a19680b44e4164b0e0d6c8c1871e05dc01ae0 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 16 Oct 2020 12:09:05 +0100
Subject: [PATCH 0489/3183] identify

---
 lib/ewelink-platform.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/ewelink-platform.js b/lib/ewelink-platform.js
index 39833c3e..c785b80e 100644
--- a/lib/ewelink-platform.js
+++ b/lib/ewelink-platform.js
@@ -512,7 +512,10 @@ module.exports = class eWeLinkPlatform {
           .setCharacteristic(this.Characteristic.Manufacturer, device.brandName)
           .setCharacteristic(this.Characteristic.Model, device.productModel + ' (' + device.extra.model + ')')
           .setCharacteristic(this.Characteristic.FirmwareRevision, device.params.fwVersion)
-          .setCharacteristic(this.Characteristic.Identify, false)
+        accessory.on('identify', (paired, callback) => {
+          this.log('[%s] - identify button pressed.', accessory.displayName)
+          callback()
+        })
       }
       accessory.context = {
         ...{

From 2f638f6442438203f6394c5662ca531c07ba4845 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 16 Oct 2020 12:34:21 +0100
Subject: [PATCH 0490/3183] identify better

---
 lib/ewelink-platform.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/ewelink-platform.js b/lib/ewelink-platform.js
index c785b80e..40740666 100644
--- a/lib/ewelink-platform.js
+++ b/lib/ewelink-platform.js
@@ -512,6 +512,7 @@ module.exports = class eWeLinkPlatform {
           .setCharacteristic(this.Characteristic.Manufacturer, device.brandName)
           .setCharacteristic(this.Characteristic.Model, device.productModel + ' (' + device.extra.model + ')')
           .setCharacteristic(this.Characteristic.FirmwareRevision, device.params.fwVersion)
+          .setCharacteristic(this.Characteristic.Identify, true)
         accessory.on('identify', (paired, callback) => {
           this.log('[%s] - identify button pressed.', accessory.displayName)
           callback()

From bb3fcdf050bc5ff86236243acf304a74ca8ed907 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 16 Oct 2020 13:36:18 +0100
Subject: [PATCH 0491/3183] Update ewelink-ws.js

---
 lib/ewelink-ws.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ewelink-ws.js b/lib/ewelink-ws.js
index d49f5d0f..04f4a0d4 100644
--- a/lib/ewelink-ws.js
+++ b/lib/ewelink-ws.js
@@ -260,7 +260,7 @@ module.exports = class eWeLinkWS {
 
   async closeConnection () {
     if (this.wsp && this.wsIsOpen) {
-      await this.wsp.close(1005, 'Normal Closure')
+      await this.wsp.close()
       if (this.debug) this.log('Web socket gracefully closed.')
     }
   }

From b2d21b612aadc813dc4764c59059e729259d9d8f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 16 Oct 2020 13:40:42 +0100
Subject: [PATCH 0492/3183] lower case

---
 lib/ewelink-platform.js | 90 ++++++++++++++++++++---------------------
 1 file changed, 45 insertions(+), 45 deletions(-)

diff --git a/lib/ewelink-platform.js b/lib/ewelink-platform.js
index 40740666..13dba7ba 100644
--- a/lib/ewelink-platform.js
+++ b/lib/ewelink-platform.js
@@ -1,26 +1,26 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
-const DeviceCurtain = require('./device/curtain')
-const DeviceBlind = require('./device/blind')
-const DeviceGarage = require('./device/garage')
-const DeviceGarageTwo = require('./device/garage-two')
-const DeviceGarageEachen = require('./device/garage-eachen')
-const DeviceLock = require('./device/lock')
-const DeviceValve = require('./device/valve')
-const DeviceSensor = require('./device/sensor')
-const DeviceFan = require('./device/fan')
-const DeviceThermostat = require('./device/thermostat')
-const DeviceOutlet = require('./device/outlet')
-const DeviceUSB = require('./device/usb')
-const DeviceSCM = require('./device/scm')
-const DeviceLight = require('./device/light')
-const DeviceSwitch = require('./device/switch')
-const DeviceRFBridge = require('./device/rf-bridge')
-const DeviceZBDev = require('./device/zb-dev')
-const EWeLinkHTTP = require('./ewelink-http')
-const EWeLinkLAN = require('./ewelink-lan')
-const EWeLinkWS = require('./ewelink-ws')
+const deviceCurtain = require('./device/curtain')
+const deviceBlind = require('./device/blind')
+const deviceGarage = require('./device/garage')
+const deviceGarageTwo = require('./device/garage-two')
+const deviceGarageEachen = require('./device/garage-eachen')
+const deviceLock = require('./device/lock')
+const deviceValve = require('./device/valve')
+const deviceSensor = require('./device/sensor')
+const deviceFan = require('./device/fan')
+const deviceThermostat = require('./device/thermostat')
+const deviceOutlet = require('./device/outlet')
+const deviceUSB = require('./device/usb')
+const deviceSCM = require('./device/scm')
+const deviceLight = require('./device/light')
+const deviceSwitch = require('./device/switch')
+const deviceRFBridge = require('./device/rf-bridge')
+const deviceZBDev = require('./device/zb-dev')
+const eWeLinkHTTP = require('./ewelink-http')
+const eWeLinkLAN = require('./ewelink-lan')
+const eWeLinkWS = require('./ewelink-ws')
 const helpers = require('./helpers')
 const promInterval = require('interval-promise')
 module.exports = class eWeLinkPlatform {
@@ -67,13 +67,13 @@ module.exports = class eWeLinkPlatform {
         return
       }
       this.log('Plugin has finished initialising. Syncing with eWeLink.')
-      this.httpClient = new EWeLinkHTTP(this.config, this.log)
+      this.httpClient = new eWeLinkHTTP(this.config, this.log)
       await this.httpClient.getHost()
       this.authData = await this.httpClient.login()
       const deviceList = await this.httpClient.getDevices()
       deviceList.forEach(device => this.devicesInEW.set(device.deviceid, device))
-      this.wsClient = new EWeLinkWS(this.config, this.log, this.authData)
-      this.lanClient = new EWeLinkLAN(this.config, this.log, deviceList)
+      this.wsClient = new eWeLinkWS(this.config, this.log, this.authData)
+      this.lanClient = new eWeLinkLAN(this.config, this.log, deviceList)
       await this.wsClient.getHost()
       this.wsClient.login()
       this.lanDevices = await this.lanClient.getHosts()
@@ -162,7 +162,7 @@ module.exports = class eWeLinkPlatform {
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
           : this.addAccessory(device, device.deviceid + 'SWX', false, helpers.defaultCurtainCache)
-        accessory.control = new DeviceCurtain(this, accessory)
+        accessory.control = new deviceCurtain(this, accessory)
         /**********************/
       } else if (this.cusG.has(device.deviceid + 'SWX') && this.cusG.get(device.deviceid + 'SWX').type === 'blind') {
         /****************************
@@ -171,7 +171,7 @@ module.exports = class eWeLinkPlatform {
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
           : this.addAccessory(device, device.deviceid + 'SWX', false, helpers.defaultBlindCache)
-        accessory.control = new DeviceBlind(this, accessory)
+        accessory.control = new deviceBlind(this, accessory)
         /***************************/
       } else if (this.cusG.has(device.deviceid + 'SWX') && this.cusG.get(device.deviceid + 'SWX').type === 'garage') {
         /**********************************
@@ -180,7 +180,7 @@ module.exports = class eWeLinkPlatform {
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
           : this.addAccessory(device, device.deviceid + 'SWX', false, helpers.defaultGarageCache)
-        accessory.control = new DeviceGarage(this, accessory)
+        accessory.control = new deviceGarage(this, accessory)
         /*********************************/
       } else if (this.cusG.has(device.deviceid + 'SWX') && this.cusG.get(device.deviceid + 'SWX').type === 'garage_two') {
         /**********************************
@@ -189,7 +189,7 @@ module.exports = class eWeLinkPlatform {
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
           : this.addAccessory(device, device.deviceid + 'SWX', false, helpers.defaultGarageTwoCache)
-        accessory.control = new DeviceGarageTwo(this, accessory)
+        accessory.control = new deviceGarageTwo(this, accessory)
         /*********************************/
       } else if (this.cusG.has(device.deviceid + 'SWX') && this.cusG.get(device.deviceid + 'SWX').type === 'garage_eachen') {
         /***************************
@@ -198,7 +198,7 @@ module.exports = class eWeLinkPlatform {
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
           : this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new DeviceGarageEachen(this, accessory)
+        accessory.control = new deviceGarageEachen(this, accessory)
         /**************************/
       } else if (this.cusG.has(device.deviceid + 'SWX') && this.cusG.get(device.deviceid + 'SWX').type === 'lock') {
         /***************************
@@ -207,7 +207,7 @@ module.exports = class eWeLinkPlatform {
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
           : this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new DeviceLock(this, accessory)
+        accessory.control = new deviceLock(this, accessory)
         /**************************/
       } else if (this.cusG.has(device.deviceid + 'SWX') && this.cusG.get(device.deviceid + 'SWX').type === 'valve') {
         /****************************
@@ -216,7 +216,7 @@ module.exports = class eWeLinkPlatform {
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
           : this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new DeviceValve(this, accessory)
+        accessory.control = new deviceValve(this, accessory)
         /***************************/
       } else if (helpers.devicesSensor.includes(device.extra.uiid)) {
         /*******************
@@ -225,7 +225,7 @@ module.exports = class eWeLinkPlatform {
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
           : this.addAccessory(device, device.deviceid + 'SWX', false, { type: 'sensor' })
-        accessory.control = new DeviceSensor(this, accessory)
+        accessory.control = new deviceSensor(this, accessory)
         /******************/
       } else if (helpers.devicesFan.includes(device.extra.uiid)) {
         /***
@@ -234,7 +234,7 @@ module.exports = class eWeLinkPlatform {
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
           : this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new DeviceFan(this, accessory)
+        accessory.control = new deviceFan(this, accessory)
         /**/
       } else if (helpers.devicesThermostat.includes(device.extra.uiid)) {
         /**********
@@ -245,7 +245,7 @@ module.exports = class eWeLinkPlatform {
           : this.addAccessory(device, device.deviceid + 'SWX', false, {
             sensorType: device.params.sensorType
           })
-        accessory.control = new DeviceThermostat(this, accessory)
+        accessory.control = new deviceThermostat(this, accessory)
         /*********/
       } else if (helpers.devicesOutlet.includes(device.extra.uiid) || (helpers.devicesSingleSwitch.includes(device.extra.uiid) && helpers.devicesSingleSwitchOutlet.includes(device.productModel))) {
         /******
@@ -254,7 +254,7 @@ module.exports = class eWeLinkPlatform {
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
           : this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new DeviceOutlet(this, accessory)
+        accessory.control = new deviceOutlet(this, accessory)
         /*****/
       } else if (helpers.devicesUSB.includes(device.extra.uiid)) {
         /**********
@@ -263,7 +263,7 @@ module.exports = class eWeLinkPlatform {
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
           : this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new DeviceUSB(this, accessory)
+        accessory.control = new deviceUSB(this, accessory)
         /*********/
       } else if (helpers.devicesSCM.includes(device.extra.uiid)) {
         /*********************************
@@ -272,7 +272,7 @@ module.exports = class eWeLinkPlatform {
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
           : this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new DeviceSCM(this, accessory)
+        accessory.control = new deviceSCM(this, accessory)
         /********************************/
       } else if (helpers.devicesSingleSwitch.includes(device.extra.uiid) && helpers.devicesSingleSwitchLight.includes(device.productModel)) {
         /**********************
@@ -281,7 +281,7 @@ module.exports = class eWeLinkPlatform {
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
           : this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new DeviceLight(this, accessory)
+        accessory.control = new deviceLight(this, accessory)
         /*********************/
       } else if (helpers.devicesMultiSwitch.includes(device.extra.uiid) && helpers.devicesMultiSwitchLight.includes(device.productModel)) {
         /*********************
@@ -298,7 +298,7 @@ module.exports = class eWeLinkPlatform {
             ? this.devicesInHB.get(device.deviceid + 'SW0')
             : this.addAccessory(device, device.deviceid + 'SW0')
         }
-        accessory.control = new DeviceLight(this, accessory)
+        accessory.control = new deviceLight(this, accessory)
         for (let i = 1; i <= helpers.chansFromUiid[device.extra.uiid]; i++) {
           if ((this.config.hideChanFromHB || '').split(',').includes(device.deviceid + 'SW' + i)) {
             if (this.devicesInHB.has(device.deviceid + 'SW' + i)) {
@@ -316,7 +316,7 @@ module.exports = class eWeLinkPlatform {
           oAccessory.context.reachableWAN = device.online
           oAccessory.context.reachableLAN = this.lanDevices.get(device.deviceid).online || false
           this.devicesInHB.set(oAccessory.context.hbDeviceId, oAccessory)
-          oAccessory.control = new DeviceLight(this, oAccessory)
+          oAccessory.control = new deviceLight(this, oAccessory)
         }
         /********************/
       } else if (helpers.devicesSingleSwitch.includes(device.extra.uiid)) {
@@ -326,7 +326,7 @@ module.exports = class eWeLinkPlatform {
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
           : this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new DeviceSwitch(this, accessory)
+        accessory.control = new deviceSwitch(this, accessory)
         /***********************/
       } else if (helpers.devicesMultiSwitch.includes(device.extra.uiid)) {
         /***********************
@@ -343,7 +343,7 @@ module.exports = class eWeLinkPlatform {
             ? this.devicesInHB.get(device.deviceid + 'SW0')
             : this.addAccessory(device, device.deviceid + 'SW0')
         }
-        accessory.control = new DeviceSwitch(this, accessory)
+        accessory.control = new deviceSwitch(this, accessory)
         for (let i = 1; i <= helpers.chansFromUiid[device.extra.uiid]; i++) {
           if ((this.config.hideChanFromHB || '').split(',').includes(device.deviceid + 'SW' + i)) {
             if (this.devicesInHB.has(device.deviceid + 'SW' + i)) {
@@ -361,7 +361,7 @@ module.exports = class eWeLinkPlatform {
           oAccessory.context.reachableWAN = device.online
           oAccessory.context.reachableLAN = this.lanDevices.get(device.deviceid).online || false
           this.devicesInHB.set(oAccessory.context.hbDeviceId, oAccessory)
-          oAccessory.control = new DeviceSwitch(this, oAccessory)
+          oAccessory.control = new deviceSwitch(this, oAccessory)
         }
         /**********************/
       } else if (helpers.devicesRFBridge.includes(device.extra.uiid)) {
@@ -384,7 +384,7 @@ module.exports = class eWeLinkPlatform {
           : this.addAccessory(device, device.deviceid + 'SW0', true, {
             rfMap
           }, 'rf_pri')
-        accessory.control = new DeviceRFBridge(this, accessory)
+        accessory.control = new deviceRFBridge(this, accessory)
         this.hiddenMasters.push(device.deviceid)
         rfMap.forEach(subDevice => {
           const swNumber = rfChlCounter + 1
@@ -418,7 +418,7 @@ module.exports = class eWeLinkPlatform {
           oAccessory.context.reachableWAN = device.online
           oAccessory.context.reachableLAN = false
           this.devicesInHB.set(oAccessory.context.hbDeviceId, oAccessory)
-          oAccessory.control = new DeviceRFBridge(this, oAccessory)
+          oAccessory.control = new deviceRFBridge(this, oAccessory)
           rfChlCounter += Object.keys(subDevice.buttons || {}).length
         })
         accessory.context.channelCount = rfChlCounter
@@ -440,7 +440,7 @@ module.exports = class eWeLinkPlatform {
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
           : this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new DeviceZBDev(this, accessory)
+        accessory.control = new deviceZBDev(this, accessory)
         /***************/
       } else if (helpers.devicesCamera.includes(device.extra.uiid)) {
         /******

From ddd53f34e2a40362d5220c27f5b53b23437752f6 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 16 Oct 2020 13:41:44 +0100
Subject: [PATCH 0493/3183] 3.6.2-0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b046aa00..34b8bf76 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.6.1",
+  "version": "3.6.2-0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 9fdbb103..996c9e66 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.6.1",
+  "version": "3.6.2-0",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From aef497db1aebcdd90f556cdf66fc9b9ef21b27c1 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 16 Oct 2020 13:46:28 +0100
Subject: [PATCH 0494/3183] Update index.js

---
 index.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/index.js b/index.js
index 11038152..731ea97a 100644
--- a/index.js
+++ b/index.js
@@ -2,6 +2,4 @@
 /* eslint-disable new-cap */
 'use strict'
 const eWeLinkPlatform = require('./lib/ewelink-platform.js')
-module.exports = (hb) => {
-  hb.registerPlatform('homebridge-ewelink', 'eWeLink', eWeLinkPlatform, true)
-}
+module.exports = hb => hb.registerPlatform('eWeLink', eWeLinkPlatform)

From 1b0b8ae5056a6517fbc554c8b8adfbfd62a077d8 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 16 Oct 2020 15:39:50 +0100
Subject: [PATCH 0495/3183] ignore duplicate lan messages

---
 lib/ewelink-lan.js | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/lib/ewelink-lan.js b/lib/ewelink-lan.js
index 41810271..36e09c25 100644
--- a/lib/ewelink-lan.js
+++ b/lib/ewelink-lan.js
@@ -15,11 +15,13 @@ module.exports = class eWeLinkLAN {
     this.emitter = new eventEmitter()
     this.devices = devices
     this.deviceMap = new Map()
+    this.lastIV = null
     devices.forEach(device => {
       this.deviceMap.set(device.deviceid, {
         apiKey: device.devicekey,
         online: helpers.hasProperty(this.config.ipOverride, device.deviceid),
-        ip: helpers.hasProperty(this.config.ipOverride, device.deviceid) ? this.config.ipOverride[device.deviceid] : null
+        ip: helpers.hasProperty(this.config.ipOverride, device.deviceid) ? this.config.ipOverride[device.deviceid] : null,
+        lastIV: null
       })
     })
   }
@@ -34,7 +36,8 @@ module.exports = class eWeLinkLAN {
           this.deviceMap.set(deviceId, {
             apiKey: d.apiKey,
             online: true,
-            ip: device.address
+            ip: device.address,
+            lastIV: null
           })
         }
       }
@@ -52,6 +55,8 @@ module.exports = class eWeLinkLAN {
           .forEach(value => {
             const rdata = value.rdata
             const deviceInfo = this.deviceMap.get(rdata.id)
+            if (deviceInfo.lastIV === rdata.iv) return
+            deviceInfo.lastIV = rdata.iv
             const data =
               rdata.data1 +
               (helpers.hasProperty(rdata, 'data2') ? rdata.data2 : '') +
@@ -65,7 +70,8 @@ module.exports = class eWeLinkLAN {
               this.deviceMap.set(rdata.id, {
                 apiKey: deviceInfo.apiKey,
                 online: true,
-                ip: packet.address
+                ip: packet.address,
+                lastIV: rdata.iv
               })
               if (this.debug) this.log.warn('[%s] updating IP address to [%s].', rdata.id, packet.address)
             }
@@ -167,7 +173,8 @@ module.exports = class eWeLinkLAN {
     this.deviceMap.set(device.deviceid, {
       apiKey: device.devicekey,
       online: helpers.hasProperty(this.config.ipOverride, device.deviceid),
-      ip: helpers.hasProperty(this.config.ipOverride, device.deviceid) ? this.config.ipOverride[device.deviceid] : null
+      ip: helpers.hasProperty(this.config.ipOverride, device.deviceid) ? this.config.ipOverride[device.deviceid] : null,
+      lastIV: null
     })
   }
 

From ade6c9620aac485ab131e565448c30e75084e3ee Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 16 Oct 2020 15:46:51 +0100
Subject: [PATCH 0496/3183] unused var

---
 lib/ewelink-lan.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/ewelink-lan.js b/lib/ewelink-lan.js
index 36e09c25..e8e85045 100644
--- a/lib/ewelink-lan.js
+++ b/lib/ewelink-lan.js
@@ -15,7 +15,6 @@ module.exports = class eWeLinkLAN {
     this.emitter = new eventEmitter()
     this.devices = devices
     this.deviceMap = new Map()
-    this.lastIV = null
     devices.forEach(device => {
       this.deviceMap.set(device.deviceid, {
         apiKey: device.devicekey,

From aa6cde86b3ba47f70cf32c892a7cf38ee54078f2 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 16 Oct 2020 15:47:25 +0100
Subject: [PATCH 0497/3183] 3.6.2-1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 34b8bf76..b2ebd78c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.6.2-0",
+  "version": "3.6.2-1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 996c9e66..3d17955c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.6.2-0",
+  "version": "3.6.2-1",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 8d218e449fa814995ec9cf7e23f4fb75e74d88c2 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 17 Oct 2020 13:00:11 +0100
Subject: [PATCH 0498/3183] garage_four skeleton

---
 config.schema.json      |  6 ++++++
 lib/ewelink-platform.js | 10 ++++++++++
 lib/helpers.js          |  2 +-
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/config.schema.json b/config.schema.json
index e34e5776..509820c8 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -167,6 +167,12 @@
                     "garage_two"
                   ]
                 },
+                {
+                  "title": "4 Garage Doors (using multi-channel device)",
+                  "enum": [
+                    "garage_four"
+                  ]
+                },
                 {
                   "title": "1 Garage Door (using Eachen GD-DC5)",
                   "enum": [
diff --git a/lib/ewelink-platform.js b/lib/ewelink-platform.js
index 13dba7ba..29e1bef8 100644
--- a/lib/ewelink-platform.js
+++ b/lib/ewelink-platform.js
@@ -5,6 +5,7 @@ const deviceCurtain = require('./device/curtain')
 const deviceBlind = require('./device/blind')
 const deviceGarage = require('./device/garage')
 const deviceGarageTwo = require('./device/garage-two')
+const deviceGarageFour = require('./device/garage-four')
 const deviceGarageEachen = require('./device/garage-eachen')
 const deviceLock = require('./device/lock')
 const deviceValve = require('./device/valve')
@@ -191,6 +192,15 @@ module.exports = class eWeLinkPlatform {
           : this.addAccessory(device, device.deviceid + 'SWX', false, helpers.defaultGarageTwoCache)
         accessory.control = new deviceGarageTwo(this, accessory)
         /*********************************/
+      } else if (this.cusG.has(device.deviceid + 'SWX') && this.cusG.get(device.deviceid + 'SWX').type === 'garage_four') {
+        /**********************************
+        GARAGE DOORS [FOUR] [ACCESSORY SIMULATION]
+        **********************************/
+        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
+          ? this.devicesInHB.get(device.deviceid + 'SWX')
+          : this.addAccessory(device, device.deviceid + 'SWX')
+        accessory.control = new deviceGarageFour(this, accessory)
+        /*********************************/
       } else if (this.cusG.has(device.deviceid + 'SWX') && this.cusG.get(device.deviceid + 'SWX').type === 'garage_eachen') {
         /***************************
         GARAGE DOORS [EACHEN GD-DC5]
diff --git a/lib/helpers.js b/lib/helpers.js
index b88b9be5..fc9abbf3 100644
--- a/lib/helpers.js
+++ b/lib/helpers.js
@@ -11,7 +11,7 @@ module.exports = {
   appId: 'oeVkj2lYFGnJu5XUtWisfW4utiN4u9Mq',
   appSecret: '6Nz4n0xA8s8qdxQf2GqurZj2Fs55FUvM',
   httpRetryCodes: ['ENOTFOUND', 'ETIMEDOUT', 'EAI_AGAIN'],
-  allowedGroups: ['blind', 'garage', 'garage_two', 'garage_eachen', 'lock', 'valve'],
+  allowedGroups: ['blind', 'garage', 'garage_two', 'garage_four' 'garage_eachen', 'lock', 'valve'],
   devicesHideable: ['switch', 'light'],
   devicesNonLAN: [22, 28, 34, 59, 102],
   devicesSingleSwitch: [1, 5, 6, 14, 15, 22, 24, 27, 32, 36, 44, 59],

From 94c1105c15ccd6936b67cdb5b78cf8860e7d23e2 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 17 Oct 2020 13:00:23 +0100
Subject: [PATCH 0499/3183] garage_four internalUpdate 1

---
 lib/device/garage-four.js | 80 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 80 insertions(+)
 create mode 100644 lib/device/garage-four.js

diff --git a/lib/device/garage-four.js b/lib/device/garage-four.js
new file mode 100644
index 00000000..85c427a9
--- /dev/null
+++ b/lib/device/garage-four.js
@@ -0,0 +1,80 @@
+/* jshint -W014, -W033, esversion: 9 */
+/* eslint-disable new-cap */
+'use strict'
+const helpers = require('./../helpers')
+module.exports = class deviceGarageFour {
+  constructor (platform, accessory) {
+    this.platform = platform
+    this.Service = platform.api.hap.Service
+    this.Characteristic = platform.api.hap.Characteristic
+    ;['1', '2', '3', '4'].forEach(v => {
+      let gdService
+      if (!(gdService = accessory.getService('Garage ' + v))) {
+        accessory
+          .addService(this.Service.GarageDoorOpener, 'Garage ' + v, 'garage' + v)
+          .setCharacteristic(this.Characteristic.CurrentDoorState, 1)
+          .setCharacteristic(this.Characteristic.TargetDoorState, 1)
+          .setCharacteristic(this.Characteristic.ObstructionDetected, false)
+        gdService = accessory.getService('Garage ' + v)
+      }
+      gdService
+        .getCharacteristic(this.Characteristic.TargetDoorState)
+        .on('set', (value, callback) => this.internalUpdate(v, value, callback))
+    })
+    this.accessory = accessory
+  }
+
+  async internalUpdate (garage, value, callback) {
+    callback()
+    try {
+      let garageConfig
+      if (!(garageConfig = this.platform.cusG.get(this.accessory.context.hbDeviceId))) {
+        throw new Error('group config missing')
+      }
+      if (garageConfig.type !== 'garage_four') {
+        throw new Error('improper configuration')
+      }
+      const params = { switches: this.accessory.context.switchState }
+      const gdService = this.accessory.getService('Garage ' + v)
+      if (value === gdService.getCharacteristic(this.Characteristic.CurrentDoorState).value % 2) return
+      params.switches[parseInt(garage) - 1].switch = value === 0 ? 'on' : 'off'
+      this.accessory.context.inUse = true
+      await this.platform.sendDeviceUpdate(this.accessory, params)
+      gdService
+        .updateCharacteristic(this.Characteristic.TargetDoorState, value)
+        .updateCharacteristic(this.Characteristic.CurrentDoorState, value + 2)
+      await helpers.sleep(2000)
+      this.accessory.context.inUse = false
+      if (value === 0) {
+        await helpers.sleep(Math.max((garageConfig.operationTime - 20) * 100, 0))
+        gdService.updateCharacteristic(this.Characteristic.CurrentDoorState, 0)
+      }
+    } catch (err) {
+      this.accessory.context.inUse = false
+      this.platform.deviceUpdateError(this.accessory, err, true)
+    }
+  }
+
+  async externalUpdate (params) {
+    try {
+      if (!helpers.hasProperty(params, 'switch') || this.accessory.context.inUse) return
+      let garageConfig
+      if (!(garageConfig = this.platform.cusG.get(this.accessory.context.hbDeviceId))) {
+        throw new Error('group config missing')
+      }
+      if (garageConfig.type !== 'garage_four') {
+        throw new Error('improper configuration')
+      }
+      this.accessory.context.switchState = params.switches
+      this.accessory.context.inUse = true
+      const gdService = this.accessory.getService(this.Service.GarageDoorOpener)
+      gdService
+        .updateCharacteristic(this.Characteristic.TargetDoorState, params.switch === 'on' ? 0 : 1)
+        .updateCharacteristic(this.Characteristic.CurrentDoorState, params.switch === 'on' ? 0 : 1)
+      this.accessory.context.inUse = false
+    } catch (err) {
+      this.accessory.context.inUse = false
+      this.platform.deviceUpdateError(this.accessory, err, false)
+    }
+  }
+}

From 68de82fe8b0213a5ad3b02db97e2dcd3f2724017 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 17 Oct 2020 13:01:40 +0100
Subject: [PATCH 0500/3183] syntax

---
 lib/helpers.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/helpers.js b/lib/helpers.js
index fc9abbf3..6f1bf1e0 100644
--- a/lib/helpers.js
+++ b/lib/helpers.js
@@ -11,7 +11,7 @@ module.exports = {
   appId: 'oeVkj2lYFGnJu5XUtWisfW4utiN4u9Mq',
   appSecret: '6Nz4n0xA8s8qdxQf2GqurZj2Fs55FUvM',
   httpRetryCodes: ['ENOTFOUND', 'ETIMEDOUT', 'EAI_AGAIN'],
-  allowedGroups: ['blind', 'garage', 'garage_two', 'garage_four' 'garage_eachen', 'lock', 'valve'],
+  allowedGroups: ['blind', 'garage', 'garage_two', 'garage_four', 'garage_eachen', 'lock', 'valve'],
   devicesHideable: ['switch', 'light'],
   devicesNonLAN: [22, 28, 34, 59, 102],
   devicesSingleSwitch: [1, 5, 6, 14, 15, 22, 24, 27, 32, 36, 44, 59],

From 66b506f715903dc952417e054d2884f1bafd4556 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 17 Oct 2020 13:01:51 +0100
Subject: [PATCH 0501/3183] v to garage

---
 lib/device/garage-four.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/device/garage-four.js b/lib/device/garage-four.js
index 85c427a9..652b0035 100644
--- a/lib/device/garage-four.js
+++ b/lib/device/garage-four.js
@@ -35,7 +35,7 @@ module.exports = class deviceGarageFour {
         throw new Error('improper configuration')
       }
       const params = { switches: this.accessory.context.switchState }
-      const gdService = this.accessory.getService('Garage ' + v)
+      const gdService = this.accessory.getService('Garage ' + garage)
       if (value === gdService.getCharacteristic(this.Characteristic.CurrentDoorState).value % 2) return
       params.switches[parseInt(garage) - 1].switch = value === 0 ? 'on' : 'off'
       this.accessory.context.inUse = true

From e8bf03d6ad075330ba015c448d883f630feada8c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 17 Oct 2020 13:04:17 +0100
Subject: [PATCH 0502/3183] 3.6.2

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b2ebd78c..fa87551d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.6.2-1",
+  "version": "3.6.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 3d17955c..c5216803 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.6.2-1",
+  "version": "3.6.2",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From eda3efbd1933d4a0671e9f8875ede5e6a7d23363 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 17 Oct 2020 13:59:59 +0100
Subject: [PATCH 0503/3183] garage-four internalUpdate 2

---
 lib/device/garage-four.js | 70 +++++++++++++++++++++++++--------------
 lib/helpers.js            | 18 ++++++++++
 2 files changed, 63 insertions(+), 25 deletions(-)

diff --git a/lib/device/garage-four.js b/lib/device/garage-four.js
index 652b0035..bc469859 100644
--- a/lib/device/garage-four.js
+++ b/lib/device/garage-four.js
@@ -7,7 +7,7 @@ module.exports = class deviceGarageFour {
     this.platform = platform
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
-    ;['1', '2', '3', '4'].forEach(v => {
+    ;['A', 'B', 'C', 'D'].forEach(v => {
       let gdService
       if (!(gdService = accessory.getService('Garage ' + v))) {
         accessory
@@ -34,21 +34,55 @@ module.exports = class deviceGarageFour {
       if (garageConfig.type !== 'garage_four') {
         throw new Error('improper configuration')
       }
-      const params = { switches: this.accessory.context.switchState }
+      let garageChannel
+      switch (garage) {
+        case 'A':
+          garageChannel = 0
+          break
+        case 'B':
+          garageChannel = 1
+          break
+        case 'C':
+          garageChannel = 2
+          break
+        case 'D':
+          garageChannel = 3
+          break
+      }
+      let sensorDefinition = garageConfig.sensorId || false
+      if (sensorDefinition) {
+        const sensors = garageConfig.sensorId.split(',')
+        sensorDefinition = sensors[garageChannel] || false
+      }
+      let sAccessory = false
+      if (sensorDefinition && !(sAccessory = this.platform.devicesInHB.get(garageConfig.sensorId + 'SWX'))) {
+        throw new Error("defined DW2 sensor doesn't exist")
+      }
+      if (sensorDefinition && sAccessory.context.type !== 'sensor') {
+        throw new Error("defined DW2 sensor isn't a sensor")
+      }
+      const prevState = sAccessory
+        ? sAccessory.getService(this.Service.ContactSensor).getCharacteristic(this.Characteristic.ContactSensorState).value === 0
+          ? 1
+          : 0
+        : this.accessory.context[garageChannel].cacheCurrentDoorState
+      if (value === prevState % 2) return
       const gdService = this.accessory.getService('Garage ' + garage)
-      if (value === gdService.getCharacteristic(this.Characteristic.CurrentDoorState).value % 2) return
-      params.switches[parseInt(garage) - 1].switch = value === 0 ? 'on' : 'off'
       this.accessory.context.inUse = true
-      await this.platform.sendDeviceUpdate(this.accessory, params)
       gdService
         .updateCharacteristic(this.Characteristic.TargetDoorState, value)
         .updateCharacteristic(this.Characteristic.CurrentDoorState, value + 2)
-      await helpers.sleep(2000)
-      this.accessory.context.inUse = false
-      if (value === 0) {
-        await helpers.sleep(Math.max((garageConfig.operationTime - 20) * 100, 0))
-        gdService.updateCharacteristic(this.Characteristic.CurrentDoorState, 0)
+      this.accessory.context[garageChannel].cacheTargetDoorState = value
+      this.accessory.context[garageChannel].cacheCurrentDoorState = value + 2
+      const params = { switches: helpers.defaultMultiSwitchOff }
+      params.switches[garageChannel].switch = 'on'
+      await this.platform.sendDeviceUpdate(this.accessory, params)
+      await helpers.sleep(Math.max(garageConfig.operationTime * 100, 1000))
+      if (!sAccessory) {
+        gdService.updateCharacteristic(this.Characteristic.CurrentDoorState, value)
+        this.accessory.context[garageChannel].cacheCurrentDoorState = value
       }
+      this.accessory.context.inUse = false
     } catch (err) {
       this.accessory.context.inUse = false
       this.platform.deviceUpdateError(this.accessory, err, true)
@@ -57,21 +91,7 @@ module.exports = class deviceGarageFour {
 
   async externalUpdate (params) {
     try {
-      if (!helpers.hasProperty(params, 'switch') || this.accessory.context.inUse) return
-      let garageConfig
-      if (!(garageConfig = this.platform.cusG.get(this.accessory.context.hbDeviceId))) {
-        throw new Error('group config missing')
-      }
-      if (garageConfig.type !== 'garage_four') {
-        throw new Error('improper configuration')
-      }
-      this.accessory.context.switchState = params.switches
-      this.accessory.context.inUse = true
-      const gdService = this.accessory.getService(this.Service.GarageDoorOpener)
-      gdService
-        .updateCharacteristic(this.Characteristic.TargetDoorState, params.switch === 'on' ? 0 : 1)
-        .updateCharacteristic(this.Characteristic.CurrentDoorState, params.switch === 'on' ? 0 : 1)
-      this.accessory.context.inUse = false
+
     } catch (err) {
       this.accessory.context.inUse = false
       this.platform.deviceUpdateError(this.accessory, err, false)
diff --git a/lib/helpers.js b/lib/helpers.js
index 6f1bf1e0..34b4e2b6 100644
--- a/lib/helpers.js
+++ b/lib/helpers.js
@@ -83,6 +83,24 @@ module.exports = {
     cacheTwoCurrentDoorState: 1,
     cacheTwoTargetDoorState: 1
   },
+  defaultGarageFourCache: [
+    {
+      cacheCurrentDoorState: 1,
+      cacheTargetDoorState: 1
+    },
+    {
+      cacheCurrentDoorState: 1,
+      cacheTargetDoorState: 1
+    },
+    {
+      cacheCurrentDoorState: 1,
+      cacheTargetDoorState: 1
+    },
+    {
+      cacheCurrentDoorState: 1,
+      cacheTargetDoorState: 1
+    }
+  ],
   chansFromUiid: {
     1: 1, // "SOCKET"                                  \\ 20, MINI, BASIC, S26
     2: 2, // "SOCKET_2"                                \\

From 22d4d343c088592c46f7b30ff510527f08cd125c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 17 Oct 2020 14:03:39 +0100
Subject: [PATCH 0504/3183] 3.7.0-0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index fa87551d..2c1b6fe7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.6.2",
+  "version": "3.7.0-0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index c5216803..b51a300e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.6.2",
+  "version": "3.7.0-0",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 455bef78daaa66c14541b99ab76d5b7476596b65 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 17 Oct 2020 18:01:39 +0100
Subject: [PATCH 0505/3183] hoobs fix

---
 index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.js b/index.js
index 731ea97a..b66ae1c9 100644
--- a/index.js
+++ b/index.js
@@ -2,4 +2,4 @@
 /* eslint-disable new-cap */
 'use strict'
 const eWeLinkPlatform = require('./lib/ewelink-platform.js')
-module.exports = hb => hb.registerPlatform('eWeLink', eWeLinkPlatform)
+module.exports = hb => hb.registerPlatform('homebridge-ewelink', 'eWeLink', eWeLinkPlatform)

From 44429ba797accd98f527e21f57c9253e5820bc0c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 17 Oct 2020 18:03:03 +0100
Subject: [PATCH 0506/3183] 3.7.0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 2c1b6fe7..1d40bf39 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.7.0-0",
+  "version": "3.7.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index b51a300e..2ec2f355 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.7.0-0",
+  "version": "3.7.0",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 19be90a2df6bc493db0963480804fdd21c36859a Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 17 Oct 2020 19:21:40 +0100
Subject: [PATCH 0507/3183] garage-four internalUpdate 3

---
 lib/device/garage-four.js | 13 +++++++++----
 lib/ewelink-platform.js   |  2 +-
 lib/helpers.js            | 38 ++++++++++++++++++++------------------
 3 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/lib/device/garage-four.js b/lib/device/garage-four.js
index bc469859..92074b1d 100644
--- a/lib/device/garage-four.js
+++ b/lib/device/garage-four.js
@@ -22,6 +22,7 @@ module.exports = class deviceGarageFour {
         .on('set', (value, callback) => this.internalUpdate(v, value, callback))
     })
     this.accessory = accessory
+    this.platform.log.error(accessory.context)
   }
 
   async internalUpdate (garage, value, callback) {
@@ -34,6 +35,7 @@ module.exports = class deviceGarageFour {
       if (garageConfig.type !== 'garage_four') {
         throw new Error('improper configuration')
       }
+      const tempLogger = msg => this.platform.log.warn('[%s] %s', this.accessory.displayName, msg)
       let garageChannel
       switch (garage) {
         case 'A':
@@ -49,6 +51,7 @@ module.exports = class deviceGarageFour {
           garageChannel = 3
           break
       }
+      tempLogger('New position value requested - TargetDoorState: ' + value)
       let sensorDefinition = garageConfig.sensorId || false
       if (sensorDefinition) {
         const sensors = garageConfig.sensorId.split(',')
@@ -61,26 +64,28 @@ module.exports = class deviceGarageFour {
       if (sensorDefinition && sAccessory.context.type !== 'sensor') {
         throw new Error("defined DW2 sensor isn't a sensor")
       }
+      tempLogger('sAccessory:' + sAccessory + ' as no sensor defined')
       const prevState = sAccessory
         ? sAccessory.getService(this.Service.ContactSensor).getCharacteristic(this.Characteristic.ContactSensorState).value === 0
           ? 1
           : 0
-        : this.accessory.context[garageChannel].cacheCurrentDoorState
+        : this.accessory.context.cacheStates[garageChannel].cacheCurrentDoorState
+      tempLogger('Previous state retrieved as prevState:' + prevState)
       if (value === prevState % 2) return
       const gdService = this.accessory.getService('Garage ' + garage)
       this.accessory.context.inUse = true
       gdService
         .updateCharacteristic(this.Characteristic.TargetDoorState, value)
         .updateCharacteristic(this.Characteristic.CurrentDoorState, value + 2)
-      this.accessory.context[garageChannel].cacheTargetDoorState = value
-      this.accessory.context[garageChannel].cacheCurrentDoorState = value + 2
+      this.accessory.context.cacheStates[garageChannel].cacheTargetDoorState = value
+      this.accessory.context.cacheStates[garageChannel].cacheCurrentDoorState = value + 2
       const params = { switches: helpers.defaultMultiSwitchOff }
       params.switches[garageChannel].switch = 'on'
       await this.platform.sendDeviceUpdate(this.accessory, params)
       await helpers.sleep(Math.max(garageConfig.operationTime * 100, 1000))
       if (!sAccessory) {
         gdService.updateCharacteristic(this.Characteristic.CurrentDoorState, value)
-        this.accessory.context[garageChannel].cacheCurrentDoorState = value
+        this.accessory.context.cacheStates[garageChannel].cacheCurrentDoorState = value
       }
       this.accessory.context.inUse = false
     } catch (err) {
diff --git a/lib/ewelink-platform.js b/lib/ewelink-platform.js
index 29e1bef8..75a8cc80 100644
--- a/lib/ewelink-platform.js
+++ b/lib/ewelink-platform.js
@@ -198,7 +198,7 @@ module.exports = class eWeLinkPlatform {
         **********************************/
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
-          : this.addAccessory(device, device.deviceid + 'SWX')
+          : this.addAccessory(device, device.deviceid + 'SWX', false, helpers.defaultGarageFourCache)
         accessory.control = new deviceGarageFour(this, accessory)
         /*********************************/
       } else if (this.cusG.has(device.deviceid + 'SWX') && this.cusG.get(device.deviceid + 'SWX').type === 'garage_eachen') {
diff --git a/lib/helpers.js b/lib/helpers.js
index 34b4e2b6..1096a34d 100644
--- a/lib/helpers.js
+++ b/lib/helpers.js
@@ -83,24 +83,26 @@ module.exports = {
     cacheTwoCurrentDoorState: 1,
     cacheTwoTargetDoorState: 1
   },
-  defaultGarageFourCache: [
-    {
-      cacheCurrentDoorState: 1,
-      cacheTargetDoorState: 1
-    },
-    {
-      cacheCurrentDoorState: 1,
-      cacheTargetDoorState: 1
-    },
-    {
-      cacheCurrentDoorState: 1,
-      cacheTargetDoorState: 1
-    },
-    {
-      cacheCurrentDoorState: 1,
-      cacheTargetDoorState: 1
-    }
-  ],
+  defaultGarageFourCache: {
+    cacheStates: [
+      {
+        cacheCurrentDoorState: 1,
+        cacheTargetDoorState: 1
+      },
+      {
+        cacheCurrentDoorState: 1,
+        cacheTargetDoorState: 1
+      },
+      {
+        cacheCurrentDoorState: 1,
+        cacheTargetDoorState: 1
+      },
+      {
+        cacheCurrentDoorState: 1,
+        cacheTargetDoorState: 1
+      }
+    ]
+  },
   chansFromUiid: {
     1: 1, // "SOCKET"                                  \\ 20, MINI, BASIC, S26
     2: 2, // "SOCKET_2"                                \\

From 401cab520e9b3cc08e4590872a3bf8588fd81cd0 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 17 Oct 2020 19:22:25 +0100
Subject: [PATCH 0508/3183] 3.7.1-0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 1d40bf39..f82e2c11 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.7.0",
+  "version": "3.7.1-0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 2ec2f355..bca9cf1d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.7.0",
+  "version": "3.7.1-0",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 46463dbb3aa9dd1bd70a4399b0bf051fe66b6b9d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 17 Oct 2020 20:18:22 +0100
Subject: [PATCH 0509/3183] garage-four internalUpdate 4

---
 lib/device/garage-four.js | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/lib/device/garage-four.js b/lib/device/garage-four.js
index 92074b1d..3f7c32b5 100644
--- a/lib/device/garage-four.js
+++ b/lib/device/garage-four.js
@@ -22,7 +22,6 @@ module.exports = class deviceGarageFour {
         .on('set', (value, callback) => this.internalUpdate(v, value, callback))
     })
     this.accessory = accessory
-    this.platform.log.error(accessory.context)
   }
 
   async internalUpdate (garage, value, callback) {
@@ -51,7 +50,6 @@ module.exports = class deviceGarageFour {
           garageChannel = 3
           break
       }
-      tempLogger('New position value requested - TargetDoorState: ' + value)
       let sensorDefinition = garageConfig.sensorId || false
       if (sensorDefinition) {
         const sensors = garageConfig.sensorId.split(',')
@@ -64,13 +62,11 @@ module.exports = class deviceGarageFour {
       if (sensorDefinition && sAccessory.context.type !== 'sensor') {
         throw new Error("defined DW2 sensor isn't a sensor")
       }
-      tempLogger('sAccessory:' + sAccessory + ' as no sensor defined')
       const prevState = sAccessory
         ? sAccessory.getService(this.Service.ContactSensor).getCharacteristic(this.Characteristic.ContactSensorState).value === 0
           ? 1
           : 0
         : this.accessory.context.cacheStates[garageChannel].cacheCurrentDoorState
-      tempLogger('Previous state retrieved as prevState:' + prevState)
       if (value === prevState % 2) return
       const gdService = this.accessory.getService('Garage ' + garage)
       this.accessory.context.inUse = true
@@ -80,7 +76,7 @@ module.exports = class deviceGarageFour {
       this.accessory.context.cacheStates[garageChannel].cacheTargetDoorState = value
       this.accessory.context.cacheStates[garageChannel].cacheCurrentDoorState = value + 2
       const params = { switches: helpers.defaultMultiSwitchOff }
-      params.switches[garageChannel].switch = 'on'
+      ;[0, 1, 2, 3].forEach(i => (params.switches[i].switch = garageChannel === i ? 'on' : 'off'))
       await this.platform.sendDeviceUpdate(this.accessory, params)
       await helpers.sleep(Math.max(garageConfig.operationTime * 100, 1000))
       if (!sAccessory) {

From 4c4252b2ab26adf1681599683cc208ee9a8f860a Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 17 Oct 2020 20:19:10 +0100
Subject: [PATCH 0510/3183] 3.7.1-1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index f82e2c11..167b072c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.7.1-0",
+  "version": "3.7.1-1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index bca9cf1d..1fc754e6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.7.1-0",
+  "version": "3.7.1-1",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From a9ce0491d94c85238f7bd4630ac56db979de8c98 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 18 Oct 2020 11:14:12 +0100
Subject: [PATCH 0511/3183] one liners

---
 lib/device/curtain.js | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/lib/device/curtain.js b/lib/device/curtain.js
index 645a38f8..dfc70ae1 100644
--- a/lib/device/curtain.js
+++ b/lib/device/curtain.js
@@ -31,13 +31,9 @@ module.exports = class deviceCurtain {
       const newPos = value
       if (newPos === prevPos) return
       if (newPos === 0 || newPos === 100) {
-        params = {
-          switch: newPos === 100 ? 'on' : 'off'
-        }
+        params = { switch: newPos === 100 ? 'on' : 'off' }
       } else {
-        params = {
-          setclose: Math.abs(100 - newPos)
-        }
+        params = { setclose: Math.abs(100 - newPos) }
       }
       await this.platform.sendDeviceUpdate(this.accessory, params)
       cService

From 2d5b5cef2173b42826e69cf1bebe9298e78bf4fc Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 18 Oct 2020 11:14:23 +0100
Subject: [PATCH 0512/3183] garage-four externalUpdate 1

---
 lib/device/garage-four.js | 56 ++++++++++++++++++++++++++++++++++++---
 1 file changed, 52 insertions(+), 4 deletions(-)

diff --git a/lib/device/garage-four.js b/lib/device/garage-four.js
index 3f7c32b5..f6cbdd82 100644
--- a/lib/device/garage-four.js
+++ b/lib/device/garage-four.js
@@ -70,6 +70,8 @@ module.exports = class deviceGarageFour {
       if (value === prevState % 2) return
       const gdService = this.accessory.getService('Garage ' + garage)
       this.accessory.context.inUse = true
+      const updateKey = Math.random().toString(36).substr(2, 8)
+      this.accessory.context.updateKey = updateKey
       gdService
         .updateCharacteristic(this.Characteristic.TargetDoorState, value)
         .updateCharacteristic(this.Characteristic.CurrentDoorState, value + 2)
@@ -78,12 +80,14 @@ module.exports = class deviceGarageFour {
       const params = { switches: helpers.defaultMultiSwitchOff }
       ;[0, 1, 2, 3].forEach(i => (params.switches[i].switch = garageChannel === i ? 'on' : 'off'))
       await this.platform.sendDeviceUpdate(this.accessory, params)
-      await helpers.sleep(Math.max(garageConfig.operationTime * 100, 1000))
+      await helpers.sleep(1000)
+      this.accessory.context.inUse = false
+      await helpers.sleep(Math.max((garageConfig.operationTime - 10) * 100, 0))
+      if (this.accessory.context.updateKey !== updateKey || sAccessory) return
       if (!sAccessory) {
         gdService.updateCharacteristic(this.Characteristic.CurrentDoorState, value)
         this.accessory.context.cacheStates[garageChannel].cacheCurrentDoorState = value
       }
-      this.accessory.context.inUse = false
     } catch (err) {
       this.accessory.context.inUse = false
       this.platform.deviceUpdateError(this.accessory, err, true)
@@ -92,9 +96,53 @@ module.exports = class deviceGarageFour {
 
   async externalUpdate (params) {
     try {
-
+      if (!helpers.hasProperty(params, 'switches') || this.accessory.context.inUse) return
+      let garageConfig
+      if (!(garageConfig = this.platform.cusG.get(this.accessory.context.hbDeviceId))) {
+        throw new Error('group config missing')
+      }
+      if (garageConfig.type !== 'garage_four') {
+        throw new Error('improper configuration')
+      }
+      if (this.accessory.context.inUse) return
+      ;['A', 'B', 'C', 'D'].forEach(async v => {
+        let garageChannel
+        switch (v) {
+          case 'A':
+            garageChannel = 0
+            break
+          case 'B':
+            garageChannel = 1
+            break
+          case 'C':
+            garageChannel = 2
+            break
+          case 'D':
+            garageChannel = 3
+            break
+        }
+        let sensorDefinition = garageConfig.sensorId || false
+        if (sensorDefinition) {
+          const sensors = garageConfig.sensorId.split(',')
+          sensorDefinition = sensors[garageChannel] || false
+        }
+        let sAccessory = false
+        if (sensorDefinition && !(sAccessory = this.platform.devicesInHB.get(garageConfig.sensorId + 'SWX'))) {
+          throw new Error("defined DW2 sensor doesn't exist")
+        }
+        if (sensorDefinition && sAccessory.context.type !== 'sensor') {
+          throw new Error("defined DW2 sensor isn't a sensor")
+        }
+        if (sensorDefinition) return
+        const gcService = this.accessory.getService('Garage ' + v)
+        const prevState = this.accessory.context.cacheStates[garageChannel].cacheCurrentDoorState
+        const newPos = [0, 2].includes(prevState) ? 1 : 0
+        if (params.switches[garageChannel].switch === 'off') return
+        gcService.updateCharacteristic(this.Characteristic.CurrentDoorState, newPos)
+        this.accessory.context.cacheStates[garageChannel].cacheTargetDoorState = newPos
+        this.accessory.context.cacheStates[garageChannel].cacheCurrentDoorState = newPos
+      })
     } catch (err) {
-      this.accessory.context.inUse = false
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }

From d9911219afc05b8771a3327505fa8b8a7a7dcfde Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 18 Oct 2020 12:03:04 +0100
Subject: [PATCH 0513/3183] Update helpers.js

---
 lib/helpers.js | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/lib/helpers.js b/lib/helpers.js
index 1096a34d..d9f99bd4 100644
--- a/lib/helpers.js
+++ b/lib/helpers.js
@@ -2,12 +2,8 @@
 /* eslint-disable new-cap */
 'use strict'
 module.exports = {
-  sleep: ms => {
-    return new Promise(resolve => setTimeout(resolve, ms))
-  },
-  hasProperty: (obj, prop) => {
-    return Object.prototype.hasOwnProperty.call(obj, prop)
-  },
+  sleep: ms => new Promise(resolve => setTimeout(resolve, ms)),
+  hasProperty: (obj, prop) => Object.prototype.hasOwnProperty.call(obj, prop),
   appId: 'oeVkj2lYFGnJu5XUtWisfW4utiN4u9Mq',
   appSecret: '6Nz4n0xA8s8qdxQf2GqurZj2Fs55FUvM',
   httpRetryCodes: ['ENOTFOUND', 'ETIMEDOUT', 'EAI_AGAIN'],

From 67c901c45f1521ffa4e5e4c9c4e519e76a4675d7 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 18 Oct 2020 14:37:50 +0100
Subject: [PATCH 0514/3183] Update ewelink-platform.js

---
 lib/ewelink-platform.js | 24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/lib/ewelink-platform.js b/lib/ewelink-platform.js
index 75a8cc80..520ed5b9 100644
--- a/lib/ewelink-platform.js
+++ b/lib/ewelink-platform.js
@@ -43,17 +43,14 @@ module.exports = class eWeLinkPlatform {
     this.cusG = new Map()
     this.cusS = new Map()
     this.hiddenMasters = []
-    this.eveLogPath = this.api.user.storagePath() + '/homebridge-ewelink/'
-    this.wsRefreshFlag = true
     this.nameOverrideTmp = {}
     this.ipOverrideTmp = {}
-    if (this.config.nameOverride) this.config.nameOverride.forEach(x => (this.nameOverrideTmp[x.fullDeviceId] = x.deviceName))
-    if (this.config.ipOverride) this.config.ipOverride.forEach(x => (this.ipOverrideTmp[x.deviceId] = x.deviceIP))
+    if (config.nameOverride) config.nameOverride.forEach(x => (this.nameOverrideTmp[x.fullDeviceId] = x.deviceName))
+    if (config.ipOverride) config.ipOverride.forEach(x => (this.ipOverrideTmp[x.deviceId] = x.deviceIP))
     this.config.nameOverride = this.nameOverrideTmp
     this.config.ipOverride = this.ipOverrideTmp
-    //* ** UPGRADE **\\
-    this.config.hideChanFromHB += ',' + this.config.hideMasters + ',' + this.config.hideFromHB
-    //* *************\\
+    this.wsRefreshFlag = true
+    this.eveLogPath = this.api.user.storagePath() + '/homebridge-ewelink/'
     this.api
       .on('didFinishLaunching', () => this.eWeLinkSetup())
       .on('shutdown', () => this.eWeLinkShutdown())
@@ -557,17 +554,12 @@ module.exports = class eWeLinkPlatform {
       deviceid: accessory.context.eweDeviceId,
       params
     }
-    let res
-    if (helpers.devicesNonLAN.includes(accessory.context.eweUIID)) {
-      res = "device doesn't support LAN mode"
-    } else {
-      res = await this.lanClient.sendUpdate(payload)
-    }
+    const res = helpers.devicesNonLAN.includes(accessory.context.eweUIID)
+      ? "device doesn't support LAN mode"
+      : await this.lanClient.sendUpdate(payload)
     if (res !== 'ok') {
       if (accessory.context.reachableWAN) {
-        if (this.debug) {
-          this.log('[%s] Reverting to web socket as %s.', accessory.displayName, res)
-        }
+        if (this.debug) this.log('[%s] Reverting to web socket as %s.', accessory.displayName, res)
         await this.wsClient.sendUpdate(payload)
       } else {
         throw new Error("it is unreachable. It's status will be corrected once it is reachable")

From a74c6af316cf7bb5aaf84da7d0d90827db0608aa Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 18 Oct 2020 17:19:00 +0100
Subject: [PATCH 0515/3183] 3.7.1-2

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 167b072c..7bec4299 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.7.1-1",
+  "version": "3.7.1-2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 1fc754e6..b5f9eb35 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.7.1-1",
+  "version": "3.7.1-2",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From fb4468b4a24bd748b372b4f2b5f65db4f77ec0f8 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 19 Oct 2020 20:08:11 +0100
Subject: [PATCH 0516/3183] option to hide fan light

---
 config.schema.json |  6 ++++++
 lib/device/fan.js  | 30 ++++++++++++++++++++----------
 2 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 509820c8..34ad95d6 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -77,6 +77,11 @@
         "description": "If enabled, the switch for the TH10/TH16 devices will be hidden from Homebridge.",
         "default": false
       },
+      "hideLightFromFan": {
+        "type": "string",
+        "title": "Hide Fan Lights",
+        "description": "A list of eWeLink iFan devices for which the light will be hidden from Homebridge. For example '10009553c8' or multiple separated with a comma '10009553c8,10009553c9'"
+      },
       "lowBattThreshold": {
         "type": "integer",
         "title": "Low Battery Threshold",
@@ -341,6 +346,7 @@
       "expandable": true,
       "items": [
         "hideChanFromHB",
+        "hideLightFromFan",
         "disableEveLogging",
         "inUsePowerThreshold",
         "hideTHSwitch",
diff --git a/lib/device/fan.js b/lib/device/fan.js
index 48037085..72e48a68 100644
--- a/lib/device/fan.js
+++ b/lib/device/fan.js
@@ -7,8 +7,8 @@ module.exports = class deviceFan {
     this.platform = platform
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
+    this.visibleLight = true
     const fanService = accessory.getService(this.Service.Fanv2) || accessory.addService(this.Service.Fanv2)
-    const fanLightService = accessory.getService(this.Service.Lightbulb) || accessory.addService(this.Service.Lightbulb)
     fanService
       .getCharacteristic(this.Characteristic.Active)
       .on('set', async (value, callback) => {
@@ -24,9 +24,17 @@ module.exports = class deviceFan {
       .setProps({
         minStep: 33
       })
-    fanLightService
-      .getCharacteristic(this.Characteristic.On)
-      .on('set', (value, callback) => this.internalUpdate('light', value, callback))
+    if ((this.platform.config.hideLightFromFan || '').includes(accessory.context.eweDeviceId)) {
+      if (accessory.getService(this.Service.Lightbulb)) {
+        accessory.removeService(accessory.getService(this.Service.Lightbulb))
+      }
+      this.visibleLight = false
+    } else {
+      const fanLightService = accessory.getService(this.Service.Lightbulb) || accessory.addService(this.Service.Lightbulb)
+      fanLightService
+        .getCharacteristic(this.Characteristic.On)
+        .on('set', (value, callback) => this.internalUpdate('light', value, callback))
+    }
     this.accessory = accessory
   }
 
@@ -36,19 +44,20 @@ module.exports = class deviceFan {
       let newPower
       let newSpeed
       let newLight
-      const lightService = this.accessory.getService(this.Service.Lightbulb)
+      let lightService
+      if (this.visibleLight) lightService = this.accessory.getService(this.Service.Lightbulb)
       const fanService = this.accessory.getService(this.Service.Fanv2)
       const params = { switches: helpers.defaultMultiSwitchOff }
       switch (type) {
         case 'speed':
           newPower = value >= 33 ? 1 : 0
           newSpeed = value
-          newLight = lightService.getCharacteristic(this.Characteristic.On).value
+          newLight = this.visibleLight ? lightService.getCharacteristic(this.Characteristic.On).value : true
           break
         case 'light':
           newPower = fanService.getCharacteristic(this.Characteristic.Active).value
           newSpeed = fanService.getCharacteristic(this.Characteristic.RotationSpeed).value
-          newLight = value
+          newLight = this.visibleLight ? value : true
           break
       }
       params.switches[0].switch = newLight ? 'on' : 'off'
@@ -56,7 +65,7 @@ module.exports = class deviceFan {
       params.switches[2].switch = newPower === 1 && newSpeed >= 66 && newSpeed < 99 ? 'on' : 'off'
       params.switches[3].switch = newPower === 1 && newSpeed >= 99 ? 'on' : 'off'
 
-      lightService.updateCharacteristic(this.Characteristic.On, newLight)
+      if (this.visibleLight) lightService.updateCharacteristic(this.Characteristic.On, newLight)
       fanService
         .updateCharacteristic(this.Characteristic.Active, newPower)
         .updateCharacteristic(this.Characteristic.RotationSpeed, newSpeed)
@@ -69,7 +78,8 @@ module.exports = class deviceFan {
   async externalUpdate (params) {
     try {
       if (params.switches && Array.isArray(params.switches)) {
-        const lightService = this.accessory.getService(this.Service.Lightbulb)
+        let lightService
+        if (this.visibleLight) lightService = this.accessory.getService(this.Service.Lightbulb)
         const fanService = this.accessory.getService(this.Service.Fanv2)
         const light = params.switches[0].switch === 'on'
         let status
@@ -91,7 +101,7 @@ module.exports = class deviceFan {
             status = 1
             speed = 99
         }
-        lightService.updateCharacteristic(this.Characteristic.On, light)
+        if (this.visibleLight) lightService.updateCharacteristic(this.Characteristic.On, light)
         fanService
           .updateCharacteristic(this.Characteristic.Active, status)
           .updateCharacteristic(this.Characteristic.RotationSpeed, speed)

From 08d0fb60bd9db6ee9237d7d9bc2d0d6cdd01b80c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 19 Oct 2020 20:11:40 +0100
Subject: [PATCH 0517/3183] 3.7.1-3

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 7bec4299..b9c1cf46 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.7.1-2",
+  "version": "3.7.1-3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index b5f9eb35..f184b8cd 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.7.1-2",
+  "version": "3.7.1-3",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 9842fbc5b690716f57e503bbf6e182ca6a912874 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 20 Oct 2020 09:57:16 +0100
Subject: [PATCH 0518/3183] Convert Fanv2 to Fan

---
 lib/device/fan.js | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/lib/device/fan.js b/lib/device/fan.js
index 72e48a68..323aefcd 100644
--- a/lib/device/fan.js
+++ b/lib/device/fan.js
@@ -8,9 +8,13 @@ module.exports = class deviceFan {
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
     this.visibleLight = true
-    const fanService = accessory.getService(this.Service.Fanv2) || accessory.addService(this.Service.Fanv2)
+    /****************** UPGRADE 3.7.* -> 3.8.* ******************/
+    const fanServiceOld = accessory.getService(this.Service.Fanv2)
+    if (fanServiceOld) accessory.removeService(fanServiceOld)
+    /************************************************************/
+    const fanService = accessory.getService(this.Service.Fan) || accessory.addService(this.Service.Fan)
     fanService
-      .getCharacteristic(this.Characteristic.Active)
+      .getCharacteristic(this.Characteristic.On)
       .on('set', async (value, callback) => {
         callback()
         if (value === 0) {
@@ -46,7 +50,7 @@ module.exports = class deviceFan {
       let newLight
       let lightService
       if (this.visibleLight) lightService = this.accessory.getService(this.Service.Lightbulb)
-      const fanService = this.accessory.getService(this.Service.Fanv2)
+      const fanService = this.accessory.getService(this.Service.Fan)
       const params = { switches: helpers.defaultMultiSwitchOff }
       switch (type) {
         case 'speed':
@@ -55,7 +59,7 @@ module.exports = class deviceFan {
           newLight = this.visibleLight ? lightService.getCharacteristic(this.Characteristic.On).value : true
           break
         case 'light':
-          newPower = fanService.getCharacteristic(this.Characteristic.Active).value
+          newPower = fanService.getCharacteristic(this.Characteristic.On).value
           newSpeed = fanService.getCharacteristic(this.Characteristic.RotationSpeed).value
           newLight = this.visibleLight ? value : true
           break
@@ -67,7 +71,7 @@ module.exports = class deviceFan {
 
       if (this.visibleLight) lightService.updateCharacteristic(this.Characteristic.On, newLight)
       fanService
-        .updateCharacteristic(this.Characteristic.Active, newPower)
+        .updateCharacteristic(this.Characteristic.On, newPower)
         .updateCharacteristic(this.Characteristic.RotationSpeed, newSpeed)
       await this.platform.sendDeviceUpdate(this.accessory, params)
     } catch (err) {
@@ -80,7 +84,7 @@ module.exports = class deviceFan {
       if (params.switches && Array.isArray(params.switches)) {
         let lightService
         if (this.visibleLight) lightService = this.accessory.getService(this.Service.Lightbulb)
-        const fanService = this.accessory.getService(this.Service.Fanv2)
+        const fanService = this.accessory.getService(this.Service.Fan)
         const light = params.switches[0].switch === 'on'
         let status
         let speed
@@ -103,7 +107,7 @@ module.exports = class deviceFan {
         }
         if (this.visibleLight) lightService.updateCharacteristic(this.Characteristic.On, light)
         fanService
-          .updateCharacteristic(this.Characteristic.Active, status)
+          .updateCharacteristic(this.Characteristic.On, status)
           .updateCharacteristic(this.Characteristic.RotationSpeed, speed)
       }
     } catch (err) {

From f8e095fb3ebf565f7961d5dad4894c2d8eaeac14 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 20 Oct 2020 10:40:33 +0100
Subject: [PATCH 0519/3183] unnecessary updates

---
 lib/device/fan.js        |  5 ----
 lib/device/light.js      | 58 +++++++++-------------------------------
 lib/device/outlet.js     |  6 +----
 lib/device/rf-bridge.js  |  7 +++--
 lib/device/scm.js        |  2 --
 lib/device/switch.js     |  5 ----
 lib/device/thermostat.js |  2 --
 lib/device/usb.js        |  2 --
 8 files changed, 16 insertions(+), 71 deletions(-)

diff --git a/lib/device/fan.js b/lib/device/fan.js
index 323aefcd..8c39e2a4 100644
--- a/lib/device/fan.js
+++ b/lib/device/fan.js
@@ -68,11 +68,6 @@ module.exports = class deviceFan {
       params.switches[1].switch = newPower === 1 && newSpeed >= 33 ? 'on' : 'off'
       params.switches[2].switch = newPower === 1 && newSpeed >= 66 && newSpeed < 99 ? 'on' : 'off'
       params.switches[3].switch = newPower === 1 && newSpeed >= 99 ? 'on' : 'off'
-
-      if (this.visibleLight) lightService.updateCharacteristic(this.Characteristic.On, newLight)
-      fanService
-        .updateCharacteristic(this.Characteristic.On, newPower)
-        .updateCharacteristic(this.Characteristic.RotationSpeed, newSpeed)
       await this.platform.sendDeviceUpdate(this.accessory, params)
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
diff --git a/lib/device/light.js b/lib/device/light.js
index 6a1ba5de..70d41bf8 100644
--- a/lib/device/light.js
+++ b/lib/device/light.js
@@ -13,27 +13,11 @@ module.exports = class deviceLight {
       .getCharacteristic(this.Characteristic.On)
       .on('set', (value, callback) => this.internalUpdate('onoff', value, callback))
     if (helpers.devicesBrightable.includes(accessory.context.eweUIID)) {
-      lightService.getCharacteristic(this.Characteristic.Brightness).on('set', (value, callback) => {
-        if (value > 0) {
-          if (!lightService.getCharacteristic(this.Characteristic.On).value) {
-            this.internalUpdate('onoff', true, function () {})
-          }
-          this.internalUpdate('brightness', value, callback)
-        } else {
-          this.internalUpdate('onoff', false, callback)
-        }
-      })
+      lightService.getCharacteristic(this.Characteristic.Brightness)
+        .on('set', (value, callback) => this.internalUpdate('brightness', value, callback))
     } else if (helpers.devicesColourable.includes(accessory.context.eweUIID)) {
-      lightService.getCharacteristic(this.Characteristic.Brightness).on('set', (value, callback) => {
-        if (value > 0) {
-          if (!lightService.getCharacteristic(this.Characteristic.On).value) {
-            this.internalUpdate('onoff', true, function () {})
-          }
-          this.internalUpdate('c_brightness', value, callback)
-        } else {
-          this.internalUpdate('onoff', false, callback)
-        }
-      })
+      lightService.getCharacteristic(this.Characteristic.Brightness)
+        .on('set', (value, callback) => this.internalUpdate('c_brightness', value, callback))
       lightService
         .getCharacteristic(this.Characteristic.Hue)
         .on('set', (value, callback) => this.internalUpdate('c_hue', value, callback))
@@ -87,9 +71,6 @@ module.exports = class deviceLight {
           }
           await this.platform.sendDeviceUpdate(this.accessory, params)
           switch (this.accessory.context.switchNumber) {
-            case 'X':
-              lightService.updateCharacteristic(this.Characteristic.On, value)
-              break
             case '0':
               for (let i = 0; i <= 4; i++) {
                 if ((oAccessory = this.platform.devicesInHB.get(this.accessory.context.eweDeviceId + 'SW' + i))) {
@@ -101,7 +82,6 @@ module.exports = class deviceLight {
             case '2':
             case '3':
             case '4': {
-              lightService.updateCharacteristic(this.Characteristic.On, value)
               let masterState = 'off'
               for (let i = 1; i <= 4; i++) {
                 if ((oAccessory = this.platform.devicesInHB.get(this.accessory.context.eweDeviceId + 'SW' + i))) {
@@ -119,29 +99,17 @@ module.exports = class deviceLight {
           }
           break
         case 'brightness':
-          if (value === 0) {
-            params.switch = 'off'
-          } else {
-            if (!lightService.getCharacteristic(this.Characteristic.On).value) {
-              params.switch = 'on'
-            }
-            switch (this.accessory.context.eweUIID) {
-              case 36: //* ** KING-M4 ***\\
-                params.bright = Math.round((value * 9) / 10 + 10)
-                break
-              case 44: //* ** D1 ***\\
-                params.brightness = value
-                params.mode = 0
-                break
-            }
+          switch (this.accessory.context.eweUIID) {
+            case 36: //* ** KING-M4 ***\\
+              params.bright = Math.round((value * 9) / 10 + 10)
+              break
+            case 44: //* ** D1 ***\\
+              params.brightness = value
+              params.mode = 0
+              break
           }
           await helpers.sleep(250)
           await this.platform.sendDeviceUpdate(this.accessory, params)
-          if (value === 0) {
-            lightService.updateCharacteristic(this.Characteristic.On, false)
-          } else {
-            lightService.updateCharacteristic(this.Characteristic.Brightness, value)
-          }
           break
         case 'c_brightness':
           switch (this.accessory.context.eweUIID) {
@@ -170,7 +138,6 @@ module.exports = class deviceLight {
           }
           await helpers.sleep(250)
           await this.platform.sendDeviceUpdate(this.accessory, params)
-          lightService.updateCharacteristic(this.Characteristic.Brightness, value)
           break
         case 'c_hue':
           newRGB = convert.hsv.rgb(value, lightService.getCharacteristic(this.Characteristic.Saturation).value, 100)
@@ -197,7 +164,6 @@ module.exports = class deviceLight {
           }
           await helpers.sleep(250)
           await this.platform.sendDeviceUpdate(this.accessory, params)
-          lightService.updateCharacteristic(this.Characteristic.Hue, value)
           break
       }
     } catch (err) {
diff --git a/lib/device/outlet.js b/lib/device/outlet.js
index ae80e022..37619b78 100644
--- a/lib/device/outlet.js
+++ b/lib/device/outlet.js
@@ -113,12 +113,8 @@ module.exports = class deviceOutlet {
   async internalUpdate (value, callback) {
     callback()
     try {
-      const params = {
-        switch: value ? 'on' : 'off'
-      }
-      const outletService = this.accessory.getService(this.Service.Outlet)
+      const params = { switch: value ? 'on' : 'off' }
       await this.platform.sendDeviceUpdate(this.accessory, params)
-      outletService.updateCharacteristic(this.Characteristic.On, value)
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
     }
diff --git a/lib/device/rf-bridge.js b/lib/device/rf-bridge.js
index 9270cd89..fa7d9bb8 100644
--- a/lib/device/rf-bridge.js
+++ b/lib/device/rf-bridge.js
@@ -34,7 +34,8 @@ module.exports = class deviceRFBridge {
         Object.entries(accessory.context.buttons).forEach(([chan, name]) => {
           if (!accessory.getService(name)) accessory.addService(this.Service.Switch, name, 'switch' + chan)
           accessory.getService(name).updateCharacteristic(this.Characteristic.On, false)
-          accessory.getService(name).getCharacteristic(this.Characteristic.On)
+          accessory.getService(name)
+            .getCharacteristic(this.Characteristic.On)
             .on('set', (value, callback) => this.internalUpdate(chan, name, value, callback))
         })
         break
@@ -50,10 +51,8 @@ module.exports = class deviceRFBridge {
         cmd: 'transmit',
         rfChl: parseInt(rfChl)
       }
-      const rfService = this.accessory.getService(service)
-      rfService.updateCharacteristic(this.Characteristic.On, true)
       await helpers.sleep(1000)
-      rfService.updateCharacteristic(this.Characteristic.On, false)
+      this.accessory.getService(service).updateCharacteristic(this.Characteristic.On, false)
       await this.platform.sendDeviceUpdate(this.accessory, params)
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
diff --git a/lib/device/scm.js b/lib/device/scm.js
index 961b1b83..b92fd847 100644
--- a/lib/device/scm.js
+++ b/lib/device/scm.js
@@ -18,10 +18,8 @@ module.exports = class deviceSCM {
     callback()
     try {
       const params = { switches: helpers.defaultMultiSwitchOff }
-      const switchService = this.accessory.getService(this.Service.Switch)
       params.switches[0].switch = value ? 'on' : 'off'
       await this.platform.sendDeviceUpdate(this.accessory, params)
-      switchService.updateCharacteristic(this.Characteristic.On, value)
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
     }
diff --git a/lib/device/switch.js b/lib/device/switch.js
index 9cea49b7..dce815af 100644
--- a/lib/device/switch.js
+++ b/lib/device/switch.js
@@ -19,7 +19,6 @@ module.exports = class deviceSwitch {
     try {
       let oAccessory
       const params = {}
-      const switchService = this.accessory.getService(this.Service.Switch)
       switch (this.accessory.context.switchNumber) {
         case 'X':
           params.switch = value ? 'on' : 'off'
@@ -51,9 +50,6 @@ module.exports = class deviceSwitch {
       }
       await this.platform.sendDeviceUpdate(this.accessory, params)
       switch (this.accessory.context.switchNumber) {
-        case 'X':
-          switchService.updateCharacteristic(this.Characteristic.On, value)
-          break
         case '0':
           for (let i = 0; i <= 4; i++) {
             if ((oAccessory = this.platform.devicesInHB.get(this.accessory.context.eweDeviceId + 'SW' + i))) {
@@ -65,7 +61,6 @@ module.exports = class deviceSwitch {
         case '2':
         case '3':
         case '4': {
-          switchService.updateCharacteristic(this.Characteristic.On, value)
           let masterState = 'off'
           for (let i = 1; i <= 4; i++) {
             if ((oAccessory = this.platform.devicesInHB.get(this.accessory.context.eweDeviceId + 'SW' + i))) {
diff --git a/lib/device/thermostat.js b/lib/device/thermostat.js
index eed8ccba..0a2a5d3a 100644
--- a/lib/device/thermostat.js
+++ b/lib/device/thermostat.js
@@ -49,9 +49,7 @@ module.exports = class deviceThermostat {
         switch: value ? 'on' : 'off',
         mainSwitch: value ? 'on' : 'off'
       }
-      const switchService = this.accessory.getService(this.Service.Switch)
       await this.platform.sendDeviceUpdate(this.accessory, params)
-      switchService.updateCharacteristic(this.Characteristic.On, value)
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
     }
diff --git a/lib/device/usb.js b/lib/device/usb.js
index 695d0391..fa5bc4f6 100644
--- a/lib/device/usb.js
+++ b/lib/device/usb.js
@@ -18,10 +18,8 @@ module.exports = class deviceUSB {
     callback()
     try {
       const params = { switches: helpers.defaultMultiSwitchOff }
-      const outletService = this.accessory.getService(this.Service.Outlet)
       params.switches[0].switch = value ? 'on' : 'off'
       await this.platform.sendDeviceUpdate(this.accessory, params)
-      outletService.updateCharacteristic(this.Characteristic.On, value)
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
     }

From 3ea87558a07d4727f4f9e1773f97652de39bc7f3 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 20 Oct 2020 10:47:21 +0100
Subject: [PATCH 0520/3183] unnecessary updates 2

---
 lib/device/blind.js   | 3 ---
 lib/device/curtain.js | 5 +----
 lib/device/lock.js    | 3 ---
 lib/device/valve.js   | 1 -
 4 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/lib/device/blind.js b/lib/device/blind.js
index 31e7bc82..b481d65e 100644
--- a/lib/device/blind.js
+++ b/lib/device/blind.js
@@ -60,9 +60,6 @@ module.exports = class deviceBlind {
       params.switches[0].switch = setToMoveUp ? 'on' : 'off'
       params.switches[1].switch = setToMoveUp ? 'off' : 'on'
       await this.platform.sendDeviceUpdate(this.accessory, params)
-      wcService
-        .updateCharacteristic(this.Characteristic.TargetPosition, newTarget)
-        .updateCharacteristic(this.Characteristic.PositionState, setToMoveUp)
       this.accessory.context.cacheTargetPosition = newTarget
       this.accessory.context.cachePositionState = setToMoveUp ? 1 : 0
       this.accessory.context.cacheLastStartTime = Math.floor(Date.now() / 100)
diff --git a/lib/device/curtain.js b/lib/device/curtain.js
index dfc70ae1..f6c8031a 100644
--- a/lib/device/curtain.js
+++ b/lib/device/curtain.js
@@ -35,11 +35,8 @@ module.exports = class deviceCurtain {
       } else {
         params = { setclose: Math.abs(100 - newPos) }
       }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
-      cService
-        .updateCharacteristic(this.Characteristic.TargetPosition, newPos)
-        .updateCharacteristic(this.Characteristic.PositionState, newPos > prevPos ? 1 : 0)
       this.accessory.context.cacheCurrentPosition = newPos
+      await this.platform.sendDeviceUpdate(this.accessory, params)
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
     }
diff --git a/lib/device/lock.js b/lib/device/lock.js
index 24c8c6ec..b69ea0cc 100644
--- a/lib/device/lock.js
+++ b/lib/device/lock.js
@@ -28,9 +28,6 @@ module.exports = class deviceLock {
       }
       this.accessory.context.inUse = true
       await this.platform.sendDeviceUpdate(this.accessory, params)
-      lmService
-        .updateCharacteristic(this.Characteristic.LockTargetState, 0)
-        .updateCharacteristic(this.Characteristic.LockCurrentState, 0)
       await helpers.sleep(Math.max(lockConfig.operationTime * 100, 1000))
       lmService
         .updateCharacteristic(this.Characteristic.LockTargetState, 1)
diff --git a/lib/device/valve.js b/lib/device/valve.js
index d5993430..e5bc5633 100644
--- a/lib/device/valve.js
+++ b/lib/device/valve.js
@@ -67,7 +67,6 @@ module.exports = class deviceValve {
       }
       await this.platform.sendDeviceUpdate(this.accessory, params)
       serviceValve
-        .updateCharacteristic(this.Characteristic.Active, value)
         .updateCharacteristic(this.Characteristic.InUse, value)
       switch (value) {
         case 0:

From 53545dfa6f3206dc664964b273dbbc1cedc778a2 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 20 Oct 2020 10:50:15 +0100
Subject: [PATCH 0521/3183] formatting

---
 lib/device/curtain.js | 1 -
 lib/device/fan.js     | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/device/curtain.js b/lib/device/curtain.js
index f6c8031a..67ca977b 100644
--- a/lib/device/curtain.js
+++ b/lib/device/curtain.js
@@ -26,7 +26,6 @@ module.exports = class deviceCurtain {
     callback()
     try {
       let params
-      const cService = this.accessory.getService(this.Service.WindowCovering)
       const prevPos = this.accessory.context.cacheCurrentPosition
       const newPos = value
       if (newPos === prevPos) return
diff --git a/lib/device/fan.js b/lib/device/fan.js
index 8c39e2a4..761afef6 100644
--- a/lib/device/fan.js
+++ b/lib/device/fan.js
@@ -8,10 +8,10 @@ module.exports = class deviceFan {
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
     this.visibleLight = true
-    /****************** UPGRADE 3.7.* -> 3.8.* ******************/
+    /** *************** UPGRADE 3.7.* -> 3.8.* ******************/
     const fanServiceOld = accessory.getService(this.Service.Fanv2)
     if (fanServiceOld) accessory.removeService(fanServiceOld)
-    /************************************************************/
+    /** *********************************************************/
     const fanService = accessory.getService(this.Service.Fan) || accessory.addService(this.Service.Fan)
     fanService
       .getCharacteristic(this.Characteristic.On)

From ccd55d5f7640d7c512d069d736e5e98db07c3a25 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 20 Oct 2020 10:52:54 +0100
Subject: [PATCH 0522/3183] 3.8.0-0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b9c1cf46..df39a3ff 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.7.1-3",
+  "version": "3.8.0-0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index f184b8cd..ff11f65a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.7.1-3",
+  "version": "3.8.0-0",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From e9cd321f7984f10e8d706b15e569d102570ca217 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 20 Oct 2020 13:01:15 +0100
Subject: [PATCH 0523/3183] eve logging for sensors

---
 lib/device/outlet.js     |  4 +--
 lib/device/rf-bridge.js  | 60 ++++++++++++++++++++++++++++++---
 lib/device/sensor.js     | 27 ++++++++++++++-
 lib/device/thermostat.js |  4 +--
 lib/device/zb-dev.js     | 71 ++++++++++++++++++++++++++++++++--------
 5 files changed, 143 insertions(+), 23 deletions(-)

diff --git a/lib/device/outlet.js b/lib/device/outlet.js
index 37619b78..1493ddd4 100644
--- a/lib/device/outlet.js
+++ b/lib/device/outlet.js
@@ -43,7 +43,7 @@ module.exports = class deviceOutlet {
       accessory.log = this.platform.log
       accessory.eveLogger = new this.EveHistoryService('energy', accessory, {
         storage: 'fs',
-        minutes: 5,
+        minutes: 10,
         path: this.platform.eveLogPath
       })
       corrInterval.setCorrectingInterval(() => {
@@ -78,7 +78,7 @@ module.exports = class deviceOutlet {
           time: Date.now(),
           power: currentWatt
         })
-      }, 300000)
+      }, 600000)
       outletService
         .getCharacteristic(this.EveCharacteristics.TotalConsumption)
         .on('get', callback => {
diff --git a/lib/device/rf-bridge.js b/lib/device/rf-bridge.js
index fa7d9bb8..1ab23e68 100644
--- a/lib/device/rf-bridge.js
+++ b/lib/device/rf-bridge.js
@@ -1,12 +1,15 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
+const corrInterval = require('correcting-interval')
+const fakegato = require('fakegato-history')
 const helpers = require('./../helpers')
 module.exports = class deviceRFBridge {
   constructor (platform, accessory) {
     this.platform = platform
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
+    this.EveHistoryService = fakegato(platform.api)
     switch (accessory.context.subType) {
       case 'water':
         if (!accessory.getService(this.Service.LeakSensor)) accessory.addService(this.Service.LeakSensor)
@@ -21,15 +24,47 @@ module.exports = class deviceRFBridge {
       case 'co2':
         if (!accessory.getService(this.Service.CarbonDioxideSensor)) accessory.addService(this.Service.CarbonDioxideSensor)
         break
-      case 'contact':
-        if (!accessory.getService(this.Service.ContactSensor)) accessory.addService(this.Service.ContactSensor)
+      case 'contact': {
+        const contactService = accessory.getService(this.Service.ContactSensor) || accessory.addService(this.Service.ContactSensor)
+        if (!this.platform.config.disableEveLogging) {
+          accessory.log = this.platform.log
+          accessory.eveLogger = new this.EveHistoryService('door', accessory, {
+            storage: 'fs',
+            minutes: 10,
+            path: this.platform.eveLogPath
+          })
+          corrInterval.setCorrectingInterval(() => {
+            const dataToAdd = {
+              time: Date.now(),
+              status: contactService.getCharacteristic(this.Characteristic.ContactSensorState).value
+            }
+            accessory.eveLogger.addEntry(dataToAdd)
+          }, 600000)
+        }
         break
+      }
       case 'occupancy':
         if (!accessory.getService(this.Service.OccupancySensor)) accessory.addService(this.Service.OccupancySensor)
         break
-      default:
-        if (!accessory.getService(this.Service.MotionSensor)) accessory.addService(this.Service.MotionSensor)
+      default: {
+        const motionService = accessory.getService(this.Service.MotionSensor) || accessory.addService(this.Service.MotionSensor)
+        if (!this.platform.config.disableEveLogging) {
+          accessory.log = this.platform.log
+          accessory.eveLogger = new this.EveHistoryService('motion', accessory, {
+            storage: 'fs',
+            minutes: 10,
+            path: this.platform.eveLogPath
+          })
+          corrInterval.setCorrectingInterval(() => {
+            const dataToAdd = {
+              time: Date.now(),
+              status: motionService.getCharacteristic(this.Characteristic.MotionDetected).value ? 1 : 0
+            }
+            accessory.eveLogger.addEntry(dataToAdd)
+          }, 600000)
+        }
         break
+      }
       case 'button':
         Object.entries(accessory.context.buttons).forEach(([chan, name]) => {
           if (!accessory.getService(name)) accessory.addService(this.Service.Switch, name, 'switch' + chan)
@@ -100,6 +135,7 @@ module.exports = class deviceRFBridge {
               const diff = (timeNow.getTime() - timeOfMotion.getTime()) / 1000
               let serv
               let char
+              let eveLog = false
               if (diff < (this.platform.config.sensorTimeDifference || 120)) {
                 switch (oAccessory.context.subType) {
                   case 'button':
@@ -124,6 +160,7 @@ module.exports = class deviceRFBridge {
                   case 'contact':
                     serv = this.Service.ContactSensor
                     char = this.Characteristic.ContactSensorState
+                    eveLog = true
                     break
                   case 'occupancy':
                     serv = this.Service.OccupancySensor
@@ -132,11 +169,26 @@ module.exports = class deviceRFBridge {
                   default:
                     serv = this.Service.MotionSensor
                     char = this.Characteristic.MotionDetected
+                    eveLog = true
                     break
                 }
                 oAccessory.getService(serv).updateCharacteristic(char, 1)
+                if (!this.platform.config.disableEveLogging && eveLog) {
+                  const eveLog = {
+                    time: Date.now(),
+                    status: 1
+                  }
+                  oAccessory.eveLogger.addEntry(eveLog)
+                }
                 await helpers.sleep((this.platform.config.sensorTimeLength || 2) * 1000)
                 oAccessory.getService(serv).updateCharacteristic(char, 0)
+                if (!this.platform.config.disableEveLogging && eveLog) {
+                  const eveLog = {
+                    time: Date.now(),
+                    status: 0
+                  }
+                  oAccessory.eveLogger.addEntry(eveLog)
+                }
               }
             }
           })
diff --git a/lib/device/sensor.js b/lib/device/sensor.js
index ee5ae854..47f5ad7d 100644
--- a/lib/device/sensor.js
+++ b/lib/device/sensor.js
@@ -1,14 +1,32 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
+const corrInterval = require('correcting-interval')
+const fakegato = require('fakegato-history')
 const helpers = require('./../helpers')
 module.exports = class deviceSensor {
   constructor (platform, accessory) {
     this.platform = platform
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
-    if (!accessory.getService(this.Service.ContactSensor)) accessory.addService(this.Service.ContactSensor)
+    this.EveHistoryService = fakegato(platform.api)
+    const contactService = accessory.getService(this.Service.ContactSensor) || accessory.addService(this.Service.ContactSensor)
     if (!accessory.getService(this.Service.BatteryService)) accessory.addService(this.Service.BatteryService)
+    if (!this.platform.config.disableEveLogging) {
+      accessory.log = this.platform.log
+      accessory.eveLogger = new this.EveHistoryService('door', accessory, {
+        storage: 'fs',
+        minutes: 10,
+        path: this.platform.eveLogPath
+      })
+      corrInterval.setCorrectingInterval(() => {
+        const dataToAdd = {
+          time: Date.now(),
+          status: contactService.getCharacteristic(this.Characteristic.ContactSensorState).value
+        }
+        accessory.eveLogger.addEntry(dataToAdd)
+      }, 600000)
+    }
     this.accessory = accessory
   }
 
@@ -29,6 +47,13 @@ module.exports = class deviceSensor {
       let oAccessory = false
       const contactService = this.accessory.getService(this.Service.ContactSensor)
       contactService.updateCharacteristic(this.Characteristic.ContactSensorState, newState)
+      if (!this.platform.config.disableEveLogging) {
+        const eveLog = {
+          time: Date.now(),
+          status: newState
+        }
+        this.accessory.eveLogger.addEntry(eveLog)
+      }
       this.platform.cusG.forEach(async group => {
         if (group.sensorId === this.accessory.context.eweDeviceId && group.type === 'garage') {
           if ((oAccessory = this.platform.devicesInHB.get(group.deviceId + 'SWX'))) {
diff --git a/lib/device/thermostat.js b/lib/device/thermostat.js
index 0a2a5d3a..6843ae0c 100644
--- a/lib/device/thermostat.js
+++ b/lib/device/thermostat.js
@@ -25,7 +25,7 @@ module.exports = class deviceThermostat {
       accessory.log = this.platform.log
       accessory.eveLogger = new this.EveHistoryService('weather', accessory, {
         storage: 'fs',
-        minutes: 5,
+        minutes: 10,
         path: this.platform.eveLogPath
       })
       corrInterval.setCorrectingInterval(() => {
@@ -37,7 +37,7 @@ module.exports = class deviceThermostat {
           dataToAdd.humidity = humiService.getCharacteristic(this.Characteristic.CurrentRelativeHumidity).value
         }
         accessory.eveLogger.addEntry(dataToAdd)
-      }, 300000)
+      }, 600000)
     }
     this.accessory = accessory
   }
diff --git a/lib/device/zb-dev.js b/lib/device/zb-dev.js
index bda0352e..a496bf84 100644
--- a/lib/device/zb-dev.js
+++ b/lib/device/zb-dev.js
@@ -32,7 +32,7 @@ module.exports = class deviceZBDev {
           accessory.log = this.platform.log
           accessory.eveLogger = new this.EveHistoryService('weather', accessory, {
             storage: 'fs',
-            minutes: 5,
+            minutes: 10,
             path: this.platform.eveLogPath
           })
           corrInterval.setCorrectingInterval(() => {
@@ -42,16 +42,48 @@ module.exports = class deviceZBDev {
               humidity: zbHumiService.getCharacteristic(this.Characteristic.CurrentRelativeHumidity).value
             }
             accessory.eveLogger.addEntry(dataToAdd)
-          }, 300000)
+          }, 600000)
         }
         break
       }
-      case 2026:
-        if (!accessory.getService(this.Service.MotionSensor)) accessory.addService(this.Service.MotionSensor)
+      case 2026: {
+        const motionService = accessory.getService(this.Service.MotionSensor) || accessory.addService(this.Service.MotionSensor)
+        if (!this.platform.config.disableEveLogging) {
+          accessory.log = this.platform.log
+          accessory.eveLogger = new this.EveHistoryService('motion', accessory, {
+            storage: 'fs',
+            minutes: 10,
+            path: this.platform.eveLogPath
+          })
+          corrInterval.setCorrectingInterval(() => {
+            const dataToAdd = {
+              time: Date.now(),
+              status: motionService.getCharacteristic(this.Characteristic.MotionDetected).value ? 1 : 0
+            }
+            accessory.eveLogger.addEntry(dataToAdd)
+          }, 600000)
+        }
         break
-      case 3026:
-        if (!accessory.getService(this.Service.ContactSensor)) accessory.addService(this.Service.ContactSensor)
+      }
+      case 3026: {
+        const contactService = accessory.getService(this.Service.ContactSensor) || accessory.addService(this.Service.ContactSensor)
+        if (!this.platform.config.disableEveLogging) {
+          accessory.log = this.platform.log
+          accessory.eveLogger = new this.EveHistoryService('door', accessory, {
+            storage: 'fs',
+            minutes: 10,
+            path: this.platform.eveLogPath
+          })
+          corrInterval.setCorrectingInterval(() => {
+            const dataToAdd = {
+              time: Date.now(),
+              status: contactService.getCharacteristic(this.Characteristic.ContactSensorState).value
+            }
+            accessory.eveLogger.addEntry(dataToAdd)
+          }, 600000)
+        }
         break
+      }
     }
     this.accessory = accessory
   }
@@ -107,14 +139,18 @@ module.exports = class deviceZBDev {
           if (helpers.hasProperty(params, 'motion') && helpers.hasProperty(params, 'trigTime')) {
             const timeNow = new Date()
             const diff = (timeNow.getTime() - params.trigTime) / 1000
-            this.accessory
-              .getService(this.Service.MotionSensor)
-              .updateCharacteristic(
-                this.Characteristic.MotionDetected,
-                helpers.hasProperty(params, 'updateSource') &&
-                  params.motion === 1 &&
-                  diff < (this.platform.config.sensorTimeDifference || 120)
-              )
+            const motionDetected =
+              helpers.hasProperty(params, 'updateSource') &&
+              params.motion === 1 &&
+              diff < (this.platform.config.sensorTimeDifference || 120)
+            if (!this.platform.config.disableEveLogging) {
+              const eveLog = {
+                time: Date.now(),
+                status: motionDetected ? 1 : 0
+              }
+              this.accessory.eveLogger.addEntry(eveLog)
+            }
+            this.accessory.getService(this.Service.MotionSensor).updateCharacteristic(this.Characteristic.MotionDetected, motionDetected)
             break
           }
           break
@@ -123,6 +159,13 @@ module.exports = class deviceZBDev {
             this.accessory
               .getService(this.Service.ContactSensor)
               .updateCharacteristic(this.Characteristic.ContactSensorState, params.lock)
+            if (!this.platform.config.disableEveLogging) {
+              const eveLog = {
+                time: Date.now(),
+                status: params.lock
+              }
+              this.accessory.eveLogger.addEntry(eveLog)
+            }
           }
           break
         default:

From 02ad28b744c70ed3076a72e450e0083012b16bb5 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 20 Oct 2020 13:03:48 +0100
Subject: [PATCH 0524/3183] 3.8.0-1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index df39a3ff..33e0e6a1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.8.0-0",
+  "version": "3.8.0-1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index ff11f65a..4b8d06f5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.8.0-0",
+  "version": "3.8.0-1",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 6017176a562a112122e6638d1289b7cc0c460e9e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 20 Oct 2020 15:46:23 +0100
Subject: [PATCH 0525/3183] updates to B1 brightness

---
 lib/device/light.js | 32 ++++++++++++++++++++++++++------
 1 file changed, 26 insertions(+), 6 deletions(-)

diff --git a/lib/device/light.js b/lib/device/light.js
index 70d41bf8..9172b63e 100644
--- a/lib/device/light.js
+++ b/lib/device/light.js
@@ -18,6 +18,13 @@ module.exports = class deviceLight {
     } else if (helpers.devicesColourable.includes(accessory.context.eweUIID)) {
       lightService.getCharacteristic(this.Characteristic.Brightness)
         .on('set', (value, callback) => this.internalUpdate('c_brightness', value, callback))
+      if (accessory.context.eweUIID === 22) {
+        lightService
+          .getCharacteristic(this.Characteristic.Brightness)
+          .setProps({
+            minStep: 100
+          })
+      }
       lightService
         .getCharacteristic(this.Characteristic.Hue)
         .on('set', (value, callback) => this.internalUpdate('c_hue', value, callback))
@@ -98,7 +105,9 @@ module.exports = class deviceLight {
             }
           }
           break
-        case 'brightness':
+        case 'brightness': {
+          const updateKey = Math.random().toString(36).substr(2, 8)
+          this.accessory.context.updateKey = updateKey
           switch (this.accessory.context.eweUIID) {
             case 36: //* ** KING-M4 ***\\
               params.bright = Math.round((value * 9) / 10 + 10)
@@ -108,10 +117,14 @@ module.exports = class deviceLight {
               params.mode = 0
               break
           }
-          await helpers.sleep(250)
+          await helpers.sleep(750)
+          if (updateKey !== this.accessory.context.updateKey) return
           await this.platform.sendDeviceUpdate(this.accessory, params)
           break
-        case 'c_brightness':
+        }
+        case 'c_brightness': {
+          const updateKey = Math.random().toString(36).substr(2, 8)
+          this.accessory.context.updateKey = updateKey
           switch (this.accessory.context.eweUIID) {
             case 22: //* ** B1 ***\\
               newRGB = convert.hsv.rgb(
@@ -119,6 +132,7 @@ module.exports = class deviceLight {
                 lightService.getCharacteristic(this.Characteristic.Saturation).value,
                 value
               )
+              if (newRGB[0] + newRGB[1] + newRGB[2] === 0) return
               params = {
                 zyx_mode: 2,
                 type: 'middle',
@@ -136,10 +150,14 @@ module.exports = class deviceLight {
               }
               break
           }
-          await helpers.sleep(250)
+          await helpers.sleep(750)
+          if (updateKey !== this.accessory.context.updateKey) return
           await this.platform.sendDeviceUpdate(this.accessory, params)
           break
-        case 'c_hue':
+        }
+        case 'c_hue': {
+          const updateKey = Math.random().toString(36).substr(2, 8)
+          this.accessory.context.updateKey = updateKey
           newRGB = convert.hsv.rgb(value, lightService.getCharacteristic(this.Characteristic.Saturation).value, 100)
           switch (this.accessory.context.eweUIID) {
             case 22: //* ** B1 ***\\
@@ -162,9 +180,11 @@ module.exports = class deviceLight {
               }
               break
           }
-          await helpers.sleep(250)
+          await helpers.sleep(750)
+          if (updateKey !== this.accessory.context.updateKey) return
           await this.platform.sendDeviceUpdate(this.accessory, params)
           break
+        }
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)

From 5ba4f925123a6528ac0190c5130dcdc45d0d1944 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 20 Oct 2020 19:06:47 +0100
Subject: [PATCH 0526/3183] bug?: Char.Active to .On

---
 lib/device/fan.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/device/fan.js b/lib/device/fan.js
index 761afef6..74405872 100644
--- a/lib/device/fan.js
+++ b/lib/device/fan.js
@@ -17,7 +17,7 @@ module.exports = class deviceFan {
       .getCharacteristic(this.Characteristic.On)
       .on('set', async (value, callback) => {
         callback()
-        if (value === 0) {
+        if (!value) {
           await helpers.sleep(500)
           fanService.setCharacteristic(this.Characteristic.RotationSpeed, 0)
         }

From d386fdd26043f2336f82dd0912856722637b21d2 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 20 Oct 2020 19:08:00 +0100
Subject: [PATCH 0527/3183] 3.8.0-2

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 33e0e6a1..7e110452 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.8.0-1",
+  "version": "3.8.0-2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 4b8d06f5..70068ab0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.8.0-1",
+  "version": "3.8.0-2",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 0540474bc81d34f35c0690a0b54d4e497730a288 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 21 Oct 2020 07:40:45 +0100
Subject: [PATCH 0528/3183] initialise sensors last

---
 lib/ewelink-http.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/lib/ewelink-http.js b/lib/ewelink-http.js
index 4ac13318..8219f8f8 100644
--- a/lib/ewelink-http.js
+++ b/lib/ewelink-http.js
@@ -171,6 +171,7 @@ module.exports = class eWeLinkHTTP {
         throw new Error(JSON.stringify(body, null, 2))
       }
       const deviceList = []
+      const sensorList = []
       if (body.data.thingList && body.data.thingList.length > 0) {
         body.data.thingList.forEach(d => {
           if (
@@ -179,11 +180,15 @@ module.exports = class eWeLinkHTTP {
             helpers.hasProperty(d.itemData.extra, 'uiid') &&
             !this.hideDevFromHB.includes(d.itemData.deviceid)
           ) {
-            deviceList.push(d.itemData)
+            if (d.itemData.extra.uiid === 102) {
+              sensorList.push(d.itemData)
+            } else {
+              deviceList.push(d.itemData)
+            }
           }
         })
       }
-      return deviceList
+      return deviceList.concat(sensorList)
     } catch (err) {
       if (helpers.hasProperty(err, 'code') && helpers.httpRetryCodes.includes(err.code)) {
         if (this.debug) {

From 64901b9113864250f3635095906158d88e0549cd Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 21 Oct 2020 07:45:57 +0100
Subject: [PATCH 0529/3183] 3.8.0-3

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 7e110452..7787ae85 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.8.0-2",
+  "version": "3.8.0-3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 70068ab0..68bf985f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.8.0-2",
+  "version": "3.8.0-3",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 7c4352fff26772fb726298c5d0259ba06fcf94e9 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Wed, 21 Oct 2020 09:23:19 +0100
Subject: [PATCH 0530/3183] Update codeql-analysis.yml

---
 .github/workflows/codeql-analysis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 7158717c..bc0e9c59 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -2,10 +2,10 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [master, ]
+    branches: [release]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [master]
+    branches: [release]
   schedule:
     - cron: '0 1 * * 5'
 

From 8b0e98145aa769c61d40a6de0503246e2e5bc65c Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Wed, 21 Oct 2020 09:27:06 +0100
Subject: [PATCH 0531/3183] Update codeql-analysis.yml

---
 .github/workflows/codeql-analysis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index bc0e9c59..51bab658 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -2,10 +2,10 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [release]
+    branches: [latest]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [release]
+    branches: [latest]
   schedule:
     - cron: '0 1 * * 5'
 

From 8b41825d2bb887fa79e3213a35991e48cb436d1d Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Wed, 21 Oct 2020 09:32:58 +0100
Subject: [PATCH 0532/3183] Update codeql-analysis.yml

---
 .github/workflows/codeql-analysis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 7158717c..51bab658 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -2,10 +2,10 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [master, ]
+    branches: [latest]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [master]
+    branches: [latest]
   schedule:
     - cron: '0 1 * * 5'
 

From f0cc347cdf844cf7cb3bd3103f9aaf2552b207f7 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 21 Oct 2020 09:35:21 +0100
Subject: [PATCH 0533/3183] 3.8.0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 7787ae85..88e02e95 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.8.0-3",
+  "version": "3.8.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 68bf985f..64f5a284 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.8.0-3",
+  "version": "3.8.0",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From c300f38394874fa28751810df8fa686aee60ba97 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Thu, 22 Oct 2020 20:56:59 +0100
Subject: [PATCH 0534/3183] add hoobs certification badge

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 4fb13bae..649fd4db 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,8 @@
 
 Homebridge plugin to control eWeLink devices with original firmware.
 
-[![verified-by-homebridge](https://badgen.net/badge/homebridge/verified/purple)](https://github.com/homebridge/homebridge/wiki/Verified-Plugins)   
+[![verified-by-homebridge](https://badgen.net/badge/homebridge/verified/purple)](https://github.com/homebridge/homebridge/wiki/Verified-Plugins)
+[![hoobs-certified](https://badgen.net/badge/HOOBS/Certified/yellow)](https://plugins.hoobs.org/plugin/homebridge-govee)   
 [![npm](https://img.shields.io/npm/v/homebridge-ewelink/latest?label=latest)](https://www.npmjs.com/package/homebridge-ewelink)
 [![npm](https://img.shields.io/npm/v/homebridge-ewelink/beta?label=beta)](https://github.com/bwp91/homebridge-ewelink/wiki/Beta-Version)   
 [![npm](https://img.shields.io/npm/dt/homebridge-ewelink)](https://www.npmjs.com/package/homebridge-ewelink)

From a0bb003935904ea8f0f57713ed183c90836819d5 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Fri, 23 Oct 2020 11:16:50 +0100
Subject: [PATCH 0535/3183] Update README.md

---
 README.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 649fd4db..f08d80a3 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,11 @@
 <p align="center">
-   <a href="https://github.com/homebridge/verified/blob/master/verified-plugins.json"><img alt="Homebridge Verified" src="https://user-images.githubusercontent.com/43026681/90361629-9af86200-e056-11ea-8553-4e4e5c4b5a54.png" width="600px"></a>
+   <a href="https://github.com/bwp91/homebridge-ewelink"><img alt="Homebridge Verified" src="https://user-images.githubusercontent.com/43026681/90361629-9af86200-e056-11ea-8553-4e4e5c4b5a54.png" width="600px"></a>
 </p>
 <span align="center">
   
 # homebridge-ewelink 
 
-Homebridge plugin to control eWeLink devices with original firmware.
+Homebridge/HOOBS plugin to control eWeLink devices with original firmware.
 
 [![verified-by-homebridge](https://badgen.net/badge/homebridge/verified/purple)](https://github.com/homebridge/homebridge/wiki/Verified-Plugins)
 [![hoobs-certified](https://badgen.net/badge/HOOBS/Certified/yellow)](https://plugins.hoobs.org/plugin/homebridge-govee)   
@@ -17,8 +17,8 @@ Homebridge plugin to control eWeLink devices with original firmware.
 
 </span>
 
-### Homebridge
-To use this plugin, you will need to already have Homebridge installed. Please refer to the [Homebridge website](https://homebridge.io) for more information and installation instructions.
+### Prerequisites
+To use this plugin, you will need to already have [Homebridge](https://homebridge.io) or [HOOBS](https://hoobs.org) installed. Please refer to the links for more information and installation instructions.
 
 ### Setup
 * [Installation (Homebridge)](https://github.com/bwp91/homebridge-ewelink/wiki/Installation-(Homebridge))

From 1fd1c8923dfdfd2a42ea6aeba502bdbf677a0b27 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Fri, 23 Oct 2020 11:21:24 +0100
Subject: [PATCH 0536/3183] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index f08d80a3..f73a85c9 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@
 Homebridge/HOOBS plugin to control eWeLink devices with original firmware.
 
 [![verified-by-homebridge](https://badgen.net/badge/homebridge/verified/purple)](https://github.com/homebridge/homebridge/wiki/Verified-Plugins)
-[![hoobs-certified](https://badgen.net/badge/HOOBS/Certified/yellow)](https://plugins.hoobs.org/plugin/homebridge-govee)   
+[![hoobs-certified](https://badgen.net/badge/HOOBS/Certified/yellow)](https://plugins.hoobs.org/plugin/homebridge-ewelink)   
 [![npm](https://img.shields.io/npm/v/homebridge-ewelink/latest?label=latest)](https://www.npmjs.com/package/homebridge-ewelink)
 [![npm](https://img.shields.io/npm/v/homebridge-ewelink/beta?label=beta)](https://github.com/bwp91/homebridge-ewelink/wiki/Beta-Version)   
 [![npm](https://img.shields.io/npm/dt/homebridge-ewelink)](https://www.npmjs.com/package/homebridge-ewelink)

From 22538fcc16e4a5b20a50ecafb19ee0edfa46e6c8 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 23 Oct 2020 15:59:11 +0100
Subject: [PATCH 0537/3183] 3.8.1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 88e02e95..01904ac4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.8.0",
+  "version": "3.8.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 64f5a284..812bd92b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.8.0",
+  "version": "3.8.1",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From d4b8ae675615dfd88f5133a168a6be51e67144e1 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 24 Oct 2020 09:13:24 +0100
Subject: [PATCH 0538/3183] reorder keywords

---
 package.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 812bd92b..d7a09be8 100644
--- a/package.json
+++ b/package.json
@@ -27,12 +27,12 @@
   "keywords": [
     "homebridge",
     "homebridge-plugin",
-    "sonoff",
+    "homebridge-ewelink",
+    "hoobs",
     "homekit",
     "siri",
     "ewelink",
-    "homebridge-ewelink",
-    "hoobs",
+    "sonoff",
     "eachen"
   ],
   "engines": {

From 7dd7f7fd8523a6966d6cc1b653d19af0d4af34ba Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 24 Oct 2020 09:13:39 +0100
Subject: [PATCH 0539/3183] plugin desc

---
 config.schema.json | 2 +-
 package.json       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 34ad95d6..7c03af88 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -2,7 +2,7 @@
   "pluginAlias": "eWeLink",
   "pluginType": "platform",
   "singular": true,
-  "headerDisplay": "Homebridge plugin to control eWeLink devices with original firmware.",
+  "headerDisplay": "Homebridge/HOOBS plugin to control eWeLink devices with original firmware.",
   "footerDisplay": "For help and support please visit our [GitHub Wiki](https://github.com/bwp91/homebridge-ewelink/wiki).",
   "schema": {
     "type": "object",
diff --git a/package.json b/package.json
index d7a09be8..b98fa8ce 100644
--- a/package.json
+++ b/package.json
@@ -65,7 +65,7 @@
     }
   ],
   "dependencies": {
-    "axios": "0.20.0",
+    "axios": "0.21.0",
     "color-convert": "2.0.1",
     "correcting-interval": "2.0.0",
     "fakegato-history": "0.5.6",

From 010f798f9d9073a4310efd681f466ee2631656cb Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 24 Oct 2020 09:14:09 +0100
Subject: [PATCH 0540/3183] update axios dep

---
 package-lock.json | 6 +++---
 package.json      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 01904ac4..4ac4d924 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -54,9 +54,9 @@
       "integrity": "sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug=="
     },
     "axios": {
-      "version": "0.20.0",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-0.20.0.tgz",
-      "integrity": "sha512-ANA4rr2BDcmmAQLOKft2fufrtuvlqR+cXNNinUmvfeSNCOF98PZL+7M/v1zIdGo7OLjEA9J2gXJL+j4zGsl0bA==",
+      "version": "0.21.0",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.0.tgz",
+      "integrity": "sha512-fmkJBknJKoZwem3/IKSSLpkdNXZeBu5Q7GA/aRsr2btgrptmSCxi2oFjZHqGdK9DoTil9PIHlPIZw2EcRJXRvw==",
       "requires": {
         "follow-redirects": "^1.10.0"
       }
diff --git a/package.json b/package.json
index b98fa8ce..0d98836b 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,7 @@
     "JuniorGenius",
     "BobbySlope"
   ],
-  "description": "Homebridge plugin to control eWeLink devices with original firmware.",
+  "description": "Homebridge/HOOBS plugin to control eWeLink devices with original firmware.",
   "license": "MIT",
   "keywords": [
     "homebridge",

From 3f703ec3f387f84553fd4404193b386f50dbd0e2 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 24 Oct 2020 10:36:36 +0100
Subject: [PATCH 0541/3183] doesnt need to be anon func

---
 lib/ewelink-platform.js | 76 ++++++++++++++++++++---------------------
 1 file changed, 37 insertions(+), 39 deletions(-)

diff --git a/lib/ewelink-platform.js b/lib/ewelink-platform.js
index 520ed5b9..250dc4d5 100644
--- a/lib/ewelink-platform.js
+++ b/lib/ewelink-platform.js
@@ -76,47 +76,45 @@ module.exports = class eWeLinkPlatform {
       this.wsClient.login()
       this.lanDevices = await this.lanClient.getHosts()
       await this.lanClient.startMonitor()
-      ;(() => {
-        if (Object.keys(this.config.groups || []).length > 0) {
-          this.config.groups
-            .filter(g => helpers.hasProperty(g, 'type') && helpers.allowedGroups.includes(g.type))
-            .filter(g => helpers.hasProperty(g, 'deviceId') && this.devicesInEW.has(g.deviceId))
-            .forEach(g => this.cusG.set(g.deviceId + 'SWX', g))
-        }
-        if (Object.keys(this.config.bridgeSensors || []).length > 0) {
-          this.config.bridgeSensors
-            .filter(s => helpers.hasProperty(s, 'deviceId') && this.devicesInEW.has(s.deviceId))
-            .forEach(s => this.cusS.set(s.fullDeviceId, s))
-        }
-        this.log('[%s] eWeLink devices loaded from the Homebridge cache.', this.devicesInHB.size)
-        this.log('[%s] primary devices loaded from your eWeLink account.', this.devicesInEW.size)
-        this.devicesInHB.forEach(a => {
-          if (!this.devicesInEW.has(a.context.eweDeviceId)) this.removeAccessory(a)
-        })
-        this.devicesInEW.forEach(d => this.initialiseDevice(d))
-        this.wsClient.receiveUpdate(d => this.receiveDeviceUpdate(d))
-        this.lanClient.receiveUpdate(d => this.receiveDeviceUpdate(d))
-        this.wsRefresh = promInterval(
-          async () => {
-            if (this.wsRefreshFlag) {
-              try {
-                if (this.wsClient) {
-                  await this.wsClient.getHost()
-                  await this.wsClient.closeConnection()
-                  await helpers.sleep(250)
-                  await this.wsClient.login()
-                }
-              } catch (err) {
-                this.log.warn(this.debug ? err : err.message)
+      if (Object.keys(this.config.groups || []).length > 0) {
+        this.config.groups
+          .filter(g => helpers.hasProperty(g, 'type') && helpers.allowedGroups.includes(g.type))
+          .filter(g => helpers.hasProperty(g, 'deviceId') && this.devicesInEW.has(g.deviceId))
+          .forEach(g => this.cusG.set(g.deviceId + 'SWX', g))
+      }
+      if (Object.keys(this.config.bridgeSensors || []).length > 0) {
+        this.config.bridgeSensors
+          .filter(s => helpers.hasProperty(s, 'deviceId') && this.devicesInEW.has(s.deviceId))
+          .forEach(s => this.cusS.set(s.fullDeviceId, s))
+      }
+      this.log('[%s] eWeLink devices loaded from the Homebridge cache.', this.devicesInHB.size)
+      this.log('[%s] primary devices loaded from your eWeLink account.', this.devicesInEW.size)
+      this.devicesInHB.forEach(a => {
+        if (!this.devicesInEW.has(a.context.eweDeviceId)) this.removeAccessory(a)
+      })
+      this.devicesInEW.forEach(d => this.initialiseDevice(d))
+      this.wsClient.receiveUpdate(d => this.receiveDeviceUpdate(d))
+      this.lanClient.receiveUpdate(d => this.receiveDeviceUpdate(d))
+      this.wsRefresh = promInterval(
+        async () => {
+          if (this.wsRefreshFlag) {
+            try {
+              if (this.wsClient) {
+                await this.wsClient.getHost()
+                await this.wsClient.closeConnection()
+                await helpers.sleep(250)
+                await this.wsClient.login()
               }
+            } catch (err) {
+              this.log.warn(this.debug ? err : err.message)
             }
-          }, 1800000, { stopOnError: false }
-        )
-        this.log("eWeLink sync complete. Don't forget to ⭐️  this plugin on GitHub if you're finding it useful!")
-        if (this.config.debugReqRes) {
-          this.log.warn("Note: 'Request & Response Logging' is not advised for long-term use.")
-        }
-      })()
+          }
+        }, 1800000, { stopOnError: false }
+      )
+      this.log("eWeLink sync complete. Don't forget to ⭐️  this plugin on GitHub if you're finding it useful!")
+      if (this.config.debugReqRes) {
+        this.log.warn("Note: 'Request & Response Logging' is not advised for long-term use.")
+      }
     } catch (err) {
       this.log.error('************* Cannot load homebridge-ewelink *************')
       this.log.error(this.debug ? err : err.message)

From ffbea0b650b84ff7a38dbd21e19c79d6dcb71b50 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 24 Oct 2020 10:39:34 +0100
Subject: [PATCH 0542/3183] formatting

---
 lib/helpers.js | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/lib/helpers.js b/lib/helpers.js
index d9f99bd4..cafb56f6 100644
--- a/lib/helpers.js
+++ b/lib/helpers.js
@@ -44,22 +44,23 @@ module.exports = {
     'switches', 'temperature', 'trigTime',
     'type', 'voltage', 'zyx_mode'
   ],
-  defaultMultiSwitchOff: [{
-    switch: 'off',
-    outlet: 0
-  },
-  {
-    switch: 'off',
-    outlet: 1
-  },
-  {
-    switch: 'off',
-    outlet: 2
-  },
-  {
-    switch: 'off',
-    outlet: 3
-  }
+  defaultMultiSwitchOff: [
+    {
+      switch: 'off',
+      outlet: 0
+    },
+    {
+      switch: 'off',
+      outlet: 1
+    },
+    {
+      switch: 'off',
+      outlet: 2
+    },
+    {
+      switch: 'off',
+      outlet: 3
+    }
   ],
   defaultCurtainCache: {
     cacheCurrentPosition: 0

From 6e42b8e7df9fca41711128d61dd83c6fa892f16e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 24 Oct 2020 10:39:48 +0100
Subject: [PATCH 0543/3183] remove as not used

---
 lib/helpers.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/helpers.js b/lib/helpers.js
index cafb56f6..1da12b5b 100644
--- a/lib/helpers.js
+++ b/lib/helpers.js
@@ -8,7 +8,6 @@ module.exports = {
   appSecret: '6Nz4n0xA8s8qdxQf2GqurZj2Fs55FUvM',
   httpRetryCodes: ['ENOTFOUND', 'ETIMEDOUT', 'EAI_AGAIN'],
   allowedGroups: ['blind', 'garage', 'garage_two', 'garage_four', 'garage_eachen', 'lock', 'valve'],
-  devicesHideable: ['switch', 'light'],
   devicesNonLAN: [22, 28, 34, 59, 102],
   devicesSingleSwitch: [1, 5, 6, 14, 15, 22, 24, 27, 32, 36, 44, 59],
   devicesMultiSwitch: [2, 3, 4, 7, 8, 9, 29, 30, 31, 34, 41],

From 0b53d1d851e4af6fe4e3096281516f2637d760cd Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 24 Oct 2020 16:07:34 +0100
Subject: [PATCH 0544/3183] eve characteristics

---
 lib/device/outlet.js |  80 ++++++++++++++---
 package-lock.json    | 208 -------------------------------------------
 package.json         |   1 -
 3 files changed, 67 insertions(+), 222 deletions(-)

diff --git a/lib/device/outlet.js b/lib/device/outlet.js
index 1493ddd4..4dfce9f8 100644
--- a/lib/device/outlet.js
+++ b/lib/device/outlet.js
@@ -3,15 +3,69 @@
 'use strict'
 const corrInterval = require('correcting-interval')
 const fakegato = require('fakegato-history')
-const hbLib = require('homebridge-lib')
 const helpers = require('./../helpers')
+const util = require('util')
 module.exports = class deviceOutlet {
   constructor (platform, accessory) {
     this.platform = platform
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
-    this.EveCharacteristics = new hbLib.EveHomeKitTypes(platform.api).Characteristics
     this.EveHistoryService = fakegato(platform.api)
+    const self = this
+    this.eveCurrentConsumption = function () {
+      self.Characteristic.call(this, 'Current Consumption', 'E863F10D-079E-48FF-8F27-9C2605A29F52')
+      this.setProps({
+        format: self.Characteristic.Formats.FLOAT,
+        unit: 'W',
+        perms: [self.Characteristic.Perms.READ, self.Characteristic.Perms.NOTIFY]
+      })
+      this.value = this.getDefaultValue()
+    }
+    this.eveTotalConsumption = function () {
+      self.Characteristic.call(this, 'Total Consumption', 'E863F10C-079E-48FF-8F27-9C2605A29F52')
+      this.setProps({
+        format: self.Characteristic.Formats.FLOAT,
+        unit: 'kWh',
+        perms: [self.Characteristic.Perms.READ, self.Characteristic.Perms.NOTIFY]
+      })
+      this.value = this.getDefaultValue()
+    }
+    this.eveVoltage = function () {
+      self.Characteristic.call(this, 'Voltage', 'E863F10A-079E-48FF-8F27-9C2605A29F52')
+      this.setProps({
+        format: self.Characteristic.Formats.FLOAT,
+        unit: 'V',
+        perms: [self.Characteristic.Perms.READ, self.Characteristic.Perms.NOTIFY]
+      })
+      this.value = this.getDefaultValue()
+    }
+    this.eveElectricCurrent = function () {
+      self.Characteristic.call(this, 'Electric Current', 'E863F126-079E-48FF-8F27-9C2605A29F52')
+      this.setProps({
+        format: self.Characteristic.Formats.FLOAT,
+        unit: 'A',
+        perms: [self.Characteristic.Perms.READ, self.Characteristic.Perms.NOTIFY]
+      })
+      this.value = this.getDefaultValue()
+    }
+    this.eveResetTotal = function () {
+      self.Characteristic.call(this, 'Reset Total', 'E863F112-079E-48FF-8F27-9C2605A29F52')
+      this.setProps({
+        format: self.Characteristic.Formats.UINT32,
+        perms: [self.Characteristic.Perms.READ, self.Characteristic.Perms.NOTIFY, self.Characteristic.Perms.WRITE]
+      })
+      this.value = this.getDefaultValue()
+    }
+    util.inherits(this.eveCurrentConsumption, this.Characteristic)
+    util.inherits(this.eveTotalConsumption, this.Characteristic)
+    util.inherits(this.eveVoltage, this.Characteristic)
+    util.inherits(this.eveElectricCurrent, this.Characteristic)
+    util.inherits(this.eveResetTotal, this.Characteristic)
+    this.eveCurrentConsumption.UUID = 'E863F10D-079E-48FF-8F27-9C2605A29F52'
+    this.eveTotalConsumption.UUID = 'E863F10C-079E-48FF-8F27-9C2605A29F52'
+    this.eveVoltage.UUID = 'E863F10A-079E-48FF-8F27-9C2605A29F52'
+    this.eveElectricCurrent.UUID = 'E863F126-079E-48FF-8F27-9C2605A29F52'
+    this.eveResetTotal.UUID = 'E863F112-079E-48FF-8F27-9C2605A29F52'
     if (accessory.getService(this.Service.Switch)) {
       accessory.removeService(accessory.getService(this.Service.Switch))
     }
@@ -20,11 +74,11 @@ module.exports = class deviceOutlet {
       accessory.addService(this.Service.Outlet)
       outletService = accessory.getService(this.Service.Outlet)
       if (!helpers.devicesSingleSwitchOutlet.includes(accessory.context.eweModel) && !this.platform.config.disableEveLogging) {
-        outletService.addCharacteristic(this.EveCharacteristics.Voltage)
-        outletService.addCharacteristic(this.EveCharacteristics.CurrentConsumption)
-        outletService.addCharacteristic(this.EveCharacteristics.ElectricCurrent)
-        outletService.addCharacteristic(this.EveCharacteristics.TotalConsumption)
-        outletService.addCharacteristic(this.EveCharacteristics.ResetTotal)
+        outletService.addCharacteristic(this.eveVoltage)
+        outletService.addCharacteristic(this.eveCurrentConsumption)
+        outletService.addCharacteristic(this.eveElectricCurrent)
+        outletService.addCharacteristic(this.eveTotalConsumption)
+        outletService.addCharacteristic(this.eveResetTotal)
         accessory.context = {
           ...accessory.context,
           ...{
@@ -49,7 +103,7 @@ module.exports = class deviceOutlet {
       corrInterval.setCorrectingInterval(() => {
         const isOn = outletService.getCharacteristic(this.Characteristic.On).value
         const currentWatt = isOn
-          ? outletService.getCharacteristic(this.EveCharacteristics.CurrentConsumption).value
+          ? outletService.getCharacteristic(this.eveCurrentConsumption).value
           : 0
         if (accessory.eveLogger.isHistoryLoaded()) {
           accessory.context.extraPersistedData = accessory.eveLogger.getExtraPersistedData()
@@ -80,7 +134,7 @@ module.exports = class deviceOutlet {
         })
       }, 600000)
       outletService
-        .getCharacteristic(this.EveCharacteristics.TotalConsumption)
+        .getCharacteristic(this.eveTotalConsumption)
         .on('get', callback => {
           accessory.context.extraPersistedData = accessory.eveLogger.getExtraPersistedData()
           if (accessory.context.extraPersistedData !== undefined) {
@@ -89,7 +143,7 @@ module.exports = class deviceOutlet {
           callback(null, accessory.context.totalEnergy)
         })
       outletService
-        .getCharacteristic(this.EveCharacteristics.ResetTotal)
+        .getCharacteristic(this.eveResetTotal)
         .on('set', (value, callback) => {
           accessory.context.totalEnergy = 0
           accessory.context.lastReset = value
@@ -130,7 +184,7 @@ module.exports = class deviceOutlet {
         }
       }
       if (helpers.hasProperty(params, 'power')) {
-        outletService.updateCharacteristic(this.EveCharacteristics.CurrentConsumption, parseFloat(params.power))
+        outletService.updateCharacteristic(this.eveCurrentConsumption, parseFloat(params.power))
         if (!helpers.devicesSingleSwitchOutlet.includes(this.accessory.context.eweModel) && !this.platform.config.disableEveLogging) {
           outletService.updateCharacteristic(
             this.Characteristic.OutletInUse,
@@ -144,10 +198,10 @@ module.exports = class deviceOutlet {
         }
       }
       if (helpers.hasProperty(params, 'voltage')) {
-        outletService.updateCharacteristic(this.EveCharacteristics.Voltage, parseFloat(params.voltage))
+        outletService.updateCharacteristic(this.eveVoltage, parseFloat(params.voltage))
       }
       if (helpers.hasProperty(params, 'current')) {
-        outletService.updateCharacteristic(this.EveCharacteristics.ElectricCurrent, parseFloat(params.current))
+        outletService.updateCharacteristic(this.eveElectricCurrent, parseFloat(params.current))
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
diff --git a/package-lock.json b/package-lock.json
index 4ac4d924..bfa79b88 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -35,19 +35,6 @@
         }
       }
     },
-    "ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "requires": {
-        "color-convert": "^2.0.1"
-      }
-    },
-    "array-flatten": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz",
-      "integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ=="
-    },
     "arrify": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz",
@@ -71,38 +58,11 @@
       "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.0.1.tgz",
       "integrity": "sha512-IdZR9mh6ahOBv/hYGiXyVuyCetmGJhtYkqLBpTStdhEGjegpPlUawydyaF3pbIOFynJTpllEs+NP+CS9jKFLjA=="
     },
-    "bonjour": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/bonjour/-/bonjour-3.5.0.tgz",
-      "integrity": "sha1-jokKGD2O6aI5OzhExpGkK897yfU=",
-      "requires": {
-        "array-flatten": "^2.1.0",
-        "deep-equal": "^1.0.1",
-        "dns-equal": "^1.0.0",
-        "dns-txt": "^2.0.2",
-        "multicast-dns": "^6.0.1",
-        "multicast-dns-service-types": "^1.1.0"
-      }
-    },
     "buffer-equal-constant-time": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz",
       "integrity": "sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk="
     },
-    "buffer-indexof": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.1.tgz",
-      "integrity": "sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g=="
-    },
-    "chalk": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-      "requires": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      }
-    },
     "chnl": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/chnl/-/chnl-1.2.0.tgz",
@@ -134,19 +94,6 @@
         "ms": "2.0.0"
       }
     },
-    "deep-equal": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz",
-      "integrity": "sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==",
-      "requires": {
-        "is-arguments": "^1.0.4",
-        "is-date-object": "^1.0.1",
-        "is-regex": "^1.0.4",
-        "object-is": "^1.0.1",
-        "object-keys": "^1.1.1",
-        "regexp.prototype.flags": "^1.2.0"
-      }
-    },
     "define-properties": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
@@ -155,28 +102,6 @@
         "object-keys": "^1.0.12"
       }
     },
-    "dns-equal": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz",
-      "integrity": "sha1-s55/HabrCnW6nBcySzR1PEfgZU0="
-    },
-    "dns-packet": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.1.tgz",
-      "integrity": "sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==",
-      "requires": {
-        "ip": "^1.1.0",
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "dns-txt": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/dns-txt/-/dns-txt-2.0.2.tgz",
-      "integrity": "sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY=",
-      "requires": {
-        "buffer-indexof": "^1.0.0"
-      }
-    },
     "ecdsa-sig-formatter": {
       "version": "1.0.11",
       "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz",
@@ -334,42 +259,11 @@
         "function-bind": "^1.1.1"
       }
     },
-    "has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
-    },
     "has-symbols": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz",
       "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg=="
     },
-    "homebridge-lib": {
-      "version": "4.7.16",
-      "resolved": "https://registry.npmjs.org/homebridge-lib/-/homebridge-lib-4.7.16.tgz",
-      "integrity": "sha512-+MYkMUUjP7mPdGT9fJU6ifjvg1SinCUlmdrzjPQZaoe119EN28d0bQSr1jpaVjWW1bqVo+KJT+ap5vnfAgFp1g==",
-      "requires": {
-        "bonjour": "^3.5.0",
-        "chalk": "^4.1.0",
-        "debug": "^4.2.0",
-        "semver": "^7.3.2"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
-          "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-        }
-      }
-    },
     "https-proxy-agent": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
@@ -399,16 +293,6 @@
       "resolved": "https://registry.npmjs.org/interval-promise/-/interval-promise-1.4.0.tgz",
       "integrity": "sha512-PUwEmGqUglJhb6M01JNvMDvxr4DA8FCeYoYCLHPEcBBZiq/8yOpCchfs1VJui7fXj69l170gAxzF1FeSA0nSlg=="
     },
-    "ip": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz",
-      "integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo="
-    },
-    "is-arguments": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.0.4.tgz",
-      "integrity": "sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA=="
-    },
     "is-callable": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.1.tgz",
@@ -419,11 +303,6 @@
       "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz",
       "integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g=="
     },
-    "is-negative-zero": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.0.tgz",
-      "integrity": "sha1-lVOxIbD6wohp2p7UWeIMdUN4hGE="
-    },
     "is-regex": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.1.tgz",
@@ -495,20 +374,6 @@
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
     },
-    "multicast-dns": {
-      "version": "6.2.3",
-      "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.3.tgz",
-      "integrity": "sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g==",
-      "requires": {
-        "dns-packet": "^1.3.1",
-        "thunky": "^1.0.2"
-      }
-    },
-    "multicast-dns-service-types": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz",
-      "integrity": "sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE="
-    },
     "node-dns-sd": {
       "version": "0.4.2",
       "resolved": "https://registry.npmjs.org/node-dns-sd/-/node-dns-sd-0.4.2.tgz",
@@ -529,52 +394,6 @@
       "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.8.0.tgz",
       "integrity": "sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA=="
     },
-    "object-is": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.3.tgz",
-      "integrity": "sha512-teyqLvFWzLkq5B9ki8FVWA902UER2qkxmdA4nLf+wjOLAWgxzCWZNCxpDq9MvE8MmhWNr+I8w3BN49Vx36Y6Xg==",
-      "requires": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.18.0-next.1"
-      },
-      "dependencies": {
-        "es-abstract": {
-          "version": "1.18.0-next.1",
-          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.1.tgz",
-          "integrity": "sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==",
-          "requires": {
-            "es-to-primitive": "^1.2.1",
-            "function-bind": "^1.1.1",
-            "has": "^1.0.3",
-            "has-symbols": "^1.0.1",
-            "is-callable": "^1.2.2",
-            "is-negative-zero": "^2.0.0",
-            "is-regex": "^1.1.1",
-            "object-inspect": "^1.8.0",
-            "object-keys": "^1.1.1",
-            "object.assign": "^4.1.1",
-            "string.prototype.trimend": "^1.0.1",
-            "string.prototype.trimstart": "^1.0.1"
-          }
-        },
-        "is-callable": {
-          "version": "1.2.2",
-          "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.2.tgz",
-          "integrity": "sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA=="
-        },
-        "object.assign": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.1.tgz",
-          "integrity": "sha512-VT/cxmx5yaoHSOTSyrCygIDFco+RsibY2NM0a4RdEeY/4KgqezwFtK1yr3U67xYhqJSlASm2pKhLVzPj2lr4bA==",
-          "requires": {
-            "define-properties": "^1.1.3",
-            "es-abstract": "^1.18.0-next.0",
-            "has-symbols": "^1.0.1",
-            "object-keys": "^1.1.1"
-          }
-        }
-      }
-    },
     "object-keys": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
@@ -611,25 +430,11 @@
       "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.4.tgz",
       "integrity": "sha512-A1kFqHekCTM7cz0udomYUoYNWjBebHm/5wzU/XqrBRBNWectVH0QIiN+NEcZ0Dte5hvzHwbr8+XQmguPhJ6WdQ=="
     },
-    "regexp.prototype.flags": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz",
-      "integrity": "sha512-2+Q0C5g951OlYlJz6yu5/M33IcsESLlLfsyIaLJaG4FA2r4yP8MvVMJUUP/fVBkSpbbbZlS5gynbEWLipiiXiQ==",
-      "requires": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.0-next.1"
-      }
-    },
     "safe-buffer": {
       "version": "5.2.1",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
       "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
     },
-    "semver": {
-      "version": "7.3.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz",
-      "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ=="
-    },
     "string.prototype.trimend": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz",
@@ -648,19 +453,6 @@
         "es-abstract": "^1.17.5"
       }
     },
-    "supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "requires": {
-        "has-flag": "^4.0.0"
-      }
-    },
-    "thunky": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz",
-      "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA=="
-    },
     "url-template": {
       "version": "2.0.8",
       "resolved": "https://registry.npmjs.org/url-template/-/url-template-2.0.8.tgz",
diff --git a/package.json b/package.json
index 0d98836b..289853a6 100644
--- a/package.json
+++ b/package.json
@@ -69,7 +69,6 @@
     "color-convert": "2.0.1",
     "correcting-interval": "2.0.0",
     "fakegato-history": "0.5.6",
-    "homebridge-lib": "4.7.16",
     "interval-promise": "1.4.0",
     "node-dns-sd": "0.4.2",
     "websocket-as-promised": "1.1.0",

From 2a536bcdbe59cf435371033ac4a2c6fb5be726bf Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 24 Oct 2020 16:57:44 +0100
Subject: [PATCH 0545/3183] 3.8.2

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index bfa79b88..c630ad00 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.8.1",
+  "version": "3.8.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 289853a6..f6e2722c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.8.1",
+  "version": "3.8.2",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 78c069eb6285e9be486c04e8f0e5617403ca4619 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 25 Oct 2020 12:33:45 +0000
Subject: [PATCH 0546/3183] clarity for enabled/disabled

---
 config.schema.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 7c03af88..3da13469 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -32,13 +32,13 @@
       "debug": {
         "title": "Debug Logging",
         "type": "boolean",
-        "description": "If enabled, more information will be added to the Homebridge log.",
+        "description": "If checked, more information will be added to the Homebridge log.",
         "default": false
       },
       "debugReqRes": {
         "title": "Request & Response Logging",
         "type": "boolean",
-        "description": "If enabled, HTTP, web socket and LAN mode messages will be added to the log. Not recommended for long-term use.",
+        "description": "If checked, HTTP, web socket and LAN mode messages will be added to the log. Not recommended for long-term use.",
         "default": false
       },
       "hideDevFromHB": {
@@ -54,13 +54,13 @@
       "disableHTTPRefresh": {
         "type": "boolean",
         "title": "Disable Initial Device Refresh",
-        "description": "If enabled, devices will not be refreshed with their most recent status from eWeLink when Homebridge starts. This setting can be useful for users who block their devices from accessing the internet.",
+        "description": "If checked, devices will not be refreshed with their most recent status from eWeLink when Homebridge starts. This setting can be useful for users who block their devices from accessing the internet.",
         "default": false
       },
       "disableEveLogging": {
         "type": "boolean",
         "title": "Disable Eve Logging",
-        "description": "If enabled, switch, thermostat and power readings will not be logged to the Eve App.",
+        "description": "If checked, switch, thermostat and power readings will not be logged to the Eve App.",
         "default": false
       },
       "inUsePowerThreshold": {
@@ -72,9 +72,9 @@
         "maximum": 100
       },
       "hideTHSwitch": {
-        "title": "TH10/TH16 Hide Switch",
+        "title": "Hide TH10/TH16 Switch",
         "type": "boolean",
-        "description": "If enabled, the switch for the TH10/TH16 devices will be hidden from Homebridge.",
+        "description": "If checked, the switch for the TH10/TH16 devices will be hidden from Homebridge.",
         "default": false
       },
       "hideLightFromFan": {
@@ -109,7 +109,7 @@
       "hideZBLDPress": {
         "title": "Zigbee Button Hide Double/Long Press",
         "type": "boolean",
-        "description": "If enabled, double and long press options will be hidden for the ZigBee button.",
+        "description": "If checked, double and long press options will be hidden for the ZigBee button.",
         "default": false
       },
       "nameOverride": {

From 478a0c0cb8b04ab25846f1228bd22ca4e5ea0212 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 25 Oct 2020 12:36:27 +0000
Subject: [PATCH 0547/3183] reorder setup steps

---
 lib/ewelink-platform.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ewelink-platform.js b/lib/ewelink-platform.js
index 250dc4d5..0758509b 100644
--- a/lib/ewelink-platform.js
+++ b/lib/ewelink-platform.js
@@ -71,9 +71,9 @@ module.exports = class eWeLinkPlatform {
       const deviceList = await this.httpClient.getDevices()
       deviceList.forEach(device => this.devicesInEW.set(device.deviceid, device))
       this.wsClient = new eWeLinkWS(this.config, this.log, this.authData)
-      this.lanClient = new eWeLinkLAN(this.config, this.log, deviceList)
       await this.wsClient.getHost()
       this.wsClient.login()
+      this.lanClient = new eWeLinkLAN(this.config, this.log, deviceList)
       this.lanDevices = await this.lanClient.getHosts()
       await this.lanClient.startMonitor()
       if (Object.keys(this.config.groups || []).length > 0) {

From 274db96e36ecff7618d0b7a4fcb12a484261e74a Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 25 Oct 2020 17:53:09 +0000
Subject: [PATCH 0548/3183] rf bridge more than 9 devs fix

---
 lib/ewelink-platform.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ewelink-platform.js b/lib/ewelink-platform.js
index 0758509b..3126f23b 100644
--- a/lib/ewelink-platform.js
+++ b/lib/ewelink-platform.js
@@ -496,7 +496,7 @@ module.exports = class eWeLinkPlatform {
   }
 
   addAccessory (device, hbDeviceId, hidden = false, extraContext = {}, type = '') {
-    const switchNumber = hbDeviceId.substr(-1).toString()
+    const switchNumber = hbDeviceId.split('SW')[1].toString()
     let newDeviceName = type === 'rf_sub' ? device.tags.zyx_info[switchNumber - 1].name : device.name
     const channelCount =
       type === 'rf_pri'

From f08009dbd3a275fef1a5bb880797d512712c10d5 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 25 Oct 2020 17:56:45 +0000
Subject: [PATCH 0549/3183] 3.8.3

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c630ad00..73f36f6d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.8.2",
+  "version": "3.8.3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index f6e2722c..6cdd8bd4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.8.2",
+  "version": "3.8.3",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 5f02e5b1e8c319800ee1109d40c2ed1b4b32de5e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 26 Oct 2020 06:17:19 +0000
Subject: [PATCH 0550/3183] fix for if chan > 9

---
 lib/device/rf-bridge.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/device/rf-bridge.js b/lib/device/rf-bridge.js
index 1ab23e68..dc5b11fa 100644
--- a/lib/device/rf-bridge.js
+++ b/lib/device/rf-bridge.js
@@ -125,7 +125,7 @@ module.exports = class deviceRFBridge {
               if (
                 acc.context.eweDeviceId === this.accessory.context.eweDeviceId &&
                 helpers.hasProperty(acc.context, 'buttons') &&
-                helpers.hasProperty(acc.context.buttons, chan.substr(-1).toString())
+                helpers.hasProperty(acc.context.buttons, chan.split('g')[1].toString())
               ) {
                 oAccessory = acc
               }

From 4a8170a68c750eabdf9976bce4d56800b02b5d9a Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 26 Oct 2020 06:18:01 +0000
Subject: [PATCH 0551/3183] 3.8.4

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 73f36f6d..d0282a10 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.8.3",
+  "version": "3.8.4",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 6cdd8bd4..5e588068 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.8.3",
+  "version": "3.8.4",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From f6077fc0be6dcf656197a9814e68d9ba510aa254 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 27 Oct 2020 10:02:23 +0000
Subject: [PATCH 0552/3183] parse config option

---
 lib/device/outlet.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/device/outlet.js b/lib/device/outlet.js
index 4dfce9f8..c444c782 100644
--- a/lib/device/outlet.js
+++ b/lib/device/outlet.js
@@ -11,6 +11,12 @@ module.exports = class deviceOutlet {
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
     this.EveHistoryService = fakegato(platform.api)
+    this.inUsePowerThreshold = parseInt(this.platform.config.inUsePowerThreshold)
+    this.inUsePowerThreshold = isNaN(this.inUsePowerThreshold)
+    ? helpers.defaults.inUsePowerThreshold
+    : this.inUsePowerThreshold < 0
+      ? helpers.defaults.inUsePowerThreshold
+      : this.inUsePowerThreshold
     const self = this
     this.eveCurrentConsumption = function () {
       self.Characteristic.call(this, 'Current Consumption', 'E863F10D-079E-48FF-8F27-9C2605A29F52')
@@ -188,7 +194,7 @@ module.exports = class deviceOutlet {
         if (!helpers.devicesSingleSwitchOutlet.includes(this.accessory.context.eweModel) && !this.platform.config.disableEveLogging) {
           outletService.updateCharacteristic(
             this.Characteristic.OutletInUse,
-            parseFloat(params.power) > (this.platform.config.inUsePowerThreshold || 0)
+            parseFloat(params.power) > (this.inUsePowerThreshold)
           )
           const isOn = this.accessory.getService(this.Service.Outlet).getCharacteristic(this.Characteristic.On).value
           this.accessory.eveLogger.addEntry({

From 310cd24100586fee29f27ee000e56b91213acc0c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 27 Oct 2020 10:09:36 +0000
Subject: [PATCH 0553/3183] parse config option

---
 lib/device/sensor.js | 8 +++++++-
 lib/device/zb-dev.js | 8 +++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/lib/device/sensor.js b/lib/device/sensor.js
index 47f5ad7d..c7e81ce3 100644
--- a/lib/device/sensor.js
+++ b/lib/device/sensor.js
@@ -10,6 +10,12 @@ module.exports = class deviceSensor {
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
     this.EveHistoryService = fakegato(platform.api)
+    this.lowBattThreshold = parseInt(this.platform.config.lowBattThreshold)
+    this.lowBattThreshold = isNaN(this.lowBattThreshold)
+    ? helpers.defaults.lowBattThreshold
+    : this.lowBattThreshold < 5
+      ? helpers.defaults.lowBattThreshold
+      : this.lowBattThreshold
     const contactService = accessory.getService(this.Service.ContactSensor) || accessory.addService(this.Service.ContactSensor)
     if (!accessory.getService(this.Service.BatteryService)) accessory.addService(this.Service.BatteryService)
     if (!this.platform.config.disableEveLogging) {
@@ -39,7 +45,7 @@ module.exports = class deviceSensor {
         batteryService.updateCharacteristic(this.Characteristic.BatteryLevel, scaledBattery)
         batteryService.updateCharacteristic(
           this.Characteristic.StatusLowBattery,
-          scaledBattery < (this.platform.config.lowBattThreshold || 25)
+          scaledBattery < this.lowBattThreshold
         )
       }
       if (!helpers.hasProperty(params, 'switch')) return
diff --git a/lib/device/zb-dev.js b/lib/device/zb-dev.js
index a496bf84..d993a656 100644
--- a/lib/device/zb-dev.js
+++ b/lib/device/zb-dev.js
@@ -10,6 +10,12 @@ module.exports = class deviceZBDev {
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
     this.EveHistoryService = fakegato(platform.api)
+    this.lowBattThreshold = parseInt(this.platform.config.lowBattThreshold)
+    this.lowBattThreshold = isNaN(this.lowBattThreshold)
+    ? helpers.defaults.lowBattThreshold
+    : this.lowBattThreshold < 5
+      ? helpers.defaults.lowBattThreshold
+      : this.lowBattThreshold
     if (!accessory.getService(this.Service.BatteryService)) accessory.addService(this.Service.BatteryService)
     switch (accessory.context.eweUIID) {
       case 1000: {
@@ -100,7 +106,7 @@ module.exports = class deviceZBDev {
         batteryService.updateCharacteristic(this.Characteristic.BatteryLevel, params.battery)
         batteryService.updateCharacteristic(
           this.Characteristic.StatusLowBattery,
-          params.battery < (this.platform.config.lowBattThreshold || 25)
+          params.battery < this.lowBattThreshold
         )
       }
       switch (this.accessory.context.eweUIID) {

From 1732a897b2f46cfb0d3ec561d8f8f065965fd877 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 27 Oct 2020 10:16:37 +0000
Subject: [PATCH 0554/3183] reset rf bridge option

---
 lib/ewelink-platform.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/ewelink-platform.js b/lib/ewelink-platform.js
index 3126f23b..8d4f60c3 100644
--- a/lib/ewelink-platform.js
+++ b/lib/ewelink-platform.js
@@ -373,6 +373,12 @@ module.exports = class eWeLinkPlatform {
         /*********************
         RF BRIDGE + SUBDEVICES
         *********************/
+        if (this.config.resetRFBridge) {
+          this.devicesInHB
+            .filter(a => helpers.hasProperty(a, 'context') && a.context.eweDeviceId === device.deviceId)
+            .foreach(a => this.removeAccessory(a))
+          this.log.warn('[%s] has been reset.', device.name)
+        }
         let rfChlCounter = 0
         const rfMap = []
         if (helpers.hasProperty(device, 'tags') && helpers.hasProperty(device.tags, 'zyx_info')) {

From a689feb738db9935b5a670971e5bfad4528c14ab Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 27 Oct 2020 10:18:00 +0000
Subject: [PATCH 0555/3183] parse config option

---
 lib/device/rf-bridge.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/device/rf-bridge.js b/lib/device/rf-bridge.js
index dc5b11fa..4831d994 100644
--- a/lib/device/rf-bridge.js
+++ b/lib/device/rf-bridge.js
@@ -10,6 +10,12 @@ module.exports = class deviceRFBridge {
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
     this.EveHistoryService = fakegato(platform.api)
+    this.sensorTimeLength = parseInt(this.platform.config.sensorTimeLength)
+    this.sensorTimeLength = isNaN(this.sensorTimeLength)
+    ? helpers.defaults.sensorTimeLength
+    : this.sensorTimeLength < 0
+      ? helpers.defaults.sensorTimeLength
+      : this.sensorTimeLength
     switch (accessory.context.subType) {
       case 'water':
         if (!accessory.getService(this.Service.LeakSensor)) accessory.addService(this.Service.LeakSensor)
@@ -180,7 +186,7 @@ module.exports = class deviceRFBridge {
                   }
                   oAccessory.eveLogger.addEntry(eveLog)
                 }
-                await helpers.sleep((this.platform.config.sensorTimeLength || 2) * 1000)
+                await helpers.sleep(this.sensorTimeLength * 1000)
                 oAccessory.getService(serv).updateCharacteristic(char, 0)
                 if (!this.platform.config.disableEveLogging && eveLog) {
                   const eveLog = {

From 17d7657ac6e0102453a707020912605f0d567d4c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 27 Oct 2020 10:22:03 +0000
Subject: [PATCH 0556/3183] parse config option

---
 lib/device/rf-bridge.js | 14 ++++++++++----
 lib/device/zb-dev.js    | 14 ++++++++++----
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/lib/device/rf-bridge.js b/lib/device/rf-bridge.js
index 4831d994..d5ed292d 100644
--- a/lib/device/rf-bridge.js
+++ b/lib/device/rf-bridge.js
@@ -12,10 +12,16 @@ module.exports = class deviceRFBridge {
     this.EveHistoryService = fakegato(platform.api)
     this.sensorTimeLength = parseInt(this.platform.config.sensorTimeLength)
     this.sensorTimeLength = isNaN(this.sensorTimeLength)
-    ? helpers.defaults.sensorTimeLength
-    : this.sensorTimeLength < 0
       ? helpers.defaults.sensorTimeLength
-      : this.sensorTimeLength
+      : this.sensorTimeLength < 0
+        ? helpers.defaults.sensorTimeLength
+        : this.sensorTimeLength
+    this.sensorTimeDifference = parseInt(this.platform.config.sensorTimeDifference)
+    this.sensorTimeDifference = isNaN(this.sensorTimeDifference)
+      ? helpers.defaults.sensorTimeDifference
+      : this.sensorTimeDifference < 10
+        ? helpers.defaults.sensorTimeDifference
+        : this.sensorTimeDifference
     switch (accessory.context.subType) {
       case 'water':
         if (!accessory.getService(this.Service.LeakSensor)) accessory.addService(this.Service.LeakSensor)
@@ -142,7 +148,7 @@ module.exports = class deviceRFBridge {
               let serv
               let char
               let eveLog = false
-              if (diff < (this.platform.config.sensorTimeDifference || 120)) {
+              if (diff < this.sensorTimeDifference) {
                 switch (oAccessory.context.subType) {
                   case 'button':
                     return
diff --git a/lib/device/zb-dev.js b/lib/device/zb-dev.js
index d993a656..74dec0ce 100644
--- a/lib/device/zb-dev.js
+++ b/lib/device/zb-dev.js
@@ -12,10 +12,16 @@ module.exports = class deviceZBDev {
     this.EveHistoryService = fakegato(platform.api)
     this.lowBattThreshold = parseInt(this.platform.config.lowBattThreshold)
     this.lowBattThreshold = isNaN(this.lowBattThreshold)
-    ? helpers.defaults.lowBattThreshold
-    : this.lowBattThreshold < 5
       ? helpers.defaults.lowBattThreshold
-      : this.lowBattThreshold
+      : this.lowBattThreshold < 5
+        ? helpers.defaults.lowBattThreshold
+        : this.lowBattThreshold
+    this.sensorTimeDifference = parseInt(this.platform.config.sensorTimeDifference)
+    this.sensorTimeDifference = isNaN(this.sensorTimeDifference)
+      ? helpers.defaults.sensorTimeDifference
+      : this.sensorTimeDifference < 10
+        ? helpers.defaults.sensorTimeDifference
+        : this.sensorTimeDifference
     if (!accessory.getService(this.Service.BatteryService)) accessory.addService(this.Service.BatteryService)
     switch (accessory.context.eweUIID) {
       case 1000: {
@@ -148,7 +154,7 @@ module.exports = class deviceZBDev {
             const motionDetected =
               helpers.hasProperty(params, 'updateSource') &&
               params.motion === 1 &&
-              diff < (this.platform.config.sensorTimeDifference || 120)
+              diff < this.sensorTimeDifference
             if (!this.platform.config.disableEveLogging) {
               const eveLog = {
                 time: Date.now(),

From 21226e55406239ae12d527941d1cffa10f59b8db Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 27 Oct 2020 10:22:10 +0000
Subject: [PATCH 0557/3183] formatting

---
 lib/device/outlet.js | 6 +++---
 lib/device/sensor.js | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/device/outlet.js b/lib/device/outlet.js
index c444c782..5a794b14 100644
--- a/lib/device/outlet.js
+++ b/lib/device/outlet.js
@@ -13,10 +13,10 @@ module.exports = class deviceOutlet {
     this.EveHistoryService = fakegato(platform.api)
     this.inUsePowerThreshold = parseInt(this.platform.config.inUsePowerThreshold)
     this.inUsePowerThreshold = isNaN(this.inUsePowerThreshold)
-    ? helpers.defaults.inUsePowerThreshold
-    : this.inUsePowerThreshold < 0
       ? helpers.defaults.inUsePowerThreshold
-      : this.inUsePowerThreshold
+      : this.inUsePowerThreshold < 0
+        ? helpers.defaults.inUsePowerThreshold
+        : this.inUsePowerThreshold
     const self = this
     this.eveCurrentConsumption = function () {
       self.Characteristic.call(this, 'Current Consumption', 'E863F10D-079E-48FF-8F27-9C2605A29F52')
diff --git a/lib/device/sensor.js b/lib/device/sensor.js
index c7e81ce3..df9a30f5 100644
--- a/lib/device/sensor.js
+++ b/lib/device/sensor.js
@@ -12,10 +12,10 @@ module.exports = class deviceSensor {
     this.EveHistoryService = fakegato(platform.api)
     this.lowBattThreshold = parseInt(this.platform.config.lowBattThreshold)
     this.lowBattThreshold = isNaN(this.lowBattThreshold)
-    ? helpers.defaults.lowBattThreshold
-    : this.lowBattThreshold < 5
       ? helpers.defaults.lowBattThreshold
-      : this.lowBattThreshold
+      : this.lowBattThreshold < 5
+        ? helpers.defaults.lowBattThreshold
+        : this.lowBattThreshold
     const contactService = accessory.getService(this.Service.ContactSensor) || accessory.addService(this.Service.ContactSensor)
     if (!accessory.getService(this.Service.BatteryService)) accessory.addService(this.Service.BatteryService)
     if (!this.platform.config.disableEveLogging) {

From d54ebf9ded193c0f2936503c904351a485d2568a Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 27 Oct 2020 10:23:29 +0000
Subject: [PATCH 0558/3183] add sensortimelength per rf device

---
 config.schema.json | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 3da13469..e11d61bf 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -96,7 +96,7 @@
         "description": "The number of seconds which the sensor tile in the Home app will light up for if a sensor detects something. This setting applies to sensors connected to RF/Zigbee Bridges.",
         "default": 60,
         "minimum": 1,
-        "maximum": 120
+        "maximum": 300
       },
       "sensorTimeDifference": {
         "type": "integer",
@@ -310,6 +310,14 @@
                   ]
                 }
               ]
+            },
+            "sensorTimeLength": {
+              "type": "integer",
+              "title": "Sensor Time Length",
+              "description": "The number of seconds which the sensor tile in the Home app will light up for if this sensor detects something. This setting will override the global time length set abov for this sensor.",
+              "default": 60,
+              "minimum": 1,
+              "maximum": 300
             }
           }
         }
@@ -387,7 +395,8 @@
           "items": [
             "bridgeSensors[].deviceId",
             "bridgeSensors[].fullDeviceId",
-            "bridgeSensors[].type"
+            "bridgeSensors[].type",
+            "bridgeSensors[].sensorTimeLength"
           ]
         }
       ]

From 5689027ba5da01025aaf628bf675a9d4480708a8 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 27 Oct 2020 10:23:38 +0000
Subject: [PATCH 0559/3183] add defaults to helpers

---
 lib/helpers.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/lib/helpers.js b/lib/helpers.js
index 1da12b5b..8a526f14 100644
--- a/lib/helpers.js
+++ b/lib/helpers.js
@@ -8,6 +8,13 @@ module.exports = {
   appSecret: '6Nz4n0xA8s8qdxQf2GqurZj2Fs55FUvM',
   httpRetryCodes: ['ENOTFOUND', 'ETIMEDOUT', 'EAI_AGAIN'],
   allowedGroups: ['blind', 'garage', 'garage_two', 'garage_four', 'garage_eachen', 'lock', 'valve'],
+  defaults: {
+    inUsePowerThreshold: 0,
+    lowBattThreshold: 25,
+    sensorTimeLength: 60,
+    sensorTimeDifference: 120
+  },
+  sensorTimeLength: 2,
   devicesNonLAN: [22, 28, 34, 59, 102],
   devicesSingleSwitch: [1, 5, 6, 14, 15, 22, 24, 27, 32, 36, 44, 59],
   devicesMultiSwitch: [2, 3, 4, 7, 8, 9, 29, 30, 31, 34, 41],

From 2911a176f56f020d6e453fe992dc173b8cc30bda Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 27 Oct 2020 10:54:05 +0000
Subject: [PATCH 0560/3183] add custom sensortimelength to context

---
 lib/ewelink-platform.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/lib/ewelink-platform.js b/lib/ewelink-platform.js
index 8d4f60c3..75a3b85c 100644
--- a/lib/ewelink-platform.js
+++ b/lib/ewelink-platform.js
@@ -400,6 +400,7 @@ module.exports = class eWeLinkPlatform {
         rfMap.forEach(subDevice => {
           const swNumber = rfChlCounter + 1
           let subType
+          let sensorTimeLength
           let subExtraContext = {}
           if (['1', '2', '3', '4'].includes(subDevice.type)) {
             subType = 'button'
@@ -407,13 +408,19 @@ module.exports = class eWeLinkPlatform {
             subType = this.cusS.has(device.deviceid + 'SW' + swNumber)
               ? this.cusS.get(device.deviceid + 'SW' + swNumber).type
               : 'motion'
+            if (this.cusS.has(device.deviceid + 'SW' + swNumber)) {
+              sensorTimeLength = helpers.hasProperty(this.cusS.get(device.deviceid + 'SW' + swNumber), 'sensorTimeLength')
+                ? this.cusS.get(device.deviceid + 'SW' + swNumber).sensorTimeLength
+                : undefined
+            }
           } else {
             return
           }
           subExtraContext = {
             buttons: subDevice.buttons,
             subType,
-            swNumber
+            swNumber,
+            sensorTimeLength
           }
           if ((oAccessory = this.devicesInHB.get(device.deviceid + 'SW' + swNumber))) {
             if (oAccessory.context.subType !== subType || oAccessory.context.swNumber !== swNumber) {

From 127c2d2de43322d546931a5cf738757f3e5da26c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 27 Oct 2020 10:54:23 +0000
Subject: [PATCH 0561/3183] use context sensorTimeLength if exists

---
 lib/device/rf-bridge.js | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/lib/device/rf-bridge.js b/lib/device/rf-bridge.js
index d5ed292d..acd3125a 100644
--- a/lib/device/rf-bridge.js
+++ b/lib/device/rf-bridge.js
@@ -10,12 +10,28 @@ module.exports = class deviceRFBridge {
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
     this.EveHistoryService = fakegato(platform.api)
-    this.sensorTimeLength = parseInt(this.platform.config.sensorTimeLength)
-    this.sensorTimeLength = isNaN(this.sensorTimeLength)
-      ? helpers.defaults.sensorTimeLength
-      : this.sensorTimeLength < 0
+    this.sensorTimeLengthPri = parseInt(accessory.context.sensorTimeLength)
+    this.sensorTimeLengthSec = parseInt(this.platform.config.sensorTimeLength)
+    this.sensorTimeLength = isNaN(this.sensorTimeLengthPri)
+      ? isNaN(this.sensorTimeLengthSec)
         ? helpers.defaults.sensorTimeLength
-        : this.sensorTimeLength
+        : this.sensorTimeLengthSec < 0
+          ? helpers.defaults.sensorTimeLength
+          : this.sensorTimeLengthSec
+      : this.sensorTimeLengthPri < 0
+        ? isNaN(this.sensorTimeLengthSec)
+          ? helpers.defaults.sensorTimeLength
+          : this.sensorTimeLengthSec < 0
+            ? helpers.defaults.sensorTimeLength
+            : this.sensorTimeLengthSec
+        : this.sensorTimeLengthPri
+    if (helpers.hasProperty(accessory.context, 'sensorTimeDifference')) {
+      this.sensorTimeLength = isNaN(this.sensorTimeLength)
+        ? helpers.defaults.sensorTimeLength
+        : this.sensorTimeLength < 0
+          ? helpers.defaults.sensorTimeLength
+          : this.sensorTimeLength
+    }
     this.sensorTimeDifference = parseInt(this.platform.config.sensorTimeDifference)
     this.sensorTimeDifference = isNaN(this.sensorTimeDifference)
       ? helpers.defaults.sensorTimeDifference

From 4598412d304541a460eed0756d6d5a555b5ac03e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 27 Oct 2020 10:57:18 +0000
Subject: [PATCH 0562/3183] typo

---
 config.schema.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config.schema.json b/config.schema.json
index e11d61bf..fb680d43 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -314,7 +314,7 @@
             "sensorTimeLength": {
               "type": "integer",
               "title": "Sensor Time Length",
-              "description": "The number of seconds which the sensor tile in the Home app will light up for if this sensor detects something. This setting will override the global time length set abov for this sensor.",
+              "description": "The number of seconds which the sensor tile in the Home app will light up for if this sensor detects something. This setting will override the global time length set above for this sensor.",
               "default": 60,
               "minimum": 1,
               "maximum": 300

From df9435dd9277108ec72d3254e416c3ace203153f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 27 Oct 2020 12:07:32 +0000
Subject: [PATCH 0563/3183] add custom time per rf sensor

---
 lib/device/rf-bridge.js | 42 ++++++++++++++++++-----------------------
 lib/ewelink-platform.js | 11 ++---------
 lib/helpers.js          |  1 -
 3 files changed, 20 insertions(+), 34 deletions(-)

diff --git a/lib/device/rf-bridge.js b/lib/device/rf-bridge.js
index acd3125a..cdf173b7 100644
--- a/lib/device/rf-bridge.js
+++ b/lib/device/rf-bridge.js
@@ -10,28 +10,6 @@ module.exports = class deviceRFBridge {
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
     this.EveHistoryService = fakegato(platform.api)
-    this.sensorTimeLengthPri = parseInt(accessory.context.sensorTimeLength)
-    this.sensorTimeLengthSec = parseInt(this.platform.config.sensorTimeLength)
-    this.sensorTimeLength = isNaN(this.sensorTimeLengthPri)
-      ? isNaN(this.sensorTimeLengthSec)
-        ? helpers.defaults.sensorTimeLength
-        : this.sensorTimeLengthSec < 0
-          ? helpers.defaults.sensorTimeLength
-          : this.sensorTimeLengthSec
-      : this.sensorTimeLengthPri < 0
-        ? isNaN(this.sensorTimeLengthSec)
-          ? helpers.defaults.sensorTimeLength
-          : this.sensorTimeLengthSec < 0
-            ? helpers.defaults.sensorTimeLength
-            : this.sensorTimeLengthSec
-        : this.sensorTimeLengthPri
-    if (helpers.hasProperty(accessory.context, 'sensorTimeDifference')) {
-      this.sensorTimeLength = isNaN(this.sensorTimeLength)
-        ? helpers.defaults.sensorTimeLength
-        : this.sensorTimeLength < 0
-          ? helpers.defaults.sensorTimeLength
-          : this.sensorTimeLength
-    }
     this.sensorTimeDifference = parseInt(this.platform.config.sensorTimeDifference)
     this.sensorTimeDifference = isNaN(this.sensorTimeDifference)
       ? helpers.defaults.sensorTimeDifference
@@ -159,6 +137,21 @@ module.exports = class deviceRFBridge {
               }
             })
             if (oAccessory) {
+              const sensorTimeLengthPri = parseInt(oAccessory.context.sensorTimeLength)
+              const sensorTimeLengthSec = parseInt(this.platform.config.sensorTimeLength)
+              const sensorTimeLength = isNaN(sensorTimeLengthPri)
+                ? isNaN(sensorTimeLengthSec)
+                  ? helpers.defaults.sensorTimeLength
+                  : sensorTimeLengthSec < 0
+                    ? helpers.defaults.sensorTimeLength
+                    : sensorTimeLengthSec
+                : sensorTimeLengthPri < 0
+                  ? isNaN(sensorTimeLengthSec)
+                    ? helpers.defaults.sensorTimeLength
+                    : sensorTimeLengthSec < 0
+                      ? helpers.defaults.sensorTimeLength
+                      : sensorTimeLengthSec
+                  : sensorTimeLengthPri
               const timeOfMotion = new Date(params[chan])
               const diff = (timeNow.getTime() - timeOfMotion.getTime()) / 1000
               let serv
@@ -175,7 +168,7 @@ module.exports = class deviceRFBridge {
                   case 'fire':
                   case 'smoke':
                     serv = this.Service.SmokeSensor
-                    char = this.Characteristic.LeakDetected
+                    char = this.Characteristic.SmokeDetected
                     break
                   case 'co':
                     serv = this.Service.CarbonMonoxideSensor
@@ -208,7 +201,8 @@ module.exports = class deviceRFBridge {
                   }
                   oAccessory.eveLogger.addEntry(eveLog)
                 }
-                await helpers.sleep(this.sensorTimeLength * 1000)
+                await helpers.sleep(sensorTimeLength * 1000)
+                this.platform.log('awaiting %s seconds', sensorTimeLength)
                 oAccessory.getService(serv).updateCharacteristic(char, 0)
                 if (!this.platform.config.disableEveLogging && eveLog) {
                   const eveLog = {
diff --git a/lib/ewelink-platform.js b/lib/ewelink-platform.js
index 75a3b85c..1ed96dbe 100644
--- a/lib/ewelink-platform.js
+++ b/lib/ewelink-platform.js
@@ -373,12 +373,6 @@ module.exports = class eWeLinkPlatform {
         /*********************
         RF BRIDGE + SUBDEVICES
         *********************/
-        if (this.config.resetRFBridge) {
-          this.devicesInHB
-            .filter(a => helpers.hasProperty(a, 'context') && a.context.eweDeviceId === device.deviceId)
-            .foreach(a => this.removeAccessory(a))
-          this.log.warn('[%s] has been reset.', device.name)
-        }
         let rfChlCounter = 0
         const rfMap = []
         if (helpers.hasProperty(device, 'tags') && helpers.hasProperty(device.tags, 'zyx_info')) {
@@ -409,9 +403,7 @@ module.exports = class eWeLinkPlatform {
               ? this.cusS.get(device.deviceid + 'SW' + swNumber).type
               : 'motion'
             if (this.cusS.has(device.deviceid + 'SW' + swNumber)) {
-              sensorTimeLength = helpers.hasProperty(this.cusS.get(device.deviceid + 'SW' + swNumber), 'sensorTimeLength')
-                ? this.cusS.get(device.deviceid + 'SW' + swNumber).sensorTimeLength
-                : undefined
+              sensorTimeLength = this.cusS.get(device.deviceid + 'SW' + swNumber).sensorTimeLength
             }
           } else {
             return
@@ -427,6 +419,7 @@ module.exports = class eWeLinkPlatform {
               this.removeAccessory(oAccessory)
             }
           }
+          if (this.config.resetRFBridge) this.removeAccessory(oAccessory)
           oAccessory = this.devicesInHB.has(device.deviceid + 'SW' + swNumber)
             ? this.devicesInHB.get(device.deviceid + 'SW' + swNumber)
             : this.addAccessory(device, device.deviceid + 'SW' + swNumber, false, subExtraContext, 'rf_sub')
diff --git a/lib/helpers.js b/lib/helpers.js
index 8a526f14..cca771bb 100644
--- a/lib/helpers.js
+++ b/lib/helpers.js
@@ -14,7 +14,6 @@ module.exports = {
     sensorTimeLength: 60,
     sensorTimeDifference: 120
   },
-  sensorTimeLength: 2,
   devicesNonLAN: [22, 28, 34, 59, 102],
   devicesSingleSwitch: [1, 5, 6, 14, 15, 22, 24, 27, 32, 36, 44, 59],
   devicesMultiSwitch: [2, 3, 4, 7, 8, 9, 29, 30, 31, 34, 41],

From ecf0ba81ede12d27280b981d13ea28b5e9598b37 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 27 Oct 2020 12:17:41 +0000
Subject: [PATCH 0564/3183] tidying up

---
 lib/device/rf-bridge.js | 1 -
 lib/ewelink-platform.js | 5 +++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/device/rf-bridge.js b/lib/device/rf-bridge.js
index cdf173b7..5087ecab 100644
--- a/lib/device/rf-bridge.js
+++ b/lib/device/rf-bridge.js
@@ -202,7 +202,6 @@ module.exports = class deviceRFBridge {
                   oAccessory.eveLogger.addEntry(eveLog)
                 }
                 await helpers.sleep(sensorTimeLength * 1000)
-                this.platform.log('awaiting %s seconds', sensorTimeLength)
                 oAccessory.getService(serv).updateCharacteristic(char, 0)
                 if (!this.platform.config.disableEveLogging && eveLog) {
                   const eveLog = {
diff --git a/lib/ewelink-platform.js b/lib/ewelink-platform.js
index 1ed96dbe..5f1e3d8f 100644
--- a/lib/ewelink-platform.js
+++ b/lib/ewelink-platform.js
@@ -414,12 +414,13 @@ module.exports = class eWeLinkPlatform {
             swNumber,
             sensorTimeLength
           }
-          if ((oAccessory = this.devicesInHB.get(device.deviceid + 'SW' + swNumber))) {
+          if (this.config.resetRFBridge) {
+            this.removeAccessory(oAccessory)
+          } else if ((oAccessory = this.devicesInHB.get(device.deviceid + 'SW' + swNumber))) {
             if (oAccessory.context.subType !== subType || oAccessory.context.swNumber !== swNumber) {
               this.removeAccessory(oAccessory)
             }
           }
-          if (this.config.resetRFBridge) this.removeAccessory(oAccessory)
           oAccessory = this.devicesInHB.has(device.deviceid + 'SW' + swNumber)
             ? this.devicesInHB.get(device.deviceid + 'SW' + swNumber)
             : this.addAccessory(device, device.deviceid + 'SW' + swNumber, false, subExtraContext, 'rf_sub')

From 026559c8b55a5be2768f41d7c8dc8fd4dbb63229 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 27 Oct 2020 15:12:12 +0000
Subject: [PATCH 0565/3183] redundant brackets

---
 lib/device/outlet.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/device/outlet.js b/lib/device/outlet.js
index 5a794b14..7de0d622 100644
--- a/lib/device/outlet.js
+++ b/lib/device/outlet.js
@@ -194,7 +194,7 @@ module.exports = class deviceOutlet {
         if (!helpers.devicesSingleSwitchOutlet.includes(this.accessory.context.eweModel) && !this.platform.config.disableEveLogging) {
           outletService.updateCharacteristic(
             this.Characteristic.OutletInUse,
-            parseFloat(params.power) > (this.inUsePowerThreshold)
+            parseFloat(params.power) > this.inUsePowerThreshold
           )
           const isOn = this.accessory.getService(this.Service.Outlet).getCharacteristic(this.Characteristic.On).value
           this.accessory.eveLogger.addEntry({

From 92c3f48efaa15124b84d575071b45f986e2fc9aa Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 27 Oct 2020 15:12:28 +0000
Subject: [PATCH 0566/3183] tidy up of sensor time

---
 config.schema.json | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index fb680d43..e1d1faf2 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -85,19 +85,11 @@
       "lowBattThreshold": {
         "type": "integer",
         "title": "Low Battery Threshold",
-        "description": "Homebridge will set the low battery status for supported devices when the device battery reaches this pecentage level.",
+        "description": "Homebridge will set the low battery status for supported devices when the device battery reaches this percentage level.",
         "default": 25,
         "minimum": 5,
         "maximum": 50
       },
-      "sensorTimeLength": {
-        "type": "integer",
-        "title": "Sensor Length",
-        "description": "The number of seconds which the sensor tile in the Home app will light up for if a sensor detects something. This setting applies to sensors connected to RF/Zigbee Bridges.",
-        "default": 60,
-        "minimum": 1,
-        "maximum": 300
-      },
       "sensorTimeDifference": {
         "type": "integer",
         "title": "Sensor Lag",
@@ -143,6 +135,9 @@
       "disablePlugin": {
         "type": "boolean"
       },
+      "sensorTimeLength": {
+        "type": "integer"
+      },
       "groups": {
         "type": "array",
         "title": "Accessory Simulations",
@@ -314,7 +309,7 @@
             "sensorTimeLength": {
               "type": "integer",
               "title": "Sensor Time Length",
-              "description": "The number of seconds which the sensor tile in the Home app will light up for if this sensor detects something. This setting will override the global time length set above for this sensor.",
+              "description": "The number of seconds which the sensor tile in the Home app will light up for if this sensor is activated.",
               "default": 60,
               "minimum": 1,
               "maximum": 300
@@ -359,7 +354,6 @@
         "inUsePowerThreshold",
         "hideTHSwitch",
         "lowBattThreshold",
-        "sensorTimeLength",
         "sensorTimeDifference",
         "hideZBLDPress"
       ]

From 4f989acf9e9f3a536c9ca834daac657ff48f476f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 27 Oct 2020 15:21:44 +0000
Subject: [PATCH 0567/3183] re-add subdevice checks

---
 lib/ewelink-platform.js | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/lib/ewelink-platform.js b/lib/ewelink-platform.js
index 5f1e3d8f..76e14214 100644
--- a/lib/ewelink-platform.js
+++ b/lib/ewelink-platform.js
@@ -414,10 +414,13 @@ module.exports = class eWeLinkPlatform {
             swNumber,
             sensorTimeLength
           }
-          if (this.config.resetRFBridge) {
-            this.removeAccessory(oAccessory)
-          } else if ((oAccessory = this.devicesInHB.get(device.deviceid + 'SW' + swNumber))) {
-            if (oAccessory.context.subType !== subType || oAccessory.context.swNumber !== swNumber) {
+          if ((oAccessory = this.devicesInHB.get(device.deviceid + 'SW' + swNumber))) {
+            if (
+              this.config.resetRFBridge ||
+              oAccessory.context.subType !== subType ||
+              oAccessory.context.sensorTimeLength !== sensorTimeLength ||
+              oAccessory.context.swNumber !== swNumber
+            ) {
               this.removeAccessory(oAccessory)
             }
           }

From 48298d017a11739646299e53d306bd705952b7cd Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 27 Oct 2020 15:23:36 +0000
Subject: [PATCH 0568/3183] 3.9.0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d0282a10..3d792761 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.8.4",
+  "version": "3.9.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 5e588068..6d91501a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.8.4",
+  "version": "3.9.0",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From e49d942e4812c0a647783ce6b8549529e710b9a9 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 28 Oct 2020 10:09:33 +0000
Subject: [PATCH 0569/3183] remove unnecessary intervals

---
 lib/device/rf-bridge.js  | 20 ++------------------
 lib/device/sensor.js     | 10 +---------
 lib/device/thermostat.js | 13 +------------
 lib/device/zb-dev.js     | 31 +++----------------------------
 4 files changed, 7 insertions(+), 67 deletions(-)

diff --git a/lib/device/rf-bridge.js b/lib/device/rf-bridge.js
index 5087ecab..80f3f6ca 100644
--- a/lib/device/rf-bridge.js
+++ b/lib/device/rf-bridge.js
@@ -36,16 +36,8 @@ module.exports = class deviceRFBridge {
           accessory.log = this.platform.log
           accessory.eveLogger = new this.EveHistoryService('door', accessory, {
             storage: 'fs',
-            minutes: 10,
             path: this.platform.eveLogPath
           })
-          corrInterval.setCorrectingInterval(() => {
-            const dataToAdd = {
-              time: Date.now(),
-              status: contactService.getCharacteristic(this.Characteristic.ContactSensorState).value
-            }
-            accessory.eveLogger.addEntry(dataToAdd)
-          }, 600000)
         }
         break
       }
@@ -58,16 +50,8 @@ module.exports = class deviceRFBridge {
           accessory.log = this.platform.log
           accessory.eveLogger = new this.EveHistoryService('motion', accessory, {
             storage: 'fs',
-            minutes: 10,
             path: this.platform.eveLogPath
           })
-          corrInterval.setCorrectingInterval(() => {
-            const dataToAdd = {
-              time: Date.now(),
-              status: motionService.getCharacteristic(this.Characteristic.MotionDetected).value ? 1 : 0
-            }
-            accessory.eveLogger.addEntry(dataToAdd)
-          }, 600000)
         }
         break
       }
@@ -196,7 +180,7 @@ module.exports = class deviceRFBridge {
                 oAccessory.getService(serv).updateCharacteristic(char, 1)
                 if (!this.platform.config.disableEveLogging && eveLog) {
                   const eveLog = {
-                    time: Date.now(),
+                    time: Math.round(new Date().valueOf() / 1000),
                     status: 1
                   }
                   oAccessory.eveLogger.addEntry(eveLog)
@@ -205,7 +189,7 @@ module.exports = class deviceRFBridge {
                 oAccessory.getService(serv).updateCharacteristic(char, 0)
                 if (!this.platform.config.disableEveLogging && eveLog) {
                   const eveLog = {
-                    time: Date.now(),
+                    time: Math.round(new Date().valueOf() / 1000),
                     status: 0
                   }
                   oAccessory.eveLogger.addEntry(eveLog)
diff --git a/lib/device/sensor.js b/lib/device/sensor.js
index df9a30f5..2090861e 100644
--- a/lib/device/sensor.js
+++ b/lib/device/sensor.js
@@ -22,16 +22,8 @@ module.exports = class deviceSensor {
       accessory.log = this.platform.log
       accessory.eveLogger = new this.EveHistoryService('door', accessory, {
         storage: 'fs',
-        minutes: 10,
         path: this.platform.eveLogPath
       })
-      corrInterval.setCorrectingInterval(() => {
-        const dataToAdd = {
-          time: Date.now(),
-          status: contactService.getCharacteristic(this.Characteristic.ContactSensorState).value
-        }
-        accessory.eveLogger.addEntry(dataToAdd)
-      }, 600000)
     }
     this.accessory = accessory
   }
@@ -55,7 +47,7 @@ module.exports = class deviceSensor {
       contactService.updateCharacteristic(this.Characteristic.ContactSensorState, newState)
       if (!this.platform.config.disableEveLogging) {
         const eveLog = {
-          time: Date.now(),
+          time: Math.round(new Date().valueOf() / 1000),
           status: newState
         }
         this.accessory.eveLogger.addEntry(eveLog)
diff --git a/lib/device/thermostat.js b/lib/device/thermostat.js
index 6843ae0c..ef0c65d9 100644
--- a/lib/device/thermostat.js
+++ b/lib/device/thermostat.js
@@ -25,19 +25,8 @@ module.exports = class deviceThermostat {
       accessory.log = this.platform.log
       accessory.eveLogger = new this.EveHistoryService('weather', accessory, {
         storage: 'fs',
-        minutes: 10,
         path: this.platform.eveLogPath
       })
-      corrInterval.setCorrectingInterval(() => {
-        const dataToAdd = {
-          time: Date.now(),
-          temp: tempService.getCharacteristic(this.Characteristic.CurrentTemperature).value
-        }
-        if (humiService) {
-          dataToAdd.humidity = humiService.getCharacteristic(this.Characteristic.CurrentRelativeHumidity).value
-        }
-        accessory.eveLogger.addEntry(dataToAdd)
-      }, 600000)
     }
     this.accessory = accessory
   }
@@ -65,7 +54,7 @@ module.exports = class deviceThermostat {
         const switchService = this.accessory.getService(this.Service.Switch)
         switchService.updateCharacteristic(this.Characteristic.On, newState)
       }
-      const eveLog = { time: Date.now() }
+      const eveLog = { time: Math.round(new Date().valueOf() / 1000) }
       if (helpers.hasProperty(params, 'currentTemperature') && this.accessory.getService(this.Service.TemperatureSensor)) {
         const currentTemp = parseFloat(params.currentTemperature !== 'unavailable' ? params.currentTemperature : 0)
         this.accessory
diff --git a/lib/device/zb-dev.js b/lib/device/zb-dev.js
index 74dec0ce..8b40ac63 100644
--- a/lib/device/zb-dev.js
+++ b/lib/device/zb-dev.js
@@ -44,17 +44,8 @@ module.exports = class deviceZBDev {
           accessory.log = this.platform.log
           accessory.eveLogger = new this.EveHistoryService('weather', accessory, {
             storage: 'fs',
-            minutes: 10,
             path: this.platform.eveLogPath
           })
-          corrInterval.setCorrectingInterval(() => {
-            const dataToAdd = {
-              time: Date.now(),
-              temp: zbTempService.getCharacteristic(this.Characteristic.CurrentTemperature).value,
-              humidity: zbHumiService.getCharacteristic(this.Characteristic.CurrentRelativeHumidity).value
-            }
-            accessory.eveLogger.addEntry(dataToAdd)
-          }, 600000)
         }
         break
       }
@@ -64,16 +55,8 @@ module.exports = class deviceZBDev {
           accessory.log = this.platform.log
           accessory.eveLogger = new this.EveHistoryService('motion', accessory, {
             storage: 'fs',
-            minutes: 10,
             path: this.platform.eveLogPath
           })
-          corrInterval.setCorrectingInterval(() => {
-            const dataToAdd = {
-              time: Date.now(),
-              status: motionService.getCharacteristic(this.Characteristic.MotionDetected).value ? 1 : 0
-            }
-            accessory.eveLogger.addEntry(dataToAdd)
-          }, 600000)
         }
         break
       }
@@ -83,16 +66,8 @@ module.exports = class deviceZBDev {
           accessory.log = this.platform.log
           accessory.eveLogger = new this.EveHistoryService('door', accessory, {
             storage: 'fs',
-            minutes: 10,
             path: this.platform.eveLogPath
           })
-          corrInterval.setCorrectingInterval(() => {
-            const dataToAdd = {
-              time: Date.now(),
-              status: contactService.getCharacteristic(this.Characteristic.ContactSensorState).value
-            }
-            accessory.eveLogger.addEntry(dataToAdd)
-          }, 600000)
         }
         break
       }
@@ -124,7 +99,7 @@ module.exports = class deviceZBDev {
           }
           break
         case 1770: {
-          const eveLog = { time: Date.now() }
+          const eveLog = { time: Math.round(new Date().valueOf() / 1000) }
           if (helpers.hasProperty(params, 'temperature')) {
             const currentTemp = parseInt(params.temperature) / 100
             this.accessory
@@ -157,7 +132,7 @@ module.exports = class deviceZBDev {
               diff < this.sensorTimeDifference
             if (!this.platform.config.disableEveLogging) {
               const eveLog = {
-                time: Date.now(),
+                time: Math.round(new Date().valueOf() / 1000),
                 status: motionDetected ? 1 : 0
               }
               this.accessory.eveLogger.addEntry(eveLog)
@@ -173,7 +148,7 @@ module.exports = class deviceZBDev {
               .updateCharacteristic(this.Characteristic.ContactSensorState, params.lock)
             if (!this.platform.config.disableEveLogging) {
               const eveLog = {
-                time: Date.now(),
+                time: Math.round(new Date().valueOf() / 1000),
                 status: params.lock
               }
               this.accessory.eveLogger.addEntry(eveLog)

From 20e39d4655b7d3549e7a72f3058afe7cb92809a3 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 28 Oct 2020 10:09:43 +0000
Subject: [PATCH 0570/3183] change interval to 5 mins

---
 lib/device/outlet.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/device/outlet.js b/lib/device/outlet.js
index 7de0d622..b8b7eea4 100644
--- a/lib/device/outlet.js
+++ b/lib/device/outlet.js
@@ -103,7 +103,7 @@ module.exports = class deviceOutlet {
       accessory.log = this.platform.log
       accessory.eveLogger = new this.EveHistoryService('energy', accessory, {
         storage: 'fs',
-        minutes: 10,
+        minutes: 5,
         path: this.platform.eveLogPath
       })
       corrInterval.setCorrectingInterval(() => {
@@ -117,13 +117,13 @@ module.exports = class deviceOutlet {
             accessory.context.totalEnergy =
               accessory.context.extraPersistedData.totalenergy +
               accessory.context.totalEnergyTemp +
-              (currentWatt * 10) / 3600 / 1000
+              (currentWatt * 5) / 3600 / 1000
             accessory.eveLogger.setExtraPersistedData({
               totalenergy: accessory.context.totalEnergy,
               lastReset: accessory.context.extraPersistedData.lastReset
             })
           } else {
-            accessory.context.totalEnergy = accessory.context.totalEnergyTemp + (currentWatt * 10) / 3600 / 1000
+            accessory.context.totalEnergy = accessory.context.totalEnergyTemp + (currentWatt * 5) / 3600 / 1000
             accessory.eveLogger.setExtraPersistedData({
               totalenergy: accessory.context.totalEnergy,
               lastReset: 0
@@ -131,14 +131,14 @@ module.exports = class deviceOutlet {
           }
           accessory.context.totalEnergytemp = 0
         } else {
-          accessory.context.totalEnergyTemp += (currentWatt * 10) / 3600 / 1000
+          accessory.context.totalEnergyTemp += (currentWatt * 5) / 3600 / 1000
           accessory.context.totalEnergy = accessory.context.totalEnergyTemp
         }
         accessory.eveLogger.addEntry({
-          time: Date.now(),
+          time: Math.round(new Date().valueOf() / 1000),
           power: currentWatt
         })
-      }, 600000)
+      }, 300000)
       outletService
         .getCharacteristic(this.eveTotalConsumption)
         .on('get', callback => {
@@ -198,7 +198,7 @@ module.exports = class deviceOutlet {
           )
           const isOn = this.accessory.getService(this.Service.Outlet).getCharacteristic(this.Characteristic.On).value
           this.accessory.eveLogger.addEntry({
-            time: Date.now(),
+            time: Math.round(new Date().valueOf() / 1000),
             power: isOn ? parseFloat(params.power) : 0
           })
         }

From acac7ace5c4bb65785ecca1ecfd40f27ad0c670c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 28 Oct 2020 10:09:50 +0000
Subject: [PATCH 0571/3183] Update package-lock.json

---
 package-lock.json | 170 ++++++++++++++++++++++++++++++++++------------
 1 file changed, 126 insertions(+), 44 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 3d792761..c109a535 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13,9 +13,9 @@
       }
     },
     "agent-base": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.1.tgz",
-      "integrity": "sha512-01q25QQDwLSsyfhrKbn8yuur+JNw0H+0Y4JiGIKd3z9aYk/w/2kxD/Upc+t2ZBBSUNff50VjPsSW2YxM8QYKVg==",
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
+      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
       "requires": {
         "debug": "4"
       },
@@ -111,19 +111,19 @@
       }
     },
     "es-abstract": {
-      "version": "1.17.6",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.6.tgz",
-      "integrity": "sha512-Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw==",
+      "version": "1.17.7",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz",
+      "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==",
       "requires": {
         "es-to-primitive": "^1.2.1",
         "function-bind": "^1.1.1",
         "has": "^1.0.3",
         "has-symbols": "^1.0.1",
-        "is-callable": "^1.2.0",
-        "is-regex": "^1.1.0",
-        "object-inspect": "^1.7.0",
+        "is-callable": "^1.2.2",
+        "is-regex": "^1.1.1",
+        "object-inspect": "^1.8.0",
         "object-keys": "^1.1.1",
-        "object.assign": "^4.1.0",
+        "object.assign": "^4.1.1",
         "string.prototype.trimend": "^1.0.1",
         "string.prototype.trimstart": "^1.0.1"
       }
@@ -174,9 +174,9 @@
       "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
     },
     "gaxios": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/gaxios/-/gaxios-3.2.0.tgz",
-      "integrity": "sha512-+6WPeVzPvOshftpxJwRi2Ozez80tn/hdtOUag7+gajDHRJvAblKxTFSSMPtr2hmnLy7p0mvYz0rMXLBl8pSO7Q==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/gaxios/-/gaxios-4.0.1.tgz",
+      "integrity": "sha512-jOin8xRZ/UytQeBpSXFqIzqU7Fi5TqgPNLlUsSB8kjJ76+FiGBfImF8KJu++c6J4jOldfJUtt0YmkRj2ZpSHTQ==",
       "requires": {
         "abort-controller": "^3.0.0",
         "extend": "^3.0.2",
@@ -192,19 +192,33 @@
       "requires": {
         "gaxios": "^3.0.0",
         "json-bigint": "^1.0.0"
+      },
+      "dependencies": {
+        "gaxios": {
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/gaxios/-/gaxios-3.2.0.tgz",
+          "integrity": "sha512-+6WPeVzPvOshftpxJwRi2Ozez80tn/hdtOUag7+gajDHRJvAblKxTFSSMPtr2hmnLy7p0mvYz0rMXLBl8pSO7Q==",
+          "requires": {
+            "abort-controller": "^3.0.0",
+            "extend": "^3.0.2",
+            "https-proxy-agent": "^5.0.0",
+            "is-stream": "^2.0.0",
+            "node-fetch": "^2.3.0"
+          }
+        }
       }
     },
     "google-auth-library": {
-      "version": "6.1.1",
-      "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-6.1.1.tgz",
-      "integrity": "sha512-0WfExOx3FrLYnY88RICQxvpaNzdwjz44OsHqHkIoAJfjY6Jck6CZRl1ASWadk+wbJ0LhkQ8rNY4zZebKml4Ghg==",
+      "version": "6.1.3",
+      "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-6.1.3.tgz",
+      "integrity": "sha512-m9mwvY3GWbr7ZYEbl61isWmk+fvTmOt0YNUfPOUY2VH8K5pZlAIWJjxEi0PqR3OjMretyiQLI6GURMrPSwHQ2g==",
       "requires": {
         "arrify": "^2.0.0",
         "base64-js": "^1.3.0",
         "ecdsa-sig-formatter": "^1.0.11",
         "fast-text-encoding": "^1.0.0",
-        "gaxios": "^3.0.0",
-        "gcp-metadata": "^4.1.0",
+        "gaxios": "^4.0.0",
+        "gcp-metadata": "^4.2.0",
         "gtoken": "^5.0.4",
         "jws": "^4.0.0",
         "lru-cache": "^6.0.0"
@@ -228,12 +242,12 @@
       }
     },
     "googleapis-common": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/googleapis-common/-/googleapis-common-4.4.1.tgz",
-      "integrity": "sha512-F1QcH8oU7TOuZex9p+XW7TeyLY0332NwBwJ3dZoN+51pXZXB5JjrKswrpgbhuREuIe8xAy8J1rlmFqxeP2mFfA==",
+      "version": "4.4.2",
+      "resolved": "https://registry.npmjs.org/googleapis-common/-/googleapis-common-4.4.2.tgz",
+      "integrity": "sha512-booWj8k9BwN2j+nbCaThbXscbbsO+FkV4h3xHW+RRC6+RwtqS2I3gqXbP8bqE1BgQBcN+49xFODCfAxy9PGfOQ==",
       "requires": {
         "extend": "^3.0.2",
-        "gaxios": "^3.2.0",
+        "gaxios": "^4.0.0",
         "google-auth-library": "^6.0.0",
         "qs": "^6.7.0",
         "url-template": "^2.0.8",
@@ -241,11 +255,11 @@
       }
     },
     "gtoken": {
-      "version": "5.0.4",
-      "resolved": "https://registry.npmjs.org/gtoken/-/gtoken-5.0.4.tgz",
-      "integrity": "sha512-U9wnSp4GZ7ov6zRdPuRHG4TuqEWqRRgT1gfXGNArhzBUn9byrPeH8uTmBWU/ZiWJJvTEmkjhDIC3mqHWdVi3xQ==",
+      "version": "5.0.5",
+      "resolved": "https://registry.npmjs.org/gtoken/-/gtoken-5.0.5.tgz",
+      "integrity": "sha512-wvjkecutFh8kVfbcdBdUWqDRrXb+WrgD79DBDEYf1Om8S1FluhylhtFjrL7Tx69vNhh259qA3Q1P4sPtb+kUYw==",
       "requires": {
-        "gaxios": "^3.0.0",
+        "gaxios": "^4.0.0",
         "google-p12-pem": "^3.0.3",
         "jws": "^4.0.0",
         "mime": "^2.2.0"
@@ -294,15 +308,20 @@
       "integrity": "sha512-PUwEmGqUglJhb6M01JNvMDvxr4DA8FCeYoYCLHPEcBBZiq/8yOpCchfs1VJui7fXj69l170gAxzF1FeSA0nSlg=="
     },
     "is-callable": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.1.tgz",
-      "integrity": "sha512-wliAfSzx6V+6WfMOmus1xy0XvSgf/dlStkvTfq7F0g4bOIW0PSUbnyse3NhDwdyYS1ozfUtAAySqTws3z9Eqgg=="
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.2.tgz",
+      "integrity": "sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA=="
     },
     "is-date-object": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz",
       "integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g=="
     },
+    "is-negative-zero": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.0.tgz",
+      "integrity": "sha1-lVOxIbD6wohp2p7UWeIMdUN4hGE="
+    },
     "is-regex": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.1.tgz",
@@ -400,14 +419,35 @@
       "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="
     },
     "object.assign": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz",
-      "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==",
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.1.tgz",
+      "integrity": "sha512-VT/cxmx5yaoHSOTSyrCygIDFco+RsibY2NM0a4RdEeY/4KgqezwFtK1yr3U67xYhqJSlASm2pKhLVzPj2lr4bA==",
       "requires": {
-        "define-properties": "^1.1.2",
-        "function-bind": "^1.1.1",
-        "has-symbols": "^1.0.0",
-        "object-keys": "^1.0.11"
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.18.0-next.0",
+        "has-symbols": "^1.0.1",
+        "object-keys": "^1.1.1"
+      },
+      "dependencies": {
+        "es-abstract": {
+          "version": "1.18.0-next.1",
+          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.1.tgz",
+          "integrity": "sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==",
+          "requires": {
+            "es-to-primitive": "^1.2.1",
+            "function-bind": "^1.1.1",
+            "has": "^1.0.3",
+            "has-symbols": "^1.0.1",
+            "is-callable": "^1.2.2",
+            "is-negative-zero": "^2.0.0",
+            "is-regex": "^1.1.1",
+            "object-inspect": "^1.8.0",
+            "object-keys": "^1.1.1",
+            "object.assign": "^4.1.1",
+            "string.prototype.trimend": "^1.0.1",
+            "string.prototype.trimstart": "^1.0.1"
+          }
+        }
       }
     },
     "promise-controller": {
@@ -436,21 +476,63 @@
       "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
     },
     "string.prototype.trimend": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz",
-      "integrity": "sha512-LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.2.tgz",
+      "integrity": "sha512-8oAG/hi14Z4nOVP0z6mdiVZ/wqjDtWSLygMigTzAb+7aPEDTleeFf+WrF+alzecxIRkckkJVn+dTlwzJXORATw==",
       "requires": {
         "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.5"
+        "es-abstract": "^1.18.0-next.1"
+      },
+      "dependencies": {
+        "es-abstract": {
+          "version": "1.18.0-next.1",
+          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.1.tgz",
+          "integrity": "sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==",
+          "requires": {
+            "es-to-primitive": "^1.2.1",
+            "function-bind": "^1.1.1",
+            "has": "^1.0.3",
+            "has-symbols": "^1.0.1",
+            "is-callable": "^1.2.2",
+            "is-negative-zero": "^2.0.0",
+            "is-regex": "^1.1.1",
+            "object-inspect": "^1.8.0",
+            "object-keys": "^1.1.1",
+            "object.assign": "^4.1.1",
+            "string.prototype.trimend": "^1.0.1",
+            "string.prototype.trimstart": "^1.0.1"
+          }
+        }
       }
     },
     "string.prototype.trimstart": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz",
-      "integrity": "sha512-XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.2.tgz",
+      "integrity": "sha512-7F6CdBTl5zyu30BJFdzSTlSlLPwODC23Od+iLoVH8X6+3fvDPPuBVVj9iaB1GOsSTSIgVfsfm27R2FGrAPznWg==",
       "requires": {
         "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.5"
+        "es-abstract": "^1.18.0-next.1"
+      },
+      "dependencies": {
+        "es-abstract": {
+          "version": "1.18.0-next.1",
+          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.1.tgz",
+          "integrity": "sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==",
+          "requires": {
+            "es-to-primitive": "^1.2.1",
+            "function-bind": "^1.1.1",
+            "has": "^1.0.3",
+            "has-symbols": "^1.0.1",
+            "is-callable": "^1.2.2",
+            "is-negative-zero": "^2.0.0",
+            "is-regex": "^1.1.1",
+            "object-inspect": "^1.8.0",
+            "object-keys": "^1.1.1",
+            "object.assign": "^4.1.1",
+            "string.prototype.trimend": "^1.0.1",
+            "string.prototype.trimstart": "^1.0.1"
+          }
+        }
       }
     },
     "url-template": {

From e79b38e9a03be6c5ff98d538d1e397ef4c0b31fd Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 28 Oct 2020 11:20:17 +0000
Subject: [PATCH 0572/3183] add nameOverride and ipOverride to plugin settings

---
 config.schema.json | 109 ++++++++++++++++++++++++++++++++-------------
 1 file changed, 78 insertions(+), 31 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index e1d1faf2..9ec04513 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -104,37 +104,6 @@
         "description": "If checked, double and long press options will be hidden for the ZigBee button.",
         "default": false
       },
-      "nameOverride": {
-        "type": "array",
-        "items": {
-          "type": "object",
-          "properties": {
-            "fullDeviceId": {
-              "type": "string"
-            },
-            "deviceName": {
-              "type": "string"
-            }
-          }
-        }
-      },
-      "ipOverride": {
-        "type": "array",
-        "items": {
-          "type": "object",
-          "properties": {
-            "deviceId": {
-              "type": "string"
-            },
-            "deviceIP": {
-              "type": "string"
-            }
-          }
-        }
-      },
-      "disablePlugin": {
-        "type": "boolean"
-      },
       "sensorTimeLength": {
         "type": "integer"
       },
@@ -316,6 +285,52 @@
             }
           }
         }
+      },
+      "nameOverride": {
+        "type": "array",
+        "title": "Accessory Name Overrides",
+        "description": "You can override the default name given to a device when it is added to Homebridge.",
+        "items": {
+          "type": "object",
+          "properties": {
+            "fullDeviceId": {
+              "title": "Device ID",
+              "type": "string",
+              "description": "Full device ID of the device from Homebridge (13 digits normally in the format 1000ab23cdSW2)."
+            },
+            "deviceName": {
+              "title": "Name",
+              "type": "string",
+              "description": "The name for the accessory for when it is added to Homebridge."
+            }
+          }
+        }
+      },
+      "ipOverride": {
+        "type": "array",
+        "title": "IP Overrides",
+        "description": "You can override the IP for a device in Homebridge.",
+        "items": {
+          "type": "object",
+          "properties": {
+            "deviceId": {
+              "title": "Device ID",
+              "type": "string",
+              "description": "Device ID from your eWeLink app (ten digits normally in the format 1000ab23cd)."
+            },
+            "deviceIP": {
+              "title": "IP Address",
+              "type": "string",
+              "description": "The IP address of this device which will be used by the plugin."
+            }
+          }
+        }
+      },
+      "disablePlugin": {
+        "type": "boolean"
+      },
+      "resetRFBridge": {
+        "type": "boolean"
       }
     }
   },
@@ -394,6 +409,38 @@
           ]
         }
       ]
+    },
+    {
+      "key": "nameOverride",
+      "title": "Accessory Name Overrides",
+      "expandable": true,
+      "add": "Add Another Name Override",
+      "type": "array",
+      "items": [
+        {
+          "type": "fieldset",
+          "items": [
+            "nameOverride[].fullDeviceId",
+            "nameOverride[].deviceName"
+          ]
+        }
+      ]
+    },
+    {
+      "key": "ipOverride",
+      "title": "IP Overrides",
+      "expandable": true,
+      "add": "Add Another IP Override",
+      "type": "array",
+      "items": [
+        {
+          "type": "fieldset",
+          "items": [
+            "ipOverride[].deviceId",
+            "ipOverride[].deviceIP"
+          ]
+        }
+      ]
     }
   ]
 }
\ No newline at end of file

From fe3259856b8ff006e944e8e7537321a05f937d71 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 28 Oct 2020 11:24:31 +0000
Subject: [PATCH 0573/3183] standard js formatting

---
 lib/device/garage-four.js |  1 -
 lib/device/rf-bridge.js   |  5 ++---
 lib/device/sensor.js      |  3 +--
 lib/device/thermostat.js  |  6 ++----
 lib/device/zb-dev.js      | 11 ++++-------
 5 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/lib/device/garage-four.js b/lib/device/garage-four.js
index f6cbdd82..f21f1e4d 100644
--- a/lib/device/garage-four.js
+++ b/lib/device/garage-four.js
@@ -34,7 +34,6 @@ module.exports = class deviceGarageFour {
       if (garageConfig.type !== 'garage_four') {
         throw new Error('improper configuration')
       }
-      const tempLogger = msg => this.platform.log.warn('[%s] %s', this.accessory.displayName, msg)
       let garageChannel
       switch (garage) {
         case 'A':
diff --git a/lib/device/rf-bridge.js b/lib/device/rf-bridge.js
index 80f3f6ca..a244acf8 100644
--- a/lib/device/rf-bridge.js
+++ b/lib/device/rf-bridge.js
@@ -1,7 +1,6 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
-const corrInterval = require('correcting-interval')
 const fakegato = require('fakegato-history')
 const helpers = require('./../helpers')
 module.exports = class deviceRFBridge {
@@ -31,7 +30,7 @@ module.exports = class deviceRFBridge {
         if (!accessory.getService(this.Service.CarbonDioxideSensor)) accessory.addService(this.Service.CarbonDioxideSensor)
         break
       case 'contact': {
-        const contactService = accessory.getService(this.Service.ContactSensor) || accessory.addService(this.Service.ContactSensor)
+        if (!accessory.getService(this.Service.ContactSensor)) accessory.addService(this.Service.ContactSensor)
         if (!this.platform.config.disableEveLogging) {
           accessory.log = this.platform.log
           accessory.eveLogger = new this.EveHistoryService('door', accessory, {
@@ -45,7 +44,7 @@ module.exports = class deviceRFBridge {
         if (!accessory.getService(this.Service.OccupancySensor)) accessory.addService(this.Service.OccupancySensor)
         break
       default: {
-        const motionService = accessory.getService(this.Service.MotionSensor) || accessory.addService(this.Service.MotionSensor)
+        if (!accessory.getService(this.Service.MotionSensor)) accessory.addService(this.Service.MotionSensor)
         if (!this.platform.config.disableEveLogging) {
           accessory.log = this.platform.log
           accessory.eveLogger = new this.EveHistoryService('motion', accessory, {
diff --git a/lib/device/sensor.js b/lib/device/sensor.js
index 2090861e..5deee35b 100644
--- a/lib/device/sensor.js
+++ b/lib/device/sensor.js
@@ -1,7 +1,6 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
-const corrInterval = require('correcting-interval')
 const fakegato = require('fakegato-history')
 const helpers = require('./../helpers')
 module.exports = class deviceSensor {
@@ -16,7 +15,7 @@ module.exports = class deviceSensor {
       : this.lowBattThreshold < 5
         ? helpers.defaults.lowBattThreshold
         : this.lowBattThreshold
-    const contactService = accessory.getService(this.Service.ContactSensor) || accessory.addService(this.Service.ContactSensor)
+    if (!accessory.getService(this.Service.ContactSensor)) accessory.addService(this.Service.ContactSensor)
     if (!accessory.getService(this.Service.BatteryService)) accessory.addService(this.Service.BatteryService)
     if (!this.platform.config.disableEveLogging) {
       accessory.log = this.platform.log
diff --git a/lib/device/thermostat.js b/lib/device/thermostat.js
index ef0c65d9..62d177bc 100644
--- a/lib/device/thermostat.js
+++ b/lib/device/thermostat.js
@@ -1,7 +1,6 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
-const corrInterval = require('correcting-interval')
 const fakegato = require('fakegato-history')
 const helpers = require('./../helpers')
 module.exports = class deviceThermostat {
@@ -10,10 +9,9 @@ module.exports = class deviceThermostat {
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
     this.EveHistoryService = fakegato(platform.api)
-    const tempService = accessory.getService(this.Service.TemperatureSensor) || accessory.addService(this.Service.TemperatureSensor)
-    let humiService = false
+    if (!accessory.getService(this.Service.TemperatureSensor)) accessory.addService(this.Service.TemperatureSensor)
     if (accessory.context.sensorType !== 'DS18B20') {
-      humiService = accessory.getService(this.Service.HumiditySensor) || accessory.addService(this.Service.HumiditySensor)
+      if (!accessory.getService(this.Service.HumiditySensor)) accessory.addService(this.Service.HumiditySensor)
     }
     if (!this.platform.config.hideTHSwitch) {
       const switchService = accessory.getService(this.Service.Switch) || accessory.addService(this.Service.Switch)
diff --git a/lib/device/zb-dev.js b/lib/device/zb-dev.js
index 8b40ac63..1614d1c9 100644
--- a/lib/device/zb-dev.js
+++ b/lib/device/zb-dev.js
@@ -1,7 +1,6 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
-const corrInterval = require('correcting-interval')
 const fakegato = require('fakegato-history')
 const helpers = require('./../helpers')
 module.exports = class deviceZBDev {
@@ -36,10 +35,8 @@ module.exports = class deviceZBDev {
         break
       }
       case 1770: {
-        const zbTempService =
-          accessory.getService(this.Service.TemperatureSensor) || accessory.addService(this.Service.TemperatureSensor)
-        const zbHumiService =
-          accessory.getService(this.Service.HumiditySensor) || accessory.addService(this.Service.HumiditySensor)
+        if (!accessory.getService(this.Service.TemperatureSensor)) accessory.addService(this.Service.TemperatureSensor)
+        if (!accessory.getService(this.Service.HumiditySensor)) accessory.addService(this.Service.HumiditySensor)
         if (!this.platform.config.disableEveLogging) {
           accessory.log = this.platform.log
           accessory.eveLogger = new this.EveHistoryService('weather', accessory, {
@@ -50,7 +47,7 @@ module.exports = class deviceZBDev {
         break
       }
       case 2026: {
-        const motionService = accessory.getService(this.Service.MotionSensor) || accessory.addService(this.Service.MotionSensor)
+        if (!accessory.getService(this.Service.MotionSensor)) accessory.addService(this.Service.MotionSensor)
         if (!this.platform.config.disableEveLogging) {
           accessory.log = this.platform.log
           accessory.eveLogger = new this.EveHistoryService('motion', accessory, {
@@ -61,7 +58,7 @@ module.exports = class deviceZBDev {
         break
       }
       case 3026: {
-        const contactService = accessory.getService(this.Service.ContactSensor) || accessory.addService(this.Service.ContactSensor)
+        if (!accessory.getService(this.Service.ContactSensor)) accessory.addService(this.Service.ContactSensor)
         if (!this.platform.config.disableEveLogging) {
           accessory.log = this.platform.log
           accessory.eveLogger = new this.EveHistoryService('door', accessory, {

From 0534667453ff4be84e4d2bee0ac2c3a86c14d192 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 28 Oct 2020 13:03:02 +0000
Subject: [PATCH 0574/3183] no need for intervals

---
 lib/device/outlet.js | 76 ++------------------------------------------
 1 file changed, 3 insertions(+), 73 deletions(-)

diff --git a/lib/device/outlet.js b/lib/device/outlet.js
index b8b7eea4..74ff0acf 100644
--- a/lib/device/outlet.js
+++ b/lib/device/outlet.js
@@ -1,7 +1,6 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
-const corrInterval = require('correcting-interval')
 const fakegato = require('fakegato-history')
 const helpers = require('./../helpers')
 const util = require('util')
@@ -79,93 +78,24 @@ module.exports = class deviceOutlet {
     if (!(outletService = accessory.getService(this.Service.Outlet))) {
       accessory.addService(this.Service.Outlet)
       outletService = accessory.getService(this.Service.Outlet)
-      if (!helpers.devicesSingleSwitchOutlet.includes(accessory.context.eweModel) && !this.platform.config.disableEveLogging) {
+      if (!this.platform.config.disableEveLogging) {
         outletService.addCharacteristic(this.eveVoltage)
         outletService.addCharacteristic(this.eveCurrentConsumption)
         outletService.addCharacteristic(this.eveElectricCurrent)
         outletService.addCharacteristic(this.eveTotalConsumption)
         outletService.addCharacteristic(this.eveResetTotal)
-        accessory.context = {
-          ...accessory.context,
-          ...{
-            extraPersistedData: {},
-            lastReset: 0,
-            totalEnergy: 0,
-            totalEnergyTemp: 0
-          }
-        }
       }
     }
     outletService
       .getCharacteristic(this.Characteristic.On)
       .on('set', (value, callback) => this.internalUpdate(value, callback))
-    if (!helpers.devicesSingleSwitchOutlet.includes(accessory.context.eweModel) && !this.platform.config.disableEveLogging) {
+    if (!this.platform.config.disableEveLogging) {
       accessory.log = this.platform.log
       accessory.eveLogger = new this.EveHistoryService('energy', accessory, {
         storage: 'fs',
         minutes: 5,
         path: this.platform.eveLogPath
       })
-      corrInterval.setCorrectingInterval(() => {
-        const isOn = outletService.getCharacteristic(this.Characteristic.On).value
-        const currentWatt = isOn
-          ? outletService.getCharacteristic(this.eveCurrentConsumption).value
-          : 0
-        if (accessory.eveLogger.isHistoryLoaded()) {
-          accessory.context.extraPersistedData = accessory.eveLogger.getExtraPersistedData()
-          if (accessory.context.extraPersistedData !== undefined) {
-            accessory.context.totalEnergy =
-              accessory.context.extraPersistedData.totalenergy +
-              accessory.context.totalEnergyTemp +
-              (currentWatt * 5) / 3600 / 1000
-            accessory.eveLogger.setExtraPersistedData({
-              totalenergy: accessory.context.totalEnergy,
-              lastReset: accessory.context.extraPersistedData.lastReset
-            })
-          } else {
-            accessory.context.totalEnergy = accessory.context.totalEnergyTemp + (currentWatt * 5) / 3600 / 1000
-            accessory.eveLogger.setExtraPersistedData({
-              totalenergy: accessory.context.totalEnergy,
-              lastReset: 0
-            })
-          }
-          accessory.context.totalEnergytemp = 0
-        } else {
-          accessory.context.totalEnergyTemp += (currentWatt * 5) / 3600 / 1000
-          accessory.context.totalEnergy = accessory.context.totalEnergyTemp
-        }
-        accessory.eveLogger.addEntry({
-          time: Math.round(new Date().valueOf() / 1000),
-          power: currentWatt
-        })
-      }, 300000)
-      outletService
-        .getCharacteristic(this.eveTotalConsumption)
-        .on('get', callback => {
-          accessory.context.extraPersistedData = accessory.eveLogger.getExtraPersistedData()
-          if (accessory.context.extraPersistedData !== undefined) {
-            accessory.context.totalEnergy = accessory.context.extraPersistedData.totalPower
-          }
-          callback(null, accessory.context.totalEnergy)
-        })
-      outletService
-        .getCharacteristic(this.eveResetTotal)
-        .on('set', (value, callback) => {
-          accessory.context.totalEnergy = 0
-          accessory.context.lastReset = value
-          accessory.eveLogger.setExtraPersistedData({
-            totalPower: 0,
-            lastReset: value
-          })
-          callback()
-        })
-        .on('get', callback => {
-          accessory.context.extraPersistedData = accessory.eveLogger.getExtraPersistedData()
-          if (accessory.context.extraPersistedData !== undefined) {
-            accessory.context.lastReset = accessory.context.extraPersistedData.lastReset
-          }
-          callback(null, accessory.context.lastReset)
-        })
     }
     this.accessory = accessory
   }
@@ -191,7 +121,7 @@ module.exports = class deviceOutlet {
       }
       if (helpers.hasProperty(params, 'power')) {
         outletService.updateCharacteristic(this.eveCurrentConsumption, parseFloat(params.power))
-        if (!helpers.devicesSingleSwitchOutlet.includes(this.accessory.context.eweModel) && !this.platform.config.disableEveLogging) {
+        if (helpers.devicesSingleSwitchOutlet.includes(this.accessory.context.eweModel) && !this.platform.config.disableEveLogging) {
           outletService.updateCharacteristic(
             this.Characteristic.OutletInUse,
             parseFloat(params.power) > this.inUsePowerThreshold

From d1a5b6356c7540b28b350f14db521b8423ef9f3a Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 28 Oct 2020 13:03:27 +0000
Subject: [PATCH 0575/3183] remove corrInteval & beta fakegato branch

---
 package-lock.json | 18 +++---------------
 package.json      |  3 +--
 2 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c109a535..cadf94fb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -81,11 +81,6 @@
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
     },
-    "correcting-interval": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/correcting-interval/-/correcting-interval-2.0.0.tgz",
-      "integrity": "sha1-iTdklFcN+C7axTQRHV8n/z6gstM="
-    },
     "debug": {
       "version": "2.6.9",
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
@@ -149,13 +144,11 @@
       "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
     },
     "fakegato-history": {
-      "version": "0.5.6",
-      "resolved": "https://registry.npmjs.org/fakegato-history/-/fakegato-history-0.5.6.tgz",
-      "integrity": "sha512-LlsOkiw9LntVlRlBkssD5ozhEkQzYuEJUlvXk5YAgBQcWzk19PQ5g+NoKfs6SRY1qAeC1onb65hes4mCvY+JmA==",
+      "version": "github:simont77/fakegato-history#7854aa29789c400ee284c9edfbec196e11bdfa4b",
+      "from": "github:simont77/fakegato-history#Updated-Energy",
       "requires": {
         "debug": "^2.2.0",
-        "googleapis": ">39.1.0",
-        "moment": "*"
+        "googleapis": ">39.1.0"
       }
     },
     "fast-text-encoding": {
@@ -383,11 +376,6 @@
       "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.6.tgz",
       "integrity": "sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA=="
     },
-    "moment": {
-      "version": "2.29.1",
-      "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz",
-      "integrity": "sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ=="
-    },
     "ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
diff --git a/package.json b/package.json
index 6d91501a..94062907 100644
--- a/package.json
+++ b/package.json
@@ -67,8 +67,7 @@
   "dependencies": {
     "axios": "0.21.0",
     "color-convert": "2.0.1",
-    "correcting-interval": "2.0.0",
-    "fakegato-history": "0.5.6",
+    "fakegato-history": "simont77/fakegato-history#Updated-Energy",
     "interval-promise": "1.4.0",
     "node-dns-sd": "0.4.2",
     "websocket-as-promised": "1.1.0",

From 2f9fcf9bf9e8a8ada2efd9fdb2262730d5e0a204 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 28 Oct 2020 13:20:05 +0000
Subject: [PATCH 0576/3183] eveLogging config option

---
 config.schema.json       |  7 -----
 lib/device/outlet.js     | 46 ++++++++++++---------------
 lib/device/rf-bridge.js  | 38 ++++++++++-------------
 lib/device/sensor.js     | 22 ++++++-------
 lib/device/thermostat.js | 18 +++++------
 lib/device/zb-dev.js     | 67 ++++++++++++++++------------------------
 6 files changed, 78 insertions(+), 120 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 9ec04513..4a88d666 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -57,12 +57,6 @@
         "description": "If checked, devices will not be refreshed with their most recent status from eWeLink when Homebridge starts. This setting can be useful for users who block their devices from accessing the internet.",
         "default": false
       },
-      "disableEveLogging": {
-        "type": "boolean",
-        "title": "Disable Eve Logging",
-        "description": "If checked, switch, thermostat and power readings will not be logged to the Eve App.",
-        "default": false
-      },
       "inUsePowerThreshold": {
         "type": "integer",
         "title": "Outlet 'In Use' Threshold",
@@ -365,7 +359,6 @@
       "items": [
         "hideChanFromHB",
         "hideLightFromFan",
-        "disableEveLogging",
         "inUsePowerThreshold",
         "hideTHSwitch",
         "lowBattThreshold",
diff --git a/lib/device/outlet.js b/lib/device/outlet.js
index 74ff0acf..1ac2d8e2 100644
--- a/lib/device/outlet.js
+++ b/lib/device/outlet.js
@@ -78,25 +78,21 @@ module.exports = class deviceOutlet {
     if (!(outletService = accessory.getService(this.Service.Outlet))) {
       accessory.addService(this.Service.Outlet)
       outletService = accessory.getService(this.Service.Outlet)
-      if (!this.platform.config.disableEveLogging) {
-        outletService.addCharacteristic(this.eveVoltage)
-        outletService.addCharacteristic(this.eveCurrentConsumption)
-        outletService.addCharacteristic(this.eveElectricCurrent)
-        outletService.addCharacteristic(this.eveTotalConsumption)
-        outletService.addCharacteristic(this.eveResetTotal)
-      }
+      outletService.addCharacteristic(this.eveVoltage)
+      outletService.addCharacteristic(this.eveCurrentConsumption)
+      outletService.addCharacteristic(this.eveElectricCurrent)
+      outletService.addCharacteristic(this.eveTotalConsumption)
+      outletService.addCharacteristic(this.eveResetTotal)
     }
     outletService
       .getCharacteristic(this.Characteristic.On)
       .on('set', (value, callback) => this.internalUpdate(value, callback))
-    if (!this.platform.config.disableEveLogging) {
-      accessory.log = this.platform.log
-      accessory.eveLogger = new this.EveHistoryService('energy', accessory, {
-        storage: 'fs',
-        minutes: 5,
-        path: this.platform.eveLogPath
-      })
-    }
+    accessory.log = this.platform.log
+    accessory.eveLogger = new this.EveHistoryService('energy', accessory, {
+      storage: 'fs',
+      minutes: 5,
+      path: this.platform.eveLogPath
+    })
     this.accessory = accessory
   }
 
@@ -115,23 +111,19 @@ module.exports = class deviceOutlet {
       const outletService = this.accessory.getService(this.Service.Outlet)
       if (helpers.hasProperty(params, 'switch')) {
         outletService.updateCharacteristic(this.Characteristic.On, params.switch === 'on')
-        if (helpers.devicesSingleSwitchOutlet.includes(this.accessory.context.eweModel) || this.platform.config.disableEveLogging) {
+        if (!this.accessory.context.powerReadings) {
           outletService.updateCharacteristic(this.Characteristic.OutletInUse, params.switch === 'on')
         }
       }
       if (helpers.hasProperty(params, 'power')) {
+        this.accessory.context.powerReadings = true
+        outletService.updateCharacteristic(this.Characteristic.OutletInUse, parseFloat(params.power) > this.inUsePowerThreshold)
         outletService.updateCharacteristic(this.eveCurrentConsumption, parseFloat(params.power))
-        if (helpers.devicesSingleSwitchOutlet.includes(this.accessory.context.eweModel) && !this.platform.config.disableEveLogging) {
-          outletService.updateCharacteristic(
-            this.Characteristic.OutletInUse,
-            parseFloat(params.power) > this.inUsePowerThreshold
-          )
-          const isOn = this.accessory.getService(this.Service.Outlet).getCharacteristic(this.Characteristic.On).value
-          this.accessory.eveLogger.addEntry({
-            time: Math.round(new Date().valueOf() / 1000),
-            power: isOn ? parseFloat(params.power) : 0
-          })
-        }
+        const isOn = this.accessory.getService(this.Service.Outlet).getCharacteristic(this.Characteristic.On).value
+        this.accessory.eveLogger.addEntry({
+          time: Math.round(new Date().valueOf() / 1000),
+          power: isOn ? parseFloat(params.power) : 0
+        })
       }
       if (helpers.hasProperty(params, 'voltage')) {
         outletService.updateCharacteristic(this.eveVoltage, parseFloat(params.voltage))
diff --git a/lib/device/rf-bridge.js b/lib/device/rf-bridge.js
index a244acf8..d795d64d 100644
--- a/lib/device/rf-bridge.js
+++ b/lib/device/rf-bridge.js
@@ -31,13 +31,11 @@ module.exports = class deviceRFBridge {
         break
       case 'contact': {
         if (!accessory.getService(this.Service.ContactSensor)) accessory.addService(this.Service.ContactSensor)
-        if (!this.platform.config.disableEveLogging) {
-          accessory.log = this.platform.log
-          accessory.eveLogger = new this.EveHistoryService('door', accessory, {
-            storage: 'fs',
-            path: this.platform.eveLogPath
-          })
-        }
+        accessory.log = this.platform.log
+        accessory.eveLogger = new this.EveHistoryService('door', accessory, {
+          storage: 'fs',
+          path: this.platform.eveLogPath
+        })
         break
       }
       case 'occupancy':
@@ -45,13 +43,11 @@ module.exports = class deviceRFBridge {
         break
       default: {
         if (!accessory.getService(this.Service.MotionSensor)) accessory.addService(this.Service.MotionSensor)
-        if (!this.platform.config.disableEveLogging) {
-          accessory.log = this.platform.log
-          accessory.eveLogger = new this.EveHistoryService('motion', accessory, {
-            storage: 'fs',
-            path: this.platform.eveLogPath
-          })
-        }
+        accessory.log = this.platform.log
+        accessory.eveLogger = new this.EveHistoryService('motion', accessory, {
+          storage: 'fs',
+          path: this.platform.eveLogPath
+        })
         break
       }
       case 'button':
@@ -177,21 +173,19 @@ module.exports = class deviceRFBridge {
                     break
                 }
                 oAccessory.getService(serv).updateCharacteristic(char, 1)
-                if (!this.platform.config.disableEveLogging && eveLog) {
-                  const eveLog = {
+                if (eveLog) {
+                  oAccessory.eveLogger.addEntry({
                     time: Math.round(new Date().valueOf() / 1000),
                     status: 1
-                  }
-                  oAccessory.eveLogger.addEntry(eveLog)
+                  })
                 }
                 await helpers.sleep(sensorTimeLength * 1000)
                 oAccessory.getService(serv).updateCharacteristic(char, 0)
-                if (!this.platform.config.disableEveLogging && eveLog) {
-                  const eveLog = {
+                if (eveLog) {
+                  oAccessory.eveLogger.addEntry({
                     time: Math.round(new Date().valueOf() / 1000),
                     status: 0
-                  }
-                  oAccessory.eveLogger.addEntry(eveLog)
+                  })
                 }
               }
             }
diff --git a/lib/device/sensor.js b/lib/device/sensor.js
index 5deee35b..a0b2c995 100644
--- a/lib/device/sensor.js
+++ b/lib/device/sensor.js
@@ -17,13 +17,11 @@ module.exports = class deviceSensor {
         : this.lowBattThreshold
     if (!accessory.getService(this.Service.ContactSensor)) accessory.addService(this.Service.ContactSensor)
     if (!accessory.getService(this.Service.BatteryService)) accessory.addService(this.Service.BatteryService)
-    if (!this.platform.config.disableEveLogging) {
-      accessory.log = this.platform.log
-      accessory.eveLogger = new this.EveHistoryService('door', accessory, {
-        storage: 'fs',
-        path: this.platform.eveLogPath
-      })
-    }
+    accessory.log = this.platform.log
+    accessory.eveLogger = new this.EveHistoryService('door', accessory, {
+      storage: 'fs',
+      path: this.platform.eveLogPath
+    })
     this.accessory = accessory
   }
 
@@ -44,13 +42,11 @@ module.exports = class deviceSensor {
       let oAccessory = false
       const contactService = this.accessory.getService(this.Service.ContactSensor)
       contactService.updateCharacteristic(this.Characteristic.ContactSensorState, newState)
-      if (!this.platform.config.disableEveLogging) {
-        const eveLog = {
-          time: Math.round(new Date().valueOf() / 1000),
-          status: newState
-        }
-        this.accessory.eveLogger.addEntry(eveLog)
+      const eveLog = {
+        time: Math.round(new Date().valueOf() / 1000),
+        status: newState
       }
+      this.accessory.eveLogger.addEntry(eveLog)
       this.platform.cusG.forEach(async group => {
         if (group.sensorId === this.accessory.context.eweDeviceId && group.type === 'garage') {
           if ((oAccessory = this.platform.devicesInHB.get(group.deviceId + 'SWX'))) {
diff --git a/lib/device/thermostat.js b/lib/device/thermostat.js
index 62d177bc..6a8d9f8e 100644
--- a/lib/device/thermostat.js
+++ b/lib/device/thermostat.js
@@ -19,13 +19,11 @@ module.exports = class deviceThermostat {
         .getCharacteristic(this.Characteristic.On)
         .on('set', (value, callback) => this.internalUpdate(value, callback))
     }
-    if (!this.platform.config.disableEveLogging) {
-      accessory.log = this.platform.log
-      accessory.eveLogger = new this.EveHistoryService('weather', accessory, {
-        storage: 'fs',
-        path: this.platform.eveLogPath
-      })
-    }
+    accessory.log = this.platform.log
+    accessory.eveLogger = new this.EveHistoryService('weather', accessory, {
+      storage: 'fs',
+      path: this.platform.eveLogPath
+    })
     this.accessory = accessory
   }
 
@@ -67,10 +65,8 @@ module.exports = class deviceThermostat {
           .updateCharacteristic(this.Characteristic.CurrentRelativeHumidity, currentHumi)
         eveLog.humidity = currentHumi
       }
-      if (!this.platform.config.disableEveLogging) {
-        if (helpers.hasProperty(eveLog, 'temp') || helpers.hasProperty(eveLog, 'humidity')) {
-          this.accessory.eveLogger.addEntry(eveLog)
-        }
+      if (helpers.hasProperty(eveLog, 'temp') || helpers.hasProperty(eveLog, 'humidity')) {
+        this.accessory.eveLogger.addEntry(eveLog)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
diff --git a/lib/device/zb-dev.js b/lib/device/zb-dev.js
index 1614d1c9..532b6680 100644
--- a/lib/device/zb-dev.js
+++ b/lib/device/zb-dev.js
@@ -37,35 +37,29 @@ module.exports = class deviceZBDev {
       case 1770: {
         if (!accessory.getService(this.Service.TemperatureSensor)) accessory.addService(this.Service.TemperatureSensor)
         if (!accessory.getService(this.Service.HumiditySensor)) accessory.addService(this.Service.HumiditySensor)
-        if (!this.platform.config.disableEveLogging) {
-          accessory.log = this.platform.log
-          accessory.eveLogger = new this.EveHistoryService('weather', accessory, {
-            storage: 'fs',
-            path: this.platform.eveLogPath
-          })
-        }
+        accessory.log = this.platform.log
+        accessory.eveLogger = new this.EveHistoryService('weather', accessory, {
+          storage: 'fs',
+          path: this.platform.eveLogPath
+        })
         break
       }
       case 2026: {
         if (!accessory.getService(this.Service.MotionSensor)) accessory.addService(this.Service.MotionSensor)
-        if (!this.platform.config.disableEveLogging) {
-          accessory.log = this.platform.log
-          accessory.eveLogger = new this.EveHistoryService('motion', accessory, {
-            storage: 'fs',
-            path: this.platform.eveLogPath
-          })
-        }
+        accessory.log = this.platform.log
+        accessory.eveLogger = new this.EveHistoryService('motion', accessory, {
+          storage: 'fs',
+          path: this.platform.eveLogPath
+        })
         break
       }
       case 3026: {
         if (!accessory.getService(this.Service.ContactSensor)) accessory.addService(this.Service.ContactSensor)
-        if (!this.platform.config.disableEveLogging) {
-          accessory.log = this.platform.log
-          accessory.eveLogger = new this.EveHistoryService('door', accessory, {
-            storage: 'fs',
-            path: this.platform.eveLogPath
-          })
-        }
+        accessory.log = this.platform.log
+        accessory.eveLogger = new this.EveHistoryService('door', accessory, {
+          storage: 'fs',
+          path: this.platform.eveLogPath
+        })
         break
       }
     }
@@ -111,10 +105,7 @@ module.exports = class deviceZBDev {
               .updateCharacteristic(this.Characteristic.CurrentRelativeHumidity, currentHumi)
             eveLog.humidity = parseFloat(currentHumi)
           }
-          if (
-            !this.platform.config.disableEveLogging &&
-            (helpers.hasProperty(eveLog, 'temp') || helpers.hasProperty(eveLog, 'humidity'))
-          ) {
+          if (helpers.hasProperty(eveLog, 'temp') || helpers.hasProperty(eveLog, 'humidity')) {
             this.accessory.eveLogger.addEntry(eveLog)
           }
           break
@@ -124,16 +115,14 @@ module.exports = class deviceZBDev {
             const timeNow = new Date()
             const diff = (timeNow.getTime() - params.trigTime) / 1000
             const motionDetected =
-              helpers.hasProperty(params, 'updateSource') &&
-              params.motion === 1 &&
-              diff < this.sensorTimeDifference
-            if (!this.platform.config.disableEveLogging) {
-              const eveLog = {
-                time: Math.round(new Date().valueOf() / 1000),
-                status: motionDetected ? 1 : 0
-              }
-              this.accessory.eveLogger.addEntry(eveLog)
+            helpers.hasProperty(params, 'updateSource') &&
+            params.motion === 1 &&
+            diff < this.sensorTimeDifference
+            const eveLog = {
+              time: Math.round(new Date().valueOf() / 1000),
+              status: motionDetected ? 1 : 0
             }
+            this.accessory.eveLogger.addEntry(eveLog)
             this.accessory.getService(this.Service.MotionSensor).updateCharacteristic(this.Characteristic.MotionDetected, motionDetected)
             break
           }
@@ -143,13 +132,11 @@ module.exports = class deviceZBDev {
             this.accessory
               .getService(this.Service.ContactSensor)
               .updateCharacteristic(this.Characteristic.ContactSensorState, params.lock)
-            if (!this.platform.config.disableEveLogging) {
-              const eveLog = {
-                time: Math.round(new Date().valueOf() / 1000),
-                status: params.lock
-              }
-              this.accessory.eveLogger.addEntry(eveLog)
+            const eveLog = {
+              time: Math.round(new Date().valueOf() / 1000),
+              status: params.lock
             }
+            this.accessory.eveLogger.addEntry(eveLog)
           }
           break
         default:

From f0a6a6eff8d9fe6d0750beeef463be0fb4faffbe Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 28 Oct 2020 17:30:13 +0000
Subject: [PATCH 0577/3183] 3.10.0-0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index cadf94fb..d5ac77a4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.9.0",
+  "version": "3.10.0-0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 94062907..cd3c7fb1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.9.0",
+  "version": "3.10.0-0",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From daad75d76c9fe4c9c2c903823457eb2090953508 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 28 Oct 2020 17:35:19 +0000
Subject: [PATCH 0578/3183] add channel names

---
 lib/ewelink-platform.js | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/lib/ewelink-platform.js b/lib/ewelink-platform.js
index 76e14214..7a8346e2 100644
--- a/lib/ewelink-platform.js
+++ b/lib/ewelink-platform.js
@@ -513,7 +513,15 @@ module.exports = class eWeLinkPlatform {
         ? Object.keys((device.tags && device.tags.zyx_info) || []).length
         : helpers.chansFromUiid[device.extra.uiid]
     if (['1', '2', '3', '4'].includes(switchNumber) && type !== 'rf_sub') {
-      newDeviceName += ' SW' + switchNumber
+      if (
+        helpers.hasProperty(device, 'tags') &&
+        helpers.hasProperty(device.tags, 'ck_channel_name') &&
+        device.tags.ck_channel_name[parseInt(switchNumber) - 1]
+      ) {
+        newDeviceName = device.tags.ck_channel_name[parseInt(switchNumber) - 1]
+      } else {
+        newDeviceName += ' SW' + switchNumber
+      }
     }
     if (helpers.hasProperty(this.config.nameOverride, hbDeviceId)) {
       newDeviceName = this.config.nameOverride[hbDeviceId]

From b461ff70e62117a6b8946f62eb23b1a81da93ca5 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 28 Oct 2020 17:36:00 +0000
Subject: [PATCH 0579/3183] 3.10.0-1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d5ac77a4..b1155e9d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.10.0-0",
+  "version": "3.10.0-1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index cd3c7fb1..5148955d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.10.0-0",
+  "version": "3.10.0-1",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 356bd3c19ae6c52fa0827c1a84fd3f6a888c82e5 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 29 Oct 2020 08:39:46 +0000
Subject: [PATCH 0580/3183] plugin version in logs

---
 lib/ewelink-platform.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/lib/ewelink-platform.js b/lib/ewelink-platform.js
index 7a8346e2..66ddccb4 100644
--- a/lib/ewelink-platform.js
+++ b/lib/ewelink-platform.js
@@ -24,12 +24,13 @@ const eWeLinkLAN = require('./ewelink-lan')
 const eWeLinkWS = require('./ewelink-ws')
 const helpers = require('./helpers')
 const promInterval = require('interval-promise')
+const version = require('./../package.json').version
 module.exports = class eWeLinkPlatform {
   constructor (log, config, api) {
     if (!log || !api || !config) return
     if (!config.username || !config.password || !config.countryCode) {
-      log.error('************* Cannot load homebridge-ewelink *************')
-      log.error('*** eWeLink credentials missing from Homebridge config ***')
+      log.warn('******** Disabling plugin [v%s] *********', version)
+      log.warn('*** eWeLink credentials missing from configuration ***')
       return
     }
     this.log = log
@@ -60,11 +61,11 @@ module.exports = class eWeLinkPlatform {
     try {
       if (this.config.disablePlugin) {
         this.devicesInHB.forEach(a => this.removeAccessory(a))
-        this.log.warn('********* Not loading homebridge-ewelink *********')
+        this.log.warn('***** Disabling plugin [v%s] *********', version)
         this.log.warn('*** To change this, set disablePlugin to false ***')
         return
       }
-      this.log('Plugin has finished initialising. Syncing with eWeLink.')
+      this.log('Plugin [v%s] initialised. Syncing with eWeLink...', version)
       this.httpClient = new eWeLinkHTTP(this.config, this.log)
       await this.httpClient.getHost()
       this.authData = await this.httpClient.login()
@@ -116,7 +117,7 @@ module.exports = class eWeLinkPlatform {
         this.log.warn("Note: 'Request & Response Logging' is not advised for long-term use.")
       }
     } catch (err) {
-      this.log.error('************* Cannot load homebridge-ewelink *************')
+      this.log.error('********** Disabling plugin [v%s] *********', version)
       this.log.error(this.debug ? err : err.message)
       try {
         if (this.lanClient) this.lanClient.closeConnection()

From e860d9fa20450120be6726f2359b4f1ac791731a Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 29 Oct 2020 08:40:20 +0000
Subject: [PATCH 0581/3183] 3.10.0-2

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b1155e9d..d018ee6f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.10.0-1",
+  "version": "3.10.0-2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 5148955d..5b1262f9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.10.0-1",
+  "version": "3.10.0-2",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 82222ba82ddefeb2f7aeacafc9efa0c6ad3deab7 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 29 Oct 2020 09:27:00 +0000
Subject: [PATCH 0582/3183] decrease versions

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 5b1262f9..58219fc8 100644
--- a/package.json
+++ b/package.json
@@ -36,8 +36,8 @@
     "eachen"
   ],
   "engines": {
-    "homebridge": ">=1.1.0",
-    "node": ">=12.19.0"
+    "homebridge": ">=1.0.0",
+    "node": ">=12.0.0"
   },
   "repository": {
     "type": "git",

From 62224e24d28c4c76090ddd0cce28d9b2a0caaae9 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 29 Oct 2020 09:35:18 +0000
Subject: [PATCH 0583/3183] log to warn

---
 lib/ewelink-platform.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/ewelink-platform.js b/lib/ewelink-platform.js
index 66ddccb4..07b82c60 100644
--- a/lib/ewelink-platform.js
+++ b/lib/ewelink-platform.js
@@ -117,8 +117,8 @@ module.exports = class eWeLinkPlatform {
         this.log.warn("Note: 'Request & Response Logging' is not advised for long-term use.")
       }
     } catch (err) {
-      this.log.error('********** Disabling plugin [v%s] *********', version)
-      this.log.error(this.debug ? err : err.message)
+      this.log.warn('********** Disabling plugin [v%s] *********', version)
+      this.log.warn(this.debug ? err : err.message)
       try {
         if (this.lanClient) this.lanClient.closeConnection()
         if (this.wsClient) this.wsClient.closeConnection()

From e3d734ecea20a43c644a5ef565c0c68ec5f3bd5c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 29 Oct 2020 09:43:23 +0000
Subject: [PATCH 0584/3183] Update ewelink-platform.js

---
 lib/ewelink-platform.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/ewelink-platform.js b/lib/ewelink-platform.js
index 07b82c60..0aa759ef 100644
--- a/lib/ewelink-platform.js
+++ b/lib/ewelink-platform.js
@@ -29,7 +29,7 @@ module.exports = class eWeLinkPlatform {
   constructor (log, config, api) {
     if (!log || !api || !config) return
     if (!config.username || !config.password || !config.countryCode) {
-      log.warn('******** Disabling plugin [v%s] *********', version)
+      log.warn('*** Disabling plugin [v%s] ***', version)
       log.warn('*** eWeLink credentials missing from configuration ***')
       return
     }
@@ -61,7 +61,7 @@ module.exports = class eWeLinkPlatform {
     try {
       if (this.config.disablePlugin) {
         this.devicesInHB.forEach(a => this.removeAccessory(a))
-        this.log.warn('***** Disabling plugin [v%s] *********', version)
+        this.log.warn('*** Disabling plugin [v%s] ***', version)
         this.log.warn('*** To change this, set disablePlugin to false ***')
         return
       }
@@ -117,7 +117,7 @@ module.exports = class eWeLinkPlatform {
         this.log.warn("Note: 'Request & Response Logging' is not advised for long-term use.")
       }
     } catch (err) {
-      this.log.warn('********** Disabling plugin [v%s] *********', version)
+      this.log.warn('*** Disabling plugin [v%s] ***', version)
       this.log.warn(this.debug ? err : err.message)
       try {
         if (this.lanClient) this.lanClient.closeConnection()

From 00ad6a95b69b6de3e83fc40436a24cad1cdeb6c1 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 29 Oct 2020 10:06:00 +0000
Subject: [PATCH 0585/3183] 3.10.0-3

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d018ee6f..56e9aa3c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.10.0-2",
+  "version": "3.10.0-3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 58219fc8..a247574b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.10.0-2",
+  "version": "3.10.0-3",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 95dc81197c30240164e2b8ba9a4ef98ee4c5d746 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 29 Oct 2020 11:50:23 +0000
Subject: [PATCH 0586/3183] user defined expose outlet as switch

---
 config.schema.json      | 6 ++++++
 lib/device/switch.js    | 8 +++++++-
 lib/ewelink-platform.js | 9 +++++++++
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/config.schema.json b/config.schema.json
index 4a88d666..51c854c2 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -57,6 +57,11 @@
         "description": "If checked, devices will not be refreshed with their most recent status from eWeLink when Homebridge starts. This setting can be useful for users who block their devices from accessing the internet.",
         "default": false
       },
+      "outletAsSwitch": {
+        "type": "string",
+        "title": "Outlets As Switch",
+        "description": "A list of eWeLink outlet devices to show as switches in Homebridge. For example '10009553c8' or multiple separated with a comma '10009553c8,10009553c9'"
+      },
       "inUsePowerThreshold": {
         "type": "integer",
         "title": "Outlet 'In Use' Threshold",
@@ -358,6 +363,7 @@
       "expandable": true,
       "items": [
         "hideChanFromHB",
+        "outletAsSwitch",
         "hideLightFromFan",
         "inUsePowerThreshold",
         "hideTHSwitch",
diff --git a/lib/device/switch.js b/lib/device/switch.js
index dce815af..75de3450 100644
--- a/lib/device/switch.js
+++ b/lib/device/switch.js
@@ -11,6 +11,9 @@ module.exports = class deviceSwitch {
     switchService
       .getCharacteristic(this.Characteristic.On)
       .on('set', (value, callback) => this.internalUpdate(value, callback))
+    if (accessory.getService(this.Service.Outlet)) {
+      accessory.removeService(accessory.getService(this.Service.Outlet))
+    }
     this.accessory = accessory
   }
 
@@ -83,7 +86,10 @@ module.exports = class deviceSwitch {
 
   async externalUpdate (params) {
     try {
-      if (helpers.devicesSingleSwitch.includes(this.accessory.context.eweUIID)) {
+      if (
+        helpers.devicesSingleSwitch.includes(this.accessory.context.eweUIID) ||
+        (this.platform.config.outletAsSwitch || '').split(',').includes(this.accessory.context.eweDeviceid)
+      ) {
         if (!helpers.hasProperty(params, 'switch')) return
         this.accessory.getService(this.Service.Switch).updateCharacteristic(this.Characteristic.On, params.switch === 'on')
       } else if (helpers.devicesMultiSwitch.includes(this.accessory.context.eweUIID)) {
diff --git a/lib/ewelink-platform.js b/lib/ewelink-platform.js
index 0aa759ef..7923fce7 100644
--- a/lib/ewelink-platform.js
+++ b/lib/ewelink-platform.js
@@ -253,6 +253,15 @@ module.exports = class eWeLinkPlatform {
           })
         accessory.control = new deviceThermostat(this, accessory)
         /*********/
+      } else if ((this.config.outletAsSwitch || '').split(',').includes(device.deviceid)) {
+        /******************
+        OUTLETS [AS SWITCH]
+        ******************/
+        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
+          ? this.devicesInHB.get(device.deviceid + 'SWX')
+          : this.addAccessory(device, device.deviceid + 'SWX')
+        accessory.control = new deviceSwitch(this, accessory)
+        /***********************/
       } else if (helpers.devicesOutlet.includes(device.extra.uiid) || (helpers.devicesSingleSwitch.includes(device.extra.uiid) && helpers.devicesSingleSwitchOutlet.includes(device.productModel))) {
         /******
         OUTLETS

From e3e99d8fb14116e38e13e976e217517b226f3311 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 29 Oct 2020 11:51:20 +0000
Subject: [PATCH 0587/3183] 3.10.0-4

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 56e9aa3c..fb65b490 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.10.0-3",
+  "version": "3.10.0-4",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index a247574b..668b970b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.10.0-3",
+  "version": "3.10.0-4",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From a35ab5f79b4656d244c15068fefbc653426d7422 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 29 Oct 2020 14:19:29 +0000
Subject: [PATCH 0588/3183] use persist folder

---
 lib/ewelink-platform.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ewelink-platform.js b/lib/ewelink-platform.js
index 7923fce7..7504f1ca 100644
--- a/lib/ewelink-platform.js
+++ b/lib/ewelink-platform.js
@@ -51,7 +51,7 @@ module.exports = class eWeLinkPlatform {
     this.config.nameOverride = this.nameOverrideTmp
     this.config.ipOverride = this.ipOverrideTmp
     this.wsRefreshFlag = true
-    this.eveLogPath = this.api.user.storagePath() + '/homebridge-ewelink/'
+    this.eveLogPath = this.api.user.storagePath() + '/persist/'
     this.api
       .on('didFinishLaunching', () => this.eWeLinkSetup())
       .on('shutdown', () => this.eWeLinkShutdown())

From efdd3e6667344337e822ab46395221ffbd8cb712 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 29 Oct 2020 14:20:33 +0000
Subject: [PATCH 0589/3183] 3.10.0-5

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index fb65b490..1a189fa2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.10.0-4",
+  "version": "3.10.0-5",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 668b970b..659ff512 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.10.0-4",
+  "version": "3.10.0-5",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 68029e492ce6de99b4ecbfc8235701638623b9d5 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 29 Oct 2020 14:41:41 +0000
Subject: [PATCH 0590/3183] revert back to 10 mins

---
 lib/device/outlet.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/device/outlet.js b/lib/device/outlet.js
index 1ac2d8e2..f5143736 100644
--- a/lib/device/outlet.js
+++ b/lib/device/outlet.js
@@ -90,7 +90,6 @@ module.exports = class deviceOutlet {
     accessory.log = this.platform.log
     accessory.eveLogger = new this.EveHistoryService('energy', accessory, {
       storage: 'fs',
-      minutes: 5,
       path: this.platform.eveLogPath
     })
     this.accessory = accessory

From 29a2b7388dd319146e276703ae0b568e7a1d5980 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 29 Oct 2020 15:07:04 +0000
Subject: [PATCH 0591/3183] delay between updates

---
 lib/ewelink-platform.js | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/lib/ewelink-platform.js b/lib/ewelink-platform.js
index 7504f1ca..ac009750 100644
--- a/lib/ewelink-platform.js
+++ b/lib/ewelink-platform.js
@@ -51,6 +51,7 @@ module.exports = class eWeLinkPlatform {
     this.config.nameOverride = this.nameOverrideTmp
     this.config.ipOverride = this.ipOverrideTmp
     this.wsRefreshFlag = true
+    this.updateInProgress = false
     this.eveLogPath = this.api.user.storagePath() + '/persist/'
     this.api
       .on('didFinishLaunching', () => this.eWeLinkSetup())
@@ -575,6 +576,12 @@ module.exports = class eWeLinkPlatform {
   }
 
   async sendDeviceUpdate (accessory, params) {
+    if (this.updateInProgress) {
+      if (this.debug) this.log('Another device update is in progress. Will try again now.')
+      await helpers.sleep(500)
+      return await this.sendDeviceUpdate(accessory, params)
+    }
+    this.updateInProgress = true
     const payload = {
       apikey: accessory.context.eweApiKey,
       deviceid: accessory.context.eweDeviceId,
@@ -583,11 +590,15 @@ module.exports = class eWeLinkPlatform {
     const res = helpers.devicesNonLAN.includes(accessory.context.eweUIID)
       ? "device doesn't support LAN mode"
       : await this.lanClient.sendUpdate(payload)
-    if (res !== 'ok') {
+    if (res === 'ok') {
+      this.updateInProgress = false
+    } else {
       if (accessory.context.reachableWAN) {
         if (this.debug) this.log('[%s] Reverting to web socket as %s.', accessory.displayName, res)
         await this.wsClient.sendUpdate(payload)
+        this.updateInProgress = false
       } else {
+        this.updateInProgress = false
         throw new Error("it is unreachable. It's status will be corrected once it is reachable")
       }
     }

From e6c9fbf3f6e80ae0bc73c8b93f28144ab2d799bb Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 29 Oct 2020 15:16:04 +0000
Subject: [PATCH 0592/3183] Revert "delay between updates"

This reverts commit 29a2b7388dd319146e276703ae0b568e7a1d5980.
---
 lib/ewelink-platform.js | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/lib/ewelink-platform.js b/lib/ewelink-platform.js
index ac009750..7504f1ca 100644
--- a/lib/ewelink-platform.js
+++ b/lib/ewelink-platform.js
@@ -51,7 +51,6 @@ module.exports = class eWeLinkPlatform {
     this.config.nameOverride = this.nameOverrideTmp
     this.config.ipOverride = this.ipOverrideTmp
     this.wsRefreshFlag = true
-    this.updateInProgress = false
     this.eveLogPath = this.api.user.storagePath() + '/persist/'
     this.api
       .on('didFinishLaunching', () => this.eWeLinkSetup())
@@ -576,12 +575,6 @@ module.exports = class eWeLinkPlatform {
   }
 
   async sendDeviceUpdate (accessory, params) {
-    if (this.updateInProgress) {
-      if (this.debug) this.log('Another device update is in progress. Will try again now.')
-      await helpers.sleep(500)
-      return await this.sendDeviceUpdate(accessory, params)
-    }
-    this.updateInProgress = true
     const payload = {
       apikey: accessory.context.eweApiKey,
       deviceid: accessory.context.eweDeviceId,
@@ -590,15 +583,11 @@ module.exports = class eWeLinkPlatform {
     const res = helpers.devicesNonLAN.includes(accessory.context.eweUIID)
       ? "device doesn't support LAN mode"
       : await this.lanClient.sendUpdate(payload)
-    if (res === 'ok') {
-      this.updateInProgress = false
-    } else {
+    if (res !== 'ok') {
       if (accessory.context.reachableWAN) {
         if (this.debug) this.log('[%s] Reverting to web socket as %s.', accessory.displayName, res)
         await this.wsClient.sendUpdate(payload)
-        this.updateInProgress = false
       } else {
-        this.updateInProgress = false
         throw new Error("it is unreachable. It's status will be corrected once it is reachable")
       }
     }

From af3da7ae6aaaa3b285524fb5e8b47f2efe69a554 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 30 Oct 2020 09:47:15 +0000
Subject: [PATCH 0593/3183] a form of update-queueing

---
 lib/ewelink-platform.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/lib/ewelink-platform.js b/lib/ewelink-platform.js
index 7504f1ca..7eecf7bf 100644
--- a/lib/ewelink-platform.js
+++ b/lib/ewelink-platform.js
@@ -51,6 +51,7 @@ module.exports = class eWeLinkPlatform {
     this.config.nameOverride = this.nameOverrideTmp
     this.config.ipOverride = this.ipOverrideTmp
     this.wsRefreshFlag = true
+    this.updateInProgress = false
     this.eveLogPath = this.api.user.storagePath() + '/persist/'
     this.api
       .on('didFinishLaunching', () => this.eWeLinkSetup())
@@ -575,6 +576,13 @@ module.exports = class eWeLinkPlatform {
   }
 
   async sendDeviceUpdate (accessory, params) {
+    await helpers.sleep(Math.floor(Math.random() * (100 - 10 + 1) + 10))
+    if (this.updateInProgress) {
+      await helpers.sleep(400)
+      return await this.sendDeviceUpdate(accessory, params)
+    }
+    this.updateInProgress = true
+    setTimeout(() => (this.updateInProgress = false), 350)
     const payload = {
       apikey: accessory.context.eweApiKey,
       deviceid: accessory.context.eweDeviceId,

From 72257ab7bac1d8344d2facdb139d441174918094 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 30 Oct 2020 09:56:58 +0000
Subject: [PATCH 0594/3183] 3.10.0-6

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 1a189fa2..b411dcea 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.10.0-5",
+  "version": "3.10.0-6",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 659ff512..1ca7a21b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.10.0-5",
+  "version": "3.10.0-6",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From b6ebb77a05bc84a717a4a482d6b746188885b5c8 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 30 Oct 2020 17:40:26 +0000
Subject: [PATCH 0595/3183] better eveTotalConsumption support

---
 lib/device/outlet.js | 37 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 36 insertions(+), 1 deletion(-)

diff --git a/lib/device/outlet.js b/lib/device/outlet.js
index f5143736..d3064231 100644
--- a/lib/device/outlet.js
+++ b/lib/device/outlet.js
@@ -20,8 +20,11 @@ module.exports = class deviceOutlet {
     this.eveCurrentConsumption = function () {
       self.Characteristic.call(this, 'Current Consumption', 'E863F10D-079E-48FF-8F27-9C2605A29F52')
       this.setProps({
-        format: self.Characteristic.Formats.FLOAT,
+        format: self.Characteristic.Formats.UINT16,
         unit: 'W',
+        maxValue: 100000,
+        minValue: 0,
+        minStep: 1,
         perms: [self.Characteristic.Perms.READ, self.Characteristic.Perms.NOTIFY]
       })
       this.value = this.getDefaultValue()
@@ -31,6 +34,9 @@ module.exports = class deviceOutlet {
       this.setProps({
         format: self.Characteristic.Formats.FLOAT,
         unit: 'kWh',
+        maxValue: 100000000000,
+        minValue: 0,
+        minStep: 0.01,
         perms: [self.Characteristic.Perms.READ, self.Characteristic.Perms.NOTIFY]
       })
       this.value = this.getDefaultValue()
@@ -40,6 +46,9 @@ module.exports = class deviceOutlet {
       this.setProps({
         format: self.Characteristic.Formats.FLOAT,
         unit: 'V',
+        maxValue: 100000000000,
+        minValue: 0,
+        minStep: 1,
         perms: [self.Characteristic.Perms.READ, self.Characteristic.Perms.NOTIFY]
       })
       this.value = this.getDefaultValue()
@@ -49,6 +58,9 @@ module.exports = class deviceOutlet {
       this.setProps({
         format: self.Characteristic.Formats.FLOAT,
         unit: 'A',
+        maxValue: 100000000000,
+        minValue: 0,
+        minStep: 0.1,
         perms: [self.Characteristic.Perms.READ, self.Characteristic.Perms.NOTIFY]
       })
       this.value = this.getDefaultValue()
@@ -71,6 +83,8 @@ module.exports = class deviceOutlet {
     this.eveVoltage.UUID = 'E863F10A-079E-48FF-8F27-9C2605A29F52'
     this.eveElectricCurrent.UUID = 'E863F126-079E-48FF-8F27-9C2605A29F52'
     this.eveResetTotal.UUID = 'E863F112-079E-48FF-8F27-9C2605A29F52'
+    if (!helpers.hasProperty(accessory.context, 'energyReadings')) accessory.context.energyReadings = []
+    if (!helpers.hasProperty(accessory.context, 'energyReadingTotal')) accessory.context.energyReadingTotal = 0
     if (accessory.getService(this.Service.Switch)) {
       accessory.removeService(accessory.getService(this.Service.Switch))
     }
@@ -87,11 +101,31 @@ module.exports = class deviceOutlet {
     outletService
       .getCharacteristic(this.Characteristic.On)
       .on('set', (value, callback) => this.internalUpdate(value, callback))
+    outletService
+      .getCharacteristic(this.eveResetTotal)
+      .on('set', (value, callback) => {
+        callback()
+        accessory.context.energyReadings = []
+        accessory.context.energyReadingTotal = 0
+        outletService.updateCharacteristic(this.eveTotalConsumption, 0)
+      })
     accessory.log = this.platform.log
     accessory.eveLogger = new this.EveHistoryService('energy', accessory, {
       storage: 'fs',
       path: this.platform.eveLogPath
     })
+    setInterval(() => {
+      let total = 0
+      if (accessory.context.energyReadings.length > 0) {
+        accessory.context.energyReadings.forEach(x => (total += x))
+        total /= accessory.context.energyReadings.length // W5m
+        total /= 12 // Wh
+        total /= 1000 // kWh
+        accessory.context.energyReadingTotal += total
+      }
+      accessory.context.energyReadings = []
+      outletService.updateCharacteristic(this.eveTotalConsumption, accessory.context.energyReadingTotal)
+    }, 300000)
     this.accessory = accessory
   }
 
@@ -123,6 +157,7 @@ module.exports = class deviceOutlet {
           time: Math.round(new Date().valueOf() / 1000),
           power: isOn ? parseFloat(params.power) : 0
         })
+        this.accessory.context.energyReadings.push(parseFloat(params.power))
       }
       if (helpers.hasProperty(params, 'voltage')) {
         outletService.updateCharacteristic(this.eveVoltage, parseFloat(params.voltage))

From ac9ceec22d87b00dce66723f25d681c8cfc5a328 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 30 Oct 2020 17:46:51 +0000
Subject: [PATCH 0596/3183] fakegato to 0.6.0

---
 package-lock.json | 41 ++++++++++++++---------------------------
 package.json      |  2 +-
 2 files changed, 15 insertions(+), 28 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b411dcea..3cf0e1e3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -144,8 +144,9 @@
       "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
     },
     "fakegato-history": {
-      "version": "github:simont77/fakegato-history#7854aa29789c400ee284c9edfbec196e11bdfa4b",
-      "from": "github:simont77/fakegato-history#Updated-Energy",
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/fakegato-history/-/fakegato-history-0.6.0.tgz",
+      "integrity": "sha512-byGVbvoumtYaoZkVzZ+p3sxXdw5cne1yfUdL1vXLE5RlcKakv5I9lc/EtfT+R92s7z22o5dbeeIkf8aPIsiR9w==",
       "requires": {
         "debug": "^2.2.0",
         "googleapis": ">39.1.0"
@@ -179,26 +180,12 @@
       }
     },
     "gcp-metadata": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-4.2.0.tgz",
-      "integrity": "sha512-vQZD57cQkqIA6YPGXM/zc+PIZfNRFdukWGsGZ5+LcJzesi5xp6Gn7a02wRJi4eXPyArNMIYpPET4QMxGqtlk6Q==",
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-4.2.1.tgz",
+      "integrity": "sha512-tSk+REe5iq/N+K+SK1XjZJUrFPuDqGZVzCy2vocIHIGmPlTGsa8owXMJwGkrXr73NO0AzhPW4MF2DEHz7P2AVw==",
       "requires": {
-        "gaxios": "^3.0.0",
+        "gaxios": "^4.0.0",
         "json-bigint": "^1.0.0"
-      },
-      "dependencies": {
-        "gaxios": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/gaxios/-/gaxios-3.2.0.tgz",
-          "integrity": "sha512-+6WPeVzPvOshftpxJwRi2Ozez80tn/hdtOUag7+gajDHRJvAblKxTFSSMPtr2hmnLy7p0mvYz0rMXLBl8pSO7Q==",
-          "requires": {
-            "abort-controller": "^3.0.0",
-            "extend": "^3.0.2",
-            "https-proxy-agent": "^5.0.0",
-            "is-stream": "^2.0.0",
-            "node-fetch": "^2.3.0"
-          }
-        }
       }
     },
     "google-auth-library": {
@@ -226,18 +213,18 @@
       }
     },
     "googleapis": {
-      "version": "61.0.0",
-      "resolved": "https://registry.npmjs.org/googleapis/-/googleapis-61.0.0.tgz",
-      "integrity": "sha512-aXaNgWKaALiYrfwrJ0ZYhRo2abyIBcqUjyNMgkbghKJMiCeOwcktlaGseH6JbPlCxXYCE8ZDfvAQqVNsf+6/RA==",
+      "version": "62.0.0",
+      "resolved": "https://registry.npmjs.org/googleapis/-/googleapis-62.0.0.tgz",
+      "integrity": "sha512-IKWMdnrEzaVcambJ90QjH4Rl6e6L+bljB4SRniPgnhTQ8BG/p/M6fuNhzbBssu61GYu5q8EcxKndmRZQIIo2iQ==",
       "requires": {
         "google-auth-library": "^6.0.0",
-        "googleapis-common": "^4.4.0"
+        "googleapis-common": "^4.4.1"
       }
     },
     "googleapis-common": {
-      "version": "4.4.2",
-      "resolved": "https://registry.npmjs.org/googleapis-common/-/googleapis-common-4.4.2.tgz",
-      "integrity": "sha512-booWj8k9BwN2j+nbCaThbXscbbsO+FkV4h3xHW+RRC6+RwtqS2I3gqXbP8bqE1BgQBcN+49xFODCfAxy9PGfOQ==",
+      "version": "4.4.3",
+      "resolved": "https://registry.npmjs.org/googleapis-common/-/googleapis-common-4.4.3.tgz",
+      "integrity": "sha512-W46WKCk3QtlCCfmZyQIH5zxmDOyeV5Qj+qs7nr2ox08eRkEJMWp6iwv542R/PsokXaGUSrmif4vCC4+rGzRSsQ==",
       "requires": {
         "extend": "^3.0.2",
         "gaxios": "^4.0.0",
diff --git a/package.json b/package.json
index 1ca7a21b..3f133d50 100644
--- a/package.json
+++ b/package.json
@@ -67,7 +67,7 @@
   "dependencies": {
     "axios": "0.21.0",
     "color-convert": "2.0.1",
-    "fakegato-history": "simont77/fakegato-history#Updated-Energy",
+    "fakegato-history": "0.6.0",
     "interval-promise": "1.4.0",
     "node-dns-sd": "0.4.2",
     "websocket-as-promised": "1.1.0",

From c06ba267dd1c8c4331e3404689ec98e3793bee2e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 30 Oct 2020 17:49:25 +0000
Subject: [PATCH 0597/3183] 3.10.0-7

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 3cf0e1e3..822ab285 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.10.0-6",
+  "version": "3.10.0-7",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 3f133d50..a55eebe2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.10.0-6",
+  "version": "3.10.0-7",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 0f73a5af408a50404c450cf73f4cda42060d8330 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 30 Oct 2020 18:37:33 +0000
Subject: [PATCH 0598/3183] eve switch history (usb+scm)

---
 lib/device/scm.js | 11 +++++++++++
 lib/device/usb.js | 11 +++++++++++
 2 files changed, 22 insertions(+)

diff --git a/lib/device/scm.js b/lib/device/scm.js
index b92fd847..0b71f8e3 100644
--- a/lib/device/scm.js
+++ b/lib/device/scm.js
@@ -1,16 +1,23 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
+const fakegato = require('fakegato-history')
 const helpers = require('./../helpers')
 module.exports = class deviceSCM {
   constructor (platform, accessory) {
     this.platform = platform
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
+    this.EveHistoryService = fakegato(platform.api)
     const scmService = accessory.getService(this.Service.Switch) || accessory.addService(this.Service.Switch)
     scmService
       .getCharacteristic(this.Characteristic.On)
       .on('set', (value, callback) => this.internalUpdate(value, callback))
+    accessory.log = this.platform.log
+    accessory.eveLogger = new this.EveHistoryService('switch', accessory, {
+      storage: 'fs',
+      path: this.platform.eveLogPath
+    })
     this.accessory = accessory
   }
 
@@ -29,6 +36,10 @@ module.exports = class deviceSCM {
     try {
       if (!helpers.hasProperty(params, 'switches')) return
       this.accessory.getService(this.Service.Switch).updateCharacteristic(this.Characteristic.On, params.switches[0].switch === 'on')
+      this.accessory.eveLogger.addEntry({
+        time: Math.round(new Date().valueOf() / 1000),
+        power: params.switches[0].switch === 'on' ? 1 : 0
+      })
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
diff --git a/lib/device/usb.js b/lib/device/usb.js
index fa5bc4f6..d7b4f30d 100644
--- a/lib/device/usb.js
+++ b/lib/device/usb.js
@@ -1,16 +1,23 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
+const fakegato = require('fakegato-history')
 const helpers = require('./../helpers')
 module.exports = class deviceUSB {
   constructor (platform, accessory) {
     this.platform = platform
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
+    this.EveHistoryService = fakegato(platform.api)
     const usbService = accessory.getService(this.Service.Outlet) || accessory.addService(this.Service.Outlet)
     usbService
       .getCharacteristic(this.Characteristic.On)
       .on('set', (value, callback) => this.internalUpdate(value, callback))
+    accessory.log = this.platform.log
+    accessory.eveLogger = new this.EveHistoryService('switch', accessory, {
+      storage: 'fs',
+      path: this.platform.eveLogPath
+    })
     this.accessory = accessory
   }
 
@@ -29,6 +36,10 @@ module.exports = class deviceUSB {
     try {
       if (!helpers.hasProperty(params, 'switches')) return
       this.accessory.getService(this.Service.Outlet).updateCharacteristic(this.Characteristic.On, params.switches[0].switch === 'on')
+      this.accessory.eveLogger.addEntry({
+        time: Math.round(new Date().valueOf() / 1000),
+        power: params.switches[0].switch === 'on' ? 1 : 0
+      })
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }

From 9611cd24b83d11f30170cc7b601dc402afe1ed28 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 30 Oct 2020 18:54:54 +0000
Subject: [PATCH 0599/3183] eveLogger formatting

---
 lib/device/sensor.js |  5 ++---
 lib/device/zb-dev.js | 10 ++++------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/lib/device/sensor.js b/lib/device/sensor.js
index a0b2c995..befaa3f3 100644
--- a/lib/device/sensor.js
+++ b/lib/device/sensor.js
@@ -42,11 +42,10 @@ module.exports = class deviceSensor {
       let oAccessory = false
       const contactService = this.accessory.getService(this.Service.ContactSensor)
       contactService.updateCharacteristic(this.Characteristic.ContactSensorState, newState)
-      const eveLog = {
+      this.accessory.eveLogger.addEntry({
         time: Math.round(new Date().valueOf() / 1000),
         status: newState
-      }
-      this.accessory.eveLogger.addEntry(eveLog)
+      })
       this.platform.cusG.forEach(async group => {
         if (group.sensorId === this.accessory.context.eweDeviceId && group.type === 'garage') {
           if ((oAccessory = this.platform.devicesInHB.get(group.deviceId + 'SWX'))) {
diff --git a/lib/device/zb-dev.js b/lib/device/zb-dev.js
index 532b6680..18994bb7 100644
--- a/lib/device/zb-dev.js
+++ b/lib/device/zb-dev.js
@@ -118,11 +118,10 @@ module.exports = class deviceZBDev {
             helpers.hasProperty(params, 'updateSource') &&
             params.motion === 1 &&
             diff < this.sensorTimeDifference
-            const eveLog = {
+            this.accessory.eveLogger.addEntry({
               time: Math.round(new Date().valueOf() / 1000),
               status: motionDetected ? 1 : 0
-            }
-            this.accessory.eveLogger.addEntry(eveLog)
+            })
             this.accessory.getService(this.Service.MotionSensor).updateCharacteristic(this.Characteristic.MotionDetected, motionDetected)
             break
           }
@@ -132,11 +131,10 @@ module.exports = class deviceZBDev {
             this.accessory
               .getService(this.Service.ContactSensor)
               .updateCharacteristic(this.Characteristic.ContactSensorState, params.lock)
-            const eveLog = {
+            this.accessory.eveLogger.addEntry({
               time: Math.round(new Date().valueOf() / 1000),
               status: params.lock
-            }
-            this.accessory.eveLogger.addEntry(eveLog)
+            })
           }
           break
         default:

From a80df1fdd04f822d681972665234b704f822c437 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 30 Oct 2020 18:56:12 +0000
Subject: [PATCH 0600/3183] eve log for all sensor types

---
 lib/device/rf-bridge.js | 120 +++++++++++++++++++++-------------------
 1 file changed, 64 insertions(+), 56 deletions(-)

diff --git a/lib/device/rf-bridge.js b/lib/device/rf-bridge.js
index d795d64d..9a01a6be 100644
--- a/lib/device/rf-bridge.js
+++ b/lib/device/rf-bridge.js
@@ -15,50 +15,63 @@ module.exports = class deviceRFBridge {
       : this.sensorTimeDifference < 10
         ? helpers.defaults.sensorTimeDifference
         : this.sensorTimeDifference
-    switch (accessory.context.subType) {
-      case 'water':
-        if (!accessory.getService(this.Service.LeakSensor)) accessory.addService(this.Service.LeakSensor)
-        break
-      case 'fire':
-      case 'smoke':
-        if (!accessory.getService(this.Service.SmokeSensor)) accessory.addService(this.Service.SmokeSensor)
-        break
-      case 'co':
-        if (!accessory.getService(this.Service.CarbonMonoxideSensor)) accessory.addService(this.Service.CarbonMonoxideSensor)
-        break
-      case 'co2':
-        if (!accessory.getService(this.Service.CarbonDioxideSensor)) accessory.addService(this.Service.CarbonDioxideSensor)
-        break
-      case 'contact': {
-        if (!accessory.getService(this.Service.ContactSensor)) accessory.addService(this.Service.ContactSensor)
-        accessory.log = this.platform.log
-        accessory.eveLogger = new this.EveHistoryService('door', accessory, {
-          storage: 'fs',
-          path: this.platform.eveLogPath
-        })
-        break
-      }
-      case 'occupancy':
-        if (!accessory.getService(this.Service.OccupancySensor)) accessory.addService(this.Service.OccupancySensor)
-        break
-      default: {
-        if (!accessory.getService(this.Service.MotionSensor)) accessory.addService(this.Service.MotionSensor)
-        accessory.log = this.platform.log
-        accessory.eveLogger = new this.EveHistoryService('motion', accessory, {
-          storage: 'fs',
-          path: this.platform.eveLogPath
-        })
-        break
+    if (accessory.context.subType === 'button') {
+      Object.entries(accessory.context.buttons).forEach(([chan, name]) => {
+        if (!accessory.getService(name)) accessory.addService(this.Service.Switch, name, 'switch' + chan)
+        accessory.getService(name).updateCharacteristic(this.Characteristic.On, false)
+        accessory.getService(name)
+          .getCharacteristic(this.Characteristic.On)
+          .on('set', (value, callback) => this.internalUpdate(chan, name, value, callback))
+      })
+    } else {
+      let serv
+      let char
+      let eveType
+      switch (accessory.context.subType) {
+        case 'water':
+          serv = this.Service.LeakSensor
+          char = this.Characteristic.LeakDetected
+          eveType = 'motion'
+          break
+        case 'fire':
+        case 'smoke':
+          serv = this.Service.SmokeSensor
+          char = this.Characteristic.SmokeDetected
+          eveType = 'motion'
+          break
+        case 'co':
+          serv = this.Service.CarbonMonoxideSensor
+          char = this.Characteristic.CarbonMonoxideDetected
+          eveType = 'motion'
+          break
+        case 'co2':
+          serv = this.Service.CarbonDioxideSensor
+          char = this.Characteristic.CarbonDioxideDetected
+          eveType = 'motion'
+          break
+        case 'contact':
+          serv = this.Service.ContactSensor
+          char = this.Characteristic.ContactSensorState
+          eveType = 'door'
+          break
+        case 'occupancy':
+          serv = this.Service.OccupancySensor
+          char = this.Characteristic.OccupancyDetected
+          eveType = 'motion'
+          break
+        default:
+          serv = this.Service.MotionSensor
+          char = this.Characteristic.MotionDetected
+          eveType = 'motion'
+          break
       }
-      case 'button':
-        Object.entries(accessory.context.buttons).forEach(([chan, name]) => {
-          if (!accessory.getService(name)) accessory.addService(this.Service.Switch, name, 'switch' + chan)
-          accessory.getService(name).updateCharacteristic(this.Characteristic.On, false)
-          accessory.getService(name)
-            .getCharacteristic(this.Characteristic.On)
-            .on('set', (value, callback) => this.internalUpdate(chan, name, value, callback))
-        })
-        break
+      const service = accessory.getService(serv) || accessory.addService(serv)
+      accessory.log = this.platform.log
+      accessory.eveLogger = new this.EveHistoryService(eveType, accessory, {
+        storage: 'fs',
+        path: this.platform.eveLogPath
+      })
+      break
     }
     this.accessory = accessory
   }
@@ -135,7 +148,6 @@ module.exports = class deviceRFBridge {
               const diff = (timeNow.getTime() - timeOfMotion.getTime()) / 1000
               let serv
               let char
-              let eveLog = false
               if (diff < this.sensorTimeDifference) {
                 switch (oAccessory.context.subType) {
                   case 'button':
@@ -173,20 +185,16 @@ module.exports = class deviceRFBridge {
                     break
                 }
                 oAccessory.getService(serv).updateCharacteristic(char, 1)
-                if (eveLog) {
-                  oAccessory.eveLogger.addEntry({
-                    time: Math.round(new Date().valueOf() / 1000),
-                    status: 1
-                  })
-                }
+                oAccessory.eveLogger.addEntry({
+                  time: Math.round(new Date().valueOf() / 1000),
+                  status: 1
+                })
                 await helpers.sleep(sensorTimeLength * 1000)
                 oAccessory.getService(serv).updateCharacteristic(char, 0)
-                if (eveLog) {
-                  oAccessory.eveLogger.addEntry({
-                    time: Math.round(new Date().valueOf() / 1000),
-                    status: 0
-                  })
-                }
+                oAccessory.eveLogger.addEntry({
+                  time: Math.round(new Date().valueOf() / 1000),
+                  status: 0
+                })
               }
             }
           })

From e00440e7a4b1c08fc2acb87234f4390536c2d83c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 30 Oct 2020 18:56:29 +0000
Subject: [PATCH 0601/3183] sensor off on hb restart

---
 lib/device/rf-bridge.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/device/rf-bridge.js b/lib/device/rf-bridge.js
index 9a01a6be..cb1e6914 100644
--- a/lib/device/rf-bridge.js
+++ b/lib/device/rf-bridge.js
@@ -66,6 +66,7 @@ module.exports = class deviceRFBridge {
           break
       }
       const service = accessory.getService(serv) || accessory.addService(serv)
+      service.updateCharacteristic(char, 0)
       accessory.log = this.platform.log
       accessory.eveLogger = new this.EveHistoryService(eveType, accessory, {
         storage: 'fs',

From 7e7ecb9d1c9cad38fdd66c6caca210789d28afe9 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 30 Oct 2020 19:04:17 +0000
Subject: [PATCH 0602/3183] switch eve history

---
 lib/device/switch.js | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/lib/device/switch.js b/lib/device/switch.js
index 75de3450..2ff2006e 100644
--- a/lib/device/switch.js
+++ b/lib/device/switch.js
@@ -1,12 +1,14 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
+const fakegato = require('fakegato-history')
 const helpers = require('./../helpers')
 module.exports = class deviceSwitch {
   constructor (platform, accessory) {
     this.platform = platform
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
+    this.EveHistoryService = fakegato(platform.api)
     const switchService = accessory.getService(this.Service.Switch) || accessory.addService(this.Service.Switch)
     switchService
       .getCharacteristic(this.Characteristic.On)
@@ -14,6 +16,11 @@ module.exports = class deviceSwitch {
     if (accessory.getService(this.Service.Outlet)) {
       accessory.removeService(accessory.getService(this.Service.Outlet))
     }
+    accessory.log = this.platform.log
+    accessory.eveLogger = new this.EveHistoryService('switch', accessory, {
+      storage: 'fs',
+      path: this.platform.eveLogPath
+    })
     this.accessory = accessory
   }
 
@@ -92,6 +99,10 @@ module.exports = class deviceSwitch {
       ) {
         if (!helpers.hasProperty(params, 'switch')) return
         this.accessory.getService(this.Service.Switch).updateCharacteristic(this.Characteristic.On, params.switch === 'on')
+        this.accessory.eveLogger.addEntry({
+          time: Math.round(new Date().valueOf() / 1000),
+          power: params.switch === 'on' ? 1 : 0
+        })
       } else if (helpers.devicesMultiSwitch.includes(this.accessory.context.eweUIID)) {
         if (!helpers.hasProperty(params, 'switches')) return
         const idToCheck = this.accessory.context.hbDeviceId.slice(0, -1)
@@ -106,10 +117,18 @@ module.exports = class deviceSwitch {
             oAccessory
               .getService(this.Service.Switch)
               .updateCharacteristic(this.Characteristic.On, params.switches[i - 1].switch === 'on')
+            oAccessory.eveLogger.addEntry({
+              time: Math.round(new Date().valueOf() / 1000),
+              power: params.switches[i - 1].switch === 'on' ? 1 : 0
+            })
           }
         }
         if (!this.platform.hiddenMasters.includes(this.accessory.context.eweDeviceId)) {
           this.accessory.getService(this.Service.Switch).updateCharacteristic(this.Characteristic.On, primaryState)
+          this.accessory.eveLogger.addEntry({
+            time: Math.round(new Date().valueOf() / 1000),
+            power: primaryState ? 1 : 0
+          })
         }
       }
     } catch (err) {

From 8b17290153eef58a0b692b3e9ed17836dd3c8fad Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 30 Oct 2020 19:05:50 +0000
Subject: [PATCH 0603/3183] fixes/formatting

---
 lib/device/rf-bridge.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/lib/device/rf-bridge.js b/lib/device/rf-bridge.js
index cb1e6914..9007f8d9 100644
--- a/lib/device/rf-bridge.js
+++ b/lib/device/rf-bridge.js
@@ -72,7 +72,6 @@ module.exports = class deviceRFBridge {
         storage: 'fs',
         path: this.platform.eveLogPath
       })
-      break
     }
     this.accessory = accessory
   }
@@ -173,7 +172,6 @@ module.exports = class deviceRFBridge {
                   case 'contact':
                     serv = this.Service.ContactSensor
                     char = this.Characteristic.ContactSensorState
-                    eveLog = true
                     break
                   case 'occupancy':
                     serv = this.Service.OccupancySensor
@@ -182,7 +180,6 @@ module.exports = class deviceRFBridge {
                   default:
                     serv = this.Service.MotionSensor
                     char = this.Characteristic.MotionDetected
-                    eveLog = true
                     break
                 }
                 oAccessory.getService(serv).updateCharacteristic(char, 1)

From 98767b95cb09e7930c775cb44c052a1e5923520f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 30 Oct 2020 19:10:58 +0000
Subject: [PATCH 0604/3183] 3.10.0-8

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 822ab285..ba0dfa7c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.10.0-7",
+  "version": "3.10.0-8",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index a55eebe2..96bb46e4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.10.0-7",
+  "version": "3.10.0-8",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 6d856ddb744b6db03693f9f7bad2aac4cae05447 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 30 Oct 2020 21:10:51 +0000
Subject: [PATCH 0605/3183] eve power to status

---
 lib/device/scm.js    | 2 +-
 lib/device/switch.js | 6 +++---
 lib/device/usb.js    | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/device/scm.js b/lib/device/scm.js
index 0b71f8e3..55fd2ef8 100644
--- a/lib/device/scm.js
+++ b/lib/device/scm.js
@@ -38,7 +38,7 @@ module.exports = class deviceSCM {
       this.accessory.getService(this.Service.Switch).updateCharacteristic(this.Characteristic.On, params.switches[0].switch === 'on')
       this.accessory.eveLogger.addEntry({
         time: Math.round(new Date().valueOf() / 1000),
-        power: params.switches[0].switch === 'on' ? 1 : 0
+        status: params.switches[0].switch === 'on' ? 1 : 0
       })
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
diff --git a/lib/device/switch.js b/lib/device/switch.js
index 2ff2006e..fee27aff 100644
--- a/lib/device/switch.js
+++ b/lib/device/switch.js
@@ -101,7 +101,7 @@ module.exports = class deviceSwitch {
         this.accessory.getService(this.Service.Switch).updateCharacteristic(this.Characteristic.On, params.switch === 'on')
         this.accessory.eveLogger.addEntry({
           time: Math.round(new Date().valueOf() / 1000),
-          power: params.switch === 'on' ? 1 : 0
+          status: params.switch === 'on' ? 1 : 0
         })
       } else if (helpers.devicesMultiSwitch.includes(this.accessory.context.eweUIID)) {
         if (!helpers.hasProperty(params, 'switches')) return
@@ -119,7 +119,7 @@ module.exports = class deviceSwitch {
               .updateCharacteristic(this.Characteristic.On, params.switches[i - 1].switch === 'on')
             oAccessory.eveLogger.addEntry({
               time: Math.round(new Date().valueOf() / 1000),
-              power: params.switches[i - 1].switch === 'on' ? 1 : 0
+              status: params.switches[i - 1].switch === 'on' ? 1 : 0
             })
           }
         }
@@ -127,7 +127,7 @@ module.exports = class deviceSwitch {
           this.accessory.getService(this.Service.Switch).updateCharacteristic(this.Characteristic.On, primaryState)
           this.accessory.eveLogger.addEntry({
             time: Math.round(new Date().valueOf() / 1000),
-            power: primaryState ? 1 : 0
+            status: primaryState ? 1 : 0
           })
         }
       }
diff --git a/lib/device/usb.js b/lib/device/usb.js
index d7b4f30d..d00664aa 100644
--- a/lib/device/usb.js
+++ b/lib/device/usb.js
@@ -38,7 +38,7 @@ module.exports = class deviceUSB {
       this.accessory.getService(this.Service.Outlet).updateCharacteristic(this.Characteristic.On, params.switches[0].switch === 'on')
       this.accessory.eveLogger.addEntry({
         time: Math.round(new Date().valueOf() / 1000),
-        power: params.switches[0].switch === 'on' ? 1 : 0
+        status: params.switches[0].switch === 'on' ? 1 : 0
       })
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)

From aa0193add1f3f6a6700c69976a517a49053c788c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 30 Oct 2020 21:11:26 +0000
Subject: [PATCH 0606/3183] eve custom design with switch and temp

---
 lib/device/thermostat.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/device/thermostat.js b/lib/device/thermostat.js
index 6a8d9f8e..cd969a20 100644
--- a/lib/device/thermostat.js
+++ b/lib/device/thermostat.js
@@ -20,7 +20,7 @@ module.exports = class deviceThermostat {
         .on('set', (value, callback) => this.internalUpdate(value, callback))
     }
     accessory.log = this.platform.log
-    accessory.eveLogger = new this.EveHistoryService('weather', accessory, {
+    accessory.eveLogger = new this.EveHistoryService('custom', accessory, {
       storage: 'fs',
       path: this.platform.eveLogPath
     })
@@ -49,6 +49,10 @@ module.exports = class deviceThermostat {
         const newState = helpers.hasProperty(params, 'switch') ? params.switch === 'on' : params.mainSwitch === 'on'
         const switchService = this.accessory.getService(this.Service.Switch)
         switchService.updateCharacteristic(this.Characteristic.On, newState)
+        this.accessory.eveLogger.addEntry({
+          time: Math.round(new Date().valueOf() / 1000),
+          status: newState ? 1 : 0
+        })
       }
       const eveLog = { time: Math.round(new Date().valueOf() / 1000) }
       if (helpers.hasProperty(params, 'currentTemperature') && this.accessory.getService(this.Service.TemperatureSensor)) {

From dfccbf5141141b3dae187fc9e0646df963cbf7c9 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 30 Oct 2020 21:15:05 +0000
Subject: [PATCH 0607/3183] 3.10.0-9

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ba0dfa7c..97b83e98 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.10.0-8",
+  "version": "3.10.0-9",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 96bb46e4..445ffaee 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.10.0-8",
+  "version": "3.10.0-9",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From a47508f30fd9013d6f8c77db963fdfdafbd4f193 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 31 Oct 2020 11:44:00 +0000
Subject: [PATCH 0608/3183] fork fakegato without google deps

---
 package-lock.json | 304 ++++------------------------------------------
 package.json      |   2 +-
 2 files changed, 23 insertions(+), 283 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 97b83e98..2f8ab375 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4,42 +4,6 @@
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
-    "abort-controller": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz",
-      "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==",
-      "requires": {
-        "event-target-shim": "^5.0.0"
-      }
-    },
-    "agent-base": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
-      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
-      "requires": {
-        "debug": "4"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
-          "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-        }
-      }
-    },
-    "arrify": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz",
-      "integrity": "sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug=="
-    },
     "axios": {
       "version": "0.21.0",
       "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.0.tgz",
@@ -48,20 +12,14 @@
         "follow-redirects": "^1.10.0"
       }
     },
-    "base64-js": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz",
-      "integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g=="
-    },
-    "bignumber.js": {
-      "version": "9.0.1",
-      "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.0.1.tgz",
-      "integrity": "sha512-IdZR9mh6ahOBv/hYGiXyVuyCetmGJhtYkqLBpTStdhEGjegpPlUawydyaF3pbIOFynJTpllEs+NP+CS9jKFLjA=="
-    },
-    "buffer-equal-constant-time": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz",
-      "integrity": "sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk="
+    "call-bind": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.0.tgz",
+      "integrity": "sha512-AEXsYIyyDY3MCzbwdhzG3Jx1R0J2wetQyUynn6dYHAO+bg8l1k7jwZtRv4ryryFs7EP+NDlikJlVe59jr0cM2w==",
+      "requires": {
+        "function-bind": "^1.1.1",
+        "get-intrinsic": "^1.0.0"
+      }
     },
     "chnl": {
       "version": "1.2.0",
@@ -97,14 +55,6 @@
         "object-keys": "^1.0.12"
       }
     },
-    "ecdsa-sig-formatter": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz",
-      "integrity": "sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==",
-      "requires": {
-        "safe-buffer": "^5.0.1"
-      }
-    },
     "es-abstract": {
       "version": "1.17.7",
       "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz",
@@ -133,30 +83,13 @@
         "is-symbol": "^1.0.2"
       }
     },
-    "event-target-shim": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz",
-      "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ=="
-    },
-    "extend": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
-      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
-    },
     "fakegato-history": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/fakegato-history/-/fakegato-history-0.6.0.tgz",
-      "integrity": "sha512-byGVbvoumtYaoZkVzZ+p3sxXdw5cne1yfUdL1vXLE5RlcKakv5I9lc/EtfT+R92s7z22o5dbeeIkf8aPIsiR9w==",
+      "version": "github:bwp91/fakegato-history#39a065f0a443f6c5b460edcb6e177872d939cc13",
+      "from": "github:bwp91/fakegato-history",
       "requires": {
-        "debug": "^2.2.0",
-        "googleapis": ">39.1.0"
+        "debug": "^2.2.0"
       }
     },
-    "fast-text-encoding": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/fast-text-encoding/-/fast-text-encoding-1.0.3.tgz",
-      "integrity": "sha512-dtm4QZH9nZtcDt8qJiOH9fcQd1NAgi+K1O2DbE6GG1PPCK/BWfOH3idCTRQ4ImXRUOyopDEgDEnVEE7Y/2Wrig=="
-    },
     "follow-redirects": {
       "version": "1.13.0",
       "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.0.tgz",
@@ -167,82 +100,14 @@
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
       "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
     },
-    "gaxios": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/gaxios/-/gaxios-4.0.1.tgz",
-      "integrity": "sha512-jOin8xRZ/UytQeBpSXFqIzqU7Fi5TqgPNLlUsSB8kjJ76+FiGBfImF8KJu++c6J4jOldfJUtt0YmkRj2ZpSHTQ==",
-      "requires": {
-        "abort-controller": "^3.0.0",
-        "extend": "^3.0.2",
-        "https-proxy-agent": "^5.0.0",
-        "is-stream": "^2.0.0",
-        "node-fetch": "^2.3.0"
-      }
-    },
-    "gcp-metadata": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-4.2.1.tgz",
-      "integrity": "sha512-tSk+REe5iq/N+K+SK1XjZJUrFPuDqGZVzCy2vocIHIGmPlTGsa8owXMJwGkrXr73NO0AzhPW4MF2DEHz7P2AVw==",
-      "requires": {
-        "gaxios": "^4.0.0",
-        "json-bigint": "^1.0.0"
-      }
-    },
-    "google-auth-library": {
-      "version": "6.1.3",
-      "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-6.1.3.tgz",
-      "integrity": "sha512-m9mwvY3GWbr7ZYEbl61isWmk+fvTmOt0YNUfPOUY2VH8K5pZlAIWJjxEi0PqR3OjMretyiQLI6GURMrPSwHQ2g==",
-      "requires": {
-        "arrify": "^2.0.0",
-        "base64-js": "^1.3.0",
-        "ecdsa-sig-formatter": "^1.0.11",
-        "fast-text-encoding": "^1.0.0",
-        "gaxios": "^4.0.0",
-        "gcp-metadata": "^4.2.0",
-        "gtoken": "^5.0.4",
-        "jws": "^4.0.0",
-        "lru-cache": "^6.0.0"
-      }
-    },
-    "google-p12-pem": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-3.0.3.tgz",
-      "integrity": "sha512-wS0ek4ZtFx/ACKYF3JhyGe5kzH7pgiQ7J5otlumqR9psmWMYc+U9cErKlCYVYHoUaidXHdZ2xbo34kB+S+24hA==",
-      "requires": {
-        "node-forge": "^0.10.0"
-      }
-    },
-    "googleapis": {
-      "version": "62.0.0",
-      "resolved": "https://registry.npmjs.org/googleapis/-/googleapis-62.0.0.tgz",
-      "integrity": "sha512-IKWMdnrEzaVcambJ90QjH4Rl6e6L+bljB4SRniPgnhTQ8BG/p/M6fuNhzbBssu61GYu5q8EcxKndmRZQIIo2iQ==",
-      "requires": {
-        "google-auth-library": "^6.0.0",
-        "googleapis-common": "^4.4.1"
-      }
-    },
-    "googleapis-common": {
-      "version": "4.4.3",
-      "resolved": "https://registry.npmjs.org/googleapis-common/-/googleapis-common-4.4.3.tgz",
-      "integrity": "sha512-W46WKCk3QtlCCfmZyQIH5zxmDOyeV5Qj+qs7nr2ox08eRkEJMWp6iwv542R/PsokXaGUSrmif4vCC4+rGzRSsQ==",
-      "requires": {
-        "extend": "^3.0.2",
-        "gaxios": "^4.0.0",
-        "google-auth-library": "^6.0.0",
-        "qs": "^6.7.0",
-        "url-template": "^2.0.8",
-        "uuid": "^8.0.0"
-      }
-    },
-    "gtoken": {
-      "version": "5.0.5",
-      "resolved": "https://registry.npmjs.org/gtoken/-/gtoken-5.0.5.tgz",
-      "integrity": "sha512-wvjkecutFh8kVfbcdBdUWqDRrXb+WrgD79DBDEYf1Om8S1FluhylhtFjrL7Tx69vNhh259qA3Q1P4sPtb+kUYw==",
+    "get-intrinsic": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.0.1.tgz",
+      "integrity": "sha512-ZnWP+AmS1VUaLgTRy47+zKtjTxz+0xMpx3I52i+aalBK1QP19ggLF3Db89KJX7kjfOfP2eoa01qc++GwPgufPg==",
       "requires": {
-        "gaxios": "^4.0.0",
-        "google-p12-pem": "^3.0.3",
-        "jws": "^4.0.0",
-        "mime": "^2.2.0"
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.1"
       }
     },
     "has": {
@@ -258,30 +123,6 @@
       "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz",
       "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg=="
     },
-    "https-proxy-agent": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
-      "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
-      "requires": {
-        "agent-base": "6",
-        "debug": "4"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
-          "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-        }
-      }
-    },
     "interval-promise": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/interval-promise/-/interval-promise-1.4.0.tgz",
@@ -310,11 +151,6 @@
         "has-symbols": "^1.0.1"
       }
     },
-    "is-stream": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz",
-      "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw=="
-    },
     "is-symbol": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz",
@@ -323,46 +159,6 @@
         "has-symbols": "^1.0.1"
       }
     },
-    "json-bigint": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/json-bigint/-/json-bigint-1.0.0.tgz",
-      "integrity": "sha512-SiPv/8VpZuWbvLSMtTDU8hEfrZWg/mH/nV/b4o0CYbSxu1UIQPLdwKOCIyLQX+VIPO5vrLX3i8qtqFyhdPSUSQ==",
-      "requires": {
-        "bignumber.js": "^9.0.0"
-      }
-    },
-    "jwa": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/jwa/-/jwa-2.0.0.tgz",
-      "integrity": "sha512-jrZ2Qx916EA+fq9cEAeCROWPTfCwi1IVHqT2tapuqLEVVDKFDENFw1oL+MwrTvH6msKxsd1YTDVw6uKEcsrLEA==",
-      "requires": {
-        "buffer-equal-constant-time": "1.0.1",
-        "ecdsa-sig-formatter": "1.0.11",
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "jws": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/jws/-/jws-4.0.0.tgz",
-      "integrity": "sha512-KDncfTmOZoOMTFG4mBlG0qUIOlc03fmzH+ru6RgYVZhPkyiy/92Owlt/8UEN+a4TXR1FQetfIpJE8ApdvdVxTg==",
-      "requires": {
-        "jwa": "^2.0.0",
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "requires": {
-        "yallist": "^4.0.0"
-      }
-    },
-    "mime": {
-      "version": "2.4.6",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.6.tgz",
-      "integrity": "sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA=="
-    },
     "ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
@@ -373,16 +169,6 @@
       "resolved": "https://registry.npmjs.org/node-dns-sd/-/node-dns-sd-0.4.2.tgz",
       "integrity": "sha512-fZvDqy19zyaiSXajmRjwue1VWLrJcy8bTV/LJVtAx8DeEFVlXRBMyZknW+q6CEfiW8Y4MQDDKh9x5wF32BHAHQ=="
     },
-    "node-fetch": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz",
-      "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw=="
-    },
-    "node-forge": {
-      "version": "0.10.0",
-      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.10.0.tgz",
-      "integrity": "sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA=="
-    },
     "object-inspect": {
       "version": "1.8.0",
       "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.8.0.tgz",
@@ -394,35 +180,14 @@
       "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="
     },
     "object.assign": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.1.tgz",
-      "integrity": "sha512-VT/cxmx5yaoHSOTSyrCygIDFco+RsibY2NM0a4RdEeY/4KgqezwFtK1yr3U67xYhqJSlASm2pKhLVzPj2lr4bA==",
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
+      "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
       "requires": {
+        "call-bind": "^1.0.0",
         "define-properties": "^1.1.3",
-        "es-abstract": "^1.18.0-next.0",
         "has-symbols": "^1.0.1",
         "object-keys": "^1.1.1"
-      },
-      "dependencies": {
-        "es-abstract": {
-          "version": "1.18.0-next.1",
-          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.1.tgz",
-          "integrity": "sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==",
-          "requires": {
-            "es-to-primitive": "^1.2.1",
-            "function-bind": "^1.1.1",
-            "has": "^1.0.3",
-            "has-symbols": "^1.0.1",
-            "is-callable": "^1.2.2",
-            "is-negative-zero": "^2.0.0",
-            "is-regex": "^1.1.1",
-            "object-inspect": "^1.8.0",
-            "object-keys": "^1.1.1",
-            "object.assign": "^4.1.1",
-            "string.prototype.trimend": "^1.0.1",
-            "string.prototype.trimstart": "^1.0.1"
-          }
-        }
       }
     },
     "promise-controller": {
@@ -440,16 +205,6 @@
         "function-bind": "^1.1.1"
       }
     },
-    "qs": {
-      "version": "6.9.4",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.4.tgz",
-      "integrity": "sha512-A1kFqHekCTM7cz0udomYUoYNWjBebHm/5wzU/XqrBRBNWectVH0QIiN+NEcZ0Dte5hvzHwbr8+XQmguPhJ6WdQ=="
-    },
-    "safe-buffer": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
-    },
     "string.prototype.trimend": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.2.tgz",
@@ -510,16 +265,6 @@
         }
       }
     },
-    "url-template": {
-      "version": "2.0.8",
-      "resolved": "https://registry.npmjs.org/url-template/-/url-template-2.0.8.tgz",
-      "integrity": "sha1-/FZaPMy/93MMd19WQflVV5FDnyE="
-    },
-    "uuid": {
-      "version": "8.3.1",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.1.tgz",
-      "integrity": "sha512-FOmRr+FmWEIG8uhZv6C2bTgEVXsHk08kE7mPlrBbEe+c3r9pjceVPgupIfNIhc4yx55H69OXANrUaSuu9eInKg=="
-    },
     "websocket-as-promised": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/websocket-as-promised/-/websocket-as-promised-1.1.0.tgz",
@@ -534,11 +279,6 @@
       "version": "7.3.1",
       "resolved": "https://registry.npmjs.org/ws/-/ws-7.3.1.tgz",
       "integrity": "sha512-D3RuNkynyHmEJIpD2qrgVkc9DQ23OrN/moAwZX4L8DfvszsJxpjQuUq3LMx6HoYji9fbIOBY18XWBsAux1ZZUA=="
-    },
-    "yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
     }
   }
 }
diff --git a/package.json b/package.json
index 445ffaee..d4bac7e0 100644
--- a/package.json
+++ b/package.json
@@ -67,7 +67,7 @@
   "dependencies": {
     "axios": "0.21.0",
     "color-convert": "2.0.1",
-    "fakegato-history": "0.6.0",
+    "fakegato-history": "bwp91/fakegato-history",
     "interval-promise": "1.4.0",
     "node-dns-sd": "0.4.2",
     "websocket-as-promised": "1.1.0",

From 75b77dcc2259cc7b542da222a25d21f6bd676c50 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 31 Oct 2020 11:46:13 +0000
Subject: [PATCH 0609/3183] Update package.json

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index d4bac7e0..5da727f7 100644
--- a/package.json
+++ b/package.json
@@ -41,7 +41,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/bwp91/homebridge-ewelink"
+    "url": "https://github.com/bwp91/homebridge-ewelink.git"
   },
   "bugs": {
     "url": "https://github.com/bwp91/homebridge-ewelink/issues"

From 844a73768a61a6d7ddf899fe72f01ae82d837b7d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 31 Oct 2020 11:51:41 +0000
Subject: [PATCH 0610/3183] 3.10.0-10

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 2f8ab375..7f76bc96 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.10.0-9",
+  "version": "3.10.0-10",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 5da727f7..f9004c58 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.10.0-9",
+  "version": "3.10.0-10",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From b43505019e1aaa16fe1b344ec275e5dc337f3fde Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Sat, 31 Oct 2020 13:01:03 +0000
Subject: [PATCH 0611/3183] Update config.yml

---
 .github/ISSUE_TEMPLATE/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index af5ef704..f43c4539 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -2,4 +2,4 @@ blank_issues_enabled: false
 contact_links:
   - name: Homebridge Discord
     url: https://discord.gg/7X36mdw
-    about: Chat to me on Discord - my username is bwp91.
+    about: The Homebridge Discord is a community where you can ask questions and get general help with Homebridge and plugins. You can also message me directly on there - my username is bwp91.

From 9c5d4de3ce985168861ef9c700b09ad2bc0335a4 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 31 Oct 2020 14:12:01 +0000
Subject: [PATCH 0612/3183] extra check for response

---
 lib/ewelink-http.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/ewelink-http.js b/lib/ewelink-http.js
index 8219f8f8..86655aa0 100644
--- a/lib/ewelink-http.js
+++ b/lib/ewelink-http.js
@@ -46,6 +46,9 @@ module.exports = class eWeLinkHTTP {
         },
         params
       })
+      if (!res || !res.data) {
+        throw new Error('Unknown response from eWeLink server.\n' + JSON.stringify(res, null, 2))
+      }
       const body = res.data
       if (!body.region) {
         throw new Error('Server did not respond with a region.\n' + JSON.stringify(body, null, 2))

From 2e0c1d8d76220904739606f052342df2c6c13be0 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 31 Oct 2020 14:24:46 +0000
Subject: [PATCH 0613/3183] 3.10.0-11

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 7f76bc96..52deb60f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.10.0-10",
+  "version": "3.10.0-11",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index f9004c58..59da1f39 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.10.0-10",
+  "version": "3.10.0-11",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 69e503730409f8ad127015b3ed1ac9ad013f557f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 31 Oct 2020 15:12:56 +0000
Subject: [PATCH 0614/3183] revert last check

---
 lib/ewelink-http.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/lib/ewelink-http.js b/lib/ewelink-http.js
index 86655aa0..8219f8f8 100644
--- a/lib/ewelink-http.js
+++ b/lib/ewelink-http.js
@@ -46,9 +46,6 @@ module.exports = class eWeLinkHTTP {
         },
         params
       })
-      if (!res || !res.data) {
-        throw new Error('Unknown response from eWeLink server.\n' + JSON.stringify(res, null, 2))
-      }
       const body = res.data
       if (!body.region) {
         throw new Error('Server did not respond with a region.\n' + JSON.stringify(body, null, 2))

From b44c5b4ac0d77b40574c06ecfc63deefd2ec0507 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 1 Nov 2020 09:18:08 +0000
Subject: [PATCH 0615/3183] updates are now queued anyway

---
 lib/device/fan.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/lib/device/fan.js b/lib/device/fan.js
index 74405872..8abbdce1 100644
--- a/lib/device/fan.js
+++ b/lib/device/fan.js
@@ -17,10 +17,7 @@ module.exports = class deviceFan {
       .getCharacteristic(this.Characteristic.On)
       .on('set', async (value, callback) => {
         callback()
-        if (!value) {
-          await helpers.sleep(500)
-          fanService.setCharacteristic(this.Characteristic.RotationSpeed, 0)
-        }
+        if (!value) fanService.setCharacteristic(this.Characteristic.RotationSpeed, 0)
       })
     fanService
       .getCharacteristic(this.Characteristic.RotationSpeed)

From 78153863aad555aad8d9067e6acbdd23e21adb6f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 1 Nov 2020 09:18:15 +0000
Subject: [PATCH 0616/3183] change to 500ms

---
 lib/device/light.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/device/light.js b/lib/device/light.js
index 9172b63e..923d5205 100644
--- a/lib/device/light.js
+++ b/lib/device/light.js
@@ -117,7 +117,7 @@ module.exports = class deviceLight {
               params.mode = 0
               break
           }
-          await helpers.sleep(750)
+          await helpers.sleep(500)
           if (updateKey !== this.accessory.context.updateKey) return
           await this.platform.sendDeviceUpdate(this.accessory, params)
           break
@@ -150,7 +150,7 @@ module.exports = class deviceLight {
               }
               break
           }
-          await helpers.sleep(750)
+          await helpers.sleep(500)
           if (updateKey !== this.accessory.context.updateKey) return
           await this.platform.sendDeviceUpdate(this.accessory, params)
           break
@@ -180,7 +180,7 @@ module.exports = class deviceLight {
               }
               break
           }
-          await helpers.sleep(750)
+          await helpers.sleep(500)
           if (updateKey !== this.accessory.context.updateKey) return
           await this.platform.sendDeviceUpdate(this.accessory, params)
           break

From f134dafb12d801f25e7170542df4738cb92bb66b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 1 Nov 2020 10:39:31 +0000
Subject: [PATCH 0617/3183] support for led colour bulb

---
 lib/device/light.js | 55 ++++++++++++++++++++++++++++++++++++++++++---
 lib/helpers.js      | 15 +++++++------
 2 files changed, 60 insertions(+), 10 deletions(-)

diff --git a/lib/device/light.js b/lib/device/light.js
index 923d5205..338261d1 100644
--- a/lib/device/light.js
+++ b/lib/device/light.js
@@ -149,6 +149,17 @@ module.exports = class deviceLight {
                 bright: value
               }
               break
+            case 104:
+              params = {
+                ltype: 'color',
+                color: {
+                  br: value,
+                  r: this.accessory.context.cacheR,
+                  g: this.accessory.context.cacheG,
+                  b: this.accessory.context.cacheB
+                }
+              }
+              break
           }
           await helpers.sleep(500)
           if (updateKey !== this.accessory.context.updateKey) return
@@ -179,6 +190,20 @@ module.exports = class deviceLight {
                 colorB: newRGB[2]
               }
               break
+            case 104:
+              params = {
+                ltype: 'color',
+                color: {
+                  r: newRGB[0],
+                  g: newRGB[1],
+                  b: newRGB[2],
+                  br: lightService.getCharacteristic(this.Characteristic.Brightness).value
+                }
+              }
+              this.accessory.context.cacheR = newRGB[0]
+              this.accessory.context.cacheG = newRGB[1]
+              this.accessory.context.cacheB = newRGB[2]
+              break
           }
           await helpers.sleep(500)
           if (updateKey !== this.accessory.context.updateKey) return
@@ -231,7 +256,6 @@ module.exports = class deviceLight {
                 mode = 2
               }
               if (mode === 2) {
-                lightService.updateCharacteristic(this.Characteristic.On, true)
                 newColour = convert.rgb.hsv(
                   parseInt(params.channel2),
                   parseInt(params.channel3),
@@ -241,8 +265,6 @@ module.exports = class deviceLight {
                   .updateCharacteristic(this.Characteristic.Hue, newColour[0])
                   .updateCharacteristic(this.Characteristic.Saturation, 100)
                   .updateCharacteristic(this.Characteristic.Brightness, 100)
-              } else if (mode === 1) {
-                throw new Error('has been set to white mode which is not supported')
               }
               break
             case 59: // L1
@@ -256,6 +278,33 @@ module.exports = class deviceLight {
                   .updateCharacteristic(this.Characteristic.Saturation, newColour[1])
               }
               break
+            case 104: // GTLC104
+              if (helpers.hasProperty(params, 'ltype')) {
+                mode = params.ltype
+                if (mode === 'color' && helpers.hasProperty(params, 'color')) {
+                  if (helpers.hasProperty(params.color, 'br')) {
+                  lightService.updateCharacteristic(this.Characteristic.Brightness, params.color.br)
+                  }
+                  if (
+                    helpers.hasProperty(params.color, 'r') &&
+                    helpers.hasProperty(params.color, 'g') &&
+                    helpers.hasProperty(params.color, 'b')
+                  ) {
+                  newColour = convert.rgb.hsv(
+                    parseInt(params.color.r),
+                    parseInt(params.color.g),
+                    parseInt(params.color.b)
+                  )
+                  lightService
+                    .updateCharacteristic(this.Characteristic.Hue, newColour[0])
+                    .updateCharacteristic(this.Characteristic.Saturation, 100)
+                  }
+                  this.accessory.context.cacheR = params.color.r
+                  this.accessory.context.cacheG = params.color.g
+                  this.accessory.context.cacheB = params.color.b
+                }
+              }
+              break
             default:
               return
           }
diff --git a/lib/helpers.js b/lib/helpers.js
index cca771bb..f13fa707 100644
--- a/lib/helpers.js
+++ b/lib/helpers.js
@@ -15,17 +15,18 @@ module.exports = {
     sensorTimeDifference: 120
   },
   devicesNonLAN: [22, 28, 34, 59, 102],
-  devicesSingleSwitch: [1, 5, 6, 14, 15, 22, 24, 27, 32, 36, 44, 59],
+  devicesSingleSwitch: [1, 5, 6, 14, 15, 22, 24, 27, 32, 36, 44, 59, 104],
   devicesMultiSwitch: [2, 3, 4, 7, 8, 9, 29, 30, 31, 34, 41],
   devicesSingleSwitchLight: [
     'T1 1C', 'L1', 'B1',
     'B1_R2', 'TX1C', 'D1', 'D1R1',
-    'KING-M4', 'Slampher', 'GTTA59'
+    'KING-M4', 'Slampher', 'GTTA59',
+    'GTLC104'
   ],
   devicesMultiSwitchLight: ['T1 2C', 'T1 3C', 'TX2C', 'TX3C'],
   devicesSingleSwitchOutlet: ['Sonoff Pow', 'S20', 'S26', 'S55'],
   devicesBrightable: [36, 44],
-  devicesColourable: [22, 59],
+  devicesColourable: [22, 59, 104],
   devicesCurtain: [11],
   devicesSensor: [102],
   devicesThermostat: [15],
@@ -39,15 +40,15 @@ module.exports = {
   devicesZB: [1000, 1770, 2026, 3026],
   paramsToKeep: [
     'battery', 'bright', 'brightness',
-    'channel', 'cmd', 'colorB', 'colorG',
+    'channel', 'cmd', 'color', 'colorB', 'colorG',
     'colorR', 'current', 'currentHumidity',
     'currentTemperature', 'humidity',
-    'key', 'lock', 'mainSwitch', 'mode',
+    'key', 'lock', 'ltype', 'mainSwitch', 'mode',
     'motion', 'online', 'power', 'rfChl',
     'rfList', 'rfTrig', 'sensorType',
     'setclose', 'state', 'switch',
     'switches', 'temperature', 'trigTime',
-    'type', 'voltage', 'zyx_mode'
+    'type', 'voltage', 'white', 'zyx_mode'
   ],
   defaultMultiSwitchOff: [
     {
@@ -185,7 +186,7 @@ module.exports = {
     98: 0, // "DOORBELL_RFBRIDGE"                      \\
     102: 1, // "DOOR_MAGNETIC"                         \\ OPL-DMA, DW2
     103: 0, // "WOTEWODE_TEM_LIGHT"                    \\
-    104: 0, // "WOTEWODE_RGB_TEM_LIGHT"                \\
+    104: 1, // "WOTEWODE_RGB_TEM_LIGHT"                \\
     107: 0, // "GSM_SOCKET_NO_FLOW"                    \\
     109: 0, // "YK_INFRARED_2"                         \\
     1000: 1, // "ZIGBEE_WIRELESS_SWITCH"               \\

From 3849011cd400bfea5bcd0121128a7897c673b0ed Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 1 Nov 2020 10:40:00 +0000
Subject: [PATCH 0618/3183] formatting

---
 lib/device/light.js | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/lib/device/light.js b/lib/device/light.js
index 338261d1..2eeef4fb 100644
--- a/lib/device/light.js
+++ b/lib/device/light.js
@@ -283,21 +283,21 @@ module.exports = class deviceLight {
                 mode = params.ltype
                 if (mode === 'color' && helpers.hasProperty(params, 'color')) {
                   if (helpers.hasProperty(params.color, 'br')) {
-                  lightService.updateCharacteristic(this.Characteristic.Brightness, params.color.br)
+                    lightService.updateCharacteristic(this.Characteristic.Brightness, params.color.br)
                   }
                   if (
                     helpers.hasProperty(params.color, 'r') &&
                     helpers.hasProperty(params.color, 'g') &&
                     helpers.hasProperty(params.color, 'b')
                   ) {
-                  newColour = convert.rgb.hsv(
-                    parseInt(params.color.r),
-                    parseInt(params.color.g),
-                    parseInt(params.color.b)
-                  )
-                  lightService
-                    .updateCharacteristic(this.Characteristic.Hue, newColour[0])
-                    .updateCharacteristic(this.Characteristic.Saturation, 100)
+                    newColour = convert.rgb.hsv(
+                      parseInt(params.color.r),
+                      parseInt(params.color.g),
+                      parseInt(params.color.b)
+                    )
+                    lightService
+                      .updateCharacteristic(this.Characteristic.Hue, newColour[0])
+                      .updateCharacteristic(this.Characteristic.Saturation, 100)
                   }
                   this.accessory.context.cacheR = params.color.r
                   this.accessory.context.cacheG = params.color.g

From a274492a69c19a181fd486f41de78d16385358c3 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 1 Nov 2020 10:40:50 +0000
Subject: [PATCH 0619/3183] 3.10.0-12

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 52deb60f..9d05e0b7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.10.0-11",
+  "version": "3.10.0-12",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 59da1f39..ac0f7499 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.10.0-11",
+  "version": "3.10.0-12",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 12707dfbc66f04cfef57de14d6ee9155fc28a8d0 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 1 Nov 2020 10:54:09 +0000
Subject: [PATCH 0620/3183] ignore lan updates for unsupported

---
 lib/device/fan.js       | 1 +
 lib/device/light.js     | 1 +
 lib/ewelink-platform.js | 2 +-
 lib/helpers.js          | 2 +-
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/device/fan.js b/lib/device/fan.js
index 8abbdce1..baeaaf4a 100644
--- a/lib/device/fan.js
+++ b/lib/device/fan.js
@@ -73,6 +73,7 @@ module.exports = class deviceFan {
 
   async externalUpdate (params) {
     try {
+      if (helpers.hasProperty(params, 'updateSource') && params.updateSource === 'LAN') return
       if (params.switches && Array.isArray(params.switches)) {
         let lightService
         if (this.visibleLight) lightService = this.accessory.getService(this.Service.Lightbulb)
diff --git a/lib/device/light.js b/lib/device/light.js
index 2eeef4fb..8fbea051 100644
--- a/lib/device/light.js
+++ b/lib/device/light.js
@@ -279,6 +279,7 @@ module.exports = class deviceLight {
               }
               break
             case 104: // GTLC104
+              if (helpers.hasProperty(params, 'updateSource') && params.updateSource === 'LAN') return
               if (helpers.hasProperty(params, 'ltype')) {
                 mode = params.ltype
                 if (mode === 'color' && helpers.hasProperty(params, 'color')) {
diff --git a/lib/ewelink-platform.js b/lib/ewelink-platform.js
index 7eecf7bf..16651855 100644
--- a/lib/ewelink-platform.js
+++ b/lib/ewelink-platform.js
@@ -589,7 +589,7 @@ module.exports = class eWeLinkPlatform {
       params
     }
     const res = helpers.devicesNonLAN.includes(accessory.context.eweUIID)
-      ? "device doesn't support LAN mode"
+      ? "LAN mode is not supported for this device"
       : await this.lanClient.sendUpdate(payload)
     if (res !== 'ok') {
       if (accessory.context.reachableWAN) {
diff --git a/lib/helpers.js b/lib/helpers.js
index f13fa707..084b1f9f 100644
--- a/lib/helpers.js
+++ b/lib/helpers.js
@@ -14,7 +14,7 @@ module.exports = {
     sensorTimeLength: 60,
     sensorTimeDifference: 120
   },
-  devicesNonLAN: [22, 28, 34, 59, 102],
+  devicesNonLAN: [22, 28, 34, 59, 102, 104],
   devicesSingleSwitch: [1, 5, 6, 14, 15, 22, 24, 27, 32, 36, 44, 59, 104],
   devicesMultiSwitch: [2, 3, 4, 7, 8, 9, 29, 30, 31, 34, 41],
   devicesSingleSwitchLight: [

From 7d6ffa56509c108f5863c4b3f9ee46b780652f3f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 1 Nov 2020 10:54:52 +0000
Subject: [PATCH 0621/3183] formatting

---
 lib/ewelink-platform.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ewelink-platform.js b/lib/ewelink-platform.js
index 16651855..e73804c2 100644
--- a/lib/ewelink-platform.js
+++ b/lib/ewelink-platform.js
@@ -589,7 +589,7 @@ module.exports = class eWeLinkPlatform {
       params
     }
     const res = helpers.devicesNonLAN.includes(accessory.context.eweUIID)
-      ? "LAN mode is not supported for this device"
+      ? 'LAN mode is not supported for this device'
       : await this.lanClient.sendUpdate(payload)
     if (res !== 'ok') {
       if (accessory.context.reachableWAN) {

From 3a9e61c15e8e3ed5112683212a902fb6c3423a44 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 1 Nov 2020 10:55:33 +0000
Subject: [PATCH 0622/3183] 3.10.0-13

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 9d05e0b7..f4039186 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.10.0-12",
+  "version": "3.10.0-13",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index ac0f7499..61e3100d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.10.0-12",
+  "version": "3.10.0-13",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From a7bf6df6c750ca486d5ac8f02be2e3f7b930b2be Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 1 Nov 2020 11:20:43 +0000
Subject: [PATCH 0623/3183] remove host field

---
 lib/ewelink-http.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/lib/ewelink-http.js b/lib/ewelink-http.js
index 8219f8f8..6337989b 100644
--- a/lib/ewelink-http.js
+++ b/lib/ewelink-http.js
@@ -100,7 +100,6 @@ module.exports = class eWeLinkHTTP {
       headers: {
         Authorization: 'Sign ' + dataToSign,
         'Content-Type': 'application/json',
-        Host: this.httpHost,
         'X-CK-Appid': helpers.appId,
         'X-CK-Nonce': Math.random().toString(36).substr(2, 8)
       }
@@ -157,7 +156,6 @@ module.exports = class eWeLinkHTTP {
         headers: {
           Authorization: 'Bearer ' + this.aToken,
           'Content-Type': 'application/json',
-          Host: this.httpHost,
           'X-CK-Appid': helpers.appId,
           'X-CK-Nonce': Math.random().toString(36).substr(2, 8)
         }
@@ -213,7 +211,6 @@ module.exports = class eWeLinkHTTP {
         headers: {
           Authorization: 'Bearer ' + this.aToken,
           'Content-Type': 'application/json',
-          Host: this.httpHost,
           'X-CK-Appid': helpers.appId,
           'X-CK-Nonce': Math.random().toString(36).substr(2, 8)
         }

From cba451bdb5cadc5dce7d3d6df36bc3015ee0ad88 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 1 Nov 2020 11:21:47 +0000
Subject: [PATCH 0624/3183] 3.10.0-14

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index f4039186..b438a271 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.10.0-13",
+  "version": "3.10.0-14",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 61e3100d..1833c12c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.10.0-13",
+  "version": "3.10.0-14",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From a8ae14c5233d9471e72b1cc9508c5d0837cfc65d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 1 Nov 2020 11:27:49 +0000
Subject: [PATCH 0625/3183] order of fields (for hoobs)

---
 config.schema.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 51c854c2..8438480d 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -325,10 +325,10 @@
           }
         }
       },
-      "disablePlugin": {
+      "resetRFBridge": {
         "type": "boolean"
       },
-      "resetRFBridge": {
+      "disablePlugin": {
         "type": "boolean"
       }
     }

From f4c015da463006782948a67ad0ee41e37a99b71a Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 1 Nov 2020 11:53:02 +0000
Subject: [PATCH 0626/3183] Update ewelink-http.js

---
 lib/ewelink-http.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/ewelink-http.js b/lib/ewelink-http.js
index 6337989b..4e8ba976 100644
--- a/lib/ewelink-http.js
+++ b/lib/ewelink-http.js
@@ -80,6 +80,7 @@ module.exports = class eWeLinkHTTP {
   }
 
   async login () {
+    if (this.httpHost === undefined) this.httpHost = 'eu-apia.coolkit.cc'
     const data = {
       countryCode: this.cCode,
       password: this.password

From 26514accff915505e2f8c17ca8fb4eebaf183766 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 1 Nov 2020 11:53:51 +0000
Subject: [PATCH 0627/3183] 3.10.0-15

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b438a271..5fa1ffcd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.10.0-14",
+  "version": "3.10.0-15",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 1833c12c..d17a9845 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.10.0-14",
+  "version": "3.10.0-15",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 1c7b0520c7795d2e45d6e6cc3f69481abdf2a5f0 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 1 Nov 2020 12:45:39 +0000
Subject: [PATCH 0628/3183] Update light.js

---
 lib/device/light.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/device/light.js b/lib/device/light.js
index 8fbea051..7738df6a 100644
--- a/lib/device/light.js
+++ b/lib/device/light.js
@@ -299,10 +299,10 @@ module.exports = class deviceLight {
                     lightService
                       .updateCharacteristic(this.Characteristic.Hue, newColour[0])
                       .updateCharacteristic(this.Characteristic.Saturation, 100)
+                    this.accessory.context.cacheR = params.color.r
+                    this.accessory.context.cacheG = params.color.g
+                    this.accessory.context.cacheB = params.color.b
                   }
-                  this.accessory.context.cacheR = params.color.r
-                  this.accessory.context.cacheG = params.color.g
-                  this.accessory.context.cacheB = params.color.b
                 }
               }
               break

From 82b33382f8a15a438696058c9379aa5f069d9c51 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 1 Nov 2020 13:19:02 +0000
Subject: [PATCH 0629/3183] remove white param

---
 lib/helpers.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/helpers.js b/lib/helpers.js
index 084b1f9f..35167723 100644
--- a/lib/helpers.js
+++ b/lib/helpers.js
@@ -48,7 +48,7 @@ module.exports = {
     'rfList', 'rfTrig', 'sensorType',
     'setclose', 'state', 'switch',
     'switches', 'temperature', 'trigTime',
-    'type', 'voltage', 'white', 'zyx_mode'
+    'type', 'voltage', 'zyx_mode'
   ],
   defaultMultiSwitchOff: [
     {

From 1954e35fb6ac8be43d6cda54b87d08b1f9a9df91 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 1 Nov 2020 13:19:11 +0000
Subject: [PATCH 0630/3183] unnecessary returns, formatting

---
 lib/ewelink-http.js | 56 ++++++++++++++++++---------------------------
 lib/ewelink-ws.js   | 15 +++++-------
 2 files changed, 28 insertions(+), 43 deletions(-)

diff --git a/lib/ewelink-http.js b/lib/ewelink-http.js
index 4e8ba976..031f0a06 100644
--- a/lib/ewelink-http.js
+++ b/lib/ewelink-http.js
@@ -62,15 +62,10 @@ module.exports = class eWeLinkHTTP {
         default:
           throw new Error('No valid region received - [' + body.region + '].')
       }
-      if (this.debug) {
-        this.log('HTTP API host received [%s].', this.httpHost)
-      }
-      return this.httpHost
+      if (this.debug) this.log('HTTP API host received [%s].', this.httpHost)
     } catch (err) {
       if (helpers.hasProperty(err, 'code') && helpers.httpRetryCodes.includes(err.code)) {
-        if (this.debug) {
-          this.log.warn('Unable to reach eWeLink. Retrying in 30 seconds.')
-        }
+        if (this.debug) this.log.warn('Unable to reach eWeLink. Retrying in 30 seconds.')
         await helpers.sleep(30000)
         return await this.getHost()
       } else {
@@ -125,28 +120,25 @@ module.exports = class eWeLinkHTTP {
         default:
           throw new Error('No valid region received - [' + givenRegion + '].')
       }
-      if (this.debug) {
-        this.log('New HTTP API host received [%s].', this.httpHost)
-      }
-      return await this.login()
-    }
-    if (body.data.at) {
-      this.aToken = body.data.at
-      this.apiKey = body.data.user.apikey
-      return {
-        aToken: this.aToken,
-        apiKey: this.apiKey,
-        httpHost: this.httpHost
-      }
+      if (this.debug) this.log('New HTTP API host received [%s].', this.httpHost)
+      await this.login()
     } else {
-      if (body.error === 500) {
-        if (this.debug) {
-          this.log.warn('An eWeLink error [500] occured. Retrying in 30 seconds.')
+      if (body.data.at) {
+        this.aToken = body.data.at
+        this.apiKey = body.data.user.apikey
+        return {
+          aToken: this.aToken,
+          apiKey: this.apiKey,
+          httpHost: this.httpHost
         }
-        await helpers.sleep(30000)
-        return await this.login()
       } else {
-        throw new Error('No auth token received.\n' + JSON.stringify(body, null, 2))
+        if (body.error === 500) {
+          if (this.debug) this.log.warn('An eWeLink error [500] occured. Retrying in 30 seconds.')
+          await helpers.sleep(30000)
+          await this.login()
+        } else {
+          throw new Error('No auth token received.\n' + JSON.stringify(body, null, 2))
+        }
       }
     }
   }
@@ -190,11 +182,9 @@ module.exports = class eWeLinkHTTP {
       return deviceList.concat(sensorList)
     } catch (err) {
       if (helpers.hasProperty(err, 'code') && helpers.httpRetryCodes.includes(err.code)) {
-        if (this.debug) {
-          this.log.warn('Unable to reach eWeLink. Retrying in 30 seconds.')
-        }
+        if (this.debug) this.log.warn('Unable to reach eWeLink. Retrying in 30 seconds.')
         await helpers.sleep(30000)
-        return await this.getDevices()
+        await this.getDevices()
       } else {
         return err
       }
@@ -231,11 +221,9 @@ module.exports = class eWeLinkHTTP {
       }
     } catch (err) {
       if (helpers.hasProperty(err, 'code') && helpers.httpRetryCodes.includes(err.code)) {
-        if (this.debug) {
-          this.log.warn('Unable to reach eWeLink. Retrying in 30 seconds.')
-        }
+        if (this.debug) this.log.warn('Unable to reach eWeLink. Retrying in 30 seconds.')
         await helpers.sleep(30000)
-        return await this.getDevice(deviceId)
+        await this.getDevice(deviceId)
       } else {
         return err
       }
diff --git a/lib/ewelink-ws.js b/lib/ewelink-ws.js
index 04f4a0d4..ee7f60ef 100644
--- a/lib/ewelink-ws.js
+++ b/lib/ewelink-ws.js
@@ -41,12 +41,11 @@ module.exports = class eWeLinkWS {
       }
       if (this.debug) this.log('Web socket host received [%s].', body.domain)
       this.wsHost = body.domain
-      return body.domain
     } catch (err) {
       if (helpers.hasProperty(err, 'code') && helpers.httpRetryCodes.includes(err.code)) {
         if (this.debug) this.log.warn('Unable to reach eWeLink. Retrying in 30 seconds.')
         await helpers.sleep(30000)
-        return await this.getHost()
+        await this.getHost()
       } else {
         return err
       }
@@ -168,7 +167,7 @@ module.exports = class eWeLinkWS {
         this.log.warn('Web socket will try to reconnect in five seconds.')
       }
       await helpers.sleep(5000)
-      return await this.login()
+      await this.login()
     })
     this.wsp.onError.addListener(async e => {
       this.wsIsOpen = false
@@ -182,7 +181,7 @@ module.exports = class eWeLinkWS {
         this.log.warn('Web socket will try to reconnect in five seconds.')
       }
       await helpers.sleep(5000)
-      return await this.login()
+      await this.login()
     })
   }
 
@@ -218,11 +217,9 @@ module.exports = class eWeLinkWS {
         return new Error('device update failed as ' + msg)
       }
     } else {
-      if (this.debug) {
-        this.log.warn('Command will be resent when WS is reconnected.')
-      }
+      if (this.debug) this.log.warn('Command will be resent when WS is reconnected.')
       await helpers.sleep(30000)
-      return await this.sendUpdate(json)
+      await this.sendUpdate(json)
     }
   }
 
@@ -250,7 +247,7 @@ module.exports = class eWeLinkWS {
     } else {
       if (this.debug) this.log.warn('Command will be resent when WS is reconnected.')
       await helpers.sleep(30000)
-      return await this.requestUpdate(accessory)
+      await this.requestUpdate(accessory)
     }
   }
 

From 95652b0e985f81def7100ed161d604e8b4c83973 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 1 Nov 2020 13:20:42 +0000
Subject: [PATCH 0631/3183] 3.10.0-16

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 5fa1ffcd..c07a0c6d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.10.0-15",
+  "version": "3.10.0-16",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index d17a9845..b80cf619 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.10.0-15",
+  "version": "3.10.0-16",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From e1aa660535bcacd2ec06182bad25f5a0f59c56f1 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 1 Nov 2020 13:43:49 +0000
Subject: [PATCH 0632/3183] support zigbee 1256 type

---
 lib/device/zb-dev.js    | 33 +++++++++++++++++++++++++++++++++
 lib/ewelink-platform.js |  2 +-
 lib/helpers.js          |  2 +-
 3 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/lib/device/zb-dev.js b/lib/device/zb-dev.js
index 18994bb7..17ecc7cb 100644
--- a/lib/device/zb-dev.js
+++ b/lib/device/zb-dev.js
@@ -34,6 +34,18 @@ module.exports = class deviceZBDev {
         }
         break
       }
+      case 1256: {
+        if (!accessory.getService(this.Service.Switch)) accessory.addService(this.Service.Switch)
+        accessory.log = this.platform.log
+        accessory.eveLogger = new this.EveHistoryService('switch', accessory, {
+          storage: 'fs',
+          path: this.platform.eveLogPath
+        })
+        accessory.getService(this.Service.Switch)
+          .getCharacteristic(this.Characteristic.On)
+          .on('set', (value, callback) => this.internalUpdate(value, callback))
+        break
+      }
       case 1770: {
         if (!accessory.getService(this.Service.TemperatureSensor)) accessory.addService(this.Service.TemperatureSensor)
         if (!accessory.getService(this.Service.HumiditySensor)) accessory.addService(this.Service.HumiditySensor)
@@ -66,6 +78,16 @@ module.exports = class deviceZBDev {
     this.accessory = accessory
   }
 
+  async internalUpdate (value, callback) {
+    callback()
+    try {
+      const params = { switch: value ? 'on' : 'off' }
+      await this.platform.sendDeviceUpdate(this.accessory, params)
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, true)
+    }
+  }
+
   async externalUpdate (params) {
     try {
       //* ** credit @tasict ***\\
@@ -89,6 +111,17 @@ module.exports = class deviceZBDev {
               .updateCharacteristic(this.Characteristic.ProgrammableSwitchEvent, params.key)
           }
           break
+        case 1256:
+          if (helpers.hasProperty(params, 'switch') && ['off', 'on'].includes(params.switch)) {
+            this.accessory
+              .getService(this.Service.Switch)
+              .updateCharacteristic(this.Characteristic.On, params.switch === 'on')
+            this.accessory.eveLogger.addEntry({
+              time: Math.round(new Date().valueOf() / 1000),
+              status: params.switch === 'on' ? 1 : 0
+            })
+          }
+          break
         case 1770: {
           const eveLog = { time: Math.round(new Date().valueOf() / 1000) }
           if (helpers.hasProperty(params, 'temperature')) {
diff --git a/lib/ewelink-platform.js b/lib/ewelink-platform.js
index e73804c2..a217733f 100644
--- a/lib/ewelink-platform.js
+++ b/lib/ewelink-platform.js
@@ -545,7 +545,7 @@ module.exports = class eWeLinkPlatform {
           .setCharacteristic(this.Characteristic.SerialNumber, hbDeviceId)
           .setCharacteristic(this.Characteristic.Manufacturer, device.brandName)
           .setCharacteristic(this.Characteristic.Model, device.productModel + ' (' + device.extra.model + ')')
-          .setCharacteristic(this.Characteristic.FirmwareRevision, device.params.fwVersion)
+          .setCharacteristic(this.Characteristic.FirmwareRevision, device.params.fwVersion || version)
           .setCharacteristic(this.Characteristic.Identify, true)
         accessory.on('identify', (paired, callback) => {
           this.log('[%s] - identify button pressed.', accessory.displayName)
diff --git a/lib/helpers.js b/lib/helpers.js
index 35167723..7121c9a3 100644
--- a/lib/helpers.js
+++ b/lib/helpers.js
@@ -37,7 +37,7 @@ module.exports = {
   devicesSCM: [78],
   devicesRFBridge: [28],
   devicesZBBridge: [66],
-  devicesZB: [1000, 1770, 2026, 3026],
+  devicesZB: [1000, 1256, 1770, 2026, 3026],
   paramsToKeep: [
     'battery', 'bright', 'brightness',
     'channel', 'cmd', 'color', 'colorB', 'colorG',

From 36ce992bdb4e139272f3566085d08584c11781f8 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 1 Nov 2020 13:44:38 +0000
Subject: [PATCH 0633/3183] 3.10.0-17

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c07a0c6d..14826457 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.10.0-16",
+  "version": "3.10.0-17",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index b80cf619..1431b73f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.10.0-16",
+  "version": "3.10.0-17",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 4cce64e5dc51c2d2b8f608b33ec4eebac3edee1c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 1 Nov 2020 16:57:45 +0000
Subject: [PATCH 0634/3183] reorder, add resetRF + disablePlugin to ui

---
 config.schema.json | 49 +++++++++++++++++++++++++---------------------
 1 file changed, 27 insertions(+), 22 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 8438480d..0e3b2a8d 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -41,6 +41,18 @@
         "description": "If checked, HTTP, web socket and LAN mode messages will be added to the log. Not recommended for long-term use.",
         "default": false
       },
+      "disableHTTPRefresh": {
+        "type": "boolean",
+        "title": "Disable Initial Device Refresh",
+        "description": "If checked, devices will not be refreshed with their most recent status from eWeLink when Homebridge starts. This setting can be useful for users who block their devices from accessing the internet.",
+        "default": false
+      },
+      "disablePlugin": {
+        "title": "Disable Plugin",
+        "type": "boolean",
+        "description": "If checked, the plugin will remove all eWeLink accessories from Homebridge and not load the plugin on Homebridge restart.",
+        "default": false
+      },
       "hideDevFromHB": {
         "type": "string",
         "title": "Hide Devices",
@@ -51,12 +63,6 @@
         "title": "Hide Light/Switch Channels",
         "description": "A list of light/switch channels to hide from Homebridge. For example '10009553c8SW0' or multiple separated with a comma '10009553c8SW0,10009553c9SW2'."
       },
-      "disableHTTPRefresh": {
-        "type": "boolean",
-        "title": "Disable Initial Device Refresh",
-        "description": "If checked, devices will not be refreshed with their most recent status from eWeLink when Homebridge starts. This setting can be useful for users who block their devices from accessing the internet.",
-        "default": false
-      },
       "outletAsSwitch": {
         "type": "string",
         "title": "Outlets As Switch",
@@ -70,17 +76,17 @@
         "minimum": 0,
         "maximum": 100
       },
+      "hideLightFromFan": {
+        "type": "string",
+        "title": "Hide Fan Lights",
+        "description": "A list of eWeLink iFan devices for which the light will be hidden from Homebridge. For example '10009553c8' or multiple separated with a comma '10009553c8,10009553c9'"
+      },
       "hideTHSwitch": {
         "title": "Hide TH10/TH16 Switch",
         "type": "boolean",
         "description": "If checked, the switch for the TH10/TH16 devices will be hidden from Homebridge.",
         "default": false
       },
-      "hideLightFromFan": {
-        "type": "string",
-        "title": "Hide Fan Lights",
-        "description": "A list of eWeLink iFan devices for which the light will be hidden from Homebridge. For example '10009553c8' or multiple separated with a comma '10009553c8,10009553c9'"
-      },
       "lowBattThreshold": {
         "type": "integer",
         "title": "Low Battery Threshold",
@@ -103,8 +109,11 @@
         "description": "If checked, double and long press options will be hidden for the ZigBee button.",
         "default": false
       },
-      "sensorTimeLength": {
-        "type": "integer"
+      "resetRFBridge": {
+        "title": "Reset RF Bridges",
+        "type": "boolean",
+        "description": "If checked, the plugin will remove and re-add all RF Bridges on Homebridge restart. This is needed when adding/removed sub-devices from the RF Bridge.",
+        "default": false
       },
       "groups": {
         "type": "array",
@@ -324,12 +333,6 @@
             }
           }
         }
-      },
-      "resetRFBridge": {
-        "type": "boolean"
-      },
-      "disablePlugin": {
-        "type": "boolean"
       }
     }
   },
@@ -353,7 +356,7 @@
         "debug",
         "debugReqRes",
         "disableHTTPRefresh",
-        "hideDevFromHB"
+        "disablePlugin"
       ]
     },
     {
@@ -362,14 +365,16 @@
       "description": "A variety of optional settings for specific device types.",
       "expandable": true,
       "items": [
+        "hideDevFromHB",
         "hideChanFromHB",
         "outletAsSwitch",
-        "hideLightFromFan",
         "inUsePowerThreshold",
+        "hideLightFromFan",
         "hideTHSwitch",
         "lowBattThreshold",
         "sensorTimeDifference",
-        "hideZBLDPress"
+        "hideZBLDPress",
+        "resetRFBridge"
       ]
     },
     {

From 941253120bf5122a58f71755fd2afe466a515d33 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 1 Nov 2020 17:04:15 +0000
Subject: [PATCH 0635/3183] formatting, no changes

---
 lib/helpers.js | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/lib/helpers.js b/lib/helpers.js
index 7121c9a3..1d1c8413 100644
--- a/lib/helpers.js
+++ b/lib/helpers.js
@@ -18,10 +18,9 @@ module.exports = {
   devicesSingleSwitch: [1, 5, 6, 14, 15, 22, 24, 27, 32, 36, 44, 59, 104],
   devicesMultiSwitch: [2, 3, 4, 7, 8, 9, 29, 30, 31, 34, 41],
   devicesSingleSwitchLight: [
-    'T1 1C', 'L1', 'B1',
-    'B1_R2', 'TX1C', 'D1', 'D1R1',
-    'KING-M4', 'Slampher', 'GTTA59',
-    'GTLC104'
+    'T1 1C', 'L1', 'B1', 'B1_R2',
+    'TX1C', 'D1', 'D1R1', 'KING-M4',
+    'Slampher', 'GTTA59', 'GTLC104'
   ],
   devicesMultiSwitchLight: ['T1 2C', 'T1 3C', 'TX2C', 'TX3C'],
   devicesSingleSwitchOutlet: ['Sonoff Pow', 'S20', 'S26', 'S55'],
@@ -40,15 +39,15 @@ module.exports = {
   devicesZB: [1000, 1256, 1770, 2026, 3026],
   paramsToKeep: [
     'battery', 'bright', 'brightness',
-    'channel', 'cmd', 'color', 'colorB', 'colorG',
-    'colorR', 'current', 'currentHumidity',
-    'currentTemperature', 'humidity',
-    'key', 'lock', 'ltype', 'mainSwitch', 'mode',
-    'motion', 'online', 'power', 'rfChl',
-    'rfList', 'rfTrig', 'sensorType',
-    'setclose', 'state', 'switch',
-    'switches', 'temperature', 'trigTime',
-    'type', 'voltage', 'zyx_mode'
+    'channel', 'cmd', 'color', 'colorB',
+    'colorG', 'colorR', 'current',
+    'currentHumidity', 'currentTemperature',
+    'humidity', 'key', 'lock', 'ltype',
+    'mainSwitch', 'mode', 'motion', 'online',
+    'power', 'rfChl', 'rfList', 'rfTrig',
+    'sensorType', 'setclose', 'state',
+    'switch', 'switches', 'temperature',
+    'trigTime', 'type', 'voltage', 'zyx_mode'
   ],
   defaultMultiSwitchOff: [
     {

From 026238226c1485cc5b8274e867965c33aa83ebdb Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 1 Nov 2020 17:14:21 +0000
Subject: [PATCH 0636/3183] formatting, no changes

---
 lib/ewelink-platform.js | 45 ++++++++++++++++++++++-------------------
 1 file changed, 24 insertions(+), 21 deletions(-)

diff --git a/lib/ewelink-platform.js b/lib/ewelink-platform.js
index a217733f..f9eef5e9 100644
--- a/lib/ewelink-platform.js
+++ b/lib/ewelink-platform.js
@@ -97,22 +97,20 @@ module.exports = class eWeLinkPlatform {
       this.devicesInEW.forEach(d => this.initialiseDevice(d))
       this.wsClient.receiveUpdate(d => this.receiveDeviceUpdate(d))
       this.lanClient.receiveUpdate(d => this.receiveDeviceUpdate(d))
-      this.wsRefresh = promInterval(
-        async () => {
-          if (this.wsRefreshFlag) {
-            try {
-              if (this.wsClient) {
-                await this.wsClient.getHost()
-                await this.wsClient.closeConnection()
-                await helpers.sleep(250)
-                await this.wsClient.login()
-              }
-            } catch (err) {
-              this.log.warn(this.debug ? err : err.message)
+      this.wsRefresh = promInterval(async () => {
+        if (this.wsRefreshFlag) {
+          try {
+            if (this.wsClient) {
+              await this.wsClient.getHost()
+              await this.wsClient.closeConnection()
+              await helpers.sleep(250)
+              await this.wsClient.login()
             }
+          } catch (err) {
+            this.log.warn(this.debug ? err : err.message)
           }
-        }, 1800000, { stopOnError: false }
-      )
+        }
+      }, 1800000, { stopOnError: false })
       this.log("eWeLink sync complete. Don't forget to ⭐️  this plugin on GitHub if you're finding it useful!")
       if (this.config.debugReqRes) {
         this.log.warn("Note: 'Request & Response Logging' is not advised for long-term use.")
@@ -263,7 +261,10 @@ module.exports = class eWeLinkPlatform {
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new deviceSwitch(this, accessory)
         /***********************/
-      } else if (helpers.devicesOutlet.includes(device.extra.uiid) || (helpers.devicesSingleSwitch.includes(device.extra.uiid) && helpers.devicesSingleSwitchOutlet.includes(device.productModel))) {
+      } else if (
+        helpers.devicesOutlet.includes(device.extra.uiid) ||
+        (helpers.devicesSingleSwitch.includes(device.extra.uiid) && helpers.devicesSingleSwitchOutlet.includes(device.productModel))
+      ) {
         /******
         OUTLETS
         ******/
@@ -299,7 +300,10 @@ module.exports = class eWeLinkPlatform {
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new deviceLight(this, accessory)
         /*********************/
-      } else if (helpers.devicesMultiSwitch.includes(device.extra.uiid) && helpers.devicesMultiSwitchLight.includes(device.productModel)) {
+      } else if (
+        helpers.devicesMultiSwitch.includes(device.extra.uiid) &&
+        helpers.devicesMultiSwitchLight.includes(device.productModel)
+      ) {
         /*********************
         LIGHTS [MULTI CHANNEL]
         *********************/
@@ -472,7 +476,7 @@ module.exports = class eWeLinkPlatform {
         /******
         CAMERAS
         ******/
-        this.log.warn(' → [%s] please see the homebridge-ewelink wiki for details to enable the camera.', device.name)
+        this.log(' → [%s] please see the homebridge-ewelink wiki for details to enable the camera.', device.name)
         return
         /*****/
       } else {
@@ -519,10 +523,9 @@ module.exports = class eWeLinkPlatform {
   addAccessory (device, hbDeviceId, hidden = false, extraContext = {}, type = '') {
     const switchNumber = hbDeviceId.split('SW')[1].toString()
     let newDeviceName = type === 'rf_sub' ? device.tags.zyx_info[switchNumber - 1].name : device.name
-    const channelCount =
-      type === 'rf_pri'
-        ? Object.keys((device.tags && device.tags.zyx_info) || []).length
-        : helpers.chansFromUiid[device.extra.uiid]
+    const channelCount = type === 'rf_pri'
+      ? Object.keys((device.tags && device.tags.zyx_info) || []).length
+      : helpers.chansFromUiid[device.extra.uiid]
     if (['1', '2', '3', '4'].includes(switchNumber) && type !== 'rf_sub') {
       if (
         helpers.hasProperty(device, 'tags') &&

From b6bfec2007d1c9f80acdcfe986cea6c406cb0fe9 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 1 Nov 2020 17:15:15 +0000
Subject: [PATCH 0637/3183] 3.10.0-18

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 14826457..49ea6963 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.10.0-17",
+  "version": "3.10.0-18",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 1431b73f..7b588c2e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.10.0-17",
+  "version": "3.10.0-18",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From a2456bac5ef1442fda2c0024f05093786902b1ba Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 2 Nov 2020 08:57:05 +0000
Subject: [PATCH 0638/3183] split light types into files

---
 lib/device/light-colour.js | 222 +++++++++++++++++++++++++++++++++++++
 lib/device/light-dimmer.js |  83 ++++++++++++++
 lib/device/light-multi.js  | 105 ++++++++++++++++++
 lib/device/light-single.js |  33 ++++++
 lib/ewelink-platform.js    |  41 ++++++-
 lib/helpers.js             |   1 +
 6 files changed, 479 insertions(+), 6 deletions(-)
 create mode 100644 lib/device/light-colour.js
 create mode 100644 lib/device/light-dimmer.js
 create mode 100644 lib/device/light-multi.js
 create mode 100644 lib/device/light-single.js

diff --git a/lib/device/light-colour.js b/lib/device/light-colour.js
new file mode 100644
index 00000000..92a7d0c2
--- /dev/null
+++ b/lib/device/light-colour.js
@@ -0,0 +1,222 @@
+/* jshint -W014, -W033, esversion: 9 */
+/* eslint-disable new-cap */
+'use strict'
+const convert = require('color-convert')
+const helpers = require('./../helpers')
+module.exports = class deviceLightColour {
+  constructor (platform, accessory) {
+    this.platform = platform
+    this.Service = platform.api.hap.Service
+    this.Characteristic = platform.api.hap.Characteristic
+    const lightService = accessory.getService(this.Service.Lightbulb) || accessory.addService(this.Service.Lightbulb)
+    lightService
+      .getCharacteristic(this.Characteristic.On)
+      .on('set', (value, callback) => this.internalUpdate('onoff', value, callback))
+    lightService
+      .getCharacteristic(this.Characteristic.Brightness)
+      .on('set', (value, callback) => this.internalUpdate('brightness', value, callback))
+    lightService
+      .getCharacteristic(this.Characteristic.Hue)
+      .on('set', (value, callback) => this.internalUpdate('hue', value, callback))
+    lightService
+      .getCharacteristic(this.Characteristic.Saturation)
+      .on('set', (value, callback) => callback())
+    if (accessory.context.eweUIID === 22) {
+      // *** B1 doesn't support brightness *** \\
+      lightService
+        .getCharacteristic(this.Characteristic.Brightness)
+        .setProps({
+          minStep: 100
+        })
+    }
+    this.accessory = accessory
+  }
+
+  async internalUpdate (type, value, callback) {
+    callback()
+    try {
+      let newRGB
+      let params = {}
+      const lightService = this.accessory.getService(this.Service.Lightbulb)
+      switch (type) {
+        case 'onoff':
+          if (this.accessory.context.eweUIID === 22) {
+          // **** B1 uses state rather than switch *** \\
+            params.state = value ? 'on' : 'off'
+          } else {
+            params.switch = value ? 'on' : 'off'
+          }
+          await this.platform.sendDeviceUpdate(this.accessory, params)
+          break
+        case 'brightness': {
+          const updateKey = Math.random().toString(36).substr(2, 8)
+          this.accessory.context.updateKey = updateKey
+          switch (this.accessory.context.eweUIID) {
+            case 22:
+              // *** B1 doesn't support brightness *** \\
+              return
+            case 59:
+              // *** L1 *** \\
+              params = {
+                mode: 1,
+                bright: value
+              }
+              break
+            case 104:
+            // *** GTLC104 needs the current rgb values sent too *** \\
+              params = {
+                ltype: 'color',
+                color: {
+                  br: value,
+                  r: this.accessory.context.cacheR,
+                  g: this.accessory.context.cacheG,
+                  b: this.accessory.context.cacheB
+                }
+              }
+              break
+          }
+          await helpers.sleep(500)
+          if (updateKey !== this.accessory.context.updateKey) return
+          await this.platform.sendDeviceUpdate(this.accessory, params)
+          break
+        }
+        case 'hue': {
+          const updateKey = Math.random().toString(36).substr(2, 8)
+          this.accessory.context.updateKey = updateKey
+          newRGB = convert.hsv.rgb(value, lightService.getCharacteristic(this.Characteristic.Saturation).value, 100)
+          switch (this.accessory.context.eweUIID) {
+            case 22:
+            // *** B1 *** \\
+              params = {
+                zyx_mode: 2,
+                type: 'middle',
+                channel0: '0',
+                channel1: '0',
+                channel2: newRGB[0].toString(),
+                channel3: newRGB[1].toString(),
+                channel4: newRGB[2].toString()
+              }
+              break
+            case 59:
+              // *** L1 *** \\
+              params = {
+                mode: 1,
+                colorR: newRGB[0],
+                colorG: newRGB[1],
+                colorB: newRGB[2]
+              }
+              break
+            case 104:
+              // *** GTLC104 *** \\
+              params = {
+                ltype: 'color',
+                color: {
+                  r: newRGB[0],
+                  g: newRGB[1],
+                  b: newRGB[2],
+                  br: lightService.getCharacteristic(this.Characteristic.Brightness).value
+                }
+              }
+              this.accessory.context.cacheR = newRGB[0]
+              this.accessory.context.cacheG = newRGB[1]
+              this.accessory.context.cacheB = newRGB[2]
+              break
+          }
+          await helpers.sleep(500)
+          if (updateKey !== this.accessory.context.updateKey) return
+          await this.platform.sendDeviceUpdate(this.accessory, params)
+          break
+        }
+      }
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, true)
+    }
+  }
+
+  async externalUpdate (params) {
+    try {
+      let newColour
+      let mode
+      let isOn = false
+      const lightService = this.accessory.getService(this.Service.Lightbulb)
+      if (this.accessory.context.eweUIID === 22 && helpers.hasProperty(params, 'state')) {
+        isOn = params.state === 'on'
+      } else if (this.accessory.context.eweUIID !== 22 && helpers.hasProperty(params, 'switch')) {
+        isOn = params.switch === 'on'
+      } else {
+        isOn = lightService.getCharacteristic(this.Characteristic.On).value
+      }
+      if (isOn) {
+        lightService.updateCharacteristic(this.Characteristic.On, true)
+        switch (this.accessory.context.eweUIID) {
+          case 22:
+            // *** B1 *** \\
+            if (helpers.hasProperty(params, 'zyx_mode')) {
+              mode = parseInt(params.zyx_mode)
+            } else if (helpers.hasProperty(params, 'channel0') && parseInt(params.channel0) + parseInt(params.channel1) > 0) {
+              mode = 1
+            } else {
+              mode = 2
+            }
+            if (mode === 2) {
+              newColour = convert.rgb.hsv(
+                parseInt(params.channel2),
+                parseInt(params.channel3),
+                parseInt(params.channel4)
+              )
+              lightService
+                .updateCharacteristic(this.Characteristic.Hue, newColour[0])
+                .updateCharacteristic(this.Characteristic.Saturation, 100)
+                .updateCharacteristic(this.Characteristic.Brightness, 100)
+            }
+            break
+          case 59:
+            // *** L1 *** \\
+            if (helpers.hasProperty(params, 'bright')) {
+              lightService.updateCharacteristic(this.Characteristic.Brightness, params.bright)
+            }
+            if (helpers.hasProperty(params, 'colorR')) {
+              newColour = convert.rgb.hsv(params.colorR, params.colorG, params.colorB)
+              lightService
+                .updateCharacteristic(this.Characteristic.Hue, newColour[0])
+                .updateCharacteristic(this.Characteristic.Saturation, newColour[1])
+            }
+            break
+          case 104:
+            // *** GTLC104 *** \\
+            if (helpers.hasProperty(params, 'updateSource') && params.updateSource === 'LAN') return
+            if (helpers.hasProperty(params, 'ltype')) {
+              mode = params.ltype
+              if (mode === 'color' && helpers.hasProperty(params, 'color')) {
+                if (helpers.hasProperty(params.color, 'br')) {
+                  lightService.updateCharacteristic(this.Characteristic.Brightness, params.color.br)
+                }
+                if (
+                  helpers.hasProperty(params.color, 'r') &&
+                  helpers.hasProperty(params.color, 'g') &&
+                  helpers.hasProperty(params.color, 'b')
+                ) {
+                  newColour = convert.rgb.hsv(
+                    parseInt(params.color.r),
+                    parseInt(params.color.g),
+                    parseInt(params.color.b)
+                  )
+                  lightService
+                    .updateCharacteristic(this.Characteristic.Hue, newColour[0])
+                    .updateCharacteristic(this.Characteristic.Saturation, 100)
+                  this.accessory.context.cacheR = params.color.r
+                  this.accessory.context.cacheG = params.color.g
+                  this.accessory.context.cacheB = params.color.b
+                }
+              }
+            }
+            break
+        }
+      } else {
+        lightService.updateCharacteristic(this.Characteristic.On, false)
+      }
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, false)
+    }
+  }
+}
diff --git a/lib/device/light-dimmer.js b/lib/device/light-dimmer.js
new file mode 100644
index 00000000..b7c30db4
--- /dev/null
+++ b/lib/device/light-dimmer.js
@@ -0,0 +1,83 @@
+/* jshint -W014, -W033, esversion: 9 */
+/* eslint-disable new-cap */
+'use strict'
+const helpers = require('./../helpers')
+module.exports = class deviceLightDimmer {
+  constructor (platform, accessory) {
+    this.platform = platform
+    this.Service = platform.api.hap.Service
+    this.Characteristic = platform.api.hap.Characteristic
+    const lightService = accessory.getService(this.Service.Lightbulb) || accessory.addService(this.Service.Lightbulb)
+    lightService
+      .getCharacteristic(this.Characteristic.On)
+      .on('set', (value, callback) => this.internalUpdate('onoff', value, callback))
+    lightService.getCharacteristic(this.Characteristic.Brightness)
+      .on('set', (value, callback) => this.internalUpdate('brightness', value, callback))
+    this.accessory = accessory
+  }
+
+  async internalUpdate (type, value, callback) {
+    callback()
+    try {
+      const params = {}
+      switch (type) {
+        case 'onoff':
+          params.switch = value ? 'on' : 'off'
+          await this.platform.sendDeviceUpdate(this.accessory, params)
+          break
+        case 'brightness': {
+          const updateKey = Math.random().toString(36).substr(2, 8)
+          this.accessory.context.updateKey = updateKey
+          switch (this.accessory.context.eweUIID) {
+            case 36:
+              // *** KING-M4 eWeLink scale is 10-100 and HomeKit scale is 0-100. *** \\
+              params.bright = Math.round((value * 9) / 10 + 10)
+              break
+            case 44:
+              // *** D1 eWeLink scale matches HomeKit scale of 0-100 *** \\
+              params.brightness = value
+              params.mode = 0
+              break
+          }
+          await helpers.sleep(500)
+          if (updateKey !== this.accessory.context.updateKey) return
+          await this.platform.sendDeviceUpdate(this.accessory, params)
+          break
+        }
+      }
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, true)
+    }
+  }
+
+  async externalUpdate (params) {
+    try {
+      const lightService = this.accessory.getService(this.Service.Lightbulb)
+      const isOn = helpers.hasProperty(params, 'switch')
+        ? params.switch === 'on'
+        : lightService.getCharacteristic(this.Characteristic.On).value
+      if (isOn) {
+        lightService.updateCharacteristic(this.Characteristic.On, true)
+        switch (this.accessory.context.eweUIID) {
+          case 36:
+            // *** KING-M4 eWeLink scale is 10-100 and HomeKit scale is 0-100. *** \\
+            if (helpers.hasProperty(params, 'bright')) {
+              const nb = Math.round(((params.bright - 10) * 10) / 9)
+              lightService.updateCharacteristic(this.Characteristic.Brightness, nb)
+            }
+            break
+          case 44:
+            // *** D1 eWeLink scale matches HomeKit scale of 0-100 *** \\
+            if (helpers.hasProperty(params, 'brightness')) {
+              lightService.updateCharacteristic(this.Characteristic.Brightness, params.brightness)
+            }
+            break
+        }
+      } else {
+        lightService.updateCharacteristic(this.Characteristic.On, false)
+      }
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, false)
+    }
+  }
+}
diff --git a/lib/device/light-multi.js b/lib/device/light-multi.js
new file mode 100644
index 00000000..c851d09f
--- /dev/null
+++ b/lib/device/light-multi.js
@@ -0,0 +1,105 @@
+/* jshint -W014, -W033, esversion: 9 */
+/* eslint-disable new-cap */
+'use strict'
+const helpers = require('./../helpers')
+module.exports = class deviceLightMulti {
+  constructor (platform, accessory) {
+    this.platform = platform
+    this.Service = platform.api.hap.Service
+    this.Characteristic = platform.api.hap.Characteristic
+    const lightService = accessory.getService(this.Service.Lightbulb) || accessory.addService(this.Service.Lightbulb)
+    lightService
+      .getCharacteristic(this.Characteristic.On)
+      .on('set', (value, callback) => this.internalUpdate(value, callback))
+    this.accessory = accessory
+  }
+
+  async internalUpdate (value, callback) {
+    callback()
+    try {
+      let oAccessory
+      const params = {}
+      switch (this.accessory.context.switchNumber) {
+        case '0':
+          params.switches = helpers.defaultMultiSwitchOff
+          params.switches[0].switch = value ? 'on' : 'off'
+          params.switches[1].switch = value ? 'on' : 'off'
+          params.switches[2].switch = value ? 'on' : 'off'
+          params.switches[3].switch = value ? 'on' : 'off'
+          break
+        case '1':
+        case '2':
+        case '3':
+        case '4':
+          params.switches = helpers.defaultMultiSwitchOff
+          for (let i = 1; i <= 4; i++) {
+            if ((oAccessory = this.platform.devicesInHB.get(this.accessory.context.eweDeviceId + 'SW' + i))) {
+              if (i === parseInt(this.accessory.context.switchNumber)) {
+                params.switches[i - 1].switch = value ? 'on' : 'off'
+              } else {
+                params.switches[i - 1].switch = oAccessory.context.cacheOn ? 'on' : 'off'
+              }
+            } else {
+              params.switches[i - 1].switch = 'off'
+            }
+          }
+          break
+      }
+      await this.platform.sendDeviceUpdate(this.accessory, params)
+      switch (this.accessory.context.switchNumber) {
+        case '0':
+          for (let i = 0; i <= 4; i++) {
+            if ((oAccessory = this.platform.devicesInHB.get(this.accessory.context.eweDeviceId + 'SW' + i))) {
+              oAccessory.getService(this.Service.Lightbulb).updateCharacteristic(this.Characteristic.On, value)
+            }
+          }
+          break
+        case '1':
+        case '2':
+        case '3':
+        case '4': {
+          let masterState = 'off'
+          for (let i = 1; i <= 4; i++) {
+            if ((oAccessory = this.platform.devicesInHB.get(this.accessory.context.eweDeviceId + 'SW' + i))) {
+              if (oAccessory.getService(this.Service.Lightbulb).getCharacteristic(this.Characteristic.On).value) {
+                masterState = 'on'
+              }
+            }
+          }
+          if (!this.platform.hiddenMasters.includes(this.accessory.context.eweDeviceId)) {
+            oAccessory = this.platform.devicesInHB.get(this.accessory.context.eweDeviceId + 'SW0')
+            oAccessory.getService(this.Service.Lightbulb).updateCharacteristic(this.Characteristic.On, masterState === 'on')
+          }
+          break
+        }
+      }
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, true)
+    }
+  }
+
+  async externalUpdate (params) {
+    try {
+      if (!helpers.hasProperty(params, 'switches')) return
+      const idToCheck = this.accessory.context.hbDeviceId.slice(0, -1)
+      let primaryState = false
+      for (let i = 1; i <= this.accessory.context.channelCount; i++) {
+        if (params.switches[i - 1].switch === 'on') {
+          primaryState = true
+        }
+        if (this.platform.devicesInHB.has(idToCheck + i)) {
+          const oAccessory = this.platform.devicesInHB.get(idToCheck + i)
+          oAccessory.context.cacheOn = params.switches[i - 1].switch === 'on'
+          oAccessory
+            .getService(this.Service.Lightbulb)
+            .updateCharacteristic(this.Characteristic.On, params.switches[i - 1].switch === 'on')
+        }
+      }
+      if (!this.platform.hiddenMasters.includes(this.accessory.context.eweDeviceId)) {
+        this.accessory.getService(this.Service.Lightbulb).updateCharacteristic(this.Characteristic.On, primaryState)
+      }
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, false)
+    }
+  }
+}
diff --git a/lib/device/light-single.js b/lib/device/light-single.js
new file mode 100644
index 00000000..c62ee8fa
--- /dev/null
+++ b/lib/device/light-single.js
@@ -0,0 +1,33 @@
+/* jshint -W014, -W033, esversion: 9 */
+/* eslint-disable new-cap */
+'use strict'
+module.exports = class deviceLightSingle {
+  constructor (platform, accessory) {
+    this.platform = platform
+    this.Service = platform.api.hap.Service
+    this.Characteristic = platform.api.hap.Characteristic
+    const lightService = accessory.getService(this.Service.Lightbulb) || accessory.addService(this.Service.Lightbulb)
+    lightService
+      .getCharacteristic(this.Characteristic.On)
+      .on('set', (value, callback) => this.internalUpdate(value, callback))
+    this.accessory = accessory
+  }
+
+  async internalUpdate (value, callback) {
+    callback()
+    try {
+      const params = { switch: value ? 'on' : 'off' }
+      await this.platform.sendDeviceUpdate(this.accessory, params)
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, true)
+    }
+  }
+
+  async externalUpdate (params) {
+    try {
+      this.accessory.getService(this.Service.Lightbulb).updateCharacteristic(this.Characteristic.On, params.switch === 'on')
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, false)
+    }
+  }
+}
diff --git a/lib/ewelink-platform.js b/lib/ewelink-platform.js
index f9eef5e9..41cf0f13 100644
--- a/lib/ewelink-platform.js
+++ b/lib/ewelink-platform.js
@@ -15,7 +15,10 @@ const deviceThermostat = require('./device/thermostat')
 const deviceOutlet = require('./device/outlet')
 const deviceUSB = require('./device/usb')
 const deviceSCM = require('./device/scm')
-const deviceLight = require('./device/light')
+const deviceLightColour = require('./device/light-colour')
+const deviceLightDimmer = require('./device/light-dimmer')
+const deviceLightMulti = require('./device/light-multi')
+const deviceLightSingle = require('./device/light-single')
 const deviceSwitch = require('./device/switch')
 const deviceRFBridge = require('./device/rf-bridge')
 const deviceZBDev = require('./device/zb-dev')
@@ -291,21 +294,47 @@ module.exports = class eWeLinkPlatform {
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new deviceSCM(this, accessory)
         /********************************/
+      } else if (
+        helpers.devicesSingleSwitch.includes(device.extra.uiid) &&
+        helpers.devicesSingleSwitchLight.includes(device.productModel) &&
+        helpers.devicesColourable.includes(device.extra.uiid)
+      ) {
+        /**********************
+        LIGHTS [COLOUR RGB]
+        **********************/
+        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
+          ? this.devicesInHB.get(device.deviceid + 'SWX')
+          : this.addAccessory(device, device.deviceid + 'SWX')
+        accessory.control = new deviceLightColour(this, accessory)
+        /*********************/
+      } else if (
+        helpers.devicesSingleSwitch.includes(device.extra.uiid) &&
+        helpers.devicesSingleSwitchLight.includes(device.productModel) &&
+        helpers.devicesBrightable.includes(device.extra.uiid)
+      ) {
+        /**********************
+        LIGHTS [DIMMER]
+        **********************/
+        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
+          ? this.devicesInHB.get(device.deviceid + 'SWX')
+          : this.addAccessory(device, device.deviceid + 'SWX')
+        accessory.control = new deviceLightDimmer(this, accessory)
+        /*********************/
       } else if (helpers.devicesSingleSwitch.includes(device.extra.uiid) && helpers.devicesSingleSwitchLight.includes(device.productModel)) {
         /**********************
-        LIGHTS [SINGLE CHANNEL]
+        LIGHTS [ON/OFF SINGLE CHANNEL]
         **********************/
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
           : this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new deviceLight(this, accessory)
+        accessory.control = new deviceLightSingle(this, accessory)
         /*********************/
       } else if (
         helpers.devicesMultiSwitch.includes(device.extra.uiid) &&
         helpers.devicesMultiSwitchLight.includes(device.productModel)
       ) {
         /*********************
-        LIGHTS [MULTI CHANNEL]
+        LIGHTS [ON/OFF MULTI CHANNEL]
         *********************/
         if ((this.config.hideChanFromHB || '').split(',').includes(device.deviceid + 'SW0')) {
           if (this.devicesInHB.has(device.deviceid + 'SW0')) {
@@ -318,7 +347,7 @@ module.exports = class eWeLinkPlatform {
             ? this.devicesInHB.get(device.deviceid + 'SW0')
             : this.addAccessory(device, device.deviceid + 'SW0')
         }
-        accessory.control = new deviceLight(this, accessory)
+        accessory.control = new deviceLightMulti(this, accessory)
         for (let i = 1; i <= helpers.chansFromUiid[device.extra.uiid]; i++) {
           if ((this.config.hideChanFromHB || '').split(',').includes(device.deviceid + 'SW' + i)) {
             if (this.devicesInHB.has(device.deviceid + 'SW' + i)) {
@@ -336,7 +365,7 @@ module.exports = class eWeLinkPlatform {
           oAccessory.context.reachableWAN = device.online
           oAccessory.context.reachableLAN = this.lanDevices.get(device.deviceid).online || false
           this.devicesInHB.set(oAccessory.context.hbDeviceId, oAccessory)
-          oAccessory.control = new deviceLight(this, oAccessory)
+          oAccessory.control = new deviceLightMulti(this, oAccessory)
         }
         /********************/
       } else if (helpers.devicesSingleSwitch.includes(device.extra.uiid)) {
diff --git a/lib/helpers.js b/lib/helpers.js
index 1d1c8413..bc503898 100644
--- a/lib/helpers.js
+++ b/lib/helpers.js
@@ -26,6 +26,7 @@ module.exports = {
   devicesSingleSwitchOutlet: ['Sonoff Pow', 'S20', 'S26', 'S55'],
   devicesBrightable: [36, 44],
   devicesColourable: [22, 59, 104],
+  devicesCTemptable: [],
   devicesCurtain: [11],
   devicesSensor: [102],
   devicesThermostat: [15],

From 7932b65421ece6df958294c781447656ce4f0c0c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 2 Nov 2020 08:59:07 +0000
Subject: [PATCH 0639/3183] Delete light.js

---
 lib/device/light.js | 342 --------------------------------------------
 1 file changed, 342 deletions(-)
 delete mode 100644 lib/device/light.js

diff --git a/lib/device/light.js b/lib/device/light.js
deleted file mode 100644
index 7738df6a..00000000
--- a/lib/device/light.js
+++ /dev/null
@@ -1,342 +0,0 @@
-/* jshint -W014, -W033, esversion: 9 */
-/* eslint-disable new-cap */
-'use strict'
-const convert = require('color-convert')
-const helpers = require('./../helpers')
-module.exports = class deviceLight {
-  constructor (platform, accessory) {
-    this.platform = platform
-    this.Service = platform.api.hap.Service
-    this.Characteristic = platform.api.hap.Characteristic
-    const lightService = accessory.getService(this.Service.Lightbulb) || accessory.addService(this.Service.Lightbulb)
-    lightService
-      .getCharacteristic(this.Characteristic.On)
-      .on('set', (value, callback) => this.internalUpdate('onoff', value, callback))
-    if (helpers.devicesBrightable.includes(accessory.context.eweUIID)) {
-      lightService.getCharacteristic(this.Characteristic.Brightness)
-        .on('set', (value, callback) => this.internalUpdate('brightness', value, callback))
-    } else if (helpers.devicesColourable.includes(accessory.context.eweUIID)) {
-      lightService.getCharacteristic(this.Characteristic.Brightness)
-        .on('set', (value, callback) => this.internalUpdate('c_brightness', value, callback))
-      if (accessory.context.eweUIID === 22) {
-        lightService
-          .getCharacteristic(this.Characteristic.Brightness)
-          .setProps({
-            minStep: 100
-          })
-      }
-      lightService
-        .getCharacteristic(this.Characteristic.Hue)
-        .on('set', (value, callback) => this.internalUpdate('c_hue', value, callback))
-      lightService.getCharacteristic(this.Characteristic.Saturation).on('set', (value, callback) => callback())
-    }
-    this.accessory = accessory
-  }
-
-  async internalUpdate (type, value, callback) {
-    callback()
-    try {
-      let oAccessory
-      let newRGB
-      let params = {}
-      const lightService = this.accessory.getService(this.Service.Lightbulb)
-      switch (type) {
-        case 'onoff':
-          switch (this.accessory.context.switchNumber) {
-            case 'X':
-              if (this.accessory.context.eweUIID === 22) {
-              //* ** B1 ***\\
-                params.state = value ? 'on' : 'off'
-              } else {
-                params.switch = value ? 'on' : 'off'
-              }
-              break
-            case '0':
-              params.switches = helpers.defaultMultiSwitchOff
-              params.switches[0].switch = value ? 'on' : 'off'
-              params.switches[1].switch = value ? 'on' : 'off'
-              params.switches[2].switch = value ? 'on' : 'off'
-              params.switches[3].switch = value ? 'on' : 'off'
-              break
-            case '1':
-            case '2':
-            case '3':
-            case '4':
-              params.switches = helpers.defaultMultiSwitchOff
-              for (let i = 1; i <= 4; i++) {
-                if ((oAccessory = this.platform.devicesInHB.get(this.accessory.context.eweDeviceId + 'SW' + i))) {
-                  if (i === parseInt(this.accessory.context.switchNumber)) {
-                    params.switches[i - 1].switch = value ? 'on' : 'off'
-                  } else {
-                    params.switches[i - 1].switch = oAccessory.context.cacheOn ? 'on' : 'off'
-                  }
-                } else {
-                  params.switches[i - 1].switch = 'off'
-                }
-              }
-              break
-          }
-          await this.platform.sendDeviceUpdate(this.accessory, params)
-          switch (this.accessory.context.switchNumber) {
-            case '0':
-              for (let i = 0; i <= 4; i++) {
-                if ((oAccessory = this.platform.devicesInHB.get(this.accessory.context.eweDeviceId + 'SW' + i))) {
-                  oAccessory.getService(this.Service.Lightbulb).updateCharacteristic(this.Characteristic.On, value)
-                }
-              }
-              break
-            case '1':
-            case '2':
-            case '3':
-            case '4': {
-              let masterState = 'off'
-              for (let i = 1; i <= 4; i++) {
-                if ((oAccessory = this.platform.devicesInHB.get(this.accessory.context.eweDeviceId + 'SW' + i))) {
-                  if (oAccessory.getService(this.Service.Lightbulb).getCharacteristic(this.Characteristic.On).value) {
-                    masterState = 'on'
-                  }
-                }
-              }
-              if (!this.platform.hiddenMasters.includes(this.accessory.context.eweDeviceId)) {
-                oAccessory = this.platform.devicesInHB.get(this.accessory.context.eweDeviceId + 'SW0')
-                oAccessory.getService(this.Service.Lightbulb).updateCharacteristic(this.Characteristic.On, masterState === 'on')
-              }
-              break
-            }
-          }
-          break
-        case 'brightness': {
-          const updateKey = Math.random().toString(36).substr(2, 8)
-          this.accessory.context.updateKey = updateKey
-          switch (this.accessory.context.eweUIID) {
-            case 36: //* ** KING-M4 ***\\
-              params.bright = Math.round((value * 9) / 10 + 10)
-              break
-            case 44: //* ** D1 ***\\
-              params.brightness = value
-              params.mode = 0
-              break
-          }
-          await helpers.sleep(500)
-          if (updateKey !== this.accessory.context.updateKey) return
-          await this.platform.sendDeviceUpdate(this.accessory, params)
-          break
-        }
-        case 'c_brightness': {
-          const updateKey = Math.random().toString(36).substr(2, 8)
-          this.accessory.context.updateKey = updateKey
-          switch (this.accessory.context.eweUIID) {
-            case 22: //* ** B1 ***\\
-              newRGB = convert.hsv.rgb(
-                lightService.getCharacteristic(this.Characteristic.Hue).value,
-                lightService.getCharacteristic(this.Characteristic.Saturation).value,
-                value
-              )
-              if (newRGB[0] + newRGB[1] + newRGB[2] === 0) return
-              params = {
-                zyx_mode: 2,
-                type: 'middle',
-                channel0: '0',
-                channel1: '0',
-                channel2: newRGB[0].toString(),
-                channel3: newRGB[1].toString(),
-                channel4: newRGB[2].toString()
-              }
-              break
-            case 59: //* ** L1 ***\\
-              params = {
-                mode: 1,
-                bright: value
-              }
-              break
-            case 104:
-              params = {
-                ltype: 'color',
-                color: {
-                  br: value,
-                  r: this.accessory.context.cacheR,
-                  g: this.accessory.context.cacheG,
-                  b: this.accessory.context.cacheB
-                }
-              }
-              break
-          }
-          await helpers.sleep(500)
-          if (updateKey !== this.accessory.context.updateKey) return
-          await this.platform.sendDeviceUpdate(this.accessory, params)
-          break
-        }
-        case 'c_hue': {
-          const updateKey = Math.random().toString(36).substr(2, 8)
-          this.accessory.context.updateKey = updateKey
-          newRGB = convert.hsv.rgb(value, lightService.getCharacteristic(this.Characteristic.Saturation).value, 100)
-          switch (this.accessory.context.eweUIID) {
-            case 22: //* ** B1 ***\\
-              params = {
-                zyx_mode: 2,
-                type: 'middle',
-                channel0: '0',
-                channel1: '0',
-                channel2: newRGB[0].toString(),
-                channel3: newRGB[1].toString(),
-                channel4: newRGB[2].toString()
-              }
-              break
-            case 59: //* ** L1 ***\\
-              params = {
-                mode: 1,
-                colorR: newRGB[0],
-                colorG: newRGB[1],
-                colorB: newRGB[2]
-              }
-              break
-            case 104:
-              params = {
-                ltype: 'color',
-                color: {
-                  r: newRGB[0],
-                  g: newRGB[1],
-                  b: newRGB[2],
-                  br: lightService.getCharacteristic(this.Characteristic.Brightness).value
-                }
-              }
-              this.accessory.context.cacheR = newRGB[0]
-              this.accessory.context.cacheG = newRGB[1]
-              this.accessory.context.cacheB = newRGB[2]
-              break
-          }
-          await helpers.sleep(500)
-          if (updateKey !== this.accessory.context.updateKey) return
-          await this.platform.sendDeviceUpdate(this.accessory, params)
-          break
-        }
-      }
-    } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
-    }
-  }
-
-  async externalUpdate (params) {
-    try {
-      if (
-        helpers.devicesSingleSwitch.includes(this.accessory.context.eweUIID) &&
-        helpers.devicesSingleSwitchLight.includes(this.accessory.context.eweModel)
-      ) {
-        let newColour
-        let mode
-        let isOn = false
-        const lightService = this.accessory.getService(this.Service.Lightbulb)
-        if (this.accessory.context.eweUIID === 22 && helpers.hasProperty(params, 'state')) {
-          isOn = params.state === 'on'
-        } else if (this.accessory.context.eweUIID !== 22 && helpers.hasProperty(params, 'switch')) {
-          isOn = params.switch === 'on'
-        } else {
-          isOn = lightService.getCharacteristic(this.Characteristic.On).value
-        }
-        if (isOn) {
-          lightService.updateCharacteristic(this.Characteristic.On, true)
-          switch (this.accessory.context.eweUIID) {
-            case 36: // KING-M4
-              if (helpers.hasProperty(params, 'bright')) {
-                const nb = Math.round(((params.bright - 10) * 10) / 9) // eWeLink scale is 10-100 and HomeKit scale is 0-100.
-                lightService.updateCharacteristic(this.Characteristic.Brightness, nb)
-              }
-              break
-            case 44: // D1
-              if (helpers.hasProperty(params, 'brightness')) {
-                lightService.updateCharacteristic(this.Characteristic.Brightness, params.brightness)
-              }
-              break
-            case 22: // B1
-              if (helpers.hasProperty(params, 'zyx_mode')) {
-                mode = parseInt(params.zyx_mode)
-              } else if (helpers.hasProperty(params, 'channel0') && parseInt(params.channel0) + parseInt(params.channel1) > 0) {
-                mode = 1
-              } else {
-                mode = 2
-              }
-              if (mode === 2) {
-                newColour = convert.rgb.hsv(
-                  parseInt(params.channel2),
-                  parseInt(params.channel3),
-                  parseInt(params.channel4)
-                )
-                lightService
-                  .updateCharacteristic(this.Characteristic.Hue, newColour[0])
-                  .updateCharacteristic(this.Characteristic.Saturation, 100)
-                  .updateCharacteristic(this.Characteristic.Brightness, 100)
-              }
-              break
-            case 59: // L1
-              if (helpers.hasProperty(params, 'bright')) {
-                lightService.updateCharacteristic(this.Characteristic.Brightness, params.bright)
-              }
-              if (helpers.hasProperty(params, 'colorR')) {
-                newColour = convert.rgb.hsv(params.colorR, params.colorG, params.colorB)
-                lightService
-                  .updateCharacteristic(this.Characteristic.Hue, newColour[0])
-                  .updateCharacteristic(this.Characteristic.Saturation, newColour[1])
-              }
-              break
-            case 104: // GTLC104
-              if (helpers.hasProperty(params, 'updateSource') && params.updateSource === 'LAN') return
-              if (helpers.hasProperty(params, 'ltype')) {
-                mode = params.ltype
-                if (mode === 'color' && helpers.hasProperty(params, 'color')) {
-                  if (helpers.hasProperty(params.color, 'br')) {
-                    lightService.updateCharacteristic(this.Characteristic.Brightness, params.color.br)
-                  }
-                  if (
-                    helpers.hasProperty(params.color, 'r') &&
-                    helpers.hasProperty(params.color, 'g') &&
-                    helpers.hasProperty(params.color, 'b')
-                  ) {
-                    newColour = convert.rgb.hsv(
-                      parseInt(params.color.r),
-                      parseInt(params.color.g),
-                      parseInt(params.color.b)
-                    )
-                    lightService
-                      .updateCharacteristic(this.Characteristic.Hue, newColour[0])
-                      .updateCharacteristic(this.Characteristic.Saturation, 100)
-                    this.accessory.context.cacheR = params.color.r
-                    this.accessory.context.cacheG = params.color.g
-                    this.accessory.context.cacheB = params.color.b
-                  }
-                }
-              }
-              break
-            default:
-              return
-          }
-        } else {
-          lightService.updateCharacteristic(this.Characteristic.On, false)
-        }
-      } else if (
-        helpers.devicesMultiSwitch.includes(this.accessory.context.eweUIID) &&
-        helpers.devicesMultiSwitchLight.includes(this.accessory.context.eweModel)
-      ) {
-        if (!helpers.hasProperty(params, 'switches')) return
-        const idToCheck = this.accessory.context.hbDeviceId.slice(0, -1)
-        let primaryState = false
-        for (let i = 1; i <= this.accessory.context.channelCount; i++) {
-          if (params.switches[i - 1].switch === 'on') {
-            primaryState = true
-          }
-          if (this.platform.devicesInHB.has(idToCheck + i)) {
-            const oAccessory = this.platform.devicesInHB.get(idToCheck + i)
-            oAccessory.context.cacheOn = params.switches[i - 1].switch === 'on'
-            oAccessory
-              .getService(this.Service.Lightbulb)
-              .updateCharacteristic(this.Characteristic.On, params.switches[i - 1].switch === 'on')
-          }
-        }
-        if (!this.platform.hiddenMasters.includes(this.accessory.context.eweDeviceId)) {
-          this.accessory.getService(this.Service.Lightbulb).updateCharacteristic(this.Characteristic.On, primaryState)
-        }
-      }
-    } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, false)
-    }
-  }
-}

From 917bce7d09044bf830747dda1a4cde20a4209af2 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 2 Nov 2020 09:53:57 +0000
Subject: [PATCH 0640/3183] color temp light scaffolding

---
 lib/device/light-ctemp.js | 35 +++++++++++++++++++++++++++++++++++
 lib/ewelink-platform.js   | 14 ++++++++++++++
 lib/helpers.js            |  2 +-
 3 files changed, 50 insertions(+), 1 deletion(-)
 create mode 100644 lib/device/light-ctemp.js

diff --git a/lib/device/light-ctemp.js b/lib/device/light-ctemp.js
new file mode 100644
index 00000000..66fa2e25
--- /dev/null
+++ b/lib/device/light-ctemp.js
@@ -0,0 +1,35 @@
+/* jshint -W014, -W033, esversion: 9 */
+/* eslint-disable new-cap */
+'use strict'
+module.exports = class deviceLightCTemp {
+  constructor (platform, accessory) {
+    this.platform = platform
+    this.Service = platform.api.hap.Service
+    this.Characteristic = platform.api.hap.Characteristic
+    const lightService = accessory.getService(this.Service.Lightbulb) || accessory.addService(this.Service.Lightbulb)
+    lightService
+      .getCharacteristic(this.Characteristic.On)
+      .on('set', (value, callback) => this.internalUpdate('onoff', value, callback))
+    lightService
+      .getCharacteristic(this.Characteristic.Brightness)
+      .on('set', (value, callback) => this.internalUpdate('brightness', value, callback))
+    this.accessory = accessory
+  }
+
+  async internalUpdate (type, value, callback) {
+    callback()
+    try {
+
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, true)
+    }
+  }
+
+  async externalUpdate (params) {
+    try {
+
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, false)
+    }
+  }
+}
diff --git a/lib/ewelink-platform.js b/lib/ewelink-platform.js
index 41cf0f13..84349615 100644
--- a/lib/ewelink-platform.js
+++ b/lib/ewelink-platform.js
@@ -16,6 +16,7 @@ const deviceOutlet = require('./device/outlet')
 const deviceUSB = require('./device/usb')
 const deviceSCM = require('./device/scm')
 const deviceLightColour = require('./device/light-colour')
+const deviceLightCTemp = require('./device/light-ctemp')
 const deviceLightDimmer = require('./device/light-dimmer')
 const deviceLightMulti = require('./device/light-multi')
 const deviceLightSingle = require('./device/light-single')
@@ -294,6 +295,19 @@ module.exports = class eWeLinkPlatform {
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new deviceSCM(this, accessory)
         /********************************/
+      } else if (
+        helpers.devicesSingleSwitch.includes(device.extra.uiid) &&
+        helpers.devicesSingleSwitchLight.includes(device.productModel) &&
+        helpers.devicesCTempable.includes(device.extra.uiid)
+      ) {
+        /**********************
+        LIGHTS [COLOUR TEMP]
+        **********************/
+        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
+          ? this.devicesInHB.get(device.deviceid + 'SWX')
+          : this.addAccessory(device, device.deviceid + 'SWX')
+        accessory.control = new deviceLightCTemp(this, accessory)
+        /*********************/
       } else if (
         helpers.devicesSingleSwitch.includes(device.extra.uiid) &&
         helpers.devicesSingleSwitchLight.includes(device.productModel) &&
diff --git a/lib/helpers.js b/lib/helpers.js
index bc503898..b6878e00 100644
--- a/lib/helpers.js
+++ b/lib/helpers.js
@@ -26,7 +26,7 @@ module.exports = {
   devicesSingleSwitchOutlet: ['Sonoff Pow', 'S20', 'S26', 'S55'],
   devicesBrightable: [36, 44],
   devicesColourable: [22, 59, 104],
-  devicesCTemptable: [],
+  devicesCTempable: [],
   devicesCurtain: [11],
   devicesSensor: [102],
   devicesThermostat: [15],

From 851f1562f7367b81535ce5378e059869c424f4cb Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 2 Nov 2020 15:04:05 +0000
Subject: [PATCH 0641/3183] 3.10.0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 49ea6963..7222477f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.10.0-18",
+  "version": "3.10.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 7b588c2e..6222178d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.10.0-18",
+  "version": "3.10.0",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 8a05f7258e6d2f4905139143b4e47aafaffa7e87 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 3 Nov 2020 13:23:21 +0000
Subject: [PATCH 0642/3183] rethrow errors

---
 lib/ewelink-http.js | 6 +++---
 lib/ewelink-ws.js   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/ewelink-http.js b/lib/ewelink-http.js
index 031f0a06..5b23d67b 100644
--- a/lib/ewelink-http.js
+++ b/lib/ewelink-http.js
@@ -69,7 +69,7 @@ module.exports = class eWeLinkHTTP {
         await helpers.sleep(30000)
         return await this.getHost()
       } else {
-        return err
+        throw err
       }
     }
   }
@@ -186,7 +186,7 @@ module.exports = class eWeLinkHTTP {
         await helpers.sleep(30000)
         await this.getDevices()
       } else {
-        return err
+        throw err
       }
     }
   }
@@ -225,7 +225,7 @@ module.exports = class eWeLinkHTTP {
         await helpers.sleep(30000)
         await this.getDevice(deviceId)
       } else {
-        return err
+        throw err
       }
     }
   }
diff --git a/lib/ewelink-ws.js b/lib/ewelink-ws.js
index ee7f60ef..f04a5bc6 100644
--- a/lib/ewelink-ws.js
+++ b/lib/ewelink-ws.js
@@ -47,7 +47,7 @@ module.exports = class eWeLinkWS {
         await helpers.sleep(30000)
         await this.getHost()
       } else {
-        return err
+        throw err
       }
     }
   }

From 02f7abcda18b2b9f89794f7e1e99f76fa3d5bd8e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 3 Nov 2020 13:24:06 +0000
Subject: [PATCH 0643/3183] support zigbee 1009 type

---
 lib/device/zb-dev.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/device/zb-dev.js b/lib/device/zb-dev.js
index 17ecc7cb..bebe372c 100644
--- a/lib/device/zb-dev.js
+++ b/lib/device/zb-dev.js
@@ -34,6 +34,7 @@ module.exports = class deviceZBDev {
         }
         break
       }
+      case 1009:
       case 1256: {
         if (!accessory.getService(this.Service.Switch)) accessory.addService(this.Service.Switch)
         accessory.log = this.platform.log
@@ -111,6 +112,7 @@ module.exports = class deviceZBDev {
               .updateCharacteristic(this.Characteristic.ProgrammableSwitchEvent, params.key)
           }
           break
+        case 1009:
         case 1256:
           if (helpers.hasProperty(params, 'switch') && ['off', 'on'].includes(params.switch)) {
             this.accessory

From 8ad0aba22f0b5a7e97b6f8a86167f0c07c58508e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 3 Nov 2020 13:34:03 +0000
Subject: [PATCH 0644/3183] commend lengths

---
 lib/ewelink-platform.js | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/lib/ewelink-platform.js b/lib/ewelink-platform.js
index 84349615..ae02129f 100644
--- a/lib/ewelink-platform.js
+++ b/lib/ewelink-platform.js
@@ -300,56 +300,58 @@ module.exports = class eWeLinkPlatform {
         helpers.devicesSingleSwitchLight.includes(device.productModel) &&
         helpers.devicesCTempable.includes(device.extra.uiid)
       ) {
-        /**********************
+        /*******************
         LIGHTS [COLOUR TEMP]
-        **********************/
+        *******************/
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new deviceLightCTemp(this, accessory)
-        /*********************/
+        /******************/
       } else if (
         helpers.devicesSingleSwitch.includes(device.extra.uiid) &&
         helpers.devicesSingleSwitchLight.includes(device.productModel) &&
         helpers.devicesColourable.includes(device.extra.uiid)
       ) {
-        /**********************
+        /******************
         LIGHTS [COLOUR RGB]
-        **********************/
+        ******************/
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new deviceLightColour(this, accessory)
-        /*********************/
+        /*****************/
       } else if (
         helpers.devicesSingleSwitch.includes(device.extra.uiid) &&
         helpers.devicesSingleSwitchLight.includes(device.productModel) &&
         helpers.devicesBrightable.includes(device.extra.uiid)
       ) {
-        /**********************
+        /**************
         LIGHTS [DIMMER]
-        **********************/
+        **************/
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new deviceLightDimmer(this, accessory)
-        /*********************/
+        /*************/
       } else if (helpers.devicesSingleSwitch.includes(device.extra.uiid) && helpers.devicesSingleSwitchLight.includes(device.productModel)) {
-        /**********************
+        /*****************************
         LIGHTS [ON/OFF SINGLE CHANNEL]
-        **********************/
+        *****************************/
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
           : this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new deviceLightSingle(this, accessory)
-        /*********************/
+        accessory.control = (this.config.lightAsSwitch || '').split(',').includes(device.deviceid)
+          ? new deviceSwitch(this, accessory)
+          : new deviceLightSingle(this, accessory)
+        /****************************/
       } else if (
         helpers.devicesMultiSwitch.includes(device.extra.uiid) &&
         helpers.devicesMultiSwitchLight.includes(device.productModel)
       ) {
-        /*********************
+        /****************************
         LIGHTS [ON/OFF MULTI CHANNEL]
-        *********************/
+        ****************************/
         if ((this.config.hideChanFromHB || '').split(',').includes(device.deviceid + 'SW0')) {
           if (this.devicesInHB.has(device.deviceid + 'SW0')) {
             this.removeAccessory(this.devicesInHB.get(device.deviceid + 'SW0'))
@@ -381,7 +383,7 @@ module.exports = class eWeLinkPlatform {
           this.devicesInHB.set(oAccessory.context.hbDeviceId, oAccessory)
           oAccessory.control = new deviceLightMulti(this, oAccessory)
         }
-        /********************/
+        /***********************/
       } else if (helpers.devicesSingleSwitch.includes(device.extra.uiid)) {
         /************************
         SWITCHES [SINGLE CHANNEL]

From ac7a35354664a43a28b783f34c65725bd0725bda Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 3 Nov 2020 13:34:40 +0000
Subject: [PATCH 0645/3183] lights as switch

---
 config.schema.json      |  8 +++++++-
 lib/ewelink-platform.js | 21 +++++++++------------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 0e3b2a8d..27b5f577 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -63,9 +63,14 @@
         "title": "Hide Light/Switch Channels",
         "description": "A list of light/switch channels to hide from Homebridge. For example '10009553c8SW0' or multiple separated with a comma '10009553c8SW0,10009553c9SW2'."
       },
+      "lightAsSwitch": {
+        "type": "string",
+        "title": "Light As Switch (beta)",
+        "description": "A list of eWeLink light switch devices to show as switches in Homebridge. For example '10009553c8' or multiple separated with a comma '10009553c8,10009553c9'"
+      },
       "outletAsSwitch": {
         "type": "string",
-        "title": "Outlets As Switch",
+        "title": "Outlet As Switch",
         "description": "A list of eWeLink outlet devices to show as switches in Homebridge. For example '10009553c8' or multiple separated with a comma '10009553c8,10009553c9'"
       },
       "inUsePowerThreshold": {
@@ -367,6 +372,7 @@
       "items": [
         "hideDevFromHB",
         "hideChanFromHB",
+        "lightAsSwitch",
         "outletAsSwitch",
         "inUsePowerThreshold",
         "hideLightFromFan",
diff --git a/lib/ewelink-platform.js b/lib/ewelink-platform.js
index ae02129f..36cff2e3 100644
--- a/lib/ewelink-platform.js
+++ b/lib/ewelink-platform.js
@@ -256,15 +256,6 @@ module.exports = class eWeLinkPlatform {
           })
         accessory.control = new deviceThermostat(this, accessory)
         /*********/
-      } else if ((this.config.outletAsSwitch || '').split(',').includes(device.deviceid)) {
-        /******************
-        OUTLETS [AS SWITCH]
-        ******************/
-        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
-          ? this.devicesInHB.get(device.deviceid + 'SWX')
-          : this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new deviceSwitch(this, accessory)
-        /***********************/
       } else if (
         helpers.devicesOutlet.includes(device.extra.uiid) ||
         (helpers.devicesSingleSwitch.includes(device.extra.uiid) && helpers.devicesSingleSwitchOutlet.includes(device.productModel))
@@ -275,7 +266,9 @@ module.exports = class eWeLinkPlatform {
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
           : this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new deviceOutlet(this, accessory)
+        accessory.control = (this.config.outletAsSwitch || '').split(',').includes(device.deviceid)
+          ? new deviceSwitch(this, accessory)
+          : new deviceOutlet(this, accessory)
         /*****/
       } else if (helpers.devicesUSB.includes(device.extra.uiid)) {
         /**********
@@ -363,7 +356,9 @@ module.exports = class eWeLinkPlatform {
             ? this.devicesInHB.get(device.deviceid + 'SW0')
             : this.addAccessory(device, device.deviceid + 'SW0')
         }
-        accessory.control = new deviceLightMulti(this, accessory)
+        accessory.control = (this.config.lightAsSwitch || '').split(',').includes(device.deviceid)
+          ? new deviceSwitch(this, accessory)
+          : new deviceLightMulti(this, accessory)
         for (let i = 1; i <= helpers.chansFromUiid[device.extra.uiid]; i++) {
           if ((this.config.hideChanFromHB || '').split(',').includes(device.deviceid + 'SW' + i)) {
             if (this.devicesInHB.has(device.deviceid + 'SW' + i)) {
@@ -381,7 +376,9 @@ module.exports = class eWeLinkPlatform {
           oAccessory.context.reachableWAN = device.online
           oAccessory.context.reachableLAN = this.lanDevices.get(device.deviceid).online || false
           this.devicesInHB.set(oAccessory.context.hbDeviceId, oAccessory)
-          oAccessory.control = new deviceLightMulti(this, oAccessory)
+          oAccessory.control = (this.config.lightAsSwitch || '').split(',').includes(device.deviceid)
+          ? new deviceSwitch(this, oAccessory)
+          : new deviceLightMulti(this, oAccessory)
         }
         /***********************/
       } else if (helpers.devicesSingleSwitch.includes(device.extra.uiid)) {

From d0387f872dd4096790f006a6fbe78deecb80f31a Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 3 Nov 2020 13:35:22 +0000
Subject: [PATCH 0646/3183] formatting

---
 lib/ewelink-platform.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/ewelink-platform.js b/lib/ewelink-platform.js
index 36cff2e3..bacd4862 100644
--- a/lib/ewelink-platform.js
+++ b/lib/ewelink-platform.js
@@ -377,8 +377,8 @@ module.exports = class eWeLinkPlatform {
           oAccessory.context.reachableLAN = this.lanDevices.get(device.deviceid).online || false
           this.devicesInHB.set(oAccessory.context.hbDeviceId, oAccessory)
           oAccessory.control = (this.config.lightAsSwitch || '').split(',').includes(device.deviceid)
-          ? new deviceSwitch(this, oAccessory)
-          : new deviceLightMulti(this, oAccessory)
+            ? new deviceSwitch(this, oAccessory)
+            : new deviceLightMulti(this, oAccessory)
         }
         /***********************/
       } else if (helpers.devicesSingleSwitch.includes(device.extra.uiid)) {

From d8e709cc8f078218e39a648bf647907782c9ad74 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 3 Nov 2020 13:36:06 +0000
Subject: [PATCH 0647/3183] 3.11.0-0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 7222477f..8c0c977c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.10.0",
+  "version": "3.11.0-0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 6222178d..8a3d42db 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.10.0",
+  "version": "3.11.0-0",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 8a6397584f88d0ffea52d0d7bc3b92ef9f27f084 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 3 Nov 2020 13:50:22 +0000
Subject: [PATCH 0648/3183] lights to switches

---
 config.schema.json                        |  6 --
 lib/device/{switch.js => switch-multi.js} | 60 +++++++---------
 lib/device/switch-single.js               | 52 ++++++++++++++
 lib/ewelink-platform.js                   | 85 +++--------------------
 lib/helpers.js                            |  6 --
 5 files changed, 85 insertions(+), 124 deletions(-)
 rename lib/device/{switch.js => switch-multi.js} (69%)
 create mode 100644 lib/device/switch-single.js

diff --git a/config.schema.json b/config.schema.json
index 27b5f577..4d770c92 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -63,11 +63,6 @@
         "title": "Hide Light/Switch Channels",
         "description": "A list of light/switch channels to hide from Homebridge. For example '10009553c8SW0' or multiple separated with a comma '10009553c8SW0,10009553c9SW2'."
       },
-      "lightAsSwitch": {
-        "type": "string",
-        "title": "Light As Switch (beta)",
-        "description": "A list of eWeLink light switch devices to show as switches in Homebridge. For example '10009553c8' or multiple separated with a comma '10009553c8,10009553c9'"
-      },
       "outletAsSwitch": {
         "type": "string",
         "title": "Outlet As Switch",
@@ -372,7 +367,6 @@
       "items": [
         "hideDevFromHB",
         "hideChanFromHB",
-        "lightAsSwitch",
         "outletAsSwitch",
         "inUsePowerThreshold",
         "hideLightFromFan",
diff --git a/lib/device/switch.js b/lib/device/switch-multi.js
similarity index 69%
rename from lib/device/switch.js
rename to lib/device/switch-multi.js
index fee27aff..29a059cf 100644
--- a/lib/device/switch.js
+++ b/lib/device/switch-multi.js
@@ -16,6 +16,9 @@ module.exports = class deviceSwitch {
     if (accessory.getService(this.Service.Outlet)) {
       accessory.removeService(accessory.getService(this.Service.Outlet))
     }
+    if (accessory.getService(this.Service.Lightbulb)) {
+      accessory.removeService(accessory.getService(this.Service.Lightbulb))
+    }
     accessory.log = this.platform.log
     accessory.eveLogger = new this.EveHistoryService('switch', accessory, {
       storage: 'fs',
@@ -30,9 +33,6 @@ module.exports = class deviceSwitch {
       let oAccessory
       const params = {}
       switch (this.accessory.context.switchNumber) {
-        case 'X':
-          params.switch = value ? 'on' : 'off'
-          break
         case '0':
           params.switches = helpers.defaultMultiSwitchOff
           params.switches[0].switch = value ? 'on' : 'off'
@@ -93,44 +93,32 @@ module.exports = class deviceSwitch {
 
   async externalUpdate (params) {
     try {
-      if (
-        helpers.devicesSingleSwitch.includes(this.accessory.context.eweUIID) ||
-        (this.platform.config.outletAsSwitch || '').split(',').includes(this.accessory.context.eweDeviceid)
-      ) {
-        if (!helpers.hasProperty(params, 'switch')) return
-        this.accessory.getService(this.Service.Switch).updateCharacteristic(this.Characteristic.On, params.switch === 'on')
-        this.accessory.eveLogger.addEntry({
-          time: Math.round(new Date().valueOf() / 1000),
-          status: params.switch === 'on' ? 1 : 0
-        })
-      } else if (helpers.devicesMultiSwitch.includes(this.accessory.context.eweUIID)) {
-        if (!helpers.hasProperty(params, 'switches')) return
-        const idToCheck = this.accessory.context.hbDeviceId.slice(0, -1)
-        let primaryState = false
-        for (let i = 1; i <= this.accessory.context.channelCount; i++) {
-          if (params.switches[i - 1].switch === 'on') {
-            primaryState = true
-          }
-          if (this.platform.devicesInHB.has(idToCheck + i)) {
-            const oAccessory = this.platform.devicesInHB.get(idToCheck + i)
-            oAccessory.context.cacheOn = params.switches[i - 1].switch === 'on'
-            oAccessory
-              .getService(this.Service.Switch)
-              .updateCharacteristic(this.Characteristic.On, params.switches[i - 1].switch === 'on')
-            oAccessory.eveLogger.addEntry({
-              time: Math.round(new Date().valueOf() / 1000),
-              status: params.switches[i - 1].switch === 'on' ? 1 : 0
-            })
-          }
+      if (!helpers.hasProperty(params, 'switches')) return
+      const idToCheck = this.accessory.context.hbDeviceId.slice(0, -1)
+      let primaryState = false
+      for (let i = 1; i <= this.accessory.context.channelCount; i++) {
+        if (params.switches[i - 1].switch === 'on') {
+          primaryState = true
         }
-        if (!this.platform.hiddenMasters.includes(this.accessory.context.eweDeviceId)) {
-          this.accessory.getService(this.Service.Switch).updateCharacteristic(this.Characteristic.On, primaryState)
-          this.accessory.eveLogger.addEntry({
+        if (this.platform.devicesInHB.has(idToCheck + i)) {
+          const oAccessory = this.platform.devicesInHB.get(idToCheck + i)
+          oAccessory.context.cacheOn = params.switches[i - 1].switch === 'on'
+          oAccessory
+            .getService(this.Service.Switch)
+            .updateCharacteristic(this.Characteristic.On, params.switches[i - 1].switch === 'on')
+          oAccessory.eveLogger.addEntry({
             time: Math.round(new Date().valueOf() / 1000),
-            status: primaryState ? 1 : 0
+            status: params.switches[i - 1].switch === 'on' ? 1 : 0
           })
         }
       }
+      if (!this.platform.hiddenMasters.includes(this.accessory.context.eweDeviceId)) {
+        this.accessory.getService(this.Service.Switch).updateCharacteristic(this.Characteristic.On, primaryState)
+        this.accessory.eveLogger.addEntry({
+          time: Math.round(new Date().valueOf() / 1000),
+          status: primaryState ? 1 : 0
+        })
+      }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
diff --git a/lib/device/switch-single.js b/lib/device/switch-single.js
new file mode 100644
index 00000000..6026bc74
--- /dev/null
+++ b/lib/device/switch-single.js
@@ -0,0 +1,52 @@
+/* jshint -W014, -W033, esversion: 9 */
+/* eslint-disable new-cap */
+'use strict'
+const fakegato = require('fakegato-history')
+const helpers = require('./../helpers')
+module.exports = class deviceSwitchSingle {
+  constructor (platform, accessory) {
+    this.platform = platform
+    this.Service = platform.api.hap.Service
+    this.Characteristic = platform.api.hap.Characteristic
+    this.EveHistoryService = fakegato(platform.api)
+    const switchService = accessory.getService(this.Service.Switch) || accessory.addService(this.Service.Switch)
+    switchService
+      .getCharacteristic(this.Characteristic.On)
+      .on('set', (value, callback) => this.internalUpdate(value, callback))
+    if (accessory.getService(this.Service.Outlet)) {
+      accessory.removeService(accessory.getService(this.Service.Outlet))
+    }
+    if (accessory.getService(this.Service.Lightbulb)) {
+      accessory.removeService(accessory.getService(this.Service.Lightbulb))
+    }
+    accessory.log = this.platform.log
+    accessory.eveLogger = new this.EveHistoryService('switch', accessory, {
+      storage: 'fs',
+      path: this.platform.eveLogPath
+    })
+    this.accessory = accessory
+  }
+
+  async internalUpdate (value, callback) {
+    callback()
+    try {
+      const params = { switch: value ? 'on' : 'off' }
+      await this.platform.sendDeviceUpdate(this.accessory, params)
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, true)
+    }
+  }
+
+  async externalUpdate (params) {
+    try {
+      if (!helpers.hasProperty(params, 'switch')) return
+      this.accessory.getService(this.Service.Switch).updateCharacteristic(this.Characteristic.On, params.switch === 'on')
+      this.accessory.eveLogger.addEntry({
+        time: Math.round(new Date().valueOf() / 1000),
+        status: params.switch === 'on' ? 1 : 0
+      })
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, false)
+    }
+  }
+}
diff --git a/lib/ewelink-platform.js b/lib/ewelink-platform.js
index bacd4862..b9a65493 100644
--- a/lib/ewelink-platform.js
+++ b/lib/ewelink-platform.js
@@ -18,9 +18,8 @@ const deviceSCM = require('./device/scm')
 const deviceLightColour = require('./device/light-colour')
 const deviceLightCTemp = require('./device/light-ctemp')
 const deviceLightDimmer = require('./device/light-dimmer')
-const deviceLightMulti = require('./device/light-multi')
-const deviceLightSingle = require('./device/light-single')
-const deviceSwitch = require('./device/switch')
+const deviceSwitchMulti = require('./device/switch-multi')
+const deviceSwitchSingle = require('./device/switch-single')
 const deviceRFBridge = require('./device/rf-bridge')
 const deviceZBDev = require('./device/zb-dev')
 const eWeLinkHTTP = require('./ewelink-http')
@@ -267,7 +266,7 @@ module.exports = class eWeLinkPlatform {
           ? this.devicesInHB.get(device.deviceid + 'SWX')
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = (this.config.outletAsSwitch || '').split(',').includes(device.deviceid)
-          ? new deviceSwitch(this, accessory)
+          ? new deviceSwitchSingle(this, accessory)
           : new deviceOutlet(this, accessory)
         /*****/
       } else if (helpers.devicesUSB.includes(device.extra.uiid)) {
@@ -288,11 +287,7 @@ module.exports = class eWeLinkPlatform {
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new deviceSCM(this, accessory)
         /********************************/
-      } else if (
-        helpers.devicesSingleSwitch.includes(device.extra.uiid) &&
-        helpers.devicesSingleSwitchLight.includes(device.productModel) &&
-        helpers.devicesCTempable.includes(device.extra.uiid)
-      ) {
+      } else if (helpers.devicesCTempable.includes(device.extra.uiid)) {
         /*******************
         LIGHTS [COLOUR TEMP]
         *******************/
@@ -301,11 +296,7 @@ module.exports = class eWeLinkPlatform {
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new deviceLightCTemp(this, accessory)
         /******************/
-      } else if (
-        helpers.devicesSingleSwitch.includes(device.extra.uiid) &&
-        helpers.devicesSingleSwitchLight.includes(device.productModel) &&
-        helpers.devicesColourable.includes(device.extra.uiid)
-      ) {
+      } else if (helpers.devicesColourable.includes(device.extra.uiid)) {
         /******************
         LIGHTS [COLOUR RGB]
         ******************/
@@ -314,11 +305,7 @@ module.exports = class eWeLinkPlatform {
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new deviceLightColour(this, accessory)
         /*****************/
-      } else if (
-        helpers.devicesSingleSwitch.includes(device.extra.uiid) &&
-        helpers.devicesSingleSwitchLight.includes(device.productModel) &&
-        helpers.devicesBrightable.includes(device.extra.uiid)
-      ) {
+      } else if (helpers.devicesBrightable.includes(device.extra.uiid)) {
         /**************
         LIGHTS [DIMMER]
         **************/
@@ -327,60 +314,6 @@ module.exports = class eWeLinkPlatform {
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new deviceLightDimmer(this, accessory)
         /*************/
-      } else if (helpers.devicesSingleSwitch.includes(device.extra.uiid) && helpers.devicesSingleSwitchLight.includes(device.productModel)) {
-        /*****************************
-        LIGHTS [ON/OFF SINGLE CHANNEL]
-        *****************************/
-        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
-          ? this.devicesInHB.get(device.deviceid + 'SWX')
-          : this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = (this.config.lightAsSwitch || '').split(',').includes(device.deviceid)
-          ? new deviceSwitch(this, accessory)
-          : new deviceLightSingle(this, accessory)
-        /****************************/
-      } else if (
-        helpers.devicesMultiSwitch.includes(device.extra.uiid) &&
-        helpers.devicesMultiSwitchLight.includes(device.productModel)
-      ) {
-        /****************************
-        LIGHTS [ON/OFF MULTI CHANNEL]
-        ****************************/
-        if ((this.config.hideChanFromHB || '').split(',').includes(device.deviceid + 'SW0')) {
-          if (this.devicesInHB.has(device.deviceid + 'SW0')) {
-            this.removeAccessory(this.devicesInHB.get(device.deviceid + 'SW0'))
-          }
-          this.hiddenMasters.push(device.deviceid)
-          accessory = this.addAccessory(device, device.deviceid + 'SW0', true)
-        } else {
-          accessory = this.devicesInHB.has(device.deviceid + 'SW0')
-            ? this.devicesInHB.get(device.deviceid + 'SW0')
-            : this.addAccessory(device, device.deviceid + 'SW0')
-        }
-        accessory.control = (this.config.lightAsSwitch || '').split(',').includes(device.deviceid)
-          ? new deviceSwitch(this, accessory)
-          : new deviceLightMulti(this, accessory)
-        for (let i = 1; i <= helpers.chansFromUiid[device.extra.uiid]; i++) {
-          if ((this.config.hideChanFromHB || '').split(',').includes(device.deviceid + 'SW' + i)) {
-            if (this.devicesInHB.has(device.deviceid + 'SW' + i)) {
-              this.removeAccessory(this.devicesInHB.get(device.deviceid + 'SW' + i))
-            }
-            oAccessory = this.addAccessory(device, device.deviceid + 'SW' + i, true)
-          } else {
-            oAccessory = this.devicesInHB.has(device.deviceid + 'SW' + i)
-              ? this.devicesInHB.get(device.deviceid + 'SW' + i)
-              : this.addAccessory(device, device.deviceid + 'SW' + i)
-            oAccessory
-              .getService(this.Service.AccessoryInformation)
-              .setCharacteristic(this.Characteristic.FirmwareRevision, device.params.fwVersion)
-          }
-          oAccessory.context.reachableWAN = device.online
-          oAccessory.context.reachableLAN = this.lanDevices.get(device.deviceid).online || false
-          this.devicesInHB.set(oAccessory.context.hbDeviceId, oAccessory)
-          oAccessory.control = (this.config.lightAsSwitch || '').split(',').includes(device.deviceid)
-            ? new deviceSwitch(this, oAccessory)
-            : new deviceLightMulti(this, oAccessory)
-        }
-        /***********************/
       } else if (helpers.devicesSingleSwitch.includes(device.extra.uiid)) {
         /************************
         SWITCHES [SINGLE CHANNEL]
@@ -388,7 +321,7 @@ module.exports = class eWeLinkPlatform {
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
           : this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new deviceSwitch(this, accessory)
+        accessory.control = new deviceSwitchSingle(this, accessory)
         /***********************/
       } else if (helpers.devicesMultiSwitch.includes(device.extra.uiid)) {
         /***********************
@@ -405,7 +338,7 @@ module.exports = class eWeLinkPlatform {
             ? this.devicesInHB.get(device.deviceid + 'SW0')
             : this.addAccessory(device, device.deviceid + 'SW0')
         }
-        accessory.control = new deviceSwitch(this, accessory)
+        accessory.control = new deviceSwitchMulti(this, accessory)
         for (let i = 1; i <= helpers.chansFromUiid[device.extra.uiid]; i++) {
           if ((this.config.hideChanFromHB || '').split(',').includes(device.deviceid + 'SW' + i)) {
             if (this.devicesInHB.has(device.deviceid + 'SW' + i)) {
@@ -423,7 +356,7 @@ module.exports = class eWeLinkPlatform {
           oAccessory.context.reachableWAN = device.online
           oAccessory.context.reachableLAN = this.lanDevices.get(device.deviceid).online || false
           this.devicesInHB.set(oAccessory.context.hbDeviceId, oAccessory)
-          oAccessory.control = new deviceSwitch(this, oAccessory)
+          oAccessory.control = new deviceSwitchMulti(this, oAccessory)
         }
         /**********************/
       } else if (helpers.devicesRFBridge.includes(device.extra.uiid)) {
diff --git a/lib/helpers.js b/lib/helpers.js
index b6878e00..23eef1df 100644
--- a/lib/helpers.js
+++ b/lib/helpers.js
@@ -17,12 +17,6 @@ module.exports = {
   devicesNonLAN: [22, 28, 34, 59, 102, 104],
   devicesSingleSwitch: [1, 5, 6, 14, 15, 22, 24, 27, 32, 36, 44, 59, 104],
   devicesMultiSwitch: [2, 3, 4, 7, 8, 9, 29, 30, 31, 34, 41],
-  devicesSingleSwitchLight: [
-    'T1 1C', 'L1', 'B1', 'B1_R2',
-    'TX1C', 'D1', 'D1R1', 'KING-M4',
-    'Slampher', 'GTTA59', 'GTLC104'
-  ],
-  devicesMultiSwitchLight: ['T1 2C', 'T1 3C', 'TX2C', 'TX3C'],
   devicesSingleSwitchOutlet: ['Sonoff Pow', 'S20', 'S26', 'S55'],
   devicesBrightable: [36, 44],
   devicesColourable: [22, 59, 104],

From 32f7b88e5ac0714fc973611ac7541759d80a6641 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 3 Nov 2020 13:55:34 +0000
Subject: [PATCH 0649/3183] 3.11.0-1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 8c0c977c..34e69696 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.11.0-0",
+  "version": "3.11.0-1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 8a3d42db..5ca254fc 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.11.0-0",
+  "version": "3.11.0-1",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 3e9cf875a093aa7764ef7d877fffbb49a4a21567 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 3 Nov 2020 14:17:37 +0000
Subject: [PATCH 0650/3183] add zb 1009 to permitted

---
 lib/helpers.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/helpers.js b/lib/helpers.js
index 23eef1df..2cdc67b1 100644
--- a/lib/helpers.js
+++ b/lib/helpers.js
@@ -31,7 +31,7 @@ module.exports = {
   devicesSCM: [78],
   devicesRFBridge: [28],
   devicesZBBridge: [66],
-  devicesZB: [1000, 1256, 1770, 2026, 3026],
+  devicesZB: [1000, 1009, 1256, 1770, 2026, 3026],
   paramsToKeep: [
     'battery', 'bright', 'brightness',
     'channel', 'cmd', 'color', 'colorB',

From 7f8afe050bd2a533318a3e60e0ef9605058b1ed7 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 3 Nov 2020 14:17:52 +0000
Subject: [PATCH 0651/3183] code style, no changes

---
 lib/ewelink-platform.js | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/lib/ewelink-platform.js b/lib/ewelink-platform.js
index b9a65493..d490a3f5 100644
--- a/lib/ewelink-platform.js
+++ b/lib/ewelink-platform.js
@@ -633,12 +633,11 @@ module.exports = class eWeLinkPlatform {
       }
     } else {
       try {
-        if (!(this.config.hideDevFromHB || '').includes(deviceId)) {
-          this.log.warn('[%s] %s update received for new device which will be added.', deviceId, device.params.updateSource)
-          const newDevice = await this.httpClient.getDevice(deviceId)
-          this.initialiseDevice(newDevice)
-          this.lanClient.addDeviceToMap(newDevice)
-        }
+        if ((this.config.hideDevFromHB || '').includes(deviceId)) return
+        this.log.warn('[%s] %s update received for new device which will be added.', deviceId, device.params.updateSource)
+        const newDevice = await this.httpClient.getDevice(deviceId)
+        this.initialiseDevice(newDevice)
+        this.lanClient.addDeviceToMap(newDevice)
       } catch (err) {
         this.log.warn('[%s] error getting info [%s]. Restart Homebridge to add device.', deviceId, err.message)
       }

From 7f60a4f7ecc0cf0e2b6c4108676da64e963e24b7 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 3 Nov 2020 14:18:50 +0000
Subject: [PATCH 0652/3183] 3.11.0-2

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 34e69696..75944394 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.11.0-1",
+  "version": "3.11.0-2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 5ca254fc..14cedf97 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.11.0-1",
+  "version": "3.11.0-2",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From c735853edede16fd4e2f2c24bea3c065864b62c5 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 3 Nov 2020 19:35:43 +0000
Subject: [PATCH 0653/3183] returns

---
 lib/ewelink-http.js | 8 ++++----
 lib/ewelink-ws.js   | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/ewelink-http.js b/lib/ewelink-http.js
index 5b23d67b..87df8917 100644
--- a/lib/ewelink-http.js
+++ b/lib/ewelink-http.js
@@ -121,7 +121,7 @@ module.exports = class eWeLinkHTTP {
           throw new Error('No valid region received - [' + givenRegion + '].')
       }
       if (this.debug) this.log('New HTTP API host received [%s].', this.httpHost)
-      await this.login()
+      return await this.login()
     } else {
       if (body.data.at) {
         this.aToken = body.data.at
@@ -135,7 +135,7 @@ module.exports = class eWeLinkHTTP {
         if (body.error === 500) {
           if (this.debug) this.log.warn('An eWeLink error [500] occured. Retrying in 30 seconds.')
           await helpers.sleep(30000)
-          await this.login()
+          return await this.login()
         } else {
           throw new Error('No auth token received.\n' + JSON.stringify(body, null, 2))
         }
@@ -184,7 +184,7 @@ module.exports = class eWeLinkHTTP {
       if (helpers.hasProperty(err, 'code') && helpers.httpRetryCodes.includes(err.code)) {
         if (this.debug) this.log.warn('Unable to reach eWeLink. Retrying in 30 seconds.')
         await helpers.sleep(30000)
-        await this.getDevices()
+        return await this.getDevices()
       } else {
         throw err
       }
@@ -223,7 +223,7 @@ module.exports = class eWeLinkHTTP {
       if (helpers.hasProperty(err, 'code') && helpers.httpRetryCodes.includes(err.code)) {
         if (this.debug) this.log.warn('Unable to reach eWeLink. Retrying in 30 seconds.')
         await helpers.sleep(30000)
-        await this.getDevice(deviceId)
+        return await this.getDevice(deviceId)
       } else {
         throw err
       }
diff --git a/lib/ewelink-ws.js b/lib/ewelink-ws.js
index f04a5bc6..88c78b84 100644
--- a/lib/ewelink-ws.js
+++ b/lib/ewelink-ws.js
@@ -45,7 +45,7 @@ module.exports = class eWeLinkWS {
       if (helpers.hasProperty(err, 'code') && helpers.httpRetryCodes.includes(err.code)) {
         if (this.debug) this.log.warn('Unable to reach eWeLink. Retrying in 30 seconds.')
         await helpers.sleep(30000)
-        await this.getHost()
+        return await this.getHost()
       } else {
         throw err
       }

From c18e4f93e8a1c17e775aa94dcfca1fb4be7f287c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 3 Nov 2020 19:37:44 +0000
Subject: [PATCH 0654/3183] check for authData

---
 lib/ewelink-platform.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/ewelink-platform.js b/lib/ewelink-platform.js
index d490a3f5..618cd2dd 100644
--- a/lib/ewelink-platform.js
+++ b/lib/ewelink-platform.js
@@ -73,6 +73,7 @@ module.exports = class eWeLinkPlatform {
       this.httpClient = new eWeLinkHTTP(this.config, this.log)
       await this.httpClient.getHost()
       this.authData = await this.httpClient.login()
+      if (this.authData === undefined) throw new Error('No auth data received from eWeLink.')
       const deviceList = await this.httpClient.getDevices()
       deviceList.forEach(device => this.devicesInEW.set(device.deviceid, device))
       this.wsClient = new eWeLinkWS(this.config, this.log, this.authData)

From 9f9fddedff72878413cd60f2be23bbf80c103083 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 3 Nov 2020 19:39:23 +0000
Subject: [PATCH 0655/3183] 3.11.0-3

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 75944394..e38819ec 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.11.0-2",
+  "version": "3.11.0-3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 14cedf97..52500b1c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.11.0-2",
+  "version": "3.11.0-3",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 2ed38e0c98a3e24338c76498fe8bbd004f6c55ac Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 3 Nov 2020 20:04:44 +0000
Subject: [PATCH 0656/3183] remove log line

---
 lib/ewelink-platform.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/ewelink-platform.js b/lib/ewelink-platform.js
index 618cd2dd..faa90cfb 100644
--- a/lib/ewelink-platform.js
+++ b/lib/ewelink-platform.js
@@ -635,7 +635,6 @@ module.exports = class eWeLinkPlatform {
     } else {
       try {
         if ((this.config.hideDevFromHB || '').includes(deviceId)) return
-        this.log.warn('[%s] %s update received for new device which will be added.', deviceId, device.params.updateSource)
         const newDevice = await this.httpClient.getDevice(deviceId)
         this.initialiseDevice(newDevice)
         this.lanClient.addDeviceToMap(newDevice)

From 947b57418bc4be46d22cda887a7aa03db8a18604 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 3 Nov 2020 20:17:19 +0000
Subject: [PATCH 0657/3183] reword log message

---
 lib/ewelink-platform.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ewelink-platform.js b/lib/ewelink-platform.js
index faa90cfb..a085a52a 100644
--- a/lib/ewelink-platform.js
+++ b/lib/ewelink-platform.js
@@ -639,7 +639,7 @@ module.exports = class eWeLinkPlatform {
         this.initialiseDevice(newDevice)
         this.lanClient.addDeviceToMap(newDevice)
       } catch (err) {
-        this.log.warn('[%s] error getting info [%s]. Restart Homebridge to add device.', deviceId, err.message)
+        this.log.warn('[%s] Restart Homebridge to add new device, failed to add automatically as %s.', deviceId, err.message)
       }
     }
   }

From 03687066c0bdbf2bb878ede9b0039c42d84be389 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 3 Nov 2020 21:55:46 +0000
Subject: [PATCH 0658/3183] fakegato in lib

---
 lib/device/outlet.js             |   2 +-
 lib/device/rf-bridge.js          |   2 +-
 lib/device/scm.js                |   2 +-
 lib/device/sensor.js             |   2 +-
 lib/device/switch-multi.js       |   2 +-
 lib/device/switch-single.js      |   2 +-
 lib/device/thermostat.js         |   2 +-
 lib/device/usb.js                |   2 +-
 lib/device/zb-dev.js             |   2 +-
 lib/fakegato/LICENSE             |  21 +
 lib/fakegato/fakegato-history.js | 847 +++++++++++++++++++++++++++++++
 lib/fakegato/fakegato-storage.js | 173 +++++++
 lib/fakegato/fakegato-timer.js   | 133 +++++
 lib/fakegato/uuid.js             |  25 +
 package-lock.json                |  20 -
 package.json                     |   1 -
 16 files changed, 1208 insertions(+), 30 deletions(-)
 create mode 100644 lib/fakegato/LICENSE
 create mode 100644 lib/fakegato/fakegato-history.js
 create mode 100644 lib/fakegato/fakegato-storage.js
 create mode 100644 lib/fakegato/fakegato-timer.js
 create mode 100644 lib/fakegato/uuid.js

diff --git a/lib/device/outlet.js b/lib/device/outlet.js
index d3064231..72339905 100644
--- a/lib/device/outlet.js
+++ b/lib/device/outlet.js
@@ -1,7 +1,7 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
-const fakegato = require('fakegato-history')
+const fakegato = require('./../fakegato/fakegato-history')
 const helpers = require('./../helpers')
 const util = require('util')
 module.exports = class deviceOutlet {
diff --git a/lib/device/rf-bridge.js b/lib/device/rf-bridge.js
index 9007f8d9..f5f61a00 100644
--- a/lib/device/rf-bridge.js
+++ b/lib/device/rf-bridge.js
@@ -1,7 +1,7 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
-const fakegato = require('fakegato-history')
+const fakegato = require('./../fakegato/fakegato-history')
 const helpers = require('./../helpers')
 module.exports = class deviceRFBridge {
   constructor (platform, accessory) {
diff --git a/lib/device/scm.js b/lib/device/scm.js
index 55fd2ef8..fc8c339c 100644
--- a/lib/device/scm.js
+++ b/lib/device/scm.js
@@ -1,7 +1,7 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
-const fakegato = require('fakegato-history')
+const fakegato = require('./../fakegato/fakegato-history')
 const helpers = require('./../helpers')
 module.exports = class deviceSCM {
   constructor (platform, accessory) {
diff --git a/lib/device/sensor.js b/lib/device/sensor.js
index befaa3f3..50c5816e 100644
--- a/lib/device/sensor.js
+++ b/lib/device/sensor.js
@@ -1,7 +1,7 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
-const fakegato = require('fakegato-history')
+const fakegato = require('./../fakegato/fakegato-history')
 const helpers = require('./../helpers')
 module.exports = class deviceSensor {
   constructor (platform, accessory) {
diff --git a/lib/device/switch-multi.js b/lib/device/switch-multi.js
index 29a059cf..4722b0d9 100644
--- a/lib/device/switch-multi.js
+++ b/lib/device/switch-multi.js
@@ -1,7 +1,7 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
-const fakegato = require('fakegato-history')
+const fakegato = require('./../fakegato/fakegato-history')
 const helpers = require('./../helpers')
 module.exports = class deviceSwitch {
   constructor (platform, accessory) {
diff --git a/lib/device/switch-single.js b/lib/device/switch-single.js
index 6026bc74..90c7cbf6 100644
--- a/lib/device/switch-single.js
+++ b/lib/device/switch-single.js
@@ -1,7 +1,7 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
-const fakegato = require('fakegato-history')
+const fakegato = require('./../fakegato/fakegato-history')
 const helpers = require('./../helpers')
 module.exports = class deviceSwitchSingle {
   constructor (platform, accessory) {
diff --git a/lib/device/thermostat.js b/lib/device/thermostat.js
index cd969a20..2f2216d7 100644
--- a/lib/device/thermostat.js
+++ b/lib/device/thermostat.js
@@ -1,7 +1,7 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
-const fakegato = require('fakegato-history')
+const fakegato = require('./../fakegato/fakegato-history')
 const helpers = require('./../helpers')
 module.exports = class deviceThermostat {
   constructor (platform, accessory) {
diff --git a/lib/device/usb.js b/lib/device/usb.js
index d00664aa..ccc96e56 100644
--- a/lib/device/usb.js
+++ b/lib/device/usb.js
@@ -1,7 +1,7 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
-const fakegato = require('fakegato-history')
+const fakegato = require('./../fakegato/fakegato-history')
 const helpers = require('./../helpers')
 module.exports = class deviceUSB {
   constructor (platform, accessory) {
diff --git a/lib/device/zb-dev.js b/lib/device/zb-dev.js
index bebe372c..4445ee3b 100644
--- a/lib/device/zb-dev.js
+++ b/lib/device/zb-dev.js
@@ -1,7 +1,7 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
-const fakegato = require('fakegato-history')
+const fakegato = require('./../fakegato/fakegato-history')
 const helpers = require('./../helpers')
 module.exports = class deviceZBDev {
   constructor (platform, accessory) {
diff --git a/lib/fakegato/LICENSE b/lib/fakegato/LICENSE
new file mode 100644
index 00000000..1e9cf844
--- /dev/null
+++ b/lib/fakegato/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2017 simont77
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/lib/fakegato/fakegato-history.js b/lib/fakegato/fakegato-history.js
new file mode 100644
index 00000000..7b0d19d0
--- /dev/null
+++ b/lib/fakegato/fakegato-history.js
@@ -0,0 +1,847 @@
+/*jshint esversion: 6,node: true,-W041: false */
+'use strict';
+
+const Format = require('util').format;
+const FakeGatoTimer = require('./fakegato-timer').FakeGatoTimer;
+const FakeGatoStorage = require('./fakegato-storage').FakeGatoStorage;
+
+const EPOCH_OFFSET = 978307200;
+
+const TYPE_ENERGY = 'energy',
+	TYPE_ROOM = 'room',
+	TYPE_WEATHER = 'weather',
+	TYPE_DOOR = 'door',
+	TYPE_MOTION = 'motion',
+	TYPE_SWITCH = 'switch',
+	TYPE_THERMO = 'thermo',
+	TYPE_AQUA = 'aqua',
+	TYPE_CUSTOM = 'custom';
+
+var homebridge;
+var Characteristic, Service;
+
+module.exports = function (pHomebridge) {
+	if (pHomebridge && !homebridge) {
+		homebridge = pHomebridge;
+		Characteristic = homebridge.hap.Characteristic;
+		Service = homebridge.hap.Service;
+	}
+
+
+	var hexToBase64 = function (val) {
+		return Buffer.from(('' + val).replace(/[^0-9A-F]/ig, ''), 'hex').toString('base64');
+	},
+		base64ToHex = function (val) {
+			if (!val)
+				return val;
+			return Buffer.from(val, 'base64').toString('hex');
+		},
+		swap16 = function (val) {
+			return ((val & 0xFF) << 8)
+				| ((val >>> 8) & 0xFF);
+		},
+		swap32 = function (val) {
+			return ((val & 0xFF) << 24)
+				| ((val & 0xFF00) << 8)
+				| ((val >>> 8) & 0xFF00)
+				| ((val >>> 24) & 0xFF);
+		},
+		hexToHPA = function (val) { //unused
+			return parseInt(swap16(val), 10);
+		},
+		hPAtoHex = function (val) { //unused
+			return swap16(Math.round(val)).toString(16);
+		},
+		numToHex = function (val, len) {
+			var s = Number(val >>> 0).toString(16);
+			if (s.length % 2 != 0) {
+				s = '0' + s;
+			}
+			if (len) {
+				return ('0000000000000' + s).slice(-1 * len);
+			}
+			return s;
+		},
+		ucfirst = function (val) {
+			return val.charAt(0).toUpperCase() + val.substr(1);
+		},
+		precisionRound = function (number, precision) {
+			var factor = Math.pow(10, precision);
+			return Math.round(number * factor) / factor;
+		};
+
+	class S2R1Characteristic extends Characteristic {
+		constructor() {
+			super('S2R1', S2R1Characteristic.UUID);
+			this.setProps({
+				format: Characteristic.Formats.DATA,
+				perms: [
+					Characteristic.Perms.READ, Characteristic.Perms.NOTIFY, Characteristic.Perms.HIDDEN
+				]
+			});
+		}
+	}
+
+	S2R1Characteristic.UUID = 'E863F116-079E-48FF-8F27-9C2605A29F52';
+
+	class S2R2Characteristic extends Characteristic {
+		constructor() {
+			super('S2R2', S2R2Characteristic.UUID);
+			this.setProps({
+				format: Characteristic.Formats.DATA,
+				perms: [
+					Characteristic.Perms.READ, Characteristic.Perms.NOTIFY, Characteristic.Perms.HIDDEN
+				]
+			});
+		}
+	}
+
+	S2R2Characteristic.UUID = 'E863F117-079E-48FF-8F27-9C2605A29F52';
+
+	class S2W1Characteristic extends Characteristic {
+		constructor() {
+			super('S2W1', S2W1Characteristic.UUID);
+			this.setProps({
+				format: Characteristic.Formats.DATA,
+				perms: [
+					Characteristic.Perms.WRITE, Characteristic.Perms.HIDDEN
+				]
+			});
+		}
+	}
+
+	S2W1Characteristic.UUID = 'E863F11C-079E-48FF-8F27-9C2605A29F52';
+
+	class S2W2Characteristic extends Characteristic {
+		constructor() {
+			super('S2W2', S2W2Characteristic.UUID);
+			this.setProps({
+				format: Characteristic.Formats.DATA,
+				perms: [
+					Characteristic.Perms.WRITE, Characteristic.Perms.HIDDEN
+				]
+			});
+		}
+	}
+
+	S2W2Characteristic.UUID = 'E863F121-079E-48FF-8F27-9C2605A29F52';
+
+	class FakeGatoHistoryService extends Service {
+		constructor(displayName, subtype) {
+			super(displayName, FakeGatoHistoryService.UUID, subtype);
+
+			this.addCharacteristic(S2R1Characteristic);
+			this.addCharacteristic(S2R2Characteristic);
+			this.addCharacteristic(S2W1Characteristic);
+			this.addCharacteristic(S2W2Characteristic);
+		}
+	}
+
+	FakeGatoHistoryService.UUID = 'E863F007-079E-48FF-8F27-9C2605A29F52';
+	var thisAccessory = {};
+	class FakeGatoHistory extends Service {
+		constructor(accessoryType, accessory, optionalParams) {
+
+			super(accessory.displayName + " History", FakeGatoHistoryService.UUID);
+
+			var entry2address = function (val) { // not used ?
+				var temp = val % this.memorySize;
+				return temp;
+			}.bind(this);
+
+			thisAccessory = accessory;
+			this.accessoryName = thisAccessory.displayName;
+			this.signatures = [];
+			this.uuid = require('./uuid.js');
+
+			if (typeof (optionalParams) === 'object') {
+				this.size = optionalParams.size || 4032;
+				this.minutes = optionalParams.minutes || 10; // Optional timer length
+				this.storage = optionalParams.storage; // 'fs' or 'googleDrive'
+				this.path = optionalParams.path || optionalParams.folder || (this.storage == 'fs' ? homebridge.user.storagePath() : undefined);
+				this.filename = optionalParams.filename;
+				this.disableTimer = optionalParams.disableTimer || false;
+				this.disableRepeatLastData = optionalParams.disableRepeatLastData || false;
+				this.log = optionalParams.log || thisAccessory.log || {};		// workaround for typescript blocking of changing of accessory object definition
+			} else {
+				this.size = 4032;
+				this.minutes = 10;
+				this.disableTimer = false;
+				this.log = thisAccessory.log || {};
+			}
+
+			if (!this.log.debug) {
+				this.log.debug = function () { };
+			}
+
+			if (!this.disableTimer) {
+				if (homebridge.globalFakeGatoTimer === undefined)
+					homebridge.globalFakeGatoTimer = new FakeGatoTimer({
+						minutes: this.minutes,
+						log: this.log
+					});
+			}
+
+			if (this.storage !== undefined) {
+				this.loaded = false;
+				if (homebridge.globalFakeGatoStorage === undefined) {
+					homebridge.globalFakeGatoStorage = new FakeGatoStorage({
+						log: this.log
+					});
+				}
+				homebridge.globalFakeGatoStorage.addWriter(this, {
+					storage: this.storage,
+					path: this.path,
+					filename: this.filename,
+					keyPath: optionalParams.keyPath || homebridge.user.storagePath() || undefined,
+					onReady: function () {
+
+						this.load(function (err, loaded) {
+							//this.log.debug("Loaded",loaded);
+							//this.registerEvents();
+							if (err) this.log.debug('Load error :', err);
+							else {
+								if (loaded) this.log.debug('History Loaded from Persistant Storage');
+								this.loaded = true;
+							}
+						}.bind(this));
+					}.bind(this)
+				});
+			}
+
+
+			switch (accessoryType) {
+				case TYPE_WEATHER:
+					this.accessoryType116 = "03 0102 0202 0302";
+					this.accessoryType117 = "07";
+					if (!this.disableTimer) {
+						homebridge.globalFakeGatoTimer.subscribe(this, this.calculateAverage);
+					}
+					break;
+				case TYPE_ENERGY:
+					this.accessoryType116 = "04 0102 0202 0702 0f03";
+					this.accessoryType117 = "1f";
+					if (!this.disableTimer) {
+						homebridge.globalFakeGatoTimer.subscribe(this, this.calculateAverage);
+					}
+					break;
+				case TYPE_ROOM:
+					this.accessoryType116 = "04 0102 0202 0402 0f03";
+					this.accessoryType117 = "0f";
+					if (!this.disableTimer) {
+						homebridge.globalFakeGatoTimer.subscribe(this, this.calculateAverage);
+					}
+					break;
+				case TYPE_DOOR:
+					this.accessoryType116 = "01 0601";
+					this.accessoryType117 = "01";
+					if (!this.disableTimer) {
+						homebridge.globalFakeGatoTimer.subscribe(this, function (params) { // callback
+							var backLog = params.backLog || [];
+							var immediate = params.immediate;
+
+							var fakegato = this.service;
+							var actualEntry = {};
+
+							if (backLog.length) {
+								if (!immediate) {
+									actualEntry.time = Math.round(new Date().valueOf() / 1000);
+									actualEntry.status = backLog[0].status;
+								}
+								else {
+									actualEntry.time = backLog[0].time;
+									actualEntry.status = backLog[0].status;
+								}
+								fakegato.log.debug('**Fakegato-timer callbackDoor: ', fakegato.accessoryName, ', immediate: ', immediate, ', entry: ', actualEntry);
+
+								fakegato._addEntry(actualEntry);
+							}
+						});
+					}
+					break;
+				case TYPE_MOTION:
+					this.accessoryType116 = "02 1301 1c01";
+					this.accessoryType117 = "02";
+					if (!this.disableTimer) {
+						homebridge.globalFakeGatoTimer.subscribe(this, function (params) { // callback
+							var backLog = params.backLog || [];
+							var immediate = params.immediate;
+
+							var fakegato = this.service;
+							var actualEntry = {};
+
+							if (backLog.length) {
+								if (!immediate) {
+									actualEntry.time = Math.round(new Date().valueOf() / 1000);
+									actualEntry.status = backLog[0].status;
+								}
+								else {
+									actualEntry.time = backLog[0].time;
+									actualEntry.status = backLog[0].status;
+								}
+								fakegato.log.debug('**Fakegato-timer callbackMotion: ', fakegato.accessoryName, ', immediate: ', immediate, ', entry: ', actualEntry);
+
+								fakegato._addEntry(actualEntry);
+							}
+						});
+					}
+					break;
+				case TYPE_SWITCH:
+					this.accessoryType116 = "01 0e01";
+					this.accessoryType117 = "01";
+					if (!this.disableTimer) {
+						homebridge.globalFakeGatoTimer.subscribe(this, function (params) { // callback
+							var backLog = params.backLog || [];
+							var immediate = params.immediate;
+
+							var fakegato = this.service;
+							var actualEntry = {};
+
+							if (backLog.length) {
+								if (!immediate) {
+									actualEntry.time = Math.round(new Date().valueOf() / 1000);
+									actualEntry.status = backLog[0].status;
+								}
+								else {
+									actualEntry.time = backLog[0].time;
+									actualEntry.status = backLog[0].status;
+								}
+								fakegato.log.debug('**Fakegato-timer callbackSwitch: ', fakegato.accessoryName, ', immediate: ', immediate, ', entry: ', actualEntry);
+
+								fakegato._addEntry(actualEntry);
+							}
+						});
+					}
+					break;
+				case TYPE_CUSTOM:
+					thisAccessory.services.forEach((service, i) => {
+						service.characteristics.forEach((characteristic, i) => {
+							// console.log('  characteristics', characteristic.displayName, characteristic.UUID);
+							switch(this.uuid.toLongFormUUID(characteristic.UUID)) {
+								case Characteristic.CurrentTemperature.UUID: // Temperature
+									this.signatures.push({ signature: '0102', length: 4, uuid: this.uuid.toShortFormUUID(characteristic.UUID), factor: 100, entry: "temp" });
+									break;
+								case Characteristic.CurrentRelativeHumidity.UUID: // Humidity
+									this.signatures.push({ signature: '0202', length: 4, uuid: this.uuid.toShortFormUUID(characteristic.UUID), factor: 100, entry: "humidity" });
+									break;
+								case 'E863F10F-079E-48FF-8F27-9C2605A29F52': // CustomCharacteristic.AtmosphericPressureLevel.UUID
+									this.signatures.push({ signature: '0302', length: 4, uuid: this.uuid.toShortFormUUID(characteristic.UUID), factor: 10, entry: "pressure" });
+									break;
+								case 'E863F10B-079E-48FF-8F27-9C2605A29F52': // PPM
+									this.signatures.push({ signature: '0702', length: 4, uuid: this.uuid.toShortFormUUID(characteristic.UUID), factor: 10, entry: "ppm" });
+									break;
+								case Characteristic.ContactSensorState.UUID: // Contact Sensor State
+									this.signatures.push({ signature: '0601', length: 2, uuid: this.uuid.toShortFormUUID(characteristic.UUID), factor: 1, entry: "contact" });
+									break;
+								case 'E863F10D-079E-48FF-8F27-9C2605A29F52': // Power
+									this.signatures.push({ signature: '0702', length: 4, uuid: this.uuid.toShortFormUUID(characteristic.UUID), factor: 10, entry: "power" });
+									break;
+								case Characteristic.On.UUID: // Switch On
+									this.signatures.push({ signature: '0e01', length: 2, uuid: this.uuid.toShortFormUUID(characteristic.UUID), factor: 1, entry: "status" });
+									break;
+								case Characteristic.MotionDetected.UUID: // Motion Detected
+									this.signatures.push({ signature: '1c01', length: 2, uuid: this.uuid.toShortFormUUID(characteristic.UUID), factor: 1, entry: "motion" });
+									break;
+								}
+							});
+						});
+						this.accessoryType116 = (' 0' + this.signatures.length.toString() + ' ' + this.signatures.sort((a, b) => (a.signature > b.signature) ? 1 : -1).map(a => a.signature).join(' ') + ' ');
+						if (!this.disableTimer) {
+							homebridge.globalFakeGatoTimer.subscribe(this, this.calculateAverage);
+						}
+					break;
+				case TYPE_AQUA:
+					this.accessoryType116 = "03 1f01 2a08 2302";
+					this.accessoryType117 = "05";
+					this.accessoryType117bis = "07";
+					break;
+				case TYPE_THERMO:
+					this.accessoryType116 = "05 0102 1102 1001 1201 1d01";
+					this.accessoryType117 = "1f";
+					break;
+			}
+
+			this.accessoryType = accessoryType;
+			this.firstEntry = 0;
+			this.lastEntry = 0;
+			this.history = ["noValue"];
+			this.memorySize = this.size;
+			this.usedMemory = 0;
+			this.currentEntry = 1;
+			this.transfer = false;
+			this.setTime = true;
+			this.restarted = true;
+			this.refTime = 0;
+			this.memoryAddress = 0;
+			this.dataStream = '';
+
+			this.saving = false;
+
+			this.registerEvents();
+			if (this.storage === undefined) {
+				this.loaded = true;
+			}
+		}
+
+		calculateAverage(params) { // callback
+			var backLog = params.backLog || [];
+			var previousAvrg = params.previousAvrg || {};
+			var timer = params.timer;
+
+			var fakegato = this.service;
+			var calc = {
+				sum: {},
+				num: {},
+				avrg: {}
+			};
+
+			for (var h in backLog) {
+				if (backLog.hasOwnProperty(h)) { // only valid keys
+					for (let key in backLog[h]) { // each record
+						if (backLog[h].hasOwnProperty(key) && key != 'time') { // except time
+							if (!calc.sum[key])
+								calc.sum[key] = 0;
+							if (!calc.num[key])
+								calc.num[key] = 0;
+							calc.sum[key] += backLog[h][key];
+							calc.num[key]++;
+							calc.avrg[key] = precisionRound(calc.sum[key] / calc.num[key], 2);
+						}
+					}
+				}
+			}
+			calc.avrg.time = Math.round(new Date().valueOf() / 1000); // set the time of the avrg
+
+			if(!fakegato.disableRepeatLastData) {
+				for (let key in previousAvrg) { // each record of previous average
+					if (previousAvrg.hasOwnProperty(key) && key != 'time') { // except time
+						if (!backLog.length ||//calc.avrg[key] == 0 || // zero value
+							calc.avrg[key] === undefined) // no key (meaning no value received for this key yet)
+						{
+						calc.avrg[key] = previousAvrg[key];
+						}
+					}
+				}
+			}
+
+			if (Object.keys(calc.avrg).length > 1) {
+				fakegato._addEntry(calc.avrg);
+				timer.emptyData(fakegato);
+			}
+			return calc.avrg;
+		}
+
+		registerEvents() {
+			this.log.debug('Registring Events', thisAccessory.displayName);
+			if (typeof thisAccessory.getService === "function") {
+				// Platform API
+				this.log.debug('Platform', thisAccessory.displayName);
+
+				this.service = thisAccessory.getService(FakeGatoHistoryService);
+				if (this.service === undefined) {
+					this.service = thisAccessory.addService(FakeGatoHistoryService, ucfirst(thisAccessory.displayName) + ' History', this.accessoryType);
+				}
+
+				this.service.getCharacteristic(S2R2Characteristic)
+					.on('get', this.getCurrentS2R2.bind(this));
+
+				this.service.getCharacteristic(S2W1Characteristic)
+					.on('set', this.setCurrentS2W1.bind(this));
+
+				this.service.getCharacteristic(S2W2Characteristic)
+					.on('set', this.setCurrentS2W2.bind(this));
+
+			}
+			else {
+				// Accessory API
+				this.log.debug('Accessory', thisAccessory.displayName);
+
+				this.addCharacteristic(S2R1Characteristic);
+
+				this.addCharacteristic(S2R2Characteristic)
+					.on('get', this.getCurrentS2R2.bind(this));
+
+				this.addCharacteristic(S2W1Characteristic)
+					.on('set', this.setCurrentS2W1.bind(this));
+
+				this.addCharacteristic(S2W2Characteristic)
+					.on('set', this.setCurrentS2W2.bind(this));
+			}
+		}
+
+		sendHistory(address) {
+			if (address != 0) {
+				this.currentEntry = address;
+			} else {
+				this.currentEntry = 1;
+			}
+			this.transfer = true;
+		}
+
+		addEntry(entry) {
+			switch (this.accessoryType) {
+				case TYPE_DOOR:
+				case TYPE_MOTION:
+				case TYPE_SWITCH:
+					if (!this.disableTimer)
+						homebridge.globalFakeGatoTimer.addData({ entry: entry, service: this, immediateCallback: true });
+					else
+						this._addEntry({ time: entry.time, status: entry.status });
+					break;
+				case TYPE_AQUA:
+					this._addEntry({ time: entry.time, status: entry.status, waterAmount: entry.waterAmount });
+					break;
+				case TYPE_WEATHER:
+					if (!this.disableTimer)
+						homebridge.globalFakeGatoTimer.addData({ entry: entry, service: this });
+					else
+						this._addEntry({ time: entry.time, temp: entry.temp, humidity: entry.humidity, pressure: entry.pressure });
+					break;
+				case TYPE_ROOM:
+					if (!this.disableTimer)
+						homebridge.globalFakeGatoTimer.addData({ entry: entry, service: this });
+					else
+						this._addEntry({ time: entry.time, temp: entry.temp, humidity: entry.humidity, ppm: entry.ppm });
+					break;
+				case TYPE_ENERGY:
+					if (!this.disableTimer)
+						homebridge.globalFakeGatoTimer.addData({ entry: entry, service: this });
+					else
+						this._addEntry({ time: entry.time, power: entry.power });
+					break;
+				case TYPE_CUSTOM:
+					if (!this.disableTimer)
+						if ('power' in entry || 'temp' in entry) { // Only put power or temperature thru averager
+							homebridge.globalFakeGatoTimer.addData({ entry: entry, service: this });
+						} else {
+							this._addEntry(entry);
+						}
+					else
+						this._addEntry(entry);
+					break;
+				default:
+					this._addEntry(entry);
+					break;
+			}
+		}
+
+		//in order to be consistent with Eve, entry address start from 1
+		_addEntry(entry) {
+			if (this.loaded) {
+				var entry2address = function (val) {
+					return val % this.memorySize;
+				}
+					.bind(this);
+
+				var val;
+
+				if (this.usedMemory < this.memorySize) {
+					this.usedMemory++;
+					this.firstEntry = 0;
+					this.lastEntry = this.usedMemory;
+				} else {
+					this.firstEntry++;
+					this.lastEntry = this.firstEntry + this.usedMemory;
+					if (this.restarted == true) {
+						this.history[entry2address(this.lastEntry)] = {
+							time: entry.time,
+							setRefTime: 1
+						};
+						this.firstEntry++;
+						this.lastEntry = this.firstEntry + this.usedMemory;
+						this.restarted = false;
+					}
+				}
+
+				if (this.refTime == 0) {
+					this.refTime = entry.time - EPOCH_OFFSET;
+					this.history[this.lastEntry] = {
+						time: entry.time,
+						setRefTime: 1
+					};
+					this.initialTime = entry.time;
+					this.lastEntry++;
+					this.usedMemory++;
+				}
+
+				this.history[entry2address(this.lastEntry)] = (entry);
+
+				if (this.usedMemory < this.memorySize) {
+					val = Format(
+						'%s00000000%s%s%s%s%s000000000101',
+						numToHex(swap32(entry.time - this.refTime - EPOCH_OFFSET), 8),
+						numToHex(swap32(this.refTime), 8),
+						this.accessoryType116,
+						numToHex(swap16(this.usedMemory + 1), 4),
+						numToHex(swap16(this.memorySize), 4),
+						numToHex(swap32(this.firstEntry), 8));
+				} else {
+					val = Format(
+						'%s00000000%s%s%s%s%s000000000101',
+						numToHex(swap32(entry.time - this.refTime - EPOCH_OFFSET), 8),
+						numToHex(swap32(this.refTime), 8),
+						this.accessoryType116,
+						numToHex(swap16(this.usedMemory), 4),
+						numToHex(swap16(this.memorySize), 4),
+						numToHex(swap32(this.firstEntry + 1), 8));
+				}
+
+				if (this.service === undefined) { // Accessory API
+					this.getCharacteristic(S2R1Characteristic).setValue(hexToBase64(val));
+				}
+				else { // Platform API
+					this.service.getCharacteristic(S2R1Characteristic).setValue(hexToBase64(val));
+				}
+
+				this.log.debug("First entry %s: %s", this.accessoryName, this.firstEntry.toString(16));
+				this.log.debug("Last entry %s: %s", this.accessoryName, this.lastEntry.toString(16));
+				this.log.debug("Used memory %s: %s", this.accessoryName, this.usedMemory.toString(16));
+				this.log.debug("116 %s: %s", this.accessoryName, val);
+
+				if (this.storage !== undefined) this.save();
+			} else {
+				setTimeout(function () { // retry in 100ms
+					this._addEntry(entry);
+				}.bind(this), 100);
+			}
+		}
+		getInitialTime() {
+			return this.initialTime;
+		}
+
+		setExtraPersistedData(extra) {
+			this.extra = extra;
+		}
+
+		getExtraPersistedData() {
+			return this.extra;
+		}
+
+		isHistoryLoaded() {
+			return this.loaded;
+		}
+
+		save() {
+			if (this.loaded) {
+
+				let data = {
+					firstEntry: this.firstEntry,
+					lastEntry: this.lastEntry,
+					usedMemory: this.usedMemory,
+					refTime: this.refTime,
+					initialTime: this.initialTime,
+					history: this.history,
+					extra: this.extra
+				};
+
+
+				homebridge.globalFakeGatoStorage.write({
+					service: this,
+					data: typeof (data) === "object" ? JSON.stringify(data) : data
+				});
+
+			} else {
+				setTimeout(function () { // retry in 100ms
+					this.save();
+				}.bind(this), 100);
+			}
+		}
+		load(cb) {
+			this.log.debug("Loading...");
+			homebridge.globalFakeGatoStorage.read({
+				service: this,
+				callback: function (err, data) {
+					if (!err) {
+						if (data) {
+							try {
+								this.log.debug("read data from", this.accessoryName, ":", data);
+								let jsonFile = typeof (data) === "object" ? data : JSON.parse(data);
+
+								this.firstEntry = jsonFile.firstEntry;
+								this.lastEntry = jsonFile.lastEntry;
+								this.usedMemory = jsonFile.usedMemory;
+								this.refTime = jsonFile.refTime;
+								this.initialTime = jsonFile.initialTime;
+								this.history = jsonFile.history;
+								this.extra = jsonFile.extra;
+							} catch (e) {
+								this.log.debug("**ERROR fetching persisting data restart from zero - invalid JSON**", e);
+								cb(e, false);
+							}
+							cb(null, true);
+						}
+					} else {
+						// file don't exists
+						cb(null, false);
+					}
+				}.bind(this)
+			});
+		}
+		cleanPersist() {
+			this.log.debug("Cleaning...");
+			homebridge.globalFakeGatoStorage.remove({
+				service: this
+			});
+		}
+
+		getCurrentS2R2(callback) {
+			var entry2address = function (val) {
+				return val % this.memorySize;
+			}.bind(this);
+
+			if ((this.currentEntry <= this.lastEntry) && (this.transfer == true)) {
+				this.memoryAddress = entry2address(this.currentEntry);
+				for (var i = 0; i < 11; i++) {
+					if ((this.history[this.memoryAddress].setRefTime == 1) || (this.setTime == true) ||
+						(this.currentEntry == this.firstEntry + 1)) {
+						this.dataStream += Format(
+							",15%s 0100 0000 81%s0000 0000 00 0000",
+							numToHex(swap32(this.currentEntry), 8),
+							numToHex(swap32(this.refTime), 8));
+						this.setTime = false;
+					}
+					else {
+						this.log.debug("%s Entry: %s, Address: %s", this.accessoryName, this.currentEntry, this.memoryAddress);
+						switch (this.accessoryType) {
+							case TYPE_WEATHER:
+								this.dataStream += Format(
+									",10 %s%s-%s:%s %s %s",
+									numToHex(swap32(this.currentEntry), 8),
+									numToHex(swap32(this.history[this.memoryAddress].time - this.refTime - EPOCH_OFFSET), 8),
+									this.accessoryType117,
+									numToHex(swap16(this.history[this.memoryAddress].temp * 100), 4),
+									numToHex(swap16(this.history[this.memoryAddress].humidity * 100), 4),
+									numToHex(swap16(this.history[this.memoryAddress].pressure * 10), 4));
+								break;
+							case TYPE_ENERGY:
+								this.dataStream += Format(
+									",14 %s%s-%s:0000 0000 %s 0000 0000",
+									numToHex(swap32(this.currentEntry), 8),
+									numToHex(swap32(this.history[this.memoryAddress].time - this.refTime - EPOCH_OFFSET), 8),
+									this.accessoryType117,
+									numToHex(swap16(this.history[this.memoryAddress].power * 10), 4));
+								break;
+							case TYPE_ROOM:
+								this.dataStream += Format(
+									",13 %s%s%s%s%s%s0000 00",
+									numToHex(swap32(this.currentEntry), 8),
+									numToHex(swap32(this.history[this.memoryAddress].time - this.refTime - EPOCH_OFFSET), 8),
+									this.accessoryType117,
+									numToHex(swap16(this.history[this.memoryAddress].temp * 100), 4),
+									numToHex(swap16(this.history[this.memoryAddress].humidity * 100), 4),
+									numToHex(swap16(this.history[this.memoryAddress].ppm), 4));
+								break;
+							case TYPE_DOOR:
+							case TYPE_MOTION:
+							case TYPE_SWITCH:
+								this.dataStream += Format(
+									",0b %s%s%s%s",
+									numToHex(swap32(this.currentEntry), 8),
+									numToHex(swap32(this.history[this.memoryAddress].time - this.refTime - EPOCH_OFFSET), 8),
+									this.accessoryType117,
+									numToHex(this.history[this.memoryAddress].status, 2));
+								break;
+							case TYPE_AQUA:
+								if (this.history[this.memoryAddress].status == true)
+									this.dataStream += Format(
+										",0d %s%s%s%s 300c",
+										numToHex(swap32(this.currentEntry), 8),
+										numToHex(swap32(this.history[this.memoryAddress].time - this.refTime - EPOCH_OFFSET), 8),
+										this.accessoryType117,
+										numToHex(this.history[this.memoryAddress].status, 2));
+								else
+									this.dataStream += Format(
+										",15 %s%s%s%s%s 00000000 300c",
+										numToHex(swap32(this.currentEntry), 8),
+										numToHex(swap32(this.history[this.memoryAddress].time - this.refTime - EPOCH_OFFSET), 8),
+										this.accessoryType117bis,
+										numToHex(this.history[this.memoryAddress].status, 2),
+										numToHex(swap32(this.history[this.memoryAddress].waterAmount), 8));
+								break;
+							case TYPE_THERMO:
+								this.dataStream += Format(
+									",11 %s%s%s%s%s%s 0000",
+									numToHex(swap32(this.currentEntry), 8),
+									numToHex(swap32(this.history[this.memoryAddress].time - this.refTime - EPOCH_OFFSET), 8),
+									this.accessoryType117,
+									numToHex(swap16(this.history[this.memoryAddress].currentTemp * 100), 4),
+									numToHex(swap16(this.history[this.memoryAddress].setTemp * 100), 4),
+									numToHex(this.history[this.memoryAddress].valvePosition, 2));
+								break;
+							case TYPE_CUSTOM:
+								var result = [];
+								var bitmask = 0;
+								var dataStream = Format("%s%s",
+								numToHex(swap32(this.currentEntry), 8),
+								numToHex(swap32(this.history[this.memoryAddress].time - this.refTime - EPOCH_OFFSET), 8));
+								for (const [key, value] of Object.entries(this.history[this.memoryAddress])) {
+									switch (key) {
+										case 'time':
+											break;
+										default:
+											for (var x = 0, iLen = this.signatures.length; x < iLen; x++) {
+												if (this.signatures[x].entry === key) {
+													// console.log('key', key, this.signatures[x].uuid, value, this.signatures[x].factor);
+													switch(this.signatures[x].length) {
+														case 8:
+															result[x] = Format('%s', numToHex(swap32(value * this.signatures[x].factor), this.signatures[x].length));
+															break;
+														case 4:
+															result[x] = Format('%s', numToHex(swap16(value * this.signatures[x].factor), this.signatures[x].length));
+															break;
+														case 2:
+															result[x] = Format('%s', numToHex(value * this.signatures[x].factor, this.signatures[x].length));
+															break;
+												}
+													bitmask += Math.pow(2, x);
+												}
+											}
+									}
+								}
+							var results = dataStream + ' ' + numToHex(bitmask, 2) + ' ' + result.map(a => a).join(' ');
+							// console.log('results', numToHex((results.replace(/[^0-9A-F]/ig, '').length) / 2 + 1) + ' ' + results);
+							this.dataStream += (' ' + numToHex((results.replace(/[^0-9A-F]/ig, '').length) / 2 + 1) + ' ' + results + ',');
+							break;
+						}
+					}
+					this.currentEntry++;
+					this.memoryAddress = entry2address(this.currentEntry);
+					if (this.currentEntry > this.lastEntry)
+						break;
+				}
+				this.log.debug("Data %s: %s", this.accessoryName, this.dataStream);
+				callback(null, hexToBase64(this.dataStream));
+				this.dataStream = '';
+			}
+			else {
+				this.transfer = false;
+				callback(null, hexToBase64('00'));
+			}
+		}
+
+
+		setCurrentS2W1(val, callback) {
+			callback(null, val);
+			this.log.debug("Data request %s: %s", this.accessoryName, base64ToHex(val));
+			var valHex = base64ToHex(val);
+			var substring = valHex.substring(4, 12);
+			var valInt = parseInt(substring, 16);
+			var address = swap32(valInt);
+			var hexAddress = address.toString('16');
+
+			this.log.debug("Address requested %s: %s", this.accessoryName, hexAddress);
+			this.sendHistory(address);
+
+		}
+
+		setCurrentS2W2(val, callback) {
+			this.log.debug("Clock adjust %s: %s", this.accessoryName, base64ToHex(val));
+			callback(null, val);
+		}
+
+	}
+
+	FakeGatoHistoryService.UUID = 'E863F007-079E-48FF-8F27-9C2605A29F52';
+
+	return FakeGatoHistory;
+};
diff --git a/lib/fakegato/fakegato-storage.js b/lib/fakegato/fakegato-storage.js
new file mode 100644
index 00000000..626d5a45
--- /dev/null
+++ b/lib/fakegato/fakegato-storage.js
@@ -0,0 +1,173 @@
+/*jshint esversion: 6,node: true,-W041: false */
+'use strict';
+
+const DEBUG = true;
+
+var fs = require('fs');
+var os = require('os');
+var path = require('path');
+var hostname = os.hostname().split(".")[0];
+
+// var googleDrive = require('./lib/googleDrive').drive;
+
+var fileSuffix = '_persist.json';
+
+var thisStorage;
+
+class FakeGatoStorage {
+	constructor(params) {
+		if (!params)
+			params = {};
+
+		this.writers = [];
+
+		this.log = params.log || {};
+		if (!this.log.debug) {
+			this.log.debug = DEBUG ? console.log : function () { };
+		}
+		thisStorage = this;
+		this.addingWriter = false;
+	}
+
+	addWriter(service, params) {
+		if (!this.addingWriter) {
+			this.addingWriter = true;
+			if (!params)
+				params = {};
+
+			this.log.debug("** Fakegato-storage AddWriter :", service.accessoryName);
+
+			let newWriter = {
+				'service': service,
+				'callback': params.callback,
+				'storage': params.storage || 'fs',
+				'fileName': params.filename || hostname + "_" + service.accessoryName + fileSuffix		// Unique filename per homebridge server.  Allows test environments on other servers not to break prod.
+			};
+			var onReady = typeof (params.onReady) == 'function' ? params.onReady : function () { }.bind(this);
+
+			switch (newWriter.storage) {
+				case 'fs':
+					newWriter.storageHandler = fs;
+					newWriter.path = params.path || path.join(os.homedir(), '.homebridge');
+					this.writers.push(newWriter);
+					this.addingWriter = false;
+					onReady();
+					break;
+				/*
+				case 'googleDrive':
+					newWriter.path = params.path || 'fakegato';
+					newWriter.keyPath = params.keyPath || path.join(os.homedir(), '.homebridge');
+					newWriter.storageHandler = new googleDrive({
+						keyPath: newWriter.keyPath, callback: function () {
+							this.addingWriter = false;
+							onReady(arguments);
+						}.bind(this), folder: newWriter.path
+					});
+					this.writers.push(newWriter);
+					break;
+				case 'memcached' :
+
+				break;
+				*/
+			}
+		} else {
+			setTimeout(function () {
+				this.addWriter(service, params);
+			}.bind(this), 100);
+		}
+	}
+	getWriter(service) {
+		let findServ = function (element) {
+			return element.service === service;
+		};
+		return this.writers.find(findServ);
+	}
+	_getWriterIndex(service) {
+		let findServ = function (element) {
+			return element.service === service;
+		};
+		return this.writers.findIndex(findServ);
+	}
+	getWriters() {
+		return this.writers;
+	}
+	delWriter(service) {
+		let index = this._getWriterIndex(service);
+		this.writers.splice(index, 1);
+	}
+
+	write(params) { // must be asynchronous
+		if (!this.writing) {
+			this.writing = true;
+			let writer = this.getWriter(params.service);
+			let callBack = typeof (params.callback) == 'function' ? params.callback : (typeof (writer.callback) == 'function' ? writer.callback : function () { }); // use parameter callback or writer callback or empty function
+			switch (writer.storage) {
+				case 'fs':
+					this.log.debug("** Fakegato-storage write FS file:", path.join(writer.path, writer.fileName), params.data.substr(1, 80));
+					writer.storageHandler.writeFile(path.join(writer.path, writer.fileName), params.data, 'utf8', function () {
+						this.writing = false;
+						callBack(arguments);
+					}.bind(this));
+					break;
+				/*
+				case 'googleDrive':
+					this.log.debug("** Fakegato-storage write googleDrive file:", writer.path, writer.fileName, params.data.substr(1, 80));
+					writer.storageHandler.writeFile(writer.path, writer.fileName, params.data, function () {
+						this.writing = false;
+						callBack(arguments);
+					}.bind(this));
+					break;
+				case 'memcached' :
+
+				break;
+				*/
+			}
+		} else {
+			setTimeout(function () { // retry in 100ms
+				this.write(params);
+			}.bind(this), 100);
+		}
+	}
+	read(params) {
+		let writer = this.getWriter(params.service);
+		let callBack = typeof (params.callback) == 'function' ? params.callback : (typeof (writer.callback) == 'function' ? writer.callback : function () { }); // use parameter callback or writer callback or empty function
+		switch (writer.storage) {
+			case 'fs':
+				this.log.debug("** Fakegato-storage read FS file:", path.join(writer.path, writer.fileName));
+				writer.storageHandler.readFile(path.join(writer.path, writer.fileName), 'utf8', callBack);
+				break;
+			/*
+			case 'googleDrive':
+				this.log.debug("** Fakegato-storage read googleDrive file: %s/%s", writer.path, writer.fileName);
+				writer.storageHandler.readFile(writer.path, writer.fileName, callBack);
+				break;
+			case 'memcached' :
+
+			break;
+			*/
+		}
+	}
+	remove(params) {
+		let writer = this.getWriter(params.service);
+		let callBack = typeof (params.callback) == 'function' ? params.callback : (typeof (writer.callback) == 'function' ? writer.callback : function () { }); // use parameter callback or writer callback or empty function
+		switch (writer.storage) {
+			case 'fs':
+				this.log.debug("** Fakegato-storage delete FS file:", path.join(writer.path, writer.fileName));
+				writer.storageHandler.unlink(path.join(writer.path, writer.fileName), callBack);
+				break;
+			/*
+			case 'googleDrive':
+				this.log.debug("** Fakegato-storage delete googleDrive file:", writer.path, writer.fileName);
+				writer.storageHandler.deleteFile(writer.path, writer.fileName, callBack);
+				break;
+			case 'memcached' :
+
+			break;
+			*/
+		}
+	}
+}
+
+module.exports = {
+	FakeGatoStorage: FakeGatoStorage
+};
diff --git a/lib/fakegato/fakegato-timer.js b/lib/fakegato/fakegato-timer.js
new file mode 100644
index 00000000..2a78bef9
--- /dev/null
+++ b/lib/fakegato/fakegato-timer.js
@@ -0,0 +1,133 @@
+/*jshint esversion: 6,node: true,-W041: false */
+'use strict';
+
+const DEBUG = true;
+
+class FakeGatoTimer {
+	constructor(params) {
+		if (!params)
+			params = {};
+		this.subscribedServices = [];
+		this.minutes = params.minutes || 10;
+
+		this.intervalID = null;
+		this.running = false;
+		this.log = params.log || {};
+		if (!this.log.debug) {
+			this.log.debug = DEBUG ? console.log : function () { };
+		}
+	}
+
+	// Subscription management
+	subscribe(service, callback) {
+		this.log.debug("** Fakegato-timer Subscription :", service.accessoryName);
+		let newService = {
+			'service': service,
+			'callback': callback,
+			'backLog': [],
+			'previousBackLog': [],
+			'previousAvrg': {}
+		};
+
+		this.subscribedServices.push(newService);
+	}
+	getSubscriber(service) {
+		let findServ = function (element) {
+			return element.service === service;
+		};
+		return this.subscribedServices.find(findServ);
+	}
+	_getSubscriberIndex(service) {
+		let findServ = function (element) {
+			return element.service === service;
+		};
+		return this.subscribedServices.findIndex(findServ);
+	}
+	getSubscribers() {
+		return this.subscribedServices;
+	}
+	unsubscribe(service) {
+		let index = this._getSubscriberIndex(service);
+		this.subscribedServices.splice(index, 1);
+		if (this.subscribedServices.length === 0 && this.running)
+			this.stop();
+	}
+
+	// Timer management
+	start() {
+		this.log.debug("**Start Global Fakegato-Timer - " + this.minutes + "min**");
+		if (this.running)
+			this.stop();
+		this.running = true;
+		this.intervalID = setInterval(this.executeCallbacks.bind(this), this.minutes * 60 * 1000);
+	}
+	stop() {
+		this.log.debug("**Stop Global Fakegato-Timer****");
+		clearInterval(this.intervalID);
+		this.running = false;
+		this.intervalID = null;
+	}
+
+	// Data management
+	executeCallbacks() {
+		this.log.debug("**Fakegato-timer: executeCallbacks**");
+		if (this.subscribedServices.length !== 0) {
+			for (let s in this.subscribedServices) {
+				if (this.subscribedServices.hasOwnProperty(s)) {
+
+					let service = this.subscribedServices[s];
+					if (typeof (service.callback) == 'function') {
+						service.previousAvrg = service.callback({
+							'backLog': service.backLog,
+							'previousAvrg': service.previousAvrg,
+							'timer': this,
+							'immediate': false
+						});
+					}
+				}
+			}
+		}
+	}
+	executeImmediateCallback(service) {
+		this.log.debug("**Fakegato-timer: executeImmediateCallback**");
+
+		if (typeof (service.callback) == 'function' && service.backLog.length)
+			service.callback({
+				'backLog': service.backLog,
+				'timer': this,
+				'immediate': true
+			});
+	}
+	addData(params) {
+		let data = params.entry;
+		let service = params.service;
+		let immediateCallback = params.immediateCallback || false;
+
+		this.log.debug("**Fakegato-timer: addData ", service.accessoryName, data, " immediate: ", immediateCallback);
+
+		if (immediateCallback) // door or motion -> replace
+			this.getSubscriber(service).backLog[0] = data;
+		else
+			this.getSubscriber(service).backLog.push(data);
+
+		if (immediateCallback) {
+			//setTimeout(this.executeImmediateCallback.bind(this), 0,service);
+			this.executeImmediateCallback(this.getSubscriber(service));
+		}
+
+		if (this.running === false)
+			this.start();
+	}
+	emptyData(service) {
+		this.log.debug("**Fakegato-timer: emptyData **", service.accessoryName);
+		let source = this.getSubscriber(service);
+
+		if (source.backLog.length) source.previousBackLog = source.backLog;
+		source.backLog = [];
+	}
+
+}
+
+module.exports = {
+	FakeGatoTimer: FakeGatoTimer
+};
diff --git a/lib/fakegato/uuid.js b/lib/fakegato/uuid.js
new file mode 100644
index 00000000..f8aa9820
--- /dev/null
+++ b/lib/fakegato/uuid.js
@@ -0,0 +1,25 @@
+// https://github.com/homebridge/HAP-NodeJS/blob/master/src/lib/util/uuid.ts
+
+const VALID_UUID_REGEX = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+
+function isValid(UUID) {
+  return VALID_UUID_REGEX.test(UUID);
+}
+const VALID_SHORT_REGEX = /^[0-9a-f]{1,8}$/i;
+
+function toLongFormUUID(uuid, base = '-0000-1000-8000-0026BB765291') {
+  if (isValid(uuid)) return uuid.toUpperCase();
+  if (!VALID_SHORT_REGEX.test(uuid)) throw new TypeError('uuid was not a valid UUID or short form UUID');
+  if (!isValid('00000000' + base)) throw new TypeError('base was not a valid base UUID');
+
+  return (('00000000' + uuid).substr(-8) + base).toUpperCase();
+}
+
+function toShortFormUUID(uuid, base = '-0000-1000-8000-0026BB765291') {
+  uuid = toLongFormUUID(uuid, base);
+  return (uuid.substr(0, 8));
+}
+
+exports.isValid = isValid;
+exports.toLongFormUUID = toLongFormUUID;
+exports.toShortFormUUID = toShortFormUUID;
diff --git a/package-lock.json b/package-lock.json
index e38819ec..b265196e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -39,14 +39,6 @@
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
     },
-    "debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "requires": {
-        "ms": "2.0.0"
-      }
-    },
     "define-properties": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
@@ -83,13 +75,6 @@
         "is-symbol": "^1.0.2"
       }
     },
-    "fakegato-history": {
-      "version": "github:bwp91/fakegato-history#39a065f0a443f6c5b460edcb6e177872d939cc13",
-      "from": "github:bwp91/fakegato-history",
-      "requires": {
-        "debug": "^2.2.0"
-      }
-    },
     "follow-redirects": {
       "version": "1.13.0",
       "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.0.tgz",
@@ -159,11 +144,6 @@
         "has-symbols": "^1.0.1"
       }
     },
-    "ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-    },
     "node-dns-sd": {
       "version": "0.4.2",
       "resolved": "https://registry.npmjs.org/node-dns-sd/-/node-dns-sd-0.4.2.tgz",
diff --git a/package.json b/package.json
index 52500b1c..9d7dbc79 100644
--- a/package.json
+++ b/package.json
@@ -67,7 +67,6 @@
   "dependencies": {
     "axios": "0.21.0",
     "color-convert": "2.0.1",
-    "fakegato-history": "bwp91/fakegato-history",
     "interval-promise": "1.4.0",
     "node-dns-sd": "0.4.2",
     "websocket-as-promised": "1.1.0",

From e88d83df4d32387ebf55e8851621321105a84426 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 3 Nov 2020 21:56:22 +0000
Subject: [PATCH 0659/3183] not needed

---
 lib/device/light-multi.js  | 105 -------------------------------------
 lib/device/light-single.js |  33 ------------
 2 files changed, 138 deletions(-)
 delete mode 100644 lib/device/light-multi.js
 delete mode 100644 lib/device/light-single.js

diff --git a/lib/device/light-multi.js b/lib/device/light-multi.js
deleted file mode 100644
index c851d09f..00000000
--- a/lib/device/light-multi.js
+++ /dev/null
@@ -1,105 +0,0 @@
-/* jshint -W014, -W033, esversion: 9 */
-/* eslint-disable new-cap */
-'use strict'
-const helpers = require('./../helpers')
-module.exports = class deviceLightMulti {
-  constructor (platform, accessory) {
-    this.platform = platform
-    this.Service = platform.api.hap.Service
-    this.Characteristic = platform.api.hap.Characteristic
-    const lightService = accessory.getService(this.Service.Lightbulb) || accessory.addService(this.Service.Lightbulb)
-    lightService
-      .getCharacteristic(this.Characteristic.On)
-      .on('set', (value, callback) => this.internalUpdate(value, callback))
-    this.accessory = accessory
-  }
-
-  async internalUpdate (value, callback) {
-    callback()
-    try {
-      let oAccessory
-      const params = {}
-      switch (this.accessory.context.switchNumber) {
-        case '0':
-          params.switches = helpers.defaultMultiSwitchOff
-          params.switches[0].switch = value ? 'on' : 'off'
-          params.switches[1].switch = value ? 'on' : 'off'
-          params.switches[2].switch = value ? 'on' : 'off'
-          params.switches[3].switch = value ? 'on' : 'off'
-          break
-        case '1':
-        case '2':
-        case '3':
-        case '4':
-          params.switches = helpers.defaultMultiSwitchOff
-          for (let i = 1; i <= 4; i++) {
-            if ((oAccessory = this.platform.devicesInHB.get(this.accessory.context.eweDeviceId + 'SW' + i))) {
-              if (i === parseInt(this.accessory.context.switchNumber)) {
-                params.switches[i - 1].switch = value ? 'on' : 'off'
-              } else {
-                params.switches[i - 1].switch = oAccessory.context.cacheOn ? 'on' : 'off'
-              }
-            } else {
-              params.switches[i - 1].switch = 'off'
-            }
-          }
-          break
-      }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
-      switch (this.accessory.context.switchNumber) {
-        case '0':
-          for (let i = 0; i <= 4; i++) {
-            if ((oAccessory = this.platform.devicesInHB.get(this.accessory.context.eweDeviceId + 'SW' + i))) {
-              oAccessory.getService(this.Service.Lightbulb).updateCharacteristic(this.Characteristic.On, value)
-            }
-          }
-          break
-        case '1':
-        case '2':
-        case '3':
-        case '4': {
-          let masterState = 'off'
-          for (let i = 1; i <= 4; i++) {
-            if ((oAccessory = this.platform.devicesInHB.get(this.accessory.context.eweDeviceId + 'SW' + i))) {
-              if (oAccessory.getService(this.Service.Lightbulb).getCharacteristic(this.Characteristic.On).value) {
-                masterState = 'on'
-              }
-            }
-          }
-          if (!this.platform.hiddenMasters.includes(this.accessory.context.eweDeviceId)) {
-            oAccessory = this.platform.devicesInHB.get(this.accessory.context.eweDeviceId + 'SW0')
-            oAccessory.getService(this.Service.Lightbulb).updateCharacteristic(this.Characteristic.On, masterState === 'on')
-          }
-          break
-        }
-      }
-    } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
-    }
-  }
-
-  async externalUpdate (params) {
-    try {
-      if (!helpers.hasProperty(params, 'switches')) return
-      const idToCheck = this.accessory.context.hbDeviceId.slice(0, -1)
-      let primaryState = false
-      for (let i = 1; i <= this.accessory.context.channelCount; i++) {
-        if (params.switches[i - 1].switch === 'on') {
-          primaryState = true
-        }
-        if (this.platform.devicesInHB.has(idToCheck + i)) {
-          const oAccessory = this.platform.devicesInHB.get(idToCheck + i)
-          oAccessory.context.cacheOn = params.switches[i - 1].switch === 'on'
-          oAccessory
-            .getService(this.Service.Lightbulb)
-            .updateCharacteristic(this.Characteristic.On, params.switches[i - 1].switch === 'on')
-        }
-      }
-      if (!this.platform.hiddenMasters.includes(this.accessory.context.eweDeviceId)) {
-        this.accessory.getService(this.Service.Lightbulb).updateCharacteristic(this.Characteristic.On, primaryState)
-      }
-    } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, false)
-    }
-  }
-}
diff --git a/lib/device/light-single.js b/lib/device/light-single.js
deleted file mode 100644
index c62ee8fa..00000000
--- a/lib/device/light-single.js
+++ /dev/null
@@ -1,33 +0,0 @@
-/* jshint -W014, -W033, esversion: 9 */
-/* eslint-disable new-cap */
-'use strict'
-module.exports = class deviceLightSingle {
-  constructor (platform, accessory) {
-    this.platform = platform
-    this.Service = platform.api.hap.Service
-    this.Characteristic = platform.api.hap.Characteristic
-    const lightService = accessory.getService(this.Service.Lightbulb) || accessory.addService(this.Service.Lightbulb)
-    lightService
-      .getCharacteristic(this.Characteristic.On)
-      .on('set', (value, callback) => this.internalUpdate(value, callback))
-    this.accessory = accessory
-  }
-
-  async internalUpdate (value, callback) {
-    callback()
-    try {
-      const params = { switch: value ? 'on' : 'off' }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
-    } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
-    }
-  }
-
-  async externalUpdate (params) {
-    try {
-      this.accessory.getService(this.Service.Lightbulb).updateCharacteristic(this.Characteristic.On, params.switch === 'on')
-    } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, false)
-    }
-  }
-}

From 301d91219066090249df214e59c36f9eeceee602 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 3 Nov 2020 22:09:17 +0000
Subject: [PATCH 0660/3183] 3.11.0-4

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b265196e..825e6c59 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.11.0-3",
+  "version": "3.11.0-4",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 9d7dbc79..2c7708b5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.11.0-3",
+  "version": "3.11.0-4",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 429fef6cefcc3ff9e5f710df48e27e0e3ed620df Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 4 Nov 2020 13:00:09 +0000
Subject: [PATCH 0661/3183] remove battery service for switches

---
 lib/device/zb-dev.js | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/lib/device/zb-dev.js b/lib/device/zb-dev.js
index 4445ee3b..a7514131 100644
--- a/lib/device/zb-dev.js
+++ b/lib/device/zb-dev.js
@@ -21,9 +21,9 @@ module.exports = class deviceZBDev {
       : this.sensorTimeDifference < 10
         ? helpers.defaults.sensorTimeDifference
         : this.sensorTimeDifference
-    if (!accessory.getService(this.Service.BatteryService)) accessory.addService(this.Service.BatteryService)
     switch (accessory.context.eweUIID) {
       case 1000: {
+        if (!accessory.getService(this.Service.BatteryService)) accessory.addService(this.Service.BatteryService)
         const zbspsService =
           accessory.getService(this.Service.StatelessProgrammableSwitch) ||
           accessory.addService(this.Service.StatelessProgrammableSwitch)
@@ -35,7 +35,8 @@ module.exports = class deviceZBDev {
         break
       }
       case 1009:
-      case 1256: {
+      case 1256:
+        if (accessory.getService(this.Service.BatteryService)) accessory.removeService(accessory.getService(this.Service.BatteryService))
         if (!accessory.getService(this.Service.Switch)) accessory.addService(this.Service.Switch)
         accessory.log = this.platform.log
         accessory.eveLogger = new this.EveHistoryService('switch', accessory, {
@@ -46,8 +47,8 @@ module.exports = class deviceZBDev {
           .getCharacteristic(this.Characteristic.On)
           .on('set', (value, callback) => this.internalUpdate(value, callback))
         break
-      }
-      case 1770: {
+      case 1770:
+        if (!accessory.getService(this.Service.BatteryService)) accessory.addService(this.Service.BatteryService)
         if (!accessory.getService(this.Service.TemperatureSensor)) accessory.addService(this.Service.TemperatureSensor)
         if (!accessory.getService(this.Service.HumiditySensor)) accessory.addService(this.Service.HumiditySensor)
         accessory.log = this.platform.log
@@ -56,8 +57,8 @@ module.exports = class deviceZBDev {
           path: this.platform.eveLogPath
         })
         break
-      }
-      case 2026: {
+      case 2026:
+        if (!accessory.getService(this.Service.BatteryService)) accessory.addService(this.Service.BatteryService)
         if (!accessory.getService(this.Service.MotionSensor)) accessory.addService(this.Service.MotionSensor)
         accessory.log = this.platform.log
         accessory.eveLogger = new this.EveHistoryService('motion', accessory, {
@@ -65,8 +66,8 @@ module.exports = class deviceZBDev {
           path: this.platform.eveLogPath
         })
         break
-      }
-      case 3026: {
+      case 3026:
+        if (!accessory.getService(this.Service.BatteryService)) accessory.addService(this.Service.BatteryService)
         if (!accessory.getService(this.Service.ContactSensor)) accessory.addService(this.Service.ContactSensor)
         accessory.log = this.platform.log
         accessory.eveLogger = new this.EveHistoryService('door', accessory, {
@@ -74,7 +75,6 @@ module.exports = class deviceZBDev {
           path: this.platform.eveLogPath
         })
         break
-      }
     }
     this.accessory = accessory
   }
@@ -150,9 +150,9 @@ module.exports = class deviceZBDev {
             const timeNow = new Date()
             const diff = (timeNow.getTime() - params.trigTime) / 1000
             const motionDetected =
-            helpers.hasProperty(params, 'updateSource') &&
-            params.motion === 1 &&
-            diff < this.sensorTimeDifference
+              helpers.hasProperty(params, 'updateSource') &&
+              params.motion === 1 &&
+              diff < this.sensorTimeDifference
             this.accessory.eveLogger.addEntry({
               time: Math.round(new Date().valueOf() / 1000),
               status: motionDetected ? 1 : 0

From 394dcd5b7cc9ebc184529ec0ad25898d0db04934 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 4 Nov 2020 13:00:12 +0000
Subject: [PATCH 0662/3183] Update package.json

---
 package.json | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/package.json b/package.json
index 2c7708b5..44b29e96 100644
--- a/package.json
+++ b/package.json
@@ -71,5 +71,10 @@
     "node-dns-sd": "0.4.2",
     "websocket-as-promised": "1.1.0",
     "ws": "7.3.1"
+  },
+  "standard": {
+    "ignore": [
+      "/lib/fakegato/"
+    ]
   }
 }

From a0fbcdebe60e75381295578e25365c28be57e20b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 4 Nov 2020 13:41:48 +0000
Subject: [PATCH 0663/3183] 3.11.0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 825e6c59..f894ce79 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.11.0-4",
+  "version": "3.11.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 44b29e96..489ced8f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.11.0-4",
+  "version": "3.11.0",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 4096c20277d007b525e5ab85ebbcf954fd9c5f23 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 4 Nov 2020 19:17:28 +0000
Subject: [PATCH 0664/3183] diffuser - skeletal support

---
 lib/device/diffuser.js  | 35 +++++++++++++++++++++++++++++++++++
 lib/ewelink-platform.js | 10 ++++++++++
 lib/helpers.js          |  3 ++-
 3 files changed, 47 insertions(+), 1 deletion(-)
 create mode 100644 lib/device/diffuser.js

diff --git a/lib/device/diffuser.js b/lib/device/diffuser.js
new file mode 100644
index 00000000..a16abdae
--- /dev/null
+++ b/lib/device/diffuser.js
@@ -0,0 +1,35 @@
+/* jshint -W014, -W033, esversion: 9 */
+/* eslint-disable new-cap */
+'use strict'
+const helpers = require('./../helpers')
+module.exports = class deviceDiffuser {
+  constructor (platform, accessory) {
+    this.platform = platform
+    this.Service = platform.api.hap.Service
+    this.Characteristic = platform.api.hap.Characteristic
+    const service = accessory.getService(this.Service.Lightbulb) || accessory.addService(this.Service.Lightbulb)
+    service
+      .getCharacteristic(this.Characteristic.On)
+      .on('set', (value, callback) => this.internalSwitchUpdate(value, callback))
+    this.accessory = accessory
+  }
+
+  async internalSwitchUpdate (value, callback) {
+    callback()
+    try {
+      const params = { switch: value ? 'on' : 'off' }
+      await this.platform.sendDeviceUpdate(this.accessory, params)
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, true)
+    }
+  }
+
+  async externalUpdate (params) {
+    try {
+      if (!helpers.hasProperty(params, 'switch')) return
+      this.accessory.getService(this.Service.Lightbulb).updateCharacteristic(this.Characteristic.On, params.switch === 'on')
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, false)
+    }
+  }
+}
diff --git a/lib/ewelink-platform.js b/lib/ewelink-platform.js
index a085a52a..8ae35653 100644
--- a/lib/ewelink-platform.js
+++ b/lib/ewelink-platform.js
@@ -11,6 +11,7 @@ const deviceLock = require('./device/lock')
 const deviceValve = require('./device/valve')
 const deviceSensor = require('./device/sensor')
 const deviceFan = require('./device/fan')
+const deviceDiffuser = require('./device/diffuser')
 const deviceThermostat = require('./device/thermostat')
 const deviceOutlet = require('./device/outlet')
 const deviceUSB = require('./device/usb')
@@ -245,6 +246,15 @@ module.exports = class eWeLinkPlatform {
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new deviceFan(this, accessory)
         /**/
+      } else if (helpers.devicesDiffuser.includes(device.extra.uiid)) {
+        /********
+        DIFFUSERS
+        ********/
+        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
+          ? this.devicesInHB.get(device.deviceid + 'SWX')
+          : this.addAccessory(device, device.deviceid + 'SWX')
+        accessory.control = new deviceDiffuser(this, accessory)
+        /**/
       } else if (helpers.devicesThermostat.includes(device.extra.uiid)) {
         /**********
         THERMOSTATS
diff --git a/lib/helpers.js b/lib/helpers.js
index 2cdc67b1..47bd7483 100644
--- a/lib/helpers.js
+++ b/lib/helpers.js
@@ -25,6 +25,7 @@ module.exports = {
   devicesSensor: [102],
   devicesThermostat: [15],
   devicesFan: [34],
+  devicesDiffuser: [25],
   devicesOutlet: [32],
   devicesCamera: [87],
   devicesUSB: [77],
@@ -123,7 +124,7 @@ module.exports = {
     22: 1, // "RGB_BALL_LIGHT"                         \\ B1, B1_R2
     23: 0, // "NEST_THERMOSTAT"                        \\
     24: 1, // "GSM_SOCKET"                             \\
-    25: 0, // "AROMATHERAPY",                          \\ Diffuser
+    25: 0, // "AROMATHERAPY",                          \\ Diffuser,  Komeito 1515-X
     26: 0, // "RuiMiTeWenKongQi"                       \\
     27: 1, // "GSM_UNLIMIT_SOCKET"                     \\
     28: 1, // "RF_BRIDGE"                              \\ RFBridge, RF_Bridge

From eb3ed14f7b013db91de0c584f5adca6556ed68b6 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 4 Nov 2020 19:18:32 +0000
Subject: [PATCH 0665/3183] 3.11.1-0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index f894ce79..da43220f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.11.0",
+  "version": "3.11.1-0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 489ced8f..707103bd 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.11.0",
+  "version": "3.11.1-0",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 09726764d225b0b49641ea2d5c03abaf96f6a497 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 5 Nov 2020 11:03:54 +0000
Subject: [PATCH 0666/3183] diffuser more support

---
 lib/device/diffuser.js | 120 ++++++++++++++++++++++++++++++++++++++---
 lib/helpers.js         |  10 ++--
 2 files changed, 120 insertions(+), 10 deletions(-)

diff --git a/lib/device/diffuser.js b/lib/device/diffuser.js
index a16abdae..966cf348 100644
--- a/lib/device/diffuser.js
+++ b/lib/device/diffuser.js
@@ -1,20 +1,41 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
+const convert = require('color-convert')
 const helpers = require('./../helpers')
 module.exports = class deviceDiffuser {
   constructor (platform, accessory) {
     this.platform = platform
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
-    const service = accessory.getService(this.Service.Lightbulb) || accessory.addService(this.Service.Lightbulb)
-    service
+    const onOffService = accessory.getService('Diffuser') || accessory.addService(this.Service.Fan, 'Diffuser', 'diffuser')
+    const lightService = accessory.getService('Light') || accessory.addService(this.Service.Lightbulb, 'Light', 'light')
+    onOffService
       .getCharacteristic(this.Characteristic.On)
-      .on('set', (value, callback) => this.internalSwitchUpdate(value, callback))
+      .on('set', (value, callback) => this.internalDiffuserOnOffUpdate(value, callback))
+    this.accessory = accessory
+    onOffService
+      .getCharacteristic(this.Characteristic.RotationSpeed)
+      .on('set', (value, callback) => this.internalDiffuserStateUpdate(value, callback))
+      .setProps({
+        minStep: 50
+      })
+    lightService
+      .getCharacteristic(this.Characteristic.On)
+      .on('set', (value, callback) => this.internalLightOnOffUpdate(value, callback))
+    lightService
+      .getCharacteristic(this.Characteristic.Brightness)
+      .on('set', (value, callback) => this.internalLightBrightnessUpdate(value, callback))
+    lightService
+      .getCharacteristic(this.Characteristic.Hue)
+      .on('set', (value, callback) => this.internalLightColourUpdate(value, callback))
+    lightService
+      .getCharacteristic(this.Characteristic.Saturation)
+      .on('set', (value, callback) => callback())
     this.accessory = accessory
   }
 
-  async internalSwitchUpdate (value, callback) {
+  async internalDiffuserOnOffUpdate (value, callback) {
     callback()
     try {
       const params = { switch: value ? 'on' : 'off' }
@@ -24,10 +45,97 @@ module.exports = class deviceDiffuser {
     }
   }
 
+  async internalDiffuserStateUpdate (value, callback) {
+    try {
+      await helpers.sleep(1000)
+      callback()
+      if (value === 0) return
+      const value = value <= 75 ? 50 : 100
+      const params = { state: value / 2 }
+      this.accessory.context.cacheState = value
+      await this.platform.sendDeviceUpdate(this.accessory, params)
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, true)
+    }
+  }
+
+  async internalLightOnOffUpdate (value, callback) {
+    try {
+      callback()
+      const params = { lightswitch: value ? 1 : 0 }
+      await this.platform.sendDeviceUpdate(this.accessory, params)
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, true)
+    }
+  }
+
+  async internalLightBrightnessUpdate (value, callback) {
+    try {
+      await helpers.sleep(1000)
+      callback()
+      const updateKeyBright = Math.random().toString(36).substr(2, 8)
+      this.accessory.context.updateKeyBright = updateKeyBright
+      const params = {
+        lightbright: value
+      }
+      await helpers.sleep(500)
+      if (updateKeyBright !== this.accessory.context.updateKeyBright) return
+      await this.platform.sendDeviceUpdate(this.accessory, params)
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, true)
+    }
+  }
+
+  async internalLightColourUpdate (value, callback) {
+    callback()
+    try {
+      const updateKeyColour = Math.random().toString(36).substr(2, 8)
+      this.accessory.context.updateKeyColour = updateKeyColour
+      const newRGB = convert.hsv.rgb(value, this.accessory.getService('Light')
+        .getCharacteristic(this.Characteristic.Saturation).value, 100)
+      const params = {
+        lightRcolor: newRGB[0],
+        lightGcolor: newRGB[1],
+        lightBcolor: newRGB[2]
+      }
+      await helpers.sleep(500)
+      if (updateKeyColour !== this.accessory.context.updateKeyColour) return
+      await this.platform.sendDeviceUpdate(this.accessory, params)
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, true)
+    }
+  }
+
   async externalUpdate (params) {
     try {
-      if (!helpers.hasProperty(params, 'switch')) return
-      this.accessory.getService(this.Service.Lightbulb).updateCharacteristic(this.Characteristic.On, params.switch === 'on')
+      if (helpers.hasProperty(params, 'switch')) {
+        this.accessory.getService('Diffuser').updateCharacteristic(this.Characteristic.On, params.switch === 'on')
+        if (!helpers.hasProperty(params, 'state')) {
+          this.accessory.getService('Diffuser').updateCharacteristic(this.Characteristic.RotationSpeed, this.accessory.context.cacheState)
+        }
+      }
+      if (helpers.hasProperty(params, 'state')) {
+        this.accessory.getService('Diffuser').updateCharacteristic(this.Characteristic.RotationSpeed, params.state * 50)
+        this.accessory.context.cacheState = params.state * 50
+      }
+      if (helpers.hasProperty(params, 'lightswitch')) {
+        this.accessory.getService('Light')
+          .updateCharacteristic(this.Characteristic.On, params.lightswitch === 1)
+      }
+      if (helpers.hasProperty(params, 'lightbright')) {
+        this.accessory.getService('Light')
+          .updateCharacteristic(this.Characteristic.Brightness, params.lightbright)
+      }
+      if (
+        helpers.hasProperty(params, 'lightRcolor') &&
+        helpers.hasProperty(params, 'lightGcolor') &&
+        helpers.hasProperty(params, 'lightBcolor')
+      ) {
+        const newColour = convert.rgb.hsv(params.lightRcolor, params.lightGcolor, params.lightBcolor)
+        this.accessory.getService('Light')
+          .updateCharacteristic(this.Characteristic.Hue, newColour[0])
+          .updateCharacteristic(this.Characteristic.Saturation, 100)
+      }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
diff --git a/lib/helpers.js b/lib/helpers.js
index 47bd7483..2efccb01 100644
--- a/lib/helpers.js
+++ b/lib/helpers.js
@@ -38,10 +38,12 @@ module.exports = {
     'channel', 'cmd', 'color', 'colorB',
     'colorG', 'colorR', 'current',
     'currentHumidity', 'currentTemperature',
-    'humidity', 'key', 'lock', 'ltype',
-    'mainSwitch', 'mode', 'motion', 'online',
-    'power', 'rfChl', 'rfList', 'rfTrig',
-    'sensorType', 'setclose', 'state',
+    'humidity', 'key', 'lightbright',
+    'lightswitch', 'lightRcolor',
+    'lightGcolor', 'lightBcolor', 'lock',
+    'ltype', 'mainSwitch', 'mode', 'motion',
+    'online', 'power', 'rfChl', 'rfList',
+    'rfTrig', 'sensorType', 'setclose', 'state',
     'switch', 'switches', 'temperature',
     'trigTime', 'type', 'voltage', 'zyx_mode'
   ],

From d6ad61be7a730b04a8a8901dad39f4891d275972 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 5 Nov 2020 11:05:29 +0000
Subject: [PATCH 0667/3183] diffuser fix

---
 lib/device/diffuser.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/device/diffuser.js b/lib/device/diffuser.js
index 966cf348..90b6594f 100644
--- a/lib/device/diffuser.js
+++ b/lib/device/diffuser.js
@@ -50,7 +50,7 @@ module.exports = class deviceDiffuser {
       await helpers.sleep(1000)
       callback()
       if (value === 0) return
-      const value = value <= 75 ? 50 : 100
+      value = value <= 75 ? 50 : 100
       const params = { state: value / 2 }
       this.accessory.context.cacheState = value
       await this.platform.sendDeviceUpdate(this.accessory, params)

From cc29c9597c694b1dff5c1313c8d68c7f268a4542 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 5 Nov 2020 11:06:05 +0000
Subject: [PATCH 0668/3183] 3.11.1-1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index da43220f..06296a1e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.11.1-0",
+  "version": "3.11.1-1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 707103bd..3f7b8ba8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.11.1-0",
+  "version": "3.11.1-1",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 13bcfbb4db537e617ec48dd353988720ac3281e7 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 5 Nov 2020 12:12:46 +0000
Subject: [PATCH 0669/3183] colour improvements

---
 lib/device/diffuser.js | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/lib/device/diffuser.js b/lib/device/diffuser.js
index 90b6594f..ae8bcf86 100644
--- a/lib/device/diffuser.js
+++ b/lib/device/diffuser.js
@@ -71,7 +71,7 @@ module.exports = class deviceDiffuser {
 
   async internalLightBrightnessUpdate (value, callback) {
     try {
-      await helpers.sleep(1000)
+      await helpers.sleep(2000)
       callback()
       const updateKeyBright = Math.random().toString(36).substr(2, 8)
       this.accessory.context.updateKeyBright = updateKeyBright
@@ -87,12 +87,16 @@ module.exports = class deviceDiffuser {
   }
 
   async internalLightColourUpdate (value, callback) {
-    callback()
     try {
+      await helpers.sleep(2000)
+      callback()
       const updateKeyColour = Math.random().toString(36).substr(2, 8)
       this.accessory.context.updateKeyColour = updateKeyColour
-      const newRGB = convert.hsv.rgb(value, this.accessory.getService('Light')
-        .getCharacteristic(this.Characteristic.Saturation).value, 100)
+      const newRGB = convert.hsv.rgb(
+        value,
+        this.accessory.getService('Light').getCharacteristic(this.Characteristic.Saturation).value,
+        100
+      )
       const params = {
         lightRcolor: newRGB[0],
         lightGcolor: newRGB[1],

From d01c81aeafd9a9af70d849e9d4a652d7bc8fbab4 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 5 Nov 2020 12:13:29 +0000
Subject: [PATCH 0670/3183] 3.11.1-2

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 06296a1e..7e4cba17 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.11.1-1",
+  "version": "3.11.1-2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 3f7b8ba8..560f6e08 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.11.1-1",
+  "version": "3.11.1-2",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From dd4d10c5bc5a6d0b99fd6d4630fc80f8ac72a6f4 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 5 Nov 2020 12:46:06 +0000
Subject: [PATCH 0671/3183] send update last

---
 lib/device/switch-multi.js | 32 +++++++++-----------------------
 lib/device/valve.js        |  2 +-
 2 files changed, 10 insertions(+), 24 deletions(-)

diff --git a/lib/device/switch-multi.js b/lib/device/switch-multi.js
index 4722b0d9..11c7c193 100644
--- a/lib/device/switch-multi.js
+++ b/lib/device/switch-multi.js
@@ -31,6 +31,7 @@ module.exports = class deviceSwitch {
     callback()
     try {
       let oAccessory
+      let masterState = 'off'
       const params = {}
       switch (this.accessory.context.switchNumber) {
         case '0':
@@ -39,6 +40,11 @@ module.exports = class deviceSwitch {
           params.switches[1].switch = value ? 'on' : 'off'
           params.switches[2].switch = value ? 'on' : 'off'
           params.switches[3].switch = value ? 'on' : 'off'
+          for (let i = 0; i <= 4; i++) {
+            if ((oAccessory = this.platform.devicesInHB.get(this.accessory.context.eweDeviceId + 'SW' + i))) {
+              oAccessory.getService(this.Service.Switch).updateCharacteristic(this.Characteristic.On, value)
+            }
+          }
           break
         case '1':
         case '2':
@@ -55,28 +61,8 @@ module.exports = class deviceSwitch {
             } else {
               params.switches[i - 1].switch = 'off'
             }
-          }
-          break
-      }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
-      switch (this.accessory.context.switchNumber) {
-        case '0':
-          for (let i = 0; i <= 4; i++) {
-            if ((oAccessory = this.platform.devicesInHB.get(this.accessory.context.eweDeviceId + 'SW' + i))) {
-              oAccessory.getService(this.Service.Switch).updateCharacteristic(this.Characteristic.On, value)
-            }
-          }
-          break
-        case '1':
-        case '2':
-        case '3':
-        case '4': {
-          let masterState = 'off'
-          for (let i = 1; i <= 4; i++) {
-            if ((oAccessory = this.platform.devicesInHB.get(this.accessory.context.eweDeviceId + 'SW' + i))) {
-              if (oAccessory.getService(this.Service.Switch).getCharacteristic(this.Characteristic.On).value) {
-                masterState = 'on'
-              }
+            if (oAccessory.getService(this.Service.Switch).getCharacteristic(this.Characteristic.On).value) {
+              masterState = 'on'
             }
           }
           if (!this.platform.hiddenMasters.includes(this.accessory.context.eweDeviceId)) {
@@ -84,8 +70,8 @@ module.exports = class deviceSwitch {
             oAccessory.getService(this.Service.Switch).updateCharacteristic(this.Characteristic.On, masterState === 'on')
           }
           break
-        }
       }
+      await this.platform.sendDeviceUpdate(this.accessory, params)
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
     }
diff --git a/lib/device/valve.js b/lib/device/valve.js
index e5bc5633..9cb81422 100644
--- a/lib/device/valve.js
+++ b/lib/device/valve.js
@@ -65,7 +65,6 @@ module.exports = class deviceValve {
           params.switches[1].switch = value ? 'on' : 'off'
           break
       }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
       serviceValve
         .updateCharacteristic(this.Characteristic.InUse, value)
       switch (value) {
@@ -80,6 +79,7 @@ module.exports = class deviceValve {
           break
         }
       }
+      await this.platform.sendDeviceUpdate(this.accessory, params)
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
     }

From c22ca651c2d29bf4f975147bd44a8dd5332449f3 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 5 Nov 2020 12:46:11 +0000
Subject: [PATCH 0672/3183] template device

---
 lib/device/template.js | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 lib/device/template.js

diff --git a/lib/device/template.js b/lib/device/template.js
new file mode 100644
index 00000000..96b3e25d
--- /dev/null
+++ b/lib/device/template.js
@@ -0,0 +1,32 @@
+/* jshint -W014, -W033, esversion: 9 */
+/* eslint-disable new-cap */
+'use strict'
+module.exports = class deviceTemplate {
+  constructor (platform, accessory) {
+    this.platform = platform
+    this.Service = platform.api.hap.Service
+    this.Characteristic = platform.api.hap.Characteristic
+    const service = accessory.getService(this.Service.Switch) || accessory.addService(this.Service.Switch)
+    service
+      .getCharacteristic(this.Characteristic.On)
+      .on('set', (value, callback) => this.internalUpdate(value, callback))
+    this.accessory = accessory
+  }
+
+  async internalUpdate (value, callback) {
+    callback()
+    try {
+
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, true)
+    }
+  }
+
+  async externalUpdate (params) {
+    try {
+
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, false)
+    }
+  }
+}

From c628e9be4b9695c17e68413184789c0b196a5584 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 5 Nov 2020 12:47:23 +0000
Subject: [PATCH 0673/3183] 3.11.1-3

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 7e4cba17..3df90786 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.11.1-2",
+  "version": "3.11.1-3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 560f6e08..945ac85c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.11.1-2",
+  "version": "3.11.1-3",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 404977b90adaedf11bc3f2957f2059194b645f30 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 5 Nov 2020 12:53:22 +0000
Subject: [PATCH 0674/3183] Update switch-multi.js

---
 lib/device/switch-multi.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/device/switch-multi.js b/lib/device/switch-multi.js
index 11c7c193..1163cb0c 100644
--- a/lib/device/switch-multi.js
+++ b/lib/device/switch-multi.js
@@ -53,6 +53,9 @@ module.exports = class deviceSwitch {
           params.switches = helpers.defaultMultiSwitchOff
           for (let i = 1; i <= 4; i++) {
             if ((oAccessory = this.platform.devicesInHB.get(this.accessory.context.eweDeviceId + 'SW' + i))) {
+              if (oAccessory.getService(this.Service.Switch).getCharacteristic(this.Characteristic.On).value) {
+                masterState = 'on'
+              }
               if (i === parseInt(this.accessory.context.switchNumber)) {
                 params.switches[i - 1].switch = value ? 'on' : 'off'
               } else {
@@ -61,9 +64,6 @@ module.exports = class deviceSwitch {
             } else {
               params.switches[i - 1].switch = 'off'
             }
-            if (oAccessory.getService(this.Service.Switch).getCharacteristic(this.Characteristic.On).value) {
-              masterState = 'on'
-            }
           }
           if (!this.platform.hiddenMasters.includes(this.accessory.context.eweDeviceId)) {
             oAccessory = this.platform.devicesInHB.get(this.accessory.context.eweDeviceId + 'SW0')

From c2c224bebf7e9187d0996678cb5b42737219f58d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 5 Nov 2020 13:23:45 +0000
Subject: [PATCH 0675/3183] 3.11.1-4

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 3df90786..48cba590 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.11.1-3",
+  "version": "3.11.1-4",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 945ac85c..882facbb 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.11.1-3",
+  "version": "3.11.1-4",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From ad1eec9047cef002424f3811762274196b75f7c5 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Fri, 6 Nov 2020 10:23:17 +0000
Subject: [PATCH 0676/3183] Update README.md

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index f73a85c9..941872f3 100644
--- a/README.md
+++ b/README.md
@@ -27,6 +27,7 @@ To use this plugin, you will need to already have [Homebridge](https://homebridg
 * [Beta Version](https://github.com/bwp91/homebridge-ewelink/wiki/Beta-Version)
 ### Features
 * [Supported Devices](https://github.com/bwp91/homebridge-ewelink/wiki/Supported-Devices)
+* [Multi Channel Devices](https://github.com/bwp91/homebridge-ewelink/wiki/Multi-Channel-Devices)
 * [Accessory Simulations](https://github.com/bwp91/homebridge-ewelink/wiki/Accessory-Simulations)
 * [Connection Methods](https://github.com/bwp91/homebridge-ewelink/wiki/Connection-Methods)
 ### How-to Guides

From 0ffddea69f785fcde431cb78dff18cb19e42a79c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 6 Nov 2020 10:43:10 +0000
Subject: [PATCH 0677/3183] L1 hk scene fix?

---
 lib/device/light-colour.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/device/light-colour.js b/lib/device/light-colour.js
index 92a7d0c2..fe68041a 100644
--- a/lib/device/light-colour.js
+++ b/lib/device/light-colour.js
@@ -49,8 +49,8 @@ module.exports = class deviceLightColour {
           await this.platform.sendDeviceUpdate(this.accessory, params)
           break
         case 'brightness': {
-          const updateKey = Math.random().toString(36).substr(2, 8)
-          this.accessory.context.updateKey = updateKey
+          const updateKeyBright = Math.random().toString(36).substr(2, 8)
+          this.accessory.context.updateKeyBright = updateKeyBright
           switch (this.accessory.context.eweUIID) {
             case 22:
               // *** B1 doesn't support brightness *** \\
@@ -76,13 +76,13 @@ module.exports = class deviceLightColour {
               break
           }
           await helpers.sleep(500)
-          if (updateKey !== this.accessory.context.updateKey) return
+          if (updateKeyBright !== this.accessory.context.updateKeyBright) return
           await this.platform.sendDeviceUpdate(this.accessory, params)
           break
         }
         case 'hue': {
-          const updateKey = Math.random().toString(36).substr(2, 8)
-          this.accessory.context.updateKey = updateKey
+          const updateKeyColour = Math.random().toString(36).substr(2, 8)
+          this.accessory.context.updateKeyColour = updateKeyColour
           newRGB = convert.hsv.rgb(value, lightService.getCharacteristic(this.Characteristic.Saturation).value, 100)
           switch (this.accessory.context.eweUIID) {
             case 22:
@@ -122,8 +122,8 @@ module.exports = class deviceLightColour {
               this.accessory.context.cacheB = newRGB[2]
               break
           }
-          await helpers.sleep(500)
-          if (updateKey !== this.accessory.context.updateKey) return
+          await helpers.sleep(1000)
+          if (updateKeyColour !== this.accessory.context.updateKeyColour) return
           await this.platform.sendDeviceUpdate(this.accessory, params)
           break
         }

From 660d5188820248df4ea26eb62c13fca1b3f02f70 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 6 Nov 2020 10:44:15 +0000
Subject: [PATCH 0678/3183] 3.11.1-5

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 48cba590..4661b466 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.11.1-4",
+  "version": "3.11.1-5",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 882facbb..114783d4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.11.1-4",
+  "version": "3.11.1-5",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From e65cb7b5f896c9015fde3aff807e5294d3ecf5be Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 6 Nov 2020 12:04:41 +0000
Subject: [PATCH 0679/3183] Update light-colour.js

---
 lib/device/light-colour.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/device/light-colour.js b/lib/device/light-colour.js
index fe68041a..a4c7320f 100644
--- a/lib/device/light-colour.js
+++ b/lib/device/light-colour.js
@@ -75,7 +75,7 @@ module.exports = class deviceLightColour {
               }
               break
           }
-          await helpers.sleep(500)
+          await helpers.sleep(1000)
           if (updateKeyBright !== this.accessory.context.updateKeyBright) return
           await this.platform.sendDeviceUpdate(this.accessory, params)
           break
@@ -122,7 +122,7 @@ module.exports = class deviceLightColour {
               this.accessory.context.cacheB = newRGB[2]
               break
           }
-          await helpers.sleep(1000)
+          await helpers.sleep(2000)
           if (updateKeyColour !== this.accessory.context.updateKeyColour) return
           await this.platform.sendDeviceUpdate(this.accessory, params)
           break

From 707731cb2433350da60a9a2f8345ad499bb0af76 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 6 Nov 2020 12:05:20 +0000
Subject: [PATCH 0680/3183] 3.11.1-6

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 4661b466..018015d0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.11.1-5",
+  "version": "3.11.1-6",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 114783d4..de3e7886 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.11.1-5",
+  "version": "3.11.1-6",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 9b89f3a01aa5b82b93f51cc5b4cbe7e4a967832d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 6 Nov 2020 12:31:27 +0000
Subject: [PATCH 0681/3183] Update light-colour.js

---
 lib/device/light-colour.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/device/light-colour.js b/lib/device/light-colour.js
index a4c7320f..fe68041a 100644
--- a/lib/device/light-colour.js
+++ b/lib/device/light-colour.js
@@ -75,7 +75,7 @@ module.exports = class deviceLightColour {
               }
               break
           }
-          await helpers.sleep(1000)
+          await helpers.sleep(500)
           if (updateKeyBright !== this.accessory.context.updateKeyBright) return
           await this.platform.sendDeviceUpdate(this.accessory, params)
           break
@@ -122,7 +122,7 @@ module.exports = class deviceLightColour {
               this.accessory.context.cacheB = newRGB[2]
               break
           }
-          await helpers.sleep(2000)
+          await helpers.sleep(1000)
           if (updateKeyColour !== this.accessory.context.updateKeyColour) return
           await this.platform.sendDeviceUpdate(this.accessory, params)
           break

From f6dc92a68cd61ecd3fe35f8330a1bd465bc890ac Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 6 Nov 2020 12:55:10 +0000
Subject: [PATCH 0682/3183] remove duplicate error check

---
 lib/ewelink-platform.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/ewelink-platform.js b/lib/ewelink-platform.js
index 8ae35653..30a6adf9 100644
--- a/lib/ewelink-platform.js
+++ b/lib/ewelink-platform.js
@@ -74,7 +74,6 @@ module.exports = class eWeLinkPlatform {
       this.httpClient = new eWeLinkHTTP(this.config, this.log)
       await this.httpClient.getHost()
       this.authData = await this.httpClient.login()
-      if (this.authData === undefined) throw new Error('No auth data received from eWeLink.')
       const deviceList = await this.httpClient.getDevices()
       deviceList.forEach(device => this.devicesInEW.set(device.deviceid, device))
       this.wsClient = new eWeLinkWS(this.config, this.log, this.authData)

From 004deeee757eba97100cc3725885616a6caea584 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 6 Nov 2020 13:52:57 +0000
Subject: [PATCH 0683/3183] 3.11.1-7

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 018015d0..754f0c99 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.11.1-6",
+  "version": "3.11.1-7",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index de3e7886..0522db14 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.11.1-6",
+  "version": "3.11.1-7",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 00f3e286704167fbb402f64f5d0080a58151c94c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 6 Nov 2020 13:54:15 +0000
Subject: [PATCH 0684/3183] 3.11.1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 754f0c99..51d79aff 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.11.1-7",
+  "version": "3.11.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 0522db14..bfcd25fb 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.11.1-7",
+  "version": "3.11.1",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 84f4c18f1fbaac3c23e92c13be8ea3408b31bb2b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 7 Nov 2020 09:54:23 +0000
Subject: [PATCH 0685/3183] fix for valves #137

---
 lib/device/valve.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/device/valve.js b/lib/device/valve.js
index 9cb81422..0179331a 100644
--- a/lib/device/valve.js
+++ b/lib/device/valve.js
@@ -9,16 +9,16 @@ module.exports = class deviceValve {
     this.Characteristic = platform.api.hap.Characteristic
     ;['A', 'B'].forEach(v => {
       let valveService
-      const valveConfig = this.platform.cusG.get(this.accessory.context.hbDeviceId)
-      if (!(valveService = this.accessory.getService('Valve ' + v))) {
-        this.accessory
+      const valveConfig = this.platform.cusG.get(accessory.context.hbDeviceId)
+      if (!(valveService = accessory.getService('Valve ' + v))) {
+        accessory
           .addService(this.Service.Valve, 'Valve ' + v, 'valve' + v.toLowerCase())
           .setCharacteristic(this.Characteristic.Active, 0)
           .setCharacteristic(this.Characteristic.InUse, 0)
           .setCharacteristic(this.Characteristic.ValveType, 1)
           .setCharacteristic(this.Characteristic.SetDuration, Math.round((valveConfig.operationTime || 1200) / 10))
           .addCharacteristic(this.Characteristic.RemainingDuration)
-        valveService = this.accessory.getService('Valve ' + v)
+        valveService = accessory.getService('Valve ' + v)
       }
       valveService
         .getCharacteristic(this.Characteristic.Active)

From 3c7ba5bf33bca54cc9023437b284875ce9d0bb1e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 7 Nov 2020 10:14:20 +0000
Subject: [PATCH 0686/3183] update cache on switch update

---
 lib/device/switch-multi.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/device/switch-multi.js b/lib/device/switch-multi.js
index 1163cb0c..0845e1ca 100644
--- a/lib/device/switch-multi.js
+++ b/lib/device/switch-multi.js
@@ -58,6 +58,7 @@ module.exports = class deviceSwitch {
               }
               if (i === parseInt(this.accessory.context.switchNumber)) {
                 params.switches[i - 1].switch = value ? 'on' : 'off'
+                oAccessory.context.cacheOn = value
               } else {
                 params.switches[i - 1].switch = oAccessory.context.cacheOn ? 'on' : 'off'
               }

From 465bdae359de61046ab1490262591f4315c4e0ec Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 7 Nov 2020 11:14:18 +0000
Subject: [PATCH 0687/3183] 3.11.2-0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 51d79aff..ab5e7b7f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.11.1",
+  "version": "3.11.2-0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index bfcd25fb..00bbee34 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.11.1",
+  "version": "3.11.2-0",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 5d0d3d474604021a98f290c80eca424192fedb4f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 7 Nov 2020 21:44:35 +0000
Subject: [PATCH 0688/3183] clarify numbers

---
 config.schema.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 4d770c92..871adb6e 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -157,19 +157,19 @@
                   ]
                 },
                 {
-                  "title": "Window Blind (using multi-channel device)",
+                  "title": "1 Window Blind (using multi-channel device)",
                   "enum": [
                     "blind"
                   ]
                 },
                 {
-                  "title": "Lock (using single channel device)",
+                  "title": "1 Lock (using single channel device)",
                   "enum": [
                     "lock"
                   ]
                 },
                 {
-                  "title": "Irrigation/Sprinkler (using multi-channel device)",
+                  "title": "2 Irrigation Valves (using multi-channel device)",
                   "enum": [
                     "valve"
                   ]

From 198478800ed4d33697f3ce56d976ba1713b3eb55 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 7 Nov 2020 21:45:04 +0000
Subject: [PATCH 0689/3183] =?UTF-8?q?=E2=9A=A0=EF=B8=8F=20valve=20to=20val?=
 =?UTF-8?q?ve=5Ftwo?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config.schema.json                    |  2 +-
 lib/device/{valve.js => valve-two.js} |  2 +-
 lib/ewelink-platform.js               | 12 ++++++------
 lib/helpers.js                        |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)
 rename lib/device/{valve.js => valve-two.js} (99%)

diff --git a/config.schema.json b/config.schema.json
index 871adb6e..adf13ec7 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -171,7 +171,7 @@
                 {
                   "title": "2 Irrigation Valves (using multi-channel device)",
                   "enum": [
-                    "valve"
+                    "valve_two"
                   ]
                 }
               ]
diff --git a/lib/device/valve.js b/lib/device/valve-two.js
similarity index 99%
rename from lib/device/valve.js
rename to lib/device/valve-two.js
index 0179331a..893738e7 100644
--- a/lib/device/valve.js
+++ b/lib/device/valve-two.js
@@ -2,7 +2,7 @@
 /* eslint-disable new-cap */
 'use strict'
 const helpers = require('./../helpers')
-module.exports = class deviceValve {
+module.exports = class deviceValveTwo {
   constructor (platform, accessory) {
     this.platform = platform
     this.Service = platform.api.hap.Service
diff --git a/lib/ewelink-platform.js b/lib/ewelink-platform.js
index 30a6adf9..c3c74ad3 100644
--- a/lib/ewelink-platform.js
+++ b/lib/ewelink-platform.js
@@ -8,7 +8,7 @@ const deviceGarageTwo = require('./device/garage-two')
 const deviceGarageFour = require('./device/garage-four')
 const deviceGarageEachen = require('./device/garage-eachen')
 const deviceLock = require('./device/lock')
-const deviceValve = require('./device/valve')
+const deviceValveTwo = require('./device/valve-two')
 const deviceSensor = require('./device/sensor')
 const deviceFan = require('./device/fan')
 const deviceDiffuser = require('./device/diffuser')
@@ -218,14 +218,14 @@ module.exports = class eWeLinkPlatform {
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new deviceLock(this, accessory)
         /**************************/
-      } else if (this.cusG.has(device.deviceid + 'SWX') && this.cusG.get(device.deviceid + 'SWX').type === 'valve') {
-        /****************************
-        VALVES [ACCESSORY SIMULATION]
-        ****************************/
+      } else if (this.cusG.has(device.deviceid + 'SWX') && this.cusG.get(device.deviceid + 'SWX').type === 'valve_two') {
+        /**********************************
+        VALVES [TWO] [ACCESSORY SIMULATION]
+        **********************************/
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
           : this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new deviceValve(this, accessory)
+        accessory.control = new deviceValveTwo(this, accessory)
         /***************************/
       } else if (helpers.devicesSensor.includes(device.extra.uiid)) {
         /*******************
diff --git a/lib/helpers.js b/lib/helpers.js
index 2efccb01..878aae37 100644
--- a/lib/helpers.js
+++ b/lib/helpers.js
@@ -7,7 +7,7 @@ module.exports = {
   appId: 'oeVkj2lYFGnJu5XUtWisfW4utiN4u9Mq',
   appSecret: '6Nz4n0xA8s8qdxQf2GqurZj2Fs55FUvM',
   httpRetryCodes: ['ENOTFOUND', 'ETIMEDOUT', 'EAI_AGAIN'],
-  allowedGroups: ['blind', 'garage', 'garage_two', 'garage_four', 'garage_eachen', 'lock', 'valve'],
+  allowedGroups: ['blind', 'garage', 'garage_two', 'garage_four', 'garage_eachen', 'lock', 'valve_two'],
   defaults: {
     inUsePowerThreshold: 0,
     lowBattThreshold: 25,

From 65077d0421224ea4d57cb07f0049617eb48cbc3e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 7 Nov 2020 21:47:17 +0000
Subject: [PATCH 0690/3183] clarify for valves

---
 config.schema.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config.schema.json b/config.schema.json
index adf13ec7..a27d5f72 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -201,7 +201,7 @@
             "operationTime": {
               "type": "integer",
               "title": "Operation Time (Deciseconds)",
-              "description": "Blinds/garage doors: the time to fully open/close the device. Locks: the time to show as unlocked. Irrigation: the time the valves will open for. This setting is in deciseconds - count the time in seconds and multiply by 10, for example 100 for 10 seconds or 75 for 7.5 seconds.",
+              "description": "Blinds/garage doors: the time to fully open/close the device. Locks: the time to show as unlocked. Irrigation: an initial default time for HomeKit. This setting is in deciseconds - count the time in seconds and multiply by 10, for example 100 for 10 seconds or 75 for 7.5 seconds.",
               "default": 100,
               "minimum": 10,
               "maximum": 600

From 2786a1a17fe18cbdcf3e1bc9c738474fa5625971 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 7 Nov 2020 21:51:58 +0000
Subject: [PATCH 0691/3183] building blocks for valve (one)

---
 config.schema.json      |  6 ++++++
 lib/device/valve.js     | 32 ++++++++++++++++++++++++++++++++
 lib/ewelink-platform.js | 10 ++++++++++
 lib/helpers.js          |  2 +-
 4 files changed, 49 insertions(+), 1 deletion(-)
 create mode 100644 lib/device/valve.js

diff --git a/config.schema.json b/config.schema.json
index a27d5f72..608c3a36 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -168,6 +168,12 @@
                     "lock"
                   ]
                 },
+                {
+                  "title": "1 Irrigation Valve (using single-channel device)",
+                  "enum": [
+                    "valve"
+                  ]
+                },
                 {
                   "title": "2 Irrigation Valves (using multi-channel device)",
                   "enum": [
diff --git a/lib/device/valve.js b/lib/device/valve.js
new file mode 100644
index 00000000..be54a971
--- /dev/null
+++ b/lib/device/valve.js
@@ -0,0 +1,32 @@
+/* jshint -W014, -W033, esversion: 9 */
+/* eslint-disable new-cap */
+'use strict'
+module.exports = class deviceValve {
+  constructor (platform, accessory) {
+    this.platform = platform
+    this.Service = platform.api.hap.Service
+    this.Characteristic = platform.api.hap.Characteristic
+    const service = accessory.getService(this.Service.Switch) || accessory.addService(this.Service.Switch)
+    service
+      .getCharacteristic(this.Characteristic.On)
+      .on('set', (value, callback) => this.internalUpdate(value, callback))
+    this.accessory = accessory
+  }
+
+  async internalUpdate (value, callback) {
+    callback()
+    try {
+
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, true)
+    }
+  }
+
+  async externalUpdate (params) {
+    try {
+
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, false)
+    }
+  }
+}
diff --git a/lib/ewelink-platform.js b/lib/ewelink-platform.js
index c3c74ad3..e71119f6 100644
--- a/lib/ewelink-platform.js
+++ b/lib/ewelink-platform.js
@@ -8,6 +8,7 @@ const deviceGarageTwo = require('./device/garage-two')
 const deviceGarageFour = require('./device/garage-four')
 const deviceGarageEachen = require('./device/garage-eachen')
 const deviceLock = require('./device/lock')
+const deviceValve = require('./device/valve')
 const deviceValveTwo = require('./device/valve-two')
 const deviceSensor = require('./device/sensor')
 const deviceFan = require('./device/fan')
@@ -218,6 +219,15 @@ module.exports = class eWeLinkPlatform {
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new deviceLock(this, accessory)
         /**************************/
+      } else if (this.cusG.has(device.deviceid + 'SWX') && this.cusG.get(device.deviceid + 'SWX').type === 'valve') {
+        /**********************************
+        VALVES [ONE] [ACCESSORY SIMULATION]
+        **********************************/
+        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
+          ? this.devicesInHB.get(device.deviceid + 'SWX')
+          : this.addAccessory(device, device.deviceid + 'SWX')
+        accessory.control = new deviceValve(this, accessory)
+        /***************************/
       } else if (this.cusG.has(device.deviceid + 'SWX') && this.cusG.get(device.deviceid + 'SWX').type === 'valve_two') {
         /**********************************
         VALVES [TWO] [ACCESSORY SIMULATION]
diff --git a/lib/helpers.js b/lib/helpers.js
index 878aae37..bcb3f2b0 100644
--- a/lib/helpers.js
+++ b/lib/helpers.js
@@ -7,7 +7,7 @@ module.exports = {
   appId: 'oeVkj2lYFGnJu5XUtWisfW4utiN4u9Mq',
   appSecret: '6Nz4n0xA8s8qdxQf2GqurZj2Fs55FUvM',
   httpRetryCodes: ['ENOTFOUND', 'ETIMEDOUT', 'EAI_AGAIN'],
-  allowedGroups: ['blind', 'garage', 'garage_two', 'garage_four', 'garage_eachen', 'lock', 'valve_two'],
+  allowedGroups: ['blind', 'garage', 'garage_two', 'garage_four', 'garage_eachen', 'lock', 'valve', 'valve_two'],
   defaults: {
     inUsePowerThreshold: 0,
     lowBattThreshold: 25,

From dff49eb79ce5998d27861ac09e6287e8cceddec6 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 7 Nov 2020 22:00:53 +0000
Subject: [PATCH 0692/3183] formatting

---
 lib/device/valve-two.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/lib/device/valve-two.js b/lib/device/valve-two.js
index 893738e7..c4d014b9 100644
--- a/lib/device/valve-two.js
+++ b/lib/device/valve-two.js
@@ -29,9 +29,7 @@ module.exports = class deviceValveTwo {
           if (valveService.getCharacteristic(this.Characteristic.InUse).value) {
             valveService.updateCharacteristic(this.Characteristic.RemainingDuration, value)
             clearTimeout(valveService.timer)
-            valveService.timer = setTimeout(() => {
-              valveService.setCharacteristic(this.Characteristic.Active, 0)
-            }, value * 1000)
+            valveService.timer = setTimeout(() => valveService.setCharacteristic(this.Characteristic.Active, 0), value * 1000)
           }
           callback()
         })

From de296e7d5c23739ebabed6513e6c0455d805534b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 7 Nov 2020 22:01:14 +0000
Subject: [PATCH 0693/3183] valve one initial attempt

---
 lib/device/valve.js | 57 +++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 52 insertions(+), 5 deletions(-)

diff --git a/lib/device/valve.js b/lib/device/valve.js
index be54a971..8ca7e0b7 100644
--- a/lib/device/valve.js
+++ b/lib/device/valve.js
@@ -6,17 +6,52 @@ module.exports = class deviceValve {
     this.platform = platform
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
-    const service = accessory.getService(this.Service.Switch) || accessory.addService(this.Service.Switch)
-    service
-      .getCharacteristic(this.Characteristic.On)
+    let valveService
+    const valveConfig = this.platform.cusG.get(accessory.context.hbDeviceId)
+    if (!(valveService = accessory.getService(this.Service.Valve) {
+      accessory
+        .addService(this.Service.Valve)
+        .setCharacteristic(this.Characteristic.Active, 0)
+        .setCharacteristic(this.Characteristic.InUse, 0)
+        .setCharacteristic(this.Characteristic.ValveType, 1)
+        .setCharacteristic(this.Characteristic.SetDuration, Math.round((valveConfig.operationTime || 1200) / 10))
+        .addCharacteristic(this.Characteristic.RemainingDuration)
+      valveService = accessory.getService(this.Service.Valve)
+    }
+    valveService
+      .getCharacteristic(this.Characteristic.Active)
       .on('set', (value, callback) => this.internalUpdate(value, callback))
+    valveService
+      .getCharacteristic(this.Characteristic.SetDuration)
+      .on('set', (value, callback) => {
+        if (valveService.getCharacteristic(this.Characteristic.InUse).value) {
+          valveService.updateCharacteristic(this.Characteristic.RemainingDuration, value)
+          clearTimeout(valveService.timer)
+          valveService.timer = setTimeout(() => valveService.setCharacteristic(this.Characteristic.Active, 0), value * 1000)
+        }
+        callback()
+      })
     this.accessory = accessory
   }
 
   async internalUpdate (value, callback) {
     callback()
     try {
-
+      const serviceValve = this.accessory.getService(this.Service.Valve)
+      serviceValve.updateCharacteristic(this.Characteristic.InUse, value)
+      switch (value) {
+        case 0:
+          serviceValve.updateCharacteristic(this.Characteristic.RemainingDuration, 0)
+          clearTimeout(this.accessory.getService(valve).timer)
+          break
+        case 1: {
+          const timer = serviceValve.getCharacteristic(this.Characteristic.SetDuration).value
+          serviceValve.updateCharacteristic(this.Characteristic.RemainingDuration, timer)
+          serviceValve.timer = setTimeout(() => serviceValve.setCharacteristic(this.Characteristic.Active, 0), timer * 1000)
+          break
+        }
+      }
+      await this.platform.sendDeviceUpdate(this.accessory, params)
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
     }
@@ -24,7 +59,19 @@ module.exports = class deviceValve {
 
   async externalUpdate (params) {
     try {
-
+      if (!helpers.hasProperty(params, 'switch')) return
+      const valveService = this.accessory.getService(this.Service.Valve)
+      valveService
+        .updateCharacteristic(this.Characteristic.Active, params.switch === 'on')
+        .updateCharacteristic(this.Characteristic.InUse, params.switch === 'on')
+      if (params.switch === 'on') {
+        const timer = valveService.getCharacteristic(this.Characteristic.SetDuration).value
+        valveService.updateCharacteristic(this.Characteristic.RemainingDuration, timer)
+        valveService.timer = setTimeout(() => valveService.setCharacteristic(this.Characteristic.Active, 0), timer * 1000)
+      } else {
+        valveService.updateCharacteristic(this.Characteristic.RemainingDuration, 0)
+        clearTimeout(valveService.timer)
+      }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }

From 7259b581e7a94d222e0deb31b4341e474958a045 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 7 Nov 2020 22:02:28 +0000
Subject: [PATCH 0694/3183] remove unnecessary check

---
 lib/device/valve-two.js | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/lib/device/valve-two.js b/lib/device/valve-two.js
index c4d014b9..63b501f0 100644
--- a/lib/device/valve-two.js
+++ b/lib/device/valve-two.js
@@ -40,14 +40,6 @@ module.exports = class deviceValveTwo {
   async internalUpdate (valve, value, callback) {
     callback()
     try {
-      let valveConfig
-      const params = { switches: helpers.defaultMultiSwitchOff }
-      if (!(valveConfig = this.platform.cusG.get(this.accessory.context.hbDeviceId))) {
-        throw new Error('group config missing')
-      }
-      if (valveConfig.type !== 'valve') {
-        throw new Error('improper configuration')
-      }
       const serviceValve = this.accessory.getService(valve)
       switch (valve) {
         case 'Valve A':
@@ -63,8 +55,7 @@ module.exports = class deviceValveTwo {
           params.switches[1].switch = value ? 'on' : 'off'
           break
       }
-      serviceValve
-        .updateCharacteristic(this.Characteristic.InUse, value)
+      serviceValve.updateCharacteristic(this.Characteristic.InUse, value)
       switch (value) {
         case 0:
           serviceValve.updateCharacteristic(this.Characteristic.RemainingDuration, 0)
@@ -86,13 +77,6 @@ module.exports = class deviceValveTwo {
   async externalUpdate (params) {
     try {
       if (!helpers.hasProperty(params, 'switches')) return
-      let valveConfig
-      if (!(valveConfig = this.platform.cusG.get(this.accessory.context.hbDeviceId))) {
-        throw new Error('group config missing')
-      }
-      if (valveConfig.type !== 'valve') {
-        throw new Error('improper configuration')
-      }
       ;['A', 'B'].forEach((v, k) => {
         const valveService = this.accessory.getService('Valve ' + v)
         valveService

From 9739a48fd05fc867e7cba7bd1237312a9163de2b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 7 Nov 2020 22:06:26 +0000
Subject: [PATCH 0695/3183] syntax errors to valve and valvetwo

---
 lib/device/valve-two.js | 1 +
 lib/device/valve.js     | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/device/valve-two.js b/lib/device/valve-two.js
index 63b501f0..4e53ebff 100644
--- a/lib/device/valve-two.js
+++ b/lib/device/valve-two.js
@@ -40,6 +40,7 @@ module.exports = class deviceValveTwo {
   async internalUpdate (valve, value, callback) {
     callback()
     try {
+      const params = { switches: helpers.defaultMultiSwitchOff }
       const serviceValve = this.accessory.getService(valve)
       switch (valve) {
         case 'Valve A':
diff --git a/lib/device/valve.js b/lib/device/valve.js
index 8ca7e0b7..ac142ff3 100644
--- a/lib/device/valve.js
+++ b/lib/device/valve.js
@@ -1,6 +1,7 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
+const helpers = require('./../helpers')
 module.exports = class deviceValve {
   constructor (platform, accessory) {
     this.platform = platform
@@ -8,7 +9,7 @@ module.exports = class deviceValve {
     this.Characteristic = platform.api.hap.Characteristic
     let valveService
     const valveConfig = this.platform.cusG.get(accessory.context.hbDeviceId)
-    if (!(valveService = accessory.getService(this.Service.Valve) {
+    if (!(valveService = accessory.getService(this.Service.Valve))) {
       accessory
         .addService(this.Service.Valve)
         .setCharacteristic(this.Characteristic.Active, 0)
@@ -37,12 +38,13 @@ module.exports = class deviceValve {
   async internalUpdate (value, callback) {
     callback()
     try {
+      const params = { switch: value ? 'on' : 'off' }
       const serviceValve = this.accessory.getService(this.Service.Valve)
       serviceValve.updateCharacteristic(this.Characteristic.InUse, value)
       switch (value) {
         case 0:
           serviceValve.updateCharacteristic(this.Characteristic.RemainingDuration, 0)
-          clearTimeout(this.accessory.getService(valve).timer)
+          clearTimeout(this.accessory.getService(this.Service.Valve).timer)
           break
         case 1: {
           const timer = serviceValve.getCharacteristic(this.Characteristic.SetDuration).value

From 6740e8d48a563304ba27da98418955f7f619c2a7 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 7 Nov 2020 22:09:41 +0000
Subject: [PATCH 0696/3183] 3.12.0-0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ab5e7b7f..9cc4dc99 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.11.2-0",
+  "version": "3.12.0-0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 00bbee34..bfe28921 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.11.2-0",
+  "version": "3.12.0-0",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 562b210c68631254bd0cd35feeca7bcb675055fc Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 8 Nov 2020 10:02:07 +0000
Subject: [PATCH 0697/3183] add 1009 to chan list

---
 lib/helpers.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/helpers.js b/lib/helpers.js
index bcb3f2b0..8bfa21c7 100644
--- a/lib/helpers.js
+++ b/lib/helpers.js
@@ -190,6 +190,7 @@ module.exports = {
     1001: 0, // "BLADELESS_FAN"                        \\
     1002: 0, // "NEW_HUMIDIFIER"                       \\
     1003: 0, // "WARM_AIR_BLOWER"                      \\
+    1009: 1, // ""                                     \\ Some sort of single switch device
     1256: 1, // "ZIGBEE_SINGLE_SWITCH"                 \\
     1770: 1, // "ZIGBEE_TEMPERATURE_SENSOR"            \\
     2026: 1, // "ZIGBEE_MOBILE_SENSOR"                 \\
@@ -197,6 +198,6 @@ module.exports = {
     3026: 1, // "ZIGBEE_DOOR_AND_WINDOW_SENSOR"        \\
     3256: 3, // "ZIGBEE_SWITCH_3"                      \\
     4026: 1, // "ZIGBEE_WATER_SENSOR"                  \\
-    4256: 4 // "ZIGBEE_SWITCH_4"                      \\
+    4256: 4 // "ZIGBEE_SWITCH_4"                       \\
   }
 }

From c8176171edb6ecf087376ccc0853427c090c3ef7 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 8 Nov 2020 10:27:17 +0000
Subject: [PATCH 0698/3183] bump ws dependency

---
 package-lock.json | 6 +++---
 package.json      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 9cc4dc99..f8c907be 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -256,9 +256,9 @@
       }
     },
     "ws": {
-      "version": "7.3.1",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.3.1.tgz",
-      "integrity": "sha512-D3RuNkynyHmEJIpD2qrgVkc9DQ23OrN/moAwZX4L8DfvszsJxpjQuUq3LMx6HoYji9fbIOBY18XWBsAux1ZZUA=="
+      "version": "7.4.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.0.tgz",
+      "integrity": "sha512-kyFwXuV/5ymf+IXhS6f0+eAFvydbaBW3zjpT6hUdAh/hbVjTIB5EHBGi0bPoCLSK2wcuz3BrEkB9LrYv1Nm4NQ=="
     }
   }
 }
diff --git a/package.json b/package.json
index bfe28921..3ab65e24 100644
--- a/package.json
+++ b/package.json
@@ -70,7 +70,7 @@
     "interval-promise": "1.4.0",
     "node-dns-sd": "0.4.2",
     "websocket-as-promised": "1.1.0",
-    "ws": "7.3.1"
+    "ws": "7.4.0"
   },
   "standard": {
     "ignore": [

From 1f08586c47693b84923c0cfc63e56f35d3d1c3d1 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 8 Nov 2020 11:01:17 +0000
Subject: [PATCH 0699/3183] no change, code formatting

---
 lib/ewelink-platform.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/ewelink-platform.js b/lib/ewelink-platform.js
index e71119f6..94d73fdc 100644
--- a/lib/ewelink-platform.js
+++ b/lib/ewelink-platform.js
@@ -574,7 +574,8 @@ module.exports = class eWeLinkPlatform {
   }
 
   async sendDeviceUpdate (accessory, params) {
-    await helpers.sleep(Math.floor(Math.random() * (100 - 10 + 1) + 10))
+    // *** generates a random number in the range [10, 100] *** \\
+    await helpers.sleep(Math.floor(Math.random() * 91 + 10))
     if (this.updateInProgress) {
       await helpers.sleep(400)
       return await this.sendDeviceUpdate(accessory, params)

From e24ad7fedbe878851a1fd63197fc9febf484006e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 8 Nov 2020 11:01:37 +0000
Subject: [PATCH 0700/3183] split simultaneous updates try

---
 lib/device/switch-multi.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/lib/device/switch-multi.js b/lib/device/switch-multi.js
index 0845e1ca..ae1c3f7d 100644
--- a/lib/device/switch-multi.js
+++ b/lib/device/switch-multi.js
@@ -9,6 +9,7 @@ module.exports = class deviceSwitch {
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
     this.EveHistoryService = fakegato(platform.api)
+    this.updateInProgress = false
     const switchService = accessory.getService(this.Service.Switch) || accessory.addService(this.Service.Switch)
     switchService
       .getCharacteristic(this.Characteristic.On)
@@ -28,6 +29,14 @@ module.exports = class deviceSwitch {
   }
 
   async internalUpdate (value, callback) {
+    // *** generates a random number in the range [10, 100] *** \\
+    await helpers.sleep(Math.floor(Math.random() * 91 + 10))
+    if (this.updateInProgress) {
+      await helpers.sleep(300)
+      return await this.internalUpdate(value, callback)
+    }
+    this.updateInProgress = true
+    setTimeout(() => (this.updateInProgress = false), 250)
     callback()
     try {
       let oAccessory

From 714ab1a25a13b744da7f74519c5030d32c902633 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 8 Nov 2020 11:08:20 +0000
Subject: [PATCH 0701/3183] 3.12.0-1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index f8c907be..02229e1b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.12.0-0",
+  "version": "3.12.0-1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 3ab65e24..41af04f9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.12.0-0",
+  "version": "3.12.0-1",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 28dd566074024bcbbe3c333b6a275cf931cc89b4 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 8 Nov 2020 13:10:48 +0000
Subject: [PATCH 0702/3183] don't use this.accessory

---
 lib/device/blind.js         | 43 +++++++++++-----------
 lib/device/curtain.js       | 21 ++++++-----
 lib/device/diffuser.js      | 72 ++++++++++++++++++-------------------
 lib/device/fan.js           | 25 +++++++------
 lib/device/garage-eachen.js | 35 +++++++++---------
 lib/device/garage-four.js   | 49 +++++++++++++------------
 lib/device/garage-two.js    | 67 +++++++++++++++++-----------------
 lib/device/garage.js        | 55 ++++++++++++++--------------
 lib/device/light-colour.js  | 63 ++++++++++++++++----------------
 lib/device/light-ctemp.js   | 13 ++++---
 lib/device/light-dimmer.js  | 27 +++++++-------
 lib/device/lock.js          | 34 +++++++++---------
 lib/device/outlet.js        | 27 +++++++-------
 lib/device/rf-bridge.js     | 19 +++++-----
 lib/device/scm.js           | 18 +++++-----
 lib/device/sensor.js        | 11 +++---
 lib/device/switch-multi.js  | 46 ++++++++++--------------
 lib/device/switch-single.js | 18 +++++-----
 lib/device/template.js      | 12 +++----
 lib/device/thermostat.js    | 27 +++++++-------
 lib/device/usb.js           | 17 +++++----
 lib/device/valve-two.js     | 23 ++++++------
 lib/device/valve.js         | 19 +++++-----
 lib/device/zb-dev.js        | 42 +++++++++++-----------
 lib/ewelink-platform.js     |  4 +--
 25 files changed, 380 insertions(+), 407 deletions(-)

diff --git a/lib/device/blind.js b/lib/device/blind.js
index b481d65e..aae2d48f 100644
--- a/lib/device/blind.js
+++ b/lib/device/blind.js
@@ -18,21 +18,20 @@ module.exports = class deviceBlind {
     }
     wcService
       .getCharacteristic(this.Characteristic.TargetPosition)
-      .on('set', (value, callback) => this.internalUpdate(value, callback))
-    this.accessory = accessory
+      .on('set', (value, callback) => this.internalUpdate(accessory, value, callback))
   }
 
-  async internalUpdate (value, callback) {
+  async internalUpdate (accessory, value, callback) {
     callback()
     try {
       let blindConfig
       const params = {}
-      const wcService = this.accessory.getService(this.Service.WindowCovering)
-      const prevState = this.accessory.context.cachePositionState
-      let prevPosition = this.accessory.context.cacheCurrentPosition
+      const wcService = accessory.getService(this.Service.WindowCovering)
+      const prevState = accessory.context.cachePositionState
+      let prevPosition = accessory.context.cacheCurrentPosition
       const newTarget = value
       const updateKey = Math.random().toString(36).substr(2, 8)
-      if (!(blindConfig = this.platform.cusG.get(this.accessory.context.hbDeviceId))) {
+      if (!(blindConfig = this.platform.cusG.get(accessory.context.hbDeviceId))) {
         throw new Error('group config missing')
       }
       if (blindConfig.type !== 'blind') {
@@ -40,11 +39,11 @@ module.exports = class deviceBlind {
       }
       if (newTarget === prevPosition) return
       params.switches = helpers.defaultMultiSwitchOff
-      this.accessory.context.updateKey = updateKey
+      accessory.context.updateKey = updateKey
       const percentStepPerDecisecond = blindConfig.operationTime / 100
       if (prevState !== 2) {
-        await this.platform.sendDeviceUpdate(this.accessory, params)
-        let positionPercentChange = Math.floor(Date.now() / 100) - this.accessory.context.cacheLastStartTime
+        await this.platform.sendDeviceUpdate(accessory, params)
+        let positionPercentChange = Math.floor(Date.now() / 100) - accessory.context.cacheLastStartTime
         positionPercentChange = Math.floor(percentStepPerDecisecond * positionPercentChange)
         if (prevState === 0) {
           prevPosition -= positionPercentChange
@@ -52,33 +51,33 @@ module.exports = class deviceBlind {
           prevPosition += positionPercentChange
         }
         wcService.updateCharacteristic(this.Characteristic.CurrentPosition, prevPosition)
-        this.accessory.context.cacheCurrentPosition = prevPosition
+        accessory.context.cacheCurrentPosition = prevPosition
       }
       const diffPosition = newTarget - prevPosition
       const setToMoveUp = diffPosition > 0
       const decisecondsToMove = Math.round(Math.abs(diffPosition) * percentStepPerDecisecond)
       params.switches[0].switch = setToMoveUp ? 'on' : 'off'
       params.switches[1].switch = setToMoveUp ? 'off' : 'on'
-      await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.accessory.context.cacheTargetPosition = newTarget
-      this.accessory.context.cachePositionState = setToMoveUp ? 1 : 0
-      this.accessory.context.cacheLastStartTime = Math.floor(Date.now() / 100)
-      if (this.accessory.context.updateKey !== updateKey) return
+      await this.platform.sendDeviceUpdate(accessory, params)
+      accessory.context.cacheTargetPosition = newTarget
+      accessory.context.cachePositionState = setToMoveUp ? 1 : 0
+      accessory.context.cacheLastStartTime = Math.floor(Date.now() / 100)
+      if (accessory.context.updateKey !== updateKey) return
       await helpers.sleep(decisecondsToMove * 100)
-      if (this.accessory.context.updateKey !== updateKey) return
+      if (accessory.context.updateKey !== updateKey) return
       params.switches[0].switch = 'off'
       params.switches[1].switch = 'off'
-      await this.platform.sendDeviceUpdate(this.accessory, params)
+      await this.platform.sendDeviceUpdate(accessory, params)
       wcService.updateCharacteristic(this.Characteristic.PositionState, 2)
       wcService.updateCharacteristic(this.Characteristic.CurrentPosition, newTarget)
-      this.accessory.context.cachePositionState = 2
-      this.accessory.context.cacheCurrentPosition = newTarget
+      accessory.context.cachePositionState = 2
+      accessory.context.cacheCurrentPosition = newTarget
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
+      this.platform.deviceUpdateError(accessory, err, true)
     }
   }
 
-  async externalUpdate (params) {
+  async externalUpdate (accessory, params) {
 
   }
 }
diff --git a/lib/device/curtain.js b/lib/device/curtain.js
index 67ca977b..d2fafcb4 100644
--- a/lib/device/curtain.js
+++ b/lib/device/curtain.js
@@ -18,15 +18,14 @@ module.exports = class deviceCurtain {
     }
     cService
       .getCharacteristic(this.Characteristic.TargetPosition)
-      .on('set', (value, callback) => this.internalUpdate(value, callback))
-    this.accessory = accessory
+      .on('set', (value, callback) => this.internalUpdate(accessory, value, callback))
   }
 
-  async internalUpdate (value, callback) {
+  async internalUpdate (accessory, value, callback) {
     callback()
     try {
       let params
-      const prevPos = this.accessory.context.cacheCurrentPosition
+      const prevPos = accessory.context.cacheCurrentPosition
       const newPos = value
       if (newPos === prevPos) return
       if (newPos === 0 || newPos === 100) {
@@ -34,16 +33,16 @@ module.exports = class deviceCurtain {
       } else {
         params = { setclose: Math.abs(100 - newPos) }
       }
-      this.accessory.context.cacheCurrentPosition = newPos
-      await this.platform.sendDeviceUpdate(this.accessory, params)
+      accessory.context.cacheCurrentPosition = newPos
+      await this.platform.sendDeviceUpdate(accessory, params)
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
+      this.platform.deviceUpdateError(accessory, err, true)
     }
   }
 
-  async externalUpdate (params) {
+  async externalUpdate (accessory, params) {
     try {
-      const cService = this.accessory.getService(this.Service.WindowCovering)
+      const cService = accessory.getService(this.Service.WindowCovering)
       if (!helpers.hasProperty(params, 'switch') && !helpers.hasProperty(params, 'setclose')) {
         return
       }
@@ -52,10 +51,10 @@ module.exports = class deviceCurtain {
         .updateCharacteristic(this.Characteristic.TargetPosition, newPos)
         .updateCharacteristic(this.Characteristic.CurrentPosition, newPos)
         .updateCharacteristic(this.Characteristic.PositionState, 2)
-      this.accessory.context.cacheCurrentPosition = newPos
+      accessory.context.cacheCurrentPosition = newPos
       return
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, false)
+      this.platform.deviceUpdateError(accessory, err, false)
     }
   }
 }
diff --git a/lib/device/diffuser.js b/lib/device/diffuser.js
index ae8bcf86..47a1739b 100644
--- a/lib/device/diffuser.js
+++ b/lib/device/diffuser.js
@@ -12,89 +12,87 @@ module.exports = class deviceDiffuser {
     const lightService = accessory.getService('Light') || accessory.addService(this.Service.Lightbulb, 'Light', 'light')
     onOffService
       .getCharacteristic(this.Characteristic.On)
-      .on('set', (value, callback) => this.internalDiffuserOnOffUpdate(value, callback))
-    this.accessory = accessory
+      .on('set', (value, callback) => this.internalDiffuserOnOffUpdate(accessory, value, callback))
     onOffService
       .getCharacteristic(this.Characteristic.RotationSpeed)
-      .on('set', (value, callback) => this.internalDiffuserStateUpdate(value, callback))
+      .on('set', (value, callback) => this.internalDiffuserStateUpdate(accessory, value, callback))
       .setProps({
         minStep: 50
       })
     lightService
       .getCharacteristic(this.Characteristic.On)
-      .on('set', (value, callback) => this.internalLightOnOffUpdate(value, callback))
+      .on('set', (value, callback) => this.internalLightOnOffUpdate(accessory, value, callback))
     lightService
       .getCharacteristic(this.Characteristic.Brightness)
-      .on('set', (value, callback) => this.internalLightBrightnessUpdate(value, callback))
+      .on('set', (value, callback) => this.internalLightBrightnessUpdate(accessory, value, callback))
     lightService
       .getCharacteristic(this.Characteristic.Hue)
-      .on('set', (value, callback) => this.internalLightColourUpdate(value, callback))
+      .on('set', (value, callback) => this.internalLightColourUpdate(accessory, value, callback))
     lightService
       .getCharacteristic(this.Characteristic.Saturation)
       .on('set', (value, callback) => callback())
-    this.accessory = accessory
   }
 
-  async internalDiffuserOnOffUpdate (value, callback) {
+  async internalDiffuserOnOffUpdate (accessory, value, callback) {
     callback()
     try {
       const params = { switch: value ? 'on' : 'off' }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
+      await this.platform.sendDeviceUpdate(accessory, params)
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
+      this.platform.deviceUpdateError(accessory, err, true)
     }
   }
 
-  async internalDiffuserStateUpdate (value, callback) {
+  async internalDiffuserStateUpdate (accessory, value, callback) {
     try {
       await helpers.sleep(1000)
       callback()
       if (value === 0) return
       value = value <= 75 ? 50 : 100
       const params = { state: value / 2 }
-      this.accessory.context.cacheState = value
-      await this.platform.sendDeviceUpdate(this.accessory, params)
+      accessory.context.cacheState = value
+      await this.platform.sendDeviceUpdate(accessory, params)
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
+      this.platform.deviceUpdateError(accessory, err, true)
     }
   }
 
-  async internalLightOnOffUpdate (value, callback) {
+  async internalLightOnOffUpdate (accessory, value, callback) {
     try {
       callback()
       const params = { lightswitch: value ? 1 : 0 }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
+      await this.platform.sendDeviceUpdate(accessory, params)
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
+      this.platform.deviceUpdateError(accessory, err, true)
     }
   }
 
-  async internalLightBrightnessUpdate (value, callback) {
+  async internalLightBrightnessUpdate (accessory, value, callback) {
     try {
       await helpers.sleep(2000)
       callback()
       const updateKeyBright = Math.random().toString(36).substr(2, 8)
-      this.accessory.context.updateKeyBright = updateKeyBright
+      accessory.context.updateKeyBright = updateKeyBright
       const params = {
         lightbright: value
       }
       await helpers.sleep(500)
-      if (updateKeyBright !== this.accessory.context.updateKeyBright) return
-      await this.platform.sendDeviceUpdate(this.accessory, params)
+      if (updateKeyBright !== accessory.context.updateKeyBright) return
+      await this.platform.sendDeviceUpdate(accessory, params)
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
+      this.platform.deviceUpdateError(accessory, err, true)
     }
   }
 
-  async internalLightColourUpdate (value, callback) {
+  async internalLightColourUpdate (accessory, value, callback) {
     try {
       await helpers.sleep(2000)
       callback()
       const updateKeyColour = Math.random().toString(36).substr(2, 8)
-      this.accessory.context.updateKeyColour = updateKeyColour
+      accessory.context.updateKeyColour = updateKeyColour
       const newRGB = convert.hsv.rgb(
         value,
-        this.accessory.getService('Light').getCharacteristic(this.Characteristic.Saturation).value,
+        accessory.getService('Light').getCharacteristic(this.Characteristic.Saturation).value,
         100
       )
       const params = {
@@ -103,31 +101,31 @@ module.exports = class deviceDiffuser {
         lightBcolor: newRGB[2]
       }
       await helpers.sleep(500)
-      if (updateKeyColour !== this.accessory.context.updateKeyColour) return
-      await this.platform.sendDeviceUpdate(this.accessory, params)
+      if (updateKeyColour !== accessory.context.updateKeyColour) return
+      await this.platform.sendDeviceUpdate(accessory, params)
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
+      this.platform.deviceUpdateError(accessory, err, true)
     }
   }
 
-  async externalUpdate (params) {
+  async externalUpdate (accessory, params) {
     try {
       if (helpers.hasProperty(params, 'switch')) {
-        this.accessory.getService('Diffuser').updateCharacteristic(this.Characteristic.On, params.switch === 'on')
+        accessory.getService('Diffuser').updateCharacteristic(this.Characteristic.On, params.switch === 'on')
         if (!helpers.hasProperty(params, 'state')) {
-          this.accessory.getService('Diffuser').updateCharacteristic(this.Characteristic.RotationSpeed, this.accessory.context.cacheState)
+          accessory.getService('Diffuser').updateCharacteristic(this.Characteristic.RotationSpeed, accessory.context.cacheState)
         }
       }
       if (helpers.hasProperty(params, 'state')) {
-        this.accessory.getService('Diffuser').updateCharacteristic(this.Characteristic.RotationSpeed, params.state * 50)
-        this.accessory.context.cacheState = params.state * 50
+        accessory.getService('Diffuser').updateCharacteristic(this.Characteristic.RotationSpeed, params.state * 50)
+        accessory.context.cacheState = params.state * 50
       }
       if (helpers.hasProperty(params, 'lightswitch')) {
-        this.accessory.getService('Light')
+        accessory.getService('Light')
           .updateCharacteristic(this.Characteristic.On, params.lightswitch === 1)
       }
       if (helpers.hasProperty(params, 'lightbright')) {
-        this.accessory.getService('Light')
+        accessory.getService('Light')
           .updateCharacteristic(this.Characteristic.Brightness, params.lightbright)
       }
       if (
@@ -136,12 +134,12 @@ module.exports = class deviceDiffuser {
         helpers.hasProperty(params, 'lightBcolor')
       ) {
         const newColour = convert.rgb.hsv(params.lightRcolor, params.lightGcolor, params.lightBcolor)
-        this.accessory.getService('Light')
+        accessory.getService('Light')
           .updateCharacteristic(this.Characteristic.Hue, newColour[0])
           .updateCharacteristic(this.Characteristic.Saturation, 100)
       }
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, false)
+      this.platform.deviceUpdateError(accessory, err, false)
     }
   }
 }
diff --git a/lib/device/fan.js b/lib/device/fan.js
index baeaaf4a..bb1a55dc 100644
--- a/lib/device/fan.js
+++ b/lib/device/fan.js
@@ -15,13 +15,13 @@ module.exports = class deviceFan {
     const fanService = accessory.getService(this.Service.Fan) || accessory.addService(this.Service.Fan)
     fanService
       .getCharacteristic(this.Characteristic.On)
-      .on('set', async (value, callback) => {
+      .on('set', (value, callback) => {
         callback()
         if (!value) fanService.setCharacteristic(this.Characteristic.RotationSpeed, 0)
       })
     fanService
       .getCharacteristic(this.Characteristic.RotationSpeed)
-      .on('set', (value, callback) => this.internalUpdate('speed', value, callback))
+      .on('set', (value, callback) => this.internalUpdate(accessory, 'speed', value, callback))
       .setProps({
         minStep: 33
       })
@@ -34,20 +34,19 @@ module.exports = class deviceFan {
       const fanLightService = accessory.getService(this.Service.Lightbulb) || accessory.addService(this.Service.Lightbulb)
       fanLightService
         .getCharacteristic(this.Characteristic.On)
-        .on('set', (value, callback) => this.internalUpdate('light', value, callback))
+        .on('set', (value, callback) => this.internalUpdate(accessory, 'light', value, callback))
     }
-    this.accessory = accessory
   }
 
-  async internalUpdate (type, value, callback) {
+  async internalUpdate (accessory, type, value, callback) {
     callback()
     try {
       let newPower
       let newSpeed
       let newLight
       let lightService
-      if (this.visibleLight) lightService = this.accessory.getService(this.Service.Lightbulb)
-      const fanService = this.accessory.getService(this.Service.Fan)
+      if (this.visibleLight) lightService = accessory.getService(this.Service.Lightbulb)
+      const fanService = accessory.getService(this.Service.Fan)
       const params = { switches: helpers.defaultMultiSwitchOff }
       switch (type) {
         case 'speed':
@@ -65,19 +64,19 @@ module.exports = class deviceFan {
       params.switches[1].switch = newPower === 1 && newSpeed >= 33 ? 'on' : 'off'
       params.switches[2].switch = newPower === 1 && newSpeed >= 66 && newSpeed < 99 ? 'on' : 'off'
       params.switches[3].switch = newPower === 1 && newSpeed >= 99 ? 'on' : 'off'
-      await this.platform.sendDeviceUpdate(this.accessory, params)
+      await this.platform.sendDeviceUpdate(accessory, params)
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
+      this.platform.deviceUpdateError(accessory, err, true)
     }
   }
 
-  async externalUpdate (params) {
+  async externalUpdate (accessory, params) {
     try {
       if (helpers.hasProperty(params, 'updateSource') && params.updateSource === 'LAN') return
       if (params.switches && Array.isArray(params.switches)) {
         let lightService
-        if (this.visibleLight) lightService = this.accessory.getService(this.Service.Lightbulb)
-        const fanService = this.accessory.getService(this.Service.Fan)
+        if (this.visibleLight) lightService = accessory.getService(this.Service.Lightbulb)
+        const fanService = accessory.getService(this.Service.Fan)
         const light = params.switches[0].switch === 'on'
         let status
         let speed
@@ -104,7 +103,7 @@ module.exports = class deviceFan {
           .updateCharacteristic(this.Characteristic.RotationSpeed, speed)
       }
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, false)
+      this.platform.deviceUpdateError(accessory, err, false)
     }
   }
 }
diff --git a/lib/device/garage-eachen.js b/lib/device/garage-eachen.js
index 1c7fb8bf..ddba1e03 100644
--- a/lib/device/garage-eachen.js
+++ b/lib/device/garage-eachen.js
@@ -18,59 +18,58 @@ module.exports = class deviceGarageEachen {
     }
     gdeService
       .getCharacteristic(this.Characteristic.TargetDoorState)
-      .on('set', (value, callback) => this.internalUpdate(value, callback))
-    this.accessory = accessory
+      .on('set', (value, callback) => this.internalUpdate(accessory, value, callback))
   }
 
-  async internalUpdate (value, callback) {
+  async internalUpdate (accessory, value, callback) {
     callback()
     try {
       let garageConfig
-      if (!(garageConfig = this.platform.cusG.get(this.accessory.context.hbDeviceId))) {
+      if (!(garageConfig = this.platform.cusG.get(accessory.context.hbDeviceId))) {
         throw new Error('group config missing')
       }
       if (garageConfig.type !== 'garage_eachen') {
         throw new Error('improper configuration')
       }
       const params = { switch: value === 0 ? 'on' : 'off' }
-      const gdService = this.accessory.getService(this.Service.GarageDoorOpener)
+      const gdService = accessory.getService(this.Service.GarageDoorOpener)
       if (value === gdService.getCharacteristic(this.Characteristic.CurrentDoorState).value % 2) return
-      this.accessory.context.inUse = true
-      await this.platform.sendDeviceUpdate(this.accessory, params)
+      accessory.context.inUse = true
+      await this.platform.sendDeviceUpdate(accessory, params)
       gdService
         .updateCharacteristic(this.Characteristic.TargetDoorState, value)
         .updateCharacteristic(this.Characteristic.CurrentDoorState, value + 2)
       await helpers.sleep(2000)
-      this.accessory.context.inUse = false
+      accessory.context.inUse = false
       if (value === 0) {
         await helpers.sleep(Math.max((garageConfig.operationTime - 20) * 100, 0))
         gdService.updateCharacteristic(this.Characteristic.CurrentDoorState, 0)
       }
     } catch (err) {
-      this.accessory.context.inUse = false
-      this.platform.deviceUpdateError(this.accessory, err, true)
+      accessory.context.inUse = false
+      this.platform.deviceUpdateError(accessory, err, true)
     }
   }
 
-  async externalUpdate (params) {
+  async externalUpdate (accessory, params) {
     try {
-      if (!helpers.hasProperty(params, 'switch') || this.accessory.context.inUse) return
+      if (!helpers.hasProperty(params, 'switch') || accessory.context.inUse) return
       let garageConfig
-      if (!(garageConfig = this.platform.cusG.get(this.accessory.context.hbDeviceId))) {
+      if (!(garageConfig = this.platform.cusG.get(accessory.context.hbDeviceId))) {
         throw new Error('group config missing')
       }
       if (garageConfig.type !== 'garage_eachen') {
         throw new Error('improper configuration')
       }
-      this.accessory.context.inUse = true
-      const gdService = this.accessory.getService(this.Service.GarageDoorOpener)
+      accessory.context.inUse = true
+      const gdService = accessory.getService(this.Service.GarageDoorOpener)
       gdService
         .updateCharacteristic(this.Characteristic.TargetDoorState, params.switch === 'on' ? 0 : 1)
         .updateCharacteristic(this.Characteristic.CurrentDoorState, params.switch === 'on' ? 0 : 1)
-      this.accessory.context.inUse = false
+      accessory.context.inUse = false
     } catch (err) {
-      this.accessory.context.inUse = false
-      this.platform.deviceUpdateError(this.accessory, err, false)
+      accessory.context.inUse = false
+      this.platform.deviceUpdateError(accessory, err, false)
     }
   }
 }
diff --git a/lib/device/garage-four.js b/lib/device/garage-four.js
index f21f1e4d..85b30124 100644
--- a/lib/device/garage-four.js
+++ b/lib/device/garage-four.js
@@ -19,16 +19,15 @@ module.exports = class deviceGarageFour {
       }
       gdService
         .getCharacteristic(this.Characteristic.TargetDoorState)
-        .on('set', (value, callback) => this.internalUpdate(v, value, callback))
+        .on('set', (value, callback) => this.internalUpdate(accessory, v, value, callback))
     })
-    this.accessory = accessory
   }
 
-  async internalUpdate (garage, value, callback) {
+  async internalUpdate (accessory, garage, value, callback) {
     callback()
     try {
       let garageConfig
-      if (!(garageConfig = this.platform.cusG.get(this.accessory.context.hbDeviceId))) {
+      if (!(garageConfig = this.platform.cusG.get(accessory.context.hbDeviceId))) {
         throw new Error('group config missing')
       }
       if (garageConfig.type !== 'garage_four') {
@@ -65,45 +64,45 @@ module.exports = class deviceGarageFour {
         ? sAccessory.getService(this.Service.ContactSensor).getCharacteristic(this.Characteristic.ContactSensorState).value === 0
           ? 1
           : 0
-        : this.accessory.context.cacheStates[garageChannel].cacheCurrentDoorState
+        : accessory.context.cacheStates[garageChannel].cacheCurrentDoorState
       if (value === prevState % 2) return
-      const gdService = this.accessory.getService('Garage ' + garage)
-      this.accessory.context.inUse = true
+      const gdService = accessory.getService('Garage ' + garage)
+      accessory.context.inUse = true
       const updateKey = Math.random().toString(36).substr(2, 8)
-      this.accessory.context.updateKey = updateKey
+      accessory.context.updateKey = updateKey
       gdService
         .updateCharacteristic(this.Characteristic.TargetDoorState, value)
         .updateCharacteristic(this.Characteristic.CurrentDoorState, value + 2)
-      this.accessory.context.cacheStates[garageChannel].cacheTargetDoorState = value
-      this.accessory.context.cacheStates[garageChannel].cacheCurrentDoorState = value + 2
+      accessory.context.cacheStates[garageChannel].cacheTargetDoorState = value
+      accessory.context.cacheStates[garageChannel].cacheCurrentDoorState = value + 2
       const params = { switches: helpers.defaultMultiSwitchOff }
       ;[0, 1, 2, 3].forEach(i => (params.switches[i].switch = garageChannel === i ? 'on' : 'off'))
-      await this.platform.sendDeviceUpdate(this.accessory, params)
+      await this.platform.sendDeviceUpdate(accessory, params)
       await helpers.sleep(1000)
-      this.accessory.context.inUse = false
+      accessory.context.inUse = false
       await helpers.sleep(Math.max((garageConfig.operationTime - 10) * 100, 0))
-      if (this.accessory.context.updateKey !== updateKey || sAccessory) return
+      if (accessory.context.updateKey !== updateKey || sAccessory) return
       if (!sAccessory) {
         gdService.updateCharacteristic(this.Characteristic.CurrentDoorState, value)
-        this.accessory.context.cacheStates[garageChannel].cacheCurrentDoorState = value
+        accessory.context.cacheStates[garageChannel].cacheCurrentDoorState = value
       }
     } catch (err) {
-      this.accessory.context.inUse = false
-      this.platform.deviceUpdateError(this.accessory, err, true)
+      accessory.context.inUse = false
+      this.platform.deviceUpdateError(accessory, err, true)
     }
   }
 
-  async externalUpdate (params) {
+  async externalUpdate (accessory, params) {
     try {
-      if (!helpers.hasProperty(params, 'switches') || this.accessory.context.inUse) return
+      if (!helpers.hasProperty(params, 'switches') || accessory.context.inUse) return
       let garageConfig
-      if (!(garageConfig = this.platform.cusG.get(this.accessory.context.hbDeviceId))) {
+      if (!(garageConfig = this.platform.cusG.get(accessory.context.hbDeviceId))) {
         throw new Error('group config missing')
       }
       if (garageConfig.type !== 'garage_four') {
         throw new Error('improper configuration')
       }
-      if (this.accessory.context.inUse) return
+      if (accessory.context.inUse) return
       ;['A', 'B', 'C', 'D'].forEach(async v => {
         let garageChannel
         switch (v) {
@@ -133,16 +132,16 @@ module.exports = class deviceGarageFour {
           throw new Error("defined DW2 sensor isn't a sensor")
         }
         if (sensorDefinition) return
-        const gcService = this.accessory.getService('Garage ' + v)
-        const prevState = this.accessory.context.cacheStates[garageChannel].cacheCurrentDoorState
+        const gcService = accessory.getService('Garage ' + v)
+        const prevState = accessory.context.cacheStates[garageChannel].cacheCurrentDoorState
         const newPos = [0, 2].includes(prevState) ? 1 : 0
         if (params.switches[garageChannel].switch === 'off') return
         gcService.updateCharacteristic(this.Characteristic.CurrentDoorState, newPos)
-        this.accessory.context.cacheStates[garageChannel].cacheTargetDoorState = newPos
-        this.accessory.context.cacheStates[garageChannel].cacheCurrentDoorState = newPos
+        accessory.context.cacheStates[garageChannel].cacheTargetDoorState = newPos
+        accessory.context.cacheStates[garageChannel].cacheCurrentDoorState = newPos
       })
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, false)
+      this.platform.deviceUpdateError(accessory, err, false)
     }
   }
 }
diff --git a/lib/device/garage-two.js b/lib/device/garage-two.js
index fa02653c..d23ac1d5 100644
--- a/lib/device/garage-two.js
+++ b/lib/device/garage-two.js
@@ -19,16 +19,15 @@ module.exports = class deviceGarageTwo {
       }
       gdService
         .getCharacteristic(this.Characteristic.TargetDoorState)
-        .on('set', (value, callback) => this.internalUpdate('Garage' + v, value, callback))
+        .on('set', (value, callback) => this.internalUpdate(accessory, 'Garage' + v, value, callback))
     })
-    this.accessory = accessory
   }
 
-  async internalUpdate (garage, value, callback) {
+  async internalUpdate (accessory, garage, value, callback) {
     callback()
     try {
       let garageConfig
-      if (!(garageConfig = this.platform.cusG.get(this.accessory.context.hbDeviceId))) {
+      if (!(garageConfig = this.platform.cusG.get(accessory.context.hbDeviceId))) {
         throw new Error('group config missing')
       }
       if (garageConfig.type !== 'garage_two') {
@@ -50,8 +49,8 @@ module.exports = class deviceGarageTwo {
       }
       let sAccessory = false
       const newPos = value
-      const params = { switches: this.accessory.context.switchState }
-      const gdService = this.accessory.getService(garage)
+      const params = { switches: accessory.context.switchState }
+      const gdService = accessory.getService(garage)
       if (sensorDefinition && !(sAccessory = this.platform.devicesInHB.get(garageConfig.sensorId + 'SWX'))) {
         throw new Error("defined DW2 sensor doesn't exist")
       }
@@ -63,69 +62,69 @@ module.exports = class deviceGarageTwo {
           ? 1
           : 0
         : garage === 'Garage 1'
-          ? this.accessory.context.cacheOneCurrentDoorState
-          : this.accessory.context.cacheTwoCurrentDoorState
+          ? accessory.context.cacheOneCurrentDoorState
+          : accessory.context.cacheTwoCurrentDoorState
       if (newPos === prevState % 2) return
-      this.accessory.context.inUse = true
+      accessory.context.inUse = true
       gdService
         .updateCharacteristic(this.Characteristic.TargetDoorState, newPos)
         .updateCharacteristic(this.Characteristic.CurrentDoorState, newPos + 2)
       switch (garage) {
         case 'Garage 1': {
-          this.accessory.context.cacheOneTargetDoorState = newPos
-          this.accessory.context.cacheOneCurrentDoorState = newPos + 2
+          accessory.context.cacheOneTargetDoorState = newPos
+          accessory.context.cacheOneCurrentDoorState = newPos + 2
           params.switches[0].switch = newPos === 0 ? 'on' : 'off'
           params.switches[1].switch = newPos === 1 ? 'on' : 'off'
           break
         }
         case 'Garage 2': {
-          this.accessory.context.cacheTwoTargetDoorState = newPos
-          this.accessory.context.cacheTwoCurrentDoorState = newPos + 2
+          accessory.context.cacheTwoTargetDoorState = newPos
+          accessory.context.cacheTwoCurrentDoorState = newPos + 2
           params.switches[2].switch = newPos === 0 ? 'on' : 'off'
           params.switches[3].switch = newPos === 1 ? 'on' : 'off'
           break
         }
       }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
+      await this.platform.sendDeviceUpdate(accessory, params)
       await helpers.sleep(Math.max(garageConfig.operationTime * 100, 1000))
       if (!sAccessory) {
         gdService.updateCharacteristic(this.Characteristic.CurrentDoorState, newPos)
         switch (garage) {
           case 'Garage 1': {
-            this.accessory.context.cacheOneCurrentDoorState = newPos
+            accessory.context.cacheOneCurrentDoorState = newPos
             break
           }
           case 'Garage 2': {
-            this.accessory.context.cacheTwoCurrentDoorState = newPos
+            accessory.context.cacheTwoCurrentDoorState = newPos
             break
           }
         }
       }
-      this.accessory.context.inUse = false
+      accessory.context.inUse = false
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
+      this.platform.deviceUpdateError(accessory, err, true)
     }
   }
 
-  externalUpdate (params) {
+  externalUpdate (accessory, params) {
     try {
       if (!helpers.hasProperty(params, 'switches')) {
         return
       }
       let garageConfig
-      if (!(garageConfig = this.platform.cusG.get(this.accessory.context.hbDeviceId))) {
+      if (!(garageConfig = this.platform.cusG.get(accessory.context.hbDeviceId))) {
         throw new Error('group config missing')
       }
       if (garageConfig.type !== 'garage_two') {
         throw new Error('improper configuration')
       }
-      if (this.accessory.context.inUse || garageConfig.sensorId) return
-      this.accessory.context.switchState = params.switches
+      if (accessory.context.inUse || garageConfig.sensorId) return
+      accessory.context.switchState = params.switches
       ;['1', '2'].forEach(async v => {
-        const gcService = this.accessory.getService('Garage ' + v)
+        const gcService = accessory.getService('Garage ' + v)
         const prevState = v === '1'
-          ? this.accessory.context.cacheOneCurrentDoorState
-          : this.accessory.context.cacheTwoCurrentDoorState
+          ? accessory.context.cacheOneCurrentDoorState
+          : accessory.context.cacheTwoCurrentDoorState
         const newPos = [0, 2].includes(prevState) ? 3 : 2
         switch (v) {
           case '1':
@@ -145,7 +144,7 @@ module.exports = class deviceGarageTwo {
             }
             break
         }
-        this.accessory.context.inUse = true
+        accessory.context.inUse = true
         if (garageConfig.sensorId) {
           await helpers.sleep(Math.max(garageConfig.operationTime * 100, 1000))
         } else {
@@ -154,29 +153,29 @@ module.exports = class deviceGarageTwo {
             .updateCharacteristic(this.Characteristic.CurrentDoorState, newPos)
           switch (v) {
             case '1':
-              this.accessory.context.cacheOneCurrentDoorState = newPos
-              this.accessory.context.cacheTwoTargetDoorState = newPos - 2
+              accessory.context.cacheOneCurrentDoorState = newPos
+              accessory.context.cacheTwoTargetDoorState = newPos - 2
               break
             case '2':
-              this.accessory.context.cacheTwoCurrentDoorState = newPos
-              this.accessory.context.cacheTwoTargetDoorState = newPos - 2
+              accessory.context.cacheTwoCurrentDoorState = newPos
+              accessory.context.cacheTwoTargetDoorState = newPos - 2
               break
           }
           await helpers.sleep(Math.max(garageConfig.operationTime * 100, 1000))
           gcService.updateCharacteristic(this.Characteristic.CurrentDoorState, newPos - 2)
           switch (v) {
             case '1':
-              this.accessory.context.cacheOneCurrentDoorState = newPos - 2
+              accessory.context.cacheOneCurrentDoorState = newPos - 2
               break
             case '2':
-              this.accessory.context.cacheTwoCurrentDoorState = newPos - 2
+              accessory.context.cacheTwoCurrentDoorState = newPos - 2
               break
           }
         }
       })
-      this.accessory.context.inUse = false
+      accessory.context.inUse = false
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, false)
+      this.platform.deviceUpdateError(accessory, err, false)
     }
   }
 }
diff --git a/lib/device/garage.js b/lib/device/garage.js
index 38d31896..ebee6eb5 100644
--- a/lib/device/garage.js
+++ b/lib/device/garage.js
@@ -18,15 +18,14 @@ module.exports = class deviceGarage {
     }
     gdService
       .getCharacteristic(this.Characteristic.TargetDoorState)
-      .on('set', (value, callback) => this.internalUpdate(value, callback))
-    this.accessory = accessory
+      .on('set', (value, callback) => this.internalUpdate(accessory, value, callback))
   }
 
-  async internalUpdate (value, callback) {
+  async internalUpdate (accessory, value, callback) {
     callback()
     try {
       let garageConfig
-      if (!(garageConfig = this.platform.cusG.get(this.accessory.context.hbDeviceId))) {
+      if (!(garageConfig = this.platform.cusG.get(accessory.context.hbDeviceId))) {
         throw new Error('group config missing')
       }
       if (garageConfig.type !== 'garage' || !['oneSwitch', 'twoSwitch'].includes(garageConfig.setup)) {
@@ -37,7 +36,7 @@ module.exports = class deviceGarage {
       const newPos = value
       const params = {}
       let delay = 0
-      const gdService = this.accessory.getService(this.Service.GarageDoorOpener)
+      const gdService = accessory.getService(this.Service.GarageDoorOpener)
       if (sensorDefinition && !(sAccessory = this.platform.devicesInHB.get(garageConfig.sensorId + 'SWX'))) {
         throw new Error("defined DW2 sensor doesn't exist")
       }
@@ -48,22 +47,22 @@ module.exports = class deviceGarage {
         ? sAccessory.getService(this.Service.ContactSensor).getCharacteristic(this.Characteristic.ContactSensorState).value === 0
           ? 1
           : 0
-        : this.accessory.context.cacheCurrentDoorState
+        : accessory.context.cacheCurrentDoorState
       if (newPos === prevState % 2) return
-      this.accessory.context.inUse = true
-      this.accessory.context.state = value
+      accessory.context.inUse = true
+      accessory.context.state = value
       if (garageConfig.setup === 'oneSwitch' && [2, 3].includes(prevState)) {
         gdService.updateCharacteristic(this.Characteristic.CurrentDoorState, ((prevState * 2) % 3) + 2)
-        this.accessory.context.cacheCurrentDoorState = ((prevState * 2) % 3) + 2
+        accessory.context.cacheCurrentDoorState = ((prevState * 2) % 3) + 2
         delay = 1500
       }
-      if (this.accessory.context.state !== newPos) return
+      if (accessory.context.state !== newPos) return
       await helpers.sleep(delay)
       gdService
         .updateCharacteristic(this.Characteristic.TargetDoorState, newPos)
         .updateCharacteristic(this.Characteristic.CurrentDoorState, newPos + 2)
-      this.accessory.context.cacheTargetDoorState = newPos
-      this.accessory.context.cacheCurrentDoorState = newPos + 2
+      accessory.context.cacheTargetDoorState = newPos
+      accessory.context.cacheCurrentDoorState = newPos + 2
       switch (garageConfig.setup) {
         case 'oneSwitch':
           params.switch = 'on'
@@ -74,34 +73,34 @@ module.exports = class deviceGarage {
           params.switches[1].switch = newPos === 1 ? 'on' : 'off'
           break
       }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
+      await this.platform.sendDeviceUpdate(accessory, params)
       await helpers.sleep(Math.max(garageConfig.operationTime * 100, 1000))
       if (!sAccessory) {
         gdService.updateCharacteristic(this.Characteristic.CurrentDoorState, newPos)
-        this.accessory.context.cacheCurrentDoorState = newPos
+        accessory.context.cacheCurrentDoorState = newPos
       }
-      this.accessory.context.inUse = false
+      accessory.context.inUse = false
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
+      this.platform.deviceUpdateError(accessory, err, true)
     }
   }
 
-  async externalUpdate (params) {
+  async externalUpdate (accessory, params) {
     try {
       if (!helpers.hasProperty(params, 'switch') && !helpers.hasProperty(params, 'switches')) {
         return
       }
       let garageConfig
-      const gcService = this.accessory.getService(this.Service.GarageDoorOpener)
-      const prevState = this.accessory.context.cacheCurrentDoorState
+      const gcService = accessory.getService(this.Service.GarageDoorOpener)
+      const prevState = accessory.context.cacheCurrentDoorState
       const newPos = [0, 2].includes(prevState) ? 3 : 2
-      if (!(garageConfig = this.platform.cusG.get(this.accessory.context.hbDeviceId))) {
+      if (!(garageConfig = this.platform.cusG.get(accessory.context.hbDeviceId))) {
         throw new Error('group config missing')
       }
       if (garageConfig.type !== 'garage' || !['oneSwitch', 'twoSwitch'].includes(garageConfig.setup)) {
         throw new Error('improper configuration')
       }
-      if (this.accessory.context.inUse || garageConfig.sensorId) return
+      if (accessory.context.inUse || garageConfig.sensorId) return
       switch (garageConfig.setup) {
         case 'oneSwitch':
           if (params.switch === 'off') {
@@ -117,23 +116,23 @@ module.exports = class deviceGarage {
           }
           break
       }
-      this.accessory.context.inUse = true
+      accessory.context.inUse = true
       if (garageConfig.sensorId) {
         await helpers.sleep(Math.max(garageConfig.operationTime * 100, 1000))
       } else {
         gcService
           .updateCharacteristic(this.Characteristic.TargetDoorState, newPos - 2)
           .updateCharacteristic(this.Characteristic.CurrentDoorState, newPos)
-        this.accessory.context.cacheCurrentDoorState = newPos
-        this.accessory.context.cacheTargetDoorState = newPos - 2
+        accessory.context.cacheCurrentDoorState = newPos
+        accessory.context.cacheTargetDoorState = newPos - 2
         await helpers.sleep(Math.max(garageConfig.operationTime * 100, 1000))
         gcService.updateCharacteristic(this.Characteristic.CurrentDoorState, newPos - 2)
-        this.accessory.context.cacheCurrentDoorState = newPos - 2
+        accessory.context.cacheCurrentDoorState = newPos - 2
       }
-      this.accessory.context.inUse = false
+      accessory.context.inUse = false
     } catch (err) {
-      this.accessory.context.inUse = false
-      this.platform.deviceUpdateError(this.accessory, err, false)
+      accessory.context.inUse = false
+      this.platform.deviceUpdateError(accessory, err, false)
     }
   }
 }
diff --git a/lib/device/light-colour.js b/lib/device/light-colour.js
index fe68041a..487356a3 100644
--- a/lib/device/light-colour.js
+++ b/lib/device/light-colour.js
@@ -11,13 +11,13 @@ module.exports = class deviceLightColour {
     const lightService = accessory.getService(this.Service.Lightbulb) || accessory.addService(this.Service.Lightbulb)
     lightService
       .getCharacteristic(this.Characteristic.On)
-      .on('set', (value, callback) => this.internalUpdate('onoff', value, callback))
+      .on('set', (value, callback) => this.internalUpdate(accessory, 'onoff', value, callback))
     lightService
       .getCharacteristic(this.Characteristic.Brightness)
-      .on('set', (value, callback) => this.internalUpdate('brightness', value, callback))
+      .on('set', (value, callback) => this.internalUpdate(accessory, 'brightness', value, callback))
     lightService
       .getCharacteristic(this.Characteristic.Hue)
-      .on('set', (value, callback) => this.internalUpdate('hue', value, callback))
+      .on('set', (value, callback) => this.internalUpdate(accessory, 'hue', value, callback))
     lightService
       .getCharacteristic(this.Characteristic.Saturation)
       .on('set', (value, callback) => callback())
@@ -29,29 +29,28 @@ module.exports = class deviceLightColour {
           minStep: 100
         })
     }
-    this.accessory = accessory
   }
 
-  async internalUpdate (type, value, callback) {
+  async internalUpdate (accessory, type, value, callback) {
     callback()
     try {
       let newRGB
       let params = {}
-      const lightService = this.accessory.getService(this.Service.Lightbulb)
+      const lightService = accessory.getService(this.Service.Lightbulb)
       switch (type) {
         case 'onoff':
-          if (this.accessory.context.eweUIID === 22) {
+          if (accessory.context.eweUIID === 22) {
           // **** B1 uses state rather than switch *** \\
             params.state = value ? 'on' : 'off'
           } else {
             params.switch = value ? 'on' : 'off'
           }
-          await this.platform.sendDeviceUpdate(this.accessory, params)
+          await this.platform.sendDeviceUpdate(accessory, params)
           break
         case 'brightness': {
           const updateKeyBright = Math.random().toString(36).substr(2, 8)
-          this.accessory.context.updateKeyBright = updateKeyBright
-          switch (this.accessory.context.eweUIID) {
+          accessory.context.updateKeyBright = updateKeyBright
+          switch (accessory.context.eweUIID) {
             case 22:
               // *** B1 doesn't support brightness *** \\
               return
@@ -68,23 +67,23 @@ module.exports = class deviceLightColour {
                 ltype: 'color',
                 color: {
                   br: value,
-                  r: this.accessory.context.cacheR,
-                  g: this.accessory.context.cacheG,
-                  b: this.accessory.context.cacheB
+                  r: accessory.context.cacheR,
+                  g: accessory.context.cacheG,
+                  b: accessory.context.cacheB
                 }
               }
               break
           }
           await helpers.sleep(500)
-          if (updateKeyBright !== this.accessory.context.updateKeyBright) return
-          await this.platform.sendDeviceUpdate(this.accessory, params)
+          if (updateKeyBright !== accessory.context.updateKeyBright) return
+          await this.platform.sendDeviceUpdate(accessory, params)
           break
         }
         case 'hue': {
           const updateKeyColour = Math.random().toString(36).substr(2, 8)
-          this.accessory.context.updateKeyColour = updateKeyColour
+          accessory.context.updateKeyColour = updateKeyColour
           newRGB = convert.hsv.rgb(value, lightService.getCharacteristic(this.Characteristic.Saturation).value, 100)
-          switch (this.accessory.context.eweUIID) {
+          switch (accessory.context.eweUIID) {
             case 22:
             // *** B1 *** \\
               params = {
@@ -117,38 +116,38 @@ module.exports = class deviceLightColour {
                   br: lightService.getCharacteristic(this.Characteristic.Brightness).value
                 }
               }
-              this.accessory.context.cacheR = newRGB[0]
-              this.accessory.context.cacheG = newRGB[1]
-              this.accessory.context.cacheB = newRGB[2]
+              accessory.context.cacheR = newRGB[0]
+              accessory.context.cacheG = newRGB[1]
+              accessory.context.cacheB = newRGB[2]
               break
           }
           await helpers.sleep(1000)
-          if (updateKeyColour !== this.accessory.context.updateKeyColour) return
-          await this.platform.sendDeviceUpdate(this.accessory, params)
+          if (updateKeyColour !== accessory.context.updateKeyColour) return
+          await this.platform.sendDeviceUpdate(accessory, params)
           break
         }
       }
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
+      this.platform.deviceUpdateError(accessory, err, true)
     }
   }
 
-  async externalUpdate (params) {
+  async externalUpdate (accessory, params) {
     try {
       let newColour
       let mode
       let isOn = false
-      const lightService = this.accessory.getService(this.Service.Lightbulb)
-      if (this.accessory.context.eweUIID === 22 && helpers.hasProperty(params, 'state')) {
+      const lightService = accessory.getService(this.Service.Lightbulb)
+      if (accessory.context.eweUIID === 22 && helpers.hasProperty(params, 'state')) {
         isOn = params.state === 'on'
-      } else if (this.accessory.context.eweUIID !== 22 && helpers.hasProperty(params, 'switch')) {
+      } else if (accessory.context.eweUIID !== 22 && helpers.hasProperty(params, 'switch')) {
         isOn = params.switch === 'on'
       } else {
         isOn = lightService.getCharacteristic(this.Characteristic.On).value
       }
       if (isOn) {
         lightService.updateCharacteristic(this.Characteristic.On, true)
-        switch (this.accessory.context.eweUIID) {
+        switch (accessory.context.eweUIID) {
           case 22:
             // *** B1 *** \\
             if (helpers.hasProperty(params, 'zyx_mode')) {
@@ -204,9 +203,9 @@ module.exports = class deviceLightColour {
                   lightService
                     .updateCharacteristic(this.Characteristic.Hue, newColour[0])
                     .updateCharacteristic(this.Characteristic.Saturation, 100)
-                  this.accessory.context.cacheR = params.color.r
-                  this.accessory.context.cacheG = params.color.g
-                  this.accessory.context.cacheB = params.color.b
+                  accessory.context.cacheR = params.color.r
+                  accessory.context.cacheG = params.color.g
+                  accessory.context.cacheB = params.color.b
                 }
               }
             }
@@ -216,7 +215,7 @@ module.exports = class deviceLightColour {
         lightService.updateCharacteristic(this.Characteristic.On, false)
       }
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, false)
+      this.platform.deviceUpdateError(accessory, err, false)
     }
   }
 }
diff --git a/lib/device/light-ctemp.js b/lib/device/light-ctemp.js
index 66fa2e25..f9450a4e 100644
--- a/lib/device/light-ctemp.js
+++ b/lib/device/light-ctemp.js
@@ -9,27 +9,26 @@ module.exports = class deviceLightCTemp {
     const lightService = accessory.getService(this.Service.Lightbulb) || accessory.addService(this.Service.Lightbulb)
     lightService
       .getCharacteristic(this.Characteristic.On)
-      .on('set', (value, callback) => this.internalUpdate('onoff', value, callback))
+      .on('set', (value, callback) => this.internalUpdate(accessory, 'onoff', value, callback))
     lightService
       .getCharacteristic(this.Characteristic.Brightness)
-      .on('set', (value, callback) => this.internalUpdate('brightness', value, callback))
-    this.accessory = accessory
+      .on('set', (value, callback) => this.internalUpdate(accessory, 'brightness', value, callback))
   }
 
-  async internalUpdate (type, value, callback) {
+  async internalUpdate (accessory, type, value, callback) {
     callback()
     try {
 
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
+      this.platform.deviceUpdateError(accessory, err, true)
     }
   }
 
-  async externalUpdate (params) {
+  async externalUpdate (accessory, params) {
     try {
 
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, false)
+      this.platform.deviceUpdateError(accessory, err, false)
     }
   }
 }
diff --git a/lib/device/light-dimmer.js b/lib/device/light-dimmer.js
index b7c30db4..94da5b67 100644
--- a/lib/device/light-dimmer.js
+++ b/lib/device/light-dimmer.js
@@ -10,25 +10,24 @@ module.exports = class deviceLightDimmer {
     const lightService = accessory.getService(this.Service.Lightbulb) || accessory.addService(this.Service.Lightbulb)
     lightService
       .getCharacteristic(this.Characteristic.On)
-      .on('set', (value, callback) => this.internalUpdate('onoff', value, callback))
+      .on('set', (value, callback) => this.internalUpdate(accessory, 'onoff', value, callback))
     lightService.getCharacteristic(this.Characteristic.Brightness)
-      .on('set', (value, callback) => this.internalUpdate('brightness', value, callback))
-    this.accessory = accessory
+      .on('set', (value, callback) => this.internalUpdate(accessory, 'brightness', value, callback))
   }
 
-  async internalUpdate (type, value, callback) {
+  async internalUpdate (accessory, type, value, callback) {
     callback()
     try {
       const params = {}
       switch (type) {
         case 'onoff':
           params.switch = value ? 'on' : 'off'
-          await this.platform.sendDeviceUpdate(this.accessory, params)
+          await this.platform.sendDeviceUpdate(accessory, params)
           break
         case 'brightness': {
           const updateKey = Math.random().toString(36).substr(2, 8)
-          this.accessory.context.updateKey = updateKey
-          switch (this.accessory.context.eweUIID) {
+          accessory.context.updateKey = updateKey
+          switch (accessory.context.eweUIID) {
             case 36:
               // *** KING-M4 eWeLink scale is 10-100 and HomeKit scale is 0-100. *** \\
               params.bright = Math.round((value * 9) / 10 + 10)
@@ -40,25 +39,25 @@ module.exports = class deviceLightDimmer {
               break
           }
           await helpers.sleep(500)
-          if (updateKey !== this.accessory.context.updateKey) return
-          await this.platform.sendDeviceUpdate(this.accessory, params)
+          if (updateKey !== accessory.context.updateKey) return
+          await this.platform.sendDeviceUpdate(accessory, params)
           break
         }
       }
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
+      this.platform.deviceUpdateError(accessory, err, true)
     }
   }
 
-  async externalUpdate (params) {
+  async externalUpdate (accessory, params) {
     try {
-      const lightService = this.accessory.getService(this.Service.Lightbulb)
+      const lightService = accessory.getService(this.Service.Lightbulb)
       const isOn = helpers.hasProperty(params, 'switch')
         ? params.switch === 'on'
         : lightService.getCharacteristic(this.Characteristic.On).value
       if (isOn) {
         lightService.updateCharacteristic(this.Characteristic.On, true)
-        switch (this.accessory.context.eweUIID) {
+        switch (accessory.context.eweUIID) {
           case 36:
             // *** KING-M4 eWeLink scale is 10-100 and HomeKit scale is 0-100. *** \\
             if (helpers.hasProperty(params, 'bright')) {
@@ -77,7 +76,7 @@ module.exports = class deviceLightDimmer {
         lightService.updateCharacteristic(this.Characteristic.On, false)
       }
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, false)
+      this.platform.deviceUpdateError(accessory, err, false)
     }
   }
 }
diff --git a/lib/device/lock.js b/lib/device/lock.js
index b69ea0cc..6804242f 100644
--- a/lib/device/lock.js
+++ b/lib/device/lock.js
@@ -10,49 +10,49 @@ module.exports = class deviceLock {
     const lmService = accessory.getService(this.Service.LockMechanism) || accessory.addService(this.Service.LockMechanism)
     lmService
       .getCharacteristic(this.Characteristic.LockTargetState)
-      .on('set', (value, callback) => this.internalUpdate(value, callback))
-    this.accessory = accessory
+      .on('set', (value, callback) => this.internalUpdate(accessory, value, callback))
+    accessory = accessory
   }
 
-  async internalUpdate (value, callback) {
+  async internalUpdate (accessory, value, callback) {
     callback()
     try {
       let lockConfig
       const params = { switch: 'on' }
-      const lmService = this.accessory.getService(this.Service.LockMechanism)
-      if (!(lockConfig = this.platform.cusG.get(this.accessory.context.hbDeviceId))) {
+      const lmService = accessory.getService(this.Service.LockMechanism)
+      if (!(lockConfig = this.platform.cusG.get(accessory.context.hbDeviceId))) {
         throw new Error('group config missing')
       }
       if (lockConfig.type !== 'lock') {
         throw new Error('improper configuration')
       }
-      this.accessory.context.inUse = true
-      await this.platform.sendDeviceUpdate(this.accessory, params)
+      accessory.context.inUse = true
+      await this.platform.sendDeviceUpdate(accessory, params)
       await helpers.sleep(Math.max(lockConfig.operationTime * 100, 1000))
       lmService
         .updateCharacteristic(this.Characteristic.LockTargetState, 1)
         .updateCharacteristic(this.Characteristic.LockCurrentState, 1)
-      this.accessory.context.inUse = false
+      accessory.context.inUse = false
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
+      this.platform.deviceUpdateError(accessory, err, true)
     }
   }
 
-  async externalUpdate (params) {
+  async externalUpdate (accessory, params) {
     try {
       if (!helpers.hasProperty(params, 'switch')) return
       let lockConfig
-      const lmService = this.accessory.getService(this.Service.LockMechanism)
-      if (!(lockConfig = this.platform.cusG.get(this.accessory.context.hbDeviceId))) {
+      const lmService = accessory.getService(this.Service.LockMechanism)
+      if (!(lockConfig = this.platform.cusG.get(accessory.context.hbDeviceId))) {
         throw new Error('group config missing')
       }
       if (lockConfig.type !== 'lock') {
         throw new Error('improper configuration')
       }
-      if (params.switch === 'off' || this.accessory.context.inUse) {
+      if (params.switch === 'off' || accessory.context.inUse) {
         return
       }
-      this.accessory.context.inUse = true
+      accessory.context.inUse = true
       lmService
         .updateCharacteristic(this.Characteristic.LockCurrentState, 0)
         .updateCharacteristic(this.Characteristic.LockTargetState, 0)
@@ -60,10 +60,10 @@ module.exports = class deviceLock {
       lmService
         .updateCharacteristic(this.Characteristic.LockCurrentState, 1)
         .updateCharacteristic(this.Characteristic.LockTargetState, 1)
-      this.accessory.context.inUse = false
+      accessory.context.inUse = false
     } catch (err) {
-      this.accessory.context.inUse = false
-      this.platform.deviceUpdateError(this.accessory, err, false)
+      accessory.context.inUse = false
+      this.platform.deviceUpdateError(accessory, err, false)
     }
   }
 }
diff --git a/lib/device/outlet.js b/lib/device/outlet.js
index 72339905..3992c9e0 100644
--- a/lib/device/outlet.js
+++ b/lib/device/outlet.js
@@ -100,10 +100,10 @@ module.exports = class deviceOutlet {
     }
     outletService
       .getCharacteristic(this.Characteristic.On)
-      .on('set', (value, callback) => this.internalUpdate(value, callback))
+      .on('set', (value, callback) => this.internalUpdate(accessory, value, callback))
     outletService
       .getCharacteristic(this.eveResetTotal)
-      .on('set', (value, callback) => {
+      .on('set', (accessory, value, callback) => {
         callback()
         accessory.context.energyReadings = []
         accessory.context.energyReadingTotal = 0
@@ -126,38 +126,37 @@ module.exports = class deviceOutlet {
       accessory.context.energyReadings = []
       outletService.updateCharacteristic(this.eveTotalConsumption, accessory.context.energyReadingTotal)
     }, 300000)
-    this.accessory = accessory
   }
 
-  async internalUpdate (value, callback) {
+  async internalUpdate (accessory, value, callback) {
     callback()
     try {
       const params = { switch: value ? 'on' : 'off' }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
+      await this.platform.sendDeviceUpdate(accessory, params)
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
+      this.platform.deviceUpdateError(accessory, err, true)
     }
   }
 
-  async externalUpdate (params) {
+  async externalUpdate (accessory, params) {
     try {
-      const outletService = this.accessory.getService(this.Service.Outlet)
+      const outletService = accessory.getService(this.Service.Outlet)
       if (helpers.hasProperty(params, 'switch')) {
         outletService.updateCharacteristic(this.Characteristic.On, params.switch === 'on')
-        if (!this.accessory.context.powerReadings) {
+        if (!accessory.context.powerReadings) {
           outletService.updateCharacteristic(this.Characteristic.OutletInUse, params.switch === 'on')
         }
       }
       if (helpers.hasProperty(params, 'power')) {
-        this.accessory.context.powerReadings = true
+        accessory.context.powerReadings = true
         outletService.updateCharacteristic(this.Characteristic.OutletInUse, parseFloat(params.power) > this.inUsePowerThreshold)
         outletService.updateCharacteristic(this.eveCurrentConsumption, parseFloat(params.power))
-        const isOn = this.accessory.getService(this.Service.Outlet).getCharacteristic(this.Characteristic.On).value
-        this.accessory.eveLogger.addEntry({
+        const isOn = accessory.getService(this.Service.Outlet).getCharacteristic(this.Characteristic.On).value
+        accessory.eveLogger.addEntry({
           time: Math.round(new Date().valueOf() / 1000),
           power: isOn ? parseFloat(params.power) : 0
         })
-        this.accessory.context.energyReadings.push(parseFloat(params.power))
+        accessory.context.energyReadings.push(parseFloat(params.power))
       }
       if (helpers.hasProperty(params, 'voltage')) {
         outletService.updateCharacteristic(this.eveVoltage, parseFloat(params.voltage))
@@ -166,7 +165,7 @@ module.exports = class deviceOutlet {
         outletService.updateCharacteristic(this.eveElectricCurrent, parseFloat(params.current))
       }
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, false)
+      this.platform.deviceUpdateError(accessory, err, false)
     }
   }
 }
diff --git a/lib/device/rf-bridge.js b/lib/device/rf-bridge.js
index f5f61a00..e9fe4f13 100644
--- a/lib/device/rf-bridge.js
+++ b/lib/device/rf-bridge.js
@@ -21,7 +21,7 @@ module.exports = class deviceRFBridge {
         accessory.getService(name).updateCharacteristic(this.Characteristic.On, false)
         accessory.getService(name)
           .getCharacteristic(this.Characteristic.On)
-          .on('set', (value, callback) => this.internalUpdate(chan, name, value, callback))
+          .on('set', (value, callback) => this.internalUpdate(accessory, chan, name, value, callback))
       })
     } else {
       let serv
@@ -73,10 +73,9 @@ module.exports = class deviceRFBridge {
         path: this.platform.eveLogPath
       })
     }
-    this.accessory = accessory
   }
 
-  async internalUpdate (rfChl, service, value, callback) {
+  async internalUpdate (accessory, rfChl, service, value, callback) {
     callback()
     try {
       if (!value) return
@@ -85,14 +84,14 @@ module.exports = class deviceRFBridge {
         rfChl: parseInt(rfChl)
       }
       await helpers.sleep(1000)
-      this.accessory.getService(service).updateCharacteristic(this.Characteristic.On, false)
-      await this.platform.sendDeviceUpdate(this.accessory, params)
+      accessory.getService(service).updateCharacteristic(this.Characteristic.On, false)
+      await this.platform.sendDeviceUpdate(accessory, params)
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
+      this.platform.deviceUpdateError(accessory, err, true)
     }
   }
 
-  async externalUpdate (params) {
+  async externalUpdate (accessory, params) {
     try {
       if (!helpers.hasProperty(params, 'updateSource')) return
       const timeNow = new Date()
@@ -100,7 +99,7 @@ module.exports = class deviceRFBridge {
       if (helpers.hasProperty(params, 'cmd') && params.cmd === 'transmit' && helpers.hasProperty(params, 'rfChl')) {
         this.platform.devicesInHB.forEach(acc => {
           if (
-            acc.context.eweDeviceId === this.accessory.context.eweDeviceId &&
+            acc.context.eweDeviceId === accessory.context.eweDeviceId &&
             helpers.hasProperty(acc.context, 'buttons') &&
             helpers.hasProperty(acc.context.buttons, params.rfChl.toString())
           ) {
@@ -121,7 +120,7 @@ module.exports = class deviceRFBridge {
           .forEach(async chan => {
             this.platform.devicesInHB.forEach(acc => {
               if (
-                acc.context.eweDeviceId === this.accessory.context.eweDeviceId &&
+                acc.context.eweDeviceId === accessory.context.eweDeviceId &&
                 helpers.hasProperty(acc.context, 'buttons') &&
                 helpers.hasProperty(acc.context.buttons, chan.split('g')[1].toString())
               ) {
@@ -198,7 +197,7 @@ module.exports = class deviceRFBridge {
           })
       }
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, false)
+      this.platform.deviceUpdateError(accessory, err, false)
     }
   }
 }
diff --git a/lib/device/scm.js b/lib/device/scm.js
index fc8c339c..c952e154 100644
--- a/lib/device/scm.js
+++ b/lib/device/scm.js
@@ -12,36 +12,36 @@ module.exports = class deviceSCM {
     const scmService = accessory.getService(this.Service.Switch) || accessory.addService(this.Service.Switch)
     scmService
       .getCharacteristic(this.Characteristic.On)
-      .on('set', (value, callback) => this.internalUpdate(value, callback))
+      .on('set', (value, callback) => this.internalUpdate(accessory, value, callback))
     accessory.log = this.platform.log
     accessory.eveLogger = new this.EveHistoryService('switch', accessory, {
       storage: 'fs',
       path: this.platform.eveLogPath
     })
-    this.accessory = accessory
+    accessory = accessory
   }
 
-  async internalUpdate (value, callback) {
+  async internalUpdate (accessory, value, callback) {
     callback()
     try {
       const params = { switches: helpers.defaultMultiSwitchOff }
       params.switches[0].switch = value ? 'on' : 'off'
-      await this.platform.sendDeviceUpdate(this.accessory, params)
+      await this.platform.sendDeviceUpdate(accessory, params)
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
+      this.platform.deviceUpdateError(accessory, err, true)
     }
   }
 
-  async externalUpdate (params) {
+  async externalUpdate (accessory, params) {
     try {
       if (!helpers.hasProperty(params, 'switches')) return
-      this.accessory.getService(this.Service.Switch).updateCharacteristic(this.Characteristic.On, params.switches[0].switch === 'on')
-      this.accessory.eveLogger.addEntry({
+      accessory.getService(this.Service.Switch).updateCharacteristic(this.Characteristic.On, params.switches[0].switch === 'on')
+      accessory.eveLogger.addEntry({
         time: Math.round(new Date().valueOf() / 1000),
         status: params.switches[0].switch === 'on' ? 1 : 0
       })
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, false)
+      this.platform.deviceUpdateError(accessory, err, false)
     }
   }
 }
diff --git a/lib/device/sensor.js b/lib/device/sensor.js
index 50c5816e..c1592391 100644
--- a/lib/device/sensor.js
+++ b/lib/device/sensor.js
@@ -22,14 +22,13 @@ module.exports = class deviceSensor {
       storage: 'fs',
       path: this.platform.eveLogPath
     })
-    this.accessory = accessory
   }
 
   async externalUpdate (params) {
     try {
       if (helpers.hasProperty(params, 'battery')) {
         const batteryService =
-            this.accessory.getService(this.Service.BatteryService) || this.accessory.addService(this.Service.BatteryService)
+            accessory.getService(this.Service.BatteryService) || accessory.addService(this.Service.BatteryService)
         const scaledBattery = Math.round(params.battery * 33.3)
         batteryService.updateCharacteristic(this.Characteristic.BatteryLevel, scaledBattery)
         batteryService.updateCharacteristic(
@@ -40,14 +39,14 @@ module.exports = class deviceSensor {
       if (!helpers.hasProperty(params, 'switch')) return
       const newState = params.switch === 'on' ? 1 : 0
       let oAccessory = false
-      const contactService = this.accessory.getService(this.Service.ContactSensor)
+      const contactService = accessory.getService(this.Service.ContactSensor)
       contactService.updateCharacteristic(this.Characteristic.ContactSensorState, newState)
-      this.accessory.eveLogger.addEntry({
+      accessory.eveLogger.addEntry({
         time: Math.round(new Date().valueOf() / 1000),
         status: newState
       })
       this.platform.cusG.forEach(async group => {
-        if (group.sensorId === this.accessory.context.eweDeviceId && group.type === 'garage') {
+        if (group.sensorId === accessory.context.eweDeviceId && group.type === 'garage') {
           if ((oAccessory = this.platform.devicesInHB.get(group.deviceId + 'SWX'))) {
             switch (newState) {
               case 0:
@@ -68,7 +67,7 @@ module.exports = class deviceSensor {
         }
       })
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, false)
+      this.platform.deviceUpdateError(accessory, err, false)
     }
   }
 }
diff --git a/lib/device/switch-multi.js b/lib/device/switch-multi.js
index ae1c3f7d..c4caf414 100644
--- a/lib/device/switch-multi.js
+++ b/lib/device/switch-multi.js
@@ -13,7 +13,7 @@ module.exports = class deviceSwitch {
     const switchService = accessory.getService(this.Service.Switch) || accessory.addService(this.Service.Switch)
     switchService
       .getCharacteristic(this.Characteristic.On)
-      .on('set', (value, callback) => this.internalUpdate(value, callback))
+      .on('set', (value, callback) => this.internalUpdate(accessory, value, callback))
     if (accessory.getService(this.Service.Outlet)) {
       accessory.removeService(accessory.getService(this.Service.Outlet))
     }
@@ -25,24 +25,15 @@ module.exports = class deviceSwitch {
       storage: 'fs',
       path: this.platform.eveLogPath
     })
-    this.accessory = accessory
   }
 
-  async internalUpdate (value, callback) {
-    // *** generates a random number in the range [10, 100] *** \\
-    await helpers.sleep(Math.floor(Math.random() * 91 + 10))
-    if (this.updateInProgress) {
-      await helpers.sleep(300)
-      return await this.internalUpdate(value, callback)
-    }
-    this.updateInProgress = true
-    setTimeout(() => (this.updateInProgress = false), 250)
-    callback()
+  async internalUpdate (accessory, value, callback) {
     try {
+      callback()
       let oAccessory
       let masterState = 'off'
       const params = {}
-      switch (this.accessory.context.switchNumber) {
+      switch (accessory.context.switchNumber) {
         case '0':
           params.switches = helpers.defaultMultiSwitchOff
           params.switches[0].switch = value ? 'on' : 'off'
@@ -50,8 +41,9 @@ module.exports = class deviceSwitch {
           params.switches[2].switch = value ? 'on' : 'off'
           params.switches[3].switch = value ? 'on' : 'off'
           for (let i = 0; i <= 4; i++) {
-            if ((oAccessory = this.platform.devicesInHB.get(this.accessory.context.eweDeviceId + 'SW' + i))) {
+            if ((oAccessory = this.platform.devicesInHB.get(accessory.context.eweDeviceId + 'SW' + i))) {
               oAccessory.getService(this.Service.Switch).updateCharacteristic(this.Characteristic.On, value)
+              oAccessory.context.cacheOn = value
             }
           }
           break
@@ -61,11 +53,11 @@ module.exports = class deviceSwitch {
         case '4':
           params.switches = helpers.defaultMultiSwitchOff
           for (let i = 1; i <= 4; i++) {
-            if ((oAccessory = this.platform.devicesInHB.get(this.accessory.context.eweDeviceId + 'SW' + i))) {
+            if ((oAccessory = this.platform.devicesInHB.get(accessory.context.eweDeviceId + 'SW' + i))) {
               if (oAccessory.getService(this.Service.Switch).getCharacteristic(this.Characteristic.On).value) {
                 masterState = 'on'
               }
-              if (i === parseInt(this.accessory.context.switchNumber)) {
+              if (i === parseInt(accessory.context.switchNumber)) {
                 params.switches[i - 1].switch = value ? 'on' : 'off'
                 oAccessory.context.cacheOn = value
               } else {
@@ -75,24 +67,24 @@ module.exports = class deviceSwitch {
               params.switches[i - 1].switch = 'off'
             }
           }
-          if (!this.platform.hiddenMasters.includes(this.accessory.context.eweDeviceId)) {
-            oAccessory = this.platform.devicesInHB.get(this.accessory.context.eweDeviceId + 'SW0')
+          if (!this.platform.hiddenMasters.includes(accessory.context.eweDeviceId)) {
+            oAccessory = this.platform.devicesInHB.get(accessory.context.eweDeviceId + 'SW0')
             oAccessory.getService(this.Service.Switch).updateCharacteristic(this.Characteristic.On, masterState === 'on')
           }
           break
       }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
+      await this.platform.sendDeviceUpdate(accessory, params)
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
+      this.platform.deviceUpdateError(accessory, err, true)
     }
   }
 
-  async externalUpdate (params) {
+  async externalUpdate (accessory, params) {
     try {
       if (!helpers.hasProperty(params, 'switches')) return
-      const idToCheck = this.accessory.context.hbDeviceId.slice(0, -1)
+      const idToCheck = accessory.context.hbDeviceId.slice(0, -1)
       let primaryState = false
-      for (let i = 1; i <= this.accessory.context.channelCount; i++) {
+      for (let i = 1; i <= accessory.context.channelCount; i++) {
         if (params.switches[i - 1].switch === 'on') {
           primaryState = true
         }
@@ -108,15 +100,15 @@ module.exports = class deviceSwitch {
           })
         }
       }
-      if (!this.platform.hiddenMasters.includes(this.accessory.context.eweDeviceId)) {
-        this.accessory.getService(this.Service.Switch).updateCharacteristic(this.Characteristic.On, primaryState)
-        this.accessory.eveLogger.addEntry({
+      if (!this.platform.hiddenMasters.includes(accessory.context.eweDeviceId)) {
+        accessory.getService(this.Service.Switch).updateCharacteristic(this.Characteristic.On, primaryState)
+        accessory.eveLogger.addEntry({
           time: Math.round(new Date().valueOf() / 1000),
           status: primaryState ? 1 : 0
         })
       }
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, false)
+      this.platform.deviceUpdateError(accessory, err, false)
     }
   }
 }
diff --git a/lib/device/switch-single.js b/lib/device/switch-single.js
index 90c7cbf6..1b106754 100644
--- a/lib/device/switch-single.js
+++ b/lib/device/switch-single.js
@@ -12,7 +12,7 @@ module.exports = class deviceSwitchSingle {
     const switchService = accessory.getService(this.Service.Switch) || accessory.addService(this.Service.Switch)
     switchService
       .getCharacteristic(this.Characteristic.On)
-      .on('set', (value, callback) => this.internalUpdate(value, callback))
+      .on('set', (value, callback) => this.internalUpdate(accessory, value, callback))
     if (accessory.getService(this.Service.Outlet)) {
       accessory.removeService(accessory.getService(this.Service.Outlet))
     }
@@ -24,29 +24,29 @@ module.exports = class deviceSwitchSingle {
       storage: 'fs',
       path: this.platform.eveLogPath
     })
-    this.accessory = accessory
+    accessory = accessory
   }
 
-  async internalUpdate (value, callback) {
+  async internalUpdate (accessory, value, callback) {
     callback()
     try {
       const params = { switch: value ? 'on' : 'off' }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
+      await this.platform.sendDeviceUpdate(accessory, params)
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
+      this.platform.deviceUpdateError(accessory, err, true)
     }
   }
 
-  async externalUpdate (params) {
+  async externalUpdate (accessory, params) {
     try {
       if (!helpers.hasProperty(params, 'switch')) return
-      this.accessory.getService(this.Service.Switch).updateCharacteristic(this.Characteristic.On, params.switch === 'on')
-      this.accessory.eveLogger.addEntry({
+      accessory.getService(this.Service.Switch).updateCharacteristic(this.Characteristic.On, params.switch === 'on')
+      accessory.eveLogger.addEntry({
         time: Math.round(new Date().valueOf() / 1000),
         status: params.switch === 'on' ? 1 : 0
       })
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, false)
+      this.platform.deviceUpdateError(accessory, err, false)
     }
   }
 }
diff --git a/lib/device/template.js b/lib/device/template.js
index 96b3e25d..640ac76d 100644
--- a/lib/device/template.js
+++ b/lib/device/template.js
@@ -9,24 +9,24 @@ module.exports = class deviceTemplate {
     const service = accessory.getService(this.Service.Switch) || accessory.addService(this.Service.Switch)
     service
       .getCharacteristic(this.Characteristic.On)
-      .on('set', (value, callback) => this.internalUpdate(value, callback))
-    this.accessory = accessory
+      .on('set', (value, callback) => this.internalUpdate(accessory, value, callback))
+    accessory = accessory
   }
 
-  async internalUpdate (value, callback) {
+  async internalUpdate (accessory, value, callback) {
     callback()
     try {
 
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
+      this.platform.deviceUpdateError(accessory, err, true)
     }
   }
 
-  async externalUpdate (params) {
+  async externalUpdate (accessory, params) {
     try {
 
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, false)
+      this.platform.deviceUpdateError(accessory, err, false)
     }
   }
 }
diff --git a/lib/device/thermostat.js b/lib/device/thermostat.js
index 2f2216d7..f8ebc126 100644
--- a/lib/device/thermostat.js
+++ b/lib/device/thermostat.js
@@ -17,63 +17,62 @@ module.exports = class deviceThermostat {
       const switchService = accessory.getService(this.Service.Switch) || accessory.addService(this.Service.Switch)
       switchService
         .getCharacteristic(this.Characteristic.On)
-        .on('set', (value, callback) => this.internalUpdate(value, callback))
+        .on('set', (value, callback) => this.internalUpdate(accessory, value, callback))
     }
     accessory.log = this.platform.log
     accessory.eveLogger = new this.EveHistoryService('custom', accessory, {
       storage: 'fs',
       path: this.platform.eveLogPath
     })
-    this.accessory = accessory
   }
 
-  async internalUpdate (value, callback) {
+  async internalUpdate (accessory, value, callback) {
     callback()
     try {
       const params = {
         switch: value ? 'on' : 'off',
         mainSwitch: value ? 'on' : 'off'
       }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
+      await this.platform.sendDeviceUpdate(accessory, params)
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
+      this.platform.deviceUpdateError(accessory, err, true)
     }
   }
 
-  async externalUpdate (params) {
+  async externalUpdate (accessory, params) {
     try {
       if (
         !this.platform.config.hideTHSwitch &&
         (helpers.hasProperty(params, 'switch') || helpers.hasProperty(params, 'mainSwitch'))
       ) {
         const newState = helpers.hasProperty(params, 'switch') ? params.switch === 'on' : params.mainSwitch === 'on'
-        const switchService = this.accessory.getService(this.Service.Switch)
+        const switchService = accessory.getService(this.Service.Switch)
         switchService.updateCharacteristic(this.Characteristic.On, newState)
-        this.accessory.eveLogger.addEntry({
+        accessory.eveLogger.addEntry({
           time: Math.round(new Date().valueOf() / 1000),
           status: newState ? 1 : 0
         })
       }
       const eveLog = { time: Math.round(new Date().valueOf() / 1000) }
-      if (helpers.hasProperty(params, 'currentTemperature') && this.accessory.getService(this.Service.TemperatureSensor)) {
+      if (helpers.hasProperty(params, 'currentTemperature') && accessory.getService(this.Service.TemperatureSensor)) {
         const currentTemp = parseFloat(params.currentTemperature !== 'unavailable' ? params.currentTemperature : 0)
-        this.accessory
+        accessory
           .getService(this.Service.TemperatureSensor)
           .updateCharacteristic(this.Characteristic.CurrentTemperature, currentTemp)
         eveLog.temp = currentTemp
       }
-      if (helpers.hasProperty(params, 'currentHumidity') && this.accessory.getService(this.Service.HumiditySensor)) {
+      if (helpers.hasProperty(params, 'currentHumidity') && accessory.getService(this.Service.HumiditySensor)) {
         const currentHumi = parseFloat(params.currentHumidity !== 'unavailable' ? params.currentHumidity : 0)
-        this.accessory
+        accessory
           .getService(this.Service.HumiditySensor)
           .updateCharacteristic(this.Characteristic.CurrentRelativeHumidity, currentHumi)
         eveLog.humidity = currentHumi
       }
       if (helpers.hasProperty(eveLog, 'temp') || helpers.hasProperty(eveLog, 'humidity')) {
-        this.accessory.eveLogger.addEntry(eveLog)
+        accessory.eveLogger.addEntry(eveLog)
       }
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, false)
+      this.platform.deviceUpdateError(accessory, err, false)
     }
   }
 }
diff --git a/lib/device/usb.js b/lib/device/usb.js
index ccc96e56..b43f90c0 100644
--- a/lib/device/usb.js
+++ b/lib/device/usb.js
@@ -12,36 +12,35 @@ module.exports = class deviceUSB {
     const usbService = accessory.getService(this.Service.Outlet) || accessory.addService(this.Service.Outlet)
     usbService
       .getCharacteristic(this.Characteristic.On)
-      .on('set', (value, callback) => this.internalUpdate(value, callback))
+      .on('set', (value, callback) => this.internalUpdate(accessory, value, callback))
     accessory.log = this.platform.log
     accessory.eveLogger = new this.EveHistoryService('switch', accessory, {
       storage: 'fs',
       path: this.platform.eveLogPath
     })
-    this.accessory = accessory
   }
 
-  async internalUpdate (value, callback) {
+  async internalUpdate (accessory, value, callback) {
     callback()
     try {
       const params = { switches: helpers.defaultMultiSwitchOff }
       params.switches[0].switch = value ? 'on' : 'off'
-      await this.platform.sendDeviceUpdate(this.accessory, params)
+      await this.platform.sendDeviceUpdate(accessory, params)
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
+      this.platform.deviceUpdateError(accessory, err, true)
     }
   }
 
-  async externalUpdate (params) {
+  async externalUpdate (accessory, params) {
     try {
       if (!helpers.hasProperty(params, 'switches')) return
-      this.accessory.getService(this.Service.Outlet).updateCharacteristic(this.Characteristic.On, params.switches[0].switch === 'on')
-      this.accessory.eveLogger.addEntry({
+      accessory.getService(this.Service.Outlet).updateCharacteristic(this.Characteristic.On, params.switches[0].switch === 'on')
+      accessory.eveLogger.addEntry({
         time: Math.round(new Date().valueOf() / 1000),
         status: params.switches[0].switch === 'on' ? 1 : 0
       })
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, false)
+      this.platform.deviceUpdateError(accessory, err, false)
     }
   }
 }
diff --git a/lib/device/valve-two.js b/lib/device/valve-two.js
index 4e53ebff..b49cabb2 100644
--- a/lib/device/valve-two.js
+++ b/lib/device/valve-two.js
@@ -22,7 +22,7 @@ module.exports = class deviceValveTwo {
       }
       valveService
         .getCharacteristic(this.Characteristic.Active)
-        .on('set', (value, callback) => this.internalUpdate('Valve ' + v, value, callback))
+        .on('set', (value, callback) => this.internalUpdate(accessory, 'Valve ' + v, value, callback))
       valveService
         .getCharacteristic(this.Characteristic.SetDuration)
         .on('set', (value, callback) => {
@@ -34,23 +34,22 @@ module.exports = class deviceValveTwo {
           callback()
         })
     })
-    this.accessory = accessory
   }
 
-  async internalUpdate (valve, value, callback) {
+  async internalUpdate (accessory, valve, value, callback) {
     callback()
     try {
       const params = { switches: helpers.defaultMultiSwitchOff }
-      const serviceValve = this.accessory.getService(valve)
+      const serviceValve = accessory.getService(valve)
       switch (valve) {
         case 'Valve A':
           params.switches[0].switch = value ? 'on' : 'off'
-          params.switches[1].switch = this.accessory.getService('Valve B').getCharacteristic(this.Characteristic.Active).value
+          params.switches[1].switch = accessory.getService('Valve B').getCharacteristic(this.Characteristic.Active).value
             ? 'on'
             : 'off'
           break
         case 'Valve B':
-          params.switches[0].switch = this.accessory.getService('Valve A').getCharacteristic(this.Characteristic.Active).value
+          params.switches[0].switch = accessory.getService('Valve A').getCharacteristic(this.Characteristic.Active).value
             ? 'on'
             : 'off'
           params.switches[1].switch = value ? 'on' : 'off'
@@ -60,7 +59,7 @@ module.exports = class deviceValveTwo {
       switch (value) {
         case 0:
           serviceValve.updateCharacteristic(this.Characteristic.RemainingDuration, 0)
-          clearTimeout(this.accessory.getService(valve).timer)
+          clearTimeout(accessory.getService(valve).timer)
           break
         case 1: {
           const timer = serviceValve.getCharacteristic(this.Characteristic.SetDuration).value
@@ -69,17 +68,17 @@ module.exports = class deviceValveTwo {
           break
         }
       }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
+      await this.platform.sendDeviceUpdate(accessory, params)
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
+      this.platform.deviceUpdateError(accessory, err, true)
     }
   }
 
-  async externalUpdate (params) {
+  async externalUpdate (accessory, params) {
     try {
       if (!helpers.hasProperty(params, 'switches')) return
       ;['A', 'B'].forEach((v, k) => {
-        const valveService = this.accessory.getService('Valve ' + v)
+        const valveService = accessory.getService('Valve ' + v)
         valveService
           .updateCharacteristic(this.Characteristic.Active, params.switches[k].switch === 'on')
           .updateCharacteristic(this.Characteristic.InUse, params.switches[k].switch === 'on')
@@ -93,7 +92,7 @@ module.exports = class deviceValveTwo {
         }
       })
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, false)
+      this.platform.deviceUpdateError(accessory, err, false)
     }
   }
 }
diff --git a/lib/device/valve.js b/lib/device/valve.js
index ac142ff3..e03b17a9 100644
--- a/lib/device/valve.js
+++ b/lib/device/valve.js
@@ -21,7 +21,7 @@ module.exports = class deviceValve {
     }
     valveService
       .getCharacteristic(this.Characteristic.Active)
-      .on('set', (value, callback) => this.internalUpdate(value, callback))
+      .on('set', (value, callback) => this.internalUpdate(accessory, value, callback))
     valveService
       .getCharacteristic(this.Characteristic.SetDuration)
       .on('set', (value, callback) => {
@@ -32,19 +32,18 @@ module.exports = class deviceValve {
         }
         callback()
       })
-    this.accessory = accessory
   }
 
-  async internalUpdate (value, callback) {
+  async internalUpdate (accessory, value, callback) {
     callback()
     try {
       const params = { switch: value ? 'on' : 'off' }
-      const serviceValve = this.accessory.getService(this.Service.Valve)
+      const serviceValve = accessory.getService(this.Service.Valve)
       serviceValve.updateCharacteristic(this.Characteristic.InUse, value)
       switch (value) {
         case 0:
           serviceValve.updateCharacteristic(this.Characteristic.RemainingDuration, 0)
-          clearTimeout(this.accessory.getService(this.Service.Valve).timer)
+          clearTimeout(accessory.getService(this.Service.Valve).timer)
           break
         case 1: {
           const timer = serviceValve.getCharacteristic(this.Characteristic.SetDuration).value
@@ -53,16 +52,16 @@ module.exports = class deviceValve {
           break
         }
       }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
+      await this.platform.sendDeviceUpdate(accessory, params)
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
+      this.platform.deviceUpdateError(accessory, err, true)
     }
   }
 
-  async externalUpdate (params) {
+  async externalUpdate (accessory, params) {
     try {
       if (!helpers.hasProperty(params, 'switch')) return
-      const valveService = this.accessory.getService(this.Service.Valve)
+      const valveService = accessory.getService(this.Service.Valve)
       valveService
         .updateCharacteristic(this.Characteristic.Active, params.switch === 'on')
         .updateCharacteristic(this.Characteristic.InUse, params.switch === 'on')
@@ -75,7 +74,7 @@ module.exports = class deviceValve {
         clearTimeout(valveService.timer)
       }
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, false)
+      this.platform.deviceUpdateError(accessory, err, false)
     }
   }
 }
diff --git a/lib/device/zb-dev.js b/lib/device/zb-dev.js
index a7514131..40f9914f 100644
--- a/lib/device/zb-dev.js
+++ b/lib/device/zb-dev.js
@@ -45,7 +45,7 @@ module.exports = class deviceZBDev {
         })
         accessory.getService(this.Service.Switch)
           .getCharacteristic(this.Characteristic.On)
-          .on('set', (value, callback) => this.internalUpdate(value, callback))
+          .on('set', (value, callback) => this.internalUpdate(accessory, value, callback))
         break
       case 1770:
         if (!accessory.getService(this.Service.BatteryService)) accessory.addService(this.Service.BatteryService)
@@ -76,38 +76,38 @@ module.exports = class deviceZBDev {
         })
         break
     }
-    this.accessory = accessory
+    accessory = accessory
   }
 
-  async internalUpdate (value, callback) {
+  async internalUpdate (accessory, value, callback) {
     callback()
     try {
       const params = { switch: value ? 'on' : 'off' }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
+      await this.platform.sendDeviceUpdate(accessory, params)
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
+      this.platform.deviceUpdateError(accessory, err, true)
     }
   }
 
-  async externalUpdate (params) {
+  async externalUpdate (accessory, params) {
     try {
       //* ** credit @tasict ***\\
       if (helpers.hasProperty(params, 'battery')) {
-        if (this.accessory.context.eweUIID === 3026 && this.platform.config.ZBDWBatt) {
+        if (accessory.context.eweUIID === 3026 && this.platform.config.ZBDWBatt) {
           params.battery *= 10
         }
         const batteryService =
-          this.accessory.getService(this.Service.BatteryService) || this.accessory.addService(this.Service.BatteryService)
+          accessory.getService(this.Service.BatteryService) || accessory.addService(this.Service.BatteryService)
         batteryService.updateCharacteristic(this.Characteristic.BatteryLevel, params.battery)
         batteryService.updateCharacteristic(
           this.Characteristic.StatusLowBattery,
           params.battery < this.lowBattThreshold
         )
       }
-      switch (this.accessory.context.eweUIID) {
+      switch (accessory.context.eweUIID) {
         case 1000:
           if (helpers.hasProperty(params, 'key') && [0, 1, 2].includes(params.key)) {
-            this.accessory
+            accessory
               .getService(this.Service.StatelessProgrammableSwitch)
               .updateCharacteristic(this.Characteristic.ProgrammableSwitchEvent, params.key)
           }
@@ -115,10 +115,10 @@ module.exports = class deviceZBDev {
         case 1009:
         case 1256:
           if (helpers.hasProperty(params, 'switch') && ['off', 'on'].includes(params.switch)) {
-            this.accessory
+            accessory
               .getService(this.Service.Switch)
               .updateCharacteristic(this.Characteristic.On, params.switch === 'on')
-            this.accessory.eveLogger.addEntry({
+            accessory.eveLogger.addEntry({
               time: Math.round(new Date().valueOf() / 1000),
               status: params.switch === 'on' ? 1 : 0
             })
@@ -128,20 +128,20 @@ module.exports = class deviceZBDev {
           const eveLog = { time: Math.round(new Date().valueOf() / 1000) }
           if (helpers.hasProperty(params, 'temperature')) {
             const currentTemp = parseInt(params.temperature) / 100
-            this.accessory
+            accessory
               .getService(this.Service.TemperatureSensor)
               .updateCharacteristic(this.Characteristic.CurrentTemperature, currentTemp)
             eveLog.temp = parseFloat(currentTemp)
           }
           if (helpers.hasProperty(params, 'humidity')) {
             const currentHumi = parseInt(params.humidity) / 100
-            this.accessory
+            accessory
               .getService(this.Service.HumiditySensor)
               .updateCharacteristic(this.Characteristic.CurrentRelativeHumidity, currentHumi)
             eveLog.humidity = parseFloat(currentHumi)
           }
           if (helpers.hasProperty(eveLog, 'temp') || helpers.hasProperty(eveLog, 'humidity')) {
-            this.accessory.eveLogger.addEntry(eveLog)
+            accessory.eveLogger.addEntry(eveLog)
           }
           break
         }
@@ -153,30 +153,30 @@ module.exports = class deviceZBDev {
               helpers.hasProperty(params, 'updateSource') &&
               params.motion === 1 &&
               diff < this.sensorTimeDifference
-            this.accessory.eveLogger.addEntry({
+            accessory.eveLogger.addEntry({
               time: Math.round(new Date().valueOf() / 1000),
               status: motionDetected ? 1 : 0
             })
-            this.accessory.getService(this.Service.MotionSensor).updateCharacteristic(this.Characteristic.MotionDetected, motionDetected)
+            accessory.getService(this.Service.MotionSensor).updateCharacteristic(this.Characteristic.MotionDetected, motionDetected)
             break
           }
           break
         case 3026:
           if (helpers.hasProperty(params, 'lock') && [0, 1].includes(params.lock)) {
-            this.accessory
+            accessory
               .getService(this.Service.ContactSensor)
               .updateCharacteristic(this.Characteristic.ContactSensorState, params.lock)
-            this.accessory.eveLogger.addEntry({
+            accessory.eveLogger.addEntry({
               time: Math.round(new Date().valueOf() / 1000),
               status: params.lock
             })
           }
           break
         default:
-          throw new Error('Zigbee device type not supported [uiid ' + this.accessory.context.eweUIID + ']')
+          throw new Error('Zigbee device type not supported [uiid ' + accessory.context.eweUIID + ']')
       }
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, false)
+      this.platform.deviceUpdateError(accessory, err, false)
     }
   }
 }
diff --git a/lib/ewelink-platform.js b/lib/ewelink-platform.js
index 94d73fdc..bb5f0913 100644
--- a/lib/ewelink-platform.js
+++ b/lib/ewelink-platform.js
@@ -504,7 +504,7 @@ module.exports = class eWeLinkPlatform {
           str += 'is unreachable'
         }
       }
-      if (!this.config.disableHTTPRefresh) accessory.control.externalUpdate(device.params)
+      if (!this.config.disableHTTPRefresh) accessory.control.externalUpdate(accessory, device.params)
       this.devicesInHB.set(accessory.context.hbDeviceId, accessory)
       this.log(' → [%s] initialised %s.', device.name, str)
     } catch (err) {
@@ -648,7 +648,7 @@ module.exports = class eWeLinkPlatform {
         this.log('[%s] %s update received and will be refreshed.', accessory.displayName, device.params.updateSource)
       }
       try {
-        accessory.control.externalUpdate(device.params)
+        accessory.control.externalUpdate(accessory, device.params)
       } catch (err) {
         this.log.warn('[%s] could not be refreshed as %s.', accessory.displayName, this.debug ? err : err.message)
       }

From a8bcf8311e8a2e0e4286553677ba2daf9a89de51 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 8 Nov 2020 13:17:55 +0000
Subject: [PATCH 0703/3183] callback inside try

---
 lib/device/blind.js         | 2 +-
 lib/device/curtain.js       | 2 +-
 lib/device/diffuser.js      | 4 ++--
 lib/device/fan.js           | 2 +-
 lib/device/garage-eachen.js | 2 +-
 lib/device/garage-four.js   | 2 +-
 lib/device/garage-two.js    | 2 +-
 lib/device/garage.js        | 2 +-
 lib/device/light-colour.js  | 2 +-
 lib/device/light-ctemp.js   | 2 +-
 lib/device/light-dimmer.js  | 2 +-
 lib/device/lock.js          | 2 +-
 lib/device/outlet.js        | 2 +-
 lib/device/rf-bridge.js     | 2 +-
 lib/device/scm.js           | 2 +-
 lib/device/switch-single.js | 2 +-
 lib/device/template.js      | 2 +-
 lib/device/thermostat.js    | 2 +-
 lib/device/usb.js           | 2 +-
 lib/device/valve-two.js     | 2 +-
 lib/device/valve.js         | 2 +-
 lib/device/zb-dev.js        | 2 +-
 22 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/lib/device/blind.js b/lib/device/blind.js
index aae2d48f..1b28ce47 100644
--- a/lib/device/blind.js
+++ b/lib/device/blind.js
@@ -22,8 +22,8 @@ module.exports = class deviceBlind {
   }
 
   async internalUpdate (accessory, value, callback) {
-    callback()
     try {
+      callback()
       let blindConfig
       const params = {}
       const wcService = accessory.getService(this.Service.WindowCovering)
diff --git a/lib/device/curtain.js b/lib/device/curtain.js
index d2fafcb4..26b0de3b 100644
--- a/lib/device/curtain.js
+++ b/lib/device/curtain.js
@@ -22,8 +22,8 @@ module.exports = class deviceCurtain {
   }
 
   async internalUpdate (accessory, value, callback) {
-    callback()
     try {
+      callback()
       let params
       const prevPos = accessory.context.cacheCurrentPosition
       const newPos = value
diff --git a/lib/device/diffuser.js b/lib/device/diffuser.js
index 47a1739b..a5a34858 100644
--- a/lib/device/diffuser.js
+++ b/lib/device/diffuser.js
@@ -34,8 +34,8 @@ module.exports = class deviceDiffuser {
   }
 
   async internalDiffuserOnOffUpdate (accessory, value, callback) {
-    callback()
     try {
+      callback()
       const params = { switch: value ? 'on' : 'off' }
       await this.platform.sendDeviceUpdate(accessory, params)
     } catch (err) {
@@ -100,7 +100,7 @@ module.exports = class deviceDiffuser {
         lightGcolor: newRGB[1],
         lightBcolor: newRGB[2]
       }
-      await helpers.sleep(500)
+      await helpers.sleep(1000)
       if (updateKeyColour !== accessory.context.updateKeyColour) return
       await this.platform.sendDeviceUpdate(accessory, params)
     } catch (err) {
diff --git a/lib/device/fan.js b/lib/device/fan.js
index bb1a55dc..963d7da8 100644
--- a/lib/device/fan.js
+++ b/lib/device/fan.js
@@ -39,8 +39,8 @@ module.exports = class deviceFan {
   }
 
   async internalUpdate (accessory, type, value, callback) {
-    callback()
     try {
+      callback()
       let newPower
       let newSpeed
       let newLight
diff --git a/lib/device/garage-eachen.js b/lib/device/garage-eachen.js
index ddba1e03..53431d1c 100644
--- a/lib/device/garage-eachen.js
+++ b/lib/device/garage-eachen.js
@@ -22,8 +22,8 @@ module.exports = class deviceGarageEachen {
   }
 
   async internalUpdate (accessory, value, callback) {
-    callback()
     try {
+      callback()
       let garageConfig
       if (!(garageConfig = this.platform.cusG.get(accessory.context.hbDeviceId))) {
         throw new Error('group config missing')
diff --git a/lib/device/garage-four.js b/lib/device/garage-four.js
index 85b30124..499ce08e 100644
--- a/lib/device/garage-four.js
+++ b/lib/device/garage-four.js
@@ -24,8 +24,8 @@ module.exports = class deviceGarageFour {
   }
 
   async internalUpdate (accessory, garage, value, callback) {
-    callback()
     try {
+      callback()
       let garageConfig
       if (!(garageConfig = this.platform.cusG.get(accessory.context.hbDeviceId))) {
         throw new Error('group config missing')
diff --git a/lib/device/garage-two.js b/lib/device/garage-two.js
index d23ac1d5..96fb08f1 100644
--- a/lib/device/garage-two.js
+++ b/lib/device/garage-two.js
@@ -24,8 +24,8 @@ module.exports = class deviceGarageTwo {
   }
 
   async internalUpdate (accessory, garage, value, callback) {
-    callback()
     try {
+      callback()
       let garageConfig
       if (!(garageConfig = this.platform.cusG.get(accessory.context.hbDeviceId))) {
         throw new Error('group config missing')
diff --git a/lib/device/garage.js b/lib/device/garage.js
index ebee6eb5..898b075e 100644
--- a/lib/device/garage.js
+++ b/lib/device/garage.js
@@ -22,8 +22,8 @@ module.exports = class deviceGarage {
   }
 
   async internalUpdate (accessory, value, callback) {
-    callback()
     try {
+      callback()
       let garageConfig
       if (!(garageConfig = this.platform.cusG.get(accessory.context.hbDeviceId))) {
         throw new Error('group config missing')
diff --git a/lib/device/light-colour.js b/lib/device/light-colour.js
index 487356a3..1b63dd5f 100644
--- a/lib/device/light-colour.js
+++ b/lib/device/light-colour.js
@@ -32,8 +32,8 @@ module.exports = class deviceLightColour {
   }
 
   async internalUpdate (accessory, type, value, callback) {
-    callback()
     try {
+      callback()
       let newRGB
       let params = {}
       const lightService = accessory.getService(this.Service.Lightbulb)
diff --git a/lib/device/light-ctemp.js b/lib/device/light-ctemp.js
index f9450a4e..d82bea02 100644
--- a/lib/device/light-ctemp.js
+++ b/lib/device/light-ctemp.js
@@ -16,8 +16,8 @@ module.exports = class deviceLightCTemp {
   }
 
   async internalUpdate (accessory, type, value, callback) {
-    callback()
     try {
+      callback()
 
     } catch (err) {
       this.platform.deviceUpdateError(accessory, err, true)
diff --git a/lib/device/light-dimmer.js b/lib/device/light-dimmer.js
index 94da5b67..4567e26a 100644
--- a/lib/device/light-dimmer.js
+++ b/lib/device/light-dimmer.js
@@ -16,8 +16,8 @@ module.exports = class deviceLightDimmer {
   }
 
   async internalUpdate (accessory, type, value, callback) {
-    callback()
     try {
+      callback()
       const params = {}
       switch (type) {
         case 'onoff':
diff --git a/lib/device/lock.js b/lib/device/lock.js
index 6804242f..d0a6b8b3 100644
--- a/lib/device/lock.js
+++ b/lib/device/lock.js
@@ -15,8 +15,8 @@ module.exports = class deviceLock {
   }
 
   async internalUpdate (accessory, value, callback) {
-    callback()
     try {
+      callback()
       let lockConfig
       const params = { switch: 'on' }
       const lmService = accessory.getService(this.Service.LockMechanism)
diff --git a/lib/device/outlet.js b/lib/device/outlet.js
index 3992c9e0..fba94b09 100644
--- a/lib/device/outlet.js
+++ b/lib/device/outlet.js
@@ -129,8 +129,8 @@ module.exports = class deviceOutlet {
   }
 
   async internalUpdate (accessory, value, callback) {
-    callback()
     try {
+      callback()
       const params = { switch: value ? 'on' : 'off' }
       await this.platform.sendDeviceUpdate(accessory, params)
     } catch (err) {
diff --git a/lib/device/rf-bridge.js b/lib/device/rf-bridge.js
index e9fe4f13..1adb89f4 100644
--- a/lib/device/rf-bridge.js
+++ b/lib/device/rf-bridge.js
@@ -76,8 +76,8 @@ module.exports = class deviceRFBridge {
   }
 
   async internalUpdate (accessory, rfChl, service, value, callback) {
-    callback()
     try {
+      callback()
       if (!value) return
       const params = {
         cmd: 'transmit',
diff --git a/lib/device/scm.js b/lib/device/scm.js
index c952e154..3b784fda 100644
--- a/lib/device/scm.js
+++ b/lib/device/scm.js
@@ -22,8 +22,8 @@ module.exports = class deviceSCM {
   }
 
   async internalUpdate (accessory, value, callback) {
-    callback()
     try {
+      callback()
       const params = { switches: helpers.defaultMultiSwitchOff }
       params.switches[0].switch = value ? 'on' : 'off'
       await this.platform.sendDeviceUpdate(accessory, params)
diff --git a/lib/device/switch-single.js b/lib/device/switch-single.js
index 1b106754..e5e840ca 100644
--- a/lib/device/switch-single.js
+++ b/lib/device/switch-single.js
@@ -28,8 +28,8 @@ module.exports = class deviceSwitchSingle {
   }
 
   async internalUpdate (accessory, value, callback) {
-    callback()
     try {
+      callback()
       const params = { switch: value ? 'on' : 'off' }
       await this.platform.sendDeviceUpdate(accessory, params)
     } catch (err) {
diff --git a/lib/device/template.js b/lib/device/template.js
index 640ac76d..a55ee11f 100644
--- a/lib/device/template.js
+++ b/lib/device/template.js
@@ -14,8 +14,8 @@ module.exports = class deviceTemplate {
   }
 
   async internalUpdate (accessory, value, callback) {
-    callback()
     try {
+      callback()
 
     } catch (err) {
       this.platform.deviceUpdateError(accessory, err, true)
diff --git a/lib/device/thermostat.js b/lib/device/thermostat.js
index f8ebc126..fbea99d1 100644
--- a/lib/device/thermostat.js
+++ b/lib/device/thermostat.js
@@ -27,8 +27,8 @@ module.exports = class deviceThermostat {
   }
 
   async internalUpdate (accessory, value, callback) {
-    callback()
     try {
+      callback()
       const params = {
         switch: value ? 'on' : 'off',
         mainSwitch: value ? 'on' : 'off'
diff --git a/lib/device/usb.js b/lib/device/usb.js
index b43f90c0..c9ad71e7 100644
--- a/lib/device/usb.js
+++ b/lib/device/usb.js
@@ -21,8 +21,8 @@ module.exports = class deviceUSB {
   }
 
   async internalUpdate (accessory, value, callback) {
-    callback()
     try {
+      callback()
       const params = { switches: helpers.defaultMultiSwitchOff }
       params.switches[0].switch = value ? 'on' : 'off'
       await this.platform.sendDeviceUpdate(accessory, params)
diff --git a/lib/device/valve-two.js b/lib/device/valve-two.js
index b49cabb2..bd487adc 100644
--- a/lib/device/valve-two.js
+++ b/lib/device/valve-two.js
@@ -37,8 +37,8 @@ module.exports = class deviceValveTwo {
   }
 
   async internalUpdate (accessory, valve, value, callback) {
-    callback()
     try {
+      callback()
       const params = { switches: helpers.defaultMultiSwitchOff }
       const serviceValve = accessory.getService(valve)
       switch (valve) {
diff --git a/lib/device/valve.js b/lib/device/valve.js
index e03b17a9..4e8d0457 100644
--- a/lib/device/valve.js
+++ b/lib/device/valve.js
@@ -35,8 +35,8 @@ module.exports = class deviceValve {
   }
 
   async internalUpdate (accessory, value, callback) {
-    callback()
     try {
+      callback()
       const params = { switch: value ? 'on' : 'off' }
       const serviceValve = accessory.getService(this.Service.Valve)
       serviceValve.updateCharacteristic(this.Characteristic.InUse, value)
diff --git a/lib/device/zb-dev.js b/lib/device/zb-dev.js
index 40f9914f..3a5fbcc3 100644
--- a/lib/device/zb-dev.js
+++ b/lib/device/zb-dev.js
@@ -80,8 +80,8 @@ module.exports = class deviceZBDev {
   }
 
   async internalUpdate (accessory, value, callback) {
-    callback()
     try {
+      callback()
       const params = { switch: value ? 'on' : 'off' }
       await this.platform.sendDeviceUpdate(accessory, params)
     } catch (err) {

From c25e32572b996b2c40f2a776c5ad7661867d95a3 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 8 Nov 2020 13:25:37 +0000
Subject: [PATCH 0704/3183] tidying up/formatting

---
 lib/device/light-ctemp.js   | 1 -
 lib/device/lock.js          | 1 -
 lib/device/scm.js           | 1 -
 lib/device/sensor.js        | 2 +-
 lib/device/switch-single.js | 1 -
 lib/device/template.js      | 2 --
 lib/device/zb-dev.js        | 1 -
 7 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/lib/device/light-ctemp.js b/lib/device/light-ctemp.js
index d82bea02..295f77e0 100644
--- a/lib/device/light-ctemp.js
+++ b/lib/device/light-ctemp.js
@@ -18,7 +18,6 @@ module.exports = class deviceLightCTemp {
   async internalUpdate (accessory, type, value, callback) {
     try {
       callback()
-
     } catch (err) {
       this.platform.deviceUpdateError(accessory, err, true)
     }
diff --git a/lib/device/lock.js b/lib/device/lock.js
index d0a6b8b3..a5cd43ba 100644
--- a/lib/device/lock.js
+++ b/lib/device/lock.js
@@ -11,7 +11,6 @@ module.exports = class deviceLock {
     lmService
       .getCharacteristic(this.Characteristic.LockTargetState)
       .on('set', (value, callback) => this.internalUpdate(accessory, value, callback))
-    accessory = accessory
   }
 
   async internalUpdate (accessory, value, callback) {
diff --git a/lib/device/scm.js b/lib/device/scm.js
index 3b784fda..906f294b 100644
--- a/lib/device/scm.js
+++ b/lib/device/scm.js
@@ -18,7 +18,6 @@ module.exports = class deviceSCM {
       storage: 'fs',
       path: this.platform.eveLogPath
     })
-    accessory = accessory
   }
 
   async internalUpdate (accessory, value, callback) {
diff --git a/lib/device/sensor.js b/lib/device/sensor.js
index c1592391..66467a1a 100644
--- a/lib/device/sensor.js
+++ b/lib/device/sensor.js
@@ -24,7 +24,7 @@ module.exports = class deviceSensor {
     })
   }
 
-  async externalUpdate (params) {
+  async externalUpdate (accessory, params) {
     try {
       if (helpers.hasProperty(params, 'battery')) {
         const batteryService =
diff --git a/lib/device/switch-single.js b/lib/device/switch-single.js
index e5e840ca..62ff4ecc 100644
--- a/lib/device/switch-single.js
+++ b/lib/device/switch-single.js
@@ -24,7 +24,6 @@ module.exports = class deviceSwitchSingle {
       storage: 'fs',
       path: this.platform.eveLogPath
     })
-    accessory = accessory
   }
 
   async internalUpdate (accessory, value, callback) {
diff --git a/lib/device/template.js b/lib/device/template.js
index a55ee11f..7c980a3c 100644
--- a/lib/device/template.js
+++ b/lib/device/template.js
@@ -10,13 +10,11 @@ module.exports = class deviceTemplate {
     service
       .getCharacteristic(this.Characteristic.On)
       .on('set', (value, callback) => this.internalUpdate(accessory, value, callback))
-    accessory = accessory
   }
 
   async internalUpdate (accessory, value, callback) {
     try {
       callback()
-
     } catch (err) {
       this.platform.deviceUpdateError(accessory, err, true)
     }
diff --git a/lib/device/zb-dev.js b/lib/device/zb-dev.js
index 3a5fbcc3..433071e4 100644
--- a/lib/device/zb-dev.js
+++ b/lib/device/zb-dev.js
@@ -76,7 +76,6 @@ module.exports = class deviceZBDev {
         })
         break
     }
-    accessory = accessory
   }
 
   async internalUpdate (accessory, value, callback) {

From dc20502a00e7090400b2770ad81a7ef6d6145398 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 8 Nov 2020 13:27:46 +0000
Subject: [PATCH 0705/3183] 3.12.0-2

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 02229e1b..032b820d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.12.0-1",
+  "version": "3.12.0-2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 41af04f9..91ec9975 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.12.0-1",
+  "version": "3.12.0-2",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From de005bb9f80cc2f1f3549c577315c67096b7d51f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 8 Nov 2020 13:58:37 +0000
Subject: [PATCH 0706/3183] Revert "3.12.0-2"

This reverts commit dc20502a00e7090400b2770ad81a7ef6d6145398.
---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 032b820d..02229e1b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.12.0-2",
+  "version": "3.12.0-1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 91ec9975..41af04f9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.12.0-2",
+  "version": "3.12.0-1",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From cfd99b12be13125311b3d7424a2393e1af9537d3 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 8 Nov 2020 13:58:53 +0000
Subject: [PATCH 0707/3183] Revert "tidying up/formatting"

This reverts commit c25e32572b996b2c40f2a776c5ad7661867d95a3.
---
 lib/device/light-ctemp.js   | 1 +
 lib/device/lock.js          | 1 +
 lib/device/scm.js           | 1 +
 lib/device/sensor.js        | 2 +-
 lib/device/switch-single.js | 1 +
 lib/device/template.js      | 2 ++
 lib/device/zb-dev.js        | 1 +
 7 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/lib/device/light-ctemp.js b/lib/device/light-ctemp.js
index 295f77e0..d82bea02 100644
--- a/lib/device/light-ctemp.js
+++ b/lib/device/light-ctemp.js
@@ -18,6 +18,7 @@ module.exports = class deviceLightCTemp {
   async internalUpdate (accessory, type, value, callback) {
     try {
       callback()
+
     } catch (err) {
       this.platform.deviceUpdateError(accessory, err, true)
     }
diff --git a/lib/device/lock.js b/lib/device/lock.js
index a5cd43ba..d0a6b8b3 100644
--- a/lib/device/lock.js
+++ b/lib/device/lock.js
@@ -11,6 +11,7 @@ module.exports = class deviceLock {
     lmService
       .getCharacteristic(this.Characteristic.LockTargetState)
       .on('set', (value, callback) => this.internalUpdate(accessory, value, callback))
+    accessory = accessory
   }
 
   async internalUpdate (accessory, value, callback) {
diff --git a/lib/device/scm.js b/lib/device/scm.js
index 906f294b..3b784fda 100644
--- a/lib/device/scm.js
+++ b/lib/device/scm.js
@@ -18,6 +18,7 @@ module.exports = class deviceSCM {
       storage: 'fs',
       path: this.platform.eveLogPath
     })
+    accessory = accessory
   }
 
   async internalUpdate (accessory, value, callback) {
diff --git a/lib/device/sensor.js b/lib/device/sensor.js
index 66467a1a..c1592391 100644
--- a/lib/device/sensor.js
+++ b/lib/device/sensor.js
@@ -24,7 +24,7 @@ module.exports = class deviceSensor {
     })
   }
 
-  async externalUpdate (accessory, params) {
+  async externalUpdate (params) {
     try {
       if (helpers.hasProperty(params, 'battery')) {
         const batteryService =
diff --git a/lib/device/switch-single.js b/lib/device/switch-single.js
index 62ff4ecc..e5e840ca 100644
--- a/lib/device/switch-single.js
+++ b/lib/device/switch-single.js
@@ -24,6 +24,7 @@ module.exports = class deviceSwitchSingle {
       storage: 'fs',
       path: this.platform.eveLogPath
     })
+    accessory = accessory
   }
 
   async internalUpdate (accessory, value, callback) {
diff --git a/lib/device/template.js b/lib/device/template.js
index 7c980a3c..a55ee11f 100644
--- a/lib/device/template.js
+++ b/lib/device/template.js
@@ -10,11 +10,13 @@ module.exports = class deviceTemplate {
     service
       .getCharacteristic(this.Characteristic.On)
       .on('set', (value, callback) => this.internalUpdate(accessory, value, callback))
+    accessory = accessory
   }
 
   async internalUpdate (accessory, value, callback) {
     try {
       callback()
+
     } catch (err) {
       this.platform.deviceUpdateError(accessory, err, true)
     }
diff --git a/lib/device/zb-dev.js b/lib/device/zb-dev.js
index 433071e4..3a5fbcc3 100644
--- a/lib/device/zb-dev.js
+++ b/lib/device/zb-dev.js
@@ -76,6 +76,7 @@ module.exports = class deviceZBDev {
         })
         break
     }
+    accessory = accessory
   }
 
   async internalUpdate (accessory, value, callback) {

From 29f5910d513858174d611b6b7a28a7e69678e52c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 8 Nov 2020 13:58:57 +0000
Subject: [PATCH 0708/3183] Revert "callback inside try"

This reverts commit a8bcf8311e8a2e0e4286553677ba2daf9a89de51.
---
 lib/device/blind.js         | 2 +-
 lib/device/curtain.js       | 2 +-
 lib/device/diffuser.js      | 4 ++--
 lib/device/fan.js           | 2 +-
 lib/device/garage-eachen.js | 2 +-
 lib/device/garage-four.js   | 2 +-
 lib/device/garage-two.js    | 2 +-
 lib/device/garage.js        | 2 +-
 lib/device/light-colour.js  | 2 +-
 lib/device/light-ctemp.js   | 2 +-
 lib/device/light-dimmer.js  | 2 +-
 lib/device/lock.js          | 2 +-
 lib/device/outlet.js        | 2 +-
 lib/device/rf-bridge.js     | 2 +-
 lib/device/scm.js           | 2 +-
 lib/device/switch-single.js | 2 +-
 lib/device/template.js      | 2 +-
 lib/device/thermostat.js    | 2 +-
 lib/device/usb.js           | 2 +-
 lib/device/valve-two.js     | 2 +-
 lib/device/valve.js         | 2 +-
 lib/device/zb-dev.js        | 2 +-
 22 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/lib/device/blind.js b/lib/device/blind.js
index 1b28ce47..aae2d48f 100644
--- a/lib/device/blind.js
+++ b/lib/device/blind.js
@@ -22,8 +22,8 @@ module.exports = class deviceBlind {
   }
 
   async internalUpdate (accessory, value, callback) {
+    callback()
     try {
-      callback()
       let blindConfig
       const params = {}
       const wcService = accessory.getService(this.Service.WindowCovering)
diff --git a/lib/device/curtain.js b/lib/device/curtain.js
index 26b0de3b..d2fafcb4 100644
--- a/lib/device/curtain.js
+++ b/lib/device/curtain.js
@@ -22,8 +22,8 @@ module.exports = class deviceCurtain {
   }
 
   async internalUpdate (accessory, value, callback) {
+    callback()
     try {
-      callback()
       let params
       const prevPos = accessory.context.cacheCurrentPosition
       const newPos = value
diff --git a/lib/device/diffuser.js b/lib/device/diffuser.js
index a5a34858..47a1739b 100644
--- a/lib/device/diffuser.js
+++ b/lib/device/diffuser.js
@@ -34,8 +34,8 @@ module.exports = class deviceDiffuser {
   }
 
   async internalDiffuserOnOffUpdate (accessory, value, callback) {
+    callback()
     try {
-      callback()
       const params = { switch: value ? 'on' : 'off' }
       await this.platform.sendDeviceUpdate(accessory, params)
     } catch (err) {
@@ -100,7 +100,7 @@ module.exports = class deviceDiffuser {
         lightGcolor: newRGB[1],
         lightBcolor: newRGB[2]
       }
-      await helpers.sleep(1000)
+      await helpers.sleep(500)
       if (updateKeyColour !== accessory.context.updateKeyColour) return
       await this.platform.sendDeviceUpdate(accessory, params)
     } catch (err) {
diff --git a/lib/device/fan.js b/lib/device/fan.js
index 963d7da8..bb1a55dc 100644
--- a/lib/device/fan.js
+++ b/lib/device/fan.js
@@ -39,8 +39,8 @@ module.exports = class deviceFan {
   }
 
   async internalUpdate (accessory, type, value, callback) {
+    callback()
     try {
-      callback()
       let newPower
       let newSpeed
       let newLight
diff --git a/lib/device/garage-eachen.js b/lib/device/garage-eachen.js
index 53431d1c..ddba1e03 100644
--- a/lib/device/garage-eachen.js
+++ b/lib/device/garage-eachen.js
@@ -22,8 +22,8 @@ module.exports = class deviceGarageEachen {
   }
 
   async internalUpdate (accessory, value, callback) {
+    callback()
     try {
-      callback()
       let garageConfig
       if (!(garageConfig = this.platform.cusG.get(accessory.context.hbDeviceId))) {
         throw new Error('group config missing')
diff --git a/lib/device/garage-four.js b/lib/device/garage-four.js
index 499ce08e..85b30124 100644
--- a/lib/device/garage-four.js
+++ b/lib/device/garage-four.js
@@ -24,8 +24,8 @@ module.exports = class deviceGarageFour {
   }
 
   async internalUpdate (accessory, garage, value, callback) {
+    callback()
     try {
-      callback()
       let garageConfig
       if (!(garageConfig = this.platform.cusG.get(accessory.context.hbDeviceId))) {
         throw new Error('group config missing')
diff --git a/lib/device/garage-two.js b/lib/device/garage-two.js
index 96fb08f1..d23ac1d5 100644
--- a/lib/device/garage-two.js
+++ b/lib/device/garage-two.js
@@ -24,8 +24,8 @@ module.exports = class deviceGarageTwo {
   }
 
   async internalUpdate (accessory, garage, value, callback) {
+    callback()
     try {
-      callback()
       let garageConfig
       if (!(garageConfig = this.platform.cusG.get(accessory.context.hbDeviceId))) {
         throw new Error('group config missing')
diff --git a/lib/device/garage.js b/lib/device/garage.js
index 898b075e..ebee6eb5 100644
--- a/lib/device/garage.js
+++ b/lib/device/garage.js
@@ -22,8 +22,8 @@ module.exports = class deviceGarage {
   }
 
   async internalUpdate (accessory, value, callback) {
+    callback()
     try {
-      callback()
       let garageConfig
       if (!(garageConfig = this.platform.cusG.get(accessory.context.hbDeviceId))) {
         throw new Error('group config missing')
diff --git a/lib/device/light-colour.js b/lib/device/light-colour.js
index 1b63dd5f..487356a3 100644
--- a/lib/device/light-colour.js
+++ b/lib/device/light-colour.js
@@ -32,8 +32,8 @@ module.exports = class deviceLightColour {
   }
 
   async internalUpdate (accessory, type, value, callback) {
+    callback()
     try {
-      callback()
       let newRGB
       let params = {}
       const lightService = accessory.getService(this.Service.Lightbulb)
diff --git a/lib/device/light-ctemp.js b/lib/device/light-ctemp.js
index d82bea02..f9450a4e 100644
--- a/lib/device/light-ctemp.js
+++ b/lib/device/light-ctemp.js
@@ -16,8 +16,8 @@ module.exports = class deviceLightCTemp {
   }
 
   async internalUpdate (accessory, type, value, callback) {
+    callback()
     try {
-      callback()
 
     } catch (err) {
       this.platform.deviceUpdateError(accessory, err, true)
diff --git a/lib/device/light-dimmer.js b/lib/device/light-dimmer.js
index 4567e26a..94da5b67 100644
--- a/lib/device/light-dimmer.js
+++ b/lib/device/light-dimmer.js
@@ -16,8 +16,8 @@ module.exports = class deviceLightDimmer {
   }
 
   async internalUpdate (accessory, type, value, callback) {
+    callback()
     try {
-      callback()
       const params = {}
       switch (type) {
         case 'onoff':
diff --git a/lib/device/lock.js b/lib/device/lock.js
index d0a6b8b3..6804242f 100644
--- a/lib/device/lock.js
+++ b/lib/device/lock.js
@@ -15,8 +15,8 @@ module.exports = class deviceLock {
   }
 
   async internalUpdate (accessory, value, callback) {
+    callback()
     try {
-      callback()
       let lockConfig
       const params = { switch: 'on' }
       const lmService = accessory.getService(this.Service.LockMechanism)
diff --git a/lib/device/outlet.js b/lib/device/outlet.js
index fba94b09..3992c9e0 100644
--- a/lib/device/outlet.js
+++ b/lib/device/outlet.js
@@ -129,8 +129,8 @@ module.exports = class deviceOutlet {
   }
 
   async internalUpdate (accessory, value, callback) {
+    callback()
     try {
-      callback()
       const params = { switch: value ? 'on' : 'off' }
       await this.platform.sendDeviceUpdate(accessory, params)
     } catch (err) {
diff --git a/lib/device/rf-bridge.js b/lib/device/rf-bridge.js
index 1adb89f4..e9fe4f13 100644
--- a/lib/device/rf-bridge.js
+++ b/lib/device/rf-bridge.js
@@ -76,8 +76,8 @@ module.exports = class deviceRFBridge {
   }
 
   async internalUpdate (accessory, rfChl, service, value, callback) {
+    callback()
     try {
-      callback()
       if (!value) return
       const params = {
         cmd: 'transmit',
diff --git a/lib/device/scm.js b/lib/device/scm.js
index 3b784fda..c952e154 100644
--- a/lib/device/scm.js
+++ b/lib/device/scm.js
@@ -22,8 +22,8 @@ module.exports = class deviceSCM {
   }
 
   async internalUpdate (accessory, value, callback) {
+    callback()
     try {
-      callback()
       const params = { switches: helpers.defaultMultiSwitchOff }
       params.switches[0].switch = value ? 'on' : 'off'
       await this.platform.sendDeviceUpdate(accessory, params)
diff --git a/lib/device/switch-single.js b/lib/device/switch-single.js
index e5e840ca..1b106754 100644
--- a/lib/device/switch-single.js
+++ b/lib/device/switch-single.js
@@ -28,8 +28,8 @@ module.exports = class deviceSwitchSingle {
   }
 
   async internalUpdate (accessory, value, callback) {
+    callback()
     try {
-      callback()
       const params = { switch: value ? 'on' : 'off' }
       await this.platform.sendDeviceUpdate(accessory, params)
     } catch (err) {
diff --git a/lib/device/template.js b/lib/device/template.js
index a55ee11f..640ac76d 100644
--- a/lib/device/template.js
+++ b/lib/device/template.js
@@ -14,8 +14,8 @@ module.exports = class deviceTemplate {
   }
 
   async internalUpdate (accessory, value, callback) {
+    callback()
     try {
-      callback()
 
     } catch (err) {
       this.platform.deviceUpdateError(accessory, err, true)
diff --git a/lib/device/thermostat.js b/lib/device/thermostat.js
index fbea99d1..f8ebc126 100644
--- a/lib/device/thermostat.js
+++ b/lib/device/thermostat.js
@@ -27,8 +27,8 @@ module.exports = class deviceThermostat {
   }
 
   async internalUpdate (accessory, value, callback) {
+    callback()
     try {
-      callback()
       const params = {
         switch: value ? 'on' : 'off',
         mainSwitch: value ? 'on' : 'off'
diff --git a/lib/device/usb.js b/lib/device/usb.js
index c9ad71e7..b43f90c0 100644
--- a/lib/device/usb.js
+++ b/lib/device/usb.js
@@ -21,8 +21,8 @@ module.exports = class deviceUSB {
   }
 
   async internalUpdate (accessory, value, callback) {
+    callback()
     try {
-      callback()
       const params = { switches: helpers.defaultMultiSwitchOff }
       params.switches[0].switch = value ? 'on' : 'off'
       await this.platform.sendDeviceUpdate(accessory, params)
diff --git a/lib/device/valve-two.js b/lib/device/valve-two.js
index bd487adc..b49cabb2 100644
--- a/lib/device/valve-two.js
+++ b/lib/device/valve-two.js
@@ -37,8 +37,8 @@ module.exports = class deviceValveTwo {
   }
 
   async internalUpdate (accessory, valve, value, callback) {
+    callback()
     try {
-      callback()
       const params = { switches: helpers.defaultMultiSwitchOff }
       const serviceValve = accessory.getService(valve)
       switch (valve) {
diff --git a/lib/device/valve.js b/lib/device/valve.js
index 4e8d0457..e03b17a9 100644
--- a/lib/device/valve.js
+++ b/lib/device/valve.js
@@ -35,8 +35,8 @@ module.exports = class deviceValve {
   }
 
   async internalUpdate (accessory, value, callback) {
+    callback()
     try {
-      callback()
       const params = { switch: value ? 'on' : 'off' }
       const serviceValve = accessory.getService(this.Service.Valve)
       serviceValve.updateCharacteristic(this.Characteristic.InUse, value)
diff --git a/lib/device/zb-dev.js b/lib/device/zb-dev.js
index 3a5fbcc3..40f9914f 100644
--- a/lib/device/zb-dev.js
+++ b/lib/device/zb-dev.js
@@ -80,8 +80,8 @@ module.exports = class deviceZBDev {
   }
 
   async internalUpdate (accessory, value, callback) {
+    callback()
     try {
-      callback()
       const params = { switch: value ? 'on' : 'off' }
       await this.platform.sendDeviceUpdate(accessory, params)
     } catch (err) {

From 0439ff5a00f34273a4ce7fb3a42f06b63e1b398b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 8 Nov 2020 13:59:00 +0000
Subject: [PATCH 0709/3183] Revert "don't use this.accessory"

This reverts commit 28dd566074024bcbbe3c333b6a275cf931cc89b4.
---
 lib/device/blind.js         | 43 +++++++++++-----------
 lib/device/curtain.js       | 21 +++++------
 lib/device/diffuser.js      | 72 +++++++++++++++++++------------------
 lib/device/fan.js           | 25 ++++++-------
 lib/device/garage-eachen.js | 35 +++++++++---------
 lib/device/garage-four.js   | 49 ++++++++++++-------------
 lib/device/garage-two.js    | 67 +++++++++++++++++-----------------
 lib/device/garage.js        | 55 ++++++++++++++--------------
 lib/device/light-colour.js  | 63 ++++++++++++++++----------------
 lib/device/light-ctemp.js   | 13 +++----
 lib/device/light-dimmer.js  | 27 +++++++-------
 lib/device/lock.js          | 34 +++++++++---------
 lib/device/outlet.js        | 27 +++++++-------
 lib/device/rf-bridge.js     | 19 +++++-----
 lib/device/scm.js           | 18 +++++-----
 lib/device/sensor.js        | 11 +++---
 lib/device/switch-multi.js  | 46 ++++++++++++++----------
 lib/device/switch-single.js | 18 +++++-----
 lib/device/template.js      | 12 +++----
 lib/device/thermostat.js    | 27 +++++++-------
 lib/device/usb.js           | 17 ++++-----
 lib/device/valve-two.js     | 23 ++++++------
 lib/device/valve.js         | 19 +++++-----
 lib/device/zb-dev.js        | 42 +++++++++++-----------
 lib/ewelink-platform.js     |  4 +--
 25 files changed, 407 insertions(+), 380 deletions(-)

diff --git a/lib/device/blind.js b/lib/device/blind.js
index aae2d48f..b481d65e 100644
--- a/lib/device/blind.js
+++ b/lib/device/blind.js
@@ -18,20 +18,21 @@ module.exports = class deviceBlind {
     }
     wcService
       .getCharacteristic(this.Characteristic.TargetPosition)
-      .on('set', (value, callback) => this.internalUpdate(accessory, value, callback))
+      .on('set', (value, callback) => this.internalUpdate(value, callback))
+    this.accessory = accessory
   }
 
-  async internalUpdate (accessory, value, callback) {
+  async internalUpdate (value, callback) {
     callback()
     try {
       let blindConfig
       const params = {}
-      const wcService = accessory.getService(this.Service.WindowCovering)
-      const prevState = accessory.context.cachePositionState
-      let prevPosition = accessory.context.cacheCurrentPosition
+      const wcService = this.accessory.getService(this.Service.WindowCovering)
+      const prevState = this.accessory.context.cachePositionState
+      let prevPosition = this.accessory.context.cacheCurrentPosition
       const newTarget = value
       const updateKey = Math.random().toString(36).substr(2, 8)
-      if (!(blindConfig = this.platform.cusG.get(accessory.context.hbDeviceId))) {
+      if (!(blindConfig = this.platform.cusG.get(this.accessory.context.hbDeviceId))) {
         throw new Error('group config missing')
       }
       if (blindConfig.type !== 'blind') {
@@ -39,11 +40,11 @@ module.exports = class deviceBlind {
       }
       if (newTarget === prevPosition) return
       params.switches = helpers.defaultMultiSwitchOff
-      accessory.context.updateKey = updateKey
+      this.accessory.context.updateKey = updateKey
       const percentStepPerDecisecond = blindConfig.operationTime / 100
       if (prevState !== 2) {
-        await this.platform.sendDeviceUpdate(accessory, params)
-        let positionPercentChange = Math.floor(Date.now() / 100) - accessory.context.cacheLastStartTime
+        await this.platform.sendDeviceUpdate(this.accessory, params)
+        let positionPercentChange = Math.floor(Date.now() / 100) - this.accessory.context.cacheLastStartTime
         positionPercentChange = Math.floor(percentStepPerDecisecond * positionPercentChange)
         if (prevState === 0) {
           prevPosition -= positionPercentChange
@@ -51,33 +52,33 @@ module.exports = class deviceBlind {
           prevPosition += positionPercentChange
         }
         wcService.updateCharacteristic(this.Characteristic.CurrentPosition, prevPosition)
-        accessory.context.cacheCurrentPosition = prevPosition
+        this.accessory.context.cacheCurrentPosition = prevPosition
       }
       const diffPosition = newTarget - prevPosition
       const setToMoveUp = diffPosition > 0
       const decisecondsToMove = Math.round(Math.abs(diffPosition) * percentStepPerDecisecond)
       params.switches[0].switch = setToMoveUp ? 'on' : 'off'
       params.switches[1].switch = setToMoveUp ? 'off' : 'on'
-      await this.platform.sendDeviceUpdate(accessory, params)
-      accessory.context.cacheTargetPosition = newTarget
-      accessory.context.cachePositionState = setToMoveUp ? 1 : 0
-      accessory.context.cacheLastStartTime = Math.floor(Date.now() / 100)
-      if (accessory.context.updateKey !== updateKey) return
+      await this.platform.sendDeviceUpdate(this.accessory, params)
+      this.accessory.context.cacheTargetPosition = newTarget
+      this.accessory.context.cachePositionState = setToMoveUp ? 1 : 0
+      this.accessory.context.cacheLastStartTime = Math.floor(Date.now() / 100)
+      if (this.accessory.context.updateKey !== updateKey) return
       await helpers.sleep(decisecondsToMove * 100)
-      if (accessory.context.updateKey !== updateKey) return
+      if (this.accessory.context.updateKey !== updateKey) return
       params.switches[0].switch = 'off'
       params.switches[1].switch = 'off'
-      await this.platform.sendDeviceUpdate(accessory, params)
+      await this.platform.sendDeviceUpdate(this.accessory, params)
       wcService.updateCharacteristic(this.Characteristic.PositionState, 2)
       wcService.updateCharacteristic(this.Characteristic.CurrentPosition, newTarget)
-      accessory.context.cachePositionState = 2
-      accessory.context.cacheCurrentPosition = newTarget
+      this.accessory.context.cachePositionState = 2
+      this.accessory.context.cacheCurrentPosition = newTarget
     } catch (err) {
-      this.platform.deviceUpdateError(accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true)
     }
   }
 
-  async externalUpdate (accessory, params) {
+  async externalUpdate (params) {
 
   }
 }
diff --git a/lib/device/curtain.js b/lib/device/curtain.js
index d2fafcb4..67ca977b 100644
--- a/lib/device/curtain.js
+++ b/lib/device/curtain.js
@@ -18,14 +18,15 @@ module.exports = class deviceCurtain {
     }
     cService
       .getCharacteristic(this.Characteristic.TargetPosition)
-      .on('set', (value, callback) => this.internalUpdate(accessory, value, callback))
+      .on('set', (value, callback) => this.internalUpdate(value, callback))
+    this.accessory = accessory
   }
 
-  async internalUpdate (accessory, value, callback) {
+  async internalUpdate (value, callback) {
     callback()
     try {
       let params
-      const prevPos = accessory.context.cacheCurrentPosition
+      const prevPos = this.accessory.context.cacheCurrentPosition
       const newPos = value
       if (newPos === prevPos) return
       if (newPos === 0 || newPos === 100) {
@@ -33,16 +34,16 @@ module.exports = class deviceCurtain {
       } else {
         params = { setclose: Math.abs(100 - newPos) }
       }
-      accessory.context.cacheCurrentPosition = newPos
-      await this.platform.sendDeviceUpdate(accessory, params)
+      this.accessory.context.cacheCurrentPosition = newPos
+      await this.platform.sendDeviceUpdate(this.accessory, params)
     } catch (err) {
-      this.platform.deviceUpdateError(accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true)
     }
   }
 
-  async externalUpdate (accessory, params) {
+  async externalUpdate (params) {
     try {
-      const cService = accessory.getService(this.Service.WindowCovering)
+      const cService = this.accessory.getService(this.Service.WindowCovering)
       if (!helpers.hasProperty(params, 'switch') && !helpers.hasProperty(params, 'setclose')) {
         return
       }
@@ -51,10 +52,10 @@ module.exports = class deviceCurtain {
         .updateCharacteristic(this.Characteristic.TargetPosition, newPos)
         .updateCharacteristic(this.Characteristic.CurrentPosition, newPos)
         .updateCharacteristic(this.Characteristic.PositionState, 2)
-      accessory.context.cacheCurrentPosition = newPos
+      this.accessory.context.cacheCurrentPosition = newPos
       return
     } catch (err) {
-      this.platform.deviceUpdateError(accessory, err, false)
+      this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
 }
diff --git a/lib/device/diffuser.js b/lib/device/diffuser.js
index 47a1739b..ae8bcf86 100644
--- a/lib/device/diffuser.js
+++ b/lib/device/diffuser.js
@@ -12,87 +12,89 @@ module.exports = class deviceDiffuser {
     const lightService = accessory.getService('Light') || accessory.addService(this.Service.Lightbulb, 'Light', 'light')
     onOffService
       .getCharacteristic(this.Characteristic.On)
-      .on('set', (value, callback) => this.internalDiffuserOnOffUpdate(accessory, value, callback))
+      .on('set', (value, callback) => this.internalDiffuserOnOffUpdate(value, callback))
+    this.accessory = accessory
     onOffService
       .getCharacteristic(this.Characteristic.RotationSpeed)
-      .on('set', (value, callback) => this.internalDiffuserStateUpdate(accessory, value, callback))
+      .on('set', (value, callback) => this.internalDiffuserStateUpdate(value, callback))
       .setProps({
         minStep: 50
       })
     lightService
       .getCharacteristic(this.Characteristic.On)
-      .on('set', (value, callback) => this.internalLightOnOffUpdate(accessory, value, callback))
+      .on('set', (value, callback) => this.internalLightOnOffUpdate(value, callback))
     lightService
       .getCharacteristic(this.Characteristic.Brightness)
-      .on('set', (value, callback) => this.internalLightBrightnessUpdate(accessory, value, callback))
+      .on('set', (value, callback) => this.internalLightBrightnessUpdate(value, callback))
     lightService
       .getCharacteristic(this.Characteristic.Hue)
-      .on('set', (value, callback) => this.internalLightColourUpdate(accessory, value, callback))
+      .on('set', (value, callback) => this.internalLightColourUpdate(value, callback))
     lightService
       .getCharacteristic(this.Characteristic.Saturation)
       .on('set', (value, callback) => callback())
+    this.accessory = accessory
   }
 
-  async internalDiffuserOnOffUpdate (accessory, value, callback) {
+  async internalDiffuserOnOffUpdate (value, callback) {
     callback()
     try {
       const params = { switch: value ? 'on' : 'off' }
-      await this.platform.sendDeviceUpdate(accessory, params)
+      await this.platform.sendDeviceUpdate(this.accessory, params)
     } catch (err) {
-      this.platform.deviceUpdateError(accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true)
     }
   }
 
-  async internalDiffuserStateUpdate (accessory, value, callback) {
+  async internalDiffuserStateUpdate (value, callback) {
     try {
       await helpers.sleep(1000)
       callback()
       if (value === 0) return
       value = value <= 75 ? 50 : 100
       const params = { state: value / 2 }
-      accessory.context.cacheState = value
-      await this.platform.sendDeviceUpdate(accessory, params)
+      this.accessory.context.cacheState = value
+      await this.platform.sendDeviceUpdate(this.accessory, params)
     } catch (err) {
-      this.platform.deviceUpdateError(accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true)
     }
   }
 
-  async internalLightOnOffUpdate (accessory, value, callback) {
+  async internalLightOnOffUpdate (value, callback) {
     try {
       callback()
       const params = { lightswitch: value ? 1 : 0 }
-      await this.platform.sendDeviceUpdate(accessory, params)
+      await this.platform.sendDeviceUpdate(this.accessory, params)
     } catch (err) {
-      this.platform.deviceUpdateError(accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true)
     }
   }
 
-  async internalLightBrightnessUpdate (accessory, value, callback) {
+  async internalLightBrightnessUpdate (value, callback) {
     try {
       await helpers.sleep(2000)
       callback()
       const updateKeyBright = Math.random().toString(36).substr(2, 8)
-      accessory.context.updateKeyBright = updateKeyBright
+      this.accessory.context.updateKeyBright = updateKeyBright
       const params = {
         lightbright: value
       }
       await helpers.sleep(500)
-      if (updateKeyBright !== accessory.context.updateKeyBright) return
-      await this.platform.sendDeviceUpdate(accessory, params)
+      if (updateKeyBright !== this.accessory.context.updateKeyBright) return
+      await this.platform.sendDeviceUpdate(this.accessory, params)
     } catch (err) {
-      this.platform.deviceUpdateError(accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true)
     }
   }
 
-  async internalLightColourUpdate (accessory, value, callback) {
+  async internalLightColourUpdate (value, callback) {
     try {
       await helpers.sleep(2000)
       callback()
       const updateKeyColour = Math.random().toString(36).substr(2, 8)
-      accessory.context.updateKeyColour = updateKeyColour
+      this.accessory.context.updateKeyColour = updateKeyColour
       const newRGB = convert.hsv.rgb(
         value,
-        accessory.getService('Light').getCharacteristic(this.Characteristic.Saturation).value,
+        this.accessory.getService('Light').getCharacteristic(this.Characteristic.Saturation).value,
         100
       )
       const params = {
@@ -101,31 +103,31 @@ module.exports = class deviceDiffuser {
         lightBcolor: newRGB[2]
       }
       await helpers.sleep(500)
-      if (updateKeyColour !== accessory.context.updateKeyColour) return
-      await this.platform.sendDeviceUpdate(accessory, params)
+      if (updateKeyColour !== this.accessory.context.updateKeyColour) return
+      await this.platform.sendDeviceUpdate(this.accessory, params)
     } catch (err) {
-      this.platform.deviceUpdateError(accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true)
     }
   }
 
-  async externalUpdate (accessory, params) {
+  async externalUpdate (params) {
     try {
       if (helpers.hasProperty(params, 'switch')) {
-        accessory.getService('Diffuser').updateCharacteristic(this.Characteristic.On, params.switch === 'on')
+        this.accessory.getService('Diffuser').updateCharacteristic(this.Characteristic.On, params.switch === 'on')
         if (!helpers.hasProperty(params, 'state')) {
-          accessory.getService('Diffuser').updateCharacteristic(this.Characteristic.RotationSpeed, accessory.context.cacheState)
+          this.accessory.getService('Diffuser').updateCharacteristic(this.Characteristic.RotationSpeed, this.accessory.context.cacheState)
         }
       }
       if (helpers.hasProperty(params, 'state')) {
-        accessory.getService('Diffuser').updateCharacteristic(this.Characteristic.RotationSpeed, params.state * 50)
-        accessory.context.cacheState = params.state * 50
+        this.accessory.getService('Diffuser').updateCharacteristic(this.Characteristic.RotationSpeed, params.state * 50)
+        this.accessory.context.cacheState = params.state * 50
       }
       if (helpers.hasProperty(params, 'lightswitch')) {
-        accessory.getService('Light')
+        this.accessory.getService('Light')
           .updateCharacteristic(this.Characteristic.On, params.lightswitch === 1)
       }
       if (helpers.hasProperty(params, 'lightbright')) {
-        accessory.getService('Light')
+        this.accessory.getService('Light')
           .updateCharacteristic(this.Characteristic.Brightness, params.lightbright)
       }
       if (
@@ -134,12 +136,12 @@ module.exports = class deviceDiffuser {
         helpers.hasProperty(params, 'lightBcolor')
       ) {
         const newColour = convert.rgb.hsv(params.lightRcolor, params.lightGcolor, params.lightBcolor)
-        accessory.getService('Light')
+        this.accessory.getService('Light')
           .updateCharacteristic(this.Characteristic.Hue, newColour[0])
           .updateCharacteristic(this.Characteristic.Saturation, 100)
       }
     } catch (err) {
-      this.platform.deviceUpdateError(accessory, err, false)
+      this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
 }
diff --git a/lib/device/fan.js b/lib/device/fan.js
index bb1a55dc..baeaaf4a 100644
--- a/lib/device/fan.js
+++ b/lib/device/fan.js
@@ -15,13 +15,13 @@ module.exports = class deviceFan {
     const fanService = accessory.getService(this.Service.Fan) || accessory.addService(this.Service.Fan)
     fanService
       .getCharacteristic(this.Characteristic.On)
-      .on('set', (value, callback) => {
+      .on('set', async (value, callback) => {
         callback()
         if (!value) fanService.setCharacteristic(this.Characteristic.RotationSpeed, 0)
       })
     fanService
       .getCharacteristic(this.Characteristic.RotationSpeed)
-      .on('set', (value, callback) => this.internalUpdate(accessory, 'speed', value, callback))
+      .on('set', (value, callback) => this.internalUpdate('speed', value, callback))
       .setProps({
         minStep: 33
       })
@@ -34,19 +34,20 @@ module.exports = class deviceFan {
       const fanLightService = accessory.getService(this.Service.Lightbulb) || accessory.addService(this.Service.Lightbulb)
       fanLightService
         .getCharacteristic(this.Characteristic.On)
-        .on('set', (value, callback) => this.internalUpdate(accessory, 'light', value, callback))
+        .on('set', (value, callback) => this.internalUpdate('light', value, callback))
     }
+    this.accessory = accessory
   }
 
-  async internalUpdate (accessory, type, value, callback) {
+  async internalUpdate (type, value, callback) {
     callback()
     try {
       let newPower
       let newSpeed
       let newLight
       let lightService
-      if (this.visibleLight) lightService = accessory.getService(this.Service.Lightbulb)
-      const fanService = accessory.getService(this.Service.Fan)
+      if (this.visibleLight) lightService = this.accessory.getService(this.Service.Lightbulb)
+      const fanService = this.accessory.getService(this.Service.Fan)
       const params = { switches: helpers.defaultMultiSwitchOff }
       switch (type) {
         case 'speed':
@@ -64,19 +65,19 @@ module.exports = class deviceFan {
       params.switches[1].switch = newPower === 1 && newSpeed >= 33 ? 'on' : 'off'
       params.switches[2].switch = newPower === 1 && newSpeed >= 66 && newSpeed < 99 ? 'on' : 'off'
       params.switches[3].switch = newPower === 1 && newSpeed >= 99 ? 'on' : 'off'
-      await this.platform.sendDeviceUpdate(accessory, params)
+      await this.platform.sendDeviceUpdate(this.accessory, params)
     } catch (err) {
-      this.platform.deviceUpdateError(accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true)
     }
   }
 
-  async externalUpdate (accessory, params) {
+  async externalUpdate (params) {
     try {
       if (helpers.hasProperty(params, 'updateSource') && params.updateSource === 'LAN') return
       if (params.switches && Array.isArray(params.switches)) {
         let lightService
-        if (this.visibleLight) lightService = accessory.getService(this.Service.Lightbulb)
-        const fanService = accessory.getService(this.Service.Fan)
+        if (this.visibleLight) lightService = this.accessory.getService(this.Service.Lightbulb)
+        const fanService = this.accessory.getService(this.Service.Fan)
         const light = params.switches[0].switch === 'on'
         let status
         let speed
@@ -103,7 +104,7 @@ module.exports = class deviceFan {
           .updateCharacteristic(this.Characteristic.RotationSpeed, speed)
       }
     } catch (err) {
-      this.platform.deviceUpdateError(accessory, err, false)
+      this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
 }
diff --git a/lib/device/garage-eachen.js b/lib/device/garage-eachen.js
index ddba1e03..1c7fb8bf 100644
--- a/lib/device/garage-eachen.js
+++ b/lib/device/garage-eachen.js
@@ -18,58 +18,59 @@ module.exports = class deviceGarageEachen {
     }
     gdeService
       .getCharacteristic(this.Characteristic.TargetDoorState)
-      .on('set', (value, callback) => this.internalUpdate(accessory, value, callback))
+      .on('set', (value, callback) => this.internalUpdate(value, callback))
+    this.accessory = accessory
   }
 
-  async internalUpdate (accessory, value, callback) {
+  async internalUpdate (value, callback) {
     callback()
     try {
       let garageConfig
-      if (!(garageConfig = this.platform.cusG.get(accessory.context.hbDeviceId))) {
+      if (!(garageConfig = this.platform.cusG.get(this.accessory.context.hbDeviceId))) {
         throw new Error('group config missing')
       }
       if (garageConfig.type !== 'garage_eachen') {
         throw new Error('improper configuration')
       }
       const params = { switch: value === 0 ? 'on' : 'off' }
-      const gdService = accessory.getService(this.Service.GarageDoorOpener)
+      const gdService = this.accessory.getService(this.Service.GarageDoorOpener)
       if (value === gdService.getCharacteristic(this.Characteristic.CurrentDoorState).value % 2) return
-      accessory.context.inUse = true
-      await this.platform.sendDeviceUpdate(accessory, params)
+      this.accessory.context.inUse = true
+      await this.platform.sendDeviceUpdate(this.accessory, params)
       gdService
         .updateCharacteristic(this.Characteristic.TargetDoorState, value)
         .updateCharacteristic(this.Characteristic.CurrentDoorState, value + 2)
       await helpers.sleep(2000)
-      accessory.context.inUse = false
+      this.accessory.context.inUse = false
       if (value === 0) {
         await helpers.sleep(Math.max((garageConfig.operationTime - 20) * 100, 0))
         gdService.updateCharacteristic(this.Characteristic.CurrentDoorState, 0)
       }
     } catch (err) {
-      accessory.context.inUse = false
-      this.platform.deviceUpdateError(accessory, err, true)
+      this.accessory.context.inUse = false
+      this.platform.deviceUpdateError(this.accessory, err, true)
     }
   }
 
-  async externalUpdate (accessory, params) {
+  async externalUpdate (params) {
     try {
-      if (!helpers.hasProperty(params, 'switch') || accessory.context.inUse) return
+      if (!helpers.hasProperty(params, 'switch') || this.accessory.context.inUse) return
       let garageConfig
-      if (!(garageConfig = this.platform.cusG.get(accessory.context.hbDeviceId))) {
+      if (!(garageConfig = this.platform.cusG.get(this.accessory.context.hbDeviceId))) {
         throw new Error('group config missing')
       }
       if (garageConfig.type !== 'garage_eachen') {
         throw new Error('improper configuration')
       }
-      accessory.context.inUse = true
-      const gdService = accessory.getService(this.Service.GarageDoorOpener)
+      this.accessory.context.inUse = true
+      const gdService = this.accessory.getService(this.Service.GarageDoorOpener)
       gdService
         .updateCharacteristic(this.Characteristic.TargetDoorState, params.switch === 'on' ? 0 : 1)
         .updateCharacteristic(this.Characteristic.CurrentDoorState, params.switch === 'on' ? 0 : 1)
-      accessory.context.inUse = false
+      this.accessory.context.inUse = false
     } catch (err) {
-      accessory.context.inUse = false
-      this.platform.deviceUpdateError(accessory, err, false)
+      this.accessory.context.inUse = false
+      this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
 }
diff --git a/lib/device/garage-four.js b/lib/device/garage-four.js
index 85b30124..f21f1e4d 100644
--- a/lib/device/garage-four.js
+++ b/lib/device/garage-four.js
@@ -19,15 +19,16 @@ module.exports = class deviceGarageFour {
       }
       gdService
         .getCharacteristic(this.Characteristic.TargetDoorState)
-        .on('set', (value, callback) => this.internalUpdate(accessory, v, value, callback))
+        .on('set', (value, callback) => this.internalUpdate(v, value, callback))
     })
+    this.accessory = accessory
   }
 
-  async internalUpdate (accessory, garage, value, callback) {
+  async internalUpdate (garage, value, callback) {
     callback()
     try {
       let garageConfig
-      if (!(garageConfig = this.platform.cusG.get(accessory.context.hbDeviceId))) {
+      if (!(garageConfig = this.platform.cusG.get(this.accessory.context.hbDeviceId))) {
         throw new Error('group config missing')
       }
       if (garageConfig.type !== 'garage_four') {
@@ -64,45 +65,45 @@ module.exports = class deviceGarageFour {
         ? sAccessory.getService(this.Service.ContactSensor).getCharacteristic(this.Characteristic.ContactSensorState).value === 0
           ? 1
           : 0
-        : accessory.context.cacheStates[garageChannel].cacheCurrentDoorState
+        : this.accessory.context.cacheStates[garageChannel].cacheCurrentDoorState
       if (value === prevState % 2) return
-      const gdService = accessory.getService('Garage ' + garage)
-      accessory.context.inUse = true
+      const gdService = this.accessory.getService('Garage ' + garage)
+      this.accessory.context.inUse = true
       const updateKey = Math.random().toString(36).substr(2, 8)
-      accessory.context.updateKey = updateKey
+      this.accessory.context.updateKey = updateKey
       gdService
         .updateCharacteristic(this.Characteristic.TargetDoorState, value)
         .updateCharacteristic(this.Characteristic.CurrentDoorState, value + 2)
-      accessory.context.cacheStates[garageChannel].cacheTargetDoorState = value
-      accessory.context.cacheStates[garageChannel].cacheCurrentDoorState = value + 2
+      this.accessory.context.cacheStates[garageChannel].cacheTargetDoorState = value
+      this.accessory.context.cacheStates[garageChannel].cacheCurrentDoorState = value + 2
       const params = { switches: helpers.defaultMultiSwitchOff }
       ;[0, 1, 2, 3].forEach(i => (params.switches[i].switch = garageChannel === i ? 'on' : 'off'))
-      await this.platform.sendDeviceUpdate(accessory, params)
+      await this.platform.sendDeviceUpdate(this.accessory, params)
       await helpers.sleep(1000)
-      accessory.context.inUse = false
+      this.accessory.context.inUse = false
       await helpers.sleep(Math.max((garageConfig.operationTime - 10) * 100, 0))
-      if (accessory.context.updateKey !== updateKey || sAccessory) return
+      if (this.accessory.context.updateKey !== updateKey || sAccessory) return
       if (!sAccessory) {
         gdService.updateCharacteristic(this.Characteristic.CurrentDoorState, value)
-        accessory.context.cacheStates[garageChannel].cacheCurrentDoorState = value
+        this.accessory.context.cacheStates[garageChannel].cacheCurrentDoorState = value
       }
     } catch (err) {
-      accessory.context.inUse = false
-      this.platform.deviceUpdateError(accessory, err, true)
+      this.accessory.context.inUse = false
+      this.platform.deviceUpdateError(this.accessory, err, true)
     }
   }
 
-  async externalUpdate (accessory, params) {
+  async externalUpdate (params) {
     try {
-      if (!helpers.hasProperty(params, 'switches') || accessory.context.inUse) return
+      if (!helpers.hasProperty(params, 'switches') || this.accessory.context.inUse) return
       let garageConfig
-      if (!(garageConfig = this.platform.cusG.get(accessory.context.hbDeviceId))) {
+      if (!(garageConfig = this.platform.cusG.get(this.accessory.context.hbDeviceId))) {
         throw new Error('group config missing')
       }
       if (garageConfig.type !== 'garage_four') {
         throw new Error('improper configuration')
       }
-      if (accessory.context.inUse) return
+      if (this.accessory.context.inUse) return
       ;['A', 'B', 'C', 'D'].forEach(async v => {
         let garageChannel
         switch (v) {
@@ -132,16 +133,16 @@ module.exports = class deviceGarageFour {
           throw new Error("defined DW2 sensor isn't a sensor")
         }
         if (sensorDefinition) return
-        const gcService = accessory.getService('Garage ' + v)
-        const prevState = accessory.context.cacheStates[garageChannel].cacheCurrentDoorState
+        const gcService = this.accessory.getService('Garage ' + v)
+        const prevState = this.accessory.context.cacheStates[garageChannel].cacheCurrentDoorState
         const newPos = [0, 2].includes(prevState) ? 1 : 0
         if (params.switches[garageChannel].switch === 'off') return
         gcService.updateCharacteristic(this.Characteristic.CurrentDoorState, newPos)
-        accessory.context.cacheStates[garageChannel].cacheTargetDoorState = newPos
-        accessory.context.cacheStates[garageChannel].cacheCurrentDoorState = newPos
+        this.accessory.context.cacheStates[garageChannel].cacheTargetDoorState = newPos
+        this.accessory.context.cacheStates[garageChannel].cacheCurrentDoorState = newPos
       })
     } catch (err) {
-      this.platform.deviceUpdateError(accessory, err, false)
+      this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
 }
diff --git a/lib/device/garage-two.js b/lib/device/garage-two.js
index d23ac1d5..fa02653c 100644
--- a/lib/device/garage-two.js
+++ b/lib/device/garage-two.js
@@ -19,15 +19,16 @@ module.exports = class deviceGarageTwo {
       }
       gdService
         .getCharacteristic(this.Characteristic.TargetDoorState)
-        .on('set', (value, callback) => this.internalUpdate(accessory, 'Garage' + v, value, callback))
+        .on('set', (value, callback) => this.internalUpdate('Garage' + v, value, callback))
     })
+    this.accessory = accessory
   }
 
-  async internalUpdate (accessory, garage, value, callback) {
+  async internalUpdate (garage, value, callback) {
     callback()
     try {
       let garageConfig
-      if (!(garageConfig = this.platform.cusG.get(accessory.context.hbDeviceId))) {
+      if (!(garageConfig = this.platform.cusG.get(this.accessory.context.hbDeviceId))) {
         throw new Error('group config missing')
       }
       if (garageConfig.type !== 'garage_two') {
@@ -49,8 +50,8 @@ module.exports = class deviceGarageTwo {
       }
       let sAccessory = false
       const newPos = value
-      const params = { switches: accessory.context.switchState }
-      const gdService = accessory.getService(garage)
+      const params = { switches: this.accessory.context.switchState }
+      const gdService = this.accessory.getService(garage)
       if (sensorDefinition && !(sAccessory = this.platform.devicesInHB.get(garageConfig.sensorId + 'SWX'))) {
         throw new Error("defined DW2 sensor doesn't exist")
       }
@@ -62,69 +63,69 @@ module.exports = class deviceGarageTwo {
           ? 1
           : 0
         : garage === 'Garage 1'
-          ? accessory.context.cacheOneCurrentDoorState
-          : accessory.context.cacheTwoCurrentDoorState
+          ? this.accessory.context.cacheOneCurrentDoorState
+          : this.accessory.context.cacheTwoCurrentDoorState
       if (newPos === prevState % 2) return
-      accessory.context.inUse = true
+      this.accessory.context.inUse = true
       gdService
         .updateCharacteristic(this.Characteristic.TargetDoorState, newPos)
         .updateCharacteristic(this.Characteristic.CurrentDoorState, newPos + 2)
       switch (garage) {
         case 'Garage 1': {
-          accessory.context.cacheOneTargetDoorState = newPos
-          accessory.context.cacheOneCurrentDoorState = newPos + 2
+          this.accessory.context.cacheOneTargetDoorState = newPos
+          this.accessory.context.cacheOneCurrentDoorState = newPos + 2
           params.switches[0].switch = newPos === 0 ? 'on' : 'off'
           params.switches[1].switch = newPos === 1 ? 'on' : 'off'
           break
         }
         case 'Garage 2': {
-          accessory.context.cacheTwoTargetDoorState = newPos
-          accessory.context.cacheTwoCurrentDoorState = newPos + 2
+          this.accessory.context.cacheTwoTargetDoorState = newPos
+          this.accessory.context.cacheTwoCurrentDoorState = newPos + 2
           params.switches[2].switch = newPos === 0 ? 'on' : 'off'
           params.switches[3].switch = newPos === 1 ? 'on' : 'off'
           break
         }
       }
-      await this.platform.sendDeviceUpdate(accessory, params)
+      await this.platform.sendDeviceUpdate(this.accessory, params)
       await helpers.sleep(Math.max(garageConfig.operationTime * 100, 1000))
       if (!sAccessory) {
         gdService.updateCharacteristic(this.Characteristic.CurrentDoorState, newPos)
         switch (garage) {
           case 'Garage 1': {
-            accessory.context.cacheOneCurrentDoorState = newPos
+            this.accessory.context.cacheOneCurrentDoorState = newPos
             break
           }
           case 'Garage 2': {
-            accessory.context.cacheTwoCurrentDoorState = newPos
+            this.accessory.context.cacheTwoCurrentDoorState = newPos
             break
           }
         }
       }
-      accessory.context.inUse = false
+      this.accessory.context.inUse = false
     } catch (err) {
-      this.platform.deviceUpdateError(accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true)
     }
   }
 
-  externalUpdate (accessory, params) {
+  externalUpdate (params) {
     try {
       if (!helpers.hasProperty(params, 'switches')) {
         return
       }
       let garageConfig
-      if (!(garageConfig = this.platform.cusG.get(accessory.context.hbDeviceId))) {
+      if (!(garageConfig = this.platform.cusG.get(this.accessory.context.hbDeviceId))) {
         throw new Error('group config missing')
       }
       if (garageConfig.type !== 'garage_two') {
         throw new Error('improper configuration')
       }
-      if (accessory.context.inUse || garageConfig.sensorId) return
-      accessory.context.switchState = params.switches
+      if (this.accessory.context.inUse || garageConfig.sensorId) return
+      this.accessory.context.switchState = params.switches
       ;['1', '2'].forEach(async v => {
-        const gcService = accessory.getService('Garage ' + v)
+        const gcService = this.accessory.getService('Garage ' + v)
         const prevState = v === '1'
-          ? accessory.context.cacheOneCurrentDoorState
-          : accessory.context.cacheTwoCurrentDoorState
+          ? this.accessory.context.cacheOneCurrentDoorState
+          : this.accessory.context.cacheTwoCurrentDoorState
         const newPos = [0, 2].includes(prevState) ? 3 : 2
         switch (v) {
           case '1':
@@ -144,7 +145,7 @@ module.exports = class deviceGarageTwo {
             }
             break
         }
-        accessory.context.inUse = true
+        this.accessory.context.inUse = true
         if (garageConfig.sensorId) {
           await helpers.sleep(Math.max(garageConfig.operationTime * 100, 1000))
         } else {
@@ -153,29 +154,29 @@ module.exports = class deviceGarageTwo {
             .updateCharacteristic(this.Characteristic.CurrentDoorState, newPos)
           switch (v) {
             case '1':
-              accessory.context.cacheOneCurrentDoorState = newPos
-              accessory.context.cacheTwoTargetDoorState = newPos - 2
+              this.accessory.context.cacheOneCurrentDoorState = newPos
+              this.accessory.context.cacheTwoTargetDoorState = newPos - 2
               break
             case '2':
-              accessory.context.cacheTwoCurrentDoorState = newPos
-              accessory.context.cacheTwoTargetDoorState = newPos - 2
+              this.accessory.context.cacheTwoCurrentDoorState = newPos
+              this.accessory.context.cacheTwoTargetDoorState = newPos - 2
               break
           }
           await helpers.sleep(Math.max(garageConfig.operationTime * 100, 1000))
           gcService.updateCharacteristic(this.Characteristic.CurrentDoorState, newPos - 2)
           switch (v) {
             case '1':
-              accessory.context.cacheOneCurrentDoorState = newPos - 2
+              this.accessory.context.cacheOneCurrentDoorState = newPos - 2
               break
             case '2':
-              accessory.context.cacheTwoCurrentDoorState = newPos - 2
+              this.accessory.context.cacheTwoCurrentDoorState = newPos - 2
               break
           }
         }
       })
-      accessory.context.inUse = false
+      this.accessory.context.inUse = false
     } catch (err) {
-      this.platform.deviceUpdateError(accessory, err, false)
+      this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
 }
diff --git a/lib/device/garage.js b/lib/device/garage.js
index ebee6eb5..38d31896 100644
--- a/lib/device/garage.js
+++ b/lib/device/garage.js
@@ -18,14 +18,15 @@ module.exports = class deviceGarage {
     }
     gdService
       .getCharacteristic(this.Characteristic.TargetDoorState)
-      .on('set', (value, callback) => this.internalUpdate(accessory, value, callback))
+      .on('set', (value, callback) => this.internalUpdate(value, callback))
+    this.accessory = accessory
   }
 
-  async internalUpdate (accessory, value, callback) {
+  async internalUpdate (value, callback) {
     callback()
     try {
       let garageConfig
-      if (!(garageConfig = this.platform.cusG.get(accessory.context.hbDeviceId))) {
+      if (!(garageConfig = this.platform.cusG.get(this.accessory.context.hbDeviceId))) {
         throw new Error('group config missing')
       }
       if (garageConfig.type !== 'garage' || !['oneSwitch', 'twoSwitch'].includes(garageConfig.setup)) {
@@ -36,7 +37,7 @@ module.exports = class deviceGarage {
       const newPos = value
       const params = {}
       let delay = 0
-      const gdService = accessory.getService(this.Service.GarageDoorOpener)
+      const gdService = this.accessory.getService(this.Service.GarageDoorOpener)
       if (sensorDefinition && !(sAccessory = this.platform.devicesInHB.get(garageConfig.sensorId + 'SWX'))) {
         throw new Error("defined DW2 sensor doesn't exist")
       }
@@ -47,22 +48,22 @@ module.exports = class deviceGarage {
         ? sAccessory.getService(this.Service.ContactSensor).getCharacteristic(this.Characteristic.ContactSensorState).value === 0
           ? 1
           : 0
-        : accessory.context.cacheCurrentDoorState
+        : this.accessory.context.cacheCurrentDoorState
       if (newPos === prevState % 2) return
-      accessory.context.inUse = true
-      accessory.context.state = value
+      this.accessory.context.inUse = true
+      this.accessory.context.state = value
       if (garageConfig.setup === 'oneSwitch' && [2, 3].includes(prevState)) {
         gdService.updateCharacteristic(this.Characteristic.CurrentDoorState, ((prevState * 2) % 3) + 2)
-        accessory.context.cacheCurrentDoorState = ((prevState * 2) % 3) + 2
+        this.accessory.context.cacheCurrentDoorState = ((prevState * 2) % 3) + 2
         delay = 1500
       }
-      if (accessory.context.state !== newPos) return
+      if (this.accessory.context.state !== newPos) return
       await helpers.sleep(delay)
       gdService
         .updateCharacteristic(this.Characteristic.TargetDoorState, newPos)
         .updateCharacteristic(this.Characteristic.CurrentDoorState, newPos + 2)
-      accessory.context.cacheTargetDoorState = newPos
-      accessory.context.cacheCurrentDoorState = newPos + 2
+      this.accessory.context.cacheTargetDoorState = newPos
+      this.accessory.context.cacheCurrentDoorState = newPos + 2
       switch (garageConfig.setup) {
         case 'oneSwitch':
           params.switch = 'on'
@@ -73,34 +74,34 @@ module.exports = class deviceGarage {
           params.switches[1].switch = newPos === 1 ? 'on' : 'off'
           break
       }
-      await this.platform.sendDeviceUpdate(accessory, params)
+      await this.platform.sendDeviceUpdate(this.accessory, params)
       await helpers.sleep(Math.max(garageConfig.operationTime * 100, 1000))
       if (!sAccessory) {
         gdService.updateCharacteristic(this.Characteristic.CurrentDoorState, newPos)
-        accessory.context.cacheCurrentDoorState = newPos
+        this.accessory.context.cacheCurrentDoorState = newPos
       }
-      accessory.context.inUse = false
+      this.accessory.context.inUse = false
     } catch (err) {
-      this.platform.deviceUpdateError(accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true)
     }
   }
 
-  async externalUpdate (accessory, params) {
+  async externalUpdate (params) {
     try {
       if (!helpers.hasProperty(params, 'switch') && !helpers.hasProperty(params, 'switches')) {
         return
       }
       let garageConfig
-      const gcService = accessory.getService(this.Service.GarageDoorOpener)
-      const prevState = accessory.context.cacheCurrentDoorState
+      const gcService = this.accessory.getService(this.Service.GarageDoorOpener)
+      const prevState = this.accessory.context.cacheCurrentDoorState
       const newPos = [0, 2].includes(prevState) ? 3 : 2
-      if (!(garageConfig = this.platform.cusG.get(accessory.context.hbDeviceId))) {
+      if (!(garageConfig = this.platform.cusG.get(this.accessory.context.hbDeviceId))) {
         throw new Error('group config missing')
       }
       if (garageConfig.type !== 'garage' || !['oneSwitch', 'twoSwitch'].includes(garageConfig.setup)) {
         throw new Error('improper configuration')
       }
-      if (accessory.context.inUse || garageConfig.sensorId) return
+      if (this.accessory.context.inUse || garageConfig.sensorId) return
       switch (garageConfig.setup) {
         case 'oneSwitch':
           if (params.switch === 'off') {
@@ -116,23 +117,23 @@ module.exports = class deviceGarage {
           }
           break
       }
-      accessory.context.inUse = true
+      this.accessory.context.inUse = true
       if (garageConfig.sensorId) {
         await helpers.sleep(Math.max(garageConfig.operationTime * 100, 1000))
       } else {
         gcService
           .updateCharacteristic(this.Characteristic.TargetDoorState, newPos - 2)
           .updateCharacteristic(this.Characteristic.CurrentDoorState, newPos)
-        accessory.context.cacheCurrentDoorState = newPos
-        accessory.context.cacheTargetDoorState = newPos - 2
+        this.accessory.context.cacheCurrentDoorState = newPos
+        this.accessory.context.cacheTargetDoorState = newPos - 2
         await helpers.sleep(Math.max(garageConfig.operationTime * 100, 1000))
         gcService.updateCharacteristic(this.Characteristic.CurrentDoorState, newPos - 2)
-        accessory.context.cacheCurrentDoorState = newPos - 2
+        this.accessory.context.cacheCurrentDoorState = newPos - 2
       }
-      accessory.context.inUse = false
+      this.accessory.context.inUse = false
     } catch (err) {
-      accessory.context.inUse = false
-      this.platform.deviceUpdateError(accessory, err, false)
+      this.accessory.context.inUse = false
+      this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
 }
diff --git a/lib/device/light-colour.js b/lib/device/light-colour.js
index 487356a3..fe68041a 100644
--- a/lib/device/light-colour.js
+++ b/lib/device/light-colour.js
@@ -11,13 +11,13 @@ module.exports = class deviceLightColour {
     const lightService = accessory.getService(this.Service.Lightbulb) || accessory.addService(this.Service.Lightbulb)
     lightService
       .getCharacteristic(this.Characteristic.On)
-      .on('set', (value, callback) => this.internalUpdate(accessory, 'onoff', value, callback))
+      .on('set', (value, callback) => this.internalUpdate('onoff', value, callback))
     lightService
       .getCharacteristic(this.Characteristic.Brightness)
-      .on('set', (value, callback) => this.internalUpdate(accessory, 'brightness', value, callback))
+      .on('set', (value, callback) => this.internalUpdate('brightness', value, callback))
     lightService
       .getCharacteristic(this.Characteristic.Hue)
-      .on('set', (value, callback) => this.internalUpdate(accessory, 'hue', value, callback))
+      .on('set', (value, callback) => this.internalUpdate('hue', value, callback))
     lightService
       .getCharacteristic(this.Characteristic.Saturation)
       .on('set', (value, callback) => callback())
@@ -29,28 +29,29 @@ module.exports = class deviceLightColour {
           minStep: 100
         })
     }
+    this.accessory = accessory
   }
 
-  async internalUpdate (accessory, type, value, callback) {
+  async internalUpdate (type, value, callback) {
     callback()
     try {
       let newRGB
       let params = {}
-      const lightService = accessory.getService(this.Service.Lightbulb)
+      const lightService = this.accessory.getService(this.Service.Lightbulb)
       switch (type) {
         case 'onoff':
-          if (accessory.context.eweUIID === 22) {
+          if (this.accessory.context.eweUIID === 22) {
           // **** B1 uses state rather than switch *** \\
             params.state = value ? 'on' : 'off'
           } else {
             params.switch = value ? 'on' : 'off'
           }
-          await this.platform.sendDeviceUpdate(accessory, params)
+          await this.platform.sendDeviceUpdate(this.accessory, params)
           break
         case 'brightness': {
           const updateKeyBright = Math.random().toString(36).substr(2, 8)
-          accessory.context.updateKeyBright = updateKeyBright
-          switch (accessory.context.eweUIID) {
+          this.accessory.context.updateKeyBright = updateKeyBright
+          switch (this.accessory.context.eweUIID) {
             case 22:
               // *** B1 doesn't support brightness *** \\
               return
@@ -67,23 +68,23 @@ module.exports = class deviceLightColour {
                 ltype: 'color',
                 color: {
                   br: value,
-                  r: accessory.context.cacheR,
-                  g: accessory.context.cacheG,
-                  b: accessory.context.cacheB
+                  r: this.accessory.context.cacheR,
+                  g: this.accessory.context.cacheG,
+                  b: this.accessory.context.cacheB
                 }
               }
               break
           }
           await helpers.sleep(500)
-          if (updateKeyBright !== accessory.context.updateKeyBright) return
-          await this.platform.sendDeviceUpdate(accessory, params)
+          if (updateKeyBright !== this.accessory.context.updateKeyBright) return
+          await this.platform.sendDeviceUpdate(this.accessory, params)
           break
         }
         case 'hue': {
           const updateKeyColour = Math.random().toString(36).substr(2, 8)
-          accessory.context.updateKeyColour = updateKeyColour
+          this.accessory.context.updateKeyColour = updateKeyColour
           newRGB = convert.hsv.rgb(value, lightService.getCharacteristic(this.Characteristic.Saturation).value, 100)
-          switch (accessory.context.eweUIID) {
+          switch (this.accessory.context.eweUIID) {
             case 22:
             // *** B1 *** \\
               params = {
@@ -116,38 +117,38 @@ module.exports = class deviceLightColour {
                   br: lightService.getCharacteristic(this.Characteristic.Brightness).value
                 }
               }
-              accessory.context.cacheR = newRGB[0]
-              accessory.context.cacheG = newRGB[1]
-              accessory.context.cacheB = newRGB[2]
+              this.accessory.context.cacheR = newRGB[0]
+              this.accessory.context.cacheG = newRGB[1]
+              this.accessory.context.cacheB = newRGB[2]
               break
           }
           await helpers.sleep(1000)
-          if (updateKeyColour !== accessory.context.updateKeyColour) return
-          await this.platform.sendDeviceUpdate(accessory, params)
+          if (updateKeyColour !== this.accessory.context.updateKeyColour) return
+          await this.platform.sendDeviceUpdate(this.accessory, params)
           break
         }
       }
     } catch (err) {
-      this.platform.deviceUpdateError(accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true)
     }
   }
 
-  async externalUpdate (accessory, params) {
+  async externalUpdate (params) {
     try {
       let newColour
       let mode
       let isOn = false
-      const lightService = accessory.getService(this.Service.Lightbulb)
-      if (accessory.context.eweUIID === 22 && helpers.hasProperty(params, 'state')) {
+      const lightService = this.accessory.getService(this.Service.Lightbulb)
+      if (this.accessory.context.eweUIID === 22 && helpers.hasProperty(params, 'state')) {
         isOn = params.state === 'on'
-      } else if (accessory.context.eweUIID !== 22 && helpers.hasProperty(params, 'switch')) {
+      } else if (this.accessory.context.eweUIID !== 22 && helpers.hasProperty(params, 'switch')) {
         isOn = params.switch === 'on'
       } else {
         isOn = lightService.getCharacteristic(this.Characteristic.On).value
       }
       if (isOn) {
         lightService.updateCharacteristic(this.Characteristic.On, true)
-        switch (accessory.context.eweUIID) {
+        switch (this.accessory.context.eweUIID) {
           case 22:
             // *** B1 *** \\
             if (helpers.hasProperty(params, 'zyx_mode')) {
@@ -203,9 +204,9 @@ module.exports = class deviceLightColour {
                   lightService
                     .updateCharacteristic(this.Characteristic.Hue, newColour[0])
                     .updateCharacteristic(this.Characteristic.Saturation, 100)
-                  accessory.context.cacheR = params.color.r
-                  accessory.context.cacheG = params.color.g
-                  accessory.context.cacheB = params.color.b
+                  this.accessory.context.cacheR = params.color.r
+                  this.accessory.context.cacheG = params.color.g
+                  this.accessory.context.cacheB = params.color.b
                 }
               }
             }
@@ -215,7 +216,7 @@ module.exports = class deviceLightColour {
         lightService.updateCharacteristic(this.Characteristic.On, false)
       }
     } catch (err) {
-      this.platform.deviceUpdateError(accessory, err, false)
+      this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
 }
diff --git a/lib/device/light-ctemp.js b/lib/device/light-ctemp.js
index f9450a4e..66fa2e25 100644
--- a/lib/device/light-ctemp.js
+++ b/lib/device/light-ctemp.js
@@ -9,26 +9,27 @@ module.exports = class deviceLightCTemp {
     const lightService = accessory.getService(this.Service.Lightbulb) || accessory.addService(this.Service.Lightbulb)
     lightService
       .getCharacteristic(this.Characteristic.On)
-      .on('set', (value, callback) => this.internalUpdate(accessory, 'onoff', value, callback))
+      .on('set', (value, callback) => this.internalUpdate('onoff', value, callback))
     lightService
       .getCharacteristic(this.Characteristic.Brightness)
-      .on('set', (value, callback) => this.internalUpdate(accessory, 'brightness', value, callback))
+      .on('set', (value, callback) => this.internalUpdate('brightness', value, callback))
+    this.accessory = accessory
   }
 
-  async internalUpdate (accessory, type, value, callback) {
+  async internalUpdate (type, value, callback) {
     callback()
     try {
 
     } catch (err) {
-      this.platform.deviceUpdateError(accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true)
     }
   }
 
-  async externalUpdate (accessory, params) {
+  async externalUpdate (params) {
     try {
 
     } catch (err) {
-      this.platform.deviceUpdateError(accessory, err, false)
+      this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
 }
diff --git a/lib/device/light-dimmer.js b/lib/device/light-dimmer.js
index 94da5b67..b7c30db4 100644
--- a/lib/device/light-dimmer.js
+++ b/lib/device/light-dimmer.js
@@ -10,24 +10,25 @@ module.exports = class deviceLightDimmer {
     const lightService = accessory.getService(this.Service.Lightbulb) || accessory.addService(this.Service.Lightbulb)
     lightService
       .getCharacteristic(this.Characteristic.On)
-      .on('set', (value, callback) => this.internalUpdate(accessory, 'onoff', value, callback))
+      .on('set', (value, callback) => this.internalUpdate('onoff', value, callback))
     lightService.getCharacteristic(this.Characteristic.Brightness)
-      .on('set', (value, callback) => this.internalUpdate(accessory, 'brightness', value, callback))
+      .on('set', (value, callback) => this.internalUpdate('brightness', value, callback))
+    this.accessory = accessory
   }
 
-  async internalUpdate (accessory, type, value, callback) {
+  async internalUpdate (type, value, callback) {
     callback()
     try {
       const params = {}
       switch (type) {
         case 'onoff':
           params.switch = value ? 'on' : 'off'
-          await this.platform.sendDeviceUpdate(accessory, params)
+          await this.platform.sendDeviceUpdate(this.accessory, params)
           break
         case 'brightness': {
           const updateKey = Math.random().toString(36).substr(2, 8)
-          accessory.context.updateKey = updateKey
-          switch (accessory.context.eweUIID) {
+          this.accessory.context.updateKey = updateKey
+          switch (this.accessory.context.eweUIID) {
             case 36:
               // *** KING-M4 eWeLink scale is 10-100 and HomeKit scale is 0-100. *** \\
               params.bright = Math.round((value * 9) / 10 + 10)
@@ -39,25 +40,25 @@ module.exports = class deviceLightDimmer {
               break
           }
           await helpers.sleep(500)
-          if (updateKey !== accessory.context.updateKey) return
-          await this.platform.sendDeviceUpdate(accessory, params)
+          if (updateKey !== this.accessory.context.updateKey) return
+          await this.platform.sendDeviceUpdate(this.accessory, params)
           break
         }
       }
     } catch (err) {
-      this.platform.deviceUpdateError(accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true)
     }
   }
 
-  async externalUpdate (accessory, params) {
+  async externalUpdate (params) {
     try {
-      const lightService = accessory.getService(this.Service.Lightbulb)
+      const lightService = this.accessory.getService(this.Service.Lightbulb)
       const isOn = helpers.hasProperty(params, 'switch')
         ? params.switch === 'on'
         : lightService.getCharacteristic(this.Characteristic.On).value
       if (isOn) {
         lightService.updateCharacteristic(this.Characteristic.On, true)
-        switch (accessory.context.eweUIID) {
+        switch (this.accessory.context.eweUIID) {
           case 36:
             // *** KING-M4 eWeLink scale is 10-100 and HomeKit scale is 0-100. *** \\
             if (helpers.hasProperty(params, 'bright')) {
@@ -76,7 +77,7 @@ module.exports = class deviceLightDimmer {
         lightService.updateCharacteristic(this.Characteristic.On, false)
       }
     } catch (err) {
-      this.platform.deviceUpdateError(accessory, err, false)
+      this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
 }
diff --git a/lib/device/lock.js b/lib/device/lock.js
index 6804242f..b69ea0cc 100644
--- a/lib/device/lock.js
+++ b/lib/device/lock.js
@@ -10,49 +10,49 @@ module.exports = class deviceLock {
     const lmService = accessory.getService(this.Service.LockMechanism) || accessory.addService(this.Service.LockMechanism)
     lmService
       .getCharacteristic(this.Characteristic.LockTargetState)
-      .on('set', (value, callback) => this.internalUpdate(accessory, value, callback))
-    accessory = accessory
+      .on('set', (value, callback) => this.internalUpdate(value, callback))
+    this.accessory = accessory
   }
 
-  async internalUpdate (accessory, value, callback) {
+  async internalUpdate (value, callback) {
     callback()
     try {
       let lockConfig
       const params = { switch: 'on' }
-      const lmService = accessory.getService(this.Service.LockMechanism)
-      if (!(lockConfig = this.platform.cusG.get(accessory.context.hbDeviceId))) {
+      const lmService = this.accessory.getService(this.Service.LockMechanism)
+      if (!(lockConfig = this.platform.cusG.get(this.accessory.context.hbDeviceId))) {
         throw new Error('group config missing')
       }
       if (lockConfig.type !== 'lock') {
         throw new Error('improper configuration')
       }
-      accessory.context.inUse = true
-      await this.platform.sendDeviceUpdate(accessory, params)
+      this.accessory.context.inUse = true
+      await this.platform.sendDeviceUpdate(this.accessory, params)
       await helpers.sleep(Math.max(lockConfig.operationTime * 100, 1000))
       lmService
         .updateCharacteristic(this.Characteristic.LockTargetState, 1)
         .updateCharacteristic(this.Characteristic.LockCurrentState, 1)
-      accessory.context.inUse = false
+      this.accessory.context.inUse = false
     } catch (err) {
-      this.platform.deviceUpdateError(accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true)
     }
   }
 
-  async externalUpdate (accessory, params) {
+  async externalUpdate (params) {
     try {
       if (!helpers.hasProperty(params, 'switch')) return
       let lockConfig
-      const lmService = accessory.getService(this.Service.LockMechanism)
-      if (!(lockConfig = this.platform.cusG.get(accessory.context.hbDeviceId))) {
+      const lmService = this.accessory.getService(this.Service.LockMechanism)
+      if (!(lockConfig = this.platform.cusG.get(this.accessory.context.hbDeviceId))) {
         throw new Error('group config missing')
       }
       if (lockConfig.type !== 'lock') {
         throw new Error('improper configuration')
       }
-      if (params.switch === 'off' || accessory.context.inUse) {
+      if (params.switch === 'off' || this.accessory.context.inUse) {
         return
       }
-      accessory.context.inUse = true
+      this.accessory.context.inUse = true
       lmService
         .updateCharacteristic(this.Characteristic.LockCurrentState, 0)
         .updateCharacteristic(this.Characteristic.LockTargetState, 0)
@@ -60,10 +60,10 @@ module.exports = class deviceLock {
       lmService
         .updateCharacteristic(this.Characteristic.LockCurrentState, 1)
         .updateCharacteristic(this.Characteristic.LockTargetState, 1)
-      accessory.context.inUse = false
+      this.accessory.context.inUse = false
     } catch (err) {
-      accessory.context.inUse = false
-      this.platform.deviceUpdateError(accessory, err, false)
+      this.accessory.context.inUse = false
+      this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
 }
diff --git a/lib/device/outlet.js b/lib/device/outlet.js
index 3992c9e0..72339905 100644
--- a/lib/device/outlet.js
+++ b/lib/device/outlet.js
@@ -100,10 +100,10 @@ module.exports = class deviceOutlet {
     }
     outletService
       .getCharacteristic(this.Characteristic.On)
-      .on('set', (value, callback) => this.internalUpdate(accessory, value, callback))
+      .on('set', (value, callback) => this.internalUpdate(value, callback))
     outletService
       .getCharacteristic(this.eveResetTotal)
-      .on('set', (accessory, value, callback) => {
+      .on('set', (value, callback) => {
         callback()
         accessory.context.energyReadings = []
         accessory.context.energyReadingTotal = 0
@@ -126,37 +126,38 @@ module.exports = class deviceOutlet {
       accessory.context.energyReadings = []
       outletService.updateCharacteristic(this.eveTotalConsumption, accessory.context.energyReadingTotal)
     }, 300000)
+    this.accessory = accessory
   }
 
-  async internalUpdate (accessory, value, callback) {
+  async internalUpdate (value, callback) {
     callback()
     try {
       const params = { switch: value ? 'on' : 'off' }
-      await this.platform.sendDeviceUpdate(accessory, params)
+      await this.platform.sendDeviceUpdate(this.accessory, params)
     } catch (err) {
-      this.platform.deviceUpdateError(accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true)
     }
   }
 
-  async externalUpdate (accessory, params) {
+  async externalUpdate (params) {
     try {
-      const outletService = accessory.getService(this.Service.Outlet)
+      const outletService = this.accessory.getService(this.Service.Outlet)
       if (helpers.hasProperty(params, 'switch')) {
         outletService.updateCharacteristic(this.Characteristic.On, params.switch === 'on')
-        if (!accessory.context.powerReadings) {
+        if (!this.accessory.context.powerReadings) {
           outletService.updateCharacteristic(this.Characteristic.OutletInUse, params.switch === 'on')
         }
       }
       if (helpers.hasProperty(params, 'power')) {
-        accessory.context.powerReadings = true
+        this.accessory.context.powerReadings = true
         outletService.updateCharacteristic(this.Characteristic.OutletInUse, parseFloat(params.power) > this.inUsePowerThreshold)
         outletService.updateCharacteristic(this.eveCurrentConsumption, parseFloat(params.power))
-        const isOn = accessory.getService(this.Service.Outlet).getCharacteristic(this.Characteristic.On).value
-        accessory.eveLogger.addEntry({
+        const isOn = this.accessory.getService(this.Service.Outlet).getCharacteristic(this.Characteristic.On).value
+        this.accessory.eveLogger.addEntry({
           time: Math.round(new Date().valueOf() / 1000),
           power: isOn ? parseFloat(params.power) : 0
         })
-        accessory.context.energyReadings.push(parseFloat(params.power))
+        this.accessory.context.energyReadings.push(parseFloat(params.power))
       }
       if (helpers.hasProperty(params, 'voltage')) {
         outletService.updateCharacteristic(this.eveVoltage, parseFloat(params.voltage))
@@ -165,7 +166,7 @@ module.exports = class deviceOutlet {
         outletService.updateCharacteristic(this.eveElectricCurrent, parseFloat(params.current))
       }
     } catch (err) {
-      this.platform.deviceUpdateError(accessory, err, false)
+      this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
 }
diff --git a/lib/device/rf-bridge.js b/lib/device/rf-bridge.js
index e9fe4f13..f5f61a00 100644
--- a/lib/device/rf-bridge.js
+++ b/lib/device/rf-bridge.js
@@ -21,7 +21,7 @@ module.exports = class deviceRFBridge {
         accessory.getService(name).updateCharacteristic(this.Characteristic.On, false)
         accessory.getService(name)
           .getCharacteristic(this.Characteristic.On)
-          .on('set', (value, callback) => this.internalUpdate(accessory, chan, name, value, callback))
+          .on('set', (value, callback) => this.internalUpdate(chan, name, value, callback))
       })
     } else {
       let serv
@@ -73,9 +73,10 @@ module.exports = class deviceRFBridge {
         path: this.platform.eveLogPath
       })
     }
+    this.accessory = accessory
   }
 
-  async internalUpdate (accessory, rfChl, service, value, callback) {
+  async internalUpdate (rfChl, service, value, callback) {
     callback()
     try {
       if (!value) return
@@ -84,14 +85,14 @@ module.exports = class deviceRFBridge {
         rfChl: parseInt(rfChl)
       }
       await helpers.sleep(1000)
-      accessory.getService(service).updateCharacteristic(this.Characteristic.On, false)
-      await this.platform.sendDeviceUpdate(accessory, params)
+      this.accessory.getService(service).updateCharacteristic(this.Characteristic.On, false)
+      await this.platform.sendDeviceUpdate(this.accessory, params)
     } catch (err) {
-      this.platform.deviceUpdateError(accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true)
     }
   }
 
-  async externalUpdate (accessory, params) {
+  async externalUpdate (params) {
     try {
       if (!helpers.hasProperty(params, 'updateSource')) return
       const timeNow = new Date()
@@ -99,7 +100,7 @@ module.exports = class deviceRFBridge {
       if (helpers.hasProperty(params, 'cmd') && params.cmd === 'transmit' && helpers.hasProperty(params, 'rfChl')) {
         this.platform.devicesInHB.forEach(acc => {
           if (
-            acc.context.eweDeviceId === accessory.context.eweDeviceId &&
+            acc.context.eweDeviceId === this.accessory.context.eweDeviceId &&
             helpers.hasProperty(acc.context, 'buttons') &&
             helpers.hasProperty(acc.context.buttons, params.rfChl.toString())
           ) {
@@ -120,7 +121,7 @@ module.exports = class deviceRFBridge {
           .forEach(async chan => {
             this.platform.devicesInHB.forEach(acc => {
               if (
-                acc.context.eweDeviceId === accessory.context.eweDeviceId &&
+                acc.context.eweDeviceId === this.accessory.context.eweDeviceId &&
                 helpers.hasProperty(acc.context, 'buttons') &&
                 helpers.hasProperty(acc.context.buttons, chan.split('g')[1].toString())
               ) {
@@ -197,7 +198,7 @@ module.exports = class deviceRFBridge {
           })
       }
     } catch (err) {
-      this.platform.deviceUpdateError(accessory, err, false)
+      this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
 }
diff --git a/lib/device/scm.js b/lib/device/scm.js
index c952e154..fc8c339c 100644
--- a/lib/device/scm.js
+++ b/lib/device/scm.js
@@ -12,36 +12,36 @@ module.exports = class deviceSCM {
     const scmService = accessory.getService(this.Service.Switch) || accessory.addService(this.Service.Switch)
     scmService
       .getCharacteristic(this.Characteristic.On)
-      .on('set', (value, callback) => this.internalUpdate(accessory, value, callback))
+      .on('set', (value, callback) => this.internalUpdate(value, callback))
     accessory.log = this.platform.log
     accessory.eveLogger = new this.EveHistoryService('switch', accessory, {
       storage: 'fs',
       path: this.platform.eveLogPath
     })
-    accessory = accessory
+    this.accessory = accessory
   }
 
-  async internalUpdate (accessory, value, callback) {
+  async internalUpdate (value, callback) {
     callback()
     try {
       const params = { switches: helpers.defaultMultiSwitchOff }
       params.switches[0].switch = value ? 'on' : 'off'
-      await this.platform.sendDeviceUpdate(accessory, params)
+      await this.platform.sendDeviceUpdate(this.accessory, params)
     } catch (err) {
-      this.platform.deviceUpdateError(accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true)
     }
   }
 
-  async externalUpdate (accessory, params) {
+  async externalUpdate (params) {
     try {
       if (!helpers.hasProperty(params, 'switches')) return
-      accessory.getService(this.Service.Switch).updateCharacteristic(this.Characteristic.On, params.switches[0].switch === 'on')
-      accessory.eveLogger.addEntry({
+      this.accessory.getService(this.Service.Switch).updateCharacteristic(this.Characteristic.On, params.switches[0].switch === 'on')
+      this.accessory.eveLogger.addEntry({
         time: Math.round(new Date().valueOf() / 1000),
         status: params.switches[0].switch === 'on' ? 1 : 0
       })
     } catch (err) {
-      this.platform.deviceUpdateError(accessory, err, false)
+      this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
 }
diff --git a/lib/device/sensor.js b/lib/device/sensor.js
index c1592391..50c5816e 100644
--- a/lib/device/sensor.js
+++ b/lib/device/sensor.js
@@ -22,13 +22,14 @@ module.exports = class deviceSensor {
       storage: 'fs',
       path: this.platform.eveLogPath
     })
+    this.accessory = accessory
   }
 
   async externalUpdate (params) {
     try {
       if (helpers.hasProperty(params, 'battery')) {
         const batteryService =
-            accessory.getService(this.Service.BatteryService) || accessory.addService(this.Service.BatteryService)
+            this.accessory.getService(this.Service.BatteryService) || this.accessory.addService(this.Service.BatteryService)
         const scaledBattery = Math.round(params.battery * 33.3)
         batteryService.updateCharacteristic(this.Characteristic.BatteryLevel, scaledBattery)
         batteryService.updateCharacteristic(
@@ -39,14 +40,14 @@ module.exports = class deviceSensor {
       if (!helpers.hasProperty(params, 'switch')) return
       const newState = params.switch === 'on' ? 1 : 0
       let oAccessory = false
-      const contactService = accessory.getService(this.Service.ContactSensor)
+      const contactService = this.accessory.getService(this.Service.ContactSensor)
       contactService.updateCharacteristic(this.Characteristic.ContactSensorState, newState)
-      accessory.eveLogger.addEntry({
+      this.accessory.eveLogger.addEntry({
         time: Math.round(new Date().valueOf() / 1000),
         status: newState
       })
       this.platform.cusG.forEach(async group => {
-        if (group.sensorId === accessory.context.eweDeviceId && group.type === 'garage') {
+        if (group.sensorId === this.accessory.context.eweDeviceId && group.type === 'garage') {
           if ((oAccessory = this.platform.devicesInHB.get(group.deviceId + 'SWX'))) {
             switch (newState) {
               case 0:
@@ -67,7 +68,7 @@ module.exports = class deviceSensor {
         }
       })
     } catch (err) {
-      this.platform.deviceUpdateError(accessory, err, false)
+      this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
 }
diff --git a/lib/device/switch-multi.js b/lib/device/switch-multi.js
index c4caf414..ae1c3f7d 100644
--- a/lib/device/switch-multi.js
+++ b/lib/device/switch-multi.js
@@ -13,7 +13,7 @@ module.exports = class deviceSwitch {
     const switchService = accessory.getService(this.Service.Switch) || accessory.addService(this.Service.Switch)
     switchService
       .getCharacteristic(this.Characteristic.On)
-      .on('set', (value, callback) => this.internalUpdate(accessory, value, callback))
+      .on('set', (value, callback) => this.internalUpdate(value, callback))
     if (accessory.getService(this.Service.Outlet)) {
       accessory.removeService(accessory.getService(this.Service.Outlet))
     }
@@ -25,15 +25,24 @@ module.exports = class deviceSwitch {
       storage: 'fs',
       path: this.platform.eveLogPath
     })
+    this.accessory = accessory
   }
 
-  async internalUpdate (accessory, value, callback) {
+  async internalUpdate (value, callback) {
+    // *** generates a random number in the range [10, 100] *** \\
+    await helpers.sleep(Math.floor(Math.random() * 91 + 10))
+    if (this.updateInProgress) {
+      await helpers.sleep(300)
+      return await this.internalUpdate(value, callback)
+    }
+    this.updateInProgress = true
+    setTimeout(() => (this.updateInProgress = false), 250)
+    callback()
     try {
-      callback()
       let oAccessory
       let masterState = 'off'
       const params = {}
-      switch (accessory.context.switchNumber) {
+      switch (this.accessory.context.switchNumber) {
         case '0':
           params.switches = helpers.defaultMultiSwitchOff
           params.switches[0].switch = value ? 'on' : 'off'
@@ -41,9 +50,8 @@ module.exports = class deviceSwitch {
           params.switches[2].switch = value ? 'on' : 'off'
           params.switches[3].switch = value ? 'on' : 'off'
           for (let i = 0; i <= 4; i++) {
-            if ((oAccessory = this.platform.devicesInHB.get(accessory.context.eweDeviceId + 'SW' + i))) {
+            if ((oAccessory = this.platform.devicesInHB.get(this.accessory.context.eweDeviceId + 'SW' + i))) {
               oAccessory.getService(this.Service.Switch).updateCharacteristic(this.Characteristic.On, value)
-              oAccessory.context.cacheOn = value
             }
           }
           break
@@ -53,11 +61,11 @@ module.exports = class deviceSwitch {
         case '4':
           params.switches = helpers.defaultMultiSwitchOff
           for (let i = 1; i <= 4; i++) {
-            if ((oAccessory = this.platform.devicesInHB.get(accessory.context.eweDeviceId + 'SW' + i))) {
+            if ((oAccessory = this.platform.devicesInHB.get(this.accessory.context.eweDeviceId + 'SW' + i))) {
               if (oAccessory.getService(this.Service.Switch).getCharacteristic(this.Characteristic.On).value) {
                 masterState = 'on'
               }
-              if (i === parseInt(accessory.context.switchNumber)) {
+              if (i === parseInt(this.accessory.context.switchNumber)) {
                 params.switches[i - 1].switch = value ? 'on' : 'off'
                 oAccessory.context.cacheOn = value
               } else {
@@ -67,24 +75,24 @@ module.exports = class deviceSwitch {
               params.switches[i - 1].switch = 'off'
             }
           }
-          if (!this.platform.hiddenMasters.includes(accessory.context.eweDeviceId)) {
-            oAccessory = this.platform.devicesInHB.get(accessory.context.eweDeviceId + 'SW0')
+          if (!this.platform.hiddenMasters.includes(this.accessory.context.eweDeviceId)) {
+            oAccessory = this.platform.devicesInHB.get(this.accessory.context.eweDeviceId + 'SW0')
             oAccessory.getService(this.Service.Switch).updateCharacteristic(this.Characteristic.On, masterState === 'on')
           }
           break
       }
-      await this.platform.sendDeviceUpdate(accessory, params)
+      await this.platform.sendDeviceUpdate(this.accessory, params)
     } catch (err) {
-      this.platform.deviceUpdateError(accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true)
     }
   }
 
-  async externalUpdate (accessory, params) {
+  async externalUpdate (params) {
     try {
       if (!helpers.hasProperty(params, 'switches')) return
-      const idToCheck = accessory.context.hbDeviceId.slice(0, -1)
+      const idToCheck = this.accessory.context.hbDeviceId.slice(0, -1)
       let primaryState = false
-      for (let i = 1; i <= accessory.context.channelCount; i++) {
+      for (let i = 1; i <= this.accessory.context.channelCount; i++) {
         if (params.switches[i - 1].switch === 'on') {
           primaryState = true
         }
@@ -100,15 +108,15 @@ module.exports = class deviceSwitch {
           })
         }
       }
-      if (!this.platform.hiddenMasters.includes(accessory.context.eweDeviceId)) {
-        accessory.getService(this.Service.Switch).updateCharacteristic(this.Characteristic.On, primaryState)
-        accessory.eveLogger.addEntry({
+      if (!this.platform.hiddenMasters.includes(this.accessory.context.eweDeviceId)) {
+        this.accessory.getService(this.Service.Switch).updateCharacteristic(this.Characteristic.On, primaryState)
+        this.accessory.eveLogger.addEntry({
           time: Math.round(new Date().valueOf() / 1000),
           status: primaryState ? 1 : 0
         })
       }
     } catch (err) {
-      this.platform.deviceUpdateError(accessory, err, false)
+      this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
 }
diff --git a/lib/device/switch-single.js b/lib/device/switch-single.js
index 1b106754..90c7cbf6 100644
--- a/lib/device/switch-single.js
+++ b/lib/device/switch-single.js
@@ -12,7 +12,7 @@ module.exports = class deviceSwitchSingle {
     const switchService = accessory.getService(this.Service.Switch) || accessory.addService(this.Service.Switch)
     switchService
       .getCharacteristic(this.Characteristic.On)
-      .on('set', (value, callback) => this.internalUpdate(accessory, value, callback))
+      .on('set', (value, callback) => this.internalUpdate(value, callback))
     if (accessory.getService(this.Service.Outlet)) {
       accessory.removeService(accessory.getService(this.Service.Outlet))
     }
@@ -24,29 +24,29 @@ module.exports = class deviceSwitchSingle {
       storage: 'fs',
       path: this.platform.eveLogPath
     })
-    accessory = accessory
+    this.accessory = accessory
   }
 
-  async internalUpdate (accessory, value, callback) {
+  async internalUpdate (value, callback) {
     callback()
     try {
       const params = { switch: value ? 'on' : 'off' }
-      await this.platform.sendDeviceUpdate(accessory, params)
+      await this.platform.sendDeviceUpdate(this.accessory, params)
     } catch (err) {
-      this.platform.deviceUpdateError(accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true)
     }
   }
 
-  async externalUpdate (accessory, params) {
+  async externalUpdate (params) {
     try {
       if (!helpers.hasProperty(params, 'switch')) return
-      accessory.getService(this.Service.Switch).updateCharacteristic(this.Characteristic.On, params.switch === 'on')
-      accessory.eveLogger.addEntry({
+      this.accessory.getService(this.Service.Switch).updateCharacteristic(this.Characteristic.On, params.switch === 'on')
+      this.accessory.eveLogger.addEntry({
         time: Math.round(new Date().valueOf() / 1000),
         status: params.switch === 'on' ? 1 : 0
       })
     } catch (err) {
-      this.platform.deviceUpdateError(accessory, err, false)
+      this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
 }
diff --git a/lib/device/template.js b/lib/device/template.js
index 640ac76d..96b3e25d 100644
--- a/lib/device/template.js
+++ b/lib/device/template.js
@@ -9,24 +9,24 @@ module.exports = class deviceTemplate {
     const service = accessory.getService(this.Service.Switch) || accessory.addService(this.Service.Switch)
     service
       .getCharacteristic(this.Characteristic.On)
-      .on('set', (value, callback) => this.internalUpdate(accessory, value, callback))
-    accessory = accessory
+      .on('set', (value, callback) => this.internalUpdate(value, callback))
+    this.accessory = accessory
   }
 
-  async internalUpdate (accessory, value, callback) {
+  async internalUpdate (value, callback) {
     callback()
     try {
 
     } catch (err) {
-      this.platform.deviceUpdateError(accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true)
     }
   }
 
-  async externalUpdate (accessory, params) {
+  async externalUpdate (params) {
     try {
 
     } catch (err) {
-      this.platform.deviceUpdateError(accessory, err, false)
+      this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
 }
diff --git a/lib/device/thermostat.js b/lib/device/thermostat.js
index f8ebc126..2f2216d7 100644
--- a/lib/device/thermostat.js
+++ b/lib/device/thermostat.js
@@ -17,62 +17,63 @@ module.exports = class deviceThermostat {
       const switchService = accessory.getService(this.Service.Switch) || accessory.addService(this.Service.Switch)
       switchService
         .getCharacteristic(this.Characteristic.On)
-        .on('set', (value, callback) => this.internalUpdate(accessory, value, callback))
+        .on('set', (value, callback) => this.internalUpdate(value, callback))
     }
     accessory.log = this.platform.log
     accessory.eveLogger = new this.EveHistoryService('custom', accessory, {
       storage: 'fs',
       path: this.platform.eveLogPath
     })
+    this.accessory = accessory
   }
 
-  async internalUpdate (accessory, value, callback) {
+  async internalUpdate (value, callback) {
     callback()
     try {
       const params = {
         switch: value ? 'on' : 'off',
         mainSwitch: value ? 'on' : 'off'
       }
-      await this.platform.sendDeviceUpdate(accessory, params)
+      await this.platform.sendDeviceUpdate(this.accessory, params)
     } catch (err) {
-      this.platform.deviceUpdateError(accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true)
     }
   }
 
-  async externalUpdate (accessory, params) {
+  async externalUpdate (params) {
     try {
       if (
         !this.platform.config.hideTHSwitch &&
         (helpers.hasProperty(params, 'switch') || helpers.hasProperty(params, 'mainSwitch'))
       ) {
         const newState = helpers.hasProperty(params, 'switch') ? params.switch === 'on' : params.mainSwitch === 'on'
-        const switchService = accessory.getService(this.Service.Switch)
+        const switchService = this.accessory.getService(this.Service.Switch)
         switchService.updateCharacteristic(this.Characteristic.On, newState)
-        accessory.eveLogger.addEntry({
+        this.accessory.eveLogger.addEntry({
           time: Math.round(new Date().valueOf() / 1000),
           status: newState ? 1 : 0
         })
       }
       const eveLog = { time: Math.round(new Date().valueOf() / 1000) }
-      if (helpers.hasProperty(params, 'currentTemperature') && accessory.getService(this.Service.TemperatureSensor)) {
+      if (helpers.hasProperty(params, 'currentTemperature') && this.accessory.getService(this.Service.TemperatureSensor)) {
         const currentTemp = parseFloat(params.currentTemperature !== 'unavailable' ? params.currentTemperature : 0)
-        accessory
+        this.accessory
           .getService(this.Service.TemperatureSensor)
           .updateCharacteristic(this.Characteristic.CurrentTemperature, currentTemp)
         eveLog.temp = currentTemp
       }
-      if (helpers.hasProperty(params, 'currentHumidity') && accessory.getService(this.Service.HumiditySensor)) {
+      if (helpers.hasProperty(params, 'currentHumidity') && this.accessory.getService(this.Service.HumiditySensor)) {
         const currentHumi = parseFloat(params.currentHumidity !== 'unavailable' ? params.currentHumidity : 0)
-        accessory
+        this.accessory
           .getService(this.Service.HumiditySensor)
           .updateCharacteristic(this.Characteristic.CurrentRelativeHumidity, currentHumi)
         eveLog.humidity = currentHumi
       }
       if (helpers.hasProperty(eveLog, 'temp') || helpers.hasProperty(eveLog, 'humidity')) {
-        accessory.eveLogger.addEntry(eveLog)
+        this.accessory.eveLogger.addEntry(eveLog)
       }
     } catch (err) {
-      this.platform.deviceUpdateError(accessory, err, false)
+      this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
 }
diff --git a/lib/device/usb.js b/lib/device/usb.js
index b43f90c0..ccc96e56 100644
--- a/lib/device/usb.js
+++ b/lib/device/usb.js
@@ -12,35 +12,36 @@ module.exports = class deviceUSB {
     const usbService = accessory.getService(this.Service.Outlet) || accessory.addService(this.Service.Outlet)
     usbService
       .getCharacteristic(this.Characteristic.On)
-      .on('set', (value, callback) => this.internalUpdate(accessory, value, callback))
+      .on('set', (value, callback) => this.internalUpdate(value, callback))
     accessory.log = this.platform.log
     accessory.eveLogger = new this.EveHistoryService('switch', accessory, {
       storage: 'fs',
       path: this.platform.eveLogPath
     })
+    this.accessory = accessory
   }
 
-  async internalUpdate (accessory, value, callback) {
+  async internalUpdate (value, callback) {
     callback()
     try {
       const params = { switches: helpers.defaultMultiSwitchOff }
       params.switches[0].switch = value ? 'on' : 'off'
-      await this.platform.sendDeviceUpdate(accessory, params)
+      await this.platform.sendDeviceUpdate(this.accessory, params)
     } catch (err) {
-      this.platform.deviceUpdateError(accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true)
     }
   }
 
-  async externalUpdate (accessory, params) {
+  async externalUpdate (params) {
     try {
       if (!helpers.hasProperty(params, 'switches')) return
-      accessory.getService(this.Service.Outlet).updateCharacteristic(this.Characteristic.On, params.switches[0].switch === 'on')
-      accessory.eveLogger.addEntry({
+      this.accessory.getService(this.Service.Outlet).updateCharacteristic(this.Characteristic.On, params.switches[0].switch === 'on')
+      this.accessory.eveLogger.addEntry({
         time: Math.round(new Date().valueOf() / 1000),
         status: params.switches[0].switch === 'on' ? 1 : 0
       })
     } catch (err) {
-      this.platform.deviceUpdateError(accessory, err, false)
+      this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
 }
diff --git a/lib/device/valve-two.js b/lib/device/valve-two.js
index b49cabb2..4e53ebff 100644
--- a/lib/device/valve-two.js
+++ b/lib/device/valve-two.js
@@ -22,7 +22,7 @@ module.exports = class deviceValveTwo {
       }
       valveService
         .getCharacteristic(this.Characteristic.Active)
-        .on('set', (value, callback) => this.internalUpdate(accessory, 'Valve ' + v, value, callback))
+        .on('set', (value, callback) => this.internalUpdate('Valve ' + v, value, callback))
       valveService
         .getCharacteristic(this.Characteristic.SetDuration)
         .on('set', (value, callback) => {
@@ -34,22 +34,23 @@ module.exports = class deviceValveTwo {
           callback()
         })
     })
+    this.accessory = accessory
   }
 
-  async internalUpdate (accessory, valve, value, callback) {
+  async internalUpdate (valve, value, callback) {
     callback()
     try {
       const params = { switches: helpers.defaultMultiSwitchOff }
-      const serviceValve = accessory.getService(valve)
+      const serviceValve = this.accessory.getService(valve)
       switch (valve) {
         case 'Valve A':
           params.switches[0].switch = value ? 'on' : 'off'
-          params.switches[1].switch = accessory.getService('Valve B').getCharacteristic(this.Characteristic.Active).value
+          params.switches[1].switch = this.accessory.getService('Valve B').getCharacteristic(this.Characteristic.Active).value
             ? 'on'
             : 'off'
           break
         case 'Valve B':
-          params.switches[0].switch = accessory.getService('Valve A').getCharacteristic(this.Characteristic.Active).value
+          params.switches[0].switch = this.accessory.getService('Valve A').getCharacteristic(this.Characteristic.Active).value
             ? 'on'
             : 'off'
           params.switches[1].switch = value ? 'on' : 'off'
@@ -59,7 +60,7 @@ module.exports = class deviceValveTwo {
       switch (value) {
         case 0:
           serviceValve.updateCharacteristic(this.Characteristic.RemainingDuration, 0)
-          clearTimeout(accessory.getService(valve).timer)
+          clearTimeout(this.accessory.getService(valve).timer)
           break
         case 1: {
           const timer = serviceValve.getCharacteristic(this.Characteristic.SetDuration).value
@@ -68,17 +69,17 @@ module.exports = class deviceValveTwo {
           break
         }
       }
-      await this.platform.sendDeviceUpdate(accessory, params)
+      await this.platform.sendDeviceUpdate(this.accessory, params)
     } catch (err) {
-      this.platform.deviceUpdateError(accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true)
     }
   }
 
-  async externalUpdate (accessory, params) {
+  async externalUpdate (params) {
     try {
       if (!helpers.hasProperty(params, 'switches')) return
       ;['A', 'B'].forEach((v, k) => {
-        const valveService = accessory.getService('Valve ' + v)
+        const valveService = this.accessory.getService('Valve ' + v)
         valveService
           .updateCharacteristic(this.Characteristic.Active, params.switches[k].switch === 'on')
           .updateCharacteristic(this.Characteristic.InUse, params.switches[k].switch === 'on')
@@ -92,7 +93,7 @@ module.exports = class deviceValveTwo {
         }
       })
     } catch (err) {
-      this.platform.deviceUpdateError(accessory, err, false)
+      this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
 }
diff --git a/lib/device/valve.js b/lib/device/valve.js
index e03b17a9..ac142ff3 100644
--- a/lib/device/valve.js
+++ b/lib/device/valve.js
@@ -21,7 +21,7 @@ module.exports = class deviceValve {
     }
     valveService
       .getCharacteristic(this.Characteristic.Active)
-      .on('set', (value, callback) => this.internalUpdate(accessory, value, callback))
+      .on('set', (value, callback) => this.internalUpdate(value, callback))
     valveService
       .getCharacteristic(this.Characteristic.SetDuration)
       .on('set', (value, callback) => {
@@ -32,18 +32,19 @@ module.exports = class deviceValve {
         }
         callback()
       })
+    this.accessory = accessory
   }
 
-  async internalUpdate (accessory, value, callback) {
+  async internalUpdate (value, callback) {
     callback()
     try {
       const params = { switch: value ? 'on' : 'off' }
-      const serviceValve = accessory.getService(this.Service.Valve)
+      const serviceValve = this.accessory.getService(this.Service.Valve)
       serviceValve.updateCharacteristic(this.Characteristic.InUse, value)
       switch (value) {
         case 0:
           serviceValve.updateCharacteristic(this.Characteristic.RemainingDuration, 0)
-          clearTimeout(accessory.getService(this.Service.Valve).timer)
+          clearTimeout(this.accessory.getService(this.Service.Valve).timer)
           break
         case 1: {
           const timer = serviceValve.getCharacteristic(this.Characteristic.SetDuration).value
@@ -52,16 +53,16 @@ module.exports = class deviceValve {
           break
         }
       }
-      await this.platform.sendDeviceUpdate(accessory, params)
+      await this.platform.sendDeviceUpdate(this.accessory, params)
     } catch (err) {
-      this.platform.deviceUpdateError(accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true)
     }
   }
 
-  async externalUpdate (accessory, params) {
+  async externalUpdate (params) {
     try {
       if (!helpers.hasProperty(params, 'switch')) return
-      const valveService = accessory.getService(this.Service.Valve)
+      const valveService = this.accessory.getService(this.Service.Valve)
       valveService
         .updateCharacteristic(this.Characteristic.Active, params.switch === 'on')
         .updateCharacteristic(this.Characteristic.InUse, params.switch === 'on')
@@ -74,7 +75,7 @@ module.exports = class deviceValve {
         clearTimeout(valveService.timer)
       }
     } catch (err) {
-      this.platform.deviceUpdateError(accessory, err, false)
+      this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
 }
diff --git a/lib/device/zb-dev.js b/lib/device/zb-dev.js
index 40f9914f..a7514131 100644
--- a/lib/device/zb-dev.js
+++ b/lib/device/zb-dev.js
@@ -45,7 +45,7 @@ module.exports = class deviceZBDev {
         })
         accessory.getService(this.Service.Switch)
           .getCharacteristic(this.Characteristic.On)
-          .on('set', (value, callback) => this.internalUpdate(accessory, value, callback))
+          .on('set', (value, callback) => this.internalUpdate(value, callback))
         break
       case 1770:
         if (!accessory.getService(this.Service.BatteryService)) accessory.addService(this.Service.BatteryService)
@@ -76,38 +76,38 @@ module.exports = class deviceZBDev {
         })
         break
     }
-    accessory = accessory
+    this.accessory = accessory
   }
 
-  async internalUpdate (accessory, value, callback) {
+  async internalUpdate (value, callback) {
     callback()
     try {
       const params = { switch: value ? 'on' : 'off' }
-      await this.platform.sendDeviceUpdate(accessory, params)
+      await this.platform.sendDeviceUpdate(this.accessory, params)
     } catch (err) {
-      this.platform.deviceUpdateError(accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true)
     }
   }
 
-  async externalUpdate (accessory, params) {
+  async externalUpdate (params) {
     try {
       //* ** credit @tasict ***\\
       if (helpers.hasProperty(params, 'battery')) {
-        if (accessory.context.eweUIID === 3026 && this.platform.config.ZBDWBatt) {
+        if (this.accessory.context.eweUIID === 3026 && this.platform.config.ZBDWBatt) {
           params.battery *= 10
         }
         const batteryService =
-          accessory.getService(this.Service.BatteryService) || accessory.addService(this.Service.BatteryService)
+          this.accessory.getService(this.Service.BatteryService) || this.accessory.addService(this.Service.BatteryService)
         batteryService.updateCharacteristic(this.Characteristic.BatteryLevel, params.battery)
         batteryService.updateCharacteristic(
           this.Characteristic.StatusLowBattery,
           params.battery < this.lowBattThreshold
         )
       }
-      switch (accessory.context.eweUIID) {
+      switch (this.accessory.context.eweUIID) {
         case 1000:
           if (helpers.hasProperty(params, 'key') && [0, 1, 2].includes(params.key)) {
-            accessory
+            this.accessory
               .getService(this.Service.StatelessProgrammableSwitch)
               .updateCharacteristic(this.Characteristic.ProgrammableSwitchEvent, params.key)
           }
@@ -115,10 +115,10 @@ module.exports = class deviceZBDev {
         case 1009:
         case 1256:
           if (helpers.hasProperty(params, 'switch') && ['off', 'on'].includes(params.switch)) {
-            accessory
+            this.accessory
               .getService(this.Service.Switch)
               .updateCharacteristic(this.Characteristic.On, params.switch === 'on')
-            accessory.eveLogger.addEntry({
+            this.accessory.eveLogger.addEntry({
               time: Math.round(new Date().valueOf() / 1000),
               status: params.switch === 'on' ? 1 : 0
             })
@@ -128,20 +128,20 @@ module.exports = class deviceZBDev {
           const eveLog = { time: Math.round(new Date().valueOf() / 1000) }
           if (helpers.hasProperty(params, 'temperature')) {
             const currentTemp = parseInt(params.temperature) / 100
-            accessory
+            this.accessory
               .getService(this.Service.TemperatureSensor)
               .updateCharacteristic(this.Characteristic.CurrentTemperature, currentTemp)
             eveLog.temp = parseFloat(currentTemp)
           }
           if (helpers.hasProperty(params, 'humidity')) {
             const currentHumi = parseInt(params.humidity) / 100
-            accessory
+            this.accessory
               .getService(this.Service.HumiditySensor)
               .updateCharacteristic(this.Characteristic.CurrentRelativeHumidity, currentHumi)
             eveLog.humidity = parseFloat(currentHumi)
           }
           if (helpers.hasProperty(eveLog, 'temp') || helpers.hasProperty(eveLog, 'humidity')) {
-            accessory.eveLogger.addEntry(eveLog)
+            this.accessory.eveLogger.addEntry(eveLog)
           }
           break
         }
@@ -153,30 +153,30 @@ module.exports = class deviceZBDev {
               helpers.hasProperty(params, 'updateSource') &&
               params.motion === 1 &&
               diff < this.sensorTimeDifference
-            accessory.eveLogger.addEntry({
+            this.accessory.eveLogger.addEntry({
               time: Math.round(new Date().valueOf() / 1000),
               status: motionDetected ? 1 : 0
             })
-            accessory.getService(this.Service.MotionSensor).updateCharacteristic(this.Characteristic.MotionDetected, motionDetected)
+            this.accessory.getService(this.Service.MotionSensor).updateCharacteristic(this.Characteristic.MotionDetected, motionDetected)
             break
           }
           break
         case 3026:
           if (helpers.hasProperty(params, 'lock') && [0, 1].includes(params.lock)) {
-            accessory
+            this.accessory
               .getService(this.Service.ContactSensor)
               .updateCharacteristic(this.Characteristic.ContactSensorState, params.lock)
-            accessory.eveLogger.addEntry({
+            this.accessory.eveLogger.addEntry({
               time: Math.round(new Date().valueOf() / 1000),
               status: params.lock
             })
           }
           break
         default:
-          throw new Error('Zigbee device type not supported [uiid ' + accessory.context.eweUIID + ']')
+          throw new Error('Zigbee device type not supported [uiid ' + this.accessory.context.eweUIID + ']')
       }
     } catch (err) {
-      this.platform.deviceUpdateError(accessory, err, false)
+      this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
 }
diff --git a/lib/ewelink-platform.js b/lib/ewelink-platform.js
index bb5f0913..94d73fdc 100644
--- a/lib/ewelink-platform.js
+++ b/lib/ewelink-platform.js
@@ -504,7 +504,7 @@ module.exports = class eWeLinkPlatform {
           str += 'is unreachable'
         }
       }
-      if (!this.config.disableHTTPRefresh) accessory.control.externalUpdate(accessory, device.params)
+      if (!this.config.disableHTTPRefresh) accessory.control.externalUpdate(device.params)
       this.devicesInHB.set(accessory.context.hbDeviceId, accessory)
       this.log(' → [%s] initialised %s.', device.name, str)
     } catch (err) {
@@ -648,7 +648,7 @@ module.exports = class eWeLinkPlatform {
         this.log('[%s] %s update received and will be refreshed.', accessory.displayName, device.params.updateSource)
       }
       try {
-        accessory.control.externalUpdate(accessory, device.params)
+        accessory.control.externalUpdate(device.params)
       } catch (err) {
         this.log.warn('[%s] could not be refreshed as %s.', accessory.displayName, this.debug ? err : err.message)
       }

From 788911c072d0ab907258a6016aab20c52023143a Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 8 Nov 2020 14:02:33 +0000
Subject: [PATCH 0710/3183] revert recent changes

---
 lib/device/blind.js         |  2 +-
 lib/device/curtain.js       |  2 +-
 lib/device/diffuser.js      |  2 +-
 lib/device/fan.js           |  4 ++--
 lib/device/garage-eachen.js |  2 +-
 lib/device/garage-four.js   |  2 +-
 lib/device/garage-two.js    |  2 +-
 lib/device/garage.js        |  2 +-
 lib/device/light-colour.js  |  2 +-
 lib/device/light-ctemp.js   |  3 +--
 lib/device/light-dimmer.js  |  2 +-
 lib/device/lock.js          |  2 +-
 lib/device/outlet.js        |  2 +-
 lib/device/rf-bridge.js     |  2 +-
 lib/device/scm.js           |  2 +-
 lib/device/switch-multi.js  | 10 +---------
 lib/device/switch-single.js |  2 +-
 lib/device/template.js      |  3 +--
 lib/device/thermostat.js    |  2 +-
 lib/device/usb.js           |  2 +-
 lib/device/valve-two.js     |  2 +-
 lib/device/valve.js         |  2 +-
 lib/device/zb-dev.js        |  2 +-
 package-lock.json           |  2 +-
 package.json                |  2 +-
 25 files changed, 26 insertions(+), 36 deletions(-)

diff --git a/lib/device/blind.js b/lib/device/blind.js
index b481d65e..d0191a2f 100644
--- a/lib/device/blind.js
+++ b/lib/device/blind.js
@@ -23,8 +23,8 @@ module.exports = class deviceBlind {
   }
 
   async internalUpdate (value, callback) {
-    callback()
     try {
+      callback()
       let blindConfig
       const params = {}
       const wcService = this.accessory.getService(this.Service.WindowCovering)
diff --git a/lib/device/curtain.js b/lib/device/curtain.js
index 67ca977b..02e3758d 100644
--- a/lib/device/curtain.js
+++ b/lib/device/curtain.js
@@ -23,8 +23,8 @@ module.exports = class deviceCurtain {
   }
 
   async internalUpdate (value, callback) {
-    callback()
     try {
+      callback()
       let params
       const prevPos = this.accessory.context.cacheCurrentPosition
       const newPos = value
diff --git a/lib/device/diffuser.js b/lib/device/diffuser.js
index ae8bcf86..95b1d1d8 100644
--- a/lib/device/diffuser.js
+++ b/lib/device/diffuser.js
@@ -36,8 +36,8 @@ module.exports = class deviceDiffuser {
   }
 
   async internalDiffuserOnOffUpdate (value, callback) {
-    callback()
     try {
+      callback()
       const params = { switch: value ? 'on' : 'off' }
       await this.platform.sendDeviceUpdate(this.accessory, params)
     } catch (err) {
diff --git a/lib/device/fan.js b/lib/device/fan.js
index baeaaf4a..1569f0e8 100644
--- a/lib/device/fan.js
+++ b/lib/device/fan.js
@@ -15,7 +15,7 @@ module.exports = class deviceFan {
     const fanService = accessory.getService(this.Service.Fan) || accessory.addService(this.Service.Fan)
     fanService
       .getCharacteristic(this.Characteristic.On)
-      .on('set', async (value, callback) => {
+      .on('set', (value, callback) => {
         callback()
         if (!value) fanService.setCharacteristic(this.Characteristic.RotationSpeed, 0)
       })
@@ -40,8 +40,8 @@ module.exports = class deviceFan {
   }
 
   async internalUpdate (type, value, callback) {
-    callback()
     try {
+      callback()
       let newPower
       let newSpeed
       let newLight
diff --git a/lib/device/garage-eachen.js b/lib/device/garage-eachen.js
index 1c7fb8bf..6f4ef86d 100644
--- a/lib/device/garage-eachen.js
+++ b/lib/device/garage-eachen.js
@@ -23,8 +23,8 @@ module.exports = class deviceGarageEachen {
   }
 
   async internalUpdate (value, callback) {
-    callback()
     try {
+      callback()
       let garageConfig
       if (!(garageConfig = this.platform.cusG.get(this.accessory.context.hbDeviceId))) {
         throw new Error('group config missing')
diff --git a/lib/device/garage-four.js b/lib/device/garage-four.js
index f21f1e4d..40247d9e 100644
--- a/lib/device/garage-four.js
+++ b/lib/device/garage-four.js
@@ -25,8 +25,8 @@ module.exports = class deviceGarageFour {
   }
 
   async internalUpdate (garage, value, callback) {
-    callback()
     try {
+      callback()
       let garageConfig
       if (!(garageConfig = this.platform.cusG.get(this.accessory.context.hbDeviceId))) {
         throw new Error('group config missing')
diff --git a/lib/device/garage-two.js b/lib/device/garage-two.js
index fa02653c..e534d59a 100644
--- a/lib/device/garage-two.js
+++ b/lib/device/garage-two.js
@@ -25,8 +25,8 @@ module.exports = class deviceGarageTwo {
   }
 
   async internalUpdate (garage, value, callback) {
-    callback()
     try {
+      callback()
       let garageConfig
       if (!(garageConfig = this.platform.cusG.get(this.accessory.context.hbDeviceId))) {
         throw new Error('group config missing')
diff --git a/lib/device/garage.js b/lib/device/garage.js
index 38d31896..2e69359c 100644
--- a/lib/device/garage.js
+++ b/lib/device/garage.js
@@ -23,8 +23,8 @@ module.exports = class deviceGarage {
   }
 
   async internalUpdate (value, callback) {
-    callback()
     try {
+      callback()
       let garageConfig
       if (!(garageConfig = this.platform.cusG.get(this.accessory.context.hbDeviceId))) {
         throw new Error('group config missing')
diff --git a/lib/device/light-colour.js b/lib/device/light-colour.js
index fe68041a..4d9581c6 100644
--- a/lib/device/light-colour.js
+++ b/lib/device/light-colour.js
@@ -33,8 +33,8 @@ module.exports = class deviceLightColour {
   }
 
   async internalUpdate (type, value, callback) {
-    callback()
     try {
+      callback()
       let newRGB
       let params = {}
       const lightService = this.accessory.getService(this.Service.Lightbulb)
diff --git a/lib/device/light-ctemp.js b/lib/device/light-ctemp.js
index 66fa2e25..2874f653 100644
--- a/lib/device/light-ctemp.js
+++ b/lib/device/light-ctemp.js
@@ -17,9 +17,8 @@ module.exports = class deviceLightCTemp {
   }
 
   async internalUpdate (type, value, callback) {
-    callback()
     try {
-
+      callback()
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
     }
diff --git a/lib/device/light-dimmer.js b/lib/device/light-dimmer.js
index b7c30db4..734bb4ff 100644
--- a/lib/device/light-dimmer.js
+++ b/lib/device/light-dimmer.js
@@ -17,8 +17,8 @@ module.exports = class deviceLightDimmer {
   }
 
   async internalUpdate (type, value, callback) {
-    callback()
     try {
+      callback()
       const params = {}
       switch (type) {
         case 'onoff':
diff --git a/lib/device/lock.js b/lib/device/lock.js
index b69ea0cc..25730813 100644
--- a/lib/device/lock.js
+++ b/lib/device/lock.js
@@ -15,8 +15,8 @@ module.exports = class deviceLock {
   }
 
   async internalUpdate (value, callback) {
-    callback()
     try {
+      callback()
       let lockConfig
       const params = { switch: 'on' }
       const lmService = this.accessory.getService(this.Service.LockMechanism)
diff --git a/lib/device/outlet.js b/lib/device/outlet.js
index 72339905..fdbcfea8 100644
--- a/lib/device/outlet.js
+++ b/lib/device/outlet.js
@@ -130,8 +130,8 @@ module.exports = class deviceOutlet {
   }
 
   async internalUpdate (value, callback) {
-    callback()
     try {
+      callback()
       const params = { switch: value ? 'on' : 'off' }
       await this.platform.sendDeviceUpdate(this.accessory, params)
     } catch (err) {
diff --git a/lib/device/rf-bridge.js b/lib/device/rf-bridge.js
index f5f61a00..3701aa9e 100644
--- a/lib/device/rf-bridge.js
+++ b/lib/device/rf-bridge.js
@@ -77,8 +77,8 @@ module.exports = class deviceRFBridge {
   }
 
   async internalUpdate (rfChl, service, value, callback) {
-    callback()
     try {
+      callback()
       if (!value) return
       const params = {
         cmd: 'transmit',
diff --git a/lib/device/scm.js b/lib/device/scm.js
index fc8c339c..72313bf9 100644
--- a/lib/device/scm.js
+++ b/lib/device/scm.js
@@ -22,8 +22,8 @@ module.exports = class deviceSCM {
   }
 
   async internalUpdate (value, callback) {
-    callback()
     try {
+      callback()
       const params = { switches: helpers.defaultMultiSwitchOff }
       params.switches[0].switch = value ? 'on' : 'off'
       await this.platform.sendDeviceUpdate(this.accessory, params)
diff --git a/lib/device/switch-multi.js b/lib/device/switch-multi.js
index ae1c3f7d..e333541a 100644
--- a/lib/device/switch-multi.js
+++ b/lib/device/switch-multi.js
@@ -29,16 +29,8 @@ module.exports = class deviceSwitch {
   }
 
   async internalUpdate (value, callback) {
-    // *** generates a random number in the range [10, 100] *** \\
-    await helpers.sleep(Math.floor(Math.random() * 91 + 10))
-    if (this.updateInProgress) {
-      await helpers.sleep(300)
-      return await this.internalUpdate(value, callback)
-    }
-    this.updateInProgress = true
-    setTimeout(() => (this.updateInProgress = false), 250)
-    callback()
     try {
+      callback()
       let oAccessory
       let masterState = 'off'
       const params = {}
diff --git a/lib/device/switch-single.js b/lib/device/switch-single.js
index 90c7cbf6..ba9ab10e 100644
--- a/lib/device/switch-single.js
+++ b/lib/device/switch-single.js
@@ -28,8 +28,8 @@ module.exports = class deviceSwitchSingle {
   }
 
   async internalUpdate (value, callback) {
-    callback()
     try {
+      callback()
       const params = { switch: value ? 'on' : 'off' }
       await this.platform.sendDeviceUpdate(this.accessory, params)
     } catch (err) {
diff --git a/lib/device/template.js b/lib/device/template.js
index 96b3e25d..728469c0 100644
--- a/lib/device/template.js
+++ b/lib/device/template.js
@@ -14,9 +14,8 @@ module.exports = class deviceTemplate {
   }
 
   async internalUpdate (value, callback) {
-    callback()
     try {
-
+      callback()
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
     }
diff --git a/lib/device/thermostat.js b/lib/device/thermostat.js
index 2f2216d7..f1c4c085 100644
--- a/lib/device/thermostat.js
+++ b/lib/device/thermostat.js
@@ -28,8 +28,8 @@ module.exports = class deviceThermostat {
   }
 
   async internalUpdate (value, callback) {
-    callback()
     try {
+      callback()
       const params = {
         switch: value ? 'on' : 'off',
         mainSwitch: value ? 'on' : 'off'
diff --git a/lib/device/usb.js b/lib/device/usb.js
index ccc96e56..b4928a2f 100644
--- a/lib/device/usb.js
+++ b/lib/device/usb.js
@@ -22,8 +22,8 @@ module.exports = class deviceUSB {
   }
 
   async internalUpdate (value, callback) {
-    callback()
     try {
+      callback()
       const params = { switches: helpers.defaultMultiSwitchOff }
       params.switches[0].switch = value ? 'on' : 'off'
       await this.platform.sendDeviceUpdate(this.accessory, params)
diff --git a/lib/device/valve-two.js b/lib/device/valve-two.js
index 4e53ebff..7cb2348d 100644
--- a/lib/device/valve-two.js
+++ b/lib/device/valve-two.js
@@ -38,8 +38,8 @@ module.exports = class deviceValveTwo {
   }
 
   async internalUpdate (valve, value, callback) {
-    callback()
     try {
+      callback()
       const params = { switches: helpers.defaultMultiSwitchOff }
       const serviceValve = this.accessory.getService(valve)
       switch (valve) {
diff --git a/lib/device/valve.js b/lib/device/valve.js
index ac142ff3..bf514311 100644
--- a/lib/device/valve.js
+++ b/lib/device/valve.js
@@ -36,8 +36,8 @@ module.exports = class deviceValve {
   }
 
   async internalUpdate (value, callback) {
-    callback()
     try {
+      callback()
       const params = { switch: value ? 'on' : 'off' }
       const serviceValve = this.accessory.getService(this.Service.Valve)
       serviceValve.updateCharacteristic(this.Characteristic.InUse, value)
diff --git a/lib/device/zb-dev.js b/lib/device/zb-dev.js
index a7514131..3a4c0aa7 100644
--- a/lib/device/zb-dev.js
+++ b/lib/device/zb-dev.js
@@ -80,8 +80,8 @@ module.exports = class deviceZBDev {
   }
 
   async internalUpdate (value, callback) {
-    callback()
     try {
+      callback()
       const params = { switch: value ? 'on' : 'off' }
       await this.platform.sendDeviceUpdate(this.accessory, params)
     } catch (err) {
diff --git a/package-lock.json b/package-lock.json
index 02229e1b..032b820d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.12.0-1",
+  "version": "3.12.0-2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 41af04f9..91ec9975 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.12.0-1",
+  "version": "3.12.0-2",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From c0027fecc386cd1c006cec3a6da6b265d6c2bbd9 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 8 Nov 2020 14:45:43 +0000
Subject: [PATCH 0711/3183] unnecessary var

---
 lib/device/switch-multi.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/device/switch-multi.js b/lib/device/switch-multi.js
index e333541a..52ee75c3 100644
--- a/lib/device/switch-multi.js
+++ b/lib/device/switch-multi.js
@@ -9,7 +9,6 @@ module.exports = class deviceSwitch {
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
     this.EveHistoryService = fakegato(platform.api)
-    this.updateInProgress = false
     const switchService = accessory.getService(this.Service.Switch) || accessory.addService(this.Service.Switch)
     switchService
       .getCharacteristic(this.Characteristic.On)

From 9483f1f720b52d6476a1b5e8fb12e45af4c3d2ef Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 8 Nov 2020 14:45:58 +0000
Subject: [PATCH 0712/3183] increase await

---
 lib/device/diffuser.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/device/diffuser.js b/lib/device/diffuser.js
index 95b1d1d8..d275f9b3 100644
--- a/lib/device/diffuser.js
+++ b/lib/device/diffuser.js
@@ -102,7 +102,7 @@ module.exports = class deviceDiffuser {
         lightGcolor: newRGB[1],
         lightBcolor: newRGB[2]
       }
-      await helpers.sleep(500)
+      await helpers.sleep(1000)
       if (updateKeyColour !== this.accessory.context.updateKeyColour) return
       await this.platform.sendDeviceUpdate(this.accessory, params)
     } catch (err) {

From 31f99d74c300a83173b794b8ef4551730e51cf62 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 8 Nov 2020 14:46:23 +0000
Subject: [PATCH 0713/3183] change logic in sendDeviceUpdate

---
 lib/ewelink-platform.js | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/lib/ewelink-platform.js b/lib/ewelink-platform.js
index 94d73fdc..703ef140 100644
--- a/lib/ewelink-platform.js
+++ b/lib/ewelink-platform.js
@@ -56,7 +56,6 @@ module.exports = class eWeLinkPlatform {
     this.config.nameOverride = this.nameOverrideTmp
     this.config.ipOverride = this.ipOverrideTmp
     this.wsRefreshFlag = true
-    this.updateInProgress = false
     this.eveLogPath = this.api.user.storagePath() + '/persist/'
     this.api
       .on('didFinishLaunching', () => this.eWeLinkSetup())
@@ -573,15 +572,11 @@ module.exports = class eWeLinkPlatform {
     }
   }
 
-  async sendDeviceUpdate (accessory, params) {
-    // *** generates a random number in the range [10, 100] *** \\
-    await helpers.sleep(Math.floor(Math.random() * 91 + 10))
-    if (this.updateInProgress) {
-      await helpers.sleep(400)
-      return await this.sendDeviceUpdate(accessory, params)
+  async sendDeviceUpdate (accessory, params, doAwait = true) {
+    if (doAwait) {
+      // *** generates a random number in the range [10, 1000] *** \\
+      await helpers.sleep(Math.floor(Math.random() * (991) + 10))
     }
-    this.updateInProgress = true
-    setTimeout(() => (this.updateInProgress = false), 350)
     const payload = {
       apikey: accessory.context.eweApiKey,
       deviceid: accessory.context.eweDeviceId,

From 7fc82439d61aa207b2e29dfc40829ba47589a54f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 8 Nov 2020 14:46:40 +0000
Subject: [PATCH 0714/3183] skip await time for blinds

---
 lib/device/blind.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/device/blind.js b/lib/device/blind.js
index d0191a2f..278323ae 100644
--- a/lib/device/blind.js
+++ b/lib/device/blind.js
@@ -43,7 +43,7 @@ module.exports = class deviceBlind {
       this.accessory.context.updateKey = updateKey
       const percentStepPerDecisecond = blindConfig.operationTime / 100
       if (prevState !== 2) {
-        await this.platform.sendDeviceUpdate(this.accessory, params)
+        await this.platform.sendDeviceUpdate(this.accessory, params, false)
         let positionPercentChange = Math.floor(Date.now() / 100) - this.accessory.context.cacheLastStartTime
         positionPercentChange = Math.floor(percentStepPerDecisecond * positionPercentChange)
         if (prevState === 0) {
@@ -59,7 +59,7 @@ module.exports = class deviceBlind {
       const decisecondsToMove = Math.round(Math.abs(diffPosition) * percentStepPerDecisecond)
       params.switches[0].switch = setToMoveUp ? 'on' : 'off'
       params.switches[1].switch = setToMoveUp ? 'off' : 'on'
-      await this.platform.sendDeviceUpdate(this.accessory, params)
+      await this.platform.sendDeviceUpdate(this.accessory, params, false)
       this.accessory.context.cacheTargetPosition = newTarget
       this.accessory.context.cachePositionState = setToMoveUp ? 1 : 0
       this.accessory.context.cacheLastStartTime = Math.floor(Date.now() / 100)
@@ -68,7 +68,7 @@ module.exports = class deviceBlind {
       if (this.accessory.context.updateKey !== updateKey) return
       params.switches[0].switch = 'off'
       params.switches[1].switch = 'off'
-      await this.platform.sendDeviceUpdate(this.accessory, params)
+      await this.platform.sendDeviceUpdate(this.accessory, params, false)
       wcService.updateCharacteristic(this.Characteristic.PositionState, 2)
       wcService.updateCharacteristic(this.Characteristic.CurrentPosition, newTarget)
       this.accessory.context.cachePositionState = 2

From fc33a99082868735197ab0bb8bb71f9427ee8197 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 8 Nov 2020 14:48:24 +0000
Subject: [PATCH 0715/3183] 3.12.0-3

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 032b820d..09da7301 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.12.0-2",
+  "version": "3.12.0-3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 91ec9975..8f9769e4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.12.0-2",
+  "version": "3.12.0-3",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 671b3e8d6800ee87d7f43cc059717b3f6e9316f4 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 8 Nov 2020 16:16:20 +0000
Subject: [PATCH 0716/3183] switches ongoing fix

---
 lib/device/blind.js        | 6 +++---
 lib/device/switch-multi.js | 2 ++
 lib/ewelink-platform.js    | 6 +-----
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/lib/device/blind.js b/lib/device/blind.js
index 278323ae..d0191a2f 100644
--- a/lib/device/blind.js
+++ b/lib/device/blind.js
@@ -43,7 +43,7 @@ module.exports = class deviceBlind {
       this.accessory.context.updateKey = updateKey
       const percentStepPerDecisecond = blindConfig.operationTime / 100
       if (prevState !== 2) {
-        await this.platform.sendDeviceUpdate(this.accessory, params, false)
+        await this.platform.sendDeviceUpdate(this.accessory, params)
         let positionPercentChange = Math.floor(Date.now() / 100) - this.accessory.context.cacheLastStartTime
         positionPercentChange = Math.floor(percentStepPerDecisecond * positionPercentChange)
         if (prevState === 0) {
@@ -59,7 +59,7 @@ module.exports = class deviceBlind {
       const decisecondsToMove = Math.round(Math.abs(diffPosition) * percentStepPerDecisecond)
       params.switches[0].switch = setToMoveUp ? 'on' : 'off'
       params.switches[1].switch = setToMoveUp ? 'off' : 'on'
-      await this.platform.sendDeviceUpdate(this.accessory, params, false)
+      await this.platform.sendDeviceUpdate(this.accessory, params)
       this.accessory.context.cacheTargetPosition = newTarget
       this.accessory.context.cachePositionState = setToMoveUp ? 1 : 0
       this.accessory.context.cacheLastStartTime = Math.floor(Date.now() / 100)
@@ -68,7 +68,7 @@ module.exports = class deviceBlind {
       if (this.accessory.context.updateKey !== updateKey) return
       params.switches[0].switch = 'off'
       params.switches[1].switch = 'off'
-      await this.platform.sendDeviceUpdate(this.accessory, params, false)
+      await this.platform.sendDeviceUpdate(this.accessory, params)
       wcService.updateCharacteristic(this.Characteristic.PositionState, 2)
       wcService.updateCharacteristic(this.Characteristic.CurrentPosition, newTarget)
       this.accessory.context.cachePositionState = 2
diff --git a/lib/device/switch-multi.js b/lib/device/switch-multi.js
index 52ee75c3..f7d468d8 100644
--- a/lib/device/switch-multi.js
+++ b/lib/device/switch-multi.js
@@ -28,6 +28,7 @@ module.exports = class deviceSwitch {
   }
 
   async internalUpdate (value, callback) {
+    await helpers.sleep(Math.floor(Math.random() * (991) + 10))
     try {
       callback()
       let oAccessory
@@ -43,6 +44,7 @@ module.exports = class deviceSwitch {
           for (let i = 0; i <= 4; i++) {
             if ((oAccessory = this.platform.devicesInHB.get(this.accessory.context.eweDeviceId + 'SW' + i))) {
               oAccessory.getService(this.Service.Switch).updateCharacteristic(this.Characteristic.On, value)
+              oAccessory.context.cacheOn = value
             }
           }
           break
diff --git a/lib/ewelink-platform.js b/lib/ewelink-platform.js
index 703ef140..396cd161 100644
--- a/lib/ewelink-platform.js
+++ b/lib/ewelink-platform.js
@@ -572,11 +572,7 @@ module.exports = class eWeLinkPlatform {
     }
   }
 
-  async sendDeviceUpdate (accessory, params, doAwait = true) {
-    if (doAwait) {
-      // *** generates a random number in the range [10, 1000] *** \\
-      await helpers.sleep(Math.floor(Math.random() * (991) + 10))
-    }
+  async sendDeviceUpdate (accessory, params) {
     const payload = {
       apikey: accessory.context.eweApiKey,
       deviceid: accessory.context.eweDeviceId,

From 26b7fe5b6be473903e2b67258c34c14f6a69bee4 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 8 Nov 2020 16:18:43 +0000
Subject: [PATCH 0717/3183] 3.12.0-4

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 09da7301..7c7f7789 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.12.0-3",
+  "version": "3.12.0-4",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 8f9769e4..9d1f2d22 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.12.0-3",
+  "version": "3.12.0-4",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 467355868438d34c39b07a0d407fe83da83c673f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 8 Nov 2020 17:55:48 +0000
Subject: [PATCH 0718/3183] await inside try

---
 lib/device/switch-multi.js  | 2 +-
 lib/device/switch-single.js | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/device/switch-multi.js b/lib/device/switch-multi.js
index f7d468d8..30446c7e 100644
--- a/lib/device/switch-multi.js
+++ b/lib/device/switch-multi.js
@@ -28,8 +28,8 @@ module.exports = class deviceSwitch {
   }
 
   async internalUpdate (value, callback) {
-    await helpers.sleep(Math.floor(Math.random() * (991) + 10))
     try {
+      await helpers.sleep(Math.floor(Math.random() * (991) + 10))
       callback()
       let oAccessory
       let masterState = 'off'
diff --git a/lib/device/switch-single.js b/lib/device/switch-single.js
index ba9ab10e..061e19e6 100644
--- a/lib/device/switch-single.js
+++ b/lib/device/switch-single.js
@@ -29,6 +29,7 @@ module.exports = class deviceSwitchSingle {
 
   async internalUpdate (value, callback) {
     try {
+      await helpers.sleep(Math.floor(Math.random() * (991) + 10))
       callback()
       const params = { switch: value ? 'on' : 'off' }
       await this.platform.sendDeviceUpdate(this.accessory, params)

From 98f30d37cf0f9089e9e62dcb40a777a8b37b4722 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 8 Nov 2020 18:32:41 +0000
Subject: [PATCH 0719/3183] 3.12.0-5

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 7c7f7789..bcc20dd9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.12.0-4",
+  "version": "3.12.0-5",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 9d1f2d22..ea7eb8be 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.12.0-4",
+  "version": "3.12.0-5",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From e0568a852e2b04342ab8ec7e3e12cfe9107a28d2 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 8 Nov 2020 20:48:34 +0000
Subject: [PATCH 0720/3183] ignore info folder

---
 .gitignore | 1 +
 .npmignore | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index 45fb205e..3f1189f6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,5 @@
 .nova
 .github
 .npm
+info/
 node_modules/
\ No newline at end of file
diff --git a/.npmignore b/.npmignore
index 45fb205e..3f1189f6 100644
--- a/.npmignore
+++ b/.npmignore
@@ -2,4 +2,5 @@
 .nova
 .github
 .npm
+info/
 node_modules/
\ No newline at end of file

From 7962a6874d6b2001109c203417e735ba6a807f13 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 8 Nov 2020 21:04:09 +0000
Subject: [PATCH 0721/3183] Update .gitignore

---
 .gitignore | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 3f1189f6..a5ad5d79 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,5 @@
 .DS_Store
 .nova
-.github
 .npm
 info/
 node_modules/
\ No newline at end of file

From 92825354c4d4038e1180d7e70936ed32098b329b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 9 Nov 2020 06:47:57 +0000
Subject: [PATCH 0722/3183] Update ewelink-platform.js

---
 lib/ewelink-platform.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ewelink-platform.js b/lib/ewelink-platform.js
index 396cd161..30fb67cd 100644
--- a/lib/ewelink-platform.js
+++ b/lib/ewelink-platform.js
@@ -374,8 +374,8 @@ module.exports = class eWeLinkPlatform {
           }
           oAccessory.context.reachableWAN = device.online
           oAccessory.context.reachableLAN = this.lanDevices.get(device.deviceid).online || false
-          this.devicesInHB.set(oAccessory.context.hbDeviceId, oAccessory)
           oAccessory.control = new deviceSwitchMulti(this, oAccessory)
+          this.devicesInHB.set(oAccessory.context.hbDeviceId, oAccessory)
         }
         /**********************/
       } else if (helpers.devicesRFBridge.includes(device.extra.uiid)) {

From effe4f9ead38821b3a12b5ed53d6abcffdd441fa Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 9 Nov 2020 08:38:06 +0000
Subject: [PATCH 0723/3183] no brackets needed

---
 lib/device/switch-multi.js  | 2 +-
 lib/device/switch-single.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/device/switch-multi.js b/lib/device/switch-multi.js
index 30446c7e..a9a8d36f 100644
--- a/lib/device/switch-multi.js
+++ b/lib/device/switch-multi.js
@@ -29,7 +29,7 @@ module.exports = class deviceSwitch {
 
   async internalUpdate (value, callback) {
     try {
-      await helpers.sleep(Math.floor(Math.random() * (991) + 10))
+      await helpers.sleep(Math.floor(Math.random() * 991 + 10))
       callback()
       let oAccessory
       let masterState = 'off'
diff --git a/lib/device/switch-single.js b/lib/device/switch-single.js
index 061e19e6..28b7aaab 100644
--- a/lib/device/switch-single.js
+++ b/lib/device/switch-single.js
@@ -29,7 +29,7 @@ module.exports = class deviceSwitchSingle {
 
   async internalUpdate (value, callback) {
     try {
-      await helpers.sleep(Math.floor(Math.random() * (991) + 10))
+      await helpers.sleep(Math.floor(Math.random() * 991 + 10))
       callback()
       const params = { switch: value ? 'on' : 'off' }
       await this.platform.sendDeviceUpdate(this.accessory, params)

From 4218fa748ff1d6dc1981514e0aa3545f976cf686 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Mon, 9 Nov 2020 08:43:15 +0000
Subject: [PATCH 0724/3183] Update README.md

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 941872f3..465daba4 100644
--- a/README.md
+++ b/README.md
@@ -36,6 +36,7 @@ To use this plugin, you will need to already have [Homebridge](https://homebridg
 * [How to copy Homebridge logs](https://github.com/bwp91/homebridge-ewelink/wiki/How-to-copy-Homebridge-logs)
 * [How to enable/disable plugin extended logging](https://github.com/bwp91/homebridge-ewelink/wiki/How-to-enable-disable-plugin-extended-logging)
 * [How to remove an accessory from the cache](https://github.com/bwp91/homebridge-ewelink/wiki/How-to-remove-an-accessory-from-the-cache)
+* [How to update node](https://github.com/bwp91/homebridge-ewelink/wiki/How-to-update-node)
 ### About
 * [About Me](https://github.com/sponsors/bwp91)
 * [Support Request](https://github.com/bwp91/homebridge-ewelink/issues/new/choose)

From 1e92b651e02cd4d1f8e85344ee836a0649669eaa Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 9 Nov 2020 09:24:53 +0000
Subject: [PATCH 0725/3183] add local wiki links

---
 config.schema.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 608c3a36..916ba357 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -118,7 +118,7 @@
       "groups": {
         "type": "array",
         "title": "Accessory Simulations",
-        "description": "You can use this setting to set up custom simulated HomeKit accessories from a generic single/multi-switch device. For more information please see the wiki.",
+        "description": "You can use this setting to set up custom simulated HomeKit accessories from a generic single/multi-switch device. Please see <a href=\"https://github.com/bwp91/homebridge-ewelink/wiki/Accessory-Simulations\" target=\"_blank\">this wiki article</a> for more information.",
         "items": {
           "type": "object",
           "properties": {
@@ -226,7 +226,7 @@
       "bridgeSensors": {
         "type": "array",
         "title": "Sensors",
-        "description": "You can expose different types of sensors connected to your RF Bridge in HomeKit.",
+        "description": "You can expose different types of sensors connected to your RF Bridge in HomeKit. Please see <a href=\"https://github.com/bwp91/homebridge-ewelink/wiki/How-to-set-up-RF-Bridge-sensors\" target=\"_blank\">this wiki article</a> for more information.",
         "items": {
           "type": "object",
           "properties": {

From f3a3fa7f1279ef0c2616a63d52501cbb03ca1010 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 9 Nov 2020 09:26:42 +0000
Subject: [PATCH 0726/3183] add header logo, remove footer

---
 config.schema.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 916ba357..722655c7 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -2,8 +2,7 @@
   "pluginAlias": "eWeLink",
   "pluginType": "platform",
   "singular": true,
-  "headerDisplay": "Homebridge/HOOBS plugin to control eWeLink devices with original firmware.",
-  "footerDisplay": "For help and support please visit our [GitHub Wiki](https://github.com/bwp91/homebridge-ewelink/wiki).",
+  "headerDisplay": "<p align=\"center\"><img width=\"75%\" src=\"https://user-images.githubusercontent.com/43026681/90361629-9af86200-e056-11ea-8553-4e4e5c4b5a54.png\"></p><p align=\"center\">For help and support please visit our <a href=\"https://github.com/bwp91/homebridge-ewelink/wiki\">GitHub Wiki</a>. We hope you find this plugin useful!</p>",
   "schema": {
     "type": "object",
     "properties": {

From 5ef84cbc9bccbbca091a4604b46107a10985c649 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 9 Nov 2020 10:43:47 +0000
Subject: [PATCH 0727/3183] enable support for B02-F

---
 lib/helpers.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/helpers.js b/lib/helpers.js
index 8bfa21c7..65ee950a 100644
--- a/lib/helpers.js
+++ b/lib/helpers.js
@@ -20,7 +20,7 @@ module.exports = {
   devicesSingleSwitchOutlet: ['Sonoff Pow', 'S20', 'S26', 'S55'],
   devicesBrightable: [36, 44],
   devicesColourable: [22, 59, 104],
-  devicesCTempable: [],
+  devicesCTempable: [103],
   devicesCurtain: [11],
   devicesSensor: [102],
   devicesThermostat: [15],
@@ -45,7 +45,8 @@ module.exports = {
     'online', 'power', 'rfChl', 'rfList',
     'rfTrig', 'sensorType', 'setclose', 'state',
     'switch', 'switches', 'temperature',
-    'trigTime', 'type', 'voltage', 'zyx_mode'
+    'trigTime', 'type', 'voltage', 'ltype',
+    'zyx_mode'
   ],
   defaultMultiSwitchOff: [
     {
@@ -182,7 +183,7 @@ module.exports = {
     94: 0, // "YIAN_ELECTRIC_PROTECT"                  \\
     98: 0, // "DOORBELL_RFBRIDGE"                      \\
     102: 1, // "DOOR_MAGNETIC"                         \\ OPL-DMA, DW2
-    103: 0, // "WOTEWODE_TEM_LIGHT"                    \\
+    103: 1, // "WOTEWODE_TEM_LIGHT"                    \\ B02-F
     104: 1, // "WOTEWODE_RGB_TEM_LIGHT"                \\
     107: 0, // "GSM_SOCKET_NO_FLOW"                    \\
     109: 0, // "YK_INFRARED_2"                         \\

From 2cb40d69e9d2ff3640ab5634ead947c60e47600f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 9 Nov 2020 12:15:23 +0000
Subject: [PATCH 0728/3183] colourTemp support for B02-F

---
 lib/device/light-colour.js |  8 +++-
 lib/device/light-ctemp.js  | 89 +++++++++++++++++++++++++++++++++++++-
 lib/helpers.js             |  4 +-
 3 files changed, 95 insertions(+), 6 deletions(-)

diff --git a/lib/device/light-colour.js b/lib/device/light-colour.js
index 4d9581c6..fba478c3 100644
--- a/lib/device/light-colour.js
+++ b/lib/device/light-colour.js
@@ -34,12 +34,12 @@ module.exports = class deviceLightColour {
 
   async internalUpdate (type, value, callback) {
     try {
-      callback()
       let newRGB
       let params = {}
       const lightService = this.accessory.getService(this.Service.Lightbulb)
       switch (type) {
         case 'onoff':
+          callback()
           if (this.accessory.context.eweUIID === 22) {
           // **** B1 uses state rather than switch *** \\
             params.state = value ? 'on' : 'off'
@@ -49,6 +49,8 @@ module.exports = class deviceLightColour {
           await this.platform.sendDeviceUpdate(this.accessory, params)
           break
         case 'brightness': {
+          await helpers.sleep(1000)
+          callback()
           const updateKeyBright = Math.random().toString(36).substr(2, 8)
           this.accessory.context.updateKeyBright = updateKeyBright
           switch (this.accessory.context.eweUIID) {
@@ -81,6 +83,8 @@ module.exports = class deviceLightColour {
           break
         }
         case 'hue': {
+          await helpers.sleep(2000)
+          callback()
           const updateKeyColour = Math.random().toString(36).substr(2, 8)
           this.accessory.context.updateKeyColour = updateKeyColour
           newRGB = convert.hsv.rgb(value, lightService.getCharacteristic(this.Characteristic.Saturation).value, 100)
@@ -135,6 +139,7 @@ module.exports = class deviceLightColour {
 
   async externalUpdate (params) {
     try {
+      if (helpers.hasProperty(params, 'updateSource') && params.updateSource === 'LAN') return
       let newColour
       let mode
       let isOn = false
@@ -184,7 +189,6 @@ module.exports = class deviceLightColour {
             break
           case 104:
             // *** GTLC104 *** \\
-            if (helpers.hasProperty(params, 'updateSource') && params.updateSource === 'LAN') return
             if (helpers.hasProperty(params, 'ltype')) {
               mode = params.ltype
               if (mode === 'color' && helpers.hasProperty(params, 'color')) {
diff --git a/lib/device/light-ctemp.js b/lib/device/light-ctemp.js
index 2874f653..317e5d91 100644
--- a/lib/device/light-ctemp.js
+++ b/lib/device/light-ctemp.js
@@ -1,7 +1,8 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
-module.exports = class deviceLightCTemp {
+const helpers = require('./../helpers')
+module.exports = class deviceLightColour {
   constructor (platform, accessory) {
     this.platform = platform
     this.Service = platform.api.hap.Service
@@ -13,12 +14,65 @@ module.exports = class deviceLightCTemp {
     lightService
       .getCharacteristic(this.Characteristic.Brightness)
       .on('set', (value, callback) => this.internalUpdate('brightness', value, callback))
+    lightService
+      .getCharacteristic(this.Characteristic.ColorTemperature)
+      .on('set', (value, callback) => this.internalUpdate('colour', value, callback))
     this.accessory = accessory
   }
 
   async internalUpdate (type, value, callback) {
     try {
-      callback()
+      let params = {}
+      const lightService = this.accessory.getService(this.Service.Lightbulb)
+      switch (type) {
+        case 'onoff':
+          callback()
+          params.switch = value ? 'on' : 'off'
+          await this.platform.sendDeviceUpdate(this.accessory, params)
+          break
+        case 'brightness': {
+          await helpers.sleep(1000)
+          callback()
+          const updateKeyBright = Math.random().toString(36).substr(2, 8)
+          this.accessory.context.updateKeyBright = updateKeyBright
+          // *** Device needs the current ct value sent too *** \\
+          params = {
+            ltype: 'white',
+            white: {
+              br: value,
+              ct: this.accessory.context.cacheCT
+            }
+          }
+          await helpers.sleep(500)
+          if (updateKeyBright !== this.accessory.context.updateKeyBright) return
+          await this.platform.sendDeviceUpdate(this.accessory, params)
+          break
+        }
+        case 'colour': {
+          await helpers.sleep(2000)
+          callback()
+          const updateKeyColour = Math.random().toString(36).substr(2, 8)
+          this.accessory.context.updateKeyColour = updateKeyColour
+          // HomeKit has a ct range of 140-500 corresponding to 2000-7143K
+          // B02-F-A60 has a range of 2200K-6500K corresponding to ct: 0-255
+          let mToK = Math.round(1000000 / value)
+          if (mToK < 2200) mToK = 2200
+          if (mToK > 6500) mToK = 6500
+          const kToCT = Math.round(((mToK - 2200) / 4300) * 255)
+          params = {
+            ltype: 'white',
+            white: {
+              ct: kToCT,
+              br: lightService.getCharacteristic(this.Characteristic.Brightness).value
+            }
+          }
+          this.accessory.context.cacheCT = kToCT
+          await helpers.sleep(1000)
+          if (updateKeyColour !== this.accessory.context.updateKeyColour) return
+          await this.platform.sendDeviceUpdate(this.accessory, params)
+          break
+        }
+      }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
     }
@@ -26,7 +80,38 @@ module.exports = class deviceLightCTemp {
 
   async externalUpdate (params) {
     try {
+      if (helpers.hasProperty(params, 'updateSource') && params.updateSource === 'LAN') return
+      let mode
+      let isOn = false
+      const lightService = this.accessory.getService(this.Service.Lightbulb)
+      if (helpers.hasProperty(params, 'switch')) {
+        isOn = params.switch === 'on'
+      } else {
+        isOn = lightService.getCharacteristic(this.Characteristic.On).value
+      }
+      if (isOn) {
+        lightService.updateCharacteristic(this.Characteristic.On, true)
+        if (helpers.hasProperty(params, 'ltype')) {
+          mode = params.ltype
+          if (mode === 'white' && helpers.hasProperty(params, 'white')) {
+            if (helpers.hasProperty(params.white, 'br')) {
+              lightService.updateCharacteristic(this.Characteristic.Brightness, params.white.br)
+            }
+            if (helpers.hasProperty(params.white, 'ct')) {
+              // B02-F-A60 has a range of 2200K-6500K corresponding to ct: 0-255
+              // HomeKit has a ct range of 140-500 corresponding to 2000-7143K
+
+              const ctToK = Math.round(params.white.ct / 255 * 4300 + 2200)
+              const kToMired = Math.round(1000000 / ctToK)
 
+              lightService.updateCharacteristic(this.Characteristic.ColorTemperature, kToMired)
+              this.accessory.context.cacheCT = params.white.ct
+            }
+          }
+        }
+      } else {
+        lightService.updateCharacteristic(this.Characteristic.On, false)
+      }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
diff --git a/lib/helpers.js b/lib/helpers.js
index 65ee950a..ced67c70 100644
--- a/lib/helpers.js
+++ b/lib/helpers.js
@@ -14,7 +14,7 @@ module.exports = {
     sensorTimeLength: 60,
     sensorTimeDifference: 120
   },
-  devicesNonLAN: [22, 28, 34, 59, 102, 104],
+  devicesNonLAN: [22, 28, 34, 59, 102, 103, 104],
   devicesSingleSwitch: [1, 5, 6, 14, 15, 22, 24, 27, 32, 36, 44, 59, 104],
   devicesMultiSwitch: [2, 3, 4, 7, 8, 9, 29, 30, 31, 34, 41],
   devicesSingleSwitchOutlet: ['Sonoff Pow', 'S20', 'S26', 'S55'],
@@ -45,7 +45,7 @@ module.exports = {
     'online', 'power', 'rfChl', 'rfList',
     'rfTrig', 'sensorType', 'setclose', 'state',
     'switch', 'switches', 'temperature',
-    'trigTime', 'type', 'voltage', 'ltype',
+    'trigTime', 'type', 'voltage', 'white',
     'zyx_mode'
   ],
   defaultMultiSwitchOff: [

From b08c3c0fcd5d89b539d615e76c01d26332b097b8 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 9 Nov 2020 15:31:07 +0000
Subject: [PATCH 0729/3183] add switch first

---
 lib/device/thermostat.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/device/thermostat.js b/lib/device/thermostat.js
index f1c4c085..8cd4a93a 100644
--- a/lib/device/thermostat.js
+++ b/lib/device/thermostat.js
@@ -9,16 +9,16 @@ module.exports = class deviceThermostat {
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
     this.EveHistoryService = fakegato(platform.api)
-    if (!accessory.getService(this.Service.TemperatureSensor)) accessory.addService(this.Service.TemperatureSensor)
-    if (accessory.context.sensorType !== 'DS18B20') {
-      if (!accessory.getService(this.Service.HumiditySensor)) accessory.addService(this.Service.HumiditySensor)
-    }
     if (!this.platform.config.hideTHSwitch) {
       const switchService = accessory.getService(this.Service.Switch) || accessory.addService(this.Service.Switch)
       switchService
         .getCharacteristic(this.Characteristic.On)
         .on('set', (value, callback) => this.internalUpdate(value, callback))
     }
+    if (!accessory.getService(this.Service.TemperatureSensor)) accessory.addService(this.Service.TemperatureSensor)
+    if (accessory.context.sensorType !== 'DS18B20') {
+      if (!accessory.getService(this.Service.HumiditySensor)) accessory.addService(this.Service.HumiditySensor)
+    }
     accessory.log = this.platform.log
     accessory.eveLogger = new this.EveHistoryService('custom', accessory, {
       storage: 'fs',

From 32af34499a9a229d3138083d87c6f7f6248e4cbe Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 9 Nov 2020 15:34:40 +0000
Subject: [PATCH 0730/3183] remove switch of config hidden

---
 lib/device/thermostat.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/device/thermostat.js b/lib/device/thermostat.js
index 8cd4a93a..0f0658e4 100644
--- a/lib/device/thermostat.js
+++ b/lib/device/thermostat.js
@@ -9,7 +9,11 @@ module.exports = class deviceThermostat {
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
     this.EveHistoryService = fakegato(platform.api)
-    if (!this.platform.config.hideTHSwitch) {
+    if (this.platform.config.hideTHSwitch) {
+      if (accessory.getService(this.Service.Switch)) {
+        accessory.removeService(accessory.getService(this.Service.Switch))
+      }
+    } else {
       const switchService = accessory.getService(this.Service.Switch) || accessory.addService(this.Service.Switch)
       switchService
         .getCharacteristic(this.Characteristic.On)

From 6ee04c6f0c3299d85a91a8f1275c83eec8ed5969 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 9 Nov 2020 15:45:15 +0000
Subject: [PATCH 0731/3183] 3.12.0-6

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index bcc20dd9..b6c5d5f4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.12.0-5",
+  "version": "3.12.0-6",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index ea7eb8be..2afad660 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.12.0-5",
+  "version": "3.12.0-6",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From ea1bc7ed84397076fed41eaad1c36e289a963773 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 9 Nov 2020 19:56:01 +0000
Subject: [PATCH 0732/3183] Update switch-multi.js

---
 lib/device/switch-multi.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/device/switch-multi.js b/lib/device/switch-multi.js
index a9a8d36f..20f9a9f2 100644
--- a/lib/device/switch-multi.js
+++ b/lib/device/switch-multi.js
@@ -3,7 +3,7 @@
 'use strict'
 const fakegato = require('./../fakegato/fakegato-history')
 const helpers = require('./../helpers')
-module.exports = class deviceSwitch {
+module.exports = class deviceSwitchMulti {
   constructor (platform, accessory) {
     this.platform = platform
     this.Service = platform.api.hap.Service

From 7a06c0dfec210eeb2eb98704d55fa008b666dc8b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 11 Nov 2020 13:54:10 +0000
Subject: [PATCH 0733/3183] reduce delay

---
 lib/device/switch-multi.js  | 2 +-
 lib/device/switch-single.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/device/switch-multi.js b/lib/device/switch-multi.js
index 20f9a9f2..2b5df947 100644
--- a/lib/device/switch-multi.js
+++ b/lib/device/switch-multi.js
@@ -29,7 +29,7 @@ module.exports = class deviceSwitchMulti {
 
   async internalUpdate (value, callback) {
     try {
-      await helpers.sleep(Math.floor(Math.random() * 991 + 10))
+      await helpers.sleep(Math.floor(Math.random() * 491 + 10))
       callback()
       let oAccessory
       let masterState = 'off'
diff --git a/lib/device/switch-single.js b/lib/device/switch-single.js
index 28b7aaab..4fdcb5e2 100644
--- a/lib/device/switch-single.js
+++ b/lib/device/switch-single.js
@@ -29,7 +29,7 @@ module.exports = class deviceSwitchSingle {
 
   async internalUpdate (value, callback) {
     try {
-      await helpers.sleep(Math.floor(Math.random() * 991 + 10))
+      await helpers.sleep(Math.floor(Math.random() * 491 + 10))
       callback()
       const params = { switch: value ? 'on' : 'off' }
       await this.platform.sendDeviceUpdate(this.accessory, params)

From d34f88009bc6ff2863d2d39bdcca8f4bfca8e022 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 11 Nov 2020 14:03:14 +0000
Subject: [PATCH 0734/3183] 3.12.0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b6c5d5f4..1afcf81a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.12.0-6",
+  "version": "3.12.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 2afad660..73fe3a48 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.12.0-6",
+  "version": "3.12.0",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From b349722bce94dadfb9870af3a91ba5df7e6a73b7 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 11 Nov 2020 21:49:59 +0000
Subject: [PATCH 0735/3183] increase range slightly

---
 lib/device/switch-multi.js  | 2 +-
 lib/device/switch-single.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/device/switch-multi.js b/lib/device/switch-multi.js
index 2b5df947..19b71595 100644
--- a/lib/device/switch-multi.js
+++ b/lib/device/switch-multi.js
@@ -29,7 +29,7 @@ module.exports = class deviceSwitchMulti {
 
   async internalUpdate (value, callback) {
     try {
-      await helpers.sleep(Math.floor(Math.random() * 491 + 10))
+      await helpers.sleep(Math.floor(Math.random() * 741 + 10))
       callback()
       let oAccessory
       let masterState = 'off'
diff --git a/lib/device/switch-single.js b/lib/device/switch-single.js
index 4fdcb5e2..b1902f91 100644
--- a/lib/device/switch-single.js
+++ b/lib/device/switch-single.js
@@ -29,7 +29,7 @@ module.exports = class deviceSwitchSingle {
 
   async internalUpdate (value, callback) {
     try {
-      await helpers.sleep(Math.floor(Math.random() * 491 + 10))
+      await helpers.sleep(Math.floor(Math.random() * 741 + 10))
       callback()
       const params = { switch: value ? 'on' : 'off' }
       await this.platform.sendDeviceUpdate(this.accessory, params)

From f7bd0d736a0fccc23a8f0ad4b51174372dfe8be8 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 11 Nov 2020 22:02:18 +0000
Subject: [PATCH 0736/3183] S55R1 to outlet list

---
 lib/helpers.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/helpers.js b/lib/helpers.js
index ced67c70..cb2a0fc2 100644
--- a/lib/helpers.js
+++ b/lib/helpers.js
@@ -17,7 +17,7 @@ module.exports = {
   devicesNonLAN: [22, 28, 34, 59, 102, 103, 104],
   devicesSingleSwitch: [1, 5, 6, 14, 15, 22, 24, 27, 32, 36, 44, 59, 104],
   devicesMultiSwitch: [2, 3, 4, 7, 8, 9, 29, 30, 31, 34, 41],
-  devicesSingleSwitchOutlet: ['Sonoff Pow', 'S20', 'S26', 'S55'],
+  devicesSingleSwitchOutlet: ['Sonoff Pow', 'S20', 'S26', 'S55', 'S55R1'],
   devicesBrightable: [36, 44],
   devicesColourable: [22, 59, 104],
   devicesCTempable: [103],

From 37933dca1af06135a5722e24f10965e092e20bfb Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 11 Nov 2020 22:04:16 +0000
Subject: [PATCH 0737/3183] 3.12.1-0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 1afcf81a..76daf946 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.12.0",
+  "version": "3.12.1-0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 73fe3a48..dcd0223d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.12.0",
+  "version": "3.12.1-0",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From b2a1e0b4b27f822979ea1a15f9a0b77c3f61c68e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 12 Nov 2020 08:53:09 +0000
Subject: [PATCH 0738/3183] hide TH switch per device basis

---
 config.schema.json       | 13 ++++++-------
 lib/device/thermostat.js |  4 ++--
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 722655c7..b829f930 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -78,13 +78,12 @@
       "hideLightFromFan": {
         "type": "string",
         "title": "Hide Fan Lights",
-        "description": "A list of eWeLink iFan devices for which the light will be hidden from Homebridge. For example '10009553c8' or multiple separated with a comma '10009553c8,10009553c9'"
+        "description": "A list of eWeLink iFan devices for which the light will be hidden from Homebridge. For example '10009553c8' or multiple separated with a comma '10009553c8,10009553c9'."
       },
-      "hideTHSwitch": {
-        "title": "Hide TH10/TH16 Switch",
-        "type": "boolean",
-        "description": "If checked, the switch for the TH10/TH16 devices will be hidden from Homebridge.",
-        "default": false
+      "hideSwitchFromTH": {
+        "type": "string",
+        "title": "Hide Fan Lights",
+        "description": "A list of TH10/TH16 devices for which the switch will be hidden from Homebridge. For example '10009553c8' or multiple separated with a comma '10009553c8,10009553c9'."
       },
       "lowBattThreshold": {
         "type": "integer",
@@ -375,7 +374,7 @@
         "outletAsSwitch",
         "inUsePowerThreshold",
         "hideLightFromFan",
-        "hideTHSwitch",
+        "hideSwitchFromTH",
         "lowBattThreshold",
         "sensorTimeDifference",
         "hideZBLDPress",
diff --git a/lib/device/thermostat.js b/lib/device/thermostat.js
index 0f0658e4..9400a497 100644
--- a/lib/device/thermostat.js
+++ b/lib/device/thermostat.js
@@ -9,7 +9,7 @@ module.exports = class deviceThermostat {
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
     this.EveHistoryService = fakegato(platform.api)
-    if (this.platform.config.hideTHSwitch) {
+    if ((this.platform.config.hideSwitchFromTH || '').includes(accessory.context.eweDeviceId)) {
       if (accessory.getService(this.Service.Switch)) {
         accessory.removeService(accessory.getService(this.Service.Switch))
       }
@@ -47,7 +47,7 @@ module.exports = class deviceThermostat {
   async externalUpdate (params) {
     try {
       if (
-        !this.platform.config.hideTHSwitch &&
+        !(this.platform.config.hideSwitchFromTH || '').includes(this.accessory.context.eweDeviceId) &&
         (helpers.hasProperty(params, 'switch') || helpers.hasProperty(params, 'mainSwitch'))
       ) {
         const newState = helpers.hasProperty(params, 'switch') ? params.switch === 'on' : params.mainSwitch === 'on'

From 5d7d294d49a0fb2704a808e2bef6683de0a99301 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 12 Nov 2020 15:07:42 +0000
Subject: [PATCH 0739/3183] config rf bridge per device

---
 config.schema.json      | 15 +++++++--------
 lib/ewelink-platform.js |  2 +-
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index b829f930..0161e91e 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -85,6 +85,11 @@
         "title": "Hide Fan Lights",
         "description": "A list of TH10/TH16 devices for which the switch will be hidden from Homebridge. For example '10009553c8' or multiple separated with a comma '10009553c8,10009553c9'."
       },
+      "resetRFBridge": {
+        "title": "Reset RF Bridges",
+        "type": "string",
+        "description": "If checked, the plugin will remove and re-add these RF Bridges on Homebridge restart. This is needed when adding/removed sub-devices from the RF Bridge. For example '10009553c8' or multiple separated with a comma '10009553c8,10009553c9'."
+      },
       "lowBattThreshold": {
         "type": "integer",
         "title": "Low Battery Threshold",
@@ -107,12 +112,6 @@
         "description": "If checked, double and long press options will be hidden for the ZigBee button.",
         "default": false
       },
-      "resetRFBridge": {
-        "title": "Reset RF Bridges",
-        "type": "boolean",
-        "description": "If checked, the plugin will remove and re-add all RF Bridges on Homebridge restart. This is needed when adding/removed sub-devices from the RF Bridge.",
-        "default": false
-      },
       "groups": {
         "type": "array",
         "title": "Accessory Simulations",
@@ -375,10 +374,10 @@
         "inUsePowerThreshold",
         "hideLightFromFan",
         "hideSwitchFromTH",
+        "resetRFBridge",
         "lowBattThreshold",
         "sensorTimeDifference",
-        "hideZBLDPress",
-        "resetRFBridge"
+        "hideZBLDPress"
       ]
     },
     {
diff --git a/lib/ewelink-platform.js b/lib/ewelink-platform.js
index 30fb67cd..c7a73a01 100644
--- a/lib/ewelink-platform.js
+++ b/lib/ewelink-platform.js
@@ -425,7 +425,7 @@ module.exports = class eWeLinkPlatform {
           }
           if ((oAccessory = this.devicesInHB.get(device.deviceid + 'SW' + swNumber))) {
             if (
-              this.config.resetRFBridge ||
+              (this.config.resetRFBridge || '').includes(device.deviceid) ||
               oAccessory.context.subType !== subType ||
               oAccessory.context.sensorTimeLength !== sensorTimeLength ||
               oAccessory.context.swNumber !== swNumber

From c346f8a09c5ef88d9be988cc8f62a9865b9e5756 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Thu, 12 Nov 2020 19:57:58 +0000
Subject: [PATCH 0740/3183] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 465daba4..d2c3dd64 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 <p align="center">
-   <a href="https://github.com/bwp91/homebridge-ewelink"><img alt="Homebridge Verified" src="https://user-images.githubusercontent.com/43026681/90361629-9af86200-e056-11ea-8553-4e4e5c4b5a54.png" width="600px"></a>
+   <a href="https://github.com/bwp91/homebridge-ewelink"><img alt="Homebridge Verified" src="https://user-images.githubusercontent.com/43026681/98988978-5e86b600-2520-11eb-875b-0703f4575e97.png" width="600px"></a>
 </p>
 <span align="center">
   

From 8bf5fb68f69019770a52ab5c9c3124cfd9946aa3 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 12 Nov 2020 20:01:19 +0000
Subject: [PATCH 0741/3183] reduce image size

---
 config.schema.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config.schema.json b/config.schema.json
index 0161e91e..77bebb1f 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -2,7 +2,7 @@
   "pluginAlias": "eWeLink",
   "pluginType": "platform",
   "singular": true,
-  "headerDisplay": "<p align=\"center\"><img width=\"75%\" src=\"https://user-images.githubusercontent.com/43026681/90361629-9af86200-e056-11ea-8553-4e4e5c4b5a54.png\"></p><p align=\"center\">For help and support please visit our <a href=\"https://github.com/bwp91/homebridge-ewelink/wiki\">GitHub Wiki</a>. We hope you find this plugin useful!</p>",
+  "headerDisplay": "<p align=\"center\"><img width=\"75%\" src=\"https://user-images.githubusercontent.com/43026681/98988978-5e86b600-2520-11eb-875b-0703f4575e97.png\"></p><p align=\"center\">For help and support please visit our <a href=\"https://github.com/bwp91/homebridge-ewelink/wiki\">GitHub Wiki</a>. We hope you find this plugin useful!</p>",
   "schema": {
     "type": "object",
     "properties": {

From 1d5f90f4a7dd02d674f7ce487c6f1a09995ff049 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 13 Nov 2020 13:32:53 +0000
Subject: [PATCH 0742/3183] capitalisation

---
 lib/ewelink-platform.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ewelink-platform.js b/lib/ewelink-platform.js
index c7a73a01..81270cf1 100644
--- a/lib/ewelink-platform.js
+++ b/lib/ewelink-platform.js
@@ -650,7 +650,7 @@ module.exports = class eWeLinkPlatform {
         this.initialiseDevice(newDevice)
         this.lanClient.addDeviceToMap(newDevice)
       } catch (err) {
-        this.log.warn('[%s] Restart Homebridge to add new device, failed to add automatically as %s.', deviceId, err.message)
+        this.log.warn('[%s] restart Homebridge to add new device, failed to add automatically as %s.', deviceId, err.message)
       }
     }
   }

From c3f9c9809e77d237fff04cae5d2e57212a400f2d Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Fri, 13 Nov 2020 13:36:11 +0000
Subject: [PATCH 0743/3183] Update README.md

---
 README.md | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index d2c3dd64..b13d4ae9 100644
--- a/README.md
+++ b/README.md
@@ -18,18 +18,22 @@ Homebridge/HOOBS plugin to control eWeLink devices with original firmware.
 </span>
 
 ### Prerequisites
-To use this plugin, you will need to already have [Homebridge](https://homebridge.io) or [HOOBS](https://hoobs.org) installed. Please refer to the links for more information and installation instructions.
+* To use this plugin, you will need to already have [Homebridge](https://homebridge.io) or [HOOBS](https://hoobs.org) installed. Please refer to the links for more information and installation instructions.
+
+### Plugin Information
 
 ### Setup
 * [Installation (Homebridge)](https://github.com/bwp91/homebridge-ewelink/wiki/Installation-(Homebridge))
 * [Installation (HOOBS)](https://github.com/bwp91/homebridge-ewelink/wiki/Installation-(HOOBS))
 * [Configuration](https://github.com/bwp91/homebridge-ewelink/wiki/Configuration)
 * [Beta Version](https://github.com/bwp91/homebridge-ewelink/wiki/Beta-Version)
+
 ### Features
 * [Supported Devices](https://github.com/bwp91/homebridge-ewelink/wiki/Supported-Devices)
 * [Multi Channel Devices](https://github.com/bwp91/homebridge-ewelink/wiki/Multi-Channel-Devices)
 * [Accessory Simulations](https://github.com/bwp91/homebridge-ewelink/wiki/Accessory-Simulations)
 * [Connection Methods](https://github.com/bwp91/homebridge-ewelink/wiki/Connection-Methods)
+
 ### How-to Guides
 * [How to set up RF Bridge sensors](https://github.com/bwp91/homebridge-ewelink/wiki/How-to-set-up-RF-Bridge-sensors)
 * [How to set up Sonoff Camera (GK-200MP2-B)](https://github.com/bwp91/homebridge-ewelink/wiki/How-to-set-up-Sonoff-Camera)
@@ -37,9 +41,11 @@ To use this plugin, you will need to already have [Homebridge](https://homebridg
 * [How to enable/disable plugin extended logging](https://github.com/bwp91/homebridge-ewelink/wiki/How-to-enable-disable-plugin-extended-logging)
 * [How to remove an accessory from the cache](https://github.com/bwp91/homebridge-ewelink/wiki/How-to-remove-an-accessory-from-the-cache)
 * [How to update node](https://github.com/bwp91/homebridge-ewelink/wiki/How-to-update-node)
+
 ### About
 * [About Me](https://github.com/sponsors/bwp91)
 * [Support Request](https://github.com/bwp91/homebridge-ewelink/issues/new/choose)
 * [Credits](https://github.com/bwp91/homebridge-ewelink/wiki/Credits)
+
 ### Disclaimer
-I am in no way affiliated with eWeLink nor any of the device brands (like Sonoff) and this plugin is a personal project that I maintain in my free time.
+* I am in no way affiliated with eWeLink nor any of the device brands (like Sonoff) and this plugin is a personal project that I maintain in my free time.

From 139d83a185f363e709e52d6e0c1a3534011247b7 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Fri, 13 Nov 2020 13:36:57 +0000
Subject: [PATCH 0744/3183] Update README.md

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index b13d4ae9..9ac72c70 100644
--- a/README.md
+++ b/README.md
@@ -44,6 +44,7 @@ Homebridge/HOOBS plugin to control eWeLink devices with original firmware.
 
 ### About
 * [About Me](https://github.com/sponsors/bwp91)
+* [Changelog](https://github.com/bwp91/homebridge-ewelink/releases)
 * [Support Request](https://github.com/bwp91/homebridge-ewelink/issues/new/choose)
 * [Credits](https://github.com/bwp91/homebridge-ewelink/wiki/Credits)
 

From a8d3cf7483cb79a930811e05e370a57906b053b8 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Fri, 13 Nov 2020 16:12:28 +0000
Subject: [PATCH 0745/3183] Update feature-request.md

---
 .github/ISSUE_TEMPLATE/feature-request.md | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/feature-request.md b/.github/ISSUE_TEMPLATE/feature-request.md
index 5ba9ddfc..0619afdd 100644
--- a/.github/ISSUE_TEMPLATE/feature-request.md
+++ b/.github/ISSUE_TEMPLATE/feature-request.md
@@ -7,14 +7,17 @@ assignees: ''
 
 ---
 
-**Please explain your feature request in one sentence.**
-...
+**Please explain your feature request in a one or two sentences.**
+
+
 
 **Is your feature request related to a problem? Please describe.**
-...
 
-**Any particular Sonoff devices that this relates to?**
-...
+
+
+**Any particular eWeLink devices that this relates to?**
+
+
 
 **Anything else?**
-...
+

From 857ae7deffd33bff6e64e1a39c01b9594d085c4b Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Fri, 13 Nov 2020 16:14:20 +0000
Subject: [PATCH 0746/3183] Update feature-request.md

---
 .github/ISSUE_TEMPLATE/feature-request.md | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/feature-request.md b/.github/ISSUE_TEMPLATE/feature-request.md
index 0619afdd..2726831a 100644
--- a/.github/ISSUE_TEMPLATE/feature-request.md
+++ b/.github/ISSUE_TEMPLATE/feature-request.md
@@ -1,23 +1,24 @@
 ---
 name: Feature Request
-about: I have an idea for the package or have a device that isn't supported.
+about: I have an idea for the package or a device that isn't supported.
 title: ''
 labels: ''
 assignees: ''
 
 ---
 
-**Please explain your feature request in a one or two sentences.**
+* **Please explain your feature request in a one or two sentences.**
 
 
 
-**Is your feature request related to a problem? Please describe.**
+* **Is your feature request related to a problem? Please describe.**
 
 
 
-**Any particular eWeLink devices that this relates to?**
+* **Any particular eWeLink devices that this relates to?**
 
 
 
-**Anything else?**
+* **Anything else?**
+
 

From 6f6bb87d9c83e646d2000738da1122d09b190d9c Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Fri, 13 Nov 2020 16:19:42 +0000
Subject: [PATCH 0747/3183] Update feedback.md

---
 .github/ISSUE_TEMPLATE/feedback.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/feedback.md b/.github/ISSUE_TEMPLATE/feedback.md
index 31941559..26dacc4c 100644
--- a/.github/ISSUE_TEMPLATE/feedback.md
+++ b/.github/ISSUE_TEMPLATE/feedback.md
@@ -1,6 +1,6 @@
 ---
-name: Feedback
-about: Give feedback that I might have asked for.
+name: Information/Feedback
+about: General information request or plugin feedback
 title: ''
 labels: ''
 assignees: ''

From 270c8531933e90b84bf97962714f3efb2481b934 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Fri, 13 Nov 2020 16:24:11 +0000
Subject: [PATCH 0748/3183] Update feedback.md

---
 .github/ISSUE_TEMPLATE/feedback.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/feedback.md b/.github/ISSUE_TEMPLATE/feedback.md
index 26dacc4c..a4d6059a 100644
--- a/.github/ISSUE_TEMPLATE/feedback.md
+++ b/.github/ISSUE_TEMPLATE/feedback.md
@@ -1,6 +1,6 @@
 ---
-name: Information/Feedback
-about: General information request or plugin feedback
+name: Information Request/Feedback
+about: Ask general information about this plugin or give valuable feedback
 title: ''
 labels: ''
 assignees: ''

From b4c84265ce1167e0f082b8b11af1f3e6ca1ec0e9 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Fri, 13 Nov 2020 16:25:02 +0000
Subject: [PATCH 0749/3183] Update feature-request.md

---
 .github/ISSUE_TEMPLATE/feature-request.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/feature-request.md b/.github/ISSUE_TEMPLATE/feature-request.md
index 2726831a..b8ac8ae0 100644
--- a/.github/ISSUE_TEMPLATE/feature-request.md
+++ b/.github/ISSUE_TEMPLATE/feature-request.md
@@ -1,5 +1,5 @@
 ---
-name: Feature Request
+name: Device/Feature Request
 about: I have an idea for the package or a device that isn't supported.
 title: ''
 labels: ''

From e1b48f061d374eb95d8bed6d92976a9592fdde1f Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Fri, 13 Nov 2020 16:25:36 +0000
Subject: [PATCH 0750/3183] Update feedback.md

---
 .github/ISSUE_TEMPLATE/feedback.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/feedback.md b/.github/ISSUE_TEMPLATE/feedback.md
index a4d6059a..aad5e776 100644
--- a/.github/ISSUE_TEMPLATE/feedback.md
+++ b/.github/ISSUE_TEMPLATE/feedback.md
@@ -1,5 +1,5 @@
 ---
-name: Information Request/Feedback
+name: Information/Feedback Request
 about: Ask general information about this plugin or give valuable feedback
 title: ''
 labels: ''

From 69d09ba68f13770ef2216ee154f55d20903256eb Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Fri, 13 Nov 2020 16:27:36 +0000
Subject: [PATCH 0751/3183] Update new-issue.md

---
 .github/ISSUE_TEMPLATE/new-issue.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/new-issue.md b/.github/ISSUE_TEMPLATE/new-issue.md
index fb970abc..9fc6f8a6 100644
--- a/.github/ISSUE_TEMPLATE/new-issue.md
+++ b/.github/ISSUE_TEMPLATE/new-issue.md
@@ -1,6 +1,6 @@
 ---
-name: New Issue
-about: I have a problem with the package or it's showing an error.
+name: Problem/Bug Alert
+about: The plugin isn't working as you'd expect it to, or it showing an error.
 title: ''
 labels: ''
 assignees: ''

From 3461c57d6c22b8c0931de739d045758b3999a65a Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Fri, 13 Nov 2020 16:31:38 +0000
Subject: [PATCH 0752/3183] Update feature-request.md

---
 .github/ISSUE_TEMPLATE/feature-request.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/feature-request.md b/.github/ISSUE_TEMPLATE/feature-request.md
index b8ac8ae0..bf295a05 100644
--- a/.github/ISSUE_TEMPLATE/feature-request.md
+++ b/.github/ISSUE_TEMPLATE/feature-request.md
@@ -1,6 +1,6 @@
 ---
-name: Device/Feature Request
-about: I have an idea for the package or a device that isn't supported.
+name: 🆕 Device/Feature Request
+about: Submit new ideas for the plugin or request support for a new device.
 title: ''
 labels: ''
 assignees: ''

From 4aaf5445f5aac48878b15e4d31c96cf32b608942 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Fri, 13 Nov 2020 16:32:51 +0000
Subject: [PATCH 0753/3183] Update feedback.md

---
 .github/ISSUE_TEMPLATE/feedback.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/feedback.md b/.github/ISSUE_TEMPLATE/feedback.md
index aad5e776..3589a888 100644
--- a/.github/ISSUE_TEMPLATE/feedback.md
+++ b/.github/ISSUE_TEMPLATE/feedback.md
@@ -1,5 +1,5 @@
 ---
-name: Information/Feedback Request
+name: ℹ️ Information/Feedback Request
 about: Ask general information about this plugin or give valuable feedback
 title: ''
 labels: ''

From 7fcb621516903cb6299f14824f900dc872256cb9 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Fri, 13 Nov 2020 16:33:23 +0000
Subject: [PATCH 0754/3183] Update feedback.md

---
 .github/ISSUE_TEMPLATE/feedback.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/feedback.md b/.github/ISSUE_TEMPLATE/feedback.md
index 3589a888..593bb9f4 100644
--- a/.github/ISSUE_TEMPLATE/feedback.md
+++ b/.github/ISSUE_TEMPLATE/feedback.md
@@ -1,6 +1,6 @@
 ---
 name: ℹ️ Information/Feedback Request
-about: Ask general information about this plugin or give valuable feedback
+about: Ask general information about this plugin or give valuable feedback.
 title: ''
 labels: ''
 assignees: ''

From d2838d7d4dfbe8652794ae103b3a7c56c20c0a9b Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Fri, 13 Nov 2020 16:34:19 +0000
Subject: [PATCH 0755/3183] Update new-issue.md

---
 .github/ISSUE_TEMPLATE/new-issue.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/new-issue.md b/.github/ISSUE_TEMPLATE/new-issue.md
index 9fc6f8a6..67567e77 100644
--- a/.github/ISSUE_TEMPLATE/new-issue.md
+++ b/.github/ISSUE_TEMPLATE/new-issue.md
@@ -1,6 +1,6 @@
 ---
-name: Problem/Bug Alert
-about: The plugin isn't working as you'd expect it to, or it showing an error.
+name: 🚨 Problem/Bug Alert
+about: The plugin isn't working as expected or it's showing an error.
 title: ''
 labels: ''
 assignees: ''

From 0348633f1630193e256f89aca1eb2142ba18880b Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Fri, 13 Nov 2020 16:35:04 +0000
Subject: [PATCH 0756/3183] Update config.yml

---
 .github/ISSUE_TEMPLATE/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index f43c4539..aa1e0229 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,5 +1,5 @@
 blank_issues_enabled: false
 contact_links:
-  - name: Homebridge Discord
+  - name: 🌐 Homebridge Discord
     url: https://discord.gg/7X36mdw
     about: The Homebridge Discord is a community where you can ask questions and get general help with Homebridge and plugins. You can also message me directly on there - my username is bwp91.

From 984ccd845bb6970763ba4c382e769885f66f0861 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Fri, 13 Nov 2020 16:36:07 +0000
Subject: [PATCH 0757/3183] Update config.yml

---
 .github/ISSUE_TEMPLATE/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index aa1e0229..568f5076 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,5 +1,5 @@
 blank_issues_enabled: false
 contact_links:
-  - name: 🌐 Homebridge Discord
+  - name: 🌍 Homebridge Discord
     url: https://discord.gg/7X36mdw
     about: The Homebridge Discord is a community where you can ask questions and get general help with Homebridge and plugins. You can also message me directly on there - my username is bwp91.

From 0b049d8764450d2d9e0e00179e0aad249d101553 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 14 Nov 2020 13:20:13 +0000
Subject: [PATCH 0758/3183] Update ewelink-platform.js

---
 lib/ewelink-platform.js | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/lib/ewelink-platform.js b/lib/ewelink-platform.js
index 81270cf1..cd7f2ccd 100644
--- a/lib/ewelink-platform.js
+++ b/lib/ewelink-platform.js
@@ -346,23 +346,12 @@ module.exports = class eWeLinkPlatform {
         /***********************
         SWITCHES [MULTI CHANNEL]
         ***********************/
-        if ((this.config.hideChanFromHB || '').split(',').includes(device.deviceid + 'SW0')) {
-          if (this.devicesInHB.has(device.deviceid + 'SW0')) {
-            this.removeAccessory(this.devicesInHB.get(device.deviceid + 'SW0'))
-          }
-          this.hiddenMasters.push(device.deviceid)
-          accessory = this.addAccessory(device, device.deviceid + 'SW0', true)
-        } else {
-          accessory = this.devicesInHB.has(device.deviceid + 'SW0')
-            ? this.devicesInHB.get(device.deviceid + 'SW0')
-            : this.addAccessory(device, device.deviceid + 'SW0')
-        }
-        accessory.control = new deviceSwitchMulti(this, accessory)
-        for (let i = 1; i <= helpers.chansFromUiid[device.extra.uiid]; i++) {
+        for (let i = 0; i <= helpers.chansFromUiid[device.extra.uiid]; i++) {
           if ((this.config.hideChanFromHB || '').split(',').includes(device.deviceid + 'SW' + i)) {
             if (this.devicesInHB.has(device.deviceid + 'SW' + i)) {
               this.removeAccessory(this.devicesInHB.get(device.deviceid + 'SW' + i))
             }
+            if (i === 0) this.hiddenMasters.push(device.deviceid)
             oAccessory = this.addAccessory(device, device.deviceid + 'SW' + i, true)
           } else {
             oAccessory = this.devicesInHB.has(device.deviceid + 'SW' + i)
@@ -376,6 +365,7 @@ module.exports = class eWeLinkPlatform {
           oAccessory.context.reachableLAN = this.lanDevices.get(device.deviceid).online || false
           oAccessory.control = new deviceSwitchMulti(this, oAccessory)
           this.devicesInHB.set(oAccessory.context.hbDeviceId, oAccessory)
+          if (i === 0) accessory = oAccessory
         }
         /**********************/
       } else if (helpers.devicesRFBridge.includes(device.extra.uiid)) {

From a43335d20c6ede7ba4746f02cf810ed96f99cc99 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 14 Nov 2020 13:24:42 +0000
Subject: [PATCH 0759/3183] change var name

---
 lib/ewelink-ws.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/ewelink-ws.js b/lib/ewelink-ws.js
index 88c78b84..8392878e 100644
--- a/lib/ewelink-ws.js
+++ b/lib/ewelink-ws.js
@@ -7,14 +7,14 @@ const helpers = require('./helpers')
 const ws = require('ws')
 const wsp = require('websocket-as-promised')
 module.exports = class eWeLinkWS {
-  constructor (config, log, res) {
+  constructor (config, log, authData) {
     this.config = config
     this.log = log
     this.debug = this.config.debug || false
     this.debugReqRes = this.config.debugReqRes || false
-    this.httpHost = res.httpHost
-    this.aToken = res.aToken
-    this.apiKey = res.apiKey
+    this.httpHost = authData.httpHost
+    this.aToken = authData.aToken
+    this.apiKey = authData.apiKey
     this.wsIsOpen = false
     this.emitter = new eventEmitter()
   }

From 75c4a80b19688caa3b773d760b7eadc4b7b8b032 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 14 Nov 2020 14:47:08 +0000
Subject: [PATCH 0760/3183] add comments to file

---
 lib/ewelink-platform.js | 112 ++++++++++++++++++++++++++++++++++++----
 1 file changed, 103 insertions(+), 9 deletions(-)

diff --git a/lib/ewelink-platform.js b/lib/ewelink-platform.js
index cd7f2ccd..6e848d06 100644
--- a/lib/ewelink-platform.js
+++ b/lib/ewelink-platform.js
@@ -32,12 +32,15 @@ const promInterval = require('interval-promise')
 const version = require('./../package.json').version
 module.exports = class eWeLinkPlatform {
   constructor (log, config, api) {
+    // *** Disable the plugin if not configured correctly *** \\
     if (!log || !api || !config) return
     if (!config.username || !config.password || !config.countryCode) {
       log.warn('*** Disabling plugin [v%s] ***', version)
       log.warn('*** eWeLink credentials missing from configuration ***')
       return
     }
+
+    // *** Set up our variables *** \\
     this.log = log
     this.config = config
     this.api = api
@@ -57,50 +60,79 @@ module.exports = class eWeLinkPlatform {
     this.config.ipOverride = this.ipOverrideTmp
     this.wsRefreshFlag = true
     this.eveLogPath = this.api.user.storagePath() + '/persist/'
+
+    // *** Set up Homebridge API events *** \\
     this.api
-      .on('didFinishLaunching', () => this.eWeLinkSetup())
-      .on('shutdown', () => this.eWeLinkShutdown())
+      .on('didFinishLaunching', this.eWeLinkSetup.bind(this))
+      .on('shutdown', this.eWeLinkShutdown.bind(this))
   }
 
   async eWeLinkSetup () {
     try {
+      // *** Check to see if the user has disabled the plugin *** \\
       if (this.config.disablePlugin) {
         this.devicesInHB.forEach(a => this.removeAccessory(a))
         this.log.warn('*** Disabling plugin [v%s] ***', version)
         this.log.warn('*** To change this, set disablePlugin to false ***')
         return
       }
+
+      // *** Set up initial sync with eWeLink *** \\
       this.log('Plugin [v%s] initialised. Syncing with eWeLink...', version)
+
+      // *** Set up the HTTP client, get the user HTTP host, and login *** \\
       this.httpClient = new eWeLinkHTTP(this.config, this.log)
       await this.httpClient.getHost()
       this.authData = await this.httpClient.login()
+
+      // *** Get a device list and add to the devicesInEW map *** \\
       const deviceList = await this.httpClient.getDevices()
       deviceList.forEach(device => this.devicesInEW.set(device.deviceid, device))
+
+      // *** Set up the WS client, get the user WS host, and login *** \\
       this.wsClient = new eWeLinkWS(this.config, this.log, this.authData)
       await this.wsClient.getHost()
       this.wsClient.login()
+
+      // *** Set up the LAN client, scan for devices and start monitoring *** \\
       this.lanClient = new eWeLinkLAN(this.config, this.log, deviceList)
       this.lanDevices = await this.lanClient.getHosts()
       await this.lanClient.startMonitor()
+
+      // *** Check for valid Accessory Simulations and add to cusG for later use *** \\
       if (Object.keys(this.config.groups || []).length > 0) {
         this.config.groups
           .filter(g => helpers.hasProperty(g, 'type') && helpers.allowedGroups.includes(g.type))
           .filter(g => helpers.hasProperty(g, 'deviceId') && this.devicesInEW.has(g.deviceId))
           .forEach(g => this.cusG.set(g.deviceId + 'SWX', g))
       }
+
+      // *** Check for valid custom RF Bridge sensors and add to cusS for later use *** \\
       if (Object.keys(this.config.bridgeSensors || []).length > 0) {
         this.config.bridgeSensors
           .filter(s => helpers.hasProperty(s, 'deviceId') && this.devicesInEW.has(s.deviceId))
           .forEach(s => this.cusS.set(s.fullDeviceId, s))
       }
+
+      // *** Logging for informative purposes *** \\
       this.log('[%s] eWeLink devices loaded from the Homebridge cache.', this.devicesInHB.size)
       this.log('[%s] primary devices loaded from your eWeLink account.', this.devicesInEW.size)
-      this.devicesInHB.forEach(a => {
-        if (!this.devicesInEW.has(a.context.eweDeviceId)) this.removeAccessory(a)
+
+      // *** Remove HB accessories that are no longer in eWeLink account *** \\
+      this.devicesInHB.forEach(accessory => {
+        if (!this.devicesInEW.has(accessory.context.eweDeviceId)) {
+          this.removeAccessory(accessory)
+        }
       })
-      this.devicesInEW.forEach(d => this.initialiseDevice(d))
-      this.wsClient.receiveUpdate(d => this.receiveDeviceUpdate(d))
-      this.lanClient.receiveUpdate(d => this.receiveDeviceUpdate(d))
+
+      // *** Initialise each device into HB *** \\
+      this.devicesInEW.forEach(device => this.initialiseDevice(device))
+
+      // *** Set up the WS and LAN listener for device updates *** \\
+      this.wsClient.receiveUpdate(device => this.receiveDeviceUpdate(device))
+      this.lanClient.receiveUpdate(device => this.receiveDeviceUpdate(device))
+
+      // *** Refresh the WS connection every 30 minutes *** \\
       this.wsRefresh = promInterval(async () => {
         if (this.wsRefreshFlag) {
           try {
@@ -115,13 +147,18 @@ module.exports = class eWeLinkPlatform {
           }
         }
       }, 1800000, { stopOnError: false })
+
+      // *** Logging for informative purposes *** \\
       this.log("eWeLink sync complete. Don't forget to ⭐️  this plugin on GitHub if you're finding it useful!")
       if (this.config.debugReqRes) {
         this.log.warn("Note: 'Request & Response Logging' is not advised for long-term use.")
       }
     } catch (err) {
+      // *** Catch errors at any point during setup *** \\
       this.log.warn('*** Disabling plugin [v%s] ***', version)
       this.log.warn(this.debug ? err : err.message)
+
+      // *** Attempt to close WS (and refresh interval) and stop LAN monitor if this has been setup *** \\
       try {
         if (this.lanClient) this.lanClient.closeConnection()
         if (this.wsClient) this.wsClient.closeConnection()
@@ -133,6 +170,7 @@ module.exports = class eWeLinkPlatform {
   }
 
   eWeLinkShutdown () {
+    // *** Attempt to close WS (and refresh interval) and stop LAN monitor if this has been setup *** \\
     try {
       if (this.lanClient) this.lanClient.closeConnection()
       if (this.wsClient) this.wsClient.closeConnection()
@@ -145,7 +183,9 @@ module.exports = class eWeLinkPlatform {
   initialiseDevice (device) {
     let accessory
     let oAccessory
+
     try {
+      // *** Remove old switch services for new Accessory Simulations *** \\
       if (this.cusG.has(device.deviceid + 'SWX')) {
         ;['X', '0', '1', '2', '3', '4'].forEach(sw => {
           if (this.devicesInHB.has(device.deviceid + 'SW' + sw)) {
@@ -155,6 +195,8 @@ module.exports = class eWeLinkPlatform {
           }
         })
       }
+
+      // *** Set up the correct instance for this particular device *** \\
       if (helpers.devicesCurtain.includes(device.extra.uiid)) {
         /***********************
         BLINDS [EWELINK UIID 11]
@@ -471,16 +513,22 @@ module.exports = class eWeLinkPlatform {
         return
         /*********/
       }
+
+      // *** Update the current firmware version *** \\
       if (!this.hiddenMasters.includes(device.deviceid)) {
         accessory
           .getService(this.Service.AccessoryInformation)
           .setCharacteristic(this.Characteristic.FirmwareRevision, device.params.fwVersion)
       }
+
+      // *** Update the reachability values (via WS and LAN) *** \\
       accessory.context.reachableWAN = device.online
       accessory.context.reachableLAN = this.lanDevices.has(device.deviceid)
         ? this.lanDevices.get(device.deviceid).online
         : false
       accessory.context.inUse = false
+
+      // *** Helpful logging for each device *** \\
       let str = accessory.context.reachableLAN
         ? 'and found locally with IP [' + this.lanDevices.get(device.deviceid).ip + ']'
         : 'but LAN mode unavailable as device '
@@ -493,10 +541,15 @@ module.exports = class eWeLinkPlatform {
           str += 'is unreachable'
         }
       }
+
+      // *** Update accessory characteristics with latest values *** \\
       if (!this.config.disableHTTPRefresh) accessory.control.externalUpdate(device.params)
+
+      // *** Update any changes to the device into our devicesInHB map *** \\
       this.devicesInHB.set(accessory.context.hbDeviceId, accessory)
       this.log(' → [%s] initialised %s.', device.name, str)
     } catch (err) {
+      // *** Catch errors at any point during device initialisation *** \\
       const deviceName = accessory && helpers.hasProperty(accessory, 'displayName')
         ? accessory.displayName
         : device.name
@@ -505,7 +558,10 @@ module.exports = class eWeLinkPlatform {
   }
 
   addAccessory (device, hbDeviceId, hidden = false, extraContext = {}, type = '') {
+    // *** Get the switchNumber which can be {X, 0, 1, 2, 3, 4, ...} *** \\
     const switchNumber = hbDeviceId.split('SW')[1].toString()
+
+    // *** Set up the device name which can depend on the accessory type *** \\
     let newDeviceName = type === 'rf_sub' ? device.tags.zyx_info[switchNumber - 1].name : device.name
     const channelCount = type === 'rf_pri'
       ? Object.keys((device.tags && device.tags.zyx_info) || []).length
@@ -524,6 +580,8 @@ module.exports = class eWeLinkPlatform {
     if (helpers.hasProperty(this.config.nameOverride, hbDeviceId)) {
       newDeviceName = this.config.nameOverride[hbDeviceId]
     }
+
+    // *** Add the new accessory to Homebridge *** \\
     try {
       const accessory = new this.api.platformAccessory(newDeviceName, this.api.hap.uuid.generate(hbDeviceId).toString())
       if (!hidden) {
@@ -535,10 +593,12 @@ module.exports = class eWeLinkPlatform {
           .setCharacteristic(this.Characteristic.FirmwareRevision, device.params.fwVersion || version)
           .setCharacteristic(this.Characteristic.Identify, true)
         accessory.on('identify', (paired, callback) => {
-          this.log('[%s] - identify button pressed.', accessory.displayName)
           callback()
+          this.log('[%s] - identify button pressed.', accessory.displayName)
         })
       }
+
+      // *** Add helpful context values to the accessory *** \\
       accessory.context = {
         ...{
           hbDeviceId,
@@ -551,27 +611,38 @@ module.exports = class eWeLinkPlatform {
         },
         ...extraContext
       }
+
+      // *** Register the accessory if it hasn't been hidden by the user *** \\
       if (!hidden) {
         this.api.registerPlatformAccessories('homebridge-ewelink', 'eWeLink', [accessory])
         this.log(' → [%s] has been added to Homebridge.', newDeviceName)
       }
+
+      // *** Return the new accessory *** \\
       return accessory
     } catch (err) {
+      // *** Add helpful context values to the accessory *** \\
       this.log.warn(' → [%s] could not be added as %s.', newDeviceName, err)
       return false
     }
   }
 
   async sendDeviceUpdate (accessory, params) {
+    // *** Set up the payload to send via LAN/WS *** \\
     const payload = {
       apikey: accessory.context.eweApiKey,
       deviceid: accessory.context.eweDeviceId,
       params
     }
+
+    // *** Quick check to see if LAN mode is supported *** \\
     const res = helpers.devicesNonLAN.includes(accessory.context.eweUIID)
       ? 'LAN mode is not supported for this device'
       : await this.lanClient.sendUpdate(payload)
+
+    // *** Revert to WS if LAN mode not possible for whatever reason *** \\
     if (res !== 'ok') {
+      // *** Check to see if the device is online *** \\
       if (accessory.context.reachableWAN) {
         if (this.debug) this.log('[%s] Reverting to web socket as %s.', accessory.displayName, res)
         await this.wsClient.sendUpdate(payload)
@@ -582,12 +653,15 @@ module.exports = class eWeLinkPlatform {
   }
 
   async receiveDeviceUpdate (device) {
-    let accessory
     const deviceId = device.deviceid
+    let accessory
     let reachableChange = false
+
+    // *** Find our accessory for which the updates relates to *** \\
     if ((accessory = this.devicesInHB.get(deviceId + 'SWX') || this.devicesInHB.get(deviceId + 'SW0'))) {
       const isX = accessory.context.hbDeviceId.substr(-1) === 'X'
       if (device.params.updateSource === 'WS') {
+        // *** The update is from WS so update the WS online/offline status *** \\
         if (device.params.online !== accessory.context.reachableWAN) {
           accessory.context.reachableWAN = device.params.online
           this.devicesInHB.set(accessory.context.hbDeviceId, accessory)
@@ -603,6 +677,7 @@ module.exports = class eWeLinkPlatform {
         }
       }
       if (device.params.updateSource === 'LAN' && !accessory.context.reachableLAN) {
+        // *** The update is from LAN so update the LAN online/offline status *** \\
         accessory.context.reachableLAN = true
         this.devicesInHB.set(accessory.context.hbDeviceId, accessory)
         reachableChange = true
@@ -613,7 +688,10 @@ module.exports = class eWeLinkPlatform {
           this.log.warn('[%s] update could not be requested as %s', accessory.displayName, this.debug ? err.message : err)
         }
       }
+
+      // *** Update this new online/offline status for all switches of multi channel devices (ie not X) *** \\
       if (reachableChange && !isX) {
+        // *** Loop through to see which channels are in HB *** \\
         for (let i = 1; i <= accessory.context.channelCount; i++) {
           if (this.devicesInHB.has(deviceId + 'SW' + i)) {
             const oAccessory = this.devicesInHB.get(deviceId + 'SW' + i)
@@ -629,17 +707,27 @@ module.exports = class eWeLinkPlatform {
         this.log('[%s] %s update received and will be refreshed.', accessory.displayName, device.params.updateSource)
       }
       try {
+        // *** Update the accessory with the new data *** \\
         accessory.control.externalUpdate(device.params)
       } catch (err) {
         this.log.warn('[%s] could not be refreshed as %s.', accessory.displayName, this.debug ? err : err.message)
       }
     } else {
+      // *** The device does not existing in HB so let's try to add it *** \\
       try {
+        // *** Check to see it doesn't exist because it's user hidden *** \\
         if ((this.config.hideDevFromHB || '').includes(deviceId)) return
+
+        // *** Obtain full device information from the HTTP API *** \\
         const newDevice = await this.httpClient.getDevice(deviceId)
+
+        // *** Initialise the device in HB *** \\
         this.initialiseDevice(newDevice)
+
+        // *** Add the device to the LAN client map *** \\
         this.lanClient.addDeviceToMap(newDevice)
       } catch (err) {
+        // *** Automatically adding the new device failed for some reason *** \\
         this.log.warn('[%s] restart Homebridge to add new device, failed to add automatically as %s.', deviceId, err.message)
       }
     }
@@ -647,6 +735,8 @@ module.exports = class eWeLinkPlatform {
 
   async deviceUpdateError (accessory, err, requestRefresh) {
     this.log.warn('[%s] could not be updated as %s.', accessory.displayName, this.debug ? err : err.message)
+
+    // *** We only request a device refresh on failed internal updates (ie with 'set' handlers) *** \\
     if (requestRefresh) {
       if (accessory.context.reachableWAN) {
         try {
@@ -660,12 +750,16 @@ module.exports = class eWeLinkPlatform {
   }
 
   configureAccessory (accessory) {
+    // *** Function is called for each device on HB start *** \\
     if (!this.log) return
+
+    // *** Add each cached device to our devicesInHB map *** \\
     this.devicesInHB.set(accessory.context.hbDeviceId, accessory)
   }
 
   removeAccessory (accessory) {
     try {
+      // *** Unregister the accessory from HB and remove it from our devicesInHB map *** \\
       this.api.unregisterPlatformAccessories('homebridge-ewelink', 'eWeLink', [accessory])
       this.devicesInHB.delete(accessory.context.hbDeviceId)
       this.log(' → [%s] was removed from Homebridge.', accessory.displayName)

From 081e364e35e87fdddc2b893a22935738b72920ae Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 14 Nov 2020 14:50:53 +0000
Subject: [PATCH 0761/3183] Update README.md

---
 README.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/README.md b/README.md
index 9ac72c70..806afeca 100644
--- a/README.md
+++ b/README.md
@@ -21,6 +21,9 @@ Homebridge/HOOBS plugin to control eWeLink devices with original firmware.
 * To use this plugin, you will need to already have [Homebridge](https://homebridge.io) or [HOOBS](https://hoobs.org) installed. Please refer to the links for more information and installation instructions.
 
 ### Plugin Information
+* This plugin uses your eWeLink credentials to obtain and control your devices
+* This plugin uses a web socket for real-time device control and updates
+* This plugin also allows LAN control for devices that support it
 
 ### Setup
 * [Installation (Homebridge)](https://github.com/bwp91/homebridge-ewelink/wiki/Installation-(Homebridge))

From f4c527925a66e67175229ab23f923ca431b9fa06 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 14 Nov 2020 14:51:44 +0000
Subject: [PATCH 0762/3183] Update README.md

---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 806afeca..653b250d 100644
--- a/README.md
+++ b/README.md
@@ -21,9 +21,9 @@ Homebridge/HOOBS plugin to control eWeLink devices with original firmware.
 * To use this plugin, you will need to already have [Homebridge](https://homebridge.io) or [HOOBS](https://hoobs.org) installed. Please refer to the links for more information and installation instructions.
 
 ### Plugin Information
-* This plugin uses your eWeLink credentials to obtain and control your devices
-* This plugin uses a web socket for real-time device control and updates
-* This plugin also allows LAN control for devices that support it
+* This plugin uses your eWeLink credentials to obtain and control your devices through Homebridge.
+* This plugin uses a web socket for real-time device control and updates.
+* This plugin also supports LAN control for certain devices that support it.
 
 ### Setup
 * [Installation (Homebridge)](https://github.com/bwp91/homebridge-ewelink/wiki/Installation-(Homebridge))

From c3abd0945b6553c6faa00abfc7779d8d1b54e8a5 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 14 Nov 2020 15:00:53 +0000
Subject: [PATCH 0763/3183] Update fakegato-history.js

---
 lib/fakegato/fakegato-history.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/fakegato/fakegato-history.js b/lib/fakegato/fakegato-history.js
index 7b0d19d0..1b9b19db 100644
--- a/lib/fakegato/fakegato-history.js
+++ b/lib/fakegato/fakegato-history.js
@@ -821,7 +821,7 @@ module.exports = function (pHomebridge) {
 
 
 		setCurrentS2W1(val, callback) {
-			callback(null, val);
+			callback(null);
 			this.log.debug("Data request %s: %s", this.accessoryName, base64ToHex(val));
 			var valHex = base64ToHex(val);
 			var substring = valHex.substring(4, 12);
@@ -836,7 +836,7 @@ module.exports = function (pHomebridge) {
 
 		setCurrentS2W2(val, callback) {
 			this.log.debug("Clock adjust %s: %s", this.accessoryName, base64ToHex(val));
-			callback(null, val);
+			callback(null);
 		}
 
 	}

From 9d875606916df3c803f37504ca9510cfed1129e6 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Sat, 14 Nov 2020 15:25:06 +0000
Subject: [PATCH 0764/3183] Update new-issue.md

---
 .github/ISSUE_TEMPLATE/new-issue.md | 41 ++++++++++++++++++++++-------
 1 file changed, 31 insertions(+), 10 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/new-issue.md b/.github/ISSUE_TEMPLATE/new-issue.md
index 67567e77..137d97aa 100644
--- a/.github/ISSUE_TEMPLATE/new-issue.md
+++ b/.github/ISSUE_TEMPLATE/new-issue.md
@@ -7,24 +7,45 @@ assignees: ''
 
 ---
 
+<!--
+   PLEASE READ BEFORE POSTING A NEW ISSUE
+   * Please use this template as well as you can, in a lot of cases I will probably ask for things you might skip anyway.
+   * Are you using a second eWeLink account for Homebridge? Please try using your main eWeLink account instead.
+   * This is not the place for issues with the homebridge-ewelink-max plugin. I am not the owner of homebridge-ewelink-max
+-->
+
 **What issue do you have? Please be as thorough and explicit as possible.**
+<!--
+   Please also state any changes may be leading to this error, examples include:
+   * Has this error started since updating this plugin? Which version were you using before when it worked?
+   * Have you tried clearing the device from the Homebridge cache to see if this solves problems?
+-->
 
-...
 
 **Details of your setup.**
-Do you use Homebridge or HOOBS?
+* Do you use Homebridge (with config-ui?) or HOOBS? 
+
+
+
+* Which version of Homebridge/HOOBS do you have?
+
+
+
+* Which version of this plugin (homebridge-ewelink) do you have?
+
 
-...
 
-Which version of Homebridge/HOOBS do you have?
+* Which eWeLink devices do you have that are causing issues?
 
-...
 
-Which version of this plugin (homebridge-ewelink) do you have?
 
-...
+**Please paste any relevant logs below.**
+<!--
+   It helps if you can turn on 'Debug Logging' and 'Request & Response Logging' in the package settings for more thorough logging.
+   If you are posting an error then it is helpful for me to also see the previous few lines as this can show the cause of the error.
+   Please enter the logs between the two ``` lines below so that the logs are formatted in a way which is easier to read
+-->
 
-**Please paste any relevant logs below. It helps if you can turn `debug` and `debugReqRes` in the package settings for more thorough logging.**
-> If you are posting an error then it is helpful for me to also see the previous few lines as this can show the cause of the error.
+```
 
-...
+```

From 5dcd3012902f4168e72b50619eee3c21084b66ce Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Sat, 14 Nov 2020 15:26:04 +0000
Subject: [PATCH 0765/3183] Update new-issue.md

---
 .github/ISSUE_TEMPLATE/new-issue.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/ISSUE_TEMPLATE/new-issue.md b/.github/ISSUE_TEMPLATE/new-issue.md
index 137d97aa..88fc799a 100644
--- a/.github/ISSUE_TEMPLATE/new-issue.md
+++ b/.github/ISSUE_TEMPLATE/new-issue.md
@@ -14,6 +14,8 @@ assignees: ''
    * This is not the place for issues with the homebridge-ewelink-max plugin. I am not the owner of homebridge-ewelink-max
 -->
 
+
+
 **What issue do you have? Please be as thorough and explicit as possible.**
 <!--
    Please also state any changes may be leading to this error, examples include:
@@ -22,6 +24,7 @@ assignees: ''
 -->
 
 
+
 **Details of your setup.**
 * Do you use Homebridge (with config-ui?) or HOOBS? 
 

From bafc6e08d1b59d1b550a0ac99a6b596ef2b2f8df Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Sat, 14 Nov 2020 15:27:00 +0000
Subject: [PATCH 0766/3183] Update new-issue.md

---
 .github/ISSUE_TEMPLATE/new-issue.md | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/new-issue.md b/.github/ISSUE_TEMPLATE/new-issue.md
index 88fc799a..7fb6c8ac 100644
--- a/.github/ISSUE_TEMPLATE/new-issue.md
+++ b/.github/ISSUE_TEMPLATE/new-issue.md
@@ -13,10 +13,7 @@ assignees: ''
    * Are you using a second eWeLink account for Homebridge? Please try using your main eWeLink account instead.
    * This is not the place for issues with the homebridge-ewelink-max plugin. I am not the owner of homebridge-ewelink-max
 -->
-
-
-
-**What issue do you have? Please be as thorough and explicit as possible.**
+### What issue do you have? Please be as thorough and explicit as possible.
 <!--
    Please also state any changes may be leading to this error, examples include:
    * Has this error started since updating this plugin? Which version were you using before when it worked?
@@ -25,7 +22,7 @@ assignees: ''
 
 
 
-**Details of your setup.**
+### Details of your setup.
 * Do you use Homebridge (with config-ui?) or HOOBS? 
 
 
@@ -42,7 +39,7 @@ assignees: ''
 
 
 
-**Please paste any relevant logs below.**
+### Please paste any relevant logs below.
 <!--
    It helps if you can turn on 'Debug Logging' and 'Request & Response Logging' in the package settings for more thorough logging.
    If you are posting an error then it is helpful for me to also see the previous few lines as this can show the cause of the error.

From 4037c20e45940bd72e1b483aed8c8d2440c92cac Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Sat, 14 Nov 2020 15:32:17 +0000
Subject: [PATCH 0767/3183] Update new-issue.md

---
 .github/ISSUE_TEMPLATE/new-issue.md | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/new-issue.md b/.github/ISSUE_TEMPLATE/new-issue.md
index 7fb6c8ac..34273d00 100644
--- a/.github/ISSUE_TEMPLATE/new-issue.md
+++ b/.github/ISSUE_TEMPLATE/new-issue.md
@@ -7,18 +7,11 @@ assignees: ''
 
 ---
 
-<!--
-   PLEASE READ BEFORE POSTING A NEW ISSUE
+<!-- PLEASE READ BEFORE POSTING A NEW ISSUE
    * Please use this template as well as you can, in a lot of cases I will probably ask for things you might skip anyway.
-   * Are you using a second eWeLink account for Homebridge? Please try using your main eWeLink account instead.
-   * This is not the place for issues with the homebridge-ewelink-max plugin. I am not the owner of homebridge-ewelink-max
--->
+   * This is not the place for issues with the homebridge-ewelink-max plugin. I am not the owner of homebridge-ewelink-max -->
+
 ### What issue do you have? Please be as thorough and explicit as possible.
-<!--
-   Please also state any changes may be leading to this error, examples include:
-   * Has this error started since updating this plugin? Which version were you using before when it worked?
-   * Have you tried clearing the device from the Homebridge cache to see if this solves problems?
--->
 
 
 
@@ -31,7 +24,7 @@ assignees: ''
 
 
 
-* Which version of this plugin (homebridge-ewelink) do you have?
+* Which version of this plugin (homebridge-ewelink) do you have? Has the issue started since upgrading from a previous version?
 
 
 
@@ -39,6 +32,10 @@ assignees: ''
 
 
 
+* Do you use your main eWeLink credentials or do you use a secondary eWeLink account for Homebridge?
+
+
+
 ### Please paste any relevant logs below.
 <!--
    It helps if you can turn on 'Debug Logging' and 'Request & Response Logging' in the package settings for more thorough logging.

From c7d534c761b58359c199cc851ce3801036e18c5e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 14 Nov 2020 15:36:45 +0000
Subject: [PATCH 0768/3183] 3.12.1-1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 76daf946..2109507a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.12.1-0",
+  "version": "3.12.1-1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index dcd0223d..edd02d79 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.12.1-0",
+  "version": "3.12.1-1",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 48bb462ee698542adb8ca5a827faf52cac9d2d19 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 14 Nov 2020 16:38:09 +0000
Subject: [PATCH 0769/3183] renaming services

---
 lib/device/blind.js         | 15 +++++++--------
 lib/device/curtain.js       | 10 ++++------
 lib/device/diffuser.js      | 28 +++++++++++++--------------
 lib/device/fan.js           | 34 ++++++++++++---------------------
 lib/device/garage-eachen.js | 17 +++++++----------
 lib/device/garage.js        | 19 ++++++++-----------
 lib/device/light-colour.js  | 34 ++++++++++++++++-----------------
 lib/device/light-ctemp.js   | 22 ++++++++++-----------
 lib/device/light-dimmer.js  | 17 ++++++++---------
 lib/device/lock.js          | 12 +++++-------
 lib/device/outlet.js        | 38 ++++++++++++++++++-------------------
 lib/device/scm.js           |  6 +++---
 lib/device/sensor.js        | 24 +++++++++--------------
 lib/device/switch-multi.js  |  6 +++---
 lib/device/switch-single.js |  6 +++---
 lib/device/thermostat.js    | 19 +++++++------------
 lib/device/usb.js           |  6 +++---
 lib/device/valve.js         | 33 +++++++++++++++-----------------
 18 files changed, 151 insertions(+), 195 deletions(-)

diff --git a/lib/device/blind.js b/lib/device/blind.js
index d0191a2f..1a8800a5 100644
--- a/lib/device/blind.js
+++ b/lib/device/blind.js
@@ -7,16 +7,15 @@ module.exports = class deviceBlind {
     this.platform = platform
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
-    let wcService
-    if (!(wcService = accessory.getService(this.Service.WindowCovering))) {
+    if (!(this.wcService = accessory.getService(this.Service.WindowCovering))) {
       accessory
         .addService(this.Service.WindowCovering)
         .setCharacteristic(this.Characteristic.CurrentPosition, 0)
         .setCharacteristic(this.Characteristic.TargetPosition, 0)
         .setCharacteristic(this.Characteristic.PositionState, 2)
-      wcService = accessory.getService(this.Service.WindowCovering)
+      this.wcService = accessory.getService(this.Service.WindowCovering)
     }
-    wcService
+    this.wcService
       .getCharacteristic(this.Characteristic.TargetPosition)
       .on('set', (value, callback) => this.internalUpdate(value, callback))
     this.accessory = accessory
@@ -27,7 +26,6 @@ module.exports = class deviceBlind {
       callback()
       let blindConfig
       const params = {}
-      const wcService = this.accessory.getService(this.Service.WindowCovering)
       const prevState = this.accessory.context.cachePositionState
       let prevPosition = this.accessory.context.cacheCurrentPosition
       const newTarget = value
@@ -51,7 +49,7 @@ module.exports = class deviceBlind {
         } else {
           prevPosition += positionPercentChange
         }
-        wcService.updateCharacteristic(this.Characteristic.CurrentPosition, prevPosition)
+        this.wcService.updateCharacteristic(this.Characteristic.CurrentPosition, prevPosition)
         this.accessory.context.cacheCurrentPosition = prevPosition
       }
       const diffPosition = newTarget - prevPosition
@@ -69,8 +67,9 @@ module.exports = class deviceBlind {
       params.switches[0].switch = 'off'
       params.switches[1].switch = 'off'
       await this.platform.sendDeviceUpdate(this.accessory, params)
-      wcService.updateCharacteristic(this.Characteristic.PositionState, 2)
-      wcService.updateCharacteristic(this.Characteristic.CurrentPosition, newTarget)
+      this.wcService
+        .updateCharacteristic(this.Characteristic.PositionState, 2)
+        .updateCharacteristic(this.Characteristic.CurrentPosition, newTarget)
       this.accessory.context.cachePositionState = 2
       this.accessory.context.cacheCurrentPosition = newTarget
     } catch (err) {
diff --git a/lib/device/curtain.js b/lib/device/curtain.js
index 02e3758d..037b9489 100644
--- a/lib/device/curtain.js
+++ b/lib/device/curtain.js
@@ -7,16 +7,15 @@ module.exports = class deviceCurtain {
     this.platform = platform
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
-    let cService
-    if (!(cService = accessory.getService(this.Service.WindowCovering))) {
+    if (!(this.cService = accessory.getService(this.Service.WindowCovering))) {
       accessory
         .addService(this.Service.WindowCovering)
         .setCharacteristic(this.Characteristic.CurrentPosition, 0)
         .setCharacteristic(this.Characteristic.TargetPosition, 0)
         .setCharacteristic(this.Characteristic.PositionState, 2)
-      cService = accessory.getService(this.Service.WindowCovering)
+      this.cService = accessory.getService(this.Service.WindowCovering)
     }
-    cService
+    this.cService
       .getCharacteristic(this.Characteristic.TargetPosition)
       .on('set', (value, callback) => this.internalUpdate(value, callback))
     this.accessory = accessory
@@ -43,12 +42,11 @@ module.exports = class deviceCurtain {
 
   async externalUpdate (params) {
     try {
-      const cService = this.accessory.getService(this.Service.WindowCovering)
       if (!helpers.hasProperty(params, 'switch') && !helpers.hasProperty(params, 'setclose')) {
         return
       }
       const newPos = Math.abs(100 - parseInt(params.setclose))
-      cService
+      this.cService
         .updateCharacteristic(this.Characteristic.TargetPosition, newPos)
         .updateCharacteristic(this.Characteristic.CurrentPosition, newPos)
         .updateCharacteristic(this.Characteristic.PositionState, 2)
diff --git a/lib/device/diffuser.js b/lib/device/diffuser.js
index d275f9b3..00a8aa80 100644
--- a/lib/device/diffuser.js
+++ b/lib/device/diffuser.js
@@ -8,28 +8,28 @@ module.exports = class deviceDiffuser {
     this.platform = platform
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
-    const onOffService = accessory.getService('Diffuser') || accessory.addService(this.Service.Fan, 'Diffuser', 'diffuser')
-    const lightService = accessory.getService('Light') || accessory.addService(this.Service.Lightbulb, 'Light', 'light')
-    onOffService
+    this.fanService = accessory.getService('Diffuser') || accessory.addService(this.Service.Fan, 'Diffuser', 'diffuser')
+    this.lightService = accessory.getService('Light') || accessory.addService(this.Service.Lightbulb, 'Light', 'light')
+    this.fanService
       .getCharacteristic(this.Characteristic.On)
       .on('set', (value, callback) => this.internalDiffuserOnOffUpdate(value, callback))
     this.accessory = accessory
-    onOffService
+    this.fanService
       .getCharacteristic(this.Characteristic.RotationSpeed)
       .on('set', (value, callback) => this.internalDiffuserStateUpdate(value, callback))
       .setProps({
         minStep: 50
       })
-    lightService
+    this.lightService
       .getCharacteristic(this.Characteristic.On)
       .on('set', (value, callback) => this.internalLightOnOffUpdate(value, callback))
-    lightService
+    this.lightService
       .getCharacteristic(this.Characteristic.Brightness)
       .on('set', (value, callback) => this.internalLightBrightnessUpdate(value, callback))
-    lightService
+    this.lightService
       .getCharacteristic(this.Characteristic.Hue)
       .on('set', (value, callback) => this.internalLightColourUpdate(value, callback))
-    lightService
+    this.lightService
       .getCharacteristic(this.Characteristic.Saturation)
       .on('set', (value, callback) => callback())
     this.accessory = accessory
@@ -113,22 +113,20 @@ module.exports = class deviceDiffuser {
   async externalUpdate (params) {
     try {
       if (helpers.hasProperty(params, 'switch')) {
-        this.accessory.getService('Diffuser').updateCharacteristic(this.Characteristic.On, params.switch === 'on')
+        this.fanService.updateCharacteristic(this.Characteristic.On, params.switch === 'on')
         if (!helpers.hasProperty(params, 'state')) {
           this.accessory.getService('Diffuser').updateCharacteristic(this.Characteristic.RotationSpeed, this.accessory.context.cacheState)
         }
       }
       if (helpers.hasProperty(params, 'state')) {
-        this.accessory.getService('Diffuser').updateCharacteristic(this.Characteristic.RotationSpeed, params.state * 50)
+        this.fanService.updateCharacteristic(this.Characteristic.RotationSpeed, params.state * 50)
         this.accessory.context.cacheState = params.state * 50
       }
       if (helpers.hasProperty(params, 'lightswitch')) {
-        this.accessory.getService('Light')
-          .updateCharacteristic(this.Characteristic.On, params.lightswitch === 1)
+        this.lightService.updateCharacteristic(this.Characteristic.On, params.lightswitch === 1)
       }
       if (helpers.hasProperty(params, 'lightbright')) {
-        this.accessory.getService('Light')
-          .updateCharacteristic(this.Characteristic.Brightness, params.lightbright)
+        this.lightService.updateCharacteristic(this.Characteristic.Brightness, params.lightbright)
       }
       if (
         helpers.hasProperty(params, 'lightRcolor') &&
@@ -136,7 +134,7 @@ module.exports = class deviceDiffuser {
         helpers.hasProperty(params, 'lightBcolor')
       ) {
         const newColour = convert.rgb.hsv(params.lightRcolor, params.lightGcolor, params.lightBcolor)
-        this.accessory.getService('Light')
+        this.lightService
           .updateCharacteristic(this.Characteristic.Hue, newColour[0])
           .updateCharacteristic(this.Characteristic.Saturation, 100)
       }
diff --git a/lib/device/fan.js b/lib/device/fan.js
index 1569f0e8..c593b3f8 100644
--- a/lib/device/fan.js
+++ b/lib/device/fan.js
@@ -7,19 +7,14 @@ module.exports = class deviceFan {
     this.platform = platform
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
-    this.visibleLight = true
-    /** *************** UPGRADE 3.7.* -> 3.8.* ******************/
-    const fanServiceOld = accessory.getService(this.Service.Fanv2)
-    if (fanServiceOld) accessory.removeService(fanServiceOld)
-    /** *********************************************************/
-    const fanService = accessory.getService(this.Service.Fan) || accessory.addService(this.Service.Fan)
-    fanService
+    this.fanService = accessory.getService(this.Service.Fan) || accessory.addService(this.Service.Fan)
+    this.fanService
       .getCharacteristic(this.Characteristic.On)
       .on('set', (value, callback) => {
         callback()
-        if (!value) fanService.setCharacteristic(this.Characteristic.RotationSpeed, 0)
+        if (!value) this.fanService.setCharacteristic(this.Characteristic.RotationSpeed, 0)
       })
-    fanService
+    this.fanService
       .getCharacteristic(this.Characteristic.RotationSpeed)
       .on('set', (value, callback) => this.internalUpdate('speed', value, callback))
       .setProps({
@@ -31,10 +26,11 @@ module.exports = class deviceFan {
       }
       this.visibleLight = false
     } else {
-      const fanLightService = accessory.getService(this.Service.Lightbulb) || accessory.addService(this.Service.Lightbulb)
-      fanLightService
+      this.lightService = accessory.getService(this.Service.Lightbulb) || accessory.addService(this.Service.Lightbulb)
+      this.lightService
         .getCharacteristic(this.Characteristic.On)
         .on('set', (value, callback) => this.internalUpdate('light', value, callback))
+      this.visibleLight = true
     }
     this.accessory = accessory
   }
@@ -45,19 +41,16 @@ module.exports = class deviceFan {
       let newPower
       let newSpeed
       let newLight
-      let lightService
-      if (this.visibleLight) lightService = this.accessory.getService(this.Service.Lightbulb)
-      const fanService = this.accessory.getService(this.Service.Fan)
       const params = { switches: helpers.defaultMultiSwitchOff }
       switch (type) {
         case 'speed':
           newPower = value >= 33 ? 1 : 0
           newSpeed = value
-          newLight = this.visibleLight ? lightService.getCharacteristic(this.Characteristic.On).value : true
+          newLight = this.visibleLight ? this.lightService.getCharacteristic(this.Characteristic.On).value : true
           break
         case 'light':
-          newPower = fanService.getCharacteristic(this.Characteristic.On).value
-          newSpeed = fanService.getCharacteristic(this.Characteristic.RotationSpeed).value
+          newPower = this.fanService.getCharacteristic(this.Characteristic.On).value
+          newSpeed = this.fanService.getCharacteristic(this.Characteristic.RotationSpeed).value
           newLight = this.visibleLight ? value : true
           break
       }
@@ -75,9 +68,6 @@ module.exports = class deviceFan {
     try {
       if (helpers.hasProperty(params, 'updateSource') && params.updateSource === 'LAN') return
       if (params.switches && Array.isArray(params.switches)) {
-        let lightService
-        if (this.visibleLight) lightService = this.accessory.getService(this.Service.Lightbulb)
-        const fanService = this.accessory.getService(this.Service.Fan)
         const light = params.switches[0].switch === 'on'
         let status
         let speed
@@ -98,8 +88,8 @@ module.exports = class deviceFan {
             status = 1
             speed = 99
         }
-        if (this.visibleLight) lightService.updateCharacteristic(this.Characteristic.On, light)
-        fanService
+        if (this.visibleLight) this.lightService.updateCharacteristic(this.Characteristic.On, light)
+        this.fanService
           .updateCharacteristic(this.Characteristic.On, status)
           .updateCharacteristic(this.Characteristic.RotationSpeed, speed)
       }
diff --git a/lib/device/garage-eachen.js b/lib/device/garage-eachen.js
index 6f4ef86d..5b56548b 100644
--- a/lib/device/garage-eachen.js
+++ b/lib/device/garage-eachen.js
@@ -7,16 +7,15 @@ module.exports = class deviceGarageEachen {
     this.platform = platform
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
-    let gdeService
-    if (!(gdeService = accessory.getService(this.Service.GarageDoorOpener))) {
+    if (!(this.gdService = accessory.getService(this.Service.GarageDoorOpener))) {
       accessory
         .addService(this.Service.GarageDoorOpener)
         .setCharacteristic(this.Characteristic.CurrentDoorState, 1)
         .setCharacteristic(this.Characteristic.TargetDoorState, 1)
         .setCharacteristic(this.Characteristic.ObstructionDetected, false)
-      gdeService = accessory.getService(this.Service.GarageDoorOpener)
+      this.gdService = accessory.getService(this.Service.GarageDoorOpener)
     }
-    gdeService
+    this.gdService
       .getCharacteristic(this.Characteristic.TargetDoorState)
       .on('set', (value, callback) => this.internalUpdate(value, callback))
     this.accessory = accessory
@@ -33,18 +32,17 @@ module.exports = class deviceGarageEachen {
         throw new Error('improper configuration')
       }
       const params = { switch: value === 0 ? 'on' : 'off' }
-      const gdService = this.accessory.getService(this.Service.GarageDoorOpener)
-      if (value === gdService.getCharacteristic(this.Characteristic.CurrentDoorState).value % 2) return
+      if (value === this.gdService.getCharacteristic(this.Characteristic.CurrentDoorState).value % 2) return
       this.accessory.context.inUse = true
       await this.platform.sendDeviceUpdate(this.accessory, params)
-      gdService
+      this.gdService
         .updateCharacteristic(this.Characteristic.TargetDoorState, value)
         .updateCharacteristic(this.Characteristic.CurrentDoorState, value + 2)
       await helpers.sleep(2000)
       this.accessory.context.inUse = false
       if (value === 0) {
         await helpers.sleep(Math.max((garageConfig.operationTime - 20) * 100, 0))
-        gdService.updateCharacteristic(this.Characteristic.CurrentDoorState, 0)
+        this.gdService.updateCharacteristic(this.Characteristic.CurrentDoorState, 0)
       }
     } catch (err) {
       this.accessory.context.inUse = false
@@ -63,8 +61,7 @@ module.exports = class deviceGarageEachen {
         throw new Error('improper configuration')
       }
       this.accessory.context.inUse = true
-      const gdService = this.accessory.getService(this.Service.GarageDoorOpener)
-      gdService
+      this.gdService
         .updateCharacteristic(this.Characteristic.TargetDoorState, params.switch === 'on' ? 0 : 1)
         .updateCharacteristic(this.Characteristic.CurrentDoorState, params.switch === 'on' ? 0 : 1)
       this.accessory.context.inUse = false
diff --git a/lib/device/garage.js b/lib/device/garage.js
index 2e69359c..35abe5e8 100644
--- a/lib/device/garage.js
+++ b/lib/device/garage.js
@@ -7,16 +7,15 @@ module.exports = class deviceGarage {
     this.platform = platform
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
-    let gdService
-    if (!(gdService = accessory.getService(this.Service.GarageDoorOpener))) {
+    if (!(this.gdService = accessory.getService(this.Service.GarageDoorOpener))) {
       accessory
         .addService(this.Service.GarageDoorOpener)
         .setCharacteristic(this.Characteristic.CurrentDoorState, 1)
         .setCharacteristic(this.Characteristic.TargetDoorState, 1)
         .setCharacteristic(this.Characteristic.ObstructionDetected, false)
-      gdService = accessory.getService(this.Service.GarageDoorOpener)
+      this.gdService = accessory.getService(this.Service.GarageDoorOpener)
     }
-    gdService
+    this.gdService
       .getCharacteristic(this.Characteristic.TargetDoorState)
       .on('set', (value, callback) => this.internalUpdate(value, callback))
     this.accessory = accessory
@@ -37,7 +36,6 @@ module.exports = class deviceGarage {
       const newPos = value
       const params = {}
       let delay = 0
-      const gdService = this.accessory.getService(this.Service.GarageDoorOpener)
       if (sensorDefinition && !(sAccessory = this.platform.devicesInHB.get(garageConfig.sensorId + 'SWX'))) {
         throw new Error("defined DW2 sensor doesn't exist")
       }
@@ -53,13 +51,13 @@ module.exports = class deviceGarage {
       this.accessory.context.inUse = true
       this.accessory.context.state = value
       if (garageConfig.setup === 'oneSwitch' && [2, 3].includes(prevState)) {
-        gdService.updateCharacteristic(this.Characteristic.CurrentDoorState, ((prevState * 2) % 3) + 2)
+        this.gdService.updateCharacteristic(this.Characteristic.CurrentDoorState, ((prevState * 2) % 3) + 2)
         this.accessory.context.cacheCurrentDoorState = ((prevState * 2) % 3) + 2
         delay = 1500
       }
       if (this.accessory.context.state !== newPos) return
       await helpers.sleep(delay)
-      gdService
+      this.gdService
         .updateCharacteristic(this.Characteristic.TargetDoorState, newPos)
         .updateCharacteristic(this.Characteristic.CurrentDoorState, newPos + 2)
       this.accessory.context.cacheTargetDoorState = newPos
@@ -77,7 +75,7 @@ module.exports = class deviceGarage {
       await this.platform.sendDeviceUpdate(this.accessory, params)
       await helpers.sleep(Math.max(garageConfig.operationTime * 100, 1000))
       if (!sAccessory) {
-        gdService.updateCharacteristic(this.Characteristic.CurrentDoorState, newPos)
+        this.gdService.updateCharacteristic(this.Characteristic.CurrentDoorState, newPos)
         this.accessory.context.cacheCurrentDoorState = newPos
       }
       this.accessory.context.inUse = false
@@ -92,7 +90,6 @@ module.exports = class deviceGarage {
         return
       }
       let garageConfig
-      const gcService = this.accessory.getService(this.Service.GarageDoorOpener)
       const prevState = this.accessory.context.cacheCurrentDoorState
       const newPos = [0, 2].includes(prevState) ? 3 : 2
       if (!(garageConfig = this.platform.cusG.get(this.accessory.context.hbDeviceId))) {
@@ -121,13 +118,13 @@ module.exports = class deviceGarage {
       if (garageConfig.sensorId) {
         await helpers.sleep(Math.max(garageConfig.operationTime * 100, 1000))
       } else {
-        gcService
+        this.gdService
           .updateCharacteristic(this.Characteristic.TargetDoorState, newPos - 2)
           .updateCharacteristic(this.Characteristic.CurrentDoorState, newPos)
         this.accessory.context.cacheCurrentDoorState = newPos
         this.accessory.context.cacheTargetDoorState = newPos - 2
         await helpers.sleep(Math.max(garageConfig.operationTime * 100, 1000))
-        gcService.updateCharacteristic(this.Characteristic.CurrentDoorState, newPos - 2)
+        this.gdService.updateCharacteristic(this.Characteristic.CurrentDoorState, newPos - 2)
         this.accessory.context.cacheCurrentDoorState = newPos - 2
       }
       this.accessory.context.inUse = false
diff --git a/lib/device/light-colour.js b/lib/device/light-colour.js
index fba478c3..032cc295 100644
--- a/lib/device/light-colour.js
+++ b/lib/device/light-colour.js
@@ -8,22 +8,22 @@ module.exports = class deviceLightColour {
     this.platform = platform
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
-    const lightService = accessory.getService(this.Service.Lightbulb) || accessory.addService(this.Service.Lightbulb)
-    lightService
+    this.lightService = accessory.getService(this.Service.Lightbulb) || accessory.addService(this.Service.Lightbulb)
+    this.lightService
       .getCharacteristic(this.Characteristic.On)
       .on('set', (value, callback) => this.internalUpdate('onoff', value, callback))
-    lightService
+    this.lightService
       .getCharacteristic(this.Characteristic.Brightness)
       .on('set', (value, callback) => this.internalUpdate('brightness', value, callback))
-    lightService
+    this.lightService
       .getCharacteristic(this.Characteristic.Hue)
       .on('set', (value, callback) => this.internalUpdate('hue', value, callback))
-    lightService
+    this.lightService
       .getCharacteristic(this.Characteristic.Saturation)
       .on('set', (value, callback) => callback())
     if (accessory.context.eweUIID === 22) {
       // *** B1 doesn't support brightness *** \\
-      lightService
+      this.lightService
         .getCharacteristic(this.Characteristic.Brightness)
         .setProps({
           minStep: 100
@@ -36,7 +36,6 @@ module.exports = class deviceLightColour {
     try {
       let newRGB
       let params = {}
-      const lightService = this.accessory.getService(this.Service.Lightbulb)
       switch (type) {
         case 'onoff':
           callback()
@@ -87,7 +86,7 @@ module.exports = class deviceLightColour {
           callback()
           const updateKeyColour = Math.random().toString(36).substr(2, 8)
           this.accessory.context.updateKeyColour = updateKeyColour
-          newRGB = convert.hsv.rgb(value, lightService.getCharacteristic(this.Characteristic.Saturation).value, 100)
+          newRGB = convert.hsv.rgb(value, this.lightService.getCharacteristic(this.Characteristic.Saturation).value, 100)
           switch (this.accessory.context.eweUIID) {
             case 22:
             // *** B1 *** \\
@@ -118,7 +117,7 @@ module.exports = class deviceLightColour {
                   r: newRGB[0],
                   g: newRGB[1],
                   b: newRGB[2],
-                  br: lightService.getCharacteristic(this.Characteristic.Brightness).value
+                  br: this.lightService.getCharacteristic(this.Characteristic.Brightness).value
                 }
               }
               this.accessory.context.cacheR = newRGB[0]
@@ -143,16 +142,15 @@ module.exports = class deviceLightColour {
       let newColour
       let mode
       let isOn = false
-      const lightService = this.accessory.getService(this.Service.Lightbulb)
       if (this.accessory.context.eweUIID === 22 && helpers.hasProperty(params, 'state')) {
         isOn = params.state === 'on'
       } else if (this.accessory.context.eweUIID !== 22 && helpers.hasProperty(params, 'switch')) {
         isOn = params.switch === 'on'
       } else {
-        isOn = lightService.getCharacteristic(this.Characteristic.On).value
+        isOn = this.lightService.getCharacteristic(this.Characteristic.On).value
       }
       if (isOn) {
-        lightService.updateCharacteristic(this.Characteristic.On, true)
+        this.lightService.updateCharacteristic(this.Characteristic.On, true)
         switch (this.accessory.context.eweUIID) {
           case 22:
             // *** B1 *** \\
@@ -169,7 +167,7 @@ module.exports = class deviceLightColour {
                 parseInt(params.channel3),
                 parseInt(params.channel4)
               )
-              lightService
+              this.lightService
                 .updateCharacteristic(this.Characteristic.Hue, newColour[0])
                 .updateCharacteristic(this.Characteristic.Saturation, 100)
                 .updateCharacteristic(this.Characteristic.Brightness, 100)
@@ -178,11 +176,11 @@ module.exports = class deviceLightColour {
           case 59:
             // *** L1 *** \\
             if (helpers.hasProperty(params, 'bright')) {
-              lightService.updateCharacteristic(this.Characteristic.Brightness, params.bright)
+              this.lightService.updateCharacteristic(this.Characteristic.Brightness, params.bright)
             }
             if (helpers.hasProperty(params, 'colorR')) {
               newColour = convert.rgb.hsv(params.colorR, params.colorG, params.colorB)
-              lightService
+              this.lightService
                 .updateCharacteristic(this.Characteristic.Hue, newColour[0])
                 .updateCharacteristic(this.Characteristic.Saturation, newColour[1])
             }
@@ -193,7 +191,7 @@ module.exports = class deviceLightColour {
               mode = params.ltype
               if (mode === 'color' && helpers.hasProperty(params, 'color')) {
                 if (helpers.hasProperty(params.color, 'br')) {
-                  lightService.updateCharacteristic(this.Characteristic.Brightness, params.color.br)
+                  this.lightService.updateCharacteristic(this.Characteristic.Brightness, params.color.br)
                 }
                 if (
                   helpers.hasProperty(params.color, 'r') &&
@@ -205,7 +203,7 @@ module.exports = class deviceLightColour {
                     parseInt(params.color.g),
                     parseInt(params.color.b)
                   )
-                  lightService
+                  this.lightService
                     .updateCharacteristic(this.Characteristic.Hue, newColour[0])
                     .updateCharacteristic(this.Characteristic.Saturation, 100)
                   this.accessory.context.cacheR = params.color.r
@@ -217,7 +215,7 @@ module.exports = class deviceLightColour {
             break
         }
       } else {
-        lightService.updateCharacteristic(this.Characteristic.On, false)
+        this.lightService.updateCharacteristic(this.Characteristic.On, false)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
diff --git a/lib/device/light-ctemp.js b/lib/device/light-ctemp.js
index 317e5d91..1799f8f2 100644
--- a/lib/device/light-ctemp.js
+++ b/lib/device/light-ctemp.js
@@ -7,14 +7,14 @@ module.exports = class deviceLightColour {
     this.platform = platform
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
-    const lightService = accessory.getService(this.Service.Lightbulb) || accessory.addService(this.Service.Lightbulb)
-    lightService
+    this.lightService = accessory.getService(this.Service.Lightbulb) || accessory.addService(this.Service.Lightbulb)
+    this.lightService
       .getCharacteristic(this.Characteristic.On)
       .on('set', (value, callback) => this.internalUpdate('onoff', value, callback))
-    lightService
+    this.lightService
       .getCharacteristic(this.Characteristic.Brightness)
       .on('set', (value, callback) => this.internalUpdate('brightness', value, callback))
-    lightService
+    this.lightService
       .getCharacteristic(this.Characteristic.ColorTemperature)
       .on('set', (value, callback) => this.internalUpdate('colour', value, callback))
     this.accessory = accessory
@@ -23,7 +23,6 @@ module.exports = class deviceLightColour {
   async internalUpdate (type, value, callback) {
     try {
       let params = {}
-      const lightService = this.accessory.getService(this.Service.Lightbulb)
       switch (type) {
         case 'onoff':
           callback()
@@ -63,7 +62,7 @@ module.exports = class deviceLightColour {
             ltype: 'white',
             white: {
               ct: kToCT,
-              br: lightService.getCharacteristic(this.Characteristic.Brightness).value
+              br: this.lightService.getCharacteristic(this.Characteristic.Brightness).value
             }
           }
           this.accessory.context.cacheCT = kToCT
@@ -83,19 +82,18 @@ module.exports = class deviceLightColour {
       if (helpers.hasProperty(params, 'updateSource') && params.updateSource === 'LAN') return
       let mode
       let isOn = false
-      const lightService = this.accessory.getService(this.Service.Lightbulb)
       if (helpers.hasProperty(params, 'switch')) {
         isOn = params.switch === 'on'
       } else {
-        isOn = lightService.getCharacteristic(this.Characteristic.On).value
+        isOn = this.lightService.getCharacteristic(this.Characteristic.On).value
       }
       if (isOn) {
-        lightService.updateCharacteristic(this.Characteristic.On, true)
+        this.lightService.updateCharacteristic(this.Characteristic.On, true)
         if (helpers.hasProperty(params, 'ltype')) {
           mode = params.ltype
           if (mode === 'white' && helpers.hasProperty(params, 'white')) {
             if (helpers.hasProperty(params.white, 'br')) {
-              lightService.updateCharacteristic(this.Characteristic.Brightness, params.white.br)
+              this.lightService.updateCharacteristic(this.Characteristic.Brightness, params.white.br)
             }
             if (helpers.hasProperty(params.white, 'ct')) {
               // B02-F-A60 has a range of 2200K-6500K corresponding to ct: 0-255
@@ -104,13 +102,13 @@ module.exports = class deviceLightColour {
               const ctToK = Math.round(params.white.ct / 255 * 4300 + 2200)
               const kToMired = Math.round(1000000 / ctToK)
 
-              lightService.updateCharacteristic(this.Characteristic.ColorTemperature, kToMired)
+              this.lightService.updateCharacteristic(this.Characteristic.ColorTemperature, kToMired)
               this.accessory.context.cacheCT = params.white.ct
             }
           }
         }
       } else {
-        lightService.updateCharacteristic(this.Characteristic.On, false)
+        this.lightService.updateCharacteristic(this.Characteristic.On, false)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
diff --git a/lib/device/light-dimmer.js b/lib/device/light-dimmer.js
index 734bb4ff..243903f3 100644
--- a/lib/device/light-dimmer.js
+++ b/lib/device/light-dimmer.js
@@ -7,11 +7,11 @@ module.exports = class deviceLightDimmer {
     this.platform = platform
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
-    const lightService = accessory.getService(this.Service.Lightbulb) || accessory.addService(this.Service.Lightbulb)
-    lightService
+    this.lightService = accessory.getService(this.Service.Lightbulb) || accessory.addService(this.Service.Lightbulb)
+    this.lightService
       .getCharacteristic(this.Characteristic.On)
       .on('set', (value, callback) => this.internalUpdate('onoff', value, callback))
-    lightService.getCharacteristic(this.Characteristic.Brightness)
+    this.lightService.getCharacteristic(this.Characteristic.Brightness)
       .on('set', (value, callback) => this.internalUpdate('brightness', value, callback))
     this.accessory = accessory
   }
@@ -52,29 +52,28 @@ module.exports = class deviceLightDimmer {
 
   async externalUpdate (params) {
     try {
-      const lightService = this.accessory.getService(this.Service.Lightbulb)
       const isOn = helpers.hasProperty(params, 'switch')
         ? params.switch === 'on'
-        : lightService.getCharacteristic(this.Characteristic.On).value
+        : this.lightService.getCharacteristic(this.Characteristic.On).value
       if (isOn) {
-        lightService.updateCharacteristic(this.Characteristic.On, true)
+        this.lightService.updateCharacteristic(this.Characteristic.On, true)
         switch (this.accessory.context.eweUIID) {
           case 36:
             // *** KING-M4 eWeLink scale is 10-100 and HomeKit scale is 0-100. *** \\
             if (helpers.hasProperty(params, 'bright')) {
               const nb = Math.round(((params.bright - 10) * 10) / 9)
-              lightService.updateCharacteristic(this.Characteristic.Brightness, nb)
+              this.lightService.updateCharacteristic(this.Characteristic.Brightness, nb)
             }
             break
           case 44:
             // *** D1 eWeLink scale matches HomeKit scale of 0-100 *** \\
             if (helpers.hasProperty(params, 'brightness')) {
-              lightService.updateCharacteristic(this.Characteristic.Brightness, params.brightness)
+              this.lightService.updateCharacteristic(this.Characteristic.Brightness, params.brightness)
             }
             break
         }
       } else {
-        lightService.updateCharacteristic(this.Characteristic.On, false)
+        this.lightService.updateCharacteristic(this.Characteristic.On, false)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
diff --git a/lib/device/lock.js b/lib/device/lock.js
index 25730813..f3d18508 100644
--- a/lib/device/lock.js
+++ b/lib/device/lock.js
@@ -7,8 +7,8 @@ module.exports = class deviceLock {
     this.platform = platform
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
-    const lmService = accessory.getService(this.Service.LockMechanism) || accessory.addService(this.Service.LockMechanism)
-    lmService
+    this.lmService = accessory.getService(this.Service.LockMechanism) || accessory.addService(this.Service.LockMechanism)
+    this.lmService
       .getCharacteristic(this.Characteristic.LockTargetState)
       .on('set', (value, callback) => this.internalUpdate(value, callback))
     this.accessory = accessory
@@ -19,7 +19,6 @@ module.exports = class deviceLock {
       callback()
       let lockConfig
       const params = { switch: 'on' }
-      const lmService = this.accessory.getService(this.Service.LockMechanism)
       if (!(lockConfig = this.platform.cusG.get(this.accessory.context.hbDeviceId))) {
         throw new Error('group config missing')
       }
@@ -29,7 +28,7 @@ module.exports = class deviceLock {
       this.accessory.context.inUse = true
       await this.platform.sendDeviceUpdate(this.accessory, params)
       await helpers.sleep(Math.max(lockConfig.operationTime * 100, 1000))
-      lmService
+      this.lmService
         .updateCharacteristic(this.Characteristic.LockTargetState, 1)
         .updateCharacteristic(this.Characteristic.LockCurrentState, 1)
       this.accessory.context.inUse = false
@@ -42,7 +41,6 @@ module.exports = class deviceLock {
     try {
       if (!helpers.hasProperty(params, 'switch')) return
       let lockConfig
-      const lmService = this.accessory.getService(this.Service.LockMechanism)
       if (!(lockConfig = this.platform.cusG.get(this.accessory.context.hbDeviceId))) {
         throw new Error('group config missing')
       }
@@ -53,11 +51,11 @@ module.exports = class deviceLock {
         return
       }
       this.accessory.context.inUse = true
-      lmService
+      this.lmService
         .updateCharacteristic(this.Characteristic.LockCurrentState, 0)
         .updateCharacteristic(this.Characteristic.LockTargetState, 0)
       await helpers.sleep(Math.max(lockConfig.operationTime * 100, 1000))
-      lmService
+      this.lmService
         .updateCharacteristic(this.Characteristic.LockCurrentState, 1)
         .updateCharacteristic(this.Characteristic.LockTargetState, 1)
       this.accessory.context.inUse = false
diff --git a/lib/device/outlet.js b/lib/device/outlet.js
index fdbcfea8..f6901c78 100644
--- a/lib/device/outlet.js
+++ b/lib/device/outlet.js
@@ -88,26 +88,24 @@ module.exports = class deviceOutlet {
     if (accessory.getService(this.Service.Switch)) {
       accessory.removeService(accessory.getService(this.Service.Switch))
     }
-    let outletService
-    if (!(outletService = accessory.getService(this.Service.Outlet))) {
-      accessory.addService(this.Service.Outlet)
-      outletService = accessory.getService(this.Service.Outlet)
-      outletService.addCharacteristic(this.eveVoltage)
-      outletService.addCharacteristic(this.eveCurrentConsumption)
-      outletService.addCharacteristic(this.eveElectricCurrent)
-      outletService.addCharacteristic(this.eveTotalConsumption)
-      outletService.addCharacteristic(this.eveResetTotal)
+    if (!(this.outletService = accessory.getService(this.Service.Outlet))) {
+      this.outletService = accessory.addService(this.Service.Outlet)
+      this.outletService.addCharacteristic(this.eveVoltage)
+      this.outletService.addCharacteristic(this.eveCurrentConsumption)
+      this.outletService.addCharacteristic(this.eveElectricCurrent)
+      this.outletService.addCharacteristic(this.eveTotalConsumption)
+      this.outletService.addCharacteristic(this.eveResetTotal)
     }
-    outletService
+    this.outletService
       .getCharacteristic(this.Characteristic.On)
       .on('set', (value, callback) => this.internalUpdate(value, callback))
-    outletService
+    this.outletService
       .getCharacteristic(this.eveResetTotal)
       .on('set', (value, callback) => {
         callback()
         accessory.context.energyReadings = []
         accessory.context.energyReadingTotal = 0
-        outletService.updateCharacteristic(this.eveTotalConsumption, 0)
+        this.outletService.updateCharacteristic(this.eveTotalConsumption, 0)
       })
     accessory.log = this.platform.log
     accessory.eveLogger = new this.EveHistoryService('energy', accessory, {
@@ -124,7 +122,7 @@ module.exports = class deviceOutlet {
         accessory.context.energyReadingTotal += total
       }
       accessory.context.energyReadings = []
-      outletService.updateCharacteristic(this.eveTotalConsumption, accessory.context.energyReadingTotal)
+      this.outletService.updateCharacteristic(this.eveTotalConsumption, accessory.context.energyReadingTotal)
     }, 300000)
     this.accessory = accessory
   }
@@ -141,17 +139,17 @@ module.exports = class deviceOutlet {
 
   async externalUpdate (params) {
     try {
-      const outletService = this.accessory.getService(this.Service.Outlet)
       if (helpers.hasProperty(params, 'switch')) {
-        outletService.updateCharacteristic(this.Characteristic.On, params.switch === 'on')
+        this.outletService.updateCharacteristic(this.Characteristic.On, params.switch === 'on')
         if (!this.accessory.context.powerReadings) {
-          outletService.updateCharacteristic(this.Characteristic.OutletInUse, params.switch === 'on')
+          this.outletService.updateCharacteristic(this.Characteristic.OutletInUse, params.switch === 'on')
         }
       }
       if (helpers.hasProperty(params, 'power')) {
         this.accessory.context.powerReadings = true
-        outletService.updateCharacteristic(this.Characteristic.OutletInUse, parseFloat(params.power) > this.inUsePowerThreshold)
-        outletService.updateCharacteristic(this.eveCurrentConsumption, parseFloat(params.power))
+        this.outletService
+          .updateCharacteristic(this.Characteristic.OutletInUse, parseFloat(params.power) > this.inUsePowerThreshold)
+          .updateCharacteristic(this.eveCurrentConsumption, parseFloat(params.power))
         const isOn = this.accessory.getService(this.Service.Outlet).getCharacteristic(this.Characteristic.On).value
         this.accessory.eveLogger.addEntry({
           time: Math.round(new Date().valueOf() / 1000),
@@ -160,10 +158,10 @@ module.exports = class deviceOutlet {
         this.accessory.context.energyReadings.push(parseFloat(params.power))
       }
       if (helpers.hasProperty(params, 'voltage')) {
-        outletService.updateCharacteristic(this.eveVoltage, parseFloat(params.voltage))
+        this.outletService.updateCharacteristic(this.eveVoltage, parseFloat(params.voltage))
       }
       if (helpers.hasProperty(params, 'current')) {
-        outletService.updateCharacteristic(this.eveElectricCurrent, parseFloat(params.current))
+        this.outletService.updateCharacteristic(this.eveElectricCurrent, parseFloat(params.current))
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
diff --git a/lib/device/scm.js b/lib/device/scm.js
index 72313bf9..83afcfe5 100644
--- a/lib/device/scm.js
+++ b/lib/device/scm.js
@@ -9,8 +9,8 @@ module.exports = class deviceSCM {
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
     this.EveHistoryService = fakegato(platform.api)
-    const scmService = accessory.getService(this.Service.Switch) || accessory.addService(this.Service.Switch)
-    scmService
+    this.switchService = accessory.getService(this.Service.Switch) || accessory.addService(this.Service.Switch)
+    this.switchService
       .getCharacteristic(this.Characteristic.On)
       .on('set', (value, callback) => this.internalUpdate(value, callback))
     accessory.log = this.platform.log
@@ -35,7 +35,7 @@ module.exports = class deviceSCM {
   async externalUpdate (params) {
     try {
       if (!helpers.hasProperty(params, 'switches')) return
-      this.accessory.getService(this.Service.Switch).updateCharacteristic(this.Characteristic.On, params.switches[0].switch === 'on')
+      this.switchService.updateCharacteristic(this.Characteristic.On, params.switches[0].switch === 'on')
       this.accessory.eveLogger.addEntry({
         time: Math.round(new Date().valueOf() / 1000),
         status: params.switches[0].switch === 'on' ? 1 : 0
diff --git a/lib/device/sensor.js b/lib/device/sensor.js
index 50c5816e..e9359085 100644
--- a/lib/device/sensor.js
+++ b/lib/device/sensor.js
@@ -15,8 +15,8 @@ module.exports = class deviceSensor {
       : this.lowBattThreshold < 5
         ? helpers.defaults.lowBattThreshold
         : this.lowBattThreshold
-    if (!accessory.getService(this.Service.ContactSensor)) accessory.addService(this.Service.ContactSensor)
-    if (!accessory.getService(this.Service.BatteryService)) accessory.addService(this.Service.BatteryService)
+    this.contactService = accessory.getService(this.Service.ContactSensor) || accessory.addService(this.Service.ContactSensor)
+    this.batteryService = accessory.getService(this.Service.BatteryService) || accessory.addService(this.Service.BatteryService)
     accessory.log = this.platform.log
     accessory.eveLogger = new this.EveHistoryService('door', accessory, {
       storage: 'fs',
@@ -28,20 +28,15 @@ module.exports = class deviceSensor {
   async externalUpdate (params) {
     try {
       if (helpers.hasProperty(params, 'battery')) {
-        const batteryService =
-            this.accessory.getService(this.Service.BatteryService) || this.accessory.addService(this.Service.BatteryService)
         const scaledBattery = Math.round(params.battery * 33.3)
-        batteryService.updateCharacteristic(this.Characteristic.BatteryLevel, scaledBattery)
-        batteryService.updateCharacteristic(
-          this.Characteristic.StatusLowBattery,
-          scaledBattery < this.lowBattThreshold
-        )
+        this.batteryService
+          .updateCharacteristic(this.Characteristic.BatteryLevel, scaledBattery)
+          .updateCharacteristic(this.Characteristic.StatusLowBattery, scaledBattery < this.lowBattThreshold)
       }
       if (!helpers.hasProperty(params, 'switch')) return
       const newState = params.switch === 'on' ? 1 : 0
       let oAccessory = false
-      const contactService = this.accessory.getService(this.Service.ContactSensor)
-      contactService.updateCharacteristic(this.Characteristic.ContactSensorState, newState)
+      this.contactService.updateCharacteristic(this.Characteristic.ContactSensorState, newState)
       this.accessory.eveLogger.addEntry({
         time: Math.round(new Date().valueOf() / 1000),
         status: newState
@@ -49,17 +44,16 @@ module.exports = class deviceSensor {
       this.platform.cusG.forEach(async group => {
         if (group.sensorId === this.accessory.context.eweDeviceId && group.type === 'garage') {
           if ((oAccessory = this.platform.devicesInHB.get(group.deviceId + 'SWX'))) {
+            const gdService = oAccessory.getService(this.Service.GarageDoorOpener)
             switch (newState) {
               case 0:
-                oAccessory
-                  .getService(this.Service.GarageDoorOpener)
+                gdService
                   .updateCharacteristic(this.Characteristic.TargetDoorState, 1)
                   .updateCharacteristic(this.Characteristic.CurrentDoorState, 1)
                 break
               case 1:
                 await helpers.sleep(Math.max(group.operationTime * 100, 1000))
-                oAccessory
-                  .getService(this.Service.GarageDoorOpener)
+                gdService
                   .updateCharacteristic(this.Characteristic.TargetDoorState, 0)
                   .updateCharacteristic(this.Characteristic.CurrentDoorState, 0)
                 break
diff --git a/lib/device/switch-multi.js b/lib/device/switch-multi.js
index 19b71595..36dd0b51 100644
--- a/lib/device/switch-multi.js
+++ b/lib/device/switch-multi.js
@@ -9,8 +9,8 @@ module.exports = class deviceSwitchMulti {
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
     this.EveHistoryService = fakegato(platform.api)
-    const switchService = accessory.getService(this.Service.Switch) || accessory.addService(this.Service.Switch)
-    switchService
+    this.switchService = accessory.getService(this.Service.Switch) || accessory.addService(this.Service.Switch)
+    this.switchService
       .getCharacteristic(this.Characteristic.On)
       .on('set', (value, callback) => this.internalUpdate(value, callback))
     if (accessory.getService(this.Service.Outlet)) {
@@ -102,7 +102,7 @@ module.exports = class deviceSwitchMulti {
         }
       }
       if (!this.platform.hiddenMasters.includes(this.accessory.context.eweDeviceId)) {
-        this.accessory.getService(this.Service.Switch).updateCharacteristic(this.Characteristic.On, primaryState)
+        this.switchService.updateCharacteristic(this.Characteristic.On, primaryState)
         this.accessory.eveLogger.addEntry({
           time: Math.round(new Date().valueOf() / 1000),
           status: primaryState ? 1 : 0
diff --git a/lib/device/switch-single.js b/lib/device/switch-single.js
index b1902f91..f96e1485 100644
--- a/lib/device/switch-single.js
+++ b/lib/device/switch-single.js
@@ -9,8 +9,8 @@ module.exports = class deviceSwitchSingle {
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
     this.EveHistoryService = fakegato(platform.api)
-    const switchService = accessory.getService(this.Service.Switch) || accessory.addService(this.Service.Switch)
-    switchService
+    this.switchService = accessory.getService(this.Service.Switch) || accessory.addService(this.Service.Switch)
+    this.switchService
       .getCharacteristic(this.Characteristic.On)
       .on('set', (value, callback) => this.internalUpdate(value, callback))
     if (accessory.getService(this.Service.Outlet)) {
@@ -41,7 +41,7 @@ module.exports = class deviceSwitchSingle {
   async externalUpdate (params) {
     try {
       if (!helpers.hasProperty(params, 'switch')) return
-      this.accessory.getService(this.Service.Switch).updateCharacteristic(this.Characteristic.On, params.switch === 'on')
+      this.switchService.updateCharacteristic(this.Characteristic.On, params.switch === 'on')
       this.accessory.eveLogger.addEntry({
         time: Math.round(new Date().valueOf() / 1000),
         status: params.switch === 'on' ? 1 : 0
diff --git a/lib/device/thermostat.js b/lib/device/thermostat.js
index 9400a497..03373573 100644
--- a/lib/device/thermostat.js
+++ b/lib/device/thermostat.js
@@ -14,14 +14,14 @@ module.exports = class deviceThermostat {
         accessory.removeService(accessory.getService(this.Service.Switch))
       }
     } else {
-      const switchService = accessory.getService(this.Service.Switch) || accessory.addService(this.Service.Switch)
-      switchService
+      this.switchService = accessory.getService(this.Service.Switch) || accessory.addService(this.Service.Switch)
+      this.switchService
         .getCharacteristic(this.Characteristic.On)
         .on('set', (value, callback) => this.internalUpdate(value, callback))
     }
-    if (!accessory.getService(this.Service.TemperatureSensor)) accessory.addService(this.Service.TemperatureSensor)
+    this.tempService = accessory.getService(this.Service.TemperatureSensor) || accessory.addService(this.Service.TemperatureSensor)
     if (accessory.context.sensorType !== 'DS18B20') {
-      if (!accessory.getService(this.Service.HumiditySensor)) accessory.addService(this.Service.HumiditySensor)
+      this.humiService = accessory.getService(this.Service.HumiditySensor) || accessory.addService(this.Service.HumiditySensor)
     }
     accessory.log = this.platform.log
     accessory.eveLogger = new this.EveHistoryService('custom', accessory, {
@@ -51,8 +51,7 @@ module.exports = class deviceThermostat {
         (helpers.hasProperty(params, 'switch') || helpers.hasProperty(params, 'mainSwitch'))
       ) {
         const newState = helpers.hasProperty(params, 'switch') ? params.switch === 'on' : params.mainSwitch === 'on'
-        const switchService = this.accessory.getService(this.Service.Switch)
-        switchService.updateCharacteristic(this.Characteristic.On, newState)
+        this.switchService.updateCharacteristic(this.Characteristic.On, newState)
         this.accessory.eveLogger.addEntry({
           time: Math.round(new Date().valueOf() / 1000),
           status: newState ? 1 : 0
@@ -61,16 +60,12 @@ module.exports = class deviceThermostat {
       const eveLog = { time: Math.round(new Date().valueOf() / 1000) }
       if (helpers.hasProperty(params, 'currentTemperature') && this.accessory.getService(this.Service.TemperatureSensor)) {
         const currentTemp = parseFloat(params.currentTemperature !== 'unavailable' ? params.currentTemperature : 0)
-        this.accessory
-          .getService(this.Service.TemperatureSensor)
-          .updateCharacteristic(this.Characteristic.CurrentTemperature, currentTemp)
+        this.tempService.updateCharacteristic(this.Characteristic.CurrentTemperature, currentTemp)
         eveLog.temp = currentTemp
       }
       if (helpers.hasProperty(params, 'currentHumidity') && this.accessory.getService(this.Service.HumiditySensor)) {
         const currentHumi = parseFloat(params.currentHumidity !== 'unavailable' ? params.currentHumidity : 0)
-        this.accessory
-          .getService(this.Service.HumiditySensor)
-          .updateCharacteristic(this.Characteristic.CurrentRelativeHumidity, currentHumi)
+        this.humiService.updateCharacteristic(this.Characteristic.CurrentRelativeHumidity, currentHumi)
         eveLog.humidity = currentHumi
       }
       if (helpers.hasProperty(eveLog, 'temp') || helpers.hasProperty(eveLog, 'humidity')) {
diff --git a/lib/device/usb.js b/lib/device/usb.js
index b4928a2f..6100821e 100644
--- a/lib/device/usb.js
+++ b/lib/device/usb.js
@@ -9,8 +9,8 @@ module.exports = class deviceUSB {
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
     this.EveHistoryService = fakegato(platform.api)
-    const usbService = accessory.getService(this.Service.Outlet) || accessory.addService(this.Service.Outlet)
-    usbService
+    this.outletService = accessory.getService(this.Service.Outlet) || accessory.addService(this.Service.Outlet)
+    this.outletService
       .getCharacteristic(this.Characteristic.On)
       .on('set', (value, callback) => this.internalUpdate(value, callback))
     accessory.log = this.platform.log
@@ -35,7 +35,7 @@ module.exports = class deviceUSB {
   async externalUpdate (params) {
     try {
       if (!helpers.hasProperty(params, 'switches')) return
-      this.accessory.getService(this.Service.Outlet).updateCharacteristic(this.Characteristic.On, params.switches[0].switch === 'on')
+      this.outletService.updateCharacteristic(this.Characteristic.On, params.switches[0].switch === 'on')
       this.accessory.eveLogger.addEntry({
         time: Math.round(new Date().valueOf() / 1000),
         status: params.switches[0].switch === 'on' ? 1 : 0
diff --git a/lib/device/valve.js b/lib/device/valve.js
index bf514311..05639a87 100644
--- a/lib/device/valve.js
+++ b/lib/device/valve.js
@@ -7,9 +7,8 @@ module.exports = class deviceValve {
     this.platform = platform
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
-    let valveService
     const valveConfig = this.platform.cusG.get(accessory.context.hbDeviceId)
-    if (!(valveService = accessory.getService(this.Service.Valve))) {
+    if (!(this.valveService = accessory.getService(this.Service.Valve))) {
       accessory
         .addService(this.Service.Valve)
         .setCharacteristic(this.Characteristic.Active, 0)
@@ -17,12 +16,12 @@ module.exports = class deviceValve {
         .setCharacteristic(this.Characteristic.ValveType, 1)
         .setCharacteristic(this.Characteristic.SetDuration, Math.round((valveConfig.operationTime || 1200) / 10))
         .addCharacteristic(this.Characteristic.RemainingDuration)
-      valveService = accessory.getService(this.Service.Valve)
+      this.valveService = accessory.getService(this.Service.Valve)
     }
-    valveService
+    this.valveService
       .getCharacteristic(this.Characteristic.Active)
       .on('set', (value, callback) => this.internalUpdate(value, callback))
-    valveService
+    this.valveService
       .getCharacteristic(this.Characteristic.SetDuration)
       .on('set', (value, callback) => {
         if (valveService.getCharacteristic(this.Characteristic.InUse).value) {
@@ -39,17 +38,16 @@ module.exports = class deviceValve {
     try {
       callback()
       const params = { switch: value ? 'on' : 'off' }
-      const serviceValve = this.accessory.getService(this.Service.Valve)
-      serviceValve.updateCharacteristic(this.Characteristic.InUse, value)
+      this.valveService.updateCharacteristic(this.Characteristic.InUse, value)
       switch (value) {
         case 0:
-          serviceValve.updateCharacteristic(this.Characteristic.RemainingDuration, 0)
+          this.valveService.updateCharacteristic(this.Characteristic.RemainingDuration, 0)
           clearTimeout(this.accessory.getService(this.Service.Valve).timer)
           break
         case 1: {
-          const timer = serviceValve.getCharacteristic(this.Characteristic.SetDuration).value
-          serviceValve.updateCharacteristic(this.Characteristic.RemainingDuration, timer)
-          serviceValve.timer = setTimeout(() => serviceValve.setCharacteristic(this.Characteristic.Active, 0), timer * 1000)
+          const timer = this.valveService.getCharacteristic(this.Characteristic.SetDuration).value
+          this.valveService.updateCharacteristic(this.Characteristic.RemainingDuration, timer)
+          this.valveService.timer = setTimeout(() => this.valveService.setCharacteristic(this.Characteristic.Active, 0), timer * 1000)
           break
         }
       }
@@ -62,17 +60,16 @@ module.exports = class deviceValve {
   async externalUpdate (params) {
     try {
       if (!helpers.hasProperty(params, 'switch')) return
-      const valveService = this.accessory.getService(this.Service.Valve)
-      valveService
+      this.valveService
         .updateCharacteristic(this.Characteristic.Active, params.switch === 'on')
         .updateCharacteristic(this.Characteristic.InUse, params.switch === 'on')
       if (params.switch === 'on') {
-        const timer = valveService.getCharacteristic(this.Characteristic.SetDuration).value
-        valveService.updateCharacteristic(this.Characteristic.RemainingDuration, timer)
-        valveService.timer = setTimeout(() => valveService.setCharacteristic(this.Characteristic.Active, 0), timer * 1000)
+        const timer = this.valveService.getCharacteristic(this.Characteristic.SetDuration).value
+        this.valveService.updateCharacteristic(this.Characteristic.RemainingDuration, timer)
+        this.valveService.timer = setTimeout(() => this.valveService.setCharacteristic(this.Characteristic.Active, 0), timer * 1000)
       } else {
-        valveService.updateCharacteristic(this.Characteristic.RemainingDuration, 0)
-        clearTimeout(valveService.timer)
+        this.valveService.updateCharacteristic(this.Characteristic.RemainingDuration, 0)
+        clearTimeout(this.valveService.timer)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)

From f35a93a08132212ea52a205dfa40306edbc6dac4 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 14 Nov 2020 16:39:21 +0000
Subject: [PATCH 0770/3183] Update valve.js

---
 lib/device/valve.js | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/lib/device/valve.js b/lib/device/valve.js
index 05639a87..53700f08 100644
--- a/lib/device/valve.js
+++ b/lib/device/valve.js
@@ -24,10 +24,13 @@ module.exports = class deviceValve {
     this.valveService
       .getCharacteristic(this.Characteristic.SetDuration)
       .on('set', (value, callback) => {
-        if (valveService.getCharacteristic(this.Characteristic.InUse).value) {
-          valveService.updateCharacteristic(this.Characteristic.RemainingDuration, value)
-          clearTimeout(valveService.timer)
-          valveService.timer = setTimeout(() => valveService.setCharacteristic(this.Characteristic.Active, 0), value * 1000)
+        if (this.valveService.getCharacteristic(this.Characteristic.InUse).value) {
+          this.valveService.updateCharacteristic(this.Characteristic.RemainingDuration, value)
+          clearTimeout(this.valveService.timer)
+          this.valveService.timer = setTimeout(
+            () => this.valveService.setCharacteristic(this.Characteristic.Active, 0),
+            value * 1000
+          )
         }
         callback()
       })

From 5581f0d78b9a3e3fe2d27a5a23010fb719c2e8d6 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 14 Nov 2020 17:53:30 +0000
Subject: [PATCH 0771/3183] use bind where possible

---
 lib/device/blind.js         |  2 +-
 lib/device/curtain.js       |  2 +-
 lib/device/diffuser.js      | 10 ++++-----
 lib/device/fan.js           | 41 +++++++++++++++++++++----------------
 lib/device/garage-eachen.js |  2 +-
 lib/device/garage.js        |  2 +-
 lib/device/lock.js          |  2 +-
 lib/device/outlet.js        |  2 +-
 lib/device/scm.js           |  2 +-
 lib/device/switch-multi.js  |  2 +-
 lib/device/switch-single.js |  2 +-
 lib/device/thermostat.js    |  2 +-
 lib/device/usb.js           |  2 +-
 lib/device/valve.js         |  2 +-
 lib/device/zb-dev.js        |  2 +-
 15 files changed, 41 insertions(+), 36 deletions(-)

diff --git a/lib/device/blind.js b/lib/device/blind.js
index 1a8800a5..5a47e793 100644
--- a/lib/device/blind.js
+++ b/lib/device/blind.js
@@ -17,7 +17,7 @@ module.exports = class deviceBlind {
     }
     this.wcService
       .getCharacteristic(this.Characteristic.TargetPosition)
-      .on('set', (value, callback) => this.internalUpdate(value, callback))
+      .on('set', this.internalUpdate.bind(this))
     this.accessory = accessory
   }
 
diff --git a/lib/device/curtain.js b/lib/device/curtain.js
index 037b9489..cb89b72b 100644
--- a/lib/device/curtain.js
+++ b/lib/device/curtain.js
@@ -17,7 +17,7 @@ module.exports = class deviceCurtain {
     }
     this.cService
       .getCharacteristic(this.Characteristic.TargetPosition)
-      .on('set', (value, callback) => this.internalUpdate(value, callback))
+      .on('set', this.internalUpdate.bind(this))
     this.accessory = accessory
   }
 
diff --git a/lib/device/diffuser.js b/lib/device/diffuser.js
index 00a8aa80..f63e509e 100644
--- a/lib/device/diffuser.js
+++ b/lib/device/diffuser.js
@@ -12,23 +12,23 @@ module.exports = class deviceDiffuser {
     this.lightService = accessory.getService('Light') || accessory.addService(this.Service.Lightbulb, 'Light', 'light')
     this.fanService
       .getCharacteristic(this.Characteristic.On)
-      .on('set', (value, callback) => this.internalDiffuserOnOffUpdate(value, callback))
+      .on('set', this.internalDiffuserOnOffUpdate.bind(this))
     this.accessory = accessory
     this.fanService
       .getCharacteristic(this.Characteristic.RotationSpeed)
-      .on('set', (value, callback) => this.internalDiffuserStateUpdate(value, callback))
+      .on('set', this.internalDiffuserStateUpdate.bind(this))
       .setProps({
         minStep: 50
       })
     this.lightService
       .getCharacteristic(this.Characteristic.On)
-      .on('set', (value, callback) => this.internalLightOnOffUpdate(value, callback))
+      .on('set', this.internalLightOnOffUpdate.bind(this))
     this.lightService
       .getCharacteristic(this.Characteristic.Brightness)
-      .on('set', (value, callback) => this.internalLightBrightnessUpdate(value, callback))
+      .on('set', this.internalLightBrightnessUpdate.bind(this))
     this.lightService
       .getCharacteristic(this.Characteristic.Hue)
-      .on('set', (value, callback) => this.internalLightColourUpdate(value, callback))
+      .on('set', this.internalLightColourUpdate.bind(this))
     this.lightService
       .getCharacteristic(this.Characteristic.Saturation)
       .on('set', (value, callback) => callback())
diff --git a/lib/device/fan.js b/lib/device/fan.js
index c593b3f8..2cf0d5c4 100644
--- a/lib/device/fan.js
+++ b/lib/device/fan.js
@@ -16,7 +16,7 @@ module.exports = class deviceFan {
       })
     this.fanService
       .getCharacteristic(this.Characteristic.RotationSpeed)
-      .on('set', (value, callback) => this.internalUpdate('speed', value, callback))
+      .on('set', this.internalSpeedUpdate.bind(this))
       .setProps({
         minStep: 33
       })
@@ -29,31 +29,36 @@ module.exports = class deviceFan {
       this.lightService = accessory.getService(this.Service.Lightbulb) || accessory.addService(this.Service.Lightbulb)
       this.lightService
         .getCharacteristic(this.Characteristic.On)
-        .on('set', (value, callback) => this.internalUpdate('light', value, callback))
+        .on('set', this.internalLightUpdate.bind(this))
       this.visibleLight = true
     }
     this.accessory = accessory
   }
 
-  async internalUpdate (type, value, callback) {
+  async internalSpeedUpdate (value, callback) {
     try {
       callback()
-      let newPower
-      let newSpeed
-      let newLight
       const params = { switches: helpers.defaultMultiSwitchOff }
-      switch (type) {
-        case 'speed':
-          newPower = value >= 33 ? 1 : 0
-          newSpeed = value
-          newLight = this.visibleLight ? this.lightService.getCharacteristic(this.Characteristic.On).value : true
-          break
-        case 'light':
-          newPower = this.fanService.getCharacteristic(this.Characteristic.On).value
-          newSpeed = this.fanService.getCharacteristic(this.Characteristic.RotationSpeed).value
-          newLight = this.visibleLight ? value : true
-          break
-      }
+      const newPower = value >= 33 ? 1 : 0
+      const newSpeed = value
+      const newLight = this.visibleLight ? this.lightService.getCharacteristic(this.Characteristic.On).value : true
+      params.switches[0].switch = newLight ? 'on' : 'off'
+      params.switches[1].switch = newPower === 1 && newSpeed >= 33 ? 'on' : 'off'
+      params.switches[2].switch = newPower === 1 && newSpeed >= 66 && newSpeed < 99 ? 'on' : 'off'
+      params.switches[3].switch = newPower === 1 && newSpeed >= 99 ? 'on' : 'off'
+      await this.platform.sendDeviceUpdate(this.accessory, params)
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, true)
+    }
+  }
+
+  async internalLightUpdate (type, value, callback) {
+    try {
+      callback()
+      const params = { switches: helpers.defaultMultiSwitchOff }
+      const newPower = this.fanService.getCharacteristic(this.Characteristic.On).value
+      const newSpeed = this.fanService.getCharacteristic(this.Characteristic.RotationSpeed).value
+      const newLight = this.visibleLight ? value : true
       params.switches[0].switch = newLight ? 'on' : 'off'
       params.switches[1].switch = newPower === 1 && newSpeed >= 33 ? 'on' : 'off'
       params.switches[2].switch = newPower === 1 && newSpeed >= 66 && newSpeed < 99 ? 'on' : 'off'
diff --git a/lib/device/garage-eachen.js b/lib/device/garage-eachen.js
index 5b56548b..a18c873a 100644
--- a/lib/device/garage-eachen.js
+++ b/lib/device/garage-eachen.js
@@ -17,7 +17,7 @@ module.exports = class deviceGarageEachen {
     }
     this.gdService
       .getCharacteristic(this.Characteristic.TargetDoorState)
-      .on('set', (value, callback) => this.internalUpdate(value, callback))
+      .on('set', this.internalUpdate.bind(this))
     this.accessory = accessory
   }
 
diff --git a/lib/device/garage.js b/lib/device/garage.js
index 35abe5e8..dbb74c4b 100644
--- a/lib/device/garage.js
+++ b/lib/device/garage.js
@@ -17,7 +17,7 @@ module.exports = class deviceGarage {
     }
     this.gdService
       .getCharacteristic(this.Characteristic.TargetDoorState)
-      .on('set', (value, callback) => this.internalUpdate(value, callback))
+      .on('set', this.internalUpdate.bind(this))
     this.accessory = accessory
   }
 
diff --git a/lib/device/lock.js b/lib/device/lock.js
index f3d18508..d606ae6f 100644
--- a/lib/device/lock.js
+++ b/lib/device/lock.js
@@ -10,7 +10,7 @@ module.exports = class deviceLock {
     this.lmService = accessory.getService(this.Service.LockMechanism) || accessory.addService(this.Service.LockMechanism)
     this.lmService
       .getCharacteristic(this.Characteristic.LockTargetState)
-      .on('set', (value, callback) => this.internalUpdate(value, callback))
+      .on('set', this.internalUpdate.bind(this))
     this.accessory = accessory
   }
 
diff --git a/lib/device/outlet.js b/lib/device/outlet.js
index f6901c78..cb04154f 100644
--- a/lib/device/outlet.js
+++ b/lib/device/outlet.js
@@ -98,7 +98,7 @@ module.exports = class deviceOutlet {
     }
     this.outletService
       .getCharacteristic(this.Characteristic.On)
-      .on('set', (value, callback) => this.internalUpdate(value, callback))
+      .on('set', this.internalUpdate.bind(this))
     this.outletService
       .getCharacteristic(this.eveResetTotal)
       .on('set', (value, callback) => {
diff --git a/lib/device/scm.js b/lib/device/scm.js
index 83afcfe5..1351e204 100644
--- a/lib/device/scm.js
+++ b/lib/device/scm.js
@@ -12,7 +12,7 @@ module.exports = class deviceSCM {
     this.switchService = accessory.getService(this.Service.Switch) || accessory.addService(this.Service.Switch)
     this.switchService
       .getCharacteristic(this.Characteristic.On)
-      .on('set', (value, callback) => this.internalUpdate(value, callback))
+      .on('set', this.internalUpdate.bind(this))
     accessory.log = this.platform.log
     accessory.eveLogger = new this.EveHistoryService('switch', accessory, {
       storage: 'fs',
diff --git a/lib/device/switch-multi.js b/lib/device/switch-multi.js
index 36dd0b51..a232cc50 100644
--- a/lib/device/switch-multi.js
+++ b/lib/device/switch-multi.js
@@ -12,7 +12,7 @@ module.exports = class deviceSwitchMulti {
     this.switchService = accessory.getService(this.Service.Switch) || accessory.addService(this.Service.Switch)
     this.switchService
       .getCharacteristic(this.Characteristic.On)
-      .on('set', (value, callback) => this.internalUpdate(value, callback))
+      .on('set', this.internalUpdate.bind(this))
     if (accessory.getService(this.Service.Outlet)) {
       accessory.removeService(accessory.getService(this.Service.Outlet))
     }
diff --git a/lib/device/switch-single.js b/lib/device/switch-single.js
index f96e1485..74b6f7eb 100644
--- a/lib/device/switch-single.js
+++ b/lib/device/switch-single.js
@@ -12,7 +12,7 @@ module.exports = class deviceSwitchSingle {
     this.switchService = accessory.getService(this.Service.Switch) || accessory.addService(this.Service.Switch)
     this.switchService
       .getCharacteristic(this.Characteristic.On)
-      .on('set', (value, callback) => this.internalUpdate(value, callback))
+      .on('set', this.internalUpdate.bind(this))
     if (accessory.getService(this.Service.Outlet)) {
       accessory.removeService(accessory.getService(this.Service.Outlet))
     }
diff --git a/lib/device/thermostat.js b/lib/device/thermostat.js
index 03373573..2c3ac02b 100644
--- a/lib/device/thermostat.js
+++ b/lib/device/thermostat.js
@@ -17,7 +17,7 @@ module.exports = class deviceThermostat {
       this.switchService = accessory.getService(this.Service.Switch) || accessory.addService(this.Service.Switch)
       this.switchService
         .getCharacteristic(this.Characteristic.On)
-        .on('set', (value, callback) => this.internalUpdate(value, callback))
+        .on('set', this.internalUpdate.bind(this))
     }
     this.tempService = accessory.getService(this.Service.TemperatureSensor) || accessory.addService(this.Service.TemperatureSensor)
     if (accessory.context.sensorType !== 'DS18B20') {
diff --git a/lib/device/usb.js b/lib/device/usb.js
index 6100821e..48de6c45 100644
--- a/lib/device/usb.js
+++ b/lib/device/usb.js
@@ -12,7 +12,7 @@ module.exports = class deviceUSB {
     this.outletService = accessory.getService(this.Service.Outlet) || accessory.addService(this.Service.Outlet)
     this.outletService
       .getCharacteristic(this.Characteristic.On)
-      .on('set', (value, callback) => this.internalUpdate(value, callback))
+      .on('set', this.internalUpdate.bind(this))
     accessory.log = this.platform.log
     accessory.eveLogger = new this.EveHistoryService('switch', accessory, {
       storage: 'fs',
diff --git a/lib/device/valve.js b/lib/device/valve.js
index 53700f08..74e88e2f 100644
--- a/lib/device/valve.js
+++ b/lib/device/valve.js
@@ -20,7 +20,7 @@ module.exports = class deviceValve {
     }
     this.valveService
       .getCharacteristic(this.Characteristic.Active)
-      .on('set', (value, callback) => this.internalUpdate(value, callback))
+      .on('set', this.internalUpdate.bind(this))
     this.valveService
       .getCharacteristic(this.Characteristic.SetDuration)
       .on('set', (value, callback) => {
diff --git a/lib/device/zb-dev.js b/lib/device/zb-dev.js
index 3a4c0aa7..4f9a2939 100644
--- a/lib/device/zb-dev.js
+++ b/lib/device/zb-dev.js
@@ -45,7 +45,7 @@ module.exports = class deviceZBDev {
         })
         accessory.getService(this.Service.Switch)
           .getCharacteristic(this.Characteristic.On)
-          .on('set', (value, callback) => this.internalUpdate(value, callback))
+          .on('set', this.internalUpdate.bind(this))
         break
       case 1770:
         if (!accessory.getService(this.Service.BatteryService)) accessory.addService(this.Service.BatteryService)

From 1d9c862710bcf7c03baf85e5f79134ed9d682e5e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 14 Nov 2020 18:03:00 +0000
Subject: [PATCH 0772/3183] 3.12.1-2

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 2109507a..4d03c789 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.12.1-1",
+  "version": "3.12.1-2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index edd02d79..77a66903 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.12.1-1",
+  "version": "3.12.1-2",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From d6391c7da8143638d5ab3ce0b2b782daebb83ccb Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Sat, 14 Nov 2020 21:47:30 +0000
Subject: [PATCH 0773/3183] Create build.yml

---
 .github/workflows/build.yml | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 .github/workflows/build.yml

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
new file mode 100644
index 00000000..e248ae14
--- /dev/null
+++ b/.github/workflows/build.yml
@@ -0,0 +1,23 @@
+name: Build
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        # the Node.js versions to build on
+        node-version: [10.x, 12.x, 14.x]
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Use Node.js ${{ matrix.node-version }} 
+        uses: actions/setup-node@v1
+        with:
+          node-version: ${{ matrix.node-version }}
+
+      - name: Install dependencies
+        run: npm install

From 2f3a42c466e01e36571e9d2d39cc5ab1b8ac444e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 14 Nov 2020 21:49:24 +0000
Subject: [PATCH 0774/3183] Update helpers.js

---
 lib/helpers.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/helpers.js b/lib/helpers.js
index cb2a0fc2..c2dd2917 100644
--- a/lib/helpers.js
+++ b/lib/helpers.js
@@ -127,7 +127,7 @@ module.exports = {
     22: 1, // "RGB_BALL_LIGHT"                         \\ B1, B1_R2
     23: 0, // "NEST_THERMOSTAT"                        \\
     24: 1, // "GSM_SOCKET"                             \\
-    25: 0, // "AROMATHERAPY",                          \\ Diffuser,  Komeito 1515-X
+    25: 0, // "AROMATHERAPY",                          \\ Diffuser, Komeito 1515-X
     26: 0, // "RuiMiTeWenKongQi"                       \\
     27: 1, // "GSM_UNLIMIT_SOCKET"                     \\
     28: 1, // "RF_BRIDGE"                              \\ RFBridge, RF_Bridge

From dea3494a5aa331f51ff0a7603562b3725743deb8 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 15 Nov 2020 11:11:27 +0000
Subject: [PATCH 0775/3183] reformat add part

---
 lib/device/blind.js         | 5 ++---
 lib/device/curtain.js       | 5 ++---
 lib/device/garage-eachen.js | 5 ++---
 lib/device/valve.js         | 5 ++---
 4 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/lib/device/blind.js b/lib/device/blind.js
index 5a47e793..04139820 100644
--- a/lib/device/blind.js
+++ b/lib/device/blind.js
@@ -8,12 +8,11 @@ module.exports = class deviceBlind {
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
     if (!(this.wcService = accessory.getService(this.Service.WindowCovering))) {
-      accessory
-        .addService(this.Service.WindowCovering)
+      this.wcService = accessory.addService(this.Service.WindowCovering)
+      this.wcService
         .setCharacteristic(this.Characteristic.CurrentPosition, 0)
         .setCharacteristic(this.Characteristic.TargetPosition, 0)
         .setCharacteristic(this.Characteristic.PositionState, 2)
-      this.wcService = accessory.getService(this.Service.WindowCovering)
     }
     this.wcService
       .getCharacteristic(this.Characteristic.TargetPosition)
diff --git a/lib/device/curtain.js b/lib/device/curtain.js
index cb89b72b..6a8c83a1 100644
--- a/lib/device/curtain.js
+++ b/lib/device/curtain.js
@@ -8,12 +8,11 @@ module.exports = class deviceCurtain {
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
     if (!(this.cService = accessory.getService(this.Service.WindowCovering))) {
-      accessory
-        .addService(this.Service.WindowCovering)
+      this.cService = accessory.addService(this.Service.WindowCovering)
+      this.cService
         .setCharacteristic(this.Characteristic.CurrentPosition, 0)
         .setCharacteristic(this.Characteristic.TargetPosition, 0)
         .setCharacteristic(this.Characteristic.PositionState, 2)
-      this.cService = accessory.getService(this.Service.WindowCovering)
     }
     this.cService
       .getCharacteristic(this.Characteristic.TargetPosition)
diff --git a/lib/device/garage-eachen.js b/lib/device/garage-eachen.js
index a18c873a..dc1b0ba7 100644
--- a/lib/device/garage-eachen.js
+++ b/lib/device/garage-eachen.js
@@ -8,12 +8,11 @@ module.exports = class deviceGarageEachen {
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
     if (!(this.gdService = accessory.getService(this.Service.GarageDoorOpener))) {
-      accessory
-        .addService(this.Service.GarageDoorOpener)
+      this.gdService = accessory.addService(this.Service.GarageDoorOpener)
+      this.gdService
         .setCharacteristic(this.Characteristic.CurrentDoorState, 1)
         .setCharacteristic(this.Characteristic.TargetDoorState, 1)
         .setCharacteristic(this.Characteristic.ObstructionDetected, false)
-      this.gdService = accessory.getService(this.Service.GarageDoorOpener)
     }
     this.gdService
       .getCharacteristic(this.Characteristic.TargetDoorState)
diff --git a/lib/device/valve.js b/lib/device/valve.js
index 74e88e2f..9ebb3274 100644
--- a/lib/device/valve.js
+++ b/lib/device/valve.js
@@ -9,14 +9,13 @@ module.exports = class deviceValve {
     this.Characteristic = platform.api.hap.Characteristic
     const valveConfig = this.platform.cusG.get(accessory.context.hbDeviceId)
     if (!(this.valveService = accessory.getService(this.Service.Valve))) {
-      accessory
-        .addService(this.Service.Valve)
+      this.valveService = accessory.addService(this.Service.Valve)
+      this.valveService
         .setCharacteristic(this.Characteristic.Active, 0)
         .setCharacteristic(this.Characteristic.InUse, 0)
         .setCharacteristic(this.Characteristic.ValveType, 1)
         .setCharacteristic(this.Characteristic.SetDuration, Math.round((valveConfig.operationTime || 1200) / 10))
         .addCharacteristic(this.Characteristic.RemainingDuration)
-      this.valveService = accessory.getService(this.Service.Valve)
     }
     this.valveService
       .getCharacteristic(this.Characteristic.Active)

From 0facebd3742509b6499e4909b4b49a75854be50b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 15 Nov 2020 11:15:08 +0000
Subject: [PATCH 0776/3183] update title for "hide TH switch"

---
 config.schema.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config.schema.json b/config.schema.json
index 77bebb1f..e88eaa97 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -82,7 +82,7 @@
       },
       "hideSwitchFromTH": {
         "type": "string",
-        "title": "Hide Fan Lights",
+        "title": "Hide TH10/16 Switches",
         "description": "A list of TH10/TH16 devices for which the switch will be hidden from Homebridge. For example '10009553c8' or multiple separated with a comma '10009553c8,10009553c9'."
       },
       "resetRFBridge": {

From eb1b1c3202a18015eb75b5a5a170d4ee81d432a5 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 15 Nov 2020 11:19:02 +0000
Subject: [PATCH 0777/3183] 3.13.0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 4d03c789..9e4aad0d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.12.1-2",
+  "version": "3.13.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 77a66903..15b62df7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.12.1-2",
+  "version": "3.13.0",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From d0d5bc17a7919472b262d2db00ee69b944b049e1 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Sun, 15 Nov 2020 12:59:50 +0000
Subject: [PATCH 0778/3183] Update new-issue.md

---
 .github/ISSUE_TEMPLATE/new-issue.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/new-issue.md b/.github/ISSUE_TEMPLATE/new-issue.md
index 34273d00..81903305 100644
--- a/.github/ISSUE_TEMPLATE/new-issue.md
+++ b/.github/ISSUE_TEMPLATE/new-issue.md
@@ -28,7 +28,7 @@ assignees: ''
 
 
 
-* Which eWeLink devices do you have that are causing issues?
+* Which eWeLink devices do you have that are causing issues? Please include product models if applicable.
 
 
 

From 3bb4df66b6e2045ded54ed9437be9c39db53c0cf Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Sun, 15 Nov 2020 13:03:17 +0000
Subject: [PATCH 0779/3183] Update new-issue.md

---
 .github/ISSUE_TEMPLATE/new-issue.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/new-issue.md b/.github/ISSUE_TEMPLATE/new-issue.md
index 81903305..ac949c09 100644
--- a/.github/ISSUE_TEMPLATE/new-issue.md
+++ b/.github/ISSUE_TEMPLATE/new-issue.md
@@ -38,7 +38,7 @@ assignees: ''
 
 ### Please paste any relevant logs below.
 <!--
-   It helps if you can turn on 'Debug Logging' and 'Request & Response Logging' in the package settings for more thorough logging.
+   It helps if you can turn on 'Debug Logging' and 'Request & Response Logging' in the plugin settings for more thorough logging.
    If you are posting an error then it is helpful for me to also see the previous few lines as this can show the cause of the error.
    Please enter the logs between the two ``` lines below so that the logs are formatted in a way which is easier to read
 -->

From c0b3b5e75941fbd5f024bebba96bb1d7ead61236 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 15 Nov 2020 13:50:26 +0000
Subject: [PATCH 0780/3183] update in api

---
 lib/ewelink-platform.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/ewelink-platform.js b/lib/ewelink-platform.js
index 6e848d06..69f65895 100644
--- a/lib/ewelink-platform.js
+++ b/lib/ewelink-platform.js
@@ -406,6 +406,7 @@ module.exports = class eWeLinkPlatform {
           oAccessory.context.reachableWAN = device.online
           oAccessory.context.reachableLAN = this.lanDevices.get(device.deviceid).online || false
           oAccessory.control = new deviceSwitchMulti(this, oAccessory)
+          this.api.updatePlatformAccessories('homebridge-ewelink', 'eWeLink', [oAccessory])
           this.devicesInHB.set(oAccessory.context.hbDeviceId, oAccessory)
           if (i === 0) accessory = oAccessory
         }
@@ -473,6 +474,7 @@ module.exports = class eWeLinkPlatform {
             .setCharacteristic(this.Characteristic.FirmwareRevision, device.params.fwVersion)
           oAccessory.context.reachableWAN = device.online
           oAccessory.context.reachableLAN = false
+          this.api.updatePlatformAccessories('homebridge-ewelink', 'eWeLink', [oAccessory])
           this.devicesInHB.set(oAccessory.context.hbDeviceId, oAccessory)
           oAccessory.control = new deviceRFBridge(this, oAccessory)
           rfChlCounter += Object.keys(subDevice.buttons || {}).length
@@ -546,6 +548,7 @@ module.exports = class eWeLinkPlatform {
       if (!this.config.disableHTTPRefresh) accessory.control.externalUpdate(device.params)
 
       // *** Update any changes to the device into our devicesInHB map *** \\
+      this.api.updatePlatformAccessories('homebridge-ewelink', 'eWeLink', [accessory])
       this.devicesInHB.set(accessory.context.hbDeviceId, accessory)
       this.log(' → [%s] initialised %s.', device.name, str)
     } catch (err) {

From 5691401f0badfc4806d17194c9fc6b2d7b8cebe1 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 15 Nov 2020 20:12:38 +0000
Subject: [PATCH 0781/3183] ifan fix

---
 lib/device/fan.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/device/fan.js b/lib/device/fan.js
index 2cf0d5c4..0d07d565 100644
--- a/lib/device/fan.js
+++ b/lib/device/fan.js
@@ -52,7 +52,7 @@ module.exports = class deviceFan {
     }
   }
 
-  async internalLightUpdate (type, value, callback) {
+  async internalLightUpdate (value, callback) {
     try {
       callback()
       const params = { switches: helpers.defaultMultiSwitchOff }

From e8ce72c9dcdeb15dee0dc41192ba5d0068f5966e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 15 Nov 2020 20:13:40 +0000
Subject: [PATCH 0782/3183] 3.13.1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 9e4aad0d..1856a69f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.13.0",
+  "version": "3.13.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 15b62df7..2637b4fc 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.13.0",
+  "version": "3.13.1",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 4b11ec35b825efe6fa0f67281b242a0aba66f34a Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 15 Nov 2020 21:32:02 +0000
Subject: [PATCH 0783/3183] S26R1 to outlet list

---
 lib/helpers.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/helpers.js b/lib/helpers.js
index c2dd2917..9b8c344d 100644
--- a/lib/helpers.js
+++ b/lib/helpers.js
@@ -17,7 +17,7 @@ module.exports = {
   devicesNonLAN: [22, 28, 34, 59, 102, 103, 104],
   devicesSingleSwitch: [1, 5, 6, 14, 15, 22, 24, 27, 32, 36, 44, 59, 104],
   devicesMultiSwitch: [2, 3, 4, 7, 8, 9, 29, 30, 31, 34, 41],
-  devicesSingleSwitchOutlet: ['Sonoff Pow', 'S20', 'S26', 'S55', 'S55R1'],
+  devicesSingleSwitchOutlet: ['Sonoff Pow', 'S20', 'S26', 'S26R1', 'S55', 'S55R1'],
   devicesBrightable: [36, 44],
   devicesColourable: [22, 59, 104],
   devicesCTempable: [103],

From c0b25f4ae1824d559a38e880772ff314c1e41f60 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 15 Nov 2020 21:33:20 +0000
Subject: [PATCH 0784/3183] 3.13.2

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 1856a69f..7ca49bfc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.13.1",
+  "version": "3.13.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 2637b4fc..3463f65c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.13.1",
+  "version": "3.13.2",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From ac494c4dbce293e10f3c6c74b7d6794d344a33f9 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 16 Nov 2020 08:25:27 +0000
Subject: [PATCH 0785/3183] negative celcuis to sensors

---
 lib/device/thermostat.js | 4 ++++
 lib/device/zb-dev.js     | 9 +++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/lib/device/thermostat.js b/lib/device/thermostat.js
index 2c3ac02b..1fb67384 100644
--- a/lib/device/thermostat.js
+++ b/lib/device/thermostat.js
@@ -20,6 +20,10 @@ module.exports = class deviceThermostat {
         .on('set', this.internalUpdate.bind(this))
     }
     this.tempService = accessory.getService(this.Service.TemperatureSensor) || accessory.addService(this.Service.TemperatureSensor)
+    this.tempService.getCharacteristic(this.Characteristic.CurrentTemperature)
+      .setProps({
+        minValue: -100
+      })
     if (accessory.context.sensorType !== 'DS18B20') {
       this.humiService = accessory.getService(this.Service.HumiditySensor) || accessory.addService(this.Service.HumiditySensor)
     }
diff --git a/lib/device/zb-dev.js b/lib/device/zb-dev.js
index 4f9a2939..e4460cc0 100644
--- a/lib/device/zb-dev.js
+++ b/lib/device/zb-dev.js
@@ -47,9 +47,13 @@ module.exports = class deviceZBDev {
           .getCharacteristic(this.Characteristic.On)
           .on('set', this.internalUpdate.bind(this))
         break
-      case 1770:
+      case 1770: {
         if (!accessory.getService(this.Service.BatteryService)) accessory.addService(this.Service.BatteryService)
-        if (!accessory.getService(this.Service.TemperatureSensor)) accessory.addService(this.Service.TemperatureSensor)
+        const tempService = accessory.getService(this.Service.TemperatureSensor) || accessory.addService(this.Service.TemperatureSensor)
+        tempService.getCharacteristic(this.Characteristic.CurrentTemperature)
+          .setProps({
+            minValue: -100
+          })
         if (!accessory.getService(this.Service.HumiditySensor)) accessory.addService(this.Service.HumiditySensor)
         accessory.log = this.platform.log
         accessory.eveLogger = new this.EveHistoryService('weather', accessory, {
@@ -57,6 +61,7 @@ module.exports = class deviceZBDev {
           path: this.platform.eveLogPath
         })
         break
+      }
       case 2026:
         if (!accessory.getService(this.Service.BatteryService)) accessory.addService(this.Service.BatteryService)
         if (!accessory.getService(this.Service.MotionSensor)) accessory.addService(this.Service.MotionSensor)

From fe5be1b656aa737d20af4ffaec3ba29fbb529ec9 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 16 Nov 2020 08:26:10 +0000
Subject: [PATCH 0786/3183] 3.13.3-0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 7ca49bfc..160ca629 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.13.2",
+  "version": "3.13.3-0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 3463f65c..bce95257 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.13.2",
+  "version": "3.13.3-0",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From d81b1fa7fa9d11d2a20730cb54d3ab512d561f13 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 16 Nov 2020 09:29:04 +0000
Subject: [PATCH 0787/3183] fix for adding multi switch on the go

---
 lib/ewelink-platform.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/ewelink-platform.js b/lib/ewelink-platform.js
index 69f65895..f062a42d 100644
--- a/lib/ewelink-platform.js
+++ b/lib/ewelink-platform.js
@@ -404,7 +404,9 @@ module.exports = class eWeLinkPlatform {
               .setCharacteristic(this.Characteristic.FirmwareRevision, device.params.fwVersion)
           }
           oAccessory.context.reachableWAN = device.online
-          oAccessory.context.reachableLAN = this.lanDevices.get(device.deviceid).online || false
+          oAccessory.context.reachableLAN = this.lanDevices.has(device.deviceid)
+            ? this.lanDevices.get(device.deviceid).online
+            : false
           oAccessory.control = new deviceSwitchMulti(this, oAccessory)
           this.api.updatePlatformAccessories('homebridge-ewelink', 'eWeLink', [oAccessory])
           this.devicesInHB.set(oAccessory.context.hbDeviceId, oAccessory)

From e1c62793fc6534f44d338103c2be87c5839f2b68 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 16 Nov 2020 10:03:36 +0000
Subject: [PATCH 0788/3183] 3.13.3-1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 160ca629..89861c70 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.13.3-0",
+  "version": "3.13.3-1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index bce95257..2e15554e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.13.3-0",
+  "version": "3.13.3-1",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 1e98235bc9251ce19343c22f2e6dbeb99458a305 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 16 Nov 2020 13:52:52 +0000
Subject: [PATCH 0789/3183] 3.13.3

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 89861c70..82e1afb1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.13.3-1",
+  "version": "3.13.3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 2e15554e..adbd8114 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.13.3-1",
+  "version": "3.13.3",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 8fa1fd8867884c68f696682ba605daa757f58d4e Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Mon, 16 Nov 2020 20:28:57 +0000
Subject: [PATCH 0790/3183] Create no-response.yml

---
 .github/no-response.yml | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 .github/no-response.yml

diff --git a/.github/no-response.yml b/.github/no-response.yml
new file mode 100644
index 00000000..4523097f
--- /dev/null
+++ b/.github/no-response.yml
@@ -0,0 +1,10 @@
+# Number of days of inactivity before an Issue is closed for lack of response
+daysUntilClose: 3
+# Label requiring a response
+responseRequiredLabel: complete
+# Comment to post when closing an Issue for lack of response. Set to `false` to disable
+closeComment: >
+  This issue has been automatically closed as it was marked as complete and has had
+  no further responses within three days. If you are still experiencing problems related
+  to the original issue then please reply to this message and the issue will be reopened
+  if necessary. Thank you.

From 6c4623805a0125c65ec5ea1c609b7f651fba8148 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 17 Nov 2020 10:10:48 +0000
Subject: [PATCH 0791/3183] accessory simulation updates

---
 config.schema.json         |   6 ++
 lib/device/switch-valve.js | 114 +++++++++++++++++++++++++++++++++++++
 lib/device/valve-two.js    |  18 +++---
 lib/ewelink-platform.js    |  22 ++++---
 lib/helpers.js             |   2 +-
 5 files changed, 141 insertions(+), 21 deletions(-)
 create mode 100644 lib/device/switch-valve.js

diff --git a/config.schema.json b/config.schema.json
index e88eaa97..effe515e 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -176,6 +176,12 @@
                   "enum": [
                     "valve_two"
                   ]
+                },
+                {
+                  "title": "1 Switch & 1 Valve (using multi-channel device)",
+                  "enum": [
+                    "switch_valve"
+                  ]
                 }
               ]
             },
diff --git a/lib/device/switch-valve.js b/lib/device/switch-valve.js
new file mode 100644
index 00000000..146504f2
--- /dev/null
+++ b/lib/device/switch-valve.js
@@ -0,0 +1,114 @@
+/* jshint -W014, -W033, esversion: 9 */
+/* eslint-disable new-cap */
+'use strict'
+const fakegato = require('./../fakegato/fakegato-history')
+const helpers = require('./../helpers')
+module.exports = class deviceSwitchValve {
+  constructor (platform, accessory) {
+    this.platform = platform
+    this.Service = platform.api.hap.Service
+    this.Characteristic = platform.api.hap.Characteristic
+    this.EveHistoryService = fakegato(platform.api)
+    const valveConfig = this.platform.cusG.get(accessory.context.hbDeviceId)
+    this.switchService = accessory.getService(this.Service.Switch) || accessory.addService(this.Service.Switch)
+    if (!(this.valveService = accessory.getService(this.Service.Valve))) {
+      this.valveService = accessory.addService(this.Service.Valve)
+      this.valveService
+        .setCharacteristic(this.Characteristic.Active, 0)
+        .setCharacteristic(this.Characteristic.InUse, 0)
+        .setCharacteristic(this.Characteristic.ValveType, 1)
+        .setCharacteristic(this.Characteristic.SetDuration, Math.round((valveConfig.operationTime || 1200) / 10))
+        .addCharacteristic(this.Characteristic.RemainingDuration)
+    }
+    this.switchService
+      .getCharacteristic(this.Characteristic.On)
+      .on('set', this.internalSwitchUpdate.bind(this))
+    this.valveService
+      .getCharacteristic(this.Characteristic.Active)
+      .on('set', this.internalValveUpdate.bind(this))
+    this.valveService
+      .getCharacteristic(this.Characteristic.SetDuration)
+      .on('set', (value, callback) => {
+        if (this.valveService.getCharacteristic(this.Characteristic.InUse).value) {
+          this.valveService.updateCharacteristic(this.Characteristic.RemainingDuration, value)
+          clearTimeout(this.valveService.timer)
+          this.valveService.timer = setTimeout(() => this.valveService.setCharacteristic(this.Characteristic.Active, 0), value * 1000)
+        }
+        callback()
+      })
+    accessory.log = this.platform.log
+    accessory.eveLogger = new this.EveHistoryService('switch', accessory, {
+      storage: 'fs',
+      path: this.platform.eveLogPath
+    })
+    this.accessory = accessory
+  }
+
+  async internalSwitchUpdate (value, callback) {
+    try {
+      callback()
+      const params = { switches: helpers.defaultMultiSwitchOff }
+      params.switches[0].switch = value ? 'on' : 'off'
+      params.switches[1].switch = this.valveService.getCharacteristic(this.Characteristic.Active).value === 1
+        ? 'on'
+        : 'off'
+      await this.platform.sendDeviceUpdate(this.accessory, params)
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, true)
+    }
+  }
+
+  async internalValveUpdate (value, callback) {
+    try {
+      callback()
+      const params = { switches: helpers.defaultMultiSwitchOff }
+      params.switches[0].switch = this.switchService.getCharacteristic(this.Characteristic.On) ? 'on' : 'off'
+      params.switches[1].switch = value === 1 ? 'on' : 'off'
+      this.valveService.updateCharacteristic(this.Characteristic.InUse, value)
+      switch (value) {
+        case 0:
+          this.valveService.updateCharacteristic(this.Characteristic.RemainingDuration, 0)
+          clearTimeout(this.valveService.timer)
+          break
+        case 1: {
+          const timer = this.valveService.getCharacteristic(this.Characteristic.SetDuration).value
+          this.valveService.updateCharacteristic(this.Characteristic.RemainingDuration, timer)
+          this.valveService.timer = setTimeout(() => this.valveService.setCharacteristic(this.Characteristic.Active, 0), timer * 1000)
+          break
+        }
+      }
+      await this.platform.sendDeviceUpdate(this.accessory, params)
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, true)
+    }
+  }
+
+  async externalUpdate (params) {
+    try {
+      if (!helpers.hasProperty(params, 'switches')) return
+
+      this.switchService.updateCharacteristic(this.Characteristic.On, params.switches[0].switch === 'on')
+      this.accessory.eveLogger.addEntry({
+        time: Math.round(new Date().valueOf() / 1000),
+        status: params.switch === 'on' ? 1 : 0
+      })
+      this.valveService
+        .updateCharacteristic(this.Characteristic.Active, params.switches[1].switch === 'on' ? 1 : 0)
+        .updateCharacteristic(this.Characteristic.InUse, params.switches[1].switch === 'on' ? 1 : 0)
+      if (params.switches[1].switch === 'on') {
+        if (this.valveService.getCharacteristic(this.Characteristic.Active).value === 0) {
+          // only start the timer if it isn't on already - we don't want to reset an "already on" timer
+          // if ewelink sends another update midway ie switch turning on/off
+          const timer = this.valveService.getCharacteristic(this.Characteristic.SetDuration).value
+          this.valveService.updateCharacteristic(this.Characteristic.RemainingDuration, timer)
+          this.valveService.timer = setTimeout(() => this.valveService.setCharacteristic(this.Characteristic.Active, 0), timer * 1000)
+        }
+      } else {
+        this.valveService.updateCharacteristic(this.Characteristic.RemainingDuration, 0)
+        clearTimeout(this.valveService.timer)
+      }
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, false)
+    }
+  }
+}
diff --git a/lib/device/valve-two.js b/lib/device/valve-two.js
index 7cb2348d..3f3c9499 100644
--- a/lib/device/valve-two.js
+++ b/lib/device/valve-two.js
@@ -26,7 +26,7 @@ module.exports = class deviceValveTwo {
       valveService
         .getCharacteristic(this.Characteristic.SetDuration)
         .on('set', (value, callback) => {
-          if (valveService.getCharacteristic(this.Characteristic.InUse).value) {
+          if (valveService.getCharacteristic(this.Characteristic.InUse).value === 1) {
             valveService.updateCharacteristic(this.Characteristic.RemainingDuration, value)
             clearTimeout(valveService.timer)
             valveService.timer = setTimeout(() => valveService.setCharacteristic(this.Characteristic.Active, 0), value * 1000)
@@ -45,12 +45,12 @@ module.exports = class deviceValveTwo {
       switch (valve) {
         case 'Valve A':
           params.switches[0].switch = value ? 'on' : 'off'
-          params.switches[1].switch = this.accessory.getService('Valve B').getCharacteristic(this.Characteristic.Active).value
+          params.switches[1].switch = this.accessory.getService('Valve B').getCharacteristic(this.Characteristic.Active).value === 1
             ? 'on'
             : 'off'
           break
         case 'Valve B':
-          params.switches[0].switch = this.accessory.getService('Valve A').getCharacteristic(this.Characteristic.Active).value
+          params.switches[0].switch = this.accessory.getService('Valve A').getCharacteristic(this.Characteristic.Active).value === 1
             ? 'on'
             : 'off'
           params.switches[1].switch = value ? 'on' : 'off'
@@ -81,12 +81,14 @@ module.exports = class deviceValveTwo {
       ;['A', 'B'].forEach((v, k) => {
         const valveService = this.accessory.getService('Valve ' + v)
         valveService
-          .updateCharacteristic(this.Characteristic.Active, params.switches[k].switch === 'on')
-          .updateCharacteristic(this.Characteristic.InUse, params.switches[k].switch === 'on')
+          .updateCharacteristic(this.Characteristic.Active, params.switches[k].switch === 'on' ? 1 : 0)
+          .updateCharacteristic(this.Characteristic.InUse, params.switches[k].switch === 'on' ? 1 : 0)
         if (params.switches[k].switch === 'on') {
-          const timer = valveService.getCharacteristic(this.Characteristic.SetDuration).value
-          valveService.updateCharacteristic(this.Characteristic.RemainingDuration, timer)
-          valveService.timer = setTimeout(() => valveService.setCharacteristic(this.Characteristic.Active, 0), timer * 1000)
+          if (valveService.getCharacteristic(this.Characteristic.Active).value === 0) {
+            const timer = valveService.getCharacteristic(this.Characteristic.SetDuration).value
+            valveService.updateCharacteristic(this.Characteristic.RemainingDuration, timer)
+            valveService.timer = setTimeout(() => valveService.setCharacteristic(this.Characteristic.Active, 0), timer * 1000)
+          }
         } else {
           valveService.updateCharacteristic(this.Characteristic.RemainingDuration, 0)
           clearTimeout(valveService.timer)
diff --git a/lib/ewelink-platform.js b/lib/ewelink-platform.js
index f062a42d..ff2dade0 100644
--- a/lib/ewelink-platform.js
+++ b/lib/ewelink-platform.js
@@ -22,6 +22,7 @@ const deviceLightCTemp = require('./device/light-ctemp')
 const deviceLightDimmer = require('./device/light-dimmer')
 const deviceSwitchMulti = require('./device/switch-multi')
 const deviceSwitchSingle = require('./device/switch-single')
+const deviceSwitchValve = require('./device/switch-valve')
 const deviceRFBridge = require('./device/rf-bridge')
 const deviceZBDev = require('./device/zb-dev')
 const eWeLinkHTTP = require('./ewelink-http')
@@ -183,19 +184,7 @@ module.exports = class eWeLinkPlatform {
   initialiseDevice (device) {
     let accessory
     let oAccessory
-
     try {
-      // *** Remove old switch services for new Accessory Simulations *** \\
-      if (this.cusG.has(device.deviceid + 'SWX')) {
-        ;['X', '0', '1', '2', '3', '4'].forEach(sw => {
-          if (this.devicesInHB.has(device.deviceid + 'SW' + sw)) {
-            if (this.devicesInHB.get(device.deviceid + 'SW' + sw).getService(this.Service.Switch)) {
-              this.removeAccessory(this.devicesInHB.get(device.deviceid + 'SW' + sw))
-            }
-          }
-        })
-      }
-
       // *** Set up the correct instance for this particular device *** \\
       if (helpers.devicesCurtain.includes(device.extra.uiid)) {
         /***********************
@@ -260,6 +249,15 @@ module.exports = class eWeLinkPlatform {
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new deviceLock(this, accessory)
         /**************************/
+      } else if (this.cusG.has(device.deviceid + 'SWX') && this.cusG.get(device.deviceid + 'SWX').type === 'switch_valve') {
+        /**********************************
+        SWITCH-VALVE [ACCESSORY SIMULATION]
+        **********************************/
+        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
+          ? this.devicesInHB.get(device.deviceid + 'SWX')
+          : this.addAccessory(device, device.deviceid + 'SWX')
+        accessory.control = new deviceSwitchValve(this, accessory)
+        /***************************/
       } else if (this.cusG.has(device.deviceid + 'SWX') && this.cusG.get(device.deviceid + 'SWX').type === 'valve') {
         /**********************************
         VALVES [ONE] [ACCESSORY SIMULATION]
diff --git a/lib/helpers.js b/lib/helpers.js
index 9b8c344d..1590b916 100644
--- a/lib/helpers.js
+++ b/lib/helpers.js
@@ -7,7 +7,7 @@ module.exports = {
   appId: 'oeVkj2lYFGnJu5XUtWisfW4utiN4u9Mq',
   appSecret: '6Nz4n0xA8s8qdxQf2GqurZj2Fs55FUvM',
   httpRetryCodes: ['ENOTFOUND', 'ETIMEDOUT', 'EAI_AGAIN'],
-  allowedGroups: ['blind', 'garage', 'garage_two', 'garage_four', 'garage_eachen', 'lock', 'valve', 'valve_two'],
+  allowedGroups: ['blind', 'garage', 'garage_two', 'garage_four', 'garage_eachen', 'lock', 'switch_valve', 'valve', 'valve_two'],
   defaults: {
     inUsePowerThreshold: 0,
     lowBattThreshold: 25,

From 08bf03aeb69b7248826a886f4e20cd0a83264ee3 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 17 Nov 2020 10:22:17 +0000
Subject: [PATCH 0792/3183] Update switch-valve.js

---
 lib/device/switch-valve.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/device/switch-valve.js b/lib/device/switch-valve.js
index 146504f2..42ac19bc 100644
--- a/lib/device/switch-valve.js
+++ b/lib/device/switch-valve.js
@@ -62,7 +62,7 @@ module.exports = class deviceSwitchValve {
     try {
       callback()
       const params = { switches: helpers.defaultMultiSwitchOff }
-      params.switches[0].switch = this.switchService.getCharacteristic(this.Characteristic.On) ? 'on' : 'off'
+      params.switches[0].switch = this.switchService.getCharacteristic(this.Characteristic.On).value ? 'on' : 'off'
       params.switches[1].switch = value === 1 ? 'on' : 'off'
       this.valveService.updateCharacteristic(this.Characteristic.InUse, value)
       switch (value) {

From caab1868c3c0aeb3729470ace35222716384beb8 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 17 Nov 2020 10:22:58 +0000
Subject: [PATCH 0793/3183] 3.13.4-0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 82e1afb1..51270860 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.13.3",
+  "version": "3.13.4-0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index adbd8114..3114d367 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.13.3",
+  "version": "3.13.4-0",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 8cb6ac52baca9c4148591f8f9faabbb60fc080e7 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 17 Nov 2020 10:47:38 +0000
Subject: [PATCH 0794/3183] reinstate amended check

---
 lib/ewelink-platform.js | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/lib/ewelink-platform.js b/lib/ewelink-platform.js
index ff2dade0..2081e558 100644
--- a/lib/ewelink-platform.js
+++ b/lib/ewelink-platform.js
@@ -185,6 +185,20 @@ module.exports = class eWeLinkPlatform {
     let accessory
     let oAccessory
     try {
+      // *** Remove old switch services for new Accessory Simulations *** \\
+      if (this.cusG.has(device.deviceid + 'SWX')) {
+        const arrToCheck = this.cusG.has(device.deviceid + 'SWX').type === 'switch_valve'
+          ? ['0', '1']
+          : ['X', '0', '1', '2', '3', '4']
+        arrToCheck.forEach(sw => {
+          if (this.devicesInHB.has(device.deviceid + 'SW' + sw)) {
+            if (this.devicesInHB.get(device.deviceid + 'SW' + sw).getService(this.Service.Switch)) {
+              this.removeAccessory(this.devicesInHB.get(device.deviceid + 'SW' + sw))
+            }
+          }
+        })
+      }
+      
       // *** Set up the correct instance for this particular device *** \\
       if (helpers.devicesCurtain.includes(device.extra.uiid)) {
         /***********************

From 8f81bf4eb4caf9b580e57fee346a78256aaa8cc1 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 17 Nov 2020 10:48:01 +0000
Subject: [PATCH 0795/3183] formatting

---
 lib/ewelink-platform.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ewelink-platform.js b/lib/ewelink-platform.js
index 2081e558..6bcaabb5 100644
--- a/lib/ewelink-platform.js
+++ b/lib/ewelink-platform.js
@@ -198,7 +198,7 @@ module.exports = class eWeLinkPlatform {
           }
         })
       }
-      
+
       // *** Set up the correct instance for this particular device *** \\
       if (helpers.devicesCurtain.includes(device.extra.uiid)) {
         /***********************

From 25a5d7a8eb13af964960b3fb4041b098bef4240d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 17 Nov 2020 13:12:00 +0000
Subject: [PATCH 0796/3183] fakegato into main lib

---
 lib/device/outlet.js        |  4 +---
 lib/device/rf-bridge.js     |  4 +---
 lib/device/scm.js           |  4 +---
 lib/device/sensor.js        |  4 +---
 lib/device/switch-multi.js  |  4 +---
 lib/device/switch-single.js |  4 +---
 lib/device/switch-valve.js  |  4 +---
 lib/device/thermostat.js    |  4 +---
 lib/device/usb.js           |  4 +---
 lib/device/zb-dev.js        | 10 ++++------
 lib/ewelink-platform.js     |  2 ++
 11 files changed, 15 insertions(+), 33 deletions(-)

diff --git a/lib/device/outlet.js b/lib/device/outlet.js
index cb04154f..66ca8704 100644
--- a/lib/device/outlet.js
+++ b/lib/device/outlet.js
@@ -1,7 +1,6 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
-const fakegato = require('./../fakegato/fakegato-history')
 const helpers = require('./../helpers')
 const util = require('util')
 module.exports = class deviceOutlet {
@@ -9,7 +8,6 @@ module.exports = class deviceOutlet {
     this.platform = platform
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
-    this.EveHistoryService = fakegato(platform.api)
     this.inUsePowerThreshold = parseInt(this.platform.config.inUsePowerThreshold)
     this.inUsePowerThreshold = isNaN(this.inUsePowerThreshold)
       ? helpers.defaults.inUsePowerThreshold
@@ -108,7 +106,7 @@ module.exports = class deviceOutlet {
         this.outletService.updateCharacteristic(this.eveTotalConsumption, 0)
       })
     accessory.log = this.platform.log
-    accessory.eveLogger = new this.EveHistoryService('energy', accessory, {
+    accessory.eveLogger = new this.platform.eveService('energy', accessory, {
       storage: 'fs',
       path: this.platform.eveLogPath
     })
diff --git a/lib/device/rf-bridge.js b/lib/device/rf-bridge.js
index 3701aa9e..1b2ba4ba 100644
--- a/lib/device/rf-bridge.js
+++ b/lib/device/rf-bridge.js
@@ -1,14 +1,12 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
-const fakegato = require('./../fakegato/fakegato-history')
 const helpers = require('./../helpers')
 module.exports = class deviceRFBridge {
   constructor (platform, accessory) {
     this.platform = platform
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
-    this.EveHistoryService = fakegato(platform.api)
     this.sensorTimeDifference = parseInt(this.platform.config.sensorTimeDifference)
     this.sensorTimeDifference = isNaN(this.sensorTimeDifference)
       ? helpers.defaults.sensorTimeDifference
@@ -68,7 +66,7 @@ module.exports = class deviceRFBridge {
       const service = accessory.getService(serv) || accessory.addService(serv)
       service.updateCharacteristic(char, 0)
       accessory.log = this.platform.log
-      accessory.eveLogger = new this.EveHistoryService(eveType, accessory, {
+      accessory.eveLogger = new this.platform.eveService(eveType, accessory, {
         storage: 'fs',
         path: this.platform.eveLogPath
       })
diff --git a/lib/device/scm.js b/lib/device/scm.js
index 1351e204..e5f1e6a0 100644
--- a/lib/device/scm.js
+++ b/lib/device/scm.js
@@ -1,20 +1,18 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
-const fakegato = require('./../fakegato/fakegato-history')
 const helpers = require('./../helpers')
 module.exports = class deviceSCM {
   constructor (platform, accessory) {
     this.platform = platform
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
-    this.EveHistoryService = fakegato(platform.api)
     this.switchService = accessory.getService(this.Service.Switch) || accessory.addService(this.Service.Switch)
     this.switchService
       .getCharacteristic(this.Characteristic.On)
       .on('set', this.internalUpdate.bind(this))
     accessory.log = this.platform.log
-    accessory.eveLogger = new this.EveHistoryService('switch', accessory, {
+    accessory.eveLogger = new this.platform.eveService('switch', accessory, {
       storage: 'fs',
       path: this.platform.eveLogPath
     })
diff --git a/lib/device/sensor.js b/lib/device/sensor.js
index e9359085..caa6f93e 100644
--- a/lib/device/sensor.js
+++ b/lib/device/sensor.js
@@ -1,14 +1,12 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
-const fakegato = require('./../fakegato/fakegato-history')
 const helpers = require('./../helpers')
 module.exports = class deviceSensor {
   constructor (platform, accessory) {
     this.platform = platform
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
-    this.EveHistoryService = fakegato(platform.api)
     this.lowBattThreshold = parseInt(this.platform.config.lowBattThreshold)
     this.lowBattThreshold = isNaN(this.lowBattThreshold)
       ? helpers.defaults.lowBattThreshold
@@ -18,7 +16,7 @@ module.exports = class deviceSensor {
     this.contactService = accessory.getService(this.Service.ContactSensor) || accessory.addService(this.Service.ContactSensor)
     this.batteryService = accessory.getService(this.Service.BatteryService) || accessory.addService(this.Service.BatteryService)
     accessory.log = this.platform.log
-    accessory.eveLogger = new this.EveHistoryService('door', accessory, {
+    accessory.eveLogger = new this.platform.eveService('door', accessory, {
       storage: 'fs',
       path: this.platform.eveLogPath
     })
diff --git a/lib/device/switch-multi.js b/lib/device/switch-multi.js
index a232cc50..337b5c88 100644
--- a/lib/device/switch-multi.js
+++ b/lib/device/switch-multi.js
@@ -1,14 +1,12 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
-const fakegato = require('./../fakegato/fakegato-history')
 const helpers = require('./../helpers')
 module.exports = class deviceSwitchMulti {
   constructor (platform, accessory) {
     this.platform = platform
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
-    this.EveHistoryService = fakegato(platform.api)
     this.switchService = accessory.getService(this.Service.Switch) || accessory.addService(this.Service.Switch)
     this.switchService
       .getCharacteristic(this.Characteristic.On)
@@ -20,7 +18,7 @@ module.exports = class deviceSwitchMulti {
       accessory.removeService(accessory.getService(this.Service.Lightbulb))
     }
     accessory.log = this.platform.log
-    accessory.eveLogger = new this.EveHistoryService('switch', accessory, {
+    accessory.eveLogger = new this.platform.eveService('switch', accessory, {
       storage: 'fs',
       path: this.platform.eveLogPath
     })
diff --git a/lib/device/switch-single.js b/lib/device/switch-single.js
index 74b6f7eb..c39090a3 100644
--- a/lib/device/switch-single.js
+++ b/lib/device/switch-single.js
@@ -1,14 +1,12 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
-const fakegato = require('./../fakegato/fakegato-history')
 const helpers = require('./../helpers')
 module.exports = class deviceSwitchSingle {
   constructor (platform, accessory) {
     this.platform = platform
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
-    this.EveHistoryService = fakegato(platform.api)
     this.switchService = accessory.getService(this.Service.Switch) || accessory.addService(this.Service.Switch)
     this.switchService
       .getCharacteristic(this.Characteristic.On)
@@ -20,7 +18,7 @@ module.exports = class deviceSwitchSingle {
       accessory.removeService(accessory.getService(this.Service.Lightbulb))
     }
     accessory.log = this.platform.log
-    accessory.eveLogger = new this.EveHistoryService('switch', accessory, {
+    accessory.eveLogger = new this.platform.eveService('switch', accessory, {
       storage: 'fs',
       path: this.platform.eveLogPath
     })
diff --git a/lib/device/switch-valve.js b/lib/device/switch-valve.js
index 42ac19bc..d0492564 100644
--- a/lib/device/switch-valve.js
+++ b/lib/device/switch-valve.js
@@ -1,14 +1,12 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
-const fakegato = require('./../fakegato/fakegato-history')
 const helpers = require('./../helpers')
 module.exports = class deviceSwitchValve {
   constructor (platform, accessory) {
     this.platform = platform
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
-    this.EveHistoryService = fakegato(platform.api)
     const valveConfig = this.platform.cusG.get(accessory.context.hbDeviceId)
     this.switchService = accessory.getService(this.Service.Switch) || accessory.addService(this.Service.Switch)
     if (!(this.valveService = accessory.getService(this.Service.Valve))) {
@@ -37,7 +35,7 @@ module.exports = class deviceSwitchValve {
         callback()
       })
     accessory.log = this.platform.log
-    accessory.eveLogger = new this.EveHistoryService('switch', accessory, {
+    accessory.eveLogger = new this.platform.eveService('switch', accessory, {
       storage: 'fs',
       path: this.platform.eveLogPath
     })
diff --git a/lib/device/thermostat.js b/lib/device/thermostat.js
index 1fb67384..5102283a 100644
--- a/lib/device/thermostat.js
+++ b/lib/device/thermostat.js
@@ -1,14 +1,12 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
-const fakegato = require('./../fakegato/fakegato-history')
 const helpers = require('./../helpers')
 module.exports = class deviceThermostat {
   constructor (platform, accessory) {
     this.platform = platform
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
-    this.EveHistoryService = fakegato(platform.api)
     if ((this.platform.config.hideSwitchFromTH || '').includes(accessory.context.eweDeviceId)) {
       if (accessory.getService(this.Service.Switch)) {
         accessory.removeService(accessory.getService(this.Service.Switch))
@@ -28,7 +26,7 @@ module.exports = class deviceThermostat {
       this.humiService = accessory.getService(this.Service.HumiditySensor) || accessory.addService(this.Service.HumiditySensor)
     }
     accessory.log = this.platform.log
-    accessory.eveLogger = new this.EveHistoryService('custom', accessory, {
+    accessory.eveLogger = new this.platform.eveService('custom', accessory, {
       storage: 'fs',
       path: this.platform.eveLogPath
     })
diff --git a/lib/device/usb.js b/lib/device/usb.js
index 48de6c45..da0161c8 100644
--- a/lib/device/usb.js
+++ b/lib/device/usb.js
@@ -1,20 +1,18 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
-const fakegato = require('./../fakegato/fakegato-history')
 const helpers = require('./../helpers')
 module.exports = class deviceUSB {
   constructor (platform, accessory) {
     this.platform = platform
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
-    this.EveHistoryService = fakegato(platform.api)
     this.outletService = accessory.getService(this.Service.Outlet) || accessory.addService(this.Service.Outlet)
     this.outletService
       .getCharacteristic(this.Characteristic.On)
       .on('set', this.internalUpdate.bind(this))
     accessory.log = this.platform.log
-    accessory.eveLogger = new this.EveHistoryService('switch', accessory, {
+    accessory.eveLogger = new this.platform.eveService('switch', accessory, {
       storage: 'fs',
       path: this.platform.eveLogPath
     })
diff --git a/lib/device/zb-dev.js b/lib/device/zb-dev.js
index e4460cc0..85d73425 100644
--- a/lib/device/zb-dev.js
+++ b/lib/device/zb-dev.js
@@ -1,14 +1,12 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
-const fakegato = require('./../fakegato/fakegato-history')
 const helpers = require('./../helpers')
 module.exports = class deviceZBDev {
   constructor (platform, accessory) {
     this.platform = platform
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
-    this.EveHistoryService = fakegato(platform.api)
     this.lowBattThreshold = parseInt(this.platform.config.lowBattThreshold)
     this.lowBattThreshold = isNaN(this.lowBattThreshold)
       ? helpers.defaults.lowBattThreshold
@@ -39,7 +37,7 @@ module.exports = class deviceZBDev {
         if (accessory.getService(this.Service.BatteryService)) accessory.removeService(accessory.getService(this.Service.BatteryService))
         if (!accessory.getService(this.Service.Switch)) accessory.addService(this.Service.Switch)
         accessory.log = this.platform.log
-        accessory.eveLogger = new this.EveHistoryService('switch', accessory, {
+        accessory.eveLogger = new this.platform.eveService('switch', accessory, {
           storage: 'fs',
           path: this.platform.eveLogPath
         })
@@ -56,7 +54,7 @@ module.exports = class deviceZBDev {
           })
         if (!accessory.getService(this.Service.HumiditySensor)) accessory.addService(this.Service.HumiditySensor)
         accessory.log = this.platform.log
-        accessory.eveLogger = new this.EveHistoryService('weather', accessory, {
+        accessory.eveLogger = new this.platform.eveService('weather', accessory, {
           storage: 'fs',
           path: this.platform.eveLogPath
         })
@@ -66,7 +64,7 @@ module.exports = class deviceZBDev {
         if (!accessory.getService(this.Service.BatteryService)) accessory.addService(this.Service.BatteryService)
         if (!accessory.getService(this.Service.MotionSensor)) accessory.addService(this.Service.MotionSensor)
         accessory.log = this.platform.log
-        accessory.eveLogger = new this.EveHistoryService('motion', accessory, {
+        accessory.eveLogger = new this.platform.eveService('motion', accessory, {
           storage: 'fs',
           path: this.platform.eveLogPath
         })
@@ -75,7 +73,7 @@ module.exports = class deviceZBDev {
         if (!accessory.getService(this.Service.BatteryService)) accessory.addService(this.Service.BatteryService)
         if (!accessory.getService(this.Service.ContactSensor)) accessory.addService(this.Service.ContactSensor)
         accessory.log = this.platform.log
-        accessory.eveLogger = new this.EveHistoryService('door', accessory, {
+        accessory.eveLogger = new this.platform.eveService('door', accessory, {
           storage: 'fs',
           path: this.platform.eveLogPath
         })
diff --git a/lib/ewelink-platform.js b/lib/ewelink-platform.js
index 6bcaabb5..b86e9fb4 100644
--- a/lib/ewelink-platform.js
+++ b/lib/ewelink-platform.js
@@ -28,6 +28,7 @@ const deviceZBDev = require('./device/zb-dev')
 const eWeLinkHTTP = require('./ewelink-http')
 const eWeLinkLAN = require('./ewelink-lan')
 const eWeLinkWS = require('./ewelink-ws')
+const fakegato = require('./fakegato/fakegato-history')
 const helpers = require('./helpers')
 const promInterval = require('interval-promise')
 const version = require('./../package.json').version
@@ -47,6 +48,7 @@ module.exports = class eWeLinkPlatform {
     this.api = api
     this.Characteristic = api.hap.Characteristic
     this.Service = api.hap.Service
+    this.eveService = fakegato(api)
     this.debug = this.config.debug || false
     this.devicesInHB = new Map()
     this.devicesInEW = new Map()

From 72540a4485c26ffc77271fd2ab0f3b8c43857bf9 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 17 Nov 2020 13:12:18 +0000
Subject: [PATCH 0797/3183] check if timer already running

---
 lib/device/valve.js | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/lib/device/valve.js b/lib/device/valve.js
index 9ebb3274..175ac295 100644
--- a/lib/device/valve.js
+++ b/lib/device/valve.js
@@ -23,7 +23,7 @@ module.exports = class deviceValve {
     this.valveService
       .getCharacteristic(this.Characteristic.SetDuration)
       .on('set', (value, callback) => {
-        if (this.valveService.getCharacteristic(this.Characteristic.InUse).value) {
+        if (this.valveService.getCharacteristic(this.Characteristic.InUse).value === 1) {
           this.valveService.updateCharacteristic(this.Characteristic.RemainingDuration, value)
           clearTimeout(this.valveService.timer)
           this.valveService.timer = setTimeout(
@@ -63,12 +63,14 @@ module.exports = class deviceValve {
     try {
       if (!helpers.hasProperty(params, 'switch')) return
       this.valveService
-        .updateCharacteristic(this.Characteristic.Active, params.switch === 'on')
-        .updateCharacteristic(this.Characteristic.InUse, params.switch === 'on')
+        .updateCharacteristic(this.Characteristic.Active, params.switch === 'on' ? 1 : 0)
+        .updateCharacteristic(this.Characteristic.InUse, params.switch === 'on' ? 1 : 0)
       if (params.switch === 'on') {
-        const timer = this.valveService.getCharacteristic(this.Characteristic.SetDuration).value
-        this.valveService.updateCharacteristic(this.Characteristic.RemainingDuration, timer)
-        this.valveService.timer = setTimeout(() => this.valveService.setCharacteristic(this.Characteristic.Active, 0), timer * 1000)
+        if (this.valveService.getCharacteristic(this.Characteristic.Active).value === 0) {
+          const timer = this.valveService.getCharacteristic(this.Characteristic.SetDuration).value
+          this.valveService.updateCharacteristic(this.Characteristic.RemainingDuration, timer)
+          this.valveService.timer = setTimeout(() => this.valveService.setCharacteristic(this.Characteristic.Active, 0), timer * 1000)
+        }
       } else {
         this.valveService.updateCharacteristic(this.Characteristic.RemainingDuration, 0)
         clearTimeout(this.valveService.timer)

From cc1945f7f7e4cc74ce57ed59f8a5d81dfe0e5531 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 17 Nov 2020 13:13:47 +0000
Subject: [PATCH 0798/3183] 3.13.4-1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 51270860..d5db2f03 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.13.4-0",
+  "version": "3.13.4-1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 3114d367..468dd186 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.13.4-0",
+  "version": "3.13.4-1",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From e0aa28a7c91dd6c6a4c96de0df28fa26c79636be Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 17 Nov 2020 16:14:12 +0000
Subject: [PATCH 0799/3183] bump min hb/node

---
 package.json | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/package.json b/package.json
index 468dd186..9b43d720 100644
--- a/package.json
+++ b/package.json
@@ -36,8 +36,8 @@
     "eachen"
   ],
   "engines": {
-    "homebridge": ">=1.0.0",
-    "node": ">=12.0.0"
+    "homebridge": "^1.1.0",
+    "node": "^14.15.1"
   },
   "repository": {
     "type": "git",
@@ -65,12 +65,12 @@
     }
   ],
   "dependencies": {
-    "axios": "0.21.0",
-    "color-convert": "2.0.1",
-    "interval-promise": "1.4.0",
-    "node-dns-sd": "0.4.2",
-    "websocket-as-promised": "1.1.0",
-    "ws": "7.4.0"
+    "axios": "^0.21.0",
+    "color-convert": "^2.0.1",
+    "interval-promise": "^1.4.0",
+    "node-dns-sd": "^0.4.2",
+    "websocket-as-promised": "^1.1.0",
+    "ws": "^7.4.0"
   },
   "standard": {
     "ignore": [

From 10f27e93f7fdeab30abc41178deb570bbea2f5a7 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 18 Nov 2020 09:59:33 +0000
Subject: [PATCH 0800/3183] separate functions

---
 lib/device/light-colour.js | 193 +++++++++++++++++++------------------
 lib/device/light-ctemp.js  | 105 ++++++++++----------
 lib/device/light-dimmer.js |  51 +++++-----
 3 files changed, 179 insertions(+), 170 deletions(-)

diff --git a/lib/device/light-colour.js b/lib/device/light-colour.js
index 032cc295..49bea70a 100644
--- a/lib/device/light-colour.js
+++ b/lib/device/light-colour.js
@@ -11,13 +11,13 @@ module.exports = class deviceLightColour {
     this.lightService = accessory.getService(this.Service.Lightbulb) || accessory.addService(this.Service.Lightbulb)
     this.lightService
       .getCharacteristic(this.Characteristic.On)
-      .on('set', (value, callback) => this.internalUpdate('onoff', value, callback))
+      .on('set', this.internalOnOffUpdate.bind(this))
     this.lightService
       .getCharacteristic(this.Characteristic.Brightness)
-      .on('set', (value, callback) => this.internalUpdate('brightness', value, callback))
+      .on('set', this.internalBrightnessUpdate.bind(this))
     this.lightService
       .getCharacteristic(this.Characteristic.Hue)
-      .on('set', (value, callback) => this.internalUpdate('hue', value, callback))
+      .on('set', this.internalHueUpdate.bind(this))
     this.lightService
       .getCharacteristic(this.Characteristic.Saturation)
       .on('set', (value, callback) => callback())
@@ -32,105 +32,110 @@ module.exports = class deviceLightColour {
     this.accessory = accessory
   }
 
-  async internalUpdate (type, value, callback) {
+  async internalOnOffUpdate (value, callback) {
     try {
-      let newRGB
-      let params = {}
-      switch (type) {
-        case 'onoff':
-          callback()
-          if (this.accessory.context.eweUIID === 22) {
-          // **** B1 uses state rather than switch *** \\
-            params.state = value ? 'on' : 'off'
-          } else {
-            params.switch = value ? 'on' : 'off'
+      callback()
+      const params = {}
+      if (this.accessory.context.eweUIID === 22) {
+        // **** B1 uses state rather than switch *** \\
+        params.state = value ? 'on' : 'off'
+      } else {
+        params.switch = value ? 'on' : 'off'
+      }
+      await this.platform.sendDeviceUpdate(this.accessory, params)
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, true)
+    }
+  }
+
+  async internalBrightnessUpdate (value, callback) {
+    try {
+      let params
+      await helpers.sleep(1000)
+      callback()
+      const updateKeyBright = Math.random().toString(36).substr(2, 8)
+      this.accessory.context.updateKeyBright = updateKeyBright
+      switch (this.accessory.context.eweUIID) {
+        case 22:
+          // *** B1 doesn't support brightness *** \\
+          return
+        case 59:
+          // *** L1 *** \\
+          params = {
+            mode: 1,
+            bright: value
           }
-          await this.platform.sendDeviceUpdate(this.accessory, params)
           break
-        case 'brightness': {
-          await helpers.sleep(1000)
-          callback()
-          const updateKeyBright = Math.random().toString(36).substr(2, 8)
-          this.accessory.context.updateKeyBright = updateKeyBright
-          switch (this.accessory.context.eweUIID) {
-            case 22:
-              // *** B1 doesn't support brightness *** \\
-              return
-            case 59:
-              // *** L1 *** \\
-              params = {
-                mode: 1,
-                bright: value
-              }
-              break
-            case 104:
-            // *** GTLC104 needs the current rgb values sent too *** \\
-              params = {
-                ltype: 'color',
-                color: {
-                  br: value,
-                  r: this.accessory.context.cacheR,
-                  g: this.accessory.context.cacheG,
-                  b: this.accessory.context.cacheB
-                }
-              }
-              break
+        case 104:
+        // *** GTLC104 needs the current rgb values sent too *** \\
+          params = {
+            ltype: 'color',
+            color: {
+              br: value,
+              r: this.accessory.context.cacheR,
+              g: this.accessory.context.cacheG,
+              b: this.accessory.context.cacheB
+            }
           }
-          await helpers.sleep(500)
-          if (updateKeyBright !== this.accessory.context.updateKeyBright) return
-          await this.platform.sendDeviceUpdate(this.accessory, params)
           break
-        }
-        case 'hue': {
-          await helpers.sleep(2000)
-          callback()
-          const updateKeyColour = Math.random().toString(36).substr(2, 8)
-          this.accessory.context.updateKeyColour = updateKeyColour
-          newRGB = convert.hsv.rgb(value, this.lightService.getCharacteristic(this.Characteristic.Saturation).value, 100)
-          switch (this.accessory.context.eweUIID) {
-            case 22:
-            // *** B1 *** \\
-              params = {
-                zyx_mode: 2,
-                type: 'middle',
-                channel0: '0',
-                channel1: '0',
-                channel2: newRGB[0].toString(),
-                channel3: newRGB[1].toString(),
-                channel4: newRGB[2].toString()
-              }
-              break
-            case 59:
-              // *** L1 *** \\
-              params = {
-                mode: 1,
-                colorR: newRGB[0],
-                colorG: newRGB[1],
-                colorB: newRGB[2]
-              }
-              break
-            case 104:
-              // *** GTLC104 *** \\
-              params = {
-                ltype: 'color',
-                color: {
-                  r: newRGB[0],
-                  g: newRGB[1],
-                  b: newRGB[2],
-                  br: this.lightService.getCharacteristic(this.Characteristic.Brightness).value
-                }
-              }
-              this.accessory.context.cacheR = newRGB[0]
-              this.accessory.context.cacheG = newRGB[1]
-              this.accessory.context.cacheB = newRGB[2]
-              break
+      }
+      await helpers.sleep(500)
+      if (updateKeyBright !== this.accessory.context.updateKeyBright) return
+      await this.platform.sendDeviceUpdate(this.accessory, params)
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, true)
+    }
+  }
+
+  async internalHueUpdate (value, callback) {
+    try {
+      await helpers.sleep(2000)
+      callback()
+      let params
+      const newRGB = convert.hsv.rgb(value, this.lightService.getCharacteristic(this.Characteristic.Saturation).value, 100)
+      const updateKeyColour = Math.random().toString(36).substr(2, 8)
+      this.accessory.context.updateKeyColour = updateKeyColour
+      switch (this.accessory.context.eweUIID) {
+        case 22:
+        // *** B1 *** \\
+          params = {
+            zyx_mode: 2,
+            type: 'middle',
+            channel0: '0',
+            channel1: '0',
+            channel2: newRGB[0].toString(),
+            channel3: newRGB[1].toString(),
+            channel4: newRGB[2].toString()
           }
-          await helpers.sleep(1000)
-          if (updateKeyColour !== this.accessory.context.updateKeyColour) return
-          await this.platform.sendDeviceUpdate(this.accessory, params)
           break
-        }
+        case 59:
+          // *** L1 *** \\
+          params = {
+            mode: 1,
+            colorR: newRGB[0],
+            colorG: newRGB[1],
+            colorB: newRGB[2]
+          }
+          break
+        case 104:
+          // *** GTLC104 *** \\
+          params = {
+            ltype: 'color',
+            color: {
+              r: newRGB[0],
+              g: newRGB[1],
+              b: newRGB[2],
+              br: this.lightService.getCharacteristic(this.Characteristic.Brightness).value
+            }
+          }
+          this.accessory.context.cacheR = newRGB[0]
+          this.accessory.context.cacheG = newRGB[1]
+          this.accessory.context.cacheB = newRGB[2]
+          break
       }
+      await helpers.sleep(1000)
+      if (updateKeyColour !== this.accessory.context.updateKeyColour) return
+      await this.platform.sendDeviceUpdate(this.accessory, params)
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
     }
diff --git a/lib/device/light-ctemp.js b/lib/device/light-ctemp.js
index 1799f8f2..78b74339 100644
--- a/lib/device/light-ctemp.js
+++ b/lib/device/light-ctemp.js
@@ -10,68 +10,71 @@ module.exports = class deviceLightColour {
     this.lightService = accessory.getService(this.Service.Lightbulb) || accessory.addService(this.Service.Lightbulb)
     this.lightService
       .getCharacteristic(this.Characteristic.On)
-      .on('set', (value, callback) => this.internalUpdate('onoff', value, callback))
+      .on('set', this.internalOnOffUpdate.bind(this))
     this.lightService
       .getCharacteristic(this.Characteristic.Brightness)
-      .on('set', (value, callback) => this.internalUpdate('brightness', value, callback))
+      .on('set', this.internalBrightnessUpdate.bind(this))
     this.lightService
       .getCharacteristic(this.Characteristic.ColorTemperature)
-      .on('set', (value, callback) => this.internalUpdate('colour', value, callback))
+      .on('set', this.internalColourTempUpdate.bind(this))
     this.accessory = accessory
   }
 
-  async internalUpdate (type, value, callback) {
+  async internaOnOffUpdate (value, callback) {
     try {
-      let params = {}
-      switch (type) {
-        case 'onoff':
-          callback()
-          params.switch = value ? 'on' : 'off'
-          await this.platform.sendDeviceUpdate(this.accessory, params)
-          break
-        case 'brightness': {
-          await helpers.sleep(1000)
-          callback()
-          const updateKeyBright = Math.random().toString(36).substr(2, 8)
-          this.accessory.context.updateKeyBright = updateKeyBright
-          // *** Device needs the current ct value sent too *** \\
-          params = {
-            ltype: 'white',
-            white: {
-              br: value,
-              ct: this.accessory.context.cacheCT
-            }
-          }
-          await helpers.sleep(500)
-          if (updateKeyBright !== this.accessory.context.updateKeyBright) return
-          await this.platform.sendDeviceUpdate(this.accessory, params)
-          break
+      callback()
+      const params = { switch: value ? 'on' : 'off' }
+      await this.platform.sendDeviceUpdate(this.accessory, params)
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, true)
+    }
+  }
+
+  async internalBrightnessUpdate (value, callback) {
+    try {
+      await helpers.sleep(1000)
+      callback()
+      const updateKeyBright = Math.random().toString(36).substr(2, 8)
+      this.accessory.context.updateKeyBright = updateKeyBright
+      // *** Device needs the current ct value sent too *** \\
+      const params = {
+        ltype: 'white',
+        white: {
+          br: value,
+          ct: this.accessory.context.cacheCT
         }
-        case 'colour': {
-          await helpers.sleep(2000)
-          callback()
-          const updateKeyColour = Math.random().toString(36).substr(2, 8)
-          this.accessory.context.updateKeyColour = updateKeyColour
-          // HomeKit has a ct range of 140-500 corresponding to 2000-7143K
-          // B02-F-A60 has a range of 2200K-6500K corresponding to ct: 0-255
-          let mToK = Math.round(1000000 / value)
-          if (mToK < 2200) mToK = 2200
-          if (mToK > 6500) mToK = 6500
-          const kToCT = Math.round(((mToK - 2200) / 4300) * 255)
-          params = {
-            ltype: 'white',
-            white: {
-              ct: kToCT,
-              br: this.lightService.getCharacteristic(this.Characteristic.Brightness).value
-            }
-          }
-          this.accessory.context.cacheCT = kToCT
-          await helpers.sleep(1000)
-          if (updateKeyColour !== this.accessory.context.updateKeyColour) return
-          await this.platform.sendDeviceUpdate(this.accessory, params)
-          break
+      }
+      await helpers.sleep(500)
+      if (updateKeyBright !== this.accessory.context.updateKeyBright) return
+      await this.platform.sendDeviceUpdate(this.accessory, params)
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, true)
+    }
+  }
+
+  async internalColourTempUpdate (value, callback) {
+    try {
+      await helpers.sleep(2000)
+      callback()
+      const updateKeyColour = Math.random().toString(36).substr(2, 8)
+      this.accessory.context.updateKeyColour = updateKeyColour
+      // HomeKit has a ct range of 140-500 corresponding to 2000-7143K
+      // B02-F-A60 has a range of 2200K-6500K corresponding to ct: 0-255
+      let mToK = Math.round(1000000 / value)
+      if (mToK < 2200) mToK = 2200
+      if (mToK > 6500) mToK = 6500
+      const kToCT = Math.round(((mToK - 2200) / 4300) * 255)
+      const params = {
+        ltype: 'white',
+        white: {
+          ct: kToCT,
+          br: this.lightService.getCharacteristic(this.Characteristic.Brightness).value
         }
       }
+      this.accessory.context.cacheCT = kToCT
+      await helpers.sleep(1000)
+      if (updateKeyColour !== this.accessory.context.updateKeyColour) return
+      await this.platform.sendDeviceUpdate(this.accessory, params)
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
     }
diff --git a/lib/device/light-dimmer.js b/lib/device/light-dimmer.js
index 243903f3..077832cc 100644
--- a/lib/device/light-dimmer.js
+++ b/lib/device/light-dimmer.js
@@ -10,41 +10,42 @@ module.exports = class deviceLightDimmer {
     this.lightService = accessory.getService(this.Service.Lightbulb) || accessory.addService(this.Service.Lightbulb)
     this.lightService
       .getCharacteristic(this.Characteristic.On)
-      .on('set', (value, callback) => this.internalUpdate('onoff', value, callback))
+      .on('set', this.internalOnOffUpdate.bind(this))
     this.lightService.getCharacteristic(this.Characteristic.Brightness)
-      .on('set', (value, callback) => this.internalUpdate('brightness', value, callback))
+      .on('set', this.internalBrightnessUpdate.bind(this))
     this.accessory = accessory
   }
 
-  async internalUpdate (type, value, callback) {
+  async internalOnOffUpdate (value, callback) {
+    try {
+      callback()
+      const params = { switch: value ? 'on' : 'off' }
+      await this.platform.sendDeviceUpdate(this.accessory, params)
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, true)
+    }
+  }
+
+  async internalBrightnessUpdate (value, callback) {
     try {
       callback()
       const params = {}
-      switch (type) {
-        case 'onoff':
-          params.switch = value ? 'on' : 'off'
-          await this.platform.sendDeviceUpdate(this.accessory, params)
+      const updateKey = Math.random().toString(36).substr(2, 8)
+      this.accessory.context.updateKey = updateKey
+      switch (this.accessory.context.eweUIID) {
+        case 36:
+        // *** KING-M4 eWeLink scale is 10-100 and HomeKit scale is 0-100. *** \\
+          params.bright = Math.round((value * 9) / 10 + 10)
           break
-        case 'brightness': {
-          const updateKey = Math.random().toString(36).substr(2, 8)
-          this.accessory.context.updateKey = updateKey
-          switch (this.accessory.context.eweUIID) {
-            case 36:
-              // *** KING-M4 eWeLink scale is 10-100 and HomeKit scale is 0-100. *** \\
-              params.bright = Math.round((value * 9) / 10 + 10)
-              break
-            case 44:
-              // *** D1 eWeLink scale matches HomeKit scale of 0-100 *** \\
-              params.brightness = value
-              params.mode = 0
-              break
-          }
-          await helpers.sleep(500)
-          if (updateKey !== this.accessory.context.updateKey) return
-          await this.platform.sendDeviceUpdate(this.accessory, params)
+        case 44:
+        // *** D1 eWeLink scale matches HomeKit scale of 0-100 *** \\
+          params.brightness = value
+          params.mode = 0
           break
-        }
       }
+      await helpers.sleep(500)
+      if (updateKey !== this.accessory.context.updateKey) return
+      await this.platform.sendDeviceUpdate(this.accessory, params)
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
     }

From b9cff978640c3247fc8f43872fa6fef399d3e863 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 18 Nov 2020 12:06:25 +0000
Subject: [PATCH 0801/3183] separate functions tidy up

---
 lib/device/light-ctemp.js | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/lib/device/light-ctemp.js b/lib/device/light-ctemp.js
index 78b74339..7ef89a20 100644
--- a/lib/device/light-ctemp.js
+++ b/lib/device/light-ctemp.js
@@ -17,10 +17,15 @@ module.exports = class deviceLightColour {
     this.lightService
       .getCharacteristic(this.Characteristic.ColorTemperature)
       .on('set', this.internalColourTempUpdate.bind(this))
+    if (platform.api.version === 2.7 && platform.api.versionGreaterOrEqual('1.3.0-beta.24')) {
+      // adaptive lighting
+      this.alController = new platform.api.hap.AdaptiveLightingController(this.lightService)
+      accessory.configureController(this.alController)
+    }
     this.accessory = accessory
   }
 
-  async internaOnOffUpdate (value, callback) {
+  async internalOnOffUpdate (value, callback) {
     try {
       callback()
       const params = { switch: value ? 'on' : 'off' }
@@ -106,6 +111,18 @@ module.exports = class deviceLightColour {
               const kToMired = Math.round(1000000 / ctToK)
 
               this.lightService.updateCharacteristic(this.Characteristic.ColorTemperature, kToMired)
+              
+              /*
+              @TODO
+              check for any difference in ct and disable Adaptive Lighting
+              temperature could have been changed by user on the ewelink app
+
+              if (this.accessory.context.cacheCT !== params.white.ct) {
+                this.alController.disableAdaptiveLighting()
+              }
+
+              */
+              
               this.accessory.context.cacheCT = params.white.ct
             }
           }

From d2aea9077b957048bf5451954ee907e8f84238d3 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 19 Nov 2020 08:24:56 +0000
Subject: [PATCH 0802/3183] disable AL for now

---
 lib/device/light-ctemp.js | 30 +++++++++++++-----------------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/lib/device/light-ctemp.js b/lib/device/light-ctemp.js
index 7ef89a20..31b402b7 100644
--- a/lib/device/light-ctemp.js
+++ b/lib/device/light-ctemp.js
@@ -17,11 +17,13 @@ module.exports = class deviceLightColour {
     this.lightService
       .getCharacteristic(this.Characteristic.ColorTemperature)
       .on('set', this.internalColourTempUpdate.bind(this))
-    if (platform.api.version === 2.7 && platform.api.versionGreaterOrEqual('1.3.0-beta.24')) {
-      // adaptive lighting
-      this.alController = new platform.api.hap.AdaptiveLightingController(this.lightService)
-      accessory.configureController(this.alController)
-    }
+    /*
+      @BETA
+      if (platform.api.version === 2.7 && platform.api.versionGreaterOrEqual('1.3.0-beta.24')) {
+        this.alController = new platform.api.hap.AdaptiveLightingController(this.lightService)
+        accessory.configureController(this.alController)
+      }
+    */
     this.accessory = accessory
   }
 
@@ -106,23 +108,17 @@ module.exports = class deviceLightColour {
             if (helpers.hasProperty(params.white, 'ct')) {
               // B02-F-A60 has a range of 2200K-6500K corresponding to ct: 0-255
               // HomeKit has a ct range of 140-500 corresponding to 2000-7143K
-
               const ctToK = Math.round(params.white.ct / 255 * 4300 + 2200)
               const kToMired = Math.round(1000000 / ctToK)
-
               this.lightService.updateCharacteristic(this.Characteristic.ColorTemperature, kToMired)
-              
               /*
-              @TODO
-              check for any difference in ct and disable Adaptive Lighting
-              temperature could have been changed by user on the ewelink app
-
-              if (this.accessory.context.cacheCT !== params.white.ct) {
-                this.alController.disableAdaptiveLighting()
-              }
-
+                @BETA
+                check for any difference in ct and disable Adaptive Lighting
+                temperature could have been changed by user on the ewelink app
+                if (this.accessory.context.cacheCT !== params.white.ct) {
+                  this.alController.disableAdaptiveLighting()
+                }
               */
-              
               this.accessory.context.cacheCT = params.white.ct
             }
           }

From 3c3ffd17535dc9cb7c4b3a1b1af0aeb49d609ede Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 19 Nov 2020 08:36:12 +0000
Subject: [PATCH 0803/3183] 3.13.4-2

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d5db2f03..42f82016 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.13.4-1",
+  "version": "3.13.4-2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 9b43d720..66a7d424 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.13.4-1",
+  "version": "3.13.4-2",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 8c0bd589303c6c6512d528659b70c4a7295b97e8 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 20 Nov 2020 08:20:15 +0000
Subject: [PATCH 0804/3183] remove check for now

---
 lib/device/light-ctemp.js | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/lib/device/light-ctemp.js b/lib/device/light-ctemp.js
index 31b402b7..376ba21b 100644
--- a/lib/device/light-ctemp.js
+++ b/lib/device/light-ctemp.js
@@ -111,14 +111,6 @@ module.exports = class deviceLightColour {
               const ctToK = Math.round(params.white.ct / 255 * 4300 + 2200)
               const kToMired = Math.round(1000000 / ctToK)
               this.lightService.updateCharacteristic(this.Characteristic.ColorTemperature, kToMired)
-              /*
-                @BETA
-                check for any difference in ct and disable Adaptive Lighting
-                temperature could have been changed by user on the ewelink app
-                if (this.accessory.context.cacheCT !== params.white.ct) {
-                  this.alController.disableAdaptiveLighting()
-                }
-              */
               this.accessory.context.cacheCT = params.white.ct
             }
           }

From 5984e9e2638460a60c56154045c5b3f16c5110cf Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 20 Nov 2020 12:30:43 +0000
Subject: [PATCH 0805/3183] Create ISSUE_TEMPLATE.md

---
 .github/ISSUE_TEMPLATE.md | 41 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE.md

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
new file mode 100644
index 00000000..7dab9f26
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,41 @@
+<!-- PLEASE READ BEFORE POSTING A NEW ISSUE
+   * If you are giving feedback or requesting a new feature then feel free to ignore this template.
+   * If you experiencing an issue with the plugin then please use this template as well as you can.
+   * Things that may seem unimportant to you are often helpful in finding the cause of the issue.
+   * This is not the place for issues with the homebridge-ewelink-max plugin. I am not the owner of homebridge-ewelink-max. -->
+
+### What issue do you have? Please be as thorough and explicit as possible.
+
+
+
+### Details of your setup.
+* Do you use Homebridge (with config-ui?) or HOOBS? 
+
+
+
+* Which version of Homebridge/HOOBS do you have?
+
+
+
+* Which version of this plugin (homebridge-ewelink) do you have? Has the issue started since upgrading from a previous version?
+
+
+
+* Which eWeLink devices do you have that are causing issues? Please include product models if applicable.
+
+
+
+* Do you use your main eWeLink credentials or do you use a secondary eWeLink account for Homebridge?
+
+
+
+### Please paste any relevant logs below.
+<!--
+   It helps if you can turn on 'Debug Logging' and 'Request & Response Logging' in the plugin settings for more thorough logging.
+   If you are posting an error then it is helpful for me to also see the previous few lines as this can show the cause of the error.
+   Please enter the logs between the two ``` lines below so that the logs are formatted in a way which is easier to read
+-->
+
+```
+
+```

From 8c049a5c5a28a134c6c8f9a39c277c39483b9e86 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 20 Nov 2020 12:31:47 +0000
Subject: [PATCH 0806/3183] Update ISSUE_TEMPLATE.md

---
 .github/ISSUE_TEMPLATE.md | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 7dab9f26..789181de 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,8 +1,7 @@
 <!-- PLEASE READ BEFORE POSTING A NEW ISSUE
    * If you are giving feedback or requesting a new feature then feel free to ignore this template.
-   * If you experiencing an issue with the plugin then please use this template as well as you can.
-   * Things that may seem unimportant to you are often helpful in finding the cause of the issue.
-   * This is not the place for issues with the homebridge-ewelink-max plugin. I am not the owner of homebridge-ewelink-max. -->
+   * If you are experiencing an issue with the plugin then please use this template as well as you can.
+   * Things that may seem unimportant to you are often helpful in finding the cause of the issue. -->
 
 ### What issue do you have? Please be as thorough and explicit as possible.
 

From 5679744e2ce535171691fe5b88c68600dee5ad57 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 20 Nov 2020 12:35:30 +0000
Subject: [PATCH 0807/3183] Update ISSUE_TEMPLATE.md

---
 .github/ISSUE_TEMPLATE.md | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 789181de..4c7d4b18 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,7 +1,7 @@
 <!-- PLEASE READ BEFORE POSTING A NEW ISSUE
-   * If you are giving feedback or requesting a new feature then feel free to ignore this template.
-   * If you are experiencing an issue with the plugin then please use this template as well as you can.
-   * Things that may seem unimportant to you are often helpful in finding the cause of the issue. -->
+   → If you are giving feedback or requesting a new feature then feel free to ignore this template.
+   → If you are experiencing an issue with the plugin then please use this template as well as you can.
+   → Things that may seem unimportant to you are often helpful in finding the cause of the issue. -->
 
 ### What issue do you have? Please be as thorough and explicit as possible.
 
@@ -29,10 +29,13 @@
 
 
 ### Please paste any relevant logs below.
-<!--
-   It helps if you can turn on 'Debug Logging' and 'Request & Response Logging' in the plugin settings for more thorough logging.
-   If you are posting an error then it is helpful for me to also see the previous few lines as this can show the cause of the error.
-   Please enter the logs between the two ``` lines below so that the logs are formatted in a way which is easier to read
+<!-- ABOUT LOGS
+   → More thorough logging can be seen by enabling 'Debug Logging' and
+     ...'Request & Response Logging' in the plugin settings.
+   → If you are posting an error then it is helpful for me to also see
+     ...the previous few lines as this can show the cause of the error.
+   → Please enter the logs between the two ``` lines below so that
+     ...the logs are formatted in a way which is easier to read
 -->
 
 ```

From b7e1977e7f4620a4418185500edc48e14a9a67ed Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 20 Nov 2020 12:36:43 +0000
Subject: [PATCH 0808/3183] Update ISSUE_TEMPLATE.md

---
 .github/ISSUE_TEMPLATE.md | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 4c7d4b18..9fa9f74b 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,7 +1,8 @@
 <!-- PLEASE READ BEFORE POSTING A NEW ISSUE
    → If you are giving feedback or requesting a new feature then feel free to ignore this template.
    → If you are experiencing an issue with the plugin then please use this template as well as you can.
-   → Things that may seem unimportant to you are often helpful in finding the cause of the issue. -->
+   → Things that may seem unimportant to you are often helpful in finding the cause of the issue.
+-->
 
 ### What issue do you have? Please be as thorough and explicit as possible.
 
@@ -31,11 +32,11 @@
 ### Please paste any relevant logs below.
 <!-- ABOUT LOGS
    → More thorough logging can be seen by enabling 'Debug Logging' and
-     ...'Request & Response Logging' in the plugin settings.
+        ...'Request & Response Logging' in the plugin settings.
    → If you are posting an error then it is helpful for me to also see
-     ...the previous few lines as this can show the cause of the error.
+        ...the previous few lines as this can show the cause of the error.
    → Please enter the logs between the two ``` lines below so that
-     ...the logs are formatted in a way which is easier to read
+        ...the logs are formatted in a way which is easier to read.
 -->
 
 ```

From c7561eb6911b498a5c7bb397ab36cc58bad0dab3 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 20 Nov 2020 12:40:54 +0000
Subject: [PATCH 0809/3183] issue templates

---
 .github/ISSUE_TEMPLATE.md           |  6 +++---
 .github/ISSUE_TEMPLATE/new-issue.md | 16 ++++++++++------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 9fa9f74b..26398aae 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -32,11 +32,11 @@
 ### Please paste any relevant logs below.
 <!-- ABOUT LOGS
    → More thorough logging can be seen by enabling 'Debug Logging' and
-        ...'Request & Response Logging' in the plugin settings.
+     ...'Request & Response Logging' in the plugin settings.
    → If you are posting an error then it is helpful for me to also see
-        ...the previous few lines as this can show the cause of the error.
+     ...the previous few lines as this can show the cause of the error.
    → Please enter the logs between the two ``` lines below so that
-        ...the logs are formatted in a way which is easier to read.
+     ...the logs are formatted in a way which is easier to read.
 -->
 
 ```
diff --git a/.github/ISSUE_TEMPLATE/new-issue.md b/.github/ISSUE_TEMPLATE/new-issue.md
index ac949c09..8c485cd1 100644
--- a/.github/ISSUE_TEMPLATE/new-issue.md
+++ b/.github/ISSUE_TEMPLATE/new-issue.md
@@ -8,8 +8,9 @@ assignees: ''
 ---
 
 <!-- PLEASE READ BEFORE POSTING A NEW ISSUE
-   * Please use this template as well as you can, in a lot of cases I will probably ask for things you might skip anyway.
-   * This is not the place for issues with the homebridge-ewelink-max plugin. I am not the owner of homebridge-ewelink-max -->
+   → Please use this template as well as you can.
+   → Things that may seem unimportant to you are often helpful in finding the cause of the issue.
+-->
 
 ### What issue do you have? Please be as thorough and explicit as possible.
 
@@ -37,10 +38,13 @@ assignees: ''
 
 
 ### Please paste any relevant logs below.
-<!--
-   It helps if you can turn on 'Debug Logging' and 'Request & Response Logging' in the plugin settings for more thorough logging.
-   If you are posting an error then it is helpful for me to also see the previous few lines as this can show the cause of the error.
-   Please enter the logs between the two ``` lines below so that the logs are formatted in a way which is easier to read
+<!-- ABOUT LOGS
+   → More thorough logging can be seen by enabling 'Debug Logging' and
+     ...'Request & Response Logging' in the plugin settings.
+   → If you are posting an error then it is helpful for me to also see
+     ...the previous few lines as this can show the cause of the error.
+   → Please enter the logs between the two ``` lines below so that
+     ...the logs are formatted in a way which is easier to read.
 -->
 
 ```

From 91fc50654a13900d8101bee4ad259b41103fa1d9 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 20 Nov 2020 13:18:31 +0000
Subject: [PATCH 0810/3183] Update light-ctemp.js

---
 lib/device/light-ctemp.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/device/light-ctemp.js b/lib/device/light-ctemp.js
index 376ba21b..a5e0a769 100644
--- a/lib/device/light-ctemp.js
+++ b/lib/device/light-ctemp.js
@@ -18,8 +18,7 @@ module.exports = class deviceLightColour {
       .getCharacteristic(this.Characteristic.ColorTemperature)
       .on('set', this.internalColourTempUpdate.bind(this))
     /*
-      @BETA
-      if (platform.api.version === 2.7 && platform.api.versionGreaterOrEqual('1.3.0-beta.24')) {
+      if (platform.api.version === 2.7 && platform.api.versionGreaterOrEqual('1.3.0-beta.26')) {
         this.alController = new platform.api.hap.AdaptiveLightingController(this.lightService)
         accessory.configureController(this.alController)
       }

From ec9e41774e94d2ee5147c52b25569921fa7967dc Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 20 Nov 2020 14:26:43 +0000
Subject: [PATCH 0811/3183] add some comments to code

---
 lib/ewelink-http.js | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/lib/ewelink-http.js b/lib/ewelink-http.js
index 87df8917..2e6fe055 100644
--- a/lib/ewelink-http.js
+++ b/lib/ewelink-http.js
@@ -6,6 +6,7 @@ const crypto = require('crypto')
 const helpers = require('./helpers')
 module.exports = class eWeLinkHTTP {
   constructor (config, log) {
+    // *** Set up our variables *** \\
     this.log = log
     this.debug = config.debug || false
     this.debugReqRes = config.debugReqRes || false
@@ -16,6 +17,7 @@ module.exports = class eWeLinkHTTP {
   }
 
   async getHost () {
+    // *** Used to get the user's regional (continent) HTTP API host *** \\
     const params = {
       appid: helpers.appId,
       country_code: this.cCode,
@@ -23,6 +25,8 @@ module.exports = class eWeLinkHTTP {
       ts: Math.floor(new Date().getTime() / 1000),
       version: 8
     }
+
+    // *** Set up the request signature *** \\
     let dataToSign = []
     try {
       Object.keys(params).forEach(k => {
@@ -34,11 +38,15 @@ module.exports = class eWeLinkHTTP {
       dataToSign.sort((a, b) => (a.key < b.key ? -1 : 1))
       dataToSign = dataToSign.map(k => k.key + '=' + k.value).join('&')
       dataToSign = crypto.createHmac('sha256', helpers.appSecret).update(dataToSign).digest('base64')
+
+      // *** Log the data depending on the debug setting *** \\
       if (this.debugReqRes) {
         this.log.warn('Sending HTTP getHost() request. This text is yellow for clarity.\n%s', JSON.stringify(params, null, 2))
       } else if (this.debug) {
         this.log('Sending HTTP getHost() request.')
       }
+
+      // *** Send the request *** \\
       const res = await axios.get('https://api.coolkit.cc:8080/api/user/region', {
         headers: {
           Authorization: 'Sign ' + dataToSign,
@@ -46,6 +54,8 @@ module.exports = class eWeLinkHTTP {
         },
         params
       })
+
+      // *** Parse the response *** \\
       const body = res.data
       if (!body.region) {
         throw new Error('Server did not respond with a region.\n' + JSON.stringify(body, null, 2))
@@ -65,6 +75,7 @@ module.exports = class eWeLinkHTTP {
       if (this.debug) this.log('HTTP API host received [%s].', this.httpHost)
     } catch (err) {
       if (helpers.hasProperty(err, 'code') && helpers.httpRetryCodes.includes(err.code)) {
+        // *** Retry if another attempt could be successful *** \\
         if (this.debug) this.log.warn('Unable to reach eWeLink. Retrying in 30 seconds.')
         await helpers.sleep(30000)
         return await this.getHost()
@@ -75,6 +86,7 @@ module.exports = class eWeLinkHTTP {
   }
 
   async login () {
+    // *** Used to log the user in and obtain the user api key and token *** \\
     if (this.httpHost === undefined) this.httpHost = 'eu-apia.coolkit.cc'
     const data = {
       countryCode: this.cCode,
@@ -85,13 +97,19 @@ module.exports = class eWeLinkHTTP {
     } else {
       data.phoneNumber = this.username
     }
+
+    // *** Log the data depending on the debug setting *** \\
     if (this.debugReqRes) {
       const msg = JSON.stringify(data, null, 2).replace(this.password, '**hidden**').replace(this.username, '**hidden**')
       this.log.warn('Sending HTTP login() request. This text is yellow for clarity.\n%s', msg)
     } else if (this.debug) {
       this.log('Sending HTTP login() request.')
     }
+
+    // *** Set up the request signature *** \\
     const dataToSign = crypto.createHmac('sha256', helpers.appSecret).update(JSON.stringify(data)).digest('base64')
+
+    // *** Send the request *** \\
     const res = await axios.post('https://' + this.httpHost + '/v2/user/login', data, {
       headers: {
         Authorization: 'Sign ' + dataToSign,
@@ -100,6 +118,7 @@ module.exports = class eWeLinkHTTP {
         'X-CK-Nonce': Math.random().toString(36).substr(2, 8)
       }
     })
+    // *** Parse the response *** \\
     const body = res.data
     if (
       helpers.hasProperty(body, 'error') &&
@@ -107,6 +126,7 @@ module.exports = class eWeLinkHTTP {
       helpers.hasProperty(body, 'data') &&
       helpers.hasProperty(body.data, 'region')
     ) {
+      // *** In this case the user has been given a different region so retry login *** \\
       const givenRegion = body.data.region
       switch (givenRegion) {
         case 'eu':
@@ -124,6 +144,7 @@ module.exports = class eWeLinkHTTP {
       return await this.login()
     } else {
       if (body.data.at) {
+        // *** User api key and token received successfully *** \\
         this.aToken = body.data.at
         this.apiKey = body.data.user.apikey
         return {
@@ -133,6 +154,7 @@ module.exports = class eWeLinkHTTP {
         }
       } else {
         if (body.error === 500) {
+          // *** Retry if another attempt could be successful *** \\
           if (this.debug) this.log.warn('An eWeLink error [500] occured. Retrying in 30 seconds.')
           await helpers.sleep(30000)
           return await this.login()
@@ -144,7 +166,9 @@ module.exports = class eWeLinkHTTP {
   }
 
   async getDevices () {
+    // *** Used to get a user's device list *** \\
     try {
+      // *** Send the request *** \\
       const res = await axios.get('https://' + this.httpHost + '/v2/device/thing', {
         headers: {
           Authorization: 'Bearer ' + this.aToken,
@@ -153,6 +177,8 @@ module.exports = class eWeLinkHTTP {
           'X-CK-Nonce': Math.random().toString(36).substr(2, 8)
         }
       })
+
+      // *** Parse the response *** \\
       const body = res.data
       if (
         !helpers.hasProperty(body, 'data') ||
@@ -161,16 +187,20 @@ module.exports = class eWeLinkHTTP {
       ) {
         throw new Error(JSON.stringify(body, null, 2))
       }
+
+      // *** The list also includes scenes so we need to remove them *** \\
       const deviceList = []
       const sensorList = []
       if (body.data.thingList && body.data.thingList.length > 0) {
         body.data.thingList.forEach(d => {
+          // *** Check each item is a device and also remove any devices the user has ignored *** \\
           if (
             helpers.hasProperty(d, 'itemData') &&
             helpers.hasProperty(d.itemData, 'extra') &&
             helpers.hasProperty(d.itemData.extra, 'uiid') &&
             !this.hideDevFromHB.includes(d.itemData.deviceid)
           ) {
+            // *** Separate the sensors as these need to be set up first *** \\
             if (d.itemData.extra.uiid === 102) {
               sensorList.push(d.itemData)
             } else {
@@ -179,9 +209,12 @@ module.exports = class eWeLinkHTTP {
           }
         })
       }
+
+      // *** Sensors need to go first as garages depend on them to exist *** \\
       return deviceList.concat(sensorList)
     } catch (err) {
       if (helpers.hasProperty(err, 'code') && helpers.httpRetryCodes.includes(err.code)) {
+        // *** Retry if another attempt could be successful *** \\
         if (this.debug) this.log.warn('Unable to reach eWeLink. Retrying in 30 seconds.')
         await helpers.sleep(30000)
         return await this.getDevices()
@@ -192,7 +225,9 @@ module.exports = class eWeLinkHTTP {
   }
 
   async getDevice (deviceId) {
+    // *** Used to get info about a specific device *** \\
     try {
+      // *** Send the request *** \\
       const res = await axios.post('https://' + this.httpHost + '/v2/device/thing', {
         thingList: [{
           itemType: 1,
@@ -206,6 +241,8 @@ module.exports = class eWeLinkHTTP {
           'X-CK-Nonce': Math.random().toString(36).substr(2, 8)
         }
       })
+
+      // *** Parse the response *** \\
       const body = res.data
       if (
         !helpers.hasProperty(body, 'data') ||
@@ -215,12 +252,14 @@ module.exports = class eWeLinkHTTP {
         throw new Error(JSON.stringify(body, null, 2))
       }
       if (body.data.thingList && body.data.thingList.length === 1) {
+        // *** Return the device data *** \\
         return body.data.thingList[0].itemData
       } else {
         throw new Error('device not found in eWeLink')
       }
     } catch (err) {
       if (helpers.hasProperty(err, 'code') && helpers.httpRetryCodes.includes(err.code)) {
+        // *** Retry if another attempt could be successful *** \\
         if (this.debug) this.log.warn('Unable to reach eWeLink. Retrying in 30 seconds.')
         await helpers.sleep(30000)
         return await this.getDevice(deviceId)

From 206659be4ffe6978bd9cff26e06ad1a1d77c3179 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 20 Nov 2020 14:30:00 +0000
Subject: [PATCH 0812/3183] comments

---
 lib/ewelink-http.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/ewelink-http.js b/lib/ewelink-http.js
index 2e6fe055..6a6a48c5 100644
--- a/lib/ewelink-http.js
+++ b/lib/ewelink-http.js
@@ -200,7 +200,7 @@ module.exports = class eWeLinkHTTP {
             helpers.hasProperty(d.itemData.extra, 'uiid') &&
             !this.hideDevFromHB.includes(d.itemData.deviceid)
           ) {
-            // *** Separate the sensors as these need to be set up first *** \\
+            // *** Separate the sensors as these need to be set up last *** \\
             if (d.itemData.extra.uiid === 102) {
               sensorList.push(d.itemData)
             } else {
@@ -210,7 +210,7 @@ module.exports = class eWeLinkHTTP {
         })
       }
 
-      // *** Sensors need to go first as garages depend on them to exist *** \\
+      // *** Sensors need to go last as they update garages that need to exist already *** \\
       return deviceList.concat(sensorList)
     } catch (err) {
       if (helpers.hasProperty(err, 'code') && helpers.httpRetryCodes.includes(err.code)) {

From 7ca876e4df81353929dfa2bc34bc4a89b7704dbf Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 20 Nov 2020 14:37:36 +0000
Subject: [PATCH 0813/3183] skip matching updates [AL]

---
 lib/device/light-ctemp.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/device/light-ctemp.js b/lib/device/light-ctemp.js
index a5e0a769..57d616d2 100644
--- a/lib/device/light-ctemp.js
+++ b/lib/device/light-ctemp.js
@@ -40,6 +40,8 @@ module.exports = class deviceLightColour {
     try {
       await helpers.sleep(1000)
       callback()
+      if (this.lastSentBrightness === value) return
+      this.lastSentBrightness = value
       const updateKeyBright = Math.random().toString(36).substr(2, 8)
       this.accessory.context.updateKeyBright = updateKeyBright
       // *** Device needs the current ct value sent too *** \\
@@ -62,8 +64,10 @@ module.exports = class deviceLightColour {
     try {
       await helpers.sleep(2000)
       callback()
+      if (this.lastSentColour === value) return
+      this.lastSentColour = value
       const updateKeyColour = Math.random().toString(36).substr(2, 8)
-      this.accessory.context.updateKeyColour = updateKeyColour
+      this.updateKeyColour = updateKeyColour
       // HomeKit has a ct range of 140-500 corresponding to 2000-7143K
       // B02-F-A60 has a range of 2200K-6500K corresponding to ct: 0-255
       let mToK = Math.round(1000000 / value)
@@ -79,7 +83,7 @@ module.exports = class deviceLightColour {
       }
       this.accessory.context.cacheCT = kToCT
       await helpers.sleep(1000)
-      if (updateKeyColour !== this.accessory.context.updateKeyColour) return
+      if (updateKeyColour !== this.updateKeyColour) return
       await this.platform.sendDeviceUpdate(this.accessory, params)
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)

From 764a760d42ad8d3cb506dbbeb2bb4636991c0908 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 20 Nov 2020 17:37:46 +0000
Subject: [PATCH 0814/3183] 3.13.4-3

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 42f82016..0a4dda45 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.13.4-2",
+  "version": "3.13.4-3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 66a7d424..9d9256a7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.13.4-2",
+  "version": "3.13.4-3",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 38620147ca051ea4d68bd6875128fe3e0173f71c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 21 Nov 2020 09:58:58 +0000
Subject: [PATCH 0815/3183] Update light-ctemp.js

---
 lib/device/light-ctemp.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/lib/device/light-ctemp.js b/lib/device/light-ctemp.js
index 57d616d2..f962f139 100644
--- a/lib/device/light-ctemp.js
+++ b/lib/device/light-ctemp.js
@@ -17,12 +17,10 @@ module.exports = class deviceLightColour {
     this.lightService
       .getCharacteristic(this.Characteristic.ColorTemperature)
       .on('set', this.internalColourTempUpdate.bind(this))
-    /*
-      if (platform.api.version === 2.7 && platform.api.versionGreaterOrEqual('1.3.0-beta.26')) {
+      if (platform.api.version === 2.7 && platform.api.versionGreaterOrEqual('1.3.0-beta.27')) {
         this.alController = new platform.api.hap.AdaptiveLightingController(this.lightService)
         accessory.configureController(this.alController)
       }
-    */
     this.accessory = accessory
   }
 

From ecc8d099b49145b69f45b3ab97cb4f3ab9ebe51b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 21 Nov 2020 13:25:51 +0000
Subject: [PATCH 0816/3183] Update light-ctemp.js

---
 lib/device/light-ctemp.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/device/light-ctemp.js b/lib/device/light-ctemp.js
index f962f139..42337481 100644
--- a/lib/device/light-ctemp.js
+++ b/lib/device/light-ctemp.js
@@ -17,10 +17,10 @@ module.exports = class deviceLightColour {
     this.lightService
       .getCharacteristic(this.Characteristic.ColorTemperature)
       .on('set', this.internalColourTempUpdate.bind(this))
-      if (platform.api.version === 2.7 && platform.api.versionGreaterOrEqual('1.3.0-beta.27')) {
-        this.alController = new platform.api.hap.AdaptiveLightingController(this.lightService)
-        accessory.configureController(this.alController)
-      }
+    if (platform.api.version === 2.7 && platform.api.versionGreaterOrEqual('1.3.0-beta.27')) {
+      this.alController = new platform.api.hap.AdaptiveLightingController(this.lightService)
+      accessory.configureController(this.alController)
+    }
     this.accessory = accessory
   }
 

From a79fd9b9b866c09ca6986f6a4a390670c18ad8b9 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 21 Nov 2020 18:01:47 +0000
Subject: [PATCH 0817/3183] ws refresh to one hour

---
 lib/ewelink-platform.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ewelink-platform.js b/lib/ewelink-platform.js
index b86e9fb4..f3fa4a83 100644
--- a/lib/ewelink-platform.js
+++ b/lib/ewelink-platform.js
@@ -149,7 +149,7 @@ module.exports = class eWeLinkPlatform {
             this.log.warn(this.debug ? err : err.message)
           }
         }
-      }, 1800000, { stopOnError: false })
+      }, 3600000, { stopOnError: false })
 
       // *** Logging for informative purposes *** \\
       this.log("eWeLink sync complete. Don't forget to ⭐️  this plugin on GitHub if you're finding it useful!")

From 4a1916924c54b851cb3994ce37c7d3549b4dd457 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 21 Nov 2020 19:58:28 +0000
Subject: [PATCH 0818/3183] don't update light if off [AL]

---
 lib/device/light-ctemp.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/device/light-ctemp.js b/lib/device/light-ctemp.js
index 42337481..53b9ef23 100644
--- a/lib/device/light-ctemp.js
+++ b/lib/device/light-ctemp.js
@@ -63,6 +63,7 @@ module.exports = class deviceLightColour {
       await helpers.sleep(2000)
       callback()
       if (this.lastSentColour === value) return
+      if (!this.lightService.getCharacteristic(this.Characteristic.On).value) return
       this.lastSentColour = value
       const updateKeyColour = Math.random().toString(36).substr(2, 8)
       this.updateKeyColour = updateKeyColour

From 36e8f978c4ede3b6f7638cc7a325c15d8952536b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 21 Nov 2020 21:45:11 +0000
Subject: [PATCH 0819/3183] 3.14.0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 0a4dda45..82469046 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.13.4-3",
+  "version": "3.14.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 9d9256a7..178b0aed 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.13.4-3",
+  "version": "3.14.0",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 85e9a68c6fed8e3f808f31770738d7121c410c4f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 23 Nov 2020 09:51:52 +0000
Subject: [PATCH 0820/3183] Update light-ctemp.js

---
 lib/device/light-ctemp.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/device/light-ctemp.js b/lib/device/light-ctemp.js
index 53b9ef23..06ee2813 100644
--- a/lib/device/light-ctemp.js
+++ b/lib/device/light-ctemp.js
@@ -63,7 +63,6 @@ module.exports = class deviceLightColour {
       await helpers.sleep(2000)
       callback()
       if (this.lastSentColour === value) return
-      if (!this.lightService.getCharacteristic(this.Characteristic.On).value) return
       this.lastSentColour = value
       const updateKeyColour = Math.random().toString(36).substr(2, 8)
       this.updateKeyColour = updateKeyColour
@@ -74,6 +73,7 @@ module.exports = class deviceLightColour {
       if (mToK > 6500) mToK = 6500
       const kToCT = Math.round(((mToK - 2200) / 4300) * 255)
       const params = {
+        switch: this.lightService.getCharacteristic(this.Characteristic.On).value ? 'on' : 'off',
         ltype: 'white',
         white: {
           ct: kToCT,

From 8888c917cfdeb37e0626897a6476a393d5c07219 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 23 Nov 2020 09:52:04 +0000
Subject: [PATCH 0821/3183] Update package-lock.json

---
 package-lock.json | 67 +++++++----------------------------------------
 1 file changed, 10 insertions(+), 57 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 82469046..ad952b7f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -123,11 +123,6 @@
       "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz",
       "integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g=="
     },
-    "is-negative-zero": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.0.tgz",
-      "integrity": "sha1-lVOxIbD6wohp2p7UWeIMdUN4hGE="
-    },
     "is-regex": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.1.tgz",
@@ -186,63 +181,21 @@
       }
     },
     "string.prototype.trimend": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.2.tgz",
-      "integrity": "sha512-8oAG/hi14Z4nOVP0z6mdiVZ/wqjDtWSLygMigTzAb+7aPEDTleeFf+WrF+alzecxIRkckkJVn+dTlwzJXORATw==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.3.tgz",
+      "integrity": "sha512-ayH0pB+uf0U28CtjlLvL7NaohvR1amUvVZk+y3DYb0Ey2PUV5zPkkKy9+U1ndVEIXO8hNg18eIv9Jntbii+dKw==",
       "requires": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.18.0-next.1"
-      },
-      "dependencies": {
-        "es-abstract": {
-          "version": "1.18.0-next.1",
-          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.1.tgz",
-          "integrity": "sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==",
-          "requires": {
-            "es-to-primitive": "^1.2.1",
-            "function-bind": "^1.1.1",
-            "has": "^1.0.3",
-            "has-symbols": "^1.0.1",
-            "is-callable": "^1.2.2",
-            "is-negative-zero": "^2.0.0",
-            "is-regex": "^1.1.1",
-            "object-inspect": "^1.8.0",
-            "object-keys": "^1.1.1",
-            "object.assign": "^4.1.1",
-            "string.prototype.trimend": "^1.0.1",
-            "string.prototype.trimstart": "^1.0.1"
-          }
-        }
+        "call-bind": "^1.0.0",
+        "define-properties": "^1.1.3"
       }
     },
     "string.prototype.trimstart": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.2.tgz",
-      "integrity": "sha512-7F6CdBTl5zyu30BJFdzSTlSlLPwODC23Od+iLoVH8X6+3fvDPPuBVVj9iaB1GOsSTSIgVfsfm27R2FGrAPznWg==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.3.tgz",
+      "integrity": "sha512-oBIBUy5lea5tt0ovtOFiEQaBkoBBkyJhZXzJYrSmDo5IUUqbOPvVezuRs/agBIdZ2p2Eo1FD6bD9USyBLfl3xg==",
       "requires": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.18.0-next.1"
-      },
-      "dependencies": {
-        "es-abstract": {
-          "version": "1.18.0-next.1",
-          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.1.tgz",
-          "integrity": "sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==",
-          "requires": {
-            "es-to-primitive": "^1.2.1",
-            "function-bind": "^1.1.1",
-            "has": "^1.0.3",
-            "has-symbols": "^1.0.1",
-            "is-callable": "^1.2.2",
-            "is-negative-zero": "^2.0.0",
-            "is-regex": "^1.1.1",
-            "object-inspect": "^1.8.0",
-            "object-keys": "^1.1.1",
-            "object.assign": "^4.1.1",
-            "string.prototype.trimend": "^1.0.1",
-            "string.prototype.trimstart": "^1.0.1"
-          }
-        }
+        "call-bind": "^1.0.0",
+        "define-properties": "^1.1.3"
       }
     },
     "websocket-as-promised": {

From a42600540db8e9ffeca4a24711adddab0c670386 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 23 Nov 2020 13:53:26 +0000
Subject: [PATCH 0822/3183] snazzy little ui

---
 config.schema.json              |   1 +
 homebridge-ui/public/index.html | 169 ++++++++++++++++++++++++++++++++
 homebridge-ui/server.js         |  34 +++++++
 package-lock.json               |   5 +
 package.json                    |   1 +
 5 files changed, 210 insertions(+)
 create mode 100644 homebridge-ui/public/index.html
 create mode 100644 homebridge-ui/server.js

diff --git a/config.schema.json b/config.schema.json
index effe515e..c0f116c8 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -2,6 +2,7 @@
   "pluginAlias": "eWeLink",
   "pluginType": "platform",
   "singular": true,
+  "customUi": true,
   "headerDisplay": "<p align=\"center\"><img width=\"75%\" src=\"https://user-images.githubusercontent.com/43026681/98988978-5e86b600-2520-11eb-875b-0703f4575e97.png\"></p><p align=\"center\">For help and support please visit our <a href=\"https://github.com/bwp91/homebridge-ewelink/wiki\">GitHub Wiki</a>. We hope you find this plugin useful!</p>",
   "schema": {
     "type": "object",
diff --git a/homebridge-ui/public/index.html b/homebridge-ui/public/index.html
new file mode 100644
index 00000000..7f0941d7
--- /dev/null
+++ b/homebridge-ui/public/index.html
@@ -0,0 +1,169 @@
+<p align="center">
+  <img width="60%" src="https://user-images.githubusercontent.com/43026681/98988978-5e86b600-2520-11eb-875b-0703f4575e97.png">
+</p>
+<div class="btn-group w-100 mb-3" role="group" aria-label="Basic example">
+  <button type="button" class="btn btn-primary ml-0" id="menuSettings">Settings</button>
+  <button type="button" class="btn btn-primary" id="menuDevices">My Devices</button>
+  <button type="button" class="btn btn-primary mr-0" id="menuHome">Support</button>
+</div>
+<div id="pageAbout" style="display: none;">
+  <div class="card card-body">
+    <p align="center">Thank you for using homebridge-ewelink. We hope you find it useful!</p>
+    <p align="center">The links below will take you to our GitHub wiki.</p>
+    <h4>Features</h4>
+    <ul>
+    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/Supported-Devices" target="_blank">Supported Devices</a></li>
+    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/Multi-Channel-Devices" target="_blank">Multi Channel Devices</a></li>
+    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/Accessory-Simulations" target="_blank">Accessory Simulations</a></li>
+    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/Connection-Methods" target="_blank">Connection Methods</a></li>
+    </ul>
+    <h4>How-to Guides</h4>
+    <ul>
+    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/How-to-set-up-RF-Bridge-sensors" target="_blank">How to set up RF Bridge sensors</a></li>
+    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/How-to-set-up-Sonoff-Camera" target="_blank">How to set up Sonoff Camera (GK-200MP2-B)</a></li>
+    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/How-to-copy-Homebridge-logs" target="_blank">How to copy Homebridge logs</a></li>
+    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/How-to-enable-disable-plugin-extended-logging" target="_blank">How to enable/disable plugin extended logging</a></li>
+    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/How-to-remove-an-accessory-from-the-cache" target="_blank">How to remove an accessory from the cache</a></li>
+    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/How-to-update-node" target="_blank">How to update node</a></li>
+    </ul>
+    <h4>About</h4>
+    <ul>
+    <li><a href="https://github.com/sponsors/bwp91" target="_blank">About Me</a></li>
+    <li><a href="https://github.com/bwp91/homebridge-ewelink/releases" target="_blank">Changelog</a></li>
+    <li><a href="https://github.com/bwp91/homebridge-ewelink/issues/new/choose" target="_blank">Support Request</a></li>
+    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/Credits" target="_blank">Credits</a></li>
+    </ul>
+    <h4>Disclaimer</h4>
+    <p>I am in no way affiliated with eWeLink nor any of the device brands (like Sonoff) and this plugin is a personal project that I maintain in my free time.</p>
+  </div>
+</div>
+<div id="pageDevices" style="display: none;">
+  <div class="card card-body" id="deviceInfo">
+    <form>
+      <div class="form-group">
+        <select class="form-control" id="deviceSelect"></select>
+      </div>
+    </form>
+    <table class="table w-100" id="deviceTable">
+      <thead>
+        <tr class="table-active">
+          <th scope="col" style="width: 40%;">Device Name</th>
+          <th scope="col" style="width: 60%;" id="displayName"></th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr>
+          <th scope="row">Cloud Status</th>
+          <td id="reachableWAN"></td>
+        </tr>
+        <tr>
+          <th scope="row">LAN Status</th>
+          <td id="reachableLAN"></td>
+        </tr>
+        <tr>
+          <th scope="row">Homebridge ID</th>
+          <td id="hbDeviceId"></td>
+        </tr>
+        <tr>
+          <th scope="row">eWeLink ID</th>
+          <td id="eweDeviceId"></td>
+        </tr>
+        <tr>
+          <th scope="row">Model</th>
+          <td id="eweModel"></td>
+        </tr>
+      </tbody>
+    </table>
+  </div>
+</div>
+<script>
+  (async () => {
+    try {
+      showHome = () => {
+        homebridge.showSpinner()
+        homebridge.hideSchemaForm()
+        document.getElementById('menuHome').classList.add('btn-primary-outline')
+        document.getElementById('menuHome').classList.remove('btn-primary')
+        document.getElementById('menuDevices').classList.remove('btn-primary-outline')
+        document.getElementById('menuDevices').classList.add('btn-primary')
+        document.getElementById('menuSettings').classList.remove('btn-primary-outline')
+        document.getElementById('menuSettings').classList.add('btn-primary')
+        document.getElementById('pageAbout').style.display = 'block'
+        document.getElementById('pageDevices').style.display = 'none'
+        homebridge.hideSpinner()
+      }
+      showDevices = async () => {
+        homebridge.showSpinner()
+        homebridge.hideSchemaForm()
+        document.getElementById('menuHome').classList.remove('btn-primary-outline')
+        document.getElementById('menuHome').classList.add('btn-primary')
+        document.getElementById('menuDevices').classList.add('btn-primary-outline')
+        document.getElementById('menuDevices').classList.remove('btn-primary')
+        document.getElementById('menuSettings').classList.remove('btn-primary-outline')
+        document.getElementById('menuSettings').classList.add('btn-primary')
+        document.getElementById('pageAbout').style.display = 'none'
+        document.getElementById('pageDevices').style.display = 'block'
+        const cachedAccessories = await homebridge.request('/getCachedAccessories')
+        const deviceSelect = document.getElementById('deviceSelect')
+        deviceSelect.innerHTML = ''
+        cachedAccessories.forEach(a => {
+          const option = document.createElement('option')
+          option.text = a.displayName
+          option.value = a.context.hbDeviceId
+          deviceSelect.add(option)
+        })
+        showDeviceInfo = async hbDeviceId => {
+          homebridge.showSpinner()
+          const selectedAccessory = cachedAccessories.find(x => x.context.hbDeviceId === hbDeviceId)
+          document.getElementById('displayName').innerHTML = selectedAccessory.displayName
+          if (selectedAccessory.context.reachableWAN) {
+            document.getElementById('reachableWAN').innerHTML = 'Online'
+          } else {
+            document.getElementById('reachableWAN').innerHTML = 'Offline'
+          }
+          if (selectedAccessory.context.reachableLAN) {
+            document.getElementById('reachableLAN').innerHTML = 'Online'
+          } else {
+            document.getElementById('reachableLAN').innerHTML = 'Offline'
+          }
+          document.getElementById('hbDeviceId').innerHTML = selectedAccessory.context.hbDeviceId
+          document.getElementById('eweDeviceId').innerHTML = selectedAccessory.context.eweDeviceId
+          document.getElementById('eweModel').innerHTML = selectedAccessory.context.eweModel
+          document.getElementById('deviceTable').style.display = 'inline-table'
+          homebridge.hideSpinner()
+        }
+        deviceSelect.addEventListener('change', event => showDeviceInfo(event.target.value))
+        if (Object.keys(cachedAccessories).length > 0) {
+          showDeviceInfo(cachedAccessories[0].context.hbDeviceId)
+        } else {
+          const option = document.createElement('option')
+          option.text = 'No Devices'
+          deviceSelect.add(option)
+          deviceSelect.disabled = true
+        }
+        homebridge.hideSpinner()
+      }
+      showSettings = () => {
+        homebridge.showSpinner()
+        document.getElementById('menuHome').classList.remove('btn-primary-outline')
+        document.getElementById('menuHome').classList.add('btn-primary')
+        document.getElementById('menuDevices').classList.remove('btn-primary-outline')
+        document.getElementById('menuDevices').classList.add('btn-primary')
+        document.getElementById('menuSettings').classList.add('btn-primary-outline')
+        document.getElementById('menuSettings').classList.remove('btn-primary')
+        document.getElementById('pageAbout').style.display = 'none'
+        document.getElementById('pageDevices').style.display = 'none'
+        homebridge.showSchemaForm()
+        homebridge.hideSpinner()
+      }
+      menuHome.addEventListener('click', () => showHome())
+      menuDevices.addEventListener('click', () => showDevices())
+      menuSettings.addEventListener('click', () => showSettings())
+      showSettings()
+    } catch (err) {
+      homebridge.toast.error(err.message, 'Error')
+    } finally {
+      homebridge.hideSpinner()
+    }
+  })()
+</script>
\ No newline at end of file
diff --git a/homebridge-ui/server.js b/homebridge-ui/server.js
new file mode 100644
index 00000000..a66cb2c8
--- /dev/null
+++ b/homebridge-ui/server.js
@@ -0,0 +1,34 @@
+const { HomebridgePluginUiServer } = require('@homebridge/plugin-ui-utils')
+const fs = require('fs')
+
+class PluginUiServer extends HomebridgePluginUiServer {
+  constructor () {
+    super()
+    this.onRequest('/getCachedAccessories', async () => {
+      const devicesToReturn = []
+      let cachedAccessories = await fs.promises.readFile(this.homebridgeStoragePath + '/accessories/cachedAccessories')
+      cachedAccessories = JSON.parse(cachedAccessories)
+      cachedAccessories
+        .filter(accessory => accessory.plugin === 'homebridge-ewelink')
+        .sort((a, b) => {
+          return a.displayName.toLowerCase() > b.displayName.toLowerCase()
+            ? 1
+            : b.displayName.toLowerCase() > a.displayName.toLowerCase()
+              ? -1
+              : 0
+        })
+        .forEach(accessory => {
+          devicesToReturn.push({
+            displayName: accessory.displayName,
+            context: accessory.context
+          })
+        })
+      return devicesToReturn
+    })
+    this.ready()
+  }
+}
+
+(() => {
+  return new PluginUiServer()
+})()
diff --git a/package-lock.json b/package-lock.json
index ad952b7f..76db033a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4,6 +4,11 @@
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
+    "@homebridge/plugin-ui-utils": {
+      "version": "0.0.17",
+      "resolved": "https://registry.npmjs.org/@homebridge/plugin-ui-utils/-/plugin-ui-utils-0.0.17.tgz",
+      "integrity": "sha512-b/36608DrTDgji9tWu126kg+pgS5lXctVwtgUK/t1pH/TsSAWcR7XUe6oDZ364umZm/1CMrVweMlOd+633q8nQ=="
+    },
     "axios": {
       "version": "0.21.0",
       "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.0.tgz",
diff --git a/package.json b/package.json
index 178b0aed..29d80c19 100644
--- a/package.json
+++ b/package.json
@@ -65,6 +65,7 @@
     }
   ],
   "dependencies": {
+    "@homebridge/plugin-ui-utils": "^0.0.17",
     "axios": "^0.21.0",
     "color-convert": "^2.0.1",
     "interval-promise": "^1.4.0",

From f6e97ab98077faa71bc67a6dabd82f723b775b21 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 23 Nov 2020 13:54:06 +0000
Subject: [PATCH 0823/3183] 3.14.1-0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 76db033a..9f004f8e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.14.0",
+  "version": "3.14.1-0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 29d80c19..6f79bac2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.14.0",
+  "version": "3.14.1-0",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 024dc9e527bced33422c19ea8ba2c05a0dbabac0 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Mon, 23 Nov 2020 14:03:04 +0000
Subject: [PATCH 0824/3183] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 653b250d..a4cb08b3 100644
--- a/README.md
+++ b/README.md
@@ -29,13 +29,13 @@ Homebridge/HOOBS plugin to control eWeLink devices with original firmware.
 * [Installation (Homebridge)](https://github.com/bwp91/homebridge-ewelink/wiki/Installation-(Homebridge))
 * [Installation (HOOBS)](https://github.com/bwp91/homebridge-ewelink/wiki/Installation-(HOOBS))
 * [Configuration](https://github.com/bwp91/homebridge-ewelink/wiki/Configuration)
-* [Beta Version](https://github.com/bwp91/homebridge-ewelink/wiki/Beta-Version)
 
 ### Features
 * [Supported Devices](https://github.com/bwp91/homebridge-ewelink/wiki/Supported-Devices)
 * [Multi Channel Devices](https://github.com/bwp91/homebridge-ewelink/wiki/Multi-Channel-Devices)
 * [Accessory Simulations](https://github.com/bwp91/homebridge-ewelink/wiki/Accessory-Simulations)
 * [Connection Methods](https://github.com/bwp91/homebridge-ewelink/wiki/Connection-Methods)
+* [Beta Version](https://github.com/bwp91/homebridge-ewelink/wiki/Beta-Version)
 
 ### How-to Guides
 * [How to set up RF Bridge sensors](https://github.com/bwp91/homebridge-ewelink/wiki/How-to-set-up-RF-Bridge-sensors)

From 1bfa8fc3c64a25843e18b8af736593aa092f79f3 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 23 Nov 2020 14:04:13 +0000
Subject: [PATCH 0825/3183] Update index.html

---
 homebridge-ui/public/index.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/homebridge-ui/public/index.html b/homebridge-ui/public/index.html
index 7f0941d7..a282b3ba 100644
--- a/homebridge-ui/public/index.html
+++ b/homebridge-ui/public/index.html
@@ -16,6 +16,7 @@ <h4>Features</h4>
     <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/Multi-Channel-Devices" target="_blank">Multi Channel Devices</a></li>
     <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/Accessory-Simulations" target="_blank">Accessory Simulations</a></li>
     <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/Connection-Methods" target="_blank">Connection Methods</a></li>
+    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/Beta-Version" target="_blank">Beta Version</a></li>
     </ul>
     <h4>How-to Guides</h4>
     <ul>

From 972bd62d8c072e31f45261f6c253c078a831a4d7 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 23 Nov 2020 15:58:53 +0000
Subject: [PATCH 0826/3183] custom-ui updates

---
 homebridge-ui/public/index.html | 156 ++++++++++++++++++++------------
 homebridge-ui/server.js         |  40 ++++----
 lib/ewelink-platform.js         |  16 +++-
 3 files changed, 133 insertions(+), 79 deletions(-)

diff --git a/homebridge-ui/public/index.html b/homebridge-ui/public/index.html
index a282b3ba..dc9a1e06 100644
--- a/homebridge-ui/public/index.html
+++ b/homebridge-ui/public/index.html
@@ -1,44 +1,19 @@
 <p align="center">
   <img width="60%" src="https://user-images.githubusercontent.com/43026681/98988978-5e86b600-2520-11eb-875b-0703f4575e97.png">
 </p>
-<div class="btn-group w-100 mb-3" role="group" aria-label="Basic example">
+<div id="pageIntro" style="display:none;">
+  <center>
+    <p class="lead">Thank you for installing homebridge-ewelink.</p>
+    <p>You will need to enter your eWeLink username, password and country code on the next page to setup this plugin.</p>
+    <button type="button" class="btn btn-primary" id="introContinue">Continue &rarr;</button>
+  </center>
+</div>
+<div id="menuWrapper" class="btn-group w-100 mb-3" role="group" aria-label="UI Menu" style="display:none;">
   <button type="button" class="btn btn-primary ml-0" id="menuSettings">Settings</button>
   <button type="button" class="btn btn-primary" id="menuDevices">My Devices</button>
   <button type="button" class="btn btn-primary mr-0" id="menuHome">Support</button>
 </div>
-<div id="pageAbout" style="display: none;">
-  <div class="card card-body">
-    <p align="center">Thank you for using homebridge-ewelink. We hope you find it useful!</p>
-    <p align="center">The links below will take you to our GitHub wiki.</p>
-    <h4>Features</h4>
-    <ul>
-    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/Supported-Devices" target="_blank">Supported Devices</a></li>
-    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/Multi-Channel-Devices" target="_blank">Multi Channel Devices</a></li>
-    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/Accessory-Simulations" target="_blank">Accessory Simulations</a></li>
-    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/Connection-Methods" target="_blank">Connection Methods</a></li>
-    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/Beta-Version" target="_blank">Beta Version</a></li>
-    </ul>
-    <h4>How-to Guides</h4>
-    <ul>
-    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/How-to-set-up-RF-Bridge-sensors" target="_blank">How to set up RF Bridge sensors</a></li>
-    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/How-to-set-up-Sonoff-Camera" target="_blank">How to set up Sonoff Camera (GK-200MP2-B)</a></li>
-    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/How-to-copy-Homebridge-logs" target="_blank">How to copy Homebridge logs</a></li>
-    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/How-to-enable-disable-plugin-extended-logging" target="_blank">How to enable/disable plugin extended logging</a></li>
-    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/How-to-remove-an-accessory-from-the-cache" target="_blank">How to remove an accessory from the cache</a></li>
-    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/How-to-update-node" target="_blank">How to update node</a></li>
-    </ul>
-    <h4>About</h4>
-    <ul>
-    <li><a href="https://github.com/sponsors/bwp91" target="_blank">About Me</a></li>
-    <li><a href="https://github.com/bwp91/homebridge-ewelink/releases" target="_blank">Changelog</a></li>
-    <li><a href="https://github.com/bwp91/homebridge-ewelink/issues/new/choose" target="_blank">Support Request</a></li>
-    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/Credits" target="_blank">Credits</a></li>
-    </ul>
-    <h4>Disclaimer</h4>
-    <p>I am in no way affiliated with eWeLink nor any of the device brands (like Sonoff) and this plugin is a personal project that I maintain in my free time.</p>
-  </div>
-</div>
-<div id="pageDevices" style="display: none;">
+<div id="pageDevices" style="display:none;">
   <div class="card card-body" id="deviceInfo">
     <form>
       <div class="form-group">
@@ -69,29 +44,66 @@ <h4>Disclaimer</h4>
           <th scope="row">eWeLink ID</th>
           <td id="eweDeviceId"></td>
         </tr>
+        <tr>
+          <th scope="row">Brand</th>
+          <td id="eweBrandName"></td>
+        </tr>
         <tr>
           <th scope="row">Model</th>
           <td id="eweModel"></td>
         </tr>
+        <tr>
+          <th scope="row">Shared Device</th>
+          <td id="eweShared"></td>
+        </tr>
       </tbody>
     </table>
   </div>
 </div>
+<div id="pageSupport" style="display:none;">
+  <div class="card card-body">
+    <p align="center">Thank you for using homebridge-ewelink. We hope you find it useful!</p>
+    <p align="center">The links below will take you to our GitHub wiki.</p>
+    <h4>Features</h4>
+    <ul>
+    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/Supported-Devices" target="_blank">Supported Devices</a></li>
+    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/Multi-Channel-Devices" target="_blank">Multi Channel Devices</a></li>
+    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/Accessory-Simulations" target="_blank">Accessory Simulations</a></li>
+    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/Connection-Methods" target="_blank">Connection Methods</a></li>
+    </ul>
+    <h4>How-to Guides</h4>
+    <ul>
+    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/How-to-set-up-RF-Bridge-sensors" target="_blank">How to set up RF Bridge sensors</a></li>
+    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/How-to-set-up-Sonoff-Camera" target="_blank">How to set up Sonoff Camera (GK-200MP2-B)</a></li>
+    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/How-to-copy-Homebridge-logs" target="_blank">How to copy Homebridge logs</a></li>
+    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/How-to-enable-disable-plugin-extended-logging" target="_blank">How to enable/disable plugin extended logging</a></li>
+    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/How-to-remove-an-accessory-from-the-cache" target="_blank">How to remove an accessory from the cache</a></li>
+    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/How-to-update-node" target="_blank">How to update node</a></li>
+    </ul>
+    <h4>About</h4>
+    <ul>
+    <li><a href="https://github.com/sponsors/bwp91" target="_blank">About Me</a></li>
+    <li><a href="https://github.com/bwp91/homebridge-ewelink/releases" target="_blank">Changelog</a></li>
+    <li><a href="https://github.com/bwp91/homebridge-ewelink/issues/new/choose" target="_blank">Support Request</a></li>
+    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/Credits" target="_blank">Credits</a></li>
+    </ul>
+    <h4>Disclaimer</h4>
+    <p>I am in no way affiliated with eWeLink nor any of the device brands (like Sonoff) and this plugin is a personal project that I maintain in my free time.</p>
+  </div>
+</div>
 <script>
   (async () => {
     try {
-      showHome = () => {
-        homebridge.showSpinner()
-        homebridge.hideSchemaForm()
-        document.getElementById('menuHome').classList.add('btn-primary-outline')
-        document.getElementById('menuHome').classList.remove('btn-primary')
-        document.getElementById('menuDevices').classList.remove('btn-primary-outline')
-        document.getElementById('menuDevices').classList.add('btn-primary')
-        document.getElementById('menuSettings').classList.remove('btn-primary-outline')
-        document.getElementById('menuSettings').classList.add('btn-primary')
-        document.getElementById('pageAbout').style.display = 'block'
-        document.getElementById('pageDevices').style.display = 'none'
-        homebridge.hideSpinner()
+      showIntro = () => {
+        const introContinue = document.getElementById('introContinue')
+        introContinue.addEventListener('click', () => {
+          homebridge.showSpinner()
+          document.getElementById('pageIntro').style.display = 'none'
+          document.getElementById('menuWrapper').style.display = 'inline-flex'
+          showSettings()
+          homebridge.hideSpinner()
+        })
+        document.getElementById('pageIntro').style.display = 'block'
       }
       showDevices = async () => {
         homebridge.showSpinner()
@@ -102,7 +114,7 @@ <h4>Disclaimer</h4>
         document.getElementById('menuDevices').classList.remove('btn-primary')
         document.getElementById('menuSettings').classList.remove('btn-primary-outline')
         document.getElementById('menuSettings').classList.add('btn-primary')
-        document.getElementById('pageAbout').style.display = 'none'
+        document.getElementById('pageSupport').style.display = 'none'
         document.getElementById('pageDevices').style.display = 'block'
         const cachedAccessories = await homebridge.request('/getCachedAccessories')
         const deviceSelect = document.getElementById('deviceSelect')
@@ -116,20 +128,22 @@ <h4>Disclaimer</h4>
         showDeviceInfo = async hbDeviceId => {
           homebridge.showSpinner()
           const selectedAccessory = cachedAccessories.find(x => x.context.hbDeviceId === hbDeviceId)
+          
+          console.log(selectedAccessory)
           document.getElementById('displayName').innerHTML = selectedAccessory.displayName
-          if (selectedAccessory.context.reachableWAN) {
-            document.getElementById('reachableWAN').innerHTML = 'Online'
-          } else {
-            document.getElementById('reachableWAN').innerHTML = 'Offline'
-          }
-          if (selectedAccessory.context.reachableLAN) {
-            document.getElementById('reachableLAN').innerHTML = 'Online'
-          } else {
-            document.getElementById('reachableLAN').innerHTML = 'Offline'
-          }
+          document.getElementById('reachableWAN').innerHTML = selectedAccessory.context.reachableWAN
+            ? 'Online'
+            : 'Offline'
+          document.getElementById('reachableLAN').innerHTML = selectedAccessory.context.reachableLAN
+            ? 'Online'
+            : document.getElementById('reachableLAN').innerHTML = 'Offline'
           document.getElementById('hbDeviceId').innerHTML = selectedAccessory.context.hbDeviceId
           document.getElementById('eweDeviceId').innerHTML = selectedAccessory.context.eweDeviceId
+          document.getElementById('eweBrandName').innerHTML = selectedAccessory.context.eweBrandName
           document.getElementById('eweModel').innerHTML = selectedAccessory.context.eweModel
+          document.getElementById('eweShared').innerHTML = selectedAccessory.context.eweShared
+            ? 'Yes (' + selectedAccessory.context.eweShared + ')'
+            : 'No'
           document.getElementById('deviceTable').style.display = 'inline-table'
           homebridge.hideSpinner()
         }
@@ -144,6 +158,19 @@ <h4>Disclaimer</h4>
         }
         homebridge.hideSpinner()
       }
+      showSupport = () => {
+        homebridge.showSpinner()
+        homebridge.hideSchemaForm()
+        document.getElementById('menuHome').classList.add('btn-primary-outline')
+        document.getElementById('menuHome').classList.remove('btn-primary')
+        document.getElementById('menuDevices').classList.remove('btn-primary-outline')
+        document.getElementById('menuDevices').classList.add('btn-primary')
+        document.getElementById('menuSettings').classList.remove('btn-primary-outline')
+        document.getElementById('menuSettings').classList.add('btn-primary')
+        document.getElementById('pageSupport').style.display = 'block'
+        document.getElementById('pageDevices').style.display = 'none'
+        homebridge.hideSpinner()
+      }
       showSettings = () => {
         homebridge.showSpinner()
         document.getElementById('menuHome').classList.remove('btn-primary-outline')
@@ -152,15 +179,24 @@ <h4>Disclaimer</h4>
         document.getElementById('menuDevices').classList.add('btn-primary')
         document.getElementById('menuSettings').classList.add('btn-primary-outline')
         document.getElementById('menuSettings').classList.remove('btn-primary')
-        document.getElementById('pageAbout').style.display = 'none'
+        document.getElementById('pageSupport').style.display = 'none'
         document.getElementById('pageDevices').style.display = 'none'
         homebridge.showSchemaForm()
         homebridge.hideSpinner()
       }
-      menuHome.addEventListener('click', () => showHome())
+      menuHome.addEventListener('click', () => showSupport())
       menuDevices.addEventListener('click', () => showDevices())
       menuSettings.addEventListener('click', () => showSettings())
-      showSettings()
+      const currentConfig = await homebridge.getPluginConfig()
+      if (currentConfig.length) {
+        document.getElementById('menuWrapper').style.display = 'inline-flex'
+        showSettings()
+      } else {
+        currentConfig.push({ name: 'eWeLink' })
+        await homebridge.updatePluginConfig(currentConfig)
+        showIntro()
+      }
+      
     } catch (err) {
       homebridge.toast.error(err.message, 'Error')
     } finally {
diff --git a/homebridge-ui/server.js b/homebridge-ui/server.js
index a66cb2c8..69fb128a 100644
--- a/homebridge-ui/server.js
+++ b/homebridge-ui/server.js
@@ -5,25 +5,29 @@ class PluginUiServer extends HomebridgePluginUiServer {
   constructor () {
     super()
     this.onRequest('/getCachedAccessories', async () => {
-      const devicesToReturn = []
-      let cachedAccessories = await fs.promises.readFile(this.homebridgeStoragePath + '/accessories/cachedAccessories')
-      cachedAccessories = JSON.parse(cachedAccessories)
-      cachedAccessories
-        .filter(accessory => accessory.plugin === 'homebridge-ewelink')
-        .sort((a, b) => {
-          return a.displayName.toLowerCase() > b.displayName.toLowerCase()
-            ? 1
-            : b.displayName.toLowerCase() > a.displayName.toLowerCase()
-              ? -1
-              : 0
-        })
-        .forEach(accessory => {
-          devicesToReturn.push({
-            displayName: accessory.displayName,
-            context: accessory.context
+      try {
+        const devicesToReturn = []
+        let cachedAccessories = await fs.promises.readFile(this.homebridgeStoragePath + '/accessories/cachedAccessories')
+        cachedAccessories = JSON.parse(cachedAccessories)
+        cachedAccessories
+          .filter(accessory => accessory.plugin === 'homebridge-ewelink')
+          .sort((a, b) => {
+            return a.displayName.toLowerCase() > b.displayName.toLowerCase()
+              ? 1
+              : b.displayName.toLowerCase() > a.displayName.toLowerCase()
+                ? -1
+                : 0
           })
-        })
-      return devicesToReturn
+          .forEach(accessory => {
+            devicesToReturn.push({
+              displayName: accessory.displayName,
+              context: accessory.context
+            })
+          })
+        return devicesToReturn
+      } catch {
+        return []
+      }
     })
     this.ready()
   }
diff --git a/lib/ewelink-platform.js b/lib/ewelink-platform.js
index f3fa4a83..01014ff2 100644
--- a/lib/ewelink-platform.js
+++ b/lib/ewelink-platform.js
@@ -421,6 +421,10 @@ module.exports = class eWeLinkPlatform {
           oAccessory.context.reachableLAN = this.lanDevices.has(device.deviceid)
             ? this.lanDevices.get(device.deviceid).online
             : false
+          oAccessory.context.eweBrandName = device.brandName
+          oAccessory.context.eweShared = helpers.hasProperty(device, 'sharedBy') && helpers.hasProperty(device.sharedBy, 'email')
+            ? device.sharedBy.email
+            : false
           oAccessory.control = new deviceSwitchMulti(this, oAccessory)
           this.api.updatePlatformAccessories('homebridge-ewelink', 'eWeLink', [oAccessory])
           this.devicesInHB.set(oAccessory.context.hbDeviceId, oAccessory)
@@ -490,6 +494,10 @@ module.exports = class eWeLinkPlatform {
             .setCharacteristic(this.Characteristic.FirmwareRevision, device.params.fwVersion)
           oAccessory.context.reachableWAN = device.online
           oAccessory.context.reachableLAN = false
+          oAccessory.context.eweBrandName = device.brandName
+          oAccessory.context.eweShared = helpers.hasProperty(device, 'sharedBy') && helpers.hasProperty(device.sharedBy, 'email')
+            ? device.sharedBy.email
+            : false
           this.api.updatePlatformAccessories('homebridge-ewelink', 'eWeLink', [oAccessory])
           this.devicesInHB.set(oAccessory.context.hbDeviceId, oAccessory)
           oAccessory.control = new deviceRFBridge(this, oAccessory)
@@ -545,6 +553,11 @@ module.exports = class eWeLinkPlatform {
         ? this.lanDevices.get(device.deviceid).online
         : false
       accessory.context.inUse = false
+      accessory.context.eweBrandName = device.brandName
+      accessory.context.eweShared = helpers.hasProperty(device, 'sharedBy') && helpers.hasProperty(device.sharedBy, 'email')
+        ? device.sharedBy.email
+        : false
+      this.log(JSON.stringify(device, null, 2))
 
       // *** Helpful logging for each device *** \\
       let str = accessory.context.reachableLAN
@@ -553,8 +566,9 @@ module.exports = class eWeLinkPlatform {
       if (!accessory.context.reachableLAN) {
         if (helpers.devicesNonLAN.includes(device.extra.uiid)) {
           str += "doesn't support it"
-        } else if (helpers.hasProperty(device, 'sharedBy') && helpers.hasProperty(device.sharedBy, 'email')) {
+        } else if (accessory.context.sharedDevice) {
           str += 'is shared (' + device.sharedBy.email + ')'
+          accessory
         } else {
           str += 'is unreachable'
         }

From 323b8f715dd4938444218782b66df2d404b7607e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 23 Nov 2020 16:00:00 +0000
Subject: [PATCH 0827/3183] Update ewelink-platform.js

---
 lib/ewelink-platform.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/ewelink-platform.js b/lib/ewelink-platform.js
index 01014ff2..4330318a 100644
--- a/lib/ewelink-platform.js
+++ b/lib/ewelink-platform.js
@@ -568,7 +568,6 @@ module.exports = class eWeLinkPlatform {
           str += "doesn't support it"
         } else if (accessory.context.sharedDevice) {
           str += 'is shared (' + device.sharedBy.email + ')'
-          accessory
         } else {
           str += 'is unreachable'
         }

From de139664b18a1a28531d146adc3303983eb58de6 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 23 Nov 2020 16:00:39 +0000
Subject: [PATCH 0828/3183] 3.14.1-1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 9f004f8e..fe448c57 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.14.1-0",
+  "version": "3.14.1-1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 6f79bac2..38abb9ef 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.14.1-0",
+  "version": "3.14.1-1",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 542dac41ab1ba44fb0ecf546e0f542d6ba6f8d46 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 23 Nov 2020 16:18:25 +0000
Subject: [PATCH 0829/3183] disable external for now

---
 lib/device/garage-four.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/device/garage-four.js b/lib/device/garage-four.js
index 40247d9e..7495f4cc 100644
--- a/lib/device/garage-four.js
+++ b/lib/device/garage-four.js
@@ -95,6 +95,7 @@ module.exports = class deviceGarageFour {
 
   async externalUpdate (params) {
     try {
+      /*
       if (!helpers.hasProperty(params, 'switches') || this.accessory.context.inUse) return
       let garageConfig
       if (!(garageConfig = this.platform.cusG.get(this.accessory.context.hbDeviceId))) {
@@ -141,6 +142,7 @@ module.exports = class deviceGarageFour {
         this.accessory.context.cacheStates[garageChannel].cacheTargetDoorState = newPos
         this.accessory.context.cacheStates[garageChannel].cacheCurrentDoorState = newPos
       })
+      */
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }

From 04fb0bd54f2dd20482681b491d65111563516f0c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 23 Nov 2020 16:19:03 +0000
Subject: [PATCH 0830/3183] 3.14.1-2

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index fe448c57..274f3dab 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.14.1-1",
+  "version": "3.14.1-2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 38abb9ef..f50c6e5f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.14.1-1",
+  "version": "3.14.1-2",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From f1d4eca7ea0c0b20207ce88638e07d9a3e6a5f54 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 23 Nov 2020 18:40:39 +0000
Subject: [PATCH 0831/3183] leftover logging

---
 lib/ewelink-platform.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/ewelink-platform.js b/lib/ewelink-platform.js
index 4330318a..f4d7c137 100644
--- a/lib/ewelink-platform.js
+++ b/lib/ewelink-platform.js
@@ -557,7 +557,6 @@ module.exports = class eWeLinkPlatform {
       accessory.context.eweShared = helpers.hasProperty(device, 'sharedBy') && helpers.hasProperty(device.sharedBy, 'email')
         ? device.sharedBy.email
         : false
-      this.log(JSON.stringify(device, null, 2))
 
       // *** Helpful logging for each device *** \\
       let str = accessory.context.reachableLAN

From aad622d80566363db2163a72dbc3313b32034429 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 23 Nov 2020 19:35:07 +0000
Subject: [PATCH 0832/3183] fixes + add uiid

---
 homebridge-ui/public/index.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/homebridge-ui/public/index.html b/homebridge-ui/public/index.html
index dc9a1e06..a71fc5bb 100644
--- a/homebridge-ui/public/index.html
+++ b/homebridge-ui/public/index.html
@@ -49,7 +49,7 @@
           <td id="eweBrandName"></td>
         </tr>
         <tr>
-          <th scope="row">Model</th>
+          <th scope="row">Model (UIID)</th>
           <td id="eweModel"></td>
         </tr>
         <tr>
@@ -94,6 +94,7 @@ <h4>Disclaimer</h4>
 <script>
   (async () => {
     try {
+      const currentConfig = await homebridge.getPluginConfig()
       showIntro = () => {
         const introContinue = document.getElementById('introContinue')
         introContinue.addEventListener('click', () => {
@@ -136,11 +137,11 @@ <h4>Disclaimer</h4>
             : 'Offline'
           document.getElementById('reachableLAN').innerHTML = selectedAccessory.context.reachableLAN
             ? 'Online'
-            : document.getElementById('reachableLAN').innerHTML = 'Offline'
+            : 'Offline'
           document.getElementById('hbDeviceId').innerHTML = selectedAccessory.context.hbDeviceId
           document.getElementById('eweDeviceId').innerHTML = selectedAccessory.context.eweDeviceId
           document.getElementById('eweBrandName').innerHTML = selectedAccessory.context.eweBrandName
-          document.getElementById('eweModel').innerHTML = selectedAccessory.context.eweModel
+          document.getElementById('eweModel').innerHTML = selectedAccessory.context.eweModel + ' (' + selectedAccessory.context.eweUIID + ')'
           document.getElementById('eweShared').innerHTML = selectedAccessory.context.eweShared
             ? 'Yes (' + selectedAccessory.context.eweShared + ')'
             : 'No'
@@ -187,7 +188,6 @@ <h4>Disclaimer</h4>
       menuHome.addEventListener('click', () => showSupport())
       menuDevices.addEventListener('click', () => showDevices())
       menuSettings.addEventListener('click', () => showSettings())
-      const currentConfig = await homebridge.getPluginConfig()
       if (currentConfig.length) {
         document.getElementById('menuWrapper').style.display = 'inline-flex'
         showSettings()

From 8abaab235f2e6371d02db66d1e678ad1b63cefc7 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 23 Nov 2020 19:36:15 +0000
Subject: [PATCH 0833/3183] 3.14.1-3

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 274f3dab..df56fbe8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.14.1-2",
+  "version": "3.14.1-3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index f50c6e5f..da145c2b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.14.1-2",
+  "version": "3.14.1-3",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From da57069bb7df83c013b85064393aaac3498f8225 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 23 Nov 2020 22:02:16 +0000
Subject: [PATCH 0834/3183] move homebridge-ui to lib

---
 config.schema.json                                     | 1 +
 {homebridge-ui => lib/homebridge-ui}/public/index.html | 0
 {homebridge-ui => lib/homebridge-ui}/server.js         | 0
 3 files changed, 1 insertion(+)
 rename {homebridge-ui => lib/homebridge-ui}/public/index.html (100%)
 rename {homebridge-ui => lib/homebridge-ui}/server.js (100%)

diff --git a/config.schema.json b/config.schema.json
index c0f116c8..5b222ddb 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -3,6 +3,7 @@
   "pluginType": "platform",
   "singular": true,
   "customUi": true,
+  "customUiPath": "./lib/homebridge-ui",
   "headerDisplay": "<p align=\"center\"><img width=\"75%\" src=\"https://user-images.githubusercontent.com/43026681/98988978-5e86b600-2520-11eb-875b-0703f4575e97.png\"></p><p align=\"center\">For help and support please visit our <a href=\"https://github.com/bwp91/homebridge-ewelink/wiki\">GitHub Wiki</a>. We hope you find this plugin useful!</p>",
   "schema": {
     "type": "object",
diff --git a/homebridge-ui/public/index.html b/lib/homebridge-ui/public/index.html
similarity index 100%
rename from homebridge-ui/public/index.html
rename to lib/homebridge-ui/public/index.html
diff --git a/homebridge-ui/server.js b/lib/homebridge-ui/server.js
similarity index 100%
rename from homebridge-ui/server.js
rename to lib/homebridge-ui/server.js

From cdcd7eb56cb1509eb70e15d72102795fa8de9539 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 24 Nov 2020 07:45:34 +0000
Subject: [PATCH 0835/3183] ui updates

---
 config.schema.json                  |   2 +-
 homebridge-ui/public/index.html     | 206 ++++++++++++++++++++++++++++
 homebridge-ui/server.js             |  38 +++++
 lib/homebridge-ui/public/index.html |  20 +--
 4 files changed, 255 insertions(+), 11 deletions(-)
 create mode 100644 homebridge-ui/public/index.html
 create mode 100644 homebridge-ui/server.js

diff --git a/config.schema.json b/config.schema.json
index 5b222ddb..34a035ad 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -4,7 +4,7 @@
   "singular": true,
   "customUi": true,
   "customUiPath": "./lib/homebridge-ui",
-  "headerDisplay": "<p align=\"center\"><img width=\"75%\" src=\"https://user-images.githubusercontent.com/43026681/98988978-5e86b600-2520-11eb-875b-0703f4575e97.png\"></p><p align=\"center\">For help and support please visit our <a href=\"https://github.com/bwp91/homebridge-ewelink/wiki\">GitHub Wiki</a>. We hope you find this plugin useful!</p>",
+  "headerDisplay": "<p align=\"center\"><img width=\"60%\" src=\"https://user-images.githubusercontent.com/43026681/100062842-2e94b800-2e28-11eb-83d4-f8490b6bb804.png\"></p><p align=\"center\">For help and support please visit our <a href=\"https://github.com/bwp91/homebridge-ewelink/wiki\">GitHub Wiki</a>. We hope you find this plugin useful!</p>",
   "schema": {
     "type": "object",
     "properties": {
diff --git a/homebridge-ui/public/index.html b/homebridge-ui/public/index.html
new file mode 100644
index 00000000..ecea5a4d
--- /dev/null
+++ b/homebridge-ui/public/index.html
@@ -0,0 +1,206 @@
+<p align="center">
+  <img width="75%" src="https://user-images.githubusercontent.com/43026681/100062842-2e94b800-2e28-11eb-83d4-f8490b6bb804.png">
+</p>
+<div id="pageIntro" style="display:none;">
+  <center>
+    <p class="lead">Thank you for installing homebridge-ewelink.</p>
+    <p>You will need to enter your eWeLink username, password and country code on the next page to setup this plugin.</p>
+    <button type="button" class="btn btn-primary" id="introContinue">Continue &rarr;</button>
+  </center>
+</div>
+<div id="menuWrapper" class="btn-group w-100 mb-3" role="group" aria-label="UI Menu" style="display:none;">
+  <button type="button" class="btn btn-primary ml-0" id="menuSettings">Settings</button>
+  <button type="button" class="btn btn-primary" id="menuDevices">My Devices</button>
+  <button type="button" class="btn btn-primary mr-0" id="menuHome">Support</button>
+</div>
+<div id="pageDevices" style="display:none;">
+  <div class="card card-body" id="deviceInfo">
+    <form>
+      <div class="form-group">
+        <select class="form-control" id="deviceSelect"></select>
+      </div>
+    </form>
+    <table class="table w-100" id="deviceTable">
+      <thead>
+        <tr class="table-active">
+          <th scope="col" style="width: 40%;">Device Name</th>
+          <th scope="col" style="width: 60%;" id="displayName"></th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr>
+          <th scope="row">Cloud Status</th>
+          <td id="reachableWAN"></td>
+        </tr>
+        <tr>
+          <th scope="row">LAN Status</th>
+          <td id="reachableLAN"></td>
+        </tr>
+        <tr>
+          <th scope="row">Homebridge ID</th>
+          <td id="hbDeviceId"></td>
+        </tr>
+        <tr>
+          <th scope="row">eWeLink ID</th>
+          <td id="eweDeviceId"></td>
+        </tr>
+        <tr>
+          <th scope="row">Brand</th>
+          <td id="eweBrandName"></td>
+        </tr>
+        <tr>
+          <th scope="row">Model (UIID)</th>
+          <td id="eweModel"></td>
+        </tr>
+        <tr>
+          <th scope="row">Shared Device</th>
+          <td id="eweShared"></td>
+        </tr>
+      </tbody>
+    </table>
+  </div>
+</div>
+<div id="pageSupport" style="display:none;">
+  <div class="card card-body">
+    <p align="center">Thank you for using homebridge-ewelink. We hope you find it useful!</p>
+    <p align="center">The links below will take you to our GitHub wiki.</p>
+    <h4>Features</h4>
+    <ul>
+    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/Supported-Devices" target="_blank">Supported Devices</a></li>
+    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/Multi-Channel-Devices" target="_blank">Multi Channel Devices</a></li>
+    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/Accessory-Simulations" target="_blank">Accessory Simulations</a></li>
+    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/Connection-Methods" target="_blank">Connection Methods</a></li>
+    </ul>
+    <h4>How-to Guides</h4>
+    <ul>
+    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/How-to-set-up-RF-Bridge-sensors" target="_blank">How to set up RF Bridge sensors</a></li>
+    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/How-to-set-up-Sonoff-Camera" target="_blank">How to set up Sonoff Camera (GK-200MP2-B)</a></li>
+    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/How-to-copy-Homebridge-logs" target="_blank">How to copy Homebridge logs</a></li>
+    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/How-to-enable-disable-plugin-extended-logging" target="_blank">How to enable/disable plugin extended logging</a></li>
+    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/How-to-remove-an-accessory-from-the-cache" target="_blank">How to remove an accessory from the cache</a></li>
+    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/How-to-update-node" target="_blank">How to update node</a></li>
+    </ul>
+    <h4>About</h4>
+    <ul>
+    <li><a href="https://github.com/sponsors/bwp91" target="_blank">About Me</a></li>
+    <li><a href="https://github.com/bwp91/homebridge-ewelink/releases" target="_blank">Changelog</a></li>
+    <li><a href="https://github.com/bwp91/homebridge-ewelink/issues/new/choose" target="_blank">Support Request</a></li>
+    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/Credits" target="_blank">Credits</a></li>
+    </ul>
+    <h4>Disclaimer</h4>
+    <p>I am in no way affiliated with eWeLink nor any of the device brands (like Sonoff) and this plugin is a personal project that I maintain in my free time.</p>
+  </div>
+</div>
+<script>
+  (async () => {
+    try {
+      const currentConfig = await homebridge.getPluginConfig()
+      showIntro = () => {
+        const introContinue = document.getElementById('introContinue')
+        introContinue.addEventListener('click', () => {
+          homebridge.showSpinner()
+          document.getElementById('pageIntro').style.display = 'none'
+          document.getElementById('menuWrapper').style.display = 'inline-flex'
+          showSettings()
+          homebridge.hideSpinner()
+        })
+        document.getElementById('pageIntro').style.display = 'block'
+      }
+      showDevices = async () => {
+        homebridge.showSpinner()
+        homebridge.hideSchemaForm()
+        document.getElementById('menuHome').classList.remove('btn-elegant')
+        document.getElementById('menuHome').classList.add('btn-primary')
+        document.getElementById('menuDevices').classList.add('btn-elegant')
+        document.getElementById('menuDevices').classList.remove('btn-primary')
+        document.getElementById('menuSettings').classList.remove('btn-elegant')
+        document.getElementById('menuSettings').classList.add('btn-primary')
+        document.getElementById('pageSupport').style.display = 'none'
+        document.getElementById('pageDevices').style.display = 'block'
+        const cachedAccessories = await homebridge.request('/getCachedAccessories')
+        const deviceSelect = document.getElementById('deviceSelect')
+        deviceSelect.innerHTML = ''
+        cachedAccessories.forEach(a => {
+          const option = document.createElement('option')
+          option.text = a.displayName
+          option.value = a.context.hbDeviceId
+          deviceSelect.add(option)
+        })
+        showDeviceInfo = async hbDeviceId => {
+          homebridge.showSpinner()
+          const selectedAccessory = cachedAccessories.find(x => x.context.hbDeviceId === hbDeviceId)
+          
+          console.log(selectedAccessory)
+          document.getElementById('displayName').innerHTML = selectedAccessory.displayName
+          document.getElementById('reachableWAN').innerHTML = selectedAccessory.context.reachableWAN
+            ? 'Online'
+            : 'Offline'
+          document.getElementById('reachableLAN').innerHTML = selectedAccessory.context.reachableLAN
+            ? 'Online'
+            : 'Offline'
+          document.getElementById('hbDeviceId').innerHTML = selectedAccessory.context.hbDeviceId
+          document.getElementById('eweDeviceId').innerHTML = selectedAccessory.context.eweDeviceId
+          document.getElementById('eweBrandName').innerHTML = selectedAccessory.context.eweBrandName
+          document.getElementById('eweModel').innerHTML = selectedAccessory.context.eweModel + ' (' + selectedAccessory.context.eweUIID + ')'
+          document.getElementById('eweShared').innerHTML = selectedAccessory.context.eweShared
+            ? 'Yes (' + selectedAccessory.context.eweShared + ')'
+            : 'No'
+          document.getElementById('deviceTable').style.display = 'inline-table'
+          homebridge.hideSpinner()
+        }
+        deviceSelect.addEventListener('change', event => showDeviceInfo(event.target.value))
+        if (Object.keys(cachedAccessories).length > 0) {
+          showDeviceInfo(cachedAccessories[0].context.hbDeviceId)
+        } else {
+          const option = document.createElement('option')
+          option.text = 'No Devices'
+          deviceSelect.add(option)
+          deviceSelect.disabled = true
+        }
+        homebridge.hideSpinner()
+      }
+      showSupport = () => {
+        homebridge.showSpinner()
+        homebridge.hideSchemaForm()
+        document.getElementById('menuHome').classList.add('btn-elegant')
+        document.getElementById('menuHome').classList.remove('btn-primary')
+        document.getElementById('menuDevices').classList.remove('btn-elegant')
+        document.getElementById('menuDevices').classList.add('btn-primary')
+        document.getElementById('menuSettings').classList.remove('btn-elegant')
+        document.getElementById('menuSettings').classList.add('btn-primary')
+        document.getElementById('pageSupport').style.display = 'block'
+        document.getElementById('pageDevices').style.display = 'none'
+        homebridge.hideSpinner()
+      }
+      showSettings = () => {
+        homebridge.showSpinner()
+        document.getElementById('menuHome').classList.remove('btn-elegant')
+        document.getElementById('menuHome').classList.add('btn-primary')
+        document.getElementById('menuDevices').classList.remove('btn-elegant')
+        document.getElementById('menuDevices').classList.add('btn-primary')
+        document.getElementById('menuSettings').classList.add('btn-elegant')
+        document.getElementById('menuSettings').classList.remove('btn-primary')
+        document.getElementById('pageSupport').style.display = 'none'
+        document.getElementById('pageDevices').style.display = 'none'
+        homebridge.showSchemaForm()
+        homebridge.hideSpinner()
+      }
+      menuHome.addEventListener('click', () => showSupport())
+      menuDevices.addEventListener('click', () => showDevices())
+      menuSettings.addEventListener('click', () => showSettings())
+      if (currentConfig.length) {
+        document.getElementById('menuWrapper').style.display = 'inline-flex'
+        showSettings()
+      } else {
+        currentConfig.push({ name: 'eWeLink' })
+        await homebridge.updatePluginConfig(currentConfig)
+        showIntro()
+      }
+      
+    } catch (err) {
+      homebridge.toast.error(err.message, 'Error')
+    } finally {
+      homebridge.hideSpinner()
+    }
+  })()
+</script>
\ No newline at end of file
diff --git a/homebridge-ui/server.js b/homebridge-ui/server.js
new file mode 100644
index 00000000..69fb128a
--- /dev/null
+++ b/homebridge-ui/server.js
@@ -0,0 +1,38 @@
+const { HomebridgePluginUiServer } = require('@homebridge/plugin-ui-utils')
+const fs = require('fs')
+
+class PluginUiServer extends HomebridgePluginUiServer {
+  constructor () {
+    super()
+    this.onRequest('/getCachedAccessories', async () => {
+      try {
+        const devicesToReturn = []
+        let cachedAccessories = await fs.promises.readFile(this.homebridgeStoragePath + '/accessories/cachedAccessories')
+        cachedAccessories = JSON.parse(cachedAccessories)
+        cachedAccessories
+          .filter(accessory => accessory.plugin === 'homebridge-ewelink')
+          .sort((a, b) => {
+            return a.displayName.toLowerCase() > b.displayName.toLowerCase()
+              ? 1
+              : b.displayName.toLowerCase() > a.displayName.toLowerCase()
+                ? -1
+                : 0
+          })
+          .forEach(accessory => {
+            devicesToReturn.push({
+              displayName: accessory.displayName,
+              context: accessory.context
+            })
+          })
+        return devicesToReturn
+      } catch {
+        return []
+      }
+    })
+    this.ready()
+  }
+}
+
+(() => {
+  return new PluginUiServer()
+})()
diff --git a/lib/homebridge-ui/public/index.html b/lib/homebridge-ui/public/index.html
index a71fc5bb..1e9adbd2 100644
--- a/lib/homebridge-ui/public/index.html
+++ b/lib/homebridge-ui/public/index.html
@@ -1,5 +1,5 @@
 <p align="center">
-  <img width="60%" src="https://user-images.githubusercontent.com/43026681/98988978-5e86b600-2520-11eb-875b-0703f4575e97.png">
+  <img width="60%" src="https://user-images.githubusercontent.com/43026681/100062842-2e94b800-2e28-11eb-83d4-f8490b6bb804.png">
 </p>
 <div id="pageIntro" style="display:none;">
   <center>
@@ -109,11 +109,11 @@ <h4>Disclaimer</h4>
       showDevices = async () => {
         homebridge.showSpinner()
         homebridge.hideSchemaForm()
-        document.getElementById('menuHome').classList.remove('btn-primary-outline')
+        document.getElementById('menuHome').classList.remove('btn-elegant')
         document.getElementById('menuHome').classList.add('btn-primary')
-        document.getElementById('menuDevices').classList.add('btn-primary-outline')
+        document.getElementById('menuDevices').classList.add('btn-elegant')
         document.getElementById('menuDevices').classList.remove('btn-primary')
-        document.getElementById('menuSettings').classList.remove('btn-primary-outline')
+        document.getElementById('menuSettings').classList.remove('btn-elegant')
         document.getElementById('menuSettings').classList.add('btn-primary')
         document.getElementById('pageSupport').style.display = 'none'
         document.getElementById('pageDevices').style.display = 'block'
@@ -162,11 +162,11 @@ <h4>Disclaimer</h4>
       showSupport = () => {
         homebridge.showSpinner()
         homebridge.hideSchemaForm()
-        document.getElementById('menuHome').classList.add('btn-primary-outline')
+        document.getElementById('menuHome').classList.add('btn-elegant')
         document.getElementById('menuHome').classList.remove('btn-primary')
-        document.getElementById('menuDevices').classList.remove('btn-primary-outline')
+        document.getElementById('menuDevices').classList.remove('btn-elegant')
         document.getElementById('menuDevices').classList.add('btn-primary')
-        document.getElementById('menuSettings').classList.remove('btn-primary-outline')
+        document.getElementById('menuSettings').classList.remove('btn-elegant')
         document.getElementById('menuSettings').classList.add('btn-primary')
         document.getElementById('pageSupport').style.display = 'block'
         document.getElementById('pageDevices').style.display = 'none'
@@ -174,11 +174,11 @@ <h4>Disclaimer</h4>
       }
       showSettings = () => {
         homebridge.showSpinner()
-        document.getElementById('menuHome').classList.remove('btn-primary-outline')
+        document.getElementById('menuHome').classList.remove('btn-elegant')
         document.getElementById('menuHome').classList.add('btn-primary')
-        document.getElementById('menuDevices').classList.remove('btn-primary-outline')
+        document.getElementById('menuDevices').classList.remove('btn-elegant')
         document.getElementById('menuDevices').classList.add('btn-primary')
-        document.getElementById('menuSettings').classList.add('btn-primary-outline')
+        document.getElementById('menuSettings').classList.add('btn-elegant')
         document.getElementById('menuSettings').classList.remove('btn-primary')
         document.getElementById('pageSupport').style.display = 'none'
         document.getElementById('pageDevices').style.display = 'none'

From f1be08fb8dba0a22a6d87dea74374ae9dc04a665 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 24 Nov 2020 07:46:13 +0000
Subject: [PATCH 0836/3183] ui updates

---
 homebridge-ui/public/index.html | 206 --------------------------------
 homebridge-ui/server.js         |  38 ------
 2 files changed, 244 deletions(-)
 delete mode 100644 homebridge-ui/public/index.html
 delete mode 100644 homebridge-ui/server.js

diff --git a/homebridge-ui/public/index.html b/homebridge-ui/public/index.html
deleted file mode 100644
index ecea5a4d..00000000
--- a/homebridge-ui/public/index.html
+++ /dev/null
@@ -1,206 +0,0 @@
-<p align="center">
-  <img width="75%" src="https://user-images.githubusercontent.com/43026681/100062842-2e94b800-2e28-11eb-83d4-f8490b6bb804.png">
-</p>
-<div id="pageIntro" style="display:none;">
-  <center>
-    <p class="lead">Thank you for installing homebridge-ewelink.</p>
-    <p>You will need to enter your eWeLink username, password and country code on the next page to setup this plugin.</p>
-    <button type="button" class="btn btn-primary" id="introContinue">Continue &rarr;</button>
-  </center>
-</div>
-<div id="menuWrapper" class="btn-group w-100 mb-3" role="group" aria-label="UI Menu" style="display:none;">
-  <button type="button" class="btn btn-primary ml-0" id="menuSettings">Settings</button>
-  <button type="button" class="btn btn-primary" id="menuDevices">My Devices</button>
-  <button type="button" class="btn btn-primary mr-0" id="menuHome">Support</button>
-</div>
-<div id="pageDevices" style="display:none;">
-  <div class="card card-body" id="deviceInfo">
-    <form>
-      <div class="form-group">
-        <select class="form-control" id="deviceSelect"></select>
-      </div>
-    </form>
-    <table class="table w-100" id="deviceTable">
-      <thead>
-        <tr class="table-active">
-          <th scope="col" style="width: 40%;">Device Name</th>
-          <th scope="col" style="width: 60%;" id="displayName"></th>
-        </tr>
-      </thead>
-      <tbody>
-        <tr>
-          <th scope="row">Cloud Status</th>
-          <td id="reachableWAN"></td>
-        </tr>
-        <tr>
-          <th scope="row">LAN Status</th>
-          <td id="reachableLAN"></td>
-        </tr>
-        <tr>
-          <th scope="row">Homebridge ID</th>
-          <td id="hbDeviceId"></td>
-        </tr>
-        <tr>
-          <th scope="row">eWeLink ID</th>
-          <td id="eweDeviceId"></td>
-        </tr>
-        <tr>
-          <th scope="row">Brand</th>
-          <td id="eweBrandName"></td>
-        </tr>
-        <tr>
-          <th scope="row">Model (UIID)</th>
-          <td id="eweModel"></td>
-        </tr>
-        <tr>
-          <th scope="row">Shared Device</th>
-          <td id="eweShared"></td>
-        </tr>
-      </tbody>
-    </table>
-  </div>
-</div>
-<div id="pageSupport" style="display:none;">
-  <div class="card card-body">
-    <p align="center">Thank you for using homebridge-ewelink. We hope you find it useful!</p>
-    <p align="center">The links below will take you to our GitHub wiki.</p>
-    <h4>Features</h4>
-    <ul>
-    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/Supported-Devices" target="_blank">Supported Devices</a></li>
-    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/Multi-Channel-Devices" target="_blank">Multi Channel Devices</a></li>
-    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/Accessory-Simulations" target="_blank">Accessory Simulations</a></li>
-    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/Connection-Methods" target="_blank">Connection Methods</a></li>
-    </ul>
-    <h4>How-to Guides</h4>
-    <ul>
-    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/How-to-set-up-RF-Bridge-sensors" target="_blank">How to set up RF Bridge sensors</a></li>
-    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/How-to-set-up-Sonoff-Camera" target="_blank">How to set up Sonoff Camera (GK-200MP2-B)</a></li>
-    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/How-to-copy-Homebridge-logs" target="_blank">How to copy Homebridge logs</a></li>
-    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/How-to-enable-disable-plugin-extended-logging" target="_blank">How to enable/disable plugin extended logging</a></li>
-    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/How-to-remove-an-accessory-from-the-cache" target="_blank">How to remove an accessory from the cache</a></li>
-    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/How-to-update-node" target="_blank">How to update node</a></li>
-    </ul>
-    <h4>About</h4>
-    <ul>
-    <li><a href="https://github.com/sponsors/bwp91" target="_blank">About Me</a></li>
-    <li><a href="https://github.com/bwp91/homebridge-ewelink/releases" target="_blank">Changelog</a></li>
-    <li><a href="https://github.com/bwp91/homebridge-ewelink/issues/new/choose" target="_blank">Support Request</a></li>
-    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/Credits" target="_blank">Credits</a></li>
-    </ul>
-    <h4>Disclaimer</h4>
-    <p>I am in no way affiliated with eWeLink nor any of the device brands (like Sonoff) and this plugin is a personal project that I maintain in my free time.</p>
-  </div>
-</div>
-<script>
-  (async () => {
-    try {
-      const currentConfig = await homebridge.getPluginConfig()
-      showIntro = () => {
-        const introContinue = document.getElementById('introContinue')
-        introContinue.addEventListener('click', () => {
-          homebridge.showSpinner()
-          document.getElementById('pageIntro').style.display = 'none'
-          document.getElementById('menuWrapper').style.display = 'inline-flex'
-          showSettings()
-          homebridge.hideSpinner()
-        })
-        document.getElementById('pageIntro').style.display = 'block'
-      }
-      showDevices = async () => {
-        homebridge.showSpinner()
-        homebridge.hideSchemaForm()
-        document.getElementById('menuHome').classList.remove('btn-elegant')
-        document.getElementById('menuHome').classList.add('btn-primary')
-        document.getElementById('menuDevices').classList.add('btn-elegant')
-        document.getElementById('menuDevices').classList.remove('btn-primary')
-        document.getElementById('menuSettings').classList.remove('btn-elegant')
-        document.getElementById('menuSettings').classList.add('btn-primary')
-        document.getElementById('pageSupport').style.display = 'none'
-        document.getElementById('pageDevices').style.display = 'block'
-        const cachedAccessories = await homebridge.request('/getCachedAccessories')
-        const deviceSelect = document.getElementById('deviceSelect')
-        deviceSelect.innerHTML = ''
-        cachedAccessories.forEach(a => {
-          const option = document.createElement('option')
-          option.text = a.displayName
-          option.value = a.context.hbDeviceId
-          deviceSelect.add(option)
-        })
-        showDeviceInfo = async hbDeviceId => {
-          homebridge.showSpinner()
-          const selectedAccessory = cachedAccessories.find(x => x.context.hbDeviceId === hbDeviceId)
-          
-          console.log(selectedAccessory)
-          document.getElementById('displayName').innerHTML = selectedAccessory.displayName
-          document.getElementById('reachableWAN').innerHTML = selectedAccessory.context.reachableWAN
-            ? 'Online'
-            : 'Offline'
-          document.getElementById('reachableLAN').innerHTML = selectedAccessory.context.reachableLAN
-            ? 'Online'
-            : 'Offline'
-          document.getElementById('hbDeviceId').innerHTML = selectedAccessory.context.hbDeviceId
-          document.getElementById('eweDeviceId').innerHTML = selectedAccessory.context.eweDeviceId
-          document.getElementById('eweBrandName').innerHTML = selectedAccessory.context.eweBrandName
-          document.getElementById('eweModel').innerHTML = selectedAccessory.context.eweModel + ' (' + selectedAccessory.context.eweUIID + ')'
-          document.getElementById('eweShared').innerHTML = selectedAccessory.context.eweShared
-            ? 'Yes (' + selectedAccessory.context.eweShared + ')'
-            : 'No'
-          document.getElementById('deviceTable').style.display = 'inline-table'
-          homebridge.hideSpinner()
-        }
-        deviceSelect.addEventListener('change', event => showDeviceInfo(event.target.value))
-        if (Object.keys(cachedAccessories).length > 0) {
-          showDeviceInfo(cachedAccessories[0].context.hbDeviceId)
-        } else {
-          const option = document.createElement('option')
-          option.text = 'No Devices'
-          deviceSelect.add(option)
-          deviceSelect.disabled = true
-        }
-        homebridge.hideSpinner()
-      }
-      showSupport = () => {
-        homebridge.showSpinner()
-        homebridge.hideSchemaForm()
-        document.getElementById('menuHome').classList.add('btn-elegant')
-        document.getElementById('menuHome').classList.remove('btn-primary')
-        document.getElementById('menuDevices').classList.remove('btn-elegant')
-        document.getElementById('menuDevices').classList.add('btn-primary')
-        document.getElementById('menuSettings').classList.remove('btn-elegant')
-        document.getElementById('menuSettings').classList.add('btn-primary')
-        document.getElementById('pageSupport').style.display = 'block'
-        document.getElementById('pageDevices').style.display = 'none'
-        homebridge.hideSpinner()
-      }
-      showSettings = () => {
-        homebridge.showSpinner()
-        document.getElementById('menuHome').classList.remove('btn-elegant')
-        document.getElementById('menuHome').classList.add('btn-primary')
-        document.getElementById('menuDevices').classList.remove('btn-elegant')
-        document.getElementById('menuDevices').classList.add('btn-primary')
-        document.getElementById('menuSettings').classList.add('btn-elegant')
-        document.getElementById('menuSettings').classList.remove('btn-primary')
-        document.getElementById('pageSupport').style.display = 'none'
-        document.getElementById('pageDevices').style.display = 'none'
-        homebridge.showSchemaForm()
-        homebridge.hideSpinner()
-      }
-      menuHome.addEventListener('click', () => showSupport())
-      menuDevices.addEventListener('click', () => showDevices())
-      menuSettings.addEventListener('click', () => showSettings())
-      if (currentConfig.length) {
-        document.getElementById('menuWrapper').style.display = 'inline-flex'
-        showSettings()
-      } else {
-        currentConfig.push({ name: 'eWeLink' })
-        await homebridge.updatePluginConfig(currentConfig)
-        showIntro()
-      }
-      
-    } catch (err) {
-      homebridge.toast.error(err.message, 'Error')
-    } finally {
-      homebridge.hideSpinner()
-    }
-  })()
-</script>
\ No newline at end of file
diff --git a/homebridge-ui/server.js b/homebridge-ui/server.js
deleted file mode 100644
index 69fb128a..00000000
--- a/homebridge-ui/server.js
+++ /dev/null
@@ -1,38 +0,0 @@
-const { HomebridgePluginUiServer } = require('@homebridge/plugin-ui-utils')
-const fs = require('fs')
-
-class PluginUiServer extends HomebridgePluginUiServer {
-  constructor () {
-    super()
-    this.onRequest('/getCachedAccessories', async () => {
-      try {
-        const devicesToReturn = []
-        let cachedAccessories = await fs.promises.readFile(this.homebridgeStoragePath + '/accessories/cachedAccessories')
-        cachedAccessories = JSON.parse(cachedAccessories)
-        cachedAccessories
-          .filter(accessory => accessory.plugin === 'homebridge-ewelink')
-          .sort((a, b) => {
-            return a.displayName.toLowerCase() > b.displayName.toLowerCase()
-              ? 1
-              : b.displayName.toLowerCase() > a.displayName.toLowerCase()
-                ? -1
-                : 0
-          })
-          .forEach(accessory => {
-            devicesToReturn.push({
-              displayName: accessory.displayName,
-              context: accessory.context
-            })
-          })
-        return devicesToReturn
-      } catch {
-        return []
-      }
-    })
-    this.ready()
-  }
-}
-
-(() => {
-  return new PluginUiServer()
-})()

From cbbfff907eefaa7ce00e0fec2f4b83bd797d291b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 24 Nov 2020 07:48:47 +0000
Subject: [PATCH 0837/3183] 3.14.1-4

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index df56fbe8..3199adb0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.14.1-3",
+  "version": "3.14.1-4",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index da145c2b..e55f5a17 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.14.1-3",
+  "version": "3.14.1-4",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From a17857358ff1d9435eafdb84883e72d77824439c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 24 Nov 2020 08:02:53 +0000
Subject: [PATCH 0838/3183] text updates

---
 lib/homebridge-ui/public/index.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/homebridge-ui/public/index.html b/lib/homebridge-ui/public/index.html
index 1e9adbd2..b54dd236 100644
--- a/lib/homebridge-ui/public/index.html
+++ b/lib/homebridge-ui/public/index.html
@@ -3,8 +3,8 @@
 </p>
 <div id="pageIntro" style="display:none;">
   <center>
-    <p class="lead">Thank you for installing homebridge-ewelink.</p>
-    <p>You will need to enter your eWeLink username, password and country code on the next page to setup this plugin.</p>
+    <p class="lead">Thank you for installing <strong>homebridge-ewelink</strong></p>
+    <p>You will need to enter your eWeLink username, password and country code on the next page</p>
     <button type="button" class="btn btn-primary" id="introContinue">Continue &rarr;</button>
   </center>
 </div>
@@ -62,8 +62,8 @@
 </div>
 <div id="pageSupport" style="display:none;">
   <div class="card card-body">
-    <p align="center">Thank you for using homebridge-ewelink. We hope you find it useful!</p>
-    <p align="center">The links below will take you to our GitHub wiki.</p>
+    <p class="lead" align="center">Thank you for using <strong>homebridge-ewelink</strong>.</p>
+    <p align="center">We hope you find this plugin useful. The links below will take you to our GitHub wiki.</p>
     <h4>Features</h4>
     <ul>
     <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/Supported-Devices" target="_blank">Supported Devices</a></li>

From eab6e917f6b19ddd82517c4a5f7a85243c666c0c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 24 Nov 2020 08:03:58 +0000
Subject: [PATCH 0839/3183] more text updates

---
 lib/homebridge-ui/public/index.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/homebridge-ui/public/index.html b/lib/homebridge-ui/public/index.html
index b54dd236..3b12eb61 100644
--- a/lib/homebridge-ui/public/index.html
+++ b/lib/homebridge-ui/public/index.html
@@ -62,8 +62,8 @@
 </div>
 <div id="pageSupport" style="display:none;">
   <div class="card card-body">
-    <p class="lead" align="center">Thank you for using <strong>homebridge-ewelink</strong>.</p>
-    <p align="center">We hope you find this plugin useful. The links below will take you to our GitHub wiki.</p>
+    <p class="lead" align="center">Thank you for using <strong>homebridge-ewelink</strong></p>
+    <p align="center">The links below will take you to our GitHub wiki</p>
     <h4>Features</h4>
     <ul>
     <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/Supported-Devices" target="_blank">Supported Devices</a></li>

From 596e5752f5feefd70a2d3183570bbfc57fbf87b0 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 24 Nov 2020 08:04:28 +0000
Subject: [PATCH 0840/3183] 3.14.1-5

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 3199adb0..296272b6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.14.1-4",
+  "version": "3.14.1-5",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index e55f5a17..80bf45d2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.14.1-4",
+  "version": "3.14.1-5",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 94ee89518bad5fad4bda9cc4829f8405d001c9fb Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 24 Nov 2020 08:25:07 +0000
Subject: [PATCH 0841/3183] Update index.html

---
 lib/homebridge-ui/public/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/homebridge-ui/public/index.html b/lib/homebridge-ui/public/index.html
index 3b12eb61..e26dd825 100644
--- a/lib/homebridge-ui/public/index.html
+++ b/lib/homebridge-ui/public/index.html
@@ -143,7 +143,7 @@ <h4>Disclaimer</h4>
           document.getElementById('eweBrandName').innerHTML = selectedAccessory.context.eweBrandName
           document.getElementById('eweModel').innerHTML = selectedAccessory.context.eweModel + ' (' + selectedAccessory.context.eweUIID + ')'
           document.getElementById('eweShared').innerHTML = selectedAccessory.context.eweShared
-            ? 'Yes (' + selectedAccessory.context.eweShared + ')'
+            ? 'Yes (by ' + selectedAccessory.context.eweShared + ')'
             : 'No'
           document.getElementById('deviceTable').style.display = 'inline-table'
           homebridge.hideSpinner()

From 4fb7b95cab95b6d918fb47b0401a6632b99b4fe5 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 24 Nov 2020 08:35:26 +0000
Subject: [PATCH 0842/3183] Update index.html

---
 lib/homebridge-ui/public/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/homebridge-ui/public/index.html b/lib/homebridge-ui/public/index.html
index e26dd825..b720521e 100644
--- a/lib/homebridge-ui/public/index.html
+++ b/lib/homebridge-ui/public/index.html
@@ -149,7 +149,7 @@ <h4>Disclaimer</h4>
           homebridge.hideSpinner()
         }
         deviceSelect.addEventListener('change', event => showDeviceInfo(event.target.value))
-        if (Object.keys(cachedAccessories).length > 0) {
+        if (cachedAccessories.length > 0) {
           showDeviceInfo(cachedAccessories[0].context.hbDeviceId)
         } else {
           const option = document.createElement('option')

From 7fca35475aa161f1f5ea158329c258e124da0495 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 24 Nov 2020 08:41:14 +0000
Subject: [PATCH 0843/3183] top margin consistent with schemaForm

---
 lib/homebridge-ui/public/index.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/homebridge-ui/public/index.html b/lib/homebridge-ui/public/index.html
index b720521e..d177da1c 100644
--- a/lib/homebridge-ui/public/index.html
+++ b/lib/homebridge-ui/public/index.html
@@ -14,7 +14,7 @@
   <button type="button" class="btn btn-primary mr-0" id="menuHome">Support</button>
 </div>
 <div id="pageDevices" style="display:none;">
-  <div class="card card-body" id="deviceInfo">
+  <div class="card card-body mt-4" id="deviceInfo">
     <form>
       <div class="form-group">
         <select class="form-control" id="deviceSelect"></select>
@@ -61,7 +61,7 @@
   </div>
 </div>
 <div id="pageSupport" style="display:none;">
-  <div class="card card-body">
+  <div class="card card-body mt-4">
     <p class="lead" align="center">Thank you for using <strong>homebridge-ewelink</strong></p>
     <p align="center">The links below will take you to our GitHub wiki</p>
     <h4>Features</h4>

From 544a9666e523d0a9af08d73d5d2f6aab1da12b37 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 24 Nov 2020 08:41:46 +0000
Subject: [PATCH 0844/3183] 3.14.1-6

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 296272b6..4cc6794b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.14.1-5",
+  "version": "3.14.1-6",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 80bf45d2..358c5ad1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.14.1-5",
+  "version": "3.14.1-6",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From e6f0e5856850648555378c51ca5e7dd04fc8be6b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 24 Nov 2020 09:03:17 +0000
Subject: [PATCH 0845/3183] format longer list

---
 lib/helpers.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/helpers.js b/lib/helpers.js
index 1590b916..a9b5c5fc 100644
--- a/lib/helpers.js
+++ b/lib/helpers.js
@@ -7,7 +7,11 @@ module.exports = {
   appId: 'oeVkj2lYFGnJu5XUtWisfW4utiN4u9Mq',
   appSecret: '6Nz4n0xA8s8qdxQf2GqurZj2Fs55FUvM',
   httpRetryCodes: ['ENOTFOUND', 'ETIMEDOUT', 'EAI_AGAIN'],
-  allowedGroups: ['blind', 'garage', 'garage_two', 'garage_four', 'garage_eachen', 'lock', 'switch_valve', 'valve', 'valve_two'],
+  allowedGroups: [
+    'blind', 'garage', 'garage_two', 'garage_four',
+    'garage_eachen', 'lock', 'switch_valve', 'valve',
+    'valve_two'
+  ],
   defaults: {
     inUsePowerThreshold: 0,
     lowBattThreshold: 25,

From d2c0ade91b85dfc58178abd5cfe1f67ae4afc3e2 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Tue, 24 Nov 2020 10:52:45 +0000
Subject: [PATCH 0846/3183] Update README.md

---
 README.md | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index a4cb08b3..0dff12e5 100644
--- a/README.md
+++ b/README.md
@@ -49,7 +49,13 @@ Homebridge/HOOBS plugin to control eWeLink devices with original firmware.
 * [About Me](https://github.com/sponsors/bwp91)
 * [Changelog](https://github.com/bwp91/homebridge-ewelink/releases)
 * [Support Request](https://github.com/bwp91/homebridge-ewelink/issues/new/choose)
-* [Credits](https://github.com/bwp91/homebridge-ewelink/wiki/Credits)
+
+### Credits
+* To the original plugin maintainer: <a href="https://github.com/gbro115" target="_blank">@gbro115</a>
+* To successive contributors: <a href="https://github.com/MrTomAsh" target="_blank">@MrTomAsh</a> and <a href="https://github.com/howanghk" target="_blank">@howanghk</a> for <a href="https://github.com/howanghk/homebridge-ewelink" target="_blank">homebridge-ewelink-max</a>
+* To the creators/contributors of <a href="https://homebridge.io" target="_blank">Homebridge</a> who make this plugin possible
+* To the creators/contributors of <a href="https://github.com/simont77/fakegato-history" target="_blank">Fakegato</a>: <a href="https://github.com/simont77" target="_blank">@simont77</a> and <a href="https://github.com/NorthernMan54" target="_blank">@NorthernMan54</a>
+* To all users who have shared their devices to enable functionality
 
 ### Disclaimer
 * I am in no way affiliated with eWeLink nor any of the device brands (like Sonoff) and this plugin is a personal project that I maintain in my free time.

From 306434f7956d3a196c7993c1d1e3980784ac713f Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Tue, 24 Nov 2020 10:54:22 +0000
Subject: [PATCH 0847/3183] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 0dff12e5..8de613d5 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@ Homebridge/HOOBS plugin to control eWeLink devices with original firmware.
 </span>
 
 ### Prerequisites
-* To use this plugin, you will need to already have [Homebridge](https://homebridge.io) or [HOOBS](https://hoobs.org) installed. Please refer to the links for more information and installation instructions.
+* To use this plugin, you will need to already have <a href="https://homebridge.io" target="_blank">Homebridge</a> or <a href="https://hoobs.org" target="_blank">HOOBS</a> installed. Please refer to the links for more information and installation instructions.
 
 ### Plugin Information
 * This plugin uses your eWeLink credentials to obtain and control your devices through Homebridge.

From 1b917b726e192eafdd69f4783f2002c27f74b208 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Tue, 24 Nov 2020 10:59:31 +0000
Subject: [PATCH 0848/3183] Update README.md

---
 README.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 8de613d5..ec25f07a 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@ Homebridge/HOOBS plugin to control eWeLink devices with original firmware.
 </span>
 
 ### Prerequisites
-* To use this plugin, you will need to already have <a href="https://homebridge.io" target="_blank">Homebridge</a> or <a href="https://hoobs.org" target="_blank">HOOBS</a> installed. Please refer to the links for more information and installation instructions.
+* To use this plugin, you will need to already have [Homebridge](https://homebridge.io) or [HOOBS](https://hoobs.org) installed. Please refer to the links for more information and installation instructions.
 
 ### Plugin Information
 * This plugin uses your eWeLink credentials to obtain and control your devices through Homebridge.
@@ -51,10 +51,10 @@ Homebridge/HOOBS plugin to control eWeLink devices with original firmware.
 * [Support Request](https://github.com/bwp91/homebridge-ewelink/issues/new/choose)
 
 ### Credits
-* To the original plugin maintainer: <a href="https://github.com/gbro115" target="_blank">@gbro115</a>
-* To successive contributors: <a href="https://github.com/MrTomAsh" target="_blank">@MrTomAsh</a> and <a href="https://github.com/howanghk" target="_blank">@howanghk</a> for <a href="https://github.com/howanghk/homebridge-ewelink" target="_blank">homebridge-ewelink-max</a>
-* To the creators/contributors of <a href="https://homebridge.io" target="_blank">Homebridge</a> who make this plugin possible
-* To the creators/contributors of <a href="https://github.com/simont77/fakegato-history" target="_blank">Fakegato</a>: <a href="https://github.com/simont77" target="_blank">@simont77</a> and <a href="https://github.com/NorthernMan54" target="_blank">@NorthernMan54</a>
+* To the original plugin maintainer: [@gbro115](https://github.com/gbro115)
+* To successive contributors: [@MrTomAsh](https://github.com/MrTomAsh) and [@howanghk](https://github.com/howanghk) for [homebridge-ewelink-max](https://github.com/howanghk/homebridge-ewelink)</a>
+* To the creators/contributors of [Homebridge](https://homebridge.io) who make this plugin possible
+* To the creators/contributors of [Fakegato](https://github.com/simont77/fakegato-history): [@simont77](https://github.com/simont77) and [@NorthernMan54](https://github.com/NorthernMan54)
 * To all users who have shared their devices to enable functionality
 
 ### Disclaimer

From a693b7c45fa6241870bf4ba9a8810cd43172505d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 24 Nov 2020 11:05:21 +0000
Subject: [PATCH 0849/3183] Update index.html

---
 lib/homebridge-ui/public/index.html | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/lib/homebridge-ui/public/index.html b/lib/homebridge-ui/public/index.html
index d177da1c..8b4479a5 100644
--- a/lib/homebridge-ui/public/index.html
+++ b/lib/homebridge-ui/public/index.html
@@ -85,10 +85,20 @@ <h4>About</h4>
     <li><a href="https://github.com/sponsors/bwp91" target="_blank">About Me</a></li>
     <li><a href="https://github.com/bwp91/homebridge-ewelink/releases" target="_blank">Changelog</a></li>
     <li><a href="https://github.com/bwp91/homebridge-ewelink/issues/new/choose" target="_blank">Support Request</a></li>
-    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/Credits" target="_blank">Credits</a></li>
     </ul>
+    <h4>Credits</h4>
+    <ul>
+      <li>To the original plugin maintainer: <a href="https://github.com/gbro115" target="_blank">@gbro115</a></li>
+      <li>To successive contributors: <a href="https://github.com/MrTomAsh" target="_blank">@MrTomAsh</a> and <a href="https://github.com/howanghk" target="_blank">@howanghk</a> for <a href="https://github.com/howanghk/homebridge-ewelink" target="_blank">homebridge-ewelink-max</a></a></li>
+      <li>To the creators/contributors of <a href="https://homebridge.io" target="_blank">Homebridge</a> who make this plugin possible</li>
+      <li>To the creators/contributors of <a href="https://github.com/simont77/fakegato-history" target="_blank">Fakegato</a>: <a href="https://github.com/simont77" target="_blank">@simont77</a> and <a href="https://github.com/NorthernMan54" target="_blank">@NorthernMan54</a></li>
+      <li>To all users who have shared their devices to enable functionality</li>
+      </ul>
+      
     <h4>Disclaimer</h4>
-    <p>I am in no way affiliated with eWeLink nor any of the device brands (like Sonoff) and this plugin is a personal project that I maintain in my free time.</p>
+    <ul>
+      <li>I am in no way affiliated with eWeLink nor any of the device brands (like Sonoff) and this plugin is a personal project that I maintain in my free time.</li>
+    </ul>
   </div>
 </div>
 <script>

From 59a81ca89d5fea03c7501599740a28c5b7a5250a Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 24 Nov 2020 11:07:30 +0000
Subject: [PATCH 0850/3183] Update index.html

---
 lib/homebridge-ui/public/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/homebridge-ui/public/index.html b/lib/homebridge-ui/public/index.html
index 8b4479a5..64d819d5 100644
--- a/lib/homebridge-ui/public/index.html
+++ b/lib/homebridge-ui/public/index.html
@@ -93,7 +93,7 @@ <h4>Credits</h4>
       <li>To the creators/contributors of <a href="https://homebridge.io" target="_blank">Homebridge</a> who make this plugin possible</li>
       <li>To the creators/contributors of <a href="https://github.com/simont77/fakegato-history" target="_blank">Fakegato</a>: <a href="https://github.com/simont77" target="_blank">@simont77</a> and <a href="https://github.com/NorthernMan54" target="_blank">@NorthernMan54</a></li>
       <li>To all users who have shared their devices to enable functionality</li>
-      </ul>
+    </ul>
       
     <h4>Disclaimer</h4>
     <ul>

From a1269f5d4d332c031a72e688f338c77c789eebba Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 24 Nov 2020 11:11:44 +0000
Subject: [PATCH 0851/3183] 3.14.1-7

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 4cc6794b..0d563fec 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.14.1-6",
+  "version": "3.14.1-7",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 358c5ad1..3d0775b1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.14.1-6",
+  "version": "3.14.1-7",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 117bcfb94c60a5adb4706dc044bb73600ec262dc Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 24 Nov 2020 14:08:39 +0000
Subject: [PATCH 0852/3183] use number for easier scrolling

---
 config.schema.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 34a035ad..86e21dec 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -70,7 +70,7 @@
         "description": "A list of eWeLink outlet devices to show as switches in Homebridge. For example '10009553c8' or multiple separated with a comma '10009553c8,10009553c9'"
       },
       "inUsePowerThreshold": {
-        "type": "integer",
+        "type": "number",
         "title": "Outlet 'In Use' Threshold",
         "description": "Homebridge will set the 'In Use' status of outlet devices to true when the wattage is above this number.",
         "default": 0,
@@ -93,7 +93,7 @@
         "description": "If checked, the plugin will remove and re-add these RF Bridges on Homebridge restart. This is needed when adding/removed sub-devices from the RF Bridge. For example '10009553c8' or multiple separated with a comma '10009553c8,10009553c9'."
       },
       "lowBattThreshold": {
-        "type": "integer",
+        "type": "number",
         "title": "Low Battery Threshold",
         "description": "Homebridge will set the low battery status for supported devices when the device battery reaches this percentage level.",
         "default": 25,
@@ -101,7 +101,7 @@
         "maximum": 50
       },
       "sensorTimeDifference": {
-        "type": "integer",
+        "type": "number",
         "title": "Sensor Lag",
         "description": "An offset in seconds to ignore any notifications if they is a delay between a sensor detecting something and Homebridge receiving the notification. This setting applies to sensors connected to RF/Zigbee Bridges.",
         "default": 120,
@@ -210,7 +210,7 @@
               ]
             },
             "operationTime": {
-              "type": "integer",
+              "type": "number",
               "title": "Operation Time (Deciseconds)",
               "description": "Blinds/garage doors: the time to fully open/close the device. Locks: the time to show as unlocked. Irrigation: an initial default time for HomeKit. This setting is in deciseconds - count the time in seconds and multiply by 10, for example 100 for 10 seconds or 75 for 7.5 seconds.",
               "default": 100,
@@ -295,7 +295,7 @@
               ]
             },
             "sensorTimeLength": {
-              "type": "integer",
+              "type": "number",
               "title": "Sensor Time Length",
               "description": "The number of seconds which the sensor tile in the Home app will light up for if this sensor is activated.",
               "default": 60,

From af756efb7dd949002ca7c71be655413cb5b82359 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 24 Nov 2020 14:13:57 +0000
Subject: [PATCH 0853/3183] clarify no quotes

---
 config.schema.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 86e21dec..10dd3d33 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -57,17 +57,17 @@
       "hideDevFromHB": {
         "type": "string",
         "title": "Hide Devices",
-        "description": "A list of eWeLink devices to hide from Homebridge. For example '10009553c8' or multiple separated with a comma '10009553c8,10009553c9'."
+        "description": "A list of eWeLink devices to hide from Homebridge. For example '10009553c8' or multiple separated with a comma '10009553c8,10009553c9' (without the quotes)."
       },
       "hideChanFromHB": {
         "type": "string",
         "title": "Hide Light/Switch Channels",
-        "description": "A list of light/switch channels to hide from Homebridge. For example '10009553c8SW0' or multiple separated with a comma '10009553c8SW0,10009553c9SW2'."
+        "description": "A list of light/switch channels to hide from Homebridge. For example '10009553c8SW0' or multiple separated with a comma '10009553c8SW0,10009553c9SW2' (without the quotes)."
       },
       "outletAsSwitch": {
         "type": "string",
         "title": "Outlet As Switch",
-        "description": "A list of eWeLink outlet devices to show as switches in Homebridge. For example '10009553c8' or multiple separated with a comma '10009553c8,10009553c9'"
+        "description": "A list of eWeLink outlet devices to show as switches in Homebridge. For example '10009553c8' or multiple separated with a comma '10009553c8,10009553c9' (without the quotes)."
       },
       "inUsePowerThreshold": {
         "type": "number",
@@ -80,17 +80,17 @@
       "hideLightFromFan": {
         "type": "string",
         "title": "Hide Fan Lights",
-        "description": "A list of eWeLink iFan devices for which the light will be hidden from Homebridge. For example '10009553c8' or multiple separated with a comma '10009553c8,10009553c9'."
+        "description": "A list of eWeLink iFan devices for which the light will be hidden from Homebridge. For example '10009553c8' or multiple separated with a comma '10009553c8,10009553c9' (without the quotes)."
       },
       "hideSwitchFromTH": {
         "type": "string",
         "title": "Hide TH10/16 Switches",
-        "description": "A list of TH10/TH16 devices for which the switch will be hidden from Homebridge. For example '10009553c8' or multiple separated with a comma '10009553c8,10009553c9'."
+        "description": "A list of TH10/TH16 devices for which the switch will be hidden from Homebridge. For example '10009553c8' or multiple separated with a comma '10009553c8,10009553c9' (without the quotes)."
       },
       "resetRFBridge": {
         "title": "Reset RF Bridges",
         "type": "string",
-        "description": "If checked, the plugin will remove and re-add these RF Bridges on Homebridge restart. This is needed when adding/removed sub-devices from the RF Bridge. For example '10009553c8' or multiple separated with a comma '10009553c8,10009553c9'."
+        "description": "If checked, the plugin will remove and re-add these RF Bridges on Homebridge restart. This is needed when adding/removed sub-devices from the RF Bridge. For example '10009553c8' or multiple separated with a comma '10009553c8,10009553c9' (without the quotes)."
       },
       "lowBattThreshold": {
         "type": "number",

From 38c7a9ffbaa80edff41f44f76390745d8fcb4809 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 24 Nov 2020 14:19:23 +0000
Subject: [PATCH 0854/3183] sharper text

---
 config.schema.json | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 10dd3d33..b4ab7a3d 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -22,7 +22,7 @@
         "type": "string",
         "title": "Username",
         "required": true,
-        "description": "The phone number or email address linked to your eWeLink account. If you use a phone number please enter the country code (with the +), for example +8613185260282."
+        "description": "The phone number or email address linked to your eWeLink account. If you use a phone number then enter the country code (with the +), for example +8613185260282."
       },
       "password": {
         "type": "string",
@@ -33,7 +33,7 @@
       "debug": {
         "title": "Debug Logging",
         "type": "boolean",
-        "description": "If checked, more information will be added to the Homebridge log.",
+        "description": "If checked, more information will be added to the log.",
         "default": false
       },
       "debugReqRes": {
@@ -45,34 +45,34 @@
       "disableHTTPRefresh": {
         "type": "boolean",
         "title": "Disable Initial Device Refresh",
-        "description": "If checked, devices will not be refreshed with their most recent status from eWeLink when Homebridge starts. This setting can be useful for users who block their devices from accessing the internet.",
+        "description": "If checked, devices will not be refreshed with their most recent status from eWeLink on startup. This setting can be useful for users who block their devices from accessing the internet.",
         "default": false
       },
       "disablePlugin": {
         "title": "Disable Plugin",
         "type": "boolean",
-        "description": "If checked, the plugin will remove all eWeLink accessories from Homebridge and not load the plugin on Homebridge restart.",
+        "description": "If checked, the plugin will remove all accessories and not load the plugin on restart.",
         "default": false
       },
       "hideDevFromHB": {
         "type": "string",
         "title": "Hide Devices",
-        "description": "A list of eWeLink devices to hide from Homebridge. For example '10009553c8' or multiple separated with a comma '10009553c8,10009553c9' (without the quotes)."
+        "description": "A list of devices to ignore. For example '10009553c8' or multiple separated with a comma '10009553c8,10009553c9' (without the quotes)."
       },
       "hideChanFromHB": {
         "type": "string",
         "title": "Hide Light/Switch Channels",
-        "description": "A list of light/switch channels to hide from Homebridge. For example '10009553c8SW0' or multiple separated with a comma '10009553c8SW0,10009553c9SW2' (without the quotes)."
+        "description": "A list of light/switch channels to hide. For example '10009553c8SW0' or multiple separated with a comma '10009553c8SW0,10009553c9SW2' (without the quotes)."
       },
       "outletAsSwitch": {
         "type": "string",
         "title": "Outlet As Switch",
-        "description": "A list of eWeLink outlet devices to show as switches in Homebridge. For example '10009553c8' or multiple separated with a comma '10009553c8,10009553c9' (without the quotes)."
+        "description": "A list of outlet devices to show as switches. For example '10009553c8' or multiple separated with a comma '10009553c8,10009553c9' (without the quotes)."
       },
       "inUsePowerThreshold": {
         "type": "number",
         "title": "Outlet 'In Use' Threshold",
-        "description": "Homebridge will set the 'In Use' status of outlet devices to true when the wattage is above this number.",
+        "description": "HomeKit will set the 'In Use' status of outlet devices to true when the wattage is above this number.",
         "default": 0,
         "minimum": 0,
         "maximum": 100
@@ -80,22 +80,22 @@
       "hideLightFromFan": {
         "type": "string",
         "title": "Hide Fan Lights",
-        "description": "A list of eWeLink iFan devices for which the light will be hidden from Homebridge. For example '10009553c8' or multiple separated with a comma '10009553c8,10009553c9' (without the quotes)."
+        "description": "A list of iFan devices for which the light will be hidden. For example '10009553c8' or multiple separated with a comma '10009553c8,10009553c9' (without the quotes)."
       },
       "hideSwitchFromTH": {
         "type": "string",
         "title": "Hide TH10/16 Switches",
-        "description": "A list of TH10/TH16 devices for which the switch will be hidden from Homebridge. For example '10009553c8' or multiple separated with a comma '10009553c8,10009553c9' (without the quotes)."
+        "description": "A list of TH10/TH16 devices for which the switch will be hidden. For example '10009553c8' or multiple separated with a comma '10009553c8,10009553c9' (without the quotes)."
       },
       "resetRFBridge": {
         "title": "Reset RF Bridges",
         "type": "string",
-        "description": "If checked, the plugin will remove and re-add these RF Bridges on Homebridge restart. This is needed when adding/removed sub-devices from the RF Bridge. For example '10009553c8' or multiple separated with a comma '10009553c8,10009553c9' (without the quotes)."
+        "description": "If checked, the plugin will remove and re-add these RF Bridges on restart. This is needed when adding/removed sub-devices from the RF Bridge. For example '10009553c8' or multiple separated with a comma '10009553c8,10009553c9' (without the quotes)."
       },
       "lowBattThreshold": {
         "type": "number",
         "title": "Low Battery Threshold",
-        "description": "Homebridge will set the low battery status for supported devices when the device battery reaches this percentage level.",
+        "description": "HomeKit will set the low battery status for supported devices when the device battery reaches this percentage level.",
         "default": 25,
         "minimum": 5,
         "maximum": 50
@@ -231,7 +231,7 @@
       "bridgeSensors": {
         "type": "array",
         "title": "Sensors",
-        "description": "You can expose different types of sensors connected to your RF Bridge in HomeKit. Please see <a href=\"https://github.com/bwp91/homebridge-ewelink/wiki/How-to-set-up-RF-Bridge-sensors\" target=\"_blank\">this wiki article</a> for more information.",
+        "description": "You can expose different types of sensors connected to your RF Bridge. Please see <a href=\"https://github.com/bwp91/homebridge-ewelink/wiki/How-to-set-up-RF-Bridge-sensors\" target=\"_blank\">this wiki article</a> for more information.",
         "items": {
           "type": "object",
           "properties": {
@@ -308,7 +308,7 @@
       "nameOverride": {
         "type": "array",
         "title": "Accessory Name Overrides",
-        "description": "You can override the default name given to a device when it is added to Homebridge.",
+        "description": "You can override the default name given to a device when it is added.",
         "items": {
           "type": "object",
           "properties": {
@@ -320,7 +320,7 @@
             "deviceName": {
               "title": "Name",
               "type": "string",
-              "description": "The name for the accessory for when it is added to Homebridge."
+              "description": "The name for the accessory for when it is added."
             }
           }
         }
@@ -328,7 +328,7 @@
       "ipOverride": {
         "type": "array",
         "title": "IP Overrides",
-        "description": "You can override the IP for a device in Homebridge.",
+        "description": "You can override the IP for a device.",
         "items": {
           "type": "object",
           "properties": {

From c78ece0283fa1a388754f12e851793da23dc950b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 24 Nov 2020 14:21:13 +0000
Subject: [PATCH 0855/3183] sharper text

---
 config.schema.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index b4ab7a3d..48c2023b 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -103,7 +103,7 @@
       "sensorTimeDifference": {
         "type": "number",
         "title": "Sensor Lag",
-        "description": "An offset in seconds to ignore any notifications if they is a delay between a sensor detecting something and Homebridge receiving the notification. This setting applies to sensors connected to RF/Zigbee Bridges.",
+        "description": "An offset in seconds to ignore any notifications if they is a delay between a sensor detecting something and the plugin receiving the notification. This setting applies to sensors connected to RF/Zigbee Bridges.",
         "default": 120,
         "minimum": 10,
         "maximum": 300
@@ -243,12 +243,12 @@
             "fullDeviceId": {
               "type": "string",
               "title": "Sensor Device ID",
-              "description": "Device ID of the sensor from Homebridge (13 digits normally in the format 1000ab23cdSW2)."
+              "description": "Device ID of the sensor in Homebridge/HOOBS (13 digits normally in the format 1000ab23cdSW2)."
             },
             "type": {
               "type": "string",
               "title": "Sensor Type",
-              "description": "Select the type of sensor you would like to expose this as in Homebridge.",
+              "description": "Select the type of sensor you would like to expose this as.",
               "oneOf": [
                 {
                   "title": "Motion",
@@ -315,7 +315,7 @@
             "fullDeviceId": {
               "title": "Device ID",
               "type": "string",
-              "description": "Full device ID of the device from Homebridge (13 digits normally in the format 1000ab23cdSW2)."
+              "description": "Full device ID of the device in Homebridge/HOOBS (13 digits normally in the format 1000ab23cdSW2)."
             },
             "deviceName": {
               "title": "Name",

From 574e9fe855b65b7c4889912b704da67b83cfbcdf Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 24 Nov 2020 14:21:50 +0000
Subject: [PATCH 0856/3183] 3.14.1-8

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 0d563fec..058efac1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.14.1-7",
+  "version": "3.14.1-8",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 3d0775b1..6ab84daf 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.14.1-7",
+  "version": "3.14.1-8",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 0279e550b8bac2dd5cd0f85c8708413e5cbd877c Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Tue, 24 Nov 2020 15:43:17 +0000
Subject: [PATCH 0857/3183] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index ec25f07a..fbfc360a 100644
--- a/README.md
+++ b/README.md
@@ -52,7 +52,7 @@ Homebridge/HOOBS plugin to control eWeLink devices with original firmware.
 
 ### Credits
 * To the original plugin maintainer: [@gbro115](https://github.com/gbro115)
-* To successive contributors: [@MrTomAsh](https://github.com/MrTomAsh) and [@howanghk](https://github.com/howanghk) for [homebridge-ewelink-max](https://github.com/howanghk/homebridge-ewelink)</a>
+* To successive contributors: [@MrTomAsh](https://github.com/MrTomAsh) and [@howanghk](https://github.com/howanghk) for [homebridge-ewelink-max](https://github.com/howanghk/homebridge-ewelink)
 * To the creators/contributors of [Homebridge](https://homebridge.io) who make this plugin possible
 * To the creators/contributors of [Fakegato](https://github.com/simont77/fakegato-history): [@simont77](https://github.com/simont77) and [@NorthernMan54](https://github.com/NorthernMan54)
 * To all users who have shared their devices to enable functionality

From 247c510d4c26314b0f69b69da4923e9ed26daf56 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 24 Nov 2020 20:22:22 +0000
Subject: [PATCH 0858/3183] Fix check for AL

---
 lib/device/light-ctemp.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/device/light-ctemp.js b/lib/device/light-ctemp.js
index 06ee2813..e0ab6553 100644
--- a/lib/device/light-ctemp.js
+++ b/lib/device/light-ctemp.js
@@ -17,7 +17,7 @@ module.exports = class deviceLightColour {
     this.lightService
       .getCharacteristic(this.Characteristic.ColorTemperature)
       .on('set', this.internalColourTempUpdate.bind(this))
-    if (platform.api.version === 2.7 && platform.api.versionGreaterOrEqual('1.3.0-beta.27')) {
+    if (platform.api.versionGreaterOrEqual && platform.api.versionGreaterOrEqual('1.3.0-beta.27')) {
       this.alController = new platform.api.hap.AdaptiveLightingController(this.lightService)
       accessory.configureController(this.alController)
     }

From 8a1015c0a356c8bcb7eff56201d6759c01f367e9 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 25 Nov 2020 08:35:28 +0000
Subject: [PATCH 0859/3183] show plugin disabled banner

---
 lib/homebridge-ui/public/index.html | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/lib/homebridge-ui/public/index.html b/lib/homebridge-ui/public/index.html
index 64d819d5..99beecb5 100644
--- a/lib/homebridge-ui/public/index.html
+++ b/lib/homebridge-ui/public/index.html
@@ -13,6 +13,9 @@
   <button type="button" class="btn btn-primary" id="menuDevices">My Devices</button>
   <button type="button" class="btn btn-primary mr-0" id="menuHome">Support</button>
 </div>
+<div id="disabledBanner" class="alert alert-secondary" role="alert" style="display:none;">
+  Plugin is currently disabled <button id="disabledEnable" type="button" class="btn btn-link p-0 m-0 float-sm-right">Enable</button>
+</div>
 <div id="pageDevices" style="display:none;">
   <div class="card card-body mt-4" id="deviceInfo">
     <form>
@@ -195,12 +198,27 @@ <h4>Disclaimer</h4>
         homebridge.showSchemaForm()
         homebridge.hideSpinner()
       }
+      showDisabledBanner = () => {
+        document.getElementById('disabledBanner').style.display = 'block'
+      }
+      enablePlugin = async () => {
+        homebridge.showSpinner()
+        document.getElementById('disabledBanner').style.display = 'none'
+        currentConfig[0].disablePlugin = false
+        await homebridge.updatePluginConfig(currentConfig)
+        await homebridge.savePluginConfig()
+        homebridge.hideSpinner()
+      }
       menuHome.addEventListener('click', () => showSupport())
       menuDevices.addEventListener('click', () => showDevices())
       menuSettings.addEventListener('click', () => showSettings())
+      disabledEnable.addEventListener('click', () => enablePlugin())
       if (currentConfig.length) {
         document.getElementById('menuWrapper').style.display = 'inline-flex'
         showSettings()
+        if (currentConfig[0].disablePlugin) {
+          showDisabledBanner()
+        }
       } else {
         currentConfig.push({ name: 'eWeLink' })
         await homebridge.updatePluginConfig(currentConfig)

From e4585b753c13b77aa6b9c0fafd760b4c90889799 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 25 Nov 2020 08:45:56 +0000
Subject: [PATCH 0860/3183] button always to right

---
 lib/homebridge-ui/public/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/homebridge-ui/public/index.html b/lib/homebridge-ui/public/index.html
index 99beecb5..e6682b40 100644
--- a/lib/homebridge-ui/public/index.html
+++ b/lib/homebridge-ui/public/index.html
@@ -14,7 +14,7 @@
   <button type="button" class="btn btn-primary mr-0" id="menuHome">Support</button>
 </div>
 <div id="disabledBanner" class="alert alert-secondary" role="alert" style="display:none;">
-  Plugin is currently disabled <button id="disabledEnable" type="button" class="btn btn-link p-0 m-0 float-sm-right">Enable</button>
+  Plugin is currently disabled <button id="disabledEnable" type="button" class="btn btn-link p-0 m-0 float-right">Enable</button>
 </div>
 <div id="pageDevices" style="display:none;">
   <div class="card card-body mt-4" id="deviceInfo">

From 99249bf75d39a51a83d0c0610ae9b6327afdc8d7 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 25 Nov 2020 08:56:27 +0000
Subject: [PATCH 0861/3183] 3.14.1-9

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 058efac1..f41ea367 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.14.1-8",
+  "version": "3.14.1-9",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 6ab84daf..d4c1475e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.14.1-8",
+  "version": "3.14.1-9",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 90e5249c2143b3a8a03130b758a88ca0d2003efb Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 25 Nov 2020 09:39:54 +0000
Subject: [PATCH 0862/3183] fix margins, remove card class

---
 lib/homebridge-ui/public/index.html | 86 ++++++++++++++---------------
 1 file changed, 42 insertions(+), 44 deletions(-)

diff --git a/lib/homebridge-ui/public/index.html b/lib/homebridge-ui/public/index.html
index e6682b40..aa8e1533 100644
--- a/lib/homebridge-ui/public/index.html
+++ b/lib/homebridge-ui/public/index.html
@@ -8,16 +8,16 @@
     <button type="button" class="btn btn-primary" id="introContinue">Continue &rarr;</button>
   </center>
 </div>
-<div id="menuWrapper" class="btn-group w-100 mb-3" role="group" aria-label="UI Menu" style="display:none;">
+<div id="menuWrapper" class="btn-group w-100 mb-0" role="group" aria-label="UI Menu" style="display:none;">
   <button type="button" class="btn btn-primary ml-0" id="menuSettings">Settings</button>
   <button type="button" class="btn btn-primary" id="menuDevices">My Devices</button>
   <button type="button" class="btn btn-primary mr-0" id="menuHome">Support</button>
 </div>
-<div id="disabledBanner" class="alert alert-secondary" role="alert" style="display:none;">
+<div id="disabledBanner" class="alert alert-secondary mb-0 mt-3" role="alert" style="display:none;">
   Plugin is currently disabled <button id="disabledEnable" type="button" class="btn btn-link p-0 m-0 float-right">Enable</button>
 </div>
-<div id="pageDevices" style="display:none;">
-  <div class="card card-body mt-4" id="deviceInfo">
+<div id="pageDevices" class="mt-4" style="display:none;">
+  <div id="deviceInfo">
     <form>
       <div class="form-group">
         <select class="form-control" id="deviceSelect"></select>
@@ -63,46 +63,44 @@
     </table>
   </div>
 </div>
-<div id="pageSupport" style="display:none;">
-  <div class="card card-body mt-4">
-    <p class="lead" align="center">Thank you for using <strong>homebridge-ewelink</strong></p>
-    <p align="center">The links below will take you to our GitHub wiki</p>
-    <h4>Features</h4>
-    <ul>
-    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/Supported-Devices" target="_blank">Supported Devices</a></li>
-    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/Multi-Channel-Devices" target="_blank">Multi Channel Devices</a></li>
-    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/Accessory-Simulations" target="_blank">Accessory Simulations</a></li>
-    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/Connection-Methods" target="_blank">Connection Methods</a></li>
-    </ul>
-    <h4>How-to Guides</h4>
-    <ul>
-    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/How-to-set-up-RF-Bridge-sensors" target="_blank">How to set up RF Bridge sensors</a></li>
-    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/How-to-set-up-Sonoff-Camera" target="_blank">How to set up Sonoff Camera (GK-200MP2-B)</a></li>
-    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/How-to-copy-Homebridge-logs" target="_blank">How to copy Homebridge logs</a></li>
-    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/How-to-enable-disable-plugin-extended-logging" target="_blank">How to enable/disable plugin extended logging</a></li>
-    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/How-to-remove-an-accessory-from-the-cache" target="_blank">How to remove an accessory from the cache</a></li>
-    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/How-to-update-node" target="_blank">How to update node</a></li>
-    </ul>
-    <h4>About</h4>
-    <ul>
-    <li><a href="https://github.com/sponsors/bwp91" target="_blank">About Me</a></li>
-    <li><a href="https://github.com/bwp91/homebridge-ewelink/releases" target="_blank">Changelog</a></li>
-    <li><a href="https://github.com/bwp91/homebridge-ewelink/issues/new/choose" target="_blank">Support Request</a></li>
-    </ul>
-    <h4>Credits</h4>
-    <ul>
-      <li>To the original plugin maintainer: <a href="https://github.com/gbro115" target="_blank">@gbro115</a></li>
-      <li>To successive contributors: <a href="https://github.com/MrTomAsh" target="_blank">@MrTomAsh</a> and <a href="https://github.com/howanghk" target="_blank">@howanghk</a> for <a href="https://github.com/howanghk/homebridge-ewelink" target="_blank">homebridge-ewelink-max</a></a></li>
-      <li>To the creators/contributors of <a href="https://homebridge.io" target="_blank">Homebridge</a> who make this plugin possible</li>
-      <li>To the creators/contributors of <a href="https://github.com/simont77/fakegato-history" target="_blank">Fakegato</a>: <a href="https://github.com/simont77" target="_blank">@simont77</a> and <a href="https://github.com/NorthernMan54" target="_blank">@NorthernMan54</a></li>
-      <li>To all users who have shared their devices to enable functionality</li>
-    </ul>
-      
-    <h4>Disclaimer</h4>
-    <ul>
-      <li>I am in no way affiliated with eWeLink nor any of the device brands (like Sonoff) and this plugin is a personal project that I maintain in my free time.</li>
-    </ul>
-  </div>
+<div id="pageSupport" class="mt-4" style="display:none;">
+  <p class="lead" align="center">Thank you for using <strong>homebridge-ewelink</strong></p>
+  <p align="center">The links below will take you to our GitHub wiki</p>
+  <h4>Features</h4>
+  <ul>
+  <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/Supported-Devices" target="_blank">Supported Devices</a></li>
+  <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/Multi-Channel-Devices" target="_blank">Multi Channel Devices</a></li>
+  <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/Accessory-Simulations" target="_blank">Accessory Simulations</a></li>
+  <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/Connection-Methods" target="_blank">Connection Methods</a></li>
+  </ul>
+  <h4>How-to Guides</h4>
+  <ul>
+  <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/How-to-set-up-RF-Bridge-sensors" target="_blank">How to set up RF Bridge sensors</a></li>
+  <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/How-to-set-up-Sonoff-Camera" target="_blank">How to set up Sonoff Camera (GK-200MP2-B)</a></li>
+  <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/How-to-copy-Homebridge-logs" target="_blank">How to copy Homebridge logs</a></li>
+  <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/How-to-enable-disable-plugin-extended-logging" target="_blank">How to enable/disable plugin extended logging</a></li>
+  <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/How-to-remove-an-accessory-from-the-cache" target="_blank">How to remove an accessory from the cache</a></li>
+  <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/How-to-update-node" target="_blank">How to update node</a></li>
+  </ul>
+  <h4>About</h4>
+  <ul>
+  <li><a href="https://github.com/sponsors/bwp91" target="_blank">About Me</a></li>
+  <li><a href="https://github.com/bwp91/homebridge-ewelink/releases" target="_blank">Changelog</a></li>
+  <li><a href="https://github.com/bwp91/homebridge-ewelink/issues/new/choose" target="_blank">Support Request</a></li>
+  </ul>
+  <h4>Credits</h4>
+  <ul>
+    <li>To the original plugin maintainer: <a href="https://github.com/gbro115" target="_blank">@gbro115</a></li>
+    <li>To successive contributors: <a href="https://github.com/MrTomAsh" target="_blank">@MrTomAsh</a> and <a href="https://github.com/howanghk" target="_blank">@howanghk</a> for <a href="https://github.com/howanghk/homebridge-ewelink" target="_blank">homebridge-ewelink-max</a></a></li>
+    <li>To the creators/contributors of <a href="https://homebridge.io" target="_blank">Homebridge</a> who make this plugin possible</li>
+    <li>To the creators/contributors of <a href="https://github.com/simont77/fakegato-history" target="_blank">Fakegato</a>: <a href="https://github.com/simont77" target="_blank">@simont77</a> and <a href="https://github.com/NorthernMan54" target="_blank">@NorthernMan54</a></li>
+    <li>To all users who have shared their devices to enable functionality</li>
+  </ul>
+    
+  <h4>Disclaimer</h4>
+  <ul>
+    <li>I am in no way affiliated with eWeLink nor any of the device brands (like Sonoff) and this plugin is a personal project that I maintain in my free time.</li>
+  </ul>
 </div>
 <script>
   (async () => {

From 1fe89f1b3745a2af50f7ad4fc460d2eaa7b462f3 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 25 Nov 2020 10:48:43 +0000
Subject: [PATCH 0863/3183] improved html formatting

---
 lib/homebridge-ui/public/index.html | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/lib/homebridge-ui/public/index.html b/lib/homebridge-ui/public/index.html
index aa8e1533..86d5feae 100644
--- a/lib/homebridge-ui/public/index.html
+++ b/lib/homebridge-ui/public/index.html
@@ -1,22 +1,20 @@
-<p align="center">
-  <img width="60%" src="https://user-images.githubusercontent.com/43026681/100062842-2e94b800-2e28-11eb-83d4-f8490b6bb804.png">
+<p class="text-center">
+  <img src="https://user-images.githubusercontent.com/43026681/100062842-2e94b800-2e28-11eb-83d4-f8490b6bb804.png" alt="homebridge-ewelink logo" style="width: 60%;">
 </p>
-<div id="pageIntro" style="display:none;">
-  <center>
-    <p class="lead">Thank you for installing <strong>homebridge-ewelink</strong></p>
-    <p>You will need to enter your eWeLink username, password and country code on the next page</p>
-    <button type="button" class="btn btn-primary" id="introContinue">Continue &rarr;</button>
-  </center>
+<div id="pageIntro" class="text-center" style="display: none;">
+  <p class="lead">Thank you for installing <strong>homebridge-ewelink</strong></p>
+  <p>You will need to enter your eWeLink username, password and country code on the next page</p>
+  <button type="button" class="btn btn-primary" id="introContinue">Continue &rarr;</button>
 </div>
-<div id="menuWrapper" class="btn-group w-100 mb-0" role="group" aria-label="UI Menu" style="display:none;">
+<div id="menuWrapper" class="btn-group w-100 mb-0" role="group" aria-label="UI Menu" style="display: none;">
   <button type="button" class="btn btn-primary ml-0" id="menuSettings">Settings</button>
   <button type="button" class="btn btn-primary" id="menuDevices">My Devices</button>
   <button type="button" class="btn btn-primary mr-0" id="menuHome">Support</button>
 </div>
-<div id="disabledBanner" class="alert alert-secondary mb-0 mt-3" role="alert" style="display:none;">
+<div id="disabledBanner" class="alert alert-secondary mb-0 mt-3" role="alert" style="display: none;">
   Plugin is currently disabled <button id="disabledEnable" type="button" class="btn btn-link p-0 m-0 float-right">Enable</button>
 </div>
-<div id="pageDevices" class="mt-4" style="display:none;">
+<div id="pageDevices" class="mt-4" style="display: none;">
   <div id="deviceInfo">
     <form>
       <div class="form-group">
@@ -63,9 +61,9 @@
     </table>
   </div>
 </div>
-<div id="pageSupport" class="mt-4" style="display:none;">
-  <p class="lead" align="center">Thank you for using <strong>homebridge-ewelink</strong></p>
-  <p align="center">The links below will take you to our GitHub wiki</p>
+<div id="pageSupport" class="mt-4" style="display: none;">
+  <p class="text-center lead">Thank you for using <strong>homebridge-ewelink</strong></p>
+  <p class="text-center">The links below will take you to our GitHub wiki</p>
   <h4>Features</h4>
   <ul>
   <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/Supported-Devices" target="_blank">Supported Devices</a></li>
@@ -91,7 +89,7 @@ <h4>About</h4>
   <h4>Credits</h4>
   <ul>
     <li>To the original plugin maintainer: <a href="https://github.com/gbro115" target="_blank">@gbro115</a></li>
-    <li>To successive contributors: <a href="https://github.com/MrTomAsh" target="_blank">@MrTomAsh</a> and <a href="https://github.com/howanghk" target="_blank">@howanghk</a> for <a href="https://github.com/howanghk/homebridge-ewelink" target="_blank">homebridge-ewelink-max</a></a></li>
+    <li>To successive contributors: <a href="https://github.com/MrTomAsh" target="_blank">@MrTomAsh</a> and <a href="https://github.com/howanghk" target="_blank">@howanghk</a> for <a href="https://github.com/howanghk/homebridge-ewelink" target="_blank">homebridge-ewelink-max</a></li>
     <li>To the creators/contributors of <a href="https://homebridge.io" target="_blank">Homebridge</a> who make this plugin possible</li>
     <li>To the creators/contributors of <a href="https://github.com/simont77/fakegato-history" target="_blank">Fakegato</a>: <a href="https://github.com/simont77" target="_blank">@simont77</a> and <a href="https://github.com/NorthernMan54" target="_blank">@NorthernMan54</a></li>
     <li>To all users who have shared their devices to enable functionality</li>

From 7a88483fed2d46dd88badbfc47afd1d599247130 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 25 Nov 2020 10:53:39 +0000
Subject: [PATCH 0864/3183] 3.15.0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index f41ea367..3be50705 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.14.1-9",
+  "version": "3.15.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index d4c1475e..e9ca8a27 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.14.1-9",
+  "version": "3.15.0",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 8e880be576894aa423666eddd1bbbae6dbbe1f9a Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 27 Nov 2020 11:01:12 +0000
Subject: [PATCH 0865/3183] TH as thermostat scaffolding

---
 config.schema.json        |  6 +++
 lib/device/outlet-temp.js | 80 +++++++++++++++++++++++++++++++++++++++
 lib/ewelink-platform.js   | 11 ++++--
 3 files changed, 93 insertions(+), 4 deletions(-)
 create mode 100644 lib/device/outlet-temp.js

diff --git a/config.schema.json b/config.schema.json
index 48c2023b..0ab0e3fa 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -87,6 +87,11 @@
         "title": "Hide TH10/16 Switches",
         "description": "A list of TH10/TH16 devices for which the switch will be hidden. For example '10009553c8' or multiple separated with a comma '10009553c8,10009553c9' (without the quotes)."
       },
+      "thAsThermostat": {
+        "type": "string",
+        "title": "TH As Thermostat",
+        "description": "A list of TH10/TH16 devices to show as thermostats. For example '10009553c8' or multiple separated with a comma '10009553c8,10009553c9' (without the quotes)."
+      },
       "resetRFBridge": {
         "title": "Reset RF Bridges",
         "type": "string",
@@ -382,6 +387,7 @@
         "inUsePowerThreshold",
         "hideLightFromFan",
         "hideSwitchFromTH",
+        "thAsThermostat",
         "resetRFBridge",
         "lowBattThreshold",
         "sensorTimeDifference",
diff --git a/lib/device/outlet-temp.js b/lib/device/outlet-temp.js
new file mode 100644
index 00000000..9552c8ac
--- /dev/null
+++ b/lib/device/outlet-temp.js
@@ -0,0 +1,80 @@
+/* jshint -W014, -W033, esversion: 9 */
+/* eslint-disable new-cap */
+'use strict'
+const helpers = require('./../helpers')
+module.exports = class deviceOutletTemp {
+  constructor (platform, accessory) {
+    this.platform = platform
+    this.Service = platform.api.hap.Service
+    this.Characteristic = platform.api.hap.Characteristic
+    if ((this.platform.config.hideSwitchFromTH || '').includes(accessory.context.eweDeviceId)) {
+      if (accessory.getService(this.Service.Switch)) {
+        accessory.removeService(accessory.getService(this.Service.Switch))
+      }
+    } else {
+      this.switchService = accessory.getService(this.Service.Switch) || accessory.addService(this.Service.Switch)
+      this.switchService
+        .getCharacteristic(this.Characteristic.On)
+        .on('set', this.internalUpdate.bind(this))
+    }
+    this.tempService = accessory.getService(this.Service.TemperatureSensor) || accessory.addService(this.Service.TemperatureSensor)
+    this.tempService.getCharacteristic(this.Characteristic.CurrentTemperature)
+      .setProps({
+        minValue: -100
+      })
+    if (accessory.context.sensorType !== 'DS18B20') {
+      this.humiService = accessory.getService(this.Service.HumiditySensor) || accessory.addService(this.Service.HumiditySensor)
+    }
+    accessory.log = this.platform.log
+    accessory.eveLogger = new this.platform.eveService('custom', accessory, {
+      storage: 'fs',
+      path: this.platform.eveLogPath
+    })
+    this.accessory = accessory
+  }
+
+  async internalUpdate (value, callback) {
+    try {
+      callback()
+      const params = {
+        switch: value ? 'on' : 'off',
+        mainSwitch: value ? 'on' : 'off'
+      }
+      await this.platform.sendDeviceUpdate(this.accessory, params)
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, true)
+    }
+  }
+
+  async externalUpdate (params) {
+    try {
+      if (
+        !(this.platform.config.hideSwitchFromTH || '').includes(this.accessory.context.eweDeviceId) &&
+        (helpers.hasProperty(params, 'switch') || helpers.hasProperty(params, 'mainSwitch'))
+      ) {
+        const newState = helpers.hasProperty(params, 'switch') ? params.switch === 'on' : params.mainSwitch === 'on'
+        this.switchService.updateCharacteristic(this.Characteristic.On, newState)
+        this.accessory.eveLogger.addEntry({
+          time: Math.round(new Date().valueOf() / 1000),
+          status: newState ? 1 : 0
+        })
+      }
+      const eveLog = { time: Math.round(new Date().valueOf() / 1000) }
+      if (helpers.hasProperty(params, 'currentTemperature') && this.accessory.getService(this.Service.TemperatureSensor)) {
+        const currentTemp = parseFloat(params.currentTemperature !== 'unavailable' ? params.currentTemperature : 0)
+        this.tempService.updateCharacteristic(this.Characteristic.CurrentTemperature, currentTemp)
+        eveLog.temp = currentTemp
+      }
+      if (helpers.hasProperty(params, 'currentHumidity') && this.accessory.getService(this.Service.HumiditySensor)) {
+        const currentHumi = parseFloat(params.currentHumidity !== 'unavailable' ? params.currentHumidity : 0)
+        this.humiService.updateCharacteristic(this.Characteristic.CurrentRelativeHumidity, currentHumi)
+        eveLog.humidity = currentHumi
+      }
+      if (helpers.hasProperty(eveLog, 'temp') || helpers.hasProperty(eveLog, 'humidity')) {
+        this.accessory.eveLogger.addEntry(eveLog)
+      }
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, false)
+    }
+  }
+}
diff --git a/lib/ewelink-platform.js b/lib/ewelink-platform.js
index f4d7c137..b1f1a8bc 100644
--- a/lib/ewelink-platform.js
+++ b/lib/ewelink-platform.js
@@ -13,6 +13,7 @@ const deviceValveTwo = require('./device/valve-two')
 const deviceSensor = require('./device/sensor')
 const deviceFan = require('./device/fan')
 const deviceDiffuser = require('./device/diffuser')
+const deviceOutletTemp = require('./device/outlet-temp')
 const deviceThermostat = require('./device/thermostat')
 const deviceOutlet = require('./device/outlet')
 const deviceUSB = require('./device/usb')
@@ -320,15 +321,17 @@ module.exports = class eWeLinkPlatform {
         accessory.control = new deviceDiffuser(this, accessory)
         /**/
       } else if (helpers.devicesThermostat.includes(device.extra.uiid)) {
-        /**********
-        THERMOSTATS
-        **********/
+        /********************
+        THERMOSTATS [TH10/16]
+        ********************/
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
           : this.addAccessory(device, device.deviceid + 'SWX', false, {
             sensorType: device.params.sensorType
           })
-        accessory.control = new deviceThermostat(this, accessory)
+        accessory.control = (this.config.thAsThermostat || '').split(',').includes(device.deviceid)
+          ? new deviceThermostat(this, accessory)
+          : new deviceOutletTemp(this, accessory)
         /*********/
       } else if (
         helpers.devicesOutlet.includes(device.extra.uiid) ||

From 11b0d87125db6674b405d60d5025fdce126a440d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 27 Nov 2020 11:38:03 +0000
Subject: [PATCH 0866/3183] TH as thermostat scaffolding

---
 lib/device/outlet-temp.js |  3 +++
 lib/device/thermostat.js  | 41 ++++++++++++++++++++++++++-------------
 2 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/lib/device/outlet-temp.js b/lib/device/outlet-temp.js
index 9552c8ac..e6bc7c01 100644
--- a/lib/device/outlet-temp.js
+++ b/lib/device/outlet-temp.js
@@ -7,6 +7,9 @@ module.exports = class deviceOutletTemp {
     this.platform = platform
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
+    if (accessory.getService(this.Service.Thermostat)) {
+      accessory.removeService(accessory.getService(this.Service.Thermostat))
+    }
     if ((this.platform.config.hideSwitchFromTH || '').includes(accessory.context.eweDeviceId)) {
       if (accessory.getService(this.Service.Switch)) {
         accessory.removeService(accessory.getService(this.Service.Switch))
diff --git a/lib/device/thermostat.js b/lib/device/thermostat.js
index 5102283a..d17a8b7d 100644
--- a/lib/device/thermostat.js
+++ b/lib/device/thermostat.js
@@ -4,27 +4,40 @@
 const helpers = require('./../helpers')
 module.exports = class deviceThermostat {
   constructor (platform, accessory) {
+    /*
+    ”9.32 Current Heating Cooling State” (page 173)
+    ”9.119 Target Heating Cooling State” (page 230)
+    ”9.35 Current Temperature” (page 175)
+    ”9.121 Target Temperature” (page 231)
+    ”9.122 Temperature Display Units” (page 231)
+    */
     this.platform = platform
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
-    if ((this.platform.config.hideSwitchFromTH || '').includes(accessory.context.eweDeviceId)) {
-      if (accessory.getService(this.Service.Switch)) {
-        accessory.removeService(accessory.getService(this.Service.Switch))
-      }
-    } else {
-      this.switchService = accessory.getService(this.Service.Switch) || accessory.addService(this.Service.Switch)
-      this.switchService
-        .getCharacteristic(this.Characteristic.On)
-        .on('set', this.internalUpdate.bind(this))
+    if (accessory.getService(this.Service.Switch)) {
+      accessory.removeService(accessory.getService(this.Service.Switch))
+    }
+    if (accessory.getService(this.Service.TemperatureSensor)) {
+      accessory.removeService(accessory.getService(this.Service.TemperatureSensor))
+    }
+    if (accessory.getService(this.Service.HumiditySensor)) {
+      accessory.removeService(accessory.getService(this.Service.HumiditySensor))
     }
-    this.tempService = accessory.getService(this.Service.TemperatureSensor) || accessory.addService(this.Service.TemperatureSensor)
-    this.tempService.getCharacteristic(this.Characteristic.CurrentTemperature)
+    this.service = accessory.getService(this.Service.Thermostat) || accessory.addService(this.Service.Thermostat)
+    this.service.getCharacteristic(this.Characteristic.CurrentTemperature)
       .setProps({
         minValue: -100
       })
-    if (accessory.context.sensorType !== 'DS18B20') {
-      this.humiService = accessory.getService(this.Service.HumiditySensor) || accessory.addService(this.Service.HumiditySensor)
-    }
+    
+    this.service
+      .getCharacteristic(this.Characteristic.TargetHeatingCoolingState)
+      .on('set', this.internalStateUpdate.bind(this))
+      .setProps({
+        validValues: [0, 3]
+      })
+    this.service
+      .getCharacteristic(this.Characteristic.TargetTemperature)
+      .on('set', this.internalTempUpdate.bind(this))
     accessory.log = this.platform.log
     accessory.eveLogger = new this.platform.eveService('custom', accessory, {
       storage: 'fs',

From 3fafcc5afe2b81b29696a81b62a2a8825df3e7c3 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Fri, 27 Nov 2020 13:32:07 +0000
Subject: [PATCH 0867/3183] Update README.md

---
 README.md | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index fbfc360a..114c82ac 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,11 @@
 <p align="center">
-   <a href="https://github.com/bwp91/homebridge-ewelink"><img alt="Homebridge Verified" src="https://user-images.githubusercontent.com/43026681/98988978-5e86b600-2520-11eb-875b-0703f4575e97.png" width="600px"></a>
+   <a href="https://github.com/bwp91/homebridge-ewelink"><img alt="Homebridge Verified" src="https://user-images.githubusercontent.com/43026681/100062842-2e94b800-2e28-11eb-83d4-f8490b6bb804.png" width="600px"></a>
 </p>
 <span align="center">
   
 # homebridge-ewelink 
 
-Homebridge/HOOBS plugin to control eWeLink devices with original firmware.
+Homebridge/HOOBS plugin to control eWeLink devices with original firmware
 
 [![verified-by-homebridge](https://badgen.net/badge/homebridge/verified/purple)](https://github.com/homebridge/homebridge/wiki/Verified-Plugins)
 [![hoobs-certified](https://badgen.net/badge/HOOBS/Certified/yellow)](https://plugins.hoobs.org/plugin/homebridge-ewelink)   
@@ -51,11 +51,11 @@ Homebridge/HOOBS plugin to control eWeLink devices with original firmware.
 * [Support Request](https://github.com/bwp91/homebridge-ewelink/issues/new/choose)
 
 ### Credits
-* To the original plugin maintainer: [@gbro115](https://github.com/gbro115)
-* To successive contributors: [@MrTomAsh](https://github.com/MrTomAsh) and [@howanghk](https://github.com/howanghk) for [homebridge-ewelink-max](https://github.com/howanghk/homebridge-ewelink)
-* To the creators/contributors of [Homebridge](https://homebridge.io) who make this plugin possible
-* To the creators/contributors of [Fakegato](https://github.com/simont77/fakegato-history): [@simont77](https://github.com/simont77) and [@NorthernMan54](https://github.com/NorthernMan54)
-* To all users who have shared their devices to enable functionality
+* To the original plugin maintainer: [@gbro115](https://github.com/gbro115).
+* To successive contributors: [@MrTomAsh](https://github.com/MrTomAsh) and [@howanghk](https://github.com/howanghk) for [homebridge-ewelink-max](https://github.com/howanghk/homebridge-ewelink).
+* To the creators/contributors of [Homebridge](https://homebridge.io) who make this plugin possible.
+* To the creators/contributors of [Fakegato](https://github.com/simont77/fakegato-history): [@simont77](https://github.com/simont77) and [@NorthernMan54](https://github.com/NorthernMan54).
+* To all users who have shared their devices to enable functionality.
 
 ### Disclaimer
 * I am in no way affiliated with eWeLink nor any of the device brands (like Sonoff) and this plugin is a personal project that I maintain in my free time.

From 1dce84a682d59e22be2a7f2a30e8e71b2b62a869 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 27 Nov 2020 13:32:38 +0000
Subject: [PATCH 0868/3183] punctuation

---
 lib/homebridge-ui/public/index.html | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/homebridge-ui/public/index.html b/lib/homebridge-ui/public/index.html
index 86d5feae..31242927 100644
--- a/lib/homebridge-ui/public/index.html
+++ b/lib/homebridge-ui/public/index.html
@@ -88,11 +88,11 @@ <h4>About</h4>
   </ul>
   <h4>Credits</h4>
   <ul>
-    <li>To the original plugin maintainer: <a href="https://github.com/gbro115" target="_blank">@gbro115</a></li>
-    <li>To successive contributors: <a href="https://github.com/MrTomAsh" target="_blank">@MrTomAsh</a> and <a href="https://github.com/howanghk" target="_blank">@howanghk</a> for <a href="https://github.com/howanghk/homebridge-ewelink" target="_blank">homebridge-ewelink-max</a></li>
-    <li>To the creators/contributors of <a href="https://homebridge.io" target="_blank">Homebridge</a> who make this plugin possible</li>
-    <li>To the creators/contributors of <a href="https://github.com/simont77/fakegato-history" target="_blank">Fakegato</a>: <a href="https://github.com/simont77" target="_blank">@simont77</a> and <a href="https://github.com/NorthernMan54" target="_blank">@NorthernMan54</a></li>
-    <li>To all users who have shared their devices to enable functionality</li>
+    <li>To the original plugin maintainer: <a href="https://github.com/gbro115" target="_blank">@gbro115</a>.</li>
+    <li>To successive contributors: <a href="https://github.com/MrTomAsh" target="_blank">@MrTomAsh</a> and <a href="https://github.com/howanghk" target="_blank">@howanghk</a> for <a href="https://github.com/howanghk/homebridge-ewelink" target="_blank">homebridge-ewelink-max</a>.</li>
+    <li>To the creators/contributors of <a href="https://homebridge.io" target="_blank">Homebridge</a> who make this plugin possible.</li>
+    <li>To the creators/contributors of <a href="https://github.com/simont77/fakegato-history" target="_blank">Fakegato</a>: <a href="https://github.com/simont77" target="_blank">@simont77</a> and <a href="https://github.com/NorthernMan54" target="_blank">@NorthernMan54</a>.</li>
+    <li>To all users who have shared their devices to enable functionality.</li>
   </ul>
     
   <h4>Disclaimer</h4>

From 320e31f6544424c5a9b1366cbe11bc9656282717 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 27 Nov 2020 15:14:19 +0000
Subject: [PATCH 0869/3183] outlet as thermostat

---
 lib/device/thermostat.js | 49 ++++++++++++++++++++++++++--------------
 1 file changed, 32 insertions(+), 17 deletions(-)

diff --git a/lib/device/thermostat.js b/lib/device/thermostat.js
index d17a8b7d..a4601b04 100644
--- a/lib/device/thermostat.js
+++ b/lib/device/thermostat.js
@@ -4,13 +4,6 @@
 const helpers = require('./../helpers')
 module.exports = class deviceThermostat {
   constructor (platform, accessory) {
-    /*
-    ”9.32 Current Heating Cooling State” (page 173)
-    ”9.119 Target Heating Cooling State” (page 230)
-    ”9.35 Current Temperature” (page 175)
-    ”9.121 Target Temperature” (page 231)
-    ”9.122 Temperature Display Units” (page 231)
-    */
     this.platform = platform
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
@@ -23,21 +16,27 @@ module.exports = class deviceThermostat {
     if (accessory.getService(this.Service.HumiditySensor)) {
       accessory.removeService(accessory.getService(this.Service.HumiditySensor))
     }
+    accessory.removeService(accessory.getService(this.Service.Thermostat))
     this.service = accessory.getService(this.Service.Thermostat) || accessory.addService(this.Service.Thermostat)
     this.service.getCharacteristic(this.Characteristic.CurrentTemperature)
       .setProps({
         minValue: -100
       })
-    
     this.service
       .getCharacteristic(this.Characteristic.TargetHeatingCoolingState)
-      .on('set', this.internalStateUpdate.bind(this))
+      .on('set', this.internalOnOffUpdate.bind(this))
       .setProps({
-        validValues: [0, 3]
+        validValues: [0, 1]
       })
     this.service
       .getCharacteristic(this.Characteristic.TargetTemperature)
       .on('set', this.internalTempUpdate.bind(this))
+    if (
+      accessory.context.sensorType !== 'DS18B20' &&
+      !this.service.testCharacteristic(this.Characteristic.CurrentRelativeHumidity)
+    ) {
+      accessory.addCharacteristic(this.Characteristic.CurrentRelativeHumidity)
+    }
     accessory.log = this.platform.log
     accessory.eveLogger = new this.platform.eveService('custom', accessory, {
       storage: 'fs',
@@ -46,12 +45,12 @@ module.exports = class deviceThermostat {
     this.accessory = accessory
   }
 
-  async internalUpdate (value, callback) {
+  async internalOnOffUpdate (value, callback) {
     try {
       callback()
       const params = {
-        switch: value ? 'on' : 'off',
-        mainSwitch: value ? 'on' : 'off'
+        switch: value === 1 ? 'on' : 'off',
+        mainSwitch: value === 1 ? 'on' : 'off'
       }
       await this.platform.sendDeviceUpdate(this.accessory, params)
     } catch (err) {
@@ -59,6 +58,19 @@ module.exports = class deviceThermostat {
     }
   }
 
+  async internalTempUpdate (value, callback) {
+    try {
+      callback()
+      await helpers.sleep(500)
+      this.service.updateCharacteristic(
+        this.Characteristic.TargetTemperature,
+        this.service.getCharacteristic(this.Characteristic.CurrentTemperature).value
+      )
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, true)
+    }
+  }
+
   async externalUpdate (params) {
     try {
       if (
@@ -66,19 +78,22 @@ module.exports = class deviceThermostat {
         (helpers.hasProperty(params, 'switch') || helpers.hasProperty(params, 'mainSwitch'))
       ) {
         const newState = helpers.hasProperty(params, 'switch') ? params.switch === 'on' : params.mainSwitch === 'on'
-        this.switchService.updateCharacteristic(this.Characteristic.On, newState)
+        this.service.updateCharacteristic(this.Characteristic.TargetHeatingCoolingState, newState ? 1 : 0)
         this.accessory.eveLogger.addEntry({
           time: Math.round(new Date().valueOf() / 1000),
           status: newState ? 1 : 0
         })
       }
       const eveLog = { time: Math.round(new Date().valueOf() / 1000) }
-      if (helpers.hasProperty(params, 'currentTemperature') && this.accessory.getService(this.Service.TemperatureSensor)) {
+      if (helpers.hasProperty(params, 'currentTemperature')) {
         const currentTemp = parseFloat(params.currentTemperature !== 'unavailable' ? params.currentTemperature : 0)
-        this.tempService.updateCharacteristic(this.Characteristic.CurrentTemperature, currentTemp)
+        this.service.updateCharacteristic(this.Characteristic.CurrentTemperature, currentTemp)
+        this.service.updateCharacteristic(this.Characteristic.TargetTemperature, currentTemp)
         eveLog.temp = currentTemp
       }
-      if (helpers.hasProperty(params, 'currentHumidity') && this.accessory.getService(this.Service.HumiditySensor)) {
+      if (
+        helpers.hasProperty(params, 'currentHumidity') && this.service.testCharacteristic(this.Characteristic.CurrentRelativeHumidity)
+      ) {
         const currentHumi = parseFloat(params.currentHumidity !== 'unavailable' ? params.currentHumidity : 0)
         this.humiService.updateCharacteristic(this.Characteristic.CurrentRelativeHumidity, currentHumi)
         eveLog.humidity = currentHumi

From 03c1e7e1130db0d96914fc87222447130eb16a89 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 27 Nov 2020 15:15:39 +0000
Subject: [PATCH 0870/3183] reverse logic

---
 lib/device/thermostat.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/device/thermostat.js b/lib/device/thermostat.js
index a4601b04..059a67ef 100644
--- a/lib/device/thermostat.js
+++ b/lib/device/thermostat.js
@@ -49,8 +49,8 @@ module.exports = class deviceThermostat {
     try {
       callback()
       const params = {
-        switch: value === 1 ? 'on' : 'off',
-        mainSwitch: value === 1 ? 'on' : 'off'
+        switch: value === 0 ? 'off' : 'on',
+        mainSwitch: value === 0 ? 'off' : 'on'
       }
       await this.platform.sendDeviceUpdate(this.accessory, params)
     } catch (err) {

From 224d42c1f906da335d662caaeae39c13aea555b2 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 27 Nov 2020 15:16:26 +0000
Subject: [PATCH 0871/3183] 3.15.1-0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 3be50705..58bb0a07 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.15.0",
+  "version": "3.15.1-0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index e9ca8a27..66a48e3b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.15.0",
+  "version": "3.15.1-0",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 5746e0885029d0537a8fbeb804fe1f6b53421718 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 27 Nov 2020 17:31:03 +0000
Subject: [PATCH 0872/3183] tidy for release

---
 lib/device/thermostat.js | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/lib/device/thermostat.js b/lib/device/thermostat.js
index 059a67ef..f045421f 100644
--- a/lib/device/thermostat.js
+++ b/lib/device/thermostat.js
@@ -16,7 +16,6 @@ module.exports = class deviceThermostat {
     if (accessory.getService(this.Service.HumiditySensor)) {
       accessory.removeService(accessory.getService(this.Service.HumiditySensor))
     }
-    accessory.removeService(accessory.getService(this.Service.Thermostat))
     this.service = accessory.getService(this.Service.Thermostat) || accessory.addService(this.Service.Thermostat)
     this.service.getCharacteristic(this.Characteristic.CurrentTemperature)
       .setProps({
@@ -79,10 +78,6 @@ module.exports = class deviceThermostat {
       ) {
         const newState = helpers.hasProperty(params, 'switch') ? params.switch === 'on' : params.mainSwitch === 'on'
         this.service.updateCharacteristic(this.Characteristic.TargetHeatingCoolingState, newState ? 1 : 0)
-        this.accessory.eveLogger.addEntry({
-          time: Math.round(new Date().valueOf() / 1000),
-          status: newState ? 1 : 0
-        })
       }
       const eveLog = { time: Math.round(new Date().valueOf() / 1000) }
       if (helpers.hasProperty(params, 'currentTemperature')) {

From d7d654154420961f688b43253bc2ce6d14337067 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 27 Nov 2020 17:32:02 +0000
Subject: [PATCH 0873/3183] 3.15.1-1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 58bb0a07..8f21e5bc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.15.1-0",
+  "version": "3.15.1-1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 66a48e3b..a0705cf4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.15.1-0",
+  "version": "3.15.1-1",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 92d0e9c806fd386ee228955c145d010993d14321 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 30 Nov 2020 11:58:44 +0000
Subject: [PATCH 0874/3183] option to disable lan mode

---
 config.schema.json      | 7 +++++++
 lib/ewelink-platform.js | 8 +++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 0ab0e3fa..e613d444 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -48,6 +48,12 @@
         "description": "If checked, devices will not be refreshed with their most recent status from eWeLink on startup. This setting can be useful for users who block their devices from accessing the internet.",
         "default": false
       },
+      "disableLANMode": {
+        "type": "boolean",
+        "title": "Disable LAN Mode",
+        "description": "If checked, all device updates will be sent straight to the cloud.",
+        "default": false
+      },
       "disablePlugin": {
         "title": "Disable Plugin",
         "type": "boolean",
@@ -372,6 +378,7 @@
         "debug",
         "debugReqRes",
         "disableHTTPRefresh",
+        "disableLANMode",
         "disablePlugin"
       ]
     },
diff --git a/lib/ewelink-platform.js b/lib/ewelink-platform.js
index b1f1a8bc..6f98b405 100644
--- a/lib/ewelink-platform.js
+++ b/lib/ewelink-platform.js
@@ -670,9 +670,11 @@ module.exports = class eWeLinkPlatform {
     }
 
     // *** Quick check to see if LAN mode is supported *** \\
-    const res = helpers.devicesNonLAN.includes(accessory.context.eweUIID)
-      ? 'LAN mode is not supported for this device'
-      : await this.lanClient.sendUpdate(payload)
+    const res = this.config.disableLANMode
+      ? 'LAN mode is disabled'
+      : helpers.devicesNonLAN.includes(accessory.context.eweUIID)
+        ? 'LAN mode is not supported for this device'
+        : await this.lanClient.sendUpdate(payload)
 
     // *** Revert to WS if LAN mode not possible for whatever reason *** \\
     if (res !== 'ok') {

From 6ee227810a1d17997563da2dd8b93205e86c5b72 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 30 Nov 2020 13:39:04 +0000
Subject: [PATCH 0875/3183] add 3s timeout for lan mode

---
 lib/ewelink-lan.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/ewelink-lan.js b/lib/ewelink-lan.js
index e8e85045..cb51a992 100644
--- a/lib/ewelink-lan.js
+++ b/lib/ewelink-lan.js
@@ -152,7 +152,8 @@ module.exports = class eWeLinkLAN {
             Accept: 'application/json',
             'Content-Type': 'application/json'
           },
-          data
+          data,
+          timeout: 3000
         })
         if (!helpers.hasProperty(res.data, 'error') || res.data.error !== 0) {
           throw new Error(res.data)

From d87266b3381582ddc6f8a968275852ad74f3681c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 30 Nov 2020 13:39:46 +0000
Subject: [PATCH 0876/3183] 3.15.1-2

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 8f21e5bc..c36e36c5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.15.1-1",
+  "version": "3.15.1-2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index a0705cf4..faa19cd0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.15.1-1",
+  "version": "3.15.1-2",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From f7e36b0ec5b226d6610e0a87bc2823b52b059dc4 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 1 Dec 2020 10:12:16 +0000
Subject: [PATCH 0877/3183] calibrate delays

---
 lib/device/blind.js         |  1 -
 lib/device/diffuser.js      | 10 +++++-----
 lib/device/garage-four.js   |  4 ++--
 lib/device/light-colour.js  |  8 ++++----
 lib/device/light-ctemp.js   |  8 ++++----
 lib/device/light-dimmer.js  |  2 +-
 lib/device/switch-multi.js  |  2 +-
 lib/device/switch-single.js |  2 +-
 8 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/lib/device/blind.js b/lib/device/blind.js
index 04139820..ef39c740 100644
--- a/lib/device/blind.js
+++ b/lib/device/blind.js
@@ -60,7 +60,6 @@ module.exports = class deviceBlind {
       this.accessory.context.cacheTargetPosition = newTarget
       this.accessory.context.cachePositionState = setToMoveUp ? 1 : 0
       this.accessory.context.cacheLastStartTime = Math.floor(Date.now() / 100)
-      if (this.accessory.context.updateKey !== updateKey) return
       await helpers.sleep(decisecondsToMove * 100)
       if (this.accessory.context.updateKey !== updateKey) return
       params.switches[0].switch = 'off'
diff --git a/lib/device/diffuser.js b/lib/device/diffuser.js
index f63e509e..3c6ee35b 100644
--- a/lib/device/diffuser.js
+++ b/lib/device/diffuser.js
@@ -47,7 +47,7 @@ module.exports = class deviceDiffuser {
 
   async internalDiffuserStateUpdate (value, callback) {
     try {
-      await helpers.sleep(1000)
+      await helpers.sleep(750)
       callback()
       if (value === 0) return
       value = value <= 75 ? 50 : 100
@@ -71,14 +71,14 @@ module.exports = class deviceDiffuser {
 
   async internalLightBrightnessUpdate (value, callback) {
     try {
-      await helpers.sleep(2000)
+      await helpers.sleep(1500)
       callback()
       const updateKeyBright = Math.random().toString(36).substr(2, 8)
       this.accessory.context.updateKeyBright = updateKeyBright
       const params = {
         lightbright: value
       }
-      await helpers.sleep(500)
+      await helpers.sleep(350)
       if (updateKeyBright !== this.accessory.context.updateKeyBright) return
       await this.platform.sendDeviceUpdate(this.accessory, params)
     } catch (err) {
@@ -88,7 +88,7 @@ module.exports = class deviceDiffuser {
 
   async internalLightColourUpdate (value, callback) {
     try {
-      await helpers.sleep(2000)
+      await helpers.sleep(1500)
       callback()
       const updateKeyColour = Math.random().toString(36).substr(2, 8)
       this.accessory.context.updateKeyColour = updateKeyColour
@@ -102,7 +102,7 @@ module.exports = class deviceDiffuser {
         lightGcolor: newRGB[1],
         lightBcolor: newRGB[2]
       }
-      await helpers.sleep(1000)
+      await helpers.sleep(700)
       if (updateKeyColour !== this.accessory.context.updateKeyColour) return
       await this.platform.sendDeviceUpdate(this.accessory, params)
     } catch (err) {
diff --git a/lib/device/garage-four.js b/lib/device/garage-four.js
index 7495f4cc..0bb439e2 100644
--- a/lib/device/garage-four.js
+++ b/lib/device/garage-four.js
@@ -79,9 +79,9 @@ module.exports = class deviceGarageFour {
       const params = { switches: helpers.defaultMultiSwitchOff }
       ;[0, 1, 2, 3].forEach(i => (params.switches[i].switch = garageChannel === i ? 'on' : 'off'))
       await this.platform.sendDeviceUpdate(this.accessory, params)
-      await helpers.sleep(1000)
+      await helpers.sleep(2000)
       this.accessory.context.inUse = false
-      await helpers.sleep(Math.max((garageConfig.operationTime - 10) * 100, 0))
+      await helpers.sleep(Math.max((garageConfig.operationTime - 20) * 100, 0))
       if (this.accessory.context.updateKey !== updateKey || sAccessory) return
       if (!sAccessory) {
         gdService.updateCharacteristic(this.Characteristic.CurrentDoorState, value)
diff --git a/lib/device/light-colour.js b/lib/device/light-colour.js
index 49bea70a..1bf587eb 100644
--- a/lib/device/light-colour.js
+++ b/lib/device/light-colour.js
@@ -51,7 +51,7 @@ module.exports = class deviceLightColour {
   async internalBrightnessUpdate (value, callback) {
     try {
       let params
-      await helpers.sleep(1000)
+      await helpers.sleep(750)
       callback()
       const updateKeyBright = Math.random().toString(36).substr(2, 8)
       this.accessory.context.updateKeyBright = updateKeyBright
@@ -79,7 +79,7 @@ module.exports = class deviceLightColour {
           }
           break
       }
-      await helpers.sleep(500)
+      await helpers.sleep(350)
       if (updateKeyBright !== this.accessory.context.updateKeyBright) return
       await this.platform.sendDeviceUpdate(this.accessory, params)
     } catch (err) {
@@ -89,7 +89,7 @@ module.exports = class deviceLightColour {
 
   async internalHueUpdate (value, callback) {
     try {
-      await helpers.sleep(2000)
+      await helpers.sleep(1500)
       callback()
       let params
       const newRGB = convert.hsv.rgb(value, this.lightService.getCharacteristic(this.Characteristic.Saturation).value, 100)
@@ -133,7 +133,7 @@ module.exports = class deviceLightColour {
           this.accessory.context.cacheB = newRGB[2]
           break
       }
-      await helpers.sleep(1000)
+      await helpers.sleep(350)
       if (updateKeyColour !== this.accessory.context.updateKeyColour) return
       await this.platform.sendDeviceUpdate(this.accessory, params)
     } catch (err) {
diff --git a/lib/device/light-ctemp.js b/lib/device/light-ctemp.js
index e0ab6553..cb550569 100644
--- a/lib/device/light-ctemp.js
+++ b/lib/device/light-ctemp.js
@@ -36,7 +36,7 @@ module.exports = class deviceLightColour {
 
   async internalBrightnessUpdate (value, callback) {
     try {
-      await helpers.sleep(1000)
+      await helpers.sleep(750)
       callback()
       if (this.lastSentBrightness === value) return
       this.lastSentBrightness = value
@@ -50,7 +50,7 @@ module.exports = class deviceLightColour {
           ct: this.accessory.context.cacheCT
         }
       }
-      await helpers.sleep(500)
+      await helpers.sleep(350)
       if (updateKeyBright !== this.accessory.context.updateKeyBright) return
       await this.platform.sendDeviceUpdate(this.accessory, params)
     } catch (err) {
@@ -60,7 +60,7 @@ module.exports = class deviceLightColour {
 
   async internalColourTempUpdate (value, callback) {
     try {
-      await helpers.sleep(2000)
+      await helpers.sleep(1500)
       callback()
       if (this.lastSentColour === value) return
       this.lastSentColour = value
@@ -81,7 +81,7 @@ module.exports = class deviceLightColour {
         }
       }
       this.accessory.context.cacheCT = kToCT
-      await helpers.sleep(1000)
+      await helpers.sleep(350)
       if (updateKeyColour !== this.updateKeyColour) return
       await this.platform.sendDeviceUpdate(this.accessory, params)
     } catch (err) {
diff --git a/lib/device/light-dimmer.js b/lib/device/light-dimmer.js
index 077832cc..4e945231 100644
--- a/lib/device/light-dimmer.js
+++ b/lib/device/light-dimmer.js
@@ -43,7 +43,7 @@ module.exports = class deviceLightDimmer {
           params.mode = 0
           break
       }
-      await helpers.sleep(500)
+      await helpers.sleep(350)
       if (updateKey !== this.accessory.context.updateKey) return
       await this.platform.sendDeviceUpdate(this.accessory, params)
     } catch (err) {
diff --git a/lib/device/switch-multi.js b/lib/device/switch-multi.js
index 337b5c88..09ec9c1a 100644
--- a/lib/device/switch-multi.js
+++ b/lib/device/switch-multi.js
@@ -27,7 +27,7 @@ module.exports = class deviceSwitchMulti {
 
   async internalUpdate (value, callback) {
     try {
-      await helpers.sleep(Math.floor(Math.random() * 741 + 10))
+      await helpers.sleep(Math.floor(Math.random() * 491 + 10))
       callback()
       let oAccessory
       let masterState = 'off'
diff --git a/lib/device/switch-single.js b/lib/device/switch-single.js
index c39090a3..ec654f83 100644
--- a/lib/device/switch-single.js
+++ b/lib/device/switch-single.js
@@ -27,7 +27,7 @@ module.exports = class deviceSwitchSingle {
 
   async internalUpdate (value, callback) {
     try {
-      await helpers.sleep(Math.floor(Math.random() * 741 + 10))
+      await helpers.sleep(Math.floor(Math.random() * 491 + 10))
       callback()
       const params = { switch: value ? 'on' : 'off' }
       await this.platform.sendDeviceUpdate(this.accessory, params)

From d4301e80cfa8a06f99fde63bea209cde1dabe62b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 1 Dec 2020 10:12:30 +0000
Subject: [PATCH 0878/3183] reinstate small delay

---
 lib/ewelink-platform.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/ewelink-platform.js b/lib/ewelink-platform.js
index 6f98b405..84acd015 100644
--- a/lib/ewelink-platform.js
+++ b/lib/ewelink-platform.js
@@ -662,6 +662,9 @@ module.exports = class eWeLinkPlatform {
   }
 
   async sendDeviceUpdate (accessory, params) {
+    // *** Add a random delay of [1, 250]ms to avoid multiple http/ws requests a la vez
+    await helpers.sleep(Math.floor(Math.random() * 250 + 1))
+    
     // *** Set up the payload to send via LAN/WS *** \\
     const payload = {
       apikey: accessory.context.eweApiKey,

From 8afa8afc93e0e05ee5f9848ecd6ca0db29d22e89 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 1 Dec 2020 10:13:21 +0000
Subject: [PATCH 0879/3183] 3.15.1-3

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c36e36c5..30c82735 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.15.1-2",
+  "version": "3.15.1-3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index faa19cd0..e42188da 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.15.1-2",
+  "version": "3.15.1-3",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From c3e77b21e1f47e6496dc6e03a62dd8699bbad22f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 1 Dec 2020 15:27:48 +0000
Subject: [PATCH 0880/3183] formatting

---
 lib/ewelink-platform.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ewelink-platform.js b/lib/ewelink-platform.js
index 84acd015..eed412b7 100644
--- a/lib/ewelink-platform.js
+++ b/lib/ewelink-platform.js
@@ -664,7 +664,7 @@ module.exports = class eWeLinkPlatform {
   async sendDeviceUpdate (accessory, params) {
     // *** Add a random delay of [1, 250]ms to avoid multiple http/ws requests a la vez
     await helpers.sleep(Math.floor(Math.random() * 250 + 1))
-    
+
     // *** Set up the payload to send via LAN/WS *** \\
     const payload = {
       apikey: accessory.context.eweApiKey,

From 5b2041f2e81f1771282e6fedcc7d8c4de5853b26 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 1 Dec 2020 15:28:45 +0000
Subject: [PATCH 0881/3183] Update package-lock.json

---
 package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 30c82735..ad3e248c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -150,9 +150,9 @@
       "integrity": "sha512-fZvDqy19zyaiSXajmRjwue1VWLrJcy8bTV/LJVtAx8DeEFVlXRBMyZknW+q6CEfiW8Y4MQDDKh9x5wF32BHAHQ=="
     },
     "object-inspect": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.8.0.tgz",
-      "integrity": "sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA=="
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.9.0.tgz",
+      "integrity": "sha512-i3Bp9iTqwhaLZBxGkRfo5ZbE07BQRT7MGu8+nNgwW9ItGp1TzCTw2DLEoWwjClxBjOFI/hWljTAmYGCEwmtnOw=="
     },
     "object-keys": {
       "version": "1.1.1",

From f976d1980ae95a56879622af39fa9a6b8ab019b7 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 1 Dec 2020 15:29:27 +0000
Subject: [PATCH 0882/3183] 3.16.0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ad3e248c..c3802f91 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.15.1-3",
+  "version": "3.16.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index e42188da..bb143ae7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.15.1-3",
+  "version": "3.16.0",
   "author": "bwp91",
   "contributors": [
     "gbro115",

From 0ca7662adf84866fb7ef9cb3f0b9762c0c79a65b Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Wed, 2 Dec 2020 08:17:30 +0000
Subject: [PATCH 0883/3183] Create label-commenter-config.yml

---
 .github/label-commenter-config.yml | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .github/label-commenter-config.yml

diff --git a/.github/label-commenter-config.yml b/.github/label-commenter-config.yml
new file mode 100644
index 00000000..77711680
--- /dev/null
+++ b/.github/label-commenter-config.yml
@@ -0,0 +1,5 @@
+labels:
+  - name: complete
+    labeled:
+      issue:
+        body: This issue has been marked as complete as I believe the original query has been fixed/answered or will not be actioned. The issue will be closed in three days. If you feel the issue requires further attention then please let me know. Thanks!

From 20792f78813c4e9da84211d2b0c67f5e73548f01 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Wed, 2 Dec 2020 08:17:49 +0000
Subject: [PATCH 0884/3183] Create label-commenter.yml

---
 .github/workflows/label-commenter.yml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 .github/workflows/label-commenter.yml

diff --git a/.github/workflows/label-commenter.yml b/.github/workflows/label-commenter.yml
new file mode 100644
index 00000000..d0a313c6
--- /dev/null
+++ b/.github/workflows/label-commenter.yml
@@ -0,0 +1,16 @@
+on:
+  issues:
+    types:
+      - labeled
+      - unlabeled
+
+jobs:
+  comment:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Label Commenter
+        uses: peaceiris/actions-label-commenter@v1
+        with:
+          config_file: .github/label-commenter-config.yml

From 871fb4be5df9bc2ded26735662ccd1bd92fd197f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 2 Dec 2020 09:52:40 +0000
Subject: [PATCH 0885/3183] file/dir structure

---
 lib/{ewelink-http.js => connection/http.js} |  56 +++---
 lib/{ewelink-lan.js => connection/lan.js}   |  34 ++--
 lib/{ewelink-ws.js => connection/ws.js}     |  40 ++--
 lib/device/blind.js                         |   7 +-
 lib/device/curtain.js                       |   5 +-
 lib/device/diffuser.js                      |  29 +--
 lib/device/fan.js                           |   9 +-
 lib/device/garage-eachen.js                 |   9 +-
 lib/device/garage-four.js                   |  11 +-
 lib/device/garage-two.js                    |  11 +-
 lib/device/garage.js                        |  15 +-
 lib/device/light-colour.js                  |  37 ++--
 lib/device/light-ctemp.js                   |  23 +--
 lib/device/light-dimmer.js                  |  11 +-
 lib/device/lock.js                          |   9 +-
 lib/device/outlet-temp.js                   |  15 +-
 lib/device/outlet.js                        |  21 +-
 lib/device/rf-bridge.js                     |  37 ++--
 lib/device/scm.js                           |   9 +-
 lib/device/sensor.js                        |  15 +-
 lib/device/switch-multi.js                  |  13 +-
 lib/device/switch-single.js                 |   9 +-
 lib/device/switch-valve.js                  |  11 +-
 lib/device/template.js                      |   2 +
 lib/device/thermostat.js                    |  17 +-
 lib/device/usb.js                           |   9 +-
 lib/device/valve-two.js                     |   7 +-
 lib/device/valve.js                         |   5 +-
 lib/device/zb-dev.js                        |  37 ++--
 index.js => lib/index.js                    |   3 +-
 lib/{ewelink-platform.js => platform.js}    | 200 +++++++++-----------
 lib/{ => utils}/helpers.js                  |   0
 package.json                                |  21 +-
 33 files changed, 358 insertions(+), 379 deletions(-)
 rename lib/{ewelink-http.js => connection/http.js} (83%)
 rename lib/{ewelink-lan.js => connection/lan.js} (80%)
 rename lib/{ewelink-ws.js => connection/ws.js} (86%)
 rename index.js => lib/index.js (61%)
 rename lib/{ewelink-platform.js => platform.js} (81%)
 rename lib/{ => utils}/helpers.js (100%)

diff --git a/lib/ewelink-http.js b/lib/connection/http.js
similarity index 83%
rename from lib/ewelink-http.js
rename to lib/connection/http.js
index 6a6a48c5..8c56cabb 100644
--- a/lib/ewelink-http.js
+++ b/lib/connection/http.js
@@ -3,11 +3,11 @@
 'use strict'
 const axios = require('axios')
 const crypto = require('crypto')
-const helpers = require('./helpers')
-module.exports = class eWeLinkHTTP {
-  constructor (config, log) {
+module.exports = class connectionHTTP {
+  constructor (config, log, helpers) {
     // *** Set up our variables *** \\
     this.log = log
+    this.helpers = helpers
     this.debug = config.debug || false
     this.debugReqRes = config.debugReqRes || false
     this.username = config.username.toString()
@@ -19,7 +19,7 @@ module.exports = class eWeLinkHTTP {
   async getHost () {
     // *** Used to get the user's regional (continent) HTTP API host *** \\
     const params = {
-      appid: helpers.appId,
+      appid: this.helpers.appId,
       country_code: this.cCode,
       nonce: Math.random().toString(36).substr(2, 8),
       ts: Math.floor(new Date().getTime() / 1000),
@@ -37,7 +37,7 @@ module.exports = class eWeLinkHTTP {
       })
       dataToSign.sort((a, b) => (a.key < b.key ? -1 : 1))
       dataToSign = dataToSign.map(k => k.key + '=' + k.value).join('&')
-      dataToSign = crypto.createHmac('sha256', helpers.appSecret).update(dataToSign).digest('base64')
+      dataToSign = crypto.createHmac('sha256', this.helpers.appSecret).update(dataToSign).digest('base64')
 
       // *** Log the data depending on the debug setting *** \\
       if (this.debugReqRes) {
@@ -74,10 +74,10 @@ module.exports = class eWeLinkHTTP {
       }
       if (this.debug) this.log('HTTP API host received [%s].', this.httpHost)
     } catch (err) {
-      if (helpers.hasProperty(err, 'code') && helpers.httpRetryCodes.includes(err.code)) {
+      if (this.helpers.hasProperty(err, 'code') && this.helpers.httpRetryCodes.includes(err.code)) {
         // *** Retry if another attempt could be successful *** \\
         if (this.debug) this.log.warn('Unable to reach eWeLink. Retrying in 30 seconds.')
-        await helpers.sleep(30000)
+        await this.helpers.sleep(30000)
         return await this.getHost()
       } else {
         throw err
@@ -107,24 +107,24 @@ module.exports = class eWeLinkHTTP {
     }
 
     // *** Set up the request signature *** \\
-    const dataToSign = crypto.createHmac('sha256', helpers.appSecret).update(JSON.stringify(data)).digest('base64')
+    const dataToSign = crypto.createHmac('sha256', this.helpers.appSecret).update(JSON.stringify(data)).digest('base64')
 
     // *** Send the request *** \\
     const res = await axios.post('https://' + this.httpHost + '/v2/user/login', data, {
       headers: {
         Authorization: 'Sign ' + dataToSign,
         'Content-Type': 'application/json',
-        'X-CK-Appid': helpers.appId,
+        'X-CK-Appid': this.helpers.appId,
         'X-CK-Nonce': Math.random().toString(36).substr(2, 8)
       }
     })
     // *** Parse the response *** \\
     const body = res.data
     if (
-      helpers.hasProperty(body, 'error') &&
+      this.helpers.hasProperty(body, 'error') &&
       body.error === 10004 &&
-      helpers.hasProperty(body, 'data') &&
-      helpers.hasProperty(body.data, 'region')
+      this.helpers.hasProperty(body, 'data') &&
+      this.helpers.hasProperty(body.data, 'region')
     ) {
       // *** In this case the user has been given a different region so retry login *** \\
       const givenRegion = body.data.region
@@ -156,7 +156,7 @@ module.exports = class eWeLinkHTTP {
         if (body.error === 500) {
           // *** Retry if another attempt could be successful *** \\
           if (this.debug) this.log.warn('An eWeLink error [500] occured. Retrying in 30 seconds.')
-          await helpers.sleep(30000)
+          await this.helpers.sleep(30000)
           return await this.login()
         } else {
           throw new Error('No auth token received.\n' + JSON.stringify(body, null, 2))
@@ -173,7 +173,7 @@ module.exports = class eWeLinkHTTP {
         headers: {
           Authorization: 'Bearer ' + this.aToken,
           'Content-Type': 'application/json',
-          'X-CK-Appid': helpers.appId,
+          'X-CK-Appid': this.helpers.appId,
           'X-CK-Nonce': Math.random().toString(36).substr(2, 8)
         }
       })
@@ -181,9 +181,9 @@ module.exports = class eWeLinkHTTP {
       // *** Parse the response *** \\
       const body = res.data
       if (
-        !helpers.hasProperty(body, 'data') ||
-        !helpers.hasProperty(body, 'error') ||
-        (helpers.hasProperty(body, 'error') && body.error !== 0)
+        !this.helpers.hasProperty(body, 'data') ||
+        !this.helpers.hasProperty(body, 'error') ||
+        (this.helpers.hasProperty(body, 'error') && body.error !== 0)
       ) {
         throw new Error(JSON.stringify(body, null, 2))
       }
@@ -195,9 +195,9 @@ module.exports = class eWeLinkHTTP {
         body.data.thingList.forEach(d => {
           // *** Check each item is a device and also remove any devices the user has ignored *** \\
           if (
-            helpers.hasProperty(d, 'itemData') &&
-            helpers.hasProperty(d.itemData, 'extra') &&
-            helpers.hasProperty(d.itemData.extra, 'uiid') &&
+            this.helpers.hasProperty(d, 'itemData') &&
+            this.helpers.hasProperty(d.itemData, 'extra') &&
+            this.helpers.hasProperty(d.itemData.extra, 'uiid') &&
             !this.hideDevFromHB.includes(d.itemData.deviceid)
           ) {
             // *** Separate the sensors as these need to be set up last *** \\
@@ -213,10 +213,10 @@ module.exports = class eWeLinkHTTP {
       // *** Sensors need to go last as they update garages that need to exist already *** \\
       return deviceList.concat(sensorList)
     } catch (err) {
-      if (helpers.hasProperty(err, 'code') && helpers.httpRetryCodes.includes(err.code)) {
+      if (this.helpers.hasProperty(err, 'code') && this.helpers.httpRetryCodes.includes(err.code)) {
         // *** Retry if another attempt could be successful *** \\
         if (this.debug) this.log.warn('Unable to reach eWeLink. Retrying in 30 seconds.')
-        await helpers.sleep(30000)
+        await this.helpers.sleep(30000)
         return await this.getDevices()
       } else {
         throw err
@@ -237,7 +237,7 @@ module.exports = class eWeLinkHTTP {
         headers: {
           Authorization: 'Bearer ' + this.aToken,
           'Content-Type': 'application/json',
-          'X-CK-Appid': helpers.appId,
+          'X-CK-Appid': this.helpers.appId,
           'X-CK-Nonce': Math.random().toString(36).substr(2, 8)
         }
       })
@@ -245,9 +245,9 @@ module.exports = class eWeLinkHTTP {
       // *** Parse the response *** \\
       const body = res.data
       if (
-        !helpers.hasProperty(body, 'data') ||
-        !helpers.hasProperty(body, 'error') ||
-        (helpers.hasProperty(body, 'error') && body.error !== 0)
+        !this.helpers.hasProperty(body, 'data') ||
+        !this.helpers.hasProperty(body, 'error') ||
+        (this.helpers.hasProperty(body, 'error') && body.error !== 0)
       ) {
         throw new Error(JSON.stringify(body, null, 2))
       }
@@ -258,10 +258,10 @@ module.exports = class eWeLinkHTTP {
         throw new Error('device not found in eWeLink')
       }
     } catch (err) {
-      if (helpers.hasProperty(err, 'code') && helpers.httpRetryCodes.includes(err.code)) {
+      if (this.helpers.hasProperty(err, 'code') && this.helpers.httpRetryCodes.includes(err.code)) {
         // *** Retry if another attempt could be successful *** \\
         if (this.debug) this.log.warn('Unable to reach eWeLink. Retrying in 30 seconds.')
-        await helpers.sleep(30000)
+        await this.helpers.sleep(30000)
         return await this.getDevice(deviceId)
       } else {
         throw err
diff --git a/lib/ewelink-lan.js b/lib/connection/lan.js
similarity index 80%
rename from lib/ewelink-lan.js
rename to lib/connection/lan.js
index cb51a992..57996ce9 100644
--- a/lib/ewelink-lan.js
+++ b/lib/connection/lan.js
@@ -5,11 +5,11 @@ const axios = require('axios')
 const crypto = require('crypto')
 const dns = require('node-dns-sd')
 const eventEmitter = require('events')
-const helpers = require('./helpers')
-module.exports = class eWeLinkLAN {
-  constructor (config, log, devices) {
+module.exports = class connectionLAN {
+  constructor (config, log, helpers, devices) {
     this.log = log
     this.config = config
+    this.helpers = helpers
     this.debug = this.config.debug || false
     this.debugReqRes = this.config.debugReqRes || false
     this.emitter = new eventEmitter()
@@ -18,8 +18,8 @@ module.exports = class eWeLinkLAN {
     devices.forEach(device => {
       this.deviceMap.set(device.deviceid, {
         apiKey: device.devicekey,
-        online: helpers.hasProperty(this.config.ipOverride, device.deviceid),
-        ip: helpers.hasProperty(this.config.ipOverride, device.deviceid) ? this.config.ipOverride[device.deviceid] : null,
+        online: this.helpers.hasProperty(this.config.ipOverride, device.deviceid),
+        ip: this.helpers.hasProperty(this.config.ipOverride, device.deviceid) ? this.config.ipOverride[device.deviceid] : null,
         lastIV: null
       })
     })
@@ -31,7 +31,7 @@ module.exports = class eWeLinkLAN {
       let d
       const deviceId = device.fqdn.replace('._ewelink._tcp.local', '').replace('eWeLink_', '')
       if ((d = this.deviceMap.get(deviceId))) {
-        if (!helpers.hasProperty(this.config.ipOverride, deviceId)) {
+        if (!this.helpers.hasProperty(this.config.ipOverride, deviceId)) {
           this.deviceMap.set(deviceId, {
             apiKey: d.apiKey,
             online: true,
@@ -58,14 +58,14 @@ module.exports = class eWeLinkLAN {
             deviceInfo.lastIV = rdata.iv
             const data =
               rdata.data1 +
-              (helpers.hasProperty(rdata, 'data2') ? rdata.data2 : '') +
-              (helpers.hasProperty(rdata, 'data3') ? rdata.data3 : '') +
-              (helpers.hasProperty(rdata, 'data4') ? rdata.data4 : '')
+              (this.helpers.hasProperty(rdata, 'data2') ? rdata.data2 : '') +
+              (this.helpers.hasProperty(rdata, 'data3') ? rdata.data3 : '') +
+              (this.helpers.hasProperty(rdata, 'data4') ? rdata.data4 : '')
             const key = crypto.createHash('md5').update(Buffer.from(deviceInfo.apiKey, 'utf8')).digest()
             const dText = crypto.createDecipheriv('aes-128-cbc', key, Buffer.from(rdata.iv, 'base64'))
             const pText = Buffer.concat([dText.update(Buffer.from(data, 'base64')), dText.final()]).toString('utf8')
             let params
-            if (packet.address !== deviceInfo.ip && !helpers.hasProperty(this.config.ipOverride, rdata.id)) {
+            if (packet.address !== deviceInfo.ip && !this.helpers.hasProperty(this.config.ipOverride, rdata.id)) {
               this.deviceMap.set(rdata.id, {
                 apiKey: deviceInfo.apiKey,
                 online: true,
@@ -81,8 +81,8 @@ module.exports = class eWeLinkLAN {
               return
             }
             for (const param in params) {
-              if (helpers.hasProperty(params, param)) {
-                if (!helpers.paramsToKeep.includes(param.replace(/[0-9]/g, ''))) {
+              if (this.helpers.hasProperty(params, param)) {
+                if (!this.helpers.paramsToKeep.includes(param.replace(/[0-9]/g, ''))) {
                   delete params[param]
                 }
               }
@@ -116,10 +116,10 @@ module.exports = class eWeLinkLAN {
       let apiKey
       let suffix
       const params = {}
-      if (helpers.hasProperty(json.params, 'switches')) {
+      if (this.helpers.hasProperty(json.params, 'switches')) {
         params.switches = json.params.switches
         suffix = 'switches'
-      } else if (helpers.hasProperty(json.params, 'switch')) {
+      } else if (this.helpers.hasProperty(json.params, 'switch')) {
         params.switch = json.params.switch
         suffix = 'switch'
       } else {
@@ -155,7 +155,7 @@ module.exports = class eWeLinkLAN {
           data,
           timeout: 3000
         })
-        if (!helpers.hasProperty(res.data, 'error') || res.data.error !== 0) {
+        if (!this.helpers.hasProperty(res.data, 'error') || res.data.error !== 0) {
           throw new Error(res.data)
         }
         return 'ok'
@@ -172,8 +172,8 @@ module.exports = class eWeLinkLAN {
   addDeviceToMap (device) {
     this.deviceMap.set(device.deviceid, {
       apiKey: device.devicekey,
-      online: helpers.hasProperty(this.config.ipOverride, device.deviceid),
-      ip: helpers.hasProperty(this.config.ipOverride, device.deviceid) ? this.config.ipOverride[device.deviceid] : null,
+      online: this.helpers.hasProperty(this.config.ipOverride, device.deviceid),
+      ip: this.helpers.hasProperty(this.config.ipOverride, device.deviceid) ? this.config.ipOverride[device.deviceid] : null,
       lastIV: null
     })
   }
diff --git a/lib/ewelink-ws.js b/lib/connection/ws.js
similarity index 86%
rename from lib/ewelink-ws.js
rename to lib/connection/ws.js
index 8392878e..8f5712ec 100644
--- a/lib/ewelink-ws.js
+++ b/lib/connection/ws.js
@@ -3,13 +3,13 @@
 'use strict'
 const axios = require('axios')
 const eventEmitter = require('events')
-const helpers = require('./helpers')
 const ws = require('ws')
 const wsp = require('websocket-as-promised')
-module.exports = class eWeLinkWS {
-  constructor (config, log, authData) {
+module.exports = class connectionWS {
+  constructor (config, log, helpers, authData) {
     this.config = config
     this.log = log
+    this.helpers = helpers
     this.debug = this.config.debug || false
     this.debugReqRes = this.config.debugReqRes || false
     this.httpHost = authData.httpHost
@@ -29,7 +29,7 @@ module.exports = class eWeLinkWS {
           'Content-Type': 'application/json'
         },
         data: {
-          appid: helpers.appId,
+          appid: this.helpers.appId,
           nonce: Math.random().toString(36).substr(2, 8),
           ts: Math.floor(new Date().getTime() / 1000),
           version: 8
@@ -42,9 +42,9 @@ module.exports = class eWeLinkWS {
       if (this.debug) this.log('Web socket host received [%s].', body.domain)
       this.wsHost = body.domain
     } catch (err) {
-      if (helpers.hasProperty(err, 'code') && helpers.httpRetryCodes.includes(err.code)) {
+      if (this.helpers.hasProperty(err, 'code') && this.helpers.httpRetryCodes.includes(err.code)) {
         if (this.debug) this.log.warn('Unable to reach eWeLink. Retrying in 30 seconds.')
-        await helpers.sleep(30000)
+        await this.helpers.sleep(30000)
         return await this.getHost()
       } else {
         throw err
@@ -68,7 +68,7 @@ module.exports = class eWeLinkWS {
       const payload = {
         action: 'userOnline',
         apikey: this.apiKey,
-        appid: helpers.appId,
+        appid: this.helpers.appId,
         at: this.aToken,
         nonce: Math.random().toString(36).substr(2, 8),
         sequence,
@@ -84,7 +84,7 @@ module.exports = class eWeLinkWS {
       }
       try {
         const res = await this.wsp.sendRequest(payload, { requestId: sequence })
-        if (helpers.hasProperty(res, 'config') && res.config.hb && res.config.hbInterval) {
+        if (this.helpers.hasProperty(res, 'config') && res.config.hb && res.config.hbInterval) {
           if (this.hbInterval) clearInterval(this.hbInterval)
           this.hbInterval = setInterval(() => {
             try {
@@ -103,24 +103,24 @@ module.exports = class eWeLinkWS {
     this.wsp.onUnpackedMessage.addListener(device => {
       if (device === 'pong') return
       let onlineStatus = true
-      if (!helpers.hasProperty(device, 'params')) device.params = {}
-      if (helpers.hasProperty(device, 'deviceid') && helpers.hasProperty(device, 'error')) {
+      if (!this.helpers.hasProperty(device, 'params')) device.params = {}
+      if (this.helpers.hasProperty(device, 'deviceid') && this.helpers.hasProperty(device, 'error')) {
         device.action = 'update'
         onlineStatus = device.error === 0
         if (device.error !== 0 && this.debug) {
           this.log.warn('WS message received.\n%s', JSON.stringify(device, null, 2).replace(this.apiKey, '**hidden**'))
         }
       }
-      if (helpers.hasProperty(device, 'action')) {
+      if (this.helpers.hasProperty(device, 'action')) {
         switch (device.action) {
           case 'update':
           case 'sysmsg':
-            if (device.action === 'sysmsg' && helpers.hasProperty(device.params, 'online')) {
+            if (device.action === 'sysmsg' && this.helpers.hasProperty(device.params, 'online')) {
               onlineStatus = device.params.online
             }
             for (const param in device.params) {
-              if (helpers.hasProperty(device.params, param)) {
-                if (!helpers.paramsToKeep.includes(param.replace(/[0-9]/g, ''))) {
+              if (this.helpers.hasProperty(device.params, param)) {
+                if (!this.helpers.paramsToKeep.includes(param.replace(/[0-9]/g, ''))) {
                   delete device.params[param]
                 }
               }
@@ -148,7 +148,7 @@ module.exports = class eWeLinkWS {
               this.log.warn('[%s] WS message has unknown action.\n' + JSON.stringify(device, null, 2), device.deviceid)
             }
         }
-      } else if (helpers.hasProperty(device, 'error') && device.error === 0) {
+      } else if (this.helpers.hasProperty(device, 'error') && device.error === 0) {
         // *** Safe to ignore these messages *** \\
       } else {
         if (this.debug) this.log.warn('WS unknown command received.\n' + JSON.stringify(device, null, 2))
@@ -166,7 +166,7 @@ module.exports = class eWeLinkWS {
         this.log.warn('Web socket closed - [%s].', e)
         this.log.warn('Web socket will try to reconnect in five seconds.')
       }
-      await helpers.sleep(5000)
+      await this.helpers.sleep(5000)
       await this.login()
     })
     this.wsp.onError.addListener(async e => {
@@ -180,7 +180,7 @@ module.exports = class eWeLinkWS {
         this.log.warn('Web socket error - [%s].', e)
         this.log.warn('Web socket will try to reconnect in five seconds.')
       }
-      await helpers.sleep(5000)
+      await this.helpers.sleep(5000)
       await this.login()
     })
   }
@@ -205,7 +205,7 @@ module.exports = class eWeLinkWS {
           this.log('WS message sent.')
         }
         const device = await this.wsp.sendRequest(jsonToSend, { requestId: sequence })
-        device.error = helpers.hasProperty(device, 'error') ? device.error : 504
+        device.error = this.helpers.hasProperty(device, 'error') ? device.error : 504
         switch (device.error) {
           case 0:
             return
@@ -218,7 +218,7 @@ module.exports = class eWeLinkWS {
       }
     } else {
       if (this.debug) this.log.warn('Command will be resent when WS is reconnected.')
-      await helpers.sleep(30000)
+      await this.helpers.sleep(30000)
       await this.sendUpdate(json)
     }
   }
@@ -246,7 +246,7 @@ module.exports = class eWeLinkWS {
       }
     } else {
       if (this.debug) this.log.warn('Command will be resent when WS is reconnected.')
-      await helpers.sleep(30000)
+      await this.helpers.sleep(30000)
       await this.requestUpdate(accessory)
     }
   }
diff --git a/lib/device/blind.js b/lib/device/blind.js
index ef39c740..b65abc4b 100644
--- a/lib/device/blind.js
+++ b/lib/device/blind.js
@@ -1,10 +1,11 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
-const helpers = require('./../helpers')
 module.exports = class deviceBlind {
   constructor (platform, accessory) {
     this.platform = platform
+    this.log = platform.log
+    this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
     if (!(this.wcService = accessory.getService(this.Service.WindowCovering))) {
@@ -36,7 +37,7 @@ module.exports = class deviceBlind {
         throw new Error('improper configuration')
       }
       if (newTarget === prevPosition) return
-      params.switches = helpers.defaultMultiSwitchOff
+      params.switches = this.helpers.defaultMultiSwitchOff
       this.accessory.context.updateKey = updateKey
       const percentStepPerDecisecond = blindConfig.operationTime / 100
       if (prevState !== 2) {
@@ -60,7 +61,7 @@ module.exports = class deviceBlind {
       this.accessory.context.cacheTargetPosition = newTarget
       this.accessory.context.cachePositionState = setToMoveUp ? 1 : 0
       this.accessory.context.cacheLastStartTime = Math.floor(Date.now() / 100)
-      await helpers.sleep(decisecondsToMove * 100)
+      await this.helpers.sleep(decisecondsToMove * 100)
       if (this.accessory.context.updateKey !== updateKey) return
       params.switches[0].switch = 'off'
       params.switches[1].switch = 'off'
diff --git a/lib/device/curtain.js b/lib/device/curtain.js
index 6a8c83a1..68543315 100644
--- a/lib/device/curtain.js
+++ b/lib/device/curtain.js
@@ -1,10 +1,11 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
-const helpers = require('./../helpers')
 module.exports = class deviceCurtain {
   constructor (platform, accessory) {
     this.platform = platform
+    this.log = platform.log
+    this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
     if (!(this.cService = accessory.getService(this.Service.WindowCovering))) {
@@ -41,7 +42,7 @@ module.exports = class deviceCurtain {
 
   async externalUpdate (params) {
     try {
-      if (!helpers.hasProperty(params, 'switch') && !helpers.hasProperty(params, 'setclose')) {
+      if (!this.helpers.hasProperty(params, 'switch') && !this.helpers.hasProperty(params, 'setclose')) {
         return
       }
       const newPos = Math.abs(100 - parseInt(params.setclose))
diff --git a/lib/device/diffuser.js b/lib/device/diffuser.js
index 3c6ee35b..67b871fd 100644
--- a/lib/device/diffuser.js
+++ b/lib/device/diffuser.js
@@ -2,10 +2,11 @@
 /* eslint-disable new-cap */
 'use strict'
 const convert = require('color-convert')
-const helpers = require('./../helpers')
 module.exports = class deviceDiffuser {
   constructor (platform, accessory) {
     this.platform = platform
+    this.log = platform.log
+    this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
     this.fanService = accessory.getService('Diffuser') || accessory.addService(this.Service.Fan, 'Diffuser', 'diffuser')
@@ -47,7 +48,7 @@ module.exports = class deviceDiffuser {
 
   async internalDiffuserStateUpdate (value, callback) {
     try {
-      await helpers.sleep(750)
+      await this.helpers.sleep(750)
       callback()
       if (value === 0) return
       value = value <= 75 ? 50 : 100
@@ -71,14 +72,14 @@ module.exports = class deviceDiffuser {
 
   async internalLightBrightnessUpdate (value, callback) {
     try {
-      await helpers.sleep(1500)
+      await this.helpers.sleep(1500)
       callback()
       const updateKeyBright = Math.random().toString(36).substr(2, 8)
       this.accessory.context.updateKeyBright = updateKeyBright
       const params = {
         lightbright: value
       }
-      await helpers.sleep(350)
+      await this.helpers.sleep(350)
       if (updateKeyBright !== this.accessory.context.updateKeyBright) return
       await this.platform.sendDeviceUpdate(this.accessory, params)
     } catch (err) {
@@ -88,7 +89,7 @@ module.exports = class deviceDiffuser {
 
   async internalLightColourUpdate (value, callback) {
     try {
-      await helpers.sleep(1500)
+      await this.helpers.sleep(1500)
       callback()
       const updateKeyColour = Math.random().toString(36).substr(2, 8)
       this.accessory.context.updateKeyColour = updateKeyColour
@@ -102,7 +103,7 @@ module.exports = class deviceDiffuser {
         lightGcolor: newRGB[1],
         lightBcolor: newRGB[2]
       }
-      await helpers.sleep(700)
+      await this.helpers.sleep(700)
       if (updateKeyColour !== this.accessory.context.updateKeyColour) return
       await this.platform.sendDeviceUpdate(this.accessory, params)
     } catch (err) {
@@ -112,26 +113,26 @@ module.exports = class deviceDiffuser {
 
   async externalUpdate (params) {
     try {
-      if (helpers.hasProperty(params, 'switch')) {
+      if (this.helpers.hasProperty(params, 'switch')) {
         this.fanService.updateCharacteristic(this.Characteristic.On, params.switch === 'on')
-        if (!helpers.hasProperty(params, 'state')) {
+        if (!this.helpers.hasProperty(params, 'state')) {
           this.accessory.getService('Diffuser').updateCharacteristic(this.Characteristic.RotationSpeed, this.accessory.context.cacheState)
         }
       }
-      if (helpers.hasProperty(params, 'state')) {
+      if (this.helpers.hasProperty(params, 'state')) {
         this.fanService.updateCharacteristic(this.Characteristic.RotationSpeed, params.state * 50)
         this.accessory.context.cacheState = params.state * 50
       }
-      if (helpers.hasProperty(params, 'lightswitch')) {
+      if (this.helpers.hasProperty(params, 'lightswitch')) {
         this.lightService.updateCharacteristic(this.Characteristic.On, params.lightswitch === 1)
       }
-      if (helpers.hasProperty(params, 'lightbright')) {
+      if (this.helpers.hasProperty(params, 'lightbright')) {
         this.lightService.updateCharacteristic(this.Characteristic.Brightness, params.lightbright)
       }
       if (
-        helpers.hasProperty(params, 'lightRcolor') &&
-        helpers.hasProperty(params, 'lightGcolor') &&
-        helpers.hasProperty(params, 'lightBcolor')
+        this.helpers.hasProperty(params, 'lightRcolor') &&
+        this.helpers.hasProperty(params, 'lightGcolor') &&
+        this.helpers.hasProperty(params, 'lightBcolor')
       ) {
         const newColour = convert.rgb.hsv(params.lightRcolor, params.lightGcolor, params.lightBcolor)
         this.lightService
diff --git a/lib/device/fan.js b/lib/device/fan.js
index 0d07d565..0921af69 100644
--- a/lib/device/fan.js
+++ b/lib/device/fan.js
@@ -1,10 +1,11 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
-const helpers = require('./../helpers')
 module.exports = class deviceFan {
   constructor (platform, accessory) {
     this.platform = platform
+    this.log = platform.log
+    this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
     this.fanService = accessory.getService(this.Service.Fan) || accessory.addService(this.Service.Fan)
@@ -38,7 +39,7 @@ module.exports = class deviceFan {
   async internalSpeedUpdate (value, callback) {
     try {
       callback()
-      const params = { switches: helpers.defaultMultiSwitchOff }
+      const params = { switches: this.helpers.defaultMultiSwitchOff }
       const newPower = value >= 33 ? 1 : 0
       const newSpeed = value
       const newLight = this.visibleLight ? this.lightService.getCharacteristic(this.Characteristic.On).value : true
@@ -55,7 +56,7 @@ module.exports = class deviceFan {
   async internalLightUpdate (value, callback) {
     try {
       callback()
-      const params = { switches: helpers.defaultMultiSwitchOff }
+      const params = { switches: this.helpers.defaultMultiSwitchOff }
       const newPower = this.fanService.getCharacteristic(this.Characteristic.On).value
       const newSpeed = this.fanService.getCharacteristic(this.Characteristic.RotationSpeed).value
       const newLight = this.visibleLight ? value : true
@@ -71,7 +72,7 @@ module.exports = class deviceFan {
 
   async externalUpdate (params) {
     try {
-      if (helpers.hasProperty(params, 'updateSource') && params.updateSource === 'LAN') return
+      if (this.helpers.hasProperty(params, 'updateSource') && params.updateSource === 'LAN') return
       if (params.switches && Array.isArray(params.switches)) {
         const light = params.switches[0].switch === 'on'
         let status
diff --git a/lib/device/garage-eachen.js b/lib/device/garage-eachen.js
index dc1b0ba7..eb5981e0 100644
--- a/lib/device/garage-eachen.js
+++ b/lib/device/garage-eachen.js
@@ -1,10 +1,11 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
-const helpers = require('./../helpers')
 module.exports = class deviceGarageEachen {
   constructor (platform, accessory) {
     this.platform = platform
+    this.log = platform.log
+    this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
     if (!(this.gdService = accessory.getService(this.Service.GarageDoorOpener))) {
@@ -37,10 +38,10 @@ module.exports = class deviceGarageEachen {
       this.gdService
         .updateCharacteristic(this.Characteristic.TargetDoorState, value)
         .updateCharacteristic(this.Characteristic.CurrentDoorState, value + 2)
-      await helpers.sleep(2000)
+      await this.helpers.sleep(2000)
       this.accessory.context.inUse = false
       if (value === 0) {
-        await helpers.sleep(Math.max((garageConfig.operationTime - 20) * 100, 0))
+        await this.helpers.sleep(Math.max((garageConfig.operationTime - 20) * 100, 0))
         this.gdService.updateCharacteristic(this.Characteristic.CurrentDoorState, 0)
       }
     } catch (err) {
@@ -51,7 +52,7 @@ module.exports = class deviceGarageEachen {
 
   async externalUpdate (params) {
     try {
-      if (!helpers.hasProperty(params, 'switch') || this.accessory.context.inUse) return
+      if (!this.helpers.hasProperty(params, 'switch') || this.accessory.context.inUse) return
       let garageConfig
       if (!(garageConfig = this.platform.cusG.get(this.accessory.context.hbDeviceId))) {
         throw new Error('group config missing')
diff --git a/lib/device/garage-four.js b/lib/device/garage-four.js
index 0bb439e2..49068189 100644
--- a/lib/device/garage-four.js
+++ b/lib/device/garage-four.js
@@ -1,10 +1,11 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
-const helpers = require('./../helpers')
 module.exports = class deviceGarageFour {
   constructor (platform, accessory) {
     this.platform = platform
+    this.log = platform.log
+    this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
     ;['A', 'B', 'C', 'D'].forEach(v => {
@@ -76,12 +77,12 @@ module.exports = class deviceGarageFour {
         .updateCharacteristic(this.Characteristic.CurrentDoorState, value + 2)
       this.accessory.context.cacheStates[garageChannel].cacheTargetDoorState = value
       this.accessory.context.cacheStates[garageChannel].cacheCurrentDoorState = value + 2
-      const params = { switches: helpers.defaultMultiSwitchOff }
+      const params = { switches: this.helpers.defaultMultiSwitchOff }
       ;[0, 1, 2, 3].forEach(i => (params.switches[i].switch = garageChannel === i ? 'on' : 'off'))
       await this.platform.sendDeviceUpdate(this.accessory, params)
-      await helpers.sleep(2000)
+      await this.helpers.sleep(2000)
       this.accessory.context.inUse = false
-      await helpers.sleep(Math.max((garageConfig.operationTime - 20) * 100, 0))
+      await this.helpers.sleep(Math.max((garageConfig.operationTime - 20) * 100, 0))
       if (this.accessory.context.updateKey !== updateKey || sAccessory) return
       if (!sAccessory) {
         gdService.updateCharacteristic(this.Characteristic.CurrentDoorState, value)
@@ -96,7 +97,7 @@ module.exports = class deviceGarageFour {
   async externalUpdate (params) {
     try {
       /*
-      if (!helpers.hasProperty(params, 'switches') || this.accessory.context.inUse) return
+      if (!this.helpers.hasProperty(params, 'switches') || this.accessory.context.inUse) return
       let garageConfig
       if (!(garageConfig = this.platform.cusG.get(this.accessory.context.hbDeviceId))) {
         throw new Error('group config missing')
diff --git a/lib/device/garage-two.js b/lib/device/garage-two.js
index e534d59a..bf348721 100644
--- a/lib/device/garage-two.js
+++ b/lib/device/garage-two.js
@@ -1,10 +1,11 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
-const helpers = require('./../helpers')
 module.exports = class deviceGarageTwo {
   constructor (platform, accessory) {
     this.platform = platform
+    this.log = platform.log
+    this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
     ;['1', '2'].forEach(v => {
@@ -87,7 +88,7 @@ module.exports = class deviceGarageTwo {
         }
       }
       await this.platform.sendDeviceUpdate(this.accessory, params)
-      await helpers.sleep(Math.max(garageConfig.operationTime * 100, 1000))
+      await this.helpers.sleep(Math.max(garageConfig.operationTime * 100, 1000))
       if (!sAccessory) {
         gdService.updateCharacteristic(this.Characteristic.CurrentDoorState, newPos)
         switch (garage) {
@@ -109,7 +110,7 @@ module.exports = class deviceGarageTwo {
 
   externalUpdate (params) {
     try {
-      if (!helpers.hasProperty(params, 'switches')) {
+      if (!this.helpers.hasProperty(params, 'switches')) {
         return
       }
       let garageConfig
@@ -147,7 +148,7 @@ module.exports = class deviceGarageTwo {
         }
         this.accessory.context.inUse = true
         if (garageConfig.sensorId) {
-          await helpers.sleep(Math.max(garageConfig.operationTime * 100, 1000))
+          await this.helpers.sleep(Math.max(garageConfig.operationTime * 100, 1000))
         } else {
           gcService
             .updateCharacteristic(this.Characteristic.TargetDoorState, newPos - 2)
@@ -162,7 +163,7 @@ module.exports = class deviceGarageTwo {
               this.accessory.context.cacheTwoTargetDoorState = newPos - 2
               break
           }
-          await helpers.sleep(Math.max(garageConfig.operationTime * 100, 1000))
+          await this.helpers.sleep(Math.max(garageConfig.operationTime * 100, 1000))
           gcService.updateCharacteristic(this.Characteristic.CurrentDoorState, newPos - 2)
           switch (v) {
             case '1':
diff --git a/lib/device/garage.js b/lib/device/garage.js
index dbb74c4b..7e086771 100644
--- a/lib/device/garage.js
+++ b/lib/device/garage.js
@@ -1,10 +1,11 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
-const helpers = require('./../helpers')
 module.exports = class deviceGarage {
   constructor (platform, accessory) {
     this.platform = platform
+    this.log = platform.log
+    this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
     if (!(this.gdService = accessory.getService(this.Service.GarageDoorOpener))) {
@@ -56,7 +57,7 @@ module.exports = class deviceGarage {
         delay = 1500
       }
       if (this.accessory.context.state !== newPos) return
-      await helpers.sleep(delay)
+      await this.helpers.sleep(delay)
       this.gdService
         .updateCharacteristic(this.Characteristic.TargetDoorState, newPos)
         .updateCharacteristic(this.Characteristic.CurrentDoorState, newPos + 2)
@@ -67,13 +68,13 @@ module.exports = class deviceGarage {
           params.switch = 'on'
           break
         case 'twoSwitch':
-          params.switches = helpers.defaultMultiSwitchOff
+          params.switches = this.helpers.defaultMultiSwitchOff
           params.switches[0].switch = newPos === 0 ? 'on' : 'off'
           params.switches[1].switch = newPos === 1 ? 'on' : 'off'
           break
       }
       await this.platform.sendDeviceUpdate(this.accessory, params)
-      await helpers.sleep(Math.max(garageConfig.operationTime * 100, 1000))
+      await this.helpers.sleep(Math.max(garageConfig.operationTime * 100, 1000))
       if (!sAccessory) {
         this.gdService.updateCharacteristic(this.Characteristic.CurrentDoorState, newPos)
         this.accessory.context.cacheCurrentDoorState = newPos
@@ -86,7 +87,7 @@ module.exports = class deviceGarage {
 
   async externalUpdate (params) {
     try {
-      if (!helpers.hasProperty(params, 'switch') && !helpers.hasProperty(params, 'switches')) {
+      if (!this.helpers.hasProperty(params, 'switch') && !this.helpers.hasProperty(params, 'switches')) {
         return
       }
       let garageConfig
@@ -116,14 +117,14 @@ module.exports = class deviceGarage {
       }
       this.accessory.context.inUse = true
       if (garageConfig.sensorId) {
-        await helpers.sleep(Math.max(garageConfig.operationTime * 100, 1000))
+        await this.helpers.sleep(Math.max(garageConfig.operationTime * 100, 1000))
       } else {
         this.gdService
           .updateCharacteristic(this.Characteristic.TargetDoorState, newPos - 2)
           .updateCharacteristic(this.Characteristic.CurrentDoorState, newPos)
         this.accessory.context.cacheCurrentDoorState = newPos
         this.accessory.context.cacheTargetDoorState = newPos - 2
-        await helpers.sleep(Math.max(garageConfig.operationTime * 100, 1000))
+        await this.helpers.sleep(Math.max(garageConfig.operationTime * 100, 1000))
         this.gdService.updateCharacteristic(this.Characteristic.CurrentDoorState, newPos - 2)
         this.accessory.context.cacheCurrentDoorState = newPos - 2
       }
diff --git a/lib/device/light-colour.js b/lib/device/light-colour.js
index 1bf587eb..b7f68b0f 100644
--- a/lib/device/light-colour.js
+++ b/lib/device/light-colour.js
@@ -2,10 +2,11 @@
 /* eslint-disable new-cap */
 'use strict'
 const convert = require('color-convert')
-const helpers = require('./../helpers')
 module.exports = class deviceLightColour {
   constructor (platform, accessory) {
     this.platform = platform
+    this.log = platform.log
+    this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
     this.lightService = accessory.getService(this.Service.Lightbulb) || accessory.addService(this.Service.Lightbulb)
@@ -51,7 +52,7 @@ module.exports = class deviceLightColour {
   async internalBrightnessUpdate (value, callback) {
     try {
       let params
-      await helpers.sleep(750)
+      await this.helpers.sleep(750)
       callback()
       const updateKeyBright = Math.random().toString(36).substr(2, 8)
       this.accessory.context.updateKeyBright = updateKeyBright
@@ -79,7 +80,7 @@ module.exports = class deviceLightColour {
           }
           break
       }
-      await helpers.sleep(350)
+      await this.helpers.sleep(350)
       if (updateKeyBright !== this.accessory.context.updateKeyBright) return
       await this.platform.sendDeviceUpdate(this.accessory, params)
     } catch (err) {
@@ -89,7 +90,7 @@ module.exports = class deviceLightColour {
 
   async internalHueUpdate (value, callback) {
     try {
-      await helpers.sleep(1500)
+      await this.helpers.sleep(1500)
       callback()
       let params
       const newRGB = convert.hsv.rgb(value, this.lightService.getCharacteristic(this.Characteristic.Saturation).value, 100)
@@ -133,7 +134,7 @@ module.exports = class deviceLightColour {
           this.accessory.context.cacheB = newRGB[2]
           break
       }
-      await helpers.sleep(350)
+      await this.helpers.sleep(350)
       if (updateKeyColour !== this.accessory.context.updateKeyColour) return
       await this.platform.sendDeviceUpdate(this.accessory, params)
     } catch (err) {
@@ -143,13 +144,13 @@ module.exports = class deviceLightColour {
 
   async externalUpdate (params) {
     try {
-      if (helpers.hasProperty(params, 'updateSource') && params.updateSource === 'LAN') return
+      if (this.helpers.hasProperty(params, 'updateSource') && params.updateSource === 'LAN') return
       let newColour
       let mode
       let isOn = false
-      if (this.accessory.context.eweUIID === 22 && helpers.hasProperty(params, 'state')) {
+      if (this.accessory.context.eweUIID === 22 && this.helpers.hasProperty(params, 'state')) {
         isOn = params.state === 'on'
-      } else if (this.accessory.context.eweUIID !== 22 && helpers.hasProperty(params, 'switch')) {
+      } else if (this.accessory.context.eweUIID !== 22 && this.helpers.hasProperty(params, 'switch')) {
         isOn = params.switch === 'on'
       } else {
         isOn = this.lightService.getCharacteristic(this.Characteristic.On).value
@@ -159,9 +160,9 @@ module.exports = class deviceLightColour {
         switch (this.accessory.context.eweUIID) {
           case 22:
             // *** B1 *** \\
-            if (helpers.hasProperty(params, 'zyx_mode')) {
+            if (this.helpers.hasProperty(params, 'zyx_mode')) {
               mode = parseInt(params.zyx_mode)
-            } else if (helpers.hasProperty(params, 'channel0') && parseInt(params.channel0) + parseInt(params.channel1) > 0) {
+            } else if (this.helpers.hasProperty(params, 'channel0') && parseInt(params.channel0) + parseInt(params.channel1) > 0) {
               mode = 1
             } else {
               mode = 2
@@ -180,10 +181,10 @@ module.exports = class deviceLightColour {
             break
           case 59:
             // *** L1 *** \\
-            if (helpers.hasProperty(params, 'bright')) {
+            if (this.helpers.hasProperty(params, 'bright')) {
               this.lightService.updateCharacteristic(this.Characteristic.Brightness, params.bright)
             }
-            if (helpers.hasProperty(params, 'colorR')) {
+            if (this.helpers.hasProperty(params, 'colorR')) {
               newColour = convert.rgb.hsv(params.colorR, params.colorG, params.colorB)
               this.lightService
                 .updateCharacteristic(this.Characteristic.Hue, newColour[0])
@@ -192,16 +193,16 @@ module.exports = class deviceLightColour {
             break
           case 104:
             // *** GTLC104 *** \\
-            if (helpers.hasProperty(params, 'ltype')) {
+            if (this.helpers.hasProperty(params, 'ltype')) {
               mode = params.ltype
-              if (mode === 'color' && helpers.hasProperty(params, 'color')) {
-                if (helpers.hasProperty(params.color, 'br')) {
+              if (mode === 'color' && this.helpers.hasProperty(params, 'color')) {
+                if (this.helpers.hasProperty(params.color, 'br')) {
                   this.lightService.updateCharacteristic(this.Characteristic.Brightness, params.color.br)
                 }
                 if (
-                  helpers.hasProperty(params.color, 'r') &&
-                  helpers.hasProperty(params.color, 'g') &&
-                  helpers.hasProperty(params.color, 'b')
+                  this.helpers.hasProperty(params.color, 'r') &&
+                  this.helpers.hasProperty(params.color, 'g') &&
+                  this.helpers.hasProperty(params.color, 'b')
                 ) {
                   newColour = convert.rgb.hsv(
                     parseInt(params.color.r),
diff --git a/lib/device/light-ctemp.js b/lib/device/light-ctemp.js
index cb550569..6a651327 100644
--- a/lib/device/light-ctemp.js
+++ b/lib/device/light-ctemp.js
@@ -1,10 +1,11 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
-const helpers = require('./../helpers')
 module.exports = class deviceLightColour {
   constructor (platform, accessory) {
     this.platform = platform
+    this.log = platform.log
+    this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
     this.lightService = accessory.getService(this.Service.Lightbulb) || accessory.addService(this.Service.Lightbulb)
@@ -36,7 +37,7 @@ module.exports = class deviceLightColour {
 
   async internalBrightnessUpdate (value, callback) {
     try {
-      await helpers.sleep(750)
+      await this.helpers.sleep(750)
       callback()
       if (this.lastSentBrightness === value) return
       this.lastSentBrightness = value
@@ -50,7 +51,7 @@ module.exports = class deviceLightColour {
           ct: this.accessory.context.cacheCT
         }
       }
-      await helpers.sleep(350)
+      await this.helpers.sleep(350)
       if (updateKeyBright !== this.accessory.context.updateKeyBright) return
       await this.platform.sendDeviceUpdate(this.accessory, params)
     } catch (err) {
@@ -60,7 +61,7 @@ module.exports = class deviceLightColour {
 
   async internalColourTempUpdate (value, callback) {
     try {
-      await helpers.sleep(1500)
+      await this.helpers.sleep(1500)
       callback()
       if (this.lastSentColour === value) return
       this.lastSentColour = value
@@ -81,7 +82,7 @@ module.exports = class deviceLightColour {
         }
       }
       this.accessory.context.cacheCT = kToCT
-      await helpers.sleep(350)
+      await this.helpers.sleep(350)
       if (updateKeyColour !== this.updateKeyColour) return
       await this.platform.sendDeviceUpdate(this.accessory, params)
     } catch (err) {
@@ -91,23 +92,23 @@ module.exports = class deviceLightColour {
 
   async externalUpdate (params) {
     try {
-      if (helpers.hasProperty(params, 'updateSource') && params.updateSource === 'LAN') return
+      if (this.helpers.hasProperty(params, 'updateSource') && params.updateSource === 'LAN') return
       let mode
       let isOn = false
-      if (helpers.hasProperty(params, 'switch')) {
+      if (this.helpers.hasProperty(params, 'switch')) {
         isOn = params.switch === 'on'
       } else {
         isOn = this.lightService.getCharacteristic(this.Characteristic.On).value
       }
       if (isOn) {
         this.lightService.updateCharacteristic(this.Characteristic.On, true)
-        if (helpers.hasProperty(params, 'ltype')) {
+        if (this.helpers.hasProperty(params, 'ltype')) {
           mode = params.ltype
-          if (mode === 'white' && helpers.hasProperty(params, 'white')) {
-            if (helpers.hasProperty(params.white, 'br')) {
+          if (mode === 'white' && this.helpers.hasProperty(params, 'white')) {
+            if (this.helpers.hasProperty(params.white, 'br')) {
               this.lightService.updateCharacteristic(this.Characteristic.Brightness, params.white.br)
             }
-            if (helpers.hasProperty(params.white, 'ct')) {
+            if (this.helpers.hasProperty(params.white, 'ct')) {
               // B02-F-A60 has a range of 2200K-6500K corresponding to ct: 0-255
               // HomeKit has a ct range of 140-500 corresponding to 2000-7143K
               const ctToK = Math.round(params.white.ct / 255 * 4300 + 2200)
diff --git a/lib/device/light-dimmer.js b/lib/device/light-dimmer.js
index 4e945231..624cbd9e 100644
--- a/lib/device/light-dimmer.js
+++ b/lib/device/light-dimmer.js
@@ -1,10 +1,11 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
-const helpers = require('./../helpers')
 module.exports = class deviceLightDimmer {
   constructor (platform, accessory) {
     this.platform = platform
+    this.log = platform.log
+    this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
     this.lightService = accessory.getService(this.Service.Lightbulb) || accessory.addService(this.Service.Lightbulb)
@@ -43,7 +44,7 @@ module.exports = class deviceLightDimmer {
           params.mode = 0
           break
       }
-      await helpers.sleep(350)
+      await this.helpers.sleep(350)
       if (updateKey !== this.accessory.context.updateKey) return
       await this.platform.sendDeviceUpdate(this.accessory, params)
     } catch (err) {
@@ -53,7 +54,7 @@ module.exports = class deviceLightDimmer {
 
   async externalUpdate (params) {
     try {
-      const isOn = helpers.hasProperty(params, 'switch')
+      const isOn = this.helpers.hasProperty(params, 'switch')
         ? params.switch === 'on'
         : this.lightService.getCharacteristic(this.Characteristic.On).value
       if (isOn) {
@@ -61,14 +62,14 @@ module.exports = class deviceLightDimmer {
         switch (this.accessory.context.eweUIID) {
           case 36:
             // *** KING-M4 eWeLink scale is 10-100 and HomeKit scale is 0-100. *** \\
-            if (helpers.hasProperty(params, 'bright')) {
+            if (this.helpers.hasProperty(params, 'bright')) {
               const nb = Math.round(((params.bright - 10) * 10) / 9)
               this.lightService.updateCharacteristic(this.Characteristic.Brightness, nb)
             }
             break
           case 44:
             // *** D1 eWeLink scale matches HomeKit scale of 0-100 *** \\
-            if (helpers.hasProperty(params, 'brightness')) {
+            if (this.helpers.hasProperty(params, 'brightness')) {
               this.lightService.updateCharacteristic(this.Characteristic.Brightness, params.brightness)
             }
             break
diff --git a/lib/device/lock.js b/lib/device/lock.js
index d606ae6f..1e735a4e 100644
--- a/lib/device/lock.js
+++ b/lib/device/lock.js
@@ -1,10 +1,11 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
-const helpers = require('./../helpers')
 module.exports = class deviceLock {
   constructor (platform, accessory) {
     this.platform = platform
+    this.log = platform.log
+    this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
     this.lmService = accessory.getService(this.Service.LockMechanism) || accessory.addService(this.Service.LockMechanism)
@@ -27,7 +28,7 @@ module.exports = class deviceLock {
       }
       this.accessory.context.inUse = true
       await this.platform.sendDeviceUpdate(this.accessory, params)
-      await helpers.sleep(Math.max(lockConfig.operationTime * 100, 1000))
+      await this.helpers.sleep(Math.max(lockConfig.operationTime * 100, 1000))
       this.lmService
         .updateCharacteristic(this.Characteristic.LockTargetState, 1)
         .updateCharacteristic(this.Characteristic.LockCurrentState, 1)
@@ -39,7 +40,7 @@ module.exports = class deviceLock {
 
   async externalUpdate (params) {
     try {
-      if (!helpers.hasProperty(params, 'switch')) return
+      if (!this.helpers.hasProperty(params, 'switch')) return
       let lockConfig
       if (!(lockConfig = this.platform.cusG.get(this.accessory.context.hbDeviceId))) {
         throw new Error('group config missing')
@@ -54,7 +55,7 @@ module.exports = class deviceLock {
       this.lmService
         .updateCharacteristic(this.Characteristic.LockCurrentState, 0)
         .updateCharacteristic(this.Characteristic.LockTargetState, 0)
-      await helpers.sleep(Math.max(lockConfig.operationTime * 100, 1000))
+      await this.helpers.sleep(Math.max(lockConfig.operationTime * 100, 1000))
       this.lmService
         .updateCharacteristic(this.Characteristic.LockCurrentState, 1)
         .updateCharacteristic(this.Characteristic.LockTargetState, 1)
diff --git a/lib/device/outlet-temp.js b/lib/device/outlet-temp.js
index e6bc7c01..0eaf7c81 100644
--- a/lib/device/outlet-temp.js
+++ b/lib/device/outlet-temp.js
@@ -1,10 +1,11 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
-const helpers = require('./../helpers')
 module.exports = class deviceOutletTemp {
   constructor (platform, accessory) {
     this.platform = platform
+    this.log = platform.log
+    this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
     if (accessory.getService(this.Service.Thermostat)) {
@@ -28,7 +29,7 @@ module.exports = class deviceOutletTemp {
     if (accessory.context.sensorType !== 'DS18B20') {
       this.humiService = accessory.getService(this.Service.HumiditySensor) || accessory.addService(this.Service.HumiditySensor)
     }
-    accessory.log = this.platform.log
+    accessory.log = this.log
     accessory.eveLogger = new this.platform.eveService('custom', accessory, {
       storage: 'fs',
       path: this.platform.eveLogPath
@@ -53,9 +54,9 @@ module.exports = class deviceOutletTemp {
     try {
       if (
         !(this.platform.config.hideSwitchFromTH || '').includes(this.accessory.context.eweDeviceId) &&
-        (helpers.hasProperty(params, 'switch') || helpers.hasProperty(params, 'mainSwitch'))
+        (this.helpers.hasProperty(params, 'switch') || this.helpers.hasProperty(params, 'mainSwitch'))
       ) {
-        const newState = helpers.hasProperty(params, 'switch') ? params.switch === 'on' : params.mainSwitch === 'on'
+        const newState = this.helpers.hasProperty(params, 'switch') ? params.switch === 'on' : params.mainSwitch === 'on'
         this.switchService.updateCharacteristic(this.Characteristic.On, newState)
         this.accessory.eveLogger.addEntry({
           time: Math.round(new Date().valueOf() / 1000),
@@ -63,17 +64,17 @@ module.exports = class deviceOutletTemp {
         })
       }
       const eveLog = { time: Math.round(new Date().valueOf() / 1000) }
-      if (helpers.hasProperty(params, 'currentTemperature') && this.accessory.getService(this.Service.TemperatureSensor)) {
+      if (this.helpers.hasProperty(params, 'currentTemperature') && this.accessory.getService(this.Service.TemperatureSensor)) {
         const currentTemp = parseFloat(params.currentTemperature !== 'unavailable' ? params.currentTemperature : 0)
         this.tempService.updateCharacteristic(this.Characteristic.CurrentTemperature, currentTemp)
         eveLog.temp = currentTemp
       }
-      if (helpers.hasProperty(params, 'currentHumidity') && this.accessory.getService(this.Service.HumiditySensor)) {
+      if (this.helpers.hasProperty(params, 'currentHumidity') && this.accessory.getService(this.Service.HumiditySensor)) {
         const currentHumi = parseFloat(params.currentHumidity !== 'unavailable' ? params.currentHumidity : 0)
         this.humiService.updateCharacteristic(this.Characteristic.CurrentRelativeHumidity, currentHumi)
         eveLog.humidity = currentHumi
       }
-      if (helpers.hasProperty(eveLog, 'temp') || helpers.hasProperty(eveLog, 'humidity')) {
+      if (this.helpers.hasProperty(eveLog, 'temp') || this.helpers.hasProperty(eveLog, 'humidity')) {
         this.accessory.eveLogger.addEntry(eveLog)
       }
     } catch (err) {
diff --git a/lib/device/outlet.js b/lib/device/outlet.js
index 66ca8704..de3256d6 100644
--- a/lib/device/outlet.js
+++ b/lib/device/outlet.js
@@ -1,18 +1,19 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
-const helpers = require('./../helpers')
 const util = require('util')
 module.exports = class deviceOutlet {
   constructor (platform, accessory) {
     this.platform = platform
+    this.log = platform.log
+    this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
     this.inUsePowerThreshold = parseInt(this.platform.config.inUsePowerThreshold)
     this.inUsePowerThreshold = isNaN(this.inUsePowerThreshold)
-      ? helpers.defaults.inUsePowerThreshold
+      ? this.helpers.defaults.inUsePowerThreshold
       : this.inUsePowerThreshold < 0
-        ? helpers.defaults.inUsePowerThreshold
+        ? this.helpers.defaults.inUsePowerThreshold
         : this.inUsePowerThreshold
     const self = this
     this.eveCurrentConsumption = function () {
@@ -81,8 +82,8 @@ module.exports = class deviceOutlet {
     this.eveVoltage.UUID = 'E863F10A-079E-48FF-8F27-9C2605A29F52'
     this.eveElectricCurrent.UUID = 'E863F126-079E-48FF-8F27-9C2605A29F52'
     this.eveResetTotal.UUID = 'E863F112-079E-48FF-8F27-9C2605A29F52'
-    if (!helpers.hasProperty(accessory.context, 'energyReadings')) accessory.context.energyReadings = []
-    if (!helpers.hasProperty(accessory.context, 'energyReadingTotal')) accessory.context.energyReadingTotal = 0
+    if (!this.helpers.hasProperty(accessory.context, 'energyReadings')) accessory.context.energyReadings = []
+    if (!this.helpers.hasProperty(accessory.context, 'energyReadingTotal')) accessory.context.energyReadingTotal = 0
     if (accessory.getService(this.Service.Switch)) {
       accessory.removeService(accessory.getService(this.Service.Switch))
     }
@@ -105,7 +106,7 @@ module.exports = class deviceOutlet {
         accessory.context.energyReadingTotal = 0
         this.outletService.updateCharacteristic(this.eveTotalConsumption, 0)
       })
-    accessory.log = this.platform.log
+    accessory.log = this.log
     accessory.eveLogger = new this.platform.eveService('energy', accessory, {
       storage: 'fs',
       path: this.platform.eveLogPath
@@ -137,13 +138,13 @@ module.exports = class deviceOutlet {
 
   async externalUpdate (params) {
     try {
-      if (helpers.hasProperty(params, 'switch')) {
+      if (this.helpers.hasProperty(params, 'switch')) {
         this.outletService.updateCharacteristic(this.Characteristic.On, params.switch === 'on')
         if (!this.accessory.context.powerReadings) {
           this.outletService.updateCharacteristic(this.Characteristic.OutletInUse, params.switch === 'on')
         }
       }
-      if (helpers.hasProperty(params, 'power')) {
+      if (this.helpers.hasProperty(params, 'power')) {
         this.accessory.context.powerReadings = true
         this.outletService
           .updateCharacteristic(this.Characteristic.OutletInUse, parseFloat(params.power) > this.inUsePowerThreshold)
@@ -155,10 +156,10 @@ module.exports = class deviceOutlet {
         })
         this.accessory.context.energyReadings.push(parseFloat(params.power))
       }
-      if (helpers.hasProperty(params, 'voltage')) {
+      if (this.helpers.hasProperty(params, 'voltage')) {
         this.outletService.updateCharacteristic(this.eveVoltage, parseFloat(params.voltage))
       }
-      if (helpers.hasProperty(params, 'current')) {
+      if (this.helpers.hasProperty(params, 'current')) {
         this.outletService.updateCharacteristic(this.eveElectricCurrent, parseFloat(params.current))
       }
     } catch (err) {
diff --git a/lib/device/rf-bridge.js b/lib/device/rf-bridge.js
index 1b2ba4ba..ad8b0340 100644
--- a/lib/device/rf-bridge.js
+++ b/lib/device/rf-bridge.js
@@ -1,17 +1,18 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
-const helpers = require('./../helpers')
 module.exports = class deviceRFBridge {
   constructor (platform, accessory) {
     this.platform = platform
+    this.log = platform.log
+    this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
     this.sensorTimeDifference = parseInt(this.platform.config.sensorTimeDifference)
     this.sensorTimeDifference = isNaN(this.sensorTimeDifference)
-      ? helpers.defaults.sensorTimeDifference
+      ? this.helpers.defaults.sensorTimeDifference
       : this.sensorTimeDifference < 10
-        ? helpers.defaults.sensorTimeDifference
+        ? this.helpers.defaults.sensorTimeDifference
         : this.sensorTimeDifference
     if (accessory.context.subType === 'button') {
       Object.entries(accessory.context.buttons).forEach(([chan, name]) => {
@@ -65,7 +66,7 @@ module.exports = class deviceRFBridge {
       }
       const service = accessory.getService(serv) || accessory.addService(serv)
       service.updateCharacteristic(char, 0)
-      accessory.log = this.platform.log
+      accessory.log = this.log
       accessory.eveLogger = new this.platform.eveService(eveType, accessory, {
         storage: 'fs',
         path: this.platform.eveLogPath
@@ -82,7 +83,7 @@ module.exports = class deviceRFBridge {
         cmd: 'transmit',
         rfChl: parseInt(rfChl)
       }
-      await helpers.sleep(1000)
+      await this.helpers.sleep(1000)
       this.accessory.getService(service).updateCharacteristic(this.Characteristic.On, false)
       await this.platform.sendDeviceUpdate(this.accessory, params)
     } catch (err) {
@@ -92,27 +93,27 @@ module.exports = class deviceRFBridge {
 
   async externalUpdate (params) {
     try {
-      if (!helpers.hasProperty(params, 'updateSource')) return
+      if (!this.helpers.hasProperty(params, 'updateSource')) return
       const timeNow = new Date()
       let oAccessory = false
-      if (helpers.hasProperty(params, 'cmd') && params.cmd === 'transmit' && helpers.hasProperty(params, 'rfChl')) {
+      if (this.helpers.hasProperty(params, 'cmd') && params.cmd === 'transmit' && this.helpers.hasProperty(params, 'rfChl')) {
         this.platform.devicesInHB.forEach(acc => {
           if (
             acc.context.eweDeviceId === this.accessory.context.eweDeviceId &&
-            helpers.hasProperty(acc.context, 'buttons') &&
-            helpers.hasProperty(acc.context.buttons, params.rfChl.toString())
+            this.helpers.hasProperty(acc.context, 'buttons') &&
+            this.helpers.hasProperty(acc.context.buttons, params.rfChl.toString())
           ) {
             oAccessory = acc
           }
         })
         if (oAccessory) {
           oAccessory.getService(oAccessory.context.buttons[params.rfChl]).updateCharacteristic(this.Characteristic.On, 1)
-          helpers.sleep(3000)
+          this.helpers.sleep(3000)
           oAccessory.getService(oAccessory.context.buttons[params.rfChl]).updateCharacteristic(this.Characteristic.On, 0)
         } else {
           throw new Error('rf button not found in Homebridge')
         }
-      } else if (helpers.hasProperty(params, 'cmd') && params.cmd === 'trigger') {
+      } else if (this.helpers.hasProperty(params, 'cmd') && params.cmd === 'trigger') {
         //* ** RF Sensor ***\\
         Object.keys(params)
           .filter(name => /rfTrig/.test(name))
@@ -120,8 +121,8 @@ module.exports = class deviceRFBridge {
             this.platform.devicesInHB.forEach(acc => {
               if (
                 acc.context.eweDeviceId === this.accessory.context.eweDeviceId &&
-                helpers.hasProperty(acc.context, 'buttons') &&
-                helpers.hasProperty(acc.context.buttons, chan.split('g')[1].toString())
+                this.helpers.hasProperty(acc.context, 'buttons') &&
+                this.helpers.hasProperty(acc.context.buttons, chan.split('g')[1].toString())
               ) {
                 oAccessory = acc
               }
@@ -131,15 +132,15 @@ module.exports = class deviceRFBridge {
               const sensorTimeLengthSec = parseInt(this.platform.config.sensorTimeLength)
               const sensorTimeLength = isNaN(sensorTimeLengthPri)
                 ? isNaN(sensorTimeLengthSec)
-                  ? helpers.defaults.sensorTimeLength
+                  ? this.helpers.defaults.sensorTimeLength
                   : sensorTimeLengthSec < 0
-                    ? helpers.defaults.sensorTimeLength
+                    ? this.helpers.defaults.sensorTimeLength
                     : sensorTimeLengthSec
                 : sensorTimeLengthPri < 0
                   ? isNaN(sensorTimeLengthSec)
-                    ? helpers.defaults.sensorTimeLength
+                    ? this.helpers.defaults.sensorTimeLength
                     : sensorTimeLengthSec < 0
-                      ? helpers.defaults.sensorTimeLength
+                      ? this.helpers.defaults.sensorTimeLength
                       : sensorTimeLengthSec
                   : sensorTimeLengthPri
               const timeOfMotion = new Date(params[chan])
@@ -185,7 +186,7 @@ module.exports = class deviceRFBridge {
                   time: Math.round(new Date().valueOf() / 1000),
                   status: 1
                 })
-                await helpers.sleep(sensorTimeLength * 1000)
+                await this.helpers.sleep(sensorTimeLength * 1000)
                 oAccessory.getService(serv).updateCharacteristic(char, 0)
                 oAccessory.eveLogger.addEntry({
                   time: Math.round(new Date().valueOf() / 1000),
diff --git a/lib/device/scm.js b/lib/device/scm.js
index e5f1e6a0..9532847f 100644
--- a/lib/device/scm.js
+++ b/lib/device/scm.js
@@ -1,17 +1,18 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
-const helpers = require('./../helpers')
 module.exports = class deviceSCM {
   constructor (platform, accessory) {
     this.platform = platform
+    this.log = platform.log
+    this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
     this.switchService = accessory.getService(this.Service.Switch) || accessory.addService(this.Service.Switch)
     this.switchService
       .getCharacteristic(this.Characteristic.On)
       .on('set', this.internalUpdate.bind(this))
-    accessory.log = this.platform.log
+    accessory.log = this.log
     accessory.eveLogger = new this.platform.eveService('switch', accessory, {
       storage: 'fs',
       path: this.platform.eveLogPath
@@ -22,7 +23,7 @@ module.exports = class deviceSCM {
   async internalUpdate (value, callback) {
     try {
       callback()
-      const params = { switches: helpers.defaultMultiSwitchOff }
+      const params = { switches: this.helpers.defaultMultiSwitchOff }
       params.switches[0].switch = value ? 'on' : 'off'
       await this.platform.sendDeviceUpdate(this.accessory, params)
     } catch (err) {
@@ -32,7 +33,7 @@ module.exports = class deviceSCM {
 
   async externalUpdate (params) {
     try {
-      if (!helpers.hasProperty(params, 'switches')) return
+      if (!this.helpers.hasProperty(params, 'switches')) return
       this.switchService.updateCharacteristic(this.Characteristic.On, params.switches[0].switch === 'on')
       this.accessory.eveLogger.addEntry({
         time: Math.round(new Date().valueOf() / 1000),
diff --git a/lib/device/sensor.js b/lib/device/sensor.js
index caa6f93e..b4cbd278 100644
--- a/lib/device/sensor.js
+++ b/lib/device/sensor.js
@@ -1,21 +1,22 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
-const helpers = require('./../helpers')
 module.exports = class deviceSensor {
   constructor (platform, accessory) {
     this.platform = platform
+    this.log = platform.log
+    this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
     this.lowBattThreshold = parseInt(this.platform.config.lowBattThreshold)
     this.lowBattThreshold = isNaN(this.lowBattThreshold)
-      ? helpers.defaults.lowBattThreshold
+      ? this.helpers.defaults.lowBattThreshold
       : this.lowBattThreshold < 5
-        ? helpers.defaults.lowBattThreshold
+        ? this.helpers.defaults.lowBattThreshold
         : this.lowBattThreshold
     this.contactService = accessory.getService(this.Service.ContactSensor) || accessory.addService(this.Service.ContactSensor)
     this.batteryService = accessory.getService(this.Service.BatteryService) || accessory.addService(this.Service.BatteryService)
-    accessory.log = this.platform.log
+    accessory.log = this.log
     accessory.eveLogger = new this.platform.eveService('door', accessory, {
       storage: 'fs',
       path: this.platform.eveLogPath
@@ -25,13 +26,13 @@ module.exports = class deviceSensor {
 
   async externalUpdate (params) {
     try {
-      if (helpers.hasProperty(params, 'battery')) {
+      if (this.helpers.hasProperty(params, 'battery')) {
         const scaledBattery = Math.round(params.battery * 33.3)
         this.batteryService
           .updateCharacteristic(this.Characteristic.BatteryLevel, scaledBattery)
           .updateCharacteristic(this.Characteristic.StatusLowBattery, scaledBattery < this.lowBattThreshold)
       }
-      if (!helpers.hasProperty(params, 'switch')) return
+      if (!this.helpers.hasProperty(params, 'switch')) return
       const newState = params.switch === 'on' ? 1 : 0
       let oAccessory = false
       this.contactService.updateCharacteristic(this.Characteristic.ContactSensorState, newState)
@@ -50,7 +51,7 @@ module.exports = class deviceSensor {
                   .updateCharacteristic(this.Characteristic.CurrentDoorState, 1)
                 break
               case 1:
-                await helpers.sleep(Math.max(group.operationTime * 100, 1000))
+                await this.helpers.sleep(Math.max(group.operationTime * 100, 1000))
                 gdService
                   .updateCharacteristic(this.Characteristic.TargetDoorState, 0)
                   .updateCharacteristic(this.Characteristic.CurrentDoorState, 0)
diff --git a/lib/device/switch-multi.js b/lib/device/switch-multi.js
index 09ec9c1a..88e8ac67 100644
--- a/lib/device/switch-multi.js
+++ b/lib/device/switch-multi.js
@@ -1,10 +1,11 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
-const helpers = require('./../helpers')
 module.exports = class deviceSwitchMulti {
   constructor (platform, accessory) {
     this.platform = platform
+    this.log = platform.log
+    this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
     this.switchService = accessory.getService(this.Service.Switch) || accessory.addService(this.Service.Switch)
@@ -17,7 +18,7 @@ module.exports = class deviceSwitchMulti {
     if (accessory.getService(this.Service.Lightbulb)) {
       accessory.removeService(accessory.getService(this.Service.Lightbulb))
     }
-    accessory.log = this.platform.log
+    accessory.log = this.log
     accessory.eveLogger = new this.platform.eveService('switch', accessory, {
       storage: 'fs',
       path: this.platform.eveLogPath
@@ -27,14 +28,14 @@ module.exports = class deviceSwitchMulti {
 
   async internalUpdate (value, callback) {
     try {
-      await helpers.sleep(Math.floor(Math.random() * 491 + 10))
+      await this.helpers.sleep(Math.floor(Math.random() * 491 + 10))
       callback()
       let oAccessory
       let masterState = 'off'
       const params = {}
       switch (this.accessory.context.switchNumber) {
         case '0':
-          params.switches = helpers.defaultMultiSwitchOff
+          params.switches = this.helpers.defaultMultiSwitchOff
           params.switches[0].switch = value ? 'on' : 'off'
           params.switches[1].switch = value ? 'on' : 'off'
           params.switches[2].switch = value ? 'on' : 'off'
@@ -50,7 +51,7 @@ module.exports = class deviceSwitchMulti {
         case '2':
         case '3':
         case '4':
-          params.switches = helpers.defaultMultiSwitchOff
+          params.switches = this.helpers.defaultMultiSwitchOff
           for (let i = 1; i <= 4; i++) {
             if ((oAccessory = this.platform.devicesInHB.get(this.accessory.context.eweDeviceId + 'SW' + i))) {
               if (oAccessory.getService(this.Service.Switch).getCharacteristic(this.Characteristic.On).value) {
@@ -80,7 +81,7 @@ module.exports = class deviceSwitchMulti {
 
   async externalUpdate (params) {
     try {
-      if (!helpers.hasProperty(params, 'switches')) return
+      if (!this.helpers.hasProperty(params, 'switches')) return
       const idToCheck = this.accessory.context.hbDeviceId.slice(0, -1)
       let primaryState = false
       for (let i = 1; i <= this.accessory.context.channelCount; i++) {
diff --git a/lib/device/switch-single.js b/lib/device/switch-single.js
index ec654f83..8c8dde15 100644
--- a/lib/device/switch-single.js
+++ b/lib/device/switch-single.js
@@ -1,10 +1,11 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
-const helpers = require('./../helpers')
 module.exports = class deviceSwitchSingle {
   constructor (platform, accessory) {
     this.platform = platform
+    this.log = platform.log
+    this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
     this.switchService = accessory.getService(this.Service.Switch) || accessory.addService(this.Service.Switch)
@@ -17,7 +18,7 @@ module.exports = class deviceSwitchSingle {
     if (accessory.getService(this.Service.Lightbulb)) {
       accessory.removeService(accessory.getService(this.Service.Lightbulb))
     }
-    accessory.log = this.platform.log
+    accessory.log = this.log
     accessory.eveLogger = new this.platform.eveService('switch', accessory, {
       storage: 'fs',
       path: this.platform.eveLogPath
@@ -27,7 +28,7 @@ module.exports = class deviceSwitchSingle {
 
   async internalUpdate (value, callback) {
     try {
-      await helpers.sleep(Math.floor(Math.random() * 491 + 10))
+      await this.helpers.sleep(Math.floor(Math.random() * 491 + 10))
       callback()
       const params = { switch: value ? 'on' : 'off' }
       await this.platform.sendDeviceUpdate(this.accessory, params)
@@ -38,7 +39,7 @@ module.exports = class deviceSwitchSingle {
 
   async externalUpdate (params) {
     try {
-      if (!helpers.hasProperty(params, 'switch')) return
+      if (!this.helpers.hasProperty(params, 'switch')) return
       this.switchService.updateCharacteristic(this.Characteristic.On, params.switch === 'on')
       this.accessory.eveLogger.addEntry({
         time: Math.round(new Date().valueOf() / 1000),
diff --git a/lib/device/switch-valve.js b/lib/device/switch-valve.js
index d0492564..a91be57c 100644
--- a/lib/device/switch-valve.js
+++ b/lib/device/switch-valve.js
@@ -1,10 +1,11 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
-const helpers = require('./../helpers')
 module.exports = class deviceSwitchValve {
   constructor (platform, accessory) {
     this.platform = platform
+    this.log = platform.log
+    this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
     const valveConfig = this.platform.cusG.get(accessory.context.hbDeviceId)
@@ -34,7 +35,7 @@ module.exports = class deviceSwitchValve {
         }
         callback()
       })
-    accessory.log = this.platform.log
+    accessory.log = this.log
     accessory.eveLogger = new this.platform.eveService('switch', accessory, {
       storage: 'fs',
       path: this.platform.eveLogPath
@@ -45,7 +46,7 @@ module.exports = class deviceSwitchValve {
   async internalSwitchUpdate (value, callback) {
     try {
       callback()
-      const params = { switches: helpers.defaultMultiSwitchOff }
+      const params = { switches: this.helpers.defaultMultiSwitchOff }
       params.switches[0].switch = value ? 'on' : 'off'
       params.switches[1].switch = this.valveService.getCharacteristic(this.Characteristic.Active).value === 1
         ? 'on'
@@ -59,7 +60,7 @@ module.exports = class deviceSwitchValve {
   async internalValveUpdate (value, callback) {
     try {
       callback()
-      const params = { switches: helpers.defaultMultiSwitchOff }
+      const params = { switches: this.helpers.defaultMultiSwitchOff }
       params.switches[0].switch = this.switchService.getCharacteristic(this.Characteristic.On).value ? 'on' : 'off'
       params.switches[1].switch = value === 1 ? 'on' : 'off'
       this.valveService.updateCharacteristic(this.Characteristic.InUse, value)
@@ -83,7 +84,7 @@ module.exports = class deviceSwitchValve {
 
   async externalUpdate (params) {
     try {
-      if (!helpers.hasProperty(params, 'switches')) return
+      if (!this.helpers.hasProperty(params, 'switches')) return
 
       this.switchService.updateCharacteristic(this.Characteristic.On, params.switches[0].switch === 'on')
       this.accessory.eveLogger.addEntry({
diff --git a/lib/device/template.js b/lib/device/template.js
index 728469c0..3a79f0e9 100644
--- a/lib/device/template.js
+++ b/lib/device/template.js
@@ -4,6 +4,8 @@
 module.exports = class deviceTemplate {
   constructor (platform, accessory) {
     this.platform = platform
+    this.log = platform.log
+    this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
     const service = accessory.getService(this.Service.Switch) || accessory.addService(this.Service.Switch)
diff --git a/lib/device/thermostat.js b/lib/device/thermostat.js
index f045421f..af9a49f7 100644
--- a/lib/device/thermostat.js
+++ b/lib/device/thermostat.js
@@ -1,10 +1,11 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
-const helpers = require('./../helpers')
 module.exports = class deviceThermostat {
   constructor (platform, accessory) {
     this.platform = platform
+    this.log = platform.log
+    this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
     if (accessory.getService(this.Service.Switch)) {
@@ -36,7 +37,7 @@ module.exports = class deviceThermostat {
     ) {
       accessory.addCharacteristic(this.Characteristic.CurrentRelativeHumidity)
     }
-    accessory.log = this.platform.log
+    accessory.log = this.log
     accessory.eveLogger = new this.platform.eveService('custom', accessory, {
       storage: 'fs',
       path: this.platform.eveLogPath
@@ -60,7 +61,7 @@ module.exports = class deviceThermostat {
   async internalTempUpdate (value, callback) {
     try {
       callback()
-      await helpers.sleep(500)
+      await this.helpers.sleep(500)
       this.service.updateCharacteristic(
         this.Characteristic.TargetTemperature,
         this.service.getCharacteristic(this.Characteristic.CurrentTemperature).value
@@ -74,26 +75,26 @@ module.exports = class deviceThermostat {
     try {
       if (
         !(this.platform.config.hideSwitchFromTH || '').includes(this.accessory.context.eweDeviceId) &&
-        (helpers.hasProperty(params, 'switch') || helpers.hasProperty(params, 'mainSwitch'))
+        (this.helpers.hasProperty(params, 'switch') || this.helpers.hasProperty(params, 'mainSwitch'))
       ) {
-        const newState = helpers.hasProperty(params, 'switch') ? params.switch === 'on' : params.mainSwitch === 'on'
+        const newState = this.helpers.hasProperty(params, 'switch') ? params.switch === 'on' : params.mainSwitch === 'on'
         this.service.updateCharacteristic(this.Characteristic.TargetHeatingCoolingState, newState ? 1 : 0)
       }
       const eveLog = { time: Math.round(new Date().valueOf() / 1000) }
-      if (helpers.hasProperty(params, 'currentTemperature')) {
+      if (this.helpers.hasProperty(params, 'currentTemperature')) {
         const currentTemp = parseFloat(params.currentTemperature !== 'unavailable' ? params.currentTemperature : 0)
         this.service.updateCharacteristic(this.Characteristic.CurrentTemperature, currentTemp)
         this.service.updateCharacteristic(this.Characteristic.TargetTemperature, currentTemp)
         eveLog.temp = currentTemp
       }
       if (
-        helpers.hasProperty(params, 'currentHumidity') && this.service.testCharacteristic(this.Characteristic.CurrentRelativeHumidity)
+        this.helpers.hasProperty(params, 'currentHumidity') && this.service.testCharacteristic(this.Characteristic.CurrentRelativeHumidity)
       ) {
         const currentHumi = parseFloat(params.currentHumidity !== 'unavailable' ? params.currentHumidity : 0)
         this.humiService.updateCharacteristic(this.Characteristic.CurrentRelativeHumidity, currentHumi)
         eveLog.humidity = currentHumi
       }
-      if (helpers.hasProperty(eveLog, 'temp') || helpers.hasProperty(eveLog, 'humidity')) {
+      if (this.helpers.hasProperty(eveLog, 'temp') || this.helpers.hasProperty(eveLog, 'humidity')) {
         this.accessory.eveLogger.addEntry(eveLog)
       }
     } catch (err) {
diff --git a/lib/device/usb.js b/lib/device/usb.js
index da0161c8..d7fe3c09 100644
--- a/lib/device/usb.js
+++ b/lib/device/usb.js
@@ -1,17 +1,18 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
-const helpers = require('./../helpers')
 module.exports = class deviceUSB {
   constructor (platform, accessory) {
     this.platform = platform
+    this.log = platform.log
+    this.this.helpers = platform.this.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
     this.outletService = accessory.getService(this.Service.Outlet) || accessory.addService(this.Service.Outlet)
     this.outletService
       .getCharacteristic(this.Characteristic.On)
       .on('set', this.internalUpdate.bind(this))
-    accessory.log = this.platform.log
+    accessory.log = this.log
     accessory.eveLogger = new this.platform.eveService('switch', accessory, {
       storage: 'fs',
       path: this.platform.eveLogPath
@@ -22,7 +23,7 @@ module.exports = class deviceUSB {
   async internalUpdate (value, callback) {
     try {
       callback()
-      const params = { switches: helpers.defaultMultiSwitchOff }
+      const params = { switches: this.helpers.defaultMultiSwitchOff }
       params.switches[0].switch = value ? 'on' : 'off'
       await this.platform.sendDeviceUpdate(this.accessory, params)
     } catch (err) {
@@ -32,7 +33,7 @@ module.exports = class deviceUSB {
 
   async externalUpdate (params) {
     try {
-      if (!helpers.hasProperty(params, 'switches')) return
+      if (!this.helpers.hasProperty(params, 'switches')) return
       this.outletService.updateCharacteristic(this.Characteristic.On, params.switches[0].switch === 'on')
       this.accessory.eveLogger.addEntry({
         time: Math.round(new Date().valueOf() / 1000),
diff --git a/lib/device/valve-two.js b/lib/device/valve-two.js
index 3f3c9499..bc0b034e 100644
--- a/lib/device/valve-two.js
+++ b/lib/device/valve-two.js
@@ -1,10 +1,11 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
-const helpers = require('./../helpers')
 module.exports = class deviceValveTwo {
   constructor (platform, accessory) {
     this.platform = platform
+    this.log = platform.log
+    this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
     ;['A', 'B'].forEach(v => {
@@ -40,7 +41,7 @@ module.exports = class deviceValveTwo {
   async internalUpdate (valve, value, callback) {
     try {
       callback()
-      const params = { switches: helpers.defaultMultiSwitchOff }
+      const params = { switches: this.helpers.defaultMultiSwitchOff }
       const serviceValve = this.accessory.getService(valve)
       switch (valve) {
         case 'Valve A':
@@ -77,7 +78,7 @@ module.exports = class deviceValveTwo {
 
   async externalUpdate (params) {
     try {
-      if (!helpers.hasProperty(params, 'switches')) return
+      if (!this.helpers.hasProperty(params, 'switches')) return
       ;['A', 'B'].forEach((v, k) => {
         const valveService = this.accessory.getService('Valve ' + v)
         valveService
diff --git a/lib/device/valve.js b/lib/device/valve.js
index 175ac295..5ff827c3 100644
--- a/lib/device/valve.js
+++ b/lib/device/valve.js
@@ -1,10 +1,11 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
-const helpers = require('./../helpers')
 module.exports = class deviceValve {
   constructor (platform, accessory) {
     this.platform = platform
+    this.log = platform.log
+    this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
     const valveConfig = this.platform.cusG.get(accessory.context.hbDeviceId)
@@ -61,7 +62,7 @@ module.exports = class deviceValve {
 
   async externalUpdate (params) {
     try {
-      if (!helpers.hasProperty(params, 'switch')) return
+      if (!this.helpers.hasProperty(params, 'switch')) return
       this.valveService
         .updateCharacteristic(this.Characteristic.Active, params.switch === 'on' ? 1 : 0)
         .updateCharacteristic(this.Characteristic.InUse, params.switch === 'on' ? 1 : 0)
diff --git a/lib/device/zb-dev.js b/lib/device/zb-dev.js
index 85d73425..dad8f5cb 100644
--- a/lib/device/zb-dev.js
+++ b/lib/device/zb-dev.js
@@ -1,23 +1,24 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
-const helpers = require('./../helpers')
 module.exports = class deviceZBDev {
   constructor (platform, accessory) {
     this.platform = platform
+    this.log = platform.log
+    this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
     this.lowBattThreshold = parseInt(this.platform.config.lowBattThreshold)
     this.lowBattThreshold = isNaN(this.lowBattThreshold)
-      ? helpers.defaults.lowBattThreshold
+      ? this.helpers.defaults.lowBattThreshold
       : this.lowBattThreshold < 5
-        ? helpers.defaults.lowBattThreshold
+        ? this.helpers.defaults.lowBattThreshold
         : this.lowBattThreshold
     this.sensorTimeDifference = parseInt(this.platform.config.sensorTimeDifference)
     this.sensorTimeDifference = isNaN(this.sensorTimeDifference)
-      ? helpers.defaults.sensorTimeDifference
+      ? this.helpers.defaults.sensorTimeDifference
       : this.sensorTimeDifference < 10
-        ? helpers.defaults.sensorTimeDifference
+        ? this.helpers.defaults.sensorTimeDifference
         : this.sensorTimeDifference
     switch (accessory.context.eweUIID) {
       case 1000: {
@@ -36,7 +37,7 @@ module.exports = class deviceZBDev {
       case 1256:
         if (accessory.getService(this.Service.BatteryService)) accessory.removeService(accessory.getService(this.Service.BatteryService))
         if (!accessory.getService(this.Service.Switch)) accessory.addService(this.Service.Switch)
-        accessory.log = this.platform.log
+        accessory.log = this.log
         accessory.eveLogger = new this.platform.eveService('switch', accessory, {
           storage: 'fs',
           path: this.platform.eveLogPath
@@ -53,7 +54,7 @@ module.exports = class deviceZBDev {
             minValue: -100
           })
         if (!accessory.getService(this.Service.HumiditySensor)) accessory.addService(this.Service.HumiditySensor)
-        accessory.log = this.platform.log
+        accessory.log = this.log
         accessory.eveLogger = new this.platform.eveService('weather', accessory, {
           storage: 'fs',
           path: this.platform.eveLogPath
@@ -63,7 +64,7 @@ module.exports = class deviceZBDev {
       case 2026:
         if (!accessory.getService(this.Service.BatteryService)) accessory.addService(this.Service.BatteryService)
         if (!accessory.getService(this.Service.MotionSensor)) accessory.addService(this.Service.MotionSensor)
-        accessory.log = this.platform.log
+        accessory.log = this.log
         accessory.eveLogger = new this.platform.eveService('motion', accessory, {
           storage: 'fs',
           path: this.platform.eveLogPath
@@ -72,7 +73,7 @@ module.exports = class deviceZBDev {
       case 3026:
         if (!accessory.getService(this.Service.BatteryService)) accessory.addService(this.Service.BatteryService)
         if (!accessory.getService(this.Service.ContactSensor)) accessory.addService(this.Service.ContactSensor)
-        accessory.log = this.platform.log
+        accessory.log = this.log
         accessory.eveLogger = new this.platform.eveService('door', accessory, {
           storage: 'fs',
           path: this.platform.eveLogPath
@@ -95,7 +96,7 @@ module.exports = class deviceZBDev {
   async externalUpdate (params) {
     try {
       //* ** credit @tasict ***\\
-      if (helpers.hasProperty(params, 'battery')) {
+      if (this.helpers.hasProperty(params, 'battery')) {
         if (this.accessory.context.eweUIID === 3026 && this.platform.config.ZBDWBatt) {
           params.battery *= 10
         }
@@ -109,7 +110,7 @@ module.exports = class deviceZBDev {
       }
       switch (this.accessory.context.eweUIID) {
         case 1000:
-          if (helpers.hasProperty(params, 'key') && [0, 1, 2].includes(params.key)) {
+          if (this.helpers.hasProperty(params, 'key') && [0, 1, 2].includes(params.key)) {
             this.accessory
               .getService(this.Service.StatelessProgrammableSwitch)
               .updateCharacteristic(this.Characteristic.ProgrammableSwitchEvent, params.key)
@@ -117,7 +118,7 @@ module.exports = class deviceZBDev {
           break
         case 1009:
         case 1256:
-          if (helpers.hasProperty(params, 'switch') && ['off', 'on'].includes(params.switch)) {
+          if (this.helpers.hasProperty(params, 'switch') && ['off', 'on'].includes(params.switch)) {
             this.accessory
               .getService(this.Service.Switch)
               .updateCharacteristic(this.Characteristic.On, params.switch === 'on')
@@ -129,31 +130,31 @@ module.exports = class deviceZBDev {
           break
         case 1770: {
           const eveLog = { time: Math.round(new Date().valueOf() / 1000) }
-          if (helpers.hasProperty(params, 'temperature')) {
+          if (this.helpers.hasProperty(params, 'temperature')) {
             const currentTemp = parseInt(params.temperature) / 100
             this.accessory
               .getService(this.Service.TemperatureSensor)
               .updateCharacteristic(this.Characteristic.CurrentTemperature, currentTemp)
             eveLog.temp = parseFloat(currentTemp)
           }
-          if (helpers.hasProperty(params, 'humidity')) {
+          if (this.helpers.hasProperty(params, 'humidity')) {
             const currentHumi = parseInt(params.humidity) / 100
             this.accessory
               .getService(this.Service.HumiditySensor)
               .updateCharacteristic(this.Characteristic.CurrentRelativeHumidity, currentHumi)
             eveLog.humidity = parseFloat(currentHumi)
           }
-          if (helpers.hasProperty(eveLog, 'temp') || helpers.hasProperty(eveLog, 'humidity')) {
+          if (this.helpers.hasProperty(eveLog, 'temp') || this.helpers.hasProperty(eveLog, 'humidity')) {
             this.accessory.eveLogger.addEntry(eveLog)
           }
           break
         }
         case 2026:
-          if (helpers.hasProperty(params, 'motion') && helpers.hasProperty(params, 'trigTime')) {
+          if (this.helpers.hasProperty(params, 'motion') && this.helpers.hasProperty(params, 'trigTime')) {
             const timeNow = new Date()
             const diff = (timeNow.getTime() - params.trigTime) / 1000
             const motionDetected =
-              helpers.hasProperty(params, 'updateSource') &&
+              this.helpers.hasProperty(params, 'updateSource') &&
               params.motion === 1 &&
               diff < this.sensorTimeDifference
             this.accessory.eveLogger.addEntry({
@@ -165,7 +166,7 @@ module.exports = class deviceZBDev {
           }
           break
         case 3026:
-          if (helpers.hasProperty(params, 'lock') && [0, 1].includes(params.lock)) {
+          if (this.helpers.hasProperty(params, 'lock') && [0, 1].includes(params.lock)) {
             this.accessory
               .getService(this.Service.ContactSensor)
               .updateCharacteristic(this.Characteristic.ContactSensorState, params.lock)
diff --git a/index.js b/lib/index.js
similarity index 61%
rename from index.js
rename to lib/index.js
index b66ae1c9..aee91573 100644
--- a/index.js
+++ b/lib/index.js
@@ -1,5 +1,4 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
-const eWeLinkPlatform = require('./lib/ewelink-platform.js')
-module.exports = hb => hb.registerPlatform('homebridge-ewelink', 'eWeLink', eWeLinkPlatform)
+module.exports = hb => hb.registerPlatform('homebridge-ewelink', 'eWeLink', require('./platform.js'))
diff --git a/lib/ewelink-platform.js b/lib/platform.js
similarity index 81%
rename from lib/ewelink-platform.js
rename to lib/platform.js
index eed412b7..a813ec9a 100644
--- a/lib/ewelink-platform.js
+++ b/lib/platform.js
@@ -1,44 +1,15 @@
-/* jshint -W014, -W033, esversion: 9 */
+/* jshint -W014, -W033, esthis.version: 9 */
 /* eslint-disable new-cap */
 'use strict'
-const deviceCurtain = require('./device/curtain')
-const deviceBlind = require('./device/blind')
-const deviceGarage = require('./device/garage')
-const deviceGarageTwo = require('./device/garage-two')
-const deviceGarageFour = require('./device/garage-four')
-const deviceGarageEachen = require('./device/garage-eachen')
-const deviceLock = require('./device/lock')
-const deviceValve = require('./device/valve')
-const deviceValveTwo = require('./device/valve-two')
-const deviceSensor = require('./device/sensor')
-const deviceFan = require('./device/fan')
-const deviceDiffuser = require('./device/diffuser')
-const deviceOutletTemp = require('./device/outlet-temp')
-const deviceThermostat = require('./device/thermostat')
-const deviceOutlet = require('./device/outlet')
-const deviceUSB = require('./device/usb')
-const deviceSCM = require('./device/scm')
-const deviceLightColour = require('./device/light-colour')
-const deviceLightCTemp = require('./device/light-ctemp')
-const deviceLightDimmer = require('./device/light-dimmer')
-const deviceSwitchMulti = require('./device/switch-multi')
-const deviceSwitchSingle = require('./device/switch-single')
-const deviceSwitchValve = require('./device/switch-valve')
-const deviceRFBridge = require('./device/rf-bridge')
-const deviceZBDev = require('./device/zb-dev')
-const eWeLinkHTTP = require('./ewelink-http')
-const eWeLinkLAN = require('./ewelink-lan')
-const eWeLinkWS = require('./ewelink-ws')
-const fakegato = require('./fakegato/fakegato-history')
-const helpers = require('./helpers')
 const promInterval = require('interval-promise')
-const version = require('./../package.json').version
 module.exports = class eWeLinkPlatform {
   constructor (log, config, api) {
+    this.version = require('./../package.json').version
+
     // *** Disable the plugin if not configured correctly *** \\
     if (!log || !api || !config) return
     if (!config.username || !config.password || !config.countryCode) {
-      log.warn('*** Disabling plugin [v%s] ***', version)
+      log.warn('*** Disabling plugin [v%s] ***', this.version)
       log.warn('*** eWeLink credentials missing from configuration ***')
       return
     }
@@ -47,9 +18,10 @@ module.exports = class eWeLinkPlatform {
     this.log = log
     this.config = config
     this.api = api
+    this.helpers = require('./utils/helpers')
     this.Characteristic = api.hap.Characteristic
     this.Service = api.hap.Service
-    this.eveService = fakegato(api)
+    this.eveService = require('./fakegato/fakegato-history')(api)
     this.debug = this.config.debug || false
     this.devicesInHB = new Map()
     this.devicesInEW = new Map()
@@ -76,16 +48,16 @@ module.exports = class eWeLinkPlatform {
       // *** Check to see if the user has disabled the plugin *** \\
       if (this.config.disablePlugin) {
         this.devicesInHB.forEach(a => this.removeAccessory(a))
-        this.log.warn('*** Disabling plugin [v%s] ***', version)
+        this.log.warn('*** Disabling plugin [v%s] ***', this.version)
         this.log.warn('*** To change this, set disablePlugin to false ***')
         return
       }
 
       // *** Set up initial sync with eWeLink *** \\
-      this.log('Plugin [v%s] initialised. Syncing with eWeLink...', version)
+      this.log('Plugin [v%s] initialised. Syncing with eWeLink...', this.version)
 
       // *** Set up the HTTP client, get the user HTTP host, and login *** \\
-      this.httpClient = new eWeLinkHTTP(this.config, this.log)
+      this.httpClient = new (require('./connection/http'))(this.config, this.log, this.helpers)
       await this.httpClient.getHost()
       this.authData = await this.httpClient.login()
 
@@ -94,31 +66,31 @@ module.exports = class eWeLinkPlatform {
       deviceList.forEach(device => this.devicesInEW.set(device.deviceid, device))
 
       // *** Set up the WS client, get the user WS host, and login *** \\
-      this.wsClient = new eWeLinkWS(this.config, this.log, this.authData)
+      this.wsClient = new (require('./connection/ws'))(this.config, this.log, this.helpers, this.authData)
       await this.wsClient.getHost()
       this.wsClient.login()
 
       // *** Set up the LAN client, scan for devices and start monitoring *** \\
-      this.lanClient = new eWeLinkLAN(this.config, this.log, deviceList)
+      this.lanClient = new (require('./connection/lan'))(this.config, this.log, this.helpers, deviceList)
       this.lanDevices = await this.lanClient.getHosts()
       await this.lanClient.startMonitor()
 
       // *** Check for valid Accessory Simulations and add to cusG for later use *** \\
       if (Object.keys(this.config.groups || []).length > 0) {
         this.config.groups
-          .filter(g => helpers.hasProperty(g, 'type') && helpers.allowedGroups.includes(g.type))
-          .filter(g => helpers.hasProperty(g, 'deviceId') && this.devicesInEW.has(g.deviceId))
+          .filter(g => this.helpers.hasProperty(g, 'type') && this.helpers.allowedGroups.includes(g.type))
+          .filter(g => this.helpers.hasProperty(g, 'deviceId') && this.devicesInEW.has(g.deviceId))
           .forEach(g => this.cusG.set(g.deviceId + 'SWX', g))
       }
 
       // *** Check for valid custom RF Bridge sensors and add to cusS for later use *** \\
       if (Object.keys(this.config.bridgeSensors || []).length > 0) {
         this.config.bridgeSensors
-          .filter(s => helpers.hasProperty(s, 'deviceId') && this.devicesInEW.has(s.deviceId))
+          .filter(s => this.helpers.hasProperty(s, 'deviceId') && this.devicesInEW.has(s.deviceId))
           .forEach(s => this.cusS.set(s.fullDeviceId, s))
       }
 
-      // *** Logging for informative purposes *** \\
+      // *** Log for informative purposes *** \\
       this.log('[%s] eWeLink devices loaded from the Homebridge cache.', this.devicesInHB.size)
       this.log('[%s] primary devices loaded from your eWeLink account.', this.devicesInEW.size)
 
@@ -143,7 +115,7 @@ module.exports = class eWeLinkPlatform {
             if (this.wsClient) {
               await this.wsClient.getHost()
               await this.wsClient.closeConnection()
-              await helpers.sleep(250)
+              await this.helpers.sleep(250)
               await this.wsClient.login()
             }
           } catch (err) {
@@ -152,14 +124,14 @@ module.exports = class eWeLinkPlatform {
         }
       }, 3600000, { stopOnError: false })
 
-      // *** Logging for informative purposes *** \\
+      // *** Log for informative purposes *** \\
       this.log("eWeLink sync complete. Don't forget to ⭐️  this plugin on GitHub if you're finding it useful!")
       if (this.config.debugReqRes) {
         this.log.warn("Note: 'Request & Response Logging' is not advised for long-term use.")
       }
     } catch (err) {
       // *** Catch errors at any point during setup *** \\
-      this.log.warn('*** Disabling plugin [v%s] ***', version)
+      this.log.warn('*** Disabling plugin [v%s] ***', this.version)
       this.log.warn(this.debug ? err : err.message)
 
       // *** Attempt to close WS (and refresh interval) and stop LAN monitor if this has been setup *** \\
@@ -203,14 +175,14 @@ module.exports = class eWeLinkPlatform {
       }
 
       // *** Set up the correct instance for this particular device *** \\
-      if (helpers.devicesCurtain.includes(device.extra.uiid)) {
+      if (this.helpers.devicesCurtain.includes(device.extra.uiid)) {
         /***********************
         BLINDS [EWELINK UIID 11]
         ***********************/
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
-          : this.addAccessory(device, device.deviceid + 'SWX', false, helpers.defaultCurtainCache)
-        accessory.control = new deviceCurtain(this, accessory)
+          : this.addAccessory(device, device.deviceid + 'SWX', false, this.helpers.defaultCurtainCache)
+        accessory.control = new (require('./device/curtain'))(this, accessory)
         /**********************/
       } else if (this.cusG.has(device.deviceid + 'SWX') && this.cusG.get(device.deviceid + 'SWX').type === 'blind') {
         /****************************
@@ -218,8 +190,8 @@ module.exports = class eWeLinkPlatform {
         ****************************/
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
-          : this.addAccessory(device, device.deviceid + 'SWX', false, helpers.defaultBlindCache)
-        accessory.control = new deviceBlind(this, accessory)
+          : this.addAccessory(device, device.deviceid + 'SWX', false, this.helpers.defaultBlindCache)
+        accessory.control = new (require('./device/blind'))(this, accessory)
         /***************************/
       } else if (this.cusG.has(device.deviceid + 'SWX') && this.cusG.get(device.deviceid + 'SWX').type === 'garage') {
         /**********************************
@@ -227,8 +199,8 @@ module.exports = class eWeLinkPlatform {
         **********************************/
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
-          : this.addAccessory(device, device.deviceid + 'SWX', false, helpers.defaultGarageCache)
-        accessory.control = new deviceGarage(this, accessory)
+          : this.addAccessory(device, device.deviceid + 'SWX', false, this.helpers.defaultGarageCache)
+        accessory.control = new (require('./device/garage'))(this, accessory)
         /*********************************/
       } else if (this.cusG.has(device.deviceid + 'SWX') && this.cusG.get(device.deviceid + 'SWX').type === 'garage_two') {
         /**********************************
@@ -236,8 +208,8 @@ module.exports = class eWeLinkPlatform {
         **********************************/
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
-          : this.addAccessory(device, device.deviceid + 'SWX', false, helpers.defaultGarageTwoCache)
-        accessory.control = new deviceGarageTwo(this, accessory)
+          : this.addAccessory(device, device.deviceid + 'SWX', false, this.helpers.defaultGarageTwoCache)
+        accessory.control = new (require('./device/garage-two'))(this, accessory)
         /*********************************/
       } else if (this.cusG.has(device.deviceid + 'SWX') && this.cusG.get(device.deviceid + 'SWX').type === 'garage_four') {
         /**********************************
@@ -245,8 +217,8 @@ module.exports = class eWeLinkPlatform {
         **********************************/
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
-          : this.addAccessory(device, device.deviceid + 'SWX', false, helpers.defaultGarageFourCache)
-        accessory.control = new deviceGarageFour(this, accessory)
+          : this.addAccessory(device, device.deviceid + 'SWX', false, this.helpers.defaultGarageFourCache)
+        accessory.control = new (require('./device/garage-four'))(this, accessory)
         /*********************************/
       } else if (this.cusG.has(device.deviceid + 'SWX') && this.cusG.get(device.deviceid + 'SWX').type === 'garage_eachen') {
         /***************************
@@ -255,7 +227,7 @@ module.exports = class eWeLinkPlatform {
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
           : this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new deviceGarageEachen(this, accessory)
+        accessory.control = new (require('./device/garage-eachen'))(this, accessory)
         /**************************/
       } else if (this.cusG.has(device.deviceid + 'SWX') && this.cusG.get(device.deviceid + 'SWX').type === 'lock') {
         /***************************
@@ -264,7 +236,7 @@ module.exports = class eWeLinkPlatform {
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
           : this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new deviceLock(this, accessory)
+        accessory.control = new (require('./device/lock'))(this, accessory)
         /**************************/
       } else if (this.cusG.has(device.deviceid + 'SWX') && this.cusG.get(device.deviceid + 'SWX').type === 'switch_valve') {
         /**********************************
@@ -273,7 +245,7 @@ module.exports = class eWeLinkPlatform {
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
           : this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new deviceSwitchValve(this, accessory)
+        accessory.control = new (require('./device/switch-valve'))(this, accessory)
         /***************************/
       } else if (this.cusG.has(device.deviceid + 'SWX') && this.cusG.get(device.deviceid + 'SWX').type === 'valve') {
         /**********************************
@@ -282,7 +254,7 @@ module.exports = class eWeLinkPlatform {
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
           : this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new deviceValve(this, accessory)
+        accessory.control = new (require('./device/valve'))(this, accessory)
         /***************************/
       } else if (this.cusG.has(device.deviceid + 'SWX') && this.cusG.get(device.deviceid + 'SWX').type === 'valve_two') {
         /**********************************
@@ -291,36 +263,36 @@ module.exports = class eWeLinkPlatform {
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
           : this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new deviceValveTwo(this, accessory)
+        accessory.control = new (require('./device/valve-two'))(this, accessory)
         /***************************/
-      } else if (helpers.devicesSensor.includes(device.extra.uiid)) {
+      } else if (this.helpers.devicesSensor.includes(device.extra.uiid)) {
         /*******************
         SENSORS [SONOFF DW2]
         *******************/
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
           : this.addAccessory(device, device.deviceid + 'SWX', false, { type: 'sensor' })
-        accessory.control = new deviceSensor(this, accessory)
+        accessory.control = new (require('./device/sensor'))(this, accessory)
         /******************/
-      } else if (helpers.devicesFan.includes(device.extra.uiid)) {
+      } else if (this.helpers.devicesFan.includes(device.extra.uiid)) {
         /***
         FANS
         ***/
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
           : this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new deviceFan(this, accessory)
+        accessory.control = new (require('./device/fan'))(this, accessory)
         /**/
-      } else if (helpers.devicesDiffuser.includes(device.extra.uiid)) {
+      } else if (this.helpers.devicesDiffuser.includes(device.extra.uiid)) {
         /********
         DIFFUSERS
         ********/
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
           : this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new deviceDiffuser(this, accessory)
+        accessory.control = new (require('./device/diffuser'))(this, accessory)
         /**/
-      } else if (helpers.devicesThermostat.includes(device.extra.uiid)) {
+      } else if (this.helpers.devicesThermostat.includes(device.extra.uiid)) {
         /********************
         THERMOSTATS [TH10/16]
         ********************/
@@ -330,12 +302,12 @@ module.exports = class eWeLinkPlatform {
             sensorType: device.params.sensorType
           })
         accessory.control = (this.config.thAsThermostat || '').split(',').includes(device.deviceid)
-          ? new deviceThermostat(this, accessory)
-          : new deviceOutletTemp(this, accessory)
+          ? new (require('./device/thermostat'))(this, accessory)
+          : new (require('./device/outlet-temp'))(this, accessory)
         /*********/
       } else if (
-        helpers.devicesOutlet.includes(device.extra.uiid) ||
-        (helpers.devicesSingleSwitch.includes(device.extra.uiid) && helpers.devicesSingleSwitchOutlet.includes(device.productModel))
+        this.helpers.devicesOutlet.includes(device.extra.uiid) ||
+        (this.helpers.devicesSingleSwitch.includes(device.extra.uiid) && this.helpers.devicesSingleSwitchOutlet.includes(device.productModel))
       ) {
         /******
         OUTLETS
@@ -344,68 +316,68 @@ module.exports = class eWeLinkPlatform {
           ? this.devicesInHB.get(device.deviceid + 'SWX')
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = (this.config.outletAsSwitch || '').split(',').includes(device.deviceid)
-          ? new deviceSwitchSingle(this, accessory)
-          : new deviceOutlet(this, accessory)
+          ? new (require('./device/switch-single'))(this, accessory)
+          : new (require('./device/outlet'))(this, accessory)
         /*****/
-      } else if (helpers.devicesUSB.includes(device.extra.uiid)) {
+      } else if (this.helpers.devicesUSB.includes(device.extra.uiid)) {
         /**********
         USB OUTLETS
         **********/
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
           : this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new deviceUSB(this, accessory)
+        accessory.control = new (require('./device/usb'))(this, accessory)
         /*********/
-      } else if (helpers.devicesSCM.includes(device.extra.uiid)) {
+      } else if (this.helpers.devicesSCM.includes(device.extra.uiid)) {
         /*********************************
         SINGLE CHL [MULTIPLE CHL HARDWARE]
         *********************************/
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
           : this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new deviceSCM(this, accessory)
+        accessory.control = new (require('./device/scm'))(this, accessory)
         /********************************/
-      } else if (helpers.devicesCTempable.includes(device.extra.uiid)) {
+      } else if (this.helpers.devicesCTempable.includes(device.extra.uiid)) {
         /*******************
         LIGHTS [COLOUR TEMP]
         *******************/
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
           : this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new deviceLightCTemp(this, accessory)
+        accessory.control = new (require('./device/light-ctemp'))(this, accessory)
         /******************/
-      } else if (helpers.devicesColourable.includes(device.extra.uiid)) {
+      } else if (this.helpers.devicesColourable.includes(device.extra.uiid)) {
         /******************
         LIGHTS [COLOUR RGB]
         ******************/
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
           : this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new deviceLightColour(this, accessory)
+        accessory.control = new (require('./device/light-colour'))(this, accessory)
         /*****************/
-      } else if (helpers.devicesBrightable.includes(device.extra.uiid)) {
+      } else if (this.helpers.devicesBrightable.includes(device.extra.uiid)) {
         /**************
         LIGHTS [DIMMER]
         **************/
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
           : this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new deviceLightDimmer(this, accessory)
+        accessory.control = new (require('./device/light-dimmer'))(this, accessory)
         /*************/
-      } else if (helpers.devicesSingleSwitch.includes(device.extra.uiid)) {
+      } else if (this.helpers.devicesSingleSwitch.includes(device.extra.uiid)) {
         /************************
         SWITCHES [SINGLE CHANNEL]
         ************************/
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
           : this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new deviceSwitchSingle(this, accessory)
+        accessory.control = new (require('./device/switch-single'))(this, accessory)
         /***********************/
-      } else if (helpers.devicesMultiSwitch.includes(device.extra.uiid)) {
+      } else if (this.helpers.devicesMultiSwitch.includes(device.extra.uiid)) {
         /***********************
         SWITCHES [MULTI CHANNEL]
         ***********************/
-        for (let i = 0; i <= helpers.chansFromUiid[device.extra.uiid]; i++) {
+        for (let i = 0; i <= this.helpers.chansFromUiid[device.extra.uiid]; i++) {
           if ((this.config.hideChanFromHB || '').split(',').includes(device.deviceid + 'SW' + i)) {
             if (this.devicesInHB.has(device.deviceid + 'SW' + i)) {
               this.removeAccessory(this.devicesInHB.get(device.deviceid + 'SW' + i))
@@ -418,29 +390,29 @@ module.exports = class eWeLinkPlatform {
               : this.addAccessory(device, device.deviceid + 'SW' + i)
             oAccessory
               .getService(this.Service.AccessoryInformation)
-              .setCharacteristic(this.Characteristic.FirmwareRevision, device.params.fwVersion)
+              .setCharacteristic(this.Characteristic.FirmwareRevision, device.params.fwthis.version)
           }
           oAccessory.context.reachableWAN = device.online
           oAccessory.context.reachableLAN = this.lanDevices.has(device.deviceid)
             ? this.lanDevices.get(device.deviceid).online
             : false
           oAccessory.context.eweBrandName = device.brandName
-          oAccessory.context.eweShared = helpers.hasProperty(device, 'sharedBy') && helpers.hasProperty(device.sharedBy, 'email')
+          oAccessory.context.eweShared = this.helpers.hasProperty(device, 'sharedBy') && this.helpers.hasProperty(device.sharedBy, 'email')
             ? device.sharedBy.email
             : false
-          oAccessory.control = new deviceSwitchMulti(this, oAccessory)
+          oAccessory.control = new (require('./device/switch-multi'))(this, oAccessory)
           this.api.updatePlatformAccessories('homebridge-ewelink', 'eWeLink', [oAccessory])
           this.devicesInHB.set(oAccessory.context.hbDeviceId, oAccessory)
           if (i === 0) accessory = oAccessory
         }
         /**********************/
-      } else if (helpers.devicesRFBridge.includes(device.extra.uiid)) {
+      } else if (this.helpers.devicesRFBridge.includes(device.extra.uiid)) {
         /*********************
         RF BRIDGE + SUBDEVICES
         *********************/
         let rfChlCounter = 0
         const rfMap = []
-        if (helpers.hasProperty(device, 'tags') && helpers.hasProperty(device.tags, 'zyx_info')) {
+        if (this.helpers.hasProperty(device, 'tags') && this.helpers.hasProperty(device.tags, 'zyx_info')) {
           device.tags.zyx_info.forEach(remote =>
             rfMap.push({
               name: remote.name,
@@ -454,7 +426,7 @@ module.exports = class eWeLinkPlatform {
           : this.addAccessory(device, device.deviceid + 'SW0', true, {
             rfMap
           }, 'rf_pri')
-        accessory.control = new deviceRFBridge(this, accessory)
+        accessory.control = new (require('./device/rf-bridge'))(this, accessory)
         this.hiddenMasters.push(device.deviceid)
         rfMap.forEach(subDevice => {
           const swNumber = rfChlCounter + 1
@@ -494,22 +466,22 @@ module.exports = class eWeLinkPlatform {
             : this.addAccessory(device, device.deviceid + 'SW' + swNumber, false, subExtraContext, 'rf_sub')
           oAccessory
             .getService(this.Service.AccessoryInformation)
-            .setCharacteristic(this.Characteristic.FirmwareRevision, device.params.fwVersion)
+            .setCharacteristic(this.Characteristic.FirmwareRevision, device.params.fwthis.version)
           oAccessory.context.reachableWAN = device.online
           oAccessory.context.reachableLAN = false
           oAccessory.context.eweBrandName = device.brandName
-          oAccessory.context.eweShared = helpers.hasProperty(device, 'sharedBy') && helpers.hasProperty(device.sharedBy, 'email')
+          oAccessory.context.eweShared = this.helpers.hasProperty(device, 'sharedBy') && this.helpers.hasProperty(device.sharedBy, 'email')
             ? device.sharedBy.email
             : false
           this.api.updatePlatformAccessories('homebridge-ewelink', 'eWeLink', [oAccessory])
           this.devicesInHB.set(oAccessory.context.hbDeviceId, oAccessory)
-          oAccessory.control = new deviceRFBridge(this, oAccessory)
+          oAccessory.control = new (require('./device/rf-bridge'))(this, oAccessory)
           rfChlCounter += Object.keys(subDevice.buttons || {}).length
         })
         accessory.context.channelCount = rfChlCounter
         this.devicesInHB.set(accessory.context.hbDeviceId, accessory)
         /********************/
-      } else if (helpers.devicesZBBridge.includes(device.extra.uiid)) {
+      } else if (this.helpers.devicesZBBridge.includes(device.extra.uiid)) {
         /************
         ZIGBEE BRIDGE
         ************/
@@ -518,16 +490,16 @@ module.exports = class eWeLinkPlatform {
         }
         return
         /***********/
-      } else if (helpers.devicesZB.includes(device.extra.uiid)) {
+      } else if (this.helpers.devicesZB.includes(device.extra.uiid)) {
         /****************
         ZIGBEE SUBDEVICES
         ****************/
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
           : this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new deviceZBDev(this, accessory)
+        accessory.control = new (require('./device/zb-dev'))(this, accessory)
         /***************/
-      } else if (helpers.devicesCamera.includes(device.extra.uiid)) {
+      } else if (this.helpers.devicesCamera.includes(device.extra.uiid)) {
         /******
         CAMERAS
         ******/
@@ -543,11 +515,11 @@ module.exports = class eWeLinkPlatform {
         /*********/
       }
 
-      // *** Update the current firmware version *** \\
+      // *** Update the current firmware this.version *** \\
       if (!this.hiddenMasters.includes(device.deviceid)) {
         accessory
           .getService(this.Service.AccessoryInformation)
-          .setCharacteristic(this.Characteristic.FirmwareRevision, device.params.fwVersion)
+          .setCharacteristic(this.Characteristic.FirmwareRevision, device.params.fwthis.version)
       }
 
       // *** Update the reachability values (via WS and LAN) *** \\
@@ -557,7 +529,7 @@ module.exports = class eWeLinkPlatform {
         : false
       accessory.context.inUse = false
       accessory.context.eweBrandName = device.brandName
-      accessory.context.eweShared = helpers.hasProperty(device, 'sharedBy') && helpers.hasProperty(device.sharedBy, 'email')
+      accessory.context.eweShared = this.helpers.hasProperty(device, 'sharedBy') && this.helpers.hasProperty(device.sharedBy, 'email')
         ? device.sharedBy.email
         : false
 
@@ -566,7 +538,7 @@ module.exports = class eWeLinkPlatform {
         ? 'and found locally with IP [' + this.lanDevices.get(device.deviceid).ip + ']'
         : 'but LAN mode unavailable as device '
       if (!accessory.context.reachableLAN) {
-        if (helpers.devicesNonLAN.includes(device.extra.uiid)) {
+        if (this.helpers.devicesNonLAN.includes(device.extra.uiid)) {
           str += "doesn't support it"
         } else if (accessory.context.sharedDevice) {
           str += 'is shared (' + device.sharedBy.email + ')'
@@ -584,7 +556,7 @@ module.exports = class eWeLinkPlatform {
       this.log(' → [%s] initialised %s.', device.name, str)
     } catch (err) {
       // *** Catch errors at any point during device initialisation *** \\
-      const deviceName = accessory && helpers.hasProperty(accessory, 'displayName')
+      const deviceName = accessory && this.helpers.hasProperty(accessory, 'displayName')
         ? accessory.displayName
         : device.name
       this.log.warn(' → [%s] could not be initialised as %s.', deviceName, this.debug ? err : err.message)
@@ -599,11 +571,11 @@ module.exports = class eWeLinkPlatform {
     let newDeviceName = type === 'rf_sub' ? device.tags.zyx_info[switchNumber - 1].name : device.name
     const channelCount = type === 'rf_pri'
       ? Object.keys((device.tags && device.tags.zyx_info) || []).length
-      : helpers.chansFromUiid[device.extra.uiid]
+      : this.helpers.chansFromUiid[device.extra.uiid]
     if (['1', '2', '3', '4'].includes(switchNumber) && type !== 'rf_sub') {
       if (
-        helpers.hasProperty(device, 'tags') &&
-        helpers.hasProperty(device.tags, 'ck_channel_name') &&
+        this.helpers.hasProperty(device, 'tags') &&
+        this.helpers.hasProperty(device.tags, 'ck_channel_name') &&
         device.tags.ck_channel_name[parseInt(switchNumber) - 1]
       ) {
         newDeviceName = device.tags.ck_channel_name[parseInt(switchNumber) - 1]
@@ -611,7 +583,7 @@ module.exports = class eWeLinkPlatform {
         newDeviceName += ' SW' + switchNumber
       }
     }
-    if (helpers.hasProperty(this.config.nameOverride, hbDeviceId)) {
+    if (this.helpers.hasProperty(this.config.nameOverride, hbDeviceId)) {
       newDeviceName = this.config.nameOverride[hbDeviceId]
     }
 
@@ -624,7 +596,7 @@ module.exports = class eWeLinkPlatform {
           .setCharacteristic(this.Characteristic.SerialNumber, hbDeviceId)
           .setCharacteristic(this.Characteristic.Manufacturer, device.brandName)
           .setCharacteristic(this.Characteristic.Model, device.productModel + ' (' + device.extra.model + ')')
-          .setCharacteristic(this.Characteristic.FirmwareRevision, device.params.fwVersion || version)
+          .setCharacteristic(this.Characteristic.FirmwareRevision, device.params.fwthis.version || this.version)
           .setCharacteristic(this.Characteristic.Identify, true)
         accessory.on('identify', (paired, callback) => {
           callback()
@@ -663,7 +635,7 @@ module.exports = class eWeLinkPlatform {
 
   async sendDeviceUpdate (accessory, params) {
     // *** Add a random delay of [1, 250]ms to avoid multiple http/ws requests a la vez
-    await helpers.sleep(Math.floor(Math.random() * 250 + 1))
+    await this.helpers.sleep(Math.floor(Math.random() * 250 + 1))
 
     // *** Set up the payload to send via LAN/WS *** \\
     const payload = {
@@ -675,7 +647,7 @@ module.exports = class eWeLinkPlatform {
     // *** Quick check to see if LAN mode is supported *** \\
     const res = this.config.disableLANMode
       ? 'LAN mode is disabled'
-      : helpers.devicesNonLAN.includes(accessory.context.eweUIID)
+      : this.helpers.devicesNonLAN.includes(accessory.context.eweUIID)
         ? 'LAN mode is not supported for this device'
         : await this.lanClient.sendUpdate(payload)
 
diff --git a/lib/helpers.js b/lib/utils/helpers.js
similarity index 100%
rename from lib/helpers.js
rename to lib/utils/helpers.js
diff --git a/package.json b/package.json
index bb143ae7..7fad06fb 100644
--- a/package.json
+++ b/package.json
@@ -2,26 +2,6 @@
   "name": "homebridge-ewelink",
   "version": "3.16.0",
   "author": "bwp91",
-  "contributors": [
-    "gbro115",
-    "MrTomAsh",
-    "howanghk",
-    "LeJeko",
-    "aremishevsky-chegg",
-    "samkni",
-    "robsonfj",
-    "ramsesz",
-    "metarutaiga",
-    "janbuecker",
-    "jacopofranza",
-    "donavanbecker",
-    "dhutchison",
-    "danielk117",
-    "bassrock",
-    "VictorKrasnov",
-    "JuniorGenius",
-    "BobbySlope"
-  ],
   "description": "Homebridge/HOOBS plugin to control eWeLink devices with original firmware.",
   "license": "MIT",
   "keywords": [
@@ -35,6 +15,7 @@
     "sonoff",
     "eachen"
   ],
+  "main": "lib/index.js",
   "engines": {
     "homebridge": "^1.1.0",
     "node": "^14.15.1"

From 9a5e85a0183d2349ac90ffe50c4a68a7ab4a39e3 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 2 Dec 2020 09:54:56 +0000
Subject: [PATCH 0886/3183] 3.16.1-0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c3802f91..2d46cac1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.16.0",
+  "version": "3.16.1-0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 7fad06fb..8ae0e6e7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.16.0",
+  "version": "3.16.1-0",
   "author": "bwp91",
   "description": "Homebridge/HOOBS plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From ecd0acf8945cefa15459f2c9a6e917243dcabf21 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 2 Dec 2020 10:14:33 +0000
Subject: [PATCH 0887/3183] device fwversion issue

---
 lib/platform.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/platform.js b/lib/platform.js
index a813ec9a..bdf8f9b2 100644
--- a/lib/platform.js
+++ b/lib/platform.js
@@ -390,7 +390,7 @@ module.exports = class eWeLinkPlatform {
               : this.addAccessory(device, device.deviceid + 'SW' + i)
             oAccessory
               .getService(this.Service.AccessoryInformation)
-              .setCharacteristic(this.Characteristic.FirmwareRevision, device.params.fwthis.version)
+              .setCharacteristic(this.Characteristic.FirmwareRevision, device.params.fwVersion || this.version)
           }
           oAccessory.context.reachableWAN = device.online
           oAccessory.context.reachableLAN = this.lanDevices.has(device.deviceid)
@@ -466,7 +466,7 @@ module.exports = class eWeLinkPlatform {
             : this.addAccessory(device, device.deviceid + 'SW' + swNumber, false, subExtraContext, 'rf_sub')
           oAccessory
             .getService(this.Service.AccessoryInformation)
-            .setCharacteristic(this.Characteristic.FirmwareRevision, device.params.fwthis.version)
+            .setCharacteristic(this.Characteristic.FirmwareRevision, device.params.fwVersion || this.version)
           oAccessory.context.reachableWAN = device.online
           oAccessory.context.reachableLAN = false
           oAccessory.context.eweBrandName = device.brandName
@@ -515,11 +515,11 @@ module.exports = class eWeLinkPlatform {
         /*********/
       }
 
-      // *** Update the current firmware this.version *** \\
+      // *** Update the current firmware version *** \\
       if (!this.hiddenMasters.includes(device.deviceid)) {
         accessory
           .getService(this.Service.AccessoryInformation)
-          .setCharacteristic(this.Characteristic.FirmwareRevision, device.params.fwthis.version)
+          .setCharacteristic(this.Characteristic.FirmwareRevision, device.params.fwVersion || this.version)
       }
 
       // *** Update the reachability values (via WS and LAN) *** \\
@@ -596,7 +596,7 @@ module.exports = class eWeLinkPlatform {
           .setCharacteristic(this.Characteristic.SerialNumber, hbDeviceId)
           .setCharacteristic(this.Characteristic.Manufacturer, device.brandName)
           .setCharacteristic(this.Characteristic.Model, device.productModel + ' (' + device.extra.model + ')')
-          .setCharacteristic(this.Characteristic.FirmwareRevision, device.params.fwthis.version || this.version)
+          .setCharacteristic(this.Characteristic.FirmwareRevision, device.params.fwVersion || this.version)
           .setCharacteristic(this.Characteristic.Identify, true)
         accessory.on('identify', (paired, callback) => {
           callback()

From 42008aac3ded65314c5d1211e9d8a8c4d03a4ddf Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 2 Dec 2020 10:15:02 +0000
Subject: [PATCH 0888/3183] add ip to custom ui

---
 lib/homebridge-ui/public/index.html | 7 +++++++
 lib/platform.js                     | 9 +++++++++
 2 files changed, 16 insertions(+)

diff --git a/lib/homebridge-ui/public/index.html b/lib/homebridge-ui/public/index.html
index 31242927..a8566a22 100644
--- a/lib/homebridge-ui/public/index.html
+++ b/lib/homebridge-ui/public/index.html
@@ -37,6 +37,10 @@
           <th scope="row">LAN Status</th>
           <td id="reachableLAN"></td>
         </tr>
+        <tr>
+          <th scope="row">LAN IP</th>
+          <td id="lanIP"></td>
+        </tr>
         <tr>
           <th scope="row">Homebridge ID</th>
           <td id="hbDeviceId"></td>
@@ -147,6 +151,9 @@ <h4>Disclaimer</h4>
           document.getElementById('reachableLAN').innerHTML = selectedAccessory.context.reachableLAN
             ? 'Online'
             : 'Offline'
+          document.getElementById('lanIP').innerHTML = selectedAccessory.context.ip
+            ? selectedAccessory.context.ip
+            : 'N/A'
           document.getElementById('hbDeviceId').innerHTML = selectedAccessory.context.hbDeviceId
           document.getElementById('eweDeviceId').innerHTML = selectedAccessory.context.eweDeviceId
           document.getElementById('eweBrandName').innerHTML = selectedAccessory.context.eweBrandName
diff --git a/lib/platform.js b/lib/platform.js
index bdf8f9b2..bb456692 100644
--- a/lib/platform.js
+++ b/lib/platform.js
@@ -400,6 +400,9 @@ module.exports = class eWeLinkPlatform {
           oAccessory.context.eweShared = this.helpers.hasProperty(device, 'sharedBy') && this.helpers.hasProperty(device.sharedBy, 'email')
             ? device.sharedBy.email
             : false
+          oAccessory.context.ip = oAccessory.context.reachableLAN
+            ? this.lanDevices.get(device.deviceid).ip
+            : false
           oAccessory.control = new (require('./device/switch-multi'))(this, oAccessory)
           this.api.updatePlatformAccessories('homebridge-ewelink', 'eWeLink', [oAccessory])
           this.devicesInHB.set(oAccessory.context.hbDeviceId, oAccessory)
@@ -473,6 +476,9 @@ module.exports = class eWeLinkPlatform {
           oAccessory.context.eweShared = this.helpers.hasProperty(device, 'sharedBy') && this.helpers.hasProperty(device.sharedBy, 'email')
             ? device.sharedBy.email
             : false
+          oAccessory.context.ip = oAccessory.context.reachableLAN
+            ? this.lanDevices.get(device.deviceid).ip
+            : false
           this.api.updatePlatformAccessories('homebridge-ewelink', 'eWeLink', [oAccessory])
           this.devicesInHB.set(oAccessory.context.hbDeviceId, oAccessory)
           oAccessory.control = new (require('./device/rf-bridge'))(this, oAccessory)
@@ -532,6 +538,9 @@ module.exports = class eWeLinkPlatform {
       accessory.context.eweShared = this.helpers.hasProperty(device, 'sharedBy') && this.helpers.hasProperty(device.sharedBy, 'email')
         ? device.sharedBy.email
         : false
+      accessory.context.ip = accessory.context.reachableLAN
+        ? this.lanDevices.get(device.deviceid).ip
+        : false
 
       // *** Helpful logging for each device *** \\
       let str = accessory.context.reachableLAN

From 35adbd947085301dcfb5a9c1c98875ebc8322f62 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 2 Dec 2020 10:15:41 +0000
Subject: [PATCH 0889/3183] 3.16.1-1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 2d46cac1..9107f68f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.16.1-0",
+  "version": "3.16.1-1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 8ae0e6e7..9c5099a8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.16.1-0",
+  "version": "3.16.1-1",
   "author": "bwp91",
   "description": "Homebridge/HOOBS plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From f34560fca102ab1fb4551a75cb1be4562e14e17e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 2 Dec 2020 11:00:50 +0000
Subject: [PATCH 0890/3183] jshint opts

---
 lib/platform.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/platform.js b/lib/platform.js
index bb456692..4ef409fa 100644
--- a/lib/platform.js
+++ b/lib/platform.js
@@ -1,4 +1,4 @@
-/* jshint -W014, -W033, esthis.version: 9 */
+/* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
 const promInterval = require('interval-promise')

From c49a94d2f52f4231d016687a0b54ed177c02a51b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 2 Dec 2020 14:50:09 +0000
Subject: [PATCH 0891/3183] colours

---
 lib/device/diffuser.js     |  8 ++---
 lib/device/light-colour.js | 13 ++++----
 lib/platform.js            | 23 ++++++-------
 lib/utils/helpers.js       | 68 ++++++++++++++++++++++++++++++++++++++
 package-lock.json          | 18 ----------
 package.json               |  2 --
 6 files changed, 87 insertions(+), 45 deletions(-)

diff --git a/lib/device/diffuser.js b/lib/device/diffuser.js
index 67b871fd..acb79f73 100644
--- a/lib/device/diffuser.js
+++ b/lib/device/diffuser.js
@@ -1,7 +1,5 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
-'use strict'
-const convert = require('color-convert')
 module.exports = class deviceDiffuser {
   constructor (platform, accessory) {
     this.platform = platform
@@ -93,11 +91,11 @@ module.exports = class deviceDiffuser {
       callback()
       const updateKeyColour = Math.random().toString(36).substr(2, 8)
       this.accessory.context.updateKeyColour = updateKeyColour
-      const newRGB = convert.hsv.rgb(
+      const newRGB = this.helpers.hsv2rgb([
         value,
         this.accessory.getService('Light').getCharacteristic(this.Characteristic.Saturation).value,
         100
-      )
+      ])
       const params = {
         lightRcolor: newRGB[0],
         lightGcolor: newRGB[1],
@@ -134,7 +132,7 @@ module.exports = class deviceDiffuser {
         this.helpers.hasProperty(params, 'lightGcolor') &&
         this.helpers.hasProperty(params, 'lightBcolor')
       ) {
-        const newColour = convert.rgb.hsv(params.lightRcolor, params.lightGcolor, params.lightBcolor)
+        const newColour = this.helpers.rgb2hsv([params.lightRcolor, params.lightGcolor, params.lightBcolor])
         this.lightService
           .updateCharacteristic(this.Characteristic.Hue, newColour[0])
           .updateCharacteristic(this.Characteristic.Saturation, 100)
diff --git a/lib/device/light-colour.js b/lib/device/light-colour.js
index b7f68b0f..600ac7d6 100644
--- a/lib/device/light-colour.js
+++ b/lib/device/light-colour.js
@@ -1,7 +1,6 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
-const convert = require('color-convert')
 module.exports = class deviceLightColour {
   constructor (platform, accessory) {
     this.platform = platform
@@ -93,7 +92,7 @@ module.exports = class deviceLightColour {
       await this.helpers.sleep(1500)
       callback()
       let params
-      const newRGB = convert.hsv.rgb(value, this.lightService.getCharacteristic(this.Characteristic.Saturation).value, 100)
+      const newRGB = this.helpers.hsv2rgb([value, this.lightService.getCharacteristic(this.Characteristic.Saturation).value, 100])
       const updateKeyColour = Math.random().toString(36).substr(2, 8)
       this.accessory.context.updateKeyColour = updateKeyColour
       switch (this.accessory.context.eweUIID) {
@@ -168,11 +167,11 @@ module.exports = class deviceLightColour {
               mode = 2
             }
             if (mode === 2) {
-              newColour = convert.rgb.hsv(
+              newColour = this.helpers.rgb2hsv([
                 parseInt(params.channel2),
                 parseInt(params.channel3),
                 parseInt(params.channel4)
-              )
+              ])
               this.lightService
                 .updateCharacteristic(this.Characteristic.Hue, newColour[0])
                 .updateCharacteristic(this.Characteristic.Saturation, 100)
@@ -185,7 +184,7 @@ module.exports = class deviceLightColour {
               this.lightService.updateCharacteristic(this.Characteristic.Brightness, params.bright)
             }
             if (this.helpers.hasProperty(params, 'colorR')) {
-              newColour = convert.rgb.hsv(params.colorR, params.colorG, params.colorB)
+              newColour = this.helpers.rgb2hsv(params.colorR, params.colorG, params.colorB)
               this.lightService
                 .updateCharacteristic(this.Characteristic.Hue, newColour[0])
                 .updateCharacteristic(this.Characteristic.Saturation, newColour[1])
@@ -204,11 +203,11 @@ module.exports = class deviceLightColour {
                   this.helpers.hasProperty(params.color, 'g') &&
                   this.helpers.hasProperty(params.color, 'b')
                 ) {
-                  newColour = convert.rgb.hsv(
+                  newColour = this.helpers.rgb2hsv([
                     parseInt(params.color.r),
                     parseInt(params.color.g),
                     parseInt(params.color.b)
-                  )
+                  ])
                   this.lightService
                     .updateCharacteristic(this.Characteristic.Hue, newColour[0])
                     .updateCharacteristic(this.Characteristic.Saturation, 100)
diff --git a/lib/platform.js b/lib/platform.js
index 4ef409fa..51c568c9 100644
--- a/lib/platform.js
+++ b/lib/platform.js
@@ -1,7 +1,6 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
-const promInterval = require('interval-promise')
 module.exports = class eWeLinkPlatform {
   constructor (log, config, api) {
     this.version = require('./../package.json').version
@@ -109,20 +108,18 @@ module.exports = class eWeLinkPlatform {
       this.lanClient.receiveUpdate(device => this.receiveDeviceUpdate(device))
 
       // *** Refresh the WS connection every 30 minutes *** \\
-      this.wsRefresh = promInterval(async () => {
-        if (this.wsRefreshFlag) {
-          try {
-            if (this.wsClient) {
-              await this.wsClient.getHost()
-              await this.wsClient.closeConnection()
-              await this.helpers.sleep(250)
-              await this.wsClient.login()
-            }
-          } catch (err) {
-            this.log.warn(this.debug ? err : err.message)
+      this.wsRefresh = setInterval(async () => {
+        try {
+          if (this.wsClient) {
+            await this.wsClient.getHost()
+            await this.wsClient.closeConnection()
+            await this.helpers.sleep(250)
+            await this.wsClient.login()
           }
+        } catch (err) {
+          this.log.warn(this.debug ? err : err.message)
         }
-      }, 3600000, { stopOnError: false })
+      }, 3600000)
 
       // *** Log for informative purposes *** \\
       this.log("eWeLink sync complete. Don't forget to ⭐️  this plugin on GitHub if you're finding it useful!")
diff --git a/lib/utils/helpers.js b/lib/utils/helpers.js
index a9b5c5fc..677a90fe 100644
--- a/lib/utils/helpers.js
+++ b/lib/utils/helpers.js
@@ -108,6 +108,74 @@ module.exports = {
       }
     ]
   },
+  hsv2rgb: hsv => {
+    /*
+    Credit: https://github.com/Qix-/color-convert
+    */
+    const h = hsv[0] / 60
+    const s = hsv[1] / 100
+    let v = hsv[2] / 100
+    const hi = Math.floor(h) % 6
+    const f = h - Math.floor(h)
+    const p = 255 * v * (1 - s)
+    const q = 255 * v * (1 - (s * f))
+    const t = 255 * v * (1 - (s * (1 - f)))
+    v *= 255
+    switch (hi) {
+      case 0:
+        return [v, t, p]
+      case 1:
+        return [q, v, p]
+      case 2:
+        return [p, v, t]
+      case 3:
+        return [p, q, v]
+      case 4:
+        return [t, p, v]
+      case 5:
+        return [v, p, q]
+    }
+  },
+  rgb2hsv: rgb => {
+    /*
+    Credit: https://github.com/Qix-/color-convert
+    */
+    let rdif
+    let gdif
+    let bdif
+    let h
+    let s
+    const r = rgb[0] / 255
+    const g = rgb[1] / 255
+    const b = rgb[2] / 255
+    const v = Math.max(r, g, b)
+    const diff = v - Math.min(r, g, b)
+    const diffc = function (c) {
+      return (v - c) / 6 / diff + 1 / 2
+    }
+    if (diff === 0) {
+      h = 0
+      s = 0
+    } else {
+      s = diff / v
+      rdif = diffc(r)
+      gdif = diffc(g)
+      bdif = diffc(b)
+      if (r === v) {
+        h = bdif - gdif
+      } else if (g === v) {
+        h = (1 / 3) + rdif - bdif
+      } else if (b === v) {
+        h = (2 / 3) + gdif - rdif
+      }
+      if (h < 0) {
+        h += 1
+      } else if (h > 1) {
+        h -= 1
+      }
+    }
+    return [h * 360, s * 100, v * 100]
+  },
   chansFromUiid: {
     1: 1, // "SOCKET"                                  \\ 20, MINI, BASIC, S26
     2: 2, // "SOCKET_2"                                \\
diff --git a/package-lock.json b/package-lock.json
index 9107f68f..be055239 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -31,19 +31,6 @@
       "resolved": "https://registry.npmjs.org/chnl/-/chnl-1.2.0.tgz",
       "integrity": "sha512-g5gJb59edwCliFbX2j7G6sBfY4sX9YLy211yctONI2GRaiX0f2zIbKWmBm+sPqFNEpM7Ljzm7IJX/xrjiEbPrw=="
     },
-    "color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "requires": {
-        "color-name": "~1.1.4"
-      }
-    },
-    "color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
     "define-properties": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
@@ -113,11 +100,6 @@
       "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz",
       "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg=="
     },
-    "interval-promise": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/interval-promise/-/interval-promise-1.4.0.tgz",
-      "integrity": "sha512-PUwEmGqUglJhb6M01JNvMDvxr4DA8FCeYoYCLHPEcBBZiq/8yOpCchfs1VJui7fXj69l170gAxzF1FeSA0nSlg=="
-    },
     "is-callable": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.2.tgz",
diff --git a/package.json b/package.json
index 9c5099a8..fab141a9 100644
--- a/package.json
+++ b/package.json
@@ -48,8 +48,6 @@
   "dependencies": {
     "@homebridge/plugin-ui-utils": "^0.0.17",
     "axios": "^0.21.0",
-    "color-convert": "^2.0.1",
-    "interval-promise": "^1.4.0",
     "node-dns-sd": "^0.4.2",
     "websocket-as-promised": "^1.1.0",
     "ws": "^7.4.0"

From 727094a34b0113db7ef2002a99f1b39bc84535f3 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 2 Dec 2020 14:51:09 +0000
Subject: [PATCH 0892/3183] 3.16.1-2

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index be055239..b5fc3b60 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.16.1-1",
+  "version": "3.16.1-2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index fab141a9..9bc76e76 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.16.1-1",
+  "version": "3.16.1-2",
   "author": "bwp91",
   "description": "Homebridge/HOOBS plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From e1aabab2178ff49247661e2979d908469d4f4668 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 2 Dec 2020 17:46:08 +0000
Subject: [PATCH 0893/3183] unnecessary var

---
 lib/platform.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/lib/platform.js b/lib/platform.js
index 51c568c9..a0fadbeb 100644
--- a/lib/platform.js
+++ b/lib/platform.js
@@ -33,7 +33,6 @@ module.exports = class eWeLinkPlatform {
     if (config.ipOverride) config.ipOverride.forEach(x => (this.ipOverrideTmp[x.deviceId] = x.deviceIP))
     this.config.nameOverride = this.nameOverrideTmp
     this.config.ipOverride = this.ipOverrideTmp
-    this.wsRefreshFlag = true
     this.eveLogPath = this.api.user.storagePath() + '/persist/'
 
     // *** Set up Homebridge API events *** \\
@@ -138,7 +137,6 @@ module.exports = class eWeLinkPlatform {
       } catch (err) {
         this.log.warn(this.debug ? err : err.message)
       }
-      this.wsRefreshFlag = false
     }
   }
 
@@ -150,7 +148,6 @@ module.exports = class eWeLinkPlatform {
     } catch (err) {
       this.log.warn(this.debug ? err : err.message)
     }
-    this.wsRefreshFlag = false
   }
 
   initialiseDevice (device) {

From 7837524bb353561f9f0c230c41df1bfdd4f84796 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 2 Dec 2020 17:58:04 +0000
Subject: [PATCH 0894/3183] lib formatting

---
 lib/connection/http.js | 16 ++++++++--------
 lib/connection/lan.js  | 28 +++++++++++++---------------
 lib/connection/ws.js   | 12 ++++--------
 lib/device/diffuser.js |  1 +
 4 files changed, 26 insertions(+), 31 deletions(-)

diff --git a/lib/connection/http.js b/lib/connection/http.js
index 8c56cabb..8c3f2be4 100644
--- a/lib/connection/http.js
+++ b/lib/connection/http.js
@@ -1,8 +1,6 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
-const axios = require('axios')
-const crypto = require('crypto')
 module.exports = class connectionHTTP {
   constructor (config, log, helpers) {
     // *** Set up our variables *** \\
@@ -14,6 +12,8 @@ module.exports = class connectionHTTP {
     this.password = config.password.toString()
     this.hideDevFromHB = (config.hideDevFromHB || '').toString()
     this.cCode = '+' + config.countryCode.toString().replace('+', '').replace(' ', '')
+    this.axios = require('axios')
+    this.crypto = require('crypto')
   }
 
   async getHost () {
@@ -37,7 +37,7 @@ module.exports = class connectionHTTP {
       })
       dataToSign.sort((a, b) => (a.key < b.key ? -1 : 1))
       dataToSign = dataToSign.map(k => k.key + '=' + k.value).join('&')
-      dataToSign = crypto.createHmac('sha256', this.helpers.appSecret).update(dataToSign).digest('base64')
+      dataToSign = this.crypto.createHmac('sha256', this.helpers.appSecret).update(dataToSign).digest('base64')
 
       // *** Log the data depending on the debug setting *** \\
       if (this.debugReqRes) {
@@ -47,7 +47,7 @@ module.exports = class connectionHTTP {
       }
 
       // *** Send the request *** \\
-      const res = await axios.get('https://api.coolkit.cc:8080/api/user/region', {
+      const res = await this.axios.get('https://api.coolkit.cc:8080/api/user/region', {
         headers: {
           Authorization: 'Sign ' + dataToSign,
           'Content-Type': 'application/json'
@@ -107,10 +107,10 @@ module.exports = class connectionHTTP {
     }
 
     // *** Set up the request signature *** \\
-    const dataToSign = crypto.createHmac('sha256', this.helpers.appSecret).update(JSON.stringify(data)).digest('base64')
+    const dataToSign = this.crypto.createHmac('sha256', this.helpers.appSecret).update(JSON.stringify(data)).digest('base64')
 
     // *** Send the request *** \\
-    const res = await axios.post('https://' + this.httpHost + '/v2/user/login', data, {
+    const res = await this.axios.post('https://' + this.httpHost + '/v2/user/login', data, {
       headers: {
         Authorization: 'Sign ' + dataToSign,
         'Content-Type': 'application/json',
@@ -169,7 +169,7 @@ module.exports = class connectionHTTP {
     // *** Used to get a user's device list *** \\
     try {
       // *** Send the request *** \\
-      const res = await axios.get('https://' + this.httpHost + '/v2/device/thing', {
+      const res = await this.axios.get('https://' + this.httpHost + '/v2/device/thing', {
         headers: {
           Authorization: 'Bearer ' + this.aToken,
           'Content-Type': 'application/json',
@@ -228,7 +228,7 @@ module.exports = class connectionHTTP {
     // *** Used to get info about a specific device *** \\
     try {
       // *** Send the request *** \\
-      const res = await axios.post('https://' + this.httpHost + '/v2/device/thing', {
+      const res = await this.axios.post('https://' + this.httpHost + '/v2/device/thing', {
         thingList: [{
           itemType: 1,
           id: deviceId
diff --git a/lib/connection/lan.js b/lib/connection/lan.js
index 57996ce9..a1f8750e 100644
--- a/lib/connection/lan.js
+++ b/lib/connection/lan.js
@@ -1,10 +1,6 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
-const axios = require('axios')
-const crypto = require('crypto')
-const dns = require('node-dns-sd')
-const eventEmitter = require('events')
 module.exports = class connectionLAN {
   constructor (config, log, helpers, devices) {
     this.log = log
@@ -12,7 +8,7 @@ module.exports = class connectionLAN {
     this.helpers = helpers
     this.debug = this.config.debug || false
     this.debugReqRes = this.config.debugReqRes || false
-    this.emitter = new eventEmitter()
+    this.emitter = new (require('events'))()
     this.devices = devices
     this.deviceMap = new Map()
     devices.forEach(device => {
@@ -23,10 +19,12 @@ module.exports = class connectionLAN {
         lastIV: null
       })
     })
+    this.crypto = require('crypto')
+    this.dns = require('node-dns-sd')
   }
 
   async getHosts () {
-    const res = await dns.discover({ name: '_ewelink._tcp.local' })
+    const res = await this.dns.discover({ name: '_ewelink._tcp.local' })
     res.forEach(device => {
       let d
       const deviceId = device.fqdn.replace('._ewelink._tcp.local', '').replace('eWeLink_', '')
@@ -45,7 +43,7 @@ module.exports = class connectionLAN {
   }
 
   async startMonitor () {
-    dns.ondata = packet => {
+    this.dns.ondata = packet => {
       if (packet.answers) {
         packet.answers
           .filter(value => value.name.includes('_ewelink._tcp.local'))
@@ -61,8 +59,8 @@ module.exports = class connectionLAN {
               (this.helpers.hasProperty(rdata, 'data2') ? rdata.data2 : '') +
               (this.helpers.hasProperty(rdata, 'data3') ? rdata.data3 : '') +
               (this.helpers.hasProperty(rdata, 'data4') ? rdata.data4 : '')
-            const key = crypto.createHash('md5').update(Buffer.from(deviceInfo.apiKey, 'utf8')).digest()
-            const dText = crypto.createDecipheriv('aes-128-cbc', key, Buffer.from(rdata.iv, 'base64'))
+            const key = this.crypto.createHash('md5').update(Buffer.from(deviceInfo.apiKey, 'utf8')).digest()
+            const dText = this.crypto.createDecipheriv('aes-128-cbc', key, Buffer.from(rdata.iv, 'base64'))
             const pText = Buffer.concat([dText.update(Buffer.from(data, 'base64')), dText.final()]).toString('utf8')
             let params
             if (packet.address !== deviceInfo.ip && !this.helpers.hasProperty(this.config.ipOverride, rdata.id)) {
@@ -105,7 +103,7 @@ module.exports = class connectionLAN {
           })
       }
     }
-    dns.startMonitoring()
+    this.dns.startMonitoring()
   }
 
   async sendUpdate (json) {
@@ -126,9 +124,9 @@ module.exports = class connectionLAN {
         throw new Error("device isn't configurable via LAN mode")
       }
       if ((apiKey = this.deviceMap.get(json.deviceid).apiKey)) {
-        const key = crypto.createHash('md5').update(Buffer.from(apiKey, 'utf8')).digest()
-        const iv = crypto.randomBytes(16)
-        const enc = crypto.createCipheriv('aes-128-cbc', key, iv)
+        const key = this.crypto.createHash('md5').update(Buffer.from(apiKey, 'utf8')).digest()
+        const iv = this.crypto.randomBytes(16)
+        const enc = this.crypto.createCipheriv('aes-128-cbc', key, iv)
         const data = {
           data: Buffer.concat([enc.update(JSON.stringify(params)), enc.final()]).toString('base64'),
           deviceid: json.deviceid,
@@ -145,7 +143,7 @@ module.exports = class connectionLAN {
         } else if (this.debug) {
           this.log('LAN message sent.')
         }
-        const res = await axios({
+        const res = await (require('axios'))({
           method: 'post',
           url: 'http://' + this.deviceMap.get(json.deviceid).ip + ':8081/zeroconf/' + suffix,
           headers: {
@@ -179,7 +177,7 @@ module.exports = class connectionLAN {
   }
 
   async closeConnection () {
-    await dns.stopMonitoring()
+    await this.dns.stopMonitoring()
     if (this.debug) this.log('LAN monitoring gracefully stopped.')
   }
 }
diff --git a/lib/connection/ws.js b/lib/connection/ws.js
index 8f5712ec..140ddee6 100644
--- a/lib/connection/ws.js
+++ b/lib/connection/ws.js
@@ -1,10 +1,6 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
-const axios = require('axios')
-const eventEmitter = require('events')
-const ws = require('ws')
-const wsp = require('websocket-as-promised')
 module.exports = class connectionWS {
   constructor (config, log, helpers, authData) {
     this.config = config
@@ -16,12 +12,12 @@ module.exports = class connectionWS {
     this.aToken = authData.aToken
     this.apiKey = authData.apiKey
     this.wsIsOpen = false
-    this.emitter = new eventEmitter()
+    this.emitter = new (require('events'))()
   }
 
   async getHost () {
     try {
-      const res = await axios({
+      const res = await (require('axios'))({
         method: 'post',
         url: 'https://' + this.httpHost.replace('-api', '-disp') + '/dispatch/app',
         headers: {
@@ -53,8 +49,8 @@ module.exports = class connectionWS {
   }
 
   login () {
-    this.wsp = new wsp('wss://' + this.wsHost + ':8080/api/ws', {
-      createWebSocket: url => new ws(url),
+    this.wsp = new (require('websocket-as-promised'))('wss://' + this.wsHost + ':8080/api/ws', {
+      createWebSocket: url => new (require('ws'))(url),
       extractMessageData: event => event,
       attachRequestId: (data, requestId) => Object.assign({ sequence: requestId }, data),
       extractRequestId: data => data && data.sequence,
diff --git a/lib/device/diffuser.js b/lib/device/diffuser.js
index acb79f73..1553fbba 100644
--- a/lib/device/diffuser.js
+++ b/lib/device/diffuser.js
@@ -1,5 +1,6 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
+'use strict'
 module.exports = class deviceDiffuser {
   constructor (platform, accessory) {
     this.platform = platform

From 4fc7cbeece2c54ac5a17be212204b9486ad7425b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 2 Dec 2020 18:02:20 +0000
Subject: [PATCH 0895/3183] 3.16.1-3

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b5fc3b60..e5de732f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.16.1-2",
+  "version": "3.16.1-3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 9bc76e76..6ee0b6be 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.16.1-2",
+  "version": "3.16.1-3",
   "author": "bwp91",
   "description": "Homebridge/HOOBS plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 3c033e60a5faf24dab1e07c008ae7e9462780ea4 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 2 Dec 2020 22:14:50 +0000
Subject: [PATCH 0896/3183] use hsl not hsv

---
 lib/device/diffuser.js     |   9 ++-
 lib/device/light-colour.js |   8 +--
 lib/utils/helpers.js       | 120 +++++++++++++++++++------------------
 3 files changed, 70 insertions(+), 67 deletions(-)

diff --git a/lib/device/diffuser.js b/lib/device/diffuser.js
index 1553fbba..ca44c694 100644
--- a/lib/device/diffuser.js
+++ b/lib/device/diffuser.js
@@ -92,17 +92,16 @@ module.exports = class deviceDiffuser {
       callback()
       const updateKeyColour = Math.random().toString(36).substr(2, 8)
       this.accessory.context.updateKeyColour = updateKeyColour
-      const newRGB = this.helpers.hsv2rgb([
+      await this.helpers.sleep(700)
+      const newRGB = this.helpers.hs2rgb([
         value,
-        this.accessory.getService('Light').getCharacteristic(this.Characteristic.Saturation).value,
-        100
+        this.accessory.getService('Light').getCharacteristic(this.Characteristic.Saturation).value
       ])
       const params = {
         lightRcolor: newRGB[0],
         lightGcolor: newRGB[1],
         lightBcolor: newRGB[2]
       }
-      await this.helpers.sleep(700)
       if (updateKeyColour !== this.accessory.context.updateKeyColour) return
       await this.platform.sendDeviceUpdate(this.accessory, params)
     } catch (err) {
@@ -133,7 +132,7 @@ module.exports = class deviceDiffuser {
         this.helpers.hasProperty(params, 'lightGcolor') &&
         this.helpers.hasProperty(params, 'lightBcolor')
       ) {
-        const newColour = this.helpers.rgb2hsv([params.lightRcolor, params.lightGcolor, params.lightBcolor])
+        const newColour = this.helpers.rgb2hs([params.lightRcolor, params.lightGcolor, params.lightBcolor])
         this.lightService
           .updateCharacteristic(this.Characteristic.Hue, newColour[0])
           .updateCharacteristic(this.Characteristic.Saturation, 100)
diff --git a/lib/device/light-colour.js b/lib/device/light-colour.js
index 600ac7d6..dd56eb7b 100644
--- a/lib/device/light-colour.js
+++ b/lib/device/light-colour.js
@@ -92,7 +92,7 @@ module.exports = class deviceLightColour {
       await this.helpers.sleep(1500)
       callback()
       let params
-      const newRGB = this.helpers.hsv2rgb([value, this.lightService.getCharacteristic(this.Characteristic.Saturation).value, 100])
+      const newRGB = this.helpers.hs2rgb([value, this.lightService.getCharacteristic(this.Characteristic.Saturation).value])
       const updateKeyColour = Math.random().toString(36).substr(2, 8)
       this.accessory.context.updateKeyColour = updateKeyColour
       switch (this.accessory.context.eweUIID) {
@@ -167,7 +167,7 @@ module.exports = class deviceLightColour {
               mode = 2
             }
             if (mode === 2) {
-              newColour = this.helpers.rgb2hsv([
+              newColour = this.helpers.rgb2hs([
                 parseInt(params.channel2),
                 parseInt(params.channel3),
                 parseInt(params.channel4)
@@ -184,7 +184,7 @@ module.exports = class deviceLightColour {
               this.lightService.updateCharacteristic(this.Characteristic.Brightness, params.bright)
             }
             if (this.helpers.hasProperty(params, 'colorR')) {
-              newColour = this.helpers.rgb2hsv(params.colorR, params.colorG, params.colorB)
+              newColour = this.helpers.rgb2hs(params.colorR, params.colorG, params.colorB)
               this.lightService
                 .updateCharacteristic(this.Characteristic.Hue, newColour[0])
                 .updateCharacteristic(this.Characteristic.Saturation, newColour[1])
@@ -203,7 +203,7 @@ module.exports = class deviceLightColour {
                   this.helpers.hasProperty(params.color, 'g') &&
                   this.helpers.hasProperty(params.color, 'b')
                 ) {
-                  newColour = this.helpers.rgb2hsv([
+                  newColour = this.helpers.rgb2hs([
                     parseInt(params.color.r),
                     parseInt(params.color.g),
                     parseInt(params.color.b)
diff --git a/lib/utils/helpers.js b/lib/utils/helpers.js
index 677a90fe..c66ababd 100644
--- a/lib/utils/helpers.js
+++ b/lib/utils/helpers.js
@@ -108,73 +108,77 @@ module.exports = {
       }
     ]
   },
-  hsv2rgb: hsv => {
-    /*
-    Credit: https://github.com/Qix-/color-convert
-    */
-    const h = hsv[0] / 60
-    const s = hsv[1] / 100
-    let v = hsv[2] / 100
-    const hi = Math.floor(h) % 6
-    const f = h - Math.floor(h)
-    const p = 255 * v * (1 - s)
-    const q = 255 * v * (1 - (s * f))
-    const t = 255 * v * (1 - (s * (1 - f)))
-    v *= 255
-    switch (hi) {
-      case 0:
-        return [v, t, p]
-      case 1:
-        return [q, v, p]
-      case 2:
-        return [p, v, t]
-      case 3:
-        return [p, q, v]
-      case 4:
-        return [t, p, v]
-      case 5:
-        return [v, p, q]
+  hs2rgb: hs => {
+    const h = hs[0] / 360
+    const s = hs[1] / 100
+    const l = 50 / 100
+    let t2
+    let t3
+    let val
+    if (s === 0) {
+      val = l * 255
+      return [val, val, val]
     }
+    if (l < 0.5) {
+      t2 = l * (1 + s)
+    } else {
+      t2 = l + s - l * s
+    }
+    const t1 = 2 * l - t2
+    const rgb = [0, 0, 0]
+    for (let i = 0; i < 3; i++) {
+      t3 = h + 1 / 3 * -(i - 1)
+      if (t3 < 0) {
+        t3++
+      }
+      if (t3 > 1) {
+        t3--
+      }
+      if (6 * t3 < 1) {
+        val = t1 + (t2 - t1) * 6 * t3
+      } else if (2 * t3 < 1) {
+        val = t2
+      } else if (3 * t3 < 2) {
+        val = t1 + (t2 - t1) * (2 / 3 - t3) * 6
+      } else {
+        val = t1
+      }
+
+      rgb[i] = val * 255
+    }
+    return rgb
   },
-  rgb2hsv: rgb => {
-    /*
-    Credit: https://github.com/Qix-/color-convert
-    */
-    let rdif
-    let gdif
-    let bdif
-    let h
-    let s
+  rgb2hs: rgb => {
     const r = rgb[0] / 255
     const g = rgb[1] / 255
     const b = rgb[2] / 255
-    const v = Math.max(r, g, b)
-    const diff = v - Math.min(r, g, b)
-    const diffc = function (c) {
-      return (v - c) / 6 / diff + 1 / 2
-    }
-    if (diff === 0) {
+    const min = Math.min(r, g, b)
+    const max = Math.max(r, g, b)
+    const delta = max - min
+    let h = 0
+    let s = 0
+    if (max === min) {
       h = 0
+    } else if (r === max) {
+      h = (g - b) / delta
+    } else if (g === max) {
+      h = 2 + (b - r) / delta
+    } else if (b === max) {
+      h = 4 + (r - g) / delta
+    }
+    h = Math.min(h * 60, 360)
+    if (h < 0) {
+      h += 360
+    }
+    const l = (min + max) / 2
+    if (max === min) {
       s = 0
+    } else if (l <= 0.5) {
+      s = delta / (max + min)
     } else {
-      s = diff / v
-      rdif = diffc(r)
-      gdif = diffc(g)
-      bdif = diffc(b)
-      if (r === v) {
-        h = bdif - gdif
-      } else if (g === v) {
-        h = (1 / 3) + rdif - bdif
-      } else if (b === v) {
-        h = (2 / 3) + gdif - rdif
-      }
-      if (h < 0) {
-        h += 1
-      } else if (h > 1) {
-        h -= 1
-      }
+      s = delta / (2 - max - min)
     }
-    return [h * 360, s * 100, v * 100]
+    return [h, s * 100]
   },
   chansFromUiid: {
     1: 1, // "SOCKET"                                  \\ 20, MINI, BASIC, S26

From db2d1c90bde753972377106991524dfbdd6874be Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 3 Dec 2020 08:23:09 +0000
Subject: [PATCH 0897/3183] 3.16.1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index e5de732f..8893ab80 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.16.1-3",
+  "version": "3.16.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 6ee0b6be..da250d4a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.16.1-3",
+  "version": "3.16.1",
   "author": "bwp91",
   "description": "Homebridge/HOOBS plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From f8edb6db9facf27ec655afbac97012d6193a1b80 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 3 Dec 2020 12:17:17 +0000
Subject: [PATCH 0898/3183] merge index/platform

---
 lib/index.js    | 784 +++++++++++++++++++++++++++++++++++++++++++++++-
 lib/platform.js | 784 ------------------------------------------------
 2 files changed, 783 insertions(+), 785 deletions(-)
 delete mode 100644 lib/platform.js

diff --git a/lib/index.js b/lib/index.js
index aee91573..16dc7bde 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1,4 +1,786 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
-module.exports = hb => hb.registerPlatform('homebridge-ewelink', 'eWeLink', require('./platform.js'))
+class eWeLinkPlatform {
+  constructor (log, config, api) {
+    this.version = require('./../package.json').version
+
+    // *** Disable the plugin if not configured correctly *** \\
+    if (!log || !api || !config) return
+    if (!config.username || !config.password || !config.countryCode) {
+      log.warn('*** Disabling plugin [v%s] ***', this.version)
+      log.warn('*** eWeLink credentials missing from configuration ***')
+      return
+    }
+
+    // *** Set up our variables *** \\
+    this.log = log
+    this.config = config
+    this.api = api
+    this.helpers = require('./utils/helpers')
+    this.Characteristic = api.hap.Characteristic
+    this.Service = api.hap.Service
+    this.eveService = require('./fakegato/fakegato-history')(api)
+    this.debug = this.config.debug || false
+    this.devicesInHB = new Map()
+    this.devicesInEW = new Map()
+    this.cusG = new Map()
+    this.cusS = new Map()
+    this.hiddenMasters = []
+    this.nameOverrideTmp = {}
+    this.ipOverrideTmp = {}
+    if (config.nameOverride) config.nameOverride.forEach(x => (this.nameOverrideTmp[x.fullDeviceId] = x.deviceName))
+    if (config.ipOverride) config.ipOverride.forEach(x => (this.ipOverrideTmp[x.deviceId] = x.deviceIP))
+    this.config.nameOverride = this.nameOverrideTmp
+    this.config.ipOverride = this.ipOverrideTmp
+    this.eveLogPath = this.api.user.storagePath() + '/persist/'
+
+    // *** Set up Homebridge API events *** \\
+    this.api
+      .on('didFinishLaunching', this.eWeLinkSetup.bind(this))
+      .on('shutdown', this.eWeLinkShutdown.bind(this))
+  }
+
+  async eWeLinkSetup () {
+    try {
+      // *** Check to see if the user has disabled the plugin *** \\
+      if (this.config.disablePlugin) {
+        this.devicesInHB.forEach(a => this.removeAccessory(a))
+        this.log.warn('*** Disabling plugin [v%s] ***', this.version)
+        this.log.warn('*** To change this, set disablePlugin to false ***')
+        return
+      }
+
+      // *** Set up initial sync with eWeLink *** \\
+      this.log('Plugin [v%s] initialised. Syncing with eWeLink...', this.version)
+
+      // *** Set up the HTTP client, get the user HTTP host, and login *** \\
+      this.httpClient = new (require('./connection/http'))(this.config, this.log, this.helpers)
+      await this.httpClient.getHost()
+      this.authData = await this.httpClient.login()
+
+      // *** Get a device list and add to the devicesInEW map *** \\
+      const deviceList = await this.httpClient.getDevices()
+      deviceList.forEach(device => this.devicesInEW.set(device.deviceid, device))
+
+      // *** Set up the WS client, get the user WS host, and login *** \\
+      this.wsClient = new (require('./connection/ws'))(this.config, this.log, this.helpers, this.authData)
+      await this.wsClient.getHost()
+      this.wsClient.login()
+
+      // *** Set up the LAN client, scan for devices and start monitoring *** \\
+      this.lanClient = new (require('./connection/lan'))(this.config, this.log, this.helpers, deviceList)
+      this.lanDevices = await this.lanClient.getHosts()
+      await this.lanClient.startMonitor()
+
+      // *** Check for valid Accessory Simulations and add to cusG for later use *** \\
+      if (Object.keys(this.config.groups || []).length > 0) {
+        this.config.groups
+          .filter(g => this.helpers.hasProperty(g, 'type') && this.helpers.allowedGroups.includes(g.type))
+          .filter(g => this.helpers.hasProperty(g, 'deviceId') && this.devicesInEW.has(g.deviceId))
+          .forEach(g => this.cusG.set(g.deviceId + 'SWX', g))
+      }
+
+      // *** Check for valid custom RF Bridge sensors and add to cusS for later use *** \\
+      if (Object.keys(this.config.bridgeSensors || []).length > 0) {
+        this.config.bridgeSensors
+          .filter(s => this.helpers.hasProperty(s, 'deviceId') && this.devicesInEW.has(s.deviceId))
+          .forEach(s => this.cusS.set(s.fullDeviceId, s))
+      }
+
+      // *** Log for informative purposes *** \\
+      this.log('[%s] eWeLink devices loaded from the Homebridge cache.', this.devicesInHB.size)
+      this.log('[%s] primary devices loaded from your eWeLink account.', this.devicesInEW.size)
+
+      // *** Remove HB accessories that are no longer in eWeLink account *** \\
+      this.devicesInHB.forEach(accessory => {
+        if (!this.devicesInEW.has(accessory.context.eweDeviceId)) {
+          this.removeAccessory(accessory)
+        }
+      })
+
+      // *** Initialise each device into HB *** \\
+      this.devicesInEW.forEach(device => this.initialiseDevice(device))
+
+      // *** Set up the WS and LAN listener for device updates *** \\
+      this.wsClient.receiveUpdate(device => this.receiveDeviceUpdate(device))
+      this.lanClient.receiveUpdate(device => this.receiveDeviceUpdate(device))
+
+      // *** Refresh the WS connection every 30 minutes *** \\
+      this.wsRefresh = setInterval(async () => {
+        try {
+          if (this.wsClient) {
+            await this.wsClient.getHost()
+            await this.wsClient.closeConnection()
+            await this.helpers.sleep(250)
+            await this.wsClient.login()
+          }
+        } catch (err) {
+          this.log.warn(this.debug ? err : err.message)
+        }
+      }, 3600000)
+
+      // *** Log for informative purposes *** \\
+      this.log("eWeLink sync complete. Don't forget to ⭐️  this plugin on GitHub if you're finding it useful!")
+      if (this.config.debugReqRes) {
+        this.log.warn("Note: 'Request & Response Logging' is not advised for long-term use.")
+      }
+    } catch (err) {
+      // *** Catch errors at any point during setup *** \\
+      this.log.warn('*** Disabling plugin [v%s] ***', this.version)
+      this.log.warn(this.debug ? err : err.message)
+
+      // *** Attempt to close WS (and refresh interval) and stop LAN monitor if this has been setup *** \\
+      try {
+        if (this.lanClient) this.lanClient.closeConnection()
+        if (this.wsClient) this.wsClient.closeConnection()
+      } catch (err) {
+        this.log.warn(this.debug ? err : err.message)
+      }
+    }
+  }
+
+  eWeLinkShutdown () {
+    // *** Attempt to close WS (and refresh interval) and stop LAN monitor if this has been setup *** \\
+    try {
+      if (this.lanClient) this.lanClient.closeConnection()
+      if (this.wsClient) this.wsClient.closeConnection()
+    } catch (err) {
+      this.log.warn(this.debug ? err : err.message)
+    }
+  }
+
+  initialiseDevice (device) {
+    let accessory
+    let oAccessory
+    try {
+      // *** Remove old switch services for new Accessory Simulations *** \\
+      if (this.cusG.has(device.deviceid + 'SWX')) {
+        const arrToCheck = this.cusG.has(device.deviceid + 'SWX').type === 'switch_valve'
+          ? ['0', '1']
+          : ['X', '0', '1', '2', '3', '4']
+        arrToCheck.forEach(sw => {
+          if (this.devicesInHB.has(device.deviceid + 'SW' + sw)) {
+            if (this.devicesInHB.get(device.deviceid + 'SW' + sw).getService(this.Service.Switch)) {
+              this.removeAccessory(this.devicesInHB.get(device.deviceid + 'SW' + sw))
+            }
+          }
+        })
+      }
+
+      // *** Set up the correct instance for this particular device *** \\
+      if (this.helpers.devicesCurtain.includes(device.extra.uiid)) {
+        /***********************
+        BLINDS [EWELINK UIID 11]
+        ***********************/
+        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
+          ? this.devicesInHB.get(device.deviceid + 'SWX')
+          : this.addAccessory(device, device.deviceid + 'SWX', false, this.helpers.defaultCurtainCache)
+        accessory.control = new (require('./device/curtain'))(this, accessory)
+        /**********************/
+      } else if (this.cusG.has(device.deviceid + 'SWX') && this.cusG.get(device.deviceid + 'SWX').type === 'blind') {
+        /****************************
+        BLINDS [ACCESSORY SIMULATION]
+        ****************************/
+        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
+          ? this.devicesInHB.get(device.deviceid + 'SWX')
+          : this.addAccessory(device, device.deviceid + 'SWX', false, this.helpers.defaultBlindCache)
+        accessory.control = new (require('./device/blind'))(this, accessory)
+        /***************************/
+      } else if (this.cusG.has(device.deviceid + 'SWX') && this.cusG.get(device.deviceid + 'SWX').type === 'garage') {
+        /**********************************
+        GARAGE DOORS [ONE] [ACCESSORY SIMULATION]
+        **********************************/
+        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
+          ? this.devicesInHB.get(device.deviceid + 'SWX')
+          : this.addAccessory(device, device.deviceid + 'SWX', false, this.helpers.defaultGarageCache)
+        accessory.control = new (require('./device/garage'))(this, accessory)
+        /*********************************/
+      } else if (this.cusG.has(device.deviceid + 'SWX') && this.cusG.get(device.deviceid + 'SWX').type === 'garage_two') {
+        /**********************************
+        GARAGE DOORS [TWO] [ACCESSORY SIMULATION]
+        **********************************/
+        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
+          ? this.devicesInHB.get(device.deviceid + 'SWX')
+          : this.addAccessory(device, device.deviceid + 'SWX', false, this.helpers.defaultGarageTwoCache)
+        accessory.control = new (require('./device/garage-two'))(this, accessory)
+        /*********************************/
+      } else if (this.cusG.has(device.deviceid + 'SWX') && this.cusG.get(device.deviceid + 'SWX').type === 'garage_four') {
+        /**********************************
+        GARAGE DOORS [FOUR] [ACCESSORY SIMULATION]
+        **********************************/
+        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
+          ? this.devicesInHB.get(device.deviceid + 'SWX')
+          : this.addAccessory(device, device.deviceid + 'SWX', false, this.helpers.defaultGarageFourCache)
+        accessory.control = new (require('./device/garage-four'))(this, accessory)
+        /*********************************/
+      } else if (this.cusG.has(device.deviceid + 'SWX') && this.cusG.get(device.deviceid + 'SWX').type === 'garage_eachen') {
+        /***************************
+        GARAGE DOORS [EACHEN GD-DC5]
+        ***************************/
+        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
+          ? this.devicesInHB.get(device.deviceid + 'SWX')
+          : this.addAccessory(device, device.deviceid + 'SWX')
+        accessory.control = new (require('./device/garage-eachen'))(this, accessory)
+        /**************************/
+      } else if (this.cusG.has(device.deviceid + 'SWX') && this.cusG.get(device.deviceid + 'SWX').type === 'lock') {
+        /***************************
+        LOCKS [ACCESSORY SIMULATION]
+        ***************************/
+        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
+          ? this.devicesInHB.get(device.deviceid + 'SWX')
+          : this.addAccessory(device, device.deviceid + 'SWX')
+        accessory.control = new (require('./device/lock'))(this, accessory)
+        /**************************/
+      } else if (this.cusG.has(device.deviceid + 'SWX') && this.cusG.get(device.deviceid + 'SWX').type === 'switch_valve') {
+        /**********************************
+        SWITCH-VALVE [ACCESSORY SIMULATION]
+        **********************************/
+        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
+          ? this.devicesInHB.get(device.deviceid + 'SWX')
+          : this.addAccessory(device, device.deviceid + 'SWX')
+        accessory.control = new (require('./device/switch-valve'))(this, accessory)
+        /***************************/
+      } else if (this.cusG.has(device.deviceid + 'SWX') && this.cusG.get(device.deviceid + 'SWX').type === 'valve') {
+        /**********************************
+        VALVES [ONE] [ACCESSORY SIMULATION]
+        **********************************/
+        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
+          ? this.devicesInHB.get(device.deviceid + 'SWX')
+          : this.addAccessory(device, device.deviceid + 'SWX')
+        accessory.control = new (require('./device/valve'))(this, accessory)
+        /***************************/
+      } else if (this.cusG.has(device.deviceid + 'SWX') && this.cusG.get(device.deviceid + 'SWX').type === 'valve_two') {
+        /**********************************
+        VALVES [TWO] [ACCESSORY SIMULATION]
+        **********************************/
+        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
+          ? this.devicesInHB.get(device.deviceid + 'SWX')
+          : this.addAccessory(device, device.deviceid + 'SWX')
+        accessory.control = new (require('./device/valve-two'))(this, accessory)
+        /***************************/
+      } else if (this.helpers.devicesSensor.includes(device.extra.uiid)) {
+        /*******************
+        SENSORS [SONOFF DW2]
+        *******************/
+        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
+          ? this.devicesInHB.get(device.deviceid + 'SWX')
+          : this.addAccessory(device, device.deviceid + 'SWX', false, { type: 'sensor' })
+        accessory.control = new (require('./device/sensor'))(this, accessory)
+        /******************/
+      } else if (this.helpers.devicesFan.includes(device.extra.uiid)) {
+        /***
+        FANS
+        ***/
+        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
+          ? this.devicesInHB.get(device.deviceid + 'SWX')
+          : this.addAccessory(device, device.deviceid + 'SWX')
+        accessory.control = new (require('./device/fan'))(this, accessory)
+        /**/
+      } else if (this.helpers.devicesDiffuser.includes(device.extra.uiid)) {
+        /********
+        DIFFUSERS
+        ********/
+        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
+          ? this.devicesInHB.get(device.deviceid + 'SWX')
+          : this.addAccessory(device, device.deviceid + 'SWX')
+        accessory.control = new (require('./device/diffuser'))(this, accessory)
+        /**/
+      } else if (this.helpers.devicesThermostat.includes(device.extra.uiid)) {
+        /********************
+        THERMOSTATS [TH10/16]
+        ********************/
+        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
+          ? this.devicesInHB.get(device.deviceid + 'SWX')
+          : this.addAccessory(device, device.deviceid + 'SWX', false, {
+            sensorType: device.params.sensorType
+          })
+        accessory.control = (this.config.thAsThermostat || '').split(',').includes(device.deviceid)
+          ? new (require('./device/thermostat'))(this, accessory)
+          : new (require('./device/outlet-temp'))(this, accessory)
+        /*********/
+      } else if (
+        this.helpers.devicesOutlet.includes(device.extra.uiid) ||
+        (this.helpers.devicesSingleSwitch.includes(device.extra.uiid) && this.helpers.devicesSingleSwitchOutlet.includes(device.productModel))
+      ) {
+        /******
+        OUTLETS
+        ******/
+        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
+          ? this.devicesInHB.get(device.deviceid + 'SWX')
+          : this.addAccessory(device, device.deviceid + 'SWX')
+        accessory.control = (this.config.outletAsSwitch || '').split(',').includes(device.deviceid)
+          ? new (require('./device/switch-single'))(this, accessory)
+          : new (require('./device/outlet'))(this, accessory)
+        /*****/
+      } else if (this.helpers.devicesUSB.includes(device.extra.uiid)) {
+        /**********
+        USB OUTLETS
+        **********/
+        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
+          ? this.devicesInHB.get(device.deviceid + 'SWX')
+          : this.addAccessory(device, device.deviceid + 'SWX')
+        accessory.control = new (require('./device/usb'))(this, accessory)
+        /*********/
+      } else if (this.helpers.devicesSCM.includes(device.extra.uiid)) {
+        /*********************************
+        SINGLE CHL [MULTIPLE CHL HARDWARE]
+        *********************************/
+        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
+          ? this.devicesInHB.get(device.deviceid + 'SWX')
+          : this.addAccessory(device, device.deviceid + 'SWX')
+        accessory.control = new (require('./device/scm'))(this, accessory)
+        /********************************/
+      } else if (this.helpers.devicesCTempable.includes(device.extra.uiid)) {
+        /*******************
+        LIGHTS [COLOUR TEMP]
+        *******************/
+        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
+          ? this.devicesInHB.get(device.deviceid + 'SWX')
+          : this.addAccessory(device, device.deviceid + 'SWX')
+        accessory.control = new (require('./device/light-ctemp'))(this, accessory)
+        /******************/
+      } else if (this.helpers.devicesColourable.includes(device.extra.uiid)) {
+        /******************
+        LIGHTS [COLOUR RGB]
+        ******************/
+        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
+          ? this.devicesInHB.get(device.deviceid + 'SWX')
+          : this.addAccessory(device, device.deviceid + 'SWX')
+        accessory.control = new (require('./device/light-colour'))(this, accessory)
+        /*****************/
+      } else if (this.helpers.devicesBrightable.includes(device.extra.uiid)) {
+        /**************
+        LIGHTS [DIMMER]
+        **************/
+        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
+          ? this.devicesInHB.get(device.deviceid + 'SWX')
+          : this.addAccessory(device, device.deviceid + 'SWX')
+        accessory.control = new (require('./device/light-dimmer'))(this, accessory)
+        /*************/
+      } else if (this.helpers.devicesSingleSwitch.includes(device.extra.uiid)) {
+        /************************
+        SWITCHES [SINGLE CHANNEL]
+        ************************/
+        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
+          ? this.devicesInHB.get(device.deviceid + 'SWX')
+          : this.addAccessory(device, device.deviceid + 'SWX')
+        accessory.control = new (require('./device/switch-single'))(this, accessory)
+        /***********************/
+      } else if (this.helpers.devicesMultiSwitch.includes(device.extra.uiid)) {
+        /***********************
+        SWITCHES [MULTI CHANNEL]
+        ***********************/
+        for (let i = 0; i <= this.helpers.chansFromUiid[device.extra.uiid]; i++) {
+          if ((this.config.hideChanFromHB || '').split(',').includes(device.deviceid + 'SW' + i)) {
+            if (this.devicesInHB.has(device.deviceid + 'SW' + i)) {
+              this.removeAccessory(this.devicesInHB.get(device.deviceid + 'SW' + i))
+            }
+            if (i === 0) this.hiddenMasters.push(device.deviceid)
+            oAccessory = this.addAccessory(device, device.deviceid + 'SW' + i, true)
+          } else {
+            oAccessory = this.devicesInHB.has(device.deviceid + 'SW' + i)
+              ? this.devicesInHB.get(device.deviceid + 'SW' + i)
+              : this.addAccessory(device, device.deviceid + 'SW' + i)
+            oAccessory
+              .getService(this.Service.AccessoryInformation)
+              .setCharacteristic(this.Characteristic.FirmwareRevision, device.params.fwVersion || this.version)
+          }
+          oAccessory.context.reachableWAN = device.online
+          oAccessory.context.reachableLAN = this.lanDevices.has(device.deviceid)
+            ? this.lanDevices.get(device.deviceid).online
+            : false
+          oAccessory.context.eweBrandName = device.brandName
+          oAccessory.context.eweShared = this.helpers.hasProperty(device, 'sharedBy') && this.helpers.hasProperty(device.sharedBy, 'email')
+            ? device.sharedBy.email
+            : false
+          oAccessory.context.ip = oAccessory.context.reachableLAN
+            ? this.lanDevices.get(device.deviceid).ip
+            : false
+          oAccessory.control = new (require('./device/switch-multi'))(this, oAccessory)
+          this.api.updatePlatformAccessories('homebridge-ewelink', 'eWeLink', [oAccessory])
+          this.devicesInHB.set(oAccessory.context.hbDeviceId, oAccessory)
+          if (i === 0) accessory = oAccessory
+        }
+        /**********************/
+      } else if (this.helpers.devicesRFBridge.includes(device.extra.uiid)) {
+        /*********************
+        RF BRIDGE + SUBDEVICES
+        *********************/
+        let rfChlCounter = 0
+        const rfMap = []
+        if (this.helpers.hasProperty(device, 'tags') && this.helpers.hasProperty(device.tags, 'zyx_info')) {
+          device.tags.zyx_info.forEach(remote =>
+            rfMap.push({
+              name: remote.name,
+              type: remote.remote_type,
+              buttons: Object.assign({}, ...remote.buttonName)
+            })
+          )
+        }
+        accessory = this.devicesInHB.has(device.deviceid + 'SW0')
+          ? this.devicesInHB.get(device.deviceid + 'SW0')
+          : this.addAccessory(device, device.deviceid + 'SW0', true, {
+            rfMap
+          }, 'rf_pri')
+        accessory.control = new (require('./device/rf-bridge'))(this, accessory)
+        this.hiddenMasters.push(device.deviceid)
+        rfMap.forEach(subDevice => {
+          const swNumber = rfChlCounter + 1
+          let subType
+          let sensorTimeLength
+          let subExtraContext = {}
+          if (['1', '2', '3', '4'].includes(subDevice.type)) {
+            subType = 'button'
+          } else if (subDevice.type === '6') {
+            subType = this.cusS.has(device.deviceid + 'SW' + swNumber)
+              ? this.cusS.get(device.deviceid + 'SW' + swNumber).type
+              : 'motion'
+            if (this.cusS.has(device.deviceid + 'SW' + swNumber)) {
+              sensorTimeLength = this.cusS.get(device.deviceid + 'SW' + swNumber).sensorTimeLength
+            }
+          } else {
+            return
+          }
+          subExtraContext = {
+            buttons: subDevice.buttons,
+            subType,
+            swNumber,
+            sensorTimeLength
+          }
+          if ((oAccessory = this.devicesInHB.get(device.deviceid + 'SW' + swNumber))) {
+            if (
+              (this.config.resetRFBridge || '').includes(device.deviceid) ||
+              oAccessory.context.subType !== subType ||
+              oAccessory.context.sensorTimeLength !== sensorTimeLength ||
+              oAccessory.context.swNumber !== swNumber
+            ) {
+              this.removeAccessory(oAccessory)
+            }
+          }
+          oAccessory = this.devicesInHB.has(device.deviceid + 'SW' + swNumber)
+            ? this.devicesInHB.get(device.deviceid + 'SW' + swNumber)
+            : this.addAccessory(device, device.deviceid + 'SW' + swNumber, false, subExtraContext, 'rf_sub')
+          oAccessory
+            .getService(this.Service.AccessoryInformation)
+            .setCharacteristic(this.Characteristic.FirmwareRevision, device.params.fwVersion || this.version)
+          oAccessory.context.reachableWAN = device.online
+          oAccessory.context.reachableLAN = false
+          oAccessory.context.eweBrandName = device.brandName
+          oAccessory.context.eweShared = this.helpers.hasProperty(device, 'sharedBy') && this.helpers.hasProperty(device.sharedBy, 'email')
+            ? device.sharedBy.email
+            : false
+          oAccessory.context.ip = oAccessory.context.reachableLAN
+            ? this.lanDevices.get(device.deviceid).ip
+            : false
+          this.api.updatePlatformAccessories('homebridge-ewelink', 'eWeLink', [oAccessory])
+          this.devicesInHB.set(oAccessory.context.hbDeviceId, oAccessory)
+          oAccessory.control = new (require('./device/rf-bridge'))(this, oAccessory)
+          rfChlCounter += Object.keys(subDevice.buttons || {}).length
+        })
+        accessory.context.channelCount = rfChlCounter
+        this.devicesInHB.set(accessory.context.hbDeviceId, accessory)
+        /********************/
+      } else if (this.helpers.devicesZBBridge.includes(device.extra.uiid)) {
+        /************
+        ZIGBEE BRIDGE
+        ************/
+        if (this.devicesInHB.has(device.deviceid + 'SWX')) {
+          this.removeAccessory(this.devicesInHB.get(device.deviceid + 'SWX'))
+        }
+        return
+        /***********/
+      } else if (this.helpers.devicesZB.includes(device.extra.uiid)) {
+        /****************
+        ZIGBEE SUBDEVICES
+        ****************/
+        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
+          ? this.devicesInHB.get(device.deviceid + 'SWX')
+          : this.addAccessory(device, device.deviceid + 'SWX')
+        accessory.control = new (require('./device/zb-dev'))(this, accessory)
+        /***************/
+      } else if (this.helpers.devicesCamera.includes(device.extra.uiid)) {
+        /******
+        CAMERAS
+        ******/
+        this.log(' → [%s] please see the homebridge-ewelink wiki for details to enable the camera.', device.name)
+        return
+        /*****/
+      } else {
+        /**********
+        UNSUPPORTED
+        **********/
+        this.log.warn(' → [%s] has not been added as it is not supported. Please make a GitHub issue request.', device.name)
+        return
+        /*********/
+      }
+
+      // *** Update the current firmware version *** \\
+      if (!this.hiddenMasters.includes(device.deviceid)) {
+        accessory
+          .getService(this.Service.AccessoryInformation)
+          .setCharacteristic(this.Characteristic.FirmwareRevision, device.params.fwVersion || this.version)
+      }
+
+      // *** Update the reachability values (via WS and LAN) *** \\
+      accessory.context.reachableWAN = device.online
+      accessory.context.reachableLAN = this.lanDevices.has(device.deviceid)
+        ? this.lanDevices.get(device.deviceid).online
+        : false
+      accessory.context.inUse = false
+      accessory.context.eweBrandName = device.brandName
+      accessory.context.eweShared = this.helpers.hasProperty(device, 'sharedBy') && this.helpers.hasProperty(device.sharedBy, 'email')
+        ? device.sharedBy.email
+        : false
+      accessory.context.ip = accessory.context.reachableLAN
+        ? this.lanDevices.get(device.deviceid).ip
+        : false
+
+      // *** Helpful logging for each device *** \\
+      let str = accessory.context.reachableLAN
+        ? 'and found locally with IP [' + this.lanDevices.get(device.deviceid).ip + ']'
+        : 'but LAN mode unavailable as device '
+      if (!accessory.context.reachableLAN) {
+        if (this.helpers.devicesNonLAN.includes(device.extra.uiid)) {
+          str += "doesn't support it"
+        } else if (accessory.context.sharedDevice) {
+          str += 'is shared (' + device.sharedBy.email + ')'
+        } else {
+          str += 'is unreachable'
+        }
+      }
+
+      // *** Update accessory characteristics with latest values *** \\
+      if (!this.config.disableHTTPRefresh) accessory.control.externalUpdate(device.params)
+
+      // *** Update any changes to the device into our devicesInHB map *** \\
+      this.api.updatePlatformAccessories('homebridge-ewelink', 'eWeLink', [accessory])
+      this.devicesInHB.set(accessory.context.hbDeviceId, accessory)
+      this.log(' → [%s] initialised %s.', device.name, str)
+    } catch (err) {
+      // *** Catch errors at any point during device initialisation *** \\
+      const deviceName = accessory && this.helpers.hasProperty(accessory, 'displayName')
+        ? accessory.displayName
+        : device.name
+      this.log.warn(' → [%s] could not be initialised as %s.', deviceName, this.debug ? err : err.message)
+    }
+  }
+
+  addAccessory (device, hbDeviceId, hidden = false, extraContext = {}, type = '') {
+    // *** Get the switchNumber which can be {X, 0, 1, 2, 3, 4, ...} *** \\
+    const switchNumber = hbDeviceId.split('SW')[1].toString()
+
+    // *** Set up the device name which can depend on the accessory type *** \\
+    let newDeviceName = type === 'rf_sub' ? device.tags.zyx_info[switchNumber - 1].name : device.name
+    const channelCount = type === 'rf_pri'
+      ? Object.keys((device.tags && device.tags.zyx_info) || []).length
+      : this.helpers.chansFromUiid[device.extra.uiid]
+    if (['1', '2', '3', '4'].includes(switchNumber) && type !== 'rf_sub') {
+      if (
+        this.helpers.hasProperty(device, 'tags') &&
+        this.helpers.hasProperty(device.tags, 'ck_channel_name') &&
+        device.tags.ck_channel_name[parseInt(switchNumber) - 1]
+      ) {
+        newDeviceName = device.tags.ck_channel_name[parseInt(switchNumber) - 1]
+      } else {
+        newDeviceName += ' SW' + switchNumber
+      }
+    }
+    if (this.helpers.hasProperty(this.config.nameOverride, hbDeviceId)) {
+      newDeviceName = this.config.nameOverride[hbDeviceId]
+    }
+
+    // *** Add the new accessory to Homebridge *** \\
+    try {
+      const accessory = new this.api.platformAccessory(newDeviceName, this.api.hap.uuid.generate(hbDeviceId).toString())
+      if (!hidden) {
+        accessory
+          .getService(this.Service.AccessoryInformation)
+          .setCharacteristic(this.Characteristic.SerialNumber, hbDeviceId)
+          .setCharacteristic(this.Characteristic.Manufacturer, device.brandName)
+          .setCharacteristic(this.Characteristic.Model, device.productModel + ' (' + device.extra.model + ')')
+          .setCharacteristic(this.Characteristic.FirmwareRevision, device.params.fwVersion || this.version)
+          .setCharacteristic(this.Characteristic.Identify, true)
+        accessory.on('identify', (paired, callback) => {
+          callback()
+          this.log('[%s] - identify button pressed.', accessory.displayName)
+        })
+      }
+
+      // *** Add helpful context values to the accessory *** \\
+      accessory.context = {
+        ...{
+          hbDeviceId,
+          eweDeviceId: device.deviceid,
+          eweUIID: device.extra.uiid,
+          eweModel: device.productModel,
+          eweApiKey: device.apikey,
+          switchNumber,
+          channelCount
+        },
+        ...extraContext
+      }
+
+      // *** Register the accessory if it hasn't been hidden by the user *** \\
+      if (!hidden) {
+        this.api.registerPlatformAccessories('homebridge-ewelink', 'eWeLink', [accessory])
+        this.log(' → [%s] has been added to Homebridge.', newDeviceName)
+      }
+
+      // *** Return the new accessory *** \\
+      return accessory
+    } catch (err) {
+      // *** Add helpful context values to the accessory *** \\
+      this.log.warn(' → [%s] could not be added as %s.', newDeviceName, err)
+      return false
+    }
+  }
+
+  async sendDeviceUpdate (accessory, params) {
+    // *** Add a random delay of [1, 250]ms to avoid multiple http/ws requests a la vez
+    await this.helpers.sleep(Math.floor(Math.random() * 250 + 1))
+
+    // *** Set up the payload to send via LAN/WS *** \\
+    const payload = {
+      apikey: accessory.context.eweApiKey,
+      deviceid: accessory.context.eweDeviceId,
+      params
+    }
+
+    // *** Quick check to see if LAN mode is supported *** \\
+    const res = this.config.disableLANMode
+      ? 'LAN mode is disabled'
+      : this.helpers.devicesNonLAN.includes(accessory.context.eweUIID)
+        ? 'LAN mode is not supported for this device'
+        : await this.lanClient.sendUpdate(payload)
+
+    // *** Revert to WS if LAN mode not possible for whatever reason *** \\
+    if (res !== 'ok') {
+      // *** Check to see if the device is online *** \\
+      if (accessory.context.reachableWAN) {
+        if (this.debug) this.log('[%s] Reverting to web socket as %s.', accessory.displayName, res)
+        await this.wsClient.sendUpdate(payload)
+      } else {
+        throw new Error("it is unreachable. It's status will be corrected once it is reachable")
+      }
+    }
+  }
+
+  async receiveDeviceUpdate (device) {
+    const deviceId = device.deviceid
+    let accessory
+    let reachableChange = false
+
+    // *** Find our accessory for which the updates relates to *** \\
+    if ((accessory = this.devicesInHB.get(deviceId + 'SWX') || this.devicesInHB.get(deviceId + 'SW0'))) {
+      const isX = accessory.context.hbDeviceId.substr(-1) === 'X'
+      if (device.params.updateSource === 'WS') {
+        // *** The update is from WS so update the WS online/offline status *** \\
+        if (device.params.online !== accessory.context.reachableWAN) {
+          accessory.context.reachableWAN = device.params.online
+          this.devicesInHB.set(accessory.context.hbDeviceId, accessory)
+          reachableChange = true
+          this.log.warn('[%s] reported [%sline] via [WS].', accessory.displayName, accessory.context.reachableWAN ? 'on' : 'off')
+          if (accessory.context.reachableWAN) {
+            try {
+              this.wsClient.requestUpdate(accessory)
+            } catch (err) {
+              this.log.warn('[%s] update could not be requested as %s', accessory.displayName, this.debug ? err.message : err)
+            }
+          }
+        }
+      }
+      if (device.params.updateSource === 'LAN' && !accessory.context.reachableLAN) {
+        // *** The update is from LAN so update the LAN online/offline status *** \\
+        accessory.context.reachableLAN = true
+        this.devicesInHB.set(accessory.context.hbDeviceId, accessory)
+        reachableChange = true
+        this.log.warn('[%s] has been reported [online] via [LAN].', accessory.displayName)
+        try {
+          this.wsClient.requestUpdate(accessory)
+        } catch (err) {
+          this.log.warn('[%s] update could not be requested as %s', accessory.displayName, this.debug ? err.message : err)
+        }
+      }
+
+      // *** Update this new online/offline status for all switches of multi channel devices (ie not X) *** \\
+      if (reachableChange && !isX) {
+        // *** Loop through to see which channels are in HB *** \\
+        for (let i = 1; i <= accessory.context.channelCount; i++) {
+          if (this.devicesInHB.has(deviceId + 'SW' + i)) {
+            const oAccessory = this.devicesInHB.get(deviceId + 'SW' + i)
+            oAccessory.context.reachableWAN = device.params.online
+            if (device.params.updateSource === 'LAN') {
+              oAccessory.context.reachableLAN = true
+            }
+            this.devicesInHB.set(oAccessory.context.hbDeviceId, oAccessory)
+          }
+        }
+      }
+      if (this.debug) {
+        this.log('[%s] %s update received and will be refreshed.', accessory.displayName, device.params.updateSource)
+      }
+      try {
+        // *** Update the accessory with the new data *** \\
+        accessory.control.externalUpdate(device.params)
+      } catch (err) {
+        this.log.warn('[%s] could not be refreshed as %s.', accessory.displayName, this.debug ? err : err.message)
+      }
+    } else {
+      // *** The device does not existing in HB so let's try to add it *** \\
+      try {
+        // *** Check to see it doesn't exist because it's user hidden *** \\
+        if ((this.config.hideDevFromHB || '').includes(deviceId)) return
+
+        // *** Obtain full device information from the HTTP API *** \\
+        const newDevice = await this.httpClient.getDevice(deviceId)
+
+        // *** Initialise the device in HB *** \\
+        this.initialiseDevice(newDevice)
+
+        // *** Add the device to the LAN client map *** \\
+        this.lanClient.addDeviceToMap(newDevice)
+      } catch (err) {
+        // *** Automatically adding the new device failed for some reason *** \\
+        this.log.warn('[%s] restart Homebridge to add new device, failed to add automatically as %s.', deviceId, err.message)
+      }
+    }
+  }
+
+  async deviceUpdateError (accessory, err, requestRefresh) {
+    this.log.warn('[%s] could not be updated as %s.', accessory.displayName, this.debug ? err : err.message)
+
+    // *** We only request a device refresh on failed internal updates (ie with 'set' handlers) *** \\
+    if (requestRefresh) {
+      if (accessory.context.reachableWAN) {
+        try {
+          await this.wsClient.requestUpdate(accessory)
+          this.log.warn('[%s] requesting previous state to revert Homebridge state.', accessory.displayName)
+        } catch (err) {}
+      } else {
+        this.log.warn('[%s] Homebridge state will be synced once the device comes back online.', accessory.displayName)
+      }
+    }
+  }
+
+  configureAccessory (accessory) {
+    // *** Function is called for each device on HB start *** \\
+    if (!this.log) return
+
+    // *** Add each cached device to our devicesInHB map *** \\
+    this.devicesInHB.set(accessory.context.hbDeviceId, accessory)
+  }
+
+  removeAccessory (accessory) {
+    try {
+      // *** Unregister the accessory from HB and remove it from our devicesInHB map *** \\
+      this.api.unregisterPlatformAccessories('homebridge-ewelink', 'eWeLink', [accessory])
+      this.devicesInHB.delete(accessory.context.hbDeviceId)
+      this.log(' → [%s] was removed from Homebridge.', accessory.displayName)
+    } catch (err) {
+      this.log.warn(" → [%s] wasn't removed as %s.", accessory.displayName, err)
+    }
+  }
+}
+
+module.exports = hb => hb.registerPlatform('homebridge-ewelink', 'eWeLink', eWeLinkPlatform)
diff --git a/lib/platform.js b/lib/platform.js
deleted file mode 100644
index a0fadbeb..00000000
--- a/lib/platform.js
+++ /dev/null
@@ -1,784 +0,0 @@
-/* jshint -W014, -W033, esversion: 9 */
-/* eslint-disable new-cap */
-'use strict'
-module.exports = class eWeLinkPlatform {
-  constructor (log, config, api) {
-    this.version = require('./../package.json').version
-
-    // *** Disable the plugin if not configured correctly *** \\
-    if (!log || !api || !config) return
-    if (!config.username || !config.password || !config.countryCode) {
-      log.warn('*** Disabling plugin [v%s] ***', this.version)
-      log.warn('*** eWeLink credentials missing from configuration ***')
-      return
-    }
-
-    // *** Set up our variables *** \\
-    this.log = log
-    this.config = config
-    this.api = api
-    this.helpers = require('./utils/helpers')
-    this.Characteristic = api.hap.Characteristic
-    this.Service = api.hap.Service
-    this.eveService = require('./fakegato/fakegato-history')(api)
-    this.debug = this.config.debug || false
-    this.devicesInHB = new Map()
-    this.devicesInEW = new Map()
-    this.cusG = new Map()
-    this.cusS = new Map()
-    this.hiddenMasters = []
-    this.nameOverrideTmp = {}
-    this.ipOverrideTmp = {}
-    if (config.nameOverride) config.nameOverride.forEach(x => (this.nameOverrideTmp[x.fullDeviceId] = x.deviceName))
-    if (config.ipOverride) config.ipOverride.forEach(x => (this.ipOverrideTmp[x.deviceId] = x.deviceIP))
-    this.config.nameOverride = this.nameOverrideTmp
-    this.config.ipOverride = this.ipOverrideTmp
-    this.eveLogPath = this.api.user.storagePath() + '/persist/'
-
-    // *** Set up Homebridge API events *** \\
-    this.api
-      .on('didFinishLaunching', this.eWeLinkSetup.bind(this))
-      .on('shutdown', this.eWeLinkShutdown.bind(this))
-  }
-
-  async eWeLinkSetup () {
-    try {
-      // *** Check to see if the user has disabled the plugin *** \\
-      if (this.config.disablePlugin) {
-        this.devicesInHB.forEach(a => this.removeAccessory(a))
-        this.log.warn('*** Disabling plugin [v%s] ***', this.version)
-        this.log.warn('*** To change this, set disablePlugin to false ***')
-        return
-      }
-
-      // *** Set up initial sync with eWeLink *** \\
-      this.log('Plugin [v%s] initialised. Syncing with eWeLink...', this.version)
-
-      // *** Set up the HTTP client, get the user HTTP host, and login *** \\
-      this.httpClient = new (require('./connection/http'))(this.config, this.log, this.helpers)
-      await this.httpClient.getHost()
-      this.authData = await this.httpClient.login()
-
-      // *** Get a device list and add to the devicesInEW map *** \\
-      const deviceList = await this.httpClient.getDevices()
-      deviceList.forEach(device => this.devicesInEW.set(device.deviceid, device))
-
-      // *** Set up the WS client, get the user WS host, and login *** \\
-      this.wsClient = new (require('./connection/ws'))(this.config, this.log, this.helpers, this.authData)
-      await this.wsClient.getHost()
-      this.wsClient.login()
-
-      // *** Set up the LAN client, scan for devices and start monitoring *** \\
-      this.lanClient = new (require('./connection/lan'))(this.config, this.log, this.helpers, deviceList)
-      this.lanDevices = await this.lanClient.getHosts()
-      await this.lanClient.startMonitor()
-
-      // *** Check for valid Accessory Simulations and add to cusG for later use *** \\
-      if (Object.keys(this.config.groups || []).length > 0) {
-        this.config.groups
-          .filter(g => this.helpers.hasProperty(g, 'type') && this.helpers.allowedGroups.includes(g.type))
-          .filter(g => this.helpers.hasProperty(g, 'deviceId') && this.devicesInEW.has(g.deviceId))
-          .forEach(g => this.cusG.set(g.deviceId + 'SWX', g))
-      }
-
-      // *** Check for valid custom RF Bridge sensors and add to cusS for later use *** \\
-      if (Object.keys(this.config.bridgeSensors || []).length > 0) {
-        this.config.bridgeSensors
-          .filter(s => this.helpers.hasProperty(s, 'deviceId') && this.devicesInEW.has(s.deviceId))
-          .forEach(s => this.cusS.set(s.fullDeviceId, s))
-      }
-
-      // *** Log for informative purposes *** \\
-      this.log('[%s] eWeLink devices loaded from the Homebridge cache.', this.devicesInHB.size)
-      this.log('[%s] primary devices loaded from your eWeLink account.', this.devicesInEW.size)
-
-      // *** Remove HB accessories that are no longer in eWeLink account *** \\
-      this.devicesInHB.forEach(accessory => {
-        if (!this.devicesInEW.has(accessory.context.eweDeviceId)) {
-          this.removeAccessory(accessory)
-        }
-      })
-
-      // *** Initialise each device into HB *** \\
-      this.devicesInEW.forEach(device => this.initialiseDevice(device))
-
-      // *** Set up the WS and LAN listener for device updates *** \\
-      this.wsClient.receiveUpdate(device => this.receiveDeviceUpdate(device))
-      this.lanClient.receiveUpdate(device => this.receiveDeviceUpdate(device))
-
-      // *** Refresh the WS connection every 30 minutes *** \\
-      this.wsRefresh = setInterval(async () => {
-        try {
-          if (this.wsClient) {
-            await this.wsClient.getHost()
-            await this.wsClient.closeConnection()
-            await this.helpers.sleep(250)
-            await this.wsClient.login()
-          }
-        } catch (err) {
-          this.log.warn(this.debug ? err : err.message)
-        }
-      }, 3600000)
-
-      // *** Log for informative purposes *** \\
-      this.log("eWeLink sync complete. Don't forget to ⭐️  this plugin on GitHub if you're finding it useful!")
-      if (this.config.debugReqRes) {
-        this.log.warn("Note: 'Request & Response Logging' is not advised for long-term use.")
-      }
-    } catch (err) {
-      // *** Catch errors at any point during setup *** \\
-      this.log.warn('*** Disabling plugin [v%s] ***', this.version)
-      this.log.warn(this.debug ? err : err.message)
-
-      // *** Attempt to close WS (and refresh interval) and stop LAN monitor if this has been setup *** \\
-      try {
-        if (this.lanClient) this.lanClient.closeConnection()
-        if (this.wsClient) this.wsClient.closeConnection()
-      } catch (err) {
-        this.log.warn(this.debug ? err : err.message)
-      }
-    }
-  }
-
-  eWeLinkShutdown () {
-    // *** Attempt to close WS (and refresh interval) and stop LAN monitor if this has been setup *** \\
-    try {
-      if (this.lanClient) this.lanClient.closeConnection()
-      if (this.wsClient) this.wsClient.closeConnection()
-    } catch (err) {
-      this.log.warn(this.debug ? err : err.message)
-    }
-  }
-
-  initialiseDevice (device) {
-    let accessory
-    let oAccessory
-    try {
-      // *** Remove old switch services for new Accessory Simulations *** \\
-      if (this.cusG.has(device.deviceid + 'SWX')) {
-        const arrToCheck = this.cusG.has(device.deviceid + 'SWX').type === 'switch_valve'
-          ? ['0', '1']
-          : ['X', '0', '1', '2', '3', '4']
-        arrToCheck.forEach(sw => {
-          if (this.devicesInHB.has(device.deviceid + 'SW' + sw)) {
-            if (this.devicesInHB.get(device.deviceid + 'SW' + sw).getService(this.Service.Switch)) {
-              this.removeAccessory(this.devicesInHB.get(device.deviceid + 'SW' + sw))
-            }
-          }
-        })
-      }
-
-      // *** Set up the correct instance for this particular device *** \\
-      if (this.helpers.devicesCurtain.includes(device.extra.uiid)) {
-        /***********************
-        BLINDS [EWELINK UIID 11]
-        ***********************/
-        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
-          ? this.devicesInHB.get(device.deviceid + 'SWX')
-          : this.addAccessory(device, device.deviceid + 'SWX', false, this.helpers.defaultCurtainCache)
-        accessory.control = new (require('./device/curtain'))(this, accessory)
-        /**********************/
-      } else if (this.cusG.has(device.deviceid + 'SWX') && this.cusG.get(device.deviceid + 'SWX').type === 'blind') {
-        /****************************
-        BLINDS [ACCESSORY SIMULATION]
-        ****************************/
-        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
-          ? this.devicesInHB.get(device.deviceid + 'SWX')
-          : this.addAccessory(device, device.deviceid + 'SWX', false, this.helpers.defaultBlindCache)
-        accessory.control = new (require('./device/blind'))(this, accessory)
-        /***************************/
-      } else if (this.cusG.has(device.deviceid + 'SWX') && this.cusG.get(device.deviceid + 'SWX').type === 'garage') {
-        /**********************************
-        GARAGE DOORS [ONE] [ACCESSORY SIMULATION]
-        **********************************/
-        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
-          ? this.devicesInHB.get(device.deviceid + 'SWX')
-          : this.addAccessory(device, device.deviceid + 'SWX', false, this.helpers.defaultGarageCache)
-        accessory.control = new (require('./device/garage'))(this, accessory)
-        /*********************************/
-      } else if (this.cusG.has(device.deviceid + 'SWX') && this.cusG.get(device.deviceid + 'SWX').type === 'garage_two') {
-        /**********************************
-        GARAGE DOORS [TWO] [ACCESSORY SIMULATION]
-        **********************************/
-        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
-          ? this.devicesInHB.get(device.deviceid + 'SWX')
-          : this.addAccessory(device, device.deviceid + 'SWX', false, this.helpers.defaultGarageTwoCache)
-        accessory.control = new (require('./device/garage-two'))(this, accessory)
-        /*********************************/
-      } else if (this.cusG.has(device.deviceid + 'SWX') && this.cusG.get(device.deviceid + 'SWX').type === 'garage_four') {
-        /**********************************
-        GARAGE DOORS [FOUR] [ACCESSORY SIMULATION]
-        **********************************/
-        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
-          ? this.devicesInHB.get(device.deviceid + 'SWX')
-          : this.addAccessory(device, device.deviceid + 'SWX', false, this.helpers.defaultGarageFourCache)
-        accessory.control = new (require('./device/garage-four'))(this, accessory)
-        /*********************************/
-      } else if (this.cusG.has(device.deviceid + 'SWX') && this.cusG.get(device.deviceid + 'SWX').type === 'garage_eachen') {
-        /***************************
-        GARAGE DOORS [EACHEN GD-DC5]
-        ***************************/
-        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
-          ? this.devicesInHB.get(device.deviceid + 'SWX')
-          : this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require('./device/garage-eachen'))(this, accessory)
-        /**************************/
-      } else if (this.cusG.has(device.deviceid + 'SWX') && this.cusG.get(device.deviceid + 'SWX').type === 'lock') {
-        /***************************
-        LOCKS [ACCESSORY SIMULATION]
-        ***************************/
-        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
-          ? this.devicesInHB.get(device.deviceid + 'SWX')
-          : this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require('./device/lock'))(this, accessory)
-        /**************************/
-      } else if (this.cusG.has(device.deviceid + 'SWX') && this.cusG.get(device.deviceid + 'SWX').type === 'switch_valve') {
-        /**********************************
-        SWITCH-VALVE [ACCESSORY SIMULATION]
-        **********************************/
-        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
-          ? this.devicesInHB.get(device.deviceid + 'SWX')
-          : this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require('./device/switch-valve'))(this, accessory)
-        /***************************/
-      } else if (this.cusG.has(device.deviceid + 'SWX') && this.cusG.get(device.deviceid + 'SWX').type === 'valve') {
-        /**********************************
-        VALVES [ONE] [ACCESSORY SIMULATION]
-        **********************************/
-        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
-          ? this.devicesInHB.get(device.deviceid + 'SWX')
-          : this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require('./device/valve'))(this, accessory)
-        /***************************/
-      } else if (this.cusG.has(device.deviceid + 'SWX') && this.cusG.get(device.deviceid + 'SWX').type === 'valve_two') {
-        /**********************************
-        VALVES [TWO] [ACCESSORY SIMULATION]
-        **********************************/
-        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
-          ? this.devicesInHB.get(device.deviceid + 'SWX')
-          : this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require('./device/valve-two'))(this, accessory)
-        /***************************/
-      } else if (this.helpers.devicesSensor.includes(device.extra.uiid)) {
-        /*******************
-        SENSORS [SONOFF DW2]
-        *******************/
-        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
-          ? this.devicesInHB.get(device.deviceid + 'SWX')
-          : this.addAccessory(device, device.deviceid + 'SWX', false, { type: 'sensor' })
-        accessory.control = new (require('./device/sensor'))(this, accessory)
-        /******************/
-      } else if (this.helpers.devicesFan.includes(device.extra.uiid)) {
-        /***
-        FANS
-        ***/
-        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
-          ? this.devicesInHB.get(device.deviceid + 'SWX')
-          : this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require('./device/fan'))(this, accessory)
-        /**/
-      } else if (this.helpers.devicesDiffuser.includes(device.extra.uiid)) {
-        /********
-        DIFFUSERS
-        ********/
-        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
-          ? this.devicesInHB.get(device.deviceid + 'SWX')
-          : this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require('./device/diffuser'))(this, accessory)
-        /**/
-      } else if (this.helpers.devicesThermostat.includes(device.extra.uiid)) {
-        /********************
-        THERMOSTATS [TH10/16]
-        ********************/
-        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
-          ? this.devicesInHB.get(device.deviceid + 'SWX')
-          : this.addAccessory(device, device.deviceid + 'SWX', false, {
-            sensorType: device.params.sensorType
-          })
-        accessory.control = (this.config.thAsThermostat || '').split(',').includes(device.deviceid)
-          ? new (require('./device/thermostat'))(this, accessory)
-          : new (require('./device/outlet-temp'))(this, accessory)
-        /*********/
-      } else if (
-        this.helpers.devicesOutlet.includes(device.extra.uiid) ||
-        (this.helpers.devicesSingleSwitch.includes(device.extra.uiid) && this.helpers.devicesSingleSwitchOutlet.includes(device.productModel))
-      ) {
-        /******
-        OUTLETS
-        ******/
-        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
-          ? this.devicesInHB.get(device.deviceid + 'SWX')
-          : this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = (this.config.outletAsSwitch || '').split(',').includes(device.deviceid)
-          ? new (require('./device/switch-single'))(this, accessory)
-          : new (require('./device/outlet'))(this, accessory)
-        /*****/
-      } else if (this.helpers.devicesUSB.includes(device.extra.uiid)) {
-        /**********
-        USB OUTLETS
-        **********/
-        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
-          ? this.devicesInHB.get(device.deviceid + 'SWX')
-          : this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require('./device/usb'))(this, accessory)
-        /*********/
-      } else if (this.helpers.devicesSCM.includes(device.extra.uiid)) {
-        /*********************************
-        SINGLE CHL [MULTIPLE CHL HARDWARE]
-        *********************************/
-        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
-          ? this.devicesInHB.get(device.deviceid + 'SWX')
-          : this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require('./device/scm'))(this, accessory)
-        /********************************/
-      } else if (this.helpers.devicesCTempable.includes(device.extra.uiid)) {
-        /*******************
-        LIGHTS [COLOUR TEMP]
-        *******************/
-        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
-          ? this.devicesInHB.get(device.deviceid + 'SWX')
-          : this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require('./device/light-ctemp'))(this, accessory)
-        /******************/
-      } else if (this.helpers.devicesColourable.includes(device.extra.uiid)) {
-        /******************
-        LIGHTS [COLOUR RGB]
-        ******************/
-        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
-          ? this.devicesInHB.get(device.deviceid + 'SWX')
-          : this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require('./device/light-colour'))(this, accessory)
-        /*****************/
-      } else if (this.helpers.devicesBrightable.includes(device.extra.uiid)) {
-        /**************
-        LIGHTS [DIMMER]
-        **************/
-        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
-          ? this.devicesInHB.get(device.deviceid + 'SWX')
-          : this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require('./device/light-dimmer'))(this, accessory)
-        /*************/
-      } else if (this.helpers.devicesSingleSwitch.includes(device.extra.uiid)) {
-        /************************
-        SWITCHES [SINGLE CHANNEL]
-        ************************/
-        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
-          ? this.devicesInHB.get(device.deviceid + 'SWX')
-          : this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require('./device/switch-single'))(this, accessory)
-        /***********************/
-      } else if (this.helpers.devicesMultiSwitch.includes(device.extra.uiid)) {
-        /***********************
-        SWITCHES [MULTI CHANNEL]
-        ***********************/
-        for (let i = 0; i <= this.helpers.chansFromUiid[device.extra.uiid]; i++) {
-          if ((this.config.hideChanFromHB || '').split(',').includes(device.deviceid + 'SW' + i)) {
-            if (this.devicesInHB.has(device.deviceid + 'SW' + i)) {
-              this.removeAccessory(this.devicesInHB.get(device.deviceid + 'SW' + i))
-            }
-            if (i === 0) this.hiddenMasters.push(device.deviceid)
-            oAccessory = this.addAccessory(device, device.deviceid + 'SW' + i, true)
-          } else {
-            oAccessory = this.devicesInHB.has(device.deviceid + 'SW' + i)
-              ? this.devicesInHB.get(device.deviceid + 'SW' + i)
-              : this.addAccessory(device, device.deviceid + 'SW' + i)
-            oAccessory
-              .getService(this.Service.AccessoryInformation)
-              .setCharacteristic(this.Characteristic.FirmwareRevision, device.params.fwVersion || this.version)
-          }
-          oAccessory.context.reachableWAN = device.online
-          oAccessory.context.reachableLAN = this.lanDevices.has(device.deviceid)
-            ? this.lanDevices.get(device.deviceid).online
-            : false
-          oAccessory.context.eweBrandName = device.brandName
-          oAccessory.context.eweShared = this.helpers.hasProperty(device, 'sharedBy') && this.helpers.hasProperty(device.sharedBy, 'email')
-            ? device.sharedBy.email
-            : false
-          oAccessory.context.ip = oAccessory.context.reachableLAN
-            ? this.lanDevices.get(device.deviceid).ip
-            : false
-          oAccessory.control = new (require('./device/switch-multi'))(this, oAccessory)
-          this.api.updatePlatformAccessories('homebridge-ewelink', 'eWeLink', [oAccessory])
-          this.devicesInHB.set(oAccessory.context.hbDeviceId, oAccessory)
-          if (i === 0) accessory = oAccessory
-        }
-        /**********************/
-      } else if (this.helpers.devicesRFBridge.includes(device.extra.uiid)) {
-        /*********************
-        RF BRIDGE + SUBDEVICES
-        *********************/
-        let rfChlCounter = 0
-        const rfMap = []
-        if (this.helpers.hasProperty(device, 'tags') && this.helpers.hasProperty(device.tags, 'zyx_info')) {
-          device.tags.zyx_info.forEach(remote =>
-            rfMap.push({
-              name: remote.name,
-              type: remote.remote_type,
-              buttons: Object.assign({}, ...remote.buttonName)
-            })
-          )
-        }
-        accessory = this.devicesInHB.has(device.deviceid + 'SW0')
-          ? this.devicesInHB.get(device.deviceid + 'SW0')
-          : this.addAccessory(device, device.deviceid + 'SW0', true, {
-            rfMap
-          }, 'rf_pri')
-        accessory.control = new (require('./device/rf-bridge'))(this, accessory)
-        this.hiddenMasters.push(device.deviceid)
-        rfMap.forEach(subDevice => {
-          const swNumber = rfChlCounter + 1
-          let subType
-          let sensorTimeLength
-          let subExtraContext = {}
-          if (['1', '2', '3', '4'].includes(subDevice.type)) {
-            subType = 'button'
-          } else if (subDevice.type === '6') {
-            subType = this.cusS.has(device.deviceid + 'SW' + swNumber)
-              ? this.cusS.get(device.deviceid + 'SW' + swNumber).type
-              : 'motion'
-            if (this.cusS.has(device.deviceid + 'SW' + swNumber)) {
-              sensorTimeLength = this.cusS.get(device.deviceid + 'SW' + swNumber).sensorTimeLength
-            }
-          } else {
-            return
-          }
-          subExtraContext = {
-            buttons: subDevice.buttons,
-            subType,
-            swNumber,
-            sensorTimeLength
-          }
-          if ((oAccessory = this.devicesInHB.get(device.deviceid + 'SW' + swNumber))) {
-            if (
-              (this.config.resetRFBridge || '').includes(device.deviceid) ||
-              oAccessory.context.subType !== subType ||
-              oAccessory.context.sensorTimeLength !== sensorTimeLength ||
-              oAccessory.context.swNumber !== swNumber
-            ) {
-              this.removeAccessory(oAccessory)
-            }
-          }
-          oAccessory = this.devicesInHB.has(device.deviceid + 'SW' + swNumber)
-            ? this.devicesInHB.get(device.deviceid + 'SW' + swNumber)
-            : this.addAccessory(device, device.deviceid + 'SW' + swNumber, false, subExtraContext, 'rf_sub')
-          oAccessory
-            .getService(this.Service.AccessoryInformation)
-            .setCharacteristic(this.Characteristic.FirmwareRevision, device.params.fwVersion || this.version)
-          oAccessory.context.reachableWAN = device.online
-          oAccessory.context.reachableLAN = false
-          oAccessory.context.eweBrandName = device.brandName
-          oAccessory.context.eweShared = this.helpers.hasProperty(device, 'sharedBy') && this.helpers.hasProperty(device.sharedBy, 'email')
-            ? device.sharedBy.email
-            : false
-          oAccessory.context.ip = oAccessory.context.reachableLAN
-            ? this.lanDevices.get(device.deviceid).ip
-            : false
-          this.api.updatePlatformAccessories('homebridge-ewelink', 'eWeLink', [oAccessory])
-          this.devicesInHB.set(oAccessory.context.hbDeviceId, oAccessory)
-          oAccessory.control = new (require('./device/rf-bridge'))(this, oAccessory)
-          rfChlCounter += Object.keys(subDevice.buttons || {}).length
-        })
-        accessory.context.channelCount = rfChlCounter
-        this.devicesInHB.set(accessory.context.hbDeviceId, accessory)
-        /********************/
-      } else if (this.helpers.devicesZBBridge.includes(device.extra.uiid)) {
-        /************
-        ZIGBEE BRIDGE
-        ************/
-        if (this.devicesInHB.has(device.deviceid + 'SWX')) {
-          this.removeAccessory(this.devicesInHB.get(device.deviceid + 'SWX'))
-        }
-        return
-        /***********/
-      } else if (this.helpers.devicesZB.includes(device.extra.uiid)) {
-        /****************
-        ZIGBEE SUBDEVICES
-        ****************/
-        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
-          ? this.devicesInHB.get(device.deviceid + 'SWX')
-          : this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require('./device/zb-dev'))(this, accessory)
-        /***************/
-      } else if (this.helpers.devicesCamera.includes(device.extra.uiid)) {
-        /******
-        CAMERAS
-        ******/
-        this.log(' → [%s] please see the homebridge-ewelink wiki for details to enable the camera.', device.name)
-        return
-        /*****/
-      } else {
-        /**********
-        UNSUPPORTED
-        **********/
-        this.log.warn(' → [%s] has not been added as it is not supported. Please make a GitHub issue request.', device.name)
-        return
-        /*********/
-      }
-
-      // *** Update the current firmware version *** \\
-      if (!this.hiddenMasters.includes(device.deviceid)) {
-        accessory
-          .getService(this.Service.AccessoryInformation)
-          .setCharacteristic(this.Characteristic.FirmwareRevision, device.params.fwVersion || this.version)
-      }
-
-      // *** Update the reachability values (via WS and LAN) *** \\
-      accessory.context.reachableWAN = device.online
-      accessory.context.reachableLAN = this.lanDevices.has(device.deviceid)
-        ? this.lanDevices.get(device.deviceid).online
-        : false
-      accessory.context.inUse = false
-      accessory.context.eweBrandName = device.brandName
-      accessory.context.eweShared = this.helpers.hasProperty(device, 'sharedBy') && this.helpers.hasProperty(device.sharedBy, 'email')
-        ? device.sharedBy.email
-        : false
-      accessory.context.ip = accessory.context.reachableLAN
-        ? this.lanDevices.get(device.deviceid).ip
-        : false
-
-      // *** Helpful logging for each device *** \\
-      let str = accessory.context.reachableLAN
-        ? 'and found locally with IP [' + this.lanDevices.get(device.deviceid).ip + ']'
-        : 'but LAN mode unavailable as device '
-      if (!accessory.context.reachableLAN) {
-        if (this.helpers.devicesNonLAN.includes(device.extra.uiid)) {
-          str += "doesn't support it"
-        } else if (accessory.context.sharedDevice) {
-          str += 'is shared (' + device.sharedBy.email + ')'
-        } else {
-          str += 'is unreachable'
-        }
-      }
-
-      // *** Update accessory characteristics with latest values *** \\
-      if (!this.config.disableHTTPRefresh) accessory.control.externalUpdate(device.params)
-
-      // *** Update any changes to the device into our devicesInHB map *** \\
-      this.api.updatePlatformAccessories('homebridge-ewelink', 'eWeLink', [accessory])
-      this.devicesInHB.set(accessory.context.hbDeviceId, accessory)
-      this.log(' → [%s] initialised %s.', device.name, str)
-    } catch (err) {
-      // *** Catch errors at any point during device initialisation *** \\
-      const deviceName = accessory && this.helpers.hasProperty(accessory, 'displayName')
-        ? accessory.displayName
-        : device.name
-      this.log.warn(' → [%s] could not be initialised as %s.', deviceName, this.debug ? err : err.message)
-    }
-  }
-
-  addAccessory (device, hbDeviceId, hidden = false, extraContext = {}, type = '') {
-    // *** Get the switchNumber which can be {X, 0, 1, 2, 3, 4, ...} *** \\
-    const switchNumber = hbDeviceId.split('SW')[1].toString()
-
-    // *** Set up the device name which can depend on the accessory type *** \\
-    let newDeviceName = type === 'rf_sub' ? device.tags.zyx_info[switchNumber - 1].name : device.name
-    const channelCount = type === 'rf_pri'
-      ? Object.keys((device.tags && device.tags.zyx_info) || []).length
-      : this.helpers.chansFromUiid[device.extra.uiid]
-    if (['1', '2', '3', '4'].includes(switchNumber) && type !== 'rf_sub') {
-      if (
-        this.helpers.hasProperty(device, 'tags') &&
-        this.helpers.hasProperty(device.tags, 'ck_channel_name') &&
-        device.tags.ck_channel_name[parseInt(switchNumber) - 1]
-      ) {
-        newDeviceName = device.tags.ck_channel_name[parseInt(switchNumber) - 1]
-      } else {
-        newDeviceName += ' SW' + switchNumber
-      }
-    }
-    if (this.helpers.hasProperty(this.config.nameOverride, hbDeviceId)) {
-      newDeviceName = this.config.nameOverride[hbDeviceId]
-    }
-
-    // *** Add the new accessory to Homebridge *** \\
-    try {
-      const accessory = new this.api.platformAccessory(newDeviceName, this.api.hap.uuid.generate(hbDeviceId).toString())
-      if (!hidden) {
-        accessory
-          .getService(this.Service.AccessoryInformation)
-          .setCharacteristic(this.Characteristic.SerialNumber, hbDeviceId)
-          .setCharacteristic(this.Characteristic.Manufacturer, device.brandName)
-          .setCharacteristic(this.Characteristic.Model, device.productModel + ' (' + device.extra.model + ')')
-          .setCharacteristic(this.Characteristic.FirmwareRevision, device.params.fwVersion || this.version)
-          .setCharacteristic(this.Characteristic.Identify, true)
-        accessory.on('identify', (paired, callback) => {
-          callback()
-          this.log('[%s] - identify button pressed.', accessory.displayName)
-        })
-      }
-
-      // *** Add helpful context values to the accessory *** \\
-      accessory.context = {
-        ...{
-          hbDeviceId,
-          eweDeviceId: device.deviceid,
-          eweUIID: device.extra.uiid,
-          eweModel: device.productModel,
-          eweApiKey: device.apikey,
-          switchNumber,
-          channelCount
-        },
-        ...extraContext
-      }
-
-      // *** Register the accessory if it hasn't been hidden by the user *** \\
-      if (!hidden) {
-        this.api.registerPlatformAccessories('homebridge-ewelink', 'eWeLink', [accessory])
-        this.log(' → [%s] has been added to Homebridge.', newDeviceName)
-      }
-
-      // *** Return the new accessory *** \\
-      return accessory
-    } catch (err) {
-      // *** Add helpful context values to the accessory *** \\
-      this.log.warn(' → [%s] could not be added as %s.', newDeviceName, err)
-      return false
-    }
-  }
-
-  async sendDeviceUpdate (accessory, params) {
-    // *** Add a random delay of [1, 250]ms to avoid multiple http/ws requests a la vez
-    await this.helpers.sleep(Math.floor(Math.random() * 250 + 1))
-
-    // *** Set up the payload to send via LAN/WS *** \\
-    const payload = {
-      apikey: accessory.context.eweApiKey,
-      deviceid: accessory.context.eweDeviceId,
-      params
-    }
-
-    // *** Quick check to see if LAN mode is supported *** \\
-    const res = this.config.disableLANMode
-      ? 'LAN mode is disabled'
-      : this.helpers.devicesNonLAN.includes(accessory.context.eweUIID)
-        ? 'LAN mode is not supported for this device'
-        : await this.lanClient.sendUpdate(payload)
-
-    // *** Revert to WS if LAN mode not possible for whatever reason *** \\
-    if (res !== 'ok') {
-      // *** Check to see if the device is online *** \\
-      if (accessory.context.reachableWAN) {
-        if (this.debug) this.log('[%s] Reverting to web socket as %s.', accessory.displayName, res)
-        await this.wsClient.sendUpdate(payload)
-      } else {
-        throw new Error("it is unreachable. It's status will be corrected once it is reachable")
-      }
-    }
-  }
-
-  async receiveDeviceUpdate (device) {
-    const deviceId = device.deviceid
-    let accessory
-    let reachableChange = false
-
-    // *** Find our accessory for which the updates relates to *** \\
-    if ((accessory = this.devicesInHB.get(deviceId + 'SWX') || this.devicesInHB.get(deviceId + 'SW0'))) {
-      const isX = accessory.context.hbDeviceId.substr(-1) === 'X'
-      if (device.params.updateSource === 'WS') {
-        // *** The update is from WS so update the WS online/offline status *** \\
-        if (device.params.online !== accessory.context.reachableWAN) {
-          accessory.context.reachableWAN = device.params.online
-          this.devicesInHB.set(accessory.context.hbDeviceId, accessory)
-          reachableChange = true
-          this.log.warn('[%s] reported [%sline] via [WS].', accessory.displayName, accessory.context.reachableWAN ? 'on' : 'off')
-          if (accessory.context.reachableWAN) {
-            try {
-              this.wsClient.requestUpdate(accessory)
-            } catch (err) {
-              this.log.warn('[%s] update could not be requested as %s', accessory.displayName, this.debug ? err.message : err)
-            }
-          }
-        }
-      }
-      if (device.params.updateSource === 'LAN' && !accessory.context.reachableLAN) {
-        // *** The update is from LAN so update the LAN online/offline status *** \\
-        accessory.context.reachableLAN = true
-        this.devicesInHB.set(accessory.context.hbDeviceId, accessory)
-        reachableChange = true
-        this.log.warn('[%s] has been reported [online] via [LAN].', accessory.displayName)
-        try {
-          this.wsClient.requestUpdate(accessory)
-        } catch (err) {
-          this.log.warn('[%s] update could not be requested as %s', accessory.displayName, this.debug ? err.message : err)
-        }
-      }
-
-      // *** Update this new online/offline status for all switches of multi channel devices (ie not X) *** \\
-      if (reachableChange && !isX) {
-        // *** Loop through to see which channels are in HB *** \\
-        for (let i = 1; i <= accessory.context.channelCount; i++) {
-          if (this.devicesInHB.has(deviceId + 'SW' + i)) {
-            const oAccessory = this.devicesInHB.get(deviceId + 'SW' + i)
-            oAccessory.context.reachableWAN = device.params.online
-            if (device.params.updateSource === 'LAN') {
-              oAccessory.context.reachableLAN = true
-            }
-            this.devicesInHB.set(oAccessory.context.hbDeviceId, oAccessory)
-          }
-        }
-      }
-      if (this.debug) {
-        this.log('[%s] %s update received and will be refreshed.', accessory.displayName, device.params.updateSource)
-      }
-      try {
-        // *** Update the accessory with the new data *** \\
-        accessory.control.externalUpdate(device.params)
-      } catch (err) {
-        this.log.warn('[%s] could not be refreshed as %s.', accessory.displayName, this.debug ? err : err.message)
-      }
-    } else {
-      // *** The device does not existing in HB so let's try to add it *** \\
-      try {
-        // *** Check to see it doesn't exist because it's user hidden *** \\
-        if ((this.config.hideDevFromHB || '').includes(deviceId)) return
-
-        // *** Obtain full device information from the HTTP API *** \\
-        const newDevice = await this.httpClient.getDevice(deviceId)
-
-        // *** Initialise the device in HB *** \\
-        this.initialiseDevice(newDevice)
-
-        // *** Add the device to the LAN client map *** \\
-        this.lanClient.addDeviceToMap(newDevice)
-      } catch (err) {
-        // *** Automatically adding the new device failed for some reason *** \\
-        this.log.warn('[%s] restart Homebridge to add new device, failed to add automatically as %s.', deviceId, err.message)
-      }
-    }
-  }
-
-  async deviceUpdateError (accessory, err, requestRefresh) {
-    this.log.warn('[%s] could not be updated as %s.', accessory.displayName, this.debug ? err : err.message)
-
-    // *** We only request a device refresh on failed internal updates (ie with 'set' handlers) *** \\
-    if (requestRefresh) {
-      if (accessory.context.reachableWAN) {
-        try {
-          await this.wsClient.requestUpdate(accessory)
-          this.log.warn('[%s] requesting previous state to revert Homebridge state.', accessory.displayName)
-        } catch (err) {}
-      } else {
-        this.log.warn('[%s] Homebridge state will be synced once the device comes back online.', accessory.displayName)
-      }
-    }
-  }
-
-  configureAccessory (accessory) {
-    // *** Function is called for each device on HB start *** \\
-    if (!this.log) return
-
-    // *** Add each cached device to our devicesInHB map *** \\
-    this.devicesInHB.set(accessory.context.hbDeviceId, accessory)
-  }
-
-  removeAccessory (accessory) {
-    try {
-      // *** Unregister the accessory from HB and remove it from our devicesInHB map *** \\
-      this.api.unregisterPlatformAccessories('homebridge-ewelink', 'eWeLink', [accessory])
-      this.devicesInHB.delete(accessory.context.hbDeviceId)
-      this.log(' → [%s] was removed from Homebridge.', accessory.displayName)
-    } catch (err) {
-      this.log.warn(" → [%s] wasn't removed as %s.", accessory.displayName, err)
-    }
-  }
-}

From 677274be1d829dbe41c60988711c8cf324f4be91 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 3 Dec 2020 12:20:48 +0000
Subject: [PATCH 0899/3183] hb version

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index da250d4a..c570892a 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,7 @@
   ],
   "main": "lib/index.js",
   "engines": {
-    "homebridge": "^1.1.0",
+    "homebridge": "^1.1.6",
     "node": "^14.15.1"
   },
   "repository": {

From 865c88c8818b5d3773e70ed9eda3e91177b569ee Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 3 Dec 2020 20:18:19 +0000
Subject: [PATCH 0900/3183] helpers error

---
 lib/device/usb.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/device/usb.js b/lib/device/usb.js
index d7fe3c09..3c722d00 100644
--- a/lib/device/usb.js
+++ b/lib/device/usb.js
@@ -5,7 +5,7 @@ module.exports = class deviceUSB {
   constructor (platform, accessory) {
     this.platform = platform
     this.log = platform.log
-    this.this.helpers = platform.this.helpers
+    this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
     this.outletService = accessory.getService(this.Service.Outlet) || accessory.addService(this.Service.Outlet)

From b0ad002efc6bdd50ceb6fbbae1dc82d4d637af87 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 3 Dec 2020 20:19:18 +0000
Subject: [PATCH 0901/3183] 3.16.2

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 8893ab80..67379f59 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.16.1",
+  "version": "3.16.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index c570892a..bbde4e9c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.16.1",
+  "version": "3.16.2",
   "author": "bwp91",
   "description": "Homebridge/HOOBS plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 546e47a75aadf6cc5835bc528aba0bfc86ba08ca Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 3 Dec 2020 20:25:29 +0000
Subject: [PATCH 0902/3183] update comments

---
 lib/index.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/index.js b/lib/index.js
index 16dc7bde..979866f7 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -106,7 +106,7 @@ class eWeLinkPlatform {
       this.wsClient.receiveUpdate(device => this.receiveDeviceUpdate(device))
       this.lanClient.receiveUpdate(device => this.receiveDeviceUpdate(device))
 
-      // *** Refresh the WS connection every 30 minutes *** \\
+      // *** Refresh the WS connection every 60 minutes *** \\
       this.wsRefresh = setInterval(async () => {
         try {
           if (this.wsClient) {
@@ -130,7 +130,7 @@ class eWeLinkPlatform {
       this.log.warn('*** Disabling plugin [v%s] ***', this.version)
       this.log.warn(this.debug ? err : err.message)
 
-      // *** Attempt to close WS (and refresh interval) and stop LAN monitor if this has been setup *** \\
+      // *** Attempt to close WS and stop LAN monitor if this has been setup *** \\
       try {
         if (this.lanClient) this.lanClient.closeConnection()
         if (this.wsClient) this.wsClient.closeConnection()
@@ -141,7 +141,7 @@ class eWeLinkPlatform {
   }
 
   eWeLinkShutdown () {
-    // *** Attempt to close WS (and refresh interval) and stop LAN monitor if this has been setup *** \\
+    // *** Attempt to close WS and stop LAN monitor if this has been setup *** \\
     try {
       if (this.lanClient) this.lanClient.closeConnection()
       if (this.wsClient) this.wsClient.closeConnection()

From bc436b3a939907a168a1029ba49383794c23021b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 3 Dec 2020 20:42:34 +0000
Subject: [PATCH 0903/3183] extend outletAsSwitch to USB

---
 lib/device/usb.js | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/lib/device/usb.js b/lib/device/usb.js
index 3c722d00..b84edd38 100644
--- a/lib/device/usb.js
+++ b/lib/device/usb.js
@@ -8,8 +8,18 @@ module.exports = class deviceUSB {
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
-    this.outletService = accessory.getService(this.Service.Outlet) || accessory.addService(this.Service.Outlet)
-    this.outletService
+    if ((platform.config.outletAsSwitch || '').includes(accessory.context.eweDeviceId)) {
+      if (accessory.getService(this.Service.Outlet)) {
+        accessory.removeService(accessory.getService(this.Service.Outlet))
+      }
+      this.service = accessory.getService(this.Service.Switch) || accessory.addService(this.Service.Switch)
+    } else {
+      if (accessory.getService(this.Service.Switch)) {
+        accessory.removeService(accessory.getService(this.Service.Switch))
+      }
+      this.service = accessory.getService(this.Service.Outlet) || accessory.addService(this.Service.Outlet)
+    }
+    this.service
       .getCharacteristic(this.Characteristic.On)
       .on('set', this.internalUpdate.bind(this))
     accessory.log = this.log
@@ -34,7 +44,7 @@ module.exports = class deviceUSB {
   async externalUpdate (params) {
     try {
       if (!this.helpers.hasProperty(params, 'switches')) return
-      this.outletService.updateCharacteristic(this.Characteristic.On, params.switches[0].switch === 'on')
+      this.service.updateCharacteristic(this.Characteristic.On, params.switches[0].switch === 'on')
       this.accessory.eveLogger.addEntry({
         time: Math.round(new Date().valueOf() / 1000),
         status: params.switches[0].switch === 'on' ? 1 : 0

From 4c473415d68f9a509f8f09c40dfca8c8d63c4a14 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 3 Dec 2020 20:43:25 +0000
Subject: [PATCH 0904/3183] 3.16.3-0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 67379f59..b1ecf78f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.16.2",
+  "version": "3.16.3-0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index bbde4e9c..ecc13ea2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.16.2",
+  "version": "3.16.3-0",
   "author": "bwp91",
   "description": "Homebridge/HOOBS plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From dad6f8c8116f62946671b5813b6c021ee984c7bf Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 4 Dec 2020 06:57:02 +0000
Subject: [PATCH 0905/3183] improved device check

---
 lib/device/fan.js         | 2 +-
 lib/device/outlet-temp.js | 4 ++--
 lib/device/thermostat.js  | 2 +-
 lib/device/usb.js         | 2 +-
 lib/index.js              | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/device/fan.js b/lib/device/fan.js
index 0921af69..bc620d3e 100644
--- a/lib/device/fan.js
+++ b/lib/device/fan.js
@@ -21,7 +21,7 @@ module.exports = class deviceFan {
       .setProps({
         minStep: 33
       })
-    if ((this.platform.config.hideLightFromFan || '').includes(accessory.context.eweDeviceId)) {
+    if ((this.platform.config.hideLightFromFan || '').split(',').includes(accessory.context.eweDeviceId)) {
       if (accessory.getService(this.Service.Lightbulb)) {
         accessory.removeService(accessory.getService(this.Service.Lightbulb))
       }
diff --git a/lib/device/outlet-temp.js b/lib/device/outlet-temp.js
index 0eaf7c81..9c7fb288 100644
--- a/lib/device/outlet-temp.js
+++ b/lib/device/outlet-temp.js
@@ -11,7 +11,7 @@ module.exports = class deviceOutletTemp {
     if (accessory.getService(this.Service.Thermostat)) {
       accessory.removeService(accessory.getService(this.Service.Thermostat))
     }
-    if ((this.platform.config.hideSwitchFromTH || '').includes(accessory.context.eweDeviceId)) {
+    if ((this.platform.config.hideSwitchFromTH || '').split(',').includes(accessory.context.eweDeviceId)) {
       if (accessory.getService(this.Service.Switch)) {
         accessory.removeService(accessory.getService(this.Service.Switch))
       }
@@ -53,7 +53,7 @@ module.exports = class deviceOutletTemp {
   async externalUpdate (params) {
     try {
       if (
-        !(this.platform.config.hideSwitchFromTH || '').includes(this.accessory.context.eweDeviceId) &&
+        !(this.platform.config.hideSwitchFromTH || '').split(',').includes(this.accessory.context.eweDeviceId) &&
         (this.helpers.hasProperty(params, 'switch') || this.helpers.hasProperty(params, 'mainSwitch'))
       ) {
         const newState = this.helpers.hasProperty(params, 'switch') ? params.switch === 'on' : params.mainSwitch === 'on'
diff --git a/lib/device/thermostat.js b/lib/device/thermostat.js
index af9a49f7..99c61730 100644
--- a/lib/device/thermostat.js
+++ b/lib/device/thermostat.js
@@ -74,7 +74,7 @@ module.exports = class deviceThermostat {
   async externalUpdate (params) {
     try {
       if (
-        !(this.platform.config.hideSwitchFromTH || '').includes(this.accessory.context.eweDeviceId) &&
+        !(this.platform.config.hideSwitchFromTH || '').split(',').includes(this.accessory.context.eweDeviceId) &&
         (this.helpers.hasProperty(params, 'switch') || this.helpers.hasProperty(params, 'mainSwitch'))
       ) {
         const newState = this.helpers.hasProperty(params, 'switch') ? params.switch === 'on' : params.mainSwitch === 'on'
diff --git a/lib/device/usb.js b/lib/device/usb.js
index b84edd38..9529d5b0 100644
--- a/lib/device/usb.js
+++ b/lib/device/usb.js
@@ -8,7 +8,7 @@ module.exports = class deviceUSB {
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
-    if ((platform.config.outletAsSwitch || '').includes(accessory.context.eweDeviceId)) {
+    if ((platform.config.outletAsSwitch || '').split(',').includes(accessory.context.eweDeviceId)) {
       if (accessory.getService(this.Service.Outlet)) {
         accessory.removeService(accessory.getService(this.Service.Outlet))
       }
diff --git a/lib/index.js b/lib/index.js
index 979866f7..a249565e 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -450,7 +450,7 @@ class eWeLinkPlatform {
           }
           if ((oAccessory = this.devicesInHB.get(device.deviceid + 'SW' + swNumber))) {
             if (
-              (this.config.resetRFBridge || '').includes(device.deviceid) ||
+              (this.config.resetRFBridge || '').split(',').includes(device.deviceid) ||
               oAccessory.context.subType !== subType ||
               oAccessory.context.sensorTimeLength !== sensorTimeLength ||
               oAccessory.context.swNumber !== swNumber
@@ -730,7 +730,7 @@ class eWeLinkPlatform {
       // *** The device does not existing in HB so let's try to add it *** \\
       try {
         // *** Check to see it doesn't exist because it's user hidden *** \\
-        if ((this.config.hideDevFromHB || '').includes(deviceId)) return
+        if ((this.config.hideDevFromHB || '').split(',').includes(deviceId)) return
 
         // *** Obtain full device information from the HTTP API *** \\
         const newDevice = await this.httpClient.getDevice(deviceId)

From 3cc67e7180df56ab7b91a18520241f724eee5161 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 4 Dec 2020 11:54:32 +0000
Subject: [PATCH 0906/3183] temp+humidity logic

---
 config.schema.json        |  4 ++++
 lib/device/outlet-temp.js | 13 +++++++++----
 lib/device/thermostat.js  | 11 +++++++----
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index e613d444..0f0935d8 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -98,6 +98,10 @@
         "title": "TH As Thermostat",
         "description": "A list of TH10/TH16 devices to show as thermostats. For example '10009553c8' or multiple separated with a comma '10009553c8,10009553c9' (without the quotes)."
       },
+      "thOffsetTwo": {
+        "type": "string",
+        "default": ""
+      },
       "resetRFBridge": {
         "title": "Reset RF Bridges",
         "type": "string",
diff --git a/lib/device/outlet-temp.js b/lib/device/outlet-temp.js
index 9c7fb288..0408154b 100644
--- a/lib/device/outlet-temp.js
+++ b/lib/device/outlet-temp.js
@@ -8,6 +8,7 @@ module.exports = class deviceOutletTemp {
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
+    this.tempOffset = (platform.config.thOffsetTwo || '').split(',').includes(accessory.context.eweDeviceId) ? 2 : 0
     if (accessory.getService(this.Service.Thermostat)) {
       accessory.removeService(accessory.getService(this.Service.Thermostat))
     }
@@ -64,13 +65,17 @@ module.exports = class deviceOutletTemp {
         })
       }
       const eveLog = { time: Math.round(new Date().valueOf() / 1000) }
-      if (this.helpers.hasProperty(params, 'currentTemperature') && this.accessory.getService(this.Service.TemperatureSensor)) {
-        const currentTemp = parseFloat(params.currentTemperature !== 'unavailable' ? params.currentTemperature : 0)
+      if (this.helpers.hasProperty(params, 'currentTemperature') && params.currentTemperature !== 'unavailable') {
+        const currentTemp = parseFloat(params.currentTemperature) + this.tempOffset
         this.tempService.updateCharacteristic(this.Characteristic.CurrentTemperature, currentTemp)
         eveLog.temp = currentTemp
       }
-      if (this.helpers.hasProperty(params, 'currentHumidity') && this.accessory.getService(this.Service.HumiditySensor)) {
-        const currentHumi = parseFloat(params.currentHumidity !== 'unavailable' ? params.currentHumidity : 0)
+      if (
+        this.helpers.hasProperty(params, 'currentHumidity') &&
+        params.currentHumidity !== 'unavailable' &&
+        this.accessory.getService(this.Service.HumiditySensor)
+      ) {
+        const currentHumi = parseFloat(params.currentHumidity)
         this.humiService.updateCharacteristic(this.Characteristic.CurrentRelativeHumidity, currentHumi)
         eveLog.humidity = currentHumi
       }
diff --git a/lib/device/thermostat.js b/lib/device/thermostat.js
index 99c61730..e45a67b1 100644
--- a/lib/device/thermostat.js
+++ b/lib/device/thermostat.js
@@ -8,6 +8,7 @@ module.exports = class deviceThermostat {
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
+    this.tempOffset = (platform.config.thOffsetTwo || '').split(',').includes(accessory.context.eweDeviceId) ? 2 : 0
     if (accessory.getService(this.Service.Switch)) {
       accessory.removeService(accessory.getService(this.Service.Switch))
     }
@@ -81,16 +82,18 @@ module.exports = class deviceThermostat {
         this.service.updateCharacteristic(this.Characteristic.TargetHeatingCoolingState, newState ? 1 : 0)
       }
       const eveLog = { time: Math.round(new Date().valueOf() / 1000) }
-      if (this.helpers.hasProperty(params, 'currentTemperature')) {
-        const currentTemp = parseFloat(params.currentTemperature !== 'unavailable' ? params.currentTemperature : 0)
+      if (this.helpers.hasProperty(params, 'currentTemperature') && params.currentTemperature !== 'unavailable') {
+        const currentTemp = parseFloat(params.currentTemperature) + this.tempOffset
         this.service.updateCharacteristic(this.Characteristic.CurrentTemperature, currentTemp)
         this.service.updateCharacteristic(this.Characteristic.TargetTemperature, currentTemp)
         eveLog.temp = currentTemp
       }
       if (
-        this.helpers.hasProperty(params, 'currentHumidity') && this.service.testCharacteristic(this.Characteristic.CurrentRelativeHumidity)
+        this.helpers.hasProperty(params, 'currentHumidity') &&
+        params.currentHumidity !== 'unavailable' &&
+        this.service.testCharacteristic(this.Characteristic.CurrentRelativeHumidity)
       ) {
-        const currentHumi = parseFloat(params.currentHumidity !== 'unavailable' ? params.currentHumidity : 0)
+        const currentHumi = parseFloat(params.currentHumidity)
         this.humiService.updateCharacteristic(this.Characteristic.CurrentRelativeHumidity, currentHumi)
         eveLog.humidity = currentHumi
       }

From 8995c58176de2f5074c68584105978716c597db1 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 4 Dec 2020 11:58:02 +0000
Subject: [PATCH 0907/3183] 3.16.3-1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b1ecf78f..14eaacf5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.16.3-0",
+  "version": "3.16.3-1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index ecc13ea2..31b10302 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.16.3-0",
+  "version": "3.16.3-1",
   "author": "bwp91",
   "description": "Homebridge/HOOBS plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 507df26bd2aac74d4b7f6236692add3c7104a9c7 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 4 Dec 2020 12:13:55 +0000
Subject: [PATCH 0908/3183] show brand logo customui

---
 lib/homebridge-ui/public/index.html | 6 ++++++
 lib/index.js                        | 4 ++++
 2 files changed, 10 insertions(+)

diff --git a/lib/homebridge-ui/public/index.html b/lib/homebridge-ui/public/index.html
index a8566a22..6b801a9c 100644
--- a/lib/homebridge-ui/public/index.html
+++ b/lib/homebridge-ui/public/index.html
@@ -61,6 +61,9 @@
           <th scope="row">Shared Device</th>
           <td id="eweShared"></td>
         </tr>
+        <tr>
+          <td colspan="2" style="text-align: center" id="imgIcon"></td>
+        </tr>
       </tbody>
     </table>
   </div>
@@ -161,6 +164,9 @@ <h4>Disclaimer</h4>
           document.getElementById('eweShared').innerHTML = selectedAccessory.context.eweShared
             ? 'Yes (by ' + selectedAccessory.context.eweShared + ')'
             : 'No'
+          document.getElementById('imgIcon').innerHTML = selectedAccessory.context.eweBrandLogo
+            ? '<img src="' + selectedAccessory.context.eweBrandLogo + '" style="width: 100px;">'
+            : ''
           document.getElementById('deviceTable').style.display = 'inline-table'
           homebridge.hideSpinner()
         }
diff --git a/lib/index.js b/lib/index.js
index a249565e..aca8b7d8 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -151,6 +151,7 @@ class eWeLinkPlatform {
   }
 
   initialiseDevice (device) {
+    if (device.name === "Porch Bulb") this.log.warn(JSON.stringify(device, null, 2))
     let accessory
     let oAccessory
     try {
@@ -391,6 +392,7 @@ class eWeLinkPlatform {
             ? this.lanDevices.get(device.deviceid).online
             : false
           oAccessory.context.eweBrandName = device.brandName
+          oAccessory.context.eweBrandLogo = device.brandLogo
           oAccessory.context.eweShared = this.helpers.hasProperty(device, 'sharedBy') && this.helpers.hasProperty(device.sharedBy, 'email')
             ? device.sharedBy.email
             : false
@@ -467,6 +469,7 @@ class eWeLinkPlatform {
           oAccessory.context.reachableWAN = device.online
           oAccessory.context.reachableLAN = false
           oAccessory.context.eweBrandName = device.brandName
+          oAccessory.context.eweBrandLogo = device.brandLogo
           oAccessory.context.eweShared = this.helpers.hasProperty(device, 'sharedBy') && this.helpers.hasProperty(device.sharedBy, 'email')
             ? device.sharedBy.email
             : false
@@ -529,6 +532,7 @@ class eWeLinkPlatform {
         : false
       accessory.context.inUse = false
       accessory.context.eweBrandName = device.brandName
+      accessory.context.eweBrandLogo = device.brandLogo
       accessory.context.eweShared = this.helpers.hasProperty(device, 'sharedBy') && this.helpers.hasProperty(device.sharedBy, 'email')
         ? device.sharedBy.email
         : false

From ff2bdb14fb561af923dd61ee35517a407215fad2 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 4 Dec 2020 12:14:40 +0000
Subject: [PATCH 0909/3183] remove test

---
 lib/index.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/index.js b/lib/index.js
index aca8b7d8..32b79175 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -151,7 +151,6 @@ class eWeLinkPlatform {
   }
 
   initialiseDevice (device) {
-    if (device.name === "Porch Bulb") this.log.warn(JSON.stringify(device, null, 2))
     let accessory
     let oAccessory
     try {

From 9088f283ab7f2a50246e4222c164d5b305981970 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 4 Dec 2020 12:15:12 +0000
Subject: [PATCH 0910/3183] 3.16.3-2

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 14eaacf5..a3fa408d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.16.3-1",
+  "version": "3.16.3-2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 31b10302..d3d6503e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.16.3-1",
+  "version": "3.16.3-2",
   "author": "bwp91",
   "description": "Homebridge/HOOBS plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 7d23b98ecacd31616c4944f00e22e0e1b3ce1262 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 4 Dec 2020 22:54:37 +0000
Subject: [PATCH 0911/3183] dump ws dep

---
 package-lock.json | 6 +++---
 package.json      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index a3fa408d..1f01a930 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -196,9 +196,9 @@
       }
     },
     "ws": {
-      "version": "7.4.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.0.tgz",
-      "integrity": "sha512-kyFwXuV/5ymf+IXhS6f0+eAFvydbaBW3zjpT6hUdAh/hbVjTIB5EHBGi0bPoCLSK2wcuz3BrEkB9LrYv1Nm4NQ=="
+      "version": "7.4.1",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.1.tgz",
+      "integrity": "sha512-pTsP8UAfhy3sk1lSk/O/s4tjD0CRwvMnzvwr4OKGX7ZvqZtUyx4KIJB5JWbkykPoc55tixMGgTNoh3k4FkNGFQ=="
     }
   }
 }
diff --git a/package.json b/package.json
index d3d6503e..cbeeea49 100644
--- a/package.json
+++ b/package.json
@@ -50,7 +50,7 @@
     "axios": "^0.21.0",
     "node-dns-sd": "^0.4.2",
     "websocket-as-promised": "^1.1.0",
-    "ws": "^7.4.0"
+    "ws": "^7.4.1"
   },
   "standard": {
     "ignore": [

From ffbd97375f60e04d94895a101b9c222b6e49bc3c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 4 Dec 2020 22:56:53 +0000
Subject: [PATCH 0912/3183] 3.16.3-3

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 1f01a930..59238e10 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.16.3-2",
+  "version": "3.16.3-3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index cbeeea49..fbed22f9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.16.3-2",
+  "version": "3.16.3-3",
   "author": "bwp91",
   "description": "Homebridge/HOOBS plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 846ff2cc0469ef8bbed122adeecac28eb4dfc07b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 5 Dec 2020 13:10:48 +0000
Subject: [PATCH 0913/3183] 3.16.3

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 59238e10..01f35563 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.16.3-3",
+  "version": "3.16.3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index fbed22f9..39988a5f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.16.3-3",
+  "version": "3.16.3",
   "author": "bwp91",
   "description": "Homebridge/HOOBS plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 47533baa60dc825433a7ca9f7ffb54407120ae80 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 5 Dec 2020 15:52:06 +0000
Subject: [PATCH 0914/3183] th offset

---
 config.schema.json        | 16 +++++++++++++---
 lib/connection/lan.js     | 15 ++++++++-------
 lib/device/outlet-temp.js |  7 +++----
 lib/device/thermostat.js  |  4 +++-
 lib/index.js              | 18 +++++++++---------
 5 files changed, 36 insertions(+), 24 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 0f0935d8..164667b1 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -98,9 +98,19 @@
         "title": "TH As Thermostat",
         "description": "A list of TH10/TH16 devices to show as thermostats. For example '10009553c8' or multiple separated with a comma '10009553c8,10009553c9' (without the quotes)."
       },
-      "thOffsetTwo": {
-        "type": "string",
-        "default": ""
+      "thTempOffset": {
+        "type": "array",
+        "items": {
+          "type": "object",
+          "properties": {
+            "deviceId": {
+              "type": "string"
+            },
+            "offset": {
+              "type": "number"
+            }
+          }
+        }
       },
       "resetRFBridge": {
         "title": "Reset RF Bridges",
diff --git a/lib/connection/lan.js b/lib/connection/lan.js
index a1f8750e..9af67589 100644
--- a/lib/connection/lan.js
+++ b/lib/connection/lan.js
@@ -2,10 +2,11 @@
 /* eslint-disable new-cap */
 'use strict'
 module.exports = class connectionLAN {
-  constructor (config, log, helpers, devices) {
+  constructor (config, log, helpers, ipOverride, devices) {
     this.log = log
     this.config = config
     this.helpers = helpers
+    this.ipOverride = ipOverride
     this.debug = this.config.debug || false
     this.debugReqRes = this.config.debugReqRes || false
     this.emitter = new (require('events'))()
@@ -14,8 +15,8 @@ module.exports = class connectionLAN {
     devices.forEach(device => {
       this.deviceMap.set(device.deviceid, {
         apiKey: device.devicekey,
-        online: this.helpers.hasProperty(this.config.ipOverride, device.deviceid),
-        ip: this.helpers.hasProperty(this.config.ipOverride, device.deviceid) ? this.config.ipOverride[device.deviceid] : null,
+        online: this.helpers.hasProperty(this.ipOverride, device.deviceid),
+        ip: this.helpers.hasProperty(this.ipOverride, device.deviceid) ? this.ipOverride[device.deviceid] : null,
         lastIV: null
       })
     })
@@ -29,7 +30,7 @@ module.exports = class connectionLAN {
       let d
       const deviceId = device.fqdn.replace('._ewelink._tcp.local', '').replace('eWeLink_', '')
       if ((d = this.deviceMap.get(deviceId))) {
-        if (!this.helpers.hasProperty(this.config.ipOverride, deviceId)) {
+        if (!this.helpers.hasProperty(this.ipOverride, deviceId)) {
           this.deviceMap.set(deviceId, {
             apiKey: d.apiKey,
             online: true,
@@ -63,7 +64,7 @@ module.exports = class connectionLAN {
             const dText = this.crypto.createDecipheriv('aes-128-cbc', key, Buffer.from(rdata.iv, 'base64'))
             const pText = Buffer.concat([dText.update(Buffer.from(data, 'base64')), dText.final()]).toString('utf8')
             let params
-            if (packet.address !== deviceInfo.ip && !this.helpers.hasProperty(this.config.ipOverride, rdata.id)) {
+            if (packet.address !== deviceInfo.ip && !this.helpers.hasProperty(this.ipOverride, rdata.id)) {
               this.deviceMap.set(rdata.id, {
                 apiKey: deviceInfo.apiKey,
                 online: true,
@@ -170,8 +171,8 @@ module.exports = class connectionLAN {
   addDeviceToMap (device) {
     this.deviceMap.set(device.deviceid, {
       apiKey: device.devicekey,
-      online: this.helpers.hasProperty(this.config.ipOverride, device.deviceid),
-      ip: this.helpers.hasProperty(this.config.ipOverride, device.deviceid) ? this.config.ipOverride[device.deviceid] : null,
+      online: this.helpers.hasProperty(this.ipOverride, device.deviceid),
+      ip: this.helpers.hasProperty(this.ipOverride, device.deviceid) ? this.ipOverride[device.deviceid] : null,
       lastIV: null
     })
   }
diff --git a/lib/device/outlet-temp.js b/lib/device/outlet-temp.js
index 0408154b..3040d519 100644
--- a/lib/device/outlet-temp.js
+++ b/lib/device/outlet-temp.js
@@ -8,10 +8,9 @@ module.exports = class deviceOutletTemp {
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
-    this.tempOffset = (platform.config.thOffsetTwo || '').split(',').includes(accessory.context.eweDeviceId) ? 2 : 0
-    if (accessory.getService(this.Service.Thermostat)) {
-      accessory.removeService(accessory.getService(this.Service.Thermostat))
-    }
+    this.tempOffset = this.helpers.hasProperty(platform.thTempOffset, accessory.context.eweDeviceId)
+      ? parseFloat(platform.thTempOffset[accessory.context.eweDeviceId])
+      : 0
     if ((this.platform.config.hideSwitchFromTH || '').split(',').includes(accessory.context.eweDeviceId)) {
       if (accessory.getService(this.Service.Switch)) {
         accessory.removeService(accessory.getService(this.Service.Switch))
diff --git a/lib/device/thermostat.js b/lib/device/thermostat.js
index e45a67b1..6ea5f0b4 100644
--- a/lib/device/thermostat.js
+++ b/lib/device/thermostat.js
@@ -8,7 +8,9 @@ module.exports = class deviceThermostat {
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
-    this.tempOffset = (platform.config.thOffsetTwo || '').split(',').includes(accessory.context.eweDeviceId) ? 2 : 0
+    this.tempOffset = this.helpers.hasProperty(platform.thTempOffset, accessory.context.eweDeviceId)
+      ? parseFloat(platform.thTempOffset[accessory.context.eweDeviceId])
+      : 0
     if (accessory.getService(this.Service.Switch)) {
       accessory.removeService(accessory.getService(this.Service.Switch))
     }
diff --git a/lib/index.js b/lib/index.js
index 32b79175..b5860a77 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -27,12 +27,12 @@ class eWeLinkPlatform {
     this.cusG = new Map()
     this.cusS = new Map()
     this.hiddenMasters = []
-    this.nameOverrideTmp = {}
-    this.ipOverrideTmp = {}
-    if (config.nameOverride) config.nameOverride.forEach(x => (this.nameOverrideTmp[x.fullDeviceId] = x.deviceName))
-    if (config.ipOverride) config.ipOverride.forEach(x => (this.ipOverrideTmp[x.deviceId] = x.deviceIP))
-    this.config.nameOverride = this.nameOverrideTmp
-    this.config.ipOverride = this.ipOverrideTmp
+    this.thTempOffset = {}
+    this.nameOverride = {}
+    this.ipOverride = {}
+    if (Array.isArray(config.thTempOffset)) config.thTempOffset.forEach(x => (this.thTempOffset[x.deviceId] = x.offset))
+    if (Array.isArray(config.nameOverride)) config.nameOverride.forEach(x => (this.nameOverride[x.fullDeviceId] = x.deviceName))
+    if (Array.isArray(config.ipOverride)) config.ipOverride.forEach(x => (this.ipOverride[x.deviceId] = x.deviceIP))
     this.eveLogPath = this.api.user.storagePath() + '/persist/'
 
     // *** Set up Homebridge API events *** \\
@@ -69,7 +69,7 @@ class eWeLinkPlatform {
       this.wsClient.login()
 
       // *** Set up the LAN client, scan for devices and start monitoring *** \\
-      this.lanClient = new (require('./connection/lan'))(this.config, this.log, this.helpers, deviceList)
+      this.lanClient = new (require('./connection/lan'))(this.config, this.log, this.helpers, this.ipOverride, deviceList)
       this.lanDevices = await this.lanClient.getHosts()
       await this.lanClient.startMonitor()
 
@@ -589,8 +589,8 @@ class eWeLinkPlatform {
         newDeviceName += ' SW' + switchNumber
       }
     }
-    if (this.helpers.hasProperty(this.config.nameOverride, hbDeviceId)) {
-      newDeviceName = this.config.nameOverride[hbDeviceId]
+    if (this.helpers.hasProperty(this.nameOverride, hbDeviceId)) {
+      newDeviceName = this.nameOverride[hbDeviceId]
     }
 
     // *** Add the new accessory to Homebridge *** \\

From 2a1ea083ca4a3fdab1de1b88472c0d3e90e86e98 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 5 Dec 2020 15:53:37 +0000
Subject: [PATCH 0915/3183] 3.16.4-0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 01f35563..02958569 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.16.3",
+  "version": "3.16.4-0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 39988a5f..98170510 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.16.3",
+  "version": "3.16.4-0",
   "author": "bwp91",
   "description": "Homebridge/HOOBS plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From aba8c609b50887c8f995773c3c61505e701eca7e Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Sun, 6 Dec 2020 13:57:52 +0000
Subject: [PATCH 0916/3183] Update config.yml

---
 .github/ISSUE_TEMPLATE/config.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 568f5076..36e33723 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,5 +1,9 @@
 blank_issues_enabled: false
 contact_links:
+  - name: 🌍 My Discord
+    url: https://discord.gg/cMGhNtZ3tW
+    about: Join my personal Discord server where you can post messages in the plugin channels or message me directly.
   - name: 🌍 Homebridge Discord
     url: https://discord.gg/7X36mdw
-    about: The Homebridge Discord is a community where you can ask questions and get general help with Homebridge and plugins. You can also message me directly on there - my username is bwp91.
+    about: The Homebridge Discord is a community where you can ask questions and get general help with Homebridge and other plugins.
+    

From 76872d595045e420c1120bb3a3a56d218a27b907 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Sun, 6 Dec 2020 13:59:29 +0000
Subject: [PATCH 0917/3183] Update config.yml

---
 .github/ISSUE_TEMPLATE/config.yml | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 36e33723..17e1c2a2 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,9 +1,5 @@
 blank_issues_enabled: false
 contact_links:
-  - name: 🌍 My Discord
+  - name: 🌍 My Discord Server
     url: https://discord.gg/cMGhNtZ3tW
-    about: Join my personal Discord server where you can post messages in the plugin channels or message me directly.
-  - name: 🌍 Homebridge Discord
-    url: https://discord.gg/7X36mdw
-    about: The Homebridge Discord is a community where you can ask questions and get general help with Homebridge and other plugins.
-    
+    about: Join my personal Discord server where you can post messages in the plugin channels or message me directly. This is often easier and quicker than creating an issue on here.

From a6a89b74b0fcec3fc109e7ca7b6fbfac263fb8a9 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 7 Dec 2020 08:09:43 +0000
Subject: [PATCH 0918/3183] new logo + credit

---
 README.md                           | 3 ++-
 config.schema.json                  | 2 +-
 lib/homebridge-ui/public/index.html | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 114c82ac..bdf21f71 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 <p align="center">
-   <a href="https://github.com/bwp91/homebridge-ewelink"><img alt="Homebridge Verified" src="https://user-images.githubusercontent.com/43026681/100062842-2e94b800-2e28-11eb-83d4-f8490b6bb804.png" width="600px"></a>
+   <a href="https://github.com/bwp91/homebridge-ewelink"><img alt="Homebridge Verified" src="https://user-images.githubusercontent.com/43026681/101325266-63126600-3863-11eb-9382-4a2924f0e540.png" width="600px"></a>
 </p>
 <span align="center">
   
@@ -55,6 +55,7 @@ Homebridge/HOOBS plugin to control eWeLink devices with original firmware
 * To successive contributors: [@MrTomAsh](https://github.com/MrTomAsh) and [@howanghk](https://github.com/howanghk) for [homebridge-ewelink-max](https://github.com/howanghk/homebridge-ewelink).
 * To the creators/contributors of [Homebridge](https://homebridge.io) who make this plugin possible.
 * To the creators/contributors of [Fakegato](https://github.com/simont77/fakegato-history): [@simont77](https://github.com/simont77) and [@NorthernMan54](https://github.com/NorthernMan54).
+* To the creator of the awesome plugin header logo: [Keryan Belahcene](https://www.instagram.com/keryan.me).
 * To all users who have shared their devices to enable functionality.
 
 ### Disclaimer
diff --git a/config.schema.json b/config.schema.json
index 164667b1..92aa1365 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -4,7 +4,7 @@
   "singular": true,
   "customUi": true,
   "customUiPath": "./lib/homebridge-ui",
-  "headerDisplay": "<p align=\"center\"><img width=\"60%\" src=\"https://user-images.githubusercontent.com/43026681/100062842-2e94b800-2e28-11eb-83d4-f8490b6bb804.png\"></p><p align=\"center\">For help and support please visit our <a href=\"https://github.com/bwp91/homebridge-ewelink/wiki\">GitHub Wiki</a>. We hope you find this plugin useful!</p>",
+  "headerDisplay": "<p align=\"center\"><img width=\"60%\" src=\"https://user-images.githubusercontent.com/43026681/101325266-63126600-3863-11eb-9382-4a2924f0e540.png\"></p><p align=\"center\">For help and support please visit our <a href=\"https://github.com/bwp91/homebridge-ewelink/wiki\">GitHub Wiki</a>. We hope you find this plugin useful!</p>",
   "schema": {
     "type": "object",
     "properties": {
diff --git a/lib/homebridge-ui/public/index.html b/lib/homebridge-ui/public/index.html
index 6b801a9c..a1b5c175 100644
--- a/lib/homebridge-ui/public/index.html
+++ b/lib/homebridge-ui/public/index.html
@@ -1,5 +1,5 @@
 <p class="text-center">
-  <img src="https://user-images.githubusercontent.com/43026681/100062842-2e94b800-2e28-11eb-83d4-f8490b6bb804.png" alt="homebridge-ewelink logo" style="width: 60%;">
+  <img src="https://user-images.githubusercontent.com/43026681/101325266-63126600-3863-11eb-9382-4a2924f0e540.png" alt="homebridge-ewelink logo" style="width: 60%;">
 </p>
 <div id="pageIntro" class="text-center" style="display: none;">
   <p class="lead">Thank you for installing <strong>homebridge-ewelink</strong></p>
@@ -99,6 +99,7 @@ <h4>Credits</h4>
     <li>To successive contributors: <a href="https://github.com/MrTomAsh" target="_blank">@MrTomAsh</a> and <a href="https://github.com/howanghk" target="_blank">@howanghk</a> for <a href="https://github.com/howanghk/homebridge-ewelink" target="_blank">homebridge-ewelink-max</a>.</li>
     <li>To the creators/contributors of <a href="https://homebridge.io" target="_blank">Homebridge</a> who make this plugin possible.</li>
     <li>To the creators/contributors of <a href="https://github.com/simont77/fakegato-history" target="_blank">Fakegato</a>: <a href="https://github.com/simont77" target="_blank">@simont77</a> and <a href="https://github.com/NorthernMan54" target="_blank">@NorthernMan54</a>.</li>
+    <li>To the creator of the awesome plugin header logo: <a href="https://www.instagram.com/keryan.me" target="_blank">Keryan Belahcene</a>.</li>
     <li>To all users who have shared their devices to enable functionality.</li>
   </ul>
     

From 6399862981d22adaa27d2e0c702abd230388b470 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 7 Dec 2020 12:39:23 +0000
Subject: [PATCH 0919/3183] 3.17.0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 02958569..5cdba02a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.16.4-0",
+  "version": "3.17.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 98170510..e0b83d6a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.16.4-0",
+  "version": "3.17.0",
   "author": "bwp91",
   "description": "Homebridge/HOOBS plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 415aec14acbcf8f1fa82f38abdd2259203118407 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Mon, 7 Dec 2020 18:09:37 +0000
Subject: [PATCH 0920/3183] Update README.md

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index bdf21f71..cbbf9d7d 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,8 @@ Homebridge/HOOBS plugin to control eWeLink devices with original firmware
 [![npm](https://img.shields.io/npm/v/homebridge-ewelink/beta?label=beta)](https://github.com/bwp91/homebridge-ewelink/wiki/Beta-Version)   
 [![npm](https://img.shields.io/npm/dt/homebridge-ewelink)](https://www.npmjs.com/package/homebridge-ewelink)
 [![JavaScript Style Guide](https://img.shields.io/badge/code_style-standard-brightgreen.svg)](https://standardjs.com)   
-[![Discord](https://img.shields.io/discord/432663330281226270?color=728ED5&logo=discord&label=discord)](https://discord.com/channels/432663330281226270/742733745743855627)
+[![Discord](https://img.shields.io/discord/784827113378676736?color=728ED5&logo=discord&label=bwp91-discord)]
+[![Discord](https://img.shields.io/discord/432663330281226270?color=728ED5&logo=discord&label=homebridge-discord)](https://discord.com/channels/432663330281226270/742733745743855627)
 
 </span>
 

From 1e489e311ac69a2e8bee4adcd2d153c8c5600b17 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Mon, 7 Dec 2020 18:10:46 +0000
Subject: [PATCH 0921/3183] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index cbbf9d7d..f8e09e47 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ Homebridge/HOOBS plugin to control eWeLink devices with original firmware
 [![npm](https://img.shields.io/npm/v/homebridge-ewelink/beta?label=beta)](https://github.com/bwp91/homebridge-ewelink/wiki/Beta-Version)   
 [![npm](https://img.shields.io/npm/dt/homebridge-ewelink)](https://www.npmjs.com/package/homebridge-ewelink)
 [![JavaScript Style Guide](https://img.shields.io/badge/code_style-standard-brightgreen.svg)](https://standardjs.com)   
-[![Discord](https://img.shields.io/discord/784827113378676736?color=728ED5&logo=discord&label=bwp91-discord)]
+[![Discord](https://img.shields.io/discord/784827113378676736?color=728ED5&logo=discord&label=bwp91-discord)](https://discord.com/channels/784827113378676736/784827113378676739)
 [![Discord](https://img.shields.io/discord/432663330281226270?color=728ED5&logo=discord&label=homebridge-discord)](https://discord.com/channels/432663330281226270/742733745743855627)
 
 </span>

From 555042a0f1405b41907844eaee6f909981ed0f03 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Mon, 7 Dec 2020 18:12:09 +0000
Subject: [PATCH 0922/3183] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index f8e09e47..f16d5410 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ Homebridge/HOOBS plugin to control eWeLink devices with original firmware
 [![npm](https://img.shields.io/npm/dt/homebridge-ewelink)](https://www.npmjs.com/package/homebridge-ewelink)
 [![JavaScript Style Guide](https://img.shields.io/badge/code_style-standard-brightgreen.svg)](https://standardjs.com)   
 [![Discord](https://img.shields.io/discord/784827113378676736?color=728ED5&logo=discord&label=bwp91-discord)](https://discord.com/channels/784827113378676736/784827113378676739)
-[![Discord](https://img.shields.io/discord/432663330281226270?color=728ED5&logo=discord&label=homebridge-discord)](https://discord.com/channels/432663330281226270/742733745743855627)
+[![Discord](https://img.shields.io/discord/432663330281226270?color=728ED5&logo=discord&label=hb-discord)](https://discord.com/channels/432663330281226270/742733745743855627)
 
 </span>
 

From b5c8835cb3d49664bf37d3f701ab506c7d652f0c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 8 Dec 2020 04:25:13 +0000
Subject: [PATCH 0923/3183] L1 rgb fix

---
 lib/device/light-colour.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/device/light-colour.js b/lib/device/light-colour.js
index dd56eb7b..68c57b55 100644
--- a/lib/device/light-colour.js
+++ b/lib/device/light-colour.js
@@ -184,7 +184,7 @@ module.exports = class deviceLightColour {
               this.lightService.updateCharacteristic(this.Characteristic.Brightness, params.bright)
             }
             if (this.helpers.hasProperty(params, 'colorR')) {
-              newColour = this.helpers.rgb2hs(params.colorR, params.colorG, params.colorB)
+              newColour = this.helpers.rgb2hs([params.colorR, params.colorG, params.colorB])
               this.lightService
                 .updateCharacteristic(this.Characteristic.Hue, newColour[0])
                 .updateCharacteristic(this.Characteristic.Saturation, newColour[1])

From f11e8e38d9eea68c7db21efdfc2ee225bf8d46a9 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 8 Dec 2020 04:29:31 +0000
Subject: [PATCH 0924/3183] 3.17.1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 5cdba02a..31cd5a0e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.17.0",
+  "version": "3.17.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index e0b83d6a..ce75939f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.17.0",
+  "version": "3.17.1",
   "author": "bwp91",
   "description": "Homebridge/HOOBS plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From d175205fd6273caa801013d02951fef1e9005e54 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 8 Dec 2020 09:36:41 +0000
Subject: [PATCH 0925/3183] hide device list to array

---
 lib/connection/http.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/connection/http.js b/lib/connection/http.js
index 8c3f2be4..d059ba5a 100644
--- a/lib/connection/http.js
+++ b/lib/connection/http.js
@@ -10,7 +10,7 @@ module.exports = class connectionHTTP {
     this.debugReqRes = config.debugReqRes || false
     this.username = config.username.toString()
     this.password = config.password.toString()
-    this.hideDevFromHB = (config.hideDevFromHB || '').toString()
+    this.hideDevFromHB = (config.hideDevFromHB || '').split(',')
     this.cCode = '+' + config.countryCode.toString().replace('+', '').replace(' ', '')
     this.axios = require('axios')
     this.crypto = require('crypto')

From 80df4d1523aa6fec0b39814ca5df2a94fe0708c7 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 8 Dec 2020 14:24:21 +0000
Subject: [PATCH 0926/3183] get all "things"

---
 lib/connection/http.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/connection/http.js b/lib/connection/http.js
index d059ba5a..8bc6fcef 100644
--- a/lib/connection/http.js
+++ b/lib/connection/http.js
@@ -175,7 +175,8 @@ module.exports = class connectionHTTP {
           'Content-Type': 'application/json',
           'X-CK-Appid': this.helpers.appId,
           'X-CK-Nonce': Math.random().toString(36).substr(2, 8)
-        }
+        },
+        params: { num: 0 }
       })
 
       // *** Parse the response *** \\

From d5c3ecec7f6373412d2dfd3186bba50874421583 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 8 Dec 2020 14:25:16 +0000
Subject: [PATCH 0927/3183] 3.17.2-0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 31cd5a0e..40ee2fc8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.17.1",
+  "version": "3.17.2-0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index ce75939f..04b1f80e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.17.1",
+  "version": "3.17.2-0",
   "author": "bwp91",
   "description": "Homebridge/HOOBS plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 8c0548598e3cfb1582d2d0e7f67dd37862e212b5 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 8 Dec 2020 14:44:16 +0000
Subject: [PATCH 0928/3183] 3.17.2

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 40ee2fc8..9c0099b0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.17.2-0",
+  "version": "3.17.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 04b1f80e..af19dc63 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.17.2-0",
+  "version": "3.17.2",
   "author": "bwp91",
   "description": "Homebridge/HOOBS plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 137e584faaf6e5b2a7bca216c75302e43b59a695 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 8 Dec 2020 17:34:15 +0000
Subject: [PATCH 0929/3183] diff colour conversions

---
 lib/utils/helpers.js | 109 ++++++++++++++++++++-----------------------
 1 file changed, 50 insertions(+), 59 deletions(-)

diff --git a/lib/utils/helpers.js b/lib/utils/helpers.js
index c66ababd..c5809337 100644
--- a/lib/utils/helpers.js
+++ b/lib/utils/helpers.js
@@ -109,76 +109,67 @@ module.exports = {
     ]
   },
   hs2rgb: hs => {
-    const h = hs[0] / 360
+    const h = hs[0] / 60
     const s = hs[1] / 100
-    const l = 50 / 100
-    let t2
-    let t3
-    let val
-    if (s === 0) {
-      val = l * 255
-      return [val, val, val]
+    const hi = Math.floor(h) % 6
+    const f = h - Math.floor(h)
+    let toReturn
+    switch (hi) {
+      case 0:
+        toReturn = [255, 255 * (1 - (s * (1 - f))), 255 * (1 - s)]
+        break
+      case 1:
+        toReturn = [255 * (1 - (s * f)), 255, 255 * (1 - s)]
+        break
+      case 2:
+        toReturn = [255 * (1 - s), 255, 255 * (1 - (s * (1 - f)))]
+        break
+      case 3:
+        toReturn = [255 * (1 - s), 255 * (1 - (s * f)), 255]
+        break
+      case 4:
+        toReturn = [255 * (1 - (s * (1 - f))), 255 * (1 - s), 255]
+        break
+      case 5:
+        toReturn = [255, 255 * (1 - s), 255 * (1 - (s * f))]
+        break
     }
-    if (l < 0.5) {
-      t2 = l * (1 + s)
-    } else {
-      t2 = l + s - l * s
-    }
-    const t1 = 2 * l - t2
-    const rgb = [0, 0, 0]
-    for (let i = 0; i < 3; i++) {
-      t3 = h + 1 / 3 * -(i - 1)
-      if (t3 < 0) {
-        t3++
-      }
-      if (t3 > 1) {
-        t3--
-      }
-      if (6 * t3 < 1) {
-        val = t1 + (t2 - t1) * 6 * t3
-      } else if (2 * t3 < 1) {
-        val = t2
-      } else if (3 * t3 < 2) {
-        val = t1 + (t2 - t1) * (2 / 3 - t3) * 6
-      } else {
-        val = t1
-      }
-
-      rgb[i] = val * 255
-    }
-    return rgb
+    return toReturn
   },
   rgb2hs: rgb => {
     const r = rgb[0] / 255
     const g = rgb[1] / 255
     const b = rgb[2] / 255
-    const min = Math.min(r, g, b)
-    const max = Math.max(r, g, b)
-    const delta = max - min
-    let h = 0
-    let s = 0
-    if (max === min) {
+    const v = Math.max(r, g, b)
+    let rdif
+    let gdif
+    let bdif
+    let h
+    let s
+    const diff = v - Math.min(r, g, b)
+    const diffc = c => (v - c) / 6 / diff + 1 / 2
+    if (diff === 0) {
       h = 0
-    } else if (r === max) {
-      h = (g - b) / delta
-    } else if (g === max) {
-      h = 2 + (b - r) / delta
-    } else if (b === max) {
-      h = 4 + (r - g) / delta
-    }
-    h = Math.min(h * 60, 360)
-    if (h < 0) {
-      h += 360
-    }
-    const l = (min + max) / 2
-    if (max === min) {
       s = 0
-    } else if (l <= 0.5) {
-      s = delta / (max + min)
     } else {
-      s = delta / (2 - max - min)
+      s = diff / v
+      rdif = diffc(r)
+      gdif = diffc(g)
+      bdif = diffc(b)
+      if (r === v) {
+        h = bdif - gdif
+      } else if (g === v) {
+        h = (1 / 3) + rdif - bdif
+      } else if (b === v) {
+        h = (2 / 3) + gdif - rdif
+      }
+      if (h < 0) {
+        h += 1
+      } else if (h > 1) {
+        h -= 1
+      }
     }
-    return [h, s * 100]
+    return [h * 360, s * 100]
   },
   chansFromUiid: {
     1: 1, // "SOCKET"                                  \\ 20, MINI, BASIC, S26

From 73b3719ac907881bb6e4a10611bff969bb2ec771 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 8 Dec 2020 17:34:45 +0000
Subject: [PATCH 0930/3183] 3.17.3-0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 9c0099b0..17ba763e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.17.2",
+  "version": "3.17.3-0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index af19dc63..c46cf8a4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.17.2",
+  "version": "3.17.3-0",
   "author": "bwp91",
   "description": "Homebridge/HOOBS plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 7d1de22c64296e0b544c0829016f6007d8c69c9e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 8 Dec 2020 18:27:43 +0000
Subject: [PATCH 0931/3183] thermostat fix

---
 lib/device/thermostat.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/device/thermostat.js b/lib/device/thermostat.js
index 6ea5f0b4..e86ed05c 100644
--- a/lib/device/thermostat.js
+++ b/lib/device/thermostat.js
@@ -38,7 +38,7 @@ module.exports = class deviceThermostat {
       accessory.context.sensorType !== 'DS18B20' &&
       !this.service.testCharacteristic(this.Characteristic.CurrentRelativeHumidity)
     ) {
-      accessory.addCharacteristic(this.Characteristic.CurrentRelativeHumidity)
+      this.service.addCharacteristic(this.Characteristic.CurrentRelativeHumidity)
     }
     accessory.log = this.log
     accessory.eveLogger = new this.platform.eveService('custom', accessory, {

From 8ff3c23be83a3faa2d23da1e5f348073a701dc27 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 8 Dec 2020 18:28:40 +0000
Subject: [PATCH 0932/3183] 3.17.3

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 17ba763e..59dcac03 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.17.3-0",
+  "version": "3.17.3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index c46cf8a4..014376fd 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.17.3-0",
+  "version": "3.17.3",
   "author": "bwp91",
   "description": "Homebridge/HOOBS plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 104408d07c1b6ea330290f1b646a08e6e9d3f257 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 8 Dec 2020 19:01:10 +0000
Subject: [PATCH 0933/3183] impossible to hide switch in thermostat

---
 lib/device/thermostat.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/lib/device/thermostat.js b/lib/device/thermostat.js
index e86ed05c..76c44236 100644
--- a/lib/device/thermostat.js
+++ b/lib/device/thermostat.js
@@ -76,10 +76,7 @@ module.exports = class deviceThermostat {
 
   async externalUpdate (params) {
     try {
-      if (
-        !(this.platform.config.hideSwitchFromTH || '').split(',').includes(this.accessory.context.eweDeviceId) &&
-        (this.helpers.hasProperty(params, 'switch') || this.helpers.hasProperty(params, 'mainSwitch'))
-      ) {
+      if (this.helpers.hasProperty(params, 'switch') || this.helpers.hasProperty(params, 'mainSwitch')) {
         const newState = this.helpers.hasProperty(params, 'switch') ? params.switch === 'on' : params.mainSwitch === 'on'
         this.service.updateCharacteristic(this.Characteristic.TargetHeatingCoolingState, newState ? 1 : 0)
       }

From 3382ba520ff112f487755cbccb9deb9bbd7c88d5 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 8 Dec 2020 19:26:01 +0000
Subject: [PATCH 0934/3183] humidity fix

---
 lib/device/thermostat.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/device/thermostat.js b/lib/device/thermostat.js
index 76c44236..a8d2dd21 100644
--- a/lib/device/thermostat.js
+++ b/lib/device/thermostat.js
@@ -93,7 +93,7 @@ module.exports = class deviceThermostat {
         this.service.testCharacteristic(this.Characteristic.CurrentRelativeHumidity)
       ) {
         const currentHumi = parseFloat(params.currentHumidity)
-        this.humiService.updateCharacteristic(this.Characteristic.CurrentRelativeHumidity, currentHumi)
+        this.service.updateCharacteristic(this.Characteristic.CurrentRelativeHumidity, currentHumi)
         eveLog.humidity = currentHumi
       }
       if (this.helpers.hasProperty(eveLog, 'temp') || this.helpers.hasProperty(eveLog, 'humidity')) {

From 1c242a1efcae078bc8361e404f82fef30db84a96 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 8 Dec 2020 19:42:12 +0000
Subject: [PATCH 0935/3183] remove thermostat on change

---
 lib/device/outlet-temp.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/device/outlet-temp.js b/lib/device/outlet-temp.js
index 3040d519..6a03a968 100644
--- a/lib/device/outlet-temp.js
+++ b/lib/device/outlet-temp.js
@@ -11,6 +11,9 @@ module.exports = class deviceOutletTemp {
     this.tempOffset = this.helpers.hasProperty(platform.thTempOffset, accessory.context.eweDeviceId)
       ? parseFloat(platform.thTempOffset[accessory.context.eweDeviceId])
       : 0
+    if (accessory.getService(this.Service.Thermostat)) {
+      accessory.removeService(accessory.getService(this.Service.Thermostat))
+    }
     if ((this.platform.config.hideSwitchFromTH || '').split(',').includes(accessory.context.eweDeviceId)) {
       if (accessory.getService(this.Service.Switch)) {
         accessory.removeService(accessory.getService(this.Service.Switch))

From 4ca312e58f4137fefec533a58010e05bdabbce0e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 8 Dec 2020 19:45:21 +0000
Subject: [PATCH 0936/3183] 3.17.4

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 59dcac03..35a9ef8a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.17.3",
+  "version": "3.17.4",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 014376fd..e08fc0e1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.17.3",
+  "version": "3.17.4",
   "author": "bwp91",
   "description": "Homebridge/HOOBS plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 04e11b781691774f75e38250614a72546386294e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 9 Dec 2020 13:52:38 +0000
Subject: [PATCH 0937/3183] colour conversion again

---
 lib/utils/helpers.js | 94 ++++++++++++++++++++++----------------------
 1 file changed, 46 insertions(+), 48 deletions(-)

diff --git a/lib/utils/helpers.js b/lib/utils/helpers.js
index c5809337..b2c1a4f4 100644
--- a/lib/utils/helpers.js
+++ b/lib/utils/helpers.js
@@ -109,67 +109,65 @@ module.exports = {
     ]
   },
   hs2rgb: hs => {
-    const h = hs[0] / 60
+    const h = hs[0] / 360
     const s = hs[1] / 100
-    const hi = Math.floor(h) % 6
-    const f = h - Math.floor(h)
-    let toReturn
-    switch (hi) {
-      case 0:
-        toReturn = [255, 255 * (1 - (s * (1 - f))), 255 * (1 - s)]
-        break
-      case 1:
-        toReturn = [255 * (1 - (s * f)), 255, 255 * (1 - s)]
-        break
-      case 2:
-        toReturn = [255 * (1 - s), 255, 255 * (1 - (s * (1 - f)))]
-        break
-      case 3:
-        toReturn = [255 * (1 - s), 255 * (1 - (s * f)), 255]
-        break
-      case 4:
-        toReturn = [255 * (1 - (s * (1 - f))), 255 * (1 - s), 255]
-        break
-      case 5:
-        toReturn = [255, 255 * (1 - s), 255 * (1 - (s * f))]
-        break
+    const l = 0.5
+    let t2
+    let t3
+    let val
+    if (s === 0) {
+      val = l * 255
+      return [Math.round(val), Math.round(val), Math.round(val)]
     }
-    return toReturn
+    t2 = l + s - l * s
+    const t1 = 2 * l - t2
+    const rgb = [0, 0, 0]
+    for (let i = 0; i < 3; i++) {
+      t3 = h + 1 / 3 * -(i - 1)
+      if (t3 < 0) t3++
+      if (t3 > 1) t3--
+      if (t3 * 6 < 1) {
+        val = t1 + (t2 - t1) * 6 * t3
+      } else if (t3 * 2 < 1) {
+        val = t2
+      } else if (t3 * 3 < 2) {
+        val = t1 + (t2 - t1) * (2 / 3 - t3) * 6
+      } else {
+        val = t1
+      }
+      rgb[i] = Math.round(val * 255)
+    }
+    return rgb
   },
   rgb2hs: rgb => {
     const r = rgb[0] / 255
     const g = rgb[1] / 255
     const b = rgb[2] / 255
-    const v = Math.max(r, g, b)
-    let rdif
-    let gdif
-    let bdif
+    const min = Math.min(r, g, b)
+    const max = Math.max(r, g, b)
+    const delta = max - min
     let h
     let s
-    const diff = v - Math.min(r, g, b)
-    const diffc = c => (v - c) / 6 / diff + 1 / 2
-    if (diff === 0) {
+    if (max === min) {
       h = 0
+    } else if (r === max) {
+      h = (g - b) / delta
+    } else if (g === max) {
+      h = 2 + (b - r) / delta
+    } else if (b === max) {
+      h = 4 + (r - g) / delta
+    }
+    h = Math.min(h * 60, 360)
+    if (h < 0) h += 360
+    const l = (min + max) / 2
+    if (max === min) {
       s = 0
+    } else if (l <= 0.5) {
+      s = delta / (max + min)
     } else {
-      s = diff / v
-      rdif = diffc(r)
-      gdif = diffc(g)
-      bdif = diffc(b)
-      if (r === v) {
-        h = bdif - gdif
-      } else if (g === v) {
-        h = (1 / 3) + rdif - bdif
-      } else if (b === v) {
-        h = (2 / 3) + gdif - rdif
-      }
-      if (h < 0) {
-        h += 1
-      } else if (h > 1) {
-        h -= 1
-      }
+      s = delta / (2 - max - min)
     }
-    return [h * 360, s * 100]
+    return [Math.round(h), Math.round(s * 100)]
   },
   chansFromUiid: {
     1: 1, // "SOCKET"                                  \\ 20, MINI, BASIC, S26

From db42d6d7ed0d7a52ea3e6671f09d26812d4b67d5 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 9 Dec 2020 13:54:11 +0000
Subject: [PATCH 0938/3183] Update helpers.js

---
 lib/utils/helpers.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/utils/helpers.js b/lib/utils/helpers.js
index b2c1a4f4..98edb6ce 100644
--- a/lib/utils/helpers.js
+++ b/lib/utils/helpers.js
@@ -112,14 +112,13 @@ module.exports = {
     const h = hs[0] / 360
     const s = hs[1] / 100
     const l = 0.5
-    let t2
     let t3
     let val
     if (s === 0) {
       val = l * 255
       return [Math.round(val), Math.round(val), Math.round(val)]
     }
-    t2 = l + s - l * s
+    const t2 = l + s - l * s
     const t1 = 2 * l - t2
     const rgb = [0, 0, 0]
     for (let i = 0; i < 3; i++) {

From 18f89a9fca1ddb566726459fd48fd3dc40e68bec Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 9 Dec 2020 13:54:38 +0000
Subject: [PATCH 0939/3183] 3.17.5-0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 35a9ef8a..596e4a66 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.17.4",
+  "version": "3.17.5-0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index e08fc0e1..f65f0411 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.17.4",
+  "version": "3.17.5-0",
   "author": "bwp91",
   "description": "Homebridge/HOOBS plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From b26f15296709159a581ba68ab3ef2616e854dff4 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 9 Dec 2020 17:16:24 +0000
Subject: [PATCH 0940/3183] config cleanup, order, defaults

---
 config.schema.json | 69 +++++++++++++++++++---------------------------
 1 file changed, 28 insertions(+), 41 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 92aa1365..e92ad524 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -30,35 +30,30 @@
         "required": true,
         "description": "The password for your eWeLink account."
       },
-      "debug": {
-        "title": "Debug Logging",
-        "type": "boolean",
-        "description": "If checked, more information will be added to the log.",
-        "default": false
-      },
-      "debugReqRes": {
-        "title": "Request & Response Logging",
-        "type": "boolean",
-        "description": "If checked, HTTP, web socket and LAN mode messages will be added to the log. Not recommended for long-term use.",
-        "default": false
-      },
       "disableHTTPRefresh": {
         "type": "boolean",
         "title": "Disable Initial Device Refresh",
-        "description": "If checked, devices will not be refreshed with their most recent status from eWeLink on startup. This setting can be useful for users who block their devices from accessing the internet.",
-        "default": false
+        "description": "If checked, devices will not be refreshed with their most recent status from eWeLink on startup. This setting can be useful for users who block their devices from accessing the internet."
       },
       "disableLANMode": {
         "type": "boolean",
         "title": "Disable LAN Mode",
-        "description": "If checked, all device updates will be sent straight to the cloud.",
-        "default": false
+        "description": "If checked, all device updates will be sent straight to the cloud."
+      },
+      "debug": {
+        "title": "Debug Logging",
+        "type": "boolean",
+        "description": "If checked, more information will be added to the log."
+      },
+      "debugReqRes": {
+        "title": "Request & Response Logging",
+        "type": "boolean",
+        "description": "If checked, HTTP, web socket and LAN mode messages will be added to the log. Not recommended for long-term use."
       },
       "disablePlugin": {
         "title": "Disable Plugin",
         "type": "boolean",
-        "description": "If checked, the plugin will remove all accessories and not load the plugin on restart.",
-        "default": false
+        "description": "If checked, the plugin will remove all accessories and not load the plugin on restart."
       },
       "hideDevFromHB": {
         "type": "string",
@@ -79,7 +74,7 @@
         "type": "number",
         "title": "Outlet 'In Use' Threshold",
         "description": "HomeKit will set the 'In Use' status of outlet devices to true when the wattage is above this number.",
-        "default": 0,
+        "placeholder": 0,
         "minimum": 0,
         "maximum": 100
       },
@@ -121,7 +116,7 @@
         "type": "number",
         "title": "Low Battery Threshold",
         "description": "HomeKit will set the low battery status for supported devices when the device battery reaches this percentage level.",
-        "default": 25,
+        "placeholder": 25,
         "minimum": 5,
         "maximum": 50
       },
@@ -129,20 +124,17 @@
         "type": "number",
         "title": "Sensor Lag",
         "description": "An offset in seconds to ignore any notifications if they is a delay between a sensor detecting something and the plugin receiving the notification. This setting applies to sensors connected to RF/Zigbee Bridges.",
-        "default": 120,
+        "placeholder": 120,
         "minimum": 10,
         "maximum": 300
       },
       "hideZBLDPress": {
         "title": "Zigbee Button Hide Double/Long Press",
         "type": "boolean",
-        "description": "If checked, double and long press options will be hidden for the ZigBee button.",
-        "default": false
+        "description": "If checked, double and long press options will be hidden for the ZigBee button."
       },
       "groups": {
         "type": "array",
-        "title": "Accessory Simulations",
-        "description": "You can use this setting to set up custom simulated HomeKit accessories from a generic single/multi-switch device. Please see <a href=\"https://github.com/bwp91/homebridge-ewelink/wiki/Accessory-Simulations\" target=\"_blank\">this wiki article</a> for more information.",
         "items": {
           "type": "object",
           "properties": {
@@ -238,7 +230,7 @@
               "type": "number",
               "title": "Operation Time (Deciseconds)",
               "description": "Blinds/garage doors: the time to fully open/close the device. Locks: the time to show as unlocked. Irrigation: an initial default time for HomeKit. This setting is in deciseconds - count the time in seconds and multiply by 10, for example 100 for 10 seconds or 75 for 7.5 seconds.",
-              "default": 100,
+              "placeholder": 100,
               "minimum": 10,
               "maximum": 600
             },
@@ -255,8 +247,6 @@
       },
       "bridgeSensors": {
         "type": "array",
-        "title": "Sensors",
-        "description": "You can expose different types of sensors connected to your RF Bridge. Please see <a href=\"https://github.com/bwp91/homebridge-ewelink/wiki/How-to-set-up-RF-Bridge-sensors\" target=\"_blank\">this wiki article</a> for more information.",
         "items": {
           "type": "object",
           "properties": {
@@ -323,7 +313,7 @@
               "type": "number",
               "title": "Sensor Time Length",
               "description": "The number of seconds which the sensor tile in the Home app will light up for if this sensor is activated.",
-              "default": 60,
+              "placeholder": 60,
               "minimum": 1,
               "maximum": 300
             }
@@ -332,8 +322,6 @@
       },
       "nameOverride": {
         "type": "array",
-        "title": "Accessory Name Overrides",
-        "description": "You can override the default name given to a device when it is added.",
         "items": {
           "type": "object",
           "properties": {
@@ -352,8 +340,6 @@
       },
       "ipOverride": {
         "type": "array",
-        "title": "IP Overrides",
-        "description": "You can override the IP for a device.",
         "items": {
           "type": "object",
           "properties": {
@@ -376,7 +362,6 @@
     {
       "type": "fieldset",
       "title": "Required Settings",
-      "description": "These are the basic settings that are required for this plugin to work.",
       "items": [
         "countryCode",
         "username",
@@ -385,21 +370,19 @@
     },
     {
       "type": "fieldset",
-      "title": "Optional Settings (General)",
-      "description": "A variety of optional settings for general use of this plugin.",
-      "expandable": true,
+      "title": "Optional Settings",
       "items": [
-        "debug",
-        "debugReqRes",
         "disableHTTPRefresh",
         "disableLANMode",
+        "debug",
+        "debugReqRes",
         "disablePlugin"
       ]
     },
     {
       "type": "fieldset",
-      "title": "Optional Settings (Device Specific)",
-      "description": "A variety of optional settings for specific device types.",
+      "title": "Device Specific Settings",
+      "description": "Further optional settings for specific devices.",
       "expandable": true,
       "items": [
         "hideDevFromHB",
@@ -419,6 +402,7 @@
       "key": "groups",
       "expandable": true,
       "title": "Accessory Simulations",
+      "description": "You can use this setting to set up custom simulated HomeKit accessories from a generic single/multi-switch device. Please see <a href=\"https://github.com/bwp91/homebridge-ewelink/wiki/Accessory-Simulations\" target=\"_blank\">this wiki article</a> for more information.",
       "add": "Add Another Type",
       "type": "array",
       "items": [
@@ -437,6 +421,7 @@
     {
       "key": "bridgeSensors",
       "title": "RF Bridge Sensors",
+      "description": "You can expose different types of sensors connected to your RF Bridge. Please see <a href=\"https://github.com/bwp91/homebridge-ewelink/wiki/How-to-set-up-RF-Bridge-sensors\" target=\"_blank\">this wiki article</a> for more information.",
       "expandable": true,
       "add": "Add Another Sensor",
       "type": "array",
@@ -455,6 +440,7 @@
     {
       "key": "nameOverride",
       "title": "Accessory Name Overrides",
+      "description": "You can override the default name given to a device when it is added.",
       "expandable": true,
       "add": "Add Another Name Override",
       "type": "array",
@@ -471,6 +457,7 @@
     {
       "key": "ipOverride",
       "title": "IP Overrides",
+      "description": "You can override the IP for a device.",
       "expandable": true,
       "add": "Add Another IP Override",
       "type": "array",

From 31e84ada30e82c772041aa9d8a61ad298640fb56 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 9 Dec 2020 17:17:07 +0000
Subject: [PATCH 0941/3183] 3.17.5

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 596e4a66..54d34eee 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.17.5-0",
+  "version": "3.17.5",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index f65f0411..7116f2df 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.17.5-0",
+  "version": "3.17.5",
   "author": "bwp91",
   "description": "Homebridge/HOOBS plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From d98c43716b60895fb79c58513c8183a4084a3a81 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 9 Dec 2020 17:32:15 +0000
Subject: [PATCH 0942/3183] desc

---
 config.schema.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config.schema.json b/config.schema.json
index e92ad524..770a31e6 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -110,7 +110,7 @@
       "resetRFBridge": {
         "title": "Reset RF Bridges",
         "type": "string",
-        "description": "If checked, the plugin will remove and re-add these RF Bridges on restart. This is needed when adding/removed sub-devices from the RF Bridge. For example '10009553c8' or multiple separated with a comma '10009553c8,10009553c9' (without the quotes)."
+        "description": "A list of RF Bridges to remove and re-add on restart. This is needed when adding/removed sub-devices from the RF Bridge. For example '10009553c8' or multiple separated with a comma '10009553c8,10009553c9' (without the quotes)."
       },
       "lowBattThreshold": {
         "type": "number",

From 64d88d18b88c5be42585e0e12bbb81eaccfe92f8 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 10 Dec 2020 14:54:08 +0000
Subject: [PATCH 0943/3183] add last activation

---
 lib/device/rf-bridge.js | 17 +++++++++++++++++
 lib/device/zb-dev.js    | 19 +++++++++++++++++++
 2 files changed, 36 insertions(+)

diff --git a/lib/device/rf-bridge.js b/lib/device/rf-bridge.js
index ad8b0340..6f5e3053 100644
--- a/lib/device/rf-bridge.js
+++ b/lib/device/rf-bridge.js
@@ -1,6 +1,7 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
+const util = require('util')
 module.exports = class deviceRFBridge {
   constructor (platform, accessory) {
     this.platform = platform
@@ -8,6 +9,18 @@ module.exports = class deviceRFBridge {
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
+    const self = this
+    this.eveLastActivation = function () {
+      self.Characteristic.call(this, 'Last Activation', 'E863F11A-079E-48FF-8F27-9C2605A29F52')
+      this.setProps({
+        format: self.Characteristic.Formats.UINT32,
+        unit: self.Characteristic.Units.SECONDS,
+        perms: [self.Characteristic.Perms.READ, self.Characteristic.Perms.NOTIFY]
+      })
+      this.value = this.getDefaultValue()
+    }
+    util.inherits(this.eveLastActivation, this.Characteristic)
+    this.eveLastActivation.UUID = 'E863F11A-079E-48FF-8F27-9C2605A29F52'
     this.sensorTimeDifference = parseInt(this.platform.config.sensorTimeDifference)
     this.sensorTimeDifference = isNaN(this.sensorTimeDifference)
       ? this.helpers.defaults.sensorTimeDifference
@@ -179,6 +192,10 @@ module.exports = class deviceRFBridge {
                   default:
                     serv = this.Service.MotionSensor
                     char = this.Characteristic.MotionDetected
+                    oAccessory.getService(serv).updateCharacteristic(
+                      this.eveLastActivation,
+                      Math.round(new Date().valueOf() / 1000) - oAccessory.eveLogger.getInitialTime()
+                    )
                     break
                 }
                 oAccessory.getService(serv).updateCharacteristic(char, 1)
diff --git a/lib/device/zb-dev.js b/lib/device/zb-dev.js
index dad8f5cb..d8c48e0a 100644
--- a/lib/device/zb-dev.js
+++ b/lib/device/zb-dev.js
@@ -1,6 +1,7 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
+const util = require('util')
 module.exports = class deviceZBDev {
   constructor (platform, accessory) {
     this.platform = platform
@@ -8,6 +9,18 @@ module.exports = class deviceZBDev {
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
+    const self = this
+    this.eveLastActivation = function () {
+      self.Characteristic.call(this, 'Last Activation', 'E863F11A-079E-48FF-8F27-9C2605A29F52')
+      this.setProps({
+        format: self.Characteristic.Formats.UINT32,
+        unit: self.Characteristic.Units.SECONDS,
+        perms: [self.Characteristic.Perms.READ, self.Characteristic.Perms.NOTIFY]
+      })
+      this.value = this.getDefaultValue()
+    }
+    util.inherits(this.eveLastActivation, this.Characteristic)
+    this.eveLastActivation.UUID = 'E863F11A-079E-48FF-8F27-9C2605A29F52'
     this.lowBattThreshold = parseInt(this.platform.config.lowBattThreshold)
     this.lowBattThreshold = isNaN(this.lowBattThreshold)
       ? this.helpers.defaults.lowBattThreshold
@@ -161,6 +174,12 @@ module.exports = class deviceZBDev {
               time: Math.round(new Date().valueOf() / 1000),
               status: motionDetected ? 1 : 0
             })
+            if (motionDetected) {
+              this.accessory.getService(this.Service.MotionSensor).updateCharacteristic(
+                this.eveLastActivation,
+                Math.round(new Date().valueOf() / 1000) - this.accessory.eveLogger.getInitialTime()
+              )
+            }
             this.accessory.getService(this.Service.MotionSensor).updateCharacteristic(this.Characteristic.MotionDetected, motionDetected)
             break
           }

From 21807d3b6ed85c7320a03ec8ec58063d1f2c17a1 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 10 Dec 2020 14:55:18 +0000
Subject: [PATCH 0944/3183] 3.17.6-0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 54d34eee..15e3db58 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.17.5",
+  "version": "3.17.6-0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 7116f2df..36f0f2f9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.17.5",
+  "version": "3.17.6-0",
   "author": "bwp91",
   "description": "Homebridge/HOOBS plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From b9157c720a3ca8ccfd96e038d2fa7cd9c171202f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 11 Dec 2020 08:58:25 +0000
Subject: [PATCH 0945/3183] add last activation (door)

---
 lib/device/rf-bridge.js |  4 ++++
 lib/device/sensor.js    | 19 +++++++++++++++++++
 lib/device/zb-dev.js    |  6 ++++++
 3 files changed, 29 insertions(+)

diff --git a/lib/device/rf-bridge.js b/lib/device/rf-bridge.js
index 6f5e3053..19050d68 100644
--- a/lib/device/rf-bridge.js
+++ b/lib/device/rf-bridge.js
@@ -184,6 +184,10 @@ module.exports = class deviceRFBridge {
                   case 'contact':
                     serv = this.Service.ContactSensor
                     char = this.Characteristic.ContactSensorState
+                    oAccessory.getService(serv).updateCharacteristic(
+                      this.eveLastActivation,
+                      Math.round(new Date().valueOf() / 1000) - oAccessory.eveLogger.getInitialTime()
+                    )
                     break
                   case 'occupancy':
                     serv = this.Service.OccupancySensor
diff --git a/lib/device/sensor.js b/lib/device/sensor.js
index b4cbd278..55c5e4c0 100644
--- a/lib/device/sensor.js
+++ b/lib/device/sensor.js
@@ -1,6 +1,7 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
+const util = require('util')
 module.exports = class deviceSensor {
   constructor (platform, accessory) {
     this.platform = platform
@@ -8,6 +9,18 @@ module.exports = class deviceSensor {
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
+    const self = this
+    this.eveLastActivation = function () {
+      self.Characteristic.call(this, 'Last Activation', 'E863F11A-079E-48FF-8F27-9C2605A29F52')
+      this.setProps({
+        format: self.Characteristic.Formats.UINT32,
+        unit: self.Characteristic.Units.SECONDS,
+        perms: [self.Characteristic.Perms.READ, self.Characteristic.Perms.NOTIFY]
+      })
+      this.value = this.getDefaultValue()
+    }
+    util.inherits(this.eveLastActivation, this.Characteristic)
+    this.eveLastActivation.UUID = 'E863F11A-079E-48FF-8F27-9C2605A29F52'
     this.lowBattThreshold = parseInt(this.platform.config.lowBattThreshold)
     this.lowBattThreshold = isNaN(this.lowBattThreshold)
       ? this.helpers.defaults.lowBattThreshold
@@ -40,6 +53,12 @@ module.exports = class deviceSensor {
         time: Math.round(new Date().valueOf() / 1000),
         status: newState
       })
+      if (newState) {
+        this.contactService.updateCharacteristic(
+          this.eveLastActivation,
+          Math.round(new Date().valueOf() / 1000) - this.accessory.eveLogger.getInitialTime()
+        )
+      }
       this.platform.cusG.forEach(async group => {
         if (group.sensorId === this.accessory.context.eweDeviceId && group.type === 'garage') {
           if ((oAccessory = this.platform.devicesInHB.get(group.deviceId + 'SWX'))) {
diff --git a/lib/device/zb-dev.js b/lib/device/zb-dev.js
index d8c48e0a..6a2edc20 100644
--- a/lib/device/zb-dev.js
+++ b/lib/device/zb-dev.js
@@ -194,6 +194,12 @@ module.exports = class deviceZBDev {
               status: params.lock
             })
           }
+          if (params.lock) {
+            this.accessory.getService(this.Service.ContactSensor).updateCharacteristic(
+              this.eveLastActivation,
+              Math.round(new Date().valueOf() / 1000) - this.accessory.eveLogger.getInitialTime()
+            )
+          }
           break
         default:
           throw new Error('Zigbee device type not supported [uiid ' + this.accessory.context.eweUIID + ']')

From 1c76947cdaccb3a63f47e7e5b782629957492865 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 11 Dec 2020 10:51:11 +0000
Subject: [PATCH 0946/3183] unnecessary option

---
 config.schema.json | 8 +-------
 lib/index.js       | 2 +-
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 770a31e6..cc2d6715 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -250,15 +250,10 @@
         "items": {
           "type": "object",
           "properties": {
-            "deviceId": {
-              "type": "string",
-              "title": "RF Bridge Device ID",
-              "description": "Device ID of your RF Bridge from your eWeLink app (10 digits normally in the format 1000ab23cd)."
-            },
             "fullDeviceId": {
               "type": "string",
               "title": "Sensor Device ID",
-              "description": "Device ID of the sensor in Homebridge/HOOBS (13 digits normally in the format 1000ab23cdSW2)."
+              "description": "Device ID of the sensor (13 digits normally in the format 1000ab23cdSW2)."
             },
             "type": {
               "type": "string",
@@ -429,7 +424,6 @@
         {
           "type": "fieldset",
           "items": [
-            "bridgeSensors[].deviceId",
             "bridgeSensors[].fullDeviceId",
             "bridgeSensors[].type",
             "bridgeSensors[].sensorTimeLength"
diff --git a/lib/index.js b/lib/index.js
index b5860a77..a65b20be 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -84,7 +84,7 @@ class eWeLinkPlatform {
       // *** Check for valid custom RF Bridge sensors and add to cusS for later use *** \\
       if (Object.keys(this.config.bridgeSensors || []).length > 0) {
         this.config.bridgeSensors
-          .filter(s => this.helpers.hasProperty(s, 'deviceId') && this.devicesInEW.has(s.deviceId))
+          .filter(s => this.helpers.hasProperty(s, 'fullDeviceId') && this.devicesInEW.has(s.fullDeviceId))
           .forEach(s => this.cusS.set(s.fullDeviceId, s))
       }
 

From 967a9c4dc6732f8e4ff6fae47d8ca8f66377e0bb Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 11 Dec 2020 10:54:09 +0000
Subject: [PATCH 0947/3183] 3.17.6-1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 15e3db58..f0a18801 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.17.6-0",
+  "version": "3.17.6-1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 36f0f2f9..b7637a24 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.17.6-0",
+  "version": "3.17.6-1",
   "author": "bwp91",
   "description": "Homebridge/HOOBS plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 8147863e8526d35483f9b27475110b85558d116a Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 11 Dec 2020 11:10:54 +0000
Subject: [PATCH 0948/3183] unnecessary opTime for valves

---
 config.schema.json         | 7 +++++--
 lib/device/switch-valve.js | 2 +-
 lib/device/valve-two.js    | 2 +-
 lib/device/valve.js        | 2 +-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index cc2d6715..69c2cd54 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -229,7 +229,10 @@
             "operationTime": {
               "type": "number",
               "title": "Operation Time (Deciseconds)",
-              "description": "Blinds/garage doors: the time to fully open/close the device. Locks: the time to show as unlocked. Irrigation: an initial default time for HomeKit. This setting is in deciseconds - count the time in seconds and multiply by 10, for example 100 for 10 seconds or 75 for 7.5 seconds.",
+              "description": "Blinds/garage doors: the time to open/close the device. Locks: the time to show as unlocked. This setting is in deciseconds - count the time in seconds and multiply by 10, for example 75 for 7.5 seconds.",
+              "condition": {
+                "functionBody": "return (model.groups[arrayIndices] && !['valve', 'valve_two', 'switch_valve'].includes(model.groups[arrayIndices].type))"
+              },
               "placeholder": 100,
               "minimum": 10,
               "maximum": 600
@@ -237,7 +240,7 @@
             "sensorId": {
               "type": "string",
               "title": "Sensor",
-              "description": "A Sonoff DW2 sensor can optionally be used for garage doors. This is to determine the current open/closed state of the garage door. Please enter the 10 digit device ID (normally in the format 1000ab23cd). Otherwise leave this blank.",
+              "description": "A DW2 sensor can be used for garage doors to determine the current state. Enter the 10 digit eWeLink device ID (normally in the format 1000ab23cd). Otherwise leave blank.",
               "condition": {
                 "functionBody": "return (model.groups[arrayIndices] && (model.groups[arrayIndices].type==='garage' || model.groups[arrayIndices].type==='garage_two'))"
               }
diff --git a/lib/device/switch-valve.js b/lib/device/switch-valve.js
index a91be57c..6d9c658d 100644
--- a/lib/device/switch-valve.js
+++ b/lib/device/switch-valve.js
@@ -16,7 +16,7 @@ module.exports = class deviceSwitchValve {
         .setCharacteristic(this.Characteristic.Active, 0)
         .setCharacteristic(this.Characteristic.InUse, 0)
         .setCharacteristic(this.Characteristic.ValveType, 1)
-        .setCharacteristic(this.Characteristic.SetDuration, Math.round((valveConfig.operationTime || 1200) / 10))
+        .setCharacteristic(this.Characteristic.SetDuration, 120)
         .addCharacteristic(this.Characteristic.RemainingDuration)
     }
     this.switchService
diff --git a/lib/device/valve-two.js b/lib/device/valve-two.js
index bc0b034e..b0f92586 100644
--- a/lib/device/valve-two.js
+++ b/lib/device/valve-two.js
@@ -17,7 +17,7 @@ module.exports = class deviceValveTwo {
           .setCharacteristic(this.Characteristic.Active, 0)
           .setCharacteristic(this.Characteristic.InUse, 0)
           .setCharacteristic(this.Characteristic.ValveType, 1)
-          .setCharacteristic(this.Characteristic.SetDuration, Math.round((valveConfig.operationTime || 1200) / 10))
+          .setCharacteristic(this.Characteristic.SetDuration, 120)
           .addCharacteristic(this.Characteristic.RemainingDuration)
         valveService = accessory.getService('Valve ' + v)
       }
diff --git a/lib/device/valve.js b/lib/device/valve.js
index 5ff827c3..a3b4f2a2 100644
--- a/lib/device/valve.js
+++ b/lib/device/valve.js
@@ -15,7 +15,7 @@ module.exports = class deviceValve {
         .setCharacteristic(this.Characteristic.Active, 0)
         .setCharacteristic(this.Characteristic.InUse, 0)
         .setCharacteristic(this.Characteristic.ValveType, 1)
-        .setCharacteristic(this.Characteristic.SetDuration, Math.round((valveConfig.operationTime || 1200) / 10))
+        .setCharacteristic(this.Characteristic.SetDuration, 120)
         .addCharacteristic(this.Characteristic.RemainingDuration)
     }
     this.valveService

From a03bb73dda913b8ca52700e2b6fef6209f37a849 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 11 Dec 2020 11:12:21 +0000
Subject: [PATCH 0949/3183] redundant var

---
 lib/device/switch-valve.js | 1 -
 lib/device/valve-two.js    | 1 -
 lib/device/valve.js        | 1 -
 3 files changed, 3 deletions(-)

diff --git a/lib/device/switch-valve.js b/lib/device/switch-valve.js
index 6d9c658d..9c2ac2a6 100644
--- a/lib/device/switch-valve.js
+++ b/lib/device/switch-valve.js
@@ -8,7 +8,6 @@ module.exports = class deviceSwitchValve {
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
-    const valveConfig = this.platform.cusG.get(accessory.context.hbDeviceId)
     this.switchService = accessory.getService(this.Service.Switch) || accessory.addService(this.Service.Switch)
     if (!(this.valveService = accessory.getService(this.Service.Valve))) {
       this.valveService = accessory.addService(this.Service.Valve)
diff --git a/lib/device/valve-two.js b/lib/device/valve-two.js
index b0f92586..b6915148 100644
--- a/lib/device/valve-two.js
+++ b/lib/device/valve-two.js
@@ -10,7 +10,6 @@ module.exports = class deviceValveTwo {
     this.Characteristic = platform.api.hap.Characteristic
     ;['A', 'B'].forEach(v => {
       let valveService
-      const valveConfig = this.platform.cusG.get(accessory.context.hbDeviceId)
       if (!(valveService = accessory.getService('Valve ' + v))) {
         accessory
           .addService(this.Service.Valve, 'Valve ' + v, 'valve' + v.toLowerCase())
diff --git a/lib/device/valve.js b/lib/device/valve.js
index a3b4f2a2..6611db2e 100644
--- a/lib/device/valve.js
+++ b/lib/device/valve.js
@@ -8,7 +8,6 @@ module.exports = class deviceValve {
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
-    const valveConfig = this.platform.cusG.get(accessory.context.hbDeviceId)
     if (!(this.valveService = accessory.getService(this.Service.Valve))) {
       this.valveService = accessory.addService(this.Service.Valve)
       this.valveService

From 47767e7d23a9c46059f465ae859ccdb5b4f0d406 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 11 Dec 2020 11:16:14 +0000
Subject: [PATCH 0950/3183] 3.18.0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index f0a18801..7d8c363c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.17.6-1",
+  "version": "3.18.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index b7637a24..613c0447 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.17.6-1",
+  "version": "3.18.0",
   "author": "bwp91",
   "description": "Homebridge/HOOBS plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From b7ca262dc8ac8531b8f4e6dc59d152086e40d4e2 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 13 Dec 2020 22:41:55 +0000
Subject: [PATCH 0951/3183] Update package-lock.json

---
 package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 7d8c363c..9db60009 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -68,9 +68,9 @@
       }
     },
     "follow-redirects": {
-      "version": "1.13.0",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.0.tgz",
-      "integrity": "sha512-aq6gF1BEKje4a9i9+5jimNFIpq4Q1WiwBToeRK5NvZBd/TRsmW8BsJfOEGkr76TbOyPVD3OVDN910EcUNtRYEA=="
+      "version": "1.13.1",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.1.tgz",
+      "integrity": "sha512-SSG5xmZh1mkPGyKzjZP8zLjltIfpW32Y5QpdNJyjcfGxK3qo3NDDkZOZSFiGn1A6SclQxY9GzEwAHQ3dmYRWpg=="
     },
     "function-bind": {
       "version": "1.1.1",

From 4825a54f78f2a16a044f9fb7c5e77fc7d665574e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 15 Dec 2020 10:15:45 +0000
Subject: [PATCH 0952/3183] add camera app

---
 lib/utils/helpers.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/utils/helpers.js b/lib/utils/helpers.js
index 98edb6ce..20865c3c 100644
--- a/lib/utils/helpers.js
+++ b/lib/utils/helpers.js
@@ -223,7 +223,7 @@ module.exports = {
     61: 0, // "KAI_WEI_ROUTER"                         \\
     62: 0, // "MEARICAMERA"                            \\
     64: 0, // "HeatingTable"                           \\
-    65: 0, // "CustomCamera"                           \\
+    65: 0, // "CustomCamera"                           \\ eWeLink camera app
     66: 0, // "ZIGBEE_MAIN_DEVICE"                     \\
     67: 0, // "RollingDoor"                            \\
     68: 0, // "KOOCHUWAH"                              \\ a whhaaaaat?

From d21809a35a4a5019c547946dc335a1a33f0a6875 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 15 Dec 2020 10:19:34 +0000
Subject: [PATCH 0953/3183] lock on restart

---
 lib/device/lock.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/device/lock.js b/lib/device/lock.js
index 1e735a4e..6297d9e2 100644
--- a/lib/device/lock.js
+++ b/lib/device/lock.js
@@ -12,6 +12,9 @@ module.exports = class deviceLock {
     this.lmService
       .getCharacteristic(this.Characteristic.LockTargetState)
       .on('set', this.internalUpdate.bind(this))
+    this.lmService
+      .updateCharacteristic(this.Characteristic.LockCurrentState, 1)
+      .updateCharacteristic(this.Characteristic.LockTargetState, 1)
     this.accessory = accessory
   }
 

From f4fe282d578775189d4e7771bb69b42525fa109b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 15 Dec 2020 10:22:09 +0000
Subject: [PATCH 0954/3183] 3.18.1-0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 9db60009..3cee6e75 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.18.0",
+  "version": "3.18.1-0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 613c0447..527dd3f1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.18.0",
+  "version": "3.18.1-0",
   "author": "bwp91",
   "description": "Homebridge/HOOBS plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From a374fdd7d1a0a4c67f584353afd20915f7fd2110 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 15 Dec 2020 12:32:23 +0000
Subject: [PATCH 0955/3183] ewelink camera not supported

---
 lib/index.js         | 9 ++++++++-
 lib/utils/helpers.js | 1 +
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/lib/index.js b/lib/index.js
index a65b20be..dea2a53a 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -505,7 +505,14 @@ class eWeLinkPlatform {
         /******
         CAMERAS
         ******/
-        this.log(' → [%s] please see the homebridge-ewelink wiki for details to enable the camera.', device.name)
+        this.log(' → [%s] see the homebridge-ewelink wiki for details to enable the camera.', device.name)
+        return
+        /*****/
+      }  else if (this.helpers.devicesEweCamera.includes(device.extra.uiid)) {
+        /******
+        CAMERAS
+        ******/
+        this.log(' → [%s] plugin does not support the eWeLink camera.', device.name)
         return
         /*****/
       } else {
diff --git a/lib/utils/helpers.js b/lib/utils/helpers.js
index 20865c3c..1a7151b3 100644
--- a/lib/utils/helpers.js
+++ b/lib/utils/helpers.js
@@ -32,6 +32,7 @@ module.exports = {
   devicesDiffuser: [25],
   devicesOutlet: [32],
   devicesCamera: [87],
+  devicesEweCamera: [65],
   devicesUSB: [77],
   devicesSCM: [78],
   devicesRFBridge: [28],

From 7332f9db8bc01d34f33cdc3fe3ed9afb5228607b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 15 Dec 2020 12:32:49 +0000
Subject: [PATCH 0956/3183] formatting

---
 lib/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/index.js b/lib/index.js
index dea2a53a..28e81fba 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -508,7 +508,7 @@ class eWeLinkPlatform {
         this.log(' → [%s] see the homebridge-ewelink wiki for details to enable the camera.', device.name)
         return
         /*****/
-      }  else if (this.helpers.devicesEweCamera.includes(device.extra.uiid)) {
+      } else if (this.helpers.devicesEweCamera.includes(device.extra.uiid)) {
         /******
         CAMERAS
         ******/

From 76aff0c7ae1ea9c7c9c6bc545d4180f0ba8d15a2 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 16 Dec 2020 09:31:34 +0000
Subject: [PATCH 0957/3183] check name exists

---
 lib/index.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/lib/index.js b/lib/index.js
index 28e81fba..72d867de 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -581,7 +581,14 @@ class eWeLinkPlatform {
     const switchNumber = hbDeviceId.split('SW')[1].toString()
 
     // *** Set up the device name which can depend on the accessory type *** \\
-    let newDeviceName = type === 'rf_sub' ? device.tags.zyx_info[switchNumber - 1].name : device.name
+    let newDeviceName =
+      type === 'rf_sub' &&
+      device.tags &&
+      device.tags.zyx_info &&
+      device.tags.zyx_info[switchNumber - 1] &&
+      device.tags.zyx_info[switchNumber - 1].name
+        ? device.tags.zyx_info[switchNumber - 1].name
+        : device.name
     const channelCount = type === 'rf_pri'
       ? Object.keys((device.tags && device.tags.zyx_info) || []).length
       : this.helpers.chansFromUiid[device.extra.uiid]

From 2941ce6328c3e11e8454e98e2a40012b710f3a7c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 16 Dec 2020 09:34:14 +0000
Subject: [PATCH 0958/3183] log unsupported rf type

---
 lib/index.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/index.js b/lib/index.js
index 72d867de..bba9bfea 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -441,6 +441,7 @@ class eWeLinkPlatform {
               sensorTimeLength = this.cusS.get(device.deviceid + 'SW' + swNumber).sensorTimeLength
             }
           } else {
+            this.log(' → [%s] has an unsupported device type [%s].', device.name, subDevice.type || '?')
             return
           }
           subExtraContext = {

From 41c6e566869a1d998b5fd4dce3f08b68901fd36c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 16 Dec 2020 09:35:02 +0000
Subject: [PATCH 0959/3183] 3.18.1-1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 3cee6e75..823de23b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.18.1-0",
+  "version": "3.18.1-1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 527dd3f1..3778a1d2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.18.1-0",
+  "version": "3.18.1-1",
   "author": "bwp91",
   "description": "Homebridge/HOOBS plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 7612f0e7f5ce12cbc09006badb71e91968503b76 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 16 Dec 2020 13:26:28 +0000
Subject: [PATCH 0960/3183] correctly name rf device

---
 lib/index.js | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/lib/index.js b/lib/index.js
index bba9bfea..5152f1f1 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -448,7 +448,8 @@ class eWeLinkPlatform {
             buttons: subDevice.buttons,
             subType,
             swNumber,
-            sensorTimeLength
+            sensorTimeLength,
+            name: subDevice.name
           }
           if ((oAccessory = this.devicesInHB.get(device.deviceid + 'SW' + swNumber))) {
             if (
@@ -582,14 +583,7 @@ class eWeLinkPlatform {
     const switchNumber = hbDeviceId.split('SW')[1].toString()
 
     // *** Set up the device name which can depend on the accessory type *** \\
-    let newDeviceName =
-      type === 'rf_sub' &&
-      device.tags &&
-      device.tags.zyx_info &&
-      device.tags.zyx_info[switchNumber - 1] &&
-      device.tags.zyx_info[switchNumber - 1].name
-        ? device.tags.zyx_info[switchNumber - 1].name
-        : device.name
+    let newDeviceName = type === 'rf_sub' ? extraContext.name : device.name
     const channelCount = type === 'rf_pri'
       ? Object.keys((device.tags && device.tags.zyx_info) || []).length
       : this.helpers.chansFromUiid[device.extra.uiid]

From fedf37dace89dbf6fd7dbe598cca0a2d8870544b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 16 Dec 2020 13:38:32 +0000
Subject: [PATCH 0961/3183] enable rf curtain remote

---
 lib/device/rf-bridge.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/device/rf-bridge.js b/lib/device/rf-bridge.js
index 19050d68..b7755dfc 100644
--- a/lib/device/rf-bridge.js
+++ b/lib/device/rf-bridge.js
@@ -27,7 +27,7 @@ module.exports = class deviceRFBridge {
       : this.sensorTimeDifference < 10
         ? this.helpers.defaults.sensorTimeDifference
         : this.sensorTimeDifference
-    if (accessory.context.subType === 'button') {
+    if (['curtain', 'button'].includes(accessory.context.subType)) {
       Object.entries(accessory.context.buttons).forEach(([chan, name]) => {
         if (!accessory.getService(name)) accessory.addService(this.Service.Switch, name, 'switch' + chan)
         accessory.getService(name).updateCharacteristic(this.Characteristic.On, false)

From 5ca958d2ae1581db71e062333a16c7abf48c8ef1 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 16 Dec 2020 13:40:14 +0000
Subject: [PATCH 0962/3183] enable rf curtain remote

---
 lib/index.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/index.js b/lib/index.js
index 5152f1f1..696394cb 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -433,6 +433,8 @@ class eWeLinkPlatform {
           let subExtraContext = {}
           if (['1', '2', '3', '4'].includes(subDevice.type)) {
             subType = 'button'
+          } else if (subDevice.type === '5') {
+            subType = 'curtain'
           } else if (subDevice.type === '6') {
             subType = this.cusS.has(device.deviceid + 'SW' + swNumber)
               ? this.cusS.get(device.deviceid + 'SW' + swNumber).type

From 3ffda435401e7ee2dc13f3761e004f9beff93eef Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 16 Dec 2020 13:40:45 +0000
Subject: [PATCH 0963/3183] 3.18.1-2

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 823de23b..88ae4d79 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.18.1-1",
+  "version": "3.18.1-2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 3778a1d2..3ccdc371 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.18.1-1",
+  "version": "3.18.1-2",
   "author": "bwp91",
   "description": "Homebridge/HOOBS plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From d7272ef89771b159b19b6cd002ad218317c907b8 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 17 Dec 2020 11:13:13 +0000
Subject: [PATCH 0964/3183] 3.18.1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 88ae4d79..419f811b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.18.1-2",
+  "version": "3.18.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 3ccdc371..3fe2ef92 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.18.1-2",
+  "version": "3.18.1",
   "author": "bwp91",
   "description": "Homebridge/HOOBS plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 4c14357cb3f81f9eb9f0720a0a5367d8f95fbec3 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 17 Dec 2020 11:19:56 +0000
Subject: [PATCH 0965/3183] update node

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 3fe2ef92..cdf58f27 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,7 @@
   "main": "lib/index.js",
   "engines": {
     "homebridge": "^1.1.6",
-    "node": "^14.15.1"
+    "node": "^14.15.2"
   },
   "repository": {
     "type": "git",

From 4a05114ca91fa2574db53c07338a7bfd6e5167c9 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 18 Dec 2020 11:06:56 +0000
Subject: [PATCH 0966/3183] deps

---
 package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 419f811b..b3bed904 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -78,9 +78,9 @@
       "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
     },
     "get-intrinsic": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.0.1.tgz",
-      "integrity": "sha512-ZnWP+AmS1VUaLgTRy47+zKtjTxz+0xMpx3I52i+aalBK1QP19ggLF3Db89KJX7kjfOfP2eoa01qc++GwPgufPg==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.0.2.tgz",
+      "integrity": "sha512-aeX0vrFm21ILl3+JpFFRNe9aUvp6VFZb2/CTbgLb8j75kOhvoNYjt9d8KA/tJG4gSo8nzEDedRl0h7vDmBYRVg==",
       "requires": {
         "function-bind": "^1.1.1",
         "has": "^1.0.3",

From b33b4395724a567b443b5b91bdaed0938e1fb482 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 18 Dec 2020 11:15:01 +0000
Subject: [PATCH 0967/3183] eve uuids to helpers

---
 lib/device/outlet.js    | 20 ++++++++++----------
 lib/device/rf-bridge.js |  4 ++--
 lib/device/sensor.js    |  4 ++--
 lib/device/zb-dev.js    |  4 ++--
 lib/utils/helpers.js    |  8 ++++++++
 5 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/lib/device/outlet.js b/lib/device/outlet.js
index de3256d6..af3efc93 100644
--- a/lib/device/outlet.js
+++ b/lib/device/outlet.js
@@ -17,7 +17,7 @@ module.exports = class deviceOutlet {
         : this.inUsePowerThreshold
     const self = this
     this.eveCurrentConsumption = function () {
-      self.Characteristic.call(this, 'Current Consumption', 'E863F10D-079E-48FF-8F27-9C2605A29F52')
+      self.Characteristic.call(this, 'Current Consumption', this.helpers.eveUUID.currentConsumption)
       this.setProps({
         format: self.Characteristic.Formats.UINT16,
         unit: 'W',
@@ -29,7 +29,7 @@ module.exports = class deviceOutlet {
       this.value = this.getDefaultValue()
     }
     this.eveTotalConsumption = function () {
-      self.Characteristic.call(this, 'Total Consumption', 'E863F10C-079E-48FF-8F27-9C2605A29F52')
+      self.Characteristic.call(this, 'Total Consumption', this.helpers.eveUUID.totalConsumption)
       this.setProps({
         format: self.Characteristic.Formats.FLOAT,
         unit: 'kWh',
@@ -41,7 +41,7 @@ module.exports = class deviceOutlet {
       this.value = this.getDefaultValue()
     }
     this.eveVoltage = function () {
-      self.Characteristic.call(this, 'Voltage', 'E863F10A-079E-48FF-8F27-9C2605A29F52')
+      self.Characteristic.call(this, 'Voltage', this.helpers.eveUUID.voltage)
       this.setProps({
         format: self.Characteristic.Formats.FLOAT,
         unit: 'V',
@@ -53,7 +53,7 @@ module.exports = class deviceOutlet {
       this.value = this.getDefaultValue()
     }
     this.eveElectricCurrent = function () {
-      self.Characteristic.call(this, 'Electric Current', 'E863F126-079E-48FF-8F27-9C2605A29F52')
+      self.Characteristic.call(this, 'Electric Current', this.helpers.eveUUID.electricCurrent)
       this.setProps({
         format: self.Characteristic.Formats.FLOAT,
         unit: 'A',
@@ -65,7 +65,7 @@ module.exports = class deviceOutlet {
       this.value = this.getDefaultValue()
     }
     this.eveResetTotal = function () {
-      self.Characteristic.call(this, 'Reset Total', 'E863F112-079E-48FF-8F27-9C2605A29F52')
+      self.Characteristic.call(this, 'Reset Total', this.helpers.eveUUID.resetTotal)
       this.setProps({
         format: self.Characteristic.Formats.UINT32,
         perms: [self.Characteristic.Perms.READ, self.Characteristic.Perms.NOTIFY, self.Characteristic.Perms.WRITE]
@@ -77,11 +77,11 @@ module.exports = class deviceOutlet {
     util.inherits(this.eveVoltage, this.Characteristic)
     util.inherits(this.eveElectricCurrent, this.Characteristic)
     util.inherits(this.eveResetTotal, this.Characteristic)
-    this.eveCurrentConsumption.UUID = 'E863F10D-079E-48FF-8F27-9C2605A29F52'
-    this.eveTotalConsumption.UUID = 'E863F10C-079E-48FF-8F27-9C2605A29F52'
-    this.eveVoltage.UUID = 'E863F10A-079E-48FF-8F27-9C2605A29F52'
-    this.eveElectricCurrent.UUID = 'E863F126-079E-48FF-8F27-9C2605A29F52'
-    this.eveResetTotal.UUID = 'E863F112-079E-48FF-8F27-9C2605A29F52'
+    this.eveCurrentConsumption.UUID = this.helpers.eveUUID.currentConsumption
+    this.eveTotalConsumption.UUID = this.helpers.eveUUID.totalConsumption
+    this.eveVoltage.UUID = this.helpers.eveUUID.voltage
+    this.eveElectricCurrent.UUID = this.helpers.eveUUID.electricCurrent
+    this.eveResetTotal.UUID = this.helpers.eveUUID.resetTotal
     if (!this.helpers.hasProperty(accessory.context, 'energyReadings')) accessory.context.energyReadings = []
     if (!this.helpers.hasProperty(accessory.context, 'energyReadingTotal')) accessory.context.energyReadingTotal = 0
     if (accessory.getService(this.Service.Switch)) {
diff --git a/lib/device/rf-bridge.js b/lib/device/rf-bridge.js
index b7755dfc..7b1f9f1f 100644
--- a/lib/device/rf-bridge.js
+++ b/lib/device/rf-bridge.js
@@ -11,7 +11,7 @@ module.exports = class deviceRFBridge {
     this.Characteristic = platform.api.hap.Characteristic
     const self = this
     this.eveLastActivation = function () {
-      self.Characteristic.call(this, 'Last Activation', 'E863F11A-079E-48FF-8F27-9C2605A29F52')
+      self.Characteristic.call(this, 'Last Activation', this.helpers.eveUUID.lastActivation)
       this.setProps({
         format: self.Characteristic.Formats.UINT32,
         unit: self.Characteristic.Units.SECONDS,
@@ -20,7 +20,7 @@ module.exports = class deviceRFBridge {
       this.value = this.getDefaultValue()
     }
     util.inherits(this.eveLastActivation, this.Characteristic)
-    this.eveLastActivation.UUID = 'E863F11A-079E-48FF-8F27-9C2605A29F52'
+    this.eveLastActivation.UUID = this.helpers.eveUUID.lastActivation
     this.sensorTimeDifference = parseInt(this.platform.config.sensorTimeDifference)
     this.sensorTimeDifference = isNaN(this.sensorTimeDifference)
       ? this.helpers.defaults.sensorTimeDifference
diff --git a/lib/device/sensor.js b/lib/device/sensor.js
index 55c5e4c0..58098bfa 100644
--- a/lib/device/sensor.js
+++ b/lib/device/sensor.js
@@ -11,7 +11,7 @@ module.exports = class deviceSensor {
     this.Characteristic = platform.api.hap.Characteristic
     const self = this
     this.eveLastActivation = function () {
-      self.Characteristic.call(this, 'Last Activation', 'E863F11A-079E-48FF-8F27-9C2605A29F52')
+      self.Characteristic.call(this, 'Last Activation', this.helpers.eveUUID.lastActivation)
       this.setProps({
         format: self.Characteristic.Formats.UINT32,
         unit: self.Characteristic.Units.SECONDS,
@@ -20,7 +20,7 @@ module.exports = class deviceSensor {
       this.value = this.getDefaultValue()
     }
     util.inherits(this.eveLastActivation, this.Characteristic)
-    this.eveLastActivation.UUID = 'E863F11A-079E-48FF-8F27-9C2605A29F52'
+    this.eveLastActivation.UUID = this.helpers.eveUUID.lastActivation
     this.lowBattThreshold = parseInt(this.platform.config.lowBattThreshold)
     this.lowBattThreshold = isNaN(this.lowBattThreshold)
       ? this.helpers.defaults.lowBattThreshold
diff --git a/lib/device/zb-dev.js b/lib/device/zb-dev.js
index 6a2edc20..139c839c 100644
--- a/lib/device/zb-dev.js
+++ b/lib/device/zb-dev.js
@@ -11,7 +11,7 @@ module.exports = class deviceZBDev {
     this.Characteristic = platform.api.hap.Characteristic
     const self = this
     this.eveLastActivation = function () {
-      self.Characteristic.call(this, 'Last Activation', 'E863F11A-079E-48FF-8F27-9C2605A29F52')
+      self.Characteristic.call(this, 'Last Activation', this.helpers.eveUUID.lastActivation)
       this.setProps({
         format: self.Characteristic.Formats.UINT32,
         unit: self.Characteristic.Units.SECONDS,
@@ -20,7 +20,7 @@ module.exports = class deviceZBDev {
       this.value = this.getDefaultValue()
     }
     util.inherits(this.eveLastActivation, this.Characteristic)
-    this.eveLastActivation.UUID = 'E863F11A-079E-48FF-8F27-9C2605A29F52'
+    this.eveLastActivation.UUID = this.helpers.eveUUID.lastActivation
     this.lowBattThreshold = parseInt(this.platform.config.lowBattThreshold)
     this.lowBattThreshold = isNaN(this.lowBattThreshold)
       ? this.helpers.defaults.lowBattThreshold
diff --git a/lib/utils/helpers.js b/lib/utils/helpers.js
index 1a7151b3..7776e53f 100644
--- a/lib/utils/helpers.js
+++ b/lib/utils/helpers.js
@@ -53,6 +53,14 @@ module.exports = {
     'trigTime', 'type', 'voltage', 'white',
     'zyx_mode'
   ],
+  eveUUID: {
+    currentConsumption: 'E863F10D-079E-48FF-8F27-9C2605A29F52',
+    totalConsumption: 'E863F10C-079E-48FF-8F27-9C2605A29F52',
+    voltage: 'E863F10A-079E-48FF-8F27-9C2605A29F52',
+    electricCurrent: 'E863F126-079E-48FF-8F27-9C2605A29F52',
+    resetTotal: 'E863F112-079E-48FF-8F27-9C2605A29F52',
+    lastActivation: 'E863F11A-079E-48FF-8F27-9C2605A29F52'
+  },
   defaultMultiSwitchOff: [
     {
       switch: 'off',

From a25c10cd0b7d106e9fcc71ec2735de2a6a839625 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 18 Dec 2020 11:36:05 +0000
Subject: [PATCH 0968/3183] limit lan to known working

---
 lib/connection/lan.js      | 2 ++
 lib/device/fan.js          | 1 -
 lib/device/light-colour.js | 1 -
 lib/device/light-ctemp.js  | 1 -
 lib/index.js               | 4 ++--
 lib/utils/helpers.js       | 2 +-
 6 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/lib/connection/lan.js b/lib/connection/lan.js
index 9af67589..6d051af6 100644
--- a/lib/connection/lan.js
+++ b/lib/connection/lan.js
@@ -17,6 +17,7 @@ module.exports = class connectionLAN {
         apiKey: device.devicekey,
         online: this.helpers.hasProperty(this.ipOverride, device.deviceid),
         ip: this.helpers.hasProperty(this.ipOverride, device.deviceid) ? this.ipOverride[device.deviceid] : null,
+        uiid: device.extra.uiid,
         lastIV: null
       })
     })
@@ -53,6 +54,7 @@ module.exports = class connectionLAN {
           .forEach(value => {
             const rdata = value.rdata
             const deviceInfo = this.deviceMap.get(rdata.id)
+            if (!this.helpers.devicesLAN.includes(deviceInfo.uiid)) return
             if (deviceInfo.lastIV === rdata.iv) return
             deviceInfo.lastIV = rdata.iv
             const data =
diff --git a/lib/device/fan.js b/lib/device/fan.js
index bc620d3e..5a909daa 100644
--- a/lib/device/fan.js
+++ b/lib/device/fan.js
@@ -72,7 +72,6 @@ module.exports = class deviceFan {
 
   async externalUpdate (params) {
     try {
-      if (this.helpers.hasProperty(params, 'updateSource') && params.updateSource === 'LAN') return
       if (params.switches && Array.isArray(params.switches)) {
         const light = params.switches[0].switch === 'on'
         let status
diff --git a/lib/device/light-colour.js b/lib/device/light-colour.js
index 68c57b55..27877d4b 100644
--- a/lib/device/light-colour.js
+++ b/lib/device/light-colour.js
@@ -143,7 +143,6 @@ module.exports = class deviceLightColour {
 
   async externalUpdate (params) {
     try {
-      if (this.helpers.hasProperty(params, 'updateSource') && params.updateSource === 'LAN') return
       let newColour
       let mode
       let isOn = false
diff --git a/lib/device/light-ctemp.js b/lib/device/light-ctemp.js
index 6a651327..c433b1f7 100644
--- a/lib/device/light-ctemp.js
+++ b/lib/device/light-ctemp.js
@@ -92,7 +92,6 @@ module.exports = class deviceLightColour {
 
   async externalUpdate (params) {
     try {
-      if (this.helpers.hasProperty(params, 'updateSource') && params.updateSource === 'LAN') return
       let mode
       let isOn = false
       if (this.helpers.hasProperty(params, 'switch')) {
diff --git a/lib/index.js b/lib/index.js
index 696394cb..52f4a493 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -555,7 +555,7 @@ class eWeLinkPlatform {
         ? 'and found locally with IP [' + this.lanDevices.get(device.deviceid).ip + ']'
         : 'but LAN mode unavailable as device '
       if (!accessory.context.reachableLAN) {
-        if (this.helpers.devicesNonLAN.includes(device.extra.uiid)) {
+        if (!this.helpers.devicesLAN.includes(device.extra.uiid)) {
           str += "doesn't support it"
         } else if (accessory.context.sharedDevice) {
           str += 'is shared (' + device.sharedBy.email + ')'
@@ -664,7 +664,7 @@ class eWeLinkPlatform {
     // *** Quick check to see if LAN mode is supported *** \\
     const res = this.config.disableLANMode
       ? 'LAN mode is disabled'
-      : this.helpers.devicesNonLAN.includes(accessory.context.eweUIID)
+      : !this.helpers.devicesLAN.includes(accessory.context.eweUIID)
         ? 'LAN mode is not supported for this device'
         : await this.lanClient.sendUpdate(payload)
 
diff --git a/lib/utils/helpers.js b/lib/utils/helpers.js
index 7776e53f..e08ae407 100644
--- a/lib/utils/helpers.js
+++ b/lib/utils/helpers.js
@@ -18,7 +18,7 @@ module.exports = {
     sensorTimeLength: 60,
     sensorTimeDifference: 120
   },
-  devicesNonLAN: [22, 28, 34, 59, 102, 103, 104],
+  devicesLAN: [1, 2, 3, 4, 5, 6, 7, 8, 9, 32, 77, 78],
   devicesSingleSwitch: [1, 5, 6, 14, 15, 22, 24, 27, 32, 36, 44, 59, 104],
   devicesMultiSwitch: [2, 3, 4, 7, 8, 9, 29, 30, 31, 34, 41],
   devicesSingleSwitchOutlet: ['Sonoff Pow', 'S20', 'S26', 'S26R1', 'S55', 'S55R1'],

From 4d4428132b368592b8387463c5759c6fe6824d0d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 18 Dec 2020 11:36:46 +0000
Subject: [PATCH 0969/3183] introduce debugDevice

---
 config.schema.json          | 8 +++++++-
 lib/device/blind.js         | 1 +
 lib/device/curtain.js       | 1 +
 lib/device/diffuser.js      | 1 +
 lib/device/fan.js           | 1 +
 lib/device/garage-eachen.js | 1 +
 lib/device/garage-four.js   | 1 +
 lib/device/garage-two.js    | 1 +
 lib/device/garage.js        | 1 +
 lib/device/light-colour.js  | 1 +
 lib/device/light-ctemp.js   | 1 +
 lib/device/light-dimmer.js  | 1 +
 lib/device/lock.js          | 1 +
 lib/device/outlet-temp.js   | 1 +
 lib/device/outlet.js        | 1 +
 lib/device/rf-bridge.js     | 1 +
 lib/device/scm.js           | 1 +
 lib/device/sensor.js        | 1 +
 lib/device/switch-multi.js  | 1 +
 lib/device/switch-single.js | 1 +
 lib/device/switch-valve.js  | 1 +
 lib/device/template.js      | 1 +
 lib/device/thermostat.js    | 1 +
 lib/device/usb.js           | 1 +
 lib/device/valve-two.js     | 1 +
 lib/device/valve.js         | 1 +
 lib/device/zb-dev.js        | 1 +
 27 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/config.schema.json b/config.schema.json
index 69c2cd54..735a5017 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -43,7 +43,12 @@
       "debug": {
         "title": "Debug Logging",
         "type": "boolean",
-        "description": "If checked, more information will be added to the log."
+        "description": "If checked, debug information will be added to the log."
+      },
+      "debugDevice": {
+        "title": "Device Logging",
+        "type": "boolean",
+        "description": "If checked, device activity received from eWeLink will be added to the log."
       },
       "debugReqRes": {
         "title": "Request & Response Logging",
@@ -373,6 +378,7 @@
         "disableHTTPRefresh",
         "disableLANMode",
         "debug",
+        "debugDevice",
         "debugReqRes",
         "disablePlugin"
       ]
diff --git a/lib/device/blind.js b/lib/device/blind.js
index b65abc4b..942a9661 100644
--- a/lib/device/blind.js
+++ b/lib/device/blind.js
@@ -5,6 +5,7 @@ module.exports = class deviceBlind {
   constructor (platform, accessory) {
     this.platform = platform
     this.log = platform.log
+    this.debugDevice = platform.config.debugDevice || false
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
diff --git a/lib/device/curtain.js b/lib/device/curtain.js
index 68543315..dbc87915 100644
--- a/lib/device/curtain.js
+++ b/lib/device/curtain.js
@@ -5,6 +5,7 @@ module.exports = class deviceCurtain {
   constructor (platform, accessory) {
     this.platform = platform
     this.log = platform.log
+    this.debugDevice = platform.config.debugDevice || false
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
diff --git a/lib/device/diffuser.js b/lib/device/diffuser.js
index ca44c694..32089829 100644
--- a/lib/device/diffuser.js
+++ b/lib/device/diffuser.js
@@ -5,6 +5,7 @@ module.exports = class deviceDiffuser {
   constructor (platform, accessory) {
     this.platform = platform
     this.log = platform.log
+    this.debugDevice = platform.config.debugDevice || false
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
diff --git a/lib/device/fan.js b/lib/device/fan.js
index 5a909daa..9405da4a 100644
--- a/lib/device/fan.js
+++ b/lib/device/fan.js
@@ -5,6 +5,7 @@ module.exports = class deviceFan {
   constructor (platform, accessory) {
     this.platform = platform
     this.log = platform.log
+    this.debugDevice = platform.config.debugDevice || false
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
diff --git a/lib/device/garage-eachen.js b/lib/device/garage-eachen.js
index eb5981e0..7e4019a3 100644
--- a/lib/device/garage-eachen.js
+++ b/lib/device/garage-eachen.js
@@ -5,6 +5,7 @@ module.exports = class deviceGarageEachen {
   constructor (platform, accessory) {
     this.platform = platform
     this.log = platform.log
+    this.debugDevice = platform.config.debugDevice || false
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
diff --git a/lib/device/garage-four.js b/lib/device/garage-four.js
index 49068189..ccba0223 100644
--- a/lib/device/garage-four.js
+++ b/lib/device/garage-four.js
@@ -5,6 +5,7 @@ module.exports = class deviceGarageFour {
   constructor (platform, accessory) {
     this.platform = platform
     this.log = platform.log
+    this.debugDevice = platform.config.debugDevice || false
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
diff --git a/lib/device/garage-two.js b/lib/device/garage-two.js
index bf348721..dcd3ceba 100644
--- a/lib/device/garage-two.js
+++ b/lib/device/garage-two.js
@@ -5,6 +5,7 @@ module.exports = class deviceGarageTwo {
   constructor (platform, accessory) {
     this.platform = platform
     this.log = platform.log
+    this.debugDevice = platform.config.debugDevice || false
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
diff --git a/lib/device/garage.js b/lib/device/garage.js
index 7e086771..73cd3bbc 100644
--- a/lib/device/garage.js
+++ b/lib/device/garage.js
@@ -5,6 +5,7 @@ module.exports = class deviceGarage {
   constructor (platform, accessory) {
     this.platform = platform
     this.log = platform.log
+    this.debugDevice = platform.config.debugDevice || false
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
diff --git a/lib/device/light-colour.js b/lib/device/light-colour.js
index 27877d4b..b3f8011f 100644
--- a/lib/device/light-colour.js
+++ b/lib/device/light-colour.js
@@ -5,6 +5,7 @@ module.exports = class deviceLightColour {
   constructor (platform, accessory) {
     this.platform = platform
     this.log = platform.log
+    this.debugDevice = platform.config.debugDevice || false
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
diff --git a/lib/device/light-ctemp.js b/lib/device/light-ctemp.js
index c433b1f7..cc5076bd 100644
--- a/lib/device/light-ctemp.js
+++ b/lib/device/light-ctemp.js
@@ -5,6 +5,7 @@ module.exports = class deviceLightColour {
   constructor (platform, accessory) {
     this.platform = platform
     this.log = platform.log
+    this.debugDevice = platform.config.debugDevice || false
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
diff --git a/lib/device/light-dimmer.js b/lib/device/light-dimmer.js
index 624cbd9e..84623594 100644
--- a/lib/device/light-dimmer.js
+++ b/lib/device/light-dimmer.js
@@ -5,6 +5,7 @@ module.exports = class deviceLightDimmer {
   constructor (platform, accessory) {
     this.platform = platform
     this.log = platform.log
+    this.debugDevice = platform.config.debugDevice || false
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
diff --git a/lib/device/lock.js b/lib/device/lock.js
index 6297d9e2..6c502344 100644
--- a/lib/device/lock.js
+++ b/lib/device/lock.js
@@ -5,6 +5,7 @@ module.exports = class deviceLock {
   constructor (platform, accessory) {
     this.platform = platform
     this.log = platform.log
+    this.debugDevice = platform.config.debugDevice || false
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
diff --git a/lib/device/outlet-temp.js b/lib/device/outlet-temp.js
index 6a03a968..e3cc0f88 100644
--- a/lib/device/outlet-temp.js
+++ b/lib/device/outlet-temp.js
@@ -5,6 +5,7 @@ module.exports = class deviceOutletTemp {
   constructor (platform, accessory) {
     this.platform = platform
     this.log = platform.log
+    this.debugDevice = platform.config.debugDevice || false
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
diff --git a/lib/device/outlet.js b/lib/device/outlet.js
index af3efc93..27016812 100644
--- a/lib/device/outlet.js
+++ b/lib/device/outlet.js
@@ -6,6 +6,7 @@ module.exports = class deviceOutlet {
   constructor (platform, accessory) {
     this.platform = platform
     this.log = platform.log
+    this.debugDevice = platform.config.debugDevice || false
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
diff --git a/lib/device/rf-bridge.js b/lib/device/rf-bridge.js
index 7b1f9f1f..02842141 100644
--- a/lib/device/rf-bridge.js
+++ b/lib/device/rf-bridge.js
@@ -6,6 +6,7 @@ module.exports = class deviceRFBridge {
   constructor (platform, accessory) {
     this.platform = platform
     this.log = platform.log
+    this.debugDevice = platform.config.debugDevice || false
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
diff --git a/lib/device/scm.js b/lib/device/scm.js
index 9532847f..42f2e518 100644
--- a/lib/device/scm.js
+++ b/lib/device/scm.js
@@ -5,6 +5,7 @@ module.exports = class deviceSCM {
   constructor (platform, accessory) {
     this.platform = platform
     this.log = platform.log
+    this.debugDevice = platform.config.debugDevice || false
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
diff --git a/lib/device/sensor.js b/lib/device/sensor.js
index 58098bfa..a8eeef3a 100644
--- a/lib/device/sensor.js
+++ b/lib/device/sensor.js
@@ -7,6 +7,7 @@ module.exports = class deviceSensor {
     this.platform = platform
     this.log = platform.log
     this.helpers = platform.helpers
+    this.debugDevice = platform.config.debugDevice || false
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
     const self = this
diff --git a/lib/device/switch-multi.js b/lib/device/switch-multi.js
index 88e8ac67..5f9e0893 100644
--- a/lib/device/switch-multi.js
+++ b/lib/device/switch-multi.js
@@ -5,6 +5,7 @@ module.exports = class deviceSwitchMulti {
   constructor (platform, accessory) {
     this.platform = platform
     this.log = platform.log
+    this.debugDevice = platform.config.debugDevice || false
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
diff --git a/lib/device/switch-single.js b/lib/device/switch-single.js
index 8c8dde15..05642fbb 100644
--- a/lib/device/switch-single.js
+++ b/lib/device/switch-single.js
@@ -5,6 +5,7 @@ module.exports = class deviceSwitchSingle {
   constructor (platform, accessory) {
     this.platform = platform
     this.log = platform.log
+    this.debugDevice = platform.config.debugDevice || false
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
diff --git a/lib/device/switch-valve.js b/lib/device/switch-valve.js
index 9c2ac2a6..9ef3e129 100644
--- a/lib/device/switch-valve.js
+++ b/lib/device/switch-valve.js
@@ -5,6 +5,7 @@ module.exports = class deviceSwitchValve {
   constructor (platform, accessory) {
     this.platform = platform
     this.log = platform.log
+    this.debugDevice = platform.config.debugDevice || false
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
diff --git a/lib/device/template.js b/lib/device/template.js
index 3a79f0e9..8a2d09ec 100644
--- a/lib/device/template.js
+++ b/lib/device/template.js
@@ -5,6 +5,7 @@ module.exports = class deviceTemplate {
   constructor (platform, accessory) {
     this.platform = platform
     this.log = platform.log
+    this.debugDevice = platform.config.debugDevice || false
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
diff --git a/lib/device/thermostat.js b/lib/device/thermostat.js
index a8d2dd21..000f9169 100644
--- a/lib/device/thermostat.js
+++ b/lib/device/thermostat.js
@@ -5,6 +5,7 @@ module.exports = class deviceThermostat {
   constructor (platform, accessory) {
     this.platform = platform
     this.log = platform.log
+    this.debugDevice = platform.config.debugDevice || false
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
diff --git a/lib/device/usb.js b/lib/device/usb.js
index 9529d5b0..569bb700 100644
--- a/lib/device/usb.js
+++ b/lib/device/usb.js
@@ -5,6 +5,7 @@ module.exports = class deviceUSB {
   constructor (platform, accessory) {
     this.platform = platform
     this.log = platform.log
+    this.debugDevice = platform.config.debugDevice || false
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
diff --git a/lib/device/valve-two.js b/lib/device/valve-two.js
index b6915148..1dd58261 100644
--- a/lib/device/valve-two.js
+++ b/lib/device/valve-two.js
@@ -5,6 +5,7 @@ module.exports = class deviceValveTwo {
   constructor (platform, accessory) {
     this.platform = platform
     this.log = platform.log
+    this.debugDevice = platform.config.debugDevice || false
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
diff --git a/lib/device/valve.js b/lib/device/valve.js
index 6611db2e..7c7525fd 100644
--- a/lib/device/valve.js
+++ b/lib/device/valve.js
@@ -5,6 +5,7 @@ module.exports = class deviceValve {
   constructor (platform, accessory) {
     this.platform = platform
     this.log = platform.log
+    this.debugDevice = platform.config.debugDevice || false
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
diff --git a/lib/device/zb-dev.js b/lib/device/zb-dev.js
index 139c839c..c59de499 100644
--- a/lib/device/zb-dev.js
+++ b/lib/device/zb-dev.js
@@ -5,6 +5,7 @@ const util = require('util')
 module.exports = class deviceZBDev {
   constructor (platform, accessory) {
     this.platform = platform
+    this.debugDevice = platform.config.debugDevice || false
     this.log = platform.log
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service

From 683b7fbcc316c23ffb6a212d02f5a44fae674aff Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 18 Dec 2020 11:58:56 +0000
Subject: [PATCH 0970/3183] filter lan devices

---
 lib/connection/lan.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/lib/connection/lan.js b/lib/connection/lan.js
index 6d051af6..d6c49604 100644
--- a/lib/connection/lan.js
+++ b/lib/connection/lan.js
@@ -36,6 +36,7 @@ module.exports = class connectionLAN {
             apiKey: d.apiKey,
             online: true,
             ip: device.address,
+            uiid: d.uiid,
             lastIV: null
           })
         }
@@ -71,6 +72,7 @@ module.exports = class connectionLAN {
                 apiKey: deviceInfo.apiKey,
                 online: true,
                 ip: packet.address,
+                uiid: deviceInfo.uiid,
                 lastIV: rdata.iv
               })
               if (this.debug) this.log.warn('[%s] updating IP address to [%s].', rdata.id, packet.address)
@@ -173,8 +175,11 @@ module.exports = class connectionLAN {
   addDeviceToMap (device) {
     this.deviceMap.set(device.deviceid, {
       apiKey: device.devicekey,
-      online: this.helpers.hasProperty(this.ipOverride, device.deviceid),
-      ip: this.helpers.hasProperty(this.ipOverride, device.deviceid) ? this.ipOverride[device.deviceid] : null,
+      online: this.helpers.devicesLAN.includes(device.extra.uiid) && this.helpers.hasProperty(this.ipOverride, device.deviceid),
+      ip: this.helpers.devicesLAN.includes(device.extra.uiid) && this.helpers.hasProperty(this.ipOverride, device.deviceid)
+        ? this.ipOverride[device.deviceid]
+        : null,
+      uiid: device.extra.uiid,
       lastIV: null
     })
   }

From b9a3b505934f523a3f0d90325ae4affedb9c53e8 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 18 Dec 2020 12:03:11 +0000
Subject: [PATCH 0971/3183] debugDevice logging

---
 lib/device/switch-single.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/device/switch-single.js b/lib/device/switch-single.js
index 05642fbb..2df83849 100644
--- a/lib/device/switch-single.js
+++ b/lib/device/switch-single.js
@@ -41,11 +41,15 @@ module.exports = class deviceSwitchSingle {
   async externalUpdate (params) {
     try {
       if (!this.helpers.hasProperty(params, 'switch')) return
-      this.switchService.updateCharacteristic(this.Characteristic.On, params.switch === 'on')
+      const newStatus = params.switch === 'on'
+      this.switchService.updateCharacteristic(this.Characteristic.On, newStatus)
       this.accessory.eveLogger.addEntry({
         time: Math.round(new Date().valueOf() / 1000),
-        status: params.switch === 'on' ? 1 : 0
+        status: newStatus ? 1 : 0
       })
+      if (this.debugDevice && params.updateSource) {
+        this.log('[%s] was reported [%s]', this.accessory.displayName, newStatus ? 'on' : 'off')
+      }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }

From 3f28b681422e9d02dc5f9fb81b957050fc6d2e85 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 18 Dec 2020 12:07:13 +0000
Subject: [PATCH 0972/3183] Update switch-single.js

---
 lib/device/switch-single.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/device/switch-single.js b/lib/device/switch-single.js
index 2df83849..09ccf966 100644
--- a/lib/device/switch-single.js
+++ b/lib/device/switch-single.js
@@ -48,7 +48,7 @@ module.exports = class deviceSwitchSingle {
         status: newStatus ? 1 : 0
       })
       if (this.debugDevice && params.updateSource) {
-        this.log('[%s] was reported [%s]', this.accessory.displayName, newStatus ? 'on' : 'off')
+        this.log('[%s] was reported [%s].', this.accessory.displayName, newStatus ? 'on' : 'off')
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)

From 9ebe90c145ba2ac3e0bcd78774d1b91d1406ccca Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 18 Dec 2020 12:07:47 +0000
Subject: [PATCH 0973/3183] 3.18.2-0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b3bed904..016dc113 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.18.1",
+  "version": "3.18.2-0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index cdf58f27..c1d5d97e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.18.1",
+  "version": "3.18.2-0",
   "author": "bwp91",
   "description": "Homebridge/HOOBS plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 6c4a81b84e61d0527602df8c0b99b836783513e6 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 18 Dec 2020 17:47:01 +0000
Subject: [PATCH 0974/3183] update node

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index c1d5d97e..34ab8a81 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,7 @@
   "main": "lib/index.js",
   "engines": {
     "homebridge": "^1.1.6",
-    "node": "^14.15.2"
+    "node": "^14.15.3"
   },
   "repository": {
     "type": "git",

From eef6e4f47880ed989c0ff70a602a1fc3cafcadd4 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 19 Dec 2020 08:50:26 +0000
Subject: [PATCH 0975/3183] debugDevice logging

---
 lib/device/switch-single.js |  2 +-
 lib/device/zb-dev.js        | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/lib/device/switch-single.js b/lib/device/switch-single.js
index 09ccf966..8b807a1f 100644
--- a/lib/device/switch-single.js
+++ b/lib/device/switch-single.js
@@ -48,7 +48,7 @@ module.exports = class deviceSwitchSingle {
         status: newStatus ? 1 : 0
       })
       if (this.debugDevice && params.updateSource) {
-        this.log('[%s] was reported [%s].', this.accessory.displayName, newStatus ? 'on' : 'off')
+        this.log('[%s] reported status [%s].', this.accessory.displayName, newStatus ? 'on' : 'off')
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
diff --git a/lib/device/zb-dev.js b/lib/device/zb-dev.js
index c59de499..9b0e2bf2 100644
--- a/lib/device/zb-dev.js
+++ b/lib/device/zb-dev.js
@@ -149,14 +149,20 @@ module.exports = class deviceZBDev {
             this.accessory
               .getService(this.Service.TemperatureSensor)
               .updateCharacteristic(this.Characteristic.CurrentTemperature, currentTemp)
-            eveLog.temp = parseFloat(currentTemp)
+            if (this.debugDevice && params.updateSource) {
+              this.log('[%s] reported temperture [%s].', this.accessory.displayName, currentTemp)
+            }
+            eveLog.temp = currentTemp
           }
           if (this.helpers.hasProperty(params, 'humidity')) {
             const currentHumi = parseInt(params.humidity) / 100
             this.accessory
               .getService(this.Service.HumiditySensor)
               .updateCharacteristic(this.Characteristic.CurrentRelativeHumidity, currentHumi)
-            eveLog.humidity = parseFloat(currentHumi)
+            eveLog.humidity = currentHumi
+            if (this.debugDevice && params.updateSource) {
+              this.log('[%s] reported humidity [%s].', this.accessory.displayName, currentHumi)
+            }
           }
           if (this.helpers.hasProperty(eveLog, 'temp') || this.helpers.hasProperty(eveLog, 'humidity')) {
             this.accessory.eveLogger.addEntry(eveLog)

From 7d7ec6c6980c4b37db80c009cc07b6429984ba5b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 19 Dec 2020 08:51:18 +0000
Subject: [PATCH 0976/3183] 3.18.2-1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 016dc113..f3755e69 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.18.2-0",
+  "version": "3.18.2-1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 34ab8a81..560d934b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.18.2-0",
+  "version": "3.18.2-1",
   "author": "bwp91",
   "description": "Homebridge/HOOBS plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 64d3dd828cc90c460e2b59a792840bcdb2d90568 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 20 Dec 2020 12:37:22 +0000
Subject: [PATCH 0977/3183] eve add time directly

---
 lib/device/outlet-temp.js        |  7 ++-----
 lib/device/outlet.js             |  5 +----
 lib/device/rf-bridge.js          | 10 ++--------
 lib/device/scm.js                |  5 +----
 lib/device/sensor.js             |  5 +----
 lib/device/switch-multi.js       | 10 ++--------
 lib/device/switch-single.js      |  5 +----
 lib/device/switch-valve.js       |  5 +----
 lib/device/thermostat.js         |  2 +-
 lib/device/usb.js                |  5 +----
 lib/device/zb-dev.js             | 17 ++++-------------
 lib/fakegato/fakegato-history.js |  1 +
 12 files changed, 18 insertions(+), 59 deletions(-)

diff --git a/lib/device/outlet-temp.js b/lib/device/outlet-temp.js
index e3cc0f88..4fb73e26 100644
--- a/lib/device/outlet-temp.js
+++ b/lib/device/outlet-temp.js
@@ -62,12 +62,9 @@ module.exports = class deviceOutletTemp {
       ) {
         const newState = this.helpers.hasProperty(params, 'switch') ? params.switch === 'on' : params.mainSwitch === 'on'
         this.switchService.updateCharacteristic(this.Characteristic.On, newState)
-        this.accessory.eveLogger.addEntry({
-          time: Math.round(new Date().valueOf() / 1000),
-          status: newState ? 1 : 0
-        })
+        this.accessory.eveLogger.addEntry({ status: newState ? 1 : 0 })
       }
-      const eveLog = { time: Math.round(new Date().valueOf() / 1000) }
+      const eveLog = {}
       if (this.helpers.hasProperty(params, 'currentTemperature') && params.currentTemperature !== 'unavailable') {
         const currentTemp = parseFloat(params.currentTemperature) + this.tempOffset
         this.tempService.updateCharacteristic(this.Characteristic.CurrentTemperature, currentTemp)
diff --git a/lib/device/outlet.js b/lib/device/outlet.js
index 27016812..01fc3840 100644
--- a/lib/device/outlet.js
+++ b/lib/device/outlet.js
@@ -151,10 +151,7 @@ module.exports = class deviceOutlet {
           .updateCharacteristic(this.Characteristic.OutletInUse, parseFloat(params.power) > this.inUsePowerThreshold)
           .updateCharacteristic(this.eveCurrentConsumption, parseFloat(params.power))
         const isOn = this.accessory.getService(this.Service.Outlet).getCharacteristic(this.Characteristic.On).value
-        this.accessory.eveLogger.addEntry({
-          time: Math.round(new Date().valueOf() / 1000),
-          power: isOn ? parseFloat(params.power) : 0
-        })
+        this.accessory.eveLogger.addEntry({ power: isOn ? parseFloat(params.power) : 0 })
         this.accessory.context.energyReadings.push(parseFloat(params.power))
       }
       if (this.helpers.hasProperty(params, 'voltage')) {
diff --git a/lib/device/rf-bridge.js b/lib/device/rf-bridge.js
index 02842141..e9b3fec0 100644
--- a/lib/device/rf-bridge.js
+++ b/lib/device/rf-bridge.js
@@ -204,16 +204,10 @@ module.exports = class deviceRFBridge {
                     break
                 }
                 oAccessory.getService(serv).updateCharacteristic(char, 1)
-                oAccessory.eveLogger.addEntry({
-                  time: Math.round(new Date().valueOf() / 1000),
-                  status: 1
-                })
+                oAccessory.eveLogger.addEntry({ status: 1 })
                 await this.helpers.sleep(sensorTimeLength * 1000)
                 oAccessory.getService(serv).updateCharacteristic(char, 0)
-                oAccessory.eveLogger.addEntry({
-                  time: Math.round(new Date().valueOf() / 1000),
-                  status: 0
-                })
+                oAccessory.eveLogger.addEntry({ status: 0 })
               }
             }
           })
diff --git a/lib/device/scm.js b/lib/device/scm.js
index 42f2e518..4aef23b8 100644
--- a/lib/device/scm.js
+++ b/lib/device/scm.js
@@ -36,10 +36,7 @@ module.exports = class deviceSCM {
     try {
       if (!this.helpers.hasProperty(params, 'switches')) return
       this.switchService.updateCharacteristic(this.Characteristic.On, params.switches[0].switch === 'on')
-      this.accessory.eveLogger.addEntry({
-        time: Math.round(new Date().valueOf() / 1000),
-        status: params.switches[0].switch === 'on' ? 1 : 0
-      })
+      this.accessory.eveLogger.addEntry({ status: params.switches[0].switch === 'on' ? 1 : 0 })
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
diff --git a/lib/device/sensor.js b/lib/device/sensor.js
index a8eeef3a..2399a1cd 100644
--- a/lib/device/sensor.js
+++ b/lib/device/sensor.js
@@ -50,10 +50,7 @@ module.exports = class deviceSensor {
       const newState = params.switch === 'on' ? 1 : 0
       let oAccessory = false
       this.contactService.updateCharacteristic(this.Characteristic.ContactSensorState, newState)
-      this.accessory.eveLogger.addEntry({
-        time: Math.round(new Date().valueOf() / 1000),
-        status: newState
-      })
+      this.accessory.eveLogger.addEntry({ status: newState })
       if (newState) {
         this.contactService.updateCharacteristic(
           this.eveLastActivation,
diff --git a/lib/device/switch-multi.js b/lib/device/switch-multi.js
index 5f9e0893..53aa745d 100644
--- a/lib/device/switch-multi.js
+++ b/lib/device/switch-multi.js
@@ -95,18 +95,12 @@ module.exports = class deviceSwitchMulti {
           oAccessory
             .getService(this.Service.Switch)
             .updateCharacteristic(this.Characteristic.On, params.switches[i - 1].switch === 'on')
-          oAccessory.eveLogger.addEntry({
-            time: Math.round(new Date().valueOf() / 1000),
-            status: params.switches[i - 1].switch === 'on' ? 1 : 0
-          })
+          oAccessory.eveLogger.addEntry({ status: params.switches[i - 1].switch === 'on' ? 1 : 0 })
         }
       }
       if (!this.platform.hiddenMasters.includes(this.accessory.context.eweDeviceId)) {
         this.switchService.updateCharacteristic(this.Characteristic.On, primaryState)
-        this.accessory.eveLogger.addEntry({
-          time: Math.round(new Date().valueOf() / 1000),
-          status: primaryState ? 1 : 0
-        })
+        this.accessory.eveLogger.addEntry({ status: primaryState ? 1 : 0 })
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
diff --git a/lib/device/switch-single.js b/lib/device/switch-single.js
index 8b807a1f..9ef2b119 100644
--- a/lib/device/switch-single.js
+++ b/lib/device/switch-single.js
@@ -43,10 +43,7 @@ module.exports = class deviceSwitchSingle {
       if (!this.helpers.hasProperty(params, 'switch')) return
       const newStatus = params.switch === 'on'
       this.switchService.updateCharacteristic(this.Characteristic.On, newStatus)
-      this.accessory.eveLogger.addEntry({
-        time: Math.round(new Date().valueOf() / 1000),
-        status: newStatus ? 1 : 0
-      })
+      this.accessory.eveLogger.addEntry({ status: newStatus ? 1 : 0 })
       if (this.debugDevice && params.updateSource) {
         this.log('[%s] reported status [%s].', this.accessory.displayName, newStatus ? 'on' : 'off')
       }
diff --git a/lib/device/switch-valve.js b/lib/device/switch-valve.js
index 9ef3e129..c3572289 100644
--- a/lib/device/switch-valve.js
+++ b/lib/device/switch-valve.js
@@ -87,10 +87,7 @@ module.exports = class deviceSwitchValve {
       if (!this.helpers.hasProperty(params, 'switches')) return
 
       this.switchService.updateCharacteristic(this.Characteristic.On, params.switches[0].switch === 'on')
-      this.accessory.eveLogger.addEntry({
-        time: Math.round(new Date().valueOf() / 1000),
-        status: params.switch === 'on' ? 1 : 0
-      })
+      this.accessory.eveLogger.addEntry({ status: params.switch === 'on' ? 1 : 0 })
       this.valveService
         .updateCharacteristic(this.Characteristic.Active, params.switches[1].switch === 'on' ? 1 : 0)
         .updateCharacteristic(this.Characteristic.InUse, params.switches[1].switch === 'on' ? 1 : 0)
diff --git a/lib/device/thermostat.js b/lib/device/thermostat.js
index 000f9169..327ff949 100644
--- a/lib/device/thermostat.js
+++ b/lib/device/thermostat.js
@@ -81,7 +81,7 @@ module.exports = class deviceThermostat {
         const newState = this.helpers.hasProperty(params, 'switch') ? params.switch === 'on' : params.mainSwitch === 'on'
         this.service.updateCharacteristic(this.Characteristic.TargetHeatingCoolingState, newState ? 1 : 0)
       }
-      const eveLog = { time: Math.round(new Date().valueOf() / 1000) }
+      const eveLog = {}
       if (this.helpers.hasProperty(params, 'currentTemperature') && params.currentTemperature !== 'unavailable') {
         const currentTemp = parseFloat(params.currentTemperature) + this.tempOffset
         this.service.updateCharacteristic(this.Characteristic.CurrentTemperature, currentTemp)
diff --git a/lib/device/usb.js b/lib/device/usb.js
index 569bb700..47a983b8 100644
--- a/lib/device/usb.js
+++ b/lib/device/usb.js
@@ -46,10 +46,7 @@ module.exports = class deviceUSB {
     try {
       if (!this.helpers.hasProperty(params, 'switches')) return
       this.service.updateCharacteristic(this.Characteristic.On, params.switches[0].switch === 'on')
-      this.accessory.eveLogger.addEntry({
-        time: Math.round(new Date().valueOf() / 1000),
-        status: params.switches[0].switch === 'on' ? 1 : 0
-      })
+      this.accessory.eveLogger.addEntry({ status: params.switches[0].switch === 'on' ? 1 : 0 })
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
diff --git a/lib/device/zb-dev.js b/lib/device/zb-dev.js
index 9b0e2bf2..7158fc4e 100644
--- a/lib/device/zb-dev.js
+++ b/lib/device/zb-dev.js
@@ -136,14 +136,11 @@ module.exports = class deviceZBDev {
             this.accessory
               .getService(this.Service.Switch)
               .updateCharacteristic(this.Characteristic.On, params.switch === 'on')
-            this.accessory.eveLogger.addEntry({
-              time: Math.round(new Date().valueOf() / 1000),
-              status: params.switch === 'on' ? 1 : 0
-            })
+            this.accessory.eveLogger.addEntry({ status: params.switch === 'on' ? 1 : 0 })
           }
           break
         case 1770: {
-          const eveLog = { time: Math.round(new Date().valueOf() / 1000) }
+          const eveLog = {}
           if (this.helpers.hasProperty(params, 'temperature')) {
             const currentTemp = parseInt(params.temperature) / 100
             this.accessory
@@ -177,10 +174,7 @@ module.exports = class deviceZBDev {
               this.helpers.hasProperty(params, 'updateSource') &&
               params.motion === 1 &&
               diff < this.sensorTimeDifference
-            this.accessory.eveLogger.addEntry({
-              time: Math.round(new Date().valueOf() / 1000),
-              status: motionDetected ? 1 : 0
-            })
+            this.accessory.eveLogger.addEntry({ status: motionDetected ? 1 : 0 })
             if (motionDetected) {
               this.accessory.getService(this.Service.MotionSensor).updateCharacteristic(
                 this.eveLastActivation,
@@ -196,10 +190,7 @@ module.exports = class deviceZBDev {
             this.accessory
               .getService(this.Service.ContactSensor)
               .updateCharacteristic(this.Characteristic.ContactSensorState, params.lock)
-            this.accessory.eveLogger.addEntry({
-              time: Math.round(new Date().valueOf() / 1000),
-              status: params.lock
-            })
+            this.accessory.eveLogger.addEntry({ status: params.lock })
           }
           if (params.lock) {
             this.accessory.getService(this.Service.ContactSensor).updateCharacteristic(
diff --git a/lib/fakegato/fakegato-history.js b/lib/fakegato/fakegato-history.js
index 1b9b19db..73594e3d 100644
--- a/lib/fakegato/fakegato-history.js
+++ b/lib/fakegato/fakegato-history.js
@@ -479,6 +479,7 @@ module.exports = function (pHomebridge) {
 		}
 
 		addEntry(entry) {
+			entry.time = Math.round(new Date().valueOf() / 1000)
 			switch (this.accessoryType) {
 				case TYPE_DOOR:
 				case TYPE_MOTION:

From 1018a55e3890498af168026f63e884986e251a5b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 20 Dec 2020 12:38:02 +0000
Subject: [PATCH 0978/3183] structure

---
 lib/device/switch-single.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/device/switch-single.js b/lib/device/switch-single.js
index 9ef2b119..1159ea51 100644
--- a/lib/device/switch-single.js
+++ b/lib/device/switch-single.js
@@ -31,8 +31,9 @@ module.exports = class deviceSwitchSingle {
     try {
       await this.helpers.sleep(Math.floor(Math.random() * 491 + 10))
       callback()
-      const params = { switch: value ? 'on' : 'off' }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
+      await this.platform.sendDeviceUpdate(this.accessory, {
+        switch: value ? 'on' : 'off'
+      })
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
     }

From 55d8a11d1f451a4a944d56ec07e40241bcc6f63d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 20 Dec 2020 12:40:26 +0000
Subject: [PATCH 0979/3183] skip update if same

---
 lib/device/switch-single.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/device/switch-single.js b/lib/device/switch-single.js
index 1159ea51..b623b76e 100644
--- a/lib/device/switch-single.js
+++ b/lib/device/switch-single.js
@@ -41,7 +41,8 @@ module.exports = class deviceSwitchSingle {
 
   async externalUpdate (params) {
     try {
-      if (!this.helpers.hasProperty(params, 'switch')) return
+      if (!params.switch || params.switch === this.cacheOnOff) return
+      this.cacheOnOff = params.switch
       const newStatus = params.switch === 'on'
       this.switchService.updateCharacteristic(this.Characteristic.On, newStatus)
       this.accessory.eveLogger.addEntry({ status: newStatus ? 1 : 0 })

From e7be14c22305ccea1613d7a664abc3f890c05d89 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 20 Dec 2020 12:52:58 +0000
Subject: [PATCH 0980/3183] vars into fakegato

---
 lib/device/outlet-temp.js        |  9 +++------
 lib/device/outlet.js             |  7 ++-----
 lib/device/rf-bridge.js          | 13 +++++--------
 lib/device/scm.js                |  7 ++-----
 lib/device/sensor.js             |  9 +++------
 lib/device/switch-multi.js       |  9 +++------
 lib/device/switch-single.js      |  7 ++-----
 lib/device/switch-valve.js       |  7 ++-----
 lib/device/thermostat.js         |  7 ++-----
 lib/device/usb.js                |  7 ++-----
 lib/device/zb-dev.js             | 32 ++++++++++----------------------
 lib/fakegato/fakegato-history.js | 24 +++++++++---------------
 12 files changed, 45 insertions(+), 93 deletions(-)

diff --git a/lib/device/outlet-temp.js b/lib/device/outlet-temp.js
index 4fb73e26..0e85dda9 100644
--- a/lib/device/outlet-temp.js
+++ b/lib/device/outlet-temp.js
@@ -34,10 +34,7 @@ module.exports = class deviceOutletTemp {
       this.humiService = accessory.getService(this.Service.HumiditySensor) || accessory.addService(this.Service.HumiditySensor)
     }
     accessory.log = this.log
-    accessory.eveLogger = new this.platform.eveService('custom', accessory, {
-      storage: 'fs',
-      path: this.platform.eveLogPath
-    })
+    accessory.eveService = new this.platform.eveService('custom', accessory)
     this.accessory = accessory
   }
 
@@ -62,7 +59,7 @@ module.exports = class deviceOutletTemp {
       ) {
         const newState = this.helpers.hasProperty(params, 'switch') ? params.switch === 'on' : params.mainSwitch === 'on'
         this.switchService.updateCharacteristic(this.Characteristic.On, newState)
-        this.accessory.eveLogger.addEntry({ status: newState ? 1 : 0 })
+        this.accessory.eveService.addEntry({ status: newState ? 1 : 0 })
       }
       const eveLog = {}
       if (this.helpers.hasProperty(params, 'currentTemperature') && params.currentTemperature !== 'unavailable') {
@@ -80,7 +77,7 @@ module.exports = class deviceOutletTemp {
         eveLog.humidity = currentHumi
       }
       if (this.helpers.hasProperty(eveLog, 'temp') || this.helpers.hasProperty(eveLog, 'humidity')) {
-        this.accessory.eveLogger.addEntry(eveLog)
+        this.accessory.eveService.addEntry(eveLog)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
diff --git a/lib/device/outlet.js b/lib/device/outlet.js
index 01fc3840..0a9589f3 100644
--- a/lib/device/outlet.js
+++ b/lib/device/outlet.js
@@ -108,10 +108,7 @@ module.exports = class deviceOutlet {
         this.outletService.updateCharacteristic(this.eveTotalConsumption, 0)
       })
     accessory.log = this.log
-    accessory.eveLogger = new this.platform.eveService('energy', accessory, {
-      storage: 'fs',
-      path: this.platform.eveLogPath
-    })
+    accessory.eveService = new this.platform.eveService('energy', accessory)
     setInterval(() => {
       let total = 0
       if (accessory.context.energyReadings.length > 0) {
@@ -151,7 +148,7 @@ module.exports = class deviceOutlet {
           .updateCharacteristic(this.Characteristic.OutletInUse, parseFloat(params.power) > this.inUsePowerThreshold)
           .updateCharacteristic(this.eveCurrentConsumption, parseFloat(params.power))
         const isOn = this.accessory.getService(this.Service.Outlet).getCharacteristic(this.Characteristic.On).value
-        this.accessory.eveLogger.addEntry({ power: isOn ? parseFloat(params.power) : 0 })
+        this.accessory.eveService.addEntry({ power: isOn ? parseFloat(params.power) : 0 })
         this.accessory.context.energyReadings.push(parseFloat(params.power))
       }
       if (this.helpers.hasProperty(params, 'voltage')) {
diff --git a/lib/device/rf-bridge.js b/lib/device/rf-bridge.js
index e9b3fec0..9d078be4 100644
--- a/lib/device/rf-bridge.js
+++ b/lib/device/rf-bridge.js
@@ -81,10 +81,7 @@ module.exports = class deviceRFBridge {
       const service = accessory.getService(serv) || accessory.addService(serv)
       service.updateCharacteristic(char, 0)
       accessory.log = this.log
-      accessory.eveLogger = new this.platform.eveService(eveType, accessory, {
-        storage: 'fs',
-        path: this.platform.eveLogPath
-      })
+      accessory.eveService = new this.platform.eveService(eveType, accessory)
     }
     this.accessory = accessory
   }
@@ -187,7 +184,7 @@ module.exports = class deviceRFBridge {
                     char = this.Characteristic.ContactSensorState
                     oAccessory.getService(serv).updateCharacteristic(
                       this.eveLastActivation,
-                      Math.round(new Date().valueOf() / 1000) - oAccessory.eveLogger.getInitialTime()
+                      Math.round(new Date().valueOf() / 1000) - oAccessory.eveService.getInitialTime()
                     )
                     break
                   case 'occupancy':
@@ -199,15 +196,15 @@ module.exports = class deviceRFBridge {
                     char = this.Characteristic.MotionDetected
                     oAccessory.getService(serv).updateCharacteristic(
                       this.eveLastActivation,
-                      Math.round(new Date().valueOf() / 1000) - oAccessory.eveLogger.getInitialTime()
+                      Math.round(new Date().valueOf() / 1000) - oAccessory.eveService.getInitialTime()
                     )
                     break
                 }
                 oAccessory.getService(serv).updateCharacteristic(char, 1)
-                oAccessory.eveLogger.addEntry({ status: 1 })
+                oAccessory.eveService.addEntry({ status: 1 })
                 await this.helpers.sleep(sensorTimeLength * 1000)
                 oAccessory.getService(serv).updateCharacteristic(char, 0)
-                oAccessory.eveLogger.addEntry({ status: 0 })
+                oAccessory.eveService.addEntry({ status: 0 })
               }
             }
           })
diff --git a/lib/device/scm.js b/lib/device/scm.js
index 4aef23b8..b5a8df63 100644
--- a/lib/device/scm.js
+++ b/lib/device/scm.js
@@ -14,10 +14,7 @@ module.exports = class deviceSCM {
       .getCharacteristic(this.Characteristic.On)
       .on('set', this.internalUpdate.bind(this))
     accessory.log = this.log
-    accessory.eveLogger = new this.platform.eveService('switch', accessory, {
-      storage: 'fs',
-      path: this.platform.eveLogPath
-    })
+    accessory.eveService = new this.platform.eveService('switch', accessory)
     this.accessory = accessory
   }
 
@@ -36,7 +33,7 @@ module.exports = class deviceSCM {
     try {
       if (!this.helpers.hasProperty(params, 'switches')) return
       this.switchService.updateCharacteristic(this.Characteristic.On, params.switches[0].switch === 'on')
-      this.accessory.eveLogger.addEntry({ status: params.switches[0].switch === 'on' ? 1 : 0 })
+      this.accessory.eveService.addEntry({ status: params.switches[0].switch === 'on' ? 1 : 0 })
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
diff --git a/lib/device/sensor.js b/lib/device/sensor.js
index 2399a1cd..d0bee14b 100644
--- a/lib/device/sensor.js
+++ b/lib/device/sensor.js
@@ -31,10 +31,7 @@ module.exports = class deviceSensor {
     this.contactService = accessory.getService(this.Service.ContactSensor) || accessory.addService(this.Service.ContactSensor)
     this.batteryService = accessory.getService(this.Service.BatteryService) || accessory.addService(this.Service.BatteryService)
     accessory.log = this.log
-    accessory.eveLogger = new this.platform.eveService('door', accessory, {
-      storage: 'fs',
-      path: this.platform.eveLogPath
-    })
+    accessory.eveService = new this.platform.eveService('door', accessory)
     this.accessory = accessory
   }
 
@@ -50,11 +47,11 @@ module.exports = class deviceSensor {
       const newState = params.switch === 'on' ? 1 : 0
       let oAccessory = false
       this.contactService.updateCharacteristic(this.Characteristic.ContactSensorState, newState)
-      this.accessory.eveLogger.addEntry({ status: newState })
+      this.accessory.eveService.addEntry({ status: newState })
       if (newState) {
         this.contactService.updateCharacteristic(
           this.eveLastActivation,
-          Math.round(new Date().valueOf() / 1000) - this.accessory.eveLogger.getInitialTime()
+          Math.round(new Date().valueOf() / 1000) - this.accessory.eveService.getInitialTime()
         )
       }
       this.platform.cusG.forEach(async group => {
diff --git a/lib/device/switch-multi.js b/lib/device/switch-multi.js
index 53aa745d..f5c294c0 100644
--- a/lib/device/switch-multi.js
+++ b/lib/device/switch-multi.js
@@ -20,10 +20,7 @@ module.exports = class deviceSwitchMulti {
       accessory.removeService(accessory.getService(this.Service.Lightbulb))
     }
     accessory.log = this.log
-    accessory.eveLogger = new this.platform.eveService('switch', accessory, {
-      storage: 'fs',
-      path: this.platform.eveLogPath
-    })
+    accessory.eveService = new this.platform.eveService('switch', accessory)
     this.accessory = accessory
   }
 
@@ -95,12 +92,12 @@ module.exports = class deviceSwitchMulti {
           oAccessory
             .getService(this.Service.Switch)
             .updateCharacteristic(this.Characteristic.On, params.switches[i - 1].switch === 'on')
-          oAccessory.eveLogger.addEntry({ status: params.switches[i - 1].switch === 'on' ? 1 : 0 })
+          oAccessory.eveService.addEntry({ status: params.switches[i - 1].switch === 'on' ? 1 : 0 })
         }
       }
       if (!this.platform.hiddenMasters.includes(this.accessory.context.eweDeviceId)) {
         this.switchService.updateCharacteristic(this.Characteristic.On, primaryState)
-        this.accessory.eveLogger.addEntry({ status: primaryState ? 1 : 0 })
+        this.accessory.eveService.addEntry({ status: primaryState ? 1 : 0 })
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
diff --git a/lib/device/switch-single.js b/lib/device/switch-single.js
index b623b76e..ebff00a1 100644
--- a/lib/device/switch-single.js
+++ b/lib/device/switch-single.js
@@ -20,10 +20,7 @@ module.exports = class deviceSwitchSingle {
       accessory.removeService(accessory.getService(this.Service.Lightbulb))
     }
     accessory.log = this.log
-    accessory.eveLogger = new this.platform.eveService('switch', accessory, {
-      storage: 'fs',
-      path: this.platform.eveLogPath
-    })
+    accessory.eveService = new this.platform.eveService('switch', accessory)
     this.accessory = accessory
   }
 
@@ -45,7 +42,7 @@ module.exports = class deviceSwitchSingle {
       this.cacheOnOff = params.switch
       const newStatus = params.switch === 'on'
       this.switchService.updateCharacteristic(this.Characteristic.On, newStatus)
-      this.accessory.eveLogger.addEntry({ status: newStatus ? 1 : 0 })
+      this.accessory.eveService.addEntry({ status: newStatus ? 1 : 0 })
       if (this.debugDevice && params.updateSource) {
         this.log('[%s] reported status [%s].', this.accessory.displayName, newStatus ? 'on' : 'off')
       }
diff --git a/lib/device/switch-valve.js b/lib/device/switch-valve.js
index c3572289..80b2573a 100644
--- a/lib/device/switch-valve.js
+++ b/lib/device/switch-valve.js
@@ -36,10 +36,7 @@ module.exports = class deviceSwitchValve {
         callback()
       })
     accessory.log = this.log
-    accessory.eveLogger = new this.platform.eveService('switch', accessory, {
-      storage: 'fs',
-      path: this.platform.eveLogPath
-    })
+    accessory.eveService = new this.platform.eveService('switch', accessory)
     this.accessory = accessory
   }
 
@@ -87,7 +84,7 @@ module.exports = class deviceSwitchValve {
       if (!this.helpers.hasProperty(params, 'switches')) return
 
       this.switchService.updateCharacteristic(this.Characteristic.On, params.switches[0].switch === 'on')
-      this.accessory.eveLogger.addEntry({ status: params.switch === 'on' ? 1 : 0 })
+      this.accessory.eveService.addEntry({ status: params.switch === 'on' ? 1 : 0 })
       this.valveService
         .updateCharacteristic(this.Characteristic.Active, params.switches[1].switch === 'on' ? 1 : 0)
         .updateCharacteristic(this.Characteristic.InUse, params.switches[1].switch === 'on' ? 1 : 0)
diff --git a/lib/device/thermostat.js b/lib/device/thermostat.js
index 327ff949..326be5e3 100644
--- a/lib/device/thermostat.js
+++ b/lib/device/thermostat.js
@@ -42,10 +42,7 @@ module.exports = class deviceThermostat {
       this.service.addCharacteristic(this.Characteristic.CurrentRelativeHumidity)
     }
     accessory.log = this.log
-    accessory.eveLogger = new this.platform.eveService('custom', accessory, {
-      storage: 'fs',
-      path: this.platform.eveLogPath
-    })
+    accessory.eveService = new this.platform.eveService('custom', accessory)
     this.accessory = accessory
   }
 
@@ -98,7 +95,7 @@ module.exports = class deviceThermostat {
         eveLog.humidity = currentHumi
       }
       if (this.helpers.hasProperty(eveLog, 'temp') || this.helpers.hasProperty(eveLog, 'humidity')) {
-        this.accessory.eveLogger.addEntry(eveLog)
+        this.accessory.eveService.addEntry(eveLog)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
diff --git a/lib/device/usb.js b/lib/device/usb.js
index 47a983b8..216d7ff4 100644
--- a/lib/device/usb.js
+++ b/lib/device/usb.js
@@ -24,10 +24,7 @@ module.exports = class deviceUSB {
       .getCharacteristic(this.Characteristic.On)
       .on('set', this.internalUpdate.bind(this))
     accessory.log = this.log
-    accessory.eveLogger = new this.platform.eveService('switch', accessory, {
-      storage: 'fs',
-      path: this.platform.eveLogPath
-    })
+    accessory.eveService = new this.platform.eveService('switch', accessory)
     this.accessory = accessory
   }
 
@@ -46,7 +43,7 @@ module.exports = class deviceUSB {
     try {
       if (!this.helpers.hasProperty(params, 'switches')) return
       this.service.updateCharacteristic(this.Characteristic.On, params.switches[0].switch === 'on')
-      this.accessory.eveLogger.addEntry({ status: params.switches[0].switch === 'on' ? 1 : 0 })
+      this.accessory.eveService.addEntry({ status: params.switches[0].switch === 'on' ? 1 : 0 })
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
diff --git a/lib/device/zb-dev.js b/lib/device/zb-dev.js
index 7158fc4e..78cbe3e7 100644
--- a/lib/device/zb-dev.js
+++ b/lib/device/zb-dev.js
@@ -52,10 +52,7 @@ module.exports = class deviceZBDev {
         if (accessory.getService(this.Service.BatteryService)) accessory.removeService(accessory.getService(this.Service.BatteryService))
         if (!accessory.getService(this.Service.Switch)) accessory.addService(this.Service.Switch)
         accessory.log = this.log
-        accessory.eveLogger = new this.platform.eveService('switch', accessory, {
-          storage: 'fs',
-          path: this.platform.eveLogPath
-        })
+        accessory.eveService = new this.platform.eveService('switch', accessory)
         accessory.getService(this.Service.Switch)
           .getCharacteristic(this.Characteristic.On)
           .on('set', this.internalUpdate.bind(this))
@@ -69,29 +66,20 @@ module.exports = class deviceZBDev {
           })
         if (!accessory.getService(this.Service.HumiditySensor)) accessory.addService(this.Service.HumiditySensor)
         accessory.log = this.log
-        accessory.eveLogger = new this.platform.eveService('weather', accessory, {
-          storage: 'fs',
-          path: this.platform.eveLogPath
-        })
+        accessory.eveService = new this.platform.eveService('weather', accessory)
         break
       }
       case 2026:
         if (!accessory.getService(this.Service.BatteryService)) accessory.addService(this.Service.BatteryService)
         if (!accessory.getService(this.Service.MotionSensor)) accessory.addService(this.Service.MotionSensor)
         accessory.log = this.log
-        accessory.eveLogger = new this.platform.eveService('motion', accessory, {
-          storage: 'fs',
-          path: this.platform.eveLogPath
-        })
+        accessory.eveService = new this.platform.eveService('motion', accessory)
         break
       case 3026:
         if (!accessory.getService(this.Service.BatteryService)) accessory.addService(this.Service.BatteryService)
         if (!accessory.getService(this.Service.ContactSensor)) accessory.addService(this.Service.ContactSensor)
         accessory.log = this.log
-        accessory.eveLogger = new this.platform.eveService('door', accessory, {
-          storage: 'fs',
-          path: this.platform.eveLogPath
-        })
+        accessory.eveService = new this.platform.eveService('door', accessory)
         break
     }
     this.accessory = accessory
@@ -136,7 +124,7 @@ module.exports = class deviceZBDev {
             this.accessory
               .getService(this.Service.Switch)
               .updateCharacteristic(this.Characteristic.On, params.switch === 'on')
-            this.accessory.eveLogger.addEntry({ status: params.switch === 'on' ? 1 : 0 })
+            this.accessory.eveService.addEntry({ status: params.switch === 'on' ? 1 : 0 })
           }
           break
         case 1770: {
@@ -162,7 +150,7 @@ module.exports = class deviceZBDev {
             }
           }
           if (this.helpers.hasProperty(eveLog, 'temp') || this.helpers.hasProperty(eveLog, 'humidity')) {
-            this.accessory.eveLogger.addEntry(eveLog)
+            this.accessory.eveService.addEntry(eveLog)
           }
           break
         }
@@ -174,11 +162,11 @@ module.exports = class deviceZBDev {
               this.helpers.hasProperty(params, 'updateSource') &&
               params.motion === 1 &&
               diff < this.sensorTimeDifference
-            this.accessory.eveLogger.addEntry({ status: motionDetected ? 1 : 0 })
+            this.accessory.eveService.addEntry({ status: motionDetected ? 1 : 0 })
             if (motionDetected) {
               this.accessory.getService(this.Service.MotionSensor).updateCharacteristic(
                 this.eveLastActivation,
-                Math.round(new Date().valueOf() / 1000) - this.accessory.eveLogger.getInitialTime()
+                Math.round(new Date().valueOf() / 1000) - this.accessory.eveService.getInitialTime()
               )
             }
             this.accessory.getService(this.Service.MotionSensor).updateCharacteristic(this.Characteristic.MotionDetected, motionDetected)
@@ -190,12 +178,12 @@ module.exports = class deviceZBDev {
             this.accessory
               .getService(this.Service.ContactSensor)
               .updateCharacteristic(this.Characteristic.ContactSensorState, params.lock)
-            this.accessory.eveLogger.addEntry({ status: params.lock })
+            this.accessory.eveService.addEntry({ status: params.lock })
           }
           if (params.lock) {
             this.accessory.getService(this.Service.ContactSensor).updateCharacteristic(
               this.eveLastActivation,
-              Math.round(new Date().valueOf() / 1000) - this.accessory.eveLogger.getInitialTime()
+              Math.round(new Date().valueOf() / 1000) - this.accessory.eveService.getInitialTime()
             )
           }
           break
diff --git a/lib/fakegato/fakegato-history.js b/lib/fakegato/fakegato-history.js
index 73594e3d..d6efe4cc 100644
--- a/lib/fakegato/fakegato-history.js
+++ b/lib/fakegato/fakegato-history.js
@@ -140,7 +140,7 @@ module.exports = function (pHomebridge) {
 	FakeGatoHistoryService.UUID = 'E863F007-079E-48FF-8F27-9C2605A29F52';
 	var thisAccessory = {};
 	class FakeGatoHistory extends Service {
-		constructor(accessoryType, accessory, optionalParams) {
+		constructor(accessoryType, accessory) {
 
 			super(accessory.displayName + " History", FakeGatoHistoryService.UUID);
 
@@ -154,21 +154,15 @@ module.exports = function (pHomebridge) {
 			this.signatures = [];
 			this.uuid = require('./uuid.js');
 
-			if (typeof (optionalParams) === 'object') {
-				this.size = optionalParams.size || 4032;
-				this.minutes = optionalParams.minutes || 10; // Optional timer length
-				this.storage = optionalParams.storage; // 'fs' or 'googleDrive'
-				this.path = optionalParams.path || optionalParams.folder || (this.storage == 'fs' ? homebridge.user.storagePath() : undefined);
-				this.filename = optionalParams.filename;
-				this.disableTimer = optionalParams.disableTimer || false;
-				this.disableRepeatLastData = optionalParams.disableRepeatLastData || false;
-				this.log = optionalParams.log || thisAccessory.log || {};		// workaround for typescript blocking of changing of accessory object definition
-			} else {
+
 				this.size = 4032;
 				this.minutes = 10;
+				this.storage = 'fs';
+				this.path = homebridge.user.storagePath() + '/persist/';
 				this.disableTimer = false;
-				this.log = thisAccessory.log || {};
-			}
+				this.disableRepeatLastData = false;
+				this.log = thisAccessory.log || {};		// workaround for typescript blocking of changing of accessory object definition
+
 
 			if (!this.log.debug) {
 				this.log.debug = function () { };
@@ -192,8 +186,8 @@ module.exports = function (pHomebridge) {
 				homebridge.globalFakeGatoStorage.addWriter(this, {
 					storage: this.storage,
 					path: this.path,
-					filename: this.filename,
-					keyPath: optionalParams.keyPath || homebridge.user.storagePath() || undefined,
+					filename: undefined,
+					keyPath: homebridge.user.storagePath() || undefined,
 					onReady: function () {
 
 						this.load(function (err, loaded) {

From a09f750f6a9ca83c2cbb156a2824bf858bf90132 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 20 Dec 2020 13:00:15 +0000
Subject: [PATCH 0981/3183] only update if different

---
 lib/device/zb-dev.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/device/zb-dev.js b/lib/device/zb-dev.js
index 78cbe3e7..c0296e12 100644
--- a/lib/device/zb-dev.js
+++ b/lib/device/zb-dev.js
@@ -129,7 +129,8 @@ module.exports = class deviceZBDev {
           break
         case 1770: {
           const eveLog = {}
-          if (this.helpers.hasProperty(params, 'temperature')) {
+          if (params.temperature && params.temperature !== this.cacheTemp) {
+            this.cacheTemp = params.temperature
             const currentTemp = parseInt(params.temperature) / 100
             this.accessory
               .getService(this.Service.TemperatureSensor)
@@ -139,7 +140,8 @@ module.exports = class deviceZBDev {
             }
             eveLog.temp = currentTemp
           }
-          if (this.helpers.hasProperty(params, 'humidity')) {
+          if (params.humidity && params.humidity !== this.cacheHumi) {
+            this.cacheHumi = params.humidity
             const currentHumi = parseInt(params.humidity) / 100
             this.accessory
               .getService(this.Service.HumiditySensor)
@@ -149,9 +151,7 @@ module.exports = class deviceZBDev {
               this.log('[%s] reported humidity [%s].', this.accessory.displayName, currentHumi)
             }
           }
-          if (this.helpers.hasProperty(eveLog, 'temp') || this.helpers.hasProperty(eveLog, 'humidity')) {
-            this.accessory.eveService.addEntry(eveLog)
-          }
+          if (eveLog.temp || eveLog.humidity) this.accessory.eveService.addEntry(eveLog)
           break
         }
         case 2026:

From a0691e06e55397914ddd0ed83053e868bb03bf49 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 20 Dec 2020 13:00:24 +0000
Subject: [PATCH 0982/3183] formatting

---
 lib/device/zb-dev.js | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/lib/device/zb-dev.js b/lib/device/zb-dev.js
index c0296e12..10933e45 100644
--- a/lib/device/zb-dev.js
+++ b/lib/device/zb-dev.js
@@ -98,17 +98,11 @@ module.exports = class deviceZBDev {
   async externalUpdate (params) {
     try {
       //* ** credit @tasict ***\\
-      if (this.helpers.hasProperty(params, 'battery')) {
-        if (this.accessory.context.eweUIID === 3026 && this.platform.config.ZBDWBatt) {
-          params.battery *= 10
-        }
-        const batteryService =
-          this.accessory.getService(this.Service.BatteryService) || this.accessory.addService(this.Service.BatteryService)
-        batteryService.updateCharacteristic(this.Characteristic.BatteryLevel, params.battery)
-        batteryService.updateCharacteristic(
-          this.Characteristic.StatusLowBattery,
-          params.battery < this.lowBattThreshold
-        )
+      if (params.battery) {
+        if (this.accessory.context.eweUIID === 3026 && this.platform.config.ZBDWBatt) params.battery *= 10
+        const batt = this.accessory.getService(this.Service.BatteryService) || this.accessory.addService(this.Service.BatteryService)
+        batt.updateCharacteristic(this.Characteristic.BatteryLevel, params.battery)
+        batt.updateCharacteristic(this.Characteristic.StatusLowBattery, params.battery < this.lowBattThreshold)
       }
       switch (this.accessory.context.eweUIID) {
         case 1000:

From d7905ca1c85c04fd9459e3eb079dc2f7b2b76ac6 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 20 Dec 2020 13:03:55 +0000
Subject: [PATCH 0983/3183] remove old type checks

---
 lib/device/switch-multi.js  | 6 ------
 lib/device/switch-single.js | 3 ---
 2 files changed, 9 deletions(-)

diff --git a/lib/device/switch-multi.js b/lib/device/switch-multi.js
index f5c294c0..96c8bfe5 100644
--- a/lib/device/switch-multi.js
+++ b/lib/device/switch-multi.js
@@ -13,12 +13,6 @@ module.exports = class deviceSwitchMulti {
     this.switchService
       .getCharacteristic(this.Characteristic.On)
       .on('set', this.internalUpdate.bind(this))
-    if (accessory.getService(this.Service.Outlet)) {
-      accessory.removeService(accessory.getService(this.Service.Outlet))
-    }
-    if (accessory.getService(this.Service.Lightbulb)) {
-      accessory.removeService(accessory.getService(this.Service.Lightbulb))
-    }
     accessory.log = this.log
     accessory.eveService = new this.platform.eveService('switch', accessory)
     this.accessory = accessory
diff --git a/lib/device/switch-single.js b/lib/device/switch-single.js
index ebff00a1..d3352092 100644
--- a/lib/device/switch-single.js
+++ b/lib/device/switch-single.js
@@ -16,9 +16,6 @@ module.exports = class deviceSwitchSingle {
     if (accessory.getService(this.Service.Outlet)) {
       accessory.removeService(accessory.getService(this.Service.Outlet))
     }
-    if (accessory.getService(this.Service.Lightbulb)) {
-      accessory.removeService(accessory.getService(this.Service.Lightbulb))
-    }
     accessory.log = this.log
     accessory.eveService = new this.platform.eveService('switch', accessory)
     this.accessory = accessory

From 5bec71b2fc2d909fd3431727de0839e38f3698d3 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 20 Dec 2020 13:06:30 +0000
Subject: [PATCH 0984/3183] Update usb.js

---
 lib/device/usb.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/device/usb.js b/lib/device/usb.js
index 216d7ff4..53166006 100644
--- a/lib/device/usb.js
+++ b/lib/device/usb.js
@@ -41,7 +41,7 @@ module.exports = class deviceUSB {
 
   async externalUpdate (params) {
     try {
-      if (!this.helpers.hasProperty(params, 'switches')) return
+      if (!params.switches) return
       this.service.updateCharacteristic(this.Characteristic.On, params.switches[0].switch === 'on')
       this.accessory.eveService.addEntry({ status: params.switches[0].switch === 'on' ? 1 : 0 })
     } catch (err) {

From dffbe8c4e0ce315781d1c75ea6605080f3930388 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 20 Dec 2020 13:12:24 +0000
Subject: [PATCH 0985/3183] formatting and logging

---
 lib/index.js | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/lib/index.js b/lib/index.js
index 52f4a493..e90bbaae 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -765,15 +765,14 @@ class eWeLinkPlatform {
     this.log.warn('[%s] could not be updated as %s.', accessory.displayName, this.debug ? err : err.message)
 
     // *** We only request a device refresh on failed internal updates (ie with 'set' handlers) *** \\
-    if (requestRefresh) {
-      if (accessory.context.reachableWAN) {
-        try {
-          await this.wsClient.requestUpdate(accessory)
-          this.log.warn('[%s] requesting previous state to revert Homebridge state.', accessory.displayName)
-        } catch (err) {}
-      } else {
-        this.log.warn('[%s] Homebridge state will be synced once the device comes back online.', accessory.displayName)
-      }
+    if (!requestRefresh) return
+    if (accessory.context.reachableWAN) {
+      try {
+        await this.wsClient.requestUpdate(accessory)
+        this.log.warn('[%s] requesting previous state information to revert.', accessory.displayName)
+      } catch (err) {}
+    } else {
+      this.log.warn('[%s] state will be synced when device comes back online.', accessory.displayName)
     }
   }
 

From f99e4b29e2503a767c320c34364c6d2088f24cec Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 20 Dec 2020 13:12:56 +0000
Subject: [PATCH 0986/3183] 3.18.2-2

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index f3755e69..2f64b13a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.18.2-1",
+  "version": "3.18.2-2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 560d934b..f3465a7b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.18.2-1",
+  "version": "3.18.2-2",
   "author": "bwp91",
   "description": "Homebridge/HOOBS plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 7c7e243d37cc8063e1c644a4091f31d687ad5412 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 21 Dec 2020 08:20:04 +0000
Subject: [PATCH 0987/3183] remove option

---
 config.schema.json          | 6 ------
 lib/device/blind.js         | 1 -
 lib/device/curtain.js       | 1 -
 lib/device/diffuser.js      | 1 -
 lib/device/fan.js           | 1 -
 lib/device/garage-eachen.js | 1 -
 lib/device/garage-four.js   | 1 -
 lib/device/garage-two.js    | 1 -
 lib/device/garage.js        | 1 -
 lib/device/light-colour.js  | 1 -
 lib/device/light-ctemp.js   | 1 -
 lib/device/light-dimmer.js  | 1 -
 lib/device/lock.js          | 1 -
 lib/device/outlet-temp.js   | 1 -
 lib/device/outlet.js        | 1 -
 lib/device/rf-bridge.js     | 1 -
 lib/device/scm.js           | 1 -
 lib/device/sensor.js        | 1 -
 lib/device/switch-multi.js  | 1 -
 lib/device/switch-single.js | 5 ++---
 lib/device/switch-valve.js  | 1 -
 lib/device/template.js      | 1 -
 lib/device/thermostat.js    | 1 -
 lib/device/usb.js           | 1 -
 lib/device/valve-two.js     | 1 -
 lib/device/valve.js         | 1 -
 lib/device/zb-dev.js        | 9 ++++-----
 27 files changed, 6 insertions(+), 38 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 735a5017..83781774 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -45,11 +45,6 @@
         "type": "boolean",
         "description": "If checked, debug information will be added to the log."
       },
-      "debugDevice": {
-        "title": "Device Logging",
-        "type": "boolean",
-        "description": "If checked, device activity received from eWeLink will be added to the log."
-      },
       "debugReqRes": {
         "title": "Request & Response Logging",
         "type": "boolean",
@@ -378,7 +373,6 @@
         "disableHTTPRefresh",
         "disableLANMode",
         "debug",
-        "debugDevice",
         "debugReqRes",
         "disablePlugin"
       ]
diff --git a/lib/device/blind.js b/lib/device/blind.js
index 942a9661..b65abc4b 100644
--- a/lib/device/blind.js
+++ b/lib/device/blind.js
@@ -5,7 +5,6 @@ module.exports = class deviceBlind {
   constructor (platform, accessory) {
     this.platform = platform
     this.log = platform.log
-    this.debugDevice = platform.config.debugDevice || false
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
diff --git a/lib/device/curtain.js b/lib/device/curtain.js
index dbc87915..68543315 100644
--- a/lib/device/curtain.js
+++ b/lib/device/curtain.js
@@ -5,7 +5,6 @@ module.exports = class deviceCurtain {
   constructor (platform, accessory) {
     this.platform = platform
     this.log = platform.log
-    this.debugDevice = platform.config.debugDevice || false
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
diff --git a/lib/device/diffuser.js b/lib/device/diffuser.js
index 32089829..ca44c694 100644
--- a/lib/device/diffuser.js
+++ b/lib/device/diffuser.js
@@ -5,7 +5,6 @@ module.exports = class deviceDiffuser {
   constructor (platform, accessory) {
     this.platform = platform
     this.log = platform.log
-    this.debugDevice = platform.config.debugDevice || false
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
diff --git a/lib/device/fan.js b/lib/device/fan.js
index 9405da4a..5a909daa 100644
--- a/lib/device/fan.js
+++ b/lib/device/fan.js
@@ -5,7 +5,6 @@ module.exports = class deviceFan {
   constructor (platform, accessory) {
     this.platform = platform
     this.log = platform.log
-    this.debugDevice = platform.config.debugDevice || false
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
diff --git a/lib/device/garage-eachen.js b/lib/device/garage-eachen.js
index 7e4019a3..eb5981e0 100644
--- a/lib/device/garage-eachen.js
+++ b/lib/device/garage-eachen.js
@@ -5,7 +5,6 @@ module.exports = class deviceGarageEachen {
   constructor (platform, accessory) {
     this.platform = platform
     this.log = platform.log
-    this.debugDevice = platform.config.debugDevice || false
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
diff --git a/lib/device/garage-four.js b/lib/device/garage-four.js
index ccba0223..49068189 100644
--- a/lib/device/garage-four.js
+++ b/lib/device/garage-four.js
@@ -5,7 +5,6 @@ module.exports = class deviceGarageFour {
   constructor (platform, accessory) {
     this.platform = platform
     this.log = platform.log
-    this.debugDevice = platform.config.debugDevice || false
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
diff --git a/lib/device/garage-two.js b/lib/device/garage-two.js
index dcd3ceba..bf348721 100644
--- a/lib/device/garage-two.js
+++ b/lib/device/garage-two.js
@@ -5,7 +5,6 @@ module.exports = class deviceGarageTwo {
   constructor (platform, accessory) {
     this.platform = platform
     this.log = platform.log
-    this.debugDevice = platform.config.debugDevice || false
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
diff --git a/lib/device/garage.js b/lib/device/garage.js
index 73cd3bbc..7e086771 100644
--- a/lib/device/garage.js
+++ b/lib/device/garage.js
@@ -5,7 +5,6 @@ module.exports = class deviceGarage {
   constructor (platform, accessory) {
     this.platform = platform
     this.log = platform.log
-    this.debugDevice = platform.config.debugDevice || false
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
diff --git a/lib/device/light-colour.js b/lib/device/light-colour.js
index b3f8011f..27877d4b 100644
--- a/lib/device/light-colour.js
+++ b/lib/device/light-colour.js
@@ -5,7 +5,6 @@ module.exports = class deviceLightColour {
   constructor (platform, accessory) {
     this.platform = platform
     this.log = platform.log
-    this.debugDevice = platform.config.debugDevice || false
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
diff --git a/lib/device/light-ctemp.js b/lib/device/light-ctemp.js
index cc5076bd..c433b1f7 100644
--- a/lib/device/light-ctemp.js
+++ b/lib/device/light-ctemp.js
@@ -5,7 +5,6 @@ module.exports = class deviceLightColour {
   constructor (platform, accessory) {
     this.platform = platform
     this.log = platform.log
-    this.debugDevice = platform.config.debugDevice || false
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
diff --git a/lib/device/light-dimmer.js b/lib/device/light-dimmer.js
index 84623594..624cbd9e 100644
--- a/lib/device/light-dimmer.js
+++ b/lib/device/light-dimmer.js
@@ -5,7 +5,6 @@ module.exports = class deviceLightDimmer {
   constructor (platform, accessory) {
     this.platform = platform
     this.log = platform.log
-    this.debugDevice = platform.config.debugDevice || false
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
diff --git a/lib/device/lock.js b/lib/device/lock.js
index 6c502344..6297d9e2 100644
--- a/lib/device/lock.js
+++ b/lib/device/lock.js
@@ -5,7 +5,6 @@ module.exports = class deviceLock {
   constructor (platform, accessory) {
     this.platform = platform
     this.log = platform.log
-    this.debugDevice = platform.config.debugDevice || false
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
diff --git a/lib/device/outlet-temp.js b/lib/device/outlet-temp.js
index 0e85dda9..e328b287 100644
--- a/lib/device/outlet-temp.js
+++ b/lib/device/outlet-temp.js
@@ -5,7 +5,6 @@ module.exports = class deviceOutletTemp {
   constructor (platform, accessory) {
     this.platform = platform
     this.log = platform.log
-    this.debugDevice = platform.config.debugDevice || false
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
diff --git a/lib/device/outlet.js b/lib/device/outlet.js
index 0a9589f3..8d424447 100644
--- a/lib/device/outlet.js
+++ b/lib/device/outlet.js
@@ -6,7 +6,6 @@ module.exports = class deviceOutlet {
   constructor (platform, accessory) {
     this.platform = platform
     this.log = platform.log
-    this.debugDevice = platform.config.debugDevice || false
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
diff --git a/lib/device/rf-bridge.js b/lib/device/rf-bridge.js
index 9d078be4..fdd7f892 100644
--- a/lib/device/rf-bridge.js
+++ b/lib/device/rf-bridge.js
@@ -6,7 +6,6 @@ module.exports = class deviceRFBridge {
   constructor (platform, accessory) {
     this.platform = platform
     this.log = platform.log
-    this.debugDevice = platform.config.debugDevice || false
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
diff --git a/lib/device/scm.js b/lib/device/scm.js
index b5a8df63..fb4d377e 100644
--- a/lib/device/scm.js
+++ b/lib/device/scm.js
@@ -5,7 +5,6 @@ module.exports = class deviceSCM {
   constructor (platform, accessory) {
     this.platform = platform
     this.log = platform.log
-    this.debugDevice = platform.config.debugDevice || false
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
diff --git a/lib/device/sensor.js b/lib/device/sensor.js
index d0bee14b..3cd5e184 100644
--- a/lib/device/sensor.js
+++ b/lib/device/sensor.js
@@ -7,7 +7,6 @@ module.exports = class deviceSensor {
     this.platform = platform
     this.log = platform.log
     this.helpers = platform.helpers
-    this.debugDevice = platform.config.debugDevice || false
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
     const self = this
diff --git a/lib/device/switch-multi.js b/lib/device/switch-multi.js
index 96c8bfe5..3b614dc3 100644
--- a/lib/device/switch-multi.js
+++ b/lib/device/switch-multi.js
@@ -5,7 +5,6 @@ module.exports = class deviceSwitchMulti {
   constructor (platform, accessory) {
     this.platform = platform
     this.log = platform.log
-    this.debugDevice = platform.config.debugDevice || false
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
diff --git a/lib/device/switch-single.js b/lib/device/switch-single.js
index d3352092..5549860b 100644
--- a/lib/device/switch-single.js
+++ b/lib/device/switch-single.js
@@ -5,7 +5,6 @@ module.exports = class deviceSwitchSingle {
   constructor (platform, accessory) {
     this.platform = platform
     this.log = platform.log
-    this.debugDevice = platform.config.debugDevice || false
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
@@ -40,8 +39,8 @@ module.exports = class deviceSwitchSingle {
       const newStatus = params.switch === 'on'
       this.switchService.updateCharacteristic(this.Characteristic.On, newStatus)
       this.accessory.eveService.addEntry({ status: newStatus ? 1 : 0 })
-      if (this.debugDevice && params.updateSource) {
-        this.log('[%s] reported status [%s].', this.accessory.displayName, newStatus ? 'on' : 'off')
+      if (params.updateSource) {
+        this.log('[%s] current status [%s].', this.accessory.displayName, newStatus ? 'on' : 'off')
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
diff --git a/lib/device/switch-valve.js b/lib/device/switch-valve.js
index 80b2573a..aafba7ad 100644
--- a/lib/device/switch-valve.js
+++ b/lib/device/switch-valve.js
@@ -5,7 +5,6 @@ module.exports = class deviceSwitchValve {
   constructor (platform, accessory) {
     this.platform = platform
     this.log = platform.log
-    this.debugDevice = platform.config.debugDevice || false
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
diff --git a/lib/device/template.js b/lib/device/template.js
index 8a2d09ec..3a79f0e9 100644
--- a/lib/device/template.js
+++ b/lib/device/template.js
@@ -5,7 +5,6 @@ module.exports = class deviceTemplate {
   constructor (platform, accessory) {
     this.platform = platform
     this.log = platform.log
-    this.debugDevice = platform.config.debugDevice || false
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
diff --git a/lib/device/thermostat.js b/lib/device/thermostat.js
index 326be5e3..a8e13c46 100644
--- a/lib/device/thermostat.js
+++ b/lib/device/thermostat.js
@@ -5,7 +5,6 @@ module.exports = class deviceThermostat {
   constructor (platform, accessory) {
     this.platform = platform
     this.log = platform.log
-    this.debugDevice = platform.config.debugDevice || false
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
diff --git a/lib/device/usb.js b/lib/device/usb.js
index 53166006..031ce1b2 100644
--- a/lib/device/usb.js
+++ b/lib/device/usb.js
@@ -5,7 +5,6 @@ module.exports = class deviceUSB {
   constructor (platform, accessory) {
     this.platform = platform
     this.log = platform.log
-    this.debugDevice = platform.config.debugDevice || false
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
diff --git a/lib/device/valve-two.js b/lib/device/valve-two.js
index 1dd58261..b6915148 100644
--- a/lib/device/valve-two.js
+++ b/lib/device/valve-two.js
@@ -5,7 +5,6 @@ module.exports = class deviceValveTwo {
   constructor (platform, accessory) {
     this.platform = platform
     this.log = platform.log
-    this.debugDevice = platform.config.debugDevice || false
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
diff --git a/lib/device/valve.js b/lib/device/valve.js
index 7c7525fd..6611db2e 100644
--- a/lib/device/valve.js
+++ b/lib/device/valve.js
@@ -5,7 +5,6 @@ module.exports = class deviceValve {
   constructor (platform, accessory) {
     this.platform = platform
     this.log = platform.log
-    this.debugDevice = platform.config.debugDevice || false
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
diff --git a/lib/device/zb-dev.js b/lib/device/zb-dev.js
index 10933e45..b8dc85cf 100644
--- a/lib/device/zb-dev.js
+++ b/lib/device/zb-dev.js
@@ -5,7 +5,6 @@ const util = require('util')
 module.exports = class deviceZBDev {
   constructor (platform, accessory) {
     this.platform = platform
-    this.debugDevice = platform.config.debugDevice || false
     this.log = platform.log
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
@@ -129,8 +128,8 @@ module.exports = class deviceZBDev {
             this.accessory
               .getService(this.Service.TemperatureSensor)
               .updateCharacteristic(this.Characteristic.CurrentTemperature, currentTemp)
-            if (this.debugDevice && params.updateSource) {
-              this.log('[%s] reported temperture [%s].', this.accessory.displayName, currentTemp)
+            if (params.updateSource) {
+              this.log('[%s] current temperture [%s].', this.accessory.displayName, currentTemp)
             }
             eveLog.temp = currentTemp
           }
@@ -141,8 +140,8 @@ module.exports = class deviceZBDev {
               .getService(this.Service.HumiditySensor)
               .updateCharacteristic(this.Characteristic.CurrentRelativeHumidity, currentHumi)
             eveLog.humidity = currentHumi
-            if (this.debugDevice && params.updateSource) {
-              this.log('[%s] reported humidity [%s].', this.accessory.displayName, currentHumi)
+            if (params.updateSource) {
+              this.log('[%s] current humidity [%s].', this.accessory.displayName, currentHumi)
             }
           }
           if (eveLog.temp || eveLog.humidity) this.accessory.eveService.addEntry(eveLog)

From 5c918044938bf5507d4c77b63013acc7222b840a Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 21 Dec 2020 08:45:51 +0000
Subject: [PATCH 0988/3183] more logging

---
 lib/device/zb-dev.js | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/lib/device/zb-dev.js b/lib/device/zb-dev.js
index b8dc85cf..4a1d0660 100644
--- a/lib/device/zb-dev.js
+++ b/lib/device/zb-dev.js
@@ -117,6 +117,9 @@ module.exports = class deviceZBDev {
             this.accessory
               .getService(this.Service.Switch)
               .updateCharacteristic(this.Characteristic.On, params.switch === 'on')
+            if (params.updateSource) {
+              this.log('[%s] current status [%s].', this.accessory.displayName, params.switch)
+            }
             this.accessory.eveService.addEntry({ status: params.switch === 'on' ? 1 : 0 })
           }
           break
@@ -129,7 +132,7 @@ module.exports = class deviceZBDev {
               .getService(this.Service.TemperatureSensor)
               .updateCharacteristic(this.Characteristic.CurrentTemperature, currentTemp)
             if (params.updateSource) {
-              this.log('[%s] current temperture [%s].', this.accessory.displayName, currentTemp)
+              this.log('[%s] current temperature [%s].', this.accessory.displayName, currentTemp)
             }
             eveLog.temp = currentTemp
           }
@@ -156,6 +159,9 @@ module.exports = class deviceZBDev {
               params.motion === 1 &&
               diff < this.sensorTimeDifference
             this.accessory.eveService.addEntry({ status: motionDetected ? 1 : 0 })
+            if (params.updateSource) {
+              this.log('[%s] current status [motion%s detected].', this.accessory.displayName, motionDetected ? '' : ' not')
+            }
             if (motionDetected) {
               this.accessory.getService(this.Service.MotionSensor).updateCharacteristic(
                 this.eveLastActivation,
@@ -171,13 +177,16 @@ module.exports = class deviceZBDev {
             this.accessory
               .getService(this.Service.ContactSensor)
               .updateCharacteristic(this.Characteristic.ContactSensorState, params.lock)
+            if (params.updateSource) {
+              this.log('[%s] current status [contact%s detected].', this.accessory.displayName, params.lock === 0 ? '' : ' not')
+            }
             this.accessory.eveService.addEntry({ status: params.lock })
-          }
-          if (params.lock) {
-            this.accessory.getService(this.Service.ContactSensor).updateCharacteristic(
-              this.eveLastActivation,
-              Math.round(new Date().valueOf() / 1000) - this.accessory.eveService.getInitialTime()
-            )
+            if (params.lock === 1) {
+              this.accessory.getService(this.Service.ContactSensor).updateCharacteristic(
+                this.eveLastActivation,
+                Math.round(new Date().valueOf() / 1000) - this.accessory.eveService.getInitialTime()
+              )
+            }
           }
           break
         default:

From 9fa252e9a04273dab24da53780d1220c9d93a113 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 21 Dec 2020 08:46:38 +0000
Subject: [PATCH 0989/3183] 3.18.2-3

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 2f64b13a..d060ebdc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.18.2-2",
+  "version": "3.18.2-3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index f3465a7b..7e554e4e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.18.2-2",
+  "version": "3.18.2-3",
   "author": "bwp91",
   "description": "Homebridge/HOOBS plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 752497134dbd5beaeb56027ad573ee62bdd905f4 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 21 Dec 2020 10:54:45 +0000
Subject: [PATCH 0990/3183] changes to reqres logging

---
 lib/connection/lan.js | 17 +----------------
 lib/connection/ws.js  | 39 +++++++++++----------------------------
 lib/index.js          | 42 +++++++++++++++++++++++++++++++++++-------
 3 files changed, 47 insertions(+), 51 deletions(-)

diff --git a/lib/connection/lan.js b/lib/connection/lan.js
index d6c49604..d3f0c8b6 100644
--- a/lib/connection/lan.js
+++ b/lib/connection/lan.js
@@ -75,12 +75,11 @@ module.exports = class connectionLAN {
                 uiid: deviceInfo.uiid,
                 lastIV: rdata.iv
               })
-              if (this.debug) this.log.warn('[%s] updating IP address to [%s].', rdata.id, packet.address)
             }
             try {
               params = JSON.parse(pText)
             } catch (e) {
-              if (this.debug) this.log.warn('[%s] An error occured reading the LAN message [%s]', rdata.id, e)
+              this.log.warn('[%s] LAN message received could not be read [%s]:\n%s', rdata.id, e.pText)
               return
             }
             for (const param in params) {
@@ -97,12 +96,6 @@ module.exports = class connectionLAN {
                 deviceid: rdata.id,
                 params
               }
-              if (this.debugReqRes) {
-                const msg = JSON.stringify(returnTemplate, null, 2).replace(rdata.id, '**hidden**')
-                this.log('LAN message received.\n%s', msg)
-              } else if (this.debug) {
-                this.log('LAN message received.')
-              }
               this.emitter.emit('update', returnTemplate)
             }
           })
@@ -140,14 +133,6 @@ module.exports = class connectionLAN {
           selfApikey: '123',
           sequence: Date.now().toString()
         }
-        if (this.debugReqRes) {
-          const msg = JSON.stringify(json, null, 2)
-            .replace(json.apikey, '**hidden**')
-            .replace(json.deviceid, '**hidden**')
-          this.log.warn('LAN message sent. This text is yellow for clarity.\n%s', msg)
-        } else if (this.debug) {
-          this.log('LAN message sent.')
-        }
         const res = await (require('axios'))({
           method: 'post',
           url: 'http://' + this.deviceMap.get(json.deviceid).ip + ':8081/zeroconf/' + suffix,
diff --git a/lib/connection/ws.js b/lib/connection/ws.js
index 140ddee6..126eb76b 100644
--- a/lib/connection/ws.js
+++ b/lib/connection/ws.js
@@ -86,7 +86,7 @@ module.exports = class connectionWS {
             try {
               this.wsp.send('ping')
             } catch (err) {
-              if (this.debug) this.log('Error sending ping - %.', err.message)
+              this.log.warn('Error sending ping - %.', err.message)
             }
           }, (res.config.hbInterval + 7) * 1000)
         } else {
@@ -103,8 +103,12 @@ module.exports = class connectionWS {
       if (this.helpers.hasProperty(device, 'deviceid') && this.helpers.hasProperty(device, 'error')) {
         device.action = 'update'
         onlineStatus = device.error === 0
-        if (device.error !== 0 && this.debug) {
-          this.log.warn('WS message received.\n%s', JSON.stringify(device, null, 2).replace(this.apiKey, '**hidden**'))
+        if (device.error !== 0) {
+          this.log.warn(
+            '[%s] WS message received.\n%s',
+            device.deviceid,
+            JSON.stringify(device, null, 2).replace(this.apiKey, '**hidden**')
+          )
         }
       }
       if (this.helpers.hasProperty(device, 'action')) {
@@ -128,26 +132,18 @@ module.exports = class connectionWS {
                 deviceid: device.deviceid,
                 params: device.params
               }
-              if (this.debugReqRes) {
-                const msg = JSON.stringify(returnTemplate, null, 2).replace(device.deviceid, '**hidden**')
-                this.log('WS message received.\n%s', msg)
-              } else if (this.debug) {
-                this.log('WS message received.')
-              }
               this.emitter.emit('update', returnTemplate)
             }
             break
           case 'reportSubDevice':
             return
           default:
-            if (this.debug) {
-              this.log.warn('[%s] WS message has unknown action.\n' + JSON.stringify(device, null, 2), device.deviceid)
-            }
+            this.log.warn('[%s] WS message received has unknown action.\n', device.deviceid, JSON.stringify(device, null, 2))
         }
       } else if (this.helpers.hasProperty(device, 'error') && device.error === 0) {
         // *** Safe to ignore these messages *** \\
       } else {
-        if (this.debug) this.log.warn('WS unknown command received.\n' + JSON.stringify(device, null, 2))
+        this.log.warn('WS unknown command received.\n', JSON.stringify(device, null, 2))
       }
     })
     this.wsp.onClose.addListener(async e => {
@@ -194,12 +190,6 @@ module.exports = class connectionWS {
     }
     if (this.wsp && this.wsIsOpen) {
       try {
-        if (this.debugReqRes) {
-          const msg = JSON.stringify(jsonToSend, null, 2).replace(json.apikey, '**hidden**').replace(json.apiKey, '**hidden**').replace(json.deviceid, '**hidden**')
-          this.log.warn('WS message sent. This text is yellow for clarity.\n%s', msg)
-        } else if (this.debug) {
-          this.log('WS message sent.')
-        }
         const device = await this.wsp.sendRequest(jsonToSend, { requestId: sequence })
         device.error = this.helpers.hasProperty(device, 'error') ? device.error : 504
         switch (device.error) {
@@ -230,18 +220,11 @@ module.exports = class connectionWS {
       ts: 0,
       userAgent: 'app'
     }
+    if (this.debugReqRes || this.debug) this.log('[%s] requesting current status.', accessory.displayName)
     if (this.wsp && this.wsIsOpen) {
       this.wsp.send(JSON.stringify(json))
-      if (this.debugReqRes) {
-        const msg = JSON.stringify(json, null, 2)
-          .replace(json.apiKey, '**hidden**')
-          .replace(json.deviceid, '**hidden**')
-        this.log.warn('WS message sent. This text is yellow for clarity.\n%s', msg)
-      } else if (this.debug) {
-        this.log('WS message sent.')
-      }
     } else {
-      if (this.debug) this.log.warn('Command will be resent when WS is reconnected.')
+      if (this.debug) this.log.warn('[%s] request will be sent when WS is reconnected.', accessory.displayName)
       await this.helpers.sleep(30000)
       await this.requestUpdate(accessory)
     }
diff --git a/lib/index.js b/lib/index.js
index e90bbaae..5ec2ed50 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -22,6 +22,7 @@ class eWeLinkPlatform {
     this.Service = api.hap.Service
     this.eveService = require('./fakegato/fakegato-history')(api)
     this.debug = this.config.debug || false
+    this.debugReqRes = this.config.debugReqRes || false
     this.devicesInHB = new Map()
     this.devicesInEW = new Map()
     this.cusG = new Map()
@@ -122,7 +123,7 @@ class eWeLinkPlatform {
 
       // *** Log for informative purposes *** \\
       this.log("eWeLink sync complete. Don't forget to ⭐️  this plugin on GitHub if you're finding it useful!")
-      if (this.config.debugReqRes) {
+      if (this.debugReqRes) {
         this.log.warn("Note: 'Request & Response Logging' is not advised for long-term use.")
       }
     } catch (err) {
@@ -654,6 +655,17 @@ class eWeLinkPlatform {
     // *** Add a random delay of [1, 250]ms to avoid multiple http/ws requests a la vez
     await this.helpers.sleep(Math.floor(Math.random() * 250 + 1))
 
+    // *** Log the update being sent *** \\
+    if (this.debugReqRes) {
+      this.log.warn(
+        '[%s] sending update - this text is yellow for clarity.\n%s',
+        accessory.displayName,
+        JSON.stringify(params, null, 2)
+      )
+    } else if (this.debug) {
+      this.log('[%s] sending update.', accessory.displayName)
+    }
+
     // *** Set up the payload to send via LAN/WS *** \\
     const payload = {
       apikey: accessory.context.eweApiKey,
@@ -687,6 +699,15 @@ class eWeLinkPlatform {
 
     // *** Find our accessory for which the updates relates to *** \\
     if ((accessory = this.devicesInHB.get(deviceId + 'SWX') || this.devicesInHB.get(deviceId + 'SW0'))) {
+      if (this.debugReqRes) {
+        this.log(
+          '[%s] update received.\n%s',
+          accessory.displayName,
+          JSON.stringify(device.params, null, 2)
+        )
+      } else if (this.debug) {
+        this.log('[%s] update received via %s.', accessory.displayName, device.params.updateSource)
+      }
       const isX = accessory.context.hbDeviceId.substr(-1) === 'X'
       if (device.params.updateSource === 'WS') {
         // *** The update is from WS so update the WS online/offline status *** \\
@@ -694,7 +715,7 @@ class eWeLinkPlatform {
           accessory.context.reachableWAN = device.params.online
           this.devicesInHB.set(accessory.context.hbDeviceId, accessory)
           reachableChange = true
-          this.log.warn('[%s] reported [%sline] via [WS].', accessory.displayName, accessory.context.reachableWAN ? 'on' : 'off')
+          this.log('[%s] reported [%sline] via WS.', accessory.displayName, accessory.context.reachableWAN ? 'on' : 'off')
           if (accessory.context.reachableWAN) {
             try {
               this.wsClient.requestUpdate(accessory)
@@ -705,11 +726,11 @@ class eWeLinkPlatform {
         }
       }
       if (device.params.updateSource === 'LAN' && !accessory.context.reachableLAN) {
-        // *** The update is from LAN so update the LAN online/offline status *** \\
+        // *** The update is from LAN so it must be online *** \\
         accessory.context.reachableLAN = true
         this.devicesInHB.set(accessory.context.hbDeviceId, accessory)
         reachableChange = true
-        this.log.warn('[%s] has been reported [online] via [LAN].', accessory.displayName)
+        this.log.warn('[%s] has been reported [online] via LAN.', accessory.displayName)
         try {
           this.wsClient.requestUpdate(accessory)
         } catch (err) {
@@ -731,9 +752,6 @@ class eWeLinkPlatform {
           }
         }
       }
-      if (this.debug) {
-        this.log('[%s] %s update received and will be refreshed.', accessory.displayName, device.params.updateSource)
-      }
       try {
         // *** Update the accessory with the new data *** \\
         accessory.control.externalUpdate(device.params)
@@ -746,6 +764,16 @@ class eWeLinkPlatform {
         // *** Check to see it doesn't exist because it's user hidden *** \\
         if ((this.config.hideDevFromHB || '').split(',').includes(deviceId)) return
 
+        if (this.debugReqRes) {
+          this.log(
+            '[%s] update received for new device.\n%s',
+            device.name,
+            JSON.stringify(device.params, null, 2)
+          )
+        } else if (this.debug) {
+          this.log('[%s] update received for new device via %s.', device.name, device.params.updateSource)
+        }
+
         // *** Obtain full device information from the HTTP API *** \\
         const newDevice = await this.httpClient.getDevice(deviceId)
 

From a4122002d1c7586b1740fc5dc0a2dbf609200c0d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 21 Dec 2020 10:55:27 +0000
Subject: [PATCH 0991/3183] 3.18.2-4

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d060ebdc..d46567a2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.18.2-3",
+  "version": "3.18.2-4",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 7e554e4e..816cc5c0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.18.2-3",
+  "version": "3.18.2-4",
   "author": "bwp91",
   "description": "Homebridge/HOOBS plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 6ecccd026a936ba1d79bb841818d18d4bae8cc46 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 21 Dec 2020 12:20:10 +0000
Subject: [PATCH 0992/3183] [exp] white mode support

---
 lib/device/light-colour.js | 92 +++++++++++++++++++++++++++++++-------
 1 file changed, 76 insertions(+), 16 deletions(-)

diff --git a/lib/device/light-colour.js b/lib/device/light-colour.js
index 27877d4b..00b7c324 100644
--- a/lib/device/light-colour.js
+++ b/lib/device/light-colour.js
@@ -29,6 +29,11 @@ module.exports = class deviceLightColour {
           minStep: 100
         })
     }
+    if (accessory.context.eweUIID === 104) {
+      this.lightService
+        .getCharacteristic(this.Characteristic.ColorTemperature)
+        .on('set', this.internalCTempUpdate.bind(this))
+    }
     this.accessory = accessory
   }
 
@@ -67,14 +72,25 @@ module.exports = class deviceLightColour {
           }
           break
         case 104:
-        // *** GTLC104 needs the current rgb values sent too *** \\
-          params = {
-            ltype: 'color',
-            color: {
-              br: value,
-              r: this.accessory.context.cacheR,
-              g: this.accessory.context.cacheG,
-              b: this.accessory.context.cacheB
+          // *** B02-B-A60, B05-B-A60, GTLC104 *** \\
+          // *** need the current colour values sent too *** \\
+          if (this.cacheMode === 'white') {
+            params = {
+              ltype: 'white',
+              white: {
+                br: value,
+                ct: this.cacheCTemp
+              }
+            }
+          } else {
+            params = {
+              ltype: 'color',
+              color: {
+                br: value,
+                r: this.cacheR,
+                g: this.cacheG,
+                b: this.cacheB
+              }
             }
           }
           break
@@ -118,7 +134,7 @@ module.exports = class deviceLightColour {
           }
           break
         case 104:
-          // *** GTLC104 *** \\
+          // *** B02-B-A60, B05-B-A60, GTLC104 *** \\
           params = {
             ltype: 'color',
             color: {
@@ -128,9 +144,10 @@ module.exports = class deviceLightColour {
               br: this.lightService.getCharacteristic(this.Characteristic.Brightness).value
             }
           }
-          this.accessory.context.cacheR = newRGB[0]
-          this.accessory.context.cacheG = newRGB[1]
-          this.accessory.context.cacheB = newRGB[2]
+          this.cacheMode = 'colour'
+          this.cacheR = newRGB[0]
+          this.cacheG = newRGB[1]
+          this.cacheB = newRGB[2]
           break
       }
       await this.helpers.sleep(350)
@@ -141,6 +158,35 @@ module.exports = class deviceLightColour {
     }
   }
 
+  async internalCTempUpdate (value, callback) {
+    try {
+      await this.helpers.sleep(1500)
+      callback()
+      if (this.accessory.context.eweUIID !== 104) return
+      const updateKeyCTemp = Math.random().toString(36).substr(2, 8)
+      this.accessory.context.updateCTemp = updateKeyCTemp
+      // *** B02-B-A60, B05-B-A60, GTLC104 *** \\
+      // HomeKit has a ct range of 140-500 corresponding to 2000-7143K
+      // These devices have a range of 2700K-6500K corresponding to ct: 0-255
+      const kelvin = Math.max(Math.min(Math.round(1000000 / value), 6500), 2700)
+      const kToCT = Math.round(((kelvin - 2200) / 3800) * 255)
+      const params = {
+        ltype: 'white',
+        white: {
+          ct: kToCT,
+          br: this.lightService.getCharacteristic(this.Characteristic.Brightness).value
+        }
+      }
+      this.cacheMode = 'white'
+      this.cacheCTemp = kToCT
+      await this.helpers.sleep(350)
+      if (updateKeyCTemp !== this.accessory.context.updateKeyCTemp) return
+      await this.platform.sendDeviceUpdate(this.accessory, params)
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, true)
+    }
+  }
+
   async externalUpdate (params) {
     try {
       let newColour
@@ -190,7 +236,7 @@ module.exports = class deviceLightColour {
             }
             break
           case 104:
-            // *** GTLC104 *** \\
+            // *** B02-B-A60, B05-B-A60, GTLC104 *** \\
             if (this.helpers.hasProperty(params, 'ltype')) {
               mode = params.ltype
               if (mode === 'color' && this.helpers.hasProperty(params, 'color')) {
@@ -210,9 +256,23 @@ module.exports = class deviceLightColour {
                   this.lightService
                     .updateCharacteristic(this.Characteristic.Hue, newColour[0])
                     .updateCharacteristic(this.Characteristic.Saturation, 100)
-                  this.accessory.context.cacheR = params.color.r
-                  this.accessory.context.cacheG = params.color.g
-                  this.accessory.context.cacheB = params.color.b
+                  this.cacheMode = 'colour'
+                  this.cacheR = params.color.r
+                  this.cacheG = params.color.g
+                  this.cacheB = params.color.b
+                }
+              } else if (mode === 'white') {
+                if (this.helpers.hasProperty(params.white, 'br')) {
+                  this.lightService.updateCharacteristic(this.Characteristic.Brightness, params.white.br)
+                }
+                if (this.helpers.hasProperty(params.white, 'ct')) {
+                  // HomeKit has a ct range of 140-500 corresponding to 2000-7143K
+                  // These devices have a range of 2700K-6500K corresponding to ct: 0-255
+                  const ctToK = Math.round(params.white.ct / 255 * 3800 + 2200)
+                  const kToMired = Math.round(1000000 / ctToK)
+                  this.lightService.updateCharacteristic(this.Characteristic.ColorTemperature, kToMired)
+                  this.cacheMode = 'white'
+                  this.cacheCTemp = params.white.ct
                 }
               }
             }

From 3f637ac9f6d87bd6c5ae9fc3028bbbbbf177189b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 21 Dec 2020 12:20:55 +0000
Subject: [PATCH 0993/3183] 3.18.2-5

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d46567a2..a903b7e3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.18.2-4",
+  "version": "3.18.2-5",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 816cc5c0..254695d3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.18.2-4",
+  "version": "3.18.2-5",
   "author": "bwp91",
   "description": "Homebridge/HOOBS plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From e5573e81f6c0452bb5dd6057f20c32c2e1c84164 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 21 Dec 2020 13:28:36 +0000
Subject: [PATCH 0994/3183] changes to logging

---
 lib/connection/http.js | 25 +++++++-------------
 lib/connection/lan.js  |  2 +-
 lib/connection/ws.js   | 25 ++++++++------------
 lib/index.js           | 52 ++++++++++++++++--------------------------
 4 files changed, 39 insertions(+), 65 deletions(-)

diff --git a/lib/connection/http.js b/lib/connection/http.js
index 8bc6fcef..341272fd 100644
--- a/lib/connection/http.js
+++ b/lib/connection/http.js
@@ -40,11 +40,7 @@ module.exports = class connectionHTTP {
       dataToSign = this.crypto.createHmac('sha256', this.helpers.appSecret).update(dataToSign).digest('base64')
 
       // *** Log the data depending on the debug setting *** \\
-      if (this.debugReqRes) {
-        this.log.warn('Sending HTTP getHost() request. This text is yellow for clarity.\n%s', JSON.stringify(params, null, 2))
-      } else if (this.debug) {
-        this.log('Sending HTTP getHost() request.')
-      }
+      if (this.debug || this.debugReqRes) this.log('Sending HTTP getHost() request.')
 
       // *** Send the request *** \\
       const res = await this.axios.get('https://api.coolkit.cc:8080/api/user/region', {
@@ -72,11 +68,11 @@ module.exports = class connectionHTTP {
         default:
           throw new Error('No valid region received - [' + body.region + '].')
       }
-      if (this.debug) this.log('HTTP API host received [%s].', this.httpHost)
+      if (this.debug || this.debugReqRes) this.log('HTTP API host received [%s].', this.httpHost)
     } catch (err) {
       if (this.helpers.hasProperty(err, 'code') && this.helpers.httpRetryCodes.includes(err.code)) {
         // *** Retry if another attempt could be successful *** \\
-        if (this.debug) this.log.warn('Unable to reach eWeLink. Retrying in 30 seconds.')
+        this.log.warn('Unable to reach eWeLink. Retrying in 30 seconds.')
         await this.helpers.sleep(30000)
         return await this.getHost()
       } else {
@@ -99,12 +95,7 @@ module.exports = class connectionHTTP {
     }
 
     // *** Log the data depending on the debug setting *** \\
-    if (this.debugReqRes) {
-      const msg = JSON.stringify(data, null, 2).replace(this.password, '**hidden**').replace(this.username, '**hidden**')
-      this.log.warn('Sending HTTP login() request. This text is yellow for clarity.\n%s', msg)
-    } else if (this.debug) {
-      this.log('Sending HTTP login() request.')
-    }
+    if (this.debug || this.debugReqRes) this.log('Sending HTTP login() request.')
 
     // *** Set up the request signature *** \\
     const dataToSign = this.crypto.createHmac('sha256', this.helpers.appSecret).update(JSON.stringify(data)).digest('base64')
@@ -140,7 +131,7 @@ module.exports = class connectionHTTP {
         default:
           throw new Error('No valid region received - [' + givenRegion + '].')
       }
-      if (this.debug) this.log('New HTTP API host received [%s].', this.httpHost)
+      if (this.debug || this.debugReqRes) this.log('New HTTP API host received [%s].', this.httpHost)
       return await this.login()
     } else {
       if (body.data.at) {
@@ -155,7 +146,7 @@ module.exports = class connectionHTTP {
       } else {
         if (body.error === 500) {
           // *** Retry if another attempt could be successful *** \\
-          if (this.debug) this.log.warn('An eWeLink error [500] occured. Retrying in 30 seconds.')
+          this.log.warn('An eWeLink error [500] occured. Retrying in 30 seconds.')
           await this.helpers.sleep(30000)
           return await this.login()
         } else {
@@ -216,7 +207,7 @@ module.exports = class connectionHTTP {
     } catch (err) {
       if (this.helpers.hasProperty(err, 'code') && this.helpers.httpRetryCodes.includes(err.code)) {
         // *** Retry if another attempt could be successful *** \\
-        if (this.debug) this.log.warn('Unable to reach eWeLink. Retrying in 30 seconds.')
+        this.log.warn('Unable to reach eWeLink. Retrying in 30 seconds.')
         await this.helpers.sleep(30000)
         return await this.getDevices()
       } else {
@@ -261,7 +252,7 @@ module.exports = class connectionHTTP {
     } catch (err) {
       if (this.helpers.hasProperty(err, 'code') && this.helpers.httpRetryCodes.includes(err.code)) {
         // *** Retry if another attempt could be successful *** \\
-        if (this.debug) this.log.warn('Unable to reach eWeLink. Retrying in 30 seconds.')
+        this.log.warn('Unable to reach eWeLink. Retrying in 30 seconds.')
         await this.helpers.sleep(30000)
         return await this.getDevice(deviceId)
       } else {
diff --git a/lib/connection/lan.js b/lib/connection/lan.js
index d3f0c8b6..aa245127 100644
--- a/lib/connection/lan.js
+++ b/lib/connection/lan.js
@@ -171,6 +171,6 @@ module.exports = class connectionLAN {
 
   async closeConnection () {
     await this.dns.stopMonitoring()
-    if (this.debug) this.log('LAN monitoring gracefully stopped.')
+    if (this.debug || this.debugReqRes) this.log('LAN monitoring gracefully stopped.')
   }
 }
diff --git a/lib/connection/ws.js b/lib/connection/ws.js
index 126eb76b..81202bd4 100644
--- a/lib/connection/ws.js
+++ b/lib/connection/ws.js
@@ -35,11 +35,11 @@ module.exports = class connectionWS {
       if (!body.domain) {
         throw new Error('Server did not respond with a web socket host.')
       }
-      if (this.debug) this.log('Web socket host received [%s].', body.domain)
+      if (this.debug || this.debugReqRes) this.log('Web socket host received [%s].', body.domain)
       this.wsHost = body.domain
     } catch (err) {
       if (this.helpers.hasProperty(err, 'code') && this.helpers.httpRetryCodes.includes(err.code)) {
-        if (this.debug) this.log.warn('Unable to reach eWeLink. Retrying in 30 seconds.')
+        this.log.warn('Unable to reach eWeLink. Retrying in 30 seconds.')
         await this.helpers.sleep(30000)
         return await this.getHost()
       } else {
@@ -72,12 +72,7 @@ module.exports = class connectionWS {
         userAgent: 'app',
         version: 8
       }
-      if (this.debugReqRes) {
-        const msg = JSON.stringify(payload, null, 2).replace(this.aToken, '**hidden**').replace(this.apiKey, '**hidden**')
-        this.log.warn('Sending WS login request. This text is yellow for clarity.\n%s', msg)
-      } else if (this.debug) {
-        this.log('Sending WS login request.')
-      }
+      if (this.debug || this.debugReqRes) this.log('Sending WS login request.')
       try {
         const res = await this.wsp.sendRequest(payload, { requestId: sequence })
         if (this.helpers.hasProperty(res, 'config') && res.config.hb && res.config.hbInterval) {
@@ -86,14 +81,14 @@ module.exports = class connectionWS {
             try {
               this.wsp.send('ping')
             } catch (err) {
-              this.log.warn('Error sending ping - %.', err.message)
+              if (this.debug || this.debugReqRes) this.log.warn('Error sending ping - %.', err.message)
             }
           }, (res.config.hbInterval + 7) * 1000)
         } else {
           throw new Error('Unknown parameters received\n' + JSON.stringify(res, null, 2))
         }
       } catch (err) {
-        this.log.error('WS login failed [%s].', this.debug ? err : err.message)
+        this.log.warn('WS login failed [%s].', this.debug ? err : err.message)
       }
     })
     this.wsp.onUnpackedMessage.addListener(device => {
@@ -154,7 +149,7 @@ module.exports = class connectionWS {
       }
       this.wsp.removeAllListeners()
       if (e === 1005) return
-      if (this.debug) {
+      if (this.debug || this.debugReqRes) {
         this.log.warn('Web socket closed - [%s].', e)
         this.log.warn('Web socket will try to reconnect in five seconds.')
       }
@@ -168,7 +163,7 @@ module.exports = class connectionWS {
         this.hbInterval = null
       }
       this.wsp.removeAllListeners()
-      if (this.debug) {
+      if (this.debug || this.debugReqRes) {
         this.log.warn('Web socket error - [%s].', e)
         this.log.warn('Web socket will try to reconnect in five seconds.')
       }
@@ -203,7 +198,7 @@ module.exports = class connectionWS {
         return new Error('device update failed as ' + msg)
       }
     } else {
-      if (this.debug) this.log.warn('Command will be resent when WS is reconnected.')
+      this.log.warn('Request will be sent when WS has reconnected.')
       await this.helpers.sleep(30000)
       await this.sendUpdate(json)
     }
@@ -224,7 +219,7 @@ module.exports = class connectionWS {
     if (this.wsp && this.wsIsOpen) {
       this.wsp.send(JSON.stringify(json))
     } else {
-      if (this.debug) this.log.warn('[%s] request will be sent when WS is reconnected.', accessory.displayName)
+      this.log.warn('[%s] request will be sent when WS has reconnected.', accessory.displayName)
       await this.helpers.sleep(30000)
       await this.requestUpdate(accessory)
     }
@@ -237,7 +232,7 @@ module.exports = class connectionWS {
   async closeConnection () {
     if (this.wsp && this.wsIsOpen) {
       await this.wsp.close()
-      if (this.debug) this.log('Web socket gracefully closed.')
+      if (this.debug || this.debugReqRes) this.log('Web socket gracefully closed.')
     }
   }
 }
diff --git a/lib/index.js b/lib/index.js
index 5ec2ed50..174b3182 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -117,7 +117,7 @@ class eWeLinkPlatform {
             await this.wsClient.login()
           }
         } catch (err) {
-          this.log.warn(this.debug ? err : err.message)
+          this.log.warn(this.debug || this.debugReqRes ? err : err.message)
         }
       }, 3600000)
 
@@ -444,7 +444,7 @@ class eWeLinkPlatform {
               sensorTimeLength = this.cusS.get(device.deviceid + 'SW' + swNumber).sensorTimeLength
             }
           } else {
-            this.log(' → [%s] has an unsupported device type [%s].', device.name, subDevice.type || '?')
+            this.log.warn(' → [%s] has an unsupported device type [%s].', device.name, subDevice.type || '?')
             return
           }
           subExtraContext = {
@@ -507,26 +507,26 @@ class eWeLinkPlatform {
         accessory.control = new (require('./device/zb-dev'))(this, accessory)
         /***************/
       } else if (this.helpers.devicesCamera.includes(device.extra.uiid)) {
-        /******
-        CAMERAS
-        ******/
+        /*************
+        SONOFF CAMERAS
+        *************/
         this.log(' → [%s] see the homebridge-ewelink wiki for details to enable the camera.', device.name)
         return
-        /*****/
+        /************/
       } else if (this.helpers.devicesEweCamera.includes(device.extra.uiid)) {
-        /******
-        CAMERAS
-        ******/
-        this.log(' → [%s] plugin does not support the eWeLink camera.', device.name)
+        /******************
+        EWELINK APP CAMERAS
+        ******************/
+        this.log(' → [%s] has not been added as it is not supported.', device.name)
         return
-        /*****/
+        /*****************/
       } else {
-        /**********
-        UNSUPPORTED
-        **********/
+        /**************
+        UNKNOWN DEVICES
+        **************/
         this.log.warn(' → [%s] has not been added as it is not supported. Please make a GitHub issue request.', device.name)
         return
-        /*********/
+        /*************/
       }
 
       // *** Update the current firmware version *** \\
@@ -657,11 +657,7 @@ class eWeLinkPlatform {
 
     // *** Log the update being sent *** \\
     if (this.debugReqRes) {
-      this.log.warn(
-        '[%s] sending update - this text is yellow for clarity.\n%s',
-        accessory.displayName,
-        JSON.stringify(params, null, 2)
-      )
+      this.log.warn('[%s] sending update (yellow text for clarity).\n%s', accessory.displayName, JSON.stringify(params, null, 2))
     } else if (this.debug) {
       this.log('[%s] sending update.', accessory.displayName)
     }
@@ -684,7 +680,7 @@ class eWeLinkPlatform {
     if (res !== 'ok') {
       // *** Check to see if the device is online *** \\
       if (accessory.context.reachableWAN) {
-        if (this.debug) this.log('[%s] Reverting to web socket as %s.', accessory.displayName, res)
+        if (this.debug || this.debugReqRes) this.log('[%s] Reverting to web socket as %s.', accessory.displayName, res)
         await this.wsClient.sendUpdate(payload)
       } else {
         throw new Error("it is unreachable. It's status will be corrected once it is reachable")
@@ -700,11 +696,7 @@ class eWeLinkPlatform {
     // *** Find our accessory for which the updates relates to *** \\
     if ((accessory = this.devicesInHB.get(deviceId + 'SWX') || this.devicesInHB.get(deviceId + 'SW0'))) {
       if (this.debugReqRes) {
-        this.log(
-          '[%s] update received.\n%s',
-          accessory.displayName,
-          JSON.stringify(device.params, null, 2)
-        )
+        this.log('[%s] update received.\n%s', accessory.displayName, JSON.stringify(device.params, null, 2))
       } else if (this.debug) {
         this.log('[%s] update received via %s.', accessory.displayName, device.params.updateSource)
       }
@@ -730,7 +722,7 @@ class eWeLinkPlatform {
         accessory.context.reachableLAN = true
         this.devicesInHB.set(accessory.context.hbDeviceId, accessory)
         reachableChange = true
-        this.log.warn('[%s] has been reported [online] via LAN.', accessory.displayName)
+        this.log('[%s] has been reported [online] via LAN.', accessory.displayName)
         try {
           this.wsClient.requestUpdate(accessory)
         } catch (err) {
@@ -765,11 +757,7 @@ class eWeLinkPlatform {
         if ((this.config.hideDevFromHB || '').split(',').includes(deviceId)) return
 
         if (this.debugReqRes) {
-          this.log(
-            '[%s] update received for new device.\n%s',
-            device.name,
-            JSON.stringify(device.params, null, 2)
-          )
+          this.log('[%s] update received for new device.\n%s', device.name, JSON.stringify(device.params, null, 2))
         } else if (this.debug) {
           this.log('[%s] update received for new device via %s.', device.name, device.params.updateSource)
         }

From c6cb29cf70bd00908e193d2a655d761178a4db54 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 21 Dec 2020 13:28:39 +0000
Subject: [PATCH 0995/3183] Update light-colour.js

---
 lib/device/light-colour.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/device/light-colour.js b/lib/device/light-colour.js
index 00b7c324..66c902bb 100644
--- a/lib/device/light-colour.js
+++ b/lib/device/light-colour.js
@@ -33,6 +33,12 @@ module.exports = class deviceLightColour {
       this.lightService
         .getCharacteristic(this.Characteristic.ColorTemperature)
         .on('set', this.internalCTempUpdate.bind(this))
+      /*
+      if (platform.api.versionGreaterOrEqual && platform.api.versionGreaterOrEqual('1.3.0-beta.27')) {
+        this.alController = new platform.api.hap.AdaptiveLightingController(this.lightService)
+        accessory.configureController(this.alController)
+      }
+      */
     }
     this.accessory = accessory
   }

From 0f6b075138173f894a8a51989f3ae4f931f2cfa1 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 21 Dec 2020 13:30:20 +0000
Subject: [PATCH 0996/3183] 3.18.2-6

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index a903b7e3..7a200625 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.18.2-5",
+  "version": "3.18.2-6",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 254695d3..2799c9b6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.18.2-5",
+  "version": "3.18.2-6",
   "author": "bwp91",
   "description": "Homebridge/HOOBS plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From a8dc7f28e17549f2c648c3dc954db1dfe8ece83b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 21 Dec 2020 14:04:56 +0000
Subject: [PATCH 0997/3183] dont use context so much

---
 lib/device/blind.js         |  4 ++--
 lib/device/diffuser.js      | 14 +++++++-------
 lib/device/garage-eachen.js | 14 +++++++-------
 lib/device/garage-four.js   | 14 +++++++-------
 lib/device/garage-two.js    | 14 +++++++-------
 lib/device/garage.js        | 16 ++++++++--------
 lib/device/light-colour.js  | 22 ++++++++++++++--------
 lib/device/light-ctemp.js   | 22 +++++++++++-----------
 lib/device/light-dimmer.js  |  6 ++++--
 lib/device/lock.js          | 12 ++++++------
 lib/index.js                |  1 -
 11 files changed, 73 insertions(+), 66 deletions(-)

diff --git a/lib/device/blind.js b/lib/device/blind.js
index b65abc4b..3bbce7d0 100644
--- a/lib/device/blind.js
+++ b/lib/device/blind.js
@@ -38,7 +38,7 @@ module.exports = class deviceBlind {
       }
       if (newTarget === prevPosition) return
       params.switches = this.helpers.defaultMultiSwitchOff
-      this.accessory.context.updateKey = updateKey
+      this.updateKey = updateKey
       const percentStepPerDecisecond = blindConfig.operationTime / 100
       if (prevState !== 2) {
         await this.platform.sendDeviceUpdate(this.accessory, params)
@@ -62,7 +62,7 @@ module.exports = class deviceBlind {
       this.accessory.context.cachePositionState = setToMoveUp ? 1 : 0
       this.accessory.context.cacheLastStartTime = Math.floor(Date.now() / 100)
       await this.helpers.sleep(decisecondsToMove * 100)
-      if (this.accessory.context.updateKey !== updateKey) return
+      if (this.updateKey !== updateKey) return
       params.switches[0].switch = 'off'
       params.switches[1].switch = 'off'
       await this.platform.sendDeviceUpdate(this.accessory, params)
diff --git a/lib/device/diffuser.js b/lib/device/diffuser.js
index ca44c694..41335669 100644
--- a/lib/device/diffuser.js
+++ b/lib/device/diffuser.js
@@ -52,7 +52,7 @@ module.exports = class deviceDiffuser {
       if (value === 0) return
       value = value <= 75 ? 50 : 100
       const params = { state: value / 2 }
-      this.accessory.context.cacheState = value
+      this.cacheState = value
       await this.platform.sendDeviceUpdate(this.accessory, params)
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
@@ -74,12 +74,12 @@ module.exports = class deviceDiffuser {
       await this.helpers.sleep(1500)
       callback()
       const updateKeyBright = Math.random().toString(36).substr(2, 8)
-      this.accessory.context.updateKeyBright = updateKeyBright
+      this.updateKeyBright = updateKeyBright
       const params = {
         lightbright: value
       }
       await this.helpers.sleep(350)
-      if (updateKeyBright !== this.accessory.context.updateKeyBright) return
+      if (updateKeyBright !== this.updateKeyBright) return
       await this.platform.sendDeviceUpdate(this.accessory, params)
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
@@ -91,7 +91,7 @@ module.exports = class deviceDiffuser {
       await this.helpers.sleep(1500)
       callback()
       const updateKeyColour = Math.random().toString(36).substr(2, 8)
-      this.accessory.context.updateKeyColour = updateKeyColour
+      this.updateKeyColour = updateKeyColour
       await this.helpers.sleep(700)
       const newRGB = this.helpers.hs2rgb([
         value,
@@ -102,7 +102,7 @@ module.exports = class deviceDiffuser {
         lightGcolor: newRGB[1],
         lightBcolor: newRGB[2]
       }
-      if (updateKeyColour !== this.accessory.context.updateKeyColour) return
+      if (updateKeyColour !== this.updateKeyColour) return
       await this.platform.sendDeviceUpdate(this.accessory, params)
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
@@ -114,12 +114,12 @@ module.exports = class deviceDiffuser {
       if (this.helpers.hasProperty(params, 'switch')) {
         this.fanService.updateCharacteristic(this.Characteristic.On, params.switch === 'on')
         if (!this.helpers.hasProperty(params, 'state')) {
-          this.accessory.getService('Diffuser').updateCharacteristic(this.Characteristic.RotationSpeed, this.accessory.context.cacheState)
+          this.accessory.getService('Diffuser').updateCharacteristic(this.Characteristic.RotationSpeed, this.cacheState)
         }
       }
       if (this.helpers.hasProperty(params, 'state')) {
         this.fanService.updateCharacteristic(this.Characteristic.RotationSpeed, params.state * 50)
-        this.accessory.context.cacheState = params.state * 50
+        this.cacheState = params.state * 50
       }
       if (this.helpers.hasProperty(params, 'lightswitch')) {
         this.lightService.updateCharacteristic(this.Characteristic.On, params.lightswitch === 1)
diff --git a/lib/device/garage-eachen.js b/lib/device/garage-eachen.js
index eb5981e0..4c19c265 100644
--- a/lib/device/garage-eachen.js
+++ b/lib/device/garage-eachen.js
@@ -33,26 +33,26 @@ module.exports = class deviceGarageEachen {
       }
       const params = { switch: value === 0 ? 'on' : 'off' }
       if (value === this.gdService.getCharacteristic(this.Characteristic.CurrentDoorState).value % 2) return
-      this.accessory.context.inUse = true
+      this.inUse = true
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.gdService
         .updateCharacteristic(this.Characteristic.TargetDoorState, value)
         .updateCharacteristic(this.Characteristic.CurrentDoorState, value + 2)
       await this.helpers.sleep(2000)
-      this.accessory.context.inUse = false
+      this.inUse = false
       if (value === 0) {
         await this.helpers.sleep(Math.max((garageConfig.operationTime - 20) * 100, 0))
         this.gdService.updateCharacteristic(this.Characteristic.CurrentDoorState, 0)
       }
     } catch (err) {
-      this.accessory.context.inUse = false
+      this.inUse = false
       this.platform.deviceUpdateError(this.accessory, err, true)
     }
   }
 
   async externalUpdate (params) {
     try {
-      if (!this.helpers.hasProperty(params, 'switch') || this.accessory.context.inUse) return
+      if (!this.helpers.hasProperty(params, 'switch') || this.inUse) return
       let garageConfig
       if (!(garageConfig = this.platform.cusG.get(this.accessory.context.hbDeviceId))) {
         throw new Error('group config missing')
@@ -60,13 +60,13 @@ module.exports = class deviceGarageEachen {
       if (garageConfig.type !== 'garage_eachen') {
         throw new Error('improper configuration')
       }
-      this.accessory.context.inUse = true
+      this.inUse = true
       this.gdService
         .updateCharacteristic(this.Characteristic.TargetDoorState, params.switch === 'on' ? 0 : 1)
         .updateCharacteristic(this.Characteristic.CurrentDoorState, params.switch === 'on' ? 0 : 1)
-      this.accessory.context.inUse = false
+      this.inUse = false
     } catch (err) {
-      this.accessory.context.inUse = false
+      this.inUse = false
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
diff --git a/lib/device/garage-four.js b/lib/device/garage-four.js
index 49068189..5b6bf8ab 100644
--- a/lib/device/garage-four.js
+++ b/lib/device/garage-four.js
@@ -69,9 +69,9 @@ module.exports = class deviceGarageFour {
         : this.accessory.context.cacheStates[garageChannel].cacheCurrentDoorState
       if (value === prevState % 2) return
       const gdService = this.accessory.getService('Garage ' + garage)
-      this.accessory.context.inUse = true
+      this.inUse = true
       const updateKey = Math.random().toString(36).substr(2, 8)
-      this.accessory.context.updateKey = updateKey
+      this.updateKey = updateKey
       gdService
         .updateCharacteristic(this.Characteristic.TargetDoorState, value)
         .updateCharacteristic(this.Characteristic.CurrentDoorState, value + 2)
@@ -81,15 +81,15 @@ module.exports = class deviceGarageFour {
       ;[0, 1, 2, 3].forEach(i => (params.switches[i].switch = garageChannel === i ? 'on' : 'off'))
       await this.platform.sendDeviceUpdate(this.accessory, params)
       await this.helpers.sleep(2000)
-      this.accessory.context.inUse = false
+      this.inUse = false
       await this.helpers.sleep(Math.max((garageConfig.operationTime - 20) * 100, 0))
-      if (this.accessory.context.updateKey !== updateKey || sAccessory) return
+      if (this.updateKey !== updateKey || sAccessory) return
       if (!sAccessory) {
         gdService.updateCharacteristic(this.Characteristic.CurrentDoorState, value)
         this.accessory.context.cacheStates[garageChannel].cacheCurrentDoorState = value
       }
     } catch (err) {
-      this.accessory.context.inUse = false
+      this.inUse = false
       this.platform.deviceUpdateError(this.accessory, err, true)
     }
   }
@@ -97,7 +97,7 @@ module.exports = class deviceGarageFour {
   async externalUpdate (params) {
     try {
       /*
-      if (!this.helpers.hasProperty(params, 'switches') || this.accessory.context.inUse) return
+      if (!this.helpers.hasProperty(params, 'switches') || this.inUse) return
       let garageConfig
       if (!(garageConfig = this.platform.cusG.get(this.accessory.context.hbDeviceId))) {
         throw new Error('group config missing')
@@ -105,7 +105,7 @@ module.exports = class deviceGarageFour {
       if (garageConfig.type !== 'garage_four') {
         throw new Error('improper configuration')
       }
-      if (this.accessory.context.inUse) return
+      if (this.inUse) return
       ;['A', 'B', 'C', 'D'].forEach(async v => {
         let garageChannel
         switch (v) {
diff --git a/lib/device/garage-two.js b/lib/device/garage-two.js
index bf348721..19d58349 100644
--- a/lib/device/garage-two.js
+++ b/lib/device/garage-two.js
@@ -51,7 +51,7 @@ module.exports = class deviceGarageTwo {
       }
       let sAccessory = false
       const newPos = value
-      const params = { switches: this.accessory.context.switchState }
+      const params = { switches: this.cacheSwitchState }
       const gdService = this.accessory.getService(garage)
       if (sensorDefinition && !(sAccessory = this.platform.devicesInHB.get(garageConfig.sensorId + 'SWX'))) {
         throw new Error("defined DW2 sensor doesn't exist")
@@ -67,7 +67,7 @@ module.exports = class deviceGarageTwo {
           ? this.accessory.context.cacheOneCurrentDoorState
           : this.accessory.context.cacheTwoCurrentDoorState
       if (newPos === prevState % 2) return
-      this.accessory.context.inUse = true
+      this.inUse = true
       gdService
         .updateCharacteristic(this.Characteristic.TargetDoorState, newPos)
         .updateCharacteristic(this.Characteristic.CurrentDoorState, newPos + 2)
@@ -102,7 +102,7 @@ module.exports = class deviceGarageTwo {
           }
         }
       }
-      this.accessory.context.inUse = false
+      this.inUse = false
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
     }
@@ -120,8 +120,8 @@ module.exports = class deviceGarageTwo {
       if (garageConfig.type !== 'garage_two') {
         throw new Error('improper configuration')
       }
-      if (this.accessory.context.inUse || garageConfig.sensorId) return
-      this.accessory.context.switchState = params.switches
+      if (this.inUse || garageConfig.sensorId) return
+      this.cacheSwitchState = params.switches
       ;['1', '2'].forEach(async v => {
         const gcService = this.accessory.getService('Garage ' + v)
         const prevState = v === '1'
@@ -146,7 +146,7 @@ module.exports = class deviceGarageTwo {
             }
             break
         }
-        this.accessory.context.inUse = true
+        this.inUse = true
         if (garageConfig.sensorId) {
           await this.helpers.sleep(Math.max(garageConfig.operationTime * 100, 1000))
         } else {
@@ -175,7 +175,7 @@ module.exports = class deviceGarageTwo {
           }
         }
       })
-      this.accessory.context.inUse = false
+      this.inUse = false
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
diff --git a/lib/device/garage.js b/lib/device/garage.js
index 7e086771..74724cb6 100644
--- a/lib/device/garage.js
+++ b/lib/device/garage.js
@@ -49,14 +49,14 @@ module.exports = class deviceGarage {
           : 0
         : this.accessory.context.cacheCurrentDoorState
       if (newPos === prevState % 2) return
-      this.accessory.context.inUse = true
-      this.accessory.context.state = value
+      this.inUse = true
+      this.cacheState = value
       if (garageConfig.setup === 'oneSwitch' && [2, 3].includes(prevState)) {
         this.gdService.updateCharacteristic(this.Characteristic.CurrentDoorState, ((prevState * 2) % 3) + 2)
         this.accessory.context.cacheCurrentDoorState = ((prevState * 2) % 3) + 2
         delay = 1500
       }
-      if (this.accessory.context.state !== newPos) return
+      if (this.cacheState !== newPos) return
       await this.helpers.sleep(delay)
       this.gdService
         .updateCharacteristic(this.Characteristic.TargetDoorState, newPos)
@@ -79,7 +79,7 @@ module.exports = class deviceGarage {
         this.gdService.updateCharacteristic(this.Characteristic.CurrentDoorState, newPos)
         this.accessory.context.cacheCurrentDoorState = newPos
       }
-      this.accessory.context.inUse = false
+      this.inUse = false
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
     }
@@ -99,7 +99,7 @@ module.exports = class deviceGarage {
       if (garageConfig.type !== 'garage' || !['oneSwitch', 'twoSwitch'].includes(garageConfig.setup)) {
         throw new Error('improper configuration')
       }
-      if (this.accessory.context.inUse || garageConfig.sensorId) return
+      if (this.inUse || garageConfig.sensorId) return
       switch (garageConfig.setup) {
         case 'oneSwitch':
           if (params.switch === 'off') {
@@ -115,7 +115,7 @@ module.exports = class deviceGarage {
           }
           break
       }
-      this.accessory.context.inUse = true
+      this.inUse = true
       if (garageConfig.sensorId) {
         await this.helpers.sleep(Math.max(garageConfig.operationTime * 100, 1000))
       } else {
@@ -128,9 +128,9 @@ module.exports = class deviceGarage {
         this.gdService.updateCharacteristic(this.Characteristic.CurrentDoorState, newPos - 2)
         this.accessory.context.cacheCurrentDoorState = newPos - 2
       }
-      this.accessory.context.inUse = false
+      this.inUse = false
     } catch (err) {
-      this.accessory.context.inUse = false
+      this.inUse = false
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
diff --git a/lib/device/light-colour.js b/lib/device/light-colour.js
index 66c902bb..ca32f796 100644
--- a/lib/device/light-colour.js
+++ b/lib/device/light-colour.js
@@ -17,7 +17,7 @@ module.exports = class deviceLightColour {
       .on('set', this.internalBrightnessUpdate.bind(this))
     this.lightService
       .getCharacteristic(this.Characteristic.Hue)
-      .on('set', this.internalHueUpdate.bind(this))
+      .on('set', this.internalColourUpdate.bind(this))
     this.lightService
       .getCharacteristic(this.Characteristic.Saturation)
       .on('set', (value, callback) => callback())
@@ -64,8 +64,10 @@ module.exports = class deviceLightColour {
       let params
       await this.helpers.sleep(750)
       callback()
+      if (this.lastSentBrightness === value) return
+      this.lastSentBrightness = value
       const updateKeyBright = Math.random().toString(36).substr(2, 8)
-      this.accessory.context.updateKeyBright = updateKeyBright
+      this.updateKeyBright = updateKeyBright
       switch (this.accessory.context.eweUIID) {
         case 22:
           // *** B1 doesn't support brightness *** \\
@@ -102,21 +104,23 @@ module.exports = class deviceLightColour {
           break
       }
       await this.helpers.sleep(350)
-      if (updateKeyBright !== this.accessory.context.updateKeyBright) return
+      if (updateKeyBright !== this.updateKeyBright) return
       await this.platform.sendDeviceUpdate(this.accessory, params)
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
     }
   }
 
-  async internalHueUpdate (value, callback) {
+  async internalColourUpdate (value, callback) {
     try {
       await this.helpers.sleep(1500)
       callback()
+      if (this.lastSentColour === value) return
+      this.lastSentColour = value
       let params
       const newRGB = this.helpers.hs2rgb([value, this.lightService.getCharacteristic(this.Characteristic.Saturation).value])
       const updateKeyColour = Math.random().toString(36).substr(2, 8)
-      this.accessory.context.updateKeyColour = updateKeyColour
+      this.updateKeyColour = updateKeyColour
       switch (this.accessory.context.eweUIID) {
         case 22:
         // *** B1 *** \\
@@ -157,7 +161,7 @@ module.exports = class deviceLightColour {
           break
       }
       await this.helpers.sleep(350)
-      if (updateKeyColour !== this.accessory.context.updateKeyColour) return
+      if (updateKeyColour !== this.updateKeyColour) return
       await this.platform.sendDeviceUpdate(this.accessory, params)
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
@@ -168,9 +172,11 @@ module.exports = class deviceLightColour {
     try {
       await this.helpers.sleep(1500)
       callback()
+      if (this.cacheLastCTemp === value) return
+      this.cacheLastCTemp = value
       if (this.accessory.context.eweUIID !== 104) return
       const updateKeyCTemp = Math.random().toString(36).substr(2, 8)
-      this.accessory.context.updateCTemp = updateKeyCTemp
+      this.updateKeyCTemp = updateKeyCTemp
       // *** B02-B-A60, B05-B-A60, GTLC104 *** \\
       // HomeKit has a ct range of 140-500 corresponding to 2000-7143K
       // These devices have a range of 2700K-6500K corresponding to ct: 0-255
@@ -186,7 +192,7 @@ module.exports = class deviceLightColour {
       this.cacheMode = 'white'
       this.cacheCTemp = kToCT
       await this.helpers.sleep(350)
-      if (updateKeyCTemp !== this.accessory.context.updateKeyCTemp) return
+      if (updateKeyCTemp !== this.updateKeyCTemp) return
       await this.platform.sendDeviceUpdate(this.accessory, params)
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
diff --git a/lib/device/light-ctemp.js b/lib/device/light-ctemp.js
index c433b1f7..00abf609 100644
--- a/lib/device/light-ctemp.js
+++ b/lib/device/light-ctemp.js
@@ -17,7 +17,7 @@ module.exports = class deviceLightColour {
       .on('set', this.internalBrightnessUpdate.bind(this))
     this.lightService
       .getCharacteristic(this.Characteristic.ColorTemperature)
-      .on('set', this.internalColourTempUpdate.bind(this))
+      .on('set', this.internalCTempUpdate.bind(this))
     if (platform.api.versionGreaterOrEqual && platform.api.versionGreaterOrEqual('1.3.0-beta.27')) {
       this.alController = new platform.api.hap.AdaptiveLightingController(this.lightService)
       accessory.configureController(this.alController)
@@ -42,31 +42,31 @@ module.exports = class deviceLightColour {
       if (this.lastSentBrightness === value) return
       this.lastSentBrightness = value
       const updateKeyBright = Math.random().toString(36).substr(2, 8)
-      this.accessory.context.updateKeyBright = updateKeyBright
+      this.updateKeyBright = updateKeyBright
       // *** Device needs the current ct value sent too *** \\
       const params = {
         ltype: 'white',
         white: {
           br: value,
-          ct: this.accessory.context.cacheCT
+          ct: this.cacheCT
         }
       }
       await this.helpers.sleep(350)
-      if (updateKeyBright !== this.accessory.context.updateKeyBright) return
+      if (updateKeyBright !== this.updateKeyBright) return
       await this.platform.sendDeviceUpdate(this.accessory, params)
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
     }
   }
 
-  async internalColourTempUpdate (value, callback) {
+  async internalCTempUpdate (value, callback) {
     try {
       await this.helpers.sleep(1500)
       callback()
-      if (this.lastSentColour === value) return
-      this.lastSentColour = value
+      if (this.cacheLastCTemp === value) return
+      this.cacheLastCTemp = value
       const updateKeyColour = Math.random().toString(36).substr(2, 8)
-      this.updateKeyColour = updateKeyColour
+      this.updateKeyCTemp = updateKeyColour
       // HomeKit has a ct range of 140-500 corresponding to 2000-7143K
       // B02-F-A60 has a range of 2200K-6500K corresponding to ct: 0-255
       let mToK = Math.round(1000000 / value)
@@ -81,9 +81,9 @@ module.exports = class deviceLightColour {
           br: this.lightService.getCharacteristic(this.Characteristic.Brightness).value
         }
       }
-      this.accessory.context.cacheCT = kToCT
+      this.cacheCT = kToCT
       await this.helpers.sleep(350)
-      if (updateKeyColour !== this.updateKeyColour) return
+      if (updateKeyColour !== this.updateKeyCTemp) return
       await this.platform.sendDeviceUpdate(this.accessory, params)
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
@@ -113,7 +113,7 @@ module.exports = class deviceLightColour {
               const ctToK = Math.round(params.white.ct / 255 * 4300 + 2200)
               const kToMired = Math.round(1000000 / ctToK)
               this.lightService.updateCharacteristic(this.Characteristic.ColorTemperature, kToMired)
-              this.accessory.context.cacheCT = params.white.ct
+              this.cacheCT = params.white.ct
             }
           }
         }
diff --git a/lib/device/light-dimmer.js b/lib/device/light-dimmer.js
index 624cbd9e..14fae561 100644
--- a/lib/device/light-dimmer.js
+++ b/lib/device/light-dimmer.js
@@ -30,9 +30,11 @@ module.exports = class deviceLightDimmer {
   async internalBrightnessUpdate (value, callback) {
     try {
       callback()
+      if (this.lastSentBrightness === value) return
+      this.lastSentBrightness = value
       const params = {}
       const updateKey = Math.random().toString(36).substr(2, 8)
-      this.accessory.context.updateKey = updateKey
+      this.updateKeyBright = updateKey
       switch (this.accessory.context.eweUIID) {
         case 36:
         // *** KING-M4 eWeLink scale is 10-100 and HomeKit scale is 0-100. *** \\
@@ -45,7 +47,7 @@ module.exports = class deviceLightDimmer {
           break
       }
       await this.helpers.sleep(350)
-      if (updateKey !== this.accessory.context.updateKey) return
+      if (updateKey !== this.updateKeyBright) return
       await this.platform.sendDeviceUpdate(this.accessory, params)
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
diff --git a/lib/device/lock.js b/lib/device/lock.js
index 6297d9e2..b95c628c 100644
--- a/lib/device/lock.js
+++ b/lib/device/lock.js
@@ -29,13 +29,13 @@ module.exports = class deviceLock {
       if (lockConfig.type !== 'lock') {
         throw new Error('improper configuration')
       }
-      this.accessory.context.inUse = true
+      this.inUse = true
       await this.platform.sendDeviceUpdate(this.accessory, params)
       await this.helpers.sleep(Math.max(lockConfig.operationTime * 100, 1000))
       this.lmService
         .updateCharacteristic(this.Characteristic.LockTargetState, 1)
         .updateCharacteristic(this.Characteristic.LockCurrentState, 1)
-      this.accessory.context.inUse = false
+      this.inUse = false
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
     }
@@ -51,10 +51,10 @@ module.exports = class deviceLock {
       if (lockConfig.type !== 'lock') {
         throw new Error('improper configuration')
       }
-      if (params.switch === 'off' || this.accessory.context.inUse) {
+      if (params.switch === 'off' || this.inUse) {
         return
       }
-      this.accessory.context.inUse = true
+      this.inUse = true
       this.lmService
         .updateCharacteristic(this.Characteristic.LockCurrentState, 0)
         .updateCharacteristic(this.Characteristic.LockTargetState, 0)
@@ -62,9 +62,9 @@ module.exports = class deviceLock {
       this.lmService
         .updateCharacteristic(this.Characteristic.LockCurrentState, 1)
         .updateCharacteristic(this.Characteristic.LockTargetState, 1)
-      this.accessory.context.inUse = false
+      this.inUse = false
     } catch (err) {
-      this.accessory.context.inUse = false
+      this.inUse = false
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
diff --git a/lib/index.js b/lib/index.js
index 174b3182..b3e5bea6 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -541,7 +541,6 @@ class eWeLinkPlatform {
       accessory.context.reachableLAN = this.lanDevices.has(device.deviceid)
         ? this.lanDevices.get(device.deviceid).online
         : false
-      accessory.context.inUse = false
       accessory.context.eweBrandName = device.brandName
       accessory.context.eweBrandLogo = device.brandLogo
       accessory.context.eweShared = this.helpers.hasProperty(device, 'sharedBy') && this.helpers.hasProperty(device.sharedBy, 'email')

From 1fe2e982aaa686a25194ea538b7ba3aacfcf47bf Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 21 Dec 2020 14:05:32 +0000
Subject: [PATCH 0998/3183] 3.18.2-7

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 7a200625..3c1cb61c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.18.2-6",
+  "version": "3.18.2-7",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 2799c9b6..a93054b6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.18.2-6",
+  "version": "3.18.2-7",
   "author": "bwp91",
   "description": "Homebridge/HOOBS plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 3f1567470aba7e0ef23ae5e622034d64977a9ead Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 21 Dec 2020 14:20:54 +0000
Subject: [PATCH 0999/3183] reorder fns

---
 lib/index.js | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/lib/index.js b/lib/index.js
index b3e5bea6..89d51855 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -650,6 +650,25 @@ class eWeLinkPlatform {
     }
   }
 
+  configureAccessory (accessory) {
+    // *** Function is called for each device on HB start *** \\
+    if (!this.log) return
+
+    // *** Add each cached device to our devicesInHB map *** \\
+    this.devicesInHB.set(accessory.context.hbDeviceId, accessory)
+  }
+
+  removeAccessory (accessory) {
+    try {
+      // *** Unregister the accessory from HB and remove it from our devicesInHB map *** \\
+      this.api.unregisterPlatformAccessories('homebridge-ewelink', 'eWeLink', [accessory])
+      this.devicesInHB.delete(accessory.context.hbDeviceId)
+      this.log(' → [%s] was removed from Homebridge.', accessory.displayName)
+    } catch (err) {
+      this.log.warn(" → [%s] wasn't removed as %s.", accessory.displayName, err)
+    }
+  }
+
   async sendDeviceUpdate (accessory, params) {
     // *** Add a random delay of [1, 250]ms to avoid multiple http/ws requests a la vez
     await this.helpers.sleep(Math.floor(Math.random() * 250 + 1))
@@ -790,25 +809,6 @@ class eWeLinkPlatform {
       this.log.warn('[%s] state will be synced when device comes back online.', accessory.displayName)
     }
   }
-
-  configureAccessory (accessory) {
-    // *** Function is called for each device on HB start *** \\
-    if (!this.log) return
-
-    // *** Add each cached device to our devicesInHB map *** \\
-    this.devicesInHB.set(accessory.context.hbDeviceId, accessory)
-  }
-
-  removeAccessory (accessory) {
-    try {
-      // *** Unregister the accessory from HB and remove it from our devicesInHB map *** \\
-      this.api.unregisterPlatformAccessories('homebridge-ewelink', 'eWeLink', [accessory])
-      this.devicesInHB.delete(accessory.context.hbDeviceId)
-      this.log(' → [%s] was removed from Homebridge.', accessory.displayName)
-    } catch (err) {
-      this.log.warn(" → [%s] wasn't removed as %s.", accessory.displayName, err)
-    }
-  }
 }
 
 module.exports = hb => hb.registerPlatform('homebridge-ewelink', 'eWeLink', eWeLinkPlatform)

From 7418f4b73c2f976e66f4ed4de846477e890d7aca Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 21 Dec 2020 14:21:01 +0000
Subject: [PATCH 1000/3183] device logging

---
 lib/device/switch-multi.js  | 18 +++++++++---------
 lib/device/switch-single.js |  4 +---
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/lib/device/switch-multi.js b/lib/device/switch-multi.js
index 3b614dc3..74a1d8db 100644
--- a/lib/device/switch-multi.js
+++ b/lib/device/switch-multi.js
@@ -34,7 +34,7 @@ module.exports = class deviceSwitchMulti {
           for (let i = 0; i <= 4; i++) {
             if ((oAccessory = this.platform.devicesInHB.get(this.accessory.context.eweDeviceId + 'SW' + i))) {
               oAccessory.getService(this.Service.Switch).updateCharacteristic(this.Characteristic.On, value)
-              oAccessory.context.cacheOn = value
+              oAccessory.context.cacheStatus = value ? 'on' : 'off'
             }
           }
           break
@@ -50,9 +50,9 @@ module.exports = class deviceSwitchMulti {
               }
               if (i === parseInt(this.accessory.context.switchNumber)) {
                 params.switches[i - 1].switch = value ? 'on' : 'off'
-                oAccessory.context.cacheOn = value
+                oAccessory.context.cacheStatus = value ? 'on' : 'off'
               } else {
-                params.switches[i - 1].switch = oAccessory.context.cacheOn ? 'on' : 'off'
+                params.switches[i - 1].switch = oAccessory.context.cacheStatus
               }
             } else {
               params.switches[i - 1].switch = 'off'
@@ -72,20 +72,20 @@ module.exports = class deviceSwitchMulti {
 
   async externalUpdate (params) {
     try {
-      if (!this.helpers.hasProperty(params, 'switches')) return
-      const idToCheck = this.accessory.context.hbDeviceId.slice(0, -1)
+      if (!params.switches) return
+      const idToCheck = this.accessory.context.eweDeviceId + 'SW'
       let primaryState = false
       for (let i = 1; i <= this.accessory.context.channelCount; i++) {
-        if (params.switches[i - 1].switch === 'on') {
-          primaryState = true
-        }
+        if (params.switches[i - 1].switch === 'on') primaryState = true
         if (this.platform.devicesInHB.has(idToCheck + i)) {
           const oAccessory = this.platform.devicesInHB.get(idToCheck + i)
-          oAccessory.context.cacheOn = params.switches[i - 1].switch === 'on'
+          if (params.switches[i - 1].switch === oAccessory.context.cacheStatus) return
+          oAccessory.context.cacheStatus = params.switches[i - 1].switch
           oAccessory
             .getService(this.Service.Switch)
             .updateCharacteristic(this.Characteristic.On, params.switches[i - 1].switch === 'on')
           oAccessory.eveService.addEntry({ status: params.switches[i - 1].switch === 'on' ? 1 : 0 })
+          if (params.updateSource) this.log('[%s] current status [%s].', oAccessory.displayName, params.switches[i - 1].switch)
         }
       }
       if (!this.platform.hiddenMasters.includes(this.accessory.context.eweDeviceId)) {
diff --git a/lib/device/switch-single.js b/lib/device/switch-single.js
index 5549860b..4c148948 100644
--- a/lib/device/switch-single.js
+++ b/lib/device/switch-single.js
@@ -39,9 +39,7 @@ module.exports = class deviceSwitchSingle {
       const newStatus = params.switch === 'on'
       this.switchService.updateCharacteristic(this.Characteristic.On, newStatus)
       this.accessory.eveService.addEntry({ status: newStatus ? 1 : 0 })
-      if (params.updateSource) {
-        this.log('[%s] current status [%s].', this.accessory.displayName, newStatus ? 'on' : 'off')
-      }
+      if (params.updateSource) this.log('[%s] current status [%s].', this.accessory.displayName, params.switch)
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }

From 807774e548a73d50231f2fcbbb32a1e081bee84d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 21 Dec 2020 17:19:02 +0000
Subject: [PATCH 1001/3183] device logging

---
 lib/device/switch-multi.js  | 5 +++--
 lib/device/switch-single.js | 2 +-
 lib/device/zb-dev.js        | 6 +++---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/lib/device/switch-multi.js b/lib/device/switch-multi.js
index 74a1d8db..a233ba9b 100644
--- a/lib/device/switch-multi.js
+++ b/lib/device/switch-multi.js
@@ -79,13 +79,14 @@ module.exports = class deviceSwitchMulti {
         if (params.switches[i - 1].switch === 'on') primaryState = true
         if (this.platform.devicesInHB.has(idToCheck + i)) {
           const oAccessory = this.platform.devicesInHB.get(idToCheck + i)
-          if (params.switches[i - 1].switch === oAccessory.context.cacheStatus) return
+          if (params.switches[i - 1].switch === oAccessory.context.cacheStatusLog) return
           oAccessory.context.cacheStatus = params.switches[i - 1].switch
+          oAccessory.context.cacheStatusLog = params.switches[i - 1].switch
           oAccessory
             .getService(this.Service.Switch)
             .updateCharacteristic(this.Characteristic.On, params.switches[i - 1].switch === 'on')
           oAccessory.eveService.addEntry({ status: params.switches[i - 1].switch === 'on' ? 1 : 0 })
-          if (params.updateSource) this.log('[%s] current status [%s].', oAccessory.displayName, params.switches[i - 1].switch)
+          if (params.updateSource) this.log('[%s] current state [%s].', oAccessory.displayName, params.switches[i - 1].switch)
         }
       }
       if (!this.platform.hiddenMasters.includes(this.accessory.context.eweDeviceId)) {
diff --git a/lib/device/switch-single.js b/lib/device/switch-single.js
index 4c148948..3c738498 100644
--- a/lib/device/switch-single.js
+++ b/lib/device/switch-single.js
@@ -39,7 +39,7 @@ module.exports = class deviceSwitchSingle {
       const newStatus = params.switch === 'on'
       this.switchService.updateCharacteristic(this.Characteristic.On, newStatus)
       this.accessory.eveService.addEntry({ status: newStatus ? 1 : 0 })
-      if (params.updateSource) this.log('[%s] current status [%s].', this.accessory.displayName, params.switch)
+      if (params.updateSource) this.log('[%s] current state [%s].', this.accessory.displayName, params.switch)
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
diff --git a/lib/device/zb-dev.js b/lib/device/zb-dev.js
index 4a1d0660..d82bdd2c 100644
--- a/lib/device/zb-dev.js
+++ b/lib/device/zb-dev.js
@@ -118,7 +118,7 @@ module.exports = class deviceZBDev {
               .getService(this.Service.Switch)
               .updateCharacteristic(this.Characteristic.On, params.switch === 'on')
             if (params.updateSource) {
-              this.log('[%s] current status [%s].', this.accessory.displayName, params.switch)
+              this.log('[%s] current state [%s].', this.accessory.displayName, params.switch)
             }
             this.accessory.eveService.addEntry({ status: params.switch === 'on' ? 1 : 0 })
           }
@@ -160,7 +160,7 @@ module.exports = class deviceZBDev {
               diff < this.sensorTimeDifference
             this.accessory.eveService.addEntry({ status: motionDetected ? 1 : 0 })
             if (params.updateSource) {
-              this.log('[%s] current status [motion%s detected].', this.accessory.displayName, motionDetected ? '' : ' not')
+              this.log('[%s] current state [motion%s detected].', this.accessory.displayName, motionDetected ? '' : ' not')
             }
             if (motionDetected) {
               this.accessory.getService(this.Service.MotionSensor).updateCharacteristic(
@@ -178,7 +178,7 @@ module.exports = class deviceZBDev {
               .getService(this.Service.ContactSensor)
               .updateCharacteristic(this.Characteristic.ContactSensorState, params.lock)
             if (params.updateSource) {
-              this.log('[%s] current status [contact%s detected].', this.accessory.displayName, params.lock === 0 ? '' : ' not')
+              this.log('[%s] current state [contact%s detected].', this.accessory.displayName, params.lock === 0 ? '' : ' not')
             }
             this.accessory.eveService.addEntry({ status: params.lock })
             if (params.lock === 1) {

From 1d2b9c6045126cd0b11c4bd5269d22dc309dd43e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 21 Dec 2020 17:25:30 +0000
Subject: [PATCH 1002/3183] device logging

---
 lib/device/scm.js | 13 ++++++++-----
 lib/device/usb.js |  9 ++++++---
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/lib/device/scm.js b/lib/device/scm.js
index fb4d377e..ec42cfae 100644
--- a/lib/device/scm.js
+++ b/lib/device/scm.js
@@ -8,8 +8,8 @@ module.exports = class deviceSCM {
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
-    this.switchService = accessory.getService(this.Service.Switch) || accessory.addService(this.Service.Switch)
-    this.switchService
+    this.service = accessory.getService(this.Service.Switch) || accessory.addService(this.Service.Switch)
+    this.service
       .getCharacteristic(this.Characteristic.On)
       .on('set', this.internalUpdate.bind(this))
     accessory.log = this.log
@@ -30,9 +30,12 @@ module.exports = class deviceSCM {
 
   async externalUpdate (params) {
     try {
-      if (!this.helpers.hasProperty(params, 'switches')) return
-      this.switchService.updateCharacteristic(this.Characteristic.On, params.switches[0].switch === 'on')
-      this.accessory.eveService.addEntry({ status: params.switches[0].switch === 'on' ? 1 : 0 })
+      if (!params.switches || params.switches[0].switch === this.cacheOnOff) return
+      this.cacheOnOff = params.switches[0].switch
+      const newStatus = params.switches[0].switch === 'on'
+      this.service.updateCharacteristic(this.Characteristic.On, newStatus)
+      this.accessory.eveService.addEntry({ status: newStatus ? 1 : 0 })
+      if (params.updateSource) this.log('[%s] current state [%s].', this.accessory.displayName, params.switches[0].switch)
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
diff --git a/lib/device/usb.js b/lib/device/usb.js
index 031ce1b2..c9681e3f 100644
--- a/lib/device/usb.js
+++ b/lib/device/usb.js
@@ -40,9 +40,12 @@ module.exports = class deviceUSB {
 
   async externalUpdate (params) {
     try {
-      if (!params.switches) return
-      this.service.updateCharacteristic(this.Characteristic.On, params.switches[0].switch === 'on')
-      this.accessory.eveService.addEntry({ status: params.switches[0].switch === 'on' ? 1 : 0 })
+      if (!params.switches || params.switches[0].switch === this.cacheOnOff) return
+      this.cacheOnOff = params.switches[0].switch
+      const newStatus = params.switches[0].switch === 'on'
+      this.switchService.updateCharacteristic(this.Characteristic.On, newStatus)
+      this.accessory.eveService.addEntry({ status: newStatus ? 1 : 0 })
+      if (params.updateSource) this.log('[%s] current state [%s].', this.accessory.displayName, params.switches[0].switch)
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }

From 2beccad5fbbd94cc02ec1312064bf4100582f3eb Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 21 Dec 2020 17:43:43 +0000
Subject: [PATCH 1003/3183] 3.18.2-8

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 3c1cb61c..8202a422 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.18.2-7",
+  "version": "3.18.2-8",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index a93054b6..63c1dd12 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.18.2-7",
+  "version": "3.18.2-8",
   "author": "bwp91",
   "description": "Homebridge/HOOBS plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 11b9802818e3c15e0d9814c2dc8720432c2241fd Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 21 Dec 2020 17:49:21 +0000
Subject: [PATCH 1004/3183] correct ctToK

---
 lib/device/light-colour.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/device/light-colour.js b/lib/device/light-colour.js
index ca32f796..e480f4ca 100644
--- a/lib/device/light-colour.js
+++ b/lib/device/light-colour.js
@@ -280,7 +280,7 @@ module.exports = class deviceLightColour {
                 if (this.helpers.hasProperty(params.white, 'ct')) {
                   // HomeKit has a ct range of 140-500 corresponding to 2000-7143K
                   // These devices have a range of 2700K-6500K corresponding to ct: 0-255
-                  const ctToK = Math.round(params.white.ct / 255 * 3800 + 2200)
+                  const ctToK = Math.round(params.white.ct / 255 * 3800 + 2700)
                   const kToMired = Math.round(1000000 / ctToK)
                   this.lightService.updateCharacteristic(this.Characteristic.ColorTemperature, kToMired)
                   this.cacheMode = 'white'

From d8d2ed965a353aac5502e03bcce3fad039c8d086 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 21 Dec 2020 17:53:14 +0000
Subject: [PATCH 1005/3183] correct kToCT

---
 lib/device/light-colour.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/device/light-colour.js b/lib/device/light-colour.js
index e480f4ca..f1e5e15f 100644
--- a/lib/device/light-colour.js
+++ b/lib/device/light-colour.js
@@ -181,7 +181,7 @@ module.exports = class deviceLightColour {
       // HomeKit has a ct range of 140-500 corresponding to 2000-7143K
       // These devices have a range of 2700K-6500K corresponding to ct: 0-255
       const kelvin = Math.max(Math.min(Math.round(1000000 / value), 6500), 2700)
-      const kToCT = Math.round(((kelvin - 2200) / 3800) * 255)
+      const kToCT = Math.round(((kelvin - 2700) / 3800) * 255)
       const params = {
         ltype: 'white',
         white: {

From cf398f7034ecdd5d119247f03747e8ec56a4c1fc Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 21 Dec 2020 18:31:07 +0000
Subject: [PATCH 1006/3183] formatting

---
 lib/device/light-colour.js | 71 ++++++++++++++++++--------------------
 lib/device/light-ctemp.js  | 26 ++++++--------
 2 files changed, 45 insertions(+), 52 deletions(-)

diff --git a/lib/device/light-colour.js b/lib/device/light-colour.js
index f1e5e15f..a4d9c852 100644
--- a/lib/device/light-colour.js
+++ b/lib/device/light-colour.js
@@ -249,43 +249,40 @@ module.exports = class deviceLightColour {
             break
           case 104:
             // *** B02-B-A60, B05-B-A60, GTLC104 *** \\
-            if (this.helpers.hasProperty(params, 'ltype')) {
-              mode = params.ltype
-              if (mode === 'color' && this.helpers.hasProperty(params, 'color')) {
-                if (this.helpers.hasProperty(params.color, 'br')) {
-                  this.lightService.updateCharacteristic(this.Characteristic.Brightness, params.color.br)
-                }
-                if (
-                  this.helpers.hasProperty(params.color, 'r') &&
-                  this.helpers.hasProperty(params.color, 'g') &&
-                  this.helpers.hasProperty(params.color, 'b')
-                ) {
-                  newColour = this.helpers.rgb2hs([
-                    parseInt(params.color.r),
-                    parseInt(params.color.g),
-                    parseInt(params.color.b)
-                  ])
-                  this.lightService
-                    .updateCharacteristic(this.Characteristic.Hue, newColour[0])
-                    .updateCharacteristic(this.Characteristic.Saturation, 100)
-                  this.cacheMode = 'colour'
-                  this.cacheR = params.color.r
-                  this.cacheG = params.color.g
-                  this.cacheB = params.color.b
-                }
-              } else if (mode === 'white') {
-                if (this.helpers.hasProperty(params.white, 'br')) {
-                  this.lightService.updateCharacteristic(this.Characteristic.Brightness, params.white.br)
-                }
-                if (this.helpers.hasProperty(params.white, 'ct')) {
-                  // HomeKit has a ct range of 140-500 corresponding to 2000-7143K
-                  // These devices have a range of 2700K-6500K corresponding to ct: 0-255
-                  const ctToK = Math.round(params.white.ct / 255 * 3800 + 2700)
-                  const kToMired = Math.round(1000000 / ctToK)
-                  this.lightService.updateCharacteristic(this.Characteristic.ColorTemperature, kToMired)
-                  this.cacheMode = 'white'
-                  this.cacheCTemp = params.white.ct
-                }
+            if (this.helpers.hasProperty(params, 'color')) {
+              if (this.helpers.hasProperty(params.color, 'br')) {
+                this.lightService.updateCharacteristic(this.Characteristic.Brightness, params.color.br)
+              }
+              if (
+                this.helpers.hasProperty(params.color, 'r') &&
+                this.helpers.hasProperty(params.color, 'g') &&
+                this.helpers.hasProperty(params.color, 'b')
+              ) {
+                newColour = this.helpers.rgb2hs([
+                  parseInt(params.color.r),
+                  parseInt(params.color.g),
+                  parseInt(params.color.b)
+                ])
+                this.lightService
+                  .updateCharacteristic(this.Characteristic.Hue, newColour[0])
+                  .updateCharacteristic(this.Characteristic.Saturation, 100)
+                this.cacheMode = 'colour'
+                this.cacheR = params.color.r
+                this.cacheG = params.color.g
+                this.cacheB = params.color.b
+              }
+            } else if (this.helpers.hasProperty(params, 'white')) {
+              if (this.helpers.hasProperty(params.white, 'br')) {
+                this.lightService.updateCharacteristic(this.Characteristic.Brightness, params.white.br)
+              }
+              if (this.helpers.hasProperty(params.white, 'ct')) {
+                // HomeKit has a ct range of 140-500 corresponding to 2000-7143K
+                // These devices have a range of 2700K-6500K corresponding to ct: 0-255
+                const ctToK = Math.round(params.white.ct / 255 * 3800 + 2700)
+                const kToMired = Math.round(1000000 / ctToK)
+                this.lightService.updateCharacteristic(this.Characteristic.ColorTemperature, kToMired)
+                this.cacheMode = 'white'
+                this.cacheCTemp = params.white.ct
               }
             }
             break
diff --git a/lib/device/light-ctemp.js b/lib/device/light-ctemp.js
index 00abf609..f2bd0b0f 100644
--- a/lib/device/light-ctemp.js
+++ b/lib/device/light-ctemp.js
@@ -92,7 +92,6 @@ module.exports = class deviceLightColour {
 
   async externalUpdate (params) {
     try {
-      let mode
       let isOn = false
       if (this.helpers.hasProperty(params, 'switch')) {
         isOn = params.switch === 'on'
@@ -101,20 +100,17 @@ module.exports = class deviceLightColour {
       }
       if (isOn) {
         this.lightService.updateCharacteristic(this.Characteristic.On, true)
-        if (this.helpers.hasProperty(params, 'ltype')) {
-          mode = params.ltype
-          if (mode === 'white' && this.helpers.hasProperty(params, 'white')) {
-            if (this.helpers.hasProperty(params.white, 'br')) {
-              this.lightService.updateCharacteristic(this.Characteristic.Brightness, params.white.br)
-            }
-            if (this.helpers.hasProperty(params.white, 'ct')) {
-              // B02-F-A60 has a range of 2200K-6500K corresponding to ct: 0-255
-              // HomeKit has a ct range of 140-500 corresponding to 2000-7143K
-              const ctToK = Math.round(params.white.ct / 255 * 4300 + 2200)
-              const kToMired = Math.round(1000000 / ctToK)
-              this.lightService.updateCharacteristic(this.Characteristic.ColorTemperature, kToMired)
-              this.cacheCT = params.white.ct
-            }
+        if (this.helpers.hasProperty(params, 'white')) {
+          if (this.helpers.hasProperty(params.white, 'br')) {
+            this.lightService.updateCharacteristic(this.Characteristic.Brightness, params.white.br)
+          }
+          if (this.helpers.hasProperty(params.white, 'ct')) {
+            // B02-F-A60 has a range of 2200K-6500K corresponding to ct: 0-255
+            // HomeKit has a ct range of 140-500 corresponding to 2000-7143K
+            const ctToK = Math.round(params.white.ct / 255 * 4300 + 2200)
+            const kToMired = Math.round(1000000 / ctToK)
+            this.lightService.updateCharacteristic(this.Characteristic.ColorTemperature, kToMired)
+            this.cacheCT = params.white.ct
           }
         }
       } else {

From e5d87474b3cb8190b65ae2b02527b2ba8761b89e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 21 Dec 2020 18:37:57 +0000
Subject: [PATCH 1007/3183] order

---
 lib/device/light-colour.js | 8 ++++----
 lib/device/light-ctemp.js  | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/device/light-colour.js b/lib/device/light-colour.js
index a4d9c852..bba9241e 100644
--- a/lib/device/light-colour.js
+++ b/lib/device/light-colour.js
@@ -148,10 +148,10 @@ module.exports = class deviceLightColour {
           params = {
             ltype: 'color',
             color: {
+              br: this.lightService.getCharacteristic(this.Characteristic.Brightness).value,
               r: newRGB[0],
               g: newRGB[1],
-              b: newRGB[2],
-              br: this.lightService.getCharacteristic(this.Characteristic.Brightness).value
+              b: newRGB[2]
             }
           }
           this.cacheMode = 'colour'
@@ -185,8 +185,8 @@ module.exports = class deviceLightColour {
       const params = {
         ltype: 'white',
         white: {
-          ct: kToCT,
-          br: this.lightService.getCharacteristic(this.Characteristic.Brightness).value
+          br: this.lightService.getCharacteristic(this.Characteristic.Brightness).value,
+          ct: kToCT
         }
       }
       this.cacheMode = 'white'
diff --git a/lib/device/light-ctemp.js b/lib/device/light-ctemp.js
index f2bd0b0f..157082f6 100644
--- a/lib/device/light-ctemp.js
+++ b/lib/device/light-ctemp.js
@@ -77,8 +77,8 @@ module.exports = class deviceLightColour {
         switch: this.lightService.getCharacteristic(this.Characteristic.On).value ? 'on' : 'off',
         ltype: 'white',
         white: {
-          ct: kToCT,
-          br: this.lightService.getCharacteristic(this.Characteristic.Brightness).value
+          br: this.lightService.getCharacteristic(this.Characteristic.Brightness).value,
+          ct: kToCT
         }
       }
       this.cacheCT = kToCT

From 63e91f233cf25e9db05264126fe19b1c7b50c8e2 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 21 Dec 2020 19:03:15 +0000
Subject: [PATCH 1008/3183] ignore successive updates

---
 lib/device/diffuser.js     |  6 +++---
 lib/device/light-colour.js | 15 ++++++++++++---
 lib/device/light-ctemp.js  | 15 ++++++++++-----
 3 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/lib/device/diffuser.js b/lib/device/diffuser.js
index 41335669..c15e7c2e 100644
--- a/lib/device/diffuser.js
+++ b/lib/device/diffuser.js
@@ -71,14 +71,14 @@ module.exports = class deviceDiffuser {
 
   async internalLightBrightnessUpdate (value, callback) {
     try {
-      await this.helpers.sleep(1500)
+      await this.helpers.sleep(750)
       callback()
       const updateKeyBright = Math.random().toString(36).substr(2, 8)
       this.updateKeyBright = updateKeyBright
       const params = {
         lightbright: value
       }
-      await this.helpers.sleep(350)
+      await this.helpers.sleep(500)
       if (updateKeyBright !== this.updateKeyBright) return
       await this.platform.sendDeviceUpdate(this.accessory, params)
     } catch (err) {
@@ -92,7 +92,7 @@ module.exports = class deviceDiffuser {
       callback()
       const updateKeyColour = Math.random().toString(36).substr(2, 8)
       this.updateKeyColour = updateKeyColour
-      await this.helpers.sleep(700)
+      await this.helpers.sleep(500)
       const newRGB = this.helpers.hs2rgb([
         value,
         this.accessory.getService('Light').getCharacteristic(this.Characteristic.Saturation).value
diff --git a/lib/device/light-colour.js b/lib/device/light-colour.js
index bba9241e..3382d814 100644
--- a/lib/device/light-colour.js
+++ b/lib/device/light-colour.js
@@ -54,6 +54,8 @@ module.exports = class deviceLightColour {
         params.switch = value ? 'on' : 'off'
       }
       await this.platform.sendDeviceUpdate(this.accessory, params)
+      this.ignoreForAMoment = true
+      setTimeout(() => (this.ignoreForAMoment = false), 3000)
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
     }
@@ -103,9 +105,11 @@ module.exports = class deviceLightColour {
           }
           break
       }
-      await this.helpers.sleep(350)
+      await this.helpers.sleep(500)
       if (updateKeyBright !== this.updateKeyBright) return
       await this.platform.sendDeviceUpdate(this.accessory, params)
+      this.ignoreForAMoment = true
+      setTimeout(() => (this.ignoreForAMoment = false), 3000)
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
     }
@@ -160,9 +164,11 @@ module.exports = class deviceLightColour {
           this.cacheB = newRGB[2]
           break
       }
-      await this.helpers.sleep(350)
+      await this.helpers.sleep(500)
       if (updateKeyColour !== this.updateKeyColour) return
       await this.platform.sendDeviceUpdate(this.accessory, params)
+      this.ignoreForAMoment = true
+      setTimeout(() => (this.ignoreForAMoment = false), 3000)
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
     }
@@ -191,9 +197,11 @@ module.exports = class deviceLightColour {
       }
       this.cacheMode = 'white'
       this.cacheCTemp = kToCT
-      await this.helpers.sleep(350)
+      await this.helpers.sleep(500)
       if (updateKeyCTemp !== this.updateKeyCTemp) return
       await this.platform.sendDeviceUpdate(this.accessory, params)
+      this.ignoreForAMoment = true
+      setTimeout(() => (this.ignoreForAMoment = false), 3000)
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
     }
@@ -201,6 +209,7 @@ module.exports = class deviceLightColour {
 
   async externalUpdate (params) {
     try {
+      if (this.ignoreForAMoment) return
       let newColour
       let mode
       let isOn = false
diff --git a/lib/device/light-ctemp.js b/lib/device/light-ctemp.js
index 157082f6..a3c822f2 100644
--- a/lib/device/light-ctemp.js
+++ b/lib/device/light-ctemp.js
@@ -30,6 +30,8 @@ module.exports = class deviceLightColour {
       callback()
       const params = { switch: value ? 'on' : 'off' }
       await this.platform.sendDeviceUpdate(this.accessory, params)
+      this.ignoreForAMoment = true
+      setTimeout(() => (this.ignoreForAMoment = false), 3000)
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
     }
@@ -51,9 +53,11 @@ module.exports = class deviceLightColour {
           ct: this.cacheCT
         }
       }
-      await this.helpers.sleep(350)
+      await this.helpers.sleep(500)
       if (updateKeyBright !== this.updateKeyBright) return
       await this.platform.sendDeviceUpdate(this.accessory, params)
+      this.ignoreForAMoment = true
+      setTimeout(() => (this.ignoreForAMoment = false), 3000)
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
     }
@@ -69,9 +73,7 @@ module.exports = class deviceLightColour {
       this.updateKeyCTemp = updateKeyColour
       // HomeKit has a ct range of 140-500 corresponding to 2000-7143K
       // B02-F-A60 has a range of 2200K-6500K corresponding to ct: 0-255
-      let mToK = Math.round(1000000 / value)
-      if (mToK < 2200) mToK = 2200
-      if (mToK > 6500) mToK = 6500
+      const mToK = Math.max(Math.min(Math.round(1000000 / value), 6500), 2200)
       const kToCT = Math.round(((mToK - 2200) / 4300) * 255)
       const params = {
         switch: this.lightService.getCharacteristic(this.Characteristic.On).value ? 'on' : 'off',
@@ -82,9 +84,11 @@ module.exports = class deviceLightColour {
         }
       }
       this.cacheCT = kToCT
-      await this.helpers.sleep(350)
+      await this.helpers.sleep(500)
       if (updateKeyColour !== this.updateKeyCTemp) return
       await this.platform.sendDeviceUpdate(this.accessory, params)
+      this.ignoreForAMoment = true
+      setTimeout(() => (this.ignoreForAMoment = false), 3000)
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
     }
@@ -92,6 +96,7 @@ module.exports = class deviceLightColour {
 
   async externalUpdate (params) {
     try {
+      if (this.ignoreForAMoment) return
       let isOn = false
       if (this.helpers.hasProperty(params, 'switch')) {
         isOn = params.switch === 'on'

From 4abb7fa4082c4df68f398980bd3669d8c1fb9b99 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 21 Dec 2020 19:04:04 +0000
Subject: [PATCH 1009/3183] 3.18.2-9

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 8202a422..26053c8c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.18.2-8",
+  "version": "3.18.2-9",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 63c1dd12..54ad42b0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.18.2-8",
+  "version": "3.18.2-9",
   "author": "bwp91",
   "description": "Homebridge/HOOBS plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From f4e547d815abf522a537d7559e0da92d42cbebfb Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 22 Dec 2020 07:18:41 +0000
Subject: [PATCH 1010/3183] Bump axios from 0.21.0 to 0.21.1

---
 package-lock.json | 6 +++---
 package.json      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 26053c8c..12a48e9f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,9 +10,9 @@
       "integrity": "sha512-b/36608DrTDgji9tWu126kg+pgS5lXctVwtgUK/t1pH/TsSAWcR7XUe6oDZ364umZm/1CMrVweMlOd+633q8nQ=="
     },
     "axios": {
-      "version": "0.21.0",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.0.tgz",
-      "integrity": "sha512-fmkJBknJKoZwem3/IKSSLpkdNXZeBu5Q7GA/aRsr2btgrptmSCxi2oFjZHqGdK9DoTil9PIHlPIZw2EcRJXRvw==",
+      "version": "0.21.1",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.1.tgz",
+      "integrity": "sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==",
       "requires": {
         "follow-redirects": "^1.10.0"
       }
diff --git a/package.json b/package.json
index 54ad42b0..fe3c0721 100644
--- a/package.json
+++ b/package.json
@@ -47,7 +47,7 @@
   ],
   "dependencies": {
     "@homebridge/plugin-ui-utils": "^0.0.17",
-    "axios": "^0.21.0",
+    "axios": "^0.21.1",
     "node-dns-sd": "^0.4.2",
     "websocket-as-promised": "^1.1.0",
     "ws": "^7.4.1"

From 54961f8c86b913583f2bebc35c6d514bc1b951f1 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 22 Dec 2020 08:52:05 +0000
Subject: [PATCH 1011/3183] ZBDWBatt include in schema

---
 config.schema.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/config.schema.json b/config.schema.json
index 83781774..df177de8 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -133,6 +133,9 @@
         "type": "boolean",
         "description": "If checked, double and long press options will be hidden for the ZigBee button."
       },
+      "ZBDWBatt": {
+        "type": "boolean"
+      },
       "groups": {
         "type": "array",
         "items": {

From 6e7c4c9fc90602f4e5032f5ec90bf1bdfc1aa096 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 22 Dec 2020 08:55:03 +0000
Subject: [PATCH 1012/3183] hide name, ip from display

---
 config.schema.json | 48 +++-------------------------------------------
 1 file changed, 3 insertions(+), 45 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index df177de8..9fea1764 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -327,14 +327,10 @@
           "type": "object",
           "properties": {
             "fullDeviceId": {
-              "title": "Device ID",
-              "type": "string",
-              "description": "Full device ID of the device in Homebridge/HOOBS (13 digits normally in the format 1000ab23cdSW2)."
+              "type": "string"
             },
             "deviceName": {
-              "title": "Name",
               "type": "string",
-              "description": "The name for the accessory for when it is added."
             }
           }
         }
@@ -345,14 +341,10 @@
           "type": "object",
           "properties": {
             "deviceId": {
-              "title": "Device ID",
-              "type": "string",
-              "description": "Device ID from your eWeLink app (ten digits normally in the format 1000ab23cd)."
+              "type": "string"
             },
             "deviceIP": {
-              "title": "IP Address",
-              "type": "string",
-              "description": "The IP address of this device which will be used by the plugin."
+              "type": "string"
             }
           }
         }
@@ -436,40 +428,6 @@
           ]
         }
       ]
-    },
-    {
-      "key": "nameOverride",
-      "title": "Accessory Name Overrides",
-      "description": "You can override the default name given to a device when it is added.",
-      "expandable": true,
-      "add": "Add Another Name Override",
-      "type": "array",
-      "items": [
-        {
-          "type": "fieldset",
-          "items": [
-            "nameOverride[].fullDeviceId",
-            "nameOverride[].deviceName"
-          ]
-        }
-      ]
-    },
-    {
-      "key": "ipOverride",
-      "title": "IP Overrides",
-      "description": "You can override the IP for a device.",
-      "expandable": true,
-      "add": "Add Another IP Override",
-      "type": "array",
-      "items": [
-        {
-          "type": "fieldset",
-          "items": [
-            "ipOverride[].deviceId",
-            "ipOverride[].deviceIP"
-          ]
-        }
-      ]
     }
   ]
 }
\ No newline at end of file

From 8fb4165d79bd24d93b2718daaae2632de32acb23 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 22 Dec 2020 08:58:43 +0000
Subject: [PATCH 1013/3183] hide hideZBLDPress

---
 config.schema.json | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 9fea1764..cfab01ac 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -330,7 +330,7 @@
               "type": "string"
             },
             "deviceName": {
-              "type": "string",
+              "type": "string"
             }
           }
         }
@@ -387,8 +387,7 @@
         "thAsThermostat",
         "resetRFBridge",
         "lowBattThreshold",
-        "sensorTimeDifference",
-        "hideZBLDPress"
+        "sensorTimeDifference"
       ]
     },
     {

From 117d3bbc6284d8dd751c2e8598c1c3e701a083f9 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 22 Dec 2020 09:25:09 +0000
Subject: [PATCH 1014/3183] init logging

---
 lib/index.js | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/lib/index.js b/lib/index.js
index 89d51855..72904796 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -551,18 +551,11 @@ class eWeLinkPlatform {
         : false
 
       // *** Helpful logging for each device *** \\
-      let str = accessory.context.reachableLAN
-        ? 'and found locally with IP [' + this.lanDevices.get(device.deviceid).ip + ']'
-        : 'but LAN mode unavailable as device '
-      if (!accessory.context.reachableLAN) {
-        if (!this.helpers.devicesLAN.includes(device.extra.uiid)) {
-          str += "doesn't support it"
-        } else if (accessory.context.sharedDevice) {
-          str += 'is shared (' + device.sharedBy.email + ')'
-        } else {
-          str += 'is unreachable'
-        }
-      }
+      const str = accessory.context.reachableLAN
+        ? 'found locally with IP [' + this.lanDevices.get(device.deviceid).ip + ']'
+        : this.helpers.devicesLAN.includes(device.extra.uiid)
+          ? 'LAN mode unavailable as unreachable'
+          : 'LAN mode unavailable as not supported'
 
       // *** Update accessory characteristics with latest values *** \\
       if (!this.config.disableHTTPRefresh) accessory.control.externalUpdate(device.params)
@@ -570,7 +563,7 @@ class eWeLinkPlatform {
       // *** Update any changes to the device into our devicesInHB map *** \\
       this.api.updatePlatformAccessories('homebridge-ewelink', 'eWeLink', [accessory])
       this.devicesInHB.set(accessory.context.hbDeviceId, accessory)
-      this.log(' → [%s] initialised %s.', device.name, str)
+      this.log(' → [%s] initialised and %s.', device.name, str)
     } catch (err) {
       // *** Catch errors at any point during device initialisation *** \\
       const deviceName = accessory && this.helpers.hasProperty(accessory, 'displayName')

From 7f423528627fd6ea01f2b41788d949784106f002 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 22 Dec 2020 09:25:51 +0000
Subject: [PATCH 1015/3183] support B02-F-ST64 range

---
 config.schema.json        |  3 +++
 lib/device/light-ctemp.js | 17 +++++++++++------
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index cfab01ac..6a4e2afc 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -136,6 +136,9 @@
       "ZBDWBatt": {
         "type": "boolean"
       },
+      "bulbB02FST64": {
+        "type": "string"
+      }
       "groups": {
         "type": "array",
         "items": {
diff --git a/lib/device/light-ctemp.js b/lib/device/light-ctemp.js
index a3c822f2..07eff1ff 100644
--- a/lib/device/light-ctemp.js
+++ b/lib/device/light-ctemp.js
@@ -18,6 +18,13 @@ module.exports = class deviceLightColour {
     this.lightService
       .getCharacteristic(this.Characteristic.ColorTemperature)
       .on('set', this.internalCTempUpdate.bind(this))
+    if ((this.platform.config.bulbB02FST64 || '').split(',').includes(accessory.context.eweDeviceId)) {
+      this.minK = 1800
+      this.maxK = 5000
+    } else {
+      this.minK = 2200
+      this.maxK = 6500
+    }
     if (platform.api.versionGreaterOrEqual && platform.api.versionGreaterOrEqual('1.3.0-beta.27')) {
       this.alController = new platform.api.hap.AdaptiveLightingController(this.lightService)
       accessory.configureController(this.alController)
@@ -72,9 +79,8 @@ module.exports = class deviceLightColour {
       const updateKeyColour = Math.random().toString(36).substr(2, 8)
       this.updateKeyCTemp = updateKeyColour
       // HomeKit has a ct range of 140-500 corresponding to 2000-7143K
-      // B02-F-A60 has a range of 2200K-6500K corresponding to ct: 0-255
-      const mToK = Math.max(Math.min(Math.round(1000000 / value), 6500), 2200)
-      const kToCT = Math.round(((mToK - 2200) / 4300) * 255)
+      const mToK = Math.max(Math.min(Math.round(1000000 / value), this.maxK), this.minK)
+      const kToCT = Math.round(((mToK - this.minK) / (this.maxK - this.minK)) * 255)
       const params = {
         switch: this.lightService.getCharacteristic(this.Characteristic.On).value ? 'on' : 'off',
         ltype: 'white',
@@ -110,10 +116,9 @@ module.exports = class deviceLightColour {
             this.lightService.updateCharacteristic(this.Characteristic.Brightness, params.white.br)
           }
           if (this.helpers.hasProperty(params.white, 'ct')) {
-            // B02-F-A60 has a range of 2200K-6500K corresponding to ct: 0-255
             // HomeKit has a ct range of 140-500 corresponding to 2000-7143K
-            const ctToK = Math.round(params.white.ct / 255 * 4300 + 2200)
-            const kToMired = Math.round(1000000 / ctToK)
+            const ctToK = Math.round(params.white.ct / 255 * (this.maxK - this.minK) + this.minK)
+            const kToMired = Math.max(Math.round(1000000 / ctToK), 2000)
             this.lightService.updateCharacteristic(this.Characteristic.ColorTemperature, kToMired)
             this.cacheCT = params.white.ct
           }

From e56089fa24dc92affa3e4f45b8c4b7133dc4905a Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 22 Dec 2020 10:23:35 +0000
Subject: [PATCH 1016/3183] b1 white mode

---
 lib/device/light-colour.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/device/light-colour.js b/lib/device/light-colour.js
index 3382d814..64f8abf3 100644
--- a/lib/device/light-colour.js
+++ b/lib/device/light-colour.js
@@ -242,6 +242,8 @@ module.exports = class deviceLightColour {
                 .updateCharacteristic(this.Characteristic.Hue, newColour[0])
                 .updateCharacteristic(this.Characteristic.Saturation, 100)
                 .updateCharacteristic(this.Characteristic.Brightness, 100)
+            } else {
+              if (params.updateSource) this.log.warn('[%s] white mode is unsupported by this plugin.', this.accessory.displayName)
             }
             break
           case 59:

From cd2ec9a7d352deeabfb1026fce73007fc39c3852 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 22 Dec 2020 10:49:21 +0000
Subject: [PATCH 1017/3183] switch device logging

---
 lib/device/scm.js           |  5 ++++-
 lib/device/switch-multi.js  | 16 ++++++++++------
 lib/device/switch-single.js |  5 ++++-
 lib/device/usb.js           |  5 ++++-
 4 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/lib/device/scm.js b/lib/device/scm.js
index ec42cfae..952ea800 100644
--- a/lib/device/scm.js
+++ b/lib/device/scm.js
@@ -23,6 +23,9 @@ module.exports = class deviceSCM {
       const params = { switches: this.helpers.defaultMultiSwitchOff }
       params.switches[0].switch = value ? 'on' : 'off'
       await this.platform.sendDeviceUpdate(this.accessory, params)
+      this.cacheOnOff = value ? 'on' : 'off'
+      this.accessory.eveService.addEntry({ status: value ? 1 : 0 })
+      this.log('[%s] current state [%s].', this.accessory.displayName, value ? 'on' : 'off')
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
     }
@@ -31,9 +34,9 @@ module.exports = class deviceSCM {
   async externalUpdate (params) {
     try {
       if (!params.switches || params.switches[0].switch === this.cacheOnOff) return
-      this.cacheOnOff = params.switches[0].switch
       const newStatus = params.switches[0].switch === 'on'
       this.service.updateCharacteristic(this.Characteristic.On, newStatus)
+      this.cacheOnOff = params.switches[0].switch
       this.accessory.eveService.addEntry({ status: newStatus ? 1 : 0 })
       if (params.updateSource) this.log('[%s] current state [%s].', this.accessory.displayName, params.switches[0].switch)
     } catch (err) {
diff --git a/lib/device/switch-multi.js b/lib/device/switch-multi.js
index a233ba9b..344ff712 100644
--- a/lib/device/switch-multi.js
+++ b/lib/device/switch-multi.js
@@ -34,7 +34,9 @@ module.exports = class deviceSwitchMulti {
           for (let i = 0; i <= 4; i++) {
             if ((oAccessory = this.platform.devicesInHB.get(this.accessory.context.eweDeviceId + 'SW' + i))) {
               oAccessory.getService(this.Service.Switch).updateCharacteristic(this.Characteristic.On, value)
-              oAccessory.context.cacheStatus = value ? 'on' : 'off'
+              oAccessory.context.cacheOnOff = value ? 'on' : 'off'
+              oAccessory.eveService.addEntry({ status: value ? 1 : 0 })
+              if (i > 0) this.log('[%s] current state [%s].', oAccessory.displayName, value ? 'on' : 'off')
             }
           }
           break
@@ -50,9 +52,11 @@ module.exports = class deviceSwitchMulti {
               }
               if (i === parseInt(this.accessory.context.switchNumber)) {
                 params.switches[i - 1].switch = value ? 'on' : 'off'
-                oAccessory.context.cacheStatus = value ? 'on' : 'off'
+                oAccessory.context.cacheOnOff = value ? 'on' : 'off'
+                oAccessory.eveService.addEntry({ status: value ? 1 : 0 })
+                if (i > 0) this.log('[%s] current state [%s].', oAccessory.displayName, value ? 'on' : 'off')
               } else {
-                params.switches[i - 1].switch = oAccessory.context.cacheStatus
+                params.switches[i - 1].switch = oAccessory.context.cacheOnOff
               }
             } else {
               params.switches[i - 1].switch = 'off'
@@ -61,6 +65,7 @@ module.exports = class deviceSwitchMulti {
           if (!this.platform.hiddenMasters.includes(this.accessory.context.eweDeviceId)) {
             oAccessory = this.platform.devicesInHB.get(this.accessory.context.eweDeviceId + 'SW0')
             oAccessory.getService(this.Service.Switch).updateCharacteristic(this.Characteristic.On, masterState === 'on')
+            oAccessory.eveService.addEntry({ status: masterState === 'on' ? 1 : 0 })
           }
           break
       }
@@ -79,12 +84,11 @@ module.exports = class deviceSwitchMulti {
         if (params.switches[i - 1].switch === 'on') primaryState = true
         if (this.platform.devicesInHB.has(idToCheck + i)) {
           const oAccessory = this.platform.devicesInHB.get(idToCheck + i)
-          if (params.switches[i - 1].switch === oAccessory.context.cacheStatusLog) return
-          oAccessory.context.cacheStatus = params.switches[i - 1].switch
-          oAccessory.context.cacheStatusLog = params.switches[i - 1].switch
+          if (params.switches[i - 1].switch === oAccessory.context.cacheOnOff) continue
           oAccessory
             .getService(this.Service.Switch)
             .updateCharacteristic(this.Characteristic.On, params.switches[i - 1].switch === 'on')
+          oAccessory.context.cacheOnOff = params.switches[i - 1].switch
           oAccessory.eveService.addEntry({ status: params.switches[i - 1].switch === 'on' ? 1 : 0 })
           if (params.updateSource) this.log('[%s] current state [%s].', oAccessory.displayName, params.switches[i - 1].switch)
         }
diff --git a/lib/device/switch-single.js b/lib/device/switch-single.js
index 3c738498..4560c52a 100644
--- a/lib/device/switch-single.js
+++ b/lib/device/switch-single.js
@@ -27,6 +27,9 @@ module.exports = class deviceSwitchSingle {
       await this.platform.sendDeviceUpdate(this.accessory, {
         switch: value ? 'on' : 'off'
       })
+      this.cacheOnOff = value ? 'on' : 'off'
+      this.accessory.eveService.addEntry({ status: value ? 1 : 0 })
+      this.log('[%s] current state [%s].', this.accessory.displayName, value ? 'on' : 'off')
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
     }
@@ -35,9 +38,9 @@ module.exports = class deviceSwitchSingle {
   async externalUpdate (params) {
     try {
       if (!params.switch || params.switch === this.cacheOnOff) return
-      this.cacheOnOff = params.switch
       const newStatus = params.switch === 'on'
       this.switchService.updateCharacteristic(this.Characteristic.On, newStatus)
+      this.cacheOnOff = params.switch
       this.accessory.eveService.addEntry({ status: newStatus ? 1 : 0 })
       if (params.updateSource) this.log('[%s] current state [%s].', this.accessory.displayName, params.switch)
     } catch (err) {
diff --git a/lib/device/usb.js b/lib/device/usb.js
index c9681e3f..1b8cdc9e 100644
--- a/lib/device/usb.js
+++ b/lib/device/usb.js
@@ -33,6 +33,9 @@ module.exports = class deviceUSB {
       const params = { switches: this.helpers.defaultMultiSwitchOff }
       params.switches[0].switch = value ? 'on' : 'off'
       await this.platform.sendDeviceUpdate(this.accessory, params)
+      this.cacheOnOff = value ? 'on' : 'off'
+      this.accessory.eveService.addEntry({ status: value ? 1 : 0 })
+      this.log('[%s] current state [%s].', this.accessory.displayName, value ? 'on' : 'off')
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
     }
@@ -41,9 +44,9 @@ module.exports = class deviceUSB {
   async externalUpdate (params) {
     try {
       if (!params.switches || params.switches[0].switch === this.cacheOnOff) return
-      this.cacheOnOff = params.switches[0].switch
       const newStatus = params.switches[0].switch === 'on'
       this.switchService.updateCharacteristic(this.Characteristic.On, newStatus)
+      this.cacheOnOff = params.switches[0].switch
       this.accessory.eveService.addEntry({ status: newStatus ? 1 : 0 })
       if (params.updateSource) this.log('[%s] current state [%s].', this.accessory.displayName, params.switches[0].switch)
     } catch (err) {

From fa1e9fd04abc2131be2a4b7d1de957379ea7c4f0 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 22 Dec 2020 11:02:53 +0000
Subject: [PATCH 1018/3183] zigbee logging

---
 lib/device/zb-dev.js | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/lib/device/zb-dev.js b/lib/device/zb-dev.js
index d82bdd2c..9a36ec5e 100644
--- a/lib/device/zb-dev.js
+++ b/lib/device/zb-dev.js
@@ -87,8 +87,12 @@ module.exports = class deviceZBDev {
   async internalUpdate (value, callback) {
     try {
       callback()
-      const params = { switch: value ? 'on' : 'off' }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
+      await this.platform.sendDeviceUpdate(this.accessory, {
+        switch: value ? 'on' : 'off'
+      })
+      this.cacheOnOff = value ? 'on' : 'off'
+      this.accessory.eveService.addEntry({ status: value ? 1 : 0 })
+      this.log('[%s] current state [%s].', this.accessory.displayName, value ? 'on' : 'off')
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
     }
@@ -99,9 +103,15 @@ module.exports = class deviceZBDev {
       //* ** credit @tasict ***\\
       if (params.battery) {
         if (this.accessory.context.eweUIID === 3026 && this.platform.config.ZBDWBatt) params.battery *= 10
-        const batt = this.accessory.getService(this.Service.BatteryService) || this.accessory.addService(this.Service.BatteryService)
-        batt.updateCharacteristic(this.Characteristic.BatteryLevel, params.battery)
-        batt.updateCharacteristic(this.Characteristic.StatusLowBattery, params.battery < this.lowBattThreshold)
+        if (params.battery !== this.cacheBattery) {
+          const batt = this.accessory.getService(this.Service.BatteryService) || this.accessory.addService(this.Service.BatteryService)
+          batt.updateCharacteristic(this.Characteristic.BatteryLevel, params.battery)
+          batt.updateCharacteristic(this.Characteristic.StatusLowBattery, params.battery < this.lowBattThreshold)
+          this.cacheBattery = params.battery
+          if (params.updateSource) {
+            this.log('[%s] current battery [%s%].', this.accessory.displayName, params.battery)
+          }
+        }
       }
       switch (this.accessory.context.eweUIID) {
         case 1000:
@@ -113,14 +123,15 @@ module.exports = class deviceZBDev {
           break
         case 1009:
         case 1256:
-          if (this.helpers.hasProperty(params, 'switch') && ['off', 'on'].includes(params.switch)) {
+          if (params.switch && params.switch !== this.cacheOnOff) {
             this.accessory
               .getService(this.Service.Switch)
               .updateCharacteristic(this.Characteristic.On, params.switch === 'on')
+            this.cacheOnOff = params.switch
+            this.accessory.eveService.addEntry({ status: params.switch === 'on' ? 1 : 0 })
             if (params.updateSource) {
               this.log('[%s] current state [%s].', this.accessory.displayName, params.switch)
             }
-            this.accessory.eveService.addEntry({ status: params.switch === 'on' ? 1 : 0 })
           }
           break
         case 1770: {

From a2391b594aeeafc7f61c506f8ee0451b7b9835c0 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 22 Dec 2020 11:33:05 +0000
Subject: [PATCH 1019/3183] device logging

---
 lib/device/outlet.js    | 32 ++++++++++++++++++++++++--------
 lib/device/rf-bridge.js |  2 ++
 2 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/lib/device/outlet.js b/lib/device/outlet.js
index 8d424447..708ef3bf 100644
--- a/lib/device/outlet.js
+++ b/lib/device/outlet.js
@@ -17,7 +17,7 @@ module.exports = class deviceOutlet {
         : this.inUsePowerThreshold
     const self = this
     this.eveCurrentConsumption = function () {
-      self.Characteristic.call(this, 'Current Consumption', this.helpers.eveUUID.currentConsumption)
+      self.Characteristic.call(this, 'Current Consumption', self.helpers.eveUUID.currentConsumption)
       this.setProps({
         format: self.Characteristic.Formats.UINT16,
         unit: 'W',
@@ -29,7 +29,7 @@ module.exports = class deviceOutlet {
       this.value = this.getDefaultValue()
     }
     this.eveTotalConsumption = function () {
-      self.Characteristic.call(this, 'Total Consumption', this.helpers.eveUUID.totalConsumption)
+      self.Characteristic.call(this, 'Total Consumption', self.helpers.eveUUID.totalConsumption)
       this.setProps({
         format: self.Characteristic.Formats.FLOAT,
         unit: 'kWh',
@@ -41,7 +41,7 @@ module.exports = class deviceOutlet {
       this.value = this.getDefaultValue()
     }
     this.eveVoltage = function () {
-      self.Characteristic.call(this, 'Voltage', this.helpers.eveUUID.voltage)
+      self.Characteristic.call(this, 'Voltage', self.helpers.eveUUID.voltage)
       this.setProps({
         format: self.Characteristic.Formats.FLOAT,
         unit: 'V',
@@ -53,7 +53,7 @@ module.exports = class deviceOutlet {
       this.value = this.getDefaultValue()
     }
     this.eveElectricCurrent = function () {
-      self.Characteristic.call(this, 'Electric Current', this.helpers.eveUUID.electricCurrent)
+      self.Characteristic.call(this, 'Electric Current', self.helpers.eveUUID.electricCurrent)
       this.setProps({
         format: self.Characteristic.Formats.FLOAT,
         unit: 'A',
@@ -65,7 +65,7 @@ module.exports = class deviceOutlet {
       this.value = this.getDefaultValue()
     }
     this.eveResetTotal = function () {
-      self.Characteristic.call(this, 'Reset Total', this.helpers.eveUUID.resetTotal)
+      self.Characteristic.call(this, 'Reset Total', self.helpers.eveUUID.resetTotal)
       this.setProps({
         format: self.Characteristic.Formats.UINT32,
         perms: [self.Characteristic.Perms.READ, self.Characteristic.Perms.NOTIFY, self.Characteristic.Perms.WRITE]
@@ -126,8 +126,9 @@ module.exports = class deviceOutlet {
   async internalUpdate (value, callback) {
     try {
       callback()
-      const params = { switch: value ? 'on' : 'off' }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
+      await this.platform.sendDeviceUpdate(this.accessory, { switch: value ? 'on' : 'off' })
+      this.cacheOnOff = value ? 'on' : 'off'
+      this.log('[%s] current state [%s].', this.accessory.displayName, value ? 'on' : 'off')
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
     }
@@ -135,12 +136,15 @@ module.exports = class deviceOutlet {
 
   async externalUpdate (params) {
     try {
-      if (this.helpers.hasProperty(params, 'switch')) {
+      if (params.switch && params.switch !== this.cacheOnOff) {
         this.outletService.updateCharacteristic(this.Characteristic.On, params.switch === 'on')
+        this.cacheOnOff = params.switch
+        if (params.updateSource) this.log('[%s] current state [%s].', this.accessory.displayName, params.switch)
         if (!this.accessory.context.powerReadings) {
           this.outletService.updateCharacteristic(this.Characteristic.OutletInUse, params.switch === 'on')
         }
       }
+      let logger = false
       if (this.helpers.hasProperty(params, 'power')) {
         this.accessory.context.powerReadings = true
         this.outletService
@@ -149,12 +153,24 @@ module.exports = class deviceOutlet {
         const isOn = this.accessory.getService(this.Service.Outlet).getCharacteristic(this.Characteristic.On).value
         this.accessory.eveService.addEntry({ power: isOn ? parseFloat(params.power) : 0 })
         this.accessory.context.energyReadings.push(parseFloat(params.power))
+        logger = true
       }
       if (this.helpers.hasProperty(params, 'voltage')) {
         this.outletService.updateCharacteristic(this.eveVoltage, parseFloat(params.voltage))
+        logger = true
       }
       if (this.helpers.hasProperty(params, 'current')) {
         this.outletService.updateCharacteristic(this.eveElectricCurrent, parseFloat(params.current))
+        logger = true
+      }
+      if (params.updateSource && logger) {
+        this.log(
+          '[%s] current%s%s%s.',
+          this.accessory.displayName,
+          this.helpers.hasProperty(params, 'power') ? ' power [' + params.power + 'W]' : '',
+          this.helpers.hasProperty(params, 'voltage') ? ' voltage [' + params.power + 'V]' : '',
+          this.helpers.hasProperty(params, 'current') ? ' current [' + params.power + 'A]' : ''
+        )
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
diff --git a/lib/device/rf-bridge.js b/lib/device/rf-bridge.js
index fdd7f892..8f24fdc4 100644
--- a/lib/device/rf-bridge.js
+++ b/lib/device/rf-bridge.js
@@ -118,6 +118,7 @@ module.exports = class deviceRFBridge {
         })
         if (oAccessory) {
           oAccessory.getService(oAccessory.context.buttons[params.rfChl]).updateCharacteristic(this.Characteristic.On, 1)
+          if (params.updateSource) this.log('[%s] current state [button triggered]', oAccessory.displayName)
           this.helpers.sleep(3000)
           oAccessory.getService(oAccessory.context.buttons[params.rfChl]).updateCharacteristic(this.Characteristic.On, 0)
         } else {
@@ -201,6 +202,7 @@ module.exports = class deviceRFBridge {
                 }
                 oAccessory.getService(serv).updateCharacteristic(char, 1)
                 oAccessory.eveService.addEntry({ status: 1 })
+                if (params.updateSource) this.log('[%s] current state [sensor triggered]', oAccessory.displayName)
                 await this.helpers.sleep(sensorTimeLength * 1000)
                 oAccessory.getService(serv).updateCharacteristic(char, 0)
                 oAccessory.eveService.addEntry({ status: 0 })

From bf14970a503355abaa617ffc5c6d47c42bb8c849 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 22 Dec 2020 12:10:58 +0000
Subject: [PATCH 1020/3183] device logging

---
 lib/device/light-dimmer.js | 54 ++++++++++++++++++++++----------------
 1 file changed, 31 insertions(+), 23 deletions(-)

diff --git a/lib/device/light-dimmer.js b/lib/device/light-dimmer.js
index 14fae561..d3bc9acd 100644
--- a/lib/device/light-dimmer.js
+++ b/lib/device/light-dimmer.js
@@ -20,8 +20,11 @@ module.exports = class deviceLightDimmer {
   async internalOnOffUpdate (value, callback) {
     try {
       callback()
-      const params = { switch: value ? 'on' : 'off' }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
+      await this.platform.sendDeviceUpdate(this.accessory, {
+        switch: value ? 'on' : 'off'
+      })
+      this.cacheOnOff = value ? 'on' : 'off'
+      this.log('[%s] current state [%s].', this.accessory.displayName, value ? 'on' : 'off')
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
     }
@@ -30,8 +33,6 @@ module.exports = class deviceLightDimmer {
   async internalBrightnessUpdate (value, callback) {
     try {
       callback()
-      if (this.lastSentBrightness === value) return
-      this.lastSentBrightness = value
       const params = {}
       const updateKey = Math.random().toString(36).substr(2, 8)
       this.updateKeyBright = updateKey
@@ -46,9 +47,11 @@ module.exports = class deviceLightDimmer {
           params.mode = 0
           break
       }
-      await this.helpers.sleep(350)
+      await this.helpers.sleep(500)
       if (updateKey !== this.updateKeyBright) return
       await this.platform.sendDeviceUpdate(this.accessory, params)
+      this.cacheBrightness = value
+      this.log('[%s] current brightness [%s%].', this.accessory.displayName, value)
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
     }
@@ -56,28 +59,33 @@ module.exports = class deviceLightDimmer {
 
   async externalUpdate (params) {
     try {
-      const isOn = this.helpers.hasProperty(params, 'switch')
-        ? params.switch === 'on'
-        : this.lightService.getCharacteristic(this.Characteristic.On).value
-      if (isOn) {
-        this.lightService.updateCharacteristic(this.Characteristic.On, true)
-        switch (this.accessory.context.eweUIID) {
-          case 36:
-            // *** KING-M4 eWeLink scale is 10-100 and HomeKit scale is 0-100. *** \\
-            if (this.helpers.hasProperty(params, 'bright')) {
-              const nb = Math.round(((params.bright - 10) * 10) / 9)
+      if (params.switch && params.switch !== this.cacheOnOff) {
+        this.switchService.updateCharacteristic(this.Characteristic.On, params.switch === 'on')
+        this.cacheOnOff = params.switch
+        if (params.updateSource) this.log('[%s] current state [%s].', this.accessory.displayName, params.switch)
+      }
+      switch (this.accessory.context.eweUIID) {
+        case 36:
+          // *** KING-M4 eWeLink scale is 10-100 and HomeKit scale is 0-100. *** \\
+          if (this.helpers.hasProperty(params, 'bright')) {
+            const nb = Math.round(((params.bright - 10) * 10) / 9)
+            if (nb !== this.cacheBrightness) {
               this.lightService.updateCharacteristic(this.Characteristic.Brightness, nb)
+              this.cacheBrightness = nb
+              if (params.updateSource) this.log('[%s] current brightness [%s%].', this.accessory.displayName, nb)
             }
-            break
-          case 44:
-            // *** D1 eWeLink scale matches HomeKit scale of 0-100 *** \\
-            if (this.helpers.hasProperty(params, 'brightness')) {
+          }
+          break
+        case 44:
+          // *** D1 eWeLink scale matches HomeKit scale of 0-100 *** \\
+          if (this.helpers.hasProperty(params, 'brightness')) {
+            if (params.brightness !== this.cacheBrightness) {
               this.lightService.updateCharacteristic(this.Characteristic.Brightness, params.brightness)
+              this.cacheBrightness = params.brightness
+              if (params.updateSource) this.log('[%s] current brightness [%s%].', this.accessory.displayName, params.brightness)
             }
-            break
-        }
-      } else {
-        this.lightService.updateCharacteristic(this.Characteristic.On, false)
+          }
+          break
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)

From 150f5ce2db0b0b70d2a3521cef21e5eabc4efbd8 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 22 Dec 2020 15:58:37 +0000
Subject: [PATCH 1021/3183] mired range

---
 lib/device/light-ctemp.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/device/light-ctemp.js b/lib/device/light-ctemp.js
index 07eff1ff..16dba6f5 100644
--- a/lib/device/light-ctemp.js
+++ b/lib/device/light-ctemp.js
@@ -118,7 +118,7 @@ module.exports = class deviceLightColour {
           if (this.helpers.hasProperty(params.white, 'ct')) {
             // HomeKit has a ct range of 140-500 corresponding to 2000-7143K
             const ctToK = Math.round(params.white.ct / 255 * (this.maxK - this.minK) + this.minK)
-            const kToMired = Math.max(Math.round(1000000 / ctToK), 2000)
+            const kToMired = Math.min(Math.max(Math.round(1000000 / ctToK), 140), 500)
             this.lightService.updateCharacteristic(this.Characteristic.ColorTemperature, kToMired)
             this.cacheCT = params.white.ct
           }

From 4260b953567e409ed52116020d80e675c08cb98d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 22 Dec 2020 15:59:11 +0000
Subject: [PATCH 1022/3183] 3.18.2-10

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 12a48e9f..85a85340 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.18.2-9",
+  "version": "3.18.2-10",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index fe3c0721..ffdcd678 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.18.2-9",
+  "version": "3.18.2-10",
   "author": "bwp91",
   "description": "Homebridge/HOOBS plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 07cd696bfd20b9e08b16ba6f09a736c47fc8eff2 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 22 Dec 2020 17:31:28 +0000
Subject: [PATCH 1023/3183] range

---
 lib/device/light-colour.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/lib/device/light-colour.js b/lib/device/light-colour.js
index 64f8abf3..bcc49381 100644
--- a/lib/device/light-colour.js
+++ b/lib/device/light-colour.js
@@ -33,12 +33,10 @@ module.exports = class deviceLightColour {
       this.lightService
         .getCharacteristic(this.Characteristic.ColorTemperature)
         .on('set', this.internalCTempUpdate.bind(this))
-      /*
       if (platform.api.versionGreaterOrEqual && platform.api.versionGreaterOrEqual('1.3.0-beta.27')) {
         this.alController = new platform.api.hap.AdaptiveLightingController(this.lightService)
         accessory.configureController(this.alController)
       }
-      */
     }
     this.accessory = accessory
   }
@@ -290,7 +288,7 @@ module.exports = class deviceLightColour {
                 // HomeKit has a ct range of 140-500 corresponding to 2000-7143K
                 // These devices have a range of 2700K-6500K corresponding to ct: 0-255
                 const ctToK = Math.round(params.white.ct / 255 * 3800 + 2700)
-                const kToMired = Math.round(1000000 / ctToK)
+                const kToMired = Math.max(Math.min(Math.round(1000000 / ctToK), 500), 140)
                 this.lightService.updateCharacteristic(this.Characteristic.ColorTemperature, kToMired)
                 this.cacheMode = 'white'
                 this.cacheCTemp = params.white.ct

From 0c82e219cd11bda46e389e9269cd45b1d3bda505 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 22 Dec 2020 17:31:54 +0000
Subject: [PATCH 1024/3183] 3.18.2-11

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 85a85340..dbb9d33f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.18.2-10",
+  "version": "3.18.2-11",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index ffdcd678..3d8a5485 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.18.2-10",
+  "version": "3.18.2-11",
   "author": "bwp91",
   "description": "Homebridge/HOOBS plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From fe23824f0afead0f88f401e10d6e5a56bb350c7c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 22 Dec 2020 20:42:12 +0000
Subject: [PATCH 1025/3183] device logging

---
 lib/device/light-ctemp.js  | 75 +++++++++++++++++++++++---------------
 lib/device/light-dimmer.js | 10 +++--
 2 files changed, 52 insertions(+), 33 deletions(-)

diff --git a/lib/device/light-ctemp.js b/lib/device/light-ctemp.js
index 16dba6f5..9ba087ac 100644
--- a/lib/device/light-ctemp.js
+++ b/lib/device/light-ctemp.js
@@ -35,10 +35,15 @@ module.exports = class deviceLightColour {
   async internalOnOffUpdate (value, callback) {
     try {
       callback()
-      const params = { switch: value ? 'on' : 'off' }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
+      const onoff = value ? 'on' : 'off'
+      if (onoff === this.cacheOnOff) return
       this.ignoreForAMoment = true
-      setTimeout(() => (this.ignoreForAMoment = false), 3000)
+      setTimeout(() => (this.ignoreForAMoment = false), 10000)
+      await this.platform.sendDeviceUpdate(this.accessory, {
+        switch: onoff
+      })
+      this.cacheOnOff = onoff
+      this.log('[%s] current state [%s].', this.accessory.displayName, onoff)
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
     }
@@ -62,9 +67,11 @@ module.exports = class deviceLightColour {
       }
       await this.helpers.sleep(500)
       if (updateKeyBright !== this.updateKeyBright) return
-      await this.platform.sendDeviceUpdate(this.accessory, params)
       this.ignoreForAMoment = true
-      setTimeout(() => (this.ignoreForAMoment = false), 3000)
+      setTimeout(() => (this.ignoreForAMoment = false), 10000)
+      await this.platform.sendDeviceUpdate(this.accessory, params)
+      this.cacheBrightness = value
+      this.log('[%s] current brightness [%s%].', this.accessory.displayName, value)
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
     }
@@ -74,27 +81,26 @@ module.exports = class deviceLightColour {
     try {
       await this.helpers.sleep(1500)
       callback()
-      if (this.cacheLastCTemp === value) return
-      this.cacheLastCTemp = value
-      const updateKeyColour = Math.random().toString(36).substr(2, 8)
-      this.updateKeyCTemp = updateKeyColour
-      // HomeKit has a ct range of 140-500 corresponding to 2000-7143K
       const mToK = Math.max(Math.min(Math.round(1000000 / value), this.maxK), this.minK)
       const kToCT = Math.round(((mToK - this.minK) / (this.maxK - this.minK)) * 255)
+      if (this.cacheCT === kToCT) return
+      const updateKeyCT = Math.random().toString(36).substr(2, 8)
+      this.updateKeyCT = updateKeyCT
+      // HomeKit has a ct range of 140-500 corresponding to 2000-7143K
       const params = {
-        switch: this.lightService.getCharacteristic(this.Characteristic.On).value ? 'on' : 'off',
         ltype: 'white',
         white: {
           br: this.lightService.getCharacteristic(this.Characteristic.Brightness).value,
           ct: kToCT
         }
       }
-      this.cacheCT = kToCT
       await this.helpers.sleep(500)
-      if (updateKeyColour !== this.updateKeyCTemp) return
-      await this.platform.sendDeviceUpdate(this.accessory, params)
+      if (updateKeyCT !== this.updateKeyCT) return
       this.ignoreForAMoment = true
-      setTimeout(() => (this.ignoreForAMoment = false), 3000)
+      setTimeout(() => (this.ignoreForAMoment = false), 10000)
+      await this.platform.sendDeviceUpdate(this.accessory, params)
+      this.cacheCT = kToCT
+      this.log('[%s] current cct [%sK].', this.accessory.displayName, mToK)
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
     }
@@ -103,28 +109,39 @@ module.exports = class deviceLightColour {
   async externalUpdate (params) {
     try {
       if (this.ignoreForAMoment) return
+      if (params.switch && params.switch !== this.cacheOnOff) {
+        this.lightService.updateCharacteristic(this.Characteristic.On, params.switch === 'on')
+        this.cacheOnOff = params.switch
+        if (params.updateSource) this.log('[%s] current state [%s].', this.accessory.displayName, params.switch)
+      }
       let isOn = false
       if (this.helpers.hasProperty(params, 'switch')) {
         isOn = params.switch === 'on'
       } else {
         isOn = this.lightService.getCharacteristic(this.Characteristic.On).value
       }
-      if (isOn) {
-        this.lightService.updateCharacteristic(this.Characteristic.On, true)
-        if (this.helpers.hasProperty(params, 'white')) {
-          if (this.helpers.hasProperty(params.white, 'br')) {
-            this.lightService.updateCharacteristic(this.Characteristic.Brightness, params.white.br)
-          }
-          if (this.helpers.hasProperty(params.white, 'ct')) {
-            // HomeKit has a ct range of 140-500 corresponding to 2000-7143K
-            const ctToK = Math.round(params.white.ct / 255 * (this.maxK - this.minK) + this.minK)
-            const kToMired = Math.min(Math.max(Math.round(1000000 / ctToK), 140), 500)
-            this.lightService.updateCharacteristic(this.Characteristic.ColorTemperature, kToMired)
-            this.cacheCT = params.white.ct
+      if (params.white) {
+        if (this.helpers.hasProperty(params.white, 'br') && this.cacheBrightness !== params.white.br) {
+          this.lightService.updateCharacteristic(this.Characteristic.Brightness, params.white.br)
+          this.cacheBrightness = params.white.br
+          if (params.updateSource) this.log('[%s] current brightness [%s%].', this.accessory.displayName, params.white.br)
+        }
+        if (this.helpers.hasProperty(params.white, 'ct') && this.cacheCT !== params.white.ct) {
+          const ctToK = Math.round(params.white.ct / 255 * (this.maxK - this.minK) + this.minK)
+          const kToMired = Math.min(Math.max(Math.round(1000000 / ctToK), 140), 500)
+          this.lightService.updateCharacteristic(this.Characteristic.ColorTemperature, kToMired)
+          if (params.updateSource && this.alController && Math.abs(this.cacheCT - params.white.ct) > 5) {
+            this.alController.disableAdaptiveLighting()
+            this.log(
+              '[%s] adaptive lighting disabled due to variance in ct [prev:%s now:%s].',
+              this.accessory.displayName,
+              this.cacheCT,
+              params.white.ct
+            )
           }
+          this.cacheCT = params.white.ct
+          if (params.updateSource) this.log('[%s] current cct [%sK].', this.accessory.displayName, ctToK)
         }
-      } else {
-        this.lightService.updateCharacteristic(this.Characteristic.On, false)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
diff --git a/lib/device/light-dimmer.js b/lib/device/light-dimmer.js
index d3bc9acd..073359a4 100644
--- a/lib/device/light-dimmer.js
+++ b/lib/device/light-dimmer.js
@@ -20,11 +20,13 @@ module.exports = class deviceLightDimmer {
   async internalOnOffUpdate (value, callback) {
     try {
       callback()
+      const onoff = value ? 'on' : 'off'
+      if (onoff === this.cacheOnOff) return
       await this.platform.sendDeviceUpdate(this.accessory, {
-        switch: value ? 'on' : 'off'
+        switch: onoff
       })
-      this.cacheOnOff = value ? 'on' : 'off'
-      this.log('[%s] current state [%s].', this.accessory.displayName, value ? 'on' : 'off')
+      this.cacheOnOff = onoff
+      this.log('[%s] current state [%s].', this.accessory.displayName, onoff)
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
     }
@@ -60,7 +62,7 @@ module.exports = class deviceLightDimmer {
   async externalUpdate (params) {
     try {
       if (params.switch && params.switch !== this.cacheOnOff) {
-        this.switchService.updateCharacteristic(this.Characteristic.On, params.switch === 'on')
+        this.lightService.updateCharacteristic(this.Characteristic.On, params.switch === 'on')
         this.cacheOnOff = params.switch
         if (params.updateSource) this.log('[%s] current state [%s].', this.accessory.displayName, params.switch)
       }

From 47d11183abfefdd0499e8df7ccc86ede0a43a078 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 22 Dec 2020 20:44:53 +0000
Subject: [PATCH 1026/3183] unneeded

---
 lib/device/light-ctemp.js | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/lib/device/light-ctemp.js b/lib/device/light-ctemp.js
index 9ba087ac..342d4480 100644
--- a/lib/device/light-ctemp.js
+++ b/lib/device/light-ctemp.js
@@ -114,12 +114,6 @@ module.exports = class deviceLightColour {
         this.cacheOnOff = params.switch
         if (params.updateSource) this.log('[%s] current state [%s].', this.accessory.displayName, params.switch)
       }
-      let isOn = false
-      if (this.helpers.hasProperty(params, 'switch')) {
-        isOn = params.switch === 'on'
-      } else {
-        isOn = this.lightService.getCharacteristic(this.Characteristic.On).value
-      }
       if (params.white) {
         if (this.helpers.hasProperty(params.white, 'br') && this.cacheBrightness !== params.white.br) {
           this.lightService.updateCharacteristic(this.Characteristic.Brightness, params.white.br)

From c83f0fc9859048cbbf93245d060cca0ecc28dc2f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 22 Dec 2020 20:45:30 +0000
Subject: [PATCH 1027/3183] 3.18.2-12

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index dbb9d33f..410bb087 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.18.2-11",
+  "version": "3.18.2-12",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 3d8a5485..32dc9c9c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.18.2-11",
+  "version": "3.18.2-12",
   "author": "bwp91",
   "description": "Homebridge/HOOBS plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From c9868da6bb40e6e1ae1d4fd7453da000b9efbf0d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 22 Dec 2020 20:57:07 +0000
Subject: [PATCH 1028/3183] switch is needed

---
 lib/device/light-ctemp.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/device/light-ctemp.js b/lib/device/light-ctemp.js
index 342d4480..fba9f264 100644
--- a/lib/device/light-ctemp.js
+++ b/lib/device/light-ctemp.js
@@ -59,6 +59,7 @@ module.exports = class deviceLightColour {
       this.updateKeyBright = updateKeyBright
       // *** Device needs the current ct value sent too *** \\
       const params = {
+        switch: this.cacheOnOff,
         ltype: 'white',
         white: {
           br: value,
@@ -88,6 +89,7 @@ module.exports = class deviceLightColour {
       this.updateKeyCT = updateKeyCT
       // HomeKit has a ct range of 140-500 corresponding to 2000-7143K
       const params = {
+        switch: this.cacheOnOff,
         ltype: 'white',
         white: {
           br: this.lightService.getCharacteristic(this.Characteristic.Brightness).value,
@@ -108,7 +110,6 @@ module.exports = class deviceLightColour {
 
   async externalUpdate (params) {
     try {
-      if (this.ignoreForAMoment) return
       if (params.switch && params.switch !== this.cacheOnOff) {
         this.lightService.updateCharacteristic(this.Characteristic.On, params.switch === 'on')
         this.cacheOnOff = params.switch
@@ -120,7 +121,7 @@ module.exports = class deviceLightColour {
           this.cacheBrightness = params.white.br
           if (params.updateSource) this.log('[%s] current brightness [%s%].', this.accessory.displayName, params.white.br)
         }
-        if (this.helpers.hasProperty(params.white, 'ct') && this.cacheCT !== params.white.ct) {
+        if (this.helpers.hasProperty(params.white, 'ct') && this.cacheCT !== params.white.ct && this.ignoreForAMoment) {
           const ctToK = Math.round(params.white.ct / 255 * (this.maxK - this.minK) + this.minK)
           const kToMired = Math.min(Math.max(Math.round(1000000 / ctToK), 140), 500)
           this.lightService.updateCharacteristic(this.Characteristic.ColorTemperature, kToMired)

From ddfede4a3696231d0aefc5a498aeee81a417fa8f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 22 Dec 2020 20:57:56 +0000
Subject: [PATCH 1029/3183] should be a warner

---
 lib/device/light-ctemp.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/device/light-ctemp.js b/lib/device/light-ctemp.js
index fba9f264..eb9492ea 100644
--- a/lib/device/light-ctemp.js
+++ b/lib/device/light-ctemp.js
@@ -127,7 +127,7 @@ module.exports = class deviceLightColour {
           this.lightService.updateCharacteristic(this.Characteristic.ColorTemperature, kToMired)
           if (params.updateSource && this.alController && Math.abs(this.cacheCT - params.white.ct) > 5) {
             this.alController.disableAdaptiveLighting()
-            this.log(
+            this.log.warn(
               '[%s] adaptive lighting disabled due to variance in ct [prev:%s now:%s].',
               this.accessory.displayName,
               this.cacheCT,

From 5c615b0172203b283b76e20fdd3990ca5c9ca001 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 23 Dec 2020 15:11:09 +0000
Subject: [PATCH 1030/3183] color/ctemp bulbs

---
 lib/device/light-colour.js | 282 +++++++++++++++----------
 lib/device/light-ctemp.js  |  54 +++--
 lib/utils/helpers.js       | 418 ++++++++++++++++++++++++++++++++++++-
 3 files changed, 612 insertions(+), 142 deletions(-)

diff --git a/lib/device/light-colour.js b/lib/device/light-colour.js
index bcc49381..99af0967 100644
--- a/lib/device/light-colour.js
+++ b/lib/device/light-colour.js
@@ -29,31 +29,39 @@ module.exports = class deviceLightColour {
           minStep: 100
         })
     }
+    this.accessory = accessory
     if (accessory.context.eweUIID === 104) {
+      // HomeKit has a range of 140-500M corresponding to 2000-7143K
+      // Devices have a range of 2700K-6500K corresponding to ewelink ct: 0-255
       this.lightService
         .getCharacteristic(this.Characteristic.ColorTemperature)
         .on('set', this.internalCTempUpdate.bind(this))
       if (platform.api.versionGreaterOrEqual && platform.api.versionGreaterOrEqual('1.3.0-beta.27')) {
         this.alController = new platform.api.hap.AdaptiveLightingController(this.lightService)
-        accessory.configureController(this.alController)
+        this.accessory.configureController(this.alController)
       }
     }
-    this.accessory = accessory
   }
 
   async internalOnOffUpdate (value, callback) {
     try {
       callback()
       const params = {}
+      const onoff = value ? 'on' : 'off'
+      if (onoff === this.cacheOnOff) return
       if (this.accessory.context.eweUIID === 22) {
-        // **** B1 uses state rather than switch *** \\
-        params.state = value ? 'on' : 'off'
+        params.state = onoff
       } else {
-        params.switch = value ? 'on' : 'off'
+        params.switch = onoff
       }
+      const timerKey = Math.random().toString(36).substr(2, 8)
+      this.updateTimeout = timerKey
+      setTimeout(() => {
+        if (this.updateTimeout === timerKey) this.updateTimeout = false
+      }, 10000)
       await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.ignoreForAMoment = true
-      setTimeout(() => (this.ignoreForAMoment = false), 3000)
+      this.cacheOnOff = onoff
+      this.log('[%s] current state [%s].', this.accessory.displayName, onoff)
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
     }
@@ -61,11 +69,9 @@ module.exports = class deviceLightColour {
 
   async internalBrightnessUpdate (value, callback) {
     try {
-      let params
-      await this.helpers.sleep(750)
       callback()
-      if (this.lastSentBrightness === value) return
-      this.lastSentBrightness = value
+      if (this.cacheBrightness === value) return
+      let params
       const updateKeyBright = Math.random().toString(36).substr(2, 8)
       this.updateKeyBright = updateKeyBright
       switch (this.accessory.context.eweUIID) {
@@ -81,13 +87,12 @@ module.exports = class deviceLightColour {
           break
         case 104:
           // *** B02-B-A60, B05-B-A60, GTLC104 *** \\
-          // *** need the current colour values sent too *** \\
           if (this.cacheMode === 'white') {
             params = {
               ltype: 'white',
               white: {
                 br: value,
-                ct: this.cacheCTemp
+                ct: this.cacheCT
               }
             }
           } else {
@@ -103,11 +108,15 @@ module.exports = class deviceLightColour {
           }
           break
       }
-      await this.helpers.sleep(500)
+      await this.helpers.sleep(750)
       if (updateKeyBright !== this.updateKeyBright) return
+      this.updateTimeout = updateKeyBright
+      setTimeout(() => {
+        if (this.updateTimeout === updateKeyBright) this.updateTimeout = false
+      }, 10000)
       await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.ignoreForAMoment = true
-      setTimeout(() => (this.ignoreForAMoment = false), 3000)
+      this.cacheBrightness = value
+      this.log('[%s] current brightness [%s%].', this.accessory.displayName, value)
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
     }
@@ -115,10 +124,8 @@ module.exports = class deviceLightColour {
 
   async internalColourUpdate (value, callback) {
     try {
-      await this.helpers.sleep(1500)
+      this.lightService.updateCharacteristic(this.Characteristic.ColorTemperature, 140)
       callback()
-      if (this.lastSentColour === value) return
-      this.lastSentColour = value
       let params
       const newRGB = this.helpers.hs2rgb([value, this.lightService.getCharacteristic(this.Characteristic.Saturation).value])
       const updateKeyColour = Math.random().toString(36).substr(2, 8)
@@ -150,23 +157,31 @@ module.exports = class deviceLightColour {
           params = {
             ltype: 'color',
             color: {
-              br: this.lightService.getCharacteristic(this.Characteristic.Brightness).value,
+              br: this.cacheBrightness,
               r: newRGB[0],
               g: newRGB[1],
               b: newRGB[2]
             }
           }
-          this.cacheMode = 'colour'
+          this.cacheMode = 'color'
           this.cacheR = newRGB[0]
           this.cacheG = newRGB[1]
           this.cacheB = newRGB[2]
           break
       }
-      await this.helpers.sleep(500)
+      await this.helpers.sleep(1500)
       if (updateKeyColour !== this.updateKeyColour) return
-      await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.ignoreForAMoment = true
-      setTimeout(() => (this.ignoreForAMoment = false), 3000)
+      if (this.cacheOnOff === 'on') {
+        this.updateTimeout = updateKeyColour
+        setTimeout(() => {
+          if (this.updateTimeout === updateKeyColour) this.updateTimeout = false
+        }, 10000)
+        await this.platform.sendDeviceUpdate(this.accessory, params)
+      }
+      this.cacheR = this.accessory.context.eweUIID === 22 ? newRGB[0].toString() : newRGB[0]
+      this.cacheG = this.accessory.context.eweUIID === 22 ? newRGB[1].toString() : newRGB[1]
+      this.cacheB = this.accessory.context.eweUIID === 22 ? newRGB[2].toString() : newRGB[2]
+      this.log('[%s] current colour [rgb %s, %s, %s].', this.accessory.displayName, this.cacheR, this.cacheG, this.cacheB)
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
     }
@@ -174,32 +189,39 @@ module.exports = class deviceLightColour {
 
   async internalCTempUpdate (value, callback) {
     try {
-      await this.helpers.sleep(1500)
+      const hs = this.helpers.m2hs(value)
+      this.lightService
+        .updateCharacteristic(this.Characteristic.Hue, hs[0])
+        .updateCharacteristic(this.Characteristic.Saturation, hs[1])
       callback()
+      const mToK = Math.max(Math.min(Math.round(1000000 / value), 6500), 2700)
+      const kToCT = Math.round(((mToK - 2700) / 3800) * 255)
       if (this.cacheLastCTemp === value) return
       this.cacheLastCTemp = value
       if (this.accessory.context.eweUIID !== 104) return
       const updateKeyCTemp = Math.random().toString(36).substr(2, 8)
       this.updateKeyCTemp = updateKeyCTemp
-      // *** B02-B-A60, B05-B-A60, GTLC104 *** \\
-      // HomeKit has a ct range of 140-500 corresponding to 2000-7143K
-      // These devices have a range of 2700K-6500K corresponding to ct: 0-255
-      const kelvin = Math.max(Math.min(Math.round(1000000 / value), 6500), 2700)
-      const kToCT = Math.round(((kelvin - 2700) / 3800) * 255)
+      if (this.cacheCT === kToCT) return
+      const updateKeyCT = Math.random().toString(36).substr(2, 8)
+      this.updateKeyCT = updateKeyCT
       const params = {
         ltype: 'white',
         white: {
-          br: this.lightService.getCharacteristic(this.Characteristic.Brightness).value,
+          br: this.cacheBrightness,
           ct: kToCT
         }
       }
-      this.cacheMode = 'white'
-      this.cacheCTemp = kToCT
-      await this.helpers.sleep(500)
-      if (updateKeyCTemp !== this.updateKeyCTemp) return
-      await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.ignoreForAMoment = true
-      setTimeout(() => (this.ignoreForAMoment = false), 3000)
+      await this.helpers.sleep(1500)
+      if (updateKeyCT !== this.updateKeyCT) return
+      if (this.cacheOnOff === 'on') {
+        this.updateTimeout = updateKeyCT
+        setTimeout(() => {
+          if (this.updateTimeout === updateKeyCT) this.updateTimeout = false
+        }, 10000)
+        await this.platform.sendDeviceUpdate(this.accessory, params)
+      }
+      this.cacheCT = kToCT
+      this.log('[%s] current cct [%sK].', this.accessory.displayName, mToK)
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
     }
@@ -207,97 +229,143 @@ module.exports = class deviceLightColour {
 
   async externalUpdate (params) {
     try {
-      if (this.ignoreForAMoment) return
-      let newColour
-      let mode
-      let isOn = false
-      if (this.accessory.context.eweUIID === 22 && this.helpers.hasProperty(params, 'state')) {
-        isOn = params.state === 'on'
-      } else if (this.accessory.context.eweUIID !== 22 && this.helpers.hasProperty(params, 'switch')) {
-        isOn = params.switch === 'on'
-      } else {
-        isOn = this.lightService.getCharacteristic(this.Characteristic.On).value
+      if (this.updateTimeout) return
+      if (
+        (this.accessory.context.eweUIID === 22 && params.state && params.state !== this.cacheOnOff) ||
+        (this.accessory.context.eweUIID !== 22 && params.switch && params.switch !== this.cacheOnOff)
+      ) {
+        const newState = this.accessory.context.eweUIID === 22 ? params.state : params.switch
+        this.lightService.updateCharacteristic(this.Characteristic.On, newState === 'on')
+        if (this.accessory.context.eweUIID === 22) {
+          this.lightService.updateCharacteristic(this.Characteristic.Brightness, 100)
+        }
+        this.cacheOnOff = newState
+        if (params.updateSource) this.log('[%s] current state [%s].', this.accessory.displayName, newState)
       }
-      if (isOn) {
-        this.lightService.updateCharacteristic(this.Characteristic.On, true)
-        switch (this.accessory.context.eweUIID) {
-          case 22:
-            // *** B1 *** \\
-            if (this.helpers.hasProperty(params, 'zyx_mode')) {
-              mode = parseInt(params.zyx_mode)
-            } else if (this.helpers.hasProperty(params, 'channel0') && parseInt(params.channel0) + parseInt(params.channel1) > 0) {
-              mode = 1
-            } else {
-              mode = 2
-            }
-            if (mode === 2) {
-              newColour = this.helpers.rgb2hs([
-                parseInt(params.channel2),
-                parseInt(params.channel3),
-                parseInt(params.channel4)
-              ])
-              this.lightService
-                .updateCharacteristic(this.Characteristic.Hue, newColour[0])
-                .updateCharacteristic(this.Characteristic.Saturation, 100)
-                .updateCharacteristic(this.Characteristic.Brightness, 100)
-            } else {
-              if (params.updateSource) this.log.warn('[%s] white mode is unsupported by this plugin.', this.accessory.displayName)
+      let hs
+      let mode
+      switch (this.accessory.context.eweUIID) {
+        case 22:
+          // *** B1 *** \\
+          if (params.zyx_mode) {
+            mode = parseInt(params.zyx_mode)
+          } else if (this.helpers.hasProperty(params, 'channel0') && parseInt(params.channel0) + parseInt(params.channel1) > 0) {
+            mode = 1
+          } else {
+            mode = 2
+          }
+          if (mode === 2) {
+            if (this.helpers.hasProperty(params, 'channel2')) {
+              if (params.channel2 !== this.cacheR || params.channel3 !== this.cacheG || params.channel4 !== this.cacheB) {
+                hs = this.helpers.rgb2hs([params.channel2, params.channel3, params.channel4])
+                this.lightService
+                  .updateCharacteristic(this.Characteristic.Hue, hs[0])
+                  .updateCharacteristic(this.Characteristic.Saturation, 100)
+                  .updateCharacteristic(this.Characteristic.Brightness, 100)
+                this.cacheR = params.channel2
+                this.cacheG = params.channel3
+                this.cacheB = params.channel4
+                if (params.updateSource) {
+                  this.log(
+                    '[%s] current colour [rgb %s, %s, %s].',
+                    this.accessory.displayName,
+                    this.cacheR, this.cacheG, this.cacheB
+                  )
+                }
+              }
             }
-            break
-          case 59:
-            // *** L1 *** \\
-            if (this.helpers.hasProperty(params, 'bright')) {
+          } else {
+            if (params.updateSource) this.log('[%s] current mode [white] is unsupported.', this.accessory.displayName)
+          }
+          break
+        case 59:
+          // *** L1 *** \\
+          if (this.helpers.hasProperty(params, 'bright')) {
+            if (params.bright !== this.cacheBrightness) {
               this.lightService.updateCharacteristic(this.Characteristic.Brightness, params.bright)
+              this.cacheBrightness = params.bright
+              if (params.updateSource) this.log('[%s] current brightness [%s%].', this.accessory.displayName, params.bright)
             }
-            if (this.helpers.hasProperty(params, 'colorR')) {
-              newColour = this.helpers.rgb2hs([params.colorR, params.colorG, params.colorB])
+          }
+          if (this.helpers.hasProperty(params, 'colorR')) {
+            if (params.colorR !== this.cacheR || params.colorG !== this.cacheB || params.colorB !== this.cacheB) {
+              hs = this.helpers.rgb2hs([params.colorR, params.colorG, params.colorB])
               this.lightService
-                .updateCharacteristic(this.Characteristic.Hue, newColour[0])
-                .updateCharacteristic(this.Characteristic.Saturation, newColour[1])
+                .updateCharacteristic(this.Characteristic.Hue, hs[0])
+                .updateCharacteristic(this.Characteristic.Saturation, hs[1])
+              this.cacheR = params.colorR
+              this.cacheG = params.colorG
+              this.cacheB = params.colorB
+              if (params.updateSource) {
+                this.log(
+                  '[%s] current colour [rgb %s, %s, %s].',
+                  this.accessory.displayName,
+                  this.cacheR, this.cacheG, this.cacheB
+                )
+              }
             }
-            break
-          case 104:
-            // *** B02-B-A60, B05-B-A60, GTLC104 *** \\
-            if (this.helpers.hasProperty(params, 'color')) {
-              if (this.helpers.hasProperty(params.color, 'br')) {
+          }
+          break
+        case 104:
+          // *** B02-B-A60, B05-B-A60, GTLC104 *** \\
+          if (params.ltype === 'color' && params.color) {
+            if (this.helpers.hasProperty(params.color, 'br')) {
+              if (params.color.br !== this.cacheBrightness) {
                 this.lightService.updateCharacteristic(this.Characteristic.Brightness, params.color.br)
+                this.cacheBrightness = params.color.br
+                if (params.updateSource) this.log('[%s] current brightness [%s%].', this.accessory.displayName, params.color.br)
               }
+            }
+            if (this.helpers.hasProperty(params.color, 'r')) {
               if (
-                this.helpers.hasProperty(params.color, 'r') &&
-                this.helpers.hasProperty(params.color, 'g') &&
-                this.helpers.hasProperty(params.color, 'b')
+                params.color.r !== this.cacheR ||
+                params.color.g !== this.cacheG ||
+                params.color.b !== this.cacheB ||
+                params.ltype !== this.cacheMode
               ) {
-                newColour = this.helpers.rgb2hs([
-                  parseInt(params.color.r),
-                  parseInt(params.color.g),
-                  parseInt(params.color.b)
-                ])
+                hs = this.helpers.rgb2hs([params.color.r, params.color.g, params.color.b])
                 this.lightService
-                  .updateCharacteristic(this.Characteristic.Hue, newColour[0])
+                  .updateCharacteristic(this.Characteristic.ColorTemperature, 140)
+                  .updateCharacteristic(this.Characteristic.Hue, hs[0])
                   .updateCharacteristic(this.Characteristic.Saturation, 100)
-                this.cacheMode = 'colour'
+                this.cacheMode = 'color'
                 this.cacheR = params.color.r
                 this.cacheG = params.color.g
                 this.cacheB = params.color.b
+                if (params.updateSource) {
+                  this.log(
+                    '[%s] current colour [rgb %s, %s, %s].',
+                    this.accessory.displayName,
+                    this.cacheR, this.cacheG, this.cacheB
+                  )
+                }
               }
-            } else if (this.helpers.hasProperty(params, 'white')) {
-              if (this.helpers.hasProperty(params.white, 'br')) {
+            }
+          }
+          if (params.ltype === 'white' && params.white) {
+            if (this.helpers.hasProperty(params.white, 'br')) {
+              if (params.white.br !== this.cacheBrightness || params.ltype !== this.cacheMode) {
                 this.lightService.updateCharacteristic(this.Characteristic.Brightness, params.white.br)
+                this.cacheBrightness = params.white.br
+                if (params.updateSource) this.log('[%s] current brightness [%s%].', this.accessory.displayName, params.white.br)
               }
-              if (this.helpers.hasProperty(params.white, 'ct')) {
-                // HomeKit has a ct range of 140-500 corresponding to 2000-7143K
-                // These devices have a range of 2700K-6500K corresponding to ct: 0-255
+            }
+            if (this.helpers.hasProperty(params.white, 'ct')) {
+              if (params.white.ct !== this.cacheCT) {
                 const ctToK = Math.round(params.white.ct / 255 * 3800 + 2700)
                 const kToMired = Math.max(Math.min(Math.round(1000000 / ctToK), 500), 140)
-                this.lightService.updateCharacteristic(this.Characteristic.ColorTemperature, kToMired)
+                hs = this.helpers.m2hs(kToMired)
+                this.lightService
+                  .updateCharacteristic(this.Characteristic.Hue, hs[0])
+                  .updateCharacteristic(this.Characteristic.Saturation, hs[1])
+                  .updateCharacteristic(this.Characteristic.ColorTemperature, kToMired)
                 this.cacheMode = 'white'
-                this.cacheCTemp = params.white.ct
+                this.cacheCT = params.white.ct
+                if (params.updateSource) this.log('[%s] current cct [%sK].', this.accessory.displayName, ctToK)
               }
             }
-            break
-        }
-      } else {
-        this.lightService.updateCharacteristic(this.Characteristic.On, false)
+          }
+          break
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
diff --git a/lib/device/light-ctemp.js b/lib/device/light-ctemp.js
index eb9492ea..7b482e07 100644
--- a/lib/device/light-ctemp.js
+++ b/lib/device/light-ctemp.js
@@ -25,11 +25,11 @@ module.exports = class deviceLightColour {
       this.minK = 2200
       this.maxK = 6500
     }
+    this.accessory = accessory
     if (platform.api.versionGreaterOrEqual && platform.api.versionGreaterOrEqual('1.3.0-beta.27')) {
       this.alController = new platform.api.hap.AdaptiveLightingController(this.lightService)
-      accessory.configureController(this.alController)
+      this.accessory.configureController(this.alController)
     }
-    this.accessory = accessory
   }
 
   async internalOnOffUpdate (value, callback) {
@@ -37,8 +37,11 @@ module.exports = class deviceLightColour {
       callback()
       const onoff = value ? 'on' : 'off'
       if (onoff === this.cacheOnOff) return
-      this.ignoreForAMoment = true
-      setTimeout(() => (this.ignoreForAMoment = false), 10000)
+      const timerKey = Math.random().toString(36).substr(2, 8)
+      this.updateTimeout = timerKey
+      setTimeout(() => {
+        if (this.updateTimeout === timerKey) this.updateTimeout = false
+      }, 10000)
       await this.platform.sendDeviceUpdate(this.accessory, {
         switch: onoff
       })
@@ -51,25 +54,23 @@ module.exports = class deviceLightColour {
 
   async internalBrightnessUpdate (value, callback) {
     try {
-      await this.helpers.sleep(750)
       callback()
-      if (this.lastSentBrightness === value) return
-      this.lastSentBrightness = value
+      if (this.cacheBrightness === value) return
       const updateKeyBright = Math.random().toString(36).substr(2, 8)
       this.updateKeyBright = updateKeyBright
-      // *** Device needs the current ct value sent too *** \\
       const params = {
-        switch: this.cacheOnOff,
         ltype: 'white',
         white: {
           br: value,
           ct: this.cacheCT
         }
       }
-      await this.helpers.sleep(500)
+      await this.helpers.sleep(750)
       if (updateKeyBright !== this.updateKeyBright) return
-      this.ignoreForAMoment = true
-      setTimeout(() => (this.ignoreForAMoment = false), 10000)
+      this.updateTimeout = updateKeyBright
+      setTimeout(() => {
+        if (this.updateTimeout === updateKeyBright) this.updateTimeout = false
+      }, 10000)
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.cacheBrightness = value
       this.log('[%s] current brightness [%s%].', this.accessory.displayName, value)
@@ -80,27 +81,28 @@ module.exports = class deviceLightColour {
 
   async internalCTempUpdate (value, callback) {
     try {
-      await this.helpers.sleep(1500)
       callback()
       const mToK = Math.max(Math.min(Math.round(1000000 / value), this.maxK), this.minK)
       const kToCT = Math.round(((mToK - this.minK) / (this.maxK - this.minK)) * 255)
       if (this.cacheCT === kToCT) return
       const updateKeyCT = Math.random().toString(36).substr(2, 8)
       this.updateKeyCT = updateKeyCT
-      // HomeKit has a ct range of 140-500 corresponding to 2000-7143K
       const params = {
-        switch: this.cacheOnOff,
         ltype: 'white',
         white: {
-          br: this.lightService.getCharacteristic(this.Characteristic.Brightness).value,
+          br: this.cacheBrightness,
           ct: kToCT
         }
       }
-      await this.helpers.sleep(500)
+      await this.helpers.sleep(1500)
       if (updateKeyCT !== this.updateKeyCT) return
-      this.ignoreForAMoment = true
-      setTimeout(() => (this.ignoreForAMoment = false), 10000)
-      await this.platform.sendDeviceUpdate(this.accessory, params)
+      if (this.cacheOnOff === 'on') {
+        this.updateTimeout = updateKeyCT
+        setTimeout(() => {
+          if (this.updateTimeout === updateKeyCT) this.updateTimeout = false
+        }, 10000)
+        await this.platform.sendDeviceUpdate(this.accessory, params)
+      }
       this.cacheCT = kToCT
       this.log('[%s] current cct [%sK].', this.accessory.displayName, mToK)
     } catch (err) {
@@ -110,6 +112,7 @@ module.exports = class deviceLightColour {
 
   async externalUpdate (params) {
     try {
+      if (this.updateTimeout) return
       if (params.switch && params.switch !== this.cacheOnOff) {
         this.lightService.updateCharacteristic(this.Characteristic.On, params.switch === 'on')
         this.cacheOnOff = params.switch
@@ -121,19 +124,10 @@ module.exports = class deviceLightColour {
           this.cacheBrightness = params.white.br
           if (params.updateSource) this.log('[%s] current brightness [%s%].', this.accessory.displayName, params.white.br)
         }
-        if (this.helpers.hasProperty(params.white, 'ct') && this.cacheCT !== params.white.ct && this.ignoreForAMoment) {
+        if (this.helpers.hasProperty(params.white, 'ct') && this.cacheCT !== params.white.ct) {
           const ctToK = Math.round(params.white.ct / 255 * (this.maxK - this.minK) + this.minK)
           const kToMired = Math.min(Math.max(Math.round(1000000 / ctToK), 140), 500)
           this.lightService.updateCharacteristic(this.Characteristic.ColorTemperature, kToMired)
-          if (params.updateSource && this.alController && Math.abs(this.cacheCT - params.white.ct) > 5) {
-            this.alController.disableAdaptiveLighting()
-            this.log.warn(
-              '[%s] adaptive lighting disabled due to variance in ct [prev:%s now:%s].',
-              this.accessory.displayName,
-              this.cacheCT,
-              params.white.ct
-            )
-          }
           this.cacheCT = params.white.ct
           if (params.updateSource) this.log('[%s] current cct [%sK].', this.accessory.displayName, ctToK)
         }
diff --git a/lib/utils/helpers.js b/lib/utils/helpers.js
index e08ae407..8dcadf70 100644
--- a/lib/utils/helpers.js
+++ b/lib/utils/helpers.js
@@ -118,8 +118,8 @@ module.exports = {
     ]
   },
   hs2rgb: hs => {
-    const h = hs[0] / 360
-    const s = hs[1] / 100
+    const h = parseInt(hs[0]) / 360
+    const s = parseInt(hs[1]) / 100
     const l = 0.5
     let t3
     let val
@@ -148,9 +148,9 @@ module.exports = {
     return rgb
   },
   rgb2hs: rgb => {
-    const r = rgb[0] / 255
-    const g = rgb[1] / 255
-    const b = rgb[2] / 255
+    const r = parseInt(rgb[0]) / 255
+    const g = parseInt(rgb[1]) / 255
+    const b = parseInt(rgb[2]) / 255
     const min = Math.min(r, g, b)
     const max = Math.max(r, g, b)
     const delta = max - min
@@ -177,6 +177,414 @@ module.exports = {
     }
     return [Math.round(h), Math.round(s * 100)]
   },
+  m2hs: m => {
+    const table = {
+      100: [19, 222.1],
+      101: [18.7, 222.2],
+      102: [18.4, 222.3],
+      103: [18.2, 222.3],
+      104: [17.9, 222.4],
+      105: [17.6, 222.5],
+      106: [17.3, 222.7],
+      107: [17, 222.8],
+      108: [16.7, 222.9],
+      109: [16.4, 223],
+      110: [16.1, 223.2],
+      111: [15.8, 223.3],
+      112: [15.4, 223.4],
+      113: [15.2, 223.6],
+      114: [14.9, 223.8],
+      115: [14.7, 223.9],
+      116: [14.3, 224.1],
+      117: [14.1, 224.2],
+      118: [13.8, 224.4],
+      119: [13.5, 224.6],
+      120: [13.2, 224.8],
+      121: [12.9, 225],
+      122: [12.5, 225.3],
+      123: [12.2, 225.6],
+      124: [11.8, 225.9],
+      125: [11.4, 226.3],
+      126: [11.1, 226.7],
+      127: [10.7, 227.1],
+      128: [10.3, 227.6],
+      129: [9.9, 228],
+      130: [9.6, 228.5],
+      131: [9.3, 229.1],
+      132: [8.9, 229.6],
+      133: [8.5, 230.2],
+      134: [8.2, 230.9],
+      135: [7.8, 231.6],
+      136: [7.5, 232.5],
+      137: [7.1, 233.5],
+      138: [6.7, 234.6],
+      139: [6.3, 235.8],
+      140: [6, 237.1],
+      141: [5.6, 238.9],
+      142: [5.2, 240.9],
+      143: [5, 242.9],
+      144: [4.8, 244.9],
+      145: [4.6, 246.9],
+      146: [4.4, 249.3],
+      147: [4.3, 251.9],
+      148: [4.1, 254.9],
+      149: [3.9, 258],
+      150: [3.7, 261.8],
+      151: [3.4, 265.9],
+      152: [3.2, 271],
+      153: [3, 276.4],
+      154: [2.8, 283.6],
+      155: [2.6, 290.4],
+      156: [2.3, 295.3],
+      157: [2.1, 300],
+      158: [1.9, 300],
+      159: [1.6, 300],
+      160: [1.4, 195.8],
+      161: [1.2, 84.3],
+      162: [1.3, 58.2],
+      163: [1.5, 55.9],
+      164: [1.7, 53.2],
+      165: [1.9, 50.2],
+      166: [2.1, 47.1],
+      167: [2.4, 44.5],
+      168: [2.6, 42.6],
+      169: [2.9, 40.9],
+      170: [3.1, 39.5],
+      171: [3.4, 38.3],
+      172: [3.7, 37.3],
+      173: [3.9, 36.5],
+      174: [4.2, 35.7],
+      175: [4.4, 35.1],
+      176: [4.6, 34.5],
+      177: [4.9, 34],
+      178: [5.1, 33.5],
+      179: [5.3, 33],
+      180: [5.6, 32.7],
+      181: [5.8, 32.3],
+      182: [6, 32],
+      183: [6.3, 31.7],
+      184: [6.5, 31.4],
+      185: [6.7, 31.2],
+      186: [7, 30.9],
+      187: [7.2, 30.7],
+      188: [7.4, 30.5],
+      189: [7.6, 30.3],
+      190: [7.9, 30.1],
+      191: [8.1, 29.9],
+      192: [8.4, 29.7],
+      193: [8.6, 29.6],
+      194: [8.9, 29.5],
+      195: [9.1, 29.3],
+      196: [9.4, 29.2],
+      197: [9.6, 29.1],
+      198: [9.8, 29],
+      199: [10, 28.9],
+      200: [10.2, 28.7],
+      201: [10.5, 28.7],
+      202: [10.7, 28.6],
+      203: [11, 28.5],
+      204: [11.2, 28.4],
+      205: [11.4, 28.3],
+      206: [11.6, 28.3],
+      207: [11.8, 28.2],
+      208: [12.1, 28.1],
+      209: [12.3, 28.1],
+      210: [12.5, 28],
+      211: [12.7, 28],
+      212: [12.9, 27.9],
+      213: [13.2, 27.8],
+      214: [13.4, 27.8],
+      215: [13.6, 27.7],
+      216: [13.8, 27.7],
+      217: [14, 27.7],
+      218: [14.3, 27.6],
+      219: [14.5, 27.6],
+      220: [14.7, 27.5],
+      221: [14.9, 27.5],
+      222: [15.1, 27.5],
+      223: [15.3, 27.4],
+      224: [15.5, 27.4],
+      225: [15.8, 27.4],
+      226: [16, 27.3],
+      227: [16.2, 27.3],
+      228: [16.4, 27.3],
+      229: [16.6, 27.3],
+      230: [16.8, 27.2],
+      231: [17, 27.2],
+      232: [17.2, 27.2],
+      233: [17.4, 27.2],
+      234: [17.6, 27.2],
+      235: [17.8, 27.1],
+      236: [18, 27.1],
+      237: [18.2, 27.1],
+      238: [18.4, 27.1],
+      239: [18.7, 27.1],
+      240: [18.8, 27],
+      241: [19, 27],
+      242: [19.2, 27],
+      243: [19.4, 27],
+      244: [19.6, 27],
+      245: [19.8, 27],
+      246: [20, 27],
+      247: [20.3, 26.9],
+      248: [20.5, 26.9],
+      249: [20.6, 26.9],
+      250: [20.8, 26.9],
+      251: [21, 26.9],
+      252: [21.3, 26.9],
+      253: [21.5, 26.9],
+      254: [21.6, 26.9],
+      255: [21.8, 26.8],
+      256: [22, 26.8],
+      257: [22.2, 26.8],
+      258: [22.4, 26.8],
+      259: [22.6, 26.8],
+      260: [22.8, 26.8],
+      261: [23, 26.8],
+      262: [23.2, 26.8],
+      263: [23.4, 26.8],
+      264: [23.6, 26.8],
+      265: [23.8, 26.8],
+      266: [24, 26.8],
+      267: [24.1, 26.8],
+      268: [24.3, 26.8],
+      269: [24.5, 26.8],
+      270: [24.7, 26.8],
+      271: [24.8, 26.8],
+      272: [25.1, 26.7],
+      273: [25.3, 26.7],
+      274: [25.4, 26.7],
+      275: [25.6, 26.7],
+      276: [25.8, 26.7],
+      277: [26, 26.7],
+      278: [26.1, 26.7],
+      279: [26.3, 26.7],
+      280: [26.5, 26.7],
+      281: [26.7, 26.7],
+      282: [26.9, 26.7],
+      283: [27.1, 26.7],
+      284: [27.3, 26.7],
+      285: [27.5, 26.7],
+      286: [27.7, 26.7],
+      287: [27.8, 26.7],
+      288: [28, 26.7],
+      289: [28.2, 26.7],
+      290: [28.4, 26.7],
+      291: [28.6, 26.7],
+      292: [28.8, 26.7],
+      293: [28.9, 26.7],
+      294: [29.1, 26.7],
+      295: [29.3, 26.7],
+      296: [29.5, 26.7],
+      297: [29.6, 26.7],
+      298: [29.8, 26.7],
+      299: [30, 26.7],
+      300: [30.2, 26.7],
+      301: [30.4, 26.7],
+      302: [30.5, 26.7],
+      303: [30.7, 26.7],
+      304: [30.9, 26.7],
+      305: [31.1, 26.7],
+      306: [31.2, 26.7],
+      307: [31.4, 26.7],
+      308: [31.6, 26.7],
+      309: [31.8, 26.8],
+      310: [31.9, 26.8],
+      311: [32.1, 26.8],
+      312: [32.3, 26.8],
+      313: [32.5, 26.8],
+      314: [32.6, 26.8],
+      315: [32.8, 26.8],
+      316: [33, 26.8],
+      317: [33.2, 26.8],
+      318: [33.3, 26.8],
+      319: [33.5, 26.8],
+      320: [33.7, 26.8],
+      321: [33.8, 26.8],
+      322: [34, 26.8],
+      323: [34.2, 26.8],
+      324: [34.4, 26.8],
+      325: [34.5, 26.8],
+      326: [34.7, 26.8],
+      327: [34.9, 26.8],
+      328: [35.1, 26.8],
+      329: [35.2, 26.8],
+      330: [35.4, 26.8],
+      331: [35.5, 26.8],
+      332: [35.7, 26.8],
+      333: [35.9, 26.8],
+      334: [36.1, 26.8],
+      335: [36.3, 26.9],
+      336: [36.5, 26.9],
+      337: [36.7, 26.9],
+      338: [36.9, 26.9],
+      339: [37.1, 26.9],
+      340: [37.2, 26.9],
+      341: [37.4, 26.9],
+      342: [37.5, 26.9],
+      343: [37.7, 26.9],
+      344: [37.9, 26.9],
+      345: [38.1, 26.9],
+      346: [38.3, 26.9],
+      347: [38.5, 26.9],
+      348: [38.7, 26.9],
+      349: [38.9, 26.9],
+      350: [39, 26.9],
+      351: [39.2, 26.9],
+      352: [39.3, 27],
+      353: [39.5, 27],
+      354: [39.7, 27],
+      355: [39.9, 27],
+      356: [40.1, 27],
+      357: [40.2, 27],
+      358: [40.4, 27],
+      359: [40.6, 27],
+      360: [40.8, 27],
+      361: [40.9, 27],
+      362: [41.1, 27],
+      363: [41.2, 27],
+      364: [41.4, 27],
+      365: [41.6, 27],
+      366: [41.8, 27],
+      367: [42, 27],
+      368: [42.1, 27.1],
+      369: [42.3, 27.1],
+      370: [42.4, 27.1],
+      371: [42.6, 27.1],
+      372: [42.8, 27.1],
+      373: [43, 27.1],
+      374: [43.1, 27.1],
+      375: [43.2, 27.1],
+      376: [43.4, 27.1],
+      377: [43.6, 27.1],
+      378: [43.8, 27.1],
+      379: [43.9, 27.1],
+      380: [44.1, 27.1],
+      381: [44.3, 27.2],
+      382: [44.4, 27.2],
+      383: [44.6, 27.2],
+      384: [44.7, 27.2],
+      385: [44.9, 27.2],
+      386: [45.1, 27.2],
+      387: [45.3, 27.2],
+      388: [45.5, 27.2],
+      389: [45.6, 27.2],
+      390: [45.8, 27.2],
+      391: [46, 27.2],
+      392: [46.2, 27.2],
+      393: [46.4, 27.3],
+      394: [46.5, 27.3],
+      395: [46.7, 27.3],
+      396: [46.9, 27.3],
+      397: [47.1, 27.3],
+      398: [47.2, 27.3],
+      399: [47.4, 27.3],
+      400: [47.6, 27.3],
+      401: [47.7, 27.3],
+      402: [47.9, 27.3],
+      403: [48.1, 27.3],
+      404: [48.3, 27.3],
+      405: [48.5, 27.4],
+      406: [48.7, 27.4],
+      407: [48.8, 27.4],
+      408: [49, 27.4],
+      409: [49.2, 27.4],
+      410: [49.4, 27.4],
+      411: [49.6, 27.4],
+      412: [49.7, 27.4],
+      413: [49.9, 27.4],
+      414: [50.1, 27.4],
+      415: [50.2, 27.4],
+      416: [50.4, 27.4],
+      417: [50.6, 27.5],
+      418: [50.7, 27.5],
+      419: [50.9, 27.5],
+      420: [51.1, 27.5],
+      421: [51.2, 27.5],
+      422: [51.4, 27.5],
+      423: [51.6, 27.5],
+      424: [51.7, 27.5],
+      425: [51.9, 27.5],
+      426: [52.1, 27.5],
+      427: [51.2, 27.6],
+      428: [52.4, 27.6],
+      429: [52.5, 27.6],
+      430: [52.7, 27.6],
+      431: [52.9, 27.6],
+      432: [53.1, 27.6],
+      433: [53.2, 27.6],
+      434: [53.4, 27.6],
+      435: [53.6, 27.6],
+      436: [53.7, 27.6],
+      437: [53.9, 27.6],
+      438: [54.1, 27.7],
+      439: [54.2, 27.7],
+      440: [54.3, 27.7],
+      441: [54.5, 27.7],
+      442: [54.7, 27.7],
+      443: [54.8, 27.7],
+      444: [55, 27.7],
+      445: [55.2, 27.7],
+      446: [55.3, 27.7],
+      447: [55.5, 27.7],
+      448: [55.7, 27.7],
+      449: [55.8, 27.8],
+      450: [56, 27.8],
+      451: [56.2, 27.8],
+      452: [56.3, 27.8],
+      453: [56.5, 27.8],
+      454: [56.7, 27.8],
+      455: [56.8, 27.8],
+      456: [57, 27.8],
+      457: [57.2, 27.8],
+      458: [57.3, 27.9],
+      459: [57.4, 27.9],
+      460: [57.6, 27.9],
+      461: [57.8, 27.9],
+      462: [57.9, 27.9],
+      463: [58.1, 27.9],
+      464: [58.3, 27.9],
+      465: [58.4, 27.9],
+      466: [58.6, 27.9],
+      467: [58.8, 27.9],
+      468: [59, 28],
+      469: [59.1, 28],
+      470: [59.2, 28],
+      471: [59.4, 28],
+      472: [59.6, 28],
+      473: [59.7, 28],
+      474: [60, 28],
+      475: [60.1, 28],
+      476: [60.2, 28],
+      477: [60.4, 28],
+      478: [60.6, 28.1],
+      479: [60.7, 28.1],
+      480: [60.9, 28.1],
+      481: [60.1, 28.1],
+      482: [60.3, 28.1],
+      483: [61.4, 28.1],
+      484: [61.5, 28.1],
+      485: [61.7, 28.1],
+      486: [61.9, 28.1],
+      487: [62, 28.2],
+      488: [62.2, 28.2],
+      489: [62.3, 28.2],
+      490: [62.5, 28.2],
+      491: [62.7, 28.2],
+      492: [62.8, 28.2],
+      493: [63, 28.2],
+      494: [63.2, 28.2],
+      495: [63.3, 28.2],
+      496: [63.4, 28.2],
+      497: [63.6, 28.2],
+      498: [63.8, 28.3],
+      499: [63.9, 28.3],
+      500: [64.1, 28.3]
+    }
+    const input = Math.min(Math.max(Math.round(m), 140), 500)
+    const toReturn = table[input]
+    return [Math.round(toReturn[1]), Math.round(toReturn[0])]
+  },
   chansFromUiid: {
     1: 1, // "SOCKET"                                  \\ 20, MINI, BASIC, S26
     2: 2, // "SOCKET_2"                                \\

From 7f1b5749aab862066a2bcd86bbbc7effaadddfe7 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 23 Dec 2020 15:12:05 +0000
Subject: [PATCH 1031/3183] 3.18.2-13

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 410bb087..d5a12729 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.18.2-12",
+  "version": "3.18.2-13",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 32dc9c9c..4e88bbf7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.18.2-12",
+  "version": "3.18.2-13",
   "author": "bwp91",
   "description": "Homebridge/HOOBS plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 6f248b780b0da9117def4ce984eb79b932cc840a Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 23 Dec 2020 16:08:18 +0000
Subject: [PATCH 1032/3183] colour/ctemp bulbs

---
 lib/device/light-colour.js | 74 ++++++++++++++++++++++----------------
 lib/device/light-ctemp.js  | 33 +++++++++--------
 2 files changed, 62 insertions(+), 45 deletions(-)

diff --git a/lib/device/light-colour.js b/lib/device/light-colour.js
index 99af0967..93f0c63d 100644
--- a/lib/device/light-colour.js
+++ b/lib/device/light-colour.js
@@ -37,6 +37,7 @@ module.exports = class deviceLightColour {
         .getCharacteristic(this.Characteristic.ColorTemperature)
         .on('set', this.internalCTempUpdate.bind(this))
       if (platform.api.versionGreaterOrEqual && platform.api.versionGreaterOrEqual('1.3.0-beta.27')) {
+        this.cacheBrightness = this.lightService.getCharacteristic(this.Characteristic.Brightness).value
         this.alController = new platform.api.hap.AdaptiveLightingController(this.lightService)
         this.accessory.configureController(this.alController)
       }
@@ -54,13 +55,13 @@ module.exports = class deviceLightColour {
       } else {
         params.switch = onoff
       }
+      this.cacheOnOff = onoff
       const timerKey = Math.random().toString(36).substr(2, 8)
       this.updateTimeout = timerKey
       setTimeout(() => {
         if (this.updateTimeout === timerKey) this.updateTimeout = false
       }, 10000)
       await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.cacheOnOff = onoff
       this.log('[%s] current state [%s].', this.accessory.displayName, onoff)
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
@@ -69,8 +70,12 @@ module.exports = class deviceLightColour {
 
   async internalBrightnessUpdate (value, callback) {
     try {
+      if (this.cacheBrightness === value) {
+        callback()
+        return
+      }
+      this.cacheBrightness = value
       callback()
-      if (this.cacheBrightness === value) return
       let params
       const updateKeyBright = Math.random().toString(36).substr(2, 8)
       this.updateKeyBright = updateKeyBright
@@ -89,7 +94,6 @@ module.exports = class deviceLightColour {
           // *** B02-B-A60, B05-B-A60, GTLC104 *** \\
           if (this.cacheMode === 'white') {
             params = {
-              ltype: 'white',
               white: {
                 br: value,
                 ct: this.cacheCT
@@ -97,7 +101,6 @@ module.exports = class deviceLightColour {
             }
           } else {
             params = {
-              ltype: 'color',
               color: {
                 br: value,
                 r: this.cacheR,
@@ -115,7 +118,6 @@ module.exports = class deviceLightColour {
         if (this.updateTimeout === updateKeyBright) this.updateTimeout = false
       }, 10000)
       await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.cacheBrightness = value
       this.log('[%s] current brightness [%s%].', this.accessory.displayName, value)
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
@@ -124,6 +126,11 @@ module.exports = class deviceLightColour {
 
   async internalColourUpdate (value, callback) {
     try {
+      if (this.cacheOnOff !== 'on' || this.cacheHue === value) {
+        callback()
+        return
+      }
+      this.cacheHue = value
       this.lightService.updateCharacteristic(this.Characteristic.ColorTemperature, 140)
       callback()
       let params
@@ -142,6 +149,9 @@ module.exports = class deviceLightColour {
             channel3: newRGB[1].toString(),
             channel4: newRGB[2].toString()
           }
+          this.cacheR = newRGB[0].toString()
+          this.cacheG = newRGB[1].toString()
+          this.cacheB = newRGB[2].toString()
           break
         case 59:
           // *** L1 *** \\
@@ -151,11 +161,14 @@ module.exports = class deviceLightColour {
             colorG: newRGB[1],
             colorB: newRGB[2]
           }
+          this.cacheR = newRGB[0]
+          this.cacheG = newRGB[1]
+          this.cacheB = newRGB[2]
           break
         case 104:
           // *** B02-B-A60, B05-B-A60, GTLC104 *** \\
           params = {
-            ltype: 'color',
+            ltype: this.cacheMode === 'color' ? undefined : 'color',
             color: {
               br: this.cacheBrightness,
               r: newRGB[0],
@@ -171,16 +184,11 @@ module.exports = class deviceLightColour {
       }
       await this.helpers.sleep(1500)
       if (updateKeyColour !== this.updateKeyColour) return
-      if (this.cacheOnOff === 'on') {
-        this.updateTimeout = updateKeyColour
-        setTimeout(() => {
-          if (this.updateTimeout === updateKeyColour) this.updateTimeout = false
-        }, 10000)
-        await this.platform.sendDeviceUpdate(this.accessory, params)
-      }
-      this.cacheR = this.accessory.context.eweUIID === 22 ? newRGB[0].toString() : newRGB[0]
-      this.cacheG = this.accessory.context.eweUIID === 22 ? newRGB[1].toString() : newRGB[1]
-      this.cacheB = this.accessory.context.eweUIID === 22 ? newRGB[2].toString() : newRGB[2]
+      this.updateTimeout = updateKeyColour
+      setTimeout(() => {
+        if (this.updateTimeout === updateKeyColour) this.updateTimeout = false
+      }, 10000)
+      await this.platform.sendDeviceUpdate(this.accessory, params)
       this.log('[%s] current colour [rgb %s, %s, %s].', this.accessory.displayName, this.cacheR, this.cacheG, this.cacheB)
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
@@ -189,6 +197,10 @@ module.exports = class deviceLightColour {
 
   async internalCTempUpdate (value, callback) {
     try {
+      if (this.cacheOnOff !== 'on' || this.cacheMired === value) {
+        callback()
+        return
+      }
       const hs = this.helpers.m2hs(value)
       this.lightService
         .updateCharacteristic(this.Characteristic.Hue, hs[0])
@@ -196,31 +208,25 @@ module.exports = class deviceLightColour {
       callback()
       const mToK = Math.max(Math.min(Math.round(1000000 / value), 6500), 2700)
       const kToCT = Math.round(((mToK - 2700) / 3800) * 255)
-      if (this.cacheLastCTemp === value) return
-      this.cacheLastCTemp = value
-      if (this.accessory.context.eweUIID !== 104) return
-      const updateKeyCTemp = Math.random().toString(36).substr(2, 8)
-      this.updateKeyCTemp = updateKeyCTemp
-      if (this.cacheCT === kToCT) return
+      this.cacheCT = kToCT
+      this.cacheMired = value
       const updateKeyCT = Math.random().toString(36).substr(2, 8)
       this.updateKeyCT = updateKeyCT
       const params = {
-        ltype: 'white',
+        ltype: this.cacheMode === 'white' ? undefined : 'white',
         white: {
           br: this.cacheBrightness,
           ct: kToCT
         }
       }
+      this.cacheMode = 'white'
       await this.helpers.sleep(1500)
       if (updateKeyCT !== this.updateKeyCT) return
-      if (this.cacheOnOff === 'on') {
-        this.updateTimeout = updateKeyCT
-        setTimeout(() => {
-          if (this.updateTimeout === updateKeyCT) this.updateTimeout = false
-        }, 10000)
-        await this.platform.sendDeviceUpdate(this.accessory, params)
-      }
-      this.cacheCT = kToCT
+      this.updateTimeout = updateKeyCT
+      setTimeout(() => {
+        if (this.updateTimeout === updateKeyCT) this.updateTimeout = false
+      }, 10000)
+      await this.platform.sendDeviceUpdate(this.accessory, params)
       this.log('[%s] current cct [%sK].', this.accessory.displayName, mToK)
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
@@ -265,6 +271,7 @@ module.exports = class deviceLightColour {
                 this.cacheR = params.channel2
                 this.cacheG = params.channel3
                 this.cacheB = params.channel4
+                this.cacheHue = hs[0]
                 if (params.updateSource) {
                   this.log(
                     '[%s] current colour [rgb %s, %s, %s].',
@@ -296,6 +303,7 @@ module.exports = class deviceLightColour {
               this.cacheR = params.colorR
               this.cacheG = params.colorG
               this.cacheB = params.colorB
+              this.cacheHue = hs[0]
               if (params.updateSource) {
                 this.log(
                   '[%s] current colour [rgb %s, %s, %s].',
@@ -332,6 +340,8 @@ module.exports = class deviceLightColour {
                 this.cacheR = params.color.r
                 this.cacheG = params.color.g
                 this.cacheB = params.color.b
+                this.cacheHue = hs[0]
+                this.cacheMired = 140
                 if (params.updateSource) {
                   this.log(
                     '[%s] current colour [rgb %s, %s, %s].',
@@ -361,6 +371,8 @@ module.exports = class deviceLightColour {
                   .updateCharacteristic(this.Characteristic.ColorTemperature, kToMired)
                 this.cacheMode = 'white'
                 this.cacheCT = params.white.ct
+                this.cacheHue = hs[0]
+                this.cacheMired = kToMired
                 if (params.updateSource) this.log('[%s] current cct [%sK].', this.accessory.displayName, ctToK)
               }
             }
diff --git a/lib/device/light-ctemp.js b/lib/device/light-ctemp.js
index 7b482e07..c3fea928 100644
--- a/lib/device/light-ctemp.js
+++ b/lib/device/light-ctemp.js
@@ -27,6 +27,7 @@ module.exports = class deviceLightColour {
     }
     this.accessory = accessory
     if (platform.api.versionGreaterOrEqual && platform.api.versionGreaterOrEqual('1.3.0-beta.27')) {
+      this.cacheBrightness = this.lightService.getCharacteristic(this.Characteristic.Brightness).value
       this.alController = new platform.api.hap.AdaptiveLightingController(this.lightService)
       this.accessory.configureController(this.alController)
     }
@@ -37,6 +38,7 @@ module.exports = class deviceLightColour {
       callback()
       const onoff = value ? 'on' : 'off'
       if (onoff === this.cacheOnOff) return
+      this.cacheOnOff = onoff
       const timerKey = Math.random().toString(36).substr(2, 8)
       this.updateTimeout = timerKey
       setTimeout(() => {
@@ -45,7 +47,6 @@ module.exports = class deviceLightColour {
       await this.platform.sendDeviceUpdate(this.accessory, {
         switch: onoff
       })
-      this.cacheOnOff = onoff
       this.log('[%s] current state [%s].', this.accessory.displayName, onoff)
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
@@ -54,12 +55,15 @@ module.exports = class deviceLightColour {
 
   async internalBrightnessUpdate (value, callback) {
     try {
+      if (this.cacheBrightness === value) {
+        callback()
+        return
+      }
+      this.cacheBrightness = value
       callback()
-      if (this.cacheBrightness === value) return
       const updateKeyBright = Math.random().toString(36).substr(2, 8)
       this.updateKeyBright = updateKeyBright
       const params = {
-        ltype: 'white',
         white: {
           br: value,
           ct: this.cacheCT
@@ -72,7 +76,6 @@ module.exports = class deviceLightColour {
         if (this.updateTimeout === updateKeyBright) this.updateTimeout = false
       }, 10000)
       await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.cacheBrightness = value
       this.log('[%s] current brightness [%s%].', this.accessory.displayName, value)
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
@@ -81,14 +84,18 @@ module.exports = class deviceLightColour {
 
   async internalCTempUpdate (value, callback) {
     try {
+      if (this.cacheOnOff !== 'on' || this.cacheMired === value) {
+        callback()
+        return
+      }
+      this.cacheMired = value
       callback()
       const mToK = Math.max(Math.min(Math.round(1000000 / value), this.maxK), this.minK)
       const kToCT = Math.round(((mToK - this.minK) / (this.maxK - this.minK)) * 255)
-      if (this.cacheCT === kToCT) return
+      this.cacheCT = kToCT
       const updateKeyCT = Math.random().toString(36).substr(2, 8)
       this.updateKeyCT = updateKeyCT
       const params = {
-        ltype: 'white',
         white: {
           br: this.cacheBrightness,
           ct: kToCT
@@ -96,14 +103,11 @@ module.exports = class deviceLightColour {
       }
       await this.helpers.sleep(1500)
       if (updateKeyCT !== this.updateKeyCT) return
-      if (this.cacheOnOff === 'on') {
-        this.updateTimeout = updateKeyCT
-        setTimeout(() => {
-          if (this.updateTimeout === updateKeyCT) this.updateTimeout = false
-        }, 10000)
-        await this.platform.sendDeviceUpdate(this.accessory, params)
-      }
-      this.cacheCT = kToCT
+      this.updateTimeout = updateKeyCT
+      setTimeout(() => {
+        if (this.updateTimeout === updateKeyCT) this.updateTimeout = false
+      }, 10000)
+      await this.platform.sendDeviceUpdate(this.accessory, params)
       this.log('[%s] current cct [%sK].', this.accessory.displayName, mToK)
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
@@ -129,6 +133,7 @@ module.exports = class deviceLightColour {
           const kToMired = Math.min(Math.max(Math.round(1000000 / ctToK), 140), 500)
           this.lightService.updateCharacteristic(this.Characteristic.ColorTemperature, kToMired)
           this.cacheCT = params.white.ct
+          this.cacheMired = kToMired
           if (params.updateSource) this.log('[%s] current cct [%sK].', this.accessory.displayName, ctToK)
         }
       }

From 6e0bde42b98e0f855dd3dec69a24a400b8f41d3c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 23 Dec 2020 16:12:56 +0000
Subject: [PATCH 1033/3183] 3.18.2-14

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d5a12729..5c3cfe8d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.18.2-13",
+  "version": "3.18.2-14",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 4e88bbf7..5d9c8ed0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.18.2-13",
+  "version": "3.18.2-14",
   "author": "bwp91",
   "description": "Homebridge/HOOBS plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 5b12ef62ca43dcd615179f3964bf933b709306f0 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 23 Dec 2020 21:53:30 +0000
Subject: [PATCH 1034/3183] lights, again

---
 lib/device/light-colour.js | 139 ++++++++++++++++++-------------------
 lib/device/light-ctemp.js  |  30 ++++----
 lib/device/light-dimmer.js |  24 ++++---
 3 files changed, 95 insertions(+), 98 deletions(-)

diff --git a/lib/device/light-colour.js b/lib/device/light-colour.js
index 93f0c63d..1b6e0207 100644
--- a/lib/device/light-colour.js
+++ b/lib/device/light-colour.js
@@ -8,6 +8,7 @@ module.exports = class deviceLightColour {
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
+    this.isB1 = this.accessory.context.eweUIID === 22
     this.lightService = accessory.getService(this.Service.Lightbulb) || accessory.addService(this.Service.Lightbulb)
     this.lightService
       .getCharacteristic(this.Characteristic.On)
@@ -49,20 +50,20 @@ module.exports = class deviceLightColour {
       callback()
       const params = {}
       const onoff = value ? 'on' : 'off'
-      if (onoff === this.cacheOnOff) return
-      if (this.accessory.context.eweUIID === 22) {
-        params.state = onoff
+      if (this.cacheOnOff === onoff) return
+      this.cacheOnOff = onoff
+      if (this.isB1) {
+        params.state = this.cacheOnOff
       } else {
-        params.switch = onoff
+        params.switch = this.cacheOnOff
       }
-      this.cacheOnOff = onoff
       const timerKey = Math.random().toString(36).substr(2, 8)
       this.updateTimeout = timerKey
       setTimeout(() => {
         if (this.updateTimeout === timerKey) this.updateTimeout = false
       }, 10000)
       await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.log('[%s] current state [%s].', this.accessory.displayName, onoff)
+      this.log('[%s] current state [%s].', this.accessory.displayName, this.cacheOnOff)
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
     }
@@ -135,6 +136,9 @@ module.exports = class deviceLightColour {
       callback()
       let params
       const newRGB = this.helpers.hs2rgb([value, this.lightService.getCharacteristic(this.Characteristic.Saturation).value])
+      this.cacheR = newRGB[0]
+      this.cacheG = newRGB[1]
+      this.cacheB = newRGB[2]
       const updateKeyColour = Math.random().toString(36).substr(2, 8)
       this.updateKeyColour = updateKeyColour
       switch (this.accessory.context.eweUIID) {
@@ -145,25 +149,19 @@ module.exports = class deviceLightColour {
             type: 'middle',
             channel0: '0',
             channel1: '0',
-            channel2: newRGB[0].toString(),
-            channel3: newRGB[1].toString(),
-            channel4: newRGB[2].toString()
+            channel2: this.cacheR.toString(),
+            channel3: this.cacheG.toString(),
+            channel4: this.cacheB.toString()
           }
-          this.cacheR = newRGB[0].toString()
-          this.cacheG = newRGB[1].toString()
-          this.cacheB = newRGB[2].toString()
           break
         case 59:
           // *** L1 *** \\
           params = {
             mode: 1,
-            colorR: newRGB[0],
-            colorG: newRGB[1],
-            colorB: newRGB[2]
+            colorR: this.cacheR,
+            colorG: this.cacheG,
+            colorB: this.cacheB
           }
-          this.cacheR = newRGB[0]
-          this.cacheG = newRGB[1]
-          this.cacheB = newRGB[2]
           break
         case 104:
           // *** B02-B-A60, B05-B-A60, GTLC104 *** \\
@@ -171,15 +169,12 @@ module.exports = class deviceLightColour {
             ltype: this.cacheMode === 'color' ? undefined : 'color',
             color: {
               br: this.cacheBrightness,
-              r: newRGB[0],
-              g: newRGB[1],
-              b: newRGB[2]
+              r: this.cacheR,
+              g: this.cacheG,
+              b: this.cacheB
             }
           }
           this.cacheMode = 'color'
-          this.cacheR = newRGB[0]
-          this.cacheG = newRGB[1]
-          this.cacheB = newRGB[2]
           break
       }
       await this.helpers.sleep(1500)
@@ -201,22 +196,22 @@ module.exports = class deviceLightColour {
         callback()
         return
       }
-      const hs = this.helpers.m2hs(value)
+      this.cacheMired = value
+      const hs = this.helpers.m2hs(this.cacheMired)
+      this.cacheHue = hs[0]
       this.lightService
-        .updateCharacteristic(this.Characteristic.Hue, hs[0])
+        .updateCharacteristic(this.Characteristic.Hue, this.cacheHue)
         .updateCharacteristic(this.Characteristic.Saturation, hs[1])
       callback()
       const mToK = Math.max(Math.min(Math.round(1000000 / value), 6500), 2700)
-      const kToCT = Math.round(((mToK - 2700) / 3800) * 255)
-      this.cacheCT = kToCT
-      this.cacheMired = value
+      this.cacheCT = Math.round(((mToK - 2700) / 3800) * 255)
       const updateKeyCT = Math.random().toString(36).substr(2, 8)
       this.updateKeyCT = updateKeyCT
       const params = {
         ltype: this.cacheMode === 'white' ? undefined : 'white',
         white: {
           br: this.cacheBrightness,
-          ct: kToCT
+          ct: this.cacheCT
         }
       }
       this.cacheMode = 'white'
@@ -237,16 +232,13 @@ module.exports = class deviceLightColour {
     try {
       if (this.updateTimeout) return
       if (
-        (this.accessory.context.eweUIID === 22 && params.state && params.state !== this.cacheOnOff) ||
-        (this.accessory.context.eweUIID !== 22 && params.switch && params.switch !== this.cacheOnOff)
+        (this.isB1 && params.state && params.state !== this.cacheOnOff) ||
+        (!this.isB1 && params.switch && params.switch !== this.cacheOnOff)
       ) {
-        const newState = this.accessory.context.eweUIID === 22 ? params.state : params.switch
-        this.lightService.updateCharacteristic(this.Characteristic.On, newState === 'on')
-        if (this.accessory.context.eweUIID === 22) {
-          this.lightService.updateCharacteristic(this.Characteristic.Brightness, 100)
-        }
-        this.cacheOnOff = newState
-        if (params.updateSource) this.log('[%s] current state [%s].', this.accessory.displayName, newState)
+        this.cacheOnOff = this.isB1 ? params.state : params.switch
+        this.lightService.updateCharacteristic(this.Characteristic.On, this.cacheOnOff === 'on')
+        if (this.isB1) this.lightService.updateCharacteristic(this.Characteristic.Brightness, this.cacheOnOff === 'on' ? 100 : 0)
+        if (params.updateSource) this.log('[%s] current state [%s].', this.accessory.displayName, this.cacheOnOff)
       }
       let hs
       let mode
@@ -262,16 +254,20 @@ module.exports = class deviceLightColour {
           }
           if (mode === 2) {
             if (this.helpers.hasProperty(params, 'channel2')) {
-              if (params.channel2 !== this.cacheR || params.channel3 !== this.cacheG || params.channel4 !== this.cacheB) {
-                hs = this.helpers.rgb2hs([params.channel2, params.channel3, params.channel4])
+              if (
+                params.channel2 !== this.cacheR.toString() ||
+                params.channel3 !== this.cacheG.toString() ||
+                params.channel4 !== this.cacheB.toString()
+              ) {
+                this.cacheR = parseInt(params.channel2)
+                this.cacheG = parseInt(params.channel3)
+                this.cacheB = parseInt(params.channel4)
+                hs = this.helpers.rgb2hs([this.cacheR, this.cacheG, this.cacheB])
+                this.cacheHue = hs[0]
                 this.lightService
-                  .updateCharacteristic(this.Characteristic.Hue, hs[0])
+                  .updateCharacteristic(this.Characteristic.Hue, this.cacheHue)
                   .updateCharacteristic(this.Characteristic.Saturation, 100)
                   .updateCharacteristic(this.Characteristic.Brightness, 100)
-                this.cacheR = params.channel2
-                this.cacheG = params.channel3
-                this.cacheB = params.channel4
-                this.cacheHue = hs[0]
                 if (params.updateSource) {
                   this.log(
                     '[%s] current colour [rgb %s, %s, %s].',
@@ -289,21 +285,21 @@ module.exports = class deviceLightColour {
           // *** L1 *** \\
           if (this.helpers.hasProperty(params, 'bright')) {
             if (params.bright !== this.cacheBrightness) {
-              this.lightService.updateCharacteristic(this.Characteristic.Brightness, params.bright)
               this.cacheBrightness = params.bright
-              if (params.updateSource) this.log('[%s] current brightness [%s%].', this.accessory.displayName, params.bright)
+              this.lightService.updateCharacteristic(this.Characteristic.Brightness, this.cacheBrightness)
+              if (params.updateSource) this.log('[%s] current brightness [%s%].', this.accessory.displayName, this.cacheBrightness)
             }
           }
           if (this.helpers.hasProperty(params, 'colorR')) {
             if (params.colorR !== this.cacheR || params.colorG !== this.cacheB || params.colorB !== this.cacheB) {
-              hs = this.helpers.rgb2hs([params.colorR, params.colorG, params.colorB])
-              this.lightService
-                .updateCharacteristic(this.Characteristic.Hue, hs[0])
-                .updateCharacteristic(this.Characteristic.Saturation, hs[1])
               this.cacheR = params.colorR
               this.cacheG = params.colorG
               this.cacheB = params.colorB
+              hs = this.helpers.rgb2hs([this.cacheR, this.cacheG, this.cacheB])
               this.cacheHue = hs[0]
+              this.lightService
+                .updateCharacteristic(this.Characteristic.Hue, this.cacheHue)
+                .updateCharacteristic(this.Characteristic.Saturation, hs[1])
               if (params.updateSource) {
                 this.log(
                   '[%s] current colour [rgb %s, %s, %s].',
@@ -319,9 +315,9 @@ module.exports = class deviceLightColour {
           if (params.ltype === 'color' && params.color) {
             if (this.helpers.hasProperty(params.color, 'br')) {
               if (params.color.br !== this.cacheBrightness) {
-                this.lightService.updateCharacteristic(this.Characteristic.Brightness, params.color.br)
                 this.cacheBrightness = params.color.br
-                if (params.updateSource) this.log('[%s] current brightness [%s%].', this.accessory.displayName, params.color.br)
+                this.lightService.updateCharacteristic(this.Characteristic.Brightness, this.cacheBrightness)
+                if (params.updateSource) this.log('[%s] current brightness [%s%].', this.accessory.displayName, this.cacheBrightness)
               }
             }
             if (this.helpers.hasProperty(params.color, 'r')) {
@@ -329,19 +325,19 @@ module.exports = class deviceLightColour {
                 params.color.r !== this.cacheR ||
                 params.color.g !== this.cacheG ||
                 params.color.b !== this.cacheB ||
-                params.ltype !== this.cacheMode
+                this.cacheMode !== 'color'
               ) {
-                hs = this.helpers.rgb2hs([params.color.r, params.color.g, params.color.b])
-                this.lightService
-                  .updateCharacteristic(this.Characteristic.ColorTemperature, 140)
-                  .updateCharacteristic(this.Characteristic.Hue, hs[0])
-                  .updateCharacteristic(this.Characteristic.Saturation, 100)
                 this.cacheMode = 'color'
                 this.cacheR = params.color.r
                 this.cacheG = params.color.g
                 this.cacheB = params.color.b
-                this.cacheHue = hs[0]
                 this.cacheMired = 140
+                hs = this.helpers.rgb2hs([this.cacheR, this.cacheG, this.cacheB])
+                this.cacheHue = hs[0]
+                this.lightService
+                  .updateCharacteristic(this.Characteristic.ColorTemperature, 140)
+                  .updateCharacteristic(this.Characteristic.Hue, this.cacheHue)
+                  .updateCharacteristic(this.Characteristic.Saturation, 100)
                 if (params.updateSource) {
                   this.log(
                     '[%s] current colour [rgb %s, %s, %s].',
@@ -354,25 +350,24 @@ module.exports = class deviceLightColour {
           }
           if (params.ltype === 'white' && params.white) {
             if (this.helpers.hasProperty(params.white, 'br')) {
-              if (params.white.br !== this.cacheBrightness || params.ltype !== this.cacheMode) {
-                this.lightService.updateCharacteristic(this.Characteristic.Brightness, params.white.br)
+              if (params.white.br !== this.cacheBrightness || this.cacheMode !== 'white') {
                 this.cacheBrightness = params.white.br
-                if (params.updateSource) this.log('[%s] current brightness [%s%].', this.accessory.displayName, params.white.br)
+                this.lightService.updateCharacteristic(this.Characteristic.Brightness, this.cacheBrightness)
+                if (params.updateSource) this.log('[%s] current brightness [%s%].', this.accessory.displayName, this.cacheBrightness)
               }
             }
             if (this.helpers.hasProperty(params.white, 'ct')) {
               if (params.white.ct !== this.cacheCT) {
-                const ctToK = Math.round(params.white.ct / 255 * 3800 + 2700)
-                const kToMired = Math.max(Math.min(Math.round(1000000 / ctToK), 500), 140)
-                hs = this.helpers.m2hs(kToMired)
-                this.lightService
-                  .updateCharacteristic(this.Characteristic.Hue, hs[0])
-                  .updateCharacteristic(this.Characteristic.Saturation, hs[1])
-                  .updateCharacteristic(this.Characteristic.ColorTemperature, kToMired)
                 this.cacheMode = 'white'
                 this.cacheCT = params.white.ct
+                const ctToK = Math.round(this.cacheCT / 255 * 3800 + 2700)
+                this.cacheMired = Math.max(Math.min(Math.round(1000000 / ctToK), 500), 140)
+                hs = this.helpers.m2hs(this.cacheMired)
                 this.cacheHue = hs[0]
-                this.cacheMired = kToMired
+                this.lightService
+                  .updateCharacteristic(this.Characteristic.Hue, this.cacheHue)
+                  .updateCharacteristic(this.Characteristic.Saturation, hs[1])
+                  .updateCharacteristic(this.Characteristic.ColorTemperature, this.cacheMired)
                 if (params.updateSource) this.log('[%s] current cct [%sK].', this.accessory.displayName, ctToK)
               }
             }
diff --git a/lib/device/light-ctemp.js b/lib/device/light-ctemp.js
index c3fea928..dfdbb069 100644
--- a/lib/device/light-ctemp.js
+++ b/lib/device/light-ctemp.js
@@ -37,7 +37,7 @@ module.exports = class deviceLightColour {
     try {
       callback()
       const onoff = value ? 'on' : 'off'
-      if (onoff === this.cacheOnOff) return
+      if (this.cacheOnOff === onoff) return
       this.cacheOnOff = onoff
       const timerKey = Math.random().toString(36).substr(2, 8)
       this.updateTimeout = timerKey
@@ -45,9 +45,9 @@ module.exports = class deviceLightColour {
         if (this.updateTimeout === timerKey) this.updateTimeout = false
       }, 10000)
       await this.platform.sendDeviceUpdate(this.accessory, {
-        switch: onoff
+        switch: this.cacheOnOff
       })
-      this.log('[%s] current state [%s].', this.accessory.displayName, onoff)
+      this.log('[%s] current state [%s].', this.accessory.displayName, this.cacheOnOff)
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
     }
@@ -65,7 +65,7 @@ module.exports = class deviceLightColour {
       this.updateKeyBright = updateKeyBright
       const params = {
         white: {
-          br: value,
+          br: this.cacheBrightness,
           ct: this.cacheCT
         }
       }
@@ -90,15 +90,14 @@ module.exports = class deviceLightColour {
       }
       this.cacheMired = value
       callback()
-      const mToK = Math.max(Math.min(Math.round(1000000 / value), this.maxK), this.minK)
-      const kToCT = Math.round(((mToK - this.minK) / (this.maxK - this.minK)) * 255)
-      this.cacheCT = kToCT
+      const mToK = Math.max(Math.min(Math.round(1000000 / this.cacheMired), this.maxK), this.minK)
+      this.cacheCT = Math.round(((mToK - this.minK) / (this.maxK - this.minK)) * 255)
       const updateKeyCT = Math.random().toString(36).substr(2, 8)
       this.updateKeyCT = updateKeyCT
       const params = {
         white: {
           br: this.cacheBrightness,
-          ct: kToCT
+          ct: this.cacheCT
         }
       }
       await this.helpers.sleep(1500)
@@ -118,22 +117,21 @@ module.exports = class deviceLightColour {
     try {
       if (this.updateTimeout) return
       if (params.switch && params.switch !== this.cacheOnOff) {
-        this.lightService.updateCharacteristic(this.Characteristic.On, params.switch === 'on')
         this.cacheOnOff = params.switch
-        if (params.updateSource) this.log('[%s] current state [%s].', this.accessory.displayName, params.switch)
+        this.lightService.updateCharacteristic(this.Characteristic.On, this.cacheOnOff === 'on')
+        if (params.updateSource) this.log('[%s] current state [%s].', this.accessory.displayName, this.cacheOnOff)
       }
       if (params.white) {
         if (this.helpers.hasProperty(params.white, 'br') && this.cacheBrightness !== params.white.br) {
-          this.lightService.updateCharacteristic(this.Characteristic.Brightness, params.white.br)
           this.cacheBrightness = params.white.br
-          if (params.updateSource) this.log('[%s] current brightness [%s%].', this.accessory.displayName, params.white.br)
+          this.lightService.updateCharacteristic(this.Characteristic.Brightness, this.cacheBrightness)
+          if (params.updateSource) this.log('[%s] current brightness [%s%].', this.accessory.displayName, this.cacheBrightness)
         }
         if (this.helpers.hasProperty(params.white, 'ct') && this.cacheCT !== params.white.ct) {
-          const ctToK = Math.round(params.white.ct / 255 * (this.maxK - this.minK) + this.minK)
-          const kToMired = Math.min(Math.max(Math.round(1000000 / ctToK), 140), 500)
-          this.lightService.updateCharacteristic(this.Characteristic.ColorTemperature, kToMired)
           this.cacheCT = params.white.ct
-          this.cacheMired = kToMired
+          const ctToK = Math.round(this.cacheCT / 255 * (this.maxK - this.minK) + this.minK)
+          this.cacheMired = Math.min(Math.max(Math.round(1000000 / ctToK), 140), 500)
+          this.lightService.updateCharacteristic(this.Characteristic.ColorTemperature, this.cacheMired)
           if (params.updateSource) this.log('[%s] current cct [%sK].', this.accessory.displayName, ctToK)
         }
       }
diff --git a/lib/device/light-dimmer.js b/lib/device/light-dimmer.js
index 073359a4..e4d71d9f 100644
--- a/lib/device/light-dimmer.js
+++ b/lib/device/light-dimmer.js
@@ -21,12 +21,12 @@ module.exports = class deviceLightDimmer {
     try {
       callback()
       const onoff = value ? 'on' : 'off'
-      if (onoff === this.cacheOnOff) return
+      if (this.cacheOnOff === onoff) return
+      this.cacheOnOff = onoff
       await this.platform.sendDeviceUpdate(this.accessory, {
-        switch: onoff
+        switch: this.cacheOnOff
       })
-      this.cacheOnOff = onoff
-      this.log('[%s] current state [%s].', this.accessory.displayName, onoff)
+      this.log('[%s] current state [%s].', this.accessory.displayName, this.cacheOnOff)
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
     }
@@ -34,26 +34,30 @@ module.exports = class deviceLightDimmer {
 
   async internalBrightnessUpdate (value, callback) {
     try {
+      if (this.cacheBrightness === value) {
+        callback()
+        return
+      }
+      this.cacheBrightness = value
       callback()
       const params = {}
-      const updateKey = Math.random().toString(36).substr(2, 8)
-      this.updateKeyBright = updateKey
       switch (this.accessory.context.eweUIID) {
         case 36:
         // *** KING-M4 eWeLink scale is 10-100 and HomeKit scale is 0-100. *** \\
-          params.bright = Math.round((value * 9) / 10 + 10)
+          params.bright = Math.round((this.cacheBrightness * 9) / 10 + 10)
           break
         case 44:
         // *** D1 eWeLink scale matches HomeKit scale of 0-100 *** \\
-          params.brightness = value
+          params.brightness = this.cacheBrightness
           params.mode = 0
           break
       }
+      const updateKey = Math.random().toString(36).substr(2, 8)
+      this.updateKeyBright = updateKey
       await this.helpers.sleep(500)
       if (updateKey !== this.updateKeyBright) return
       await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.cacheBrightness = value
-      this.log('[%s] current brightness [%s%].', this.accessory.displayName, value)
+      this.log('[%s] current brightness [%s%].', this.accessory.displayName, this.cacheBrightness)
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
     }

From 328f73be442ec876e845eb4d2bbdebcd3606b563 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 23 Dec 2020 21:55:58 +0000
Subject: [PATCH 1035/3183] Update config.schema.json

---
 config.schema.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config.schema.json b/config.schema.json
index 6a4e2afc..1b4ff19a 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -138,7 +138,7 @@
       },
       "bulbB02FST64": {
         "type": "string"
-      }
+      },
       "groups": {
         "type": "array",
         "items": {

From b2535d811904c37fc0387e559884d5f15099bd82 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 23 Dec 2020 22:09:18 +0000
Subject: [PATCH 1036/3183] device logging

---
 lib/device/curtain.js | 37 ++++++++++++++-----------------------
 1 file changed, 14 insertions(+), 23 deletions(-)

diff --git a/lib/device/curtain.js b/lib/device/curtain.js
index 68543315..8ef6c159 100644
--- a/lib/device/curtain.js
+++ b/lib/device/curtain.js
@@ -8,13 +8,7 @@ module.exports = class deviceCurtain {
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
-    if (!(this.cService = accessory.getService(this.Service.WindowCovering))) {
-      this.cService = accessory.addService(this.Service.WindowCovering)
-      this.cService
-        .setCharacteristic(this.Characteristic.CurrentPosition, 0)
-        .setCharacteristic(this.Characteristic.TargetPosition, 0)
-        .setCharacteristic(this.Characteristic.PositionState, 2)
-    }
+    this.cService = accessory.getService(this.Service.WindowCovering) || accessory.addService(this.Service.WindowCovering)
     this.cService
       .getCharacteristic(this.Characteristic.TargetPosition)
       .on('set', this.internalUpdate.bind(this))
@@ -24,17 +18,16 @@ module.exports = class deviceCurtain {
   async internalUpdate (value, callback) {
     try {
       callback()
-      let params
-      const prevPos = this.accessory.context.cacheCurrentPosition
-      const newPos = value
-      if (newPos === prevPos) return
-      if (newPos === 0 || newPos === 100) {
-        params = { switch: newPos === 100 ? 'on' : 'off' }
+      if (value === this.cachePosition) return
+      const params = {}
+      this.cachePosition = value
+      if ([0, 100].includes(this.cachePosition)) {
+        params.switch = this.cachePosition === 100 ? 'on' : 'off'
       } else {
-        params = { setclose: Math.abs(100 - newPos) }
+        params.setclose = Math.abs(100 - this.cachePosition)
       }
-      this.accessory.context.cacheCurrentPosition = newPos
       await this.platform.sendDeviceUpdate(this.accessory, params)
+      this.log('[%s] current position [%s%].', this.accessory.displayName, this.cachePosition)
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
     }
@@ -42,16 +35,14 @@ module.exports = class deviceCurtain {
 
   async externalUpdate (params) {
     try {
-      if (!this.helpers.hasProperty(params, 'switch') && !this.helpers.hasProperty(params, 'setclose')) {
-        return
-      }
-      const newPos = Math.abs(100 - parseInt(params.setclose))
+      if (!params.switch && !this.helpers.hasProperty(params, 'setclose')) return
+      const pos = Math.abs(100 - parseInt(params.setclose))
+      if (this.cachePosition === pos) return
       this.cService
-        .updateCharacteristic(this.Characteristic.TargetPosition, newPos)
-        .updateCharacteristic(this.Characteristic.CurrentPosition, newPos)
+        .updateCharacteristic(this.Characteristic.TargetPosition, this.cachePosition)
+        .updateCharacteristic(this.Characteristic.CurrentPosition, this.cachePosition)
         .updateCharacteristic(this.Characteristic.PositionState, 2)
-      this.accessory.context.cacheCurrentPosition = newPos
-      return
+      this.log('[%s] current position [%s%].', this.accessory.displayName, this.cachePosition)
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }

From b30b0f2ecba0af7fdad4f988fe9ada2687460419 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 23 Dec 2020 22:09:48 +0000
Subject: [PATCH 1037/3183] 3.18.2-15

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 5c3cfe8d..1d74aff9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.18.2-14",
+  "version": "3.18.2-15",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 5d9c8ed0..4927eb4b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.18.2-14",
+  "version": "3.18.2-15",
   "author": "bwp91",
   "description": "Homebridge/HOOBS plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 6065d441b9369a3f890e15598f2cf5446e483a94 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 24 Dec 2020 09:25:16 +0000
Subject: [PATCH 1038/3183] just log once

---
 lib/index.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/lib/index.js b/lib/index.js
index 72904796..9dc63131 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -694,7 +694,7 @@ class eWeLinkPlatform {
         if (this.debug || this.debugReqRes) this.log('[%s] Reverting to web socket as %s.', accessory.displayName, res)
         await this.wsClient.sendUpdate(payload)
       } else {
-        throw new Error("it is unreachable. It's status will be corrected once it is reachable")
+        throw new Error("it is unreachable. It's status will be corrected once back online")
       }
     }
   }
@@ -798,8 +798,6 @@ class eWeLinkPlatform {
         await this.wsClient.requestUpdate(accessory)
         this.log.warn('[%s] requesting previous state information to revert.', accessory.displayName)
       } catch (err) {}
-    } else {
-      this.log.warn('[%s] state will be synced when device comes back online.', accessory.displayName)
     }
   }
 }

From 0998a6a946196dd2ea8df0293c41594177a2d399 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 24 Dec 2020 09:25:22 +0000
Subject: [PATCH 1039/3183] bug fixes

---
 lib/device/light-colour.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/device/light-colour.js b/lib/device/light-colour.js
index 1b6e0207..54373a41 100644
--- a/lib/device/light-colour.js
+++ b/lib/device/light-colour.js
@@ -8,7 +8,7 @@ module.exports = class deviceLightColour {
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
-    this.isB1 = this.accessory.context.eweUIID === 22
+    this.isB1 = accessory.context.eweUIID === 22
     this.lightService = accessory.getService(this.Service.Lightbulb) || accessory.addService(this.Service.Lightbulb)
     this.lightService
       .getCharacteristic(this.Characteristic.On)
@@ -255,9 +255,9 @@ module.exports = class deviceLightColour {
           if (mode === 2) {
             if (this.helpers.hasProperty(params, 'channel2')) {
               if (
-                params.channel2 !== this.cacheR.toString() ||
-                params.channel3 !== this.cacheG.toString() ||
-                params.channel4 !== this.cacheB.toString()
+                params.channel2 !== (this.cacheR || 0).toString() ||
+                params.channel3 !== (this.cacheG || 0).toString() ||
+                params.channel4 !== (this.cacheB || 0).toString()
               ) {
                 this.cacheR = parseInt(params.channel2)
                 this.cacheG = parseInt(params.channel3)

From e7ca709d6e479353c863c0f9f89dd2f1fe54858b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 24 Dec 2020 09:26:15 +0000
Subject: [PATCH 1040/3183] order

---
 lib/connection/lan.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/connection/lan.js b/lib/connection/lan.js
index aa245127..f76a5e02 100644
--- a/lib/connection/lan.js
+++ b/lib/connection/lan.js
@@ -90,8 +90,8 @@ module.exports = class connectionLAN {
               }
             }
             if (Object.keys(params).length > 0) {
-              params.updateSource = 'LAN'
               params.online = true
+              params.updateSource = 'LAN'
               const returnTemplate = {
                 deviceid: rdata.id,
                 params

From 01633989bd91b29d29b295022bb2c936c1919be7 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 24 Dec 2020 10:36:20 +0000
Subject: [PATCH 1041/3183] commenting, restructuring

---
 lib/connection/http.js |  18 +--
 lib/connection/lan.js  | 243 ++++++++++++++++++++++-------------------
 lib/connection/ws.js   |  12 +-
 lib/index.js           |  25 +++--
 4 files changed, 160 insertions(+), 138 deletions(-)

diff --git a/lib/connection/http.js b/lib/connection/http.js
index 341272fd..4660e074 100644
--- a/lib/connection/http.js
+++ b/lib/connection/http.js
@@ -2,16 +2,16 @@
 /* eslint-disable new-cap */
 'use strict'
 module.exports = class connectionHTTP {
-  constructor (config, log, helpers) {
+  constructor (platform) {
     // *** Set up our variables *** \\
-    this.log = log
-    this.helpers = helpers
-    this.debug = config.debug || false
-    this.debugReqRes = config.debugReqRes || false
-    this.username = config.username.toString()
-    this.password = config.password.toString()
-    this.hideDevFromHB = (config.hideDevFromHB || '').split(',')
-    this.cCode = '+' + config.countryCode.toString().replace('+', '').replace(' ', '')
+    this.log = platform.log
+    this.helpers = platform.helpers
+    this.debug = platform.config.debug
+    this.debugReqRes = platform.config.debugReqRes
+    this.username = platform.config.username.toString()
+    this.password = platform.config.password.toString()
+    this.hideDevFromHB = (platform.config.hideDevFromHB || '').split(',')
+    this.cCode = '+' + platform.config.countryCode.toString().replace('+', '').replace(' ', '')
     this.axios = require('axios')
     this.crypto = require('crypto')
   }
diff --git a/lib/connection/lan.js b/lib/connection/lan.js
index f76a5e02..ba58d9b8 100644
--- a/lib/connection/lan.js
+++ b/lib/connection/lan.js
@@ -2,116 +2,130 @@
 /* eslint-disable new-cap */
 'use strict'
 module.exports = class connectionLAN {
-  constructor (config, log, helpers, ipOverride, devices) {
-    this.log = log
-    this.config = config
-    this.helpers = helpers
-    this.ipOverride = ipOverride
-    this.debug = this.config.debug || false
-    this.debugReqRes = this.config.debugReqRes || false
-    this.emitter = new (require('events'))()
-    this.devices = devices
+  constructor (platform, devices) {
+    // *** Set up our variables *** \\
+    this.log = platform.log
+    this.helpers = platform.helpers
+    this.debug = platform.config.debug
+    this.debugReqRes = platform.config.debugReqRes
+    this.ipOverride = platform.ipOverride
     this.deviceMap = new Map()
+    this.crypto = require('crypto')
+    this.dns = require('node-dns-sd')
+    this.emitter = new (require('events'))()
+
+    // *** Create a template map with our device list from the HTTP client *** \\
     devices.forEach(device => {
+      if (!this.helpers.devicesLAN.includes(device.extra.uiid)) return
       this.deviceMap.set(device.deviceid, {
         apiKey: device.devicekey,
-        online: this.helpers.hasProperty(this.ipOverride, device.deviceid),
-        ip: this.helpers.hasProperty(this.ipOverride, device.deviceid) ? this.ipOverride[device.deviceid] : null,
-        uiid: device.extra.uiid,
-        lastIV: null
+        ip: this.ipOverride[device.deviceid]
       })
     })
-    this.crypto = require('crypto')
-    this.dns = require('node-dns-sd')
   }
 
   async getHosts () {
+    // *** Perform an initial discovery of devices on the local network *** \\
     const res = await this.dns.discover({ name: '_ewelink._tcp.local' })
+
+    // *** Update the device map for each device found on the local network *** \\
     res.forEach(device => {
-      let d
+      // *** Obtain the ewelink deviceId and check to see it is in our map *** \\
       const deviceId = device.fqdn.replace('._ewelink._tcp.local', '').replace('eWeLink_', '')
-      if ((d = this.deviceMap.get(deviceId))) {
-        if (!this.helpers.hasProperty(this.ipOverride, deviceId)) {
-          this.deviceMap.set(deviceId, {
-            apiKey: d.apiKey,
-            online: true,
-            ip: device.address,
-            uiid: d.uiid,
-            lastIV: null
-          })
-        }
+      let d
+      if ((d = this.deviceMap.get(deviceId)) && !d.ip) {
+        // *** Update the map with the found IP address *** \\
+        this.deviceMap.set(deviceId, {
+          apiKey: d.apiKey,
+          ip: device.address,
+          lastIV: null
+        })
       }
     })
     return this.deviceMap
   }
 
   async startMonitor () {
+    // *** Function to parse DNS packets picked up by node-dns-sd *** \\
     this.dns.ondata = packet => {
-      if (packet.answers) {
-        packet.answers
-          .filter(value => value.name.includes('_ewelink._tcp.local'))
-          .filter(value => value.type === 'TXT')
-          .filter(value => this.deviceMap.has(value.rdata.id))
-          .forEach(value => {
-            const rdata = value.rdata
-            const deviceInfo = this.deviceMap.get(rdata.id)
-            if (!this.helpers.devicesLAN.includes(deviceInfo.uiid)) return
-            if (deviceInfo.lastIV === rdata.iv) return
-            deviceInfo.lastIV = rdata.iv
-            const data =
-              rdata.data1 +
-              (this.helpers.hasProperty(rdata, 'data2') ? rdata.data2 : '') +
-              (this.helpers.hasProperty(rdata, 'data3') ? rdata.data3 : '') +
-              (this.helpers.hasProperty(rdata, 'data4') ? rdata.data4 : '')
-            const key = this.crypto.createHash('md5').update(Buffer.from(deviceInfo.apiKey, 'utf8')).digest()
-            const dText = this.crypto.createDecipheriv('aes-128-cbc', key, Buffer.from(rdata.iv, 'base64'))
-            const pText = Buffer.concat([dText.update(Buffer.from(data, 'base64')), dText.final()]).toString('utf8')
-            let params
-            if (packet.address !== deviceInfo.ip && !this.helpers.hasProperty(this.ipOverride, rdata.id)) {
-              this.deviceMap.set(rdata.id, {
-                apiKey: deviceInfo.apiKey,
-                online: true,
-                ip: packet.address,
-                uiid: deviceInfo.uiid,
-                lastIV: rdata.iv
-              })
-            }
-            try {
-              params = JSON.parse(pText)
-            } catch (e) {
-              this.log.warn('[%s] LAN message received could not be read [%s]:\n%s', rdata.id, e.pText)
-              return
-            }
-            for (const param in params) {
-              if (this.helpers.hasProperty(params, param)) {
-                if (!this.helpers.paramsToKeep.includes(param.replace(/[0-9]/g, ''))) {
-                  delete params[param]
-                }
+      if (!packet.answers) return
+      packet.answers
+        .filter(value => value.name.includes('_ewelink._tcp.local'))
+        .filter(value => value.type === 'TXT')
+        .filter(value => this.deviceMap.has(value.rdata.id))
+        .forEach(value => {
+          const rdata = value.rdata
+
+          // *** Check the packet relates to a device in our map *** \\
+          const deviceInfo = this.deviceMap.get(rdata.id)
+
+          // *** Skip the update if it's a duplicate *** \\
+          if (deviceInfo.lastIV === rdata.iv) return
+          deviceInfo.lastIV = rdata.iv
+          const data =
+            rdata.data1 +
+            (this.helpers.hasProperty(rdata, 'data2') ? rdata.data2 : '') +
+            (this.helpers.hasProperty(rdata, 'data3') ? rdata.data3 : '') +
+            (this.helpers.hasProperty(rdata, 'data4') ? rdata.data4 : '')
+          const key = this.crypto.createHash('md5').update(Buffer.from(deviceInfo.apiKey, 'utf8')).digest()
+          const dText = this.crypto.createDecipheriv('aes-128-cbc', key, Buffer.from(rdata.iv, 'base64'))
+          const pText = Buffer.concat([dText.update(Buffer.from(data, 'base64')), dText.final()]).toString('utf8')
+
+          // *** Check to see if the IP address of the device has changed *** \\
+          if (packet.address !== deviceInfo.ip && !this.ipOverride[rdata.id]) {
+            this.deviceMap.set(rdata.id, {
+              apiKey: deviceInfo.apiKey,
+              ip: packet.address,
+              lastIV: rdata.iv
+            })
+          }
+
+          // *** Parse the deconstructed information from the packet *** \\
+          let params
+          try {
+            params = JSON.parse(pText)
+          } catch (e) {
+            this.log.warn('[%s] LAN message received could not be read [%s]:\n%s', rdata.id, e, pText)
+            return
+          }
+
+          // *** Remove any params we don't need *** \\
+          for (const param in params) {
+            if (this.helpers.hasProperty(params, param)) {
+              if (!this.helpers.paramsToKeep.includes(param.replace(/[0-9]/g, ''))) {
+                delete params[param]
               }
             }
-            if (Object.keys(params).length > 0) {
-              params.online = true
-              params.updateSource = 'LAN'
-              const returnTemplate = {
-                deviceid: rdata.id,
-                params
-              }
-              this.emitter.emit('update', returnTemplate)
+          }
+
+          // *** If any params are left then generate the template to be emitted *** \\
+          if (Object.keys(params).length > 0) {
+            params.online = true
+            params.updateSource = 'LAN'
+            const returnTemplate = {
+              deviceid: rdata.id,
+              params
             }
-          })
-      }
+            this.emitter.emit('update', returnTemplate)
+          }
+        })
     }
+
+    // *** Start the DNS packet monitoring *** \\
     this.dns.startMonitoring()
   }
 
   async sendUpdate (json) {
     try {
-      if (!this.deviceMap.get(json.deviceid).online) {
-        throw new Error("device isn't reachable via LAN mode")
+      // *** Check we have an IP address for the device *** \\
+      if (!this.deviceMap.get(json.deviceid).ip) {
+        throw new Error('device not reachable via LAN mode')
       }
       let apiKey
       let suffix
       const params = {}
+
+      // *** For now only /switch and /switches are supported *** \\
       if (this.helpers.hasProperty(json.params, 'switches')) {
         params.switches = json.params.switches
         suffix = 'switches'
@@ -119,35 +133,46 @@ module.exports = class connectionLAN {
         params.switch = json.params.switch
         suffix = 'switch'
       } else {
-        throw new Error("device isn't configurable via LAN mode")
+        throw new Error('device not configurable via LAN mode')
       }
-      if ((apiKey = this.deviceMap.get(json.deviceid).apiKey)) {
-        const key = this.crypto.createHash('md5').update(Buffer.from(apiKey, 'utf8')).digest()
-        const iv = this.crypto.randomBytes(16)
-        const enc = this.crypto.createCipheriv('aes-128-cbc', key, iv)
-        const data = {
-          data: Buffer.concat([enc.update(JSON.stringify(params)), enc.final()]).toString('base64'),
-          deviceid: json.deviceid,
-          encrypt: true,
-          iv: iv.toString('base64'),
-          selfApikey: '123',
-          sequence: Date.now().toString()
-        }
-        const res = await (require('axios'))({
-          method: 'post',
-          url: 'http://' + this.deviceMap.get(json.deviceid).ip + ':8081/zeroconf/' + suffix,
-          headers: {
-            Accept: 'application/json',
-            'Content-Type': 'application/json'
-          },
-          data,
-          timeout: 3000
-        })
-        if (!this.helpers.hasProperty(res.data, 'error') || res.data.error !== 0) {
-          throw new Error(res.data)
-        }
-        return 'ok'
+
+      // *** Check we have the device API key *** \\
+      if (!(apiKey = this.deviceMap.get(json.deviceid).apiKey)) {
+        throw new Error('cannot retrieve device API key')
+      }
+
+      // *** Generate the HTTP request *** \\
+      const key = this.crypto.createHash('md5').update(Buffer.from(apiKey, 'utf8')).digest()
+      const iv = this.crypto.randomBytes(16)
+      const enc = this.crypto.createCipheriv('aes-128-cbc', key, iv)
+      const data = {
+        data: Buffer.concat([enc.update(JSON.stringify(params)), enc.final()]).toString('base64'),
+        deviceid: json.deviceid,
+        encrypt: true,
+        iv: iv.toString('base64'),
+        selfApikey: '123',
+        sequence: Date.now().toString()
+      }
+
+      // *** Send the HTTP request *** \\
+      const res = await (require('axios'))({
+        method: 'post',
+        url: 'http://' + this.deviceMap.get(json.deviceid).ip + ':8081/zeroconf/' + suffix,
+        headers: {
+          Accept: 'application/json',
+          'Content-Type': 'application/json'
+        },
+        data,
+        timeout: 3000
+      })
+
+      // *** Check for any errors in the response *** \\
+      if (!res.data || res.data.error !== 0) {
+        throw new Error(res.data)
       }
+
+      // *** This ok is needed by the plugin *** \\
+      return 'ok'
     } catch (err) {
       return err.message
     }
@@ -158,18 +183,16 @@ module.exports = class connectionLAN {
   }
 
   addDeviceToMap (device) {
+    // *** Adds a device to the map if it is discovered by the plugin *** \\
     this.deviceMap.set(device.deviceid, {
       apiKey: device.devicekey,
-      online: this.helpers.devicesLAN.includes(device.extra.uiid) && this.helpers.hasProperty(this.ipOverride, device.deviceid),
-      ip: this.helpers.devicesLAN.includes(device.extra.uiid) && this.helpers.hasProperty(this.ipOverride, device.deviceid)
-        ? this.ipOverride[device.deviceid]
-        : null,
-      uiid: device.extra.uiid,
+      ip: this.ipOverride[device.deviceid],
       lastIV: null
     })
   }
 
   async closeConnection () {
+    // *** This is called when Homebridge is shutdown *** \\
     await this.dns.stopMonitoring()
     if (this.debug || this.debugReqRes) this.log('LAN monitoring gracefully stopped.')
   }
diff --git a/lib/connection/ws.js b/lib/connection/ws.js
index 81202bd4..95bab053 100644
--- a/lib/connection/ws.js
+++ b/lib/connection/ws.js
@@ -2,16 +2,14 @@
 /* eslint-disable new-cap */
 'use strict'
 module.exports = class connectionWS {
-  constructor (config, log, helpers, authData) {
-    this.config = config
-    this.log = log
-    this.helpers = helpers
-    this.debug = this.config.debug || false
-    this.debugReqRes = this.config.debugReqRes || false
+  constructor (platform, authData) {
+    this.log = platform.log
+    this.helpers = platform.helpers
+    this.debug = platform.config.debug
+    this.debugReqRes = platform.config.debugReqRes
     this.httpHost = authData.httpHost
     this.aToken = authData.aToken
     this.apiKey = authData.apiKey
-    this.wsIsOpen = false
     this.emitter = new (require('events'))()
   }
 
diff --git a/lib/index.js b/lib/index.js
index 9dc63131..9479f3d1 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -17,12 +17,12 @@ class eWeLinkPlatform {
     this.log = log
     this.config = config
     this.api = api
-    this.helpers = require('./utils/helpers')
     this.Characteristic = api.hap.Characteristic
     this.Service = api.hap.Service
+    this.helpers = require('./utils/helpers')
     this.eveService = require('./fakegato/fakegato-history')(api)
-    this.debug = this.config.debug || false
-    this.debugReqRes = this.config.debugReqRes || false
+    this.debug = this.config.debug
+    this.debugReqRes = this.config.debugReqRes
     this.devicesInHB = new Map()
     this.devicesInEW = new Map()
     this.cusG = new Map()
@@ -34,7 +34,6 @@ class eWeLinkPlatform {
     if (Array.isArray(config.thTempOffset)) config.thTempOffset.forEach(x => (this.thTempOffset[x.deviceId] = x.offset))
     if (Array.isArray(config.nameOverride)) config.nameOverride.forEach(x => (this.nameOverride[x.fullDeviceId] = x.deviceName))
     if (Array.isArray(config.ipOverride)) config.ipOverride.forEach(x => (this.ipOverride[x.deviceId] = x.deviceIP))
-    this.eveLogPath = this.api.user.storagePath() + '/persist/'
 
     // *** Set up Homebridge API events *** \\
     this.api
@@ -56,21 +55,21 @@ class eWeLinkPlatform {
       this.log('Plugin [v%s] initialised. Syncing with eWeLink...', this.version)
 
       // *** Set up the HTTP client, get the user HTTP host, and login *** \\
-      this.httpClient = new (require('./connection/http'))(this.config, this.log, this.helpers)
+      this.httpClient = new (require('./connection/http'))(this)
       await this.httpClient.getHost()
-      this.authData = await this.httpClient.login()
+      const authData = await this.httpClient.login()
 
       // *** Get a device list and add to the devicesInEW map *** \\
       const deviceList = await this.httpClient.getDevices()
       deviceList.forEach(device => this.devicesInEW.set(device.deviceid, device))
 
       // *** Set up the WS client, get the user WS host, and login *** \\
-      this.wsClient = new (require('./connection/ws'))(this.config, this.log, this.helpers, this.authData)
+      this.wsClient = new (require('./connection/ws'))(this, authData)
       await this.wsClient.getHost()
       this.wsClient.login()
 
       // *** Set up the LAN client, scan for devices and start monitoring *** \\
-      this.lanClient = new (require('./connection/lan'))(this.config, this.log, this.helpers, this.ipOverride, deviceList)
+      this.lanClient = new (require('./connection/lan'))(this, deviceList)
       this.lanDevices = await this.lanClient.getHosts()
       await this.lanClient.startMonitor()
 
@@ -117,7 +116,7 @@ class eWeLinkPlatform {
             await this.wsClient.login()
           }
         } catch (err) {
-          this.log.warn(this.debug || this.debugReqRes ? err : err.message)
+          this.log.warn((this.debug || this.debugReqRes) ? err : err.message)
         }
       }, 3600000)
 
@@ -389,7 +388,7 @@ class eWeLinkPlatform {
           }
           oAccessory.context.reachableWAN = device.online
           oAccessory.context.reachableLAN = this.lanDevices.has(device.deviceid)
-            ? this.lanDevices.get(device.deviceid).online
+            ? this.lanDevices.get(device.deviceid).ip
             : false
           oAccessory.context.eweBrandName = device.brandName
           oAccessory.context.eweBrandLogo = device.brandLogo
@@ -539,7 +538,7 @@ class eWeLinkPlatform {
       // *** Update the reachability values (via WS and LAN) *** \\
       accessory.context.reachableWAN = device.online
       accessory.context.reachableLAN = this.lanDevices.has(device.deviceid)
-        ? this.lanDevices.get(device.deviceid).online
+        ? this.lanDevices.get(device.deviceid).ip
         : false
       accessory.context.eweBrandName = device.brandName
       accessory.context.eweBrandLogo = device.brandLogo
@@ -780,7 +779,9 @@ class eWeLinkPlatform {
         this.initialiseDevice(newDevice)
 
         // *** Add the device to the LAN client map *** \\
-        this.lanClient.addDeviceToMap(newDevice)
+        if (this.helpers.devicesLAN.includes(newDevice.extra.uiid)) {
+          this.lanClient.addDeviceToMap(newDevice)
+        }
       } catch (err) {
         // *** Automatically adding the new device failed for some reason *** \\
         this.log.warn('[%s] restart Homebridge to add new device, failed to add automatically as %s.', deviceId, err.message)

From d25ca5b29078ee8f9ab858716959ab331ea0e19a Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 24 Dec 2020 10:49:28 +0000
Subject: [PATCH 1042/3183] rename device files

---
 lib/device/{garage.js => garage-one.js}     | 2 +-
 lib/device/{outlet-temp.js => th-outlet.js} | 2 +-
 lib/device/{thermostat.js => th-thermo.js}  | 2 +-
 lib/device/{valve.js => valve-one.js}       | 2 +-
 lib/index.js                                | 8 ++++----
 5 files changed, 8 insertions(+), 8 deletions(-)
 rename lib/device/{garage.js => garage-one.js} (99%)
 rename lib/device/{outlet-temp.js => th-outlet.js} (98%)
 rename lib/device/{thermostat.js => th-thermo.js} (99%)
 rename lib/device/{valve.js => valve-one.js} (98%)

diff --git a/lib/device/garage.js b/lib/device/garage-one.js
similarity index 99%
rename from lib/device/garage.js
rename to lib/device/garage-one.js
index 74724cb6..c52837d1 100644
--- a/lib/device/garage.js
+++ b/lib/device/garage-one.js
@@ -1,7 +1,7 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
-module.exports = class deviceGarage {
+module.exports = class deviceGarageOne {
   constructor (platform, accessory) {
     this.platform = platform
     this.log = platform.log
diff --git a/lib/device/outlet-temp.js b/lib/device/th-outlet.js
similarity index 98%
rename from lib/device/outlet-temp.js
rename to lib/device/th-outlet.js
index e328b287..98987f99 100644
--- a/lib/device/outlet-temp.js
+++ b/lib/device/th-outlet.js
@@ -1,7 +1,7 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
-module.exports = class deviceOutletTemp {
+module.exports = class deviceTHOutlet {
   constructor (platform, accessory) {
     this.platform = platform
     this.log = platform.log
diff --git a/lib/device/thermostat.js b/lib/device/th-thermo.js
similarity index 99%
rename from lib/device/thermostat.js
rename to lib/device/th-thermo.js
index a8e13c46..93e51597 100644
--- a/lib/device/thermostat.js
+++ b/lib/device/th-thermo.js
@@ -1,7 +1,7 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
-module.exports = class deviceThermostat {
+module.exports = class deviceTHThermo {
   constructor (platform, accessory) {
     this.platform = platform
     this.log = platform.log
diff --git a/lib/device/valve.js b/lib/device/valve-one.js
similarity index 98%
rename from lib/device/valve.js
rename to lib/device/valve-one.js
index 6611db2e..f47104ed 100644
--- a/lib/device/valve.js
+++ b/lib/device/valve-one.js
@@ -1,7 +1,7 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
-module.exports = class deviceValve {
+module.exports = class deviceValveOne {
   constructor (platform, accessory) {
     this.platform = platform
     this.log = platform.log
diff --git a/lib/index.js b/lib/index.js
index 9479f3d1..107e916a 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -194,7 +194,7 @@ class eWeLinkPlatform {
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
           : this.addAccessory(device, device.deviceid + 'SWX', false, this.helpers.defaultGarageCache)
-        accessory.control = new (require('./device/garage'))(this, accessory)
+        accessory.control = new (require('./device/garage-one'))(this, accessory)
         /*********************************/
       } else if (this.cusG.has(device.deviceid + 'SWX') && this.cusG.get(device.deviceid + 'SWX').type === 'garage_two') {
         /**********************************
@@ -248,7 +248,7 @@ class eWeLinkPlatform {
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
           : this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require('./device/valve'))(this, accessory)
+        accessory.control = new (require('./device/valve-one'))(this, accessory)
         /***************************/
       } else if (this.cusG.has(device.deviceid + 'SWX') && this.cusG.get(device.deviceid + 'SWX').type === 'valve_two') {
         /**********************************
@@ -296,8 +296,8 @@ class eWeLinkPlatform {
             sensorType: device.params.sensorType
           })
         accessory.control = (this.config.thAsThermostat || '').split(',').includes(device.deviceid)
-          ? new (require('./device/thermostat'))(this, accessory)
-          : new (require('./device/outlet-temp'))(this, accessory)
+          ? new (require('./device/th-thermo'))(this, accessory)
+          : new (require('./device/th-outlet'))(this, accessory)
         /*********/
       } else if (
         this.helpers.devicesOutlet.includes(device.extra.uiid) ||

From d5d8bbb9f07262799c87a634b337b10314f9c2ec Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 24 Dec 2020 10:58:45 +0000
Subject: [PATCH 1043/3183] device logging

---
 lib/device/blind.js | 27 ++++++++++-----------------
 1 file changed, 10 insertions(+), 17 deletions(-)

diff --git a/lib/device/blind.js b/lib/device/blind.js
index 3bbce7d0..0a67abee 100644
--- a/lib/device/blind.js
+++ b/lib/device/blind.js
@@ -24,22 +24,14 @@ module.exports = class deviceBlind {
   async internalUpdate (value, callback) {
     try {
       callback()
-      let blindConfig
-      const params = {}
-      const prevState = this.accessory.context.cachePositionState
+      const blindConfig = this.platform.cusG.get(this.accessory.context.hbDeviceId)
       let prevPosition = this.accessory.context.cacheCurrentPosition
-      const newTarget = value
+      if (value === prevPosition) return
+      const params = { switches: this.helpers.defaultMultiSwitchOff }
+      const prevState = this.accessory.context.cachePositionState
+      const percentStepPerDecisecond = blindConfig.operationTime / 100
       const updateKey = Math.random().toString(36).substr(2, 8)
-      if (!(blindConfig = this.platform.cusG.get(this.accessory.context.hbDeviceId))) {
-        throw new Error('group config missing')
-      }
-      if (blindConfig.type !== 'blind') {
-        throw new Error('improper configuration')
-      }
-      if (newTarget === prevPosition) return
-      params.switches = this.helpers.defaultMultiSwitchOff
       this.updateKey = updateKey
-      const percentStepPerDecisecond = blindConfig.operationTime / 100
       if (prevState !== 2) {
         await this.platform.sendDeviceUpdate(this.accessory, params)
         let positionPercentChange = Math.floor(Date.now() / 100) - this.accessory.context.cacheLastStartTime
@@ -52,13 +44,13 @@ module.exports = class deviceBlind {
         this.wcService.updateCharacteristic(this.Characteristic.CurrentPosition, prevPosition)
         this.accessory.context.cacheCurrentPosition = prevPosition
       }
-      const diffPosition = newTarget - prevPosition
+      const diffPosition = value - prevPosition
       const setToMoveUp = diffPosition > 0
       const decisecondsToMove = Math.round(Math.abs(diffPosition) * percentStepPerDecisecond)
       params.switches[0].switch = setToMoveUp ? 'on' : 'off'
       params.switches[1].switch = setToMoveUp ? 'off' : 'on'
       await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.accessory.context.cacheTargetPosition = newTarget
+      this.accessory.context.cacheTargetPosition = value
       this.accessory.context.cachePositionState = setToMoveUp ? 1 : 0
       this.accessory.context.cacheLastStartTime = Math.floor(Date.now() / 100)
       await this.helpers.sleep(decisecondsToMove * 100)
@@ -68,9 +60,10 @@ module.exports = class deviceBlind {
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.wcService
         .updateCharacteristic(this.Characteristic.PositionState, 2)
-        .updateCharacteristic(this.Characteristic.CurrentPosition, newTarget)
+        .updateCharacteristic(this.Characteristic.CurrentPosition, value)
       this.accessory.context.cachePositionState = 2
-      this.accessory.context.cacheCurrentPosition = newTarget
+      this.accessory.context.cacheCurrentPosition = value
+      this.log('[%s] current position [%s%]', this.accessory.displayName, value)
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
     }

From 37eeba2a856f3afb45a6a3042d0056a695f1a395 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 24 Dec 2020 11:16:21 +0000
Subject: [PATCH 1044/3183] device logging

---
 lib/device/lock.js   | 26 ++++++++------------------
 lib/device/sensor.js | 19 ++++++++++++++-----
 2 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/lib/device/lock.js b/lib/device/lock.js
index b95c628c..2a879ad7 100644
--- a/lib/device/lock.js
+++ b/lib/device/lock.js
@@ -21,48 +21,38 @@ module.exports = class deviceLock {
   async internalUpdate (value, callback) {
     try {
       callback()
-      let lockConfig
+      const lockConfig = this.platform.cusG.get(this.accessory.context.hbDeviceId)
       const params = { switch: 'on' }
-      if (!(lockConfig = this.platform.cusG.get(this.accessory.context.hbDeviceId))) {
-        throw new Error('group config missing')
-      }
-      if (lockConfig.type !== 'lock') {
-        throw new Error('improper configuration')
-      }
       this.inUse = true
       await this.platform.sendDeviceUpdate(this.accessory, params)
+      this.log('[%s] current status [unlocked].', this.accessory.displayName)
       await this.helpers.sleep(Math.max(lockConfig.operationTime * 100, 1000))
       this.lmService
         .updateCharacteristic(this.Characteristic.LockTargetState, 1)
         .updateCharacteristic(this.Characteristic.LockCurrentState, 1)
       this.inUse = false
+      this.log('[%s] current status [locked].', this.accessory.displayName)
     } catch (err) {
+      this.inUse = false
       this.platform.deviceUpdateError(this.accessory, err, true)
     }
   }
 
   async externalUpdate (params) {
     try {
-      if (!this.helpers.hasProperty(params, 'switch')) return
-      let lockConfig
-      if (!(lockConfig = this.platform.cusG.get(this.accessory.context.hbDeviceId))) {
-        throw new Error('group config missing')
-      }
-      if (lockConfig.type !== 'lock') {
-        throw new Error('improper configuration')
-      }
-      if (params.switch === 'off' || this.inUse) {
-        return
-      }
+      if (!params.switch || params.switch === 'off' || this.inUse) return
+      const lockConfig = this.platform.cusG.get(this.accessory.context.hbDeviceId)
       this.inUse = true
       this.lmService
         .updateCharacteristic(this.Characteristic.LockCurrentState, 0)
         .updateCharacteristic(this.Characteristic.LockTargetState, 0)
+      this.log('[%s] current status [unlocked].', this.accessory.displayName)
       await this.helpers.sleep(Math.max(lockConfig.operationTime * 100, 1000))
       this.lmService
         .updateCharacteristic(this.Characteristic.LockCurrentState, 1)
         .updateCharacteristic(this.Characteristic.LockTargetState, 1)
       this.inUse = false
+      this.log('[%s] current status [locked].', this.accessory.displayName)
     } catch (err) {
       this.inUse = false
       this.platform.deviceUpdateError(this.accessory, err, false)
diff --git a/lib/device/sensor.js b/lib/device/sensor.js
index 3cd5e184..c7d2c7c8 100644
--- a/lib/device/sensor.js
+++ b/lib/device/sensor.js
@@ -38,13 +38,16 @@ module.exports = class deviceSensor {
     try {
       if (this.helpers.hasProperty(params, 'battery')) {
         const scaledBattery = Math.round(params.battery * 33.3)
-        this.batteryService
-          .updateCharacteristic(this.Characteristic.BatteryLevel, scaledBattery)
-          .updateCharacteristic(this.Characteristic.StatusLowBattery, scaledBattery < this.lowBattThreshold)
+        if (this.cacheBattery !== scaledBattery) {
+          this.batteryService
+            .updateCharacteristic(this.Characteristic.BatteryLevel, this.cacheBattery)
+            .updateCharacteristic(this.Characteristic.StatusLowBattery, this.cacheBattery < this.lowBattThreshold)
+          if (params.updateSource) this.log('[%s] current battery [%s%].', this.accessory.displayName, this.cacheBattery)
+        }
       }
-      if (!this.helpers.hasProperty(params, 'switch')) return
+      if (!params.switch || params.switch === this.cacheOnOff) return
+      this.cacheOnOff = params.switch
       const newState = params.switch === 'on' ? 1 : 0
-      let oAccessory = false
       this.contactService.updateCharacteristic(this.Characteristic.ContactSensorState, newState)
       this.accessory.eveService.addEntry({ status: newState })
       if (newState) {
@@ -53,6 +56,10 @@ module.exports = class deviceSensor {
           Math.round(new Date().valueOf() / 1000) - this.accessory.eveService.getInitialTime()
         )
       }
+      if (params.updateSource) {
+        this.log('[%s] current state [contact%s detected].', this.accessory.displayName, newState === 0 ? '' : ' not')
+      }
+      let oAccessory
       this.platform.cusG.forEach(async group => {
         if (group.sensorId === this.accessory.context.eweDeviceId && group.type === 'garage') {
           if ((oAccessory = this.platform.devicesInHB.get(group.deviceId + 'SWX'))) {
@@ -62,12 +69,14 @@ module.exports = class deviceSensor {
                 gdService
                   .updateCharacteristic(this.Characteristic.TargetDoorState, 1)
                   .updateCharacteristic(this.Characteristic.CurrentDoorState, 1)
+                if (params.updateSource) this.log('[%s] current state [closed].', oAccessory.displayName)
                 break
               case 1:
                 await this.helpers.sleep(Math.max(group.operationTime * 100, 1000))
                 gdService
                   .updateCharacteristic(this.Characteristic.TargetDoorState, 0)
                   .updateCharacteristic(this.Characteristic.CurrentDoorState, 0)
+                if (params.updateSource) this.log('[%s] current state [open].', oAccessory.displayName)
                 break
             }
           }

From 00d097c8f8bf682e5bf00f0875fb53baa000c16a Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 24 Dec 2020 11:17:22 +0000
Subject: [PATCH 1045/3183] 3.18.2-16

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 1d74aff9..4f777863 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.18.2-15",
+  "version": "3.18.2-16",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 4927eb4b..4c81b715 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.18.2-15",
+  "version": "3.18.2-16",
   "author": "bwp91",
   "description": "Homebridge/HOOBS plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From c544556725218e50ed87b4022c0d27c3555df096 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 24 Dec 2020 11:51:30 +0000
Subject: [PATCH 1046/3183] device logging

---
 lib/device/fan.js | 83 +++++++++++++++++++++++++++--------------------
 1 file changed, 47 insertions(+), 36 deletions(-)

diff --git a/lib/device/fan.js b/lib/device/fan.js
index 5a909daa..70f178c1 100644
--- a/lib/device/fan.js
+++ b/lib/device/fan.js
@@ -25,13 +25,11 @@ module.exports = class deviceFan {
       if (accessory.getService(this.Service.Lightbulb)) {
         accessory.removeService(accessory.getService(this.Service.Lightbulb))
       }
-      this.visibleLight = false
     } else {
       this.lightService = accessory.getService(this.Service.Lightbulb) || accessory.addService(this.Service.Lightbulb)
       this.lightService
         .getCharacteristic(this.Characteristic.On)
         .on('set', this.internalLightUpdate.bind(this))
-      this.visibleLight = true
     }
     this.accessory = accessory
   }
@@ -40,14 +38,22 @@ module.exports = class deviceFan {
     try {
       callback()
       const params = { switches: this.helpers.defaultMultiSwitchOff }
-      const newPower = value >= 33 ? 1 : 0
+      const newPower = value >= 33
       const newSpeed = value
-      const newLight = this.visibleLight ? this.lightService.getCharacteristic(this.Characteristic.On).value : true
+      const newLight = this.lightService ? this.lightService.getCharacteristic(this.Characteristic.On).value : true
       params.switches[0].switch = newLight ? 'on' : 'off'
-      params.switches[1].switch = newPower === 1 && newSpeed >= 33 ? 'on' : 'off'
-      params.switches[2].switch = newPower === 1 && newSpeed >= 66 && newSpeed < 99 ? 'on' : 'off'
-      params.switches[3].switch = newPower === 1 && newSpeed >= 99 ? 'on' : 'off'
+      params.switches[1].switch = newPower && newSpeed >= 33 ? 'on' : 'off'
+      params.switches[2].switch = newPower && newSpeed >= 66 && newSpeed < 99 ? 'on' : 'off'
+      params.switches[3].switch = newPower && newSpeed >= 99 ? 'on' : 'off'
       await this.platform.sendDeviceUpdate(this.accessory, params)
+      if (newPower !== (this.cacheOnOff === 'on')) {
+        this.cacheOnOff = newPower ? 'on' : 'off'
+        this.log('[%s] current state [%s].', this.accessory.displayName, this.cacheOnOff)
+      }
+      if (newSpeed !== this.cacheSpeed) {
+        this.cacheSpeed = newSpeed
+        this.log('[%s] current speed [%s%].', this.accessory.displayName, this.cacheSpeed)
+      }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
     }
@@ -59,12 +65,16 @@ module.exports = class deviceFan {
       const params = { switches: this.helpers.defaultMultiSwitchOff }
       const newPower = this.fanService.getCharacteristic(this.Characteristic.On).value
       const newSpeed = this.fanService.getCharacteristic(this.Characteristic.RotationSpeed).value
-      const newLight = this.visibleLight ? value : true
+      const newLight = this.lightService ? value : true
       params.switches[0].switch = newLight ? 'on' : 'off'
-      params.switches[1].switch = newPower === 1 && newSpeed >= 33 ? 'on' : 'off'
-      params.switches[2].switch = newPower === 1 && newSpeed >= 66 && newSpeed < 99 ? 'on' : 'off'
-      params.switches[3].switch = newPower === 1 && newSpeed >= 99 ? 'on' : 'off'
+      params.switches[1].switch = newPower && newSpeed >= 33 ? 'on' : 'off'
+      params.switches[2].switch = newPower && newSpeed >= 66 && newSpeed < 99 ? 'on' : 'off'
+      params.switches[3].switch = newPower && newSpeed >= 99 ? 'on' : 'off'
       await this.platform.sendDeviceUpdate(this.accessory, params)
+      if (newLight !== (this.cacheLight === 'on')) {
+        this.cacheLight = newLight ? 'on' : 'off'
+        this.log('[%s] current light [%s].', this.accessory.displayName, this.cacheLight)
+      }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
     }
@@ -72,31 +82,32 @@ module.exports = class deviceFan {
 
   async externalUpdate (params) {
     try {
-      if (params.switches && Array.isArray(params.switches)) {
-        const light = params.switches[0].switch === 'on'
-        let status
-        let speed
-        switch (params.switches[1].switch + params.switches[2].switch + params.switches[3].switch) {
-          default:
-            status = 0
-            speed = 0
-            break
-          case 'onoffoff':
-            status = 1
-            speed = 33
-            break
-          case 'ononoff':
-            status = 1
-            speed = 66
-            break
-          case 'onoffon':
-            status = 1
-            speed = 99
-        }
-        if (this.visibleLight) this.lightService.updateCharacteristic(this.Characteristic.On, light)
-        this.fanService
-          .updateCharacteristic(this.Characteristic.On, status)
-          .updateCharacteristic(this.Characteristic.RotationSpeed, speed)
+      if (!params.switches) return
+      if (params.switches[1].switch !== this.cacheOnOff) {
+        this.cacheOnOff = params.switches[1].switch
+        this.fanService.updateCharacteristic(this.Characteristic.On, this.cacheLight === 'on')
+        if (params.updateSource) this.log('[%s] current state [%s].', this.accessory.displayName, this.cacheOnOff)
+      }
+      let speed = 0
+      switch (params.switches[2].switch + params.switches[3].switch) {
+        case 'offoff':
+          speed = 33
+          break
+        case 'onoff':
+          speed = 66
+          break
+        case 'offon':
+          speed = 99
+      }
+      if (speed !== this.cacheSpeed) {
+        this.cacheSpeed = speed
+        this.fanService.updateCharacteristic(this.Characteristic.RotationSpeed, this.cacheSpeed)
+        if (params.updateSource) this.log('[%s] current speed [%s%].', this.accessory.displayName, this.cacheSpeed)
+      }
+      if (this.lightService && params.switches[0].switch !== this.cacheLight) {
+        this.cacheLight = params.switches[0].switch
+        this.lightService.updateCharacteristic(this.Characteristic.On, this.cacheLight === 'on')
+        if (params.updateSource) this.log('[%s] current light state [%s].', this.accessory.displayName, this.cacheLight)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)

From 1161728b792d04659246504b633876726eedd579 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 24 Dec 2020 12:12:34 +0000
Subject: [PATCH 1047/3183] device logging

---
 lib/device/switch-single.js |  4 ++--
 lib/device/th-outlet.js     | 40 +++++++++++++++++++++----------------
 lib/device/th-thermo.js     | 35 ++++++++++++++++++++++----------
 3 files changed, 49 insertions(+), 30 deletions(-)

diff --git a/lib/device/switch-single.js b/lib/device/switch-single.js
index 4560c52a..9ea681a8 100644
--- a/lib/device/switch-single.js
+++ b/lib/device/switch-single.js
@@ -29,7 +29,7 @@ module.exports = class deviceSwitchSingle {
       })
       this.cacheOnOff = value ? 'on' : 'off'
       this.accessory.eveService.addEntry({ status: value ? 1 : 0 })
-      this.log('[%s] current state [%s].', this.accessory.displayName, value ? 'on' : 'off')
+      this.log('[%s] current state [%s].', this.accessory.displayName, this.cacheOnOff)
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
     }
@@ -42,7 +42,7 @@ module.exports = class deviceSwitchSingle {
       this.switchService.updateCharacteristic(this.Characteristic.On, newStatus)
       this.cacheOnOff = params.switch
       this.accessory.eveService.addEntry({ status: newStatus ? 1 : 0 })
-      if (params.updateSource) this.log('[%s] current state [%s].', this.accessory.displayName, params.switch)
+      if (params.updateSource) this.log('[%s] current state [%s].', this.accessory.displayName, this.cacheOnOff)
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
diff --git a/lib/device/th-outlet.js b/lib/device/th-outlet.js
index 98987f99..df1eac67 100644
--- a/lib/device/th-outlet.js
+++ b/lib/device/th-outlet.js
@@ -8,9 +8,8 @@ module.exports = class deviceTHOutlet {
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
-    this.tempOffset = this.helpers.hasProperty(platform.thTempOffset, accessory.context.eweDeviceId)
-      ? parseFloat(platform.thTempOffset[accessory.context.eweDeviceId])
-      : 0
+    this.tempOffset = parseFloat(platform.thTempOffset[accessory.context.eweDeviceId] || 0)
+    this.hideSwitch = (this.platform.config.hideSwitchFromTH || '').split(',').includes(this.accessory.context.eweDeviceId)
     if (accessory.getService(this.Service.Thermostat)) {
       accessory.removeService(accessory.getService(this.Service.Thermostat))
     }
@@ -45,6 +44,8 @@ module.exports = class deviceTHOutlet {
         mainSwitch: value ? 'on' : 'off'
       }
       await this.platform.sendDeviceUpdate(this.accessory, params)
+      this.cacheOnOff = value ? 'on' : 'off'
+      this.log('[%s] current state [%s].', this.accessory.displayName, this.cacheOnOff)
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
     }
@@ -52,28 +53,33 @@ module.exports = class deviceTHOutlet {
 
   async externalUpdate (params) {
     try {
-      if (
-        !(this.platform.config.hideSwitchFromTH || '').split(',').includes(this.accessory.context.eweDeviceId) &&
-        (this.helpers.hasProperty(params, 'switch') || this.helpers.hasProperty(params, 'mainSwitch'))
-      ) {
-        const newState = this.helpers.hasProperty(params, 'switch') ? params.switch === 'on' : params.mainSwitch === 'on'
-        this.switchService.updateCharacteristic(this.Characteristic.On, newState)
-        this.accessory.eveService.addEntry({ status: newState ? 1 : 0 })
+      if (!this.hideSwitch && (params.switch || params.mainSwitch)) {
+        const newState = params.switch || params.mainSwitch
+        if (this.cacheOnOff !== newState) {
+          this.cacheOnOff = newState
+          this.switchService.updateCharacteristic(this.Characteristic.On, this.cacheOnOff === 'on')
+          this.accessory.eveService.addEntry({ status: this.cacheOnOff === 'on' ? 1 : 0 })
+          if (params.updateSource) this.log('[%s] current state [%s].', this.accessory.displayName, this.cacheOnOff)
+        }
       }
       const eveLog = {}
       if (this.helpers.hasProperty(params, 'currentTemperature') && params.currentTemperature !== 'unavailable') {
         const currentTemp = parseFloat(params.currentTemperature) + this.tempOffset
-        this.tempService.updateCharacteristic(this.Characteristic.CurrentTemperature, currentTemp)
         eveLog.temp = currentTemp
+        if (this.cacheTemp !== currentTemp) {
+          this.cacheTemp = currentTemp
+          this.tempService.updateCharacteristic(this.Characteristic.CurrentTemperature, this.cacheTemp)
+          if (params.updateSource) this.log('[%s] current temperature [%s].', this.accessory.displayName, this.cacheTemp)
+        }
       }
-      if (
-        this.helpers.hasProperty(params, 'currentHumidity') &&
-        params.currentHumidity !== 'unavailable' &&
-        this.accessory.getService(this.Service.HumiditySensor)
-      ) {
+      if (this.helpers.hasProperty(params, 'currentHumidity') && params.currentHumidity !== 'unavailable' && this.humiService) {
         const currentHumi = parseFloat(params.currentHumidity)
-        this.humiService.updateCharacteristic(this.Characteristic.CurrentRelativeHumidity, currentHumi)
         eveLog.humidity = currentHumi
+        if (this.cacheHumi !== currentHumi) {
+          this.cacheHumi = currentHumi
+          this.humiService.updateCharacteristic(this.Characteristic.CurrentRelativeHumidity, this.cacheHumi)
+          if (params.updateSource) this.log('[%s] current humidity [%s%].', this.accessory.displayName, this.cacheHumi)
+        }
       }
       if (this.helpers.hasProperty(eveLog, 'temp') || this.helpers.hasProperty(eveLog, 'humidity')) {
         this.accessory.eveService.addEntry(eveLog)
diff --git a/lib/device/th-thermo.js b/lib/device/th-thermo.js
index 93e51597..abfa98fc 100644
--- a/lib/device/th-thermo.js
+++ b/lib/device/th-thermo.js
@@ -8,9 +8,7 @@ module.exports = class deviceTHThermo {
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
-    this.tempOffset = this.helpers.hasProperty(platform.thTempOffset, accessory.context.eweDeviceId)
-      ? parseFloat(platform.thTempOffset[accessory.context.eweDeviceId])
-      : 0
+    this.tempOffset = parseFloat(platform.thTempOffset[accessory.context.eweDeviceId] || 0)
     if (accessory.getService(this.Service.Switch)) {
       accessory.removeService(accessory.getService(this.Service.Switch))
     }
@@ -49,10 +47,12 @@ module.exports = class deviceTHThermo {
     try {
       callback()
       const params = {
-        switch: value === 0 ? 'off' : 'on',
-        mainSwitch: value === 0 ? 'off' : 'on'
+        switch: value !== 0 ? 'on' : 'off',
+        mainSwitch: value !== 0 ? 'on' : 'off'
       }
       await this.platform.sendDeviceUpdate(this.accessory, params)
+      this.cacheOnOff = value !== 0 ? 'on' : 'off'
+      this.log('[%s] current state [%s].', this.accessory.displayName, this.cacheOnOff)
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
     }
@@ -73,16 +73,25 @@ module.exports = class deviceTHThermo {
 
   async externalUpdate (params) {
     try {
-      if (this.helpers.hasProperty(params, 'switch') || this.helpers.hasProperty(params, 'mainSwitch')) {
-        const newState = this.helpers.hasProperty(params, 'switch') ? params.switch === 'on' : params.mainSwitch === 'on'
-        this.service.updateCharacteristic(this.Characteristic.TargetHeatingCoolingState, newState ? 1 : 0)
+      if (params.switch || params.mainSwitch) {
+        const newState = params.switch || params.mainSwitch
+        if (this.cacheOnOff !== newState) {
+          this.cacheOnOff = newState
+          this.switchService.updateCharacteristic(this.Characteristic.On, this.cacheOnOff === 'on')
+          this.accessory.eveService.addEntry({ status: this.cacheOnOff === 'on' ? 1 : 0 })
+          if (params.updateSource) this.log('[%s] current state [%s].', this.accessory.displayName, this.cacheOnOff)
+        }
       }
       const eveLog = {}
       if (this.helpers.hasProperty(params, 'currentTemperature') && params.currentTemperature !== 'unavailable') {
         const currentTemp = parseFloat(params.currentTemperature) + this.tempOffset
-        this.service.updateCharacteristic(this.Characteristic.CurrentTemperature, currentTemp)
-        this.service.updateCharacteristic(this.Characteristic.TargetTemperature, currentTemp)
         eveLog.temp = currentTemp
+        if (this.cacheTemp !== currentTemp) {
+          this.cacheTemp = currentTemp
+          this.service.updateCharacteristic(this.Characteristic.CurrentTemperature, this.cacheTemp)
+          this.service.updateCharacteristic(this.Characteristic.TargetTemperature, this.cacheTemp)
+          if (params.updateSource) this.log('[%s] current temperature [%s].', this.accessory.displayName, this.cacheTemp)
+        }
       }
       if (
         this.helpers.hasProperty(params, 'currentHumidity') &&
@@ -90,8 +99,12 @@ module.exports = class deviceTHThermo {
         this.service.testCharacteristic(this.Characteristic.CurrentRelativeHumidity)
       ) {
         const currentHumi = parseFloat(params.currentHumidity)
-        this.service.updateCharacteristic(this.Characteristic.CurrentRelativeHumidity, currentHumi)
         eveLog.humidity = currentHumi
+        if (this.cacheHumi !== currentHumi) {
+          this.cacheHumi = currentHumi
+          this.service.updateCharacteristic(this.Characteristic.CurrentRelativeHumidity, this.cacheHumi)
+          if (params.updateSource) this.log('[%s] current humidity [%s%].', this.accessory.displayName, this.cacheHumi)
+        }
       }
       if (this.helpers.hasProperty(eveLog, 'temp') || this.helpers.hasProperty(eveLog, 'humidity')) {
         this.accessory.eveService.addEntry(eveLog)

From 9a8a73235100b277c673bb1e536b9af603a00bb0 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 24 Dec 2020 12:43:08 +0000
Subject: [PATCH 1048/3183] device logging

---
 lib/device/switch-valve.js | 55 +++++++++++++++++++++++---------------
 lib/device/valve-one.js    | 36 ++++++++++++++++---------
 lib/device/valve-two.js    | 40 ++++++++++++++++-----------
 3 files changed, 82 insertions(+), 49 deletions(-)

diff --git a/lib/device/switch-valve.js b/lib/device/switch-valve.js
index aafba7ad..a145d271 100644
--- a/lib/device/switch-valve.js
+++ b/lib/device/switch-valve.js
@@ -29,8 +29,8 @@ module.exports = class deviceSwitchValve {
       .on('set', (value, callback) => {
         if (this.valveService.getCharacteristic(this.Characteristic.InUse).value) {
           this.valveService.updateCharacteristic(this.Characteristic.RemainingDuration, value)
-          clearTimeout(this.valveService.timer)
-          this.valveService.timer = setTimeout(() => this.valveService.setCharacteristic(this.Characteristic.Active, 0), value * 1000)
+          clearTimeout(this.timer)
+          this.timer = setTimeout(() => this.valveService.setCharacteristic(this.Characteristic.Active, 0), value * 1000)
         }
         callback()
       })
@@ -44,10 +44,11 @@ module.exports = class deviceSwitchValve {
       callback()
       const params = { switches: this.helpers.defaultMultiSwitchOff }
       params.switches[0].switch = value ? 'on' : 'off'
-      params.switches[1].switch = this.valveService.getCharacteristic(this.Characteristic.Active).value === 1
-        ? 'on'
-        : 'off'
+      params.switches[1].switch = this.valveService.getCharacteristic(this.Characteristic.Active).value === 1 ? 'on' : 'off'
       await this.platform.sendDeviceUpdate(this.accessory, params)
+      this.cacheOnOff = value ? 'on' : 'off'
+      this.accessory.eveService.addEntry({ status: value ? 1 : 0 })
+      this.log('[%s] current state [%s].', this.accessory.displayName, this.cacheOnOff)
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
     }
@@ -63,12 +64,16 @@ module.exports = class deviceSwitchValve {
       switch (value) {
         case 0:
           this.valveService.updateCharacteristic(this.Characteristic.RemainingDuration, 0)
-          clearTimeout(this.valveService.timer)
+          clearTimeout(this.timer)
+          this.log('[%s] current state [stopped].', this.accessory.displayName)
           break
         case 1: {
           const timer = this.valveService.getCharacteristic(this.Characteristic.SetDuration).value
           this.valveService.updateCharacteristic(this.Characteristic.RemainingDuration, timer)
-          this.valveService.timer = setTimeout(() => this.valveService.setCharacteristic(this.Characteristic.Active, 0), timer * 1000)
+          this.log('[%s] current state [watering].', this.accessory.displayName)
+          this.timer = setTimeout(() => {
+            this.valveService.setCharacteristic(this.Characteristic.Active, 0)
+          }, timer * 1000)
           break
         }
       }
@@ -80,25 +85,33 @@ module.exports = class deviceSwitchValve {
 
   async externalUpdate (params) {
     try {
-      if (!this.helpers.hasProperty(params, 'switches')) return
-
-      this.switchService.updateCharacteristic(this.Characteristic.On, params.switches[0].switch === 'on')
-      this.accessory.eveService.addEntry({ status: params.switch === 'on' ? 1 : 0 })
-      this.valveService
-        .updateCharacteristic(this.Characteristic.Active, params.switches[1].switch === 'on' ? 1 : 0)
-        .updateCharacteristic(this.Characteristic.InUse, params.switches[1].switch === 'on' ? 1 : 0)
+      if (!params.switches) return
+      if (this.cacheOnOff !== (params.switches[0].switch === 'on')) {
+        const newStatus = params.switches[0].switch === 'on'
+        this.cacheOnOff = params.switches[0].switch
+        this.switchService.updateCharacteristic(this.Characteristic.On, newStatus)
+        this.accessory.eveService.addEntry({ status: newStatus ? 1 : 0 })
+        if (params.updateSource) this.log('[%s] current state [%s].', this.accessory.displayName, this.cacheOnOff)
+      }
       if (params.switches[1].switch === 'on') {
         if (this.valveService.getCharacteristic(this.Characteristic.Active).value === 0) {
-          // only start the timer if it isn't on already - we don't want to reset an "already on" timer
-          // if ewelink sends another update midway ie switch turning on/off
           const timer = this.valveService.getCharacteristic(this.Characteristic.SetDuration).value
-          this.valveService.updateCharacteristic(this.Characteristic.RemainingDuration, timer)
-          this.valveService.timer = setTimeout(() => this.valveService.setCharacteristic(this.Characteristic.Active, 0), timer * 1000)
+          this.valveService
+            .updateCharacteristic(this.Characteristic.Active, 1)
+            .updateCharacteristic(this.Characteristic.InUse, 1)
+            .updateCharacteristic(this.Characteristic.RemainingDuration, timer)
+          if (params.updateSource) this.log('[%s] current state [watering].', this.accessory.displayName)
+          this.timer = setTimeout(() => {
+            this.valveService.setCharacteristic(this.Characteristic.Active, 0)
+          }, timer * 1000)
         }
-      } else {
-        this.valveService.updateCharacteristic(this.Characteristic.RemainingDuration, 0)
-        clearTimeout(this.valveService.timer)
+        return
       }
+      this.valveService
+        .updateCharacteristic(this.Characteristic.Active, 0)
+        .updateCharacteristic(this.Characteristic.InUse, 0)
+        .updateCharacteristic(this.Characteristic.RemainingDuration, 0)
+      clearTimeout(this.timer)
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
diff --git a/lib/device/valve-one.js b/lib/device/valve-one.js
index f47104ed..5e49bdb8 100644
--- a/lib/device/valve-one.js
+++ b/lib/device/valve-one.js
@@ -25,8 +25,8 @@ module.exports = class deviceValveOne {
       .on('set', (value, callback) => {
         if (this.valveService.getCharacteristic(this.Characteristic.InUse).value === 1) {
           this.valveService.updateCharacteristic(this.Characteristic.RemainingDuration, value)
-          clearTimeout(this.valveService.timer)
-          this.valveService.timer = setTimeout(
+          clearTimeout(this.timer)
+          this.timer = setTimeout(
             () => this.valveService.setCharacteristic(this.Characteristic.Active, 0),
             value * 1000
           )
@@ -44,12 +44,16 @@ module.exports = class deviceValveOne {
       switch (value) {
         case 0:
           this.valveService.updateCharacteristic(this.Characteristic.RemainingDuration, 0)
-          clearTimeout(this.accessory.getService(this.Service.Valve).timer)
+          clearTimeout(this.timer)
+          this.log('[%s] current state [stopped].', this.accessory.displayName)
           break
         case 1: {
           const timer = this.valveService.getCharacteristic(this.Characteristic.SetDuration).value
           this.valveService.updateCharacteristic(this.Characteristic.RemainingDuration, timer)
-          this.valveService.timer = setTimeout(() => this.valveService.setCharacteristic(this.Characteristic.Active, 0), timer * 1000)
+          this.log('[%s] current state [watering].', this.accessory.displayName)
+          this.timer = setTimeout(() => {
+            this.valveService.setCharacteristic(this.Characteristic.Active, 0)
+          }, timer * 1000)
           break
         }
       }
@@ -61,20 +65,26 @@ module.exports = class deviceValveOne {
 
   async externalUpdate (params) {
     try {
-      if (!this.helpers.hasProperty(params, 'switch')) return
-      this.valveService
-        .updateCharacteristic(this.Characteristic.Active, params.switch === 'on' ? 1 : 0)
-        .updateCharacteristic(this.Characteristic.InUse, params.switch === 'on' ? 1 : 0)
+      if (!params.switch) return
       if (params.switch === 'on') {
         if (this.valveService.getCharacteristic(this.Characteristic.Active).value === 0) {
           const timer = this.valveService.getCharacteristic(this.Characteristic.SetDuration).value
-          this.valveService.updateCharacteristic(this.Characteristic.RemainingDuration, timer)
-          this.valveService.timer = setTimeout(() => this.valveService.setCharacteristic(this.Characteristic.Active, 0), timer * 1000)
+          this.valveService
+            .updateCharacteristic(this.Characteristic.Active, 1)
+            .updateCharacteristic(this.Characteristic.InUse, 1)
+            .updateCharacteristic(this.Characteristic.RemainingDuration, timer)
+          if (params.updateSource) this.log('[%s] current state [watering].', this.accessory.displayName)
+          this.timer = setTimeout(() => {
+            this.valveService.setCharacteristic(this.Characteristic.Active, 0)
+          }, timer * 1000)
         }
-      } else {
-        this.valveService.updateCharacteristic(this.Characteristic.RemainingDuration, 0)
-        clearTimeout(this.valveService.timer)
+        return
       }
+      this.valveService
+        .updateCharacteristic(this.Characteristic.Active, 0)
+        .updateCharacteristic(this.Characteristic.InUse, 0)
+        .updateCharacteristic(this.Characteristic.RemainingDuration, 0)
+      clearTimeout(this.timer)
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
diff --git a/lib/device/valve-two.js b/lib/device/valve-two.js
index b6915148..015585a5 100644
--- a/lib/device/valve-two.js
+++ b/lib/device/valve-two.js
@@ -41,7 +41,7 @@ module.exports = class deviceValveTwo {
     try {
       callback()
       const params = { switches: this.helpers.defaultMultiSwitchOff }
-      const serviceValve = this.accessory.getService(valve)
+      const valveService = this.accessory.getService(valve)
       switch (valve) {
         case 'Valve A':
           params.switches[0].switch = value ? 'on' : 'off'
@@ -56,16 +56,20 @@ module.exports = class deviceValveTwo {
           params.switches[1].switch = value ? 'on' : 'off'
           break
       }
-      serviceValve.updateCharacteristic(this.Characteristic.InUse, value)
+      valveService.updateCharacteristic(this.Characteristic.InUse, value)
       switch (value) {
         case 0:
-          serviceValve.updateCharacteristic(this.Characteristic.RemainingDuration, 0)
+          valveService.updateCharacteristic(this.Characteristic.RemainingDuration, 0)
           clearTimeout(this.accessory.getService(valve).timer)
+          this.log('[%s] current state [%s stopped].', this.accessory.displayName, valve)
           break
         case 1: {
-          const timer = serviceValve.getCharacteristic(this.Characteristic.SetDuration).value
-          serviceValve.updateCharacteristic(this.Characteristic.RemainingDuration, timer)
-          serviceValve.timer = setTimeout(() => serviceValve.setCharacteristic(this.Characteristic.Active, 0), timer * 1000)
+          const timer = valveService.getCharacteristic(this.Characteristic.SetDuration).value
+          valveService.updateCharacteristic(this.Characteristic.RemainingDuration, timer)
+          this.log('[%s] current state [%s watering].', this.accessory.displayName, valve)
+          valveService.timer = setTimeout(() => {
+            valveService.setCharacteristic(this.Characteristic.Active, 0)
+          }, timer * 1000)
           break
         }
       }
@@ -77,22 +81,28 @@ module.exports = class deviceValveTwo {
 
   async externalUpdate (params) {
     try {
-      if (!this.helpers.hasProperty(params, 'switches')) return
+      if (!params.switches) return
       ;['A', 'B'].forEach((v, k) => {
         const valveService = this.accessory.getService('Valve ' + v)
-        valveService
-          .updateCharacteristic(this.Characteristic.Active, params.switches[k].switch === 'on' ? 1 : 0)
-          .updateCharacteristic(this.Characteristic.InUse, params.switches[k].switch === 'on' ? 1 : 0)
         if (params.switches[k].switch === 'on') {
           if (valveService.getCharacteristic(this.Characteristic.Active).value === 0) {
             const timer = valveService.getCharacteristic(this.Characteristic.SetDuration).value
-            valveService.updateCharacteristic(this.Characteristic.RemainingDuration, timer)
-            valveService.timer = setTimeout(() => valveService.setCharacteristic(this.Characteristic.Active, 0), timer * 1000)
+            valveService
+              .updateCharacteristic(this.Characteristic.Active, 1)
+              .updateCharacteristic(this.Characteristic.InUse, 1)
+              .updateCharacteristic(this.Characteristic.RemainingDuration, timer)
+            if (params.updateSource) this.log('[%s] current state [Valve %s watering].', this.accessory.displayName, v)
+            valveService.timer = setTimeout(() => {
+              valveService.setCharacteristic(this.Characteristic.Active, 0)
+            }, timer * 1000)
           }
-        } else {
-          valveService.updateCharacteristic(this.Characteristic.RemainingDuration, 0)
-          clearTimeout(valveService.timer)
+          return
         }
+        valveService
+          .updateCharacteristic(this.Characteristic.Active, 0)
+          .updateCharacteristic(this.Characteristic.InUse, 0)
+          .updateCharacteristic(this.Characteristic.RemainingDuration, 0)
+        clearTimeout(valveService.timer)
       })
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)

From c27153dd89ff16ac6c7a86419984ac7b4f38397e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 24 Dec 2020 13:21:43 +0000
Subject: [PATCH 1049/3183] device logging

---
 lib/device/diffuser.js | 133 ++++++++++++++++++++++++++++++-----------
 1 file changed, 99 insertions(+), 34 deletions(-)

diff --git a/lib/device/diffuser.js b/lib/device/diffuser.js
index c15e7c2e..4f7b0146 100644
--- a/lib/device/diffuser.js
+++ b/lib/device/diffuser.js
@@ -16,7 +16,7 @@ module.exports = class deviceDiffuser {
     this.accessory = accessory
     this.fanService
       .getCharacteristic(this.Characteristic.RotationSpeed)
-      .on('set', this.internalDiffuserStateUpdate.bind(this))
+      .on('set', this.internalDiffuserSpeedUpdate.bind(this))
       .setProps({
         minStep: 50
       })
@@ -38,22 +38,40 @@ module.exports = class deviceDiffuser {
   async internalDiffuserOnOffUpdate (value, callback) {
     try {
       callback()
-      const params = { switch: value ? 'on' : 'off' }
+      const onoff = value ? 'on' : 'off'
+      if (this.cacheOnOff === onoff) return
+      this.cacheOnOff = onoff
+      const params = { switch: this.cacheOnOff }
+      const timerKey = Math.random().toString(36).substr(2, 8)
+      this.updateTimeout = timerKey
+      setTimeout(() => {
+        if (this.updateTimeout === timerKey) this.updateTimeout = false
+      }, 10000)
       await this.platform.sendDeviceUpdate(this.accessory, params)
+      this.log('[%s] current state [%s].', this.accessory.displayName, this.cacheOnOff)
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
     }
   }
 
-  async internalDiffuserStateUpdate (value, callback) {
+  async internalDiffuserSpeedUpdate (value, callback) {
     try {
-      await this.helpers.sleep(750)
       callback()
       if (value === 0) return
-      value = value <= 75 ? 50 : 100
-      const params = { state: value / 2 }
-      this.cacheState = value
+      const newSpeed = value <= 75 ? 50 : 100
+      if (newSpeed === this.cacheSpeed) return
+      this.cacheSpeed = newSpeed
+      const params = { state: this.cacheSpeed / 50 }
+      const updateKeySpeed = Math.random().toString(36).substr(2, 8)
+      this.updateKeySpeed = updateKeySpeed
+      await this.helpers.sleep(500)
+      if (updateKeySpeed !== this.updateKeySpeed) return
+      this.updateTimeout = updateKeySpeed
+      setTimeout(() => {
+        if (this.updateTimeout === updateKeySpeed) this.updateTimeout = false
+      }, 10000)
       await this.platform.sendDeviceUpdate(this.accessory, params)
+      this.log('[%s] current speed [%s%].', this.accessory.displayName, newSpeed)
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
     }
@@ -62,8 +80,20 @@ module.exports = class deviceDiffuser {
   async internalLightOnOffUpdate (value, callback) {
     try {
       callback()
-      const params = { lightswitch: value ? 1 : 0 }
+      const onoff = value ? 1 : 0
+      if (this.cacheLightOnOff === onoff) return
+      this.cacheLightOnOff = onoff
+      const params = { lightswitch: this.cacheLightOnOff }
+      const updateKeyLight = Math.random().toString(36).substr(2, 8)
+      this.updateKeyLight = updateKeyLight
+      await this.helpers.sleep(250)
+      if (updateKeyLight !== this.updateKeyLight) return
+      this.updateTimeout = updateKeyLight
+      setTimeout(() => {
+        if (this.updateTimeout === updateKeyLight) this.updateTimeout = false
+      }, 10000)
       await this.platform.sendDeviceUpdate(this.accessory, params)
+      this.log('[%s] current light [%s%].', this.accessory.displayName, value ? 'on' : 'off')
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
     }
@@ -71,16 +101,23 @@ module.exports = class deviceDiffuser {
 
   async internalLightBrightnessUpdate (value, callback) {
     try {
-      await this.helpers.sleep(750)
+      if (this.cacheBrightness === value) {
+        callback()
+        return
+      }
+      this.cacheBrightness = value
       callback()
       const updateKeyBright = Math.random().toString(36).substr(2, 8)
       this.updateKeyBright = updateKeyBright
-      const params = {
-        lightbright: value
-      }
+      const params = { lightbright: this.cacheBrightness }
       await this.helpers.sleep(500)
       if (updateKeyBright !== this.updateKeyBright) return
+      this.updateTimeout = updateKeyBright
+      setTimeout(() => {
+        if (this.updateTimeout === updateKeyBright) this.updateTimeout = false
+      }, 10000)
       await this.platform.sendDeviceUpdate(this.accessory, params)
+      this.log('[%s] current brightness [%s%].', this.accessory.displayName, this.cacheBrightness)
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
     }
@@ -88,22 +125,34 @@ module.exports = class deviceDiffuser {
 
   async internalLightColourUpdate (value, callback) {
     try {
-      await this.helpers.sleep(1500)
+      if (this.cacheOnOff !== 'on' || this.cacheHue === value) {
+        callback()
+        return
+      }
+      this.cacheHue = value
       callback()
       const updateKeyColour = Math.random().toString(36).substr(2, 8)
       this.updateKeyColour = updateKeyColour
-      await this.helpers.sleep(500)
       const newRGB = this.helpers.hs2rgb([
         value,
         this.accessory.getService('Light').getCharacteristic(this.Characteristic.Saturation).value
       ])
+      this.cacheR = newRGB[0]
+      this.cacheG = newRGB[0]
+      this.cacheB = newRGB[0]
       const params = {
-        lightRcolor: newRGB[0],
-        lightGcolor: newRGB[1],
-        lightBcolor: newRGB[2]
+        lightRcolor: this.cacheR,
+        lightGcolor: this.cacheG,
+        lightBcolor: this.cacheB
       }
+      await this.helpers.sleep(1500)
       if (updateKeyColour !== this.updateKeyColour) return
+      this.updateTimeout = updateKeyColour
+      setTimeout(() => {
+        if (this.updateTimeout === updateKeyColour) this.updateTimeout = false
+      }, 10000)
       await this.platform.sendDeviceUpdate(this.accessory, params)
+      this.log('[%s] current colour [rgb %s, %s, %s].', this.accessory.displayName, this.cacheR, this.cacheG, this.cacheB)
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
     }
@@ -111,31 +160,47 @@ module.exports = class deviceDiffuser {
 
   async externalUpdate (params) {
     try {
-      if (this.helpers.hasProperty(params, 'switch')) {
-        this.fanService.updateCharacteristic(this.Characteristic.On, params.switch === 'on')
+      if (this.updateTimeout) return
+      if (params.switch && params.switch !== this.cacheOnOff) {
+        this.cacheOnOff = params.switch
+        this.fanService.updateCharacteristic(this.Characteristic.On, this.cacheOnOff === 'on')
         if (!this.helpers.hasProperty(params, 'state')) {
-          this.accessory.getService('Diffuser').updateCharacteristic(this.Characteristic.RotationSpeed, this.cacheState)
+          this.fanService.updateCharacteristic(this.Characteristic.RotationSpeed, this.cacheSpeed)
         }
       }
-      if (this.helpers.hasProperty(params, 'state')) {
-        this.fanService.updateCharacteristic(this.Characteristic.RotationSpeed, params.state * 50)
-        this.cacheState = params.state * 50
+      if (this.helpers.hasProperty(params, 'state') && params.state * 50 !== this.cacheSpeed) {
+        this.cacheSpeed = params.state * 50
+        this.fanService.updateCharacteristic(this.Characteristic.RotationSpeed, this.cacheSpeed)
+        if (params.updateSource) this.log('[%s] current speed [%s%].', this.accessory.displayName, this.cacheSpeed)
       }
-      if (this.helpers.hasProperty(params, 'lightswitch')) {
+      if (this.helpers.hasProperty(params, 'lightswitch') && this.cacheLightOnOff !== params.lightswitch) {
+        this.cacheLightOnOff = params.lightswitch
         this.lightService.updateCharacteristic(this.Characteristic.On, params.lightswitch === 1)
+        if (params.updateSource) {
+          this.log('[%s] current speed [%s%].', this.accessory.displayNameparams.lightswitch === 1 ? 'on' : 'off')
+        }
       }
-      if (this.helpers.hasProperty(params, 'lightbright')) {
+      if (this.helpers.hasProperty(params, 'lightbright') && this.cacheBrightness !== params.lightbright) {
+        this.cacheBrightness = params.lightbright
         this.lightService.updateCharacteristic(this.Characteristic.Brightness, params.lightbright)
+        if (params.updateSource) {
+          this.log('[%s] current brightness [%s%].', this.accessory.displayNameparams.lightbright)
+        }
       }
-      if (
-        this.helpers.hasProperty(params, 'lightRcolor') &&
-        this.helpers.hasProperty(params, 'lightGcolor') &&
-        this.helpers.hasProperty(params, 'lightBcolor')
-      ) {
-        const newColour = this.helpers.rgb2hs([params.lightRcolor, params.lightGcolor, params.lightBcolor])
-        this.lightService
-          .updateCharacteristic(this.Characteristic.Hue, newColour[0])
-          .updateCharacteristic(this.Characteristic.Saturation, 100)
+      if (this.helpers.hasProperty(params, 'lightRcolor')) {
+        if (this.cacheR !== params.lightRcolor || this.cacheG !== params.lightGcolor || this.cacheB !== params.lightBcolor) {
+          this.cacheR = params.lightRcolor
+          this.cacheG = params.lightGcolor
+          this.cacheB = params.lightBcolor
+          const newColour = this.helpers.rgb2hs([this.cacheR, this.cacheG, this.cacheB])
+          this.cacheHue = newColour[0]
+          this.lightService
+            .updateCharacteristic(this.Characteristic.Hue, this.cacheHue)
+            .updateCharacteristic(this.Characteristic.Saturation, 100)
+          if (params.updateSource) {
+            this.log('[%s] current colour [rgb %s, %s, %s].', this.accessory.displayName, this.cacheR, this.cacheG, this.cacheB)
+          }
+        }
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)

From 2a4217b26c656155e89d15e9526186e0cab6ec18 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 24 Dec 2020 13:22:41 +0000
Subject: [PATCH 1050/3183] 4.0.0-0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 4f777863..53f01bb6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.18.2-16",
+  "version": "4.0.0-0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 4c81b715..5f9b1d5a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "3.18.2-16",
+  "version": "4.0.0-0",
   "author": "bwp91",
   "description": "Homebridge/HOOBS plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 02e3919276da8119fa8073fa0af0716836d18378 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 25 Dec 2020 10:13:36 +0000
Subject: [PATCH 1051/3183] fix eve characteristics

---
 lib/device/rf-bridge.js | 2 +-
 lib/device/zb-dev.js    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/device/rf-bridge.js b/lib/device/rf-bridge.js
index 8f24fdc4..85b8c080 100644
--- a/lib/device/rf-bridge.js
+++ b/lib/device/rf-bridge.js
@@ -11,7 +11,7 @@ module.exports = class deviceRFBridge {
     this.Characteristic = platform.api.hap.Characteristic
     const self = this
     this.eveLastActivation = function () {
-      self.Characteristic.call(this, 'Last Activation', this.helpers.eveUUID.lastActivation)
+      self.Characteristic.call(this, 'Last Activation', self.helpers.eveUUID.lastActivation)
       this.setProps({
         format: self.Characteristic.Formats.UINT32,
         unit: self.Characteristic.Units.SECONDS,
diff --git a/lib/device/zb-dev.js b/lib/device/zb-dev.js
index 9a36ec5e..2fe2c415 100644
--- a/lib/device/zb-dev.js
+++ b/lib/device/zb-dev.js
@@ -11,7 +11,7 @@ module.exports = class deviceZBDev {
     this.Characteristic = platform.api.hap.Characteristic
     const self = this
     this.eveLastActivation = function () {
-      self.Characteristic.call(this, 'Last Activation', this.helpers.eveUUID.lastActivation)
+      self.Characteristic.call(this, 'Last Activation', self.helpers.eveUUID.lastActivation)
       this.setProps({
         format: self.Characteristic.Formats.UINT32,
         unit: self.Characteristic.Units.SECONDS,

From 097d5e75bd5fa595817a766e0940939580a443eb Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 25 Dec 2020 10:21:29 +0000
Subject: [PATCH 1052/3183] fix eve characteristics

---
 lib/device/sensor.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/device/sensor.js b/lib/device/sensor.js
index c7d2c7c8..01080325 100644
--- a/lib/device/sensor.js
+++ b/lib/device/sensor.js
@@ -11,7 +11,7 @@ module.exports = class deviceSensor {
     this.Characteristic = platform.api.hap.Characteristic
     const self = this
     this.eveLastActivation = function () {
-      self.Characteristic.call(this, 'Last Activation', this.helpers.eveUUID.lastActivation)
+      self.Characteristic.call(this, 'Last Activation', self.helpers.eveUUID.lastActivation)
       this.setProps({
         format: self.Characteristic.Formats.UINT32,
         unit: self.Characteristic.Units.SECONDS,

From d680b134ba5a4c5360b8e246bbbea2f36f1cd8c5 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 25 Dec 2020 10:22:15 +0000
Subject: [PATCH 1053/3183] log zigbee stateless button

---
 lib/device/zb-dev.js | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/lib/device/zb-dev.js b/lib/device/zb-dev.js
index 2fe2c415..43a4c427 100644
--- a/lib/device/zb-dev.js
+++ b/lib/device/zb-dev.js
@@ -119,6 +119,17 @@ module.exports = class deviceZBDev {
             this.accessory
               .getService(this.Service.StatelessProgrammableSwitch)
               .updateCharacteristic(this.Characteristic.ProgrammableSwitchEvent, params.key)
+            if (params.updateSource) {
+              this.log(
+                '[%s] current state [%s].',
+                this.accessory.displayName,
+                params.key === 0
+                  ? 'single press'
+                  : params.key === 1
+                    ? 'double press'
+                    : 'long press'
+              )
+            }
           }
           break
         case 1009:

From 4c8fc0b9607d3efc8d652b71b89339f2df467e72 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 25 Dec 2020 10:22:56 +0000
Subject: [PATCH 1054/3183] 4.0.0-1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 53f01bb6..0b519dbf 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.0.0-0",
+  "version": "4.0.0-1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 5f9b1d5a..d1f1506c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.0.0-0",
+  "version": "4.0.0-1",
   "author": "bwp91",
   "description": "Homebridge/HOOBS plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From ae2f0502a68508db8da5cee84b14273ceacd8358 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 30 Dec 2020 23:10:43 +0000
Subject: [PATCH 1055/3183] bump ws dep

---
 package-lock.json | 6 +++---
 package.json      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 0b519dbf..8d24723f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -196,9 +196,9 @@
       }
     },
     "ws": {
-      "version": "7.4.1",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.1.tgz",
-      "integrity": "sha512-pTsP8UAfhy3sk1lSk/O/s4tjD0CRwvMnzvwr4OKGX7ZvqZtUyx4KIJB5JWbkykPoc55tixMGgTNoh3k4FkNGFQ=="
+      "version": "7.4.2",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.2.tgz",
+      "integrity": "sha512-T4tewALS3+qsrpGI/8dqNMLIVdq/g/85U98HPMa6F0m6xTbvhXU6RCQLqPH3+SlomNV/LdY6RXEbBpMH6EOJnA=="
     }
   }
 }
diff --git a/package.json b/package.json
index d1f1506c..63af20f1 100644
--- a/package.json
+++ b/package.json
@@ -50,7 +50,7 @@
     "axios": "^0.21.1",
     "node-dns-sd": "^0.4.2",
     "websocket-as-promised": "^1.1.0",
-    "ws": "^7.4.1"
+    "ws": "^7.4.2"
   },
   "standard": {
     "ignore": [

From b0bebdcaa42474c6c3acf17d14c22a8812cb028f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 31 Dec 2020 09:35:31 +0000
Subject: [PATCH 1056/3183] shorter logging

---
 lib/index.js | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/lib/index.js b/lib/index.js
index 107e916a..2c33c9d8 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -666,10 +666,8 @@ class eWeLinkPlatform {
     await this.helpers.sleep(Math.floor(Math.random() * 250 + 1))
 
     // *** Log the update being sent *** \\
-    if (this.debugReqRes) {
-      this.log.warn('[%s] sending update (yellow text for clarity).\n%s', accessory.displayName, JSON.stringify(params, null, 2))
-    } else if (this.debug) {
-      this.log('[%s] sending update.', accessory.displayName)
+    if (this.debugReqRes || this.debug) {
+      this.log('[%s] sending update %s.', accessory.displayName, JSON.stringify(params))
     }
 
     // *** Set up the payload to send via LAN/WS *** \\
@@ -693,7 +691,7 @@ class eWeLinkPlatform {
         if (this.debug || this.debugReqRes) this.log('[%s] Reverting to web socket as %s.', accessory.displayName, res)
         await this.wsClient.sendUpdate(payload)
       } else {
-        throw new Error("it is unreachable. It's status will be corrected once back online")
+        throw new Error('it is unreachable')
       }
     }
   }
@@ -705,10 +703,8 @@ class eWeLinkPlatform {
 
     // *** Find our accessory for which the updates relates to *** \\
     if ((accessory = this.devicesInHB.get(deviceId + 'SWX') || this.devicesInHB.get(deviceId + 'SW0'))) {
-      if (this.debugReqRes) {
-        this.log('[%s] update received.\n%s', accessory.displayName, JSON.stringify(device.params, null, 2))
-      } else if (this.debug) {
-        this.log('[%s] update received via %s.', accessory.displayName, device.params.updateSource)
+      if (this.debugReqRes || this.debug) {
+        this.log('[%s] receiving update %s.', accessory.displayName, JSON.stringify(device.params))
       }
       const isX = accessory.context.hbDeviceId.substr(-1) === 'X'
       if (device.params.updateSource === 'WS') {
@@ -790,14 +786,14 @@ class eWeLinkPlatform {
   }
 
   async deviceUpdateError (accessory, err, requestRefresh) {
-    this.log.warn('[%s] could not be updated as %s.', accessory.displayName, this.debug ? err : err.message)
+    this.log.warn('[%s] sending update failed as %s.', accessory.displayName, this.debug ? err : err.message)
 
     // *** We only request a device refresh on failed internal updates (ie with 'set' handlers) *** \\
     if (!requestRefresh) return
     if (accessory.context.reachableWAN) {
       try {
         await this.wsClient.requestUpdate(accessory)
-        this.log.warn('[%s] requesting previous state information to revert.', accessory.displayName)
+        this.log.warn('[%s] reverting to previous state.', accessory.displayName)
       } catch (err) {}
     }
   }

From 3206b734aeaebee5d02e8b3fda823c91c61e966c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 31 Dec 2020 09:41:01 +0000
Subject: [PATCH 1057/3183] all debugreqres to debug

---
 config.schema.json     |  6 ------
 lib/connection/http.js |  9 ++++-----
 lib/connection/ws.js   | 15 +++++++--------
 lib/index.js           | 20 +++++---------------
 4 files changed, 16 insertions(+), 34 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 1b4ff19a..15ffa6e5 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -45,11 +45,6 @@
         "type": "boolean",
         "description": "If checked, debug information will be added to the log."
       },
-      "debugReqRes": {
-        "title": "Request & Response Logging",
-        "type": "boolean",
-        "description": "If checked, HTTP, web socket and LAN mode messages will be added to the log. Not recommended for long-term use."
-      },
       "disablePlugin": {
         "title": "Disable Plugin",
         "type": "boolean",
@@ -371,7 +366,6 @@
         "disableHTTPRefresh",
         "disableLANMode",
         "debug",
-        "debugReqRes",
         "disablePlugin"
       ]
     },
diff --git a/lib/connection/http.js b/lib/connection/http.js
index 4660e074..f091b341 100644
--- a/lib/connection/http.js
+++ b/lib/connection/http.js
@@ -7,7 +7,6 @@ module.exports = class connectionHTTP {
     this.log = platform.log
     this.helpers = platform.helpers
     this.debug = platform.config.debug
-    this.debugReqRes = platform.config.debugReqRes
     this.username = platform.config.username.toString()
     this.password = platform.config.password.toString()
     this.hideDevFromHB = (platform.config.hideDevFromHB || '').split(',')
@@ -40,7 +39,7 @@ module.exports = class connectionHTTP {
       dataToSign = this.crypto.createHmac('sha256', this.helpers.appSecret).update(dataToSign).digest('base64')
 
       // *** Log the data depending on the debug setting *** \\
-      if (this.debug || this.debugReqRes) this.log('Sending HTTP getHost() request.')
+      if (this.debug) this.log('Sending HTTP getHost() request.')
 
       // *** Send the request *** \\
       const res = await this.axios.get('https://api.coolkit.cc:8080/api/user/region', {
@@ -68,7 +67,7 @@ module.exports = class connectionHTTP {
         default:
           throw new Error('No valid region received - [' + body.region + '].')
       }
-      if (this.debug || this.debugReqRes) this.log('HTTP API host received [%s].', this.httpHost)
+      if (this.debug) this.log('HTTP API host received [%s].', this.httpHost)
     } catch (err) {
       if (this.helpers.hasProperty(err, 'code') && this.helpers.httpRetryCodes.includes(err.code)) {
         // *** Retry if another attempt could be successful *** \\
@@ -95,7 +94,7 @@ module.exports = class connectionHTTP {
     }
 
     // *** Log the data depending on the debug setting *** \\
-    if (this.debug || this.debugReqRes) this.log('Sending HTTP login() request.')
+    if (this.debug) this.log('Sending HTTP login() request.')
 
     // *** Set up the request signature *** \\
     const dataToSign = this.crypto.createHmac('sha256', this.helpers.appSecret).update(JSON.stringify(data)).digest('base64')
@@ -131,7 +130,7 @@ module.exports = class connectionHTTP {
         default:
           throw new Error('No valid region received - [' + givenRegion + '].')
       }
-      if (this.debug || this.debugReqRes) this.log('New HTTP API host received [%s].', this.httpHost)
+      if (this.debug) this.log('New HTTP API host received [%s].', this.httpHost)
       return await this.login()
     } else {
       if (body.data.at) {
diff --git a/lib/connection/ws.js b/lib/connection/ws.js
index 95bab053..a514f582 100644
--- a/lib/connection/ws.js
+++ b/lib/connection/ws.js
@@ -6,7 +6,6 @@ module.exports = class connectionWS {
     this.log = platform.log
     this.helpers = platform.helpers
     this.debug = platform.config.debug
-    this.debugReqRes = platform.config.debugReqRes
     this.httpHost = authData.httpHost
     this.aToken = authData.aToken
     this.apiKey = authData.apiKey
@@ -33,7 +32,7 @@ module.exports = class connectionWS {
       if (!body.domain) {
         throw new Error('Server did not respond with a web socket host.')
       }
-      if (this.debug || this.debugReqRes) this.log('Web socket host received [%s].', body.domain)
+      if (this.debug) this.log('Web socket host received [%s].', body.domain)
       this.wsHost = body.domain
     } catch (err) {
       if (this.helpers.hasProperty(err, 'code') && this.helpers.httpRetryCodes.includes(err.code)) {
@@ -70,7 +69,7 @@ module.exports = class connectionWS {
         userAgent: 'app',
         version: 8
       }
-      if (this.debug || this.debugReqRes) this.log('Sending WS login request.')
+      if (this.debug) this.log('Sending WS login request.')
       try {
         const res = await this.wsp.sendRequest(payload, { requestId: sequence })
         if (this.helpers.hasProperty(res, 'config') && res.config.hb && res.config.hbInterval) {
@@ -79,7 +78,7 @@ module.exports = class connectionWS {
             try {
               this.wsp.send('ping')
             } catch (err) {
-              if (this.debug || this.debugReqRes) this.log.warn('Error sending ping - %.', err.message)
+              if (this.debug) this.log.warn('Error sending ping - %.', err.message)
             }
           }, (res.config.hbInterval + 7) * 1000)
         } else {
@@ -147,7 +146,7 @@ module.exports = class connectionWS {
       }
       this.wsp.removeAllListeners()
       if (e === 1005) return
-      if (this.debug || this.debugReqRes) {
+      if (this.debug) {
         this.log.warn('Web socket closed - [%s].', e)
         this.log.warn('Web socket will try to reconnect in five seconds.')
       }
@@ -161,7 +160,7 @@ module.exports = class connectionWS {
         this.hbInterval = null
       }
       this.wsp.removeAllListeners()
-      if (this.debug || this.debugReqRes) {
+      if (this.debug) {
         this.log.warn('Web socket error - [%s].', e)
         this.log.warn('Web socket will try to reconnect in five seconds.')
       }
@@ -213,7 +212,7 @@ module.exports = class connectionWS {
       ts: 0,
       userAgent: 'app'
     }
-    if (this.debugReqRes || this.debug) this.log('[%s] requesting current status.', accessory.displayName)
+    if (this.debug) this.log('[%s] requesting current status.', accessory.displayName)
     if (this.wsp && this.wsIsOpen) {
       this.wsp.send(JSON.stringify(json))
     } else {
@@ -230,7 +229,7 @@ module.exports = class connectionWS {
   async closeConnection () {
     if (this.wsp && this.wsIsOpen) {
       await this.wsp.close()
-      if (this.debug || this.debugReqRes) this.log('Web socket gracefully closed.')
+      if (this.debug) this.log('Web socket gracefully closed.')
     }
   }
 }
diff --git a/lib/index.js b/lib/index.js
index 2c33c9d8..8b9b1484 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -22,7 +22,6 @@ class eWeLinkPlatform {
     this.helpers = require('./utils/helpers')
     this.eveService = require('./fakegato/fakegato-history')(api)
     this.debug = this.config.debug
-    this.debugReqRes = this.config.debugReqRes
     this.devicesInHB = new Map()
     this.devicesInEW = new Map()
     this.cusG = new Map()
@@ -116,15 +115,12 @@ class eWeLinkPlatform {
             await this.wsClient.login()
           }
         } catch (err) {
-          this.log.warn((this.debug || this.debugReqRes) ? err : err.message)
+          this.log.warn((this.debug) ? err : err.message)
         }
       }, 3600000)
 
       // *** Log for informative purposes *** \\
       this.log("eWeLink sync complete. Don't forget to ⭐️  this plugin on GitHub if you're finding it useful!")
-      if (this.debugReqRes) {
-        this.log.warn("Note: 'Request & Response Logging' is not advised for long-term use.")
-      }
     } catch (err) {
       // *** Catch errors at any point during setup *** \\
       this.log.warn('*** Disabling plugin [v%s] ***', this.version)
@@ -666,7 +662,7 @@ class eWeLinkPlatform {
     await this.helpers.sleep(Math.floor(Math.random() * 250 + 1))
 
     // *** Log the update being sent *** \\
-    if (this.debugReqRes || this.debug) {
+    if (this.debug) {
       this.log('[%s] sending update %s.', accessory.displayName, JSON.stringify(params))
     }
 
@@ -688,7 +684,7 @@ class eWeLinkPlatform {
     if (res !== 'ok') {
       // *** Check to see if the device is online *** \\
       if (accessory.context.reachableWAN) {
-        if (this.debug || this.debugReqRes) this.log('[%s] Reverting to web socket as %s.', accessory.displayName, res)
+        if (this.debug) this.log('[%s] Reverting to web socket as %s.', accessory.displayName, res)
         await this.wsClient.sendUpdate(payload)
       } else {
         throw new Error('it is unreachable')
@@ -703,9 +699,7 @@ class eWeLinkPlatform {
 
     // *** Find our accessory for which the updates relates to *** \\
     if ((accessory = this.devicesInHB.get(deviceId + 'SWX') || this.devicesInHB.get(deviceId + 'SW0'))) {
-      if (this.debugReqRes || this.debug) {
-        this.log('[%s] receiving update %s.', accessory.displayName, JSON.stringify(device.params))
-      }
+      if (this.debug) this.log('[%s] receiving update %s.', accessory.displayName, JSON.stringify(device.params))
       const isX = accessory.context.hbDeviceId.substr(-1) === 'X'
       if (device.params.updateSource === 'WS') {
         // *** The update is from WS so update the WS online/offline status *** \\
@@ -762,11 +756,7 @@ class eWeLinkPlatform {
         // *** Check to see it doesn't exist because it's user hidden *** \\
         if ((this.config.hideDevFromHB || '').split(',').includes(deviceId)) return
 
-        if (this.debugReqRes) {
-          this.log('[%s] update received for new device.\n%s', device.name, JSON.stringify(device.params, null, 2))
-        } else if (this.debug) {
-          this.log('[%s] update received for new device via %s.', device.name, device.params.updateSource)
-        }
+        if (this.debug) this.log('[%s] receiving update for new device %s.', device.name, JSON.stringify(device.params))
 
         // *** Obtain full device information from the HTTP API *** \\
         const newDevice = await this.httpClient.getDevice(deviceId)

From c2d68fd0f2b830a4e47d929850b9d110ca41a2d4 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 31 Dec 2020 09:41:19 +0000
Subject: [PATCH 1058/3183] Update lan.js

---
 lib/connection/lan.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/connection/lan.js b/lib/connection/lan.js
index ba58d9b8..19492810 100644
--- a/lib/connection/lan.js
+++ b/lib/connection/lan.js
@@ -7,7 +7,6 @@ module.exports = class connectionLAN {
     this.log = platform.log
     this.helpers = platform.helpers
     this.debug = platform.config.debug
-    this.debugReqRes = platform.config.debugReqRes
     this.ipOverride = platform.ipOverride
     this.deviceMap = new Map()
     this.crypto = require('crypto')
@@ -194,6 +193,6 @@ module.exports = class connectionLAN {
   async closeConnection () {
     // *** This is called when Homebridge is shutdown *** \\
     await this.dns.stopMonitoring()
-    if (this.debug || this.debugReqRes) this.log('LAN monitoring gracefully stopped.')
+    if (this.debug) this.log('LAN monitoring gracefully stopped.')
   }
 }

From d641d7bb7d80083c2078dbcdd119b47096662d4c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 31 Dec 2020 10:13:18 +0000
Subject: [PATCH 1059/3183] Update index.js

---
 lib/index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/index.js b/lib/index.js
index 8b9b1484..36e99da2 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -115,7 +115,7 @@ class eWeLinkPlatform {
             await this.wsClient.login()
           }
         } catch (err) {
-          this.log.warn((this.debug) ? err : err.message)
+          this.log.warn(this.debug ? err : err.message)
         }
       }, 3600000)
 
@@ -776,7 +776,7 @@ class eWeLinkPlatform {
   }
 
   async deviceUpdateError (accessory, err, requestRefresh) {
-    this.log.warn('[%s] sending update failed as %s.', accessory.displayName, this.debug ? err : err.message)
+    this.log.warn('[%s] sending update failed as %s.', accessory.displayName, err.message)
 
     // *** We only request a device refresh on failed internal updates (ie with 'set' handlers) *** \\
     if (!requestRefresh) return

From 5aec04a056f6aadd0fa4c5ffebebfd1d5ef446f4 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 1 Jan 2021 14:57:12 +0000
Subject: [PATCH 1060/3183] 4.0.0-2

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 8d24723f..19b085d8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.0.0-1",
+  "version": "4.0.0-2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 63af20f1..665eab14 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.0.0-1",
+  "version": "4.0.0-2",
   "author": "bwp91",
   "description": "Homebridge/HOOBS plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 8d1d5e508c74c1af17961ad84d4a3e9977dce637 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 2 Jan 2021 09:09:35 +0000
Subject: [PATCH 1061/3183] log if plugin not configured

---
 lib/index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/index.js b/lib/index.js
index 36e99da2..ff7fa2bc 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -6,8 +6,8 @@ class eWeLinkPlatform {
     this.version = require('./../package.json').version
 
     // *** Disable the plugin if not configured correctly *** \\
-    if (!log || !api || !config) return
-    if (!config.username || !config.password || !config.countryCode) {
+    if (!log || !api) return
+    if (!config || !config.username || !config.password || !config.countryCode) {
       log.warn('*** Disabling plugin [v%s] ***', this.version)
       log.warn('*** eWeLink credentials missing from configuration ***')
       return

From ac83e82a05b20ef4280b82424a9093a86af335cf Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 2 Jan 2021 09:17:20 +0000
Subject: [PATCH 1062/3183] unneeded

---
 lib/index.js | 21 ++-------------------
 1 file changed, 2 insertions(+), 19 deletions(-)

diff --git a/lib/index.js b/lib/index.js
index ff7fa2bc..749e2e57 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -87,10 +87,6 @@ class eWeLinkPlatform {
           .forEach(s => this.cusS.set(s.fullDeviceId, s))
       }
 
-      // *** Log for informative purposes *** \\
-      this.log('[%s] eWeLink devices loaded from the Homebridge cache.', this.devicesInHB.size)
-      this.log('[%s] primary devices loaded from your eWeLink account.', this.devicesInEW.size)
-
       // *** Remove HB accessories that are no longer in eWeLink account *** \\
       this.devicesInHB.forEach(accessory => {
         if (!this.devicesInEW.has(accessory.context.eweDeviceId)) {
@@ -469,12 +465,8 @@ class eWeLinkPlatform {
           oAccessory.context.reachableLAN = false
           oAccessory.context.eweBrandName = device.brandName
           oAccessory.context.eweBrandLogo = device.brandLogo
-          oAccessory.context.eweShared = this.helpers.hasProperty(device, 'sharedBy') && this.helpers.hasProperty(device.sharedBy, 'email')
-            ? device.sharedBy.email
-            : false
-          oAccessory.context.ip = oAccessory.context.reachableLAN
-            ? this.lanDevices.get(device.deviceid).ip
-            : false
+          oAccessory.context.eweShared = device.sharedBy && device.sharedBy.email ? device.sharedBy.email : false
+          oAccessory.context.ip = oAccessory.context.reachableLAN ? this.lanDevices.get(device.deviceid).ip : false
           this.api.updatePlatformAccessories('homebridge-ewelink', 'eWeLink', [oAccessory])
           this.devicesInHB.set(oAccessory.context.hbDeviceId, oAccessory)
           oAccessory.control = new (require('./device/rf-bridge'))(this, oAccessory)
@@ -483,15 +475,6 @@ class eWeLinkPlatform {
         accessory.context.channelCount = rfChlCounter
         this.devicesInHB.set(accessory.context.hbDeviceId, accessory)
         /********************/
-      } else if (this.helpers.devicesZBBridge.includes(device.extra.uiid)) {
-        /************
-        ZIGBEE BRIDGE
-        ************/
-        if (this.devicesInHB.has(device.deviceid + 'SWX')) {
-          this.removeAccessory(this.devicesInHB.get(device.deviceid + 'SWX'))
-        }
-        return
-        /***********/
       } else if (this.helpers.devicesZB.includes(device.extra.uiid)) {
         /****************
         ZIGBEE SUBDEVICES

From 66e42b0b004ad4ab6bf59283f157a3b7221ee019 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 2 Jan 2021 09:22:28 +0000
Subject: [PATCH 1063/3183] remove arrows

---
 lib/index.js | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/lib/index.js b/lib/index.js
index 749e2e57..d5cdf591 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -435,7 +435,7 @@ class eWeLinkPlatform {
               sensorTimeLength = this.cusS.get(device.deviceid + 'SW' + swNumber).sensorTimeLength
             }
           } else {
-            this.log.warn(' → [%s] has an unsupported device type [%s].', device.name, subDevice.type || '?')
+            this.log.warn('[%s] has an unsupported device type [%s].', device.name, subDevice.type || '?')
             return
           }
           subExtraContext = {
@@ -488,21 +488,21 @@ class eWeLinkPlatform {
         /*************
         SONOFF CAMERAS
         *************/
-        this.log(' → [%s] see the homebridge-ewelink wiki for details to enable the camera.', device.name)
+        this.log('[%s] see the homebridge-ewelink wiki for details to enable the camera.', device.name)
         return
         /************/
       } else if (this.helpers.devicesEweCamera.includes(device.extra.uiid)) {
         /******************
         EWELINK APP CAMERAS
         ******************/
-        this.log(' → [%s] has not been added as it is not supported.', device.name)
+        this.log('[%s] has not been added as it is not supported.', device.name)
         return
         /*****************/
       } else {
         /**************
         UNKNOWN DEVICES
         **************/
-        this.log.warn(' → [%s] has not been added as it is not supported. Please make a GitHub issue request.', device.name)
+        this.log.warn('[%s] has not been added as it is not supported. Please make a GitHub issue request.', device.name)
         return
         /*************/
       }
@@ -541,13 +541,13 @@ class eWeLinkPlatform {
       // *** Update any changes to the device into our devicesInHB map *** \\
       this.api.updatePlatformAccessories('homebridge-ewelink', 'eWeLink', [accessory])
       this.devicesInHB.set(accessory.context.hbDeviceId, accessory)
-      this.log(' → [%s] initialised and %s.', device.name, str)
+      this.log('[%s] initialised and %s.', device.name, str)
     } catch (err) {
       // *** Catch errors at any point during device initialisation *** \\
       const deviceName = accessory && this.helpers.hasProperty(accessory, 'displayName')
         ? accessory.displayName
         : device.name
-      this.log.warn(' → [%s] could not be initialised as %s.', deviceName, this.debug ? err : err.message)
+      this.log.warn('[%s] could not be initialised as %s.', deviceName, this.debug ? err : err.message)
     }
   }
 
@@ -609,14 +609,14 @@ class eWeLinkPlatform {
       // *** Register the accessory if it hasn't been hidden by the user *** \\
       if (!hidden) {
         this.api.registerPlatformAccessories('homebridge-ewelink', 'eWeLink', [accessory])
-        this.log(' → [%s] has been added to Homebridge.', newDeviceName)
+        this.log('[%s] has been added to Homebridge.', newDeviceName)
       }
 
       // *** Return the new accessory *** \\
       return accessory
     } catch (err) {
       // *** Add helpful context values to the accessory *** \\
-      this.log.warn(' → [%s] could not be added as %s.', newDeviceName, err)
+      this.log.warn('[%s] could not be added as %s.', newDeviceName, err)
       return false
     }
   }
@@ -634,9 +634,9 @@ class eWeLinkPlatform {
       // *** Unregister the accessory from HB and remove it from our devicesInHB map *** \\
       this.api.unregisterPlatformAccessories('homebridge-ewelink', 'eWeLink', [accessory])
       this.devicesInHB.delete(accessory.context.hbDeviceId)
-      this.log(' → [%s] was removed from Homebridge.', accessory.displayName)
+      this.log('[%s] was removed from Homebridge.', accessory.displayName)
     } catch (err) {
-      this.log.warn(" → [%s] wasn't removed as %s.", accessory.displayName, err)
+      this.log.warn("[%s] wasn't removed as %s.", accessory.displayName, err)
     }
   }
 

From 17ea1735ae1b32446e6b07808298144c0af758fa Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 2 Jan 2021 09:32:01 +0000
Subject: [PATCH 1064/3183] logging

---
 lib/index.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/lib/index.js b/lib/index.js
index d5cdf591..9f02e1c6 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -694,9 +694,7 @@ class eWeLinkPlatform {
           if (accessory.context.reachableWAN) {
             try {
               this.wsClient.requestUpdate(accessory)
-            } catch (err) {
-              this.log.warn('[%s] update could not be requested as %s', accessory.displayName, this.debug ? err.message : err)
-            }
+            } catch (err) {}
           }
         }
       }
@@ -766,7 +764,6 @@ class eWeLinkPlatform {
     if (accessory.context.reachableWAN) {
       try {
         await this.wsClient.requestUpdate(accessory)
-        this.log.warn('[%s] reverting to previous state.', accessory.displayName)
       } catch (err) {}
     }
   }

From 4b64dfc17451fb133d3b129510fea83a99024039 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 2 Jan 2021 10:03:48 +0000
Subject: [PATCH 1065/3183] garage logging + fixes

---
 config.schema.json          |   2 +-
 lib/device/garage-eachen.js |  24 ++-----
 lib/device/garage-one.js    |  26 ++------
 lib/device/garage-two.js    | 129 +++++++++++++-----------------------
 4 files changed, 60 insertions(+), 121 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 15ffa6e5..fe581307 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -243,7 +243,7 @@
               "title": "Sensor",
               "description": "A DW2 sensor can be used for garage doors to determine the current state. Enter the 10 digit eWeLink device ID (normally in the format 1000ab23cd). Otherwise leave blank.",
               "condition": {
-                "functionBody": "return (model.groups[arrayIndices] && (model.groups[arrayIndices].type==='garage' || model.groups[arrayIndices].type==='garage_two'))"
+                "functionBody": "return (model.groups[arrayIndices] && model.groups[arrayIndices].type==='garage')"
               }
             }
           }
diff --git a/lib/device/garage-eachen.js b/lib/device/garage-eachen.js
index 4c19c265..bdaa1a69 100644
--- a/lib/device/garage-eachen.js
+++ b/lib/device/garage-eachen.js
@@ -24,13 +24,7 @@ module.exports = class deviceGarageEachen {
   async internalUpdate (value, callback) {
     try {
       callback()
-      let garageConfig
-      if (!(garageConfig = this.platform.cusG.get(this.accessory.context.hbDeviceId))) {
-        throw new Error('group config missing')
-      }
-      if (garageConfig.type !== 'garage_eachen') {
-        throw new Error('improper configuration')
-      }
+      const garageConfig = this.platform.cusG.get(this.accessory.context.hbDeviceId)
       const params = { switch: value === 0 ? 'on' : 'off' }
       if (value === this.gdService.getCharacteristic(this.Characteristic.CurrentDoorState).value % 2) return
       this.inUse = true
@@ -43,6 +37,7 @@ module.exports = class deviceGarageEachen {
       if (value === 0) {
         await this.helpers.sleep(Math.max((garageConfig.operationTime - 20) * 100, 0))
         this.gdService.updateCharacteristic(this.Characteristic.CurrentDoorState, 0)
+        this.log('[%s] current state [open].', this.accessory.displayName)
       }
     } catch (err) {
       this.inUse = false
@@ -52,21 +47,14 @@ module.exports = class deviceGarageEachen {
 
   async externalUpdate (params) {
     try {
-      if (!this.helpers.hasProperty(params, 'switch') || this.inUse) return
-      let garageConfig
-      if (!(garageConfig = this.platform.cusG.get(this.accessory.context.hbDeviceId))) {
-        throw new Error('group config missing')
-      }
-      if (garageConfig.type !== 'garage_eachen') {
-        throw new Error('improper configuration')
-      }
-      this.inUse = true
+      if (!params.switch || this.inUse) return
       this.gdService
         .updateCharacteristic(this.Characteristic.TargetDoorState, params.switch === 'on' ? 0 : 1)
         .updateCharacteristic(this.Characteristic.CurrentDoorState, params.switch === 'on' ? 0 : 1)
-      this.inUse = false
+      if (params.updateSource) {
+        this.log('[%s] current state [%s].', this.accessory.displayName, params.switch === 'on' ? 'open' : 'closed')
+      }
     } catch (err) {
-      this.inUse = false
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
diff --git a/lib/device/garage-one.js b/lib/device/garage-one.js
index c52837d1..cb882f69 100644
--- a/lib/device/garage-one.js
+++ b/lib/device/garage-one.js
@@ -25,19 +25,13 @@ module.exports = class deviceGarageOne {
   async internalUpdate (value, callback) {
     try {
       callback()
-      let garageConfig
-      if (!(garageConfig = this.platform.cusG.get(this.accessory.context.hbDeviceId))) {
-        throw new Error('group config missing')
-      }
-      if (garageConfig.type !== 'garage' || !['oneSwitch', 'twoSwitch'].includes(garageConfig.setup)) {
-        throw new Error('improper configuration')
-      }
+      const garageConfig = this.platform.cusG.get(this.accessory.context.hbDeviceId)
       const sensorDefinition = garageConfig.sensorId || false
       let sAccessory = false
       const newPos = value
       const params = {}
       let delay = 0
-      if (sensorDefinition && !(sAccessory = this.platform.devicesInHB.get(garageConfig.sensorId + 'SWX'))) {
+      if (sensorDefinition && !(sAccessory = this.platform.devicesInHB.get(sensorDefinition + 'SWX'))) {
         throw new Error("defined DW2 sensor doesn't exist")
       }
       if (sensorDefinition && sAccessory.context.type !== 'sensor') {
@@ -78,6 +72,7 @@ module.exports = class deviceGarageOne {
       if (!sAccessory) {
         this.gdService.updateCharacteristic(this.Characteristic.CurrentDoorState, newPos)
         this.accessory.context.cacheCurrentDoorState = newPos
+        this.log('[%s] current state [%s].', this.accessory.displayName, newPos === 0 ? 'open' : 'closed')
       }
       this.inUse = false
     } catch (err) {
@@ -87,19 +82,11 @@ module.exports = class deviceGarageOne {
 
   async externalUpdate (params) {
     try {
-      if (!this.helpers.hasProperty(params, 'switch') && !this.helpers.hasProperty(params, 'switches')) {
-        return
-      }
-      let garageConfig
+      if (!this.helpers.hasProperty(params, 'switch') && !this.helpers.hasProperty(params, 'switches')) return
+      const garageConfig = this.platform.cusG.get(this.accessory.context.hbDeviceId)
+      if (this.inUse || garageConfig.sensorId) return
       const prevState = this.accessory.context.cacheCurrentDoorState
       const newPos = [0, 2].includes(prevState) ? 3 : 2
-      if (!(garageConfig = this.platform.cusG.get(this.accessory.context.hbDeviceId))) {
-        throw new Error('group config missing')
-      }
-      if (garageConfig.type !== 'garage' || !['oneSwitch', 'twoSwitch'].includes(garageConfig.setup)) {
-        throw new Error('improper configuration')
-      }
-      if (this.inUse || garageConfig.sensorId) return
       switch (garageConfig.setup) {
         case 'oneSwitch':
           if (params.switch === 'off') {
@@ -127,6 +114,7 @@ module.exports = class deviceGarageOne {
         await this.helpers.sleep(Math.max(garageConfig.operationTime * 100, 1000))
         this.gdService.updateCharacteristic(this.Characteristic.CurrentDoorState, newPos - 2)
         this.accessory.context.cacheCurrentDoorState = newPos - 2
+        this.log('[%s] current state [%s].', this.accessory.displayName, newPos === 2 ? 'open' : 'closed')
       }
       this.inUse = false
     } catch (err) {
diff --git a/lib/device/garage-two.js b/lib/device/garage-two.js
index 19d58349..c86c6909 100644
--- a/lib/device/garage-two.js
+++ b/lib/device/garage-two.js
@@ -28,44 +28,13 @@ module.exports = class deviceGarageTwo {
   async internalUpdate (garage, value, callback) {
     try {
       callback()
-      let garageConfig
-      if (!(garageConfig = this.platform.cusG.get(this.accessory.context.hbDeviceId))) {
-        throw new Error('group config missing')
-      }
-      if (garageConfig.type !== 'garage_two') {
-        throw new Error('improper configuration')
-      }
-      let sensorDefinition = garageConfig.sensorId || false
-      if (sensorDefinition) {
-        const sensors = garageConfig.sensorId.split(',')
-        switch (garage) {
-          case 'Garage 1': {
-            sensorDefinition = sensors[0] || false
-            break
-          }
-          case 'Garage 2': {
-            sensorDefinition = sensors[1] || false
-            break
-          }
-        }
-      }
-      let sAccessory = false
+      const garageConfig = this.platform.cusG.get(this.accessory.context.hbDeviceId)
       const newPos = value
       const params = { switches: this.cacheSwitchState }
       const gdService = this.accessory.getService(garage)
-      if (sensorDefinition && !(sAccessory = this.platform.devicesInHB.get(garageConfig.sensorId + 'SWX'))) {
-        throw new Error("defined DW2 sensor doesn't exist")
-      }
-      if (sensorDefinition && sAccessory.context.type !== 'sensor') {
-        throw new Error("defined DW2 sensor isn't a sensor")
-      }
-      const prevState = sAccessory
-        ? sAccessory.getService(this.Service.ContactSensor).getCharacteristic(this.Characteristic.ContactSensorState).value === 0
-          ? 1
-          : 0
-        : garage === 'Garage 1'
-          ? this.accessory.context.cacheOneCurrentDoorState
-          : this.accessory.context.cacheTwoCurrentDoorState
+      const prevState = garage === 'Garage 1'
+        ? this.accessory.context.cacheOneCurrentDoorState
+        : this.accessory.context.cacheTwoCurrentDoorState
       if (newPos === prevState % 2) return
       this.inUse = true
       gdService
@@ -89,17 +58,17 @@ module.exports = class deviceGarageTwo {
       }
       await this.platform.sendDeviceUpdate(this.accessory, params)
       await this.helpers.sleep(Math.max(garageConfig.operationTime * 100, 1000))
-      if (!sAccessory) {
-        gdService.updateCharacteristic(this.Characteristic.CurrentDoorState, newPos)
-        switch (garage) {
-          case 'Garage 1': {
-            this.accessory.context.cacheOneCurrentDoorState = newPos
-            break
-          }
-          case 'Garage 2': {
-            this.accessory.context.cacheTwoCurrentDoorState = newPos
-            break
-          }
+      gdService.updateCharacteristic(this.Characteristic.CurrentDoorState, newPos)
+      switch (garage) {
+        case 'Garage 1': {
+          this.accessory.context.cacheOneCurrentDoorState = newPos
+          this.log('[%s] current state [garage 1 %s].', this.accessory.displayName, newPos === 0 ? 'open' : 'closed')
+          break
+        }
+        case 'Garage 2': {
+          this.accessory.context.cacheTwoCurrentDoorState = newPos
+          this.log('[%s] current state [garage 2 %s].', this.accessory.displayName, newPos === 0 ? 'open' : 'closed')
+          break
         }
       }
       this.inUse = false
@@ -110,17 +79,9 @@ module.exports = class deviceGarageTwo {
 
   externalUpdate (params) {
     try {
-      if (!this.helpers.hasProperty(params, 'switches')) {
-        return
-      }
-      let garageConfig
-      if (!(garageConfig = this.platform.cusG.get(this.accessory.context.hbDeviceId))) {
-        throw new Error('group config missing')
-      }
-      if (garageConfig.type !== 'garage_two') {
-        throw new Error('improper configuration')
-      }
-      if (this.inUse || garageConfig.sensorId) return
+      if (!params.switches) return
+      const garageConfig = this.platform.cusG.get(this.accessory.context.hbDeviceId)
+      if (this.inUse) return
       this.cacheSwitchState = params.switches
       ;['1', '2'].forEach(async v => {
         const gcService = this.accessory.getService('Garage ' + v)
@@ -147,32 +108,34 @@ module.exports = class deviceGarageTwo {
             break
         }
         this.inUse = true
-        if (garageConfig.sensorId) {
-          await this.helpers.sleep(Math.max(garageConfig.operationTime * 100, 1000))
-        } else {
-          gcService
-            .updateCharacteristic(this.Characteristic.TargetDoorState, newPos - 2)
-            .updateCharacteristic(this.Characteristic.CurrentDoorState, newPos)
-          switch (v) {
-            case '1':
-              this.accessory.context.cacheOneCurrentDoorState = newPos
-              this.accessory.context.cacheTwoTargetDoorState = newPos - 2
-              break
-            case '2':
-              this.accessory.context.cacheTwoCurrentDoorState = newPos
-              this.accessory.context.cacheTwoTargetDoorState = newPos - 2
-              break
-          }
-          await this.helpers.sleep(Math.max(garageConfig.operationTime * 100, 1000))
-          gcService.updateCharacteristic(this.Characteristic.CurrentDoorState, newPos - 2)
-          switch (v) {
-            case '1':
-              this.accessory.context.cacheOneCurrentDoorState = newPos - 2
-              break
-            case '2':
-              this.accessory.context.cacheTwoCurrentDoorState = newPos - 2
-              break
-          }
+        gcService
+          .updateCharacteristic(this.Characteristic.TargetDoorState, newPos - 2)
+          .updateCharacteristic(this.Characteristic.CurrentDoorState, newPos)
+        switch (v) {
+          case '1':
+            this.accessory.context.cacheOneCurrentDoorState = newPos
+            this.accessory.context.cacheTwoTargetDoorState = newPos - 2
+            break
+          case '2':
+            this.accessory.context.cacheTwoCurrentDoorState = newPos
+            this.accessory.context.cacheTwoTargetDoorState = newPos - 2
+            break
+        }
+        await this.helpers.sleep(Math.max(garageConfig.operationTime * 100, 1000))
+        gcService.updateCharacteristic(this.Characteristic.CurrentDoorState, newPos - 2)
+        switch (v) {
+          case '1':
+            this.accessory.context.cacheOneCurrentDoorState = newPos - 2
+            if (params.updateSource) {
+              this.log('[%s] current state [garage 1 %s].', this.accessory.displayName, newPos === 2 ? 'open' : 'closed')
+            }
+            break
+          case '2':
+            this.accessory.context.cacheTwoCurrentDoorState = newPos - 2
+            if (params.updateSource) {
+              this.log('[%s] current state [garage 2 %s].', this.accessory.displayName, newPos === 2 ? 'open' : 'closed')
+            }
+            break
         }
       })
       this.inUse = false

From 72a7225160d0ae2a82ad116a7b9fea0e257184b9 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 2 Jan 2021 10:09:28 +0000
Subject: [PATCH 1066/3183] garage logging

---
 lib/device/garage-four.js | 82 +++------------------------------------
 1 file changed, 6 insertions(+), 76 deletions(-)

diff --git a/lib/device/garage-four.js b/lib/device/garage-four.js
index 5b6bf8ab..7f38b7a5 100644
--- a/lib/device/garage-four.js
+++ b/lib/device/garage-four.js
@@ -28,13 +28,7 @@ module.exports = class deviceGarageFour {
   async internalUpdate (garage, value, callback) {
     try {
       callback()
-      let garageConfig
-      if (!(garageConfig = this.platform.cusG.get(this.accessory.context.hbDeviceId))) {
-        throw new Error('group config missing')
-      }
-      if (garageConfig.type !== 'garage_four') {
-        throw new Error('improper configuration')
-      }
+      const garageConfig = this.platform.cusG.get(this.accessory.context.hbDeviceId)
       let garageChannel
       switch (garage) {
         case 'A':
@@ -50,23 +44,7 @@ module.exports = class deviceGarageFour {
           garageChannel = 3
           break
       }
-      let sensorDefinition = garageConfig.sensorId || false
-      if (sensorDefinition) {
-        const sensors = garageConfig.sensorId.split(',')
-        sensorDefinition = sensors[garageChannel] || false
-      }
-      let sAccessory = false
-      if (sensorDefinition && !(sAccessory = this.platform.devicesInHB.get(garageConfig.sensorId + 'SWX'))) {
-        throw new Error("defined DW2 sensor doesn't exist")
-      }
-      if (sensorDefinition && sAccessory.context.type !== 'sensor') {
-        throw new Error("defined DW2 sensor isn't a sensor")
-      }
-      const prevState = sAccessory
-        ? sAccessory.getService(this.Service.ContactSensor).getCharacteristic(this.Characteristic.ContactSensorState).value === 0
-          ? 1
-          : 0
-        : this.accessory.context.cacheStates[garageChannel].cacheCurrentDoorState
+      const prevState = this.accessory.context.cacheStates[garageChannel].cacheCurrentDoorState
       if (value === prevState % 2) return
       const gdService = this.accessory.getService('Garage ' + garage)
       this.inUse = true
@@ -84,10 +62,9 @@ module.exports = class deviceGarageFour {
       this.inUse = false
       await this.helpers.sleep(Math.max((garageConfig.operationTime - 20) * 100, 0))
       if (this.updateKey !== updateKey || sAccessory) return
-      if (!sAccessory) {
-        gdService.updateCharacteristic(this.Characteristic.CurrentDoorState, value)
-        this.accessory.context.cacheStates[garageChannel].cacheCurrentDoorState = value
-      }
+      gdService.updateCharacteristic(this.Characteristic.CurrentDoorState, value)
+      this.accessory.context.cacheStates[garageChannel].cacheCurrentDoorState = value
+      this.log('[%s] current state [garage %s %s].', this.accessory.displayName, garageChannel, value === 0 ? 'open' : 'closed')
     } catch (err) {
       this.inUse = false
       this.platform.deviceUpdateError(this.accessory, err, true)
@@ -96,54 +73,7 @@ module.exports = class deviceGarageFour {
 
   async externalUpdate (params) {
     try {
-      /*
-      if (!this.helpers.hasProperty(params, 'switches') || this.inUse) return
-      let garageConfig
-      if (!(garageConfig = this.platform.cusG.get(this.accessory.context.hbDeviceId))) {
-        throw new Error('group config missing')
-      }
-      if (garageConfig.type !== 'garage_four') {
-        throw new Error('improper configuration')
-      }
-      if (this.inUse) return
-      ;['A', 'B', 'C', 'D'].forEach(async v => {
-        let garageChannel
-        switch (v) {
-          case 'A':
-            garageChannel = 0
-            break
-          case 'B':
-            garageChannel = 1
-            break
-          case 'C':
-            garageChannel = 2
-            break
-          case 'D':
-            garageChannel = 3
-            break
-        }
-        let sensorDefinition = garageConfig.sensorId || false
-        if (sensorDefinition) {
-          const sensors = garageConfig.sensorId.split(',')
-          sensorDefinition = sensors[garageChannel] || false
-        }
-        let sAccessory = false
-        if (sensorDefinition && !(sAccessory = this.platform.devicesInHB.get(garageConfig.sensorId + 'SWX'))) {
-          throw new Error("defined DW2 sensor doesn't exist")
-        }
-        if (sensorDefinition && sAccessory.context.type !== 'sensor') {
-          throw new Error("defined DW2 sensor isn't a sensor")
-        }
-        if (sensorDefinition) return
-        const gcService = this.accessory.getService('Garage ' + v)
-        const prevState = this.accessory.context.cacheStates[garageChannel].cacheCurrentDoorState
-        const newPos = [0, 2].includes(prevState) ? 1 : 0
-        if (params.switches[garageChannel].switch === 'off') return
-        gcService.updateCharacteristic(this.Characteristic.CurrentDoorState, newPos)
-        this.accessory.context.cacheStates[garageChannel].cacheTargetDoorState = newPos
-        this.accessory.context.cacheStates[garageChannel].cacheCurrentDoorState = newPos
-      })
-      */
+      
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }

From f4202ee815a60796105e05131034a5af2f05dc65 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 2 Jan 2021 10:10:39 +0000
Subject: [PATCH 1067/3183] fix

---
 lib/device/garage-four.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/device/garage-four.js b/lib/device/garage-four.js
index 7f38b7a5..85cb7e1d 100644
--- a/lib/device/garage-four.js
+++ b/lib/device/garage-four.js
@@ -61,7 +61,7 @@ module.exports = class deviceGarageFour {
       await this.helpers.sleep(2000)
       this.inUse = false
       await this.helpers.sleep(Math.max((garageConfig.operationTime - 20) * 100, 0))
-      if (this.updateKey !== updateKey || sAccessory) return
+      if (this.updateKey !== updateKey) return
       gdService.updateCharacteristic(this.Characteristic.CurrentDoorState, value)
       this.accessory.context.cacheStates[garageChannel].cacheCurrentDoorState = value
       this.log('[%s] current state [garage %s %s].', this.accessory.displayName, garageChannel, value === 0 ? 'open' : 'closed')
@@ -73,7 +73,7 @@ module.exports = class deviceGarageFour {
 
   async externalUpdate (params) {
     try {
-      
+
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }

From 22b9c7c5929e57bcdf3d83b177f827ee72347037 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 2 Jan 2021 10:12:10 +0000
Subject: [PATCH 1068/3183] 4.0.0-3

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 19b085d8..bdbed851 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.0.0-2",
+  "version": "4.0.0-3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 665eab14..baf7f992 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.0.0-2",
+  "version": "4.0.0-3",
   "author": "bwp91",
   "description": "Homebridge/HOOBS plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 458d072e56d685c38a47f3d54d8c49bb267be019 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 2 Jan 2021 10:27:30 +0000
Subject: [PATCH 1069/3183] update min beta needed

---
 lib/device/light-colour.js | 2 +-
 lib/device/light-ctemp.js  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/device/light-colour.js b/lib/device/light-colour.js
index 54373a41..5cc00217 100644
--- a/lib/device/light-colour.js
+++ b/lib/device/light-colour.js
@@ -37,7 +37,7 @@ module.exports = class deviceLightColour {
       this.lightService
         .getCharacteristic(this.Characteristic.ColorTemperature)
         .on('set', this.internalCTempUpdate.bind(this))
-      if (platform.api.versionGreaterOrEqual && platform.api.versionGreaterOrEqual('1.3.0-beta.27')) {
+      if (platform.api.versionGreaterOrEqual && platform.api.versionGreaterOrEqual('1.3.0-beta.40')) {
         this.cacheBrightness = this.lightService.getCharacteristic(this.Characteristic.Brightness).value
         this.alController = new platform.api.hap.AdaptiveLightingController(this.lightService)
         this.accessory.configureController(this.alController)
diff --git a/lib/device/light-ctemp.js b/lib/device/light-ctemp.js
index dfdbb069..e1d93d67 100644
--- a/lib/device/light-ctemp.js
+++ b/lib/device/light-ctemp.js
@@ -26,7 +26,7 @@ module.exports = class deviceLightColour {
       this.maxK = 6500
     }
     this.accessory = accessory
-    if (platform.api.versionGreaterOrEqual && platform.api.versionGreaterOrEqual('1.3.0-beta.27')) {
+    if (platform.api.versionGreaterOrEqual && platform.api.versionGreaterOrEqual('1.3.0-beta.40')) {
       this.cacheBrightness = this.lightService.getCharacteristic(this.Characteristic.Brightness).value
       this.alController = new platform.api.hap.AdaptiveLightingController(this.lightService)
       this.accessory.configureController(this.alController)

From 45c88c8a75add63b15bf6bd794bebb1f5a1d66b2 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 2 Jan 2021 10:38:56 +0000
Subject: [PATCH 1070/3183] rgb log formatting

---
 lib/device/diffuser.js     | 4 ++--
 lib/device/light-colour.js | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/device/diffuser.js b/lib/device/diffuser.js
index 4f7b0146..634c8aaa 100644
--- a/lib/device/diffuser.js
+++ b/lib/device/diffuser.js
@@ -152,7 +152,7 @@ module.exports = class deviceDiffuser {
         if (this.updateTimeout === updateKeyColour) this.updateTimeout = false
       }, 10000)
       await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.log('[%s] current colour [rgb %s, %s, %s].', this.accessory.displayName, this.cacheR, this.cacheG, this.cacheB)
+      this.log('[%s] current colour [rgb %s %s %s].', this.accessory.displayName, this.cacheR, this.cacheG, this.cacheB)
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
     }
@@ -198,7 +198,7 @@ module.exports = class deviceDiffuser {
             .updateCharacteristic(this.Characteristic.Hue, this.cacheHue)
             .updateCharacteristic(this.Characteristic.Saturation, 100)
           if (params.updateSource) {
-            this.log('[%s] current colour [rgb %s, %s, %s].', this.accessory.displayName, this.cacheR, this.cacheG, this.cacheB)
+            this.log('[%s] current colour [rgb %s %s %s].', this.accessory.displayName, this.cacheR, this.cacheG, this.cacheB)
           }
         }
       }
diff --git a/lib/device/light-colour.js b/lib/device/light-colour.js
index 5cc00217..9134bfe4 100644
--- a/lib/device/light-colour.js
+++ b/lib/device/light-colour.js
@@ -184,7 +184,7 @@ module.exports = class deviceLightColour {
         if (this.updateTimeout === updateKeyColour) this.updateTimeout = false
       }, 10000)
       await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.log('[%s] current colour [rgb %s, %s, %s].', this.accessory.displayName, this.cacheR, this.cacheG, this.cacheB)
+      this.log('[%s] current colour [rgb %s %s %s].', this.accessory.displayName, this.cacheR, this.cacheG, this.cacheB)
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
     }
@@ -270,7 +270,7 @@ module.exports = class deviceLightColour {
                   .updateCharacteristic(this.Characteristic.Brightness, 100)
                 if (params.updateSource) {
                   this.log(
-                    '[%s] current colour [rgb %s, %s, %s].',
+                    '[%s] current colour [rgb %s %s %s].',
                     this.accessory.displayName,
                     this.cacheR, this.cacheG, this.cacheB
                   )
@@ -302,7 +302,7 @@ module.exports = class deviceLightColour {
                 .updateCharacteristic(this.Characteristic.Saturation, hs[1])
               if (params.updateSource) {
                 this.log(
-                  '[%s] current colour [rgb %s, %s, %s].',
+                  '[%s] current colour [rgb %s %s %s].',
                   this.accessory.displayName,
                   this.cacheR, this.cacheG, this.cacheB
                 )
@@ -340,7 +340,7 @@ module.exports = class deviceLightColour {
                   .updateCharacteristic(this.Characteristic.Saturation, 100)
                 if (params.updateSource) {
                   this.log(
-                    '[%s] current colour [rgb %s, %s, %s].',
+                    '[%s] current colour [rgb %s %s %s].',
                     this.accessory.displayName,
                     this.cacheR, this.cacheG, this.cacheB
                   )

From c939aaa9a4a7c8eaae0189fc91f6546e5a5eab7d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 2 Jan 2021 11:32:55 +0000
Subject: [PATCH 1071/3183] remove emoji

---
 lib/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/index.js b/lib/index.js
index 9f02e1c6..8746092c 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -116,7 +116,7 @@ class eWeLinkPlatform {
       }, 3600000)
 
       // *** Log for informative purposes *** \\
-      this.log("eWeLink sync complete. Don't forget to ⭐️  this plugin on GitHub if you're finding it useful!")
+      this.log("✓ Setup complete. Don't forget to ☆ this plugin on GitHub if you're finding it useful!")
     } catch (err) {
       // *** Catch errors at any point during setup *** \\
       this.log.warn('*** Disabling plugin [v%s] ***', this.version)

From e917d5e60b7f842490a57aa9a939e0284ca922f8 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 2 Jan 2021 18:04:59 +0000
Subject: [PATCH 1072/3183] log if adaptive lighting

---
 lib/device/light-colour.js | 6 +++++-
 lib/device/light-ctemp.js  | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/lib/device/light-colour.js b/lib/device/light-colour.js
index 9134bfe4..f5620043 100644
--- a/lib/device/light-colour.js
+++ b/lib/device/light-colour.js
@@ -222,7 +222,11 @@ module.exports = class deviceLightColour {
         if (this.updateTimeout === updateKeyCT) this.updateTimeout = false
       }, 10000)
       await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.log('[%s] current cct [%sK].', this.accessory.displayName, mToK)
+      if (this.alController && this.alController.isAdaptiveLightingActive()) {
+        this.log('[%s] current cct [%s mired] via adaptive lighting.', this.accessory.displayName, value)
+      } else {
+        this.log('[%s] current cct [%s mired].', this.accessory.displayName, value)
+      }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
     }
diff --git a/lib/device/light-ctemp.js b/lib/device/light-ctemp.js
index e1d93d67..88a97cda 100644
--- a/lib/device/light-ctemp.js
+++ b/lib/device/light-ctemp.js
@@ -107,7 +107,11 @@ module.exports = class deviceLightColour {
         if (this.updateTimeout === updateKeyCT) this.updateTimeout = false
       }, 10000)
       await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.log('[%s] current cct [%sK].', this.accessory.displayName, mToK)
+      if (this.alController && this.alController.isAdaptiveLightingActive()) {
+        this.log('[%s] current cct [%s mired] via adaptive lighting.', this.accessory.displayName, value)
+      } else {
+        this.log('[%s] current cct [%s mired].', this.accessory.displayName, value)
+      }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
     }

From 1109716c0a67d51e3b8dcf3cecacad9e72a7da3c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 2 Jan 2021 18:23:20 +0000
Subject: [PATCH 1073/3183] kelvin is better

---
 lib/device/light-colour.js | 4 ++--
 lib/device/light-ctemp.js  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/device/light-colour.js b/lib/device/light-colour.js
index f5620043..146b2a37 100644
--- a/lib/device/light-colour.js
+++ b/lib/device/light-colour.js
@@ -223,9 +223,9 @@ module.exports = class deviceLightColour {
       }, 10000)
       await this.platform.sendDeviceUpdate(this.accessory, params)
       if (this.alController && this.alController.isAdaptiveLightingActive()) {
-        this.log('[%s] current cct [%s mired] via adaptive lighting.', this.accessory.displayName, value)
+        this.log('[%s] current cct [%sK] via adaptive lighting.', this.accessory.displayName, mToK)
       } else {
-        this.log('[%s] current cct [%s mired].', this.accessory.displayName, value)
+        this.log('[%s] current cct [%sK].', this.accessory.displayName, mToK)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
diff --git a/lib/device/light-ctemp.js b/lib/device/light-ctemp.js
index 88a97cda..0a436802 100644
--- a/lib/device/light-ctemp.js
+++ b/lib/device/light-ctemp.js
@@ -108,9 +108,9 @@ module.exports = class deviceLightColour {
       }, 10000)
       await this.platform.sendDeviceUpdate(this.accessory, params)
       if (this.alController && this.alController.isAdaptiveLightingActive()) {
-        this.log('[%s] current cct [%s mired] via adaptive lighting.', this.accessory.displayName, value)
+        this.log('[%s] current cct [%sK] via adaptive lighting.', this.accessory.displayName, mToK)
       } else {
-        this.log('[%s] current cct [%s mired].', this.accessory.displayName, value)
+        this.log('[%s] current cct [%sK].', this.accessory.displayName, mToK)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)

From 3d76b14cecafc8a723c3aa7859e938eee0ecc996 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 2 Jan 2021 21:16:27 +0000
Subject: [PATCH 1074/3183] significant colour variation

---
 lib/device/light-colour.js | 37 ++++++++++++++++++++++++-------------
 lib/device/light-ctemp.js  |  9 +++++++++
 2 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/lib/device/light-colour.js b/lib/device/light-colour.js
index 146b2a37..33a1eb6c 100644
--- a/lib/device/light-colour.js
+++ b/lib/device/light-colour.js
@@ -311,6 +311,10 @@ module.exports = class deviceLightColour {
                   this.cacheR, this.cacheG, this.cacheB
                 )
               }
+              if (this.alController && this.alController.isAdaptiveLightingActive()) {
+                this.alController.disableAdaptiveLighting()
+                this.log('[%s] adaptive lighting disabled due to significant colour change.', this.accessory.displayName)
+              }
             }
           }
           break
@@ -360,19 +364,26 @@ module.exports = class deviceLightColour {
                 if (params.updateSource) this.log('[%s] current brightness [%s%].', this.accessory.displayName, this.cacheBrightness)
               }
             }
-            if (this.helpers.hasProperty(params.white, 'ct')) {
-              if (params.white.ct !== this.cacheCT) {
-                this.cacheMode = 'white'
-                this.cacheCT = params.white.ct
-                const ctToK = Math.round(this.cacheCT / 255 * 3800 + 2700)
-                this.cacheMired = Math.max(Math.min(Math.round(1000000 / ctToK), 500), 140)
-                hs = this.helpers.m2hs(this.cacheMired)
-                this.cacheHue = hs[0]
-                this.lightService
-                  .updateCharacteristic(this.Characteristic.Hue, this.cacheHue)
-                  .updateCharacteristic(this.Characteristic.Saturation, hs[1])
-                  .updateCharacteristic(this.Characteristic.ColorTemperature, this.cacheMired)
-                if (params.updateSource) this.log('[%s] current cct [%sK].', this.accessory.displayName, ctToK)
+            if (this.helpers.hasProperty(params.white, 'ct') && params.white.ct !== this.cacheCT) {
+              this.cacheMode = 'white'
+              this.cacheCT = params.white.ct
+              const ctToK = Math.round(this.cacheCT / 255 * 3800 + 2700)
+              this.cacheMired = Math.max(Math.min(Math.round(1000000 / ctToK), 500), 140)
+              hs = this.helpers.m2hs(this.cacheMired)
+              this.cacheHue = hs[0]
+              this.lightService
+                .updateCharacteristic(this.Characteristic.Hue, this.cacheHue)
+                .updateCharacteristic(this.Characteristic.Saturation, hs[1])
+                .updateCharacteristic(this.Characteristic.ColorTemperature, this.cacheMired)
+              if (params.updateSource) this.log('[%s] current cct [%sK].', this.accessory.displayName, ctToK)
+              if (
+                this.alController &&
+                this.alController.isAdaptiveLightingActive() &&
+                Math.abs(params.white.ct - this.cacheCT) > 20
+              ) {
+                // *** look for a variation greater than twenty *** \\
+                this.alController.disableAdaptiveLighting()
+                this.log('[%s] adaptive lighting disabled due to significant colour change.', this.accessory.displayName)
               }
             }
           }
diff --git a/lib/device/light-ctemp.js b/lib/device/light-ctemp.js
index 0a436802..33ae9533 100644
--- a/lib/device/light-ctemp.js
+++ b/lib/device/light-ctemp.js
@@ -137,6 +137,15 @@ module.exports = class deviceLightColour {
           this.cacheMired = Math.min(Math.max(Math.round(1000000 / ctToK), 140), 500)
           this.lightService.updateCharacteristic(this.Characteristic.ColorTemperature, this.cacheMired)
           if (params.updateSource) this.log('[%s] current cct [%sK].', this.accessory.displayName, ctToK)
+          if (
+            this.alController &&
+            this.alController.isAdaptiveLightingActive() &&
+            Math.abs(params.white.ct - this.cacheCT) > 20
+          ) {
+            // *** look for a variation greater than twenty *** \\
+            this.alController.disableAdaptiveLighting()
+            this.log('[%s] adaptive lighting disabled due to significant colour change.', this.accessory.displayName)
+          }
         }
       }
     } catch (err) {

From 8e71fbc1be2021efda8e4befdc40285dd1fa13ed Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 3 Jan 2021 09:13:30 +0000
Subject: [PATCH 1075/3183] AL updates

---
 lib/device/light-colour.js | 7 +++++--
 lib/device/light-ctemp.js  | 4 ++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/lib/device/light-colour.js b/lib/device/light-colour.js
index 33a1eb6c..3ba669d8 100644
--- a/lib/device/light-colour.js
+++ b/lib/device/light-colour.js
@@ -139,6 +139,8 @@ module.exports = class deviceLightColour {
       this.cacheR = newRGB[0]
       this.cacheG = newRGB[1]
       this.cacheB = newRGB[2]
+      this.cacheMired = 0
+      this.cacheCT = 0
       const updateKeyColour = Math.random().toString(36).substr(2, 8)
       this.updateKeyColour = updateKeyColour
       switch (this.accessory.context.eweUIID) {
@@ -205,6 +207,7 @@ module.exports = class deviceLightColour {
       callback()
       const mToK = Math.max(Math.min(Math.round(1000000 / value), 6500), 2700)
       this.cacheCT = Math.round(((mToK - 2700) / 3800) * 255)
+      this.cacheHue = 0
       const updateKeyCT = Math.random().toString(36).substr(2, 8)
       this.updateKeyCT = updateKeyCT
       const params = {
@@ -379,9 +382,9 @@ module.exports = class deviceLightColour {
               if (
                 this.alController &&
                 this.alController.isAdaptiveLightingActive() &&
-                Math.abs(params.white.ct - this.cacheCT) > 20
+                Math.abs(params.white.ct - this.cacheCT) > 5
               ) {
-                // *** look for a variation greater than twenty *** \\
+                // *** look for a variation greater than five *** \\
                 this.alController.disableAdaptiveLighting()
                 this.log('[%s] adaptive lighting disabled due to significant colour change.', this.accessory.displayName)
               }
diff --git a/lib/device/light-ctemp.js b/lib/device/light-ctemp.js
index 33ae9533..a5e22624 100644
--- a/lib/device/light-ctemp.js
+++ b/lib/device/light-ctemp.js
@@ -140,9 +140,9 @@ module.exports = class deviceLightColour {
           if (
             this.alController &&
             this.alController.isAdaptiveLightingActive() &&
-            Math.abs(params.white.ct - this.cacheCT) > 20
+            Math.abs(params.white.ct - this.cacheCT) > 5
           ) {
-            // *** look for a variation greater than twenty *** \\
+            // *** look for a variation greater than five *** \\
             this.alController.disableAdaptiveLighting()
             this.log('[%s] adaptive lighting disabled due to significant colour change.', this.accessory.displayName)
           }

From 2a9b4ca9620b72d2f893b45a36b7105067221fef Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 3 Jan 2021 09:15:45 +0000
Subject: [PATCH 1076/3183] 4.0.0-4

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index bdbed851..e7c63203 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.0.0-3",
+  "version": "4.0.0-4",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index baf7f992..7ca39c40 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.0.0-3",
+  "version": "4.0.0-4",
   "author": "bwp91",
   "description": "Homebridge/HOOBS plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From ee7c75d11cb56a58027e5e07134b4f1b5a745302 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 3 Jan 2021 11:19:31 +0000
Subject: [PATCH 1077/3183] new mode option

---
 config.schema.json | 37 ++++++++++++++------
 lib/index.js       | 87 ++++++++++++++++++++++++++--------------------
 2 files changed, 76 insertions(+), 48 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index fe581307..16e2f329 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -30,15 +30,31 @@
         "required": true,
         "description": "The password for your eWeLink account."
       },
-      "disableHTTPRefresh": {
-        "type": "boolean",
-        "title": "Disable Initial Device Refresh",
-        "description": "If checked, devices will not be refreshed with their most recent status from eWeLink on startup. This setting can be useful for users who block their devices from accessing the internet."
-      },
-      "disableLANMode": {
-        "type": "boolean",
-        "title": "Disable LAN Mode",
-        "description": "If checked, all device updates will be sent straight to the cloud."
+      "mode": {
+        "type": "string",
+        "title": "Connection Mode",
+        "description": "This setting defines how the plugin communicates with your devices.",
+        "default": "auto",
+        "oneOf": [
+          {
+            "title": "Auto (Recommended)",
+            "enum": [
+              "auto"
+            ]
+          },
+          {
+            "title": "Cloud Only",
+            "enum": [
+              "wan"
+            ]
+          },
+          {
+            "title": "LAN Only",
+            "enum": [
+              "lan"
+            ]
+          }
+        ]
       },
       "debug": {
         "title": "Debug Logging",
@@ -363,8 +379,7 @@
       "type": "fieldset",
       "title": "Optional Settings",
       "items": [
-        "disableHTTPRefresh",
-        "disableLANMode",
+        "mode",
         "debug",
         "disablePlugin"
       ]
diff --git a/lib/index.js b/lib/index.js
index 8746092c..6f660f40 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -22,6 +22,7 @@ class eWeLinkPlatform {
     this.helpers = require('./utils/helpers')
     this.eveService = require('./fakegato/fakegato-history')(api)
     this.debug = this.config.debug
+    this.mode = ['auto', 'wan', 'lan'].includes(this.config.mode) ? this.config.mode : 'auto'
     this.devicesInHB = new Map()
     this.devicesInEW = new Map()
     this.cusG = new Map()
@@ -63,14 +64,18 @@ class eWeLinkPlatform {
       deviceList.forEach(device => this.devicesInEW.set(device.deviceid, device))
 
       // *** Set up the WS client, get the user WS host, and login *** \\
-      this.wsClient = new (require('./connection/ws'))(this, authData)
-      await this.wsClient.getHost()
-      this.wsClient.login()
+      if (this.mode !== 'lan') {
+        this.wsClient = new (require('./connection/ws'))(this, authData)
+        await this.wsClient.getHost()
+        this.wsClient.login()
+      }
 
       // *** Set up the LAN client, scan for devices and start monitoring *** \\
-      this.lanClient = new (require('./connection/lan'))(this, deviceList)
-      this.lanDevices = await this.lanClient.getHosts()
-      await this.lanClient.startMonitor()
+      if (this.mode !== 'wan') {
+        this.lanClient = new (require('./connection/lan'))(this, deviceList)
+        this.lanDevices = await this.lanClient.getHosts()
+        await this.lanClient.startMonitor()
+      }
 
       // *** Check for valid Accessory Simulations and add to cusG for later use *** \\
       if (Object.keys(this.config.groups || []).length > 0) {
@@ -98,22 +103,22 @@ class eWeLinkPlatform {
       this.devicesInEW.forEach(device => this.initialiseDevice(device))
 
       // *** Set up the WS and LAN listener for device updates *** \\
-      this.wsClient.receiveUpdate(device => this.receiveDeviceUpdate(device))
-      this.lanClient.receiveUpdate(device => this.receiveDeviceUpdate(device))
+      if (this.wsClient) this.wsClient.receiveUpdate(device => this.receiveDeviceUpdate(device))
+      if (this.lanClient) this.lanClient.receiveUpdate(device => this.receiveDeviceUpdate(device))
 
       // *** Refresh the WS connection every 60 minutes *** \\
-      this.wsRefresh = setInterval(async () => {
-        try {
-          if (this.wsClient) {
+      if (this.wsClient) {
+        this.wsRefresh = setInterval(async () => {
+          try {
             await this.wsClient.getHost()
             await this.wsClient.closeConnection()
             await this.helpers.sleep(250)
             await this.wsClient.login()
+          } catch (err) {
+            this.log.warn(this.debug ? err : err.message)
           }
-        } catch (err) {
-          this.log.warn(this.debug ? err : err.message)
-        }
-      }, 3600000)
+        }, 3600000)
+      }
 
       // *** Log for informative purposes *** \\
       this.log("✓ Setup complete. Don't forget to ☆ this plugin on GitHub if you're finding it useful!")
@@ -124,8 +129,13 @@ class eWeLinkPlatform {
 
       // *** Attempt to close WS and stop LAN monitor if this has been setup *** \\
       try {
-        if (this.lanClient) this.lanClient.closeConnection()
-        if (this.wsClient) this.wsClient.closeConnection()
+        if (this.lanClient) {
+          this.lanClient.closeConnection()
+        }
+        if (this.wsClient) {
+          clearInterval(this.wsRefresh)
+          this.wsClient.closeConnection()
+        }
       } catch (err) {
         this.log.warn(this.debug ? err : err.message)
       }
@@ -135,8 +145,13 @@ class eWeLinkPlatform {
   eWeLinkShutdown () {
     // *** Attempt to close WS and stop LAN monitor if this has been setup *** \\
     try {
-      if (this.lanClient) this.lanClient.closeConnection()
-      if (this.wsClient) this.wsClient.closeConnection()
+      if (this.lanClient) {
+        this.lanClient.closeConnection()
+      }
+      if (this.wsClient) {
+        clearInterval(this.wsRefresh)
+        this.wsClient.closeConnection()
+      }
     } catch (err) {
       this.log.warn(this.debug ? err : err.message)
     }
@@ -379,15 +394,13 @@ class eWeLinkPlatform {
               .setCharacteristic(this.Characteristic.FirmwareRevision, device.params.fwVersion || this.version)
           }
           oAccessory.context.reachableWAN = device.online
-          oAccessory.context.reachableLAN = this.lanDevices.has(device.deviceid)
+          oAccessory.context.reachableLAN = this.lanClient && this.lanDevices.has(device.deviceid)
             ? this.lanDevices.get(device.deviceid).ip
             : false
           oAccessory.context.eweBrandName = device.brandName
           oAccessory.context.eweBrandLogo = device.brandLogo
-          oAccessory.context.eweShared = this.helpers.hasProperty(device, 'sharedBy') && this.helpers.hasProperty(device.sharedBy, 'email')
-            ? device.sharedBy.email
-            : false
-          oAccessory.context.ip = oAccessory.context.reachableLAN
+          oAccessory.context.eweShared = device.sharedBy && device.sharedBy.email ? device.sharedBy.email : false
+          oAccessory.context.ip = this.lanClient && oAccessory.context.reachableLAN
             ? this.lanDevices.get(device.deviceid).ip
             : false
           oAccessory.control = new (require('./device/switch-multi'))(this, oAccessory)
@@ -466,7 +479,7 @@ class eWeLinkPlatform {
           oAccessory.context.eweBrandName = device.brandName
           oAccessory.context.eweBrandLogo = device.brandLogo
           oAccessory.context.eweShared = device.sharedBy && device.sharedBy.email ? device.sharedBy.email : false
-          oAccessory.context.ip = oAccessory.context.reachableLAN ? this.lanDevices.get(device.deviceid).ip : false
+          oAccessory.context.ip = this.lanClient && oAccessory.context.reachableLAN ? this.lanDevices.get(device.deviceid).ip : false
           this.api.updatePlatformAccessories('homebridge-ewelink', 'eWeLink', [oAccessory])
           this.devicesInHB.set(oAccessory.context.hbDeviceId, oAccessory)
           oAccessory.control = new (require('./device/rf-bridge'))(this, oAccessory)
@@ -516,7 +529,7 @@ class eWeLinkPlatform {
 
       // *** Update the reachability values (via WS and LAN) *** \\
       accessory.context.reachableWAN = device.online
-      accessory.context.reachableLAN = this.lanDevices.has(device.deviceid)
+      accessory.context.reachableLAN = this.lanClient && this.lanDevices.has(device.deviceid)
         ? this.lanDevices.get(device.deviceid).ip
         : false
       accessory.context.eweBrandName = device.brandName
@@ -524,7 +537,7 @@ class eWeLinkPlatform {
       accessory.context.eweShared = this.helpers.hasProperty(device, 'sharedBy') && this.helpers.hasProperty(device.sharedBy, 'email')
         ? device.sharedBy.email
         : false
-      accessory.context.ip = accessory.context.reachableLAN
+      accessory.context.ip = this.lanClient && accessory.context.reachableLAN
         ? this.lanDevices.get(device.deviceid).ip
         : false
 
@@ -536,7 +549,7 @@ class eWeLinkPlatform {
           : 'LAN mode unavailable as not supported'
 
       // *** Update accessory characteristics with latest values *** \\
-      if (!this.config.disableHTTPRefresh) accessory.control.externalUpdate(device.params)
+      if (this.wsClient) accessory.control.externalUpdate(device.params)
 
       // *** Update any changes to the device into our devicesInHB map *** \\
       this.api.updatePlatformAccessories('homebridge-ewelink', 'eWeLink', [accessory])
@@ -657,7 +670,7 @@ class eWeLinkPlatform {
     }
 
     // *** Quick check to see if LAN mode is supported *** \\
-    const res = this.config.disableLANMode
+    const res = !this.lanClient
       ? 'LAN mode is disabled'
       : !this.helpers.devicesLAN.includes(accessory.context.eweUIID)
         ? 'LAN mode is not supported for this device'
@@ -666,7 +679,7 @@ class eWeLinkPlatform {
     // *** Revert to WS if LAN mode not possible for whatever reason *** \\
     if (res !== 'ok') {
       // *** Check to see if the device is online *** \\
-      if (accessory.context.reachableWAN) {
+      if (this.wsClient && accessory.context.reachableWAN) {
         if (this.debug) this.log('[%s] Reverting to web socket as %s.', accessory.displayName, res)
         await this.wsClient.sendUpdate(payload)
       } else {
@@ -691,7 +704,7 @@ class eWeLinkPlatform {
           this.devicesInHB.set(accessory.context.hbDeviceId, accessory)
           reachableChange = true
           this.log('[%s] reported [%sline] via WS.', accessory.displayName, accessory.context.reachableWAN ? 'on' : 'off')
-          if (accessory.context.reachableWAN) {
+          if (accessory.context.reachableWAN && this.wsClient) {
             try {
               this.wsClient.requestUpdate(accessory)
             } catch (err) {}
@@ -704,10 +717,10 @@ class eWeLinkPlatform {
         this.devicesInHB.set(accessory.context.hbDeviceId, accessory)
         reachableChange = true
         this.log('[%s] has been reported [online] via LAN.', accessory.displayName)
-        try {
-          this.wsClient.requestUpdate(accessory)
-        } catch (err) {
-          this.log.warn('[%s] update could not be requested as %s', accessory.displayName, this.debug ? err.message : err)
+        if (accessory.context.reachableWAN && this.wsClient) {
+          try {
+            this.wsClient.requestUpdate(accessory)
+          } catch (err) {}
         }
       }
 
@@ -746,7 +759,7 @@ class eWeLinkPlatform {
         this.initialiseDevice(newDevice)
 
         // *** Add the device to the LAN client map *** \\
-        if (this.helpers.devicesLAN.includes(newDevice.extra.uiid)) {
+        if (this.lanClient && this.helpers.devicesLAN.includes(newDevice.extra.uiid)) {
           this.lanClient.addDeviceToMap(newDevice)
         }
       } catch (err) {
@@ -761,7 +774,7 @@ class eWeLinkPlatform {
 
     // *** We only request a device refresh on failed internal updates (ie with 'set' handlers) *** \\
     if (!requestRefresh) return
-    if (accessory.context.reachableWAN) {
+    if (accessory.context.reachableWAN && this.wsClient) {
       try {
         await this.wsClient.requestUpdate(accessory)
       } catch (err) {}

From 4d50e5b12977923eebe4f566c9d15723ea3b658f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 3 Jan 2021 11:23:50 +0000
Subject: [PATCH 1078/3183] 4.0.0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index e7c63203..faa6dc81 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.0.0-4",
+  "version": "4.0.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 7ca39c40..cffe6d84 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.0.0-4",
+  "version": "4.0.0",
   "author": "bwp91",
   "description": "Homebridge/HOOBS plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 16ea4422794e7c288bf2ecc4ef9cf2d0976cdd55 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Mon, 4 Jan 2021 08:57:43 +0000
Subject: [PATCH 1079/3183] Update README.md

---
 README.md | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index f16d5410..99bcdb77 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
   
 # homebridge-ewelink 
 
-Homebridge/HOOBS plugin to control eWeLink devices with original firmware
+Homebridge plugin to control eWeLink devices with original firmware
 
 [![verified-by-homebridge](https://badgen.net/badge/homebridge/verified/purple)](https://github.com/homebridge/homebridge/wiki/Verified-Plugins)
 [![hoobs-certified](https://badgen.net/badge/HOOBS/Certified/yellow)](https://plugins.hoobs.org/plugin/homebridge-ewelink)   
@@ -18,13 +18,15 @@ Homebridge/HOOBS plugin to control eWeLink devices with original firmware
 
 </span>
 
-### Prerequisites
-* To use this plugin, you will need to already have [Homebridge](https://homebridge.io) or [HOOBS](https://hoobs.org) installed. Please refer to the links for more information and installation instructions.
 
 ### Plugin Information
-* This plugin uses your eWeLink credentials to obtain and control your devices through Homebridge.
-* This plugin uses a web socket for real-time device control and updates.
-* This plugin also supports LAN control for certain devices that support it.
+* This plugin allows you to view and control your eWeLink devices within HomeKit. The plugin:
+  * requires your eWeLink credentials to function
+  * supports LAN control for certain devices
+  * uses a web socket for real-time device control and updates
+
+### Prerequisites
+* To use this plugin, you will need to already have [Homebridge](https://homebridge.io) or [HOOBS](https://hoobs.org) installed. Please refer to the links for more information and installation instructions.
 
 ### Setup
 * [Installation (Homebridge)](https://github.com/bwp91/homebridge-ewelink/wiki/Installation-(Homebridge))

From 7f71aa656fac37646a5225b76941efb2e0e5b9c0 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 4 Jan 2021 08:58:47 +0000
Subject: [PATCH 1080/3183] Update package.json

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index cffe6d84..288256f7 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "homebridge-ewelink",
   "version": "4.0.0",
   "author": "bwp91",
-  "description": "Homebridge/HOOBS plugin to control eWeLink devices with original firmware.",
+  "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",
   "keywords": [
     "homebridge",

From 5dd6b9c55707c7b696d958bc5a1c2b28f67a106b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 4 Jan 2021 10:36:28 +0000
Subject: [PATCH 1081/3183] fix setup bug

---
 lib/device/th-outlet.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/device/th-outlet.js b/lib/device/th-outlet.js
index df1eac67..e4865048 100644
--- a/lib/device/th-outlet.js
+++ b/lib/device/th-outlet.js
@@ -9,7 +9,7 @@ module.exports = class deviceTHOutlet {
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
     this.tempOffset = parseFloat(platform.thTempOffset[accessory.context.eweDeviceId] || 0)
-    this.hideSwitch = (this.platform.config.hideSwitchFromTH || '').split(',').includes(this.accessory.context.eweDeviceId)
+    this.hideSwitch = (this.platform.config.hideSwitchFromTH || '').split(',').includes(accessory.context.eweDeviceId)
     if (accessory.getService(this.Service.Thermostat)) {
       accessory.removeService(accessory.getService(this.Service.Thermostat))
     }

From cc9872d994b248de1078e1ff5c9382f79649f482 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 4 Jan 2021 10:37:18 +0000
Subject: [PATCH 1082/3183] 4.0.1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index faa6dc81..6ad7fcb5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.0.0",
+  "version": "4.0.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 288256f7..78e43244 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.0.0",
+  "version": "4.0.1",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 0612d6ef61b1cf37b71c68611608ad02783f9f33 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Mon, 4 Jan 2021 12:16:44 +0000
Subject: [PATCH 1083/3183] Update new-issue.md

---
 .github/ISSUE_TEMPLATE/new-issue.md | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/new-issue.md b/.github/ISSUE_TEMPLATE/new-issue.md
index 8c485cd1..3aeacf87 100644
--- a/.github/ISSUE_TEMPLATE/new-issue.md
+++ b/.github/ISSUE_TEMPLATE/new-issue.md
@@ -9,7 +9,7 @@ assignees: ''
 
 <!-- PLEASE READ BEFORE POSTING A NEW ISSUE
    → Please use this template as well as you can.
-   → Things that may seem unimportant to you are often helpful in finding the cause of the issue.
+   → Things that may seem unimportant are often helpful in finding the cause of the issue.
 -->
 
 ### What issue do you have? Please be as thorough and explicit as possible.
@@ -17,7 +17,7 @@ assignees: ''
 
 
 ### Details of your setup.
-* Do you use Homebridge (with config-ui?) or HOOBS? 
+* Do you use (1) Homebridge (+ config-ui), (2) Homebridge (CLI) or (3) HOOBS? 
 
 
 
@@ -25,26 +25,25 @@ assignees: ''
 
 
 
-* Which version of this plugin (homebridge-ewelink) do you have? Has the issue started since upgrading from a previous version?
+* Which platform do you run Homebridge/HOOBS on? (e.g. Raspberry Pi/Windows/HOOBS Box) Please also mention your version of Node.js/NPM if known.
 
 
 
-* Which eWeLink devices do you have that are causing issues? Please include product models if applicable.
+* Which version of this plugin (homebridge-ewelink) do you have? Has the issue started since upgrading from a previous version?
 
 
 
-* Do you use your main eWeLink credentials or do you use a secondary eWeLink account for Homebridge?
+* Which eWeLink devices do you have that are causing issues? Please include product models if applicable.
 
 
 
 ### Please paste any relevant logs below.
 <!-- ABOUT LOGS
-   → More thorough logging can be seen by enabling 'Debug Logging' and
-     ...'Request & Response Logging' in the plugin settings.
+   → More logging can enabled with 'Debug Logging' in the plugin settings.
    → If you are posting an error then it is helpful for me to also see
-     ...the previous few lines as this can show the cause of the error.
-   → Please enter the logs between the two ``` lines below so that
-     ...the logs are formatted in a way which is easier to read.
+     the previous few lines as this can show the cause of the error.
+   → Please enter the logs between the two ``` lines below so that the
+     logs are formatted in a way which is easier to read.
 -->
 
 ```

From 7dcc101b6986d419793b0b42d5d478fcfaa04c87 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Mon, 4 Jan 2021 12:17:02 +0000
Subject: [PATCH 1084/3183] Update new-issue.md

---
 .github/ISSUE_TEMPLATE/new-issue.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/new-issue.md b/.github/ISSUE_TEMPLATE/new-issue.md
index 3aeacf87..3decca88 100644
--- a/.github/ISSUE_TEMPLATE/new-issue.md
+++ b/.github/ISSUE_TEMPLATE/new-issue.md
@@ -25,7 +25,7 @@ assignees: ''
 
 
 
-* Which platform do you run Homebridge/HOOBS on? (e.g. Raspberry Pi/Windows/HOOBS Box) Please also mention your version of Node.js/NPM if known.
+* Which platform do you run Homebridge/HOOBS on (e.g. Raspberry Pi/Windows/HOOBS Box)? Please also mention your version of Node.js/NPM if known.
 
 
 

From fcb9a6bb3c9910db92ecaefb972a9c6693ee6cba Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 4 Jan 2021 14:27:27 +0000
Subject: [PATCH 1085/3183] test AL on L1

---
 lib/device/light-colour.js | 66 ++++++++++++++++++++++++++------------
 1 file changed, 46 insertions(+), 20 deletions(-)

diff --git a/lib/device/light-colour.js b/lib/device/light-colour.js
index 3ba669d8..2839db37 100644
--- a/lib/device/light-colour.js
+++ b/lib/device/light-colour.js
@@ -31,7 +31,7 @@ module.exports = class deviceLightColour {
         })
     }
     this.accessory = accessory
-    if (accessory.context.eweUIID === 104) {
+    if ([59, 104].includes(accessory.context.eweUIID)) {
       // HomeKit has a range of 140-500M corresponding to 2000-7143K
       // Devices have a range of 2700K-6500K corresponding to ewelink ct: 0-255
       this.lightService
@@ -210,14 +210,37 @@ module.exports = class deviceLightColour {
       this.cacheHue = 0
       const updateKeyCT = Math.random().toString(36).substr(2, 8)
       this.updateKeyCT = updateKeyCT
-      const params = {
-        ltype: this.cacheMode === 'white' ? undefined : 'white',
-        white: {
-          br: this.cacheBrightness,
-          ct: this.cacheCT
+      let params
+      switch (this.accessory.context.eweUIID) {
+        case 59: {
+          // *** L1 *** \\
+          const newRGB = this.helpers.hs2rgb([
+            hs[0],
+            this.lightService.getCharacteristic(this.Characteristic.Saturation).value
+          ])
+          this.cacheR = newRGB[0]
+          this.cacheG = newRGB[1]
+          this.cacheB = newRGB[2]
+          params = {
+            mode: 1,
+            colorR: this.cacheR,
+            colorG: this.cacheG,
+            colorB: this.cacheB
+          }
+          break
         }
+        case 104:
+          // *** B02-B-A60, B05-B-A60, GTLC104 *** \\
+          params = {
+            ltype: this.cacheMode === 'white' ? undefined : 'white',
+            white: {
+              br: this.cacheBrightness,
+              ct: this.cacheCT
+            }
+          }
+          this.cacheMode = 'white'
+          break
       }
-      this.cacheMode = 'white'
       await this.helpers.sleep(1500)
       if (updateKeyCT !== this.updateKeyCT) return
       this.updateTimeout = updateKeyCT
@@ -304,6 +327,7 @@ module.exports = class deviceLightColour {
               this.cacheB = params.colorB
               hs = this.helpers.rgb2hs([this.cacheR, this.cacheG, this.cacheB])
               this.cacheHue = hs[0]
+              this.cacheMired = 140
               this.lightService
                 .updateCharacteristic(this.Characteristic.Hue, this.cacheHue)
                 .updateCharacteristic(this.Characteristic.Saturation, hs[1])
@@ -313,10 +337,10 @@ module.exports = class deviceLightColour {
                   this.accessory.displayName,
                   this.cacheR, this.cacheG, this.cacheB
                 )
-              }
-              if (this.alController && this.alController.isAdaptiveLightingActive()) {
-                this.alController.disableAdaptiveLighting()
-                this.log('[%s] adaptive lighting disabled due to significant colour change.', this.accessory.displayName)
+                if (this.alController && this.alController.isAdaptiveLightingActive()) {
+                  this.alController.disableAdaptiveLighting()
+                  this.log('[%s] adaptive lighting disabled due to significant colour change.', this.accessory.displayName)
+                }
               }
             }
           }
@@ -378,15 +402,17 @@ module.exports = class deviceLightColour {
                 .updateCharacteristic(this.Characteristic.Hue, this.cacheHue)
                 .updateCharacteristic(this.Characteristic.Saturation, hs[1])
                 .updateCharacteristic(this.Characteristic.ColorTemperature, this.cacheMired)
-              if (params.updateSource) this.log('[%s] current cct [%sK].', this.accessory.displayName, ctToK)
-              if (
-                this.alController &&
-                this.alController.isAdaptiveLightingActive() &&
-                Math.abs(params.white.ct - this.cacheCT) > 5
-              ) {
-                // *** look for a variation greater than five *** \\
-                this.alController.disableAdaptiveLighting()
-                this.log('[%s] adaptive lighting disabled due to significant colour change.', this.accessory.displayName)
+              if (params.updateSource) {
+                this.log('[%s] current cct [%sK].', this.accessory.displayName, ctToK)
+                if (
+                  this.alController &&
+                  this.alController.isAdaptiveLightingActive() &&
+                  Math.abs(params.white.ct - this.cacheCT) > 5
+                ) {
+                  // *** look for a variation greater than five *** \\
+                  this.alController.disableAdaptiveLighting()
+                  this.log('[%s] adaptive lighting disabled due to significant colour change.', this.accessory.displayName)
+                }
               }
             }
           }

From 678530a5bbc88cc694026e8de3c05200ce11d5a9 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 4 Jan 2021 14:27:36 +0000
Subject: [PATCH 1086/3183] increase to beta-41

---
 lib/device/light-colour.js | 2 +-
 lib/device/light-ctemp.js  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/device/light-colour.js b/lib/device/light-colour.js
index 2839db37..6be42fe6 100644
--- a/lib/device/light-colour.js
+++ b/lib/device/light-colour.js
@@ -37,7 +37,7 @@ module.exports = class deviceLightColour {
       this.lightService
         .getCharacteristic(this.Characteristic.ColorTemperature)
         .on('set', this.internalCTempUpdate.bind(this))
-      if (platform.api.versionGreaterOrEqual && platform.api.versionGreaterOrEqual('1.3.0-beta.40')) {
+      if (platform.api.versionGreaterOrEqual && platform.api.versionGreaterOrEqual('1.3.0-beta.41')) {
         this.cacheBrightness = this.lightService.getCharacteristic(this.Characteristic.Brightness).value
         this.alController = new platform.api.hap.AdaptiveLightingController(this.lightService)
         this.accessory.configureController(this.alController)
diff --git a/lib/device/light-ctemp.js b/lib/device/light-ctemp.js
index a5e22624..bc8aa0de 100644
--- a/lib/device/light-ctemp.js
+++ b/lib/device/light-ctemp.js
@@ -26,7 +26,7 @@ module.exports = class deviceLightColour {
       this.maxK = 6500
     }
     this.accessory = accessory
-    if (platform.api.versionGreaterOrEqual && platform.api.versionGreaterOrEqual('1.3.0-beta.40')) {
+    if (platform.api.versionGreaterOrEqual && platform.api.versionGreaterOrEqual('1.3.0-beta.41')) {
       this.cacheBrightness = this.lightService.getCharacteristic(this.Characteristic.Brightness).value
       this.alController = new platform.api.hap.AdaptiveLightingController(this.lightService)
       this.accessory.configureController(this.alController)

From 888642c3c9204f5d997e41784206996541a4f632 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 4 Jan 2021 14:29:46 +0000
Subject: [PATCH 1087/3183] hide zb bridge not supported

---
 lib/index.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/index.js b/lib/index.js
index 6f660f40..ac0a2cb1 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -488,6 +488,12 @@ class eWeLinkPlatform {
         accessory.context.channelCount = rfChlCounter
         this.devicesInHB.set(accessory.context.hbDeviceId, accessory)
         /********************/
+      } else if (this.helpers.devicesZBBridge.includes(device.extra.uiid)) {
+        /************
+        ZIGBEE BRIDGE
+        ************/
+        return
+        /***********/
       } else if (this.helpers.devicesZB.includes(device.extra.uiid)) {
         /****************
         ZIGBEE SUBDEVICES

From d455e079d1a61ac9a0f826715e902cdc5d52ed83 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 4 Jan 2021 14:37:14 +0000
Subject: [PATCH 1088/3183] 4.0.2-0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 6ad7fcb5..47662129 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.0.1",
+  "version": "4.0.2-0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 78e43244..764d7dcf 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.0.1",
+  "version": "4.0.2-0",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 51e89b573a1f9bab270726992f2063f2a09f23e1 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 4 Jan 2021 16:05:10 +0000
Subject: [PATCH 1089/3183] 4.0.2

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 47662129..ba53312e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.0.2-0",
+  "version": "4.0.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 764d7dcf..0d536083 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.0.2-0",
+  "version": "4.0.2",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 3c027496c7d8520763c8b35ed499ca6eae03b896 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 4 Jan 2021 17:25:53 +0000
Subject: [PATCH 1090/3183] support B02-B-A60

---
 config.schema.json        | 3 +++
 lib/device/light-ctemp.js | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/config.schema.json b/config.schema.json
index 16e2f329..521c833f 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -147,6 +147,9 @@
       "ZBDWBatt": {
         "type": "boolean"
       },
+      "bulbB02BA60": {
+        "type": "string"
+      },
       "bulbB02FST64": {
         "type": "string"
       },
diff --git a/lib/device/light-ctemp.js b/lib/device/light-ctemp.js
index bc8aa0de..7c78dbc8 100644
--- a/lib/device/light-ctemp.js
+++ b/lib/device/light-ctemp.js
@@ -21,6 +21,9 @@ module.exports = class deviceLightColour {
     if ((this.platform.config.bulbB02FST64 || '').split(',').includes(accessory.context.eweDeviceId)) {
       this.minK = 1800
       this.maxK = 5000
+    } else if ((this.platform.config.bulbB02BA60 || '').split(',').includes(accessory.context.eweDeviceId)) {
+      this.minK = 2700
+      this.maxK = 6500
     } else {
       this.minK = 2200
       this.maxK = 6500

From 04e87a77eee36c3a777eeccc84dab1971379f13d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 4 Jan 2021 18:54:06 +0000
Subject: [PATCH 1091/3183] bump node to 14.15.4

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 0d536083..77e3a861 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,7 @@
   "main": "lib/index.js",
   "engines": {
     "homebridge": "^1.1.6",
-    "node": "^14.15.3"
+    "node": "^14.15.4"
   },
   "repository": {
     "type": "git",

From 6260f628e587e7ed1e2c92dd1aeea6ac779db02a Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 5 Jan 2021 06:44:14 +0000
Subject: [PATCH 1092/3183] fix service update #178

---
 lib/device/usb.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/device/usb.js b/lib/device/usb.js
index 1b8cdc9e..70d40884 100644
--- a/lib/device/usb.js
+++ b/lib/device/usb.js
@@ -45,7 +45,7 @@ module.exports = class deviceUSB {
     try {
       if (!params.switches || params.switches[0].switch === this.cacheOnOff) return
       const newStatus = params.switches[0].switch === 'on'
-      this.switchService.updateCharacteristic(this.Characteristic.On, newStatus)
+      this.service.updateCharacteristic(this.Characteristic.On, newStatus)
       this.cacheOnOff = params.switches[0].switch
       this.accessory.eveService.addEntry({ status: newStatus ? 1 : 0 })
       if (params.updateSource) this.log('[%s] current state [%s].', this.accessory.displayName, params.switches[0].switch)

From ed1815a136008fa363a64e04f684a1f84ab9660d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 5 Jan 2021 06:51:49 +0000
Subject: [PATCH 1093/3183] switchAsOutlet option

---
 config.schema.json | 6 ++++++
 lib/index.js       | 4 +++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/config.schema.json b/config.schema.json
index 521c833f..adcf0719 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -76,6 +76,11 @@
         "title": "Hide Light/Switch Channels",
         "description": "A list of light/switch channels to hide. For example '10009553c8SW0' or multiple separated with a comma '10009553c8SW0,10009553c9SW2' (without the quotes)."
       },
+      "switchAsOutlet": {
+        "type": "string",
+        "title": "Switch As Outlet",
+        "description": "A list of switch devices to show as outlets. For example '10009553c8' or multiple separated with a comma '10009553c8,10009553c9' (without the quotes)."
+      },
       "outletAsSwitch": {
         "type": "string",
         "title": "Outlet As Switch",
@@ -395,6 +400,7 @@
       "items": [
         "hideDevFromHB",
         "hideChanFromHB",
+        "switchAsOutlet",
         "outletAsSwitch",
         "inUsePowerThreshold",
         "hideLightFromFan",
diff --git a/lib/index.js b/lib/index.js
index ac0a2cb1..e5418294 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -372,7 +372,9 @@ class eWeLinkPlatform {
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
           : this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require('./device/switch-single'))(this, accessory)
+        accessory.control = (this.config.switchAsOutlet || '').split(',').includes(device.deviceid)
+          ? new (require('./device/outlet'))(this, accessory)
+          : new (require('./device/switch-single'))(this, accessory)
         /***********************/
       } else if (this.helpers.devicesMultiSwitch.includes(device.extra.uiid)) {
         /***********************

From aa5d27b3a0515be4eddf0a4775aed503254fcb11 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 5 Jan 2021 06:53:01 +0000
Subject: [PATCH 1094/3183] 4.1.0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ba53312e..011710c9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.0.2",
+  "version": "4.1.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 77e3a861..26c21c23 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.0.2",
+  "version": "4.1.0",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 276df75112c1dff6295f9015191e851ad5e9c099 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 5 Jan 2021 07:32:51 +0000
Subject: [PATCH 1095/3183] clearer logging

---
 lib/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/index.js b/lib/index.js
index e5418294..ba7d64c3 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -778,7 +778,7 @@ class eWeLinkPlatform {
   }
 
   async deviceUpdateError (accessory, err, requestRefresh) {
-    this.log.warn('[%s] sending update failed as %s.', accessory.displayName, err.message)
+    this.log.warn('[%s] device update failed as %s.', accessory.displayName, err.message)
 
     // *** We only request a device refresh on failed internal updates (ie with 'set' handlers) *** \\
     if (!requestRefresh) return

From 94f7ae7771ae34201fb4e8ed612a8ce12df82798 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 5 Jan 2021 09:05:26 +0000
Subject: [PATCH 1096/3183] inc node-dns-sd

---
 lib/connection/lan.js               |   2 +-
 lib/node-dns-sd/LICENSE             |  21 +
 lib/node-dns-sd/dns-sd-classes.json |   6 +
 lib/node-dns-sd/dns-sd-composer.js  |  73 ++++
 lib/node-dns-sd/dns-sd-parser.js    | 343 ++++++++++++++++
 lib/node-dns-sd/dns-sd-types.json   |  52 +++
 lib/node-dns-sd/dns-sd.js           | 586 ++++++++++++++++++++++++++++
 package-lock.json                   |   5 -
 package.json                        |   4 +-
 9 files changed, 1084 insertions(+), 8 deletions(-)
 create mode 100644 lib/node-dns-sd/LICENSE
 create mode 100644 lib/node-dns-sd/dns-sd-classes.json
 create mode 100644 lib/node-dns-sd/dns-sd-composer.js
 create mode 100644 lib/node-dns-sd/dns-sd-parser.js
 create mode 100644 lib/node-dns-sd/dns-sd-types.json
 create mode 100644 lib/node-dns-sd/dns-sd.js

diff --git a/lib/connection/lan.js b/lib/connection/lan.js
index 19492810..f4c5603c 100644
--- a/lib/connection/lan.js
+++ b/lib/connection/lan.js
@@ -10,7 +10,7 @@ module.exports = class connectionLAN {
     this.ipOverride = platform.ipOverride
     this.deviceMap = new Map()
     this.crypto = require('crypto')
-    this.dns = require('node-dns-sd')
+    this.dns = require('./../node-dns-sd/dns-sd')
     this.emitter = new (require('events'))()
 
     // *** Create a template map with our device list from the HTTP client *** \\
diff --git a/lib/node-dns-sd/LICENSE b/lib/node-dns-sd/LICENSE
new file mode 100644
index 00000000..b412ce59
--- /dev/null
+++ b/lib/node-dns-sd/LICENSE
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2018-2020 Futomi Hatano
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
\ No newline at end of file
diff --git a/lib/node-dns-sd/dns-sd-classes.json b/lib/node-dns-sd/dns-sd-classes.json
new file mode 100644
index 00000000..d9f47867
--- /dev/null
+++ b/lib/node-dns-sd/dns-sd-classes.json
@@ -0,0 +1,6 @@
+{
+	"IN" : 1,
+	"CS" : 2,
+	"CH" : 3,
+	"HS" : 4
+}
\ No newline at end of file
diff --git a/lib/node-dns-sd/dns-sd-composer.js b/lib/node-dns-sd/dns-sd-composer.js
new file mode 100644
index 00000000..4ff70295
--- /dev/null
+++ b/lib/node-dns-sd/dns-sd-composer.js
@@ -0,0 +1,73 @@
+/* ------------------------------------------------------------------
+* node-dns-sd - dns-sd-composer.js
+*
+* Copyright (c) 2017, Futomi Hatano, All rights reserved.
+* Released under the MIT license
+* Date: 2018-10-25
+* ---------------------------------------------------------------- */
+'use strict';
+
+/* ------------------------------------------------------------------
+* Constructor: DnsSdComposer()
+* ---------------------------------------------------------------- */
+const DnsSdComposer = function() {
+	this._CLASSES = require('./dns-sd-classes.json');
+	this._TYPES = require('./dns-sd-types.json');
+};
+
+/* ------------------------------------------------------------------
+* Method: compose(params)
+* - params:
+*   - name    | Array  | Requred  | Servcie name.(e.g., ["_googlecast._tcp.local"])
+*   - type    | String | Optional | Query Type (e.g., "PTR"). The default value is "*"
+* ---------------------------------------------------------------- */
+DnsSdComposer.prototype.compose = function(params) {
+	let name_list = params['name'];
+	let type_name = params['type'];
+	let type_code = 0xff;
+	if(type_name) {
+		if(typeof(type_name) === 'string') {
+			if(this._TYPES[type_name]) {
+				type_code = this._TYPES[type_name];
+			} else {
+				throw new Error('The specified query type name is unknown: ' + type_name);
+			}
+		} else {
+			throw new Error('The specified query type is invalid.');
+		}
+	}
+
+	let hbuf = Buffer.from([ // Header
+		0x00, 0x00, // Transaction ID
+		0x00, 0x00, // Flags
+		0x00, name_list.length, // Questions
+		0x00, 0x00, // Answer PRs
+		0x00, 0x00, // Authority PRs
+		0x00, 0x00 // Additional PRs
+	]);
+
+	let qbuf_list = [];
+	name_list.forEach((name) => {
+		(name.split('.')).forEach((part) => {
+			let part_buf = Buffer.from(part, 'utf8');
+			qbuf_list.push(Buffer.from([part_buf.length]));
+			qbuf_list.push(part_buf);
+		});
+		qbuf_list.push(Buffer.from([0x00])); // Null-terminated string for the domain name
+
+		let type_buf = Buffer.alloc(2);
+		type_buf.writeUInt16BE(type_code, 0);
+		qbuf_list.push(type_buf);
+
+		let class_buf = Buffer.alloc(2);
+		class_buf.writeUInt16BE(this._CLASSES['IN'], 0);
+		qbuf_list.push(class_buf);
+	});
+	let qbuf = Buffer.concat(qbuf_list);
+
+	let buf = Buffer.concat([hbuf, qbuf]);
+	return buf;
+};
+
+module.exports = new DnsSdComposer();
+
diff --git a/lib/node-dns-sd/dns-sd-parser.js b/lib/node-dns-sd/dns-sd-parser.js
new file mode 100644
index 00000000..aa96ebab
--- /dev/null
+++ b/lib/node-dns-sd/dns-sd-parser.js
@@ -0,0 +1,343 @@
+/* ------------------------------------------------------------------
+* node-dns-sd - dns-sd-parser.js
+*
+* Copyright (c) 2018-2019, Futomi Hatano, All rights reserved.
+* Released under the MIT license
+* Date: 2018-02-27
+
+* Related specifications:
+* - RFC 1035 (DOMAIN NAMES - IMPLEMENTATION AND SPECIFICATION)
+*     https://tools.ietf.org/html/rfc1035
+* - RFC 6762 (Multicast DNS)
+*     https://tools.ietf.org/html/rfc6762
+* - RFC 6763 (DNS-Based Service Discovery)
+*     https://tools.ietf.org/html/rfc6763
+* - RFC 2782 (A DNS RR for specifying the location of services (DNS SRV))
+*     https://tools.ietf.org/html/rfc2782
+* ---------------------------------------------------------------- */
+'use strict';
+
+/* ------------------------------------------------------------------
+* Constructor: DnsSdParser()
+* ---------------------------------------------------------------- */
+const DnsSdParser = function() {
+	this._CLASSES = require('./dns-sd-classes.json');
+	this._CLASS_MAP = {};
+	Object.keys(this._CLASSES).forEach((k) => {
+		this._CLASS_MAP[this._CLASSES[k]] = k;
+	});
+
+	this._TYPES = require('./dns-sd-types.json');
+	this._TYPE_MAP = {};
+	Object.keys(this._TYPES).forEach((k) => {
+		this._TYPE_MAP[this._TYPES[k]] = k;
+	});
+};
+
+/* ------------------------------------------------------------------
+* Method: parse(buf)
+* ---------------------------------------------------------------- */
+DnsSdParser.prototype.parse = function(buf) {
+	if(buf.length <= 12) {
+		return null;
+	}
+	let header = {
+		id: buf.readUInt16BE(0),
+		qr: buf.readUInt8(2) >> 7, // 0: Query, 1: Response
+		op: (buf.readUInt8(2) & 0b01111000) >> 3, // 0: Normal query, 4: Notify, 5: Update
+		aa: (buf.readUInt8(2) & 0b00000100) >> 2,
+		tc: (buf.readUInt8(2) & 0b00000010) >> 1,
+		rd: (buf.readUInt8(2) & 0b00000001),
+		ra: (buf.readUInt8(3) & 0b10000000) >> 7,
+		z : (buf.readUInt8(3) & 0b01000000) >> 6,
+		ad: (buf.readUInt8(3) & 0b00100000) >> 6,
+		cd: (buf.readUInt8(3) & 0b00010000) >> 5,
+		rc: (buf.readUInt8(3) & 0b00001111),
+		questions  : buf.readUInt16BE(4),
+		answers    : buf.readUInt16BE(6),
+		authorities: buf.readUInt16BE(8),
+		additionals: buf.readUInt16BE(10)
+	};
+	if(header['tc'] !== 0 || header['rd'] !== 0 || header['ra'] !== 0 || header['z'] !== 0 || header['ad'] !== 0 || header['cd'] !== 0 || header['rc'] !== 0) {
+		return null;
+	}
+	if(header['questions'] + header['answers'] + header['authorities'] + header['additionals'] === 0) {
+		return null;
+	}
+	let offset = 12;
+	let records = {
+		header: header,
+		questions: [],
+		answers: [],
+		authorities: [],
+		additionals: []
+	};
+	let record_count_list = [];
+	['questions', 'answers', 'authorities', 'additionals'].forEach((k) => {
+		let cnt = header[k];
+		if(cnt > 0) {
+			record_count_list.push({name: k, count: cnt});
+		}
+	});
+	let invalid = false;
+	while(true) {
+		let domain_name_parts = [];
+		let parsed = this._parseLabel(buf, offset);
+		let domain_name = '';
+		if(parsed) {
+			offset += parsed['length'];
+			domain_name = parsed['name'];
+		} else {
+			invalid = true;
+			break;
+		}
+
+		let record_key = record_count_list[0]['name'];
+		if(record_key === 'questions') {
+			if(offset + 4 > buf.length) {
+				invalid = true;
+				break;
+			}
+			let type_value = buf.readUInt16BE(offset);
+			let type = this._TYPE_MAP[type_value];
+			offset += 2;
+			let cls_value = buf.readUInt16BE(offset);
+			let cls = this._CLASS_MAP[cls_value];
+			offset += 2;
+			records[record_key].push({
+				name  : domain_name,
+				type  : type || '',
+				class : cls || ''
+			});
+		} else {
+			if(offset + 10 > buf.length) {
+				invalid = true;
+				break;
+			}
+			let type_value = buf.readUInt16BE(offset);
+			let type = this._TYPE_MAP[type_value] || '';
+			offset += 2;
+			let cls_value = buf.readUInt16BE(offset);
+			let cls = this._CLASS_MAP[cls_value & 0b0111111111111111];
+			let flash = (cls_value & 0b1000000000000000) ? true : false;
+			offset += 2;
+			let ttl = buf.readUInt32BE(offset);
+			offset += 4;
+			let rdlen = buf.readUInt16BE(offset);
+			offset += 2;
+			if(offset + rdlen > buf.length) {
+				invalid = true;
+				break;
+			}
+			let rdata = '';
+			let rdbuf = buf.slice(offset, offset + rdlen);
+			let rdata_txt_buffer = null;
+			if(type === 'A') {
+				rdata = this._parseRdataA(buf, offset, rdlen);
+			} else if(type === 'AAAA') {
+				rdata = this._parseRdataAAAA(buf, offset, rdlen);
+			} else if(type === 'PTR') {
+				rdata = this._parseRdataPtr(buf, offset, rdlen);
+			} else if(type === 'TXT') {
+				rdata = this._parseRdataTxt(buf, offset, rdlen);
+				rdata_txt_buffer = this._parseRdataTxt(buf, offset, rdlen, true);
+			} else if(type === 'SRV') {
+				rdata = this._parseRdataSrv(buf, offset, rdlen);
+			} else if(type === 'HINFO') {
+				rdata = this._parseRdataHinfo(buf, offset, rdlen);
+			} else {
+				rdata = this._parseRdataOther(buf, offset, rdlen);
+			}
+			offset += rdlen;
+
+			if(!rdata) {
+				invalid = true;
+				break;
+			}
+
+			let d = {	
+				name  : domain_name,
+				type  : type || '',
+				class : cls || '',
+				flash : flash,
+				ttl   : ttl,
+				rdata : rdata
+			};
+			if(rdata_txt_buffer) {
+				d['rdata_buffer'] = rdata_txt_buffer;
+			}
+			records[record_key].push(d);
+		}
+
+		if(offset >= buf.length) {
+			break;
+		}
+		record_count_list[0]['count'] --;
+		if(record_count_list[0]['count'] <= 0) {
+			record_count_list.shift();
+		}
+		if(record_count_list.length === 0) {
+			break;
+		}
+	}
+	if(invalid === true) {
+		return null;
+	} else {
+		return records;
+	};
+};
+
+DnsSdParser.prototype._parseLabel = function(buf, offset) {
+	let labels = [];
+	let length = 0;
+	let invalid = false;
+	while(true) {
+		let label_len = buf.readUInt8(offset + length);
+		if((label_len & 0b11000000) === 0b11000000) {
+			let i = buf.readUInt16BE(offset + length) & 0b0011111111111111;
+			let parsed = this._parseLabel(buf, i);
+			if(parsed) { 
+				labels.push(parsed['name']);
+				length += 2;
+				break;
+			} else {
+				invalid = true;
+				break;
+			}
+		} else if((label_len & 0b11000000) === 0b00000000) {
+			length += 1;
+			if(label_len === 0x00) {
+				break;
+			} else if(offset + length + label_len <= buf.length) {
+				let label = buf.slice(offset + length, offset + length + label_len).toString('utf8');
+				labels.push(label);
+				length += label_len;
+			} else {
+				invalid = true;
+				break;
+			}
+		} else {
+			invalid = true;
+			break;
+		}
+	}
+	if(invalid === true) {
+		return null;
+	} else {
+		return {
+			name   : labels.join('.'),
+			length : length
+		};
+	}
+};
+
+DnsSdParser.prototype._parseRdataA = function(buf, offset, len) {
+	let addr_parts = [];
+	for(let i=0; i<len; i++) {
+		addr_parts.push(buf.readUInt8(offset + i));
+	}
+	let addr = addr_parts.join('.');
+	return addr;
+};
+
+DnsSdParser.prototype._parseRdataAAAA = function(buf, offset, len) {
+	let addr_parts = [];
+	for(let i=0; i<len; i+=2) {
+		addr_parts.push(buf.slice(offset + i, offset + i + 2).toString('hex'));
+	}
+	let addr = addr_parts.join(':');
+	return addr;
+};
+
+DnsSdParser.prototype._parseRdataPtr = function(buf, offset, len) {
+	let parsed = this._parseLabel(buf, offset);
+	if(parsed) {
+		return parsed['name'];
+	} else {
+		return null;
+	}
+};
+
+DnsSdParser.prototype._parseRdataTxt = function(buf, offset, len, buf_flag) {
+	let labels = {};
+	let i = 0;
+	while(true) {
+		if(i >= len) {
+			break;
+		}
+		let blen = buf.readUInt8(offset + i);
+		i += 1;
+		if(i + blen <= len) {
+			let pair = buf.slice(offset + i, offset + i + blen).toString('utf8');
+			let m = pair.match(/^([^\=]+)\=(.*)/);
+			if(m) {
+				labels[m[1]] = m[2];
+				if(buf_flag) {
+					let s = offset + i + m[1].length + 1;
+					let e = offset + i + blen;
+					labels[m[1]] = buf.slice(s, e);
+				}
+			}
+			i += blen;
+		} else {
+			break;
+		}
+	}
+	return labels;
+};
+
+DnsSdParser.prototype._parseRdataSrv = function(buf, offset, len) {
+	if(len <= 6) {
+		return null;
+	}
+	let target = null;
+	let parsed = this._parseLabel(buf, offset + 6);
+	if(parsed) {
+		target = parsed['name'];
+	}
+	return {
+		priority : buf.readUInt16BE(offset),
+		weight   : buf.readUInt16BE(offset + 2),
+		port     : buf.readUInt16BE(offset + 4),
+		target   : target
+	};
+};
+
+DnsSdParser.prototype._parseRdataHinfo = function(buf, offset, len) {
+	let txt_list = [];
+	let i = 0;
+	while(true) {
+		if(i >= len) {
+			break;
+		}
+		let blen = buf.readUInt8(offset + i);
+		i += 1;
+		if(i + blen <= len) {
+			let v = buf.slice(offset + i, offset + i + blen).toString('utf8');
+			txt_list.push(v);
+			i += blen;
+		} else {
+			break;
+		}
+	}
+	let info = {};
+	if(txt_list[0]) {
+		info['cpu'] = txt_list[0];
+	}
+	if(txt_list[1]) {
+		info['os'] = txt_list[1];
+	}
+	return info;
+};
+
+DnsSdParser.prototype._parseRdataOther = function(buf, offset, len) {
+	let rdata_parts = [];
+	for(let i=0; i<len; i++) {
+		rdata_parts.push(buf.slice(offset + i, offset + i + 1).toString('hex'));
+	}
+	let rdata = rdata_parts.join(' ');
+	return rdata;
+};
+
+module.exports = new DnsSdParser();
+
diff --git a/lib/node-dns-sd/dns-sd-types.json b/lib/node-dns-sd/dns-sd-types.json
new file mode 100644
index 00000000..430ae5c4
--- /dev/null
+++ b/lib/node-dns-sd/dns-sd-types.json
@@ -0,0 +1,52 @@
+{
+	"A" : 1,
+	"NS" : 2,
+	"MD" : 3,
+	"MF" : 4,
+	"CNAME" : 5,
+	"SOA" : 6,
+	"MB" : 7,
+	"MG" : 8,
+	"MR" : 9,
+	"NULL" : 10,
+	"WKS" : 11,
+	"PTR" : 12,
+	"HINFO" : 13,
+	"MINFO" : 14,
+	"MX" : 15,
+	"TXT" : 16,
+	"AAAA" : 28,
+	"AFSDB" : 18,
+	"APL" : 42,
+	"CAA" : 257,
+	"CDNSKEY" : 60,
+	"CDS" : 59,
+	"CERT" : 37,
+	"DHCID" : 49,
+	"DLV" : 32769,
+	"DNAME" : 39,
+	"DNSKEY" : 48,
+	"DS" : 43,
+	"HIP" : 55,
+	"IPSECKEY" : 45,
+	"KEY" : 25,
+	"KX" : 36,
+	"LOC" : 29,
+	"NAPTR" : 35,
+	"NSEC" : 47,
+	"NSEC3" : 50,
+	"NSEC3PARAM" : 51,
+	"OPENPGPKEY" : 61,
+	"RRSIG" : 46,
+	"RP" : 17,
+	"SIG" : 24,
+	"SRV" : 33,
+	"SSHFP" : 44,
+	"TA" : 32768,
+	"TKEY" : 249,
+	"TLSA" : 52,
+	"TSIG" : 250,
+	"URI" : 256,
+	"OPT": 41,
+	"*": 255
+}
\ No newline at end of file
diff --git a/lib/node-dns-sd/dns-sd.js b/lib/node-dns-sd/dns-sd.js
new file mode 100644
index 00000000..d6aa36d8
--- /dev/null
+++ b/lib/node-dns-sd/dns-sd.js
@@ -0,0 +1,586 @@
+/* ------------------------------------------------------------------
+* node-dns-sd - dns-sd.js
+*
+* Copyright (c) 2018 - 2020, Futomi Hatano, All rights reserved.
+* Released under the MIT license
+* Date: 2020-09-30
+* ---------------------------------------------------------------- */
+'use strict';
+const mDgram = require('dgram');
+const mOs = require('os');
+const mDnsSdParser = require('./dns-sd-parser.js');
+const mDnsSdComposer = require('./dns-sd-composer.js');
+
+/* ------------------------------------------------------------------
+* Constructor: DnsSd()
+* ---------------------------------------------------------------- */
+const DnsSd = function () {
+	// Public
+	this.ondata = () => { };
+
+	// Private
+	this._MULTICAST_ADDR = '224.0.0.251';
+	this._UDP_PORT = 5353;
+	this._DISCOVERY_WAIT_DEFAULT = 3; // sec
+
+	this._udp = null;
+	this._source_address_list = [];
+	this._discovered_devices = {};
+	this._is_discovering = false;
+	this._is_monitoring = false;
+	this._is_listening = false;
+	this._onreceive = () => { };
+};
+
+/* ------------------------------------------------------------------
+* Method: discover(params)
+* - params   | Object    | Required |
+*   - name   | String or | Required | Servcie name.(e.g., "_googlecast._tcp.local")
+*            | Array     |          |
+*   - type   | String    | Optional | Query Type (e.g., "PTR"). The default value is "*".
+*   - key    | String    | Optional | "address" (default) or "fqdn".
+*            |           |          | - "address": IP address based discovery
+*            |           |          | - "fqdn": FQDN (service) based discovery
+*   - wait   | Integer   | Optional | Duration of monitoring. The default value is 3 (sec).
+*   - quick  | Boolean   | Optional | If `true`, this method returns immediately after
+*            |           |          | a device was found ignoring the value of the `wait`.
+*            |           |          | The default value is `false`.
+*   - filter | String or | Optional | If specified as a string, this method discovers only
+*            | Function  |          | devices which the string is found in the `fqdn`,
+*            |           |          | `address`, `modelName` or `familyName`.
+*            |           |          | If specified as a function, this method discovers 
+*            |           |          | only devices for which the function returns `true`. 
+* ---------------------------------------------------------------- */
+DnsSd.prototype.discover = function (params) {
+	let promise = new Promise((resolve, reject) => {
+		if (this._is_discovering === true) {
+			reject(new Error('The discovery process is running.'));
+			return;
+		}
+		// Check the parameters
+		let res = this._checkDiscoveryParameters(params);
+		if (res['error']) {
+			reject(res['error']);
+			return;
+		}
+		let device_list = [];
+		this._startListening().then(() => {
+			return this._startDiscovery(res['params']);
+		}).then(() => {
+			for (let addr in this._discovered_devices) {
+				let device = this._discovered_devices[addr];
+				device_list.push(device);
+			}
+			this._stopDiscovery().then(() => {
+				resolve(device_list);
+			});
+		}).catch((error) => {
+			this._stopDiscovery().then(() => {
+				reject(error);
+			});
+		});
+	});
+	return promise;
+};
+
+DnsSd.prototype._createDeviceObject = function (packet) {
+	let o = {};
+
+	let trecs = {};
+	['answers', 'authorities', 'additionals'].forEach((k) => {
+		packet[k].forEach((r) => {
+			let type = r['type'];
+			if (!trecs[type]) {
+				trecs[type] = [];
+			}
+			trecs[type].push(r);
+		});
+	});
+
+	o['address'] = null;
+	if (trecs['A']) {
+		o['address'] = trecs['A'][0]['rdata'];
+	}
+	if (!o['address']) {
+		o['address'] = packet['address'];
+	}
+
+	o['fqdn'] = null;
+	let hostname = null;
+	if (trecs['PTR']) {
+		let rec = trecs['PTR'][0];
+		o['fqdn'] = rec['rdata'];
+	}
+
+	o['modelName'] = null;
+	o['familyName'] = null;
+	if (trecs['TXT'] && trecs['TXT'][0] && trecs['TXT'][0]['rdata']) {
+		let r = trecs['TXT'][0];
+		let d = r['rdata'] || {};
+		let name = r['name'] || '';
+		if (/Apple TV/.test(name)) {
+			o['modelName'] = 'Apple TV';
+			if (trecs['TXT']) {
+				for (let i = 0; i < trecs['TXT'].length; i++) {
+					let r = trecs['TXT'][i];
+					if ((/_device-info/).test(r['name']) && r['rdata'] && r['rdata']['model']) {
+						o['modelName'] = 'Apple TV ' + r['rdata']['model'];
+						break;
+					}
+				}
+			}
+		} else if (/_googlecast/.test(name)) {
+			o['modelName'] = d['md'] || null;
+			o['familyName'] = d['fn'] || null;
+		} else if (/Philips hue/.test(name)) {
+			o['modelName'] = 'Philips hue';
+			if (d['md']) {
+				o['modelName'] += ' ' + d['md'];
+			}
+		} else if (/Canon/.test(name)) {
+			o['modelName'] = d['ty'] || null;
+		}
+	}
+	if (!o['modelName']) {
+		if (trecs['A'] && trecs['A'][0]) {
+			let r = trecs['A'][0];
+			let name = r['name'];
+			if (/Apple\-TV/.test(name)) {
+				o['modelName'] = 'Apple TV';
+			} else if (/iPad/.test(name)) {
+				o['modelName'] = 'iPad';
+			}
+		}
+	}
+
+	if (!o['modelName']) {
+		if (o['fqdn']) {
+			let hostname = (o['fqdn'].split('.')).shift();
+			if (hostname && / /.test(hostname)) {
+				o['modelName'] = hostname;
+			}
+		}
+	}
+
+	o['service'] = null;
+	if (trecs['SRV']) {
+		let rec = trecs['SRV'][0];
+		let name_parts = rec['name'].split('.');
+		name_parts.reverse();
+		o['service'] = {
+			port: rec['rdata']['port'],
+			protocol: name_parts[1].replace(/^_/, ''),
+			type: name_parts[2].replace(/^_/, '')
+		};
+	}
+
+	o['packet'] = packet;
+	return o;
+};
+
+DnsSd.prototype._checkDiscoveryParameters = function (params) {
+	let p = {};
+	if (params) {
+		if (typeof (params) !== 'object') {
+			return { error: new Error('The argument `params` is invalid.') };
+		}
+	} else {
+		return { error: new Error('The argument `params` is required.') };
+	}
+
+	if ('name' in params) {
+		let v = params['name'];
+		if (typeof (v) === 'string') {
+			if (v === '') {
+				return { error: new Error('The `name` must be an non-empty string.') };
+			}
+			p['name'] = [v];
+		} else if (Array.isArray(v)) {
+			if (v.length === 0) {
+				return { error: new Error('The `name` must be a non-empty array.') };
+			} else if (v.length > 255) {
+				return { error: new Error('The `name` can include up to 255 elements.') };
+			}
+			let err = null;
+			let list = [];
+			for (let i = 0; i < v.length; i++) {
+				if (typeof (v[i]) === 'string' && v[i] !== '') {
+					list.push(v[i]);
+				} else {
+					err = new Error('The `name` must be an Array object including non-empty strings.');
+					break;
+				}
+			}
+			if (err) {
+				return { error: err };
+			}
+			p['name'] = list;
+		} else {
+			return { error: new Error('The `name` must be a string or an Array object.') };
+		}
+	} else {
+		return { error: new Error('The `name` is required.') };
+	}
+
+
+	if ('type' in params) {
+		let v = params['type'];
+		if (typeof (v) !== 'string' || !(/^[a-zA-Z0-9]{1,10}$/.test(v) || v === '*')) {
+			return { error: new Error('The `type` is invalid.') };
+		}
+		p['type'] = v.toUpperCase();
+	}
+
+	if ('key' in params) {
+		let v = params['key'];
+		if (typeof (v) !== 'string' || !/^(address|fqdn)$/.test(v)) {
+			return { error: new Error('The `key` is invalid.') };
+		}
+		if (!v) {
+			v = 'address';
+		}
+		p['key'] = v;
+	}
+
+	if ('wait' in params) {
+		let v = params['wait'];
+		if (typeof (v) !== 'number' || v <= 0 || v % 1 !== 0) {
+			return { error: new Error('The `wait` is invalid.') };
+		}
+		p['wait'] = v;
+	}
+
+	if ('quick' in params) {
+		let v = params['quick'];
+		if (typeof (v) !== 'boolean') {
+			return { error: new Error('The `quick` must be a boolean.') };
+		}
+		p['quick'] = v;
+	} else {
+		p['quick'] = false;
+	}
+
+	if (`filter` in params) {
+		let v = params['filter'];
+		if (typeof (v) !== 'string' && typeof (v) !== 'function') {
+			return { error: new Error('The `filter` must be a string.') };
+		}
+		if (v) {
+			p['filter'] = v;
+		}
+	}
+
+	return { params: p };
+};
+
+DnsSd.prototype._startDiscovery = function (params) {
+	let promise = new Promise((resolve, reject) => {
+		this._discovered_devices = {};
+		this._is_discovering = true;
+		let wait = (params && params['wait']) ? params['wait'] : this._DISCOVERY_WAIT_DEFAULT;
+		// Create a request packet
+		let buf = mDnsSdComposer.compose({
+			name: params['name'],
+			type: params['type']
+		});
+
+		// Timer
+		let send_timer = null;
+		let wait_timer = null;
+
+		let clearTimer = () => {
+			if (send_timer) {
+				clearTimeout(send_timer);
+				send_timer = null;
+			}
+			if (wait_timer) {
+				clearTimeout(wait_timer);
+				wait_timer = null;
+			}
+			this._onreceive = () => { };
+		};
+
+		wait_timer = setTimeout(() => {
+			clearTimer();
+			resolve();
+		}, wait * 1000);
+
+		let quick = params['quick'];
+		let key = params['key'];
+		if (!key) {
+			key = 'address';
+		}
+		this._onreceive = (addr, packet) => {
+			if (!this._isTargettedDevice(packet, params['name'])) {
+				return;
+			}
+			let device = this._createDeviceObject(packet);
+			if (!this._evaluateDeviceFilter(device, params['filter'])) {
+				return;
+			}
+			if (key === 'fqdn') {
+				let fqdn = device['fqdn'];
+				this._discovered_devices[fqdn] = device;
+			} else {
+				this._discovered_devices[addr] = device;
+			}
+			if (quick) {
+				clearTimer();
+				resolve();
+			}
+		};
+
+		// Send a packet
+		let send_num = 0;
+		let sendQueryPacket = () => {
+			this._udp.send(buf, 0, buf.length, this._UDP_PORT, this._MULTICAST_ADDR, (error, bytes) => {
+				if (error) {
+					clearTimer();
+					reject(error);
+				} else {
+					send_num++;
+					if (send_num < 3) {
+						send_timer = setTimeout(() => {
+							sendQueryPacket();
+						}, 1000);
+					} else {
+						send_timer = null;
+					}
+				}
+			});
+		};
+		sendQueryPacket();
+	});
+	return promise;
+};
+
+DnsSd.prototype._isTargettedDevice = function (packet, name_list) {
+	let hit = false;
+	packet['answers'].forEach((ans) => {
+		let name = ans['name'];
+		if (name && name_list.indexOf(name) >= 0) {
+			hit = true;
+		}
+	});
+	return hit;
+};
+
+DnsSd.prototype._evaluateDeviceFilter = function (device, filter) {
+	if (filter) {
+		let filter_type = typeof (filter);
+		if (filter_type === 'string') {
+			return this._evaluateDeviceFilterString(device, filter);
+		} else if (filter_type === 'function') {
+			return this._evaluateDeviceFilterFunction(device, filter);
+		} else {
+			return false;
+		}
+	} else {
+		return true;
+	}
+};
+
+DnsSd.prototype._evaluateDeviceFilterString = function (device, filter) {
+	if (device['fqdn'] && device['fqdn'].indexOf(filter) >= 0) {
+		return true;
+	}
+	if (device['address'] && device['address'].indexOf(filter) >= 0) {
+		return true;
+	}
+	if (device['modelName'] && device['modelName'].indexOf(filter) >= 0) {
+		return true;
+	}
+	if (device['familyName'] && device['familyName'].indexOf(filter) >= 0) {
+		return true;
+	}
+	return false;
+};
+
+DnsSd.prototype._evaluateDeviceFilterFunction = function (device, filter) {
+	let res = false;
+	try {
+		res = filter(device);
+	} catch (e) { }
+	res = res ? true : false;
+	return res;
+};
+
+DnsSd.prototype._stopDiscovery = function () {
+	let promise = new Promise((resolve, reject) => {
+		this._discovered_devices = {};
+		this._is_discovering = false;
+		this._stopListening().then(() => {
+			resolve();
+		}).catch((error) => {
+			resolve();
+		});
+	});
+	return promise;
+};
+
+DnsSd.prototype._addMembership = function () {
+	this._source_address_list.forEach((netif) => {
+		try {
+			this._udp.addMembership(this._MULTICAST_ADDR, netif);
+		} catch(e) {
+			console.log(`Catching error on address already in use: ${JSON.stringify(e)}`);
+		}
+	});
+};
+
+DnsSd.prototype._dropMembership = function () {
+	this._source_address_list.forEach((netif) => {
+		try {
+			this._udp.dropMembership(this._MULTICAST_ADDR, netif);
+		} catch(e) {
+			console.log(`Catching error on dropMembership: ${JSON.stringify(e)}`);
+		}
+	});
+};
+
+DnsSd.prototype._getSourceAddressList = function () {
+	let list = [];
+	let netifs = mOs.networkInterfaces();
+	for (let dev in netifs) {
+		netifs[dev].forEach((info) => {
+			if (info.family === 'IPv4' && info.internal === false) {
+				let m = info.address.match(/^(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})/);
+				if (m) {
+					list.push(m[1]);
+				}
+			}
+		});
+	}
+	return list;
+};
+
+/* ------------------------------------------------------------------
+* Method: startMonitoring()
+* ---------------------------------------------------------------- */
+DnsSd.prototype.startMonitoring = function () {
+	let promise = new Promise((resolve, reject) => {
+		if (this._is_monitoring === true) {
+			resolve();
+			return;
+		}
+		this._startListening().then(() => {
+			this._is_monitoring = true;
+			resolve();
+		}).catch((error) => {
+			this._is_monitoring = false;
+			this._stopListening().then(() => {
+				reject(error);
+			});
+		});
+	});
+	return promise;
+};
+
+/* ------------------------------------------------------------------
+* Method: stopMonitoring()
+* ---------------------------------------------------------------- */
+DnsSd.prototype.stopMonitoring = function () {
+	let promise = new Promise((resolve, reject) => {
+		this._is_monitoring = false;
+		this._stopListening().then(() => {
+			resolve();
+		}).catch((error) => {
+			resolve();
+		});
+	});
+	return promise;
+};
+
+DnsSd.prototype._startListening = function () {
+	let promise = new Promise((resolve, reject) => {
+		if (this._is_listening === true) {
+			resolve();
+			return;
+		}
+		// Get the source IP address
+		this._source_address_list = this._getSourceAddressList();
+		// Set up a UDP tranceiver
+		this._udp = mDgram.createSocket({
+			type: 'udp4',
+			reuseAddr: true
+		});
+		this._udp.once('error', (error) => {
+			this._is_listening = false;
+			reject(error);
+			return;
+		});
+		this._udp.once('listening', () => {
+			this._udp.setMulticastLoopback(false);
+			this._addMembership();
+			this._is_listening = true;
+			resolve();
+			return;
+		});
+		this._udp.on('message', (buf, rinfo) => {
+			this._receivePacket(buf, rinfo);
+		});
+		this._udp.bind({ port: this._UDP_PORT }, () => {
+			this._udp.removeAllListeners('error');
+		});
+	});
+	return promise;
+};
+
+DnsSd.prototype._stopListening = function () {
+	let promise = new Promise((resolve, reject) => {
+		this._dropMembership();
+		if (this._is_discovering || this._is_monitoring) {
+			resolve();
+		} else {
+			let cleanObj = () => {
+				if (this._udp) {
+					this._udp.unref();
+					this._udp = null;
+				}
+				this._is_listening = false;
+				resolve();
+			};
+			if (this._udp) {
+				this._udp.removeAllListeners('message');
+				this._udp.removeAllListeners('error');
+				this._udp.removeAllListeners('listening');
+				this._udp.close(() => {
+					cleanObj();
+				});
+			} else {
+				cleanObj();
+			}
+		}
+	});
+	return promise;
+};
+
+DnsSd.prototype._receivePacket = function (buf, rinfo) {
+	let p = mDnsSdParser.parse(buf);
+	if (!p) {
+		return;
+	}
+	p['address'] = rinfo.address;
+	if (this._is_discovering) {
+		if (this._isAnswerPacket(p, rinfo.address)) {
+			this._onreceive(rinfo.address, p);
+		}
+	}
+	if (this._is_monitoring) {
+		if (typeof (this.ondata) === 'function') {
+			this.ondata(p);
+		}
+	}
+};
+
+DnsSd.prototype._isAnswerPacket = function (p, address) {
+	if (this._source_address_list.indexOf(address) >= 0) {
+		return false;
+	}
+	if (!(p['header']['qr'] === 1 && p['header']['op'] === 0)) {
+		return false;
+	}
+	return true;
+};
+
+module.exports = new DnsSd();
diff --git a/package-lock.json b/package-lock.json
index 011710c9..2d4e0001 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -126,11 +126,6 @@
         "has-symbols": "^1.0.1"
       }
     },
-    "node-dns-sd": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/node-dns-sd/-/node-dns-sd-0.4.2.tgz",
-      "integrity": "sha512-fZvDqy19zyaiSXajmRjwue1VWLrJcy8bTV/LJVtAx8DeEFVlXRBMyZknW+q6CEfiW8Y4MQDDKh9x5wF32BHAHQ=="
-    },
     "object-inspect": {
       "version": "1.9.0",
       "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.9.0.tgz",
diff --git a/package.json b/package.json
index 26c21c23..9327798e 100644
--- a/package.json
+++ b/package.json
@@ -48,13 +48,13 @@
   "dependencies": {
     "@homebridge/plugin-ui-utils": "^0.0.17",
     "axios": "^0.21.1",
-    "node-dns-sd": "^0.4.2",
     "websocket-as-promised": "^1.1.0",
     "ws": "^7.4.2"
   },
   "standard": {
     "ignore": [
-      "/lib/fakegato/"
+      "/lib/fakegato/",
+      "/lib/node-dns-sd/"
     ]
   }
 }

From fd28c6bd164c0811c2a1b28e070db15ced412c41 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 5 Jan 2021 14:22:16 +0000
Subject: [PATCH 1097/3183] tap AS

---
 config.schema.json    |  8 ++++++-
 lib/device/tap-one.js | 50 +++++++++++++++++++++++++++++++++++++++++++
 lib/index.js          | 45 +++++++++++++++++---------------------
 lib/utils/helpers.js  |  4 ++--
 4 files changed, 79 insertions(+), 28 deletions(-)
 create mode 100644 lib/device/tap-one.js

diff --git a/config.schema.json b/config.schema.json
index adcf0719..e0e0f7f6 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -209,6 +209,12 @@
                     "lock"
                   ]
                 },
+                {
+                  "title": "1 Tap/Faucet (using single channel device)",
+                  "enum": [
+                    "tap"
+                  ]
+                },
                 {
                   "title": "1 Irrigation Valve (using single-channel device)",
                   "enum": [
@@ -256,7 +262,7 @@
               "title": "Operation Time (Deciseconds)",
               "description": "Blinds/garage doors: the time to open/close the device. Locks: the time to show as unlocked. This setting is in deciseconds - count the time in seconds and multiply by 10, for example 75 for 7.5 seconds.",
               "condition": {
-                "functionBody": "return (model.groups[arrayIndices] && !['valve', 'valve_two', 'switch_valve'].includes(model.groups[arrayIndices].type))"
+                "functionBody": "return (model.groups[arrayIndices] && !['tap_one', 'valve', 'valve_two', 'switch_valve'].includes(model.groups[arrayIndices].type))"
               },
               "placeholder": 100,
               "minimum": 10,
diff --git a/lib/device/tap-one.js b/lib/device/tap-one.js
new file mode 100644
index 00000000..3eeb260c
--- /dev/null
+++ b/lib/device/tap-one.js
@@ -0,0 +1,50 @@
+/* jshint -W014, -W033, esversion: 9 */
+/* eslint-disable new-cap */
+'use strict'
+module.exports = class deviceTapOne {
+  constructor (platform, accessory) {
+    this.platform = platform
+    this.log = platform.log
+    this.helpers = platform.helpers
+    this.Service = platform.api.hap.Service
+    this.Characteristic = platform.api.hap.Characteristic
+    if (!(this.service = accessory.getService(this.Service.Valve))) {
+      this.service = accessory.addService(this.Service.Valve)
+      this.service
+        .setCharacteristic(this.Characteristic.Active, 0)
+        .setCharacteristic(this.Characteristic.InUse, 0)
+        .setCharacteristic(this.Characteristic.ValveType, 3)
+    }
+    this.service
+      .getCharacteristic(this.Characteristic.Active)
+      .on('set', this.internalUpdate.bind(this))
+    this.accessory = accessory
+  }
+
+  async internalUpdate (value, callback) {
+    try {
+      callback()
+      await this.platform.sendDeviceUpdate(this.accessory, {
+        switch: value ? 'on' : 'off'
+      })
+      this.cacheOnOff = value ? 'on' : 'off'
+      this.service.updateCharacteristic(this.Characteristic.InUse, value)
+      this.log('[%s] current state [%s].', this.accessory.displayName, this.cacheOnOff)
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, true)
+    }
+  }
+
+  async externalUpdate (params) {
+    try {
+      if (!params.switch || params.switch === this.cacheOnOff) return
+      const newStatus = params.switch === 'on'
+      this.service.updateCharacteristic(this.Characteristic.Active, newStatus ? 1 : 0)
+      this.service.updateCharacteristic(this.Characteristic.InUse, newStatus ? 1 : 0)
+      this.cacheOnOff = params.switch
+      if (params.updateSource) this.log('[%s] current state [%s].', this.accessory.displayName, this.cacheOnOff)
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, false)
+    }
+  }
+}
diff --git a/lib/index.js b/lib/index.js
index ba7d64c3..f920bb8a 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -82,7 +82,7 @@ class eWeLinkPlatform {
         this.config.groups
           .filter(g => this.helpers.hasProperty(g, 'type') && this.helpers.allowedGroups.includes(g.type))
           .filter(g => this.helpers.hasProperty(g, 'deviceId') && this.devicesInEW.has(g.deviceId))
-          .forEach(g => this.cusG.set(g.deviceId + 'SWX', g))
+          .forEach(g => this.cusG.set(g.deviceId, g))
       }
 
       // *** Check for valid custom RF Bridge sensors and add to cusS for later use *** \\
@@ -161,20 +161,6 @@ class eWeLinkPlatform {
     let accessory
     let oAccessory
     try {
-      // *** Remove old switch services for new Accessory Simulations *** \\
-      if (this.cusG.has(device.deviceid + 'SWX')) {
-        const arrToCheck = this.cusG.has(device.deviceid + 'SWX').type === 'switch_valve'
-          ? ['0', '1']
-          : ['X', '0', '1', '2', '3', '4']
-        arrToCheck.forEach(sw => {
-          if (this.devicesInHB.has(device.deviceid + 'SW' + sw)) {
-            if (this.devicesInHB.get(device.deviceid + 'SW' + sw).getService(this.Service.Switch)) {
-              this.removeAccessory(this.devicesInHB.get(device.deviceid + 'SW' + sw))
-            }
-          }
-        })
-      }
-
       // *** Set up the correct instance for this particular device *** \\
       if (this.helpers.devicesCurtain.includes(device.extra.uiid)) {
         /***********************
@@ -185,7 +171,7 @@ class eWeLinkPlatform {
           : this.addAccessory(device, device.deviceid + 'SWX', false, this.helpers.defaultCurtainCache)
         accessory.control = new (require('./device/curtain'))(this, accessory)
         /**********************/
-      } else if (this.cusG.has(device.deviceid + 'SWX') && this.cusG.get(device.deviceid + 'SWX').type === 'blind') {
+      } else if (this.cusG.has(device.deviceid) && this.cusG.get(device.deviceid).type === 'blind') {
         /****************************
         BLINDS [ACCESSORY SIMULATION]
         ****************************/
@@ -194,7 +180,7 @@ class eWeLinkPlatform {
           : this.addAccessory(device, device.deviceid + 'SWX', false, this.helpers.defaultBlindCache)
         accessory.control = new (require('./device/blind'))(this, accessory)
         /***************************/
-      } else if (this.cusG.has(device.deviceid + 'SWX') && this.cusG.get(device.deviceid + 'SWX').type === 'garage') {
+      } else if (this.cusG.has(device.deviceid) && this.cusG.get(device.deviceid).type === 'garage') {
         /**********************************
         GARAGE DOORS [ONE] [ACCESSORY SIMULATION]
         **********************************/
@@ -203,7 +189,7 @@ class eWeLinkPlatform {
           : this.addAccessory(device, device.deviceid + 'SWX', false, this.helpers.defaultGarageCache)
         accessory.control = new (require('./device/garage-one'))(this, accessory)
         /*********************************/
-      } else if (this.cusG.has(device.deviceid + 'SWX') && this.cusG.get(device.deviceid + 'SWX').type === 'garage_two') {
+      } else if (this.cusG.has(device.deviceid) && this.cusG.get(device.deviceid).type === 'garage_two') {
         /**********************************
         GARAGE DOORS [TWO] [ACCESSORY SIMULATION]
         **********************************/
@@ -212,7 +198,7 @@ class eWeLinkPlatform {
           : this.addAccessory(device, device.deviceid + 'SWX', false, this.helpers.defaultGarageTwoCache)
         accessory.control = new (require('./device/garage-two'))(this, accessory)
         /*********************************/
-      } else if (this.cusG.has(device.deviceid + 'SWX') && this.cusG.get(device.deviceid + 'SWX').type === 'garage_four') {
+      } else if (this.cusG.has(device.deviceid) && this.cusG.get(device.deviceid).type === 'garage_four') {
         /**********************************
         GARAGE DOORS [FOUR] [ACCESSORY SIMULATION]
         **********************************/
@@ -221,7 +207,7 @@ class eWeLinkPlatform {
           : this.addAccessory(device, device.deviceid + 'SWX', false, this.helpers.defaultGarageFourCache)
         accessory.control = new (require('./device/garage-four'))(this, accessory)
         /*********************************/
-      } else if (this.cusG.has(device.deviceid + 'SWX') && this.cusG.get(device.deviceid + 'SWX').type === 'garage_eachen') {
+      } else if (this.cusG.has(device.deviceid) && this.cusG.get(device.deviceid).type === 'garage_eachen') {
         /***************************
         GARAGE DOORS [EACHEN GD-DC5]
         ***************************/
@@ -230,7 +216,7 @@ class eWeLinkPlatform {
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/garage-eachen'))(this, accessory)
         /**************************/
-      } else if (this.cusG.has(device.deviceid + 'SWX') && this.cusG.get(device.deviceid + 'SWX').type === 'lock') {
+      } else if (this.cusG.has(device.deviceid) && this.cusG.get(device.deviceid).type === 'lock') {
         /***************************
         LOCKS [ACCESSORY SIMULATION]
         ***************************/
@@ -239,7 +225,7 @@ class eWeLinkPlatform {
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/lock'))(this, accessory)
         /**************************/
-      } else if (this.cusG.has(device.deviceid + 'SWX') && this.cusG.get(device.deviceid + 'SWX').type === 'switch_valve') {
+      } else if (this.cusG.has(device.deviceid) && this.cusG.get(device.deviceid).type === 'switch_valve') {
         /**********************************
         SWITCH-VALVE [ACCESSORY SIMULATION]
         **********************************/
@@ -248,8 +234,17 @@ class eWeLinkPlatform {
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/switch-valve'))(this, accessory)
         /***************************/
-      } else if (this.cusG.has(device.deviceid + 'SWX') && this.cusG.get(device.deviceid + 'SWX').type === 'valve') {
-        /**********************************
+      } else if (this.cusG.has(device.deviceid) && this.cusG.get(device.deviceid).type === 'tap_one') {
+        /********************************
+        TAPS [ONE] [ACCESSORY SIMULATION]
+        ********************************/
+        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
+          ? this.devicesInHB.get(device.deviceid + 'SWX')
+          : this.addAccessory(device, device.deviceid + 'SWX')
+        accessory.control = new (require('./device/tap-one'))(this, accessory)
+        /***************************/
+      } else if (this.cusG.has(device.deviceid) && this.cusG.get(device.deviceid).type === 'valve') {
+        /********************************
         VALVES [ONE] [ACCESSORY SIMULATION]
         **********************************/
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
@@ -257,7 +252,7 @@ class eWeLinkPlatform {
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/valve-one'))(this, accessory)
         /***************************/
-      } else if (this.cusG.has(device.deviceid + 'SWX') && this.cusG.get(device.deviceid + 'SWX').type === 'valve_two') {
+      } else if (this.cusG.has(device.deviceid) && this.cusG.get(device.deviceid).type === 'valve_two') {
         /**********************************
         VALVES [TWO] [ACCESSORY SIMULATION]
         **********************************/
diff --git a/lib/utils/helpers.js b/lib/utils/helpers.js
index 8dcadf70..a7174113 100644
--- a/lib/utils/helpers.js
+++ b/lib/utils/helpers.js
@@ -9,8 +9,8 @@ module.exports = {
   httpRetryCodes: ['ENOTFOUND', 'ETIMEDOUT', 'EAI_AGAIN'],
   allowedGroups: [
     'blind', 'garage', 'garage_two', 'garage_four',
-    'garage_eachen', 'lock', 'switch_valve', 'valve',
-    'valve_two'
+    'garage_eachen', 'lock', 'tap_one', 'switch_valve',
+    'valve', 'valve_two'
   ],
   defaults: {
     inUsePowerThreshold: 0,

From 041e6f026040dce8b7f093b70f9ac21d318b7ddb Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 6 Jan 2021 09:48:44 +0000
Subject: [PATCH 1098/3183] remember cache

---
 lib/device/curtain.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/device/curtain.js b/lib/device/curtain.js
index 8ef6c159..bdfaac82 100644
--- a/lib/device/curtain.js
+++ b/lib/device/curtain.js
@@ -38,6 +38,7 @@ module.exports = class deviceCurtain {
       if (!params.switch && !this.helpers.hasProperty(params, 'setclose')) return
       const pos = Math.abs(100 - parseInt(params.setclose))
       if (this.cachePosition === pos) return
+      this.cachePosition = pos
       this.cService
         .updateCharacteristic(this.Characteristic.TargetPosition, this.cachePosition)
         .updateCharacteristic(this.Characteristic.CurrentPosition, this.cachePosition)

From 2085f14c82bba6fbe92d35539af5104d5b78b37d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 6 Jan 2021 09:49:21 +0000
Subject: [PATCH 1099/3183] 4.1.1-0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 2d4e0001..63dd739a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.1.0",
+  "version": "4.1.1-0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 9327798e..b516a0b6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.1.0",
+  "version": "4.1.1-0",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From cc05ce2fd179e9d58ae7c557b6f4576480f8dd41 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 6 Jan 2021 10:21:36 +0000
Subject: [PATCH 1100/3183] rename to this.service

---
 lib/device/blind.js         | 12 +++++-----
 lib/device/curtain.js       |  8 +++----
 lib/device/fan.js           | 16 +++++++-------
 lib/device/garage-eachen.js | 16 +++++++-------
 lib/device/garage-one.js    | 16 +++++++-------
 lib/device/light-colour.js  | 44 ++++++++++++++++++-------------------
 lib/device/light-ctemp.js   | 18 +++++++--------
 lib/device/light-dimmer.js  | 12 +++++-----
 lib/device/lock.js          | 12 +++++-----
 lib/device/outlet.js        | 32 +++++++++++++--------------
 lib/device/switch-multi.js  |  6 ++---
 lib/device/switch-single.js |  6 ++---
 lib/device/template.js      |  4 ++--
 lib/device/valve-one.js     | 36 +++++++++++++++---------------
 14 files changed, 119 insertions(+), 119 deletions(-)

diff --git a/lib/device/blind.js b/lib/device/blind.js
index 0a67abee..6c406a0c 100644
--- a/lib/device/blind.js
+++ b/lib/device/blind.js
@@ -8,14 +8,14 @@ module.exports = class deviceBlind {
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
-    if (!(this.wcService = accessory.getService(this.Service.WindowCovering))) {
-      this.wcService = accessory.addService(this.Service.WindowCovering)
-      this.wcService
+    if (!(this.service = accessory.getService(this.Service.WindowCovering))) {
+      this.service = accessory.addService(this.Service.WindowCovering)
+      this.service
         .setCharacteristic(this.Characteristic.CurrentPosition, 0)
         .setCharacteristic(this.Characteristic.TargetPosition, 0)
         .setCharacteristic(this.Characteristic.PositionState, 2)
     }
-    this.wcService
+    this.service
       .getCharacteristic(this.Characteristic.TargetPosition)
       .on('set', this.internalUpdate.bind(this))
     this.accessory = accessory
@@ -41,7 +41,7 @@ module.exports = class deviceBlind {
         } else {
           prevPosition += positionPercentChange
         }
-        this.wcService.updateCharacteristic(this.Characteristic.CurrentPosition, prevPosition)
+        this.service.updateCharacteristic(this.Characteristic.CurrentPosition, prevPosition)
         this.accessory.context.cacheCurrentPosition = prevPosition
       }
       const diffPosition = value - prevPosition
@@ -58,7 +58,7 @@ module.exports = class deviceBlind {
       params.switches[0].switch = 'off'
       params.switches[1].switch = 'off'
       await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.wcService
+      this.service
         .updateCharacteristic(this.Characteristic.PositionState, 2)
         .updateCharacteristic(this.Characteristic.CurrentPosition, value)
       this.accessory.context.cachePositionState = 2
diff --git a/lib/device/curtain.js b/lib/device/curtain.js
index bdfaac82..783246ca 100644
--- a/lib/device/curtain.js
+++ b/lib/device/curtain.js
@@ -8,8 +8,8 @@ module.exports = class deviceCurtain {
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
-    this.cService = accessory.getService(this.Service.WindowCovering) || accessory.addService(this.Service.WindowCovering)
-    this.cService
+    this.service = accessory.getService(this.Service.WindowCovering) || accessory.addService(this.Service.WindowCovering)
+    this.service
       .getCharacteristic(this.Characteristic.TargetPosition)
       .on('set', this.internalUpdate.bind(this))
     this.accessory = accessory
@@ -39,11 +39,11 @@ module.exports = class deviceCurtain {
       const pos = Math.abs(100 - parseInt(params.setclose))
       if (this.cachePosition === pos) return
       this.cachePosition = pos
-      this.cService
+      this.service
         .updateCharacteristic(this.Characteristic.TargetPosition, this.cachePosition)
         .updateCharacteristic(this.Characteristic.CurrentPosition, this.cachePosition)
         .updateCharacteristic(this.Characteristic.PositionState, 2)
-      this.log('[%s] current position [%s%].', this.accessory.displayName, this.cachePosition)
+      if (params.updateSource) this.log('[%s] current position [%s%].', this.accessory.displayName, this.cachePosition)
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
diff --git a/lib/device/fan.js b/lib/device/fan.js
index 70f178c1..8acc3696 100644
--- a/lib/device/fan.js
+++ b/lib/device/fan.js
@@ -8,14 +8,14 @@ module.exports = class deviceFan {
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
-    this.fanService = accessory.getService(this.Service.Fan) || accessory.addService(this.Service.Fan)
-    this.fanService
+    this.service = accessory.getService(this.Service.Fan) || accessory.addService(this.Service.Fan)
+    this.service
       .getCharacteristic(this.Characteristic.On)
       .on('set', (value, callback) => {
         callback()
-        if (!value) this.fanService.setCharacteristic(this.Characteristic.RotationSpeed, 0)
+        if (!value) this.service.setCharacteristic(this.Characteristic.RotationSpeed, 0)
       })
-    this.fanService
+    this.service
       .getCharacteristic(this.Characteristic.RotationSpeed)
       .on('set', this.internalSpeedUpdate.bind(this))
       .setProps({
@@ -63,8 +63,8 @@ module.exports = class deviceFan {
     try {
       callback()
       const params = { switches: this.helpers.defaultMultiSwitchOff }
-      const newPower = this.fanService.getCharacteristic(this.Characteristic.On).value
-      const newSpeed = this.fanService.getCharacteristic(this.Characteristic.RotationSpeed).value
+      const newPower = this.service.getCharacteristic(this.Characteristic.On).value
+      const newSpeed = this.service.getCharacteristic(this.Characteristic.RotationSpeed).value
       const newLight = this.lightService ? value : true
       params.switches[0].switch = newLight ? 'on' : 'off'
       params.switches[1].switch = newPower && newSpeed >= 33 ? 'on' : 'off'
@@ -85,7 +85,7 @@ module.exports = class deviceFan {
       if (!params.switches) return
       if (params.switches[1].switch !== this.cacheOnOff) {
         this.cacheOnOff = params.switches[1].switch
-        this.fanService.updateCharacteristic(this.Characteristic.On, this.cacheLight === 'on')
+        this.service.updateCharacteristic(this.Characteristic.On, this.cacheLight === 'on')
         if (params.updateSource) this.log('[%s] current state [%s].', this.accessory.displayName, this.cacheOnOff)
       }
       let speed = 0
@@ -101,7 +101,7 @@ module.exports = class deviceFan {
       }
       if (speed !== this.cacheSpeed) {
         this.cacheSpeed = speed
-        this.fanService.updateCharacteristic(this.Characteristic.RotationSpeed, this.cacheSpeed)
+        this.service.updateCharacteristic(this.Characteristic.RotationSpeed, this.cacheSpeed)
         if (params.updateSource) this.log('[%s] current speed [%s%].', this.accessory.displayName, this.cacheSpeed)
       }
       if (this.lightService && params.switches[0].switch !== this.cacheLight) {
diff --git a/lib/device/garage-eachen.js b/lib/device/garage-eachen.js
index bdaa1a69..e6c78272 100644
--- a/lib/device/garage-eachen.js
+++ b/lib/device/garage-eachen.js
@@ -8,14 +8,14 @@ module.exports = class deviceGarageEachen {
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
-    if (!(this.gdService = accessory.getService(this.Service.GarageDoorOpener))) {
-      this.gdService = accessory.addService(this.Service.GarageDoorOpener)
-      this.gdService
+    if (!(this.service = accessory.getService(this.Service.GarageDoorOpener))) {
+      this.service = accessory.addService(this.Service.GarageDoorOpener)
+      this.service
         .setCharacteristic(this.Characteristic.CurrentDoorState, 1)
         .setCharacteristic(this.Characteristic.TargetDoorState, 1)
         .setCharacteristic(this.Characteristic.ObstructionDetected, false)
     }
-    this.gdService
+    this.service
       .getCharacteristic(this.Characteristic.TargetDoorState)
       .on('set', this.internalUpdate.bind(this))
     this.accessory = accessory
@@ -26,17 +26,17 @@ module.exports = class deviceGarageEachen {
       callback()
       const garageConfig = this.platform.cusG.get(this.accessory.context.hbDeviceId)
       const params = { switch: value === 0 ? 'on' : 'off' }
-      if (value === this.gdService.getCharacteristic(this.Characteristic.CurrentDoorState).value % 2) return
+      if (value === this.service.getCharacteristic(this.Characteristic.CurrentDoorState).value % 2) return
       this.inUse = true
       await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.gdService
+      this.service
         .updateCharacteristic(this.Characteristic.TargetDoorState, value)
         .updateCharacteristic(this.Characteristic.CurrentDoorState, value + 2)
       await this.helpers.sleep(2000)
       this.inUse = false
       if (value === 0) {
         await this.helpers.sleep(Math.max((garageConfig.operationTime - 20) * 100, 0))
-        this.gdService.updateCharacteristic(this.Characteristic.CurrentDoorState, 0)
+        this.service.updateCharacteristic(this.Characteristic.CurrentDoorState, 0)
         this.log('[%s] current state [open].', this.accessory.displayName)
       }
     } catch (err) {
@@ -48,7 +48,7 @@ module.exports = class deviceGarageEachen {
   async externalUpdate (params) {
     try {
       if (!params.switch || this.inUse) return
-      this.gdService
+      this.service
         .updateCharacteristic(this.Characteristic.TargetDoorState, params.switch === 'on' ? 0 : 1)
         .updateCharacteristic(this.Characteristic.CurrentDoorState, params.switch === 'on' ? 0 : 1)
       if (params.updateSource) {
diff --git a/lib/device/garage-one.js b/lib/device/garage-one.js
index cb882f69..f682c01f 100644
--- a/lib/device/garage-one.js
+++ b/lib/device/garage-one.js
@@ -8,15 +8,15 @@ module.exports = class deviceGarageOne {
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
-    if (!(this.gdService = accessory.getService(this.Service.GarageDoorOpener))) {
+    if (!(this.service = accessory.getService(this.Service.GarageDoorOpener))) {
       accessory
         .addService(this.Service.GarageDoorOpener)
         .setCharacteristic(this.Characteristic.CurrentDoorState, 1)
         .setCharacteristic(this.Characteristic.TargetDoorState, 1)
         .setCharacteristic(this.Characteristic.ObstructionDetected, false)
-      this.gdService = accessory.getService(this.Service.GarageDoorOpener)
+      this.service = accessory.getService(this.Service.GarageDoorOpener)
     }
-    this.gdService
+    this.service
       .getCharacteristic(this.Characteristic.TargetDoorState)
       .on('set', this.internalUpdate.bind(this))
     this.accessory = accessory
@@ -46,13 +46,13 @@ module.exports = class deviceGarageOne {
       this.inUse = true
       this.cacheState = value
       if (garageConfig.setup === 'oneSwitch' && [2, 3].includes(prevState)) {
-        this.gdService.updateCharacteristic(this.Characteristic.CurrentDoorState, ((prevState * 2) % 3) + 2)
+        this.service.updateCharacteristic(this.Characteristic.CurrentDoorState, ((prevState * 2) % 3) + 2)
         this.accessory.context.cacheCurrentDoorState = ((prevState * 2) % 3) + 2
         delay = 1500
       }
       if (this.cacheState !== newPos) return
       await this.helpers.sleep(delay)
-      this.gdService
+      this.service
         .updateCharacteristic(this.Characteristic.TargetDoorState, newPos)
         .updateCharacteristic(this.Characteristic.CurrentDoorState, newPos + 2)
       this.accessory.context.cacheTargetDoorState = newPos
@@ -70,7 +70,7 @@ module.exports = class deviceGarageOne {
       await this.platform.sendDeviceUpdate(this.accessory, params)
       await this.helpers.sleep(Math.max(garageConfig.operationTime * 100, 1000))
       if (!sAccessory) {
-        this.gdService.updateCharacteristic(this.Characteristic.CurrentDoorState, newPos)
+        this.service.updateCharacteristic(this.Characteristic.CurrentDoorState, newPos)
         this.accessory.context.cacheCurrentDoorState = newPos
         this.log('[%s] current state [%s].', this.accessory.displayName, newPos === 0 ? 'open' : 'closed')
       }
@@ -106,13 +106,13 @@ module.exports = class deviceGarageOne {
       if (garageConfig.sensorId) {
         await this.helpers.sleep(Math.max(garageConfig.operationTime * 100, 1000))
       } else {
-        this.gdService
+        this.service
           .updateCharacteristic(this.Characteristic.TargetDoorState, newPos - 2)
           .updateCharacteristic(this.Characteristic.CurrentDoorState, newPos)
         this.accessory.context.cacheCurrentDoorState = newPos
         this.accessory.context.cacheTargetDoorState = newPos - 2
         await this.helpers.sleep(Math.max(garageConfig.operationTime * 100, 1000))
-        this.gdService.updateCharacteristic(this.Characteristic.CurrentDoorState, newPos - 2)
+        this.service.updateCharacteristic(this.Characteristic.CurrentDoorState, newPos - 2)
         this.accessory.context.cacheCurrentDoorState = newPos - 2
         this.log('[%s] current state [%s].', this.accessory.displayName, newPos === 2 ? 'open' : 'closed')
       }
diff --git a/lib/device/light-colour.js b/lib/device/light-colour.js
index 6be42fe6..c18643d7 100644
--- a/lib/device/light-colour.js
+++ b/lib/device/light-colour.js
@@ -9,22 +9,22 @@ module.exports = class deviceLightColour {
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
     this.isB1 = accessory.context.eweUIID === 22
-    this.lightService = accessory.getService(this.Service.Lightbulb) || accessory.addService(this.Service.Lightbulb)
-    this.lightService
+    this.service = accessory.getService(this.Service.Lightbulb) || accessory.addService(this.Service.Lightbulb)
+    this.service
       .getCharacteristic(this.Characteristic.On)
       .on('set', this.internalOnOffUpdate.bind(this))
-    this.lightService
+    this.service
       .getCharacteristic(this.Characteristic.Brightness)
       .on('set', this.internalBrightnessUpdate.bind(this))
-    this.lightService
+    this.service
       .getCharacteristic(this.Characteristic.Hue)
       .on('set', this.internalColourUpdate.bind(this))
-    this.lightService
+    this.service
       .getCharacteristic(this.Characteristic.Saturation)
       .on('set', (value, callback) => callback())
     if (accessory.context.eweUIID === 22) {
       // *** B1 doesn't support brightness *** \\
-      this.lightService
+      this.service
         .getCharacteristic(this.Characteristic.Brightness)
         .setProps({
           minStep: 100
@@ -34,12 +34,12 @@ module.exports = class deviceLightColour {
     if ([59, 104].includes(accessory.context.eweUIID)) {
       // HomeKit has a range of 140-500M corresponding to 2000-7143K
       // Devices have a range of 2700K-6500K corresponding to ewelink ct: 0-255
-      this.lightService
+      this.service
         .getCharacteristic(this.Characteristic.ColorTemperature)
         .on('set', this.internalCTempUpdate.bind(this))
       if (platform.api.versionGreaterOrEqual && platform.api.versionGreaterOrEqual('1.3.0-beta.41')) {
-        this.cacheBrightness = this.lightService.getCharacteristic(this.Characteristic.Brightness).value
-        this.alController = new platform.api.hap.AdaptiveLightingController(this.lightService)
+        this.cacheBrightness = this.service.getCharacteristic(this.Characteristic.Brightness).value
+        this.alController = new platform.api.hap.AdaptiveLightingController(this.service)
         this.accessory.configureController(this.alController)
       }
     }
@@ -132,10 +132,10 @@ module.exports = class deviceLightColour {
         return
       }
       this.cacheHue = value
-      this.lightService.updateCharacteristic(this.Characteristic.ColorTemperature, 140)
+      this.service.updateCharacteristic(this.Characteristic.ColorTemperature, 140)
       callback()
       let params
-      const newRGB = this.helpers.hs2rgb([value, this.lightService.getCharacteristic(this.Characteristic.Saturation).value])
+      const newRGB = this.helpers.hs2rgb([value, this.service.getCharacteristic(this.Characteristic.Saturation).value])
       this.cacheR = newRGB[0]
       this.cacheG = newRGB[1]
       this.cacheB = newRGB[2]
@@ -201,7 +201,7 @@ module.exports = class deviceLightColour {
       this.cacheMired = value
       const hs = this.helpers.m2hs(this.cacheMired)
       this.cacheHue = hs[0]
-      this.lightService
+      this.service
         .updateCharacteristic(this.Characteristic.Hue, this.cacheHue)
         .updateCharacteristic(this.Characteristic.Saturation, hs[1])
       callback()
@@ -216,7 +216,7 @@ module.exports = class deviceLightColour {
           // *** L1 *** \\
           const newRGB = this.helpers.hs2rgb([
             hs[0],
-            this.lightService.getCharacteristic(this.Characteristic.Saturation).value
+            this.service.getCharacteristic(this.Characteristic.Saturation).value
           ])
           this.cacheR = newRGB[0]
           this.cacheG = newRGB[1]
@@ -266,8 +266,8 @@ module.exports = class deviceLightColour {
         (!this.isB1 && params.switch && params.switch !== this.cacheOnOff)
       ) {
         this.cacheOnOff = this.isB1 ? params.state : params.switch
-        this.lightService.updateCharacteristic(this.Characteristic.On, this.cacheOnOff === 'on')
-        if (this.isB1) this.lightService.updateCharacteristic(this.Characteristic.Brightness, this.cacheOnOff === 'on' ? 100 : 0)
+        this.service.updateCharacteristic(this.Characteristic.On, this.cacheOnOff === 'on')
+        if (this.isB1) this.service.updateCharacteristic(this.Characteristic.Brightness, this.cacheOnOff === 'on' ? 100 : 0)
         if (params.updateSource) this.log('[%s] current state [%s].', this.accessory.displayName, this.cacheOnOff)
       }
       let hs
@@ -294,7 +294,7 @@ module.exports = class deviceLightColour {
                 this.cacheB = parseInt(params.channel4)
                 hs = this.helpers.rgb2hs([this.cacheR, this.cacheG, this.cacheB])
                 this.cacheHue = hs[0]
-                this.lightService
+                this.service
                   .updateCharacteristic(this.Characteristic.Hue, this.cacheHue)
                   .updateCharacteristic(this.Characteristic.Saturation, 100)
                   .updateCharacteristic(this.Characteristic.Brightness, 100)
@@ -316,7 +316,7 @@ module.exports = class deviceLightColour {
           if (this.helpers.hasProperty(params, 'bright')) {
             if (params.bright !== this.cacheBrightness) {
               this.cacheBrightness = params.bright
-              this.lightService.updateCharacteristic(this.Characteristic.Brightness, this.cacheBrightness)
+              this.service.updateCharacteristic(this.Characteristic.Brightness, this.cacheBrightness)
               if (params.updateSource) this.log('[%s] current brightness [%s%].', this.accessory.displayName, this.cacheBrightness)
             }
           }
@@ -328,7 +328,7 @@ module.exports = class deviceLightColour {
               hs = this.helpers.rgb2hs([this.cacheR, this.cacheG, this.cacheB])
               this.cacheHue = hs[0]
               this.cacheMired = 140
-              this.lightService
+              this.service
                 .updateCharacteristic(this.Characteristic.Hue, this.cacheHue)
                 .updateCharacteristic(this.Characteristic.Saturation, hs[1])
               if (params.updateSource) {
@@ -351,7 +351,7 @@ module.exports = class deviceLightColour {
             if (this.helpers.hasProperty(params.color, 'br')) {
               if (params.color.br !== this.cacheBrightness) {
                 this.cacheBrightness = params.color.br
-                this.lightService.updateCharacteristic(this.Characteristic.Brightness, this.cacheBrightness)
+                this.service.updateCharacteristic(this.Characteristic.Brightness, this.cacheBrightness)
                 if (params.updateSource) this.log('[%s] current brightness [%s%].', this.accessory.displayName, this.cacheBrightness)
               }
             }
@@ -369,7 +369,7 @@ module.exports = class deviceLightColour {
                 this.cacheMired = 140
                 hs = this.helpers.rgb2hs([this.cacheR, this.cacheG, this.cacheB])
                 this.cacheHue = hs[0]
-                this.lightService
+                this.service
                   .updateCharacteristic(this.Characteristic.ColorTemperature, 140)
                   .updateCharacteristic(this.Characteristic.Hue, this.cacheHue)
                   .updateCharacteristic(this.Characteristic.Saturation, 100)
@@ -387,7 +387,7 @@ module.exports = class deviceLightColour {
             if (this.helpers.hasProperty(params.white, 'br')) {
               if (params.white.br !== this.cacheBrightness || this.cacheMode !== 'white') {
                 this.cacheBrightness = params.white.br
-                this.lightService.updateCharacteristic(this.Characteristic.Brightness, this.cacheBrightness)
+                this.service.updateCharacteristic(this.Characteristic.Brightness, this.cacheBrightness)
                 if (params.updateSource) this.log('[%s] current brightness [%s%].', this.accessory.displayName, this.cacheBrightness)
               }
             }
@@ -398,7 +398,7 @@ module.exports = class deviceLightColour {
               this.cacheMired = Math.max(Math.min(Math.round(1000000 / ctToK), 500), 140)
               hs = this.helpers.m2hs(this.cacheMired)
               this.cacheHue = hs[0]
-              this.lightService
+              this.service
                 .updateCharacteristic(this.Characteristic.Hue, this.cacheHue)
                 .updateCharacteristic(this.Characteristic.Saturation, hs[1])
                 .updateCharacteristic(this.Characteristic.ColorTemperature, this.cacheMired)
diff --git a/lib/device/light-ctemp.js b/lib/device/light-ctemp.js
index 7c78dbc8..7142c216 100644
--- a/lib/device/light-ctemp.js
+++ b/lib/device/light-ctemp.js
@@ -8,14 +8,14 @@ module.exports = class deviceLightColour {
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
-    this.lightService = accessory.getService(this.Service.Lightbulb) || accessory.addService(this.Service.Lightbulb)
-    this.lightService
+    this.service = accessory.getService(this.Service.Lightbulb) || accessory.addService(this.Service.Lightbulb)
+    this.service
       .getCharacteristic(this.Characteristic.On)
       .on('set', this.internalOnOffUpdate.bind(this))
-    this.lightService
+    this.service
       .getCharacteristic(this.Characteristic.Brightness)
       .on('set', this.internalBrightnessUpdate.bind(this))
-    this.lightService
+    this.service
       .getCharacteristic(this.Characteristic.ColorTemperature)
       .on('set', this.internalCTempUpdate.bind(this))
     if ((this.platform.config.bulbB02FST64 || '').split(',').includes(accessory.context.eweDeviceId)) {
@@ -30,8 +30,8 @@ module.exports = class deviceLightColour {
     }
     this.accessory = accessory
     if (platform.api.versionGreaterOrEqual && platform.api.versionGreaterOrEqual('1.3.0-beta.41')) {
-      this.cacheBrightness = this.lightService.getCharacteristic(this.Characteristic.Brightness).value
-      this.alController = new platform.api.hap.AdaptiveLightingController(this.lightService)
+      this.cacheBrightness = this.service.getCharacteristic(this.Characteristic.Brightness).value
+      this.alController = new platform.api.hap.AdaptiveLightingController(this.service)
       this.accessory.configureController(this.alController)
     }
   }
@@ -125,20 +125,20 @@ module.exports = class deviceLightColour {
       if (this.updateTimeout) return
       if (params.switch && params.switch !== this.cacheOnOff) {
         this.cacheOnOff = params.switch
-        this.lightService.updateCharacteristic(this.Characteristic.On, this.cacheOnOff === 'on')
+        this.service.updateCharacteristic(this.Characteristic.On, this.cacheOnOff === 'on')
         if (params.updateSource) this.log('[%s] current state [%s].', this.accessory.displayName, this.cacheOnOff)
       }
       if (params.white) {
         if (this.helpers.hasProperty(params.white, 'br') && this.cacheBrightness !== params.white.br) {
           this.cacheBrightness = params.white.br
-          this.lightService.updateCharacteristic(this.Characteristic.Brightness, this.cacheBrightness)
+          this.service.updateCharacteristic(this.Characteristic.Brightness, this.cacheBrightness)
           if (params.updateSource) this.log('[%s] current brightness [%s%].', this.accessory.displayName, this.cacheBrightness)
         }
         if (this.helpers.hasProperty(params.white, 'ct') && this.cacheCT !== params.white.ct) {
           this.cacheCT = params.white.ct
           const ctToK = Math.round(this.cacheCT / 255 * (this.maxK - this.minK) + this.minK)
           this.cacheMired = Math.min(Math.max(Math.round(1000000 / ctToK), 140), 500)
-          this.lightService.updateCharacteristic(this.Characteristic.ColorTemperature, this.cacheMired)
+          this.service.updateCharacteristic(this.Characteristic.ColorTemperature, this.cacheMired)
           if (params.updateSource) this.log('[%s] current cct [%sK].', this.accessory.displayName, ctToK)
           if (
             this.alController &&
diff --git a/lib/device/light-dimmer.js b/lib/device/light-dimmer.js
index e4d71d9f..25ad43d5 100644
--- a/lib/device/light-dimmer.js
+++ b/lib/device/light-dimmer.js
@@ -8,11 +8,11 @@ module.exports = class deviceLightDimmer {
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
-    this.lightService = accessory.getService(this.Service.Lightbulb) || accessory.addService(this.Service.Lightbulb)
-    this.lightService
+    this.service = accessory.getService(this.Service.Lightbulb) || accessory.addService(this.Service.Lightbulb)
+    this.service
       .getCharacteristic(this.Characteristic.On)
       .on('set', this.internalOnOffUpdate.bind(this))
-    this.lightService.getCharacteristic(this.Characteristic.Brightness)
+    this.service.getCharacteristic(this.Characteristic.Brightness)
       .on('set', this.internalBrightnessUpdate.bind(this))
     this.accessory = accessory
   }
@@ -66,7 +66,7 @@ module.exports = class deviceLightDimmer {
   async externalUpdate (params) {
     try {
       if (params.switch && params.switch !== this.cacheOnOff) {
-        this.lightService.updateCharacteristic(this.Characteristic.On, params.switch === 'on')
+        this.service.updateCharacteristic(this.Characteristic.On, params.switch === 'on')
         this.cacheOnOff = params.switch
         if (params.updateSource) this.log('[%s] current state [%s].', this.accessory.displayName, params.switch)
       }
@@ -76,7 +76,7 @@ module.exports = class deviceLightDimmer {
           if (this.helpers.hasProperty(params, 'bright')) {
             const nb = Math.round(((params.bright - 10) * 10) / 9)
             if (nb !== this.cacheBrightness) {
-              this.lightService.updateCharacteristic(this.Characteristic.Brightness, nb)
+              this.service.updateCharacteristic(this.Characteristic.Brightness, nb)
               this.cacheBrightness = nb
               if (params.updateSource) this.log('[%s] current brightness [%s%].', this.accessory.displayName, nb)
             }
@@ -86,7 +86,7 @@ module.exports = class deviceLightDimmer {
           // *** D1 eWeLink scale matches HomeKit scale of 0-100 *** \\
           if (this.helpers.hasProperty(params, 'brightness')) {
             if (params.brightness !== this.cacheBrightness) {
-              this.lightService.updateCharacteristic(this.Characteristic.Brightness, params.brightness)
+              this.service.updateCharacteristic(this.Characteristic.Brightness, params.brightness)
               this.cacheBrightness = params.brightness
               if (params.updateSource) this.log('[%s] current brightness [%s%].', this.accessory.displayName, params.brightness)
             }
diff --git a/lib/device/lock.js b/lib/device/lock.js
index 2a879ad7..6097cfac 100644
--- a/lib/device/lock.js
+++ b/lib/device/lock.js
@@ -8,11 +8,11 @@ module.exports = class deviceLock {
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
-    this.lmService = accessory.getService(this.Service.LockMechanism) || accessory.addService(this.Service.LockMechanism)
-    this.lmService
+    this.service = accessory.getService(this.Service.LockMechanism) || accessory.addService(this.Service.LockMechanism)
+    this.service
       .getCharacteristic(this.Characteristic.LockTargetState)
       .on('set', this.internalUpdate.bind(this))
-    this.lmService
+    this.service
       .updateCharacteristic(this.Characteristic.LockCurrentState, 1)
       .updateCharacteristic(this.Characteristic.LockTargetState, 1)
     this.accessory = accessory
@@ -27,7 +27,7 @@ module.exports = class deviceLock {
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.log('[%s] current status [unlocked].', this.accessory.displayName)
       await this.helpers.sleep(Math.max(lockConfig.operationTime * 100, 1000))
-      this.lmService
+      this.service
         .updateCharacteristic(this.Characteristic.LockTargetState, 1)
         .updateCharacteristic(this.Characteristic.LockCurrentState, 1)
       this.inUse = false
@@ -43,12 +43,12 @@ module.exports = class deviceLock {
       if (!params.switch || params.switch === 'off' || this.inUse) return
       const lockConfig = this.platform.cusG.get(this.accessory.context.hbDeviceId)
       this.inUse = true
-      this.lmService
+      this.service
         .updateCharacteristic(this.Characteristic.LockCurrentState, 0)
         .updateCharacteristic(this.Characteristic.LockTargetState, 0)
       this.log('[%s] current status [unlocked].', this.accessory.displayName)
       await this.helpers.sleep(Math.max(lockConfig.operationTime * 100, 1000))
-      this.lmService
+      this.service
         .updateCharacteristic(this.Characteristic.LockCurrentState, 1)
         .updateCharacteristic(this.Characteristic.LockTargetState, 1)
       this.inUse = false
diff --git a/lib/device/outlet.js b/lib/device/outlet.js
index 708ef3bf..6953e005 100644
--- a/lib/device/outlet.js
+++ b/lib/device/outlet.js
@@ -87,24 +87,24 @@ module.exports = class deviceOutlet {
     if (accessory.getService(this.Service.Switch)) {
       accessory.removeService(accessory.getService(this.Service.Switch))
     }
-    if (!(this.outletService = accessory.getService(this.Service.Outlet))) {
-      this.outletService = accessory.addService(this.Service.Outlet)
-      this.outletService.addCharacteristic(this.eveVoltage)
-      this.outletService.addCharacteristic(this.eveCurrentConsumption)
-      this.outletService.addCharacteristic(this.eveElectricCurrent)
-      this.outletService.addCharacteristic(this.eveTotalConsumption)
-      this.outletService.addCharacteristic(this.eveResetTotal)
+    if (!(this.service = accessory.getService(this.Service.Outlet))) {
+      this.service = accessory.addService(this.Service.Outlet)
+      this.service.addCharacteristic(this.eveVoltage)
+      this.service.addCharacteristic(this.eveCurrentConsumption)
+      this.service.addCharacteristic(this.eveElectricCurrent)
+      this.service.addCharacteristic(this.eveTotalConsumption)
+      this.service.addCharacteristic(this.eveResetTotal)
     }
-    this.outletService
+    this.service
       .getCharacteristic(this.Characteristic.On)
       .on('set', this.internalUpdate.bind(this))
-    this.outletService
+    this.service
       .getCharacteristic(this.eveResetTotal)
       .on('set', (value, callback) => {
         callback()
         accessory.context.energyReadings = []
         accessory.context.energyReadingTotal = 0
-        this.outletService.updateCharacteristic(this.eveTotalConsumption, 0)
+        this.service.updateCharacteristic(this.eveTotalConsumption, 0)
       })
     accessory.log = this.log
     accessory.eveService = new this.platform.eveService('energy', accessory)
@@ -118,7 +118,7 @@ module.exports = class deviceOutlet {
         accessory.context.energyReadingTotal += total
       }
       accessory.context.energyReadings = []
-      this.outletService.updateCharacteristic(this.eveTotalConsumption, accessory.context.energyReadingTotal)
+      this.service.updateCharacteristic(this.eveTotalConsumption, accessory.context.energyReadingTotal)
     }, 300000)
     this.accessory = accessory
   }
@@ -137,17 +137,17 @@ module.exports = class deviceOutlet {
   async externalUpdate (params) {
     try {
       if (params.switch && params.switch !== this.cacheOnOff) {
-        this.outletService.updateCharacteristic(this.Characteristic.On, params.switch === 'on')
+        this.service.updateCharacteristic(this.Characteristic.On, params.switch === 'on')
         this.cacheOnOff = params.switch
         if (params.updateSource) this.log('[%s] current state [%s].', this.accessory.displayName, params.switch)
         if (!this.accessory.context.powerReadings) {
-          this.outletService.updateCharacteristic(this.Characteristic.OutletInUse, params.switch === 'on')
+          this.service.updateCharacteristic(this.Characteristic.OutletInUse, params.switch === 'on')
         }
       }
       let logger = false
       if (this.helpers.hasProperty(params, 'power')) {
         this.accessory.context.powerReadings = true
-        this.outletService
+        this.service
           .updateCharacteristic(this.Characteristic.OutletInUse, parseFloat(params.power) > this.inUsePowerThreshold)
           .updateCharacteristic(this.eveCurrentConsumption, parseFloat(params.power))
         const isOn = this.accessory.getService(this.Service.Outlet).getCharacteristic(this.Characteristic.On).value
@@ -156,11 +156,11 @@ module.exports = class deviceOutlet {
         logger = true
       }
       if (this.helpers.hasProperty(params, 'voltage')) {
-        this.outletService.updateCharacteristic(this.eveVoltage, parseFloat(params.voltage))
+        this.service.updateCharacteristic(this.eveVoltage, parseFloat(params.voltage))
         logger = true
       }
       if (this.helpers.hasProperty(params, 'current')) {
-        this.outletService.updateCharacteristic(this.eveElectricCurrent, parseFloat(params.current))
+        this.service.updateCharacteristic(this.eveElectricCurrent, parseFloat(params.current))
         logger = true
       }
       if (params.updateSource && logger) {
diff --git a/lib/device/switch-multi.js b/lib/device/switch-multi.js
index 344ff712..3471bd53 100644
--- a/lib/device/switch-multi.js
+++ b/lib/device/switch-multi.js
@@ -8,8 +8,8 @@ module.exports = class deviceSwitchMulti {
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
-    this.switchService = accessory.getService(this.Service.Switch) || accessory.addService(this.Service.Switch)
-    this.switchService
+    this.service = accessory.getService(this.Service.Switch) || accessory.addService(this.Service.Switch)
+    this.service
       .getCharacteristic(this.Characteristic.On)
       .on('set', this.internalUpdate.bind(this))
     accessory.log = this.log
@@ -94,7 +94,7 @@ module.exports = class deviceSwitchMulti {
         }
       }
       if (!this.platform.hiddenMasters.includes(this.accessory.context.eweDeviceId)) {
-        this.switchService.updateCharacteristic(this.Characteristic.On, primaryState)
+        this.service.updateCharacteristic(this.Characteristic.On, primaryState)
         this.accessory.eveService.addEntry({ status: primaryState ? 1 : 0 })
       }
     } catch (err) {
diff --git a/lib/device/switch-single.js b/lib/device/switch-single.js
index 9ea681a8..d3ba9f4e 100644
--- a/lib/device/switch-single.js
+++ b/lib/device/switch-single.js
@@ -8,8 +8,8 @@ module.exports = class deviceSwitchSingle {
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
-    this.switchService = accessory.getService(this.Service.Switch) || accessory.addService(this.Service.Switch)
-    this.switchService
+    this.service = accessory.getService(this.Service.Switch) || accessory.addService(this.Service.Switch)
+    this.service
       .getCharacteristic(this.Characteristic.On)
       .on('set', this.internalUpdate.bind(this))
     if (accessory.getService(this.Service.Outlet)) {
@@ -39,7 +39,7 @@ module.exports = class deviceSwitchSingle {
     try {
       if (!params.switch || params.switch === this.cacheOnOff) return
       const newStatus = params.switch === 'on'
-      this.switchService.updateCharacteristic(this.Characteristic.On, newStatus)
+      this.service.updateCharacteristic(this.Characteristic.On, newStatus)
       this.cacheOnOff = params.switch
       this.accessory.eveService.addEntry({ status: newStatus ? 1 : 0 })
       if (params.updateSource) this.log('[%s] current state [%s].', this.accessory.displayName, this.cacheOnOff)
diff --git a/lib/device/template.js b/lib/device/template.js
index 3a79f0e9..9a689a65 100644
--- a/lib/device/template.js
+++ b/lib/device/template.js
@@ -8,8 +8,8 @@ module.exports = class deviceTemplate {
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
-    const service = accessory.getService(this.Service.Switch) || accessory.addService(this.Service.Switch)
-    service
+    this.service = accessory.getService(this.Service.Switch) || accessory.addService(this.Service.Switch)
+    this.service
       .getCharacteristic(this.Characteristic.On)
       .on('set', (value, callback) => this.internalUpdate(value, callback))
     this.accessory = accessory
diff --git a/lib/device/valve-one.js b/lib/device/valve-one.js
index 5e49bdb8..2b74822d 100644
--- a/lib/device/valve-one.js
+++ b/lib/device/valve-one.js
@@ -8,26 +8,26 @@ module.exports = class deviceValveOne {
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
-    if (!(this.valveService = accessory.getService(this.Service.Valve))) {
-      this.valveService = accessory.addService(this.Service.Valve)
-      this.valveService
+    if (!(this.service = accessory.getService(this.Service.Valve))) {
+      this.service = accessory.addService(this.Service.Valve)
+      this.service
         .setCharacteristic(this.Characteristic.Active, 0)
         .setCharacteristic(this.Characteristic.InUse, 0)
         .setCharacteristic(this.Characteristic.ValveType, 1)
         .setCharacteristic(this.Characteristic.SetDuration, 120)
         .addCharacteristic(this.Characteristic.RemainingDuration)
     }
-    this.valveService
+    this.service
       .getCharacteristic(this.Characteristic.Active)
       .on('set', this.internalUpdate.bind(this))
-    this.valveService
+    this.service
       .getCharacteristic(this.Characteristic.SetDuration)
       .on('set', (value, callback) => {
-        if (this.valveService.getCharacteristic(this.Characteristic.InUse).value === 1) {
-          this.valveService.updateCharacteristic(this.Characteristic.RemainingDuration, value)
+        if (this.service.getCharacteristic(this.Characteristic.InUse).value === 1) {
+          this.service.updateCharacteristic(this.Characteristic.RemainingDuration, value)
           clearTimeout(this.timer)
           this.timer = setTimeout(
-            () => this.valveService.setCharacteristic(this.Characteristic.Active, 0),
+            () => this.service.setCharacteristic(this.Characteristic.Active, 0),
             value * 1000
           )
         }
@@ -40,19 +40,19 @@ module.exports = class deviceValveOne {
     try {
       callback()
       const params = { switch: value ? 'on' : 'off' }
-      this.valveService.updateCharacteristic(this.Characteristic.InUse, value)
+      this.service.updateCharacteristic(this.Characteristic.InUse, value)
       switch (value) {
         case 0:
-          this.valveService.updateCharacteristic(this.Characteristic.RemainingDuration, 0)
+          this.service.updateCharacteristic(this.Characteristic.RemainingDuration, 0)
           clearTimeout(this.timer)
           this.log('[%s] current state [stopped].', this.accessory.displayName)
           break
         case 1: {
-          const timer = this.valveService.getCharacteristic(this.Characteristic.SetDuration).value
-          this.valveService.updateCharacteristic(this.Characteristic.RemainingDuration, timer)
+          const timer = this.service.getCharacteristic(this.Characteristic.SetDuration).value
+          this.service.updateCharacteristic(this.Characteristic.RemainingDuration, timer)
           this.log('[%s] current state [watering].', this.accessory.displayName)
           this.timer = setTimeout(() => {
-            this.valveService.setCharacteristic(this.Characteristic.Active, 0)
+            this.service.setCharacteristic(this.Characteristic.Active, 0)
           }, timer * 1000)
           break
         }
@@ -67,20 +67,20 @@ module.exports = class deviceValveOne {
     try {
       if (!params.switch) return
       if (params.switch === 'on') {
-        if (this.valveService.getCharacteristic(this.Characteristic.Active).value === 0) {
-          const timer = this.valveService.getCharacteristic(this.Characteristic.SetDuration).value
-          this.valveService
+        if (this.service.getCharacteristic(this.Characteristic.Active).value === 0) {
+          const timer = this.service.getCharacteristic(this.Characteristic.SetDuration).value
+          this.service
             .updateCharacteristic(this.Characteristic.Active, 1)
             .updateCharacteristic(this.Characteristic.InUse, 1)
             .updateCharacteristic(this.Characteristic.RemainingDuration, timer)
           if (params.updateSource) this.log('[%s] current state [watering].', this.accessory.displayName)
           this.timer = setTimeout(() => {
-            this.valveService.setCharacteristic(this.Characteristic.Active, 0)
+            this.service.setCharacteristic(this.Characteristic.Active, 0)
           }, timer * 1000)
         }
         return
       }
-      this.valveService
+      this.service
         .updateCharacteristic(this.Characteristic.Active, 0)
         .updateCharacteristic(this.Characteristic.InUse, 0)
         .updateCharacteristic(this.Characteristic.RemainingDuration, 0)

From 6385183fc292153bedb5c9bbc1545eb8ba566756 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 6 Jan 2021 10:47:10 +0000
Subject: [PATCH 1101/3183] dont use cache for blinds

---
 lib/device/curtain.js | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/lib/device/curtain.js b/lib/device/curtain.js
index 783246ca..7a58a2a8 100644
--- a/lib/device/curtain.js
+++ b/lib/device/curtain.js
@@ -18,16 +18,13 @@ module.exports = class deviceCurtain {
   async internalUpdate (value, callback) {
     try {
       callback()
-      if (value === this.cachePosition) return
       const params = {}
-      this.cachePosition = value
-      if ([0, 100].includes(this.cachePosition)) {
-        params.switch = this.cachePosition === 100 ? 'on' : 'off'
+      if ([0, 100].includes(value)) {
+        params.switch = value === 100 ? 'on' : 'off'
       } else {
-        params.setclose = Math.abs(100 - this.cachePosition)
+        params.setclose = Math.abs(100 - value)
       }
       await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.log('[%s] current position [%s%].', this.accessory.displayName, this.cachePosition)
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
     }
@@ -36,14 +33,15 @@ module.exports = class deviceCurtain {
   async externalUpdate (params) {
     try {
       if (!params.switch && !this.helpers.hasProperty(params, 'setclose')) return
-      const pos = Math.abs(100 - parseInt(params.setclose))
-      if (this.cachePosition === pos) return
-      this.cachePosition = pos
+      const newPos = Math.abs(100 - parseInt(params.setclose))
       this.service
-        .updateCharacteristic(this.Characteristic.TargetPosition, this.cachePosition)
-        .updateCharacteristic(this.Characteristic.CurrentPosition, this.cachePosition)
+        .updateCharacteristic(this.Characteristic.TargetPosition, newPos)
+        .updateCharacteristic(this.Characteristic.CurrentPosition, newPos)
         .updateCharacteristic(this.Characteristic.PositionState, 2)
-      if (params.updateSource) this.log('[%s] current position [%s%].', this.accessory.displayName, this.cachePosition)
+      if (params.updateSource && this.cachePosition !== newPos) {
+        this.cachePosition = newPos
+        this.log('[%s] current position [%s%].', this.accessory.displayName, this.cachePosition)
+      }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }

From ba4361ab70e4ec690cf89843fe702a9bedd272f4 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 6 Jan 2021 10:47:36 +0000
Subject: [PATCH 1102/3183] 4.1.1-1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 63dd739a..77b805b9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.1.1-0",
+  "version": "4.1.1-1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index b516a0b6..2b156e11 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.1.1-0",
+  "version": "4.1.1-1",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 4465852625518b9c71bf5e0117144ff3a887a01d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 6 Jan 2021 10:58:11 +0000
Subject: [PATCH 1103/3183] credit for table

---
 lib/utils/helpers.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/utils/helpers.js b/lib/utils/helpers.js
index a7174113..9d671485 100644
--- a/lib/utils/helpers.js
+++ b/lib/utils/helpers.js
@@ -178,6 +178,11 @@ module.exports = {
     return [Math.round(h), Math.round(s * 100)]
   },
   m2hs: m => {
+    /*
+      table from (and credit to) HAP-NodeJS
+      it's here so it can be used for users with HB < 1.3
+      https://github.com/homebridge/HAP-NodeJS/blob/beta/src/lib/util/color-utils.ts
+    */
     const table = {
       100: [19, 222.1],
       101: [18.7, 222.2],

From 22d738e44580465404f8f96dfe0cb05a91dc1dfd Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 6 Jan 2021 11:13:53 +0000
Subject: [PATCH 1104/3183] tap to tap_one

---
 config.schema.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config.schema.json b/config.schema.json
index e0e0f7f6..1f981bf7 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -212,7 +212,7 @@
                 {
                   "title": "1 Tap/Faucet (using single channel device)",
                   "enum": [
-                    "tap"
+                    "tap_one"
                   ]
                 },
                 {

From 8764c4e802ed6896c27cc1f8028c5e9749dbce1d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 6 Jan 2021 11:25:11 +0000
Subject: [PATCH 1105/3183] 4.2.0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 77b805b9..0898b75b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.1.1-1",
+  "version": "4.2.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 2b156e11..6f582c23 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.1.1-1",
+  "version": "4.2.0",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 1a26aec5136a50f0f4fccfce345d185ce4a1021c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 6 Jan 2021 11:57:03 +0000
Subject: [PATCH 1106/3183] use ewedevice id

---
 lib/device/blind.js         | 2 +-
 lib/device/garage-eachen.js | 2 +-
 lib/device/garage-four.js   | 2 +-
 lib/device/garage-one.js    | 4 ++--
 lib/device/garage-two.js    | 4 ++--
 lib/device/lock.js          | 4 ++--
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/lib/device/blind.js b/lib/device/blind.js
index 6c406a0c..b5a4cb64 100644
--- a/lib/device/blind.js
+++ b/lib/device/blind.js
@@ -24,7 +24,7 @@ module.exports = class deviceBlind {
   async internalUpdate (value, callback) {
     try {
       callback()
-      const blindConfig = this.platform.cusG.get(this.accessory.context.hbDeviceId)
+      const blindConfig = this.platform.cusG.get(this.accessory.context.eweDeviceId)
       let prevPosition = this.accessory.context.cacheCurrentPosition
       if (value === prevPosition) return
       const params = { switches: this.helpers.defaultMultiSwitchOff }
diff --git a/lib/device/garage-eachen.js b/lib/device/garage-eachen.js
index e6c78272..579ae17f 100644
--- a/lib/device/garage-eachen.js
+++ b/lib/device/garage-eachen.js
@@ -24,7 +24,7 @@ module.exports = class deviceGarageEachen {
   async internalUpdate (value, callback) {
     try {
       callback()
-      const garageConfig = this.platform.cusG.get(this.accessory.context.hbDeviceId)
+      const garageConfig = this.platform.cusG.get(this.accessory.context.eweDeviceId)
       const params = { switch: value === 0 ? 'on' : 'off' }
       if (value === this.service.getCharacteristic(this.Characteristic.CurrentDoorState).value % 2) return
       this.inUse = true
diff --git a/lib/device/garage-four.js b/lib/device/garage-four.js
index 85cb7e1d..47ecbdf6 100644
--- a/lib/device/garage-four.js
+++ b/lib/device/garage-four.js
@@ -28,7 +28,7 @@ module.exports = class deviceGarageFour {
   async internalUpdate (garage, value, callback) {
     try {
       callback()
-      const garageConfig = this.platform.cusG.get(this.accessory.context.hbDeviceId)
+      const garageConfig = this.platform.cusG.get(this.accessory.context.eweDeviceId)
       let garageChannel
       switch (garage) {
         case 'A':
diff --git a/lib/device/garage-one.js b/lib/device/garage-one.js
index f682c01f..f38a3216 100644
--- a/lib/device/garage-one.js
+++ b/lib/device/garage-one.js
@@ -25,7 +25,7 @@ module.exports = class deviceGarageOne {
   async internalUpdate (value, callback) {
     try {
       callback()
-      const garageConfig = this.platform.cusG.get(this.accessory.context.hbDeviceId)
+      const garageConfig = this.platform.cusG.get(this.accessory.context.eweDeviceId)
       const sensorDefinition = garageConfig.sensorId || false
       let sAccessory = false
       const newPos = value
@@ -83,7 +83,7 @@ module.exports = class deviceGarageOne {
   async externalUpdate (params) {
     try {
       if (!this.helpers.hasProperty(params, 'switch') && !this.helpers.hasProperty(params, 'switches')) return
-      const garageConfig = this.platform.cusG.get(this.accessory.context.hbDeviceId)
+      const garageConfig = this.platform.cusG.get(this.accessory.context.eweDeviceId)
       if (this.inUse || garageConfig.sensorId) return
       const prevState = this.accessory.context.cacheCurrentDoorState
       const newPos = [0, 2].includes(prevState) ? 3 : 2
diff --git a/lib/device/garage-two.js b/lib/device/garage-two.js
index c86c6909..886d3931 100644
--- a/lib/device/garage-two.js
+++ b/lib/device/garage-two.js
@@ -28,7 +28,7 @@ module.exports = class deviceGarageTwo {
   async internalUpdate (garage, value, callback) {
     try {
       callback()
-      const garageConfig = this.platform.cusG.get(this.accessory.context.hbDeviceId)
+      const garageConfig = this.platform.cusG.get(this.accessory.context.eweDeviceId)
       const newPos = value
       const params = { switches: this.cacheSwitchState }
       const gdService = this.accessory.getService(garage)
@@ -80,7 +80,7 @@ module.exports = class deviceGarageTwo {
   externalUpdate (params) {
     try {
       if (!params.switches) return
-      const garageConfig = this.platform.cusG.get(this.accessory.context.hbDeviceId)
+      const garageConfig = this.platform.cusG.get(this.accessory.context.eweDeviceId)
       if (this.inUse) return
       this.cacheSwitchState = params.switches
       ;['1', '2'].forEach(async v => {
diff --git a/lib/device/lock.js b/lib/device/lock.js
index 6097cfac..9692457c 100644
--- a/lib/device/lock.js
+++ b/lib/device/lock.js
@@ -21,7 +21,7 @@ module.exports = class deviceLock {
   async internalUpdate (value, callback) {
     try {
       callback()
-      const lockConfig = this.platform.cusG.get(this.accessory.context.hbDeviceId)
+      const lockConfig = this.platform.cusG.get(this.accessory.context.eweDeviceId)
       const params = { switch: 'on' }
       this.inUse = true
       await this.platform.sendDeviceUpdate(this.accessory, params)
@@ -41,7 +41,7 @@ module.exports = class deviceLock {
   async externalUpdate (params) {
     try {
       if (!params.switch || params.switch === 'off' || this.inUse) return
-      const lockConfig = this.platform.cusG.get(this.accessory.context.hbDeviceId)
+      const lockConfig = this.platform.cusG.get(this.accessory.context.eweDeviceId)
       this.inUse = true
       this.service
         .updateCharacteristic(this.Characteristic.LockCurrentState, 0)

From 324031a5508a4d7e79b5981b48e1faed6e39ea73 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 6 Jan 2021 11:57:57 +0000
Subject: [PATCH 1107/3183] 4.2.1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 0898b75b..65f49f6f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.2.0",
+  "version": "4.2.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 6f582c23..5de3a4b5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.2.0",
+  "version": "4.2.1",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 663fa94b183dcaee051cccdc55029a02edfbfd5e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 7 Jan 2021 09:14:23 +0000
Subject: [PATCH 1108/3183] revert include node-dns-sd

---
 lib/node-dns-sd/LICENSE             |  21 -
 lib/node-dns-sd/dns-sd-classes.json |   6 -
 lib/node-dns-sd/dns-sd-composer.js  |  73 ----
 lib/node-dns-sd/dns-sd-parser.js    | 343 ----------------
 lib/node-dns-sd/dns-sd-types.json   |  52 ---
 lib/node-dns-sd/dns-sd.js           | 586 ----------------------------
 package-lock.json                   |   5 +
 package.json                        |   1 +
 8 files changed, 6 insertions(+), 1081 deletions(-)
 delete mode 100644 lib/node-dns-sd/LICENSE
 delete mode 100644 lib/node-dns-sd/dns-sd-classes.json
 delete mode 100644 lib/node-dns-sd/dns-sd-composer.js
 delete mode 100644 lib/node-dns-sd/dns-sd-parser.js
 delete mode 100644 lib/node-dns-sd/dns-sd-types.json
 delete mode 100644 lib/node-dns-sd/dns-sd.js

diff --git a/lib/node-dns-sd/LICENSE b/lib/node-dns-sd/LICENSE
deleted file mode 100644
index b412ce59..00000000
--- a/lib/node-dns-sd/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2018-2020 Futomi Hatano
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
\ No newline at end of file
diff --git a/lib/node-dns-sd/dns-sd-classes.json b/lib/node-dns-sd/dns-sd-classes.json
deleted file mode 100644
index d9f47867..00000000
--- a/lib/node-dns-sd/dns-sd-classes.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	"IN" : 1,
-	"CS" : 2,
-	"CH" : 3,
-	"HS" : 4
-}
\ No newline at end of file
diff --git a/lib/node-dns-sd/dns-sd-composer.js b/lib/node-dns-sd/dns-sd-composer.js
deleted file mode 100644
index 4ff70295..00000000
--- a/lib/node-dns-sd/dns-sd-composer.js
+++ /dev/null
@@ -1,73 +0,0 @@
-/* ------------------------------------------------------------------
-* node-dns-sd - dns-sd-composer.js
-*
-* Copyright (c) 2017, Futomi Hatano, All rights reserved.
-* Released under the MIT license
-* Date: 2018-10-25
-* ---------------------------------------------------------------- */
-'use strict';
-
-/* ------------------------------------------------------------------
-* Constructor: DnsSdComposer()
-* ---------------------------------------------------------------- */
-const DnsSdComposer = function() {
-	this._CLASSES = require('./dns-sd-classes.json');
-	this._TYPES = require('./dns-sd-types.json');
-};
-
-/* ------------------------------------------------------------------
-* Method: compose(params)
-* - params:
-*   - name    | Array  | Requred  | Servcie name.(e.g., ["_googlecast._tcp.local"])
-*   - type    | String | Optional | Query Type (e.g., "PTR"). The default value is "*"
-* ---------------------------------------------------------------- */
-DnsSdComposer.prototype.compose = function(params) {
-	let name_list = params['name'];
-	let type_name = params['type'];
-	let type_code = 0xff;
-	if(type_name) {
-		if(typeof(type_name) === 'string') {
-			if(this._TYPES[type_name]) {
-				type_code = this._TYPES[type_name];
-			} else {
-				throw new Error('The specified query type name is unknown: ' + type_name);
-			}
-		} else {
-			throw new Error('The specified query type is invalid.');
-		}
-	}
-
-	let hbuf = Buffer.from([ // Header
-		0x00, 0x00, // Transaction ID
-		0x00, 0x00, // Flags
-		0x00, name_list.length, // Questions
-		0x00, 0x00, // Answer PRs
-		0x00, 0x00, // Authority PRs
-		0x00, 0x00 // Additional PRs
-	]);
-
-	let qbuf_list = [];
-	name_list.forEach((name) => {
-		(name.split('.')).forEach((part) => {
-			let part_buf = Buffer.from(part, 'utf8');
-			qbuf_list.push(Buffer.from([part_buf.length]));
-			qbuf_list.push(part_buf);
-		});
-		qbuf_list.push(Buffer.from([0x00])); // Null-terminated string for the domain name
-
-		let type_buf = Buffer.alloc(2);
-		type_buf.writeUInt16BE(type_code, 0);
-		qbuf_list.push(type_buf);
-
-		let class_buf = Buffer.alloc(2);
-		class_buf.writeUInt16BE(this._CLASSES['IN'], 0);
-		qbuf_list.push(class_buf);
-	});
-	let qbuf = Buffer.concat(qbuf_list);
-
-	let buf = Buffer.concat([hbuf, qbuf]);
-	return buf;
-};
-
-module.exports = new DnsSdComposer();
-
diff --git a/lib/node-dns-sd/dns-sd-parser.js b/lib/node-dns-sd/dns-sd-parser.js
deleted file mode 100644
index aa96ebab..00000000
--- a/lib/node-dns-sd/dns-sd-parser.js
+++ /dev/null
@@ -1,343 +0,0 @@
-/* ------------------------------------------------------------------
-* node-dns-sd - dns-sd-parser.js
-*
-* Copyright (c) 2018-2019, Futomi Hatano, All rights reserved.
-* Released under the MIT license
-* Date: 2018-02-27
-
-* Related specifications:
-* - RFC 1035 (DOMAIN NAMES - IMPLEMENTATION AND SPECIFICATION)
-*     https://tools.ietf.org/html/rfc1035
-* - RFC 6762 (Multicast DNS)
-*     https://tools.ietf.org/html/rfc6762
-* - RFC 6763 (DNS-Based Service Discovery)
-*     https://tools.ietf.org/html/rfc6763
-* - RFC 2782 (A DNS RR for specifying the location of services (DNS SRV))
-*     https://tools.ietf.org/html/rfc2782
-* ---------------------------------------------------------------- */
-'use strict';
-
-/* ------------------------------------------------------------------
-* Constructor: DnsSdParser()
-* ---------------------------------------------------------------- */
-const DnsSdParser = function() {
-	this._CLASSES = require('./dns-sd-classes.json');
-	this._CLASS_MAP = {};
-	Object.keys(this._CLASSES).forEach((k) => {
-		this._CLASS_MAP[this._CLASSES[k]] = k;
-	});
-
-	this._TYPES = require('./dns-sd-types.json');
-	this._TYPE_MAP = {};
-	Object.keys(this._TYPES).forEach((k) => {
-		this._TYPE_MAP[this._TYPES[k]] = k;
-	});
-};
-
-/* ------------------------------------------------------------------
-* Method: parse(buf)
-* ---------------------------------------------------------------- */
-DnsSdParser.prototype.parse = function(buf) {
-	if(buf.length <= 12) {
-		return null;
-	}
-	let header = {
-		id: buf.readUInt16BE(0),
-		qr: buf.readUInt8(2) >> 7, // 0: Query, 1: Response
-		op: (buf.readUInt8(2) & 0b01111000) >> 3, // 0: Normal query, 4: Notify, 5: Update
-		aa: (buf.readUInt8(2) & 0b00000100) >> 2,
-		tc: (buf.readUInt8(2) & 0b00000010) >> 1,
-		rd: (buf.readUInt8(2) & 0b00000001),
-		ra: (buf.readUInt8(3) & 0b10000000) >> 7,
-		z : (buf.readUInt8(3) & 0b01000000) >> 6,
-		ad: (buf.readUInt8(3) & 0b00100000) >> 6,
-		cd: (buf.readUInt8(3) & 0b00010000) >> 5,
-		rc: (buf.readUInt8(3) & 0b00001111),
-		questions  : buf.readUInt16BE(4),
-		answers    : buf.readUInt16BE(6),
-		authorities: buf.readUInt16BE(8),
-		additionals: buf.readUInt16BE(10)
-	};
-	if(header['tc'] !== 0 || header['rd'] !== 0 || header['ra'] !== 0 || header['z'] !== 0 || header['ad'] !== 0 || header['cd'] !== 0 || header['rc'] !== 0) {
-		return null;
-	}
-	if(header['questions'] + header['answers'] + header['authorities'] + header['additionals'] === 0) {
-		return null;
-	}
-	let offset = 12;
-	let records = {
-		header: header,
-		questions: [],
-		answers: [],
-		authorities: [],
-		additionals: []
-	};
-	let record_count_list = [];
-	['questions', 'answers', 'authorities', 'additionals'].forEach((k) => {
-		let cnt = header[k];
-		if(cnt > 0) {
-			record_count_list.push({name: k, count: cnt});
-		}
-	});
-	let invalid = false;
-	while(true) {
-		let domain_name_parts = [];
-		let parsed = this._parseLabel(buf, offset);
-		let domain_name = '';
-		if(parsed) {
-			offset += parsed['length'];
-			domain_name = parsed['name'];
-		} else {
-			invalid = true;
-			break;
-		}
-
-		let record_key = record_count_list[0]['name'];
-		if(record_key === 'questions') {
-			if(offset + 4 > buf.length) {
-				invalid = true;
-				break;
-			}
-			let type_value = buf.readUInt16BE(offset);
-			let type = this._TYPE_MAP[type_value];
-			offset += 2;
-			let cls_value = buf.readUInt16BE(offset);
-			let cls = this._CLASS_MAP[cls_value];
-			offset += 2;
-			records[record_key].push({
-				name  : domain_name,
-				type  : type || '',
-				class : cls || ''
-			});
-		} else {
-			if(offset + 10 > buf.length) {
-				invalid = true;
-				break;
-			}
-			let type_value = buf.readUInt16BE(offset);
-			let type = this._TYPE_MAP[type_value] || '';
-			offset += 2;
-			let cls_value = buf.readUInt16BE(offset);
-			let cls = this._CLASS_MAP[cls_value & 0b0111111111111111];
-			let flash = (cls_value & 0b1000000000000000) ? true : false;
-			offset += 2;
-			let ttl = buf.readUInt32BE(offset);
-			offset += 4;
-			let rdlen = buf.readUInt16BE(offset);
-			offset += 2;
-			if(offset + rdlen > buf.length) {
-				invalid = true;
-				break;
-			}
-			let rdata = '';
-			let rdbuf = buf.slice(offset, offset + rdlen);
-			let rdata_txt_buffer = null;
-			if(type === 'A') {
-				rdata = this._parseRdataA(buf, offset, rdlen);
-			} else if(type === 'AAAA') {
-				rdata = this._parseRdataAAAA(buf, offset, rdlen);
-			} else if(type === 'PTR') {
-				rdata = this._parseRdataPtr(buf, offset, rdlen);
-			} else if(type === 'TXT') {
-				rdata = this._parseRdataTxt(buf, offset, rdlen);
-				rdata_txt_buffer = this._parseRdataTxt(buf, offset, rdlen, true);
-			} else if(type === 'SRV') {
-				rdata = this._parseRdataSrv(buf, offset, rdlen);
-			} else if(type === 'HINFO') {
-				rdata = this._parseRdataHinfo(buf, offset, rdlen);
-			} else {
-				rdata = this._parseRdataOther(buf, offset, rdlen);
-			}
-			offset += rdlen;
-
-			if(!rdata) {
-				invalid = true;
-				break;
-			}
-
-			let d = {	
-				name  : domain_name,
-				type  : type || '',
-				class : cls || '',
-				flash : flash,
-				ttl   : ttl,
-				rdata : rdata
-			};
-			if(rdata_txt_buffer) {
-				d['rdata_buffer'] = rdata_txt_buffer;
-			}
-			records[record_key].push(d);
-		}
-
-		if(offset >= buf.length) {
-			break;
-		}
-		record_count_list[0]['count'] --;
-		if(record_count_list[0]['count'] <= 0) {
-			record_count_list.shift();
-		}
-		if(record_count_list.length === 0) {
-			break;
-		}
-	}
-	if(invalid === true) {
-		return null;
-	} else {
-		return records;
-	};
-};
-
-DnsSdParser.prototype._parseLabel = function(buf, offset) {
-	let labels = [];
-	let length = 0;
-	let invalid = false;
-	while(true) {
-		let label_len = buf.readUInt8(offset + length);
-		if((label_len & 0b11000000) === 0b11000000) {
-			let i = buf.readUInt16BE(offset + length) & 0b0011111111111111;
-			let parsed = this._parseLabel(buf, i);
-			if(parsed) { 
-				labels.push(parsed['name']);
-				length += 2;
-				break;
-			} else {
-				invalid = true;
-				break;
-			}
-		} else if((label_len & 0b11000000) === 0b00000000) {
-			length += 1;
-			if(label_len === 0x00) {
-				break;
-			} else if(offset + length + label_len <= buf.length) {
-				let label = buf.slice(offset + length, offset + length + label_len).toString('utf8');
-				labels.push(label);
-				length += label_len;
-			} else {
-				invalid = true;
-				break;
-			}
-		} else {
-			invalid = true;
-			break;
-		}
-	}
-	if(invalid === true) {
-		return null;
-	} else {
-		return {
-			name   : labels.join('.'),
-			length : length
-		};
-	}
-};
-
-DnsSdParser.prototype._parseRdataA = function(buf, offset, len) {
-	let addr_parts = [];
-	for(let i=0; i<len; i++) {
-		addr_parts.push(buf.readUInt8(offset + i));
-	}
-	let addr = addr_parts.join('.');
-	return addr;
-};
-
-DnsSdParser.prototype._parseRdataAAAA = function(buf, offset, len) {
-	let addr_parts = [];
-	for(let i=0; i<len; i+=2) {
-		addr_parts.push(buf.slice(offset + i, offset + i + 2).toString('hex'));
-	}
-	let addr = addr_parts.join(':');
-	return addr;
-};
-
-DnsSdParser.prototype._parseRdataPtr = function(buf, offset, len) {
-	let parsed = this._parseLabel(buf, offset);
-	if(parsed) {
-		return parsed['name'];
-	} else {
-		return null;
-	}
-};
-
-DnsSdParser.prototype._parseRdataTxt = function(buf, offset, len, buf_flag) {
-	let labels = {};
-	let i = 0;
-	while(true) {
-		if(i >= len) {
-			break;
-		}
-		let blen = buf.readUInt8(offset + i);
-		i += 1;
-		if(i + blen <= len) {
-			let pair = buf.slice(offset + i, offset + i + blen).toString('utf8');
-			let m = pair.match(/^([^\=]+)\=(.*)/);
-			if(m) {
-				labels[m[1]] = m[2];
-				if(buf_flag) {
-					let s = offset + i + m[1].length + 1;
-					let e = offset + i + blen;
-					labels[m[1]] = buf.slice(s, e);
-				}
-			}
-			i += blen;
-		} else {
-			break;
-		}
-	}
-	return labels;
-};
-
-DnsSdParser.prototype._parseRdataSrv = function(buf, offset, len) {
-	if(len <= 6) {
-		return null;
-	}
-	let target = null;
-	let parsed = this._parseLabel(buf, offset + 6);
-	if(parsed) {
-		target = parsed['name'];
-	}
-	return {
-		priority : buf.readUInt16BE(offset),
-		weight   : buf.readUInt16BE(offset + 2),
-		port     : buf.readUInt16BE(offset + 4),
-		target   : target
-	};
-};
-
-DnsSdParser.prototype._parseRdataHinfo = function(buf, offset, len) {
-	let txt_list = [];
-	let i = 0;
-	while(true) {
-		if(i >= len) {
-			break;
-		}
-		let blen = buf.readUInt8(offset + i);
-		i += 1;
-		if(i + blen <= len) {
-			let v = buf.slice(offset + i, offset + i + blen).toString('utf8');
-			txt_list.push(v);
-			i += blen;
-		} else {
-			break;
-		}
-	}
-	let info = {};
-	if(txt_list[0]) {
-		info['cpu'] = txt_list[0];
-	}
-	if(txt_list[1]) {
-		info['os'] = txt_list[1];
-	}
-	return info;
-};
-
-DnsSdParser.prototype._parseRdataOther = function(buf, offset, len) {
-	let rdata_parts = [];
-	for(let i=0; i<len; i++) {
-		rdata_parts.push(buf.slice(offset + i, offset + i + 1).toString('hex'));
-	}
-	let rdata = rdata_parts.join(' ');
-	return rdata;
-};
-
-module.exports = new DnsSdParser();
-
diff --git a/lib/node-dns-sd/dns-sd-types.json b/lib/node-dns-sd/dns-sd-types.json
deleted file mode 100644
index 430ae5c4..00000000
--- a/lib/node-dns-sd/dns-sd-types.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-	"A" : 1,
-	"NS" : 2,
-	"MD" : 3,
-	"MF" : 4,
-	"CNAME" : 5,
-	"SOA" : 6,
-	"MB" : 7,
-	"MG" : 8,
-	"MR" : 9,
-	"NULL" : 10,
-	"WKS" : 11,
-	"PTR" : 12,
-	"HINFO" : 13,
-	"MINFO" : 14,
-	"MX" : 15,
-	"TXT" : 16,
-	"AAAA" : 28,
-	"AFSDB" : 18,
-	"APL" : 42,
-	"CAA" : 257,
-	"CDNSKEY" : 60,
-	"CDS" : 59,
-	"CERT" : 37,
-	"DHCID" : 49,
-	"DLV" : 32769,
-	"DNAME" : 39,
-	"DNSKEY" : 48,
-	"DS" : 43,
-	"HIP" : 55,
-	"IPSECKEY" : 45,
-	"KEY" : 25,
-	"KX" : 36,
-	"LOC" : 29,
-	"NAPTR" : 35,
-	"NSEC" : 47,
-	"NSEC3" : 50,
-	"NSEC3PARAM" : 51,
-	"OPENPGPKEY" : 61,
-	"RRSIG" : 46,
-	"RP" : 17,
-	"SIG" : 24,
-	"SRV" : 33,
-	"SSHFP" : 44,
-	"TA" : 32768,
-	"TKEY" : 249,
-	"TLSA" : 52,
-	"TSIG" : 250,
-	"URI" : 256,
-	"OPT": 41,
-	"*": 255
-}
\ No newline at end of file
diff --git a/lib/node-dns-sd/dns-sd.js b/lib/node-dns-sd/dns-sd.js
deleted file mode 100644
index d6aa36d8..00000000
--- a/lib/node-dns-sd/dns-sd.js
+++ /dev/null
@@ -1,586 +0,0 @@
-/* ------------------------------------------------------------------
-* node-dns-sd - dns-sd.js
-*
-* Copyright (c) 2018 - 2020, Futomi Hatano, All rights reserved.
-* Released under the MIT license
-* Date: 2020-09-30
-* ---------------------------------------------------------------- */
-'use strict';
-const mDgram = require('dgram');
-const mOs = require('os');
-const mDnsSdParser = require('./dns-sd-parser.js');
-const mDnsSdComposer = require('./dns-sd-composer.js');
-
-/* ------------------------------------------------------------------
-* Constructor: DnsSd()
-* ---------------------------------------------------------------- */
-const DnsSd = function () {
-	// Public
-	this.ondata = () => { };
-
-	// Private
-	this._MULTICAST_ADDR = '224.0.0.251';
-	this._UDP_PORT = 5353;
-	this._DISCOVERY_WAIT_DEFAULT = 3; // sec
-
-	this._udp = null;
-	this._source_address_list = [];
-	this._discovered_devices = {};
-	this._is_discovering = false;
-	this._is_monitoring = false;
-	this._is_listening = false;
-	this._onreceive = () => { };
-};
-
-/* ------------------------------------------------------------------
-* Method: discover(params)
-* - params   | Object    | Required |
-*   - name   | String or | Required | Servcie name.(e.g., "_googlecast._tcp.local")
-*            | Array     |          |
-*   - type   | String    | Optional | Query Type (e.g., "PTR"). The default value is "*".
-*   - key    | String    | Optional | "address" (default) or "fqdn".
-*            |           |          | - "address": IP address based discovery
-*            |           |          | - "fqdn": FQDN (service) based discovery
-*   - wait   | Integer   | Optional | Duration of monitoring. The default value is 3 (sec).
-*   - quick  | Boolean   | Optional | If `true`, this method returns immediately after
-*            |           |          | a device was found ignoring the value of the `wait`.
-*            |           |          | The default value is `false`.
-*   - filter | String or | Optional | If specified as a string, this method discovers only
-*            | Function  |          | devices which the string is found in the `fqdn`,
-*            |           |          | `address`, `modelName` or `familyName`.
-*            |           |          | If specified as a function, this method discovers 
-*            |           |          | only devices for which the function returns `true`. 
-* ---------------------------------------------------------------- */
-DnsSd.prototype.discover = function (params) {
-	let promise = new Promise((resolve, reject) => {
-		if (this._is_discovering === true) {
-			reject(new Error('The discovery process is running.'));
-			return;
-		}
-		// Check the parameters
-		let res = this._checkDiscoveryParameters(params);
-		if (res['error']) {
-			reject(res['error']);
-			return;
-		}
-		let device_list = [];
-		this._startListening().then(() => {
-			return this._startDiscovery(res['params']);
-		}).then(() => {
-			for (let addr in this._discovered_devices) {
-				let device = this._discovered_devices[addr];
-				device_list.push(device);
-			}
-			this._stopDiscovery().then(() => {
-				resolve(device_list);
-			});
-		}).catch((error) => {
-			this._stopDiscovery().then(() => {
-				reject(error);
-			});
-		});
-	});
-	return promise;
-};
-
-DnsSd.prototype._createDeviceObject = function (packet) {
-	let o = {};
-
-	let trecs = {};
-	['answers', 'authorities', 'additionals'].forEach((k) => {
-		packet[k].forEach((r) => {
-			let type = r['type'];
-			if (!trecs[type]) {
-				trecs[type] = [];
-			}
-			trecs[type].push(r);
-		});
-	});
-
-	o['address'] = null;
-	if (trecs['A']) {
-		o['address'] = trecs['A'][0]['rdata'];
-	}
-	if (!o['address']) {
-		o['address'] = packet['address'];
-	}
-
-	o['fqdn'] = null;
-	let hostname = null;
-	if (trecs['PTR']) {
-		let rec = trecs['PTR'][0];
-		o['fqdn'] = rec['rdata'];
-	}
-
-	o['modelName'] = null;
-	o['familyName'] = null;
-	if (trecs['TXT'] && trecs['TXT'][0] && trecs['TXT'][0]['rdata']) {
-		let r = trecs['TXT'][0];
-		let d = r['rdata'] || {};
-		let name = r['name'] || '';
-		if (/Apple TV/.test(name)) {
-			o['modelName'] = 'Apple TV';
-			if (trecs['TXT']) {
-				for (let i = 0; i < trecs['TXT'].length; i++) {
-					let r = trecs['TXT'][i];
-					if ((/_device-info/).test(r['name']) && r['rdata'] && r['rdata']['model']) {
-						o['modelName'] = 'Apple TV ' + r['rdata']['model'];
-						break;
-					}
-				}
-			}
-		} else if (/_googlecast/.test(name)) {
-			o['modelName'] = d['md'] || null;
-			o['familyName'] = d['fn'] || null;
-		} else if (/Philips hue/.test(name)) {
-			o['modelName'] = 'Philips hue';
-			if (d['md']) {
-				o['modelName'] += ' ' + d['md'];
-			}
-		} else if (/Canon/.test(name)) {
-			o['modelName'] = d['ty'] || null;
-		}
-	}
-	if (!o['modelName']) {
-		if (trecs['A'] && trecs['A'][0]) {
-			let r = trecs['A'][0];
-			let name = r['name'];
-			if (/Apple\-TV/.test(name)) {
-				o['modelName'] = 'Apple TV';
-			} else if (/iPad/.test(name)) {
-				o['modelName'] = 'iPad';
-			}
-		}
-	}
-
-	if (!o['modelName']) {
-		if (o['fqdn']) {
-			let hostname = (o['fqdn'].split('.')).shift();
-			if (hostname && / /.test(hostname)) {
-				o['modelName'] = hostname;
-			}
-		}
-	}
-
-	o['service'] = null;
-	if (trecs['SRV']) {
-		let rec = trecs['SRV'][0];
-		let name_parts = rec['name'].split('.');
-		name_parts.reverse();
-		o['service'] = {
-			port: rec['rdata']['port'],
-			protocol: name_parts[1].replace(/^_/, ''),
-			type: name_parts[2].replace(/^_/, '')
-		};
-	}
-
-	o['packet'] = packet;
-	return o;
-};
-
-DnsSd.prototype._checkDiscoveryParameters = function (params) {
-	let p = {};
-	if (params) {
-		if (typeof (params) !== 'object') {
-			return { error: new Error('The argument `params` is invalid.') };
-		}
-	} else {
-		return { error: new Error('The argument `params` is required.') };
-	}
-
-	if ('name' in params) {
-		let v = params['name'];
-		if (typeof (v) === 'string') {
-			if (v === '') {
-				return { error: new Error('The `name` must be an non-empty string.') };
-			}
-			p['name'] = [v];
-		} else if (Array.isArray(v)) {
-			if (v.length === 0) {
-				return { error: new Error('The `name` must be a non-empty array.') };
-			} else if (v.length > 255) {
-				return { error: new Error('The `name` can include up to 255 elements.') };
-			}
-			let err = null;
-			let list = [];
-			for (let i = 0; i < v.length; i++) {
-				if (typeof (v[i]) === 'string' && v[i] !== '') {
-					list.push(v[i]);
-				} else {
-					err = new Error('The `name` must be an Array object including non-empty strings.');
-					break;
-				}
-			}
-			if (err) {
-				return { error: err };
-			}
-			p['name'] = list;
-		} else {
-			return { error: new Error('The `name` must be a string or an Array object.') };
-		}
-	} else {
-		return { error: new Error('The `name` is required.') };
-	}
-
-
-	if ('type' in params) {
-		let v = params['type'];
-		if (typeof (v) !== 'string' || !(/^[a-zA-Z0-9]{1,10}$/.test(v) || v === '*')) {
-			return { error: new Error('The `type` is invalid.') };
-		}
-		p['type'] = v.toUpperCase();
-	}
-
-	if ('key' in params) {
-		let v = params['key'];
-		if (typeof (v) !== 'string' || !/^(address|fqdn)$/.test(v)) {
-			return { error: new Error('The `key` is invalid.') };
-		}
-		if (!v) {
-			v = 'address';
-		}
-		p['key'] = v;
-	}
-
-	if ('wait' in params) {
-		let v = params['wait'];
-		if (typeof (v) !== 'number' || v <= 0 || v % 1 !== 0) {
-			return { error: new Error('The `wait` is invalid.') };
-		}
-		p['wait'] = v;
-	}
-
-	if ('quick' in params) {
-		let v = params['quick'];
-		if (typeof (v) !== 'boolean') {
-			return { error: new Error('The `quick` must be a boolean.') };
-		}
-		p['quick'] = v;
-	} else {
-		p['quick'] = false;
-	}
-
-	if (`filter` in params) {
-		let v = params['filter'];
-		if (typeof (v) !== 'string' && typeof (v) !== 'function') {
-			return { error: new Error('The `filter` must be a string.') };
-		}
-		if (v) {
-			p['filter'] = v;
-		}
-	}
-
-	return { params: p };
-};
-
-DnsSd.prototype._startDiscovery = function (params) {
-	let promise = new Promise((resolve, reject) => {
-		this._discovered_devices = {};
-		this._is_discovering = true;
-		let wait = (params && params['wait']) ? params['wait'] : this._DISCOVERY_WAIT_DEFAULT;
-		// Create a request packet
-		let buf = mDnsSdComposer.compose({
-			name: params['name'],
-			type: params['type']
-		});
-
-		// Timer
-		let send_timer = null;
-		let wait_timer = null;
-
-		let clearTimer = () => {
-			if (send_timer) {
-				clearTimeout(send_timer);
-				send_timer = null;
-			}
-			if (wait_timer) {
-				clearTimeout(wait_timer);
-				wait_timer = null;
-			}
-			this._onreceive = () => { };
-		};
-
-		wait_timer = setTimeout(() => {
-			clearTimer();
-			resolve();
-		}, wait * 1000);
-
-		let quick = params['quick'];
-		let key = params['key'];
-		if (!key) {
-			key = 'address';
-		}
-		this._onreceive = (addr, packet) => {
-			if (!this._isTargettedDevice(packet, params['name'])) {
-				return;
-			}
-			let device = this._createDeviceObject(packet);
-			if (!this._evaluateDeviceFilter(device, params['filter'])) {
-				return;
-			}
-			if (key === 'fqdn') {
-				let fqdn = device['fqdn'];
-				this._discovered_devices[fqdn] = device;
-			} else {
-				this._discovered_devices[addr] = device;
-			}
-			if (quick) {
-				clearTimer();
-				resolve();
-			}
-		};
-
-		// Send a packet
-		let send_num = 0;
-		let sendQueryPacket = () => {
-			this._udp.send(buf, 0, buf.length, this._UDP_PORT, this._MULTICAST_ADDR, (error, bytes) => {
-				if (error) {
-					clearTimer();
-					reject(error);
-				} else {
-					send_num++;
-					if (send_num < 3) {
-						send_timer = setTimeout(() => {
-							sendQueryPacket();
-						}, 1000);
-					} else {
-						send_timer = null;
-					}
-				}
-			});
-		};
-		sendQueryPacket();
-	});
-	return promise;
-};
-
-DnsSd.prototype._isTargettedDevice = function (packet, name_list) {
-	let hit = false;
-	packet['answers'].forEach((ans) => {
-		let name = ans['name'];
-		if (name && name_list.indexOf(name) >= 0) {
-			hit = true;
-		}
-	});
-	return hit;
-};
-
-DnsSd.prototype._evaluateDeviceFilter = function (device, filter) {
-	if (filter) {
-		let filter_type = typeof (filter);
-		if (filter_type === 'string') {
-			return this._evaluateDeviceFilterString(device, filter);
-		} else if (filter_type === 'function') {
-			return this._evaluateDeviceFilterFunction(device, filter);
-		} else {
-			return false;
-		}
-	} else {
-		return true;
-	}
-};
-
-DnsSd.prototype._evaluateDeviceFilterString = function (device, filter) {
-	if (device['fqdn'] && device['fqdn'].indexOf(filter) >= 0) {
-		return true;
-	}
-	if (device['address'] && device['address'].indexOf(filter) >= 0) {
-		return true;
-	}
-	if (device['modelName'] && device['modelName'].indexOf(filter) >= 0) {
-		return true;
-	}
-	if (device['familyName'] && device['familyName'].indexOf(filter) >= 0) {
-		return true;
-	}
-	return false;
-};
-
-DnsSd.prototype._evaluateDeviceFilterFunction = function (device, filter) {
-	let res = false;
-	try {
-		res = filter(device);
-	} catch (e) { }
-	res = res ? true : false;
-	return res;
-};
-
-DnsSd.prototype._stopDiscovery = function () {
-	let promise = new Promise((resolve, reject) => {
-		this._discovered_devices = {};
-		this._is_discovering = false;
-		this._stopListening().then(() => {
-			resolve();
-		}).catch((error) => {
-			resolve();
-		});
-	});
-	return promise;
-};
-
-DnsSd.prototype._addMembership = function () {
-	this._source_address_list.forEach((netif) => {
-		try {
-			this._udp.addMembership(this._MULTICAST_ADDR, netif);
-		} catch(e) {
-			console.log(`Catching error on address already in use: ${JSON.stringify(e)}`);
-		}
-	});
-};
-
-DnsSd.prototype._dropMembership = function () {
-	this._source_address_list.forEach((netif) => {
-		try {
-			this._udp.dropMembership(this._MULTICAST_ADDR, netif);
-		} catch(e) {
-			console.log(`Catching error on dropMembership: ${JSON.stringify(e)}`);
-		}
-	});
-};
-
-DnsSd.prototype._getSourceAddressList = function () {
-	let list = [];
-	let netifs = mOs.networkInterfaces();
-	for (let dev in netifs) {
-		netifs[dev].forEach((info) => {
-			if (info.family === 'IPv4' && info.internal === false) {
-				let m = info.address.match(/^(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})/);
-				if (m) {
-					list.push(m[1]);
-				}
-			}
-		});
-	}
-	return list;
-};
-
-/* ------------------------------------------------------------------
-* Method: startMonitoring()
-* ---------------------------------------------------------------- */
-DnsSd.prototype.startMonitoring = function () {
-	let promise = new Promise((resolve, reject) => {
-		if (this._is_monitoring === true) {
-			resolve();
-			return;
-		}
-		this._startListening().then(() => {
-			this._is_monitoring = true;
-			resolve();
-		}).catch((error) => {
-			this._is_monitoring = false;
-			this._stopListening().then(() => {
-				reject(error);
-			});
-		});
-	});
-	return promise;
-};
-
-/* ------------------------------------------------------------------
-* Method: stopMonitoring()
-* ---------------------------------------------------------------- */
-DnsSd.prototype.stopMonitoring = function () {
-	let promise = new Promise((resolve, reject) => {
-		this._is_monitoring = false;
-		this._stopListening().then(() => {
-			resolve();
-		}).catch((error) => {
-			resolve();
-		});
-	});
-	return promise;
-};
-
-DnsSd.prototype._startListening = function () {
-	let promise = new Promise((resolve, reject) => {
-		if (this._is_listening === true) {
-			resolve();
-			return;
-		}
-		// Get the source IP address
-		this._source_address_list = this._getSourceAddressList();
-		// Set up a UDP tranceiver
-		this._udp = mDgram.createSocket({
-			type: 'udp4',
-			reuseAddr: true
-		});
-		this._udp.once('error', (error) => {
-			this._is_listening = false;
-			reject(error);
-			return;
-		});
-		this._udp.once('listening', () => {
-			this._udp.setMulticastLoopback(false);
-			this._addMembership();
-			this._is_listening = true;
-			resolve();
-			return;
-		});
-		this._udp.on('message', (buf, rinfo) => {
-			this._receivePacket(buf, rinfo);
-		});
-		this._udp.bind({ port: this._UDP_PORT }, () => {
-			this._udp.removeAllListeners('error');
-		});
-	});
-	return promise;
-};
-
-DnsSd.prototype._stopListening = function () {
-	let promise = new Promise((resolve, reject) => {
-		this._dropMembership();
-		if (this._is_discovering || this._is_monitoring) {
-			resolve();
-		} else {
-			let cleanObj = () => {
-				if (this._udp) {
-					this._udp.unref();
-					this._udp = null;
-				}
-				this._is_listening = false;
-				resolve();
-			};
-			if (this._udp) {
-				this._udp.removeAllListeners('message');
-				this._udp.removeAllListeners('error');
-				this._udp.removeAllListeners('listening');
-				this._udp.close(() => {
-					cleanObj();
-				});
-			} else {
-				cleanObj();
-			}
-		}
-	});
-	return promise;
-};
-
-DnsSd.prototype._receivePacket = function (buf, rinfo) {
-	let p = mDnsSdParser.parse(buf);
-	if (!p) {
-		return;
-	}
-	p['address'] = rinfo.address;
-	if (this._is_discovering) {
-		if (this._isAnswerPacket(p, rinfo.address)) {
-			this._onreceive(rinfo.address, p);
-		}
-	}
-	if (this._is_monitoring) {
-		if (typeof (this.ondata) === 'function') {
-			this.ondata(p);
-		}
-	}
-};
-
-DnsSd.prototype._isAnswerPacket = function (p, address) {
-	if (this._source_address_list.indexOf(address) >= 0) {
-		return false;
-	}
-	if (!(p['header']['qr'] === 1 && p['header']['op'] === 0)) {
-		return false;
-	}
-	return true;
-};
-
-module.exports = new DnsSd();
diff --git a/package-lock.json b/package-lock.json
index 65f49f6f..71fda4f9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -126,6 +126,11 @@
         "has-symbols": "^1.0.1"
       }
     },
+    "node-dns-sd": {
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/node-dns-sd/-/node-dns-sd-0.4.2.tgz",
+      "integrity": "sha512-fZvDqy19zyaiSXajmRjwue1VWLrJcy8bTV/LJVtAx8DeEFVlXRBMyZknW+q6CEfiW8Y4MQDDKh9x5wF32BHAHQ=="
+    },
     "object-inspect": {
       "version": "1.9.0",
       "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.9.0.tgz",
diff --git a/package.json b/package.json
index 5de3a4b5..0893fd5e 100644
--- a/package.json
+++ b/package.json
@@ -48,6 +48,7 @@
   "dependencies": {
     "@homebridge/plugin-ui-utils": "^0.0.17",
     "axios": "^0.21.1",
+    "node-dns-sd": "^0.4.2",
     "websocket-as-promised": "^1.1.0",
     "ws": "^7.4.2"
   },

From 126dc3004cb00a1a48179d0b2f9b7af3470c4885 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 7 Jan 2021 09:14:30 +0000
Subject: [PATCH 1109/3183] catch errors in parse packet

---
 lib/connection/lan.js | 112 ++++++++++++++++++++++--------------------
 1 file changed, 58 insertions(+), 54 deletions(-)

diff --git a/lib/connection/lan.js b/lib/connection/lan.js
index f4c5603c..93376f20 100644
--- a/lib/connection/lan.js
+++ b/lib/connection/lan.js
@@ -47,67 +47,71 @@ module.exports = class connectionLAN {
   async startMonitor () {
     // *** Function to parse DNS packets picked up by node-dns-sd *** \\
     this.dns.ondata = packet => {
-      if (!packet.answers) return
-      packet.answers
-        .filter(value => value.name.includes('_ewelink._tcp.local'))
-        .filter(value => value.type === 'TXT')
-        .filter(value => this.deviceMap.has(value.rdata.id))
-        .forEach(value => {
-          const rdata = value.rdata
-
-          // *** Check the packet relates to a device in our map *** \\
-          const deviceInfo = this.deviceMap.get(rdata.id)
-
-          // *** Skip the update if it's a duplicate *** \\
-          if (deviceInfo.lastIV === rdata.iv) return
-          deviceInfo.lastIV = rdata.iv
-          const data =
+      try {
+        if (!packet.answers) return
+        packet.answers
+          .filter(value => value.name.includes('_ewelink._tcp.local'))
+          .filter(value => value.type === 'TXT')
+          .filter(value => this.deviceMap.has(value.rdata.id))
+          .forEach(value => {
+            const rdata = value.rdata
+
+            // *** Check the packet relates to a device in our map *** \\
+            const deviceInfo = this.deviceMap.get(rdata.id)
+
+            // *** Skip the update if it's a duplicate *** \\
+            if (deviceInfo.lastIV === rdata.iv) return
+            deviceInfo.lastIV = rdata.iv
+            const data =
             rdata.data1 +
             (this.helpers.hasProperty(rdata, 'data2') ? rdata.data2 : '') +
             (this.helpers.hasProperty(rdata, 'data3') ? rdata.data3 : '') +
             (this.helpers.hasProperty(rdata, 'data4') ? rdata.data4 : '')
-          const key = this.crypto.createHash('md5').update(Buffer.from(deviceInfo.apiKey, 'utf8')).digest()
-          const dText = this.crypto.createDecipheriv('aes-128-cbc', key, Buffer.from(rdata.iv, 'base64'))
-          const pText = Buffer.concat([dText.update(Buffer.from(data, 'base64')), dText.final()]).toString('utf8')
-
-          // *** Check to see if the IP address of the device has changed *** \\
-          if (packet.address !== deviceInfo.ip && !this.ipOverride[rdata.id]) {
-            this.deviceMap.set(rdata.id, {
-              apiKey: deviceInfo.apiKey,
-              ip: packet.address,
-              lastIV: rdata.iv
-            })
-          }
-
-          // *** Parse the deconstructed information from the packet *** \\
-          let params
-          try {
-            params = JSON.parse(pText)
-          } catch (e) {
-            this.log.warn('[%s] LAN message received could not be read [%s]:\n%s', rdata.id, e, pText)
-            return
-          }
-
-          // *** Remove any params we don't need *** \\
-          for (const param in params) {
-            if (this.helpers.hasProperty(params, param)) {
-              if (!this.helpers.paramsToKeep.includes(param.replace(/[0-9]/g, ''))) {
-                delete params[param]
+            const key = this.crypto.createHash('md5').update(Buffer.from(deviceInfo.apiKey, 'utf8')).digest()
+            const dText = this.crypto.createDecipheriv('aes-128-cbc', key, Buffer.from(rdata.iv, 'base64'))
+            const pText = Buffer.concat([dText.update(Buffer.from(data, 'base64')), dText.final()]).toString('utf8')
+
+            // *** Check to see if the IP address of the device has changed *** \\
+            if (packet.address !== deviceInfo.ip && !this.ipOverride[rdata.id]) {
+              this.deviceMap.set(rdata.id, {
+                apiKey: deviceInfo.apiKey,
+                ip: packet.address,
+                lastIV: rdata.iv
+              })
+            }
+
+            // *** Parse the deconstructed information from the packet *** \\
+            let params
+            try {
+              params = JSON.parse(pText)
+            } catch (e) {
+              this.log.warn('[%s] LAN message received could not be read [%s]:\n%s', rdata.id, e, pText)
+              return
+            }
+
+            // *** Remove any params we don't need *** \\
+            for (const param in params) {
+              if (this.helpers.hasProperty(params, param)) {
+                if (!this.helpers.paramsToKeep.includes(param.replace(/[0-9]/g, ''))) {
+                  delete params[param]
+                }
               }
             }
-          }
-
-          // *** If any params are left then generate the template to be emitted *** \\
-          if (Object.keys(params).length > 0) {
-            params.online = true
-            params.updateSource = 'LAN'
-            const returnTemplate = {
-              deviceid: rdata.id,
-              params
+
+            // *** If any params are left then generate the template to be emitted *** \\
+            if (Object.keys(params).length > 0) {
+              params.online = true
+              params.updateSource = 'LAN'
+              const returnTemplate = {
+                deviceid: rdata.id,
+                params
+              }
+              this.emitter.emit('update', returnTemplate)
             }
-            this.emitter.emit('update', returnTemplate)
-          }
-        })
+          })
+      } catch (err) {
+        this.log.warn('Could not parse DNS packet as %s', this.debug ? err : err.message)
+      }
     }
 
     // *** Start the DNS packet monitoring *** \\

From bd060fed1aec6c50a195a7d6da2d50a98ea9d8a6 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 7 Jan 2021 13:59:36 +0000
Subject: [PATCH 1110/3183] code formatting

---
 lib/device/diffuser.js     |  4 +---
 lib/device/fan.js          |  4 +---
 lib/device/light-colour.js |  4 +---
 lib/device/th-outlet.js    |  7 +++----
 lib/device/th-thermo.js    |  8 ++------
 lib/device/zb-dev.js       | 17 +++++++++--------
 6 files changed, 17 insertions(+), 27 deletions(-)

diff --git a/lib/device/diffuser.js b/lib/device/diffuser.js
index 634c8aaa..cde107f2 100644
--- a/lib/device/diffuser.js
+++ b/lib/device/diffuser.js
@@ -17,9 +17,7 @@ module.exports = class deviceDiffuser {
     this.fanService
       .getCharacteristic(this.Characteristic.RotationSpeed)
       .on('set', this.internalDiffuserSpeedUpdate.bind(this))
-      .setProps({
-        minStep: 50
-      })
+      .setProps({ minStep: 50 })
     this.lightService
       .getCharacteristic(this.Characteristic.On)
       .on('set', this.internalLightOnOffUpdate.bind(this))
diff --git a/lib/device/fan.js b/lib/device/fan.js
index 8acc3696..6b72d8cd 100644
--- a/lib/device/fan.js
+++ b/lib/device/fan.js
@@ -18,9 +18,7 @@ module.exports = class deviceFan {
     this.service
       .getCharacteristic(this.Characteristic.RotationSpeed)
       .on('set', this.internalSpeedUpdate.bind(this))
-      .setProps({
-        minStep: 33
-      })
+      .setProps({ minStep: 33 })
     if ((this.platform.config.hideLightFromFan || '').split(',').includes(accessory.context.eweDeviceId)) {
       if (accessory.getService(this.Service.Lightbulb)) {
         accessory.removeService(accessory.getService(this.Service.Lightbulb))
diff --git a/lib/device/light-colour.js b/lib/device/light-colour.js
index c18643d7..9825e359 100644
--- a/lib/device/light-colour.js
+++ b/lib/device/light-colour.js
@@ -26,9 +26,7 @@ module.exports = class deviceLightColour {
       // *** B1 doesn't support brightness *** \\
       this.service
         .getCharacteristic(this.Characteristic.Brightness)
-        .setProps({
-          minStep: 100
-        })
+        .setProps({ minStep: 100 })
     }
     this.accessory = accessory
     if ([59, 104].includes(accessory.context.eweUIID)) {
diff --git a/lib/device/th-outlet.js b/lib/device/th-outlet.js
index e4865048..066d2cc4 100644
--- a/lib/device/th-outlet.js
+++ b/lib/device/th-outlet.js
@@ -24,10 +24,9 @@ module.exports = class deviceTHOutlet {
         .on('set', this.internalUpdate.bind(this))
     }
     this.tempService = accessory.getService(this.Service.TemperatureSensor) || accessory.addService(this.Service.TemperatureSensor)
-    this.tempService.getCharacteristic(this.Characteristic.CurrentTemperature)
-      .setProps({
-        minValue: -100
-      })
+    this.tempService
+      .getCharacteristic(this.Characteristic.CurrentTemperature)
+      .setProps({ minValue: -100 })
     if (accessory.context.sensorType !== 'DS18B20') {
       this.humiService = accessory.getService(this.Service.HumiditySensor) || accessory.addService(this.Service.HumiditySensor)
     }
diff --git a/lib/device/th-thermo.js b/lib/device/th-thermo.js
index abfa98fc..0f813b8e 100644
--- a/lib/device/th-thermo.js
+++ b/lib/device/th-thermo.js
@@ -20,15 +20,11 @@ module.exports = class deviceTHThermo {
     }
     this.service = accessory.getService(this.Service.Thermostat) || accessory.addService(this.Service.Thermostat)
     this.service.getCharacteristic(this.Characteristic.CurrentTemperature)
-      .setProps({
-        minValue: -100
-      })
+      .setProps({ minValue: -100 })
     this.service
       .getCharacteristic(this.Characteristic.TargetHeatingCoolingState)
       .on('set', this.internalOnOffUpdate.bind(this))
-      .setProps({
-        validValues: [0, 1]
-      })
+      .setProps({ validValues: [0, 1] })
     this.service
       .getCharacteristic(this.Characteristic.TargetTemperature)
       .on('set', this.internalTempUpdate.bind(this))
diff --git a/lib/device/zb-dev.js b/lib/device/zb-dev.js
index 43a4c427..421ba14d 100644
--- a/lib/device/zb-dev.js
+++ b/lib/device/zb-dev.js
@@ -40,15 +40,17 @@ module.exports = class deviceZBDev {
           accessory.getService(this.Service.StatelessProgrammableSwitch) ||
           accessory.addService(this.Service.StatelessProgrammableSwitch)
         if (this.platform.config.hideZBLDPress) {
-          zbspsService.getCharacteristic(this.Characteristic.ProgrammableSwitchEvent).setProps({
-            validValues: [0]
-          })
+          zbspsService
+            .getCharacteristic(this.Characteristic.ProgrammableSwitchEvent)
+            .setProps({ validValues: [0] })
         }
         break
       }
       case 1009:
       case 1256:
-        if (accessory.getService(this.Service.BatteryService)) accessory.removeService(accessory.getService(this.Service.BatteryService))
+        if (accessory.getService(this.Service.BatteryService)) {
+          accessory.removeService(accessory.getService(this.Service.BatteryService))
+        }
         if (!accessory.getService(this.Service.Switch)) accessory.addService(this.Service.Switch)
         accessory.log = this.log
         accessory.eveService = new this.platform.eveService('switch', accessory)
@@ -59,10 +61,9 @@ module.exports = class deviceZBDev {
       case 1770: {
         if (!accessory.getService(this.Service.BatteryService)) accessory.addService(this.Service.BatteryService)
         const tempService = accessory.getService(this.Service.TemperatureSensor) || accessory.addService(this.Service.TemperatureSensor)
-        tempService.getCharacteristic(this.Characteristic.CurrentTemperature)
-          .setProps({
-            minValue: -100
-          })
+        tempService
+          .getCharacteristic(this.Characteristic.CurrentTemperature)
+          .setProps({ minValue: -100 })
         if (!accessory.getService(this.Service.HumiditySensor)) accessory.addService(this.Service.HumiditySensor)
         accessory.log = this.log
         accessory.eveService = new this.platform.eveService('weather', accessory)

From ed5eae8c6834a9bc4e08296ef0935292a36dad20 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 7 Jan 2021 14:11:48 +0000
Subject: [PATCH 1111/3183] export colourUtils

---
 lib/device/diffuser.js     |   7 +-
 lib/device/light-colour.js |  17 +-
 lib/index.js               |   1 +
 lib/utils/colour-utils.js  | 478 +++++++++++++++++++++++++++++++++++++
 lib/utils/helpers.js       | 473 ------------------------------------
 5 files changed, 492 insertions(+), 484 deletions(-)
 create mode 100644 lib/utils/colour-utils.js

diff --git a/lib/device/diffuser.js b/lib/device/diffuser.js
index cde107f2..d98f6f32 100644
--- a/lib/device/diffuser.js
+++ b/lib/device/diffuser.js
@@ -6,6 +6,7 @@ module.exports = class deviceDiffuser {
     this.platform = platform
     this.log = platform.log
     this.helpers = platform.helpers
+    this.colourUtils = platform.colourUtils
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
     this.fanService = accessory.getService('Diffuser') || accessory.addService(this.Service.Fan, 'Diffuser', 'diffuser')
@@ -131,10 +132,10 @@ module.exports = class deviceDiffuser {
       callback()
       const updateKeyColour = Math.random().toString(36).substr(2, 8)
       this.updateKeyColour = updateKeyColour
-      const newRGB = this.helpers.hs2rgb([
+      const newRGB = this.colourUtils.hs2rgb(
         value,
         this.accessory.getService('Light').getCharacteristic(this.Characteristic.Saturation).value
-      ])
+      )
       this.cacheR = newRGB[0]
       this.cacheG = newRGB[0]
       this.cacheB = newRGB[0]
@@ -190,7 +191,7 @@ module.exports = class deviceDiffuser {
           this.cacheR = params.lightRcolor
           this.cacheG = params.lightGcolor
           this.cacheB = params.lightBcolor
-          const newColour = this.helpers.rgb2hs([this.cacheR, this.cacheG, this.cacheB])
+          const newColour = this.colourUtils.rgb2hs(this.cacheR, this.cacheG, this.cacheB)
           this.cacheHue = newColour[0]
           this.lightService
             .updateCharacteristic(this.Characteristic.Hue, this.cacheHue)
diff --git a/lib/device/light-colour.js b/lib/device/light-colour.js
index 9825e359..a3db5166 100644
--- a/lib/device/light-colour.js
+++ b/lib/device/light-colour.js
@@ -6,6 +6,7 @@ module.exports = class deviceLightColour {
     this.platform = platform
     this.log = platform.log
     this.helpers = platform.helpers
+    this.colourUtils = platform.colourUtils
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
     this.isB1 = accessory.context.eweUIID === 22
@@ -133,7 +134,7 @@ module.exports = class deviceLightColour {
       this.service.updateCharacteristic(this.Characteristic.ColorTemperature, 140)
       callback()
       let params
-      const newRGB = this.helpers.hs2rgb([value, this.service.getCharacteristic(this.Characteristic.Saturation).value])
+      const newRGB = this.colourUtils.hs2rgb(value, this.service.getCharacteristic(this.Characteristic.Saturation).value)
       this.cacheR = newRGB[0]
       this.cacheG = newRGB[1]
       this.cacheB = newRGB[2]
@@ -197,7 +198,7 @@ module.exports = class deviceLightColour {
         return
       }
       this.cacheMired = value
-      const hs = this.helpers.m2hs(this.cacheMired)
+      const hs = this.colourUtils.m2hs(this.cacheMired)
       this.cacheHue = hs[0]
       this.service
         .updateCharacteristic(this.Characteristic.Hue, this.cacheHue)
@@ -212,10 +213,10 @@ module.exports = class deviceLightColour {
       switch (this.accessory.context.eweUIID) {
         case 59: {
           // *** L1 *** \\
-          const newRGB = this.helpers.hs2rgb([
+          const newRGB = this.colourUtils.hs2rgb(
             hs[0],
             this.service.getCharacteristic(this.Characteristic.Saturation).value
-          ])
+          )
           this.cacheR = newRGB[0]
           this.cacheG = newRGB[1]
           this.cacheB = newRGB[2]
@@ -290,7 +291,7 @@ module.exports = class deviceLightColour {
                 this.cacheR = parseInt(params.channel2)
                 this.cacheG = parseInt(params.channel3)
                 this.cacheB = parseInt(params.channel4)
-                hs = this.helpers.rgb2hs([this.cacheR, this.cacheG, this.cacheB])
+                hs = this.colourUtils.rgb2hs(this.cacheR, this.cacheG, this.cacheB)
                 this.cacheHue = hs[0]
                 this.service
                   .updateCharacteristic(this.Characteristic.Hue, this.cacheHue)
@@ -323,7 +324,7 @@ module.exports = class deviceLightColour {
               this.cacheR = params.colorR
               this.cacheG = params.colorG
               this.cacheB = params.colorB
-              hs = this.helpers.rgb2hs([this.cacheR, this.cacheG, this.cacheB])
+              hs = this.colourUtils.rgb2hs(this.cacheR, this.cacheG, this.cacheB)
               this.cacheHue = hs[0]
               this.cacheMired = 140
               this.service
@@ -365,7 +366,7 @@ module.exports = class deviceLightColour {
                 this.cacheG = params.color.g
                 this.cacheB = params.color.b
                 this.cacheMired = 140
-                hs = this.helpers.rgb2hs([this.cacheR, this.cacheG, this.cacheB])
+                hs = this.colourUtils.rgb2hs(this.cacheR, this.cacheG, this.cacheB)
                 this.cacheHue = hs[0]
                 this.service
                   .updateCharacteristic(this.Characteristic.ColorTemperature, 140)
@@ -394,7 +395,7 @@ module.exports = class deviceLightColour {
               this.cacheCT = params.white.ct
               const ctToK = Math.round(this.cacheCT / 255 * 3800 + 2700)
               this.cacheMired = Math.max(Math.min(Math.round(1000000 / ctToK), 500), 140)
-              hs = this.helpers.m2hs(this.cacheMired)
+              hs = this.colourUtils.m2hs(this.cacheMired)
               this.cacheHue = hs[0]
               this.service
                 .updateCharacteristic(this.Characteristic.Hue, this.cacheHue)
diff --git a/lib/index.js b/lib/index.js
index f920bb8a..ddab9cfb 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -20,6 +20,7 @@ class eWeLinkPlatform {
     this.Characteristic = api.hap.Characteristic
     this.Service = api.hap.Service
     this.helpers = require('./utils/helpers')
+    this.colourUtils = require('./utils/colour-utils')
     this.eveService = require('./fakegato/fakegato-history')(api)
     this.debug = this.config.debug
     this.mode = ['auto', 'wan', 'lan'].includes(this.config.mode) ? this.config.mode : 'auto'
diff --git a/lib/utils/colour-utils.js b/lib/utils/colour-utils.js
new file mode 100644
index 00000000..776c7459
--- /dev/null
+++ b/lib/utils/colour-utils.js
@@ -0,0 +1,478 @@
+/* jshint -W014, -W033, esversion: 9 */
+/* eslint-disable new-cap */
+'use strict'
+module.exports = {
+  hs2rgb: (h, s) => {
+    h = parseInt(h) / 360
+    s = parseInt(s) / 100
+    const l = 0.5
+    let t3
+    let val
+    if (s === 0) {
+      val = l * 255
+      return [Math.round(val), Math.round(val), Math.round(val)]
+    }
+    const t2 = l + s - l * s
+    const t1 = 2 * l - t2
+    const rgb = [0, 0, 0]
+    for (let i = 0; i < 3; i++) {
+      t3 = h + 1 / 3 * -(i - 1)
+      if (t3 < 0) t3++
+      if (t3 > 1) t3--
+      if (t3 * 6 < 1) {
+        val = t1 + (t2 - t1) * 6 * t3
+      } else if (t3 * 2 < 1) {
+        val = t2
+      } else if (t3 * 3 < 2) {
+        val = t1 + (t2 - t1) * (2 / 3 - t3) * 6
+      } else {
+        val = t1
+      }
+      rgb[i] = Math.round(val * 255)
+    }
+    return rgb
+  },
+  rgb2hs: (r, g, b) => {
+    r = parseInt(r) / 255
+    g = parseInt(g) / 255
+    b = parseInt(b) / 255
+    const min = Math.min(r, g, b)
+    const max = Math.max(r, g, b)
+    const delta = max - min
+    let h
+    let s
+    if (max === min) {
+      h = 0
+    } else if (r === max) {
+      h = (g - b) / delta
+    } else if (g === max) {
+      h = 2 + (b - r) / delta
+    } else if (b === max) {
+      h = 4 + (r - g) / delta
+    }
+    h = Math.min(h * 60, 360)
+    if (h < 0) h += 360
+    const l = (min + max) / 2
+    if (max === min) {
+      s = 0
+    } else if (l <= 0.5) {
+      s = delta / (max + min)
+    } else {
+      s = delta / (2 - max - min)
+    }
+    return [Math.round(h), Math.round(s * 100)]
+  },
+  m2hs: m => {
+    /*
+      table from (and credit to) HAP-NodeJS
+      it's here so it can be used for users with HB < 1.3
+      https://github.com/homebridge/HAP-NodeJS/blob/beta/src/lib/util/color-utils.ts
+    */
+    const table = {
+      100: [19, 222.1],
+      101: [18.7, 222.2],
+      102: [18.4, 222.3],
+      103: [18.2, 222.3],
+      104: [17.9, 222.4],
+      105: [17.6, 222.5],
+      106: [17.3, 222.7],
+      107: [17, 222.8],
+      108: [16.7, 222.9],
+      109: [16.4, 223],
+      110: [16.1, 223.2],
+      111: [15.8, 223.3],
+      112: [15.4, 223.4],
+      113: [15.2, 223.6],
+      114: [14.9, 223.8],
+      115: [14.7, 223.9],
+      116: [14.3, 224.1],
+      117: [14.1, 224.2],
+      118: [13.8, 224.4],
+      119: [13.5, 224.6],
+      120: [13.2, 224.8],
+      121: [12.9, 225],
+      122: [12.5, 225.3],
+      123: [12.2, 225.6],
+      124: [11.8, 225.9],
+      125: [11.4, 226.3],
+      126: [11.1, 226.7],
+      127: [10.7, 227.1],
+      128: [10.3, 227.6],
+      129: [9.9, 228],
+      130: [9.6, 228.5],
+      131: [9.3, 229.1],
+      132: [8.9, 229.6],
+      133: [8.5, 230.2],
+      134: [8.2, 230.9],
+      135: [7.8, 231.6],
+      136: [7.5, 232.5],
+      137: [7.1, 233.5],
+      138: [6.7, 234.6],
+      139: [6.3, 235.8],
+      140: [6, 237.1],
+      141: [5.6, 238.9],
+      142: [5.2, 240.9],
+      143: [5, 242.9],
+      144: [4.8, 244.9],
+      145: [4.6, 246.9],
+      146: [4.4, 249.3],
+      147: [4.3, 251.9],
+      148: [4.1, 254.9],
+      149: [3.9, 258],
+      150: [3.7, 261.8],
+      151: [3.4, 265.9],
+      152: [3.2, 271],
+      153: [3, 276.4],
+      154: [2.8, 283.6],
+      155: [2.6, 290.4],
+      156: [2.3, 295.3],
+      157: [2.1, 300],
+      158: [1.9, 300],
+      159: [1.6, 300],
+      160: [1.4, 195.8],
+      161: [1.2, 84.3],
+      162: [1.3, 58.2],
+      163: [1.5, 55.9],
+      164: [1.7, 53.2],
+      165: [1.9, 50.2],
+      166: [2.1, 47.1],
+      167: [2.4, 44.5],
+      168: [2.6, 42.6],
+      169: [2.9, 40.9],
+      170: [3.1, 39.5],
+      171: [3.4, 38.3],
+      172: [3.7, 37.3],
+      173: [3.9, 36.5],
+      174: [4.2, 35.7],
+      175: [4.4, 35.1],
+      176: [4.6, 34.5],
+      177: [4.9, 34],
+      178: [5.1, 33.5],
+      179: [5.3, 33],
+      180: [5.6, 32.7],
+      181: [5.8, 32.3],
+      182: [6, 32],
+      183: [6.3, 31.7],
+      184: [6.5, 31.4],
+      185: [6.7, 31.2],
+      186: [7, 30.9],
+      187: [7.2, 30.7],
+      188: [7.4, 30.5],
+      189: [7.6, 30.3],
+      190: [7.9, 30.1],
+      191: [8.1, 29.9],
+      192: [8.4, 29.7],
+      193: [8.6, 29.6],
+      194: [8.9, 29.5],
+      195: [9.1, 29.3],
+      196: [9.4, 29.2],
+      197: [9.6, 29.1],
+      198: [9.8, 29],
+      199: [10, 28.9],
+      200: [10.2, 28.7],
+      201: [10.5, 28.7],
+      202: [10.7, 28.6],
+      203: [11, 28.5],
+      204: [11.2, 28.4],
+      205: [11.4, 28.3],
+      206: [11.6, 28.3],
+      207: [11.8, 28.2],
+      208: [12.1, 28.1],
+      209: [12.3, 28.1],
+      210: [12.5, 28],
+      211: [12.7, 28],
+      212: [12.9, 27.9],
+      213: [13.2, 27.8],
+      214: [13.4, 27.8],
+      215: [13.6, 27.7],
+      216: [13.8, 27.7],
+      217: [14, 27.7],
+      218: [14.3, 27.6],
+      219: [14.5, 27.6],
+      220: [14.7, 27.5],
+      221: [14.9, 27.5],
+      222: [15.1, 27.5],
+      223: [15.3, 27.4],
+      224: [15.5, 27.4],
+      225: [15.8, 27.4],
+      226: [16, 27.3],
+      227: [16.2, 27.3],
+      228: [16.4, 27.3],
+      229: [16.6, 27.3],
+      230: [16.8, 27.2],
+      231: [17, 27.2],
+      232: [17.2, 27.2],
+      233: [17.4, 27.2],
+      234: [17.6, 27.2],
+      235: [17.8, 27.1],
+      236: [18, 27.1],
+      237: [18.2, 27.1],
+      238: [18.4, 27.1],
+      239: [18.7, 27.1],
+      240: [18.8, 27],
+      241: [19, 27],
+      242: [19.2, 27],
+      243: [19.4, 27],
+      244: [19.6, 27],
+      245: [19.8, 27],
+      246: [20, 27],
+      247: [20.3, 26.9],
+      248: [20.5, 26.9],
+      249: [20.6, 26.9],
+      250: [20.8, 26.9],
+      251: [21, 26.9],
+      252: [21.3, 26.9],
+      253: [21.5, 26.9],
+      254: [21.6, 26.9],
+      255: [21.8, 26.8],
+      256: [22, 26.8],
+      257: [22.2, 26.8],
+      258: [22.4, 26.8],
+      259: [22.6, 26.8],
+      260: [22.8, 26.8],
+      261: [23, 26.8],
+      262: [23.2, 26.8],
+      263: [23.4, 26.8],
+      264: [23.6, 26.8],
+      265: [23.8, 26.8],
+      266: [24, 26.8],
+      267: [24.1, 26.8],
+      268: [24.3, 26.8],
+      269: [24.5, 26.8],
+      270: [24.7, 26.8],
+      271: [24.8, 26.8],
+      272: [25.1, 26.7],
+      273: [25.3, 26.7],
+      274: [25.4, 26.7],
+      275: [25.6, 26.7],
+      276: [25.8, 26.7],
+      277: [26, 26.7],
+      278: [26.1, 26.7],
+      279: [26.3, 26.7],
+      280: [26.5, 26.7],
+      281: [26.7, 26.7],
+      282: [26.9, 26.7],
+      283: [27.1, 26.7],
+      284: [27.3, 26.7],
+      285: [27.5, 26.7],
+      286: [27.7, 26.7],
+      287: [27.8, 26.7],
+      288: [28, 26.7],
+      289: [28.2, 26.7],
+      290: [28.4, 26.7],
+      291: [28.6, 26.7],
+      292: [28.8, 26.7],
+      293: [28.9, 26.7],
+      294: [29.1, 26.7],
+      295: [29.3, 26.7],
+      296: [29.5, 26.7],
+      297: [29.6, 26.7],
+      298: [29.8, 26.7],
+      299: [30, 26.7],
+      300: [30.2, 26.7],
+      301: [30.4, 26.7],
+      302: [30.5, 26.7],
+      303: [30.7, 26.7],
+      304: [30.9, 26.7],
+      305: [31.1, 26.7],
+      306: [31.2, 26.7],
+      307: [31.4, 26.7],
+      308: [31.6, 26.7],
+      309: [31.8, 26.8],
+      310: [31.9, 26.8],
+      311: [32.1, 26.8],
+      312: [32.3, 26.8],
+      313: [32.5, 26.8],
+      314: [32.6, 26.8],
+      315: [32.8, 26.8],
+      316: [33, 26.8],
+      317: [33.2, 26.8],
+      318: [33.3, 26.8],
+      319: [33.5, 26.8],
+      320: [33.7, 26.8],
+      321: [33.8, 26.8],
+      322: [34, 26.8],
+      323: [34.2, 26.8],
+      324: [34.4, 26.8],
+      325: [34.5, 26.8],
+      326: [34.7, 26.8],
+      327: [34.9, 26.8],
+      328: [35.1, 26.8],
+      329: [35.2, 26.8],
+      330: [35.4, 26.8],
+      331: [35.5, 26.8],
+      332: [35.7, 26.8],
+      333: [35.9, 26.8],
+      334: [36.1, 26.8],
+      335: [36.3, 26.9],
+      336: [36.5, 26.9],
+      337: [36.7, 26.9],
+      338: [36.9, 26.9],
+      339: [37.1, 26.9],
+      340: [37.2, 26.9],
+      341: [37.4, 26.9],
+      342: [37.5, 26.9],
+      343: [37.7, 26.9],
+      344: [37.9, 26.9],
+      345: [38.1, 26.9],
+      346: [38.3, 26.9],
+      347: [38.5, 26.9],
+      348: [38.7, 26.9],
+      349: [38.9, 26.9],
+      350: [39, 26.9],
+      351: [39.2, 26.9],
+      352: [39.3, 27],
+      353: [39.5, 27],
+      354: [39.7, 27],
+      355: [39.9, 27],
+      356: [40.1, 27],
+      357: [40.2, 27],
+      358: [40.4, 27],
+      359: [40.6, 27],
+      360: [40.8, 27],
+      361: [40.9, 27],
+      362: [41.1, 27],
+      363: [41.2, 27],
+      364: [41.4, 27],
+      365: [41.6, 27],
+      366: [41.8, 27],
+      367: [42, 27],
+      368: [42.1, 27.1],
+      369: [42.3, 27.1],
+      370: [42.4, 27.1],
+      371: [42.6, 27.1],
+      372: [42.8, 27.1],
+      373: [43, 27.1],
+      374: [43.1, 27.1],
+      375: [43.2, 27.1],
+      376: [43.4, 27.1],
+      377: [43.6, 27.1],
+      378: [43.8, 27.1],
+      379: [43.9, 27.1],
+      380: [44.1, 27.1],
+      381: [44.3, 27.2],
+      382: [44.4, 27.2],
+      383: [44.6, 27.2],
+      384: [44.7, 27.2],
+      385: [44.9, 27.2],
+      386: [45.1, 27.2],
+      387: [45.3, 27.2],
+      388: [45.5, 27.2],
+      389: [45.6, 27.2],
+      390: [45.8, 27.2],
+      391: [46, 27.2],
+      392: [46.2, 27.2],
+      393: [46.4, 27.3],
+      394: [46.5, 27.3],
+      395: [46.7, 27.3],
+      396: [46.9, 27.3],
+      397: [47.1, 27.3],
+      398: [47.2, 27.3],
+      399: [47.4, 27.3],
+      400: [47.6, 27.3],
+      401: [47.7, 27.3],
+      402: [47.9, 27.3],
+      403: [48.1, 27.3],
+      404: [48.3, 27.3],
+      405: [48.5, 27.4],
+      406: [48.7, 27.4],
+      407: [48.8, 27.4],
+      408: [49, 27.4],
+      409: [49.2, 27.4],
+      410: [49.4, 27.4],
+      411: [49.6, 27.4],
+      412: [49.7, 27.4],
+      413: [49.9, 27.4],
+      414: [50.1, 27.4],
+      415: [50.2, 27.4],
+      416: [50.4, 27.4],
+      417: [50.6, 27.5],
+      418: [50.7, 27.5],
+      419: [50.9, 27.5],
+      420: [51.1, 27.5],
+      421: [51.2, 27.5],
+      422: [51.4, 27.5],
+      423: [51.6, 27.5],
+      424: [51.7, 27.5],
+      425: [51.9, 27.5],
+      426: [52.1, 27.5],
+      427: [51.2, 27.6],
+      428: [52.4, 27.6],
+      429: [52.5, 27.6],
+      430: [52.7, 27.6],
+      431: [52.9, 27.6],
+      432: [53.1, 27.6],
+      433: [53.2, 27.6],
+      434: [53.4, 27.6],
+      435: [53.6, 27.6],
+      436: [53.7, 27.6],
+      437: [53.9, 27.6],
+      438: [54.1, 27.7],
+      439: [54.2, 27.7],
+      440: [54.3, 27.7],
+      441: [54.5, 27.7],
+      442: [54.7, 27.7],
+      443: [54.8, 27.7],
+      444: [55, 27.7],
+      445: [55.2, 27.7],
+      446: [55.3, 27.7],
+      447: [55.5, 27.7],
+      448: [55.7, 27.7],
+      449: [55.8, 27.8],
+      450: [56, 27.8],
+      451: [56.2, 27.8],
+      452: [56.3, 27.8],
+      453: [56.5, 27.8],
+      454: [56.7, 27.8],
+      455: [56.8, 27.8],
+      456: [57, 27.8],
+      457: [57.2, 27.8],
+      458: [57.3, 27.9],
+      459: [57.4, 27.9],
+      460: [57.6, 27.9],
+      461: [57.8, 27.9],
+      462: [57.9, 27.9],
+      463: [58.1, 27.9],
+      464: [58.3, 27.9],
+      465: [58.4, 27.9],
+      466: [58.6, 27.9],
+      467: [58.8, 27.9],
+      468: [59, 28],
+      469: [59.1, 28],
+      470: [59.2, 28],
+      471: [59.4, 28],
+      472: [59.6, 28],
+      473: [59.7, 28],
+      474: [60, 28],
+      475: [60.1, 28],
+      476: [60.2, 28],
+      477: [60.4, 28],
+      478: [60.6, 28.1],
+      479: [60.7, 28.1],
+      480: [60.9, 28.1],
+      481: [60.1, 28.1],
+      482: [60.3, 28.1],
+      483: [61.4, 28.1],
+      484: [61.5, 28.1],
+      485: [61.7, 28.1],
+      486: [61.9, 28.1],
+      487: [62, 28.2],
+      488: [62.2, 28.2],
+      489: [62.3, 28.2],
+      490: [62.5, 28.2],
+      491: [62.7, 28.2],
+      492: [62.8, 28.2],
+      493: [63, 28.2],
+      494: [63.2, 28.2],
+      495: [63.3, 28.2],
+      496: [63.4, 28.2],
+      497: [63.6, 28.2],
+      498: [63.8, 28.3],
+      499: [63.9, 28.3],
+      500: [64.1, 28.3]
+    }
+    const input = Math.min(Math.max(Math.round(m), 140), 500)
+    const toReturn = table[input]
+    return [Math.round(toReturn[1]), Math.round(toReturn[0])]
+  }
+}
diff --git a/lib/utils/helpers.js b/lib/utils/helpers.js
index 9d671485..0b40ef7e 100644
--- a/lib/utils/helpers.js
+++ b/lib/utils/helpers.js
@@ -117,479 +117,6 @@ module.exports = {
       }
     ]
   },
-  hs2rgb: hs => {
-    const h = parseInt(hs[0]) / 360
-    const s = parseInt(hs[1]) / 100
-    const l = 0.5
-    let t3
-    let val
-    if (s === 0) {
-      val = l * 255
-      return [Math.round(val), Math.round(val), Math.round(val)]
-    }
-    const t2 = l + s - l * s
-    const t1 = 2 * l - t2
-    const rgb = [0, 0, 0]
-    for (let i = 0; i < 3; i++) {
-      t3 = h + 1 / 3 * -(i - 1)
-      if (t3 < 0) t3++
-      if (t3 > 1) t3--
-      if (t3 * 6 < 1) {
-        val = t1 + (t2 - t1) * 6 * t3
-      } else if (t3 * 2 < 1) {
-        val = t2
-      } else if (t3 * 3 < 2) {
-        val = t1 + (t2 - t1) * (2 / 3 - t3) * 6
-      } else {
-        val = t1
-      }
-      rgb[i] = Math.round(val * 255)
-    }
-    return rgb
-  },
-  rgb2hs: rgb => {
-    const r = parseInt(rgb[0]) / 255
-    const g = parseInt(rgb[1]) / 255
-    const b = parseInt(rgb[2]) / 255
-    const min = Math.min(r, g, b)
-    const max = Math.max(r, g, b)
-    const delta = max - min
-    let h
-    let s
-    if (max === min) {
-      h = 0
-    } else if (r === max) {
-      h = (g - b) / delta
-    } else if (g === max) {
-      h = 2 + (b - r) / delta
-    } else if (b === max) {
-      h = 4 + (r - g) / delta
-    }
-    h = Math.min(h * 60, 360)
-    if (h < 0) h += 360
-    const l = (min + max) / 2
-    if (max === min) {
-      s = 0
-    } else if (l <= 0.5) {
-      s = delta / (max + min)
-    } else {
-      s = delta / (2 - max - min)
-    }
-    return [Math.round(h), Math.round(s * 100)]
-  },
-  m2hs: m => {
-    /*
-      table from (and credit to) HAP-NodeJS
-      it's here so it can be used for users with HB < 1.3
-      https://github.com/homebridge/HAP-NodeJS/blob/beta/src/lib/util/color-utils.ts
-    */
-    const table = {
-      100: [19, 222.1],
-      101: [18.7, 222.2],
-      102: [18.4, 222.3],
-      103: [18.2, 222.3],
-      104: [17.9, 222.4],
-      105: [17.6, 222.5],
-      106: [17.3, 222.7],
-      107: [17, 222.8],
-      108: [16.7, 222.9],
-      109: [16.4, 223],
-      110: [16.1, 223.2],
-      111: [15.8, 223.3],
-      112: [15.4, 223.4],
-      113: [15.2, 223.6],
-      114: [14.9, 223.8],
-      115: [14.7, 223.9],
-      116: [14.3, 224.1],
-      117: [14.1, 224.2],
-      118: [13.8, 224.4],
-      119: [13.5, 224.6],
-      120: [13.2, 224.8],
-      121: [12.9, 225],
-      122: [12.5, 225.3],
-      123: [12.2, 225.6],
-      124: [11.8, 225.9],
-      125: [11.4, 226.3],
-      126: [11.1, 226.7],
-      127: [10.7, 227.1],
-      128: [10.3, 227.6],
-      129: [9.9, 228],
-      130: [9.6, 228.5],
-      131: [9.3, 229.1],
-      132: [8.9, 229.6],
-      133: [8.5, 230.2],
-      134: [8.2, 230.9],
-      135: [7.8, 231.6],
-      136: [7.5, 232.5],
-      137: [7.1, 233.5],
-      138: [6.7, 234.6],
-      139: [6.3, 235.8],
-      140: [6, 237.1],
-      141: [5.6, 238.9],
-      142: [5.2, 240.9],
-      143: [5, 242.9],
-      144: [4.8, 244.9],
-      145: [4.6, 246.9],
-      146: [4.4, 249.3],
-      147: [4.3, 251.9],
-      148: [4.1, 254.9],
-      149: [3.9, 258],
-      150: [3.7, 261.8],
-      151: [3.4, 265.9],
-      152: [3.2, 271],
-      153: [3, 276.4],
-      154: [2.8, 283.6],
-      155: [2.6, 290.4],
-      156: [2.3, 295.3],
-      157: [2.1, 300],
-      158: [1.9, 300],
-      159: [1.6, 300],
-      160: [1.4, 195.8],
-      161: [1.2, 84.3],
-      162: [1.3, 58.2],
-      163: [1.5, 55.9],
-      164: [1.7, 53.2],
-      165: [1.9, 50.2],
-      166: [2.1, 47.1],
-      167: [2.4, 44.5],
-      168: [2.6, 42.6],
-      169: [2.9, 40.9],
-      170: [3.1, 39.5],
-      171: [3.4, 38.3],
-      172: [3.7, 37.3],
-      173: [3.9, 36.5],
-      174: [4.2, 35.7],
-      175: [4.4, 35.1],
-      176: [4.6, 34.5],
-      177: [4.9, 34],
-      178: [5.1, 33.5],
-      179: [5.3, 33],
-      180: [5.6, 32.7],
-      181: [5.8, 32.3],
-      182: [6, 32],
-      183: [6.3, 31.7],
-      184: [6.5, 31.4],
-      185: [6.7, 31.2],
-      186: [7, 30.9],
-      187: [7.2, 30.7],
-      188: [7.4, 30.5],
-      189: [7.6, 30.3],
-      190: [7.9, 30.1],
-      191: [8.1, 29.9],
-      192: [8.4, 29.7],
-      193: [8.6, 29.6],
-      194: [8.9, 29.5],
-      195: [9.1, 29.3],
-      196: [9.4, 29.2],
-      197: [9.6, 29.1],
-      198: [9.8, 29],
-      199: [10, 28.9],
-      200: [10.2, 28.7],
-      201: [10.5, 28.7],
-      202: [10.7, 28.6],
-      203: [11, 28.5],
-      204: [11.2, 28.4],
-      205: [11.4, 28.3],
-      206: [11.6, 28.3],
-      207: [11.8, 28.2],
-      208: [12.1, 28.1],
-      209: [12.3, 28.1],
-      210: [12.5, 28],
-      211: [12.7, 28],
-      212: [12.9, 27.9],
-      213: [13.2, 27.8],
-      214: [13.4, 27.8],
-      215: [13.6, 27.7],
-      216: [13.8, 27.7],
-      217: [14, 27.7],
-      218: [14.3, 27.6],
-      219: [14.5, 27.6],
-      220: [14.7, 27.5],
-      221: [14.9, 27.5],
-      222: [15.1, 27.5],
-      223: [15.3, 27.4],
-      224: [15.5, 27.4],
-      225: [15.8, 27.4],
-      226: [16, 27.3],
-      227: [16.2, 27.3],
-      228: [16.4, 27.3],
-      229: [16.6, 27.3],
-      230: [16.8, 27.2],
-      231: [17, 27.2],
-      232: [17.2, 27.2],
-      233: [17.4, 27.2],
-      234: [17.6, 27.2],
-      235: [17.8, 27.1],
-      236: [18, 27.1],
-      237: [18.2, 27.1],
-      238: [18.4, 27.1],
-      239: [18.7, 27.1],
-      240: [18.8, 27],
-      241: [19, 27],
-      242: [19.2, 27],
-      243: [19.4, 27],
-      244: [19.6, 27],
-      245: [19.8, 27],
-      246: [20, 27],
-      247: [20.3, 26.9],
-      248: [20.5, 26.9],
-      249: [20.6, 26.9],
-      250: [20.8, 26.9],
-      251: [21, 26.9],
-      252: [21.3, 26.9],
-      253: [21.5, 26.9],
-      254: [21.6, 26.9],
-      255: [21.8, 26.8],
-      256: [22, 26.8],
-      257: [22.2, 26.8],
-      258: [22.4, 26.8],
-      259: [22.6, 26.8],
-      260: [22.8, 26.8],
-      261: [23, 26.8],
-      262: [23.2, 26.8],
-      263: [23.4, 26.8],
-      264: [23.6, 26.8],
-      265: [23.8, 26.8],
-      266: [24, 26.8],
-      267: [24.1, 26.8],
-      268: [24.3, 26.8],
-      269: [24.5, 26.8],
-      270: [24.7, 26.8],
-      271: [24.8, 26.8],
-      272: [25.1, 26.7],
-      273: [25.3, 26.7],
-      274: [25.4, 26.7],
-      275: [25.6, 26.7],
-      276: [25.8, 26.7],
-      277: [26, 26.7],
-      278: [26.1, 26.7],
-      279: [26.3, 26.7],
-      280: [26.5, 26.7],
-      281: [26.7, 26.7],
-      282: [26.9, 26.7],
-      283: [27.1, 26.7],
-      284: [27.3, 26.7],
-      285: [27.5, 26.7],
-      286: [27.7, 26.7],
-      287: [27.8, 26.7],
-      288: [28, 26.7],
-      289: [28.2, 26.7],
-      290: [28.4, 26.7],
-      291: [28.6, 26.7],
-      292: [28.8, 26.7],
-      293: [28.9, 26.7],
-      294: [29.1, 26.7],
-      295: [29.3, 26.7],
-      296: [29.5, 26.7],
-      297: [29.6, 26.7],
-      298: [29.8, 26.7],
-      299: [30, 26.7],
-      300: [30.2, 26.7],
-      301: [30.4, 26.7],
-      302: [30.5, 26.7],
-      303: [30.7, 26.7],
-      304: [30.9, 26.7],
-      305: [31.1, 26.7],
-      306: [31.2, 26.7],
-      307: [31.4, 26.7],
-      308: [31.6, 26.7],
-      309: [31.8, 26.8],
-      310: [31.9, 26.8],
-      311: [32.1, 26.8],
-      312: [32.3, 26.8],
-      313: [32.5, 26.8],
-      314: [32.6, 26.8],
-      315: [32.8, 26.8],
-      316: [33, 26.8],
-      317: [33.2, 26.8],
-      318: [33.3, 26.8],
-      319: [33.5, 26.8],
-      320: [33.7, 26.8],
-      321: [33.8, 26.8],
-      322: [34, 26.8],
-      323: [34.2, 26.8],
-      324: [34.4, 26.8],
-      325: [34.5, 26.8],
-      326: [34.7, 26.8],
-      327: [34.9, 26.8],
-      328: [35.1, 26.8],
-      329: [35.2, 26.8],
-      330: [35.4, 26.8],
-      331: [35.5, 26.8],
-      332: [35.7, 26.8],
-      333: [35.9, 26.8],
-      334: [36.1, 26.8],
-      335: [36.3, 26.9],
-      336: [36.5, 26.9],
-      337: [36.7, 26.9],
-      338: [36.9, 26.9],
-      339: [37.1, 26.9],
-      340: [37.2, 26.9],
-      341: [37.4, 26.9],
-      342: [37.5, 26.9],
-      343: [37.7, 26.9],
-      344: [37.9, 26.9],
-      345: [38.1, 26.9],
-      346: [38.3, 26.9],
-      347: [38.5, 26.9],
-      348: [38.7, 26.9],
-      349: [38.9, 26.9],
-      350: [39, 26.9],
-      351: [39.2, 26.9],
-      352: [39.3, 27],
-      353: [39.5, 27],
-      354: [39.7, 27],
-      355: [39.9, 27],
-      356: [40.1, 27],
-      357: [40.2, 27],
-      358: [40.4, 27],
-      359: [40.6, 27],
-      360: [40.8, 27],
-      361: [40.9, 27],
-      362: [41.1, 27],
-      363: [41.2, 27],
-      364: [41.4, 27],
-      365: [41.6, 27],
-      366: [41.8, 27],
-      367: [42, 27],
-      368: [42.1, 27.1],
-      369: [42.3, 27.1],
-      370: [42.4, 27.1],
-      371: [42.6, 27.1],
-      372: [42.8, 27.1],
-      373: [43, 27.1],
-      374: [43.1, 27.1],
-      375: [43.2, 27.1],
-      376: [43.4, 27.1],
-      377: [43.6, 27.1],
-      378: [43.8, 27.1],
-      379: [43.9, 27.1],
-      380: [44.1, 27.1],
-      381: [44.3, 27.2],
-      382: [44.4, 27.2],
-      383: [44.6, 27.2],
-      384: [44.7, 27.2],
-      385: [44.9, 27.2],
-      386: [45.1, 27.2],
-      387: [45.3, 27.2],
-      388: [45.5, 27.2],
-      389: [45.6, 27.2],
-      390: [45.8, 27.2],
-      391: [46, 27.2],
-      392: [46.2, 27.2],
-      393: [46.4, 27.3],
-      394: [46.5, 27.3],
-      395: [46.7, 27.3],
-      396: [46.9, 27.3],
-      397: [47.1, 27.3],
-      398: [47.2, 27.3],
-      399: [47.4, 27.3],
-      400: [47.6, 27.3],
-      401: [47.7, 27.3],
-      402: [47.9, 27.3],
-      403: [48.1, 27.3],
-      404: [48.3, 27.3],
-      405: [48.5, 27.4],
-      406: [48.7, 27.4],
-      407: [48.8, 27.4],
-      408: [49, 27.4],
-      409: [49.2, 27.4],
-      410: [49.4, 27.4],
-      411: [49.6, 27.4],
-      412: [49.7, 27.4],
-      413: [49.9, 27.4],
-      414: [50.1, 27.4],
-      415: [50.2, 27.4],
-      416: [50.4, 27.4],
-      417: [50.6, 27.5],
-      418: [50.7, 27.5],
-      419: [50.9, 27.5],
-      420: [51.1, 27.5],
-      421: [51.2, 27.5],
-      422: [51.4, 27.5],
-      423: [51.6, 27.5],
-      424: [51.7, 27.5],
-      425: [51.9, 27.5],
-      426: [52.1, 27.5],
-      427: [51.2, 27.6],
-      428: [52.4, 27.6],
-      429: [52.5, 27.6],
-      430: [52.7, 27.6],
-      431: [52.9, 27.6],
-      432: [53.1, 27.6],
-      433: [53.2, 27.6],
-      434: [53.4, 27.6],
-      435: [53.6, 27.6],
-      436: [53.7, 27.6],
-      437: [53.9, 27.6],
-      438: [54.1, 27.7],
-      439: [54.2, 27.7],
-      440: [54.3, 27.7],
-      441: [54.5, 27.7],
-      442: [54.7, 27.7],
-      443: [54.8, 27.7],
-      444: [55, 27.7],
-      445: [55.2, 27.7],
-      446: [55.3, 27.7],
-      447: [55.5, 27.7],
-      448: [55.7, 27.7],
-      449: [55.8, 27.8],
-      450: [56, 27.8],
-      451: [56.2, 27.8],
-      452: [56.3, 27.8],
-      453: [56.5, 27.8],
-      454: [56.7, 27.8],
-      455: [56.8, 27.8],
-      456: [57, 27.8],
-      457: [57.2, 27.8],
-      458: [57.3, 27.9],
-      459: [57.4, 27.9],
-      460: [57.6, 27.9],
-      461: [57.8, 27.9],
-      462: [57.9, 27.9],
-      463: [58.1, 27.9],
-      464: [58.3, 27.9],
-      465: [58.4, 27.9],
-      466: [58.6, 27.9],
-      467: [58.8, 27.9],
-      468: [59, 28],
-      469: [59.1, 28],
-      470: [59.2, 28],
-      471: [59.4, 28],
-      472: [59.6, 28],
-      473: [59.7, 28],
-      474: [60, 28],
-      475: [60.1, 28],
-      476: [60.2, 28],
-      477: [60.4, 28],
-      478: [60.6, 28.1],
-      479: [60.7, 28.1],
-      480: [60.9, 28.1],
-      481: [60.1, 28.1],
-      482: [60.3, 28.1],
-      483: [61.4, 28.1],
-      484: [61.5, 28.1],
-      485: [61.7, 28.1],
-      486: [61.9, 28.1],
-      487: [62, 28.2],
-      488: [62.2, 28.2],
-      489: [62.3, 28.2],
-      490: [62.5, 28.2],
-      491: [62.7, 28.2],
-      492: [62.8, 28.2],
-      493: [63, 28.2],
-      494: [63.2, 28.2],
-      495: [63.3, 28.2],
-      496: [63.4, 28.2],
-      497: [63.6, 28.2],
-      498: [63.8, 28.3],
-      499: [63.9, 28.3],
-      500: [64.1, 28.3]
-    }
-    const input = Math.min(Math.max(Math.round(m), 140), 500)
-    const toReturn = table[input]
-    return [Math.round(toReturn[1]), Math.round(toReturn[0])]
-  },
   chansFromUiid: {
     1: 1, // "SOCKET"                                  \\ 20, MINI, BASIC, S26
     2: 2, // "SOCKET_2"                                \\

From 4e956dfdd4bbb7000988c4b31647a7f522a6bced Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 7 Jan 2021 14:28:17 +0000
Subject: [PATCH 1112/3183] use node-dns-sd from modules

---
 lib/connection/lan.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/connection/lan.js b/lib/connection/lan.js
index 93376f20..ffd4b316 100644
--- a/lib/connection/lan.js
+++ b/lib/connection/lan.js
@@ -10,7 +10,7 @@ module.exports = class connectionLAN {
     this.ipOverride = platform.ipOverride
     this.deviceMap = new Map()
     this.crypto = require('crypto')
-    this.dns = require('./../node-dns-sd/dns-sd')
+    this.dns = require('node-dns-sd')
     this.emitter = new (require('events'))()
 
     // *** Create a template map with our device list from the HTTP client *** \\

From 204635e1c4c45231868b1bcd4d0d81c8dcebee4c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 8 Jan 2021 15:18:30 +0000
Subject: [PATCH 1113/3183] add descriptive ranges

---
 config.schema.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 1f981bf7..3ac20030 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -89,7 +89,7 @@
       "inUsePowerThreshold": {
         "type": "number",
         "title": "Outlet 'In Use' Threshold",
-        "description": "HomeKit will set the 'In Use' status of outlet devices to true when the wattage is above this number.",
+        "description": "HomeKit will set the 'In Use' status of outlet devices to true when the wattage is above this number. Must be between 0 and 100.",
         "placeholder": 0,
         "minimum": 0,
         "maximum": 100
@@ -131,7 +131,7 @@
       "lowBattThreshold": {
         "type": "number",
         "title": "Low Battery Threshold",
-        "description": "HomeKit will set the low battery status for supported devices when the device battery reaches this percentage level.",
+        "description": "HomeKit will set the low battery status for supported devices when the device battery reaches this percentage level. Must be between 5 and 50.",
         "placeholder": 25,
         "minimum": 5,
         "maximum": 50
@@ -139,7 +139,7 @@
       "sensorTimeDifference": {
         "type": "number",
         "title": "Sensor Lag",
-        "description": "An offset in seconds to ignore any notifications if they is a delay between a sensor detecting something and the plugin receiving the notification. This setting applies to sensors connected to RF/Zigbee Bridges.",
+        "description": "An offset in seconds to ignore any notifications if they is a delay between a sensor detecting something and the plugin receiving the notification. This setting applies to sensors connected to RF/Zigbee Bridges. Must be between 10 and 300.",
         "placeholder": 120,
         "minimum": 10,
         "maximum": 300
@@ -260,7 +260,7 @@
             "operationTime": {
               "type": "number",
               "title": "Operation Time (Deciseconds)",
-              "description": "Blinds/garage doors: the time to open/close the device. Locks: the time to show as unlocked. This setting is in deciseconds - count the time in seconds and multiply by 10, for example 75 for 7.5 seconds.",
+              "description": "Blinds/garage doors: the time to open/close the device. Locks: the time to show as unlocked. This setting is in deciseconds - count the time in seconds and multiply by 10, for example 75 for 7.5 seconds. Must be between 10 and 600.",
               "condition": {
                 "functionBody": "return (model.groups[arrayIndices] && !['tap_one', 'valve', 'valve_two', 'switch_valve'].includes(model.groups[arrayIndices].type))"
               },
@@ -341,7 +341,7 @@
             "sensorTimeLength": {
               "type": "number",
               "title": "Sensor Time Length",
-              "description": "The number of seconds which the sensor tile in the Home app will light up for if this sensor is activated.",
+              "description": "The number of seconds which the sensor tile in the Home app will light up for if this sensor is activated. Must be between 1 and 300.",
               "placeholder": 60,
               "minimum": 1,
               "maximum": 300

From 1ef630fc88cab46b89e7667dc21e5b4002c0fea7 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 8 Jan 2021 15:20:19 +0000
Subject: [PATCH 1114/3183] 4.2.2

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 71fda4f9..abec61cd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.2.1",
+  "version": "4.2.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 0893fd5e..46e52edf 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.2.1",
+  "version": "4.2.2",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 194efa5bc5e7d3883e4ff4c92a9085d288622315 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 8 Jan 2021 16:15:18 +0000
Subject: [PATCH 1115/3183] operationTime to min 20

---
 config.schema.json       |  2 +-
 lib/device/garage-one.js | 13 +++++++++----
 lib/device/garage-two.js | 12 ++++++++----
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 3ac20030..a31e32b4 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -260,7 +260,7 @@
             "operationTime": {
               "type": "number",
               "title": "Operation Time (Deciseconds)",
-              "description": "Blinds/garage doors: the time to open/close the device. Locks: the time to show as unlocked. This setting is in deciseconds - count the time in seconds and multiply by 10, for example 75 for 7.5 seconds. Must be between 10 and 600.",
+              "description": "Blinds/garage doors: the time to open/close the device. Locks: the time to show as unlocked. This setting is in deciseconds - count the time in seconds and multiply by 10, for example 75 for 7.5 seconds. Must be between 20 and 600.",
               "condition": {
                 "functionBody": "return (model.groups[arrayIndices] && !['tap_one', 'valve', 'valve_two', 'switch_valve'].includes(model.groups[arrayIndices].type))"
               },
diff --git a/lib/device/garage-one.js b/lib/device/garage-one.js
index f38a3216..fbe5a74e 100644
--- a/lib/device/garage-one.js
+++ b/lib/device/garage-one.js
@@ -68,14 +68,16 @@ module.exports = class deviceGarageOne {
           break
       }
       await this.platform.sendDeviceUpdate(this.accessory, params)
-      await this.helpers.sleep(Math.max(garageConfig.operationTime * 100, 1000))
+      await this.helpers.sleep(2000)
+      this.inUse = false
+      await this.helpers.sleep(Math.max(garageConfig.operationTime * 100, 0))
       if (!sAccessory) {
         this.service.updateCharacteristic(this.Characteristic.CurrentDoorState, newPos)
         this.accessory.context.cacheCurrentDoorState = newPos
         this.log('[%s] current state [%s].', this.accessory.displayName, newPos === 0 ? 'open' : 'closed')
       }
-      this.inUse = false
     } catch (err) {
+      this.inUse = false
       this.platform.deviceUpdateError(this.accessory, err, true)
     }
   }
@@ -104,14 +106,17 @@ module.exports = class deviceGarageOne {
       }
       this.inUse = true
       if (garageConfig.sensorId) {
-        await this.helpers.sleep(Math.max(garageConfig.operationTime * 100, 1000))
+        await this.helpers.sleep(2000)
+        this.inUse = false
       } else {
         this.service
           .updateCharacteristic(this.Characteristic.TargetDoorState, newPos - 2)
           .updateCharacteristic(this.Characteristic.CurrentDoorState, newPos)
         this.accessory.context.cacheCurrentDoorState = newPos
         this.accessory.context.cacheTargetDoorState = newPos - 2
-        await this.helpers.sleep(Math.max(garageConfig.operationTime * 100, 1000))
+        await this.helpers.sleep(2000)
+        this.inUse = false
+        await this.helpers.sleep(Math.max((garageConfig.operationTime - 20) * 100, 0))
         this.service.updateCharacteristic(this.Characteristic.CurrentDoorState, newPos - 2)
         this.accessory.context.cacheCurrentDoorState = newPos - 2
         this.log('[%s] current state [%s].', this.accessory.displayName, newPos === 2 ? 'open' : 'closed')
diff --git a/lib/device/garage-two.js b/lib/device/garage-two.js
index 886d3931..5b7774a9 100644
--- a/lib/device/garage-two.js
+++ b/lib/device/garage-two.js
@@ -57,7 +57,9 @@ module.exports = class deviceGarageTwo {
         }
       }
       await this.platform.sendDeviceUpdate(this.accessory, params)
-      await this.helpers.sleep(Math.max(garageConfig.operationTime * 100, 1000))
+      await this.helpers.sleep(2000)
+      this.inUse = false
+      await this.helpers.sleep(Math.max((garageConfig.operationTime - 20) * 100, 0))
       gdService.updateCharacteristic(this.Characteristic.CurrentDoorState, newPos)
       switch (garage) {
         case 'Garage 1': {
@@ -71,8 +73,8 @@ module.exports = class deviceGarageTwo {
           break
         }
       }
-      this.inUse = false
     } catch (err) {
+      this.inUse = false
       this.platform.deviceUpdateError(this.accessory, err, true)
     }
   }
@@ -121,7 +123,9 @@ module.exports = class deviceGarageTwo {
             this.accessory.context.cacheTwoTargetDoorState = newPos - 2
             break
         }
-        await this.helpers.sleep(Math.max(garageConfig.operationTime * 100, 1000))
+        await this.helpers.sleep(2000)
+        this.inUse = false
+        await this.helpers.sleep(Math.max((garageConfig.operationTime - 20) * 100, 0))
         gcService.updateCharacteristic(this.Characteristic.CurrentDoorState, newPos - 2)
         switch (v) {
           case '1':
@@ -138,8 +142,8 @@ module.exports = class deviceGarageTwo {
             break
         }
       })
-      this.inUse = false
     } catch (err) {
+      this.inUse = false
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }

From ffa8601cd47d2d7024eb3e48da90ead00140e512 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 8 Jan 2021 16:16:46 +0000
Subject: [PATCH 1116/3183] redundant line

---
 lib/device/garage-one.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/device/garage-one.js b/lib/device/garage-one.js
index fbe5a74e..69391dbc 100644
--- a/lib/device/garage-one.js
+++ b/lib/device/garage-one.js
@@ -121,7 +121,6 @@ module.exports = class deviceGarageOne {
         this.accessory.context.cacheCurrentDoorState = newPos - 2
         this.log('[%s] current state [%s].', this.accessory.displayName, newPos === 2 ? 'open' : 'closed')
       }
-      this.inUse = false
     } catch (err) {
       this.inUse = false
       this.platform.deviceUpdateError(this.accessory, err, false)

From 66f2397b099451a084f0000adc12a6a2a8921286 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 9 Jan 2021 12:36:44 +0000
Subject: [PATCH 1117/3183] bump deps

---
 package-lock.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index abec61cd..84926447 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -18,12 +18,12 @@
       }
     },
     "call-bind": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.0.tgz",
-      "integrity": "sha512-AEXsYIyyDY3MCzbwdhzG3Jx1R0J2wetQyUynn6dYHAO+bg8l1k7jwZtRv4ryryFs7EP+NDlikJlVe59jr0cM2w==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.1.tgz",
+      "integrity": "sha512-tvAvUwNcRikl3RVF20X9lsYmmepsovzTWeJiXjO0PkJp15uy/6xKFZOQtuiSULwYW+6ToZBprphCgWXC2dSgcQ==",
       "requires": {
         "function-bind": "^1.1.1",
-        "get-intrinsic": "^1.0.0"
+        "get-intrinsic": "^1.0.2"
       }
     },
     "chnl": {

From ebc8a14813c6b54dccc84b85147fa79aeb00543c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 9 Jan 2021 12:36:53 +0000
Subject: [PATCH 1118/3183] testing obstructionDetected

---
 lib/device/garage-eachen.js | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/lib/device/garage-eachen.js b/lib/device/garage-eachen.js
index 579ae17f..cb56bc6e 100644
--- a/lib/device/garage-eachen.js
+++ b/lib/device/garage-eachen.js
@@ -8,6 +8,9 @@ module.exports = class deviceGarageEachen {
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
+    // testing
+    this.obstruct = (this.platform.config.obstructGarage || '').split(',').includes(accessory.context.eweDeviceId)
+    // end testing
     if (!(this.service = accessory.getService(this.Service.GarageDoorOpener))) {
       this.service = accessory.addService(this.Service.GarageDoorOpener)
       this.service
@@ -18,12 +21,20 @@ module.exports = class deviceGarageEachen {
     this.service
       .getCharacteristic(this.Characteristic.TargetDoorState)
       .on('set', this.internalUpdate.bind(this))
+    this.service.updateCharacteristic(this.Characteristic.ObstructionDetected, false)
     this.accessory = accessory
   }
 
   async internalUpdate (value, callback) {
     try {
       callback()
+      // testing
+      if (this.obstruct) {
+        await this.helpers.sleep(4000)
+        this.service.updateCharacteristic(this.Characteristic.ObstructionDetected, true)
+        return
+      }
+      // end testing
       const garageConfig = this.platform.cusG.get(this.accessory.context.eweDeviceId)
       const params = { switch: value === 0 ? 'on' : 'off' }
       if (value === this.service.getCharacteristic(this.Characteristic.CurrentDoorState).value % 2) return

From 7c14587c6bb5719ba0056aa5f946ce99c0ac6a9f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 9 Jan 2021 12:37:29 +0000
Subject: [PATCH 1119/3183] 4.2.3-0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 84926447..6223862a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.2.2",
+  "version": "4.2.3-0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 46e52edf..b842d022 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.2.2",
+  "version": "4.2.3-0",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From d70997136f538b42ade6ab8d1b6642988e382674 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 9 Jan 2021 13:37:21 +0000
Subject: [PATCH 1120/3183] bump hb for AL beta 42

---
 lib/device/light-colour.js | 2 +-
 lib/device/light-ctemp.js  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/device/light-colour.js b/lib/device/light-colour.js
index a3db5166..a616660f 100644
--- a/lib/device/light-colour.js
+++ b/lib/device/light-colour.js
@@ -36,7 +36,7 @@ module.exports = class deviceLightColour {
       this.service
         .getCharacteristic(this.Characteristic.ColorTemperature)
         .on('set', this.internalCTempUpdate.bind(this))
-      if (platform.api.versionGreaterOrEqual && platform.api.versionGreaterOrEqual('1.3.0-beta.41')) {
+      if (platform.api.versionGreaterOrEqual && platform.api.versionGreaterOrEqual('1.3.0-beta.42')) {
         this.cacheBrightness = this.service.getCharacteristic(this.Characteristic.Brightness).value
         this.alController = new platform.api.hap.AdaptiveLightingController(this.service)
         this.accessory.configureController(this.alController)
diff --git a/lib/device/light-ctemp.js b/lib/device/light-ctemp.js
index 7142c216..d7efa146 100644
--- a/lib/device/light-ctemp.js
+++ b/lib/device/light-ctemp.js
@@ -29,7 +29,7 @@ module.exports = class deviceLightColour {
       this.maxK = 6500
     }
     this.accessory = accessory
-    if (platform.api.versionGreaterOrEqual && platform.api.versionGreaterOrEqual('1.3.0-beta.41')) {
+    if (platform.api.versionGreaterOrEqual && platform.api.versionGreaterOrEqual('1.3.0-beta.42')) {
       this.cacheBrightness = this.service.getCharacteristic(this.Characteristic.Brightness).value
       this.alController = new platform.api.hap.AdaptiveLightingController(this.service)
       this.accessory.configureController(this.alController)

From 5c8cb6d17fb179e7097bc1623e9b6f18061cee3e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 10 Jan 2021 12:08:08 +0000
Subject: [PATCH 1121/3183] shorten descriptions

---
 config.schema.json | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index a31e32b4..5c927998 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -68,23 +68,23 @@
       },
       "hideDevFromHB": {
         "type": "string",
-        "title": "Hide Devices",
-        "description": "A list of devices to ignore. For example '10009553c8' or multiple separated with a comma '10009553c8,10009553c9' (without the quotes)."
+        "title": "Ignored Devices",
+        "description": "A list of devices to ignore by device id. For example 10009553c8 or multiple separated by a comma."
       },
       "hideChanFromHB": {
         "type": "string",
         "title": "Hide Light/Switch Channels",
-        "description": "A list of light/switch channels to hide. For example '10009553c8SW0' or multiple separated with a comma '10009553c8SW0,10009553c9SW2' (without the quotes)."
+        "description": "A list of light/switch channels to hide. For example 10009553c8SW0 or multiple separated by a comma."
       },
       "switchAsOutlet": {
         "type": "string",
         "title": "Switch As Outlet",
-        "description": "A list of switch devices to show as outlets. For example '10009553c8' or multiple separated with a comma '10009553c8,10009553c9' (without the quotes)."
+        "description": "A list of switch devices to show as outlets. For example 10009553c8 or multiple separated by a comma."
       },
       "outletAsSwitch": {
         "type": "string",
         "title": "Outlet As Switch",
-        "description": "A list of outlet devices to show as switches. For example '10009553c8' or multiple separated with a comma '10009553c8,10009553c9' (without the quotes)."
+        "description": "A list of outlet devices to show as switches. For example 10009553c8 or multiple separated by a comma."
       },
       "inUsePowerThreshold": {
         "type": "number",
@@ -97,17 +97,17 @@
       "hideLightFromFan": {
         "type": "string",
         "title": "Hide Fan Lights",
-        "description": "A list of iFan devices for which the light will be hidden. For example '10009553c8' or multiple separated with a comma '10009553c8,10009553c9' (without the quotes)."
+        "description": "A list of iFan devices for which the light will be hidden. For example 10009553c8 or multiple separated by a comma."
       },
       "hideSwitchFromTH": {
         "type": "string",
         "title": "Hide TH10/16 Switches",
-        "description": "A list of TH10/TH16 devices for which the switch will be hidden. For example '10009553c8' or multiple separated with a comma '10009553c8,10009553c9' (without the quotes)."
+        "description": "A list of TH10/TH16 devices for which the switch will be hidden. For example 10009553c8 or multiple separated by a comma."
       },
       "thAsThermostat": {
         "type": "string",
         "title": "TH As Thermostat",
-        "description": "A list of TH10/TH16 devices to show as thermostats. For example '10009553c8' or multiple separated with a comma '10009553c8,10009553c9' (without the quotes)."
+        "description": "A list of TH10/TH16 devices to show as thermostats. For example 10009553c8 or multiple separated by a comma."
       },
       "thTempOffset": {
         "type": "array",
@@ -126,7 +126,7 @@
       "resetRFBridge": {
         "title": "Reset RF Bridges",
         "type": "string",
-        "description": "A list of RF Bridges to remove and re-add on restart. This is needed when adding/removed sub-devices from the RF Bridge. For example '10009553c8' or multiple separated with a comma '10009553c8,10009553c9' (without the quotes)."
+        "description": "A list of RF Bridges to remove and re-add on restart. This is needed when adding/removed sub-devices from the RF Bridge. For example 10009553c8 or multiple separated by a comma."
       },
       "lowBattThreshold": {
         "type": "number",

From 6bf3308a32db8e13649fe9400da46ffcbe82a817 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 10 Jan 2021 12:08:23 +0000
Subject: [PATCH 1122/3183] rename hideDevFromHB to ignoredDevices

---
 config.schema.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 5c927998..bc3069bb 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -66,7 +66,7 @@
         "type": "boolean",
         "description": "If checked, the plugin will remove all accessories and not load the plugin on restart."
       },
-      "hideDevFromHB": {
+      "ignoredDevices": {
         "type": "string",
         "title": "Ignored Devices",
         "description": "A list of devices to ignore by device id. For example 10009553c8 or multiple separated by a comma."
@@ -404,7 +404,7 @@
       "description": "Further optional settings for specific devices.",
       "expandable": true,
       "items": [
-        "hideDevFromHB",
+        "ignoredDevices",
         "hideChanFromHB",
         "switchAsOutlet",
         "outletAsSwitch",

From e8c313fde161574c6e7a1b70f7a1f40dffea55cd Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 10 Jan 2021 12:14:50 +0000
Subject: [PATCH 1123/3183] ignoredDevices

---
 config.schema.json     | 3 +++
 lib/connection/http.js | 4 ++--
 lib/index.js           | 4 +++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index bc3069bb..447099f9 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -158,6 +158,9 @@
       "bulbB02FST64": {
         "type": "string"
       },
+      "hideDevFromHB": {
+        "type": "string"
+      },
       "groups": {
         "type": "array",
         "items": {
diff --git a/lib/connection/http.js b/lib/connection/http.js
index f091b341..c5f061b4 100644
--- a/lib/connection/http.js
+++ b/lib/connection/http.js
@@ -9,7 +9,7 @@ module.exports = class connectionHTTP {
     this.debug = platform.config.debug
     this.username = platform.config.username.toString()
     this.password = platform.config.password.toString()
-    this.hideDevFromHB = (platform.config.hideDevFromHB || '').split(',')
+    this.ignoredDevices = platform.ignoredDevices
     this.cCode = '+' + platform.config.countryCode.toString().replace('+', '').replace(' ', '')
     this.axios = require('axios')
     this.crypto = require('crypto')
@@ -189,7 +189,7 @@ module.exports = class connectionHTTP {
             this.helpers.hasProperty(d, 'itemData') &&
             this.helpers.hasProperty(d.itemData, 'extra') &&
             this.helpers.hasProperty(d.itemData.extra, 'uiid') &&
-            !this.hideDevFromHB.includes(d.itemData.deviceid)
+            !this.ignoredDevices.includes(d.itemData.deviceid)
           ) {
             // *** Separate the sensors as these need to be set up last *** \\
             if (d.itemData.extra.uiid === 102) {
diff --git a/lib/index.js b/lib/index.js
index ddab9cfb..dd9378f4 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -29,6 +29,8 @@ class eWeLinkPlatform {
     this.cusG = new Map()
     this.cusS = new Map()
     this.hiddenMasters = []
+    this.ignoredDevices = (this.config.ignoredDevices || this.config.hideDevFromHB || '')
+      .replace(/[\s'"]+/g, '').toLowerCase().split(',')
     this.thTempOffset = {}
     this.nameOverride = {}
     this.ipOverride = {}
@@ -752,7 +754,7 @@ class eWeLinkPlatform {
       // *** The device does not existing in HB so let's try to add it *** \\
       try {
         // *** Check to see it doesn't exist because it's user hidden *** \\
-        if ((this.config.hideDevFromHB || '').split(',').includes(deviceId)) return
+        if (this.ignoredDevices.includes(deviceId)) return
 
         if (this.debug) this.log('[%s] receiving update for new device %s.', device.name, JSON.stringify(device.params))
 

From 364940acb2ef1e370c63c6c8730c6abe382784de Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 10 Jan 2021 12:28:09 +0000
Subject: [PATCH 1124/3183] valve_four AS

---
 config.schema.json       |   8 ++-
 lib/device/valve-four.js | 147 +++++++++++++++++++++++++++++++++++++++
 lib/index.js             |  41 ++++++-----
 lib/utils/helpers.js     |   2 +-
 4 files changed, 180 insertions(+), 18 deletions(-)
 create mode 100644 lib/device/valve-four.js

diff --git a/config.schema.json b/config.schema.json
index 447099f9..955da0fe 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -230,6 +230,12 @@
                     "valve_two"
                   ]
                 },
+                {
+                  "title": "4 Irrigation Valves (using multi-channel device)",
+                  "enum": [
+                    "valve_four"
+                  ]
+                },
                 {
                   "title": "1 Switch & 1 Valve (using multi-channel device)",
                   "enum": [
@@ -265,7 +271,7 @@
               "title": "Operation Time (Deciseconds)",
               "description": "Blinds/garage doors: the time to open/close the device. Locks: the time to show as unlocked. This setting is in deciseconds - count the time in seconds and multiply by 10, for example 75 for 7.5 seconds. Must be between 20 and 600.",
               "condition": {
-                "functionBody": "return (model.groups[arrayIndices] && !['tap_one', 'valve', 'valve_two', 'switch_valve'].includes(model.groups[arrayIndices].type))"
+                "functionBody": "return (model.groups[arrayIndices] && !['tap_one', 'valve', 'valve_two', 'valve_four', 'switch_valve'].includes(model.groups[arrayIndices].type))"
               },
               "placeholder": 100,
               "minimum": 10,
diff --git a/lib/device/valve-four.js b/lib/device/valve-four.js
new file mode 100644
index 00000000..eac1d713
--- /dev/null
+++ b/lib/device/valve-four.js
@@ -0,0 +1,147 @@
+/* jshint -W014, -W033, esversion: 9 */
+/* eslint-disable new-cap */
+'use strict'
+module.exports = class deviceValveFour {
+  constructor (platform, accessory) {
+    this.platform = platform
+    this.log = platform.log
+    this.helpers = platform.helpers
+    this.Service = platform.api.hap.Service
+    this.Characteristic = platform.api.hap.Characteristic
+    ;['A', 'B', 'C', 'D'].forEach(v => {
+      let valveService
+      if (!(valveService = accessory.getService('Valve ' + v))) {
+        accessory
+          .addService(this.Service.Valve, 'Valve ' + v, 'valve' + v.toLowerCase())
+          .setCharacteristic(this.Characteristic.Active, 0)
+          .setCharacteristic(this.Characteristic.InUse, 0)
+          .setCharacteristic(this.Characteristic.ValveType, 1)
+          .setCharacteristic(this.Characteristic.SetDuration, 120)
+          .addCharacteristic(this.Characteristic.RemainingDuration)
+        valveService = accessory.getService('Valve ' + v)
+      }
+      valveService
+        .getCharacteristic(this.Characteristic.Active)
+        .on('set', (value, callback) => this.internalUpdate('Valve ' + v, value, callback))
+      valveService
+        .getCharacteristic(this.Characteristic.SetDuration)
+        .on('set', (value, callback) => {
+          if (valveService.getCharacteristic(this.Characteristic.InUse).value === 1) {
+            valveService.updateCharacteristic(this.Characteristic.RemainingDuration, value)
+            clearTimeout(valveService.timer)
+            valveService.timer = setTimeout(() => valveService.setCharacteristic(this.Characteristic.Active, 0), value * 1000)
+          }
+          callback()
+        })
+    })
+    this.accessory = accessory
+  }
+
+  async internalUpdate (valve, value, callback) {
+    try {
+      callback()
+      const params = { switches: this.helpers.defaultMultiSwitchOff }
+      const valveService = this.accessory.getService(valve)
+      switch (valve) {
+        case 'Valve A':
+          params.switches[0].switch = value ? 'on' : 'off'
+          params.switches[1].switch = this.accessory.getService('Valve B').getCharacteristic(this.Characteristic.Active).value === 1
+            ? 'on'
+            : 'off'
+          params.switches[2].switch = this.accessory.getService('Valve C').getCharacteristic(this.Characteristic.Active).value === 1
+            ? 'on'
+            : 'off'
+          params.switches[3].switch = this.accessory.getService('Valve D').getCharacteristic(this.Characteristic.Active).value === 1
+            ? 'on'
+            : 'off'
+          break
+        case 'Valve B':
+          params.switches[0].switch = this.accessory.getService('Valve A').getCharacteristic(this.Characteristic.Active).value === 1
+            ? 'on'
+            : 'off'
+          params.switches[1].switch = value ? 'on' : 'off'
+          params.switches[2].switch = this.accessory.getService('Valve C').getCharacteristic(this.Characteristic.Active).value === 1
+            ? 'on'
+            : 'off'
+          params.switches[3].switch = this.accessory.getService('Valve D').getCharacteristic(this.Characteristic.Active).value === 1
+            ? 'on'
+            : 'off'
+          break
+        case 'Valve C':
+          params.switches[0].switch = this.accessory.getService('Valve A').getCharacteristic(this.Characteristic.Active).value === 1
+            ? 'on'
+            : 'off'
+          params.switches[1].switch = this.accessory.getService('Valve B').getCharacteristic(this.Characteristic.Active).value === 1
+            ? 'on'
+            : 'off'
+          params.switches[2].switch = value ? 'on' : 'off'
+          params.switches[3].switch = this.accessory.getService('Valve D').getCharacteristic(this.Characteristic.Active).value === 1
+            ? 'on'
+            : 'off'
+          break
+        case 'Valve D':
+          params.switches[0].switch = this.accessory.getService('Valve A').getCharacteristic(this.Characteristic.Active).value === 1
+            ? 'on'
+            : 'off'
+          params.switches[1].switch = this.accessory.getService('Valve B').getCharacteristic(this.Characteristic.Active).value === 1
+            ? 'on'
+            : 'off'
+          params.switches[2].switch = this.accessory.getService('Valve C').getCharacteristic(this.Characteristic.Active).value === 1
+            ? 'on'
+            : 'off'
+          params.switches[3].switch = value ? 'on' : 'off'
+          break
+      }
+      valveService.updateCharacteristic(this.Characteristic.InUse, value)
+      switch (value) {
+        case 0:
+          valveService.updateCharacteristic(this.Characteristic.RemainingDuration, 0)
+          clearTimeout(this.accessory.getService(valve).timer)
+          this.log('[%s] current state [%s stopped].', this.accessory.displayName, valve)
+          break
+        case 1: {
+          const timer = valveService.getCharacteristic(this.Characteristic.SetDuration).value
+          valveService.updateCharacteristic(this.Characteristic.RemainingDuration, timer)
+          this.log('[%s] current state [%s watering].', this.accessory.displayName, valve)
+          valveService.timer = setTimeout(() => {
+            valveService.setCharacteristic(this.Characteristic.Active, 0)
+          }, timer * 1000)
+          break
+        }
+      }
+      await this.platform.sendDeviceUpdate(this.accessory, params)
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, true)
+    }
+  }
+
+  async externalUpdate (params) {
+    try {
+      if (!params.switches) return
+      ;['A', 'B', 'C', 'D'].forEach((v, k) => {
+        const valveService = this.accessory.getService('Valve ' + v)
+        if (params.switches[k].switch === 'on') {
+          if (valveService.getCharacteristic(this.Characteristic.Active).value === 0) {
+            const timer = valveService.getCharacteristic(this.Characteristic.SetDuration).value
+            valveService
+              .updateCharacteristic(this.Characteristic.Active, 1)
+              .updateCharacteristic(this.Characteristic.InUse, 1)
+              .updateCharacteristic(this.Characteristic.RemainingDuration, timer)
+            if (params.updateSource) this.log('[%s] current state [Valve %s watering].', this.accessory.displayName, v)
+            valveService.timer = setTimeout(() => {
+              valveService.setCharacteristic(this.Characteristic.Active, 0)
+            }, timer * 1000)
+          }
+          return
+        }
+        valveService
+          .updateCharacteristic(this.Characteristic.Active, 0)
+          .updateCharacteristic(this.Characteristic.InUse, 0)
+          .updateCharacteristic(this.Characteristic.RemainingDuration, 0)
+        clearTimeout(valveService.timer)
+      })
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, false)
+    }
+  }
+}
diff --git a/lib/index.js b/lib/index.js
index dd9378f4..a923123f 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -184,32 +184,32 @@ class eWeLinkPlatform {
         accessory.control = new (require('./device/blind'))(this, accessory)
         /***************************/
       } else if (this.cusG.has(device.deviceid) && this.cusG.get(device.deviceid).type === 'garage') {
-        /**********************************
+        /****************************************
         GARAGE DOORS [ONE] [ACCESSORY SIMULATION]
-        **********************************/
+        ****************************************/
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
           : this.addAccessory(device, device.deviceid + 'SWX', false, this.helpers.defaultGarageCache)
         accessory.control = new (require('./device/garage-one'))(this, accessory)
-        /*********************************/
+        /***************************************/
       } else if (this.cusG.has(device.deviceid) && this.cusG.get(device.deviceid).type === 'garage_two') {
-        /**********************************
+        /****************************************
         GARAGE DOORS [TWO] [ACCESSORY SIMULATION]
-        **********************************/
+        ****************************************/
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
           : this.addAccessory(device, device.deviceid + 'SWX', false, this.helpers.defaultGarageTwoCache)
         accessory.control = new (require('./device/garage-two'))(this, accessory)
-        /*********************************/
+        /***************************************/
       } else if (this.cusG.has(device.deviceid) && this.cusG.get(device.deviceid).type === 'garage_four') {
-        /**********************************
+        /*****************************************
         GARAGE DOORS [FOUR] [ACCESSORY SIMULATION]
-        **********************************/
+        *****************************************/
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
           : this.addAccessory(device, device.deviceid + 'SWX', false, this.helpers.defaultGarageFourCache)
         accessory.control = new (require('./device/garage-four'))(this, accessory)
-        /*********************************/
+        /****************************************/
       } else if (this.cusG.has(device.deviceid) && this.cusG.get(device.deviceid).type === 'garage_eachen') {
         /***************************
         GARAGE DOORS [EACHEN GD-DC5]
@@ -236,7 +236,7 @@ class eWeLinkPlatform {
           ? this.devicesInHB.get(device.deviceid + 'SWX')
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/switch-valve'))(this, accessory)
-        /***************************/
+        /*********************************/
       } else if (this.cusG.has(device.deviceid) && this.cusG.get(device.deviceid).type === 'tap_one') {
         /********************************
         TAPS [ONE] [ACCESSORY SIMULATION]
@@ -245,16 +245,16 @@ class eWeLinkPlatform {
           ? this.devicesInHB.get(device.deviceid + 'SWX')
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/tap-one'))(this, accessory)
-        /***************************/
+        /*******************************/
       } else if (this.cusG.has(device.deviceid) && this.cusG.get(device.deviceid).type === 'valve') {
-        /********************************
+        /**********************************
         VALVES [ONE] [ACCESSORY SIMULATION]
         **********************************/
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/valve-one'))(this, accessory)
-        /***************************/
+        /*********************************/
       } else if (this.cusG.has(device.deviceid) && this.cusG.get(device.deviceid).type === 'valve_two') {
         /**********************************
         VALVES [TWO] [ACCESSORY SIMULATION]
@@ -263,7 +263,16 @@ class eWeLinkPlatform {
           ? this.devicesInHB.get(device.deviceid + 'SWX')
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/valve-two'))(this, accessory)
-        /***************************/
+        /*********************************/
+      } else if (this.cusG.has(device.deviceid) && this.cusG.get(device.deviceid).type === 'valve_four') {
+        /***********************************
+        VALVES [FOUR] [ACCESSORY SIMULATION]
+        ***********************************/
+        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
+          ? this.devicesInHB.get(device.deviceid + 'SWX')
+          : this.addAccessory(device, device.deviceid + 'SWX')
+        accessory.control = new (require('./device/valve-four'))(this, accessory)
+        /**********************************/
       } else if (this.helpers.devicesSensor.includes(device.extra.uiid)) {
         /*******************
         SENSORS [SONOFF DW2]
@@ -290,7 +299,7 @@ class eWeLinkPlatform {
           ? this.devicesInHB.get(device.deviceid + 'SWX')
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/diffuser'))(this, accessory)
-        /**/
+        /*******/
       } else if (this.helpers.devicesThermostat.includes(device.extra.uiid)) {
         /********************
         THERMOSTATS [TH10/16]
@@ -303,7 +312,7 @@ class eWeLinkPlatform {
         accessory.control = (this.config.thAsThermostat || '').split(',').includes(device.deviceid)
           ? new (require('./device/th-thermo'))(this, accessory)
           : new (require('./device/th-outlet'))(this, accessory)
-        /*********/
+        /*******************/
       } else if (
         this.helpers.devicesOutlet.includes(device.extra.uiid) ||
         (this.helpers.devicesSingleSwitch.includes(device.extra.uiid) && this.helpers.devicesSingleSwitchOutlet.includes(device.productModel))
diff --git a/lib/utils/helpers.js b/lib/utils/helpers.js
index 0b40ef7e..96d08cc4 100644
--- a/lib/utils/helpers.js
+++ b/lib/utils/helpers.js
@@ -10,7 +10,7 @@ module.exports = {
   allowedGroups: [
     'blind', 'garage', 'garage_two', 'garage_four',
     'garage_eachen', 'lock', 'tap_one', 'switch_valve',
-    'valve', 'valve_two'
+    'valve', 'valve_two', 'valve_four'
   ],
   defaults: {
     inUsePowerThreshold: 0,

From cf8fdd499462252855b1a360212d49964f89df3d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 10 Jan 2021 12:30:16 +0000
Subject: [PATCH 1125/3183] remove hideDevFromHB

---
 config.schema.json | 3 ---
 lib/index.js       | 3 +--
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 955da0fe..7d93f266 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -158,9 +158,6 @@
       "bulbB02FST64": {
         "type": "string"
       },
-      "hideDevFromHB": {
-        "type": "string"
-      },
       "groups": {
         "type": "array",
         "items": {
diff --git a/lib/index.js b/lib/index.js
index a923123f..728c2aa2 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -29,8 +29,7 @@ class eWeLinkPlatform {
     this.cusG = new Map()
     this.cusS = new Map()
     this.hiddenMasters = []
-    this.ignoredDevices = (this.config.ignoredDevices || this.config.hideDevFromHB || '')
-      .replace(/[\s'"]+/g, '').toLowerCase().split(',')
+    this.ignoredDevices = (this.config.ignoredDevices || '').replace(/[\s'"]+/g, '').toLowerCase().split(',')
     this.thTempOffset = {}
     this.nameOverride = {}
     this.ipOverride = {}

From c1c43d14c714e06a2c272d4cf579f0de96e24d11 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 10 Jan 2021 12:43:45 +0000
Subject: [PATCH 1126/3183] 4.2.3-1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 6223862a..be4ff863 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.2.3-0",
+  "version": "4.2.3-1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index b842d022..bbd2fde9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.2.3-0",
+  "version": "4.2.3-1",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 72426dc76e8235393f0b7484b44753f0a1dfe12b Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Sun, 10 Jan 2021 14:10:06 +0000
Subject: [PATCH 1127/3183] Update README.md

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 99bcdb77..f03b29bc 100644
--- a/README.md
+++ b/README.md
@@ -63,3 +63,4 @@ Homebridge plugin to control eWeLink devices with original firmware
 
 ### Disclaimer
 * I am in no way affiliated with eWeLink nor any of the device brands (like Sonoff) and this plugin is a personal project that I maintain in my free time.
+* Use this plugin entirely at your own risk - please see licence for more information.

From e38c9ae2ef59c3eff7573c85b98a08acb99ca090 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 10 Jan 2021 15:01:25 +0000
Subject: [PATCH 1128/3183] disclaimer

---
 lib/homebridge-ui/public/index.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/homebridge-ui/public/index.html b/lib/homebridge-ui/public/index.html
index a1b5c175..88963000 100644
--- a/lib/homebridge-ui/public/index.html
+++ b/lib/homebridge-ui/public/index.html
@@ -106,6 +106,7 @@ <h4>Credits</h4>
   <h4>Disclaimer</h4>
   <ul>
     <li>I am in no way affiliated with eWeLink nor any of the device brands (like Sonoff) and this plugin is a personal project that I maintain in my free time.</li>
+    <li>Use this plugin entirely at your own risk - please see licence for more information.</li>
   </ul>
 </div>
 <script>

From 699996847b72330418aaf26eea5cccfd367e4441 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 10 Jan 2021 15:22:18 +0000
Subject: [PATCH 1129/3183] clean up view

---
 config.schema.json | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 7d93f266..8dd7e0ce 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -13,22 +13,21 @@
         "default": "eWeLink"
       },
       "countryCode": {
-        "type": "string",
+        "type": "number",
         "title": "Country Code",
-        "required": true,
-        "description": "The telephone country code linked to your eWeLink account (without the +)."
+        "placeholder": "Enter without the +",
+        "required": true
       },
       "username": {
         "type": "string",
         "title": "Username",
         "required": true,
-        "description": "The phone number or email address linked to your eWeLink account. If you use a phone number then enter the country code (with the +), for example +8613185260282."
+        "placeholder": "Email or full phone (e.g. +8613185260282)"
       },
       "password": {
         "type": "string",
         "title": "Password",
-        "required": true,
-        "description": "The password for your eWeLink account."
+        "required": true
       },
       "mode": {
         "type": "string",
@@ -398,6 +397,7 @@
     {
       "type": "fieldset",
       "title": "Optional Settings",
+      "expandable": true,
       "items": [
         "mode",
         "debug",
@@ -406,8 +406,7 @@
     },
     {
       "type": "fieldset",
-      "title": "Device Specific Settings",
-      "description": "Further optional settings for specific devices.",
+      "title": "Device Settings",
       "expandable": true,
       "items": [
         "ignoredDevices",
@@ -427,7 +426,7 @@
       "key": "groups",
       "expandable": true,
       "title": "Accessory Simulations",
-      "description": "You can use this setting to set up custom simulated HomeKit accessories from a generic single/multi-switch device. Please see <a href=\"https://github.com/bwp91/homebridge-ewelink/wiki/Accessory-Simulations\" target=\"_blank\">this wiki article</a> for more information.",
+      "description": "Set up custom simulated accessories generic devices - <a href=\"https://github.com/bwp91/homebridge-ewelink/wiki/Accessory-Simulations\" target=\"_blank\">more info</a>.",
       "add": "Add Another Type",
       "type": "array",
       "items": [
@@ -446,7 +445,7 @@
     {
       "key": "bridgeSensors",
       "title": "RF Bridge Sensors",
-      "description": "You can expose different types of sensors connected to your RF Bridge. Please see <a href=\"https://github.com/bwp91/homebridge-ewelink/wiki/How-to-set-up-RF-Bridge-sensors\" target=\"_blank\">this wiki article</a> for more information.",
+      "description": "Expose different types of sensors linked to your RF Bridge - <a href=\"https://github.com/bwp91/homebridge-ewelink/wiki/How-to-set-up-RF-Bridge-sensors\" target=\"_blank\">more info</a>.",
       "expandable": true,
       "add": "Add Another Sensor",
       "type": "array",

From 32a653491d167ee63a18639a283301f80d3da6ee Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 10 Jan 2021 16:49:56 +0000
Subject: [PATCH 1130/3183] Update colour-utils.js

---
 lib/utils/colour-utils.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/utils/colour-utils.js b/lib/utils/colour-utils.js
index 776c7459..d2fcbe43 100644
--- a/lib/utils/colour-utils.js
+++ b/lib/utils/colour-utils.js
@@ -39,8 +39,8 @@ module.exports = {
     const min = Math.min(r, g, b)
     const max = Math.max(r, g, b)
     const delta = max - min
-    let h
-    let s
+    let h = 0
+    let s = 0
     if (max === min) {
       h = 0
     } else if (r === max) {

From d3ac2b26dd7e1c0c9cd0590cf62e0d1a9fc55fee Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 10 Jan 2021 20:35:43 +0000
Subject: [PATCH 1131/3183] rename tap_one to tap

---
 config.schema.json   | 2 +-
 lib/index.js         | 2 +-
 lib/utils/helpers.js | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 8dd7e0ce..efed68b6 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -211,7 +211,7 @@
                 {
                   "title": "1 Tap/Faucet (using single channel device)",
                   "enum": [
-                    "tap_one"
+                    "tap"
                   ]
                 },
                 {
diff --git a/lib/index.js b/lib/index.js
index 728c2aa2..0bf6c5c7 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -236,7 +236,7 @@ class eWeLinkPlatform {
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/switch-valve'))(this, accessory)
         /*********************************/
-      } else if (this.cusG.has(device.deviceid) && this.cusG.get(device.deviceid).type === 'tap_one') {
+      } else if (this.cusG.has(device.deviceid) && this.cusG.get(device.deviceid).type === 'tap') {
         /********************************
         TAPS [ONE] [ACCESSORY SIMULATION]
         ********************************/
diff --git a/lib/utils/helpers.js b/lib/utils/helpers.js
index 96d08cc4..1ebbc775 100644
--- a/lib/utils/helpers.js
+++ b/lib/utils/helpers.js
@@ -9,7 +9,7 @@ module.exports = {
   httpRetryCodes: ['ENOTFOUND', 'ETIMEDOUT', 'EAI_AGAIN'],
   allowedGroups: [
     'blind', 'garage', 'garage_two', 'garage_four',
-    'garage_eachen', 'lock', 'tap_one', 'switch_valve',
+    'garage_eachen', 'lock', 'tap', 'switch_valve',
     'valve', 'valve_two', 'valve_four'
   ],
   defaults: {

From b357f54184626e59480b749425d316b9ba86c2c8 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 10 Jan 2021 20:39:24 +0000
Subject: [PATCH 1132/3183] rename lock for consistency

---
 lib/device/{lock.js => lock-one.js} | 2 +-
 lib/index.js                        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename lib/device/{lock.js => lock-one.js} (98%)

diff --git a/lib/device/lock.js b/lib/device/lock-one.js
similarity index 98%
rename from lib/device/lock.js
rename to lib/device/lock-one.js
index 9692457c..587b8a93 100644
--- a/lib/device/lock.js
+++ b/lib/device/lock-one.js
@@ -1,7 +1,7 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
-module.exports = class deviceLock {
+module.exports = class deviceLockOne {
   constructor (platform, accessory) {
     this.platform = platform
     this.log = platform.log
diff --git a/lib/index.js b/lib/index.js
index 0bf6c5c7..ddf45653 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -225,7 +225,7 @@ class eWeLinkPlatform {
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
           : this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require('./device/lock'))(this, accessory)
+        accessory.control = new (require('./device/lock-one'))(this, accessory)
         /**************************/
       } else if (this.cusG.has(device.deviceid) && this.cusG.get(device.deviceid).type === 'switch_valve') {
         /**********************************

From 7bda7bcadaa343c223d996c434e545c904c4e9db Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 11 Jan 2021 08:30:34 +0000
Subject: [PATCH 1133/3183] disableDeviceLogging option

---
 config.schema.json          |  6 ++++
 lib/device/blind.js         |  5 +++-
 lib/device/curtain.js       |  5 +++-
 lib/device/diffuser.js      | 36 +++++++++++++++-------
 lib/device/fan.js           | 25 ++++++++++++----
 lib/device/garage-eachen.js |  7 +++--
 lib/device/garage-four.js   |  5 +++-
 lib/device/garage-one.js    |  9 ++++--
 lib/device/garage-two.js    | 13 +++++---
 lib/device/light-colour.js  | 59 +++++++++++++++++++++++++------------
 lib/device/light-ctemp.js   | 49 +++++++++++++++++++-----------
 lib/device/light-dimmer.js  | 21 +++++++++----
 lib/device/lock-one.js      | 17 ++++++++---
 lib/device/outlet.js        | 11 +++++--
 lib/device/rf-bridge.js     | 12 ++++++--
 lib/device/scm.js           |  9 ++++--
 lib/device/sensor.js        | 15 +++++++---
 lib/device/switch-multi.js  | 13 ++++++--
 lib/device/switch-single.js |  9 ++++--
 lib/device/switch-valve.js  | 21 +++++++++----
 lib/device/tap-one.js       |  9 ++++--
 lib/device/template.js      |  1 +
 lib/device/th-outlet.js     | 17 ++++++++---
 lib/device/th-thermo.js     | 17 ++++++++---
 lib/device/usb.js           |  9 ++++--
 lib/device/valve-four.js    | 13 ++++++--
 lib/device/valve-one.js     | 13 ++++++--
 lib/device/valve-two.js     | 13 ++++++--
 lib/device/zb-dev.js        | 19 +++++++-----
 29 files changed, 336 insertions(+), 122 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index efed68b6..37c6bd4d 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -55,6 +55,11 @@
           }
         ]
       },
+      "disableDeviceLogging": {
+        "type": "boolean",
+        "title": "Disable Device Logging",
+        "description": "If checked, device updates will not be added to the log."
+      },
       "debug": {
         "title": "Debug Logging",
         "type": "boolean",
@@ -401,6 +406,7 @@
       "items": [
         "mode",
         "debug",
+        "disableDeviceLogging",
         "disablePlugin"
       ]
     },
diff --git a/lib/device/blind.js b/lib/device/blind.js
index b5a4cb64..7f0886a2 100644
--- a/lib/device/blind.js
+++ b/lib/device/blind.js
@@ -5,6 +5,7 @@ module.exports = class deviceBlind {
   constructor (platform, accessory) {
     this.platform = platform
     this.log = platform.log
+    this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
@@ -63,7 +64,9 @@ module.exports = class deviceBlind {
         .updateCharacteristic(this.Characteristic.CurrentPosition, value)
       this.accessory.context.cachePositionState = 2
       this.accessory.context.cacheCurrentPosition = value
-      this.log('[%s] current position [%s%]', this.accessory.displayName, value)
+      if (!this.disableDeviceLogging) {
+        this.log('[%s] current position [%s%]', this.accessory.displayName, value)
+      }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
     }
diff --git a/lib/device/curtain.js b/lib/device/curtain.js
index 7a58a2a8..4dc6bc2f 100644
--- a/lib/device/curtain.js
+++ b/lib/device/curtain.js
@@ -5,6 +5,7 @@ module.exports = class deviceCurtain {
   constructor (platform, accessory) {
     this.platform = platform
     this.log = platform.log
+    this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
@@ -40,7 +41,9 @@ module.exports = class deviceCurtain {
         .updateCharacteristic(this.Characteristic.PositionState, 2)
       if (params.updateSource && this.cachePosition !== newPos) {
         this.cachePosition = newPos
-        this.log('[%s] current position [%s%].', this.accessory.displayName, this.cachePosition)
+        if (!this.disableDeviceLogging) {
+          this.log('[%s] current position [%s%].', this.accessory.displayName, this.cachePosition)
+        }
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
diff --git a/lib/device/diffuser.js b/lib/device/diffuser.js
index d98f6f32..db6ac0bf 100644
--- a/lib/device/diffuser.js
+++ b/lib/device/diffuser.js
@@ -5,6 +5,7 @@ module.exports = class deviceDiffuser {
   constructor (platform, accessory) {
     this.platform = platform
     this.log = platform.log
+    this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.helpers = platform.helpers
     this.colourUtils = platform.colourUtils
     this.Service = platform.api.hap.Service
@@ -47,7 +48,9 @@ module.exports = class deviceDiffuser {
         if (this.updateTimeout === timerKey) this.updateTimeout = false
       }, 10000)
       await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.log('[%s] current state [%s].', this.accessory.displayName, this.cacheOnOff)
+      if (!this.disableDeviceLogging) {
+        this.log('[%s] current state [%s].', this.accessory.displayName, this.cacheOnOff)
+      }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
     }
@@ -70,7 +73,9 @@ module.exports = class deviceDiffuser {
         if (this.updateTimeout === updateKeySpeed) this.updateTimeout = false
       }, 10000)
       await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.log('[%s] current speed [%s%].', this.accessory.displayName, newSpeed)
+      if (!this.disableDeviceLogging) {
+        this.log('[%s] current speed [%s%].', this.accessory.displayName, newSpeed)
+      }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
     }
@@ -92,7 +97,9 @@ module.exports = class deviceDiffuser {
         if (this.updateTimeout === updateKeyLight) this.updateTimeout = false
       }, 10000)
       await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.log('[%s] current light [%s%].', this.accessory.displayName, value ? 'on' : 'off')
+      if (!this.disableDeviceLogging) {
+        this.log('[%s] current light [%s%].', this.accessory.displayName, value ? 'on' : 'off')
+      }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
     }
@@ -116,7 +123,9 @@ module.exports = class deviceDiffuser {
         if (this.updateTimeout === updateKeyBright) this.updateTimeout = false
       }, 10000)
       await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.log('[%s] current brightness [%s%].', this.accessory.displayName, this.cacheBrightness)
+      if (!this.disableDeviceLogging) {
+        this.log('[%s] current brightness [%s%].', this.accessory.displayName, this.cacheBrightness)
+      }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
     }
@@ -151,7 +160,9 @@ module.exports = class deviceDiffuser {
         if (this.updateTimeout === updateKeyColour) this.updateTimeout = false
       }, 10000)
       await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.log('[%s] current colour [rgb %s %s %s].', this.accessory.displayName, this.cacheR, this.cacheG, this.cacheB)
+      if (!this.disableDeviceLogging) {
+        this.log('[%s] current colour [rgb %s %s %s].', this.accessory.displayName, this.cacheR, this.cacheG, this.cacheB)
+      }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
     }
@@ -162,6 +173,9 @@ module.exports = class deviceDiffuser {
       if (this.updateTimeout) return
       if (params.switch && params.switch !== this.cacheOnOff) {
         this.cacheOnOff = params.switch
+        if (params.updateSource && !this.disableDeviceLogging) {
+          this.log('[%s] current state [%s%].', this.accessory.displayName, this.cacheOnOff)
+        }
         this.fanService.updateCharacteristic(this.Characteristic.On, this.cacheOnOff === 'on')
         if (!this.helpers.hasProperty(params, 'state')) {
           this.fanService.updateCharacteristic(this.Characteristic.RotationSpeed, this.cacheSpeed)
@@ -170,19 +184,21 @@ module.exports = class deviceDiffuser {
       if (this.helpers.hasProperty(params, 'state') && params.state * 50 !== this.cacheSpeed) {
         this.cacheSpeed = params.state * 50
         this.fanService.updateCharacteristic(this.Characteristic.RotationSpeed, this.cacheSpeed)
-        if (params.updateSource) this.log('[%s] current speed [%s%].', this.accessory.displayName, this.cacheSpeed)
+        if (params.updateSource && !this.disableDeviceLogging) {
+          this.log('[%s] current speed [%s%].', this.accessory.displayName, this.cacheSpeed)
+        }
       }
       if (this.helpers.hasProperty(params, 'lightswitch') && this.cacheLightOnOff !== params.lightswitch) {
         this.cacheLightOnOff = params.lightswitch
         this.lightService.updateCharacteristic(this.Characteristic.On, params.lightswitch === 1)
-        if (params.updateSource) {
-          this.log('[%s] current speed [%s%].', this.accessory.displayNameparams.lightswitch === 1 ? 'on' : 'off')
+        if (params.updateSource && !this.disableDeviceLogging) {
+          this.log('[%s] current light [%s%].', this.accessory.displayNameparams.lightswitch === 1 ? 'on' : 'off')
         }
       }
       if (this.helpers.hasProperty(params, 'lightbright') && this.cacheBrightness !== params.lightbright) {
         this.cacheBrightness = params.lightbright
         this.lightService.updateCharacteristic(this.Characteristic.Brightness, params.lightbright)
-        if (params.updateSource) {
+        if (params.updateSource && !this.disableDeviceLogging) {
           this.log('[%s] current brightness [%s%].', this.accessory.displayNameparams.lightbright)
         }
       }
@@ -196,7 +212,7 @@ module.exports = class deviceDiffuser {
           this.lightService
             .updateCharacteristic(this.Characteristic.Hue, this.cacheHue)
             .updateCharacteristic(this.Characteristic.Saturation, 100)
-          if (params.updateSource) {
+          if (params.updateSource && !this.disableDeviceLogging) {
             this.log('[%s] current colour [rgb %s %s %s].', this.accessory.displayName, this.cacheR, this.cacheG, this.cacheB)
           }
         }
diff --git a/lib/device/fan.js b/lib/device/fan.js
index 6b72d8cd..1c4da26b 100644
--- a/lib/device/fan.js
+++ b/lib/device/fan.js
@@ -5,6 +5,7 @@ module.exports = class deviceFan {
   constructor (platform, accessory) {
     this.platform = platform
     this.log = platform.log
+    this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
@@ -46,11 +47,15 @@ module.exports = class deviceFan {
       await this.platform.sendDeviceUpdate(this.accessory, params)
       if (newPower !== (this.cacheOnOff === 'on')) {
         this.cacheOnOff = newPower ? 'on' : 'off'
-        this.log('[%s] current state [%s].', this.accessory.displayName, this.cacheOnOff)
+        if (!this.disableDeviceLogging) {
+          this.log('[%s] current state [%s].', this.accessory.displayName, this.cacheOnOff)
+        }
       }
       if (newSpeed !== this.cacheSpeed) {
         this.cacheSpeed = newSpeed
-        this.log('[%s] current speed [%s%].', this.accessory.displayName, this.cacheSpeed)
+        if (!this.disableDeviceLogging) {
+          this.log('[%s] current speed [%s%].', this.accessory.displayName, this.cacheSpeed)
+        }
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
@@ -71,7 +76,9 @@ module.exports = class deviceFan {
       await this.platform.sendDeviceUpdate(this.accessory, params)
       if (newLight !== (this.cacheLight === 'on')) {
         this.cacheLight = newLight ? 'on' : 'off'
-        this.log('[%s] current light [%s].', this.accessory.displayName, this.cacheLight)
+        if (!this.disableDeviceLogging) {
+          this.log('[%s] current light [%s].', this.accessory.displayName, this.cacheLight)
+        }
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
@@ -84,7 +91,9 @@ module.exports = class deviceFan {
       if (params.switches[1].switch !== this.cacheOnOff) {
         this.cacheOnOff = params.switches[1].switch
         this.service.updateCharacteristic(this.Characteristic.On, this.cacheLight === 'on')
-        if (params.updateSource) this.log('[%s] current state [%s].', this.accessory.displayName, this.cacheOnOff)
+        if (params.updateSource && !this.disableDeviceLogging) {
+          this.log('[%s] current state [%s].', this.accessory.displayName, this.cacheOnOff)
+        }
       }
       let speed = 0
       switch (params.switches[2].switch + params.switches[3].switch) {
@@ -100,12 +109,16 @@ module.exports = class deviceFan {
       if (speed !== this.cacheSpeed) {
         this.cacheSpeed = speed
         this.service.updateCharacteristic(this.Characteristic.RotationSpeed, this.cacheSpeed)
-        if (params.updateSource) this.log('[%s] current speed [%s%].', this.accessory.displayName, this.cacheSpeed)
+        if (params.updateSource && !this.disableDeviceLogging) {
+          this.log('[%s] current speed [%s%].', this.accessory.displayName, this.cacheSpeed)
+        }
       }
       if (this.lightService && params.switches[0].switch !== this.cacheLight) {
         this.cacheLight = params.switches[0].switch
         this.lightService.updateCharacteristic(this.Characteristic.On, this.cacheLight === 'on')
-        if (params.updateSource) this.log('[%s] current light state [%s].', this.accessory.displayName, this.cacheLight)
+        if (params.updateSource && !this.disableDeviceLogging) {
+          this.log('[%s] current light state [%s].', this.accessory.displayName, this.cacheLight)
+        }
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
diff --git a/lib/device/garage-eachen.js b/lib/device/garage-eachen.js
index cb56bc6e..915a6269 100644
--- a/lib/device/garage-eachen.js
+++ b/lib/device/garage-eachen.js
@@ -5,6 +5,7 @@ module.exports = class deviceGarageEachen {
   constructor (platform, accessory) {
     this.platform = platform
     this.log = platform.log
+    this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
@@ -48,7 +49,9 @@ module.exports = class deviceGarageEachen {
       if (value === 0) {
         await this.helpers.sleep(Math.max((garageConfig.operationTime - 20) * 100, 0))
         this.service.updateCharacteristic(this.Characteristic.CurrentDoorState, 0)
-        this.log('[%s] current state [open].', this.accessory.displayName)
+        if (!this.disableDeviceLogging) {
+          this.log('[%s] current state [open].', this.accessory.displayName)
+        }
       }
     } catch (err) {
       this.inUse = false
@@ -62,7 +65,7 @@ module.exports = class deviceGarageEachen {
       this.service
         .updateCharacteristic(this.Characteristic.TargetDoorState, params.switch === 'on' ? 0 : 1)
         .updateCharacteristic(this.Characteristic.CurrentDoorState, params.switch === 'on' ? 0 : 1)
-      if (params.updateSource) {
+      if (params.updateSource && !this.disableDeviceLogging) {
         this.log('[%s] current state [%s].', this.accessory.displayName, params.switch === 'on' ? 'open' : 'closed')
       }
     } catch (err) {
diff --git a/lib/device/garage-four.js b/lib/device/garage-four.js
index 47ecbdf6..596aff4f 100644
--- a/lib/device/garage-four.js
+++ b/lib/device/garage-four.js
@@ -5,6 +5,7 @@ module.exports = class deviceGarageFour {
   constructor (platform, accessory) {
     this.platform = platform
     this.log = platform.log
+    this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
@@ -64,7 +65,9 @@ module.exports = class deviceGarageFour {
       if (this.updateKey !== updateKey) return
       gdService.updateCharacteristic(this.Characteristic.CurrentDoorState, value)
       this.accessory.context.cacheStates[garageChannel].cacheCurrentDoorState = value
-      this.log('[%s] current state [garage %s %s].', this.accessory.displayName, garageChannel, value === 0 ? 'open' : 'closed')
+      if (!this.disableDeviceLogging) {
+        this.log('[%s] current state [garage %s %s].', this.accessory.displayName, garageChannel, value === 0 ? 'open' : 'closed')
+      }
     } catch (err) {
       this.inUse = false
       this.platform.deviceUpdateError(this.accessory, err, true)
diff --git a/lib/device/garage-one.js b/lib/device/garage-one.js
index 69391dbc..30fa204f 100644
--- a/lib/device/garage-one.js
+++ b/lib/device/garage-one.js
@@ -5,6 +5,7 @@ module.exports = class deviceGarageOne {
   constructor (platform, accessory) {
     this.platform = platform
     this.log = platform.log
+    this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
@@ -74,7 +75,9 @@ module.exports = class deviceGarageOne {
       if (!sAccessory) {
         this.service.updateCharacteristic(this.Characteristic.CurrentDoorState, newPos)
         this.accessory.context.cacheCurrentDoorState = newPos
-        this.log('[%s] current state [%s].', this.accessory.displayName, newPos === 0 ? 'open' : 'closed')
+        if (!this.disableDeviceLogging) {
+          this.log('[%s] current state [%s].', this.accessory.displayName, newPos === 0 ? 'open' : 'closed')
+        }
       }
     } catch (err) {
       this.inUse = false
@@ -119,7 +122,9 @@ module.exports = class deviceGarageOne {
         await this.helpers.sleep(Math.max((garageConfig.operationTime - 20) * 100, 0))
         this.service.updateCharacteristic(this.Characteristic.CurrentDoorState, newPos - 2)
         this.accessory.context.cacheCurrentDoorState = newPos - 2
-        this.log('[%s] current state [%s].', this.accessory.displayName, newPos === 2 ? 'open' : 'closed')
+        if (!this.disableDeviceLogging) {
+          this.log('[%s] current state [%s].', this.accessory.displayName, newPos === 2 ? 'open' : 'closed')
+        }
       }
     } catch (err) {
       this.inUse = false
diff --git a/lib/device/garage-two.js b/lib/device/garage-two.js
index 5b7774a9..35ff6fff 100644
--- a/lib/device/garage-two.js
+++ b/lib/device/garage-two.js
@@ -5,6 +5,7 @@ module.exports = class deviceGarageTwo {
   constructor (platform, accessory) {
     this.platform = platform
     this.log = platform.log
+    this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
@@ -64,12 +65,16 @@ module.exports = class deviceGarageTwo {
       switch (garage) {
         case 'Garage 1': {
           this.accessory.context.cacheOneCurrentDoorState = newPos
-          this.log('[%s] current state [garage 1 %s].', this.accessory.displayName, newPos === 0 ? 'open' : 'closed')
+          if (!this.disableDeviceLogging) {
+            this.log('[%s] current state [garage 1 %s].', this.accessory.displayName, newPos === 0 ? 'open' : 'closed')
+          }
           break
         }
         case 'Garage 2': {
           this.accessory.context.cacheTwoCurrentDoorState = newPos
-          this.log('[%s] current state [garage 2 %s].', this.accessory.displayName, newPos === 0 ? 'open' : 'closed')
+          if (!this.disableDeviceLogging) {
+            this.log('[%s] current state [garage 2 %s].', this.accessory.displayName, newPos === 0 ? 'open' : 'closed')
+          }
           break
         }
       }
@@ -130,13 +135,13 @@ module.exports = class deviceGarageTwo {
         switch (v) {
           case '1':
             this.accessory.context.cacheOneCurrentDoorState = newPos - 2
-            if (params.updateSource) {
+            if (params.updateSource && !this.disableDeviceLogging) {
               this.log('[%s] current state [garage 1 %s].', this.accessory.displayName, newPos === 2 ? 'open' : 'closed')
             }
             break
           case '2':
             this.accessory.context.cacheTwoCurrentDoorState = newPos - 2
-            if (params.updateSource) {
+            if (params.updateSource && !this.disableDeviceLogging) {
               this.log('[%s] current state [garage 2 %s].', this.accessory.displayName, newPos === 2 ? 'open' : 'closed')
             }
             break
diff --git a/lib/device/light-colour.js b/lib/device/light-colour.js
index a616660f..3373adae 100644
--- a/lib/device/light-colour.js
+++ b/lib/device/light-colour.js
@@ -5,6 +5,7 @@ module.exports = class deviceLightColour {
   constructor (platform, accessory) {
     this.platform = platform
     this.log = platform.log
+    this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.helpers = platform.helpers
     this.colourUtils = platform.colourUtils
     this.Service = platform.api.hap.Service
@@ -62,7 +63,9 @@ module.exports = class deviceLightColour {
         if (this.updateTimeout === timerKey) this.updateTimeout = false
       }, 10000)
       await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.log('[%s] current state [%s].', this.accessory.displayName, this.cacheOnOff)
+      if (!this.disableDeviceLogging) {
+        this.log('[%s] current state [%s].', this.accessory.displayName, this.cacheOnOff)
+      }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
     }
@@ -118,7 +121,9 @@ module.exports = class deviceLightColour {
         if (this.updateTimeout === updateKeyBright) this.updateTimeout = false
       }, 10000)
       await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.log('[%s] current brightness [%s%].', this.accessory.displayName, value)
+      if (!this.disableDeviceLogging) {
+        this.log('[%s] current brightness [%s%].', this.accessory.displayName, value)
+      }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
     }
@@ -185,7 +190,9 @@ module.exports = class deviceLightColour {
         if (this.updateTimeout === updateKeyColour) this.updateTimeout = false
       }, 10000)
       await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.log('[%s] current colour [rgb %s %s %s].', this.accessory.displayName, this.cacheR, this.cacheG, this.cacheB)
+      if (!this.disableDeviceLogging) {
+        this.log('[%s] current colour [rgb %s %s %s].', this.accessory.displayName, this.cacheR, this.cacheG, this.cacheB)
+      }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
     }
@@ -247,10 +254,12 @@ module.exports = class deviceLightColour {
         if (this.updateTimeout === updateKeyCT) this.updateTimeout = false
       }, 10000)
       await this.platform.sendDeviceUpdate(this.accessory, params)
-      if (this.alController && this.alController.isAdaptiveLightingActive()) {
-        this.log('[%s] current cct [%sK] via adaptive lighting.', this.accessory.displayName, mToK)
-      } else {
-        this.log('[%s] current cct [%sK].', this.accessory.displayName, mToK)
+      if (!this.disableDeviceLogging) {
+        if (this.alController && this.alController.isAdaptiveLightingActive()) {
+          this.log('[%s] current cct [%sK] via adaptive lighting.', this.accessory.displayName, mToK)
+        } else {
+          this.log('[%s] current cct [%sK].', this.accessory.displayName, mToK)
+        }
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
@@ -267,7 +276,9 @@ module.exports = class deviceLightColour {
         this.cacheOnOff = this.isB1 ? params.state : params.switch
         this.service.updateCharacteristic(this.Characteristic.On, this.cacheOnOff === 'on')
         if (this.isB1) this.service.updateCharacteristic(this.Characteristic.Brightness, this.cacheOnOff === 'on' ? 100 : 0)
-        if (params.updateSource) this.log('[%s] current state [%s].', this.accessory.displayName, this.cacheOnOff)
+        if (params.updateSource && !this.disableDeviceLogging) {
+          this.log('[%s] current state [%s].', this.accessory.displayName, this.cacheOnOff)
+        }
       }
       let hs
       let mode
@@ -297,7 +308,7 @@ module.exports = class deviceLightColour {
                   .updateCharacteristic(this.Characteristic.Hue, this.cacheHue)
                   .updateCharacteristic(this.Characteristic.Saturation, 100)
                   .updateCharacteristic(this.Characteristic.Brightness, 100)
-                if (params.updateSource) {
+                if (params.updateSource && !this.disableDeviceLogging) {
                   this.log(
                     '[%s] current colour [rgb %s %s %s].',
                     this.accessory.displayName,
@@ -316,7 +327,9 @@ module.exports = class deviceLightColour {
             if (params.bright !== this.cacheBrightness) {
               this.cacheBrightness = params.bright
               this.service.updateCharacteristic(this.Characteristic.Brightness, this.cacheBrightness)
-              if (params.updateSource) this.log('[%s] current brightness [%s%].', this.accessory.displayName, this.cacheBrightness)
+              if (params.updateSource && !this.disableDeviceLogging) {
+                this.log('[%s] current brightness [%s%].', this.accessory.displayName, this.cacheBrightness)
+              }
             }
           }
           if (this.helpers.hasProperty(params, 'colorR')) {
@@ -331,11 +344,13 @@ module.exports = class deviceLightColour {
                 .updateCharacteristic(this.Characteristic.Hue, this.cacheHue)
                 .updateCharacteristic(this.Characteristic.Saturation, hs[1])
               if (params.updateSource) {
-                this.log(
-                  '[%s] current colour [rgb %s %s %s].',
-                  this.accessory.displayName,
-                  this.cacheR, this.cacheG, this.cacheB
-                )
+                if (!this.disableDeviceLogging) {
+                  this.log(
+                    '[%s] current colour [rgb %s %s %s].',
+                    this.accessory.displayName,
+                    this.cacheR, this.cacheG, this.cacheB
+                  )
+                }
                 if (this.alController && this.alController.isAdaptiveLightingActive()) {
                   this.alController.disableAdaptiveLighting()
                   this.log('[%s] adaptive lighting disabled due to significant colour change.', this.accessory.displayName)
@@ -351,7 +366,9 @@ module.exports = class deviceLightColour {
               if (params.color.br !== this.cacheBrightness) {
                 this.cacheBrightness = params.color.br
                 this.service.updateCharacteristic(this.Characteristic.Brightness, this.cacheBrightness)
-                if (params.updateSource) this.log('[%s] current brightness [%s%].', this.accessory.displayName, this.cacheBrightness)
+                if (params.updateSource && !this.disableDeviceLogging) {
+                  this.log('[%s] current brightness [%s%].', this.accessory.displayName, this.cacheBrightness)
+                }
               }
             }
             if (this.helpers.hasProperty(params.color, 'r')) {
@@ -372,7 +389,7 @@ module.exports = class deviceLightColour {
                   .updateCharacteristic(this.Characteristic.ColorTemperature, 140)
                   .updateCharacteristic(this.Characteristic.Hue, this.cacheHue)
                   .updateCharacteristic(this.Characteristic.Saturation, 100)
-                if (params.updateSource) {
+                if (params.updateSource && !this.disableDeviceLogging) {
                   this.log(
                     '[%s] current colour [rgb %s %s %s].',
                     this.accessory.displayName,
@@ -387,7 +404,9 @@ module.exports = class deviceLightColour {
               if (params.white.br !== this.cacheBrightness || this.cacheMode !== 'white') {
                 this.cacheBrightness = params.white.br
                 this.service.updateCharacteristic(this.Characteristic.Brightness, this.cacheBrightness)
-                if (params.updateSource) this.log('[%s] current brightness [%s%].', this.accessory.displayName, this.cacheBrightness)
+                if (params.updateSource && !this.disableDeviceLogging) {
+                  this.log('[%s] current brightness [%s%].', this.accessory.displayName, this.cacheBrightness)
+                }
               }
             }
             if (this.helpers.hasProperty(params.white, 'ct') && params.white.ct !== this.cacheCT) {
@@ -402,7 +421,9 @@ module.exports = class deviceLightColour {
                 .updateCharacteristic(this.Characteristic.Saturation, hs[1])
                 .updateCharacteristic(this.Characteristic.ColorTemperature, this.cacheMired)
               if (params.updateSource) {
-                this.log('[%s] current cct [%sK].', this.accessory.displayName, ctToK)
+                if (!this.disableDeviceLogging) {
+                  this.log('[%s] current cct [%sK].', this.accessory.displayName, ctToK)
+                }
                 if (
                   this.alController &&
                   this.alController.isAdaptiveLightingActive() &&
diff --git a/lib/device/light-ctemp.js b/lib/device/light-ctemp.js
index d7efa146..fb3d8c30 100644
--- a/lib/device/light-ctemp.js
+++ b/lib/device/light-ctemp.js
@@ -5,6 +5,7 @@ module.exports = class deviceLightColour {
   constructor (platform, accessory) {
     this.platform = platform
     this.log = platform.log
+    this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
@@ -50,7 +51,9 @@ module.exports = class deviceLightColour {
       await this.platform.sendDeviceUpdate(this.accessory, {
         switch: this.cacheOnOff
       })
-      this.log('[%s] current state [%s].', this.accessory.displayName, this.cacheOnOff)
+      if (!this.disableDeviceLogging) {
+        this.log('[%s] current state [%s].', this.accessory.displayName, this.cacheOnOff)
+      }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
     }
@@ -79,7 +82,9 @@ module.exports = class deviceLightColour {
         if (this.updateTimeout === updateKeyBright) this.updateTimeout = false
       }, 10000)
       await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.log('[%s] current brightness [%s%].', this.accessory.displayName, value)
+      if (!this.disableDeviceLogging) {
+        this.log('[%s] current brightness [%s%].', this.accessory.displayName, value)
+      }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
     }
@@ -110,10 +115,12 @@ module.exports = class deviceLightColour {
         if (this.updateTimeout === updateKeyCT) this.updateTimeout = false
       }, 10000)
       await this.platform.sendDeviceUpdate(this.accessory, params)
-      if (this.alController && this.alController.isAdaptiveLightingActive()) {
-        this.log('[%s] current cct [%sK] via adaptive lighting.', this.accessory.displayName, mToK)
-      } else {
-        this.log('[%s] current cct [%sK].', this.accessory.displayName, mToK)
+      if (!this.disableDeviceLogging) {
+        if (this.alController && this.alController.isAdaptiveLightingActive()) {
+          this.log('[%s] current cct [%sK] via adaptive lighting.', this.accessory.displayName, mToK)
+        } else {
+          this.log('[%s] current cct [%sK].', this.accessory.displayName, mToK)
+        }
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
@@ -126,28 +133,36 @@ module.exports = class deviceLightColour {
       if (params.switch && params.switch !== this.cacheOnOff) {
         this.cacheOnOff = params.switch
         this.service.updateCharacteristic(this.Characteristic.On, this.cacheOnOff === 'on')
-        if (params.updateSource) this.log('[%s] current state [%s].', this.accessory.displayName, this.cacheOnOff)
+        if (params.updateSource && !this.disableDeviceLogging) {
+          this.log('[%s] current state [%s].', this.accessory.displayName, this.cacheOnOff)
+        }
       }
       if (params.white) {
         if (this.helpers.hasProperty(params.white, 'br') && this.cacheBrightness !== params.white.br) {
           this.cacheBrightness = params.white.br
           this.service.updateCharacteristic(this.Characteristic.Brightness, this.cacheBrightness)
-          if (params.updateSource) this.log('[%s] current brightness [%s%].', this.accessory.displayName, this.cacheBrightness)
+          if (params.updateSource && !this.disableDeviceLogging) {
+            this.log('[%s] current brightness [%s%].', this.accessory.displayName, this.cacheBrightness)
+          }
         }
         if (this.helpers.hasProperty(params.white, 'ct') && this.cacheCT !== params.white.ct) {
           this.cacheCT = params.white.ct
           const ctToK = Math.round(this.cacheCT / 255 * (this.maxK - this.minK) + this.minK)
           this.cacheMired = Math.min(Math.max(Math.round(1000000 / ctToK), 140), 500)
           this.service.updateCharacteristic(this.Characteristic.ColorTemperature, this.cacheMired)
-          if (params.updateSource) this.log('[%s] current cct [%sK].', this.accessory.displayName, ctToK)
-          if (
-            this.alController &&
-            this.alController.isAdaptiveLightingActive() &&
-            Math.abs(params.white.ct - this.cacheCT) > 5
-          ) {
-            // *** look for a variation greater than five *** \\
-            this.alController.disableAdaptiveLighting()
-            this.log('[%s] adaptive lighting disabled due to significant colour change.', this.accessory.displayName)
+          if (params.updateSource) {
+            if (!this.disableDeviceLogging) {
+              this.log('[%s] current cct [%sK].', this.accessory.displayName, ctToK)
+            }
+            if (
+              this.alController &&
+              this.alController.isAdaptiveLightingActive() &&
+              Math.abs(params.white.ct - this.cacheCT) > 5
+            ) {
+              // *** look for a variation greater than five *** \\
+              this.alController.disableAdaptiveLighting()
+              this.log('[%s] adaptive lighting disabled due to significant colour change.', this.accessory.displayName)
+            }
           }
         }
       }
diff --git a/lib/device/light-dimmer.js b/lib/device/light-dimmer.js
index 25ad43d5..b1b59afe 100644
--- a/lib/device/light-dimmer.js
+++ b/lib/device/light-dimmer.js
@@ -5,6 +5,7 @@ module.exports = class deviceLightDimmer {
   constructor (platform, accessory) {
     this.platform = platform
     this.log = platform.log
+    this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
@@ -26,7 +27,9 @@ module.exports = class deviceLightDimmer {
       await this.platform.sendDeviceUpdate(this.accessory, {
         switch: this.cacheOnOff
       })
-      this.log('[%s] current state [%s].', this.accessory.displayName, this.cacheOnOff)
+      if (!this.disableDeviceLogging) {
+        this.log('[%s] current state [%s].', this.accessory.displayName, this.cacheOnOff)
+      }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
     }
@@ -57,7 +60,9 @@ module.exports = class deviceLightDimmer {
       await this.helpers.sleep(500)
       if (updateKey !== this.updateKeyBright) return
       await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.log('[%s] current brightness [%s%].', this.accessory.displayName, this.cacheBrightness)
+      if (!this.disableDeviceLogging) {
+        this.log('[%s] current brightness [%s%].', this.accessory.displayName, this.cacheBrightness)
+      }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
     }
@@ -68,7 +73,9 @@ module.exports = class deviceLightDimmer {
       if (params.switch && params.switch !== this.cacheOnOff) {
         this.service.updateCharacteristic(this.Characteristic.On, params.switch === 'on')
         this.cacheOnOff = params.switch
-        if (params.updateSource) this.log('[%s] current state [%s].', this.accessory.displayName, params.switch)
+        if (params.updateSource && !this.disableDeviceLogging) {
+          this.log('[%s] current state [%s].', this.accessory.displayName, params.switch)
+        }
       }
       switch (this.accessory.context.eweUIID) {
         case 36:
@@ -78,7 +85,9 @@ module.exports = class deviceLightDimmer {
             if (nb !== this.cacheBrightness) {
               this.service.updateCharacteristic(this.Characteristic.Brightness, nb)
               this.cacheBrightness = nb
-              if (params.updateSource) this.log('[%s] current brightness [%s%].', this.accessory.displayName, nb)
+              if (params.updateSource && !this.disableDeviceLogging) {
+                this.log('[%s] current brightness [%s%].', this.accessory.displayName, nb)
+              }
             }
           }
           break
@@ -88,7 +97,9 @@ module.exports = class deviceLightDimmer {
             if (params.brightness !== this.cacheBrightness) {
               this.service.updateCharacteristic(this.Characteristic.Brightness, params.brightness)
               this.cacheBrightness = params.brightness
-              if (params.updateSource) this.log('[%s] current brightness [%s%].', this.accessory.displayName, params.brightness)
+              if (params.updateSource && !this.disableDeviceLogging) {
+                this.log('[%s] current brightness [%s%].', this.accessory.displayName, params.brightness)
+              }
             }
           }
           break
diff --git a/lib/device/lock-one.js b/lib/device/lock-one.js
index 587b8a93..3d796a69 100644
--- a/lib/device/lock-one.js
+++ b/lib/device/lock-one.js
@@ -5,6 +5,7 @@ module.exports = class deviceLockOne {
   constructor (platform, accessory) {
     this.platform = platform
     this.log = platform.log
+    this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
@@ -25,13 +26,17 @@ module.exports = class deviceLockOne {
       const params = { switch: 'on' }
       this.inUse = true
       await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.log('[%s] current status [unlocked].', this.accessory.displayName)
+      if (!this.disableDeviceLogging) {
+        this.log('[%s] current status [unlocked].', this.accessory.displayName)
+      }
       await this.helpers.sleep(Math.max(lockConfig.operationTime * 100, 1000))
       this.service
         .updateCharacteristic(this.Characteristic.LockTargetState, 1)
         .updateCharacteristic(this.Characteristic.LockCurrentState, 1)
       this.inUse = false
-      this.log('[%s] current status [locked].', this.accessory.displayName)
+      if (!this.disableDeviceLogging) {
+        this.log('[%s] current status [locked].', this.accessory.displayName)
+      }
     } catch (err) {
       this.inUse = false
       this.platform.deviceUpdateError(this.accessory, err, true)
@@ -46,13 +51,17 @@ module.exports = class deviceLockOne {
       this.service
         .updateCharacteristic(this.Characteristic.LockCurrentState, 0)
         .updateCharacteristic(this.Characteristic.LockTargetState, 0)
-      this.log('[%s] current status [unlocked].', this.accessory.displayName)
+      if (params.updateSource && !this.disableDeviceLogging) {
+        this.log('[%s] current status [unlocked].', this.accessory.displayName)
+      }
       await this.helpers.sleep(Math.max(lockConfig.operationTime * 100, 1000))
       this.service
         .updateCharacteristic(this.Characteristic.LockCurrentState, 1)
         .updateCharacteristic(this.Characteristic.LockTargetState, 1)
       this.inUse = false
-      this.log('[%s] current status [locked].', this.accessory.displayName)
+      if (params.updateSource && !this.disableDeviceLogging) {
+        this.log('[%s] current status [locked].', this.accessory.displayName)
+      }
     } catch (err) {
       this.inUse = false
       this.platform.deviceUpdateError(this.accessory, err, false)
diff --git a/lib/device/outlet.js b/lib/device/outlet.js
index 6953e005..e2a20d0f 100644
--- a/lib/device/outlet.js
+++ b/lib/device/outlet.js
@@ -6,6 +6,7 @@ module.exports = class deviceOutlet {
   constructor (platform, accessory) {
     this.platform = platform
     this.log = platform.log
+    this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
@@ -128,7 +129,9 @@ module.exports = class deviceOutlet {
       callback()
       await this.platform.sendDeviceUpdate(this.accessory, { switch: value ? 'on' : 'off' })
       this.cacheOnOff = value ? 'on' : 'off'
-      this.log('[%s] current state [%s].', this.accessory.displayName, value ? 'on' : 'off')
+      if (!this.disableDeviceLogging) {
+        this.log('[%s] current state [%s].', this.accessory.displayName, value ? 'on' : 'off')
+      }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
     }
@@ -139,7 +142,9 @@ module.exports = class deviceOutlet {
       if (params.switch && params.switch !== this.cacheOnOff) {
         this.service.updateCharacteristic(this.Characteristic.On, params.switch === 'on')
         this.cacheOnOff = params.switch
-        if (params.updateSource) this.log('[%s] current state [%s].', this.accessory.displayName, params.switch)
+        if (params.updateSource && !this.disableDeviceLogging) {
+          this.log('[%s] current state [%s].', this.accessory.displayName, params.switch)
+        }
         if (!this.accessory.context.powerReadings) {
           this.service.updateCharacteristic(this.Characteristic.OutletInUse, params.switch === 'on')
         }
@@ -163,7 +168,7 @@ module.exports = class deviceOutlet {
         this.service.updateCharacteristic(this.eveElectricCurrent, parseFloat(params.current))
         logger = true
       }
-      if (params.updateSource && logger) {
+      if (params.updateSource && logger && !this.disableDeviceLogging) {
         this.log(
           '[%s] current%s%s%s.',
           this.accessory.displayName,
diff --git a/lib/device/rf-bridge.js b/lib/device/rf-bridge.js
index 85b8c080..e3e7fdcc 100644
--- a/lib/device/rf-bridge.js
+++ b/lib/device/rf-bridge.js
@@ -6,6 +6,7 @@ module.exports = class deviceRFBridge {
   constructor (platform, accessory) {
     this.platform = platform
     this.log = platform.log
+    this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
@@ -118,7 +119,9 @@ module.exports = class deviceRFBridge {
         })
         if (oAccessory) {
           oAccessory.getService(oAccessory.context.buttons[params.rfChl]).updateCharacteristic(this.Characteristic.On, 1)
-          if (params.updateSource) this.log('[%s] current state [button triggered]', oAccessory.displayName)
+          if (params.updateSource && !this.disableDeviceLogging) {
+            this.log('[%s] current state [button triggered]', oAccessory.displayName)
+          }
           this.helpers.sleep(3000)
           oAccessory.getService(oAccessory.context.buttons[params.rfChl]).updateCharacteristic(this.Characteristic.On, 0)
         } else {
@@ -202,10 +205,15 @@ module.exports = class deviceRFBridge {
                 }
                 oAccessory.getService(serv).updateCharacteristic(char, 1)
                 oAccessory.eveService.addEntry({ status: 1 })
-                if (params.updateSource) this.log('[%s] current state [sensor triggered]', oAccessory.displayName)
+                if (params.updateSource && !this.disableDeviceLogging) {
+                  this.log('[%s] current state [triggered]', oAccessory.displayName)
+                }
                 await this.helpers.sleep(sensorTimeLength * 1000)
                 oAccessory.getService(serv).updateCharacteristic(char, 0)
                 oAccessory.eveService.addEntry({ status: 0 })
+                if (params.updateSource && !this.disableDeviceLogging) {
+                  this.log('[%s] current state [not triggered]', oAccessory.displayName)
+                }
               }
             }
           })
diff --git a/lib/device/scm.js b/lib/device/scm.js
index 952ea800..62cbb9bb 100644
--- a/lib/device/scm.js
+++ b/lib/device/scm.js
@@ -5,6 +5,7 @@ module.exports = class deviceSCM {
   constructor (platform, accessory) {
     this.platform = platform
     this.log = platform.log
+    this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
@@ -25,7 +26,9 @@ module.exports = class deviceSCM {
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.cacheOnOff = value ? 'on' : 'off'
       this.accessory.eveService.addEntry({ status: value ? 1 : 0 })
-      this.log('[%s] current state [%s].', this.accessory.displayName, value ? 'on' : 'off')
+      if (!this.disableDeviceLogging) {
+        this.log('[%s] current state [%s].', this.accessory.displayName, value ? 'on' : 'off')
+      }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
     }
@@ -38,7 +41,9 @@ module.exports = class deviceSCM {
       this.service.updateCharacteristic(this.Characteristic.On, newStatus)
       this.cacheOnOff = params.switches[0].switch
       this.accessory.eveService.addEntry({ status: newStatus ? 1 : 0 })
-      if (params.updateSource) this.log('[%s] current state [%s].', this.accessory.displayName, params.switches[0].switch)
+      if (params.updateSource && !this.disableDeviceLogging) {
+        this.log('[%s] current state [%s].', this.accessory.displayName, params.switches[0].switch)
+      }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
diff --git a/lib/device/sensor.js b/lib/device/sensor.js
index 01080325..a98518cf 100644
--- a/lib/device/sensor.js
+++ b/lib/device/sensor.js
@@ -6,6 +6,7 @@ module.exports = class deviceSensor {
   constructor (platform, accessory) {
     this.platform = platform
     this.log = platform.log
+    this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
@@ -42,7 +43,9 @@ module.exports = class deviceSensor {
           this.batteryService
             .updateCharacteristic(this.Characteristic.BatteryLevel, this.cacheBattery)
             .updateCharacteristic(this.Characteristic.StatusLowBattery, this.cacheBattery < this.lowBattThreshold)
-          if (params.updateSource) this.log('[%s] current battery [%s%].', this.accessory.displayName, this.cacheBattery)
+          if (params.updateSource && !this.disableDeviceLogging) {
+            this.log('[%s] current battery [%s%].', this.accessory.displayName, this.cacheBattery)
+          }
         }
       }
       if (!params.switch || params.switch === this.cacheOnOff) return
@@ -56,7 +59,7 @@ module.exports = class deviceSensor {
           Math.round(new Date().valueOf() / 1000) - this.accessory.eveService.getInitialTime()
         )
       }
-      if (params.updateSource) {
+      if (params.updateSource && !this.disableDeviceLogging) {
         this.log('[%s] current state [contact%s detected].', this.accessory.displayName, newState === 0 ? '' : ' not')
       }
       let oAccessory
@@ -69,14 +72,18 @@ module.exports = class deviceSensor {
                 gdService
                   .updateCharacteristic(this.Characteristic.TargetDoorState, 1)
                   .updateCharacteristic(this.Characteristic.CurrentDoorState, 1)
-                if (params.updateSource) this.log('[%s] current state [closed].', oAccessory.displayName)
+                if (params.updateSource && !this.disableDeviceLogging) {
+                  this.log('[%s] current state [closed].', oAccessory.displayName)
+                }
                 break
               case 1:
                 await this.helpers.sleep(Math.max(group.operationTime * 100, 1000))
                 gdService
                   .updateCharacteristic(this.Characteristic.TargetDoorState, 0)
                   .updateCharacteristic(this.Characteristic.CurrentDoorState, 0)
-                if (params.updateSource) this.log('[%s] current state [open].', oAccessory.displayName)
+                if (params.updateSource && !this.disableDeviceLogging) {
+                  this.log('[%s] current state [open].', oAccessory.displayName)
+                }
                 break
             }
           }
diff --git a/lib/device/switch-multi.js b/lib/device/switch-multi.js
index 3471bd53..c80132c5 100644
--- a/lib/device/switch-multi.js
+++ b/lib/device/switch-multi.js
@@ -5,6 +5,7 @@ module.exports = class deviceSwitchMulti {
   constructor (platform, accessory) {
     this.platform = platform
     this.log = platform.log
+    this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
@@ -36,7 +37,9 @@ module.exports = class deviceSwitchMulti {
               oAccessory.getService(this.Service.Switch).updateCharacteristic(this.Characteristic.On, value)
               oAccessory.context.cacheOnOff = value ? 'on' : 'off'
               oAccessory.eveService.addEntry({ status: value ? 1 : 0 })
-              if (i > 0) this.log('[%s] current state [%s].', oAccessory.displayName, value ? 'on' : 'off')
+              if (i > 0 && !this.disableDeviceLogging) {
+                this.log('[%s] current state [%s].', oAccessory.displayName, value ? 'on' : 'off')
+              }
             }
           }
           break
@@ -54,7 +57,9 @@ module.exports = class deviceSwitchMulti {
                 params.switches[i - 1].switch = value ? 'on' : 'off'
                 oAccessory.context.cacheOnOff = value ? 'on' : 'off'
                 oAccessory.eveService.addEntry({ status: value ? 1 : 0 })
-                if (i > 0) this.log('[%s] current state [%s].', oAccessory.displayName, value ? 'on' : 'off')
+                if (i > 0 && !this.disableDeviceLogging) {
+                  this.log('[%s] current state [%s].', oAccessory.displayName, value ? 'on' : 'off')
+                }
               } else {
                 params.switches[i - 1].switch = oAccessory.context.cacheOnOff
               }
@@ -90,7 +95,9 @@ module.exports = class deviceSwitchMulti {
             .updateCharacteristic(this.Characteristic.On, params.switches[i - 1].switch === 'on')
           oAccessory.context.cacheOnOff = params.switches[i - 1].switch
           oAccessory.eveService.addEntry({ status: params.switches[i - 1].switch === 'on' ? 1 : 0 })
-          if (params.updateSource) this.log('[%s] current state [%s].', oAccessory.displayName, params.switches[i - 1].switch)
+          if (params.updateSource && !this.disableDeviceLogging) {
+            this.log('[%s] current state [%s].', oAccessory.displayName, params.switches[i - 1].switch)
+          }
         }
       }
       if (!this.platform.hiddenMasters.includes(this.accessory.context.eweDeviceId)) {
diff --git a/lib/device/switch-single.js b/lib/device/switch-single.js
index d3ba9f4e..74c12ddc 100644
--- a/lib/device/switch-single.js
+++ b/lib/device/switch-single.js
@@ -5,6 +5,7 @@ module.exports = class deviceSwitchSingle {
   constructor (platform, accessory) {
     this.platform = platform
     this.log = platform.log
+    this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
@@ -29,7 +30,9 @@ module.exports = class deviceSwitchSingle {
       })
       this.cacheOnOff = value ? 'on' : 'off'
       this.accessory.eveService.addEntry({ status: value ? 1 : 0 })
-      this.log('[%s] current state [%s].', this.accessory.displayName, this.cacheOnOff)
+      if (!this.disableDeviceLogging) {
+        this.log('[%s] current state [%s].', this.accessory.displayName, this.cacheOnOff)
+      }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
     }
@@ -42,7 +45,9 @@ module.exports = class deviceSwitchSingle {
       this.service.updateCharacteristic(this.Characteristic.On, newStatus)
       this.cacheOnOff = params.switch
       this.accessory.eveService.addEntry({ status: newStatus ? 1 : 0 })
-      if (params.updateSource) this.log('[%s] current state [%s].', this.accessory.displayName, this.cacheOnOff)
+      if (params.updateSource && !this.disableDeviceLogging) {
+        this.log('[%s] current state [%s].', this.accessory.displayName, this.cacheOnOff)
+      }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
diff --git a/lib/device/switch-valve.js b/lib/device/switch-valve.js
index a145d271..5faea04c 100644
--- a/lib/device/switch-valve.js
+++ b/lib/device/switch-valve.js
@@ -5,6 +5,7 @@ module.exports = class deviceSwitchValve {
   constructor (platform, accessory) {
     this.platform = platform
     this.log = platform.log
+    this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
@@ -48,7 +49,9 @@ module.exports = class deviceSwitchValve {
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.cacheOnOff = value ? 'on' : 'off'
       this.accessory.eveService.addEntry({ status: value ? 1 : 0 })
-      this.log('[%s] current state [%s].', this.accessory.displayName, this.cacheOnOff)
+      if (!this.disableDeviceLogging) {
+        this.log('[%s] current state [%s].', this.accessory.displayName, this.cacheOnOff)
+      }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
     }
@@ -65,12 +68,16 @@ module.exports = class deviceSwitchValve {
         case 0:
           this.valveService.updateCharacteristic(this.Characteristic.RemainingDuration, 0)
           clearTimeout(this.timer)
-          this.log('[%s] current state [stopped].', this.accessory.displayName)
+          if (!this.disableDeviceLogging) {
+            this.log('[%s] current state [stopped].', this.accessory.displayName)
+          }
           break
         case 1: {
           const timer = this.valveService.getCharacteristic(this.Characteristic.SetDuration).value
           this.valveService.updateCharacteristic(this.Characteristic.RemainingDuration, timer)
-          this.log('[%s] current state [watering].', this.accessory.displayName)
+          if (!this.disableDeviceLogging) {
+            this.log('[%s] current state [watering].', this.accessory.displayName)
+          }
           this.timer = setTimeout(() => {
             this.valveService.setCharacteristic(this.Characteristic.Active, 0)
           }, timer * 1000)
@@ -91,7 +98,9 @@ module.exports = class deviceSwitchValve {
         this.cacheOnOff = params.switches[0].switch
         this.switchService.updateCharacteristic(this.Characteristic.On, newStatus)
         this.accessory.eveService.addEntry({ status: newStatus ? 1 : 0 })
-        if (params.updateSource) this.log('[%s] current state [%s].', this.accessory.displayName, this.cacheOnOff)
+        if (params.updateSource && !this.disableDeviceLogging) {
+          this.log('[%s] current state [%s].', this.accessory.displayName, this.cacheOnOff)
+        }
       }
       if (params.switches[1].switch === 'on') {
         if (this.valveService.getCharacteristic(this.Characteristic.Active).value === 0) {
@@ -100,7 +109,9 @@ module.exports = class deviceSwitchValve {
             .updateCharacteristic(this.Characteristic.Active, 1)
             .updateCharacteristic(this.Characteristic.InUse, 1)
             .updateCharacteristic(this.Characteristic.RemainingDuration, timer)
-          if (params.updateSource) this.log('[%s] current state [watering].', this.accessory.displayName)
+          if (params.updateSource && !this.disableDeviceLogging) {
+            this.log('[%s] current state [watering].', this.accessory.displayName)
+          }
           this.timer = setTimeout(() => {
             this.valveService.setCharacteristic(this.Characteristic.Active, 0)
           }, timer * 1000)
diff --git a/lib/device/tap-one.js b/lib/device/tap-one.js
index 3eeb260c..673abc37 100644
--- a/lib/device/tap-one.js
+++ b/lib/device/tap-one.js
@@ -5,6 +5,7 @@ module.exports = class deviceTapOne {
   constructor (platform, accessory) {
     this.platform = platform
     this.log = platform.log
+    this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
@@ -29,7 +30,9 @@ module.exports = class deviceTapOne {
       })
       this.cacheOnOff = value ? 'on' : 'off'
       this.service.updateCharacteristic(this.Characteristic.InUse, value)
-      this.log('[%s] current state [%s].', this.accessory.displayName, this.cacheOnOff)
+      if (!this.disableDeviceLogging) {
+        this.log('[%s] current state [%s].', this.accessory.displayName, this.cacheOnOff)
+      }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
     }
@@ -42,7 +45,9 @@ module.exports = class deviceTapOne {
       this.service.updateCharacteristic(this.Characteristic.Active, newStatus ? 1 : 0)
       this.service.updateCharacteristic(this.Characteristic.InUse, newStatus ? 1 : 0)
       this.cacheOnOff = params.switch
-      if (params.updateSource) this.log('[%s] current state [%s].', this.accessory.displayName, this.cacheOnOff)
+      if (params.updateSource && !this.disableDeviceLogging) {
+        this.log('[%s] current state [%s].', this.accessory.displayName, this.cacheOnOff)
+      }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
diff --git a/lib/device/template.js b/lib/device/template.js
index 9a689a65..1d9ccc91 100644
--- a/lib/device/template.js
+++ b/lib/device/template.js
@@ -5,6 +5,7 @@ module.exports = class deviceTemplate {
   constructor (platform, accessory) {
     this.platform = platform
     this.log = platform.log
+    this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
diff --git a/lib/device/th-outlet.js b/lib/device/th-outlet.js
index 066d2cc4..d6631bed 100644
--- a/lib/device/th-outlet.js
+++ b/lib/device/th-outlet.js
@@ -5,6 +5,7 @@ module.exports = class deviceTHOutlet {
   constructor (platform, accessory) {
     this.platform = platform
     this.log = platform.log
+    this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
@@ -44,7 +45,9 @@ module.exports = class deviceTHOutlet {
       }
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.cacheOnOff = value ? 'on' : 'off'
-      this.log('[%s] current state [%s].', this.accessory.displayName, this.cacheOnOff)
+      if (!this.disableDeviceLogging) {
+        this.log('[%s] current state [%s].', this.accessory.displayName, this.cacheOnOff)
+      }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
     }
@@ -58,7 +61,9 @@ module.exports = class deviceTHOutlet {
           this.cacheOnOff = newState
           this.switchService.updateCharacteristic(this.Characteristic.On, this.cacheOnOff === 'on')
           this.accessory.eveService.addEntry({ status: this.cacheOnOff === 'on' ? 1 : 0 })
-          if (params.updateSource) this.log('[%s] current state [%s].', this.accessory.displayName, this.cacheOnOff)
+          if (params.updateSource && !this.disableDeviceLogging) {
+            this.log('[%s] current state [%s].', this.accessory.displayName, this.cacheOnOff)
+          }
         }
       }
       const eveLog = {}
@@ -68,7 +73,9 @@ module.exports = class deviceTHOutlet {
         if (this.cacheTemp !== currentTemp) {
           this.cacheTemp = currentTemp
           this.tempService.updateCharacteristic(this.Characteristic.CurrentTemperature, this.cacheTemp)
-          if (params.updateSource) this.log('[%s] current temperature [%s].', this.accessory.displayName, this.cacheTemp)
+          if (params.updateSource && !this.disableDeviceLogging) {
+            this.log('[%s] current temperature [%s].', this.accessory.displayName, this.cacheTemp)
+          }
         }
       }
       if (this.helpers.hasProperty(params, 'currentHumidity') && params.currentHumidity !== 'unavailable' && this.humiService) {
@@ -77,7 +84,9 @@ module.exports = class deviceTHOutlet {
         if (this.cacheHumi !== currentHumi) {
           this.cacheHumi = currentHumi
           this.humiService.updateCharacteristic(this.Characteristic.CurrentRelativeHumidity, this.cacheHumi)
-          if (params.updateSource) this.log('[%s] current humidity [%s%].', this.accessory.displayName, this.cacheHumi)
+          if (params.updateSource && !this.disableDeviceLogging) {
+            this.log('[%s] current humidity [%s%].', this.accessory.displayName, this.cacheHumi)
+          }
         }
       }
       if (this.helpers.hasProperty(eveLog, 'temp') || this.helpers.hasProperty(eveLog, 'humidity')) {
diff --git a/lib/device/th-thermo.js b/lib/device/th-thermo.js
index 0f813b8e..9e5d29cd 100644
--- a/lib/device/th-thermo.js
+++ b/lib/device/th-thermo.js
@@ -5,6 +5,7 @@ module.exports = class deviceTHThermo {
   constructor (platform, accessory) {
     this.platform = platform
     this.log = platform.log
+    this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
@@ -48,7 +49,9 @@ module.exports = class deviceTHThermo {
       }
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.cacheOnOff = value !== 0 ? 'on' : 'off'
-      this.log('[%s] current state [%s].', this.accessory.displayName, this.cacheOnOff)
+      if (!this.disableDeviceLogging) {
+        this.log('[%s] current state [%s].', this.accessory.displayName, this.cacheOnOff)
+      }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
     }
@@ -75,7 +78,9 @@ module.exports = class deviceTHThermo {
           this.cacheOnOff = newState
           this.switchService.updateCharacteristic(this.Characteristic.On, this.cacheOnOff === 'on')
           this.accessory.eveService.addEntry({ status: this.cacheOnOff === 'on' ? 1 : 0 })
-          if (params.updateSource) this.log('[%s] current state [%s].', this.accessory.displayName, this.cacheOnOff)
+          if (params.updateSource && !this.disableDeviceLogging) {
+            this.log('[%s] current state [%s].', this.accessory.displayName, this.cacheOnOff)
+          }
         }
       }
       const eveLog = {}
@@ -86,7 +91,9 @@ module.exports = class deviceTHThermo {
           this.cacheTemp = currentTemp
           this.service.updateCharacteristic(this.Characteristic.CurrentTemperature, this.cacheTemp)
           this.service.updateCharacteristic(this.Characteristic.TargetTemperature, this.cacheTemp)
-          if (params.updateSource) this.log('[%s] current temperature [%s].', this.accessory.displayName, this.cacheTemp)
+          if (params.updateSource && !this.disableDeviceLogging) {
+            this.log('[%s] current temperature [%s].', this.accessory.displayName, this.cacheTemp)
+          }
         }
       }
       if (
@@ -99,7 +106,9 @@ module.exports = class deviceTHThermo {
         if (this.cacheHumi !== currentHumi) {
           this.cacheHumi = currentHumi
           this.service.updateCharacteristic(this.Characteristic.CurrentRelativeHumidity, this.cacheHumi)
-          if (params.updateSource) this.log('[%s] current humidity [%s%].', this.accessory.displayName, this.cacheHumi)
+          if (params.updateSource && !this.disableDeviceLogging) {
+            this.log('[%s] current humidity [%s%].', this.accessory.displayName, this.cacheHumi)
+          }
         }
       }
       if (this.helpers.hasProperty(eveLog, 'temp') || this.helpers.hasProperty(eveLog, 'humidity')) {
diff --git a/lib/device/usb.js b/lib/device/usb.js
index 70d40884..647dd411 100644
--- a/lib/device/usb.js
+++ b/lib/device/usb.js
@@ -5,6 +5,7 @@ module.exports = class deviceUSB {
   constructor (platform, accessory) {
     this.platform = platform
     this.log = platform.log
+    this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
@@ -35,7 +36,9 @@ module.exports = class deviceUSB {
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.cacheOnOff = value ? 'on' : 'off'
       this.accessory.eveService.addEntry({ status: value ? 1 : 0 })
-      this.log('[%s] current state [%s].', this.accessory.displayName, value ? 'on' : 'off')
+      if (!this.disableDeviceLogging) {
+        this.log('[%s] current state [%s].', this.accessory.displayName, value ? 'on' : 'off')
+      }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
     }
@@ -48,7 +51,9 @@ module.exports = class deviceUSB {
       this.service.updateCharacteristic(this.Characteristic.On, newStatus)
       this.cacheOnOff = params.switches[0].switch
       this.accessory.eveService.addEntry({ status: newStatus ? 1 : 0 })
-      if (params.updateSource) this.log('[%s] current state [%s].', this.accessory.displayName, params.switches[0].switch)
+      if (params.updateSource && !this.disableDeviceLogging) {
+        this.log('[%s] current state [%s].', this.accessory.displayName, params.switches[0].switch)
+      }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
diff --git a/lib/device/valve-four.js b/lib/device/valve-four.js
index eac1d713..3c3f14e2 100644
--- a/lib/device/valve-four.js
+++ b/lib/device/valve-four.js
@@ -5,6 +5,7 @@ module.exports = class deviceValveFour {
   constructor (platform, accessory) {
     this.platform = platform
     this.log = platform.log
+    this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
@@ -97,12 +98,16 @@ module.exports = class deviceValveFour {
         case 0:
           valveService.updateCharacteristic(this.Characteristic.RemainingDuration, 0)
           clearTimeout(this.accessory.getService(valve).timer)
-          this.log('[%s] current state [%s stopped].', this.accessory.displayName, valve)
+          if (!this.disableDeviceLogging) {
+            this.log('[%s] current state [%s stopped].', this.accessory.displayName, valve)
+          }
           break
         case 1: {
           const timer = valveService.getCharacteristic(this.Characteristic.SetDuration).value
           valveService.updateCharacteristic(this.Characteristic.RemainingDuration, timer)
-          this.log('[%s] current state [%s watering].', this.accessory.displayName, valve)
+          if (!this.disableDeviceLogging) {
+            this.log('[%s] current state [%s watering].', this.accessory.displayName, valve)
+          }
           valveService.timer = setTimeout(() => {
             valveService.setCharacteristic(this.Characteristic.Active, 0)
           }, timer * 1000)
@@ -127,7 +132,9 @@ module.exports = class deviceValveFour {
               .updateCharacteristic(this.Characteristic.Active, 1)
               .updateCharacteristic(this.Characteristic.InUse, 1)
               .updateCharacteristic(this.Characteristic.RemainingDuration, timer)
-            if (params.updateSource) this.log('[%s] current state [Valve %s watering].', this.accessory.displayName, v)
+            if (params.updateSource && !this.disableDeviceLogging) {
+              this.log('[%s] current state [Valve %s watering].', this.accessory.displayName, v)
+            }
             valveService.timer = setTimeout(() => {
               valveService.setCharacteristic(this.Characteristic.Active, 0)
             }, timer * 1000)
diff --git a/lib/device/valve-one.js b/lib/device/valve-one.js
index 2b74822d..0b84a809 100644
--- a/lib/device/valve-one.js
+++ b/lib/device/valve-one.js
@@ -5,6 +5,7 @@ module.exports = class deviceValveOne {
   constructor (platform, accessory) {
     this.platform = platform
     this.log = platform.log
+    this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
@@ -45,12 +46,16 @@ module.exports = class deviceValveOne {
         case 0:
           this.service.updateCharacteristic(this.Characteristic.RemainingDuration, 0)
           clearTimeout(this.timer)
-          this.log('[%s] current state [stopped].', this.accessory.displayName)
+          if (!this.disableDeviceLogging) {
+            this.log('[%s] current state [stopped].', this.accessory.displayName)
+          }
           break
         case 1: {
           const timer = this.service.getCharacteristic(this.Characteristic.SetDuration).value
           this.service.updateCharacteristic(this.Characteristic.RemainingDuration, timer)
-          this.log('[%s] current state [watering].', this.accessory.displayName)
+          if (!this.disableDeviceLogging) {
+            this.log('[%s] current state [watering].', this.accessory.displayName)
+          }
           this.timer = setTimeout(() => {
             this.service.setCharacteristic(this.Characteristic.Active, 0)
           }, timer * 1000)
@@ -73,7 +78,9 @@ module.exports = class deviceValveOne {
             .updateCharacteristic(this.Characteristic.Active, 1)
             .updateCharacteristic(this.Characteristic.InUse, 1)
             .updateCharacteristic(this.Characteristic.RemainingDuration, timer)
-          if (params.updateSource) this.log('[%s] current state [watering].', this.accessory.displayName)
+          if (params.updateSource && !this.disableDeviceLogging) {
+            this.log('[%s] current state [watering].', this.accessory.displayName)
+          }
           this.timer = setTimeout(() => {
             this.service.setCharacteristic(this.Characteristic.Active, 0)
           }, timer * 1000)
diff --git a/lib/device/valve-two.js b/lib/device/valve-two.js
index 015585a5..7667ab6e 100644
--- a/lib/device/valve-two.js
+++ b/lib/device/valve-two.js
@@ -5,6 +5,7 @@ module.exports = class deviceValveTwo {
   constructor (platform, accessory) {
     this.platform = platform
     this.log = platform.log
+    this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
@@ -61,12 +62,16 @@ module.exports = class deviceValveTwo {
         case 0:
           valveService.updateCharacteristic(this.Characteristic.RemainingDuration, 0)
           clearTimeout(this.accessory.getService(valve).timer)
-          this.log('[%s] current state [%s stopped].', this.accessory.displayName, valve)
+          if (!this.disableDeviceLogging) {
+            this.log('[%s] current state [%s stopped].', this.accessory.displayName, valve)
+          }
           break
         case 1: {
           const timer = valveService.getCharacteristic(this.Characteristic.SetDuration).value
           valveService.updateCharacteristic(this.Characteristic.RemainingDuration, timer)
-          this.log('[%s] current state [%s watering].', this.accessory.displayName, valve)
+          if (!this.disableDeviceLogging) {
+            this.log('[%s] current state [%s watering].', this.accessory.displayName, valve)
+          }
           valveService.timer = setTimeout(() => {
             valveService.setCharacteristic(this.Characteristic.Active, 0)
           }, timer * 1000)
@@ -91,7 +96,9 @@ module.exports = class deviceValveTwo {
               .updateCharacteristic(this.Characteristic.Active, 1)
               .updateCharacteristic(this.Characteristic.InUse, 1)
               .updateCharacteristic(this.Characteristic.RemainingDuration, timer)
-            if (params.updateSource) this.log('[%s] current state [Valve %s watering].', this.accessory.displayName, v)
+            if (params.updateSource && !this.disableDeviceLogging) {
+              this.log('[%s] current state [Valve %s watering].', this.accessory.displayName, v)
+            }
             valveService.timer = setTimeout(() => {
               valveService.setCharacteristic(this.Characteristic.Active, 0)
             }, timer * 1000)
diff --git a/lib/device/zb-dev.js b/lib/device/zb-dev.js
index 421ba14d..b70cbe44 100644
--- a/lib/device/zb-dev.js
+++ b/lib/device/zb-dev.js
@@ -6,6 +6,7 @@ module.exports = class deviceZBDev {
   constructor (platform, accessory) {
     this.platform = platform
     this.log = platform.log
+    this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
@@ -93,7 +94,9 @@ module.exports = class deviceZBDev {
       })
       this.cacheOnOff = value ? 'on' : 'off'
       this.accessory.eveService.addEntry({ status: value ? 1 : 0 })
-      this.log('[%s] current state [%s].', this.accessory.displayName, value ? 'on' : 'off')
+      if (!this.disableDeviceLogging) {
+        this.log('[%s] current state [%s].', this.accessory.displayName, value ? 'on' : 'off')
+      }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
     }
@@ -109,7 +112,7 @@ module.exports = class deviceZBDev {
           batt.updateCharacteristic(this.Characteristic.BatteryLevel, params.battery)
           batt.updateCharacteristic(this.Characteristic.StatusLowBattery, params.battery < this.lowBattThreshold)
           this.cacheBattery = params.battery
-          if (params.updateSource) {
+          if (params.updateSource && !this.disableDeviceLogging) {
             this.log('[%s] current battery [%s%].', this.accessory.displayName, params.battery)
           }
         }
@@ -120,7 +123,7 @@ module.exports = class deviceZBDev {
             this.accessory
               .getService(this.Service.StatelessProgrammableSwitch)
               .updateCharacteristic(this.Characteristic.ProgrammableSwitchEvent, params.key)
-            if (params.updateSource) {
+            if (params.updateSource && !this.disableDeviceLogging) {
               this.log(
                 '[%s] current state [%s].',
                 this.accessory.displayName,
@@ -141,7 +144,7 @@ module.exports = class deviceZBDev {
               .updateCharacteristic(this.Characteristic.On, params.switch === 'on')
             this.cacheOnOff = params.switch
             this.accessory.eveService.addEntry({ status: params.switch === 'on' ? 1 : 0 })
-            if (params.updateSource) {
+            if (params.updateSource && !this.disableDeviceLogging) {
               this.log('[%s] current state [%s].', this.accessory.displayName, params.switch)
             }
           }
@@ -154,7 +157,7 @@ module.exports = class deviceZBDev {
             this.accessory
               .getService(this.Service.TemperatureSensor)
               .updateCharacteristic(this.Characteristic.CurrentTemperature, currentTemp)
-            if (params.updateSource) {
+            if (params.updateSource && !this.disableDeviceLogging) {
               this.log('[%s] current temperature [%s].', this.accessory.displayName, currentTemp)
             }
             eveLog.temp = currentTemp
@@ -166,7 +169,7 @@ module.exports = class deviceZBDev {
               .getService(this.Service.HumiditySensor)
               .updateCharacteristic(this.Characteristic.CurrentRelativeHumidity, currentHumi)
             eveLog.humidity = currentHumi
-            if (params.updateSource) {
+            if (params.updateSource && !this.disableDeviceLogging) {
               this.log('[%s] current humidity [%s].', this.accessory.displayName, currentHumi)
             }
           }
@@ -182,7 +185,7 @@ module.exports = class deviceZBDev {
               params.motion === 1 &&
               diff < this.sensorTimeDifference
             this.accessory.eveService.addEntry({ status: motionDetected ? 1 : 0 })
-            if (params.updateSource) {
+            if (params.updateSource && !this.disableDeviceLogging) {
               this.log('[%s] current state [motion%s detected].', this.accessory.displayName, motionDetected ? '' : ' not')
             }
             if (motionDetected) {
@@ -200,7 +203,7 @@ module.exports = class deviceZBDev {
             this.accessory
               .getService(this.Service.ContactSensor)
               .updateCharacteristic(this.Characteristic.ContactSensorState, params.lock)
-            if (params.updateSource) {
+            if (params.updateSource && !this.disableDeviceLogging) {
               this.log('[%s] current state [contact%s detected].', this.accessory.displayName, params.lock === 0 ? '' : ' not')
             }
             this.accessory.eveService.addEntry({ status: params.lock })

From 01383c135f7ddb70f8a60c7fe9ece31e487d27e4 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 11 Jan 2021 08:31:33 +0000
Subject: [PATCH 1134/3183] 4.2.3-2

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index be4ff863..de3fcb8c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.2.3-1",
+  "version": "4.2.3-2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index bbd2fde9..05ed28e6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.2.3-1",
+  "version": "4.2.3-2",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 9d79afdbfe32d773970fe44c78afe17c73d76230 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 11 Jan 2021 09:16:06 +0000
Subject: [PATCH 1135/3183] ordering

---
 config.schema.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config.schema.json b/config.schema.json
index 37c6bd4d..609561a5 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -405,8 +405,8 @@
       "expandable": true,
       "items": [
         "mode",
-        "debug",
         "disableDeviceLogging",
+        "debug",
         "disablePlugin"
       ]
     },

From 1c537f7b9657b20fd138f3c43f180ab4073f29cb Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 11 Jan 2021 10:33:18 +0000
Subject: [PATCH 1136/3183] od testing

---
 lib/device/garage-eachen.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/lib/device/garage-eachen.js b/lib/device/garage-eachen.js
index 915a6269..6d5f1590 100644
--- a/lib/device/garage-eachen.js
+++ b/lib/device/garage-eachen.js
@@ -31,9 +31,7 @@ module.exports = class deviceGarageEachen {
       callback()
       // testing
       if (this.obstruct) {
-        await this.helpers.sleep(4000)
         this.service.updateCharacteristic(this.Characteristic.ObstructionDetected, true)
-        return
       }
       // end testing
       const garageConfig = this.platform.cusG.get(this.accessory.context.eweDeviceId)

From 6ccd9b0bcaeda7c95c9b21a2cb1aa1db239b9c8a Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 11 Jan 2021 10:34:08 +0000
Subject: [PATCH 1137/3183] 4.2.3-3

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index de3fcb8c..d4ce0144 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.2.3-2",
+  "version": "4.2.3-3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 05ed28e6..35c7ba14 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.2.3-2",
+  "version": "4.2.3-3",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 4aa4eae847d114eabcc2f3024f4d71dc7d686c56 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 11 Jan 2021 13:54:36 +0000
Subject: [PATCH 1138/3183] two taps AS

---
 config.schema.json    | 12 +++++--
 lib/device/tap-two.js | 73 +++++++++++++++++++++++++++++++++++++++++++
 lib/index.js          |  9 ++++++
 lib/utils/helpers.js  |  4 +--
 4 files changed, 93 insertions(+), 5 deletions(-)
 create mode 100644 lib/device/tap-two.js

diff --git a/config.schema.json b/config.schema.json
index 609561a5..6a84087a 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -208,17 +208,23 @@
                   ]
                 },
                 {
-                  "title": "1 Lock (using single channel device)",
+                  "title": "1 Lock (using single-channel device)",
                   "enum": [
                     "lock"
                   ]
                 },
                 {
-                  "title": "1 Tap/Faucet (using single channel device)",
+                  "title": "1 Tap/Faucet (using single-channel device)",
                   "enum": [
                     "tap"
                   ]
                 },
+                {
+                  "title": "2 Taps/Faucets (using multi-channel device)",
+                  "enum": [
+                    "tap_two"
+                  ]
+                },
                 {
                   "title": "1 Irrigation Valve (using single-channel device)",
                   "enum": [
@@ -272,7 +278,7 @@
               "title": "Operation Time (Deciseconds)",
               "description": "Blinds/garage doors: the time to open/close the device. Locks: the time to show as unlocked. This setting is in deciseconds - count the time in seconds and multiply by 10, for example 75 for 7.5 seconds. Must be between 20 and 600.",
               "condition": {
-                "functionBody": "return (model.groups[arrayIndices] && !['tap_one', 'valve', 'valve_two', 'valve_four', 'switch_valve'].includes(model.groups[arrayIndices].type))"
+                "functionBody": "return (model.groups[arrayIndices] && !['tap', 'tap_two', 'valve', 'valve_two', 'valve_four', 'switch_valve'].includes(model.groups[arrayIndices].type))"
               },
               "placeholder": 100,
               "minimum": 10,
diff --git a/lib/device/tap-two.js b/lib/device/tap-two.js
new file mode 100644
index 00000000..4eae07d9
--- /dev/null
+++ b/lib/device/tap-two.js
@@ -0,0 +1,73 @@
+/* jshint -W014, -W033, esversion: 9 */
+/* eslint-disable new-cap */
+'use strict'
+module.exports = class deviceTapTwo {
+  constructor (platform, accessory) {
+    this.platform = platform
+    this.log = platform.log
+    this.disableDeviceLogging = platform.config.disableDeviceLogging
+    this.helpers = platform.helpers
+    this.Service = platform.api.hap.Service
+    this.Characteristic = platform.api.hap.Characteristic
+    ;['A', 'B'].forEach(v => {
+      let tapService
+      if (!(tapService = accessory.getService(this.Service.Valve))) {
+        tapService = accessory.addService(this.Service.Valve)
+        tapService.setCharacteristic(this.Characteristic.Active, 0)
+          .setCharacteristic(this.Characteristic.InUse, 0)
+          .setCharacteristic(this.Characteristic.ValveType, 3)
+      }
+      tapService
+        .getCharacteristic(this.Characteristic.Active)
+        .on('set', (value, callback) => this.internalUpdate('Tap ' + v, value, callback))
+    })
+    this.accessory = accessory
+  }
+
+  async internalUpdate (tap, value, callback) {
+    try {
+      callback()
+      const params = { switches: this.helpers.defaultMultiSwitchOff }
+      const tapService = this.accessory.getService(tap)
+      switch (tap) {
+        case 'Tap A':
+          params.switches[0].switch = value ? 'on' : 'off'
+          params.switches[1].switch = this.accessory.getService('Tap B').getCharacteristic(this.Characteristic.Active).value === 1
+            ? 'on'
+            : 'off'
+          break
+        case 'Tap B':
+          params.switches[0].switch = this.accessory.getService('Tap A').getCharacteristic(this.Characteristic.Active).value === 1
+            ? 'on'
+            : 'off'
+          params.switches[1].switch = value ? 'on' : 'off'
+          break
+      }
+      tapService.updateCharacteristic(this.Characteristic.InUse, value)
+      if (!this.disableDeviceLogging) {
+        this.log('[%s] current state [%s %].', this.accessory.displayName, tap, value === 1 ? 'running' : 'stopped')
+      }
+      await this.platform.sendDeviceUpdate(this.accessory, params)
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, true)
+    }
+  }
+
+  async externalUpdate (params) {
+    try {
+      if (!params.switches) return
+      ;['A', 'B'].forEach((v, k) => {
+        const tapService = this.accessory.getService('Valve ' + v)
+        tapService
+          .updateCharacteristic(this.Characteristic.Active, params.switches[k].switch === 'on' ? 1 : 0)
+          .updateCharacteristic(this.Characteristic.InUse, params.switches[k].switch === 'on' ? 1 : 0)
+        const logText = params.switches[k].switch === 'on' ? 'running' : 'stopped'
+        if (params.updateSource && !this.disableDeviceLogging) {
+          this.log('[%s] current state [Tap %s running].', this.accessory.displayName, v, logText)
+        }
+      })
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, false)
+    }
+  }
+}
diff --git a/lib/index.js b/lib/index.js
index ddf45653..35343d05 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -245,6 +245,15 @@ class eWeLinkPlatform {
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/tap-one'))(this, accessory)
         /*******************************/
+      } else if (this.cusG.has(device.deviceid) && this.cusG.get(device.deviceid).type === 'tap_two') {
+        /********************************
+        TAPS [TWO] [ACCESSORY SIMULATION]
+        ********************************/
+        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
+          ? this.devicesInHB.get(device.deviceid + 'SWX')
+          : this.addAccessory(device, device.deviceid + 'SWX')
+        accessory.control = new (require('./device/tap-two'))(this, accessory)
+        /*******************************/
       } else if (this.cusG.has(device.deviceid) && this.cusG.get(device.deviceid).type === 'valve') {
         /**********************************
         VALVES [ONE] [ACCESSORY SIMULATION]
diff --git a/lib/utils/helpers.js b/lib/utils/helpers.js
index 1ebbc775..0fee9972 100644
--- a/lib/utils/helpers.js
+++ b/lib/utils/helpers.js
@@ -9,8 +9,8 @@ module.exports = {
   httpRetryCodes: ['ENOTFOUND', 'ETIMEDOUT', 'EAI_AGAIN'],
   allowedGroups: [
     'blind', 'garage', 'garage_two', 'garage_four',
-    'garage_eachen', 'lock', 'tap', 'switch_valve',
-    'valve', 'valve_two', 'valve_four'
+    'garage_eachen', 'lock', 'tap', 'tap_two',
+    'switch_valve', 'valve', 'valve_two', 'valve_four'
   ],
   defaults: {
     inUsePowerThreshold: 0,

From 6a55d5f2e3fcc777967926f60487ac321f5752c3 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 11 Jan 2021 13:54:42 +0000
Subject: [PATCH 1139/3183] log text

---
 lib/device/switch-valve.js | 4 ++--
 lib/device/valve-four.js   | 4 ++--
 lib/device/valve-one.js    | 4 ++--
 lib/device/valve-two.js    | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/device/switch-valve.js b/lib/device/switch-valve.js
index 5faea04c..a0f74b40 100644
--- a/lib/device/switch-valve.js
+++ b/lib/device/switch-valve.js
@@ -76,7 +76,7 @@ module.exports = class deviceSwitchValve {
           const timer = this.valveService.getCharacteristic(this.Characteristic.SetDuration).value
           this.valveService.updateCharacteristic(this.Characteristic.RemainingDuration, timer)
           if (!this.disableDeviceLogging) {
-            this.log('[%s] current state [watering].', this.accessory.displayName)
+            this.log('[%s] current state [running].', this.accessory.displayName)
           }
           this.timer = setTimeout(() => {
             this.valveService.setCharacteristic(this.Characteristic.Active, 0)
@@ -110,7 +110,7 @@ module.exports = class deviceSwitchValve {
             .updateCharacteristic(this.Characteristic.InUse, 1)
             .updateCharacteristic(this.Characteristic.RemainingDuration, timer)
           if (params.updateSource && !this.disableDeviceLogging) {
-            this.log('[%s] current state [watering].', this.accessory.displayName)
+            this.log('[%s] current state [running].', this.accessory.displayName)
           }
           this.timer = setTimeout(() => {
             this.valveService.setCharacteristic(this.Characteristic.Active, 0)
diff --git a/lib/device/valve-four.js b/lib/device/valve-four.js
index 3c3f14e2..d196958b 100644
--- a/lib/device/valve-four.js
+++ b/lib/device/valve-four.js
@@ -106,7 +106,7 @@ module.exports = class deviceValveFour {
           const timer = valveService.getCharacteristic(this.Characteristic.SetDuration).value
           valveService.updateCharacteristic(this.Characteristic.RemainingDuration, timer)
           if (!this.disableDeviceLogging) {
-            this.log('[%s] current state [%s watering].', this.accessory.displayName, valve)
+            this.log('[%s] current state [%s running].', this.accessory.displayName, valve)
           }
           valveService.timer = setTimeout(() => {
             valveService.setCharacteristic(this.Characteristic.Active, 0)
@@ -133,7 +133,7 @@ module.exports = class deviceValveFour {
               .updateCharacteristic(this.Characteristic.InUse, 1)
               .updateCharacteristic(this.Characteristic.RemainingDuration, timer)
             if (params.updateSource && !this.disableDeviceLogging) {
-              this.log('[%s] current state [Valve %s watering].', this.accessory.displayName, v)
+              this.log('[%s] current state [Valve %s running].', this.accessory.displayName, v)
             }
             valveService.timer = setTimeout(() => {
               valveService.setCharacteristic(this.Characteristic.Active, 0)
diff --git a/lib/device/valve-one.js b/lib/device/valve-one.js
index 0b84a809..0f016fc8 100644
--- a/lib/device/valve-one.js
+++ b/lib/device/valve-one.js
@@ -54,7 +54,7 @@ module.exports = class deviceValveOne {
           const timer = this.service.getCharacteristic(this.Characteristic.SetDuration).value
           this.service.updateCharacteristic(this.Characteristic.RemainingDuration, timer)
           if (!this.disableDeviceLogging) {
-            this.log('[%s] current state [watering].', this.accessory.displayName)
+            this.log('[%s] current state [running].', this.accessory.displayName)
           }
           this.timer = setTimeout(() => {
             this.service.setCharacteristic(this.Characteristic.Active, 0)
@@ -79,7 +79,7 @@ module.exports = class deviceValveOne {
             .updateCharacteristic(this.Characteristic.InUse, 1)
             .updateCharacteristic(this.Characteristic.RemainingDuration, timer)
           if (params.updateSource && !this.disableDeviceLogging) {
-            this.log('[%s] current state [watering].', this.accessory.displayName)
+            this.log('[%s] current state [running].', this.accessory.displayName)
           }
           this.timer = setTimeout(() => {
             this.service.setCharacteristic(this.Characteristic.Active, 0)
diff --git a/lib/device/valve-two.js b/lib/device/valve-two.js
index 7667ab6e..ba40df7a 100644
--- a/lib/device/valve-two.js
+++ b/lib/device/valve-two.js
@@ -70,7 +70,7 @@ module.exports = class deviceValveTwo {
           const timer = valveService.getCharacteristic(this.Characteristic.SetDuration).value
           valveService.updateCharacteristic(this.Characteristic.RemainingDuration, timer)
           if (!this.disableDeviceLogging) {
-            this.log('[%s] current state [%s watering].', this.accessory.displayName, valve)
+            this.log('[%s] current state [%s running].', this.accessory.displayName, valve)
           }
           valveService.timer = setTimeout(() => {
             valveService.setCharacteristic(this.Characteristic.Active, 0)
@@ -97,7 +97,7 @@ module.exports = class deviceValveTwo {
               .updateCharacteristic(this.Characteristic.InUse, 1)
               .updateCharacteristic(this.Characteristic.RemainingDuration, timer)
             if (params.updateSource && !this.disableDeviceLogging) {
-              this.log('[%s] current state [Valve %s watering].', this.accessory.displayName, v)
+              this.log('[%s] current state [Valve %s running].', this.accessory.displayName, v)
             }
             valveService.timer = setTimeout(() => {
               valveService.setCharacteristic(this.Characteristic.Active, 0)

From 46238e81b4641bda87d9233fa842bf890601cad5 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 11 Jan 2021 14:11:04 +0000
Subject: [PATCH 1140/3183] formatting

---
 lib/device/blind.js         |  9 +++-----
 lib/device/curtain.js       |  6 ++----
 lib/device/diffuser.js      | 21 +++++++------------
 lib/device/fan.js           |  9 +++-----
 lib/device/garage-eachen.js | 12 ++++-------
 lib/device/garage-four.js   |  9 +++-----
 lib/device/garage-one.js    | 12 ++++-------
 lib/device/garage-two.js    | 12 ++++-------
 lib/device/light-colour.js  | 37 +++++++++++++-------------------
 lib/device/light-ctemp.js   |  9 +++-----
 lib/device/light-dimmer.js  |  3 +--
 lib/device/lock-one.js      | 12 ++++-------
 lib/device/outlet.js        |  9 +++-----
 lib/device/rf-bridge.js     |  3 +--
 lib/device/scm.js           |  3 +--
 lib/device/sensor.js        |  9 +++-----
 lib/device/switch-multi.js  |  6 ++----
 lib/device/switch-single.js |  3 +--
 lib/device/switch-valve.js  | 18 ++++++----------
 lib/device/tap-one.js       |  8 +++----
 lib/device/tap-two.js       |  6 ++----
 lib/device/template.js      |  3 +--
 lib/device/th-outlet.js     |  6 ++----
 lib/device/th-thermo.js     |  6 ++----
 lib/device/usb.js           |  3 +--
 lib/device/valve-four.js    | 15 +++++--------
 lib/device/valve-one.js     | 15 +++++--------
 lib/device/valve-two.js     | 15 +++++--------
 lib/device/zb-dev.js        | 42 +++++++++++++++++--------------------
 29 files changed, 114 insertions(+), 207 deletions(-)

diff --git a/lib/device/blind.js b/lib/device/blind.js
index 7f0886a2..8fcdad39 100644
--- a/lib/device/blind.js
+++ b/lib/device/blind.js
@@ -11,13 +11,11 @@ module.exports = class deviceBlind {
     this.Characteristic = platform.api.hap.Characteristic
     if (!(this.service = accessory.getService(this.Service.WindowCovering))) {
       this.service = accessory.addService(this.Service.WindowCovering)
-      this.service
-        .setCharacteristic(this.Characteristic.CurrentPosition, 0)
+      this.service.setCharacteristic(this.Characteristic.CurrentPosition, 0)
         .setCharacteristic(this.Characteristic.TargetPosition, 0)
         .setCharacteristic(this.Characteristic.PositionState, 2)
     }
-    this.service
-      .getCharacteristic(this.Characteristic.TargetPosition)
+    this.service.getCharacteristic(this.Characteristic.TargetPosition)
       .on('set', this.internalUpdate.bind(this))
     this.accessory = accessory
   }
@@ -59,8 +57,7 @@ module.exports = class deviceBlind {
       params.switches[0].switch = 'off'
       params.switches[1].switch = 'off'
       await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.service
-        .updateCharacteristic(this.Characteristic.PositionState, 2)
+      this.service.updateCharacteristic(this.Characteristic.PositionState, 2)
         .updateCharacteristic(this.Characteristic.CurrentPosition, value)
       this.accessory.context.cachePositionState = 2
       this.accessory.context.cacheCurrentPosition = value
diff --git a/lib/device/curtain.js b/lib/device/curtain.js
index 4dc6bc2f..113dd4d1 100644
--- a/lib/device/curtain.js
+++ b/lib/device/curtain.js
@@ -10,8 +10,7 @@ module.exports = class deviceCurtain {
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
     this.service = accessory.getService(this.Service.WindowCovering) || accessory.addService(this.Service.WindowCovering)
-    this.service
-      .getCharacteristic(this.Characteristic.TargetPosition)
+    this.service.getCharacteristic(this.Characteristic.TargetPosition)
       .on('set', this.internalUpdate.bind(this))
     this.accessory = accessory
   }
@@ -35,8 +34,7 @@ module.exports = class deviceCurtain {
     try {
       if (!params.switch && !this.helpers.hasProperty(params, 'setclose')) return
       const newPos = Math.abs(100 - parseInt(params.setclose))
-      this.service
-        .updateCharacteristic(this.Characteristic.TargetPosition, newPos)
+      this.service.updateCharacteristic(this.Characteristic.TargetPosition, newPos)
         .updateCharacteristic(this.Characteristic.CurrentPosition, newPos)
         .updateCharacteristic(this.Characteristic.PositionState, 2)
       if (params.updateSource && this.cachePosition !== newPos) {
diff --git a/lib/device/diffuser.js b/lib/device/diffuser.js
index db6ac0bf..0dd641e0 100644
--- a/lib/device/diffuser.js
+++ b/lib/device/diffuser.js
@@ -12,25 +12,19 @@ module.exports = class deviceDiffuser {
     this.Characteristic = platform.api.hap.Characteristic
     this.fanService = accessory.getService('Diffuser') || accessory.addService(this.Service.Fan, 'Diffuser', 'diffuser')
     this.lightService = accessory.getService('Light') || accessory.addService(this.Service.Lightbulb, 'Light', 'light')
-    this.fanService
-      .getCharacteristic(this.Characteristic.On)
+    this.fanService.getCharacteristic(this.Characteristic.On)
       .on('set', this.internalDiffuserOnOffUpdate.bind(this))
     this.accessory = accessory
-    this.fanService
-      .getCharacteristic(this.Characteristic.RotationSpeed)
+    this.fanService.getCharacteristic(this.Characteristic.RotationSpeed)
       .on('set', this.internalDiffuserSpeedUpdate.bind(this))
       .setProps({ minStep: 50 })
-    this.lightService
-      .getCharacteristic(this.Characteristic.On)
+    this.lightService.getCharacteristic(this.Characteristic.On)
       .on('set', this.internalLightOnOffUpdate.bind(this))
-    this.lightService
-      .getCharacteristic(this.Characteristic.Brightness)
+    this.lightService.getCharacteristic(this.Characteristic.Brightness)
       .on('set', this.internalLightBrightnessUpdate.bind(this))
-    this.lightService
-      .getCharacteristic(this.Characteristic.Hue)
+    this.lightService.getCharacteristic(this.Characteristic.Hue)
       .on('set', this.internalLightColourUpdate.bind(this))
-    this.lightService
-      .getCharacteristic(this.Characteristic.Saturation)
+    this.lightService.getCharacteristic(this.Characteristic.Saturation)
       .on('set', (value, callback) => callback())
     this.accessory = accessory
   }
@@ -209,8 +203,7 @@ module.exports = class deviceDiffuser {
           this.cacheB = params.lightBcolor
           const newColour = this.colourUtils.rgb2hs(this.cacheR, this.cacheG, this.cacheB)
           this.cacheHue = newColour[0]
-          this.lightService
-            .updateCharacteristic(this.Characteristic.Hue, this.cacheHue)
+          this.lightService.updateCharacteristic(this.Characteristic.Hue, this.cacheHue)
             .updateCharacteristic(this.Characteristic.Saturation, 100)
           if (params.updateSource && !this.disableDeviceLogging) {
             this.log('[%s] current colour [rgb %s %s %s].', this.accessory.displayName, this.cacheR, this.cacheG, this.cacheB)
diff --git a/lib/device/fan.js b/lib/device/fan.js
index 1c4da26b..a41077cb 100644
--- a/lib/device/fan.js
+++ b/lib/device/fan.js
@@ -10,14 +10,12 @@ module.exports = class deviceFan {
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
     this.service = accessory.getService(this.Service.Fan) || accessory.addService(this.Service.Fan)
-    this.service
-      .getCharacteristic(this.Characteristic.On)
+    this.service.getCharacteristic(this.Characteristic.On)
       .on('set', (value, callback) => {
         callback()
         if (!value) this.service.setCharacteristic(this.Characteristic.RotationSpeed, 0)
       })
-    this.service
-      .getCharacteristic(this.Characteristic.RotationSpeed)
+    this.service.getCharacteristic(this.Characteristic.RotationSpeed)
       .on('set', this.internalSpeedUpdate.bind(this))
       .setProps({ minStep: 33 })
     if ((this.platform.config.hideLightFromFan || '').split(',').includes(accessory.context.eweDeviceId)) {
@@ -26,8 +24,7 @@ module.exports = class deviceFan {
       }
     } else {
       this.lightService = accessory.getService(this.Service.Lightbulb) || accessory.addService(this.Service.Lightbulb)
-      this.lightService
-        .getCharacteristic(this.Characteristic.On)
+      this.lightService.getCharacteristic(this.Characteristic.On)
         .on('set', this.internalLightUpdate.bind(this))
     }
     this.accessory = accessory
diff --git a/lib/device/garage-eachen.js b/lib/device/garage-eachen.js
index 6d5f1590..77d151bf 100644
--- a/lib/device/garage-eachen.js
+++ b/lib/device/garage-eachen.js
@@ -14,13 +14,11 @@ module.exports = class deviceGarageEachen {
     // end testing
     if (!(this.service = accessory.getService(this.Service.GarageDoorOpener))) {
       this.service = accessory.addService(this.Service.GarageDoorOpener)
-      this.service
-        .setCharacteristic(this.Characteristic.CurrentDoorState, 1)
+      this.service.setCharacteristic(this.Characteristic.CurrentDoorState, 1)
         .setCharacteristic(this.Characteristic.TargetDoorState, 1)
         .setCharacteristic(this.Characteristic.ObstructionDetected, false)
     }
-    this.service
-      .getCharacteristic(this.Characteristic.TargetDoorState)
+    this.service.getCharacteristic(this.Characteristic.TargetDoorState)
       .on('set', this.internalUpdate.bind(this))
     this.service.updateCharacteristic(this.Characteristic.ObstructionDetected, false)
     this.accessory = accessory
@@ -39,8 +37,7 @@ module.exports = class deviceGarageEachen {
       if (value === this.service.getCharacteristic(this.Characteristic.CurrentDoorState).value % 2) return
       this.inUse = true
       await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.service
-        .updateCharacteristic(this.Characteristic.TargetDoorState, value)
+      this.service.updateCharacteristic(this.Characteristic.TargetDoorState, value)
         .updateCharacteristic(this.Characteristic.CurrentDoorState, value + 2)
       await this.helpers.sleep(2000)
       this.inUse = false
@@ -60,8 +57,7 @@ module.exports = class deviceGarageEachen {
   async externalUpdate (params) {
     try {
       if (!params.switch || this.inUse) return
-      this.service
-        .updateCharacteristic(this.Characteristic.TargetDoorState, params.switch === 'on' ? 0 : 1)
+      this.service.updateCharacteristic(this.Characteristic.TargetDoorState, params.switch === 'on' ? 0 : 1)
         .updateCharacteristic(this.Characteristic.CurrentDoorState, params.switch === 'on' ? 0 : 1)
       if (params.updateSource && !this.disableDeviceLogging) {
         this.log('[%s] current state [%s].', this.accessory.displayName, params.switch === 'on' ? 'open' : 'closed')
diff --git a/lib/device/garage-four.js b/lib/device/garage-four.js
index 596aff4f..7a0341e0 100644
--- a/lib/device/garage-four.js
+++ b/lib/device/garage-four.js
@@ -12,15 +12,13 @@ module.exports = class deviceGarageFour {
     ;['A', 'B', 'C', 'D'].forEach(v => {
       let gdService
       if (!(gdService = accessory.getService('Garage ' + v))) {
-        accessory
-          .addService(this.Service.GarageDoorOpener, 'Garage ' + v, 'garage' + v)
+        accessory.addService(this.Service.GarageDoorOpener, 'Garage ' + v, 'garage' + v)
           .setCharacteristic(this.Characteristic.CurrentDoorState, 1)
           .setCharacteristic(this.Characteristic.TargetDoorState, 1)
           .setCharacteristic(this.Characteristic.ObstructionDetected, false)
         gdService = accessory.getService('Garage ' + v)
       }
-      gdService
-        .getCharacteristic(this.Characteristic.TargetDoorState)
+      gdService.getCharacteristic(this.Characteristic.TargetDoorState)
         .on('set', (value, callback) => this.internalUpdate(v, value, callback))
     })
     this.accessory = accessory
@@ -51,8 +49,7 @@ module.exports = class deviceGarageFour {
       this.inUse = true
       const updateKey = Math.random().toString(36).substr(2, 8)
       this.updateKey = updateKey
-      gdService
-        .updateCharacteristic(this.Characteristic.TargetDoorState, value)
+      gdService.updateCharacteristic(this.Characteristic.TargetDoorState, value)
         .updateCharacteristic(this.Characteristic.CurrentDoorState, value + 2)
       this.accessory.context.cacheStates[garageChannel].cacheTargetDoorState = value
       this.accessory.context.cacheStates[garageChannel].cacheCurrentDoorState = value + 2
diff --git a/lib/device/garage-one.js b/lib/device/garage-one.js
index 30fa204f..59691c89 100644
--- a/lib/device/garage-one.js
+++ b/lib/device/garage-one.js
@@ -10,15 +10,13 @@ module.exports = class deviceGarageOne {
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
     if (!(this.service = accessory.getService(this.Service.GarageDoorOpener))) {
-      accessory
-        .addService(this.Service.GarageDoorOpener)
+      accessory.addService(this.Service.GarageDoorOpener)
         .setCharacteristic(this.Characteristic.CurrentDoorState, 1)
         .setCharacteristic(this.Characteristic.TargetDoorState, 1)
         .setCharacteristic(this.Characteristic.ObstructionDetected, false)
       this.service = accessory.getService(this.Service.GarageDoorOpener)
     }
-    this.service
-      .getCharacteristic(this.Characteristic.TargetDoorState)
+    this.service.getCharacteristic(this.Characteristic.TargetDoorState)
       .on('set', this.internalUpdate.bind(this))
     this.accessory = accessory
   }
@@ -53,8 +51,7 @@ module.exports = class deviceGarageOne {
       }
       if (this.cacheState !== newPos) return
       await this.helpers.sleep(delay)
-      this.service
-        .updateCharacteristic(this.Characteristic.TargetDoorState, newPos)
+      this.service.updateCharacteristic(this.Characteristic.TargetDoorState, newPos)
         .updateCharacteristic(this.Characteristic.CurrentDoorState, newPos + 2)
       this.accessory.context.cacheTargetDoorState = newPos
       this.accessory.context.cacheCurrentDoorState = newPos + 2
@@ -112,8 +109,7 @@ module.exports = class deviceGarageOne {
         await this.helpers.sleep(2000)
         this.inUse = false
       } else {
-        this.service
-          .updateCharacteristic(this.Characteristic.TargetDoorState, newPos - 2)
+        this.service.updateCharacteristic(this.Characteristic.TargetDoorState, newPos - 2)
           .updateCharacteristic(this.Characteristic.CurrentDoorState, newPos)
         this.accessory.context.cacheCurrentDoorState = newPos
         this.accessory.context.cacheTargetDoorState = newPos - 2
diff --git a/lib/device/garage-two.js b/lib/device/garage-two.js
index 35ff6fff..f9760b52 100644
--- a/lib/device/garage-two.js
+++ b/lib/device/garage-two.js
@@ -12,15 +12,13 @@ module.exports = class deviceGarageTwo {
     ;['1', '2'].forEach(v => {
       let gdService
       if (!(gdService = accessory.getService('Garage ' + v))) {
-        accessory
-          .addService(this.Service.GarageDoorOpener, 'Garage ' + v, 'garage' + v)
+        accessory.addService(this.Service.GarageDoorOpener, 'Garage ' + v, 'garage' + v)
           .setCharacteristic(this.Characteristic.CurrentDoorState, 1)
           .setCharacteristic(this.Characteristic.TargetDoorState, 1)
           .setCharacteristic(this.Characteristic.ObstructionDetected, false)
         gdService = accessory.getService('Garage ' + v)
       }
-      gdService
-        .getCharacteristic(this.Characteristic.TargetDoorState)
+      gdService.getCharacteristic(this.Characteristic.TargetDoorState)
         .on('set', (value, callback) => this.internalUpdate('Garage' + v, value, callback))
     })
     this.accessory = accessory
@@ -38,8 +36,7 @@ module.exports = class deviceGarageTwo {
         : this.accessory.context.cacheTwoCurrentDoorState
       if (newPos === prevState % 2) return
       this.inUse = true
-      gdService
-        .updateCharacteristic(this.Characteristic.TargetDoorState, newPos)
+      gdService.updateCharacteristic(this.Characteristic.TargetDoorState, newPos)
         .updateCharacteristic(this.Characteristic.CurrentDoorState, newPos + 2)
       switch (garage) {
         case 'Garage 1': {
@@ -115,8 +112,7 @@ module.exports = class deviceGarageTwo {
             break
         }
         this.inUse = true
-        gcService
-          .updateCharacteristic(this.Characteristic.TargetDoorState, newPos - 2)
+        gcService.updateCharacteristic(this.Characteristic.TargetDoorState, newPos - 2)
           .updateCharacteristic(this.Characteristic.CurrentDoorState, newPos)
         switch (v) {
           case '1':
diff --git a/lib/device/light-colour.js b/lib/device/light-colour.js
index 3373adae..5ca08ce0 100644
--- a/lib/device/light-colour.js
+++ b/lib/device/light-colour.js
@@ -12,30 +12,24 @@ module.exports = class deviceLightColour {
     this.Characteristic = platform.api.hap.Characteristic
     this.isB1 = accessory.context.eweUIID === 22
     this.service = accessory.getService(this.Service.Lightbulb) || accessory.addService(this.Service.Lightbulb)
-    this.service
-      .getCharacteristic(this.Characteristic.On)
+    this.service.getCharacteristic(this.Characteristic.On)
       .on('set', this.internalOnOffUpdate.bind(this))
-    this.service
-      .getCharacteristic(this.Characteristic.Brightness)
+    this.service.getCharacteristic(this.Characteristic.Brightness)
       .on('set', this.internalBrightnessUpdate.bind(this))
-    this.service
-      .getCharacteristic(this.Characteristic.Hue)
+    this.service.getCharacteristic(this.Characteristic.Hue)
       .on('set', this.internalColourUpdate.bind(this))
-    this.service
-      .getCharacteristic(this.Characteristic.Saturation)
+    this.service.getCharacteristic(this.Characteristic.Saturation)
       .on('set', (value, callback) => callback())
     if (accessory.context.eweUIID === 22) {
       // *** B1 doesn't support brightness *** \\
-      this.service
-        .getCharacteristic(this.Characteristic.Brightness)
+      this.service.getCharacteristic(this.Characteristic.Brightness)
         .setProps({ minStep: 100 })
     }
     this.accessory = accessory
     if ([59, 104].includes(accessory.context.eweUIID)) {
       // HomeKit has a range of 140-500M corresponding to 2000-7143K
       // Devices have a range of 2700K-6500K corresponding to ewelink ct: 0-255
-      this.service
-        .getCharacteristic(this.Characteristic.ColorTemperature)
+      this.service.getCharacteristic(this.Characteristic.ColorTemperature)
         .on('set', this.internalCTempUpdate.bind(this))
       if (platform.api.versionGreaterOrEqual && platform.api.versionGreaterOrEqual('1.3.0-beta.42')) {
         this.cacheBrightness = this.service.getCharacteristic(this.Characteristic.Brightness).value
@@ -207,8 +201,7 @@ module.exports = class deviceLightColour {
       this.cacheMired = value
       const hs = this.colourUtils.m2hs(this.cacheMired)
       this.cacheHue = hs[0]
-      this.service
-        .updateCharacteristic(this.Characteristic.Hue, this.cacheHue)
+      this.service.updateCharacteristic(this.Characteristic.Hue, this.cacheHue)
         .updateCharacteristic(this.Characteristic.Saturation, hs[1])
       callback()
       const mToK = Math.max(Math.min(Math.round(1000000 / value), 6500), 2700)
@@ -304,8 +297,7 @@ module.exports = class deviceLightColour {
                 this.cacheB = parseInt(params.channel4)
                 hs = this.colourUtils.rgb2hs(this.cacheR, this.cacheG, this.cacheB)
                 this.cacheHue = hs[0]
-                this.service
-                  .updateCharacteristic(this.Characteristic.Hue, this.cacheHue)
+                this.service.updateCharacteristic(this.Characteristic.Hue, this.cacheHue)
                   .updateCharacteristic(this.Characteristic.Saturation, 100)
                   .updateCharacteristic(this.Characteristic.Brightness, 100)
                 if (params.updateSource && !this.disableDeviceLogging) {
@@ -318,7 +310,9 @@ module.exports = class deviceLightColour {
               }
             }
           } else {
-            if (params.updateSource) this.log('[%s] current mode [white] is unsupported.', this.accessory.displayName)
+            if (params.updateSource) {
+              this.log('[%s] current mode [white] is unsupported.', this.accessory.displayName)
+            }
           }
           break
         case 59:
@@ -340,8 +334,7 @@ module.exports = class deviceLightColour {
               hs = this.colourUtils.rgb2hs(this.cacheR, this.cacheG, this.cacheB)
               this.cacheHue = hs[0]
               this.cacheMired = 140
-              this.service
-                .updateCharacteristic(this.Characteristic.Hue, this.cacheHue)
+              this.service.updateCharacteristic(this.Characteristic.Hue, this.cacheHue)
                 .updateCharacteristic(this.Characteristic.Saturation, hs[1])
               if (params.updateSource) {
                 if (!this.disableDeviceLogging) {
@@ -385,8 +378,7 @@ module.exports = class deviceLightColour {
                 this.cacheMired = 140
                 hs = this.colourUtils.rgb2hs(this.cacheR, this.cacheG, this.cacheB)
                 this.cacheHue = hs[0]
-                this.service
-                  .updateCharacteristic(this.Characteristic.ColorTemperature, 140)
+                this.service.updateCharacteristic(this.Characteristic.ColorTemperature, 140)
                   .updateCharacteristic(this.Characteristic.Hue, this.cacheHue)
                   .updateCharacteristic(this.Characteristic.Saturation, 100)
                 if (params.updateSource && !this.disableDeviceLogging) {
@@ -416,8 +408,7 @@ module.exports = class deviceLightColour {
               this.cacheMired = Math.max(Math.min(Math.round(1000000 / ctToK), 500), 140)
               hs = this.colourUtils.m2hs(this.cacheMired)
               this.cacheHue = hs[0]
-              this.service
-                .updateCharacteristic(this.Characteristic.Hue, this.cacheHue)
+              this.service.updateCharacteristic(this.Characteristic.Hue, this.cacheHue)
                 .updateCharacteristic(this.Characteristic.Saturation, hs[1])
                 .updateCharacteristic(this.Characteristic.ColorTemperature, this.cacheMired)
               if (params.updateSource) {
diff --git a/lib/device/light-ctemp.js b/lib/device/light-ctemp.js
index fb3d8c30..5b38b78a 100644
--- a/lib/device/light-ctemp.js
+++ b/lib/device/light-ctemp.js
@@ -10,14 +10,11 @@ module.exports = class deviceLightColour {
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
     this.service = accessory.getService(this.Service.Lightbulb) || accessory.addService(this.Service.Lightbulb)
-    this.service
-      .getCharacteristic(this.Characteristic.On)
+    this.service.getCharacteristic(this.Characteristic.On)
       .on('set', this.internalOnOffUpdate.bind(this))
-    this.service
-      .getCharacteristic(this.Characteristic.Brightness)
+    this.service.getCharacteristic(this.Characteristic.Brightness)
       .on('set', this.internalBrightnessUpdate.bind(this))
-    this.service
-      .getCharacteristic(this.Characteristic.ColorTemperature)
+    this.service.getCharacteristic(this.Characteristic.ColorTemperature)
       .on('set', this.internalCTempUpdate.bind(this))
     if ((this.platform.config.bulbB02FST64 || '').split(',').includes(accessory.context.eweDeviceId)) {
       this.minK = 1800
diff --git a/lib/device/light-dimmer.js b/lib/device/light-dimmer.js
index b1b59afe..d2e19c01 100644
--- a/lib/device/light-dimmer.js
+++ b/lib/device/light-dimmer.js
@@ -10,8 +10,7 @@ module.exports = class deviceLightDimmer {
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
     this.service = accessory.getService(this.Service.Lightbulb) || accessory.addService(this.Service.Lightbulb)
-    this.service
-      .getCharacteristic(this.Characteristic.On)
+    this.service.getCharacteristic(this.Characteristic.On)
       .on('set', this.internalOnOffUpdate.bind(this))
     this.service.getCharacteristic(this.Characteristic.Brightness)
       .on('set', this.internalBrightnessUpdate.bind(this))
diff --git a/lib/device/lock-one.js b/lib/device/lock-one.js
index 3d796a69..1ca7ec58 100644
--- a/lib/device/lock-one.js
+++ b/lib/device/lock-one.js
@@ -10,11 +10,9 @@ module.exports = class deviceLockOne {
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
     this.service = accessory.getService(this.Service.LockMechanism) || accessory.addService(this.Service.LockMechanism)
-    this.service
-      .getCharacteristic(this.Characteristic.LockTargetState)
+    this.service.getCharacteristic(this.Characteristic.LockTargetState)
       .on('set', this.internalUpdate.bind(this))
-    this.service
-      .updateCharacteristic(this.Characteristic.LockCurrentState, 1)
+    this.service.updateCharacteristic(this.Characteristic.LockCurrentState, 1)
       .updateCharacteristic(this.Characteristic.LockTargetState, 1)
     this.accessory = accessory
   }
@@ -48,15 +46,13 @@ module.exports = class deviceLockOne {
       if (!params.switch || params.switch === 'off' || this.inUse) return
       const lockConfig = this.platform.cusG.get(this.accessory.context.eweDeviceId)
       this.inUse = true
-      this.service
-        .updateCharacteristic(this.Characteristic.LockCurrentState, 0)
+      this.service.updateCharacteristic(this.Characteristic.LockCurrentState, 0)
         .updateCharacteristic(this.Characteristic.LockTargetState, 0)
       if (params.updateSource && !this.disableDeviceLogging) {
         this.log('[%s] current status [unlocked].', this.accessory.displayName)
       }
       await this.helpers.sleep(Math.max(lockConfig.operationTime * 100, 1000))
-      this.service
-        .updateCharacteristic(this.Characteristic.LockCurrentState, 1)
+      this.service.updateCharacteristic(this.Characteristic.LockCurrentState, 1)
         .updateCharacteristic(this.Characteristic.LockTargetState, 1)
       this.inUse = false
       if (params.updateSource && !this.disableDeviceLogging) {
diff --git a/lib/device/outlet.js b/lib/device/outlet.js
index e2a20d0f..2f116d21 100644
--- a/lib/device/outlet.js
+++ b/lib/device/outlet.js
@@ -96,11 +96,9 @@ module.exports = class deviceOutlet {
       this.service.addCharacteristic(this.eveTotalConsumption)
       this.service.addCharacteristic(this.eveResetTotal)
     }
-    this.service
-      .getCharacteristic(this.Characteristic.On)
+    this.service.getCharacteristic(this.Characteristic.On)
       .on('set', this.internalUpdate.bind(this))
-    this.service
-      .getCharacteristic(this.eveResetTotal)
+    this.service.getCharacteristic(this.eveResetTotal)
       .on('set', (value, callback) => {
         callback()
         accessory.context.energyReadings = []
@@ -152,8 +150,7 @@ module.exports = class deviceOutlet {
       let logger = false
       if (this.helpers.hasProperty(params, 'power')) {
         this.accessory.context.powerReadings = true
-        this.service
-          .updateCharacteristic(this.Characteristic.OutletInUse, parseFloat(params.power) > this.inUsePowerThreshold)
+        this.service.updateCharacteristic(this.Characteristic.OutletInUse, parseFloat(params.power) > this.inUsePowerThreshold)
           .updateCharacteristic(this.eveCurrentConsumption, parseFloat(params.power))
         const isOn = this.accessory.getService(this.Service.Outlet).getCharacteristic(this.Characteristic.On).value
         this.accessory.eveService.addEntry({ power: isOn ? parseFloat(params.power) : 0 })
diff --git a/lib/device/rf-bridge.js b/lib/device/rf-bridge.js
index e3e7fdcc..620885ee 100644
--- a/lib/device/rf-bridge.js
+++ b/lib/device/rf-bridge.js
@@ -32,8 +32,7 @@ module.exports = class deviceRFBridge {
       Object.entries(accessory.context.buttons).forEach(([chan, name]) => {
         if (!accessory.getService(name)) accessory.addService(this.Service.Switch, name, 'switch' + chan)
         accessory.getService(name).updateCharacteristic(this.Characteristic.On, false)
-        accessory.getService(name)
-          .getCharacteristic(this.Characteristic.On)
+        accessory.getService(name).getCharacteristic(this.Characteristic.On)
           .on('set', (value, callback) => this.internalUpdate(chan, name, value, callback))
       })
     } else {
diff --git a/lib/device/scm.js b/lib/device/scm.js
index 62cbb9bb..e8278a7b 100644
--- a/lib/device/scm.js
+++ b/lib/device/scm.js
@@ -10,8 +10,7 @@ module.exports = class deviceSCM {
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
     this.service = accessory.getService(this.Service.Switch) || accessory.addService(this.Service.Switch)
-    this.service
-      .getCharacteristic(this.Characteristic.On)
+    this.service.getCharacteristic(this.Characteristic.On)
       .on('set', this.internalUpdate.bind(this))
     accessory.log = this.log
     accessory.eveService = new this.platform.eveService('switch', accessory)
diff --git a/lib/device/sensor.js b/lib/device/sensor.js
index a98518cf..bf035e7a 100644
--- a/lib/device/sensor.js
+++ b/lib/device/sensor.js
@@ -40,8 +40,7 @@ module.exports = class deviceSensor {
       if (this.helpers.hasProperty(params, 'battery')) {
         const scaledBattery = Math.round(params.battery * 33.3)
         if (this.cacheBattery !== scaledBattery) {
-          this.batteryService
-            .updateCharacteristic(this.Characteristic.BatteryLevel, this.cacheBattery)
+          this.batteryService.updateCharacteristic(this.Characteristic.BatteryLevel, this.cacheBattery)
             .updateCharacteristic(this.Characteristic.StatusLowBattery, this.cacheBattery < this.lowBattThreshold)
           if (params.updateSource && !this.disableDeviceLogging) {
             this.log('[%s] current battery [%s%].', this.accessory.displayName, this.cacheBattery)
@@ -69,8 +68,7 @@ module.exports = class deviceSensor {
             const gdService = oAccessory.getService(this.Service.GarageDoorOpener)
             switch (newState) {
               case 0:
-                gdService
-                  .updateCharacteristic(this.Characteristic.TargetDoorState, 1)
+                gdService.updateCharacteristic(this.Characteristic.TargetDoorState, 1)
                   .updateCharacteristic(this.Characteristic.CurrentDoorState, 1)
                 if (params.updateSource && !this.disableDeviceLogging) {
                   this.log('[%s] current state [closed].', oAccessory.displayName)
@@ -78,8 +76,7 @@ module.exports = class deviceSensor {
                 break
               case 1:
                 await this.helpers.sleep(Math.max(group.operationTime * 100, 1000))
-                gdService
-                  .updateCharacteristic(this.Characteristic.TargetDoorState, 0)
+                gdService.updateCharacteristic(this.Characteristic.TargetDoorState, 0)
                   .updateCharacteristic(this.Characteristic.CurrentDoorState, 0)
                 if (params.updateSource && !this.disableDeviceLogging) {
                   this.log('[%s] current state [open].', oAccessory.displayName)
diff --git a/lib/device/switch-multi.js b/lib/device/switch-multi.js
index c80132c5..70aab9a7 100644
--- a/lib/device/switch-multi.js
+++ b/lib/device/switch-multi.js
@@ -10,8 +10,7 @@ module.exports = class deviceSwitchMulti {
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
     this.service = accessory.getService(this.Service.Switch) || accessory.addService(this.Service.Switch)
-    this.service
-      .getCharacteristic(this.Characteristic.On)
+    this.service.getCharacteristic(this.Characteristic.On)
       .on('set', this.internalUpdate.bind(this))
     accessory.log = this.log
     accessory.eveService = new this.platform.eveService('switch', accessory)
@@ -90,8 +89,7 @@ module.exports = class deviceSwitchMulti {
         if (this.platform.devicesInHB.has(idToCheck + i)) {
           const oAccessory = this.platform.devicesInHB.get(idToCheck + i)
           if (params.switches[i - 1].switch === oAccessory.context.cacheOnOff) continue
-          oAccessory
-            .getService(this.Service.Switch)
+          oAccessory.getService(this.Service.Switch)
             .updateCharacteristic(this.Characteristic.On, params.switches[i - 1].switch === 'on')
           oAccessory.context.cacheOnOff = params.switches[i - 1].switch
           oAccessory.eveService.addEntry({ status: params.switches[i - 1].switch === 'on' ? 1 : 0 })
diff --git a/lib/device/switch-single.js b/lib/device/switch-single.js
index 74c12ddc..de199228 100644
--- a/lib/device/switch-single.js
+++ b/lib/device/switch-single.js
@@ -10,8 +10,7 @@ module.exports = class deviceSwitchSingle {
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
     this.service = accessory.getService(this.Service.Switch) || accessory.addService(this.Service.Switch)
-    this.service
-      .getCharacteristic(this.Characteristic.On)
+    this.service.getCharacteristic(this.Characteristic.On)
       .on('set', this.internalUpdate.bind(this))
     if (accessory.getService(this.Service.Outlet)) {
       accessory.removeService(accessory.getService(this.Service.Outlet))
diff --git a/lib/device/switch-valve.js b/lib/device/switch-valve.js
index a0f74b40..9b7e42a7 100644
--- a/lib/device/switch-valve.js
+++ b/lib/device/switch-valve.js
@@ -12,21 +12,17 @@ module.exports = class deviceSwitchValve {
     this.switchService = accessory.getService(this.Service.Switch) || accessory.addService(this.Service.Switch)
     if (!(this.valveService = accessory.getService(this.Service.Valve))) {
       this.valveService = accessory.addService(this.Service.Valve)
-      this.valveService
-        .setCharacteristic(this.Characteristic.Active, 0)
+      this.valveService.setCharacteristic(this.Characteristic.Active, 0)
         .setCharacteristic(this.Characteristic.InUse, 0)
         .setCharacteristic(this.Characteristic.ValveType, 1)
         .setCharacteristic(this.Characteristic.SetDuration, 120)
         .addCharacteristic(this.Characteristic.RemainingDuration)
     }
-    this.switchService
-      .getCharacteristic(this.Characteristic.On)
+    this.switchService.getCharacteristic(this.Characteristic.On)
       .on('set', this.internalSwitchUpdate.bind(this))
-    this.valveService
-      .getCharacteristic(this.Characteristic.Active)
+    this.valveService.getCharacteristic(this.Characteristic.Active)
       .on('set', this.internalValveUpdate.bind(this))
-    this.valveService
-      .getCharacteristic(this.Characteristic.SetDuration)
+    this.valveService.getCharacteristic(this.Characteristic.SetDuration)
       .on('set', (value, callback) => {
         if (this.valveService.getCharacteristic(this.Characteristic.InUse).value) {
           this.valveService.updateCharacteristic(this.Characteristic.RemainingDuration, value)
@@ -105,8 +101,7 @@ module.exports = class deviceSwitchValve {
       if (params.switches[1].switch === 'on') {
         if (this.valveService.getCharacteristic(this.Characteristic.Active).value === 0) {
           const timer = this.valveService.getCharacteristic(this.Characteristic.SetDuration).value
-          this.valveService
-            .updateCharacteristic(this.Characteristic.Active, 1)
+          this.valveService.updateCharacteristic(this.Characteristic.Active, 1)
             .updateCharacteristic(this.Characteristic.InUse, 1)
             .updateCharacteristic(this.Characteristic.RemainingDuration, timer)
           if (params.updateSource && !this.disableDeviceLogging) {
@@ -118,8 +113,7 @@ module.exports = class deviceSwitchValve {
         }
         return
       }
-      this.valveService
-        .updateCharacteristic(this.Characteristic.Active, 0)
+      this.valveService.updateCharacteristic(this.Characteristic.Active, 0)
         .updateCharacteristic(this.Characteristic.InUse, 0)
         .updateCharacteristic(this.Characteristic.RemainingDuration, 0)
       clearTimeout(this.timer)
diff --git a/lib/device/tap-one.js b/lib/device/tap-one.js
index 673abc37..55644a99 100644
--- a/lib/device/tap-one.js
+++ b/lib/device/tap-one.js
@@ -11,13 +11,11 @@ module.exports = class deviceTapOne {
     this.Characteristic = platform.api.hap.Characteristic
     if (!(this.service = accessory.getService(this.Service.Valve))) {
       this.service = accessory.addService(this.Service.Valve)
-      this.service
-        .setCharacteristic(this.Characteristic.Active, 0)
+      this.service.setCharacteristic(this.Characteristic.Active, 0)
         .setCharacteristic(this.Characteristic.InUse, 0)
         .setCharacteristic(this.Characteristic.ValveType, 3)
     }
-    this.service
-      .getCharacteristic(this.Characteristic.Active)
+    this.service.getCharacteristic(this.Characteristic.Active)
       .on('set', this.internalUpdate.bind(this))
     this.accessory = accessory
   }
@@ -43,7 +41,7 @@ module.exports = class deviceTapOne {
       if (!params.switch || params.switch === this.cacheOnOff) return
       const newStatus = params.switch === 'on'
       this.service.updateCharacteristic(this.Characteristic.Active, newStatus ? 1 : 0)
-      this.service.updateCharacteristic(this.Characteristic.InUse, newStatus ? 1 : 0)
+        .updateCharacteristic(this.Characteristic.InUse, newStatus ? 1 : 0)
       this.cacheOnOff = params.switch
       if (params.updateSource && !this.disableDeviceLogging) {
         this.log('[%s] current state [%s].', this.accessory.displayName, this.cacheOnOff)
diff --git a/lib/device/tap-two.js b/lib/device/tap-two.js
index 4eae07d9..0f7cb8f9 100644
--- a/lib/device/tap-two.js
+++ b/lib/device/tap-two.js
@@ -17,8 +17,7 @@ module.exports = class deviceTapTwo {
           .setCharacteristic(this.Characteristic.InUse, 0)
           .setCharacteristic(this.Characteristic.ValveType, 3)
       }
-      tapService
-        .getCharacteristic(this.Characteristic.Active)
+      tapService.getCharacteristic(this.Characteristic.Active)
         .on('set', (value, callback) => this.internalUpdate('Tap ' + v, value, callback))
     })
     this.accessory = accessory
@@ -58,8 +57,7 @@ module.exports = class deviceTapTwo {
       if (!params.switches) return
       ;['A', 'B'].forEach((v, k) => {
         const tapService = this.accessory.getService('Valve ' + v)
-        tapService
-          .updateCharacteristic(this.Characteristic.Active, params.switches[k].switch === 'on' ? 1 : 0)
+        tapService.updateCharacteristic(this.Characteristic.Active, params.switches[k].switch === 'on' ? 1 : 0)
           .updateCharacteristic(this.Characteristic.InUse, params.switches[k].switch === 'on' ? 1 : 0)
         const logText = params.switches[k].switch === 'on' ? 'running' : 'stopped'
         if (params.updateSource && !this.disableDeviceLogging) {
diff --git a/lib/device/template.js b/lib/device/template.js
index 1d9ccc91..569ee673 100644
--- a/lib/device/template.js
+++ b/lib/device/template.js
@@ -10,8 +10,7 @@ module.exports = class deviceTemplate {
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
     this.service = accessory.getService(this.Service.Switch) || accessory.addService(this.Service.Switch)
-    this.service
-      .getCharacteristic(this.Characteristic.On)
+    this.service.getCharacteristic(this.Characteristic.On)
       .on('set', (value, callback) => this.internalUpdate(value, callback))
     this.accessory = accessory
   }
diff --git a/lib/device/th-outlet.js b/lib/device/th-outlet.js
index d6631bed..e2da811c 100644
--- a/lib/device/th-outlet.js
+++ b/lib/device/th-outlet.js
@@ -20,13 +20,11 @@ module.exports = class deviceTHOutlet {
       }
     } else {
       this.switchService = accessory.getService(this.Service.Switch) || accessory.addService(this.Service.Switch)
-      this.switchService
-        .getCharacteristic(this.Characteristic.On)
+      this.switchService.getCharacteristic(this.Characteristic.On)
         .on('set', this.internalUpdate.bind(this))
     }
     this.tempService = accessory.getService(this.Service.TemperatureSensor) || accessory.addService(this.Service.TemperatureSensor)
-    this.tempService
-      .getCharacteristic(this.Characteristic.CurrentTemperature)
+    this.tempService.getCharacteristic(this.Characteristic.CurrentTemperature)
       .setProps({ minValue: -100 })
     if (accessory.context.sensorType !== 'DS18B20') {
       this.humiService = accessory.getService(this.Service.HumiditySensor) || accessory.addService(this.Service.HumiditySensor)
diff --git a/lib/device/th-thermo.js b/lib/device/th-thermo.js
index 9e5d29cd..4dc2d4ff 100644
--- a/lib/device/th-thermo.js
+++ b/lib/device/th-thermo.js
@@ -22,12 +22,10 @@ module.exports = class deviceTHThermo {
     this.service = accessory.getService(this.Service.Thermostat) || accessory.addService(this.Service.Thermostat)
     this.service.getCharacteristic(this.Characteristic.CurrentTemperature)
       .setProps({ minValue: -100 })
-    this.service
-      .getCharacteristic(this.Characteristic.TargetHeatingCoolingState)
+    this.service.getCharacteristic(this.Characteristic.TargetHeatingCoolingState)
       .on('set', this.internalOnOffUpdate.bind(this))
       .setProps({ validValues: [0, 1] })
-    this.service
-      .getCharacteristic(this.Characteristic.TargetTemperature)
+    this.service.getCharacteristic(this.Characteristic.TargetTemperature)
       .on('set', this.internalTempUpdate.bind(this))
     if (
       accessory.context.sensorType !== 'DS18B20' &&
diff --git a/lib/device/usb.js b/lib/device/usb.js
index 647dd411..34c75425 100644
--- a/lib/device/usb.js
+++ b/lib/device/usb.js
@@ -20,8 +20,7 @@ module.exports = class deviceUSB {
       }
       this.service = accessory.getService(this.Service.Outlet) || accessory.addService(this.Service.Outlet)
     }
-    this.service
-      .getCharacteristic(this.Characteristic.On)
+    this.service.getCharacteristic(this.Characteristic.On)
       .on('set', this.internalUpdate.bind(this))
     accessory.log = this.log
     accessory.eveService = new this.platform.eveService('switch', accessory)
diff --git a/lib/device/valve-four.js b/lib/device/valve-four.js
index d196958b..512a76e1 100644
--- a/lib/device/valve-four.js
+++ b/lib/device/valve-four.js
@@ -12,8 +12,7 @@ module.exports = class deviceValveFour {
     ;['A', 'B', 'C', 'D'].forEach(v => {
       let valveService
       if (!(valveService = accessory.getService('Valve ' + v))) {
-        accessory
-          .addService(this.Service.Valve, 'Valve ' + v, 'valve' + v.toLowerCase())
+        accessory.addService(this.Service.Valve, 'Valve ' + v, 'valve' + v.toLowerCase())
           .setCharacteristic(this.Characteristic.Active, 0)
           .setCharacteristic(this.Characteristic.InUse, 0)
           .setCharacteristic(this.Characteristic.ValveType, 1)
@@ -21,11 +20,9 @@ module.exports = class deviceValveFour {
           .addCharacteristic(this.Characteristic.RemainingDuration)
         valveService = accessory.getService('Valve ' + v)
       }
-      valveService
-        .getCharacteristic(this.Characteristic.Active)
+      valveService.getCharacteristic(this.Characteristic.Active)
         .on('set', (value, callback) => this.internalUpdate('Valve ' + v, value, callback))
-      valveService
-        .getCharacteristic(this.Characteristic.SetDuration)
+      valveService.getCharacteristic(this.Characteristic.SetDuration)
         .on('set', (value, callback) => {
           if (valveService.getCharacteristic(this.Characteristic.InUse).value === 1) {
             valveService.updateCharacteristic(this.Characteristic.RemainingDuration, value)
@@ -128,8 +125,7 @@ module.exports = class deviceValveFour {
         if (params.switches[k].switch === 'on') {
           if (valveService.getCharacteristic(this.Characteristic.Active).value === 0) {
             const timer = valveService.getCharacteristic(this.Characteristic.SetDuration).value
-            valveService
-              .updateCharacteristic(this.Characteristic.Active, 1)
+            valveService.updateCharacteristic(this.Characteristic.Active, 1)
               .updateCharacteristic(this.Characteristic.InUse, 1)
               .updateCharacteristic(this.Characteristic.RemainingDuration, timer)
             if (params.updateSource && !this.disableDeviceLogging) {
@@ -141,8 +137,7 @@ module.exports = class deviceValveFour {
           }
           return
         }
-        valveService
-          .updateCharacteristic(this.Characteristic.Active, 0)
+        valveService.updateCharacteristic(this.Characteristic.Active, 0)
           .updateCharacteristic(this.Characteristic.InUse, 0)
           .updateCharacteristic(this.Characteristic.RemainingDuration, 0)
         clearTimeout(valveService.timer)
diff --git a/lib/device/valve-one.js b/lib/device/valve-one.js
index 0f016fc8..1514b2e3 100644
--- a/lib/device/valve-one.js
+++ b/lib/device/valve-one.js
@@ -11,18 +11,15 @@ module.exports = class deviceValveOne {
     this.Characteristic = platform.api.hap.Characteristic
     if (!(this.service = accessory.getService(this.Service.Valve))) {
       this.service = accessory.addService(this.Service.Valve)
-      this.service
-        .setCharacteristic(this.Characteristic.Active, 0)
+      this.service.setCharacteristic(this.Characteristic.Active, 0)
         .setCharacteristic(this.Characteristic.InUse, 0)
         .setCharacteristic(this.Characteristic.ValveType, 1)
         .setCharacteristic(this.Characteristic.SetDuration, 120)
         .addCharacteristic(this.Characteristic.RemainingDuration)
     }
-    this.service
-      .getCharacteristic(this.Characteristic.Active)
+    this.service.getCharacteristic(this.Characteristic.Active)
       .on('set', this.internalUpdate.bind(this))
-    this.service
-      .getCharacteristic(this.Characteristic.SetDuration)
+    this.service.getCharacteristic(this.Characteristic.SetDuration)
       .on('set', (value, callback) => {
         if (this.service.getCharacteristic(this.Characteristic.InUse).value === 1) {
           this.service.updateCharacteristic(this.Characteristic.RemainingDuration, value)
@@ -74,8 +71,7 @@ module.exports = class deviceValveOne {
       if (params.switch === 'on') {
         if (this.service.getCharacteristic(this.Characteristic.Active).value === 0) {
           const timer = this.service.getCharacteristic(this.Characteristic.SetDuration).value
-          this.service
-            .updateCharacteristic(this.Characteristic.Active, 1)
+          this.service.updateCharacteristic(this.Characteristic.Active, 1)
             .updateCharacteristic(this.Characteristic.InUse, 1)
             .updateCharacteristic(this.Characteristic.RemainingDuration, timer)
           if (params.updateSource && !this.disableDeviceLogging) {
@@ -87,8 +83,7 @@ module.exports = class deviceValveOne {
         }
         return
       }
-      this.service
-        .updateCharacteristic(this.Characteristic.Active, 0)
+      this.service.updateCharacteristic(this.Characteristic.Active, 0)
         .updateCharacteristic(this.Characteristic.InUse, 0)
         .updateCharacteristic(this.Characteristic.RemainingDuration, 0)
       clearTimeout(this.timer)
diff --git a/lib/device/valve-two.js b/lib/device/valve-two.js
index ba40df7a..fb0fda06 100644
--- a/lib/device/valve-two.js
+++ b/lib/device/valve-two.js
@@ -12,8 +12,7 @@ module.exports = class deviceValveTwo {
     ;['A', 'B'].forEach(v => {
       let valveService
       if (!(valveService = accessory.getService('Valve ' + v))) {
-        accessory
-          .addService(this.Service.Valve, 'Valve ' + v, 'valve' + v.toLowerCase())
+        accessory.addService(this.Service.Valve, 'Valve ' + v, 'valve' + v.toLowerCase())
           .setCharacteristic(this.Characteristic.Active, 0)
           .setCharacteristic(this.Characteristic.InUse, 0)
           .setCharacteristic(this.Characteristic.ValveType, 1)
@@ -21,11 +20,9 @@ module.exports = class deviceValveTwo {
           .addCharacteristic(this.Characteristic.RemainingDuration)
         valveService = accessory.getService('Valve ' + v)
       }
-      valveService
-        .getCharacteristic(this.Characteristic.Active)
+      valveService.getCharacteristic(this.Characteristic.Active)
         .on('set', (value, callback) => this.internalUpdate('Valve ' + v, value, callback))
-      valveService
-        .getCharacteristic(this.Characteristic.SetDuration)
+      valveService.getCharacteristic(this.Characteristic.SetDuration)
         .on('set', (value, callback) => {
           if (valveService.getCharacteristic(this.Characteristic.InUse).value === 1) {
             valveService.updateCharacteristic(this.Characteristic.RemainingDuration, value)
@@ -92,8 +89,7 @@ module.exports = class deviceValveTwo {
         if (params.switches[k].switch === 'on') {
           if (valveService.getCharacteristic(this.Characteristic.Active).value === 0) {
             const timer = valveService.getCharacteristic(this.Characteristic.SetDuration).value
-            valveService
-              .updateCharacteristic(this.Characteristic.Active, 1)
+            valveService.updateCharacteristic(this.Characteristic.Active, 1)
               .updateCharacteristic(this.Characteristic.InUse, 1)
               .updateCharacteristic(this.Characteristic.RemainingDuration, timer)
             if (params.updateSource && !this.disableDeviceLogging) {
@@ -105,8 +101,7 @@ module.exports = class deviceValveTwo {
           }
           return
         }
-        valveService
-          .updateCharacteristic(this.Characteristic.Active, 0)
+        valveService.updateCharacteristic(this.Characteristic.Active, 0)
           .updateCharacteristic(this.Characteristic.InUse, 0)
           .updateCharacteristic(this.Characteristic.RemainingDuration, 0)
         clearTimeout(valveService.timer)
diff --git a/lib/device/zb-dev.js b/lib/device/zb-dev.js
index b70cbe44..da459d74 100644
--- a/lib/device/zb-dev.js
+++ b/lib/device/zb-dev.js
@@ -55,15 +55,13 @@ module.exports = class deviceZBDev {
         if (!accessory.getService(this.Service.Switch)) accessory.addService(this.Service.Switch)
         accessory.log = this.log
         accessory.eveService = new this.platform.eveService('switch', accessory)
-        accessory.getService(this.Service.Switch)
-          .getCharacteristic(this.Characteristic.On)
+        accessory.getService(this.Service.Switch).getCharacteristic(this.Characteristic.On)
           .on('set', this.internalUpdate.bind(this))
         break
       case 1770: {
         if (!accessory.getService(this.Service.BatteryService)) accessory.addService(this.Service.BatteryService)
         const tempService = accessory.getService(this.Service.TemperatureSensor) || accessory.addService(this.Service.TemperatureSensor)
-        tempService
-          .getCharacteristic(this.Characteristic.CurrentTemperature)
+        tempService.getCharacteristic(this.Characteristic.CurrentTemperature)
           .setProps({ minValue: -100 })
         if (!accessory.getService(this.Service.HumiditySensor)) accessory.addService(this.Service.HumiditySensor)
         accessory.log = this.log
@@ -120,8 +118,7 @@ module.exports = class deviceZBDev {
       switch (this.accessory.context.eweUIID) {
         case 1000:
           if (this.helpers.hasProperty(params, 'key') && [0, 1, 2].includes(params.key)) {
-            this.accessory
-              .getService(this.Service.StatelessProgrammableSwitch)
+            this.accessory.getService(this.Service.StatelessProgrammableSwitch)
               .updateCharacteristic(this.Characteristic.ProgrammableSwitchEvent, params.key)
             if (params.updateSource && !this.disableDeviceLogging) {
               this.log(
@@ -139,8 +136,7 @@ module.exports = class deviceZBDev {
         case 1009:
         case 1256:
           if (params.switch && params.switch !== this.cacheOnOff) {
-            this.accessory
-              .getService(this.Service.Switch)
+            this.accessory.getService(this.Service.Switch)
               .updateCharacteristic(this.Characteristic.On, params.switch === 'on')
             this.cacheOnOff = params.switch
             this.accessory.eveService.addEntry({ status: params.switch === 'on' ? 1 : 0 })
@@ -154,8 +150,7 @@ module.exports = class deviceZBDev {
           if (params.temperature && params.temperature !== this.cacheTemp) {
             this.cacheTemp = params.temperature
             const currentTemp = parseInt(params.temperature) / 100
-            this.accessory
-              .getService(this.Service.TemperatureSensor)
+            this.accessory.getService(this.Service.TemperatureSensor)
               .updateCharacteristic(this.Characteristic.CurrentTemperature, currentTemp)
             if (params.updateSource && !this.disableDeviceLogging) {
               this.log('[%s] current temperature [%s].', this.accessory.displayName, currentTemp)
@@ -165,8 +160,7 @@ module.exports = class deviceZBDev {
           if (params.humidity && params.humidity !== this.cacheHumi) {
             this.cacheHumi = params.humidity
             const currentHumi = parseInt(params.humidity) / 100
-            this.accessory
-              .getService(this.Service.HumiditySensor)
+            this.accessory.getService(this.Service.HumiditySensor)
               .updateCharacteristic(this.Characteristic.CurrentRelativeHumidity, currentHumi)
             eveLog.humidity = currentHumi
             if (params.updateSource && !this.disableDeviceLogging) {
@@ -189,29 +183,31 @@ module.exports = class deviceZBDev {
               this.log('[%s] current state [motion%s detected].', this.accessory.displayName, motionDetected ? '' : ' not')
             }
             if (motionDetected) {
-              this.accessory.getService(this.Service.MotionSensor).updateCharacteristic(
-                this.eveLastActivation,
-                Math.round(new Date().valueOf() / 1000) - this.accessory.eveService.getInitialTime()
-              )
+              this.accessory.getService(this.Service.MotionSensor)
+                .updateCharacteristic(
+                  this.eveLastActivation,
+                  Math.round(new Date().valueOf() / 1000) - this.accessory.eveService.getInitialTime()
+                )
             }
-            this.accessory.getService(this.Service.MotionSensor).updateCharacteristic(this.Characteristic.MotionDetected, motionDetected)
+            this.accessory.getService(this.Service.MotionSensor)
+              .updateCharacteristic(this.Characteristic.MotionDetected, motionDetected)
             break
           }
           break
         case 3026:
           if (this.helpers.hasProperty(params, 'lock') && [0, 1].includes(params.lock)) {
-            this.accessory
-              .getService(this.Service.ContactSensor)
+            this.accessory.getService(this.Service.ContactSensor)
               .updateCharacteristic(this.Characteristic.ContactSensorState, params.lock)
             if (params.updateSource && !this.disableDeviceLogging) {
               this.log('[%s] current state [contact%s detected].', this.accessory.displayName, params.lock === 0 ? '' : ' not')
             }
             this.accessory.eveService.addEntry({ status: params.lock })
             if (params.lock === 1) {
-              this.accessory.getService(this.Service.ContactSensor).updateCharacteristic(
-                this.eveLastActivation,
-                Math.round(new Date().valueOf() / 1000) - this.accessory.eveService.getInitialTime()
-              )
+              this.accessory.getService(this.Service.ContactSensor)
+                .updateCharacteristic(
+                  this.eveLastActivation,
+                  Math.round(new Date().valueOf() / 1000) - this.accessory.eveService.getInitialTime()
+                )
             }
           }
           break

From a1bbd8e98083bb6e715cea722140a23bb693f28a Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 11 Jan 2021 16:07:10 +0000
Subject: [PATCH 1141/3183] remove maximums

---
 config.schema.json | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 6a84087a..06f72f21 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -93,10 +93,9 @@
       "inUsePowerThreshold": {
         "type": "number",
         "title": "Outlet 'In Use' Threshold",
-        "description": "HomeKit will set the 'In Use' status of outlet devices to true when the wattage is above this number. Must be between 0 and 100.",
+        "description": "HomeKit will set the 'In Use' status of outlet devices to true when the wattage is above this number. Must be 0 or more.",
         "placeholder": 0,
-        "minimum": 0,
-        "maximum": 100
+        "minimum": 0
       },
       "hideLightFromFan": {
         "type": "string",
@@ -135,18 +134,16 @@
       "lowBattThreshold": {
         "type": "number",
         "title": "Low Battery Threshold",
-        "description": "HomeKit will set the low battery status for supported devices when the device battery reaches this percentage level. Must be between 5 and 50.",
+        "description": "HomeKit will set the low battery status for supported devices when the device battery reaches this percentage level. Must be 5 or more.",
         "placeholder": 25,
-        "minimum": 5,
-        "maximum": 50
+        "minimum": 5
       },
       "sensorTimeDifference": {
         "type": "number",
         "title": "Sensor Lag",
-        "description": "An offset in seconds to ignore any notifications if they is a delay between a sensor detecting something and the plugin receiving the notification. This setting applies to sensors connected to RF/Zigbee Bridges. Must be between 10 and 300.",
+        "description": "An offset in seconds to ignore any notifications if they is a delay between a sensor detecting something and the plugin receiving the notification. This setting applies to sensors connected to RF/Zigbee Bridges. Must be 10 or more.",
         "placeholder": 120,
-        "minimum": 10,
-        "maximum": 300
+        "minimum": 10
       },
       "hideZBLDPress": {
         "title": "Zigbee Button Hide Double/Long Press",
@@ -276,13 +273,12 @@
             "operationTime": {
               "type": "number",
               "title": "Operation Time (Deciseconds)",
-              "description": "Blinds/garage doors: the time to open/close the device. Locks: the time to show as unlocked. This setting is in deciseconds - count the time in seconds and multiply by 10, for example 75 for 7.5 seconds. Must be between 20 and 600.",
+              "description": "Blinds/garage doors: the time to open/close the device. Locks: the time to show as unlocked. This setting is in deciseconds - count the time in seconds and multiply by 10, for example 75 for 7.5 seconds. Must be 20 or more.",
               "condition": {
                 "functionBody": "return (model.groups[arrayIndices] && !['tap', 'tap_two', 'valve', 'valve_two', 'valve_four', 'switch_valve'].includes(model.groups[arrayIndices].type))"
               },
               "placeholder": 100,
-              "minimum": 10,
-              "maximum": 600
+              "minimum": 20
             },
             "sensorId": {
               "type": "string",
@@ -357,10 +353,9 @@
             "sensorTimeLength": {
               "type": "number",
               "title": "Sensor Time Length",
-              "description": "The number of seconds which the sensor tile in the Home app will light up for if this sensor is activated. Must be between 1 and 300.",
+              "description": "The number of seconds which the sensor tile in the Home app will light up for if this sensor is activated. Must be 1 or more.",
               "placeholder": 60,
-              "minimum": 1,
-              "maximum": 300
+              "minimum": 1
             }
           }
         }

From 0592ced089c3183f8ace412fe6b30f77496b28bc Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 11 Jan 2021 22:11:18 +0000
Subject: [PATCH 1142/3183] better code formatting

---
 lib/connection/http.js      | 136 ++++++++++++++++++-----------------
 lib/connection/lan.js       |  33 +++++----
 lib/connection/ws.js        |  79 +++++++++++++--------
 lib/homebridge-ui/server.js |   7 +-
 lib/index.js                | 138 ++++++++++++++++++++----------------
 5 files changed, 219 insertions(+), 174 deletions(-)

diff --git a/lib/connection/http.js b/lib/connection/http.js
index c5f061b4..7a580697 100644
--- a/lib/connection/http.js
+++ b/lib/connection/http.js
@@ -39,16 +39,21 @@ module.exports = class connectionHTTP {
       dataToSign = this.crypto.createHmac('sha256', this.helpers.appSecret).update(dataToSign).digest('base64')
 
       // *** Log the data depending on the debug setting *** \\
-      if (this.debug) this.log('Sending HTTP getHost() request.')
+      if (this.debug) {
+        this.log('Sending HTTP getHost() request.')
+      }
 
       // *** Send the request *** \\
-      const res = await this.axios.get('https://api.coolkit.cc:8080/api/user/region', {
-        headers: {
-          Authorization: 'Sign ' + dataToSign,
-          'Content-Type': 'application/json'
-        },
-        params
-      })
+      const res = await this.axios.get(
+        'https://api.coolkit.cc:8080/api/user/region',
+        {
+          headers: {
+            Authorization: 'Sign ' + dataToSign,
+            'Content-Type': 'application/json'
+          },
+          params
+        }
+      )
 
       // *** Parse the response *** \\
       const body = res.data
@@ -67,7 +72,9 @@ module.exports = class connectionHTTP {
         default:
           throw new Error('No valid region received - [' + body.region + '].')
       }
-      if (this.debug) this.log('HTTP API host received [%s].', this.httpHost)
+      if (this.debug) {
+        this.log('HTTP API host received [%s].', this.httpHost)
+      }
     } catch (err) {
       if (this.helpers.hasProperty(err, 'code') && this.helpers.httpRetryCodes.includes(err.code)) {
         // *** Retry if another attempt could be successful *** \\
@@ -82,7 +89,9 @@ module.exports = class connectionHTTP {
 
   async login () {
     // *** Used to log the user in and obtain the user api key and token *** \\
-    if (this.httpHost === undefined) this.httpHost = 'eu-apia.coolkit.cc'
+    if (this.httpHost === undefined) {
+      this.httpHost = 'eu-apia.coolkit.cc'
+    }
     const data = {
       countryCode: this.cCode,
       password: this.password
@@ -94,28 +103,29 @@ module.exports = class connectionHTTP {
     }
 
     // *** Log the data depending on the debug setting *** \\
-    if (this.debug) this.log('Sending HTTP login() request.')
+    if (this.debug) {
+      this.log('Sending HTTP login() request.')
+    }
 
     // *** Set up the request signature *** \\
     const dataToSign = this.crypto.createHmac('sha256', this.helpers.appSecret).update(JSON.stringify(data)).digest('base64')
 
     // *** Send the request *** \\
-    const res = await this.axios.post('https://' + this.httpHost + '/v2/user/login', data, {
-      headers: {
-        Authorization: 'Sign ' + dataToSign,
-        'Content-Type': 'application/json',
-        'X-CK-Appid': this.helpers.appId,
-        'X-CK-Nonce': Math.random().toString(36).substr(2, 8)
+    const res = await this.axios.post(
+      'https://' + this.httpHost + '/v2/user/login', data,
+      {
+        headers: {
+          Authorization: 'Sign ' + dataToSign,
+          'Content-Type': 'application/json',
+          'X-CK-Appid': this.helpers.appId,
+          'X-CK-Nonce': Math.random().toString(36).substr(2, 8)
+        }
       }
-    })
+    )
+
     // *** Parse the response *** \\
     const body = res.data
-    if (
-      this.helpers.hasProperty(body, 'error') &&
-      body.error === 10004 &&
-      this.helpers.hasProperty(body, 'data') &&
-      this.helpers.hasProperty(body.data, 'region')
-    ) {
+    if (body.error === 10004 && body.data && body.data.region) {
       // *** In this case the user has been given a different region so retry login *** \\
       const givenRegion = body.data.region
       switch (givenRegion) {
@@ -130,7 +140,9 @@ module.exports = class connectionHTTP {
         default:
           throw new Error('No valid region received - [' + givenRegion + '].')
       }
-      if (this.debug) this.log('New HTTP API host received [%s].', this.httpHost)
+      if (this.debug) {
+        this.log('New HTTP API host received [%s].', this.httpHost)
+      }
       return await this.login()
     } else {
       if (body.data.at) {
@@ -159,23 +171,24 @@ module.exports = class connectionHTTP {
     // *** Used to get a user's device list *** \\
     try {
       // *** Send the request *** \\
-      const res = await this.axios.get('https://' + this.httpHost + '/v2/device/thing', {
-        headers: {
-          Authorization: 'Bearer ' + this.aToken,
-          'Content-Type': 'application/json',
-          'X-CK-Appid': this.helpers.appId,
-          'X-CK-Nonce': Math.random().toString(36).substr(2, 8)
-        },
-        params: { num: 0 }
-      })
+      const res = await this.axios.get(
+        'https://' + this.httpHost + '/v2/device/thing',
+        {
+          headers: {
+            Authorization: 'Bearer ' + this.aToken,
+            'Content-Type': 'application/json',
+            'X-CK-Appid': this.helpers.appId,
+            'X-CK-Nonce': Math.random().toString(36).substr(2, 8)
+          },
+          params: {
+            num: 0
+          }
+        }
+      )
 
       // *** Parse the response *** \\
       const body = res.data
-      if (
-        !this.helpers.hasProperty(body, 'data') ||
-        !this.helpers.hasProperty(body, 'error') ||
-        (this.helpers.hasProperty(body, 'error') && body.error !== 0)
-      ) {
+      if (!body.data || body.error !== 0) {
         throw new Error(JSON.stringify(body, null, 2))
       }
 
@@ -185,12 +198,7 @@ module.exports = class connectionHTTP {
       if (body.data.thingList && body.data.thingList.length > 0) {
         body.data.thingList.forEach(d => {
           // *** Check each item is a device and also remove any devices the user has ignored *** \\
-          if (
-            this.helpers.hasProperty(d, 'itemData') &&
-            this.helpers.hasProperty(d.itemData, 'extra') &&
-            this.helpers.hasProperty(d.itemData.extra, 'uiid') &&
-            !this.ignoredDevices.includes(d.itemData.deviceid)
-          ) {
+          if (d.itemData && d.itemData.extra && d.itemData.extra.uiid && !this.ignoredDevices.includes(d.itemData.deviceid)) {
             // *** Separate the sensors as these need to be set up last *** \\
             if (d.itemData.extra.uiid === 102) {
               sensorList.push(d.itemData)
@@ -204,7 +212,7 @@ module.exports = class connectionHTTP {
       // *** Sensors need to go last as they update garages that need to exist already *** \\
       return deviceList.concat(sensorList)
     } catch (err) {
-      if (this.helpers.hasProperty(err, 'code') && this.helpers.httpRetryCodes.includes(err.code)) {
+      if (err.code && this.helpers.httpRetryCodes.includes(err.code)) {
         // *** Retry if another attempt could be successful *** \\
         this.log.warn('Unable to reach eWeLink. Retrying in 30 seconds.')
         await this.helpers.sleep(30000)
@@ -219,27 +227,27 @@ module.exports = class connectionHTTP {
     // *** Used to get info about a specific device *** \\
     try {
       // *** Send the request *** \\
-      const res = await this.axios.post('https://' + this.httpHost + '/v2/device/thing', {
-        thingList: [{
-          itemType: 1,
-          id: deviceId
-        }]
-      }, {
-        headers: {
-          Authorization: 'Bearer ' + this.aToken,
-          'Content-Type': 'application/json',
-          'X-CK-Appid': this.helpers.appId,
-          'X-CK-Nonce': Math.random().toString(36).substr(2, 8)
+      const res = await this.axios.post(
+        'https://' + this.httpHost + '/v2/device/thing',
+        {
+          thingList: [{
+            itemType: 1,
+            id: deviceId
+          }]
+        },
+        {
+          headers: {
+            Authorization: 'Bearer ' + this.aToken,
+            'Content-Type': 'application/json',
+            'X-CK-Appid': this.helpers.appId,
+            'X-CK-Nonce': Math.random().toString(36).substr(2, 8)
+          }
         }
-      })
+      )
 
       // *** Parse the response *** \\
       const body = res.data
-      if (
-        !this.helpers.hasProperty(body, 'data') ||
-        !this.helpers.hasProperty(body, 'error') ||
-        (this.helpers.hasProperty(body, 'error') && body.error !== 0)
-      ) {
+      if (!body.data || body.error !== 0) {
         throw new Error(JSON.stringify(body, null, 2))
       }
       if (body.data.thingList && body.data.thingList.length === 1) {
@@ -249,7 +257,7 @@ module.exports = class connectionHTTP {
         throw new Error('device not found in eWeLink')
       }
     } catch (err) {
-      if (this.helpers.hasProperty(err, 'code') && this.helpers.httpRetryCodes.includes(err.code)) {
+      if (err.code && this.helpers.httpRetryCodes.includes(err.code)) {
         // *** Retry if another attempt could be successful *** \\
         this.log.warn('Unable to reach eWeLink. Retrying in 30 seconds.')
         await this.helpers.sleep(30000)
diff --git a/lib/connection/lan.js b/lib/connection/lan.js
index ffd4b316..6d5d0fda 100644
--- a/lib/connection/lan.js
+++ b/lib/connection/lan.js
@@ -15,7 +15,9 @@ module.exports = class connectionLAN {
 
     // *** Create a template map with our device list from the HTTP client *** \\
     devices.forEach(device => {
-      if (!this.helpers.devicesLAN.includes(device.extra.uiid)) return
+      if (!this.helpers.devicesLAN.includes(device.extra.uiid)) {
+        return
+      }
       this.deviceMap.set(device.deviceid, {
         apiKey: device.devicekey,
         ip: this.ipOverride[device.deviceid]
@@ -25,7 +27,9 @@ module.exports = class connectionLAN {
 
   async getHosts () {
     // *** Perform an initial discovery of devices on the local network *** \\
-    const res = await this.dns.discover({ name: '_ewelink._tcp.local' })
+    const res = await this.dns.discover({
+      name: '_ewelink._tcp.local'
+    })
 
     // *** Update the device map for each device found on the local network *** \\
     res.forEach(device => {
@@ -48,9 +52,10 @@ module.exports = class connectionLAN {
     // *** Function to parse DNS packets picked up by node-dns-sd *** \\
     this.dns.ondata = packet => {
       try {
-        if (!packet.answers) return
-        packet.answers
-          .filter(value => value.name.includes('_ewelink._tcp.local'))
+        if (!packet.answers) {
+          return
+        }
+        packet.answers.filter(value => value.name.includes('_ewelink._tcp.local'))
           .filter(value => value.type === 'TXT')
           .filter(value => this.deviceMap.has(value.rdata.id))
           .forEach(value => {
@@ -60,13 +65,11 @@ module.exports = class connectionLAN {
             const deviceInfo = this.deviceMap.get(rdata.id)
 
             // *** Skip the update if it's a duplicate *** \\
-            if (deviceInfo.lastIV === rdata.iv) return
+            if (deviceInfo.lastIV === rdata.iv) {
+              return
+            }
             deviceInfo.lastIV = rdata.iv
-            const data =
-            rdata.data1 +
-            (this.helpers.hasProperty(rdata, 'data2') ? rdata.data2 : '') +
-            (this.helpers.hasProperty(rdata, 'data3') ? rdata.data3 : '') +
-            (this.helpers.hasProperty(rdata, 'data4') ? rdata.data4 : '')
+            const data = rdata.data1 + (rdata.data2 || '') + (rdata.data3 || '') + (rdata.data4 || '')
             const key = this.crypto.createHash('md5').update(Buffer.from(deviceInfo.apiKey, 'utf8')).digest()
             const dText = this.crypto.createDecipheriv('aes-128-cbc', key, Buffer.from(rdata.iv, 'base64'))
             const pText = Buffer.concat([dText.update(Buffer.from(data, 'base64')), dText.final()]).toString('utf8')
@@ -129,10 +132,10 @@ module.exports = class connectionLAN {
       const params = {}
 
       // *** For now only /switch and /switches are supported *** \\
-      if (this.helpers.hasProperty(json.params, 'switches')) {
+      if (json.params.switches) {
         params.switches = json.params.switches
         suffix = 'switches'
-      } else if (this.helpers.hasProperty(json.params, 'switch')) {
+      } else if (json.params.switch) {
         params.switch = json.params.switch
         suffix = 'switch'
       } else {
@@ -197,6 +200,8 @@ module.exports = class connectionLAN {
   async closeConnection () {
     // *** This is called when Homebridge is shutdown *** \\
     await this.dns.stopMonitoring()
-    if (this.debug) this.log('LAN monitoring gracefully stopped.')
+    if (this.debug) {
+      this.log('LAN monitoring gracefully stopped.')
+    }
   }
 }
diff --git a/lib/connection/ws.js b/lib/connection/ws.js
index a514f582..a92c0c44 100644
--- a/lib/connection/ws.js
+++ b/lib/connection/ws.js
@@ -32,10 +32,12 @@ module.exports = class connectionWS {
       if (!body.domain) {
         throw new Error('Server did not respond with a web socket host.')
       }
-      if (this.debug) this.log('Web socket host received [%s].', body.domain)
+      if (this.debug) {
+        this.log('Web socket host received [%s].', body.domain)
+      }
       this.wsHost = body.domain
     } catch (err) {
-      if (this.helpers.hasProperty(err, 'code') && this.helpers.httpRetryCodes.includes(err.code)) {
+      if (err.code && this.helpers.httpRetryCodes.includes(err.code)) {
         this.log.warn('Unable to reach eWeLink. Retrying in 30 seconds.')
         await this.helpers.sleep(30000)
         return await this.getHost()
@@ -46,14 +48,17 @@ module.exports = class connectionWS {
   }
 
   login () {
-    this.wsp = new (require('websocket-as-promised'))('wss://' + this.wsHost + ':8080/api/ws', {
-      createWebSocket: url => new (require('ws'))(url),
-      extractMessageData: event => event,
-      attachRequestId: (data, requestId) => Object.assign({ sequence: requestId }, data),
-      extractRequestId: data => data && data.sequence,
-      packMessage: data => JSON.stringify(data),
-      unpackMessage: data => data === 'pong' ? data : JSON.parse(data)
-    })
+    this.wsp = new (require('websocket-as-promised'))(
+      'wss://' + this.wsHost + ':8080/api/ws',
+      {
+        createWebSocket: url => new (require('ws'))(url),
+        extractMessageData: event => event,
+        attachRequestId: (data, requestId) => Object.assign({ sequence: requestId }, data),
+        extractRequestId: data => data && data.sequence,
+        packMessage: data => JSON.stringify(data),
+        unpackMessage: data => data === 'pong' ? data : JSON.parse(data)
+      }
+    )
     this.wsp.open()
     this.wsp.onOpen.addListener(async () => {
       this.wsIsOpen = true
@@ -69,41 +74,48 @@ module.exports = class connectionWS {
         userAgent: 'app',
         version: 8
       }
-      if (this.debug) this.log('Sending WS login request.')
+      if (this.debug) {
+        this.log('Sending WS login request.')
+      }
       try {
         const res = await this.wsp.sendRequest(payload, { requestId: sequence })
-        if (this.helpers.hasProperty(res, 'config') && res.config.hb && res.config.hbInterval) {
-          if (this.hbInterval) clearInterval(this.hbInterval)
+        if (res.config && res.config.hb && res.config.hbInterval) {
+          if (this.hbInterval) {
+            clearInterval(this.hbInterval)
+          }
           this.hbInterval = setInterval(() => {
             try {
               this.wsp.send('ping')
             } catch (err) {
-              if (this.debug) this.log.warn('Error sending ping - %.', err.message)
+              if (this.debug) {
+                this.log.warn('Error sending ping - %.', err.message)
+              }
             }
           }, (res.config.hbInterval + 7) * 1000)
         } else {
           throw new Error('Unknown parameters received\n' + JSON.stringify(res, null, 2))
         }
       } catch (err) {
-        this.log.warn('WS login failed [%s].', this.debug ? err : err.message)
+        this.log.warn('WS login failed as %s.', this.debug ? err : err.message)
       }
     })
     this.wsp.onUnpackedMessage.addListener(device => {
-      if (device === 'pong') return
+      if (device === 'pong') {
+        return
+      }
       let onlineStatus = true
-      if (!this.helpers.hasProperty(device, 'params')) device.params = {}
-      if (this.helpers.hasProperty(device, 'deviceid') && this.helpers.hasProperty(device, 'error')) {
+      if (!device.params) {
+        device.params = {}
+      }
+      if (device.deviceid && this.helpers.hasProperty(device, 'error')) {
         device.action = 'update'
         onlineStatus = device.error === 0
         if (device.error !== 0) {
-          this.log.warn(
-            '[%s] WS message received.\n%s',
-            device.deviceid,
-            JSON.stringify(device, null, 2).replace(this.apiKey, '**hidden**')
-          )
+          const redacted = JSON.stringify(device, null, 2).replace(this.apiKey, '**hidden**')
+          this.log.warn('[%s] WS message received.\n%s', device.deviceid, redacted)
         }
       }
-      if (this.helpers.hasProperty(device, 'action')) {
+      if (device.action) {
         switch (device.action) {
           case 'update':
           case 'sysmsg':
@@ -145,9 +157,11 @@ module.exports = class connectionWS {
         this.hbInterval = null
       }
       this.wsp.removeAllListeners()
-      if (e === 1005) return
+      if (e === 1005) {
+        return
+      }
       if (this.debug) {
-        this.log.warn('Web socket closed - [%s].', e)
+        this.log.warn('Web socket closed - %s.', e)
         this.log.warn('Web socket will try to reconnect in five seconds.')
       }
       await this.helpers.sleep(5000)
@@ -161,7 +175,7 @@ module.exports = class connectionWS {
       }
       this.wsp.removeAllListeners()
       if (this.debug) {
-        this.log.warn('Web socket error - [%s].', e)
+        this.log.warn('Web socket error - %s.', e)
         this.log.warn('Web socket will try to reconnect in five seconds.')
       }
       await this.helpers.sleep(5000)
@@ -191,8 +205,7 @@ module.exports = class connectionWS {
             throw new Error('Unknown response')
         }
       } catch (err) {
-        const msg = this.debug ? err : err.message
-        return new Error('device update failed as ' + msg)
+        return new Error('device update failed as ' + this.debug ? err : err.message)
       }
     } else {
       this.log.warn('Request will be sent when WS has reconnected.')
@@ -212,7 +225,9 @@ module.exports = class connectionWS {
       ts: 0,
       userAgent: 'app'
     }
-    if (this.debug) this.log('[%s] requesting current status.', accessory.displayName)
+    if (this.debug) {
+      this.log('[%s] requesting current status.', accessory.displayName)
+    }
     if (this.wsp && this.wsIsOpen) {
       this.wsp.send(JSON.stringify(json))
     } else {
@@ -229,7 +244,9 @@ module.exports = class connectionWS {
   async closeConnection () {
     if (this.wsp && this.wsIsOpen) {
       await this.wsp.close()
-      if (this.debug) this.log('Web socket gracefully closed.')
+      if (this.debug) {
+        this.log('Web socket gracefully closed.')
+      }
     }
   }
 }
diff --git a/lib/homebridge-ui/server.js b/lib/homebridge-ui/server.js
index 69fb128a..a84891f0 100644
--- a/lib/homebridge-ui/server.js
+++ b/lib/homebridge-ui/server.js
@@ -1,3 +1,5 @@
+/* jshint -W014, -W033, esversion: 9 */
+/* eslint-disable new-cap */
 const { HomebridgePluginUiServer } = require('@homebridge/plugin-ui-utils')
 const fs = require('fs')
 
@@ -9,8 +11,7 @@ class PluginUiServer extends HomebridgePluginUiServer {
         const devicesToReturn = []
         let cachedAccessories = await fs.promises.readFile(this.homebridgeStoragePath + '/accessories/cachedAccessories')
         cachedAccessories = JSON.parse(cachedAccessories)
-        cachedAccessories
-          .filter(accessory => accessory.plugin === 'homebridge-ewelink')
+        cachedAccessories.filter(accessory => accessory.plugin === 'homebridge-ewelink')
           .sort((a, b) => {
             return a.displayName.toLowerCase() > b.displayName.toLowerCase()
               ? 1
@@ -25,7 +26,7 @@ class PluginUiServer extends HomebridgePluginUiServer {
             })
           })
         return devicesToReturn
-      } catch {
+      } catch (err) {
         return []
       }
     })
diff --git a/lib/index.js b/lib/index.js
index 35343d05..ddb595ed 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -6,7 +6,9 @@ class eWeLinkPlatform {
     this.version = require('./../package.json').version
 
     // *** Disable the plugin if not configured correctly *** \\
-    if (!log || !api) return
+    if (!log || !api) {
+      return
+    }
     if (!config || !config.username || !config.password || !config.countryCode) {
       log.warn('*** Disabling plugin [v%s] ***', this.version)
       log.warn('*** eWeLink credentials missing from configuration ***')
@@ -38,9 +40,8 @@ class eWeLinkPlatform {
     if (Array.isArray(config.ipOverride)) config.ipOverride.forEach(x => (this.ipOverride[x.deviceId] = x.deviceIP))
 
     // *** Set up Homebridge API events *** \\
-    this.api
-      .on('didFinishLaunching', this.eWeLinkSetup.bind(this))
-      .on('shutdown', this.eWeLinkShutdown.bind(this))
+    this.api.on('didFinishLaunching', this.eWeLinkSetup.bind(this))
+    this.api.on('shutdown', this.eWeLinkShutdown.bind(this))
   }
 
   async eWeLinkSetup () {
@@ -105,8 +106,12 @@ class eWeLinkPlatform {
       this.devicesInEW.forEach(device => this.initialiseDevice(device))
 
       // *** Set up the WS and LAN listener for device updates *** \\
-      if (this.wsClient) this.wsClient.receiveUpdate(device => this.receiveDeviceUpdate(device))
-      if (this.lanClient) this.lanClient.receiveUpdate(device => this.receiveDeviceUpdate(device))
+      if (this.wsClient) {
+        this.wsClient.receiveUpdate(device => this.receiveDeviceUpdate(device))
+      }
+      if (this.lanClient) {
+        this.lanClient.receiveUpdate(device => this.receiveDeviceUpdate(device))
+      }
 
       // *** Refresh the WS connection every 60 minutes *** \\
       if (this.wsClient) {
@@ -314,9 +319,7 @@ class eWeLinkPlatform {
         ********************/
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
-          : this.addAccessory(device, device.deviceid + 'SWX', false, {
-            sensorType: device.params.sensorType
-          })
+          : this.addAccessory(device, device.deviceid + 'SWX', false, { sensorType: device.params.sensorType })
         accessory.control = (this.config.thAsThermostat || '').split(',').includes(device.deviceid)
           ? new (require('./device/th-thermo'))(this, accessory)
           : new (require('./device/th-outlet'))(this, accessory)
@@ -400,14 +403,15 @@ class eWeLinkPlatform {
             if (this.devicesInHB.has(device.deviceid + 'SW' + i)) {
               this.removeAccessory(this.devicesInHB.get(device.deviceid + 'SW' + i))
             }
-            if (i === 0) this.hiddenMasters.push(device.deviceid)
+            if (i === 0) {
+              this.hiddenMasters.push(device.deviceid)
+            }
             oAccessory = this.addAccessory(device, device.deviceid + 'SW' + i, true)
           } else {
             oAccessory = this.devicesInHB.has(device.deviceid + 'SW' + i)
               ? this.devicesInHB.get(device.deviceid + 'SW' + i)
               : this.addAccessory(device, device.deviceid + 'SW' + i)
-            oAccessory
-              .getService(this.Service.AccessoryInformation)
+            oAccessory.getService(this.Service.AccessoryInformation)
               .setCharacteristic(this.Characteristic.FirmwareRevision, device.params.fwVersion || this.version)
           }
           oAccessory.context.reachableWAN = device.online
@@ -423,7 +427,9 @@ class eWeLinkPlatform {
           oAccessory.control = new (require('./device/switch-multi'))(this, oAccessory)
           this.api.updatePlatformAccessories('homebridge-ewelink', 'eWeLink', [oAccessory])
           this.devicesInHB.set(oAccessory.context.hbDeviceId, oAccessory)
-          if (i === 0) accessory = oAccessory
+          if (i === 0) {
+            accessory = oAccessory
+          }
         }
         /**********************/
       } else if (this.helpers.devicesRFBridge.includes(device.extra.uiid)) {
@@ -443,9 +449,7 @@ class eWeLinkPlatform {
         }
         accessory = this.devicesInHB.has(device.deviceid + 'SW0')
           ? this.devicesInHB.get(device.deviceid + 'SW0')
-          : this.addAccessory(device, device.deviceid + 'SW0', true, {
-            rfMap
-          }, 'rf_pri')
+          : this.addAccessory(device, device.deviceid + 'SW0', true, { rfMap }, 'rf_pri')
         accessory.control = new (require('./device/rf-bridge'))(this, accessory)
         this.hiddenMasters.push(device.deviceid)
         rfMap.forEach(subDevice => {
@@ -488,8 +492,7 @@ class eWeLinkPlatform {
           oAccessory = this.devicesInHB.has(device.deviceid + 'SW' + swNumber)
             ? this.devicesInHB.get(device.deviceid + 'SW' + swNumber)
             : this.addAccessory(device, device.deviceid + 'SW' + swNumber, false, subExtraContext, 'rf_sub')
-          oAccessory
-            .getService(this.Service.AccessoryInformation)
+          oAccessory.getService(this.Service.AccessoryInformation)
             .setCharacteristic(this.Characteristic.FirmwareRevision, device.params.fwVersion || this.version)
           oAccessory.context.reachableWAN = device.online
           oAccessory.context.reachableLAN = false
@@ -545,8 +548,7 @@ class eWeLinkPlatform {
 
       // *** Update the current firmware version *** \\
       if (!this.hiddenMasters.includes(device.deviceid)) {
-        accessory
-          .getService(this.Service.AccessoryInformation)
+        accessory.getService(this.Service.AccessoryInformation)
           .setCharacteristic(this.Characteristic.FirmwareRevision, device.params.fwVersion || this.version)
       }
 
@@ -572,7 +574,9 @@ class eWeLinkPlatform {
           : 'LAN mode unavailable as not supported'
 
       // *** Update accessory characteristics with latest values *** \\
-      if (this.wsClient) accessory.control.externalUpdate(device.params)
+      if (this.wsClient) {
+        accessory.control.externalUpdate(device.params)
+      }
 
       // *** Update any changes to the device into our devicesInHB map *** \\
       this.api.updatePlatformAccessories('homebridge-ewelink', 'eWeLink', [accessory])
@@ -580,43 +584,40 @@ class eWeLinkPlatform {
       this.log('[%s] initialised and %s.', device.name, str)
     } catch (err) {
       // *** Catch errors at any point during device initialisation *** \\
-      const deviceName = accessory && this.helpers.hasProperty(accessory, 'displayName')
-        ? accessory.displayName
-        : device.name
-      this.log.warn('[%s] could not be initialised as %s.', deviceName, this.debug ? err : err.message)
+      this.log.warn('[%s] could not be initialised as %s.', device.name, this.debug ? err : err.message)
     }
   }
 
   addAccessory (device, hbDeviceId, hidden = false, extraContext = {}, type = '') {
-    // *** Get the switchNumber which can be {X, 0, 1, 2, 3, 4, ...} *** \\
-    const switchNumber = hbDeviceId.split('SW')[1].toString()
-
-    // *** Set up the device name which can depend on the accessory type *** \\
-    let newDeviceName = type === 'rf_sub' ? extraContext.name : device.name
-    const channelCount = type === 'rf_pri'
-      ? Object.keys((device.tags && device.tags.zyx_info) || []).length
-      : this.helpers.chansFromUiid[device.extra.uiid]
-    if (['1', '2', '3', '4'].includes(switchNumber) && type !== 'rf_sub') {
-      if (
-        this.helpers.hasProperty(device, 'tags') &&
-        this.helpers.hasProperty(device.tags, 'ck_channel_name') &&
-        device.tags.ck_channel_name[parseInt(switchNumber) - 1]
-      ) {
-        newDeviceName = device.tags.ck_channel_name[parseInt(switchNumber) - 1]
-      } else {
-        newDeviceName += ' SW' + switchNumber
+    let newDeviceName
+    try {
+      // *** Get the switchNumber which can be {X, 0, 1, 2, 3, 4, ...} *** \\
+      const switchNumber = hbDeviceId.split('SW')[1].toString()
+
+      // *** Set up the device name which can depend on the accessory type *** \\
+      newDeviceName = type === 'rf_sub' ? extraContext.name : device.name
+      const channelCount = type === 'rf_pri'
+        ? Object.keys((device.tags && device.tags.zyx_info) || []).length
+        : this.helpers.chansFromUiid[device.extra.uiid]
+      if (['1', '2', '3', '4'].includes(switchNumber) && type !== 'rf_sub') {
+        if (
+          this.helpers.hasProperty(device, 'tags') &&
+          this.helpers.hasProperty(device.tags, 'ck_channel_name') &&
+          device.tags.ck_channel_name[parseInt(switchNumber) - 1]
+        ) {
+          newDeviceName = device.tags.ck_channel_name[parseInt(switchNumber) - 1]
+        } else {
+          newDeviceName += ' SW' + switchNumber
+        }
+      }
+      if (this.helpers.hasProperty(this.nameOverride, hbDeviceId)) {
+        newDeviceName = this.nameOverride[hbDeviceId]
       }
-    }
-    if (this.helpers.hasProperty(this.nameOverride, hbDeviceId)) {
-      newDeviceName = this.nameOverride[hbDeviceId]
-    }
 
-    // *** Add the new accessory to Homebridge *** \\
-    try {
-      const accessory = new this.api.platformAccessory(newDeviceName, this.api.hap.uuid.generate(hbDeviceId).toString())
+      // *** Add the new accessory to Homebridge *** \\
+      const accessory = new this.api.platformAccessory(newDeviceName, this.api.hap.uuid.generate(hbDeviceId))
       if (!hidden) {
-        accessory
-          .getService(this.Service.AccessoryInformation)
+        accessory.getService(this.Service.AccessoryInformation)
           .setCharacteristic(this.Characteristic.SerialNumber, hbDeviceId)
           .setCharacteristic(this.Characteristic.Manufacturer, device.brandName)
           .setCharacteristic(this.Characteristic.Model, device.productModel + ' (' + device.extra.model + ')')
@@ -624,7 +625,7 @@ class eWeLinkPlatform {
           .setCharacteristic(this.Characteristic.Identify, true)
         accessory.on('identify', (paired, callback) => {
           callback()
-          this.log('[%s] - identify button pressed.', accessory.displayName)
+          this.log('[%s] identify button pressed.', accessory.displayName)
         })
       }
 
@@ -651,15 +652,17 @@ class eWeLinkPlatform {
       // *** Return the new accessory *** \\
       return accessory
     } catch (err) {
-      // *** Add helpful context values to the accessory *** \\
-      this.log.warn('[%s] could not be added as %s.', newDeviceName, err)
+      // *** Catch any errors whilst trying to add the accessory *** \\
+      this.log.warn('[%s] could not be added to Homebridge as %s.', newDeviceName, err)
       return false
     }
   }
 
   configureAccessory (accessory) {
     // *** Function is called for each device on HB start *** \\
-    if (!this.log) return
+    if (!this.log) {
+      return
+    }
 
     // *** Add each cached device to our devicesInHB map *** \\
     this.devicesInHB.set(accessory.context.hbDeviceId, accessory)
@@ -670,9 +673,9 @@ class eWeLinkPlatform {
       // *** Unregister the accessory from HB and remove it from our devicesInHB map *** \\
       this.api.unregisterPlatformAccessories('homebridge-ewelink', 'eWeLink', [accessory])
       this.devicesInHB.delete(accessory.context.hbDeviceId)
-      this.log('[%s] was removed from Homebridge.', accessory.displayName)
+      this.log('[%s] has been removed from Homebridge.', accessory.displayName)
     } catch (err) {
-      this.log.warn("[%s] wasn't removed as %s.", accessory.displayName, err)
+      this.log.warn('[%s] could not removed from Homebridge as %s.', accessory.displayName, err)
     }
   }
 
@@ -703,7 +706,9 @@ class eWeLinkPlatform {
     if (res !== 'ok') {
       // *** Check to see if the device is online *** \\
       if (this.wsClient && accessory.context.reachableWAN) {
-        if (this.debug) this.log('[%s] Reverting to web socket as %s.', accessory.displayName, res)
+        if (this.debug) {
+          this.log('[%s] Reverting to web socket as %s.', accessory.displayName, res)
+        }
         await this.wsClient.sendUpdate(payload)
       } else {
         throw new Error('it is unreachable')
@@ -718,7 +723,9 @@ class eWeLinkPlatform {
 
     // *** Find our accessory for which the updates relates to *** \\
     if ((accessory = this.devicesInHB.get(deviceId + 'SWX') || this.devicesInHB.get(deviceId + 'SW0'))) {
-      if (this.debug) this.log('[%s] receiving update %s.', accessory.displayName, JSON.stringify(device.params))
+      if (this.debug) {
+        this.log('[%s] receiving update %s.', accessory.displayName, JSON.stringify(device.params))
+      }
       const isX = accessory.context.hbDeviceId.substr(-1) === 'X'
       if (device.params.updateSource === 'WS') {
         // *** The update is from WS so update the WS online/offline status *** \\
@@ -771,9 +778,14 @@ class eWeLinkPlatform {
       // *** The device does not existing in HB so let's try to add it *** \\
       try {
         // *** Check to see it doesn't exist because it's user hidden *** \\
-        if (this.ignoredDevices.includes(deviceId)) return
+        if (this.ignoredDevices.includes(deviceId)) {
+          return
+        }
 
-        if (this.debug) this.log('[%s] receiving update for new device %s.', device.name, JSON.stringify(device.params))
+        // *** Log the update if debug is set to true *** \\
+        if (this.debug) {
+          this.log('[%s] receiving update for new device %s.', device.name, JSON.stringify(device.params))
+        }
 
         // *** Obtain full device information from the HTTP API *** \\
         const newDevice = await this.httpClient.getDevice(deviceId)
@@ -796,7 +808,9 @@ class eWeLinkPlatform {
     this.log.warn('[%s] device update failed as %s.', accessory.displayName, err.message)
 
     // *** We only request a device refresh on failed internal updates (ie with 'set' handlers) *** \\
-    if (!requestRefresh) return
+    if (!requestRefresh) {
+      return
+    }
     if (accessory.context.reachableWAN && this.wsClient) {
       try {
         await this.wsClient.requestUpdate(accessory)

From 3ee06c2f3f869a12585f52ede2a70c0bd65b91c3 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 11 Jan 2021 22:11:46 +0000
Subject: [PATCH 1143/3183] 4.2.3-4

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d4ce0144..31263e81 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.2.3-3",
+  "version": "4.2.3-4",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 35c7ba14..18733ac6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.2.3-3",
+  "version": "4.2.3-4",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 91504c3707251112fa85b0fe905a0c0266b9968b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 12 Jan 2021 08:28:48 +0000
Subject: [PATCH 1144/3183] shutdown on error

---
 lib/index.js | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/lib/index.js b/lib/index.js
index ddb595ed..4cc1788b 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -134,18 +134,8 @@ class eWeLinkPlatform {
       this.log.warn('*** Disabling plugin [v%s] ***', this.version)
       this.log.warn(this.debug ? err : err.message)
 
-      // *** Attempt to close WS and stop LAN monitor if this has been setup *** \\
-      try {
-        if (this.lanClient) {
-          this.lanClient.closeConnection()
-        }
-        if (this.wsClient) {
-          clearInterval(this.wsRefresh)
-          this.wsClient.closeConnection()
-        }
-      } catch (err) {
-        this.log.warn(this.debug ? err : err.message)
-      }
+      // *** Call the shutdown function as plugin is disabled *** \\
+      this.eWeLinkShutdown()
     }
   }
 

From f7f3f790fe3deccaed7e721eecb4285b2b7e28aa Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 12 Jan 2021 08:28:56 +0000
Subject: [PATCH 1145/3183] deps

---
 package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 31263e81..a7ff4471 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -18,9 +18,9 @@
       }
     },
     "call-bind": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.1.tgz",
-      "integrity": "sha512-tvAvUwNcRikl3RVF20X9lsYmmepsovzTWeJiXjO0PkJp15uy/6xKFZOQtuiSULwYW+6ToZBprphCgWXC2dSgcQ==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
+      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
       "requires": {
         "function-bind": "^1.1.1",
         "get-intrinsic": "^1.0.2"

From 890024e0b23c6fc32f7edb24b56cd7da76ae7c80 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 12 Jan 2021 09:17:09 +0000
Subject: [PATCH 1146/3183] plugin name not reqd

---
 lib/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/index.js b/lib/index.js
index 4cc1788b..cf5d1cf6 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -809,4 +809,4 @@ class eWeLinkPlatform {
   }
 }
 
-module.exports = hb => hb.registerPlatform('homebridge-ewelink', 'eWeLink', eWeLinkPlatform)
+module.exports = hb => hb.registerPlatform('eWeLink', eWeLinkPlatform)

From 02f433fd64edca4de3b01bedcaca2b073dad8351 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 12 Jan 2021 09:20:52 +0000
Subject: [PATCH 1147/3183] 4.2.3-5

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index a7ff4471..c8fffaa6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.2.3-4",
+  "version": "4.2.3-5",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 18733ac6..62b5ffe9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.2.3-4",
+  "version": "4.2.3-5",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 1d02ff8362e8e5fea30475c723958137dbf4606d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 12 Jan 2021 13:19:19 +0000
Subject: [PATCH 1148/3183] parse user inputs better

---
 lib/connection/http.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/connection/http.js b/lib/connection/http.js
index 7a580697..0ed69e91 100644
--- a/lib/connection/http.js
+++ b/lib/connection/http.js
@@ -7,10 +7,10 @@ module.exports = class connectionHTTP {
     this.log = platform.log
     this.helpers = platform.helpers
     this.debug = platform.config.debug
-    this.username = platform.config.username.toString()
+    this.username = platform.config.username.toString().replace(/[\s]+/g, '')
     this.password = platform.config.password.toString()
     this.ignoredDevices = platform.ignoredDevices
-    this.cCode = '+' + platform.config.countryCode.toString().replace('+', '').replace(' ', '')
+    this.cCode = '+' + platform.config.countryCode.toString().replace(/[\s+]+/g, '')
     this.axios = require('axios')
     this.crypto = require('crypto')
   }

From 2fb2b9e463b6d058c17a9316bf826c46d848e705 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 12 Jan 2021 13:51:49 +0000
Subject: [PATCH 1149/3183] welcome message selection

---
 lib/index.js         | 2 +-
 lib/utils/helpers.js | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/index.js b/lib/index.js
index cf5d1cf6..6f95f6fa 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -128,7 +128,7 @@ class eWeLinkPlatform {
       }
 
       // *** Log for informative purposes *** \\
-      this.log("✓ Setup complete. Don't forget to ☆ this plugin on GitHub if you're finding it useful!")
+      this.log('✓ Setup complete. %s', this.helpers.logMessages[Math.floor(Math.random() * this.helpers.logMessages.length)])
     } catch (err) {
       // *** Catch errors at any point during setup *** \\
       this.log.warn('*** Disabling plugin [v%s] ***', this.version)
diff --git a/lib/utils/helpers.js b/lib/utils/helpers.js
index 0fee9972..c5d2f841 100644
--- a/lib/utils/helpers.js
+++ b/lib/utils/helpers.js
@@ -4,6 +4,9 @@
 module.exports = {
   sleep: ms => new Promise(resolve => setTimeout(resolve, ms)),
   hasProperty: (obj, prop) => Object.prototype.hasOwnProperty.call(obj, prop),
+  logMessages: [
+    "Don't forget to ☆ this plugin on GitHub if you're finding it useful!"
+  ],
   appId: 'oeVkj2lYFGnJu5XUtWisfW4utiN4u9Mq',
   appSecret: '6Nz4n0xA8s8qdxQf2GqurZj2Fs55FUvM',
   httpRetryCodes: ['ENOTFOUND', 'ETIMEDOUT', 'EAI_AGAIN'],

From e8ad3219d3f798b1e6b2b85f8e4dacca0602201f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 12 Jan 2021 15:28:02 +0000
Subject: [PATCH 1150/3183] logMessages

---
 lib/utils/helpers.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/utils/helpers.js b/lib/utils/helpers.js
index c5d2f841..553dcb95 100644
--- a/lib/utils/helpers.js
+++ b/lib/utils/helpers.js
@@ -5,7 +5,12 @@ module.exports = {
   sleep: ms => new Promise(resolve => setTimeout(resolve, ms)),
   hasProperty: (obj, prop) => Object.prototype.hasOwnProperty.call(obj, prop),
   logMessages: [
-    "Don't forget to ☆ this plugin on GitHub if you're finding it useful!"
+    "Don't forget to ☆ this plugin on GitHub if you're finding it useful!",
+    'Have a feature request? Visit http://bit.ly/hb-ewelink-issues. to ask!',
+    'Interested in sponsoring this plugin? https://github.com/sponsors/bwp91',
+    "Join the plugin's Discord community! https://discord.gg/cMGhNtZ3tW",
+    'Thanks for using this plugin, I hope you find it helpful!',
+    'This plugin has been made with ♥ by bwp91 from the UK!'
   ],
   appId: 'oeVkj2lYFGnJu5XUtWisfW4utiN4u9Mq',
   appSecret: '6Nz4n0xA8s8qdxQf2GqurZj2Fs55FUvM',

From 7651d4832b97efef3aa5a65aacd874ce7b286bad Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 12 Jan 2021 18:46:14 +0000
Subject: [PATCH 1151/3183] 4.3.0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c8fffaa6..1a85a72d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.2.3-5",
+  "version": "4.3.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 62b5ffe9..16575d89 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.2.3-5",
+  "version": "4.3.0",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 8cc793082dbe608f0126305350a29576c473d03d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 12 Jan 2021 19:02:18 +0000
Subject: [PATCH 1152/3183] remove OD testing

---
 lib/device/garage-eachen.js | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/lib/device/garage-eachen.js b/lib/device/garage-eachen.js
index 77d151bf..f406303a 100644
--- a/lib/device/garage-eachen.js
+++ b/lib/device/garage-eachen.js
@@ -9,9 +9,6 @@ module.exports = class deviceGarageEachen {
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
-    // testing
-    this.obstruct = (this.platform.config.obstructGarage || '').split(',').includes(accessory.context.eweDeviceId)
-    // end testing
     if (!(this.service = accessory.getService(this.Service.GarageDoorOpener))) {
       this.service = accessory.addService(this.Service.GarageDoorOpener)
       this.service.setCharacteristic(this.Characteristic.CurrentDoorState, 1)
@@ -27,11 +24,6 @@ module.exports = class deviceGarageEachen {
   async internalUpdate (value, callback) {
     try {
       callback()
-      // testing
-      if (this.obstruct) {
-        this.service.updateCharacteristic(this.Characteristic.ObstructionDetected, true)
-      }
-      // end testing
       const garageConfig = this.platform.cusG.get(this.accessory.context.eweDeviceId)
       const params = { switch: value === 0 ? 'on' : 'off' }
       if (value === this.service.getCharacteristic(this.Characteristic.CurrentDoorState).value % 2) return

From b59317689dfc5f171091cab54b7a328bb87a7f88 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 13 Jan 2021 08:39:41 +0000
Subject: [PATCH 1153/3183] Create CHANGELOG.md

---
 CHANGELOG.md | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 CHANGELOG.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 00000000..8bb7f70e
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,26 @@
+# Change Log
+
+All notable changes to this homebridge-ewelink will be documented in this file.
+
+## 4.3.0 (2021-01-12)
+
+### ⚠️ Breaking Changes
+
+* `hideDevFromHB` config option renamed to `ignoredDevices`
+  * After installing this update any hidden devices may reappear in Homebridge. Please edit your configuration directly, changing `hideDevFromHB` to `ignoredDevices`. The devices will be removed upon Homebridge restart.
+
+### New
+
+* New Accessory Simulations:
+  * 2 Taps/Faucets using a multi-channel device
+  * 4 Irrigation Valves using a multi-channel device #182 
+* New `disableDeviceLogging` config option to hide device state logging #183 
+
+### Changes
+
+* Minimum `operationTime` for associated Accessory Simulations increased to 20 (2 seconds)
+* Removal of maximum values on plugin settings screen for all `number` types
+* Changes to startup log messages
+* Adaptive lighting minimum Homebridge beta version is now beta-42
+* Backend code changes
+* Updated dependencies

From 8ad089be78e13dfba54352d99c605bdb9b07fc6a Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 13 Jan 2021 10:08:21 +0000
Subject: [PATCH 1154/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8bb7f70e..573b189c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,13 @@
 
 All notable changes to this homebridge-ewelink will be documented in this file.
 
+## BETA
+
+### Changes
+
+* Changes to plugin now in CHANGELOG.md
+* Removed `Obstruction Detected` tests
+
 ## 4.3.0 (2021-01-12)
 
 ### ⚠️ Breaking Changes

From 50e57e5d68a374602606055ee2d6a09638f9ceed Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 13 Jan 2021 13:33:46 +0000
Subject: [PATCH 1155/3183] checks + structure to AS

---
 config.schema.json          | 32 ++++++-------
 lib/device/garage-eachen.js |  4 +-
 lib/device/garage-four.js   |  4 +-
 lib/device/garage-one.js    | 92 ++++++++++++++++++++++---------------
 lib/device/garage-two.js    |  7 ++-
 lib/device/lock-one.js      | 55 ++++++++++++++++++----
 lib/device/switch-valve.js  |  4 +-
 lib/device/tap-one.js       | 48 +++++++++++++++----
 lib/device/tap-two.js       |  4 +-
 lib/device/valve-four.js    |  4 +-
 lib/device/valve-one.js     | 42 +++++++++++++++--
 lib/device/valve-two.js     |  4 +-
 lib/utils/helpers.js        |  3 +-
 13 files changed, 218 insertions(+), 85 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 06f72f21..c07b920e 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -175,27 +175,27 @@
               "description": "The new type for this device.",
               "oneOf": [
                 {
-                  "title": "1 Garage Door (using single/multi-channel device)",
+                  "title": "1 Garage Door",
                   "enum": [
                     "garage"
                   ]
                 },
                 {
-                  "title": "2 Garage Doors (using multi-channel device)",
+                  "title": "1 Garage Door (using Eachen GD-DC5)",
                   "enum": [
-                    "garage_two"
+                    "garage_eachen"
                   ]
                 },
                 {
-                  "title": "4 Garage Doors (using multi-channel device)",
+                  "title": "2 Garage Doors (using multi-channel device)",
                   "enum": [
-                    "garage_four"
+                    "garage_two"
                   ]
                 },
                 {
-                  "title": "1 Garage Door (using Eachen GD-DC5)",
+                  "title": "4 Garage Doors (using multi-channel device)",
                   "enum": [
-                    "garage_eachen"
+                    "garage_four"
                   ]
                 },
                 {
@@ -205,13 +205,13 @@
                   ]
                 },
                 {
-                  "title": "1 Lock (using single-channel device)",
+                  "title": "1 Lock",
                   "enum": [
                     "lock"
                   ]
                 },
                 {
-                  "title": "1 Tap/Faucet (using single-channel device)",
+                  "title": "1 Tap/Faucet",
                   "enum": [
                     "tap"
                   ]
@@ -223,7 +223,7 @@
                   ]
                 },
                 {
-                  "title": "1 Irrigation Valve (using single-channel device)",
+                  "title": "1 Irrigation Valve",
                   "enum": [
                     "valve"
                   ]
@@ -251,19 +251,19 @@
             "setup": {
               "type": "string",
               "title": "Device Setup",
-              "description": "The setup for your garage doors.",
+              "description": "The type of generic device being used.",
               "condition": {
-                "functionBody": "return (model.groups[arrayIndices] && model.groups[arrayIndices].type==='garage')"
+                "functionBody": "return (model.groups[arrayIndices] && ['garage', 'lock', 'tap', 'valve'].includes(model.groups[arrayIndices].type))"
               },
               "oneOf": [
                 {
-                  "title": "One Switch - for up and down",
+                  "title": "Single-Channel",
                   "enum": [
                     "oneSwitch"
                   ]
                 },
                 {
-                  "title": "Two Switches - one for up and one for down",
+                  "title": "Multi-Channel",
                   "enum": [
                     "twoSwitch"
                   ]
@@ -275,7 +275,7 @@
               "title": "Operation Time (Deciseconds)",
               "description": "Blinds/garage doors: the time to open/close the device. Locks: the time to show as unlocked. This setting is in deciseconds - count the time in seconds and multiply by 10, for example 75 for 7.5 seconds. Must be 20 or more.",
               "condition": {
-                "functionBody": "return (model.groups[arrayIndices] && !['tap', 'tap_two', 'valve', 'valve_two', 'valve_four', 'switch_valve'].includes(model.groups[arrayIndices].type))"
+                "functionBody": "return (model.groups[arrayIndices] && ['garage', 'garage_two', 'garage_four', 'garage_eachen', 'blind', 'lock'].includes(model.groups[arrayIndices].type))"
               },
               "placeholder": 100,
               "minimum": 20
@@ -283,7 +283,7 @@
             "sensorId": {
               "type": "string",
               "title": "Sensor",
-              "description": "A DW2 sensor can be used for garage doors to determine the current state. Enter the 10 digit eWeLink device ID (normally in the format 1000ab23cd). Otherwise leave blank.",
+              "description": "A DW2 sensor can be used for a single garage door to determine the current state. Enter the 10 digit eWeLink device ID (normally in the format 1000ab23cd). Otherwise leave blank.",
               "condition": {
                 "functionBody": "return (model.groups[arrayIndices] && model.groups[arrayIndices].type==='garage')"
               }
diff --git a/lib/device/garage-eachen.js b/lib/device/garage-eachen.js
index f406303a..b504d734 100644
--- a/lib/device/garage-eachen.js
+++ b/lib/device/garage-eachen.js
@@ -9,6 +9,7 @@ module.exports = class deviceGarageEachen {
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
+    this.operationTime = platform.cusG.get(accessory.context.eweDeviceId).operationTime
     if (!(this.service = accessory.getService(this.Service.GarageDoorOpener))) {
       this.service = accessory.addService(this.Service.GarageDoorOpener)
       this.service.setCharacteristic(this.Characteristic.CurrentDoorState, 1)
@@ -24,7 +25,6 @@ module.exports = class deviceGarageEachen {
   async internalUpdate (value, callback) {
     try {
       callback()
-      const garageConfig = this.platform.cusG.get(this.accessory.context.eweDeviceId)
       const params = { switch: value === 0 ? 'on' : 'off' }
       if (value === this.service.getCharacteristic(this.Characteristic.CurrentDoorState).value % 2) return
       this.inUse = true
@@ -34,7 +34,7 @@ module.exports = class deviceGarageEachen {
       await this.helpers.sleep(2000)
       this.inUse = false
       if (value === 0) {
-        await this.helpers.sleep(Math.max((garageConfig.operationTime - 20) * 100, 0))
+        await this.helpers.sleep(Math.max((this.operationTime - 20) * 100, 0))
         this.service.updateCharacteristic(this.Characteristic.CurrentDoorState, 0)
         if (!this.disableDeviceLogging) {
           this.log('[%s] current state [open].', this.accessory.displayName)
diff --git a/lib/device/garage-four.js b/lib/device/garage-four.js
index 7a0341e0..10df8abb 100644
--- a/lib/device/garage-four.js
+++ b/lib/device/garage-four.js
@@ -9,6 +9,7 @@ module.exports = class deviceGarageFour {
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
+    this.operationTime = platform.cusG.get(accessory.context.eweDeviceId).operationTime
     ;['A', 'B', 'C', 'D'].forEach(v => {
       let gdService
       if (!(gdService = accessory.getService('Garage ' + v))) {
@@ -27,7 +28,6 @@ module.exports = class deviceGarageFour {
   async internalUpdate (garage, value, callback) {
     try {
       callback()
-      const garageConfig = this.platform.cusG.get(this.accessory.context.eweDeviceId)
       let garageChannel
       switch (garage) {
         case 'A':
@@ -58,7 +58,7 @@ module.exports = class deviceGarageFour {
       await this.platform.sendDeviceUpdate(this.accessory, params)
       await this.helpers.sleep(2000)
       this.inUse = false
-      await this.helpers.sleep(Math.max((garageConfig.operationTime - 20) * 100, 0))
+      await this.helpers.sleep(Math.max((this.operationTime - 20) * 100, 0))
       if (this.updateKey !== updateKey) return
       gdService.updateCharacteristic(this.Characteristic.CurrentDoorState, value)
       this.accessory.context.cacheStates[garageChannel].cacheCurrentDoorState = value
diff --git a/lib/device/garage-one.js b/lib/device/garage-one.js
index 59691c89..80148949 100644
--- a/lib/device/garage-one.js
+++ b/lib/device/garage-one.js
@@ -9,6 +9,26 @@ module.exports = class deviceGarageOne {
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
+    const asConfig = platform.cusG.get(accessory.context.eweDeviceId)
+    if (!['oneSwitch', 'twoSwitch'].includes(asConfig.setup)) {
+      this.error = 'setup must be oneSwitch or twoSwitch'
+    }
+    this.setup = asConfig.setup
+    this.operationTime = parseInt(asConfig.operationTime)
+    this.operationTime = isNaN(this.operationTime)
+      ? this.helpers.defaults.operationTime
+      : this.operationTime < 20
+        ? this.helpers.defaults.operationTime
+        : this.operationTime
+    if (asConfig.sensorId) {
+      if (!this.platform.devicesInHB.has(asConfig.sensorId + 'SWX')) {
+        this.error = 'defined sensor does not exist in Homebridge'
+      }
+      if (this.platform.devicesInHB.get(asConfig.sensorId + 'SWX').context.type !== 'sensor') {
+        this.error = 'defined sensor is not a DW2 sensor'
+      }
+      this.definedSensor = this.platform.devicesInHB.get(asConfig.sensorId + 'SWX')
+    }
     if (!(this.service = accessory.getService(this.Service.GarageDoorOpener))) {
       accessory.addService(this.Service.GarageDoorOpener)
         .setCharacteristic(this.Characteristic.CurrentDoorState, 1)
@@ -24,38 +44,37 @@ module.exports = class deviceGarageOne {
   async internalUpdate (value, callback) {
     try {
       callback()
-      const garageConfig = this.platform.cusG.get(this.accessory.context.eweDeviceId)
-      const sensorDefinition = garageConfig.sensorId || false
-      let sAccessory = false
+      if (this.error) {
+        this.log.warn('[%s] invalid config - %s.', this.accessory.displayName, this.error)
+        return
+      }
       const newPos = value
       const params = {}
       let delay = 0
-      if (sensorDefinition && !(sAccessory = this.platform.devicesInHB.get(sensorDefinition + 'SWX'))) {
-        throw new Error("defined DW2 sensor doesn't exist")
-      }
-      if (sensorDefinition && sAccessory.context.type !== 'sensor') {
-        throw new Error("defined DW2 sensor isn't a sensor")
-      }
-      const prevState = sAccessory
-        ? sAccessory.getService(this.Service.ContactSensor).getCharacteristic(this.Characteristic.ContactSensorState).value === 0
+      const prevState = this.definedSensor
+        ? this.definedSensor.getService(this.Service.ContactSensor).getCharacteristic(this.Characteristic.ContactSensorState).value === 0
           ? 1
           : 0
         : this.accessory.context.cacheCurrentDoorState
-      if (newPos === prevState % 2) return
+      if (newPos === prevState % 2) {
+        return
+      }
       this.inUse = true
       this.cacheState = value
-      if (garageConfig.setup === 'oneSwitch' && [2, 3].includes(prevState)) {
+      if (this.setup === 'oneSwitch' && [2, 3].includes(prevState)) {
         this.service.updateCharacteristic(this.Characteristic.CurrentDoorState, ((prevState * 2) % 3) + 2)
         this.accessory.context.cacheCurrentDoorState = ((prevState * 2) % 3) + 2
         delay = 1500
       }
-      if (this.cacheState !== newPos) return
+      if (this.cacheState !== newPos) {
+        return
+      }
       await this.helpers.sleep(delay)
       this.service.updateCharacteristic(this.Characteristic.TargetDoorState, newPos)
         .updateCharacteristic(this.Characteristic.CurrentDoorState, newPos + 2)
       this.accessory.context.cacheTargetDoorState = newPos
       this.accessory.context.cacheCurrentDoorState = newPos + 2
-      switch (garageConfig.setup) {
+      switch (this.setup) {
         case 'oneSwitch':
           params.switch = 'on'
           break
@@ -68,8 +87,8 @@ module.exports = class deviceGarageOne {
       await this.platform.sendDeviceUpdate(this.accessory, params)
       await this.helpers.sleep(2000)
       this.inUse = false
-      await this.helpers.sleep(Math.max(garageConfig.operationTime * 100, 0))
-      if (!sAccessory) {
+      await this.helpers.sleep(Math.max((this.operationTime - 20) * 100, 0))
+      if (!this.definedSensor) {
         this.service.updateCharacteristic(this.Characteristic.CurrentDoorState, newPos)
         this.accessory.context.cacheCurrentDoorState = newPos
         if (!this.disableDeviceLogging) {
@@ -84,12 +103,16 @@ module.exports = class deviceGarageOne {
 
   async externalUpdate (params) {
     try {
-      if (!this.helpers.hasProperty(params, 'switch') && !this.helpers.hasProperty(params, 'switches')) return
-      const garageConfig = this.platform.cusG.get(this.accessory.context.eweDeviceId)
-      if (this.inUse || garageConfig.sensorId) return
+      if (this.error) {
+        this.log.warn('[%s] invalid config - %s.', this.accessory.displayName, this.error)
+        return
+      }
+      if ((!params.switch && !params.switches) || this.inUse || this.definedSensor) {
+        return
+      }
       const prevState = this.accessory.context.cacheCurrentDoorState
       const newPos = [0, 2].includes(prevState) ? 3 : 2
-      switch (garageConfig.setup) {
+      switch (this.setup) {
         case 'oneSwitch':
           if (params.switch === 'off') {
             return
@@ -105,22 +128,17 @@ module.exports = class deviceGarageOne {
           break
       }
       this.inUse = true
-      if (garageConfig.sensorId) {
-        await this.helpers.sleep(2000)
-        this.inUse = false
-      } else {
-        this.service.updateCharacteristic(this.Characteristic.TargetDoorState, newPos - 2)
-          .updateCharacteristic(this.Characteristic.CurrentDoorState, newPos)
-        this.accessory.context.cacheCurrentDoorState = newPos
-        this.accessory.context.cacheTargetDoorState = newPos - 2
-        await this.helpers.sleep(2000)
-        this.inUse = false
-        await this.helpers.sleep(Math.max((garageConfig.operationTime - 20) * 100, 0))
-        this.service.updateCharacteristic(this.Characteristic.CurrentDoorState, newPos - 2)
-        this.accessory.context.cacheCurrentDoorState = newPos - 2
-        if (!this.disableDeviceLogging) {
-          this.log('[%s] current state [%s].', this.accessory.displayName, newPos === 2 ? 'open' : 'closed')
-        }
+      this.service.updateCharacteristic(this.Characteristic.TargetDoorState, newPos - 2)
+        .updateCharacteristic(this.Characteristic.CurrentDoorState, newPos)
+      this.accessory.context.cacheCurrentDoorState = newPos
+      this.accessory.context.cacheTargetDoorState = newPos - 2
+      await this.helpers.sleep(2000)
+      this.inUse = false
+      await this.helpers.sleep(Math.max((this.operationTime - 20) * 100, 0))
+      this.service.updateCharacteristic(this.Characteristic.CurrentDoorState, newPos - 2)
+      this.accessory.context.cacheCurrentDoorState = newPos - 2
+      if (!this.disableDeviceLogging) {
+        this.log('[%s] current state [%s].', this.accessory.displayName, newPos === 2 ? 'open' : 'closed')
       }
     } catch (err) {
       this.inUse = false
diff --git a/lib/device/garage-two.js b/lib/device/garage-two.js
index f9760b52..369d2c86 100644
--- a/lib/device/garage-two.js
+++ b/lib/device/garage-two.js
@@ -9,6 +9,7 @@ module.exports = class deviceGarageTwo {
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
+    this.operationTime = platform.cusG.get(accessory.context.eweDeviceId).operationTime
     ;['1', '2'].forEach(v => {
       let gdService
       if (!(gdService = accessory.getService('Garage ' + v))) {
@@ -27,7 +28,6 @@ module.exports = class deviceGarageTwo {
   async internalUpdate (garage, value, callback) {
     try {
       callback()
-      const garageConfig = this.platform.cusG.get(this.accessory.context.eweDeviceId)
       const newPos = value
       const params = { switches: this.cacheSwitchState }
       const gdService = this.accessory.getService(garage)
@@ -57,7 +57,7 @@ module.exports = class deviceGarageTwo {
       await this.platform.sendDeviceUpdate(this.accessory, params)
       await this.helpers.sleep(2000)
       this.inUse = false
-      await this.helpers.sleep(Math.max((garageConfig.operationTime - 20) * 100, 0))
+      await this.helpers.sleep(Math.max((this.operationTime - 20) * 100, 0))
       gdService.updateCharacteristic(this.Characteristic.CurrentDoorState, newPos)
       switch (garage) {
         case 'Garage 1': {
@@ -84,7 +84,6 @@ module.exports = class deviceGarageTwo {
   externalUpdate (params) {
     try {
       if (!params.switches) return
-      const garageConfig = this.platform.cusG.get(this.accessory.context.eweDeviceId)
       if (this.inUse) return
       this.cacheSwitchState = params.switches
       ;['1', '2'].forEach(async v => {
@@ -126,7 +125,7 @@ module.exports = class deviceGarageTwo {
         }
         await this.helpers.sleep(2000)
         this.inUse = false
-        await this.helpers.sleep(Math.max((garageConfig.operationTime - 20) * 100, 0))
+        await this.helpers.sleep(Math.max((this.operationTime - 20) * 100, 0))
         gcService.updateCharacteristic(this.Characteristic.CurrentDoorState, newPos - 2)
         switch (v) {
           case '1':
diff --git a/lib/device/lock-one.js b/lib/device/lock-one.js
index 1ca7ec58..6f7c0cbf 100644
--- a/lib/device/lock-one.js
+++ b/lib/device/lock-one.js
@@ -9,6 +9,17 @@ module.exports = class deviceLockOne {
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
+    const asConfig = platform.cusG.get(accessory.context.eweDeviceId)
+    if (!['oneSwitch', 'twoSwitch'].includes(asConfig.setup)) {
+      this.error = 'setup must be oneSwitch or twoSwitch'
+    }
+    this.setup = asConfig.setup
+    this.operationTime = parseInt(asConfig.operationTime)
+    this.operationTime = isNaN(this.operationTime)
+      ? this.helpers.defaults.operationTime
+      : this.operationTime < 20
+        ? this.helpers.defaults.operationTime
+        : this.operationTime
     this.service = accessory.getService(this.Service.LockMechanism) || accessory.addService(this.Service.LockMechanism)
     this.service.getCharacteristic(this.Characteristic.LockTargetState)
       .on('set', this.internalUpdate.bind(this))
@@ -20,16 +31,27 @@ module.exports = class deviceLockOne {
   async internalUpdate (value, callback) {
     try {
       callback()
-      const lockConfig = this.platform.cusG.get(this.accessory.context.eweDeviceId)
-      const params = { switch: 'on' }
+      if (this.error) {
+        this.log.warn('[%s] invalid config - %s.', this.accessory.displayName, this.error)
+        return
+      }
+      const params = {}
+      switch (this.setup) {
+        case 'oneSwitch':
+          params.switch = 'on'
+          break
+        case 'twoSwitch':
+          params.switches = this.helpers.defaultMultiSwitchOff
+          params.switches[0].switch = 'on'
+          break
+      }
       this.inUse = true
       await this.platform.sendDeviceUpdate(this.accessory, params)
       if (!this.disableDeviceLogging) {
         this.log('[%s] current status [unlocked].', this.accessory.displayName)
       }
-      await this.helpers.sleep(Math.max(lockConfig.operationTime * 100, 1000))
-      this.service
-        .updateCharacteristic(this.Characteristic.LockTargetState, 1)
+      await this.helpers.sleep(Math.max(this.operationTime * 100, 1000))
+      this.service.updateCharacteristic(this.Characteristic.LockTargetState, 1)
         .updateCharacteristic(this.Characteristic.LockCurrentState, 1)
       this.inUse = false
       if (!this.disableDeviceLogging) {
@@ -43,15 +65,32 @@ module.exports = class deviceLockOne {
 
   async externalUpdate (params) {
     try {
-      if (!params.switch || params.switch === 'off' || this.inUse) return
-      const lockConfig = this.platform.cusG.get(this.accessory.context.eweDeviceId)
+      if (this.error) {
+        this.log.warn('[%s] invalid config - %s.', this.accessory.displayName, this.error)
+        return
+      }
+      if (this.inUse) {
+        return
+      }
+      switch (this.setup) {
+        case 'oneSwitch':
+          if (!params.switch || params.switch === 'off') {
+            return
+          }
+          break
+        case 'twoSwitch':
+          if (!params.switches || params.switches[0].switch === 'off') {
+            return
+          }
+          break
+      }
       this.inUse = true
       this.service.updateCharacteristic(this.Characteristic.LockCurrentState, 0)
         .updateCharacteristic(this.Characteristic.LockTargetState, 0)
       if (params.updateSource && !this.disableDeviceLogging) {
         this.log('[%s] current status [unlocked].', this.accessory.displayName)
       }
-      await this.helpers.sleep(Math.max(lockConfig.operationTime * 100, 1000))
+      await this.helpers.sleep(Math.max(this.operationTime * 100, 1000))
       this.service.updateCharacteristic(this.Characteristic.LockCurrentState, 1)
         .updateCharacteristic(this.Characteristic.LockTargetState, 1)
       this.inUse = false
diff --git a/lib/device/switch-valve.js b/lib/device/switch-valve.js
index 9b7e42a7..6425bb0b 100644
--- a/lib/device/switch-valve.js
+++ b/lib/device/switch-valve.js
@@ -88,7 +88,9 @@ module.exports = class deviceSwitchValve {
 
   async externalUpdate (params) {
     try {
-      if (!params.switches) return
+      if (!params.switches) {
+        return
+      }
       if (this.cacheOnOff !== (params.switches[0].switch === 'on')) {
         const newStatus = params.switches[0].switch === 'on'
         this.cacheOnOff = params.switches[0].switch
diff --git a/lib/device/tap-one.js b/lib/device/tap-one.js
index 55644a99..4276ff61 100644
--- a/lib/device/tap-one.js
+++ b/lib/device/tap-one.js
@@ -9,6 +9,11 @@ module.exports = class deviceTapOne {
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
+    const asConfig = platform.cusG.get(accessory.context.eweDeviceId)
+    if (!['oneSwitch', 'twoSwitch'].includes(asConfig.setup)) {
+      this.error = 'setup must be oneSwitch or twoSwitch'
+    }
+    this.setup = asConfig.setup
     if (!(this.service = accessory.getService(this.Service.Valve))) {
       this.service = accessory.addService(this.Service.Valve)
       this.service.setCharacteristic(this.Characteristic.Active, 0)
@@ -23,9 +28,21 @@ module.exports = class deviceTapOne {
   async internalUpdate (value, callback) {
     try {
       callback()
-      await this.platform.sendDeviceUpdate(this.accessory, {
-        switch: value ? 'on' : 'off'
-      })
+      if (this.error) {
+        this.log.warn('[%s] invalid config - %s.', this.accessory.displayName, this.error)
+        return
+      }
+      const params = {}
+      switch (this.setup) {
+        case 'oneSwitch':
+          params.switch = value ? 'on' : 'off'
+          break
+        case 'twoSwitch':
+          params.switches = this.helpers.defaultMultiSwitchOff
+          params.switches[0].switch = value ? 'on' : 'off'
+          break
+      }
+      await this.platform.sendDeviceUpdate(this.accessory, params)
       this.cacheOnOff = value ? 'on' : 'off'
       this.service.updateCharacteristic(this.Characteristic.InUse, value)
       if (!this.disableDeviceLogging) {
@@ -38,11 +55,26 @@ module.exports = class deviceTapOne {
 
   async externalUpdate (params) {
     try {
-      if (!params.switch || params.switch === this.cacheOnOff) return
-      const newStatus = params.switch === 'on'
-      this.service.updateCharacteristic(this.Characteristic.Active, newStatus ? 1 : 0)
-        .updateCharacteristic(this.Characteristic.InUse, newStatus ? 1 : 0)
-      this.cacheOnOff = params.switch
+      if (this.error) {
+        this.log.warn('[%s] invalid config - %s.', this.accessory.displayName, this.error)
+        return
+      }
+      switch (this.setup) {
+        case 'oneSwitch':
+          if (!params.switch || params.switch === this.cacheOnOff) {
+            return
+          }
+          this.cacheOnOff = params.switch
+          break
+        case 'twoSwitch':
+          if (!params.switches || params.switches[0].switch === this.cacheOnOff) {
+            return
+          }
+          this.cacheOnOff = params.switches[0].switch
+          break
+      }
+      this.service.updateCharacteristic(this.Characteristic.Active, this.cacheOnOff === 'on' ? 1 : 0)
+        .updateCharacteristic(this.Characteristic.InUse, this.cacheOnOff === 'on' ? 1 : 0)
       if (params.updateSource && !this.disableDeviceLogging) {
         this.log('[%s] current state [%s].', this.accessory.displayName, this.cacheOnOff)
       }
diff --git a/lib/device/tap-two.js b/lib/device/tap-two.js
index 0f7cb8f9..7ea2114a 100644
--- a/lib/device/tap-two.js
+++ b/lib/device/tap-two.js
@@ -54,7 +54,9 @@ module.exports = class deviceTapTwo {
 
   async externalUpdate (params) {
     try {
-      if (!params.switches) return
+      if (!params.switches) {
+        return
+      }
       ;['A', 'B'].forEach((v, k) => {
         const tapService = this.accessory.getService('Valve ' + v)
         tapService.updateCharacteristic(this.Characteristic.Active, params.switches[k].switch === 'on' ? 1 : 0)
diff --git a/lib/device/valve-four.js b/lib/device/valve-four.js
index 512a76e1..04259084 100644
--- a/lib/device/valve-four.js
+++ b/lib/device/valve-four.js
@@ -119,7 +119,9 @@ module.exports = class deviceValveFour {
 
   async externalUpdate (params) {
     try {
-      if (!params.switches) return
+      if (!params.switches) {
+        return
+      }
       ;['A', 'B', 'C', 'D'].forEach((v, k) => {
         const valveService = this.accessory.getService('Valve ' + v)
         if (params.switches[k].switch === 'on') {
diff --git a/lib/device/valve-one.js b/lib/device/valve-one.js
index 1514b2e3..00d79c79 100644
--- a/lib/device/valve-one.js
+++ b/lib/device/valve-one.js
@@ -9,6 +9,11 @@ module.exports = class deviceValveOne {
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
+    const asConfig = platform.cusG.get(accessory.context.eweDeviceId)
+    if (!['oneSwitch', 'twoSwitch'].includes(asConfig.setup)) {
+      this.error = 'setup must be oneSwitch or twoSwitch'
+    }
+    this.setup = asConfig.setup
     if (!(this.service = accessory.getService(this.Service.Valve))) {
       this.service = accessory.addService(this.Service.Valve)
       this.service.setCharacteristic(this.Characteristic.Active, 0)
@@ -37,7 +42,20 @@ module.exports = class deviceValveOne {
   async internalUpdate (value, callback) {
     try {
       callback()
-      const params = { switch: value ? 'on' : 'off' }
+      if (this.error) {
+        this.log.warn('[%s] invalid config - %s.', this.accessory.displayName, this.error)
+        return
+      }
+      const params = {}
+      switch (this.setup) {
+        case 'oneSwitch':
+          params.switch = value ? 'on' : 'off'
+          break
+        case 'twoSwitch':
+          params.switches = this.helpers.defaultMultiSwitchOff
+          params.switches[0].switch = value ? 'on' : 'off'
+          break
+      }
       this.service.updateCharacteristic(this.Characteristic.InUse, value)
       switch (value) {
         case 0:
@@ -67,8 +85,26 @@ module.exports = class deviceValveOne {
 
   async externalUpdate (params) {
     try {
-      if (!params.switch) return
-      if (params.switch === 'on') {
+      if (this.error) {
+        this.log.warn('[%s] invalid config - %s.', this.accessory.displayName, this.error)
+        return
+      }
+      let isOn = false
+      switch (this.setup) {
+        case 'oneSwitch':
+          if (!params.switch) {
+            return
+          }
+          isOn = params.switch === 'on'
+          break
+        case 'twoSwitch':
+          if (!params.switches) {
+            return
+          }
+          isOn = params.switches[0].switch === 'on'
+          break
+      }
+      if (isOn) {
         if (this.service.getCharacteristic(this.Characteristic.Active).value === 0) {
           const timer = this.service.getCharacteristic(this.Characteristic.SetDuration).value
           this.service.updateCharacteristic(this.Characteristic.Active, 1)
diff --git a/lib/device/valve-two.js b/lib/device/valve-two.js
index fb0fda06..2a3c9a98 100644
--- a/lib/device/valve-two.js
+++ b/lib/device/valve-two.js
@@ -83,7 +83,9 @@ module.exports = class deviceValveTwo {
 
   async externalUpdate (params) {
     try {
-      if (!params.switches) return
+      if (!params.switches) {
+        return
+      }
       ;['A', 'B'].forEach((v, k) => {
         const valveService = this.accessory.getService('Valve ' + v)
         if (params.switches[k].switch === 'on') {
diff --git a/lib/utils/helpers.js b/lib/utils/helpers.js
index 553dcb95..a8ab7368 100644
--- a/lib/utils/helpers.js
+++ b/lib/utils/helpers.js
@@ -24,7 +24,8 @@ module.exports = {
     inUsePowerThreshold: 0,
     lowBattThreshold: 25,
     sensorTimeLength: 60,
-    sensorTimeDifference: 120
+    sensorTimeDifference: 120,
+    operationTime: 100
   },
   devicesLAN: [1, 2, 3, 4, 5, 6, 7, 8, 9, 32, 77, 78],
   devicesSingleSwitch: [1, 5, 6, 14, 15, 22, 24, 27, 32, 36, 44, 59, 104],

From 4f83aa0c8614905a4558a673cadcdb4dbd4bad92 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 13 Jan 2021 13:56:40 +0000
Subject: [PATCH 1156/3183] validate operationTime

---
 lib/device/garage-eachen.js | 7 ++++++-
 lib/device/garage-four.js   | 7 ++++++-
 lib/device/garage-two.js    | 7 ++++++-
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/lib/device/garage-eachen.js b/lib/device/garage-eachen.js
index b504d734..659414fa 100644
--- a/lib/device/garage-eachen.js
+++ b/lib/device/garage-eachen.js
@@ -9,7 +9,12 @@ module.exports = class deviceGarageEachen {
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
-    this.operationTime = platform.cusG.get(accessory.context.eweDeviceId).operationTime
+    this.operationTime = parseInt(platform.cusG.get(accessory.context.eweDeviceId).operationTime)
+    this.operationTime = isNaN(this.operationTime)
+      ? this.helpers.defaults.operationTime
+      : this.operationTime < 20
+        ? this.helpers.defaults.operationTime
+        : this.operationTime
     if (!(this.service = accessory.getService(this.Service.GarageDoorOpener))) {
       this.service = accessory.addService(this.Service.GarageDoorOpener)
       this.service.setCharacteristic(this.Characteristic.CurrentDoorState, 1)
diff --git a/lib/device/garage-four.js b/lib/device/garage-four.js
index 10df8abb..5678cab5 100644
--- a/lib/device/garage-four.js
+++ b/lib/device/garage-four.js
@@ -9,7 +9,12 @@ module.exports = class deviceGarageFour {
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
-    this.operationTime = platform.cusG.get(accessory.context.eweDeviceId).operationTime
+    this.operationTime = parseInt(platform.cusG.get(accessory.context.eweDeviceId).operationTime)
+    this.operationTime = isNaN(this.operationTime)
+      ? this.helpers.defaults.operationTime
+      : this.operationTime < 20
+        ? this.helpers.defaults.operationTime
+        : this.operationTime
     ;['A', 'B', 'C', 'D'].forEach(v => {
       let gdService
       if (!(gdService = accessory.getService('Garage ' + v))) {
diff --git a/lib/device/garage-two.js b/lib/device/garage-two.js
index 369d2c86..088105eb 100644
--- a/lib/device/garage-two.js
+++ b/lib/device/garage-two.js
@@ -9,7 +9,12 @@ module.exports = class deviceGarageTwo {
     this.helpers = platform.helpers
     this.Service = platform.api.hap.Service
     this.Characteristic = platform.api.hap.Characteristic
-    this.operationTime = platform.cusG.get(accessory.context.eweDeviceId).operationTime
+    this.operationTime = parseInt(platform.cusG.get(accessory.context.eweDeviceId).operationTime)
+    this.operationTime = isNaN(this.operationTime)
+      ? this.helpers.defaults.operationTime
+      : this.operationTime < 20
+        ? this.helpers.defaults.operationTime
+        : this.operationTime
     ;['1', '2'].forEach(v => {
       let gdService
       if (!(gdService = accessory.getService('Garage ' + v))) {

From f30ec652ac7c8bd8d6a28c292e50102c24e99724 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 13 Jan 2021 14:01:10 +0000
Subject: [PATCH 1157/3183] increase min OpTime to 2 seconds

---
 lib/device/sensor.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/device/sensor.js b/lib/device/sensor.js
index bf035e7a..3bf2fadd 100644
--- a/lib/device/sensor.js
+++ b/lib/device/sensor.js
@@ -75,7 +75,7 @@ module.exports = class deviceSensor {
                 }
                 break
               case 1:
-                await this.helpers.sleep(Math.max(group.operationTime * 100, 1000))
+                await this.helpers.sleep(Math.max(group.operationTime * 100, 2000))
                 gdService.updateCharacteristic(this.Characteristic.TargetDoorState, 0)
                   .updateCharacteristic(this.Characteristic.CurrentDoorState, 0)
                 if (params.updateSource && !this.disableDeviceLogging) {

From b2cc0b32283f63a704c04ea4c83c367f01f57315 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 13 Jan 2021 14:01:12 +0000
Subject: [PATCH 1158/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 573b189c..16024914 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,19 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 ## BETA
 
+### ⚠️ Breaking Changes
+
+* **Accessory Simulations** - if use the following:
+  * 1 Lock
+  * 1 Tap/Faucet
+  * 1 Valve
+* you will need to update your configuration with the Device Setup field (via Homebridge UI) or adding the line `"setup": oneSwitch"` directly to your configuration file in the groups section
+
+### New
+
+* Single Accessory Simulations for multi-channel devices
+* `operationTime` for Accessory Simulations will now be validated and increased to 20 if less than 20
+
 ### Changes
 
 * Changes to plugin now in CHANGELOG.md

From 882c14df622c22c1ba9257e1736c4c0a8410c4c8 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 13 Jan 2021 14:18:28 +0000
Subject: [PATCH 1159/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 16024914..121fc2c8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,12 +10,12 @@ All notable changes to this homebridge-ewelink will be documented in this file.
   * 1 Lock
   * 1 Tap/Faucet
   * 1 Valve
-* you will need to update your configuration with the Device Setup field (via Homebridge UI) or adding the line `"setup": oneSwitch"` directly to your configuration file in the groups section
+* you will need to update your configuration with the Device Setup field (via Homebridge UI) or adding the line `"setup": "oneSwitch"` directly to your configuration file in the groups section
 
 ### New
 
-* Single Accessory Simulations for multi-channel devices
-* `operationTime` for Accessory Simulations will now be validated and increased to 20 if less than 20
+* Single Accessory Simulations for multi-channel devices (e.g. 1 valve using a Sonoff 4CH)
+* `operationTime` for Accessory Simulations will now be validated and increased to 20 if less than 20 or an invalid number
 
 ### Changes
 

From 106926cf8c0762e3943448bc589062af9c96a5bb Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 13 Jan 2021 14:27:13 +0000
Subject: [PATCH 1160/3183] 4.3.1-0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 1a85a72d..d4a728ac 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.3.0",
+  "version": "4.3.1-0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 16575d89..0df13b7f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.3.0",
+  "version": "4.3.1-0",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 66fac1af63aa4b1d56f8f248fb47b3532bf40b41 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 14 Jan 2021 10:00:38 +0000
Subject: [PATCH 1161/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 121fc2c8..98fdbba0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 All notable changes to this homebridge-ewelink will be documented in this file.
 
-## BETA
+## 4.4.0 (2021-01-14)
 
 ### ⚠️ Breaking Changes
 

From 8564bb025d7ce8febd41851808bb36d1c6fd77e3 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 14 Jan 2021 10:01:03 +0000
Subject: [PATCH 1162/3183] 4.4.0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d4a728ac..5eacaa04 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.3.1-0",
+  "version": "4.4.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 0df13b7f..88762411 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.3.1-0",
+  "version": "4.4.0",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From ee8d86522188c86d049617aed66f7156668b8a9e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 15 Jan 2021 08:19:39 +0000
Subject: [PATCH 1163/3183] one liner

---
 lib/index.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/lib/index.js b/lib/index.js
index 6f95f6fa..9774a356 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -549,9 +549,7 @@ class eWeLinkPlatform {
         : false
       accessory.context.eweBrandName = device.brandName
       accessory.context.eweBrandLogo = device.brandLogo
-      accessory.context.eweShared = this.helpers.hasProperty(device, 'sharedBy') && this.helpers.hasProperty(device.sharedBy, 'email')
-        ? device.sharedBy.email
-        : false
+      accessory.context.eweShared = device.sharedBy && device.sharedBy.email ? device.sharedBy.email : false
       accessory.context.ip = this.lanClient && accessory.context.reachableLAN
         ? this.lanDevices.get(device.deviceid).ip
         : false

From daac924b1726505adeedc075b6d150dd2aa4a65c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 15 Jan 2021 08:21:51 +0000
Subject: [PATCH 1164/3183] channel name

---
 lib/index.js | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/lib/index.js b/lib/index.js
index 9774a356..d3e27bb8 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -588,11 +588,7 @@ class eWeLinkPlatform {
         ? Object.keys((device.tags && device.tags.zyx_info) || []).length
         : this.helpers.chansFromUiid[device.extra.uiid]
       if (['1', '2', '3', '4'].includes(switchNumber) && type !== 'rf_sub') {
-        if (
-          this.helpers.hasProperty(device, 'tags') &&
-          this.helpers.hasProperty(device.tags, 'ck_channel_name') &&
-          device.tags.ck_channel_name[parseInt(switchNumber) - 1]
-        ) {
+        if (device.tags && device.tags.ck_channel_name && device.tags.ck_channel_name[parseInt(switchNumber) - 1]) {
           newDeviceName = device.tags.ck_channel_name[parseInt(switchNumber) - 1]
         } else {
           newDeviceName += ' SW' + switchNumber

From 61bc8ca815c56996c957961304e3dcfd79581506 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 15 Jan 2021 08:26:43 +0000
Subject: [PATCH 1165/3183] small refactors

---
 lib/index.js | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/lib/index.js b/lib/index.js
index d3e27bb8..337cc053 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -583,19 +583,20 @@ class eWeLinkPlatform {
       const switchNumber = hbDeviceId.split('SW')[1].toString()
 
       // *** Set up the device name which can depend on the accessory type *** \\
-      newDeviceName = type === 'rf_sub' ? extraContext.name : device.name
-      const channelCount = type === 'rf_pri'
-        ? Object.keys((device.tags && device.tags.zyx_info) || []).length
-        : this.helpers.chansFromUiid[device.extra.uiid]
-      if (['1', '2', '3', '4'].includes(switchNumber) && type !== 'rf_sub') {
-        if (device.tags && device.tags.ck_channel_name && device.tags.ck_channel_name[parseInt(switchNumber) - 1]) {
-          newDeviceName = device.tags.ck_channel_name[parseInt(switchNumber) - 1]
-        } else {
-          newDeviceName += ' SW' + switchNumber
-        }
-      }
-      if (this.helpers.hasProperty(this.nameOverride, hbDeviceId)) {
+      if (this.nameOverride[hbDeviceId]) {
         newDeviceName = this.nameOverride[hbDeviceId]
+      } else {
+        newDeviceName = type === 'rf_sub' ? extraContext.name : device.name
+        const channelCount = type === 'rf_pri'
+          ? Object.keys((device.tags && device.tags.zyx_info) || []).length
+          : this.helpers.chansFromUiid[device.extra.uiid]
+        if (['1', '2', '3', '4'].includes(switchNumber) && type !== 'rf_sub') {
+          if (device.tags && device.tags.ck_channel_name && device.tags.ck_channel_name[parseInt(switchNumber) - 1]) {
+            newDeviceName = device.tags.ck_channel_name[parseInt(switchNumber) - 1]
+          } else {
+            newDeviceName += ' SW' + switchNumber
+          }
+        }
       }
 
       // *** Add the new accessory to Homebridge *** \\
@@ -710,7 +711,6 @@ class eWeLinkPlatform {
       if (this.debug) {
         this.log('[%s] receiving update %s.', accessory.displayName, JSON.stringify(device.params))
       }
-      const isX = accessory.context.hbDeviceId.substr(-1) === 'X'
       if (device.params.updateSource === 'WS') {
         // *** The update is from WS so update the WS online/offline status *** \\
         if (device.params.online !== accessory.context.reachableWAN) {
@@ -739,7 +739,7 @@ class eWeLinkPlatform {
       }
 
       // *** Update this new online/offline status for all switches of multi channel devices (ie not X) *** \\
-      if (reachableChange && !isX) {
+      if (reachableChange && accessory.context.hbDeviceId.substr(-1) !== 'X') {
         // *** Loop through to see which channels are in HB *** \\
         for (let i = 1; i <= accessory.context.channelCount; i++) {
           if (this.devicesInHB.has(deviceId + 'SW' + i)) {

From ea3dcf8c6841b14dc3fd80d247e9d0f3409d79b3 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 15 Jan 2021 11:20:59 +0000
Subject: [PATCH 1166/3183] remove standard ignore

---
 package.json | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/package.json b/package.json
index 88762411..4b7d9a29 100644
--- a/package.json
+++ b/package.json
@@ -51,11 +51,5 @@
     "node-dns-sd": "^0.4.2",
     "websocket-as-promised": "^1.1.0",
     "ws": "^7.4.2"
-  },
-  "standard": {
-    "ignore": [
-      "/lib/fakegato/",
-      "/lib/node-dns-sd/"
-    ]
   }
 }

From 7749ebc232474bab2d4e53ee962fd4129c3e5849 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 15 Jan 2021 11:21:25 +0000
Subject: [PATCH 1167/3183] fakegato to standardjs

---
 lib/fakegato/fakegato-history.js | 1554 ++++++++++++++----------------
 lib/fakegato/fakegato-storage.js |  268 ++----
 lib/fakegato/fakegato-timer.js   |  251 +++--
 lib/fakegato/uuid.js             |   42 +-
 4 files changed, 962 insertions(+), 1153 deletions(-)

diff --git a/lib/fakegato/fakegato-history.js b/lib/fakegato/fakegato-history.js
index d6efe4cc..2d16ca98 100644
--- a/lib/fakegato/fakegato-history.js
+++ b/lib/fakegato/fakegato-history.js
@@ -1,842 +1,716 @@
-/*jshint esversion: 6,node: true,-W041: false */
-'use strict';
-
-const Format = require('util').format;
-const FakeGatoTimer = require('./fakegato-timer').FakeGatoTimer;
-const FakeGatoStorage = require('./fakegato-storage').FakeGatoStorage;
-
-const EPOCH_OFFSET = 978307200;
-
-const TYPE_ENERGY = 'energy',
-	TYPE_ROOM = 'room',
-	TYPE_WEATHER = 'weather',
-	TYPE_DOOR = 'door',
-	TYPE_MOTION = 'motion',
-	TYPE_SWITCH = 'switch',
-	TYPE_THERMO = 'thermo',
-	TYPE_AQUA = 'aqua',
-	TYPE_CUSTOM = 'custom';
-
-var homebridge;
-var Characteristic, Service;
+/* jshint -W014, -W033, esversion: 9 */
+/* eslint-disable new-cap */
+'use strict'
+
+const Format = require('util').format
+const FakeGatoTimer = require('./fakegato-timer').FakeGatoTimer
+const FakeGatoStorage = require('./fakegato-storage').FakeGatoStorage
+
+const EPOCH_OFFSET = 978307200
+
+const TYPE_ENERGY = 'energy'
+const TYPE_ROOM = 'room'
+const TYPE_WEATHER = 'weather'
+const TYPE_DOOR = 'door'
+const TYPE_MOTION = 'motion'
+const TYPE_SWITCH = 'switch'
+const TYPE_THERMO = 'thermo'
+const TYPE_AQUA = 'aqua'
+const TYPE_CUSTOM = 'custom'
+
+let homebridge
+let Characteristic
+let Service
 
 module.exports = function (pHomebridge) {
-	if (pHomebridge && !homebridge) {
-		homebridge = pHomebridge;
-		Characteristic = homebridge.hap.Characteristic;
-		Service = homebridge.hap.Service;
-	}
-
-
-	var hexToBase64 = function (val) {
-		return Buffer.from(('' + val).replace(/[^0-9A-F]/ig, ''), 'hex').toString('base64');
-	},
-		base64ToHex = function (val) {
-			if (!val)
-				return val;
-			return Buffer.from(val, 'base64').toString('hex');
-		},
-		swap16 = function (val) {
-			return ((val & 0xFF) << 8)
-				| ((val >>> 8) & 0xFF);
-		},
-		swap32 = function (val) {
-			return ((val & 0xFF) << 24)
-				| ((val & 0xFF00) << 8)
-				| ((val >>> 8) & 0xFF00)
-				| ((val >>> 24) & 0xFF);
-		},
-		hexToHPA = function (val) { //unused
-			return parseInt(swap16(val), 10);
-		},
-		hPAtoHex = function (val) { //unused
-			return swap16(Math.round(val)).toString(16);
-		},
-		numToHex = function (val, len) {
-			var s = Number(val >>> 0).toString(16);
-			if (s.length % 2 != 0) {
-				s = '0' + s;
-			}
-			if (len) {
-				return ('0000000000000' + s).slice(-1 * len);
-			}
-			return s;
-		},
-		ucfirst = function (val) {
-			return val.charAt(0).toUpperCase() + val.substr(1);
-		},
-		precisionRound = function (number, precision) {
-			var factor = Math.pow(10, precision);
-			return Math.round(number * factor) / factor;
-		};
-
-	class S2R1Characteristic extends Characteristic {
-		constructor() {
-			super('S2R1', S2R1Characteristic.UUID);
-			this.setProps({
-				format: Characteristic.Formats.DATA,
-				perms: [
-					Characteristic.Perms.READ, Characteristic.Perms.NOTIFY, Characteristic.Perms.HIDDEN
-				]
-			});
-		}
-	}
-
-	S2R1Characteristic.UUID = 'E863F116-079E-48FF-8F27-9C2605A29F52';
-
-	class S2R2Characteristic extends Characteristic {
-		constructor() {
-			super('S2R2', S2R2Characteristic.UUID);
-			this.setProps({
-				format: Characteristic.Formats.DATA,
-				perms: [
-					Characteristic.Perms.READ, Characteristic.Perms.NOTIFY, Characteristic.Perms.HIDDEN
-				]
-			});
-		}
-	}
-
-	S2R2Characteristic.UUID = 'E863F117-079E-48FF-8F27-9C2605A29F52';
-
-	class S2W1Characteristic extends Characteristic {
-		constructor() {
-			super('S2W1', S2W1Characteristic.UUID);
-			this.setProps({
-				format: Characteristic.Formats.DATA,
-				perms: [
-					Characteristic.Perms.WRITE, Characteristic.Perms.HIDDEN
-				]
-			});
-		}
-	}
-
-	S2W1Characteristic.UUID = 'E863F11C-079E-48FF-8F27-9C2605A29F52';
-
-	class S2W2Characteristic extends Characteristic {
-		constructor() {
-			super('S2W2', S2W2Characteristic.UUID);
-			this.setProps({
-				format: Characteristic.Formats.DATA,
-				perms: [
-					Characteristic.Perms.WRITE, Characteristic.Perms.HIDDEN
-				]
-			});
-		}
-	}
-
-	S2W2Characteristic.UUID = 'E863F121-079E-48FF-8F27-9C2605A29F52';
-
-	class FakeGatoHistoryService extends Service {
-		constructor(displayName, subtype) {
-			super(displayName, FakeGatoHistoryService.UUID, subtype);
-
-			this.addCharacteristic(S2R1Characteristic);
-			this.addCharacteristic(S2R2Characteristic);
-			this.addCharacteristic(S2W1Characteristic);
-			this.addCharacteristic(S2W2Characteristic);
-		}
-	}
-
-	FakeGatoHistoryService.UUID = 'E863F007-079E-48FF-8F27-9C2605A29F52';
-	var thisAccessory = {};
-	class FakeGatoHistory extends Service {
-		constructor(accessoryType, accessory) {
-
-			super(accessory.displayName + " History", FakeGatoHistoryService.UUID);
-
-			var entry2address = function (val) { // not used ?
-				var temp = val % this.memorySize;
-				return temp;
-			}.bind(this);
-
-			thisAccessory = accessory;
-			this.accessoryName = thisAccessory.displayName;
-			this.signatures = [];
-			this.uuid = require('./uuid.js');
-
-
-				this.size = 4032;
-				this.minutes = 10;
-				this.storage = 'fs';
-				this.path = homebridge.user.storagePath() + '/persist/';
-				this.disableTimer = false;
-				this.disableRepeatLastData = false;
-				this.log = thisAccessory.log || {};		// workaround for typescript blocking of changing of accessory object definition
-
-
-			if (!this.log.debug) {
-				this.log.debug = function () { };
-			}
-
-			if (!this.disableTimer) {
-				if (homebridge.globalFakeGatoTimer === undefined)
-					homebridge.globalFakeGatoTimer = new FakeGatoTimer({
-						minutes: this.minutes,
-						log: this.log
-					});
-			}
-
-			if (this.storage !== undefined) {
-				this.loaded = false;
-				if (homebridge.globalFakeGatoStorage === undefined) {
-					homebridge.globalFakeGatoStorage = new FakeGatoStorage({
-						log: this.log
-					});
-				}
-				homebridge.globalFakeGatoStorage.addWriter(this, {
-					storage: this.storage,
-					path: this.path,
-					filename: undefined,
-					keyPath: homebridge.user.storagePath() || undefined,
-					onReady: function () {
-
-						this.load(function (err, loaded) {
-							//this.log.debug("Loaded",loaded);
-							//this.registerEvents();
-							if (err) this.log.debug('Load error :', err);
-							else {
-								if (loaded) this.log.debug('History Loaded from Persistant Storage');
-								this.loaded = true;
-							}
-						}.bind(this));
-					}.bind(this)
-				});
-			}
-
-
-			switch (accessoryType) {
-				case TYPE_WEATHER:
-					this.accessoryType116 = "03 0102 0202 0302";
-					this.accessoryType117 = "07";
-					if (!this.disableTimer) {
-						homebridge.globalFakeGatoTimer.subscribe(this, this.calculateAverage);
-					}
-					break;
-				case TYPE_ENERGY:
-					this.accessoryType116 = "04 0102 0202 0702 0f03";
-					this.accessoryType117 = "1f";
-					if (!this.disableTimer) {
-						homebridge.globalFakeGatoTimer.subscribe(this, this.calculateAverage);
-					}
-					break;
-				case TYPE_ROOM:
-					this.accessoryType116 = "04 0102 0202 0402 0f03";
-					this.accessoryType117 = "0f";
-					if (!this.disableTimer) {
-						homebridge.globalFakeGatoTimer.subscribe(this, this.calculateAverage);
-					}
-					break;
-				case TYPE_DOOR:
-					this.accessoryType116 = "01 0601";
-					this.accessoryType117 = "01";
-					if (!this.disableTimer) {
-						homebridge.globalFakeGatoTimer.subscribe(this, function (params) { // callback
-							var backLog = params.backLog || [];
-							var immediate = params.immediate;
-
-							var fakegato = this.service;
-							var actualEntry = {};
-
-							if (backLog.length) {
-								if (!immediate) {
-									actualEntry.time = Math.round(new Date().valueOf() / 1000);
-									actualEntry.status = backLog[0].status;
-								}
-								else {
-									actualEntry.time = backLog[0].time;
-									actualEntry.status = backLog[0].status;
-								}
-								fakegato.log.debug('**Fakegato-timer callbackDoor: ', fakegato.accessoryName, ', immediate: ', immediate, ', entry: ', actualEntry);
-
-								fakegato._addEntry(actualEntry);
-							}
-						});
-					}
-					break;
-				case TYPE_MOTION:
-					this.accessoryType116 = "02 1301 1c01";
-					this.accessoryType117 = "02";
-					if (!this.disableTimer) {
-						homebridge.globalFakeGatoTimer.subscribe(this, function (params) { // callback
-							var backLog = params.backLog || [];
-							var immediate = params.immediate;
-
-							var fakegato = this.service;
-							var actualEntry = {};
-
-							if (backLog.length) {
-								if (!immediate) {
-									actualEntry.time = Math.round(new Date().valueOf() / 1000);
-									actualEntry.status = backLog[0].status;
-								}
-								else {
-									actualEntry.time = backLog[0].time;
-									actualEntry.status = backLog[0].status;
-								}
-								fakegato.log.debug('**Fakegato-timer callbackMotion: ', fakegato.accessoryName, ', immediate: ', immediate, ', entry: ', actualEntry);
-
-								fakegato._addEntry(actualEntry);
-							}
-						});
-					}
-					break;
-				case TYPE_SWITCH:
-					this.accessoryType116 = "01 0e01";
-					this.accessoryType117 = "01";
-					if (!this.disableTimer) {
-						homebridge.globalFakeGatoTimer.subscribe(this, function (params) { // callback
-							var backLog = params.backLog || [];
-							var immediate = params.immediate;
-
-							var fakegato = this.service;
-							var actualEntry = {};
-
-							if (backLog.length) {
-								if (!immediate) {
-									actualEntry.time = Math.round(new Date().valueOf() / 1000);
-									actualEntry.status = backLog[0].status;
-								}
-								else {
-									actualEntry.time = backLog[0].time;
-									actualEntry.status = backLog[0].status;
-								}
-								fakegato.log.debug('**Fakegato-timer callbackSwitch: ', fakegato.accessoryName, ', immediate: ', immediate, ', entry: ', actualEntry);
-
-								fakegato._addEntry(actualEntry);
-							}
-						});
-					}
-					break;
-				case TYPE_CUSTOM:
-					thisAccessory.services.forEach((service, i) => {
-						service.characteristics.forEach((characteristic, i) => {
-							// console.log('  characteristics', characteristic.displayName, characteristic.UUID);
-							switch(this.uuid.toLongFormUUID(characteristic.UUID)) {
-								case Characteristic.CurrentTemperature.UUID: // Temperature
-									this.signatures.push({ signature: '0102', length: 4, uuid: this.uuid.toShortFormUUID(characteristic.UUID), factor: 100, entry: "temp" });
-									break;
-								case Characteristic.CurrentRelativeHumidity.UUID: // Humidity
-									this.signatures.push({ signature: '0202', length: 4, uuid: this.uuid.toShortFormUUID(characteristic.UUID), factor: 100, entry: "humidity" });
-									break;
-								case 'E863F10F-079E-48FF-8F27-9C2605A29F52': // CustomCharacteristic.AtmosphericPressureLevel.UUID
-									this.signatures.push({ signature: '0302', length: 4, uuid: this.uuid.toShortFormUUID(characteristic.UUID), factor: 10, entry: "pressure" });
-									break;
-								case 'E863F10B-079E-48FF-8F27-9C2605A29F52': // PPM
-									this.signatures.push({ signature: '0702', length: 4, uuid: this.uuid.toShortFormUUID(characteristic.UUID), factor: 10, entry: "ppm" });
-									break;
-								case Characteristic.ContactSensorState.UUID: // Contact Sensor State
-									this.signatures.push({ signature: '0601', length: 2, uuid: this.uuid.toShortFormUUID(characteristic.UUID), factor: 1, entry: "contact" });
-									break;
-								case 'E863F10D-079E-48FF-8F27-9C2605A29F52': // Power
-									this.signatures.push({ signature: '0702', length: 4, uuid: this.uuid.toShortFormUUID(characteristic.UUID), factor: 10, entry: "power" });
-									break;
-								case Characteristic.On.UUID: // Switch On
-									this.signatures.push({ signature: '0e01', length: 2, uuid: this.uuid.toShortFormUUID(characteristic.UUID), factor: 1, entry: "status" });
-									break;
-								case Characteristic.MotionDetected.UUID: // Motion Detected
-									this.signatures.push({ signature: '1c01', length: 2, uuid: this.uuid.toShortFormUUID(characteristic.UUID), factor: 1, entry: "motion" });
-									break;
-								}
-							});
-						});
-						this.accessoryType116 = (' 0' + this.signatures.length.toString() + ' ' + this.signatures.sort((a, b) => (a.signature > b.signature) ? 1 : -1).map(a => a.signature).join(' ') + ' ');
-						if (!this.disableTimer) {
-							homebridge.globalFakeGatoTimer.subscribe(this, this.calculateAverage);
-						}
-					break;
-				case TYPE_AQUA:
-					this.accessoryType116 = "03 1f01 2a08 2302";
-					this.accessoryType117 = "05";
-					this.accessoryType117bis = "07";
-					break;
-				case TYPE_THERMO:
-					this.accessoryType116 = "05 0102 1102 1001 1201 1d01";
-					this.accessoryType117 = "1f";
-					break;
-			}
-
-			this.accessoryType = accessoryType;
-			this.firstEntry = 0;
-			this.lastEntry = 0;
-			this.history = ["noValue"];
-			this.memorySize = this.size;
-			this.usedMemory = 0;
-			this.currentEntry = 1;
-			this.transfer = false;
-			this.setTime = true;
-			this.restarted = true;
-			this.refTime = 0;
-			this.memoryAddress = 0;
-			this.dataStream = '';
-
-			this.saving = false;
-
-			this.registerEvents();
-			if (this.storage === undefined) {
-				this.loaded = true;
-			}
-		}
-
-		calculateAverage(params) { // callback
-			var backLog = params.backLog || [];
-			var previousAvrg = params.previousAvrg || {};
-			var timer = params.timer;
-
-			var fakegato = this.service;
-			var calc = {
-				sum: {},
-				num: {},
-				avrg: {}
-			};
-
-			for (var h in backLog) {
-				if (backLog.hasOwnProperty(h)) { // only valid keys
-					for (let key in backLog[h]) { // each record
-						if (backLog[h].hasOwnProperty(key) && key != 'time') { // except time
-							if (!calc.sum[key])
-								calc.sum[key] = 0;
-							if (!calc.num[key])
-								calc.num[key] = 0;
-							calc.sum[key] += backLog[h][key];
-							calc.num[key]++;
-							calc.avrg[key] = precisionRound(calc.sum[key] / calc.num[key], 2);
-						}
-					}
-				}
-			}
-			calc.avrg.time = Math.round(new Date().valueOf() / 1000); // set the time of the avrg
-
-			if(!fakegato.disableRepeatLastData) {
-				for (let key in previousAvrg) { // each record of previous average
-					if (previousAvrg.hasOwnProperty(key) && key != 'time') { // except time
-						if (!backLog.length ||//calc.avrg[key] == 0 || // zero value
-							calc.avrg[key] === undefined) // no key (meaning no value received for this key yet)
-						{
-						calc.avrg[key] = previousAvrg[key];
-						}
-					}
-				}
-			}
-
-			if (Object.keys(calc.avrg).length > 1) {
-				fakegato._addEntry(calc.avrg);
-				timer.emptyData(fakegato);
-			}
-			return calc.avrg;
-		}
-
-		registerEvents() {
-			this.log.debug('Registring Events', thisAccessory.displayName);
-			if (typeof thisAccessory.getService === "function") {
-				// Platform API
-				this.log.debug('Platform', thisAccessory.displayName);
-
-				this.service = thisAccessory.getService(FakeGatoHistoryService);
-				if (this.service === undefined) {
-					this.service = thisAccessory.addService(FakeGatoHistoryService, ucfirst(thisAccessory.displayName) + ' History', this.accessoryType);
-				}
-
-				this.service.getCharacteristic(S2R2Characteristic)
-					.on('get', this.getCurrentS2R2.bind(this));
-
-				this.service.getCharacteristic(S2W1Characteristic)
-					.on('set', this.setCurrentS2W1.bind(this));
-
-				this.service.getCharacteristic(S2W2Characteristic)
-					.on('set', this.setCurrentS2W2.bind(this));
-
-			}
-			else {
-				// Accessory API
-				this.log.debug('Accessory', thisAccessory.displayName);
-
-				this.addCharacteristic(S2R1Characteristic);
-
-				this.addCharacteristic(S2R2Characteristic)
-					.on('get', this.getCurrentS2R2.bind(this));
-
-				this.addCharacteristic(S2W1Characteristic)
-					.on('set', this.setCurrentS2W1.bind(this));
-
-				this.addCharacteristic(S2W2Characteristic)
-					.on('set', this.setCurrentS2W2.bind(this));
-			}
-		}
-
-		sendHistory(address) {
-			if (address != 0) {
-				this.currentEntry = address;
-			} else {
-				this.currentEntry = 1;
-			}
-			this.transfer = true;
-		}
-
-		addEntry(entry) {
-			entry.time = Math.round(new Date().valueOf() / 1000)
-			switch (this.accessoryType) {
-				case TYPE_DOOR:
-				case TYPE_MOTION:
-				case TYPE_SWITCH:
-					if (!this.disableTimer)
-						homebridge.globalFakeGatoTimer.addData({ entry: entry, service: this, immediateCallback: true });
-					else
-						this._addEntry({ time: entry.time, status: entry.status });
-					break;
-				case TYPE_AQUA:
-					this._addEntry({ time: entry.time, status: entry.status, waterAmount: entry.waterAmount });
-					break;
-				case TYPE_WEATHER:
-					if (!this.disableTimer)
-						homebridge.globalFakeGatoTimer.addData({ entry: entry, service: this });
-					else
-						this._addEntry({ time: entry.time, temp: entry.temp, humidity: entry.humidity, pressure: entry.pressure });
-					break;
-				case TYPE_ROOM:
-					if (!this.disableTimer)
-						homebridge.globalFakeGatoTimer.addData({ entry: entry, service: this });
-					else
-						this._addEntry({ time: entry.time, temp: entry.temp, humidity: entry.humidity, ppm: entry.ppm });
-					break;
-				case TYPE_ENERGY:
-					if (!this.disableTimer)
-						homebridge.globalFakeGatoTimer.addData({ entry: entry, service: this });
-					else
-						this._addEntry({ time: entry.time, power: entry.power });
-					break;
-				case TYPE_CUSTOM:
-					if (!this.disableTimer)
-						if ('power' in entry || 'temp' in entry) { // Only put power or temperature thru averager
-							homebridge.globalFakeGatoTimer.addData({ entry: entry, service: this });
-						} else {
-							this._addEntry(entry);
-						}
-					else
-						this._addEntry(entry);
-					break;
-				default:
-					this._addEntry(entry);
-					break;
-			}
-		}
-
-		//in order to be consistent with Eve, entry address start from 1
-		_addEntry(entry) {
-			if (this.loaded) {
-				var entry2address = function (val) {
-					return val % this.memorySize;
-				}
-					.bind(this);
-
-				var val;
-
-				if (this.usedMemory < this.memorySize) {
-					this.usedMemory++;
-					this.firstEntry = 0;
-					this.lastEntry = this.usedMemory;
-				} else {
-					this.firstEntry++;
-					this.lastEntry = this.firstEntry + this.usedMemory;
-					if (this.restarted == true) {
-						this.history[entry2address(this.lastEntry)] = {
-							time: entry.time,
-							setRefTime: 1
-						};
-						this.firstEntry++;
-						this.lastEntry = this.firstEntry + this.usedMemory;
-						this.restarted = false;
-					}
-				}
-
-				if (this.refTime == 0) {
-					this.refTime = entry.time - EPOCH_OFFSET;
-					this.history[this.lastEntry] = {
-						time: entry.time,
-						setRefTime: 1
-					};
-					this.initialTime = entry.time;
-					this.lastEntry++;
-					this.usedMemory++;
-				}
-
-				this.history[entry2address(this.lastEntry)] = (entry);
-
-				if (this.usedMemory < this.memorySize) {
-					val = Format(
-						'%s00000000%s%s%s%s%s000000000101',
-						numToHex(swap32(entry.time - this.refTime - EPOCH_OFFSET), 8),
-						numToHex(swap32(this.refTime), 8),
-						this.accessoryType116,
-						numToHex(swap16(this.usedMemory + 1), 4),
-						numToHex(swap16(this.memorySize), 4),
-						numToHex(swap32(this.firstEntry), 8));
-				} else {
-					val = Format(
-						'%s00000000%s%s%s%s%s000000000101',
-						numToHex(swap32(entry.time - this.refTime - EPOCH_OFFSET), 8),
-						numToHex(swap32(this.refTime), 8),
-						this.accessoryType116,
-						numToHex(swap16(this.usedMemory), 4),
-						numToHex(swap16(this.memorySize), 4),
-						numToHex(swap32(this.firstEntry + 1), 8));
-				}
-
-				if (this.service === undefined) { // Accessory API
-					this.getCharacteristic(S2R1Characteristic).setValue(hexToBase64(val));
-				}
-				else { // Platform API
-					this.service.getCharacteristic(S2R1Characteristic).setValue(hexToBase64(val));
-				}
-
-				this.log.debug("First entry %s: %s", this.accessoryName, this.firstEntry.toString(16));
-				this.log.debug("Last entry %s: %s", this.accessoryName, this.lastEntry.toString(16));
-				this.log.debug("Used memory %s: %s", this.accessoryName, this.usedMemory.toString(16));
-				this.log.debug("116 %s: %s", this.accessoryName, val);
-
-				if (this.storage !== undefined) this.save();
-			} else {
-				setTimeout(function () { // retry in 100ms
-					this._addEntry(entry);
-				}.bind(this), 100);
-			}
-		}
-		getInitialTime() {
-			return this.initialTime;
-		}
-
-		setExtraPersistedData(extra) {
-			this.extra = extra;
-		}
-
-		getExtraPersistedData() {
-			return this.extra;
-		}
-
-		isHistoryLoaded() {
-			return this.loaded;
-		}
-
-		save() {
-			if (this.loaded) {
-
-				let data = {
-					firstEntry: this.firstEntry,
-					lastEntry: this.lastEntry,
-					usedMemory: this.usedMemory,
-					refTime: this.refTime,
-					initialTime: this.initialTime,
-					history: this.history,
-					extra: this.extra
-				};
-
-
-				homebridge.globalFakeGatoStorage.write({
-					service: this,
-					data: typeof (data) === "object" ? JSON.stringify(data) : data
-				});
-
-			} else {
-				setTimeout(function () { // retry in 100ms
-					this.save();
-				}.bind(this), 100);
-			}
-		}
-		load(cb) {
-			this.log.debug("Loading...");
-			homebridge.globalFakeGatoStorage.read({
-				service: this,
-				callback: function (err, data) {
-					if (!err) {
-						if (data) {
-							try {
-								this.log.debug("read data from", this.accessoryName, ":", data);
-								let jsonFile = typeof (data) === "object" ? data : JSON.parse(data);
-
-								this.firstEntry = jsonFile.firstEntry;
-								this.lastEntry = jsonFile.lastEntry;
-								this.usedMemory = jsonFile.usedMemory;
-								this.refTime = jsonFile.refTime;
-								this.initialTime = jsonFile.initialTime;
-								this.history = jsonFile.history;
-								this.extra = jsonFile.extra;
-							} catch (e) {
-								this.log.debug("**ERROR fetching persisting data restart from zero - invalid JSON**", e);
-								cb(e, false);
-							}
-							cb(null, true);
-						}
-					} else {
-						// file don't exists
-						cb(null, false);
-					}
-				}.bind(this)
-			});
-		}
-		cleanPersist() {
-			this.log.debug("Cleaning...");
-			homebridge.globalFakeGatoStorage.remove({
-				service: this
-			});
-		}
-
-		getCurrentS2R2(callback) {
-			var entry2address = function (val) {
-				return val % this.memorySize;
-			}.bind(this);
-
-			if ((this.currentEntry <= this.lastEntry) && (this.transfer == true)) {
-				this.memoryAddress = entry2address(this.currentEntry);
-				for (var i = 0; i < 11; i++) {
-					if ((this.history[this.memoryAddress].setRefTime == 1) || (this.setTime == true) ||
-						(this.currentEntry == this.firstEntry + 1)) {
-						this.dataStream += Format(
-							",15%s 0100 0000 81%s0000 0000 00 0000",
-							numToHex(swap32(this.currentEntry), 8),
-							numToHex(swap32(this.refTime), 8));
-						this.setTime = false;
-					}
-					else {
-						this.log.debug("%s Entry: %s, Address: %s", this.accessoryName, this.currentEntry, this.memoryAddress);
-						switch (this.accessoryType) {
-							case TYPE_WEATHER:
-								this.dataStream += Format(
-									",10 %s%s-%s:%s %s %s",
-									numToHex(swap32(this.currentEntry), 8),
-									numToHex(swap32(this.history[this.memoryAddress].time - this.refTime - EPOCH_OFFSET), 8),
-									this.accessoryType117,
-									numToHex(swap16(this.history[this.memoryAddress].temp * 100), 4),
-									numToHex(swap16(this.history[this.memoryAddress].humidity * 100), 4),
-									numToHex(swap16(this.history[this.memoryAddress].pressure * 10), 4));
-								break;
-							case TYPE_ENERGY:
-								this.dataStream += Format(
-									",14 %s%s-%s:0000 0000 %s 0000 0000",
-									numToHex(swap32(this.currentEntry), 8),
-									numToHex(swap32(this.history[this.memoryAddress].time - this.refTime - EPOCH_OFFSET), 8),
-									this.accessoryType117,
-									numToHex(swap16(this.history[this.memoryAddress].power * 10), 4));
-								break;
-							case TYPE_ROOM:
-								this.dataStream += Format(
-									",13 %s%s%s%s%s%s0000 00",
-									numToHex(swap32(this.currentEntry), 8),
-									numToHex(swap32(this.history[this.memoryAddress].time - this.refTime - EPOCH_OFFSET), 8),
-									this.accessoryType117,
-									numToHex(swap16(this.history[this.memoryAddress].temp * 100), 4),
-									numToHex(swap16(this.history[this.memoryAddress].humidity * 100), 4),
-									numToHex(swap16(this.history[this.memoryAddress].ppm), 4));
-								break;
-							case TYPE_DOOR:
-							case TYPE_MOTION:
-							case TYPE_SWITCH:
-								this.dataStream += Format(
-									",0b %s%s%s%s",
-									numToHex(swap32(this.currentEntry), 8),
-									numToHex(swap32(this.history[this.memoryAddress].time - this.refTime - EPOCH_OFFSET), 8),
-									this.accessoryType117,
-									numToHex(this.history[this.memoryAddress].status, 2));
-								break;
-							case TYPE_AQUA:
-								if (this.history[this.memoryAddress].status == true)
-									this.dataStream += Format(
-										",0d %s%s%s%s 300c",
-										numToHex(swap32(this.currentEntry), 8),
-										numToHex(swap32(this.history[this.memoryAddress].time - this.refTime - EPOCH_OFFSET), 8),
-										this.accessoryType117,
-										numToHex(this.history[this.memoryAddress].status, 2));
-								else
-									this.dataStream += Format(
-										",15 %s%s%s%s%s 00000000 300c",
-										numToHex(swap32(this.currentEntry), 8),
-										numToHex(swap32(this.history[this.memoryAddress].time - this.refTime - EPOCH_OFFSET), 8),
-										this.accessoryType117bis,
-										numToHex(this.history[this.memoryAddress].status, 2),
-										numToHex(swap32(this.history[this.memoryAddress].waterAmount), 8));
-								break;
-							case TYPE_THERMO:
-								this.dataStream += Format(
-									",11 %s%s%s%s%s%s 0000",
-									numToHex(swap32(this.currentEntry), 8),
-									numToHex(swap32(this.history[this.memoryAddress].time - this.refTime - EPOCH_OFFSET), 8),
-									this.accessoryType117,
-									numToHex(swap16(this.history[this.memoryAddress].currentTemp * 100), 4),
-									numToHex(swap16(this.history[this.memoryAddress].setTemp * 100), 4),
-									numToHex(this.history[this.memoryAddress].valvePosition, 2));
-								break;
-							case TYPE_CUSTOM:
-								var result = [];
-								var bitmask = 0;
-								var dataStream = Format("%s%s",
-								numToHex(swap32(this.currentEntry), 8),
-								numToHex(swap32(this.history[this.memoryAddress].time - this.refTime - EPOCH_OFFSET), 8));
-								for (const [key, value] of Object.entries(this.history[this.memoryAddress])) {
-									switch (key) {
-										case 'time':
-											break;
-										default:
-											for (var x = 0, iLen = this.signatures.length; x < iLen; x++) {
-												if (this.signatures[x].entry === key) {
-													// console.log('key', key, this.signatures[x].uuid, value, this.signatures[x].factor);
-													switch(this.signatures[x].length) {
-														case 8:
-															result[x] = Format('%s', numToHex(swap32(value * this.signatures[x].factor), this.signatures[x].length));
-															break;
-														case 4:
-															result[x] = Format('%s', numToHex(swap16(value * this.signatures[x].factor), this.signatures[x].length));
-															break;
-														case 2:
-															result[x] = Format('%s', numToHex(value * this.signatures[x].factor, this.signatures[x].length));
-															break;
-												}
-													bitmask += Math.pow(2, x);
-												}
-											}
-									}
-								}
-							var results = dataStream + ' ' + numToHex(bitmask, 2) + ' ' + result.map(a => a).join(' ');
-							// console.log('results', numToHex((results.replace(/[^0-9A-F]/ig, '').length) / 2 + 1) + ' ' + results);
-							this.dataStream += (' ' + numToHex((results.replace(/[^0-9A-F]/ig, '').length) / 2 + 1) + ' ' + results + ',');
-							break;
-						}
-					}
-					this.currentEntry++;
-					this.memoryAddress = entry2address(this.currentEntry);
-					if (this.currentEntry > this.lastEntry)
-						break;
-				}
-				this.log.debug("Data %s: %s", this.accessoryName, this.dataStream);
-				callback(null, hexToBase64(this.dataStream));
-				this.dataStream = '';
-			}
-			else {
-				this.transfer = false;
-				callback(null, hexToBase64('00'));
-			}
-		}
-
-
-		setCurrentS2W1(val, callback) {
-			callback(null);
-			this.log.debug("Data request %s: %s", this.accessoryName, base64ToHex(val));
-			var valHex = base64ToHex(val);
-			var substring = valHex.substring(4, 12);
-			var valInt = parseInt(substring, 16);
-			var address = swap32(valInt);
-			var hexAddress = address.toString('16');
-
-			this.log.debug("Address requested %s: %s", this.accessoryName, hexAddress);
-			this.sendHistory(address);
-
-		}
-
-		setCurrentS2W2(val, callback) {
-			this.log.debug("Clock adjust %s: %s", this.accessoryName, base64ToHex(val));
-			callback(null);
-		}
-
-	}
-
-	FakeGatoHistoryService.UUID = 'E863F007-079E-48FF-8F27-9C2605A29F52';
-
-	return FakeGatoHistory;
-};
+  if (pHomebridge && !homebridge) {
+    homebridge = pHomebridge
+    Characteristic = homebridge.hap.Characteristic
+    Service = homebridge.hap.Service
+  }
+
+  const hexToBase64 = function (val) {
+    return Buffer.from(('' + val).replace(/[^0-9A-F]/ig, ''), 'hex').toString('base64')
+  }
+  const base64ToHex = function (val) {
+    if (!val) {
+      return val
+    }
+    return Buffer.from(val, 'base64').toString('hex')
+  }
+  const swap16 = function (val) {
+    return ((val & 0xFF) << 8) | ((val >>> 8) & 0xFF)
+  }
+  const swap32 = function (val) {
+    return ((val & 0xFF) << 24) | ((val & 0xFF00) << 8) | ((val >>> 8) & 0xFF00) | ((val >>> 24) & 0xFF)
+  }
+  const numToHex = function (val, len) {
+    let s = Number(val >>> 0).toString(16)
+    if (s.length % 2 !== 0) {
+      s = '0' + s
+    }
+    if (len) {
+      return ('0000000000000' + s).slice(-1 * len)
+    }
+    return s
+  }
+  const ucfirst = function (val) {
+    return val.charAt(0).toUpperCase() + val.substr(1)
+  }
+  const precisionRound = function (number, precision) {
+    const factor = Math.pow(10, precision)
+    return Math.round(number * factor) / factor
+  }
+
+  class S2R1Characteristic extends Characteristic {
+    constructor () {
+      super('S2R1', S2R1Characteristic.UUID)
+      this.setProps({
+        format: Characteristic.Formats.DATA,
+        perms: [Characteristic.Perms.READ, Characteristic.Perms.NOTIFY, Characteristic.Perms.HIDDEN]
+      })
+    }
+  }
+  S2R1Characteristic.UUID = 'E863F116-079E-48FF-8F27-9C2605A29F52'
+
+  class S2R2Characteristic extends Characteristic {
+    constructor () {
+      super('S2R2', S2R2Characteristic.UUID)
+      this.setProps({
+        format: Characteristic.Formats.DATA,
+        perms: [Characteristic.Perms.READ, Characteristic.Perms.NOTIFY, Characteristic.Perms.HIDDEN]
+      })
+    }
+  }
+  S2R2Characteristic.UUID = 'E863F117-079E-48FF-8F27-9C2605A29F52'
+
+  class S2W1Characteristic extends Characteristic {
+    constructor () {
+      super('S2W1', S2W1Characteristic.UUID)
+      this.setProps({
+        format: Characteristic.Formats.DATA,
+        perms: [Characteristic.Perms.WRITE, Characteristic.Perms.HIDDEN]
+      })
+    }
+  }
+  S2W1Characteristic.UUID = 'E863F11C-079E-48FF-8F27-9C2605A29F52'
+
+  class S2W2Characteristic extends Characteristic {
+    constructor () {
+      super('S2W2', S2W2Characteristic.UUID)
+      this.setProps({
+        format: Characteristic.Formats.DATA,
+        perms: [Characteristic.Perms.WRITE, Characteristic.Perms.HIDDEN]
+      })
+    }
+  }
+  S2W2Characteristic.UUID = 'E863F121-079E-48FF-8F27-9C2605A29F52'
+
+  class FakeGatoHistoryService extends Service {
+    constructor (displayName, subtype) {
+      super(displayName, FakeGatoHistoryService.UUID, subtype)
+      this.addCharacteristic(S2R1Characteristic)
+      this.addCharacteristic(S2R2Characteristic)
+      this.addCharacteristic(S2W1Characteristic)
+      this.addCharacteristic(S2W2Characteristic)
+    }
+  }
+  FakeGatoHistoryService.UUID = 'E863F007-079E-48FF-8F27-9C2605A29F52'
+
+  class FakeGatoHistory extends Service {
+    constructor (accessoryType, accessory) {
+      super(accessory.displayName + ' History', FakeGatoHistoryService.UUID)
+      this.accessory = accessory
+      this.signatures = []
+      this.uuid = require('./uuid.js')
+
+      this.size = 4032
+      this.minutes = 10
+      this.storage = 'fs'
+      this.path = homebridge.user.storagePath() + '/persist/'
+      this.disableTimer = false
+      this.disableRepeatLastData = false
+      this.log = accessory.log
+
+      if (homebridge.globalFakeGatoTimer === undefined) {
+        homebridge.globalFakeGatoTimer = new FakeGatoTimer({
+          minutes: this.minutes,
+          log: this.log
+        })
+      }
+
+      this.loaded = false
+      if (homebridge.globalFakeGatoStorage === undefined) {
+        homebridge.globalFakeGatoStorage = new FakeGatoStorage({
+          log: this.log
+        })
+      }
+      homebridge.globalFakeGatoStorage.addWriter(this, {
+        storage: this.storage,
+        path: this.path,
+        filename: undefined,
+        keyPath: homebridge.user.storagePath() || undefined,
+        onReady: () => {
+          this.load((err, loaded) => {
+            if (err) {
+              this.log('Load error :', err)
+            } else {
+              this.loaded = true
+            }
+          })
+        }
+      })
+
+      switch (accessoryType) {
+        case TYPE_WEATHER:
+          this.accessoryType116 = '03 0102 0202 0302'
+          this.accessoryType117 = '07'
+          homebridge.globalFakeGatoTimer.subscribe(this, this.calculateAverage)
+          break
+        case TYPE_ENERGY:
+          this.accessoryType116 = '04 0102 0202 0702 0f03'
+          this.accessoryType117 = '1f'
+          homebridge.globalFakeGatoTimer.subscribe(this, this.calculateAverage)
+          break
+        case TYPE_ROOM:
+          this.accessoryType116 = '04 0102 0202 0402 0f03'
+          this.accessoryType117 = '0f'
+          homebridge.globalFakeGatoTimer.subscribe(this, this.calculateAverage)
+          break
+        case TYPE_DOOR:
+          this.accessoryType116 = '01 0601'
+          this.accessoryType117 = '01'
+          homebridge.globalFakeGatoTimer.subscribe(this, function (params) {
+            const backLog = params.backLog || []
+            const immediate = params.immediate
+            const fakegato = this.service
+            const actualEntry = {}
+            if (backLog.length) {
+              if (!immediate) {
+                actualEntry.time = Math.round(new Date().valueOf() / 1000)
+                actualEntry.status = backLog[0].status
+              } else {
+                actualEntry.time = backLog[0].time
+                actualEntry.status = backLog[0].status
+              }
+              fakegato.log('**Fakegato-timer callbackDoor: ', fakegato.accessoryName, ', immediate: ', immediate, ', entry: ', actualEntry)
+              fakegato._addEntry(actualEntry)
+            }
+          })
+          break
+        case TYPE_MOTION:
+          this.accessoryType116 = '02 1301 1c01'
+          this.accessoryType117 = '02'
+          homebridge.globalFakeGatoTimer.subscribe(this, function (params) {
+            const backLog = params.backLog || []
+            const immediate = params.immediate
+            const fakegato = this.service
+            const actualEntry = {}
+            if (backLog.length) {
+              if (!immediate) {
+                actualEntry.time = Math.round(new Date().valueOf() / 1000)
+                actualEntry.status = backLog[0].status
+              } else {
+                actualEntry.time = backLog[0].time
+                actualEntry.status = backLog[0].status
+              }
+              fakegato.log('**Fakegato-timer callbackMotion: ', fakegato.accessoryName, ', immediate: ', immediate, ', entry: ', actualEntry)
+              fakegato._addEntry(actualEntry)
+            }
+          })
+          break
+        case TYPE_SWITCH:
+          this.accessoryType116 = '01 0e01'
+          this.accessoryType117 = '01'
+          homebridge.globalFakeGatoTimer.subscribe(this, function (params) {
+            const backLog = params.backLog || []
+            const immediate = params.immediate
+            const fakegato = this.service
+            const actualEntry = {}
+            if (backLog.length) {
+              if (!immediate) {
+                actualEntry.time = Math.round(new Date().valueOf() / 1000)
+                actualEntry.status = backLog[0].status
+              } else {
+                actualEntry.time = backLog[0].time
+                actualEntry.status = backLog[0].status
+              }
+              fakegato.log('**Fakegato-timer callbackSwitch: ', fakegato.accessoryName, ', immediate: ', immediate, ', entry: ', actualEntry)
+              fakegato._addEntry(actualEntry)
+            }
+          })
+          break
+        case TYPE_CUSTOM:
+          this.accessory.services.forEach((service, i) => {
+            service.characteristics.forEach((characteristic, i) => {
+              switch (this.uuid.toLongFormUUID(characteristic.UUID)) {
+                case Characteristic.CurrentTemperature.UUID: // Temperature
+                  this.signatures.push({ signature: '0102', length: 4, uuid: this.uuid.toShortFormUUID(characteristic.UUID), factor: 100, entry: 'temp' })
+                  break
+                case Characteristic.CurrentRelativeHumidity.UUID: // Humidity
+                  this.signatures.push({ signature: '0202', length: 4, uuid: this.uuid.toShortFormUUID(characteristic.UUID), factor: 100, entry: 'humidity' })
+                  break
+                case 'E863F10F-079E-48FF-8F27-9C2605A29F52': // CustomCharacteristic.AtmosphericPressureLevel.UUID
+                  this.signatures.push({ signature: '0302', length: 4, uuid: this.uuid.toShortFormUUID(characteristic.UUID), factor: 10, entry: 'pressure' })
+                  break
+                case 'E863F10B-079E-48FF-8F27-9C2605A29F52': // PPM
+                  this.signatures.push({ signature: '0702', length: 4, uuid: this.uuid.toShortFormUUID(characteristic.UUID), factor: 10, entry: 'ppm' })
+                  break
+                case Characteristic.ContactSensorState.UUID: // Contact Sensor State
+                  this.signatures.push({ signature: '0601', length: 2, uuid: this.uuid.toShortFormUUID(characteristic.UUID), factor: 1, entry: 'contact' })
+                  break
+                case 'E863F10D-079E-48FF-8F27-9C2605A29F52': // Power
+                  this.signatures.push({ signature: '0702', length: 4, uuid: this.uuid.toShortFormUUID(characteristic.UUID), factor: 10, entry: 'power' })
+                  break
+                case Characteristic.On.UUID: // Switch On
+                  this.signatures.push({ signature: '0e01', length: 2, uuid: this.uuid.toShortFormUUID(characteristic.UUID), factor: 1, entry: 'status' })
+                  break
+                case Characteristic.MotionDetected.UUID: // Motion Detected
+                  this.signatures.push({ signature: '1c01', length: 2, uuid: this.uuid.toShortFormUUID(characteristic.UUID), factor: 1, entry: 'motion' })
+                  break
+              }
+            })
+          })
+          this.accessoryType116 = (' 0' + this.signatures.length.toString() + ' ' + this.signatures.sort((a, b) => (a.signature > b.signature) ? 1 : -1).map(a => a.signature).join(' ') + ' ')
+          homebridge.globalFakeGatoTimer.subscribe(this, this.calculateAverage)
+          break
+        case TYPE_AQUA:
+          this.accessoryType116 = '03 1f01 2a08 2302'
+          this.accessoryType117 = '05'
+          this.accessoryType117bis = '07'
+          break
+        case TYPE_THERMO:
+          this.accessoryType116 = '05 0102 1102 1001 1201 1d01'
+          this.accessoryType117 = '1f'
+          break
+      }
+
+      this.accessoryType = accessoryType
+      this.firstEntry = 0
+      this.lastEntry = 0
+      this.history = ['noValue']
+      this.memorySize = this.size
+      this.usedMemory = 0
+      this.currentEntry = 1
+      this.transfer = false
+      this.setTime = true
+      this.restarted = true
+      this.refTime = 0
+      this.memoryAddress = 0
+      this.dataStream = ''
+
+      this.saving = false
+
+      this.registerEvents()
+      if (this.storage === undefined) {
+        this.loaded = true
+      }
+    }
+
+    calculateAverage (params) {
+      const backLog = params.backLog || []
+      const previousAvrg = params.previousAvrg || {}
+      const timer = params.timer
+
+      const fakegato = this.service
+      const calc = { sum: {}, num: {}, avrg: {} }
+
+      for (const h in backLog) {
+        if (Object.prototype.hasOwnProperty.call(backLog, h)) { // only valid keys
+          for (const key in backLog[h]) { // each record
+            if (Object.prototype.hasOwnProperty.call(backLog[h], key) && key !== 'time') { // except time
+              if (!calc.sum[key]) {
+                calc.sum[key] = 0
+              }
+              if (!calc.num[key]) {
+                calc.num[key] = 0
+              }
+              calc.sum[key] += backLog[h][key]
+              calc.num[key]++
+              calc.avrg[key] = precisionRound(calc.sum[key] / calc.num[key], 2)
+            }
+          }
+        }
+      }
+      // set the time of the avrg
+      calc.avrg.time = Math.round(new Date().valueOf() / 1000)
+
+      if (!fakegato.disableRepeatLastData) {
+        for (const key in previousAvrg) { // each record of previous average
+          if (Object.prototype.hasOwnProperty.call(previousAvrg, key) && key !== 'time') { // except time
+            if (!backLog.length || calc.avrg[key] === undefined) {
+              calc.avrg[key] = previousAvrg[key]
+            }
+          }
+        }
+      }
+
+      if (Object.keys(calc.avrg).length > 1) {
+        fakegato._addEntry(calc.avrg)
+        timer.emptyData(fakegato)
+      }
+      return calc.avrg
+    }
+
+    registerEvents () {
+      this.service = this.accessory.getService(FakeGatoHistoryService)
+      if (this.service === undefined) {
+        this.service = this.accessory.addService(FakeGatoHistoryService, ucfirst(this.accessory.displayName) + ' History', this.accessoryType)
+      }
+      this.service.getCharacteristic(S2R2Characteristic)
+        .on('get', this.getCurrentS2R2.bind(this))
+      this.service.getCharacteristic(S2W1Characteristic)
+        .on('set', this.setCurrentS2W1.bind(this))
+      this.service.getCharacteristic(S2W2Characteristic)
+        .on('set', this.setCurrentS2W2.bind(this))
+    }
+
+    sendHistory (address) {
+      if (address !== 0) {
+        this.currentEntry = address
+      } else {
+        this.currentEntry = 1
+      }
+      this.transfer = true
+    }
+
+    addEntry (entry) {
+      entry.time = Math.round(new Date().valueOf() / 1000)
+      switch (this.accessoryType) {
+        case TYPE_DOOR:
+        case TYPE_MOTION:
+        case TYPE_SWITCH:
+          homebridge.globalFakeGatoTimer.addData({ entry: entry, service: this, immediateCallback: true })
+          break
+        case TYPE_AQUA:
+          this._addEntry({ time: entry.time, status: entry.status, waterAmount: entry.waterAmount })
+          break
+        case TYPE_WEATHER:
+          homebridge.globalFakeGatoTimer.addData({ entry: entry, service: this })
+          break
+        case TYPE_ROOM:
+          homebridge.globalFakeGatoTimer.addData({ entry: entry, service: this })
+          break
+        case TYPE_ENERGY:
+          homebridge.globalFakeGatoTimer.addData({ entry: entry, service: this })
+          break
+        case TYPE_CUSTOM:
+          if ('power' in entry || 'temp' in entry) {
+            homebridge.globalFakeGatoTimer.addData({ entry: entry, service: this })
+          } else {
+            this._addEntry(entry)
+          }
+          break
+        default:
+          this._addEntry(entry)
+          break
+      }
+    }
+
+    // In order to be consistent with Eve, entry address start from 1
+    _addEntry (entry) {
+      if (this.loaded) {
+        const entry2address = val => {
+          return val % this.memorySize
+        }
+        let val
+        if (this.usedMemory < this.memorySize) {
+          this.usedMemory++
+          this.firstEntry = 0
+          this.lastEntry = this.usedMemory
+        } else {
+          this.firstEntry++
+          this.lastEntry = this.firstEntry + this.usedMemory
+          if (this.restarted) {
+            this.history[entry2address(this.lastEntry)] = {
+              time: entry.time,
+              setRefTime: 1
+            }
+            this.firstEntry++
+            this.lastEntry = this.firstEntry + this.usedMemory
+            this.restarted = false
+          }
+        }
+
+        if (this.refTime === 0) {
+          this.refTime = entry.time - EPOCH_OFFSET
+          this.history[this.lastEntry] = {
+            time: entry.time,
+            setRefTime: 1
+          }
+          this.initialTime = entry.time
+          this.lastEntry++
+          this.usedMemory++
+        }
+
+        this.history[entry2address(this.lastEntry)] = (entry)
+
+        if (this.usedMemory < this.memorySize) {
+          val = Format(
+            '%s00000000%s%s%s%s%s000000000101',
+            numToHex(swap32(entry.time - this.refTime - EPOCH_OFFSET), 8),
+            numToHex(swap32(this.refTime), 8),
+            this.accessoryType116,
+            numToHex(swap16(this.usedMemory + 1), 4),
+            numToHex(swap16(this.memorySize), 4),
+            numToHex(swap32(this.firstEntry), 8))
+        } else {
+          val = Format(
+            '%s00000000%s%s%s%s%s000000000101',
+            numToHex(swap32(entry.time - this.refTime - EPOCH_OFFSET), 8),
+            numToHex(swap32(this.refTime), 8),
+            this.accessoryType116,
+            numToHex(swap16(this.usedMemory), 4),
+            numToHex(swap16(this.memorySize), 4),
+            numToHex(swap32(this.firstEntry + 1), 8))
+        }
+        this.service.getCharacteristic(S2R1Characteristic).setValue(hexToBase64(val))
+        this.log('First entry %s: %s', this.accessory.displayName, this.firstEntry.toString(16))
+        this.log('Last entry %s: %s', this.accessory.displayName, this.lastEntry.toString(16))
+        this.log('Used memory %s: %s', this.accessory.displayName, this.usedMemory.toString(16))
+        this.log('116 %s: %s', this.accessory.displayName, val)
+        if (this.storage !== undefined) {
+          this.save()
+        }
+      } else {
+        setTimeout(() => this._addEntry(entry), 100)
+      }
+    }
+
+    getInitialTime () {
+      return this.initialTime
+    }
+
+    setExtraPersistedData (extra) {
+      this.extra = extra
+    }
+
+    getExtraPersistedData () {
+      return this.extra
+    }
+
+    isHistoryLoaded () {
+      return this.loaded
+    }
+
+    save () {
+      if (this.loaded) {
+        const data = {
+          firstEntry: this.firstEntry,
+          lastEntry: this.lastEntry,
+          usedMemory: this.usedMemory,
+          refTime: this.refTime,
+          initialTime: this.initialTime,
+          history: this.history,
+          extra: this.extra
+        }
+        homebridge.globalFakeGatoStorage.write({
+          service: this,
+          data: typeof (data) === 'object' ? JSON.stringify(data) : data
+        })
+      } else {
+        setTimeout(() => this.save(), 100)
+      }
+    }
+
+    load (cb) {
+      homebridge.globalFakeGatoStorage.read({
+        service: this,
+        callback: function (err, data) {
+          if (!err) {
+            if (data) {
+              try {
+                // this.log('read data from', this.accessory.displayName, ':', data)
+                const jsonFile = typeof (data) === 'object' ? data : JSON.parse(data)
+                this.firstEntry = jsonFile.firstEntry
+                this.lastEntry = jsonFile.lastEntry
+                this.usedMemory = jsonFile.usedMemory
+                this.refTime = jsonFile.refTime
+                this.initialTime = jsonFile.initialTime
+                this.history = jsonFile.history
+                this.extra = jsonFile.extra
+              } catch (e) {
+                this.log('**ERROR fetching persisting data restart from zero - invalid JSON**', e)
+                cb(e, false)
+              }
+              cb(null, true)
+            }
+          } else {
+            // file don't exists
+            cb(null, false)
+          }
+        }.bind(this)
+      })
+    }
+
+    cleanPersist () {
+      this.log('Cleaning...')
+      homebridge.globalFakeGatoStorage.remove({
+        service: this
+      })
+    }
+
+    getCurrentS2R2 (callback) {
+      const entry2address = function (val) {
+        return val % this.memorySize
+      }.bind(this)
+
+      if ((this.currentEntry <= this.lastEntry) && this.transfer) {
+        this.memoryAddress = entry2address(this.currentEntry)
+        for (let i = 0; i < 11; i++) {
+          if ((this.history[this.memoryAddress].setRefTime === 1) || this.setTime || this.currentEntry === this.firstEntry + 1) {
+            this.dataStream += Format(
+              ',15%s 0100 0000 81%s0000 0000 00 0000',
+              numToHex(swap32(this.currentEntry), 8),
+              numToHex(swap32(this.refTime), 8)
+            )
+            this.setTime = false
+          } else {
+            this.log('%s Entry: %s, Address: %s', this.accessory.displayName, this.currentEntry, this.memoryAddress)
+            switch (this.accessoryType) {
+              case TYPE_WEATHER:
+                this.dataStream += Format(
+                  ',10 %s%s-%s:%s %s %s',
+                  numToHex(swap32(this.currentEntry), 8),
+                  numToHex(swap32(this.history[this.memoryAddress].time - this.refTime - EPOCH_OFFSET), 8),
+                  this.accessoryType117,
+                  numToHex(swap16(this.history[this.memoryAddress].temp * 100), 4),
+                  numToHex(swap16(this.history[this.memoryAddress].humidity * 100), 4),
+                  numToHex(swap16(this.history[this.memoryAddress].pressure * 10), 4)
+                )
+                break
+              case TYPE_ENERGY:
+                this.dataStream += Format(
+                  ',14 %s%s-%s:0000 0000 %s 0000 0000',
+                  numToHex(swap32(this.currentEntry), 8),
+                  numToHex(swap32(this.history[this.memoryAddress].time - this.refTime - EPOCH_OFFSET), 8),
+                  this.accessoryType117,
+                  numToHex(swap16(this.history[this.memoryAddress].power * 10), 4)
+                )
+                break
+              case TYPE_ROOM:
+                this.dataStream += Format(
+                  ',13 %s%s%s%s%s%s0000 00',
+                  numToHex(swap32(this.currentEntry), 8),
+                  numToHex(swap32(this.history[this.memoryAddress].time - this.refTime - EPOCH_OFFSET), 8),
+                  this.accessoryType117,
+                  numToHex(swap16(this.history[this.memoryAddress].temp * 100), 4),
+                  numToHex(swap16(this.history[this.memoryAddress].humidity * 100), 4),
+                  numToHex(swap16(this.history[this.memoryAddress].ppm), 4)
+                )
+                break
+              case TYPE_DOOR:
+              case TYPE_MOTION:
+              case TYPE_SWITCH:
+                this.dataStream += Format(
+                  ',0b %s%s%s%s',
+                  numToHex(swap32(this.currentEntry), 8),
+                  numToHex(swap32(this.history[this.memoryAddress].time - this.refTime - EPOCH_OFFSET), 8),
+                  this.accessoryType117,
+                  numToHex(this.history[this.memoryAddress].status, 2)
+                )
+                break
+              case TYPE_AQUA:
+                if (this.history[this.memoryAddress].status) {
+                  this.dataStream += Format(
+                    ',0d %s%s%s%s 300c',
+                    numToHex(swap32(this.currentEntry), 8),
+                    numToHex(swap32(this.history[this.memoryAddress].time - this.refTime - EPOCH_OFFSET), 8),
+                    this.accessoryType117,
+                    numToHex(this.history[this.memoryAddress].status, 2)
+                  )
+                } else {
+                  this.dataStream += Format(
+                    ',15 %s%s%s%s%s 00000000 300c',
+                    numToHex(swap32(this.currentEntry), 8),
+                    numToHex(swap32(this.history[this.memoryAddress].time - this.refTime - EPOCH_OFFSET), 8),
+                    this.accessoryType117bis,
+                    numToHex(this.history[this.memoryAddress].status, 2),
+                    numToHex(swap32(this.history[this.memoryAddress].waterAmount), 8)
+                  )
+                }
+                break
+              case TYPE_THERMO:
+                this.dataStream += Format(
+                  ',11 %s%s%s%s%s%s 0000',
+                  numToHex(swap32(this.currentEntry), 8),
+                  numToHex(swap32(this.history[this.memoryAddress].time - this.refTime - EPOCH_OFFSET), 8),
+                  this.accessoryType117,
+                  numToHex(swap16(this.history[this.memoryAddress].currentTemp * 100), 4),
+                  numToHex(swap16(this.history[this.memoryAddress].setTemp * 100), 4),
+                  numToHex(this.history[this.memoryAddress].valvePosition, 2)
+                )
+                break
+              case TYPE_CUSTOM: {
+                const result = []
+                let bitmask = 0
+                const dataStream = Format('%s%s',
+                  numToHex(swap32(this.currentEntry), 8),
+                  numToHex(swap32(this.history[this.memoryAddress].time - this.refTime - EPOCH_OFFSET), 8)
+                )
+                for (const [key, value] of Object.entries(this.history[this.memoryAddress])) {
+                  switch (key) {
+                    case 'time':
+                      break
+                    default:
+                      for (let x = 0, iLen = this.signatures.length; x < iLen; x++) {
+                        if (this.signatures[x].entry === key) {
+                          switch (this.signatures[x].length) {
+                            case 8:
+                              result[x] = Format('%s', numToHex(swap32(value * this.signatures[x].factor), this.signatures[x].length))
+                              break
+                            case 4:
+                              result[x] = Format('%s', numToHex(swap16(value * this.signatures[x].factor), this.signatures[x].length))
+                              break
+                            case 2:
+                              result[x] = Format('%s', numToHex(value * this.signatures[x].factor, this.signatures[x].length))
+                              break
+                          }
+                          bitmask += Math.pow(2, x)
+                        }
+                      }
+                  }
+                }
+                const results = dataStream + ' ' + numToHex(bitmask, 2) + ' ' + result.map(a => a).join(' ')
+                // console.log('results', numToHex((results.replace(/[^0-9A-F]/ig, '').length) / 2 + 1) + ' ' + results)
+                this.dataStream += (' ' + numToHex((results.replace(/[^0-9A-F]/ig, '').length) / 2 + 1) + ' ' + results + ',')
+                break
+              }
+            }
+          }
+          this.currentEntry++
+          this.memoryAddress = entry2address(this.currentEntry)
+          if (this.currentEntry > this.lastEntry) {
+            break
+          }
+        }
+        this.log('Data %s: %s', this.accessory.displayName, this.dataStream)
+        callback(null, hexToBase64(this.dataStream))
+        this.dataStream = ''
+      } else {
+        this.transfer = false
+        callback(null, hexToBase64('00'))
+      }
+    }
+
+    setCurrentS2W1 (val, callback) {
+      callback(null)
+      this.log('Data request %s: %s', this.accessory.displayName, base64ToHex(val))
+      const valHex = base64ToHex(val)
+      const substring = valHex.substring(4, 12)
+      const valInt = parseInt(substring, 16)
+      const address = swap32(valInt)
+      const hexAddress = address.toString('16')
+      this.log('Address requested %s: %s', this.accessory.displayName, hexAddress)
+      this.sendHistory(address)
+    }
+
+    setCurrentS2W2 (val, callback) {
+      this.log('Clock adjust %s: %s', this.accessory.displayName, base64ToHex(val))
+      callback(null)
+    }
+  }
+
+  FakeGatoHistoryService.UUID = 'E863F007-079E-48FF-8F27-9C2605A29F52'
+  return FakeGatoHistory
+}
diff --git a/lib/fakegato/fakegato-storage.js b/lib/fakegato/fakegato-storage.js
index 626d5a45..32a4ce36 100644
--- a/lib/fakegato/fakegato-storage.js
+++ b/lib/fakegato/fakegato-storage.js
@@ -1,173 +1,105 @@
-/*jshint esversion: 6,node: true,-W041: false */
-'use strict';
+/* jshint -W014, -W033, esversion: 9 */
+/* eslint-disable new-cap */
+'use strict'
 
-const DEBUG = true;
-
-var fs = require('fs');
-var os = require('os');
-var path = require('path');
-var hostname = os.hostname().split(".")[0];
-
-// var googleDrive = require('./lib/googleDrive').drive;
-
-var fileSuffix = '_persist.json';
-
-var thisStorage;
+const fs = require('fs')
+const os = require('os')
+const path = require('path')
+const hostname = os.hostname().split('.')[0]
+const fileSuffix = '_persist.json'
 
 class FakeGatoStorage {
-	constructor(params) {
-		if (!params)
-			params = {};
-
-		this.writers = [];
-
-		this.log = params.log || {};
-		if (!this.log.debug) {
-			this.log.debug = DEBUG ? console.log : function () { };
-		}
-		thisStorage = this;
-		this.addingWriter = false;
-	}
-
-	addWriter(service, params) {
-		if (!this.addingWriter) {
-			this.addingWriter = true;
-			if (!params)
-				params = {};
-
-			this.log.debug("** Fakegato-storage AddWriter :", service.accessoryName);
-
-			let newWriter = {
-				'service': service,
-				'callback': params.callback,
-				'storage': params.storage || 'fs',
-				'fileName': params.filename || hostname + "_" + service.accessoryName + fileSuffix		// Unique filename per homebridge server.  Allows test environments on other servers not to break prod.
-			};
-			var onReady = typeof (params.onReady) == 'function' ? params.onReady : function () { }.bind(this);
-
-			switch (newWriter.storage) {
-				case 'fs':
-					newWriter.storageHandler = fs;
-					newWriter.path = params.path || path.join(os.homedir(), '.homebridge');
-					this.writers.push(newWriter);
-					this.addingWriter = false;
-					onReady();
-					break;
-				/*
-				case 'googleDrive':
-					newWriter.path = params.path || 'fakegato';
-					newWriter.keyPath = params.keyPath || path.join(os.homedir(), '.homebridge');
-					newWriter.storageHandler = new googleDrive({
-						keyPath: newWriter.keyPath, callback: function () {
-							this.addingWriter = false;
-							onReady(arguments);
-						}.bind(this), folder: newWriter.path
-					});
-					this.writers.push(newWriter);
-					break;
-				case 'memcached' :
-
-				break;
-				*/
-			}
-		} else {
-			setTimeout(function () {
-				this.addWriter(service, params);
-			}.bind(this), 100);
-		}
-	}
-	getWriter(service) {
-		let findServ = function (element) {
-			return element.service === service;
-		};
-		return this.writers.find(findServ);
-	}
-	_getWriterIndex(service) {
-		let findServ = function (element) {
-			return element.service === service;
-		};
-		return this.writers.findIndex(findServ);
-	}
-	getWriters() {
-		return this.writers;
-	}
-	delWriter(service) {
-		let index = this._getWriterIndex(service);
-		this.writers.splice(index, 1);
-	}
-
-	write(params) { // must be asynchronous
-		if (!this.writing) {
-			this.writing = true;
-			let writer = this.getWriter(params.service);
-			let callBack = typeof (params.callback) == 'function' ? params.callback : (typeof (writer.callback) == 'function' ? writer.callback : function () { }); // use parameter callback or writer callback or empty function
-			switch (writer.storage) {
-				case 'fs':
-					this.log.debug("** Fakegato-storage write FS file:", path.join(writer.path, writer.fileName), params.data.substr(1, 80));
-					writer.storageHandler.writeFile(path.join(writer.path, writer.fileName), params.data, 'utf8', function () {
-						this.writing = false;
-						callBack(arguments);
-					}.bind(this));
-					break;
-				/*
-				case 'googleDrive':
-					this.log.debug("** Fakegato-storage write googleDrive file:", writer.path, writer.fileName, params.data.substr(1, 80));
-					writer.storageHandler.writeFile(writer.path, writer.fileName, params.data, function () {
-						this.writing = false;
-						callBack(arguments);
-					}.bind(this));
-					break;
-				case 'memcached' :
-
-				break;
-				*/
-			}
-		} else {
-			setTimeout(function () { // retry in 100ms
-				this.write(params);
-			}.bind(this), 100);
-		}
-	}
-	read(params) {
-		let writer = this.getWriter(params.service);
-		let callBack = typeof (params.callback) == 'function' ? params.callback : (typeof (writer.callback) == 'function' ? writer.callback : function () { }); // use parameter callback or writer callback or empty function
-		switch (writer.storage) {
-			case 'fs':
-				this.log.debug("** Fakegato-storage read FS file:", path.join(writer.path, writer.fileName));
-				writer.storageHandler.readFile(path.join(writer.path, writer.fileName), 'utf8', callBack);
-				break;
-			/*
-			case 'googleDrive':
-				this.log.debug("** Fakegato-storage read googleDrive file: %s/%s", writer.path, writer.fileName);
-				writer.storageHandler.readFile(writer.path, writer.fileName, callBack);
-				break;
-			case 'memcached' :
-
-			break;
-			*/
-		}
-	}
-	remove(params) {
-		let writer = this.getWriter(params.service);
-		let callBack = typeof (params.callback) == 'function' ? params.callback : (typeof (writer.callback) == 'function' ? writer.callback : function () { }); // use parameter callback or writer callback or empty function
-		switch (writer.storage) {
-			case 'fs':
-				this.log.debug("** Fakegato-storage delete FS file:", path.join(writer.path, writer.fileName));
-				writer.storageHandler.unlink(path.join(writer.path, writer.fileName), callBack);
-				break;
-			/*
-			case 'googleDrive':
-				this.log.debug("** Fakegato-storage delete googleDrive file:", writer.path, writer.fileName);
-				writer.storageHandler.deleteFile(writer.path, writer.fileName, callBack);
-				break;
-			case 'memcached' :
-
-			break;
-			*/
-		}
-	}
+  constructor (params) {
+    this.writers = []
+    this.log = params.log
+    this.addingWriter = false
+  }
+
+  addWriter (service, params) {
+    if (!this.addingWriter) {
+      this.addingWriter = true
+      this.log('[%s] fakegato storage - addWriter', service.accessoryName)
+      const newWriter = {
+        service,
+        callback: params.callback,
+        storage: params.storage || 'fs',
+        fileName: params.filename || hostname + '_' + service.accessoryName + fileSuffix
+      }
+      const onReady = params.onReady
+      newWriter.storageHandler = fs
+      newWriter.path = params.path
+      this.writers.push(newWriter)
+      this.addingWriter = false
+      onReady()
+    } else {
+      setTimeout(() => this.addWriter(service, params), 100)
+    }
+  }
+
+  getWriter (service) {
+    const findServ = function (element) {
+      return element.service === service
+    }
+    return this.writers.find(findServ)
+  }
+
+  _getWriterIndex (service) {
+    const findServ = function (element) {
+      return element.service === service
+    }
+    return this.writers.findIndex(findServ)
+  }
+
+  getWriters () {
+    return this.writers
+  }
+
+  delWriter (service) {
+    const index = this._getWriterIndex(service)
+    this.writers.splice(index, 1)
+  }
+
+  write (params) {
+    // *** Must be asynchronous *** \\
+    if (!this.writing) {
+      this.writing = true
+      const writer = this.getWriter(params.service)
+      const callBack = typeof (params.callback) === 'function'
+        ? params.callback
+        : typeof (writer.callback) === 'function'
+          ? writer.callback
+          : function () { }
+      this.log('Fakegato storage - write file: %s.', path.join(writer.path, writer.fileName), params.data.substr(1, 80))
+      writer.storageHandler.writeFile(path.join(writer.path, writer.fileName), params.data, 'utf8', () => {
+        this.writing = false
+        callBack(arguments)
+      })
+    } else {
+      setTimeout(() => this.write(params), 100)
+    }
+  }
+
+  read (params) {
+    const writer = this.getWriter(params.service)
+    const callBack = typeof (params.callback) === 'function'
+      ? params.callback
+      : typeof (writer.callback) === 'function'
+        ? writer.callback
+        : function () { }
+    this.log('Fakegato storage read file: %s.', path.join(writer.path, writer.fileName))
+    writer.storageHandler.readFile(path.join(writer.path, writer.fileName), 'utf8', callBack)
+  }
+
+  remove (params) {
+    const writer = this.getWriter(params.service)
+    const callBack = typeof (params.callback) === 'function'
+      ? params.callback
+      : typeof (writer.callback) === 'function'
+        ? writer.callback
+        : function () { }
+    this.log('Fakegato storage delete file: %s.', path.join(writer.path, writer.fileName))
+    writer.storageHandler.unlink(path.join(writer.path, writer.fileName), callBack)
+  }
 }
 
-module.exports = {
-	FakeGatoStorage: FakeGatoStorage
-};
+module.exports = { FakeGatoStorage }
diff --git a/lib/fakegato/fakegato-timer.js b/lib/fakegato/fakegato-timer.js
index 2a78bef9..dad0581e 100644
--- a/lib/fakegato/fakegato-timer.js
+++ b/lib/fakegato/fakegato-timer.js
@@ -1,133 +1,126 @@
-/*jshint esversion: 6,node: true,-W041: false */
-'use strict';
-
-const DEBUG = true;
+/* jshint -W014, -W033, esversion: 9 */
+/* eslint-disable new-cap */
+'use strict'
 
 class FakeGatoTimer {
-	constructor(params) {
-		if (!params)
-			params = {};
-		this.subscribedServices = [];
-		this.minutes = params.minutes || 10;
-
-		this.intervalID = null;
-		this.running = false;
-		this.log = params.log || {};
-		if (!this.log.debug) {
-			this.log.debug = DEBUG ? console.log : function () { };
-		}
-	}
-
-	// Subscription management
-	subscribe(service, callback) {
-		this.log.debug("** Fakegato-timer Subscription :", service.accessoryName);
-		let newService = {
-			'service': service,
-			'callback': callback,
-			'backLog': [],
-			'previousBackLog': [],
-			'previousAvrg': {}
-		};
-
-		this.subscribedServices.push(newService);
-	}
-	getSubscriber(service) {
-		let findServ = function (element) {
-			return element.service === service;
-		};
-		return this.subscribedServices.find(findServ);
-	}
-	_getSubscriberIndex(service) {
-		let findServ = function (element) {
-			return element.service === service;
-		};
-		return this.subscribedServices.findIndex(findServ);
-	}
-	getSubscribers() {
-		return this.subscribedServices;
-	}
-	unsubscribe(service) {
-		let index = this._getSubscriberIndex(service);
-		this.subscribedServices.splice(index, 1);
-		if (this.subscribedServices.length === 0 && this.running)
-			this.stop();
-	}
-
-	// Timer management
-	start() {
-		this.log.debug("**Start Global Fakegato-Timer - " + this.minutes + "min**");
-		if (this.running)
-			this.stop();
-		this.running = true;
-		this.intervalID = setInterval(this.executeCallbacks.bind(this), this.minutes * 60 * 1000);
-	}
-	stop() {
-		this.log.debug("**Stop Global Fakegato-Timer****");
-		clearInterval(this.intervalID);
-		this.running = false;
-		this.intervalID = null;
-	}
-
-	// Data management
-	executeCallbacks() {
-		this.log.debug("**Fakegato-timer: executeCallbacks**");
-		if (this.subscribedServices.length !== 0) {
-			for (let s in this.subscribedServices) {
-				if (this.subscribedServices.hasOwnProperty(s)) {
-
-					let service = this.subscribedServices[s];
-					if (typeof (service.callback) == 'function') {
-						service.previousAvrg = service.callback({
-							'backLog': service.backLog,
-							'previousAvrg': service.previousAvrg,
-							'timer': this,
-							'immediate': false
-						});
-					}
-				}
-			}
-		}
-	}
-	executeImmediateCallback(service) {
-		this.log.debug("**Fakegato-timer: executeImmediateCallback**");
-
-		if (typeof (service.callback) == 'function' && service.backLog.length)
-			service.callback({
-				'backLog': service.backLog,
-				'timer': this,
-				'immediate': true
-			});
-	}
-	addData(params) {
-		let data = params.entry;
-		let service = params.service;
-		let immediateCallback = params.immediateCallback || false;
-
-		this.log.debug("**Fakegato-timer: addData ", service.accessoryName, data, " immediate: ", immediateCallback);
-
-		if (immediateCallback) // door or motion -> replace
-			this.getSubscriber(service).backLog[0] = data;
-		else
-			this.getSubscriber(service).backLog.push(data);
-
-		if (immediateCallback) {
-			//setTimeout(this.executeImmediateCallback.bind(this), 0,service);
-			this.executeImmediateCallback(this.getSubscriber(service));
-		}
-
-		if (this.running === false)
-			this.start();
-	}
-	emptyData(service) {
-		this.log.debug("**Fakegato-timer: emptyData **", service.accessoryName);
-		let source = this.getSubscriber(service);
-
-		if (source.backLog.length) source.previousBackLog = source.backLog;
-		source.backLog = [];
-	}
-
+  constructor (params) {
+    this.subscribedServices = []
+    this.minutes = params.minutes
+    this.log = params.log
+  }
+
+  subscribe (service, callback) {
+    this.log('[%s] fakegato-timer subscription.', service.accessoryName)
+    const newService = {
+      service,
+      callback,
+      backLog: [],
+      previousBackLog: [],
+      previousAvrg: {}
+    }
+    this.subscribedServices.push(newService)
+  }
+
+  getSubscriber (service) {
+    const findServ = function (element) {
+      return element.service === service
+    }
+    return this.subscribedServices.find(findServ)
+  }
+
+  _getSubscriberIndex (service) {
+    const findServ = function (element) {
+      return element.service === service
+    }
+    return this.subscribedServices.findIndex(findServ)
+  }
+
+  getSubscribers () {
+    return this.subscribedServices
+  }
+
+  unsubscribe (service) {
+    const index = this._getSubscriberIndex(service)
+    this.subscribedServices.splice(index, 1)
+    if (this.subscribedServices.length === 0 && this.running) {
+      this.stop()
+    }
+  }
+
+  start () {
+    this.log('Start global fakegato timer [%s mins]', this.minutes)
+    if (this.running) {
+      this.stop()
+    }
+    this.running = true
+    this.intervalID = setInterval(this.executeCallbacks.bind(this), this.minutes * 60 * 1000)
+  }
+
+  stop () {
+    this.log('**Stop global fakegato timer')
+    clearInterval(this.intervalID)
+    this.running = false
+    this.intervalID = null
+  }
+
+  executeCallbacks () {
+    this.log('Fakegato timer - executeCallbacks')
+    if (this.subscribedServices.length !== 0) {
+      for (const s in this.subscribedServices) {
+        if (Object.prototype.hasOwnProperty.call(this.subscribedServices, s)) {
+          const service = this.subscribedServices[s]
+          if (typeof (service.callback) === 'function') {
+            service.previousAvrg = service.callback({
+              backLog: service.backLog,
+              previousAvrg: service.previousAvrg,
+              timer: this,
+              immediate: false
+            })
+          }
+        }
+      }
+    }
+  }
+
+  executeImmediateCallback (service) {
+    this.log('Fakegato timer - executeImmediateCallback')
+
+    if (typeof (service.callback) === 'function' && service.backLog.length) {
+      service.callback({
+        backLog: service.backLog,
+        timer: this,
+        immediate: true
+      })
+    }
+  }
+
+  addData (params) {
+    const data = params.entry
+    const service = params.service
+    const immediateCallback = params.immediateCallback || false
+    this.log('[%s] fakegato timer - addData [%s] immediate [%s].', service.accessoryName, data, immediateCallback)
+    if (immediateCallback) {
+      // door or motion -> replace
+      this.getSubscriber(service).backLog[0] = data
+    } else {
+      this.getSubscriber(service).backLog.push(data)
+    }
+    if (immediateCallback) {
+      this.executeImmediateCallback(this.getSubscriber(service))
+    }
+    if (this.running) {
+      this.start()
+    }
+  }
+
+  emptyData (service) {
+    this.log('[%s] fakegato timer - emptyData.', service.accessoryName)
+    const source = this.getSubscriber(service)
+    if (source.backLog.length) {
+      source.previousBackLog = source.backLog
+    }
+    source.backLog = []
+  }
 }
 
-module.exports = {
-	FakeGatoTimer: FakeGatoTimer
-};
+module.exports = { FakeGatoTimer }
diff --git a/lib/fakegato/uuid.js b/lib/fakegato/uuid.js
index f8aa9820..c95d91f0 100644
--- a/lib/fakegato/uuid.js
+++ b/lib/fakegato/uuid.js
@@ -1,25 +1,35 @@
-// https://github.com/homebridge/HAP-NodeJS/blob/master/src/lib/util/uuid.ts
+/* jshint -W014, -W033, esversion: 9 */
+/* eslint-disable new-cap */
+'use strict'
 
-const VALID_UUID_REGEX = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+// *** https://github.com/homebridge/HAP-NodeJS/blob/master/src/lib/util/uuid.ts *** \\
 
-function isValid(UUID) {
-  return VALID_UUID_REGEX.test(UUID);
+const VALID_UUID_REGEX = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i
+
+function isValid (UUID) {
+  return VALID_UUID_REGEX.test(UUID)
 }
-const VALID_SHORT_REGEX = /^[0-9a-f]{1,8}$/i;
+const VALID_SHORT_REGEX = /^[0-9a-f]{1,8}$/i
 
-function toLongFormUUID(uuid, base = '-0000-1000-8000-0026BB765291') {
-  if (isValid(uuid)) return uuid.toUpperCase();
-  if (!VALID_SHORT_REGEX.test(uuid)) throw new TypeError('uuid was not a valid UUID or short form UUID');
-  if (!isValid('00000000' + base)) throw new TypeError('base was not a valid base UUID');
+function toLongFormUUID (uuid, base = '-0000-1000-8000-0026BB765291') {
+  if (isValid(uuid)) {
+    return uuid.toUpperCase()
+  }
+  if (!VALID_SHORT_REGEX.test(uuid)) {
+    throw new TypeError('uuid was not a valid UUID or short form UUID')
+  }
+  if (!isValid('00000000' + base)) {
+    throw new TypeError('base was not a valid base UUID')
+  }
 
-  return (('00000000' + uuid).substr(-8) + base).toUpperCase();
+  return (('00000000' + uuid).substr(-8) + base).toUpperCase()
 }
 
-function toShortFormUUID(uuid, base = '-0000-1000-8000-0026BB765291') {
-  uuid = toLongFormUUID(uuid, base);
-  return (uuid.substr(0, 8));
+function toShortFormUUID (uuid, base = '-0000-1000-8000-0026BB765291') {
+  uuid = toLongFormUUID(uuid, base)
+  return (uuid.substr(0, 8))
 }
 
-exports.isValid = isValid;
-exports.toLongFormUUID = toLongFormUUID;
-exports.toShortFormUUID = toShortFormUUID;
+exports.isValid = isValid
+exports.toLongFormUUID = toLongFormUUID
+exports.toShortFormUUID = toShortFormUUID

From 51d043809cf76341d31003916e53b2909296fa4e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 15 Jan 2021 11:21:35 +0000
Subject: [PATCH 1168/3183] relocate channelCount

---
 lib/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/index.js b/lib/index.js
index 337cc053..6eb159e6 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -581,13 +581,13 @@ class eWeLinkPlatform {
     try {
       // *** Get the switchNumber which can be {X, 0, 1, 2, 3, 4, ...} *** \\
       const switchNumber = hbDeviceId.split('SW')[1].toString()
+      const channelCount = type === 'rf_pri'
 
       // *** Set up the device name which can depend on the accessory type *** \\
       if (this.nameOverride[hbDeviceId]) {
         newDeviceName = this.nameOverride[hbDeviceId]
       } else {
         newDeviceName = type === 'rf_sub' ? extraContext.name : device.name
-        const channelCount = type === 'rf_pri'
           ? Object.keys((device.tags && device.tags.zyx_info) || []).length
           : this.helpers.chansFromUiid[device.extra.uiid]
         if (['1', '2', '3', '4'].includes(switchNumber) && type !== 'rf_sub') {

From 3c6493fd9481a930625037121c21b988aff59086 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 15 Jan 2021 11:21:51 +0000
Subject: [PATCH 1169/3183] fakegato log to debug

---
 lib/device/outlet.js        | 2 +-
 lib/device/rf-bridge.js     | 2 +-
 lib/device/scm.js           | 2 +-
 lib/device/sensor.js        | 2 +-
 lib/device/switch-multi.js  | 2 +-
 lib/device/switch-single.js | 2 +-
 lib/device/switch-valve.js  | 2 +-
 lib/device/th-outlet.js     | 2 +-
 lib/device/th-thermo.js     | 2 +-
 lib/device/usb.js           | 2 +-
 lib/device/zb-dev.js        | 8 ++++----
 11 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/lib/device/outlet.js b/lib/device/outlet.js
index 2f116d21..8a3ce2c6 100644
--- a/lib/device/outlet.js
+++ b/lib/device/outlet.js
@@ -105,7 +105,7 @@ module.exports = class deviceOutlet {
         accessory.context.energyReadingTotal = 0
         this.service.updateCharacteristic(this.eveTotalConsumption, 0)
       })
-    accessory.log = this.log
+    accessory.log = platform.debug ? this.log : () => {}
     accessory.eveService = new this.platform.eveService('energy', accessory)
     setInterval(() => {
       let total = 0
diff --git a/lib/device/rf-bridge.js b/lib/device/rf-bridge.js
index 620885ee..93a8621b 100644
--- a/lib/device/rf-bridge.js
+++ b/lib/device/rf-bridge.js
@@ -79,7 +79,7 @@ module.exports = class deviceRFBridge {
       }
       const service = accessory.getService(serv) || accessory.addService(serv)
       service.updateCharacteristic(char, 0)
-      accessory.log = this.log
+      accessory.log = platform.debug ? this.log : () => {}
       accessory.eveService = new this.platform.eveService(eveType, accessory)
     }
     this.accessory = accessory
diff --git a/lib/device/scm.js b/lib/device/scm.js
index e8278a7b..5e794fde 100644
--- a/lib/device/scm.js
+++ b/lib/device/scm.js
@@ -12,7 +12,7 @@ module.exports = class deviceSCM {
     this.service = accessory.getService(this.Service.Switch) || accessory.addService(this.Service.Switch)
     this.service.getCharacteristic(this.Characteristic.On)
       .on('set', this.internalUpdate.bind(this))
-    accessory.log = this.log
+    accessory.log = platform.debug ? this.log : () => {}
     accessory.eveService = new this.platform.eveService('switch', accessory)
     this.accessory = accessory
   }
diff --git a/lib/device/sensor.js b/lib/device/sensor.js
index 3bf2fadd..6413bbaa 100644
--- a/lib/device/sensor.js
+++ b/lib/device/sensor.js
@@ -30,7 +30,7 @@ module.exports = class deviceSensor {
         : this.lowBattThreshold
     this.contactService = accessory.getService(this.Service.ContactSensor) || accessory.addService(this.Service.ContactSensor)
     this.batteryService = accessory.getService(this.Service.BatteryService) || accessory.addService(this.Service.BatteryService)
-    accessory.log = this.log
+    accessory.log = platform.debug ? this.log : () => {}
     accessory.eveService = new this.platform.eveService('door', accessory)
     this.accessory = accessory
   }
diff --git a/lib/device/switch-multi.js b/lib/device/switch-multi.js
index 70aab9a7..09cd074d 100644
--- a/lib/device/switch-multi.js
+++ b/lib/device/switch-multi.js
@@ -12,7 +12,7 @@ module.exports = class deviceSwitchMulti {
     this.service = accessory.getService(this.Service.Switch) || accessory.addService(this.Service.Switch)
     this.service.getCharacteristic(this.Characteristic.On)
       .on('set', this.internalUpdate.bind(this))
-    accessory.log = this.log
+    accessory.log = platform.debug ? this.log : () => {}
     accessory.eveService = new this.platform.eveService('switch', accessory)
     this.accessory = accessory
   }
diff --git a/lib/device/switch-single.js b/lib/device/switch-single.js
index de199228..dba636ef 100644
--- a/lib/device/switch-single.js
+++ b/lib/device/switch-single.js
@@ -15,7 +15,7 @@ module.exports = class deviceSwitchSingle {
     if (accessory.getService(this.Service.Outlet)) {
       accessory.removeService(accessory.getService(this.Service.Outlet))
     }
-    accessory.log = this.log
+    accessory.log = platform.debug ? this.log : () => {}
     accessory.eveService = new this.platform.eveService('switch', accessory)
     this.accessory = accessory
   }
diff --git a/lib/device/switch-valve.js b/lib/device/switch-valve.js
index 6425bb0b..3ae6ec16 100644
--- a/lib/device/switch-valve.js
+++ b/lib/device/switch-valve.js
@@ -31,7 +31,7 @@ module.exports = class deviceSwitchValve {
         }
         callback()
       })
-    accessory.log = this.log
+    accessory.log = platform.debug ? this.log : () => {}
     accessory.eveService = new this.platform.eveService('switch', accessory)
     this.accessory = accessory
   }
diff --git a/lib/device/th-outlet.js b/lib/device/th-outlet.js
index e2da811c..ff3b5bcc 100644
--- a/lib/device/th-outlet.js
+++ b/lib/device/th-outlet.js
@@ -29,7 +29,7 @@ module.exports = class deviceTHOutlet {
     if (accessory.context.sensorType !== 'DS18B20') {
       this.humiService = accessory.getService(this.Service.HumiditySensor) || accessory.addService(this.Service.HumiditySensor)
     }
-    accessory.log = this.log
+    accessory.log = platform.debug ? this.log : () => {}
     accessory.eveService = new this.platform.eveService('custom', accessory)
     this.accessory = accessory
   }
diff --git a/lib/device/th-thermo.js b/lib/device/th-thermo.js
index 4dc2d4ff..7b9e7ff8 100644
--- a/lib/device/th-thermo.js
+++ b/lib/device/th-thermo.js
@@ -33,7 +33,7 @@ module.exports = class deviceTHThermo {
     ) {
       this.service.addCharacteristic(this.Characteristic.CurrentRelativeHumidity)
     }
-    accessory.log = this.log
+    accessory.log = platform.debug ? this.log : () => {}
     accessory.eveService = new this.platform.eveService('custom', accessory)
     this.accessory = accessory
   }
diff --git a/lib/device/usb.js b/lib/device/usb.js
index 34c75425..a604d3ab 100644
--- a/lib/device/usb.js
+++ b/lib/device/usb.js
@@ -22,7 +22,7 @@ module.exports = class deviceUSB {
     }
     this.service.getCharacteristic(this.Characteristic.On)
       .on('set', this.internalUpdate.bind(this))
-    accessory.log = this.log
+    accessory.log = platform.debug ? this.log : () => {}
     accessory.eveService = new this.platform.eveService('switch', accessory)
     this.accessory = accessory
   }
diff --git a/lib/device/zb-dev.js b/lib/device/zb-dev.js
index da459d74..e59ce69b 100644
--- a/lib/device/zb-dev.js
+++ b/lib/device/zb-dev.js
@@ -53,7 +53,7 @@ module.exports = class deviceZBDev {
           accessory.removeService(accessory.getService(this.Service.BatteryService))
         }
         if (!accessory.getService(this.Service.Switch)) accessory.addService(this.Service.Switch)
-        accessory.log = this.log
+        accessory.log = platform.debug ? this.log : () => {}
         accessory.eveService = new this.platform.eveService('switch', accessory)
         accessory.getService(this.Service.Switch).getCharacteristic(this.Characteristic.On)
           .on('set', this.internalUpdate.bind(this))
@@ -64,20 +64,20 @@ module.exports = class deviceZBDev {
         tempService.getCharacteristic(this.Characteristic.CurrentTemperature)
           .setProps({ minValue: -100 })
         if (!accessory.getService(this.Service.HumiditySensor)) accessory.addService(this.Service.HumiditySensor)
-        accessory.log = this.log
+        accessory.log = platform.debug ? this.log : () => {}
         accessory.eveService = new this.platform.eveService('weather', accessory)
         break
       }
       case 2026:
         if (!accessory.getService(this.Service.BatteryService)) accessory.addService(this.Service.BatteryService)
         if (!accessory.getService(this.Service.MotionSensor)) accessory.addService(this.Service.MotionSensor)
-        accessory.log = this.log
+        accessory.log = platform.debug ? this.log : () => {}
         accessory.eveService = new this.platform.eveService('motion', accessory)
         break
       case 3026:
         if (!accessory.getService(this.Service.BatteryService)) accessory.addService(this.Service.BatteryService)
         if (!accessory.getService(this.Service.ContactSensor)) accessory.addService(this.Service.ContactSensor)
-        accessory.log = this.log
+        accessory.log = platform.debug ? this.log : () => {}
         accessory.eveService = new this.platform.eveService('door', accessory)
         break
     }

From 1d603290d79f862dd98501b78eda3003de0ce844 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 15 Jan 2021 11:47:39 +0000
Subject: [PATCH 1170/3183] update message

---
 lib/utils/helpers.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/utils/helpers.js b/lib/utils/helpers.js
index a8ab7368..3d49c560 100644
--- a/lib/utils/helpers.js
+++ b/lib/utils/helpers.js
@@ -6,7 +6,7 @@ module.exports = {
   hasProperty: (obj, prop) => Object.prototype.hasOwnProperty.call(obj, prop),
   logMessages: [
     "Don't forget to ☆ this plugin on GitHub if you're finding it useful!",
-    'Have a feature request? Visit http://bit.ly/hb-ewelink-issues. to ask!',
+    'Have a feature request? Visit http://bit.ly/hb-ewelink-issues to ask!',
     'Interested in sponsoring this plugin? https://github.com/sponsors/bwp91',
     "Join the plugin's Discord community! https://discord.gg/cMGhNtZ3tW",
     'Thanks for using this plugin, I hope you find it helpful!',

From e50e21c2d2c374ea52c390941d5b1fb4ead467d9 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 15 Jan 2021 11:54:28 +0000
Subject: [PATCH 1171/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 98fdbba0..8e42b5ce 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,13 @@
 
 All notable changes to this homebridge-ewelink will be documented in this file.
 
+## BETA
+
+## Changes
+
+* Fakegato debugging will now appear with plugin `debug` on rather then Homebridge `debug` on
+* Fakegato (Eve History Service Library) code formatting to StandardJS
+
 ## 4.4.0 (2021-01-14)
 
 ### ⚠️ Breaking Changes

From edb71a7534e45d1e134900152d7054fc0451960e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 15 Jan 2021 11:58:28 +0000
Subject: [PATCH 1172/3183] 4.4.1-0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 5eacaa04..a349f3e2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.4.0",
+  "version": "4.4.1-0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 4b7d9a29..e58148c9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.4.0",
+  "version": "4.4.1-0",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From af0782738d7cc863d96cda3dba37c3162d1d2b90 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 15 Jan 2021 15:45:00 +0000
Subject: [PATCH 1173/3183] fakegato implementation

---
 lib/device/outlet.js             |   1 -
 lib/device/rf-bridge.js          |   1 -
 lib/device/scm.js                |   1 -
 lib/device/sensor.js             |   1 -
 lib/device/switch-multi.js       |   1 -
 lib/device/switch-single.js      |   1 -
 lib/device/switch-valve.js       |   1 -
 lib/device/th-outlet.js          |   1 -
 lib/device/th-thermo.js          |   1 -
 lib/device/usb.js                |   1 -
 lib/device/zb-dev.js             |   4 -
 lib/fakegato/fakegato-history.js | 184 ++++++++++++-------------------
 lib/fakegato/fakegato-storage.js | 102 +++++------------
 lib/fakegato/fakegato-timer.js   |  22 ++--
 lib/index.js                     |   4 +-
 15 files changed, 111 insertions(+), 215 deletions(-)

diff --git a/lib/device/outlet.js b/lib/device/outlet.js
index 8a3ce2c6..d627b09e 100644
--- a/lib/device/outlet.js
+++ b/lib/device/outlet.js
@@ -105,7 +105,6 @@ module.exports = class deviceOutlet {
         accessory.context.energyReadingTotal = 0
         this.service.updateCharacteristic(this.eveTotalConsumption, 0)
       })
-    accessory.log = platform.debug ? this.log : () => {}
     accessory.eveService = new this.platform.eveService('energy', accessory)
     setInterval(() => {
       let total = 0
diff --git a/lib/device/rf-bridge.js b/lib/device/rf-bridge.js
index 93a8621b..70c91913 100644
--- a/lib/device/rf-bridge.js
+++ b/lib/device/rf-bridge.js
@@ -79,7 +79,6 @@ module.exports = class deviceRFBridge {
       }
       const service = accessory.getService(serv) || accessory.addService(serv)
       service.updateCharacteristic(char, 0)
-      accessory.log = platform.debug ? this.log : () => {}
       accessory.eveService = new this.platform.eveService(eveType, accessory)
     }
     this.accessory = accessory
diff --git a/lib/device/scm.js b/lib/device/scm.js
index 5e794fde..8c027da8 100644
--- a/lib/device/scm.js
+++ b/lib/device/scm.js
@@ -12,7 +12,6 @@ module.exports = class deviceSCM {
     this.service = accessory.getService(this.Service.Switch) || accessory.addService(this.Service.Switch)
     this.service.getCharacteristic(this.Characteristic.On)
       .on('set', this.internalUpdate.bind(this))
-    accessory.log = platform.debug ? this.log : () => {}
     accessory.eveService = new this.platform.eveService('switch', accessory)
     this.accessory = accessory
   }
diff --git a/lib/device/sensor.js b/lib/device/sensor.js
index 6413bbaa..b2dc27df 100644
--- a/lib/device/sensor.js
+++ b/lib/device/sensor.js
@@ -30,7 +30,6 @@ module.exports = class deviceSensor {
         : this.lowBattThreshold
     this.contactService = accessory.getService(this.Service.ContactSensor) || accessory.addService(this.Service.ContactSensor)
     this.batteryService = accessory.getService(this.Service.BatteryService) || accessory.addService(this.Service.BatteryService)
-    accessory.log = platform.debug ? this.log : () => {}
     accessory.eveService = new this.platform.eveService('door', accessory)
     this.accessory = accessory
   }
diff --git a/lib/device/switch-multi.js b/lib/device/switch-multi.js
index 09cd074d..4685988e 100644
--- a/lib/device/switch-multi.js
+++ b/lib/device/switch-multi.js
@@ -12,7 +12,6 @@ module.exports = class deviceSwitchMulti {
     this.service = accessory.getService(this.Service.Switch) || accessory.addService(this.Service.Switch)
     this.service.getCharacteristic(this.Characteristic.On)
       .on('set', this.internalUpdate.bind(this))
-    accessory.log = platform.debug ? this.log : () => {}
     accessory.eveService = new this.platform.eveService('switch', accessory)
     this.accessory = accessory
   }
diff --git a/lib/device/switch-single.js b/lib/device/switch-single.js
index dba636ef..21499f74 100644
--- a/lib/device/switch-single.js
+++ b/lib/device/switch-single.js
@@ -15,7 +15,6 @@ module.exports = class deviceSwitchSingle {
     if (accessory.getService(this.Service.Outlet)) {
       accessory.removeService(accessory.getService(this.Service.Outlet))
     }
-    accessory.log = platform.debug ? this.log : () => {}
     accessory.eveService = new this.platform.eveService('switch', accessory)
     this.accessory = accessory
   }
diff --git a/lib/device/switch-valve.js b/lib/device/switch-valve.js
index 3ae6ec16..546b965e 100644
--- a/lib/device/switch-valve.js
+++ b/lib/device/switch-valve.js
@@ -31,7 +31,6 @@ module.exports = class deviceSwitchValve {
         }
         callback()
       })
-    accessory.log = platform.debug ? this.log : () => {}
     accessory.eveService = new this.platform.eveService('switch', accessory)
     this.accessory = accessory
   }
diff --git a/lib/device/th-outlet.js b/lib/device/th-outlet.js
index ff3b5bcc..d7f05bb2 100644
--- a/lib/device/th-outlet.js
+++ b/lib/device/th-outlet.js
@@ -29,7 +29,6 @@ module.exports = class deviceTHOutlet {
     if (accessory.context.sensorType !== 'DS18B20') {
       this.humiService = accessory.getService(this.Service.HumiditySensor) || accessory.addService(this.Service.HumiditySensor)
     }
-    accessory.log = platform.debug ? this.log : () => {}
     accessory.eveService = new this.platform.eveService('custom', accessory)
     this.accessory = accessory
   }
diff --git a/lib/device/th-thermo.js b/lib/device/th-thermo.js
index 7b9e7ff8..c6376583 100644
--- a/lib/device/th-thermo.js
+++ b/lib/device/th-thermo.js
@@ -33,7 +33,6 @@ module.exports = class deviceTHThermo {
     ) {
       this.service.addCharacteristic(this.Characteristic.CurrentRelativeHumidity)
     }
-    accessory.log = platform.debug ? this.log : () => {}
     accessory.eveService = new this.platform.eveService('custom', accessory)
     this.accessory = accessory
   }
diff --git a/lib/device/usb.js b/lib/device/usb.js
index a604d3ab..68128c69 100644
--- a/lib/device/usb.js
+++ b/lib/device/usb.js
@@ -22,7 +22,6 @@ module.exports = class deviceUSB {
     }
     this.service.getCharacteristic(this.Characteristic.On)
       .on('set', this.internalUpdate.bind(this))
-    accessory.log = platform.debug ? this.log : () => {}
     accessory.eveService = new this.platform.eveService('switch', accessory)
     this.accessory = accessory
   }
diff --git a/lib/device/zb-dev.js b/lib/device/zb-dev.js
index e59ce69b..349638e3 100644
--- a/lib/device/zb-dev.js
+++ b/lib/device/zb-dev.js
@@ -53,7 +53,6 @@ module.exports = class deviceZBDev {
           accessory.removeService(accessory.getService(this.Service.BatteryService))
         }
         if (!accessory.getService(this.Service.Switch)) accessory.addService(this.Service.Switch)
-        accessory.log = platform.debug ? this.log : () => {}
         accessory.eveService = new this.platform.eveService('switch', accessory)
         accessory.getService(this.Service.Switch).getCharacteristic(this.Characteristic.On)
           .on('set', this.internalUpdate.bind(this))
@@ -64,20 +63,17 @@ module.exports = class deviceZBDev {
         tempService.getCharacteristic(this.Characteristic.CurrentTemperature)
           .setProps({ minValue: -100 })
         if (!accessory.getService(this.Service.HumiditySensor)) accessory.addService(this.Service.HumiditySensor)
-        accessory.log = platform.debug ? this.log : () => {}
         accessory.eveService = new this.platform.eveService('weather', accessory)
         break
       }
       case 2026:
         if (!accessory.getService(this.Service.BatteryService)) accessory.addService(this.Service.BatteryService)
         if (!accessory.getService(this.Service.MotionSensor)) accessory.addService(this.Service.MotionSensor)
-        accessory.log = platform.debug ? this.log : () => {}
         accessory.eveService = new this.platform.eveService('motion', accessory)
         break
       case 3026:
         if (!accessory.getService(this.Service.BatteryService)) accessory.addService(this.Service.BatteryService)
         if (!accessory.getService(this.Service.ContactSensor)) accessory.addService(this.Service.ContactSensor)
-        accessory.log = platform.debug ? this.log : () => {}
         accessory.eveService = new this.platform.eveService('door', accessory)
         break
     }
diff --git a/lib/fakegato/fakegato-history.js b/lib/fakegato/fakegato-history.js
index 2d16ca98..f4f9f2b2 100644
--- a/lib/fakegato/fakegato-history.js
+++ b/lib/fakegato/fakegato-history.js
@@ -5,24 +5,11 @@
 const Format = require('util').format
 const FakeGatoTimer = require('./fakegato-timer').FakeGatoTimer
 const FakeGatoStorage = require('./fakegato-storage').FakeGatoStorage
-
-const EPOCH_OFFSET = 978307200
-
-const TYPE_ENERGY = 'energy'
-const TYPE_ROOM = 'room'
-const TYPE_WEATHER = 'weather'
-const TYPE_DOOR = 'door'
-const TYPE_MOTION = 'motion'
-const TYPE_SWITCH = 'switch'
-const TYPE_THERMO = 'thermo'
-const TYPE_AQUA = 'aqua'
-const TYPE_CUSTOM = 'custom'
-
 let homebridge
 let Characteristic
 let Service
 
-module.exports = function (pHomebridge) {
+module.exports = function (pHomebridge, log) {
   if (pHomebridge && !homebridge) {
     homebridge = pHomebridge
     Characteristic = homebridge.hap.Characteristic
@@ -121,39 +108,23 @@ module.exports = function (pHomebridge) {
     constructor (accessoryType, accessory) {
       super(accessory.displayName + ' History', FakeGatoHistoryService.UUID)
       this.accessory = accessory
+      this.log = log
       this.signatures = []
       this.uuid = require('./uuid.js')
-
-      this.size = 4032
-      this.minutes = 10
-      this.storage = 'fs'
       this.path = homebridge.user.storagePath() + '/persist/'
-      this.disableTimer = false
-      this.disableRepeatLastData = false
-      this.log = accessory.log
-
       if (homebridge.globalFakeGatoTimer === undefined) {
-        homebridge.globalFakeGatoTimer = new FakeGatoTimer({
-          minutes: this.minutes,
-          log: this.log
-        })
+        homebridge.globalFakeGatoTimer = new FakeGatoTimer(this.log)
       }
-
       this.loaded = false
       if (homebridge.globalFakeGatoStorage === undefined) {
-        homebridge.globalFakeGatoStorage = new FakeGatoStorage({
-          log: this.log
-        })
+        homebridge.globalFakeGatoStorage = new FakeGatoStorage(this.log)
       }
       homebridge.globalFakeGatoStorage.addWriter(this, {
-        storage: this.storage,
         path: this.path,
-        filename: undefined,
-        keyPath: homebridge.user.storagePath() || undefined,
         onReady: () => {
           this.load((err, loaded) => {
             if (err) {
-              this.log('Load error :', err)
+              this.log.warn('[%s] fakegato load error [%s].', this.accessory.displayName, err)
             } else {
               this.loaded = true
             }
@@ -162,22 +133,22 @@ module.exports = function (pHomebridge) {
       })
 
       switch (accessoryType) {
-        case TYPE_WEATHER:
+        case 'weather':
           this.accessoryType116 = '03 0102 0202 0302'
           this.accessoryType117 = '07'
           homebridge.globalFakeGatoTimer.subscribe(this, this.calculateAverage)
           break
-        case TYPE_ENERGY:
+        case 'energy':
           this.accessoryType116 = '04 0102 0202 0702 0f03'
           this.accessoryType117 = '1f'
           homebridge.globalFakeGatoTimer.subscribe(this, this.calculateAverage)
           break
-        case TYPE_ROOM:
+        case 'room':
           this.accessoryType116 = '04 0102 0202 0402 0f03'
           this.accessoryType117 = '0f'
           homebridge.globalFakeGatoTimer.subscribe(this, this.calculateAverage)
           break
-        case TYPE_DOOR:
+        case 'door':
           this.accessoryType116 = '01 0601'
           this.accessoryType117 = '01'
           homebridge.globalFakeGatoTimer.subscribe(this, function (params) {
@@ -193,12 +164,12 @@ module.exports = function (pHomebridge) {
                 actualEntry.time = backLog[0].time
                 actualEntry.status = backLog[0].status
               }
-              fakegato.log('**Fakegato-timer callbackDoor: ', fakegato.accessoryName, ', immediate: ', immediate, ', entry: ', actualEntry)
+              fakegato.log('[%s] fakegato cb [%s]', fakegato.accessory.displayName, actualEntry)
               fakegato._addEntry(actualEntry)
             }
           })
           break
-        case TYPE_MOTION:
+        case 'motion':
           this.accessoryType116 = '02 1301 1c01'
           this.accessoryType117 = '02'
           homebridge.globalFakeGatoTimer.subscribe(this, function (params) {
@@ -214,12 +185,12 @@ module.exports = function (pHomebridge) {
                 actualEntry.time = backLog[0].time
                 actualEntry.status = backLog[0].status
               }
-              fakegato.log('**Fakegato-timer callbackMotion: ', fakegato.accessoryName, ', immediate: ', immediate, ', entry: ', actualEntry)
+              fakegato.log('[%s] fakegato cb [%s]', fakegato.accessory.displayName, actualEntry)
               fakegato._addEntry(actualEntry)
             }
           })
           break
-        case TYPE_SWITCH:
+        case 'switch':
           this.accessoryType116 = '01 0e01'
           this.accessoryType117 = '01'
           homebridge.globalFakeGatoTimer.subscribe(this, function (params) {
@@ -235,12 +206,12 @@ module.exports = function (pHomebridge) {
                 actualEntry.time = backLog[0].time
                 actualEntry.status = backLog[0].status
               }
-              fakegato.log('**Fakegato-timer callbackSwitch: ', fakegato.accessoryName, ', immediate: ', immediate, ', entry: ', actualEntry)
+              fakegato.log('[%s] fakegato cb [%s]', fakegato.accessory.displayName, actualEntry)
               fakegato._addEntry(actualEntry)
             }
           })
           break
-        case TYPE_CUSTOM:
+        case 'custom':
           this.accessory.services.forEach((service, i) => {
             service.characteristics.forEach((characteristic, i) => {
               switch (this.uuid.toLongFormUUID(characteristic.UUID)) {
@@ -274,12 +245,12 @@ module.exports = function (pHomebridge) {
           this.accessoryType116 = (' 0' + this.signatures.length.toString() + ' ' + this.signatures.sort((a, b) => (a.signature > b.signature) ? 1 : -1).map(a => a.signature).join(' ') + ' ')
           homebridge.globalFakeGatoTimer.subscribe(this, this.calculateAverage)
           break
-        case TYPE_AQUA:
+        case 'aqua':
           this.accessoryType116 = '03 1f01 2a08 2302'
           this.accessoryType117 = '05'
           this.accessoryType117bis = '07'
           break
-        case TYPE_THERMO:
+        case 'thermo':
           this.accessoryType116 = '05 0102 1102 1001 1201 1d01'
           this.accessoryType117 = '1f'
           break
@@ -289,22 +260,24 @@ module.exports = function (pHomebridge) {
       this.firstEntry = 0
       this.lastEntry = 0
       this.history = ['noValue']
-      this.memorySize = this.size
+      this.memorySize = 4032
       this.usedMemory = 0
       this.currentEntry = 1
-      this.transfer = false
       this.setTime = true
       this.restarted = true
       this.refTime = 0
       this.memoryAddress = 0
       this.dataStream = ''
-
-      this.saving = false
-
-      this.registerEvents()
-      if (this.storage === undefined) {
-        this.loaded = true
+      if (!(this.service = this.accessory.getService(FakeGatoHistoryService))) {
+        const serviceName = ucfirst(this.accessory.displayName) + ' History'
+        this.service = this.accessory.addService(FakeGatoHistoryService, serviceName, this.accessoryType)
       }
+      this.service.getCharacteristic(S2R2Characteristic)
+        .on('get', this.getCurrentS2R2.bind(this))
+      this.service.getCharacteristic(S2W1Characteristic)
+        .on('set', this.setCurrentS2W1.bind(this))
+      this.service.getCharacteristic(S2W2Characteristic)
+        .on('set', this.setCurrentS2W2.bind(this))
     }
 
     calculateAverage (params) {
@@ -352,19 +325,6 @@ module.exports = function (pHomebridge) {
       return calc.avrg
     }
 
-    registerEvents () {
-      this.service = this.accessory.getService(FakeGatoHistoryService)
-      if (this.service === undefined) {
-        this.service = this.accessory.addService(FakeGatoHistoryService, ucfirst(this.accessory.displayName) + ' History', this.accessoryType)
-      }
-      this.service.getCharacteristic(S2R2Characteristic)
-        .on('get', this.getCurrentS2R2.bind(this))
-      this.service.getCharacteristic(S2W1Characteristic)
-        .on('set', this.setCurrentS2W1.bind(this))
-      this.service.getCharacteristic(S2W2Characteristic)
-        .on('set', this.setCurrentS2W2.bind(this))
-    }
-
     sendHistory (address) {
       if (address !== 0) {
         this.currentEntry = address
@@ -377,24 +337,24 @@ module.exports = function (pHomebridge) {
     addEntry (entry) {
       entry.time = Math.round(new Date().valueOf() / 1000)
       switch (this.accessoryType) {
-        case TYPE_DOOR:
-        case TYPE_MOTION:
-        case TYPE_SWITCH:
+        case 'door':
+        case 'motion':
+        case 'switch':
           homebridge.globalFakeGatoTimer.addData({ entry: entry, service: this, immediateCallback: true })
           break
-        case TYPE_AQUA:
+        case 'aqua':
           this._addEntry({ time: entry.time, status: entry.status, waterAmount: entry.waterAmount })
           break
-        case TYPE_WEATHER:
+        case 'weather':
           homebridge.globalFakeGatoTimer.addData({ entry: entry, service: this })
           break
-        case TYPE_ROOM:
+        case 'room':
           homebridge.globalFakeGatoTimer.addData({ entry: entry, service: this })
           break
-        case TYPE_ENERGY:
+        case 'energy':
           homebridge.globalFakeGatoTimer.addData({ entry: entry, service: this })
           break
-        case TYPE_CUSTOM:
+        case 'custom':
           if ('power' in entry || 'temp' in entry) {
             homebridge.globalFakeGatoTimer.addData({ entry: entry, service: this })
           } else {
@@ -433,7 +393,7 @@ module.exports = function (pHomebridge) {
         }
 
         if (this.refTime === 0) {
-          this.refTime = entry.time - EPOCH_OFFSET
+          this.refTime = entry.time - 978307200
           this.history[this.lastEntry] = {
             time: entry.time,
             setRefTime: 1
@@ -448,7 +408,7 @@ module.exports = function (pHomebridge) {
         if (this.usedMemory < this.memorySize) {
           val = Format(
             '%s00000000%s%s%s%s%s000000000101',
-            numToHex(swap32(entry.time - this.refTime - EPOCH_OFFSET), 8),
+            numToHex(swap32(entry.time - this.refTime - 978307200), 8),
             numToHex(swap32(this.refTime), 8),
             this.accessoryType116,
             numToHex(swap16(this.usedMemory + 1), 4),
@@ -457,7 +417,7 @@ module.exports = function (pHomebridge) {
         } else {
           val = Format(
             '%s00000000%s%s%s%s%s000000000101',
-            numToHex(swap32(entry.time - this.refTime - EPOCH_OFFSET), 8),
+            numToHex(swap32(entry.time - this.refTime - 978307200), 8),
             numToHex(swap32(this.refTime), 8),
             this.accessoryType116,
             numToHex(swap16(this.usedMemory), 4),
@@ -465,13 +425,15 @@ module.exports = function (pHomebridge) {
             numToHex(swap32(this.firstEntry + 1), 8))
         }
         this.service.getCharacteristic(S2R1Characteristic).setValue(hexToBase64(val))
-        this.log('First entry %s: %s', this.accessory.displayName, this.firstEntry.toString(16))
-        this.log('Last entry %s: %s', this.accessory.displayName, this.lastEntry.toString(16))
-        this.log('Used memory %s: %s', this.accessory.displayName, this.usedMemory.toString(16))
-        this.log('116 %s: %s', this.accessory.displayName, val)
-        if (this.storage !== undefined) {
-          this.save()
-        }
+        this.log(
+          '[%s] fakegato first [%s] last [%s] used [%s] 116 [%s].',
+          this.accessory.displayName,
+          this.firstEntry.toString(16),
+          this.lastEntry.toString(16),
+          this.usedMemory.toString(16),
+          val
+        )
+        this.save()
       } else {
         setTimeout(() => this._addEntry(entry), 100)
       }
@@ -520,7 +482,6 @@ module.exports = function (pHomebridge) {
           if (!err) {
             if (data) {
               try {
-                // this.log('read data from', this.accessory.displayName, ':', data)
                 const jsonFile = typeof (data) === 'object' ? data : JSON.parse(data)
                 this.firstEntry = jsonFile.firstEntry
                 this.lastEntry = jsonFile.lastEntry
@@ -530,7 +491,7 @@ module.exports = function (pHomebridge) {
                 this.history = jsonFile.history
                 this.extra = jsonFile.extra
               } catch (e) {
-                this.log('**ERROR fetching persisting data restart from zero - invalid JSON**', e)
+                this.log.warn('[%s] fakegato error fetching persisting data [%s]', this.accessory.displayName, e)
                 cb(e, false)
               }
               cb(null, true)
@@ -544,10 +505,7 @@ module.exports = function (pHomebridge) {
     }
 
     cleanPersist () {
-      this.log('Cleaning...')
-      homebridge.globalFakeGatoStorage.remove({
-        service: this
-      })
+      homebridge.globalFakeGatoStorage.remove({ service: this })
     }
 
     getCurrentS2R2 (callback) {
@@ -566,56 +524,56 @@ module.exports = function (pHomebridge) {
             )
             this.setTime = false
           } else {
-            this.log('%s Entry: %s, Address: %s', this.accessory.displayName, this.currentEntry, this.memoryAddress)
+            this.log('[%s] fakegato S2R2 entry [%s] address: [%s].', this.accessory.displayName, this.currentEntry, this.memoryAddress)
             switch (this.accessoryType) {
-              case TYPE_WEATHER:
+              case 'weather':
                 this.dataStream += Format(
                   ',10 %s%s-%s:%s %s %s',
                   numToHex(swap32(this.currentEntry), 8),
-                  numToHex(swap32(this.history[this.memoryAddress].time - this.refTime - EPOCH_OFFSET), 8),
+                  numToHex(swap32(this.history[this.memoryAddress].time - this.refTime - 978307200), 8),
                   this.accessoryType117,
                   numToHex(swap16(this.history[this.memoryAddress].temp * 100), 4),
                   numToHex(swap16(this.history[this.memoryAddress].humidity * 100), 4),
                   numToHex(swap16(this.history[this.memoryAddress].pressure * 10), 4)
                 )
                 break
-              case TYPE_ENERGY:
+              case 'energy':
                 this.dataStream += Format(
                   ',14 %s%s-%s:0000 0000 %s 0000 0000',
                   numToHex(swap32(this.currentEntry), 8),
-                  numToHex(swap32(this.history[this.memoryAddress].time - this.refTime - EPOCH_OFFSET), 8),
+                  numToHex(swap32(this.history[this.memoryAddress].time - this.refTime - 978307200), 8),
                   this.accessoryType117,
                   numToHex(swap16(this.history[this.memoryAddress].power * 10), 4)
                 )
                 break
-              case TYPE_ROOM:
+              case 'room':
                 this.dataStream += Format(
                   ',13 %s%s%s%s%s%s0000 00',
                   numToHex(swap32(this.currentEntry), 8),
-                  numToHex(swap32(this.history[this.memoryAddress].time - this.refTime - EPOCH_OFFSET), 8),
+                  numToHex(swap32(this.history[this.memoryAddress].time - this.refTime - 978307200), 8),
                   this.accessoryType117,
                   numToHex(swap16(this.history[this.memoryAddress].temp * 100), 4),
                   numToHex(swap16(this.history[this.memoryAddress].humidity * 100), 4),
                   numToHex(swap16(this.history[this.memoryAddress].ppm), 4)
                 )
                 break
-              case TYPE_DOOR:
-              case TYPE_MOTION:
-              case TYPE_SWITCH:
+              case 'door':
+              case 'motion':
+              case 'switch':
                 this.dataStream += Format(
                   ',0b %s%s%s%s',
                   numToHex(swap32(this.currentEntry), 8),
-                  numToHex(swap32(this.history[this.memoryAddress].time - this.refTime - EPOCH_OFFSET), 8),
+                  numToHex(swap32(this.history[this.memoryAddress].time - this.refTime - 978307200), 8),
                   this.accessoryType117,
                   numToHex(this.history[this.memoryAddress].status, 2)
                 )
                 break
-              case TYPE_AQUA:
+              case 'aqua':
                 if (this.history[this.memoryAddress].status) {
                   this.dataStream += Format(
                     ',0d %s%s%s%s 300c',
                     numToHex(swap32(this.currentEntry), 8),
-                    numToHex(swap32(this.history[this.memoryAddress].time - this.refTime - EPOCH_OFFSET), 8),
+                    numToHex(swap32(this.history[this.memoryAddress].time - this.refTime - 978307200), 8),
                     this.accessoryType117,
                     numToHex(this.history[this.memoryAddress].status, 2)
                   )
@@ -623,30 +581,30 @@ module.exports = function (pHomebridge) {
                   this.dataStream += Format(
                     ',15 %s%s%s%s%s 00000000 300c',
                     numToHex(swap32(this.currentEntry), 8),
-                    numToHex(swap32(this.history[this.memoryAddress].time - this.refTime - EPOCH_OFFSET), 8),
+                    numToHex(swap32(this.history[this.memoryAddress].time - this.refTime - 978307200), 8),
                     this.accessoryType117bis,
                     numToHex(this.history[this.memoryAddress].status, 2),
                     numToHex(swap32(this.history[this.memoryAddress].waterAmount), 8)
                   )
                 }
                 break
-              case TYPE_THERMO:
+              case 'thermo':
                 this.dataStream += Format(
                   ',11 %s%s%s%s%s%s 0000',
                   numToHex(swap32(this.currentEntry), 8),
-                  numToHex(swap32(this.history[this.memoryAddress].time - this.refTime - EPOCH_OFFSET), 8),
+                  numToHex(swap32(this.history[this.memoryAddress].time - this.refTime - 978307200), 8),
                   this.accessoryType117,
                   numToHex(swap16(this.history[this.memoryAddress].currentTemp * 100), 4),
                   numToHex(swap16(this.history[this.memoryAddress].setTemp * 100), 4),
                   numToHex(this.history[this.memoryAddress].valvePosition, 2)
                 )
                 break
-              case TYPE_CUSTOM: {
+              case 'custom': {
                 const result = []
                 let bitmask = 0
                 const dataStream = Format('%s%s',
                   numToHex(swap32(this.currentEntry), 8),
-                  numToHex(swap32(this.history[this.memoryAddress].time - this.refTime - EPOCH_OFFSET), 8)
+                  numToHex(swap32(this.history[this.memoryAddress].time - this.refTime - 978307200), 8)
                 )
                 for (const [key, value] of Object.entries(this.history[this.memoryAddress])) {
                   switch (key) {
@@ -684,7 +642,7 @@ module.exports = function (pHomebridge) {
             break
           }
         }
-        this.log('Data %s: %s', this.accessory.displayName, this.dataStream)
+        this.log('[%s] fakegato S2R2 data: %s', this.accessory.displayName, this.dataStream)
         callback(null, hexToBase64(this.dataStream))
         this.dataStream = ''
       } else {
@@ -695,18 +653,18 @@ module.exports = function (pHomebridge) {
 
     setCurrentS2W1 (val, callback) {
       callback(null)
-      this.log('Data request %s: %s', this.accessory.displayName, base64ToHex(val))
+      this.log('[%s] fakegato S2W1 data request [%s].', this.accessory.displayName, base64ToHex(val))
       const valHex = base64ToHex(val)
       const substring = valHex.substring(4, 12)
       const valInt = parseInt(substring, 16)
       const address = swap32(valInt)
       const hexAddress = address.toString('16')
-      this.log('Address requested %s: %s', this.accessory.displayName, hexAddress)
+      this.log('[%s] fakegato S2W1 address requested [%s].', this.accessory.displayName, hexAddress)
       this.sendHistory(address)
     }
 
     setCurrentS2W2 (val, callback) {
-      this.log('Clock adjust %s: %s', this.accessory.displayName, base64ToHex(val))
+      this.log('[%s] fakegato S2W2 clock adjust [%s].', this.accessory.displayName, base64ToHex(val))
       callback(null)
     }
   }
diff --git a/lib/fakegato/fakegato-storage.js b/lib/fakegato/fakegato-storage.js
index 32a4ce36..28d716c2 100644
--- a/lib/fakegato/fakegato-storage.js
+++ b/lib/fakegato/fakegato-storage.js
@@ -6,99 +6,55 @@ const fs = require('fs')
 const os = require('os')
 const path = require('path')
 const hostname = os.hostname().split('.')[0]
-const fileSuffix = '_persist.json'
 
 class FakeGatoStorage {
-  constructor (params) {
+  constructor (log) {
+    this.log = log
     this.writers = []
-    this.log = params.log
-    this.addingWriter = false
   }
 
   addWriter (service, params) {
-    if (!this.addingWriter) {
-      this.addingWriter = true
-      this.log('[%s] fakegato storage - addWriter', service.accessoryName)
-      const newWriter = {
-        service,
-        callback: params.callback,
-        storage: params.storage || 'fs',
-        fileName: params.filename || hostname + '_' + service.accessoryName + fileSuffix
-      }
-      const onReady = params.onReady
-      newWriter.storageHandler = fs
-      newWriter.path = params.path
-      this.writers.push(newWriter)
-      this.addingWriter = false
-      onReady()
-    } else {
+    if (this.addingWriter) {
       setTimeout(() => this.addWriter(service, params), 100)
+      return
     }
-  }
-
-  getWriter (service) {
-    const findServ = function (element) {
-      return element.service === service
-    }
-    return this.writers.find(findServ)
-  }
-
-  _getWriterIndex (service) {
-    const findServ = function (element) {
-      return element.service === service
+    this.addingWriter = true
+    this.log('[%s] fakegato addWriter().', service.accessory.displayName)
+    const newWriter = {
+      service,
+      fileName: hostname + '_' + service.accessory.displayName + '_persist.json'
     }
-    return this.writers.findIndex(findServ)
-  }
-
-  getWriters () {
-    return this.writers
-  }
-
-  delWriter (service) {
-    const index = this._getWriterIndex(service)
-    this.writers.splice(index, 1)
+    const onReady = params.onReady
+    newWriter.storageHandler = fs
+    newWriter.path = params.path
+    this.writers.push(newWriter)
+    this.addingWriter = false
+    onReady()
   }
 
   write (params) {
-    // *** Must be asynchronous *** \\
-    if (!this.writing) {
-      this.writing = true
-      const writer = this.getWriter(params.service)
-      const callBack = typeof (params.callback) === 'function'
-        ? params.callback
-        : typeof (writer.callback) === 'function'
-          ? writer.callback
-          : function () { }
-      this.log('Fakegato storage - write file: %s.', path.join(writer.path, writer.fileName), params.data.substr(1, 80))
-      writer.storageHandler.writeFile(path.join(writer.path, writer.fileName), params.data, 'utf8', () => {
-        this.writing = false
-        callBack(arguments)
-      })
-    } else {
+    if (this.writing) {
       setTimeout(() => this.write(params), 100)
+      return
     }
+    this.writing = true
+    const writer = this.writers.find(ele => ele.service === params.service)
+    this.log('[%s] fakegato write [%s].', params.service.accessory.displayName, params.data.substr(1, 80))
+    writer.storageHandler.writeFile(path.join(writer.path, writer.fileName), params.data, 'utf8', () => {
+      this.writing = false
+    })
   }
 
   read (params) {
-    const writer = this.getWriter(params.service)
-    const callBack = typeof (params.callback) === 'function'
-      ? params.callback
-      : typeof (writer.callback) === 'function'
-        ? writer.callback
-        : function () { }
-    this.log('Fakegato storage read file: %s.', path.join(writer.path, writer.fileName))
-    writer.storageHandler.readFile(path.join(writer.path, writer.fileName), 'utf8', callBack)
+    const writer = this.writers.find(ele => ele.service === params.service)
+    this.log('[%s] fakegato read [%s].', params.service.accessory.displayName, path.join(writer.path, writer.fileName))
+    writer.storageHandler.readFile(path.join(writer.path, writer.fileName), 'utf8', params.callback)
   }
 
   remove (params) {
-    const writer = this.getWriter(params.service)
-    const callBack = typeof (params.callback) === 'function'
-      ? params.callback
-      : typeof (writer.callback) === 'function'
-        ? writer.callback
-        : function () { }
-    this.log('Fakegato storage delete file: %s.', path.join(writer.path, writer.fileName))
-    writer.storageHandler.unlink(path.join(writer.path, writer.fileName), callBack)
+    const writer = this.writers.find(ele => ele.service === params.service)
+    this.log('[%s] fakegato delete [%s].', params.service.accessory.displayName, path.join(writer.path, writer.fileName))
+    writer.storageHandler.unlink(path.join(writer.path, writer.fileName), 'utf8', () => {})
   }
 }
 
diff --git a/lib/fakegato/fakegato-timer.js b/lib/fakegato/fakegato-timer.js
index dad0581e..d61437cc 100644
--- a/lib/fakegato/fakegato-timer.js
+++ b/lib/fakegato/fakegato-timer.js
@@ -3,14 +3,13 @@
 'use strict'
 
 class FakeGatoTimer {
-  constructor (params) {
+  constructor (log) {
+    this.log = log
     this.subscribedServices = []
-    this.minutes = params.minutes
-    this.log = params.log
   }
 
   subscribe (service, callback) {
-    this.log('[%s] fakegato-timer subscription.', service.accessoryName)
+    this.log('[%s] fakegato subscribe().', service.accessory.displayName)
     const newService = {
       service,
       callback,
@@ -48,23 +47,22 @@ class FakeGatoTimer {
   }
 
   start () {
-    this.log('Start global fakegato timer [%s mins]', this.minutes)
+    this.log('Fakegato global timer STARTED [10 mins].')
     if (this.running) {
       this.stop()
     }
     this.running = true
-    this.intervalID = setInterval(this.executeCallbacks.bind(this), this.minutes * 60 * 1000)
+    this.intervalID = setInterval(this.executeCallbacks.bind(this), 600000)
   }
 
   stop () {
-    this.log('**Stop global fakegato timer')
+    this.log('Fakegato global timer STOPPED.')
     clearInterval(this.intervalID)
     this.running = false
     this.intervalID = null
   }
 
   executeCallbacks () {
-    this.log('Fakegato timer - executeCallbacks')
     if (this.subscribedServices.length !== 0) {
       for (const s in this.subscribedServices) {
         if (Object.prototype.hasOwnProperty.call(this.subscribedServices, s)) {
@@ -83,8 +81,6 @@ class FakeGatoTimer {
   }
 
   executeImmediateCallback (service) {
-    this.log('Fakegato timer - executeImmediateCallback')
-
     if (typeof (service.callback) === 'function' && service.backLog.length) {
       service.callback({
         backLog: service.backLog,
@@ -98,7 +94,7 @@ class FakeGatoTimer {
     const data = params.entry
     const service = params.service
     const immediateCallback = params.immediateCallback || false
-    this.log('[%s] fakegato timer - addData [%s] immediate [%s].', service.accessoryName, data, immediateCallback)
+    this.log('[%s] fakegato addData [%s].', service.accessory.displayName, data)
     if (immediateCallback) {
       // door or motion -> replace
       this.getSubscriber(service).backLog[0] = data
@@ -108,13 +104,13 @@ class FakeGatoTimer {
     if (immediateCallback) {
       this.executeImmediateCallback(this.getSubscriber(service))
     }
-    if (this.running) {
+    if (!this.running) {
       this.start()
     }
   }
 
   emptyData (service) {
-    this.log('[%s] fakegato timer - emptyData.', service.accessoryName)
+    this.log('[%s] fakegato emptyData().', service.accessory.displayName)
     const source = this.getSubscriber(service)
     if (source.backLog.length) {
       source.previousBackLog = source.backLog
diff --git a/lib/index.js b/lib/index.js
index 6eb159e6..39beb7ea 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -22,9 +22,9 @@ class eWeLinkPlatform {
     this.Characteristic = api.hap.Characteristic
     this.Service = api.hap.Service
     this.helpers = require('./utils/helpers')
-    this.colourUtils = require('./utils/colour-utils')
-    this.eveService = require('./fakegato/fakegato-history')(api)
     this.debug = this.config.debug
+    this.colourUtils = require('./utils/colour-utils')
+    this.eveService = require('./fakegato/fakegato-history')(api, this.debug ? this.log : () => {})
     this.mode = ['auto', 'wan', 'lan'].includes(this.config.mode) ? this.config.mode : 'auto'
     this.devicesInHB = new Map()
     this.devicesInEW = new Map()

From 0ccf05fed90a3f519bf2ae0497b04fac66585b3b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 15 Jan 2021 16:43:02 +0000
Subject: [PATCH 1174/3183] Update fakegato-timer.js

---
 lib/fakegato/fakegato-timer.js | 28 +++++-----------------------
 1 file changed, 5 insertions(+), 23 deletions(-)

diff --git a/lib/fakegato/fakegato-timer.js b/lib/fakegato/fakegato-timer.js
index d61437cc..1d83c87f 100644
--- a/lib/fakegato/fakegato-timer.js
+++ b/lib/fakegato/fakegato-timer.js
@@ -20,26 +20,8 @@ class FakeGatoTimer {
     this.subscribedServices.push(newService)
   }
 
-  getSubscriber (service) {
-    const findServ = function (element) {
-      return element.service === service
-    }
-    return this.subscribedServices.find(findServ)
-  }
-
-  _getSubscriberIndex (service) {
-    const findServ = function (element) {
-      return element.service === service
-    }
-    return this.subscribedServices.findIndex(findServ)
-  }
-
-  getSubscribers () {
-    return this.subscribedServices
-  }
-
   unsubscribe (service) {
-    const index = this._getSubscriberIndex(service)
+    const index = this.subscribedServices.findIndex(ele => ele.service === service)
     this.subscribedServices.splice(index, 1)
     if (this.subscribedServices.length === 0 && this.running) {
       this.stop()
@@ -97,12 +79,12 @@ class FakeGatoTimer {
     this.log('[%s] fakegato addData [%s].', service.accessory.displayName, data)
     if (immediateCallback) {
       // door or motion -> replace
-      this.getSubscriber(service).backLog[0] = data
+      this.subscribedServices.find(ele => ele.service === service).backLog[0] = data
     } else {
-      this.getSubscriber(service).backLog.push(data)
+      this.subscribedServices.find(ele => ele.service === service).backLog.push(data)
     }
     if (immediateCallback) {
-      this.executeImmediateCallback(this.getSubscriber(service))
+      this.executeImmediateCallback(this.subscribedServices.find(ele => ele.service === service))
     }
     if (!this.running) {
       this.start()
@@ -111,7 +93,7 @@ class FakeGatoTimer {
 
   emptyData (service) {
     this.log('[%s] fakegato emptyData().', service.accessory.displayName)
-    const source = this.getSubscriber(service)
+    const source = this.subscribedServices.find(ele => ele.service === service)
     if (source.backLog.length) {
       source.previousBackLog = source.backLog
     }

From 322b70a60a46697aff9a0810f67f783b447d4cac Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 15 Jan 2021 16:46:00 +0000
Subject: [PATCH 1175/3183] 4.4.1-1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index a349f3e2..919c1512 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.4.1-0",
+  "version": "4.4.1-1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index e58148c9..f02e5889 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.4.1-0",
+  "version": "4.4.1-1",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 04db59c964c1a94e3415d90453868141105632a8 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 15 Jan 2021 17:57:47 +0000
Subject: [PATCH 1176/3183] more code edits

---
 lib/fakegato/fakegato-history.js | 291 ++++++++++++++-----------------
 lib/fakegato/fakegato-storage.js |   9 +-
 lib/fakegato/fakegato-timer.js   |   1 -
 3 files changed, 134 insertions(+), 167 deletions(-)

diff --git a/lib/fakegato/fakegato-history.js b/lib/fakegato/fakegato-history.js
index f4f9f2b2..2a273a26 100644
--- a/lib/fakegato/fakegato-history.js
+++ b/lib/fakegato/fakegato-history.js
@@ -1,14 +1,12 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
-
 const Format = require('util').format
 const FakeGatoTimer = require('./fakegato-timer').FakeGatoTimer
 const FakeGatoStorage = require('./fakegato-storage').FakeGatoStorage
 let homebridge
 let Characteristic
 let Service
-
 module.exports = function (pHomebridge, log) {
   if (pHomebridge && !homebridge) {
     homebridge = pHomebridge
@@ -16,37 +14,18 @@ module.exports = function (pHomebridge, log) {
     Service = homebridge.hap.Service
   }
 
-  const hexToBase64 = function (val) {
-    return Buffer.from(('' + val).replace(/[^0-9A-F]/ig, ''), 'hex').toString('base64')
-  }
-  const base64ToHex = function (val) {
-    if (!val) {
-      return val
-    }
-    return Buffer.from(val, 'base64').toString('hex')
-  }
-  const swap16 = function (val) {
-    return ((val & 0xFF) << 8) | ((val >>> 8) & 0xFF)
-  }
-  const swap32 = function (val) {
-    return ((val & 0xFF) << 24) | ((val & 0xFF00) << 8) | ((val >>> 8) & 0xFF00) | ((val >>> 24) & 0xFF)
-  }
-  const numToHex = function (val, len) {
+  const hexToBase64 = val => Buffer.from(('' + val).replace(/[^0-9A-F]/ig, ''), 'hex').toString('base64')
+  const base64ToHex = val => val ? Buffer.from(val, 'base64').toString('hex') : val
+  const swap16 = val => ((val & 0xFF) << 8) | ((val >>> 8) & 0xFF)
+  const swap32 = val => ((val & 0xFF) << 24) | ((val & 0xFF00) << 8) | ((val >>> 8) & 0xFF00) | ((val >>> 24) & 0xFF)
+  const ucfirst = val => val.charAt(0).toUpperCase() + val.substr(1)
+  const precisionRound = (number, precision) => Math.round(number * Math.pow(10, precision)) / Math.pow(10, precision)
+  const numToHex = (val, len) => {
     let s = Number(val >>> 0).toString(16)
     if (s.length % 2 !== 0) {
       s = '0' + s
     }
-    if (len) {
-      return ('0000000000000' + s).slice(-1 * len)
-    }
-    return s
-  }
-  const ucfirst = function (val) {
-    return val.charAt(0).toUpperCase() + val.substr(1)
-  }
-  const precisionRound = function (number, precision) {
-    const factor = Math.pow(10, precision)
-    return Math.round(number * factor) / factor
+    return len ? ('0000000000000' + s).slice(-1 * len) : s
   }
 
   class S2R1Characteristic extends Characteristic {
@@ -125,9 +104,9 @@ module.exports = function (pHomebridge, log) {
           this.load((err, loaded) => {
             if (err) {
               this.log.warn('[%s] fakegato load error [%s].', this.accessory.displayName, err)
-            } else {
-              this.loaded = true
+              return
             }
+            this.loaded = true
           })
         }
       })
@@ -152,20 +131,12 @@ module.exports = function (pHomebridge, log) {
           this.accessoryType116 = '01 0601'
           this.accessoryType117 = '01'
           homebridge.globalFakeGatoTimer.subscribe(this, function (params) {
-            const backLog = params.backLog || []
-            const immediate = params.immediate
-            const fakegato = this.service
             const actualEntry = {}
-            if (backLog.length) {
-              if (!immediate) {
-                actualEntry.time = Math.round(new Date().valueOf() / 1000)
-                actualEntry.status = backLog[0].status
-              } else {
-                actualEntry.time = backLog[0].time
-                actualEntry.status = backLog[0].status
-              }
-              fakegato.log('[%s] fakegato cb [%s]', fakegato.accessory.displayName, actualEntry)
-              fakegato._addEntry(actualEntry)
+            if ((params.backLog || []).length) {
+              actualEntry.status = params.backLog[0].status
+              actualEntry.time = params.immediate ? params.backLog[0].time : Math.round(new Date().valueOf() / 1000)
+              this.service.log('[%s] fakegato cb [%s]', this.service.accessory.displayName, actualEntry)
+              this.service._addEntry(actualEntry)
             }
           })
           break
@@ -173,20 +144,12 @@ module.exports = function (pHomebridge, log) {
           this.accessoryType116 = '02 1301 1c01'
           this.accessoryType117 = '02'
           homebridge.globalFakeGatoTimer.subscribe(this, function (params) {
-            const backLog = params.backLog || []
-            const immediate = params.immediate
-            const fakegato = this.service
             const actualEntry = {}
-            if (backLog.length) {
-              if (!immediate) {
-                actualEntry.time = Math.round(new Date().valueOf() / 1000)
-                actualEntry.status = backLog[0].status
-              } else {
-                actualEntry.time = backLog[0].time
-                actualEntry.status = backLog[0].status
-              }
-              fakegato.log('[%s] fakegato cb [%s]', fakegato.accessory.displayName, actualEntry)
-              fakegato._addEntry(actualEntry)
+            if ((params.backLog || []).length) {
+              actualEntry.status = params.backLog[0].status
+              actualEntry.time = params.immediate ? params.backLog[0].time : Math.round(new Date().valueOf() / 1000)
+              this.service.log('[%s] fakegato cb [%s]', this.service.accessory.displayName, actualEntry)
+              this.service._addEntry(actualEntry)
             }
           })
           break
@@ -194,20 +157,12 @@ module.exports = function (pHomebridge, log) {
           this.accessoryType116 = '01 0e01'
           this.accessoryType117 = '01'
           homebridge.globalFakeGatoTimer.subscribe(this, function (params) {
-            const backLog = params.backLog || []
-            const immediate = params.immediate
-            const fakegato = this.service
             const actualEntry = {}
-            if (backLog.length) {
-              if (!immediate) {
-                actualEntry.time = Math.round(new Date().valueOf() / 1000)
-                actualEntry.status = backLog[0].status
-              } else {
-                actualEntry.time = backLog[0].time
-                actualEntry.status = backLog[0].status
-              }
-              fakegato.log('[%s] fakegato cb [%s]', fakegato.accessory.displayName, actualEntry)
-              fakegato._addEntry(actualEntry)
+            if ((params.backLog || []).length) {
+              actualEntry.status = params.backLog[0].status
+              actualEntry.time = params.immediate ? params.backLog[0].time : Math.round(new Date().valueOf() / 1000)
+              this.service.log('[%s] fakegato cb [%s]', this.service.accessory.displayName, actualEntry)
+              this.service._addEntry(actualEntry)
             }
           })
           break
@@ -216,33 +171,85 @@ module.exports = function (pHomebridge, log) {
             service.characteristics.forEach((characteristic, i) => {
               switch (this.uuid.toLongFormUUID(characteristic.UUID)) {
                 case Characteristic.CurrentTemperature.UUID: // Temperature
-                  this.signatures.push({ signature: '0102', length: 4, uuid: this.uuid.toShortFormUUID(characteristic.UUID), factor: 100, entry: 'temp' })
+                  this.signatures.push({
+                    signature: '0102',
+                    length: 4,
+                    uuid: this.uuid.toShortFormUUID(characteristic.UUID),
+                    factor: 100,
+                    entry: 'temp'
+                  })
                   break
                 case Characteristic.CurrentRelativeHumidity.UUID: // Humidity
-                  this.signatures.push({ signature: '0202', length: 4, uuid: this.uuid.toShortFormUUID(characteristic.UUID), factor: 100, entry: 'humidity' })
+                  this.signatures.push({
+                    signature: '0202',
+                    length: 4,
+                    uuid: this.uuid.toShortFormUUID(characteristic.UUID),
+                    factor: 100,
+                    entry: 'humidity'
+                  })
                   break
                 case 'E863F10F-079E-48FF-8F27-9C2605A29F52': // CustomCharacteristic.AtmosphericPressureLevel.UUID
-                  this.signatures.push({ signature: '0302', length: 4, uuid: this.uuid.toShortFormUUID(characteristic.UUID), factor: 10, entry: 'pressure' })
+                  this.signatures.push({
+                    signature: '0302',
+                    length: 4,
+                    uuid: this.uuid.toShortFormUUID(characteristic.UUID),
+                    factor: 10,
+                    entry: 'pressure'
+                  })
                   break
                 case 'E863F10B-079E-48FF-8F27-9C2605A29F52': // PPM
-                  this.signatures.push({ signature: '0702', length: 4, uuid: this.uuid.toShortFormUUID(characteristic.UUID), factor: 10, entry: 'ppm' })
+                  this.signatures.push({
+                    signature: '0702',
+                    length: 4,
+                    uuid: this.uuid.toShortFormUUID(characteristic.UUID),
+                    factor: 10,
+                    entry: 'ppm'
+                  })
                   break
                 case Characteristic.ContactSensorState.UUID: // Contact Sensor State
-                  this.signatures.push({ signature: '0601', length: 2, uuid: this.uuid.toShortFormUUID(characteristic.UUID), factor: 1, entry: 'contact' })
+                  this.signatures.push({
+                    signature: '0601',
+                    length: 2,
+                    uuid: this.uuid.toShortFormUUID(characteristic.UUID),
+                    factor: 1,
+                    entry: 'contact'
+                  })
                   break
                 case 'E863F10D-079E-48FF-8F27-9C2605A29F52': // Power
-                  this.signatures.push({ signature: '0702', length: 4, uuid: this.uuid.toShortFormUUID(characteristic.UUID), factor: 10, entry: 'power' })
+                  this.signatures.push({
+                    signature: '0702',
+                    length: 4,
+                    uuid: this.uuid.toShortFormUUID(characteristic.UUID),
+                    factor: 10,
+                    entry: 'power'
+                  })
                   break
                 case Characteristic.On.UUID: // Switch On
-                  this.signatures.push({ signature: '0e01', length: 2, uuid: this.uuid.toShortFormUUID(characteristic.UUID), factor: 1, entry: 'status' })
+                  this.signatures.push({
+                    signature: '0e01',
+                    length: 2,
+                    uuid: this.uuid.toShortFormUUID(characteristic.UUID),
+                    factor: 1,
+                    entry: 'status'
+                  })
                   break
                 case Characteristic.MotionDetected.UUID: // Motion Detected
-                  this.signatures.push({ signature: '1c01', length: 2, uuid: this.uuid.toShortFormUUID(characteristic.UUID), factor: 1, entry: 'motion' })
+                  this.signatures.push({
+                    signature: '1c01',
+                    length: 2,
+                    uuid: this.uuid.toShortFormUUID(characteristic.UUID),
+                    factor: 1,
+                    entry: 'motion'
+                  })
                   break
               }
             })
           })
-          this.accessoryType116 = (' 0' + this.signatures.length.toString() + ' ' + this.signatures.sort((a, b) => (a.signature > b.signature) ? 1 : -1).map(a => a.signature).join(' ') + ' ')
+          this.accessoryType116 = ' 0' +
+            this.signatures.length.toString() +
+            ' ' +
+            this.signatures.sort((a, b) => (a.signature > b.signature) ? 1 : -1).map(a => a.signature).join(' ') +
+            ' '
           homebridge.globalFakeGatoTimer.subscribe(this, this.calculateAverage)
           break
         case 'aqua':
@@ -255,7 +262,6 @@ module.exports = function (pHomebridge, log) {
           this.accessoryType117 = '1f'
           break
       }
-
       this.accessoryType = accessoryType
       this.firstEntry = 0
       this.lastEntry = 0
@@ -284,10 +290,8 @@ module.exports = function (pHomebridge, log) {
       const backLog = params.backLog || []
       const previousAvrg = params.previousAvrg || {}
       const timer = params.timer
-
       const fakegato = this.service
       const calc = { sum: {}, num: {}, avrg: {} }
-
       for (const h in backLog) {
         if (Object.prototype.hasOwnProperty.call(backLog, h)) { // only valid keys
           for (const key in backLog[h]) { // each record
@@ -307,13 +311,10 @@ module.exports = function (pHomebridge, log) {
       }
       // set the time of the avrg
       calc.avrg.time = Math.round(new Date().valueOf() / 1000)
-
-      if (!fakegato.disableRepeatLastData) {
-        for (const key in previousAvrg) { // each record of previous average
-          if (Object.prototype.hasOwnProperty.call(previousAvrg, key) && key !== 'time') { // except time
-            if (!backLog.length || calc.avrg[key] === undefined) {
-              calc.avrg[key] = previousAvrg[key]
-            }
+      for (const key in previousAvrg) { // each record of previous average
+        if (Object.prototype.hasOwnProperty.call(previousAvrg, key) && key !== 'time') { // except time
+          if (!backLog.length || calc.avrg[key] === undefined) {
+            calc.avrg[key] = previousAvrg[key]
           }
         }
       }
@@ -367,7 +368,7 @@ module.exports = function (pHomebridge, log) {
       }
     }
 
-    // In order to be consistent with Eve, entry address start from 1
+    // *** In order to be consistent with Eve, entry address start from 1 *** \\
     _addEntry (entry) {
       if (this.loaded) {
         const entry2address = val => {
@@ -391,7 +392,6 @@ module.exports = function (pHomebridge, log) {
             this.restarted = false
           }
         }
-
         if (this.refTime === 0) {
           this.refTime = entry.time - 978307200
           this.history[this.lastEntry] = {
@@ -402,9 +402,7 @@ module.exports = function (pHomebridge, log) {
           this.lastEntry++
           this.usedMemory++
         }
-
         this.history[entry2address(this.lastEntry)] = (entry)
-
         if (this.usedMemory < this.memorySize) {
           val = Format(
             '%s00000000%s%s%s%s%s000000000101',
@@ -424,7 +422,7 @@ module.exports = function (pHomebridge, log) {
             numToHex(swap16(this.memorySize), 4),
             numToHex(swap32(this.firstEntry + 1), 8))
         }
-        this.service.getCharacteristic(S2R1Characteristic).setValue(hexToBase64(val))
+        this.service.setCharacteristic(S2R1Characteristic, hexToBase64(val))
         this.log(
           '[%s] fakegato first [%s] last [%s] used [%s] 116 [%s].',
           this.accessory.displayName,
@@ -443,18 +441,6 @@ module.exports = function (pHomebridge, log) {
       return this.initialTime
     }
 
-    setExtraPersistedData (extra) {
-      this.extra = extra
-    }
-
-    getExtraPersistedData () {
-      return this.extra
-    }
-
-    isHistoryLoaded () {
-      return this.loaded
-    }
-
     save () {
       if (this.loaded) {
         const data = {
@@ -470,37 +456,34 @@ module.exports = function (pHomebridge, log) {
           service: this,
           data: typeof (data) === 'object' ? JSON.stringify(data) : data
         })
-      } else {
-        setTimeout(() => this.save(), 100)
+        return
       }
+      setTimeout(() => this.save(), 100)
     }
 
     load (cb) {
       homebridge.globalFakeGatoStorage.read({
         service: this,
-        callback: function (err, data) {
-          if (!err) {
-            if (data) {
-              try {
-                const jsonFile = typeof (data) === 'object' ? data : JSON.parse(data)
-                this.firstEntry = jsonFile.firstEntry
-                this.lastEntry = jsonFile.lastEntry
-                this.usedMemory = jsonFile.usedMemory
-                this.refTime = jsonFile.refTime
-                this.initialTime = jsonFile.initialTime
-                this.history = jsonFile.history
-                this.extra = jsonFile.extra
-              } catch (e) {
-                this.log.warn('[%s] fakegato error fetching persisting data [%s]', this.accessory.displayName, e)
-                cb(e, false)
-              }
-              cb(null, true)
-            }
-          } else {
-            // file don't exists
+        callback: (err, data) => {
+          if (err || !data) {
             cb(null, false)
+            return
+          }
+          try {
+            const jsonFile = typeof (data) === 'object' ? data : JSON.parse(data)
+            this.firstEntry = jsonFile.firstEntry
+            this.lastEntry = jsonFile.lastEntry
+            this.usedMemory = jsonFile.usedMemory
+            this.refTime = jsonFile.refTime
+            this.initialTime = jsonFile.initialTime
+            this.history = jsonFile.history
+            this.extra = jsonFile.extra
+          } catch (e) {
+            this.log.warn('[%s] fakegato error fetching persisting data [%s]', this.accessory.displayName, e)
+            cb(e, false)
           }
-        }.bind(this)
+          cb(null, true)
+        }
       })
     }
 
@@ -509,10 +492,7 @@ module.exports = function (pHomebridge, log) {
     }
 
     getCurrentS2R2 (callback) {
-      const entry2address = function (val) {
-        return val % this.memorySize
-      }.bind(this)
-
+      const entry2address = val => val % this.memorySize
       if ((this.currentEntry <= this.lastEntry) && this.transfer) {
         this.memoryAddress = entry2address(this.currentEntry)
         for (let i = 0; i < 11; i++) {
@@ -607,31 +587,27 @@ module.exports = function (pHomebridge, log) {
                   numToHex(swap32(this.history[this.memoryAddress].time - this.refTime - 978307200), 8)
                 )
                 for (const [key, value] of Object.entries(this.history[this.memoryAddress])) {
-                  switch (key) {
-                    case 'time':
-                      break
-                    default:
-                      for (let x = 0, iLen = this.signatures.length; x < iLen; x++) {
-                        if (this.signatures[x].entry === key) {
-                          switch (this.signatures[x].length) {
-                            case 8:
-                              result[x] = Format('%s', numToHex(swap32(value * this.signatures[x].factor), this.signatures[x].length))
-                              break
-                            case 4:
-                              result[x] = Format('%s', numToHex(swap16(value * this.signatures[x].factor), this.signatures[x].length))
-                              break
-                            case 2:
-                              result[x] = Format('%s', numToHex(value * this.signatures[x].factor, this.signatures[x].length))
-                              break
-                          }
-                          bitmask += Math.pow(2, x)
+                  if (key !== 'time') {
+                    for (let x = 0, iLen = this.signatures.length; x < iLen; x++) {
+                      if (this.signatures[x].entry === key) {
+                        switch (this.signatures[x].length) {
+                          case 8:
+                            result[x] = Format('%s', numToHex(swap32(value * this.signatures[x].factor), this.signatures[x].length))
+                            break
+                          case 4:
+                            result[x] = Format('%s', numToHex(swap16(value * this.signatures[x].factor), this.signatures[x].length))
+                            break
+                          case 2:
+                            result[x] = Format('%s', numToHex(value * this.signatures[x].factor, this.signatures[x].length))
+                            break
                         }
+                        bitmask += Math.pow(2, x)
                       }
+                    }
                   }
                 }
                 const results = dataStream + ' ' + numToHex(bitmask, 2) + ' ' + result.map(a => a).join(' ')
-                // console.log('results', numToHex((results.replace(/[^0-9A-F]/ig, '').length) / 2 + 1) + ' ' + results)
-                this.dataStream += (' ' + numToHex((results.replace(/[^0-9A-F]/ig, '').length) / 2 + 1) + ' ' + results + ',')
+                this.dataStream += ' ' + numToHex((results.replace(/[^0-9A-F]/ig, '').length) / 2 + 1) + ' ' + results + ','
                 break
               }
             }
@@ -652,20 +628,17 @@ module.exports = function (pHomebridge, log) {
     }
 
     setCurrentS2W1 (val, callback) {
-      callback(null)
+      callback()
       this.log('[%s] fakegato S2W1 data request [%s].', this.accessory.displayName, base64ToHex(val))
-      const valHex = base64ToHex(val)
-      const substring = valHex.substring(4, 12)
-      const valInt = parseInt(substring, 16)
-      const address = swap32(valInt)
+      const address = swap32(parseInt(base64ToHex(val).substring(4, 12), 16))
       const hexAddress = address.toString('16')
       this.log('[%s] fakegato S2W1 address requested [%s].', this.accessory.displayName, hexAddress)
       this.sendHistory(address)
     }
 
     setCurrentS2W2 (val, callback) {
+      callback()
       this.log('[%s] fakegato S2W2 clock adjust [%s].', this.accessory.displayName, base64ToHex(val))
-      callback(null)
     }
   }
 
diff --git a/lib/fakegato/fakegato-storage.js b/lib/fakegato/fakegato-storage.js
index 28d716c2..d3c00ce7 100644
--- a/lib/fakegato/fakegato-storage.js
+++ b/lib/fakegato/fakegato-storage.js
@@ -1,12 +1,7 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
-
-const fs = require('fs')
-const os = require('os')
 const path = require('path')
-const hostname = os.hostname().split('.')[0]
-
 class FakeGatoStorage {
   constructor (log) {
     this.log = log
@@ -22,10 +17,10 @@ class FakeGatoStorage {
     this.log('[%s] fakegato addWriter().', service.accessory.displayName)
     const newWriter = {
       service,
-      fileName: hostname + '_' + service.accessory.displayName + '_persist.json'
+      fileName: require('os').hostname().split('.')[0] + '_' + service.accessory.displayName + '_persist.json'
     }
     const onReady = params.onReady
-    newWriter.storageHandler = fs
+    newWriter.storageHandler = require('fs')
     newWriter.path = params.path
     this.writers.push(newWriter)
     this.addingWriter = false
diff --git a/lib/fakegato/fakegato-timer.js b/lib/fakegato/fakegato-timer.js
index 1d83c87f..efed8bc0 100644
--- a/lib/fakegato/fakegato-timer.js
+++ b/lib/fakegato/fakegato-timer.js
@@ -1,7 +1,6 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
-
 class FakeGatoTimer {
   constructor (log) {
     this.log = log

From a4fbdf823b6a4e15ef470bd340655353c3c566b2 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 15 Jan 2021 18:34:47 +0000
Subject: [PATCH 1177/3183] remove info folder

---
 .gitignore | 1 -
 .npmignore | 1 -
 2 files changed, 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index a5ad5d79..7f010394 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,4 @@
 .DS_Store
 .nova
 .npm
-info/
 node_modules/
\ No newline at end of file
diff --git a/.npmignore b/.npmignore
index 3f1189f6..45fb205e 100644
--- a/.npmignore
+++ b/.npmignore
@@ -2,5 +2,4 @@
 .nova
 .github
 .npm
-info/
 node_modules/
\ No newline at end of file

From d014b64456f9c292f4cec6cd69bb3d51ad19aaa2 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 15 Jan 2021 19:42:02 +0000
Subject: [PATCH 1178/3183] Update LICENSE

---
 LICENSE | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LICENSE b/LICENSE
index 23e8aaa0..98b201cb 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020 Ben Potter
+Copyright (c) 2021 Ben Potter
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

From a59147b5ca356f5a57101f45d03779cc43b474a5 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 19 Jan 2021 17:29:44 +0000
Subject: [PATCH 1179/3183] fakegato to default

---
 lib/device/outlet.js             |  11 +-
 lib/device/rf-bridge.js          |  20 +-
 lib/device/scm.js                |  16 +-
 lib/device/sensor.js             |  13 +-
 lib/device/switch-multi.js       |  31 +-
 lib/device/switch-single.js      |  16 +-
 lib/device/switch-valve.js       |  16 +-
 lib/device/th-outlet.js          |  14 +-
 lib/device/th-thermo.js          |  14 +-
 lib/device/usb.js                |  16 +-
 lib/device/zb-dev.js             |  53 ++-
 lib/fakegato/fakegato-history.js | 784 +++++++++++++++++++------------
 lib/fakegato/fakegato-storage.js | 193 ++++++--
 lib/fakegato/fakegato-timer.js   | 101 ++--
 lib/fakegato/uuid.js             |  18 +-
 lib/index.js                     |   3 +-
 package.json                     |   5 +
 17 files changed, 889 insertions(+), 435 deletions(-)

diff --git a/lib/device/outlet.js b/lib/device/outlet.js
index d627b09e..a7dc88c5 100644
--- a/lib/device/outlet.js
+++ b/lib/device/outlet.js
@@ -105,7 +105,11 @@ module.exports = class deviceOutlet {
         accessory.context.energyReadingTotal = 0
         this.service.updateCharacteristic(this.eveTotalConsumption, 0)
       })
-    accessory.eveService = new this.platform.eveService('energy', accessory)
+    accessory.log = platform.config.debugFakegato ? this.log : () => {}
+    accessory.historyService = new this.platform.eveService('energy', accessory, {
+      storage: 'fs',
+      path: platform.eveLogPath
+    })
     setInterval(() => {
       let total = 0
       if (accessory.context.energyReadings.length > 0) {
@@ -152,7 +156,10 @@ module.exports = class deviceOutlet {
         this.service.updateCharacteristic(this.Characteristic.OutletInUse, parseFloat(params.power) > this.inUsePowerThreshold)
           .updateCharacteristic(this.eveCurrentConsumption, parseFloat(params.power))
         const isOn = this.accessory.getService(this.Service.Outlet).getCharacteristic(this.Characteristic.On).value
-        this.accessory.eveService.addEntry({ power: isOn ? parseFloat(params.power) : 0 })
+        this.accessory.historyService.addEntry({
+          time: Math.round(new Date().valueOf() / 1000),
+          power: isOn ? parseFloat(params.power) : 0
+        })
         this.accessory.context.energyReadings.push(parseFloat(params.power))
         logger = true
       }
diff --git a/lib/device/rf-bridge.js b/lib/device/rf-bridge.js
index 70c91913..741f8fac 100644
--- a/lib/device/rf-bridge.js
+++ b/lib/device/rf-bridge.js
@@ -79,7 +79,11 @@ module.exports = class deviceRFBridge {
       }
       const service = accessory.getService(serv) || accessory.addService(serv)
       service.updateCharacteristic(char, 0)
-      accessory.eveService = new this.platform.eveService(eveType, accessory)
+      accessory.log = platform.config.debugFakegato ? this.log : () => {}
+      accessory.historyService = new this.platform.eveService(eveType, accessory, {
+        storage: 'fs',
+        path: platform.eveLogPath
+      })
     }
     this.accessory = accessory
   }
@@ -185,7 +189,7 @@ module.exports = class deviceRFBridge {
                     char = this.Characteristic.ContactSensorState
                     oAccessory.getService(serv).updateCharacteristic(
                       this.eveLastActivation,
-                      Math.round(new Date().valueOf() / 1000) - oAccessory.eveService.getInitialTime()
+                      Math.round(new Date().valueOf() / 1000) - oAccessory.historyService.getInitialTime()
                     )
                     break
                   case 'occupancy':
@@ -197,18 +201,24 @@ module.exports = class deviceRFBridge {
                     char = this.Characteristic.MotionDetected
                     oAccessory.getService(serv).updateCharacteristic(
                       this.eveLastActivation,
-                      Math.round(new Date().valueOf() / 1000) - oAccessory.eveService.getInitialTime()
+                      Math.round(new Date().valueOf() / 1000) - oAccessory.historyService.getInitialTime()
                     )
                     break
                 }
                 oAccessory.getService(serv).updateCharacteristic(char, 1)
-                oAccessory.eveService.addEntry({ status: 1 })
+                oAccessory.historyService.addEntry({
+                  time: Math.round(new Date().valueOf() / 1000),
+                  status: 1
+                })
                 if (params.updateSource && !this.disableDeviceLogging) {
                   this.log('[%s] current state [triggered]', oAccessory.displayName)
                 }
                 await this.helpers.sleep(sensorTimeLength * 1000)
                 oAccessory.getService(serv).updateCharacteristic(char, 0)
-                oAccessory.eveService.addEntry({ status: 0 })
+                oAccessory.historyService.addEntry({
+                  time: Math.round(new Date().valueOf() / 1000),
+                  status: 0
+                })
                 if (params.updateSource && !this.disableDeviceLogging) {
                   this.log('[%s] current state [not triggered]', oAccessory.displayName)
                 }
diff --git a/lib/device/scm.js b/lib/device/scm.js
index 8c027da8..8a02c214 100644
--- a/lib/device/scm.js
+++ b/lib/device/scm.js
@@ -12,7 +12,11 @@ module.exports = class deviceSCM {
     this.service = accessory.getService(this.Service.Switch) || accessory.addService(this.Service.Switch)
     this.service.getCharacteristic(this.Characteristic.On)
       .on('set', this.internalUpdate.bind(this))
-    accessory.eveService = new this.platform.eveService('switch', accessory)
+    accessory.log = platform.config.debugFakegato ? this.log : () => {}
+    accessory.historyService = new this.platform.eveService('switch', accessory, {
+      storage: 'fs',
+      path: platform.eveLogPath
+    })
     this.accessory = accessory
   }
 
@@ -23,7 +27,10 @@ module.exports = class deviceSCM {
       params.switches[0].switch = value ? 'on' : 'off'
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.cacheOnOff = value ? 'on' : 'off'
-      this.accessory.eveService.addEntry({ status: value ? 1 : 0 })
+      this.accessory.historyService.addEntry({
+        time: Math.round(new Date().valueOf() / 1000),
+        status: value ? 1 : 0
+      })
       if (!this.disableDeviceLogging) {
         this.log('[%s] current state [%s].', this.accessory.displayName, value ? 'on' : 'off')
       }
@@ -38,7 +45,10 @@ module.exports = class deviceSCM {
       const newStatus = params.switches[0].switch === 'on'
       this.service.updateCharacteristic(this.Characteristic.On, newStatus)
       this.cacheOnOff = params.switches[0].switch
-      this.accessory.eveService.addEntry({ status: newStatus ? 1 : 0 })
+      this.accessory.historyService.addEntry({
+        time: Math.round(new Date().valueOf() / 1000),
+        status: newStatus ? 1 : 0
+      })
       if (params.updateSource && !this.disableDeviceLogging) {
         this.log('[%s] current state [%s].', this.accessory.displayName, params.switches[0].switch)
       }
diff --git a/lib/device/sensor.js b/lib/device/sensor.js
index b2dc27df..e75f1d50 100644
--- a/lib/device/sensor.js
+++ b/lib/device/sensor.js
@@ -30,7 +30,11 @@ module.exports = class deviceSensor {
         : this.lowBattThreshold
     this.contactService = accessory.getService(this.Service.ContactSensor) || accessory.addService(this.Service.ContactSensor)
     this.batteryService = accessory.getService(this.Service.BatteryService) || accessory.addService(this.Service.BatteryService)
-    accessory.eveService = new this.platform.eveService('door', accessory)
+    accessory.log = platform.config.debugFakegato ? this.log : () => {}
+    accessory.historyService = new this.platform.eveService('door', accessory, {
+      storage: 'fs',
+      path: platform.eveLogPath
+    })
     this.accessory = accessory
   }
 
@@ -50,11 +54,14 @@ module.exports = class deviceSensor {
       this.cacheOnOff = params.switch
       const newState = params.switch === 'on' ? 1 : 0
       this.contactService.updateCharacteristic(this.Characteristic.ContactSensorState, newState)
-      this.accessory.eveService.addEntry({ status: newState })
+      this.accessory.historyService.addEntry({
+        time: Math.round(new Date().valueOf() / 1000),
+        status: newState
+      })
       if (newState) {
         this.contactService.updateCharacteristic(
           this.eveLastActivation,
-          Math.round(new Date().valueOf() / 1000) - this.accessory.eveService.getInitialTime()
+          Math.round(new Date().valueOf() / 1000) - this.accessory.historyService.getInitialTime()
         )
       }
       if (params.updateSource && !this.disableDeviceLogging) {
diff --git a/lib/device/switch-multi.js b/lib/device/switch-multi.js
index 4685988e..be011712 100644
--- a/lib/device/switch-multi.js
+++ b/lib/device/switch-multi.js
@@ -12,7 +12,11 @@ module.exports = class deviceSwitchMulti {
     this.service = accessory.getService(this.Service.Switch) || accessory.addService(this.Service.Switch)
     this.service.getCharacteristic(this.Characteristic.On)
       .on('set', this.internalUpdate.bind(this))
-    accessory.eveService = new this.platform.eveService('switch', accessory)
+    accessory.log = platform.config.debugFakegato ? this.log : () => {}
+    accessory.historyService = new this.platform.eveService('switch', accessory, {
+      storage: 'fs',
+      path: platform.eveLogPath
+    })
     this.accessory = accessory
   }
 
@@ -34,7 +38,10 @@ module.exports = class deviceSwitchMulti {
             if ((oAccessory = this.platform.devicesInHB.get(this.accessory.context.eweDeviceId + 'SW' + i))) {
               oAccessory.getService(this.Service.Switch).updateCharacteristic(this.Characteristic.On, value)
               oAccessory.context.cacheOnOff = value ? 'on' : 'off'
-              oAccessory.eveService.addEntry({ status: value ? 1 : 0 })
+              oAccessory.historyService.addEntry({
+                time: Math.round(new Date().valueOf() / 1000),
+                status: value ? 1 : 0
+              })
               if (i > 0 && !this.disableDeviceLogging) {
                 this.log('[%s] current state [%s].', oAccessory.displayName, value ? 'on' : 'off')
               }
@@ -54,7 +61,10 @@ module.exports = class deviceSwitchMulti {
               if (i === parseInt(this.accessory.context.switchNumber)) {
                 params.switches[i - 1].switch = value ? 'on' : 'off'
                 oAccessory.context.cacheOnOff = value ? 'on' : 'off'
-                oAccessory.eveService.addEntry({ status: value ? 1 : 0 })
+                oAccessory.historyService.addEntry({
+                  time: Math.round(new Date().valueOf() / 1000),
+                  status: value ? 1 : 0
+                })
                 if (i > 0 && !this.disableDeviceLogging) {
                   this.log('[%s] current state [%s].', oAccessory.displayName, value ? 'on' : 'off')
                 }
@@ -68,7 +78,10 @@ module.exports = class deviceSwitchMulti {
           if (!this.platform.hiddenMasters.includes(this.accessory.context.eweDeviceId)) {
             oAccessory = this.platform.devicesInHB.get(this.accessory.context.eweDeviceId + 'SW0')
             oAccessory.getService(this.Service.Switch).updateCharacteristic(this.Characteristic.On, masterState === 'on')
-            oAccessory.eveService.addEntry({ status: masterState === 'on' ? 1 : 0 })
+            oAccessory.historyService.addEntry({
+              time: Math.round(new Date().valueOf() / 1000),
+              status: masterState === 'on' ? 1 : 0
+            })
           }
           break
       }
@@ -91,7 +104,10 @@ module.exports = class deviceSwitchMulti {
           oAccessory.getService(this.Service.Switch)
             .updateCharacteristic(this.Characteristic.On, params.switches[i - 1].switch === 'on')
           oAccessory.context.cacheOnOff = params.switches[i - 1].switch
-          oAccessory.eveService.addEntry({ status: params.switches[i - 1].switch === 'on' ? 1 : 0 })
+          oAccessory.historyService.addEntry({
+            time: Math.round(new Date().valueOf() / 1000),
+            status: params.switches[i - 1].switch === 'on' ? 1 : 0
+          })
           if (params.updateSource && !this.disableDeviceLogging) {
             this.log('[%s] current state [%s].', oAccessory.displayName, params.switches[i - 1].switch)
           }
@@ -99,7 +115,10 @@ module.exports = class deviceSwitchMulti {
       }
       if (!this.platform.hiddenMasters.includes(this.accessory.context.eweDeviceId)) {
         this.service.updateCharacteristic(this.Characteristic.On, primaryState)
-        this.accessory.eveService.addEntry({ status: primaryState ? 1 : 0 })
+        this.accessory.historyService.addEntry({
+          time: Math.round(new Date().valueOf() / 1000),
+          status: primaryState ? 1 : 0
+        })
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
diff --git a/lib/device/switch-single.js b/lib/device/switch-single.js
index 21499f74..ea3df561 100644
--- a/lib/device/switch-single.js
+++ b/lib/device/switch-single.js
@@ -15,7 +15,11 @@ module.exports = class deviceSwitchSingle {
     if (accessory.getService(this.Service.Outlet)) {
       accessory.removeService(accessory.getService(this.Service.Outlet))
     }
-    accessory.eveService = new this.platform.eveService('switch', accessory)
+    accessory.log = platform.config.debugFakegato ? this.log : () => {}
+    accessory.historyService = new this.platform.eveService('switch', accessory, {
+      storage: 'fs',
+      path: platform.eveLogPath
+    })
     this.accessory = accessory
   }
 
@@ -27,7 +31,10 @@ module.exports = class deviceSwitchSingle {
         switch: value ? 'on' : 'off'
       })
       this.cacheOnOff = value ? 'on' : 'off'
-      this.accessory.eveService.addEntry({ status: value ? 1 : 0 })
+      this.accessory.historyService.addEntry({
+        time: Math.round(new Date().valueOf() / 1000),
+        status: value ? 1 : 0
+      })
       if (!this.disableDeviceLogging) {
         this.log('[%s] current state [%s].', this.accessory.displayName, this.cacheOnOff)
       }
@@ -42,7 +49,10 @@ module.exports = class deviceSwitchSingle {
       const newStatus = params.switch === 'on'
       this.service.updateCharacteristic(this.Characteristic.On, newStatus)
       this.cacheOnOff = params.switch
-      this.accessory.eveService.addEntry({ status: newStatus ? 1 : 0 })
+      this.accessory.historyService.addEntry({
+        time: Math.round(new Date().valueOf() / 1000),
+        status: newStatus ? 1 : 0
+      })
       if (params.updateSource && !this.disableDeviceLogging) {
         this.log('[%s] current state [%s].', this.accessory.displayName, this.cacheOnOff)
       }
diff --git a/lib/device/switch-valve.js b/lib/device/switch-valve.js
index 546b965e..736c692a 100644
--- a/lib/device/switch-valve.js
+++ b/lib/device/switch-valve.js
@@ -31,7 +31,11 @@ module.exports = class deviceSwitchValve {
         }
         callback()
       })
-    accessory.eveService = new this.platform.eveService('switch', accessory)
+    accessory.log = platform.config.debugFakegato ? this.log : () => {}
+    accessory.historyService = new this.platform.eveService('switch', accessory, {
+      storage: 'fs',
+      path: platform.eveLogPath
+    })
     this.accessory = accessory
   }
 
@@ -43,7 +47,10 @@ module.exports = class deviceSwitchValve {
       params.switches[1].switch = this.valveService.getCharacteristic(this.Characteristic.Active).value === 1 ? 'on' : 'off'
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.cacheOnOff = value ? 'on' : 'off'
-      this.accessory.eveService.addEntry({ status: value ? 1 : 0 })
+      this.accessory.historyService.addEntry({
+        time: Math.round(new Date().valueOf() / 1000),
+        status: value ? 1 : 0
+      })
       if (!this.disableDeviceLogging) {
         this.log('[%s] current state [%s].', this.accessory.displayName, this.cacheOnOff)
       }
@@ -94,7 +101,10 @@ module.exports = class deviceSwitchValve {
         const newStatus = params.switches[0].switch === 'on'
         this.cacheOnOff = params.switches[0].switch
         this.switchService.updateCharacteristic(this.Characteristic.On, newStatus)
-        this.accessory.eveService.addEntry({ status: newStatus ? 1 : 0 })
+        this.accessory.historyService.addEntry({
+          time: Math.round(new Date().valueOf() / 1000),
+          status: newStatus ? 1 : 0
+        })
         if (params.updateSource && !this.disableDeviceLogging) {
           this.log('[%s] current state [%s].', this.accessory.displayName, this.cacheOnOff)
         }
diff --git a/lib/device/th-outlet.js b/lib/device/th-outlet.js
index d7f05bb2..a02d3a02 100644
--- a/lib/device/th-outlet.js
+++ b/lib/device/th-outlet.js
@@ -29,7 +29,11 @@ module.exports = class deviceTHOutlet {
     if (accessory.context.sensorType !== 'DS18B20') {
       this.humiService = accessory.getService(this.Service.HumiditySensor) || accessory.addService(this.Service.HumiditySensor)
     }
-    accessory.eveService = new this.platform.eveService('custom', accessory)
+    accessory.log = platform.config.debugFakegato ? this.log : () => {}
+    accessory.historyService = new this.platform.eveService('custom', accessory, {
+      storage: 'fs',
+      path: platform.eveLogPath
+    })
     this.accessory = accessory
   }
 
@@ -57,7 +61,10 @@ module.exports = class deviceTHOutlet {
         if (this.cacheOnOff !== newState) {
           this.cacheOnOff = newState
           this.switchService.updateCharacteristic(this.Characteristic.On, this.cacheOnOff === 'on')
-          this.accessory.eveService.addEntry({ status: this.cacheOnOff === 'on' ? 1 : 0 })
+          this.accessory.historyService.addEntry({
+            time: Math.round(new Date().valueOf() / 1000),
+            status: this.cacheOnOff === 'on' ? 1 : 0
+          })
           if (params.updateSource && !this.disableDeviceLogging) {
             this.log('[%s] current state [%s].', this.accessory.displayName, this.cacheOnOff)
           }
@@ -87,7 +94,8 @@ module.exports = class deviceTHOutlet {
         }
       }
       if (this.helpers.hasProperty(eveLog, 'temp') || this.helpers.hasProperty(eveLog, 'humidity')) {
-        this.accessory.eveService.addEntry(eveLog)
+        eveLog.time = Math.round(new Date().valueOf() / 1000)
+        this.accessory.historyService.addEntry(eveLog)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
diff --git a/lib/device/th-thermo.js b/lib/device/th-thermo.js
index c6376583..c989605c 100644
--- a/lib/device/th-thermo.js
+++ b/lib/device/th-thermo.js
@@ -33,7 +33,11 @@ module.exports = class deviceTHThermo {
     ) {
       this.service.addCharacteristic(this.Characteristic.CurrentRelativeHumidity)
     }
-    accessory.eveService = new this.platform.eveService('custom', accessory)
+    accessory.log = platform.config.debugFakegato ? this.log : () => {}
+    accessory.historyService = new this.platform.eveService('custom', accessory, {
+      storage: 'fs',
+      path: platform.eveLogPath
+    })
     this.accessory = accessory
   }
 
@@ -74,7 +78,10 @@ module.exports = class deviceTHThermo {
         if (this.cacheOnOff !== newState) {
           this.cacheOnOff = newState
           this.switchService.updateCharacteristic(this.Characteristic.On, this.cacheOnOff === 'on')
-          this.accessory.eveService.addEntry({ status: this.cacheOnOff === 'on' ? 1 : 0 })
+          this.accessory.historyService.addEntry({
+            time: Math.round(new Date().valueOf() / 1000),
+            status: this.cacheOnOff === 'on' ? 1 : 0
+          })
           if (params.updateSource && !this.disableDeviceLogging) {
             this.log('[%s] current state [%s].', this.accessory.displayName, this.cacheOnOff)
           }
@@ -109,7 +116,8 @@ module.exports = class deviceTHThermo {
         }
       }
       if (this.helpers.hasProperty(eveLog, 'temp') || this.helpers.hasProperty(eveLog, 'humidity')) {
-        this.accessory.eveService.addEntry(eveLog)
+        eveLog.time = Math.round(new Date().valueOf() / 1000)
+        this.accessory.historyService.addEntry(eveLog)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
diff --git a/lib/device/usb.js b/lib/device/usb.js
index 68128c69..a53cc258 100644
--- a/lib/device/usb.js
+++ b/lib/device/usb.js
@@ -22,7 +22,11 @@ module.exports = class deviceUSB {
     }
     this.service.getCharacteristic(this.Characteristic.On)
       .on('set', this.internalUpdate.bind(this))
-    accessory.eveService = new this.platform.eveService('switch', accessory)
+    accessory.log = platform.config.debugFakegato ? this.log : () => {}
+    accessory.historyService = new this.platform.eveService('switch', accessory, {
+      storage: 'fs',
+      path: platform.eveLogPath
+    })
     this.accessory = accessory
   }
 
@@ -33,7 +37,10 @@ module.exports = class deviceUSB {
       params.switches[0].switch = value ? 'on' : 'off'
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.cacheOnOff = value ? 'on' : 'off'
-      this.accessory.eveService.addEntry({ status: value ? 1 : 0 })
+      this.accessory.historyService.addEntry({
+        time: Math.round(new Date().valueOf() / 1000),
+        status: value ? 1 : 0
+      })
       if (!this.disableDeviceLogging) {
         this.log('[%s] current state [%s].', this.accessory.displayName, value ? 'on' : 'off')
       }
@@ -48,7 +55,10 @@ module.exports = class deviceUSB {
       const newStatus = params.switches[0].switch === 'on'
       this.service.updateCharacteristic(this.Characteristic.On, newStatus)
       this.cacheOnOff = params.switches[0].switch
-      this.accessory.eveService.addEntry({ status: newStatus ? 1 : 0 })
+      this.accessory.historyService.addEntry({
+        time: Math.round(new Date().valueOf() / 1000),
+        status: newStatus ? 1 : 0
+      })
       if (params.updateSource && !this.disableDeviceLogging) {
         this.log('[%s] current state [%s].', this.accessory.displayName, params.switches[0].switch)
       }
diff --git a/lib/device/zb-dev.js b/lib/device/zb-dev.js
index 349638e3..8b8e4832 100644
--- a/lib/device/zb-dev.js
+++ b/lib/device/zb-dev.js
@@ -53,7 +53,11 @@ module.exports = class deviceZBDev {
           accessory.removeService(accessory.getService(this.Service.BatteryService))
         }
         if (!accessory.getService(this.Service.Switch)) accessory.addService(this.Service.Switch)
-        accessory.eveService = new this.platform.eveService('switch', accessory)
+        accessory.log = platform.config.debugFakegato ? this.log : () => {}
+        accessory.historyService = new this.platform.eveService('switch', accessory, {
+          storage: 'fs',
+          path: platform.eveLogPath
+        })
         accessory.getService(this.Service.Switch).getCharacteristic(this.Characteristic.On)
           .on('set', this.internalUpdate.bind(this))
         break
@@ -63,18 +67,30 @@ module.exports = class deviceZBDev {
         tempService.getCharacteristic(this.Characteristic.CurrentTemperature)
           .setProps({ minValue: -100 })
         if (!accessory.getService(this.Service.HumiditySensor)) accessory.addService(this.Service.HumiditySensor)
-        accessory.eveService = new this.platform.eveService('weather', accessory)
+        accessory.log = platform.config.debugFakegato ? this.log : () => {}
+        accessory.historyService = new this.platform.eveService('weather', accessory, {
+          storage: 'fs',
+          path: platform.eveLogPath
+        })
         break
       }
       case 2026:
         if (!accessory.getService(this.Service.BatteryService)) accessory.addService(this.Service.BatteryService)
         if (!accessory.getService(this.Service.MotionSensor)) accessory.addService(this.Service.MotionSensor)
-        accessory.eveService = new this.platform.eveService('motion', accessory)
+        accessory.log = platform.config.debugFakegato ? this.log : () => {}
+        accessory.historyService = new this.platform.eveService('motion', accessory, {
+          storage: 'fs',
+          path: platform.eveLogPath
+        })
         break
       case 3026:
         if (!accessory.getService(this.Service.BatteryService)) accessory.addService(this.Service.BatteryService)
         if (!accessory.getService(this.Service.ContactSensor)) accessory.addService(this.Service.ContactSensor)
-        accessory.eveService = new this.platform.eveService('door', accessory)
+        accessory.log = platform.config.debugFakegato ? this.log : () => {}
+        accessory.historyService = new this.platform.eveService('door', accessory, {
+          storage: 'fs',
+          path: platform.eveLogPath
+        })
         break
     }
     this.accessory = accessory
@@ -87,7 +103,10 @@ module.exports = class deviceZBDev {
         switch: value ? 'on' : 'off'
       })
       this.cacheOnOff = value ? 'on' : 'off'
-      this.accessory.eveService.addEntry({ status: value ? 1 : 0 })
+      this.accessory.historyService.addEntry({
+        time: Math.round(new Date().valueOf() / 1000),
+        status: value ? 1 : 0
+      })
       if (!this.disableDeviceLogging) {
         this.log('[%s] current state [%s].', this.accessory.displayName, value ? 'on' : 'off')
       }
@@ -135,7 +154,10 @@ module.exports = class deviceZBDev {
             this.accessory.getService(this.Service.Switch)
               .updateCharacteristic(this.Characteristic.On, params.switch === 'on')
             this.cacheOnOff = params.switch
-            this.accessory.eveService.addEntry({ status: params.switch === 'on' ? 1 : 0 })
+            this.accessory.historyService.addEntry({
+              time: Math.round(new Date().valueOf() / 1000),
+              status: params.switch === 'on' ? 1 : 0
+            })
             if (params.updateSource && !this.disableDeviceLogging) {
               this.log('[%s] current state [%s].', this.accessory.displayName, params.switch)
             }
@@ -163,7 +185,10 @@ module.exports = class deviceZBDev {
               this.log('[%s] current humidity [%s].', this.accessory.displayName, currentHumi)
             }
           }
-          if (eveLog.temp || eveLog.humidity) this.accessory.eveService.addEntry(eveLog)
+          if (eveLog.temp || eveLog.humidity) {
+            eveLog.time = Math.round(new Date().valueOf() / 1000)
+            this.accessory.historyService.addEntry(eveLog)
+          }
           break
         }
         case 2026:
@@ -174,7 +199,10 @@ module.exports = class deviceZBDev {
               this.helpers.hasProperty(params, 'updateSource') &&
               params.motion === 1 &&
               diff < this.sensorTimeDifference
-            this.accessory.eveService.addEntry({ status: motionDetected ? 1 : 0 })
+            this.accessory.historyService.addEntry({
+              time: Math.round(new Date().valueOf() / 1000),
+              status: motionDetected ? 1 : 0
+            })
             if (params.updateSource && !this.disableDeviceLogging) {
               this.log('[%s] current state [motion%s detected].', this.accessory.displayName, motionDetected ? '' : ' not')
             }
@@ -182,7 +210,7 @@ module.exports = class deviceZBDev {
               this.accessory.getService(this.Service.MotionSensor)
                 .updateCharacteristic(
                   this.eveLastActivation,
-                  Math.round(new Date().valueOf() / 1000) - this.accessory.eveService.getInitialTime()
+                  Math.round(new Date().valueOf() / 1000) - this.accessory.historyService.getInitialTime()
                 )
             }
             this.accessory.getService(this.Service.MotionSensor)
@@ -197,12 +225,15 @@ module.exports = class deviceZBDev {
             if (params.updateSource && !this.disableDeviceLogging) {
               this.log('[%s] current state [contact%s detected].', this.accessory.displayName, params.lock === 0 ? '' : ' not')
             }
-            this.accessory.eveService.addEntry({ status: params.lock })
+            this.accessory.historyService.addEntry({
+              time: Math.round(new Date().valueOf() / 1000),
+              status: params.lock
+            })
             if (params.lock === 1) {
               this.accessory.getService(this.Service.ContactSensor)
                 .updateCharacteristic(
                   this.eveLastActivation,
-                  Math.round(new Date().valueOf() / 1000) - this.accessory.eveService.getInitialTime()
+                  Math.round(new Date().valueOf() / 1000) - this.accessory.historyService.getInitialTime()
                 )
             }
           }
diff --git a/lib/fakegato/fakegato-history.js b/lib/fakegato/fakegato-history.js
index 2a273a26..a19f1b7c 100644
--- a/lib/fakegato/fakegato-history.js
+++ b/lib/fakegato/fakegato-history.js
@@ -1,31 +1,71 @@
-/* jshint -W014, -W033, esversion: 9 */
-/* eslint-disable new-cap */
+/* jshint esversion: 6,node: true,-W041: false */
 'use strict'
+
 const Format = require('util').format
 const FakeGatoTimer = require('./fakegato-timer').FakeGatoTimer
 const FakeGatoStorage = require('./fakegato-storage').FakeGatoStorage
-let homebridge
-let Characteristic
-let Service
-module.exports = function (pHomebridge, log) {
+
+const EPOCH_OFFSET = 978307200
+
+const TYPE_ENERGY = 'energy'
+const TYPE_ROOM = 'room'
+const TYPE_WEATHER = 'weather'
+const TYPE_DOOR = 'door'
+const TYPE_MOTION = 'motion'
+const TYPE_SWITCH = 'switch'
+const TYPE_THERMO = 'thermo'
+const TYPE_AQUA = 'aqua'
+const TYPE_CUSTOM = 'custom'
+
+var homebridge
+var Characteristic, Service
+
+module.exports = function (pHomebridge) {
   if (pHomebridge && !homebridge) {
     homebridge = pHomebridge
     Characteristic = homebridge.hap.Characteristic
     Service = homebridge.hap.Service
   }
 
-  const hexToBase64 = val => Buffer.from(('' + val).replace(/[^0-9A-F]/ig, ''), 'hex').toString('base64')
-  const base64ToHex = val => val ? Buffer.from(val, 'base64').toString('hex') : val
-  const swap16 = val => ((val & 0xFF) << 8) | ((val >>> 8) & 0xFF)
-  const swap32 = val => ((val & 0xFF) << 24) | ((val & 0xFF00) << 8) | ((val >>> 8) & 0xFF00) | ((val >>> 24) & 0xFF)
-  const ucfirst = val => val.charAt(0).toUpperCase() + val.substr(1)
-  const precisionRound = (number, precision) => Math.round(number * Math.pow(10, precision)) / Math.pow(10, precision)
-  const numToHex = (val, len) => {
-    let s = Number(val >>> 0).toString(16)
-    if (s.length % 2 !== 0) {
+  var hexToBase64 = function (val) {
+    return Buffer.from(('' + val).replace(/[^0-9A-F]/ig, ''), 'hex').toString('base64')
+  }
+  var base64ToHex = function (val) {
+    if (!val) { return val }
+    return Buffer.from(val, 'base64').toString('hex')
+  }
+  var swap16 = function (val) {
+    return ((val & 0xFF) << 8) |
+        ((val >>> 8) & 0xFF)
+  }
+  var swap32 = function (val) {
+    return ((val & 0xFF) << 24) |
+        ((val & 0xFF00) << 8) |
+        ((val >>> 8) & 0xFF00) |
+        ((val >>> 24) & 0xFF)
+  }
+  var hexToHPA = function (val) { // unused
+    return parseInt(swap16(val), 10)
+  }
+  var hPAtoHex = function (val) { // unused
+    return swap16(Math.round(val)).toString(16)
+  }
+  var numToHex = function (val, len) {
+    var s = Number(val >>> 0).toString(16)
+    if (s.length % 2 != 0) {
       s = '0' + s
     }
-    return len ? ('0000000000000' + s).slice(-1 * len) : s
+    if (len) {
+      return ('0000000000000' + s).slice(-1 * len)
+    }
+    return s
+  }
+  var ucfirst = function (val) {
+    return val.charAt(0).toUpperCase() + val.substr(1)
+  }
+  var precisionRound = function (number, precision) {
+    var factor = Math.pow(10, precision)
+    return Math.round(number * factor) / factor
   }
 
   class S2R1Characteristic extends Characteristic {
@@ -33,10 +73,13 @@ module.exports = function (pHomebridge, log) {
       super('S2R1', S2R1Characteristic.UUID)
       this.setProps({
         format: Characteristic.Formats.DATA,
-        perms: [Characteristic.Perms.READ, Characteristic.Perms.NOTIFY, Characteristic.Perms.HIDDEN]
+        perms: [
+          Characteristic.Perms.READ, Characteristic.Perms.NOTIFY, Characteristic.Perms.HIDDEN
+        ]
       })
     }
   }
+
   S2R1Characteristic.UUID = 'E863F116-079E-48FF-8F27-9C2605A29F52'
 
   class S2R2Characteristic extends Characteristic {
@@ -44,10 +87,13 @@ module.exports = function (pHomebridge, log) {
       super('S2R2', S2R2Characteristic.UUID)
       this.setProps({
         format: Characteristic.Formats.DATA,
-        perms: [Characteristic.Perms.READ, Characteristic.Perms.NOTIFY, Characteristic.Perms.HIDDEN]
+        perms: [
+          Characteristic.Perms.READ, Characteristic.Perms.NOTIFY, Characteristic.Perms.HIDDEN
+        ]
       })
     }
   }
+
   S2R2Characteristic.UUID = 'E863F117-079E-48FF-8F27-9C2605A29F52'
 
   class S2W1Characteristic extends Characteristic {
@@ -55,10 +101,13 @@ module.exports = function (pHomebridge, log) {
       super('S2W1', S2W1Characteristic.UUID)
       this.setProps({
         format: Characteristic.Formats.DATA,
-        perms: [Characteristic.Perms.WRITE, Characteristic.Perms.HIDDEN]
+        perms: [
+          Characteristic.Perms.WRITE, Characteristic.Perms.HIDDEN
+        ]
       })
     }
   }
+
   S2W1Characteristic.UUID = 'E863F11C-079E-48FF-8F27-9C2605A29F52'
 
   class S2W2Characteristic extends Characteristic {
@@ -66,242 +115,285 @@ module.exports = function (pHomebridge, log) {
       super('S2W2', S2W2Characteristic.UUID)
       this.setProps({
         format: Characteristic.Formats.DATA,
-        perms: [Characteristic.Perms.WRITE, Characteristic.Perms.HIDDEN]
+        perms: [
+          Characteristic.Perms.WRITE, Characteristic.Perms.HIDDEN
+        ]
       })
     }
   }
+
   S2W2Characteristic.UUID = 'E863F121-079E-48FF-8F27-9C2605A29F52'
 
   class FakeGatoHistoryService extends Service {
     constructor (displayName, subtype) {
       super(displayName, FakeGatoHistoryService.UUID, subtype)
+
       this.addCharacteristic(S2R1Characteristic)
       this.addCharacteristic(S2R2Characteristic)
       this.addCharacteristic(S2W1Characteristic)
       this.addCharacteristic(S2W2Characteristic)
     }
   }
-  FakeGatoHistoryService.UUID = 'E863F007-079E-48FF-8F27-9C2605A29F52'
 
+  FakeGatoHistoryService.UUID = 'E863F007-079E-48FF-8F27-9C2605A29F52'
+  var thisAccessory = {}
   class FakeGatoHistory extends Service {
-    constructor (accessoryType, accessory) {
+    constructor (accessoryType, accessory, optionalParams) {
       super(accessory.displayName + ' History', FakeGatoHistoryService.UUID)
-      this.accessory = accessory
-      this.log = log
+
+      var entry2address = function (val) { // not used ?
+        var temp = val % this.memorySize
+        return temp
+      }.bind(this)
+
+      thisAccessory = accessory
+      this.accessoryName = thisAccessory.displayName
       this.signatures = []
       this.uuid = require('./uuid.js')
-      this.path = homebridge.user.storagePath() + '/persist/'
-      if (homebridge.globalFakeGatoTimer === undefined) {
-        homebridge.globalFakeGatoTimer = new FakeGatoTimer(this.log)
+
+      if (typeof (optionalParams) === 'object') {
+        this.size = optionalParams.size || 4032
+        this.minutes = optionalParams.minutes || 10 // Optional timer length
+        this.storage = optionalParams.storage // 'fs' or 'googleDrive'
+        this.path = optionalParams.path || optionalParams.folder || (this.storage == 'fs' ? homebridge.user.storagePath() : undefined)
+        this.filename = optionalParams.filename
+        this.disableTimer = optionalParams.disableTimer || false
+        this.disableRepeatLastData = optionalParams.disableRepeatLastData || false
+        this.log = optionalParams.log || thisAccessory.log || {}		// workaround for typescript blocking of changing of accessory object definition
+      } else {
+        this.size = 4032
+        this.minutes = 10
+        this.disableTimer = false
+        this.log = thisAccessory.log || {}
       }
-      this.loaded = false
-      if (homebridge.globalFakeGatoStorage === undefined) {
-        homebridge.globalFakeGatoStorage = new FakeGatoStorage(this.log)
+
+      if (!this.log.debug) {
+        this.log.debug = function () { }
       }
-      homebridge.globalFakeGatoStorage.addWriter(this, {
-        path: this.path,
-        onReady: () => {
-          this.load((err, loaded) => {
-            if (err) {
-              this.log.warn('[%s] fakegato load error [%s].', this.accessory.displayName, err)
-              return
-            }
-            this.loaded = true
+
+      if (!this.disableTimer) {
+        if (homebridge.globalFakeGatoTimer === undefined) {
+          homebridge.globalFakeGatoTimer = new FakeGatoTimer({
+            minutes: this.minutes,
+            log: this.log
           })
         }
-      })
+      }
+
+      if (this.storage !== undefined) {
+        this.loaded = false
+        if (homebridge.globalFakeGatoStorage === undefined) {
+          homebridge.globalFakeGatoStorage = new FakeGatoStorage({
+            log: this.log
+          })
+        }
+        homebridge.globalFakeGatoStorage.addWriter(this, {
+          storage: this.storage,
+          path: this.path,
+          filename: this.filename,
+          keyPath: optionalParams.keyPath || homebridge.user.storagePath() || undefined,
+          onReady: function () {
+            this.load(function (err, loaded) {
+              // this.log.debug("Loaded",loaded);
+              // this.registerEvents();
+              if (err) this.log.debug('Load error :', err)
+              else {
+                if (loaded) this.log.debug('History Loaded from Persistant Storage')
+                this.loaded = true
+              }
+            }.bind(this))
+          }.bind(this)
+        })
+      }
 
       switch (accessoryType) {
-        case 'weather':
+        case TYPE_WEATHER:
           this.accessoryType116 = '03 0102 0202 0302'
           this.accessoryType117 = '07'
-          homebridge.globalFakeGatoTimer.subscribe(this, this.calculateAverage)
+          if (!this.disableTimer) {
+            homebridge.globalFakeGatoTimer.subscribe(this, this.calculateAverage)
+          }
           break
-        case 'energy':
+        case TYPE_ENERGY:
           this.accessoryType116 = '04 0102 0202 0702 0f03'
           this.accessoryType117 = '1f'
-          homebridge.globalFakeGatoTimer.subscribe(this, this.calculateAverage)
+          if (!this.disableTimer) {
+            homebridge.globalFakeGatoTimer.subscribe(this, this.calculateAverage)
+          }
           break
-        case 'room':
+        case TYPE_ROOM:
           this.accessoryType116 = '04 0102 0202 0402 0f03'
           this.accessoryType117 = '0f'
-          homebridge.globalFakeGatoTimer.subscribe(this, this.calculateAverage)
+          if (!this.disableTimer) {
+            homebridge.globalFakeGatoTimer.subscribe(this, this.calculateAverage)
+          }
           break
-        case 'door':
+        case TYPE_DOOR:
           this.accessoryType116 = '01 0601'
           this.accessoryType117 = '01'
-          homebridge.globalFakeGatoTimer.subscribe(this, function (params) {
-            const actualEntry = {}
-            if ((params.backLog || []).length) {
-              actualEntry.status = params.backLog[0].status
-              actualEntry.time = params.immediate ? params.backLog[0].time : Math.round(new Date().valueOf() / 1000)
-              this.service.log('[%s] fakegato cb [%s]', this.service.accessory.displayName, actualEntry)
-              this.service._addEntry(actualEntry)
-            }
-          })
+          if (!this.disableTimer) {
+            homebridge.globalFakeGatoTimer.subscribe(this, function (params) { // callback
+              var backLog = params.backLog || []
+              var immediate = params.immediate
+
+              var fakegato = this.service
+              var actualEntry = {}
+
+              if (backLog.length) {
+                if (!immediate) {
+                  actualEntry.time = Math.round(new Date().valueOf() / 1000)
+                  actualEntry.status = backLog[0].status
+                } else {
+                  actualEntry.time = backLog[0].time
+                  actualEntry.status = backLog[0].status
+                }
+                fakegato.log.debug('**Fakegato-timer callbackDoor: ', fakegato.accessoryName, ', immediate: ', immediate, ', entry: ', actualEntry)
+
+                fakegato._addEntry(actualEntry)
+              }
+            })
+          }
           break
-        case 'motion':
+        case TYPE_MOTION:
           this.accessoryType116 = '02 1301 1c01'
           this.accessoryType117 = '02'
-          homebridge.globalFakeGatoTimer.subscribe(this, function (params) {
-            const actualEntry = {}
-            if ((params.backLog || []).length) {
-              actualEntry.status = params.backLog[0].status
-              actualEntry.time = params.immediate ? params.backLog[0].time : Math.round(new Date().valueOf() / 1000)
-              this.service.log('[%s] fakegato cb [%s]', this.service.accessory.displayName, actualEntry)
-              this.service._addEntry(actualEntry)
-            }
-          })
+          if (!this.disableTimer) {
+            homebridge.globalFakeGatoTimer.subscribe(this, function (params) { // callback
+              var backLog = params.backLog || []
+              var immediate = params.immediate
+
+              var fakegato = this.service
+              var actualEntry = {}
+
+              if (backLog.length) {
+                if (!immediate) {
+                  actualEntry.time = Math.round(new Date().valueOf() / 1000)
+                  actualEntry.status = backLog[0].status
+                } else {
+                  actualEntry.time = backLog[0].time
+                  actualEntry.status = backLog[0].status
+                }
+                fakegato.log.debug('**Fakegato-timer callbackMotion: ', fakegato.accessoryName, ', immediate: ', immediate, ', entry: ', actualEntry)
+
+                fakegato._addEntry(actualEntry)
+              }
+            })
+          }
           break
-        case 'switch':
+        case TYPE_SWITCH:
           this.accessoryType116 = '01 0e01'
           this.accessoryType117 = '01'
-          homebridge.globalFakeGatoTimer.subscribe(this, function (params) {
-            const actualEntry = {}
-            if ((params.backLog || []).length) {
-              actualEntry.status = params.backLog[0].status
-              actualEntry.time = params.immediate ? params.backLog[0].time : Math.round(new Date().valueOf() / 1000)
-              this.service.log('[%s] fakegato cb [%s]', this.service.accessory.displayName, actualEntry)
-              this.service._addEntry(actualEntry)
-            }
-          })
+          if (!this.disableTimer) {
+            homebridge.globalFakeGatoTimer.subscribe(this, function (params) { // callback
+              var backLog = params.backLog || []
+              var immediate = params.immediate
+
+              var fakegato = this.service
+              var actualEntry = {}
+
+              if (backLog.length) {
+                if (!immediate) {
+                  actualEntry.time = Math.round(new Date().valueOf() / 1000)
+                  actualEntry.status = backLog[0].status
+                } else {
+                  actualEntry.time = backLog[0].time
+                  actualEntry.status = backLog[0].status
+                }
+                fakegato.log.debug('**Fakegato-timer callbackSwitch: ', fakegato.accessoryName, ', immediate: ', immediate, ', entry: ', actualEntry)
+
+                fakegato._addEntry(actualEntry)
+              }
+            })
+          }
           break
-        case 'custom':
-          this.accessory.services.forEach((service, i) => {
+        case TYPE_CUSTOM:
+          thisAccessory.services.forEach((service, i) => {
             service.characteristics.forEach((characteristic, i) => {
+              // console.log('  characteristics', characteristic.displayName, characteristic.UUID);
               switch (this.uuid.toLongFormUUID(characteristic.UUID)) {
                 case Characteristic.CurrentTemperature.UUID: // Temperature
-                  this.signatures.push({
-                    signature: '0102',
-                    length: 4,
-                    uuid: this.uuid.toShortFormUUID(characteristic.UUID),
-                    factor: 100,
-                    entry: 'temp'
-                  })
+                  this.signatures.push({ signature: '0102', length: 4, uuid: this.uuid.toShortFormUUID(characteristic.UUID), factor: 100, entry: 'temp' })
                   break
                 case Characteristic.CurrentRelativeHumidity.UUID: // Humidity
-                  this.signatures.push({
-                    signature: '0202',
-                    length: 4,
-                    uuid: this.uuid.toShortFormUUID(characteristic.UUID),
-                    factor: 100,
-                    entry: 'humidity'
-                  })
+                  this.signatures.push({ signature: '0202', length: 4, uuid: this.uuid.toShortFormUUID(characteristic.UUID), factor: 100, entry: 'humidity' })
                   break
                 case 'E863F10F-079E-48FF-8F27-9C2605A29F52': // CustomCharacteristic.AtmosphericPressureLevel.UUID
-                  this.signatures.push({
-                    signature: '0302',
-                    length: 4,
-                    uuid: this.uuid.toShortFormUUID(characteristic.UUID),
-                    factor: 10,
-                    entry: 'pressure'
-                  })
+                  this.signatures.push({ signature: '0302', length: 4, uuid: this.uuid.toShortFormUUID(characteristic.UUID), factor: 10, entry: 'pressure' })
                   break
                 case 'E863F10B-079E-48FF-8F27-9C2605A29F52': // PPM
-                  this.signatures.push({
-                    signature: '0702',
-                    length: 4,
-                    uuid: this.uuid.toShortFormUUID(characteristic.UUID),
-                    factor: 10,
-                    entry: 'ppm'
-                  })
+                  this.signatures.push({ signature: '0702', length: 4, uuid: this.uuid.toShortFormUUID(characteristic.UUID), factor: 10, entry: 'ppm' })
                   break
                 case Characteristic.ContactSensorState.UUID: // Contact Sensor State
-                  this.signatures.push({
-                    signature: '0601',
-                    length: 2,
-                    uuid: this.uuid.toShortFormUUID(characteristic.UUID),
-                    factor: 1,
-                    entry: 'contact'
-                  })
+                  this.signatures.push({ signature: '0601', length: 2, uuid: this.uuid.toShortFormUUID(characteristic.UUID), factor: 1, entry: 'contact' })
                   break
                 case 'E863F10D-079E-48FF-8F27-9C2605A29F52': // Power
-                  this.signatures.push({
-                    signature: '0702',
-                    length: 4,
-                    uuid: this.uuid.toShortFormUUID(characteristic.UUID),
-                    factor: 10,
-                    entry: 'power'
-                  })
+                  this.signatures.push({ signature: '0702', length: 4, uuid: this.uuid.toShortFormUUID(characteristic.UUID), factor: 10, entry: 'power' })
                   break
                 case Characteristic.On.UUID: // Switch On
-                  this.signatures.push({
-                    signature: '0e01',
-                    length: 2,
-                    uuid: this.uuid.toShortFormUUID(characteristic.UUID),
-                    factor: 1,
-                    entry: 'status'
-                  })
+                  this.signatures.push({ signature: '0e01', length: 2, uuid: this.uuid.toShortFormUUID(characteristic.UUID), factor: 1, entry: 'status' })
                   break
                 case Characteristic.MotionDetected.UUID: // Motion Detected
-                  this.signatures.push({
-                    signature: '1c01',
-                    length: 2,
-                    uuid: this.uuid.toShortFormUUID(characteristic.UUID),
-                    factor: 1,
-                    entry: 'motion'
-                  })
+                  this.signatures.push({ signature: '1c01', length: 2, uuid: this.uuid.toShortFormUUID(characteristic.UUID), factor: 1, entry: 'motion' })
                   break
               }
             })
           })
-          this.accessoryType116 = ' 0' +
-            this.signatures.length.toString() +
-            ' ' +
-            this.signatures.sort((a, b) => (a.signature > b.signature) ? 1 : -1).map(a => a.signature).join(' ') +
-            ' '
-          homebridge.globalFakeGatoTimer.subscribe(this, this.calculateAverage)
+          this.accessoryType116 = (' 0' + this.signatures.length.toString() + ' ' + this.signatures.sort((a, b) => (a.signature > b.signature) ? 1 : -1).map(a => a.signature).join(' ') + ' ')
+          if (!this.disableTimer) {
+            homebridge.globalFakeGatoTimer.subscribe(this, this.calculateAverage)
+          }
           break
-        case 'aqua':
+        case TYPE_AQUA:
           this.accessoryType116 = '03 1f01 2a08 2302'
           this.accessoryType117 = '05'
           this.accessoryType117bis = '07'
           break
-        case 'thermo':
+        case TYPE_THERMO:
           this.accessoryType116 = '05 0102 1102 1001 1201 1d01'
           this.accessoryType117 = '1f'
           break
       }
+
       this.accessoryType = accessoryType
       this.firstEntry = 0
       this.lastEntry = 0
       this.history = ['noValue']
-      this.memorySize = 4032
+      this.memorySize = this.size
       this.usedMemory = 0
       this.currentEntry = 1
+      this.transfer = false
       this.setTime = true
       this.restarted = true
       this.refTime = 0
       this.memoryAddress = 0
       this.dataStream = ''
-      if (!(this.service = this.accessory.getService(FakeGatoHistoryService))) {
-        const serviceName = ucfirst(this.accessory.displayName) + ' History'
-        this.service = this.accessory.addService(FakeGatoHistoryService, serviceName, this.accessoryType)
+
+      this.saving = false
+
+      this.registerEvents()
+      if (this.storage === undefined) {
+        this.loaded = true
       }
-      this.service.getCharacteristic(S2R2Characteristic)
-        .on('get', this.getCurrentS2R2.bind(this))
-      this.service.getCharacteristic(S2W1Characteristic)
-        .on('set', this.setCurrentS2W1.bind(this))
-      this.service.getCharacteristic(S2W2Characteristic)
-        .on('set', this.setCurrentS2W2.bind(this))
     }
 
-    calculateAverage (params) {
-      const backLog = params.backLog || []
-      const previousAvrg = params.previousAvrg || {}
-      const timer = params.timer
-      const fakegato = this.service
-      const calc = { sum: {}, num: {}, avrg: {} }
-      for (const h in backLog) {
-        if (Object.prototype.hasOwnProperty.call(backLog, h)) { // only valid keys
+    calculateAverage (params) { // callback
+      var backLog = params.backLog || []
+      var previousAvrg = params.previousAvrg || {}
+      var timer = params.timer
+
+      var fakegato = this.service
+      var calc = {
+        sum: {},
+        num: {},
+        avrg: {}
+      }
+
+      for (var h in backLog) {
+        if (backLog.hasOwnProperty(h)) { // only valid keys
           for (const key in backLog[h]) { // each record
-            if (Object.prototype.hasOwnProperty.call(backLog[h], key) && key !== 'time') { // except time
-              if (!calc.sum[key]) {
-                calc.sum[key] = 0
-              }
-              if (!calc.num[key]) {
-                calc.num[key] = 0
-              }
+            if (backLog[h].hasOwnProperty(key) && key != 'time') { // except time
+              if (!calc.sum[key]) { calc.sum[key] = 0 }
+              if (!calc.num[key]) { calc.num[key] = 0 }
               calc.sum[key] += backLog[h][key]
               calc.num[key]++
               calc.avrg[key] = precisionRound(calc.sum[key] / calc.num[key], 2)
@@ -309,12 +401,16 @@ module.exports = function (pHomebridge, log) {
           }
         }
       }
-      // set the time of the avrg
-      calc.avrg.time = Math.round(new Date().valueOf() / 1000)
-      for (const key in previousAvrg) { // each record of previous average
-        if (Object.prototype.hasOwnProperty.call(previousAvrg, key) && key !== 'time') { // except time
-          if (!backLog.length || calc.avrg[key] === undefined) {
-            calc.avrg[key] = previousAvrg[key]
+      calc.avrg.time = Math.round(new Date().valueOf() / 1000) // set the time of the avrg
+
+      if (!fakegato.disableRepeatLastData) {
+        for (const key in previousAvrg) { // each record of previous average
+          if (previousAvrg.hasOwnProperty(key) && key != 'time') { // except time
+            if (!backLog.length ||// calc.avrg[key] == 0 || // zero value
+              calc.avrg[key] === undefined) // no key (meaning no value received for this key yet)
+            {
+              calc.avrg[key] = previousAvrg[key]
+            }
           }
         }
       }
@@ -326,8 +422,50 @@ module.exports = function (pHomebridge, log) {
       return calc.avrg
     }
 
+    registerEvents () {
+      this.log.debug('Registring Events', thisAccessory.displayName)
+      if (typeof thisAccessory.getService === 'function') {
+        // Platform API
+        this.log.debug('Platform', thisAccessory.displayName)
+
+        this.service = thisAccessory.getService(FakeGatoHistoryService)
+        if (this.service === undefined) {
+          this.service = thisAccessory.addService(FakeGatoHistoryService, ucfirst(thisAccessory.displayName) + ' History', this.accessoryType)
+        }
+
+        this.service.getCharacteristic(S2R2Characteristic)
+          .removeAllListeners('get')
+          .on('get', this.getCurrentS2R2.bind(this))
+
+        this.service.getCharacteristic(S2W1Characteristic)
+          .removeAllListeners('set')
+          .on('set', this.setCurrentS2W1.bind(this))
+
+        this.service.getCharacteristic(S2W2Characteristic)
+          .removeAllListeners('set')
+          .on('set', this.setCurrentS2W2.bind(this))
+      } else {
+        // Accessory API
+        this.log.debug('Accessory', thisAccessory.displayName)
+
+        this.addCharacteristic(S2R1Characteristic)
+
+        this.addCharacteristic(S2R2Characteristic)
+          .removeAllListeners('get')
+          .on('get', this.getCurrentS2R2.bind(this))
+
+        this.addCharacteristic(S2W1Characteristic)
+          .removeAllListeners('set')
+          .on('set', this.setCurrentS2W1.bind(this))
+
+        this.addCharacteristic(S2W2Characteristic)
+          .removeAllListeners('set')
+          .on('set', this.setCurrentS2W2.bind(this))
+      }
+    }
+
     sendHistory (address) {
-      if (address !== 0) {
+      if (address != 0) {
         this.currentEntry = address
       } else {
         this.currentEntry = 1
@@ -336,31 +474,32 @@ module.exports = function (pHomebridge, log) {
     }
 
     addEntry (entry) {
-      entry.time = Math.round(new Date().valueOf() / 1000)
       switch (this.accessoryType) {
-        case 'door':
-        case 'motion':
-        case 'switch':
-          homebridge.globalFakeGatoTimer.addData({ entry: entry, service: this, immediateCallback: true })
+        case TYPE_DOOR:
+        case TYPE_MOTION:
+        case TYPE_SWITCH:
+          if (!this.disableTimer) { homebridge.globalFakeGatoTimer.addData({ entry: entry, service: this, immediateCallback: true }) } else { this._addEntry({ time: entry.time, status: entry.status }) }
           break
-        case 'aqua':
+        case TYPE_AQUA:
           this._addEntry({ time: entry.time, status: entry.status, waterAmount: entry.waterAmount })
           break
-        case 'weather':
-          homebridge.globalFakeGatoTimer.addData({ entry: entry, service: this })
+        case TYPE_WEATHER:
+          if (!this.disableTimer) { homebridge.globalFakeGatoTimer.addData({ entry: entry, service: this }) } else { this._addEntry({ time: entry.time, temp: entry.temp, humidity: entry.humidity, pressure: entry.pressure }) }
           break
-        case 'room':
-          homebridge.globalFakeGatoTimer.addData({ entry: entry, service: this })
+        case TYPE_ROOM:
+          if (!this.disableTimer) { homebridge.globalFakeGatoTimer.addData({ entry: entry, service: this }) } else { this._addEntry({ time: entry.time, temp: entry.temp, humidity: entry.humidity, ppm: entry.ppm }) }
           break
-        case 'energy':
-          homebridge.globalFakeGatoTimer.addData({ entry: entry, service: this })
+        case TYPE_ENERGY:
+          if (!this.disableTimer) { homebridge.globalFakeGatoTimer.addData({ entry: entry, service: this }) } else { this._addEntry({ time: entry.time, power: entry.power }) }
           break
-        case 'custom':
-          if ('power' in entry || 'temp' in entry) {
-            homebridge.globalFakeGatoTimer.addData({ entry: entry, service: this })
-          } else {
-            this._addEntry(entry)
-          }
+        case TYPE_CUSTOM:
+          if (!this.disableTimer) {
+            if ('power' in entry || 'temp' in entry) { // Only put power or temperature thru averager
+              homebridge.globalFakeGatoTimer.addData({ entry: entry, service: this })
+            } else {
+              this._addEntry(entry)
+            }
+          } else { this._addEntry(entry) }
           break
         default:
           this._addEntry(entry)
@@ -368,13 +507,16 @@ module.exports = function (pHomebridge, log) {
       }
     }
 
-    // *** In order to be consistent with Eve, entry address start from 1 *** \\
+    // in order to be consistent with Eve, entry address start from 1
     _addEntry (entry) {
       if (this.loaded) {
-        const entry2address = val => {
+        var entry2address = function (val) {
           return val % this.memorySize
         }
-        let val
+          .bind(this)
+
+        var val
+
         if (this.usedMemory < this.memorySize) {
           this.usedMemory++
           this.firstEntry = 0
@@ -382,7 +524,7 @@ module.exports = function (pHomebridge, log) {
         } else {
           this.firstEntry++
           this.lastEntry = this.firstEntry + this.usedMemory
-          if (this.restarted) {
+          if (this.restarted == true) {
             this.history[entry2address(this.lastEntry)] = {
               time: entry.time,
               setRefTime: 1
@@ -392,8 +534,9 @@ module.exports = function (pHomebridge, log) {
             this.restarted = false
           }
         }
-        if (this.refTime === 0) {
-          this.refTime = entry.time - 978307200
+
+        if (this.refTime == 0) {
+          this.refTime = entry.time - EPOCH_OFFSET
           this.history[this.lastEntry] = {
             time: entry.time,
             setRefTime: 1
@@ -402,11 +545,13 @@ module.exports = function (pHomebridge, log) {
           this.lastEntry++
           this.usedMemory++
         }
+
         this.history[entry2address(this.lastEntry)] = (entry)
+
         if (this.usedMemory < this.memorySize) {
           val = Format(
             '%s00000000%s%s%s%s%s000000000101',
-            numToHex(swap32(entry.time - this.refTime - 978307200), 8),
+            numToHex(swap32(entry.time - this.refTime - EPOCH_OFFSET), 8),
             numToHex(swap32(this.refTime), 8),
             this.accessoryType116,
             numToHex(swap16(this.usedMemory + 1), 4),
@@ -415,25 +560,30 @@ module.exports = function (pHomebridge, log) {
         } else {
           val = Format(
             '%s00000000%s%s%s%s%s000000000101',
-            numToHex(swap32(entry.time - this.refTime - 978307200), 8),
+            numToHex(swap32(entry.time - this.refTime - EPOCH_OFFSET), 8),
             numToHex(swap32(this.refTime), 8),
             this.accessoryType116,
             numToHex(swap16(this.usedMemory), 4),
             numToHex(swap16(this.memorySize), 4),
             numToHex(swap32(this.firstEntry + 1), 8))
         }
-        this.service.setCharacteristic(S2R1Characteristic, hexToBase64(val))
-        this.log(
-          '[%s] fakegato first [%s] last [%s] used [%s] 116 [%s].',
-          this.accessory.displayName,
-          this.firstEntry.toString(16),
-          this.lastEntry.toString(16),
-          this.usedMemory.toString(16),
-          val
-        )
-        this.save()
+
+        if (this.service === undefined) { // Accessory API
+          this.getCharacteristic(S2R1Characteristic).setValue(hexToBase64(val))
+        } else { // Platform API
+          this.service.getCharacteristic(S2R1Characteristic).setValue(hexToBase64(val))
+        }
+
+        this.log.debug('First entry %s: %s', this.accessoryName, this.firstEntry.toString(16))
+        this.log.debug('Last entry %s: %s', this.accessoryName, this.lastEntry.toString(16))
+        this.log.debug('Used memory %s: %s', this.accessoryName, this.usedMemory.toString(16))
+        this.log.debug('116 %s: %s', this.accessoryName, val)
+
+        if (this.storage !== undefined) this.save()
       } else {
-        setTimeout(() => this._addEntry(entry), 100)
+        setTimeout(function () { // retry in 100ms
+          this._addEntry(entry)
+        }.bind(this), 100)
       }
     }
 
@@ -441,6 +591,18 @@ module.exports = function (pHomebridge, log) {
       return this.initialTime
     }
 
+    setExtraPersistedData (extra) {
+      this.extra = extra
+    }
+
+    getExtraPersistedData () {
+      return this.extra
+    }
+
+    isHistoryLoaded () {
+      return this.loaded
+    }
+
     save () {
       if (this.loaded) {
         const data = {
@@ -452,173 +614,182 @@ module.exports = function (pHomebridge, log) {
           history: this.history,
           extra: this.extra
         }
+
         homebridge.globalFakeGatoStorage.write({
           service: this,
           data: typeof (data) === 'object' ? JSON.stringify(data) : data
         })
-        return
+      } else {
+        setTimeout(function () { // retry in 100ms
+          this.save()
+        }.bind(this), 100)
       }
-      setTimeout(() => this.save(), 100)
     }
 
     load (cb) {
+      this.log.debug('Loading...')
       homebridge.globalFakeGatoStorage.read({
         service: this,
-        callback: (err, data) => {
-          if (err || !data) {
+        callback: function (err, data) {
+          if (!err) {
+            if (data) {
+              try {
+                this.log.debug('read data from', this.accessoryName, ':', data)
+                const jsonFile = typeof (data) === 'object' ? data : JSON.parse(data)
+
+                this.firstEntry = jsonFile.firstEntry
+                this.lastEntry = jsonFile.lastEntry
+                this.usedMemory = jsonFile.usedMemory
+                this.refTime = jsonFile.refTime
+                this.initialTime = jsonFile.initialTime
+                this.history = jsonFile.history
+                this.extra = jsonFile.extra
+              } catch (e) {
+                this.log.debug('**ERROR fetching persisting data restart from zero - invalid JSON**', e)
+                cb(e, false)
+              }
+              cb(null, true)
+            }
+          } else {
+            // file don't exists
             cb(null, false)
-            return
-          }
-          try {
-            const jsonFile = typeof (data) === 'object' ? data : JSON.parse(data)
-            this.firstEntry = jsonFile.firstEntry
-            this.lastEntry = jsonFile.lastEntry
-            this.usedMemory = jsonFile.usedMemory
-            this.refTime = jsonFile.refTime
-            this.initialTime = jsonFile.initialTime
-            this.history = jsonFile.history
-            this.extra = jsonFile.extra
-          } catch (e) {
-            this.log.warn('[%s] fakegato error fetching persisting data [%s]', this.accessory.displayName, e)
-            cb(e, false)
           }
-          cb(null, true)
-        }
+        }.bind(this)
       })
     }
 
     cleanPersist () {
-      homebridge.globalFakeGatoStorage.remove({ service: this })
+      this.log.debug('Cleaning...')
+      homebridge.globalFakeGatoStorage.remove({
+        service: this
+      })
     }
 
     getCurrentS2R2 (callback) {
-      const entry2address = val => val % this.memorySize
-      if ((this.currentEntry <= this.lastEntry) && this.transfer) {
+      var entry2address = function (val) {
+        return val % this.memorySize
+      }.bind(this)
+
+      if ((this.currentEntry <= this.lastEntry) && (this.transfer == true)) {
         this.memoryAddress = entry2address(this.currentEntry)
-        for (let i = 0; i < 11; i++) {
-          if ((this.history[this.memoryAddress].setRefTime === 1) || this.setTime || this.currentEntry === this.firstEntry + 1) {
+        for (var i = 0; i < 11; i++) {
+          if ((this.history[this.memoryAddress].setRefTime == 1) || (this.setTime == true) ||
+            (this.currentEntry == this.firstEntry + 1)) {
             this.dataStream += Format(
               ',15%s 0100 0000 81%s0000 0000 00 0000',
               numToHex(swap32(this.currentEntry), 8),
-              numToHex(swap32(this.refTime), 8)
-            )
+              numToHex(swap32(this.refTime), 8))
             this.setTime = false
           } else {
-            this.log('[%s] fakegato S2R2 entry [%s] address: [%s].', this.accessory.displayName, this.currentEntry, this.memoryAddress)
+            this.log.debug('%s Entry: %s, Address: %s', this.accessoryName, this.currentEntry, this.memoryAddress)
             switch (this.accessoryType) {
-              case 'weather':
+              case TYPE_WEATHER:
                 this.dataStream += Format(
                   ',10 %s%s-%s:%s %s %s',
                   numToHex(swap32(this.currentEntry), 8),
-                  numToHex(swap32(this.history[this.memoryAddress].time - this.refTime - 978307200), 8),
+                  numToHex(swap32(this.history[this.memoryAddress].time - this.refTime - EPOCH_OFFSET), 8),
                   this.accessoryType117,
                   numToHex(swap16(this.history[this.memoryAddress].temp * 100), 4),
                   numToHex(swap16(this.history[this.memoryAddress].humidity * 100), 4),
-                  numToHex(swap16(this.history[this.memoryAddress].pressure * 10), 4)
-                )
+                  numToHex(swap16(this.history[this.memoryAddress].pressure * 10), 4))
                 break
-              case 'energy':
+              case TYPE_ENERGY:
                 this.dataStream += Format(
                   ',14 %s%s-%s:0000 0000 %s 0000 0000',
                   numToHex(swap32(this.currentEntry), 8),
-                  numToHex(swap32(this.history[this.memoryAddress].time - this.refTime - 978307200), 8),
+                  numToHex(swap32(this.history[this.memoryAddress].time - this.refTime - EPOCH_OFFSET), 8),
                   this.accessoryType117,
-                  numToHex(swap16(this.history[this.memoryAddress].power * 10), 4)
-                )
+                  numToHex(swap16(this.history[this.memoryAddress].power * 10), 4))
                 break
-              case 'room':
+              case TYPE_ROOM:
                 this.dataStream += Format(
                   ',13 %s%s%s%s%s%s0000 00',
                   numToHex(swap32(this.currentEntry), 8),
-                  numToHex(swap32(this.history[this.memoryAddress].time - this.refTime - 978307200), 8),
+                  numToHex(swap32(this.history[this.memoryAddress].time - this.refTime - EPOCH_OFFSET), 8),
                   this.accessoryType117,
                   numToHex(swap16(this.history[this.memoryAddress].temp * 100), 4),
                   numToHex(swap16(this.history[this.memoryAddress].humidity * 100), 4),
-                  numToHex(swap16(this.history[this.memoryAddress].ppm), 4)
-                )
+                  numToHex(swap16(this.history[this.memoryAddress].ppm), 4))
                 break
-              case 'door':
-              case 'motion':
-              case 'switch':
+              case TYPE_DOOR:
+              case TYPE_MOTION:
+              case TYPE_SWITCH:
                 this.dataStream += Format(
                   ',0b %s%s%s%s',
                   numToHex(swap32(this.currentEntry), 8),
-                  numToHex(swap32(this.history[this.memoryAddress].time - this.refTime - 978307200), 8),
+                  numToHex(swap32(this.history[this.memoryAddress].time - this.refTime - EPOCH_OFFSET), 8),
                   this.accessoryType117,
-                  numToHex(this.history[this.memoryAddress].status, 2)
-                )
+                  numToHex(this.history[this.memoryAddress].status, 2))
                 break
-              case 'aqua':
-                if (this.history[this.memoryAddress].status) {
+              case TYPE_AQUA:
+                if (this.history[this.memoryAddress].status == true) {
                   this.dataStream += Format(
                     ',0d %s%s%s%s 300c',
                     numToHex(swap32(this.currentEntry), 8),
-                    numToHex(swap32(this.history[this.memoryAddress].time - this.refTime - 978307200), 8),
+                    numToHex(swap32(this.history[this.memoryAddress].time - this.refTime - EPOCH_OFFSET), 8),
                     this.accessoryType117,
-                    numToHex(this.history[this.memoryAddress].status, 2)
-                  )
+                    numToHex(this.history[this.memoryAddress].status, 2))
                 } else {
                   this.dataStream += Format(
                     ',15 %s%s%s%s%s 00000000 300c',
                     numToHex(swap32(this.currentEntry), 8),
-                    numToHex(swap32(this.history[this.memoryAddress].time - this.refTime - 978307200), 8),
+                    numToHex(swap32(this.history[this.memoryAddress].time - this.refTime - EPOCH_OFFSET), 8),
                     this.accessoryType117bis,
                     numToHex(this.history[this.memoryAddress].status, 2),
-                    numToHex(swap32(this.history[this.memoryAddress].waterAmount), 8)
-                  )
+                    numToHex(swap32(this.history[this.memoryAddress].waterAmount), 8))
                 }
                 break
-              case 'thermo':
+              case TYPE_THERMO:
                 this.dataStream += Format(
                   ',11 %s%s%s%s%s%s 0000',
                   numToHex(swap32(this.currentEntry), 8),
-                  numToHex(swap32(this.history[this.memoryAddress].time - this.refTime - 978307200), 8),
+                  numToHex(swap32(this.history[this.memoryAddress].time - this.refTime - EPOCH_OFFSET), 8),
                   this.accessoryType117,
                   numToHex(swap16(this.history[this.memoryAddress].currentTemp * 100), 4),
                   numToHex(swap16(this.history[this.memoryAddress].setTemp * 100), 4),
-                  numToHex(this.history[this.memoryAddress].valvePosition, 2)
-                )
+                  numToHex(this.history[this.memoryAddress].valvePosition, 2))
                 break
-              case 'custom': {
-                const result = []
-                let bitmask = 0
-                const dataStream = Format('%s%s',
+              case TYPE_CUSTOM:
+                var result = []
+                var bitmask = 0
+                var dataStream = Format('%s%s',
                   numToHex(swap32(this.currentEntry), 8),
-                  numToHex(swap32(this.history[this.memoryAddress].time - this.refTime - 978307200), 8)
-                )
+                  numToHex(swap32(this.history[this.memoryAddress].time - this.refTime - EPOCH_OFFSET), 8))
                 for (const [key, value] of Object.entries(this.history[this.memoryAddress])) {
-                  if (key !== 'time') {
-                    for (let x = 0, iLen = this.signatures.length; x < iLen; x++) {
-                      if (this.signatures[x].entry === key) {
-                        switch (this.signatures[x].length) {
-                          case 8:
-                            result[x] = Format('%s', numToHex(swap32(value * this.signatures[x].factor), this.signatures[x].length))
-                            break
-                          case 4:
-                            result[x] = Format('%s', numToHex(swap16(value * this.signatures[x].factor), this.signatures[x].length))
-                            break
-                          case 2:
-                            result[x] = Format('%s', numToHex(value * this.signatures[x].factor, this.signatures[x].length))
-                            break
+                  switch (key) {
+                    case 'time':
+                      break
+                    default:
+                      for (var x = 0, iLen = this.signatures.length; x < iLen; x++) {
+                        if (this.signatures[x].entry === key) {
+                          // console.log('key', key, this.signatures[x].uuid, value, this.signatures[x].factor);
+                          switch (this.signatures[x].length) {
+                            case 8:
+                              result[x] = Format('%s', numToHex(swap32(value * this.signatures[x].factor), this.signatures[x].length))
+                              break
+                            case 4:
+                              result[x] = Format('%s', numToHex(swap16(value * this.signatures[x].factor), this.signatures[x].length))
+                              break
+                            case 2:
+                              result[x] = Format('%s', numToHex(value * this.signatures[x].factor, this.signatures[x].length))
+                              break
+                          }
+                          bitmask += Math.pow(2, x)
                         }
-                        bitmask += Math.pow(2, x)
                       }
-                    }
                   }
                 }
-                const results = dataStream + ' ' + numToHex(bitmask, 2) + ' ' + result.map(a => a).join(' ')
-                this.dataStream += ' ' + numToHex((results.replace(/[^0-9A-F]/ig, '').length) / 2 + 1) + ' ' + results + ','
+                var results = dataStream + ' ' + numToHex(bitmask, 2) + ' ' + result.map(a => a).join(' ')
+                // console.log('results', numToHex((results.replace(/[^0-9A-F]/ig, '').length) / 2 + 1) + ' ' + results);
+                this.dataStream += (' ' + numToHex((results.replace(/[^0-9A-F]/ig, '').length) / 2 + 1) + ' ' + results + ',')
                 break
-              }
             }
           }
           this.currentEntry++
           this.memoryAddress = entry2address(this.currentEntry)
-          if (this.currentEntry > this.lastEntry) {
-            break
-          }
+          if (this.currentEntry > this.lastEntry) { break }
         }
-        this.log('[%s] fakegato S2R2 data: %s', this.accessory.displayName, this.dataStream)
+        this.log.debug('Data %s: %s', this.accessoryName, this.dataStream)
         callback(null, hexToBase64(this.dataStream))
         this.dataStream = ''
       } else {
@@ -628,20 +799,25 @@ module.exports = function (pHomebridge, log) {
     }
 
     setCurrentS2W1 (val, callback) {
-      callback()
-      this.log('[%s] fakegato S2W1 data request [%s].', this.accessory.displayName, base64ToHex(val))
-      const address = swap32(parseInt(base64ToHex(val).substring(4, 12), 16))
-      const hexAddress = address.toString('16')
-      this.log('[%s] fakegato S2W1 address requested [%s].', this.accessory.displayName, hexAddress)
+      callback(null)
+      this.log.debug('Data request %s: %s', this.accessoryName, base64ToHex(val))
+      var valHex = base64ToHex(val)
+      var substring = valHex.substring(4, 12)
+      var valInt = parseInt(substring, 16)
+      var address = swap32(valInt)
+      var hexAddress = address.toString('16')
+
+      this.log.debug('Address requested %s: %s', this.accessoryName, hexAddress)
       this.sendHistory(address)
     }
 
     setCurrentS2W2 (val, callback) {
-      callback()
-      this.log('[%s] fakegato S2W2 clock adjust [%s].', this.accessory.displayName, base64ToHex(val))
+      this.log.debug('Clock adjust %s: %s', this.accessoryName, base64ToHex(val))
+      callback(null)
     }
   }
 
   FakeGatoHistoryService.UUID = 'E863F007-079E-48FF-8F27-9C2605A29F52'
+
   return FakeGatoHistory
 }
diff --git a/lib/fakegato/fakegato-storage.js b/lib/fakegato/fakegato-storage.js
index d3c00ce7..2fa074ce 100644
--- a/lib/fakegato/fakegato-storage.js
+++ b/lib/fakegato/fakegato-storage.js
@@ -1,56 +1,177 @@
-/* jshint -W014, -W033, esversion: 9 */
-/* eslint-disable new-cap */
+/* jshint esversion: 6,node: true,-W041: false */
 'use strict'
-const path = require('path')
+
+const DEBUG = true
+
+var fs = require('fs')
+var os = require('os')
+var path = require('path')
+var hostname = os.hostname().split('.')[0]
+
+// var googleDrive = require('./lib/googleDrive').drive;
+
+var fileSuffix = '_persist.json'
+
+var thisStorage
+
 class FakeGatoStorage {
-  constructor (log) {
-    this.log = log
+  constructor (params) {
+    if (!params) { params = {} }
+
     this.writers = []
+
+    this.log = params.log || {}
+    if (!this.log.debug) {
+      this.log.debug = DEBUG ? console.log : function () { }
+    }
+    thisStorage = this
+    this.addingWriter = false
   }
 
   addWriter (service, params) {
-    if (this.addingWriter) {
-      setTimeout(() => this.addWriter(service, params), 100)
-      return
+    if (!this.addingWriter) {
+      this.addingWriter = true
+      if (!params) { params = {} }
+
+      this.log.debug('** Fakegato-storage AddWriter :', service.accessoryName)
+
+      const newWriter = {
+        service: service,
+        callback: params.callback,
+        storage: params.storage || 'fs',
+        fileName: params.filename || hostname + '_' + service.accessoryName + fileSuffix		// Unique filename per homebridge server.  Allows test environments on other servers not to break prod.
+      }
+      var onReady = typeof (params.onReady) === 'function' ? params.onReady : function () { }
+
+      switch (newWriter.storage) {
+        case 'fs':
+          newWriter.storageHandler = fs
+          newWriter.path = params.path || path.join(os.homedir(), '.homebridge')
+          this.writers.push(newWriter)
+          this.addingWriter = false
+          onReady()
+          break
+        /*
+        case 'googleDrive':
+          newWriter.path = params.path || 'fakegato';
+          newWriter.keyPath = params.keyPath || path.join(os.homedir(), '.homebridge');
+          newWriter.storageHandler = new googleDrive({
+            keyPath: newWriter.keyPath, callback: function () {
+              this.addingWriter = false;
+              onReady(arguments);
+            }.bind(this), folder: newWriter.path
+          });
+          this.writers.push(newWriter);
+          break;
+        case 'memcached' :
+
+        break;
+        */
+      }
+    } else {
+      setTimeout(function () {
+        this.addWriter(service, params)
+      }.bind(this), 100)
+    }
+  }
+
+  getWriter (service) {
+    const findServ = function (element) {
+      return element.service === service
     }
-    this.addingWriter = true
-    this.log('[%s] fakegato addWriter().', service.accessory.displayName)
-    const newWriter = {
-      service,
-      fileName: require('os').hostname().split('.')[0] + '_' + service.accessory.displayName + '_persist.json'
+    return this.writers.find(findServ)
+  }
+
+  _getWriterIndex (service) {
+    const findServ = function (element) {
+      return element.service === service
     }
-    const onReady = params.onReady
-    newWriter.storageHandler = require('fs')
-    newWriter.path = params.path
-    this.writers.push(newWriter)
-    this.addingWriter = false
-    onReady()
+    return this.writers.findIndex(findServ)
+  }
+
+  getWriters () {
+    return this.writers
   }
 
-  write (params) {
-    if (this.writing) {
-      setTimeout(() => this.write(params), 100)
-      return
+  delWriter (service) {
+    const index = this._getWriterIndex(service)
+    this.writers.splice(index, 1)
+  }
+
+  write (params) { // must be asynchronous
+    if (!this.writing) {
+      this.writing = true
+      const writer = this.getWriter(params.service)
+      const callBack = typeof (params.callback) === 'function' ? params.callback : (typeof (writer.callback) === 'function' ? writer.callback : function () { }) // use parameter callback or writer callback or empty function
+      switch (writer.storage) {
+        case 'fs':
+          this.log.debug('** Fakegato-storage write FS file:', path.join(writer.path, writer.fileName), params.data.substr(1, 80))
+          writer.storageHandler.writeFile(path.join(writer.path, writer.fileName), params.data, 'utf8', function () {
+            this.writing = false
+            callBack(arguments)
+          }.bind(this))
+          break
+        /*
+        case 'googleDrive':
+          this.log.debug("** Fakegato-storage write googleDrive file:", writer.path, writer.fileName, params.data.substr(1, 80));
+          writer.storageHandler.writeFile(writer.path, writer.fileName, params.data, function () {
+            this.writing = false;
+            callBack(arguments);
+          }.bind(this));
+          break;
+        case 'memcached' :
+
+        break;
+        */
+      }
+    } else {
+      setTimeout(function () { // retry in 100ms
+        this.write(params)
+      }.bind(this), 100)
     }
-    this.writing = true
-    const writer = this.writers.find(ele => ele.service === params.service)
-    this.log('[%s] fakegato write [%s].', params.service.accessory.displayName, params.data.substr(1, 80))
-    writer.storageHandler.writeFile(path.join(writer.path, writer.fileName), params.data, 'utf8', () => {
-      this.writing = false
-    })
   }
 
   read (params) {
-    const writer = this.writers.find(ele => ele.service === params.service)
-    this.log('[%s] fakegato read [%s].', params.service.accessory.displayName, path.join(writer.path, writer.fileName))
-    writer.storageHandler.readFile(path.join(writer.path, writer.fileName), 'utf8', params.callback)
+    const writer = this.getWriter(params.service)
+    const callBack = typeof (params.callback) === 'function' ? params.callback : (typeof (writer.callback) === 'function' ? writer.callback : function () { }) // use parameter callback or writer callback or empty function
+    switch (writer.storage) {
+      case 'fs':
+        this.log.debug('** Fakegato-storage read FS file:', path.join(writer.path, writer.fileName))
+        writer.storageHandler.readFile(path.join(writer.path, writer.fileName), 'utf8', callBack)
+        break
+      /*
+      case 'googleDrive':
+        this.log.debug("** Fakegato-storage read googleDrive file: %s/%s", writer.path, writer.fileName);
+        writer.storageHandler.readFile(writer.path, writer.fileName, callBack);
+        break;
+      case 'memcached' :
+
+      break;
+      */
+    }
   }
 
   remove (params) {
-    const writer = this.writers.find(ele => ele.service === params.service)
-    this.log('[%s] fakegato delete [%s].', params.service.accessory.displayName, path.join(writer.path, writer.fileName))
-    writer.storageHandler.unlink(path.join(writer.path, writer.fileName), 'utf8', () => {})
+    const writer = this.getWriter(params.service)
+    const callBack = typeof (params.callback) === 'function' ? params.callback : (typeof (writer.callback) === 'function' ? writer.callback : function () { }) // use parameter callback or writer callback or empty function
+    switch (writer.storage) {
+      case 'fs':
+        this.log.debug('** Fakegato-storage delete FS file:', path.join(writer.path, writer.fileName))
+        writer.storageHandler.unlink(path.join(writer.path, writer.fileName), callBack)
+        break
+      /*
+      case 'googleDrive':
+        this.log.debug("** Fakegato-storage delete googleDrive file:", writer.path, writer.fileName);
+        writer.storageHandler.deleteFile(writer.path, writer.fileName, callBack);
+        break;
+      case 'memcached' :
+
+      break;
+      */
+    }
   }
 }
 
-module.exports = { FakeGatoStorage }
+module.exports = {
+  FakeGatoStorage: FakeGatoStorage
+}
diff --git a/lib/fakegato/fakegato-timer.js b/lib/fakegato/fakegato-timer.js
index efed8bc0..008d4b93 100644
--- a/lib/fakegato/fakegato-timer.js
+++ b/lib/fakegato/fakegato-timer.js
@@ -1,52 +1,81 @@
-/* jshint -W014, -W033, esversion: 9 */
-/* eslint-disable new-cap */
+/* jshint esversion: 6,node: true,-W041: false */
 'use strict'
+
+const DEBUG = true
+
 class FakeGatoTimer {
-  constructor (log) {
-    this.log = log
+  constructor (params) {
+    if (!params) { params = {} }
     this.subscribedServices = []
+    this.minutes = params.minutes || 10
+
+    this.intervalID = null
+    this.running = false
+    this.log = params.log || {}
+    if (!this.log.debug) {
+      this.log.debug = DEBUG ? console.log : function () { }
+    }
   }
 
+  // Subscription management
   subscribe (service, callback) {
-    this.log('[%s] fakegato subscribe().', service.accessory.displayName)
+    this.log.debug('** Fakegato-timer Subscription :', service.accessoryName)
     const newService = {
-      service,
-      callback,
+      service: service,
+      callback: callback,
       backLog: [],
       previousBackLog: [],
       previousAvrg: {}
     }
+
     this.subscribedServices.push(newService)
   }
 
+  getSubscriber (service) {
+    const findServ = function (element) {
+      return element.service === service
+    }
+    return this.subscribedServices.find(findServ)
+  }
+
+  _getSubscriberIndex (service) {
+    const findServ = function (element) {
+      return element.service === service
+    }
+    return this.subscribedServices.findIndex(findServ)
+  }
+
+  getSubscribers () {
+    return this.subscribedServices
+  }
+
   unsubscribe (service) {
-    const index = this.subscribedServices.findIndex(ele => ele.service === service)
+    const index = this._getSubscriberIndex(service)
     this.subscribedServices.splice(index, 1)
-    if (this.subscribedServices.length === 0 && this.running) {
-      this.stop()
-    }
+    if (this.subscribedServices.length === 0 && this.running) { this.stop() }
   }
 
+  // Timer management
   start () {
-    this.log('Fakegato global timer STARTED [10 mins].')
-    if (this.running) {
-      this.stop()
-    }
+    this.log.debug('**Start Global Fakegato-Timer - ' + this.minutes + 'min**')
+    if (this.running) { this.stop() }
     this.running = true
-    this.intervalID = setInterval(this.executeCallbacks.bind(this), 600000)
+    this.intervalID = setInterval(this.executeCallbacks.bind(this), this.minutes * 60 * 1000)
   }
 
   stop () {
-    this.log('Fakegato global timer STOPPED.')
+    this.log.debug('**Stop Global Fakegato-Timer****')
     clearInterval(this.intervalID)
     this.running = false
     this.intervalID = null
   }
 
+  // Data management
   executeCallbacks () {
+    this.log.debug('**Fakegato-timer: executeCallbacks**')
     if (this.subscribedServices.length !== 0) {
       for (const s in this.subscribedServices) {
-        if (Object.prototype.hasOwnProperty.call(this.subscribedServices, s)) {
+        if (this.subscribedServices.hasOwnProperty(s)) {
           const service = this.subscribedServices[s]
           if (typeof (service.callback) === 'function') {
             service.previousAvrg = service.callback({
@@ -62,6 +91,8 @@ class FakeGatoTimer {
   }
 
   executeImmediateCallback (service) {
+    this.log.debug('**Fakegato-timer: executeImmediateCallback**')
+
     if (typeof (service.callback) === 'function' && service.backLog.length) {
       service.callback({
         backLog: service.backLog,
@@ -75,29 +106,29 @@ class FakeGatoTimer {
     const data = params.entry
     const service = params.service
     const immediateCallback = params.immediateCallback || false
-    this.log('[%s] fakegato addData [%s].', service.accessory.displayName, data)
-    if (immediateCallback) {
-      // door or motion -> replace
-      this.subscribedServices.find(ele => ele.service === service).backLog[0] = data
-    } else {
-      this.subscribedServices.find(ele => ele.service === service).backLog.push(data)
-    }
+
+    this.log.debug('**Fakegato-timer: addData ', service.accessoryName, data, ' immediate: ', immediateCallback)
+
+    if (immediateCallback) // door or motion -> replace
+    { this.getSubscriber(service).backLog[0] = data } else { this.getSubscriber(service).backLog.push(data) }
+
     if (immediateCallback) {
-      this.executeImmediateCallback(this.subscribedServices.find(ele => ele.service === service))
-    }
-    if (!this.running) {
-      this.start()
+      // setTimeout(this.executeImmediateCallback.bind(this), 0,service);
+      this.executeImmediateCallback(this.getSubscriber(service))
     }
+
+    if (this.running === false) { this.start() }
   }
 
   emptyData (service) {
-    this.log('[%s] fakegato emptyData().', service.accessory.displayName)
-    const source = this.subscribedServices.find(ele => ele.service === service)
-    if (source.backLog.length) {
-      source.previousBackLog = source.backLog
-    }
+    this.log.debug('**Fakegato-timer: emptyData **', service.accessoryName)
+    const source = this.getSubscriber(service)
+
+    if (source.backLog.length) source.previousBackLog = source.backLog
     source.backLog = []
   }
 }
 
-module.exports = { FakeGatoTimer }
+module.exports = {
+  FakeGatoTimer: FakeGatoTimer
+}
diff --git a/lib/fakegato/uuid.js b/lib/fakegato/uuid.js
index c95d91f0..ede9f670 100644
--- a/lib/fakegato/uuid.js
+++ b/lib/fakegato/uuid.js
@@ -1,8 +1,4 @@
-/* jshint -W014, -W033, esversion: 9 */
-/* eslint-disable new-cap */
-'use strict'
-
-// *** https://github.com/homebridge/HAP-NodeJS/blob/master/src/lib/util/uuid.ts *** \\
+// https://github.com/homebridge/HAP-NodeJS/blob/master/src/lib/util/uuid.ts
 
 const VALID_UUID_REGEX = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i
 
@@ -12,15 +8,9 @@ function isValid (UUID) {
 const VALID_SHORT_REGEX = /^[0-9a-f]{1,8}$/i
 
 function toLongFormUUID (uuid, base = '-0000-1000-8000-0026BB765291') {
-  if (isValid(uuid)) {
-    return uuid.toUpperCase()
-  }
-  if (!VALID_SHORT_REGEX.test(uuid)) {
-    throw new TypeError('uuid was not a valid UUID or short form UUID')
-  }
-  if (!isValid('00000000' + base)) {
-    throw new TypeError('base was not a valid base UUID')
-  }
+  if (isValid(uuid)) return uuid.toUpperCase()
+  if (!VALID_SHORT_REGEX.test(uuid)) throw new TypeError('uuid was not a valid UUID or short form UUID')
+  if (!isValid('00000000' + base)) throw new TypeError('base was not a valid base UUID')
 
   return (('00000000' + uuid).substr(-8) + base).toUpperCase()
 }
diff --git a/lib/index.js b/lib/index.js
index 39beb7ea..454edff3 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -24,7 +24,8 @@ class eWeLinkPlatform {
     this.helpers = require('./utils/helpers')
     this.debug = this.config.debug
     this.colourUtils = require('./utils/colour-utils')
-    this.eveService = require('./fakegato/fakegato-history')(api, this.debug ? this.log : () => {})
+    this.eveService = require('./fakegato/fakegato-history')(api)
+    this.eveLogPath = api.user.storagePath() + '/persist/'
     this.mode = ['auto', 'wan', 'lan'].includes(this.config.mode) ? this.config.mode : 'auto'
     this.devicesInHB = new Map()
     this.devicesInEW = new Map()
diff --git a/package.json b/package.json
index f02e5889..99aed9d0 100644
--- a/package.json
+++ b/package.json
@@ -51,5 +51,10 @@
     "node-dns-sd": "^0.4.2",
     "websocket-as-promised": "^1.1.0",
     "ws": "^7.4.2"
+  },
+  "standard": {
+    "ignore": [
+      "/lib/fakegato/"
+    ]
   }
 }

From 878dbf680bca98f878657526535f28ba9b3637a0 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 19 Jan 2021 17:30:53 +0000
Subject: [PATCH 1180/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8e42b5ce..dce03038 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,8 +6,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 ## Changes
 
-* Fakegato debugging will now appear with plugin `debug` on rather then Homebridge `debug` on
-* Fakegato (Eve History Service Library) code formatting to StandardJS
+* Fakegato logging disabled in Homebridge `debug` mode, can be explicitly enabled with `debugFakegato`
 
 ## 4.4.0 (2021-01-14)
 

From fb637ccdb3df74b1c84a57ed2b73a11d6bd64751 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 20 Jan 2021 10:05:13 +0000
Subject: [PATCH 1181/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dce03038..024c2d85 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 All notable changes to this homebridge-ewelink will be documented in this file.
 
-## BETA
+## 4.4.1 (2021-01-20)
 
 ## Changes
 

From 4b955ac7dfb52dca7969c679882276483d646195 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 20 Jan 2021 10:06:03 +0000
Subject: [PATCH 1182/3183] 4.4.1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 919c1512..a623de1b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.4.1-1",
+  "version": "4.4.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 99aed9d0..28657033 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.4.1-1",
+  "version": "4.4.1",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 2e4994ff18de72d6789d38121a703ba1ab0d464e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 20 Jan 2021 10:07:11 +0000
Subject: [PATCH 1183/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 024c2d85..2c48f996 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 ## 4.4.1 (2021-01-20)
 
-## Changes
+### Changes
 
 * Fakegato logging disabled in Homebridge `debug` mode, can be explicitly enabled with `debugFakegato`
 

From d8003804e0c79caf61a22246500b367a0ca0848f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 20 Jan 2021 10:11:04 +0000
Subject: [PATCH 1184/3183] hb to 46 for AL

---
 CHANGELOG.md               | 6 ++++++
 lib/device/light-colour.js | 2 +-
 lib/device/light-ctemp.js  | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2c48f996..3d8dced1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 All notable changes to this homebridge-ewelink will be documented in this file.
 
+## BETA
+
+### Changes
+
+* Minimum Homebridge beta needed for Adaptive Lighting bumped to beta-46.
+
 ## 4.4.1 (2021-01-20)
 
 ### Changes
diff --git a/lib/device/light-colour.js b/lib/device/light-colour.js
index 5ca08ce0..9e4782a1 100644
--- a/lib/device/light-colour.js
+++ b/lib/device/light-colour.js
@@ -31,7 +31,7 @@ module.exports = class deviceLightColour {
       // Devices have a range of 2700K-6500K corresponding to ewelink ct: 0-255
       this.service.getCharacteristic(this.Characteristic.ColorTemperature)
         .on('set', this.internalCTempUpdate.bind(this))
-      if (platform.api.versionGreaterOrEqual && platform.api.versionGreaterOrEqual('1.3.0-beta.42')) {
+      if (platform.api.versionGreaterOrEqual && platform.api.versionGreaterOrEqual('1.3.0-beta.46')) {
         this.cacheBrightness = this.service.getCharacteristic(this.Characteristic.Brightness).value
         this.alController = new platform.api.hap.AdaptiveLightingController(this.service)
         this.accessory.configureController(this.alController)
diff --git a/lib/device/light-ctemp.js b/lib/device/light-ctemp.js
index 5b38b78a..c451a7a1 100644
--- a/lib/device/light-ctemp.js
+++ b/lib/device/light-ctemp.js
@@ -27,7 +27,7 @@ module.exports = class deviceLightColour {
       this.maxK = 6500
     }
     this.accessory = accessory
-    if (platform.api.versionGreaterOrEqual && platform.api.versionGreaterOrEqual('1.3.0-beta.42')) {
+    if (platform.api.versionGreaterOrEqual && platform.api.versionGreaterOrEqual('1.3.0-beta.46')) {
       this.cacheBrightness = this.service.getCharacteristic(this.Characteristic.Brightness).value
       this.alController = new platform.api.hap.AdaptiveLightingController(this.service)
       this.accessory.configureController(this.alController)

From 52d6dacf9c60b7d2020c39324e8f7fe79ae14a2d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 20 Jan 2021 14:33:57 +0000
Subject: [PATCH 1185/3183] device name on add

---
 lib/index.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/lib/index.js b/lib/index.js
index 454edff3..7f03ce21 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -583,15 +583,17 @@ class eWeLinkPlatform {
       // *** Get the switchNumber which can be {X, 0, 1, 2, 3, 4, ...} *** \\
       const switchNumber = hbDeviceId.split('SW')[1].toString()
       const channelCount = type === 'rf_pri'
+        ? Object.keys((device.tags && device.tags.zyx_info) || []).length
+        : this.helpers.chansFromUiid[device.extra.uiid]
 
       // *** Set up the device name which can depend on the accessory type *** \\
       if (this.nameOverride[hbDeviceId]) {
         newDeviceName = this.nameOverride[hbDeviceId]
+      } else if (type === 'rf_sub') {
+        newDeviceName = extraContext.name
       } else {
-        newDeviceName = type === 'rf_sub' ? extraContext.name : device.name
-          ? Object.keys((device.tags && device.tags.zyx_info) || []).length
-          : this.helpers.chansFromUiid[device.extra.uiid]
-        if (['1', '2', '3', '4'].includes(switchNumber) && type !== 'rf_sub') {
+        newDeviceName = device.name
+        if (['1', '2', '3', '4'].includes(switchNumber)) {
           if (device.tags && device.tags.ck_channel_name && device.tags.ck_channel_name[parseInt(switchNumber) - 1]) {
             newDeviceName = device.tags.ck_channel_name[parseInt(switchNumber) - 1]
           } else {

From d93852900fb3262b69fbab876233a213d796f825 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 20 Jan 2021 14:35:40 +0000
Subject: [PATCH 1186/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3d8dced1..d6784e62 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,11 +2,12 @@
 
 All notable changes to this homebridge-ewelink will be documented in this file.
 
-## BETA
+## 4.4.2 (2021-01-20)
 
 ### Changes
 
-* Minimum Homebridge beta needed for Adaptive Lighting bumped to beta-46.
+* Fixes an issue when adding new RF bridge devices
+* Minimum Homebridge beta needed for Adaptive Lighting bumped to beta-46
 
 ## 4.4.1 (2021-01-20)
 

From 1b789b4e493390aed29756b3d7682955776c9b7c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 20 Jan 2021 14:36:24 +0000
Subject: [PATCH 1187/3183] 4.4.2

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index a623de1b..1e692f88 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.4.1",
+  "version": "4.4.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 28657033..2007e18b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.4.1",
+  "version": "4.4.2",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From d0f1163c96b3156a525610bbd59189786677ce01 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 20 Jan 2021 19:45:20 +0000
Subject: [PATCH 1188/3183] fix rf check

---
 lib/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/index.js b/lib/index.js
index 7f03ce21..3ca38d16 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -92,7 +92,7 @@ class eWeLinkPlatform {
       // *** Check for valid custom RF Bridge sensors and add to cusS for later use *** \\
       if (Object.keys(this.config.bridgeSensors || []).length > 0) {
         this.config.bridgeSensors
-          .filter(s => this.helpers.hasProperty(s, 'fullDeviceId') && this.devicesInEW.has(s.fullDeviceId))
+          .filter(s => this.helpers.hasProperty(s, 'fullDeviceId') && this.devicesInHB.has(s.fullDeviceId))
           .forEach(s => this.cusS.set(s.fullDeviceId, s))
       }
 

From 2c3881a0b129432984b2c945528cd4b8e5d75781 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 20 Jan 2021 19:45:53 +0000
Subject: [PATCH 1189/3183] 4.4.3-0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 1e692f88..a4453de0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.4.2",
+  "version": "4.4.3-0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 2007e18b..137cf977 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.4.2",
+  "version": "4.4.3-0",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From b5206f25d9aa4cb2e7144701266191405955e03c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 20 Jan 2021 19:56:27 +0000
Subject: [PATCH 1190/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d6784e62..4cee7f73 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 All notable changes to this homebridge-ewelink will be documented in this file.
 
+## 4.4.3 (2021-01-20)
+
+### Changes
+
+* Fixes an issue where RF sensors would not use a custom defined type
+
 ## 4.4.2 (2021-01-20)
 
 ### Changes

From 94cfd36122605068944e19c096ea104476385ca1 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 20 Jan 2021 19:57:23 +0000
Subject: [PATCH 1191/3183] 4.4.3

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index a4453de0..82d8def0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.4.3-0",
+  "version": "4.4.3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 137cf977..fd2902bc 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.4.3-0",
+  "version": "4.4.3",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 6b56d816e170a60a731c714c006f13cde3ee11d1 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 23 Jan 2021 15:25:02 +0000
Subject: [PATCH 1192/3183] alias

---
 lib/index.js | 31 +++++++++++++++----------------
 package.json |  1 +
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/lib/index.js b/lib/index.js
index 3ca38d16..118472cd 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1,16 +1,15 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
+const PLUGIN = require('./../package.json')
 class eWeLinkPlatform {
   constructor (log, config, api) {
-    this.version = require('./../package.json').version
-
     // *** Disable the plugin if not configured correctly *** \\
     if (!log || !api) {
       return
     }
     if (!config || !config.username || !config.password || !config.countryCode) {
-      log.warn('*** Disabling plugin [v%s] ***', this.version)
+      log.warn('*** Disabling plugin [v%s] ***', PLUGIN.version)
       log.warn('*** eWeLink credentials missing from configuration ***')
       return
     }
@@ -50,13 +49,13 @@ class eWeLinkPlatform {
       // *** Check to see if the user has disabled the plugin *** \\
       if (this.config.disablePlugin) {
         this.devicesInHB.forEach(a => this.removeAccessory(a))
-        this.log.warn('*** Disabling plugin [v%s] ***', this.version)
+        this.log.warn('*** Disabling plugin [v%s] ***', PLUGIN.version)
         this.log.warn('*** To change this, set disablePlugin to false ***')
         return
       }
 
       // *** Set up initial sync with eWeLink *** \\
-      this.log('Plugin [v%s] initialised. Syncing with eWeLink...', this.version)
+      this.log('Plugin [v%s] initialised. Syncing with eWeLink...', PLUGIN.version)
 
       // *** Set up the HTTP client, get the user HTTP host, and login *** \\
       this.httpClient = new (require('./connection/http'))(this)
@@ -132,7 +131,7 @@ class eWeLinkPlatform {
       this.log('✓ Setup complete. %s', this.helpers.logMessages[Math.floor(Math.random() * this.helpers.logMessages.length)])
     } catch (err) {
       // *** Catch errors at any point during setup *** \\
-      this.log.warn('*** Disabling plugin [v%s] ***', this.version)
+      this.log.warn('*** Disabling plugin [v%s] ***', PLUGIN.version)
       this.log.warn(this.debug ? err : err.message)
 
       // *** Call the shutdown function as plugin is disabled *** \\
@@ -403,7 +402,7 @@ class eWeLinkPlatform {
               ? this.devicesInHB.get(device.deviceid + 'SW' + i)
               : this.addAccessory(device, device.deviceid + 'SW' + i)
             oAccessory.getService(this.Service.AccessoryInformation)
-              .setCharacteristic(this.Characteristic.FirmwareRevision, device.params.fwVersion || this.version)
+              .setCharacteristic(this.Characteristic.FirmwareRevision, device.params.fwVersion || PLUGIN.version)
           }
           oAccessory.context.reachableWAN = device.online
           oAccessory.context.reachableLAN = this.lanClient && this.lanDevices.has(device.deviceid)
@@ -416,7 +415,7 @@ class eWeLinkPlatform {
             ? this.lanDevices.get(device.deviceid).ip
             : false
           oAccessory.control = new (require('./device/switch-multi'))(this, oAccessory)
-          this.api.updatePlatformAccessories('homebridge-ewelink', 'eWeLink', [oAccessory])
+          this.api.updatePlatformAccessories(PLUGIN.name, PLUGIN.alias, [oAccessory])
           this.devicesInHB.set(oAccessory.context.hbDeviceId, oAccessory)
           if (i === 0) {
             accessory = oAccessory
@@ -484,14 +483,14 @@ class eWeLinkPlatform {
             ? this.devicesInHB.get(device.deviceid + 'SW' + swNumber)
             : this.addAccessory(device, device.deviceid + 'SW' + swNumber, false, subExtraContext, 'rf_sub')
           oAccessory.getService(this.Service.AccessoryInformation)
-            .setCharacteristic(this.Characteristic.FirmwareRevision, device.params.fwVersion || this.version)
+            .setCharacteristic(this.Characteristic.FirmwareRevision, device.params.fwVersion || PLUGIN.version)
           oAccessory.context.reachableWAN = device.online
           oAccessory.context.reachableLAN = false
           oAccessory.context.eweBrandName = device.brandName
           oAccessory.context.eweBrandLogo = device.brandLogo
           oAccessory.context.eweShared = device.sharedBy && device.sharedBy.email ? device.sharedBy.email : false
           oAccessory.context.ip = this.lanClient && oAccessory.context.reachableLAN ? this.lanDevices.get(device.deviceid).ip : false
-          this.api.updatePlatformAccessories('homebridge-ewelink', 'eWeLink', [oAccessory])
+          this.api.updatePlatformAccessories(PLUGIN.name, PLUGIN.alias, [oAccessory])
           this.devicesInHB.set(oAccessory.context.hbDeviceId, oAccessory)
           oAccessory.control = new (require('./device/rf-bridge'))(this, oAccessory)
           rfChlCounter += Object.keys(subDevice.buttons || {}).length
@@ -540,7 +539,7 @@ class eWeLinkPlatform {
       // *** Update the current firmware version *** \\
       if (!this.hiddenMasters.includes(device.deviceid)) {
         accessory.getService(this.Service.AccessoryInformation)
-          .setCharacteristic(this.Characteristic.FirmwareRevision, device.params.fwVersion || this.version)
+          .setCharacteristic(this.Characteristic.FirmwareRevision, device.params.fwVersion || PLUGIN.version)
       }
 
       // *** Update the reachability values (via WS and LAN) *** \\
@@ -568,7 +567,7 @@ class eWeLinkPlatform {
       }
 
       // *** Update any changes to the device into our devicesInHB map *** \\
-      this.api.updatePlatformAccessories('homebridge-ewelink', 'eWeLink', [accessory])
+      this.api.updatePlatformAccessories(PLUGIN.name, PLUGIN.alias, [accessory])
       this.devicesInHB.set(accessory.context.hbDeviceId, accessory)
       this.log('[%s] initialised and %s.', device.name, str)
     } catch (err) {
@@ -609,7 +608,7 @@ class eWeLinkPlatform {
           .setCharacteristic(this.Characteristic.SerialNumber, hbDeviceId)
           .setCharacteristic(this.Characteristic.Manufacturer, device.brandName)
           .setCharacteristic(this.Characteristic.Model, device.productModel + ' (' + device.extra.model + ')')
-          .setCharacteristic(this.Characteristic.FirmwareRevision, device.params.fwVersion || this.version)
+          .setCharacteristic(this.Characteristic.FirmwareRevision, device.params.fwVersion || PLUGIN.version)
           .setCharacteristic(this.Characteristic.Identify, true)
         accessory.on('identify', (paired, callback) => {
           callback()
@@ -633,7 +632,7 @@ class eWeLinkPlatform {
 
       // *** Register the accessory if it hasn't been hidden by the user *** \\
       if (!hidden) {
-        this.api.registerPlatformAccessories('homebridge-ewelink', 'eWeLink', [accessory])
+        this.api.registerPlatformAccessories(PLUGIN.name, PLUGIN.alias, [accessory])
         this.log('[%s] has been added to Homebridge.', newDeviceName)
       }
 
@@ -659,7 +658,7 @@ class eWeLinkPlatform {
   removeAccessory (accessory) {
     try {
       // *** Unregister the accessory from HB and remove it from our devicesInHB map *** \\
-      this.api.unregisterPlatformAccessories('homebridge-ewelink', 'eWeLink', [accessory])
+      this.api.unregisterPlatformAccessories(PLUGIN.name, PLUGIN.alias, [accessory])
       this.devicesInHB.delete(accessory.context.hbDeviceId)
       this.log('[%s] has been removed from Homebridge.', accessory.displayName)
     } catch (err) {
@@ -806,4 +805,4 @@ class eWeLinkPlatform {
   }
 }
 
-module.exports = hb => hb.registerPlatform('eWeLink', eWeLinkPlatform)
+module.exports = hb => hb.registerPlatform(PLUGIN.alias, eWeLinkPlatform)
diff --git a/package.json b/package.json
index fd2902bc..8527ab0b 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,6 @@
 {
   "name": "homebridge-ewelink",
+  "alias": "eWeLink",
   "version": "4.4.3",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",

From c3c368adac6d3f0c79c544e9849e162608f8140e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 23 Jan 2021 15:31:16 +0000
Subject: [PATCH 1193/3183] error handling

---
 lib/index.js | 77 ++++++++++++++++++++++++++--------------------------
 1 file changed, 38 insertions(+), 39 deletions(-)

diff --git a/lib/index.js b/lib/index.js
index 118472cd..89dea3a5 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -8,40 +8,43 @@ class eWeLinkPlatform {
     if (!log || !api) {
       return
     }
-    if (!config || !config.username || !config.password || !config.countryCode) {
+    try {
+      if (!config || !config.username || !config.password || !config.countryCode) {
+        throw new Error('eWeLink credentials missing from configuration')
+      }
+  
+      // *** Set up our variables *** \\
+      this.log = log
+      this.config = config
+      this.api = api
+      this.Characteristic = api.hap.Characteristic
+      this.Service = api.hap.Service
+      this.helpers = require('./utils/helpers')
+      this.debug = this.config.debug
+      this.colourUtils = require('./utils/colour-utils')
+      this.eveService = require('./fakegato/fakegato-history')(api)
+      this.eveLogPath = api.user.storagePath() + '/persist/'
+      this.mode = ['auto', 'wan', 'lan'].includes(this.config.mode) ? this.config.mode : 'auto'
+      this.devicesInHB = new Map()
+      this.devicesInEW = new Map()
+      this.cusG = new Map()
+      this.cusS = new Map()
+      this.hiddenMasters = []
+      this.ignoredDevices = (this.config.ignoredDevices || '').replace(/[\s'"]+/g, '').toLowerCase().split(',')
+      this.thTempOffset = {}
+      this.nameOverride = {}
+      this.ipOverride = {}
+      if (Array.isArray(config.thTempOffset)) config.thTempOffset.forEach(x => (this.thTempOffset[x.deviceId] = x.offset))
+      if (Array.isArray(config.nameOverride)) config.nameOverride.forEach(x => (this.nameOverride[x.fullDeviceId] = x.deviceName))
+      if (Array.isArray(config.ipOverride)) config.ipOverride.forEach(x => (this.ipOverride[x.deviceId] = x.deviceIP))
+  
+      // *** Set up Homebridge API events *** \\
+      this.api.on('didFinishLaunching', this.eWeLinkSetup.bind(this))
+      this.api.on('shutdown', this.eWeLinkShutdown.bind(this))
+    } catch (err) {
       log.warn('*** Disabling plugin [v%s] ***', PLUGIN.version)
-      log.warn('*** eWeLink credentials missing from configuration ***')
-      return
+      log.warn('*** %s. ***', err.message)
     }
-
-    // *** Set up our variables *** \\
-    this.log = log
-    this.config = config
-    this.api = api
-    this.Characteristic = api.hap.Characteristic
-    this.Service = api.hap.Service
-    this.helpers = require('./utils/helpers')
-    this.debug = this.config.debug
-    this.colourUtils = require('./utils/colour-utils')
-    this.eveService = require('./fakegato/fakegato-history')(api)
-    this.eveLogPath = api.user.storagePath() + '/persist/'
-    this.mode = ['auto', 'wan', 'lan'].includes(this.config.mode) ? this.config.mode : 'auto'
-    this.devicesInHB = new Map()
-    this.devicesInEW = new Map()
-    this.cusG = new Map()
-    this.cusS = new Map()
-    this.hiddenMasters = []
-    this.ignoredDevices = (this.config.ignoredDevices || '').replace(/[\s'"]+/g, '').toLowerCase().split(',')
-    this.thTempOffset = {}
-    this.nameOverride = {}
-    this.ipOverride = {}
-    if (Array.isArray(config.thTempOffset)) config.thTempOffset.forEach(x => (this.thTempOffset[x.deviceId] = x.offset))
-    if (Array.isArray(config.nameOverride)) config.nameOverride.forEach(x => (this.nameOverride[x.fullDeviceId] = x.deviceName))
-    if (Array.isArray(config.ipOverride)) config.ipOverride.forEach(x => (this.ipOverride[x.deviceId] = x.deviceIP))
-
-    // *** Set up Homebridge API events *** \\
-    this.api.on('didFinishLaunching', this.eWeLinkSetup.bind(this))
-    this.api.on('shutdown', this.eWeLinkShutdown.bind(this))
   }
 
   async eWeLinkSetup () {
@@ -49,9 +52,7 @@ class eWeLinkPlatform {
       // *** Check to see if the user has disabled the plugin *** \\
       if (this.config.disablePlugin) {
         this.devicesInHB.forEach(a => this.removeAccessory(a))
-        this.log.warn('*** Disabling plugin [v%s] ***', PLUGIN.version)
-        this.log.warn('*** To change this, set disablePlugin to false ***')
-        return
+        throw new Error('To change this, set disablePlugin to false')
       }
 
       // *** Set up initial sync with eWeLink *** \\
@@ -132,7 +133,7 @@ class eWeLinkPlatform {
     } catch (err) {
       // *** Catch errors at any point during setup *** \\
       this.log.warn('*** Disabling plugin [v%s] ***', PLUGIN.version)
-      this.log.warn(this.debug ? err : err.message)
+      this.log.warn('*** %s ***', err.message)
 
       // *** Call the shutdown function as plugin is disabled *** \\
       this.eWeLinkShutdown()
@@ -149,9 +150,7 @@ class eWeLinkPlatform {
         clearInterval(this.wsRefresh)
         this.wsClient.closeConnection()
       }
-    } catch (err) {
-      this.log.warn(this.debug ? err : err.message)
-    }
+    } catch (err) {}
   }
 
   initialiseDevice (device) {

From 2d99ccf1d52023ccace52171dd2cd6c231cea207 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 24 Jan 2021 09:25:17 +0000
Subject: [PATCH 1194/3183] formatting

---
 lib/index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/index.js b/lib/index.js
index 89dea3a5..f543b8f2 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -12,7 +12,7 @@ class eWeLinkPlatform {
       if (!config || !config.username || !config.password || !config.countryCode) {
         throw new Error('eWeLink credentials missing from configuration')
       }
-  
+
       // *** Set up our variables *** \\
       this.log = log
       this.config = config
@@ -37,7 +37,7 @@ class eWeLinkPlatform {
       if (Array.isArray(config.thTempOffset)) config.thTempOffset.forEach(x => (this.thTempOffset[x.deviceId] = x.offset))
       if (Array.isArray(config.nameOverride)) config.nameOverride.forEach(x => (this.nameOverride[x.fullDeviceId] = x.deviceName))
       if (Array.isArray(config.ipOverride)) config.ipOverride.forEach(x => (this.ipOverride[x.deviceId] = x.deviceIP))
-  
+
       // *** Set up Homebridge API events *** \\
       this.api.on('didFinishLaunching', this.eWeLinkSetup.bind(this))
       this.api.on('shutdown', this.eWeLinkShutdown.bind(this))

From 0edacdcce747c78b2c4c6f7658fc6db5a497fe1f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 24 Jan 2021 09:26:00 +0000
Subject: [PATCH 1195/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4cee7f73..753f85cf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 All notable changes to this homebridge-ewelink will be documented in this file.
 
+## 4.4.4 (2021-01-24)
+
+### Changes
+
+* Backend - better handling of errors
+
 ## 4.4.3 (2021-01-20)
 
 ### Changes

From c4ac3edd8a7ec0f9b79a24231929513259fb74fe Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 24 Jan 2021 09:26:59 +0000
Subject: [PATCH 1196/3183] 4.4.4

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 82d8def0..4a018457 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.4.3",
+  "version": "4.4.4",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 8527ab0b..d13f2af2 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "4.4.3",
+  "version": "4.4.4",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 49210884d49096416a5614bb7e9b863472f7a724 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 24 Jan 2021 09:57:17 +0000
Subject: [PATCH 1197/3183] use braces with if

---
 lib/device/blind.js         |  8 ++++++--
 lib/device/curtain.js       |  4 +++-
 lib/device/diffuser.js      | 36 +++++++++++++++++++++++++++---------
 lib/device/fan.js           |  4 +++-
 lib/device/garage-eachen.js |  8 ++++++--
 lib/device/garage-four.js   |  8 ++++++--
 lib/device/garage-two.js    |  9 ++++++---
 lib/device/light-colour.js  | 20 +++++++++++++++-----
 lib/device/light-ctemp.js   | 16 ++++++++++++----
 lib/device/light-dimmer.js  |  8 ++++++--
 lib/device/rf-bridge.js     |  8 ++++++--
 lib/device/scm.js           |  4 +++-
 lib/device/sensor.js        |  4 +++-
 lib/device/switch-multi.js  |  4 +++-
 lib/device/switch-single.js |  4 +++-
 lib/device/usb.js           |  4 +++-
 16 files changed, 111 insertions(+), 38 deletions(-)

diff --git a/lib/device/blind.js b/lib/device/blind.js
index 8fcdad39..405f2297 100644
--- a/lib/device/blind.js
+++ b/lib/device/blind.js
@@ -25,7 +25,9 @@ module.exports = class deviceBlind {
       callback()
       const blindConfig = this.platform.cusG.get(this.accessory.context.eweDeviceId)
       let prevPosition = this.accessory.context.cacheCurrentPosition
-      if (value === prevPosition) return
+      if (value === prevPosition) {
+        return
+      }
       const params = { switches: this.helpers.defaultMultiSwitchOff }
       const prevState = this.accessory.context.cachePositionState
       const percentStepPerDecisecond = blindConfig.operationTime / 100
@@ -53,7 +55,9 @@ module.exports = class deviceBlind {
       this.accessory.context.cachePositionState = setToMoveUp ? 1 : 0
       this.accessory.context.cacheLastStartTime = Math.floor(Date.now() / 100)
       await this.helpers.sleep(decisecondsToMove * 100)
-      if (this.updateKey !== updateKey) return
+      if (this.updateKey !== updateKey) {
+        return
+      }
       params.switches[0].switch = 'off'
       params.switches[1].switch = 'off'
       await this.platform.sendDeviceUpdate(this.accessory, params)
diff --git a/lib/device/curtain.js b/lib/device/curtain.js
index 113dd4d1..c98daf61 100644
--- a/lib/device/curtain.js
+++ b/lib/device/curtain.js
@@ -32,7 +32,9 @@ module.exports = class deviceCurtain {
 
   async externalUpdate (params) {
     try {
-      if (!params.switch && !this.helpers.hasProperty(params, 'setclose')) return
+      if (!params.switch && !this.helpers.hasProperty(params, 'setclose')) {
+        return
+      }
       const newPos = Math.abs(100 - parseInt(params.setclose))
       this.service.updateCharacteristic(this.Characteristic.TargetPosition, newPos)
         .updateCharacteristic(this.Characteristic.CurrentPosition, newPos)
diff --git a/lib/device/diffuser.js b/lib/device/diffuser.js
index 0dd641e0..184b5891 100644
--- a/lib/device/diffuser.js
+++ b/lib/device/diffuser.js
@@ -33,7 +33,9 @@ module.exports = class deviceDiffuser {
     try {
       callback()
       const onoff = value ? 'on' : 'off'
-      if (this.cacheOnOff === onoff) return
+      if (this.cacheOnOff === onoff) {
+        return
+      }
       this.cacheOnOff = onoff
       const params = { switch: this.cacheOnOff }
       const timerKey = Math.random().toString(36).substr(2, 8)
@@ -53,15 +55,21 @@ module.exports = class deviceDiffuser {
   async internalDiffuserSpeedUpdate (value, callback) {
     try {
       callback()
-      if (value === 0) return
+      if (value === 0) {
+        return
+      }
       const newSpeed = value <= 75 ? 50 : 100
-      if (newSpeed === this.cacheSpeed) return
+      if (newSpeed === this.cacheSpeed) {
+        return
+      }
       this.cacheSpeed = newSpeed
       const params = { state: this.cacheSpeed / 50 }
       const updateKeySpeed = Math.random().toString(36).substr(2, 8)
       this.updateKeySpeed = updateKeySpeed
       await this.helpers.sleep(500)
-      if (updateKeySpeed !== this.updateKeySpeed) return
+      if (updateKeySpeed !== this.updateKeySpeed) {
+        return
+      }
       this.updateTimeout = updateKeySpeed
       setTimeout(() => {
         if (this.updateTimeout === updateKeySpeed) this.updateTimeout = false
@@ -79,13 +87,17 @@ module.exports = class deviceDiffuser {
     try {
       callback()
       const onoff = value ? 1 : 0
-      if (this.cacheLightOnOff === onoff) return
+      if (this.cacheLightOnOff === onoff) {
+        return
+      }
       this.cacheLightOnOff = onoff
       const params = { lightswitch: this.cacheLightOnOff }
       const updateKeyLight = Math.random().toString(36).substr(2, 8)
       this.updateKeyLight = updateKeyLight
       await this.helpers.sleep(250)
-      if (updateKeyLight !== this.updateKeyLight) return
+      if (updateKeyLight !== this.updateKeyLight) {
+        return
+      }
       this.updateTimeout = updateKeyLight
       setTimeout(() => {
         if (this.updateTimeout === updateKeyLight) this.updateTimeout = false
@@ -111,7 +123,9 @@ module.exports = class deviceDiffuser {
       this.updateKeyBright = updateKeyBright
       const params = { lightbright: this.cacheBrightness }
       await this.helpers.sleep(500)
-      if (updateKeyBright !== this.updateKeyBright) return
+      if (updateKeyBright !== this.updateKeyBright) {
+        return
+      }
       this.updateTimeout = updateKeyBright
       setTimeout(() => {
         if (this.updateTimeout === updateKeyBright) this.updateTimeout = false
@@ -148,7 +162,9 @@ module.exports = class deviceDiffuser {
         lightBcolor: this.cacheB
       }
       await this.helpers.sleep(1500)
-      if (updateKeyColour !== this.updateKeyColour) return
+      if (updateKeyColour !== this.updateKeyColour) {
+        return
+      }
       this.updateTimeout = updateKeyColour
       setTimeout(() => {
         if (this.updateTimeout === updateKeyColour) this.updateTimeout = false
@@ -164,7 +180,9 @@ module.exports = class deviceDiffuser {
 
   async externalUpdate (params) {
     try {
-      if (this.updateTimeout) return
+      if (this.updateTimeout) {
+        return
+      }
       if (params.switch && params.switch !== this.cacheOnOff) {
         this.cacheOnOff = params.switch
         if (params.updateSource && !this.disableDeviceLogging) {
diff --git a/lib/device/fan.js b/lib/device/fan.js
index a41077cb..76dff033 100644
--- a/lib/device/fan.js
+++ b/lib/device/fan.js
@@ -84,7 +84,9 @@ module.exports = class deviceFan {
 
   async externalUpdate (params) {
     try {
-      if (!params.switches) return
+      if (!params.switches) {
+        return
+      }
       if (params.switches[1].switch !== this.cacheOnOff) {
         this.cacheOnOff = params.switches[1].switch
         this.service.updateCharacteristic(this.Characteristic.On, this.cacheLight === 'on')
diff --git a/lib/device/garage-eachen.js b/lib/device/garage-eachen.js
index 659414fa..cea3a24a 100644
--- a/lib/device/garage-eachen.js
+++ b/lib/device/garage-eachen.js
@@ -31,7 +31,9 @@ module.exports = class deviceGarageEachen {
     try {
       callback()
       const params = { switch: value === 0 ? 'on' : 'off' }
-      if (value === this.service.getCharacteristic(this.Characteristic.CurrentDoorState).value % 2) return
+      if (value === this.service.getCharacteristic(this.Characteristic.CurrentDoorState).value % 2) {
+        return
+      }
       this.inUse = true
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.service.updateCharacteristic(this.Characteristic.TargetDoorState, value)
@@ -53,7 +55,9 @@ module.exports = class deviceGarageEachen {
 
   async externalUpdate (params) {
     try {
-      if (!params.switch || this.inUse) return
+      if (!params.switch || this.inUse) {
+        return
+      }
       this.service.updateCharacteristic(this.Characteristic.TargetDoorState, params.switch === 'on' ? 0 : 1)
         .updateCharacteristic(this.Characteristic.CurrentDoorState, params.switch === 'on' ? 0 : 1)
       if (params.updateSource && !this.disableDeviceLogging) {
diff --git a/lib/device/garage-four.js b/lib/device/garage-four.js
index 5678cab5..cbfe2451 100644
--- a/lib/device/garage-four.js
+++ b/lib/device/garage-four.js
@@ -49,7 +49,9 @@ module.exports = class deviceGarageFour {
           break
       }
       const prevState = this.accessory.context.cacheStates[garageChannel].cacheCurrentDoorState
-      if (value === prevState % 2) return
+      if (value === prevState % 2) {
+        return
+      }
       const gdService = this.accessory.getService('Garage ' + garage)
       this.inUse = true
       const updateKey = Math.random().toString(36).substr(2, 8)
@@ -64,7 +66,9 @@ module.exports = class deviceGarageFour {
       await this.helpers.sleep(2000)
       this.inUse = false
       await this.helpers.sleep(Math.max((this.operationTime - 20) * 100, 0))
-      if (this.updateKey !== updateKey) return
+      if (this.updateKey !== updateKey) {
+        return
+      }
       gdService.updateCharacteristic(this.Characteristic.CurrentDoorState, value)
       this.accessory.context.cacheStates[garageChannel].cacheCurrentDoorState = value
       if (!this.disableDeviceLogging) {
diff --git a/lib/device/garage-two.js b/lib/device/garage-two.js
index 088105eb..55ffc4b8 100644
--- a/lib/device/garage-two.js
+++ b/lib/device/garage-two.js
@@ -39,7 +39,9 @@ module.exports = class deviceGarageTwo {
       const prevState = garage === 'Garage 1'
         ? this.accessory.context.cacheOneCurrentDoorState
         : this.accessory.context.cacheTwoCurrentDoorState
-      if (newPos === prevState % 2) return
+      if (newPos === prevState % 2) {
+        return
+      }
       this.inUse = true
       gdService.updateCharacteristic(this.Characteristic.TargetDoorState, newPos)
         .updateCharacteristic(this.Characteristic.CurrentDoorState, newPos + 2)
@@ -88,8 +90,9 @@ module.exports = class deviceGarageTwo {
 
   externalUpdate (params) {
     try {
-      if (!params.switches) return
-      if (this.inUse) return
+      if (!params.switches || this.inUse) {
+        return
+      }
       this.cacheSwitchState = params.switches
       ;['1', '2'].forEach(async v => {
         const gcService = this.accessory.getService('Garage ' + v)
diff --git a/lib/device/light-colour.js b/lib/device/light-colour.js
index 9e4782a1..80f578d9 100644
--- a/lib/device/light-colour.js
+++ b/lib/device/light-colour.js
@@ -44,7 +44,9 @@ module.exports = class deviceLightColour {
       callback()
       const params = {}
       const onoff = value ? 'on' : 'off'
-      if (this.cacheOnOff === onoff) return
+      if (this.cacheOnOff === onoff) {
+        return
+      }
       this.cacheOnOff = onoff
       if (this.isB1) {
         params.state = this.cacheOnOff
@@ -109,7 +111,9 @@ module.exports = class deviceLightColour {
           break
       }
       await this.helpers.sleep(750)
-      if (updateKeyBright !== this.updateKeyBright) return
+      if (updateKeyBright !== this.updateKeyBright) {
+        return
+      }
       this.updateTimeout = updateKeyBright
       setTimeout(() => {
         if (this.updateTimeout === updateKeyBright) this.updateTimeout = false
@@ -178,7 +182,9 @@ module.exports = class deviceLightColour {
           break
       }
       await this.helpers.sleep(1500)
-      if (updateKeyColour !== this.updateKeyColour) return
+      if (updateKeyColour !== this.updateKeyColour) {
+        return
+      }
       this.updateTimeout = updateKeyColour
       setTimeout(() => {
         if (this.updateTimeout === updateKeyColour) this.updateTimeout = false
@@ -241,7 +247,9 @@ module.exports = class deviceLightColour {
           break
       }
       await this.helpers.sleep(1500)
-      if (updateKeyCT !== this.updateKeyCT) return
+      if (updateKeyCT !== this.updateKeyCT) {
+        return
+      }
       this.updateTimeout = updateKeyCT
       setTimeout(() => {
         if (this.updateTimeout === updateKeyCT) this.updateTimeout = false
@@ -261,7 +269,9 @@ module.exports = class deviceLightColour {
 
   async externalUpdate (params) {
     try {
-      if (this.updateTimeout) return
+      if (this.updateTimeout) {
+        return
+      }
       if (
         (this.isB1 && params.state && params.state !== this.cacheOnOff) ||
         (!this.isB1 && params.switch && params.switch !== this.cacheOnOff)
diff --git a/lib/device/light-ctemp.js b/lib/device/light-ctemp.js
index c451a7a1..0278f357 100644
--- a/lib/device/light-ctemp.js
+++ b/lib/device/light-ctemp.js
@@ -38,7 +38,9 @@ module.exports = class deviceLightColour {
     try {
       callback()
       const onoff = value ? 'on' : 'off'
-      if (this.cacheOnOff === onoff) return
+      if (this.cacheOnOff === onoff) {
+        return
+      }
       this.cacheOnOff = onoff
       const timerKey = Math.random().toString(36).substr(2, 8)
       this.updateTimeout = timerKey
@@ -73,7 +75,9 @@ module.exports = class deviceLightColour {
         }
       }
       await this.helpers.sleep(750)
-      if (updateKeyBright !== this.updateKeyBright) return
+      if (updateKeyBright !== this.updateKeyBright) {
+        return
+      }
       this.updateTimeout = updateKeyBright
       setTimeout(() => {
         if (this.updateTimeout === updateKeyBright) this.updateTimeout = false
@@ -106,7 +110,9 @@ module.exports = class deviceLightColour {
         }
       }
       await this.helpers.sleep(1500)
-      if (updateKeyCT !== this.updateKeyCT) return
+      if (updateKeyCT !== this.updateKeyCT) {
+        return
+      }
       this.updateTimeout = updateKeyCT
       setTimeout(() => {
         if (this.updateTimeout === updateKeyCT) this.updateTimeout = false
@@ -126,7 +132,9 @@ module.exports = class deviceLightColour {
 
   async externalUpdate (params) {
     try {
-      if (this.updateTimeout) return
+      if (this.updateTimeout) {
+        return
+      }
       if (params.switch && params.switch !== this.cacheOnOff) {
         this.cacheOnOff = params.switch
         this.service.updateCharacteristic(this.Characteristic.On, this.cacheOnOff === 'on')
diff --git a/lib/device/light-dimmer.js b/lib/device/light-dimmer.js
index d2e19c01..f68e1546 100644
--- a/lib/device/light-dimmer.js
+++ b/lib/device/light-dimmer.js
@@ -21,7 +21,9 @@ module.exports = class deviceLightDimmer {
     try {
       callback()
       const onoff = value ? 'on' : 'off'
-      if (this.cacheOnOff === onoff) return
+      if (this.cacheOnOff === onoff) {
+        return
+      }
       this.cacheOnOff = onoff
       await this.platform.sendDeviceUpdate(this.accessory, {
         switch: this.cacheOnOff
@@ -57,7 +59,9 @@ module.exports = class deviceLightDimmer {
       const updateKey = Math.random().toString(36).substr(2, 8)
       this.updateKeyBright = updateKey
       await this.helpers.sleep(500)
-      if (updateKey !== this.updateKeyBright) return
+      if (updateKey !== this.updateKeyBright) {
+        return
+      }
       await this.platform.sendDeviceUpdate(this.accessory, params)
       if (!this.disableDeviceLogging) {
         this.log('[%s] current brightness [%s%].', this.accessory.displayName, this.cacheBrightness)
diff --git a/lib/device/rf-bridge.js b/lib/device/rf-bridge.js
index 741f8fac..b7d5b286 100644
--- a/lib/device/rf-bridge.js
+++ b/lib/device/rf-bridge.js
@@ -91,7 +91,9 @@ module.exports = class deviceRFBridge {
   async internalUpdate (rfChl, service, value, callback) {
     try {
       callback()
-      if (!value) return
+      if (!value) {
+        return
+      }
       const params = {
         cmd: 'transmit',
         rfChl: parseInt(rfChl)
@@ -106,7 +108,9 @@ module.exports = class deviceRFBridge {
 
   async externalUpdate (params) {
     try {
-      if (!this.helpers.hasProperty(params, 'updateSource')) return
+      if (!this.helpers.hasProperty(params, 'updateSource')) {
+        return
+      }
       const timeNow = new Date()
       let oAccessory = false
       if (this.helpers.hasProperty(params, 'cmd') && params.cmd === 'transmit' && this.helpers.hasProperty(params, 'rfChl')) {
diff --git a/lib/device/scm.js b/lib/device/scm.js
index 8a02c214..5db589a2 100644
--- a/lib/device/scm.js
+++ b/lib/device/scm.js
@@ -41,7 +41,9 @@ module.exports = class deviceSCM {
 
   async externalUpdate (params) {
     try {
-      if (!params.switches || params.switches[0].switch === this.cacheOnOff) return
+      if (!params.switches || params.switches[0].switch === this.cacheOnOff) {
+        return
+      }
       const newStatus = params.switches[0].switch === 'on'
       this.service.updateCharacteristic(this.Characteristic.On, newStatus)
       this.cacheOnOff = params.switches[0].switch
diff --git a/lib/device/sensor.js b/lib/device/sensor.js
index e75f1d50..1a0bf59d 100644
--- a/lib/device/sensor.js
+++ b/lib/device/sensor.js
@@ -50,7 +50,9 @@ module.exports = class deviceSensor {
           }
         }
       }
-      if (!params.switch || params.switch === this.cacheOnOff) return
+      if (!params.switch || params.switch === this.cacheOnOff) {
+        return
+      }
       this.cacheOnOff = params.switch
       const newState = params.switch === 'on' ? 1 : 0
       this.contactService.updateCharacteristic(this.Characteristic.ContactSensorState, newState)
diff --git a/lib/device/switch-multi.js b/lib/device/switch-multi.js
index be011712..7599c1b4 100644
--- a/lib/device/switch-multi.js
+++ b/lib/device/switch-multi.js
@@ -93,7 +93,9 @@ module.exports = class deviceSwitchMulti {
 
   async externalUpdate (params) {
     try {
-      if (!params.switches) return
+      if (!params.switches) {
+        return
+      }
       const idToCheck = this.accessory.context.eweDeviceId + 'SW'
       let primaryState = false
       for (let i = 1; i <= this.accessory.context.channelCount; i++) {
diff --git a/lib/device/switch-single.js b/lib/device/switch-single.js
index ea3df561..b87e45f1 100644
--- a/lib/device/switch-single.js
+++ b/lib/device/switch-single.js
@@ -45,7 +45,9 @@ module.exports = class deviceSwitchSingle {
 
   async externalUpdate (params) {
     try {
-      if (!params.switch || params.switch === this.cacheOnOff) return
+      if (!params.switch || params.switch === this.cacheOnOff) {
+        return
+      }
       const newStatus = params.switch === 'on'
       this.service.updateCharacteristic(this.Characteristic.On, newStatus)
       this.cacheOnOff = params.switch
diff --git a/lib/device/usb.js b/lib/device/usb.js
index a53cc258..543893a7 100644
--- a/lib/device/usb.js
+++ b/lib/device/usb.js
@@ -51,7 +51,9 @@ module.exports = class deviceUSB {
 
   async externalUpdate (params) {
     try {
-      if (!params.switches || params.switches[0].switch === this.cacheOnOff) return
+      if (!params.switches || params.switches[0].switch === this.cacheOnOff) {
+        return
+      }
       const newStatus = params.switches[0].switch === 'on'
       this.service.updateCharacteristic(this.Characteristic.On, newStatus)
       this.cacheOnOff = params.switches[0].switch

From 21394a7cb36a54354d3596eac9acae46090b46ee Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 24 Jan 2021 10:11:16 +0000
Subject: [PATCH 1198/3183] shorten vars

---
 lib/device/blind.js         | 22 +++++-----
 lib/device/curtain.js       | 14 +++----
 lib/device/diffuser.js      | 36 ++++++++--------
 lib/device/fan.js           | 32 +++++++--------
 lib/device/garage-eachen.js | 30 +++++++-------
 lib/device/garage-four.js   | 20 ++++-----
 lib/device/garage-one.js    | 34 +++++++--------
 lib/device/garage-two.js    | 26 ++++++------
 lib/device/light-colour.js  | 62 ++++++++++++++--------------
 lib/device/light-ctemp.js   | 20 ++++-----
 lib/device/light-dimmer.js  | 16 ++++----
 lib/device/lock-one.js      | 24 +++++------
 lib/device/outlet.js        | 62 ++++++++++++++--------------
 lib/device/rf-bridge.js     | 82 ++++++++++++++++++-------------------
 lib/device/scm.js           | 10 ++---
 lib/device/sensor.js        | 34 +++++++--------
 lib/device/switch-multi.js  | 20 ++++-----
 lib/device/switch-single.js | 14 +++----
 lib/device/switch-valve.js  | 66 ++++++++++++++---------------
 lib/device/tap-one.js       | 22 +++++-----
 lib/device/tap-two.js       | 26 ++++++------
 lib/device/template.js      | 12 +++---
 lib/device/th-outlet.js     | 28 ++++++-------
 lib/device/th-thermo.js     | 42 +++++++++----------
 lib/device/usb.js           | 20 ++++-----
 lib/device/valve-four.js    | 78 +++++++++++++++++------------------
 lib/device/valve-one.js     | 56 ++++++++++++-------------
 lib/device/valve-two.js     | 58 +++++++++++++-------------
 lib/device/zb-dev.js        | 80 ++++++++++++++++++------------------
 lib/index.js                | 26 ++++++------
 30 files changed, 536 insertions(+), 536 deletions(-)

diff --git a/lib/device/blind.js b/lib/device/blind.js
index 405f2297..469f483b 100644
--- a/lib/device/blind.js
+++ b/lib/device/blind.js
@@ -7,15 +7,15 @@ module.exports = class deviceBlind {
     this.log = platform.log
     this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.helpers = platform.helpers
-    this.Service = platform.api.hap.Service
-    this.Characteristic = platform.api.hap.Characteristic
-    if (!(this.service = accessory.getService(this.Service.WindowCovering))) {
-      this.service = accessory.addService(this.Service.WindowCovering)
-      this.service.setCharacteristic(this.Characteristic.CurrentPosition, 0)
-        .setCharacteristic(this.Characteristic.TargetPosition, 0)
-        .setCharacteristic(this.Characteristic.PositionState, 2)
+    this.S = platform.api.hap.Service
+    this.C = platform.api.hap.Characteristic
+    if (!(this.service = accessory.getService(this.S.WindowCovering))) {
+      this.service = accessory.addService(this.S.WindowCovering)
+      this.service.setCharacteristic(this.C.CurrentPosition, 0)
+        .setCharacteristic(this.C.TargetPosition, 0)
+        .setCharacteristic(this.C.PositionState, 2)
     }
-    this.service.getCharacteristic(this.Characteristic.TargetPosition)
+    this.service.getCharacteristic(this.C.TargetPosition)
       .on('set', this.internalUpdate.bind(this))
     this.accessory = accessory
   }
@@ -42,7 +42,7 @@ module.exports = class deviceBlind {
         } else {
           prevPosition += positionPercentChange
         }
-        this.service.updateCharacteristic(this.Characteristic.CurrentPosition, prevPosition)
+        this.service.updateCharacteristic(this.C.CurrentPosition, prevPosition)
         this.accessory.context.cacheCurrentPosition = prevPosition
       }
       const diffPosition = value - prevPosition
@@ -61,8 +61,8 @@ module.exports = class deviceBlind {
       params.switches[0].switch = 'off'
       params.switches[1].switch = 'off'
       await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.service.updateCharacteristic(this.Characteristic.PositionState, 2)
-        .updateCharacteristic(this.Characteristic.CurrentPosition, value)
+      this.service.updateCharacteristic(this.C.PositionState, 2)
+        .updateCharacteristic(this.C.CurrentPosition, value)
       this.accessory.context.cachePositionState = 2
       this.accessory.context.cacheCurrentPosition = value
       if (!this.disableDeviceLogging) {
diff --git a/lib/device/curtain.js b/lib/device/curtain.js
index c98daf61..9e59daa7 100644
--- a/lib/device/curtain.js
+++ b/lib/device/curtain.js
@@ -7,10 +7,10 @@ module.exports = class deviceCurtain {
     this.log = platform.log
     this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.helpers = platform.helpers
-    this.Service = platform.api.hap.Service
-    this.Characteristic = platform.api.hap.Characteristic
-    this.service = accessory.getService(this.Service.WindowCovering) || accessory.addService(this.Service.WindowCovering)
-    this.service.getCharacteristic(this.Characteristic.TargetPosition)
+    this.S = platform.api.hap.Service
+    this.C = platform.api.hap.Characteristic
+    this.service = accessory.getService(this.S.WindowCovering) || accessory.addService(this.S.WindowCovering)
+    this.service.getCharacteristic(this.C.TargetPosition)
       .on('set', this.internalUpdate.bind(this))
     this.accessory = accessory
   }
@@ -36,9 +36,9 @@ module.exports = class deviceCurtain {
         return
       }
       const newPos = Math.abs(100 - parseInt(params.setclose))
-      this.service.updateCharacteristic(this.Characteristic.TargetPosition, newPos)
-        .updateCharacteristic(this.Characteristic.CurrentPosition, newPos)
-        .updateCharacteristic(this.Characteristic.PositionState, 2)
+      this.service.updateCharacteristic(this.C.TargetPosition, newPos)
+        .updateCharacteristic(this.C.CurrentPosition, newPos)
+        .updateCharacteristic(this.C.PositionState, 2)
       if (params.updateSource && this.cachePosition !== newPos) {
         this.cachePosition = newPos
         if (!this.disableDeviceLogging) {
diff --git a/lib/device/diffuser.js b/lib/device/diffuser.js
index 184b5891..83cd97d2 100644
--- a/lib/device/diffuser.js
+++ b/lib/device/diffuser.js
@@ -8,23 +8,23 @@ module.exports = class deviceDiffuser {
     this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.helpers = platform.helpers
     this.colourUtils = platform.colourUtils
-    this.Service = platform.api.hap.Service
-    this.Characteristic = platform.api.hap.Characteristic
-    this.fanService = accessory.getService('Diffuser') || accessory.addService(this.Service.Fan, 'Diffuser', 'diffuser')
-    this.lightService = accessory.getService('Light') || accessory.addService(this.Service.Lightbulb, 'Light', 'light')
-    this.fanService.getCharacteristic(this.Characteristic.On)
+    this.S = platform.api.hap.Service
+    this.C = platform.api.hap.Characteristic
+    this.fanService = accessory.getService('Diffuser') || accessory.addService(this.S.Fan, 'Diffuser', 'diffuser')
+    this.lightService = accessory.getService('Light') || accessory.addService(this.S.Lightbulb, 'Light', 'light')
+    this.fanService.getCharacteristic(this.C.On)
       .on('set', this.internalDiffuserOnOffUpdate.bind(this))
     this.accessory = accessory
-    this.fanService.getCharacteristic(this.Characteristic.RotationSpeed)
+    this.fanService.getCharacteristic(this.C.RotationSpeed)
       .on('set', this.internalDiffuserSpeedUpdate.bind(this))
       .setProps({ minStep: 50 })
-    this.lightService.getCharacteristic(this.Characteristic.On)
+    this.lightService.getCharacteristic(this.C.On)
       .on('set', this.internalLightOnOffUpdate.bind(this))
-    this.lightService.getCharacteristic(this.Characteristic.Brightness)
+    this.lightService.getCharacteristic(this.C.Brightness)
       .on('set', this.internalLightBrightnessUpdate.bind(this))
-    this.lightService.getCharacteristic(this.Characteristic.Hue)
+    this.lightService.getCharacteristic(this.C.Hue)
       .on('set', this.internalLightColourUpdate.bind(this))
-    this.lightService.getCharacteristic(this.Characteristic.Saturation)
+    this.lightService.getCharacteristic(this.C.Saturation)
       .on('set', (value, callback) => callback())
     this.accessory = accessory
   }
@@ -151,7 +151,7 @@ module.exports = class deviceDiffuser {
       this.updateKeyColour = updateKeyColour
       const newRGB = this.colourUtils.hs2rgb(
         value,
-        this.accessory.getService('Light').getCharacteristic(this.Characteristic.Saturation).value
+        this.accessory.getService('Light').getCharacteristic(this.C.Saturation).value
       )
       this.cacheR = newRGB[0]
       this.cacheG = newRGB[0]
@@ -188,28 +188,28 @@ module.exports = class deviceDiffuser {
         if (params.updateSource && !this.disableDeviceLogging) {
           this.log('[%s] current state [%s%].', this.accessory.displayName, this.cacheOnOff)
         }
-        this.fanService.updateCharacteristic(this.Characteristic.On, this.cacheOnOff === 'on')
+        this.fanService.updateCharacteristic(this.C.On, this.cacheOnOff === 'on')
         if (!this.helpers.hasProperty(params, 'state')) {
-          this.fanService.updateCharacteristic(this.Characteristic.RotationSpeed, this.cacheSpeed)
+          this.fanService.updateCharacteristic(this.C.RotationSpeed, this.cacheSpeed)
         }
       }
       if (this.helpers.hasProperty(params, 'state') && params.state * 50 !== this.cacheSpeed) {
         this.cacheSpeed = params.state * 50
-        this.fanService.updateCharacteristic(this.Characteristic.RotationSpeed, this.cacheSpeed)
+        this.fanService.updateCharacteristic(this.C.RotationSpeed, this.cacheSpeed)
         if (params.updateSource && !this.disableDeviceLogging) {
           this.log('[%s] current speed [%s%].', this.accessory.displayName, this.cacheSpeed)
         }
       }
       if (this.helpers.hasProperty(params, 'lightswitch') && this.cacheLightOnOff !== params.lightswitch) {
         this.cacheLightOnOff = params.lightswitch
-        this.lightService.updateCharacteristic(this.Characteristic.On, params.lightswitch === 1)
+        this.lightService.updateCharacteristic(this.C.On, params.lightswitch === 1)
         if (params.updateSource && !this.disableDeviceLogging) {
           this.log('[%s] current light [%s%].', this.accessory.displayNameparams.lightswitch === 1 ? 'on' : 'off')
         }
       }
       if (this.helpers.hasProperty(params, 'lightbright') && this.cacheBrightness !== params.lightbright) {
         this.cacheBrightness = params.lightbright
-        this.lightService.updateCharacteristic(this.Characteristic.Brightness, params.lightbright)
+        this.lightService.updateCharacteristic(this.C.Brightness, params.lightbright)
         if (params.updateSource && !this.disableDeviceLogging) {
           this.log('[%s] current brightness [%s%].', this.accessory.displayNameparams.lightbright)
         }
@@ -221,8 +221,8 @@ module.exports = class deviceDiffuser {
           this.cacheB = params.lightBcolor
           const newColour = this.colourUtils.rgb2hs(this.cacheR, this.cacheG, this.cacheB)
           this.cacheHue = newColour[0]
-          this.lightService.updateCharacteristic(this.Characteristic.Hue, this.cacheHue)
-            .updateCharacteristic(this.Characteristic.Saturation, 100)
+          this.lightService.updateCharacteristic(this.C.Hue, this.cacheHue)
+            .updateCharacteristic(this.C.Saturation, 100)
           if (params.updateSource && !this.disableDeviceLogging) {
             this.log('[%s] current colour [rgb %s %s %s].', this.accessory.displayName, this.cacheR, this.cacheG, this.cacheB)
           }
diff --git a/lib/device/fan.js b/lib/device/fan.js
index 76dff033..5d795b35 100644
--- a/lib/device/fan.js
+++ b/lib/device/fan.js
@@ -7,24 +7,24 @@ module.exports = class deviceFan {
     this.log = platform.log
     this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.helpers = platform.helpers
-    this.Service = platform.api.hap.Service
-    this.Characteristic = platform.api.hap.Characteristic
-    this.service = accessory.getService(this.Service.Fan) || accessory.addService(this.Service.Fan)
-    this.service.getCharacteristic(this.Characteristic.On)
+    this.S = platform.api.hap.Service
+    this.C = platform.api.hap.Characteristic
+    this.service = accessory.getService(this.S.Fan) || accessory.addService(this.S.Fan)
+    this.service.getCharacteristic(this.C.On)
       .on('set', (value, callback) => {
         callback()
-        if (!value) this.service.setCharacteristic(this.Characteristic.RotationSpeed, 0)
+        if (!value) this.service.setCharacteristic(this.C.RotationSpeed, 0)
       })
-    this.service.getCharacteristic(this.Characteristic.RotationSpeed)
+    this.service.getCharacteristic(this.C.RotationSpeed)
       .on('set', this.internalSpeedUpdate.bind(this))
       .setProps({ minStep: 33 })
     if ((this.platform.config.hideLightFromFan || '').split(',').includes(accessory.context.eweDeviceId)) {
-      if (accessory.getService(this.Service.Lightbulb)) {
-        accessory.removeService(accessory.getService(this.Service.Lightbulb))
+      if (accessory.getService(this.S.Lightbulb)) {
+        accessory.removeService(accessory.getService(this.S.Lightbulb))
       }
     } else {
-      this.lightService = accessory.getService(this.Service.Lightbulb) || accessory.addService(this.Service.Lightbulb)
-      this.lightService.getCharacteristic(this.Characteristic.On)
+      this.lightService = accessory.getService(this.S.Lightbulb) || accessory.addService(this.S.Lightbulb)
+      this.lightService.getCharacteristic(this.C.On)
         .on('set', this.internalLightUpdate.bind(this))
     }
     this.accessory = accessory
@@ -36,7 +36,7 @@ module.exports = class deviceFan {
       const params = { switches: this.helpers.defaultMultiSwitchOff }
       const newPower = value >= 33
       const newSpeed = value
-      const newLight = this.lightService ? this.lightService.getCharacteristic(this.Characteristic.On).value : true
+      const newLight = this.lightService ? this.lightService.getCharacteristic(this.C.On).value : true
       params.switches[0].switch = newLight ? 'on' : 'off'
       params.switches[1].switch = newPower && newSpeed >= 33 ? 'on' : 'off'
       params.switches[2].switch = newPower && newSpeed >= 66 && newSpeed < 99 ? 'on' : 'off'
@@ -63,8 +63,8 @@ module.exports = class deviceFan {
     try {
       callback()
       const params = { switches: this.helpers.defaultMultiSwitchOff }
-      const newPower = this.service.getCharacteristic(this.Characteristic.On).value
-      const newSpeed = this.service.getCharacteristic(this.Characteristic.RotationSpeed).value
+      const newPower = this.service.getCharacteristic(this.C.On).value
+      const newSpeed = this.service.getCharacteristic(this.C.RotationSpeed).value
       const newLight = this.lightService ? value : true
       params.switches[0].switch = newLight ? 'on' : 'off'
       params.switches[1].switch = newPower && newSpeed >= 33 ? 'on' : 'off'
@@ -89,7 +89,7 @@ module.exports = class deviceFan {
       }
       if (params.switches[1].switch !== this.cacheOnOff) {
         this.cacheOnOff = params.switches[1].switch
-        this.service.updateCharacteristic(this.Characteristic.On, this.cacheLight === 'on')
+        this.service.updateCharacteristic(this.C.On, this.cacheLight === 'on')
         if (params.updateSource && !this.disableDeviceLogging) {
           this.log('[%s] current state [%s].', this.accessory.displayName, this.cacheOnOff)
         }
@@ -107,14 +107,14 @@ module.exports = class deviceFan {
       }
       if (speed !== this.cacheSpeed) {
         this.cacheSpeed = speed
-        this.service.updateCharacteristic(this.Characteristic.RotationSpeed, this.cacheSpeed)
+        this.service.updateCharacteristic(this.C.RotationSpeed, this.cacheSpeed)
         if (params.updateSource && !this.disableDeviceLogging) {
           this.log('[%s] current speed [%s%].', this.accessory.displayName, this.cacheSpeed)
         }
       }
       if (this.lightService && params.switches[0].switch !== this.cacheLight) {
         this.cacheLight = params.switches[0].switch
-        this.lightService.updateCharacteristic(this.Characteristic.On, this.cacheLight === 'on')
+        this.lightService.updateCharacteristic(this.C.On, this.cacheLight === 'on')
         if (params.updateSource && !this.disableDeviceLogging) {
           this.log('[%s] current light state [%s].', this.accessory.displayName, this.cacheLight)
         }
diff --git a/lib/device/garage-eachen.js b/lib/device/garage-eachen.js
index cea3a24a..6c442bee 100644
--- a/lib/device/garage-eachen.js
+++ b/lib/device/garage-eachen.js
@@ -7,23 +7,23 @@ module.exports = class deviceGarageEachen {
     this.log = platform.log
     this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.helpers = platform.helpers
-    this.Service = platform.api.hap.Service
-    this.Characteristic = platform.api.hap.Characteristic
+    this.S = platform.api.hap.Service
+    this.C = platform.api.hap.Characteristic
     this.operationTime = parseInt(platform.cusG.get(accessory.context.eweDeviceId).operationTime)
     this.operationTime = isNaN(this.operationTime)
       ? this.helpers.defaults.operationTime
       : this.operationTime < 20
         ? this.helpers.defaults.operationTime
         : this.operationTime
-    if (!(this.service = accessory.getService(this.Service.GarageDoorOpener))) {
-      this.service = accessory.addService(this.Service.GarageDoorOpener)
-      this.service.setCharacteristic(this.Characteristic.CurrentDoorState, 1)
-        .setCharacteristic(this.Characteristic.TargetDoorState, 1)
-        .setCharacteristic(this.Characteristic.ObstructionDetected, false)
+    if (!(this.service = accessory.getService(this.S.GarageDoorOpener))) {
+      this.service = accessory.addService(this.S.GarageDoorOpener)
+      this.service.setCharacteristic(this.C.CurrentDoorState, 1)
+        .setCharacteristic(this.C.TargetDoorState, 1)
+        .setCharacteristic(this.C.ObstructionDetected, false)
     }
-    this.service.getCharacteristic(this.Characteristic.TargetDoorState)
+    this.service.getCharacteristic(this.C.TargetDoorState)
       .on('set', this.internalUpdate.bind(this))
-    this.service.updateCharacteristic(this.Characteristic.ObstructionDetected, false)
+    this.service.updateCharacteristic(this.C.ObstructionDetected, false)
     this.accessory = accessory
   }
 
@@ -31,18 +31,18 @@ module.exports = class deviceGarageEachen {
     try {
       callback()
       const params = { switch: value === 0 ? 'on' : 'off' }
-      if (value === this.service.getCharacteristic(this.Characteristic.CurrentDoorState).value % 2) {
+      if (value === this.service.getCharacteristic(this.C.CurrentDoorState).value % 2) {
         return
       }
       this.inUse = true
       await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.service.updateCharacteristic(this.Characteristic.TargetDoorState, value)
-        .updateCharacteristic(this.Characteristic.CurrentDoorState, value + 2)
+      this.service.updateCharacteristic(this.C.TargetDoorState, value)
+        .updateCharacteristic(this.C.CurrentDoorState, value + 2)
       await this.helpers.sleep(2000)
       this.inUse = false
       if (value === 0) {
         await this.helpers.sleep(Math.max((this.operationTime - 20) * 100, 0))
-        this.service.updateCharacteristic(this.Characteristic.CurrentDoorState, 0)
+        this.service.updateCharacteristic(this.C.CurrentDoorState, 0)
         if (!this.disableDeviceLogging) {
           this.log('[%s] current state [open].', this.accessory.displayName)
         }
@@ -58,8 +58,8 @@ module.exports = class deviceGarageEachen {
       if (!params.switch || this.inUse) {
         return
       }
-      this.service.updateCharacteristic(this.Characteristic.TargetDoorState, params.switch === 'on' ? 0 : 1)
-        .updateCharacteristic(this.Characteristic.CurrentDoorState, params.switch === 'on' ? 0 : 1)
+      this.service.updateCharacteristic(this.C.TargetDoorState, params.switch === 'on' ? 0 : 1)
+        .updateCharacteristic(this.C.CurrentDoorState, params.switch === 'on' ? 0 : 1)
       if (params.updateSource && !this.disableDeviceLogging) {
         this.log('[%s] current state [%s].', this.accessory.displayName, params.switch === 'on' ? 'open' : 'closed')
       }
diff --git a/lib/device/garage-four.js b/lib/device/garage-four.js
index cbfe2451..6c56e84f 100644
--- a/lib/device/garage-four.js
+++ b/lib/device/garage-four.js
@@ -7,8 +7,8 @@ module.exports = class deviceGarageFour {
     this.log = platform.log
     this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.helpers = platform.helpers
-    this.Service = platform.api.hap.Service
-    this.Characteristic = platform.api.hap.Characteristic
+    this.S = platform.api.hap.Service
+    this.C = platform.api.hap.Characteristic
     this.operationTime = parseInt(platform.cusG.get(accessory.context.eweDeviceId).operationTime)
     this.operationTime = isNaN(this.operationTime)
       ? this.helpers.defaults.operationTime
@@ -18,13 +18,13 @@ module.exports = class deviceGarageFour {
     ;['A', 'B', 'C', 'D'].forEach(v => {
       let gdService
       if (!(gdService = accessory.getService('Garage ' + v))) {
-        accessory.addService(this.Service.GarageDoorOpener, 'Garage ' + v, 'garage' + v)
-          .setCharacteristic(this.Characteristic.CurrentDoorState, 1)
-          .setCharacteristic(this.Characteristic.TargetDoorState, 1)
-          .setCharacteristic(this.Characteristic.ObstructionDetected, false)
+        accessory.addService(this.S.GarageDoorOpener, 'Garage ' + v, 'garage' + v)
+          .setCharacteristic(this.C.CurrentDoorState, 1)
+          .setCharacteristic(this.C.TargetDoorState, 1)
+          .setCharacteristic(this.C.ObstructionDetected, false)
         gdService = accessory.getService('Garage ' + v)
       }
-      gdService.getCharacteristic(this.Characteristic.TargetDoorState)
+      gdService.getCharacteristic(this.C.TargetDoorState)
         .on('set', (value, callback) => this.internalUpdate(v, value, callback))
     })
     this.accessory = accessory
@@ -56,8 +56,8 @@ module.exports = class deviceGarageFour {
       this.inUse = true
       const updateKey = Math.random().toString(36).substr(2, 8)
       this.updateKey = updateKey
-      gdService.updateCharacteristic(this.Characteristic.TargetDoorState, value)
-        .updateCharacteristic(this.Characteristic.CurrentDoorState, value + 2)
+      gdService.updateCharacteristic(this.C.TargetDoorState, value)
+        .updateCharacteristic(this.C.CurrentDoorState, value + 2)
       this.accessory.context.cacheStates[garageChannel].cacheTargetDoorState = value
       this.accessory.context.cacheStates[garageChannel].cacheCurrentDoorState = value + 2
       const params = { switches: this.helpers.defaultMultiSwitchOff }
@@ -69,7 +69,7 @@ module.exports = class deviceGarageFour {
       if (this.updateKey !== updateKey) {
         return
       }
-      gdService.updateCharacteristic(this.Characteristic.CurrentDoorState, value)
+      gdService.updateCharacteristic(this.C.CurrentDoorState, value)
       this.accessory.context.cacheStates[garageChannel].cacheCurrentDoorState = value
       if (!this.disableDeviceLogging) {
         this.log('[%s] current state [garage %s %s].', this.accessory.displayName, garageChannel, value === 0 ? 'open' : 'closed')
diff --git a/lib/device/garage-one.js b/lib/device/garage-one.js
index 80148949..06e739a7 100644
--- a/lib/device/garage-one.js
+++ b/lib/device/garage-one.js
@@ -7,8 +7,8 @@ module.exports = class deviceGarageOne {
     this.log = platform.log
     this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.helpers = platform.helpers
-    this.Service = platform.api.hap.Service
-    this.Characteristic = platform.api.hap.Characteristic
+    this.S = platform.api.hap.Service
+    this.C = platform.api.hap.Characteristic
     const asConfig = platform.cusG.get(accessory.context.eweDeviceId)
     if (!['oneSwitch', 'twoSwitch'].includes(asConfig.setup)) {
       this.error = 'setup must be oneSwitch or twoSwitch'
@@ -29,14 +29,14 @@ module.exports = class deviceGarageOne {
       }
       this.definedSensor = this.platform.devicesInHB.get(asConfig.sensorId + 'SWX')
     }
-    if (!(this.service = accessory.getService(this.Service.GarageDoorOpener))) {
-      accessory.addService(this.Service.GarageDoorOpener)
-        .setCharacteristic(this.Characteristic.CurrentDoorState, 1)
-        .setCharacteristic(this.Characteristic.TargetDoorState, 1)
-        .setCharacteristic(this.Characteristic.ObstructionDetected, false)
-      this.service = accessory.getService(this.Service.GarageDoorOpener)
+    if (!(this.service = accessory.getService(this.S.GarageDoorOpener))) {
+      accessory.addService(this.S.GarageDoorOpener)
+        .setCharacteristic(this.C.CurrentDoorState, 1)
+        .setCharacteristic(this.C.TargetDoorState, 1)
+        .setCharacteristic(this.C.ObstructionDetected, false)
+      this.service = accessory.getService(this.S.GarageDoorOpener)
     }
-    this.service.getCharacteristic(this.Characteristic.TargetDoorState)
+    this.service.getCharacteristic(this.C.TargetDoorState)
       .on('set', this.internalUpdate.bind(this))
     this.accessory = accessory
   }
@@ -52,7 +52,7 @@ module.exports = class deviceGarageOne {
       const params = {}
       let delay = 0
       const prevState = this.definedSensor
-        ? this.definedSensor.getService(this.Service.ContactSensor).getCharacteristic(this.Characteristic.ContactSensorState).value === 0
+        ? this.definedSensor.getService(this.S.ContactSensor).getCharacteristic(this.C.ContactSensorState).value === 0
           ? 1
           : 0
         : this.accessory.context.cacheCurrentDoorState
@@ -62,7 +62,7 @@ module.exports = class deviceGarageOne {
       this.inUse = true
       this.cacheState = value
       if (this.setup === 'oneSwitch' && [2, 3].includes(prevState)) {
-        this.service.updateCharacteristic(this.Characteristic.CurrentDoorState, ((prevState * 2) % 3) + 2)
+        this.service.updateCharacteristic(this.C.CurrentDoorState, ((prevState * 2) % 3) + 2)
         this.accessory.context.cacheCurrentDoorState = ((prevState * 2) % 3) + 2
         delay = 1500
       }
@@ -70,8 +70,8 @@ module.exports = class deviceGarageOne {
         return
       }
       await this.helpers.sleep(delay)
-      this.service.updateCharacteristic(this.Characteristic.TargetDoorState, newPos)
-        .updateCharacteristic(this.Characteristic.CurrentDoorState, newPos + 2)
+      this.service.updateCharacteristic(this.C.TargetDoorState, newPos)
+        .updateCharacteristic(this.C.CurrentDoorState, newPos + 2)
       this.accessory.context.cacheTargetDoorState = newPos
       this.accessory.context.cacheCurrentDoorState = newPos + 2
       switch (this.setup) {
@@ -89,7 +89,7 @@ module.exports = class deviceGarageOne {
       this.inUse = false
       await this.helpers.sleep(Math.max((this.operationTime - 20) * 100, 0))
       if (!this.definedSensor) {
-        this.service.updateCharacteristic(this.Characteristic.CurrentDoorState, newPos)
+        this.service.updateCharacteristic(this.C.CurrentDoorState, newPos)
         this.accessory.context.cacheCurrentDoorState = newPos
         if (!this.disableDeviceLogging) {
           this.log('[%s] current state [%s].', this.accessory.displayName, newPos === 0 ? 'open' : 'closed')
@@ -128,14 +128,14 @@ module.exports = class deviceGarageOne {
           break
       }
       this.inUse = true
-      this.service.updateCharacteristic(this.Characteristic.TargetDoorState, newPos - 2)
-        .updateCharacteristic(this.Characteristic.CurrentDoorState, newPos)
+      this.service.updateCharacteristic(this.C.TargetDoorState, newPos - 2)
+        .updateCharacteristic(this.C.CurrentDoorState, newPos)
       this.accessory.context.cacheCurrentDoorState = newPos
       this.accessory.context.cacheTargetDoorState = newPos - 2
       await this.helpers.sleep(2000)
       this.inUse = false
       await this.helpers.sleep(Math.max((this.operationTime - 20) * 100, 0))
-      this.service.updateCharacteristic(this.Characteristic.CurrentDoorState, newPos - 2)
+      this.service.updateCharacteristic(this.C.CurrentDoorState, newPos - 2)
       this.accessory.context.cacheCurrentDoorState = newPos - 2
       if (!this.disableDeviceLogging) {
         this.log('[%s] current state [%s].', this.accessory.displayName, newPos === 2 ? 'open' : 'closed')
diff --git a/lib/device/garage-two.js b/lib/device/garage-two.js
index 55ffc4b8..e8b28ffb 100644
--- a/lib/device/garage-two.js
+++ b/lib/device/garage-two.js
@@ -7,8 +7,8 @@ module.exports = class deviceGarageTwo {
     this.log = platform.log
     this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.helpers = platform.helpers
-    this.Service = platform.api.hap.Service
-    this.Characteristic = platform.api.hap.Characteristic
+    this.S = platform.api.hap.Service
+    this.C = platform.api.hap.Characteristic
     this.operationTime = parseInt(platform.cusG.get(accessory.context.eweDeviceId).operationTime)
     this.operationTime = isNaN(this.operationTime)
       ? this.helpers.defaults.operationTime
@@ -18,13 +18,13 @@ module.exports = class deviceGarageTwo {
     ;['1', '2'].forEach(v => {
       let gdService
       if (!(gdService = accessory.getService('Garage ' + v))) {
-        accessory.addService(this.Service.GarageDoorOpener, 'Garage ' + v, 'garage' + v)
-          .setCharacteristic(this.Characteristic.CurrentDoorState, 1)
-          .setCharacteristic(this.Characteristic.TargetDoorState, 1)
-          .setCharacteristic(this.Characteristic.ObstructionDetected, false)
+        accessory.addService(this.S.GarageDoorOpener, 'Garage ' + v, 'garage' + v)
+          .setCharacteristic(this.C.CurrentDoorState, 1)
+          .setCharacteristic(this.C.TargetDoorState, 1)
+          .setCharacteristic(this.C.ObstructionDetected, false)
         gdService = accessory.getService('Garage ' + v)
       }
-      gdService.getCharacteristic(this.Characteristic.TargetDoorState)
+      gdService.getCharacteristic(this.C.TargetDoorState)
         .on('set', (value, callback) => this.internalUpdate('Garage' + v, value, callback))
     })
     this.accessory = accessory
@@ -43,8 +43,8 @@ module.exports = class deviceGarageTwo {
         return
       }
       this.inUse = true
-      gdService.updateCharacteristic(this.Characteristic.TargetDoorState, newPos)
-        .updateCharacteristic(this.Characteristic.CurrentDoorState, newPos + 2)
+      gdService.updateCharacteristic(this.C.TargetDoorState, newPos)
+        .updateCharacteristic(this.C.CurrentDoorState, newPos + 2)
       switch (garage) {
         case 'Garage 1': {
           this.accessory.context.cacheOneTargetDoorState = newPos
@@ -65,7 +65,7 @@ module.exports = class deviceGarageTwo {
       await this.helpers.sleep(2000)
       this.inUse = false
       await this.helpers.sleep(Math.max((this.operationTime - 20) * 100, 0))
-      gdService.updateCharacteristic(this.Characteristic.CurrentDoorState, newPos)
+      gdService.updateCharacteristic(this.C.CurrentDoorState, newPos)
       switch (garage) {
         case 'Garage 1': {
           this.accessory.context.cacheOneCurrentDoorState = newPos
@@ -119,8 +119,8 @@ module.exports = class deviceGarageTwo {
             break
         }
         this.inUse = true
-        gcService.updateCharacteristic(this.Characteristic.TargetDoorState, newPos - 2)
-          .updateCharacteristic(this.Characteristic.CurrentDoorState, newPos)
+        gcService.updateCharacteristic(this.C.TargetDoorState, newPos - 2)
+          .updateCharacteristic(this.C.CurrentDoorState, newPos)
         switch (v) {
           case '1':
             this.accessory.context.cacheOneCurrentDoorState = newPos
@@ -134,7 +134,7 @@ module.exports = class deviceGarageTwo {
         await this.helpers.sleep(2000)
         this.inUse = false
         await this.helpers.sleep(Math.max((this.operationTime - 20) * 100, 0))
-        gcService.updateCharacteristic(this.Characteristic.CurrentDoorState, newPos - 2)
+        gcService.updateCharacteristic(this.C.CurrentDoorState, newPos - 2)
         switch (v) {
           case '1':
             this.accessory.context.cacheOneCurrentDoorState = newPos - 2
diff --git a/lib/device/light-colour.js b/lib/device/light-colour.js
index 80f578d9..caec35b5 100644
--- a/lib/device/light-colour.js
+++ b/lib/device/light-colour.js
@@ -8,31 +8,31 @@ module.exports = class deviceLightColour {
     this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.helpers = platform.helpers
     this.colourUtils = platform.colourUtils
-    this.Service = platform.api.hap.Service
-    this.Characteristic = platform.api.hap.Characteristic
+    this.S = platform.api.hap.Service
+    this.C = platform.api.hap.Characteristic
     this.isB1 = accessory.context.eweUIID === 22
-    this.service = accessory.getService(this.Service.Lightbulb) || accessory.addService(this.Service.Lightbulb)
-    this.service.getCharacteristic(this.Characteristic.On)
+    this.service = accessory.getService(this.S.Lightbulb) || accessory.addService(this.S.Lightbulb)
+    this.service.getCharacteristic(this.C.On)
       .on('set', this.internalOnOffUpdate.bind(this))
-    this.service.getCharacteristic(this.Characteristic.Brightness)
+    this.service.getCharacteristic(this.C.Brightness)
       .on('set', this.internalBrightnessUpdate.bind(this))
-    this.service.getCharacteristic(this.Characteristic.Hue)
+    this.service.getCharacteristic(this.C.Hue)
       .on('set', this.internalColourUpdate.bind(this))
-    this.service.getCharacteristic(this.Characteristic.Saturation)
+    this.service.getCharacteristic(this.C.Saturation)
       .on('set', (value, callback) => callback())
     if (accessory.context.eweUIID === 22) {
       // *** B1 doesn't support brightness *** \\
-      this.service.getCharacteristic(this.Characteristic.Brightness)
+      this.service.getCharacteristic(this.C.Brightness)
         .setProps({ minStep: 100 })
     }
     this.accessory = accessory
     if ([59, 104].includes(accessory.context.eweUIID)) {
       // HomeKit has a range of 140-500M corresponding to 2000-7143K
       // Devices have a range of 2700K-6500K corresponding to ewelink ct: 0-255
-      this.service.getCharacteristic(this.Characteristic.ColorTemperature)
+      this.service.getCharacteristic(this.C.ColorTemperature)
         .on('set', this.internalCTempUpdate.bind(this))
       if (platform.api.versionGreaterOrEqual && platform.api.versionGreaterOrEqual('1.3.0-beta.46')) {
-        this.cacheBrightness = this.service.getCharacteristic(this.Characteristic.Brightness).value
+        this.cacheBrightness = this.service.getCharacteristic(this.C.Brightness).value
         this.alController = new platform.api.hap.AdaptiveLightingController(this.service)
         this.accessory.configureController(this.alController)
       }
@@ -134,10 +134,10 @@ module.exports = class deviceLightColour {
         return
       }
       this.cacheHue = value
-      this.service.updateCharacteristic(this.Characteristic.ColorTemperature, 140)
+      this.service.updateCharacteristic(this.C.ColorTemperature, 140)
       callback()
       let params
-      const newRGB = this.colourUtils.hs2rgb(value, this.service.getCharacteristic(this.Characteristic.Saturation).value)
+      const newRGB = this.colourUtils.hs2rgb(value, this.service.getCharacteristic(this.C.Saturation).value)
       this.cacheR = newRGB[0]
       this.cacheG = newRGB[1]
       this.cacheB = newRGB[2]
@@ -207,8 +207,8 @@ module.exports = class deviceLightColour {
       this.cacheMired = value
       const hs = this.colourUtils.m2hs(this.cacheMired)
       this.cacheHue = hs[0]
-      this.service.updateCharacteristic(this.Characteristic.Hue, this.cacheHue)
-        .updateCharacteristic(this.Characteristic.Saturation, hs[1])
+      this.service.updateCharacteristic(this.C.Hue, this.cacheHue)
+        .updateCharacteristic(this.C.Saturation, hs[1])
       callback()
       const mToK = Math.max(Math.min(Math.round(1000000 / value), 6500), 2700)
       this.cacheCT = Math.round(((mToK - 2700) / 3800) * 255)
@@ -221,7 +221,7 @@ module.exports = class deviceLightColour {
           // *** L1 *** \\
           const newRGB = this.colourUtils.hs2rgb(
             hs[0],
-            this.service.getCharacteristic(this.Characteristic.Saturation).value
+            this.service.getCharacteristic(this.C.Saturation).value
           )
           this.cacheR = newRGB[0]
           this.cacheG = newRGB[1]
@@ -277,8 +277,8 @@ module.exports = class deviceLightColour {
         (!this.isB1 && params.switch && params.switch !== this.cacheOnOff)
       ) {
         this.cacheOnOff = this.isB1 ? params.state : params.switch
-        this.service.updateCharacteristic(this.Characteristic.On, this.cacheOnOff === 'on')
-        if (this.isB1) this.service.updateCharacteristic(this.Characteristic.Brightness, this.cacheOnOff === 'on' ? 100 : 0)
+        this.service.updateCharacteristic(this.C.On, this.cacheOnOff === 'on')
+        if (this.isB1) this.service.updateCharacteristic(this.C.Brightness, this.cacheOnOff === 'on' ? 100 : 0)
         if (params.updateSource && !this.disableDeviceLogging) {
           this.log('[%s] current state [%s].', this.accessory.displayName, this.cacheOnOff)
         }
@@ -307,9 +307,9 @@ module.exports = class deviceLightColour {
                 this.cacheB = parseInt(params.channel4)
                 hs = this.colourUtils.rgb2hs(this.cacheR, this.cacheG, this.cacheB)
                 this.cacheHue = hs[0]
-                this.service.updateCharacteristic(this.Characteristic.Hue, this.cacheHue)
-                  .updateCharacteristic(this.Characteristic.Saturation, 100)
-                  .updateCharacteristic(this.Characteristic.Brightness, 100)
+                this.service.updateCharacteristic(this.C.Hue, this.cacheHue)
+                  .updateCharacteristic(this.C.Saturation, 100)
+                  .updateCharacteristic(this.C.Brightness, 100)
                 if (params.updateSource && !this.disableDeviceLogging) {
                   this.log(
                     '[%s] current colour [rgb %s %s %s].',
@@ -330,7 +330,7 @@ module.exports = class deviceLightColour {
           if (this.helpers.hasProperty(params, 'bright')) {
             if (params.bright !== this.cacheBrightness) {
               this.cacheBrightness = params.bright
-              this.service.updateCharacteristic(this.Characteristic.Brightness, this.cacheBrightness)
+              this.service.updateCharacteristic(this.C.Brightness, this.cacheBrightness)
               if (params.updateSource && !this.disableDeviceLogging) {
                 this.log('[%s] current brightness [%s%].', this.accessory.displayName, this.cacheBrightness)
               }
@@ -344,8 +344,8 @@ module.exports = class deviceLightColour {
               hs = this.colourUtils.rgb2hs(this.cacheR, this.cacheG, this.cacheB)
               this.cacheHue = hs[0]
               this.cacheMired = 140
-              this.service.updateCharacteristic(this.Characteristic.Hue, this.cacheHue)
-                .updateCharacteristic(this.Characteristic.Saturation, hs[1])
+              this.service.updateCharacteristic(this.C.Hue, this.cacheHue)
+                .updateCharacteristic(this.C.Saturation, hs[1])
               if (params.updateSource) {
                 if (!this.disableDeviceLogging) {
                   this.log(
@@ -368,7 +368,7 @@ module.exports = class deviceLightColour {
             if (this.helpers.hasProperty(params.color, 'br')) {
               if (params.color.br !== this.cacheBrightness) {
                 this.cacheBrightness = params.color.br
-                this.service.updateCharacteristic(this.Characteristic.Brightness, this.cacheBrightness)
+                this.service.updateCharacteristic(this.C.Brightness, this.cacheBrightness)
                 if (params.updateSource && !this.disableDeviceLogging) {
                   this.log('[%s] current brightness [%s%].', this.accessory.displayName, this.cacheBrightness)
                 }
@@ -388,9 +388,9 @@ module.exports = class deviceLightColour {
                 this.cacheMired = 140
                 hs = this.colourUtils.rgb2hs(this.cacheR, this.cacheG, this.cacheB)
                 this.cacheHue = hs[0]
-                this.service.updateCharacteristic(this.Characteristic.ColorTemperature, 140)
-                  .updateCharacteristic(this.Characteristic.Hue, this.cacheHue)
-                  .updateCharacteristic(this.Characteristic.Saturation, 100)
+                this.service.updateCharacteristic(this.C.ColorTemperature, 140)
+                  .updateCharacteristic(this.C.Hue, this.cacheHue)
+                  .updateCharacteristic(this.C.Saturation, 100)
                 if (params.updateSource && !this.disableDeviceLogging) {
                   this.log(
                     '[%s] current colour [rgb %s %s %s].',
@@ -405,7 +405,7 @@ module.exports = class deviceLightColour {
             if (this.helpers.hasProperty(params.white, 'br')) {
               if (params.white.br !== this.cacheBrightness || this.cacheMode !== 'white') {
                 this.cacheBrightness = params.white.br
-                this.service.updateCharacteristic(this.Characteristic.Brightness, this.cacheBrightness)
+                this.service.updateCharacteristic(this.C.Brightness, this.cacheBrightness)
                 if (params.updateSource && !this.disableDeviceLogging) {
                   this.log('[%s] current brightness [%s%].', this.accessory.displayName, this.cacheBrightness)
                 }
@@ -418,9 +418,9 @@ module.exports = class deviceLightColour {
               this.cacheMired = Math.max(Math.min(Math.round(1000000 / ctToK), 500), 140)
               hs = this.colourUtils.m2hs(this.cacheMired)
               this.cacheHue = hs[0]
-              this.service.updateCharacteristic(this.Characteristic.Hue, this.cacheHue)
-                .updateCharacteristic(this.Characteristic.Saturation, hs[1])
-                .updateCharacteristic(this.Characteristic.ColorTemperature, this.cacheMired)
+              this.service.updateCharacteristic(this.C.Hue, this.cacheHue)
+                .updateCharacteristic(this.C.Saturation, hs[1])
+                .updateCharacteristic(this.C.ColorTemperature, this.cacheMired)
               if (params.updateSource) {
                 if (!this.disableDeviceLogging) {
                   this.log('[%s] current cct [%sK].', this.accessory.displayName, ctToK)
diff --git a/lib/device/light-ctemp.js b/lib/device/light-ctemp.js
index 0278f357..75e42505 100644
--- a/lib/device/light-ctemp.js
+++ b/lib/device/light-ctemp.js
@@ -7,14 +7,14 @@ module.exports = class deviceLightColour {
     this.log = platform.log
     this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.helpers = platform.helpers
-    this.Service = platform.api.hap.Service
-    this.Characteristic = platform.api.hap.Characteristic
-    this.service = accessory.getService(this.Service.Lightbulb) || accessory.addService(this.Service.Lightbulb)
-    this.service.getCharacteristic(this.Characteristic.On)
+    this.S = platform.api.hap.Service
+    this.C = platform.api.hap.Characteristic
+    this.service = accessory.getService(this.S.Lightbulb) || accessory.addService(this.S.Lightbulb)
+    this.service.getCharacteristic(this.C.On)
       .on('set', this.internalOnOffUpdate.bind(this))
-    this.service.getCharacteristic(this.Characteristic.Brightness)
+    this.service.getCharacteristic(this.C.Brightness)
       .on('set', this.internalBrightnessUpdate.bind(this))
-    this.service.getCharacteristic(this.Characteristic.ColorTemperature)
+    this.service.getCharacteristic(this.C.ColorTemperature)
       .on('set', this.internalCTempUpdate.bind(this))
     if ((this.platform.config.bulbB02FST64 || '').split(',').includes(accessory.context.eweDeviceId)) {
       this.minK = 1800
@@ -28,7 +28,7 @@ module.exports = class deviceLightColour {
     }
     this.accessory = accessory
     if (platform.api.versionGreaterOrEqual && platform.api.versionGreaterOrEqual('1.3.0-beta.46')) {
-      this.cacheBrightness = this.service.getCharacteristic(this.Characteristic.Brightness).value
+      this.cacheBrightness = this.service.getCharacteristic(this.C.Brightness).value
       this.alController = new platform.api.hap.AdaptiveLightingController(this.service)
       this.accessory.configureController(this.alController)
     }
@@ -137,7 +137,7 @@ module.exports = class deviceLightColour {
       }
       if (params.switch && params.switch !== this.cacheOnOff) {
         this.cacheOnOff = params.switch
-        this.service.updateCharacteristic(this.Characteristic.On, this.cacheOnOff === 'on')
+        this.service.updateCharacteristic(this.C.On, this.cacheOnOff === 'on')
         if (params.updateSource && !this.disableDeviceLogging) {
           this.log('[%s] current state [%s].', this.accessory.displayName, this.cacheOnOff)
         }
@@ -145,7 +145,7 @@ module.exports = class deviceLightColour {
       if (params.white) {
         if (this.helpers.hasProperty(params.white, 'br') && this.cacheBrightness !== params.white.br) {
           this.cacheBrightness = params.white.br
-          this.service.updateCharacteristic(this.Characteristic.Brightness, this.cacheBrightness)
+          this.service.updateCharacteristic(this.C.Brightness, this.cacheBrightness)
           if (params.updateSource && !this.disableDeviceLogging) {
             this.log('[%s] current brightness [%s%].', this.accessory.displayName, this.cacheBrightness)
           }
@@ -154,7 +154,7 @@ module.exports = class deviceLightColour {
           this.cacheCT = params.white.ct
           const ctToK = Math.round(this.cacheCT / 255 * (this.maxK - this.minK) + this.minK)
           this.cacheMired = Math.min(Math.max(Math.round(1000000 / ctToK), 140), 500)
-          this.service.updateCharacteristic(this.Characteristic.ColorTemperature, this.cacheMired)
+          this.service.updateCharacteristic(this.C.ColorTemperature, this.cacheMired)
           if (params.updateSource) {
             if (!this.disableDeviceLogging) {
               this.log('[%s] current cct [%sK].', this.accessory.displayName, ctToK)
diff --git a/lib/device/light-dimmer.js b/lib/device/light-dimmer.js
index f68e1546..c08d8448 100644
--- a/lib/device/light-dimmer.js
+++ b/lib/device/light-dimmer.js
@@ -7,12 +7,12 @@ module.exports = class deviceLightDimmer {
     this.log = platform.log
     this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.helpers = platform.helpers
-    this.Service = platform.api.hap.Service
-    this.Characteristic = platform.api.hap.Characteristic
-    this.service = accessory.getService(this.Service.Lightbulb) || accessory.addService(this.Service.Lightbulb)
-    this.service.getCharacteristic(this.Characteristic.On)
+    this.S = platform.api.hap.Service
+    this.C = platform.api.hap.Characteristic
+    this.service = accessory.getService(this.S.Lightbulb) || accessory.addService(this.S.Lightbulb)
+    this.service.getCharacteristic(this.C.On)
       .on('set', this.internalOnOffUpdate.bind(this))
-    this.service.getCharacteristic(this.Characteristic.Brightness)
+    this.service.getCharacteristic(this.C.Brightness)
       .on('set', this.internalBrightnessUpdate.bind(this))
     this.accessory = accessory
   }
@@ -74,7 +74,7 @@ module.exports = class deviceLightDimmer {
   async externalUpdate (params) {
     try {
       if (params.switch && params.switch !== this.cacheOnOff) {
-        this.service.updateCharacteristic(this.Characteristic.On, params.switch === 'on')
+        this.service.updateCharacteristic(this.C.On, params.switch === 'on')
         this.cacheOnOff = params.switch
         if (params.updateSource && !this.disableDeviceLogging) {
           this.log('[%s] current state [%s].', this.accessory.displayName, params.switch)
@@ -86,7 +86,7 @@ module.exports = class deviceLightDimmer {
           if (this.helpers.hasProperty(params, 'bright')) {
             const nb = Math.round(((params.bright - 10) * 10) / 9)
             if (nb !== this.cacheBrightness) {
-              this.service.updateCharacteristic(this.Characteristic.Brightness, nb)
+              this.service.updateCharacteristic(this.C.Brightness, nb)
               this.cacheBrightness = nb
               if (params.updateSource && !this.disableDeviceLogging) {
                 this.log('[%s] current brightness [%s%].', this.accessory.displayName, nb)
@@ -98,7 +98,7 @@ module.exports = class deviceLightDimmer {
           // *** D1 eWeLink scale matches HomeKit scale of 0-100 *** \\
           if (this.helpers.hasProperty(params, 'brightness')) {
             if (params.brightness !== this.cacheBrightness) {
-              this.service.updateCharacteristic(this.Characteristic.Brightness, params.brightness)
+              this.service.updateCharacteristic(this.C.Brightness, params.brightness)
               this.cacheBrightness = params.brightness
               if (params.updateSource && !this.disableDeviceLogging) {
                 this.log('[%s] current brightness [%s%].', this.accessory.displayName, params.brightness)
diff --git a/lib/device/lock-one.js b/lib/device/lock-one.js
index 6f7c0cbf..bfcc4fcc 100644
--- a/lib/device/lock-one.js
+++ b/lib/device/lock-one.js
@@ -7,8 +7,8 @@ module.exports = class deviceLockOne {
     this.log = platform.log
     this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.helpers = platform.helpers
-    this.Service = platform.api.hap.Service
-    this.Characteristic = platform.api.hap.Characteristic
+    this.S = platform.api.hap.Service
+    this.C = platform.api.hap.Characteristic
     const asConfig = platform.cusG.get(accessory.context.eweDeviceId)
     if (!['oneSwitch', 'twoSwitch'].includes(asConfig.setup)) {
       this.error = 'setup must be oneSwitch or twoSwitch'
@@ -20,11 +20,11 @@ module.exports = class deviceLockOne {
       : this.operationTime < 20
         ? this.helpers.defaults.operationTime
         : this.operationTime
-    this.service = accessory.getService(this.Service.LockMechanism) || accessory.addService(this.Service.LockMechanism)
-    this.service.getCharacteristic(this.Characteristic.LockTargetState)
+    this.service = accessory.getService(this.S.LockMechanism) || accessory.addService(this.S.LockMechanism)
+    this.service.getCharacteristic(this.C.LockTargetState)
       .on('set', this.internalUpdate.bind(this))
-    this.service.updateCharacteristic(this.Characteristic.LockCurrentState, 1)
-      .updateCharacteristic(this.Characteristic.LockTargetState, 1)
+    this.service.updateCharacteristic(this.C.LockCurrentState, 1)
+      .updateCharacteristic(this.C.LockTargetState, 1)
     this.accessory = accessory
   }
 
@@ -51,8 +51,8 @@ module.exports = class deviceLockOne {
         this.log('[%s] current status [unlocked].', this.accessory.displayName)
       }
       await this.helpers.sleep(Math.max(this.operationTime * 100, 1000))
-      this.service.updateCharacteristic(this.Characteristic.LockTargetState, 1)
-        .updateCharacteristic(this.Characteristic.LockCurrentState, 1)
+      this.service.updateCharacteristic(this.C.LockTargetState, 1)
+        .updateCharacteristic(this.C.LockCurrentState, 1)
       this.inUse = false
       if (!this.disableDeviceLogging) {
         this.log('[%s] current status [locked].', this.accessory.displayName)
@@ -85,14 +85,14 @@ module.exports = class deviceLockOne {
           break
       }
       this.inUse = true
-      this.service.updateCharacteristic(this.Characteristic.LockCurrentState, 0)
-        .updateCharacteristic(this.Characteristic.LockTargetState, 0)
+      this.service.updateCharacteristic(this.C.LockCurrentState, 0)
+        .updateCharacteristic(this.C.LockTargetState, 0)
       if (params.updateSource && !this.disableDeviceLogging) {
         this.log('[%s] current status [unlocked].', this.accessory.displayName)
       }
       await this.helpers.sleep(Math.max(this.operationTime * 100, 1000))
-      this.service.updateCharacteristic(this.Characteristic.LockCurrentState, 1)
-        .updateCharacteristic(this.Characteristic.LockTargetState, 1)
+      this.service.updateCharacteristic(this.C.LockCurrentState, 1)
+        .updateCharacteristic(this.C.LockTargetState, 1)
       this.inUse = false
       if (params.updateSource && !this.disableDeviceLogging) {
         this.log('[%s] current status [locked].', this.accessory.displayName)
diff --git a/lib/device/outlet.js b/lib/device/outlet.js
index a7dc88c5..bfb438e9 100644
--- a/lib/device/outlet.js
+++ b/lib/device/outlet.js
@@ -8,8 +8,8 @@ module.exports = class deviceOutlet {
     this.log = platform.log
     this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.helpers = platform.helpers
-    this.Service = platform.api.hap.Service
-    this.Characteristic = platform.api.hap.Characteristic
+    this.S = platform.api.hap.Service
+    this.C = platform.api.hap.Characteristic
     this.inUsePowerThreshold = parseInt(this.platform.config.inUsePowerThreshold)
     this.inUsePowerThreshold = isNaN(this.inUsePowerThreshold)
       ? this.helpers.defaults.inUsePowerThreshold
@@ -18,66 +18,66 @@ module.exports = class deviceOutlet {
         : this.inUsePowerThreshold
     const self = this
     this.eveCurrentConsumption = function () {
-      self.Characteristic.call(this, 'Current Consumption', self.helpers.eveUUID.currentConsumption)
+      self.C.call(this, 'Current Consumption', self.helpers.eveUUID.currentConsumption)
       this.setProps({
-        format: self.Characteristic.Formats.UINT16,
+        format: self.C.Formats.UINT16,
         unit: 'W',
         maxValue: 100000,
         minValue: 0,
         minStep: 1,
-        perms: [self.Characteristic.Perms.READ, self.Characteristic.Perms.NOTIFY]
+        perms: [self.C.Perms.READ, self.C.Perms.NOTIFY]
       })
       this.value = this.getDefaultValue()
     }
     this.eveTotalConsumption = function () {
-      self.Characteristic.call(this, 'Total Consumption', self.helpers.eveUUID.totalConsumption)
+      self.C.call(this, 'Total Consumption', self.helpers.eveUUID.totalConsumption)
       this.setProps({
-        format: self.Characteristic.Formats.FLOAT,
+        format: self.C.Formats.FLOAT,
         unit: 'kWh',
         maxValue: 100000000000,
         minValue: 0,
         minStep: 0.01,
-        perms: [self.Characteristic.Perms.READ, self.Characteristic.Perms.NOTIFY]
+        perms: [self.C.Perms.READ, self.C.Perms.NOTIFY]
       })
       this.value = this.getDefaultValue()
     }
     this.eveVoltage = function () {
-      self.Characteristic.call(this, 'Voltage', self.helpers.eveUUID.voltage)
+      self.C.call(this, 'Voltage', self.helpers.eveUUID.voltage)
       this.setProps({
-        format: self.Characteristic.Formats.FLOAT,
+        format: self.C.Formats.FLOAT,
         unit: 'V',
         maxValue: 100000000000,
         minValue: 0,
         minStep: 1,
-        perms: [self.Characteristic.Perms.READ, self.Characteristic.Perms.NOTIFY]
+        perms: [self.C.Perms.READ, self.C.Perms.NOTIFY]
       })
       this.value = this.getDefaultValue()
     }
     this.eveElectricCurrent = function () {
-      self.Characteristic.call(this, 'Electric Current', self.helpers.eveUUID.electricCurrent)
+      self.C.call(this, 'Electric Current', self.helpers.eveUUID.electricCurrent)
       this.setProps({
-        format: self.Characteristic.Formats.FLOAT,
+        format: self.C.Formats.FLOAT,
         unit: 'A',
         maxValue: 100000000000,
         minValue: 0,
         minStep: 0.1,
-        perms: [self.Characteristic.Perms.READ, self.Characteristic.Perms.NOTIFY]
+        perms: [self.C.Perms.READ, self.C.Perms.NOTIFY]
       })
       this.value = this.getDefaultValue()
     }
     this.eveResetTotal = function () {
-      self.Characteristic.call(this, 'Reset Total', self.helpers.eveUUID.resetTotal)
+      self.C.call(this, 'Reset Total', self.helpers.eveUUID.resetTotal)
       this.setProps({
-        format: self.Characteristic.Formats.UINT32,
-        perms: [self.Characteristic.Perms.READ, self.Characteristic.Perms.NOTIFY, self.Characteristic.Perms.WRITE]
+        format: self.C.Formats.UINT32,
+        perms: [self.C.Perms.READ, self.C.Perms.NOTIFY, self.C.Perms.WRITE]
       })
       this.value = this.getDefaultValue()
     }
-    util.inherits(this.eveCurrentConsumption, this.Characteristic)
-    util.inherits(this.eveTotalConsumption, this.Characteristic)
-    util.inherits(this.eveVoltage, this.Characteristic)
-    util.inherits(this.eveElectricCurrent, this.Characteristic)
-    util.inherits(this.eveResetTotal, this.Characteristic)
+    util.inherits(this.eveCurrentConsumption, this.C)
+    util.inherits(this.eveTotalConsumption, this.C)
+    util.inherits(this.eveVoltage, this.C)
+    util.inherits(this.eveElectricCurrent, this.C)
+    util.inherits(this.eveResetTotal, this.C)
     this.eveCurrentConsumption.UUID = this.helpers.eveUUID.currentConsumption
     this.eveTotalConsumption.UUID = this.helpers.eveUUID.totalConsumption
     this.eveVoltage.UUID = this.helpers.eveUUID.voltage
@@ -85,18 +85,18 @@ module.exports = class deviceOutlet {
     this.eveResetTotal.UUID = this.helpers.eveUUID.resetTotal
     if (!this.helpers.hasProperty(accessory.context, 'energyReadings')) accessory.context.energyReadings = []
     if (!this.helpers.hasProperty(accessory.context, 'energyReadingTotal')) accessory.context.energyReadingTotal = 0
-    if (accessory.getService(this.Service.Switch)) {
-      accessory.removeService(accessory.getService(this.Service.Switch))
+    if (accessory.getService(this.S.Switch)) {
+      accessory.removeService(accessory.getService(this.S.Switch))
     }
-    if (!(this.service = accessory.getService(this.Service.Outlet))) {
-      this.service = accessory.addService(this.Service.Outlet)
+    if (!(this.service = accessory.getService(this.S.Outlet))) {
+      this.service = accessory.addService(this.S.Outlet)
       this.service.addCharacteristic(this.eveVoltage)
       this.service.addCharacteristic(this.eveCurrentConsumption)
       this.service.addCharacteristic(this.eveElectricCurrent)
       this.service.addCharacteristic(this.eveTotalConsumption)
       this.service.addCharacteristic(this.eveResetTotal)
     }
-    this.service.getCharacteristic(this.Characteristic.On)
+    this.service.getCharacteristic(this.C.On)
       .on('set', this.internalUpdate.bind(this))
     this.service.getCharacteristic(this.eveResetTotal)
       .on('set', (value, callback) => {
@@ -141,21 +141,21 @@ module.exports = class deviceOutlet {
   async externalUpdate (params) {
     try {
       if (params.switch && params.switch !== this.cacheOnOff) {
-        this.service.updateCharacteristic(this.Characteristic.On, params.switch === 'on')
+        this.service.updateCharacteristic(this.C.On, params.switch === 'on')
         this.cacheOnOff = params.switch
         if (params.updateSource && !this.disableDeviceLogging) {
           this.log('[%s] current state [%s].', this.accessory.displayName, params.switch)
         }
         if (!this.accessory.context.powerReadings) {
-          this.service.updateCharacteristic(this.Characteristic.OutletInUse, params.switch === 'on')
+          this.service.updateCharacteristic(this.C.OutletInUse, params.switch === 'on')
         }
       }
       let logger = false
       if (this.helpers.hasProperty(params, 'power')) {
         this.accessory.context.powerReadings = true
-        this.service.updateCharacteristic(this.Characteristic.OutletInUse, parseFloat(params.power) > this.inUsePowerThreshold)
+        this.service.updateCharacteristic(this.C.OutletInUse, parseFloat(params.power) > this.inUsePowerThreshold)
           .updateCharacteristic(this.eveCurrentConsumption, parseFloat(params.power))
-        const isOn = this.accessory.getService(this.Service.Outlet).getCharacteristic(this.Characteristic.On).value
+        const isOn = this.accessory.getService(this.S.Outlet).getCharacteristic(this.C.On).value
         this.accessory.historyService.addEntry({
           time: Math.round(new Date().valueOf() / 1000),
           power: isOn ? parseFloat(params.power) : 0
diff --git a/lib/device/rf-bridge.js b/lib/device/rf-bridge.js
index b7d5b286..ff8d104f 100644
--- a/lib/device/rf-bridge.js
+++ b/lib/device/rf-bridge.js
@@ -8,19 +8,19 @@ module.exports = class deviceRFBridge {
     this.log = platform.log
     this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.helpers = platform.helpers
-    this.Service = platform.api.hap.Service
-    this.Characteristic = platform.api.hap.Characteristic
+    this.S = platform.api.hap.Service
+    this.C = platform.api.hap.Characteristic
     const self = this
     this.eveLastActivation = function () {
-      self.Characteristic.call(this, 'Last Activation', self.helpers.eveUUID.lastActivation)
+      self.C.call(this, 'Last Activation', self.helpers.eveUUID.lastActivation)
       this.setProps({
-        format: self.Characteristic.Formats.UINT32,
-        unit: self.Characteristic.Units.SECONDS,
-        perms: [self.Characteristic.Perms.READ, self.Characteristic.Perms.NOTIFY]
+        format: self.C.Formats.UINT32,
+        unit: self.C.Units.SECONDS,
+        perms: [self.C.Perms.READ, self.C.Perms.NOTIFY]
       })
       this.value = this.getDefaultValue()
     }
-    util.inherits(this.eveLastActivation, this.Characteristic)
+    util.inherits(this.eveLastActivation, this.C)
     this.eveLastActivation.UUID = this.helpers.eveUUID.lastActivation
     this.sensorTimeDifference = parseInt(this.platform.config.sensorTimeDifference)
     this.sensorTimeDifference = isNaN(this.sensorTimeDifference)
@@ -30,9 +30,9 @@ module.exports = class deviceRFBridge {
         : this.sensorTimeDifference
     if (['curtain', 'button'].includes(accessory.context.subType)) {
       Object.entries(accessory.context.buttons).forEach(([chan, name]) => {
-        if (!accessory.getService(name)) accessory.addService(this.Service.Switch, name, 'switch' + chan)
-        accessory.getService(name).updateCharacteristic(this.Characteristic.On, false)
-        accessory.getService(name).getCharacteristic(this.Characteristic.On)
+        if (!accessory.getService(name)) accessory.addService(this.S.Switch, name, 'switch' + chan)
+        accessory.getService(name).updateCharacteristic(this.C.On, false)
+        accessory.getService(name).getCharacteristic(this.C.On)
           .on('set', (value, callback) => this.internalUpdate(chan, name, value, callback))
       })
     } else {
@@ -41,39 +41,39 @@ module.exports = class deviceRFBridge {
       let eveType
       switch (accessory.context.subType) {
         case 'water':
-          serv = this.Service.LeakSensor
-          char = this.Characteristic.LeakDetected
+          serv = this.S.LeakSensor
+          char = this.C.LeakDetected
           eveType = 'motion'
           break
         case 'fire':
         case 'smoke':
-          serv = this.Service.SmokeSensor
-          char = this.Characteristic.SmokeDetected
+          serv = this.S.SmokeSensor
+          char = this.C.SmokeDetected
           eveType = 'motion'
           break
         case 'co':
-          serv = this.Service.CarbonMonoxideSensor
-          char = this.Characteristic.CarbonMonoxideDetected
+          serv = this.S.CarbonMonoxideSensor
+          char = this.C.CarbonMonoxideDetected
           eveType = 'motion'
           break
         case 'co2':
-          serv = this.Service.CarbonDioxideSensor
-          char = this.Characteristic.CarbonDioxideDetected
+          serv = this.S.CarbonDioxideSensor
+          char = this.C.CarbonDioxideDetected
           eveType = 'motion'
           break
         case 'contact':
-          serv = this.Service.ContactSensor
-          char = this.Characteristic.ContactSensorState
+          serv = this.S.ContactSensor
+          char = this.C.ContactSensorState
           eveType = 'door'
           break
         case 'occupancy':
-          serv = this.Service.OccupancySensor
-          char = this.Characteristic.OccupancyDetected
+          serv = this.S.OccupancySensor
+          char = this.C.OccupancyDetected
           eveType = 'motion'
           break
         default:
-          serv = this.Service.MotionSensor
-          char = this.Characteristic.MotionDetected
+          serv = this.S.MotionSensor
+          char = this.C.MotionDetected
           eveType = 'motion'
           break
       }
@@ -99,7 +99,7 @@ module.exports = class deviceRFBridge {
         rfChl: parseInt(rfChl)
       }
       await this.helpers.sleep(1000)
-      this.accessory.getService(service).updateCharacteristic(this.Characteristic.On, false)
+      this.accessory.getService(service).updateCharacteristic(this.C.On, false)
       await this.platform.sendDeviceUpdate(this.accessory, params)
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
@@ -124,12 +124,12 @@ module.exports = class deviceRFBridge {
           }
         })
         if (oAccessory) {
-          oAccessory.getService(oAccessory.context.buttons[params.rfChl]).updateCharacteristic(this.Characteristic.On, 1)
+          oAccessory.getService(oAccessory.context.buttons[params.rfChl]).updateCharacteristic(this.C.On, 1)
           if (params.updateSource && !this.disableDeviceLogging) {
             this.log('[%s] current state [button triggered]', oAccessory.displayName)
           }
           this.helpers.sleep(3000)
-          oAccessory.getService(oAccessory.context.buttons[params.rfChl]).updateCharacteristic(this.Characteristic.On, 0)
+          oAccessory.getService(oAccessory.context.buttons[params.rfChl]).updateCharacteristic(this.C.On, 0)
         } else {
           throw new Error('rf button not found in Homebridge')
         }
@@ -172,37 +172,37 @@ module.exports = class deviceRFBridge {
                   case 'button':
                     return
                   case 'water':
-                    serv = this.Service.LeakSensor
-                    char = this.Characteristic.LeakDetected
+                    serv = this.S.LeakSensor
+                    char = this.C.LeakDetected
                     break
                   case 'fire':
                   case 'smoke':
-                    serv = this.Service.SmokeSensor
-                    char = this.Characteristic.SmokeDetected
+                    serv = this.S.SmokeSensor
+                    char = this.C.SmokeDetected
                     break
                   case 'co':
-                    serv = this.Service.CarbonMonoxideSensor
-                    char = this.Characteristic.CarbonMonoxideDetected
+                    serv = this.S.CarbonMonoxideSensor
+                    char = this.C.CarbonMonoxideDetected
                     break
                   case 'co2':
-                    serv = this.Service.CarbonDioxideSensor
-                    char = this.Characteristic.CarbonDioxideDetected
+                    serv = this.S.CarbonDioxideSensor
+                    char = this.C.CarbonDioxideDetected
                     break
                   case 'contact':
-                    serv = this.Service.ContactSensor
-                    char = this.Characteristic.ContactSensorState
+                    serv = this.S.ContactSensor
+                    char = this.C.ContactSensorState
                     oAccessory.getService(serv).updateCharacteristic(
                       this.eveLastActivation,
                       Math.round(new Date().valueOf() / 1000) - oAccessory.historyService.getInitialTime()
                     )
                     break
                   case 'occupancy':
-                    serv = this.Service.OccupancySensor
-                    char = this.Characteristic.OccupancyDetected
+                    serv = this.S.OccupancySensor
+                    char = this.C.OccupancyDetected
                     break
                   default:
-                    serv = this.Service.MotionSensor
-                    char = this.Characteristic.MotionDetected
+                    serv = this.S.MotionSensor
+                    char = this.C.MotionDetected
                     oAccessory.getService(serv).updateCharacteristic(
                       this.eveLastActivation,
                       Math.round(new Date().valueOf() / 1000) - oAccessory.historyService.getInitialTime()
diff --git a/lib/device/scm.js b/lib/device/scm.js
index 5db589a2..f35c86b7 100644
--- a/lib/device/scm.js
+++ b/lib/device/scm.js
@@ -7,10 +7,10 @@ module.exports = class deviceSCM {
     this.log = platform.log
     this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.helpers = platform.helpers
-    this.Service = platform.api.hap.Service
-    this.Characteristic = platform.api.hap.Characteristic
-    this.service = accessory.getService(this.Service.Switch) || accessory.addService(this.Service.Switch)
-    this.service.getCharacteristic(this.Characteristic.On)
+    this.S = platform.api.hap.Service
+    this.C = platform.api.hap.Characteristic
+    this.service = accessory.getService(this.S.Switch) || accessory.addService(this.S.Switch)
+    this.service.getCharacteristic(this.C.On)
       .on('set', this.internalUpdate.bind(this))
     accessory.log = platform.config.debugFakegato ? this.log : () => {}
     accessory.historyService = new this.platform.eveService('switch', accessory, {
@@ -45,7 +45,7 @@ module.exports = class deviceSCM {
         return
       }
       const newStatus = params.switches[0].switch === 'on'
-      this.service.updateCharacteristic(this.Characteristic.On, newStatus)
+      this.service.updateCharacteristic(this.C.On, newStatus)
       this.cacheOnOff = params.switches[0].switch
       this.accessory.historyService.addEntry({
         time: Math.round(new Date().valueOf() / 1000),
diff --git a/lib/device/sensor.js b/lib/device/sensor.js
index 1a0bf59d..66a9fe96 100644
--- a/lib/device/sensor.js
+++ b/lib/device/sensor.js
@@ -8,19 +8,19 @@ module.exports = class deviceSensor {
     this.log = platform.log
     this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.helpers = platform.helpers
-    this.Service = platform.api.hap.Service
-    this.Characteristic = platform.api.hap.Characteristic
+    this.S = platform.api.hap.Service
+    this.C = platform.api.hap.Characteristic
     const self = this
     this.eveLastActivation = function () {
-      self.Characteristic.call(this, 'Last Activation', self.helpers.eveUUID.lastActivation)
+      self.C.call(this, 'Last Activation', self.helpers.eveUUID.lastActivation)
       this.setProps({
-        format: self.Characteristic.Formats.UINT32,
-        unit: self.Characteristic.Units.SECONDS,
-        perms: [self.Characteristic.Perms.READ, self.Characteristic.Perms.NOTIFY]
+        format: self.C.Formats.UINT32,
+        unit: self.C.Units.SECONDS,
+        perms: [self.C.Perms.READ, self.C.Perms.NOTIFY]
       })
       this.value = this.getDefaultValue()
     }
-    util.inherits(this.eveLastActivation, this.Characteristic)
+    util.inherits(this.eveLastActivation, this.C)
     this.eveLastActivation.UUID = this.helpers.eveUUID.lastActivation
     this.lowBattThreshold = parseInt(this.platform.config.lowBattThreshold)
     this.lowBattThreshold = isNaN(this.lowBattThreshold)
@@ -28,8 +28,8 @@ module.exports = class deviceSensor {
       : this.lowBattThreshold < 5
         ? this.helpers.defaults.lowBattThreshold
         : this.lowBattThreshold
-    this.contactService = accessory.getService(this.Service.ContactSensor) || accessory.addService(this.Service.ContactSensor)
-    this.batteryService = accessory.getService(this.Service.BatteryService) || accessory.addService(this.Service.BatteryService)
+    this.contactService = accessory.getService(this.S.ContactSensor) || accessory.addService(this.S.ContactSensor)
+    this.batteryService = accessory.getService(this.S.BatteryService) || accessory.addService(this.S.BatteryService)
     accessory.log = platform.config.debugFakegato ? this.log : () => {}
     accessory.historyService = new this.platform.eveService('door', accessory, {
       storage: 'fs',
@@ -43,8 +43,8 @@ module.exports = class deviceSensor {
       if (this.helpers.hasProperty(params, 'battery')) {
         const scaledBattery = Math.round(params.battery * 33.3)
         if (this.cacheBattery !== scaledBattery) {
-          this.batteryService.updateCharacteristic(this.Characteristic.BatteryLevel, this.cacheBattery)
-            .updateCharacteristic(this.Characteristic.StatusLowBattery, this.cacheBattery < this.lowBattThreshold)
+          this.batteryService.updateCharacteristic(this.C.BatteryLevel, this.cacheBattery)
+            .updateCharacteristic(this.C.StatusLowBattery, this.cacheBattery < this.lowBattThreshold)
           if (params.updateSource && !this.disableDeviceLogging) {
             this.log('[%s] current battery [%s%].', this.accessory.displayName, this.cacheBattery)
           }
@@ -55,7 +55,7 @@ module.exports = class deviceSensor {
       }
       this.cacheOnOff = params.switch
       const newState = params.switch === 'on' ? 1 : 0
-      this.contactService.updateCharacteristic(this.Characteristic.ContactSensorState, newState)
+      this.contactService.updateCharacteristic(this.C.ContactSensorState, newState)
       this.accessory.historyService.addEntry({
         time: Math.round(new Date().valueOf() / 1000),
         status: newState
@@ -73,19 +73,19 @@ module.exports = class deviceSensor {
       this.platform.cusG.forEach(async group => {
         if (group.sensorId === this.accessory.context.eweDeviceId && group.type === 'garage') {
           if ((oAccessory = this.platform.devicesInHB.get(group.deviceId + 'SWX'))) {
-            const gdService = oAccessory.getService(this.Service.GarageDoorOpener)
+            const gdService = oAccessory.getService(this.S.GarageDoorOpener)
             switch (newState) {
               case 0:
-                gdService.updateCharacteristic(this.Characteristic.TargetDoorState, 1)
-                  .updateCharacteristic(this.Characteristic.CurrentDoorState, 1)
+                gdService.updateCharacteristic(this.C.TargetDoorState, 1)
+                  .updateCharacteristic(this.C.CurrentDoorState, 1)
                 if (params.updateSource && !this.disableDeviceLogging) {
                   this.log('[%s] current state [closed].', oAccessory.displayName)
                 }
                 break
               case 1:
                 await this.helpers.sleep(Math.max(group.operationTime * 100, 2000))
-                gdService.updateCharacteristic(this.Characteristic.TargetDoorState, 0)
-                  .updateCharacteristic(this.Characteristic.CurrentDoorState, 0)
+                gdService.updateCharacteristic(this.C.TargetDoorState, 0)
+                  .updateCharacteristic(this.C.CurrentDoorState, 0)
                 if (params.updateSource && !this.disableDeviceLogging) {
                   this.log('[%s] current state [open].', oAccessory.displayName)
                 }
diff --git a/lib/device/switch-multi.js b/lib/device/switch-multi.js
index 7599c1b4..4cfd625c 100644
--- a/lib/device/switch-multi.js
+++ b/lib/device/switch-multi.js
@@ -7,10 +7,10 @@ module.exports = class deviceSwitchMulti {
     this.log = platform.log
     this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.helpers = platform.helpers
-    this.Service = platform.api.hap.Service
-    this.Characteristic = platform.api.hap.Characteristic
-    this.service = accessory.getService(this.Service.Switch) || accessory.addService(this.Service.Switch)
-    this.service.getCharacteristic(this.Characteristic.On)
+    this.S = platform.api.hap.Service
+    this.C = platform.api.hap.Characteristic
+    this.service = accessory.getService(this.S.Switch) || accessory.addService(this.S.Switch)
+    this.service.getCharacteristic(this.C.On)
       .on('set', this.internalUpdate.bind(this))
     accessory.log = platform.config.debugFakegato ? this.log : () => {}
     accessory.historyService = new this.platform.eveService('switch', accessory, {
@@ -36,7 +36,7 @@ module.exports = class deviceSwitchMulti {
           params.switches[3].switch = value ? 'on' : 'off'
           for (let i = 0; i <= 4; i++) {
             if ((oAccessory = this.platform.devicesInHB.get(this.accessory.context.eweDeviceId + 'SW' + i))) {
-              oAccessory.getService(this.Service.Switch).updateCharacteristic(this.Characteristic.On, value)
+              oAccessory.getService(this.S.Switch).updateCharacteristic(this.C.On, value)
               oAccessory.context.cacheOnOff = value ? 'on' : 'off'
               oAccessory.historyService.addEntry({
                 time: Math.round(new Date().valueOf() / 1000),
@@ -55,7 +55,7 @@ module.exports = class deviceSwitchMulti {
           params.switches = this.helpers.defaultMultiSwitchOff
           for (let i = 1; i <= 4; i++) {
             if ((oAccessory = this.platform.devicesInHB.get(this.accessory.context.eweDeviceId + 'SW' + i))) {
-              if (oAccessory.getService(this.Service.Switch).getCharacteristic(this.Characteristic.On).value) {
+              if (oAccessory.getService(this.S.Switch).getCharacteristic(this.C.On).value) {
                 masterState = 'on'
               }
               if (i === parseInt(this.accessory.context.switchNumber)) {
@@ -77,7 +77,7 @@ module.exports = class deviceSwitchMulti {
           }
           if (!this.platform.hiddenMasters.includes(this.accessory.context.eweDeviceId)) {
             oAccessory = this.platform.devicesInHB.get(this.accessory.context.eweDeviceId + 'SW0')
-            oAccessory.getService(this.Service.Switch).updateCharacteristic(this.Characteristic.On, masterState === 'on')
+            oAccessory.getService(this.S.Switch).updateCharacteristic(this.C.On, masterState === 'on')
             oAccessory.historyService.addEntry({
               time: Math.round(new Date().valueOf() / 1000),
               status: masterState === 'on' ? 1 : 0
@@ -103,8 +103,8 @@ module.exports = class deviceSwitchMulti {
         if (this.platform.devicesInHB.has(idToCheck + i)) {
           const oAccessory = this.platform.devicesInHB.get(idToCheck + i)
           if (params.switches[i - 1].switch === oAccessory.context.cacheOnOff) continue
-          oAccessory.getService(this.Service.Switch)
-            .updateCharacteristic(this.Characteristic.On, params.switches[i - 1].switch === 'on')
+          oAccessory.getService(this.S.Switch)
+            .updateCharacteristic(this.C.On, params.switches[i - 1].switch === 'on')
           oAccessory.context.cacheOnOff = params.switches[i - 1].switch
           oAccessory.historyService.addEntry({
             time: Math.round(new Date().valueOf() / 1000),
@@ -116,7 +116,7 @@ module.exports = class deviceSwitchMulti {
         }
       }
       if (!this.platform.hiddenMasters.includes(this.accessory.context.eweDeviceId)) {
-        this.service.updateCharacteristic(this.Characteristic.On, primaryState)
+        this.service.updateCharacteristic(this.C.On, primaryState)
         this.accessory.historyService.addEntry({
           time: Math.round(new Date().valueOf() / 1000),
           status: primaryState ? 1 : 0
diff --git a/lib/device/switch-single.js b/lib/device/switch-single.js
index b87e45f1..6bd5a702 100644
--- a/lib/device/switch-single.js
+++ b/lib/device/switch-single.js
@@ -7,13 +7,13 @@ module.exports = class deviceSwitchSingle {
     this.log = platform.log
     this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.helpers = platform.helpers
-    this.Service = platform.api.hap.Service
-    this.Characteristic = platform.api.hap.Characteristic
-    this.service = accessory.getService(this.Service.Switch) || accessory.addService(this.Service.Switch)
-    this.service.getCharacteristic(this.Characteristic.On)
+    this.S = platform.api.hap.Service
+    this.C = platform.api.hap.Characteristic
+    this.service = accessory.getService(this.S.Switch) || accessory.addService(this.S.Switch)
+    this.service.getCharacteristic(this.C.On)
       .on('set', this.internalUpdate.bind(this))
-    if (accessory.getService(this.Service.Outlet)) {
-      accessory.removeService(accessory.getService(this.Service.Outlet))
+    if (accessory.getService(this.S.Outlet)) {
+      accessory.removeService(accessory.getService(this.S.Outlet))
     }
     accessory.log = platform.config.debugFakegato ? this.log : () => {}
     accessory.historyService = new this.platform.eveService('switch', accessory, {
@@ -49,7 +49,7 @@ module.exports = class deviceSwitchSingle {
         return
       }
       const newStatus = params.switch === 'on'
-      this.service.updateCharacteristic(this.Characteristic.On, newStatus)
+      this.service.updateCharacteristic(this.C.On, newStatus)
       this.cacheOnOff = params.switch
       this.accessory.historyService.addEntry({
         time: Math.round(new Date().valueOf() / 1000),
diff --git a/lib/device/switch-valve.js b/lib/device/switch-valve.js
index 736c692a..4ee1d80b 100644
--- a/lib/device/switch-valve.js
+++ b/lib/device/switch-valve.js
@@ -7,27 +7,27 @@ module.exports = class deviceSwitchValve {
     this.log = platform.log
     this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.helpers = platform.helpers
-    this.Service = platform.api.hap.Service
-    this.Characteristic = platform.api.hap.Characteristic
-    this.switchService = accessory.getService(this.Service.Switch) || accessory.addService(this.Service.Switch)
-    if (!(this.valveService = accessory.getService(this.Service.Valve))) {
-      this.valveService = accessory.addService(this.Service.Valve)
-      this.valveService.setCharacteristic(this.Characteristic.Active, 0)
-        .setCharacteristic(this.Characteristic.InUse, 0)
-        .setCharacteristic(this.Characteristic.ValveType, 1)
-        .setCharacteristic(this.Characteristic.SetDuration, 120)
-        .addCharacteristic(this.Characteristic.RemainingDuration)
+    this.S = platform.api.hap.Service
+    this.C = platform.api.hap.Characteristic
+    this.sService = accessory.getService(this.S.Switch) || accessory.addService(this.S.Switch)
+    if (!(this.vService = accessory.getService(this.S.Valve))) {
+      this.vService = accessory.addService(this.S.Valve)
+      this.vService.setCharacteristic(this.C.Active, 0)
+        .setCharacteristic(this.C.InUse, 0)
+        .setCharacteristic(this.C.ValveType, 1)
+        .setCharacteristic(this.C.SetDuration, 120)
+        .addCharacteristic(this.C.RemainingDuration)
     }
-    this.switchService.getCharacteristic(this.Characteristic.On)
+    this.sService.getCharacteristic(this.C.On)
       .on('set', this.internalSwitchUpdate.bind(this))
-    this.valveService.getCharacteristic(this.Characteristic.Active)
+    this.vService.getCharacteristic(this.C.Active)
       .on('set', this.internalValveUpdate.bind(this))
-    this.valveService.getCharacteristic(this.Characteristic.SetDuration)
+    this.vService.getCharacteristic(this.C.SetDuration)
       .on('set', (value, callback) => {
-        if (this.valveService.getCharacteristic(this.Characteristic.InUse).value) {
-          this.valveService.updateCharacteristic(this.Characteristic.RemainingDuration, value)
+        if (this.vService.getCharacteristic(this.C.InUse).value) {
+          this.vService.updateCharacteristic(this.C.RemainingDuration, value)
           clearTimeout(this.timer)
-          this.timer = setTimeout(() => this.valveService.setCharacteristic(this.Characteristic.Active, 0), value * 1000)
+          this.timer = setTimeout(() => this.vService.setCharacteristic(this.C.Active, 0), value * 1000)
         }
         callback()
       })
@@ -44,7 +44,7 @@ module.exports = class deviceSwitchValve {
       callback()
       const params = { switches: this.helpers.defaultMultiSwitchOff }
       params.switches[0].switch = value ? 'on' : 'off'
-      params.switches[1].switch = this.valveService.getCharacteristic(this.Characteristic.Active).value === 1 ? 'on' : 'off'
+      params.switches[1].switch = this.vService.getCharacteristic(this.C.Active).value === 1 ? 'on' : 'off'
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.cacheOnOff = value ? 'on' : 'off'
       this.accessory.historyService.addEntry({
@@ -63,25 +63,25 @@ module.exports = class deviceSwitchValve {
     try {
       callback()
       const params = { switches: this.helpers.defaultMultiSwitchOff }
-      params.switches[0].switch = this.switchService.getCharacteristic(this.Characteristic.On).value ? 'on' : 'off'
+      params.switches[0].switch = this.sService.getCharacteristic(this.C.On).value ? 'on' : 'off'
       params.switches[1].switch = value === 1 ? 'on' : 'off'
-      this.valveService.updateCharacteristic(this.Characteristic.InUse, value)
+      this.vService.updateCharacteristic(this.C.InUse, value)
       switch (value) {
         case 0:
-          this.valveService.updateCharacteristic(this.Characteristic.RemainingDuration, 0)
+          this.vService.updateCharacteristic(this.C.RemainingDuration, 0)
           clearTimeout(this.timer)
           if (!this.disableDeviceLogging) {
             this.log('[%s] current state [stopped].', this.accessory.displayName)
           }
           break
         case 1: {
-          const timer = this.valveService.getCharacteristic(this.Characteristic.SetDuration).value
-          this.valveService.updateCharacteristic(this.Characteristic.RemainingDuration, timer)
+          const timer = this.vService.getCharacteristic(this.C.SetDuration).value
+          this.vService.updateCharacteristic(this.C.RemainingDuration, timer)
           if (!this.disableDeviceLogging) {
             this.log('[%s] current state [running].', this.accessory.displayName)
           }
           this.timer = setTimeout(() => {
-            this.valveService.setCharacteristic(this.Characteristic.Active, 0)
+            this.vService.setCharacteristic(this.C.Active, 0)
           }, timer * 1000)
           break
         }
@@ -100,7 +100,7 @@ module.exports = class deviceSwitchValve {
       if (this.cacheOnOff !== (params.switches[0].switch === 'on')) {
         const newStatus = params.switches[0].switch === 'on'
         this.cacheOnOff = params.switches[0].switch
-        this.switchService.updateCharacteristic(this.Characteristic.On, newStatus)
+        this.sService.updateCharacteristic(this.C.On, newStatus)
         this.accessory.historyService.addEntry({
           time: Math.round(new Date().valueOf() / 1000),
           status: newStatus ? 1 : 0
@@ -110,23 +110,23 @@ module.exports = class deviceSwitchValve {
         }
       }
       if (params.switches[1].switch === 'on') {
-        if (this.valveService.getCharacteristic(this.Characteristic.Active).value === 0) {
-          const timer = this.valveService.getCharacteristic(this.Characteristic.SetDuration).value
-          this.valveService.updateCharacteristic(this.Characteristic.Active, 1)
-            .updateCharacteristic(this.Characteristic.InUse, 1)
-            .updateCharacteristic(this.Characteristic.RemainingDuration, timer)
+        if (this.vService.getCharacteristic(this.C.Active).value === 0) {
+          const timer = this.vService.getCharacteristic(this.C.SetDuration).value
+          this.vService.updateCharacteristic(this.C.Active, 1)
+            .updateCharacteristic(this.C.InUse, 1)
+            .updateCharacteristic(this.C.RemainingDuration, timer)
           if (params.updateSource && !this.disableDeviceLogging) {
             this.log('[%s] current state [running].', this.accessory.displayName)
           }
           this.timer = setTimeout(() => {
-            this.valveService.setCharacteristic(this.Characteristic.Active, 0)
+            this.vService.setCharacteristic(this.C.Active, 0)
           }, timer * 1000)
         }
         return
       }
-      this.valveService.updateCharacteristic(this.Characteristic.Active, 0)
-        .updateCharacteristic(this.Characteristic.InUse, 0)
-        .updateCharacteristic(this.Characteristic.RemainingDuration, 0)
+      this.vService.updateCharacteristic(this.C.Active, 0)
+        .updateCharacteristic(this.C.InUse, 0)
+        .updateCharacteristic(this.C.RemainingDuration, 0)
       clearTimeout(this.timer)
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
diff --git a/lib/device/tap-one.js b/lib/device/tap-one.js
index 4276ff61..8256d2a2 100644
--- a/lib/device/tap-one.js
+++ b/lib/device/tap-one.js
@@ -7,20 +7,20 @@ module.exports = class deviceTapOne {
     this.log = platform.log
     this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.helpers = platform.helpers
-    this.Service = platform.api.hap.Service
-    this.Characteristic = platform.api.hap.Characteristic
+    this.S = platform.api.hap.Service
+    this.C = platform.api.hap.Characteristic
     const asConfig = platform.cusG.get(accessory.context.eweDeviceId)
     if (!['oneSwitch', 'twoSwitch'].includes(asConfig.setup)) {
       this.error = 'setup must be oneSwitch or twoSwitch'
     }
     this.setup = asConfig.setup
-    if (!(this.service = accessory.getService(this.Service.Valve))) {
-      this.service = accessory.addService(this.Service.Valve)
-      this.service.setCharacteristic(this.Characteristic.Active, 0)
-        .setCharacteristic(this.Characteristic.InUse, 0)
-        .setCharacteristic(this.Characteristic.ValveType, 3)
+    if (!(this.service = accessory.getService(this.S.Valve))) {
+      this.service = accessory.addService(this.S.Valve)
+      this.service.setCharacteristic(this.C.Active, 0)
+        .setCharacteristic(this.C.InUse, 0)
+        .setCharacteristic(this.C.ValveType, 3)
     }
-    this.service.getCharacteristic(this.Characteristic.Active)
+    this.service.getCharacteristic(this.C.Active)
       .on('set', this.internalUpdate.bind(this))
     this.accessory = accessory
   }
@@ -44,7 +44,7 @@ module.exports = class deviceTapOne {
       }
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.cacheOnOff = value ? 'on' : 'off'
-      this.service.updateCharacteristic(this.Characteristic.InUse, value)
+      this.service.updateCharacteristic(this.C.InUse, value)
       if (!this.disableDeviceLogging) {
         this.log('[%s] current state [%s].', this.accessory.displayName, this.cacheOnOff)
       }
@@ -73,8 +73,8 @@ module.exports = class deviceTapOne {
           this.cacheOnOff = params.switches[0].switch
           break
       }
-      this.service.updateCharacteristic(this.Characteristic.Active, this.cacheOnOff === 'on' ? 1 : 0)
-        .updateCharacteristic(this.Characteristic.InUse, this.cacheOnOff === 'on' ? 1 : 0)
+      this.service.updateCharacteristic(this.C.Active, this.cacheOnOff === 'on' ? 1 : 0)
+        .updateCharacteristic(this.C.InUse, this.cacheOnOff === 'on' ? 1 : 0)
       if (params.updateSource && !this.disableDeviceLogging) {
         this.log('[%s] current state [%s].', this.accessory.displayName, this.cacheOnOff)
       }
diff --git a/lib/device/tap-two.js b/lib/device/tap-two.js
index 7ea2114a..77c4b99b 100644
--- a/lib/device/tap-two.js
+++ b/lib/device/tap-two.js
@@ -7,17 +7,17 @@ module.exports = class deviceTapTwo {
     this.log = platform.log
     this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.helpers = platform.helpers
-    this.Service = platform.api.hap.Service
-    this.Characteristic = platform.api.hap.Characteristic
+    this.S = platform.api.hap.Service
+    this.C = platform.api.hap.Characteristic
     ;['A', 'B'].forEach(v => {
       let tapService
-      if (!(tapService = accessory.getService(this.Service.Valve))) {
-        tapService = accessory.addService(this.Service.Valve)
-        tapService.setCharacteristic(this.Characteristic.Active, 0)
-          .setCharacteristic(this.Characteristic.InUse, 0)
-          .setCharacteristic(this.Characteristic.ValveType, 3)
+      if (!(tapService = accessory.getService(this.S.Valve))) {
+        tapService = accessory.addService(this.S.Valve)
+        tapService.setCharacteristic(this.C.Active, 0)
+          .setCharacteristic(this.C.InUse, 0)
+          .setCharacteristic(this.C.ValveType, 3)
       }
-      tapService.getCharacteristic(this.Characteristic.Active)
+      tapService.getCharacteristic(this.C.Active)
         .on('set', (value, callback) => this.internalUpdate('Tap ' + v, value, callback))
     })
     this.accessory = accessory
@@ -31,18 +31,18 @@ module.exports = class deviceTapTwo {
       switch (tap) {
         case 'Tap A':
           params.switches[0].switch = value ? 'on' : 'off'
-          params.switches[1].switch = this.accessory.getService('Tap B').getCharacteristic(this.Characteristic.Active).value === 1
+          params.switches[1].switch = this.accessory.getService('Tap B').getCharacteristic(this.C.Active).value === 1
             ? 'on'
             : 'off'
           break
         case 'Tap B':
-          params.switches[0].switch = this.accessory.getService('Tap A').getCharacteristic(this.Characteristic.Active).value === 1
+          params.switches[0].switch = this.accessory.getService('Tap A').getCharacteristic(this.C.Active).value === 1
             ? 'on'
             : 'off'
           params.switches[1].switch = value ? 'on' : 'off'
           break
       }
-      tapService.updateCharacteristic(this.Characteristic.InUse, value)
+      tapService.updateCharacteristic(this.C.InUse, value)
       if (!this.disableDeviceLogging) {
         this.log('[%s] current state [%s %].', this.accessory.displayName, tap, value === 1 ? 'running' : 'stopped')
       }
@@ -59,8 +59,8 @@ module.exports = class deviceTapTwo {
       }
       ;['A', 'B'].forEach((v, k) => {
         const tapService = this.accessory.getService('Valve ' + v)
-        tapService.updateCharacteristic(this.Characteristic.Active, params.switches[k].switch === 'on' ? 1 : 0)
-          .updateCharacteristic(this.Characteristic.InUse, params.switches[k].switch === 'on' ? 1 : 0)
+        tapService.updateCharacteristic(this.C.Active, params.switches[k].switch === 'on' ? 1 : 0)
+          .updateCharacteristic(this.C.InUse, params.switches[k].switch === 'on' ? 1 : 0)
         const logText = params.switches[k].switch === 'on' ? 'running' : 'stopped'
         if (params.updateSource && !this.disableDeviceLogging) {
           this.log('[%s] current state [Tap %s running].', this.accessory.displayName, v, logText)
diff --git a/lib/device/template.js b/lib/device/template.js
index 569ee673..56796a76 100644
--- a/lib/device/template.js
+++ b/lib/device/template.js
@@ -7,12 +7,14 @@ module.exports = class deviceTemplate {
     this.log = platform.log
     this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.helpers = platform.helpers
-    this.Service = platform.api.hap.Service
-    this.Characteristic = platform.api.hap.Characteristic
-    this.service = accessory.getService(this.Service.Switch) || accessory.addService(this.Service.Switch)
-    this.service.getCharacteristic(this.Characteristic.On)
-      .on('set', (value, callback) => this.internalUpdate(value, callback))
+    this.S = platform.api.hap.Service
+    this.C = platform.api.hap.Characteristic
+    this.dName = accessory.displayName
     this.accessory = accessory
+
+    this.service = this.accessory.getService(this.S.Switch) || this.accessory.addService(this.S.Switch)
+    this.service.getCharacteristic(this.C.On)
+      .on('set', this.internalUpdate.bind(this))
   }
 
   async internalUpdate (value, callback) {
diff --git a/lib/device/th-outlet.js b/lib/device/th-outlet.js
index a02d3a02..aabcf387 100644
--- a/lib/device/th-outlet.js
+++ b/lib/device/th-outlet.js
@@ -7,27 +7,27 @@ module.exports = class deviceTHOutlet {
     this.log = platform.log
     this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.helpers = platform.helpers
-    this.Service = platform.api.hap.Service
-    this.Characteristic = platform.api.hap.Characteristic
+    this.S = platform.api.hap.Service
+    this.C = platform.api.hap.Characteristic
     this.tempOffset = parseFloat(platform.thTempOffset[accessory.context.eweDeviceId] || 0)
     this.hideSwitch = (this.platform.config.hideSwitchFromTH || '').split(',').includes(accessory.context.eweDeviceId)
-    if (accessory.getService(this.Service.Thermostat)) {
-      accessory.removeService(accessory.getService(this.Service.Thermostat))
+    if (accessory.getService(this.S.Thermostat)) {
+      accessory.removeService(accessory.getService(this.S.Thermostat))
     }
     if ((this.platform.config.hideSwitchFromTH || '').split(',').includes(accessory.context.eweDeviceId)) {
-      if (accessory.getService(this.Service.Switch)) {
-        accessory.removeService(accessory.getService(this.Service.Switch))
+      if (accessory.getService(this.S.Switch)) {
+        accessory.removeService(accessory.getService(this.S.Switch))
       }
     } else {
-      this.switchService = accessory.getService(this.Service.Switch) || accessory.addService(this.Service.Switch)
-      this.switchService.getCharacteristic(this.Characteristic.On)
+      this.switchService = accessory.getService(this.S.Switch) || accessory.addService(this.S.Switch)
+      this.switchService.getCharacteristic(this.C.On)
         .on('set', this.internalUpdate.bind(this))
     }
-    this.tempService = accessory.getService(this.Service.TemperatureSensor) || accessory.addService(this.Service.TemperatureSensor)
-    this.tempService.getCharacteristic(this.Characteristic.CurrentTemperature)
+    this.tempService = accessory.getService(this.S.TemperatureSensor) || accessory.addService(this.S.TemperatureSensor)
+    this.tempService.getCharacteristic(this.C.CurrentTemperature)
       .setProps({ minValue: -100 })
     if (accessory.context.sensorType !== 'DS18B20') {
-      this.humiService = accessory.getService(this.Service.HumiditySensor) || accessory.addService(this.Service.HumiditySensor)
+      this.humiService = accessory.getService(this.S.HumiditySensor) || accessory.addService(this.S.HumiditySensor)
     }
     accessory.log = platform.config.debugFakegato ? this.log : () => {}
     accessory.historyService = new this.platform.eveService('custom', accessory, {
@@ -60,7 +60,7 @@ module.exports = class deviceTHOutlet {
         const newState = params.switch || params.mainSwitch
         if (this.cacheOnOff !== newState) {
           this.cacheOnOff = newState
-          this.switchService.updateCharacteristic(this.Characteristic.On, this.cacheOnOff === 'on')
+          this.switchService.updateCharacteristic(this.C.On, this.cacheOnOff === 'on')
           this.accessory.historyService.addEntry({
             time: Math.round(new Date().valueOf() / 1000),
             status: this.cacheOnOff === 'on' ? 1 : 0
@@ -76,7 +76,7 @@ module.exports = class deviceTHOutlet {
         eveLog.temp = currentTemp
         if (this.cacheTemp !== currentTemp) {
           this.cacheTemp = currentTemp
-          this.tempService.updateCharacteristic(this.Characteristic.CurrentTemperature, this.cacheTemp)
+          this.tempService.updateCharacteristic(this.C.CurrentTemperature, this.cacheTemp)
           if (params.updateSource && !this.disableDeviceLogging) {
             this.log('[%s] current temperature [%s].', this.accessory.displayName, this.cacheTemp)
           }
@@ -87,7 +87,7 @@ module.exports = class deviceTHOutlet {
         eveLog.humidity = currentHumi
         if (this.cacheHumi !== currentHumi) {
           this.cacheHumi = currentHumi
-          this.humiService.updateCharacteristic(this.Characteristic.CurrentRelativeHumidity, this.cacheHumi)
+          this.humiService.updateCharacteristic(this.C.CurrentRelativeHumidity, this.cacheHumi)
           if (params.updateSource && !this.disableDeviceLogging) {
             this.log('[%s] current humidity [%s%].', this.accessory.displayName, this.cacheHumi)
           }
diff --git a/lib/device/th-thermo.js b/lib/device/th-thermo.js
index c989605c..9a398db6 100644
--- a/lib/device/th-thermo.js
+++ b/lib/device/th-thermo.js
@@ -7,31 +7,31 @@ module.exports = class deviceTHThermo {
     this.log = platform.log
     this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.helpers = platform.helpers
-    this.Service = platform.api.hap.Service
-    this.Characteristic = platform.api.hap.Characteristic
+    this.S = platform.api.hap.Service
+    this.C = platform.api.hap.Characteristic
     this.tempOffset = parseFloat(platform.thTempOffset[accessory.context.eweDeviceId] || 0)
-    if (accessory.getService(this.Service.Switch)) {
-      accessory.removeService(accessory.getService(this.Service.Switch))
+    if (accessory.getService(this.S.Switch)) {
+      accessory.removeService(accessory.getService(this.S.Switch))
     }
-    if (accessory.getService(this.Service.TemperatureSensor)) {
-      accessory.removeService(accessory.getService(this.Service.TemperatureSensor))
+    if (accessory.getService(this.S.TemperatureSensor)) {
+      accessory.removeService(accessory.getService(this.S.TemperatureSensor))
     }
-    if (accessory.getService(this.Service.HumiditySensor)) {
-      accessory.removeService(accessory.getService(this.Service.HumiditySensor))
+    if (accessory.getService(this.S.HumiditySensor)) {
+      accessory.removeService(accessory.getService(this.S.HumiditySensor))
     }
-    this.service = accessory.getService(this.Service.Thermostat) || accessory.addService(this.Service.Thermostat)
-    this.service.getCharacteristic(this.Characteristic.CurrentTemperature)
+    this.service = accessory.getService(this.S.Thermostat) || accessory.addService(this.S.Thermostat)
+    this.service.getCharacteristic(this.C.CurrentTemperature)
       .setProps({ minValue: -100 })
-    this.service.getCharacteristic(this.Characteristic.TargetHeatingCoolingState)
+    this.service.getCharacteristic(this.C.TargetHeatingCoolingState)
       .on('set', this.internalOnOffUpdate.bind(this))
       .setProps({ validValues: [0, 1] })
-    this.service.getCharacteristic(this.Characteristic.TargetTemperature)
+    this.service.getCharacteristic(this.C.TargetTemperature)
       .on('set', this.internalTempUpdate.bind(this))
     if (
       accessory.context.sensorType !== 'DS18B20' &&
-      !this.service.testCharacteristic(this.Characteristic.CurrentRelativeHumidity)
+      !this.service.testCharacteristic(this.C.CurrentRelativeHumidity)
     ) {
-      this.service.addCharacteristic(this.Characteristic.CurrentRelativeHumidity)
+      this.service.addCharacteristic(this.C.CurrentRelativeHumidity)
     }
     accessory.log = platform.config.debugFakegato ? this.log : () => {}
     accessory.historyService = new this.platform.eveService('custom', accessory, {
@@ -63,8 +63,8 @@ module.exports = class deviceTHThermo {
       callback()
       await this.helpers.sleep(500)
       this.service.updateCharacteristic(
-        this.Characteristic.TargetTemperature,
-        this.service.getCharacteristic(this.Characteristic.CurrentTemperature).value
+        this.C.TargetTemperature,
+        this.service.getCharacteristic(this.C.CurrentTemperature).value
       )
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
@@ -77,7 +77,7 @@ module.exports = class deviceTHThermo {
         const newState = params.switch || params.mainSwitch
         if (this.cacheOnOff !== newState) {
           this.cacheOnOff = newState
-          this.switchService.updateCharacteristic(this.Characteristic.On, this.cacheOnOff === 'on')
+          this.switchService.updateCharacteristic(this.C.On, this.cacheOnOff === 'on')
           this.accessory.historyService.addEntry({
             time: Math.round(new Date().valueOf() / 1000),
             status: this.cacheOnOff === 'on' ? 1 : 0
@@ -93,8 +93,8 @@ module.exports = class deviceTHThermo {
         eveLog.temp = currentTemp
         if (this.cacheTemp !== currentTemp) {
           this.cacheTemp = currentTemp
-          this.service.updateCharacteristic(this.Characteristic.CurrentTemperature, this.cacheTemp)
-          this.service.updateCharacteristic(this.Characteristic.TargetTemperature, this.cacheTemp)
+          this.service.updateCharacteristic(this.C.CurrentTemperature, this.cacheTemp)
+          this.service.updateCharacteristic(this.C.TargetTemperature, this.cacheTemp)
           if (params.updateSource && !this.disableDeviceLogging) {
             this.log('[%s] current temperature [%s].', this.accessory.displayName, this.cacheTemp)
           }
@@ -103,13 +103,13 @@ module.exports = class deviceTHThermo {
       if (
         this.helpers.hasProperty(params, 'currentHumidity') &&
         params.currentHumidity !== 'unavailable' &&
-        this.service.testCharacteristic(this.Characteristic.CurrentRelativeHumidity)
+        this.service.testCharacteristic(this.C.CurrentRelativeHumidity)
       ) {
         const currentHumi = parseFloat(params.currentHumidity)
         eveLog.humidity = currentHumi
         if (this.cacheHumi !== currentHumi) {
           this.cacheHumi = currentHumi
-          this.service.updateCharacteristic(this.Characteristic.CurrentRelativeHumidity, this.cacheHumi)
+          this.service.updateCharacteristic(this.C.CurrentRelativeHumidity, this.cacheHumi)
           if (params.updateSource && !this.disableDeviceLogging) {
             this.log('[%s] current humidity [%s%].', this.accessory.displayName, this.cacheHumi)
           }
diff --git a/lib/device/usb.js b/lib/device/usb.js
index 543893a7..b6641d2a 100644
--- a/lib/device/usb.js
+++ b/lib/device/usb.js
@@ -7,20 +7,20 @@ module.exports = class deviceUSB {
     this.log = platform.log
     this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.helpers = platform.helpers
-    this.Service = platform.api.hap.Service
-    this.Characteristic = platform.api.hap.Characteristic
+    this.S = platform.api.hap.Service
+    this.C = platform.api.hap.Characteristic
     if ((platform.config.outletAsSwitch || '').split(',').includes(accessory.context.eweDeviceId)) {
-      if (accessory.getService(this.Service.Outlet)) {
-        accessory.removeService(accessory.getService(this.Service.Outlet))
+      if (accessory.getService(this.S.Outlet)) {
+        accessory.removeService(accessory.getService(this.S.Outlet))
       }
-      this.service = accessory.getService(this.Service.Switch) || accessory.addService(this.Service.Switch)
+      this.service = accessory.getService(this.S.Switch) || accessory.addService(this.S.Switch)
     } else {
-      if (accessory.getService(this.Service.Switch)) {
-        accessory.removeService(accessory.getService(this.Service.Switch))
+      if (accessory.getService(this.S.Switch)) {
+        accessory.removeService(accessory.getService(this.S.Switch))
       }
-      this.service = accessory.getService(this.Service.Outlet) || accessory.addService(this.Service.Outlet)
+      this.service = accessory.getService(this.S.Outlet) || accessory.addService(this.S.Outlet)
     }
-    this.service.getCharacteristic(this.Characteristic.On)
+    this.service.getCharacteristic(this.C.On)
       .on('set', this.internalUpdate.bind(this))
     accessory.log = platform.config.debugFakegato ? this.log : () => {}
     accessory.historyService = new this.platform.eveService('switch', accessory, {
@@ -55,7 +55,7 @@ module.exports = class deviceUSB {
         return
       }
       const newStatus = params.switches[0].switch === 'on'
-      this.service.updateCharacteristic(this.Characteristic.On, newStatus)
+      this.service.updateCharacteristic(this.C.On, newStatus)
       this.cacheOnOff = params.switches[0].switch
       this.accessory.historyService.addEntry({
         time: Math.round(new Date().valueOf() / 1000),
diff --git a/lib/device/valve-four.js b/lib/device/valve-four.js
index 04259084..7c69d086 100644
--- a/lib/device/valve-four.js
+++ b/lib/device/valve-four.js
@@ -7,27 +7,27 @@ module.exports = class deviceValveFour {
     this.log = platform.log
     this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.helpers = platform.helpers
-    this.Service = platform.api.hap.Service
-    this.Characteristic = platform.api.hap.Characteristic
+    this.S = platform.api.hap.Service
+    this.C = platform.api.hap.Characteristic
     ;['A', 'B', 'C', 'D'].forEach(v => {
       let valveService
       if (!(valveService = accessory.getService('Valve ' + v))) {
-        accessory.addService(this.Service.Valve, 'Valve ' + v, 'valve' + v.toLowerCase())
-          .setCharacteristic(this.Characteristic.Active, 0)
-          .setCharacteristic(this.Characteristic.InUse, 0)
-          .setCharacteristic(this.Characteristic.ValveType, 1)
-          .setCharacteristic(this.Characteristic.SetDuration, 120)
-          .addCharacteristic(this.Characteristic.RemainingDuration)
+        accessory.addService(this.S.Valve, 'Valve ' + v, 'valve' + v.toLowerCase())
+          .setCharacteristic(this.C.Active, 0)
+          .setCharacteristic(this.C.InUse, 0)
+          .setCharacteristic(this.C.ValveType, 1)
+          .setCharacteristic(this.C.SetDuration, 120)
+          .addCharacteristic(this.C.RemainingDuration)
         valveService = accessory.getService('Valve ' + v)
       }
-      valveService.getCharacteristic(this.Characteristic.Active)
+      valveService.getCharacteristic(this.C.Active)
         .on('set', (value, callback) => this.internalUpdate('Valve ' + v, value, callback))
-      valveService.getCharacteristic(this.Characteristic.SetDuration)
+      valveService.getCharacteristic(this.C.SetDuration)
         .on('set', (value, callback) => {
-          if (valveService.getCharacteristic(this.Characteristic.InUse).value === 1) {
-            valveService.updateCharacteristic(this.Characteristic.RemainingDuration, value)
+          if (valveService.getCharacteristic(this.C.InUse).value === 1) {
+            valveService.updateCharacteristic(this.C.RemainingDuration, value)
             clearTimeout(valveService.timer)
-            valveService.timer = setTimeout(() => valveService.setCharacteristic(this.Characteristic.Active, 0), value * 1000)
+            valveService.timer = setTimeout(() => valveService.setCharacteristic(this.C.Active, 0), value * 1000)
           }
           callback()
         })
@@ -43,70 +43,70 @@ module.exports = class deviceValveFour {
       switch (valve) {
         case 'Valve A':
           params.switches[0].switch = value ? 'on' : 'off'
-          params.switches[1].switch = this.accessory.getService('Valve B').getCharacteristic(this.Characteristic.Active).value === 1
+          params.switches[1].switch = this.accessory.getService('Valve B').getCharacteristic(this.C.Active).value === 1
             ? 'on'
             : 'off'
-          params.switches[2].switch = this.accessory.getService('Valve C').getCharacteristic(this.Characteristic.Active).value === 1
+          params.switches[2].switch = this.accessory.getService('Valve C').getCharacteristic(this.C.Active).value === 1
             ? 'on'
             : 'off'
-          params.switches[3].switch = this.accessory.getService('Valve D').getCharacteristic(this.Characteristic.Active).value === 1
+          params.switches[3].switch = this.accessory.getService('Valve D').getCharacteristic(this.C.Active).value === 1
             ? 'on'
             : 'off'
           break
         case 'Valve B':
-          params.switches[0].switch = this.accessory.getService('Valve A').getCharacteristic(this.Characteristic.Active).value === 1
+          params.switches[0].switch = this.accessory.getService('Valve A').getCharacteristic(this.C.Active).value === 1
             ? 'on'
             : 'off'
           params.switches[1].switch = value ? 'on' : 'off'
-          params.switches[2].switch = this.accessory.getService('Valve C').getCharacteristic(this.Characteristic.Active).value === 1
+          params.switches[2].switch = this.accessory.getService('Valve C').getCharacteristic(this.C.Active).value === 1
             ? 'on'
             : 'off'
-          params.switches[3].switch = this.accessory.getService('Valve D').getCharacteristic(this.Characteristic.Active).value === 1
+          params.switches[3].switch = this.accessory.getService('Valve D').getCharacteristic(this.C.Active).value === 1
             ? 'on'
             : 'off'
           break
         case 'Valve C':
-          params.switches[0].switch = this.accessory.getService('Valve A').getCharacteristic(this.Characteristic.Active).value === 1
+          params.switches[0].switch = this.accessory.getService('Valve A').getCharacteristic(this.C.Active).value === 1
             ? 'on'
             : 'off'
-          params.switches[1].switch = this.accessory.getService('Valve B').getCharacteristic(this.Characteristic.Active).value === 1
+          params.switches[1].switch = this.accessory.getService('Valve B').getCharacteristic(this.C.Active).value === 1
             ? 'on'
             : 'off'
           params.switches[2].switch = value ? 'on' : 'off'
-          params.switches[3].switch = this.accessory.getService('Valve D').getCharacteristic(this.Characteristic.Active).value === 1
+          params.switches[3].switch = this.accessory.getService('Valve D').getCharacteristic(this.C.Active).value === 1
             ? 'on'
             : 'off'
           break
         case 'Valve D':
-          params.switches[0].switch = this.accessory.getService('Valve A').getCharacteristic(this.Characteristic.Active).value === 1
+          params.switches[0].switch = this.accessory.getService('Valve A').getCharacteristic(this.C.Active).value === 1
             ? 'on'
             : 'off'
-          params.switches[1].switch = this.accessory.getService('Valve B').getCharacteristic(this.Characteristic.Active).value === 1
+          params.switches[1].switch = this.accessory.getService('Valve B').getCharacteristic(this.C.Active).value === 1
             ? 'on'
             : 'off'
-          params.switches[2].switch = this.accessory.getService('Valve C').getCharacteristic(this.Characteristic.Active).value === 1
+          params.switches[2].switch = this.accessory.getService('Valve C').getCharacteristic(this.C.Active).value === 1
             ? 'on'
             : 'off'
           params.switches[3].switch = value ? 'on' : 'off'
           break
       }
-      valveService.updateCharacteristic(this.Characteristic.InUse, value)
+      valveService.updateCharacteristic(this.C.InUse, value)
       switch (value) {
         case 0:
-          valveService.updateCharacteristic(this.Characteristic.RemainingDuration, 0)
+          valveService.updateCharacteristic(this.C.RemainingDuration, 0)
           clearTimeout(this.accessory.getService(valve).timer)
           if (!this.disableDeviceLogging) {
             this.log('[%s] current state [%s stopped].', this.accessory.displayName, valve)
           }
           break
         case 1: {
-          const timer = valveService.getCharacteristic(this.Characteristic.SetDuration).value
-          valveService.updateCharacteristic(this.Characteristic.RemainingDuration, timer)
+          const timer = valveService.getCharacteristic(this.C.SetDuration).value
+          valveService.updateCharacteristic(this.C.RemainingDuration, timer)
           if (!this.disableDeviceLogging) {
             this.log('[%s] current state [%s running].', this.accessory.displayName, valve)
           }
           valveService.timer = setTimeout(() => {
-            valveService.setCharacteristic(this.Characteristic.Active, 0)
+            valveService.setCharacteristic(this.C.Active, 0)
           }, timer * 1000)
           break
         }
@@ -125,23 +125,23 @@ module.exports = class deviceValveFour {
       ;['A', 'B', 'C', 'D'].forEach((v, k) => {
         const valveService = this.accessory.getService('Valve ' + v)
         if (params.switches[k].switch === 'on') {
-          if (valveService.getCharacteristic(this.Characteristic.Active).value === 0) {
-            const timer = valveService.getCharacteristic(this.Characteristic.SetDuration).value
-            valveService.updateCharacteristic(this.Characteristic.Active, 1)
-              .updateCharacteristic(this.Characteristic.InUse, 1)
-              .updateCharacteristic(this.Characteristic.RemainingDuration, timer)
+          if (valveService.getCharacteristic(this.C.Active).value === 0) {
+            const timer = valveService.getCharacteristic(this.C.SetDuration).value
+            valveService.updateCharacteristic(this.C.Active, 1)
+              .updateCharacteristic(this.C.InUse, 1)
+              .updateCharacteristic(this.C.RemainingDuration, timer)
             if (params.updateSource && !this.disableDeviceLogging) {
               this.log('[%s] current state [Valve %s running].', this.accessory.displayName, v)
             }
             valveService.timer = setTimeout(() => {
-              valveService.setCharacteristic(this.Characteristic.Active, 0)
+              valveService.setCharacteristic(this.C.Active, 0)
             }, timer * 1000)
           }
           return
         }
-        valveService.updateCharacteristic(this.Characteristic.Active, 0)
-          .updateCharacteristic(this.Characteristic.InUse, 0)
-          .updateCharacteristic(this.Characteristic.RemainingDuration, 0)
+        valveService.updateCharacteristic(this.C.Active, 0)
+          .updateCharacteristic(this.C.InUse, 0)
+          .updateCharacteristic(this.C.RemainingDuration, 0)
         clearTimeout(valveService.timer)
       })
     } catch (err) {
diff --git a/lib/device/valve-one.js b/lib/device/valve-one.js
index 00d79c79..846f17fb 100644
--- a/lib/device/valve-one.js
+++ b/lib/device/valve-one.js
@@ -7,30 +7,30 @@ module.exports = class deviceValveOne {
     this.log = platform.log
     this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.helpers = platform.helpers
-    this.Service = platform.api.hap.Service
-    this.Characteristic = platform.api.hap.Characteristic
+    this.S = platform.api.hap.Service
+    this.C = platform.api.hap.Characteristic
     const asConfig = platform.cusG.get(accessory.context.eweDeviceId)
     if (!['oneSwitch', 'twoSwitch'].includes(asConfig.setup)) {
       this.error = 'setup must be oneSwitch or twoSwitch'
     }
     this.setup = asConfig.setup
-    if (!(this.service = accessory.getService(this.Service.Valve))) {
-      this.service = accessory.addService(this.Service.Valve)
-      this.service.setCharacteristic(this.Characteristic.Active, 0)
-        .setCharacteristic(this.Characteristic.InUse, 0)
-        .setCharacteristic(this.Characteristic.ValveType, 1)
-        .setCharacteristic(this.Characteristic.SetDuration, 120)
-        .addCharacteristic(this.Characteristic.RemainingDuration)
+    if (!(this.service = accessory.getService(this.S.Valve))) {
+      this.service = accessory.addService(this.S.Valve)
+      this.service.setCharacteristic(this.C.Active, 0)
+        .setCharacteristic(this.C.InUse, 0)
+        .setCharacteristic(this.C.ValveType, 1)
+        .setCharacteristic(this.C.SetDuration, 120)
+        .addCharacteristic(this.C.RemainingDuration)
     }
-    this.service.getCharacteristic(this.Characteristic.Active)
+    this.service.getCharacteristic(this.C.Active)
       .on('set', this.internalUpdate.bind(this))
-    this.service.getCharacteristic(this.Characteristic.SetDuration)
+    this.service.getCharacteristic(this.C.SetDuration)
       .on('set', (value, callback) => {
-        if (this.service.getCharacteristic(this.Characteristic.InUse).value === 1) {
-          this.service.updateCharacteristic(this.Characteristic.RemainingDuration, value)
+        if (this.service.getCharacteristic(this.C.InUse).value === 1) {
+          this.service.updateCharacteristic(this.C.RemainingDuration, value)
           clearTimeout(this.timer)
           this.timer = setTimeout(
-            () => this.service.setCharacteristic(this.Characteristic.Active, 0),
+            () => this.service.setCharacteristic(this.C.Active, 0),
             value * 1000
           )
         }
@@ -56,23 +56,23 @@ module.exports = class deviceValveOne {
           params.switches[0].switch = value ? 'on' : 'off'
           break
       }
-      this.service.updateCharacteristic(this.Characteristic.InUse, value)
+      this.service.updateCharacteristic(this.C.InUse, value)
       switch (value) {
         case 0:
-          this.service.updateCharacteristic(this.Characteristic.RemainingDuration, 0)
+          this.service.updateCharacteristic(this.C.RemainingDuration, 0)
           clearTimeout(this.timer)
           if (!this.disableDeviceLogging) {
             this.log('[%s] current state [stopped].', this.accessory.displayName)
           }
           break
         case 1: {
-          const timer = this.service.getCharacteristic(this.Characteristic.SetDuration).value
-          this.service.updateCharacteristic(this.Characteristic.RemainingDuration, timer)
+          const timer = this.service.getCharacteristic(this.C.SetDuration).value
+          this.service.updateCharacteristic(this.C.RemainingDuration, timer)
           if (!this.disableDeviceLogging) {
             this.log('[%s] current state [running].', this.accessory.displayName)
           }
           this.timer = setTimeout(() => {
-            this.service.setCharacteristic(this.Characteristic.Active, 0)
+            this.service.setCharacteristic(this.C.Active, 0)
           }, timer * 1000)
           break
         }
@@ -105,23 +105,23 @@ module.exports = class deviceValveOne {
           break
       }
       if (isOn) {
-        if (this.service.getCharacteristic(this.Characteristic.Active).value === 0) {
-          const timer = this.service.getCharacteristic(this.Characteristic.SetDuration).value
-          this.service.updateCharacteristic(this.Characteristic.Active, 1)
-            .updateCharacteristic(this.Characteristic.InUse, 1)
-            .updateCharacteristic(this.Characteristic.RemainingDuration, timer)
+        if (this.service.getCharacteristic(this.C.Active).value === 0) {
+          const timer = this.service.getCharacteristic(this.C.SetDuration).value
+          this.service.updateCharacteristic(this.C.Active, 1)
+            .updateCharacteristic(this.C.InUse, 1)
+            .updateCharacteristic(this.C.RemainingDuration, timer)
           if (params.updateSource && !this.disableDeviceLogging) {
             this.log('[%s] current state [running].', this.accessory.displayName)
           }
           this.timer = setTimeout(() => {
-            this.service.setCharacteristic(this.Characteristic.Active, 0)
+            this.service.setCharacteristic(this.C.Active, 0)
           }, timer * 1000)
         }
         return
       }
-      this.service.updateCharacteristic(this.Characteristic.Active, 0)
-        .updateCharacteristic(this.Characteristic.InUse, 0)
-        .updateCharacteristic(this.Characteristic.RemainingDuration, 0)
+      this.service.updateCharacteristic(this.C.Active, 0)
+        .updateCharacteristic(this.C.InUse, 0)
+        .updateCharacteristic(this.C.RemainingDuration, 0)
       clearTimeout(this.timer)
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
diff --git a/lib/device/valve-two.js b/lib/device/valve-two.js
index 2a3c9a98..e5764e96 100644
--- a/lib/device/valve-two.js
+++ b/lib/device/valve-two.js
@@ -7,27 +7,27 @@ module.exports = class deviceValveTwo {
     this.log = platform.log
     this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.helpers = platform.helpers
-    this.Service = platform.api.hap.Service
-    this.Characteristic = platform.api.hap.Characteristic
+    this.S = platform.api.hap.Service
+    this.C = platform.api.hap.Characteristic
     ;['A', 'B'].forEach(v => {
       let valveService
       if (!(valveService = accessory.getService('Valve ' + v))) {
-        accessory.addService(this.Service.Valve, 'Valve ' + v, 'valve' + v.toLowerCase())
-          .setCharacteristic(this.Characteristic.Active, 0)
-          .setCharacteristic(this.Characteristic.InUse, 0)
-          .setCharacteristic(this.Characteristic.ValveType, 1)
-          .setCharacteristic(this.Characteristic.SetDuration, 120)
-          .addCharacteristic(this.Characteristic.RemainingDuration)
+        accessory.addService(this.S.Valve, 'Valve ' + v, 'valve' + v.toLowerCase())
+          .setCharacteristic(this.C.Active, 0)
+          .setCharacteristic(this.C.InUse, 0)
+          .setCharacteristic(this.C.ValveType, 1)
+          .setCharacteristic(this.C.SetDuration, 120)
+          .addCharacteristic(this.C.RemainingDuration)
         valveService = accessory.getService('Valve ' + v)
       }
-      valveService.getCharacteristic(this.Characteristic.Active)
+      valveService.getCharacteristic(this.C.Active)
         .on('set', (value, callback) => this.internalUpdate('Valve ' + v, value, callback))
-      valveService.getCharacteristic(this.Characteristic.SetDuration)
+      valveService.getCharacteristic(this.C.SetDuration)
         .on('set', (value, callback) => {
-          if (valveService.getCharacteristic(this.Characteristic.InUse).value === 1) {
-            valveService.updateCharacteristic(this.Characteristic.RemainingDuration, value)
+          if (valveService.getCharacteristic(this.C.InUse).value === 1) {
+            valveService.updateCharacteristic(this.C.RemainingDuration, value)
             clearTimeout(valveService.timer)
-            valveService.timer = setTimeout(() => valveService.setCharacteristic(this.Characteristic.Active, 0), value * 1000)
+            valveService.timer = setTimeout(() => valveService.setCharacteristic(this.C.Active, 0), value * 1000)
           }
           callback()
         })
@@ -43,34 +43,34 @@ module.exports = class deviceValveTwo {
       switch (valve) {
         case 'Valve A':
           params.switches[0].switch = value ? 'on' : 'off'
-          params.switches[1].switch = this.accessory.getService('Valve B').getCharacteristic(this.Characteristic.Active).value === 1
+          params.switches[1].switch = this.accessory.getService('Valve B').getCharacteristic(this.C.Active).value === 1
             ? 'on'
             : 'off'
           break
         case 'Valve B':
-          params.switches[0].switch = this.accessory.getService('Valve A').getCharacteristic(this.Characteristic.Active).value === 1
+          params.switches[0].switch = this.accessory.getService('Valve A').getCharacteristic(this.C.Active).value === 1
             ? 'on'
             : 'off'
           params.switches[1].switch = value ? 'on' : 'off'
           break
       }
-      valveService.updateCharacteristic(this.Characteristic.InUse, value)
+      valveService.updateCharacteristic(this.C.InUse, value)
       switch (value) {
         case 0:
-          valveService.updateCharacteristic(this.Characteristic.RemainingDuration, 0)
+          valveService.updateCharacteristic(this.C.RemainingDuration, 0)
           clearTimeout(this.accessory.getService(valve).timer)
           if (!this.disableDeviceLogging) {
             this.log('[%s] current state [%s stopped].', this.accessory.displayName, valve)
           }
           break
         case 1: {
-          const timer = valveService.getCharacteristic(this.Characteristic.SetDuration).value
-          valveService.updateCharacteristic(this.Characteristic.RemainingDuration, timer)
+          const timer = valveService.getCharacteristic(this.C.SetDuration).value
+          valveService.updateCharacteristic(this.C.RemainingDuration, timer)
           if (!this.disableDeviceLogging) {
             this.log('[%s] current state [%s running].', this.accessory.displayName, valve)
           }
           valveService.timer = setTimeout(() => {
-            valveService.setCharacteristic(this.Characteristic.Active, 0)
+            valveService.setCharacteristic(this.C.Active, 0)
           }, timer * 1000)
           break
         }
@@ -89,23 +89,23 @@ module.exports = class deviceValveTwo {
       ;['A', 'B'].forEach((v, k) => {
         const valveService = this.accessory.getService('Valve ' + v)
         if (params.switches[k].switch === 'on') {
-          if (valveService.getCharacteristic(this.Characteristic.Active).value === 0) {
-            const timer = valveService.getCharacteristic(this.Characteristic.SetDuration).value
-            valveService.updateCharacteristic(this.Characteristic.Active, 1)
-              .updateCharacteristic(this.Characteristic.InUse, 1)
-              .updateCharacteristic(this.Characteristic.RemainingDuration, timer)
+          if (valveService.getCharacteristic(this.C.Active).value === 0) {
+            const timer = valveService.getCharacteristic(this.C.SetDuration).value
+            valveService.updateCharacteristic(this.C.Active, 1)
+              .updateCharacteristic(this.C.InUse, 1)
+              .updateCharacteristic(this.C.RemainingDuration, timer)
             if (params.updateSource && !this.disableDeviceLogging) {
               this.log('[%s] current state [Valve %s running].', this.accessory.displayName, v)
             }
             valveService.timer = setTimeout(() => {
-              valveService.setCharacteristic(this.Characteristic.Active, 0)
+              valveService.setCharacteristic(this.C.Active, 0)
             }, timer * 1000)
           }
           return
         }
-        valveService.updateCharacteristic(this.Characteristic.Active, 0)
-          .updateCharacteristic(this.Characteristic.InUse, 0)
-          .updateCharacteristic(this.Characteristic.RemainingDuration, 0)
+        valveService.updateCharacteristic(this.C.Active, 0)
+          .updateCharacteristic(this.C.InUse, 0)
+          .updateCharacteristic(this.C.RemainingDuration, 0)
         clearTimeout(valveService.timer)
       })
     } catch (err) {
diff --git a/lib/device/zb-dev.js b/lib/device/zb-dev.js
index 8b8e4832..71b6aa84 100644
--- a/lib/device/zb-dev.js
+++ b/lib/device/zb-dev.js
@@ -8,19 +8,19 @@ module.exports = class deviceZBDev {
     this.log = platform.log
     this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.helpers = platform.helpers
-    this.Service = platform.api.hap.Service
-    this.Characteristic = platform.api.hap.Characteristic
+    this.S = platform.api.hap.Service
+    this.C = platform.api.hap.Characteristic
     const self = this
     this.eveLastActivation = function () {
-      self.Characteristic.call(this, 'Last Activation', self.helpers.eveUUID.lastActivation)
+      self.C.call(this, 'Last Activation', self.helpers.eveUUID.lastActivation)
       this.setProps({
-        format: self.Characteristic.Formats.UINT32,
-        unit: self.Characteristic.Units.SECONDS,
-        perms: [self.Characteristic.Perms.READ, self.Characteristic.Perms.NOTIFY]
+        format: self.C.Formats.UINT32,
+        unit: self.C.Units.SECONDS,
+        perms: [self.C.Perms.READ, self.C.Perms.NOTIFY]
       })
       this.value = this.getDefaultValue()
     }
-    util.inherits(this.eveLastActivation, this.Characteristic)
+    util.inherits(this.eveLastActivation, this.C)
     this.eveLastActivation.UUID = this.helpers.eveUUID.lastActivation
     this.lowBattThreshold = parseInt(this.platform.config.lowBattThreshold)
     this.lowBattThreshold = isNaN(this.lowBattThreshold)
@@ -36,37 +36,37 @@ module.exports = class deviceZBDev {
         : this.sensorTimeDifference
     switch (accessory.context.eweUIID) {
       case 1000: {
-        if (!accessory.getService(this.Service.BatteryService)) accessory.addService(this.Service.BatteryService)
+        if (!accessory.getService(this.S.BatteryService)) accessory.addService(this.S.BatteryService)
         const zbspsService =
-          accessory.getService(this.Service.StatelessProgrammableSwitch) ||
-          accessory.addService(this.Service.StatelessProgrammableSwitch)
+          accessory.getService(this.S.StatelessProgrammableSwitch) ||
+          accessory.addService(this.S.StatelessProgrammableSwitch)
         if (this.platform.config.hideZBLDPress) {
           zbspsService
-            .getCharacteristic(this.Characteristic.ProgrammableSwitchEvent)
+            .getCharacteristic(this.C.ProgrammableSwitchEvent)
             .setProps({ validValues: [0] })
         }
         break
       }
       case 1009:
       case 1256:
-        if (accessory.getService(this.Service.BatteryService)) {
-          accessory.removeService(accessory.getService(this.Service.BatteryService))
+        if (accessory.getService(this.S.BatteryService)) {
+          accessory.removeService(accessory.getService(this.S.BatteryService))
         }
-        if (!accessory.getService(this.Service.Switch)) accessory.addService(this.Service.Switch)
+        if (!accessory.getService(this.S.Switch)) accessory.addService(this.S.Switch)
         accessory.log = platform.config.debugFakegato ? this.log : () => {}
         accessory.historyService = new this.platform.eveService('switch', accessory, {
           storage: 'fs',
           path: platform.eveLogPath
         })
-        accessory.getService(this.Service.Switch).getCharacteristic(this.Characteristic.On)
+        accessory.getService(this.S.Switch).getCharacteristic(this.C.On)
           .on('set', this.internalUpdate.bind(this))
         break
       case 1770: {
-        if (!accessory.getService(this.Service.BatteryService)) accessory.addService(this.Service.BatteryService)
-        const tempService = accessory.getService(this.Service.TemperatureSensor) || accessory.addService(this.Service.TemperatureSensor)
-        tempService.getCharacteristic(this.Characteristic.CurrentTemperature)
+        if (!accessory.getService(this.S.BatteryService)) accessory.addService(this.S.BatteryService)
+        const tempService = accessory.getService(this.S.TemperatureSensor) || accessory.addService(this.S.TemperatureSensor)
+        tempService.getCharacteristic(this.C.CurrentTemperature)
           .setProps({ minValue: -100 })
-        if (!accessory.getService(this.Service.HumiditySensor)) accessory.addService(this.Service.HumiditySensor)
+        if (!accessory.getService(this.S.HumiditySensor)) accessory.addService(this.S.HumiditySensor)
         accessory.log = platform.config.debugFakegato ? this.log : () => {}
         accessory.historyService = new this.platform.eveService('weather', accessory, {
           storage: 'fs',
@@ -75,8 +75,8 @@ module.exports = class deviceZBDev {
         break
       }
       case 2026:
-        if (!accessory.getService(this.Service.BatteryService)) accessory.addService(this.Service.BatteryService)
-        if (!accessory.getService(this.Service.MotionSensor)) accessory.addService(this.Service.MotionSensor)
+        if (!accessory.getService(this.S.BatteryService)) accessory.addService(this.S.BatteryService)
+        if (!accessory.getService(this.S.MotionSensor)) accessory.addService(this.S.MotionSensor)
         accessory.log = platform.config.debugFakegato ? this.log : () => {}
         accessory.historyService = new this.platform.eveService('motion', accessory, {
           storage: 'fs',
@@ -84,8 +84,8 @@ module.exports = class deviceZBDev {
         })
         break
       case 3026:
-        if (!accessory.getService(this.Service.BatteryService)) accessory.addService(this.Service.BatteryService)
-        if (!accessory.getService(this.Service.ContactSensor)) accessory.addService(this.Service.ContactSensor)
+        if (!accessory.getService(this.S.BatteryService)) accessory.addService(this.S.BatteryService)
+        if (!accessory.getService(this.S.ContactSensor)) accessory.addService(this.S.ContactSensor)
         accessory.log = platform.config.debugFakegato ? this.log : () => {}
         accessory.historyService = new this.platform.eveService('door', accessory, {
           storage: 'fs',
@@ -121,9 +121,9 @@ module.exports = class deviceZBDev {
       if (params.battery) {
         if (this.accessory.context.eweUIID === 3026 && this.platform.config.ZBDWBatt) params.battery *= 10
         if (params.battery !== this.cacheBattery) {
-          const batt = this.accessory.getService(this.Service.BatteryService) || this.accessory.addService(this.Service.BatteryService)
-          batt.updateCharacteristic(this.Characteristic.BatteryLevel, params.battery)
-          batt.updateCharacteristic(this.Characteristic.StatusLowBattery, params.battery < this.lowBattThreshold)
+          const batt = this.accessory.getService(this.S.BatteryService) || this.accessory.addService(this.S.BatteryService)
+          batt.updateCharacteristic(this.C.BatteryLevel, params.battery)
+          batt.updateCharacteristic(this.C.StatusLowBattery, params.battery < this.lowBattThreshold)
           this.cacheBattery = params.battery
           if (params.updateSource && !this.disableDeviceLogging) {
             this.log('[%s] current battery [%s%].', this.accessory.displayName, params.battery)
@@ -133,8 +133,8 @@ module.exports = class deviceZBDev {
       switch (this.accessory.context.eweUIID) {
         case 1000:
           if (this.helpers.hasProperty(params, 'key') && [0, 1, 2].includes(params.key)) {
-            this.accessory.getService(this.Service.StatelessProgrammableSwitch)
-              .updateCharacteristic(this.Characteristic.ProgrammableSwitchEvent, params.key)
+            this.accessory.getService(this.S.StatelessProgrammableSwitch)
+              .updateCharacteristic(this.C.ProgrammableSwitchEvent, params.key)
             if (params.updateSource && !this.disableDeviceLogging) {
               this.log(
                 '[%s] current state [%s].',
@@ -151,8 +151,8 @@ module.exports = class deviceZBDev {
         case 1009:
         case 1256:
           if (params.switch && params.switch !== this.cacheOnOff) {
-            this.accessory.getService(this.Service.Switch)
-              .updateCharacteristic(this.Characteristic.On, params.switch === 'on')
+            this.accessory.getService(this.S.Switch)
+              .updateCharacteristic(this.C.On, params.switch === 'on')
             this.cacheOnOff = params.switch
             this.accessory.historyService.addEntry({
               time: Math.round(new Date().valueOf() / 1000),
@@ -168,8 +168,8 @@ module.exports = class deviceZBDev {
           if (params.temperature && params.temperature !== this.cacheTemp) {
             this.cacheTemp = params.temperature
             const currentTemp = parseInt(params.temperature) / 100
-            this.accessory.getService(this.Service.TemperatureSensor)
-              .updateCharacteristic(this.Characteristic.CurrentTemperature, currentTemp)
+            this.accessory.getService(this.S.TemperatureSensor)
+              .updateCharacteristic(this.C.CurrentTemperature, currentTemp)
             if (params.updateSource && !this.disableDeviceLogging) {
               this.log('[%s] current temperature [%s].', this.accessory.displayName, currentTemp)
             }
@@ -178,8 +178,8 @@ module.exports = class deviceZBDev {
           if (params.humidity && params.humidity !== this.cacheHumi) {
             this.cacheHumi = params.humidity
             const currentHumi = parseInt(params.humidity) / 100
-            this.accessory.getService(this.Service.HumiditySensor)
-              .updateCharacteristic(this.Characteristic.CurrentRelativeHumidity, currentHumi)
+            this.accessory.getService(this.S.HumiditySensor)
+              .updateCharacteristic(this.C.CurrentRelativeHumidity, currentHumi)
             eveLog.humidity = currentHumi
             if (params.updateSource && !this.disableDeviceLogging) {
               this.log('[%s] current humidity [%s].', this.accessory.displayName, currentHumi)
@@ -207,21 +207,21 @@ module.exports = class deviceZBDev {
               this.log('[%s] current state [motion%s detected].', this.accessory.displayName, motionDetected ? '' : ' not')
             }
             if (motionDetected) {
-              this.accessory.getService(this.Service.MotionSensor)
+              this.accessory.getService(this.S.MotionSensor)
                 .updateCharacteristic(
                   this.eveLastActivation,
                   Math.round(new Date().valueOf() / 1000) - this.accessory.historyService.getInitialTime()
                 )
             }
-            this.accessory.getService(this.Service.MotionSensor)
-              .updateCharacteristic(this.Characteristic.MotionDetected, motionDetected)
+            this.accessory.getService(this.S.MotionSensor)
+              .updateCharacteristic(this.C.MotionDetected, motionDetected)
             break
           }
           break
         case 3026:
           if (this.helpers.hasProperty(params, 'lock') && [0, 1].includes(params.lock)) {
-            this.accessory.getService(this.Service.ContactSensor)
-              .updateCharacteristic(this.Characteristic.ContactSensorState, params.lock)
+            this.accessory.getService(this.S.ContactSensor)
+              .updateCharacteristic(this.C.ContactSensorState, params.lock)
             if (params.updateSource && !this.disableDeviceLogging) {
               this.log('[%s] current state [contact%s detected].', this.accessory.displayName, params.lock === 0 ? '' : ' not')
             }
@@ -230,7 +230,7 @@ module.exports = class deviceZBDev {
               status: params.lock
             })
             if (params.lock === 1) {
-              this.accessory.getService(this.Service.ContactSensor)
+              this.accessory.getService(this.S.ContactSensor)
                 .updateCharacteristic(
                   this.eveLastActivation,
                   Math.round(new Date().valueOf() / 1000) - this.accessory.historyService.getInitialTime()
diff --git a/lib/index.js b/lib/index.js
index f543b8f2..13772557 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -17,8 +17,6 @@ class eWeLinkPlatform {
       this.log = log
       this.config = config
       this.api = api
-      this.Characteristic = api.hap.Characteristic
-      this.Service = api.hap.Service
       this.helpers = require('./utils/helpers')
       this.debug = this.config.debug
       this.colourUtils = require('./utils/colour-utils')
@@ -400,8 +398,8 @@ class eWeLinkPlatform {
             oAccessory = this.devicesInHB.has(device.deviceid + 'SW' + i)
               ? this.devicesInHB.get(device.deviceid + 'SW' + i)
               : this.addAccessory(device, device.deviceid + 'SW' + i)
-            oAccessory.getService(this.Service.AccessoryInformation)
-              .setCharacteristic(this.Characteristic.FirmwareRevision, device.params.fwVersion || PLUGIN.version)
+            oAccessory.getService(this.api.hap.Service.AccessoryInformation)
+              .setCharacteristic(this.api.hap.Characteristic.FirmwareRevision, device.params.fwVersion || PLUGIN.version)
           }
           oAccessory.context.reachableWAN = device.online
           oAccessory.context.reachableLAN = this.lanClient && this.lanDevices.has(device.deviceid)
@@ -481,8 +479,8 @@ class eWeLinkPlatform {
           oAccessory = this.devicesInHB.has(device.deviceid + 'SW' + swNumber)
             ? this.devicesInHB.get(device.deviceid + 'SW' + swNumber)
             : this.addAccessory(device, device.deviceid + 'SW' + swNumber, false, subExtraContext, 'rf_sub')
-          oAccessory.getService(this.Service.AccessoryInformation)
-            .setCharacteristic(this.Characteristic.FirmwareRevision, device.params.fwVersion || PLUGIN.version)
+          oAccessory.getService(this.api.hap.Service.AccessoryInformation)
+            .setCharacteristic(this.api.hap.Characteristic.FirmwareRevision, device.params.fwVersion || PLUGIN.version)
           oAccessory.context.reachableWAN = device.online
           oAccessory.context.reachableLAN = false
           oAccessory.context.eweBrandName = device.brandName
@@ -537,8 +535,8 @@ class eWeLinkPlatform {
 
       // *** Update the current firmware version *** \\
       if (!this.hiddenMasters.includes(device.deviceid)) {
-        accessory.getService(this.Service.AccessoryInformation)
-          .setCharacteristic(this.Characteristic.FirmwareRevision, device.params.fwVersion || PLUGIN.version)
+        accessory.getService(this.api.hap.Service.AccessoryInformation)
+          .setCharacteristic(this.api.hap.Characteristic.FirmwareRevision, device.params.fwVersion || PLUGIN.version)
       }
 
       // *** Update the reachability values (via WS and LAN) *** \\
@@ -603,12 +601,12 @@ class eWeLinkPlatform {
       // *** Add the new accessory to Homebridge *** \\
       const accessory = new this.api.platformAccessory(newDeviceName, this.api.hap.uuid.generate(hbDeviceId))
       if (!hidden) {
-        accessory.getService(this.Service.AccessoryInformation)
-          .setCharacteristic(this.Characteristic.SerialNumber, hbDeviceId)
-          .setCharacteristic(this.Characteristic.Manufacturer, device.brandName)
-          .setCharacteristic(this.Characteristic.Model, device.productModel + ' (' + device.extra.model + ')')
-          .setCharacteristic(this.Characteristic.FirmwareRevision, device.params.fwVersion || PLUGIN.version)
-          .setCharacteristic(this.Characteristic.Identify, true)
+        accessory.getService(this.api.hap.Service.AccessoryInformation)
+          .setCharacteristic(this.api.hap.Characteristic.SerialNumber, hbDeviceId)
+          .setCharacteristic(this.api.hap.Characteristic.Manufacturer, device.brandName)
+          .setCharacteristic(this.api.hap.Characteristic.Model, device.productModel + ' (' + device.extra.model + ')')
+          .setCharacteristic(this.api.hap.Characteristic.FirmwareRevision, device.params.fwVersion || PLUGIN.version)
+          .setCharacteristic(this.api.hap.Characteristic.Identify, true)
         accessory.on('identify', (paired, callback) => {
           callback()
           this.log('[%s] identify button pressed.', accessory.displayName)

From 96e7eb11c42295dd9b2004bf1ade4fe408e2a55d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 24 Jan 2021 10:58:13 +0000
Subject: [PATCH 1199/3183] shorten vars

---
 lib/device/blind.js         | 10 +++--
 lib/device/curtain.js       |  8 ++--
 lib/device/diffuser.js      | 29 ++++++-------
 lib/device/fan.js           | 26 ++++++------
 lib/device/garage-eachen.js | 15 ++++---
 lib/device/garage-four.js   | 17 ++++----
 lib/device/garage-one.js    | 21 ++++++----
 lib/device/garage-two.js    | 22 +++++-----
 lib/device/light-colour.js  | 46 ++++++++++----------
 lib/device/light-ctemp.js   | 26 ++++++------
 lib/device/light-dimmer.js  | 16 +++----
 lib/device/lock-one.js      | 21 ++++++----
 lib/device/outlet.js        | 47 ++++++++++++---------
 lib/device/rf-bridge.js     | 22 +++++-----
 lib/device/scm.js           | 14 ++++---
 lib/device/sensor.js        | 16 +++----
 lib/device/switch-multi.js  | 10 +++--
 lib/device/switch-single.js | 18 ++++----
 lib/device/switch-valve.js  | 24 ++++++-----
 lib/device/tap-one.js       | 19 +++++----
 lib/device/tap-two.js       | 12 +++---
 lib/device/th-outlet.js     | 38 +++++++++--------
 lib/device/th-thermo.js     | 34 ++++++++-------
 lib/device/usb.js           | 26 ++++++------
 lib/device/valve-four.js    | 17 ++++----
 lib/device/valve-one.js     | 20 +++++----
 lib/device/valve-two.js     | 17 ++++----
 lib/device/zb-dev.js        | 84 ++++++++++++++++++++++---------------
 28 files changed, 378 insertions(+), 297 deletions(-)

diff --git a/lib/device/blind.js b/lib/device/blind.js
index 469f483b..496c7e99 100644
--- a/lib/device/blind.js
+++ b/lib/device/blind.js
@@ -9,15 +9,17 @@ module.exports = class deviceBlind {
     this.helpers = platform.helpers
     this.S = platform.api.hap.Service
     this.C = platform.api.hap.Characteristic
-    if (!(this.service = accessory.getService(this.S.WindowCovering))) {
-      this.service = accessory.addService(this.S.WindowCovering)
+    this.dName = accessory.displayName
+    this.accessory = accessory
+
+    if (!(this.service = this.accessory.getService(this.S.WindowCovering))) {
+      this.service = this.accessory.addService(this.S.WindowCovering)
       this.service.setCharacteristic(this.C.CurrentPosition, 0)
         .setCharacteristic(this.C.TargetPosition, 0)
         .setCharacteristic(this.C.PositionState, 2)
     }
     this.service.getCharacteristic(this.C.TargetPosition)
       .on('set', this.internalUpdate.bind(this))
-    this.accessory = accessory
   }
 
   async internalUpdate (value, callback) {
@@ -66,7 +68,7 @@ module.exports = class deviceBlind {
       this.accessory.context.cachePositionState = 2
       this.accessory.context.cacheCurrentPosition = value
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current position [%s%]', this.accessory.displayName, value)
+        this.log('[%s] current position [%s%]', this.dName, value)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
diff --git a/lib/device/curtain.js b/lib/device/curtain.js
index 9e59daa7..69642043 100644
--- a/lib/device/curtain.js
+++ b/lib/device/curtain.js
@@ -9,10 +9,12 @@ module.exports = class deviceCurtain {
     this.helpers = platform.helpers
     this.S = platform.api.hap.Service
     this.C = platform.api.hap.Characteristic
-    this.service = accessory.getService(this.S.WindowCovering) || accessory.addService(this.S.WindowCovering)
+    this.dName = accessory.displayName
+    this.accessory = accessory
+
+    this.service = this.accessory.getService(this.S.WindowCovering) || this.accessory.addService(this.S.WindowCovering)
     this.service.getCharacteristic(this.C.TargetPosition)
       .on('set', this.internalUpdate.bind(this))
-    this.accessory = accessory
   }
 
   async internalUpdate (value, callback) {
@@ -42,7 +44,7 @@ module.exports = class deviceCurtain {
       if (params.updateSource && this.cachePosition !== newPos) {
         this.cachePosition = newPos
         if (!this.disableDeviceLogging) {
-          this.log('[%s] current position [%s%].', this.accessory.displayName, this.cachePosition)
+          this.log('[%s] current position [%s%].', this.dName, this.cachePosition)
         }
       }
     } catch (err) {
diff --git a/lib/device/diffuser.js b/lib/device/diffuser.js
index 83cd97d2..70eed33e 100644
--- a/lib/device/diffuser.js
+++ b/lib/device/diffuser.js
@@ -10,11 +10,13 @@ module.exports = class deviceDiffuser {
     this.colourUtils = platform.colourUtils
     this.S = platform.api.hap.Service
     this.C = platform.api.hap.Characteristic
-    this.fanService = accessory.getService('Diffuser') || accessory.addService(this.S.Fan, 'Diffuser', 'diffuser')
-    this.lightService = accessory.getService('Light') || accessory.addService(this.S.Lightbulb, 'Light', 'light')
+    this.dName = accessory.displayName
+    this.accessory = accessory
+
+    this.fanService = this.accessory.getService('Diffuser') || this.accessory.addService(this.S.Fan, 'Diffuser', 'diffuser')
+    this.lightService = this.accessory.getService('Light') || this.accessory.addService(this.S.Lightbulb, 'Light', 'light')
     this.fanService.getCharacteristic(this.C.On)
       .on('set', this.internalDiffuserOnOffUpdate.bind(this))
-    this.accessory = accessory
     this.fanService.getCharacteristic(this.C.RotationSpeed)
       .on('set', this.internalDiffuserSpeedUpdate.bind(this))
       .setProps({ minStep: 50 })
@@ -26,7 +28,6 @@ module.exports = class deviceDiffuser {
       .on('set', this.internalLightColourUpdate.bind(this))
     this.lightService.getCharacteristic(this.C.Saturation)
       .on('set', (value, callback) => callback())
-    this.accessory = accessory
   }
 
   async internalDiffuserOnOffUpdate (value, callback) {
@@ -45,7 +46,7 @@ module.exports = class deviceDiffuser {
       }, 10000)
       await this.platform.sendDeviceUpdate(this.accessory, params)
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current state [%s].', this.accessory.displayName, this.cacheOnOff)
+        this.log('[%s] current state [%s].', this.dName, this.cacheOnOff)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
@@ -76,7 +77,7 @@ module.exports = class deviceDiffuser {
       }, 10000)
       await this.platform.sendDeviceUpdate(this.accessory, params)
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current speed [%s%].', this.accessory.displayName, newSpeed)
+        this.log('[%s] current speed [%s%].', this.dName, newSpeed)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
@@ -104,7 +105,7 @@ module.exports = class deviceDiffuser {
       }, 10000)
       await this.platform.sendDeviceUpdate(this.accessory, params)
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current light [%s%].', this.accessory.displayName, value ? 'on' : 'off')
+        this.log('[%s] current light [%s%].', this.dName, value ? 'on' : 'off')
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
@@ -132,7 +133,7 @@ module.exports = class deviceDiffuser {
       }, 10000)
       await this.platform.sendDeviceUpdate(this.accessory, params)
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current brightness [%s%].', this.accessory.displayName, this.cacheBrightness)
+        this.log('[%s] current brightness [%s%].', this.dName, this.cacheBrightness)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
@@ -171,7 +172,7 @@ module.exports = class deviceDiffuser {
       }, 10000)
       await this.platform.sendDeviceUpdate(this.accessory, params)
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current colour [rgb %s %s %s].', this.accessory.displayName, this.cacheR, this.cacheG, this.cacheB)
+        this.log('[%s] current colour [rgb %s %s %s].', this.dName, this.cacheR, this.cacheG, this.cacheB)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
@@ -186,7 +187,7 @@ module.exports = class deviceDiffuser {
       if (params.switch && params.switch !== this.cacheOnOff) {
         this.cacheOnOff = params.switch
         if (params.updateSource && !this.disableDeviceLogging) {
-          this.log('[%s] current state [%s%].', this.accessory.displayName, this.cacheOnOff)
+          this.log('[%s] current state [%s%].', this.dName, this.cacheOnOff)
         }
         this.fanService.updateCharacteristic(this.C.On, this.cacheOnOff === 'on')
         if (!this.helpers.hasProperty(params, 'state')) {
@@ -197,21 +198,21 @@ module.exports = class deviceDiffuser {
         this.cacheSpeed = params.state * 50
         this.fanService.updateCharacteristic(this.C.RotationSpeed, this.cacheSpeed)
         if (params.updateSource && !this.disableDeviceLogging) {
-          this.log('[%s] current speed [%s%].', this.accessory.displayName, this.cacheSpeed)
+          this.log('[%s] current speed [%s%].', this.dName, this.cacheSpeed)
         }
       }
       if (this.helpers.hasProperty(params, 'lightswitch') && this.cacheLightOnOff !== params.lightswitch) {
         this.cacheLightOnOff = params.lightswitch
         this.lightService.updateCharacteristic(this.C.On, params.lightswitch === 1)
         if (params.updateSource && !this.disableDeviceLogging) {
-          this.log('[%s] current light [%s%].', this.accessory.displayNameparams.lightswitch === 1 ? 'on' : 'off')
+          this.log('[%s] current light [%s%].', this.dNameparams.lightswitch === 1 ? 'on' : 'off')
         }
       }
       if (this.helpers.hasProperty(params, 'lightbright') && this.cacheBrightness !== params.lightbright) {
         this.cacheBrightness = params.lightbright
         this.lightService.updateCharacteristic(this.C.Brightness, params.lightbright)
         if (params.updateSource && !this.disableDeviceLogging) {
-          this.log('[%s] current brightness [%s%].', this.accessory.displayNameparams.lightbright)
+          this.log('[%s] current brightness [%s%].', this.dNameparams.lightbright)
         }
       }
       if (this.helpers.hasProperty(params, 'lightRcolor')) {
@@ -224,7 +225,7 @@ module.exports = class deviceDiffuser {
           this.lightService.updateCharacteristic(this.C.Hue, this.cacheHue)
             .updateCharacteristic(this.C.Saturation, 100)
           if (params.updateSource && !this.disableDeviceLogging) {
-            this.log('[%s] current colour [rgb %s %s %s].', this.accessory.displayName, this.cacheR, this.cacheG, this.cacheB)
+            this.log('[%s] current colour [rgb %s %s %s].', this.dName, this.cacheR, this.cacheG, this.cacheB)
           }
         }
       }
diff --git a/lib/device/fan.js b/lib/device/fan.js
index 5d795b35..d1f0eeff 100644
--- a/lib/device/fan.js
+++ b/lib/device/fan.js
@@ -9,7 +9,10 @@ module.exports = class deviceFan {
     this.helpers = platform.helpers
     this.S = platform.api.hap.Service
     this.C = platform.api.hap.Characteristic
-    this.service = accessory.getService(this.S.Fan) || accessory.addService(this.S.Fan)
+    this.dName = accessory.displayName
+    this.accessory = accessory
+
+    this.service = this.accessory.getService(this.S.Fan) || this.accessory.addService(this.S.Fan)
     this.service.getCharacteristic(this.C.On)
       .on('set', (value, callback) => {
         callback()
@@ -18,16 +21,15 @@ module.exports = class deviceFan {
     this.service.getCharacteristic(this.C.RotationSpeed)
       .on('set', this.internalSpeedUpdate.bind(this))
       .setProps({ minStep: 33 })
-    if ((this.platform.config.hideLightFromFan || '').split(',').includes(accessory.context.eweDeviceId)) {
-      if (accessory.getService(this.S.Lightbulb)) {
-        accessory.removeService(accessory.getService(this.S.Lightbulb))
+    if ((this.platform.config.hideLightFromFan || '').split(',').includes(this.accessory.context.eweDeviceId)) {
+      if (this.accessory.getService(this.S.Lightbulb)) {
+        this.accessory.removeService(this.accessory.getService(this.S.Lightbulb))
       }
     } else {
-      this.lightService = accessory.getService(this.S.Lightbulb) || accessory.addService(this.S.Lightbulb)
+      this.lightService = this.accessory.getService(this.S.Lightbulb) || this.accessory.addService(this.S.Lightbulb)
       this.lightService.getCharacteristic(this.C.On)
         .on('set', this.internalLightUpdate.bind(this))
     }
-    this.accessory = accessory
   }
 
   async internalSpeedUpdate (value, callback) {
@@ -45,13 +47,13 @@ module.exports = class deviceFan {
       if (newPower !== (this.cacheOnOff === 'on')) {
         this.cacheOnOff = newPower ? 'on' : 'off'
         if (!this.disableDeviceLogging) {
-          this.log('[%s] current state [%s].', this.accessory.displayName, this.cacheOnOff)
+          this.log('[%s] current state [%s].', this.dName, this.cacheOnOff)
         }
       }
       if (newSpeed !== this.cacheSpeed) {
         this.cacheSpeed = newSpeed
         if (!this.disableDeviceLogging) {
-          this.log('[%s] current speed [%s%].', this.accessory.displayName, this.cacheSpeed)
+          this.log('[%s] current speed [%s%].', this.dName, this.cacheSpeed)
         }
       }
     } catch (err) {
@@ -74,7 +76,7 @@ module.exports = class deviceFan {
       if (newLight !== (this.cacheLight === 'on')) {
         this.cacheLight = newLight ? 'on' : 'off'
         if (!this.disableDeviceLogging) {
-          this.log('[%s] current light [%s].', this.accessory.displayName, this.cacheLight)
+          this.log('[%s] current light [%s].', this.dName, this.cacheLight)
         }
       }
     } catch (err) {
@@ -91,7 +93,7 @@ module.exports = class deviceFan {
         this.cacheOnOff = params.switches[1].switch
         this.service.updateCharacteristic(this.C.On, this.cacheLight === 'on')
         if (params.updateSource && !this.disableDeviceLogging) {
-          this.log('[%s] current state [%s].', this.accessory.displayName, this.cacheOnOff)
+          this.log('[%s] current state [%s].', this.dName, this.cacheOnOff)
         }
       }
       let speed = 0
@@ -109,14 +111,14 @@ module.exports = class deviceFan {
         this.cacheSpeed = speed
         this.service.updateCharacteristic(this.C.RotationSpeed, this.cacheSpeed)
         if (params.updateSource && !this.disableDeviceLogging) {
-          this.log('[%s] current speed [%s%].', this.accessory.displayName, this.cacheSpeed)
+          this.log('[%s] current speed [%s%].', this.dName, this.cacheSpeed)
         }
       }
       if (this.lightService && params.switches[0].switch !== this.cacheLight) {
         this.cacheLight = params.switches[0].switch
         this.lightService.updateCharacteristic(this.C.On, this.cacheLight === 'on')
         if (params.updateSource && !this.disableDeviceLogging) {
-          this.log('[%s] current light state [%s].', this.accessory.displayName, this.cacheLight)
+          this.log('[%s] current light state [%s].', this.dName, this.cacheLight)
         }
       }
     } catch (err) {
diff --git a/lib/device/garage-eachen.js b/lib/device/garage-eachen.js
index 6c442bee..4eab2a49 100644
--- a/lib/device/garage-eachen.js
+++ b/lib/device/garage-eachen.js
@@ -9,14 +9,18 @@ module.exports = class deviceGarageEachen {
     this.helpers = platform.helpers
     this.S = platform.api.hap.Service
     this.C = platform.api.hap.Characteristic
-    this.operationTime = parseInt(platform.cusG.get(accessory.context.eweDeviceId).operationTime)
+    this.dName = accessory.displayName
+    this.accessory = accessory
+
+    this.operationTime = parseInt(platform.cusG.get(this.accessory.context.eweDeviceId).operationTime)
     this.operationTime = isNaN(this.operationTime)
       ? this.helpers.defaults.operationTime
       : this.operationTime < 20
         ? this.helpers.defaults.operationTime
         : this.operationTime
-    if (!(this.service = accessory.getService(this.S.GarageDoorOpener))) {
-      this.service = accessory.addService(this.S.GarageDoorOpener)
+
+    if (!(this.service = this.accessory.getService(this.S.GarageDoorOpener))) {
+      this.service = this.accessory.addService(this.S.GarageDoorOpener)
       this.service.setCharacteristic(this.C.CurrentDoorState, 1)
         .setCharacteristic(this.C.TargetDoorState, 1)
         .setCharacteristic(this.C.ObstructionDetected, false)
@@ -24,7 +28,6 @@ module.exports = class deviceGarageEachen {
     this.service.getCharacteristic(this.C.TargetDoorState)
       .on('set', this.internalUpdate.bind(this))
     this.service.updateCharacteristic(this.C.ObstructionDetected, false)
-    this.accessory = accessory
   }
 
   async internalUpdate (value, callback) {
@@ -44,7 +47,7 @@ module.exports = class deviceGarageEachen {
         await this.helpers.sleep(Math.max((this.operationTime - 20) * 100, 0))
         this.service.updateCharacteristic(this.C.CurrentDoorState, 0)
         if (!this.disableDeviceLogging) {
-          this.log('[%s] current state [open].', this.accessory.displayName)
+          this.log('[%s] current state [open].', this.dName)
         }
       }
     } catch (err) {
@@ -61,7 +64,7 @@ module.exports = class deviceGarageEachen {
       this.service.updateCharacteristic(this.C.TargetDoorState, params.switch === 'on' ? 0 : 1)
         .updateCharacteristic(this.C.CurrentDoorState, params.switch === 'on' ? 0 : 1)
       if (params.updateSource && !this.disableDeviceLogging) {
-        this.log('[%s] current state [%s].', this.accessory.displayName, params.switch === 'on' ? 'open' : 'closed')
+        this.log('[%s] current state [%s].', this.dName, params.switch === 'on' ? 'open' : 'closed')
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
diff --git a/lib/device/garage-four.js b/lib/device/garage-four.js
index 6c56e84f..9b110aea 100644
--- a/lib/device/garage-four.js
+++ b/lib/device/garage-four.js
@@ -9,25 +9,28 @@ module.exports = class deviceGarageFour {
     this.helpers = platform.helpers
     this.S = platform.api.hap.Service
     this.C = platform.api.hap.Characteristic
-    this.operationTime = parseInt(platform.cusG.get(accessory.context.eweDeviceId).operationTime)
+
+    this.dName = accessory.displayName
+    this.accessory = accessory
+
+    this.operationTime = parseInt(platform.cusG.get(this.accessory.context.eweDeviceId).operationTime)
     this.operationTime = isNaN(this.operationTime)
       ? this.helpers.defaults.operationTime
       : this.operationTime < 20
         ? this.helpers.defaults.operationTime
         : this.operationTime
+
     ;['A', 'B', 'C', 'D'].forEach(v => {
       let gdService
-      if (!(gdService = accessory.getService('Garage ' + v))) {
-        accessory.addService(this.S.GarageDoorOpener, 'Garage ' + v, 'garage' + v)
-          .setCharacteristic(this.C.CurrentDoorState, 1)
+      if (!(gdService = this.accessory.getService('Garage ' + v))) {
+        gdService = this.accessory.addService(this.S.GarageDoorOpener, 'Garage ' + v, 'garage' + v)
+        gdService.setCharacteristic(this.C.CurrentDoorState, 1)
           .setCharacteristic(this.C.TargetDoorState, 1)
           .setCharacteristic(this.C.ObstructionDetected, false)
-        gdService = accessory.getService('Garage ' + v)
       }
       gdService.getCharacteristic(this.C.TargetDoorState)
         .on('set', (value, callback) => this.internalUpdate(v, value, callback))
     })
-    this.accessory = accessory
   }
 
   async internalUpdate (garage, value, callback) {
@@ -72,7 +75,7 @@ module.exports = class deviceGarageFour {
       gdService.updateCharacteristic(this.C.CurrentDoorState, value)
       this.accessory.context.cacheStates[garageChannel].cacheCurrentDoorState = value
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current state [garage %s %s].', this.accessory.displayName, garageChannel, value === 0 ? 'open' : 'closed')
+        this.log('[%s] current state [garage %s %s].', this.dName, garageChannel, value === 0 ? 'open' : 'closed')
       }
     } catch (err) {
       this.inUse = false
diff --git a/lib/device/garage-one.js b/lib/device/garage-one.js
index 06e739a7..fdd94a8e 100644
--- a/lib/device/garage-one.js
+++ b/lib/device/garage-one.js
@@ -9,7 +9,10 @@ module.exports = class deviceGarageOne {
     this.helpers = platform.helpers
     this.S = platform.api.hap.Service
     this.C = platform.api.hap.Characteristic
-    const asConfig = platform.cusG.get(accessory.context.eweDeviceId)
+    this.dName = accessory.displayName
+    this.accessory = accessory
+
+    const asConfig = platform.cusG.get(this.accessory.context.eweDeviceId)
     if (!['oneSwitch', 'twoSwitch'].includes(asConfig.setup)) {
       this.error = 'setup must be oneSwitch or twoSwitch'
     }
@@ -29,23 +32,23 @@ module.exports = class deviceGarageOne {
       }
       this.definedSensor = this.platform.devicesInHB.get(asConfig.sensorId + 'SWX')
     }
-    if (!(this.service = accessory.getService(this.S.GarageDoorOpener))) {
-      accessory.addService(this.S.GarageDoorOpener)
+
+    if (!(this.service = this.accessory.getService(this.S.GarageDoorOpener))) {
+      this.accessory.addService(this.S.GarageDoorOpener)
         .setCharacteristic(this.C.CurrentDoorState, 1)
         .setCharacteristic(this.C.TargetDoorState, 1)
         .setCharacteristic(this.C.ObstructionDetected, false)
-      this.service = accessory.getService(this.S.GarageDoorOpener)
+      this.service = this.accessory.getService(this.S.GarageDoorOpener)
     }
     this.service.getCharacteristic(this.C.TargetDoorState)
       .on('set', this.internalUpdate.bind(this))
-    this.accessory = accessory
   }
 
   async internalUpdate (value, callback) {
     try {
       callback()
       if (this.error) {
-        this.log.warn('[%s] invalid config - %s.', this.accessory.displayName, this.error)
+        this.log.warn('[%s] invalid config - %s.', this.dName, this.error)
         return
       }
       const newPos = value
@@ -92,7 +95,7 @@ module.exports = class deviceGarageOne {
         this.service.updateCharacteristic(this.C.CurrentDoorState, newPos)
         this.accessory.context.cacheCurrentDoorState = newPos
         if (!this.disableDeviceLogging) {
-          this.log('[%s] current state [%s].', this.accessory.displayName, newPos === 0 ? 'open' : 'closed')
+          this.log('[%s] current state [%s].', this.dName, newPos === 0 ? 'open' : 'closed')
         }
       }
     } catch (err) {
@@ -104,7 +107,7 @@ module.exports = class deviceGarageOne {
   async externalUpdate (params) {
     try {
       if (this.error) {
-        this.log.warn('[%s] invalid config - %s.', this.accessory.displayName, this.error)
+        this.log.warn('[%s] invalid config - %s.', this.dName, this.error)
         return
       }
       if ((!params.switch && !params.switches) || this.inUse || this.definedSensor) {
@@ -138,7 +141,7 @@ module.exports = class deviceGarageOne {
       this.service.updateCharacteristic(this.C.CurrentDoorState, newPos - 2)
       this.accessory.context.cacheCurrentDoorState = newPos - 2
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current state [%s].', this.accessory.displayName, newPos === 2 ? 'open' : 'closed')
+        this.log('[%s] current state [%s].', this.dName, newPos === 2 ? 'open' : 'closed')
       }
     } catch (err) {
       this.inUse = false
diff --git a/lib/device/garage-two.js b/lib/device/garage-two.js
index e8b28ffb..e0b87323 100644
--- a/lib/device/garage-two.js
+++ b/lib/device/garage-two.js
@@ -9,25 +9,27 @@ module.exports = class deviceGarageTwo {
     this.helpers = platform.helpers
     this.S = platform.api.hap.Service
     this.C = platform.api.hap.Characteristic
-    this.operationTime = parseInt(platform.cusG.get(accessory.context.eweDeviceId).operationTime)
+    this.dName = accessory.displayName
+    this.accessory = accessory
+
+    this.operationTime = parseInt(platform.cusG.get(this.accessory.context.eweDeviceId).operationTime)
     this.operationTime = isNaN(this.operationTime)
       ? this.helpers.defaults.operationTime
       : this.operationTime < 20
         ? this.helpers.defaults.operationTime
         : this.operationTime
+
     ;['1', '2'].forEach(v => {
       let gdService
-      if (!(gdService = accessory.getService('Garage ' + v))) {
-        accessory.addService(this.S.GarageDoorOpener, 'Garage ' + v, 'garage' + v)
-          .setCharacteristic(this.C.CurrentDoorState, 1)
+      if (!(gdService = this.accessory.getService('Garage ' + v))) {
+        gdService = this.accessory.addService(this.S.GarageDoorOpener, 'Garage ' + v, 'garage' + v)
+        gdService.setCharacteristic(this.C.CurrentDoorState, 1)
           .setCharacteristic(this.C.TargetDoorState, 1)
           .setCharacteristic(this.C.ObstructionDetected, false)
-        gdService = accessory.getService('Garage ' + v)
       }
       gdService.getCharacteristic(this.C.TargetDoorState)
         .on('set', (value, callback) => this.internalUpdate('Garage' + v, value, callback))
     })
-    this.accessory = accessory
   }
 
   async internalUpdate (garage, value, callback) {
@@ -70,14 +72,14 @@ module.exports = class deviceGarageTwo {
         case 'Garage 1': {
           this.accessory.context.cacheOneCurrentDoorState = newPos
           if (!this.disableDeviceLogging) {
-            this.log('[%s] current state [garage 1 %s].', this.accessory.displayName, newPos === 0 ? 'open' : 'closed')
+            this.log('[%s] current state [garage 1 %s].', this.dName, newPos === 0 ? 'open' : 'closed')
           }
           break
         }
         case 'Garage 2': {
           this.accessory.context.cacheTwoCurrentDoorState = newPos
           if (!this.disableDeviceLogging) {
-            this.log('[%s] current state [garage 2 %s].', this.accessory.displayName, newPos === 0 ? 'open' : 'closed')
+            this.log('[%s] current state [garage 2 %s].', this.dName, newPos === 0 ? 'open' : 'closed')
           }
           break
         }
@@ -139,13 +141,13 @@ module.exports = class deviceGarageTwo {
           case '1':
             this.accessory.context.cacheOneCurrentDoorState = newPos - 2
             if (params.updateSource && !this.disableDeviceLogging) {
-              this.log('[%s] current state [garage 1 %s].', this.accessory.displayName, newPos === 2 ? 'open' : 'closed')
+              this.log('[%s] current state [garage 1 %s].', this.dName, newPos === 2 ? 'open' : 'closed')
             }
             break
           case '2':
             this.accessory.context.cacheTwoCurrentDoorState = newPos - 2
             if (params.updateSource && !this.disableDeviceLogging) {
-              this.log('[%s] current state [garage 2 %s].', this.accessory.displayName, newPos === 2 ? 'open' : 'closed')
+              this.log('[%s] current state [garage 2 %s].', this.dName, newPos === 2 ? 'open' : 'closed')
             }
             break
         }
diff --git a/lib/device/light-colour.js b/lib/device/light-colour.js
index caec35b5..8d596ae7 100644
--- a/lib/device/light-colour.js
+++ b/lib/device/light-colour.js
@@ -10,8 +10,12 @@ module.exports = class deviceLightColour {
     this.colourUtils = platform.colourUtils
     this.S = platform.api.hap.Service
     this.C = platform.api.hap.Characteristic
-    this.isB1 = accessory.context.eweUIID === 22
-    this.service = accessory.getService(this.S.Lightbulb) || accessory.addService(this.S.Lightbulb)
+    this.dName = accessory.displayName
+    this.accessory = accessory
+
+    this.isB1 = this.accessory.context.eweUIID === 22
+
+    this.service = this.accessory.getService(this.S.Lightbulb) || this.accessory.addService(this.S.Lightbulb)
     this.service.getCharacteristic(this.C.On)
       .on('set', this.internalOnOffUpdate.bind(this))
     this.service.getCharacteristic(this.C.Brightness)
@@ -20,13 +24,13 @@ module.exports = class deviceLightColour {
       .on('set', this.internalColourUpdate.bind(this))
     this.service.getCharacteristic(this.C.Saturation)
       .on('set', (value, callback) => callback())
-    if (accessory.context.eweUIID === 22) {
+    if (this.isB1) {
       // *** B1 doesn't support brightness *** \\
       this.service.getCharacteristic(this.C.Brightness)
         .setProps({ minStep: 100 })
     }
-    this.accessory = accessory
-    if ([59, 104].includes(accessory.context.eweUIID)) {
+
+    if ([59, 104].includes(this.accessory.context.eweUIID)) {
       // HomeKit has a range of 140-500M corresponding to 2000-7143K
       // Devices have a range of 2700K-6500K corresponding to ewelink ct: 0-255
       this.service.getCharacteristic(this.C.ColorTemperature)
@@ -60,7 +64,7 @@ module.exports = class deviceLightColour {
       }, 10000)
       await this.platform.sendDeviceUpdate(this.accessory, params)
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current state [%s].', this.accessory.displayName, this.cacheOnOff)
+        this.log('[%s] current state [%s].', this.dName, this.cacheOnOff)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
@@ -120,7 +124,7 @@ module.exports = class deviceLightColour {
       }, 10000)
       await this.platform.sendDeviceUpdate(this.accessory, params)
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current brightness [%s%].', this.accessory.displayName, value)
+        this.log('[%s] current brightness [%s%].', this.dName, value)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
@@ -191,7 +195,7 @@ module.exports = class deviceLightColour {
       }, 10000)
       await this.platform.sendDeviceUpdate(this.accessory, params)
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current colour [rgb %s %s %s].', this.accessory.displayName, this.cacheR, this.cacheG, this.cacheB)
+        this.log('[%s] current colour [rgb %s %s %s].', this.dName, this.cacheR, this.cacheG, this.cacheB)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
@@ -257,9 +261,9 @@ module.exports = class deviceLightColour {
       await this.platform.sendDeviceUpdate(this.accessory, params)
       if (!this.disableDeviceLogging) {
         if (this.alController && this.alController.isAdaptiveLightingActive()) {
-          this.log('[%s] current cct [%sK] via adaptive lighting.', this.accessory.displayName, mToK)
+          this.log('[%s] current cct [%sK] via adaptive lighting.', this.dName, mToK)
         } else {
-          this.log('[%s] current cct [%sK].', this.accessory.displayName, mToK)
+          this.log('[%s] current cct [%sK].', this.dName, mToK)
         }
       }
     } catch (err) {
@@ -280,7 +284,7 @@ module.exports = class deviceLightColour {
         this.service.updateCharacteristic(this.C.On, this.cacheOnOff === 'on')
         if (this.isB1) this.service.updateCharacteristic(this.C.Brightness, this.cacheOnOff === 'on' ? 100 : 0)
         if (params.updateSource && !this.disableDeviceLogging) {
-          this.log('[%s] current state [%s].', this.accessory.displayName, this.cacheOnOff)
+          this.log('[%s] current state [%s].', this.dName, this.cacheOnOff)
         }
       }
       let hs
@@ -313,7 +317,7 @@ module.exports = class deviceLightColour {
                 if (params.updateSource && !this.disableDeviceLogging) {
                   this.log(
                     '[%s] current colour [rgb %s %s %s].',
-                    this.accessory.displayName,
+                    this.dName,
                     this.cacheR, this.cacheG, this.cacheB
                   )
                 }
@@ -321,7 +325,7 @@ module.exports = class deviceLightColour {
             }
           } else {
             if (params.updateSource) {
-              this.log('[%s] current mode [white] is unsupported.', this.accessory.displayName)
+              this.log('[%s] current mode [white] is unsupported.', this.dName)
             }
           }
           break
@@ -332,7 +336,7 @@ module.exports = class deviceLightColour {
               this.cacheBrightness = params.bright
               this.service.updateCharacteristic(this.C.Brightness, this.cacheBrightness)
               if (params.updateSource && !this.disableDeviceLogging) {
-                this.log('[%s] current brightness [%s%].', this.accessory.displayName, this.cacheBrightness)
+                this.log('[%s] current brightness [%s%].', this.dName, this.cacheBrightness)
               }
             }
           }
@@ -350,13 +354,13 @@ module.exports = class deviceLightColour {
                 if (!this.disableDeviceLogging) {
                   this.log(
                     '[%s] current colour [rgb %s %s %s].',
-                    this.accessory.displayName,
+                    this.dName,
                     this.cacheR, this.cacheG, this.cacheB
                   )
                 }
                 if (this.alController && this.alController.isAdaptiveLightingActive()) {
                   this.alController.disableAdaptiveLighting()
-                  this.log('[%s] adaptive lighting disabled due to significant colour change.', this.accessory.displayName)
+                  this.log('[%s] adaptive lighting disabled due to significant colour change.', this.dName)
                 }
               }
             }
@@ -370,7 +374,7 @@ module.exports = class deviceLightColour {
                 this.cacheBrightness = params.color.br
                 this.service.updateCharacteristic(this.C.Brightness, this.cacheBrightness)
                 if (params.updateSource && !this.disableDeviceLogging) {
-                  this.log('[%s] current brightness [%s%].', this.accessory.displayName, this.cacheBrightness)
+                  this.log('[%s] current brightness [%s%].', this.dName, this.cacheBrightness)
                 }
               }
             }
@@ -394,7 +398,7 @@ module.exports = class deviceLightColour {
                 if (params.updateSource && !this.disableDeviceLogging) {
                   this.log(
                     '[%s] current colour [rgb %s %s %s].',
-                    this.accessory.displayName,
+                    this.dName,
                     this.cacheR, this.cacheG, this.cacheB
                   )
                 }
@@ -407,7 +411,7 @@ module.exports = class deviceLightColour {
                 this.cacheBrightness = params.white.br
                 this.service.updateCharacteristic(this.C.Brightness, this.cacheBrightness)
                 if (params.updateSource && !this.disableDeviceLogging) {
-                  this.log('[%s] current brightness [%s%].', this.accessory.displayName, this.cacheBrightness)
+                  this.log('[%s] current brightness [%s%].', this.dName, this.cacheBrightness)
                 }
               }
             }
@@ -423,7 +427,7 @@ module.exports = class deviceLightColour {
                 .updateCharacteristic(this.C.ColorTemperature, this.cacheMired)
               if (params.updateSource) {
                 if (!this.disableDeviceLogging) {
-                  this.log('[%s] current cct [%sK].', this.accessory.displayName, ctToK)
+                  this.log('[%s] current cct [%sK].', this.dName, ctToK)
                 }
                 if (
                   this.alController &&
@@ -432,7 +436,7 @@ module.exports = class deviceLightColour {
                 ) {
                   // *** look for a variation greater than five *** \\
                   this.alController.disableAdaptiveLighting()
-                  this.log('[%s] adaptive lighting disabled due to significant colour change.', this.accessory.displayName)
+                  this.log('[%s] adaptive lighting disabled due to significant colour change.', this.dName)
                 }
               }
             }
diff --git a/lib/device/light-ctemp.js b/lib/device/light-ctemp.js
index 75e42505..8fef02f6 100644
--- a/lib/device/light-ctemp.js
+++ b/lib/device/light-ctemp.js
@@ -9,24 +9,26 @@ module.exports = class deviceLightColour {
     this.helpers = platform.helpers
     this.S = platform.api.hap.Service
     this.C = platform.api.hap.Characteristic
-    this.service = accessory.getService(this.S.Lightbulb) || accessory.addService(this.S.Lightbulb)
+    this.dName = accessory.displayName
+    this.accessory = accessory
+
+    this.service = this.accessory.getService(this.S.Lightbulb) || this.accessory.addService(this.S.Lightbulb)
     this.service.getCharacteristic(this.C.On)
       .on('set', this.internalOnOffUpdate.bind(this))
     this.service.getCharacteristic(this.C.Brightness)
       .on('set', this.internalBrightnessUpdate.bind(this))
     this.service.getCharacteristic(this.C.ColorTemperature)
       .on('set', this.internalCTempUpdate.bind(this))
-    if ((this.platform.config.bulbB02FST64 || '').split(',').includes(accessory.context.eweDeviceId)) {
+    if ((this.platform.config.bulbB02FST64 || '').split(',').includes(this.accessory.context.eweDeviceId)) {
       this.minK = 1800
       this.maxK = 5000
-    } else if ((this.platform.config.bulbB02BA60 || '').split(',').includes(accessory.context.eweDeviceId)) {
+    } else if ((this.platform.config.bulbB02BA60 || '').split(',').includes(this.accessory.context.eweDeviceId)) {
       this.minK = 2700
       this.maxK = 6500
     } else {
       this.minK = 2200
       this.maxK = 6500
     }
-    this.accessory = accessory
     if (platform.api.versionGreaterOrEqual && platform.api.versionGreaterOrEqual('1.3.0-beta.46')) {
       this.cacheBrightness = this.service.getCharacteristic(this.C.Brightness).value
       this.alController = new platform.api.hap.AdaptiveLightingController(this.service)
@@ -51,7 +53,7 @@ module.exports = class deviceLightColour {
         switch: this.cacheOnOff
       })
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current state [%s].', this.accessory.displayName, this.cacheOnOff)
+        this.log('[%s] current state [%s].', this.dName, this.cacheOnOff)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
@@ -84,7 +86,7 @@ module.exports = class deviceLightColour {
       }, 10000)
       await this.platform.sendDeviceUpdate(this.accessory, params)
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current brightness [%s%].', this.accessory.displayName, value)
+        this.log('[%s] current brightness [%s%].', this.dName, value)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
@@ -120,9 +122,9 @@ module.exports = class deviceLightColour {
       await this.platform.sendDeviceUpdate(this.accessory, params)
       if (!this.disableDeviceLogging) {
         if (this.alController && this.alController.isAdaptiveLightingActive()) {
-          this.log('[%s] current cct [%sK] via adaptive lighting.', this.accessory.displayName, mToK)
+          this.log('[%s] current cct [%sK] via adaptive lighting.', this.dName, mToK)
         } else {
-          this.log('[%s] current cct [%sK].', this.accessory.displayName, mToK)
+          this.log('[%s] current cct [%sK].', this.dName, mToK)
         }
       }
     } catch (err) {
@@ -139,7 +141,7 @@ module.exports = class deviceLightColour {
         this.cacheOnOff = params.switch
         this.service.updateCharacteristic(this.C.On, this.cacheOnOff === 'on')
         if (params.updateSource && !this.disableDeviceLogging) {
-          this.log('[%s] current state [%s].', this.accessory.displayName, this.cacheOnOff)
+          this.log('[%s] current state [%s].', this.dName, this.cacheOnOff)
         }
       }
       if (params.white) {
@@ -147,7 +149,7 @@ module.exports = class deviceLightColour {
           this.cacheBrightness = params.white.br
           this.service.updateCharacteristic(this.C.Brightness, this.cacheBrightness)
           if (params.updateSource && !this.disableDeviceLogging) {
-            this.log('[%s] current brightness [%s%].', this.accessory.displayName, this.cacheBrightness)
+            this.log('[%s] current brightness [%s%].', this.dName, this.cacheBrightness)
           }
         }
         if (this.helpers.hasProperty(params.white, 'ct') && this.cacheCT !== params.white.ct) {
@@ -157,7 +159,7 @@ module.exports = class deviceLightColour {
           this.service.updateCharacteristic(this.C.ColorTemperature, this.cacheMired)
           if (params.updateSource) {
             if (!this.disableDeviceLogging) {
-              this.log('[%s] current cct [%sK].', this.accessory.displayName, ctToK)
+              this.log('[%s] current cct [%sK].', this.dName, ctToK)
             }
             if (
               this.alController &&
@@ -166,7 +168,7 @@ module.exports = class deviceLightColour {
             ) {
               // *** look for a variation greater than five *** \\
               this.alController.disableAdaptiveLighting()
-              this.log('[%s] adaptive lighting disabled due to significant colour change.', this.accessory.displayName)
+              this.log('[%s] adaptive lighting disabled due to significant colour change.', this.dName)
             }
           }
         }
diff --git a/lib/device/light-dimmer.js b/lib/device/light-dimmer.js
index c08d8448..6f4b1643 100644
--- a/lib/device/light-dimmer.js
+++ b/lib/device/light-dimmer.js
@@ -9,12 +9,14 @@ module.exports = class deviceLightDimmer {
     this.helpers = platform.helpers
     this.S = platform.api.hap.Service
     this.C = platform.api.hap.Characteristic
-    this.service = accessory.getService(this.S.Lightbulb) || accessory.addService(this.S.Lightbulb)
+    this.dName = accessory.displayName
+    this.accessory = accessory
+
+    this.service = this.accessory.getService(this.S.Lightbulb) || this.accessory.addService(this.S.Lightbulb)
     this.service.getCharacteristic(this.C.On)
       .on('set', this.internalOnOffUpdate.bind(this))
     this.service.getCharacteristic(this.C.Brightness)
       .on('set', this.internalBrightnessUpdate.bind(this))
-    this.accessory = accessory
   }
 
   async internalOnOffUpdate (value, callback) {
@@ -29,7 +31,7 @@ module.exports = class deviceLightDimmer {
         switch: this.cacheOnOff
       })
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current state [%s].', this.accessory.displayName, this.cacheOnOff)
+        this.log('[%s] current state [%s].', this.dName, this.cacheOnOff)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
@@ -64,7 +66,7 @@ module.exports = class deviceLightDimmer {
       }
       await this.platform.sendDeviceUpdate(this.accessory, params)
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current brightness [%s%].', this.accessory.displayName, this.cacheBrightness)
+        this.log('[%s] current brightness [%s%].', this.dName, this.cacheBrightness)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
@@ -77,7 +79,7 @@ module.exports = class deviceLightDimmer {
         this.service.updateCharacteristic(this.C.On, params.switch === 'on')
         this.cacheOnOff = params.switch
         if (params.updateSource && !this.disableDeviceLogging) {
-          this.log('[%s] current state [%s].', this.accessory.displayName, params.switch)
+          this.log('[%s] current state [%s].', this.dName, params.switch)
         }
       }
       switch (this.accessory.context.eweUIID) {
@@ -89,7 +91,7 @@ module.exports = class deviceLightDimmer {
               this.service.updateCharacteristic(this.C.Brightness, nb)
               this.cacheBrightness = nb
               if (params.updateSource && !this.disableDeviceLogging) {
-                this.log('[%s] current brightness [%s%].', this.accessory.displayName, nb)
+                this.log('[%s] current brightness [%s%].', this.dName, nb)
               }
             }
           }
@@ -101,7 +103,7 @@ module.exports = class deviceLightDimmer {
               this.service.updateCharacteristic(this.C.Brightness, params.brightness)
               this.cacheBrightness = params.brightness
               if (params.updateSource && !this.disableDeviceLogging) {
-                this.log('[%s] current brightness [%s%].', this.accessory.displayName, params.brightness)
+                this.log('[%s] current brightness [%s%].', this.dName, params.brightness)
               }
             }
           }
diff --git a/lib/device/lock-one.js b/lib/device/lock-one.js
index bfcc4fcc..c031913b 100644
--- a/lib/device/lock-one.js
+++ b/lib/device/lock-one.js
@@ -9,7 +9,10 @@ module.exports = class deviceLockOne {
     this.helpers = platform.helpers
     this.S = platform.api.hap.Service
     this.C = platform.api.hap.Characteristic
-    const asConfig = platform.cusG.get(accessory.context.eweDeviceId)
+    this.dName = accessory.displayName
+    this.accessory = accessory
+
+    const asConfig = platform.cusG.get(this.accessory.context.eweDeviceId)
     if (!['oneSwitch', 'twoSwitch'].includes(asConfig.setup)) {
       this.error = 'setup must be oneSwitch or twoSwitch'
     }
@@ -20,19 +23,19 @@ module.exports = class deviceLockOne {
       : this.operationTime < 20
         ? this.helpers.defaults.operationTime
         : this.operationTime
-    this.service = accessory.getService(this.S.LockMechanism) || accessory.addService(this.S.LockMechanism)
+
+    this.service = this.accessory.getService(this.S.LockMechanism) || this.accessory.addService(this.S.LockMechanism)
     this.service.getCharacteristic(this.C.LockTargetState)
       .on('set', this.internalUpdate.bind(this))
     this.service.updateCharacteristic(this.C.LockCurrentState, 1)
       .updateCharacteristic(this.C.LockTargetState, 1)
-    this.accessory = accessory
   }
 
   async internalUpdate (value, callback) {
     try {
       callback()
       if (this.error) {
-        this.log.warn('[%s] invalid config - %s.', this.accessory.displayName, this.error)
+        this.log.warn('[%s] invalid config - %s.', this.dName, this.error)
         return
       }
       const params = {}
@@ -48,14 +51,14 @@ module.exports = class deviceLockOne {
       this.inUse = true
       await this.platform.sendDeviceUpdate(this.accessory, params)
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current status [unlocked].', this.accessory.displayName)
+        this.log('[%s] current status [unlocked].', this.dName)
       }
       await this.helpers.sleep(Math.max(this.operationTime * 100, 1000))
       this.service.updateCharacteristic(this.C.LockTargetState, 1)
         .updateCharacteristic(this.C.LockCurrentState, 1)
       this.inUse = false
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current status [locked].', this.accessory.displayName)
+        this.log('[%s] current status [locked].', this.dName)
       }
     } catch (err) {
       this.inUse = false
@@ -66,7 +69,7 @@ module.exports = class deviceLockOne {
   async externalUpdate (params) {
     try {
       if (this.error) {
-        this.log.warn('[%s] invalid config - %s.', this.accessory.displayName, this.error)
+        this.log.warn('[%s] invalid config - %s.', this.dName, this.error)
         return
       }
       if (this.inUse) {
@@ -88,14 +91,14 @@ module.exports = class deviceLockOne {
       this.service.updateCharacteristic(this.C.LockCurrentState, 0)
         .updateCharacteristic(this.C.LockTargetState, 0)
       if (params.updateSource && !this.disableDeviceLogging) {
-        this.log('[%s] current status [unlocked].', this.accessory.displayName)
+        this.log('[%s] current status [unlocked].', this.dName)
       }
       await this.helpers.sleep(Math.max(this.operationTime * 100, 1000))
       this.service.updateCharacteristic(this.C.LockCurrentState, 1)
         .updateCharacteristic(this.C.LockTargetState, 1)
       this.inUse = false
       if (params.updateSource && !this.disableDeviceLogging) {
-        this.log('[%s] current status [locked].', this.accessory.displayName)
+        this.log('[%s] current status [locked].', this.dName)
       }
     } catch (err) {
       this.inUse = false
diff --git a/lib/device/outlet.js b/lib/device/outlet.js
index bfb438e9..bc809fc3 100644
--- a/lib/device/outlet.js
+++ b/lib/device/outlet.js
@@ -10,6 +10,9 @@ module.exports = class deviceOutlet {
     this.helpers = platform.helpers
     this.S = platform.api.hap.Service
     this.C = platform.api.hap.Characteristic
+    this.dName = accessory.displayName
+    this.accessory = accessory
+
     this.inUsePowerThreshold = parseInt(this.platform.config.inUsePowerThreshold)
     this.inUsePowerThreshold = isNaN(this.inUsePowerThreshold)
       ? this.helpers.defaults.inUsePowerThreshold
@@ -83,13 +86,18 @@ module.exports = class deviceOutlet {
     this.eveVoltage.UUID = this.helpers.eveUUID.voltage
     this.eveElectricCurrent.UUID = this.helpers.eveUUID.electricCurrent
     this.eveResetTotal.UUID = this.helpers.eveUUID.resetTotal
-    if (!this.helpers.hasProperty(accessory.context, 'energyReadings')) accessory.context.energyReadings = []
-    if (!this.helpers.hasProperty(accessory.context, 'energyReadingTotal')) accessory.context.energyReadingTotal = 0
-    if (accessory.getService(this.S.Switch)) {
-      accessory.removeService(accessory.getService(this.S.Switch))
+    if (!this.helpers.hasProperty(this.accessory.context, 'energyReadings')) {
+      this.accessory.context.energyReadings = []
+    }
+    if (!this.helpers.hasProperty(this.accessory.context, 'energyReadingTotal')) {
+      this.accessory.context.energyReadingTotal = 0
     }
-    if (!(this.service = accessory.getService(this.S.Outlet))) {
-      this.service = accessory.addService(this.S.Outlet)
+
+    if (this.accessory.getService(this.S.Switch)) {
+      this.accessory.removeService(this.accessory.getService(this.S.Switch))
+    }
+    if (!(this.service = this.accessory.getService(this.S.Outlet))) {
+      this.service = this.accessory.addService(this.S.Outlet)
       this.service.addCharacteristic(this.eveVoltage)
       this.service.addCharacteristic(this.eveCurrentConsumption)
       this.service.addCharacteristic(this.eveElectricCurrent)
@@ -101,28 +109,27 @@ module.exports = class deviceOutlet {
     this.service.getCharacteristic(this.eveResetTotal)
       .on('set', (value, callback) => {
         callback()
-        accessory.context.energyReadings = []
-        accessory.context.energyReadingTotal = 0
+        this.accessory.context.energyReadings = []
+        this.accessory.context.energyReadingTotal = 0
         this.service.updateCharacteristic(this.eveTotalConsumption, 0)
       })
-    accessory.log = platform.config.debugFakegato ? this.log : () => {}
-    accessory.historyService = new this.platform.eveService('energy', accessory, {
+    this.accessory.log = platform.config.debugFakegato ? this.log : () => {}
+    this.accessory.historyService = new this.platform.eveService('energy', this.accessory, {
       storage: 'fs',
       path: platform.eveLogPath
     })
     setInterval(() => {
       let total = 0
-      if (accessory.context.energyReadings.length > 0) {
-        accessory.context.energyReadings.forEach(x => (total += x))
-        total /= accessory.context.energyReadings.length // W5m
+      if (this.accessory.context.energyReadings.length > 0) {
+        this.accessory.context.energyReadings.forEach(x => (total += x))
+        total /= this.accessory.context.energyReadings.length // W5m
         total /= 12 // Wh
         total /= 1000 // kWh
-        accessory.context.energyReadingTotal += total
+        this.accessory.context.energyReadingTotal += total
       }
-      accessory.context.energyReadings = []
-      this.service.updateCharacteristic(this.eveTotalConsumption, accessory.context.energyReadingTotal)
+      this.accessory.context.energyReadings = []
+      this.service.updateCharacteristic(this.eveTotalConsumption, this.accessory.context.energyReadingTotal)
     }, 300000)
-    this.accessory = accessory
   }
 
   async internalUpdate (value, callback) {
@@ -131,7 +138,7 @@ module.exports = class deviceOutlet {
       await this.platform.sendDeviceUpdate(this.accessory, { switch: value ? 'on' : 'off' })
       this.cacheOnOff = value ? 'on' : 'off'
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current state [%s].', this.accessory.displayName, value ? 'on' : 'off')
+        this.log('[%s] current state [%s].', this.dName, value ? 'on' : 'off')
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
@@ -144,7 +151,7 @@ module.exports = class deviceOutlet {
         this.service.updateCharacteristic(this.C.On, params.switch === 'on')
         this.cacheOnOff = params.switch
         if (params.updateSource && !this.disableDeviceLogging) {
-          this.log('[%s] current state [%s].', this.accessory.displayName, params.switch)
+          this.log('[%s] current state [%s].', this.dName, params.switch)
         }
         if (!this.accessory.context.powerReadings) {
           this.service.updateCharacteristic(this.C.OutletInUse, params.switch === 'on')
@@ -174,7 +181,7 @@ module.exports = class deviceOutlet {
       if (params.updateSource && logger && !this.disableDeviceLogging) {
         this.log(
           '[%s] current%s%s%s.',
-          this.accessory.displayName,
+          this.dName,
           this.helpers.hasProperty(params, 'power') ? ' power [' + params.power + 'W]' : '',
           this.helpers.hasProperty(params, 'voltage') ? ' voltage [' + params.power + 'V]' : '',
           this.helpers.hasProperty(params, 'current') ? ' current [' + params.power + 'A]' : ''
diff --git a/lib/device/rf-bridge.js b/lib/device/rf-bridge.js
index ff8d104f..cbfb3911 100644
--- a/lib/device/rf-bridge.js
+++ b/lib/device/rf-bridge.js
@@ -10,6 +10,9 @@ module.exports = class deviceRFBridge {
     this.helpers = platform.helpers
     this.S = platform.api.hap.Service
     this.C = platform.api.hap.Characteristic
+    this.dName = accessory.displayName
+    this.accessory = accessory
+
     const self = this
     this.eveLastActivation = function () {
       self.C.call(this, 'Last Activation', self.helpers.eveUUID.lastActivation)
@@ -28,18 +31,18 @@ module.exports = class deviceRFBridge {
       : this.sensorTimeDifference < 10
         ? this.helpers.defaults.sensorTimeDifference
         : this.sensorTimeDifference
-    if (['curtain', 'button'].includes(accessory.context.subType)) {
-      Object.entries(accessory.context.buttons).forEach(([chan, name]) => {
-        if (!accessory.getService(name)) accessory.addService(this.S.Switch, name, 'switch' + chan)
-        accessory.getService(name).updateCharacteristic(this.C.On, false)
-        accessory.getService(name).getCharacteristic(this.C.On)
+    if (['curtain', 'button'].includes(this.accessory.context.subType)) {
+      Object.entries(this.accessory.context.buttons).forEach(([chan, name]) => {
+        if (!this.accessory.getService(name)) this.accessory.addService(this.S.Switch, name, 'switch' + chan)
+        this.accessory.getService(name).updateCharacteristic(this.C.On, false)
+        this.accessory.getService(name).getCharacteristic(this.C.On)
           .on('set', (value, callback) => this.internalUpdate(chan, name, value, callback))
       })
     } else {
       let serv
       let char
       let eveType
-      switch (accessory.context.subType) {
+      switch (this.accessory.context.subType) {
         case 'water':
           serv = this.S.LeakSensor
           char = this.C.LeakDetected
@@ -77,15 +80,14 @@ module.exports = class deviceRFBridge {
           eveType = 'motion'
           break
       }
-      const service = accessory.getService(serv) || accessory.addService(serv)
+      const service = this.accessory.getService(serv) || this.accessory.addService(serv)
       service.updateCharacteristic(char, 0)
-      accessory.log = platform.config.debugFakegato ? this.log : () => {}
-      accessory.historyService = new this.platform.eveService(eveType, accessory, {
+      this.accessory.log = platform.config.debugFakegato ? this.log : () => {}
+      this.accessory.historyService = new this.platform.eveService(eveType, this.accessory, {
         storage: 'fs',
         path: platform.eveLogPath
       })
     }
-    this.accessory = accessory
   }
 
   async internalUpdate (rfChl, service, value, callback) {
diff --git a/lib/device/scm.js b/lib/device/scm.js
index f35c86b7..7787496d 100644
--- a/lib/device/scm.js
+++ b/lib/device/scm.js
@@ -9,15 +9,17 @@ module.exports = class deviceSCM {
     this.helpers = platform.helpers
     this.S = platform.api.hap.Service
     this.C = platform.api.hap.Characteristic
-    this.service = accessory.getService(this.S.Switch) || accessory.addService(this.S.Switch)
+    this.dName = accessory.displayName
+    this.accessory = accessory
+
+    this.service = this.accessory.getService(this.S.Switch) || this.accessory.addService(this.S.Switch)
     this.service.getCharacteristic(this.C.On)
       .on('set', this.internalUpdate.bind(this))
-    accessory.log = platform.config.debugFakegato ? this.log : () => {}
-    accessory.historyService = new this.platform.eveService('switch', accessory, {
+    this.accessory.log = platform.config.debugFakegato ? this.log : () => {}
+    this.accessory.historyService = new this.platform.eveService('switch', this.accessory, {
       storage: 'fs',
       path: platform.eveLogPath
     })
-    this.accessory = accessory
   }
 
   async internalUpdate (value, callback) {
@@ -32,7 +34,7 @@ module.exports = class deviceSCM {
         status: value ? 1 : 0
       })
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current state [%s].', this.accessory.displayName, value ? 'on' : 'off')
+        this.log('[%s] current state [%s].', this.dName, value ? 'on' : 'off')
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
@@ -52,7 +54,7 @@ module.exports = class deviceSCM {
         status: newStatus ? 1 : 0
       })
       if (params.updateSource && !this.disableDeviceLogging) {
-        this.log('[%s] current state [%s].', this.accessory.displayName, params.switches[0].switch)
+        this.log('[%s] current state [%s].', this.dName, params.switches[0].switch)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
diff --git a/lib/device/sensor.js b/lib/device/sensor.js
index 66a9fe96..f1eab230 100644
--- a/lib/device/sensor.js
+++ b/lib/device/sensor.js
@@ -10,6 +10,9 @@ module.exports = class deviceSensor {
     this.helpers = platform.helpers
     this.S = platform.api.hap.Service
     this.C = platform.api.hap.Characteristic
+    this.dName = accessory.displayName
+    this.accessory = accessory
+
     const self = this
     this.eveLastActivation = function () {
       self.C.call(this, 'Last Activation', self.helpers.eveUUID.lastActivation)
@@ -28,14 +31,13 @@ module.exports = class deviceSensor {
       : this.lowBattThreshold < 5
         ? this.helpers.defaults.lowBattThreshold
         : this.lowBattThreshold
-    this.contactService = accessory.getService(this.S.ContactSensor) || accessory.addService(this.S.ContactSensor)
-    this.batteryService = accessory.getService(this.S.BatteryService) || accessory.addService(this.S.BatteryService)
-    accessory.log = platform.config.debugFakegato ? this.log : () => {}
-    accessory.historyService = new this.platform.eveService('door', accessory, {
+    this.contactService = this.accessory.getService(this.S.ContactSensor) || this.accessory.addService(this.S.ContactSensor)
+    this.batteryService = this.accessory.getService(this.S.BatteryService) || this.accessory.addService(this.S.BatteryService)
+    this.accessory.log = platform.config.debugFakegato ? this.log : () => {}
+    this.accessory.historyService = new this.platform.eveService('door', this.accessory, {
       storage: 'fs',
       path: platform.eveLogPath
     })
-    this.accessory = accessory
   }
 
   async externalUpdate (params) {
@@ -46,7 +48,7 @@ module.exports = class deviceSensor {
           this.batteryService.updateCharacteristic(this.C.BatteryLevel, this.cacheBattery)
             .updateCharacteristic(this.C.StatusLowBattery, this.cacheBattery < this.lowBattThreshold)
           if (params.updateSource && !this.disableDeviceLogging) {
-            this.log('[%s] current battery [%s%].', this.accessory.displayName, this.cacheBattery)
+            this.log('[%s] current battery [%s%].', this.dName, this.cacheBattery)
           }
         }
       }
@@ -67,7 +69,7 @@ module.exports = class deviceSensor {
         )
       }
       if (params.updateSource && !this.disableDeviceLogging) {
-        this.log('[%s] current state [contact%s detected].', this.accessory.displayName, newState === 0 ? '' : ' not')
+        this.log('[%s] current state [contact%s detected].', this.dName, newState === 0 ? '' : ' not')
       }
       let oAccessory
       this.platform.cusG.forEach(async group => {
diff --git a/lib/device/switch-multi.js b/lib/device/switch-multi.js
index 4cfd625c..cd763893 100644
--- a/lib/device/switch-multi.js
+++ b/lib/device/switch-multi.js
@@ -9,15 +9,17 @@ module.exports = class deviceSwitchMulti {
     this.helpers = platform.helpers
     this.S = platform.api.hap.Service
     this.C = platform.api.hap.Characteristic
-    this.service = accessory.getService(this.S.Switch) || accessory.addService(this.S.Switch)
+    this.dName = accessory.displayName
+    this.accessory = accessory
+
+    this.service = this.accessory.getService(this.S.Switch) || this.accessory.addService(this.S.Switch)
     this.service.getCharacteristic(this.C.On)
       .on('set', this.internalUpdate.bind(this))
-    accessory.log = platform.config.debugFakegato ? this.log : () => {}
-    accessory.historyService = new this.platform.eveService('switch', accessory, {
+    this.accessory.log = platform.config.debugFakegato ? this.log : () => {}
+    this.accessory.historyService = new this.platform.eveService('switch', this.accessory, {
       storage: 'fs',
       path: platform.eveLogPath
     })
-    this.accessory = accessory
   }
 
   async internalUpdate (value, callback) {
diff --git a/lib/device/switch-single.js b/lib/device/switch-single.js
index 6bd5a702..2f398eb0 100644
--- a/lib/device/switch-single.js
+++ b/lib/device/switch-single.js
@@ -9,18 +9,20 @@ module.exports = class deviceSwitchSingle {
     this.helpers = platform.helpers
     this.S = platform.api.hap.Service
     this.C = platform.api.hap.Characteristic
-    this.service = accessory.getService(this.S.Switch) || accessory.addService(this.S.Switch)
+    this.dName = accessory.displayName
+    this.accessory = accessory
+
+    this.service = this.accessory.getService(this.S.Switch) || this.accessory.addService(this.S.Switch)
     this.service.getCharacteristic(this.C.On)
       .on('set', this.internalUpdate.bind(this))
-    if (accessory.getService(this.S.Outlet)) {
-      accessory.removeService(accessory.getService(this.S.Outlet))
+    if (this.accessory.getService(this.S.Outlet)) {
+      this.accessory.removeService(this.accessory.getService(this.S.Outlet))
     }
-    accessory.log = platform.config.debugFakegato ? this.log : () => {}
-    accessory.historyService = new this.platform.eveService('switch', accessory, {
+    this.accessory.log = platform.config.debugFakegato ? this.log : () => {}
+    this.accessory.historyService = new this.platform.eveService('switch', this.accessory, {
       storage: 'fs',
       path: platform.eveLogPath
     })
-    this.accessory = accessory
   }
 
   async internalUpdate (value, callback) {
@@ -36,7 +38,7 @@ module.exports = class deviceSwitchSingle {
         status: value ? 1 : 0
       })
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current state [%s].', this.accessory.displayName, this.cacheOnOff)
+        this.log('[%s] current state [%s].', this.dName, this.cacheOnOff)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
@@ -56,7 +58,7 @@ module.exports = class deviceSwitchSingle {
         status: newStatus ? 1 : 0
       })
       if (params.updateSource && !this.disableDeviceLogging) {
-        this.log('[%s] current state [%s].', this.accessory.displayName, this.cacheOnOff)
+        this.log('[%s] current state [%s].', this.dName, this.cacheOnOff)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
diff --git a/lib/device/switch-valve.js b/lib/device/switch-valve.js
index 4ee1d80b..f1d4949a 100644
--- a/lib/device/switch-valve.js
+++ b/lib/device/switch-valve.js
@@ -9,9 +9,12 @@ module.exports = class deviceSwitchValve {
     this.helpers = platform.helpers
     this.S = platform.api.hap.Service
     this.C = platform.api.hap.Characteristic
-    this.sService = accessory.getService(this.S.Switch) || accessory.addService(this.S.Switch)
-    if (!(this.vService = accessory.getService(this.S.Valve))) {
-      this.vService = accessory.addService(this.S.Valve)
+    this.dName = accessory.displayName
+    this.accessory = accessory
+
+    this.sService = this.accessory.getService(this.S.Switch) || this.accessory.addService(this.S.Switch)
+    if (!(this.vService = this.accessory.getService(this.S.Valve))) {
+      this.vService = this.accessory.addService(this.S.Valve)
       this.vService.setCharacteristic(this.C.Active, 0)
         .setCharacteristic(this.C.InUse, 0)
         .setCharacteristic(this.C.ValveType, 1)
@@ -31,12 +34,11 @@ module.exports = class deviceSwitchValve {
         }
         callback()
       })
-    accessory.log = platform.config.debugFakegato ? this.log : () => {}
-    accessory.historyService = new this.platform.eveService('switch', accessory, {
+    this.accessory.log = platform.config.debugFakegato ? this.log : () => {}
+    this.accessory.historyService = new this.platform.eveService('switch', this.accessory, {
       storage: 'fs',
       path: platform.eveLogPath
     })
-    this.accessory = accessory
   }
 
   async internalSwitchUpdate (value, callback) {
@@ -52,7 +54,7 @@ module.exports = class deviceSwitchValve {
         status: value ? 1 : 0
       })
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current state [%s].', this.accessory.displayName, this.cacheOnOff)
+        this.log('[%s] current state [%s].', this.dName, this.cacheOnOff)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
@@ -71,14 +73,14 @@ module.exports = class deviceSwitchValve {
           this.vService.updateCharacteristic(this.C.RemainingDuration, 0)
           clearTimeout(this.timer)
           if (!this.disableDeviceLogging) {
-            this.log('[%s] current state [stopped].', this.accessory.displayName)
+            this.log('[%s] current state [stopped].', this.dName)
           }
           break
         case 1: {
           const timer = this.vService.getCharacteristic(this.C.SetDuration).value
           this.vService.updateCharacteristic(this.C.RemainingDuration, timer)
           if (!this.disableDeviceLogging) {
-            this.log('[%s] current state [running].', this.accessory.displayName)
+            this.log('[%s] current state [running].', this.dName)
           }
           this.timer = setTimeout(() => {
             this.vService.setCharacteristic(this.C.Active, 0)
@@ -106,7 +108,7 @@ module.exports = class deviceSwitchValve {
           status: newStatus ? 1 : 0
         })
         if (params.updateSource && !this.disableDeviceLogging) {
-          this.log('[%s] current state [%s].', this.accessory.displayName, this.cacheOnOff)
+          this.log('[%s] current state [%s].', this.dName, this.cacheOnOff)
         }
       }
       if (params.switches[1].switch === 'on') {
@@ -116,7 +118,7 @@ module.exports = class deviceSwitchValve {
             .updateCharacteristic(this.C.InUse, 1)
             .updateCharacteristic(this.C.RemainingDuration, timer)
           if (params.updateSource && !this.disableDeviceLogging) {
-            this.log('[%s] current state [running].', this.accessory.displayName)
+            this.log('[%s] current state [running].', this.dName)
           }
           this.timer = setTimeout(() => {
             this.vService.setCharacteristic(this.C.Active, 0)
diff --git a/lib/device/tap-one.js b/lib/device/tap-one.js
index 8256d2a2..3de183d5 100644
--- a/lib/device/tap-one.js
+++ b/lib/device/tap-one.js
@@ -9,27 +9,30 @@ module.exports = class deviceTapOne {
     this.helpers = platform.helpers
     this.S = platform.api.hap.Service
     this.C = platform.api.hap.Characteristic
-    const asConfig = platform.cusG.get(accessory.context.eweDeviceId)
+    this.dName = accessory.displayName
+    this.accessory = accessory
+
+    const asConfig = platform.cusG.get(this.accessory.context.eweDeviceId)
     if (!['oneSwitch', 'twoSwitch'].includes(asConfig.setup)) {
       this.error = 'setup must be oneSwitch or twoSwitch'
     }
     this.setup = asConfig.setup
-    if (!(this.service = accessory.getService(this.S.Valve))) {
-      this.service = accessory.addService(this.S.Valve)
+
+    if (!(this.service = this.accessory.getService(this.S.Valve))) {
+      this.service = this.accessory.addService(this.S.Valve)
       this.service.setCharacteristic(this.C.Active, 0)
         .setCharacteristic(this.C.InUse, 0)
         .setCharacteristic(this.C.ValveType, 3)
     }
     this.service.getCharacteristic(this.C.Active)
       .on('set', this.internalUpdate.bind(this))
-    this.accessory = accessory
   }
 
   async internalUpdate (value, callback) {
     try {
       callback()
       if (this.error) {
-        this.log.warn('[%s] invalid config - %s.', this.accessory.displayName, this.error)
+        this.log.warn('[%s] invalid config - %s.', this.dName, this.error)
         return
       }
       const params = {}
@@ -46,7 +49,7 @@ module.exports = class deviceTapOne {
       this.cacheOnOff = value ? 'on' : 'off'
       this.service.updateCharacteristic(this.C.InUse, value)
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current state [%s].', this.accessory.displayName, this.cacheOnOff)
+        this.log('[%s] current state [%s].', this.dName, this.cacheOnOff)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
@@ -56,7 +59,7 @@ module.exports = class deviceTapOne {
   async externalUpdate (params) {
     try {
       if (this.error) {
-        this.log.warn('[%s] invalid config - %s.', this.accessory.displayName, this.error)
+        this.log.warn('[%s] invalid config - %s.', this.dName, this.error)
         return
       }
       switch (this.setup) {
@@ -76,7 +79,7 @@ module.exports = class deviceTapOne {
       this.service.updateCharacteristic(this.C.Active, this.cacheOnOff === 'on' ? 1 : 0)
         .updateCharacteristic(this.C.InUse, this.cacheOnOff === 'on' ? 1 : 0)
       if (params.updateSource && !this.disableDeviceLogging) {
-        this.log('[%s] current state [%s].', this.accessory.displayName, this.cacheOnOff)
+        this.log('[%s] current state [%s].', this.dName, this.cacheOnOff)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
diff --git a/lib/device/tap-two.js b/lib/device/tap-two.js
index 77c4b99b..7bf783ea 100644
--- a/lib/device/tap-two.js
+++ b/lib/device/tap-two.js
@@ -9,10 +9,13 @@ module.exports = class deviceTapTwo {
     this.helpers = platform.helpers
     this.S = platform.api.hap.Service
     this.C = platform.api.hap.Characteristic
+    this.dName = accessory.displayName
+    this.accessory = accessory
+
     ;['A', 'B'].forEach(v => {
       let tapService
-      if (!(tapService = accessory.getService(this.S.Valve))) {
-        tapService = accessory.addService(this.S.Valve)
+      if (!(tapService = this.accessory.getService(this.S.Valve))) {
+        tapService = this.accessory.addService(this.S.Valve)
         tapService.setCharacteristic(this.C.Active, 0)
           .setCharacteristic(this.C.InUse, 0)
           .setCharacteristic(this.C.ValveType, 3)
@@ -20,7 +23,6 @@ module.exports = class deviceTapTwo {
       tapService.getCharacteristic(this.C.Active)
         .on('set', (value, callback) => this.internalUpdate('Tap ' + v, value, callback))
     })
-    this.accessory = accessory
   }
 
   async internalUpdate (tap, value, callback) {
@@ -44,7 +46,7 @@ module.exports = class deviceTapTwo {
       }
       tapService.updateCharacteristic(this.C.InUse, value)
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current state [%s %].', this.accessory.displayName, tap, value === 1 ? 'running' : 'stopped')
+        this.log('[%s] current state [%s %].', this.dName, tap, value === 1 ? 'running' : 'stopped')
       }
       await this.platform.sendDeviceUpdate(this.accessory, params)
     } catch (err) {
@@ -63,7 +65,7 @@ module.exports = class deviceTapTwo {
           .updateCharacteristic(this.C.InUse, params.switches[k].switch === 'on' ? 1 : 0)
         const logText = params.switches[k].switch === 'on' ? 'running' : 'stopped'
         if (params.updateSource && !this.disableDeviceLogging) {
-          this.log('[%s] current state [Tap %s running].', this.accessory.displayName, v, logText)
+          this.log('[%s] current state [Tap %s running].', this.dName, v, logText)
         }
       })
     } catch (err) {
diff --git a/lib/device/th-outlet.js b/lib/device/th-outlet.js
index aabcf387..9de18ab4 100644
--- a/lib/device/th-outlet.js
+++ b/lib/device/th-outlet.js
@@ -9,32 +9,34 @@ module.exports = class deviceTHOutlet {
     this.helpers = platform.helpers
     this.S = platform.api.hap.Service
     this.C = platform.api.hap.Characteristic
-    this.tempOffset = parseFloat(platform.thTempOffset[accessory.context.eweDeviceId] || 0)
-    this.hideSwitch = (this.platform.config.hideSwitchFromTH || '').split(',').includes(accessory.context.eweDeviceId)
-    if (accessory.getService(this.S.Thermostat)) {
-      accessory.removeService(accessory.getService(this.S.Thermostat))
+    this.dName = accessory.displayName
+    this.accessory = accessory
+
+    this.tempOffset = parseFloat(platform.thTempOffset[this.accessory.context.eweDeviceId] || 0)
+    this.hideSwitch = (this.platform.config.hideSwitchFromTH || '').split(',').includes(this.accessory.context.eweDeviceId)
+    if (this.accessory.getService(this.S.Thermostat)) {
+      this.accessory.removeService(this.accessory.getService(this.S.Thermostat))
     }
-    if ((this.platform.config.hideSwitchFromTH || '').split(',').includes(accessory.context.eweDeviceId)) {
-      if (accessory.getService(this.S.Switch)) {
-        accessory.removeService(accessory.getService(this.S.Switch))
+    if ((this.platform.config.hideSwitchFromTH || '').split(',').includes(this.accessory.context.eweDeviceId)) {
+      if (this.accessory.getService(this.S.Switch)) {
+        this.accessory.removeService(this.accessory.getService(this.S.Switch))
       }
     } else {
-      this.switchService = accessory.getService(this.S.Switch) || accessory.addService(this.S.Switch)
+      this.switchService = this.accessory.getService(this.S.Switch) || this.accessory.addService(this.S.Switch)
       this.switchService.getCharacteristic(this.C.On)
         .on('set', this.internalUpdate.bind(this))
     }
-    this.tempService = accessory.getService(this.S.TemperatureSensor) || accessory.addService(this.S.TemperatureSensor)
+    this.tempService = this.accessory.getService(this.S.TemperatureSensor) || this.accessory.addService(this.S.TemperatureSensor)
     this.tempService.getCharacteristic(this.C.CurrentTemperature)
       .setProps({ minValue: -100 })
-    if (accessory.context.sensorType !== 'DS18B20') {
-      this.humiService = accessory.getService(this.S.HumiditySensor) || accessory.addService(this.S.HumiditySensor)
+    if (this.accessory.context.sensorType !== 'DS18B20') {
+      this.humiService = this.accessory.getService(this.S.HumiditySensor) || this.accessory.addService(this.S.HumiditySensor)
     }
-    accessory.log = platform.config.debugFakegato ? this.log : () => {}
-    accessory.historyService = new this.platform.eveService('custom', accessory, {
+    this.accessory.log = platform.config.debugFakegato ? this.log : () => {}
+    this.accessory.historyService = new this.platform.eveService('custom', this.accessory, {
       storage: 'fs',
       path: platform.eveLogPath
     })
-    this.accessory = accessory
   }
 
   async internalUpdate (value, callback) {
@@ -47,7 +49,7 @@ module.exports = class deviceTHOutlet {
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.cacheOnOff = value ? 'on' : 'off'
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current state [%s].', this.accessory.displayName, this.cacheOnOff)
+        this.log('[%s] current state [%s].', this.dName, this.cacheOnOff)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
@@ -66,7 +68,7 @@ module.exports = class deviceTHOutlet {
             status: this.cacheOnOff === 'on' ? 1 : 0
           })
           if (params.updateSource && !this.disableDeviceLogging) {
-            this.log('[%s] current state [%s].', this.accessory.displayName, this.cacheOnOff)
+            this.log('[%s] current state [%s].', this.dName, this.cacheOnOff)
           }
         }
       }
@@ -78,7 +80,7 @@ module.exports = class deviceTHOutlet {
           this.cacheTemp = currentTemp
           this.tempService.updateCharacteristic(this.C.CurrentTemperature, this.cacheTemp)
           if (params.updateSource && !this.disableDeviceLogging) {
-            this.log('[%s] current temperature [%s].', this.accessory.displayName, this.cacheTemp)
+            this.log('[%s] current temperature [%s].', this.dName, this.cacheTemp)
           }
         }
       }
@@ -89,7 +91,7 @@ module.exports = class deviceTHOutlet {
           this.cacheHumi = currentHumi
           this.humiService.updateCharacteristic(this.C.CurrentRelativeHumidity, this.cacheHumi)
           if (params.updateSource && !this.disableDeviceLogging) {
-            this.log('[%s] current humidity [%s%].', this.accessory.displayName, this.cacheHumi)
+            this.log('[%s] current humidity [%s%].', this.dName, this.cacheHumi)
           }
         }
       }
diff --git a/lib/device/th-thermo.js b/lib/device/th-thermo.js
index 9a398db6..167c4e03 100644
--- a/lib/device/th-thermo.js
+++ b/lib/device/th-thermo.js
@@ -9,17 +9,20 @@ module.exports = class deviceTHThermo {
     this.helpers = platform.helpers
     this.S = platform.api.hap.Service
     this.C = platform.api.hap.Characteristic
-    this.tempOffset = parseFloat(platform.thTempOffset[accessory.context.eweDeviceId] || 0)
-    if (accessory.getService(this.S.Switch)) {
-      accessory.removeService(accessory.getService(this.S.Switch))
+    this.dName = accessory.displayName
+    this.accessory = accessory
+
+    this.tempOffset = parseFloat(platform.thTempOffset[this.accessory.context.eweDeviceId] || 0)
+    if (this.accessory.getService(this.S.Switch)) {
+      this.accessory.removeService(this.accessory.getService(this.S.Switch))
     }
-    if (accessory.getService(this.S.TemperatureSensor)) {
-      accessory.removeService(accessory.getService(this.S.TemperatureSensor))
+    if (this.accessory.getService(this.S.TemperatureSensor)) {
+      this.accessory.removeService(this.accessory.getService(this.S.TemperatureSensor))
     }
-    if (accessory.getService(this.S.HumiditySensor)) {
-      accessory.removeService(accessory.getService(this.S.HumiditySensor))
+    if (this.accessory.getService(this.S.HumiditySensor)) {
+      this.accessory.removeService(this.accessory.getService(this.S.HumiditySensor))
     }
-    this.service = accessory.getService(this.S.Thermostat) || accessory.addService(this.S.Thermostat)
+    this.service = this.accessory.getService(this.S.Thermostat) || this.accessory.addService(this.S.Thermostat)
     this.service.getCharacteristic(this.C.CurrentTemperature)
       .setProps({ minValue: -100 })
     this.service.getCharacteristic(this.C.TargetHeatingCoolingState)
@@ -28,17 +31,16 @@ module.exports = class deviceTHThermo {
     this.service.getCharacteristic(this.C.TargetTemperature)
       .on('set', this.internalTempUpdate.bind(this))
     if (
-      accessory.context.sensorType !== 'DS18B20' &&
+      this.accessory.context.sensorType !== 'DS18B20' &&
       !this.service.testCharacteristic(this.C.CurrentRelativeHumidity)
     ) {
       this.service.addCharacteristic(this.C.CurrentRelativeHumidity)
     }
-    accessory.log = platform.config.debugFakegato ? this.log : () => {}
-    accessory.historyService = new this.platform.eveService('custom', accessory, {
+    this.accessory.log = platform.config.debugFakegato ? this.log : () => {}
+    this.accessory.historyService = new this.platform.eveService('custom', this.accessory, {
       storage: 'fs',
       path: platform.eveLogPath
     })
-    this.accessory = accessory
   }
 
   async internalOnOffUpdate (value, callback) {
@@ -51,7 +53,7 @@ module.exports = class deviceTHThermo {
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.cacheOnOff = value !== 0 ? 'on' : 'off'
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current state [%s].', this.accessory.displayName, this.cacheOnOff)
+        this.log('[%s] current state [%s].', this.dName, this.cacheOnOff)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
@@ -83,7 +85,7 @@ module.exports = class deviceTHThermo {
             status: this.cacheOnOff === 'on' ? 1 : 0
           })
           if (params.updateSource && !this.disableDeviceLogging) {
-            this.log('[%s] current state [%s].', this.accessory.displayName, this.cacheOnOff)
+            this.log('[%s] current state [%s].', this.dName, this.cacheOnOff)
           }
         }
       }
@@ -96,7 +98,7 @@ module.exports = class deviceTHThermo {
           this.service.updateCharacteristic(this.C.CurrentTemperature, this.cacheTemp)
           this.service.updateCharacteristic(this.C.TargetTemperature, this.cacheTemp)
           if (params.updateSource && !this.disableDeviceLogging) {
-            this.log('[%s] current temperature [%s].', this.accessory.displayName, this.cacheTemp)
+            this.log('[%s] current temperature [%s].', this.dName, this.cacheTemp)
           }
         }
       }
@@ -111,7 +113,7 @@ module.exports = class deviceTHThermo {
           this.cacheHumi = currentHumi
           this.service.updateCharacteristic(this.C.CurrentRelativeHumidity, this.cacheHumi)
           if (params.updateSource && !this.disableDeviceLogging) {
-            this.log('[%s] current humidity [%s%].', this.accessory.displayName, this.cacheHumi)
+            this.log('[%s] current humidity [%s%].', this.dName, this.cacheHumi)
           }
         }
       }
diff --git a/lib/device/usb.js b/lib/device/usb.js
index b6641d2a..0b0c63d8 100644
--- a/lib/device/usb.js
+++ b/lib/device/usb.js
@@ -9,25 +9,27 @@ module.exports = class deviceUSB {
     this.helpers = platform.helpers
     this.S = platform.api.hap.Service
     this.C = platform.api.hap.Characteristic
-    if ((platform.config.outletAsSwitch || '').split(',').includes(accessory.context.eweDeviceId)) {
-      if (accessory.getService(this.S.Outlet)) {
-        accessory.removeService(accessory.getService(this.S.Outlet))
+    this.dName = accessory.displayName
+    this.accessory = accessory
+
+    if ((platform.config.outletAsSwitch || '').split(',').includes(this.accessory.context.eweDeviceId)) {
+      if (this.accessory.getService(this.S.Outlet)) {
+        this.accessory.removeService(this.accessory.getService(this.S.Outlet))
       }
-      this.service = accessory.getService(this.S.Switch) || accessory.addService(this.S.Switch)
+      this.service = this.accessory.getService(this.S.Switch) || this.accessory.addService(this.S.Switch)
     } else {
-      if (accessory.getService(this.S.Switch)) {
-        accessory.removeService(accessory.getService(this.S.Switch))
+      if (this.accessory.getService(this.S.Switch)) {
+        this.accessory.removeService(this.accessory.getService(this.S.Switch))
       }
-      this.service = accessory.getService(this.S.Outlet) || accessory.addService(this.S.Outlet)
+      this.service = this.accessory.getService(this.S.Outlet) || this.accessory.addService(this.S.Outlet)
     }
     this.service.getCharacteristic(this.C.On)
       .on('set', this.internalUpdate.bind(this))
-    accessory.log = platform.config.debugFakegato ? this.log : () => {}
-    accessory.historyService = new this.platform.eveService('switch', accessory, {
+    this.accessory.log = platform.config.debugFakegato ? this.log : () => {}
+    this.accessory.historyService = new this.platform.eveService('switch', this.accessory, {
       storage: 'fs',
       path: platform.eveLogPath
     })
-    this.accessory = accessory
   }
 
   async internalUpdate (value, callback) {
@@ -42,7 +44,7 @@ module.exports = class deviceUSB {
         status: value ? 1 : 0
       })
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current state [%s].', this.accessory.displayName, value ? 'on' : 'off')
+        this.log('[%s] current state [%s].', this.dName, value ? 'on' : 'off')
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
@@ -62,7 +64,7 @@ module.exports = class deviceUSB {
         status: newStatus ? 1 : 0
       })
       if (params.updateSource && !this.disableDeviceLogging) {
-        this.log('[%s] current state [%s].', this.accessory.displayName, params.switches[0].switch)
+        this.log('[%s] current state [%s].', this.dName, params.switches[0].switch)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
diff --git a/lib/device/valve-four.js b/lib/device/valve-four.js
index 7c69d086..60f410bd 100644
--- a/lib/device/valve-four.js
+++ b/lib/device/valve-four.js
@@ -9,16 +9,18 @@ module.exports = class deviceValveFour {
     this.helpers = platform.helpers
     this.S = platform.api.hap.Service
     this.C = platform.api.hap.Characteristic
+    this.dName = accessory.displayName
+    this.accessory = accessory
+
     ;['A', 'B', 'C', 'D'].forEach(v => {
       let valveService
-      if (!(valveService = accessory.getService('Valve ' + v))) {
-        accessory.addService(this.S.Valve, 'Valve ' + v, 'valve' + v.toLowerCase())
-          .setCharacteristic(this.C.Active, 0)
+      if (!(valveService = this.accessory.getService('Valve ' + v))) {
+        valveService = this.accessory.addService(this.S.Valve, 'Valve ' + v, 'valve' + v.toLowerCase())
+        valveService.setCharacteristic(this.C.Active, 0)
           .setCharacteristic(this.C.InUse, 0)
           .setCharacteristic(this.C.ValveType, 1)
           .setCharacteristic(this.C.SetDuration, 120)
           .addCharacteristic(this.C.RemainingDuration)
-        valveService = accessory.getService('Valve ' + v)
       }
       valveService.getCharacteristic(this.C.Active)
         .on('set', (value, callback) => this.internalUpdate('Valve ' + v, value, callback))
@@ -32,7 +34,6 @@ module.exports = class deviceValveFour {
           callback()
         })
     })
-    this.accessory = accessory
   }
 
   async internalUpdate (valve, value, callback) {
@@ -96,14 +97,14 @@ module.exports = class deviceValveFour {
           valveService.updateCharacteristic(this.C.RemainingDuration, 0)
           clearTimeout(this.accessory.getService(valve).timer)
           if (!this.disableDeviceLogging) {
-            this.log('[%s] current state [%s stopped].', this.accessory.displayName, valve)
+            this.log('[%s] current state [%s stopped].', this.dName, valve)
           }
           break
         case 1: {
           const timer = valveService.getCharacteristic(this.C.SetDuration).value
           valveService.updateCharacteristic(this.C.RemainingDuration, timer)
           if (!this.disableDeviceLogging) {
-            this.log('[%s] current state [%s running].', this.accessory.displayName, valve)
+            this.log('[%s] current state [%s running].', this.dName, valve)
           }
           valveService.timer = setTimeout(() => {
             valveService.setCharacteristic(this.C.Active, 0)
@@ -131,7 +132,7 @@ module.exports = class deviceValveFour {
               .updateCharacteristic(this.C.InUse, 1)
               .updateCharacteristic(this.C.RemainingDuration, timer)
             if (params.updateSource && !this.disableDeviceLogging) {
-              this.log('[%s] current state [Valve %s running].', this.accessory.displayName, v)
+              this.log('[%s] current state [Valve %s running].', this.dName, v)
             }
             valveService.timer = setTimeout(() => {
               valveService.setCharacteristic(this.C.Active, 0)
diff --git a/lib/device/valve-one.js b/lib/device/valve-one.js
index 846f17fb..f148655f 100644
--- a/lib/device/valve-one.js
+++ b/lib/device/valve-one.js
@@ -9,13 +9,16 @@ module.exports = class deviceValveOne {
     this.helpers = platform.helpers
     this.S = platform.api.hap.Service
     this.C = platform.api.hap.Characteristic
-    const asConfig = platform.cusG.get(accessory.context.eweDeviceId)
+    this.dName = accessory.displayName
+    this.accessory = accessory
+
+    const asConfig = platform.cusG.get(this.accessory.context.eweDeviceId)
     if (!['oneSwitch', 'twoSwitch'].includes(asConfig.setup)) {
       this.error = 'setup must be oneSwitch or twoSwitch'
     }
     this.setup = asConfig.setup
-    if (!(this.service = accessory.getService(this.S.Valve))) {
-      this.service = accessory.addService(this.S.Valve)
+    if (!(this.service = this.accessory.getService(this.S.Valve))) {
+      this.service = this.accessory.addService(this.S.Valve)
       this.service.setCharacteristic(this.C.Active, 0)
         .setCharacteristic(this.C.InUse, 0)
         .setCharacteristic(this.C.ValveType, 1)
@@ -36,14 +39,13 @@ module.exports = class deviceValveOne {
         }
         callback()
       })
-    this.accessory = accessory
   }
 
   async internalUpdate (value, callback) {
     try {
       callback()
       if (this.error) {
-        this.log.warn('[%s] invalid config - %s.', this.accessory.displayName, this.error)
+        this.log.warn('[%s] invalid config - %s.', this.dName, this.error)
         return
       }
       const params = {}
@@ -62,14 +64,14 @@ module.exports = class deviceValveOne {
           this.service.updateCharacteristic(this.C.RemainingDuration, 0)
           clearTimeout(this.timer)
           if (!this.disableDeviceLogging) {
-            this.log('[%s] current state [stopped].', this.accessory.displayName)
+            this.log('[%s] current state [stopped].', this.dName)
           }
           break
         case 1: {
           const timer = this.service.getCharacteristic(this.C.SetDuration).value
           this.service.updateCharacteristic(this.C.RemainingDuration, timer)
           if (!this.disableDeviceLogging) {
-            this.log('[%s] current state [running].', this.accessory.displayName)
+            this.log('[%s] current state [running].', this.dName)
           }
           this.timer = setTimeout(() => {
             this.service.setCharacteristic(this.C.Active, 0)
@@ -86,7 +88,7 @@ module.exports = class deviceValveOne {
   async externalUpdate (params) {
     try {
       if (this.error) {
-        this.log.warn('[%s] invalid config - %s.', this.accessory.displayName, this.error)
+        this.log.warn('[%s] invalid config - %s.', this.dName, this.error)
         return
       }
       let isOn = false
@@ -111,7 +113,7 @@ module.exports = class deviceValveOne {
             .updateCharacteristic(this.C.InUse, 1)
             .updateCharacteristic(this.C.RemainingDuration, timer)
           if (params.updateSource && !this.disableDeviceLogging) {
-            this.log('[%s] current state [running].', this.accessory.displayName)
+            this.log('[%s] current state [running].', this.dName)
           }
           this.timer = setTimeout(() => {
             this.service.setCharacteristic(this.C.Active, 0)
diff --git a/lib/device/valve-two.js b/lib/device/valve-two.js
index e5764e96..954b071e 100644
--- a/lib/device/valve-two.js
+++ b/lib/device/valve-two.js
@@ -9,16 +9,18 @@ module.exports = class deviceValveTwo {
     this.helpers = platform.helpers
     this.S = platform.api.hap.Service
     this.C = platform.api.hap.Characteristic
+    this.dName = accessory.displayName
+    this.accessory = accessory
+
     ;['A', 'B'].forEach(v => {
       let valveService
-      if (!(valveService = accessory.getService('Valve ' + v))) {
-        accessory.addService(this.S.Valve, 'Valve ' + v, 'valve' + v.toLowerCase())
-          .setCharacteristic(this.C.Active, 0)
+      if (!(valveService = this.accessory.getService('Valve ' + v))) {
+        valveService = this.accessory.addService(this.S.Valve, 'Valve ' + v, 'valve' + v.toLowerCase())
+        valveService.setCharacteristic(this.C.Active, 0)
           .setCharacteristic(this.C.InUse, 0)
           .setCharacteristic(this.C.ValveType, 1)
           .setCharacteristic(this.C.SetDuration, 120)
           .addCharacteristic(this.C.RemainingDuration)
-        valveService = accessory.getService('Valve ' + v)
       }
       valveService.getCharacteristic(this.C.Active)
         .on('set', (value, callback) => this.internalUpdate('Valve ' + v, value, callback))
@@ -32,7 +34,6 @@ module.exports = class deviceValveTwo {
           callback()
         })
     })
-    this.accessory = accessory
   }
 
   async internalUpdate (valve, value, callback) {
@@ -60,14 +61,14 @@ module.exports = class deviceValveTwo {
           valveService.updateCharacteristic(this.C.RemainingDuration, 0)
           clearTimeout(this.accessory.getService(valve).timer)
           if (!this.disableDeviceLogging) {
-            this.log('[%s] current state [%s stopped].', this.accessory.displayName, valve)
+            this.log('[%s] current state [%s stopped].', this.dName, valve)
           }
           break
         case 1: {
           const timer = valveService.getCharacteristic(this.C.SetDuration).value
           valveService.updateCharacteristic(this.C.RemainingDuration, timer)
           if (!this.disableDeviceLogging) {
-            this.log('[%s] current state [%s running].', this.accessory.displayName, valve)
+            this.log('[%s] current state [%s running].', this.dName, valve)
           }
           valveService.timer = setTimeout(() => {
             valveService.setCharacteristic(this.C.Active, 0)
@@ -95,7 +96,7 @@ module.exports = class deviceValveTwo {
               .updateCharacteristic(this.C.InUse, 1)
               .updateCharacteristic(this.C.RemainingDuration, timer)
             if (params.updateSource && !this.disableDeviceLogging) {
-              this.log('[%s] current state [Valve %s running].', this.accessory.displayName, v)
+              this.log('[%s] current state [Valve %s running].', this.dName, v)
             }
             valveService.timer = setTimeout(() => {
               valveService.setCharacteristic(this.C.Active, 0)
diff --git a/lib/device/zb-dev.js b/lib/device/zb-dev.js
index 71b6aa84..9ec8169d 100644
--- a/lib/device/zb-dev.js
+++ b/lib/device/zb-dev.js
@@ -10,6 +10,9 @@ module.exports = class deviceZBDev {
     this.helpers = platform.helpers
     this.S = platform.api.hap.Service
     this.C = platform.api.hap.Characteristic
+    this.dName = accessory.displayName
+    this.accessory = accessory
+
     const self = this
     this.eveLastActivation = function () {
       self.C.call(this, 'Last Activation', self.helpers.eveUUID.lastActivation)
@@ -34,12 +37,14 @@ module.exports = class deviceZBDev {
       : this.sensorTimeDifference < 10
         ? this.helpers.defaults.sensorTimeDifference
         : this.sensorTimeDifference
-    switch (accessory.context.eweUIID) {
+    switch (this.accessory.context.eweUIID) {
       case 1000: {
-        if (!accessory.getService(this.S.BatteryService)) accessory.addService(this.S.BatteryService)
+        if (!this.accessory.getService(this.S.BatteryService)) {
+          this.accessory.addService(this.S.BatteryService)
+        }
         const zbspsService =
-          accessory.getService(this.S.StatelessProgrammableSwitch) ||
-          accessory.addService(this.S.StatelessProgrammableSwitch)
+          this.accessory.getService(this.S.StatelessProgrammableSwitch) ||
+          this.accessory.addService(this.S.StatelessProgrammableSwitch)
         if (this.platform.config.hideZBLDPress) {
           zbspsService
             .getCharacteristic(this.C.ProgrammableSwitchEvent)
@@ -49,51 +54,64 @@ module.exports = class deviceZBDev {
       }
       case 1009:
       case 1256:
-        if (accessory.getService(this.S.BatteryService)) {
-          accessory.removeService(accessory.getService(this.S.BatteryService))
+        if (this.accessory.getService(this.S.BatteryService)) {
+          this.accessory.removeService(this.accessory.getService(this.S.BatteryService))
         }
-        if (!accessory.getService(this.S.Switch)) accessory.addService(this.S.Switch)
-        accessory.log = platform.config.debugFakegato ? this.log : () => {}
-        accessory.historyService = new this.platform.eveService('switch', accessory, {
+        if (!this.accessory.getService(this.S.Switch)) {
+          this.accessory.addService(this.S.Switch)
+        }
+        this.accessory.log = platform.config.debugFakegato ? this.log : () => {}
+        this.accessory.historyService = new this.platform.eveService('switch', this.accessory, {
           storage: 'fs',
           path: platform.eveLogPath
         })
-        accessory.getService(this.S.Switch).getCharacteristic(this.C.On)
+        this.accessory.getService(this.S.Switch).getCharacteristic(this.C.On)
           .on('set', this.internalUpdate.bind(this))
         break
       case 1770: {
-        if (!accessory.getService(this.S.BatteryService)) accessory.addService(this.S.BatteryService)
-        const tempService = accessory.getService(this.S.TemperatureSensor) || accessory.addService(this.S.TemperatureSensor)
-        tempService.getCharacteristic(this.C.CurrentTemperature)
+        if (!this.accessory.getService(this.S.BatteryService)) {
+          this.accessory.addService(this.S.BatteryService)
+        }
+        const tService = this.accessory.getService(this.S.TemperatureSensor) || this.accessory.addService(this.S.TemperatureSensor)
+        tService.getCharacteristic(this.C.CurrentTemperature)
           .setProps({ minValue: -100 })
-        if (!accessory.getService(this.S.HumiditySensor)) accessory.addService(this.S.HumiditySensor)
-        accessory.log = platform.config.debugFakegato ? this.log : () => {}
-        accessory.historyService = new this.platform.eveService('weather', accessory, {
+        if (!this.accessory.getService(this.S.HumiditySensor)) {
+          this.accessory.addService(this.S.HumiditySensor)
+        }
+        this.accessory.log = platform.config.debugFakegato ? this.log : () => {}
+        this.accessory.historyService = new this.platform.eveService('weather', this.accessory, {
           storage: 'fs',
           path: platform.eveLogPath
         })
         break
       }
       case 2026:
-        if (!accessory.getService(this.S.BatteryService)) accessory.addService(this.S.BatteryService)
-        if (!accessory.getService(this.S.MotionSensor)) accessory.addService(this.S.MotionSensor)
-        accessory.log = platform.config.debugFakegato ? this.log : () => {}
-        accessory.historyService = new this.platform.eveService('motion', accessory, {
+        if (!this.accessory.getService(this.S.BatteryService)) {
+          this.accessory.addService(this.S.BatteryService)
+        }
+        if (!this.accessory.getService(this.S.MotionSensor)) {
+          this.accessory.addService(this.S.MotionSensor)
+        }
+        this.accessory.log = platform.config.debugFakegato ? this.log : () => {}
+        this.accessory.historyService = new this.platform.eveService('motion', this.accessory, {
           storage: 'fs',
           path: platform.eveLogPath
         })
         break
       case 3026:
-        if (!accessory.getService(this.S.BatteryService)) accessory.addService(this.S.BatteryService)
-        if (!accessory.getService(this.S.ContactSensor)) accessory.addService(this.S.ContactSensor)
-        accessory.log = platform.config.debugFakegato ? this.log : () => {}
-        accessory.historyService = new this.platform.eveService('door', accessory, {
+        if (!this.accessory.getService(this.S.BatteryService)) {
+          this.accessory.addService(this.S.BatteryService)
+        }
+        if (!this.accessory.getService(this.S.ContactSensor)) {
+          this.accessory.addService(this.S.ContactSensor)
+        }
+        this.accessory.log = platform.config.debugFakegato ? this.log : () => {}
+        this.accessory.historyService = new this.platform.eveService('door', this.accessory, {
           storage: 'fs',
           path: platform.eveLogPath
         })
         break
     }
-    this.accessory = accessory
   }
 
   async internalUpdate (value, callback) {
@@ -108,7 +126,7 @@ module.exports = class deviceZBDev {
         status: value ? 1 : 0
       })
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current state [%s].', this.accessory.displayName, value ? 'on' : 'off')
+        this.log('[%s] current state [%s].', this.dName, value ? 'on' : 'off')
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
@@ -126,7 +144,7 @@ module.exports = class deviceZBDev {
           batt.updateCharacteristic(this.C.StatusLowBattery, params.battery < this.lowBattThreshold)
           this.cacheBattery = params.battery
           if (params.updateSource && !this.disableDeviceLogging) {
-            this.log('[%s] current battery [%s%].', this.accessory.displayName, params.battery)
+            this.log('[%s] current battery [%s%].', this.dName, params.battery)
           }
         }
       }
@@ -138,7 +156,7 @@ module.exports = class deviceZBDev {
             if (params.updateSource && !this.disableDeviceLogging) {
               this.log(
                 '[%s] current state [%s].',
-                this.accessory.displayName,
+                this.dName,
                 params.key === 0
                   ? 'single press'
                   : params.key === 1
@@ -159,7 +177,7 @@ module.exports = class deviceZBDev {
               status: params.switch === 'on' ? 1 : 0
             })
             if (params.updateSource && !this.disableDeviceLogging) {
-              this.log('[%s] current state [%s].', this.accessory.displayName, params.switch)
+              this.log('[%s] current state [%s].', this.dName, params.switch)
             }
           }
           break
@@ -171,7 +189,7 @@ module.exports = class deviceZBDev {
             this.accessory.getService(this.S.TemperatureSensor)
               .updateCharacteristic(this.C.CurrentTemperature, currentTemp)
             if (params.updateSource && !this.disableDeviceLogging) {
-              this.log('[%s] current temperature [%s].', this.accessory.displayName, currentTemp)
+              this.log('[%s] current temperature [%s].', this.dName, currentTemp)
             }
             eveLog.temp = currentTemp
           }
@@ -182,7 +200,7 @@ module.exports = class deviceZBDev {
               .updateCharacteristic(this.C.CurrentRelativeHumidity, currentHumi)
             eveLog.humidity = currentHumi
             if (params.updateSource && !this.disableDeviceLogging) {
-              this.log('[%s] current humidity [%s].', this.accessory.displayName, currentHumi)
+              this.log('[%s] current humidity [%s].', this.dName, currentHumi)
             }
           }
           if (eveLog.temp || eveLog.humidity) {
@@ -204,7 +222,7 @@ module.exports = class deviceZBDev {
               status: motionDetected ? 1 : 0
             })
             if (params.updateSource && !this.disableDeviceLogging) {
-              this.log('[%s] current state [motion%s detected].', this.accessory.displayName, motionDetected ? '' : ' not')
+              this.log('[%s] current state [motion%s detected].', this.dName, motionDetected ? '' : ' not')
             }
             if (motionDetected) {
               this.accessory.getService(this.S.MotionSensor)
@@ -223,7 +241,7 @@ module.exports = class deviceZBDev {
             this.accessory.getService(this.S.ContactSensor)
               .updateCharacteristic(this.C.ContactSensorState, params.lock)
             if (params.updateSource && !this.disableDeviceLogging) {
-              this.log('[%s] current state [contact%s detected].', this.accessory.displayName, params.lock === 0 ? '' : ' not')
+              this.log('[%s] current state [contact%s detected].', this.dName, params.lock === 0 ? '' : ' not')
             }
             this.accessory.historyService.addEntry({
               time: Math.round(new Date().valueOf() / 1000),

From 14f4e33c821b5c55872d6ddfd792b6b6d153a0db Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 24 Jan 2021 10:59:38 +0000
Subject: [PATCH 1200/3183] Update th-thermo.js

---
 lib/device/th-thermo.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/lib/device/th-thermo.js b/lib/device/th-thermo.js
index 167c4e03..bc6b9a38 100644
--- a/lib/device/th-thermo.js
+++ b/lib/device/th-thermo.js
@@ -30,10 +30,7 @@ module.exports = class deviceTHThermo {
       .setProps({ validValues: [0, 1] })
     this.service.getCharacteristic(this.C.TargetTemperature)
       .on('set', this.internalTempUpdate.bind(this))
-    if (
-      this.accessory.context.sensorType !== 'DS18B20' &&
-      !this.service.testCharacteristic(this.C.CurrentRelativeHumidity)
-    ) {
+    if (this.accessory.context.sensorType !== 'DS18B20' && !this.service.testCharacteristic(this.C.CurrentRelativeHumidity)) {
       this.service.addCharacteristic(this.C.CurrentRelativeHumidity)
     }
     this.accessory.log = platform.config.debugFakegato ? this.log : () => {}

From ef2306953d06892a22e1856e399bc92caa6b5e97 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 24 Jan 2021 11:05:05 +0000
Subject: [PATCH 1201/3183] dw2 battery fix

---
 lib/device/sensor.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/device/sensor.js b/lib/device/sensor.js
index f1eab230..c4cbb7c0 100644
--- a/lib/device/sensor.js
+++ b/lib/device/sensor.js
@@ -45,6 +45,7 @@ module.exports = class deviceSensor {
       if (this.helpers.hasProperty(params, 'battery')) {
         const scaledBattery = Math.round(params.battery * 33.3)
         if (this.cacheBattery !== scaledBattery) {
+          this.cacheBattery = scaledBattery
           this.batteryService.updateCharacteristic(this.C.BatteryLevel, this.cacheBattery)
             .updateCharacteristic(this.C.StatusLowBattery, this.cacheBattery < this.lowBattThreshold)
           if (params.updateSource && !this.disableDeviceLogging) {

From 8d6f0ac25e06718c8f96bbb78ab22241c427266a Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 24 Jan 2021 11:06:55 +0000
Subject: [PATCH 1202/3183] 4.4.5-0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 4a018457..980be3f0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.4.4",
+  "version": "4.4.5-0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index d13f2af2..2be85d9c 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "4.4.4",
+  "version": "4.4.5-0",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 9bf89c8d50aa11087f0d8db9514d51c6f02d7c77 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 24 Jan 2021 12:47:02 +0000
Subject: [PATCH 1203/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 753f85cf..b8624c48 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 All notable changes to this homebridge-ewelink will be documented in this file.
 
+## BETA
+
+### Changes
+
+* Fix where the battery for DW2 device would not update
+
 ## 4.4.4 (2021-01-24)
 
 ### Changes

From 894a2311b9bd24054c30dcb8ea081d599dec607e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 24 Jan 2021 14:57:35 +0000
Subject: [PATCH 1204/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b8624c48..9dc2cdea 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 All notable changes to this homebridge-ewelink will be documented in this file.
 
-## BETA
+## 4.4.5 (2021-01-24)
 
 ### Changes
 

From 41ce269a8dbd0e68e2ddf59f9b225f82bf53a181 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 24 Jan 2021 14:58:00 +0000
Subject: [PATCH 1205/3183] 4.4.5

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 980be3f0..cafecf6c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.4.5-0",
+  "version": "4.4.5",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 2be85d9c..e147662b 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "4.4.5-0",
+  "version": "4.4.5",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From aa6656017d51dcd68f1d81b3f842def7937cf7fb Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 24 Jan 2021 16:44:15 +0000
Subject: [PATCH 1206/3183] correct to show switch state

---
 lib/device/th-outlet.js | 10 ++++++----
 lib/device/th-thermo.js | 10 ++++++----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/lib/device/th-outlet.js b/lib/device/th-outlet.js
index 9de18ab4..81a11f65 100644
--- a/lib/device/th-outlet.js
+++ b/lib/device/th-outlet.js
@@ -28,7 +28,10 @@ module.exports = class deviceTHOutlet {
     }
     this.tempService = this.accessory.getService(this.S.TemperatureSensor) || this.accessory.addService(this.S.TemperatureSensor)
     this.tempService.getCharacteristic(this.C.CurrentTemperature)
-      .setProps({ minValue: -100 })
+      .setProps({
+        minValue: -100,
+        minStep: 0.1
+      })
     if (this.accessory.context.sensorType !== 'DS18B20') {
       this.humiService = this.accessory.getService(this.S.HumiditySensor) || this.accessory.addService(this.S.HumiditySensor)
     }
@@ -44,7 +47,6 @@ module.exports = class deviceTHOutlet {
       callback()
       const params = {
         switch: value ? 'on' : 'off',
-        mainSwitch: value ? 'on' : 'off'
       }
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.cacheOnOff = value ? 'on' : 'off'
@@ -58,8 +60,8 @@ module.exports = class deviceTHOutlet {
 
   async externalUpdate (params) {
     try {
-      if (!this.hideSwitch && (params.switch || params.mainSwitch)) {
-        const newState = params.switch || params.mainSwitch
+      if (!this.hideSwitch && params.switch) {
+        const newState = params.switch
         if (this.cacheOnOff !== newState) {
           this.cacheOnOff = newState
           this.switchService.updateCharacteristic(this.C.On, this.cacheOnOff === 'on')
diff --git a/lib/device/th-thermo.js b/lib/device/th-thermo.js
index bc6b9a38..81e00406 100644
--- a/lib/device/th-thermo.js
+++ b/lib/device/th-thermo.js
@@ -24,7 +24,10 @@ module.exports = class deviceTHThermo {
     }
     this.service = this.accessory.getService(this.S.Thermostat) || this.accessory.addService(this.S.Thermostat)
     this.service.getCharacteristic(this.C.CurrentTemperature)
-      .setProps({ minValue: -100 })
+      .setProps({
+        minValue: -100,
+        minStep: 0.1
+      })
     this.service.getCharacteristic(this.C.TargetHeatingCoolingState)
       .on('set', this.internalOnOffUpdate.bind(this))
       .setProps({ validValues: [0, 1] })
@@ -45,7 +48,6 @@ module.exports = class deviceTHThermo {
       callback()
       const params = {
         switch: value !== 0 ? 'on' : 'off',
-        mainSwitch: value !== 0 ? 'on' : 'off'
       }
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.cacheOnOff = value !== 0 ? 'on' : 'off'
@@ -72,8 +74,8 @@ module.exports = class deviceTHThermo {
 
   async externalUpdate (params) {
     try {
-      if (params.switch || params.mainSwitch) {
-        const newState = params.switch || params.mainSwitch
+      if (params.switch) {
+        const newState = params.switch
         if (this.cacheOnOff !== newState) {
           this.cacheOnOff = newState
           this.switchService.updateCharacteristic(this.C.On, this.cacheOnOff === 'on')

From f1833418fa3ae10257d56fef7e376021d08ea6b8 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 24 Jan 2021 16:46:12 +0000
Subject: [PATCH 1207/3183] correct to show switch state formatting

---
 lib/device/th-outlet.js | 2 +-
 lib/device/th-thermo.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/device/th-outlet.js b/lib/device/th-outlet.js
index 81a11f65..3f4f6445 100644
--- a/lib/device/th-outlet.js
+++ b/lib/device/th-outlet.js
@@ -46,7 +46,7 @@ module.exports = class deviceTHOutlet {
     try {
       callback()
       const params = {
-        switch: value ? 'on' : 'off',
+        switch: value ? 'on' : 'off'
       }
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.cacheOnOff = value ? 'on' : 'off'
diff --git a/lib/device/th-thermo.js b/lib/device/th-thermo.js
index 81e00406..850eaf67 100644
--- a/lib/device/th-thermo.js
+++ b/lib/device/th-thermo.js
@@ -47,7 +47,7 @@ module.exports = class deviceTHThermo {
     try {
       callback()
       const params = {
-        switch: value !== 0 ? 'on' : 'off',
+        switch: value !== 0 ? 'on' : 'off'
       }
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.cacheOnOff = value !== 0 ? 'on' : 'off'

From 096a90372a2947c401393369bc27cd46dea4a1d0 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 24 Jan 2021 16:46:44 +0000
Subject: [PATCH 1208/3183] 4.4.6-0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index cafecf6c..347cbfad 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.4.5",
+  "version": "4.4.6-0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index e147662b..360b77b9 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "4.4.5",
+  "version": "4.4.6-0",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 8d8327ce457026fc4191012d4bd6baf054194903 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 24 Jan 2021 17:09:06 +0000
Subject: [PATCH 1209/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9dc2cdea..30709fff 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 All notable changes to this homebridge-ewelink will be documented in this file.
 
+## BETA
+
+### Changes
+
+* Fix for TH10/16 devices when the HomeKit switch would show the state of 'auto' mode
+
 ## 4.4.5 (2021-01-24)
 
 ### Changes

From 0f4cc53f6037b53436689eb6ae27e3612b7939f3 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 24 Jan 2021 21:41:06 +0000
Subject: [PATCH 1210/3183] always bracket ifs

---
 lib/device/diffuser.js     | 20 +++++++++++++++-----
 lib/device/fan.js          |  4 +++-
 lib/device/light-colour.js | 20 +++++++++++++++-----
 lib/device/light-ctemp.js  | 12 +++++++++---
 lib/device/rf-bridge.js    |  4 +++-
 lib/device/switch-multi.js |  8 ++++++--
 lib/device/zb-dev.js       |  4 +++-
 lib/index.js               | 12 +++++++++---
 8 files changed, 63 insertions(+), 21 deletions(-)

diff --git a/lib/device/diffuser.js b/lib/device/diffuser.js
index 70eed33e..7f14a85a 100644
--- a/lib/device/diffuser.js
+++ b/lib/device/diffuser.js
@@ -42,7 +42,9 @@ module.exports = class deviceDiffuser {
       const timerKey = Math.random().toString(36).substr(2, 8)
       this.updateTimeout = timerKey
       setTimeout(() => {
-        if (this.updateTimeout === timerKey) this.updateTimeout = false
+        if (this.updateTimeout === timerKey) {
+          this.updateTimeout = false
+        }
       }, 10000)
       await this.platform.sendDeviceUpdate(this.accessory, params)
       if (!this.disableDeviceLogging) {
@@ -73,7 +75,9 @@ module.exports = class deviceDiffuser {
       }
       this.updateTimeout = updateKeySpeed
       setTimeout(() => {
-        if (this.updateTimeout === updateKeySpeed) this.updateTimeout = false
+        if (this.updateTimeout === updateKeySpeed) {
+          this.updateTimeout = false
+        }
       }, 10000)
       await this.platform.sendDeviceUpdate(this.accessory, params)
       if (!this.disableDeviceLogging) {
@@ -101,7 +105,9 @@ module.exports = class deviceDiffuser {
       }
       this.updateTimeout = updateKeyLight
       setTimeout(() => {
-        if (this.updateTimeout === updateKeyLight) this.updateTimeout = false
+        if (this.updateTimeout === updateKeyLight) {
+          this.updateTimeout = false
+        }
       }, 10000)
       await this.platform.sendDeviceUpdate(this.accessory, params)
       if (!this.disableDeviceLogging) {
@@ -129,7 +135,9 @@ module.exports = class deviceDiffuser {
       }
       this.updateTimeout = updateKeyBright
       setTimeout(() => {
-        if (this.updateTimeout === updateKeyBright) this.updateTimeout = false
+        if (this.updateTimeout === updateKeyBright) {
+          this.updateTimeout = false
+        }
       }, 10000)
       await this.platform.sendDeviceUpdate(this.accessory, params)
       if (!this.disableDeviceLogging) {
@@ -168,7 +176,9 @@ module.exports = class deviceDiffuser {
       }
       this.updateTimeout = updateKeyColour
       setTimeout(() => {
-        if (this.updateTimeout === updateKeyColour) this.updateTimeout = false
+        if (this.updateTimeout === updateKeyColour) {
+          this.updateTimeout = false
+        }
       }, 10000)
       await this.platform.sendDeviceUpdate(this.accessory, params)
       if (!this.disableDeviceLogging) {
diff --git a/lib/device/fan.js b/lib/device/fan.js
index d1f0eeff..23dfdf10 100644
--- a/lib/device/fan.js
+++ b/lib/device/fan.js
@@ -16,7 +16,9 @@ module.exports = class deviceFan {
     this.service.getCharacteristic(this.C.On)
       .on('set', (value, callback) => {
         callback()
-        if (!value) this.service.setCharacteristic(this.C.RotationSpeed, 0)
+        if (!value) {
+          this.service.setCharacteristic(this.C.RotationSpeed, 0)
+        }
       })
     this.service.getCharacteristic(this.C.RotationSpeed)
       .on('set', this.internalSpeedUpdate.bind(this))
diff --git a/lib/device/light-colour.js b/lib/device/light-colour.js
index 8d596ae7..5d489367 100644
--- a/lib/device/light-colour.js
+++ b/lib/device/light-colour.js
@@ -60,7 +60,9 @@ module.exports = class deviceLightColour {
       const timerKey = Math.random().toString(36).substr(2, 8)
       this.updateTimeout = timerKey
       setTimeout(() => {
-        if (this.updateTimeout === timerKey) this.updateTimeout = false
+        if (this.updateTimeout === timerKey) {
+          this.updateTimeout = false
+        }
       }, 10000)
       await this.platform.sendDeviceUpdate(this.accessory, params)
       if (!this.disableDeviceLogging) {
@@ -120,7 +122,9 @@ module.exports = class deviceLightColour {
       }
       this.updateTimeout = updateKeyBright
       setTimeout(() => {
-        if (this.updateTimeout === updateKeyBright) this.updateTimeout = false
+        if (this.updateTimeout === updateKeyBright) {
+          this.updateTimeout = false
+        }
       }, 10000)
       await this.platform.sendDeviceUpdate(this.accessory, params)
       if (!this.disableDeviceLogging) {
@@ -191,7 +195,9 @@ module.exports = class deviceLightColour {
       }
       this.updateTimeout = updateKeyColour
       setTimeout(() => {
-        if (this.updateTimeout === updateKeyColour) this.updateTimeout = false
+        if (this.updateTimeout === updateKeyColour) {
+          this.updateTimeout = false
+        }
       }, 10000)
       await this.platform.sendDeviceUpdate(this.accessory, params)
       if (!this.disableDeviceLogging) {
@@ -256,7 +262,9 @@ module.exports = class deviceLightColour {
       }
       this.updateTimeout = updateKeyCT
       setTimeout(() => {
-        if (this.updateTimeout === updateKeyCT) this.updateTimeout = false
+        if (this.updateTimeout === updateKeyCT) {
+          this.updateTimeout = false
+        }
       }, 10000)
       await this.platform.sendDeviceUpdate(this.accessory, params)
       if (!this.disableDeviceLogging) {
@@ -282,7 +290,9 @@ module.exports = class deviceLightColour {
       ) {
         this.cacheOnOff = this.isB1 ? params.state : params.switch
         this.service.updateCharacteristic(this.C.On, this.cacheOnOff === 'on')
-        if (this.isB1) this.service.updateCharacteristic(this.C.Brightness, this.cacheOnOff === 'on' ? 100 : 0)
+        if (this.isB1) {
+          this.service.updateCharacteristic(this.C.Brightness, this.cacheOnOff === 'on' ? 100 : 0)
+        }
         if (params.updateSource && !this.disableDeviceLogging) {
           this.log('[%s] current state [%s].', this.dName, this.cacheOnOff)
         }
diff --git a/lib/device/light-ctemp.js b/lib/device/light-ctemp.js
index 8fef02f6..3bda7bce 100644
--- a/lib/device/light-ctemp.js
+++ b/lib/device/light-ctemp.js
@@ -47,7 +47,9 @@ module.exports = class deviceLightColour {
       const timerKey = Math.random().toString(36).substr(2, 8)
       this.updateTimeout = timerKey
       setTimeout(() => {
-        if (this.updateTimeout === timerKey) this.updateTimeout = false
+        if (this.updateTimeout === timerKey) {
+          this.updateTimeout = false
+        }
       }, 10000)
       await this.platform.sendDeviceUpdate(this.accessory, {
         switch: this.cacheOnOff
@@ -82,7 +84,9 @@ module.exports = class deviceLightColour {
       }
       this.updateTimeout = updateKeyBright
       setTimeout(() => {
-        if (this.updateTimeout === updateKeyBright) this.updateTimeout = false
+        if (this.updateTimeout === updateKeyBright) {
+          this.updateTimeout = false
+        }
       }, 10000)
       await this.platform.sendDeviceUpdate(this.accessory, params)
       if (!this.disableDeviceLogging) {
@@ -117,7 +121,9 @@ module.exports = class deviceLightColour {
       }
       this.updateTimeout = updateKeyCT
       setTimeout(() => {
-        if (this.updateTimeout === updateKeyCT) this.updateTimeout = false
+        if (this.updateTimeout === updateKeyCT) {
+          this.updateTimeout = false
+        }
       }, 10000)
       await this.platform.sendDeviceUpdate(this.accessory, params)
       if (!this.disableDeviceLogging) {
diff --git a/lib/device/rf-bridge.js b/lib/device/rf-bridge.js
index cbfb3911..5345d90f 100644
--- a/lib/device/rf-bridge.js
+++ b/lib/device/rf-bridge.js
@@ -33,7 +33,9 @@ module.exports = class deviceRFBridge {
         : this.sensorTimeDifference
     if (['curtain', 'button'].includes(this.accessory.context.subType)) {
       Object.entries(this.accessory.context.buttons).forEach(([chan, name]) => {
-        if (!this.accessory.getService(name)) this.accessory.addService(this.S.Switch, name, 'switch' + chan)
+        if (!this.accessory.getService(name)) {
+          this.accessory.addService(this.S.Switch, name, 'switch' + chan)
+        }
         this.accessory.getService(name).updateCharacteristic(this.C.On, false)
         this.accessory.getService(name).getCharacteristic(this.C.On)
           .on('set', (value, callback) => this.internalUpdate(chan, name, value, callback))
diff --git a/lib/device/switch-multi.js b/lib/device/switch-multi.js
index cd763893..d36a0ed4 100644
--- a/lib/device/switch-multi.js
+++ b/lib/device/switch-multi.js
@@ -101,10 +101,14 @@ module.exports = class deviceSwitchMulti {
       const idToCheck = this.accessory.context.eweDeviceId + 'SW'
       let primaryState = false
       for (let i = 1; i <= this.accessory.context.channelCount; i++) {
-        if (params.switches[i - 1].switch === 'on') primaryState = true
+        if (params.switches[i - 1].switch === 'on') {
+          primaryState = true
+        }
         if (this.platform.devicesInHB.has(idToCheck + i)) {
           const oAccessory = this.platform.devicesInHB.get(idToCheck + i)
-          if (params.switches[i - 1].switch === oAccessory.context.cacheOnOff) continue
+          if (params.switches[i - 1].switch === oAccessory.context.cacheOnOff) {
+            continue
+          }
           oAccessory.getService(this.S.Switch)
             .updateCharacteristic(this.C.On, params.switches[i - 1].switch === 'on')
           oAccessory.context.cacheOnOff = params.switches[i - 1].switch
diff --git a/lib/device/zb-dev.js b/lib/device/zb-dev.js
index 9ec8169d..fa2fc174 100644
--- a/lib/device/zb-dev.js
+++ b/lib/device/zb-dev.js
@@ -137,7 +137,9 @@ module.exports = class deviceZBDev {
     try {
       //* ** credit @tasict ***\\
       if (params.battery) {
-        if (this.accessory.context.eweUIID === 3026 && this.platform.config.ZBDWBatt) params.battery *= 10
+        if (this.accessory.context.eweUIID === 3026 && this.platform.config.ZBDWBatt) {
+          params.battery *= 10
+        }
         if (params.battery !== this.cacheBattery) {
           const batt = this.accessory.getService(this.S.BatteryService) || this.accessory.addService(this.S.BatteryService)
           batt.updateCharacteristic(this.C.BatteryLevel, params.battery)
diff --git a/lib/index.js b/lib/index.js
index 13772557..8febc39b 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -32,9 +32,15 @@ class eWeLinkPlatform {
       this.thTempOffset = {}
       this.nameOverride = {}
       this.ipOverride = {}
-      if (Array.isArray(config.thTempOffset)) config.thTempOffset.forEach(x => (this.thTempOffset[x.deviceId] = x.offset))
-      if (Array.isArray(config.nameOverride)) config.nameOverride.forEach(x => (this.nameOverride[x.fullDeviceId] = x.deviceName))
-      if (Array.isArray(config.ipOverride)) config.ipOverride.forEach(x => (this.ipOverride[x.deviceId] = x.deviceIP))
+      if (Array.isArray(config.thTempOffset)) {
+        config.thTempOffset.forEach(x => (this.thTempOffset[x.deviceId] = x.offset))
+      }
+      if (Array.isArray(config.nameOverride)) {
+        config.nameOverride.forEach(x => (this.nameOverride[x.fullDeviceId] = x.deviceName))
+      }
+      if (Array.isArray(config.ipOverride)) {
+        config.ipOverride.forEach(x => (this.ipOverride[x.deviceId] = x.deviceIP))
+      }
 
       // *** Set up Homebridge API events *** \\
       this.api.on('didFinishLaunching', this.eWeLinkSetup.bind(this))

From 61c573ce3a9e8e2e71b80b9e13770b1ed5b69ce1 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 25 Jan 2021 13:30:35 +0000
Subject: [PATCH 1211/3183] on/off fix

---
 lib/device/th-thermo.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/device/th-thermo.js b/lib/device/th-thermo.js
index 850eaf67..b41dcb5d 100644
--- a/lib/device/th-thermo.js
+++ b/lib/device/th-thermo.js
@@ -78,7 +78,7 @@ module.exports = class deviceTHThermo {
         const newState = params.switch
         if (this.cacheOnOff !== newState) {
           this.cacheOnOff = newState
-          this.switchService.updateCharacteristic(this.C.On, this.cacheOnOff === 'on')
+          this.service.updateCharacteristic(this.C.TargetHeatingCoolingState, this.cacheOnOff === 'on' ? 0 : 1)
           this.accessory.historyService.addEntry({
             time: Math.round(new Date().valueOf() / 1000),
             status: this.cacheOnOff === 'on' ? 1 : 0

From 84c2ee59c7bd369643bec219eedcae6d48aaf3d1 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 25 Jan 2021 13:30:42 +0000
Subject: [PATCH 1212/3183] show line number too

---
 lib/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/index.js b/lib/index.js
index 8febc39b..c0acfec1 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -794,7 +794,7 @@ class eWeLinkPlatform {
   }
 
   async deviceUpdateError (accessory, err, requestRefresh) {
-    this.log.warn('[%s] device update failed as %s.', accessory.displayName, err.message)
+    this.log.warn('[%s] device update failed as %s on line %s.', accessory.displayName, err.message, err.lineNumber)
 
     // *** We only request a device refresh on failed internal updates (ie with 'set' handlers) *** \\
     if (!requestRefresh) {

From 258a663825811ec2dbebad7f7078f73fc66990f9 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 25 Jan 2021 14:43:39 +0000
Subject: [PATCH 1213/3183] full thermostat beta

---
 lib/device/th-thermo.js | 93 ++++++++++++++++++++++++++++++++++-------
 1 file changed, 78 insertions(+), 15 deletions(-)

diff --git a/lib/device/th-thermo.js b/lib/device/th-thermo.js
index b41dcb5d..d07e853d 100644
--- a/lib/device/th-thermo.js
+++ b/lib/device/th-thermo.js
@@ -22,6 +22,9 @@ module.exports = class deviceTHThermo {
     if (this.accessory.getService(this.S.HumiditySensor)) {
       this.accessory.removeService(this.accessory.getService(this.S.HumiditySensor))
     }
+    if (!this.helpers.hasProperty(this.accessory.context, 'cacheHeatingTarget')) {
+      this.accessory.context.cacheHeatingTarget = 16
+    }
     this.service = this.accessory.getService(this.S.Thermostat) || this.accessory.addService(this.S.Thermostat)
     this.service.getCharacteristic(this.C.CurrentTemperature)
       .setProps({
@@ -32,7 +35,12 @@ module.exports = class deviceTHThermo {
       .on('set', this.internalOnOffUpdate.bind(this))
       .setProps({ validValues: [0, 1] })
     this.service.getCharacteristic(this.C.TargetTemperature)
-      .on('set', this.internalTempUpdate.bind(this))
+      .on('set', this.internalTargetTempUpdate.bind(this))
+      .setProps({
+        minValue: 0,
+        maxValue: 30,
+        minStep: 0.5
+      })
     if (this.accessory.context.sensorType !== 'DS18B20' && !this.service.testCharacteristic(this.C.CurrentRelativeHumidity)) {
       this.service.addCharacteristic(this.C.CurrentRelativeHumidity)
     }
@@ -46,27 +54,69 @@ module.exports = class deviceTHThermo {
   async internalOnOffUpdate (value, callback) {
     try {
       callback()
-      const params = {
-        switch: value !== 0 ? 'on' : 'off'
+      const params = {}
+      if (value === 0) {
+        // *** Has been turned off *** \\
+        params.mainswitch = 'off'
+        params.switch = 'off'
+      } else {
+        params.mainswitch = 'on'
+        params.switch = this.service.getCharacteristic(this.C.CurrentTemperature).value < this.accessory.context.cacheHeatingTarget
+          ? 'on'
+          : 'off'
       }
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.cacheOnOff = value !== 0 ? 'on' : 'off'
+      this.cacheIsHeating = params.switch
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current state [%s].', this.dName, this.cacheOnOff)
+        this.log('[%s] current state [%s] heating [%s].', this.dName, this.cacheOnOff, this.cacheIsHeating)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
     }
   }
 
-  async internalTempUpdate (value, callback) {
+  async internalTargetTempUpdate (value, callback) {
     try {
       callback()
-      await this.helpers.sleep(500)
-      this.service.updateCharacteristic(
-        this.C.TargetTemperature,
-        this.service.getCharacteristic(this.C.CurrentTemperature).value
-      )
+      this.accessory.context.cacheHeatingTarget = value
+      this.cacheOnOff = 'on'
+      this.cacheIsHeating = this.service.getCharacteristic(this.C.CurrentTemperature).value < value
+        ? 'on'
+        : 'off'
+      const params = {
+        mainswitch: this.cacheOnOff,
+        switch: this.cacheIsHeating
+      }
+      await this.platform.sendDeviceUpdate(this.accessory, params)
+      if (!this.disableDeviceLogging) {
+        this.log('[%s] current state [%s] heating [%s].', this.dName, this.cacheOnOff, this.cacheIsHeating)
+      }
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, true)
+    }
+  }
+
+  async internalCurrentTempUpdate (value) {
+    try {
+      const params = {}
+      // *** Logic for checking the new current temperature against the target temperature *** \\
+      if (this.service.getCharacteristic(this.C.TargetHeatingCoolingState).value !== 0) {
+        // *** Thermostat is on so compare temperatures *** \\
+
+        if (this.cacheTemp < this.accessory.context.cacheHeatingTarget && this.cacheIsHeating !== 'on') {
+          this.cacheIsHeating = 'on'
+          params.switch = this.cacheIsHeating
+          await this.platform.sendDeviceUpdate(this.accessory, params)
+        } else if (this.cacheTemp < this.accessory.context.cacheHeatingTarget && this.cacheIsHeating !== 'off') {
+          this.cacheIsHeating = 'off'
+          params.switch = this.cacheIsHeating
+          await this.platform.sendDeviceUpdate(this.accessory, params)
+        }
+        if (!this.disableDeviceLogging) {
+          this.log('[%s] current state [%s] heating [%s].', this.dName, this.cacheOnOff, this.cacheIsHeating)
+        }
+      }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
     }
@@ -74,8 +124,8 @@ module.exports = class deviceTHThermo {
 
   async externalUpdate (params) {
     try {
-      if (params.switch) {
-        const newState = params.switch
+      if (params.mainswitch) {
+        const newState = params.mainswitch
         if (this.cacheOnOff !== newState) {
           this.cacheOnOff = newState
           this.service.updateCharacteristic(this.C.TargetHeatingCoolingState, this.cacheOnOff === 'on' ? 0 : 1)
@@ -83,11 +133,22 @@ module.exports = class deviceTHThermo {
             time: Math.round(new Date().valueOf() / 1000),
             status: this.cacheOnOff === 'on' ? 1 : 0
           })
-          if (params.updateSource && !this.disableDeviceLogging) {
+          if (this.cacheOnOff === 'off') {
+            this.cacheIsHeating = 'off'
+          }
+          // if (params.updateSource && !this.disableDeviceLogging && !params.switch) {
+          if (!this.disableDeviceLogging && !params.switch) {
             this.log('[%s] current state [%s].', this.dName, this.cacheOnOff)
           }
         }
       }
+      if (params.switch) {
+        // if (params.updateSource && !this.disableDeviceLogging) {
+        if (!this.disableDeviceLogging) {
+          this.log('[%s] current state [%s] heating [%s].', this.dName, this.cacheOnOff, params.switch)
+        }
+        this.cacheIsHeating = params.switch
+      }
       const eveLog = {}
       if (this.helpers.hasProperty(params, 'currentTemperature') && params.currentTemperature !== 'unavailable') {
         const currentTemp = parseFloat(params.currentTemperature) + this.tempOffset
@@ -95,10 +156,11 @@ module.exports = class deviceTHThermo {
         if (this.cacheTemp !== currentTemp) {
           this.cacheTemp = currentTemp
           this.service.updateCharacteristic(this.C.CurrentTemperature, this.cacheTemp)
-          this.service.updateCharacteristic(this.C.TargetTemperature, this.cacheTemp)
+          // if (params.updateSource && !this.disableDeviceLogging) {
           if (params.updateSource && !this.disableDeviceLogging) {
             this.log('[%s] current temperature [%s].', this.dName, this.cacheTemp)
           }
+          this.internalCurrentTempUpdate(this.cacheTemp)
         }
       }
       if (
@@ -111,7 +173,8 @@ module.exports = class deviceTHThermo {
         if (this.cacheHumi !== currentHumi) {
           this.cacheHumi = currentHumi
           this.service.updateCharacteristic(this.C.CurrentRelativeHumidity, this.cacheHumi)
-          if (params.updateSource && !this.disableDeviceLogging) {
+          // if (params.updateSource && !this.disableDeviceLogging) {
+          if (!this.disableDeviceLogging) {
             this.log('[%s] current humidity [%s%].', this.dName, this.cacheHumi)
           }
         }

From 14a0ff9953d21dbae9baf2fd26bd4a6759ec660d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 25 Jan 2021 17:39:41 +0000
Subject: [PATCH 1214/3183] full thermostat beta 2

---
 CHANGELOG.md            |  4 ++++
 lib/device/th-thermo.js | 16 ++++++++++++++--
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 30709fff..02e77e47 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 ## BETA
 
+## New
+
+* **[Experimental]** Expose a TH10/16 device as a fully working thermostat accessory
+
 ### Changes
 
 * Fix for TH10/16 devices when the HomeKit switch would show the state of 'auto' mode
diff --git a/lib/device/th-thermo.js b/lib/device/th-thermo.js
index d07e853d..427b2772 100644
--- a/lib/device/th-thermo.js
+++ b/lib/device/th-thermo.js
@@ -44,6 +44,12 @@ module.exports = class deviceTHThermo {
     if (this.accessory.context.sensorType !== 'DS18B20' && !this.service.testCharacteristic(this.C.CurrentRelativeHumidity)) {
       this.service.addCharacteristic(this.C.CurrentRelativeHumidity)
     }
+
+    // *** BETA *** \\
+    this.service.updateCharacteristic(this.C.CurrentTemperature, 16)
+    this.service.updateCharacteristic(this.C.TargetTemperature, 20)
+    // *** END BETA *** \\
+
     this.accessory.log = platform.config.debugFakegato ? this.log : () => {}
     this.accessory.historyService = new this.platform.eveService('custom', this.accessory, {
       storage: 'fs',
@@ -54,6 +60,7 @@ module.exports = class deviceTHThermo {
   async internalOnOffUpdate (value, callback) {
     try {
       callback()
+      this.log('[%s] setting TargetHeatingCoolingState to %s.', this.dName, value)
       const params = {}
       if (value === 0) {
         // *** Has been turned off *** \\
@@ -65,9 +72,10 @@ module.exports = class deviceTHThermo {
           ? 'on'
           : 'off'
       }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
       this.cacheOnOff = value !== 0 ? 'on' : 'off'
       this.cacheIsHeating = params.switch
+      this.service.updateCharacteristic(this.C.CurrentHeatingCoolingState, this.cacheIsHeating === 'on' ? 1 : 0)
+      await this.platform.sendDeviceUpdate(this.accessory, params)
       if (!this.disableDeviceLogging) {
         this.log('[%s] current state [%s] heating [%s].', this.dName, this.cacheOnOff, this.cacheIsHeating)
       }
@@ -78,6 +86,7 @@ module.exports = class deviceTHThermo {
 
   async internalTargetTempUpdate (value, callback) {
     try {
+      this.log('[%s] setting TargetTemperature to %s.', this.dName, value)
       callback()
       this.accessory.context.cacheHeatingTarget = value
       this.cacheOnOff = 'on'
@@ -88,6 +97,7 @@ module.exports = class deviceTHThermo {
         mainswitch: this.cacheOnOff,
         switch: this.cacheIsHeating
       }
+      this.service.updateCharacteristic(this.C.CurrentHeatingCoolingState, this.cacheIsHeating === 'on' ? 1 : 0)
       await this.platform.sendDeviceUpdate(this.accessory, params)
       if (!this.disableDeviceLogging) {
         this.log('[%s] current state [%s] heating [%s].', this.dName, this.cacheOnOff, this.cacheIsHeating)
@@ -100,17 +110,19 @@ module.exports = class deviceTHThermo {
   async internalCurrentTempUpdate (value) {
     try {
       const params = {}
+      this.log('[%s] internalCurrentTempUpdate() %s.', this.dName, value)
       // *** Logic for checking the new current temperature against the target temperature *** \\
       if (this.service.getCharacteristic(this.C.TargetHeatingCoolingState).value !== 0) {
         // *** Thermostat is on so compare temperatures *** \\
-
         if (this.cacheTemp < this.accessory.context.cacheHeatingTarget && this.cacheIsHeating !== 'on') {
           this.cacheIsHeating = 'on'
           params.switch = this.cacheIsHeating
+          this.service.updateCharacteristic(this.C.CurrentHeatingCoolingState, this.cacheIsHeating === 'on' ? 1 : 0)
           await this.platform.sendDeviceUpdate(this.accessory, params)
         } else if (this.cacheTemp < this.accessory.context.cacheHeatingTarget && this.cacheIsHeating !== 'off') {
           this.cacheIsHeating = 'off'
           params.switch = this.cacheIsHeating
+          this.service.updateCharacteristic(this.C.CurrentHeatingCoolingState, this.cacheIsHeating === 'on' ? 1 : 0)
           await this.platform.sendDeviceUpdate(this.accessory, params)
         }
         if (!this.disableDeviceLogging) {

From aa452dc9de9a22642dad0e7e11d851d9f36ad9ed Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 25 Jan 2021 17:40:58 +0000
Subject: [PATCH 1215/3183] 4.4.6-1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 347cbfad..8ff36006 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.4.6-0",
+  "version": "4.4.6-1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 360b77b9..d4724bf5 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "4.4.6-0",
+  "version": "4.4.6-1",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From d59e15577fd587ae75c9c7432aec6a9601928680 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 25 Jan 2021 20:37:53 +0000
Subject: [PATCH 1216/3183] update deps

---
 package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 8ff36006..37313530 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -68,9 +68,9 @@
       }
     },
     "follow-redirects": {
-      "version": "1.13.1",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.1.tgz",
-      "integrity": "sha512-SSG5xmZh1mkPGyKzjZP8zLjltIfpW32Y5QpdNJyjcfGxK3qo3NDDkZOZSFiGn1A6SclQxY9GzEwAHQ3dmYRWpg=="
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.2.tgz",
+      "integrity": "sha512-6mPTgLxYm3r6Bkkg0vNM0HTjfGrOEtsfbhagQvbxDEsEkpNhw582upBaoRZylzen6krEmxXJgt9Ju6HiI4O7BA=="
     },
     "function-bind": {
       "version": "1.1.1",

From 75fee11e909bd5151ab84a2497000130e082772d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 25 Jan 2021 20:38:08 +0000
Subject: [PATCH 1217/3183] fix logging

---
 lib/device/outlet.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/device/outlet.js b/lib/device/outlet.js
index bc809fc3..4b71252e 100644
--- a/lib/device/outlet.js
+++ b/lib/device/outlet.js
@@ -183,8 +183,8 @@ module.exports = class deviceOutlet {
           '[%s] current%s%s%s.',
           this.dName,
           this.helpers.hasProperty(params, 'power') ? ' power [' + params.power + 'W]' : '',
-          this.helpers.hasProperty(params, 'voltage') ? ' voltage [' + params.power + 'V]' : '',
-          this.helpers.hasProperty(params, 'current') ? ' current [' + params.power + 'A]' : ''
+          this.helpers.hasProperty(params, 'voltage') ? ' voltage [' + params.voltage + 'V]' : '',
+          this.helpers.hasProperty(params, 'current') ? ' current [' + params.current + 'A]' : ''
         )
       }
     } catch (err) {

From 8e97cdec51643a892c774cfd7bcc271345b83aa0 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 25 Jan 2021 20:38:58 +0000
Subject: [PATCH 1218/3183] 4.4.6-2

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 37313530..55d09a4e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.4.6-1",
+  "version": "4.4.6-2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index d4724bf5..3a77f9a5 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "4.4.6-1",
+  "version": "4.4.6-2",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 167ccb54dd241ad792e82f23881b2258defd58ae Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 25 Jan 2021 20:40:35 +0000
Subject: [PATCH 1219/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 02e77e47..cf618703 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 ### Changes
 
 * Fix for TH10/16 devices when the HomeKit switch would show the state of 'auto' mode
+* Fix for the display of watts/amps/volts for outlets that support this
 
 ## 4.4.5 (2021-01-24)
 

From c6b62e5f0b5be361f51ce3bec71f929da771f46b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 26 Jan 2021 09:13:25 +0000
Subject: [PATCH 1220/3183] parse inputs better

---
 lib/device/th-outlet.js | 4 ++--
 lib/device/th-thermo.js | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/device/th-outlet.js b/lib/device/th-outlet.js
index 3f4f6445..cb332e6e 100644
--- a/lib/device/th-outlet.js
+++ b/lib/device/th-outlet.js
@@ -76,7 +76,7 @@ module.exports = class deviceTHOutlet {
       }
       const eveLog = {}
       if (this.helpers.hasProperty(params, 'currentTemperature') && params.currentTemperature !== 'unavailable') {
-        const currentTemp = parseFloat(params.currentTemperature) + this.tempOffset
+        const currentTemp = (parseFloat(params.currentTemperature) + this.tempOffset).toFixed(1)
         eveLog.temp = currentTemp
         if (this.cacheTemp !== currentTemp) {
           this.cacheTemp = currentTemp
@@ -87,7 +87,7 @@ module.exports = class deviceTHOutlet {
         }
       }
       if (this.helpers.hasProperty(params, 'currentHumidity') && params.currentHumidity !== 'unavailable' && this.humiService) {
-        const currentHumi = parseFloat(params.currentHumidity)
+        const currentHumi = parseInt(params.currentHumidity)
         eveLog.humidity = currentHumi
         if (this.cacheHumi !== currentHumi) {
           this.cacheHumi = currentHumi
diff --git a/lib/device/th-thermo.js b/lib/device/th-thermo.js
index 427b2772..9fec5ad6 100644
--- a/lib/device/th-thermo.js
+++ b/lib/device/th-thermo.js
@@ -163,7 +163,7 @@ module.exports = class deviceTHThermo {
       }
       const eveLog = {}
       if (this.helpers.hasProperty(params, 'currentTemperature') && params.currentTemperature !== 'unavailable') {
-        const currentTemp = parseFloat(params.currentTemperature) + this.tempOffset
+        const currentTemp = (parseFloat(params.currentTemperature) + this.tempOffset).toFixed(1)
         eveLog.temp = currentTemp
         if (this.cacheTemp !== currentTemp) {
           this.cacheTemp = currentTemp
@@ -180,7 +180,7 @@ module.exports = class deviceTHThermo {
         params.currentHumidity !== 'unavailable' &&
         this.service.testCharacteristic(this.C.CurrentRelativeHumidity)
       ) {
-        const currentHumi = parseFloat(params.currentHumidity)
+        const currentHumi = parseInt(params.currentHumidity)
         eveLog.humidity = currentHumi
         if (this.cacheHumi !== currentHumi) {
           this.cacheHumi = currentHumi

From 47fc7a3bcd22b1c77d2fbbe1a39a0e1d5648fe12 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 26 Jan 2021 15:23:02 +0000
Subject: [PATCH 1221/3183] deps

---
 package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 55d09a4e..d58d86ca 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -78,9 +78,9 @@
       "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
     },
     "get-intrinsic": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.0.2.tgz",
-      "integrity": "sha512-aeX0vrFm21ILl3+JpFFRNe9aUvp6VFZb2/CTbgLb8j75kOhvoNYjt9d8KA/tJG4gSo8nzEDedRl0h7vDmBYRVg==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.0.tgz",
+      "integrity": "sha512-M11rgtQp5GZMZzDL7jLTNxbDfurpzuau5uqRWDPvlHjfvg3TdScAZo96GLvhMjImrmR8uAt0FS2RLoMrfWGKlg==",
       "requires": {
         "function-bind": "^1.1.1",
         "has": "^1.0.3",

From 166738ecf6558f98056ed6bb36f4e9e1671743e6 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 26 Jan 2021 15:23:57 +0000
Subject: [PATCH 1222/3183] OD switch

---
 config.schema.json             | 11 +++++-
 lib/device/garage-od-switch.js | 61 ++++++++++++++++++++++++++++++++++
 lib/index.js                   | 25 +++++++++++---
 3 files changed, 91 insertions(+), 6 deletions(-)
 create mode 100644 lib/device/garage-od-switch.js

diff --git a/config.schema.json b/config.schema.json
index c07b920e..61394e40 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -287,6 +287,14 @@
               "condition": {
                 "functionBody": "return (model.groups[arrayIndices] && model.groups[arrayIndices].type==='garage')"
               }
+            },
+            "obstructId": {
+              "type": "string",
+              "title": "Obstruction Switch",
+              "description": "An optional switch that will trigger the Obstruction Detected feature depending on its value. Otherwise leave blank.",
+              "condition": {
+                "functionBody": "return (model.groups[arrayIndices] && ['garage', 'garage_eachen'].includes(model.groups[arrayIndices].type))"
+              }
             }
           }
         }
@@ -444,7 +452,8 @@
             "groups[].type",
             "groups[].setup",
             "groups[].operationTime",
-            "groups[].sensorId"
+            "groups[].sensorId",
+            "groups[].obstructId"
           ]
         }
       ]
diff --git a/lib/device/garage-od-switch.js b/lib/device/garage-od-switch.js
new file mode 100644
index 00000000..0b8422ee
--- /dev/null
+++ b/lib/device/garage-od-switch.js
@@ -0,0 +1,61 @@
+/* jshint -W014, -W033, esversion: 9 */
+/* eslint-disable new-cap */
+'use strict'
+module.exports = class deviceGarageODSwitch {
+  constructor (platform, accessory) {
+    this.platform = platform
+    this.log = platform.log
+    this.disableDeviceLogging = platform.config.disableDeviceLogging
+    this.helpers = platform.helpers
+    this.S = platform.api.hap.Service
+    this.C = platform.api.hap.Characteristic
+    this.dName = accessory.displayName
+    this.accessory = accessory
+
+    this.garageId = platform.obstructSwitches[this.accessory.context.eweDeviceId]
+    this.garage = platform.devicesInHB.get(this.garageId + 'SWX')
+
+    this.service = this.accessory.getService(this.S.Switch) || this.accessory.addService(this.S.Switch)
+    this.service.getCharacteristic(this.C.On)
+      .on('set', this.internalUpdate.bind(this))
+
+    this.gService = this.garage.getService(this.S.GarageDoorOpener)
+    this.gService.updateCharacteristic(
+      this.C.ObstructionDetected,
+      this.service.getCharacteristic(this.C.On).value
+    )
+  }
+
+  async internalUpdate (value, callback) {
+    try {
+      callback()
+      await this.platform.sendDeviceUpdate(this.accessory, {
+        switch: value ? 'on' : 'off'
+      })
+      this.cacheOnOff = value ? 'on' : 'off'
+      if (!this.disableDeviceLogging) {
+        this.log('[%s] current state [%s].', this.dName, this.cacheOnOff)
+      }
+      this.gService.updateCharacteristic(this.C.ObstructionDetected, value)
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, true)
+    }
+  }
+
+  async externalUpdate (params) {
+    try {
+      if (!params.switch || params.switch === this.cacheOnOff) {
+        return
+      }
+      const newStatus = params.switch === 'on'
+      this.service.updateCharacteristic(this.C.On, newStatus)
+      this.gService.updateCharacteristic(this.C.On, newStatus)
+      this.cacheOnOff = params.switch
+      if (params.updateSource && !this.disableDeviceLogging) {
+        this.log('[%s] current state [%s].', this.dName, this.cacheOnOff)
+      }
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, false)
+    }
+  }
+}
diff --git a/lib/index.js b/lib/index.js
index c0acfec1..685739ae 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -28,6 +28,7 @@ class eWeLinkPlatform {
       this.cusG = new Map()
       this.cusS = new Map()
       this.hiddenMasters = []
+      this.obstructSwitches = {}
       this.ignoredDevices = (this.config.ignoredDevices || '').replace(/[\s'"]+/g, '').toLowerCase().split(',')
       this.thTempOffset = {}
       this.nameOverride = {}
@@ -88,16 +89,21 @@ class eWeLinkPlatform {
       // *** Check for valid Accessory Simulations and add to cusG for later use *** \\
       if (Object.keys(this.config.groups || []).length > 0) {
         this.config.groups
-          .filter(g => this.helpers.hasProperty(g, 'type') && this.helpers.allowedGroups.includes(g.type))
-          .filter(g => this.helpers.hasProperty(g, 'deviceId') && this.devicesInEW.has(g.deviceId))
-          .forEach(g => this.cusG.set(g.deviceId, g))
+          .filter(g => g.type && this.helpers.allowedGroups.includes(g.type))
+          .filter(g => g.deviceId && this.devicesInEW.has(g.deviceId.toLowerCase()))
+          .forEach(g => {
+            this.cusG.set(g.deviceId.toLowerCase(), g)
+            if (['garage', 'garage_eachen'].includes(g.type) && g.obstructId && this.devicesInEW.has(g.obstructId.toLowerCase())) {
+              this.obstructSwitches[g.obstructId.toLowerCase()] = g.deviceId.toLowerCase()
+            }
+          })
       }
 
       // *** Check for valid custom RF Bridge sensors and add to cusS for later use *** \\
       if (Object.keys(this.config.bridgeSensors || []).length > 0) {
         this.config.bridgeSensors
-          .filter(s => this.helpers.hasProperty(s, 'fullDeviceId') && this.devicesInHB.has(s.fullDeviceId))
-          .forEach(s => this.cusS.set(s.fullDeviceId, s))
+          .filter(s => s.fullDeviceId && this.devicesInEW.has(s.fullDeviceId.split('SW')[0].toString().toLowerCase()))
+          .forEach(s => this.cusS.set(s.fullDeviceId.toLowerCase(), s))
       }
 
       // *** Remove HB accessories that are no longer in eWeLink account *** \\
@@ -180,6 +186,15 @@ class eWeLinkPlatform {
           : this.addAccessory(device, device.deviceid + 'SWX', false, this.helpers.defaultBlindCache)
         accessory.control = new (require('./device/blind'))(this, accessory)
         /***************************/
+      } else if (this.helpers.hasProperty(this.obstructSwitches, device.deviceid)) {
+        /*****************************
+        OBSTRUCTION DETECTION SWITCHES
+        *****************************/
+        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
+          ? this.devicesInHB.get(device.deviceid + 'SWX')
+          : this.addAccessory(device, device.deviceid + 'SWX')
+        accessory.control = new (require('./device/garage-od-switch'))(this, accessory)
+        /****************************/
       } else if (this.cusG.has(device.deviceid) && this.cusG.get(device.deviceid).type === 'garage') {
         /****************************************
         GARAGE DOORS [ONE] [ACCESSORY SIMULATION]

From 8e00d4db48b10fbac862e6ebe4e7ebad925d3365 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 26 Jan 2021 15:25:59 +0000
Subject: [PATCH 1223/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cf618703..3d938376 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 ## New
 
 * **[Experimental]** Expose a TH10/16 device as a fully working thermostat accessory
+* **[Experimental]** Use a switch to control the `Obstruction Detected` feature of a garage door
 
 ### Changes
 

From 7eb6d0a2cac0c4f9dd888501e80c5d2b7253981b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 26 Jan 2021 15:26:31 +0000
Subject: [PATCH 1224/3183] 4.4.6-3

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d58d86ca..7c877681 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.4.6-2",
+  "version": "4.4.6-3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 3a77f9a5..9b59dba4 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "4.4.6-2",
+  "version": "4.4.6-3",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 0d756d6bf9bfdec317eb0a6fd5942ff0fbd66cb6 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 26 Jan 2021 15:35:55 +0000
Subject: [PATCH 1225/3183] Update garage-od-switch.js

---
 lib/device/garage-od-switch.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/device/garage-od-switch.js b/lib/device/garage-od-switch.js
index 0b8422ee..bf9ea6c5 100644
--- a/lib/device/garage-od-switch.js
+++ b/lib/device/garage-od-switch.js
@@ -49,7 +49,7 @@ module.exports = class deviceGarageODSwitch {
       }
       const newStatus = params.switch === 'on'
       this.service.updateCharacteristic(this.C.On, newStatus)
-      this.gService.updateCharacteristic(this.C.On, newStatus)
+      this.gService.updateCharacteristic(this.C.ObstructionDetected, newStatus)
       this.cacheOnOff = params.switch
       if (params.updateSource && !this.disableDeviceLogging) {
         this.log('[%s] current state [%s].', this.dName, this.cacheOnOff)

From ec59fd6f7387d9d32d8d611604761eb6525ad04e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 26 Jan 2021 17:01:16 +0000
Subject: [PATCH 1226/3183] OD switch two

---
 lib/connection/http.js |  3 ++-
 lib/index.js           | 12 ++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/lib/connection/http.js b/lib/connection/http.js
index 0ed69e91..014d3d23 100644
--- a/lib/connection/http.js
+++ b/lib/connection/http.js
@@ -10,6 +10,7 @@ module.exports = class connectionHTTP {
     this.username = platform.config.username.toString().replace(/[\s]+/g, '')
     this.password = platform.config.password.toString()
     this.ignoredDevices = platform.ignoredDevices
+    this.obstructSwitches = platform.obstructSwitches
     this.cCode = '+' + platform.config.countryCode.toString().replace(/[\s+]+/g, '')
     this.axios = require('axios')
     this.crypto = require('crypto')
@@ -200,7 +201,7 @@ module.exports = class connectionHTTP {
           // *** Check each item is a device and also remove any devices the user has ignored *** \\
           if (d.itemData && d.itemData.extra && d.itemData.extra.uiid && !this.ignoredDevices.includes(d.itemData.deviceid)) {
             // *** Separate the sensors as these need to be set up last *** \\
-            if (d.itemData.extra.uiid === 102) {
+            if (d.itemData.extra.uiid === 102 || this.helpers.hasProperty(this.obstructSwitches, d.itemData.deviceid)) {
               sensorList.push(d.itemData)
             } else {
               deviceList.push(d.itemData)
diff --git a/lib/index.js b/lib/index.js
index 685739ae..74baa57b 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -29,6 +29,11 @@ class eWeLinkPlatform {
       this.cusS = new Map()
       this.hiddenMasters = []
       this.obstructSwitches = {}
+      if (Object.keys(this.config.groups || []).length > 0) {
+        this.config.groups
+          .filter(g => g.obstructId && g.deviceId && ['garage', 'garage_eachen'].includes(g.type))
+          .forEach(g => (this.obstructSwitches[g.obstructId.toLowerCase()] = g.deviceId.toLowerCase()))
+      }
       this.ignoredDevices = (this.config.ignoredDevices || '').replace(/[\s'"]+/g, '').toLowerCase().split(',')
       this.thTempOffset = {}
       this.nameOverride = {}
@@ -91,12 +96,7 @@ class eWeLinkPlatform {
         this.config.groups
           .filter(g => g.type && this.helpers.allowedGroups.includes(g.type))
           .filter(g => g.deviceId && this.devicesInEW.has(g.deviceId.toLowerCase()))
-          .forEach(g => {
-            this.cusG.set(g.deviceId.toLowerCase(), g)
-            if (['garage', 'garage_eachen'].includes(g.type) && g.obstructId && this.devicesInEW.has(g.obstructId.toLowerCase())) {
-              this.obstructSwitches[g.obstructId.toLowerCase()] = g.deviceId.toLowerCase()
-            }
-          })
+          .forEach(g => this.cusG.set(g.deviceId.toLowerCase(), g))
       }
 
       // *** Check for valid custom RF Bridge sensors and add to cusS for later use *** \\

From 14fc976771ee31609d290913f2ea2ee08024f05d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 26 Jan 2021 17:02:16 +0000
Subject: [PATCH 1227/3183] 4.4.6-4

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 7c877681..57cbc6a8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.4.6-3",
+  "version": "4.4.6-4",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 9b59dba4..edf2587e 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "4.4.6-3",
+  "version": "4.4.6-4",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From a3166cee51b7dea6bda98c86e5d04f652257803d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 26 Jan 2021 18:43:46 +0000
Subject: [PATCH 1228/3183] OD switch three

---
 lib/index.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/lib/index.js b/lib/index.js
index 74baa57b..bcdc8f6a 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -190,9 +190,7 @@ class eWeLinkPlatform {
         /*****************************
         OBSTRUCTION DETECTION SWITCHES
         *****************************/
-        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
-          ? this.devicesInHB.get(device.deviceid + 'SWX')
-          : this.addAccessory(device, device.deviceid + 'SWX')
+        accessory = this.addAccessory(device, device.deviceid + 'SWX', true)
         accessory.control = new (require('./device/garage-od-switch'))(this, accessory)
         /****************************/
       } else if (this.cusG.has(device.deviceid) && this.cusG.get(device.deviceid).type === 'garage') {
@@ -555,7 +553,10 @@ class eWeLinkPlatform {
       }
 
       // *** Update the current firmware version *** \\
-      if (!this.hiddenMasters.includes(device.deviceid)) {
+      if (
+        !this.hiddenMasters.includes(device.deviceid) &&
+        !this.helpers.hasProperty(this.obstructSwitches, device.deviceid)
+      ) {
         accessory.getService(this.api.hap.Service.AccessoryInformation)
           .setCharacteristic(this.api.hap.Characteristic.FirmwareRevision, device.params.fwVersion || PLUGIN.version)
       }

From c89b98def90d24b0dd0332b0247252e5302359c3 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 26 Jan 2021 18:46:14 +0000
Subject: [PATCH 1229/3183] 4.4.6-5

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 57cbc6a8..3b572064 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.4.6-4",
+  "version": "4.4.6-5",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index edf2587e..802618c5 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "4.4.6-4",
+  "version": "4.4.6-5",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 4b55c67ddadeaaea568df45f1b3dfe36244eecf5 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 27 Jan 2021 07:49:36 +0000
Subject: [PATCH 1230/3183] reformats

---
 lib/device/garage-eachen.js |  6 ++----
 lib/device/garage-four.js   |  6 ++----
 lib/device/garage-one.js    |  6 ++----
 lib/device/garage-two.js    |  6 ++----
 lib/device/lock-one.js      |  6 ++----
 lib/device/outlet.js        |  6 ++----
 lib/device/rf-bridge.js     | 22 ++++++----------------
 lib/device/sensor.js        |  6 ++----
 lib/device/zb-dev.js        | 12 ++++--------
 9 files changed, 24 insertions(+), 52 deletions(-)

diff --git a/lib/device/garage-eachen.js b/lib/device/garage-eachen.js
index 4eab2a49..6833f8aa 100644
--- a/lib/device/garage-eachen.js
+++ b/lib/device/garage-eachen.js
@@ -13,11 +13,9 @@ module.exports = class deviceGarageEachen {
     this.accessory = accessory
 
     this.operationTime = parseInt(platform.cusG.get(this.accessory.context.eweDeviceId).operationTime)
-    this.operationTime = isNaN(this.operationTime)
+    this.operationTime = isNaN(this.operationTime) || this.operationTime < 20
       ? this.helpers.defaults.operationTime
-      : this.operationTime < 20
-        ? this.helpers.defaults.operationTime
-        : this.operationTime
+      : this.operationTime
 
     if (!(this.service = this.accessory.getService(this.S.GarageDoorOpener))) {
       this.service = this.accessory.addService(this.S.GarageDoorOpener)
diff --git a/lib/device/garage-four.js b/lib/device/garage-four.js
index 9b110aea..863b364c 100644
--- a/lib/device/garage-four.js
+++ b/lib/device/garage-four.js
@@ -14,11 +14,9 @@ module.exports = class deviceGarageFour {
     this.accessory = accessory
 
     this.operationTime = parseInt(platform.cusG.get(this.accessory.context.eweDeviceId).operationTime)
-    this.operationTime = isNaN(this.operationTime)
+    this.operationTime = isNaN(this.operationTime) || this.operationTime < 20
       ? this.helpers.defaults.operationTime
-      : this.operationTime < 20
-        ? this.helpers.defaults.operationTime
-        : this.operationTime
+      : this.operationTime
 
     ;['A', 'B', 'C', 'D'].forEach(v => {
       let gdService
diff --git a/lib/device/garage-one.js b/lib/device/garage-one.js
index fdd94a8e..ac6995af 100644
--- a/lib/device/garage-one.js
+++ b/lib/device/garage-one.js
@@ -18,11 +18,9 @@ module.exports = class deviceGarageOne {
     }
     this.setup = asConfig.setup
     this.operationTime = parseInt(asConfig.operationTime)
-    this.operationTime = isNaN(this.operationTime)
+    this.operationTime = isNaN(this.operationTime) || this.operationTime < 20
       ? this.helpers.defaults.operationTime
-      : this.operationTime < 20
-        ? this.helpers.defaults.operationTime
-        : this.operationTime
+      : this.operationTime
     if (asConfig.sensorId) {
       if (!this.platform.devicesInHB.has(asConfig.sensorId + 'SWX')) {
         this.error = 'defined sensor does not exist in Homebridge'
diff --git a/lib/device/garage-two.js b/lib/device/garage-two.js
index e0b87323..21ecde3e 100644
--- a/lib/device/garage-two.js
+++ b/lib/device/garage-two.js
@@ -13,11 +13,9 @@ module.exports = class deviceGarageTwo {
     this.accessory = accessory
 
     this.operationTime = parseInt(platform.cusG.get(this.accessory.context.eweDeviceId).operationTime)
-    this.operationTime = isNaN(this.operationTime)
+    this.operationTime = isNaN(this.operationTime) || this.operationTime < 20
       ? this.helpers.defaults.operationTime
-      : this.operationTime < 20
-        ? this.helpers.defaults.operationTime
-        : this.operationTime
+      : this.operationTime
 
     ;['1', '2'].forEach(v => {
       let gdService
diff --git a/lib/device/lock-one.js b/lib/device/lock-one.js
index c031913b..aede9673 100644
--- a/lib/device/lock-one.js
+++ b/lib/device/lock-one.js
@@ -18,11 +18,9 @@ module.exports = class deviceLockOne {
     }
     this.setup = asConfig.setup
     this.operationTime = parseInt(asConfig.operationTime)
-    this.operationTime = isNaN(this.operationTime)
+    this.operationTime = isNaN(this.operationTime) || this.operationTime < 20
       ? this.helpers.defaults.operationTime
-      : this.operationTime < 20
-        ? this.helpers.defaults.operationTime
-        : this.operationTime
+      : this.operationTime
 
     this.service = this.accessory.getService(this.S.LockMechanism) || this.accessory.addService(this.S.LockMechanism)
     this.service.getCharacteristic(this.C.LockTargetState)
diff --git a/lib/device/outlet.js b/lib/device/outlet.js
index 4b71252e..ead8ee1a 100644
--- a/lib/device/outlet.js
+++ b/lib/device/outlet.js
@@ -14,11 +14,9 @@ module.exports = class deviceOutlet {
     this.accessory = accessory
 
     this.inUsePowerThreshold = parseInt(this.platform.config.inUsePowerThreshold)
-    this.inUsePowerThreshold = isNaN(this.inUsePowerThreshold)
+    this.inUsePowerThreshold = isNaN(this.inUsePowerThreshold) || this.inUsePowerThreshold < 0
       ? this.helpers.defaults.inUsePowerThreshold
-      : this.inUsePowerThreshold < 0
-        ? this.helpers.defaults.inUsePowerThreshold
-        : this.inUsePowerThreshold
+      : this.inUsePowerThreshold
     const self = this
     this.eveCurrentConsumption = function () {
       self.C.call(this, 'Current Consumption', self.helpers.eveUUID.currentConsumption)
diff --git a/lib/device/rf-bridge.js b/lib/device/rf-bridge.js
index 5345d90f..8961c088 100644
--- a/lib/device/rf-bridge.js
+++ b/lib/device/rf-bridge.js
@@ -26,11 +26,9 @@ module.exports = class deviceRFBridge {
     util.inherits(this.eveLastActivation, this.C)
     this.eveLastActivation.UUID = this.helpers.eveUUID.lastActivation
     this.sensorTimeDifference = parseInt(this.platform.config.sensorTimeDifference)
-    this.sensorTimeDifference = isNaN(this.sensorTimeDifference)
+    this.sensorTimeDifference = isNaN(this.sensorTimeDifference) || this.sensorTimeDifference < 10
       ? this.helpers.defaults.sensorTimeDifference
-      : this.sensorTimeDifference < 10
-        ? this.helpers.defaults.sensorTimeDifference
-        : this.sensorTimeDifference
+      : this.sensorTimeDifference
     if (['curtain', 'button'].includes(this.accessory.context.subType)) {
       Object.entries(this.accessory.context.buttons).forEach(([chan, name]) => {
         if (!this.accessory.getService(name)) {
@@ -154,19 +152,11 @@ module.exports = class deviceRFBridge {
             if (oAccessory) {
               const sensorTimeLengthPri = parseInt(oAccessory.context.sensorTimeLength)
               const sensorTimeLengthSec = parseInt(this.platform.config.sensorTimeLength)
-              const sensorTimeLength = isNaN(sensorTimeLengthPri)
-                ? isNaN(sensorTimeLengthSec)
+              const sensorTimeLength = isNaN(sensorTimeLengthPri) || sensorTimeLengthPri < 0
+                ? isNaN(sensorTimeLengthSec) || sensorTimeLengthSec < 0
                   ? this.helpers.defaults.sensorTimeLength
-                  : sensorTimeLengthSec < 0
-                    ? this.helpers.defaults.sensorTimeLength
-                    : sensorTimeLengthSec
-                : sensorTimeLengthPri < 0
-                  ? isNaN(sensorTimeLengthSec)
-                    ? this.helpers.defaults.sensorTimeLength
-                    : sensorTimeLengthSec < 0
-                      ? this.helpers.defaults.sensorTimeLength
-                      : sensorTimeLengthSec
-                  : sensorTimeLengthPri
+                  : sensorTimeLengthSec
+                : sensorTimeLengthPri
               const timeOfMotion = new Date(params[chan])
               const diff = (timeNow.getTime() - timeOfMotion.getTime()) / 1000
               let serv
diff --git a/lib/device/sensor.js b/lib/device/sensor.js
index c4cbb7c0..b7401000 100644
--- a/lib/device/sensor.js
+++ b/lib/device/sensor.js
@@ -26,11 +26,9 @@ module.exports = class deviceSensor {
     util.inherits(this.eveLastActivation, this.C)
     this.eveLastActivation.UUID = this.helpers.eveUUID.lastActivation
     this.lowBattThreshold = parseInt(this.platform.config.lowBattThreshold)
-    this.lowBattThreshold = isNaN(this.lowBattThreshold)
+    this.lowBattThreshold = isNaN(this.lowBattThreshold) || this.lowBattThreshold < 5
       ? this.helpers.defaults.lowBattThreshold
-      : this.lowBattThreshold < 5
-        ? this.helpers.defaults.lowBattThreshold
-        : this.lowBattThreshold
+      : this.lowBattThreshold
     this.contactService = this.accessory.getService(this.S.ContactSensor) || this.accessory.addService(this.S.ContactSensor)
     this.batteryService = this.accessory.getService(this.S.BatteryService) || this.accessory.addService(this.S.BatteryService)
     this.accessory.log = platform.config.debugFakegato ? this.log : () => {}
diff --git a/lib/device/zb-dev.js b/lib/device/zb-dev.js
index fa2fc174..09a042fe 100644
--- a/lib/device/zb-dev.js
+++ b/lib/device/zb-dev.js
@@ -26,17 +26,13 @@ module.exports = class deviceZBDev {
     util.inherits(this.eveLastActivation, this.C)
     this.eveLastActivation.UUID = this.helpers.eveUUID.lastActivation
     this.lowBattThreshold = parseInt(this.platform.config.lowBattThreshold)
-    this.lowBattThreshold = isNaN(this.lowBattThreshold)
+    this.lowBattThreshold = isNaN(this.lowBattThreshold) || this.lowBattThreshold < 5
       ? this.helpers.defaults.lowBattThreshold
-      : this.lowBattThreshold < 5
-        ? this.helpers.defaults.lowBattThreshold
-        : this.lowBattThreshold
+      : this.lowBattThreshold
     this.sensorTimeDifference = parseInt(this.platform.config.sensorTimeDifference)
-    this.sensorTimeDifference = isNaN(this.sensorTimeDifference)
+    this.sensorTimeDifference = isNaN(this.sensorTimeDifference) || this.sensorTimeDifference < 10
       ? this.helpers.defaults.sensorTimeDifference
-      : this.sensorTimeDifference < 10
-        ? this.helpers.defaults.sensorTimeDifference
-        : this.sensorTimeDifference
+      : this.sensorTimeDifference
     switch (this.accessory.context.eweUIID) {
       case 1000: {
         if (!this.accessory.getService(this.S.BatteryService)) {

From b7729b44a9ff0b1205c39eb63437bb71145c253a Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 27 Jan 2021 11:09:10 +0000
Subject: [PATCH 1231/3183] error handling

---
 lib/connection/lan.js |  5 +++--
 lib/connection/ws.js  |  6 ++++--
 lib/index.js          | 47 ++++++++++++++++++++++++++-----------------
 3 files changed, 35 insertions(+), 23 deletions(-)

diff --git a/lib/connection/lan.js b/lib/connection/lan.js
index 6d5d0fda..60e60e65 100644
--- a/lib/connection/lan.js
+++ b/lib/connection/lan.js
@@ -88,7 +88,7 @@ module.exports = class connectionLAN {
             try {
               params = JSON.parse(pText)
             } catch (e) {
-              this.log.warn('[%s] LAN message received could not be read [%s]:\n%s', rdata.id, e, pText)
+              this.log.warn('[%s] LAN message received could not be read as %s:\n%s', rdata.id, e.message, pText)
               return
             }
 
@@ -113,7 +113,8 @@ module.exports = class connectionLAN {
             }
           })
       } catch (err) {
-        this.log.warn('Could not parse DNS packet as %s', this.debug ? err : err.message)
+        const errToShow = this.debug ? ':\n' + err : ' ' + err.message + '.'
+        this.log.warn('Could not parse DNS packet as%s', errToShow)
       }
     }
 
diff --git a/lib/connection/ws.js b/lib/connection/ws.js
index a92c0c44..046c37b8 100644
--- a/lib/connection/ws.js
+++ b/lib/connection/ws.js
@@ -96,7 +96,8 @@ module.exports = class connectionWS {
           throw new Error('Unknown parameters received\n' + JSON.stringify(res, null, 2))
         }
       } catch (err) {
-        this.log.warn('WS login failed as %s.', this.debug ? err : err.message)
+        const errToShow = this.debug ? ':\n' + err : ' ' + err.message + '.'
+        this.log.warn('WS login failed as%s', errToShow)
       }
     })
     this.wsp.onUnpackedMessage.addListener(device => {
@@ -205,7 +206,8 @@ module.exports = class connectionWS {
             throw new Error('Unknown response')
         }
       } catch (err) {
-        return new Error('device update failed as ' + this.debug ? err : err.message)
+        const errToShow = this.debug ? ':\n' + err : ' ' + err.message
+        return new Error('device update failed as' + errToShow)
       }
     } else {
       this.log.warn('Request will be sent when WS has reconnected.')
diff --git a/lib/index.js b/lib/index.js
index bcdc8f6a..84c32b7f 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -18,32 +18,32 @@ class eWeLinkPlatform {
       this.config = config
       this.api = api
       this.helpers = require('./utils/helpers')
-      this.debug = this.config.debug
+      this.debug = config.debug
       this.colourUtils = require('./utils/colour-utils')
       this.eveService = require('./fakegato/fakegato-history')(api)
       this.eveLogPath = api.user.storagePath() + '/persist/'
-      this.mode = ['auto', 'wan', 'lan'].includes(this.config.mode) ? this.config.mode : 'auto'
+      this.mode = ['auto', 'wan', 'lan'].includes(config.mode) ? config.mode : 'auto'
       this.devicesInHB = new Map()
       this.devicesInEW = new Map()
       this.cusG = new Map()
       this.cusS = new Map()
       this.hiddenMasters = []
       this.obstructSwitches = {}
-      if (Object.keys(this.config.groups || []).length > 0) {
-        this.config.groups
+      if (Object.keys(config.groups || []).length > 0) {
+        config.groups
           .filter(g => g.obstructId && g.deviceId && ['garage', 'garage_eachen'].includes(g.type))
           .forEach(g => (this.obstructSwitches[g.obstructId.toLowerCase()] = g.deviceId.toLowerCase()))
       }
-      this.ignoredDevices = (this.config.ignoredDevices || '').replace(/[\s'"]+/g, '').toLowerCase().split(',')
+      this.ignoredDevices = (config.ignoredDevices || '').replace(/[\s'"]+/g, '').toLowerCase().split(',')
       this.thTempOffset = {}
-      this.nameOverride = {}
-      this.ipOverride = {}
       if (Array.isArray(config.thTempOffset)) {
         config.thTempOffset.forEach(x => (this.thTempOffset[x.deviceId] = x.offset))
       }
+      this.nameOverride = {}
       if (Array.isArray(config.nameOverride)) {
         config.nameOverride.forEach(x => (this.nameOverride[x.fullDeviceId] = x.deviceName))
       }
+      this.ipOverride = {}
       if (Array.isArray(config.ipOverride)) {
         config.ipOverride.forEach(x => (this.ipOverride[x.deviceId] = x.deviceIP))
       }
@@ -93,8 +93,7 @@ class eWeLinkPlatform {
 
       // *** Check for valid Accessory Simulations and add to cusG for later use *** \\
       if (Object.keys(this.config.groups || []).length > 0) {
-        this.config.groups
-          .filter(g => g.type && this.helpers.allowedGroups.includes(g.type))
+        this.config.groups.filter(g => g.type && this.helpers.allowedGroups.includes(g.type))
           .filter(g => g.deviceId && this.devicesInEW.has(g.deviceId.toLowerCase()))
           .forEach(g => this.cusG.set(g.deviceId.toLowerCase(), g))
       }
@@ -591,7 +590,8 @@ class eWeLinkPlatform {
       this.log('[%s] initialised and %s.', device.name, str)
     } catch (err) {
       // *** Catch errors at any point during device initialisation *** \\
-      this.log.warn('[%s] could not be initialised as %s.', device.name, this.debug ? err : err.message)
+      const errToShow = this.debug ? ':\n' + err : ' ' + err.message + '.'
+      this.log.warn('[%s] could not be initialised as %s.', device.name, errToShow)
     }
   }
 
@@ -659,19 +659,25 @@ class eWeLinkPlatform {
       return accessory
     } catch (err) {
       // *** Catch any errors whilst trying to add the accessory *** \\
-      this.log.warn('[%s] could not be added to Homebridge as %s.', newDeviceName, err)
+      const errToShow = this.debug ? ':\n' + err : ' ' + err.message + '.'
+      this.log.warn('[%s] could not be added to Homebridge as%s', newDeviceName, errToShow)
       return false
     }
   }
 
   configureAccessory (accessory) {
     // *** Function is called for each device on HB start *** \\
-    if (!this.log) {
-      return
-    }
+    try {
+      if (!this.log) {
+        return
+      }
 
-    // *** Add each cached device to our devicesInHB map *** \\
-    this.devicesInHB.set(accessory.context.hbDeviceId, accessory)
+      // *** Add each cached device to our devicesInHB map *** \\
+      this.devicesInHB.set(accessory.context.hbDeviceId, accessory)
+    } catch (err) {
+      const errToShow = this.debug ? ':\n' + err : ' ' + err.message + '.'
+      this.log.warn('[%s] could not be configured as%s', accessory.displayName, errToShow)
+    }
   }
 
   removeAccessory (accessory) {
@@ -681,7 +687,8 @@ class eWeLinkPlatform {
       this.devicesInHB.delete(accessory.context.hbDeviceId)
       this.log('[%s] has been removed from Homebridge.', accessory.displayName)
     } catch (err) {
-      this.log.warn('[%s] could not removed from Homebridge as %s.', accessory.displayName, err)
+      const errToShow = this.debug ? ':\n' + err : ' ' + err.message + '.'
+      this.log.warn('[%s] could not removed from Homebridge as%s', accessory.displayName, errToShow)
     }
   }
 
@@ -777,7 +784,8 @@ class eWeLinkPlatform {
         // *** Update the accessory with the new data *** \\
         accessory.control.externalUpdate(device.params)
       } catch (err) {
-        this.log.warn('[%s] could not be refreshed as %s.', accessory.displayName, this.debug ? err : err.message)
+        const errToShow = this.debug ? ':\n' + err : ' ' + err.message + '.'
+        this.log.warn('[%s] could not be refreshed as%s', accessory.displayName, errToShow)
       }
     } else {
       // *** The device does not existing in HB so let's try to add it *** \\
@@ -804,7 +812,8 @@ class eWeLinkPlatform {
         }
       } catch (err) {
         // *** Automatically adding the new device failed for some reason *** \\
-        this.log.warn('[%s] restart Homebridge to add new device, failed to add automatically as %s.', deviceId, err.message)
+        const errToShow = this.debug ? ':\n' + err : ' ' + err.message + '.'
+        this.log.warn('[%s] restart Homebridge to add new device, failed to add automatically as%s', deviceId, errToShow)
       }
     }
   }

From 637bcbeecbefa8efd50b15b87adafc201e2442c0 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 27 Jan 2021 11:09:45 +0000
Subject: [PATCH 1232/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3d938376..861f63df 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 * Fix for TH10/16 devices when the HomeKit switch would show the state of 'auto' mode
 * Fix for the display of watts/amps/volts for outlets that support this
+* More consistent and clearer error logging
 
 ## 4.4.5 (2021-01-24)
 

From cc6068791cef11c94b6f2ac70cbe905a87fae6af Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 27 Jan 2021 11:10:16 +0000
Subject: [PATCH 1233/3183] 4.4.6-6

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 3b572064..7c04f28f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.4.6-5",
+  "version": "4.4.6-6",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 802618c5..afe62a50 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "4.4.6-5",
+  "version": "4.4.6-6",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 6fd5b669545e5cf7d24208a1004e90c6b66f97a0 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 27 Jan 2021 12:00:35 +0000
Subject: [PATCH 1234/3183] error line numbers

---
 lib/connection/lan.js |  4 ++--
 lib/connection/ws.js  |  4 ++--
 lib/index.js          | 18 ++++++++++--------
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/lib/connection/lan.js b/lib/connection/lan.js
index 60e60e65..d2b05e50 100644
--- a/lib/connection/lan.js
+++ b/lib/connection/lan.js
@@ -113,7 +113,7 @@ module.exports = class connectionLAN {
             }
           })
       } catch (err) {
-        const errToShow = this.debug ? ':\n' + err : ' ' + err.message + '.'
+        const errToShow = this.debug ? ':\n' + err : ' ' + err.message + ' [line ' + err.lineNumber + '].'
         this.log.warn('Could not parse DNS packet as%s', errToShow)
       }
     }
@@ -181,7 +181,7 @@ module.exports = class connectionLAN {
       // *** This ok is needed by the plugin *** \\
       return 'ok'
     } catch (err) {
-      return err.message
+      return err.message + ' [line ' + err.lineNumber + ']'
     }
   }
 
diff --git a/lib/connection/ws.js b/lib/connection/ws.js
index 046c37b8..4ecc395e 100644
--- a/lib/connection/ws.js
+++ b/lib/connection/ws.js
@@ -96,7 +96,7 @@ module.exports = class connectionWS {
           throw new Error('Unknown parameters received\n' + JSON.stringify(res, null, 2))
         }
       } catch (err) {
-        const errToShow = this.debug ? ':\n' + err : ' ' + err.message + '.'
+        const errToShow = this.debug ? ':\n' + err : ' ' + err.message + ' [line ' + err.lineNumber + '].'
         this.log.warn('WS login failed as%s', errToShow)
       }
     })
@@ -206,7 +206,7 @@ module.exports = class connectionWS {
             throw new Error('Unknown response')
         }
       } catch (err) {
-        const errToShow = this.debug ? ':\n' + err : ' ' + err.message
+        const errToShow = this.debug ? ':\n' + err : ' ' + err.message + ' [line ' + err.lineNumber + '].'
         return new Error('device update failed as' + errToShow)
       }
     } else {
diff --git a/lib/index.js b/lib/index.js
index 84c32b7f..bd135994 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -52,8 +52,9 @@ class eWeLinkPlatform {
       this.api.on('didFinishLaunching', this.eWeLinkSetup.bind(this))
       this.api.on('shutdown', this.eWeLinkShutdown.bind(this))
     } catch (err) {
+      const errToShow = err.message + ' [line ' + err.lineNumber + ']'
       log.warn('*** Disabling plugin [v%s] ***', PLUGIN.version)
-      log.warn('*** %s. ***', err.message)
+      log.warn('*** %s. ***', errToShow)
     }
   }
 
@@ -141,8 +142,9 @@ class eWeLinkPlatform {
       this.log('✓ Setup complete. %s', this.helpers.logMessages[Math.floor(Math.random() * this.helpers.logMessages.length)])
     } catch (err) {
       // *** Catch errors at any point during setup *** \\
+      const errToShow = err.message + ' [line ' + err.lineNumber + ']'
       this.log.warn('*** Disabling plugin [v%s] ***', PLUGIN.version)
-      this.log.warn('*** %s ***', err.message)
+      this.log.warn('*** %s ***', errToShow)
 
       // *** Call the shutdown function as plugin is disabled *** \\
       this.eWeLinkShutdown()
@@ -590,7 +592,7 @@ class eWeLinkPlatform {
       this.log('[%s] initialised and %s.', device.name, str)
     } catch (err) {
       // *** Catch errors at any point during device initialisation *** \\
-      const errToShow = this.debug ? ':\n' + err : ' ' + err.message + '.'
+      const errToShow = this.debug ? ':\n' + err : ' ' + err.message + ' [line ' + err.lineNumber + '].'
       this.log.warn('[%s] could not be initialised as %s.', device.name, errToShow)
     }
   }
@@ -659,7 +661,7 @@ class eWeLinkPlatform {
       return accessory
     } catch (err) {
       // *** Catch any errors whilst trying to add the accessory *** \\
-      const errToShow = this.debug ? ':\n' + err : ' ' + err.message + '.'
+      const errToShow = this.debug ? ':\n' + err : ' ' + err.message + ' [line ' + err.lineNumber + '].'
       this.log.warn('[%s] could not be added to Homebridge as%s', newDeviceName, errToShow)
       return false
     }
@@ -675,7 +677,7 @@ class eWeLinkPlatform {
       // *** Add each cached device to our devicesInHB map *** \\
       this.devicesInHB.set(accessory.context.hbDeviceId, accessory)
     } catch (err) {
-      const errToShow = this.debug ? ':\n' + err : ' ' + err.message + '.'
+      const errToShow = this.debug ? ':\n' + err : ' ' + err.message + ' [line ' + err.lineNumber + '].'
       this.log.warn('[%s] could not be configured as%s', accessory.displayName, errToShow)
     }
   }
@@ -687,7 +689,7 @@ class eWeLinkPlatform {
       this.devicesInHB.delete(accessory.context.hbDeviceId)
       this.log('[%s] has been removed from Homebridge.', accessory.displayName)
     } catch (err) {
-      const errToShow = this.debug ? ':\n' + err : ' ' + err.message + '.'
+      const errToShow = this.debug ? ':\n' + err : ' ' + err.message + ' [line ' + err.lineNumber + '].'
       this.log.warn('[%s] could not removed from Homebridge as%s', accessory.displayName, errToShow)
     }
   }
@@ -784,7 +786,7 @@ class eWeLinkPlatform {
         // *** Update the accessory with the new data *** \\
         accessory.control.externalUpdate(device.params)
       } catch (err) {
-        const errToShow = this.debug ? ':\n' + err : ' ' + err.message + '.'
+        const errToShow = this.debug ? ':\n' + err : ' ' + err.message + ' [line ' + err.lineNumber + '].'
         this.log.warn('[%s] could not be refreshed as%s', accessory.displayName, errToShow)
       }
     } else {
@@ -812,7 +814,7 @@ class eWeLinkPlatform {
         }
       } catch (err) {
         // *** Automatically adding the new device failed for some reason *** \\
-        const errToShow = this.debug ? ':\n' + err : ' ' + err.message + '.'
+        const errToShow = this.debug ? ':\n' + err : ' ' + err.message + ' [line ' + err.lineNumber + '].'
         this.log.warn('[%s] restart Homebridge to add new device, failed to add automatically as%s', deviceId, errToShow)
       }
     }

From 82c7b0bcebb13878c3e56127d506fc9b449d29ac Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 27 Jan 2021 12:02:16 +0000
Subject: [PATCH 1235/3183] 4.4.6-7

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 7c04f28f..ff0b88e6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.4.6-6",
+  "version": "4.4.6-7",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index afe62a50..c404d75b 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "4.4.6-6",
+  "version": "4.4.6-7",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 53068b27911208769c264ba8342a059185e207b3 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 28 Jan 2021 07:32:01 +0000
Subject: [PATCH 1236/3183] revert for patch

---
 lib/device/th-thermo.js | 117 +++++++---------------------------------
 1 file changed, 20 insertions(+), 97 deletions(-)

diff --git a/lib/device/th-thermo.js b/lib/device/th-thermo.js
index 9fec5ad6..8d0c732a 100644
--- a/lib/device/th-thermo.js
+++ b/lib/device/th-thermo.js
@@ -22,34 +22,17 @@ module.exports = class deviceTHThermo {
     if (this.accessory.getService(this.S.HumiditySensor)) {
       this.accessory.removeService(this.accessory.getService(this.S.HumiditySensor))
     }
-    if (!this.helpers.hasProperty(this.accessory.context, 'cacheHeatingTarget')) {
-      this.accessory.context.cacheHeatingTarget = 16
-    }
     this.service = this.accessory.getService(this.S.Thermostat) || this.accessory.addService(this.S.Thermostat)
     this.service.getCharacteristic(this.C.CurrentTemperature)
-      .setProps({
-        minValue: -100,
-        minStep: 0.1
-      })
+      .setProps({ minValue: -100 })
     this.service.getCharacteristic(this.C.TargetHeatingCoolingState)
       .on('set', this.internalOnOffUpdate.bind(this))
       .setProps({ validValues: [0, 1] })
     this.service.getCharacteristic(this.C.TargetTemperature)
-      .on('set', this.internalTargetTempUpdate.bind(this))
-      .setProps({
-        minValue: 0,
-        maxValue: 30,
-        minStep: 0.5
-      })
+      .on('set', this.internalTempUpdate.bind(this))
     if (this.accessory.context.sensorType !== 'DS18B20' && !this.service.testCharacteristic(this.C.CurrentRelativeHumidity)) {
       this.service.addCharacteristic(this.C.CurrentRelativeHumidity)
     }
-
-    // *** BETA *** \\
-    this.service.updateCharacteristic(this.C.CurrentTemperature, 16)
-    this.service.updateCharacteristic(this.C.TargetTemperature, 20)
-    // *** END BETA *** \\
-
     this.accessory.log = platform.config.debugFakegato ? this.log : () => {}
     this.accessory.historyService = new this.platform.eveService('custom', this.accessory, {
       storage: 'fs',
@@ -60,75 +43,28 @@ module.exports = class deviceTHThermo {
   async internalOnOffUpdate (value, callback) {
     try {
       callback()
-      this.log('[%s] setting TargetHeatingCoolingState to %s.', this.dName, value)
-      const params = {}
-      if (value === 0) {
-        // *** Has been turned off *** \\
-        params.mainswitch = 'off'
-        params.switch = 'off'
-      } else {
-        params.mainswitch = 'on'
-        params.switch = this.service.getCharacteristic(this.C.CurrentTemperature).value < this.accessory.context.cacheHeatingTarget
-          ? 'on'
-          : 'off'
-      }
-      this.cacheOnOff = value !== 0 ? 'on' : 'off'
-      this.cacheIsHeating = params.switch
-      this.service.updateCharacteristic(this.C.CurrentHeatingCoolingState, this.cacheIsHeating === 'on' ? 1 : 0)
-      await this.platform.sendDeviceUpdate(this.accessory, params)
-      if (!this.disableDeviceLogging) {
-        this.log('[%s] current state [%s] heating [%s].', this.dName, this.cacheOnOff, this.cacheIsHeating)
-      }
-    } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
-    }
-  }
-
-  async internalTargetTempUpdate (value, callback) {
-    try {
-      this.log('[%s] setting TargetTemperature to %s.', this.dName, value)
-      callback()
-      this.accessory.context.cacheHeatingTarget = value
-      this.cacheOnOff = 'on'
-      this.cacheIsHeating = this.service.getCharacteristic(this.C.CurrentTemperature).value < value
-        ? 'on'
-        : 'off'
       const params = {
-        mainswitch: this.cacheOnOff,
-        switch: this.cacheIsHeating
+        switch: value !== 0 ? 'on' : 'off',
+        mainSwitch: value !== 0 ? 'on' : 'off'
       }
-      this.service.updateCharacteristic(this.C.CurrentHeatingCoolingState, this.cacheIsHeating === 'on' ? 1 : 0)
       await this.platform.sendDeviceUpdate(this.accessory, params)
+      this.cacheOnOff = value !== 0 ? 'on' : 'off'
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current state [%s] heating [%s].', this.dName, this.cacheOnOff, this.cacheIsHeating)
+        this.log('[%s] current state [%s].', this.dName, this.cacheOnOff)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
     }
   }
 
-  async internalCurrentTempUpdate (value) {
+  async internalTempUpdate (value, callback) {
     try {
-      const params = {}
-      this.log('[%s] internalCurrentTempUpdate() %s.', this.dName, value)
-      // *** Logic for checking the new current temperature against the target temperature *** \\
-      if (this.service.getCharacteristic(this.C.TargetHeatingCoolingState).value !== 0) {
-        // *** Thermostat is on so compare temperatures *** \\
-        if (this.cacheTemp < this.accessory.context.cacheHeatingTarget && this.cacheIsHeating !== 'on') {
-          this.cacheIsHeating = 'on'
-          params.switch = this.cacheIsHeating
-          this.service.updateCharacteristic(this.C.CurrentHeatingCoolingState, this.cacheIsHeating === 'on' ? 1 : 0)
-          await this.platform.sendDeviceUpdate(this.accessory, params)
-        } else if (this.cacheTemp < this.accessory.context.cacheHeatingTarget && this.cacheIsHeating !== 'off') {
-          this.cacheIsHeating = 'off'
-          params.switch = this.cacheIsHeating
-          this.service.updateCharacteristic(this.C.CurrentHeatingCoolingState, this.cacheIsHeating === 'on' ? 1 : 0)
-          await this.platform.sendDeviceUpdate(this.accessory, params)
-        }
-        if (!this.disableDeviceLogging) {
-          this.log('[%s] current state [%s] heating [%s].', this.dName, this.cacheOnOff, this.cacheIsHeating)
-        }
-      }
+      callback()
+      await this.helpers.sleep(500)
+      this.service.updateCharacteristic(
+        this.C.TargetTemperature,
+        this.service.getCharacteristic(this.C.CurrentTemperature).value
+      )
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
     }
@@ -136,8 +72,8 @@ module.exports = class deviceTHThermo {
 
   async externalUpdate (params) {
     try {
-      if (params.mainswitch) {
-        const newState = params.mainswitch
+      if (params.switch || params.mainSwitch) {
+        const newState = params.switch || params.mainSwitch
         if (this.cacheOnOff !== newState) {
           this.cacheOnOff = newState
           this.service.updateCharacteristic(this.C.TargetHeatingCoolingState, this.cacheOnOff === 'on' ? 0 : 1)
@@ -145,34 +81,22 @@ module.exports = class deviceTHThermo {
             time: Math.round(new Date().valueOf() / 1000),
             status: this.cacheOnOff === 'on' ? 1 : 0
           })
-          if (this.cacheOnOff === 'off') {
-            this.cacheIsHeating = 'off'
-          }
-          // if (params.updateSource && !this.disableDeviceLogging && !params.switch) {
-          if (!this.disableDeviceLogging && !params.switch) {
+          if (params.updateSource && !this.disableDeviceLogging) {
             this.log('[%s] current state [%s].', this.dName, this.cacheOnOff)
           }
         }
       }
-      if (params.switch) {
-        // if (params.updateSource && !this.disableDeviceLogging) {
-        if (!this.disableDeviceLogging) {
-          this.log('[%s] current state [%s] heating [%s].', this.dName, this.cacheOnOff, params.switch)
-        }
-        this.cacheIsHeating = params.switch
-      }
       const eveLog = {}
       if (this.helpers.hasProperty(params, 'currentTemperature') && params.currentTemperature !== 'unavailable') {
-        const currentTemp = (parseFloat(params.currentTemperature) + this.tempOffset).toFixed(1)
+        const currentTemp = parseFloat(params.currentTemperature) + this.tempOffset
         eveLog.temp = currentTemp
         if (this.cacheTemp !== currentTemp) {
           this.cacheTemp = currentTemp
           this.service.updateCharacteristic(this.C.CurrentTemperature, this.cacheTemp)
-          // if (params.updateSource && !this.disableDeviceLogging) {
+          this.service.updateCharacteristic(this.C.TargetTemperature, this.cacheTemp)
           if (params.updateSource && !this.disableDeviceLogging) {
             this.log('[%s] current temperature [%s].', this.dName, this.cacheTemp)
           }
-          this.internalCurrentTempUpdate(this.cacheTemp)
         }
       }
       if (
@@ -180,13 +104,12 @@ module.exports = class deviceTHThermo {
         params.currentHumidity !== 'unavailable' &&
         this.service.testCharacteristic(this.C.CurrentRelativeHumidity)
       ) {
-        const currentHumi = parseInt(params.currentHumidity)
+        const currentHumi = parseFloat(params.currentHumidity)
         eveLog.humidity = currentHumi
         if (this.cacheHumi !== currentHumi) {
           this.cacheHumi = currentHumi
           this.service.updateCharacteristic(this.C.CurrentRelativeHumidity, this.cacheHumi)
-          // if (params.updateSource && !this.disableDeviceLogging) {
-          if (!this.disableDeviceLogging) {
+          if (params.updateSource && !this.disableDeviceLogging) {
             this.log('[%s] current humidity [%s%].', this.dName, this.cacheHumi)
           }
         }

From d1823d6d45f9984876ac1e4373d5860752e0b352 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 28 Jan 2021 07:33:02 +0000
Subject: [PATCH 1237/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 861f63df..ae643c27 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,16 +2,21 @@
 
 All notable changes to this homebridge-ewelink will be documented in this file.
 
-## BETA
+### BETA
 
 ## New
 
 * **[Experimental]** Expose a TH10/16 device as a fully working thermostat accessory
+
+## 4.5.0 (2021-01-28)
+
+## New
 * **[Experimental]** Use a switch to control the `Obstruction Detected` feature of a garage door
 
 ### Changes
 
 * Fix for TH10/16 devices when the HomeKit switch would show the state of 'auto' mode
+* Fix for TH10/16 devices (shown as thermostat) where the plugin would not show the current state of the device
 * Fix for the display of watts/amps/volts for outlets that support this
 * More consistent and clearer error logging
 

From 3aab5ab163e8c2c968608242dab5b89d5fa5b5f2 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 28 Jan 2021 07:34:51 +0000
Subject: [PATCH 1238/3183] Update th-thermo.js

---
 lib/device/th-thermo.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/lib/device/th-thermo.js b/lib/device/th-thermo.js
index 8d0c732a..ea90ca29 100644
--- a/lib/device/th-thermo.js
+++ b/lib/device/th-thermo.js
@@ -44,8 +44,7 @@ module.exports = class deviceTHThermo {
     try {
       callback()
       const params = {
-        switch: value !== 0 ? 'on' : 'off',
-        mainSwitch: value !== 0 ? 'on' : 'off'
+        switch: value !== 0 ? 'on' : 'off'
       }
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.cacheOnOff = value !== 0 ? 'on' : 'off'
@@ -72,8 +71,8 @@ module.exports = class deviceTHThermo {
 
   async externalUpdate (params) {
     try {
-      if (params.switch || params.mainSwitch) {
-        const newState = params.switch || params.mainSwitch
+      if (params.switch) {
+        const newState = params.switch
         if (this.cacheOnOff !== newState) {
           this.cacheOnOff = newState
           this.service.updateCharacteristic(this.C.TargetHeatingCoolingState, this.cacheOnOff === 'on' ? 0 : 1)

From 9cdc1b34d9f1b28167c5baab6bdc172dd63feedd Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 28 Jan 2021 07:35:59 +0000
Subject: [PATCH 1239/3183] 4.5.0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ff0b88e6..80d67209 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.4.6-7",
+  "version": "4.5.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index c404d75b..142e779b 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "4.4.6-7",
+  "version": "4.5.0",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From dc23c3f82fa69219ad6968e8a74d9112589a33e0 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 28 Jan 2021 07:38:17 +0000
Subject: [PATCH 1240/3183] full thermostat beta

---
 lib/device/th-thermo.js | 116 +++++++++++++++++++++++++++++++++-------
 1 file changed, 97 insertions(+), 19 deletions(-)

diff --git a/lib/device/th-thermo.js b/lib/device/th-thermo.js
index ea90ca29..9fec5ad6 100644
--- a/lib/device/th-thermo.js
+++ b/lib/device/th-thermo.js
@@ -22,17 +22,34 @@ module.exports = class deviceTHThermo {
     if (this.accessory.getService(this.S.HumiditySensor)) {
       this.accessory.removeService(this.accessory.getService(this.S.HumiditySensor))
     }
+    if (!this.helpers.hasProperty(this.accessory.context, 'cacheHeatingTarget')) {
+      this.accessory.context.cacheHeatingTarget = 16
+    }
     this.service = this.accessory.getService(this.S.Thermostat) || this.accessory.addService(this.S.Thermostat)
     this.service.getCharacteristic(this.C.CurrentTemperature)
-      .setProps({ minValue: -100 })
+      .setProps({
+        minValue: -100,
+        minStep: 0.1
+      })
     this.service.getCharacteristic(this.C.TargetHeatingCoolingState)
       .on('set', this.internalOnOffUpdate.bind(this))
       .setProps({ validValues: [0, 1] })
     this.service.getCharacteristic(this.C.TargetTemperature)
-      .on('set', this.internalTempUpdate.bind(this))
+      .on('set', this.internalTargetTempUpdate.bind(this))
+      .setProps({
+        minValue: 0,
+        maxValue: 30,
+        minStep: 0.5
+      })
     if (this.accessory.context.sensorType !== 'DS18B20' && !this.service.testCharacteristic(this.C.CurrentRelativeHumidity)) {
       this.service.addCharacteristic(this.C.CurrentRelativeHumidity)
     }
+
+    // *** BETA *** \\
+    this.service.updateCharacteristic(this.C.CurrentTemperature, 16)
+    this.service.updateCharacteristic(this.C.TargetTemperature, 20)
+    // *** END BETA *** \\
+
     this.accessory.log = platform.config.debugFakegato ? this.log : () => {}
     this.accessory.historyService = new this.platform.eveService('custom', this.accessory, {
       storage: 'fs',
@@ -43,27 +60,75 @@ module.exports = class deviceTHThermo {
   async internalOnOffUpdate (value, callback) {
     try {
       callback()
-      const params = {
-        switch: value !== 0 ? 'on' : 'off'
+      this.log('[%s] setting TargetHeatingCoolingState to %s.', this.dName, value)
+      const params = {}
+      if (value === 0) {
+        // *** Has been turned off *** \\
+        params.mainswitch = 'off'
+        params.switch = 'off'
+      } else {
+        params.mainswitch = 'on'
+        params.switch = this.service.getCharacteristic(this.C.CurrentTemperature).value < this.accessory.context.cacheHeatingTarget
+          ? 'on'
+          : 'off'
       }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
       this.cacheOnOff = value !== 0 ? 'on' : 'off'
+      this.cacheIsHeating = params.switch
+      this.service.updateCharacteristic(this.C.CurrentHeatingCoolingState, this.cacheIsHeating === 'on' ? 1 : 0)
+      await this.platform.sendDeviceUpdate(this.accessory, params)
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current state [%s].', this.dName, this.cacheOnOff)
+        this.log('[%s] current state [%s] heating [%s].', this.dName, this.cacheOnOff, this.cacheIsHeating)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
     }
   }
 
-  async internalTempUpdate (value, callback) {
+  async internalTargetTempUpdate (value, callback) {
     try {
+      this.log('[%s] setting TargetTemperature to %s.', this.dName, value)
       callback()
-      await this.helpers.sleep(500)
-      this.service.updateCharacteristic(
-        this.C.TargetTemperature,
-        this.service.getCharacteristic(this.C.CurrentTemperature).value
-      )
+      this.accessory.context.cacheHeatingTarget = value
+      this.cacheOnOff = 'on'
+      this.cacheIsHeating = this.service.getCharacteristic(this.C.CurrentTemperature).value < value
+        ? 'on'
+        : 'off'
+      const params = {
+        mainswitch: this.cacheOnOff,
+        switch: this.cacheIsHeating
+      }
+      this.service.updateCharacteristic(this.C.CurrentHeatingCoolingState, this.cacheIsHeating === 'on' ? 1 : 0)
+      await this.platform.sendDeviceUpdate(this.accessory, params)
+      if (!this.disableDeviceLogging) {
+        this.log('[%s] current state [%s] heating [%s].', this.dName, this.cacheOnOff, this.cacheIsHeating)
+      }
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, true)
+    }
+  }
+
+  async internalCurrentTempUpdate (value) {
+    try {
+      const params = {}
+      this.log('[%s] internalCurrentTempUpdate() %s.', this.dName, value)
+      // *** Logic for checking the new current temperature against the target temperature *** \\
+      if (this.service.getCharacteristic(this.C.TargetHeatingCoolingState).value !== 0) {
+        // *** Thermostat is on so compare temperatures *** \\
+        if (this.cacheTemp < this.accessory.context.cacheHeatingTarget && this.cacheIsHeating !== 'on') {
+          this.cacheIsHeating = 'on'
+          params.switch = this.cacheIsHeating
+          this.service.updateCharacteristic(this.C.CurrentHeatingCoolingState, this.cacheIsHeating === 'on' ? 1 : 0)
+          await this.platform.sendDeviceUpdate(this.accessory, params)
+        } else if (this.cacheTemp < this.accessory.context.cacheHeatingTarget && this.cacheIsHeating !== 'off') {
+          this.cacheIsHeating = 'off'
+          params.switch = this.cacheIsHeating
+          this.service.updateCharacteristic(this.C.CurrentHeatingCoolingState, this.cacheIsHeating === 'on' ? 1 : 0)
+          await this.platform.sendDeviceUpdate(this.accessory, params)
+        }
+        if (!this.disableDeviceLogging) {
+          this.log('[%s] current state [%s] heating [%s].', this.dName, this.cacheOnOff, this.cacheIsHeating)
+        }
+      }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
     }
@@ -71,8 +136,8 @@ module.exports = class deviceTHThermo {
 
   async externalUpdate (params) {
     try {
-      if (params.switch) {
-        const newState = params.switch
+      if (params.mainswitch) {
+        const newState = params.mainswitch
         if (this.cacheOnOff !== newState) {
           this.cacheOnOff = newState
           this.service.updateCharacteristic(this.C.TargetHeatingCoolingState, this.cacheOnOff === 'on' ? 0 : 1)
@@ -80,22 +145,34 @@ module.exports = class deviceTHThermo {
             time: Math.round(new Date().valueOf() / 1000),
             status: this.cacheOnOff === 'on' ? 1 : 0
           })
-          if (params.updateSource && !this.disableDeviceLogging) {
+          if (this.cacheOnOff === 'off') {
+            this.cacheIsHeating = 'off'
+          }
+          // if (params.updateSource && !this.disableDeviceLogging && !params.switch) {
+          if (!this.disableDeviceLogging && !params.switch) {
             this.log('[%s] current state [%s].', this.dName, this.cacheOnOff)
           }
         }
       }
+      if (params.switch) {
+        // if (params.updateSource && !this.disableDeviceLogging) {
+        if (!this.disableDeviceLogging) {
+          this.log('[%s] current state [%s] heating [%s].', this.dName, this.cacheOnOff, params.switch)
+        }
+        this.cacheIsHeating = params.switch
+      }
       const eveLog = {}
       if (this.helpers.hasProperty(params, 'currentTemperature') && params.currentTemperature !== 'unavailable') {
-        const currentTemp = parseFloat(params.currentTemperature) + this.tempOffset
+        const currentTemp = (parseFloat(params.currentTemperature) + this.tempOffset).toFixed(1)
         eveLog.temp = currentTemp
         if (this.cacheTemp !== currentTemp) {
           this.cacheTemp = currentTemp
           this.service.updateCharacteristic(this.C.CurrentTemperature, this.cacheTemp)
-          this.service.updateCharacteristic(this.C.TargetTemperature, this.cacheTemp)
+          // if (params.updateSource && !this.disableDeviceLogging) {
           if (params.updateSource && !this.disableDeviceLogging) {
             this.log('[%s] current temperature [%s].', this.dName, this.cacheTemp)
           }
+          this.internalCurrentTempUpdate(this.cacheTemp)
         }
       }
       if (
@@ -103,12 +180,13 @@ module.exports = class deviceTHThermo {
         params.currentHumidity !== 'unavailable' &&
         this.service.testCharacteristic(this.C.CurrentRelativeHumidity)
       ) {
-        const currentHumi = parseFloat(params.currentHumidity)
+        const currentHumi = parseInt(params.currentHumidity)
         eveLog.humidity = currentHumi
         if (this.cacheHumi !== currentHumi) {
           this.cacheHumi = currentHumi
           this.service.updateCharacteristic(this.C.CurrentRelativeHumidity, this.cacheHumi)
-          if (params.updateSource && !this.disableDeviceLogging) {
+          // if (params.updateSource && !this.disableDeviceLogging) {
+          if (!this.disableDeviceLogging) {
             this.log('[%s] current humidity [%s%].', this.dName, this.cacheHumi)
           }
         }

From 2afc2bc9a292e0770a078c4bf77337d10ebd9757 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 28 Jan 2021 07:38:44 +0000
Subject: [PATCH 1241/3183] 4.5.1-0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 80d67209..6fef0103 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.5.0",
+  "version": "4.5.1-0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 142e779b..4ae5828c 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "4.5.0",
+  "version": "4.5.1-0",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From e0c5ef834a0a73f4bd3d96478b8b053deda27599 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 28 Jan 2021 07:39:46 +0000
Subject: [PATCH 1242/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ae643c27..b13153e6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,15 +2,15 @@
 
 All notable changes to this homebridge-ewelink will be documented in this file.
 
-### BETA
+## BETA
 
-## New
+### New
 
 * **[Experimental]** Expose a TH10/16 device as a fully working thermostat accessory
 
 ## 4.5.0 (2021-01-28)
 
-## New
+### New
 * **[Experimental]** Use a switch to control the `Obstruction Detected` feature of a garage door
 
 ### Changes

From 080cf431a73757168f3281b49151a45f0ace0acb Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 28 Jan 2021 08:08:57 +0000
Subject: [PATCH 1243/3183] only show line if exists

---
 lib/connection/lan.js |  6 ++++--
 lib/connection/ws.js  |  8 ++++++--
 lib/index.js          | 38 +++++++++++++++++++++++++-------------
 3 files changed, 35 insertions(+), 17 deletions(-)

diff --git a/lib/connection/lan.js b/lib/connection/lan.js
index d2b05e50..2fc07457 100644
--- a/lib/connection/lan.js
+++ b/lib/connection/lan.js
@@ -113,7 +113,9 @@ module.exports = class connectionLAN {
             }
           })
       } catch (err) {
-        const errToShow = this.debug ? ':\n' + err : ' ' + err.message + ' [line ' + err.lineNumber + '].'
+        const errToShow = this.debug
+          ? ':\n' + err
+          : ' ' + err.message + (err.lineNumber ? ' [line ' + err.lineNumber + '].' : '')
         this.log.warn('Could not parse DNS packet as%s', errToShow)
       }
     }
@@ -181,7 +183,7 @@ module.exports = class connectionLAN {
       // *** This ok is needed by the plugin *** \\
       return 'ok'
     } catch (err) {
-      return err.message + ' [line ' + err.lineNumber + ']'
+      return err.message + (err.lineNumber ? ' [line ' + err.lineNumber + ']' : '')
     }
   }
 
diff --git a/lib/connection/ws.js b/lib/connection/ws.js
index 4ecc395e..4c45b29f 100644
--- a/lib/connection/ws.js
+++ b/lib/connection/ws.js
@@ -96,7 +96,9 @@ module.exports = class connectionWS {
           throw new Error('Unknown parameters received\n' + JSON.stringify(res, null, 2))
         }
       } catch (err) {
-        const errToShow = this.debug ? ':\n' + err : ' ' + err.message + ' [line ' + err.lineNumber + '].'
+        const errToShow = this.debug
+          ? ':\n' + err
+          : ' ' + err.message + (err.lineNumber ? ' [line ' + err.lineNumber + '].' : '')
         this.log.warn('WS login failed as%s', errToShow)
       }
     })
@@ -206,7 +208,9 @@ module.exports = class connectionWS {
             throw new Error('Unknown response')
         }
       } catch (err) {
-        const errToShow = this.debug ? ':\n' + err : ' ' + err.message + ' [line ' + err.lineNumber + '].'
+        const errToShow = this.debug
+          ? ':\n' + err
+          : ' ' + err.message + (err.lineNumber ? ' [line ' + err.lineNumber + '].' : '')
         return new Error('device update failed as' + errToShow)
       }
     } else {
diff --git a/lib/index.js b/lib/index.js
index bd135994..2cbe8f32 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -52,7 +52,7 @@ class eWeLinkPlatform {
       this.api.on('didFinishLaunching', this.eWeLinkSetup.bind(this))
       this.api.on('shutdown', this.eWeLinkShutdown.bind(this))
     } catch (err) {
-      const errToShow = err.message + ' [line ' + err.lineNumber + ']'
+      const errToShow = err.message + (err.lineNumber ? ' [line ' + err.lineNumber + ']' : '')
       log.warn('*** Disabling plugin [v%s] ***', PLUGIN.version)
       log.warn('*** %s. ***', errToShow)
     }
@@ -142,7 +142,7 @@ class eWeLinkPlatform {
       this.log('✓ Setup complete. %s', this.helpers.logMessages[Math.floor(Math.random() * this.helpers.logMessages.length)])
     } catch (err) {
       // *** Catch errors at any point during setup *** \\
-      const errToShow = err.message + ' [line ' + err.lineNumber + ']'
+      const errToShow = err.message + (err.lineNumber ? ' [line ' + err.lineNumber + ']' : '')
       this.log.warn('*** Disabling plugin [v%s] ***', PLUGIN.version)
       this.log.warn('*** %s ***', errToShow)
 
@@ -592,7 +592,9 @@ class eWeLinkPlatform {
       this.log('[%s] initialised and %s.', device.name, str)
     } catch (err) {
       // *** Catch errors at any point during device initialisation *** \\
-      const errToShow = this.debug ? ':\n' + err : ' ' + err.message + ' [line ' + err.lineNumber + '].'
+      const errToShow = this.debug
+        ? ':\n' + err
+        : ' ' + err.message + (err.lineNumber ? ' [line ' + err.lineNumber + '].' : '')
       this.log.warn('[%s] could not be initialised as %s.', device.name, errToShow)
     }
   }
@@ -661,7 +663,9 @@ class eWeLinkPlatform {
       return accessory
     } catch (err) {
       // *** Catch any errors whilst trying to add the accessory *** \\
-      const errToShow = this.debug ? ':\n' + err : ' ' + err.message + ' [line ' + err.lineNumber + '].'
+      const errToShow = this.debug
+        ? ':\n' + err
+        : ' ' + err.message + (err.lineNumber ? ' [line ' + err.lineNumber + '].' : '')
       this.log.warn('[%s] could not be added to Homebridge as%s', newDeviceName, errToShow)
       return false
     }
@@ -677,7 +681,9 @@ class eWeLinkPlatform {
       // *** Add each cached device to our devicesInHB map *** \\
       this.devicesInHB.set(accessory.context.hbDeviceId, accessory)
     } catch (err) {
-      const errToShow = this.debug ? ':\n' + err : ' ' + err.message + ' [line ' + err.lineNumber + '].'
+      const errToShow = this.debug
+        ? ':\n' + err
+        : ' ' + err.message + (err.lineNumber ? ' [line ' + err.lineNumber + '].' : '')
       this.log.warn('[%s] could not be configured as%s', accessory.displayName, errToShow)
     }
   }
@@ -689,7 +695,9 @@ class eWeLinkPlatform {
       this.devicesInHB.delete(accessory.context.hbDeviceId)
       this.log('[%s] has been removed from Homebridge.', accessory.displayName)
     } catch (err) {
-      const errToShow = this.debug ? ':\n' + err : ' ' + err.message + ' [line ' + err.lineNumber + '].'
+      const errToShow = this.debug
+        ? ':\n' + err
+        : ' ' + err.message + (err.lineNumber ? ' [line ' + err.lineNumber + '].' : '')
       this.log.warn('[%s] could not removed from Homebridge as%s', accessory.displayName, errToShow)
     }
   }
@@ -786,7 +794,9 @@ class eWeLinkPlatform {
         // *** Update the accessory with the new data *** \\
         accessory.control.externalUpdate(device.params)
       } catch (err) {
-        const errToShow = this.debug ? ':\n' + err : ' ' + err.message + ' [line ' + err.lineNumber + '].'
+        const errToShow = this.debug
+          ? ':\n' + err
+          : ' ' + err.message + (err.lineNumber ? ' [line ' + err.lineNumber + '].' : '')
         this.log.warn('[%s] could not be refreshed as%s', accessory.displayName, errToShow)
       }
     } else {
@@ -814,20 +824,22 @@ class eWeLinkPlatform {
         }
       } catch (err) {
         // *** Automatically adding the new device failed for some reason *** \\
-        const errToShow = this.debug ? ':\n' + err : ' ' + err.message + ' [line ' + err.lineNumber + '].'
+        const errToShow = this.debug
+          ? ':\n' + err
+          : ' ' + err.message + (err.lineNumber ? ' [line ' + err.lineNumber + '].' : '')
         this.log.warn('[%s] restart Homebridge to add new device, failed to add automatically as%s', deviceId, errToShow)
       }
     }
   }
 
   async deviceUpdateError (accessory, err, requestRefresh) {
-    this.log.warn('[%s] device update failed as %s on line %s.', accessory.displayName, err.message, err.lineNumber)
+    const errToShow = this.debug
+      ? ':\n' + err
+      : ' ' + err.message + (err.lineNumber ? ' [line ' + err.lineNumber + '].' : '')
+    this.log.warn('[%s] device update failed as%s.', accessory.displayName, errToShow)
 
     // *** We only request a device refresh on failed internal updates (ie with 'set' handlers) *** \\
-    if (!requestRefresh) {
-      return
-    }
-    if (accessory.context.reachableWAN && this.wsClient) {
+    if (requestRefresh && accessory.context.reachableWAN && this.wsClient) {
       try {
         await this.wsClient.requestUpdate(accessory)
       } catch (err) {}

From e2fc33b45c88172bf8738420e4b395dfb412d845 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 28 Jan 2021 08:13:01 +0000
Subject: [PATCH 1244/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b13153e6..516e71f6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,10 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 * **[Experimental]** Expose a TH10/16 device as a fully working thermostat accessory
 
+### Changes
+
+* Only show the line in error logs if it exists (no more `[line undefined]`)
+
 ## 4.5.0 (2021-01-28)
 
 ### New

From c4da6756418e8bf1d49056169fd5eb288b6a52bc Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 28 Jan 2021 16:35:11 +0000
Subject: [PATCH 1245/3183] rf fix

---
 lib/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/index.js b/lib/index.js
index 2cbe8f32..bd7b0e59 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -103,7 +103,7 @@ class eWeLinkPlatform {
       if (Object.keys(this.config.bridgeSensors || []).length > 0) {
         this.config.bridgeSensors
           .filter(s => s.fullDeviceId && this.devicesInEW.has(s.fullDeviceId.split('SW')[0].toString().toLowerCase()))
-          .forEach(s => this.cusS.set(s.fullDeviceId.toLowerCase(), s))
+          .forEach(s => this.cusS.set(s.fullDeviceId, s))
       }
 
       // *** Remove HB accessories that are no longer in eWeLink account *** \\

From f67de99b2560b515c58137f29f4d065f1f0415cd Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 28 Jan 2021 16:35:42 +0000
Subject: [PATCH 1246/3183] 4.5.1-1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 6fef0103..c7e867a3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.5.1-0",
+  "version": "4.5.1-1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 4ae5828c..14f334e5 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "4.5.1-0",
+  "version": "4.5.1-1",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 96dbf4ac33e51a1c9d2d3129e7db692c3fe69201 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 28 Jan 2021 17:00:19 +0000
Subject: [PATCH 1247/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 516e71f6..67123790 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 ### Changes
 
 * Only show the line in error logs if it exists (no more `[line undefined]`)
+* Fixes an issue where RF sensors would not use a custom defined type (again!)
 
 ## 4.5.0 (2021-01-28)
 

From 4f192ca21fb38f8b357892d3685733aed71dc327 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 28 Jan 2021 18:31:15 +0000
Subject: [PATCH 1248/3183] switch as primary service

---
 lib/device/th-outlet.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/device/th-outlet.js b/lib/device/th-outlet.js
index cb332e6e..9963c4d5 100644
--- a/lib/device/th-outlet.js
+++ b/lib/device/th-outlet.js
@@ -35,6 +35,9 @@ module.exports = class deviceTHOutlet {
     if (this.accessory.context.sensorType !== 'DS18B20') {
       this.humiService = this.accessory.getService(this.S.HumiditySensor) || this.accessory.addService(this.S.HumiditySensor)
     }
+    if (this.switchService) {
+      this.switchService.setPrimaryService()
+    }
     this.accessory.log = platform.config.debugFakegato ? this.log : () => {}
     this.accessory.historyService = new this.platform.eveService('custom', this.accessory, {
       storage: 'fs',

From 3d657ba991b6fa2d44cbe19f282bb62471296bdd Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 28 Jan 2021 18:32:19 +0000
Subject: [PATCH 1249/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 67123790..b8294da3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 ### Changes
 
+* Set the switch as the primary service of a TH10/16 device
 * Only show the line in error logs if it exists (no more `[line undefined]`)
 * Fixes an issue where RF sensors would not use a custom defined type (again!)
 

From bd1c6347c33b0431166b60c2b82bbc643e400c84 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 28 Jan 2021 18:34:08 +0000
Subject: [PATCH 1250/3183] 4.5.1-2

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c7e867a3..97dbbda8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.5.1-1",
+  "version": "4.5.1-2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 14f334e5..72f9d283 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "4.5.1-1",
+  "version": "4.5.1-2",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 33984bf5d23b4160ed914e1cc2aa7fef7616238e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 28 Jan 2021 19:10:42 +0000
Subject: [PATCH 1251/3183] revert for release

---
 lib/device/th-thermo.js | 118 +++++++---------------------------------
 1 file changed, 20 insertions(+), 98 deletions(-)

diff --git a/lib/device/th-thermo.js b/lib/device/th-thermo.js
index 9fec5ad6..b0c30b7f 100644
--- a/lib/device/th-thermo.js
+++ b/lib/device/th-thermo.js
@@ -22,34 +22,17 @@ module.exports = class deviceTHThermo {
     if (this.accessory.getService(this.S.HumiditySensor)) {
       this.accessory.removeService(this.accessory.getService(this.S.HumiditySensor))
     }
-    if (!this.helpers.hasProperty(this.accessory.context, 'cacheHeatingTarget')) {
-      this.accessory.context.cacheHeatingTarget = 16
-    }
     this.service = this.accessory.getService(this.S.Thermostat) || this.accessory.addService(this.S.Thermostat)
     this.service.getCharacteristic(this.C.CurrentTemperature)
-      .setProps({
-        minValue: -100,
-        minStep: 0.1
-      })
+      .setProps({ minValue: -100 })
     this.service.getCharacteristic(this.C.TargetHeatingCoolingState)
       .on('set', this.internalOnOffUpdate.bind(this))
       .setProps({ validValues: [0, 1] })
     this.service.getCharacteristic(this.C.TargetTemperature)
-      .on('set', this.internalTargetTempUpdate.bind(this))
-      .setProps({
-        minValue: 0,
-        maxValue: 30,
-        minStep: 0.5
-      })
+      .on('set', this.internalTempUpdate.bind(this))
     if (this.accessory.context.sensorType !== 'DS18B20' && !this.service.testCharacteristic(this.C.CurrentRelativeHumidity)) {
       this.service.addCharacteristic(this.C.CurrentRelativeHumidity)
     }
-
-    // *** BETA *** \\
-    this.service.updateCharacteristic(this.C.CurrentTemperature, 16)
-    this.service.updateCharacteristic(this.C.TargetTemperature, 20)
-    // *** END BETA *** \\
-
     this.accessory.log = platform.config.debugFakegato ? this.log : () => {}
     this.accessory.historyService = new this.platform.eveService('custom', this.accessory, {
       storage: 'fs',
@@ -60,75 +43,27 @@ module.exports = class deviceTHThermo {
   async internalOnOffUpdate (value, callback) {
     try {
       callback()
-      this.log('[%s] setting TargetHeatingCoolingState to %s.', this.dName, value)
-      const params = {}
-      if (value === 0) {
-        // *** Has been turned off *** \\
-        params.mainswitch = 'off'
-        params.switch = 'off'
-      } else {
-        params.mainswitch = 'on'
-        params.switch = this.service.getCharacteristic(this.C.CurrentTemperature).value < this.accessory.context.cacheHeatingTarget
-          ? 'on'
-          : 'off'
-      }
-      this.cacheOnOff = value !== 0 ? 'on' : 'off'
-      this.cacheIsHeating = params.switch
-      this.service.updateCharacteristic(this.C.CurrentHeatingCoolingState, this.cacheIsHeating === 'on' ? 1 : 0)
-      await this.platform.sendDeviceUpdate(this.accessory, params)
-      if (!this.disableDeviceLogging) {
-        this.log('[%s] current state [%s] heating [%s].', this.dName, this.cacheOnOff, this.cacheIsHeating)
-      }
-    } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
-    }
-  }
-
-  async internalTargetTempUpdate (value, callback) {
-    try {
-      this.log('[%s] setting TargetTemperature to %s.', this.dName, value)
-      callback()
-      this.accessory.context.cacheHeatingTarget = value
-      this.cacheOnOff = 'on'
-      this.cacheIsHeating = this.service.getCharacteristic(this.C.CurrentTemperature).value < value
-        ? 'on'
-        : 'off'
       const params = {
-        mainswitch: this.cacheOnOff,
-        switch: this.cacheIsHeating
+        switch: value !== 0 ? 'on' : 'off'
       }
-      this.service.updateCharacteristic(this.C.CurrentHeatingCoolingState, this.cacheIsHeating === 'on' ? 1 : 0)
       await this.platform.sendDeviceUpdate(this.accessory, params)
+      this.cacheOnOff = value !== 0 ? 'on' : 'off'
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current state [%s] heating [%s].', this.dName, this.cacheOnOff, this.cacheIsHeating)
+        this.log('[%s] current state [%s].', this.dName, this.cacheOnOff)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
     }
   }
 
-  async internalCurrentTempUpdate (value) {
+  async internalTempUpdate (value, callback) {
     try {
-      const params = {}
-      this.log('[%s] internalCurrentTempUpdate() %s.', this.dName, value)
-      // *** Logic for checking the new current temperature against the target temperature *** \\
-      if (this.service.getCharacteristic(this.C.TargetHeatingCoolingState).value !== 0) {
-        // *** Thermostat is on so compare temperatures *** \\
-        if (this.cacheTemp < this.accessory.context.cacheHeatingTarget && this.cacheIsHeating !== 'on') {
-          this.cacheIsHeating = 'on'
-          params.switch = this.cacheIsHeating
-          this.service.updateCharacteristic(this.C.CurrentHeatingCoolingState, this.cacheIsHeating === 'on' ? 1 : 0)
-          await this.platform.sendDeviceUpdate(this.accessory, params)
-        } else if (this.cacheTemp < this.accessory.context.cacheHeatingTarget && this.cacheIsHeating !== 'off') {
-          this.cacheIsHeating = 'off'
-          params.switch = this.cacheIsHeating
-          this.service.updateCharacteristic(this.C.CurrentHeatingCoolingState, this.cacheIsHeating === 'on' ? 1 : 0)
-          await this.platform.sendDeviceUpdate(this.accessory, params)
-        }
-        if (!this.disableDeviceLogging) {
-          this.log('[%s] current state [%s] heating [%s].', this.dName, this.cacheOnOff, this.cacheIsHeating)
-        }
-      }
+      callback()
+      await this.helpers.sleep(500)
+      this.service.updateCharacteristic(
+        this.C.TargetTemperature,
+        this.service.getCharacteristic(this.C.CurrentTemperature).value
+      )
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
     }
@@ -136,8 +71,8 @@ module.exports = class deviceTHThermo {
 
   async externalUpdate (params) {
     try {
-      if (params.mainswitch) {
-        const newState = params.mainswitch
+      if (params.switch) {
+        const newState = params.switch
         if (this.cacheOnOff !== newState) {
           this.cacheOnOff = newState
           this.service.updateCharacteristic(this.C.TargetHeatingCoolingState, this.cacheOnOff === 'on' ? 0 : 1)
@@ -145,34 +80,22 @@ module.exports = class deviceTHThermo {
             time: Math.round(new Date().valueOf() / 1000),
             status: this.cacheOnOff === 'on' ? 1 : 0
           })
-          if (this.cacheOnOff === 'off') {
-            this.cacheIsHeating = 'off'
-          }
-          // if (params.updateSource && !this.disableDeviceLogging && !params.switch) {
-          if (!this.disableDeviceLogging && !params.switch) {
+          if (params.updateSource && !this.disableDeviceLogging) {
             this.log('[%s] current state [%s].', this.dName, this.cacheOnOff)
           }
         }
       }
-      if (params.switch) {
-        // if (params.updateSource && !this.disableDeviceLogging) {
-        if (!this.disableDeviceLogging) {
-          this.log('[%s] current state [%s] heating [%s].', this.dName, this.cacheOnOff, params.switch)
-        }
-        this.cacheIsHeating = params.switch
-      }
       const eveLog = {}
       if (this.helpers.hasProperty(params, 'currentTemperature') && params.currentTemperature !== 'unavailable') {
-        const currentTemp = (parseFloat(params.currentTemperature) + this.tempOffset).toFixed(1)
+        const currentTemp = parseFloat(params.currentTemperature) + this.tempOffset
         eveLog.temp = currentTemp
         if (this.cacheTemp !== currentTemp) {
           this.cacheTemp = currentTemp
           this.service.updateCharacteristic(this.C.CurrentTemperature, this.cacheTemp)
-          // if (params.updateSource && !this.disableDeviceLogging) {
+          this.service.updateCharacteristic(this.C.TargetTemperature, this.cacheTemp)
           if (params.updateSource && !this.disableDeviceLogging) {
             this.log('[%s] current temperature [%s].', this.dName, this.cacheTemp)
           }
-          this.internalCurrentTempUpdate(this.cacheTemp)
         }
       }
       if (
@@ -180,13 +103,12 @@ module.exports = class deviceTHThermo {
         params.currentHumidity !== 'unavailable' &&
         this.service.testCharacteristic(this.C.CurrentRelativeHumidity)
       ) {
-        const currentHumi = parseInt(params.currentHumidity)
+        const currentHumi = parseFloat(params.currentHumidity)
         eveLog.humidity = currentHumi
         if (this.cacheHumi !== currentHumi) {
           this.cacheHumi = currentHumi
           this.service.updateCharacteristic(this.C.CurrentRelativeHumidity, this.cacheHumi)
-          // if (params.updateSource && !this.disableDeviceLogging) {
-          if (!this.disableDeviceLogging) {
+          if (params.updateSource && !this.disableDeviceLogging) {
             this.log('[%s] current humidity [%s%].', this.dName, this.cacheHumi)
           }
         }
@@ -199,4 +121,4 @@ module.exports = class deviceTHThermo {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
-}
+}
\ No newline at end of file

From 8b42386442f9f40a1ebb0e7c03dacffffc50c944 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 28 Jan 2021 19:12:06 +0000
Subject: [PATCH 1252/3183] formatting

---
 lib/device/th-thermo.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/device/th-thermo.js b/lib/device/th-thermo.js
index b0c30b7f..ea90ca29 100644
--- a/lib/device/th-thermo.js
+++ b/lib/device/th-thermo.js
@@ -121,4 +121,4 @@ module.exports = class deviceTHThermo {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
-}
\ No newline at end of file
+}

From 5d92b48a50e184cf1a5245d09702f53f2013fe23 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 28 Jan 2021 19:12:09 +0000
Subject: [PATCH 1253/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b8294da3..180aca7a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,8 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 * **[Experimental]** Expose a TH10/16 device as a fully working thermostat accessory
 
+## 4.5.1 (2021-01-28)
+
 ### Changes
 
 * Set the switch as the primary service of a TH10/16 device

From b070b21b905f39323020440ba8d0a4769e157a3e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 28 Jan 2021 19:12:50 +0000
Subject: [PATCH 1254/3183] 4.5.1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 97dbbda8..d691eb94 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.5.1-2",
+  "version": "4.5.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 72f9d283..1580c6c9 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "4.5.1-2",
+  "version": "4.5.1",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From e4843e67f0fc49cbb6db82a6c9fc7d5e66520f8f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 28 Jan 2021 19:14:16 +0000
Subject: [PATCH 1255/3183] full thermostat beta

---
 lib/device/th-thermo.js | 116 +++++++++++++++++++++++++++++++++-------
 1 file changed, 97 insertions(+), 19 deletions(-)

diff --git a/lib/device/th-thermo.js b/lib/device/th-thermo.js
index ea90ca29..9fec5ad6 100644
--- a/lib/device/th-thermo.js
+++ b/lib/device/th-thermo.js
@@ -22,17 +22,34 @@ module.exports = class deviceTHThermo {
     if (this.accessory.getService(this.S.HumiditySensor)) {
       this.accessory.removeService(this.accessory.getService(this.S.HumiditySensor))
     }
+    if (!this.helpers.hasProperty(this.accessory.context, 'cacheHeatingTarget')) {
+      this.accessory.context.cacheHeatingTarget = 16
+    }
     this.service = this.accessory.getService(this.S.Thermostat) || this.accessory.addService(this.S.Thermostat)
     this.service.getCharacteristic(this.C.CurrentTemperature)
-      .setProps({ minValue: -100 })
+      .setProps({
+        minValue: -100,
+        minStep: 0.1
+      })
     this.service.getCharacteristic(this.C.TargetHeatingCoolingState)
       .on('set', this.internalOnOffUpdate.bind(this))
       .setProps({ validValues: [0, 1] })
     this.service.getCharacteristic(this.C.TargetTemperature)
-      .on('set', this.internalTempUpdate.bind(this))
+      .on('set', this.internalTargetTempUpdate.bind(this))
+      .setProps({
+        minValue: 0,
+        maxValue: 30,
+        minStep: 0.5
+      })
     if (this.accessory.context.sensorType !== 'DS18B20' && !this.service.testCharacteristic(this.C.CurrentRelativeHumidity)) {
       this.service.addCharacteristic(this.C.CurrentRelativeHumidity)
     }
+
+    // *** BETA *** \\
+    this.service.updateCharacteristic(this.C.CurrentTemperature, 16)
+    this.service.updateCharacteristic(this.C.TargetTemperature, 20)
+    // *** END BETA *** \\
+
     this.accessory.log = platform.config.debugFakegato ? this.log : () => {}
     this.accessory.historyService = new this.platform.eveService('custom', this.accessory, {
       storage: 'fs',
@@ -43,27 +60,75 @@ module.exports = class deviceTHThermo {
   async internalOnOffUpdate (value, callback) {
     try {
       callback()
-      const params = {
-        switch: value !== 0 ? 'on' : 'off'
+      this.log('[%s] setting TargetHeatingCoolingState to %s.', this.dName, value)
+      const params = {}
+      if (value === 0) {
+        // *** Has been turned off *** \\
+        params.mainswitch = 'off'
+        params.switch = 'off'
+      } else {
+        params.mainswitch = 'on'
+        params.switch = this.service.getCharacteristic(this.C.CurrentTemperature).value < this.accessory.context.cacheHeatingTarget
+          ? 'on'
+          : 'off'
       }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
       this.cacheOnOff = value !== 0 ? 'on' : 'off'
+      this.cacheIsHeating = params.switch
+      this.service.updateCharacteristic(this.C.CurrentHeatingCoolingState, this.cacheIsHeating === 'on' ? 1 : 0)
+      await this.platform.sendDeviceUpdate(this.accessory, params)
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current state [%s].', this.dName, this.cacheOnOff)
+        this.log('[%s] current state [%s] heating [%s].', this.dName, this.cacheOnOff, this.cacheIsHeating)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
     }
   }
 
-  async internalTempUpdate (value, callback) {
+  async internalTargetTempUpdate (value, callback) {
     try {
+      this.log('[%s] setting TargetTemperature to %s.', this.dName, value)
       callback()
-      await this.helpers.sleep(500)
-      this.service.updateCharacteristic(
-        this.C.TargetTemperature,
-        this.service.getCharacteristic(this.C.CurrentTemperature).value
-      )
+      this.accessory.context.cacheHeatingTarget = value
+      this.cacheOnOff = 'on'
+      this.cacheIsHeating = this.service.getCharacteristic(this.C.CurrentTemperature).value < value
+        ? 'on'
+        : 'off'
+      const params = {
+        mainswitch: this.cacheOnOff,
+        switch: this.cacheIsHeating
+      }
+      this.service.updateCharacteristic(this.C.CurrentHeatingCoolingState, this.cacheIsHeating === 'on' ? 1 : 0)
+      await this.platform.sendDeviceUpdate(this.accessory, params)
+      if (!this.disableDeviceLogging) {
+        this.log('[%s] current state [%s] heating [%s].', this.dName, this.cacheOnOff, this.cacheIsHeating)
+      }
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, true)
+    }
+  }
+
+  async internalCurrentTempUpdate (value) {
+    try {
+      const params = {}
+      this.log('[%s] internalCurrentTempUpdate() %s.', this.dName, value)
+      // *** Logic for checking the new current temperature against the target temperature *** \\
+      if (this.service.getCharacteristic(this.C.TargetHeatingCoolingState).value !== 0) {
+        // *** Thermostat is on so compare temperatures *** \\
+        if (this.cacheTemp < this.accessory.context.cacheHeatingTarget && this.cacheIsHeating !== 'on') {
+          this.cacheIsHeating = 'on'
+          params.switch = this.cacheIsHeating
+          this.service.updateCharacteristic(this.C.CurrentHeatingCoolingState, this.cacheIsHeating === 'on' ? 1 : 0)
+          await this.platform.sendDeviceUpdate(this.accessory, params)
+        } else if (this.cacheTemp < this.accessory.context.cacheHeatingTarget && this.cacheIsHeating !== 'off') {
+          this.cacheIsHeating = 'off'
+          params.switch = this.cacheIsHeating
+          this.service.updateCharacteristic(this.C.CurrentHeatingCoolingState, this.cacheIsHeating === 'on' ? 1 : 0)
+          await this.platform.sendDeviceUpdate(this.accessory, params)
+        }
+        if (!this.disableDeviceLogging) {
+          this.log('[%s] current state [%s] heating [%s].', this.dName, this.cacheOnOff, this.cacheIsHeating)
+        }
+      }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
     }
@@ -71,8 +136,8 @@ module.exports = class deviceTHThermo {
 
   async externalUpdate (params) {
     try {
-      if (params.switch) {
-        const newState = params.switch
+      if (params.mainswitch) {
+        const newState = params.mainswitch
         if (this.cacheOnOff !== newState) {
           this.cacheOnOff = newState
           this.service.updateCharacteristic(this.C.TargetHeatingCoolingState, this.cacheOnOff === 'on' ? 0 : 1)
@@ -80,22 +145,34 @@ module.exports = class deviceTHThermo {
             time: Math.round(new Date().valueOf() / 1000),
             status: this.cacheOnOff === 'on' ? 1 : 0
           })
-          if (params.updateSource && !this.disableDeviceLogging) {
+          if (this.cacheOnOff === 'off') {
+            this.cacheIsHeating = 'off'
+          }
+          // if (params.updateSource && !this.disableDeviceLogging && !params.switch) {
+          if (!this.disableDeviceLogging && !params.switch) {
             this.log('[%s] current state [%s].', this.dName, this.cacheOnOff)
           }
         }
       }
+      if (params.switch) {
+        // if (params.updateSource && !this.disableDeviceLogging) {
+        if (!this.disableDeviceLogging) {
+          this.log('[%s] current state [%s] heating [%s].', this.dName, this.cacheOnOff, params.switch)
+        }
+        this.cacheIsHeating = params.switch
+      }
       const eveLog = {}
       if (this.helpers.hasProperty(params, 'currentTemperature') && params.currentTemperature !== 'unavailable') {
-        const currentTemp = parseFloat(params.currentTemperature) + this.tempOffset
+        const currentTemp = (parseFloat(params.currentTemperature) + this.tempOffset).toFixed(1)
         eveLog.temp = currentTemp
         if (this.cacheTemp !== currentTemp) {
           this.cacheTemp = currentTemp
           this.service.updateCharacteristic(this.C.CurrentTemperature, this.cacheTemp)
-          this.service.updateCharacteristic(this.C.TargetTemperature, this.cacheTemp)
+          // if (params.updateSource && !this.disableDeviceLogging) {
           if (params.updateSource && !this.disableDeviceLogging) {
             this.log('[%s] current temperature [%s].', this.dName, this.cacheTemp)
           }
+          this.internalCurrentTempUpdate(this.cacheTemp)
         }
       }
       if (
@@ -103,12 +180,13 @@ module.exports = class deviceTHThermo {
         params.currentHumidity !== 'unavailable' &&
         this.service.testCharacteristic(this.C.CurrentRelativeHumidity)
       ) {
-        const currentHumi = parseFloat(params.currentHumidity)
+        const currentHumi = parseInt(params.currentHumidity)
         eveLog.humidity = currentHumi
         if (this.cacheHumi !== currentHumi) {
           this.cacheHumi = currentHumi
           this.service.updateCharacteristic(this.C.CurrentRelativeHumidity, this.cacheHumi)
-          if (params.updateSource && !this.disableDeviceLogging) {
+          // if (params.updateSource && !this.disableDeviceLogging) {
+          if (!this.disableDeviceLogging) {
             this.log('[%s] current humidity [%s%].', this.dName, this.cacheHumi)
           }
         }

From d4b53d4df05bfda2865667f7f6b455d68bd088c1 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 28 Jan 2021 19:14:50 +0000
Subject: [PATCH 1256/3183] 4.5.2-0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d691eb94..9265a7d0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.5.1",
+  "version": "4.5.2-0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 1580c6c9..5eba5258 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "4.5.1",
+  "version": "4.5.2-0",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From cc0eb058e76c9e2f54327d2b6072cefe4839729b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 29 Jan 2021 12:52:33 +0000
Subject: [PATCH 1257/3183] update plugin-utils

---
 package-lock.json | 6 +++---
 package.json      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 9265a7d0..4097860e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5,9 +5,9 @@
   "requires": true,
   "dependencies": {
     "@homebridge/plugin-ui-utils": {
-      "version": "0.0.17",
-      "resolved": "https://registry.npmjs.org/@homebridge/plugin-ui-utils/-/plugin-ui-utils-0.0.17.tgz",
-      "integrity": "sha512-b/36608DrTDgji9tWu126kg+pgS5lXctVwtgUK/t1pH/TsSAWcR7XUe6oDZ364umZm/1CMrVweMlOd+633q8nQ=="
+      "version": "0.0.18",
+      "resolved": "https://registry.npmjs.org/@homebridge/plugin-ui-utils/-/plugin-ui-utils-0.0.18.tgz",
+      "integrity": "sha512-ZxiSSxMKXHtv4IUtI3oVPCQwwtRPDfCGYa+SMhj0avLM9amVoqwTqFxa4psj6VjF5RJV1cuUMNJWJa8T8R/Pbg=="
     },
     "axios": {
       "version": "0.21.1",
diff --git a/package.json b/package.json
index 5eba5258..d3eb0068 100644
--- a/package.json
+++ b/package.json
@@ -47,7 +47,7 @@
     }
   ],
   "dependencies": {
-    "@homebridge/plugin-ui-utils": "^0.0.17",
+    "@homebridge/plugin-ui-utils": "^0.0.18",
     "axios": "^0.21.1",
     "node-dns-sd": "^0.4.2",
     "websocket-as-promised": "^1.1.0",

From 5913f798859f013e239071fb241dc84c99b3840e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 29 Jan 2021 12:52:58 +0000
Subject: [PATCH 1258/3183] use new method

---
 lib/homebridge-ui/public/index.html |  4 +++-
 lib/homebridge-ui/server.js         | 33 ++++++++++++++++-------------
 2 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/lib/homebridge-ui/public/index.html b/lib/homebridge-ui/public/index.html
index 88963000..87bab06f 100644
--- a/lib/homebridge-ui/public/index.html
+++ b/lib/homebridge-ui/public/index.html
@@ -135,7 +135,9 @@ <h4>Disclaimer</h4>
         document.getElementById('menuSettings').classList.add('btn-primary')
         document.getElementById('pageSupport').style.display = 'none'
         document.getElementById('pageDevices').style.display = 'block'
-        const cachedAccessories = await homebridge.request('/getCachedAccessories')
+        const cachedAccessories = typeof homebridge.getCachedAccessories === 'function'
+          ? await homebridge.getCachedAccessories()
+          : await homebridge.request('/getCachedAccessories')
         const deviceSelect = document.getElementById('deviceSelect')
         deviceSelect.innerHTML = ''
         cachedAccessories.forEach(a => {
diff --git a/lib/homebridge-ui/server.js b/lib/homebridge-ui/server.js
index a84891f0..d4a2593f 100644
--- a/lib/homebridge-ui/server.js
+++ b/lib/homebridge-ui/server.js
@@ -9,22 +9,25 @@ class PluginUiServer extends HomebridgePluginUiServer {
     this.onRequest('/getCachedAccessories', async () => {
       try {
         const devicesToReturn = []
-        let cachedAccessories = await fs.promises.readFile(this.homebridgeStoragePath + '/accessories/cachedAccessories')
-        cachedAccessories = JSON.parse(cachedAccessories)
-        cachedAccessories.filter(accessory => accessory.plugin === 'homebridge-ewelink')
-          .sort((a, b) => {
-            return a.displayName.toLowerCase() > b.displayName.toLowerCase()
-              ? 1
-              : b.displayName.toLowerCase() > a.displayName.toLowerCase()
-                ? -1
-                : 0
-          })
-          .forEach(accessory => {
-            devicesToReturn.push({
-              displayName: accessory.displayName,
-              context: accessory.context
+        const accessoriesFile = this.homebridgeStoragePath + '/accessories/cachedAccessories'
+        if (fs.existsSync(accessoriesFile)) {
+          let cachedAccessories = await fs.promises.readFile(accessoriesFile)
+          cachedAccessories = JSON.parse(cachedAccessories)
+          cachedAccessories.filter(accessory => accessory.plugin === 'homebridge-ewelink')
+            .sort((a, b) => {
+              return a.displayName.toLowerCase() > b.displayName.toLowerCase()
+                ? 1
+                : b.displayName.toLowerCase() > a.displayName.toLowerCase()
+                  ? -1
+                  : 0
             })
-          })
+            .forEach(accessory => {
+              devicesToReturn.push({
+                displayName: accessory.displayName,
+                context: accessory.context
+              })
+            })
+        }
         return devicesToReturn
       } catch (err) {
         return []

From 1a680aa481a58dd287d284ecc257bf4e057534ff Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 29 Jan 2021 12:53:45 +0000
Subject: [PATCH 1259/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 180aca7a..a3cd0e0f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,10 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 * **[Experimental]** Expose a TH10/16 device as a fully working thermostat accessory
 
+### Changes
+
+* Updated plugin-ui-utils dep and use new method to get cached accessories
+
 ## 4.5.1 (2021-01-28)
 
 ### Changes

From 6a56bdb5c6aa92641ead388c75e6cdcc92c141a0 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 29 Jan 2021 12:58:22 +0000
Subject: [PATCH 1260/3183] sort accessories by name

---
 lib/homebridge-ui/public/index.html | 9 +++++++++
 lib/homebridge-ui/server.js         | 7 -------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/lib/homebridge-ui/public/index.html b/lib/homebridge-ui/public/index.html
index 87bab06f..f955c2b6 100644
--- a/lib/homebridge-ui/public/index.html
+++ b/lib/homebridge-ui/public/index.html
@@ -138,6 +138,15 @@ <h4>Disclaimer</h4>
         const cachedAccessories = typeof homebridge.getCachedAccessories === 'function'
           ? await homebridge.getCachedAccessories()
           : await homebridge.request('/getCachedAccessories')
+        if (cachedAccessories.length > 0) {
+          cachedAccessories.sort((a, b) => {
+            return a.displayName.toLowerCase() > b.displayName.toLowerCase()
+              ? 1
+              : b.displayName.toLowerCase() > a.displayName.toLowerCase()
+                ? -1
+                : 0
+          })
+        }
         const deviceSelect = document.getElementById('deviceSelect')
         deviceSelect.innerHTML = ''
         cachedAccessories.forEach(a => {
diff --git a/lib/homebridge-ui/server.js b/lib/homebridge-ui/server.js
index d4a2593f..7c17fb02 100644
--- a/lib/homebridge-ui/server.js
+++ b/lib/homebridge-ui/server.js
@@ -14,13 +14,6 @@ class PluginUiServer extends HomebridgePluginUiServer {
           let cachedAccessories = await fs.promises.readFile(accessoriesFile)
           cachedAccessories = JSON.parse(cachedAccessories)
           cachedAccessories.filter(accessory => accessory.plugin === 'homebridge-ewelink')
-            .sort((a, b) => {
-              return a.displayName.toLowerCase() > b.displayName.toLowerCase()
-                ? 1
-                : b.displayName.toLowerCase() > a.displayName.toLowerCase()
-                  ? -1
-                  : 0
-            })
             .forEach(accessory => {
               devicesToReturn.push({
                 displayName: accessory.displayName,

From 4a6a06d4a9d70a58b2439aec760aec5b4c846fbf Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 29 Jan 2021 13:20:16 +0000
Subject: [PATCH 1261/3183] 4.5.2-1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 4097860e..6a80c571 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.5.2-0",
+  "version": "4.5.2-1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index d3eb0068..860a827e 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "4.5.2-0",
+  "version": "4.5.2-1",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 48f269a8e78b2ebf0eea81a345351afcca8fada5 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 30 Jan 2021 04:17:54 +0000
Subject: [PATCH 1262/3183] zb1257 switch implementation

---
 lib/device/zb-dev.js | 26 ++++++++++++++++++++++++--
 lib/utils/helpers.js |  3 ++-
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/lib/device/zb-dev.js b/lib/device/zb-dev.js
index 09a042fe..c54db68e 100644
--- a/lib/device/zb-dev.js
+++ b/lib/device/zb-dev.js
@@ -62,7 +62,14 @@ module.exports = class deviceZBDev {
           path: platform.eveLogPath
         })
         this.accessory.getService(this.S.Switch).getCharacteristic(this.C.On)
-          .on('set', this.internalUpdate.bind(this))
+          .on('set', this.internalSwitchOnOffUpdate.bind(this))
+        break
+      case 1257:
+        if (!this.accessory.getService(this.S.Lightbulb)) {
+          this.accessory.addService(this.S.Lightbulb)
+        }
+        this.accessory.getService(this.S.Lightbulb).getCharacteristic(this.C.On)
+          .on('set', this.internalLightOnOffUpdate.bind(this))
         break
       case 1770: {
         if (!this.accessory.getService(this.S.BatteryService)) {
@@ -110,7 +117,7 @@ module.exports = class deviceZBDev {
     }
   }
 
-  async internalUpdate (value, callback) {
+  async internalSwitchOnOffUpdate (value, callback) {
     try {
       callback()
       await this.platform.sendDeviceUpdate(this.accessory, {
@@ -129,6 +136,21 @@ module.exports = class deviceZBDev {
     }
   }
 
+  async internalLightOnOffUpdate (value, callback) {
+    try {
+      callback()
+      await this.platform.sendDeviceUpdate(this.accessory, {
+        switch: value ? 'on' : 'off'
+      })
+      this.cacheOnOff = value ? 'on' : 'off'
+      if (!this.disableDeviceLogging) {
+        this.log('[%s] current state [%s].', this.dName, value ? 'on' : 'off')
+      }
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, true)
+    }
+  }
+
   async externalUpdate (params) {
     try {
       //* ** credit @tasict ***\\
diff --git a/lib/utils/helpers.js b/lib/utils/helpers.js
index 3d49c560..e9ee4b37 100644
--- a/lib/utils/helpers.js
+++ b/lib/utils/helpers.js
@@ -46,7 +46,7 @@ module.exports = {
   devicesSCM: [78],
   devicesRFBridge: [28],
   devicesZBBridge: [66],
-  devicesZB: [1000, 1009, 1256, 1770, 2026, 3026],
+  devicesZB: [1000, 1009, 1256, 1257, 1770, 2026, 3026],
   paramsToKeep: [
     'battery', 'bright', 'brightness',
     'channel', 'cmd', 'color', 'colorB',
@@ -215,6 +215,7 @@ module.exports = {
     1003: 0, // "WARM_AIR_BLOWER"                      \\
     1009: 1, // ""                                     \\ Some sort of single switch device
     1256: 1, // "ZIGBEE_SINGLE_SWITCH"                 \\
+    1257: 1, // "ZigbeeWhiteLight"
     1770: 1, // "ZIGBEE_TEMPERATURE_SENSOR"            \\
     2026: 1, // "ZIGBEE_MOBILE_SENSOR"                 \\
     2256: 2, // "ZIGBEE_SWITCH_2"                      \\

From fd2151c6bc9c59cf6afa3ac00ab218d2b390bb2e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 30 Jan 2021 04:28:02 +0000
Subject: [PATCH 1263/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a3cd0e0f..85266100 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 ### New
 
+* Support for the Zigbee white bulb
 * **[Experimental]** Expose a TH10/16 device as a fully working thermostat accessory
 
 ### Changes

From 64e55a65b4055f2a0ff6306cae7f5612df266b94 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 30 Jan 2021 04:32:49 +0000
Subject: [PATCH 1264/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 85266100..05d2db5a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,7 +6,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 ### New
 
-* Support for the Zigbee white bulb
+* Initial support for the Zigbee white bulb
 * **[Experimental]** Expose a TH10/16 device as a fully working thermostat accessory
 
 ### Changes

From e9507cb1fffafb0037861762973bcddc5c901916 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 30 Jan 2021 04:33:29 +0000
Subject: [PATCH 1265/3183] 4.5.2-2

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 6a80c571..54608d1e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.5.2-1",
+  "version": "4.5.2-2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 860a827e..ec3de264 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "4.5.2-1",
+  "version": "4.5.2-2",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 0496cd3211cdc39b030625205bcd12a74d0d3e03 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 30 Jan 2021 10:20:25 +0000
Subject: [PATCH 1266/3183] move AS to folder

---
 lib/device/{ => simulation}/blind.js          |  0
 lib/device/{ => simulation}/garage-eachen.js  |  0
 lib/device/{ => simulation}/garage-four.js    |  0
 .../{ => simulation}/garage-od-switch.js      |  0
 lib/device/{ => simulation}/garage-one.js     |  0
 lib/device/{ => simulation}/garage-two.js     |  0
 lib/device/{ => simulation}/lock-one.js       |  0
 lib/device/{ => simulation}/switch-valve.js   |  0
 lib/device/{ => simulation}/tap-one.js        |  0
 lib/device/{ => simulation}/tap-two.js        |  0
 lib/device/{ => simulation}/valve-four.js     |  0
 lib/device/{ => simulation}/valve-one.js      |  0
 lib/device/{ => simulation}/valve-two.js      |  0
 lib/index.js                                  | 26 +++++++++----------
 14 files changed, 13 insertions(+), 13 deletions(-)
 rename lib/device/{ => simulation}/blind.js (100%)
 rename lib/device/{ => simulation}/garage-eachen.js (100%)
 rename lib/device/{ => simulation}/garage-four.js (100%)
 rename lib/device/{ => simulation}/garage-od-switch.js (100%)
 rename lib/device/{ => simulation}/garage-one.js (100%)
 rename lib/device/{ => simulation}/garage-two.js (100%)
 rename lib/device/{ => simulation}/lock-one.js (100%)
 rename lib/device/{ => simulation}/switch-valve.js (100%)
 rename lib/device/{ => simulation}/tap-one.js (100%)
 rename lib/device/{ => simulation}/tap-two.js (100%)
 rename lib/device/{ => simulation}/valve-four.js (100%)
 rename lib/device/{ => simulation}/valve-one.js (100%)
 rename lib/device/{ => simulation}/valve-two.js (100%)

diff --git a/lib/device/blind.js b/lib/device/simulation/blind.js
similarity index 100%
rename from lib/device/blind.js
rename to lib/device/simulation/blind.js
diff --git a/lib/device/garage-eachen.js b/lib/device/simulation/garage-eachen.js
similarity index 100%
rename from lib/device/garage-eachen.js
rename to lib/device/simulation/garage-eachen.js
diff --git a/lib/device/garage-four.js b/lib/device/simulation/garage-four.js
similarity index 100%
rename from lib/device/garage-four.js
rename to lib/device/simulation/garage-four.js
diff --git a/lib/device/garage-od-switch.js b/lib/device/simulation/garage-od-switch.js
similarity index 100%
rename from lib/device/garage-od-switch.js
rename to lib/device/simulation/garage-od-switch.js
diff --git a/lib/device/garage-one.js b/lib/device/simulation/garage-one.js
similarity index 100%
rename from lib/device/garage-one.js
rename to lib/device/simulation/garage-one.js
diff --git a/lib/device/garage-two.js b/lib/device/simulation/garage-two.js
similarity index 100%
rename from lib/device/garage-two.js
rename to lib/device/simulation/garage-two.js
diff --git a/lib/device/lock-one.js b/lib/device/simulation/lock-one.js
similarity index 100%
rename from lib/device/lock-one.js
rename to lib/device/simulation/lock-one.js
diff --git a/lib/device/switch-valve.js b/lib/device/simulation/switch-valve.js
similarity index 100%
rename from lib/device/switch-valve.js
rename to lib/device/simulation/switch-valve.js
diff --git a/lib/device/tap-one.js b/lib/device/simulation/tap-one.js
similarity index 100%
rename from lib/device/tap-one.js
rename to lib/device/simulation/tap-one.js
diff --git a/lib/device/tap-two.js b/lib/device/simulation/tap-two.js
similarity index 100%
rename from lib/device/tap-two.js
rename to lib/device/simulation/tap-two.js
diff --git a/lib/device/valve-four.js b/lib/device/simulation/valve-four.js
similarity index 100%
rename from lib/device/valve-four.js
rename to lib/device/simulation/valve-four.js
diff --git a/lib/device/valve-one.js b/lib/device/simulation/valve-one.js
similarity index 100%
rename from lib/device/valve-one.js
rename to lib/device/simulation/valve-one.js
diff --git a/lib/device/valve-two.js b/lib/device/simulation/valve-two.js
similarity index 100%
rename from lib/device/valve-two.js
rename to lib/device/simulation/valve-two.js
diff --git a/lib/index.js b/lib/index.js
index bd7b0e59..b6b8d7c9 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -185,14 +185,14 @@ class eWeLinkPlatform {
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
           : this.addAccessory(device, device.deviceid + 'SWX', false, this.helpers.defaultBlindCache)
-        accessory.control = new (require('./device/blind'))(this, accessory)
+        accessory.control = new (require('./device/simulation/blind'))(this, accessory)
         /***************************/
       } else if (this.helpers.hasProperty(this.obstructSwitches, device.deviceid)) {
         /*****************************
         OBSTRUCTION DETECTION SWITCHES
         *****************************/
         accessory = this.addAccessory(device, device.deviceid + 'SWX', true)
-        accessory.control = new (require('./device/garage-od-switch'))(this, accessory)
+        accessory.control = new (require('./device/simulation/garage-od-switch'))(this, accessory)
         /****************************/
       } else if (this.cusG.has(device.deviceid) && this.cusG.get(device.deviceid).type === 'garage') {
         /****************************************
@@ -201,7 +201,7 @@ class eWeLinkPlatform {
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
           : this.addAccessory(device, device.deviceid + 'SWX', false, this.helpers.defaultGarageCache)
-        accessory.control = new (require('./device/garage-one'))(this, accessory)
+        accessory.control = new (require('./device/simulation/garage-one'))(this, accessory)
         /***************************************/
       } else if (this.cusG.has(device.deviceid) && this.cusG.get(device.deviceid).type === 'garage_two') {
         /****************************************
@@ -210,7 +210,7 @@ class eWeLinkPlatform {
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
           : this.addAccessory(device, device.deviceid + 'SWX', false, this.helpers.defaultGarageTwoCache)
-        accessory.control = new (require('./device/garage-two'))(this, accessory)
+        accessory.control = new (require('./device/simulation/garage-two'))(this, accessory)
         /***************************************/
       } else if (this.cusG.has(device.deviceid) && this.cusG.get(device.deviceid).type === 'garage_four') {
         /*****************************************
@@ -219,7 +219,7 @@ class eWeLinkPlatform {
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
           : this.addAccessory(device, device.deviceid + 'SWX', false, this.helpers.defaultGarageFourCache)
-        accessory.control = new (require('./device/garage-four'))(this, accessory)
+        accessory.control = new (require('./device/simulation/garage-four'))(this, accessory)
         /****************************************/
       } else if (this.cusG.has(device.deviceid) && this.cusG.get(device.deviceid).type === 'garage_eachen') {
         /***************************
@@ -228,7 +228,7 @@ class eWeLinkPlatform {
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
           : this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require('./device/garage-eachen'))(this, accessory)
+        accessory.control = new (require('./device/simulation/garage-eachen'))(this, accessory)
         /**************************/
       } else if (this.cusG.has(device.deviceid) && this.cusG.get(device.deviceid).type === 'lock') {
         /***************************
@@ -237,7 +237,7 @@ class eWeLinkPlatform {
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
           : this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require('./device/lock-one'))(this, accessory)
+        accessory.control = new (require('./device/simulation/lock-one'))(this, accessory)
         /**************************/
       } else if (this.cusG.has(device.deviceid) && this.cusG.get(device.deviceid).type === 'switch_valve') {
         /**********************************
@@ -246,7 +246,7 @@ class eWeLinkPlatform {
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
           : this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require('./device/switch-valve'))(this, accessory)
+        accessory.control = new (require('./device/simulation/switch-valve'))(this, accessory)
         /*********************************/
       } else if (this.cusG.has(device.deviceid) && this.cusG.get(device.deviceid).type === 'tap') {
         /********************************
@@ -255,7 +255,7 @@ class eWeLinkPlatform {
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
           : this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require('./device/tap-one'))(this, accessory)
+        accessory.control = new (require('./device/simulation/tap-one'))(this, accessory)
         /*******************************/
       } else if (this.cusG.has(device.deviceid) && this.cusG.get(device.deviceid).type === 'tap_two') {
         /********************************
@@ -264,7 +264,7 @@ class eWeLinkPlatform {
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
           : this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require('./device/tap-two'))(this, accessory)
+        accessory.control = new (require('./device/simulation/tap-two'))(this, accessory)
         /*******************************/
       } else if (this.cusG.has(device.deviceid) && this.cusG.get(device.deviceid).type === 'valve') {
         /**********************************
@@ -273,7 +273,7 @@ class eWeLinkPlatform {
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
           : this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require('./device/valve-one'))(this, accessory)
+        accessory.control = new (require('./device/simulation/valve-one'))(this, accessory)
         /*********************************/
       } else if (this.cusG.has(device.deviceid) && this.cusG.get(device.deviceid).type === 'valve_two') {
         /**********************************
@@ -282,7 +282,7 @@ class eWeLinkPlatform {
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
           : this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require('./device/valve-two'))(this, accessory)
+        accessory.control = new (require('./device/simulation/valve-two'))(this, accessory)
         /*********************************/
       } else if (this.cusG.has(device.deviceid) && this.cusG.get(device.deviceid).type === 'valve_four') {
         /***********************************
@@ -291,7 +291,7 @@ class eWeLinkPlatform {
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
           : this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require('./device/valve-four'))(this, accessory)
+        accessory.control = new (require('./device/simulation/valve-four'))(this, accessory)
         /**********************************/
       } else if (this.helpers.devicesSensor.includes(device.extra.uiid)) {
         /*******************

From 8885826a75b4020f38ccab51f7f5d6265dfbbcd8 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 30 Jan 2021 11:42:47 +0000
Subject: [PATCH 1267/3183] rewrite zigbee devices

---
 lib/device/zb-dev.js                  | 286 --------------------------
 lib/device/zigbee/light-dimmer.js     |  76 +++++++
 lib/device/zigbee/sensor-ambient.js   |  69 +++++++
 lib/device/zigbee/sensor-contact.js   |  73 +++++++
 lib/device/zigbee/sensor-motion.js    |  79 +++++++
 lib/device/zigbee/switch-single.js    |  62 ++++++
 lib/device/zigbee/switch-stateless.js |  50 +++++
 lib/index.js                          |  57 ++++-
 lib/utils/helpers.js                  |   7 +-
 9 files changed, 466 insertions(+), 293 deletions(-)
 delete mode 100644 lib/device/zb-dev.js
 create mode 100644 lib/device/zigbee/light-dimmer.js
 create mode 100644 lib/device/zigbee/sensor-ambient.js
 create mode 100644 lib/device/zigbee/sensor-contact.js
 create mode 100644 lib/device/zigbee/sensor-motion.js
 create mode 100644 lib/device/zigbee/switch-single.js
 create mode 100644 lib/device/zigbee/switch-stateless.js

diff --git a/lib/device/zb-dev.js b/lib/device/zb-dev.js
deleted file mode 100644
index c54db68e..00000000
--- a/lib/device/zb-dev.js
+++ /dev/null
@@ -1,286 +0,0 @@
-/* jshint -W014, -W033, esversion: 9 */
-/* eslint-disable new-cap */
-'use strict'
-const util = require('util')
-module.exports = class deviceZBDev {
-  constructor (platform, accessory) {
-    this.platform = platform
-    this.log = platform.log
-    this.disableDeviceLogging = platform.config.disableDeviceLogging
-    this.helpers = platform.helpers
-    this.S = platform.api.hap.Service
-    this.C = platform.api.hap.Characteristic
-    this.dName = accessory.displayName
-    this.accessory = accessory
-
-    const self = this
-    this.eveLastActivation = function () {
-      self.C.call(this, 'Last Activation', self.helpers.eveUUID.lastActivation)
-      this.setProps({
-        format: self.C.Formats.UINT32,
-        unit: self.C.Units.SECONDS,
-        perms: [self.C.Perms.READ, self.C.Perms.NOTIFY]
-      })
-      this.value = this.getDefaultValue()
-    }
-    util.inherits(this.eveLastActivation, this.C)
-    this.eveLastActivation.UUID = this.helpers.eveUUID.lastActivation
-    this.lowBattThreshold = parseInt(this.platform.config.lowBattThreshold)
-    this.lowBattThreshold = isNaN(this.lowBattThreshold) || this.lowBattThreshold < 5
-      ? this.helpers.defaults.lowBattThreshold
-      : this.lowBattThreshold
-    this.sensorTimeDifference = parseInt(this.platform.config.sensorTimeDifference)
-    this.sensorTimeDifference = isNaN(this.sensorTimeDifference) || this.sensorTimeDifference < 10
-      ? this.helpers.defaults.sensorTimeDifference
-      : this.sensorTimeDifference
-    switch (this.accessory.context.eweUIID) {
-      case 1000: {
-        if (!this.accessory.getService(this.S.BatteryService)) {
-          this.accessory.addService(this.S.BatteryService)
-        }
-        const zbspsService =
-          this.accessory.getService(this.S.StatelessProgrammableSwitch) ||
-          this.accessory.addService(this.S.StatelessProgrammableSwitch)
-        if (this.platform.config.hideZBLDPress) {
-          zbspsService
-            .getCharacteristic(this.C.ProgrammableSwitchEvent)
-            .setProps({ validValues: [0] })
-        }
-        break
-      }
-      case 1009:
-      case 1256:
-        if (this.accessory.getService(this.S.BatteryService)) {
-          this.accessory.removeService(this.accessory.getService(this.S.BatteryService))
-        }
-        if (!this.accessory.getService(this.S.Switch)) {
-          this.accessory.addService(this.S.Switch)
-        }
-        this.accessory.log = platform.config.debugFakegato ? this.log : () => {}
-        this.accessory.historyService = new this.platform.eveService('switch', this.accessory, {
-          storage: 'fs',
-          path: platform.eveLogPath
-        })
-        this.accessory.getService(this.S.Switch).getCharacteristic(this.C.On)
-          .on('set', this.internalSwitchOnOffUpdate.bind(this))
-        break
-      case 1257:
-        if (!this.accessory.getService(this.S.Lightbulb)) {
-          this.accessory.addService(this.S.Lightbulb)
-        }
-        this.accessory.getService(this.S.Lightbulb).getCharacteristic(this.C.On)
-          .on('set', this.internalLightOnOffUpdate.bind(this))
-        break
-      case 1770: {
-        if (!this.accessory.getService(this.S.BatteryService)) {
-          this.accessory.addService(this.S.BatteryService)
-        }
-        const tService = this.accessory.getService(this.S.TemperatureSensor) || this.accessory.addService(this.S.TemperatureSensor)
-        tService.getCharacteristic(this.C.CurrentTemperature)
-          .setProps({ minValue: -100 })
-        if (!this.accessory.getService(this.S.HumiditySensor)) {
-          this.accessory.addService(this.S.HumiditySensor)
-        }
-        this.accessory.log = platform.config.debugFakegato ? this.log : () => {}
-        this.accessory.historyService = new this.platform.eveService('weather', this.accessory, {
-          storage: 'fs',
-          path: platform.eveLogPath
-        })
-        break
-      }
-      case 2026:
-        if (!this.accessory.getService(this.S.BatteryService)) {
-          this.accessory.addService(this.S.BatteryService)
-        }
-        if (!this.accessory.getService(this.S.MotionSensor)) {
-          this.accessory.addService(this.S.MotionSensor)
-        }
-        this.accessory.log = platform.config.debugFakegato ? this.log : () => {}
-        this.accessory.historyService = new this.platform.eveService('motion', this.accessory, {
-          storage: 'fs',
-          path: platform.eveLogPath
-        })
-        break
-      case 3026:
-        if (!this.accessory.getService(this.S.BatteryService)) {
-          this.accessory.addService(this.S.BatteryService)
-        }
-        if (!this.accessory.getService(this.S.ContactSensor)) {
-          this.accessory.addService(this.S.ContactSensor)
-        }
-        this.accessory.log = platform.config.debugFakegato ? this.log : () => {}
-        this.accessory.historyService = new this.platform.eveService('door', this.accessory, {
-          storage: 'fs',
-          path: platform.eveLogPath
-        })
-        break
-    }
-  }
-
-  async internalSwitchOnOffUpdate (value, callback) {
-    try {
-      callback()
-      await this.platform.sendDeviceUpdate(this.accessory, {
-        switch: value ? 'on' : 'off'
-      })
-      this.cacheOnOff = value ? 'on' : 'off'
-      this.accessory.historyService.addEntry({
-        time: Math.round(new Date().valueOf() / 1000),
-        status: value ? 1 : 0
-      })
-      if (!this.disableDeviceLogging) {
-        this.log('[%s] current state [%s].', this.dName, value ? 'on' : 'off')
-      }
-    } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
-    }
-  }
-
-  async internalLightOnOffUpdate (value, callback) {
-    try {
-      callback()
-      await this.platform.sendDeviceUpdate(this.accessory, {
-        switch: value ? 'on' : 'off'
-      })
-      this.cacheOnOff = value ? 'on' : 'off'
-      if (!this.disableDeviceLogging) {
-        this.log('[%s] current state [%s].', this.dName, value ? 'on' : 'off')
-      }
-    } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
-    }
-  }
-
-  async externalUpdate (params) {
-    try {
-      //* ** credit @tasict ***\\
-      if (params.battery) {
-        if (this.accessory.context.eweUIID === 3026 && this.platform.config.ZBDWBatt) {
-          params.battery *= 10
-        }
-        if (params.battery !== this.cacheBattery) {
-          const batt = this.accessory.getService(this.S.BatteryService) || this.accessory.addService(this.S.BatteryService)
-          batt.updateCharacteristic(this.C.BatteryLevel, params.battery)
-          batt.updateCharacteristic(this.C.StatusLowBattery, params.battery < this.lowBattThreshold)
-          this.cacheBattery = params.battery
-          if (params.updateSource && !this.disableDeviceLogging) {
-            this.log('[%s] current battery [%s%].', this.dName, params.battery)
-          }
-        }
-      }
-      switch (this.accessory.context.eweUIID) {
-        case 1000:
-          if (this.helpers.hasProperty(params, 'key') && [0, 1, 2].includes(params.key)) {
-            this.accessory.getService(this.S.StatelessProgrammableSwitch)
-              .updateCharacteristic(this.C.ProgrammableSwitchEvent, params.key)
-            if (params.updateSource && !this.disableDeviceLogging) {
-              this.log(
-                '[%s] current state [%s].',
-                this.dName,
-                params.key === 0
-                  ? 'single press'
-                  : params.key === 1
-                    ? 'double press'
-                    : 'long press'
-              )
-            }
-          }
-          break
-        case 1009:
-        case 1256:
-          if (params.switch && params.switch !== this.cacheOnOff) {
-            this.accessory.getService(this.S.Switch)
-              .updateCharacteristic(this.C.On, params.switch === 'on')
-            this.cacheOnOff = params.switch
-            this.accessory.historyService.addEntry({
-              time: Math.round(new Date().valueOf() / 1000),
-              status: params.switch === 'on' ? 1 : 0
-            })
-            if (params.updateSource && !this.disableDeviceLogging) {
-              this.log('[%s] current state [%s].', this.dName, params.switch)
-            }
-          }
-          break
-        case 1770: {
-          const eveLog = {}
-          if (params.temperature && params.temperature !== this.cacheTemp) {
-            this.cacheTemp = params.temperature
-            const currentTemp = parseInt(params.temperature) / 100
-            this.accessory.getService(this.S.TemperatureSensor)
-              .updateCharacteristic(this.C.CurrentTemperature, currentTemp)
-            if (params.updateSource && !this.disableDeviceLogging) {
-              this.log('[%s] current temperature [%s].', this.dName, currentTemp)
-            }
-            eveLog.temp = currentTemp
-          }
-          if (params.humidity && params.humidity !== this.cacheHumi) {
-            this.cacheHumi = params.humidity
-            const currentHumi = parseInt(params.humidity) / 100
-            this.accessory.getService(this.S.HumiditySensor)
-              .updateCharacteristic(this.C.CurrentRelativeHumidity, currentHumi)
-            eveLog.humidity = currentHumi
-            if (params.updateSource && !this.disableDeviceLogging) {
-              this.log('[%s] current humidity [%s].', this.dName, currentHumi)
-            }
-          }
-          if (eveLog.temp || eveLog.humidity) {
-            eveLog.time = Math.round(new Date().valueOf() / 1000)
-            this.accessory.historyService.addEntry(eveLog)
-          }
-          break
-        }
-        case 2026:
-          if (this.helpers.hasProperty(params, 'motion') && this.helpers.hasProperty(params, 'trigTime')) {
-            const timeNow = new Date()
-            const diff = (timeNow.getTime() - params.trigTime) / 1000
-            const motionDetected =
-              this.helpers.hasProperty(params, 'updateSource') &&
-              params.motion === 1 &&
-              diff < this.sensorTimeDifference
-            this.accessory.historyService.addEntry({
-              time: Math.round(new Date().valueOf() / 1000),
-              status: motionDetected ? 1 : 0
-            })
-            if (params.updateSource && !this.disableDeviceLogging) {
-              this.log('[%s] current state [motion%s detected].', this.dName, motionDetected ? '' : ' not')
-            }
-            if (motionDetected) {
-              this.accessory.getService(this.S.MotionSensor)
-                .updateCharacteristic(
-                  this.eveLastActivation,
-                  Math.round(new Date().valueOf() / 1000) - this.accessory.historyService.getInitialTime()
-                )
-            }
-            this.accessory.getService(this.S.MotionSensor)
-              .updateCharacteristic(this.C.MotionDetected, motionDetected)
-            break
-          }
-          break
-        case 3026:
-          if (this.helpers.hasProperty(params, 'lock') && [0, 1].includes(params.lock)) {
-            this.accessory.getService(this.S.ContactSensor)
-              .updateCharacteristic(this.C.ContactSensorState, params.lock)
-            if (params.updateSource && !this.disableDeviceLogging) {
-              this.log('[%s] current state [contact%s detected].', this.dName, params.lock === 0 ? '' : ' not')
-            }
-            this.accessory.historyService.addEntry({
-              time: Math.round(new Date().valueOf() / 1000),
-              status: params.lock
-            })
-            if (params.lock === 1) {
-              this.accessory.getService(this.S.ContactSensor)
-                .updateCharacteristic(
-                  this.eveLastActivation,
-                  Math.round(new Date().valueOf() / 1000) - this.accessory.historyService.getInitialTime()
-                )
-            }
-          }
-          break
-        default:
-          throw new Error('Zigbee device type not supported [uiid ' + this.accessory.context.eweUIID + ']')
-      }
-    } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, false)
-    }
-  }
-}
diff --git a/lib/device/zigbee/light-dimmer.js b/lib/device/zigbee/light-dimmer.js
new file mode 100644
index 00000000..86093776
--- /dev/null
+++ b/lib/device/zigbee/light-dimmer.js
@@ -0,0 +1,76 @@
+/* jshint -W014, -W033, esversion: 9 */
+/* eslint-disable new-cap */
+'use strict'
+module.exports = class deviceZBLightDimmer {
+  constructor (platform, accessory) {
+    this.platform = platform
+    this.log = platform.log
+    this.disableDeviceLogging = platform.config.disableDeviceLogging
+    this.helpers = platform.helpers
+    this.S = platform.api.hap.Service
+    this.C = platform.api.hap.Characteristic
+    this.dName = accessory.displayName
+    this.accessory = accessory
+
+    this.service = this.accessory.getService(this.S.Lightbulb) || this.accessory.addService(this.S.Lightbulb)
+    this.service.getCharacteristic(this.C.On)
+      .on('set', this.internalOnOffUpdate.bind(this))
+    this.service.getCharacteristic(this.C.Brightness)
+      .on('set', this.internalBrightnessUpdate.bind(this))
+  }
+
+  async internalOnOffUpdate (value, callback) {
+    try {
+      callback()
+      await this.platform.sendDeviceUpdate(this.accessory, {
+        switch: value ? 'on' : 'off'
+      })
+      this.cacheOnOff = value ? 'on' : 'off'
+      if (!this.disableDeviceLogging) {
+        this.log('[%s] current state [%s].', this.dName, value ? 'on' : 'off')
+      }
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, true)
+    }
+  }
+
+  async internalBrightnessUpdate (value, callback) {
+    try {
+      callback()
+      /*
+      await this.platform.sendDeviceUpdate(this.accessory, {
+        switch: value ? 'on' : 'off'
+      })
+      this.cacheOnOff = value ? 'on' : 'off'
+      if (!this.disableDeviceLogging) {
+        this.log('[%s] current state [%s].', this.dName, value ? 'on' : 'off')
+      }
+      */
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, true)
+    }
+  }
+
+  async externalUpdate (params) {
+    try {
+      if (params.switch && params.switch !== this.cacheOnOff) {
+        this.cacheOnOff = params.switch
+        this.service.updateCharacteristic(this.C.On, this.cacheOnOff === 'on')
+        if (params.updateSource && !this.disableDeviceLogging) {
+          this.log('[%s] current state [%s].', this.dName, this.cacheOnOff)
+        }
+      }
+      if (this.helpers.hasProperty(params, 'brightness')) {
+        if (params.brightness !== this.cacheBrightness) {
+          this.cacheBrightness = params.brightness
+          this.service.updateCharacteristic(this.C.Brightness, this.cacheBrightness)
+          if (params.updateSource && !this.disableDeviceLogging) {
+            this.log('[%s] current brightness [%s%].', this.dName, this.cacheBrightness)
+          }
+        }
+      }
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, false)
+    }
+  }
+}
diff --git a/lib/device/zigbee/sensor-ambient.js b/lib/device/zigbee/sensor-ambient.js
new file mode 100644
index 00000000..e0660c61
--- /dev/null
+++ b/lib/device/zigbee/sensor-ambient.js
@@ -0,0 +1,69 @@
+/* jshint -W014, -W033, esversion: 9 */
+/* eslint-disable new-cap */
+'use strict'
+module.exports = class deviceZBSensorAmbient {
+  constructor (platform, accessory) {
+    this.platform = platform
+    this.log = platform.log
+    this.disableDeviceLogging = platform.config.disableDeviceLogging
+    this.helpers = platform.helpers
+    this.S = platform.api.hap.Service
+    this.C = platform.api.hap.Characteristic
+    this.dName = accessory.displayName
+    this.accessory = accessory
+
+    this.lowBattThreshold = parseInt(this.platform.config.lowBattThreshold)
+    this.lowBattThreshold = isNaN(this.lowBattThreshold) || this.lowBattThreshold < 5
+      ? this.helpers.defaults.lowBattThreshold
+      : this.lowBattThreshold
+
+    this.tService = this.accessory.getService(this.S.TemperatureSensor) || this.accessory.addService(this.S.TemperatureSensor)
+    this.tService.getCharacteristic(this.C.CurrentTemperature)
+      .setProps({ minValue: -100 })
+    this.hService = this.accessory.getService(this.S.HumiditySensor) || this.accessory.addService(this.S.HumiditySensor)
+    this.accessory.log = platform.config.debugFakegato ? this.log : () => {}
+    this.accessory.historyService = new this.platform.eveService('weather', this.accessory, {
+      storage: 'fs',
+      path: platform.eveLogPath
+    })
+    this.battService = this.accessory.getService(this.S.BatteryService) || this.accessory.addService(this.S.BatteryService)
+  }
+
+  async externalUpdate (params) {
+    try {
+      if (this.helpers.hasProperty(params, 'battery') && params.battery !== this.cacheBattery) {
+        this.cacheBattery = params.battery
+        this.battService.updateCharacteristic(this.C.BatteryLevel, this.cacheBattery)
+        this.battService.updateCharacteristic(this.C.StatusLowBattery, this.cacheBattery < this.lowBattThreshold)
+        if (params.updateSource && !this.disableDeviceLogging) {
+          this.log('[%s] current battery [%s%].', this.dName, this.cacheBattery)
+        }
+      }
+      const eveLog = {}
+      if (this.helpers.hasProperty(params, 'temperature') && params.temperature !== this.cacheTemp) {
+        this.cacheTemp = params.temperature
+        const currentTemp = parseInt(this.cacheTemp) / 100
+        this.tService.updateCharacteristic(this.C.CurrentTemperature, currentTemp)
+        eveLog.temp = currentTemp
+        if (params.updateSource && !this.disableDeviceLogging) {
+          this.log('[%s] current temperature [%s].', this.dName, currentTemp)
+        }
+      }
+      if (this.helpers.hasProperty(params, 'humidity') && params.humidity !== this.cacheHumi) {
+        this.cacheHumi = params.humidity
+        const currentHumi = parseInt(this.cacheHumi) / 100
+        this.hService.updateCharacteristic(this.C.CurrentRelativeHumidity, currentHumi)
+        eveLog.humidity = currentHumi
+        if (params.updateSource && !this.disableDeviceLogging) {
+          this.log('[%s] current humidity [%s].', this.dName, currentHumi)
+        }
+      }
+      if (eveLog.temp || eveLog.humidity) {
+        eveLog.time = Math.round(new Date().valueOf() / 1000)
+        this.accessory.historyService.addEntry(eveLog)
+      }
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, false)
+    }
+  }
+}
diff --git a/lib/device/zigbee/sensor-contact.js b/lib/device/zigbee/sensor-contact.js
new file mode 100644
index 00000000..ce277708
--- /dev/null
+++ b/lib/device/zigbee/sensor-contact.js
@@ -0,0 +1,73 @@
+/* jshint -W014, -W033, esversion: 9 */
+/* eslint-disable new-cap */
+'use strict'
+const util = require('util')
+module.exports = class deviceZBSensorContact {
+  constructor (platform, accessory) {
+    this.platform = platform
+    this.log = platform.log
+    this.disableDeviceLogging = platform.config.disableDeviceLogging
+    this.helpers = platform.helpers
+    this.S = platform.api.hap.Service
+    this.C = platform.api.hap.Characteristic
+    this.dName = accessory.displayName
+    this.accessory = accessory
+
+    const self = this
+    this.eveLastActivation = function () {
+      self.C.call(this, 'Last Activation', self.helpers.eveUUID.lastActivation)
+      this.setProps({
+        format: self.C.Formats.UINT32,
+        unit: self.C.Units.SECONDS,
+        perms: [self.C.Perms.READ, self.C.Perms.NOTIFY]
+      })
+      this.value = this.getDefaultValue()
+    }
+    util.inherits(this.eveLastActivation, this.C)
+    this.eveLastActivation.UUID = this.helpers.eveUUID.lastActivation
+    this.lowBattThreshold = parseInt(this.platform.config.lowBattThreshold)
+    this.lowBattThreshold = isNaN(this.lowBattThreshold) || this.lowBattThreshold < 5
+      ? this.helpers.defaults.lowBattThreshold
+      : this.lowBattThreshold
+
+    this.service = this.accessory.getService(this.S.ContactSensor) || this.accessory.addService(this.S.ContactSensor)
+    this.accessory.log = platform.config.debugFakegato ? this.log : () => {}
+    this.accessory.historyService = new this.platform.eveService('door', this.accessory, {
+      storage: 'fs',
+      path: platform.eveLogPath
+    })
+    this.battService = this.accessory.getService(this.S.BatteryService) || this.accessory.addService(this.S.BatteryService)
+  }
+
+  async externalUpdate (params) {
+    try {
+      if (this.helpers.hasProperty(params, 'battery') && params.battery !== this.cacheBattery) {
+        this.cacheBattery = params.battery
+        const scaledBatt = this.platform.config.ZBDWBatt ? this.cacheBattery * 10 : this.cacheBattery
+        this.battService.updateCharacteristic(this.C.BatteryLevel, scaledBatt)
+        this.battService.updateCharacteristic(this.C.StatusLowBattery, scaledBatt < this.lowBattThreshold)
+        if (params.updateSource && !this.disableDeviceLogging) {
+          this.log('[%s] current battery [%s%].', this.dName, scaledBatt)
+        }
+      }
+      if (this.helpers.hasProperty(params, 'lock') && [0, 1].includes(params.lock)) {
+        this.service.updateCharacteristic(this.C.ContactSensorState, params.lock)
+        if (params.lock === 1) {
+          this.service.updateCharacteristic(
+            this.eveLastActivation,
+            Math.round(new Date().valueOf() / 1000) - this.accessory.historyService.getInitialTime()
+          )
+        }
+        this.accessory.historyService.addEntry({
+          time: Math.round(new Date().valueOf() / 1000),
+          status: params.lock
+        })
+        if (params.updateSource && !this.disableDeviceLogging) {
+          this.log('[%s] current state [contact%s detected].', this.dName, params.lock === 0 ? '' : ' not')
+        }
+      }
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, false)
+    }
+  }
+}
diff --git a/lib/device/zigbee/sensor-motion.js b/lib/device/zigbee/sensor-motion.js
new file mode 100644
index 00000000..c76e4aaa
--- /dev/null
+++ b/lib/device/zigbee/sensor-motion.js
@@ -0,0 +1,79 @@
+/* jshint -W014, -W033, esversion: 9 */
+/* eslint-disable new-cap */
+'use strict'
+const util = require('util')
+module.exports = class deviceZBSensorMotion {
+  constructor (platform, accessory) {
+    this.platform = platform
+    this.log = platform.log
+    this.disableDeviceLogging = platform.config.disableDeviceLogging
+    this.helpers = platform.helpers
+    this.S = platform.api.hap.Service
+    this.C = platform.api.hap.Characteristic
+    this.dName = accessory.displayName
+    this.accessory = accessory
+
+    const self = this
+    this.eveLastActivation = function () {
+      self.C.call(this, 'Last Activation', self.helpers.eveUUID.lastActivation)
+      this.setProps({
+        format: self.C.Formats.UINT32,
+        unit: self.C.Units.SECONDS,
+        perms: [self.C.Perms.READ, self.C.Perms.NOTIFY]
+      })
+      this.value = this.getDefaultValue()
+    }
+    util.inherits(this.eveLastActivation, this.C)
+    this.eveLastActivation.UUID = this.helpers.eveUUID.lastActivation
+    this.lowBattThreshold = parseInt(this.platform.config.lowBattThreshold)
+    this.lowBattThreshold = isNaN(this.lowBattThreshold) || this.lowBattThreshold < 5
+      ? this.helpers.defaults.lowBattThreshold
+      : this.lowBattThreshold
+    this.sensorTimeDifference = parseInt(this.platform.config.sensorTimeDifference)
+    this.sensorTimeDifference = isNaN(this.sensorTimeDifference) || this.sensorTimeDifference < 10
+      ? this.helpers.defaults.sensorTimeDifference
+      : this.sensorTimeDifference
+
+    this.service = this.accessory.getService(this.S.MotionSensor) || this.accessory.addService(this.S.MotionSensor)
+    this.accessory.log = platform.config.debugFakegato ? this.log : () => {}
+    this.accessory.historyService = new this.platform.eveService('motion', this.accessory, {
+      storage: 'fs',
+      path: platform.eveLogPath
+    })
+    this.battService = this.accessory.getService(this.S.BatteryService) || this.accessory.addService(this.S.BatteryService)
+  }
+
+  async externalUpdate (params) {
+    try {
+      if (this.helpers.hasProperty(params, 'battery') && params.battery !== this.cacheBattery) {
+        this.cacheBattery = params.battery
+        this.battService.updateCharacteristic(this.C.BatteryLevel, this.cacheBattery)
+        this.battService.updateCharacteristic(this.C.StatusLowBattery, this.cacheBattery < this.lowBattThreshold)
+        if (params.updateSource && !this.disableDeviceLogging) {
+          this.log('[%s] current battery [%s%].', this.dName, this.cacheBattery)
+        }
+      }
+      if (this.helpers.hasProperty(params, 'motion') && this.helpers.hasProperty(params, 'trigTime')) {
+        const timeNow = new Date()
+        const diff = (timeNow.getTime() - params.trigTime) / 1000
+        const motionDetected = params.updateSource && params.motion === 1 && diff < this.sensorTimeDifference
+        this.service.updateCharacteristic(this.C.MotionDetected, motionDetected)
+        if (motionDetected) {
+          this.service.updateCharacteristic(
+            this.eveLastActivation,
+            Math.round(new Date().valueOf() / 1000) - this.accessory.historyService.getInitialTime()
+          )
+        }
+        this.accessory.historyService.addEntry({
+          time: Math.round(new Date().valueOf() / 1000),
+          status: motionDetected ? 1 : 0
+        })
+        if (params.updateSource && !this.disableDeviceLogging) {
+          this.log('[%s] current state [motion%s detected].', this.dName, motionDetected ? '' : ' not')
+        }
+      }
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, false)
+    }
+  }
+}
diff --git a/lib/device/zigbee/switch-single.js b/lib/device/zigbee/switch-single.js
new file mode 100644
index 00000000..a97cca44
--- /dev/null
+++ b/lib/device/zigbee/switch-single.js
@@ -0,0 +1,62 @@
+/* jshint -W014, -W033, esversion: 9 */
+/* eslint-disable new-cap */
+'use strict'
+module.exports = class deviceZBSwitchSingle {
+  constructor (platform, accessory) {
+    this.platform = platform
+    this.log = platform.log
+    this.disableDeviceLogging = platform.config.disableDeviceLogging
+    this.helpers = platform.helpers
+    this.S = platform.api.hap.Service
+    this.C = platform.api.hap.Characteristic
+    this.dName = accessory.displayName
+    this.accessory = accessory
+
+    this.service = this.accessory.getService(this.S.Switch) || this.accessory.addService(this.S.Switch)
+    this.accessory.log = platform.config.debugFakegato ? this.log : () => {}
+    this.accessory.historyService = new this.platform.eveService('switch', this.accessory, {
+      storage: 'fs',
+      path: platform.eveLogPath
+    })
+    this.service.getCharacteristic(this.C.On)
+      .on('set', this.internalUpdate.bind(this))
+  }
+
+  async internalUpdate (value, callback) {
+    try {
+      callback()
+      await this.platform.sendDeviceUpdate(this.accessory, {
+        switch: value ? 'on' : 'off'
+      })
+      this.cacheOnOff = value ? 'on' : 'off'
+      this.accessory.historyService.addEntry({
+        time: Math.round(new Date().valueOf() / 1000),
+        status: value ? 1 : 0
+      })
+      if (!this.disableDeviceLogging) {
+        this.log('[%s] current state [%s].', this.dName, value ? 'on' : 'off')
+      }
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, true)
+    }
+  }
+
+  async externalUpdate (params) {
+    try {
+      if (!params.switch || params.switch === this.cacheOnOff) {
+        return
+      }
+      this.cacheOnOff = params.switch
+      this.service.updateCharacteristic(this.C.On, this.cacheOnOff === 'on')
+      this.accessory.historyService.addEntry({
+        time: Math.round(new Date().valueOf() / 1000),
+        status: this.cacheOnOff === 'on' ? 1 : 0
+      })
+      if (params.updateSource && !this.disableDeviceLogging) {
+        this.log('[%s] current state [%s].', this.dName, this.cacheOnOff)
+      }
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, false)
+    }
+  }
+}
diff --git a/lib/device/zigbee/switch-stateless.js b/lib/device/zigbee/switch-stateless.js
new file mode 100644
index 00000000..88c2a476
--- /dev/null
+++ b/lib/device/zigbee/switch-stateless.js
@@ -0,0 +1,50 @@
+/* jshint -W014, -W033, esversion: 9 */
+/* eslint-disable new-cap */
+'use strict'
+module.exports = class deviceZBSwitchStateless {
+  constructor (platform, accessory) {
+    this.platform = platform
+    this.log = platform.log
+    this.disableDeviceLogging = platform.config.disableDeviceLogging
+    this.helpers = platform.helpers
+    this.S = platform.api.hap.Service
+    this.C = platform.api.hap.Characteristic
+    this.dName = accessory.displayName
+    this.accessory = accessory
+
+    this.lowBattThreshold = parseInt(this.platform.config.lowBattThreshold)
+    this.lowBattThreshold = isNaN(this.lowBattThreshold) || this.lowBattThreshold < 5
+      ? this.helpers.defaults.lowBattThreshold
+      : this.lowBattThreshold
+
+    const ssp = this.S.StatelessProgrammableSwitch
+    this.service = this.accessory.getService(ssp) || this.accessory.addService(ssp)
+    if (this.platform.config.hideZBLDPress) {
+      this.service.getCharacteristic(this.C.ProgrammableSwitchEvent)
+        .setProps({ validValues: [0] })
+    }
+    this.battService = this.accessory.getService(this.S.BatteryService) || this.accessory.addService(this.S.BatteryService)
+  }
+
+  async externalUpdate (params) {
+    try {
+      if (this.helpers.hasProperty(params, 'battery') && params.battery !== this.cacheBattery) {
+        this.cacheBattery = params.battery
+        this.battService.updateCharacteristic(this.C.BatteryLevel, this.cacheBattery)
+        this.battService.updateCharacteristic(this.C.StatusLowBattery, this.cacheBattery < this.lowBattThreshold)
+        if (params.updateSource && !this.disableDeviceLogging) {
+          this.log('[%s] current battery [%s%].', this.dName, params.battery)
+        }
+      }
+      if (this.helpers.hasProperty(params, 'key') && [0, 1, 2].includes(params.key)) {
+        this.service.updateCharacteristic(this.C.ProgrammableSwitchEvent, params.key)
+        if (params.updateSource && !this.disableDeviceLogging) {
+          const textLabel = params.key === 0 ? 'single' : (params.key === 1 ? 'double' : 'long')
+          this.log('[%s] current state [%s press].', this.dName, textLabel)
+        }
+      }
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, false)
+    }
+  }
+}
diff --git a/lib/index.js b/lib/index.js
index b6b8d7c9..559a7aa9 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -521,15 +521,60 @@ class eWeLinkPlatform {
         ************/
         return
         /***********/
-      } else if (this.helpers.devicesZB.includes(device.extra.uiid)) {
-        /****************
-        ZIGBEE SUBDEVICES
-        ****************/
+      } else if (this.helpers.devicesZBSwitchStateless.includes(device.extra.uiid)) {
+        /**********************
+        ZIGBEE STATELESS SWITCH
+        **********************/
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
           : this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require('./device/zb-dev'))(this, accessory)
-        /***************/
+        accessory.control = new (require('./device/zigbee/switch-stateless'))(this, accessory)
+        /*********************/
+      } else if (this.helpers.devicesZBSwitchSingle.includes(device.extra.uiid)) {
+        /***************
+        ZB SINGLE SWITCH
+        ***************/
+        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
+          ? this.devicesInHB.get(device.deviceid + 'SWX')
+          : this.addAccessory(device, device.deviceid + 'SWX')
+        accessory.control = new (require('./device/zigbee/switch-single'))(this, accessory)
+        /**************/
+      } else if (this.helpers.devicesZBLightDimmer.includes(device.extra.uiid)) {
+        /*****************
+        ZB LIGHTS [DIMMER]
+        *****************/
+        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
+          ? this.devicesInHB.get(device.deviceid + 'SWX')
+          : this.addAccessory(device, device.deviceid + 'SWX')
+        accessory.control = new (require('./device/zigbee/light-dimmer'))(this, accessory)
+        /****************/
+      } else if (this.helpers.devicesZBSensorAmbient.includes(device.extra.uiid)) {
+        /******************
+        ZB SENSOR [AMBIENT]
+        ******************/
+        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
+          ? this.devicesInHB.get(device.deviceid + 'SWX')
+          : this.addAccessory(device, device.deviceid + 'SWX')
+        accessory.control = new (require('./device/zigbee/sensor-ambient'))(this, accessory)
+        /*****************/
+      } else if (this.helpers.devicesZBSensorMotion.includes(device.extra.uiid)) {
+        /*****************
+        ZB SENSOR [MOTION]
+        *****************/
+        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
+          ? this.devicesInHB.get(device.deviceid + 'SWX')
+          : this.addAccessory(device, device.deviceid + 'SWX')
+        accessory.control = new (require('./device/zigbee/sensor-motion'))(this, accessory)
+        /****************/
+      } else if (this.helpers.devicesZBSensorContact.includes(device.extra.uiid)) {
+        /******************
+        ZB SENSOR [CONTACT]
+        ******************/
+        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
+          ? this.devicesInHB.get(device.deviceid + 'SWX')
+          : this.addAccessory(device, device.deviceid + 'SWX')
+        accessory.control = new (require('./device/zigbee/sensor-contact'))(this, accessory)
+        /*****************/
       } else if (this.helpers.devicesCamera.includes(device.extra.uiid)) {
         /*************
         SONOFF CAMERAS
diff --git a/lib/utils/helpers.js b/lib/utils/helpers.js
index e9ee4b37..05ec15f2 100644
--- a/lib/utils/helpers.js
+++ b/lib/utils/helpers.js
@@ -46,7 +46,12 @@ module.exports = {
   devicesSCM: [78],
   devicesRFBridge: [28],
   devicesZBBridge: [66],
-  devicesZB: [1000, 1009, 1256, 1257, 1770, 2026, 3026],
+  devicesZBSwitchStateless: [1000],
+  devicesZBSwitchSingle: [1009, 1256],
+  devicesZBLightDimmer: [1257],
+  devicesZBSensorAmbient: [1770],
+  devicesZBSensorMotion: [2026],
+  devicesZBSensorContact: [3026],
   paramsToKeep: [
     'battery', 'bright', 'brightness',
     'channel', 'cmd', 'color', 'colorB',

From a7cfbc705d9a0fd9e9da4daf4e94b106075c85cb Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 30 Jan 2021 11:43:33 +0000
Subject: [PATCH 1268/3183] 4.5.2-3

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 54608d1e..3d3abea2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.5.2-2",
+  "version": "4.5.2-3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index ec3de264..5a48c5bb 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "4.5.2-2",
+  "version": "4.5.2-3",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 081c755fb9f74cb214593435dc6191e23b397852 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 30 Jan 2021 11:53:11 +0000
Subject: [PATCH 1269/3183] zb bulb brightness

---
 lib/device/zigbee/light-dimmer.js | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/lib/device/zigbee/light-dimmer.js b/lib/device/zigbee/light-dimmer.js
index 86093776..f0fa448e 100644
--- a/lib/device/zigbee/light-dimmer.js
+++ b/lib/device/zigbee/light-dimmer.js
@@ -36,16 +36,25 @@ module.exports = class deviceZBLightDimmer {
 
   async internalBrightnessUpdate (value, callback) {
     try {
+      if (this.cacheBrightness === value) {
+        callback()
+        return
+      }
+      this.cacheBrightness = value
       callback()
-      /*
-      await this.platform.sendDeviceUpdate(this.accessory, {
-        switch: value ? 'on' : 'off'
-      })
-      this.cacheOnOff = value ? 'on' : 'off'
+      const params = {
+        brightness: this.cacheBrightness
+      }
+      const updateKey = Math.random().toString(36).substr(2, 8)
+      this.updateKeyBright = updateKey
+      await this.helpers.sleep(500)
+      if (updateKey !== this.updateKeyBright) {
+        return
+      }
+      await this.platform.sendDeviceUpdate(this.accessory, params)
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current state [%s].', this.dName, value ? 'on' : 'off')
+        this.log('[%s] current brightness [%s%].', this.dName, this.cacheBrightness)
       }
-      */
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
     }

From b6017e409a51ccbd8bf9ff71d3910d317777f250 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 30 Jan 2021 12:02:42 +0000
Subject: [PATCH 1270/3183] 4.5.2-4

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 3d3abea2..91a76beb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.5.2-3",
+  "version": "4.5.2-4",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 5a48c5bb..c2b6a289 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "4.5.2-3",
+  "version": "4.5.2-4",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From f0d849513f3302b84239a30afc39e3c2a3578c41 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 30 Jan 2021 12:23:08 +0000
Subject: [PATCH 1271/3183] needs switch?

---
 lib/device/zigbee/light-dimmer.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/device/zigbee/light-dimmer.js b/lib/device/zigbee/light-dimmer.js
index f0fa448e..6ff64d6d 100644
--- a/lib/device/zigbee/light-dimmer.js
+++ b/lib/device/zigbee/light-dimmer.js
@@ -43,6 +43,7 @@ module.exports = class deviceZBLightDimmer {
       this.cacheBrightness = value
       callback()
       const params = {
+        switch: value > 0 ? 'on' : 'off',
         brightness: this.cacheBrightness
       }
       const updateKey = Math.random().toString(36).substr(2, 8)

From 4fbe40bde3b28783dd9b0793d2f5a3e015f94aa6 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 30 Jan 2021 12:25:51 +0000
Subject: [PATCH 1272/3183] 4.5.2-5

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 91a76beb..7fc76cdc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.5.2-4",
+  "version": "4.5.2-5",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index c2b6a289..6cdcb0a4 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "4.5.2-4",
+  "version": "4.5.2-5",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From b3b9f81595db4b852e7d0bed25e0b70f7239e49d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 30 Jan 2021 12:38:10 +0000
Subject: [PATCH 1273/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 05d2db5a..f5a6fbda 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,7 +6,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 ### New
 
-* Initial support for the Zigbee white bulb
+* Support for the Zigbee type white bulb
 * **[Experimental]** Expose a TH10/16 device as a fully working thermostat accessory
 
 ### Changes

From d19c59b60579ebde851f07898c8e4b28ca19efb5 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 30 Jan 2021 12:38:14 +0000
Subject: [PATCH 1274/3183] Update light-dimmer.js

---
 lib/device/zigbee/light-dimmer.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/device/zigbee/light-dimmer.js b/lib/device/zigbee/light-dimmer.js
index 6ff64d6d..74d2d4cf 100644
--- a/lib/device/zigbee/light-dimmer.js
+++ b/lib/device/zigbee/light-dimmer.js
@@ -43,7 +43,7 @@ module.exports = class deviceZBLightDimmer {
       this.cacheBrightness = value
       callback()
       const params = {
-        switch: value > 0 ? 'on' : 'off',
+        switch: 'on',
         brightness: this.cacheBrightness
       }
       const updateKey = Math.random().toString(36).substr(2, 8)

From 2b4adb24bb49e4d40b9c087a97e546ecaebe95b2 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 30 Jan 2021 12:38:42 +0000
Subject: [PATCH 1275/3183] 4.5.2-6

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 7fc76cdc..135c40f0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.5.2-5",
+  "version": "4.5.2-6",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 6cdcb0a4..78a180e1 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "4.5.2-5",
+  "version": "4.5.2-6",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 050c9393a7421aac4dea8c2bf1f0f8ab27dcdd5d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 30 Jan 2021 12:47:33 +0000
Subject: [PATCH 1276/3183] Update light-dimmer.js

---
 lib/device/zigbee/light-dimmer.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/device/zigbee/light-dimmer.js b/lib/device/zigbee/light-dimmer.js
index 74d2d4cf..929426a2 100644
--- a/lib/device/zigbee/light-dimmer.js
+++ b/lib/device/zigbee/light-dimmer.js
@@ -36,7 +36,7 @@ module.exports = class deviceZBLightDimmer {
 
   async internalBrightnessUpdate (value, callback) {
     try {
-      if (this.cacheBrightness === value) {
+      if (this.cacheBrightness === value || value === 0) {
         callback()
         return
       }

From aae4f10b91b1f3c782fa5eddffa124596e32fa4a Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 30 Jan 2021 12:48:00 +0000
Subject: [PATCH 1277/3183] 4.5.2-7

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 135c40f0..3000313b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.5.2-6",
+  "version": "4.5.2-7",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 78a180e1..702b0613 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "4.5.2-6",
+  "version": "4.5.2-7",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From e876525040f67976ad8bbcf5e0e61644b6b24855 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 30 Jan 2021 13:06:57 +0000
Subject: [PATCH 1278/3183] increase timeout for lan only

---
 lib/connection/lan.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/connection/lan.js b/lib/connection/lan.js
index 2fc07457..9fbdc699 100644
--- a/lib/connection/lan.js
+++ b/lib/connection/lan.js
@@ -7,6 +7,7 @@ module.exports = class connectionLAN {
     this.log = platform.log
     this.helpers = platform.helpers
     this.debug = platform.config.debug
+    this.mode = platform.mode
     this.ipOverride = platform.ipOverride
     this.deviceMap = new Map()
     this.crypto = require('crypto')
@@ -172,7 +173,7 @@ module.exports = class connectionLAN {
           'Content-Type': 'application/json'
         },
         data,
-        timeout: 3000
+        timeout: this.mode === 'lan' 10000 : 3000
       })
 
       // *** Check for any errors in the response *** \\

From c4ef853db6421d22b966e89fb2e0c35af0f651c8 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 30 Jan 2021 13:07:50 +0000
Subject: [PATCH 1279/3183] Update lan.js

---
 lib/connection/lan.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/connection/lan.js b/lib/connection/lan.js
index 9fbdc699..d41afdd2 100644
--- a/lib/connection/lan.js
+++ b/lib/connection/lan.js
@@ -6,7 +6,7 @@ module.exports = class connectionLAN {
     // *** Set up our variables *** \\
     this.log = platform.log
     this.helpers = platform.helpers
-    this.debug = platform.config.debug
+    this.debug = platform.debug
     this.mode = platform.mode
     this.ipOverride = platform.ipOverride
     this.deviceMap = new Map()

From 9ce2e60e4214a57f02084bcaf3d0dacd904d3c09 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 30 Jan 2021 13:14:06 +0000
Subject: [PATCH 1280/3183] show lan errors

---
 lib/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/index.js b/lib/index.js
index 559a7aa9..782a014f 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -779,7 +779,7 @@ class eWeLinkPlatform {
         }
         await this.wsClient.sendUpdate(payload)
       } else {
-        throw new Error('it is unreachable')
+        throw new Error('it is unreachable [' + res + ']')
       }
     }
   }

From ad0888c85c520658108e7bc0f4a9c1953107ff14 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 30 Jan 2021 13:14:52 +0000
Subject: [PATCH 1281/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f5a6fbda..e31d60b7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,8 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 ### Changes
 
 * Updated plugin-ui-utils dep and use new method to get cached accessories
+* Increase the timeout for LAN control to 10 seconds for LAN only settings
+* Show LAN update errors in the log
 
 ## 4.5.1 (2021-01-28)
 

From e43b4f587614577a73784f9d317e91806e49f202 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 30 Jan 2021 13:15:22 +0000
Subject: [PATCH 1282/3183] 4.5.2-8

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 3000313b..5041db68 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.5.2-7",
+  "version": "4.5.2-8",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 702b0613..1f39c808 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "4.5.2-7",
+  "version": "4.5.2-8",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From f73dff1301c0064bce1d217a6d6018ed9f8503f7 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 30 Jan 2021 13:21:38 +0000
Subject: [PATCH 1283/3183] syntax fix

---
 lib/connection/lan.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/connection/lan.js b/lib/connection/lan.js
index d41afdd2..779ea219 100644
--- a/lib/connection/lan.js
+++ b/lib/connection/lan.js
@@ -173,7 +173,7 @@ module.exports = class connectionLAN {
           'Content-Type': 'application/json'
         },
         data,
-        timeout: this.mode === 'lan' 10000 : 3000
+        timeout: this.mode === 'lan' ? 10000 : 3000
       })
 
       // *** Check for any errors in the response *** \\

From dbbf1c3cb52c49229afa6b3721345fb08a50308e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 30 Jan 2021 13:22:29 +0000
Subject: [PATCH 1284/3183] 4.5.2-9

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 5041db68..4cba12e6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.5.2-8",
+  "version": "4.5.2-9",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 1f39c808..cc9b0970 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "4.5.2-8",
+  "version": "4.5.2-9",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 6709be626e859cb4576d6021b1cb9ecf71bf86e1 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 30 Jan 2021 13:28:08 +0000
Subject: [PATCH 1285/3183] only show lan generated error

---
 lib/index.js | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/lib/index.js b/lib/index.js
index 782a014f..f9204b68 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -763,11 +763,14 @@ class eWeLinkPlatform {
       params
     }
 
+    const errorOne = 'LAN mode is disabled'
+    const errorTwo = 'LAN mode is not supported for this device'
+
     // *** Quick check to see if LAN mode is supported *** \\
     const res = !this.lanClient
-      ? 'LAN mode is disabled'
+      ? errorOne
       : !this.helpers.devicesLAN.includes(accessory.context.eweUIID)
-        ? 'LAN mode is not supported for this device'
+        ? errorTwo
         : await this.lanClient.sendUpdate(payload)
 
     // *** Revert to WS if LAN mode not possible for whatever reason *** \\
@@ -779,7 +782,11 @@ class eWeLinkPlatform {
         }
         await this.wsClient.sendUpdate(payload)
       } else {
-        throw new Error('it is unreachable [' + res + ']')
+        throw new Error(
+          [errorOne, errorTwo].includes(res)
+            ? 'it is unreachable'
+            : 'it is unreachable [' + res + ']'
+        )
       }
     }
   }

From 7726bddb858af5e09c19cc8aab1773dcb0216bf6 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 30 Jan 2021 13:41:53 +0000
Subject: [PATCH 1286/3183] require once

---
 lib/connection/lan.js | 3 ++-
 lib/connection/ws.js  | 9 ++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/lib/connection/lan.js b/lib/connection/lan.js
index 779ea219..bd1d0f42 100644
--- a/lib/connection/lan.js
+++ b/lib/connection/lan.js
@@ -10,6 +10,7 @@ module.exports = class connectionLAN {
     this.mode = platform.mode
     this.ipOverride = platform.ipOverride
     this.deviceMap = new Map()
+    this.axios = require('axios')
     this.crypto = require('crypto')
     this.dns = require('node-dns-sd')
     this.emitter = new (require('events'))()
@@ -165,7 +166,7 @@ module.exports = class connectionLAN {
       }
 
       // *** Send the HTTP request *** \\
-      const res = await (require('axios'))({
+      const res = await this.axios({
         method: 'post',
         url: 'http://' + this.deviceMap.get(json.deviceid).ip + ':8081/zeroconf/' + suffix,
         headers: {
diff --git a/lib/connection/ws.js b/lib/connection/ws.js
index 4c45b29f..2d1ad4eb 100644
--- a/lib/connection/ws.js
+++ b/lib/connection/ws.js
@@ -9,12 +9,15 @@ module.exports = class connectionWS {
     this.httpHost = authData.httpHost
     this.aToken = authData.aToken
     this.apiKey = authData.apiKey
+    this.axios = require('axios')
     this.emitter = new (require('events'))()
+    this.ws = require('ws')
+    this.wsp = require('websocket-as-promised')
   }
 
   async getHost () {
     try {
-      const res = await (require('axios'))({
+      const res = await this.axios({
         method: 'post',
         url: 'https://' + this.httpHost.replace('-api', '-disp') + '/dispatch/app',
         headers: {
@@ -48,10 +51,10 @@ module.exports = class connectionWS {
   }
 
   login () {
-    this.wsp = new (require('websocket-as-promised'))(
+    this.wsp = new this.wsp(
       'wss://' + this.wsHost + ':8080/api/ws',
       {
-        createWebSocket: url => new (require('ws'))(url),
+        createWebSocket: url => new this.ws(url),
         extractMessageData: event => event,
         attachRequestId: (data, requestId) => Object.assign({ sequence: requestId }, data),
         extractRequestId: data => data && data.sequence,

From 6c5f6241882f020ed0175bc1e636e958f987698f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 30 Jan 2021 13:49:10 +0000
Subject: [PATCH 1287/3183] util

---
 lib/device/outlet.js                | 12 ++++++------
 lib/device/rf-bridge.js             |  4 ++--
 lib/device/sensor.js                |  4 ++--
 lib/device/zigbee/sensor-contact.js |  4 ++--
 lib/device/zigbee/sensor-motion.js  |  4 ++--
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/lib/device/outlet.js b/lib/device/outlet.js
index ead8ee1a..a812945e 100644
--- a/lib/device/outlet.js
+++ b/lib/device/outlet.js
@@ -1,7 +1,6 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
-const util = require('util')
 module.exports = class deviceOutlet {
   constructor (platform, accessory) {
     this.platform = platform
@@ -17,6 +16,7 @@ module.exports = class deviceOutlet {
     this.inUsePowerThreshold = isNaN(this.inUsePowerThreshold) || this.inUsePowerThreshold < 0
       ? this.helpers.defaults.inUsePowerThreshold
       : this.inUsePowerThreshold
+    this.inherits = require('util').inherits
     const self = this
     this.eveCurrentConsumption = function () {
       self.C.call(this, 'Current Consumption', self.helpers.eveUUID.currentConsumption)
@@ -74,11 +74,11 @@ module.exports = class deviceOutlet {
       })
       this.value = this.getDefaultValue()
     }
-    util.inherits(this.eveCurrentConsumption, this.C)
-    util.inherits(this.eveTotalConsumption, this.C)
-    util.inherits(this.eveVoltage, this.C)
-    util.inherits(this.eveElectricCurrent, this.C)
-    util.inherits(this.eveResetTotal, this.C)
+    this.inherits(this.eveCurrentConsumption, this.C)
+    this.inherits(this.eveTotalConsumption, this.C)
+    this.inherits(this.eveVoltage, this.C)
+    this.inherits(this.eveElectricCurrent, this.C)
+    this.inherits(this.eveResetTotal, this.C)
     this.eveCurrentConsumption.UUID = this.helpers.eveUUID.currentConsumption
     this.eveTotalConsumption.UUID = this.helpers.eveUUID.totalConsumption
     this.eveVoltage.UUID = this.helpers.eveUUID.voltage
diff --git a/lib/device/rf-bridge.js b/lib/device/rf-bridge.js
index 8961c088..ef7a657e 100644
--- a/lib/device/rf-bridge.js
+++ b/lib/device/rf-bridge.js
@@ -1,7 +1,6 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
-const util = require('util')
 module.exports = class deviceRFBridge {
   constructor (platform, accessory) {
     this.platform = platform
@@ -13,6 +12,7 @@ module.exports = class deviceRFBridge {
     this.dName = accessory.displayName
     this.accessory = accessory
 
+    this.inherits = require('util').inherits
     const self = this
     this.eveLastActivation = function () {
       self.C.call(this, 'Last Activation', self.helpers.eveUUID.lastActivation)
@@ -23,7 +23,7 @@ module.exports = class deviceRFBridge {
       })
       this.value = this.getDefaultValue()
     }
-    util.inherits(this.eveLastActivation, this.C)
+    this.inherits(this.eveLastActivation, this.C)
     this.eveLastActivation.UUID = this.helpers.eveUUID.lastActivation
     this.sensorTimeDifference = parseInt(this.platform.config.sensorTimeDifference)
     this.sensorTimeDifference = isNaN(this.sensorTimeDifference) || this.sensorTimeDifference < 10
diff --git a/lib/device/sensor.js b/lib/device/sensor.js
index b7401000..5b1efcc0 100644
--- a/lib/device/sensor.js
+++ b/lib/device/sensor.js
@@ -1,7 +1,6 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
-const util = require('util')
 module.exports = class deviceSensor {
   constructor (platform, accessory) {
     this.platform = platform
@@ -13,6 +12,7 @@ module.exports = class deviceSensor {
     this.dName = accessory.displayName
     this.accessory = accessory
 
+    this.inherits = require('util').inherits
     const self = this
     this.eveLastActivation = function () {
       self.C.call(this, 'Last Activation', self.helpers.eveUUID.lastActivation)
@@ -23,7 +23,7 @@ module.exports = class deviceSensor {
       })
       this.value = this.getDefaultValue()
     }
-    util.inherits(this.eveLastActivation, this.C)
+    this.inherits(this.eveLastActivation, this.C)
     this.eveLastActivation.UUID = this.helpers.eveUUID.lastActivation
     this.lowBattThreshold = parseInt(this.platform.config.lowBattThreshold)
     this.lowBattThreshold = isNaN(this.lowBattThreshold) || this.lowBattThreshold < 5
diff --git a/lib/device/zigbee/sensor-contact.js b/lib/device/zigbee/sensor-contact.js
index ce277708..9cb43aa9 100644
--- a/lib/device/zigbee/sensor-contact.js
+++ b/lib/device/zigbee/sensor-contact.js
@@ -1,7 +1,6 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
-const util = require('util')
 module.exports = class deviceZBSensorContact {
   constructor (platform, accessory) {
     this.platform = platform
@@ -13,6 +12,7 @@ module.exports = class deviceZBSensorContact {
     this.dName = accessory.displayName
     this.accessory = accessory
 
+    this.inherits = require('util').inherits
     const self = this
     this.eveLastActivation = function () {
       self.C.call(this, 'Last Activation', self.helpers.eveUUID.lastActivation)
@@ -23,7 +23,7 @@ module.exports = class deviceZBSensorContact {
       })
       this.value = this.getDefaultValue()
     }
-    util.inherits(this.eveLastActivation, this.C)
+    this.inherits(this.eveLastActivation, this.C)
     this.eveLastActivation.UUID = this.helpers.eveUUID.lastActivation
     this.lowBattThreshold = parseInt(this.platform.config.lowBattThreshold)
     this.lowBattThreshold = isNaN(this.lowBattThreshold) || this.lowBattThreshold < 5
diff --git a/lib/device/zigbee/sensor-motion.js b/lib/device/zigbee/sensor-motion.js
index c76e4aaa..a68a35da 100644
--- a/lib/device/zigbee/sensor-motion.js
+++ b/lib/device/zigbee/sensor-motion.js
@@ -1,7 +1,6 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
-const util = require('util')
 module.exports = class deviceZBSensorMotion {
   constructor (platform, accessory) {
     this.platform = platform
@@ -13,6 +12,7 @@ module.exports = class deviceZBSensorMotion {
     this.dName = accessory.displayName
     this.accessory = accessory
 
+    this.inherits = require('util').inherits
     const self = this
     this.eveLastActivation = function () {
       self.C.call(this, 'Last Activation', self.helpers.eveUUID.lastActivation)
@@ -23,7 +23,7 @@ module.exports = class deviceZBSensorMotion {
       })
       this.value = this.getDefaultValue()
     }
-    util.inherits(this.eveLastActivation, this.C)
+    this.inherits(this.eveLastActivation, this.C)
     this.eveLastActivation.UUID = this.helpers.eveUUID.lastActivation
     this.lowBattThreshold = parseInt(this.platform.config.lowBattThreshold)
     this.lowBattThreshold = isNaN(this.lowBattThreshold) || this.lowBattThreshold < 5

From e6a3ac744eebd0dd7225b67c25ce828776908870 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 30 Jan 2021 13:49:15 +0000
Subject: [PATCH 1288/3183] formatting

---
 lib/homebridge-ui/server.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/lib/homebridge-ui/server.js b/lib/homebridge-ui/server.js
index 7c17fb02..f28e8cbd 100644
--- a/lib/homebridge-ui/server.js
+++ b/lib/homebridge-ui/server.js
@@ -30,6 +30,4 @@ class PluginUiServer extends HomebridgePluginUiServer {
   }
 }
 
-(() => {
-  return new PluginUiServer()
-})()
+(() => new PluginUiServer())()

From 467818e4a1591499dc61e7f299d5ad7ca5fbc800 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 30 Jan 2021 15:23:48 +0000
Subject: [PATCH 1289/3183] thermostat AS

---
 config.schema.json                            |  12 +-
 .../{th-outlet.js => sensor-ambient.js}       |   2 +-
 lib/device/{sensor.js => sensor-contact.js}   |   2 +-
 .../thermostat.js}                            | 132 +++++++++---------
 lib/index.js                                  |  29 ++--
 lib/utils/helpers.js                          |   5 +-
 6 files changed, 98 insertions(+), 84 deletions(-)
 rename lib/device/{th-outlet.js => sensor-ambient.js} (99%)
 rename lib/device/{sensor.js => sensor-contact.js} (98%)
 rename lib/device/{th-thermo.js => simulation/thermostat.js} (61%)

diff --git a/config.schema.json b/config.schema.json
index 61394e40..32679c0f 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -107,11 +107,6 @@
         "title": "Hide TH10/16 Switches",
         "description": "A list of TH10/TH16 devices for which the switch will be hidden. For example 10009553c8 or multiple separated by a comma."
       },
-      "thAsThermostat": {
-        "type": "string",
-        "title": "TH As Thermostat",
-        "description": "A list of TH10/TH16 devices to show as thermostats. For example 10009553c8 or multiple separated by a comma."
-      },
       "thTempOffset": {
         "type": "array",
         "items": {
@@ -174,6 +169,12 @@
               "title": "Type",
               "description": "The new type for this device.",
               "oneOf": [
+                {
+                  "title": "1 Thermostat (using TH10/16)",
+                  "enum": [
+                    "thermostat"
+                  ]
+                },
                 {
                   "title": "1 Garage Door",
                   "enum": [
@@ -431,7 +432,6 @@
         "inUsePowerThreshold",
         "hideLightFromFan",
         "hideSwitchFromTH",
-        "thAsThermostat",
         "resetRFBridge",
         "lowBattThreshold",
         "sensorTimeDifference"
diff --git a/lib/device/th-outlet.js b/lib/device/sensor-ambient.js
similarity index 99%
rename from lib/device/th-outlet.js
rename to lib/device/sensor-ambient.js
index 9963c4d5..38f03c71 100644
--- a/lib/device/th-outlet.js
+++ b/lib/device/sensor-ambient.js
@@ -1,7 +1,7 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
-module.exports = class deviceTHOutlet {
+module.exports = class deviceSensorAmbient {
   constructor (platform, accessory) {
     this.platform = platform
     this.log = platform.log
diff --git a/lib/device/sensor.js b/lib/device/sensor-contact.js
similarity index 98%
rename from lib/device/sensor.js
rename to lib/device/sensor-contact.js
index 5b1efcc0..07642200 100644
--- a/lib/device/sensor.js
+++ b/lib/device/sensor-contact.js
@@ -1,7 +1,7 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
-module.exports = class deviceSensor {
+module.exports = class deviceSensorContact {
   constructor (platform, accessory) {
     this.platform = platform
     this.log = platform.log
diff --git a/lib/device/th-thermo.js b/lib/device/simulation/thermostat.js
similarity index 61%
rename from lib/device/th-thermo.js
rename to lib/device/simulation/thermostat.js
index 9fec5ad6..a954caca 100644
--- a/lib/device/th-thermo.js
+++ b/lib/device/simulation/thermostat.js
@@ -1,7 +1,7 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
-module.exports = class deviceTHThermo {
+module.exports = class deviceThermostat {
   constructor (platform, accessory) {
     this.platform = platform
     this.log = platform.log
@@ -22,8 +22,8 @@ module.exports = class deviceTHThermo {
     if (this.accessory.getService(this.S.HumiditySensor)) {
       this.accessory.removeService(this.accessory.getService(this.S.HumiditySensor))
     }
-    if (!this.helpers.hasProperty(this.accessory.context, 'cacheHeatingTarget')) {
-      this.accessory.context.cacheHeatingTarget = 16
+    if (!this.helpers.hasProperty(this.accessory.context, 'cacheTarget')) {
+      this.accessory.context.cacheTarget = 20
     }
     this.service = this.accessory.getService(this.S.Thermostat) || this.accessory.addService(this.S.Thermostat)
     this.service.getCharacteristic(this.C.CurrentTemperature)
@@ -45,39 +45,60 @@ module.exports = class deviceTHThermo {
       this.service.addCharacteristic(this.C.CurrentRelativeHumidity)
     }
 
-    // *** BETA *** \\
-    this.service.updateCharacteristic(this.C.CurrentTemperature, 16)
-    this.service.updateCharacteristic(this.C.TargetTemperature, 20)
-    // *** END BETA *** \\
+    /*
+    The eWeLink app seems a little confusing with only options for
+      - if temp is HIGHER THAN    eg 20.0 TURN ON/OFF
+      - if temp is LOWER THAN     eg 20.0 TURN ON/OFF
+    There doesn't seem to be an option for IS EQUAL TO but I assume the ON/OFF doesn't change from the previous state
+
+    The payload for automatic mode is as follows:
+
+    "deviceType": "temperature",
+    "targets": [
+      {
+        "targetHigh": "19.6",
+        "reaction": {
+          "switch": "off"
+        }
+      },
+      {
+        "targetLow": "19.6",
+        "reaction": {
+          "switch": "on"
+        }
+      }
+    ]
+    */
 
     this.accessory.log = platform.config.debugFakegato ? this.log : () => {}
     this.accessory.historyService = new this.platform.eveService('custom', this.accessory, {
       storage: 'fs',
       path: platform.eveLogPath
     })
+
+    // *** Setting this already makes the plugin send the payload to setup as thermostat *** \\
+    this.service.setCharacteristic(this.C.TargetTemperature, this.accessory.context.cacheTarget)
   }
 
   async internalOnOffUpdate (value, callback) {
     try {
       callback()
-      this.log('[%s] setting TargetHeatingCoolingState to %s.', this.dName, value)
       const params = {}
       if (value === 0) {
-        // *** Has been turned off *** \\
-        params.mainswitch = 'off'
+        params.mainSwitch = 'off'
         params.switch = 'off'
       } else {
-        params.mainswitch = 'on'
-        params.switch = this.service.getCharacteristic(this.C.CurrentTemperature).value < this.accessory.context.cacheHeatingTarget
-          ? 'on'
-          : 'off'
+        params.mainSwitch = 'on'
       }
       this.cacheOnOff = value !== 0 ? 'on' : 'off'
-      this.cacheIsHeating = params.switch
-      this.service.updateCharacteristic(this.C.CurrentHeatingCoolingState, this.cacheIsHeating === 'on' ? 1 : 0)
+      const currentTemp = this.service.getCharacteristic(this.C.CurrentTemperature).value
+      this.cacheHeating = this.cacheOnOff === 'on' && currentTemp < this.accessory.context.cacheTarget
+        ? 'on'
+        : 'off'
+      this.service.updateCharacteristic(this.C.CurrentHeatingCoolingState, this.cacheHeating === 'on' ? 1 : 0)
       await this.platform.sendDeviceUpdate(this.accessory, params)
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current state [%s] heating [%s].', this.dName, this.cacheOnOff, this.cacheIsHeating)
+        this.log('[%s] current state [%s] heating [%s].', this.dName, this.cacheOnOff, this.cacheHeating)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
@@ -86,48 +107,33 @@ module.exports = class deviceTHThermo {
 
   async internalTargetTempUpdate (value, callback) {
     try {
-      this.log('[%s] setting TargetTemperature to %s.', this.dName, value)
       callback()
-      this.accessory.context.cacheHeatingTarget = value
+      this.accessory.context.cacheTarget = value
       this.cacheOnOff = 'on'
-      this.cacheIsHeating = this.service.getCharacteristic(this.C.CurrentTemperature).value < value
+      this.cacheHeating = this.service.getCharacteristic(this.C.CurrentTemperature).value < value
         ? 'on'
         : 'off'
       const params = {
-        mainswitch: this.cacheOnOff,
-        switch: this.cacheIsHeating
+        deviceType: 'temperature',
+        targets: [
+          {
+            targetHigh: value.toFixed(1),
+            reaction: {
+              switch: 'off'
+            }
+          },
+          {
+            targetLow: value.toFixed(1),
+            reaction: {
+              switch: 'on'
+            }
+          }
+        ]
       }
-      this.service.updateCharacteristic(this.C.CurrentHeatingCoolingState, this.cacheIsHeating === 'on' ? 1 : 0)
+      this.service.updateCharacteristic(this.C.CurrentHeatingCoolingState, this.cacheHeating === 'on' ? 1 : 0)
       await this.platform.sendDeviceUpdate(this.accessory, params)
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current state [%s] heating [%s].', this.dName, this.cacheOnOff, this.cacheIsHeating)
-      }
-    } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
-    }
-  }
-
-  async internalCurrentTempUpdate (value) {
-    try {
-      const params = {}
-      this.log('[%s] internalCurrentTempUpdate() %s.', this.dName, value)
-      // *** Logic for checking the new current temperature against the target temperature *** \\
-      if (this.service.getCharacteristic(this.C.TargetHeatingCoolingState).value !== 0) {
-        // *** Thermostat is on so compare temperatures *** \\
-        if (this.cacheTemp < this.accessory.context.cacheHeatingTarget && this.cacheIsHeating !== 'on') {
-          this.cacheIsHeating = 'on'
-          params.switch = this.cacheIsHeating
-          this.service.updateCharacteristic(this.C.CurrentHeatingCoolingState, this.cacheIsHeating === 'on' ? 1 : 0)
-          await this.platform.sendDeviceUpdate(this.accessory, params)
-        } else if (this.cacheTemp < this.accessory.context.cacheHeatingTarget && this.cacheIsHeating !== 'off') {
-          this.cacheIsHeating = 'off'
-          params.switch = this.cacheIsHeating
-          this.service.updateCharacteristic(this.C.CurrentHeatingCoolingState, this.cacheIsHeating === 'on' ? 1 : 0)
-          await this.platform.sendDeviceUpdate(this.accessory, params)
-        }
-        if (!this.disableDeviceLogging) {
-          this.log('[%s] current state [%s] heating [%s].', this.dName, this.cacheOnOff, this.cacheIsHeating)
-        }
+        this.log('[%s] current state [%s] heating [%s].', this.dName, this.cacheOnOff, this.cacheHeating)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
@@ -136,30 +142,29 @@ module.exports = class deviceTHThermo {
 
   async externalUpdate (params) {
     try {
-      if (params.mainswitch) {
-        const newState = params.mainswitch
+      if (params.mainSwitch) {
+        const newState = params.mainSwitch
         if (this.cacheOnOff !== newState) {
           this.cacheOnOff = newState
-          this.service.updateCharacteristic(this.C.TargetHeatingCoolingState, this.cacheOnOff === 'on' ? 0 : 1)
+          this.service.updateCharacteristic(this.C.TargetHeatingCoolingState, this.cacheOnOff === 'on' ? 1 : 0)
           this.accessory.historyService.addEntry({
             time: Math.round(new Date().valueOf() / 1000),
             status: this.cacheOnOff === 'on' ? 1 : 0
           })
           if (this.cacheOnOff === 'off') {
-            this.cacheIsHeating = 'off'
+            this.cacheHeating = 'off'
           }
-          // if (params.updateSource && !this.disableDeviceLogging && !params.switch) {
-          if (!this.disableDeviceLogging && !params.switch) {
+          if (params.updateSource && !this.disableDeviceLogging && !params.switch) {
             this.log('[%s] current state [%s].', this.dName, this.cacheOnOff)
           }
         }
       }
-      if (params.switch) {
-        // if (params.updateSource && !this.disableDeviceLogging) {
-        if (!this.disableDeviceLogging) {
+      if (params.switch && params.switch !== this.cacheHeating) {
+        this.cacheHeating = params.switch
+        this.service.updateCharacteristic(this.C.CurrentHeatingCoolingState, params.switch === 'on' ? 1 : 0)
+        if (params.updateSource && !this.disableDeviceLogging) {
           this.log('[%s] current state [%s] heating [%s].', this.dName, this.cacheOnOff, params.switch)
         }
-        this.cacheIsHeating = params.switch
       }
       const eveLog = {}
       if (this.helpers.hasProperty(params, 'currentTemperature') && params.currentTemperature !== 'unavailable') {
@@ -168,11 +173,9 @@ module.exports = class deviceTHThermo {
         if (this.cacheTemp !== currentTemp) {
           this.cacheTemp = currentTemp
           this.service.updateCharacteristic(this.C.CurrentTemperature, this.cacheTemp)
-          // if (params.updateSource && !this.disableDeviceLogging) {
           if (params.updateSource && !this.disableDeviceLogging) {
             this.log('[%s] current temperature [%s].', this.dName, this.cacheTemp)
           }
-          this.internalCurrentTempUpdate(this.cacheTemp)
         }
       }
       if (
@@ -185,8 +188,7 @@ module.exports = class deviceTHThermo {
         if (this.cacheHumi !== currentHumi) {
           this.cacheHumi = currentHumi
           this.service.updateCharacteristic(this.C.CurrentRelativeHumidity, this.cacheHumi)
-          // if (params.updateSource && !this.disableDeviceLogging) {
-          if (!this.disableDeviceLogging) {
+          if (params.updateSource && !this.disableDeviceLogging) {
             this.log('[%s] current humidity [%s%].', this.dName, this.cacheHumi)
           }
         }
diff --git a/lib/index.js b/lib/index.js
index f9204b68..f2a2ae29 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -300,7 +300,7 @@ class eWeLinkPlatform {
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
           : this.addAccessory(device, device.deviceid + 'SWX', false, { type: 'sensor' })
-        accessory.control = new (require('./device/sensor'))(this, accessory)
+        accessory.control = new (require('./device/sensor-contact'))(this, accessory)
         /******************/
       } else if (this.helpers.devicesFan.includes(device.extra.uiid)) {
         /***
@@ -320,17 +320,28 @@ class eWeLinkPlatform {
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/diffuser'))(this, accessory)
         /*******/
+      } else if (
+        this.cusG.has(device.deviceid) &&
+        this.cusG.get(device.deviceid).type === 'thermostat' &&
+        this.helpers.devicesThermostat.includes(device.extra.uiid)
+      ) {
+        /*********************************
+        THERMOSTATS [ACCESSORY SIMULATION]
+        *********************************/
+        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
+          ? this.devicesInHB.get(device.deviceid + 'SWX')
+          : this.addAccessory(device, device.deviceid + 'SWX')
+        accessory.control = new (require('./device/simulation/thermostat'))(this, accessory)
+        /********************************/
       } else if (this.helpers.devicesThermostat.includes(device.extra.uiid)) {
-        /********************
-        THERMOSTATS [TH10/16]
-        ********************/
+        /***********************
+        SENSOR [AMBIENT-TH10/16]
+        ***********************/
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
           : this.addAccessory(device, device.deviceid + 'SWX', false, { sensorType: device.params.sensorType })
-        accessory.control = (this.config.thAsThermostat || '').split(',').includes(device.deviceid)
-          ? new (require('./device/th-thermo'))(this, accessory)
-          : new (require('./device/th-outlet'))(this, accessory)
-        /*******************/
+        accessory.control = new (require('./device/sensor-ambient'))(this, accessory)
+        /**********************/
       } else if (
         this.helpers.devicesOutlet.includes(device.extra.uiid) ||
         (this.helpers.devicesSingleSwitch.includes(device.extra.uiid) && this.helpers.devicesSingleSwitchOutlet.includes(device.productModel))
@@ -640,7 +651,7 @@ class eWeLinkPlatform {
       const errToShow = this.debug
         ? ':\n' + err
         : ' ' + err.message + (err.lineNumber ? ' [line ' + err.lineNumber + '].' : '')
-      this.log.warn('[%s] could not be initialised as %s.', device.name, errToShow)
+      this.log.warn('[%s] could not be initialised as%s', device.name, errToShow)
     }
   }
 
diff --git a/lib/utils/helpers.js b/lib/utils/helpers.js
index 05ec15f2..6555592f 100644
--- a/lib/utils/helpers.js
+++ b/lib/utils/helpers.js
@@ -17,8 +17,9 @@ module.exports = {
   httpRetryCodes: ['ENOTFOUND', 'ETIMEDOUT', 'EAI_AGAIN'],
   allowedGroups: [
     'blind', 'garage', 'garage_two', 'garage_four',
-    'garage_eachen', 'lock', 'tap', 'tap_two',
-    'switch_valve', 'valve', 'valve_two', 'valve_four'
+    'garage_eachen', 'lock', 'switch_valve', 'tap',
+    'tap_two', 'thermostat', 'valve', 'valve_two',
+    'valve_four'
   ],
   defaults: {
     inUsePowerThreshold: 0,

From d213abed86af9976559e2a0b7f74b2bb2afc3ab0 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 30 Jan 2021 15:26:14 +0000
Subject: [PATCH 1290/3183] labels

---
 config.schema.json | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 32679c0f..bf94e751 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -170,79 +170,79 @@
               "description": "The new type for this device.",
               "oneOf": [
                 {
-                  "title": "1 Thermostat (using TH10/16)",
+                  "title": "1 Thermostat (w/ TH10/16)",
                   "enum": [
                     "thermostat"
                   ]
                 },
                 {
-                  "title": "1 Garage Door",
+                  "title": "1 Garage Door (w/ single or multi-channel device)",
                   "enum": [
                     "garage"
                   ]
                 },
                 {
-                  "title": "1 Garage Door (using Eachen GD-DC5)",
+                  "title": "1 Garage Door (w/ Eachen GD-DC5)",
                   "enum": [
                     "garage_eachen"
                   ]
                 },
                 {
-                  "title": "2 Garage Doors (using multi-channel device)",
+                  "title": "2 Garage Doors (w/ multi-channel device)",
                   "enum": [
                     "garage_two"
                   ]
                 },
                 {
-                  "title": "4 Garage Doors (using multi-channel device)",
+                  "title": "4 Garage Doors (w/ multi-channel device)",
                   "enum": [
                     "garage_four"
                   ]
                 },
                 {
-                  "title": "1 Window Blind (using multi-channel device)",
+                  "title": "1 Window Blind (w/ multi-channel device)",
                   "enum": [
                     "blind"
                   ]
                 },
                 {
-                  "title": "1 Lock",
+                  "title": "1 Lock (w/ single or multi-channel device)",
                   "enum": [
                     "lock"
                   ]
                 },
                 {
-                  "title": "1 Tap/Faucet",
+                  "title": "1 Tap/Faucet (w/ single or multi-channel device)",
                   "enum": [
                     "tap"
                   ]
                 },
                 {
-                  "title": "2 Taps/Faucets (using multi-channel device)",
+                  "title": "2 Taps/Faucets (w/ multi-channel device)",
                   "enum": [
                     "tap_two"
                   ]
                 },
                 {
-                  "title": "1 Irrigation Valve",
+                  "title": "1 Irrigation Valve (w/ single or multi-channel device)",
                   "enum": [
                     "valve"
                   ]
                 },
                 {
-                  "title": "2 Irrigation Valves (using multi-channel device)",
+                  "title": "2 Irrigation Valves (w/ multi-channel device)",
                   "enum": [
                     "valve_two"
                   ]
                 },
                 {
-                  "title": "4 Irrigation Valves (using multi-channel device)",
+                  "title": "4 Irrigation Valves (w/ multi-channel device)",
                   "enum": [
                     "valve_four"
                   ]
                 },
                 {
-                  "title": "1 Switch & 1 Valve (using multi-channel device)",
+                  "title": "1 Switch & 1 Valve (w/ multi-channel device)",
                   "enum": [
                     "switch_valve"
                   ]

From 63765045349886546ce2e7b2d3efebc964197305 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 30 Jan 2021 15:28:56 +0000
Subject: [PATCH 1291/3183] 4.5.2-10

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 4cba12e6..dc077bac 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.5.2-9",
+  "version": "4.5.2-10",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index cc9b0970..3d44c178 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "4.5.2-9",
+  "version": "4.5.2-10",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From c034d35d2502843643bfa1b1e8b2f45b259668e1 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 30 Jan 2021 15:29:51 +0000
Subject: [PATCH 1292/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e31d60b7..752f5f6d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,7 +7,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 ### New
 
 * Support for the Zigbee type white bulb
-* **[Experimental]** Expose a TH10/16 device as a fully working thermostat accessory
+* **[Experimental]** Use a TH10/16 device as a thermostat using an Accessory Simulation
 
 ### Changes
 

From 39dcdcc8a415d74f9958be0c7bb1ed95802f2171 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 30 Jan 2021 16:21:10 +0000
Subject: [PATCH 1293/3183] unnecessary toFixed

---
 lib/device/sensor-ambient.js        | 2 +-
 lib/device/simulation/thermostat.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/device/sensor-ambient.js b/lib/device/sensor-ambient.js
index 38f03c71..ca8ffe37 100644
--- a/lib/device/sensor-ambient.js
+++ b/lib/device/sensor-ambient.js
@@ -79,7 +79,7 @@ module.exports = class deviceSensorAmbient {
       }
       const eveLog = {}
       if (this.helpers.hasProperty(params, 'currentTemperature') && params.currentTemperature !== 'unavailable') {
-        const currentTemp = (parseFloat(params.currentTemperature) + this.tempOffset).toFixed(1)
+        const currentTemp = parseFloat(params.currentTemperature) + this.tempOffset
         eveLog.temp = currentTemp
         if (this.cacheTemp !== currentTemp) {
           this.cacheTemp = currentTemp
diff --git a/lib/device/simulation/thermostat.js b/lib/device/simulation/thermostat.js
index a954caca..4b05ef6b 100644
--- a/lib/device/simulation/thermostat.js
+++ b/lib/device/simulation/thermostat.js
@@ -168,7 +168,7 @@ module.exports = class deviceThermostat {
       }
       const eveLog = {}
       if (this.helpers.hasProperty(params, 'currentTemperature') && params.currentTemperature !== 'unavailable') {
-        const currentTemp = (parseFloat(params.currentTemperature) + this.tempOffset).toFixed(1)
+        const currentTemp = parseFloat(params.currentTemperature) + this.tempOffset
         eveLog.temp = currentTemp
         if (this.cacheTemp !== currentTemp) {
           this.cacheTemp = currentTemp

From b08a43566af5e38210941f8e327718057ab1fa57 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 30 Jan 2021 17:28:20 +0000
Subject: [PATCH 1294/3183] use Number

---
 lib/device/sensor-ambient.js        | 2 +-
 lib/device/simulation/thermostat.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/device/sensor-ambient.js b/lib/device/sensor-ambient.js
index ca8ffe37..67dcdee2 100644
--- a/lib/device/sensor-ambient.js
+++ b/lib/device/sensor-ambient.js
@@ -79,7 +79,7 @@ module.exports = class deviceSensorAmbient {
       }
       const eveLog = {}
       if (this.helpers.hasProperty(params, 'currentTemperature') && params.currentTemperature !== 'unavailable') {
-        const currentTemp = parseFloat(params.currentTemperature) + this.tempOffset
+        const currentTemp = Number(params.currentTemperature) + this.tempOffset
         eveLog.temp = currentTemp
         if (this.cacheTemp !== currentTemp) {
           this.cacheTemp = currentTemp
diff --git a/lib/device/simulation/thermostat.js b/lib/device/simulation/thermostat.js
index 4b05ef6b..00588d0f 100644
--- a/lib/device/simulation/thermostat.js
+++ b/lib/device/simulation/thermostat.js
@@ -168,7 +168,7 @@ module.exports = class deviceThermostat {
       }
       const eveLog = {}
       if (this.helpers.hasProperty(params, 'currentTemperature') && params.currentTemperature !== 'unavailable') {
-        const currentTemp = parseFloat(params.currentTemperature) + this.tempOffset
+        const currentTemp = Number(params.currentTemperature) + this.tempOffset
         eveLog.temp = currentTemp
         if (this.cacheTemp !== currentTemp) {
           this.cacheTemp = currentTemp

From b6b1ddf295945b58bcd35034332f5175f1affe3b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 30 Jan 2021 17:36:31 +0000
Subject: [PATCH 1295/3183] revert change

---
 lib/connection/ws.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/connection/ws.js b/lib/connection/ws.js
index 2d1ad4eb..ba580302 100644
--- a/lib/connection/ws.js
+++ b/lib/connection/ws.js
@@ -12,7 +12,6 @@ module.exports = class connectionWS {
     this.axios = require('axios')
     this.emitter = new (require('events'))()
     this.ws = require('ws')
-    this.wsp = require('websocket-as-promised')
   }
 
   async getHost () {
@@ -51,7 +50,7 @@ module.exports = class connectionWS {
   }
 
   login () {
-    this.wsp = new this.wsp(
+    this.wsp = new (require('websocket-as-promised'))(
       'wss://' + this.wsHost + ':8080/api/ws',
       {
         createWebSocket: url => new this.ws(url),

From 3e792cd8d32361ec0c02529b262a373501b45ec5 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 30 Jan 2021 17:36:34 +0000
Subject: [PATCH 1296/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 752f5f6d..4e3f2fba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,12 +2,12 @@
 
 All notable changes to this homebridge-ewelink will be documented in this file.
 
-## BETA
+## 4.6.0
 
 ### New
 
+* **[Experimental]** Use a TH10/16 device as a thermostat using an Accessory Simulation [more info](https://github.com/bwp91/homebridge-ewelink/issues/161#issuecomment-770230157)
 * Support for the Zigbee type white bulb
-* **[Experimental]** Use a TH10/16 device as a thermostat using an Accessory Simulation
 
 ### Changes
 

From 56b803e6dc7bb3415981e4f8b6235c920d1961c7 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 30 Jan 2021 18:26:56 +0000
Subject: [PATCH 1297/3183] require once

---
 lib/connection/ws.js | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/lib/connection/ws.js b/lib/connection/ws.js
index ba580302..4cf2d424 100644
--- a/lib/connection/ws.js
+++ b/lib/connection/ws.js
@@ -12,6 +12,7 @@ module.exports = class connectionWS {
     this.axios = require('axios')
     this.emitter = new (require('events'))()
     this.ws = require('ws')
+    this.wsp = require('websocket-as-promised')
   }
 
   async getHost () {
@@ -50,7 +51,7 @@ module.exports = class connectionWS {
   }
 
   login () {
-    this.wsp = new (require('websocket-as-promised'))(
+    this.wsClient = new this.wsp(
       'wss://' + this.wsHost + ':8080/api/ws',
       {
         createWebSocket: url => new this.ws(url),
@@ -61,8 +62,8 @@ module.exports = class connectionWS {
         unpackMessage: data => data === 'pong' ? data : JSON.parse(data)
       }
     )
-    this.wsp.open()
-    this.wsp.onOpen.addListener(async () => {
+    this.wsClient.open()
+    this.wsClient.onOpen.addListener(async () => {
       this.wsIsOpen = true
       const sequence = Math.floor(new Date()).toString()
       const payload = {
@@ -80,14 +81,14 @@ module.exports = class connectionWS {
         this.log('Sending WS login request.')
       }
       try {
-        const res = await this.wsp.sendRequest(payload, { requestId: sequence })
+        const res = await this.wsClient.sendRequest(payload, { requestId: sequence })
         if (res.config && res.config.hb && res.config.hbInterval) {
           if (this.hbInterval) {
             clearInterval(this.hbInterval)
           }
           this.hbInterval = setInterval(() => {
             try {
-              this.wsp.send('ping')
+              this.wsClient.send('ping')
             } catch (err) {
               if (this.debug) {
                 this.log.warn('Error sending ping - %.', err.message)
@@ -104,7 +105,7 @@ module.exports = class connectionWS {
         this.log.warn('WS login failed as%s', errToShow)
       }
     })
-    this.wsp.onUnpackedMessage.addListener(device => {
+    this.wsClient.onUnpackedMessage.addListener(device => {
       if (device === 'pong') {
         return
       }
@@ -155,13 +156,13 @@ module.exports = class connectionWS {
         this.log.warn('WS unknown command received.\n', JSON.stringify(device, null, 2))
       }
     })
-    this.wsp.onClose.addListener(async e => {
+    this.wsClient.onClose.addListener(async e => {
       this.wsIsOpen = false
       if (this.hbInterval) {
         clearInterval(this.hbInterval)
         this.hbInterval = null
       }
-      this.wsp.removeAllListeners()
+      this.wsClient.removeAllListeners()
       if (e === 1005) {
         return
       }
@@ -172,13 +173,13 @@ module.exports = class connectionWS {
       await this.helpers.sleep(5000)
       await this.login()
     })
-    this.wsp.onError.addListener(async e => {
+    this.wsClient.onError.addListener(async e => {
       this.wsIsOpen = false
       if (this.hbInterval) {
         clearInterval(this.hbInterval)
         this.hbInterval = null
       }
-      this.wsp.removeAllListeners()
+      this.wsClient.removeAllListeners()
       if (this.debug) {
         this.log.warn('Web socket error - %s.', e)
         this.log.warn('Web socket will try to reconnect in five seconds.')
@@ -199,9 +200,9 @@ module.exports = class connectionWS {
         userAgent: 'app'
       }
     }
-    if (this.wsp && this.wsIsOpen) {
+    if (this.wsClient && this.wsIsOpen) {
       try {
-        const device = await this.wsp.sendRequest(jsonToSend, { requestId: sequence })
+        const device = await this.wsClient.sendRequest(jsonToSend, { requestId: sequence })
         device.error = this.helpers.hasProperty(device, 'error') ? device.error : 504
         switch (device.error) {
           case 0:
@@ -236,8 +237,8 @@ module.exports = class connectionWS {
     if (this.debug) {
       this.log('[%s] requesting current status.', accessory.displayName)
     }
-    if (this.wsp && this.wsIsOpen) {
-      this.wsp.send(JSON.stringify(json))
+    if (this.wsClient && this.wsIsOpen) {
+      this.wsClient.send(JSON.stringify(json))
     } else {
       this.log.warn('[%s] request will be sent when WS has reconnected.', accessory.displayName)
       await this.helpers.sleep(30000)
@@ -250,8 +251,8 @@ module.exports = class connectionWS {
   }
 
   async closeConnection () {
-    if (this.wsp && this.wsIsOpen) {
-      await this.wsp.close()
+    if (this.wsClient && this.wsIsOpen) {
+      await this.wsClient.close()
       if (this.debug) {
         this.log('Web socket gracefully closed.')
       }

From b13374a4bd58e4b316024709c61afd69ad8b6c72 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 30 Jan 2021 18:28:59 +0000
Subject: [PATCH 1298/3183] show temp units

---
 lib/device/sensor-ambient.js        | 2 +-
 lib/device/simulation/thermostat.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/device/sensor-ambient.js b/lib/device/sensor-ambient.js
index 67dcdee2..ac27ea06 100644
--- a/lib/device/sensor-ambient.js
+++ b/lib/device/sensor-ambient.js
@@ -85,7 +85,7 @@ module.exports = class deviceSensorAmbient {
           this.cacheTemp = currentTemp
           this.tempService.updateCharacteristic(this.C.CurrentTemperature, this.cacheTemp)
           if (params.updateSource && !this.disableDeviceLogging) {
-            this.log('[%s] current temperature [%s].', this.dName, this.cacheTemp)
+            this.log('[%s] current temperature [%s°C].', this.dName, this.cacheTemp)
           }
         }
       }
diff --git a/lib/device/simulation/thermostat.js b/lib/device/simulation/thermostat.js
index 00588d0f..250c45ab 100644
--- a/lib/device/simulation/thermostat.js
+++ b/lib/device/simulation/thermostat.js
@@ -174,7 +174,7 @@ module.exports = class deviceThermostat {
           this.cacheTemp = currentTemp
           this.service.updateCharacteristic(this.C.CurrentTemperature, this.cacheTemp)
           if (params.updateSource && !this.disableDeviceLogging) {
-            this.log('[%s] current temperature [%s].', this.dName, this.cacheTemp)
+            this.log('[%s] current temperature [%s°C].', this.dName, this.cacheTemp)
           }
         }
       }

From 5f0d9ac9c1106415527a9bfd7a622c358e6426e0 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 30 Jan 2021 18:30:28 +0000
Subject: [PATCH 1299/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4e3f2fba..f93c65ca 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 All notable changes to this homebridge-ewelink will be documented in this file.
 
-## 4.6.0
+## 4.6.0 (2021-01-30)
 
 ### New
 
@@ -26,7 +26,8 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 ## 4.5.0 (2021-01-28)
 
 ### New
-* **[Experimental]** Use a switch to control the `Obstruction Detected` feature of a garage door
+
+* Use a switch to control the `Obstruction Detected` feature of a garage door
 
 ### Changes
 

From 0c1c1a7871cabad50dfc07a712131048ec6a46ae Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 30 Jan 2021 18:32:45 +0000
Subject: [PATCH 1300/3183] 4.6.0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index dc077bac..15a8a7cd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.5.2-10",
+  "version": "4.6.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 3d44c178..2ea2c8c1 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "4.5.2-10",
+  "version": "4.6.0",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 7e45c3882a0aabdf2afa39467ba92f2eaa5e3b2b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 31 Jan 2021 19:33:49 +0000
Subject: [PATCH 1301/3183] reorder AS

---
 config.schema.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index bf94e751..a2232bd8 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -176,15 +176,15 @@
                   ]
                 },
                 {
-                  "title": "1 Garage Door (w/ single or multi-channel device)",
+                  "title": "1 Garage Door (w/ Eachen GD-DC5)",
                   "enum": [
-                    "garage"
+                    "garage_eachen"
                   ]
                 },
                 {
-                  "title": "1 Garage Door (w/ Eachen GD-DC5)",
+                  "title": "1 Garage Door (w/ single or multi-channel device)",
                   "enum": [
-                    "garage_eachen"
+                    "garage"
                   ]
                 },
                 {

From 9dab4767b0e196249baeb725f18444350d32c287 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 31 Jan 2021 22:44:39 +0000
Subject: [PATCH 1302/3183] log ws refresh

---
 lib/index.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/index.js b/lib/index.js
index f2a2ae29..6cfd45e0 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -128,6 +128,9 @@ class eWeLinkPlatform {
       if (this.wsClient) {
         this.wsRefresh = setInterval(async () => {
           try {
+            if (this.debug) {
+              this.log('Refreshing WS connection...')
+            }
             await this.wsClient.getHost()
             await this.wsClient.closeConnection()
             await this.helpers.sleep(250)

From 136cb433928cb3066e56aadc8e4db721da98e375 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 31 Jan 2021 23:00:19 +0000
Subject: [PATCH 1303/3183] Update ws.js

---
 lib/connection/ws.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/connection/ws.js b/lib/connection/ws.js
index 4cf2d424..b752cd4f 100644
--- a/lib/connection/ws.js
+++ b/lib/connection/ws.js
@@ -95,6 +95,9 @@ module.exports = class connectionWS {
               }
             }
           }, (res.config.hbInterval + 7) * 1000)
+          if (this.debug) {
+            this.log('WS login successful.')
+          }
         } else {
           throw new Error('Unknown parameters received\n' + JSON.stringify(res, null, 2))
         }

From e541511cf44196007de7c598936909aab985ee79 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 1 Feb 2021 17:03:23 +0000
Subject: [PATCH 1304/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f93c65ca..316a5229 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 All notable changes to this homebridge-ewelink will be documented in this file.
 
+## BETA
+
+### Changes
+
+* Extra debug logging for ws reconnection status
+
 ## 4.6.0 (2021-01-30)
 
 ### New

From cb4b42c75d0804091413c75ed54ff922796a3e3a Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 1 Feb 2021 17:03:56 +0000
Subject: [PATCH 1305/3183] deps

---
 package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 15a8a7cd..913d92cc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -101,9 +101,9 @@
       "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg=="
     },
     "is-callable": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.2.tgz",
-      "integrity": "sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA=="
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.3.tgz",
+      "integrity": "sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ=="
     },
     "is-date-object": {
       "version": "1.0.2",

From 2b042f25d14883a4178ec735c9c674359c1bd14e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 1 Feb 2021 17:04:29 +0000
Subject: [PATCH 1306/3183] 4.6.1-0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 913d92cc..ed4c4b14 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.6.0",
+  "version": "4.6.1-0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 2ea2c8c1..4de7e9d3 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "4.6.0",
+  "version": "4.6.1-0",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 5bd9f84549f4311b95a3bcf8291a293493ed60f0 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 2 Feb 2021 19:44:20 +0000
Subject: [PATCH 1307/3183] deps

---
 package-lock.json | 13 +++++++------
 package.json      |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ed4c4b14..6a266f50 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -111,10 +111,11 @@
       "integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g=="
     },
     "is-regex": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.1.tgz",
-      "integrity": "sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.2.tgz",
+      "integrity": "sha512-axvdhb5pdhEVThqJzYXwMlVuZwC+FF2DpcOhTS+y/8jVq4trxyPgfcwIxIKiyeuLlSQYKkmUaPQJ8ZE4yNKXDg==",
       "requires": {
+        "call-bind": "^1.0.2",
         "has-symbols": "^1.0.1"
       }
     },
@@ -196,9 +197,9 @@
       }
     },
     "ws": {
-      "version": "7.4.2",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.2.tgz",
-      "integrity": "sha512-T4tewALS3+qsrpGI/8dqNMLIVdq/g/85U98HPMa6F0m6xTbvhXU6RCQLqPH3+SlomNV/LdY6RXEbBpMH6EOJnA=="
+      "version": "7.4.3",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.3.tgz",
+      "integrity": "sha512-hr6vCR76GsossIRsr8OLR9acVVm1jyfEWvhbNjtgPOrfvAlKzvyeg/P6r8RuDjRyrcQoPQT7K0DGEPc7Ae6jzA=="
     }
   }
 }
diff --git a/package.json b/package.json
index 4de7e9d3..deaf4e86 100644
--- a/package.json
+++ b/package.json
@@ -51,7 +51,7 @@
     "axios": "^0.21.1",
     "node-dns-sd": "^0.4.2",
     "websocket-as-promised": "^1.1.0",
-    "ws": "^7.4.2"
+    "ws": "^7.4.3"
   },
   "standard": {
     "ignore": [

From 557d7b6f686647a9261569986f0a8521d7bb77fa Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 2 Feb 2021 19:44:22 +0000
Subject: [PATCH 1308/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 316a5229..0f6d4cad 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,7 +6,8 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 ### Changes
 
-* Extra debug logging for ws reconnection status
+* Extra debug logging for WS reconnection status
+* Updated `ws` dependency to v7.4.3
 
 ## 4.6.0 (2021-01-30)
 

From 9c18bc79f3a88c3be4e213edc2af6d4c64530df1 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 2 Feb 2021 19:46:23 +0000
Subject: [PATCH 1309/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0f6d4cad..fedff052 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 All notable changes to this homebridge-ewelink will be documented in this file.
 
-## BETA
+## 4.6.1 (2021-02-02)
 
 ### Changes
 

From 4569ea6d44f64222589b1d887a5ea44b828670f7 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 2 Feb 2021 19:46:51 +0000
Subject: [PATCH 1310/3183] 4.6.1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 6a266f50..1e9434e5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.6.1-0",
+  "version": "4.6.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index deaf4e86..6b1bab6f 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "4.6.1-0",
+  "version": "4.6.1",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From df80488ea01779dd31f73ed8d70f56bf5fe845fe Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 3 Feb 2021 16:46:47 +0000
Subject: [PATCH 1311/3183] deps

---
 package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 1e9434e5..c84349b0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -78,9 +78,9 @@
       "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
     },
     "get-intrinsic": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.0.tgz",
-      "integrity": "sha512-M11rgtQp5GZMZzDL7jLTNxbDfurpzuau5uqRWDPvlHjfvg3TdScAZo96GLvhMjImrmR8uAt0FS2RLoMrfWGKlg==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz",
+      "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==",
       "requires": {
         "function-bind": "^1.1.1",
         "has": "^1.0.3",

From abd5d1b5b4ae20936caacbab8e7531e0c3f910b2 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 3 Feb 2021 17:00:56 +0000
Subject: [PATCH 1312/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fedff052..7d0048f2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,13 @@
 
 All notable changes to this homebridge-ewelink will be documented in this file.
 
+## BETA
+
+### Changes
+
+* Updated dependencies
+
+
 ## 4.6.1 (2021-02-02)
 
 ### Changes

From d5d48be2445c645c1e1758292dcdc3c134b7a9c3 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 3 Feb 2021 17:01:36 +0000
Subject: [PATCH 1313/3183] 4.6.2-0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c84349b0..b37ca490 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.6.1",
+  "version": "4.6.2-0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 6b1bab6f..4eea5659 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "4.6.1",
+  "version": "4.6.2-0",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 4089c4c017e406b566306f5b36dd53dab637e31f Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Wed, 3 Feb 2021 19:48:17 +0000
Subject: [PATCH 1314/3183] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index f03b29bc..6d2ef6c1 100644
--- a/README.md
+++ b/README.md
@@ -31,9 +31,9 @@ Homebridge plugin to control eWeLink devices with original firmware
 ### Setup
 * [Installation (Homebridge)](https://github.com/bwp91/homebridge-ewelink/wiki/Installation-(Homebridge))
 * [Installation (HOOBS)](https://github.com/bwp91/homebridge-ewelink/wiki/Installation-(HOOBS))
-* [Configuration](https://github.com/bwp91/homebridge-ewelink/wiki/Configuration)
 
 ### Features
+* [Configuration](https://github.com/bwp91/homebridge-ewelink/wiki/Configuration)
 * [Supported Devices](https://github.com/bwp91/homebridge-ewelink/wiki/Supported-Devices)
 * [Multi Channel Devices](https://github.com/bwp91/homebridge-ewelink/wiki/Multi-Channel-Devices)
 * [Accessory Simulations](https://github.com/bwp91/homebridge-ewelink/wiki/Accessory-Simulations)

From ece9747e338f1436e27f2f0088e5f4bc20c59ba3 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 3 Feb 2021 19:49:59 +0000
Subject: [PATCH 1315/3183] configuration link + formatting

---
 lib/homebridge-ui/public/index.html | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/lib/homebridge-ui/public/index.html b/lib/homebridge-ui/public/index.html
index f955c2b6..c74e9b40 100644
--- a/lib/homebridge-ui/public/index.html
+++ b/lib/homebridge-ui/public/index.html
@@ -73,25 +73,26 @@
   <p class="text-center">The links below will take you to our GitHub wiki</p>
   <h4>Features</h4>
   <ul>
-  <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/Supported-Devices" target="_blank">Supported Devices</a></li>
-  <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/Multi-Channel-Devices" target="_blank">Multi Channel Devices</a></li>
-  <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/Accessory-Simulations" target="_blank">Accessory Simulations</a></li>
-  <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/Connection-Methods" target="_blank">Connection Methods</a></li>
+    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/Configuration" target="_blank">Configuration</a></li>
+    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/Supported-Devices" target="_blank">Supported Devices</a></li>
+    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/Multi-Channel-Devices" target="_blank">Multi Channel Devices</a></li>
+    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/Accessory-Simulations" target="_blank">Accessory Simulations</a></li>
+    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/Connection-Methods" target="_blank">Connection Methods</a></li>
   </ul>
   <h4>How-to Guides</h4>
   <ul>
-  <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/How-to-set-up-RF-Bridge-sensors" target="_blank">How to set up RF Bridge sensors</a></li>
-  <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/How-to-set-up-Sonoff-Camera" target="_blank">How to set up Sonoff Camera (GK-200MP2-B)</a></li>
-  <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/How-to-copy-Homebridge-logs" target="_blank">How to copy Homebridge logs</a></li>
-  <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/How-to-enable-disable-plugin-extended-logging" target="_blank">How to enable/disable plugin extended logging</a></li>
-  <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/How-to-remove-an-accessory-from-the-cache" target="_blank">How to remove an accessory from the cache</a></li>
-  <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/How-to-update-node" target="_blank">How to update node</a></li>
+    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/How-to-set-up-RF-Bridge-sensors" target="_blank">How to set up RF Bridge sensors</a></li>
+    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/How-to-set-up-Sonoff-Camera" target="_blank">How to set up Sonoff Camera (GK-200MP2-B)</a></li>
+    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/How-to-copy-Homebridge-logs" target="_blank">How to copy Homebridge logs</a></li>
+    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/How-to-enable-disable-plugin-extended-logging" target="_blank">How to enable/disable plugin extended logging</a></li>
+    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/How-to-remove-an-accessory-from-the-cache" target="_blank">How to remove an accessory from the cache</a></li>
+    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/How-to-update-node" target="_blank">How to update node</a></li>
   </ul>
   <h4>About</h4>
   <ul>
-  <li><a href="https://github.com/sponsors/bwp91" target="_blank">About Me</a></li>
-  <li><a href="https://github.com/bwp91/homebridge-ewelink/releases" target="_blank">Changelog</a></li>
-  <li><a href="https://github.com/bwp91/homebridge-ewelink/issues/new/choose" target="_blank">Support Request</a></li>
+    <li><a href="https://github.com/sponsors/bwp91" target="_blank">About Me</a></li>
+    <li><a href="https://github.com/bwp91/homebridge-ewelink/releases" target="_blank">Changelog</a></li>
+    <li><a href="https://github.com/bwp91/homebridge-ewelink/issues/new/choose" target="_blank">Support Request</a></li>
   </ul>
   <h4>Credits</h4>
   <ul>

From 807d140de394d41cc40d770f90f0270046a089da Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 3 Feb 2021 20:03:01 +0000
Subject: [PATCH 1316/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7d0048f2..f9e4c3b7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,11 +4,14 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 ## BETA
 
+### Added
+
+* Link to 'Configuration' wiki page in the plugin-ui
+
 ### Changes
 
 * Updated dependencies
 
-
 ## 4.6.1 (2021-02-02)
 
 ### Changes

From 2ee98b262b7f7c5f3227d382995629439c4dfd42 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 3 Feb 2021 20:03:50 +0000
Subject: [PATCH 1317/3183] 4.6.2-1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b37ca490..00e88179 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.6.2-0",
+  "version": "4.6.2-1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 4eea5659..c4f1f948 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "4.6.2-0",
+  "version": "4.6.2-1",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From a6dd61fc6c5f2f5b16619350c123ad9b04d8b230 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 5 Feb 2021 13:03:01 +0000
Subject: [PATCH 1318/3183] add note to AS

---
 config.schema.json | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/config.schema.json b/config.schema.json
index a2232bd8..dc46faa9 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -453,7 +453,11 @@
             "groups[].setup",
             "groups[].operationTime",
             "groups[].sensorId",
-            "groups[].obstructId"
+            "groups[].obstructId",
+            {
+              "type": "help",
+              "helpvalue": "<label class=\"control-label text-warning\">⚠ After restarting Homebridge you will need to remove this accessory from the cache for it set up correctly.</label>"
+            }
           ]
         }
       ]

From ee035d41ea270fe9c1db48f56e8d8cb1e0441b5d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 6 Feb 2021 11:34:13 +0000
Subject: [PATCH 1319/3183] update as unlocked

---
 lib/device/simulation/lock-one.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/device/simulation/lock-one.js b/lib/device/simulation/lock-one.js
index aede9673..46a730d4 100644
--- a/lib/device/simulation/lock-one.js
+++ b/lib/device/simulation/lock-one.js
@@ -48,12 +48,13 @@ module.exports = class deviceLockOne {
       }
       this.inUse = true
       await this.platform.sendDeviceUpdate(this.accessory, params)
+      this.service.updateCharacteristic(this.C.LockCurrentState, 0)
       if (!this.disableDeviceLogging) {
         this.log('[%s] current status [unlocked].', this.dName)
       }
       await this.helpers.sleep(Math.max(this.operationTime * 100, 1000))
       this.service.updateCharacteristic(this.C.LockTargetState, 1)
-        .updateCharacteristic(this.C.LockCurrentState, 1)
+      this.service.updateCharacteristic(this.C.LockCurrentState, 1)
       this.inUse = false
       if (!this.disableDeviceLogging) {
         this.log('[%s] current status [locked].', this.dName)

From 7961d6c3e06a3825f571d2859abe84cdb1615a8a Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 6 Feb 2021 11:34:17 +0000
Subject: [PATCH 1320/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f9e4c3b7..66be6e4c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,9 +7,11 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 ### Added
 
 * Link to 'Configuration' wiki page in the plugin-ui
+* Added a note in the plugin UI when adding an Accessory Simulation that the accessory will need to be removed from the cache
 
 ### Changes
 
+* Fixed an issue with the 'Lock' Accessory Simulation where the status would never update as 'Unlocked'
 * Updated dependencies
 
 ## 4.6.1 (2021-02-02)

From 7b38c47dc376604e7d564d474a7494ae9ea07f66 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 6 Feb 2021 11:35:03 +0000
Subject: [PATCH 1321/3183] 4.6.2-2

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 00e88179..6c305f4a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.6.2-1",
+  "version": "4.6.2-2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index c4f1f948..3f45684c 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "4.6.2-1",
+  "version": "4.6.2-2",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From d8d6dc63d4db755067da8771953698a10d036e93 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 6 Feb 2021 20:46:30 +0000
Subject: [PATCH 1322/3183] lock siri response?

---
 lib/device/simulation/lock-one.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/device/simulation/lock-one.js b/lib/device/simulation/lock-one.js
index 46a730d4..d9f50b18 100644
--- a/lib/device/simulation/lock-one.js
+++ b/lib/device/simulation/lock-one.js
@@ -48,13 +48,13 @@ module.exports = class deviceLockOne {
       }
       this.inUse = true
       await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.service.updateCharacteristic(this.C.LockCurrentState, 0)
+      this.service.setCharacteristic(this.C.LockCurrentState, 0)
       if (!this.disableDeviceLogging) {
         this.log('[%s] current status [unlocked].', this.dName)
       }
       await this.helpers.sleep(Math.max(this.operationTime * 100, 1000))
       this.service.updateCharacteristic(this.C.LockTargetState, 1)
-      this.service.updateCharacteristic(this.C.LockCurrentState, 1)
+      this.service.setCharacteristic(this.C.LockCurrentState, 1)
       this.inUse = false
       if (!this.disableDeviceLogging) {
         this.log('[%s] current status [locked].', this.dName)

From cf9233c069e6acea15075bbc78325993e3b92001 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 6 Feb 2021 20:47:04 +0000
Subject: [PATCH 1323/3183] 4.6.2-3

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 6c305f4a..9d2be378 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.6.2-2",
+  "version": "4.6.2-3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 3f45684c..f4292ca1 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "4.6.2-2",
+  "version": "4.6.2-3",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 5fc7a96f65590978ae45805432f6e2d9bc7ac844 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 7 Feb 2021 11:02:45 +0000
Subject: [PATCH 1324/3183] conversion changes

---
 lib/utils/colour-utils.js | 71 +++++++++++++++++----------------------
 1 file changed, 31 insertions(+), 40 deletions(-)

diff --git a/lib/utils/colour-utils.js b/lib/utils/colour-utils.js
index d2fcbe43..6d93b78b 100644
--- a/lib/utils/colour-utils.js
+++ b/lib/utils/colour-utils.js
@@ -1,46 +1,42 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
+
 module.exports = {
   hs2rgb: (h, s) => {
-    h = parseInt(h) / 360
+    h = parseInt(h) / 60
     s = parseInt(s) / 100
-    const l = 0.5
-    let t3
-    let val
-    if (s === 0) {
-      val = l * 255
-      return [Math.round(val), Math.round(val), Math.round(val)]
+    const f = h - Math.floor(h)
+    const p = Math.round(255 * (1 - s))
+    const q = Math.round(255 * (1 - (s * f)))
+    const t = Math.round(255 * (1 - (s * (1 - f))))
+    switch (Math.floor(h) % 6) {
+      case 0:
+        return [255, t, p]
+      case 1:
+        return [q, 255, p]
+      case 2:
+        return [p, 255, t]
+      case 3:
+        return [p, q, 255]
+      case 4:
+        return [t, p, 255]
+      case 5:
+        return [255, p, q]
     }
-    const t2 = l + s - l * s
-    const t1 = 2 * l - t2
-    const rgb = [0, 0, 0]
-    for (let i = 0; i < 3; i++) {
-      t3 = h + 1 / 3 * -(i - 1)
-      if (t3 < 0) t3++
-      if (t3 > 1) t3--
-      if (t3 * 6 < 1) {
-        val = t1 + (t2 - t1) * 6 * t3
-      } else if (t3 * 2 < 1) {
-        val = t2
-      } else if (t3 * 3 < 2) {
-        val = t1 + (t2 - t1) * (2 / 3 - t3) * 6
-      } else {
-        val = t1
-      }
-      rgb[i] = Math.round(val * 255)
-    }
-    return rgb
   },
+
   rgb2hs: (r, g, b) => {
-    r = parseInt(r) / 255
-    g = parseInt(g) / 255
-    b = parseInt(b) / 255
+    r = parseInt(r)
+    g = parseInt(g)
+    b = parseInt(b)
     const min = Math.min(r, g, b)
     const max = Math.max(r, g, b)
     const delta = max - min
-    let h = 0
-    let s = 0
+    let h
+    const s = max === 0
+      ? 0
+      : delta / max * 100
     if (max === min) {
       h = 0
     } else if (r === max) {
@@ -51,17 +47,12 @@ module.exports = {
       h = 4 + (r - g) / delta
     }
     h = Math.min(h * 60, 360)
-    if (h < 0) h += 360
-    const l = (min + max) / 2
-    if (max === min) {
-      s = 0
-    } else if (l <= 0.5) {
-      s = delta / (max + min)
-    } else {
-      s = delta / (2 - max - min)
+    if (h < 0) {
+      h += 360
     }
-    return [Math.round(h), Math.round(s * 100)]
+    return [Math.round(h), Math.round(s)]
   },
+
   m2hs: m => {
     /*
       table from (and credit to) HAP-NodeJS

From ecda1765e07f45f768092f50a35ef36a58fb4b9c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 7 Feb 2021 15:47:03 +0000
Subject: [PATCH 1325/3183] initial refactor

---
 lib/connection/http.js                    | 102 +--
 lib/connection/lan.js                     |  68 +-
 lib/connection/ws.js                      |  41 +-
 lib/device/curtain.js                     |  23 +-
 lib/device/diffuser.js                    |  79 +-
 lib/device/fan.js                         |  53 +-
 lib/device/light-colour.js                | 121 +--
 lib/device/light-ctemp.js                 |  49 +-
 lib/device/light-dimmer.js                |  37 +-
 lib/device/outlet.js                      | 102 +--
 lib/device/rf-bridge.js                   | 114 +--
 lib/device/scm.js                         |  21 +-
 lib/device/sensor-ambient.js              |  47 +-
 lib/device/sensor-contact.js              |  56 +-
 lib/device/simulation/blind.js            |  35 +-
 lib/device/simulation/garage-eachen.js    |  47 +-
 lib/device/simulation/garage-four.js      |  37 +-
 lib/device/simulation/garage-od-switch.js |  29 +-
 lib/device/simulation/garage-one.js       |  63 +-
 lib/device/simulation/garage-two.js       |  51 +-
 lib/device/simulation/lock-one.js         |  53 +-
 lib/device/simulation/switch-valve.js     |  85 +-
 lib/device/simulation/tap-one.js          |  39 +-
 lib/device/simulation/tap-two.js          |  37 +-
 lib/device/simulation/thermostat.js       |  73 +-
 lib/device/simulation/valve-four.js       |  91 +--
 lib/device/simulation/valve-one.js        |  75 +-
 lib/device/simulation/valve-two.js        |  71 +-
 lib/device/switch-multi.js                |  31 +-
 lib/device/switch-single.js               |  26 +-
 lib/device/template.js                    |  13 +-
 lib/device/usb.js                         |  31 +-
 lib/device/zigbee/light-dimmer.js         |  31 +-
 lib/device/zigbee/sensor-ambient.js       |  39 +-
 lib/device/zigbee/sensor-contact.js       |  42 +-
 lib/device/zigbee/sensor-motion.js        |  44 +-
 lib/device/zigbee/switch-single.js        |  19 +-
 lib/device/zigbee/switch-stateless.js     |  31 +-
 lib/index.js                              | 918 ++++++++++++++++------
 lib/utils/{helpers.js => constants.js}    | 168 +++-
 lib/utils/functions.js                    |  28 +
 41 files changed, 1850 insertions(+), 1270 deletions(-)
 rename lib/utils/{helpers.js => constants.js} (72%)
 create mode 100644 lib/utils/functions.js

diff --git a/lib/connection/http.js b/lib/connection/http.js
index 014d3d23..538b9c51 100644
--- a/lib/connection/http.js
+++ b/lib/connection/http.js
@@ -1,32 +1,36 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
+
 module.exports = class connectionHTTP {
   constructor (platform) {
-    // *** Set up our variables *** \\
+    // Set up our variables
+    this.consts = platform.consts
+    this.funcs = platform.funcs
     this.log = platform.log
-    this.helpers = platform.helpers
+    this.messages = platform.messages
     this.debug = platform.config.debug
-    this.username = platform.config.username.toString().replace(/[\s]+/g, '')
-    this.password = platform.config.password.toString()
-    this.ignoredDevices = platform.ignoredDevices
+    this.username = platform.config.username
+    this.password = platform.config.password
+    this.ignoredDevices = platform.config.ignoredDevices
     this.obstructSwitches = platform.obstructSwitches
-    this.cCode = '+' + platform.config.countryCode.toString().replace(/[\s+]+/g, '')
-    this.axios = require('axios')
-    this.crypto = require('crypto')
+    this.cCode = platform.config.countryCode
+
+    this.axios = platform.axios
+    this.crypto = platform.crypto
   }
 
   async getHost () {
-    // *** Used to get the user's regional (continent) HTTP API host *** \\
+    // Used to get the user's regional (continent) HTTP API host
     const params = {
-      appid: this.helpers.appId,
+      appid: this.consts.appId,
       country_code: this.cCode,
       nonce: Math.random().toString(36).substr(2, 8),
       ts: Math.floor(new Date().getTime() / 1000),
       version: 8
     }
 
-    // *** Set up the request signature *** \\
+    // Set up the request signature
     let dataToSign = []
     try {
       Object.keys(params).forEach(k => {
@@ -37,14 +41,14 @@ module.exports = class connectionHTTP {
       })
       dataToSign.sort((a, b) => (a.key < b.key ? -1 : 1))
       dataToSign = dataToSign.map(k => k.key + '=' + k.value).join('&')
-      dataToSign = this.crypto.createHmac('sha256', this.helpers.appSecret).update(dataToSign).digest('base64')
+      dataToSign = this.crypto.createHmac('sha256', this.consts.appSecret).update(dataToSign).digest('base64')
 
-      // *** Log the data depending on the debug setting *** \\
+      // Log the data depending on the debug setting
       if (this.debug) {
         this.log('Sending HTTP getHost() request.')
       }
 
-      // *** Send the request *** \\
+      // Send the request
       const res = await this.axios.get(
         'https://api.coolkit.cc:8080/api/user/region',
         {
@@ -56,7 +60,7 @@ module.exports = class connectionHTTP {
         }
       )
 
-      // *** Parse the response *** \\
+      // Parse the response
       const body = res.data
       if (!body.region) {
         throw new Error('Server did not respond with a region.\n' + JSON.stringify(body, null, 2))
@@ -77,10 +81,10 @@ module.exports = class connectionHTTP {
         this.log('HTTP API host received [%s].', this.httpHost)
       }
     } catch (err) {
-      if (this.helpers.hasProperty(err, 'code') && this.helpers.httpRetryCodes.includes(err.code)) {
-        // *** Retry if another attempt could be successful *** \\
+      if (this.funcs.hasProperty(err, 'code') && this.consts.httpRetryCodes.includes(err.code)) {
+        // Retry if another attempt could be successful
         this.log.warn('Unable to reach eWeLink. Retrying in 30 seconds.')
-        await this.helpers.sleep(30000)
+        await this.funcs.sleep(30000)
         return await this.getHost()
       } else {
         throw err
@@ -89,7 +93,7 @@ module.exports = class connectionHTTP {
   }
 
   async login () {
-    // *** Used to log the user in and obtain the user api key and token *** \\
+    // Used to log the user in and obtain the user api key and token
     if (this.httpHost === undefined) {
       this.httpHost = 'eu-apia.coolkit.cc'
     }
@@ -103,31 +107,31 @@ module.exports = class connectionHTTP {
       data.phoneNumber = this.username
     }
 
-    // *** Log the data depending on the debug setting *** \\
+    // Log the data depending on the debug setting
     if (this.debug) {
       this.log('Sending HTTP login() request.')
     }
 
-    // *** Set up the request signature *** \\
-    const dataToSign = this.crypto.createHmac('sha256', this.helpers.appSecret).update(JSON.stringify(data)).digest('base64')
+    // Set up the request signature
+    const dataToSign = this.crypto.createHmac('sha256', this.consts.appSecret).update(JSON.stringify(data)).digest('base64')
 
-    // *** Send the request *** \\
+    // Send the request
     const res = await this.axios.post(
       'https://' + this.httpHost + '/v2/user/login', data,
       {
         headers: {
           Authorization: 'Sign ' + dataToSign,
           'Content-Type': 'application/json',
-          'X-CK-Appid': this.helpers.appId,
+          'X-CK-Appid': this.consts.appId,
           'X-CK-Nonce': Math.random().toString(36).substr(2, 8)
         }
       }
     )
 
-    // *** Parse the response *** \\
+    // Parse the response
     const body = res.data
     if (body.error === 10004 && body.data && body.data.region) {
-      // *** In this case the user has been given a different region so retry login *** \\
+      // In this case the user has been given a different region so retry login
       const givenRegion = body.data.region
       switch (givenRegion) {
         case 'eu':
@@ -147,7 +151,7 @@ module.exports = class connectionHTTP {
       return await this.login()
     } else {
       if (body.data.at) {
-        // *** User api key and token received successfully *** \\
+        // User api key and token received successfully
         this.aToken = body.data.at
         this.apiKey = body.data.user.apikey
         return {
@@ -157,9 +161,9 @@ module.exports = class connectionHTTP {
         }
       } else {
         if (body.error === 500) {
-          // *** Retry if another attempt could be successful *** \\
+          // Retry if another attempt could be successful
           this.log.warn('An eWeLink error [500] occured. Retrying in 30 seconds.')
-          await this.helpers.sleep(30000)
+          await this.funcs.sleep(30000)
           return await this.login()
         } else {
           throw new Error('No auth token received.\n' + JSON.stringify(body, null, 2))
@@ -169,16 +173,16 @@ module.exports = class connectionHTTP {
   }
 
   async getDevices () {
-    // *** Used to get a user's device list *** \\
+    // Used to get a user's device list
     try {
-      // *** Send the request *** \\
+      // Send the request
       const res = await this.axios.get(
         'https://' + this.httpHost + '/v2/device/thing',
         {
           headers: {
             Authorization: 'Bearer ' + this.aToken,
             'Content-Type': 'application/json',
-            'X-CK-Appid': this.helpers.appId,
+            'X-CK-Appid': this.consts.appId,
             'X-CK-Nonce': Math.random().toString(36).substr(2, 8)
           },
           params: {
@@ -187,21 +191,21 @@ module.exports = class connectionHTTP {
         }
       )
 
-      // *** Parse the response *** \\
+      // Parse the response
       const body = res.data
       if (!body.data || body.error !== 0) {
         throw new Error(JSON.stringify(body, null, 2))
       }
 
-      // *** The list also includes scenes so we need to remove them *** \\
+      // The list also includes scenes so we need to remove them
       const deviceList = []
       const sensorList = []
       if (body.data.thingList && body.data.thingList.length > 0) {
         body.data.thingList.forEach(d => {
-          // *** Check each item is a device and also remove any devices the user has ignored *** \\
+          // Check each item is a device and also remove any devices the user has ignored
           if (d.itemData && d.itemData.extra && d.itemData.extra.uiid && !this.ignoredDevices.includes(d.itemData.deviceid)) {
-            // *** Separate the sensors as these need to be set up last *** \\
-            if (d.itemData.extra.uiid === 102 || this.helpers.hasProperty(this.obstructSwitches, d.itemData.deviceid)) {
+            // Separate the sensors as these need to be set up last
+            if (d.itemData.extra.uiid === 102 || this.obstructSwitches[d.itemData.deviceid]) {
               sensorList.push(d.itemData)
             } else {
               deviceList.push(d.itemData)
@@ -210,13 +214,13 @@ module.exports = class connectionHTTP {
         })
       }
 
-      // *** Sensors need to go last as they update garages that need to exist already *** \\
+      // Sensors need to go last as they update garages that need to exist already
       return deviceList.concat(sensorList)
     } catch (err) {
-      if (err.code && this.helpers.httpRetryCodes.includes(err.code)) {
-        // *** Retry if another attempt could be successful *** \\
+      if (err.code && this.consts.httpRetryCodes.includes(err.code)) {
+        // Retry if another attempt could be successful
         this.log.warn('Unable to reach eWeLink. Retrying in 30 seconds.')
-        await this.helpers.sleep(30000)
+        await this.funcs.sleep(30000)
         return await this.getDevices()
       } else {
         throw err
@@ -225,9 +229,9 @@ module.exports = class connectionHTTP {
   }
 
   async getDevice (deviceId) {
-    // *** Used to get info about a specific device *** \\
+    // Used to get info about a specific device
     try {
-      // *** Send the request *** \\
+      // Send the request
       const res = await this.axios.post(
         'https://' + this.httpHost + '/v2/device/thing',
         {
@@ -240,28 +244,28 @@ module.exports = class connectionHTTP {
           headers: {
             Authorization: 'Bearer ' + this.aToken,
             'Content-Type': 'application/json',
-            'X-CK-Appid': this.helpers.appId,
+            'X-CK-Appid': this.consts.appId,
             'X-CK-Nonce': Math.random().toString(36).substr(2, 8)
           }
         }
       )
 
-      // *** Parse the response *** \\
+      // Parse the response
       const body = res.data
       if (!body.data || body.error !== 0) {
         throw new Error(JSON.stringify(body, null, 2))
       }
       if (body.data.thingList && body.data.thingList.length === 1) {
-        // *** Return the device data *** \\
+        // Return the device data
         return body.data.thingList[0].itemData
       } else {
         throw new Error('device not found in eWeLink')
       }
     } catch (err) {
-      if (err.code && this.helpers.httpRetryCodes.includes(err.code)) {
-        // *** Retry if another attempt could be successful *** \\
+      if (err.code && this.consts.httpRetryCodes.includes(err.code)) {
+        // Retry if another attempt could be successful
         this.log.warn('Unable to reach eWeLink. Retrying in 30 seconds.')
-        await this.helpers.sleep(30000)
+        await this.funcs.sleep(30000)
         return await this.getDevice(deviceId)
       } else {
         throw err
diff --git a/lib/connection/lan.js b/lib/connection/lan.js
index bd1d0f42..c3f4961a 100644
--- a/lib/connection/lan.js
+++ b/lib/connection/lan.js
@@ -3,21 +3,25 @@
 'use strict'
 module.exports = class connectionLAN {
   constructor (platform, devices) {
-    // *** Set up our variables *** \\
+    // Set up our variables
+    this.consts = platform.consts
+    this.funcs = platform.funcs
     this.log = platform.log
-    this.helpers = platform.helpers
-    this.debug = platform.debug
-    this.mode = platform.mode
+    this.messages = platform.messages
+    this.mode = platform.config.mode
     this.ipOverride = platform.ipOverride
+
     this.deviceMap = new Map()
-    this.axios = require('axios')
-    this.crypto = require('crypto')
+
+    this.axios = platform.axios
+    this.crypto = platform.crypto
+    this.emitter = platform.emitter
+
     this.dns = require('node-dns-sd')
-    this.emitter = new (require('events'))()
 
-    // *** Create a template map with our device list from the HTTP client *** \\
+    // Create a template map with our device list from the HTTP client
     devices.forEach(device => {
-      if (!this.helpers.devicesLAN.includes(device.extra.uiid)) {
+      if (!this.consts.devices.lan.includes(device.extra.uiid)) {
         return
       }
       this.deviceMap.set(device.deviceid, {
@@ -28,18 +32,18 @@ module.exports = class connectionLAN {
   }
 
   async getHosts () {
-    // *** Perform an initial discovery of devices on the local network *** \\
+    // Perform an initial discovery of devices on the local network
     const res = await this.dns.discover({
       name: '_ewelink._tcp.local'
     })
 
-    // *** Update the device map for each device found on the local network *** \\
+    // Update the device map for each device found on the local network
     res.forEach(device => {
-      // *** Obtain the ewelink deviceId and check to see it is in our map *** \\
+      // Obtain the ewelink deviceId and check to see it is in our map
       const deviceId = device.fqdn.replace('._ewelink._tcp.local', '').replace('eWeLink_', '')
       let d
       if ((d = this.deviceMap.get(deviceId)) && !d.ip) {
-        // *** Update the map with the found IP address *** \\
+        // Update the map with the found IP address
         this.deviceMap.set(deviceId, {
           apiKey: d.apiKey,
           ip: device.address,
@@ -51,7 +55,7 @@ module.exports = class connectionLAN {
   }
 
   async startMonitor () {
-    // *** Function to parse DNS packets picked up by node-dns-sd *** \\
+    // Function to parse DNS packets picked up by node-dns-sd
     this.dns.ondata = packet => {
       try {
         if (!packet.answers) {
@@ -63,10 +67,10 @@ module.exports = class connectionLAN {
           .forEach(value => {
             const rdata = value.rdata
 
-            // *** Check the packet relates to a device in our map *** \\
+            // Check the packet relates to a device in our map
             const deviceInfo = this.deviceMap.get(rdata.id)
 
-            // *** Skip the update if it's a duplicate *** \\
+            // Skip the update if it's a duplicate
             if (deviceInfo.lastIV === rdata.iv) {
               return
             }
@@ -76,7 +80,7 @@ module.exports = class connectionLAN {
             const dText = this.crypto.createDecipheriv('aes-128-cbc', key, Buffer.from(rdata.iv, 'base64'))
             const pText = Buffer.concat([dText.update(Buffer.from(data, 'base64')), dText.final()]).toString('utf8')
 
-            // *** Check to see if the IP address of the device has changed *** \\
+            // Check to see if the IP address of the device has changed
             if (packet.address !== deviceInfo.ip && !this.ipOverride[rdata.id]) {
               this.deviceMap.set(rdata.id, {
                 apiKey: deviceInfo.apiKey,
@@ -85,7 +89,7 @@ module.exports = class connectionLAN {
               })
             }
 
-            // *** Parse the deconstructed information from the packet *** \\
+            // Parse the deconstructed information from the packet
             let params
             try {
               params = JSON.parse(pText)
@@ -94,16 +98,16 @@ module.exports = class connectionLAN {
               return
             }
 
-            // *** Remove any params we don't need *** \\
+            // Remove any params we don't need
             for (const param in params) {
-              if (this.helpers.hasProperty(params, param)) {
-                if (!this.helpers.paramsToKeep.includes(param.replace(/[0-9]/g, ''))) {
+              if (this.funcs.hasProperty(params, param)) {
+                if (!this.consts.paramsToKeep.includes(param.replace(/[0-9]/g, ''))) {
                   delete params[param]
                 }
               }
             }
 
-            // *** If any params are left then generate the template to be emitted *** \\
+            // If any params are left then generate the template to be emitted
             if (Object.keys(params).length > 0) {
               params.online = true
               params.updateSource = 'LAN'
@@ -122,13 +126,13 @@ module.exports = class connectionLAN {
       }
     }
 
-    // *** Start the DNS packet monitoring *** \\
+    // Start the DNS packet monitoring
     this.dns.startMonitoring()
   }
 
   async sendUpdate (json) {
     try {
-      // *** Check we have an IP address for the device *** \\
+      // Check we have an IP address for the device
       if (!this.deviceMap.get(json.deviceid).ip) {
         throw new Error('device not reachable via LAN mode')
       }
@@ -136,7 +140,7 @@ module.exports = class connectionLAN {
       let suffix
       const params = {}
 
-      // *** For now only /switch and /switches are supported *** \\
+      // For now only /switch and /switches are supported
       if (json.params.switches) {
         params.switches = json.params.switches
         suffix = 'switches'
@@ -147,12 +151,12 @@ module.exports = class connectionLAN {
         throw new Error('device not configurable via LAN mode')
       }
 
-      // *** Check we have the device API key *** \\
+      // Check we have the device API key
       if (!(apiKey = this.deviceMap.get(json.deviceid).apiKey)) {
         throw new Error('cannot retrieve device API key')
       }
 
-      // *** Generate the HTTP request *** \\
+      // Generate the HTTP request
       const key = this.crypto.createHash('md5').update(Buffer.from(apiKey, 'utf8')).digest()
       const iv = this.crypto.randomBytes(16)
       const enc = this.crypto.createCipheriv('aes-128-cbc', key, iv)
@@ -165,7 +169,7 @@ module.exports = class connectionLAN {
         sequence: Date.now().toString()
       }
 
-      // *** Send the HTTP request *** \\
+      // Send the HTTP request
       const res = await this.axios({
         method: 'post',
         url: 'http://' + this.deviceMap.get(json.deviceid).ip + ':8081/zeroconf/' + suffix,
@@ -177,12 +181,12 @@ module.exports = class connectionLAN {
         timeout: this.mode === 'lan' ? 10000 : 3000
       })
 
-      // *** Check for any errors in the response *** \\
+      // Check for any errors in the response
       if (!res.data || res.data.error !== 0) {
         throw new Error(res.data)
       }
 
-      // *** This ok is needed by the plugin *** \\
+      // This ok is needed by the plugin
       return 'ok'
     } catch (err) {
       return err.message + (err.lineNumber ? ' [line ' + err.lineNumber + ']' : '')
@@ -194,7 +198,7 @@ module.exports = class connectionLAN {
   }
 
   addDeviceToMap (device) {
-    // *** Adds a device to the map if it is discovered by the plugin *** \\
+    // Adds a device to the map if it is discovered by the plugin
     this.deviceMap.set(device.deviceid, {
       apiKey: device.devicekey,
       ip: this.ipOverride[device.deviceid],
@@ -203,7 +207,7 @@ module.exports = class connectionLAN {
   }
 
   async closeConnection () {
-    // *** This is called when Homebridge is shutdown *** \\
+    // This is called when Homebridge is shutdown
     await this.dns.stopMonitoring()
     if (this.debug) {
       this.log('LAN monitoring gracefully stopped.')
diff --git a/lib/connection/ws.js b/lib/connection/ws.js
index b752cd4f..c4851006 100644
--- a/lib/connection/ws.js
+++ b/lib/connection/ws.js
@@ -1,16 +1,21 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
+
 module.exports = class connectionWS {
   constructor (platform, authData) {
+    this.consts = platform.consts
+    this.funcs = platform.funcs
     this.log = platform.log
-    this.helpers = platform.helpers
+    this.messages = platform.messages
     this.debug = platform.config.debug
+    this.axios = platform.axios
+    this.emitter = platform.emitter
+
     this.httpHost = authData.httpHost
     this.aToken = authData.aToken
     this.apiKey = authData.apiKey
-    this.axios = require('axios')
-    this.emitter = new (require('events'))()
+
     this.ws = require('ws')
     this.wsp = require('websocket-as-promised')
   }
@@ -25,7 +30,7 @@ module.exports = class connectionWS {
           'Content-Type': 'application/json'
         },
         data: {
-          appid: this.helpers.appId,
+          appid: this.consts.appId,
           nonce: Math.random().toString(36).substr(2, 8),
           ts: Math.floor(new Date().getTime() / 1000),
           version: 8
@@ -40,9 +45,9 @@ module.exports = class connectionWS {
       }
       this.wsHost = body.domain
     } catch (err) {
-      if (err.code && this.helpers.httpRetryCodes.includes(err.code)) {
+      if (err.code && this.consts.httpRetryCodes.includes(err.code)) {
         this.log.warn('Unable to reach eWeLink. Retrying in 30 seconds.')
-        await this.helpers.sleep(30000)
+        await this.funcs.sleep(30000)
         return await this.getHost()
       } else {
         throw err
@@ -69,7 +74,7 @@ module.exports = class connectionWS {
       const payload = {
         action: 'userOnline',
         apikey: this.apiKey,
-        appid: this.helpers.appId,
+        appid: this.consts.appId,
         at: this.aToken,
         nonce: Math.random().toString(36).substr(2, 8),
         sequence,
@@ -116,7 +121,7 @@ module.exports = class connectionWS {
       if (!device.params) {
         device.params = {}
       }
-      if (device.deviceid && this.helpers.hasProperty(device, 'error')) {
+      if (device.deviceid && this.funcs.hasProperty(device, 'error')) {
         device.action = 'update'
         onlineStatus = device.error === 0
         if (device.error !== 0) {
@@ -128,12 +133,12 @@ module.exports = class connectionWS {
         switch (device.action) {
           case 'update':
           case 'sysmsg':
-            if (device.action === 'sysmsg' && this.helpers.hasProperty(device.params, 'online')) {
+            if (device.action === 'sysmsg' && this.funcs.hasProperty(device.params, 'online')) {
               onlineStatus = device.params.online
             }
             for (const param in device.params) {
-              if (this.helpers.hasProperty(device.params, param)) {
-                if (!this.helpers.paramsToKeep.includes(param.replace(/[0-9]/g, ''))) {
+              if (this.funcs.hasProperty(device.params, param)) {
+                if (!this.consts.paramsToKeep.includes(param.replace(/[0-9]/g, ''))) {
                   delete device.params[param]
                 }
               }
@@ -153,8 +158,8 @@ module.exports = class connectionWS {
           default:
             this.log.warn('[%s] WS message received has unknown action.\n', device.deviceid, JSON.stringify(device, null, 2))
         }
-      } else if (this.helpers.hasProperty(device, 'error') && device.error === 0) {
-        // *** Safe to ignore these messages *** \\
+      } else if (this.funcs.hasProperty(device, 'error') && device.error === 0) {
+        // Safe to ignore these messages
       } else {
         this.log.warn('WS unknown command received.\n', JSON.stringify(device, null, 2))
       }
@@ -173,7 +178,7 @@ module.exports = class connectionWS {
         this.log.warn('Web socket closed - %s.', e)
         this.log.warn('Web socket will try to reconnect in five seconds.')
       }
-      await this.helpers.sleep(5000)
+      await this.funcs.sleep(5000)
       await this.login()
     })
     this.wsClient.onError.addListener(async e => {
@@ -187,7 +192,7 @@ module.exports = class connectionWS {
         this.log.warn('Web socket error - %s.', e)
         this.log.warn('Web socket will try to reconnect in five seconds.')
       }
-      await this.helpers.sleep(5000)
+      await this.funcs.sleep(5000)
       await this.login()
     })
   }
@@ -206,7 +211,7 @@ module.exports = class connectionWS {
     if (this.wsClient && this.wsIsOpen) {
       try {
         const device = await this.wsClient.sendRequest(jsonToSend, { requestId: sequence })
-        device.error = this.helpers.hasProperty(device, 'error') ? device.error : 504
+        device.error = this.funcs.hasProperty(device, 'error') ? device.error : 504
         switch (device.error) {
           case 0:
             return
@@ -221,7 +226,7 @@ module.exports = class connectionWS {
       }
     } else {
       this.log.warn('Request will be sent when WS has reconnected.')
-      await this.helpers.sleep(30000)
+      await this.funcs.sleep(30000)
       await this.sendUpdate(json)
     }
   }
@@ -244,7 +249,7 @@ module.exports = class connectionWS {
       this.wsClient.send(JSON.stringify(json))
     } else {
       this.log.warn('[%s] request will be sent when WS has reconnected.', accessory.displayName)
-      await this.helpers.sleep(30000)
+      await this.funcs.sleep(30000)
       await this.requestUpdate(accessory)
     }
   }
diff --git a/lib/device/curtain.js b/lib/device/curtain.js
index 69642043..dcb6da78 100644
--- a/lib/device/curtain.js
+++ b/lib/device/curtain.js
@@ -4,16 +4,17 @@
 module.exports = class deviceCurtain {
   constructor (platform, accessory) {
     this.platform = platform
+    this.funcs = platform.funcs
+    this.messages = platform.messages
     this.log = platform.log
     this.disableDeviceLogging = platform.config.disableDeviceLogging
-    this.helpers = platform.helpers
-    this.S = platform.api.hap.Service
-    this.C = platform.api.hap.Characteristic
-    this.dName = accessory.displayName
+    this.hapServ = platform.api.hap.Service
+    this.hapChar = platform.api.hap.Characteristic
+    this.name = accessory.displayName
     this.accessory = accessory
 
-    this.service = this.accessory.getService(this.S.WindowCovering) || this.accessory.addService(this.S.WindowCovering)
-    this.service.getCharacteristic(this.C.TargetPosition)
+    this.service = this.accessory.getService(this.hapServ.WindowCovering) || this.accessory.addService(this.hapServ.WindowCovering)
+    this.service.getCharacteristic(this.hapChar.TargetPosition)
       .on('set', this.internalUpdate.bind(this))
   }
 
@@ -34,17 +35,17 @@ module.exports = class deviceCurtain {
 
   async externalUpdate (params) {
     try {
-      if (!params.switch && !this.helpers.hasProperty(params, 'setclose')) {
+      if (!params.switch && !this.funcs.hasProperty(params, 'setclose')) {
         return
       }
       const newPos = Math.abs(100 - parseInt(params.setclose))
-      this.service.updateCharacteristic(this.C.TargetPosition, newPos)
-        .updateCharacteristic(this.C.CurrentPosition, newPos)
-        .updateCharacteristic(this.C.PositionState, 2)
+      this.service.updateCharacteristic(this.hapChar.TargetPosition, newPos)
+        .updateCharacteristic(this.hapChar.CurrentPosition, newPos)
+        .updateCharacteristic(this.hapChar.PositionState, 2)
       if (params.updateSource && this.cachePosition !== newPos) {
         this.cachePosition = newPos
         if (!this.disableDeviceLogging) {
-          this.log('[%s] current position [%s%].', this.dName, this.cachePosition)
+          this.log('[%s] current position [%s%].', this.name, this.cachePosition)
         }
       }
     } catch (err) {
diff --git a/lib/device/diffuser.js b/lib/device/diffuser.js
index 7f14a85a..212e3f74 100644
--- a/lib/device/diffuser.js
+++ b/lib/device/diffuser.js
@@ -4,29 +4,30 @@
 module.exports = class deviceDiffuser {
   constructor (platform, accessory) {
     this.platform = platform
+    this.funcs = platform.funcs
+    this.messages = platform.messages
     this.log = platform.log
     this.disableDeviceLogging = platform.config.disableDeviceLogging
-    this.helpers = platform.helpers
     this.colourUtils = platform.colourUtils
-    this.S = platform.api.hap.Service
-    this.C = platform.api.hap.Characteristic
-    this.dName = accessory.displayName
+    this.hapServ = platform.api.hap.Service
+    this.hapChar = platform.api.hap.Characteristic
+    this.name = accessory.displayName
     this.accessory = accessory
 
-    this.fanService = this.accessory.getService('Diffuser') || this.accessory.addService(this.S.Fan, 'Diffuser', 'diffuser')
-    this.lightService = this.accessory.getService('Light') || this.accessory.addService(this.S.Lightbulb, 'Light', 'light')
-    this.fanService.getCharacteristic(this.C.On)
+    this.fanService = this.accessory.getService('Diffuser') || this.accessory.addService(this.hapServ.Fan, 'Diffuser', 'diffuser')
+    this.lightService = this.accessory.getService('Light') || this.accessory.addService(this.hapServ.Lightbulb, 'Light', 'light')
+    this.fanService.getCharacteristic(this.hapChar.On)
       .on('set', this.internalDiffuserOnOffUpdate.bind(this))
-    this.fanService.getCharacteristic(this.C.RotationSpeed)
+    this.fanService.getCharacteristic(this.hapChar.RotationSpeed)
       .on('set', this.internalDiffuserSpeedUpdate.bind(this))
       .setProps({ minStep: 50 })
-    this.lightService.getCharacteristic(this.C.On)
+    this.lightService.getCharacteristic(this.hapChar.On)
       .on('set', this.internalLightOnOffUpdate.bind(this))
-    this.lightService.getCharacteristic(this.C.Brightness)
+    this.lightService.getCharacteristic(this.hapChar.Brightness)
       .on('set', this.internalLightBrightnessUpdate.bind(this))
-    this.lightService.getCharacteristic(this.C.Hue)
+    this.lightService.getCharacteristic(this.hapChar.Hue)
       .on('set', this.internalLightColourUpdate.bind(this))
-    this.lightService.getCharacteristic(this.C.Saturation)
+    this.lightService.getCharacteristic(this.hapChar.Saturation)
       .on('set', (value, callback) => callback())
   }
 
@@ -48,7 +49,7 @@ module.exports = class deviceDiffuser {
       }, 10000)
       await this.platform.sendDeviceUpdate(this.accessory, params)
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current state [%s].', this.dName, this.cacheOnOff)
+        this.log('[%s] current state [%s].', this.name, this.cacheOnOff)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
@@ -69,7 +70,7 @@ module.exports = class deviceDiffuser {
       const params = { state: this.cacheSpeed / 50 }
       const updateKeySpeed = Math.random().toString(36).substr(2, 8)
       this.updateKeySpeed = updateKeySpeed
-      await this.helpers.sleep(500)
+      await this.funcs.sleep(500)
       if (updateKeySpeed !== this.updateKeySpeed) {
         return
       }
@@ -81,7 +82,7 @@ module.exports = class deviceDiffuser {
       }, 10000)
       await this.platform.sendDeviceUpdate(this.accessory, params)
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current speed [%s%].', this.dName, newSpeed)
+        this.log('[%s] current speed [%s%].', this.name, newSpeed)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
@@ -99,7 +100,7 @@ module.exports = class deviceDiffuser {
       const params = { lightswitch: this.cacheLightOnOff }
       const updateKeyLight = Math.random().toString(36).substr(2, 8)
       this.updateKeyLight = updateKeyLight
-      await this.helpers.sleep(250)
+      await this.funcs.sleep(250)
       if (updateKeyLight !== this.updateKeyLight) {
         return
       }
@@ -111,7 +112,7 @@ module.exports = class deviceDiffuser {
       }, 10000)
       await this.platform.sendDeviceUpdate(this.accessory, params)
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current light [%s%].', this.dName, value ? 'on' : 'off')
+        this.log('[%s] current light [%s%].', this.name, value ? 'on' : 'off')
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
@@ -129,7 +130,7 @@ module.exports = class deviceDiffuser {
       const updateKeyBright = Math.random().toString(36).substr(2, 8)
       this.updateKeyBright = updateKeyBright
       const params = { lightbright: this.cacheBrightness }
-      await this.helpers.sleep(500)
+      await this.funcs.sleep(500)
       if (updateKeyBright !== this.updateKeyBright) {
         return
       }
@@ -141,7 +142,7 @@ module.exports = class deviceDiffuser {
       }, 10000)
       await this.platform.sendDeviceUpdate(this.accessory, params)
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current brightness [%s%].', this.dName, this.cacheBrightness)
+        this.log('[%s] current brightness [%s%].', this.name, this.cacheBrightness)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
@@ -160,7 +161,7 @@ module.exports = class deviceDiffuser {
       this.updateKeyColour = updateKeyColour
       const newRGB = this.colourUtils.hs2rgb(
         value,
-        this.accessory.getService('Light').getCharacteristic(this.C.Saturation).value
+        this.accessory.getService('Light').getCharacteristic(this.hapChar.Saturation).value
       )
       this.cacheR = newRGB[0]
       this.cacheG = newRGB[0]
@@ -170,7 +171,7 @@ module.exports = class deviceDiffuser {
         lightGcolor: this.cacheG,
         lightBcolor: this.cacheB
       }
-      await this.helpers.sleep(1500)
+      await this.funcs.sleep(1500)
       if (updateKeyColour !== this.updateKeyColour) {
         return
       }
@@ -182,7 +183,7 @@ module.exports = class deviceDiffuser {
       }, 10000)
       await this.platform.sendDeviceUpdate(this.accessory, params)
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current colour [rgb %s %s %s].', this.dName, this.cacheR, this.cacheG, this.cacheB)
+        this.log('[%s] current colour [rgb %s %s %s].', this.name, this.cacheR, this.cacheG, this.cacheB)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
@@ -197,45 +198,45 @@ module.exports = class deviceDiffuser {
       if (params.switch && params.switch !== this.cacheOnOff) {
         this.cacheOnOff = params.switch
         if (params.updateSource && !this.disableDeviceLogging) {
-          this.log('[%s] current state [%s%].', this.dName, this.cacheOnOff)
+          this.log('[%s] current state [%s%].', this.name, this.cacheOnOff)
         }
-        this.fanService.updateCharacteristic(this.C.On, this.cacheOnOff === 'on')
-        if (!this.helpers.hasProperty(params, 'state')) {
-          this.fanService.updateCharacteristic(this.C.RotationSpeed, this.cacheSpeed)
+        this.fanService.updateCharacteristic(this.hapChar.On, this.cacheOnOff === 'on')
+        if (!this.funcs.hasProperty(params, 'state')) {
+          this.fanService.updateCharacteristic(this.hapChar.RotationSpeed, this.cacheSpeed)
         }
       }
-      if (this.helpers.hasProperty(params, 'state') && params.state * 50 !== this.cacheSpeed) {
+      if (this.funcs.hasProperty(params, 'state') && params.state * 50 !== this.cacheSpeed) {
         this.cacheSpeed = params.state * 50
-        this.fanService.updateCharacteristic(this.C.RotationSpeed, this.cacheSpeed)
+        this.fanService.updateCharacteristic(this.hapChar.RotationSpeed, this.cacheSpeed)
         if (params.updateSource && !this.disableDeviceLogging) {
-          this.log('[%s] current speed [%s%].', this.dName, this.cacheSpeed)
+          this.log('[%s] current speed [%s%].', this.name, this.cacheSpeed)
         }
       }
-      if (this.helpers.hasProperty(params, 'lightswitch') && this.cacheLightOnOff !== params.lightswitch) {
+      if (this.funcs.hasProperty(params, 'lightswitch') && this.cacheLightOnOff !== params.lightswitch) {
         this.cacheLightOnOff = params.lightswitch
-        this.lightService.updateCharacteristic(this.C.On, params.lightswitch === 1)
+        this.lightService.updateCharacteristic(this.hapChar.On, params.lightswitch === 1)
         if (params.updateSource && !this.disableDeviceLogging) {
-          this.log('[%s] current light [%s%].', this.dNameparams.lightswitch === 1 ? 'on' : 'off')
+          this.log('[%s] current light [%s%].', this.nameparams.lightswitch === 1 ? 'on' : 'off')
         }
       }
-      if (this.helpers.hasProperty(params, 'lightbright') && this.cacheBrightness !== params.lightbright) {
+      if (this.funcs.hasProperty(params, 'lightbright') && this.cacheBrightness !== params.lightbright) {
         this.cacheBrightness = params.lightbright
-        this.lightService.updateCharacteristic(this.C.Brightness, params.lightbright)
+        this.lightService.updateCharacteristic(this.hapChar.Brightness, params.lightbright)
         if (params.updateSource && !this.disableDeviceLogging) {
-          this.log('[%s] current brightness [%s%].', this.dNameparams.lightbright)
+          this.log('[%s] current brightness [%s%].', this.nameparams.lightbright)
         }
       }
-      if (this.helpers.hasProperty(params, 'lightRcolor')) {
+      if (this.funcs.hasProperty(params, 'lightRcolor')) {
         if (this.cacheR !== params.lightRcolor || this.cacheG !== params.lightGcolor || this.cacheB !== params.lightBcolor) {
           this.cacheR = params.lightRcolor
           this.cacheG = params.lightGcolor
           this.cacheB = params.lightBcolor
           const newColour = this.colourUtils.rgb2hs(this.cacheR, this.cacheG, this.cacheB)
           this.cacheHue = newColour[0]
-          this.lightService.updateCharacteristic(this.C.Hue, this.cacheHue)
-            .updateCharacteristic(this.C.Saturation, 100)
+          this.lightService.updateCharacteristic(this.hapChar.Hue, this.cacheHue)
+            .updateCharacteristic(this.hapChar.Saturation, 100)
           if (params.updateSource && !this.disableDeviceLogging) {
-            this.log('[%s] current colour [rgb %s %s %s].', this.dName, this.cacheR, this.cacheG, this.cacheB)
+            this.log('[%s] current colour [rgb %s %s %s].', this.name, this.cacheR, this.cacheG, this.cacheB)
           }
         }
       }
diff --git a/lib/device/fan.js b/lib/device/fan.js
index 23dfdf10..d5194d9c 100644
--- a/lib/device/fan.js
+++ b/lib/device/fan.js
@@ -4,32 +4,33 @@
 module.exports = class deviceFan {
   constructor (platform, accessory) {
     this.platform = platform
+    this.funcs = platform.funcs
+    this.messages = platform.messages
     this.log = platform.log
     this.disableDeviceLogging = platform.config.disableDeviceLogging
-    this.helpers = platform.helpers
-    this.S = platform.api.hap.Service
-    this.C = platform.api.hap.Characteristic
-    this.dName = accessory.displayName
+    this.hapServ = platform.api.hap.Service
+    this.hapChar = platform.api.hap.Characteristic
+    this.name = accessory.displayName
     this.accessory = accessory
 
-    this.service = this.accessory.getService(this.S.Fan) || this.accessory.addService(this.S.Fan)
-    this.service.getCharacteristic(this.C.On)
+    this.service = this.accessory.getService(this.hapServ.Fan) || this.accessory.addService(this.hapServ.Fan)
+    this.service.getCharacteristic(this.hapChar.On)
       .on('set', (value, callback) => {
         callback()
         if (!value) {
-          this.service.setCharacteristic(this.C.RotationSpeed, 0)
+          this.service.setCharacteristic(this.hapChar.RotationSpeed, 0)
         }
       })
-    this.service.getCharacteristic(this.C.RotationSpeed)
+    this.service.getCharacteristic(this.hapChar.RotationSpeed)
       .on('set', this.internalSpeedUpdate.bind(this))
       .setProps({ minStep: 33 })
     if ((this.platform.config.hideLightFromFan || '').split(',').includes(this.accessory.context.eweDeviceId)) {
-      if (this.accessory.getService(this.S.Lightbulb)) {
-        this.accessory.removeService(this.accessory.getService(this.S.Lightbulb))
+      if (this.accessory.getService(this.hapServ.Lightbulb)) {
+        this.accessory.removeService(this.accessory.getService(this.hapServ.Lightbulb))
       }
     } else {
-      this.lightService = this.accessory.getService(this.S.Lightbulb) || this.accessory.addService(this.S.Lightbulb)
-      this.lightService.getCharacteristic(this.C.On)
+      this.lightService = this.accessory.getService(this.hapServ.Lightbulb) || this.accessory.addService(this.hapServ.Lightbulb)
+      this.lightService.getCharacteristic(this.hapChar.On)
         .on('set', this.internalLightUpdate.bind(this))
     }
   }
@@ -37,10 +38,10 @@ module.exports = class deviceFan {
   async internalSpeedUpdate (value, callback) {
     try {
       callback()
-      const params = { switches: this.helpers.defaultMultiSwitchOff }
+      const params = { switches: this.consts.defaultMultiSwitchOff }
       const newPower = value >= 33
       const newSpeed = value
-      const newLight = this.lightService ? this.lightService.getCharacteristic(this.C.On).value : true
+      const newLight = this.lightService ? this.lightService.getCharacteristic(this.hapChar.On).value : true
       params.switches[0].switch = newLight ? 'on' : 'off'
       params.switches[1].switch = newPower && newSpeed >= 33 ? 'on' : 'off'
       params.switches[2].switch = newPower && newSpeed >= 66 && newSpeed < 99 ? 'on' : 'off'
@@ -49,13 +50,13 @@ module.exports = class deviceFan {
       if (newPower !== (this.cacheOnOff === 'on')) {
         this.cacheOnOff = newPower ? 'on' : 'off'
         if (!this.disableDeviceLogging) {
-          this.log('[%s] current state [%s].', this.dName, this.cacheOnOff)
+          this.log('[%s] current state [%s].', this.name, this.cacheOnOff)
         }
       }
       if (newSpeed !== this.cacheSpeed) {
         this.cacheSpeed = newSpeed
         if (!this.disableDeviceLogging) {
-          this.log('[%s] current speed [%s%].', this.dName, this.cacheSpeed)
+          this.log('[%s] current speed [%s%].', this.name, this.cacheSpeed)
         }
       }
     } catch (err) {
@@ -66,9 +67,9 @@ module.exports = class deviceFan {
   async internalLightUpdate (value, callback) {
     try {
       callback()
-      const params = { switches: this.helpers.defaultMultiSwitchOff }
-      const newPower = this.service.getCharacteristic(this.C.On).value
-      const newSpeed = this.service.getCharacteristic(this.C.RotationSpeed).value
+      const params = { switches: this.consts.defaultMultiSwitchOff }
+      const newPower = this.service.getCharacteristic(this.hapChar.On).value
+      const newSpeed = this.service.getCharacteristic(this.hapChar.RotationSpeed).value
       const newLight = this.lightService ? value : true
       params.switches[0].switch = newLight ? 'on' : 'off'
       params.switches[1].switch = newPower && newSpeed >= 33 ? 'on' : 'off'
@@ -78,7 +79,7 @@ module.exports = class deviceFan {
       if (newLight !== (this.cacheLight === 'on')) {
         this.cacheLight = newLight ? 'on' : 'off'
         if (!this.disableDeviceLogging) {
-          this.log('[%s] current light [%s].', this.dName, this.cacheLight)
+          this.log('[%s] current light [%s].', this.name, this.cacheLight)
         }
       }
     } catch (err) {
@@ -93,9 +94,9 @@ module.exports = class deviceFan {
       }
       if (params.switches[1].switch !== this.cacheOnOff) {
         this.cacheOnOff = params.switches[1].switch
-        this.service.updateCharacteristic(this.C.On, this.cacheLight === 'on')
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheLight === 'on')
         if (params.updateSource && !this.disableDeviceLogging) {
-          this.log('[%s] current state [%s].', this.dName, this.cacheOnOff)
+          this.log('[%s] current state [%s].', this.name, this.cacheOnOff)
         }
       }
       let speed = 0
@@ -111,16 +112,16 @@ module.exports = class deviceFan {
       }
       if (speed !== this.cacheSpeed) {
         this.cacheSpeed = speed
-        this.service.updateCharacteristic(this.C.RotationSpeed, this.cacheSpeed)
+        this.service.updateCharacteristic(this.hapChar.RotationSpeed, this.cacheSpeed)
         if (params.updateSource && !this.disableDeviceLogging) {
-          this.log('[%s] current speed [%s%].', this.dName, this.cacheSpeed)
+          this.log('[%s] current speed [%s%].', this.name, this.cacheSpeed)
         }
       }
       if (this.lightService && params.switches[0].switch !== this.cacheLight) {
         this.cacheLight = params.switches[0].switch
-        this.lightService.updateCharacteristic(this.C.On, this.cacheLight === 'on')
+        this.lightService.updateCharacteristic(this.hapChar.On, this.cacheLight === 'on')
         if (params.updateSource && !this.disableDeviceLogging) {
-          this.log('[%s] current light state [%s].', this.dName, this.cacheLight)
+          this.log('[%s] current light state [%s].', this.name, this.cacheLight)
         }
       }
     } catch (err) {
diff --git a/lib/device/light-colour.js b/lib/device/light-colour.js
index 5d489367..26a6dbed 100644
--- a/lib/device/light-colour.js
+++ b/lib/device/light-colour.js
@@ -4,39 +4,40 @@
 module.exports = class deviceLightColour {
   constructor (platform, accessory) {
     this.platform = platform
+    this.funcs = platform.funcs
+    this.messages = platform.messages
     this.log = platform.log
     this.disableDeviceLogging = platform.config.disableDeviceLogging
-    this.helpers = platform.helpers
     this.colourUtils = platform.colourUtils
-    this.S = platform.api.hap.Service
-    this.C = platform.api.hap.Characteristic
-    this.dName = accessory.displayName
+    this.hapServ = platform.api.hap.Service
+    this.hapChar = platform.api.hap.Characteristic
+    this.name = accessory.displayName
     this.accessory = accessory
 
     this.isB1 = this.accessory.context.eweUIID === 22
 
-    this.service = this.accessory.getService(this.S.Lightbulb) || this.accessory.addService(this.S.Lightbulb)
-    this.service.getCharacteristic(this.C.On)
+    this.service = this.accessory.getService(this.hapServ.Lightbulb) || this.accessory.addService(this.hapServ.Lightbulb)
+    this.service.getCharacteristic(this.hapChar.On)
       .on('set', this.internalOnOffUpdate.bind(this))
-    this.service.getCharacteristic(this.C.Brightness)
+    this.service.getCharacteristic(this.hapChar.Brightness)
       .on('set', this.internalBrightnessUpdate.bind(this))
-    this.service.getCharacteristic(this.C.Hue)
+    this.service.getCharacteristic(this.hapChar.Hue)
       .on('set', this.internalColourUpdate.bind(this))
-    this.service.getCharacteristic(this.C.Saturation)
+    this.service.getCharacteristic(this.hapChar.Saturation)
       .on('set', (value, callback) => callback())
     if (this.isB1) {
       // *** B1 doesn't support brightness *** \\
-      this.service.getCharacteristic(this.C.Brightness)
+      this.service.getCharacteristic(this.hapChar.Brightness)
         .setProps({ minStep: 100 })
     }
 
     if ([59, 104].includes(this.accessory.context.eweUIID)) {
       // HomeKit has a range of 140-500M corresponding to 2000-7143K
       // Devices have a range of 2700K-6500K corresponding to ewelink ct: 0-255
-      this.service.getCharacteristic(this.C.ColorTemperature)
+      this.service.getCharacteristic(this.hapChar.ColorTemperature)
         .on('set', this.internalCTempUpdate.bind(this))
       if (platform.api.versionGreaterOrEqual && platform.api.versionGreaterOrEqual('1.3.0-beta.46')) {
-        this.cacheBrightness = this.service.getCharacteristic(this.C.Brightness).value
+        this.cacheBrightness = this.service.getCharacteristic(this.hapChar.Brightness).value
         this.alController = new platform.api.hap.AdaptiveLightingController(this.service)
         this.accessory.configureController(this.alController)
       }
@@ -66,7 +67,7 @@ module.exports = class deviceLightColour {
       }, 10000)
       await this.platform.sendDeviceUpdate(this.accessory, params)
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current state [%s].', this.dName, this.cacheOnOff)
+        this.log('[%s] current state [%s].', this.name, this.cacheOnOff)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
@@ -116,7 +117,7 @@ module.exports = class deviceLightColour {
           }
           break
       }
-      await this.helpers.sleep(750)
+      await this.funcs.sleep(750)
       if (updateKeyBright !== this.updateKeyBright) {
         return
       }
@@ -128,7 +129,7 @@ module.exports = class deviceLightColour {
       }, 10000)
       await this.platform.sendDeviceUpdate(this.accessory, params)
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current brightness [%s%].', this.dName, value)
+        this.log('[%s] current brightness [%s%].', this.name, value)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
@@ -142,10 +143,10 @@ module.exports = class deviceLightColour {
         return
       }
       this.cacheHue = value
-      this.service.updateCharacteristic(this.C.ColorTemperature, 140)
+      this.service.updateCharacteristic(this.hapChar.ColorTemperature, 140)
       callback()
       let params
-      const newRGB = this.colourUtils.hs2rgb(value, this.service.getCharacteristic(this.C.Saturation).value)
+      const newRGB = this.colourUtils.hs2rgb(value, this.service.getCharacteristic(this.hapChar.Saturation).value)
       this.cacheR = newRGB[0]
       this.cacheG = newRGB[1]
       this.cacheB = newRGB[2]
@@ -189,7 +190,7 @@ module.exports = class deviceLightColour {
           this.cacheMode = 'color'
           break
       }
-      await this.helpers.sleep(1500)
+      await this.funcs.sleep(1500)
       if (updateKeyColour !== this.updateKeyColour) {
         return
       }
@@ -201,7 +202,7 @@ module.exports = class deviceLightColour {
       }, 10000)
       await this.platform.sendDeviceUpdate(this.accessory, params)
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current colour [rgb %s %s %s].', this.dName, this.cacheR, this.cacheG, this.cacheB)
+        this.log('[%s] current colour [rgb %s %s %s].', this.name, this.cacheR, this.cacheG, this.cacheB)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
@@ -217,8 +218,8 @@ module.exports = class deviceLightColour {
       this.cacheMired = value
       const hs = this.colourUtils.m2hs(this.cacheMired)
       this.cacheHue = hs[0]
-      this.service.updateCharacteristic(this.C.Hue, this.cacheHue)
-        .updateCharacteristic(this.C.Saturation, hs[1])
+      this.service.updateCharacteristic(this.hapChar.Hue, this.cacheHue)
+        .updateCharacteristic(this.hapChar.Saturation, hs[1])
       callback()
       const mToK = Math.max(Math.min(Math.round(1000000 / value), 6500), 2700)
       this.cacheCT = Math.round(((mToK - 2700) / 3800) * 255)
@@ -231,7 +232,7 @@ module.exports = class deviceLightColour {
           // *** L1 *** \\
           const newRGB = this.colourUtils.hs2rgb(
             hs[0],
-            this.service.getCharacteristic(this.C.Saturation).value
+            this.service.getCharacteristic(this.hapChar.Saturation).value
           )
           this.cacheR = newRGB[0]
           this.cacheG = newRGB[1]
@@ -256,7 +257,7 @@ module.exports = class deviceLightColour {
           this.cacheMode = 'white'
           break
       }
-      await this.helpers.sleep(1500)
+      await this.funcs.sleep(1500)
       if (updateKeyCT !== this.updateKeyCT) {
         return
       }
@@ -269,9 +270,9 @@ module.exports = class deviceLightColour {
       await this.platform.sendDeviceUpdate(this.accessory, params)
       if (!this.disableDeviceLogging) {
         if (this.alController && this.alController.isAdaptiveLightingActive()) {
-          this.log('[%s] current cct [%sK] via adaptive lighting.', this.dName, mToK)
+          this.log('[%s] current cct [%sK] via adaptive lighting.', this.name, mToK)
         } else {
-          this.log('[%s] current cct [%sK].', this.dName, mToK)
+          this.log('[%s] current cct [%sK].', this.name, mToK)
         }
       }
     } catch (err) {
@@ -289,12 +290,12 @@ module.exports = class deviceLightColour {
         (!this.isB1 && params.switch && params.switch !== this.cacheOnOff)
       ) {
         this.cacheOnOff = this.isB1 ? params.state : params.switch
-        this.service.updateCharacteristic(this.C.On, this.cacheOnOff === 'on')
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheOnOff === 'on')
         if (this.isB1) {
-          this.service.updateCharacteristic(this.C.Brightness, this.cacheOnOff === 'on' ? 100 : 0)
+          this.service.updateCharacteristic(this.hapChar.Brightness, this.cacheOnOff === 'on' ? 100 : 0)
         }
         if (params.updateSource && !this.disableDeviceLogging) {
-          this.log('[%s] current state [%s].', this.dName, this.cacheOnOff)
+          this.log('[%s] current state [%s].', this.name, this.cacheOnOff)
         }
       }
       let hs
@@ -304,13 +305,13 @@ module.exports = class deviceLightColour {
           // *** B1 *** \\
           if (params.zyx_mode) {
             mode = parseInt(params.zyx_mode)
-          } else if (this.helpers.hasProperty(params, 'channel0') && parseInt(params.channel0) + parseInt(params.channel1) > 0) {
+          } else if (this.funcs.hasProperty(params, 'channel0') && parseInt(params.channel0) + parseInt(params.channel1) > 0) {
             mode = 1
           } else {
             mode = 2
           }
           if (mode === 2) {
-            if (this.helpers.hasProperty(params, 'channel2')) {
+            if (this.funcs.hasProperty(params, 'channel2')) {
               if (
                 params.channel2 !== (this.cacheR || 0).toString() ||
                 params.channel3 !== (this.cacheG || 0).toString() ||
@@ -321,13 +322,13 @@ module.exports = class deviceLightColour {
                 this.cacheB = parseInt(params.channel4)
                 hs = this.colourUtils.rgb2hs(this.cacheR, this.cacheG, this.cacheB)
                 this.cacheHue = hs[0]
-                this.service.updateCharacteristic(this.C.Hue, this.cacheHue)
-                  .updateCharacteristic(this.C.Saturation, 100)
-                  .updateCharacteristic(this.C.Brightness, 100)
+                this.service.updateCharacteristic(this.hapChar.Hue, this.cacheHue)
+                  .updateCharacteristic(this.hapChar.Saturation, 100)
+                  .updateCharacteristic(this.hapChar.Brightness, 100)
                 if (params.updateSource && !this.disableDeviceLogging) {
                   this.log(
                     '[%s] current colour [rgb %s %s %s].',
-                    this.dName,
+                    this.name,
                     this.cacheR, this.cacheG, this.cacheB
                   )
                 }
@@ -335,22 +336,22 @@ module.exports = class deviceLightColour {
             }
           } else {
             if (params.updateSource) {
-              this.log('[%s] current mode [white] is unsupported.', this.dName)
+              this.log('[%s] current mode [white] is unsupported.', this.name)
             }
           }
           break
         case 59:
           // *** L1 *** \\
-          if (this.helpers.hasProperty(params, 'bright')) {
+          if (this.funcs.hasProperty(params, 'bright')) {
             if (params.bright !== this.cacheBrightness) {
               this.cacheBrightness = params.bright
-              this.service.updateCharacteristic(this.C.Brightness, this.cacheBrightness)
+              this.service.updateCharacteristic(this.hapChar.Brightness, this.cacheBrightness)
               if (params.updateSource && !this.disableDeviceLogging) {
-                this.log('[%s] current brightness [%s%].', this.dName, this.cacheBrightness)
+                this.log('[%s] current brightness [%s%].', this.name, this.cacheBrightness)
               }
             }
           }
-          if (this.helpers.hasProperty(params, 'colorR')) {
+          if (this.funcs.hasProperty(params, 'colorR')) {
             if (params.colorR !== this.cacheR || params.colorG !== this.cacheB || params.colorB !== this.cacheB) {
               this.cacheR = params.colorR
               this.cacheG = params.colorG
@@ -358,19 +359,19 @@ module.exports = class deviceLightColour {
               hs = this.colourUtils.rgb2hs(this.cacheR, this.cacheG, this.cacheB)
               this.cacheHue = hs[0]
               this.cacheMired = 140
-              this.service.updateCharacteristic(this.C.Hue, this.cacheHue)
-                .updateCharacteristic(this.C.Saturation, hs[1])
+              this.service.updateCharacteristic(this.hapChar.Hue, this.cacheHue)
+                .updateCharacteristic(this.hapChar.Saturation, hs[1])
               if (params.updateSource) {
                 if (!this.disableDeviceLogging) {
                   this.log(
                     '[%s] current colour [rgb %s %s %s].',
-                    this.dName,
+                    this.name,
                     this.cacheR, this.cacheG, this.cacheB
                   )
                 }
                 if (this.alController && this.alController.isAdaptiveLightingActive()) {
                   this.alController.disableAdaptiveLighting()
-                  this.log('[%s] adaptive lighting disabled due to significant colour change.', this.dName)
+                  this.log('[%s] adaptive lighting disabled due to significant colour change.', this.name)
                 }
               }
             }
@@ -379,16 +380,16 @@ module.exports = class deviceLightColour {
         case 104:
           // *** B02-B-A60, B05-B-A60, GTLC104 *** \\
           if (params.ltype === 'color' && params.color) {
-            if (this.helpers.hasProperty(params.color, 'br')) {
+            if (this.funcs.hasProperty(params.color, 'br')) {
               if (params.color.br !== this.cacheBrightness) {
                 this.cacheBrightness = params.color.br
-                this.service.updateCharacteristic(this.C.Brightness, this.cacheBrightness)
+                this.service.updateCharacteristic(this.hapChar.Brightness, this.cacheBrightness)
                 if (params.updateSource && !this.disableDeviceLogging) {
-                  this.log('[%s] current brightness [%s%].', this.dName, this.cacheBrightness)
+                  this.log('[%s] current brightness [%s%].', this.name, this.cacheBrightness)
                 }
               }
             }
-            if (this.helpers.hasProperty(params.color, 'r')) {
+            if (this.funcs.hasProperty(params.color, 'r')) {
               if (
                 params.color.r !== this.cacheR ||
                 params.color.g !== this.cacheG ||
@@ -402,13 +403,13 @@ module.exports = class deviceLightColour {
                 this.cacheMired = 140
                 hs = this.colourUtils.rgb2hs(this.cacheR, this.cacheG, this.cacheB)
                 this.cacheHue = hs[0]
-                this.service.updateCharacteristic(this.C.ColorTemperature, 140)
-                  .updateCharacteristic(this.C.Hue, this.cacheHue)
-                  .updateCharacteristic(this.C.Saturation, 100)
+                this.service.updateCharacteristic(this.hapChar.ColorTemperature, 140)
+                  .updateCharacteristic(this.hapChar.Hue, this.cacheHue)
+                  .updateCharacteristic(this.hapChar.Saturation, 100)
                 if (params.updateSource && !this.disableDeviceLogging) {
                   this.log(
                     '[%s] current colour [rgb %s %s %s].',
-                    this.dName,
+                    this.name,
                     this.cacheR, this.cacheG, this.cacheB
                   )
                 }
@@ -416,28 +417,28 @@ module.exports = class deviceLightColour {
             }
           }
           if (params.ltype === 'white' && params.white) {
-            if (this.helpers.hasProperty(params.white, 'br')) {
+            if (this.funcs.hasProperty(params.white, 'br')) {
               if (params.white.br !== this.cacheBrightness || this.cacheMode !== 'white') {
                 this.cacheBrightness = params.white.br
-                this.service.updateCharacteristic(this.C.Brightness, this.cacheBrightness)
+                this.service.updateCharacteristic(this.hapChar.Brightness, this.cacheBrightness)
                 if (params.updateSource && !this.disableDeviceLogging) {
-                  this.log('[%s] current brightness [%s%].', this.dName, this.cacheBrightness)
+                  this.log('[%s] current brightness [%s%].', this.name, this.cacheBrightness)
                 }
               }
             }
-            if (this.helpers.hasProperty(params.white, 'ct') && params.white.ct !== this.cacheCT) {
+            if (this.funcs.hasProperty(params.white, 'ct') && params.white.ct !== this.cacheCT) {
               this.cacheMode = 'white'
               this.cacheCT = params.white.ct
               const ctToK = Math.round(this.cacheCT / 255 * 3800 + 2700)
               this.cacheMired = Math.max(Math.min(Math.round(1000000 / ctToK), 500), 140)
               hs = this.colourUtils.m2hs(this.cacheMired)
               this.cacheHue = hs[0]
-              this.service.updateCharacteristic(this.C.Hue, this.cacheHue)
-                .updateCharacteristic(this.C.Saturation, hs[1])
-                .updateCharacteristic(this.C.ColorTemperature, this.cacheMired)
+              this.service.updateCharacteristic(this.hapChar.Hue, this.cacheHue)
+                .updateCharacteristic(this.hapChar.Saturation, hs[1])
+                .updateCharacteristic(this.hapChar.ColorTemperature, this.cacheMired)
               if (params.updateSource) {
                 if (!this.disableDeviceLogging) {
-                  this.log('[%s] current cct [%sK].', this.dName, ctToK)
+                  this.log('[%s] current cct [%sK].', this.name, ctToK)
                 }
                 if (
                   this.alController &&
@@ -446,7 +447,7 @@ module.exports = class deviceLightColour {
                 ) {
                   // *** look for a variation greater than five *** \\
                   this.alController.disableAdaptiveLighting()
-                  this.log('[%s] adaptive lighting disabled due to significant colour change.', this.dName)
+                  this.log('[%s] adaptive lighting disabled due to significant colour change.', this.name)
                 }
               }
             }
diff --git a/lib/device/light-ctemp.js b/lib/device/light-ctemp.js
index 3bda7bce..0b6fbaef 100644
--- a/lib/device/light-ctemp.js
+++ b/lib/device/light-ctemp.js
@@ -4,20 +4,21 @@
 module.exports = class deviceLightColour {
   constructor (platform, accessory) {
     this.platform = platform
+    this.funcs = platform.funcs
+    this.messages = platform.messages
     this.log = platform.log
     this.disableDeviceLogging = platform.config.disableDeviceLogging
-    this.helpers = platform.helpers
-    this.S = platform.api.hap.Service
-    this.C = platform.api.hap.Characteristic
-    this.dName = accessory.displayName
+    this.hapServ = platform.api.hap.Service
+    this.hapChar = platform.api.hap.Characteristic
+    this.name = accessory.displayName
     this.accessory = accessory
 
-    this.service = this.accessory.getService(this.S.Lightbulb) || this.accessory.addService(this.S.Lightbulb)
-    this.service.getCharacteristic(this.C.On)
+    this.service = this.accessory.getService(this.hapServ.Lightbulb) || this.accessory.addService(this.hapServ.Lightbulb)
+    this.service.getCharacteristic(this.hapChar.On)
       .on('set', this.internalOnOffUpdate.bind(this))
-    this.service.getCharacteristic(this.C.Brightness)
+    this.service.getCharacteristic(this.hapChar.Brightness)
       .on('set', this.internalBrightnessUpdate.bind(this))
-    this.service.getCharacteristic(this.C.ColorTemperature)
+    this.service.getCharacteristic(this.hapChar.ColorTemperature)
       .on('set', this.internalCTempUpdate.bind(this))
     if ((this.platform.config.bulbB02FST64 || '').split(',').includes(this.accessory.context.eweDeviceId)) {
       this.minK = 1800
@@ -30,7 +31,7 @@ module.exports = class deviceLightColour {
       this.maxK = 6500
     }
     if (platform.api.versionGreaterOrEqual && platform.api.versionGreaterOrEqual('1.3.0-beta.46')) {
-      this.cacheBrightness = this.service.getCharacteristic(this.C.Brightness).value
+      this.cacheBrightness = this.service.getCharacteristic(this.hapChar.Brightness).value
       this.alController = new platform.api.hap.AdaptiveLightingController(this.service)
       this.accessory.configureController(this.alController)
     }
@@ -55,7 +56,7 @@ module.exports = class deviceLightColour {
         switch: this.cacheOnOff
       })
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current state [%s].', this.dName, this.cacheOnOff)
+        this.log('[%s] current state [%s].', this.name, this.cacheOnOff)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
@@ -78,7 +79,7 @@ module.exports = class deviceLightColour {
           ct: this.cacheCT
         }
       }
-      await this.helpers.sleep(750)
+      await this.funcs.sleep(750)
       if (updateKeyBright !== this.updateKeyBright) {
         return
       }
@@ -90,7 +91,7 @@ module.exports = class deviceLightColour {
       }, 10000)
       await this.platform.sendDeviceUpdate(this.accessory, params)
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current brightness [%s%].', this.dName, value)
+        this.log('[%s] current brightness [%s%].', this.name, value)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
@@ -115,7 +116,7 @@ module.exports = class deviceLightColour {
           ct: this.cacheCT
         }
       }
-      await this.helpers.sleep(1500)
+      await this.funcs.sleep(1500)
       if (updateKeyCT !== this.updateKeyCT) {
         return
       }
@@ -128,9 +129,9 @@ module.exports = class deviceLightColour {
       await this.platform.sendDeviceUpdate(this.accessory, params)
       if (!this.disableDeviceLogging) {
         if (this.alController && this.alController.isAdaptiveLightingActive()) {
-          this.log('[%s] current cct [%sK] via adaptive lighting.', this.dName, mToK)
+          this.log('[%s] current cct [%sK] via adaptive lighting.', this.name, mToK)
         } else {
-          this.log('[%s] current cct [%sK].', this.dName, mToK)
+          this.log('[%s] current cct [%sK].', this.name, mToK)
         }
       }
     } catch (err) {
@@ -145,27 +146,27 @@ module.exports = class deviceLightColour {
       }
       if (params.switch && params.switch !== this.cacheOnOff) {
         this.cacheOnOff = params.switch
-        this.service.updateCharacteristic(this.C.On, this.cacheOnOff === 'on')
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheOnOff === 'on')
         if (params.updateSource && !this.disableDeviceLogging) {
-          this.log('[%s] current state [%s].', this.dName, this.cacheOnOff)
+          this.log('[%s] current state [%s].', this.name, this.cacheOnOff)
         }
       }
       if (params.white) {
-        if (this.helpers.hasProperty(params.white, 'br') && this.cacheBrightness !== params.white.br) {
+        if (this.funcs.hasProperty(params.white, 'br') && this.cacheBrightness !== params.white.br) {
           this.cacheBrightness = params.white.br
-          this.service.updateCharacteristic(this.C.Brightness, this.cacheBrightness)
+          this.service.updateCharacteristic(this.hapChar.Brightness, this.cacheBrightness)
           if (params.updateSource && !this.disableDeviceLogging) {
-            this.log('[%s] current brightness [%s%].', this.dName, this.cacheBrightness)
+            this.log('[%s] current brightness [%s%].', this.name, this.cacheBrightness)
           }
         }
-        if (this.helpers.hasProperty(params.white, 'ct') && this.cacheCT !== params.white.ct) {
+        if (this.funcs.hasProperty(params.white, 'ct') && this.cacheCT !== params.white.ct) {
           this.cacheCT = params.white.ct
           const ctToK = Math.round(this.cacheCT / 255 * (this.maxK - this.minK) + this.minK)
           this.cacheMired = Math.min(Math.max(Math.round(1000000 / ctToK), 140), 500)
-          this.service.updateCharacteristic(this.C.ColorTemperature, this.cacheMired)
+          this.service.updateCharacteristic(this.hapChar.ColorTemperature, this.cacheMired)
           if (params.updateSource) {
             if (!this.disableDeviceLogging) {
-              this.log('[%s] current cct [%sK].', this.dName, ctToK)
+              this.log('[%s] current cct [%sK].', this.name, ctToK)
             }
             if (
               this.alController &&
@@ -174,7 +175,7 @@ module.exports = class deviceLightColour {
             ) {
               // *** look for a variation greater than five *** \\
               this.alController.disableAdaptiveLighting()
-              this.log('[%s] adaptive lighting disabled due to significant colour change.', this.dName)
+              this.log('[%s] adaptive lighting disabled due to significant colour change.', this.name)
             }
           }
         }
diff --git a/lib/device/light-dimmer.js b/lib/device/light-dimmer.js
index 6f4b1643..0e25940b 100644
--- a/lib/device/light-dimmer.js
+++ b/lib/device/light-dimmer.js
@@ -4,18 +4,19 @@
 module.exports = class deviceLightDimmer {
   constructor (platform, accessory) {
     this.platform = platform
+    this.funcs = platform.funcs
+    this.messages = platform.messages
     this.log = platform.log
     this.disableDeviceLogging = platform.config.disableDeviceLogging
-    this.helpers = platform.helpers
-    this.S = platform.api.hap.Service
-    this.C = platform.api.hap.Characteristic
-    this.dName = accessory.displayName
+    this.hapServ = platform.api.hap.Service
+    this.hapChar = platform.api.hap.Characteristic
+    this.name = accessory.displayName
     this.accessory = accessory
 
-    this.service = this.accessory.getService(this.S.Lightbulb) || this.accessory.addService(this.S.Lightbulb)
-    this.service.getCharacteristic(this.C.On)
+    this.service = this.accessory.getService(this.hapServ.Lightbulb) || this.accessory.addService(this.hapServ.Lightbulb)
+    this.service.getCharacteristic(this.hapChar.On)
       .on('set', this.internalOnOffUpdate.bind(this))
-    this.service.getCharacteristic(this.C.Brightness)
+    this.service.getCharacteristic(this.hapChar.Brightness)
       .on('set', this.internalBrightnessUpdate.bind(this))
   }
 
@@ -31,7 +32,7 @@ module.exports = class deviceLightDimmer {
         switch: this.cacheOnOff
       })
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current state [%s].', this.dName, this.cacheOnOff)
+        this.log('[%s] current state [%s].', this.name, this.cacheOnOff)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
@@ -60,13 +61,13 @@ module.exports = class deviceLightDimmer {
       }
       const updateKey = Math.random().toString(36).substr(2, 8)
       this.updateKeyBright = updateKey
-      await this.helpers.sleep(500)
+      await this.funcs.sleep(500)
       if (updateKey !== this.updateKeyBright) {
         return
       }
       await this.platform.sendDeviceUpdate(this.accessory, params)
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current brightness [%s%].', this.dName, this.cacheBrightness)
+        this.log('[%s] current brightness [%s%].', this.name, this.cacheBrightness)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
@@ -76,34 +77,34 @@ module.exports = class deviceLightDimmer {
   async externalUpdate (params) {
     try {
       if (params.switch && params.switch !== this.cacheOnOff) {
-        this.service.updateCharacteristic(this.C.On, params.switch === 'on')
+        this.service.updateCharacteristic(this.hapChar.On, params.switch === 'on')
         this.cacheOnOff = params.switch
         if (params.updateSource && !this.disableDeviceLogging) {
-          this.log('[%s] current state [%s].', this.dName, params.switch)
+          this.log('[%s] current state [%s].', this.name, params.switch)
         }
       }
       switch (this.accessory.context.eweUIID) {
         case 36:
           // *** KING-M4 eWeLink scale is 10-100 and HomeKit scale is 0-100. *** \\
-          if (this.helpers.hasProperty(params, 'bright')) {
+          if (this.funcs.hasProperty(params, 'bright')) {
             const nb = Math.round(((params.bright - 10) * 10) / 9)
             if (nb !== this.cacheBrightness) {
-              this.service.updateCharacteristic(this.C.Brightness, nb)
+              this.service.updateCharacteristic(this.hapChar.Brightness, nb)
               this.cacheBrightness = nb
               if (params.updateSource && !this.disableDeviceLogging) {
-                this.log('[%s] current brightness [%s%].', this.dName, nb)
+                this.log('[%s] current brightness [%s%].', this.name, nb)
               }
             }
           }
           break
         case 44:
           // *** D1 eWeLink scale matches HomeKit scale of 0-100 *** \\
-          if (this.helpers.hasProperty(params, 'brightness')) {
+          if (this.funcs.hasProperty(params, 'brightness')) {
             if (params.brightness !== this.cacheBrightness) {
-              this.service.updateCharacteristic(this.C.Brightness, params.brightness)
+              this.service.updateCharacteristic(this.hapChar.Brightness, params.brightness)
               this.cacheBrightness = params.brightness
               if (params.updateSource && !this.disableDeviceLogging) {
-                this.log('[%s] current brightness [%s%].', this.dName, params.brightness)
+                this.log('[%s] current brightness [%s%].', this.name, params.brightness)
               }
             }
           }
diff --git a/lib/device/outlet.js b/lib/device/outlet.js
index a812945e..86de6a1e 100644
--- a/lib/device/outlet.js
+++ b/lib/device/outlet.js
@@ -4,105 +4,107 @@
 module.exports = class deviceOutlet {
   constructor (platform, accessory) {
     this.platform = platform
+    this.consts = platform.consts
+    this.funcs = platform.funcs
+    this.messages = platform.messages
     this.log = platform.log
     this.disableDeviceLogging = platform.config.disableDeviceLogging
-    this.helpers = platform.helpers
-    this.S = platform.api.hap.Service
-    this.C = platform.api.hap.Characteristic
-    this.dName = accessory.displayName
+    this.hapServ = platform.api.hap.Service
+    this.hapChar = platform.api.hap.Characteristic
+    this.name = accessory.displayName
     this.accessory = accessory
 
     this.inUsePowerThreshold = parseInt(this.platform.config.inUsePowerThreshold)
     this.inUsePowerThreshold = isNaN(this.inUsePowerThreshold) || this.inUsePowerThreshold < 0
-      ? this.helpers.defaults.inUsePowerThreshold
+      ? this.consts.defaults.inUsePowerThreshold
       : this.inUsePowerThreshold
     this.inherits = require('util').inherits
     const self = this
     this.eveCurrentConsumption = function () {
-      self.C.call(this, 'Current Consumption', self.helpers.eveUUID.currentConsumption)
+      self.hapChar.call(this, 'Current Consumption', self.consts.eveUUID.currentConsumption)
       this.setProps({
-        format: self.C.Formats.UINT16,
+        format: self.hapChar.Formats.UINT16,
         unit: 'W',
         maxValue: 100000,
         minValue: 0,
         minStep: 1,
-        perms: [self.C.Perms.READ, self.C.Perms.NOTIFY]
+        perms: [self.hapChar.Perms.READ, self.hapChar.Perms.NOTIFY]
       })
       this.value = this.getDefaultValue()
     }
     this.eveTotalConsumption = function () {
-      self.C.call(this, 'Total Consumption', self.helpers.eveUUID.totalConsumption)
+      self.hapChar.call(this, 'Total Consumption', self.consts.eveUUID.totalConsumption)
       this.setProps({
-        format: self.C.Formats.FLOAT,
+        format: self.hapChar.Formats.FLOAT,
         unit: 'kWh',
         maxValue: 100000000000,
         minValue: 0,
         minStep: 0.01,
-        perms: [self.C.Perms.READ, self.C.Perms.NOTIFY]
+        perms: [self.hapChar.Perms.READ, self.hapChar.Perms.NOTIFY]
       })
       this.value = this.getDefaultValue()
     }
     this.eveVoltage = function () {
-      self.C.call(this, 'Voltage', self.helpers.eveUUID.voltage)
+      self.hapChar.call(this, 'Voltage', self.consts.eveUUID.voltage)
       this.setProps({
-        format: self.C.Formats.FLOAT,
+        format: self.hapChar.Formats.FLOAT,
         unit: 'V',
         maxValue: 100000000000,
         minValue: 0,
         minStep: 1,
-        perms: [self.C.Perms.READ, self.C.Perms.NOTIFY]
+        perms: [self.hapChar.Perms.READ, self.hapChar.Perms.NOTIFY]
       })
       this.value = this.getDefaultValue()
     }
     this.eveElectricCurrent = function () {
-      self.C.call(this, 'Electric Current', self.helpers.eveUUID.electricCurrent)
+      self.hapChar.call(this, 'Electric Current', self.consts.eveUUID.electricCurrent)
       this.setProps({
-        format: self.C.Formats.FLOAT,
+        format: self.hapChar.Formats.FLOAT,
         unit: 'A',
         maxValue: 100000000000,
         minValue: 0,
         minStep: 0.1,
-        perms: [self.C.Perms.READ, self.C.Perms.NOTIFY]
+        perms: [self.hapChar.Perms.READ, self.hapChar.Perms.NOTIFY]
       })
       this.value = this.getDefaultValue()
     }
     this.eveResetTotal = function () {
-      self.C.call(this, 'Reset Total', self.helpers.eveUUID.resetTotal)
+      self.hapChar.call(this, 'Reset Total', self.consts.eveUUID.resetTotal)
       this.setProps({
-        format: self.C.Formats.UINT32,
-        perms: [self.C.Perms.READ, self.C.Perms.NOTIFY, self.C.Perms.WRITE]
+        format: self.hapChar.Formats.UINT32,
+        perms: [self.hapChar.Perms.READ, self.hapChar.Perms.NOTIFY, self.hapChar.Perms.WRITE]
       })
       this.value = this.getDefaultValue()
     }
-    this.inherits(this.eveCurrentConsumption, this.C)
-    this.inherits(this.eveTotalConsumption, this.C)
-    this.inherits(this.eveVoltage, this.C)
-    this.inherits(this.eveElectricCurrent, this.C)
-    this.inherits(this.eveResetTotal, this.C)
-    this.eveCurrentConsumption.UUID = this.helpers.eveUUID.currentConsumption
-    this.eveTotalConsumption.UUID = this.helpers.eveUUID.totalConsumption
-    this.eveVoltage.UUID = this.helpers.eveUUID.voltage
-    this.eveElectricCurrent.UUID = this.helpers.eveUUID.electricCurrent
-    this.eveResetTotal.UUID = this.helpers.eveUUID.resetTotal
-    if (!this.helpers.hasProperty(this.accessory.context, 'energyReadings')) {
+    this.inherits(this.eveCurrentConsumption, this.hapChar)
+    this.inherits(this.eveTotalConsumption, this.hapChar)
+    this.inherits(this.eveVoltage, this.hapChar)
+    this.inherits(this.eveElectricCurrent, this.hapChar)
+    this.inherits(this.eveResetTotal, this.hapChar)
+    this.eveCurrentConsumption.UUID = this.consts.eveUUID.currentConsumption
+    this.eveTotalConsumption.UUID = this.consts.eveUUID.totalConsumption
+    this.eveVoltage.UUID = this.consts.eveUUID.voltage
+    this.eveElectricCurrent.UUID = this.consts.eveUUID.electricCurrent
+    this.eveResetTotal.UUID = this.consts.eveUUID.resetTotal
+    if (!this.funcs.hasProperty(this.accessory.context, 'energyReadings')) {
       this.accessory.context.energyReadings = []
     }
-    if (!this.helpers.hasProperty(this.accessory.context, 'energyReadingTotal')) {
+    if (!this.funcs.hasProperty(this.accessory.context, 'energyReadingTotal')) {
       this.accessory.context.energyReadingTotal = 0
     }
 
-    if (this.accessory.getService(this.S.Switch)) {
-      this.accessory.removeService(this.accessory.getService(this.S.Switch))
+    if (this.accessory.getService(this.hapServ.Switch)) {
+      this.accessory.removeService(this.accessory.getService(this.hapServ.Switch))
     }
-    if (!(this.service = this.accessory.getService(this.S.Outlet))) {
-      this.service = this.accessory.addService(this.S.Outlet)
+    if (!(this.service = this.accessory.getService(this.hapServ.Outlet))) {
+      this.service = this.accessory.addService(this.hapServ.Outlet)
       this.service.addCharacteristic(this.eveVoltage)
       this.service.addCharacteristic(this.eveCurrentConsumption)
       this.service.addCharacteristic(this.eveElectricCurrent)
       this.service.addCharacteristic(this.eveTotalConsumption)
       this.service.addCharacteristic(this.eveResetTotal)
     }
-    this.service.getCharacteristic(this.C.On)
+    this.service.getCharacteristic(this.hapChar.On)
       .on('set', this.internalUpdate.bind(this))
     this.service.getCharacteristic(this.eveResetTotal)
       .on('set', (value, callback) => {
@@ -136,7 +138,7 @@ module.exports = class deviceOutlet {
       await this.platform.sendDeviceUpdate(this.accessory, { switch: value ? 'on' : 'off' })
       this.cacheOnOff = value ? 'on' : 'off'
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current state [%s].', this.dName, value ? 'on' : 'off')
+        this.log('[%s] current state [%s].', this.name, value ? 'on' : 'off')
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
@@ -146,21 +148,21 @@ module.exports = class deviceOutlet {
   async externalUpdate (params) {
     try {
       if (params.switch && params.switch !== this.cacheOnOff) {
-        this.service.updateCharacteristic(this.C.On, params.switch === 'on')
+        this.service.updateCharacteristic(this.hapChar.On, params.switch === 'on')
         this.cacheOnOff = params.switch
         if (params.updateSource && !this.disableDeviceLogging) {
-          this.log('[%s] current state [%s].', this.dName, params.switch)
+          this.log('[%s] current state [%s].', this.name, params.switch)
         }
         if (!this.accessory.context.powerReadings) {
-          this.service.updateCharacteristic(this.C.OutletInUse, params.switch === 'on')
+          this.service.updateCharacteristic(this.hapChar.OutletInUse, params.switch === 'on')
         }
       }
       let logger = false
-      if (this.helpers.hasProperty(params, 'power')) {
+      if (this.funcs.hasProperty(params, 'power')) {
         this.accessory.context.powerReadings = true
-        this.service.updateCharacteristic(this.C.OutletInUse, parseFloat(params.power) > this.inUsePowerThreshold)
+        this.service.updateCharacteristic(this.hapChar.OutletInUse, parseFloat(params.power) > this.inUsePowerThreshold)
           .updateCharacteristic(this.eveCurrentConsumption, parseFloat(params.power))
-        const isOn = this.accessory.getService(this.S.Outlet).getCharacteristic(this.C.On).value
+        const isOn = this.accessory.getService(this.hapServ.Outlet).getCharacteristic(this.hapChar.On).value
         this.accessory.historyService.addEntry({
           time: Math.round(new Date().valueOf() / 1000),
           power: isOn ? parseFloat(params.power) : 0
@@ -168,21 +170,21 @@ module.exports = class deviceOutlet {
         this.accessory.context.energyReadings.push(parseFloat(params.power))
         logger = true
       }
-      if (this.helpers.hasProperty(params, 'voltage')) {
+      if (this.funcs.hasProperty(params, 'voltage')) {
         this.service.updateCharacteristic(this.eveVoltage, parseFloat(params.voltage))
         logger = true
       }
-      if (this.helpers.hasProperty(params, 'current')) {
+      if (this.funcs.hasProperty(params, 'current')) {
         this.service.updateCharacteristic(this.eveElectricCurrent, parseFloat(params.current))
         logger = true
       }
       if (params.updateSource && logger && !this.disableDeviceLogging) {
         this.log(
           '[%s] current%s%s%s.',
-          this.dName,
-          this.helpers.hasProperty(params, 'power') ? ' power [' + params.power + 'W]' : '',
-          this.helpers.hasProperty(params, 'voltage') ? ' voltage [' + params.voltage + 'V]' : '',
-          this.helpers.hasProperty(params, 'current') ? ' current [' + params.current + 'A]' : ''
+          this.name,
+          this.funcs.hasProperty(params, 'power') ? ' power [' + params.power + 'W]' : '',
+          this.funcs.hasProperty(params, 'voltage') ? ' voltage [' + params.voltage + 'V]' : '',
+          this.funcs.hasProperty(params, 'current') ? ' current [' + params.current + 'A]' : ''
         )
       }
     } catch (err) {
diff --git a/lib/device/rf-bridge.js b/lib/device/rf-bridge.js
index ef7a657e..7751b2de 100644
--- a/lib/device/rf-bridge.js
+++ b/lib/device/rf-bridge.js
@@ -4,38 +4,40 @@
 module.exports = class deviceRFBridge {
   constructor (platform, accessory) {
     this.platform = platform
+    this.consts = platform.consts
+    this.funcs = platform.funcs
+    this.messages = platform.messages
     this.log = platform.log
     this.disableDeviceLogging = platform.config.disableDeviceLogging
-    this.helpers = platform.helpers
-    this.S = platform.api.hap.Service
-    this.C = platform.api.hap.Characteristic
-    this.dName = accessory.displayName
+    this.hapServ = platform.api.hap.Service
+    this.hapChar = platform.api.hap.Characteristic
+    this.name = accessory.displayName
     this.accessory = accessory
 
     this.inherits = require('util').inherits
     const self = this
     this.eveLastActivation = function () {
-      self.C.call(this, 'Last Activation', self.helpers.eveUUID.lastActivation)
+      self.hapChar.call(this, 'Last Activation', self.consts.eveUUID.lastActivation)
       this.setProps({
-        format: self.C.Formats.UINT32,
-        unit: self.C.Units.SECONDS,
-        perms: [self.C.Perms.READ, self.C.Perms.NOTIFY]
+        format: self.hapChar.Formats.UINT32,
+        unit: self.hapChar.Units.SECONDS,
+        perms: [self.hapChar.Perms.READ, self.hapChar.Perms.NOTIFY]
       })
       this.value = this.getDefaultValue()
     }
-    this.inherits(this.eveLastActivation, this.C)
-    this.eveLastActivation.UUID = this.helpers.eveUUID.lastActivation
+    this.inherits(this.eveLastActivation, this.hapChar)
+    this.eveLastActivation.UUID = this.consts.eveUUID.lastActivation
     this.sensorTimeDifference = parseInt(this.platform.config.sensorTimeDifference)
     this.sensorTimeDifference = isNaN(this.sensorTimeDifference) || this.sensorTimeDifference < 10
-      ? this.helpers.defaults.sensorTimeDifference
+      ? this.consts.defaults.sensorTimeDifference
       : this.sensorTimeDifference
     if (['curtain', 'button'].includes(this.accessory.context.subType)) {
       Object.entries(this.accessory.context.buttons).forEach(([chan, name]) => {
         if (!this.accessory.getService(name)) {
-          this.accessory.addService(this.S.Switch, name, 'switch' + chan)
+          this.accessory.addService(this.hapServ.Switch, name, 'switch' + chan)
         }
-        this.accessory.getService(name).updateCharacteristic(this.C.On, false)
-        this.accessory.getService(name).getCharacteristic(this.C.On)
+        this.accessory.getService(name).updateCharacteristic(this.hapChar.On, false)
+        this.accessory.getService(name).getCharacteristic(this.hapChar.On)
           .on('set', (value, callback) => this.internalUpdate(chan, name, value, callback))
       })
     } else {
@@ -44,39 +46,39 @@ module.exports = class deviceRFBridge {
       let eveType
       switch (this.accessory.context.subType) {
         case 'water':
-          serv = this.S.LeakSensor
-          char = this.C.LeakDetected
+          serv = this.hapServ.LeakSensor
+          char = this.hapChar.LeakDetected
           eveType = 'motion'
           break
         case 'fire':
         case 'smoke':
-          serv = this.S.SmokeSensor
-          char = this.C.SmokeDetected
+          serv = this.hapServ.SmokeSensor
+          char = this.hapChar.SmokeDetected
           eveType = 'motion'
           break
         case 'co':
-          serv = this.S.CarbonMonoxideSensor
-          char = this.C.CarbonMonoxideDetected
+          serv = this.hapServ.CarbonMonoxideSensor
+          char = this.hapChar.CarbonMonoxideDetected
           eveType = 'motion'
           break
         case 'co2':
-          serv = this.S.CarbonDioxideSensor
-          char = this.C.CarbonDioxideDetected
+          serv = this.hapServ.CarbonDioxideSensor
+          char = this.hapChar.CarbonDioxideDetected
           eveType = 'motion'
           break
         case 'contact':
-          serv = this.S.ContactSensor
-          char = this.C.ContactSensorState
+          serv = this.hapServ.ContactSensor
+          char = this.hapChar.ContactSensorState
           eveType = 'door'
           break
         case 'occupancy':
-          serv = this.S.OccupancySensor
-          char = this.C.OccupancyDetected
+          serv = this.hapServ.OccupancySensor
+          char = this.hapChar.OccupancyDetected
           eveType = 'motion'
           break
         default:
-          serv = this.S.MotionSensor
-          char = this.C.MotionDetected
+          serv = this.hapServ.MotionSensor
+          char = this.hapChar.MotionDetected
           eveType = 'motion'
           break
       }
@@ -100,8 +102,8 @@ module.exports = class deviceRFBridge {
         cmd: 'transmit',
         rfChl: parseInt(rfChl)
       }
-      await this.helpers.sleep(1000)
-      this.accessory.getService(service).updateCharacteristic(this.C.On, false)
+      await this.funcs.sleep(1000)
+      this.accessory.getService(service).updateCharacteristic(this.hapChar.On, false)
       await this.platform.sendDeviceUpdate(this.accessory, params)
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
@@ -110,32 +112,32 @@ module.exports = class deviceRFBridge {
 
   async externalUpdate (params) {
     try {
-      if (!this.helpers.hasProperty(params, 'updateSource')) {
+      if (!this.funcs.hasProperty(params, 'updateSource')) {
         return
       }
       const timeNow = new Date()
       let oAccessory = false
-      if (this.helpers.hasProperty(params, 'cmd') && params.cmd === 'transmit' && this.helpers.hasProperty(params, 'rfChl')) {
+      if (this.funcs.hasProperty(params, 'cmd') && params.cmd === 'transmit' && this.funcs.hasProperty(params, 'rfChl')) {
         this.platform.devicesInHB.forEach(acc => {
           if (
             acc.context.eweDeviceId === this.accessory.context.eweDeviceId &&
-            this.helpers.hasProperty(acc.context, 'buttons') &&
-            this.helpers.hasProperty(acc.context.buttons, params.rfChl.toString())
+            this.funcs.hasProperty(acc.context, 'buttons') &&
+            this.funcs.hasProperty(acc.context.buttons, params.rfChl.toString())
           ) {
             oAccessory = acc
           }
         })
         if (oAccessory) {
-          oAccessory.getService(oAccessory.context.buttons[params.rfChl]).updateCharacteristic(this.C.On, 1)
+          oAccessory.getService(oAccessory.context.buttons[params.rfChl]).updateCharacteristic(this.hapChar.On, 1)
           if (params.updateSource && !this.disableDeviceLogging) {
             this.log('[%s] current state [button triggered]', oAccessory.displayName)
           }
-          this.helpers.sleep(3000)
-          oAccessory.getService(oAccessory.context.buttons[params.rfChl]).updateCharacteristic(this.C.On, 0)
+          this.funcs.sleep(3000)
+          oAccessory.getService(oAccessory.context.buttons[params.rfChl]).updateCharacteristic(this.hapChar.On, 0)
         } else {
           throw new Error('rf button not found in Homebridge')
         }
-      } else if (this.helpers.hasProperty(params, 'cmd') && params.cmd === 'trigger') {
+      } else if (this.funcs.hasProperty(params, 'cmd') && params.cmd === 'trigger') {
         //* ** RF Sensor ***\\
         Object.keys(params)
           .filter(name => /rfTrig/.test(name))
@@ -143,8 +145,8 @@ module.exports = class deviceRFBridge {
             this.platform.devicesInHB.forEach(acc => {
               if (
                 acc.context.eweDeviceId === this.accessory.context.eweDeviceId &&
-                this.helpers.hasProperty(acc.context, 'buttons') &&
-                this.helpers.hasProperty(acc.context.buttons, chan.split('g')[1].toString())
+                this.funcs.hasProperty(acc.context, 'buttons') &&
+                this.funcs.hasProperty(acc.context.buttons, chan.split('g')[1].toString())
               ) {
                 oAccessory = acc
               }
@@ -154,7 +156,7 @@ module.exports = class deviceRFBridge {
               const sensorTimeLengthSec = parseInt(this.platform.config.sensorTimeLength)
               const sensorTimeLength = isNaN(sensorTimeLengthPri) || sensorTimeLengthPri < 0
                 ? isNaN(sensorTimeLengthSec) || sensorTimeLengthSec < 0
-                  ? this.helpers.defaults.sensorTimeLength
+                  ? this.consts.defaults.sensorTimeLength
                   : sensorTimeLengthSec
                 : sensorTimeLengthPri
               const timeOfMotion = new Date(params[chan])
@@ -166,37 +168,37 @@ module.exports = class deviceRFBridge {
                   case 'button':
                     return
                   case 'water':
-                    serv = this.S.LeakSensor
-                    char = this.C.LeakDetected
+                    serv = this.hapServ.LeakSensor
+                    char = this.hapChar.LeakDetected
                     break
                   case 'fire':
                   case 'smoke':
-                    serv = this.S.SmokeSensor
-                    char = this.C.SmokeDetected
+                    serv = this.hapServ.SmokeSensor
+                    char = this.hapChar.SmokeDetected
                     break
                   case 'co':
-                    serv = this.S.CarbonMonoxideSensor
-                    char = this.C.CarbonMonoxideDetected
+                    serv = this.hapServ.CarbonMonoxideSensor
+                    char = this.hapChar.CarbonMonoxideDetected
                     break
                   case 'co2':
-                    serv = this.S.CarbonDioxideSensor
-                    char = this.C.CarbonDioxideDetected
+                    serv = this.hapServ.CarbonDioxideSensor
+                    char = this.hapChar.CarbonDioxideDetected
                     break
                   case 'contact':
-                    serv = this.S.ContactSensor
-                    char = this.C.ContactSensorState
+                    serv = this.hapServ.ContactSensor
+                    char = this.hapChar.ContactSensorState
                     oAccessory.getService(serv).updateCharacteristic(
                       this.eveLastActivation,
                       Math.round(new Date().valueOf() / 1000) - oAccessory.historyService.getInitialTime()
                     )
                     break
                   case 'occupancy':
-                    serv = this.S.OccupancySensor
-                    char = this.C.OccupancyDetected
+                    serv = this.hapServ.OccupancySensor
+                    char = this.hapChar.OccupancyDetected
                     break
                   default:
-                    serv = this.S.MotionSensor
-                    char = this.C.MotionDetected
+                    serv = this.hapServ.MotionSensor
+                    char = this.hapChar.MotionDetected
                     oAccessory.getService(serv).updateCharacteristic(
                       this.eveLastActivation,
                       Math.round(new Date().valueOf() / 1000) - oAccessory.historyService.getInitialTime()
@@ -211,7 +213,7 @@ module.exports = class deviceRFBridge {
                 if (params.updateSource && !this.disableDeviceLogging) {
                   this.log('[%s] current state [triggered]', oAccessory.displayName)
                 }
-                await this.helpers.sleep(sensorTimeLength * 1000)
+                await this.funcs.sleep(sensorTimeLength * 1000)
                 oAccessory.getService(serv).updateCharacteristic(char, 0)
                 oAccessory.historyService.addEntry({
                   time: Math.round(new Date().valueOf() / 1000),
diff --git a/lib/device/scm.js b/lib/device/scm.js
index 7787496d..e88e6152 100644
--- a/lib/device/scm.js
+++ b/lib/device/scm.js
@@ -4,16 +4,17 @@
 module.exports = class deviceSCM {
   constructor (platform, accessory) {
     this.platform = platform
+    this.funcs = platform.funcs
+    this.messages = platform.messages
     this.log = platform.log
     this.disableDeviceLogging = platform.config.disableDeviceLogging
-    this.helpers = platform.helpers
-    this.S = platform.api.hap.Service
-    this.C = platform.api.hap.Characteristic
-    this.dName = accessory.displayName
+    this.hapServ = platform.api.hap.Service
+    this.hapChar = platform.api.hap.Characteristic
+    this.name = accessory.displayName
     this.accessory = accessory
 
-    this.service = this.accessory.getService(this.S.Switch) || this.accessory.addService(this.S.Switch)
-    this.service.getCharacteristic(this.C.On)
+    this.service = this.accessory.getService(this.hapServ.Switch) || this.accessory.addService(this.hapServ.Switch)
+    this.service.getCharacteristic(this.hapChar.On)
       .on('set', this.internalUpdate.bind(this))
     this.accessory.log = platform.config.debugFakegato ? this.log : () => {}
     this.accessory.historyService = new this.platform.eveService('switch', this.accessory, {
@@ -25,7 +26,7 @@ module.exports = class deviceSCM {
   async internalUpdate (value, callback) {
     try {
       callback()
-      const params = { switches: this.helpers.defaultMultiSwitchOff }
+      const params = { switches: this.consts.defaultMultiSwitchOff }
       params.switches[0].switch = value ? 'on' : 'off'
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.cacheOnOff = value ? 'on' : 'off'
@@ -34,7 +35,7 @@ module.exports = class deviceSCM {
         status: value ? 1 : 0
       })
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current state [%s].', this.dName, value ? 'on' : 'off')
+        this.log('[%s] current state [%s].', this.name, value ? 'on' : 'off')
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
@@ -47,14 +48,14 @@ module.exports = class deviceSCM {
         return
       }
       const newStatus = params.switches[0].switch === 'on'
-      this.service.updateCharacteristic(this.C.On, newStatus)
+      this.service.updateCharacteristic(this.hapChar.On, newStatus)
       this.cacheOnOff = params.switches[0].switch
       this.accessory.historyService.addEntry({
         time: Math.round(new Date().valueOf() / 1000),
         status: newStatus ? 1 : 0
       })
       if (params.updateSource && !this.disableDeviceLogging) {
-        this.log('[%s] current state [%s].', this.dName, params.switches[0].switch)
+        this.log('[%s] current state [%s].', this.name, params.switches[0].switch)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
diff --git a/lib/device/sensor-ambient.js b/lib/device/sensor-ambient.js
index ac27ea06..5fa0d577 100644
--- a/lib/device/sensor-ambient.js
+++ b/lib/device/sensor-ambient.js
@@ -4,36 +4,37 @@
 module.exports = class deviceSensorAmbient {
   constructor (platform, accessory) {
     this.platform = platform
+    this.funcs = platform.funcs
+    this.messages = platform.messages
     this.log = platform.log
     this.disableDeviceLogging = platform.config.disableDeviceLogging
-    this.helpers = platform.helpers
-    this.S = platform.api.hap.Service
-    this.C = platform.api.hap.Characteristic
-    this.dName = accessory.displayName
+    this.hapServ = platform.api.hap.Service
+    this.hapChar = platform.api.hap.Characteristic
+    this.name = accessory.displayName
     this.accessory = accessory
 
     this.tempOffset = parseFloat(platform.thTempOffset[this.accessory.context.eweDeviceId] || 0)
     this.hideSwitch = (this.platform.config.hideSwitchFromTH || '').split(',').includes(this.accessory.context.eweDeviceId)
-    if (this.accessory.getService(this.S.Thermostat)) {
-      this.accessory.removeService(this.accessory.getService(this.S.Thermostat))
+    if (this.accessory.getService(this.hapServ.Thermostat)) {
+      this.accessory.removeService(this.accessory.getService(this.hapServ.Thermostat))
     }
     if ((this.platform.config.hideSwitchFromTH || '').split(',').includes(this.accessory.context.eweDeviceId)) {
-      if (this.accessory.getService(this.S.Switch)) {
-        this.accessory.removeService(this.accessory.getService(this.S.Switch))
+      if (this.accessory.getService(this.hapServ.Switch)) {
+        this.accessory.removeService(this.accessory.getService(this.hapServ.Switch))
       }
     } else {
-      this.switchService = this.accessory.getService(this.S.Switch) || this.accessory.addService(this.S.Switch)
-      this.switchService.getCharacteristic(this.C.On)
+      this.switchService = this.accessory.getService(this.hapServ.Switch) || this.accessory.addService(this.hapServ.Switch)
+      this.switchService.getCharacteristic(this.hapChar.On)
         .on('set', this.internalUpdate.bind(this))
     }
-    this.tempService = this.accessory.getService(this.S.TemperatureSensor) || this.accessory.addService(this.S.TemperatureSensor)
-    this.tempService.getCharacteristic(this.C.CurrentTemperature)
+    this.tempService = this.accessory.getService(this.hapServ.TemperatureSensor) || this.accessory.addService(this.hapServ.TemperatureSensor)
+    this.tempService.getCharacteristic(this.hapChar.CurrentTemperature)
       .setProps({
         minValue: -100,
         minStep: 0.1
       })
     if (this.accessory.context.sensorType !== 'DS18B20') {
-      this.humiService = this.accessory.getService(this.S.HumiditySensor) || this.accessory.addService(this.S.HumiditySensor)
+      this.humiService = this.accessory.getService(this.hapServ.HumiditySensor) || this.accessory.addService(this.hapServ.HumiditySensor)
     }
     if (this.switchService) {
       this.switchService.setPrimaryService()
@@ -54,7 +55,7 @@ module.exports = class deviceSensorAmbient {
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.cacheOnOff = value ? 'on' : 'off'
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current state [%s].', this.dName, this.cacheOnOff)
+        this.log('[%s] current state [%s].', this.name, this.cacheOnOff)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
@@ -67,40 +68,40 @@ module.exports = class deviceSensorAmbient {
         const newState = params.switch
         if (this.cacheOnOff !== newState) {
           this.cacheOnOff = newState
-          this.switchService.updateCharacteristic(this.C.On, this.cacheOnOff === 'on')
+          this.switchService.updateCharacteristic(this.hapChar.On, this.cacheOnOff === 'on')
           this.accessory.historyService.addEntry({
             time: Math.round(new Date().valueOf() / 1000),
             status: this.cacheOnOff === 'on' ? 1 : 0
           })
           if (params.updateSource && !this.disableDeviceLogging) {
-            this.log('[%s] current state [%s].', this.dName, this.cacheOnOff)
+            this.log('[%s] current state [%s].', this.name, this.cacheOnOff)
           }
         }
       }
       const eveLog = {}
-      if (this.helpers.hasProperty(params, 'currentTemperature') && params.currentTemperature !== 'unavailable') {
+      if (this.funcs.hasProperty(params, 'currentTemperature') && params.currentTemperature !== 'unavailable') {
         const currentTemp = Number(params.currentTemperature) + this.tempOffset
         eveLog.temp = currentTemp
         if (this.cacheTemp !== currentTemp) {
           this.cacheTemp = currentTemp
-          this.tempService.updateCharacteristic(this.C.CurrentTemperature, this.cacheTemp)
+          this.tempService.updateCharacteristic(this.hapChar.CurrentTemperature, this.cacheTemp)
           if (params.updateSource && !this.disableDeviceLogging) {
-            this.log('[%s] current temperature [%s°C].', this.dName, this.cacheTemp)
+            this.log('[%s] current temperature [%s°C].', this.name, this.cacheTemp)
           }
         }
       }
-      if (this.helpers.hasProperty(params, 'currentHumidity') && params.currentHumidity !== 'unavailable' && this.humiService) {
+      if (this.funcs.hasProperty(params, 'currentHumidity') && params.currentHumidity !== 'unavailable' && this.humiService) {
         const currentHumi = parseInt(params.currentHumidity)
         eveLog.humidity = currentHumi
         if (this.cacheHumi !== currentHumi) {
           this.cacheHumi = currentHumi
-          this.humiService.updateCharacteristic(this.C.CurrentRelativeHumidity, this.cacheHumi)
+          this.humiService.updateCharacteristic(this.hapChar.CurrentRelativeHumidity, this.cacheHumi)
           if (params.updateSource && !this.disableDeviceLogging) {
-            this.log('[%s] current humidity [%s%].', this.dName, this.cacheHumi)
+            this.log('[%s] current humidity [%s%].', this.name, this.cacheHumi)
           }
         }
       }
-      if (this.helpers.hasProperty(eveLog, 'temp') || this.helpers.hasProperty(eveLog, 'humidity')) {
+      if (this.funcs.hasProperty(eveLog, 'temp') || this.funcs.hasProperty(eveLog, 'humidity')) {
         eveLog.time = Math.round(new Date().valueOf() / 1000)
         this.accessory.historyService.addEntry(eveLog)
       }
diff --git a/lib/device/sensor-contact.js b/lib/device/sensor-contact.js
index 07642200..9a7aa972 100644
--- a/lib/device/sensor-contact.js
+++ b/lib/device/sensor-contact.js
@@ -4,33 +4,35 @@
 module.exports = class deviceSensorContact {
   constructor (platform, accessory) {
     this.platform = platform
+    this.consts = platform.consts
+    this.funcs = platform.funcs
+    this.messages = platform.messages
     this.log = platform.log
     this.disableDeviceLogging = platform.config.disableDeviceLogging
-    this.helpers = platform.helpers
-    this.S = platform.api.hap.Service
-    this.C = platform.api.hap.Characteristic
-    this.dName = accessory.displayName
+    this.hapServ = platform.api.hap.Service
+    this.hapChar = platform.api.hap.Characteristic
+    this.name = accessory.displayName
     this.accessory = accessory
 
     this.inherits = require('util').inherits
     const self = this
     this.eveLastActivation = function () {
-      self.C.call(this, 'Last Activation', self.helpers.eveUUID.lastActivation)
+      self.hapChar.call(this, 'Last Activation', self.consts.eveUUID.lastActivation)
       this.setProps({
-        format: self.C.Formats.UINT32,
-        unit: self.C.Units.SECONDS,
-        perms: [self.C.Perms.READ, self.C.Perms.NOTIFY]
+        format: self.hapChar.Formats.UINT32,
+        unit: self.hapChar.Units.SECONDS,
+        perms: [self.hapChar.Perms.READ, self.hapChar.Perms.NOTIFY]
       })
       this.value = this.getDefaultValue()
     }
-    this.inherits(this.eveLastActivation, this.C)
-    this.eveLastActivation.UUID = this.helpers.eveUUID.lastActivation
+    this.inherits(this.eveLastActivation, this.hapChar)
+    this.eveLastActivation.UUID = this.consts.eveUUID.lastActivation
     this.lowBattThreshold = parseInt(this.platform.config.lowBattThreshold)
     this.lowBattThreshold = isNaN(this.lowBattThreshold) || this.lowBattThreshold < 5
-      ? this.helpers.defaults.lowBattThreshold
+      ? this.consts.defaults.lowBattThreshold
       : this.lowBattThreshold
-    this.contactService = this.accessory.getService(this.S.ContactSensor) || this.accessory.addService(this.S.ContactSensor)
-    this.batteryService = this.accessory.getService(this.S.BatteryService) || this.accessory.addService(this.S.BatteryService)
+    this.contactService = this.accessory.getService(this.hapServ.ContactSensor) || this.accessory.addService(this.hapServ.ContactSensor)
+    this.batteryService = this.accessory.getService(this.hapServ.BatteryService) || this.accessory.addService(this.hapServ.BatteryService)
     this.accessory.log = platform.config.debugFakegato ? this.log : () => {}
     this.accessory.historyService = new this.platform.eveService('door', this.accessory, {
       storage: 'fs',
@@ -40,14 +42,14 @@ module.exports = class deviceSensorContact {
 
   async externalUpdate (params) {
     try {
-      if (this.helpers.hasProperty(params, 'battery')) {
+      if (this.funcs.hasProperty(params, 'battery')) {
         const scaledBattery = Math.round(params.battery * 33.3)
         if (this.cacheBattery !== scaledBattery) {
           this.cacheBattery = scaledBattery
-          this.batteryService.updateCharacteristic(this.C.BatteryLevel, this.cacheBattery)
-            .updateCharacteristic(this.C.StatusLowBattery, this.cacheBattery < this.lowBattThreshold)
+          this.batteryService.updateCharacteristic(this.hapChar.BatteryLevel, this.cacheBattery)
+            .updateCharacteristic(this.hapChar.StatusLowBattery, this.cacheBattery < this.lowBattThreshold)
           if (params.updateSource && !this.disableDeviceLogging) {
-            this.log('[%s] current battery [%s%].', this.dName, this.cacheBattery)
+            this.log('[%s] current battery [%s%].', this.name, this.cacheBattery)
           }
         }
       }
@@ -56,7 +58,7 @@ module.exports = class deviceSensorContact {
       }
       this.cacheOnOff = params.switch
       const newState = params.switch === 'on' ? 1 : 0
-      this.contactService.updateCharacteristic(this.C.ContactSensorState, newState)
+      this.contactService.updateCharacteristic(this.hapChar.ContactSensorState, newState)
       this.accessory.historyService.addEntry({
         time: Math.round(new Date().valueOf() / 1000),
         status: newState
@@ -68,25 +70,25 @@ module.exports = class deviceSensorContact {
         )
       }
       if (params.updateSource && !this.disableDeviceLogging) {
-        this.log('[%s] current state [contact%s detected].', this.dName, newState === 0 ? '' : ' not')
+        this.log('[%s] current state [contact%s detected].', this.name, newState === 0 ? '' : ' not')
       }
       let oAccessory
-      this.platform.cusG.forEach(async group => {
+      for (const group of Object.entries(this.platform.rfSensors)) {
         if (group.sensorId === this.accessory.context.eweDeviceId && group.type === 'garage') {
           if ((oAccessory = this.platform.devicesInHB.get(group.deviceId + 'SWX'))) {
-            const gdService = oAccessory.getService(this.S.GarageDoorOpener)
+            const gdService = oAccessory.getService(this.hapServ.GarageDoorOpener)
             switch (newState) {
               case 0:
-                gdService.updateCharacteristic(this.C.TargetDoorState, 1)
-                  .updateCharacteristic(this.C.CurrentDoorState, 1)
+                gdService.updateCharacteristic(this.hapChar.TargetDoorState, 1)
+                  .updateCharacteristic(this.hapChar.CurrentDoorState, 1)
                 if (params.updateSource && !this.disableDeviceLogging) {
                   this.log('[%s] current state [closed].', oAccessory.displayName)
                 }
                 break
               case 1:
-                await this.helpers.sleep(Math.max(group.operationTime * 100, 2000))
-                gdService.updateCharacteristic(this.C.TargetDoorState, 0)
-                  .updateCharacteristic(this.C.CurrentDoorState, 0)
+                await this.funcs.sleep(Math.max(group.operationTime * 100, 2000))
+                gdService.updateCharacteristic(this.hapChar.TargetDoorState, 0)
+                  .updateCharacteristic(this.hapChar.CurrentDoorState, 0)
                 if (params.updateSource && !this.disableDeviceLogging) {
                   this.log('[%s] current state [open].', oAccessory.displayName)
                 }
@@ -94,7 +96,7 @@ module.exports = class deviceSensorContact {
             }
           }
         }
-      })
+      }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
diff --git a/lib/device/simulation/blind.js b/lib/device/simulation/blind.js
index 496c7e99..c31747ba 100644
--- a/lib/device/simulation/blind.js
+++ b/lib/device/simulation/blind.js
@@ -4,33 +4,34 @@
 module.exports = class deviceBlind {
   constructor (platform, accessory) {
     this.platform = platform
+    this.funcs = platform.funcs
+    this.messages = platform.messages
     this.log = platform.log
     this.disableDeviceLogging = platform.config.disableDeviceLogging
-    this.helpers = platform.helpers
-    this.S = platform.api.hap.Service
-    this.C = platform.api.hap.Characteristic
-    this.dName = accessory.displayName
+    this.hapServ = platform.api.hap.Service
+    this.hapChar = platform.api.hap.Characteristic
+    this.name = accessory.displayName
     this.accessory = accessory
 
-    if (!(this.service = this.accessory.getService(this.S.WindowCovering))) {
-      this.service = this.accessory.addService(this.S.WindowCovering)
-      this.service.setCharacteristic(this.C.CurrentPosition, 0)
-        .setCharacteristic(this.C.TargetPosition, 0)
-        .setCharacteristic(this.C.PositionState, 2)
+    if (!(this.service = this.accessory.getService(this.hapServ.WindowCovering))) {
+      this.service = this.accessory.addService(this.hapServ.WindowCovering)
+      this.service.setCharacteristic(this.hapChar.CurrentPosition, 0)
+        .setCharacteristic(this.hapChar.TargetPosition, 0)
+        .setCharacteristic(this.hapChar.PositionState, 2)
     }
-    this.service.getCharacteristic(this.C.TargetPosition)
+    this.service.getCharacteristic(this.hapChar.TargetPosition)
       .on('set', this.internalUpdate.bind(this))
   }
 
   async internalUpdate (value, callback) {
     try {
       callback()
-      const blindConfig = this.platform.cusG.get(this.accessory.context.eweDeviceId)
+      const blindConfig = this.platform.simulations[this.accessory.context.eweDeviceId]
       let prevPosition = this.accessory.context.cacheCurrentPosition
       if (value === prevPosition) {
         return
       }
-      const params = { switches: this.helpers.defaultMultiSwitchOff }
+      const params = { switches: this.consts.defaultMultiSwitchOff }
       const prevState = this.accessory.context.cachePositionState
       const percentStepPerDecisecond = blindConfig.operationTime / 100
       const updateKey = Math.random().toString(36).substr(2, 8)
@@ -44,7 +45,7 @@ module.exports = class deviceBlind {
         } else {
           prevPosition += positionPercentChange
         }
-        this.service.updateCharacteristic(this.C.CurrentPosition, prevPosition)
+        this.service.updateCharacteristic(this.hapChar.CurrentPosition, prevPosition)
         this.accessory.context.cacheCurrentPosition = prevPosition
       }
       const diffPosition = value - prevPosition
@@ -56,19 +57,19 @@ module.exports = class deviceBlind {
       this.accessory.context.cacheTargetPosition = value
       this.accessory.context.cachePositionState = setToMoveUp ? 1 : 0
       this.accessory.context.cacheLastStartTime = Math.floor(Date.now() / 100)
-      await this.helpers.sleep(decisecondsToMove * 100)
+      await this.funcs.sleep(decisecondsToMove * 100)
       if (this.updateKey !== updateKey) {
         return
       }
       params.switches[0].switch = 'off'
       params.switches[1].switch = 'off'
       await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.service.updateCharacteristic(this.C.PositionState, 2)
-        .updateCharacteristic(this.C.CurrentPosition, value)
+      this.service.updateCharacteristic(this.hapChar.PositionState, 2)
+        .updateCharacteristic(this.hapChar.CurrentPosition, value)
       this.accessory.context.cachePositionState = 2
       this.accessory.context.cacheCurrentPosition = value
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current position [%s%]', this.dName, value)
+        this.log('[%s] current position [%s%]', this.name, value)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
diff --git a/lib/device/simulation/garage-eachen.js b/lib/device/simulation/garage-eachen.js
index 6833f8aa..6481e54c 100644
--- a/lib/device/simulation/garage-eachen.js
+++ b/lib/device/simulation/garage-eachen.js
@@ -4,48 +4,49 @@
 module.exports = class deviceGarageEachen {
   constructor (platform, accessory) {
     this.platform = platform
+    this.funcs = platform.funcs
+    this.messages = platform.messages
     this.log = platform.log
     this.disableDeviceLogging = platform.config.disableDeviceLogging
-    this.helpers = platform.helpers
-    this.S = platform.api.hap.Service
-    this.C = platform.api.hap.Characteristic
-    this.dName = accessory.displayName
+    this.hapServ = platform.api.hap.Service
+    this.hapChar = platform.api.hap.Characteristic
+    this.name = accessory.displayName
     this.accessory = accessory
 
-    this.operationTime = parseInt(platform.cusG.get(this.accessory.context.eweDeviceId).operationTime)
+    this.operationTime = parseInt(platform.simulations[this.accessory.context.eweDeviceId].operationTime)
     this.operationTime = isNaN(this.operationTime) || this.operationTime < 20
-      ? this.helpers.defaults.operationTime
+      ? this.consts.defaults.operationTime
       : this.operationTime
 
-    if (!(this.service = this.accessory.getService(this.S.GarageDoorOpener))) {
-      this.service = this.accessory.addService(this.S.GarageDoorOpener)
-      this.service.setCharacteristic(this.C.CurrentDoorState, 1)
-        .setCharacteristic(this.C.TargetDoorState, 1)
-        .setCharacteristic(this.C.ObstructionDetected, false)
+    if (!(this.service = this.accessory.getService(this.hapServ.GarageDoorOpener))) {
+      this.service = this.accessory.addService(this.hapServ.GarageDoorOpener)
+      this.service.setCharacteristic(this.hapChar.CurrentDoorState, 1)
+        .setCharacteristic(this.hapChar.TargetDoorState, 1)
+        .setCharacteristic(this.hapChar.ObstructionDetected, false)
     }
-    this.service.getCharacteristic(this.C.TargetDoorState)
+    this.service.getCharacteristic(this.hapChar.TargetDoorState)
       .on('set', this.internalUpdate.bind(this))
-    this.service.updateCharacteristic(this.C.ObstructionDetected, false)
+    this.service.updateCharacteristic(this.hapChar.ObstructionDetected, false)
   }
 
   async internalUpdate (value, callback) {
     try {
       callback()
       const params = { switch: value === 0 ? 'on' : 'off' }
-      if (value === this.service.getCharacteristic(this.C.CurrentDoorState).value % 2) {
+      if (value === this.service.getCharacteristic(this.hapChar.CurrentDoorState).value % 2) {
         return
       }
       this.inUse = true
       await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.service.updateCharacteristic(this.C.TargetDoorState, value)
-        .updateCharacteristic(this.C.CurrentDoorState, value + 2)
-      await this.helpers.sleep(2000)
+      this.service.updateCharacteristic(this.hapChar.TargetDoorState, value)
+        .updateCharacteristic(this.hapChar.CurrentDoorState, value + 2)
+      await this.funcs.sleep(2000)
       this.inUse = false
       if (value === 0) {
-        await this.helpers.sleep(Math.max((this.operationTime - 20) * 100, 0))
-        this.service.updateCharacteristic(this.C.CurrentDoorState, 0)
+        await this.funcs.sleep(Math.max((this.operationTime - 20) * 100, 0))
+        this.service.updateCharacteristic(this.hapChar.CurrentDoorState, 0)
         if (!this.disableDeviceLogging) {
-          this.log('[%s] current state [open].', this.dName)
+          this.log('[%s] current state [open].', this.name)
         }
       }
     } catch (err) {
@@ -59,10 +60,10 @@ module.exports = class deviceGarageEachen {
       if (!params.switch || this.inUse) {
         return
       }
-      this.service.updateCharacteristic(this.C.TargetDoorState, params.switch === 'on' ? 0 : 1)
-        .updateCharacteristic(this.C.CurrentDoorState, params.switch === 'on' ? 0 : 1)
+      this.service.updateCharacteristic(this.hapChar.TargetDoorState, params.switch === 'on' ? 0 : 1)
+        .updateCharacteristic(this.hapChar.CurrentDoorState, params.switch === 'on' ? 0 : 1)
       if (params.updateSource && !this.disableDeviceLogging) {
-        this.log('[%s] current state [%s].', this.dName, params.switch === 'on' ? 'open' : 'closed')
+        this.log('[%s] current state [%s].', this.name, params.switch === 'on' ? 'open' : 'closed')
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
diff --git a/lib/device/simulation/garage-four.js b/lib/device/simulation/garage-four.js
index 863b364c..98e8a8c1 100644
--- a/lib/device/simulation/garage-four.js
+++ b/lib/device/simulation/garage-four.js
@@ -4,29 +4,30 @@
 module.exports = class deviceGarageFour {
   constructor (platform, accessory) {
     this.platform = platform
+    this.funcs = platform.funcs
+    this.messages = platform.messages
     this.log = platform.log
     this.disableDeviceLogging = platform.config.disableDeviceLogging
-    this.helpers = platform.helpers
-    this.S = platform.api.hap.Service
-    this.C = platform.api.hap.Characteristic
+    this.hapServ = platform.api.hap.Service
+    this.hapChar = platform.api.hap.Characteristic
 
-    this.dName = accessory.displayName
+    this.name = accessory.displayName
     this.accessory = accessory
 
-    this.operationTime = parseInt(platform.cusG.get(this.accessory.context.eweDeviceId).operationTime)
+    this.operationTime = parseInt(platform.simulations[this.accessory.context.eweDeviceId].operationTime)
     this.operationTime = isNaN(this.operationTime) || this.operationTime < 20
-      ? this.helpers.defaults.operationTime
+      ? this.consts.defaults.operationTime
       : this.operationTime
 
     ;['A', 'B', 'C', 'D'].forEach(v => {
       let gdService
       if (!(gdService = this.accessory.getService('Garage ' + v))) {
-        gdService = this.accessory.addService(this.S.GarageDoorOpener, 'Garage ' + v, 'garage' + v)
-        gdService.setCharacteristic(this.C.CurrentDoorState, 1)
-          .setCharacteristic(this.C.TargetDoorState, 1)
-          .setCharacteristic(this.C.ObstructionDetected, false)
+        gdService = this.accessory.addService(this.hapServ.GarageDoorOpener, 'Garage ' + v, 'garage' + v)
+        gdService.setCharacteristic(this.hapChar.CurrentDoorState, 1)
+          .setCharacteristic(this.hapChar.TargetDoorState, 1)
+          .setCharacteristic(this.hapChar.ObstructionDetected, false)
       }
-      gdService.getCharacteristic(this.C.TargetDoorState)
+      gdService.getCharacteristic(this.hapChar.TargetDoorState)
         .on('set', (value, callback) => this.internalUpdate(v, value, callback))
     })
   }
@@ -57,23 +58,23 @@ module.exports = class deviceGarageFour {
       this.inUse = true
       const updateKey = Math.random().toString(36).substr(2, 8)
       this.updateKey = updateKey
-      gdService.updateCharacteristic(this.C.TargetDoorState, value)
-        .updateCharacteristic(this.C.CurrentDoorState, value + 2)
+      gdService.updateCharacteristic(this.hapChar.TargetDoorState, value)
+        .updateCharacteristic(this.hapChar.CurrentDoorState, value + 2)
       this.accessory.context.cacheStates[garageChannel].cacheTargetDoorState = value
       this.accessory.context.cacheStates[garageChannel].cacheCurrentDoorState = value + 2
-      const params = { switches: this.helpers.defaultMultiSwitchOff }
+      const params = { switches: this.consts.defaultMultiSwitchOff }
       ;[0, 1, 2, 3].forEach(i => (params.switches[i].switch = garageChannel === i ? 'on' : 'off'))
       await this.platform.sendDeviceUpdate(this.accessory, params)
-      await this.helpers.sleep(2000)
+      await this.funcs.sleep(2000)
       this.inUse = false
-      await this.helpers.sleep(Math.max((this.operationTime - 20) * 100, 0))
+      await this.funcs.sleep(Math.max((this.operationTime - 20) * 100, 0))
       if (this.updateKey !== updateKey) {
         return
       }
-      gdService.updateCharacteristic(this.C.CurrentDoorState, value)
+      gdService.updateCharacteristic(this.hapChar.CurrentDoorState, value)
       this.accessory.context.cacheStates[garageChannel].cacheCurrentDoorState = value
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current state [garage %s %s].', this.dName, garageChannel, value === 0 ? 'open' : 'closed')
+        this.log('[%s] current state [garage %s %s].', this.name, garageChannel, value === 0 ? 'open' : 'closed')
       }
     } catch (err) {
       this.inUse = false
diff --git a/lib/device/simulation/garage-od-switch.js b/lib/device/simulation/garage-od-switch.js
index bf9ea6c5..3a7d7ed9 100644
--- a/lib/device/simulation/garage-od-switch.js
+++ b/lib/device/simulation/garage-od-switch.js
@@ -4,25 +4,26 @@
 module.exports = class deviceGarageODSwitch {
   constructor (platform, accessory) {
     this.platform = platform
+    this.funcs = platform.funcs
+    this.messages = platform.messages
     this.log = platform.log
     this.disableDeviceLogging = platform.config.disableDeviceLogging
-    this.helpers = platform.helpers
-    this.S = platform.api.hap.Service
-    this.C = platform.api.hap.Characteristic
-    this.dName = accessory.displayName
+    this.hapServ = platform.api.hap.Service
+    this.hapChar = platform.api.hap.Characteristic
+    this.name = accessory.displayName
     this.accessory = accessory
 
     this.garageId = platform.obstructSwitches[this.accessory.context.eweDeviceId]
     this.garage = platform.devicesInHB.get(this.garageId + 'SWX')
 
-    this.service = this.accessory.getService(this.S.Switch) || this.accessory.addService(this.S.Switch)
-    this.service.getCharacteristic(this.C.On)
+    this.service = this.accessory.getService(this.hapServ.Switch) || this.accessory.addService(this.hapServ.Switch)
+    this.service.getCharacteristic(this.hapChar.On)
       .on('set', this.internalUpdate.bind(this))
 
-    this.gService = this.garage.getService(this.S.GarageDoorOpener)
+    this.gService = this.garage.getService(this.hapServ.GarageDoorOpener)
     this.gService.updateCharacteristic(
-      this.C.ObstructionDetected,
-      this.service.getCharacteristic(this.C.On).value
+      this.hapChar.ObstructionDetected,
+      this.service.getCharacteristic(this.hapChar.On).value
     )
   }
 
@@ -34,9 +35,9 @@ module.exports = class deviceGarageODSwitch {
       })
       this.cacheOnOff = value ? 'on' : 'off'
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current state [%s].', this.dName, this.cacheOnOff)
+        this.log('[%s] current state [%s].', this.name, this.cacheOnOff)
       }
-      this.gService.updateCharacteristic(this.C.ObstructionDetected, value)
+      this.gService.updateCharacteristic(this.hapChar.ObstructionDetected, value)
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
     }
@@ -48,11 +49,11 @@ module.exports = class deviceGarageODSwitch {
         return
       }
       const newStatus = params.switch === 'on'
-      this.service.updateCharacteristic(this.C.On, newStatus)
-      this.gService.updateCharacteristic(this.C.ObstructionDetected, newStatus)
+      this.service.updateCharacteristic(this.hapChar.On, newStatus)
+      this.gService.updateCharacteristic(this.hapChar.ObstructionDetected, newStatus)
       this.cacheOnOff = params.switch
       if (params.updateSource && !this.disableDeviceLogging) {
-        this.log('[%s] current state [%s].', this.dName, this.cacheOnOff)
+        this.log('[%s] current state [%s].', this.name, this.cacheOnOff)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
diff --git a/lib/device/simulation/garage-one.js b/lib/device/simulation/garage-one.js
index ac6995af..68f5432d 100644
--- a/lib/device/simulation/garage-one.js
+++ b/lib/device/simulation/garage-one.js
@@ -4,22 +4,23 @@
 module.exports = class deviceGarageOne {
   constructor (platform, accessory) {
     this.platform = platform
+    this.funcs = platform.funcs
+    this.messages = platform.messages
     this.log = platform.log
     this.disableDeviceLogging = platform.config.disableDeviceLogging
-    this.helpers = platform.helpers
-    this.S = platform.api.hap.Service
-    this.C = platform.api.hap.Characteristic
-    this.dName = accessory.displayName
+    this.hapServ = platform.api.hap.Service
+    this.hapChar = platform.api.hap.Characteristic
+    this.name = accessory.displayName
     this.accessory = accessory
 
-    const asConfig = platform.cusG.get(this.accessory.context.eweDeviceId)
+    const asConfig = platform.simulations[this.accessory.context.eweDeviceId]
     if (!['oneSwitch', 'twoSwitch'].includes(asConfig.setup)) {
       this.error = 'setup must be oneSwitch or twoSwitch'
     }
     this.setup = asConfig.setup
     this.operationTime = parseInt(asConfig.operationTime)
     this.operationTime = isNaN(this.operationTime) || this.operationTime < 20
-      ? this.helpers.defaults.operationTime
+      ? this.consts.defaults.operationTime
       : this.operationTime
     if (asConfig.sensorId) {
       if (!this.platform.devicesInHB.has(asConfig.sensorId + 'SWX')) {
@@ -31,14 +32,14 @@ module.exports = class deviceGarageOne {
       this.definedSensor = this.platform.devicesInHB.get(asConfig.sensorId + 'SWX')
     }
 
-    if (!(this.service = this.accessory.getService(this.S.GarageDoorOpener))) {
-      this.accessory.addService(this.S.GarageDoorOpener)
-        .setCharacteristic(this.C.CurrentDoorState, 1)
-        .setCharacteristic(this.C.TargetDoorState, 1)
-        .setCharacteristic(this.C.ObstructionDetected, false)
-      this.service = this.accessory.getService(this.S.GarageDoorOpener)
+    if (!(this.service = this.accessory.getService(this.hapServ.GarageDoorOpener))) {
+      this.accessory.addService(this.hapServ.GarageDoorOpener)
+        .setCharacteristic(this.hapChar.CurrentDoorState, 1)
+        .setCharacteristic(this.hapChar.TargetDoorState, 1)
+        .setCharacteristic(this.hapChar.ObstructionDetected, false)
+      this.service = this.accessory.getService(this.hapServ.GarageDoorOpener)
     }
-    this.service.getCharacteristic(this.C.TargetDoorState)
+    this.service.getCharacteristic(this.hapChar.TargetDoorState)
       .on('set', this.internalUpdate.bind(this))
   }
 
@@ -46,14 +47,14 @@ module.exports = class deviceGarageOne {
     try {
       callback()
       if (this.error) {
-        this.log.warn('[%s] invalid config - %s.', this.dName, this.error)
+        this.log.warn('[%s] invalid config - %s.', this.name, this.error)
         return
       }
       const newPos = value
       const params = {}
       let delay = 0
       const prevState = this.definedSensor
-        ? this.definedSensor.getService(this.S.ContactSensor).getCharacteristic(this.C.ContactSensorState).value === 0
+        ? this.definedSensor.getService(this.hapServ.ContactSensor).getCharacteristic(this.hapChar.ContactSensorState).value === 0
           ? 1
           : 0
         : this.accessory.context.cacheCurrentDoorState
@@ -63,16 +64,16 @@ module.exports = class deviceGarageOne {
       this.inUse = true
       this.cacheState = value
       if (this.setup === 'oneSwitch' && [2, 3].includes(prevState)) {
-        this.service.updateCharacteristic(this.C.CurrentDoorState, ((prevState * 2) % 3) + 2)
+        this.service.updateCharacteristic(this.hapChar.CurrentDoorState, ((prevState * 2) % 3) + 2)
         this.accessory.context.cacheCurrentDoorState = ((prevState * 2) % 3) + 2
         delay = 1500
       }
       if (this.cacheState !== newPos) {
         return
       }
-      await this.helpers.sleep(delay)
-      this.service.updateCharacteristic(this.C.TargetDoorState, newPos)
-        .updateCharacteristic(this.C.CurrentDoorState, newPos + 2)
+      await this.funcs.sleep(delay)
+      this.service.updateCharacteristic(this.hapChar.TargetDoorState, newPos)
+        .updateCharacteristic(this.hapChar.CurrentDoorState, newPos + 2)
       this.accessory.context.cacheTargetDoorState = newPos
       this.accessory.context.cacheCurrentDoorState = newPos + 2
       switch (this.setup) {
@@ -80,20 +81,20 @@ module.exports = class deviceGarageOne {
           params.switch = 'on'
           break
         case 'twoSwitch':
-          params.switches = this.helpers.defaultMultiSwitchOff
+          params.switches = this.consts.defaultMultiSwitchOff
           params.switches[0].switch = newPos === 0 ? 'on' : 'off'
           params.switches[1].switch = newPos === 1 ? 'on' : 'off'
           break
       }
       await this.platform.sendDeviceUpdate(this.accessory, params)
-      await this.helpers.sleep(2000)
+      await this.funcs.sleep(2000)
       this.inUse = false
-      await this.helpers.sleep(Math.max((this.operationTime - 20) * 100, 0))
+      await this.funcs.sleep(Math.max((this.operationTime - 20) * 100, 0))
       if (!this.definedSensor) {
-        this.service.updateCharacteristic(this.C.CurrentDoorState, newPos)
+        this.service.updateCharacteristic(this.hapChar.CurrentDoorState, newPos)
         this.accessory.context.cacheCurrentDoorState = newPos
         if (!this.disableDeviceLogging) {
-          this.log('[%s] current state [%s].', this.dName, newPos === 0 ? 'open' : 'closed')
+          this.log('[%s] current state [%s].', this.name, newPos === 0 ? 'open' : 'closed')
         }
       }
     } catch (err) {
@@ -105,7 +106,7 @@ module.exports = class deviceGarageOne {
   async externalUpdate (params) {
     try {
       if (this.error) {
-        this.log.warn('[%s] invalid config - %s.', this.dName, this.error)
+        this.log.warn('[%s] invalid config - %s.', this.name, this.error)
         return
       }
       if ((!params.switch && !params.switches) || this.inUse || this.definedSensor) {
@@ -129,17 +130,17 @@ module.exports = class deviceGarageOne {
           break
       }
       this.inUse = true
-      this.service.updateCharacteristic(this.C.TargetDoorState, newPos - 2)
-        .updateCharacteristic(this.C.CurrentDoorState, newPos)
+      this.service.updateCharacteristic(this.hapChar.TargetDoorState, newPos - 2)
+        .updateCharacteristic(this.hapChar.CurrentDoorState, newPos)
       this.accessory.context.cacheCurrentDoorState = newPos
       this.accessory.context.cacheTargetDoorState = newPos - 2
-      await this.helpers.sleep(2000)
+      await this.funcs.sleep(2000)
       this.inUse = false
-      await this.helpers.sleep(Math.max((this.operationTime - 20) * 100, 0))
-      this.service.updateCharacteristic(this.C.CurrentDoorState, newPos - 2)
+      await this.funcs.sleep(Math.max((this.operationTime - 20) * 100, 0))
+      this.service.updateCharacteristic(this.hapChar.CurrentDoorState, newPos - 2)
       this.accessory.context.cacheCurrentDoorState = newPos - 2
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current state [%s].', this.dName, newPos === 2 ? 'open' : 'closed')
+        this.log('[%s] current state [%s].', this.name, newPos === 2 ? 'open' : 'closed')
       }
     } catch (err) {
       this.inUse = false
diff --git a/lib/device/simulation/garage-two.js b/lib/device/simulation/garage-two.js
index 21ecde3e..6579ebb0 100644
--- a/lib/device/simulation/garage-two.js
+++ b/lib/device/simulation/garage-two.js
@@ -4,28 +4,29 @@
 module.exports = class deviceGarageTwo {
   constructor (platform, accessory) {
     this.platform = platform
+    this.funcs = platform.funcs
+    this.messages = platform.messages
     this.log = platform.log
     this.disableDeviceLogging = platform.config.disableDeviceLogging
-    this.helpers = platform.helpers
-    this.S = platform.api.hap.Service
-    this.C = platform.api.hap.Characteristic
-    this.dName = accessory.displayName
+    this.hapServ = platform.api.hap.Service
+    this.hapChar = platform.api.hap.Characteristic
+    this.name = accessory.displayName
     this.accessory = accessory
 
-    this.operationTime = parseInt(platform.cusG.get(this.accessory.context.eweDeviceId).operationTime)
+    this.operationTime = parseInt(platform.simulations[this.accessory.context.eweDeviceId].operationTime)
     this.operationTime = isNaN(this.operationTime) || this.operationTime < 20
-      ? this.helpers.defaults.operationTime
+      ? this.consts.defaults.operationTime
       : this.operationTime
 
     ;['1', '2'].forEach(v => {
       let gdService
       if (!(gdService = this.accessory.getService('Garage ' + v))) {
-        gdService = this.accessory.addService(this.S.GarageDoorOpener, 'Garage ' + v, 'garage' + v)
-        gdService.setCharacteristic(this.C.CurrentDoorState, 1)
-          .setCharacteristic(this.C.TargetDoorState, 1)
-          .setCharacteristic(this.C.ObstructionDetected, false)
+        gdService = this.accessory.addService(this.hapServ.GarageDoorOpener, 'Garage ' + v, 'garage' + v)
+        gdService.setCharacteristic(this.hapChar.CurrentDoorState, 1)
+          .setCharacteristic(this.hapChar.TargetDoorState, 1)
+          .setCharacteristic(this.hapChar.ObstructionDetected, false)
       }
-      gdService.getCharacteristic(this.C.TargetDoorState)
+      gdService.getCharacteristic(this.hapChar.TargetDoorState)
         .on('set', (value, callback) => this.internalUpdate('Garage' + v, value, callback))
     })
   }
@@ -43,8 +44,8 @@ module.exports = class deviceGarageTwo {
         return
       }
       this.inUse = true
-      gdService.updateCharacteristic(this.C.TargetDoorState, newPos)
-        .updateCharacteristic(this.C.CurrentDoorState, newPos + 2)
+      gdService.updateCharacteristic(this.hapChar.TargetDoorState, newPos)
+        .updateCharacteristic(this.hapChar.CurrentDoorState, newPos + 2)
       switch (garage) {
         case 'Garage 1': {
           this.accessory.context.cacheOneTargetDoorState = newPos
@@ -62,22 +63,22 @@ module.exports = class deviceGarageTwo {
         }
       }
       await this.platform.sendDeviceUpdate(this.accessory, params)
-      await this.helpers.sleep(2000)
+      await this.funcs.sleep(2000)
       this.inUse = false
-      await this.helpers.sleep(Math.max((this.operationTime - 20) * 100, 0))
-      gdService.updateCharacteristic(this.C.CurrentDoorState, newPos)
+      await this.funcs.sleep(Math.max((this.operationTime - 20) * 100, 0))
+      gdService.updateCharacteristic(this.hapChar.CurrentDoorState, newPos)
       switch (garage) {
         case 'Garage 1': {
           this.accessory.context.cacheOneCurrentDoorState = newPos
           if (!this.disableDeviceLogging) {
-            this.log('[%s] current state [garage 1 %s].', this.dName, newPos === 0 ? 'open' : 'closed')
+            this.log('[%s] current state [garage 1 %s].', this.name, newPos === 0 ? 'open' : 'closed')
           }
           break
         }
         case 'Garage 2': {
           this.accessory.context.cacheTwoCurrentDoorState = newPos
           if (!this.disableDeviceLogging) {
-            this.log('[%s] current state [garage 2 %s].', this.dName, newPos === 0 ? 'open' : 'closed')
+            this.log('[%s] current state [garage 2 %s].', this.name, newPos === 0 ? 'open' : 'closed')
           }
           break
         }
@@ -119,8 +120,8 @@ module.exports = class deviceGarageTwo {
             break
         }
         this.inUse = true
-        gcService.updateCharacteristic(this.C.TargetDoorState, newPos - 2)
-          .updateCharacteristic(this.C.CurrentDoorState, newPos)
+        gcService.updateCharacteristic(this.hapChar.TargetDoorState, newPos - 2)
+          .updateCharacteristic(this.hapChar.CurrentDoorState, newPos)
         switch (v) {
           case '1':
             this.accessory.context.cacheOneCurrentDoorState = newPos
@@ -131,21 +132,21 @@ module.exports = class deviceGarageTwo {
             this.accessory.context.cacheTwoTargetDoorState = newPos - 2
             break
         }
-        await this.helpers.sleep(2000)
+        await this.funcs.sleep(2000)
         this.inUse = false
-        await this.helpers.sleep(Math.max((this.operationTime - 20) * 100, 0))
-        gcService.updateCharacteristic(this.C.CurrentDoorState, newPos - 2)
+        await this.funcs.sleep(Math.max((this.operationTime - 20) * 100, 0))
+        gcService.updateCharacteristic(this.hapChar.CurrentDoorState, newPos - 2)
         switch (v) {
           case '1':
             this.accessory.context.cacheOneCurrentDoorState = newPos - 2
             if (params.updateSource && !this.disableDeviceLogging) {
-              this.log('[%s] current state [garage 1 %s].', this.dName, newPos === 2 ? 'open' : 'closed')
+              this.log('[%s] current state [garage 1 %s].', this.name, newPos === 2 ? 'open' : 'closed')
             }
             break
           case '2':
             this.accessory.context.cacheTwoCurrentDoorState = newPos - 2
             if (params.updateSource && !this.disableDeviceLogging) {
-              this.log('[%s] current state [garage 2 %s].', this.dName, newPos === 2 ? 'open' : 'closed')
+              this.log('[%s] current state [garage 2 %s].', this.name, newPos === 2 ? 'open' : 'closed')
             }
             break
         }
diff --git a/lib/device/simulation/lock-one.js b/lib/device/simulation/lock-one.js
index d9f50b18..4d88cbf0 100644
--- a/lib/device/simulation/lock-one.js
+++ b/lib/device/simulation/lock-one.js
@@ -4,36 +4,37 @@
 module.exports = class deviceLockOne {
   constructor (platform, accessory) {
     this.platform = platform
+    this.funcs = platform.funcs
+    this.messages = platform.messages
     this.log = platform.log
     this.disableDeviceLogging = platform.config.disableDeviceLogging
-    this.helpers = platform.helpers
-    this.S = platform.api.hap.Service
-    this.C = platform.api.hap.Characteristic
-    this.dName = accessory.displayName
+    this.hapServ = platform.api.hap.Service
+    this.hapChar = platform.api.hap.Characteristic
+    this.name = accessory.displayName
     this.accessory = accessory
 
-    const asConfig = platform.cusG.get(this.accessory.context.eweDeviceId)
+    const asConfig = platform.simulations[this.accessory.context.eweDeviceId]
     if (!['oneSwitch', 'twoSwitch'].includes(asConfig.setup)) {
       this.error = 'setup must be oneSwitch or twoSwitch'
     }
     this.setup = asConfig.setup
     this.operationTime = parseInt(asConfig.operationTime)
     this.operationTime = isNaN(this.operationTime) || this.operationTime < 20
-      ? this.helpers.defaults.operationTime
+      ? this.consts.defaults.operationTime
       : this.operationTime
 
-    this.service = this.accessory.getService(this.S.LockMechanism) || this.accessory.addService(this.S.LockMechanism)
-    this.service.getCharacteristic(this.C.LockTargetState)
+    this.service = this.accessory.getService(this.hapServ.LockMechanism) || this.accessory.addService(this.hapServ.LockMechanism)
+    this.service.getCharacteristic(this.hapChar.LockTargetState)
       .on('set', this.internalUpdate.bind(this))
-    this.service.updateCharacteristic(this.C.LockCurrentState, 1)
-      .updateCharacteristic(this.C.LockTargetState, 1)
+    this.service.updateCharacteristic(this.hapChar.LockCurrentState, 1)
+      .updateCharacteristic(this.hapChar.LockTargetState, 1)
   }
 
   async internalUpdate (value, callback) {
     try {
       callback()
       if (this.error) {
-        this.log.warn('[%s] invalid config - %s.', this.dName, this.error)
+        this.log.warn('[%s] invalid config - %s.', this.name, this.error)
         return
       }
       const params = {}
@@ -42,22 +43,22 @@ module.exports = class deviceLockOne {
           params.switch = 'on'
           break
         case 'twoSwitch':
-          params.switches = this.helpers.defaultMultiSwitchOff
+          params.switches = this.consts.defaultMultiSwitchOff
           params.switches[0].switch = 'on'
           break
       }
       this.inUse = true
       await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.service.setCharacteristic(this.C.LockCurrentState, 0)
+      this.service.setCharacteristic(this.hapChar.LockCurrentState, 0)
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current status [unlocked].', this.dName)
+        this.log('[%s] current status [unlocked].', this.name)
       }
-      await this.helpers.sleep(Math.max(this.operationTime * 100, 1000))
-      this.service.updateCharacteristic(this.C.LockTargetState, 1)
-      this.service.setCharacteristic(this.C.LockCurrentState, 1)
+      await this.funcs.sleep(Math.max(this.operationTime * 100, 1000))
+      this.service.updateCharacteristic(this.hapChar.LockTargetState, 1)
+      this.service.setCharacteristic(this.hapChar.LockCurrentState, 1)
       this.inUse = false
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current status [locked].', this.dName)
+        this.log('[%s] current status [locked].', this.name)
       }
     } catch (err) {
       this.inUse = false
@@ -68,7 +69,7 @@ module.exports = class deviceLockOne {
   async externalUpdate (params) {
     try {
       if (this.error) {
-        this.log.warn('[%s] invalid config - %s.', this.dName, this.error)
+        this.log.warn('[%s] invalid config - %s.', this.name, this.error)
         return
       }
       if (this.inUse) {
@@ -87,17 +88,17 @@ module.exports = class deviceLockOne {
           break
       }
       this.inUse = true
-      this.service.updateCharacteristic(this.C.LockCurrentState, 0)
-        .updateCharacteristic(this.C.LockTargetState, 0)
+      this.service.updateCharacteristic(this.hapChar.LockCurrentState, 0)
+        .updateCharacteristic(this.hapChar.LockTargetState, 0)
       if (params.updateSource && !this.disableDeviceLogging) {
-        this.log('[%s] current status [unlocked].', this.dName)
+        this.log('[%s] current status [unlocked].', this.name)
       }
-      await this.helpers.sleep(Math.max(this.operationTime * 100, 1000))
-      this.service.updateCharacteristic(this.C.LockCurrentState, 1)
-        .updateCharacteristic(this.C.LockTargetState, 1)
+      await this.funcs.sleep(Math.max(this.operationTime * 100, 1000))
+      this.service.updateCharacteristic(this.hapChar.LockCurrentState, 1)
+        .updateCharacteristic(this.hapChar.LockTargetState, 1)
       this.inUse = false
       if (params.updateSource && !this.disableDeviceLogging) {
-        this.log('[%s] current status [locked].', this.dName)
+        this.log('[%s] current status [locked].', this.name)
       }
     } catch (err) {
       this.inUse = false
diff --git a/lib/device/simulation/switch-valve.js b/lib/device/simulation/switch-valve.js
index f1d4949a..23ac9c73 100644
--- a/lib/device/simulation/switch-valve.js
+++ b/lib/device/simulation/switch-valve.js
@@ -4,33 +4,34 @@
 module.exports = class deviceSwitchValve {
   constructor (platform, accessory) {
     this.platform = platform
+    this.funcs = platform.funcs
+    this.messages = platform.messages
     this.log = platform.log
     this.disableDeviceLogging = platform.config.disableDeviceLogging
-    this.helpers = platform.helpers
-    this.S = platform.api.hap.Service
-    this.C = platform.api.hap.Characteristic
-    this.dName = accessory.displayName
+    this.hapServ = platform.api.hap.Service
+    this.hapChar = platform.api.hap.Characteristic
+    this.name = accessory.displayName
     this.accessory = accessory
 
-    this.sService = this.accessory.getService(this.S.Switch) || this.accessory.addService(this.S.Switch)
-    if (!(this.vService = this.accessory.getService(this.S.Valve))) {
-      this.vService = this.accessory.addService(this.S.Valve)
-      this.vService.setCharacteristic(this.C.Active, 0)
-        .setCharacteristic(this.C.InUse, 0)
-        .setCharacteristic(this.C.ValveType, 1)
-        .setCharacteristic(this.C.SetDuration, 120)
-        .addCharacteristic(this.C.RemainingDuration)
+    this.sService = this.accessory.getService(this.hapServ.Switch) || this.accessory.addService(this.hapServ.Switch)
+    if (!(this.vService = this.accessory.getService(this.hapServ.Valve))) {
+      this.vService = this.accessory.addService(this.hapServ.Valve)
+      this.vService.setCharacteristic(this.hapChar.Active, 0)
+        .setCharacteristic(this.hapChar.InUse, 0)
+        .setCharacteristic(this.hapChar.ValveType, 1)
+        .setCharacteristic(this.hapChar.SetDuration, 120)
+        .addCharacteristic(this.hapChar.RemainingDuration)
     }
-    this.sService.getCharacteristic(this.C.On)
+    this.sService.getCharacteristic(this.hapChar.On)
       .on('set', this.internalSwitchUpdate.bind(this))
-    this.vService.getCharacteristic(this.C.Active)
+    this.vService.getCharacteristic(this.hapChar.Active)
       .on('set', this.internalValveUpdate.bind(this))
-    this.vService.getCharacteristic(this.C.SetDuration)
+    this.vService.getCharacteristic(this.hapChar.SetDuration)
       .on('set', (value, callback) => {
-        if (this.vService.getCharacteristic(this.C.InUse).value) {
-          this.vService.updateCharacteristic(this.C.RemainingDuration, value)
+        if (this.vService.getCharacteristic(this.hapChar.InUse).value) {
+          this.vService.updateCharacteristic(this.hapChar.RemainingDuration, value)
           clearTimeout(this.timer)
-          this.timer = setTimeout(() => this.vService.setCharacteristic(this.C.Active, 0), value * 1000)
+          this.timer = setTimeout(() => this.vService.setCharacteristic(this.hapChar.Active, 0), value * 1000)
         }
         callback()
       })
@@ -44,9 +45,9 @@ module.exports = class deviceSwitchValve {
   async internalSwitchUpdate (value, callback) {
     try {
       callback()
-      const params = { switches: this.helpers.defaultMultiSwitchOff }
+      const params = { switches: this.consts.defaultMultiSwitchOff }
       params.switches[0].switch = value ? 'on' : 'off'
-      params.switches[1].switch = this.vService.getCharacteristic(this.C.Active).value === 1 ? 'on' : 'off'
+      params.switches[1].switch = this.vService.getCharacteristic(this.hapChar.Active).value === 1 ? 'on' : 'off'
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.cacheOnOff = value ? 'on' : 'off'
       this.accessory.historyService.addEntry({
@@ -54,7 +55,7 @@ module.exports = class deviceSwitchValve {
         status: value ? 1 : 0
       })
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current state [%s].', this.dName, this.cacheOnOff)
+        this.log('[%s] current state [%s].', this.name, this.cacheOnOff)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
@@ -64,26 +65,26 @@ module.exports = class deviceSwitchValve {
   async internalValveUpdate (value, callback) {
     try {
       callback()
-      const params = { switches: this.helpers.defaultMultiSwitchOff }
-      params.switches[0].switch = this.sService.getCharacteristic(this.C.On).value ? 'on' : 'off'
+      const params = { switches: this.consts.defaultMultiSwitchOff }
+      params.switches[0].switch = this.sService.getCharacteristic(this.hapChar.On).value ? 'on' : 'off'
       params.switches[1].switch = value === 1 ? 'on' : 'off'
-      this.vService.updateCharacteristic(this.C.InUse, value)
+      this.vService.updateCharacteristic(this.hapChar.InUse, value)
       switch (value) {
         case 0:
-          this.vService.updateCharacteristic(this.C.RemainingDuration, 0)
+          this.vService.updateCharacteristic(this.hapChar.RemainingDuration, 0)
           clearTimeout(this.timer)
           if (!this.disableDeviceLogging) {
-            this.log('[%s] current state [stopped].', this.dName)
+            this.log('[%s] current state [stopped].', this.name)
           }
           break
         case 1: {
-          const timer = this.vService.getCharacteristic(this.C.SetDuration).value
-          this.vService.updateCharacteristic(this.C.RemainingDuration, timer)
+          const timer = this.vService.getCharacteristic(this.hapChar.SetDuration).value
+          this.vService.updateCharacteristic(this.hapChar.RemainingDuration, timer)
           if (!this.disableDeviceLogging) {
-            this.log('[%s] current state [running].', this.dName)
+            this.log('[%s] current state [running].', this.name)
           }
           this.timer = setTimeout(() => {
-            this.vService.setCharacteristic(this.C.Active, 0)
+            this.vService.setCharacteristic(this.hapChar.Active, 0)
           }, timer * 1000)
           break
         }
@@ -102,33 +103,33 @@ module.exports = class deviceSwitchValve {
       if (this.cacheOnOff !== (params.switches[0].switch === 'on')) {
         const newStatus = params.switches[0].switch === 'on'
         this.cacheOnOff = params.switches[0].switch
-        this.sService.updateCharacteristic(this.C.On, newStatus)
+        this.sService.updateCharacteristic(this.hapChar.On, newStatus)
         this.accessory.historyService.addEntry({
           time: Math.round(new Date().valueOf() / 1000),
           status: newStatus ? 1 : 0
         })
         if (params.updateSource && !this.disableDeviceLogging) {
-          this.log('[%s] current state [%s].', this.dName, this.cacheOnOff)
+          this.log('[%s] current state [%s].', this.name, this.cacheOnOff)
         }
       }
       if (params.switches[1].switch === 'on') {
-        if (this.vService.getCharacteristic(this.C.Active).value === 0) {
-          const timer = this.vService.getCharacteristic(this.C.SetDuration).value
-          this.vService.updateCharacteristic(this.C.Active, 1)
-            .updateCharacteristic(this.C.InUse, 1)
-            .updateCharacteristic(this.C.RemainingDuration, timer)
+        if (this.vService.getCharacteristic(this.hapChar.Active).value === 0) {
+          const timer = this.vService.getCharacteristic(this.hapChar.SetDuration).value
+          this.vService.updateCharacteristic(this.hapChar.Active, 1)
+            .updateCharacteristic(this.hapChar.InUse, 1)
+            .updateCharacteristic(this.hapChar.RemainingDuration, timer)
           if (params.updateSource && !this.disableDeviceLogging) {
-            this.log('[%s] current state [running].', this.dName)
+            this.log('[%s] current state [running].', this.name)
           }
           this.timer = setTimeout(() => {
-            this.vService.setCharacteristic(this.C.Active, 0)
+            this.vService.setCharacteristic(this.hapChar.Active, 0)
           }, timer * 1000)
         }
         return
       }
-      this.vService.updateCharacteristic(this.C.Active, 0)
-        .updateCharacteristic(this.C.InUse, 0)
-        .updateCharacteristic(this.C.RemainingDuration, 0)
+      this.vService.updateCharacteristic(this.hapChar.Active, 0)
+        .updateCharacteristic(this.hapChar.InUse, 0)
+        .updateCharacteristic(this.hapChar.RemainingDuration, 0)
       clearTimeout(this.timer)
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
diff --git a/lib/device/simulation/tap-one.js b/lib/device/simulation/tap-one.js
index 3de183d5..230ed4a6 100644
--- a/lib/device/simulation/tap-one.js
+++ b/lib/device/simulation/tap-one.js
@@ -4,27 +4,28 @@
 module.exports = class deviceTapOne {
   constructor (platform, accessory) {
     this.platform = platform
+    this.funcs = platform.funcs
+    this.messages = platform.messages
     this.log = platform.log
     this.disableDeviceLogging = platform.config.disableDeviceLogging
-    this.helpers = platform.helpers
-    this.S = platform.api.hap.Service
-    this.C = platform.api.hap.Characteristic
-    this.dName = accessory.displayName
+    this.hapServ = platform.api.hap.Service
+    this.hapChar = platform.api.hap.Characteristic
+    this.name = accessory.displayName
     this.accessory = accessory
 
-    const asConfig = platform.cusG.get(this.accessory.context.eweDeviceId)
+    const asConfig = platform.simulations[this.accessory.context.eweDeviceId]
     if (!['oneSwitch', 'twoSwitch'].includes(asConfig.setup)) {
       this.error = 'setup must be oneSwitch or twoSwitch'
     }
     this.setup = asConfig.setup
 
-    if (!(this.service = this.accessory.getService(this.S.Valve))) {
-      this.service = this.accessory.addService(this.S.Valve)
-      this.service.setCharacteristic(this.C.Active, 0)
-        .setCharacteristic(this.C.InUse, 0)
-        .setCharacteristic(this.C.ValveType, 3)
+    if (!(this.service = this.accessory.getService(this.hapServ.Valve))) {
+      this.service = this.accessory.addService(this.hapServ.Valve)
+      this.service.setCharacteristic(this.hapChar.Active, 0)
+        .setCharacteristic(this.hapChar.InUse, 0)
+        .setCharacteristic(this.hapChar.ValveType, 3)
     }
-    this.service.getCharacteristic(this.C.Active)
+    this.service.getCharacteristic(this.hapChar.Active)
       .on('set', this.internalUpdate.bind(this))
   }
 
@@ -32,7 +33,7 @@ module.exports = class deviceTapOne {
     try {
       callback()
       if (this.error) {
-        this.log.warn('[%s] invalid config - %s.', this.dName, this.error)
+        this.log.warn('[%s] invalid config - %s.', this.name, this.error)
         return
       }
       const params = {}
@@ -41,15 +42,15 @@ module.exports = class deviceTapOne {
           params.switch = value ? 'on' : 'off'
           break
         case 'twoSwitch':
-          params.switches = this.helpers.defaultMultiSwitchOff
+          params.switches = this.consts.defaultMultiSwitchOff
           params.switches[0].switch = value ? 'on' : 'off'
           break
       }
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.cacheOnOff = value ? 'on' : 'off'
-      this.service.updateCharacteristic(this.C.InUse, value)
+      this.service.updateCharacteristic(this.hapChar.InUse, value)
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current state [%s].', this.dName, this.cacheOnOff)
+        this.log('[%s] current state [%s].', this.name, this.cacheOnOff)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
@@ -59,7 +60,7 @@ module.exports = class deviceTapOne {
   async externalUpdate (params) {
     try {
       if (this.error) {
-        this.log.warn('[%s] invalid config - %s.', this.dName, this.error)
+        this.log.warn('[%s] invalid config - %s.', this.name, this.error)
         return
       }
       switch (this.setup) {
@@ -76,10 +77,10 @@ module.exports = class deviceTapOne {
           this.cacheOnOff = params.switches[0].switch
           break
       }
-      this.service.updateCharacteristic(this.C.Active, this.cacheOnOff === 'on' ? 1 : 0)
-        .updateCharacteristic(this.C.InUse, this.cacheOnOff === 'on' ? 1 : 0)
+      this.service.updateCharacteristic(this.hapChar.Active, this.cacheOnOff === 'on' ? 1 : 0)
+        .updateCharacteristic(this.hapChar.InUse, this.cacheOnOff === 'on' ? 1 : 0)
       if (params.updateSource && !this.disableDeviceLogging) {
-        this.log('[%s] current state [%s].', this.dName, this.cacheOnOff)
+        this.log('[%s] current state [%s].', this.name, this.cacheOnOff)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
diff --git a/lib/device/simulation/tap-two.js b/lib/device/simulation/tap-two.js
index 7bf783ea..d5c38f44 100644
--- a/lib/device/simulation/tap-two.js
+++ b/lib/device/simulation/tap-two.js
@@ -4,23 +4,24 @@
 module.exports = class deviceTapTwo {
   constructor (platform, accessory) {
     this.platform = platform
+    this.funcs = platform.funcs
+    this.messages = platform.messages
     this.log = platform.log
     this.disableDeviceLogging = platform.config.disableDeviceLogging
-    this.helpers = platform.helpers
-    this.S = platform.api.hap.Service
-    this.C = platform.api.hap.Characteristic
-    this.dName = accessory.displayName
+    this.hapServ = platform.api.hap.Service
+    this.hapChar = platform.api.hap.Characteristic
+    this.name = accessory.displayName
     this.accessory = accessory
 
     ;['A', 'B'].forEach(v => {
       let tapService
-      if (!(tapService = this.accessory.getService(this.S.Valve))) {
-        tapService = this.accessory.addService(this.S.Valve)
-        tapService.setCharacteristic(this.C.Active, 0)
-          .setCharacteristic(this.C.InUse, 0)
-          .setCharacteristic(this.C.ValveType, 3)
+      if (!(tapService = this.accessory.getService(this.hapServ.Valve))) {
+        tapService = this.accessory.addService(this.hapServ.Valve)
+        tapService.setCharacteristic(this.hapChar.Active, 0)
+          .setCharacteristic(this.hapChar.InUse, 0)
+          .setCharacteristic(this.hapChar.ValveType, 3)
       }
-      tapService.getCharacteristic(this.C.Active)
+      tapService.getCharacteristic(this.hapChar.Active)
         .on('set', (value, callback) => this.internalUpdate('Tap ' + v, value, callback))
     })
   }
@@ -28,25 +29,25 @@ module.exports = class deviceTapTwo {
   async internalUpdate (tap, value, callback) {
     try {
       callback()
-      const params = { switches: this.helpers.defaultMultiSwitchOff }
+      const params = { switches: this.consts.defaultMultiSwitchOff }
       const tapService = this.accessory.getService(tap)
       switch (tap) {
         case 'Tap A':
           params.switches[0].switch = value ? 'on' : 'off'
-          params.switches[1].switch = this.accessory.getService('Tap B').getCharacteristic(this.C.Active).value === 1
+          params.switches[1].switch = this.accessory.getService('Tap B').getCharacteristic(this.hapChar.Active).value === 1
             ? 'on'
             : 'off'
           break
         case 'Tap B':
-          params.switches[0].switch = this.accessory.getService('Tap A').getCharacteristic(this.C.Active).value === 1
+          params.switches[0].switch = this.accessory.getService('Tap A').getCharacteristic(this.hapChar.Active).value === 1
             ? 'on'
             : 'off'
           params.switches[1].switch = value ? 'on' : 'off'
           break
       }
-      tapService.updateCharacteristic(this.C.InUse, value)
+      tapService.updateCharacteristic(this.hapChar.InUse, value)
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current state [%s %].', this.dName, tap, value === 1 ? 'running' : 'stopped')
+        this.log('[%s] current state [%s %].', this.name, tap, value === 1 ? 'running' : 'stopped')
       }
       await this.platform.sendDeviceUpdate(this.accessory, params)
     } catch (err) {
@@ -61,11 +62,11 @@ module.exports = class deviceTapTwo {
       }
       ;['A', 'B'].forEach((v, k) => {
         const tapService = this.accessory.getService('Valve ' + v)
-        tapService.updateCharacteristic(this.C.Active, params.switches[k].switch === 'on' ? 1 : 0)
-          .updateCharacteristic(this.C.InUse, params.switches[k].switch === 'on' ? 1 : 0)
+        tapService.updateCharacteristic(this.hapChar.Active, params.switches[k].switch === 'on' ? 1 : 0)
+          .updateCharacteristic(this.hapChar.InUse, params.switches[k].switch === 'on' ? 1 : 0)
         const logText = params.switches[k].switch === 'on' ? 'running' : 'stopped'
         if (params.updateSource && !this.disableDeviceLogging) {
-          this.log('[%s] current state [Tap %s running].', this.dName, v, logText)
+          this.log('[%s] current state [Tap %s running].', this.name, v, logText)
         }
       })
     } catch (err) {
diff --git a/lib/device/simulation/thermostat.js b/lib/device/simulation/thermostat.js
index 250c45ab..70d7e1f2 100644
--- a/lib/device/simulation/thermostat.js
+++ b/lib/device/simulation/thermostat.js
@@ -4,45 +4,46 @@
 module.exports = class deviceThermostat {
   constructor (platform, accessory) {
     this.platform = platform
+    this.funcs = platform.funcs
+    this.messages = platform.messages
     this.log = platform.log
     this.disableDeviceLogging = platform.config.disableDeviceLogging
-    this.helpers = platform.helpers
-    this.S = platform.api.hap.Service
-    this.C = platform.api.hap.Characteristic
-    this.dName = accessory.displayName
+    this.hapServ = platform.api.hap.Service
+    this.hapChar = platform.api.hap.Characteristic
+    this.name = accessory.displayName
     this.accessory = accessory
 
     this.tempOffset = parseFloat(platform.thTempOffset[this.accessory.context.eweDeviceId] || 0)
-    if (this.accessory.getService(this.S.Switch)) {
-      this.accessory.removeService(this.accessory.getService(this.S.Switch))
+    if (this.accessory.getService(this.hapServ.Switch)) {
+      this.accessory.removeService(this.accessory.getService(this.hapServ.Switch))
     }
-    if (this.accessory.getService(this.S.TemperatureSensor)) {
-      this.accessory.removeService(this.accessory.getService(this.S.TemperatureSensor))
+    if (this.accessory.getService(this.hapServ.TemperatureSensor)) {
+      this.accessory.removeService(this.accessory.getService(this.hapServ.TemperatureSensor))
     }
-    if (this.accessory.getService(this.S.HumiditySensor)) {
-      this.accessory.removeService(this.accessory.getService(this.S.HumiditySensor))
+    if (this.accessory.getService(this.hapServ.HumiditySensor)) {
+      this.accessory.removeService(this.accessory.getService(this.hapServ.HumiditySensor))
     }
-    if (!this.helpers.hasProperty(this.accessory.context, 'cacheTarget')) {
+    if (!this.funcs.hasProperty(this.accessory.context, 'cacheTarget')) {
       this.accessory.context.cacheTarget = 20
     }
-    this.service = this.accessory.getService(this.S.Thermostat) || this.accessory.addService(this.S.Thermostat)
-    this.service.getCharacteristic(this.C.CurrentTemperature)
+    this.service = this.accessory.getService(this.hapServ.Thermostat) || this.accessory.addService(this.hapServ.Thermostat)
+    this.service.getCharacteristic(this.hapChar.CurrentTemperature)
       .setProps({
         minValue: -100,
         minStep: 0.1
       })
-    this.service.getCharacteristic(this.C.TargetHeatingCoolingState)
+    this.service.getCharacteristic(this.hapChar.TargetHeatingCoolingState)
       .on('set', this.internalOnOffUpdate.bind(this))
       .setProps({ validValues: [0, 1] })
-    this.service.getCharacteristic(this.C.TargetTemperature)
+    this.service.getCharacteristic(this.hapChar.TargetTemperature)
       .on('set', this.internalTargetTempUpdate.bind(this))
       .setProps({
         minValue: 0,
         maxValue: 30,
         minStep: 0.5
       })
-    if (this.accessory.context.sensorType !== 'DS18B20' && !this.service.testCharacteristic(this.C.CurrentRelativeHumidity)) {
-      this.service.addCharacteristic(this.C.CurrentRelativeHumidity)
+    if (this.accessory.context.sensorType !== 'DS18B20' && !this.service.testCharacteristic(this.hapChar.CurrentRelativeHumidity)) {
+      this.service.addCharacteristic(this.hapChar.CurrentRelativeHumidity)
     }
 
     /*
@@ -77,7 +78,7 @@ module.exports = class deviceThermostat {
     })
 
     // *** Setting this already makes the plugin send the payload to setup as thermostat *** \\
-    this.service.setCharacteristic(this.C.TargetTemperature, this.accessory.context.cacheTarget)
+    this.service.setCharacteristic(this.hapChar.TargetTemperature, this.accessory.context.cacheTarget)
   }
 
   async internalOnOffUpdate (value, callback) {
@@ -91,14 +92,14 @@ module.exports = class deviceThermostat {
         params.mainSwitch = 'on'
       }
       this.cacheOnOff = value !== 0 ? 'on' : 'off'
-      const currentTemp = this.service.getCharacteristic(this.C.CurrentTemperature).value
+      const currentTemp = this.service.getCharacteristic(this.hapChar.CurrentTemperature).value
       this.cacheHeating = this.cacheOnOff === 'on' && currentTemp < this.accessory.context.cacheTarget
         ? 'on'
         : 'off'
-      this.service.updateCharacteristic(this.C.CurrentHeatingCoolingState, this.cacheHeating === 'on' ? 1 : 0)
+      this.service.updateCharacteristic(this.hapChar.CurrentHeatingCoolingState, this.cacheHeating === 'on' ? 1 : 0)
       await this.platform.sendDeviceUpdate(this.accessory, params)
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current state [%s] heating [%s].', this.dName, this.cacheOnOff, this.cacheHeating)
+        this.log('[%s] current state [%s] heating [%s].', this.name, this.cacheOnOff, this.cacheHeating)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
@@ -110,7 +111,7 @@ module.exports = class deviceThermostat {
       callback()
       this.accessory.context.cacheTarget = value
       this.cacheOnOff = 'on'
-      this.cacheHeating = this.service.getCharacteristic(this.C.CurrentTemperature).value < value
+      this.cacheHeating = this.service.getCharacteristic(this.hapChar.CurrentTemperature).value < value
         ? 'on'
         : 'off'
       const params = {
@@ -130,10 +131,10 @@ module.exports = class deviceThermostat {
           }
         ]
       }
-      this.service.updateCharacteristic(this.C.CurrentHeatingCoolingState, this.cacheHeating === 'on' ? 1 : 0)
+      this.service.updateCharacteristic(this.hapChar.CurrentHeatingCoolingState, this.cacheHeating === 'on' ? 1 : 0)
       await this.platform.sendDeviceUpdate(this.accessory, params)
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current state [%s] heating [%s].', this.dName, this.cacheOnOff, this.cacheHeating)
+        this.log('[%s] current state [%s] heating [%s].', this.name, this.cacheOnOff, this.cacheHeating)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
@@ -146,7 +147,7 @@ module.exports = class deviceThermostat {
         const newState = params.mainSwitch
         if (this.cacheOnOff !== newState) {
           this.cacheOnOff = newState
-          this.service.updateCharacteristic(this.C.TargetHeatingCoolingState, this.cacheOnOff === 'on' ? 1 : 0)
+          this.service.updateCharacteristic(this.hapChar.TargetHeatingCoolingState, this.cacheOnOff === 'on' ? 1 : 0)
           this.accessory.historyService.addEntry({
             time: Math.round(new Date().valueOf() / 1000),
             status: this.cacheOnOff === 'on' ? 1 : 0
@@ -155,45 +156,45 @@ module.exports = class deviceThermostat {
             this.cacheHeating = 'off'
           }
           if (params.updateSource && !this.disableDeviceLogging && !params.switch) {
-            this.log('[%s] current state [%s].', this.dName, this.cacheOnOff)
+            this.log('[%s] current state [%s].', this.name, this.cacheOnOff)
           }
         }
       }
       if (params.switch && params.switch !== this.cacheHeating) {
         this.cacheHeating = params.switch
-        this.service.updateCharacteristic(this.C.CurrentHeatingCoolingState, params.switch === 'on' ? 1 : 0)
+        this.service.updateCharacteristic(this.hapChar.CurrentHeatingCoolingState, params.switch === 'on' ? 1 : 0)
         if (params.updateSource && !this.disableDeviceLogging) {
-          this.log('[%s] current state [%s] heating [%s].', this.dName, this.cacheOnOff, params.switch)
+          this.log('[%s] current state [%s] heating [%s].', this.name, this.cacheOnOff, params.switch)
         }
       }
       const eveLog = {}
-      if (this.helpers.hasProperty(params, 'currentTemperature') && params.currentTemperature !== 'unavailable') {
+      if (this.funcs.hasProperty(params, 'currentTemperature') && params.currentTemperature !== 'unavailable') {
         const currentTemp = Number(params.currentTemperature) + this.tempOffset
         eveLog.temp = currentTemp
         if (this.cacheTemp !== currentTemp) {
           this.cacheTemp = currentTemp
-          this.service.updateCharacteristic(this.C.CurrentTemperature, this.cacheTemp)
+          this.service.updateCharacteristic(this.hapChar.CurrentTemperature, this.cacheTemp)
           if (params.updateSource && !this.disableDeviceLogging) {
-            this.log('[%s] current temperature [%s°C].', this.dName, this.cacheTemp)
+            this.log('[%s] current temperature [%s°C].', this.name, this.cacheTemp)
           }
         }
       }
       if (
-        this.helpers.hasProperty(params, 'currentHumidity') &&
+        this.funcs.hasProperty(params, 'currentHumidity') &&
         params.currentHumidity !== 'unavailable' &&
-        this.service.testCharacteristic(this.C.CurrentRelativeHumidity)
+        this.service.testCharacteristic(this.hapChar.CurrentRelativeHumidity)
       ) {
         const currentHumi = parseInt(params.currentHumidity)
         eveLog.humidity = currentHumi
         if (this.cacheHumi !== currentHumi) {
           this.cacheHumi = currentHumi
-          this.service.updateCharacteristic(this.C.CurrentRelativeHumidity, this.cacheHumi)
+          this.service.updateCharacteristic(this.hapChar.CurrentRelativeHumidity, this.cacheHumi)
           if (params.updateSource && !this.disableDeviceLogging) {
-            this.log('[%s] current humidity [%s%].', this.dName, this.cacheHumi)
+            this.log('[%s] current humidity [%s%].', this.name, this.cacheHumi)
           }
         }
       }
-      if (this.helpers.hasProperty(eveLog, 'temp') || this.helpers.hasProperty(eveLog, 'humidity')) {
+      if (this.funcs.hasProperty(eveLog, 'temp') || this.funcs.hasProperty(eveLog, 'humidity')) {
         eveLog.time = Math.round(new Date().valueOf() / 1000)
         this.accessory.historyService.addEntry(eveLog)
       }
diff --git a/lib/device/simulation/valve-four.js b/lib/device/simulation/valve-four.js
index 60f410bd..de2f09c6 100644
--- a/lib/device/simulation/valve-four.js
+++ b/lib/device/simulation/valve-four.js
@@ -4,32 +4,33 @@
 module.exports = class deviceValveFour {
   constructor (platform, accessory) {
     this.platform = platform
+    this.funcs = platform.funcs
+    this.messages = platform.messages
     this.log = platform.log
     this.disableDeviceLogging = platform.config.disableDeviceLogging
-    this.helpers = platform.helpers
-    this.S = platform.api.hap.Service
-    this.C = platform.api.hap.Characteristic
-    this.dName = accessory.displayName
+    this.hapServ = platform.api.hap.Service
+    this.hapChar = platform.api.hap.Characteristic
+    this.name = accessory.displayName
     this.accessory = accessory
 
     ;['A', 'B', 'C', 'D'].forEach(v => {
       let valveService
       if (!(valveService = this.accessory.getService('Valve ' + v))) {
-        valveService = this.accessory.addService(this.S.Valve, 'Valve ' + v, 'valve' + v.toLowerCase())
-        valveService.setCharacteristic(this.C.Active, 0)
-          .setCharacteristic(this.C.InUse, 0)
-          .setCharacteristic(this.C.ValveType, 1)
-          .setCharacteristic(this.C.SetDuration, 120)
-          .addCharacteristic(this.C.RemainingDuration)
+        valveService = this.accessory.addService(this.hapServ.Valve, 'Valve ' + v, 'valve' + v.toLowerCase())
+        valveService.setCharacteristic(this.hapChar.Active, 0)
+          .setCharacteristic(this.hapChar.InUse, 0)
+          .setCharacteristic(this.hapChar.ValveType, 1)
+          .setCharacteristic(this.hapChar.SetDuration, 120)
+          .addCharacteristic(this.hapChar.RemainingDuration)
       }
-      valveService.getCharacteristic(this.C.Active)
+      valveService.getCharacteristic(this.hapChar.Active)
         .on('set', (value, callback) => this.internalUpdate('Valve ' + v, value, callback))
-      valveService.getCharacteristic(this.C.SetDuration)
+      valveService.getCharacteristic(this.hapChar.SetDuration)
         .on('set', (value, callback) => {
-          if (valveService.getCharacteristic(this.C.InUse).value === 1) {
-            valveService.updateCharacteristic(this.C.RemainingDuration, value)
+          if (valveService.getCharacteristic(this.hapChar.InUse).value === 1) {
+            valveService.updateCharacteristic(this.hapChar.RemainingDuration, value)
             clearTimeout(valveService.timer)
-            valveService.timer = setTimeout(() => valveService.setCharacteristic(this.C.Active, 0), value * 1000)
+            valveService.timer = setTimeout(() => valveService.setCharacteristic(this.hapChar.Active, 0), value * 1000)
           }
           callback()
         })
@@ -39,75 +40,75 @@ module.exports = class deviceValveFour {
   async internalUpdate (valve, value, callback) {
     try {
       callback()
-      const params = { switches: this.helpers.defaultMultiSwitchOff }
+      const params = { switches: this.consts.defaultMultiSwitchOff }
       const valveService = this.accessory.getService(valve)
       switch (valve) {
         case 'Valve A':
           params.switches[0].switch = value ? 'on' : 'off'
-          params.switches[1].switch = this.accessory.getService('Valve B').getCharacteristic(this.C.Active).value === 1
+          params.switches[1].switch = this.accessory.getService('Valve B').getCharacteristic(this.hapChar.Active).value === 1
             ? 'on'
             : 'off'
-          params.switches[2].switch = this.accessory.getService('Valve C').getCharacteristic(this.C.Active).value === 1
+          params.switches[2].switch = this.accessory.getService('Valve C').getCharacteristic(this.hapChar.Active).value === 1
             ? 'on'
             : 'off'
-          params.switches[3].switch = this.accessory.getService('Valve D').getCharacteristic(this.C.Active).value === 1
+          params.switches[3].switch = this.accessory.getService('Valve D').getCharacteristic(this.hapChar.Active).value === 1
             ? 'on'
             : 'off'
           break
         case 'Valve B':
-          params.switches[0].switch = this.accessory.getService('Valve A').getCharacteristic(this.C.Active).value === 1
+          params.switches[0].switch = this.accessory.getService('Valve A').getCharacteristic(this.hapChar.Active).value === 1
             ? 'on'
             : 'off'
           params.switches[1].switch = value ? 'on' : 'off'
-          params.switches[2].switch = this.accessory.getService('Valve C').getCharacteristic(this.C.Active).value === 1
+          params.switches[2].switch = this.accessory.getService('Valve C').getCharacteristic(this.hapChar.Active).value === 1
             ? 'on'
             : 'off'
-          params.switches[3].switch = this.accessory.getService('Valve D').getCharacteristic(this.C.Active).value === 1
+          params.switches[3].switch = this.accessory.getService('Valve D').getCharacteristic(this.hapChar.Active).value === 1
             ? 'on'
             : 'off'
           break
         case 'Valve C':
-          params.switches[0].switch = this.accessory.getService('Valve A').getCharacteristic(this.C.Active).value === 1
+          params.switches[0].switch = this.accessory.getService('Valve A').getCharacteristic(this.hapChar.Active).value === 1
             ? 'on'
             : 'off'
-          params.switches[1].switch = this.accessory.getService('Valve B').getCharacteristic(this.C.Active).value === 1
+          params.switches[1].switch = this.accessory.getService('Valve B').getCharacteristic(this.hapChar.Active).value === 1
             ? 'on'
             : 'off'
           params.switches[2].switch = value ? 'on' : 'off'
-          params.switches[3].switch = this.accessory.getService('Valve D').getCharacteristic(this.C.Active).value === 1
+          params.switches[3].switch = this.accessory.getService('Valve D').getCharacteristic(this.hapChar.Active).value === 1
             ? 'on'
             : 'off'
           break
         case 'Valve D':
-          params.switches[0].switch = this.accessory.getService('Valve A').getCharacteristic(this.C.Active).value === 1
+          params.switches[0].switch = this.accessory.getService('Valve A').getCharacteristic(this.hapChar.Active).value === 1
             ? 'on'
             : 'off'
-          params.switches[1].switch = this.accessory.getService('Valve B').getCharacteristic(this.C.Active).value === 1
+          params.switches[1].switch = this.accessory.getService('Valve B').getCharacteristic(this.hapChar.Active).value === 1
             ? 'on'
             : 'off'
-          params.switches[2].switch = this.accessory.getService('Valve C').getCharacteristic(this.C.Active).value === 1
+          params.switches[2].switch = this.accessory.getService('Valve C').getCharacteristic(this.hapChar.Active).value === 1
             ? 'on'
             : 'off'
           params.switches[3].switch = value ? 'on' : 'off'
           break
       }
-      valveService.updateCharacteristic(this.C.InUse, value)
+      valveService.updateCharacteristic(this.hapChar.InUse, value)
       switch (value) {
         case 0:
-          valveService.updateCharacteristic(this.C.RemainingDuration, 0)
+          valveService.updateCharacteristic(this.hapChar.RemainingDuration, 0)
           clearTimeout(this.accessory.getService(valve).timer)
           if (!this.disableDeviceLogging) {
-            this.log('[%s] current state [%s stopped].', this.dName, valve)
+            this.log('[%s] current state [%s stopped].', this.name, valve)
           }
           break
         case 1: {
-          const timer = valveService.getCharacteristic(this.C.SetDuration).value
-          valveService.updateCharacteristic(this.C.RemainingDuration, timer)
+          const timer = valveService.getCharacteristic(this.hapChar.SetDuration).value
+          valveService.updateCharacteristic(this.hapChar.RemainingDuration, timer)
           if (!this.disableDeviceLogging) {
-            this.log('[%s] current state [%s running].', this.dName, valve)
+            this.log('[%s] current state [%s running].', this.name, valve)
           }
           valveService.timer = setTimeout(() => {
-            valveService.setCharacteristic(this.C.Active, 0)
+            valveService.setCharacteristic(this.hapChar.Active, 0)
           }, timer * 1000)
           break
         }
@@ -126,23 +127,23 @@ module.exports = class deviceValveFour {
       ;['A', 'B', 'C', 'D'].forEach((v, k) => {
         const valveService = this.accessory.getService('Valve ' + v)
         if (params.switches[k].switch === 'on') {
-          if (valveService.getCharacteristic(this.C.Active).value === 0) {
-            const timer = valveService.getCharacteristic(this.C.SetDuration).value
-            valveService.updateCharacteristic(this.C.Active, 1)
-              .updateCharacteristic(this.C.InUse, 1)
-              .updateCharacteristic(this.C.RemainingDuration, timer)
+          if (valveService.getCharacteristic(this.hapChar.Active).value === 0) {
+            const timer = valveService.getCharacteristic(this.hapChar.SetDuration).value
+            valveService.updateCharacteristic(this.hapChar.Active, 1)
+              .updateCharacteristic(this.hapChar.InUse, 1)
+              .updateCharacteristic(this.hapChar.RemainingDuration, timer)
             if (params.updateSource && !this.disableDeviceLogging) {
-              this.log('[%s] current state [Valve %s running].', this.dName, v)
+              this.log('[%s] current state [Valve %s running].', this.name, v)
             }
             valveService.timer = setTimeout(() => {
-              valveService.setCharacteristic(this.C.Active, 0)
+              valveService.setCharacteristic(this.hapChar.Active, 0)
             }, timer * 1000)
           }
           return
         }
-        valveService.updateCharacteristic(this.C.Active, 0)
-          .updateCharacteristic(this.C.InUse, 0)
-          .updateCharacteristic(this.C.RemainingDuration, 0)
+        valveService.updateCharacteristic(this.hapChar.Active, 0)
+          .updateCharacteristic(this.hapChar.InUse, 0)
+          .updateCharacteristic(this.hapChar.RemainingDuration, 0)
         clearTimeout(valveService.timer)
       })
     } catch (err) {
diff --git a/lib/device/simulation/valve-one.js b/lib/device/simulation/valve-one.js
index f148655f..b862a3af 100644
--- a/lib/device/simulation/valve-one.js
+++ b/lib/device/simulation/valve-one.js
@@ -4,36 +4,37 @@
 module.exports = class deviceValveOne {
   constructor (platform, accessory) {
     this.platform = platform
+    this.funcs = platform.funcs
+    this.messages = platform.messages
     this.log = platform.log
     this.disableDeviceLogging = platform.config.disableDeviceLogging
-    this.helpers = platform.helpers
-    this.S = platform.api.hap.Service
-    this.C = platform.api.hap.Characteristic
-    this.dName = accessory.displayName
+    this.hapServ = platform.api.hap.Service
+    this.hapChar = platform.api.hap.Characteristic
+    this.name = accessory.displayName
     this.accessory = accessory
 
-    const asConfig = platform.cusG.get(this.accessory.context.eweDeviceId)
+    const asConfig = platform.simulations[this.accessory.context.eweDeviceId]
     if (!['oneSwitch', 'twoSwitch'].includes(asConfig.setup)) {
       this.error = 'setup must be oneSwitch or twoSwitch'
     }
     this.setup = asConfig.setup
-    if (!(this.service = this.accessory.getService(this.S.Valve))) {
-      this.service = this.accessory.addService(this.S.Valve)
-      this.service.setCharacteristic(this.C.Active, 0)
-        .setCharacteristic(this.C.InUse, 0)
-        .setCharacteristic(this.C.ValveType, 1)
-        .setCharacteristic(this.C.SetDuration, 120)
-        .addCharacteristic(this.C.RemainingDuration)
+    if (!(this.service = this.accessory.getService(this.hapServ.Valve))) {
+      this.service = this.accessory.addService(this.hapServ.Valve)
+      this.service.setCharacteristic(this.hapChar.Active, 0)
+        .setCharacteristic(this.hapChar.InUse, 0)
+        .setCharacteristic(this.hapChar.ValveType, 1)
+        .setCharacteristic(this.hapChar.SetDuration, 120)
+        .addCharacteristic(this.hapChar.RemainingDuration)
     }
-    this.service.getCharacteristic(this.C.Active)
+    this.service.getCharacteristic(this.hapChar.Active)
       .on('set', this.internalUpdate.bind(this))
-    this.service.getCharacteristic(this.C.SetDuration)
+    this.service.getCharacteristic(this.hapChar.SetDuration)
       .on('set', (value, callback) => {
-        if (this.service.getCharacteristic(this.C.InUse).value === 1) {
-          this.service.updateCharacteristic(this.C.RemainingDuration, value)
+        if (this.service.getCharacteristic(this.hapChar.InUse).value === 1) {
+          this.service.updateCharacteristic(this.hapChar.RemainingDuration, value)
           clearTimeout(this.timer)
           this.timer = setTimeout(
-            () => this.service.setCharacteristic(this.C.Active, 0),
+            () => this.service.setCharacteristic(this.hapChar.Active, 0),
             value * 1000
           )
         }
@@ -45,7 +46,7 @@ module.exports = class deviceValveOne {
     try {
       callback()
       if (this.error) {
-        this.log.warn('[%s] invalid config - %s.', this.dName, this.error)
+        this.log.warn('[%s] invalid config - %s.', this.name, this.error)
         return
       }
       const params = {}
@@ -54,27 +55,27 @@ module.exports = class deviceValveOne {
           params.switch = value ? 'on' : 'off'
           break
         case 'twoSwitch':
-          params.switches = this.helpers.defaultMultiSwitchOff
+          params.switches = this.consts.defaultMultiSwitchOff
           params.switches[0].switch = value ? 'on' : 'off'
           break
       }
-      this.service.updateCharacteristic(this.C.InUse, value)
+      this.service.updateCharacteristic(this.hapChar.InUse, value)
       switch (value) {
         case 0:
-          this.service.updateCharacteristic(this.C.RemainingDuration, 0)
+          this.service.updateCharacteristic(this.hapChar.RemainingDuration, 0)
           clearTimeout(this.timer)
           if (!this.disableDeviceLogging) {
-            this.log('[%s] current state [stopped].', this.dName)
+            this.log('[%s] current state [stopped].', this.name)
           }
           break
         case 1: {
-          const timer = this.service.getCharacteristic(this.C.SetDuration).value
-          this.service.updateCharacteristic(this.C.RemainingDuration, timer)
+          const timer = this.service.getCharacteristic(this.hapChar.SetDuration).value
+          this.service.updateCharacteristic(this.hapChar.RemainingDuration, timer)
           if (!this.disableDeviceLogging) {
-            this.log('[%s] current state [running].', this.dName)
+            this.log('[%s] current state [running].', this.name)
           }
           this.timer = setTimeout(() => {
-            this.service.setCharacteristic(this.C.Active, 0)
+            this.service.setCharacteristic(this.hapChar.Active, 0)
           }, timer * 1000)
           break
         }
@@ -88,7 +89,7 @@ module.exports = class deviceValveOne {
   async externalUpdate (params) {
     try {
       if (this.error) {
-        this.log.warn('[%s] invalid config - %s.', this.dName, this.error)
+        this.log.warn('[%s] invalid config - %s.', this.name, this.error)
         return
       }
       let isOn = false
@@ -107,23 +108,23 @@ module.exports = class deviceValveOne {
           break
       }
       if (isOn) {
-        if (this.service.getCharacteristic(this.C.Active).value === 0) {
-          const timer = this.service.getCharacteristic(this.C.SetDuration).value
-          this.service.updateCharacteristic(this.C.Active, 1)
-            .updateCharacteristic(this.C.InUse, 1)
-            .updateCharacteristic(this.C.RemainingDuration, timer)
+        if (this.service.getCharacteristic(this.hapChar.Active).value === 0) {
+          const timer = this.service.getCharacteristic(this.hapChar.SetDuration).value
+          this.service.updateCharacteristic(this.hapChar.Active, 1)
+            .updateCharacteristic(this.hapChar.InUse, 1)
+            .updateCharacteristic(this.hapChar.RemainingDuration, timer)
           if (params.updateSource && !this.disableDeviceLogging) {
-            this.log('[%s] current state [running].', this.dName)
+            this.log('[%s] current state [running].', this.name)
           }
           this.timer = setTimeout(() => {
-            this.service.setCharacteristic(this.C.Active, 0)
+            this.service.setCharacteristic(this.hapChar.Active, 0)
           }, timer * 1000)
         }
         return
       }
-      this.service.updateCharacteristic(this.C.Active, 0)
-        .updateCharacteristic(this.C.InUse, 0)
-        .updateCharacteristic(this.C.RemainingDuration, 0)
+      this.service.updateCharacteristic(this.hapChar.Active, 0)
+        .updateCharacteristic(this.hapChar.InUse, 0)
+        .updateCharacteristic(this.hapChar.RemainingDuration, 0)
       clearTimeout(this.timer)
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
diff --git a/lib/device/simulation/valve-two.js b/lib/device/simulation/valve-two.js
index 954b071e..72cbc92f 100644
--- a/lib/device/simulation/valve-two.js
+++ b/lib/device/simulation/valve-two.js
@@ -4,32 +4,33 @@
 module.exports = class deviceValveTwo {
   constructor (platform, accessory) {
     this.platform = platform
+    this.funcs = platform.funcs
+    this.messages = platform.messages
     this.log = platform.log
     this.disableDeviceLogging = platform.config.disableDeviceLogging
-    this.helpers = platform.helpers
-    this.S = platform.api.hap.Service
-    this.C = platform.api.hap.Characteristic
-    this.dName = accessory.displayName
+    this.hapServ = platform.api.hap.Service
+    this.hapChar = platform.api.hap.Characteristic
+    this.name = accessory.displayName
     this.accessory = accessory
 
     ;['A', 'B'].forEach(v => {
       let valveService
       if (!(valveService = this.accessory.getService('Valve ' + v))) {
-        valveService = this.accessory.addService(this.S.Valve, 'Valve ' + v, 'valve' + v.toLowerCase())
-        valveService.setCharacteristic(this.C.Active, 0)
-          .setCharacteristic(this.C.InUse, 0)
-          .setCharacteristic(this.C.ValveType, 1)
-          .setCharacteristic(this.C.SetDuration, 120)
-          .addCharacteristic(this.C.RemainingDuration)
+        valveService = this.accessory.addService(this.hapServ.Valve, 'Valve ' + v, 'valve' + v.toLowerCase())
+        valveService.setCharacteristic(this.hapChar.Active, 0)
+          .setCharacteristic(this.hapChar.InUse, 0)
+          .setCharacteristic(this.hapChar.ValveType, 1)
+          .setCharacteristic(this.hapChar.SetDuration, 120)
+          .addCharacteristic(this.hapChar.RemainingDuration)
       }
-      valveService.getCharacteristic(this.C.Active)
+      valveService.getCharacteristic(this.hapChar.Active)
         .on('set', (value, callback) => this.internalUpdate('Valve ' + v, value, callback))
-      valveService.getCharacteristic(this.C.SetDuration)
+      valveService.getCharacteristic(this.hapChar.SetDuration)
         .on('set', (value, callback) => {
-          if (valveService.getCharacteristic(this.C.InUse).value === 1) {
-            valveService.updateCharacteristic(this.C.RemainingDuration, value)
+          if (valveService.getCharacteristic(this.hapChar.InUse).value === 1) {
+            valveService.updateCharacteristic(this.hapChar.RemainingDuration, value)
             clearTimeout(valveService.timer)
-            valveService.timer = setTimeout(() => valveService.setCharacteristic(this.C.Active, 0), value * 1000)
+            valveService.timer = setTimeout(() => valveService.setCharacteristic(this.hapChar.Active, 0), value * 1000)
           }
           callback()
         })
@@ -39,39 +40,39 @@ module.exports = class deviceValveTwo {
   async internalUpdate (valve, value, callback) {
     try {
       callback()
-      const params = { switches: this.helpers.defaultMultiSwitchOff }
+      const params = { switches: this.consts.defaultMultiSwitchOff }
       const valveService = this.accessory.getService(valve)
       switch (valve) {
         case 'Valve A':
           params.switches[0].switch = value ? 'on' : 'off'
-          params.switches[1].switch = this.accessory.getService('Valve B').getCharacteristic(this.C.Active).value === 1
+          params.switches[1].switch = this.accessory.getService('Valve B').getCharacteristic(this.hapChar.Active).value === 1
             ? 'on'
             : 'off'
           break
         case 'Valve B':
-          params.switches[0].switch = this.accessory.getService('Valve A').getCharacteristic(this.C.Active).value === 1
+          params.switches[0].switch = this.accessory.getService('Valve A').getCharacteristic(this.hapChar.Active).value === 1
             ? 'on'
             : 'off'
           params.switches[1].switch = value ? 'on' : 'off'
           break
       }
-      valveService.updateCharacteristic(this.C.InUse, value)
+      valveService.updateCharacteristic(this.hapChar.InUse, value)
       switch (value) {
         case 0:
-          valveService.updateCharacteristic(this.C.RemainingDuration, 0)
+          valveService.updateCharacteristic(this.hapChar.RemainingDuration, 0)
           clearTimeout(this.accessory.getService(valve).timer)
           if (!this.disableDeviceLogging) {
-            this.log('[%s] current state [%s stopped].', this.dName, valve)
+            this.log('[%s] current state [%s stopped].', this.name, valve)
           }
           break
         case 1: {
-          const timer = valveService.getCharacteristic(this.C.SetDuration).value
-          valveService.updateCharacteristic(this.C.RemainingDuration, timer)
+          const timer = valveService.getCharacteristic(this.hapChar.SetDuration).value
+          valveService.updateCharacteristic(this.hapChar.RemainingDuration, timer)
           if (!this.disableDeviceLogging) {
-            this.log('[%s] current state [%s running].', this.dName, valve)
+            this.log('[%s] current state [%s running].', this.name, valve)
           }
           valveService.timer = setTimeout(() => {
-            valveService.setCharacteristic(this.C.Active, 0)
+            valveService.setCharacteristic(this.hapChar.Active, 0)
           }, timer * 1000)
           break
         }
@@ -90,23 +91,23 @@ module.exports = class deviceValveTwo {
       ;['A', 'B'].forEach((v, k) => {
         const valveService = this.accessory.getService('Valve ' + v)
         if (params.switches[k].switch === 'on') {
-          if (valveService.getCharacteristic(this.C.Active).value === 0) {
-            const timer = valveService.getCharacteristic(this.C.SetDuration).value
-            valveService.updateCharacteristic(this.C.Active, 1)
-              .updateCharacteristic(this.C.InUse, 1)
-              .updateCharacteristic(this.C.RemainingDuration, timer)
+          if (valveService.getCharacteristic(this.hapChar.Active).value === 0) {
+            const timer = valveService.getCharacteristic(this.hapChar.SetDuration).value
+            valveService.updateCharacteristic(this.hapChar.Active, 1)
+              .updateCharacteristic(this.hapChar.InUse, 1)
+              .updateCharacteristic(this.hapChar.RemainingDuration, timer)
             if (params.updateSource && !this.disableDeviceLogging) {
-              this.log('[%s] current state [Valve %s running].', this.dName, v)
+              this.log('[%s] current state [Valve %s running].', this.name, v)
             }
             valveService.timer = setTimeout(() => {
-              valveService.setCharacteristic(this.C.Active, 0)
+              valveService.setCharacteristic(this.hapChar.Active, 0)
             }, timer * 1000)
           }
           return
         }
-        valveService.updateCharacteristic(this.C.Active, 0)
-          .updateCharacteristic(this.C.InUse, 0)
-          .updateCharacteristic(this.C.RemainingDuration, 0)
+        valveService.updateCharacteristic(this.hapChar.Active, 0)
+          .updateCharacteristic(this.hapChar.InUse, 0)
+          .updateCharacteristic(this.hapChar.RemainingDuration, 0)
         clearTimeout(valveService.timer)
       })
     } catch (err) {
diff --git a/lib/device/switch-multi.js b/lib/device/switch-multi.js
index d36a0ed4..3a1b1443 100644
--- a/lib/device/switch-multi.js
+++ b/lib/device/switch-multi.js
@@ -4,16 +4,17 @@
 module.exports = class deviceSwitchMulti {
   constructor (platform, accessory) {
     this.platform = platform
+    this.funcs = platform.funcs
+    this.messages = platform.messages
     this.log = platform.log
     this.disableDeviceLogging = platform.config.disableDeviceLogging
-    this.helpers = platform.helpers
-    this.S = platform.api.hap.Service
-    this.C = platform.api.hap.Characteristic
-    this.dName = accessory.displayName
+    this.hapServ = platform.api.hap.Service
+    this.hapChar = platform.api.hap.Characteristic
+    this.name = accessory.displayName
     this.accessory = accessory
 
-    this.service = this.accessory.getService(this.S.Switch) || this.accessory.addService(this.S.Switch)
-    this.service.getCharacteristic(this.C.On)
+    this.service = this.accessory.getService(this.hapServ.Switch) || this.accessory.addService(this.hapServ.Switch)
+    this.service.getCharacteristic(this.hapChar.On)
       .on('set', this.internalUpdate.bind(this))
     this.accessory.log = platform.config.debugFakegato ? this.log : () => {}
     this.accessory.historyService = new this.platform.eveService('switch', this.accessory, {
@@ -24,21 +25,21 @@ module.exports = class deviceSwitchMulti {
 
   async internalUpdate (value, callback) {
     try {
-      await this.helpers.sleep(Math.floor(Math.random() * 491 + 10))
+      await this.funcs.sleep(Math.floor(Math.random() * 491 + 10))
       callback()
       let oAccessory
       let masterState = 'off'
       const params = {}
       switch (this.accessory.context.switchNumber) {
         case '0':
-          params.switches = this.helpers.defaultMultiSwitchOff
+          params.switches = this.consts.defaultMultiSwitchOff
           params.switches[0].switch = value ? 'on' : 'off'
           params.switches[1].switch = value ? 'on' : 'off'
           params.switches[2].switch = value ? 'on' : 'off'
           params.switches[3].switch = value ? 'on' : 'off'
           for (let i = 0; i <= 4; i++) {
             if ((oAccessory = this.platform.devicesInHB.get(this.accessory.context.eweDeviceId + 'SW' + i))) {
-              oAccessory.getService(this.S.Switch).updateCharacteristic(this.C.On, value)
+              oAccessory.getService(this.hapServ.Switch).updateCharacteristic(this.hapChar.On, value)
               oAccessory.context.cacheOnOff = value ? 'on' : 'off'
               oAccessory.historyService.addEntry({
                 time: Math.round(new Date().valueOf() / 1000),
@@ -54,10 +55,10 @@ module.exports = class deviceSwitchMulti {
         case '2':
         case '3':
         case '4':
-          params.switches = this.helpers.defaultMultiSwitchOff
+          params.switches = this.consts.defaultMultiSwitchOff
           for (let i = 1; i <= 4; i++) {
             if ((oAccessory = this.platform.devicesInHB.get(this.accessory.context.eweDeviceId + 'SW' + i))) {
-              if (oAccessory.getService(this.S.Switch).getCharacteristic(this.C.On).value) {
+              if (oAccessory.getService(this.hapServ.Switch).getCharacteristic(this.hapChar.On).value) {
                 masterState = 'on'
               }
               if (i === parseInt(this.accessory.context.switchNumber)) {
@@ -79,7 +80,7 @@ module.exports = class deviceSwitchMulti {
           }
           if (!this.platform.hiddenMasters.includes(this.accessory.context.eweDeviceId)) {
             oAccessory = this.platform.devicesInHB.get(this.accessory.context.eweDeviceId + 'SW0')
-            oAccessory.getService(this.S.Switch).updateCharacteristic(this.C.On, masterState === 'on')
+            oAccessory.getService(this.hapServ.Switch).updateCharacteristic(this.hapChar.On, masterState === 'on')
             oAccessory.historyService.addEntry({
               time: Math.round(new Date().valueOf() / 1000),
               status: masterState === 'on' ? 1 : 0
@@ -109,8 +110,8 @@ module.exports = class deviceSwitchMulti {
           if (params.switches[i - 1].switch === oAccessory.context.cacheOnOff) {
             continue
           }
-          oAccessory.getService(this.S.Switch)
-            .updateCharacteristic(this.C.On, params.switches[i - 1].switch === 'on')
+          oAccessory.getService(this.hapServ.Switch)
+            .updateCharacteristic(this.hapChar.On, params.switches[i - 1].switch === 'on')
           oAccessory.context.cacheOnOff = params.switches[i - 1].switch
           oAccessory.historyService.addEntry({
             time: Math.round(new Date().valueOf() / 1000),
@@ -122,7 +123,7 @@ module.exports = class deviceSwitchMulti {
         }
       }
       if (!this.platform.hiddenMasters.includes(this.accessory.context.eweDeviceId)) {
-        this.service.updateCharacteristic(this.C.On, primaryState)
+        this.service.updateCharacteristic(this.hapChar.On, primaryState)
         this.accessory.historyService.addEntry({
           time: Math.round(new Date().valueOf() / 1000),
           status: primaryState ? 1 : 0
diff --git a/lib/device/switch-single.js b/lib/device/switch-single.js
index 2f398eb0..fc00e778 100644
--- a/lib/device/switch-single.js
+++ b/lib/device/switch-single.js
@@ -4,19 +4,21 @@
 module.exports = class deviceSwitchSingle {
   constructor (platform, accessory) {
     this.platform = platform
+    this.funcs = platform.funcs
+    this.messages = platform.messages
     this.log = platform.log
     this.disableDeviceLogging = platform.config.disableDeviceLogging
-    this.helpers = platform.helpers
-    this.S = platform.api.hap.Service
-    this.C = platform.api.hap.Characteristic
-    this.dName = accessory.displayName
+    this.consts = platform.helpers
+    this.hapServ = platform.api.hap.Service
+    this.hapChar = platform.api.hap.Characteristic
+    this.name = accessory.displayName
     this.accessory = accessory
 
-    this.service = this.accessory.getService(this.S.Switch) || this.accessory.addService(this.S.Switch)
-    this.service.getCharacteristic(this.C.On)
+    this.service = this.accessory.getService(this.hapServ.Switch) || this.accessory.addService(this.hapServ.Switch)
+    this.service.getCharacteristic(this.hapChar.On)
       .on('set', this.internalUpdate.bind(this))
-    if (this.accessory.getService(this.S.Outlet)) {
-      this.accessory.removeService(this.accessory.getService(this.S.Outlet))
+    if (this.accessory.getService(this.hapServ.Outlet)) {
+      this.accessory.removeService(this.accessory.getService(this.hapServ.Outlet))
     }
     this.accessory.log = platform.config.debugFakegato ? this.log : () => {}
     this.accessory.historyService = new this.platform.eveService('switch', this.accessory, {
@@ -27,7 +29,7 @@ module.exports = class deviceSwitchSingle {
 
   async internalUpdate (value, callback) {
     try {
-      await this.helpers.sleep(Math.floor(Math.random() * 491 + 10))
+      await this.funcs.sleep(Math.floor(Math.random() * 491 + 10))
       callback()
       await this.platform.sendDeviceUpdate(this.accessory, {
         switch: value ? 'on' : 'off'
@@ -38,7 +40,7 @@ module.exports = class deviceSwitchSingle {
         status: value ? 1 : 0
       })
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current state [%s].', this.dName, this.cacheOnOff)
+        this.log('[%s] current state [%s].', this.name, this.cacheOnOff)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
@@ -51,14 +53,14 @@ module.exports = class deviceSwitchSingle {
         return
       }
       const newStatus = params.switch === 'on'
-      this.service.updateCharacteristic(this.C.On, newStatus)
+      this.service.updateCharacteristic(this.hapChar.On, newStatus)
       this.cacheOnOff = params.switch
       this.accessory.historyService.addEntry({
         time: Math.round(new Date().valueOf() / 1000),
         status: newStatus ? 1 : 0
       })
       if (params.updateSource && !this.disableDeviceLogging) {
-        this.log('[%s] current state [%s].', this.dName, this.cacheOnOff)
+        this.log('[%s] current state [%s].', this.name, this.cacheOnOff)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
diff --git a/lib/device/template.js b/lib/device/template.js
index 56796a76..dfd0b248 100644
--- a/lib/device/template.js
+++ b/lib/device/template.js
@@ -4,16 +4,17 @@
 module.exports = class deviceTemplate {
   constructor (platform, accessory) {
     this.platform = platform
+    this.funcs = platform.funcs
+    this.messages = platform.messages
     this.log = platform.log
     this.disableDeviceLogging = platform.config.disableDeviceLogging
-    this.helpers = platform.helpers
-    this.S = platform.api.hap.Service
-    this.C = platform.api.hap.Characteristic
-    this.dName = accessory.displayName
+    this.hapServ = platform.api.hap.Service
+    this.hapChar = platform.api.hap.Characteristic
+    this.name = accessory.displayName
     this.accessory = accessory
 
-    this.service = this.accessory.getService(this.S.Switch) || this.accessory.addService(this.S.Switch)
-    this.service.getCharacteristic(this.C.On)
+    this.service = this.accessory.getService(this.hapServ.Switch) || this.accessory.addService(this.hapServ.Switch)
+    this.service.getCharacteristic(this.hapChar.On)
       .on('set', this.internalUpdate.bind(this))
   }
 
diff --git a/lib/device/usb.js b/lib/device/usb.js
index 0b0c63d8..dfcb1b04 100644
--- a/lib/device/usb.js
+++ b/lib/device/usb.js
@@ -4,26 +4,27 @@
 module.exports = class deviceUSB {
   constructor (platform, accessory) {
     this.platform = platform
+    this.funcs = platform.funcs
+    this.messages = platform.messages
     this.log = platform.log
     this.disableDeviceLogging = platform.config.disableDeviceLogging
-    this.helpers = platform.helpers
-    this.S = platform.api.hap.Service
-    this.C = platform.api.hap.Characteristic
-    this.dName = accessory.displayName
+    this.hapServ = platform.api.hap.Service
+    this.hapChar = platform.api.hap.Characteristic
+    this.name = accessory.displayName
     this.accessory = accessory
 
     if ((platform.config.outletAsSwitch || '').split(',').includes(this.accessory.context.eweDeviceId)) {
-      if (this.accessory.getService(this.S.Outlet)) {
-        this.accessory.removeService(this.accessory.getService(this.S.Outlet))
+      if (this.accessory.getService(this.hapServ.Outlet)) {
+        this.accessory.removeService(this.accessory.getService(this.hapServ.Outlet))
       }
-      this.service = this.accessory.getService(this.S.Switch) || this.accessory.addService(this.S.Switch)
+      this.service = this.accessory.getService(this.hapServ.Switch) || this.accessory.addService(this.hapServ.Switch)
     } else {
-      if (this.accessory.getService(this.S.Switch)) {
-        this.accessory.removeService(this.accessory.getService(this.S.Switch))
+      if (this.accessory.getService(this.hapServ.Switch)) {
+        this.accessory.removeService(this.accessory.getService(this.hapServ.Switch))
       }
-      this.service = this.accessory.getService(this.S.Outlet) || this.accessory.addService(this.S.Outlet)
+      this.service = this.accessory.getService(this.hapServ.Outlet) || this.accessory.addService(this.hapServ.Outlet)
     }
-    this.service.getCharacteristic(this.C.On)
+    this.service.getCharacteristic(this.hapChar.On)
       .on('set', this.internalUpdate.bind(this))
     this.accessory.log = platform.config.debugFakegato ? this.log : () => {}
     this.accessory.historyService = new this.platform.eveService('switch', this.accessory, {
@@ -35,7 +36,7 @@ module.exports = class deviceUSB {
   async internalUpdate (value, callback) {
     try {
       callback()
-      const params = { switches: this.helpers.defaultMultiSwitchOff }
+      const params = { switches: this.consts.defaultMultiSwitchOff }
       params.switches[0].switch = value ? 'on' : 'off'
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.cacheOnOff = value ? 'on' : 'off'
@@ -44,7 +45,7 @@ module.exports = class deviceUSB {
         status: value ? 1 : 0
       })
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current state [%s].', this.dName, value ? 'on' : 'off')
+        this.log('[%s] current state [%s].', this.name, value ? 'on' : 'off')
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
@@ -57,14 +58,14 @@ module.exports = class deviceUSB {
         return
       }
       const newStatus = params.switches[0].switch === 'on'
-      this.service.updateCharacteristic(this.C.On, newStatus)
+      this.service.updateCharacteristic(this.hapChar.On, newStatus)
       this.cacheOnOff = params.switches[0].switch
       this.accessory.historyService.addEntry({
         time: Math.round(new Date().valueOf() / 1000),
         status: newStatus ? 1 : 0
       })
       if (params.updateSource && !this.disableDeviceLogging) {
-        this.log('[%s] current state [%s].', this.dName, params.switches[0].switch)
+        this.log('[%s] current state [%s].', this.name, params.switches[0].switch)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
diff --git a/lib/device/zigbee/light-dimmer.js b/lib/device/zigbee/light-dimmer.js
index 929426a2..bc4a35ba 100644
--- a/lib/device/zigbee/light-dimmer.js
+++ b/lib/device/zigbee/light-dimmer.js
@@ -4,18 +4,19 @@
 module.exports = class deviceZBLightDimmer {
   constructor (platform, accessory) {
     this.platform = platform
+    this.funcs = platform.funcs
+    this.messages = platform.messages
     this.log = platform.log
     this.disableDeviceLogging = platform.config.disableDeviceLogging
-    this.helpers = platform.helpers
-    this.S = platform.api.hap.Service
-    this.C = platform.api.hap.Characteristic
-    this.dName = accessory.displayName
+    this.hapServ = platform.api.hap.Service
+    this.hapChar = platform.api.hap.Characteristic
+    this.name = accessory.displayName
     this.accessory = accessory
 
-    this.service = this.accessory.getService(this.S.Lightbulb) || this.accessory.addService(this.S.Lightbulb)
-    this.service.getCharacteristic(this.C.On)
+    this.service = this.accessory.getService(this.hapServ.Lightbulb) || this.accessory.addService(this.hapServ.Lightbulb)
+    this.service.getCharacteristic(this.hapChar.On)
       .on('set', this.internalOnOffUpdate.bind(this))
-    this.service.getCharacteristic(this.C.Brightness)
+    this.service.getCharacteristic(this.hapChar.Brightness)
       .on('set', this.internalBrightnessUpdate.bind(this))
   }
 
@@ -27,7 +28,7 @@ module.exports = class deviceZBLightDimmer {
       })
       this.cacheOnOff = value ? 'on' : 'off'
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current state [%s].', this.dName, value ? 'on' : 'off')
+        this.log('[%s] current state [%s].', this.name, value ? 'on' : 'off')
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
@@ -48,13 +49,13 @@ module.exports = class deviceZBLightDimmer {
       }
       const updateKey = Math.random().toString(36).substr(2, 8)
       this.updateKeyBright = updateKey
-      await this.helpers.sleep(500)
+      await this.funcs.sleep(500)
       if (updateKey !== this.updateKeyBright) {
         return
       }
       await this.platform.sendDeviceUpdate(this.accessory, params)
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current brightness [%s%].', this.dName, this.cacheBrightness)
+        this.log('[%s] current brightness [%s%].', this.name, this.cacheBrightness)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
@@ -65,17 +66,17 @@ module.exports = class deviceZBLightDimmer {
     try {
       if (params.switch && params.switch !== this.cacheOnOff) {
         this.cacheOnOff = params.switch
-        this.service.updateCharacteristic(this.C.On, this.cacheOnOff === 'on')
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheOnOff === 'on')
         if (params.updateSource && !this.disableDeviceLogging) {
-          this.log('[%s] current state [%s].', this.dName, this.cacheOnOff)
+          this.log('[%s] current state [%s].', this.name, this.cacheOnOff)
         }
       }
-      if (this.helpers.hasProperty(params, 'brightness')) {
+      if (this.funcs.hasProperty(params, 'brightness')) {
         if (params.brightness !== this.cacheBrightness) {
           this.cacheBrightness = params.brightness
-          this.service.updateCharacteristic(this.C.Brightness, this.cacheBrightness)
+          this.service.updateCharacteristic(this.hapChar.Brightness, this.cacheBrightness)
           if (params.updateSource && !this.disableDeviceLogging) {
-            this.log('[%s] current brightness [%s%].', this.dName, this.cacheBrightness)
+            this.log('[%s] current brightness [%s%].', this.name, this.cacheBrightness)
           }
         }
       }
diff --git a/lib/device/zigbee/sensor-ambient.js b/lib/device/zigbee/sensor-ambient.js
index e0660c61..2a5960c2 100644
--- a/lib/device/zigbee/sensor-ambient.js
+++ b/lib/device/zigbee/sensor-ambient.js
@@ -4,58 +4,59 @@
 module.exports = class deviceZBSensorAmbient {
   constructor (platform, accessory) {
     this.platform = platform
+    this.funcs = platform.funcs
+    this.messages = platform.messages
     this.log = platform.log
     this.disableDeviceLogging = platform.config.disableDeviceLogging
-    this.helpers = platform.helpers
-    this.S = platform.api.hap.Service
-    this.C = platform.api.hap.Characteristic
-    this.dName = accessory.displayName
+    this.hapServ = platform.api.hap.Service
+    this.hapChar = platform.api.hap.Characteristic
+    this.name = accessory.displayName
     this.accessory = accessory
 
     this.lowBattThreshold = parseInt(this.platform.config.lowBattThreshold)
     this.lowBattThreshold = isNaN(this.lowBattThreshold) || this.lowBattThreshold < 5
-      ? this.helpers.defaults.lowBattThreshold
+      ? this.consts.defaults.lowBattThreshold
       : this.lowBattThreshold
 
-    this.tService = this.accessory.getService(this.S.TemperatureSensor) || this.accessory.addService(this.S.TemperatureSensor)
-    this.tService.getCharacteristic(this.C.CurrentTemperature)
+    this.tService = this.accessory.getService(this.hapServ.TemperatureSensor) || this.accessory.addService(this.hapServ.TemperatureSensor)
+    this.tService.getCharacteristic(this.hapChar.CurrentTemperature)
       .setProps({ minValue: -100 })
-    this.hService = this.accessory.getService(this.S.HumiditySensor) || this.accessory.addService(this.S.HumiditySensor)
+    this.hService = this.accessory.getService(this.hapServ.HumiditySensor) || this.accessory.addService(this.hapServ.HumiditySensor)
     this.accessory.log = platform.config.debugFakegato ? this.log : () => {}
     this.accessory.historyService = new this.platform.eveService('weather', this.accessory, {
       storage: 'fs',
       path: platform.eveLogPath
     })
-    this.battService = this.accessory.getService(this.S.BatteryService) || this.accessory.addService(this.S.BatteryService)
+    this.battService = this.accessory.getService(this.hapServ.BatteryService) || this.accessory.addService(this.hapServ.BatteryService)
   }
 
   async externalUpdate (params) {
     try {
-      if (this.helpers.hasProperty(params, 'battery') && params.battery !== this.cacheBattery) {
+      if (this.funcs.hasProperty(params, 'battery') && params.battery !== this.cacheBattery) {
         this.cacheBattery = params.battery
-        this.battService.updateCharacteristic(this.C.BatteryLevel, this.cacheBattery)
-        this.battService.updateCharacteristic(this.C.StatusLowBattery, this.cacheBattery < this.lowBattThreshold)
+        this.battService.updateCharacteristic(this.hapChar.BatteryLevel, this.cacheBattery)
+        this.battService.updateCharacteristic(this.hapChar.StatusLowBattery, this.cacheBattery < this.lowBattThreshold)
         if (params.updateSource && !this.disableDeviceLogging) {
-          this.log('[%s] current battery [%s%].', this.dName, this.cacheBattery)
+          this.log('[%s] current battery [%s%].', this.name, this.cacheBattery)
         }
       }
       const eveLog = {}
-      if (this.helpers.hasProperty(params, 'temperature') && params.temperature !== this.cacheTemp) {
+      if (this.funcs.hasProperty(params, 'temperature') && params.temperature !== this.cacheTemp) {
         this.cacheTemp = params.temperature
         const currentTemp = parseInt(this.cacheTemp) / 100
-        this.tService.updateCharacteristic(this.C.CurrentTemperature, currentTemp)
+        this.tService.updateCharacteristic(this.hapChar.CurrentTemperature, currentTemp)
         eveLog.temp = currentTemp
         if (params.updateSource && !this.disableDeviceLogging) {
-          this.log('[%s] current temperature [%s].', this.dName, currentTemp)
+          this.log('[%s] current temperature [%s].', this.name, currentTemp)
         }
       }
-      if (this.helpers.hasProperty(params, 'humidity') && params.humidity !== this.cacheHumi) {
+      if (this.funcs.hasProperty(params, 'humidity') && params.humidity !== this.cacheHumi) {
         this.cacheHumi = params.humidity
         const currentHumi = parseInt(this.cacheHumi) / 100
-        this.hService.updateCharacteristic(this.C.CurrentRelativeHumidity, currentHumi)
+        this.hService.updateCharacteristic(this.hapChar.CurrentRelativeHumidity, currentHumi)
         eveLog.humidity = currentHumi
         if (params.updateSource && !this.disableDeviceLogging) {
-          this.log('[%s] current humidity [%s].', this.dName, currentHumi)
+          this.log('[%s] current humidity [%s].', this.name, currentHumi)
         }
       }
       if (eveLog.temp || eveLog.humidity) {
diff --git a/lib/device/zigbee/sensor-contact.js b/lib/device/zigbee/sensor-contact.js
index 9cb43aa9..0698de0e 100644
--- a/lib/device/zigbee/sensor-contact.js
+++ b/lib/device/zigbee/sensor-contact.js
@@ -4,54 +4,56 @@
 module.exports = class deviceZBSensorContact {
   constructor (platform, accessory) {
     this.platform = platform
+    this.consts = platform.consts
+    this.funcs = platform.funcs
+    this.messages = platform.messages
     this.log = platform.log
     this.disableDeviceLogging = platform.config.disableDeviceLogging
-    this.helpers = platform.helpers
-    this.S = platform.api.hap.Service
-    this.C = platform.api.hap.Characteristic
-    this.dName = accessory.displayName
+    this.hapServ = platform.api.hap.Service
+    this.hapChar = platform.api.hap.Characteristic
+    this.name = accessory.displayName
     this.accessory = accessory
 
     this.inherits = require('util').inherits
     const self = this
     this.eveLastActivation = function () {
-      self.C.call(this, 'Last Activation', self.helpers.eveUUID.lastActivation)
+      self.hapChar.call(this, 'Last Activation', self.consts.eveUUID.lastActivation)
       this.setProps({
-        format: self.C.Formats.UINT32,
-        unit: self.C.Units.SECONDS,
-        perms: [self.C.Perms.READ, self.C.Perms.NOTIFY]
+        format: self.hapChar.Formats.UINT32,
+        unit: self.hapChar.Units.SECONDS,
+        perms: [self.hapChar.Perms.READ, self.hapChar.Perms.NOTIFY]
       })
       this.value = this.getDefaultValue()
     }
-    this.inherits(this.eveLastActivation, this.C)
-    this.eveLastActivation.UUID = this.helpers.eveUUID.lastActivation
+    this.inherits(this.eveLastActivation, this.hapChar)
+    this.eveLastActivation.UUID = this.consts.eveUUID.lastActivation
     this.lowBattThreshold = parseInt(this.platform.config.lowBattThreshold)
     this.lowBattThreshold = isNaN(this.lowBattThreshold) || this.lowBattThreshold < 5
-      ? this.helpers.defaults.lowBattThreshold
+      ? this.consts.defaults.lowBattThreshold
       : this.lowBattThreshold
 
-    this.service = this.accessory.getService(this.S.ContactSensor) || this.accessory.addService(this.S.ContactSensor)
+    this.service = this.accessory.getService(this.hapServ.ContactSensor) || this.accessory.addService(this.hapServ.ContactSensor)
     this.accessory.log = platform.config.debugFakegato ? this.log : () => {}
     this.accessory.historyService = new this.platform.eveService('door', this.accessory, {
       storage: 'fs',
       path: platform.eveLogPath
     })
-    this.battService = this.accessory.getService(this.S.BatteryService) || this.accessory.addService(this.S.BatteryService)
+    this.battService = this.accessory.getService(this.hapServ.BatteryService) || this.accessory.addService(this.hapServ.BatteryService)
   }
 
   async externalUpdate (params) {
     try {
-      if (this.helpers.hasProperty(params, 'battery') && params.battery !== this.cacheBattery) {
+      if (this.funcs.hasProperty(params, 'battery') && params.battery !== this.cacheBattery) {
         this.cacheBattery = params.battery
         const scaledBatt = this.platform.config.ZBDWBatt ? this.cacheBattery * 10 : this.cacheBattery
-        this.battService.updateCharacteristic(this.C.BatteryLevel, scaledBatt)
-        this.battService.updateCharacteristic(this.C.StatusLowBattery, scaledBatt < this.lowBattThreshold)
+        this.battService.updateCharacteristic(this.hapChar.BatteryLevel, scaledBatt)
+        this.battService.updateCharacteristic(this.hapChar.StatusLowBattery, scaledBatt < this.lowBattThreshold)
         if (params.updateSource && !this.disableDeviceLogging) {
-          this.log('[%s] current battery [%s%].', this.dName, scaledBatt)
+          this.log('[%s] current battery [%s%].', this.name, scaledBatt)
         }
       }
-      if (this.helpers.hasProperty(params, 'lock') && [0, 1].includes(params.lock)) {
-        this.service.updateCharacteristic(this.C.ContactSensorState, params.lock)
+      if (this.funcs.hasProperty(params, 'lock') && [0, 1].includes(params.lock)) {
+        this.service.updateCharacteristic(this.hapChar.ContactSensorState, params.lock)
         if (params.lock === 1) {
           this.service.updateCharacteristic(
             this.eveLastActivation,
@@ -63,7 +65,7 @@ module.exports = class deviceZBSensorContact {
           status: params.lock
         })
         if (params.updateSource && !this.disableDeviceLogging) {
-          this.log('[%s] current state [contact%s detected].', this.dName, params.lock === 0 ? '' : ' not')
+          this.log('[%s] current state [contact%s detected].', this.name, params.lock === 0 ? '' : ' not')
         }
       }
     } catch (err) {
diff --git a/lib/device/zigbee/sensor-motion.js b/lib/device/zigbee/sensor-motion.js
index a68a35da..3b9a813e 100644
--- a/lib/device/zigbee/sensor-motion.js
+++ b/lib/device/zigbee/sensor-motion.js
@@ -4,60 +4,62 @@
 module.exports = class deviceZBSensorMotion {
   constructor (platform, accessory) {
     this.platform = platform
+    this.consts = platform.consts
+    this.funcs = platform.funcs
+    this.messages = platform.messages
     this.log = platform.log
     this.disableDeviceLogging = platform.config.disableDeviceLogging
-    this.helpers = platform.helpers
-    this.S = platform.api.hap.Service
-    this.C = platform.api.hap.Characteristic
-    this.dName = accessory.displayName
+    this.hapServ = platform.api.hap.Service
+    this.hapChar = platform.api.hap.Characteristic
+    this.name = accessory.displayName
     this.accessory = accessory
 
     this.inherits = require('util').inherits
     const self = this
     this.eveLastActivation = function () {
-      self.C.call(this, 'Last Activation', self.helpers.eveUUID.lastActivation)
+      self.hapChar.call(this, 'Last Activation', self.consts.eveUUID.lastActivation)
       this.setProps({
-        format: self.C.Formats.UINT32,
-        unit: self.C.Units.SECONDS,
-        perms: [self.C.Perms.READ, self.C.Perms.NOTIFY]
+        format: self.hapChar.Formats.UINT32,
+        unit: self.hapChar.Units.SECONDS,
+        perms: [self.hapChar.Perms.READ, self.hapChar.Perms.NOTIFY]
       })
       this.value = this.getDefaultValue()
     }
-    this.inherits(this.eveLastActivation, this.C)
-    this.eveLastActivation.UUID = this.helpers.eveUUID.lastActivation
+    this.inherits(this.eveLastActivation, this.hapChar)
+    this.eveLastActivation.UUID = this.consts.eveUUID.lastActivation
     this.lowBattThreshold = parseInt(this.platform.config.lowBattThreshold)
     this.lowBattThreshold = isNaN(this.lowBattThreshold) || this.lowBattThreshold < 5
-      ? this.helpers.defaults.lowBattThreshold
+      ? this.consts.defaults.lowBattThreshold
       : this.lowBattThreshold
     this.sensorTimeDifference = parseInt(this.platform.config.sensorTimeDifference)
     this.sensorTimeDifference = isNaN(this.sensorTimeDifference) || this.sensorTimeDifference < 10
-      ? this.helpers.defaults.sensorTimeDifference
+      ? this.consts.defaults.sensorTimeDifference
       : this.sensorTimeDifference
 
-    this.service = this.accessory.getService(this.S.MotionSensor) || this.accessory.addService(this.S.MotionSensor)
+    this.service = this.accessory.getService(this.hapServ.MotionSensor) || this.accessory.addService(this.hapServ.MotionSensor)
     this.accessory.log = platform.config.debugFakegato ? this.log : () => {}
     this.accessory.historyService = new this.platform.eveService('motion', this.accessory, {
       storage: 'fs',
       path: platform.eveLogPath
     })
-    this.battService = this.accessory.getService(this.S.BatteryService) || this.accessory.addService(this.S.BatteryService)
+    this.battService = this.accessory.getService(this.hapServ.BatteryService) || this.accessory.addService(this.hapServ.BatteryService)
   }
 
   async externalUpdate (params) {
     try {
-      if (this.helpers.hasProperty(params, 'battery') && params.battery !== this.cacheBattery) {
+      if (this.funcs.hasProperty(params, 'battery') && params.battery !== this.cacheBattery) {
         this.cacheBattery = params.battery
-        this.battService.updateCharacteristic(this.C.BatteryLevel, this.cacheBattery)
-        this.battService.updateCharacteristic(this.C.StatusLowBattery, this.cacheBattery < this.lowBattThreshold)
+        this.battService.updateCharacteristic(this.hapChar.BatteryLevel, this.cacheBattery)
+        this.battService.updateCharacteristic(this.hapChar.StatusLowBattery, this.cacheBattery < this.lowBattThreshold)
         if (params.updateSource && !this.disableDeviceLogging) {
-          this.log('[%s] current battery [%s%].', this.dName, this.cacheBattery)
+          this.log('[%s] current battery [%s%].', this.name, this.cacheBattery)
         }
       }
-      if (this.helpers.hasProperty(params, 'motion') && this.helpers.hasProperty(params, 'trigTime')) {
+      if (this.funcs.hasProperty(params, 'motion') && this.funcs.hasProperty(params, 'trigTime')) {
         const timeNow = new Date()
         const diff = (timeNow.getTime() - params.trigTime) / 1000
         const motionDetected = params.updateSource && params.motion === 1 && diff < this.sensorTimeDifference
-        this.service.updateCharacteristic(this.C.MotionDetected, motionDetected)
+        this.service.updateCharacteristic(this.hapChar.MotionDetected, motionDetected)
         if (motionDetected) {
           this.service.updateCharacteristic(
             this.eveLastActivation,
@@ -69,7 +71,7 @@ module.exports = class deviceZBSensorMotion {
           status: motionDetected ? 1 : 0
         })
         if (params.updateSource && !this.disableDeviceLogging) {
-          this.log('[%s] current state [motion%s detected].', this.dName, motionDetected ? '' : ' not')
+          this.log('[%s] current state [motion%s detected].', this.name, motionDetected ? '' : ' not')
         }
       }
     } catch (err) {
diff --git a/lib/device/zigbee/switch-single.js b/lib/device/zigbee/switch-single.js
index a97cca44..5d255e15 100644
--- a/lib/device/zigbee/switch-single.js
+++ b/lib/device/zigbee/switch-single.js
@@ -4,21 +4,22 @@
 module.exports = class deviceZBSwitchSingle {
   constructor (platform, accessory) {
     this.platform = platform
+    this.funcs = platform.funcs
+    this.messages = platform.messages
     this.log = platform.log
     this.disableDeviceLogging = platform.config.disableDeviceLogging
-    this.helpers = platform.helpers
-    this.S = platform.api.hap.Service
-    this.C = platform.api.hap.Characteristic
-    this.dName = accessory.displayName
+    this.hapServ = platform.api.hap.Service
+    this.hapChar = platform.api.hap.Characteristic
+    this.name = accessory.displayName
     this.accessory = accessory
 
-    this.service = this.accessory.getService(this.S.Switch) || this.accessory.addService(this.S.Switch)
+    this.service = this.accessory.getService(this.hapServ.Switch) || this.accessory.addService(this.hapServ.Switch)
     this.accessory.log = platform.config.debugFakegato ? this.log : () => {}
     this.accessory.historyService = new this.platform.eveService('switch', this.accessory, {
       storage: 'fs',
       path: platform.eveLogPath
     })
-    this.service.getCharacteristic(this.C.On)
+    this.service.getCharacteristic(this.hapChar.On)
       .on('set', this.internalUpdate.bind(this))
   }
 
@@ -34,7 +35,7 @@ module.exports = class deviceZBSwitchSingle {
         status: value ? 1 : 0
       })
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current state [%s].', this.dName, value ? 'on' : 'off')
+        this.log('[%s] current state [%s].', this.name, value ? 'on' : 'off')
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
@@ -47,13 +48,13 @@ module.exports = class deviceZBSwitchSingle {
         return
       }
       this.cacheOnOff = params.switch
-      this.service.updateCharacteristic(this.C.On, this.cacheOnOff === 'on')
+      this.service.updateCharacteristic(this.hapChar.On, this.cacheOnOff === 'on')
       this.accessory.historyService.addEntry({
         time: Math.round(new Date().valueOf() / 1000),
         status: this.cacheOnOff === 'on' ? 1 : 0
       })
       if (params.updateSource && !this.disableDeviceLogging) {
-        this.log('[%s] current state [%s].', this.dName, this.cacheOnOff)
+        this.log('[%s] current state [%s].', this.name, this.cacheOnOff)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
diff --git a/lib/device/zigbee/switch-stateless.js b/lib/device/zigbee/switch-stateless.js
index 88c2a476..435b4cc2 100644
--- a/lib/device/zigbee/switch-stateless.js
+++ b/lib/device/zigbee/switch-stateless.js
@@ -4,43 +4,44 @@
 module.exports = class deviceZBSwitchStateless {
   constructor (platform, accessory) {
     this.platform = platform
+    this.funcs = platform.funcs
+    this.messages = platform.messages
     this.log = platform.log
     this.disableDeviceLogging = platform.config.disableDeviceLogging
-    this.helpers = platform.helpers
-    this.S = platform.api.hap.Service
-    this.C = platform.api.hap.Characteristic
-    this.dName = accessory.displayName
+    this.hapServ = platform.api.hap.Service
+    this.hapChar = platform.api.hap.Characteristic
+    this.name = accessory.displayName
     this.accessory = accessory
 
     this.lowBattThreshold = parseInt(this.platform.config.lowBattThreshold)
     this.lowBattThreshold = isNaN(this.lowBattThreshold) || this.lowBattThreshold < 5
-      ? this.helpers.defaults.lowBattThreshold
+      ? this.consts.defaults.lowBattThreshold
       : this.lowBattThreshold
 
-    const ssp = this.S.StatelessProgrammableSwitch
+    const ssp = this.hapServ.StatelessProgrammableSwitch
     this.service = this.accessory.getService(ssp) || this.accessory.addService(ssp)
     if (this.platform.config.hideZBLDPress) {
-      this.service.getCharacteristic(this.C.ProgrammableSwitchEvent)
+      this.service.getCharacteristic(this.hapChar.ProgrammableSwitchEvent)
         .setProps({ validValues: [0] })
     }
-    this.battService = this.accessory.getService(this.S.BatteryService) || this.accessory.addService(this.S.BatteryService)
+    this.battService = this.accessory.getService(this.hapServ.BatteryService) || this.accessory.addService(this.hapServ.BatteryService)
   }
 
   async externalUpdate (params) {
     try {
-      if (this.helpers.hasProperty(params, 'battery') && params.battery !== this.cacheBattery) {
+      if (this.funcs.hasProperty(params, 'battery') && params.battery !== this.cacheBattery) {
         this.cacheBattery = params.battery
-        this.battService.updateCharacteristic(this.C.BatteryLevel, this.cacheBattery)
-        this.battService.updateCharacteristic(this.C.StatusLowBattery, this.cacheBattery < this.lowBattThreshold)
+        this.battService.updateCharacteristic(this.hapChar.BatteryLevel, this.cacheBattery)
+        this.battService.updateCharacteristic(this.hapChar.StatusLowBattery, this.cacheBattery < this.lowBattThreshold)
         if (params.updateSource && !this.disableDeviceLogging) {
-          this.log('[%s] current battery [%s%].', this.dName, params.battery)
+          this.log('[%s] current battery [%s%].', this.name, params.battery)
         }
       }
-      if (this.helpers.hasProperty(params, 'key') && [0, 1, 2].includes(params.key)) {
-        this.service.updateCharacteristic(this.C.ProgrammableSwitchEvent, params.key)
+      if (this.funcs.hasProperty(params, 'key') && [0, 1, 2].includes(params.key)) {
+        this.service.updateCharacteristic(this.hapChar.ProgrammableSwitchEvent, params.key)
         if (params.updateSource && !this.disableDeviceLogging) {
           const textLabel = params.key === 0 ? 'single' : (params.key === 1 ? 'double' : 'long')
-          this.log('[%s] current state [%s press].', this.dName, textLabel)
+          this.log('[%s] current state [%s press].', this.name, textLabel)
         }
       }
     } catch (err) {
diff --git a/lib/index.js b/lib/index.js
index 6cfd45e0..7d79035a 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1,122 +1,421 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
+
+// Retrieve necessary fields from the package.json file
 const PLUGIN = require('./../package.json')
+
+// Create the platform class
 class eWeLinkPlatform {
   constructor (log, config, api) {
-    // *** Disable the plugin if not configured correctly *** \\
+    // Don't load the plugin if these aren't accessible for any reason
     if (!log || !api) {
       return
     }
+
+    // Retrieve the necessary constants and functions before starting
+    this.consts = require('./utils/constants')
+    this.messages = this.consts.messages
+    this.funcs = require('./utils/functions')
+
+    // Begin plugin initialisation
     try {
+      // Check the user has configured the plugin
       if (!config || !config.username || !config.password || !config.countryCode) {
-        throw new Error('eWeLink credentials missing from configuration')
+        throw new Error(this.messages.missingCreds)
       }
 
-      // *** Set up our variables *** \\
+      // Initialise these variables before anything else
       this.log = log
-      this.config = config
       this.api = api
-      this.helpers = require('./utils/helpers')
-      this.debug = config.debug
-      this.colourUtils = require('./utils/colour-utils')
-      this.eveService = require('./fakegato/fakegato-history')(api)
-      this.eveLogPath = api.user.storagePath() + '/persist/'
-      this.mode = ['auto', 'wan', 'lan'].includes(config.mode) ? config.mode : 'auto'
-      this.devicesInHB = new Map()
-      this.devicesInEW = new Map()
-      this.cusG = new Map()
-      this.cusS = new Map()
-      this.hiddenMasters = []
+      this.ipOverride = {}
       this.obstructSwitches = {}
-      if (Object.keys(config.groups || []).length > 0) {
-        config.groups
-          .filter(g => g.obstructId && g.deviceId && ['garage', 'garage_eachen'].includes(g.type))
-          .forEach(g => (this.obstructSwitches[g.obstructId.toLowerCase()] = g.deviceId.toLowerCase()))
-      }
-      this.ignoredDevices = (config.ignoredDevices || '').replace(/[\s'"]+/g, '').toLowerCase().split(',')
       this.thTempOffset = {}
-      if (Array.isArray(config.thTempOffset)) {
-        config.thTempOffset.forEach(x => (this.thTempOffset[x.deviceId] = x.offset))
-      }
-      this.nameOverride = {}
-      if (Array.isArray(config.nameOverride)) {
-        config.nameOverride.forEach(x => (this.nameOverride[x.fullDeviceId] = x.deviceName))
-      }
-      this.ipOverride = {}
-      if (Array.isArray(config.ipOverride)) {
-        config.ipOverride.forEach(x => (this.ipOverride[x.deviceId] = x.deviceIP))
-      }
+      this.simulations = {}
+      this.rfSensors = {}
 
-      // *** Set up Homebridge API events *** \\
-      this.api.on('didFinishLaunching', this.eWeLinkSetup.bind(this))
-      this.api.on('shutdown', this.eWeLinkShutdown.bind(this))
+      // Apply the user's configuration
+      this.config = this.consts.defaultConfig
+      this.applyUserConfig(config)
+
+      // Create further variables needed by the plugin
+      this.devicesInHB = new Map()
+      this.devicesInEW = new Map()
+
+      // Setup the Homebridge events
+      this.api.on('didFinishLaunching', this.pluginSetup.bind(this))
+      this.api.on('shutdown', this.pluginShutdown.bind(this))
     } catch (err) {
-      const errToShow = err.message + (err.lineNumber ? ' [line ' + err.lineNumber + ']' : '')
-      log.warn('*** Disabling plugin [v%s] ***', PLUGIN.version)
-      log.warn('*** %s. ***', errToShow)
+      // Catch any errors during initialisation
+      const hideErrLines = [
+        this.messages.missingCC,
+        this.messages.missingCreds,
+        this.messages.missingPW,
+        this.messages.missingUN
+      ]
+      const eText = hideErrLines.includes(err.message)
+        ? err.message
+        : this.funcs.parseError(err)
+      log.warn('***** %s [v%s]. *****', this.messages.disabling, PLUGIN.version)
+      log.warn('***** %s. *****', eText)
     }
   }
 
-  async eWeLinkSetup () {
+  applyUserConfig (config) {
+    // These shorthand functions save line space during config parsing
+    const logDefault = (k, def) => {
+      this.log.warn('%s [%s] %s %s.', this.messages.cfgItem, k, this.messages.cfgDef, def)
+    }
+    const logIgnore = k => {
+      this.log.warn('%s [%s] %s.', this.messages.cfgItem, k, this.messages.cfgIgn)
+    }
+    const logIncrease = (k, min) => {
+      this.log.warn('%s [%s] %s %s.', this.messages.cfgItem, k, this.messages.cfgLow, min)
+    }
+    const logQuotes = k => {
+      this.log.warn('%s [%s] %s.', this.messages.cfgItem, k, this.messages.cfgQts)
+    }
+    const logRemove = k => {
+      this.log.warn('%s [%s] %s.', this.messages.cfgItem, k, this.messages.cfgRmv)
+    }
+
+    // Begin applying the user's config
+    for (const [key, val] of Object.entries(config)) {
+      switch (key) {
+        case 'bridgeSensors':
+          if (Array.isArray(val) && val.length > 0) {
+            val.forEach(x => {
+              if (!x.type || !x.fullDeviceId) {
+                logIgnore(key)
+                return
+              }
+              const fullDeviceId = this.funcs.parseDeviceId(x.fullDeviceId)
+              this.rfSensors[fullDeviceId] = {}
+              for (const [k, v] of Object.entries(x)) {
+                switch (k) {
+                  case 'fullDeviceId':
+                    break
+                  case 'sensorTimeLength': {
+                    if (typeof v === 'string') {
+                      logQuotes(key + '.' + k)
+                    }
+                    const intVal = parseInt(v)
+                    if (isNaN(intVal)) {
+                      logDefault(key + '.' + k, this.consts.defaultValues[k])
+                      this.rfSensors[fullDeviceId][k] = this.consts.defaultValues[k]
+                    } else if (intVal < this.consts.minValues[k]) {
+                      logIncrease(key + '.' + k, this.consts.minValues[k])
+                      this.rfSensors[fullDeviceId][k] = this.consts.minValues[k]
+                    } else {
+                      this.rfSensors[fullDeviceId][k] = intVal
+                    }
+                    break
+                  }
+                  case 'type':
+                    if (typeof v !== 'string' || v === '') {
+                      logIgnore(key + '.' + k)
+                    } else if (!this.consts.allowed.sensors.includes(x.type)) {
+                      logIgnore(key + '.' + k)
+                    } else {
+                      this.rfSensors[fullDeviceId][k] = v
+                    }
+                    break
+                  default:
+                    logRemove(key + '.' + k)
+                    break
+                }
+              }
+            })
+          } else {
+            logIgnore(key)
+          }
+          break
+        case 'countryCode': {
+          if (typeof val === 'string') {
+            logQuotes(key)
+          }
+          const intVal = parseInt(val)
+          if (isNaN(intVal)) {
+            throw new Error(this.messages.missingCC)
+          } else {
+            this.config.countryCode = '+' + val.toString().replace(/[\s+]+/g, '')
+          }
+          break
+        }
+        case 'debug':
+        case 'debugFakegato':
+        case 'disableDeviceLogging':
+        case 'disablePlugin':
+        case 'hideZBLDPress':
+          if (typeof val === 'string') {
+            logQuotes(key)
+          }
+          this.config[key] = val === 'false' ? false : !!val
+          break
+        case 'groups':
+          if (Array.isArray(val) && val.length > 0) {
+            val.forEach(x => {
+              if (!x.type || !x.deviceId) {
+                logIgnore(key)
+                return
+              }
+              const deviceId = this.funcs.parseDeviceId(x.deviceId)
+              this.simulations[deviceId] = {}
+              for (const [k, v] of Object.entries(x)) {
+                switch (k) {
+                  case 'deviceId':
+                    break
+                  case 'obstructId':
+                    if (typeof v !== 'string' || v === '') {
+                      logIgnore(key + '.' + k)
+                    } else if (!this.consts.allowed.obstructs.includes(x.type)) {
+                      logIgnore(key + '.' + k)
+                    } else {
+                      const parsed = this.funcs.parseDeviceId(v)
+                      this.simulations[deviceId].obstructId = parsed
+                      this.obstructSwitches[parsed] = deviceId
+                    }
+                    break
+                  case 'operationTime': {
+                    if (typeof v === 'string') {
+                      logQuotes(key + '.' + k)
+                    }
+                    const intVal = parseInt(v)
+                    if (isNaN(intVal)) {
+                      logDefault(key + '.' + k, this.consts.defaultValues[k])
+                      this.simulations[deviceId][k] = this.consts.defaultValues[k]
+                    } else if (intVal < this.consts.minValues[k]) {
+                      logIncrease(key + '.' + k, this.consts.minValues[k])
+                      this.simulations[deviceId][k] = this.consts.minValues[k]
+                    } else {
+                      this.simulations[deviceId][k] = intVal
+                    }
+                    break
+                  }
+                  case 'sensorId':
+                    if (typeof v !== 'string' || v === '') {
+                      logIgnore(key + '.' + k)
+                    } else {
+                      const parsed = this.funcs.parseDeviceId(v)
+                      this.simulations[deviceId].sensorId = parsed
+                    }
+                    break
+                  case 'setup':
+                    if (typeof v !== 'string' || v === '') {
+                      logIgnore(key + '.' + k)
+                    } else if (!this.consts.allowed.setups.includes(v)) {
+                      logIgnore(key + '.' + k)
+                    } else {
+                      this.simulations[deviceId][k] = v
+                    }
+                    break
+                  case 'type':
+                    if (typeof v !== 'string' || v === '') {
+                      logIgnore(key + '.' + k)
+                    } else if (!this.consts.allowed.groups.includes(x.type)) {
+                      logIgnore(key + '.' + k)
+                    } else {
+                      this.simulations[deviceId][k] = v
+                    }
+                    break
+                  default:
+                    logRemove(key + '.' + k)
+                    break
+                }
+              }
+            })
+          } else {
+            logIgnore(key)
+          }
+          break
+        case 'ignoredDevices':
+        case 'hideChanFromHB':
+        case 'switchAsOutlet':
+        case 'outletAsSwitch':
+        case 'hideLightFromFan':
+        case 'hideSwitchFromTH':
+        case 'resetRFBridge':
+        case 'bulbB02BA60':
+        case 'bulbB02FST64':
+          this.config[key] = []
+          if (typeof val !== 'string' || val === '') {
+            logIgnore(key)
+          } else {
+            const items = val.split(',')
+            items.forEach(item => {
+              this.config[key].push(this.funcs.parseDeviceId(val))
+            })
+          }
+          break
+        case 'inUsePowerThreshold':
+        case 'lowBattThreshold':
+        case 'sensorTimeDifference': {
+          if (typeof val === 'string') {
+            logQuotes(key)
+          }
+          const intVal = parseInt(val)
+          if (isNaN(intVal)) {
+            logDefault(key, this.consts.defaultValues[key])
+            this.config[key] = this.consts.defaultValues[key]
+          } else if (intVal < this.consts.minValues[key]) {
+            logIncrease(key, this.consts.minValues[key])
+            this.config[key] = this.consts.minValues[key]
+          } else {
+            this.config[key] = intVal
+          }
+          break
+        }
+        case 'ipOverride':
+          if (Array.isArray(val) && val.length > 0) {
+            val.forEach(x => {
+              if (!x.deviceId) {
+                logIgnore(key)
+                return
+              }
+              const deviceId = this.funcs.parseDeviceId(x.deviceId)
+              for (const [k, v] of Object.entries(x)) {
+                switch (k) {
+                  case 'deviceId':
+                    break
+                  case 'deviceIp': {
+                    if (typeof v !== 'string' || v === '') {
+                      logIgnore(key + '.' + k)
+                    }
+                    this.ipOverride[deviceId] = v
+                    break
+                  }
+                  default:
+                    logRemove(key + '.' + k)
+                    break
+                }
+              }
+            })
+          } else {
+            logIgnore(key)
+          }
+          break
+        case 'mode': {
+          const inSet = ['auto', 'wan', 'lan'].includes(val)
+          if (typeof val !== 'string' || !inSet) {
+            logIgnore(key)
+          }
+          this.config.mode = inSet ? val : 'auto'
+          break
+        }
+        case 'name':
+        case 'platform':
+          break
+        case 'password':
+          if (typeof val !== 'string' || val === '') {
+            throw new Error(this.messages.missingPW)
+          }
+          this.config.password = val
+          break
+        case 'thTempOffset':
+          if (Array.isArray(val) && val.length > 0) {
+            val.forEach(x => {
+              if (!x.deviceId) {
+                logIgnore(key)
+                return
+              }
+              const deviceId = this.funcs.parseDeviceId(x.deviceId)
+              for (const [k, v] of Object.entries(x)) {
+                switch (k) {
+                  case 'deviceId':
+                    break
+                  case 'offset': {
+                    if (typeof v === 'string') {
+                      logQuotes(key + '.' + k)
+                    }
+                    const intVal = Number(v)
+                    if (isNaN(intVal)) {
+                      logIgnore(key + '.' + k)
+                    } else {
+                      this.thTempOffset[deviceId] = intVal
+                    }
+                    break
+                  }
+                  default:
+                    logRemove(key + '.' + k)
+                    break
+                }
+              }
+            })
+          } else {
+            logIgnore(key)
+          }
+          break
+        case 'username':
+          if (typeof val !== 'string' || val === '') {
+            throw new Error(this.messages.missingUN)
+          }
+          this.config.username = val.replace(/[\s]+/g, '')
+          break
+      }
+    }
+  }
+
+  async pluginSetup () {
+    // Plugin has finished initialising to now onto setup
     try {
-      // *** Check to see if the user has disabled the plugin *** \\
+      // If the user has disabled the plugin then remove all accessories
       if (this.config.disablePlugin) {
-        this.devicesInHB.forEach(a => this.removeAccessory(a))
-        throw new Error('To change this, set disablePlugin to false')
+        this.devicesInHB.forEach(accessory => {
+          this.removeAccessory(accessory)
+        })
+        throw new Error(this.messages.disabled)
       }
 
-      // *** Set up initial sync with eWeLink *** \\
-      this.log('Plugin [v%s] initialised. Syncing with eWeLink...', PLUGIN.version)
+      // Log that the plugin initialisation has been successful
+      this.log('[v%s] %s.', PLUGIN.version, this.messages.initialised)
+
+      // Set up further global variables
+      this.eveLogPath = this.api.user.storagePath() + '/persist/'
+      this.hiddenMasters = []
+
+      // Require any libraries that the plugin uses
+      this.axios = require('axios')
+      this.crypto = require('crypto')
+      this.colourUtils = require('./utils/colour-utils')
+      this.emitter = new (require('events'))()
+      this.eveService = require('./fakegato/fakegato-history')(this.api)
 
-      // *** Set up the HTTP client, get the user HTTP host, and login *** \\
+      // Set up the HTTP client, get the user HTTP host, and login
       this.httpClient = new (require('./connection/http'))(this)
       await this.httpClient.getHost()
       const authData = await this.httpClient.login()
 
-      // *** Get a device list and add to the devicesInEW map *** \\
+      // Get a device list and add to the devicesInEW map
       const deviceList = await this.httpClient.getDevices()
-      deviceList.forEach(device => this.devicesInEW.set(device.deviceid, device))
+      deviceList.forEach(device => {
+        this.devicesInEW.set(device.deviceid, device)
+      })
 
-      // *** Set up the WS client, get the user WS host, and login *** \\
-      if (this.mode !== 'lan') {
+      // Set up the WS client, get the user WS host, and login
+      if (this.config.mode !== 'lan') {
         this.wsClient = new (require('./connection/ws'))(this, authData)
         await this.wsClient.getHost()
         this.wsClient.login()
       }
 
-      // *** Set up the LAN client, scan for devices and start monitoring *** \\
-      if (this.mode !== 'wan') {
+      // Set up the LAN client, scan for devices and start monitoring
+      if (this.config.mode !== 'wan') {
         this.lanClient = new (require('./connection/lan'))(this, deviceList)
         this.lanDevices = await this.lanClient.getHosts()
         await this.lanClient.startMonitor()
       }
 
-      // *** Check for valid Accessory Simulations and add to cusG for later use *** \\
-      if (Object.keys(this.config.groups || []).length > 0) {
-        this.config.groups.filter(g => g.type && this.helpers.allowedGroups.includes(g.type))
-          .filter(g => g.deviceId && this.devicesInEW.has(g.deviceId.toLowerCase()))
-          .forEach(g => this.cusG.set(g.deviceId.toLowerCase(), g))
-      }
-
-      // *** Check for valid custom RF Bridge sensors and add to cusS for later use *** \\
-      if (Object.keys(this.config.bridgeSensors || []).length > 0) {
-        this.config.bridgeSensors
-          .filter(s => s.fullDeviceId && this.devicesInEW.has(s.fullDeviceId.split('SW')[0].toString().toLowerCase()))
-          .forEach(s => this.cusS.set(s.fullDeviceId, s))
-      }
-
-      // *** Remove HB accessories that are no longer in eWeLink account *** \\
+      // Remove HB accessories that are no longer in eWeLink account
       this.devicesInHB.forEach(accessory => {
         if (!this.devicesInEW.has(accessory.context.eweDeviceId)) {
           this.removeAccessory(accessory)
         }
       })
 
-      // *** Initialise each device into HB *** \\
+      // Initialise each device into HB
       this.devicesInEW.forEach(device => this.initialiseDevice(device))
 
-      // *** Set up the WS and LAN listener for device updates *** \\
+      // Set up the WS and LAN listener for device updates
       if (this.wsClient) {
         this.wsClient.receiveUpdate(device => this.receiveDeviceUpdate(device))
       }
@@ -124,116 +423,149 @@ class eWeLinkPlatform {
         this.lanClient.receiveUpdate(device => this.receiveDeviceUpdate(device))
       }
 
-      // *** Refresh the WS connection every 60 minutes *** \\
+      // Refresh the WS connection every 60 minutes
       if (this.wsClient) {
         this.wsRefresh = setInterval(async () => {
           try {
-            if (this.debug) {
-              this.log('Refreshing WS connection...')
+            if (this.config.debug) {
+              this.log('%s.', this.messages.wsRef)
             }
             await this.wsClient.getHost()
             await this.wsClient.closeConnection()
-            await this.helpers.sleep(250)
+            await this.funcs.sleep(250)
             await this.wsClient.login()
-          } catch (err) {
-            this.log.warn(this.debug ? err : err.message)
+          } catch (e) {
+            const eText = this.funcs.parseError(e)
+            this.log.warn('%s %s.', this.messages.wsRefFail, eText)
           }
         }, 3600000)
       }
 
-      // *** Log for informative purposes *** \\
-      this.log('✓ Setup complete. %s', this.helpers.logMessages[Math.floor(Math.random() * this.helpers.logMessages.length)])
+      // Log that the plugin setup has been successful with a welcome message
+      const randIndex = Math.floor(Math.random() * this.consts.welcomeMessages.length)
+      this.log('%s. %s', this.messages.complete, this.consts.welcomeMessages[randIndex])
     } catch (err) {
-      // *** Catch errors at any point during setup *** \\
-      const errToShow = err.message + (err.lineNumber ? ' [line ' + err.lineNumber + ']' : '')
-      this.log.warn('*** Disabling plugin [v%s] ***', PLUGIN.version)
-      this.log.warn('*** %s ***', errToShow)
-
-      // *** Call the shutdown function as plugin is disabled *** \\
-      this.eWeLinkShutdown()
+      // Catch any errors during setup
+      const eText = this.funcs.parseError(err)
+      this.log.warn('***** %s [v%s]. *****', this.messages.disabling, PLUGIN.version)
+      this.log.warn('***** %s. *****', eText)
+      this.pluginShutdown()
     }
   }
 
-  eWeLinkShutdown () {
-    // *** Attempt to close WS and stop LAN monitor if this has been setup *** \\
+  pluginShutdown () {
+    // A function that is called when the plugin fails to load or Homebridge restarts
     try {
+      // Stop the LAN monitoring
       if (this.lanClient) {
         this.lanClient.closeConnection()
       }
+
+      // Close the WS connection
       if (this.wsClient) {
         clearInterval(this.wsRefresh)
         this.wsClient.closeConnection()
       }
-    } catch (err) {}
+    } catch (err) {
+      // No need to show errors at this point
+    }
   }
 
   initialiseDevice (device) {
     let accessory
     let oAccessory
     try {
-      // *** Set up the correct instance for this particular device *** \\
-      if (this.helpers.devicesCurtain.includes(device.extra.uiid)) {
+      // Set up the correct instance for this particular device
+      if (this.consts.devices.curtain.includes(device.extra.uiid)) {
         /***********************
         BLINDS [EWELINK UIID 11]
         ***********************/
+        const cache = this.consts.defaultCurtainCache
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
-          : this.addAccessory(device, device.deviceid + 'SWX', false, this.helpers.defaultCurtainCache)
+          : this.addAccessory(device, device.deviceid + 'SWX', false, cache)
         accessory.control = new (require('./device/curtain'))(this, accessory)
         /**********************/
-      } else if (this.cusG.has(device.deviceid) && this.cusG.get(device.deviceid).type === 'blind') {
+      } else if (
+        this.simulations[device.deviceid] &&
+        this.simulations[device.deviceid].type === 'blind'
+      ) {
         /****************************
         BLINDS [ACCESSORY SIMULATION]
         ****************************/
+        const cache = this.consts.defaultBlindCache
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
-          : this.addAccessory(device, device.deviceid + 'SWX', false, this.helpers.defaultBlindCache)
+          : this.addAccessory(device, device.deviceid + 'SWX', false, cache)
         accessory.control = new (require('./device/simulation/blind'))(this, accessory)
         /***************************/
-      } else if (this.helpers.hasProperty(this.obstructSwitches, device.deviceid)) {
+      } else if (this.obstructSwitches[device.deviceid]) {
         /*****************************
         OBSTRUCTION DETECTION SWITCHES
         *****************************/
+        const instance = './device/simulation/garage-od-switch'
         accessory = this.addAccessory(device, device.deviceid + 'SWX', true)
-        accessory.control = new (require('./device/simulation/garage-od-switch'))(this, accessory)
+        accessory.control = new (require(instance))(this, accessory)
         /****************************/
-      } else if (this.cusG.has(device.deviceid) && this.cusG.get(device.deviceid).type === 'garage') {
+      } else if (
+        this.simulations[device.deviceid] &&
+        this.simulations[device.deviceid].type === 'garage'
+      ) {
         /****************************************
         GARAGE DOORS [ONE] [ACCESSORY SIMULATION]
         ****************************************/
+        const cache = this.consts.defaultGarageCache
+        const instance = './device/simulation/garage-one'
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
-          : this.addAccessory(device, device.deviceid + 'SWX', false, this.helpers.defaultGarageCache)
-        accessory.control = new (require('./device/simulation/garage-one'))(this, accessory)
+          : this.addAccessory(device, device.deviceid + 'SWX', false, cache)
+        accessory.control = new (require(instance))(this, accessory)
         /***************************************/
-      } else if (this.cusG.has(device.deviceid) && this.cusG.get(device.deviceid).type === 'garage_two') {
+      } else if (
+        this.simulations[device.deviceid] &&
+        this.simulations[device.deviceid].type === 'garage_two'
+      ) {
         /****************************************
         GARAGE DOORS [TWO] [ACCESSORY SIMULATION]
         ****************************************/
+        const cache = this.consts.defaultGarageTwoCache
+        const instance = './device/simulation/garage-two'
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
-          : this.addAccessory(device, device.deviceid + 'SWX', false, this.helpers.defaultGarageTwoCache)
-        accessory.control = new (require('./device/simulation/garage-two'))(this, accessory)
+          : this.addAccessory(device, device.deviceid + 'SWX', false, cache)
+        accessory.control = new (require(instance))(this, accessory)
         /***************************************/
-      } else if (this.cusG.has(device.deviceid) && this.cusG.get(device.deviceid).type === 'garage_four') {
+      } else if (
+        this.simulations[device.deviceid] &&
+        this.simulations[device.deviceid].type === 'garage_four'
+      ) {
         /*****************************************
         GARAGE DOORS [FOUR] [ACCESSORY SIMULATION]
         *****************************************/
+        const cache = this.consts.defaultGarageFourCache
+        const instance = './device/simulation/garage-four'
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
-          : this.addAccessory(device, device.deviceid + 'SWX', false, this.helpers.defaultGarageFourCache)
-        accessory.control = new (require('./device/simulation/garage-four'))(this, accessory)
+          : this.addAccessory(device, device.deviceid + 'SWX', false, cache)
+        accessory.control = new (require(instance))(this, accessory)
         /****************************************/
-      } else if (this.cusG.has(device.deviceid) && this.cusG.get(device.deviceid).type === 'garage_eachen') {
+      } else if (
+        this.simulations[device.deviceid] &&
+        this.simulations[device.deviceid].type === 'garage_eachen'
+      ) {
         /***************************
         GARAGE DOORS [EACHEN GD-DC5]
         ***************************/
+        const instance = './device/simulation/garage-eachen'
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
           : this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require('./device/simulation/garage-eachen'))(this, accessory)
+        accessory.control = new (require(instance))(this, accessory)
         /**************************/
-      } else if (this.cusG.has(device.deviceid) && this.cusG.get(device.deviceid).type === 'lock') {
+      } else if (
+        this.simulations[device.deviceid] &&
+        this.simulations[device.deviceid].type === 'lock'
+      ) {
         /***************************
         LOCKS [ACCESSORY SIMULATION]
         ***************************/
@@ -242,16 +574,23 @@ class eWeLinkPlatform {
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/simulation/lock-one'))(this, accessory)
         /**************************/
-      } else if (this.cusG.has(device.deviceid) && this.cusG.get(device.deviceid).type === 'switch_valve') {
+      } else if (
+        this.simulations[device.deviceid] &&
+        this.simulations[device.deviceid].type === 'switch_valve'
+      ) {
         /**********************************
         SWITCH-VALVE [ACCESSORY SIMULATION]
         **********************************/
+        const instance = './device/simulation/switch-valve'
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
           : this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require('./device/simulation/switch-valve'))(this, accessory)
+        accessory.control = new (require(instance))(this, accessory)
         /*********************************/
-      } else if (this.cusG.has(device.deviceid) && this.cusG.get(device.deviceid).type === 'tap') {
+      } else if (
+        this.simulations[device.deviceid] &&
+        this.simulations[device.deviceid].type === 'tap'
+      ) {
         /********************************
         TAPS [ONE] [ACCESSORY SIMULATION]
         ********************************/
@@ -260,7 +599,10 @@ class eWeLinkPlatform {
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/simulation/tap-one'))(this, accessory)
         /*******************************/
-      } else if (this.cusG.has(device.deviceid) && this.cusG.get(device.deviceid).type === 'tap_two') {
+      } else if (
+        this.simulations[device.deviceid] &&
+        this.simulations[device.deviceid].type === 'tap_two'
+      ) {
         /********************************
         TAPS [TWO] [ACCESSORY SIMULATION]
         ********************************/
@@ -269,34 +611,46 @@ class eWeLinkPlatform {
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/simulation/tap-two'))(this, accessory)
         /*******************************/
-      } else if (this.cusG.has(device.deviceid) && this.cusG.get(device.deviceid).type === 'valve') {
+      } else if (
+        this.simulations[device.deviceid] &&
+        this.simulations[device.deviceid].type === 'valve'
+      ) {
         /**********************************
         VALVES [ONE] [ACCESSORY SIMULATION]
         **********************************/
+        const instance = './device/simulation/valve-one'
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
           : this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require('./device/simulation/valve-one'))(this, accessory)
+        accessory.control = new (require(instance))(this, accessory)
         /*********************************/
-      } else if (this.cusG.has(device.deviceid) && this.cusG.get(device.deviceid).type === 'valve_two') {
+      } else if (
+        this.simulations[device.deviceid] &&
+        this.simulations[device.deviceid].type === 'valve_two'
+      ) {
         /**********************************
         VALVES [TWO] [ACCESSORY SIMULATION]
         **********************************/
+        const instance = './device/simulation/valve-two'
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
           : this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require('./device/simulation/valve-two'))(this, accessory)
+        accessory.control = new (require(instance))(this, accessory)
         /*********************************/
-      } else if (this.cusG.has(device.deviceid) && this.cusG.get(device.deviceid).type === 'valve_four') {
+      } else if (
+        this.simulations[device.deviceid] &&
+        this.simulations[device.deviceid].type === 'valve_four'
+      ) {
         /***********************************
         VALVES [FOUR] [ACCESSORY SIMULATION]
         ***********************************/
+        const instance = './device/simulation/valve-four'
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
           : this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require('./device/simulation/valve-four'))(this, accessory)
+        accessory.control = new (require(instance))(this, accessory)
         /**********************************/
-      } else if (this.helpers.devicesSensor.includes(device.extra.uiid)) {
+      } else if (this.consts.devices.sensor.includes(device.extra.uiid)) {
         /*******************
         SENSORS [SONOFF DW2]
         *******************/
@@ -305,7 +659,7 @@ class eWeLinkPlatform {
           : this.addAccessory(device, device.deviceid + 'SWX', false, { type: 'sensor' })
         accessory.control = new (require('./device/sensor-contact'))(this, accessory)
         /******************/
-      } else if (this.helpers.devicesFan.includes(device.extra.uiid)) {
+      } else if (this.consts.devices.fan.includes(device.extra.uiid)) {
         /***
         FANS
         ***/
@@ -314,7 +668,7 @@ class eWeLinkPlatform {
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/fan'))(this, accessory)
         /**/
-      } else if (this.helpers.devicesDiffuser.includes(device.extra.uiid)) {
+      } else if (this.consts.devices.diffuser.includes(device.extra.uiid)) {
         /********
         DIFFUSERS
         ********/
@@ -324,30 +678,32 @@ class eWeLinkPlatform {
         accessory.control = new (require('./device/diffuser'))(this, accessory)
         /*******/
       } else if (
-        this.cusG.has(device.deviceid) &&
-        this.cusG.get(device.deviceid).type === 'thermostat' &&
-        this.helpers.devicesThermostat.includes(device.extra.uiid)
+        this.simulations[device.deviceid] &&
+        this.simulations[device.deviceid].type === 'thermostat' &&
+        this.consts.devices.thermostat.includes(device.extra.uiid)
       ) {
         /*********************************
         THERMOSTATS [ACCESSORY SIMULATION]
         *********************************/
+        const instance = './device/simulation/thermostat'
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
           : this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require('./device/simulation/thermostat'))(this, accessory)
+        accessory.control = new (require(instance))(this, accessory)
         /********************************/
-      } else if (this.helpers.devicesThermostat.includes(device.extra.uiid)) {
+      } else if (this.consts.devices.thermostat.includes(device.extra.uiid)) {
         /***********************
         SENSOR [AMBIENT-TH10/16]
         ***********************/
+        const cache = { sensorType: device.params.sensorType }
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
-          : this.addAccessory(device, device.deviceid + 'SWX', false, { sensorType: device.params.sensorType })
+          : this.addAccessory(device, device.deviceid + 'SWX', false, cache)
         accessory.control = new (require('./device/sensor-ambient'))(this, accessory)
         /**********************/
       } else if (
-        this.helpers.devicesOutlet.includes(device.extra.uiid) ||
-        (this.helpers.devicesSingleSwitch.includes(device.extra.uiid) && this.helpers.devicesSingleSwitchOutlet.includes(device.productModel))
+        this.consts.devices.outlet.includes(device.extra.uiid) ||
+        (this.consts.devices.singleSwitch.includes(device.extra.uiid) && this.consts.devices.singleSwitchOutlet.includes(device.productModel))
       ) {
         /******
         OUTLETS
@@ -355,11 +711,11 @@ class eWeLinkPlatform {
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
           : this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = (this.config.outletAsSwitch || '').split(',').includes(device.deviceid)
+        accessory.control = this.config.outletAsSwitch.includes(device.deviceid)
           ? new (require('./device/switch-single'))(this, accessory)
           : new (require('./device/outlet'))(this, accessory)
         /*****/
-      } else if (this.helpers.devicesUSB.includes(device.extra.uiid)) {
+      } else if (this.consts.devices.usb.includes(device.extra.uiid)) {
         /**********
         USB OUTLETS
         **********/
@@ -368,7 +724,7 @@ class eWeLinkPlatform {
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/usb'))(this, accessory)
         /*********/
-      } else if (this.helpers.devicesSCM.includes(device.extra.uiid)) {
+      } else if (this.consts.devices.scm.includes(device.extra.uiid)) {
         /*********************************
         SINGLE CHL [MULTIPLE CHL HARDWARE]
         *********************************/
@@ -377,7 +733,7 @@ class eWeLinkPlatform {
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/scm'))(this, accessory)
         /********************************/
-      } else if (this.helpers.devicesCTempable.includes(device.extra.uiid)) {
+      } else if (this.consts.devices.cTempable.includes(device.extra.uiid)) {
         /*******************
         LIGHTS [COLOUR TEMP]
         *******************/
@@ -386,7 +742,7 @@ class eWeLinkPlatform {
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/light-ctemp'))(this, accessory)
         /******************/
-      } else if (this.helpers.devicesColourable.includes(device.extra.uiid)) {
+      } else if (this.consts.devices.colourable.includes(device.extra.uiid)) {
         /******************
         LIGHTS [COLOUR RGB]
         ******************/
@@ -395,7 +751,7 @@ class eWeLinkPlatform {
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/light-colour'))(this, accessory)
         /*****************/
-      } else if (this.helpers.devicesBrightable.includes(device.extra.uiid)) {
+      } else if (this.consts.devices.brightable.includes(device.extra.uiid)) {
         /**************
         LIGHTS [DIMMER]
         **************/
@@ -404,23 +760,23 @@ class eWeLinkPlatform {
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/light-dimmer'))(this, accessory)
         /*************/
-      } else if (this.helpers.devicesSingleSwitch.includes(device.extra.uiid)) {
+      } else if (this.consts.devices.singleSwitch.includes(device.extra.uiid)) {
         /************************
         SWITCHES [SINGLE CHANNEL]
         ************************/
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
           : this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = (this.config.switchAsOutlet || '').split(',').includes(device.deviceid)
+        accessory.control = this.config.switchAsOutlet.includes(device.deviceid)
           ? new (require('./device/outlet'))(this, accessory)
           : new (require('./device/switch-single'))(this, accessory)
         /***********************/
-      } else if (this.helpers.devicesMultiSwitch.includes(device.extra.uiid)) {
+      } else if (this.consts.devices.multiSwitch.includes(device.extra.uiid)) {
         /***********************
         SWITCHES [MULTI CHANNEL]
         ***********************/
-        for (let i = 0; i <= this.helpers.chansFromUiid[device.extra.uiid]; i++) {
-          if ((this.config.hideChanFromHB || '').split(',').includes(device.deviceid + 'SW' + i)) {
+        for (let i = 0; i <= this.consts.chansFromUiid[device.extra.uiid]; i++) {
+          if (this.config.hideChanFromHB.includes(device.deviceid + 'sw' + i)) {
             if (this.devicesInHB.has(device.deviceid + 'SW' + i)) {
               this.removeAccessory(this.devicesInHB.get(device.deviceid + 'SW' + i))
             }
@@ -433,15 +789,21 @@ class eWeLinkPlatform {
               ? this.devicesInHB.get(device.deviceid + 'SW' + i)
               : this.addAccessory(device, device.deviceid + 'SW' + i)
             oAccessory.getService(this.api.hap.Service.AccessoryInformation)
-              .setCharacteristic(this.api.hap.Characteristic.FirmwareRevision, device.params.fwVersion || PLUGIN.version)
+              .setCharacteristic(
+                this.api.hap.Characteristic.FirmwareRevision,
+                device.params.fwVersion || PLUGIN.version
+              )
           }
           oAccessory.context.reachableWAN = device.online
-          oAccessory.context.reachableLAN = this.lanClient && this.lanDevices.has(device.deviceid)
+          oAccessory.context.reachableLAN = this.lanClient &&
+            this.lanDevices.has(device.deviceid)
             ? this.lanDevices.get(device.deviceid).ip
             : false
           oAccessory.context.eweBrandName = device.brandName
           oAccessory.context.eweBrandLogo = device.brandLogo
-          oAccessory.context.eweShared = device.sharedBy && device.sharedBy.email ? device.sharedBy.email : false
+          oAccessory.context.eweShared = device.sharedBy && device.sharedBy.email
+            ? device.sharedBy.email
+            : false
           oAccessory.context.ip = this.lanClient && oAccessory.context.reachableLAN
             ? this.lanDevices.get(device.deviceid).ip
             : false
@@ -453,13 +815,13 @@ class eWeLinkPlatform {
           }
         }
         /**********************/
-      } else if (this.helpers.devicesRFBridge.includes(device.extra.uiid)) {
+      } else if (this.consts.devices.rfBridge.includes(device.extra.uiid)) {
         /*********************
         RF BRIDGE + SUBDEVICES
         *********************/
         let rfChlCounter = 0
         const rfMap = []
-        if (this.helpers.hasProperty(device, 'tags') && this.helpers.hasProperty(device.tags, 'zyx_info')) {
+        if (device.tags && device.tags.zyx_info) {
           device.tags.zyx_info.forEach(remote =>
             rfMap.push({
               name: remote.name,
@@ -478,19 +840,21 @@ class eWeLinkPlatform {
           let subType
           let sensorTimeLength
           let subExtraContext = {}
+          const fullDeviceId = device.deviceid + 'SW' + swNumber
           if (['1', '2', '3', '4'].includes(subDevice.type)) {
             subType = 'button'
           } else if (subDevice.type === '5') {
             subType = 'curtain'
           } else if (subDevice.type === '6') {
-            subType = this.cusS.has(device.deviceid + 'SW' + swNumber)
-              ? this.cusS.get(device.deviceid + 'SW' + swNumber).type
+            subType = this.rfSensors[fullDeviceId]
+              ? this.rfSensors[fullDeviceId].type
               : 'motion'
-            if (this.cusS.has(device.deviceid + 'SW' + swNumber)) {
-              sensorTimeLength = this.cusS.get(device.deviceid + 'SW' + swNumber).sensorTimeLength
+            if (this.rfSensors[fullDeviceId]) {
+              sensorTimeLength = this.rfSensors[fullDeviceId].sensorTimeLength
             }
           } else {
-            this.log.warn('[%s] has an unsupported device type [%s].', device.name, subDevice.type || '?')
+            const type = subDevice.type || '?'
+            this.log.warn('[%s] %s [%s].', device.name, this.messages.unsupDev, type)
             return
           }
           subExtraContext = {
@@ -500,9 +864,9 @@ class eWeLinkPlatform {
             sensorTimeLength,
             name: subDevice.name
           }
-          if ((oAccessory = this.devicesInHB.get(device.deviceid + 'SW' + swNumber))) {
+          if ((oAccessory = this.devicesInHB.get(fullDeviceId))) {
             if (
-              (this.config.resetRFBridge || '').split(',').includes(device.deviceid) ||
+              this.config.resetRFBridge.includes(device.deviceid) ||
               oAccessory.context.subType !== subType ||
               oAccessory.context.sensorTimeLength !== sensorTimeLength ||
               oAccessory.context.swNumber !== swNumber
@@ -510,17 +874,24 @@ class eWeLinkPlatform {
               this.removeAccessory(oAccessory)
             }
           }
-          oAccessory = this.devicesInHB.has(device.deviceid + 'SW' + swNumber)
-            ? this.devicesInHB.get(device.deviceid + 'SW' + swNumber)
-            : this.addAccessory(device, device.deviceid + 'SW' + swNumber, false, subExtraContext, 'rf_sub')
+          oAccessory = this.devicesInHB.has(fullDeviceId)
+            ? this.devicesInHB.get(fullDeviceId)
+            : this.addAccessory(device, fullDeviceId, false, subExtraContext, 'rf_sub')
           oAccessory.getService(this.api.hap.Service.AccessoryInformation)
-            .setCharacteristic(this.api.hap.Characteristic.FirmwareRevision, device.params.fwVersion || PLUGIN.version)
+            .setCharacteristic(
+              this.api.hap.Characteristic.FirmwareRevision,
+              device.params.fwVersion || PLUGIN.version
+            )
           oAccessory.context.reachableWAN = device.online
           oAccessory.context.reachableLAN = false
           oAccessory.context.eweBrandName = device.brandName
           oAccessory.context.eweBrandLogo = device.brandLogo
-          oAccessory.context.eweShared = device.sharedBy && device.sharedBy.email ? device.sharedBy.email : false
-          oAccessory.context.ip = this.lanClient && oAccessory.context.reachableLAN ? this.lanDevices.get(device.deviceid).ip : false
+          oAccessory.context.eweShared = device.sharedBy && device.sharedBy.email
+            ? device.sharedBy.email
+            : false
+          oAccessory.context.ip = this.lanClient && oAccessory.context.reachableLAN
+            ? this.lanDevices.get(device.deviceid).ip
+            : false
           this.api.updatePlatformAccessories(PLUGIN.name, PLUGIN.alias, [oAccessory])
           this.devicesInHB.set(oAccessory.context.hbDeviceId, oAccessory)
           oAccessory.control = new (require('./device/rf-bridge'))(this, oAccessory)
@@ -529,31 +900,33 @@ class eWeLinkPlatform {
         accessory.context.channelCount = rfChlCounter
         this.devicesInHB.set(accessory.context.hbDeviceId, accessory)
         /********************/
-      } else if (this.helpers.devicesZBBridge.includes(device.extra.uiid)) {
+      } else if (this.consts.devices.zbBridge.includes(device.extra.uiid)) {
         /************
         ZIGBEE BRIDGE
         ************/
         return
         /***********/
-      } else if (this.helpers.devicesZBSwitchStateless.includes(device.extra.uiid)) {
+      } else if (this.consts.devices.zbSwitchStateless.includes(device.extra.uiid)) {
         /**********************
         ZIGBEE STATELESS SWITCH
         **********************/
+        const instance = './device/zigbee/switch-stateless'
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
           : this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require('./device/zigbee/switch-stateless'))(this, accessory)
+        accessory.control = new (require(instance))(this, accessory)
         /*********************/
-      } else if (this.helpers.devicesZBSwitchSingle.includes(device.extra.uiid)) {
+      } else if (this.consts.devices.zbSwitchSingle.includes(device.extra.uiid)) {
         /***************
         ZB SINGLE SWITCH
         ***************/
+        const instance = './device/zigbee/switch-single'
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
           : this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require('./device/zigbee/switch-single'))(this, accessory)
+        accessory.control = new (require(instance))(this, accessory)
         /**************/
-      } else if (this.helpers.devicesZBLightDimmer.includes(device.extra.uiid)) {
+      } else if (this.consts.devices.zbLightDimmer.includes(device.extra.uiid)) {
         /*****************
         ZB LIGHTS [DIMMER]
         *****************/
@@ -562,120 +935,130 @@ class eWeLinkPlatform {
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/zigbee/light-dimmer'))(this, accessory)
         /****************/
-      } else if (this.helpers.devicesZBSensorAmbient.includes(device.extra.uiid)) {
+      } else if (this.consts.devices.zbSensorAmbient.includes(device.extra.uiid)) {
         /******************
         ZB SENSOR [AMBIENT]
         ******************/
+        const instance = './device/zigbee/sensor-ambient'
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
           : this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require('./device/zigbee/sensor-ambient'))(this, accessory)
+        accessory.control = new (require(instance))(this, accessory)
         /*****************/
-      } else if (this.helpers.devicesZBSensorMotion.includes(device.extra.uiid)) {
+      } else if (this.consts.devices.zbSensorMotion.includes(device.extra.uiid)) {
         /*****************
         ZB SENSOR [MOTION]
         *****************/
+        const instance = './device/zigbee/sensor-motion'
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
           : this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require('./device/zigbee/sensor-motion'))(this, accessory)
+        accessory.control = new (require(instance))(this, accessory)
         /****************/
-      } else if (this.helpers.devicesZBSensorContact.includes(device.extra.uiid)) {
+      } else if (this.consts.devices.zbSensorContact.includes(device.extra.uiid)) {
         /******************
         ZB SENSOR [CONTACT]
         ******************/
+        const instance = './device/zigbee/sensor-contact'
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
           : this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require('./device/zigbee/sensor-contact'))(this, accessory)
+        accessory.control = new (require(instance))(this, accessory)
         /*****************/
-      } else if (this.helpers.devicesCamera.includes(device.extra.uiid)) {
+      } else if (this.consts.devices.camera.includes(device.extra.uiid)) {
         /*************
         SONOFF CAMERAS
         *************/
-        this.log('[%s] see the homebridge-ewelink wiki for details to enable the camera.', device.name)
+        this.log('[%s] %s.', this.messages.sonoffCamera, device.name)
         return
         /************/
-      } else if (this.helpers.devicesEweCamera.includes(device.extra.uiid)) {
+      } else if (this.consts.devices.eWeCamera.includes(device.extra.uiid)) {
         /******************
         EWELINK APP CAMERAS
         ******************/
-        this.log('[%s] has not been added as it is not supported.', device.name)
+        this.log('[%s] %s.', this.messages.devNotSup, device.name)
         return
         /*****************/
       } else {
         /**************
         UNKNOWN DEVICES
         **************/
-        this.log.warn('[%s] has not been added as it is not supported. Please make a GitHub issue request.', device.name)
+        this.log.warn('[%s] %s.', this.messages.devNotSupYet, device.name)
         return
         /*************/
       }
 
-      // *** Update the current firmware version *** \\
+      // Update the current firmware version
       if (
         !this.hiddenMasters.includes(device.deviceid) &&
-        !this.helpers.hasProperty(this.obstructSwitches, device.deviceid)
+        !this.obstructSwitches[device.deviceid]
       ) {
         accessory.getService(this.api.hap.Service.AccessoryInformation)
-          .setCharacteristic(this.api.hap.Characteristic.FirmwareRevision, device.params.fwVersion || PLUGIN.version)
+          .setCharacteristic(
+            this.api.hap.Characteristic.FirmwareRevision,
+            device.params.fwVersion || PLUGIN.version
+          )
       }
 
-      // *** Update the reachability values (via WS and LAN) *** \\
+      // Update the reachability values (via WS and LAN)
       accessory.context.reachableWAN = device.online
-      accessory.context.reachableLAN = this.lanClient && this.lanDevices.has(device.deviceid)
+      accessory.context.reachableLAN = this.lanClient &&
+        this.lanDevices.has(device.deviceid)
         ? this.lanDevices.get(device.deviceid).ip
         : false
       accessory.context.eweBrandName = device.brandName
       accessory.context.eweBrandLogo = device.brandLogo
-      accessory.context.eweShared = device.sharedBy && device.sharedBy.email ? device.sharedBy.email : false
+      accessory.context.eweShared = device.sharedBy && device.sharedBy.email
+        ? device.sharedBy.email
+        : false
       accessory.context.ip = this.lanClient && accessory.context.reachableLAN
         ? this.lanDevices.get(device.deviceid).ip
         : false
 
-      // *** Helpful logging for each device *** \\
+      // Helpful logging for each device
       const str = accessory.context.reachableLAN
         ? 'found locally with IP [' + this.lanDevices.get(device.deviceid).ip + ']'
-        : this.helpers.devicesLAN.includes(device.extra.uiid)
+        : this.consts.devices.lan.includes(device.extra.uiid)
           ? 'LAN mode unavailable as unreachable'
           : 'LAN mode unavailable as not supported'
 
-      // *** Update accessory characteristics with latest values *** \\
+      // Update accessory characteristics with latest values
       if (this.wsClient) {
         accessory.control.externalUpdate(device.params)
       }
 
-      // *** Update any changes to the device into our devicesInHB map *** \\
+      // Update any changes to the device into our devicesInHB map
       this.api.updatePlatformAccessories(PLUGIN.name, PLUGIN.alias, [accessory])
       this.devicesInHB.set(accessory.context.hbDeviceId, accessory)
       this.log('[%s] initialised and %s.', device.name, str)
     } catch (err) {
-      // *** Catch errors at any point during device initialisation *** \\
-      const errToShow = this.debug
-        ? ':\n' + err
-        : ' ' + err.message + (err.lineNumber ? ' [line ' + err.lineNumber + '].' : '')
-      this.log.warn('[%s] could not be initialised as%s', device.name, errToShow)
+      // Catch any errors during initialisation
+      const eText = this.funcs.parseError(err)
+      this.log.warn('[%s] %s %s.', device.name, this.messages.devNotInit, eText)
     }
   }
 
   addAccessory (device, hbDeviceId, hidden = false, extraContext = {}, type = '') {
+    // Add an accessory to Homebridge
     let newDeviceName
     try {
-      // *** Get the switchNumber which can be {X, 0, 1, 2, 3, 4, ...} *** \\
+      // Get the switchNumber which can be {X, 0, 1, 2, 3, 4, ...}
       const switchNumber = hbDeviceId.split('SW')[1].toString()
       const channelCount = type === 'rf_pri'
         ? Object.keys((device.tags && device.tags.zyx_info) || []).length
-        : this.helpers.chansFromUiid[device.extra.uiid]
+        : this.consts.chansFromUiid[device.extra.uiid]
 
-      // *** Set up the device name which can depend on the accessory type *** \\
-      if (this.nameOverride[hbDeviceId]) {
-        newDeviceName = this.nameOverride[hbDeviceId]
-      } else if (type === 'rf_sub') {
+      // Set up the device name which can depend on the accessory type
+      if (type === 'rf_sub') {
         newDeviceName = extraContext.name
       } else {
         newDeviceName = device.name
         if (['1', '2', '3', '4'].includes(switchNumber)) {
-          if (device.tags && device.tags.ck_channel_name && device.tags.ck_channel_name[parseInt(switchNumber) - 1]) {
+          if (
+            device.tags &&
+            device.tags.ck_channel_name &&
+            device.tags.ck_channel_name[parseInt(switchNumber) - 1]
+          ) {
             newDeviceName = device.tags.ck_channel_name[parseInt(switchNumber) - 1]
           } else {
             newDeviceName += ' SW' + switchNumber
@@ -683,14 +1066,23 @@ class eWeLinkPlatform {
         }
       }
 
-      // *** Add the new accessory to Homebridge *** \\
-      const accessory = new this.api.platformAccessory(newDeviceName, this.api.hap.uuid.generate(hbDeviceId))
+      // Add the new accessory to Homebridge
+      const accessory = new this.api.platformAccessory(
+        newDeviceName,
+        this.api.hap.uuid.generate(hbDeviceId)
+      )
       if (!hidden) {
         accessory.getService(this.api.hap.Service.AccessoryInformation)
           .setCharacteristic(this.api.hap.Characteristic.SerialNumber, hbDeviceId)
           .setCharacteristic(this.api.hap.Characteristic.Manufacturer, device.brandName)
-          .setCharacteristic(this.api.hap.Characteristic.Model, device.productModel + ' (' + device.extra.model + ')')
-          .setCharacteristic(this.api.hap.Characteristic.FirmwareRevision, device.params.fwVersion || PLUGIN.version)
+          .setCharacteristic(
+            this.api.hap.Characteristic.Model,
+            device.productModel + ' (' + device.extra.model + ')'
+          )
+          .setCharacteristic(
+            this.api.hap.Characteristic.FirmwareRevision,
+            device.params.fwVersion || PLUGIN.version
+          )
           .setCharacteristic(this.api.hap.Characteristic.Identify, true)
         accessory.on('identify', (paired, callback) => {
           callback()
@@ -698,7 +1090,7 @@ class eWeLinkPlatform {
         })
       }
 
-      // *** Add helpful context values to the accessory *** \\
+      // Add helpful context values to the accessory
       accessory.context = {
         ...{
           hbDeviceId,
@@ -712,65 +1104,61 @@ class eWeLinkPlatform {
         ...extraContext
       }
 
-      // *** Register the accessory if it hasn't been hidden by the user *** \\
+      // Register the accessory if it hasn't been hidden by the user
       if (!hidden) {
         this.api.registerPlatformAccessories(PLUGIN.name, PLUGIN.alias, [accessory])
         this.log('[%s] has been added to Homebridge.', newDeviceName)
       }
 
-      // *** Return the new accessory *** \\
+      // Return the new accessory
       return accessory
     } catch (err) {
-      // *** Catch any errors whilst trying to add the accessory *** \\
-      const errToShow = this.debug
-        ? ':\n' + err
-        : ' ' + err.message + (err.lineNumber ? ' [line ' + err.lineNumber + '].' : '')
-      this.log.warn('[%s] could not be added to Homebridge as%s', newDeviceName, errToShow)
+      // Catch any errors during add
+      const eText = this.funcs.parseError(err)
+      this.log.warn('[%s] %s %s.', newDeviceName, this.messages.devNotAdd, eText)
       return false
     }
   }
 
   configureAccessory (accessory) {
-    // *** Function is called for each device on HB start *** \\
+    // Function is called to retrieve each accessory from the cache on startup
     try {
       if (!this.log) {
         return
       }
 
-      // *** Add each cached device to our devicesInHB map *** \\
       this.devicesInHB.set(accessory.context.hbDeviceId, accessory)
     } catch (err) {
-      const errToShow = this.debug
-        ? ':\n' + err
-        : ' ' + err.message + (err.lineNumber ? ' [line ' + err.lineNumber + '].' : '')
-      this.log.warn('[%s] could not be configured as%s', accessory.displayName, errToShow)
+      // Catch any errors during retrieve
+      const eText = this.funcs.parseError(err)
+      this.log.warn('[%s] %s %s.', accessory.displayName, this.messages.devNotConf, eText)
     }
   }
 
   removeAccessory (accessory) {
     try {
-      // *** Unregister the accessory from HB and remove it from our devicesInHB map *** \\
+      // Remove an accessory from Homebridge
       this.api.unregisterPlatformAccessories(PLUGIN.name, PLUGIN.alias, [accessory])
       this.devicesInHB.delete(accessory.context.hbDeviceId)
       this.log('[%s] has been removed from Homebridge.', accessory.displayName)
     } catch (err) {
-      const errToShow = this.debug
-        ? ':\n' + err
-        : ' ' + err.message + (err.lineNumber ? ' [line ' + err.lineNumber + '].' : '')
-      this.log.warn('[%s] could not removed from Homebridge as%s', accessory.displayName, errToShow)
+      // Catch any errors during remove
+      const eText = this.funcs.parseError(err)
+      const name = accessory.displayName
+      this.log.warn('[%s] %s %s.', name, this.messages.devNotRemove, eText)
     }
   }
 
   async sendDeviceUpdate (accessory, params) {
-    // *** Add a random delay of [1, 250]ms to avoid multiple http/ws requests a la vez
-    await this.helpers.sleep(Math.floor(Math.random() * 250 + 1))
+    // Add a random delay of [1, 250]ms to avoid multiple http/ws requests a la vez
+    await this.funcs.sleep(Math.floor(Math.random() * 250 + 1))
 
-    // *** Log the update being sent *** \\
-    if (this.debug) {
+    // Log the update being sent
+    if (this.config.debug) {
       this.log('[%s] sending update %s.', accessory.displayName, JSON.stringify(params))
     }
 
-    // *** Set up the payload to send via LAN/WS *** \\
+    // Set up the payload to send via LAN/WS
     const payload = {
       apikey: accessory.context.eweApiKey,
       deviceid: accessory.context.eweDeviceId,
@@ -780,18 +1168,18 @@ class eWeLinkPlatform {
     const errorOne = 'LAN mode is disabled'
     const errorTwo = 'LAN mode is not supported for this device'
 
-    // *** Quick check to see if LAN mode is supported *** \\
+    // Quick check to see if LAN mode is supported
     const res = !this.lanClient
       ? errorOne
-      : !this.helpers.devicesLAN.includes(accessory.context.eweUIID)
+      : !this.consts.devices.lan.includes(accessory.context.eweUIID)
         ? errorTwo
         : await this.lanClient.sendUpdate(payload)
 
-    // *** Revert to WS if LAN mode not possible for whatever reason *** \\
+    // Revert to WS if LAN mode not possible for whatever reason
     if (res !== 'ok') {
-      // *** Check to see if the device is online *** \\
+      // Check to see if the device is online
       if (this.wsClient && accessory.context.reachableWAN) {
-        if (this.debug) {
+        if (this.config.debug) {
           this.log('[%s] Reverting to web socket as %s.', accessory.displayName, res)
         }
         await this.wsClient.sendUpdate(payload)
@@ -810,18 +1198,28 @@ class eWeLinkPlatform {
     let accessory
     let reachableChange = false
 
-    // *** Find our accessory for which the updates relates to *** \\
-    if ((accessory = this.devicesInHB.get(deviceId + 'SWX') || this.devicesInHB.get(deviceId + 'SW0'))) {
-      if (this.debug) {
-        this.log('[%s] receiving update %s.', accessory.displayName, JSON.stringify(device.params))
+    // Find our accessory for which the updates relates to
+    if ((accessory = this.devicesInHB.get(
+      deviceId + 'SWX') || this.devicesInHB.get(deviceId + 'SW0')
+    )) {
+      if (this.config.debug) {
+        this.log(
+          '[%s] receiving update %s.',
+          accessory.displayName,
+          JSON.stringify(device.params)
+        )
       }
       if (device.params.updateSource === 'WS') {
-        // *** The update is from WS so update the WS online/offline status *** \\
+        // The update is from WS so update the WS online/offline status
         if (device.params.online !== accessory.context.reachableWAN) {
           accessory.context.reachableWAN = device.params.online
           this.devicesInHB.set(accessory.context.hbDeviceId, accessory)
           reachableChange = true
-          this.log('[%s] reported [%sline] via WS.', accessory.displayName, accessory.context.reachableWAN ? 'on' : 'off')
+          this.log(
+            '[%s] reported [%sline] via WS.',
+            accessory.displayName,
+            accessory.context.reachableWAN ? 'on' : 'off'
+          )
           if (accessory.context.reachableWAN && this.wsClient) {
             try {
               this.wsClient.requestUpdate(accessory)
@@ -830,7 +1228,7 @@ class eWeLinkPlatform {
         }
       }
       if (device.params.updateSource === 'LAN' && !accessory.context.reachableLAN) {
-        // *** The update is from LAN so it must be online *** \\
+        // The update is from LAN so it must be online
         accessory.context.reachableLAN = true
         this.devicesInHB.set(accessory.context.hbDeviceId, accessory)
         reachableChange = true
@@ -842,9 +1240,9 @@ class eWeLinkPlatform {
         }
       }
 
-      // *** Update this new online/offline status for all switches of multi channel devices (ie not X) *** \\
+      // Update this new online/offline status for all switches of multi channel devices
       if (reachableChange && accessory.context.hbDeviceId.substr(-1) !== 'X') {
-        // *** Loop through to see which channels are in HB *** \\
+        // Loop through to see which channels are in HB
         for (let i = 1; i <= accessory.context.channelCount; i++) {
           if (this.devicesInHB.has(deviceId + 'SW' + i)) {
             const oAccessory = this.devicesInHB.get(deviceId + 'SW' + i)
@@ -857,54 +1255,66 @@ class eWeLinkPlatform {
         }
       }
       try {
-        // *** Update the accessory with the new data *** \\
+        // Update the accessory with the new data
         accessory.control.externalUpdate(device.params)
       } catch (err) {
-        const errToShow = this.debug
+        const errToShow = this.config.debug
           ? ':\n' + err
           : ' ' + err.message + (err.lineNumber ? ' [line ' + err.lineNumber + '].' : '')
-        this.log.warn('[%s] could not be refreshed as%s', accessory.displayName, errToShow)
+        this.log.warn(
+          '[%s] could not be refreshed as%s',
+          accessory.displayName,
+          errToShow
+        )
       }
     } else {
-      // *** The device does not existing in HB so let's try to add it *** \\
+      // The device does not existing in HB so let's try to add it
       try {
-        // *** Check to see it doesn't exist because it's user hidden *** \\
-        if (this.ignoredDevices.includes(deviceId)) {
+        // Check to see it doesn't exist because it's user hidden
+        if (this.config.ignoredDevices.includes(deviceId)) {
           return
         }
 
-        // *** Log the update if debug is set to true *** \\
-        if (this.debug) {
-          this.log('[%s] receiving update for new device %s.', device.name, JSON.stringify(device.params))
+        // Log the update if debug is set to true
+        if (this.config.debug) {
+          this.log(
+            '[%s] receiving update for new device %s.',
+            device.name,
+            JSON.stringify(device.params)
+          )
         }
 
-        // *** Obtain full device information from the HTTP API *** \\
+        // Obtain full device information from the HTTP API
         const newDevice = await this.httpClient.getDevice(deviceId)
 
-        // *** Initialise the device in HB *** \\
+        // Initialise the device in HB
         this.initialiseDevice(newDevice)
 
-        // *** Add the device to the LAN client map *** \\
-        if (this.lanClient && this.helpers.devicesLAN.includes(newDevice.extra.uiid)) {
+        // Add the device to the LAN client map
+        if (this.lanClient && this.consts.devices.lan.includes(newDevice.extra.uiid)) {
           this.lanClient.addDeviceToMap(newDevice)
         }
       } catch (err) {
-        // *** Automatically adding the new device failed for some reason *** \\
-        const errToShow = this.debug
+        // Automatically adding the new device failed for some reason
+        const errToShow = this.config.debug
           ? ':\n' + err
           : ' ' + err.message + (err.lineNumber ? ' [line ' + err.lineNumber + '].' : '')
-        this.log.warn('[%s] restart Homebridge to add new device, failed to add automatically as%s', deviceId, errToShow)
+        this.log.warn(
+          '[%s] restart Homebridge to add new device, failed to add automatically as%s',
+          deviceId,
+          errToShow
+        )
       }
     }
   }
 
   async deviceUpdateError (accessory, err, requestRefresh) {
-    const errToShow = this.debug
+    const errToShow = this.config.debug
       ? ':\n' + err
       : ' ' + err.message + (err.lineNumber ? ' [line ' + err.lineNumber + '].' : '')
     this.log.warn('[%s] device update failed as%s.', accessory.displayName, errToShow)
 
-    // *** We only request a device refresh on failed internal updates (ie with 'set' handlers) *** \\
+    // We only request a device refresh on failed internal updates
     if (requestRefresh && accessory.context.reachableWAN && this.wsClient) {
       try {
         await this.wsClient.requestUpdate(accessory)
diff --git a/lib/utils/helpers.js b/lib/utils/constants.js
similarity index 72%
rename from lib/utils/helpers.js
rename to lib/utils/constants.js
index 6555592f..0a734fd5 100644
--- a/lib/utils/helpers.js
+++ b/lib/utils/constants.js
@@ -1,10 +1,84 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
+
 module.exports = {
-  sleep: ms => new Promise(resolve => setTimeout(resolve, ms)),
-  hasProperty: (obj, prop) => Object.prototype.hasOwnProperty.call(obj, prop),
-  logMessages: [
+  defaultConfig: {
+    name: 'eWeLink',
+    countryCode: '',
+    username: '',
+    password: '',
+    mode: 'auto',
+    disableDeviceLogging: false,
+    debug: false,
+    disablePlugin: false,
+    ignoredDevices: '',
+    hideChanFromHB: '',
+    switchAsOutlet: '',
+    outletAsSwitch: '',
+    inUsePowerThreshold: 0,
+    hideLightFromFan: '',
+    hideSwitchFromTH: '',
+    thTempOffset: [], // TODO
+    resetRFBridge: '',
+    lowBattThreshold: 25,
+    sensorTimeDifference: 120,
+    hideZBLDPress: false,
+    bulbB02BA60: '',
+    bulbB02FST64: '',
+    groups: [], // TODO
+    bridgeSensors: [], // TODO
+    nameOverride: [], // TODO
+    ipOverride: [], // TODO
+    debugFakegato: false,
+    platform: 'eWeLink'
+  },
+
+  defaultValues: {
+    inUsePowerThreshold: 0,
+    lowBattThreshold: 25,
+    sensorTimeLength: 60,
+    sensorTimeDifference: 120,
+    offset: 0,
+    operationTime: 100
+  },
+
+  minValues: {
+    inUsePowerThreshold: 0,
+    lowBattThreshold: 5,
+    sensorTimeLength: 1,
+    sensorTimeDifference: 10,
+    operationTime: 20
+  },
+
+  messages: {
+    cfgDef: 'is not a valid number so using default of',
+    cfgIgn: 'is not configured correctly so ignoring',
+    cfgItem: 'Config entry',
+    cfgLow: 'is set too low so increasing to',
+    cfgRmv: 'is unused and can be removed',
+    cfgQts: 'should not have quotes around its entry',
+    complete: '✓ Setup complete',
+    devNotAdd: 'could not be added to Homebridge as',
+    devNotConf: 'could not be configured as',
+    devNotInit: 'could not be initialised as',
+    devNotRemove: 'could not be removed from Homebridge as',
+    devNotSup: 'has not been added as it is not supported',
+    devNotSupYet: 'has not been added as it is not supported, please make a GitHub issue',
+    disabled: 'To change this, set disablePlugin to false',
+    disabling: 'Disabling plugin',
+    initialised: 'initialised. Syncing with eWeLink',
+    missingCC: 'eWeLink country code missing from configuration',
+    missingCreds: 'eWeLink credentials missing from configuration',
+    missingPW: 'eWeLink password missing from configuration',
+    missingUN: 'eWeLink username missing from configuration',
+    sonoffCamera: 'see the homebridge-ewelink wiki for details to enable the camera',
+    unsupDev: 'has an unsupported device type',
+    wsRef: 'Refreshing WS connection',
+    wsRefFail: 'Refreshing WS connection failed as'
+  },
+
+  welcomeMessages: [
     "Don't forget to ☆ this plugin on GitHub if you're finding it useful!",
     'Have a feature request? Visit http://bit.ly/hb-ewelink-issues to ask!',
     'Interested in sponsoring this plugin? https://github.com/sponsors/bwp91',
@@ -12,47 +86,53 @@ module.exports = {
     'Thanks for using this plugin, I hope you find it helpful!',
     'This plugin has been made with ♥ by bwp91 from the UK!'
   ],
+
   appId: 'oeVkj2lYFGnJu5XUtWisfW4utiN4u9Mq',
+
   appSecret: '6Nz4n0xA8s8qdxQf2GqurZj2Fs55FUvM',
+
   httpRetryCodes: ['ENOTFOUND', 'ETIMEDOUT', 'EAI_AGAIN'],
-  allowedGroups: [
-    'blind', 'garage', 'garage_two', 'garage_four',
-    'garage_eachen', 'lock', 'switch_valve', 'tap',
-    'tap_two', 'thermostat', 'valve', 'valve_two',
-    'valve_four'
-  ],
-  defaults: {
-    inUsePowerThreshold: 0,
-    lowBattThreshold: 25,
-    sensorTimeLength: 60,
-    sensorTimeDifference: 120,
-    operationTime: 100
+
+  allowed: {
+    groups: [
+      'blind', 'garage', 'garage_two', 'garage_four',
+      'garage_eachen', 'lock', 'switch_valve', 'tap',
+      'tap_two', 'thermostat', 'valve', 'valve_two',
+      'valve_four'
+    ],
+    obstructs: ['garage', 'garage_eachen'],
+    setups: ['oneSwitch', 'twoSwitch'],
+    sensors: ['water', 'smoke', 'co', 'co2', 'contact', 'occupancy', 'motion']
+  },
+
+  devices: {
+    lan: [1, 2, 3, 4, 5, 6, 7, 8, 9, 32, 77, 78],
+    singleSwitch: [1, 5, 6, 14, 15, 22, 24, 27, 32, 36, 44, 59, 104],
+    multiSwitch: [2, 3, 4, 7, 8, 9, 29, 30, 31, 34, 41],
+    singleSwitchOutlet: ['Sonoff Pow', 'S20', 'S26', 'S26R1', 'S55', 'S55R1'],
+    brightable: [36, 44],
+    colourable: [22, 59, 104],
+    cTempable: [103],
+    curtain: [11],
+    sensor: [102],
+    thermostat: [15],
+    fan: [34],
+    diffuser: [25],
+    outlet: [32],
+    camera: [87],
+    eWeCamera: [65],
+    usb: [77],
+    scm: [78],
+    rfBridge: [28],
+    zbBridge: [66],
+    zbSwitchStateless: [1000],
+    zbSwitchSingle: [1009, 1256],
+    zbLightDimmer: [1257],
+    zbSensorAmbient: [1770],
+    zbSensorMotion: [2026],
+    zbSensorContact: [3026]
   },
-  devicesLAN: [1, 2, 3, 4, 5, 6, 7, 8, 9, 32, 77, 78],
-  devicesSingleSwitch: [1, 5, 6, 14, 15, 22, 24, 27, 32, 36, 44, 59, 104],
-  devicesMultiSwitch: [2, 3, 4, 7, 8, 9, 29, 30, 31, 34, 41],
-  devicesSingleSwitchOutlet: ['Sonoff Pow', 'S20', 'S26', 'S26R1', 'S55', 'S55R1'],
-  devicesBrightable: [36, 44],
-  devicesColourable: [22, 59, 104],
-  devicesCTempable: [103],
-  devicesCurtain: [11],
-  devicesSensor: [102],
-  devicesThermostat: [15],
-  devicesFan: [34],
-  devicesDiffuser: [25],
-  devicesOutlet: [32],
-  devicesCamera: [87],
-  devicesEweCamera: [65],
-  devicesUSB: [77],
-  devicesSCM: [78],
-  devicesRFBridge: [28],
-  devicesZBBridge: [66],
-  devicesZBSwitchStateless: [1000],
-  devicesZBSwitchSingle: [1009, 1256],
-  devicesZBLightDimmer: [1257],
-  devicesZBSensorAmbient: [1770],
-  devicesZBSensorMotion: [2026],
-  devicesZBSensorContact: [3026],
+
   paramsToKeep: [
     'battery', 'bright', 'brightness',
     'channel', 'cmd', 'color', 'colorB',
@@ -68,6 +148,7 @@ module.exports = {
     'trigTime', 'type', 'voltage', 'white',
     'zyx_mode'
   ],
+
   eveUUID: {
     currentConsumption: 'E863F10D-079E-48FF-8F27-9C2605A29F52',
     totalConsumption: 'E863F10C-079E-48FF-8F27-9C2605A29F52',
@@ -76,6 +157,7 @@ module.exports = {
     resetTotal: 'E863F112-079E-48FF-8F27-9C2605A29F52',
     lastActivation: 'E863F11A-079E-48FF-8F27-9C2605A29F52'
   },
+
   defaultMultiSwitchOff: [
     {
       switch: 'off',
@@ -94,24 +176,29 @@ module.exports = {
       outlet: 3
     }
   ],
+
   defaultCurtainCache: {
     cacheCurrentPosition: 0
   },
+
   defaultBlindCache: {
     cacheCurrentPosition: 0,
     cachePositionState: 2,
     cacheTargetPosition: 0
   },
+
   defaultGarageCache: {
     cacheCurrentDoorState: 1,
     cacheTargetDoorState: 1
   },
+
   defaultGarageTwoCache: {
     cacheOneCurrentDoorState: 1,
     cacheOneTargetDoorState: 1,
     cacheTwoCurrentDoorState: 1,
     cacheTwoTargetDoorState: 1
   },
+
   defaultGarageFourCache: {
     cacheStates: [
       {
@@ -132,6 +219,7 @@ module.exports = {
       }
     ]
   },
+
   chansFromUiid: {
     1: 1, // "SOCKET"                                  \\ 20, MINI, BASIC, S26
     2: 2, // "SOCKET_2"                                \\
diff --git a/lib/utils/functions.js b/lib/utils/functions.js
new file mode 100644
index 00000000..87e5a9e2
--- /dev/null
+++ b/lib/utils/functions.js
@@ -0,0 +1,28 @@
+/* jshint -W014, -W033, esversion: 9 */
+/* eslint-disable new-cap */
+'use strict'
+
+module.exports = {
+  hasProperty: (obj, prop) => {
+    return Object.prototype.hasOwnProperty.call(obj, prop)
+  },
+
+  sleep: ms => {
+    return new Promise(resolve => setTimeout(resolve, ms))
+  },
+
+  parseDeviceId: deviceId => {
+    return deviceId.toLowerCase().replace(/[^a-z0-9]+/g, '')
+  },
+
+  parseError: err => {
+    let toReturn = err.message
+    if (err.stack && err.stack.length > 0) {
+      const stack = err.stack.split('\n')
+      if (stack[1]) {
+        toReturn += stack[1].replace('   ', '')
+      }
+    }
+    return toReturn
+  }
+}

From 897e127055d56fcb08882eb5a8f163fff935f38c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 7 Feb 2021 15:47:06 +0000
Subject: [PATCH 1326/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 66be6e4c..7af2aa94 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,12 +6,17 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 ### Added
 
+* Configuration checks to highlight any unnecessary or incorrectly formatted settings you have
 * Link to 'Configuration' wiki page in the plugin-ui
 * Added a note in the plugin UI when adding an Accessory Simulation that the accessory will need to be removed from the cache
 
 ### Changes
 
 * Fixed an issue with the 'Lock' Accessory Simulation where the status would never update as 'Unlocked'
+* Colour conversation formula changes
+* Error messages refactored to show the most useful information
+* [Backend] Major code refactoring
+* [Backend] Code comments
 * Updated dependencies
 
 ## 4.6.1 (2021-02-02)

From 7d85d586e56231d52b97c41143ed0e753d989a47 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 7 Feb 2021 17:02:32 +0000
Subject: [PATCH 1327/3183] initial refactor two

---
 lib/device/simulation/blind.js       |   6 +
 lib/device/simulation/garage-four.js |  10 +-
 lib/device/simulation/garage-one.js  |   5 +
 lib/device/simulation/garage-two.js  |   7 +
 lib/index.js                         | 209 +++++++++++++++++----------
 lib/utils/constants.js               |  64 +++-----
 6 files changed, 180 insertions(+), 121 deletions(-)

diff --git a/lib/device/simulation/blind.js b/lib/device/simulation/blind.js
index c31747ba..00496daa 100644
--- a/lib/device/simulation/blind.js
+++ b/lib/device/simulation/blind.js
@@ -13,6 +13,12 @@ module.exports = class deviceBlind {
     this.name = accessory.displayName
     this.accessory = accessory
 
+    if (!this.funcs.hasProperty(this.accessory.context, 'cacheCurrentPosition')) {
+      this.accessory.context.cacheCurrentPosition = 0
+      this.accessory.context.cachePositionState = 2
+      this.accessory.context.cacheTargetPosition = 0
+    }
+
     if (!(this.service = this.accessory.getService(this.hapServ.WindowCovering))) {
       this.service = this.accessory.addService(this.hapServ.WindowCovering)
       this.service.setCharacteristic(this.hapChar.CurrentPosition, 0)
diff --git a/lib/device/simulation/garage-four.js b/lib/device/simulation/garage-four.js
index 98e8a8c1..e18d5256 100644
--- a/lib/device/simulation/garage-four.js
+++ b/lib/device/simulation/garage-four.js
@@ -10,10 +10,18 @@ module.exports = class deviceGarageFour {
     this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
-
     this.name = accessory.displayName
     this.accessory = accessory
 
+    if (!this.funcs.hasProperty(this.accessory.context, 'cacheStates')) {
+      this.accessory.context.cacheStates = [
+        { cacheCurrentDoorState: 1, cacheTargetDoorState: 1 },
+        { cacheCurrentDoorState: 1, cacheTargetDoorState: 1 },
+        { cacheCurrentDoorState: 1, cacheTargetDoorState: 1 },
+        { cacheCurrentDoorState: 1, cacheTargetDoorState: 1 }
+      ]
+    }
+
     this.operationTime = parseInt(platform.simulations[this.accessory.context.eweDeviceId].operationTime)
     this.operationTime = isNaN(this.operationTime) || this.operationTime < 20
       ? this.consts.defaults.operationTime
diff --git a/lib/device/simulation/garage-one.js b/lib/device/simulation/garage-one.js
index 68f5432d..28f207f9 100644
--- a/lib/device/simulation/garage-one.js
+++ b/lib/device/simulation/garage-one.js
@@ -13,6 +13,11 @@ module.exports = class deviceGarageOne {
     this.name = accessory.displayName
     this.accessory = accessory
 
+    if (!this.funcs.hasProperty(this.accessory.context, 'cacheCurrentDoorState')) {
+      this.accessory.context.cacheCurrentDoorState = 1
+      this.accessory.context.cacheTargetDoorState = 1
+    }
+
     const asConfig = platform.simulations[this.accessory.context.eweDeviceId]
     if (!['oneSwitch', 'twoSwitch'].includes(asConfig.setup)) {
       this.error = 'setup must be oneSwitch or twoSwitch'
diff --git a/lib/device/simulation/garage-two.js b/lib/device/simulation/garage-two.js
index 6579ebb0..872bd3d3 100644
--- a/lib/device/simulation/garage-two.js
+++ b/lib/device/simulation/garage-two.js
@@ -13,6 +13,13 @@ module.exports = class deviceGarageTwo {
     this.name = accessory.displayName
     this.accessory = accessory
 
+    if (!this.funcs.hasProperty(this.accessory.context, 'cacheCurrentDoorState')) {
+      this.accessory.context.cacheOneCurrentDoorState = 1
+      this.accessory.context.cacheOneTargetDoorState = 1
+      this.accessory.context.cacheTwoCurrentDoorState = 1
+      this.accessory.context.cacheTwoTargetDoorState = 1
+    }
+
     this.operationTime = parseInt(platform.simulations[this.accessory.context.eweDeviceId].operationTime)
     this.operationTime = isNaN(this.operationTime) || this.operationTime < 20
       ? this.consts.defaults.operationTime
diff --git a/lib/index.js b/lib/index.js
index 7d79035a..c041cc6c 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -446,7 +446,9 @@ class eWeLinkPlatform {
       this.log('%s. %s', this.messages.complete, this.consts.welcomeMessages[randIndex])
     } catch (err) {
       // Catch any errors during setup
-      const eText = this.funcs.parseError(err)
+      const eText = err.message === this.messages.disabled
+        ? err.message
+        : this.funcs.parseError(err)
       this.log.warn('***** %s [v%s]. *****', this.messages.disabling, PLUGIN.version)
       this.log.warn('***** %s. *****', eText)
       this.pluginShutdown()
@@ -480,10 +482,9 @@ class eWeLinkPlatform {
         /***********************
         BLINDS [EWELINK UIID 11]
         ***********************/
-        const cache = this.consts.defaultCurtainCache
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
-          : this.addAccessory(device, device.deviceid + 'SWX', false, cache)
+          : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/curtain'))(this, accessory)
         /**********************/
       } else if (
@@ -493,10 +494,9 @@ class eWeLinkPlatform {
         /****************************
         BLINDS [ACCESSORY SIMULATION]
         ****************************/
-        const cache = this.consts.defaultBlindCache
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
-          : this.addAccessory(device, device.deviceid + 'SWX', false, cache)
+          : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/simulation/blind'))(this, accessory)
         /***************************/
       } else if (this.obstructSwitches[device.deviceid]) {
@@ -514,11 +514,10 @@ class eWeLinkPlatform {
         /****************************************
         GARAGE DOORS [ONE] [ACCESSORY SIMULATION]
         ****************************************/
-        const cache = this.consts.defaultGarageCache
         const instance = './device/simulation/garage-one'
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
-          : this.addAccessory(device, device.deviceid + 'SWX', false, cache)
+          : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require(instance))(this, accessory)
         /***************************************/
       } else if (
@@ -528,11 +527,10 @@ class eWeLinkPlatform {
         /****************************************
         GARAGE DOORS [TWO] [ACCESSORY SIMULATION]
         ****************************************/
-        const cache = this.consts.defaultGarageTwoCache
         const instance = './device/simulation/garage-two'
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
-          : this.addAccessory(device, device.deviceid + 'SWX', false, cache)
+          : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require(instance))(this, accessory)
         /***************************************/
       } else if (
@@ -542,11 +540,10 @@ class eWeLinkPlatform {
         /*****************************************
         GARAGE DOORS [FOUR] [ACCESSORY SIMULATION]
         *****************************************/
-        const cache = this.consts.defaultGarageFourCache
         const instance = './device/simulation/garage-four'
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
-          : this.addAccessory(device, device.deviceid + 'SWX', false, cache)
+          : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require(instance))(this, accessory)
         /****************************************/
       } else if (
@@ -695,10 +692,10 @@ class eWeLinkPlatform {
         /***********************
         SENSOR [AMBIENT-TH10/16]
         ***********************/
-        const cache = { sensorType: device.params.sensorType }
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
-          : this.addAccessory(device, device.deviceid + 'SWX', false, cache)
+          : this.addAccessory(device, device.deviceid + 'SWX')
+        accessory.context.sensorType = device.params.sensorType
         accessory.control = new (require('./device/sensor-ambient'))(this, accessory)
         /**********************/
       } else if (
@@ -776,24 +773,35 @@ class eWeLinkPlatform {
         SWITCHES [MULTI CHANNEL]
         ***********************/
         for (let i = 0; i <= this.consts.chansFromUiid[device.extra.uiid]; i++) {
+          // Check if the user has chosen to hide any channels for this device
           if (this.config.hideChanFromHB.includes(device.deviceid + 'sw' + i)) {
+            // The user has hidden this channel so if it exists then remove it
             if (this.devicesInHB.has(device.deviceid + 'SW' + i)) {
               this.removeAccessory(this.devicesInHB.get(device.deviceid + 'SW' + i))
             }
+
+            // If this is the main channel then add it to the array of hidden masters
             if (i === 0) {
               this.hiddenMasters.push(device.deviceid)
             }
+
+            // Add the sub accessory, but hidden, to Homebridge
             oAccessory = this.addAccessory(device, device.deviceid + 'SW' + i, true)
           } else {
+            // The user has not hidden this channel
             oAccessory = this.devicesInHB.has(device.deviceid + 'SW' + i)
               ? this.devicesInHB.get(device.deviceid + 'SW' + i)
               : this.addAccessory(device, device.deviceid + 'SW' + i)
+
+            // Set the firmware version for the sub accessory
             oAccessory.getService(this.api.hap.Service.AccessoryInformation)
               .setCharacteristic(
                 this.api.hap.Characteristic.FirmwareRevision,
                 device.params.fwVersion || PLUGIN.version
               )
           }
+
+          // Add context information to the sub accessory
           oAccessory.context.reachableWAN = device.online
           oAccessory.context.reachableLAN = this.lanClient &&
             this.lanDevices.has(device.deviceid)
@@ -808,6 +816,8 @@ class eWeLinkPlatform {
             ? this.lanDevices.get(device.deviceid).ip
             : false
           oAccessory.control = new (require('./device/switch-multi'))(this, oAccessory)
+
+          // Update any changes to the sub accessory to the platform
           this.api.updatePlatformAccessories(PLUGIN.name, PLUGIN.alias, [oAccessory])
           this.devicesInHB.set(oAccessory.context.hbDeviceId, oAccessory)
           if (i === 0) {
@@ -820,6 +830,8 @@ class eWeLinkPlatform {
         RF BRIDGE + SUBDEVICES
         *********************/
         let rfChlCounter = 0
+
+        // Make an array of sub devices connected to the RF Bridge
         const rfMap = []
         if (device.tags && device.tags.zyx_info) {
           device.tags.zyx_info.forEach(remote =>
@@ -834,13 +846,19 @@ class eWeLinkPlatform {
           ? this.devicesInHB.get(device.deviceid + 'SW0')
           : this.addAccessory(device, device.deviceid + 'SW0', true, { rfMap }, 'rf_pri')
         accessory.control = new (require('./device/rf-bridge'))(this, accessory)
+
+        // We don't want to add the main bridge as an accessory in Homebridge
         this.hiddenMasters.push(device.deviceid)
+
+        // Loop through each sub device connected to the RF Bridge
         rfMap.forEach(subDevice => {
           const swNumber = rfChlCounter + 1
           let subType
           let sensorTimeLength
           let subExtraContext = {}
           const fullDeviceId = device.deviceid + 'SW' + swNumber
+
+          // Check which eWeLink type the connected sub device is
           if (['1', '2', '3', '4'].includes(subDevice.type)) {
             subType = 'button'
           } else if (subDevice.type === '5') {
@@ -857,6 +875,8 @@ class eWeLinkPlatform {
             this.log.warn('[%s] %s [%s].', device.name, this.messages.unsupDev, type)
             return
           }
+
+          // Create an object to save to the sub accessory context
           subExtraContext = {
             buttons: subDevice.buttons,
             subType,
@@ -864,24 +884,34 @@ class eWeLinkPlatform {
             sensorTimeLength,
             name: subDevice.name
           }
+
+          // Check if the sub accessory already exists in Homebridge
           if ((oAccessory = this.devicesInHB.get(fullDeviceId))) {
+            // Check for any changes to user config or types
             if (
               this.config.resetRFBridge.includes(device.deviceid) ||
               oAccessory.context.subType !== subType ||
               oAccessory.context.sensorTimeLength !== sensorTimeLength ||
               oAccessory.context.swNumber !== swNumber
             ) {
+              // Remove the existing sub accessory if any changes are found
               this.removeAccessory(oAccessory)
             }
           }
+
+          // Get the sub accessory if it's new or hasn't been removed above
           oAccessory = this.devicesInHB.has(fullDeviceId)
             ? this.devicesInHB.get(fullDeviceId)
             : this.addAccessory(device, fullDeviceId, false, subExtraContext, 'rf_sub')
+
+          // Set the firmware version for the sub accessory
           oAccessory.getService(this.api.hap.Service.AccessoryInformation)
             .setCharacteristic(
               this.api.hap.Characteristic.FirmwareRevision,
               device.params.fwVersion || PLUGIN.version
             )
+
+          // Add context information to the sub accessory
           oAccessory.context.reachableWAN = device.online
           oAccessory.context.reachableLAN = false
           oAccessory.context.eweBrandName = device.brandName
@@ -892,11 +922,15 @@ class eWeLinkPlatform {
           oAccessory.context.ip = this.lanClient && oAccessory.context.reachableLAN
             ? this.lanDevices.get(device.deviceid).ip
             : false
+
+          // Update any changes to the sub accessory to the platform
           this.api.updatePlatformAccessories(PLUGIN.name, PLUGIN.alias, [oAccessory])
           this.devicesInHB.set(oAccessory.context.hbDeviceId, oAccessory)
           oAccessory.control = new (require('./device/rf-bridge'))(this, oAccessory)
           rfChlCounter += Object.keys(subDevice.buttons || {}).length
         })
+
+        // Update any changes to the accessory to the platform
         accessory.context.channelCount = rfChlCounter
         this.devicesInHB.set(accessory.context.hbDeviceId, accessory)
         /********************/
@@ -988,7 +1022,7 @@ class eWeLinkPlatform {
         /*************/
       }
 
-      // Update the current firmware version
+      // Update the current firmware version if the accessory isn't hidden
       if (
         !this.hiddenMasters.includes(device.deviceid) &&
         !this.obstructSwitches[device.deviceid]
@@ -1017,10 +1051,10 @@ class eWeLinkPlatform {
 
       // Helpful logging for each device
       const str = accessory.context.reachableLAN
-        ? 'found locally with IP [' + this.lanDevices.get(device.deviceid).ip + ']'
+        ? this.messages.foundWithIp + ' [' + this.lanDevices.get(device.deviceid).ip + ']'
         : this.consts.devices.lan.includes(device.extra.uiid)
-          ? 'LAN mode unavailable as unreachable'
-          : 'LAN mode unavailable as not supported'
+          ? this.messages.lanUnreachable
+          : this.messages.lanUnsupported
 
       // Update accessory characteristics with latest values
       if (this.wsClient) {
@@ -1030,7 +1064,7 @@ class eWeLinkPlatform {
       // Update any changes to the device into our devicesInHB map
       this.api.updatePlatformAccessories(PLUGIN.name, PLUGIN.alias, [accessory])
       this.devicesInHB.set(accessory.context.hbDeviceId, accessory)
-      this.log('[%s] initialised and %s.', device.name, str)
+      this.log('[%s] %s %s.', device.name, this.messages.devInit, str)
     } catch (err) {
       // Catch any errors during initialisation
       const eText = this.funcs.parseError(err)
@@ -1050,17 +1084,24 @@ class eWeLinkPlatform {
 
       // Set up the device name which can depend on the accessory type
       if (type === 'rf_sub') {
+        // RF accessories have their name stored in the context
         newDeviceName = extraContext.name
       } else {
+        // Other accessories store the name initially as the device name
         newDeviceName = device.name
+
+        // Check if it's a channel of a multi-channel device
         if (['1', '2', '3', '4'].includes(switchNumber)) {
+          // Try and obtain the eWeLink channel name
           if (
             device.tags &&
             device.tags.ck_channel_name &&
             device.tags.ck_channel_name[parseInt(switchNumber) - 1]
           ) {
+            // Found the eWeLink channel name
             newDeviceName = device.tags.ck_channel_name[parseInt(switchNumber) - 1]
           } else {
+            // Didn't find the eWeLink channel name use generic SW channel
             newDeviceName += ' SW' + switchNumber
           }
         }
@@ -1071,6 +1112,8 @@ class eWeLinkPlatform {
         newDeviceName,
         this.api.hap.uuid.generate(hbDeviceId)
       )
+
+      // If it isn't a hidden device then set the accessory characteristics
       if (!hidden) {
         accessory.getService(this.api.hap.Service.AccessoryInformation)
           .setCharacteristic(this.api.hap.Characteristic.SerialNumber, hbDeviceId)
@@ -1084,9 +1127,11 @@ class eWeLinkPlatform {
             device.params.fwVersion || PLUGIN.version
           )
           .setCharacteristic(this.api.hap.Characteristic.Identify, true)
+
+        // A function for when the identify button is pressed in HomeKit apps
         accessory.on('identify', (paired, callback) => {
           callback()
-          this.log('[%s] identify button pressed.', accessory.displayName)
+          this.log('[%s] %s.', accessory.displayName, this.messages.identify)
         })
       }
 
@@ -1107,7 +1152,7 @@ class eWeLinkPlatform {
       // Register the accessory if it hasn't been hidden by the user
       if (!hidden) {
         this.api.registerPlatformAccessories(PLUGIN.name, PLUGIN.alias, [accessory])
-        this.log('[%s] has been added to Homebridge.', newDeviceName)
+        this.log('[%s] %s.', newDeviceName, this.messages.devAdd)
       }
 
       // Return the new accessory
@@ -1140,7 +1185,7 @@ class eWeLinkPlatform {
       // Remove an accessory from Homebridge
       this.api.unregisterPlatformAccessories(PLUGIN.name, PLUGIN.alias, [accessory])
       this.devicesInHB.delete(accessory.context.hbDeviceId)
-      this.log('[%s] has been removed from Homebridge.', accessory.displayName)
+      this.log('[%s] %s.', accessory.displayName, this.messages.devRemove)
     } catch (err) {
       // Catch any errors during remove
       const eText = this.funcs.parseError(err)
@@ -1150,12 +1195,13 @@ class eWeLinkPlatform {
   }
 
   async sendDeviceUpdate (accessory, params) {
-    // Add a random delay of [1, 250]ms to avoid multiple http/ws requests a la vez
+    // Add a random delay of [1, 250]ms to avoid multiple http/ws requests at once
     await this.funcs.sleep(Math.floor(Math.random() * 250 + 1))
 
     // Log the update being sent
     if (this.config.debug) {
-      this.log('[%s] sending update %s.', accessory.displayName, JSON.stringify(params))
+      const str = JSON.stringify(params)
+      this.log('[%s] %s %s.', accessory.displayName, this.messages.updSend, str)
     }
 
     // Set up the payload to send via LAN/WS
@@ -1165,30 +1211,31 @@ class eWeLinkPlatform {
       params
     }
 
-    const errorOne = 'LAN mode is disabled'
-    const errorTwo = 'LAN mode is not supported for this device'
-
     // Quick check to see if LAN mode is supported
     const res = !this.lanClient
-      ? errorOne
+      ? this.messages.lanDisabled
       : !this.consts.devices.lan.includes(accessory.context.eweUIID)
-        ? errorTwo
+        ? this.messages.lanNotSup
         : await this.lanClient.sendUpdate(payload)
 
     // Revert to WS if LAN mode not possible for whatever reason
     if (res !== 'ok') {
       // Check to see if the device is online
       if (this.wsClient && accessory.context.reachableWAN) {
+        // Log the revert if appropriate
         if (this.config.debug) {
-          this.log('[%s] Reverting to web socket as %s.', accessory.displayName, res)
+          this.log('[%s] %s %s.', accessory.displayName, this.messages.revertWS, res)
         }
+
+        // Device is online via WS so sent the update
         await this.wsClient.sendUpdate(payload)
       } else {
-        throw new Error(
-          [errorOne, errorTwo].includes(res)
-            ? 'it is unreachable'
-            : 'it is unreachable [' + res + ']'
-        )
+        // Device isn't online via WS so report the error back
+        let eText = this.messages.unreachable
+        if ([this.messages.lanDisabled, this.messages.lanNotSup].includes(res)) {
+          eText += ' [' + res + ']'
+        }
+        throw new Error(eText)
       }
     }
   }
@@ -1199,31 +1246,36 @@ class eWeLinkPlatform {
     let reachableChange = false
 
     // Find our accessory for which the updates relates to
-    if ((accessory = this.devicesInHB.get(
-      deviceId + 'SWX') || this.devicesInHB.get(deviceId + 'SW0')
-    )) {
+    if ((
+      accessory = this.devicesInHB.get(deviceId + 'SWX') ||
+        this.devicesInHB.get(deviceId + 'SW0'))
+    ) {
       if (this.config.debug) {
-        this.log(
-          '[%s] receiving update %s.',
-          accessory.displayName,
-          JSON.stringify(device.params)
-        )
+        const str = JSON.stringify(device.params)
+        this.log('[%s] %s %s.', accessory.displayName, this.messages.updRec, str)
       }
       if (device.params.updateSource === 'WS') {
         // The update is from WS so update the WS online/offline status
         if (device.params.online !== accessory.context.reachableWAN) {
           accessory.context.reachableWAN = device.params.online
           this.devicesInHB.set(accessory.context.hbDeviceId, accessory)
+
+          // Flag this true to update the sub accessories later
           reachableChange = true
-          this.log(
-            '[%s] reported [%sline] via WS.',
-            accessory.displayName,
-            accessory.context.reachableWAN ? 'on' : 'off'
-          )
+
+          // Log the new reachability of the device
+          const status = accessory.context.reachableWAN
+            ? this.messages.repOnline
+            : this.messages.repOffline
+          this.log('[%s] %s %s.', accessory.displayName, status, this.messages.viaWS)
+
+          // Try and request an update through WS if the device has come back online
           if (accessory.context.reachableWAN && this.wsClient) {
             try {
               this.wsClient.requestUpdate(accessory)
-            } catch (err) {}
+            } catch (err) {
+              // Suppress any errors here
+            }
           }
         }
       }
@@ -1231,12 +1283,21 @@ class eWeLinkPlatform {
         // The update is from LAN so it must be online
         accessory.context.reachableLAN = true
         this.devicesInHB.set(accessory.context.hbDeviceId, accessory)
+
+        // Flag this true to update the sub accessories later
         reachableChange = true
-        this.log('[%s] has been reported [online] via LAN.', accessory.displayName)
+
+        // Log the new reachability of the device
+        const name = accessory.displayName
+        this.log('[%s] %s %s.', name, this.messages.repOnline, this.messages.viaLAN)
+
+        // Try and request an update through WS if the device has come back online
         if (accessory.context.reachableWAN && this.wsClient) {
           try {
             this.wsClient.requestUpdate(accessory)
-          } catch (err) {}
+          } catch (err) {
+            // Suppress any errors here
+          }
         }
       }
 
@@ -1245,11 +1306,18 @@ class eWeLinkPlatform {
         // Loop through to see which channels are in HB
         for (let i = 1; i <= accessory.context.channelCount; i++) {
           if (this.devicesInHB.has(deviceId + 'SW' + i)) {
+            // Find the sub accessory
             const oAccessory = this.devicesInHB.get(deviceId + 'SW' + i)
+
+            // Update the WAN status
             oAccessory.context.reachableWAN = device.params.online
+
+            // Update the LAN status
             if (device.params.updateSource === 'LAN') {
               oAccessory.context.reachableLAN = true
             }
+
+            // Save the sub accessory updates to the platform
             this.devicesInHB.set(oAccessory.context.hbDeviceId, oAccessory)
           }
         }
@@ -1258,30 +1326,21 @@ class eWeLinkPlatform {
         // Update the accessory with the new data
         accessory.control.externalUpdate(device.params)
       } catch (err) {
-        const errToShow = this.config.debug
-          ? ':\n' + err
-          : ' ' + err.message + (err.lineNumber ? ' [line ' + err.lineNumber + '].' : '')
-        this.log.warn(
-          '[%s] could not be refreshed as%s',
-          accessory.displayName,
-          errToShow
-        )
+        const eText = this.funcs.parseError(err)
+        this.log.warn('[%s] %s %s.', accessory.displayName, this.messages.devNotRf, eText)
       }
     } else {
       // The device does not existing in HB so let's try to add it
       try {
-        // Check to see it doesn't exist because it's user hidden
+        // Don't continue if the user has hidden this device
         if (this.config.ignoredDevices.includes(deviceId)) {
           return
         }
 
         // Log the update if debug is set to true
         if (this.config.debug) {
-          this.log(
-            '[%s] receiving update for new device %s.',
-            device.name,
-            JSON.stringify(device.params)
-          )
+          const str = JSON.stringify(device.params)
+          this.log('[%s] %s %s.', device.name, this.messages.recNew, str)
         }
 
         // Obtain full device information from the HTTP API
@@ -1296,31 +1355,27 @@ class eWeLinkPlatform {
         }
       } catch (err) {
         // Automatically adding the new device failed for some reason
-        const errToShow = this.config.debug
-          ? ':\n' + err
-          : ' ' + err.message + (err.lineNumber ? ' [line ' + err.lineNumber + '].' : '')
-        this.log.warn(
-          '[%s] restart Homebridge to add new device, failed to add automatically as%s',
-          deviceId,
-          errToShow
-        )
+        const eText = this.funcs.parseError(err)
+        this.log.warn('[%s] %s %s.', deviceId, this.messages.devNewNotAdd, eText)
       }
     }
   }
 
   async deviceUpdateError (accessory, err, requestRefresh) {
-    const errToShow = this.config.debug
-      ? ':\n' + err
-      : ' ' + err.message + (err.lineNumber ? ' [line ' + err.lineNumber + '].' : '')
-    this.log.warn('[%s] device update failed as%s.', accessory.displayName, errToShow)
+    // Log the error
+    const eText = this.funcs.parseError(err)
+    this.log.warn('[%s] %s %s.', accessory.displayName, this.messages.devNotUpd, eText)
 
     // We only request a device refresh on failed internal updates
     if (requestRefresh && accessory.context.reachableWAN && this.wsClient) {
       try {
         await this.wsClient.requestUpdate(accessory)
-      } catch (err) {}
+      } catch (err) {
+        // Suppress any errors at this point
+      }
     }
   }
 }
 
+// Export the plugin to Homebridge
 module.exports = hb => hb.registerPlatform(PLUGIN.alias, eWeLinkPlatform)
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 0a734fd5..6e350a1b 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -59,21 +59,42 @@ module.exports = {
     cfgRmv: 'is unused and can be removed',
     cfgQts: 'should not have quotes around its entry',
     complete: '✓ Setup complete',
+    devAdd: 'has been added to Homebridge',
+    devInit: 'initialised and',
+    devNewNotAdd: 'restart Homebridge to add new device, failed to add automatically as',
     devNotAdd: 'could not be added to Homebridge as',
     devNotConf: 'could not be configured as',
     devNotInit: 'could not be initialised as',
+    devNotRf: 'could not be refreshed as',
     devNotRemove: 'could not be removed from Homebridge as',
     devNotSup: 'has not been added as it is not supported',
     devNotSupYet: 'has not been added as it is not supported, please make a GitHub issue',
+    devNotUpd: 'device update failed as',
+    devRemove: 'has been removed from Homebridge',
     disabled: 'To change this, set disablePlugin to false',
     disabling: 'Disabling plugin',
+    foundWithIP: 'found locally with IP',
+    identify: 'identify button pressed',
     initialised: 'initialised. Syncing with eWeLink',
+    lanDisabled: 'LAN mode is disabled',
+    lanNotSup: 'LAN mode is not supported for this device',
+    lanUnreachable: 'LAN mode unavailable as unreachable',
+    lanUnsupported: 'LAN mode unavailable as not supported',
     missingCC: 'eWeLink country code missing from configuration',
     missingCreds: 'eWeLink credentials missing from configuration',
     missingPW: 'eWeLink password missing from configuration',
     missingUN: 'eWeLink username missing from configuration',
+    recNew: 'receiving update for new device',
+    repOffline: 'reported [offline]',
+    repOnline: 'reported [online]',
+    revertWS: 'reverting to web socket as',
     sonoffCamera: 'see the homebridge-ewelink wiki for details to enable the camera',
+    unreachable: 'it is unreachable',
     unsupDev: 'has an unsupported device type',
+    updRec: 'receiving update',
+    updSend: 'sending update',
+    viaLAN: 'via LAN',
+    viaWS: 'via WS',
     wsRef: 'Refreshing WS connection',
     wsRefFail: 'Refreshing WS connection failed as'
   },
@@ -177,49 +198,6 @@ module.exports = {
     }
   ],
 
-  defaultCurtainCache: {
-    cacheCurrentPosition: 0
-  },
-
-  defaultBlindCache: {
-    cacheCurrentPosition: 0,
-    cachePositionState: 2,
-    cacheTargetPosition: 0
-  },
-
-  defaultGarageCache: {
-    cacheCurrentDoorState: 1,
-    cacheTargetDoorState: 1
-  },
-
-  defaultGarageTwoCache: {
-    cacheOneCurrentDoorState: 1,
-    cacheOneTargetDoorState: 1,
-    cacheTwoCurrentDoorState: 1,
-    cacheTwoTargetDoorState: 1
-  },
-
-  defaultGarageFourCache: {
-    cacheStates: [
-      {
-        cacheCurrentDoorState: 1,
-        cacheTargetDoorState: 1
-      },
-      {
-        cacheCurrentDoorState: 1,
-        cacheTargetDoorState: 1
-      },
-      {
-        cacheCurrentDoorState: 1,
-        cacheTargetDoorState: 1
-      },
-      {
-        cacheCurrentDoorState: 1,
-        cacheTargetDoorState: 1
-      }
-    ]
-  },
-
   chansFromUiid: {
     1: 1, // "SOCKET"                                  \\ 20, MINI, BASIC, S26
     2: 2, // "SOCKET_2"                                \\

From 4c875efefd917b19f009d3c76de2f541a0cf72a8 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 7 Feb 2021 18:23:36 +0000
Subject: [PATCH 1328/3183] initial refactor three

---
 lib/connection/http.js | 113 ++++++++++++--------
 lib/connection/lan.js  |  66 ++++++++----
 lib/connection/ws.js   | 237 +++++++++++++++++++++++++++++++----------
 lib/index.js           |   5 +-
 lib/utils/constants.js |  33 +++++-
 5 files changed, 329 insertions(+), 125 deletions(-)

diff --git a/lib/connection/http.js b/lib/connection/http.js
index 538b9c51..15f60f4e 100644
--- a/lib/connection/http.js
+++ b/lib/connection/http.js
@@ -4,18 +4,21 @@
 
 module.exports = class connectionHTTP {
   constructor (platform) {
-    // Set up our variables
+    // Set up variables from the platform
     this.consts = platform.consts
     this.funcs = platform.funcs
     this.log = platform.log
     this.messages = platform.messages
-    this.debug = platform.config.debug
-    this.username = platform.config.username
-    this.password = platform.config.password
-    this.ignoredDevices = platform.config.ignoredDevices
     this.obstructSwitches = platform.obstructSwitches
+
+    // Set up config variables from the platform
     this.cCode = platform.config.countryCode
+    this.debug = platform.config.debug
+    this.ignoredDevices = platform.config.ignoredDevices
+    this.password = platform.config.password
+    this.username = platform.config.username
 
+    // Set up libraries from the platform
     this.axios = platform.axios
     this.crypto = platform.crypto
   }
@@ -41,30 +44,30 @@ module.exports = class connectionHTTP {
       })
       dataToSign.sort((a, b) => (a.key < b.key ? -1 : 1))
       dataToSign = dataToSign.map(k => k.key + '=' + k.value).join('&')
-      dataToSign = this.crypto.createHmac('sha256', this.consts.appSecret).update(dataToSign).digest('base64')
+      dataToSign = this.crypto.createHmac('sha256', this.consts.appSecret)
+        .update(dataToSign).digest('base64')
 
       // Log the data depending on the debug setting
       if (this.debug) {
-        this.log('Sending HTTP getHost() request.')
+        this.log('%s.', this.messages.sendGetHost)
       }
 
       // Send the request
-      const res = await this.axios.get(
-        'https://api.coolkit.cc:8080/api/user/region',
-        {
-          headers: {
-            Authorization: 'Sign ' + dataToSign,
-            'Content-Type': 'application/json'
-          },
-          params
-        }
-      )
+      const res = await this.axios.get('https://api.coolkit.cc:8080/api/user/region', {
+        headers: {
+          Authorization: 'Sign ' + dataToSign,
+          'Content-Type': 'application/json'
+        },
+        params
+      })
 
       // Parse the response
       const body = res.data
       if (!body.region) {
-        throw new Error('Server did not respond with a region.\n' + JSON.stringify(body, null, 2))
+        throw new Error(this.messages.noRegion + '.\n' + JSON.stringify(body, null, 2))
       }
+
+      // Check we have received a valid region
       switch (body.region) {
         case 'eu':
         case 'us':
@@ -75,18 +78,23 @@ module.exports = class connectionHTTP {
           this.httpHost = 'cn-apia.coolkit.cn'
           break
         default:
-          throw new Error('No valid region received - [' + body.region + '].')
+          // No valid region received
+          throw new Error(this.messages.noRegionRec + ' - [' + body.region + '].')
       }
+
+      // Log no valid region received
       if (this.debug) {
-        this.log('HTTP API host received [%s].', this.httpHost)
+        this.log('%s [%s].', this.messages.hostReceived, this.httpHost)
       }
     } catch (err) {
-      if (this.funcs.hasProperty(err, 'code') && this.consts.httpRetryCodes.includes(err.code)) {
+      // Check to see if it's a eWeLink server problem and we can retry
+      if (err.code && this.consts.httpRetryCodes.includes(err.code)) {
         // Retry if another attempt could be successful
-        this.log.warn('Unable to reach eWeLink. Retrying in 30 seconds.')
+        this.log.warn('%s.', this.messages.httpRetry)
         await this.funcs.sleep(30000)
         return await this.getHost()
       } else {
+        // It's not a eWeLink problem so report the error back
         throw err
       }
     }
@@ -97,10 +105,14 @@ module.exports = class connectionHTTP {
     if (this.httpHost === undefined) {
       this.httpHost = 'eu-apia.coolkit.cc'
     }
+
+    // Set up the data to send object
     const data = {
       countryCode: this.cCode,
       password: this.password
     }
+
+    // See if the user has provided an email or phone as username
     if (this.username.includes('@')) {
       data.email = this.username
     } else {
@@ -109,11 +121,12 @@ module.exports = class connectionHTTP {
 
     // Log the data depending on the debug setting
     if (this.debug) {
-      this.log('Sending HTTP login() request.')
+      this.log('%s.', this.messages.sendLogin)
     }
 
     // Set up the request signature
-    const dataToSign = this.crypto.createHmac('sha256', this.consts.appSecret).update(JSON.stringify(data)).digest('base64')
+    const dataToSign = this.crypto.createHmac('sha256', this.consts.appSecret)
+      .update(JSON.stringify(data)).digest('base64')
 
     // Send the request
     const res = await this.axios.post(
@@ -133,6 +146,8 @@ module.exports = class connectionHTTP {
     if (body.error === 10004 && body.data && body.data.region) {
       // In this case the user has been given a different region so retry login
       const givenRegion = body.data.region
+
+      // Check the new received region is valid
       switch (givenRegion) {
         case 'eu':
         case 'us':
@@ -143,10 +158,10 @@ module.exports = class connectionHTTP {
           this.httpHost = 'cn-apia.coolkit.cn'
           break
         default:
-          throw new Error('No valid region received - [' + givenRegion + '].')
+          throw new Error(this.messages.noRegionRec + ' - [' + givenRegion + '].')
       }
       if (this.debug) {
-        this.log('New HTTP API host received [%s].', this.httpHost)
+        this.log('%s [%s].', this.messages.newRegionRec, this.httpHost)
       }
       return await this.login()
     } else {
@@ -162,11 +177,11 @@ module.exports = class connectionHTTP {
       } else {
         if (body.error === 500) {
           // Retry if another attempt could be successful
-          this.log.warn('An eWeLink error [500] occured. Retrying in 30 seconds.')
+          this.log.warn('%s.', this.messages.eweError)
           await this.funcs.sleep(30000)
           return await this.login()
         } else {
-          throw new Error('No auth token received.\n' + JSON.stringify(body, null, 2))
+          throw new Error(this.messages.noAuthRec + '.\n' + JSON.stringify(body, null, 2))
         }
       }
     }
@@ -176,20 +191,17 @@ module.exports = class connectionHTTP {
     // Used to get a user's device list
     try {
       // Send the request
-      const res = await this.axios.get(
-        'https://' + this.httpHost + '/v2/device/thing',
-        {
-          headers: {
-            Authorization: 'Bearer ' + this.aToken,
-            'Content-Type': 'application/json',
-            'X-CK-Appid': this.consts.appId,
-            'X-CK-Nonce': Math.random().toString(36).substr(2, 8)
-          },
-          params: {
-            num: 0
-          }
+      const res = await this.axios.get('https://' + this.httpHost + '/v2/device/thing', {
+        headers: {
+          Authorization: 'Bearer ' + this.aToken,
+          'Content-Type': 'application/json',
+          'X-CK-Appid': this.consts.appId,
+          'X-CK-Nonce': Math.random().toString(36).substr(2, 8)
+        },
+        params: {
+          num: 0
         }
-      )
+      })
 
       // Parse the response
       const body = res.data
@@ -203,9 +215,15 @@ module.exports = class connectionHTTP {
       if (body.data.thingList && body.data.thingList.length > 0) {
         body.data.thingList.forEach(d => {
           // Check each item is a device and also remove any devices the user has ignored
-          if (d.itemData && d.itemData.extra && d.itemData.extra.uiid && !this.ignoredDevices.includes(d.itemData.deviceid)) {
+          if (
+            d.itemData &&
+            d.itemData.extra &&
+            d.itemData.extra.uiid &&
+            !this.ignoredDevices.includes(d.itemData.deviceid)
+          ) {
             // Separate the sensors as these need to be set up last
-            if (d.itemData.extra.uiid === 102 || this.obstructSwitches[d.itemData.deviceid]) {
+            const isObstructSwitch = this.obstructSwitches[d.itemData.deviceid]
+            if (d.itemData.extra.uiid === 102 || isObstructSwitch) {
               sensorList.push(d.itemData)
             } else {
               deviceList.push(d.itemData)
@@ -217,12 +235,14 @@ module.exports = class connectionHTTP {
       // Sensors need to go last as they update garages that need to exist already
       return deviceList.concat(sensorList)
     } catch (err) {
+      // Check to see if it's a eWeLink server problem and we can retry
       if (err.code && this.consts.httpRetryCodes.includes(err.code)) {
         // Retry if another attempt could be successful
-        this.log.warn('Unable to reach eWeLink. Retrying in 30 seconds.')
+        this.log.warn('%s.', this.messages.httpRetry)
         await this.funcs.sleep(30000)
         return await this.getDevices()
       } else {
+        // It's not a eWeLink problem so report the error back
         throw err
       }
     }
@@ -259,15 +279,16 @@ module.exports = class connectionHTTP {
         // Return the device data
         return body.data.thingList[0].itemData
       } else {
-        throw new Error('device not found in eWeLink')
+        throw new Error(this.messages.devNotFound)
       }
     } catch (err) {
       if (err.code && this.consts.httpRetryCodes.includes(err.code)) {
         // Retry if another attempt could be successful
-        this.log.warn('Unable to reach eWeLink. Retrying in 30 seconds.')
+        this.log.warn('%s.', this.messages.httpRetry)
         await this.funcs.sleep(30000)
         return await this.getDevice(deviceId)
       } else {
+        // It's not a eWeLink problem so report the error back
         throw err
       }
     }
diff --git a/lib/connection/lan.js b/lib/connection/lan.js
index c3f4961a..97fd426c 100644
--- a/lib/connection/lan.js
+++ b/lib/connection/lan.js
@@ -1,29 +1,36 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
+
 module.exports = class connectionLAN {
   constructor (platform, devices) {
-    // Set up our variables
+    // Set up variables from the platform
     this.consts = platform.consts
     this.funcs = platform.funcs
     this.log = platform.log
     this.messages = platform.messages
+
+    // Set up config variables from the platform
     this.mode = platform.config.mode
     this.ipOverride = platform.ipOverride
 
-    this.deviceMap = new Map()
-
+    // Set up libraries from the platform
     this.axios = platform.axios
     this.crypto = platform.crypto
     this.emitter = platform.emitter
 
+    // Set up other variables and libraries needed by this class
+    this.deviceMap = new Map()
     this.dns = require('node-dns-sd')
 
     // Create a template map with our device list from the HTTP client
     devices.forEach(device => {
+      // Don't continue if the device doesn't support LAN mode
       if (!this.consts.devices.lan.includes(device.extra.uiid)) {
         return
       }
+
+      // Add this device into the map with it's key and user configured IP
       this.deviceMap.set(device.deviceid, {
         apiKey: device.devicekey,
         ip: this.ipOverride[device.deviceid]
@@ -40,7 +47,8 @@ module.exports = class connectionLAN {
     // Update the device map for each device found on the local network
     res.forEach(device => {
       // Obtain the ewelink deviceId and check to see it is in our map
-      const deviceId = device.fqdn.replace('._ewelink._tcp.local', '').replace('eWeLink_', '')
+      const deviceId = device.fqdn.replace('._ewelink._tcp.local', '')
+        .replace('eWeLink_', '')
       let d
       if ((d = this.deviceMap.get(deviceId)) && !d.ip) {
         // Update the map with the found IP address
@@ -75,10 +83,19 @@ module.exports = class connectionLAN {
               return
             }
             deviceInfo.lastIV = rdata.iv
-            const data = rdata.data1 + (rdata.data2 || '') + (rdata.data3 || '') + (rdata.data4 || '')
-            const key = this.crypto.createHash('md5').update(Buffer.from(deviceInfo.apiKey, 'utf8')).digest()
-            const dText = this.crypto.createDecipheriv('aes-128-cbc', key, Buffer.from(rdata.iv, 'base64'))
-            const pText = Buffer.concat([dText.update(Buffer.from(data, 'base64')), dText.final()]).toString('utf8')
+
+            // Obtain the packet information
+            const data = rdata.data1 +
+              (rdata.data2 || '') +
+              (rdata.data3 || '') +
+              (rdata.data4 || '')
+            const key = this.crypto.createHash('md5')
+              .update(Buffer.from(deviceInfo.apiKey, 'utf8')).digest()
+            const dText = this.crypto
+              .createDecipheriv('aes-128-cbc', key, Buffer.from(rdata.iv, 'base64'))
+            const pText = Buffer
+              .concat([dText.update(Buffer.from(data, 'base64')), dText.final()])
+              .toString('utf8')
 
             // Check to see if the IP address of the device has changed
             if (packet.address !== deviceInfo.ip && !this.ipOverride[rdata.id]) {
@@ -94,7 +111,13 @@ module.exports = class connectionLAN {
             try {
               params = JSON.parse(pText)
             } catch (e) {
-              this.log.warn('[%s] LAN message received could not be read as %s:\n%s', rdata.id, e.message, pText)
+              this.log.warn(
+                '[%s] %s %s:\n%s',
+                rdata.id,
+                this.messages.cantReadPacket,
+                e.message,
+                pText
+              )
               return
             }
 
@@ -119,10 +142,8 @@ module.exports = class connectionLAN {
             }
           })
       } catch (err) {
-        const errToShow = this.debug
-          ? ':\n' + err
-          : ' ' + err.message + (err.lineNumber ? ' [line ' + err.lineNumber + '].' : '')
-        this.log.warn('Could not parse DNS packet as%s', errToShow)
+        const eText = this.funcs.parseError(err)
+        this.log.warn('%s %s.', this.messages.cantParsePacket, eText)
       }
     }
 
@@ -134,7 +155,7 @@ module.exports = class connectionLAN {
     try {
       // Check we have an IP address for the device
       if (!this.deviceMap.get(json.deviceid).ip) {
-        throw new Error('device not reachable via LAN mode')
+        throw new Error(this.messages.devNotReachLAN)
       }
       let apiKey
       let suffix
@@ -148,20 +169,22 @@ module.exports = class connectionLAN {
         params.switch = json.params.switch
         suffix = 'switch'
       } else {
-        throw new Error('device not configurable via LAN mode')
+        throw new Error(this.messages.devNotConfLAN)
       }
 
       // Check we have the device API key
       if (!(apiKey = this.deviceMap.get(json.deviceid).apiKey)) {
-        throw new Error('cannot retrieve device API key')
+        throw new Error(this.messages.devNoAPIKey)
       }
 
       // Generate the HTTP request
-      const key = this.crypto.createHash('md5').update(Buffer.from(apiKey, 'utf8')).digest()
+      const key = this.crypto.createHash('md5')
+        .update(Buffer.from(apiKey, 'utf8')).digest()
       const iv = this.crypto.randomBytes(16)
       const enc = this.crypto.createCipheriv('aes-128-cbc', key, iv)
       const data = {
-        data: Buffer.concat([enc.update(JSON.stringify(params)), enc.final()]).toString('base64'),
+        data: Buffer.concat([enc.update(JSON.stringify(params)), enc.final()])
+          .toString('base64'),
         deviceid: json.deviceid,
         encrypt: true,
         iv: iv.toString('base64'),
@@ -170,9 +193,10 @@ module.exports = class connectionLAN {
       }
 
       // Send the HTTP request
+      const ip = this.deviceMap.get(json.deviceid).ip
       const res = await this.axios({
         method: 'post',
-        url: 'http://' + this.deviceMap.get(json.deviceid).ip + ':8081/zeroconf/' + suffix,
+        url: 'http://' + ip + ':8081/zeroconf/' + suffix,
         headers: {
           Accept: 'application/json',
           'Content-Type': 'application/json'
@@ -189,7 +213,7 @@ module.exports = class connectionLAN {
       // This ok is needed by the plugin
       return 'ok'
     } catch (err) {
-      return err.message + (err.lineNumber ? ' [line ' + err.lineNumber + ']' : '')
+      return this.funcs.parseError(err)
     }
   }
 
@@ -210,7 +234,7 @@ module.exports = class connectionLAN {
     // This is called when Homebridge is shutdown
     await this.dns.stopMonitoring()
     if (this.debug) {
-      this.log('LAN monitoring gracefully stopped.')
+      this.log('%s.', this.messages.stoppedLAN)
     }
   }
 }
diff --git a/lib/connection/ws.js b/lib/connection/ws.js
index c4851006..07d29314 100644
--- a/lib/connection/ws.js
+++ b/lib/connection/ws.js
@@ -4,24 +4,33 @@
 
 module.exports = class connectionWS {
   constructor (platform, authData) {
+    // Set up variables from the platform
     this.consts = platform.consts
     this.funcs = platform.funcs
     this.log = platform.log
     this.messages = platform.messages
+
+    // Set up config variables from the platform
     this.debug = platform.config.debug
+
+    // Set up libraries from the platform
     this.axios = platform.axios
     this.emitter = platform.emitter
 
+    // Set up variables from the authData (from HTTP)
     this.httpHost = authData.httpHost
     this.aToken = authData.aToken
     this.apiKey = authData.apiKey
 
+    // Set up other libraries needed by this class
     this.ws = require('ws')
     this.wsp = require('websocket-as-promised')
   }
 
   async getHost () {
+    // Used to get the web socket host
     try {
+      // Send the HTTP request to get the web socket host
       const res = await this.axios({
         method: 'post',
         url: 'https://' + this.httpHost.replace('-api', '-disp') + '/dispatch/app',
@@ -36,41 +45,58 @@ module.exports = class connectionWS {
           version: 8
         }
       })
+
+      // Parse the response
       const body = res.data
+
+      // Check for any reason a host wasn't received
       if (!body.domain) {
-        throw new Error('Server did not respond with a web socket host.')
+        throw new Error(this.messages.noWSHost)
       }
+
+      // Log the received host if appropriate
       if (this.debug) {
-        this.log('Web socket host received [%s].', body.domain)
+        this.log('%s [%s].', this.messages.wsHostRec, body.domain)
       }
+
+      // Make the received host global
       this.wsHost = body.domain
     } catch (err) {
+      // Check to see if it's a eWeLink server problem and we can retry
       if (err.code && this.consts.httpRetryCodes.includes(err.code)) {
-        this.log.warn('Unable to reach eWeLink. Retrying in 30 seconds.')
+        // Retry if another attempt could be successful
+        this.log.warn('%s.', this.messages.httpRetry)
         await this.funcs.sleep(30000)
         return await this.getHost()
       } else {
+        // It's not a eWeLink problem so report the error back
         throw err
       }
     }
   }
 
   login () {
-    this.wsClient = new this.wsp(
-      'wss://' + this.wsHost + ':8080/api/ws',
-      {
-        createWebSocket: url => new this.ws(url),
-        extractMessageData: event => event,
-        attachRequestId: (data, requestId) => Object.assign({ sequence: requestId }, data),
-        extractRequestId: data => data && data.sequence,
-        packMessage: data => JSON.stringify(data),
-        unpackMessage: data => data === 'pong' ? data : JSON.parse(data)
-      }
-    )
+    // Used to create the web socket connection and authenticate
+
+    // Create the web socket client
+    this.wsClient = new this.wsp('wss://' + this.wsHost + ':8080/api/ws', {
+      createWebSocket: url => new this.ws(url),
+      extractMessageData: event => event,
+      attachRequestId: (data, requestId) => Object.assign({ sequence: requestId }, data),
+      extractRequestId: data => data && data.sequence,
+      packMessage: data => JSON.stringify(data),
+      unpackMessage: data => data === 'pong' ? data : JSON.parse(data)
+    })
+
+    // Open the web socket connection
     this.wsClient.open()
+
+    // Add a listener to authenticate when a web socket connection is opened
     this.wsClient.onOpen.addListener(async () => {
       this.wsIsOpen = true
       const sequence = Math.floor(new Date()).toString()
+
+      // Generate the login payload for the web socket
       const payload = {
         action: 'userOnline',
         apikey: this.apiKey,
@@ -82,124 +108,197 @@ module.exports = class connectionWS {
         userAgent: 'app',
         version: 8
       }
+
+      // Log the web socket login if appropriate
       if (this.debug) {
-        this.log('Sending WS login request.')
+        this.log('%s.', this.messages.wsLogin)
       }
+
+      // Attempt to authenticate the web socket connection
       try {
+        // Send the request
         const res = await this.wsClient.sendRequest(payload, { requestId: sequence })
+
+        // Parse the response
         if (res.config && res.config.hb && res.config.hbInterval) {
+          // Clear any existing ping intervals
           if (this.hbInterval) {
             clearInterval(this.hbInterval)
           }
+
+          // Create a new ping interval
           this.hbInterval = setInterval(() => {
             try {
+              // Send the ping
               this.wsClient.send('ping')
             } catch (err) {
+              // Catch errors sending ping and show in debug mode
               if (this.debug) {
-                this.log.warn('Error sending ping - %.', err.message)
+                const eText = this.funcs.parseError(err)
+                this.log.warn('%s %s.', this.messages.wsPingError, eText)
               }
             }
           }, (res.config.hbInterval + 7) * 1000)
+
+          // Login was successful and log if appropriate
           if (this.debug) {
-            this.log('WS login successful.')
+            this.log('%s.', this.messages.wsLoginSuccess)
           }
         } else {
-          throw new Error('Unknown parameters received\n' + JSON.stringify(res, null, 2))
+          // There was a problem with the authentication response
+          throw new Error(this.messages.wsLoginErr + '\n' + JSON.stringify(res, null, 2))
         }
       } catch (err) {
-        const errToShow = this.debug
-          ? ':\n' + err
-          : ' ' + err.message + (err.lineNumber ? ' [line ' + err.lineNumber + '].' : '')
-        this.log.warn('WS login failed as%s', errToShow)
+        // Catch any errors authenicating the WS connection
+        const eText = this.funcs.parseError(err)
+        this.log.warn('%s %s.', this.messages.wsLoginError, eText)
       }
     })
+
+    // Add a listener for when we receive a WS message
     this.wsClient.onUnpackedMessage.addListener(device => {
+      // Don't continue if it's a simple pong
       if (device === 'pong') {
         return
       }
+
+      // Set a device online flag now which we can change later
       let onlineStatus = true
+
+      // Set up a params object if one didn't already come within the message
       if (!device.params) {
         device.params = {}
       }
+
+      // We received a device on/offline or error notification
       if (device.deviceid && this.funcs.hasProperty(device, 'error')) {
         device.action = 'update'
+
+        // Set the online status of the device
         onlineStatus = device.error === 0
+
+        // Check if the device has reported an error
         if (device.error !== 0) {
-          const redacted = JSON.stringify(device, null, 2).replace(this.apiKey, '**hidden**')
-          this.log.warn('[%s] WS message received.\n%s', device.deviceid, redacted)
+          const str = JSON.stringify(device, null, 2)
+          const redacted = str.replace(this.apiKey, '**hidden**')
+          this.log.warn('[%s] %s.\n%s', device.deviceid, this.messages.wsRec, redacted)
         }
       }
+
+      // Normally the WS messages comes with an action
       if (device.action) {
+        // Check which action the WS message includes
         switch (device.action) {
           case 'update':
-          case 'sysmsg':
-            if (device.action === 'sysmsg' && this.funcs.hasProperty(device.params, 'online')) {
+          case 'sysmsg': {
+            if (
+              device.action === 'sysmsg' &&
+              this.funcs.hasProperty(device.params, 'online')
+            ) {
+              // Update the online/offline status provided in the message
               onlineStatus = device.params.online
             }
+
+            // Loop through the device parameters received
             for (const param in device.params) {
               if (this.funcs.hasProperty(device.params, param)) {
+                // Remove any params that the plugin doesn't need
                 if (!this.consts.paramsToKeep.includes(param.replace(/[0-9]/g, ''))) {
                   delete device.params[param]
                 }
               }
             }
+
+            // Add more params to report back to the plugin
             device.params.online = onlineStatus
             device.params.updateSource = 'WS'
-            if (Object.keys(device.params).length > 0) {
-              const returnTemplate = {
-                deviceid: device.deviceid,
-                params: device.params
-              }
-              this.emitter.emit('update', returnTemplate)
+
+            // Generate the object to return to the plugin
+            const returnTemplate = {
+              deviceid: device.deviceid,
+              params: device.params
             }
+
+            // Report the new device params object back to the plugin to deal with
+            this.emitter.emit('update', returnTemplate)
             break
+          }
           case 'reportSubDevice':
+            // We don't need to do anything with this action
             return
-          default:
-            this.log.warn('[%s] WS message received has unknown action.\n', device.deviceid, JSON.stringify(device, null, 2))
+          default: {
+            const str = JSON.stringify(device, null, 2)
+            this.log.warn('[%s] %s.\n%s', device.deviceid, this.messages.wsUnkAct, str)
+          }
         }
       } else if (this.funcs.hasProperty(device, 'error') && device.error === 0) {
         // Safe to ignore these messages
       } else {
-        this.log.warn('WS unknown command received.\n', JSON.stringify(device, null, 2))
+        // WS message received has an unknown action
+        this.log.warn('%s.\n%s', this.messages.wsUnkCmd, JSON.stringify(device, null, 2))
       }
     })
+
+    // Add a listener for when the web socket closes for any reason
     this.wsClient.onClose.addListener(async e => {
+      // Set the global flag to false
       this.wsIsOpen = false
+
+      // Clear the ping interval
       if (this.hbInterval) {
         clearInterval(this.hbInterval)
         this.hbInterval = null
       }
+
+      // Remove all existing listeners for web socket events
       this.wsClient.removeAllListeners()
+
+      // Don't continue further with logging/reconnection if it's a wanted closure
       if (e === 1005) {
         return
       }
+
+      // Log that the web socket has closed if appropriate
       if (this.debug) {
-        this.log.warn('Web socket closed - %s.', e)
-        this.log.warn('Web socket will try to reconnect in five seconds.')
+        this.log.warn('%s, %s.', this.messages.wsReconnect, e)
       }
+
+      // Wait for 5 seconds and try to re-establish the web socket connection
       await this.funcs.sleep(5000)
       await this.login()
     })
+
+    // Add a listener for when the web socket throws an error
     this.wsClient.onError.addListener(async e => {
+      // Set the global flag to false
       this.wsIsOpen = false
+
+      // Clear the ping interval
       if (this.hbInterval) {
         clearInterval(this.hbInterval)
         this.hbInterval = null
       }
+
+      // Remove all existing listeners for web socket events
       this.wsClient.removeAllListeners()
+
+      // Log that the web socket has closed if appropriate
       if (this.debug) {
-        this.log.warn('Web socket error - %s.', e)
-        this.log.warn('Web socket will try to reconnect in five seconds.')
+        this.log.warn('%s, %s.', this.messages.wsReconnect, e)
       }
+
+      // Wait for 5 seconds and try to re-establish the web socket connection
       await this.funcs.sleep(5000)
       await this.login()
     })
   }
 
   async sendUpdate (json) {
+    // Used to send a device update to eWeLink
     const sequence = Math.floor(new Date()).toString()
-    const jsonToSend = {
+
+    // Generate the payload to send
+    const toSend = {
       ...json,
       ...{
         action: 'update',
@@ -208,31 +307,49 @@ module.exports = class connectionWS {
         userAgent: 'app'
       }
     }
+
+    // Check the web socket is open
     if (this.wsClient && this.wsIsOpen) {
       try {
-        const device = await this.wsClient.sendRequest(jsonToSend, { requestId: sequence })
-        device.error = this.funcs.hasProperty(device, 'error') ? device.error : 504
-        switch (device.error) {
+        // Send the request to eWeLink
+        const res = await this.wsClient.sendRequest(toSend, { requestId: sequence })
+
+        // Parse the response and see if any error has been reported back
+        res.error = this.funcs.hasProperty(res, 'error') ? res.error : 504
+
+        // Check if and which error has been reported back
+        switch (res.error) {
           case 0:
+            // No error is always what is wanted
             return
           default:
-            throw new Error('Unknown response')
+            // An error has occurred
+            throw new Error(this.messages.wsUnkRes)
         }
       } catch (err) {
-        const errToShow = this.debug
-          ? ':\n' + err
-          : ' ' + err.message + (err.lineNumber ? ' [line ' + err.lineNumber + '].' : '')
-        return new Error('device update failed as' + errToShow)
+        // Catch any errors sending the device update
+        const eText = this.funcs.parseError(err)
+        return new Error(this.messages.devNotUpd + ' ' + eText)
       }
     } else {
-      this.log.warn('Request will be sent when WS has reconnected.')
+      // The web socket isn't currently open so log this
+      this.log.warn('%s.', this.messages.wsResend)
+
+      // Try sending the update again in 30 seconds when it's hopefully open again
       await this.funcs.sleep(30000)
       await this.sendUpdate(json)
     }
   }
 
+  receiveUpdate (f) {
+    this.emitter.addListener('update', f)
+  }
+
   async requestUpdate (accessory) {
+    // Used to request a device update from eWeLink
     const sequence = Math.floor(new Date()).toString()
+
+    // Generate the payload to send
     const json = {
       action: 'query',
       apikey: accessory.context.eweApiKey,
@@ -242,27 +359,35 @@ module.exports = class connectionWS {
       ts: 0,
       userAgent: 'app'
     }
+
+    // Log the action if appropriate
     if (this.debug) {
-      this.log('[%s] requesting current status.', accessory.displayName)
+      this.log('[%s] %s.', accessory.displayName, this.messages.updReq)
     }
+
+    // Check the web socket is open
     if (this.wsClient && this.wsIsOpen) {
+      // Send the request
       this.wsClient.send(JSON.stringify(json))
     } else {
-      this.log.warn('[%s] request will be sent when WS has reconnected.', accessory.displayName)
+      // The web socket isn't currently open so log this
+      this.log.warn('[%s] %s.', accessory.displayName, this.messages.wsResend)
+
+      // Try sending the update again in 30 seconds when it's hopefully open again
       await this.funcs.sleep(30000)
       await this.requestUpdate(accessory)
     }
   }
 
-  receiveUpdate (f) {
-    this.emitter.addListener('update', f)
-  }
-
   async closeConnection () {
+    // This is called when Homebridge is shutdown
     if (this.wsClient && this.wsIsOpen) {
+      // Close the web socket connection
       await this.wsClient.close()
+
+      // Log if appropriate
       if (this.debug) {
-        this.log('Web socket gracefully closed.')
+        this.log('%s.', this.messages.stoppedWS)
       }
     }
   }
diff --git a/lib/index.js b/lib/index.js
index c041cc6c..5a260ddf 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -700,7 +700,10 @@ class eWeLinkPlatform {
         /**********************/
       } else if (
         this.consts.devices.outlet.includes(device.extra.uiid) ||
-        (this.consts.devices.singleSwitch.includes(device.extra.uiid) && this.consts.devices.singleSwitchOutlet.includes(device.productModel))
+        (
+          this.consts.devices.singleSwitch.includes(device.extra.uiid) &&
+          this.consts.devices.singleSwitchOutlet.includes(device.productModel)
+        )
       ) {
         /******
         OUTLETS
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 6e350a1b..a2e0924f 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -52,6 +52,8 @@ module.exports = {
   },
 
   messages: {
+    cantReadPacket: 'LAN message received could not be read as',
+    cantParsePacket: 'Could not parse DNS packet as',
     cfgDef: 'is not a valid number so using default of',
     cfgIgn: 'is not configured correctly so ignoring',
     cfgItem: 'Config entry',
@@ -62,9 +64,13 @@ module.exports = {
     devAdd: 'has been added to Homebridge',
     devInit: 'initialised and',
     devNewNotAdd: 'restart Homebridge to add new device, failed to add automatically as',
+    devNoAPIKey: 'cannot retrieve device API key',
     devNotAdd: 'could not be added to Homebridge as',
     devNotConf: 'could not be configured as',
+    devNotFound: 'device not found in eWeLink',
     devNotInit: 'could not be initialised as',
+    devNotConfLAN: 'device not configurable via LAN mode',
+    devNotReachLAN: 'device not reachable via LAN mode',
     devNotRf: 'could not be refreshed as',
     devNotRemove: 'could not be removed from Homebridge as',
     devNotSup: 'has not been added as it is not supported',
@@ -73,7 +79,10 @@ module.exports = {
     devRemove: 'has been removed from Homebridge',
     disabled: 'To change this, set disablePlugin to false',
     disabling: 'Disabling plugin',
+    eweError: 'An eWeLink error [500] occured, retrying in 30 seconds',
     foundWithIP: 'found locally with IP',
+    hostReceived: 'HTTP API host received',
+    httpRetry: 'Unable to reach eWeLink, retrying in 30 seconds',
     identify: 'identify button pressed',
     initialised: 'initialised. Syncing with eWeLink',
     lanDisabled: 'LAN mode is disabled',
@@ -84,19 +93,41 @@ module.exports = {
     missingCreds: 'eWeLink credentials missing from configuration',
     missingPW: 'eWeLink password missing from configuration',
     missingUN: 'eWeLink username missing from configuration',
+    newRegionRec: 'New HTTP API host received',
+    noAuthRec: 'No auth token received',
+    noRegion: 'Server did not respond with a region',
+    noRegionRec: 'No valid region received',
+    noWSHost: 'Server did not respond with a web socket host',
     recNew: 'receiving update for new device',
     repOffline: 'reported [offline]',
     repOnline: 'reported [online]',
     revertWS: 'reverting to web socket as',
+    sendGetHost: 'Sending HTTP getHost() request',
+    sendLogin: 'Sending HTTP login() request',
     sonoffCamera: 'see the homebridge-ewelink wiki for details to enable the camera',
+    stoppedLAN: 'LAN monitoring gracefully stopped',
+    stoppedWS: 'Web socket gracefully closed',
     unreachable: 'it is unreachable',
     unsupDev: 'has an unsupported device type',
     updRec: 'receiving update',
+    updReq: 'requesting current status',
     updSend: 'sending update',
     viaLAN: 'via LAN',
     viaWS: 'via WS',
+    wsHostRec: 'Web socket host received',
+    wsLogin: 'Sending WS login request',
+    wsLoginErr: 'Unknown WS parameters received',
+    wsLoginError: 'WS login failed as',
+    wsLoginSuccess: 'WS login successful',
+    wsPingError: 'Cound not send WS ping as',
+    wsRec: 'WS message received',
+    wsReconnect: 'Web socket closed and will try to reconnect in 5 seconds',
     wsRef: 'Refreshing WS connection',
-    wsRefFail: 'Refreshing WS connection failed as'
+    wsRefFail: 'Refreshing WS connection failed as',
+    wsResend: 'Request will be sent when WS has reconnected',
+    wsUnkAct: 'WS message received has unknown action',
+    wsUnkCmd: 'WS unknown command received',
+    wsUnkRes: 'Unknown WS response'
   },
 
   welcomeMessages: [

From d06254246cd24ee15b0200572eefdd1c4f6761a9 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 7 Feb 2021 18:25:59 +0000
Subject: [PATCH 1329/3183] typo

---
 lib/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/index.js b/lib/index.js
index 5a260ddf..a29204eb 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1054,7 +1054,7 @@ class eWeLinkPlatform {
 
       // Helpful logging for each device
       const str = accessory.context.reachableLAN
-        ? this.messages.foundWithIp + ' [' + this.lanDevices.get(device.deviceid).ip + ']'
+        ? this.messages.foundWithIP + ' [' + this.lanDevices.get(device.deviceid).ip + ']'
         : this.consts.devices.lan.includes(device.extra.uiid)
           ? this.messages.lanUnreachable
           : this.messages.lanUnsupported

From 5d6fb0fa84bd2a995cd53053c073d8daf092884a Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 7 Feb 2021 18:30:11 +0000
Subject: [PATCH 1330/3183] revert duplicate update bug

---
 lib/connection/lan.js | 2 +-
 lib/connection/ws.js  | 2 +-
 lib/index.js          | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/connection/lan.js b/lib/connection/lan.js
index 97fd426c..d20c0ec1 100644
--- a/lib/connection/lan.js
+++ b/lib/connection/lan.js
@@ -17,11 +17,11 @@ module.exports = class connectionLAN {
     // Set up libraries from the platform
     this.axios = platform.axios
     this.crypto = platform.crypto
-    this.emitter = platform.emitter
 
     // Set up other variables and libraries needed by this class
     this.deviceMap = new Map()
     this.dns = require('node-dns-sd')
+    this.emitter = new (require('events'))()
 
     // Create a template map with our device list from the HTTP client
     devices.forEach(device => {
diff --git a/lib/connection/ws.js b/lib/connection/ws.js
index 07d29314..d3a6a218 100644
--- a/lib/connection/ws.js
+++ b/lib/connection/ws.js
@@ -15,7 +15,6 @@ module.exports = class connectionWS {
 
     // Set up libraries from the platform
     this.axios = platform.axios
-    this.emitter = platform.emitter
 
     // Set up variables from the authData (from HTTP)
     this.httpHost = authData.httpHost
@@ -23,6 +22,7 @@ module.exports = class connectionWS {
     this.apiKey = authData.apiKey
 
     // Set up other libraries needed by this class
+    this.emitter = new (require('events'))()
     this.ws = require('ws')
     this.wsp = require('websocket-as-promised')
   }
diff --git a/lib/index.js b/lib/index.js
index a29204eb..3a8938cc 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -377,7 +377,6 @@ class eWeLinkPlatform {
       this.axios = require('axios')
       this.crypto = require('crypto')
       this.colourUtils = require('./utils/colour-utils')
-      this.emitter = new (require('events'))()
       this.eveService = require('./fakegato/fakegato-history')(this.api)
 
       // Set up the HTTP client, get the user HTTP host, and login

From aeadf43b410d8f34441cd6a464f05f0d1b7c65d4 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 7 Feb 2021 18:38:50 +0000
Subject: [PATCH 1331/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7af2aa94..9f66edd6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 ### Changes
 
+* ⚠️ Removed `nameOverride` configuration option
 * Fixed an issue with the 'Lock' Accessory Simulation where the status would never update as 'Unlocked'
 * Colour conversation formula changes
 * Error messages refactored to show the most useful information

From 70dd84d17976cdb9b65f60d3d1385bf809d22c77 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 7 Feb 2021 18:38:59 +0000
Subject: [PATCH 1332/3183] Update constants.js

---
 lib/utils/constants.js | 219 +++++++++++++++++++----------------------
 1 file changed, 103 insertions(+), 116 deletions(-)

diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index a2e0924f..90d1df72 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -19,17 +19,16 @@ module.exports = {
     inUsePowerThreshold: 0,
     hideLightFromFan: '',
     hideSwitchFromTH: '',
-    thTempOffset: [], // TODO
+    thTempOffset: [],
     resetRFBridge: '',
     lowBattThreshold: 25,
     sensorTimeDifference: 120,
     hideZBLDPress: false,
     bulbB02BA60: '',
     bulbB02FST64: '',
-    groups: [], // TODO
-    bridgeSensors: [], // TODO
-    nameOverride: [], // TODO
-    ipOverride: [], // TODO
+    groups: [],
+    bridgeSensors: [],
+    ipOverride: [],
     debugFakegato: false,
     platform: 'eWeLink'
   },
@@ -211,120 +210,108 @@ module.exports = {
   },
 
   defaultMultiSwitchOff: [
-    {
-      switch: 'off',
-      outlet: 0
-    },
-    {
-      switch: 'off',
-      outlet: 1
-    },
-    {
-      switch: 'off',
-      outlet: 2
-    },
-    {
-      switch: 'off',
-      outlet: 3
-    }
+    { switch: 'off', outlet: 0 },
+    { switch: 'off', outlet: 1 },
+    { switch: 'off', outlet: 2 },
+    { switch: 'off', outlet: 3 }
   ],
 
   chansFromUiid: {
-    1: 1, // "SOCKET"                                  \\ 20, MINI, BASIC, S26
-    2: 2, // "SOCKET_2"                                \\
-    3: 3, // "SOCKET_3"                                \\
-    4: 4, // "SOCKET_4",                               \\
-    5: 1, // "SOCKET_POWER"                            \\
-    6: 1, // "SWITCH"                                  \\ T1 1C, TX1C
-    7: 2, // "SWITCH_2"                                \\ T1 2C, TX2C
-    8: 3, // "SWITCH_3"                                \\ T1 3C, TX3C
-    9: 4, // "SWITCH_4"                                \\
-    10: 0, // "OSPF"                                   \\
-    11: 1, // "CURTAIN"                                \\ King Q4 Cover
-    12: 0, // "EW-RE"                                  \\
-    13: 0, // "FIREPLACE"                              \\
-    14: 1, // "SWITCH_CHANGE"                          \\
-    15: 1, // "THERMOSTAT"                             \\ TH10, TH16
-    16: 0, // "COLD_WARM_LED"                          \\
-    17: 0, // "THREE_GEAR_FAN"                         \\
-    18: 0, // "SENSORS_CENTER"                         \\
-    19: 0, // "HUMIDIFIER"                             \\
-    22: 1, // "RGB_BALL_LIGHT"                         \\ B1, B1_R2
-    23: 0, // "NEST_THERMOSTAT"                        \\
-    24: 1, // "GSM_SOCKET"                             \\
-    25: 0, // "AROMATHERAPY",                          \\ Diffuser, Komeito 1515-X
-    26: 0, // "RuiMiTeWenKongQi"                       \\
-    27: 1, // "GSM_UNLIMIT_SOCKET"                     \\
-    28: 1, // "RF_BRIDGE"                              \\ RFBridge, RF_Bridge
-    29: 2, // "GSM_SOCKET_2"                           \\
-    30: 3, // "GSM_SOCKET_3"                           \\
-    31: 4, // "GSM_SOCKET_4"                           \\
-    32: 1, // "POWER_DETECTION_SOCKET"                 \\ Pow_R2 POW
-    33: 0, // "LIGHT_BELT",                            \\
-    34: 4, // "FAN_LIGHT"                              \\ iFan02, iFan
-    35: 0, // "EZVIZ_CAMERA",                          \\
-    36: 1, // "SINGLE_CHANNEL_DIMMER_SWITCH"           \\ KING-M4
-    38: 0, // "HOME_KIT_BRIDGE",                       \\
-    40: 0, // "FUJIN_OPS"                              \\
-    41: 4, // "CUN_YOU_DOOR"                           \\
-    42: 0, // "SMART_BEDSIDE_AND_NEW_RGB_BALL_LIGHT"   \\
-    43: 0, // "?"                                      \\
-    44: 1, // "SNOFF_LIGHT"                            \\ D1
-    45: 0, // "DOWN_CEILING_LIGHT"                     \\
-    46: 0, // "AIR_CLEANER"                            \\
-    49: 0, // "MACHINE_BED"                            \\
-    51: 0, // "COLD_WARM_DESK_LIGHT"                   \\
-    52: 0, // "DOUBLE_COLOR_DEMO_LIGHT"                \\
-    53: 0, // "ELECTRIC_FAN_WITH_LAMP"                 \\
-    55: 0, // "SWEEPING_ROBOT"                         \\
-    56: 0, // "RGB_BALL_LIGHT_4"                       \\
-    57: 0, // "MONOCHROMATIC_BALL_LIGHT"               \\
-    59: 1, // "MUSIC_LIGHT_BELT"                       \\ L1
-    60: 0, // "NEW_HUMIDIFIER"                         \\
-    61: 0, // "KAI_WEI_ROUTER"                         \\
-    62: 0, // "MEARICAMERA"                            \\
-    64: 0, // "HeatingTable"                           \\
-    65: 0, // "CustomCamera"                           \\ eWeLink camera app
-    66: 0, // "ZIGBEE_MAIN_DEVICE"                     \\
-    67: 0, // "RollingDoor"                            \\
-    68: 0, // "KOOCHUWAH"                              \\ a whhaaaaat?
-    69: 0, // "ATMOSPHERE_LAMP"                        \\
-    76: 0, // "YI_GE_ER_LAMP"                          \\
-    77: 4, // "SINGLE_SOCKET_MULTIPLE"                 \\ (1 socket device using data structure of four :()
-    78: 4, // "SINGLE_SWITCH_MULTIPLE"                 \\ (1 switch device using data structure of four :()
-    79: 0, // "CHRISTMAS_LIGHT"                        \\
-    80: 0, // "HANYUAN_AIR_CONDITION"                  \\
-    81: 1, // "GSM_SOCKET_NO_FLOW"                     \\
-    82: 2, // "GSM_SOCKET_2_NO_FLOW"                   \\
-    83: 3, // "GSM_SOCKET_3_NO_FLOW"                   \\
-    84: 4, // "GSM_SOCKET_4_NO_FLOW"                   \\
-    86: 0, // "CLEAR_BOOT"                             \\
-    87: 0, // "EWELINK_IOT_CAMERA"                     \\ GK-200MP2B
-    88: 0, // "YK_INFRARED"                            \\
-    89: 0, // "SMART_OPEN_MACHINE"                     \\
-    90: 0, // "GSM_RFBridge"                           \\
-    91: 0, // "ROLLING_DOOR_91"                        \\
-    93: 0, // "HTHD_AIR_CLEANER"                       \\
-    94: 0, // "YIAN_ELECTRIC_PROTECT"                  \\
-    98: 0, // "DOORBELL_RFBRIDGE"                      \\
-    102: 1, // "DOOR_MAGNETIC"                         \\ OPL-DMA, DW2
-    103: 1, // "WOTEWODE_TEM_LIGHT"                    \\ B02-F
-    104: 1, // "WOTEWODE_RGB_TEM_LIGHT"                \\
-    107: 0, // "GSM_SOCKET_NO_FLOW"                    \\
-    109: 0, // "YK_INFRARED_2"                         \\
-    1000: 1, // "ZIGBEE_WIRELESS_SWITCH"               \\
-    1001: 0, // "BLADELESS_FAN"                        \\
-    1002: 0, // "NEW_HUMIDIFIER"                       \\
-    1003: 0, // "WARM_AIR_BLOWER"                      \\
-    1009: 1, // ""                                     \\ Some sort of single switch device
-    1256: 1, // "ZIGBEE_SINGLE_SWITCH"                 \\
+    1: 1, // "SOCKET" (20, MINI, BASIC, S26)
+    2: 2, // "SOCKET_2"
+    3: 3, // "SOCKET_3"
+    4: 4, // "SOCKET_4"
+    5: 1, // "SOCKET_POWER"
+    6: 1, // "SWITCH" (T1 1C, TX1C)
+    7: 2, // "SWITCH_2" (T1 2C, TX2C)
+    8: 3, // "SWITCH_3" (T1 3C, TX3C)
+    9: 4, // "SWITCH_4"
+    10: 0, // "OSPF"
+    11: 1, // "CURTAIN" (King Q4 Cover)
+    12: 0, // "EW-RE"
+    13: 0, // "FIREPLACE"
+    14: 1, // "SWITCH_CHANGE"
+    15: 1, // "THERMOSTAT" (TH10, TH16)
+    16: 0, // "COLD_WARM_LED"
+    17: 0, // "THREE_GEAR_FAN"
+    18: 0, // "SENSORS_CENTER"
+    19: 0, // "HUMIDIFIER"
+    22: 1, // "RGB_BALL_LIGHT" (B1, B1_R2)
+    23: 0, // "NEST_THERMOSTAT"
+    24: 1, // "GSM_SOCKET"
+    25: 0, // "AROMATHERAPY" (Diffuser, Komeito 1515-X)
+    26: 0, // "RuiMiTeWenKongQi"
+    27: 1, // "GSM_UNLIMIT_SOCKET"
+    28: 1, // "RF_BRIDGE" (RFBridge, RF_Bridge)
+    29: 2, // "GSM_SOCKET_2"
+    30: 3, // "GSM_SOCKET_3"
+    31: 4, // "GSM_SOCKET_4"
+    32: 1, // "POWER_DETECTION_SOCKET" (POW, Pow_R2)
+    33: 0, // "LIGHT_BELT",
+    34: 4, // "FAN_LIGHT" (iFan02, iFan)
+    35: 0, // "EZVIZ_CAMERA",
+    36: 1, // "SINGLE_CHANNEL_DIMMER_SWITCH" (KING-M4)
+    38: 0, // "HOME_KIT_BRIDGE",
+    40: 0, // "FUJIN_OPS"
+    41: 4, // "CUN_YOU_DOOR"
+    42: 0, // "SMART_BEDSIDE_AND_NEW_RGB_BALL_LIGHT"
+    43: 0, // "?"
+    44: 1, // "SNOFF_LIGHT" (D1)
+    45: 0, // "DOWN_CEILING_LIGHT"
+    46: 0, // "AIR_CLEANER"
+    49: 0, // "MACHINE_BED"
+    51: 0, // "COLD_WARM_DESK_LIGHT"
+    52: 0, // "DOUBLE_COLOR_DEMO_LIGHT"
+    53: 0, // "ELECTRIC_FAN_WITH_LAMP"
+    55: 0, // "SWEEPING_ROBOT"
+    56: 0, // "RGB_BALL_LIGHT_4"
+    57: 0, // "MONOCHROMATIC_BALL_LIGHT"
+    59: 1, // "MUSIC_LIGHT_BELT" (L1)
+    60: 0, // "NEW_HUMIDIFIER"
+    61: 0, // "KAI_WEI_ROUTER"
+    62: 0, // "MEARICAMERA"
+    64: 0, // "HeatingTable"
+    65: 0, // "CustomCamera" (eWeLink Camera App)
+    66: 0, // "ZIGBEE_MAIN_DEVICE"
+    67: 0, // "RollingDoor"
+    68: 0, // "KOOCHUWAH"
+    69: 0, // "ATMOSPHERE_LAMP"
+    76: 0, // "YI_GE_ER_LAMP"
+    77: 4, // "SINGLE_SOCKET_MULTIPLE" (1 socket device using data structure of four :()
+    78: 4, // "SINGLE_SWITCH_MULTIPLE" (1 switch device using data structure of four :()
+    79: 0, // "CHRISTMAS_LIGHT"
+    80: 0, // "HANYUAN_AIR_CONDITION"
+    81: 1, // "GSM_SOCKET_NO_FLOW"
+    82: 2, // "GSM_SOCKET_2_NO_FLOW"
+    83: 3, // "GSM_SOCKET_3_NO_FLOW"
+    84: 4, // "GSM_SOCKET_4_NO_FLOW"
+    86: 0, // "CLEAR_BOOT"
+    87: 0, // "EWELINK_IOT_CAMERA" (GK-200MP2B)
+    88: 0, // "YK_INFRARED"
+    89: 0, // "SMART_OPEN_MACHINE"
+    90: 0, // "GSM_RFBridge"
+    91: 0, // "ROLLING_DOOR_91"
+    93: 0, // "HTHD_AIR_CLEANER"
+    94: 0, // "YIAN_ELECTRIC_PROTECT"
+    98: 0, // "DOORBELL_RFBRIDGE"
+    102: 1, // "DOOR_MAGNETIC" (OPL-DMA, DW2)
+    103: 1, // "WOTEWODE_TEM_LIGHT" (B02-F)
+    104: 1, // "WOTEWODE_RGB_TEM_LIGHT"
+    107: 0, // "GSM_SOCKET_NO_FLOW"
+    109: 0, // "YK_INFRARED_2"
+    1000: 1, // "ZIGBEE_WIRELESS_SWITCH"
+    1001: 0, // "BLADELESS_FAN"
+    1002: 0, // "NEW_HUMIDIFIER"
+    1003: 0, // "WARM_AIR_BLOWER"
+    1009: 1, // "" (Some sort of single switch device)
+    1256: 1, // "ZIGBEE_SINGLE_SWITCH"
     1257: 1, // "ZigbeeWhiteLight"
-    1770: 1, // "ZIGBEE_TEMPERATURE_SENSOR"            \\
-    2026: 1, // "ZIGBEE_MOBILE_SENSOR"                 \\
-    2256: 2, // "ZIGBEE_SWITCH_2"                      \\
-    3026: 1, // "ZIGBEE_DOOR_AND_WINDOW_SENSOR"        \\
-    3256: 3, // "ZIGBEE_SWITCH_3"                      \\
-    4026: 1, // "ZIGBEE_WATER_SENSOR"                  \\
-    4256: 4 // "ZIGBEE_SWITCH_4"                       \\
+    1770: 1, // "ZIGBEE_TEMPERATURE_SENSOR"
+    2026: 1, // "ZIGBEE_MOBILE_SENSOR"
+    2256: 2, // "ZIGBEE_SWITCH_2"
+    3026: 1, // "ZIGBEE_DOOR_AND_WINDOW_SENSOR"
+    3256: 3, // "ZIGBEE_SWITCH_3"
+    4026: 1, // "ZIGBEE_WATER_SENSOR"
+    4256: 4 // "ZIGBEE_SWITCH_4"
   }
 }

From fb3f72e290adb55b9a27c58e81f6c1b11c32e78c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 7 Feb 2021 18:55:49 +0000
Subject: [PATCH 1333/3183] remove nameOverride

---
 config.schema.json | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index dc46faa9..59134816 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -369,20 +369,6 @@
           }
         }
       },
-      "nameOverride": {
-        "type": "array",
-        "items": {
-          "type": "object",
-          "properties": {
-            "fullDeviceId": {
-              "type": "string"
-            },
-            "deviceName": {
-              "type": "string"
-            }
-          }
-        }
-      },
       "ipOverride": {
         "type": "array",
         "items": {

From a4a3d0ba0a080485327aaf221988040abbeda902 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 7 Feb 2021 18:56:00 +0000
Subject: [PATCH 1334/3183] reinstate ipOverride into view

---
 config.schema.json | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 59134816..da0954c9 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -375,10 +375,12 @@
           "type": "object",
           "properties": {
             "deviceId": {
-              "type": "string"
+              "type": "string",
+              "title": "Device ID"
             },
             "deviceIP": {
-              "type": "string"
+              "type": "string",
+              "title": "Device IP"
             }
           }
         }
@@ -465,6 +467,23 @@
           ]
         }
       ]
+    },
+    {
+      "key": "ipOverride",
+      "title": "Device IPs",
+      "description": "Set manual IPs for your devices if the plugin cannot automatically discover them.",
+      "expandable": true,
+      "add": "Add Another IP",
+      "type": "array",
+      "items": [
+        {
+          "type": "fieldset",
+          "items": [
+            "ipOverride[].deviceId",
+            "ipOverride[].deviceIP"
+          ]
+        }
+      ]
     }
   ]
 }
\ No newline at end of file

From 5602fb4b088a9cecf847700d3283fbd52e0dd91c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 7 Feb 2021 18:56:03 +0000
Subject: [PATCH 1335/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9f66edd6..e9f24104 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,8 +13,10 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 ### Changes
 
 * ⚠️ Removed `nameOverride` configuration option
+* Reinstated `ipOverride` into the Homebridge plugin UI screen
 * Fixed an issue with the 'Lock' Accessory Simulation where the status would never update as 'Unlocked'
 * Colour conversation formula changes
+* HTTP error codes will be displayed in the logs if and when the plugin re-attempts the connection
 * Error messages refactored to show the most useful information
 * [Backend] Major code refactoring
 * [Backend] Code comments

From a5d1154077e9402ad4427f5cf8175d7583d106b3 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 7 Feb 2021 18:56:24 +0000
Subject: [PATCH 1336/3183] show http code in log

---
 lib/connection/http.js | 6 +++---
 lib/connection/ws.js   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/connection/http.js b/lib/connection/http.js
index 15f60f4e..9f655e77 100644
--- a/lib/connection/http.js
+++ b/lib/connection/http.js
@@ -90,7 +90,7 @@ module.exports = class connectionHTTP {
       // Check to see if it's a eWeLink server problem and we can retry
       if (err.code && this.consts.httpRetryCodes.includes(err.code)) {
         // Retry if another attempt could be successful
-        this.log.warn('%s.', this.messages.httpRetry)
+        this.log.warn('%s (%s).', this.messages.httpRetry, err.code)
         await this.funcs.sleep(30000)
         return await this.getHost()
       } else {
@@ -238,7 +238,7 @@ module.exports = class connectionHTTP {
       // Check to see if it's a eWeLink server problem and we can retry
       if (err.code && this.consts.httpRetryCodes.includes(err.code)) {
         // Retry if another attempt could be successful
-        this.log.warn('%s.', this.messages.httpRetry)
+        this.log.warn('%s (%s).', this.messages.httpRetry, err.code)
         await this.funcs.sleep(30000)
         return await this.getDevices()
       } else {
@@ -284,7 +284,7 @@ module.exports = class connectionHTTP {
     } catch (err) {
       if (err.code && this.consts.httpRetryCodes.includes(err.code)) {
         // Retry if another attempt could be successful
-        this.log.warn('%s.', this.messages.httpRetry)
+        this.log.warn('%s (%s).', this.messages.httpRetry, err.code)
         await this.funcs.sleep(30000)
         return await this.getDevice(deviceId)
       } else {
diff --git a/lib/connection/ws.js b/lib/connection/ws.js
index d3a6a218..ef876243 100644
--- a/lib/connection/ws.js
+++ b/lib/connection/ws.js
@@ -65,7 +65,7 @@ module.exports = class connectionWS {
       // Check to see if it's a eWeLink server problem and we can retry
       if (err.code && this.consts.httpRetryCodes.includes(err.code)) {
         // Retry if another attempt could be successful
-        this.log.warn('%s.', this.messages.httpRetry)
+        this.log.warn('%s (%s).', this.messages.httpRetry, err.code)
         await this.funcs.sleep(30000)
         return await this.getHost()
       } else {

From 95a1a0c47e48ca423f2662f14da31d2eaa2662b3 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 7 Feb 2021 18:56:30 +0000
Subject: [PATCH 1337/3183] typo

---
 lib/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/index.js b/lib/index.js
index 3a8938cc..e7cb79b6 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -277,7 +277,7 @@ class eWeLinkPlatform {
                 switch (k) {
                   case 'deviceId':
                     break
-                  case 'deviceIp': {
+                  case 'deviceIP': {
                     if (typeof v !== 'string' || v === '') {
                       logIgnore(key + '.' + k)
                     }

From bc8a2320371a86d5d8355eb7c44dce85336d7cd2 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 7 Feb 2021 19:08:01 +0000
Subject: [PATCH 1338/3183] config item consistency

---
 config.schema.json     | 57 +++++++++++++++++++++---------------------
 lib/index.js           |  1 +
 lib/utils/constants.js |  9 ++++---
 3 files changed, 35 insertions(+), 32 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index da0954c9..a4326b75 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -107,20 +107,6 @@
         "title": "Hide TH10/16 Switches",
         "description": "A list of TH10/TH16 devices for which the switch will be hidden. For example 10009553c8 or multiple separated by a comma."
       },
-      "thTempOffset": {
-        "type": "array",
-        "items": {
-          "type": "object",
-          "properties": {
-            "deviceId": {
-              "type": "string"
-            },
-            "offset": {
-              "type": "number"
-            }
-          }
-        }
-      },
       "resetRFBridge": {
         "title": "Reset RF Bridges",
         "type": "string",
@@ -140,20 +126,6 @@
         "placeholder": 120,
         "minimum": 10
       },
-      "hideZBLDPress": {
-        "title": "Zigbee Button Hide Double/Long Press",
-        "type": "boolean",
-        "description": "If checked, double and long press options will be hidden for the ZigBee button."
-      },
-      "ZBDWBatt": {
-        "type": "boolean"
-      },
-      "bulbB02BA60": {
-        "type": "string"
-      },
-      "bulbB02FST64": {
-        "type": "string"
-      },
       "groups": {
         "type": "array",
         "items": {
@@ -384,6 +356,35 @@
             }
           }
         }
+      },
+      "debugFakegato": {
+        "type": "boolean"
+      },
+      "bulbB02BA60": {
+        "type": "string"
+      },
+      "bulbB02FST64": {
+        "type": "string"
+      },
+      "thTempOffset": {
+        "type": "array",
+        "items": {
+          "type": "object",
+          "properties": {
+            "deviceId": {
+              "type": "string"
+            },
+            "offset": {
+              "type": "number"
+            }
+          }
+        }
+      },
+      "hideZBLDPress": {
+        "type": "boolean"
+      },
+      "ZBDWBatt": {
+        "type": "boolean"
       }
     }
   },
diff --git a/lib/index.js b/lib/index.js
index e7cb79b6..1c2c4d96 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -147,6 +147,7 @@ class eWeLinkPlatform {
         case 'disableDeviceLogging':
         case 'disablePlugin':
         case 'hideZBLDPress':
+        case 'ZBDWBatt':
           if (typeof val === 'string') {
             logQuotes(key)
           }
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 90d1df72..c790e15a 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -19,17 +19,18 @@ module.exports = {
     inUsePowerThreshold: 0,
     hideLightFromFan: '',
     hideSwitchFromTH: '',
-    thTempOffset: [],
     resetRFBridge: '',
     lowBattThreshold: 25,
     sensorTimeDifference: 120,
-    hideZBLDPress: false,
-    bulbB02BA60: '',
-    bulbB02FST64: '',
     groups: [],
     bridgeSensors: [],
     ipOverride: [],
     debugFakegato: false,
+    bulbB02BA60: '',
+    bulbB02FST64: '',
+    thTempOffset: [],
+    hideZBLDPress: false,
+    ZBDWBatt: false,
     platform: 'eWeLink'
   },
 

From 9bdccf622d2ede3c1143ae0584e67ad780ed3616 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 7 Feb 2021 19:10:29 +0000
Subject: [PATCH 1339/3183] log ordering

---
 lib/index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/index.js b/lib/index.js
index 1c2c4d96..31729cfd 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1006,14 +1006,14 @@ class eWeLinkPlatform {
         /*************
         SONOFF CAMERAS
         *************/
-        this.log('[%s] %s.', this.messages.sonoffCamera, device.name)
+        this.log('[%s] %s.', device.name, this.messages.sonoffCamera)
         return
         /************/
       } else if (this.consts.devices.eWeCamera.includes(device.extra.uiid)) {
         /******************
         EWELINK APP CAMERAS
         ******************/
-        this.log('[%s] %s.', this.messages.devNotSup, device.name)
+        this.log('[%s] %s.', device.name, this.messages.devNotSup)
         return
         /*****************/
       } else {

From 8d7e2911712918786d738bb0c2c2155ba3cf89cc Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 7 Feb 2021 19:15:59 +0000
Subject: [PATCH 1340/3183] log that entry will be ignored

---
 lib/index.js           | 11 +++++++----
 lib/utils/constants.js |  1 +
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/lib/index.js b/lib/index.js
index 31729cfd..e1d749fd 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -69,6 +69,9 @@ class eWeLinkPlatform {
     const logIgnore = k => {
       this.log.warn('%s [%s] %s.', this.messages.cfgItem, k, this.messages.cfgIgn)
     }
+    const logIgnoreItem = k => {
+      this.log.warn('%s [%s] %s.', this.messages.cfgItem, k, this.messages.cfgIgnItem)
+    }
     const logIncrease = (k, min) => {
       this.log.warn('%s [%s] %s %s.', this.messages.cfgItem, k, this.messages.cfgLow, min)
     }
@@ -86,7 +89,7 @@ class eWeLinkPlatform {
           if (Array.isArray(val) && val.length > 0) {
             val.forEach(x => {
               if (!x.type || !x.fullDeviceId) {
-                logIgnore(key)
+                logIgnoreItem(key)
                 return
               }
               const fullDeviceId = this.funcs.parseDeviceId(x.fullDeviceId)
@@ -157,7 +160,7 @@ class eWeLinkPlatform {
           if (Array.isArray(val) && val.length > 0) {
             val.forEach(x => {
               if (!x.type || !x.deviceId) {
-                logIgnore(key)
+                logIgnoreItem(key)
                 return
               }
               const deviceId = this.funcs.parseDeviceId(x.deviceId)
@@ -270,7 +273,7 @@ class eWeLinkPlatform {
           if (Array.isArray(val) && val.length > 0) {
             val.forEach(x => {
               if (!x.deviceId) {
-                logIgnore(key)
+                logIgnoreItem(key)
                 return
               }
               const deviceId = this.funcs.parseDeviceId(x.deviceId)
@@ -316,7 +319,7 @@ class eWeLinkPlatform {
           if (Array.isArray(val) && val.length > 0) {
             val.forEach(x => {
               if (!x.deviceId) {
-                logIgnore(key)
+                logIgnoreItem(key)
                 return
               }
               const deviceId = this.funcs.parseDeviceId(x.deviceId)
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index c790e15a..a939f718 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -56,6 +56,7 @@ module.exports = {
     cantParsePacket: 'Could not parse DNS packet as',
     cfgDef: 'is not a valid number so using default of',
     cfgIgn: 'is not configured correctly so ignoring',
+    cfgIgnItem: 'has an invalid entry which will be ignored',
     cfgItem: 'Config entry',
     cfgLow: 'is set too low so increasing to',
     cfgRmv: 'is unused and can be removed',

From 636a365a425cd781ddae9ace4a6ce77fcbf10779 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 7 Feb 2021 19:19:05 +0000
Subject: [PATCH 1341/3183] 4.7.0-0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 9d2be378..b2a5bebb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.6.2-3",
+  "version": "4.7.0-0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index f4292ca1..25863252 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "4.6.2-3",
+  "version": "4.7.0-0",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 99f665dede50e2b58ae239578519462185075952 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 7 Feb 2021 19:53:33 +0000
Subject: [PATCH 1342/3183] device refactor one

---
 lib/device/curtain.js                     | 12 ++++++++----
 lib/device/diffuser.js                    | 14 +++++++++-----
 lib/device/fan.js                         | 12 ++++++++----
 lib/device/light-colour.js                | 14 +++++++++-----
 lib/device/light-ctemp.js                 | 12 ++++++++----
 lib/device/light-dimmer.js                | 12 ++++++++----
 lib/device/outlet.js                      | 12 ++++++++----
 lib/device/rf-bridge.js                   | 12 ++++++++----
 lib/device/scm.js                         | 12 ++++++++----
 lib/device/sensor-ambient.js              | 12 ++++++++----
 lib/device/sensor-contact.js              | 12 ++++++++----
 lib/device/simulation/blind.js            | 12 ++++++++----
 lib/device/simulation/garage-eachen.js    | 12 ++++++++----
 lib/device/simulation/garage-four.js      | 12 ++++++++----
 lib/device/simulation/garage-od-switch.js | 12 ++++++++----
 lib/device/simulation/garage-one.js       | 12 ++++++++----
 lib/device/simulation/garage-two.js       | 12 ++++++++----
 lib/device/simulation/lock-one.js         | 12 ++++++++----
 lib/device/simulation/switch-valve.js     | 12 ++++++++----
 lib/device/simulation/tap-one.js          | 12 ++++++++----
 lib/device/simulation/tap-two.js          | 12 ++++++++----
 lib/device/simulation/thermostat.js       | 12 ++++++++----
 lib/device/simulation/valve-four.js       | 12 ++++++++----
 lib/device/simulation/valve-one.js        | 12 ++++++++----
 lib/device/simulation/valve-two.js        | 12 ++++++++----
 lib/device/switch-multi.js                | 12 ++++++++----
 lib/device/switch-single.js               | 13 ++++++++-----
 lib/device/template.js                    | 12 ++++++++----
 lib/device/usb.js                         | 12 ++++++++----
 lib/device/zigbee/light-dimmer.js         | 12 ++++++++----
 lib/device/zigbee/sensor-ambient.js       | 12 ++++++++----
 lib/device/zigbee/sensor-contact.js       | 12 ++++++++----
 lib/device/zigbee/sensor-motion.js        | 12 ++++++++----
 lib/device/zigbee/switch-single.js        | 12 ++++++++----
 lib/device/zigbee/switch-stateless.js     | 12 ++++++++----
 35 files changed, 282 insertions(+), 143 deletions(-)

diff --git a/lib/device/curtain.js b/lib/device/curtain.js
index dcb6da78..8d01532c 100644
--- a/lib/device/curtain.js
+++ b/lib/device/curtain.js
@@ -1,15 +1,19 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
+
 module.exports = class deviceCurtain {
   constructor (platform, accessory) {
-    this.platform = platform
-    this.funcs = platform.funcs
-    this.messages = platform.messages
-    this.log = platform.log
+    // Set up variables from the platform
     this.disableDeviceLogging = platform.config.disableDeviceLogging
+    this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
+    this.log = platform.log
+    this.messages = platform.messages
+    this.platform = platform
+
+    // Set up variables from the accessory
     this.name = accessory.displayName
     this.accessory = accessory
 
diff --git a/lib/device/diffuser.js b/lib/device/diffuser.js
index 212e3f74..b009f761 100644
--- a/lib/device/diffuser.js
+++ b/lib/device/diffuser.js
@@ -1,16 +1,20 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
+
 module.exports = class deviceDiffuser {
   constructor (platform, accessory) {
-    this.platform = platform
-    this.funcs = platform.funcs
-    this.messages = platform.messages
-    this.log = platform.log
-    this.disableDeviceLogging = platform.config.disableDeviceLogging
+    // Set up variables from the platform
     this.colourUtils = platform.colourUtils
+    this.disableDeviceLogging = platform.config.disableDeviceLogging
+    this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
+    this.log = platform.log
+    this.messages = platform.messages
+    this.platform = platform
+
+    // Set up variables from the accessory
     this.name = accessory.displayName
     this.accessory = accessory
 
diff --git a/lib/device/fan.js b/lib/device/fan.js
index d5194d9c..624d4fa2 100644
--- a/lib/device/fan.js
+++ b/lib/device/fan.js
@@ -1,15 +1,19 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
+
 module.exports = class deviceFan {
   constructor (platform, accessory) {
-    this.platform = platform
-    this.funcs = platform.funcs
-    this.messages = platform.messages
-    this.log = platform.log
+    // Set up variables from the platform
     this.disableDeviceLogging = platform.config.disableDeviceLogging
+    this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
+    this.log = platform.log
+    this.messages = platform.messages
+    this.platform = platform
+
+    // Set up variables from the accessory
     this.name = accessory.displayName
     this.accessory = accessory
 
diff --git a/lib/device/light-colour.js b/lib/device/light-colour.js
index 26a6dbed..8a59519b 100644
--- a/lib/device/light-colour.js
+++ b/lib/device/light-colour.js
@@ -1,16 +1,20 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
+
 module.exports = class deviceLightColour {
   constructor (platform, accessory) {
-    this.platform = platform
-    this.funcs = platform.funcs
-    this.messages = platform.messages
-    this.log = platform.log
-    this.disableDeviceLogging = platform.config.disableDeviceLogging
+    // Set up variables from the platform
     this.colourUtils = platform.colourUtils
+    this.disableDeviceLogging = platform.config.disableDeviceLogging
+    this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
+    this.log = platform.log
+    this.messages = platform.messages
+    this.platform = platform
+
+    // Set up variables from the accessory
     this.name = accessory.displayName
     this.accessory = accessory
 
diff --git a/lib/device/light-ctemp.js b/lib/device/light-ctemp.js
index 0b6fbaef..a712788e 100644
--- a/lib/device/light-ctemp.js
+++ b/lib/device/light-ctemp.js
@@ -1,15 +1,19 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
+
 module.exports = class deviceLightColour {
   constructor (platform, accessory) {
-    this.platform = platform
-    this.funcs = platform.funcs
-    this.messages = platform.messages
-    this.log = platform.log
+    // Set up variables from the platform
     this.disableDeviceLogging = platform.config.disableDeviceLogging
+    this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
+    this.log = platform.log
+    this.messages = platform.messages
+    this.platform = platform
+
+    // Set up variables from the accessory
     this.name = accessory.displayName
     this.accessory = accessory
 
diff --git a/lib/device/light-dimmer.js b/lib/device/light-dimmer.js
index 0e25940b..76886c7b 100644
--- a/lib/device/light-dimmer.js
+++ b/lib/device/light-dimmer.js
@@ -1,15 +1,19 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
+
 module.exports = class deviceLightDimmer {
   constructor (platform, accessory) {
-    this.platform = platform
-    this.funcs = platform.funcs
-    this.messages = platform.messages
-    this.log = platform.log
+    // Set up variables from the platform
     this.disableDeviceLogging = platform.config.disableDeviceLogging
+    this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
+    this.log = platform.log
+    this.messages = platform.messages
+    this.platform = platform
+
+    // Set up variables from the accessory
     this.name = accessory.displayName
     this.accessory = accessory
 
diff --git a/lib/device/outlet.js b/lib/device/outlet.js
index 86de6a1e..a2fa55d3 100644
--- a/lib/device/outlet.js
+++ b/lib/device/outlet.js
@@ -1,16 +1,20 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
+
 module.exports = class deviceOutlet {
   constructor (platform, accessory) {
-    this.platform = platform
+    // Set up variables from the platform
     this.consts = platform.consts
-    this.funcs = platform.funcs
-    this.messages = platform.messages
-    this.log = platform.log
     this.disableDeviceLogging = platform.config.disableDeviceLogging
+    this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
+    this.log = platform.log
+    this.messages = platform.messages
+    this.platform = platform
+
+    // Set up variables from the accessory
     this.name = accessory.displayName
     this.accessory = accessory
 
diff --git a/lib/device/rf-bridge.js b/lib/device/rf-bridge.js
index 7751b2de..7ad82785 100644
--- a/lib/device/rf-bridge.js
+++ b/lib/device/rf-bridge.js
@@ -1,16 +1,20 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
+
 module.exports = class deviceRFBridge {
   constructor (platform, accessory) {
-    this.platform = platform
+    // Set up variables from the platform
     this.consts = platform.consts
-    this.funcs = platform.funcs
-    this.messages = platform.messages
-    this.log = platform.log
     this.disableDeviceLogging = platform.config.disableDeviceLogging
+    this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
+    this.log = platform.log
+    this.messages = platform.messages
+    this.platform = platform
+
+    // Set up variables from the accessory
     this.name = accessory.displayName
     this.accessory = accessory
 
diff --git a/lib/device/scm.js b/lib/device/scm.js
index e88e6152..48b4219b 100644
--- a/lib/device/scm.js
+++ b/lib/device/scm.js
@@ -1,15 +1,19 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
+
 module.exports = class deviceSCM {
   constructor (platform, accessory) {
-    this.platform = platform
-    this.funcs = platform.funcs
-    this.messages = platform.messages
-    this.log = platform.log
+    // Set up variables from the platform
     this.disableDeviceLogging = platform.config.disableDeviceLogging
+    this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
+    this.log = platform.log
+    this.messages = platform.messages
+    this.platform = platform
+
+    // Set up variables from the accessory
     this.name = accessory.displayName
     this.accessory = accessory
 
diff --git a/lib/device/sensor-ambient.js b/lib/device/sensor-ambient.js
index 5fa0d577..a97ac5e1 100644
--- a/lib/device/sensor-ambient.js
+++ b/lib/device/sensor-ambient.js
@@ -1,15 +1,19 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
+
 module.exports = class deviceSensorAmbient {
   constructor (platform, accessory) {
-    this.platform = platform
-    this.funcs = platform.funcs
-    this.messages = platform.messages
-    this.log = platform.log
+    // Set up variables from the platform
     this.disableDeviceLogging = platform.config.disableDeviceLogging
+    this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
+    this.log = platform.log
+    this.messages = platform.messages
+    this.platform = platform
+
+    // Set up variables from the accessory
     this.name = accessory.displayName
     this.accessory = accessory
 
diff --git a/lib/device/sensor-contact.js b/lib/device/sensor-contact.js
index 9a7aa972..a73fa631 100644
--- a/lib/device/sensor-contact.js
+++ b/lib/device/sensor-contact.js
@@ -1,16 +1,20 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
+
 module.exports = class deviceSensorContact {
   constructor (platform, accessory) {
-    this.platform = platform
+    // Set up variables from the platform
     this.consts = platform.consts
-    this.funcs = platform.funcs
-    this.messages = platform.messages
-    this.log = platform.log
     this.disableDeviceLogging = platform.config.disableDeviceLogging
+    this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
+    this.log = platform.log
+    this.messages = platform.messages
+    this.platform = platform
+
+    // Set up variables from the accessory
     this.name = accessory.displayName
     this.accessory = accessory
 
diff --git a/lib/device/simulation/blind.js b/lib/device/simulation/blind.js
index 00496daa..369a8738 100644
--- a/lib/device/simulation/blind.js
+++ b/lib/device/simulation/blind.js
@@ -1,15 +1,19 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
+
 module.exports = class deviceBlind {
   constructor (platform, accessory) {
-    this.platform = platform
-    this.funcs = platform.funcs
-    this.messages = platform.messages
-    this.log = platform.log
+    // Set up variables from the platform
     this.disableDeviceLogging = platform.config.disableDeviceLogging
+    this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
+    this.log = platform.log
+    this.messages = platform.messages
+    this.platform = platform
+
+    // Set up variables from the accessory
     this.name = accessory.displayName
     this.accessory = accessory
 
diff --git a/lib/device/simulation/garage-eachen.js b/lib/device/simulation/garage-eachen.js
index 6481e54c..f1f71431 100644
--- a/lib/device/simulation/garage-eachen.js
+++ b/lib/device/simulation/garage-eachen.js
@@ -1,15 +1,19 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
+
 module.exports = class deviceGarageEachen {
   constructor (platform, accessory) {
-    this.platform = platform
-    this.funcs = platform.funcs
-    this.messages = platform.messages
-    this.log = platform.log
+    // Set up variables from the platform
     this.disableDeviceLogging = platform.config.disableDeviceLogging
+    this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
+    this.log = platform.log
+    this.messages = platform.messages
+    this.platform = platform
+
+    // Set up variables from the accessory
     this.name = accessory.displayName
     this.accessory = accessory
 
diff --git a/lib/device/simulation/garage-four.js b/lib/device/simulation/garage-four.js
index e18d5256..17e7e3a4 100644
--- a/lib/device/simulation/garage-four.js
+++ b/lib/device/simulation/garage-four.js
@@ -1,15 +1,19 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
+
 module.exports = class deviceGarageFour {
   constructor (platform, accessory) {
-    this.platform = platform
-    this.funcs = platform.funcs
-    this.messages = platform.messages
-    this.log = platform.log
+    // Set up variables from the platform
     this.disableDeviceLogging = platform.config.disableDeviceLogging
+    this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
+    this.log = platform.log
+    this.messages = platform.messages
+    this.platform = platform
+
+    // Set up variables from the accessory
     this.name = accessory.displayName
     this.accessory = accessory
 
diff --git a/lib/device/simulation/garage-od-switch.js b/lib/device/simulation/garage-od-switch.js
index 3a7d7ed9..9fb18cde 100644
--- a/lib/device/simulation/garage-od-switch.js
+++ b/lib/device/simulation/garage-od-switch.js
@@ -1,15 +1,19 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
+
 module.exports = class deviceGarageODSwitch {
   constructor (platform, accessory) {
-    this.platform = platform
-    this.funcs = platform.funcs
-    this.messages = platform.messages
-    this.log = platform.log
+    // Set up variables from the platform
     this.disableDeviceLogging = platform.config.disableDeviceLogging
+    this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
+    this.log = platform.log
+    this.messages = platform.messages
+    this.platform = platform
+
+    // Set up variables from the accessory
     this.name = accessory.displayName
     this.accessory = accessory
 
diff --git a/lib/device/simulation/garage-one.js b/lib/device/simulation/garage-one.js
index 28f207f9..85116afe 100644
--- a/lib/device/simulation/garage-one.js
+++ b/lib/device/simulation/garage-one.js
@@ -1,15 +1,19 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
+
 module.exports = class deviceGarageOne {
   constructor (platform, accessory) {
-    this.platform = platform
-    this.funcs = platform.funcs
-    this.messages = platform.messages
-    this.log = platform.log
+    // Set up variables from the platform
     this.disableDeviceLogging = platform.config.disableDeviceLogging
+    this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
+    this.log = platform.log
+    this.messages = platform.messages
+    this.platform = platform
+
+    // Set up variables from the accessory
     this.name = accessory.displayName
     this.accessory = accessory
 
diff --git a/lib/device/simulation/garage-two.js b/lib/device/simulation/garage-two.js
index 872bd3d3..6d661a7c 100644
--- a/lib/device/simulation/garage-two.js
+++ b/lib/device/simulation/garage-two.js
@@ -1,15 +1,19 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
+
 module.exports = class deviceGarageTwo {
   constructor (platform, accessory) {
-    this.platform = platform
-    this.funcs = platform.funcs
-    this.messages = platform.messages
-    this.log = platform.log
+    // Set up variables from the platform
     this.disableDeviceLogging = platform.config.disableDeviceLogging
+    this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
+    this.log = platform.log
+    this.messages = platform.messages
+    this.platform = platform
+
+    // Set up variables from the accessory
     this.name = accessory.displayName
     this.accessory = accessory
 
diff --git a/lib/device/simulation/lock-one.js b/lib/device/simulation/lock-one.js
index 4d88cbf0..22140ad1 100644
--- a/lib/device/simulation/lock-one.js
+++ b/lib/device/simulation/lock-one.js
@@ -1,15 +1,19 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
+
 module.exports = class deviceLockOne {
   constructor (platform, accessory) {
-    this.platform = platform
-    this.funcs = platform.funcs
-    this.messages = platform.messages
-    this.log = platform.log
+    // Set up variables from the platform
     this.disableDeviceLogging = platform.config.disableDeviceLogging
+    this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
+    this.log = platform.log
+    this.messages = platform.messages
+    this.platform = platform
+
+    // Set up variables from the accessory
     this.name = accessory.displayName
     this.accessory = accessory
 
diff --git a/lib/device/simulation/switch-valve.js b/lib/device/simulation/switch-valve.js
index 23ac9c73..d66f4d76 100644
--- a/lib/device/simulation/switch-valve.js
+++ b/lib/device/simulation/switch-valve.js
@@ -1,15 +1,19 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
+
 module.exports = class deviceSwitchValve {
   constructor (platform, accessory) {
-    this.platform = platform
-    this.funcs = platform.funcs
-    this.messages = platform.messages
-    this.log = platform.log
+    // Set up variables from the platform
     this.disableDeviceLogging = platform.config.disableDeviceLogging
+    this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
+    this.log = platform.log
+    this.messages = platform.messages
+    this.platform = platform
+
+    // Set up variables from the accessory
     this.name = accessory.displayName
     this.accessory = accessory
 
diff --git a/lib/device/simulation/tap-one.js b/lib/device/simulation/tap-one.js
index 230ed4a6..d2c69709 100644
--- a/lib/device/simulation/tap-one.js
+++ b/lib/device/simulation/tap-one.js
@@ -1,15 +1,19 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
+
 module.exports = class deviceTapOne {
   constructor (platform, accessory) {
-    this.platform = platform
-    this.funcs = platform.funcs
-    this.messages = platform.messages
-    this.log = platform.log
+    // Set up variables from the platform
     this.disableDeviceLogging = platform.config.disableDeviceLogging
+    this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
+    this.log = platform.log
+    this.messages = platform.messages
+    this.platform = platform
+
+    // Set up variables from the accessory
     this.name = accessory.displayName
     this.accessory = accessory
 
diff --git a/lib/device/simulation/tap-two.js b/lib/device/simulation/tap-two.js
index d5c38f44..91a6eaca 100644
--- a/lib/device/simulation/tap-two.js
+++ b/lib/device/simulation/tap-two.js
@@ -1,15 +1,19 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
+
 module.exports = class deviceTapTwo {
   constructor (platform, accessory) {
-    this.platform = platform
-    this.funcs = platform.funcs
-    this.messages = platform.messages
-    this.log = platform.log
+    // Set up variables from the platform
     this.disableDeviceLogging = platform.config.disableDeviceLogging
+    this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
+    this.log = platform.log
+    this.messages = platform.messages
+    this.platform = platform
+
+    // Set up variables from the accessory
     this.name = accessory.displayName
     this.accessory = accessory
 
diff --git a/lib/device/simulation/thermostat.js b/lib/device/simulation/thermostat.js
index 70d7e1f2..bc5eea45 100644
--- a/lib/device/simulation/thermostat.js
+++ b/lib/device/simulation/thermostat.js
@@ -1,15 +1,19 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
+
 module.exports = class deviceThermostat {
   constructor (platform, accessory) {
-    this.platform = platform
-    this.funcs = platform.funcs
-    this.messages = platform.messages
-    this.log = platform.log
+    // Set up variables from the platform
     this.disableDeviceLogging = platform.config.disableDeviceLogging
+    this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
+    this.log = platform.log
+    this.messages = platform.messages
+    this.platform = platform
+
+    // Set up variables from the accessory
     this.name = accessory.displayName
     this.accessory = accessory
 
diff --git a/lib/device/simulation/valve-four.js b/lib/device/simulation/valve-four.js
index de2f09c6..79cd453f 100644
--- a/lib/device/simulation/valve-four.js
+++ b/lib/device/simulation/valve-four.js
@@ -1,15 +1,19 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
+
 module.exports = class deviceValveFour {
   constructor (platform, accessory) {
-    this.platform = platform
-    this.funcs = platform.funcs
-    this.messages = platform.messages
-    this.log = platform.log
+    // Set up variables from the platform
     this.disableDeviceLogging = platform.config.disableDeviceLogging
+    this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
+    this.log = platform.log
+    this.messages = platform.messages
+    this.platform = platform
+
+    // Set up variables from the accessory
     this.name = accessory.displayName
     this.accessory = accessory
 
diff --git a/lib/device/simulation/valve-one.js b/lib/device/simulation/valve-one.js
index b862a3af..9d3daa42 100644
--- a/lib/device/simulation/valve-one.js
+++ b/lib/device/simulation/valve-one.js
@@ -1,15 +1,19 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
+
 module.exports = class deviceValveOne {
   constructor (platform, accessory) {
-    this.platform = platform
-    this.funcs = platform.funcs
-    this.messages = platform.messages
-    this.log = platform.log
+    // Set up variables from the platform
     this.disableDeviceLogging = platform.config.disableDeviceLogging
+    this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
+    this.log = platform.log
+    this.messages = platform.messages
+    this.platform = platform
+
+    // Set up variables from the accessory
     this.name = accessory.displayName
     this.accessory = accessory
 
diff --git a/lib/device/simulation/valve-two.js b/lib/device/simulation/valve-two.js
index 72cbc92f..41267ea7 100644
--- a/lib/device/simulation/valve-two.js
+++ b/lib/device/simulation/valve-two.js
@@ -1,15 +1,19 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
+
 module.exports = class deviceValveTwo {
   constructor (platform, accessory) {
-    this.platform = platform
-    this.funcs = platform.funcs
-    this.messages = platform.messages
-    this.log = platform.log
+    // Set up variables from the platform
     this.disableDeviceLogging = platform.config.disableDeviceLogging
+    this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
+    this.log = platform.log
+    this.messages = platform.messages
+    this.platform = platform
+
+    // Set up variables from the accessory
     this.name = accessory.displayName
     this.accessory = accessory
 
diff --git a/lib/device/switch-multi.js b/lib/device/switch-multi.js
index 3a1b1443..7a2df03f 100644
--- a/lib/device/switch-multi.js
+++ b/lib/device/switch-multi.js
@@ -1,15 +1,19 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
+
 module.exports = class deviceSwitchMulti {
   constructor (platform, accessory) {
-    this.platform = platform
-    this.funcs = platform.funcs
-    this.messages = platform.messages
-    this.log = platform.log
+    // Set up variables from the platform
     this.disableDeviceLogging = platform.config.disableDeviceLogging
+    this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
+    this.log = platform.log
+    this.messages = platform.messages
+    this.platform = platform
+
+    // Set up variables from the accessory
     this.name = accessory.displayName
     this.accessory = accessory
 
diff --git a/lib/device/switch-single.js b/lib/device/switch-single.js
index fc00e778..0c1a1f40 100644
--- a/lib/device/switch-single.js
+++ b/lib/device/switch-single.js
@@ -1,16 +1,19 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
+
 module.exports = class deviceSwitchSingle {
   constructor (platform, accessory) {
-    this.platform = platform
-    this.funcs = platform.funcs
-    this.messages = platform.messages
-    this.log = platform.log
+    // Set up variables from the platform
     this.disableDeviceLogging = platform.config.disableDeviceLogging
-    this.consts = platform.helpers
+    this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
+    this.log = platform.log
+    this.messages = platform.messages
+    this.platform = platform
+
+    // Set up variables from the accessory
     this.name = accessory.displayName
     this.accessory = accessory
 
diff --git a/lib/device/template.js b/lib/device/template.js
index dfd0b248..c6b8a4d5 100644
--- a/lib/device/template.js
+++ b/lib/device/template.js
@@ -1,15 +1,19 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
+
 module.exports = class deviceTemplate {
   constructor (platform, accessory) {
-    this.platform = platform
-    this.funcs = platform.funcs
-    this.messages = platform.messages
-    this.log = platform.log
+    // Set up variables from the platform
     this.disableDeviceLogging = platform.config.disableDeviceLogging
+    this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
+    this.log = platform.log
+    this.messages = platform.messages
+    this.platform = platform
+
+    // Set up variables from the accessory
     this.name = accessory.displayName
     this.accessory = accessory
 
diff --git a/lib/device/usb.js b/lib/device/usb.js
index dfcb1b04..f4a10ce4 100644
--- a/lib/device/usb.js
+++ b/lib/device/usb.js
@@ -1,15 +1,19 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
+
 module.exports = class deviceUSB {
   constructor (platform, accessory) {
-    this.platform = platform
-    this.funcs = platform.funcs
-    this.messages = platform.messages
-    this.log = platform.log
+    // Set up variables from the platform
     this.disableDeviceLogging = platform.config.disableDeviceLogging
+    this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
+    this.log = platform.log
+    this.messages = platform.messages
+    this.platform = platform
+
+    // Set up variables from the accessory
     this.name = accessory.displayName
     this.accessory = accessory
 
diff --git a/lib/device/zigbee/light-dimmer.js b/lib/device/zigbee/light-dimmer.js
index bc4a35ba..a1f9f244 100644
--- a/lib/device/zigbee/light-dimmer.js
+++ b/lib/device/zigbee/light-dimmer.js
@@ -1,15 +1,19 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
+
 module.exports = class deviceZBLightDimmer {
   constructor (platform, accessory) {
-    this.platform = platform
-    this.funcs = platform.funcs
-    this.messages = platform.messages
-    this.log = platform.log
+    // Set up variables from the platform
     this.disableDeviceLogging = platform.config.disableDeviceLogging
+    this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
+    this.log = platform.log
+    this.messages = platform.messages
+    this.platform = platform
+
+    // Set up variables from the accessory
     this.name = accessory.displayName
     this.accessory = accessory
 
diff --git a/lib/device/zigbee/sensor-ambient.js b/lib/device/zigbee/sensor-ambient.js
index 2a5960c2..5594170e 100644
--- a/lib/device/zigbee/sensor-ambient.js
+++ b/lib/device/zigbee/sensor-ambient.js
@@ -1,15 +1,19 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
+
 module.exports = class deviceZBSensorAmbient {
   constructor (platform, accessory) {
-    this.platform = platform
-    this.funcs = platform.funcs
-    this.messages = platform.messages
-    this.log = platform.log
+    // Set up variables from the platform
     this.disableDeviceLogging = platform.config.disableDeviceLogging
+    this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
+    this.log = platform.log
+    this.messages = platform.messages
+    this.platform = platform
+
+    // Set up variables from the accessory
     this.name = accessory.displayName
     this.accessory = accessory
 
diff --git a/lib/device/zigbee/sensor-contact.js b/lib/device/zigbee/sensor-contact.js
index 0698de0e..e91f5bd6 100644
--- a/lib/device/zigbee/sensor-contact.js
+++ b/lib/device/zigbee/sensor-contact.js
@@ -1,16 +1,20 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
+
 module.exports = class deviceZBSensorContact {
   constructor (platform, accessory) {
-    this.platform = platform
+    // Set up variables from the platform
     this.consts = platform.consts
-    this.funcs = platform.funcs
-    this.messages = platform.messages
-    this.log = platform.log
     this.disableDeviceLogging = platform.config.disableDeviceLogging
+    this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
+    this.log = platform.log
+    this.messages = platform.messages
+    this.platform = platform
+
+    // Set up variables from the accessory
     this.name = accessory.displayName
     this.accessory = accessory
 
diff --git a/lib/device/zigbee/sensor-motion.js b/lib/device/zigbee/sensor-motion.js
index 3b9a813e..86b81256 100644
--- a/lib/device/zigbee/sensor-motion.js
+++ b/lib/device/zigbee/sensor-motion.js
@@ -1,16 +1,20 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
+
 module.exports = class deviceZBSensorMotion {
   constructor (platform, accessory) {
-    this.platform = platform
+    // Set up variables from the platform
     this.consts = platform.consts
-    this.funcs = platform.funcs
-    this.messages = platform.messages
-    this.log = platform.log
     this.disableDeviceLogging = platform.config.disableDeviceLogging
+    this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
+    this.log = platform.log
+    this.messages = platform.messages
+    this.platform = platform
+
+    // Set up variables from the accessory
     this.name = accessory.displayName
     this.accessory = accessory
 
diff --git a/lib/device/zigbee/switch-single.js b/lib/device/zigbee/switch-single.js
index 5d255e15..b7bc569c 100644
--- a/lib/device/zigbee/switch-single.js
+++ b/lib/device/zigbee/switch-single.js
@@ -1,15 +1,19 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
+
 module.exports = class deviceZBSwitchSingle {
   constructor (platform, accessory) {
-    this.platform = platform
-    this.funcs = platform.funcs
-    this.messages = platform.messages
-    this.log = platform.log
+    // Set up variables from the platform
     this.disableDeviceLogging = platform.config.disableDeviceLogging
+    this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
+    this.log = platform.log
+    this.messages = platform.messages
+    this.platform = platform
+
+    // Set up variables from the accessory
     this.name = accessory.displayName
     this.accessory = accessory
 
diff --git a/lib/device/zigbee/switch-stateless.js b/lib/device/zigbee/switch-stateless.js
index 435b4cc2..b8626dac 100644
--- a/lib/device/zigbee/switch-stateless.js
+++ b/lib/device/zigbee/switch-stateless.js
@@ -1,15 +1,19 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
 'use strict'
+
 module.exports = class deviceZBSwitchStateless {
   constructor (platform, accessory) {
-    this.platform = platform
-    this.funcs = platform.funcs
-    this.messages = platform.messages
-    this.log = platform.log
+    // Set up variables from the platform
     this.disableDeviceLogging = platform.config.disableDeviceLogging
+    this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
+    this.log = platform.log
+    this.messages = platform.messages
+    this.platform = platform
+
+    // Set up variables from the accessory
     this.name = accessory.displayName
     this.accessory = accessory
 

From f6648d535666284430c73ffd851bdffc5d86693f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 7 Feb 2021 22:13:00 +0000
Subject: [PATCH 1343/3183] queue for updates

---
 lib/device/diffuser.js            | 11 ++---
 lib/device/light-colour.js        |  6 +--
 lib/device/light-ctemp.js         |  4 +-
 lib/device/light-dimmer.js        | 10 ++++-
 lib/device/switch-multi.js        |  2 +-
 lib/device/switch-single.js       |  2 +-
 lib/device/zigbee/light-dimmer.js |  2 +-
 lib/index.js                      | 74 +++++++++++++++++--------------
 8 files changed, 60 insertions(+), 51 deletions(-)

diff --git a/lib/device/diffuser.js b/lib/device/diffuser.js
index b009f761..a9b17bed 100644
--- a/lib/device/diffuser.js
+++ b/lib/device/diffuser.js
@@ -74,7 +74,7 @@ module.exports = class deviceDiffuser {
       const params = { state: this.cacheSpeed / 50 }
       const updateKeySpeed = Math.random().toString(36).substr(2, 8)
       this.updateKeySpeed = updateKeySpeed
-      await this.funcs.sleep(500)
+      await this.funcs.sleep(450)
       if (updateKeySpeed !== this.updateKeySpeed) {
         return
       }
@@ -103,11 +103,6 @@ module.exports = class deviceDiffuser {
       this.cacheLightOnOff = onoff
       const params = { lightswitch: this.cacheLightOnOff }
       const updateKeyLight = Math.random().toString(36).substr(2, 8)
-      this.updateKeyLight = updateKeyLight
-      await this.funcs.sleep(250)
-      if (updateKeyLight !== this.updateKeyLight) {
-        return
-      }
       this.updateTimeout = updateKeyLight
       setTimeout(() => {
         if (this.updateTimeout === updateKeyLight) {
@@ -134,7 +129,7 @@ module.exports = class deviceDiffuser {
       const updateKeyBright = Math.random().toString(36).substr(2, 8)
       this.updateKeyBright = updateKeyBright
       const params = { lightbright: this.cacheBrightness }
-      await this.funcs.sleep(500)
+      await this.funcs.sleep(450)
       if (updateKeyBright !== this.updateKeyBright) {
         return
       }
@@ -175,7 +170,7 @@ module.exports = class deviceDiffuser {
         lightGcolor: this.cacheG,
         lightBcolor: this.cacheB
       }
-      await this.funcs.sleep(1500)
+      await this.funcs.sleep(350)
       if (updateKeyColour !== this.updateKeyColour) {
         return
       }
diff --git a/lib/device/light-colour.js b/lib/device/light-colour.js
index 8a59519b..db81867a 100644
--- a/lib/device/light-colour.js
+++ b/lib/device/light-colour.js
@@ -121,7 +121,7 @@ module.exports = class deviceLightColour {
           }
           break
       }
-      await this.funcs.sleep(750)
+      await this.funcs.sleep(450)
       if (updateKeyBright !== this.updateKeyBright) {
         return
       }
@@ -194,7 +194,7 @@ module.exports = class deviceLightColour {
           this.cacheMode = 'color'
           break
       }
-      await this.funcs.sleep(1500)
+      await this.funcs.sleep(350)
       if (updateKeyColour !== this.updateKeyColour) {
         return
       }
@@ -261,7 +261,7 @@ module.exports = class deviceLightColour {
           this.cacheMode = 'white'
           break
       }
-      await this.funcs.sleep(1500)
+      await this.funcs.sleep(350)
       if (updateKeyCT !== this.updateKeyCT) {
         return
       }
diff --git a/lib/device/light-ctemp.js b/lib/device/light-ctemp.js
index a712788e..58787aef 100644
--- a/lib/device/light-ctemp.js
+++ b/lib/device/light-ctemp.js
@@ -83,7 +83,7 @@ module.exports = class deviceLightColour {
           ct: this.cacheCT
         }
       }
-      await this.funcs.sleep(750)
+      await this.funcs.sleep(450)
       if (updateKeyBright !== this.updateKeyBright) {
         return
       }
@@ -120,7 +120,7 @@ module.exports = class deviceLightColour {
           ct: this.cacheCT
         }
       }
-      await this.funcs.sleep(1500)
+      await this.funcs.sleep(350)
       if (updateKeyCT !== this.updateKeyCT) {
         return
       }
diff --git a/lib/device/light-dimmer.js b/lib/device/light-dimmer.js
index 76886c7b..16b38df5 100644
--- a/lib/device/light-dimmer.js
+++ b/lib/device/light-dimmer.js
@@ -17,9 +17,15 @@ module.exports = class deviceLightDimmer {
     this.name = accessory.displayName
     this.accessory = accessory
 
-    this.service = this.accessory.getService(this.hapServ.Lightbulb) || this.accessory.addService(this.hapServ.Lightbulb)
+    // Add the lightbulb service if it doesn't already exist
+    this.service = this.accessory.getService(this.hapServ.Lightbulb) ||
+      this.accessory.addService(this.hapServ.Lightbulb)
+
+    // Add the set handler to the lightbulb on/off characteristic
     this.service.getCharacteristic(this.hapChar.On)
       .on('set', this.internalOnOffUpdate.bind(this))
+
+    // Add the set handler to the lightbulb brightness characteristic
     this.service.getCharacteristic(this.hapChar.Brightness)
       .on('set', this.internalBrightnessUpdate.bind(this))
   }
@@ -65,7 +71,7 @@ module.exports = class deviceLightDimmer {
       }
       const updateKey = Math.random().toString(36).substr(2, 8)
       this.updateKeyBright = updateKey
-      await this.funcs.sleep(500)
+      await this.funcs.sleep(350)
       if (updateKey !== this.updateKeyBright) {
         return
       }
diff --git a/lib/device/switch-multi.js b/lib/device/switch-multi.js
index 7a2df03f..177926d1 100644
--- a/lib/device/switch-multi.js
+++ b/lib/device/switch-multi.js
@@ -29,7 +29,7 @@ module.exports = class deviceSwitchMulti {
 
   async internalUpdate (value, callback) {
     try {
-      await this.funcs.sleep(Math.floor(Math.random() * 491 + 10))
+      await this.funcs.sleep(Math.floor(Math.random() * 241 + 10))
       callback()
       let oAccessory
       let masterState = 'off'
diff --git a/lib/device/switch-single.js b/lib/device/switch-single.js
index 0c1a1f40..861a08a0 100644
--- a/lib/device/switch-single.js
+++ b/lib/device/switch-single.js
@@ -32,7 +32,7 @@ module.exports = class deviceSwitchSingle {
 
   async internalUpdate (value, callback) {
     try {
-      await this.funcs.sleep(Math.floor(Math.random() * 491 + 10))
+      await this.funcs.sleep(Math.floor(Math.random() * 241 + 10))
       callback()
       await this.platform.sendDeviceUpdate(this.accessory, {
         switch: value ? 'on' : 'off'
diff --git a/lib/device/zigbee/light-dimmer.js b/lib/device/zigbee/light-dimmer.js
index a1f9f244..5be1cbc0 100644
--- a/lib/device/zigbee/light-dimmer.js
+++ b/lib/device/zigbee/light-dimmer.js
@@ -53,7 +53,7 @@ module.exports = class deviceZBLightDimmer {
       }
       const updateKey = Math.random().toString(36).substr(2, 8)
       this.updateKeyBright = updateKey
-      await this.funcs.sleep(500)
+      await this.funcs.sleep(350)
       if (updateKey !== this.updateKeyBright) {
         return
       }
diff --git a/lib/index.js b/lib/index.js
index e1d749fd..85290c96 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -382,6 +382,14 @@ class eWeLinkPlatform {
       this.crypto = require('crypto')
       this.colourUtils = require('./utils/colour-utils')
       this.eveService = require('./fakegato/fakegato-history')(this.api)
+      const { default: PQueue } = require('p-queue')
+
+      // Create the queue used for HTTP requests
+      this.queue = new PQueue({
+        concurrency: 1,
+        interval: 500,
+        intervalCap: 1
+      })
 
       // Set up the HTTP client, get the user HTTP host, and login
       this.httpClient = new (require('./connection/http'))(this)
@@ -1201,49 +1209,49 @@ class eWeLinkPlatform {
   }
 
   async sendDeviceUpdate (accessory, params) {
-    // Add a random delay of [1, 250]ms to avoid multiple http/ws requests at once
-    await this.funcs.sleep(Math.floor(Math.random() * 250 + 1))
-
+    // Add to a queue so multiple updates are at least 500ms apart
+    return await this.queue.add(async () => {
     // Log the update being sent
-    if (this.config.debug) {
-      const str = JSON.stringify(params)
-      this.log('[%s] %s %s.', accessory.displayName, this.messages.updSend, str)
-    }
+      if (this.config.debug) {
+        const str = JSON.stringify(params)
+        this.log('[%s] %s %s.', accessory.displayName, this.messages.updSend, str)
+      }
 
-    // Set up the payload to send via LAN/WS
-    const payload = {
-      apikey: accessory.context.eweApiKey,
-      deviceid: accessory.context.eweDeviceId,
-      params
-    }
+      // Set up the payload to send via LAN/WS
+      const payload = {
+        apikey: accessory.context.eweApiKey,
+        deviceid: accessory.context.eweDeviceId,
+        params
+      }
 
-    // Quick check to see if LAN mode is supported
-    const res = !this.lanClient
-      ? this.messages.lanDisabled
-      : !this.consts.devices.lan.includes(accessory.context.eweUIID)
-        ? this.messages.lanNotSup
-        : await this.lanClient.sendUpdate(payload)
+      // Quick check to see if LAN mode is supported
+      const res = !this.lanClient
+        ? this.messages.lanDisabled
+        : !this.consts.devices.lan.includes(accessory.context.eweUIID)
+          ? this.messages.lanNotSup
+          : await this.lanClient.sendUpdate(payload)
 
-    // Revert to WS if LAN mode not possible for whatever reason
-    if (res !== 'ok') {
+      // Revert to WS if LAN mode not possible for whatever reason
+      if (res !== 'ok') {
       // Check to see if the device is online
-      if (this.wsClient && accessory.context.reachableWAN) {
+        if (this.wsClient && accessory.context.reachableWAN) {
         // Log the revert if appropriate
-        if (this.config.debug) {
-          this.log('[%s] %s %s.', accessory.displayName, this.messages.revertWS, res)
-        }
+          if (this.config.debug) {
+            this.log('[%s] %s %s.', accessory.displayName, this.messages.revertWS, res)
+          }
 
-        // Device is online via WS so sent the update
-        await this.wsClient.sendUpdate(payload)
-      } else {
+          // Device is online via WS so sent the update
+          await this.wsClient.sendUpdate(payload)
+        } else {
         // Device isn't online via WS so report the error back
-        let eText = this.messages.unreachable
-        if ([this.messages.lanDisabled, this.messages.lanNotSup].includes(res)) {
-          eText += ' [' + res + ']'
+          let eText = this.messages.unreachable
+          if ([this.messages.lanDisabled, this.messages.lanNotSup].includes(res)) {
+            eText += ' [' + res + ']'
+          }
+          throw new Error(eText)
         }
-        throw new Error(eText)
       }
-    }
+    })
   }
 
   async receiveDeviceUpdate (device) {

From 1dc4a911a68354fc0ebe918db1584d3fbcdc8dc4 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 7 Feb 2021 22:13:06 +0000
Subject: [PATCH 1344/3183] add p-queue

---
 package-lock.json | 27 +++++++++++++++++++++++++++
 package.json      |  1 +
 2 files changed, 28 insertions(+)

diff --git a/package-lock.json b/package-lock.json
index b2a5bebb..75945196 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -67,6 +67,11 @@
         "is-symbol": "^1.0.2"
       }
     },
+    "eventemitter3": {
+      "version": "4.0.7",
+      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
+      "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="
+    },
     "follow-redirects": {
       "version": "1.13.2",
       "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.2.tgz",
@@ -153,6 +158,28 @@
         "object-keys": "^1.1.1"
       }
     },
+    "p-finally": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
+      "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4="
+    },
+    "p-queue": {
+      "version": "6.6.2",
+      "resolved": "https://registry.npmjs.org/p-queue/-/p-queue-6.6.2.tgz",
+      "integrity": "sha512-RwFpb72c/BhQLEXIZ5K2e+AhgNVmIejGlTgiB9MzZ0e93GRvqZ7uSi0dvRF7/XIXDeNkra2fNHBxTyPDGySpjQ==",
+      "requires": {
+        "eventemitter3": "^4.0.4",
+        "p-timeout": "^3.2.0"
+      }
+    },
+    "p-timeout": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-3.2.0.tgz",
+      "integrity": "sha512-rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg==",
+      "requires": {
+        "p-finally": "^1.0.0"
+      }
+    },
     "promise-controller": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/promise-controller/-/promise-controller-1.0.0.tgz",
diff --git a/package.json b/package.json
index 25863252..276d91da 100644
--- a/package.json
+++ b/package.json
@@ -50,6 +50,7 @@
     "@homebridge/plugin-ui-utils": "^0.0.18",
     "axios": "^0.21.1",
     "node-dns-sd": "^0.4.2",
+    "p-queue": "^6.6.2",
     "websocket-as-promised": "^1.1.0",
     "ws": "^7.4.3"
   },

From 97c68e4b6215b516edbd2da3eebbe242b8467a77 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 7 Feb 2021 22:13:12 +0000
Subject: [PATCH 1345/3183] formatting

---
 lib/device/curtain.js      |  6 +++-
 lib/device/diffuser.js     | 21 +++++++++++--
 lib/device/fan.js          | 20 ++++++++++--
 lib/device/light-colour.js | 64 ++++++++++++++++++++++++--------------
 lib/device/light-ctemp.js  | 26 +++++++++++++---
 5 files changed, 104 insertions(+), 33 deletions(-)

diff --git a/lib/device/curtain.js b/lib/device/curtain.js
index 8d01532c..cf8adcc0 100644
--- a/lib/device/curtain.js
+++ b/lib/device/curtain.js
@@ -17,7 +17,11 @@ module.exports = class deviceCurtain {
     this.name = accessory.displayName
     this.accessory = accessory
 
-    this.service = this.accessory.getService(this.hapServ.WindowCovering) || this.accessory.addService(this.hapServ.WindowCovering)
+    // Add the window covering service if it doesn't already exist
+    this.service = this.accessory.getService(this.hapServ.WindowCovering) ||
+      this.accessory.addService(this.hapServ.WindowCovering)
+
+    // Add the set handler to the target position characteristic
     this.service.getCharacteristic(this.hapChar.TargetPosition)
       .on('set', this.internalUpdate.bind(this))
   }
diff --git a/lib/device/diffuser.js b/lib/device/diffuser.js
index a9b17bed..5907e8ee 100644
--- a/lib/device/diffuser.js
+++ b/lib/device/diffuser.js
@@ -18,19 +18,36 @@ module.exports = class deviceDiffuser {
     this.name = accessory.displayName
     this.accessory = accessory
 
-    this.fanService = this.accessory.getService('Diffuser') || this.accessory.addService(this.hapServ.Fan, 'Diffuser', 'diffuser')
-    this.lightService = this.accessory.getService('Light') || this.accessory.addService(this.hapServ.Lightbulb, 'Light', 'light')
+    // Add the fan service if it doesn't already exist
+    this.fanService = this.accessory.getService('Diffuser') ||
+      this.accessory.addService(this.hapServ.Fan, 'Diffuser', 'diffuser')
+
+    // Add the lightbulb service if it doesn't already exist
+    this.lightService = this.accessory.getService('Light') ||
+      this.accessory.addService(this.hapServ.Lightbulb, 'Light', 'light')
+
+    // Add the set handler to the fan on/off characteristic
     this.fanService.getCharacteristic(this.hapChar.On)
       .on('set', this.internalDiffuserOnOffUpdate.bind(this))
+
+    // Add the set handler to the fan rotation characteristic
     this.fanService.getCharacteristic(this.hapChar.RotationSpeed)
       .on('set', this.internalDiffuserSpeedUpdate.bind(this))
       .setProps({ minStep: 50 })
+
+    // Add the set handler to the lightbulb on/off characteristic
     this.lightService.getCharacteristic(this.hapChar.On)
       .on('set', this.internalLightOnOffUpdate.bind(this))
+
+    // Add the set handler to the lightbulb brightness characteristic
     this.lightService.getCharacteristic(this.hapChar.Brightness)
       .on('set', this.internalLightBrightnessUpdate.bind(this))
+
+    // Add the set handler to the lightbulb hue characteristic
     this.lightService.getCharacteristic(this.hapChar.Hue)
       .on('set', this.internalLightColourUpdate.bind(this))
+
+    // Add the set handler to the lightbulb saturation characteristic
     this.lightService.getCharacteristic(this.hapChar.Saturation)
       .on('set', (value, callback) => callback())
   }
diff --git a/lib/device/fan.js b/lib/device/fan.js
index 624d4fa2..b1e16dc9 100644
--- a/lib/device/fan.js
+++ b/lib/device/fan.js
@@ -17,7 +17,11 @@ module.exports = class deviceFan {
     this.name = accessory.displayName
     this.accessory = accessory
 
-    this.service = this.accessory.getService(this.hapServ.Fan) || this.accessory.addService(this.hapServ.Fan)
+    // Add the fan service if it doesn't already exist
+    this.service = this.accessory.getService(this.hapServ.Fan) ||
+      this.accessory.addService(this.hapServ.Fan)
+
+    // Add the set handler to the fan on/off characteristic
     this.service.getCharacteristic(this.hapChar.On)
       .on('set', (value, callback) => {
         callback()
@@ -25,15 +29,25 @@ module.exports = class deviceFan {
           this.service.setCharacteristic(this.hapChar.RotationSpeed, 0)
         }
       })
+
+    // Add the set handler to the fan rotation speed characteristic
     this.service.getCharacteristic(this.hapChar.RotationSpeed)
       .on('set', this.internalSpeedUpdate.bind(this))
       .setProps({ minStep: 33 })
-    if ((this.platform.config.hideLightFromFan || '').split(',').includes(this.accessory.context.eweDeviceId)) {
+
+    // Check to see if the user has hidden the light channel
+    const eweId = this.accessory.context.eweDeviceId
+    if (this.platform.config.hideLightFromFan.includes(eweId)) {
+      // The user has hidden the light channel, so remove it if it exists
       if (this.accessory.getService(this.hapServ.Lightbulb)) {
         this.accessory.removeService(this.accessory.getService(this.hapServ.Lightbulb))
       }
     } else {
-      this.lightService = this.accessory.getService(this.hapServ.Lightbulb) || this.accessory.addService(this.hapServ.Lightbulb)
+      // The user has not hidden the light channel, so add it if it doesn't exist
+      this.lightService = this.accessory.getService(this.hapServ.Lightbulb) ||
+        this.accessory.addService(this.hapServ.Lightbulb)
+
+      // Add the set handler to the lightbulb on/off characteristic
       this.lightService.getCharacteristic(this.hapChar.On)
         .on('set', this.internalLightUpdate.bind(this))
     }
diff --git a/lib/device/light-colour.js b/lib/device/light-colour.js
index db81867a..416bad01 100644
--- a/lib/device/light-colour.js
+++ b/lib/device/light-colour.js
@@ -17,31 +17,49 @@ module.exports = class deviceLightColour {
     // Set up variables from the accessory
     this.name = accessory.displayName
     this.accessory = accessory
-
     this.isB1 = this.accessory.context.eweUIID === 22
 
-    this.service = this.accessory.getService(this.hapServ.Lightbulb) || this.accessory.addService(this.hapServ.Lightbulb)
+    // Add the lightbulb service if it doesn't already exist
+    this.service = this.accessory.getService(this.hapServ.Lightbulb) ||
+      this.accessory.addService(this.hapServ.Lightbulb)
+
+    // Add the set handler to the lightbulb on/off characteristic
     this.service.getCharacteristic(this.hapChar.On)
       .on('set', this.internalOnOffUpdate.bind(this))
+
+    // Add the set handler to the lightbulb brightness characteristic
     this.service.getCharacteristic(this.hapChar.Brightness)
       .on('set', this.internalBrightnessUpdate.bind(this))
+
+    // Add the set handler to the lightbulb hue characteristic
     this.service.getCharacteristic(this.hapChar.Hue)
       .on('set', this.internalColourUpdate.bind(this))
+
+    // Add the set handler to the lightbulb saturation characteristic
     this.service.getCharacteristic(this.hapChar.Saturation)
       .on('set', (value, callback) => callback())
+
     if (this.isB1) {
-      // *** B1 doesn't support brightness *** \\
+      // B1 doesn't support brightness so set a minimum step (ie on or off)
       this.service.getCharacteristic(this.hapChar.Brightness)
         .setProps({ minStep: 100 })
     }
 
+    // Some bulbs support cct with a range of 2700K-6500K corresponding to ewelink 0-255
     if ([59, 104].includes(this.accessory.context.eweUIID)) {
-      // HomeKit has a range of 140-500M corresponding to 2000-7143K
-      // Devices have a range of 2700K-6500K corresponding to ewelink ct: 0-255
+      // Add the set handler to the lightbulb colour temperature characteristic
       this.service.getCharacteristic(this.hapChar.ColorTemperature)
         .on('set', this.internalCTempUpdate.bind(this))
-      if (platform.api.versionGreaterOrEqual && platform.api.versionGreaterOrEqual('1.3.0-beta.46')) {
-        this.cacheBrightness = this.service.getCharacteristic(this.hapChar.Brightness).value
+
+      // Setup the adaptive lighting controller if available
+      if (
+        platform.api.versionGreaterOrEqual &&
+        platform.api.versionGreaterOrEqual('1.3.0-beta.46')
+      ) {
+        // This is needed as sometimes we need to send the brightness with a cct update
+        this.cacheBright = this.service.getCharacteristic(this.hapChar.Brightness).value
+
+        // Setup the adaptive lighting controller
         this.alController = new platform.api.hap.AdaptiveLightingController(this.service)
         this.accessory.configureController(this.alController)
       }
@@ -80,11 +98,11 @@ module.exports = class deviceLightColour {
 
   async internalBrightnessUpdate (value, callback) {
     try {
-      if (this.cacheBrightness === value) {
+      if (this.cacheBright === value) {
         callback()
         return
       }
-      this.cacheBrightness = value
+      this.cacheBright = value
       callback()
       let params
       const updateKeyBright = Math.random().toString(36).substr(2, 8)
@@ -185,7 +203,7 @@ module.exports = class deviceLightColour {
           params = {
             ltype: this.cacheMode === 'color' ? undefined : 'color',
             color: {
-              br: this.cacheBrightness,
+              br: this.cacheBright,
               r: this.cacheR,
               g: this.cacheG,
               b: this.cacheB
@@ -254,7 +272,7 @@ module.exports = class deviceLightColour {
           params = {
             ltype: this.cacheMode === 'white' ? undefined : 'white',
             white: {
-              br: this.cacheBrightness,
+              br: this.cacheBright,
               ct: this.cacheCT
             }
           }
@@ -347,11 +365,11 @@ module.exports = class deviceLightColour {
         case 59:
           // *** L1 *** \\
           if (this.funcs.hasProperty(params, 'bright')) {
-            if (params.bright !== this.cacheBrightness) {
-              this.cacheBrightness = params.bright
-              this.service.updateCharacteristic(this.hapChar.Brightness, this.cacheBrightness)
+            if (params.bright !== this.cacheBright) {
+              this.cacheBright = params.bright
+              this.service.updateCharacteristic(this.hapChar.Brightness, this.cacheBright)
               if (params.updateSource && !this.disableDeviceLogging) {
-                this.log('[%s] current brightness [%s%].', this.name, this.cacheBrightness)
+                this.log('[%s] current brightness [%s%].', this.name, this.cacheBright)
               }
             }
           }
@@ -385,11 +403,11 @@ module.exports = class deviceLightColour {
           // *** B02-B-A60, B05-B-A60, GTLC104 *** \\
           if (params.ltype === 'color' && params.color) {
             if (this.funcs.hasProperty(params.color, 'br')) {
-              if (params.color.br !== this.cacheBrightness) {
-                this.cacheBrightness = params.color.br
-                this.service.updateCharacteristic(this.hapChar.Brightness, this.cacheBrightness)
+              if (params.color.br !== this.cacheBright) {
+                this.cacheBright = params.color.br
+                this.service.updateCharacteristic(this.hapChar.Brightness, this.cacheBright)
                 if (params.updateSource && !this.disableDeviceLogging) {
-                  this.log('[%s] current brightness [%s%].', this.name, this.cacheBrightness)
+                  this.log('[%s] current brightness [%s%].', this.name, this.cacheBright)
                 }
               }
             }
@@ -422,11 +440,11 @@ module.exports = class deviceLightColour {
           }
           if (params.ltype === 'white' && params.white) {
             if (this.funcs.hasProperty(params.white, 'br')) {
-              if (params.white.br !== this.cacheBrightness || this.cacheMode !== 'white') {
-                this.cacheBrightness = params.white.br
-                this.service.updateCharacteristic(this.hapChar.Brightness, this.cacheBrightness)
+              if (params.white.br !== this.cacheBright || this.cacheMode !== 'white') {
+                this.cacheBright = params.white.br
+                this.service.updateCharacteristic(this.hapChar.Brightness, this.cacheBright)
                 if (params.updateSource && !this.disableDeviceLogging) {
-                  this.log('[%s] current brightness [%s%].', this.name, this.cacheBrightness)
+                  this.log('[%s] current brightness [%s%].', this.name, this.cacheBright)
                 }
               }
             }
diff --git a/lib/device/light-ctemp.js b/lib/device/light-ctemp.js
index 58787aef..c46d456a 100644
--- a/lib/device/light-ctemp.js
+++ b/lib/device/light-ctemp.js
@@ -17,25 +17,43 @@ module.exports = class deviceLightColour {
     this.name = accessory.displayName
     this.accessory = accessory
 
-    this.service = this.accessory.getService(this.hapServ.Lightbulb) || this.accessory.addService(this.hapServ.Lightbulb)
+    // Add the lightbulb service if it doesn't already exist
+    this.service = this.accessory.getService(this.hapServ.Lightbulb) ||
+      this.accessory.addService(this.hapServ.Lightbulb)
+
+    // Add the set handler to the lightbulb on/off characteristic
     this.service.getCharacteristic(this.hapChar.On)
       .on('set', this.internalOnOffUpdate.bind(this))
+
+    // Add the set handler to the lightbulb brightness characteristic
     this.service.getCharacteristic(this.hapChar.Brightness)
       .on('set', this.internalBrightnessUpdate.bind(this))
+
+    // Add the set handler to the lightbulb colour temperature characteristic
     this.service.getCharacteristic(this.hapChar.ColorTemperature)
       .on('set', this.internalCTempUpdate.bind(this))
-    if ((this.platform.config.bulbB02FST64 || '').split(',').includes(this.accessory.context.eweDeviceId)) {
+
+    // Different bulbs have different colour temperature ranges
+    if (platform.config.bulbB02FST64.includes(this.accessory.context.eweDeviceId)) {
       this.minK = 1800
       this.maxK = 5000
-    } else if ((this.platform.config.bulbB02BA60 || '').split(',').includes(this.accessory.context.eweDeviceId)) {
+    } else if (platform.config.bulbB02BA60.includes(this.accessory.context.eweDeviceId)) {
       this.minK = 2700
       this.maxK = 6500
     } else {
       this.minK = 2200
       this.maxK = 6500
     }
-    if (platform.api.versionGreaterOrEqual && platform.api.versionGreaterOrEqual('1.3.0-beta.46')) {
+
+    // Setup the adaptive lighting controller if available
+    if (
+      platform.api.versionGreaterOrEqual &&
+      platform.api.versionGreaterOrEqual('1.3.0-beta.46')
+    ) {
+      // This is needed as sometimes we need to send the brightness with a cct update
       this.cacheBrightness = this.service.getCharacteristic(this.hapChar.Brightness).value
+
+      // Setup the adaptive lighting controller
       this.alController = new platform.api.hap.AdaptiveLightingController(this.service)
       this.accessory.configureController(this.alController)
     }

From a065a16a7be60f9a4ac5f7e66c3936406c4c4ba8 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 7 Feb 2021 22:14:29 +0000
Subject: [PATCH 1346/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e9f24104..efaaddb8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 ### Added
 
+* A queue for device updates to improve reliability
 * Configuration checks to highlight any unnecessary or incorrectly formatted settings you have
 * Link to 'Configuration' wiki page in the plugin-ui
 * Added a note in the plugin UI when adding an Accessory Simulation that the accessory will need to be removed from the cache

From f6cf13d1ccb24d8679c16d76a9bd7d5db7215aa2 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 7 Feb 2021 22:32:00 +0000
Subject: [PATCH 1347/3183] formats, fixes

---
 lib/device/curtain.js                     | 1 +
 lib/device/diffuser.js                    | 1 +
 lib/device/fan.js                         | 1 +
 lib/device/light-colour.js                | 1 +
 lib/device/light-ctemp.js                 | 1 +
 lib/device/light-dimmer.js                | 1 +
 lib/device/outlet.js                      | 2 +-
 lib/device/rf-bridge.js                   | 4 ++--
 lib/device/scm.js                         | 1 +
 lib/device/sensor-ambient.js              | 1 +
 lib/device/sensor-contact.js              | 2 +-
 lib/device/simulation/blind.js            | 1 +
 lib/device/simulation/garage-eachen.js    | 3 ++-
 lib/device/simulation/garage-four.js      | 3 ++-
 lib/device/simulation/garage-od-switch.js | 1 +
 lib/device/simulation/garage-one.js       | 3 ++-
 lib/device/simulation/garage-two.js       | 3 ++-
 lib/device/simulation/lock-one.js         | 3 ++-
 lib/device/simulation/switch-valve.js     | 1 +
 lib/device/simulation/tap-one.js          | 1 +
 lib/device/simulation/tap-two.js          | 1 +
 lib/device/simulation/thermostat.js       | 1 +
 lib/device/simulation/valve-four.js       | 1 +
 lib/device/simulation/valve-one.js        | 1 +
 lib/device/simulation/valve-two.js        | 1 +
 lib/device/switch-multi.js                | 1 +
 lib/device/switch-single.js               | 1 +
 lib/device/template.js                    | 1 +
 lib/device/usb.js                         | 1 +
 lib/device/zigbee/light-dimmer.js         | 1 +
 lib/device/zigbee/sensor-ambient.js       | 3 ++-
 lib/device/zigbee/sensor-contact.js       | 2 +-
 lib/device/zigbee/sensor-motion.js        | 4 ++--
 lib/device/zigbee/switch-single.js        | 1 +
 lib/device/zigbee/switch-stateless.js     | 3 ++-
 lib/index.js                              | 2 +-
 36 files changed, 45 insertions(+), 15 deletions(-)

diff --git a/lib/device/curtain.js b/lib/device/curtain.js
index cf8adcc0..632b8b02 100644
--- a/lib/device/curtain.js
+++ b/lib/device/curtain.js
@@ -5,6 +5,7 @@
 module.exports = class deviceCurtain {
   constructor (platform, accessory) {
     // Set up variables from the platform
+    this.consts = platform.consts
     this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
diff --git a/lib/device/diffuser.js b/lib/device/diffuser.js
index 5907e8ee..dc0ce47a 100644
--- a/lib/device/diffuser.js
+++ b/lib/device/diffuser.js
@@ -6,6 +6,7 @@ module.exports = class deviceDiffuser {
   constructor (platform, accessory) {
     // Set up variables from the platform
     this.colourUtils = platform.colourUtils
+    this.consts = platform.consts
     this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
diff --git a/lib/device/fan.js b/lib/device/fan.js
index b1e16dc9..94ee5f45 100644
--- a/lib/device/fan.js
+++ b/lib/device/fan.js
@@ -5,6 +5,7 @@
 module.exports = class deviceFan {
   constructor (platform, accessory) {
     // Set up variables from the platform
+    this.consts = platform.consts
     this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
diff --git a/lib/device/light-colour.js b/lib/device/light-colour.js
index 416bad01..0d558137 100644
--- a/lib/device/light-colour.js
+++ b/lib/device/light-colour.js
@@ -6,6 +6,7 @@ module.exports = class deviceLightColour {
   constructor (platform, accessory) {
     // Set up variables from the platform
     this.colourUtils = platform.colourUtils
+    this.consts = platform.consts
     this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
diff --git a/lib/device/light-ctemp.js b/lib/device/light-ctemp.js
index c46d456a..8c4e6f7d 100644
--- a/lib/device/light-ctemp.js
+++ b/lib/device/light-ctemp.js
@@ -5,6 +5,7 @@
 module.exports = class deviceLightColour {
   constructor (platform, accessory) {
     // Set up variables from the platform
+    this.consts = platform.consts
     this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
diff --git a/lib/device/light-dimmer.js b/lib/device/light-dimmer.js
index 16b38df5..3144b35f 100644
--- a/lib/device/light-dimmer.js
+++ b/lib/device/light-dimmer.js
@@ -5,6 +5,7 @@
 module.exports = class deviceLightDimmer {
   constructor (platform, accessory) {
     // Set up variables from the platform
+    this.consts = platform.consts
     this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
diff --git a/lib/device/outlet.js b/lib/device/outlet.js
index a2fa55d3..7679d92e 100644
--- a/lib/device/outlet.js
+++ b/lib/device/outlet.js
@@ -20,7 +20,7 @@ module.exports = class deviceOutlet {
 
     this.inUsePowerThreshold = parseInt(this.platform.config.inUsePowerThreshold)
     this.inUsePowerThreshold = isNaN(this.inUsePowerThreshold) || this.inUsePowerThreshold < 0
-      ? this.consts.defaults.inUsePowerThreshold
+      ? this.consts.defaultValues.inUsePowerThreshold
       : this.inUsePowerThreshold
     this.inherits = require('util').inherits
     const self = this
diff --git a/lib/device/rf-bridge.js b/lib/device/rf-bridge.js
index 7ad82785..28e1598b 100644
--- a/lib/device/rf-bridge.js
+++ b/lib/device/rf-bridge.js
@@ -33,7 +33,7 @@ module.exports = class deviceRFBridge {
     this.eveLastActivation.UUID = this.consts.eveUUID.lastActivation
     this.sensorTimeDifference = parseInt(this.platform.config.sensorTimeDifference)
     this.sensorTimeDifference = isNaN(this.sensorTimeDifference) || this.sensorTimeDifference < 10
-      ? this.consts.defaults.sensorTimeDifference
+      ? this.consts.defaultValues.sensorTimeDifference
       : this.sensorTimeDifference
     if (['curtain', 'button'].includes(this.accessory.context.subType)) {
       Object.entries(this.accessory.context.buttons).forEach(([chan, name]) => {
@@ -160,7 +160,7 @@ module.exports = class deviceRFBridge {
               const sensorTimeLengthSec = parseInt(this.platform.config.sensorTimeLength)
               const sensorTimeLength = isNaN(sensorTimeLengthPri) || sensorTimeLengthPri < 0
                 ? isNaN(sensorTimeLengthSec) || sensorTimeLengthSec < 0
-                  ? this.consts.defaults.sensorTimeLength
+                  ? this.consts.defaultValues.sensorTimeLength
                   : sensorTimeLengthSec
                 : sensorTimeLengthPri
               const timeOfMotion = new Date(params[chan])
diff --git a/lib/device/scm.js b/lib/device/scm.js
index 48b4219b..d2dd410b 100644
--- a/lib/device/scm.js
+++ b/lib/device/scm.js
@@ -5,6 +5,7 @@
 module.exports = class deviceSCM {
   constructor (platform, accessory) {
     // Set up variables from the platform
+    this.consts = platform.consts
     this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
diff --git a/lib/device/sensor-ambient.js b/lib/device/sensor-ambient.js
index a97ac5e1..66921991 100644
--- a/lib/device/sensor-ambient.js
+++ b/lib/device/sensor-ambient.js
@@ -5,6 +5,7 @@
 module.exports = class deviceSensorAmbient {
   constructor (platform, accessory) {
     // Set up variables from the platform
+    this.consts = platform.consts
     this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
diff --git a/lib/device/sensor-contact.js b/lib/device/sensor-contact.js
index a73fa631..65dcbf07 100644
--- a/lib/device/sensor-contact.js
+++ b/lib/device/sensor-contact.js
@@ -33,7 +33,7 @@ module.exports = class deviceSensorContact {
     this.eveLastActivation.UUID = this.consts.eveUUID.lastActivation
     this.lowBattThreshold = parseInt(this.platform.config.lowBattThreshold)
     this.lowBattThreshold = isNaN(this.lowBattThreshold) || this.lowBattThreshold < 5
-      ? this.consts.defaults.lowBattThreshold
+      ? this.consts.defaultValues.lowBattThreshold
       : this.lowBattThreshold
     this.contactService = this.accessory.getService(this.hapServ.ContactSensor) || this.accessory.addService(this.hapServ.ContactSensor)
     this.batteryService = this.accessory.getService(this.hapServ.BatteryService) || this.accessory.addService(this.hapServ.BatteryService)
diff --git a/lib/device/simulation/blind.js b/lib/device/simulation/blind.js
index 369a8738..8ea793a1 100644
--- a/lib/device/simulation/blind.js
+++ b/lib/device/simulation/blind.js
@@ -5,6 +5,7 @@
 module.exports = class deviceBlind {
   constructor (platform, accessory) {
     // Set up variables from the platform
+    this.consts = platform.consts
     this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
diff --git a/lib/device/simulation/garage-eachen.js b/lib/device/simulation/garage-eachen.js
index f1f71431..b20a7e1f 100644
--- a/lib/device/simulation/garage-eachen.js
+++ b/lib/device/simulation/garage-eachen.js
@@ -5,6 +5,7 @@
 module.exports = class deviceGarageEachen {
   constructor (platform, accessory) {
     // Set up variables from the platform
+    this.consts = platform.consts
     this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
@@ -19,7 +20,7 @@ module.exports = class deviceGarageEachen {
 
     this.operationTime = parseInt(platform.simulations[this.accessory.context.eweDeviceId].operationTime)
     this.operationTime = isNaN(this.operationTime) || this.operationTime < 20
-      ? this.consts.defaults.operationTime
+      ? this.consts.defaultValues.operationTime
       : this.operationTime
 
     if (!(this.service = this.accessory.getService(this.hapServ.GarageDoorOpener))) {
diff --git a/lib/device/simulation/garage-four.js b/lib/device/simulation/garage-four.js
index 17e7e3a4..15826999 100644
--- a/lib/device/simulation/garage-four.js
+++ b/lib/device/simulation/garage-four.js
@@ -5,6 +5,7 @@
 module.exports = class deviceGarageFour {
   constructor (platform, accessory) {
     // Set up variables from the platform
+    this.consts = platform.consts
     this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
@@ -28,7 +29,7 @@ module.exports = class deviceGarageFour {
 
     this.operationTime = parseInt(platform.simulations[this.accessory.context.eweDeviceId].operationTime)
     this.operationTime = isNaN(this.operationTime) || this.operationTime < 20
-      ? this.consts.defaults.operationTime
+      ? this.consts.defaultValues.operationTime
       : this.operationTime
 
     ;['A', 'B', 'C', 'D'].forEach(v => {
diff --git a/lib/device/simulation/garage-od-switch.js b/lib/device/simulation/garage-od-switch.js
index 9fb18cde..af1c8f46 100644
--- a/lib/device/simulation/garage-od-switch.js
+++ b/lib/device/simulation/garage-od-switch.js
@@ -5,6 +5,7 @@
 module.exports = class deviceGarageODSwitch {
   constructor (platform, accessory) {
     // Set up variables from the platform
+    this.consts = platform.consts
     this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
diff --git a/lib/device/simulation/garage-one.js b/lib/device/simulation/garage-one.js
index 85116afe..71c8b6e0 100644
--- a/lib/device/simulation/garage-one.js
+++ b/lib/device/simulation/garage-one.js
@@ -5,6 +5,7 @@
 module.exports = class deviceGarageOne {
   constructor (platform, accessory) {
     // Set up variables from the platform
+    this.consts = platform.consts
     this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
@@ -29,7 +30,7 @@ module.exports = class deviceGarageOne {
     this.setup = asConfig.setup
     this.operationTime = parseInt(asConfig.operationTime)
     this.operationTime = isNaN(this.operationTime) || this.operationTime < 20
-      ? this.consts.defaults.operationTime
+      ? this.consts.defaultValues.operationTime
       : this.operationTime
     if (asConfig.sensorId) {
       if (!this.platform.devicesInHB.has(asConfig.sensorId + 'SWX')) {
diff --git a/lib/device/simulation/garage-two.js b/lib/device/simulation/garage-two.js
index 6d661a7c..c8631a09 100644
--- a/lib/device/simulation/garage-two.js
+++ b/lib/device/simulation/garage-two.js
@@ -5,6 +5,7 @@
 module.exports = class deviceGarageTwo {
   constructor (platform, accessory) {
     // Set up variables from the platform
+    this.consts = platform.consts
     this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
@@ -26,7 +27,7 @@ module.exports = class deviceGarageTwo {
 
     this.operationTime = parseInt(platform.simulations[this.accessory.context.eweDeviceId].operationTime)
     this.operationTime = isNaN(this.operationTime) || this.operationTime < 20
-      ? this.consts.defaults.operationTime
+      ? this.consts.defaultValues.operationTime
       : this.operationTime
 
     ;['1', '2'].forEach(v => {
diff --git a/lib/device/simulation/lock-one.js b/lib/device/simulation/lock-one.js
index 22140ad1..e33144e6 100644
--- a/lib/device/simulation/lock-one.js
+++ b/lib/device/simulation/lock-one.js
@@ -5,6 +5,7 @@
 module.exports = class deviceLockOne {
   constructor (platform, accessory) {
     // Set up variables from the platform
+    this.consts = platform.consts
     this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
@@ -24,7 +25,7 @@ module.exports = class deviceLockOne {
     this.setup = asConfig.setup
     this.operationTime = parseInt(asConfig.operationTime)
     this.operationTime = isNaN(this.operationTime) || this.operationTime < 20
-      ? this.consts.defaults.operationTime
+      ? this.consts.defaultValues.operationTime
       : this.operationTime
 
     this.service = this.accessory.getService(this.hapServ.LockMechanism) || this.accessory.addService(this.hapServ.LockMechanism)
diff --git a/lib/device/simulation/switch-valve.js b/lib/device/simulation/switch-valve.js
index d66f4d76..d3c8bf24 100644
--- a/lib/device/simulation/switch-valve.js
+++ b/lib/device/simulation/switch-valve.js
@@ -5,6 +5,7 @@
 module.exports = class deviceSwitchValve {
   constructor (platform, accessory) {
     // Set up variables from the platform
+    this.consts = platform.consts
     this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
diff --git a/lib/device/simulation/tap-one.js b/lib/device/simulation/tap-one.js
index d2c69709..14baa590 100644
--- a/lib/device/simulation/tap-one.js
+++ b/lib/device/simulation/tap-one.js
@@ -5,6 +5,7 @@
 module.exports = class deviceTapOne {
   constructor (platform, accessory) {
     // Set up variables from the platform
+    this.consts = platform.consts
     this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
diff --git a/lib/device/simulation/tap-two.js b/lib/device/simulation/tap-two.js
index 91a6eaca..f31c10b3 100644
--- a/lib/device/simulation/tap-two.js
+++ b/lib/device/simulation/tap-two.js
@@ -5,6 +5,7 @@
 module.exports = class deviceTapTwo {
   constructor (platform, accessory) {
     // Set up variables from the platform
+    this.consts = platform.consts
     this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
diff --git a/lib/device/simulation/thermostat.js b/lib/device/simulation/thermostat.js
index bc5eea45..de6a74e2 100644
--- a/lib/device/simulation/thermostat.js
+++ b/lib/device/simulation/thermostat.js
@@ -5,6 +5,7 @@
 module.exports = class deviceThermostat {
   constructor (platform, accessory) {
     // Set up variables from the platform
+    this.consts = platform.consts
     this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
diff --git a/lib/device/simulation/valve-four.js b/lib/device/simulation/valve-four.js
index 79cd453f..ec73f5f1 100644
--- a/lib/device/simulation/valve-four.js
+++ b/lib/device/simulation/valve-four.js
@@ -5,6 +5,7 @@
 module.exports = class deviceValveFour {
   constructor (platform, accessory) {
     // Set up variables from the platform
+    this.consts = platform.consts
     this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
diff --git a/lib/device/simulation/valve-one.js b/lib/device/simulation/valve-one.js
index 9d3daa42..b74eef83 100644
--- a/lib/device/simulation/valve-one.js
+++ b/lib/device/simulation/valve-one.js
@@ -5,6 +5,7 @@
 module.exports = class deviceValveOne {
   constructor (platform, accessory) {
     // Set up variables from the platform
+    this.consts = platform.consts
     this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
diff --git a/lib/device/simulation/valve-two.js b/lib/device/simulation/valve-two.js
index 41267ea7..6a9aae90 100644
--- a/lib/device/simulation/valve-two.js
+++ b/lib/device/simulation/valve-two.js
@@ -5,6 +5,7 @@
 module.exports = class deviceValveTwo {
   constructor (platform, accessory) {
     // Set up variables from the platform
+    this.consts = platform.consts
     this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
diff --git a/lib/device/switch-multi.js b/lib/device/switch-multi.js
index 177926d1..06944e7b 100644
--- a/lib/device/switch-multi.js
+++ b/lib/device/switch-multi.js
@@ -5,6 +5,7 @@
 module.exports = class deviceSwitchMulti {
   constructor (platform, accessory) {
     // Set up variables from the platform
+    this.consts = platform.consts
     this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
diff --git a/lib/device/switch-single.js b/lib/device/switch-single.js
index 861a08a0..5e0a81f1 100644
--- a/lib/device/switch-single.js
+++ b/lib/device/switch-single.js
@@ -5,6 +5,7 @@
 module.exports = class deviceSwitchSingle {
   constructor (platform, accessory) {
     // Set up variables from the platform
+    this.consts = platform.consts
     this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
diff --git a/lib/device/template.js b/lib/device/template.js
index c6b8a4d5..1a6c2946 100644
--- a/lib/device/template.js
+++ b/lib/device/template.js
@@ -5,6 +5,7 @@
 module.exports = class deviceTemplate {
   constructor (platform, accessory) {
     // Set up variables from the platform
+    this.consts = platform.consts
     this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
diff --git a/lib/device/usb.js b/lib/device/usb.js
index f4a10ce4..a9483662 100644
--- a/lib/device/usb.js
+++ b/lib/device/usb.js
@@ -5,6 +5,7 @@
 module.exports = class deviceUSB {
   constructor (platform, accessory) {
     // Set up variables from the platform
+    this.consts = platform.consts
     this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
diff --git a/lib/device/zigbee/light-dimmer.js b/lib/device/zigbee/light-dimmer.js
index 5be1cbc0..c0e64a70 100644
--- a/lib/device/zigbee/light-dimmer.js
+++ b/lib/device/zigbee/light-dimmer.js
@@ -5,6 +5,7 @@
 module.exports = class deviceZBLightDimmer {
   constructor (platform, accessory) {
     // Set up variables from the platform
+    this.consts = platform.consts
     this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
diff --git a/lib/device/zigbee/sensor-ambient.js b/lib/device/zigbee/sensor-ambient.js
index 5594170e..c619128a 100644
--- a/lib/device/zigbee/sensor-ambient.js
+++ b/lib/device/zigbee/sensor-ambient.js
@@ -5,6 +5,7 @@
 module.exports = class deviceZBSensorAmbient {
   constructor (platform, accessory) {
     // Set up variables from the platform
+    this.consts = platform.consts
     this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
@@ -19,7 +20,7 @@ module.exports = class deviceZBSensorAmbient {
 
     this.lowBattThreshold = parseInt(this.platform.config.lowBattThreshold)
     this.lowBattThreshold = isNaN(this.lowBattThreshold) || this.lowBattThreshold < 5
-      ? this.consts.defaults.lowBattThreshold
+      ? this.consts.defaultValues.lowBattThreshold
       : this.lowBattThreshold
 
     this.tService = this.accessory.getService(this.hapServ.TemperatureSensor) || this.accessory.addService(this.hapServ.TemperatureSensor)
diff --git a/lib/device/zigbee/sensor-contact.js b/lib/device/zigbee/sensor-contact.js
index e91f5bd6..fa958223 100644
--- a/lib/device/zigbee/sensor-contact.js
+++ b/lib/device/zigbee/sensor-contact.js
@@ -33,7 +33,7 @@ module.exports = class deviceZBSensorContact {
     this.eveLastActivation.UUID = this.consts.eveUUID.lastActivation
     this.lowBattThreshold = parseInt(this.platform.config.lowBattThreshold)
     this.lowBattThreshold = isNaN(this.lowBattThreshold) || this.lowBattThreshold < 5
-      ? this.consts.defaults.lowBattThreshold
+      ? this.consts.defaultValues.lowBattThreshold
       : this.lowBattThreshold
 
     this.service = this.accessory.getService(this.hapServ.ContactSensor) || this.accessory.addService(this.hapServ.ContactSensor)
diff --git a/lib/device/zigbee/sensor-motion.js b/lib/device/zigbee/sensor-motion.js
index 86b81256..0a3120e3 100644
--- a/lib/device/zigbee/sensor-motion.js
+++ b/lib/device/zigbee/sensor-motion.js
@@ -33,11 +33,11 @@ module.exports = class deviceZBSensorMotion {
     this.eveLastActivation.UUID = this.consts.eveUUID.lastActivation
     this.lowBattThreshold = parseInt(this.platform.config.lowBattThreshold)
     this.lowBattThreshold = isNaN(this.lowBattThreshold) || this.lowBattThreshold < 5
-      ? this.consts.defaults.lowBattThreshold
+      ? this.consts.defaultValues.lowBattThreshold
       : this.lowBattThreshold
     this.sensorTimeDifference = parseInt(this.platform.config.sensorTimeDifference)
     this.sensorTimeDifference = isNaN(this.sensorTimeDifference) || this.sensorTimeDifference < 10
-      ? this.consts.defaults.sensorTimeDifference
+      ? this.consts.defaultValues.sensorTimeDifference
       : this.sensorTimeDifference
 
     this.service = this.accessory.getService(this.hapServ.MotionSensor) || this.accessory.addService(this.hapServ.MotionSensor)
diff --git a/lib/device/zigbee/switch-single.js b/lib/device/zigbee/switch-single.js
index b7bc569c..27f1df44 100644
--- a/lib/device/zigbee/switch-single.js
+++ b/lib/device/zigbee/switch-single.js
@@ -5,6 +5,7 @@
 module.exports = class deviceZBSwitchSingle {
   constructor (platform, accessory) {
     // Set up variables from the platform
+    this.consts = platform.consts
     this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
diff --git a/lib/device/zigbee/switch-stateless.js b/lib/device/zigbee/switch-stateless.js
index b8626dac..a7d9fa94 100644
--- a/lib/device/zigbee/switch-stateless.js
+++ b/lib/device/zigbee/switch-stateless.js
@@ -5,6 +5,7 @@
 module.exports = class deviceZBSwitchStateless {
   constructor (platform, accessory) {
     // Set up variables from the platform
+    this.consts = platform.consts
     this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
@@ -19,7 +20,7 @@ module.exports = class deviceZBSwitchStateless {
 
     this.lowBattThreshold = parseInt(this.platform.config.lowBattThreshold)
     this.lowBattThreshold = isNaN(this.lowBattThreshold) || this.lowBattThreshold < 5
-      ? this.consts.defaults.lowBattThreshold
+      ? this.consts.defaultValues.lowBattThreshold
       : this.lowBattThreshold
 
     const ssp = this.hapServ.StatelessProgrammableSwitch
diff --git a/lib/index.js b/lib/index.js
index 85290c96..e96d6620 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1240,7 +1240,7 @@ class eWeLinkPlatform {
             this.log('[%s] %s %s.', accessory.displayName, this.messages.revertWS, res)
           }
 
-          // Device is online via WS so sent the update
+          // Device is online via WS so send the update
           await this.wsClient.sendUpdate(payload)
         } else {
         // Device isn't online via WS so report the error back

From ad027747fcb20f2677b525da4f46feadba6d8140 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 7 Feb 2021 22:32:41 +0000
Subject: [PATCH 1348/3183] 4.7.0-1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 75945196..0a52d78e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.7.0-0",
+  "version": "4.7.0-1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 276d91da..decf76d8 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "4.7.0-0",
+  "version": "4.7.0-1",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From aca2518de265c82fcf8e329389f262c2bc73c09c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 7 Feb 2021 22:38:46 +0000
Subject: [PATCH 1349/3183] typo in comment

---
 lib/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/index.js b/lib/index.js
index e96d6620..6e77b169 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -360,7 +360,7 @@ class eWeLinkPlatform {
   }
 
   async pluginSetup () {
-    // Plugin has finished initialising to now onto setup
+    // Plugin has finished initialising so now onto setup
     try {
       // If the user has disabled the plugin then remove all accessories
       if (this.config.disablePlugin) {

From 5c03c7207c6749a2b684bac3a28e595e1b3ede38 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 7 Feb 2021 22:50:04 +0000
Subject: [PATCH 1350/3183] less context

---
 lib/device/simulation/garage-one.js | 2 +-
 lib/index.js                        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/device/simulation/garage-one.js b/lib/device/simulation/garage-one.js
index 71c8b6e0..baa68107 100644
--- a/lib/device/simulation/garage-one.js
+++ b/lib/device/simulation/garage-one.js
@@ -36,7 +36,7 @@ module.exports = class deviceGarageOne {
       if (!this.platform.devicesInHB.has(asConfig.sensorId + 'SWX')) {
         this.error = 'defined sensor does not exist in Homebridge'
       }
-      if (this.platform.devicesInHB.get(asConfig.sensorId + 'SWX').context.type !== 'sensor') {
+      if (this.platform.devicesInHB.get(asConfig.sensorId + 'SWX').context.eweUIID !== 102) {
         this.error = 'defined sensor is not a DW2 sensor'
       }
       this.definedSensor = this.platform.devicesInHB.get(asConfig.sensorId + 'SWX')
diff --git a/lib/index.js b/lib/index.js
index 6e77b169..48d97366 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -664,7 +664,7 @@ class eWeLinkPlatform {
         *******************/
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
-          : this.addAccessory(device, device.deviceid + 'SWX', false, { type: 'sensor' })
+          : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/sensor-contact'))(this, accessory)
         /******************/
       } else if (this.consts.devices.fan.includes(device.extra.uiid)) {

From 22e4ebfbcbaf62f8fef835395ed98cc6126b474a Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 8 Feb 2021 06:31:06 +0000
Subject: [PATCH 1351/3183] revert conversion

---
 lib/utils/colour-utils.js | 67 +++++++++++++++++++++++----------------
 1 file changed, 40 insertions(+), 27 deletions(-)

diff --git a/lib/utils/colour-utils.js b/lib/utils/colour-utils.js
index 6d93b78b..1f8e7363 100644
--- a/lib/utils/colour-utils.js
+++ b/lib/utils/colour-utils.js
@@ -4,39 +4,44 @@
 
 module.exports = {
   hs2rgb: (h, s) => {
-    h = parseInt(h) / 60
+    h = parseInt(h) / 360
     s = parseInt(s) / 100
-    const f = h - Math.floor(h)
-    const p = Math.round(255 * (1 - s))
-    const q = Math.round(255 * (1 - (s * f)))
-    const t = Math.round(255 * (1 - (s * (1 - f))))
-    switch (Math.floor(h) % 6) {
-      case 0:
-        return [255, t, p]
-      case 1:
-        return [q, 255, p]
-      case 2:
-        return [p, 255, t]
-      case 3:
-        return [p, q, 255]
-      case 4:
-        return [t, p, 255]
-      case 5:
-        return [255, p, q]
+    const l = 0.5
+    let t3
+    let val
+    if (s === 0) {
+      val = l * 255
+      return [Math.round(val), Math.round(val), Math.round(val)]
     }
+    const t2 = l + s - l * s
+    const t1 = 2 * l - t2
+    const rgb = [0, 0, 0]
+    for (let i = 0; i < 3; i++) {
+      t3 = h + 1 / 3 * -(i - 1)
+      if (t3 < 0) t3++
+      if (t3 > 1) t3--
+      if (t3 * 6 < 1) {
+        val = t1 + (t2 - t1) * 6 * t3
+      } else if (t3 * 2 < 1) {
+        val = t2
+      } else if (t3 * 3 < 2) {
+        val = t1 + (t2 - t1) * (2 / 3 - t3) * 6
+      } else {
+        val = t1
+      }
+      rgb[i] = Math.round(val * 255)
+    }
+    return rgb
   },
-
   rgb2hs: (r, g, b) => {
-    r = parseInt(r)
-    g = parseInt(g)
-    b = parseInt(b)
+    r = parseInt(r) / 255
+    g = parseInt(g) / 255
+    b = parseInt(b) / 255
     const min = Math.min(r, g, b)
     const max = Math.max(r, g, b)
     const delta = max - min
-    let h
-    const s = max === 0
-      ? 0
-      : delta / max * 100
+    let h = 0
+    let s = 0
     if (max === min) {
       h = 0
     } else if (r === max) {
@@ -50,7 +55,15 @@ module.exports = {
     if (h < 0) {
       h += 360
     }
-    return [Math.round(h), Math.round(s)]
+    const l = (min + max) / 2
+    if (max === min) {
+      s = 0
+    } else if (l <= 0.5) {
+      s = delta / (max + min)
+    } else {
+      s = delta / (2 - max - min)
+    }
+    return [Math.round(h), Math.round(s * 100)]
   },
 
   m2hs: m => {

From e1b925157cd103ee53add591fae5c201f1b3dd2e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 8 Feb 2021 06:31:30 +0000
Subject: [PATCH 1352/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index efaaddb8..3ed0e6f4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,7 +16,6 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 * ⚠️ Removed `nameOverride` configuration option
 * Reinstated `ipOverride` into the Homebridge plugin UI screen
 * Fixed an issue with the 'Lock' Accessory Simulation where the status would never update as 'Unlocked'
-* Colour conversation formula changes
 * HTTP error codes will be displayed in the logs if and when the plugin re-attempts the connection
 * Error messages refactored to show the most useful information
 * [Backend] Major code refactoring

From 0051a58faf31803d59aa1fa0682db57945eb1fad Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 8 Feb 2021 07:20:57 +0000
Subject: [PATCH 1353/3183] allowed modes to consts

---
 lib/index.js           | 2 +-
 lib/utils/constants.js | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/index.js b/lib/index.js
index 48d97366..6f9943c1 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -299,7 +299,7 @@ class eWeLinkPlatform {
           }
           break
         case 'mode': {
-          const inSet = ['auto', 'wan', 'lan'].includes(val)
+          const inSet = this.consts.allowed.modes.includes(val)
           if (typeof val !== 'string' || !inSet) {
             logIgnore(key)
           }
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index a939f718..1857baab 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -153,6 +153,7 @@ module.exports = {
       'tap_two', 'thermostat', 'valve', 'valve_two',
       'valve_four'
     ],
+    modes: ['auto', 'wan', 'lan'],
     obstructs: ['garage', 'garage_eachen'],
     setups: ['oneSwitch', 'twoSwitch'],
     sensors: ['water', 'smoke', 'co', 'co2', 'contact', 'occupancy', 'motion']

From 93b24c3c90d007feffa05d8f2274a77738043792 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 8 Feb 2021 07:30:20 +0000
Subject: [PATCH 1354/3183] Grammar in comments

---
 lib/device/light-colour.js | 4 ++--
 lib/device/light-ctemp.js  | 4 ++--
 lib/device/outlet.js       | 1 +
 lib/index.js               | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/lib/device/light-colour.js b/lib/device/light-colour.js
index 0d558137..899a864b 100644
--- a/lib/device/light-colour.js
+++ b/lib/device/light-colour.js
@@ -52,7 +52,7 @@ module.exports = class deviceLightColour {
       this.service.getCharacteristic(this.hapChar.ColorTemperature)
         .on('set', this.internalCTempUpdate.bind(this))
 
-      // Setup the adaptive lighting controller if available
+      // Set up the adaptive lighting controller if available
       if (
         platform.api.versionGreaterOrEqual &&
         platform.api.versionGreaterOrEqual('1.3.0-beta.46')
@@ -60,7 +60,7 @@ module.exports = class deviceLightColour {
         // This is needed as sometimes we need to send the brightness with a cct update
         this.cacheBright = this.service.getCharacteristic(this.hapChar.Brightness).value
 
-        // Setup the adaptive lighting controller
+        // Set up the adaptive lighting controller
         this.alController = new platform.api.hap.AdaptiveLightingController(this.service)
         this.accessory.configureController(this.alController)
       }
diff --git a/lib/device/light-ctemp.js b/lib/device/light-ctemp.js
index 8c4e6f7d..7c2bd8b7 100644
--- a/lib/device/light-ctemp.js
+++ b/lib/device/light-ctemp.js
@@ -46,7 +46,7 @@ module.exports = class deviceLightColour {
       this.maxK = 6500
     }
 
-    // Setup the adaptive lighting controller if available
+    // Set up the adaptive lighting controller if available
     if (
       platform.api.versionGreaterOrEqual &&
       platform.api.versionGreaterOrEqual('1.3.0-beta.46')
@@ -54,7 +54,7 @@ module.exports = class deviceLightColour {
       // This is needed as sometimes we need to send the brightness with a cct update
       this.cacheBrightness = this.service.getCharacteristic(this.hapChar.Brightness).value
 
-      // Setup the adaptive lighting controller
+      // Set up the adaptive lighting controller
       this.alController = new platform.api.hap.AdaptiveLightingController(this.service)
       this.accessory.configureController(this.alController)
     }
diff --git a/lib/device/outlet.js b/lib/device/outlet.js
index 7679d92e..41c5c41f 100644
--- a/lib/device/outlet.js
+++ b/lib/device/outlet.js
@@ -18,6 +18,7 @@ module.exports = class deviceOutlet {
     this.name = accessory.displayName
     this.accessory = accessory
 
+    // Set up custom variables 
     this.inUsePowerThreshold = parseInt(this.platform.config.inUsePowerThreshold)
     this.inUsePowerThreshold = isNaN(this.inUsePowerThreshold) || this.inUsePowerThreshold < 0
       ? this.consts.defaultValues.inUsePowerThreshold
diff --git a/lib/index.js b/lib/index.js
index 6f9943c1..a5c4b450 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -42,7 +42,7 @@ class eWeLinkPlatform {
       this.devicesInHB = new Map()
       this.devicesInEW = new Map()
 
-      // Setup the Homebridge events
+      // Set up the Homebridge events
       this.api.on('didFinishLaunching', this.pluginSetup.bind(this))
       this.api.on('shutdown', this.pluginShutdown.bind(this))
     } catch (err) {

From 42ced1c7ff0c375b985f014e6f40981fa6502572 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 8 Feb 2021 08:23:47 +0000
Subject: [PATCH 1355/3183] comments and formatting

---
 lib/device/outlet.js                  | 83 +++++++++++++++++++--------
 lib/device/rf-bridge.js               | 37 +++++++++---
 lib/device/scm.js                     | 14 +++--
 lib/device/sensor-ambient.js          | 51 +++++++++++-----
 lib/device/sensor-contact.js          | 30 ++++++----
 lib/device/simulation/switch-valve.js |  6 +-
 lib/device/simulation/thermostat.js   |  6 +-
 lib/device/switch-multi.js            | 12 +++-
 lib/device/switch-single.js           | 20 +++++--
 lib/device/template.js                |  6 +-
 lib/device/usb.js                     | 25 ++++++--
 lib/device/zigbee/light-dimmer.js     |  8 ++-
 lib/device/zigbee/sensor-ambient.js   | 34 +++++++----
 lib/device/zigbee/sensor-contact.js   | 29 ++++++----
 lib/device/zigbee/sensor-motion.js    | 33 ++++++-----
 lib/device/zigbee/switch-single.js    | 18 ++++--
 lib/device/zigbee/switch-stateless.js | 23 +++++---
 lib/utils/constants.js                |  2 +-
 18 files changed, 301 insertions(+), 136 deletions(-)

diff --git a/lib/device/outlet.js b/lib/device/outlet.js
index 41c5c41f..054356e9 100644
--- a/lib/device/outlet.js
+++ b/lib/device/outlet.js
@@ -18,15 +18,14 @@ module.exports = class deviceOutlet {
     this.name = accessory.displayName
     this.accessory = accessory
 
-    // Set up custom variables 
-    this.inUsePowerThreshold = parseInt(this.platform.config.inUsePowerThreshold)
-    this.inUsePowerThreshold = isNaN(this.inUsePowerThreshold) || this.inUsePowerThreshold < 0
-      ? this.consts.defaultValues.inUsePowerThreshold
-      : this.inUsePowerThreshold
+    // Set up custom variables for this device type
+    this.inUsePowerThreshold = this.platform.config.inUsePowerThreshold
+
+    // Set up the custom Eve characteristics for this device type
     this.inherits = require('util').inherits
     const self = this
     this.eveCurrentConsumption = function () {
-      self.hapChar.call(this, 'Current Consumption', self.consts.eveUUID.currentConsumption)
+      self.hapChar.call(this, 'Current Consumption', self.consts.eve.currentConsumption)
       this.setProps({
         format: self.hapChar.Formats.UINT16,
         unit: 'W',
@@ -38,7 +37,7 @@ module.exports = class deviceOutlet {
       this.value = this.getDefaultValue()
     }
     this.eveTotalConsumption = function () {
-      self.hapChar.call(this, 'Total Consumption', self.consts.eveUUID.totalConsumption)
+      self.hapChar.call(this, 'Total Consumption', self.consts.eve.totalConsumption)
       this.setProps({
         format: self.hapChar.Formats.FLOAT,
         unit: 'kWh',
@@ -50,7 +49,7 @@ module.exports = class deviceOutlet {
       this.value = this.getDefaultValue()
     }
     this.eveVoltage = function () {
-      self.hapChar.call(this, 'Voltage', self.consts.eveUUID.voltage)
+      self.hapChar.call(this, 'Voltage', self.consts.eve.voltage)
       this.setProps({
         format: self.hapChar.Formats.FLOAT,
         unit: 'V',
@@ -62,7 +61,7 @@ module.exports = class deviceOutlet {
       this.value = this.getDefaultValue()
     }
     this.eveElectricCurrent = function () {
-      self.hapChar.call(this, 'Electric Current', self.consts.eveUUID.electricCurrent)
+      self.hapChar.call(this, 'Electric Current', self.consts.eve.electricCurrent)
       this.setProps({
         format: self.hapChar.Formats.FLOAT,
         unit: 'A',
@@ -74,10 +73,14 @@ module.exports = class deviceOutlet {
       this.value = this.getDefaultValue()
     }
     this.eveResetTotal = function () {
-      self.hapChar.call(this, 'Reset Total', self.consts.eveUUID.resetTotal)
+      self.hapChar.call(this, 'Reset Total', self.consts.eve.resetTotal)
       this.setProps({
         format: self.hapChar.Formats.UINT32,
-        perms: [self.hapChar.Perms.READ, self.hapChar.Perms.NOTIFY, self.hapChar.Perms.WRITE]
+        perms: [
+          self.hapChar.Perms.READ,
+          self.hapChar.Perms.NOTIFY,
+          self.hapChar.Perms.WRITE
+        ]
       })
       this.value = this.getDefaultValue()
     }
@@ -86,11 +89,13 @@ module.exports = class deviceOutlet {
     this.inherits(this.eveVoltage, this.hapChar)
     this.inherits(this.eveElectricCurrent, this.hapChar)
     this.inherits(this.eveResetTotal, this.hapChar)
-    this.eveCurrentConsumption.UUID = this.consts.eveUUID.currentConsumption
-    this.eveTotalConsumption.UUID = this.consts.eveUUID.totalConsumption
-    this.eveVoltage.UUID = this.consts.eveUUID.voltage
-    this.eveElectricCurrent.UUID = this.consts.eveUUID.electricCurrent
-    this.eveResetTotal.UUID = this.consts.eveUUID.resetTotal
+    this.eveCurrentConsumption.UUID = this.consts.eve.currentConsumption
+    this.eveTotalConsumption.UUID = this.consts.eve.totalConsumption
+    this.eveVoltage.UUID = this.consts.eve.voltage
+    this.eveElectricCurrent.UUID = this.consts.eve.electricCurrent
+    this.eveResetTotal.UUID = this.consts.eve.resetTotal
+
+    // TotalConsumption is calculated by the plugin with these context readings
     if (!this.funcs.hasProperty(this.accessory.context, 'energyReadings')) {
       this.accessory.context.energyReadings = []
     }
@@ -98,9 +103,12 @@ module.exports = class deviceOutlet {
       this.accessory.context.energyReadingTotal = 0
     }
 
+    // If the accessory has a switch service then remove it
     if (this.accessory.getService(this.hapServ.Switch)) {
       this.accessory.removeService(this.accessory.getService(this.hapServ.Switch))
     }
+
+    // Add the outlet service if it doesn't already exist
     if (!(this.service = this.accessory.getService(this.hapServ.Outlet))) {
       this.service = this.accessory.addService(this.hapServ.Outlet)
       this.service.addCharacteristic(this.eveVoltage)
@@ -109,8 +117,12 @@ module.exports = class deviceOutlet {
       this.service.addCharacteristic(this.eveTotalConsumption)
       this.service.addCharacteristic(this.eveResetTotal)
     }
+
+    // Add the set handler to the outlet on/off characteristic
     this.service.getCharacteristic(this.hapChar.On)
       .on('set', this.internalUpdate.bind(this))
+
+    // Add the set handler to the outlet eve reset total energy characteristic
     this.service.getCharacteristic(this.eveResetTotal)
       .on('set', (value, callback) => {
         callback()
@@ -118,22 +130,47 @@ module.exports = class deviceOutlet {
         this.accessory.context.energyReadingTotal = 0
         this.service.updateCharacteristic(this.eveTotalConsumption, 0)
       })
+
+    // Pass the accessory to Fakegato to set up with Eve
     this.accessory.log = platform.config.debugFakegato ? this.log : () => {}
-    this.accessory.historyService = new this.platform.eveService('energy', this.accessory, {
+    this.accessory.eveService = new this.platform.eveService('energy', this.accessory, {
       storage: 'fs',
       path: platform.eveLogPath
     })
+
+    // Set up an interval for the plugin to calculate an approx total consumption
     setInterval(() => {
+      // Every 30 seconds start with a zero reading
       let total = 0
+
+      // Check we have had readings within the previous 30 seconds
       if (this.accessory.context.energyReadings.length > 0) {
-        this.accessory.context.energyReadings.forEach(x => (total += x))
-        total /= this.accessory.context.energyReadings.length // W5m
-        total /= 12 // Wh
-        total /= 1000 // kWh
+        // Accumulate the total from the energy readings
+        this.accessory.context.energyReadings.forEach(x => {
+          total += x
+        })
+
+        // Divide this by the number of entries to get an average W5m
+        total /= this.accessory.context.energyReadings.length
+
+        // Convert this to Wh
+        total /= 12
+
+        // Convert this to kWh
+        total /= 1000
+
+        // Accumulate the grand total that Eve reads as the total consumption
         this.accessory.context.energyReadingTotal += total
       }
+
+      // Reset the array for each 30 second readings
       this.accessory.context.energyReadings = []
-      this.service.updateCharacteristic(this.eveTotalConsumption, this.accessory.context.energyReadingTotal)
+
+      // Update Eve with the new grand total
+      this.service.updateCharacteristic(
+        this.eveTotalConsumption,
+        this.accessory.context.energyReadingTotal
+      )
     }, 300000)
   }
 
@@ -168,7 +205,7 @@ module.exports = class deviceOutlet {
         this.service.updateCharacteristic(this.hapChar.OutletInUse, parseFloat(params.power) > this.inUsePowerThreshold)
           .updateCharacteristic(this.eveCurrentConsumption, parseFloat(params.power))
         const isOn = this.accessory.getService(this.hapServ.Outlet).getCharacteristic(this.hapChar.On).value
-        this.accessory.historyService.addEntry({
+        this.accessory.eveService.addEntry({
           time: Math.round(new Date().valueOf() / 1000),
           power: isOn ? parseFloat(params.power) : 0
         })
diff --git a/lib/device/rf-bridge.js b/lib/device/rf-bridge.js
index 28e1598b..6ff95262 100644
--- a/lib/device/rf-bridge.js
+++ b/lib/device/rf-bridge.js
@@ -18,10 +18,14 @@ module.exports = class deviceRFBridge {
     this.name = accessory.displayName
     this.accessory = accessory
 
+    // Set up custom variables for this device type
+    this.sensorTimeDifference = this.platform.config.sensorTimeDifference
+
+    // Set up the custom Eve characteristics for this device type
     this.inherits = require('util').inherits
     const self = this
     this.eveLastActivation = function () {
-      self.hapChar.call(this, 'Last Activation', self.consts.eveUUID.lastActivation)
+      self.hapChar.call(this, 'Last Activation', self.consts.eve.lastActivation)
       this.setProps({
         format: self.hapChar.Formats.UINT32,
         unit: self.hapChar.Units.SECONDS,
@@ -30,24 +34,35 @@ module.exports = class deviceRFBridge {
       this.value = this.getDefaultValue()
     }
     this.inherits(this.eveLastActivation, this.hapChar)
-    this.eveLastActivation.UUID = this.consts.eveUUID.lastActivation
-    this.sensorTimeDifference = parseInt(this.platform.config.sensorTimeDifference)
-    this.sensorTimeDifference = isNaN(this.sensorTimeDifference) || this.sensorTimeDifference < 10
-      ? this.consts.defaultValues.sensorTimeDifference
-      : this.sensorTimeDifference
+    this.eveLastActivation.UUID = this.consts.eve.lastActivation
+
+    // There are two types of RF sub types [curtains, buttons] and [sensors]
     if (['curtain', 'button'].includes(this.accessory.context.subType)) {
+      // This instance is a remote control with buttons or curtain control
       Object.entries(this.accessory.context.buttons).forEach(([chan, name]) => {
+        // For each curtain/button we create a separate switch service
+
+        // Add the switch service if it doesn't already exist
         if (!this.accessory.getService(name)) {
           this.accessory.addService(this.hapServ.Switch, name, 'switch' + chan)
         }
+
+        // Always start with the buttons off (useful when restarting Homebridge)
         this.accessory.getService(name).updateCharacteristic(this.hapChar.On, false)
+
+        // Add the set handler to the switch on/off characteristic
         this.accessory.getService(name).getCharacteristic(this.hapChar.On)
-          .on('set', (value, callback) => this.internalUpdate(chan, name, value, callback))
+          .on('set', (value, callback) => {
+            this.internalUpdate(chan, name, value, callback)
+          })
       })
     } else {
+      // This instance is a sensor which the user can define as different types
       let serv
       let char
       let eveType
+
+      // Check which type this sensor is and get the correct service/characteristic
       switch (this.accessory.context.subType) {
         case 'water':
           serv = this.hapServ.LeakSensor
@@ -86,10 +101,16 @@ module.exports = class deviceRFBridge {
           eveType = 'motion'
           break
       }
+
+      // Add the sensor if it doesn't already exist
       const service = this.accessory.getService(serv) || this.accessory.addService(serv)
+
+      // Always start with the sensor off (useful when restarting Homebridge)
       service.updateCharacteristic(char, 0)
+
+      // Pass the accessory to Fakegato to set up with Eve
       this.accessory.log = platform.config.debugFakegato ? this.log : () => {}
-      this.accessory.historyService = new this.platform.eveService(eveType, this.accessory, {
+      this.accessory.eveService = new this.platform.eveService(eveType, this.accessory, {
         storage: 'fs',
         path: platform.eveLogPath
       })
diff --git a/lib/device/scm.js b/lib/device/scm.js
index d2dd410b..f90f989f 100644
--- a/lib/device/scm.js
+++ b/lib/device/scm.js
@@ -18,11 +18,17 @@ module.exports = class deviceSCM {
     this.name = accessory.displayName
     this.accessory = accessory
 
-    this.service = this.accessory.getService(this.hapServ.Switch) || this.accessory.addService(this.hapServ.Switch)
+    // Add the switch service if it doesn't already exist
+    this.service = this.accessory.getService(this.hapServ.Switch) ||
+      this.accessory.addService(this.hapServ.Switch)
+
+    // Add the set handler to the switch on/off characteristic
     this.service.getCharacteristic(this.hapChar.On)
       .on('set', this.internalUpdate.bind(this))
+
+    // Pass the accessory to Fakegato to set up with Eve
     this.accessory.log = platform.config.debugFakegato ? this.log : () => {}
-    this.accessory.historyService = new this.platform.eveService('switch', this.accessory, {
+    this.accessory.eveService = new this.platform.eveService('switch', this.accessory, {
       storage: 'fs',
       path: platform.eveLogPath
     })
@@ -35,7 +41,7 @@ module.exports = class deviceSCM {
       params.switches[0].switch = value ? 'on' : 'off'
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.cacheOnOff = value ? 'on' : 'off'
-      this.accessory.historyService.addEntry({
+      this.accessory.eveService.addEntry({
         time: Math.round(new Date().valueOf() / 1000),
         status: value ? 1 : 0
       })
@@ -55,7 +61,7 @@ module.exports = class deviceSCM {
       const newStatus = params.switches[0].switch === 'on'
       this.service.updateCharacteristic(this.hapChar.On, newStatus)
       this.cacheOnOff = params.switches[0].switch
-      this.accessory.historyService.addEntry({
+      this.accessory.eveService.addEntry({
         time: Math.round(new Date().valueOf() / 1000),
         status: newStatus ? 1 : 0
       })
diff --git a/lib/device/sensor-ambient.js b/lib/device/sensor-ambient.js
index 66921991..ccce8112 100644
--- a/lib/device/sensor-ambient.js
+++ b/lib/device/sensor-ambient.js
@@ -18,34 +18,57 @@ module.exports = class deviceSensorAmbient {
     this.name = accessory.displayName
     this.accessory = accessory
 
-    this.tempOffset = parseFloat(platform.thTempOffset[this.accessory.context.eweDeviceId] || 0)
-    this.hideSwitch = (this.platform.config.hideSwitchFromTH || '').split(',').includes(this.accessory.context.eweDeviceId)
+    // Set up custom variables for this device type
+    const eweId = this.accessory.context.eweDeviceId
+    this.tempOffset = Number(platform.thTempOffset[eweId] || 0)
+    this.hideSwitch = this.platform.config.hideSwitchFromTH.includes(eweId)
+
+    // If the accessory has a thermostat service then remove it
     if (this.accessory.getService(this.hapServ.Thermostat)) {
       this.accessory.removeService(this.accessory.getService(this.hapServ.Thermostat))
     }
-    if ((this.platform.config.hideSwitchFromTH || '').split(',').includes(this.accessory.context.eweDeviceId)) {
+
+    // The user can choose to hide the switch service if they desire
+    if (this.platform.config.hideSwitchFromTH.includes(eweId)) {
+      // User has hidden the switch service so remove it if it exists
       if (this.accessory.getService(this.hapServ.Switch)) {
         this.accessory.removeService(this.accessory.getService(this.hapServ.Switch))
       }
     } else {
-      this.switchService = this.accessory.getService(this.hapServ.Switch) || this.accessory.addService(this.hapServ.Switch)
+      // User has not hidden the switch service so add it if it doesn't already exist
+      this.switchService = this.accessory.getService(this.hapServ.Switch) ||
+        this.accessory.addService(this.hapServ.Switch)
+
+      // Add the set handler to the switch on/off characteristic
       this.switchService.getCharacteristic(this.hapChar.On)
         .on('set', this.internalUpdate.bind(this))
     }
-    this.tempService = this.accessory.getService(this.hapServ.TemperatureSensor) || this.accessory.addService(this.hapServ.TemperatureSensor)
-    this.tempService.getCharacteristic(this.hapChar.CurrentTemperature)
-      .setProps({
-        minValue: -100,
-        minStep: 0.1
-      })
+
+    // Add the temperature sensor service if it doesn't already exist
+    this.tempService = this.accessory.getService(this.hapServ.TemperatureSensor) ||
+      this.accessory.addService(this.hapServ.TemperatureSensor)
+
+    // Set custom properties of the current temperature characteristic
+    this.tempService.getCharacteristic(this.hapChar.CurrentTemperature).setProps({
+      minValue: -100,
+      minStep: 0.1
+    })
+
+    // The DS18B20 sensor does not provide humidity readings
     if (this.accessory.context.sensorType !== 'DS18B20') {
-      this.humiService = this.accessory.getService(this.hapServ.HumiditySensor) || this.accessory.addService(this.hapServ.HumiditySensor)
+      // Add the humidity sensor service if it doesn't already exist
+      this.humiService = this.accessory.getService(this.hapServ.HumiditySensor) ||
+        this.accessory.addService(this.hapServ.HumiditySensor)
     }
+
+    // The switch as the primary service ensures the status is reflected in the Home icon
     if (this.switchService) {
       this.switchService.setPrimaryService()
     }
+
+    // Pass the accessory to Fakegato to set up with Eve
     this.accessory.log = platform.config.debugFakegato ? this.log : () => {}
-    this.accessory.historyService = new this.platform.eveService('custom', this.accessory, {
+    this.accessory.eveService = new this.platform.eveService('custom', this.accessory, {
       storage: 'fs',
       path: platform.eveLogPath
     })
@@ -74,7 +97,7 @@ module.exports = class deviceSensorAmbient {
         if (this.cacheOnOff !== newState) {
           this.cacheOnOff = newState
           this.switchService.updateCharacteristic(this.hapChar.On, this.cacheOnOff === 'on')
-          this.accessory.historyService.addEntry({
+          this.accessory.eveService.addEntry({
             time: Math.round(new Date().valueOf() / 1000),
             status: this.cacheOnOff === 'on' ? 1 : 0
           })
@@ -108,7 +131,7 @@ module.exports = class deviceSensorAmbient {
       }
       if (this.funcs.hasProperty(eveLog, 'temp') || this.funcs.hasProperty(eveLog, 'humidity')) {
         eveLog.time = Math.round(new Date().valueOf() / 1000)
-        this.accessory.historyService.addEntry(eveLog)
+        this.accessory.eveService.addEntry(eveLog)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
diff --git a/lib/device/sensor-contact.js b/lib/device/sensor-contact.js
index 65dcbf07..2d5e2ce5 100644
--- a/lib/device/sensor-contact.js
+++ b/lib/device/sensor-contact.js
@@ -18,10 +18,14 @@ module.exports = class deviceSensorContact {
     this.name = accessory.displayName
     this.accessory = accessory
 
+    // Set up custom variables for this device type
+    this.lowBattThreshold = this.platform.config.lowBattThreshold
+
+    // Set up the custom Eve characteristics for this device type
     this.inherits = require('util').inherits
     const self = this
     this.eveLastActivation = function () {
-      self.hapChar.call(this, 'Last Activation', self.consts.eveUUID.lastActivation)
+      self.hapChar.call(this, 'Last Activation', self.consts.eve.lastActivation)
       this.setProps({
         format: self.hapChar.Formats.UINT32,
         unit: self.hapChar.Units.SECONDS,
@@ -30,15 +34,19 @@ module.exports = class deviceSensorContact {
       this.value = this.getDefaultValue()
     }
     this.inherits(this.eveLastActivation, this.hapChar)
-    this.eveLastActivation.UUID = this.consts.eveUUID.lastActivation
-    this.lowBattThreshold = parseInt(this.platform.config.lowBattThreshold)
-    this.lowBattThreshold = isNaN(this.lowBattThreshold) || this.lowBattThreshold < 5
-      ? this.consts.defaultValues.lowBattThreshold
-      : this.lowBattThreshold
-    this.contactService = this.accessory.getService(this.hapServ.ContactSensor) || this.accessory.addService(this.hapServ.ContactSensor)
-    this.batteryService = this.accessory.getService(this.hapServ.BatteryService) || this.accessory.addService(this.hapServ.BatteryService)
+    this.eveLastActivation.UUID = this.consts.eve.lastActivation
+
+    // Add the contact sensor service if it doesn't already exist
+    this.contactService = this.accessory.getService(this.hapServ.ContactSensor) ||
+      this.accessory.addService(this.hapServ.ContactSensor)
+
+    // Add the battery service if it doesn't already exist
+    this.batteryService = this.accessory.getService(this.hapServ.BatteryService) ||
+      this.accessory.addService(this.hapServ.BatteryService)
+
+    // Pass the accessory to Fakegato to set up with Eve
     this.accessory.log = platform.config.debugFakegato ? this.log : () => {}
-    this.accessory.historyService = new this.platform.eveService('door', this.accessory, {
+    this.accessory.eveService = new this.platform.eveService('door', this.accessory, {
       storage: 'fs',
       path: platform.eveLogPath
     })
@@ -63,14 +71,14 @@ module.exports = class deviceSensorContact {
       this.cacheOnOff = params.switch
       const newState = params.switch === 'on' ? 1 : 0
       this.contactService.updateCharacteristic(this.hapChar.ContactSensorState, newState)
-      this.accessory.historyService.addEntry({
+      this.accessory.eveService.addEntry({
         time: Math.round(new Date().valueOf() / 1000),
         status: newState
       })
       if (newState) {
         this.contactService.updateCharacteristic(
           this.eveLastActivation,
-          Math.round(new Date().valueOf() / 1000) - this.accessory.historyService.getInitialTime()
+          Math.round(new Date().valueOf() / 1000) - this.accessory.eveService.getInitialTime()
         )
       }
       if (params.updateSource && !this.disableDeviceLogging) {
diff --git a/lib/device/simulation/switch-valve.js b/lib/device/simulation/switch-valve.js
index d3c8bf24..f28bf1ba 100644
--- a/lib/device/simulation/switch-valve.js
+++ b/lib/device/simulation/switch-valve.js
@@ -41,7 +41,7 @@ module.exports = class deviceSwitchValve {
         callback()
       })
     this.accessory.log = platform.config.debugFakegato ? this.log : () => {}
-    this.accessory.historyService = new this.platform.eveService('switch', this.accessory, {
+    this.accessory.eveService = new this.platform.eveService('switch', this.accessory, {
       storage: 'fs',
       path: platform.eveLogPath
     })
@@ -55,7 +55,7 @@ module.exports = class deviceSwitchValve {
       params.switches[1].switch = this.vService.getCharacteristic(this.hapChar.Active).value === 1 ? 'on' : 'off'
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.cacheOnOff = value ? 'on' : 'off'
-      this.accessory.historyService.addEntry({
+      this.accessory.eveService.addEntry({
         time: Math.round(new Date().valueOf() / 1000),
         status: value ? 1 : 0
       })
@@ -109,7 +109,7 @@ module.exports = class deviceSwitchValve {
         const newStatus = params.switches[0].switch === 'on'
         this.cacheOnOff = params.switches[0].switch
         this.sService.updateCharacteristic(this.hapChar.On, newStatus)
-        this.accessory.historyService.addEntry({
+        this.accessory.eveService.addEntry({
           time: Math.round(new Date().valueOf() / 1000),
           status: newStatus ? 1 : 0
         })
diff --git a/lib/device/simulation/thermostat.js b/lib/device/simulation/thermostat.js
index de6a74e2..4039c3ed 100644
--- a/lib/device/simulation/thermostat.js
+++ b/lib/device/simulation/thermostat.js
@@ -77,7 +77,7 @@ module.exports = class deviceThermostat {
     */
 
     this.accessory.log = platform.config.debugFakegato ? this.log : () => {}
-    this.accessory.historyService = new this.platform.eveService('custom', this.accessory, {
+    this.accessory.eveService = new this.platform.eveService('custom', this.accessory, {
       storage: 'fs',
       path: platform.eveLogPath
     })
@@ -153,7 +153,7 @@ module.exports = class deviceThermostat {
         if (this.cacheOnOff !== newState) {
           this.cacheOnOff = newState
           this.service.updateCharacteristic(this.hapChar.TargetHeatingCoolingState, this.cacheOnOff === 'on' ? 1 : 0)
-          this.accessory.historyService.addEntry({
+          this.accessory.eveService.addEntry({
             time: Math.round(new Date().valueOf() / 1000),
             status: this.cacheOnOff === 'on' ? 1 : 0
           })
@@ -201,7 +201,7 @@ module.exports = class deviceThermostat {
       }
       if (this.funcs.hasProperty(eveLog, 'temp') || this.funcs.hasProperty(eveLog, 'humidity')) {
         eveLog.time = Math.round(new Date().valueOf() / 1000)
-        this.accessory.historyService.addEntry(eveLog)
+        this.accessory.eveService.addEntry(eveLog)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
diff --git a/lib/device/switch-multi.js b/lib/device/switch-multi.js
index 06944e7b..7ab02780 100644
--- a/lib/device/switch-multi.js
+++ b/lib/device/switch-multi.js
@@ -18,11 +18,17 @@ module.exports = class deviceSwitchMulti {
     this.name = accessory.displayName
     this.accessory = accessory
 
-    this.service = this.accessory.getService(this.hapServ.Switch) || this.accessory.addService(this.hapServ.Switch)
+    // Add the switch service if it doesn't already exist
+    this.service = this.accessory.getService(this.hapServ.Switch) ||
+      this.accessory.addService(this.hapServ.Switch)
+
+    // Add the set handler to the switch on/off characteristic
     this.service.getCharacteristic(this.hapChar.On)
       .on('set', this.internalUpdate.bind(this))
+
+    // Pass the accessory to Fakegato to set up with Eve
     this.accessory.log = platform.config.debugFakegato ? this.log : () => {}
-    this.accessory.historyService = new this.platform.eveService('switch', this.accessory, {
+    this.accessory.eveService = new this.platform.eveService('switch', this.accessory, {
       storage: 'fs',
       path: platform.eveLogPath
     })
@@ -129,7 +135,7 @@ module.exports = class deviceSwitchMulti {
       }
       if (!this.platform.hiddenMasters.includes(this.accessory.context.eweDeviceId)) {
         this.service.updateCharacteristic(this.hapChar.On, primaryState)
-        this.accessory.historyService.addEntry({
+        this.accessory.eveService.addEntry({
           time: Math.round(new Date().valueOf() / 1000),
           status: primaryState ? 1 : 0
         })
diff --git a/lib/device/switch-single.js b/lib/device/switch-single.js
index 5e0a81f1..e035fbf3 100644
--- a/lib/device/switch-single.js
+++ b/lib/device/switch-single.js
@@ -18,14 +18,22 @@ module.exports = class deviceSwitchSingle {
     this.name = accessory.displayName
     this.accessory = accessory
 
-    this.service = this.accessory.getService(this.hapServ.Switch) || this.accessory.addService(this.hapServ.Switch)
-    this.service.getCharacteristic(this.hapChar.On)
-      .on('set', this.internalUpdate.bind(this))
+    // If the accessory has a outlet service then remove it
     if (this.accessory.getService(this.hapServ.Outlet)) {
       this.accessory.removeService(this.accessory.getService(this.hapServ.Outlet))
     }
+
+    // Add the switch service if it doesn't already exist
+    this.service = this.accessory.getService(this.hapServ.Switch) ||
+      this.accessory.addService(this.hapServ.Switch)
+
+    // Add the set handler to the switch on/off characteristic
+    this.service.getCharacteristic(this.hapChar.On)
+      .on('set', this.internalUpdate.bind(this))
+
+    // Pass the accessory to Fakegato to set up with Eve
     this.accessory.log = platform.config.debugFakegato ? this.log : () => {}
-    this.accessory.historyService = new this.platform.eveService('switch', this.accessory, {
+    this.accessory.eveService = new this.platform.eveService('switch', this.accessory, {
       storage: 'fs',
       path: platform.eveLogPath
     })
@@ -39,7 +47,7 @@ module.exports = class deviceSwitchSingle {
         switch: value ? 'on' : 'off'
       })
       this.cacheOnOff = value ? 'on' : 'off'
-      this.accessory.historyService.addEntry({
+      this.accessory.eveService.addEntry({
         time: Math.round(new Date().valueOf() / 1000),
         status: value ? 1 : 0
       })
@@ -59,7 +67,7 @@ module.exports = class deviceSwitchSingle {
       const newStatus = params.switch === 'on'
       this.service.updateCharacteristic(this.hapChar.On, newStatus)
       this.cacheOnOff = params.switch
-      this.accessory.historyService.addEntry({
+      this.accessory.eveService.addEntry({
         time: Math.round(new Date().valueOf() / 1000),
         status: newStatus ? 1 : 0
       })
diff --git a/lib/device/template.js b/lib/device/template.js
index 1a6c2946..be89b93d 100644
--- a/lib/device/template.js
+++ b/lib/device/template.js
@@ -18,7 +18,11 @@ module.exports = class deviceTemplate {
     this.name = accessory.displayName
     this.accessory = accessory
 
-    this.service = this.accessory.getService(this.hapServ.Switch) || this.accessory.addService(this.hapServ.Switch)
+    // Add the switch service if it doesn't already exist
+    this.service = this.accessory.getService(this.hapServ.Switch) ||
+      this.accessory.addService(this.hapServ.Switch)
+
+    // Add the set handler to the switch on/off characteristic
     this.service.getCharacteristic(this.hapChar.On)
       .on('set', this.internalUpdate.bind(this))
   }
diff --git a/lib/device/usb.js b/lib/device/usb.js
index a9483662..dc1c20c7 100644
--- a/lib/device/usb.js
+++ b/lib/device/usb.js
@@ -18,21 +18,34 @@ module.exports = class deviceUSB {
     this.name = accessory.displayName
     this.accessory = accessory
 
-    if ((platform.config.outletAsSwitch || '').split(',').includes(this.accessory.context.eweDeviceId)) {
+    // Check if the user has overridden how this accessory should appear
+    if (platform.config.outletAsSwitch.includes(this.accessory.context.eweDeviceId)) {
+      // User has chosen switch so if the accessory has an outlet service then remove it
       if (this.accessory.getService(this.hapServ.Outlet)) {
         this.accessory.removeService(this.accessory.getService(this.hapServ.Outlet))
       }
-      this.service = this.accessory.getService(this.hapServ.Switch) || this.accessory.addService(this.hapServ.Switch)
+
+      // Add the switch service if it doesn't already exist
+      this.service = this.accessory.getService(this.hapServ.Switch) ||
+        this.accessory.addService(this.hapServ.Switch)
     } else {
+      // The default is an outlet so if the accessory has an switch service then remove it
       if (this.accessory.getService(this.hapServ.Switch)) {
         this.accessory.removeService(this.accessory.getService(this.hapServ.Switch))
       }
-      this.service = this.accessory.getService(this.hapServ.Outlet) || this.accessory.addService(this.hapServ.Outlet)
+
+      // Add the outlet service if it doesn't already exist
+      this.service = this.accessory.getService(this.hapServ.Outlet) ||
+        this.accessory.addService(this.hapServ.Outlet)
     }
+
+    // Add the set handler to the switch/outlet on/off characteristic
     this.service.getCharacteristic(this.hapChar.On)
       .on('set', this.internalUpdate.bind(this))
+
+    // Pass the accessory to Fakegato to set up with Eve
     this.accessory.log = platform.config.debugFakegato ? this.log : () => {}
-    this.accessory.historyService = new this.platform.eveService('switch', this.accessory, {
+    this.accessory.eveService = new this.platform.eveService('switch', this.accessory, {
       storage: 'fs',
       path: platform.eveLogPath
     })
@@ -45,7 +58,7 @@ module.exports = class deviceUSB {
       params.switches[0].switch = value ? 'on' : 'off'
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.cacheOnOff = value ? 'on' : 'off'
-      this.accessory.historyService.addEntry({
+      this.accessory.eveService.addEntry({
         time: Math.round(new Date().valueOf() / 1000),
         status: value ? 1 : 0
       })
@@ -65,7 +78,7 @@ module.exports = class deviceUSB {
       const newStatus = params.switches[0].switch === 'on'
       this.service.updateCharacteristic(this.hapChar.On, newStatus)
       this.cacheOnOff = params.switches[0].switch
-      this.accessory.historyService.addEntry({
+      this.accessory.eveService.addEntry({
         time: Math.round(new Date().valueOf() / 1000),
         status: newStatus ? 1 : 0
       })
diff --git a/lib/device/zigbee/light-dimmer.js b/lib/device/zigbee/light-dimmer.js
index c0e64a70..223bd578 100644
--- a/lib/device/zigbee/light-dimmer.js
+++ b/lib/device/zigbee/light-dimmer.js
@@ -18,9 +18,15 @@ module.exports = class deviceZBLightDimmer {
     this.name = accessory.displayName
     this.accessory = accessory
 
-    this.service = this.accessory.getService(this.hapServ.Lightbulb) || this.accessory.addService(this.hapServ.Lightbulb)
+    // Add the lightbulb service if it doesn't already exist
+    this.service = this.accessory.getService(this.hapServ.Lightbulb) ||
+      this.accessory.addService(this.hapServ.Lightbulb)
+
+    // Add the set handler to the lightbulb on/off characteristic
     this.service.getCharacteristic(this.hapChar.On)
       .on('set', this.internalOnOffUpdate.bind(this))
+
+    // Add the set handler to the lightbulb brightness characteristic
     this.service.getCharacteristic(this.hapChar.Brightness)
       .on('set', this.internalBrightnessUpdate.bind(this))
   }
diff --git a/lib/device/zigbee/sensor-ambient.js b/lib/device/zigbee/sensor-ambient.js
index c619128a..1915f899 100644
--- a/lib/device/zigbee/sensor-ambient.js
+++ b/lib/device/zigbee/sensor-ambient.js
@@ -18,21 +18,33 @@ module.exports = class deviceZBSensorAmbient {
     this.name = accessory.displayName
     this.accessory = accessory
 
-    this.lowBattThreshold = parseInt(this.platform.config.lowBattThreshold)
-    this.lowBattThreshold = isNaN(this.lowBattThreshold) || this.lowBattThreshold < 5
-      ? this.consts.defaultValues.lowBattThreshold
-      : this.lowBattThreshold
+    // Set up custom variables for this device type
+    this.lowBattThreshold = this.platform.config.lowBattThreshold
 
-    this.tService = this.accessory.getService(this.hapServ.TemperatureSensor) || this.accessory.addService(this.hapServ.TemperatureSensor)
-    this.tService.getCharacteristic(this.hapChar.CurrentTemperature)
-      .setProps({ minValue: -100 })
-    this.hService = this.accessory.getService(this.hapServ.HumiditySensor) || this.accessory.addService(this.hapServ.HumiditySensor)
+    // Add the temperature sensor service if it doesn't already exist
+    this.tService = this.accessory.getService(this.hapServ.TemperatureSensor) ||
+      this.accessory.addService(this.hapServ.TemperatureSensor)
+
+    // Set custom properties of the current temperature characteristic
+    this.tService.getCharacteristic(this.hapChar.CurrentTemperature).setProps({
+      minValue: -100,
+      minStep: 0.1
+    })
+
+    // Add the humidity sensor service if it doesn't already exist
+    this.hService = this.accessory.getService(this.hapServ.HumiditySensor) ||
+      this.accessory.addService(this.hapServ.HumiditySensor)
+
+    // Add the battery service if it doesn't already exist
+    this.battService = this.accessory.getService(this.hapServ.BatteryService) ||
+      this.accessory.addService(this.hapServ.BatteryService)
+
+    // Pass the accessory to Fakegato to set up with Eve
     this.accessory.log = platform.config.debugFakegato ? this.log : () => {}
-    this.accessory.historyService = new this.platform.eveService('weather', this.accessory, {
+    this.accessory.eveService = new this.platform.eveService('weather', this.accessory, {
       storage: 'fs',
       path: platform.eveLogPath
     })
-    this.battService = this.accessory.getService(this.hapServ.BatteryService) || this.accessory.addService(this.hapServ.BatteryService)
   }
 
   async externalUpdate (params) {
@@ -66,7 +78,7 @@ module.exports = class deviceZBSensorAmbient {
       }
       if (eveLog.temp || eveLog.humidity) {
         eveLog.time = Math.round(new Date().valueOf() / 1000)
-        this.accessory.historyService.addEntry(eveLog)
+        this.accessory.eveService.addEntry(eveLog)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
diff --git a/lib/device/zigbee/sensor-contact.js b/lib/device/zigbee/sensor-contact.js
index fa958223..7d02f8d4 100644
--- a/lib/device/zigbee/sensor-contact.js
+++ b/lib/device/zigbee/sensor-contact.js
@@ -18,10 +18,14 @@ module.exports = class deviceZBSensorContact {
     this.name = accessory.displayName
     this.accessory = accessory
 
+    // Set up custom variables for this device type
+    this.lowBattThreshold = this.platform.config.lowBattThreshold
+
+    // Set up the custom Eve characteristics for this device type
     this.inherits = require('util').inherits
     const self = this
     this.eveLastActivation = function () {
-      self.hapChar.call(this, 'Last Activation', self.consts.eveUUID.lastActivation)
+      self.hapChar.call(this, 'Last Activation', self.consts.eve.lastActivation)
       this.setProps({
         format: self.hapChar.Formats.UINT32,
         unit: self.hapChar.Units.SECONDS,
@@ -30,19 +34,22 @@ module.exports = class deviceZBSensorContact {
       this.value = this.getDefaultValue()
     }
     this.inherits(this.eveLastActivation, this.hapChar)
-    this.eveLastActivation.UUID = this.consts.eveUUID.lastActivation
-    this.lowBattThreshold = parseInt(this.platform.config.lowBattThreshold)
-    this.lowBattThreshold = isNaN(this.lowBattThreshold) || this.lowBattThreshold < 5
-      ? this.consts.defaultValues.lowBattThreshold
-      : this.lowBattThreshold
+    this.eveLastActivation.UUID = this.consts.eve.lastActivation
+
+    // Add the contact sensor service if it doesn't already exist
+    this.service = this.accessory.getService(this.hapServ.ContactSensor) ||
+      this.accessory.addService(this.hapServ.ContactSensor)
+
+    // Add the battery service if it doesn't already exist
+    this.battService = this.accessory.getService(this.hapServ.BatteryService) ||
+      this.accessory.addService(this.hapServ.BatteryService)
 
-    this.service = this.accessory.getService(this.hapServ.ContactSensor) || this.accessory.addService(this.hapServ.ContactSensor)
+    // Pass the accessory to Fakegato to set up with Eve
     this.accessory.log = platform.config.debugFakegato ? this.log : () => {}
-    this.accessory.historyService = new this.platform.eveService('door', this.accessory, {
+    this.accessory.eveService = new this.platform.eveService('door', this.accessory, {
       storage: 'fs',
       path: platform.eveLogPath
     })
-    this.battService = this.accessory.getService(this.hapServ.BatteryService) || this.accessory.addService(this.hapServ.BatteryService)
   }
 
   async externalUpdate (params) {
@@ -61,10 +68,10 @@ module.exports = class deviceZBSensorContact {
         if (params.lock === 1) {
           this.service.updateCharacteristic(
             this.eveLastActivation,
-            Math.round(new Date().valueOf() / 1000) - this.accessory.historyService.getInitialTime()
+            Math.round(new Date().valueOf() / 1000) - this.accessory.eveService.getInitialTime()
           )
         }
-        this.accessory.historyService.addEntry({
+        this.accessory.eveService.addEntry({
           time: Math.round(new Date().valueOf() / 1000),
           status: params.lock
         })
diff --git a/lib/device/zigbee/sensor-motion.js b/lib/device/zigbee/sensor-motion.js
index 0a3120e3..cba57659 100644
--- a/lib/device/zigbee/sensor-motion.js
+++ b/lib/device/zigbee/sensor-motion.js
@@ -18,10 +18,15 @@ module.exports = class deviceZBSensorMotion {
     this.name = accessory.displayName
     this.accessory = accessory
 
+    // Set up custom variables for this device type
+    this.lowBattThreshold = this.platform.config.lowBattThreshold
+    this.sensorTimeDifference = this.platform.config.sensorTimeDifference
+
+    // Set up the custom Eve characteristics for this device type
     this.inherits = require('util').inherits
     const self = this
     this.eveLastActivation = function () {
-      self.hapChar.call(this, 'Last Activation', self.consts.eveUUID.lastActivation)
+      self.hapChar.call(this, 'Last Activation', self.consts.eve.lastActivation)
       this.setProps({
         format: self.hapChar.Formats.UINT32,
         unit: self.hapChar.Units.SECONDS,
@@ -30,23 +35,21 @@ module.exports = class deviceZBSensorMotion {
       this.value = this.getDefaultValue()
     }
     this.inherits(this.eveLastActivation, this.hapChar)
-    this.eveLastActivation.UUID = this.consts.eveUUID.lastActivation
-    this.lowBattThreshold = parseInt(this.platform.config.lowBattThreshold)
-    this.lowBattThreshold = isNaN(this.lowBattThreshold) || this.lowBattThreshold < 5
-      ? this.consts.defaultValues.lowBattThreshold
-      : this.lowBattThreshold
-    this.sensorTimeDifference = parseInt(this.platform.config.sensorTimeDifference)
-    this.sensorTimeDifference = isNaN(this.sensorTimeDifference) || this.sensorTimeDifference < 10
-      ? this.consts.defaultValues.sensorTimeDifference
-      : this.sensorTimeDifference
+    this.eveLastActivation.UUID = this.consts.eve.lastActivation
+
+    // Add the motion sensor service if it doesn't already exist
+    this.service = this.accessory.getService(this.hapServ.MotionSensor) ||
+      this.accessory.addService(this.hapServ.MotionSensor)
 
-    this.service = this.accessory.getService(this.hapServ.MotionSensor) || this.accessory.addService(this.hapServ.MotionSensor)
+    // Add the battery service if it doesn't already exist
+    this.battService = this.accessory.getService(this.hapServ.BatteryService) || this.accessory.addService(this.hapServ.BatteryService)
+
+    // Pass the accessory to Fakegato to set up with Eve
     this.accessory.log = platform.config.debugFakegato ? this.log : () => {}
-    this.accessory.historyService = new this.platform.eveService('motion', this.accessory, {
+    this.accessory.eveService = new this.platform.eveService('motion', this.accessory, {
       storage: 'fs',
       path: platform.eveLogPath
     })
-    this.battService = this.accessory.getService(this.hapServ.BatteryService) || this.accessory.addService(this.hapServ.BatteryService)
   }
 
   async externalUpdate (params) {
@@ -67,10 +70,10 @@ module.exports = class deviceZBSensorMotion {
         if (motionDetected) {
           this.service.updateCharacteristic(
             this.eveLastActivation,
-            Math.round(new Date().valueOf() / 1000) - this.accessory.historyService.getInitialTime()
+            Math.round(new Date().valueOf() / 1000) - this.accessory.eveService.getInitialTime()
           )
         }
-        this.accessory.historyService.addEntry({
+        this.accessory.eveService.addEntry({
           time: Math.round(new Date().valueOf() / 1000),
           status: motionDetected ? 1 : 0
         })
diff --git a/lib/device/zigbee/switch-single.js b/lib/device/zigbee/switch-single.js
index 27f1df44..43d7c6b9 100644
--- a/lib/device/zigbee/switch-single.js
+++ b/lib/device/zigbee/switch-single.js
@@ -18,14 +18,20 @@ module.exports = class deviceZBSwitchSingle {
     this.name = accessory.displayName
     this.accessory = accessory
 
-    this.service = this.accessory.getService(this.hapServ.Switch) || this.accessory.addService(this.hapServ.Switch)
+    // Add the switch service if it doesn't already exist
+    this.service = this.accessory.getService(this.hapServ.Switch) ||
+      this.accessory.addService(this.hapServ.Switch)
+
+    // Add the set handler to the switch on/off characteristic
+    this.service.getCharacteristic(this.hapChar.On)
+      .on('set', this.internalUpdate.bind(this))
+
+    // Pass the accessory to Fakegato to set up with Eve
     this.accessory.log = platform.config.debugFakegato ? this.log : () => {}
-    this.accessory.historyService = new this.platform.eveService('switch', this.accessory, {
+    this.accessory.eveService = new this.platform.eveService('switch', this.accessory, {
       storage: 'fs',
       path: platform.eveLogPath
     })
-    this.service.getCharacteristic(this.hapChar.On)
-      .on('set', this.internalUpdate.bind(this))
   }
 
   async internalUpdate (value, callback) {
@@ -35,7 +41,7 @@ module.exports = class deviceZBSwitchSingle {
         switch: value ? 'on' : 'off'
       })
       this.cacheOnOff = value ? 'on' : 'off'
-      this.accessory.historyService.addEntry({
+      this.accessory.eveService.addEntry({
         time: Math.round(new Date().valueOf() / 1000),
         status: value ? 1 : 0
       })
@@ -54,7 +60,7 @@ module.exports = class deviceZBSwitchSingle {
       }
       this.cacheOnOff = params.switch
       this.service.updateCharacteristic(this.hapChar.On, this.cacheOnOff === 'on')
-      this.accessory.historyService.addEntry({
+      this.accessory.eveService.addEntry({
         time: Math.round(new Date().valueOf() / 1000),
         status: this.cacheOnOff === 'on' ? 1 : 0
       })
diff --git a/lib/device/zigbee/switch-stateless.js b/lib/device/zigbee/switch-stateless.js
index a7d9fa94..f52a841a 100644
--- a/lib/device/zigbee/switch-stateless.js
+++ b/lib/device/zigbee/switch-stateless.js
@@ -18,18 +18,23 @@ module.exports = class deviceZBSwitchStateless {
     this.name = accessory.displayName
     this.accessory = accessory
 
-    this.lowBattThreshold = parseInt(this.platform.config.lowBattThreshold)
-    this.lowBattThreshold = isNaN(this.lowBattThreshold) || this.lowBattThreshold < 5
-      ? this.consts.defaultValues.lowBattThreshold
-      : this.lowBattThreshold
+    // Set up custom variables for this device type
+    this.lowBattThreshold = this.platform.config.lowBattThreshold
 
-    const ssp = this.hapServ.StatelessProgrammableSwitch
-    this.service = this.accessory.getService(ssp) || this.accessory.addService(ssp)
+    // Add the stateless switch service if it doesn't already exist
+    this.service = this.accessory.getService(this.hapServ.StatelessProgrammableSwitch) ||
+      this.accessory.addService(this.hapServ.StatelessProgrammableSwitch)
+
+    // Hide the double and long press options if the user wants
     if (this.platform.config.hideZBLDPress) {
-      this.service.getCharacteristic(this.hapChar.ProgrammableSwitchEvent)
-        .setProps({ validValues: [0] })
+      this.service.getCharacteristic(this.hapChar.ProgrammableSwitchEvent).setProps({
+        validValues: [0]
+      })
     }
-    this.battService = this.accessory.getService(this.hapServ.BatteryService) || this.accessory.addService(this.hapServ.BatteryService)
+
+    // Add the battery service if it doesn't already exist
+    this.battService = this.accessory.getService(this.hapServ.BatteryService) ||
+      this.accessory.addService(this.hapServ.BatteryService)
   }
 
   async externalUpdate (params) {
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 1857baab..3d746a9e 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -203,7 +203,7 @@ module.exports = {
     'zyx_mode'
   ],
 
-  eveUUID: {
+  eve: {
     currentConsumption: 'E863F10D-079E-48FF-8F27-9C2605A29F52',
     totalConsumption: 'E863F10C-079E-48FF-8F27-9C2605A29F52',
     voltage: 'E863F10A-079E-48FF-8F27-9C2605A29F52',

From ec26f45848827b4e0eae73786fb6396212aa7909 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 8 Feb 2021 09:02:00 +0000
Subject: [PATCH 1356/3183] comments and formatting two

---
 lib/device/light-colour.js                | 24 +++----
 lib/device/light-ctemp.js                 |  2 +-
 lib/device/light-dimmer.js                |  8 +--
 lib/device/simulation/blind.js            |  4 ++
 lib/device/simulation/garage-eachen.js    | 12 ++--
 lib/device/simulation/garage-four.js      | 18 +++--
 lib/device/simulation/garage-od-switch.js | 10 ++-
 lib/device/simulation/garage-one.js       | 21 ++++--
 lib/device/simulation/garage-two.js       | 22 +++++--
 lib/device/simulation/lock-one.js         | 16 +++--
 lib/device/simulation/switch-valve.js     | 27 +++++++-
 lib/device/simulation/tap-one.js          |  4 ++
 lib/device/simulation/tap-two.js          |  4 ++
 lib/device/simulation/thermostat.js       | 80 ++++++++++++-----------
 lib/device/simulation/valve-four.js       | 27 +++++++-
 lib/device/simulation/valve-one.js        | 13 ++++
 lib/device/simulation/valve-two.js        | 27 +++++++-
 17 files changed, 229 insertions(+), 90 deletions(-)

diff --git a/lib/device/light-colour.js b/lib/device/light-colour.js
index 899a864b..52c25b79 100644
--- a/lib/device/light-colour.js
+++ b/lib/device/light-colour.js
@@ -110,17 +110,17 @@ module.exports = class deviceLightColour {
       this.updateKeyBright = updateKeyBright
       switch (this.accessory.context.eweUIID) {
         case 22:
-          // *** B1 doesn't support brightness *** \\
+          // B1 doesn't support brightness
           return
         case 59:
-          // *** L1 *** \\
+          // L1
           params = {
             mode: 1,
             bright: value
           }
           break
         case 104:
-          // *** B02-B-A60, B05-B-A60, GTLC104 *** \\
+          // B02-B-A60, B05-B-A60, GTLC104
           if (this.cacheMode === 'white') {
             params = {
               white: {
@@ -179,7 +179,7 @@ module.exports = class deviceLightColour {
       this.updateKeyColour = updateKeyColour
       switch (this.accessory.context.eweUIID) {
         case 22:
-        // *** B1 *** \\
+        // B1
           params = {
             zyx_mode: 2,
             type: 'middle',
@@ -191,7 +191,7 @@ module.exports = class deviceLightColour {
           }
           break
         case 59:
-          // *** L1 *** \\
+          // L1
           params = {
             mode: 1,
             colorR: this.cacheR,
@@ -200,7 +200,7 @@ module.exports = class deviceLightColour {
           }
           break
         case 104:
-          // *** B02-B-A60, B05-B-A60, GTLC104 *** \\
+          // B02-B-A60, B05-B-A60, GTLC104
           params = {
             ltype: this.cacheMode === 'color' ? undefined : 'color',
             color: {
@@ -252,7 +252,7 @@ module.exports = class deviceLightColour {
       let params
       switch (this.accessory.context.eweUIID) {
         case 59: {
-          // *** L1 *** \\
+          // L1
           const newRGB = this.colourUtils.hs2rgb(
             hs[0],
             this.service.getCharacteristic(this.hapChar.Saturation).value
@@ -269,7 +269,7 @@ module.exports = class deviceLightColour {
           break
         }
         case 104:
-          // *** B02-B-A60, B05-B-A60, GTLC104 *** \\
+          // B02-B-A60, B05-B-A60, GTLC104
           params = {
             ltype: this.cacheMode === 'white' ? undefined : 'white',
             white: {
@@ -325,7 +325,7 @@ module.exports = class deviceLightColour {
       let mode
       switch (this.accessory.context.eweUIID) {
         case 22:
-          // *** B1 *** \\
+          // B1
           if (params.zyx_mode) {
             mode = parseInt(params.zyx_mode)
           } else if (this.funcs.hasProperty(params, 'channel0') && parseInt(params.channel0) + parseInt(params.channel1) > 0) {
@@ -364,7 +364,7 @@ module.exports = class deviceLightColour {
           }
           break
         case 59:
-          // *** L1 *** \\
+          // L1
           if (this.funcs.hasProperty(params, 'bright')) {
             if (params.bright !== this.cacheBright) {
               this.cacheBright = params.bright
@@ -401,7 +401,7 @@ module.exports = class deviceLightColour {
           }
           break
         case 104:
-          // *** B02-B-A60, B05-B-A60, GTLC104 *** \\
+          // B02-B-A60, B05-B-A60, GTLC104
           if (params.ltype === 'color' && params.color) {
             if (this.funcs.hasProperty(params.color, 'br')) {
               if (params.color.br !== this.cacheBright) {
@@ -468,7 +468,7 @@ module.exports = class deviceLightColour {
                   this.alController.isAdaptiveLightingActive() &&
                   Math.abs(params.white.ct - this.cacheCT) > 5
                 ) {
-                  // *** look for a variation greater than five *** \\
+                  // look for a variation greater than five
                   this.alController.disableAdaptiveLighting()
                   this.log('[%s] adaptive lighting disabled due to significant colour change.', this.name)
                 }
diff --git a/lib/device/light-ctemp.js b/lib/device/light-ctemp.js
index 7c2bd8b7..ef2a243b 100644
--- a/lib/device/light-ctemp.js
+++ b/lib/device/light-ctemp.js
@@ -196,7 +196,7 @@ module.exports = class deviceLightColour {
               this.alController.isAdaptiveLightingActive() &&
               Math.abs(params.white.ct - this.cacheCT) > 5
             ) {
-              // *** look for a variation greater than five *** \\
+              // look for a variation greater than five
               this.alController.disableAdaptiveLighting()
               this.log('[%s] adaptive lighting disabled due to significant colour change.', this.name)
             }
diff --git a/lib/device/light-dimmer.js b/lib/device/light-dimmer.js
index 3144b35f..4e5c4195 100644
--- a/lib/device/light-dimmer.js
+++ b/lib/device/light-dimmer.js
@@ -61,11 +61,11 @@ module.exports = class deviceLightDimmer {
       const params = {}
       switch (this.accessory.context.eweUIID) {
         case 36:
-        // *** KING-M4 eWeLink scale is 10-100 and HomeKit scale is 0-100. *** \\
+        // KING-M4 eWeLink scale is 10-100 and HomeKit scale is 0-100.
           params.bright = Math.round((this.cacheBrightness * 9) / 10 + 10)
           break
         case 44:
-        // *** D1 eWeLink scale matches HomeKit scale of 0-100 *** \\
+        // D1 eWeLink scale matches HomeKit scale of 0-100
           params.brightness = this.cacheBrightness
           params.mode = 0
           break
@@ -96,7 +96,7 @@ module.exports = class deviceLightDimmer {
       }
       switch (this.accessory.context.eweUIID) {
         case 36:
-          // *** KING-M4 eWeLink scale is 10-100 and HomeKit scale is 0-100. *** \\
+          // KING-M4 eWeLink scale is 10-100 and HomeKit scale is 0-100.
           if (this.funcs.hasProperty(params, 'bright')) {
             const nb = Math.round(((params.bright - 10) * 10) / 9)
             if (nb !== this.cacheBrightness) {
@@ -109,7 +109,7 @@ module.exports = class deviceLightDimmer {
           }
           break
         case 44:
-          // *** D1 eWeLink scale matches HomeKit scale of 0-100 *** \\
+          // D1 eWeLink scale matches HomeKit scale of 0-100
           if (this.funcs.hasProperty(params, 'brightness')) {
             if (params.brightness !== this.cacheBrightness) {
               this.service.updateCharacteristic(this.hapChar.Brightness, params.brightness)
diff --git a/lib/device/simulation/blind.js b/lib/device/simulation/blind.js
index 8ea793a1..7ef5e4f4 100644
--- a/lib/device/simulation/blind.js
+++ b/lib/device/simulation/blind.js
@@ -18,18 +18,22 @@ module.exports = class deviceBlind {
     this.name = accessory.displayName
     this.accessory = accessory
 
+    // Set up the accessory with default positions when added the first time
     if (!this.funcs.hasProperty(this.accessory.context, 'cacheCurrentPosition')) {
       this.accessory.context.cacheCurrentPosition = 0
       this.accessory.context.cachePositionState = 2
       this.accessory.context.cacheTargetPosition = 0
     }
 
+    // Add the window covering service if it doesn't already exist
     if (!(this.service = this.accessory.getService(this.hapServ.WindowCovering))) {
       this.service = this.accessory.addService(this.hapServ.WindowCovering)
       this.service.setCharacteristic(this.hapChar.CurrentPosition, 0)
         .setCharacteristic(this.hapChar.TargetPosition, 0)
         .setCharacteristic(this.hapChar.PositionState, 2)
     }
+
+    // Add the set handler to the target position characteristic
     this.service.getCharacteristic(this.hapChar.TargetPosition)
       .on('set', this.internalUpdate.bind(this))
   }
diff --git a/lib/device/simulation/garage-eachen.js b/lib/device/simulation/garage-eachen.js
index b20a7e1f..1a4374c3 100644
--- a/lib/device/simulation/garage-eachen.js
+++ b/lib/device/simulation/garage-eachen.js
@@ -18,19 +18,23 @@ module.exports = class deviceGarageEachen {
     this.name = accessory.displayName
     this.accessory = accessory
 
-    this.operationTime = parseInt(platform.simulations[this.accessory.context.eweDeviceId].operationTime)
-    this.operationTime = isNaN(this.operationTime) || this.operationTime < 20
-      ? this.consts.defaultValues.operationTime
-      : this.operationTime
+    // Set up custom variables for this device type
+    const eweId = this.accessory.context.eweDeviceId
+    this.operationTime = platform.simulations[eweId].operationTime
 
+    // Add the garage door service if it doesn't already exist
     if (!(this.service = this.accessory.getService(this.hapServ.GarageDoorOpener))) {
       this.service = this.accessory.addService(this.hapServ.GarageDoorOpener)
       this.service.setCharacteristic(this.hapChar.CurrentDoorState, 1)
         .setCharacteristic(this.hapChar.TargetDoorState, 1)
         .setCharacteristic(this.hapChar.ObstructionDetected, false)
     }
+
+    // Add the set handler to the target position characteristic
     this.service.getCharacteristic(this.hapChar.TargetDoorState)
       .on('set', this.internalUpdate.bind(this))
+
+    // Update the obstruction detected to false on Homebridge restart
     this.service.updateCharacteristic(this.hapChar.ObstructionDetected, false)
   }
 
diff --git a/lib/device/simulation/garage-four.js b/lib/device/simulation/garage-four.js
index 15826999..b36dbfb3 100644
--- a/lib/device/simulation/garage-four.js
+++ b/lib/device/simulation/garage-four.js
@@ -18,6 +18,7 @@ module.exports = class deviceGarageFour {
     this.name = accessory.displayName
     this.accessory = accessory
 
+    // Set up the accessory with default positions when added the first time
     if (!this.funcs.hasProperty(this.accessory.context, 'cacheStates')) {
       this.accessory.context.cacheStates = [
         { cacheCurrentDoorState: 1, cacheTargetDoorState: 1 },
@@ -27,19 +28,26 @@ module.exports = class deviceGarageFour {
       ]
     }
 
-    this.operationTime = parseInt(platform.simulations[this.accessory.context.eweDeviceId].operationTime)
-    this.operationTime = isNaN(this.operationTime) || this.operationTime < 20
-      ? this.consts.defaultValues.operationTime
-      : this.operationTime
+    // Set up custom variables for this device type
+    const eweId = this.accessory.context.eweDeviceId
+    this.operationTime = platform.simulations[eweId].operationTime
 
+    // We want four garage door services for this accessory
     ;['A', 'B', 'C', 'D'].forEach(v => {
+      // Add the garage door service if it doesn't already exist
       let gdService
       if (!(gdService = this.accessory.getService('Garage ' + v))) {
-        gdService = this.accessory.addService(this.hapServ.GarageDoorOpener, 'Garage ' + v, 'garage' + v)
+        gdService = this.accessory.addService(
+          this.hapServ.GarageDoorOpener,
+          'Garage ' + v,
+          'garage' + v
+        )
         gdService.setCharacteristic(this.hapChar.CurrentDoorState, 1)
           .setCharacteristic(this.hapChar.TargetDoorState, 1)
           .setCharacteristic(this.hapChar.ObstructionDetected, false)
       }
+
+      // Add the set handler to the target position characteristic
       gdService.getCharacteristic(this.hapChar.TargetDoorState)
         .on('set', (value, callback) => this.internalUpdate(v, value, callback))
     })
diff --git a/lib/device/simulation/garage-od-switch.js b/lib/device/simulation/garage-od-switch.js
index af1c8f46..3fed70ef 100644
--- a/lib/device/simulation/garage-od-switch.js
+++ b/lib/device/simulation/garage-od-switch.js
@@ -18,14 +18,22 @@ module.exports = class deviceGarageODSwitch {
     this.name = accessory.displayName
     this.accessory = accessory
 
+    // Set up custom variables for this device type
     this.garageId = platform.obstructSwitches[this.accessory.context.eweDeviceId]
     this.garage = platform.devicesInHB.get(this.garageId + 'SWX')
 
-    this.service = this.accessory.getService(this.hapServ.Switch) || this.accessory.addService(this.hapServ.Switch)
+    // Add the switch service if it doesn't already exist
+    this.service = this.accessory.getService(this.hapServ.Switch) ||
+      this.accessory.addService(this.hapServ.Switch)
+
+    // Add the set handler to the switch on/off characteristic
     this.service.getCharacteristic(this.hapChar.On)
       .on('set', this.internalUpdate.bind(this))
 
+    // Get the garage door accessory to which this switch relates
     this.gService = this.garage.getService(this.hapServ.GarageDoorOpener)
+
+    // Update the obstruction detected of the garage depending on the switch state
     this.gService.updateCharacteristic(
       this.hapChar.ObstructionDetected,
       this.service.getCharacteristic(this.hapChar.On).value
diff --git a/lib/device/simulation/garage-one.js b/lib/device/simulation/garage-one.js
index baa68107..0aae3004 100644
--- a/lib/device/simulation/garage-one.js
+++ b/lib/device/simulation/garage-one.js
@@ -18,30 +18,37 @@ module.exports = class deviceGarageOne {
     this.name = accessory.displayName
     this.accessory = accessory
 
+    // Set up the accessory with default positions when added the first time
     if (!this.funcs.hasProperty(this.accessory.context, 'cacheCurrentDoorState')) {
       this.accessory.context.cacheCurrentDoorState = 1
       this.accessory.context.cacheTargetDoorState = 1
     }
 
+    // Validate the user config
     const asConfig = platform.simulations[this.accessory.context.eweDeviceId]
     if (!['oneSwitch', 'twoSwitch'].includes(asConfig.setup)) {
       this.error = 'setup must be oneSwitch or twoSwitch'
     }
     this.setup = asConfig.setup
-    this.operationTime = parseInt(asConfig.operationTime)
-    this.operationTime = isNaN(this.operationTime) || this.operationTime < 20
-      ? this.consts.defaultValues.operationTime
-      : this.operationTime
+
+    // Set up custom variables for this device type
+    this.operationTime = asConfig.operationTime
+
+    // Check the sensor is valid if defined by the user
     if (asConfig.sensorId) {
-      if (!this.platform.devicesInHB.has(asConfig.sensorId + 'SWX')) {
+      // Check the sensor exists in Homebridge
+      if (!platform.devicesInHB.has(asConfig.sensorId + 'SWX')) {
         this.error = 'defined sensor does not exist in Homebridge'
       }
-      if (this.platform.devicesInHB.get(asConfig.sensorId + 'SWX').context.eweUIID !== 102) {
+
+      // Check the sensor is a sensor
+      if (platform.devicesInHB.get(asConfig.sensorId + 'SWX').context.eweUIID !== 102) {
         this.error = 'defined sensor is not a DW2 sensor'
       }
       this.definedSensor = this.platform.devicesInHB.get(asConfig.sensorId + 'SWX')
     }
 
+    // Add the garage door service if it doesn't already exist
     if (!(this.service = this.accessory.getService(this.hapServ.GarageDoorOpener))) {
       this.accessory.addService(this.hapServ.GarageDoorOpener)
         .setCharacteristic(this.hapChar.CurrentDoorState, 1)
@@ -49,6 +56,8 @@ module.exports = class deviceGarageOne {
         .setCharacteristic(this.hapChar.ObstructionDetected, false)
       this.service = this.accessory.getService(this.hapServ.GarageDoorOpener)
     }
+
+    // Add the set handler to the target position characteristic
     this.service.getCharacteristic(this.hapChar.TargetDoorState)
       .on('set', this.internalUpdate.bind(this))
   }
diff --git a/lib/device/simulation/garage-two.js b/lib/device/simulation/garage-two.js
index c8631a09..0f2bc51d 100644
--- a/lib/device/simulation/garage-two.js
+++ b/lib/device/simulation/garage-two.js
@@ -18,6 +18,7 @@ module.exports = class deviceGarageTwo {
     this.name = accessory.displayName
     this.accessory = accessory
 
+    // Set up the accessory with default positions when added the first time
     if (!this.funcs.hasProperty(this.accessory.context, 'cacheCurrentDoorState')) {
       this.accessory.context.cacheOneCurrentDoorState = 1
       this.accessory.context.cacheOneTargetDoorState = 1
@@ -25,21 +26,30 @@ module.exports = class deviceGarageTwo {
       this.accessory.context.cacheTwoTargetDoorState = 1
     }
 
-    this.operationTime = parseInt(platform.simulations[this.accessory.context.eweDeviceId].operationTime)
-    this.operationTime = isNaN(this.operationTime) || this.operationTime < 20
-      ? this.consts.defaultValues.operationTime
-      : this.operationTime
+    // Set up custom variables for this device type
+    const eweId = this.accessory.context.eweDeviceId
+    this.operationTime = platform.simulations[eweId].operationTime
 
+    // We want two garage door services for this accessory
     ;['1', '2'].forEach(v => {
+      // Add the garage door service if it doesn't already exist
       let gdService
       if (!(gdService = this.accessory.getService('Garage ' + v))) {
-        gdService = this.accessory.addService(this.hapServ.GarageDoorOpener, 'Garage ' + v, 'garage' + v)
+        gdService = this.accessory.addService(
+          this.hapServ.GarageDoorOpener,
+          'Garage ' + v,
+          'garage' + v
+        )
         gdService.setCharacteristic(this.hapChar.CurrentDoorState, 1)
           .setCharacteristic(this.hapChar.TargetDoorState, 1)
           .setCharacteristic(this.hapChar.ObstructionDetected, false)
       }
+
+      // Add the set handler to the target position characteristic
       gdService.getCharacteristic(this.hapChar.TargetDoorState)
-        .on('set', (value, callback) => this.internalUpdate('Garage' + v, value, callback))
+        .on('set', (value, callback) => {
+          this.internalUpdate('Garage' + v, value, callback)
+        })
     })
   }
 
diff --git a/lib/device/simulation/lock-one.js b/lib/device/simulation/lock-one.js
index e33144e6..67e006e1 100644
--- a/lib/device/simulation/lock-one.js
+++ b/lib/device/simulation/lock-one.js
@@ -18,19 +18,25 @@ module.exports = class deviceLockOne {
     this.name = accessory.displayName
     this.accessory = accessory
 
+    // Validate the user config
     const asConfig = platform.simulations[this.accessory.context.eweDeviceId]
     if (!['oneSwitch', 'twoSwitch'].includes(asConfig.setup)) {
       this.error = 'setup must be oneSwitch or twoSwitch'
     }
     this.setup = asConfig.setup
-    this.operationTime = parseInt(asConfig.operationTime)
-    this.operationTime = isNaN(this.operationTime) || this.operationTime < 20
-      ? this.consts.defaultValues.operationTime
-      : this.operationTime
 
-    this.service = this.accessory.getService(this.hapServ.LockMechanism) || this.accessory.addService(this.hapServ.LockMechanism)
+    // Set up custom variables for this device type
+    this.operationTime = asConfig.operationTime
+
+    // Add the lock service if it doesn't already exist
+    this.service = this.accessory.getService(this.hapServ.LockMechanism) ||
+      this.accessory.addService(this.hapServ.LockMechanism)
+
+    // Add the set handler to the lock target state characteristic
     this.service.getCharacteristic(this.hapChar.LockTargetState)
       .on('set', this.internalUpdate.bind(this))
+
+    // Always show the accessory as locked on Homebridge restart
     this.service.updateCharacteristic(this.hapChar.LockCurrentState, 1)
       .updateCharacteristic(this.hapChar.LockTargetState, 1)
   }
diff --git a/lib/device/simulation/switch-valve.js b/lib/device/simulation/switch-valve.js
index f28bf1ba..5f61bead 100644
--- a/lib/device/simulation/switch-valve.js
+++ b/lib/device/simulation/switch-valve.js
@@ -18,7 +18,11 @@ module.exports = class deviceSwitchValve {
     this.name = accessory.displayName
     this.accessory = accessory
 
-    this.sService = this.accessory.getService(this.hapServ.Switch) || this.accessory.addService(this.hapServ.Switch)
+    // Add the switch service if it doesn't already exist
+    this.sService = this.accessory.getService(this.hapServ.Switch) ||
+      this.accessory.addService(this.hapServ.Switch)
+
+    // Add the valve service if it doesn't already exist
     if (!(this.vService = this.accessory.getService(this.hapServ.Valve))) {
       this.vService = this.accessory.addService(this.hapServ.Valve)
       this.vService.setCharacteristic(this.hapChar.Active, 0)
@@ -27,19 +31,36 @@ module.exports = class deviceSwitchValve {
         .setCharacteristic(this.hapChar.SetDuration, 120)
         .addCharacteristic(this.hapChar.RemainingDuration)
     }
+
+    // Add the set handler to the switch on/off characteristic
     this.sService.getCharacteristic(this.hapChar.On)
       .on('set', this.internalSwitchUpdate.bind(this))
+
+    // Add the set handler to the valve active characteristic
     this.vService.getCharacteristic(this.hapChar.Active)
       .on('set', this.internalValveUpdate.bind(this))
+
+    // Add the set handler to the valve set duration characteristic
     this.vService.getCharacteristic(this.hapChar.SetDuration)
       .on('set', (value, callback) => {
-        if (this.vService.getCharacteristic(this.hapChar.InUse).value) {
+        // Check if the valve is currently active
+        if (this.vService.getCharacteristic(this.hapChar.InUse).value === 1) {
+          // Update the remaining duration characteristic with the new value
           this.vService.updateCharacteristic(this.hapChar.RemainingDuration, value)
+
+          // Clear any existing active timers
           clearTimeout(this.timer)
-          this.timer = setTimeout(() => this.vService.setCharacteristic(this.hapChar.Active, 0), value * 1000)
+
+          // Set a new active timer with the new time amount
+          this.timer = setTimeout(
+            () => this.vService.setCharacteristic(this.hapChar.Active, 0),
+            value * 1000
+          )
         }
         callback()
       })
+
+    // Pass the accessory to Fakegato to set up with Eve
     this.accessory.log = platform.config.debugFakegato ? this.log : () => {}
     this.accessory.eveService = new this.platform.eveService('switch', this.accessory, {
       storage: 'fs',
diff --git a/lib/device/simulation/tap-one.js b/lib/device/simulation/tap-one.js
index 14baa590..fb216431 100644
--- a/lib/device/simulation/tap-one.js
+++ b/lib/device/simulation/tap-one.js
@@ -18,18 +18,22 @@ module.exports = class deviceTapOne {
     this.name = accessory.displayName
     this.accessory = accessory
 
+    // Validate the user config
     const asConfig = platform.simulations[this.accessory.context.eweDeviceId]
     if (!['oneSwitch', 'twoSwitch'].includes(asConfig.setup)) {
       this.error = 'setup must be oneSwitch or twoSwitch'
     }
     this.setup = asConfig.setup
 
+    // Add the tap service if it doesn't already exist
     if (!(this.service = this.accessory.getService(this.hapServ.Valve))) {
       this.service = this.accessory.addService(this.hapServ.Valve)
       this.service.setCharacteristic(this.hapChar.Active, 0)
         .setCharacteristic(this.hapChar.InUse, 0)
         .setCharacteristic(this.hapChar.ValveType, 3)
     }
+
+    // Add the set handler to the tap active characteristic
     this.service.getCharacteristic(this.hapChar.Active)
       .on('set', this.internalUpdate.bind(this))
   }
diff --git a/lib/device/simulation/tap-two.js b/lib/device/simulation/tap-two.js
index f31c10b3..6a029e55 100644
--- a/lib/device/simulation/tap-two.js
+++ b/lib/device/simulation/tap-two.js
@@ -18,7 +18,9 @@ module.exports = class deviceTapTwo {
     this.name = accessory.displayName
     this.accessory = accessory
 
+    // We want two tap services for this accessory
     ;['A', 'B'].forEach(v => {
+      // Add the tap service if it doesn't already exist
       let tapService
       if (!(tapService = this.accessory.getService(this.hapServ.Valve))) {
         tapService = this.accessory.addService(this.hapServ.Valve)
@@ -26,6 +28,8 @@ module.exports = class deviceTapTwo {
           .setCharacteristic(this.hapChar.InUse, 0)
           .setCharacteristic(this.hapChar.ValveType, 3)
       }
+
+      // Add the set handler to the tap active characteristic
       tapService.getCharacteristic(this.hapChar.Active)
         .on('set', (value, callback) => this.internalUpdate('Tap ' + v, value, callback))
     })
diff --git a/lib/device/simulation/thermostat.js b/lib/device/simulation/thermostat.js
index 4039c3ed..1504f65e 100644
--- a/lib/device/simulation/thermostat.js
+++ b/lib/device/simulation/thermostat.js
@@ -18,28 +18,50 @@ module.exports = class deviceThermostat {
     this.name = accessory.displayName
     this.accessory = accessory
 
-    this.tempOffset = parseFloat(platform.thTempOffset[this.accessory.context.eweDeviceId] || 0)
+    // Set up custom variables for this device type
+    const eweId = this.accessory.context.eweDeviceId
+    this.tempOffset = Number(platform.thTempOffset[eweId] || 0)
+
+    // If the accessory has a switch service then remove it
     if (this.accessory.getService(this.hapServ.Switch)) {
       this.accessory.removeService(this.accessory.getService(this.hapServ.Switch))
     }
+
+    // If the accessory has a temperature sensor service then remove it
     if (this.accessory.getService(this.hapServ.TemperatureSensor)) {
-      this.accessory.removeService(this.accessory.getService(this.hapServ.TemperatureSensor))
+      this.accessory.removeService(
+        this.accessory.getService(this.hapServ.TemperatureSensor)
+      )
     }
+
+    // If the accessory has a humidity sensor service then remove it
     if (this.accessory.getService(this.hapServ.HumiditySensor)) {
-      this.accessory.removeService(this.accessory.getService(this.hapServ.HumiditySensor))
+      this.accessory.removeService(
+        this.accessory.getService(this.hapServ.HumiditySensor)
+      )
     }
+
+    // Set up the accessory with default target temp when added the first time
     if (!this.funcs.hasProperty(this.accessory.context, 'cacheTarget')) {
       this.accessory.context.cacheTarget = 20
     }
-    this.service = this.accessory.getService(this.hapServ.Thermostat) || this.accessory.addService(this.hapServ.Thermostat)
-    this.service.getCharacteristic(this.hapChar.CurrentTemperature)
-      .setProps({
-        minValue: -100,
-        minStep: 0.1
-      })
+
+    // Add the thermostat service if it doesn't already exist
+    this.service = this.accessory.getService(this.hapServ.Thermostat) ||
+      this.accessory.addService(this.hapServ.Thermostat)
+
+    // Set custom properties of the current temperature characteristic
+    this.service.getCharacteristic(this.hapChar.CurrentTemperature).setProps({
+      minValue: -100,
+      minStep: 0.1
+    })
+
+    // Add the set handler to the target state characteristic
     this.service.getCharacteristic(this.hapChar.TargetHeatingCoolingState)
       .on('set', this.internalOnOffUpdate.bind(this))
       .setProps({ validValues: [0, 1] })
+
+    // Add the set handler to the target temperature characteristic
     this.service.getCharacteristic(this.hapChar.TargetTemperature)
       .on('set', this.internalTargetTempUpdate.bind(this))
       .setProps({
@@ -47,43 +69,27 @@ module.exports = class deviceThermostat {
         maxValue: 30,
         minStep: 0.5
       })
-    if (this.accessory.context.sensorType !== 'DS18B20' && !this.service.testCharacteristic(this.hapChar.CurrentRelativeHumidity)) {
+
+    // The DS18B20 sensor does not provide humidity readings
+    if (
+      this.accessory.context.sensorType !== 'DS18B20' &&
+      !this.service.testCharacteristic(this.hapChar.CurrentRelativeHumidity)
+    ) {
       this.service.addCharacteristic(this.hapChar.CurrentRelativeHumidity)
     }
 
-    /*
-    The eWeLink app seems a little confusing with only options for
-      - if temp is HIGHER THAN    eg 20.0 TURN ON/OFF
-      - if temp is LOWER THAN     eg 20.0 TURN ON/OFF
-    There doesn't seem to be an option for IS EQUAL TO but I assume the ON/OFF doesn't change from the previous state
-
-    The payload for automatic mode is as follows:
-
-    "deviceType": "temperature",
-    "targets": [
-      {
-        "targetHigh": "19.6",
-        "reaction": {
-          "switch": "off"
-        }
-      },
-      {
-        "targetLow": "19.6",
-        "reaction": {
-          "switch": "on"
-        }
-      }
-    ]
-    */
-
+    // Pass the accessory to Fakegato to set up with Eve
     this.accessory.log = platform.config.debugFakegato ? this.log : () => {}
     this.accessory.eveService = new this.platform.eveService('custom', this.accessory, {
       storage: 'fs',
       path: platform.eveLogPath
     })
 
-    // *** Setting this already makes the plugin send the payload to setup as thermostat *** \\
-    this.service.setCharacteristic(this.hapChar.TargetTemperature, this.accessory.context.cacheTarget)
+    // Setting this now makes the plugin send the payload to setup as thermostat
+    this.service.setCharacteristic(
+      this.hapChar.TargetTemperature,
+      this.accessory.context.cacheTarget
+    )
   }
 
   async internalOnOffUpdate (value, callback) {
diff --git a/lib/device/simulation/valve-four.js b/lib/device/simulation/valve-four.js
index ec73f5f1..bc27f2c9 100644
--- a/lib/device/simulation/valve-four.js
+++ b/lib/device/simulation/valve-four.js
@@ -18,24 +18,45 @@ module.exports = class deviceValveFour {
     this.name = accessory.displayName
     this.accessory = accessory
 
+    // We want four valve services for this accessory
     ;['A', 'B', 'C', 'D'].forEach(v => {
+      // Add the valve service if it doesn't already exist
       let valveService
       if (!(valveService = this.accessory.getService('Valve ' + v))) {
-        valveService = this.accessory.addService(this.hapServ.Valve, 'Valve ' + v, 'valve' + v.toLowerCase())
+        valveService = this.accessory.addService(
+          this.hapServ.Valve,
+          'Valve ' + v,
+          'valve' + v.toLowerCase()
+        )
         valveService.setCharacteristic(this.hapChar.Active, 0)
           .setCharacteristic(this.hapChar.InUse, 0)
           .setCharacteristic(this.hapChar.ValveType, 1)
           .setCharacteristic(this.hapChar.SetDuration, 120)
           .addCharacteristic(this.hapChar.RemainingDuration)
       }
+
+      // Add the set handler to the valve active characteristic
       valveService.getCharacteristic(this.hapChar.Active)
-        .on('set', (value, callback) => this.internalUpdate('Valve ' + v, value, callback))
+        .on('set', (value, callback) => {
+          this.internalUpdate('Valve ' + v, value, callback)
+        })
+
+      // Add the set handler to the valve set duration characteristic
       valveService.getCharacteristic(this.hapChar.SetDuration)
         .on('set', (value, callback) => {
+          // Check if the valve is currently active
           if (valveService.getCharacteristic(this.hapChar.InUse).value === 1) {
+            // Update the remaining duration characteristic with the new value
             valveService.updateCharacteristic(this.hapChar.RemainingDuration, value)
+
+            // Clear any existing active timers
             clearTimeout(valveService.timer)
-            valveService.timer = setTimeout(() => valveService.setCharacteristic(this.hapChar.Active, 0), value * 1000)
+
+            // Set a new active timer with the new time amount
+            valveService.timer = setTimeout(
+              () => valveService.setCharacteristic(this.hapChar.Active, 0),
+              value * 1000
+            )
           }
           callback()
         })
diff --git a/lib/device/simulation/valve-one.js b/lib/device/simulation/valve-one.js
index b74eef83..4c5ca302 100644
--- a/lib/device/simulation/valve-one.js
+++ b/lib/device/simulation/valve-one.js
@@ -18,11 +18,14 @@ module.exports = class deviceValveOne {
     this.name = accessory.displayName
     this.accessory = accessory
 
+    // Validate the user config
     const asConfig = platform.simulations[this.accessory.context.eweDeviceId]
     if (!['oneSwitch', 'twoSwitch'].includes(asConfig.setup)) {
       this.error = 'setup must be oneSwitch or twoSwitch'
     }
     this.setup = asConfig.setup
+
+    // Add the valve service if it doesn't already exist
     if (!(this.service = this.accessory.getService(this.hapServ.Valve))) {
       this.service = this.accessory.addService(this.hapServ.Valve)
       this.service.setCharacteristic(this.hapChar.Active, 0)
@@ -31,13 +34,23 @@ module.exports = class deviceValveOne {
         .setCharacteristic(this.hapChar.SetDuration, 120)
         .addCharacteristic(this.hapChar.RemainingDuration)
     }
+
+    // Add the set handler to the valve active characteristic
     this.service.getCharacteristic(this.hapChar.Active)
       .on('set', this.internalUpdate.bind(this))
+
+    // Add the set handler to the valve set duration characteristic
     this.service.getCharacteristic(this.hapChar.SetDuration)
       .on('set', (value, callback) => {
+        // Check if the valve is currently active
         if (this.service.getCharacteristic(this.hapChar.InUse).value === 1) {
+          // Update the remaining duration characteristic with the new value
           this.service.updateCharacteristic(this.hapChar.RemainingDuration, value)
+
+          // Clear any existing active timers
           clearTimeout(this.timer)
+
+          // Set a new active timer with the new time amount
           this.timer = setTimeout(
             () => this.service.setCharacteristic(this.hapChar.Active, 0),
             value * 1000
diff --git a/lib/device/simulation/valve-two.js b/lib/device/simulation/valve-two.js
index 6a9aae90..75b4f48a 100644
--- a/lib/device/simulation/valve-two.js
+++ b/lib/device/simulation/valve-two.js
@@ -18,24 +18,45 @@ module.exports = class deviceValveTwo {
     this.name = accessory.displayName
     this.accessory = accessory
 
+    // We want two valve services for this accessory
     ;['A', 'B'].forEach(v => {
+      // Add the valve service if it doesn't already exist
       let valveService
       if (!(valveService = this.accessory.getService('Valve ' + v))) {
-        valveService = this.accessory.addService(this.hapServ.Valve, 'Valve ' + v, 'valve' + v.toLowerCase())
+        valveService = this.accessory.addService(
+          this.hapServ.Valve,
+          'Valve ' + v,
+          'valve' + v.toLowerCase()
+        )
         valveService.setCharacteristic(this.hapChar.Active, 0)
           .setCharacteristic(this.hapChar.InUse, 0)
           .setCharacteristic(this.hapChar.ValveType, 1)
           .setCharacteristic(this.hapChar.SetDuration, 120)
           .addCharacteristic(this.hapChar.RemainingDuration)
       }
+
+      // Add the set handler to the valve active characteristic
       valveService.getCharacteristic(this.hapChar.Active)
-        .on('set', (value, callback) => this.internalUpdate('Valve ' + v, value, callback))
+        .on('set', (value, callback) => {
+          this.internalUpdate('Valve ' + v, value, callback)
+        })
+
+      // Add the set handler to the valve set duration characteristic
       valveService.getCharacteristic(this.hapChar.SetDuration)
         .on('set', (value, callback) => {
+          // Check if the valve is currently active
           if (valveService.getCharacteristic(this.hapChar.InUse).value === 1) {
+            // Update the remaining duration characteristic with the new value
             valveService.updateCharacteristic(this.hapChar.RemainingDuration, value)
+
+            // Clear any existing active timers
             clearTimeout(valveService.timer)
-            valveService.timer = setTimeout(() => valveService.setCharacteristic(this.hapChar.Active, 0), value * 1000)
+
+            // Set a new active timer with the new time amount
+            valveService.timer = setTimeout(
+              () => valveService.setCharacteristic(this.hapChar.Active, 0),
+              value * 1000
+            )
           }
           callback()
         })

From 833cf31b5307acd1e390c0f5fc4e3a692d8a29b7 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 8 Feb 2021 09:05:54 +0000
Subject: [PATCH 1357/3183] redundant checking

---
 lib/device/simulation/garage-one.js |  6 +-----
 lib/device/simulation/lock-one.js   | 18 +-----------------
 lib/device/simulation/tap-one.js    | 14 +-------------
 lib/device/simulation/valve-one.js  | 14 +-------------
 4 files changed, 4 insertions(+), 48 deletions(-)

diff --git a/lib/device/simulation/garage-one.js b/lib/device/simulation/garage-one.js
index 0aae3004..8e6fb5ea 100644
--- a/lib/device/simulation/garage-one.js
+++ b/lib/device/simulation/garage-one.js
@@ -24,11 +24,7 @@ module.exports = class deviceGarageOne {
       this.accessory.context.cacheTargetDoorState = 1
     }
 
-    // Validate the user config
-    const asConfig = platform.simulations[this.accessory.context.eweDeviceId]
-    if (!['oneSwitch', 'twoSwitch'].includes(asConfig.setup)) {
-      this.error = 'setup must be oneSwitch or twoSwitch'
-    }
+    // Set up custom variables for this device type
     this.setup = asConfig.setup
 
     // Set up custom variables for this device type
diff --git a/lib/device/simulation/lock-one.js b/lib/device/simulation/lock-one.js
index 67e006e1..9b817ef6 100644
--- a/lib/device/simulation/lock-one.js
+++ b/lib/device/simulation/lock-one.js
@@ -14,15 +14,7 @@ module.exports = class deviceLockOne {
     this.messages = platform.messages
     this.platform = platform
 
-    // Set up variables from the accessory
-    this.name = accessory.displayName
-    this.accessory = accessory
-
-    // Validate the user config
-    const asConfig = platform.simulations[this.accessory.context.eweDeviceId]
-    if (!['oneSwitch', 'twoSwitch'].includes(asConfig.setup)) {
-      this.error = 'setup must be oneSwitch or twoSwitch'
-    }
+    // Set up custom variables for this device type
     this.setup = asConfig.setup
 
     // Set up custom variables for this device type
@@ -44,10 +36,6 @@ module.exports = class deviceLockOne {
   async internalUpdate (value, callback) {
     try {
       callback()
-      if (this.error) {
-        this.log.warn('[%s] invalid config - %s.', this.name, this.error)
-        return
-      }
       const params = {}
       switch (this.setup) {
         case 'oneSwitch':
@@ -79,10 +67,6 @@ module.exports = class deviceLockOne {
 
   async externalUpdate (params) {
     try {
-      if (this.error) {
-        this.log.warn('[%s] invalid config - %s.', this.name, this.error)
-        return
-      }
       if (this.inUse) {
         return
       }
diff --git a/lib/device/simulation/tap-one.js b/lib/device/simulation/tap-one.js
index fb216431..29c2ab7a 100644
--- a/lib/device/simulation/tap-one.js
+++ b/lib/device/simulation/tap-one.js
@@ -18,11 +18,7 @@ module.exports = class deviceTapOne {
     this.name = accessory.displayName
     this.accessory = accessory
 
-    // Validate the user config
-    const asConfig = platform.simulations[this.accessory.context.eweDeviceId]
-    if (!['oneSwitch', 'twoSwitch'].includes(asConfig.setup)) {
-      this.error = 'setup must be oneSwitch or twoSwitch'
-    }
+    // Set up custom variables for this device type
     this.setup = asConfig.setup
 
     // Add the tap service if it doesn't already exist
@@ -41,10 +37,6 @@ module.exports = class deviceTapOne {
   async internalUpdate (value, callback) {
     try {
       callback()
-      if (this.error) {
-        this.log.warn('[%s] invalid config - %s.', this.name, this.error)
-        return
-      }
       const params = {}
       switch (this.setup) {
         case 'oneSwitch':
@@ -68,10 +60,6 @@ module.exports = class deviceTapOne {
 
   async externalUpdate (params) {
     try {
-      if (this.error) {
-        this.log.warn('[%s] invalid config - %s.', this.name, this.error)
-        return
-      }
       switch (this.setup) {
         case 'oneSwitch':
           if (!params.switch || params.switch === this.cacheOnOff) {
diff --git a/lib/device/simulation/valve-one.js b/lib/device/simulation/valve-one.js
index 4c5ca302..c3c38286 100644
--- a/lib/device/simulation/valve-one.js
+++ b/lib/device/simulation/valve-one.js
@@ -18,11 +18,7 @@ module.exports = class deviceValveOne {
     this.name = accessory.displayName
     this.accessory = accessory
 
-    // Validate the user config
-    const asConfig = platform.simulations[this.accessory.context.eweDeviceId]
-    if (!['oneSwitch', 'twoSwitch'].includes(asConfig.setup)) {
-      this.error = 'setup must be oneSwitch or twoSwitch'
-    }
+    // Set up custom variables for this device type
     this.setup = asConfig.setup
 
     // Add the valve service if it doesn't already exist
@@ -63,10 +59,6 @@ module.exports = class deviceValveOne {
   async internalUpdate (value, callback) {
     try {
       callback()
-      if (this.error) {
-        this.log.warn('[%s] invalid config - %s.', this.name, this.error)
-        return
-      }
       const params = {}
       switch (this.setup) {
         case 'oneSwitch':
@@ -106,10 +98,6 @@ module.exports = class deviceValveOne {
 
   async externalUpdate (params) {
     try {
-      if (this.error) {
-        this.log.warn('[%s] invalid config - %s.', this.name, this.error)
-        return
-      }
       let isOn = false
       switch (this.setup) {
         case 'oneSwitch':

From 3380f98fdd34027a61cf7dc680ba3aa69bb8411c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 8 Feb 2021 09:08:22 +0000
Subject: [PATCH 1358/3183] vars

---
 lib/device/simulation/garage-one.js | 3 ++-
 lib/device/simulation/lock-one.js   | 3 +--
 lib/device/simulation/tap-one.js    | 2 +-
 lib/device/simulation/valve-one.js  | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/device/simulation/garage-one.js b/lib/device/simulation/garage-one.js
index 8e6fb5ea..69563918 100644
--- a/lib/device/simulation/garage-one.js
+++ b/lib/device/simulation/garage-one.js
@@ -25,7 +25,8 @@ module.exports = class deviceGarageOne {
     }
 
     // Set up custom variables for this device type
-    this.setup = asConfig.setup
+    const asConfig = platform.simulations[this.accessory.context.eweDeviceId]
+    this.setup = platform.simulations[this.accessory.context.eweDeviceId].setup
 
     // Set up custom variables for this device type
     this.operationTime = asConfig.operationTime
diff --git a/lib/device/simulation/lock-one.js b/lib/device/simulation/lock-one.js
index 9b817ef6..0037b41c 100644
--- a/lib/device/simulation/lock-one.js
+++ b/lib/device/simulation/lock-one.js
@@ -15,9 +15,8 @@ module.exports = class deviceLockOne {
     this.platform = platform
 
     // Set up custom variables for this device type
+    const asConfig = platform.simulations[this.accessory.context.eweDeviceId]
     this.setup = asConfig.setup
-
-    // Set up custom variables for this device type
     this.operationTime = asConfig.operationTime
 
     // Add the lock service if it doesn't already exist
diff --git a/lib/device/simulation/tap-one.js b/lib/device/simulation/tap-one.js
index 29c2ab7a..8284b755 100644
--- a/lib/device/simulation/tap-one.js
+++ b/lib/device/simulation/tap-one.js
@@ -19,7 +19,7 @@ module.exports = class deviceTapOne {
     this.accessory = accessory
 
     // Set up custom variables for this device type
-    this.setup = asConfig.setup
+    this.setup = platform.simulations[this.accessory.context.eweDeviceId].setup
 
     // Add the tap service if it doesn't already exist
     if (!(this.service = this.accessory.getService(this.hapServ.Valve))) {
diff --git a/lib/device/simulation/valve-one.js b/lib/device/simulation/valve-one.js
index c3c38286..ea3d9535 100644
--- a/lib/device/simulation/valve-one.js
+++ b/lib/device/simulation/valve-one.js
@@ -19,7 +19,7 @@ module.exports = class deviceValveOne {
     this.accessory = accessory
 
     // Set up custom variables for this device type
-    this.setup = asConfig.setup
+    this.setup = platform.simulations[this.accessory.context.eweDeviceId].setup
 
     // Add the valve service if it doesn't already exist
     if (!(this.service = this.accessory.getService(this.hapServ.Valve))) {

From 8ef7039d1107a56b23af070248f35978fce2c8e4 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 8 Feb 2021 09:36:49 +0000
Subject: [PATCH 1359/3183] 4.7.0-2

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 0a52d78e..28a35f51 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.7.0-1",
+  "version": "4.7.0-2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index decf76d8..d6376c7c 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "4.7.0-1",
+  "version": "4.7.0-2",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 53e881a945ae013b52d28fe25212b1dcc383e0ca Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 8 Feb 2021 10:09:34 +0000
Subject: [PATCH 1360/3183] fix eve

---
 lib/device/rf-bridge.js    | 8 ++++----
 lib/device/switch-multi.js | 8 ++++----
 lib/index.js               | 2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/lib/device/rf-bridge.js b/lib/device/rf-bridge.js
index 6ff95262..418e03a9 100644
--- a/lib/device/rf-bridge.js
+++ b/lib/device/rf-bridge.js
@@ -214,7 +214,7 @@ module.exports = class deviceRFBridge {
                     char = this.hapChar.ContactSensorState
                     oAccessory.getService(serv).updateCharacteristic(
                       this.eveLastActivation,
-                      Math.round(new Date().valueOf() / 1000) - oAccessory.historyService.getInitialTime()
+                      Math.round(new Date().valueOf() / 1000) - oAccessory.eveService.getInitialTime()
                     )
                     break
                   case 'occupancy':
@@ -226,12 +226,12 @@ module.exports = class deviceRFBridge {
                     char = this.hapChar.MotionDetected
                     oAccessory.getService(serv).updateCharacteristic(
                       this.eveLastActivation,
-                      Math.round(new Date().valueOf() / 1000) - oAccessory.historyService.getInitialTime()
+                      Math.round(new Date().valueOf() / 1000) - oAccessory.eveService.getInitialTime()
                     )
                     break
                 }
                 oAccessory.getService(serv).updateCharacteristic(char, 1)
-                oAccessory.historyService.addEntry({
+                oAccessory.eveService.addEntry({
                   time: Math.round(new Date().valueOf() / 1000),
                   status: 1
                 })
@@ -240,7 +240,7 @@ module.exports = class deviceRFBridge {
                 }
                 await this.funcs.sleep(sensorTimeLength * 1000)
                 oAccessory.getService(serv).updateCharacteristic(char, 0)
-                oAccessory.historyService.addEntry({
+                oAccessory.eveService.addEntry({
                   time: Math.round(new Date().valueOf() / 1000),
                   status: 0
                 })
diff --git a/lib/device/switch-multi.js b/lib/device/switch-multi.js
index 7ab02780..17508ebe 100644
--- a/lib/device/switch-multi.js
+++ b/lib/device/switch-multi.js
@@ -52,7 +52,7 @@ module.exports = class deviceSwitchMulti {
             if ((oAccessory = this.platform.devicesInHB.get(this.accessory.context.eweDeviceId + 'SW' + i))) {
               oAccessory.getService(this.hapServ.Switch).updateCharacteristic(this.hapChar.On, value)
               oAccessory.context.cacheOnOff = value ? 'on' : 'off'
-              oAccessory.historyService.addEntry({
+              oAccessory.eveService.addEntry({
                 time: Math.round(new Date().valueOf() / 1000),
                 status: value ? 1 : 0
               })
@@ -75,7 +75,7 @@ module.exports = class deviceSwitchMulti {
               if (i === parseInt(this.accessory.context.switchNumber)) {
                 params.switches[i - 1].switch = value ? 'on' : 'off'
                 oAccessory.context.cacheOnOff = value ? 'on' : 'off'
-                oAccessory.historyService.addEntry({
+                oAccessory.eveService.addEntry({
                   time: Math.round(new Date().valueOf() / 1000),
                   status: value ? 1 : 0
                 })
@@ -92,7 +92,7 @@ module.exports = class deviceSwitchMulti {
           if (!this.platform.hiddenMasters.includes(this.accessory.context.eweDeviceId)) {
             oAccessory = this.platform.devicesInHB.get(this.accessory.context.eweDeviceId + 'SW0')
             oAccessory.getService(this.hapServ.Switch).updateCharacteristic(this.hapChar.On, masterState === 'on')
-            oAccessory.historyService.addEntry({
+            oAccessory.eveService.addEntry({
               time: Math.round(new Date().valueOf() / 1000),
               status: masterState === 'on' ? 1 : 0
             })
@@ -124,7 +124,7 @@ module.exports = class deviceSwitchMulti {
           oAccessory.getService(this.hapServ.Switch)
             .updateCharacteristic(this.hapChar.On, params.switches[i - 1].switch === 'on')
           oAccessory.context.cacheOnOff = params.switches[i - 1].switch
-          oAccessory.historyService.addEntry({
+          oAccessory.eveService.addEntry({
             time: Math.round(new Date().valueOf() / 1000),
             status: params.switches[i - 1].switch === 'on' ? 1 : 0
           })
diff --git a/lib/index.js b/lib/index.js
index a5c4b450..2ff8b6e5 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1245,7 +1245,7 @@ class eWeLinkPlatform {
         } else {
         // Device isn't online via WS so report the error back
           let eText = this.messages.unreachable
-          if ([this.messages.lanDisabled, this.messages.lanNotSup].includes(res)) {
+          if (![this.messages.lanDisabled, this.messages.lanNotSup].includes(res)) {
             eText += ' [' + res + ']'
           }
           throw new Error(eText)

From 27c57c41ec81338162162324f2748706296c2a0c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 8 Feb 2021 10:12:50 +0000
Subject: [PATCH 1361/3183] 4.7.0-3

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 28a35f51..510c4705 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.7.0-2",
+  "version": "4.7.0-3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index d6376c7c..c23b8c0c 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "4.7.0-2",
+  "version": "4.7.0-3",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From a74b6fef9e8850c7044f612325c0980bb64170a2 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 8 Feb 2021 13:34:38 +0000
Subject: [PATCH 1362/3183] ctemp for L1 update

---
 lib/device/light-colour.js |  5 +--
 lib/utils/colour-utils.js  | 90 +++++++++++++++++++++++++++++++++-----
 2 files changed, 80 insertions(+), 15 deletions(-)

diff --git a/lib/device/light-colour.js b/lib/device/light-colour.js
index 52c25b79..4783deb9 100644
--- a/lib/device/light-colour.js
+++ b/lib/device/light-colour.js
@@ -253,10 +253,7 @@ module.exports = class deviceLightColour {
       switch (this.accessory.context.eweUIID) {
         case 59: {
           // L1
-          const newRGB = this.colourUtils.hs2rgb(
-            hs[0],
-            this.service.getCharacteristic(this.hapChar.Saturation).value
-          )
+          const newRGB = this.colourUtils.k2rgb(mToK)
           this.cacheR = newRGB[0]
           this.cacheG = newRGB[1]
           this.cacheB = newRGB[2]
diff --git a/lib/utils/colour-utils.js b/lib/utils/colour-utils.js
index 1f8e7363..6f5903e7 100644
--- a/lib/utils/colour-utils.js
+++ b/lib/utils/colour-utils.js
@@ -4,22 +4,27 @@
 
 module.exports = {
   hs2rgb: (h, s) => {
+    /*
+      Credit:
+      https://github.com/WickyNilliams/pure-color
+    */
     h = parseInt(h) / 360
     s = parseInt(s) / 100
-    const l = 0.5
     let t3
     let val
     if (s === 0) {
-      val = l * 255
-      return [Math.round(val), Math.round(val), Math.round(val)]
+      return [128, 128, 128]
     }
-    const t2 = l + s - l * s
-    const t1 = 2 * l - t2
+    const t2 = 0.5 + s - 0.5 * s
+    const t1 = 1 - t2
     const rgb = [0, 0, 0]
     for (let i = 0; i < 3; i++) {
-      t3 = h + 1 / 3 * -(i - 1)
-      if (t3 < 0) t3++
-      if (t3 > 1) t3--
+      t3 = h + 1 / 3 * (1 - i)
+      if (t3 < 0) {
+        t3++
+      } else if (t3 > 1) {
+        t3--
+      }
       if (t3 * 6 < 1) {
         val = t1 + (t2 - t1) * 6 * t3
       } else if (t3 * 2 < 1) {
@@ -33,7 +38,12 @@ module.exports = {
     }
     return rgb
   },
+
   rgb2hs: (r, g, b) => {
+    /*
+      Credit:
+      https://github.com/WickyNilliams/pure-color
+    */
     r = parseInt(r) / 255
     g = parseInt(g) / 255
     b = parseInt(b) / 255
@@ -66,11 +76,69 @@ module.exports = {
     return [Math.round(h), Math.round(s * 100)]
   },
 
+  k2rgb: k => {
+    /*
+      Credit:
+      https://tannerhelland.com/2012/09/18/convert-temperature-rgb-algorithm-code.html
+    */
+    k = k / 100
+    let r
+    let g
+    let b
+    if (k <= 66) {
+      r = 255
+    } else {
+      r = k - 60
+      r = 329.698727466 * Math.pow(r, -0.1332047592)
+      if (r < 0) {
+        r = 0
+      }
+      if (r > 255) {
+        r = 255
+      }
+    }
+    if (k <= 66) {
+      g = k
+      g = 99.4708025861 * Math.log(g) - 161.1195681661
+      if (g < 0) {
+        g = 0
+      }
+      if (g > 255) {
+        g = 255
+      }
+    } else {
+      g = k - 60
+      g = 288.1221695283 * Math.pow(g, -0.0755148492)
+      if (g < 0) {
+        g = 0
+      }
+      if (g > 255) {
+        g = 255
+      }
+    }
+    if (k >= 66) {
+      b = 255
+    } else {
+      if (k <= 19) {
+        b = 0
+      } else {
+        b = k - 10
+        b = 138.5177312231 * Math.log(b) - 305.0447927307
+        if (b < 0) {
+          b = 0
+        }
+        if (b > 255) {
+          b = 255
+        }
+      }
+    }
+    return [Math.round(r), Math.round(g), Math.round(b)]
+  },
+
   m2hs: m => {
     /*
-      table from (and credit to) HAP-NodeJS
-      it's here so it can be used for users with HB < 1.3
-      https://github.com/homebridge/HAP-NodeJS/blob/beta/src/lib/util/color-utils.ts
+      Credit:
+      https://github.com/homebridge/HAP-NodeJS
     */
     const table = {
       100: [19, 222.1],

From 15ec349d90228fcb5004ad4b3ea8c9d8d17e5469 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 8 Feb 2021 13:35:07 +0000
Subject: [PATCH 1363/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3ed0e6f4..cbe68f4f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 * ⚠️ Removed `nameOverride` configuration option
 * Reinstated `ipOverride` into the Homebridge plugin UI screen
+* Improved colour temperature conversion for L1 and L1 Lite devices
 * Fixed an issue with the 'Lock' Accessory Simulation where the status would never update as 'Unlocked'
 * HTTP error codes will be displayed in the logs if and when the plugin re-attempts the connection
 * Error messages refactored to show the most useful information

From 68427de45292db72eed15229bf60fa9fff9159f4 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 8 Feb 2021 14:52:09 +0000
Subject: [PATCH 1364/3183] disable AL appropriately

---
 lib/device/light-colour.js | 16 ++++++++++++++--
 lib/device/light-ctemp.js  |  3 ++-
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/lib/device/light-colour.js b/lib/device/light-colour.js
index 4783deb9..9a8201f7 100644
--- a/lib/device/light-colour.js
+++ b/lib/device/light-colour.js
@@ -373,6 +373,9 @@ module.exports = class deviceLightColour {
           }
           if (this.funcs.hasProperty(params, 'colorR')) {
             if (params.colorR !== this.cacheR || params.colorG !== this.cacheB || params.colorB !== this.cacheB) {
+              const rgbDiff = Math.abs(params.colorR - this.cacheR) +
+                Math.abs(params.colorG - this.cacheG) +
+                Math.abs(params.colorG - this.cacheB)
               this.cacheR = params.colorR
               this.cacheG = params.colorG
               this.cacheB = params.colorB
@@ -389,7 +392,7 @@ module.exports = class deviceLightColour {
                     this.cacheR, this.cacheG, this.cacheB
                   )
                 }
-                if (this.alController && this.alController.isAdaptiveLightingActive()) {
+                if (this.alController && this.alController.isAdaptiveLightingActive() && rgbDiff > 5) {
                   this.alController.disableAdaptiveLighting()
                   this.log('[%s] adaptive lighting disabled due to significant colour change.', this.name)
                 }
@@ -435,6 +438,14 @@ module.exports = class deviceLightColour {
                 }
               }
             }
+            if (
+              params.updateSource &&
+              this.alController &&
+              this.alController.isAdaptiveLightingActive()
+            ) {
+              this.alController.disableAdaptiveLighting()
+              this.log('[%s] adaptive lighting disabled due to significant colour change.', this.name)
+            }
           }
           if (params.ltype === 'white' && params.white) {
             if (this.funcs.hasProperty(params.white, 'br')) {
@@ -448,6 +459,7 @@ module.exports = class deviceLightColour {
             }
             if (this.funcs.hasProperty(params.white, 'ct') && params.white.ct !== this.cacheCT) {
               this.cacheMode = 'white'
+              const ctDiff = Math.abs(params.white.ct - this.cacheCT) > 5
               this.cacheCT = params.white.ct
               const ctToK = Math.round(this.cacheCT / 255 * 3800 + 2700)
               this.cacheMired = Math.max(Math.min(Math.round(1000000 / ctToK), 500), 140)
@@ -463,7 +475,7 @@ module.exports = class deviceLightColour {
                 if (
                   this.alController &&
                   this.alController.isAdaptiveLightingActive() &&
-                  Math.abs(params.white.ct - this.cacheCT) > 5
+                  ctDiff
                 ) {
                   // look for a variation greater than five
                   this.alController.disableAdaptiveLighting()
diff --git a/lib/device/light-ctemp.js b/lib/device/light-ctemp.js
index ef2a243b..763eb24b 100644
--- a/lib/device/light-ctemp.js
+++ b/lib/device/light-ctemp.js
@@ -183,6 +183,7 @@ module.exports = class deviceLightColour {
           }
         }
         if (this.funcs.hasProperty(params.white, 'ct') && this.cacheCT !== params.white.ct) {
+          const ctDiff = Math.abs(params.white.ct - this.cacheCT) > 5
           this.cacheCT = params.white.ct
           const ctToK = Math.round(this.cacheCT / 255 * (this.maxK - this.minK) + this.minK)
           this.cacheMired = Math.min(Math.max(Math.round(1000000 / ctToK), 140), 500)
@@ -194,7 +195,7 @@ module.exports = class deviceLightColour {
             if (
               this.alController &&
               this.alController.isAdaptiveLightingActive() &&
-              Math.abs(params.white.ct - this.cacheCT) > 5
+              ctDiff
             ) {
               // look for a variation greater than five
               this.alController.disableAdaptiveLighting()

From 88cec700405b1e221a6a7bcf6feab78a41c5b7aa Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 8 Feb 2021 14:53:41 +0000
Subject: [PATCH 1365/3183] 4.7.0-4

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 510c4705..0563b16e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.7.0-3",
+  "version": "4.7.0-4",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index c23b8c0c..0e0b50b8 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "4.7.0-3",
+  "version": "4.7.0-4",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From af51605f86eb54553c47f251417b165f78789734 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 8 Feb 2021 14:54:22 +0000
Subject: [PATCH 1366/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cbe68f4f..33218595 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 * ⚠️ Removed `nameOverride` configuration option
 * Reinstated `ipOverride` into the Homebridge plugin UI screen
 * Improved colour temperature conversion for L1 and L1 Lite devices
+* Fixed a bug where Adaptive Lighting would not be disabled if the colour was changed from the eWeLink app
 * Fixed an issue with the 'Lock' Accessory Simulation where the status would never update as 'Unlocked'
 * HTTP error codes will be displayed in the logs if and when the plugin re-attempts the connection
 * Error messages refactored to show the most useful information

From afe78a5b5130973b2375438ffe933ea1e46e91d7 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 8 Feb 2021 16:12:22 +0000
Subject: [PATCH 1367/3183] use difference of 10 for rgb

---
 lib/device/light-colour.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/device/light-colour.js b/lib/device/light-colour.js
index 9a8201f7..be17c3bd 100644
--- a/lib/device/light-colour.js
+++ b/lib/device/light-colour.js
@@ -392,7 +392,7 @@ module.exports = class deviceLightColour {
                     this.cacheR, this.cacheG, this.cacheB
                   )
                 }
-                if (this.alController && this.alController.isAdaptiveLightingActive() && rgbDiff > 5) {
+                if (this.alController && this.alController.isAdaptiveLightingActive() && rgbDiff > 10) {
                   this.alController.disableAdaptiveLighting()
                   this.log('[%s] adaptive lighting disabled due to significant colour change.', this.name)
                 }

From 2540e10b32a4ee70591b24b2cd400805adf2c04f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 8 Feb 2021 16:26:47 +0000
Subject: [PATCH 1368/3183] Don't disable AL if light was off

---
 lib/device/light-colour.js | 22 ++++++++++++++++------
 lib/device/light-ctemp.js  | 14 ++++++++++----
 2 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/lib/device/light-colour.js b/lib/device/light-colour.js
index be17c3bd..45edc9d0 100644
--- a/lib/device/light-colour.js
+++ b/lib/device/light-colour.js
@@ -161,7 +161,7 @@ module.exports = class deviceLightColour {
 
   async internalColourUpdate (value, callback) {
     try {
-      if (this.cacheOnOff !== 'on' || this.cacheHue === value) {
+      if (this.cacheHue === value) {
         callback()
         return
       }
@@ -175,8 +175,6 @@ module.exports = class deviceLightColour {
       this.cacheB = newRGB[2]
       this.cacheMired = 0
       this.cacheCT = 0
-      const updateKeyColour = Math.random().toString(36).substr(2, 8)
-      this.updateKeyColour = updateKeyColour
       switch (this.accessory.context.eweUIID) {
         case 22:
         // B1
@@ -213,6 +211,13 @@ module.exports = class deviceLightColour {
           this.cacheMode = 'color'
           break
       }
+      // For adaptive lighting we still want to update the would have been so
+      // it's not disabled when the light comes back on so do this check now not before
+      if (this.cacheOnOff !== 'on') {
+        return
+      }
+      const updateKeyColour = Math.random().toString(36).substr(2, 8)
+      this.updateKeyColour = updateKeyColour
       await this.funcs.sleep(350)
       if (updateKeyColour !== this.updateKeyColour) {
         return
@@ -234,7 +239,7 @@ module.exports = class deviceLightColour {
 
   async internalCTempUpdate (value, callback) {
     try {
-      if (this.cacheOnOff !== 'on' || this.cacheMired === value) {
+      if (this.cacheMired === value) {
         callback()
         return
       }
@@ -247,8 +252,6 @@ module.exports = class deviceLightColour {
       const mToK = Math.max(Math.min(Math.round(1000000 / value), 6500), 2700)
       this.cacheCT = Math.round(((mToK - 2700) / 3800) * 255)
       this.cacheHue = 0
-      const updateKeyCT = Math.random().toString(36).substr(2, 8)
-      this.updateKeyCT = updateKeyCT
       let params
       switch (this.accessory.context.eweUIID) {
         case 59: {
@@ -277,6 +280,13 @@ module.exports = class deviceLightColour {
           this.cacheMode = 'white'
           break
       }
+      // For adaptive lighting we still want to update the would have been so
+      // it's not disabled when the light comes back on so do this check now not before
+      if (this.cacheOnOff !== 'on') {
+        return
+      }
+      const updateKeyCT = Math.random().toString(36).substr(2, 8)
+      this.updateKeyCT = updateKeyCT
       await this.funcs.sleep(350)
       if (updateKeyCT !== this.updateKeyCT) {
         return
diff --git a/lib/device/light-ctemp.js b/lib/device/light-ctemp.js
index 763eb24b..754ce409 100644
--- a/lib/device/light-ctemp.js
+++ b/lib/device/light-ctemp.js
@@ -123,7 +123,7 @@ module.exports = class deviceLightColour {
 
   async internalCTempUpdate (value, callback) {
     try {
-      if (this.cacheOnOff !== 'on' || this.cacheMired === value) {
+      if (this.cacheMired === value) {
         callback()
         return
       }
@@ -131,19 +131,25 @@ module.exports = class deviceLightColour {
       callback()
       const mToK = Math.max(Math.min(Math.round(1000000 / this.cacheMired), this.maxK), this.minK)
       this.cacheCT = Math.round(((mToK - this.minK) / (this.maxK - this.minK)) * 255)
-      const updateKeyCT = Math.random().toString(36).substr(2, 8)
-      this.updateKeyCT = updateKeyCT
       const params = {
         white: {
           br: this.cacheBrightness,
           ct: this.cacheCT
         }
       }
+      // For adaptive lighting we still want to update the would have been so
+      // it's not disabled when the light comes back on so do this check now not before
+      if (this.cacheOnOff !== 'on') {
+        callback()
+        return
+      }
+      const updateKeyCT = Math.random().toString(36).substr(2, 8)
+      this.updateKeyCT = updateKeyCT
+      this.updateTimeout = updateKeyCT
       await this.funcs.sleep(350)
       if (updateKeyCT !== this.updateKeyCT) {
         return
       }
-      this.updateTimeout = updateKeyCT
       setTimeout(() => {
         if (this.updateTimeout === updateKeyCT) {
           this.updateTimeout = false

From 53081d612ed0f5fc8ac6b9c1876eab6acf0b245d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 8 Feb 2021 16:28:02 +0000
Subject: [PATCH 1369/3183] 4.7.0-5

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 0563b16e..05b4b564 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.7.0-4",
+  "version": "4.7.0-5",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 0e0b50b8..39f7ba50 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "4.7.0-4",
+  "version": "4.7.0-5",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From ff77d0387798ae1c962f153c2d4cb0176b98c507 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 8 Feb 2021 18:05:01 +0000
Subject: [PATCH 1370/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 33218595..f9004525 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,7 +6,8 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 ### Added
 
-* A queue for device updates to improve reliability
+* A queue for device updates to improve reliability, this also results in:
+  * Faster device updates with colour bulbs
 * Configuration checks to highlight any unnecessary or incorrectly formatted settings you have
 * Link to 'Configuration' wiki page in the plugin-ui
 * Added a note in the plugin UI when adding an Accessory Simulation that the accessory will need to be removed from the cache

From 256a5d09a5306487962e119c34e72a10aa348b3e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 8 Feb 2021 18:15:52 +0000
Subject: [PATCH 1371/3183] hide plugin_map notice [HOOBS]

---
 lib/index.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/index.js b/lib/index.js
index 2ff8b6e5..c02c068c 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -308,6 +308,7 @@ class eWeLinkPlatform {
         }
         case 'name':
         case 'platform':
+        case 'plugin_map':
           break
         case 'password':
           if (typeof val !== 'string' || val === '') {

From 0b4041e1bb0f351cfbbcb2db73755597d777b9f3 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 9 Feb 2021 10:09:50 +0000
Subject: [PATCH 1372/3183] fakegato standardjs

---
 lib/fakegato/fakegato-history.js | 469 ++++++++++++++++++++++---------
 lib/fakegato/fakegato-storage.js | 188 +++++--------
 lib/fakegato/fakegato-timer.js   |  61 ++--
 lib/fakegato/uuid.js             |  19 +-
 package.json                     |   5 -
 5 files changed, 447 insertions(+), 295 deletions(-)

diff --git a/lib/fakegato/fakegato-history.js b/lib/fakegato/fakegato-history.js
index a19f1b7c..16249b46 100644
--- a/lib/fakegato/fakegato-history.js
+++ b/lib/fakegato/fakegato-history.js
@@ -1,12 +1,11 @@
-/* jshint esversion: 6,node: true,-W041: false */
+/* jshint -W014, -W033, esversion: 9 */
+/* eslint-disable new-cap */
 'use strict'
 
 const Format = require('util').format
-const FakeGatoTimer = require('./fakegato-timer').FakeGatoTimer
-const FakeGatoStorage = require('./fakegato-storage').FakeGatoStorage
-
-const EPOCH_OFFSET = 978307200
-
+const FakeGatoTimer = require('./fakegato-timer')
+const FakeGatoStorage = require('./fakegato-storage')
+const _EPOCH = 978307200
 const TYPE_ENERGY = 'energy'
 const TYPE_ROOM = 'room'
 const TYPE_WEATHER = 'weather'
@@ -17,8 +16,9 @@ const TYPE_THERMO = 'thermo'
 const TYPE_AQUA = 'aqua'
 const TYPE_CUSTOM = 'custom'
 
-var homebridge
-var Characteristic, Service
+let homebridge
+let Characteristic
+let Service
 
 module.exports = function (pHomebridge) {
   if (pHomebridge && !homebridge) {
@@ -27,32 +27,26 @@ module.exports = function (pHomebridge) {
     Service = homebridge.hap.Service
   }
 
-  var hexToBase64 = function (val) {
+  const hexToBase64 = function (val) {
     return Buffer.from(('' + val).replace(/[^0-9A-F]/ig, ''), 'hex').toString('base64')
   }
-  var base64ToHex = function (val) {
+  const base64ToHex = function (val) {
     if (!val) { return val }
     return Buffer.from(val, 'base64').toString('hex')
   }
-  var swap16 = function (val) {
+  const swap16 = function (val) {
     return ((val & 0xFF) << 8) |
         ((val >>> 8) & 0xFF)
   }
-  var swap32 = function (val) {
+  const swap32 = function (val) {
     return ((val & 0xFF) << 24) |
         ((val & 0xFF00) << 8) |
         ((val >>> 8) & 0xFF00) |
         ((val >>> 24) & 0xFF)
   }
-  var hexToHPA = function (val) { // unused
-    return parseInt(swap16(val), 10)
-  }
-  var hPAtoHex = function (val) { // unused
-    return swap16(Math.round(val)).toString(16)
-  }
-  var numToHex = function (val, len) {
-    var s = Number(val >>> 0).toString(16)
-    if (s.length % 2 != 0) {
+  const numToHex = function (val, len) {
+    let s = Number(val >>> 0).toString(16)
+    if (s.length % 2 !== 0) {
       s = '0' + s
     }
     if (len) {
@@ -60,11 +54,11 @@ module.exports = function (pHomebridge) {
     }
     return s
   }
-  var ucfirst = function (val) {
+  const ucfirst = function (val) {
     return val.charAt(0).toUpperCase() + val.substr(1)
   }
-  var precisionRound = function (number, precision) {
-    var factor = Math.pow(10, precision)
+  const precisionRound = function (number, precision) {
+    const factor = Math.pow(10, precision)
     return Math.round(number * factor) / factor
   }
 
@@ -74,7 +68,9 @@ module.exports = function (pHomebridge) {
       this.setProps({
         format: Characteristic.Formats.DATA,
         perms: [
-          Characteristic.Perms.READ, Characteristic.Perms.NOTIFY, Characteristic.Perms.HIDDEN
+          Characteristic.Perms.READ,
+          Characteristic.Perms.NOTIFY,
+          Characteristic.Perms.HIDDEN
         ]
       })
     }
@@ -88,7 +84,9 @@ module.exports = function (pHomebridge) {
       this.setProps({
         format: Characteristic.Formats.DATA,
         perms: [
-          Characteristic.Perms.READ, Characteristic.Perms.NOTIFY, Characteristic.Perms.HIDDEN
+          Characteristic.Perms.READ,
+          Characteristic.Perms.NOTIFY,
+          Characteristic.Perms.HIDDEN
         ]
       })
     }
@@ -136,16 +134,11 @@ module.exports = function (pHomebridge) {
   }
 
   FakeGatoHistoryService.UUID = 'E863F007-079E-48FF-8F27-9C2605A29F52'
-  var thisAccessory = {}
+  let thisAccessory = {}
   class FakeGatoHistory extends Service {
     constructor (accessoryType, accessory, optionalParams) {
       super(accessory.displayName + ' History', FakeGatoHistoryService.UUID)
 
-      var entry2address = function (val) { // not used ?
-        var temp = val % this.memorySize
-        return temp
-      }.bind(this)
-
       thisAccessory = accessory
       this.accessoryName = thisAccessory.displayName
       this.signatures = []
@@ -155,11 +148,14 @@ module.exports = function (pHomebridge) {
         this.size = optionalParams.size || 4032
         this.minutes = optionalParams.minutes || 10 // Optional timer length
         this.storage = optionalParams.storage // 'fs' or 'googleDrive'
-        this.path = optionalParams.path || optionalParams.folder || (this.storage == 'fs' ? homebridge.user.storagePath() : undefined)
+        this.path = optionalParams.path ||
+          optionalParams.folder ||
+          (this.storage === 'fs' ? homebridge.user.storagePath() : undefined)
         this.filename = optionalParams.filename
         this.disableTimer = optionalParams.disableTimer || false
         this.disableRepeatLastData = optionalParams.disableRepeatLastData || false
-        this.log = optionalParams.log || thisAccessory.log || {}		// workaround for typescript blocking of changing of accessory object definition
+        // workaround for typescript blocking of changing of accessory object definition
+        this.log = optionalParams.log || thisAccessory.log || {}
       } else {
         this.size = 4032
         this.minutes = 10
@@ -233,11 +229,11 @@ module.exports = function (pHomebridge) {
           this.accessoryType117 = '01'
           if (!this.disableTimer) {
             homebridge.globalFakeGatoTimer.subscribe(this, function (params) { // callback
-              var backLog = params.backLog || []
-              var immediate = params.immediate
+              const backLog = params.backLog || []
+              const immediate = params.immediate
 
-              var fakegato = this.service
-              var actualEntry = {}
+              const fakegato = this.service
+              const actualEntry = {}
 
               if (backLog.length) {
                 if (!immediate) {
@@ -247,7 +243,14 @@ module.exports = function (pHomebridge) {
                   actualEntry.time = backLog[0].time
                   actualEntry.status = backLog[0].status
                 }
-                fakegato.log.debug('**Fakegato-timer callbackDoor: ', fakegato.accessoryName, ', immediate: ', immediate, ', entry: ', actualEntry)
+                fakegato.log.debug(
+                  '**Fakegato-timer callbackDoor: ',
+                  fakegato.accessoryName,
+                  ', immediate: ',
+                  immediate,
+                  ', entry: ',
+                  actualEntry
+                )
 
                 fakegato._addEntry(actualEntry)
               }
@@ -259,11 +262,11 @@ module.exports = function (pHomebridge) {
           this.accessoryType117 = '02'
           if (!this.disableTimer) {
             homebridge.globalFakeGatoTimer.subscribe(this, function (params) { // callback
-              var backLog = params.backLog || []
-              var immediate = params.immediate
+              const backLog = params.backLog || []
+              const immediate = params.immediate
 
-              var fakegato = this.service
-              var actualEntry = {}
+              const fakegato = this.service
+              const actualEntry = {}
 
               if (backLog.length) {
                 if (!immediate) {
@@ -273,7 +276,14 @@ module.exports = function (pHomebridge) {
                   actualEntry.time = backLog[0].time
                   actualEntry.status = backLog[0].status
                 }
-                fakegato.log.debug('**Fakegato-timer callbackMotion: ', fakegato.accessoryName, ', immediate: ', immediate, ', entry: ', actualEntry)
+                fakegato.log.debug(
+                  '**Fakegato-timer callbackMotion: ',
+                  fakegato.accessoryName,
+                  ', immediate: ',
+                  immediate,
+                  ', entry: ',
+                  actualEntry
+                )
 
                 fakegato._addEntry(actualEntry)
               }
@@ -285,11 +295,11 @@ module.exports = function (pHomebridge) {
           this.accessoryType117 = '01'
           if (!this.disableTimer) {
             homebridge.globalFakeGatoTimer.subscribe(this, function (params) { // callback
-              var backLog = params.backLog || []
-              var immediate = params.immediate
+              const backLog = params.backLog || []
+              const immediate = params.immediate
 
-              var fakegato = this.service
-              var actualEntry = {}
+              const fakegato = this.service
+              const actualEntry = {}
 
               if (backLog.length) {
                 if (!immediate) {
@@ -299,7 +309,14 @@ module.exports = function (pHomebridge) {
                   actualEntry.time = backLog[0].time
                   actualEntry.status = backLog[0].status
                 }
-                fakegato.log.debug('**Fakegato-timer callbackSwitch: ', fakegato.accessoryName, ', immediate: ', immediate, ', entry: ', actualEntry)
+                fakegato.log.debug(
+                  '**Fakegato-timer callbackSwitch: ',
+                  fakegato.accessoryName,
+                  ', immediate: ',
+                  immediate,
+                  ', entry: ',
+                  actualEntry
+                )
 
                 fakegato._addEntry(actualEntry)
               }
@@ -309,36 +326,89 @@ module.exports = function (pHomebridge) {
         case TYPE_CUSTOM:
           thisAccessory.services.forEach((service, i) => {
             service.characteristics.forEach((characteristic, i) => {
-              // console.log('  characteristics', characteristic.displayName, characteristic.UUID);
               switch (this.uuid.toLongFormUUID(characteristic.UUID)) {
                 case Characteristic.CurrentTemperature.UUID: // Temperature
-                  this.signatures.push({ signature: '0102', length: 4, uuid: this.uuid.toShortFormUUID(characteristic.UUID), factor: 100, entry: 'temp' })
+                  this.signatures.push({
+                    signature: '0102',
+                    length: 4,
+                    uuid: this.uuid.toShortFormUUID(characteristic.UUID),
+                    factor: 100,
+                    entry: 'temp'
+                  })
                   break
                 case Characteristic.CurrentRelativeHumidity.UUID: // Humidity
-                  this.signatures.push({ signature: '0202', length: 4, uuid: this.uuid.toShortFormUUID(characteristic.UUID), factor: 100, entry: 'humidity' })
+                  this.signatures.push({
+                    signature: '0202',
+                    length: 4,
+                    uuid: this.uuid.toShortFormUUID(characteristic.UUID),
+                    factor: 100,
+                    entry: 'humidity'
+                  })
                   break
                 case 'E863F10F-079E-48FF-8F27-9C2605A29F52': // CustomCharacteristic.AtmosphericPressureLevel.UUID
-                  this.signatures.push({ signature: '0302', length: 4, uuid: this.uuid.toShortFormUUID(characteristic.UUID), factor: 10, entry: 'pressure' })
+                  this.signatures.push({
+                    signature: '0302',
+                    length: 4,
+                    uuid: this.uuid.toShortFormUUID(characteristic.UUID),
+                    factor: 10,
+                    entry: 'pressure'
+                  })
                   break
                 case 'E863F10B-079E-48FF-8F27-9C2605A29F52': // PPM
-                  this.signatures.push({ signature: '0702', length: 4, uuid: this.uuid.toShortFormUUID(characteristic.UUID), factor: 10, entry: 'ppm' })
+                  this.signatures.push({
+                    signature: '0702',
+                    length: 4,
+                    uuid: this.uuid.toShortFormUUID(characteristic.UUID),
+                    factor: 10,
+                    entry: 'ppm'
+                  })
                   break
                 case Characteristic.ContactSensorState.UUID: // Contact Sensor State
-                  this.signatures.push({ signature: '0601', length: 2, uuid: this.uuid.toShortFormUUID(characteristic.UUID), factor: 1, entry: 'contact' })
+                  this.signatures.push({
+                    signature: '0601',
+                    length: 2,
+                    uuid: this.uuid.toShortFormUUID(characteristic.UUID),
+                    factor: 1,
+                    entry: 'contact'
+                  })
                   break
                 case 'E863F10D-079E-48FF-8F27-9C2605A29F52': // Power
-                  this.signatures.push({ signature: '0702', length: 4, uuid: this.uuid.toShortFormUUID(characteristic.UUID), factor: 10, entry: 'power' })
+                  this.signatures.push({
+                    signature: '0702',
+                    length: 4,
+                    uuid: this.uuid.toShortFormUUID(characteristic.UUID),
+                    factor: 10,
+                    entry: 'power'
+                  })
                   break
                 case Characteristic.On.UUID: // Switch On
-                  this.signatures.push({ signature: '0e01', length: 2, uuid: this.uuid.toShortFormUUID(characteristic.UUID), factor: 1, entry: 'status' })
+                  this.signatures.push({
+                    signature: '0e01',
+                    length: 2,
+                    uuid: this.uuid.toShortFormUUID(characteristic.UUID),
+                    factor: 1,
+                    entry: 'status'
+                  })
                   break
                 case Characteristic.MotionDetected.UUID: // Motion Detected
-                  this.signatures.push({ signature: '1c01', length: 2, uuid: this.uuid.toShortFormUUID(characteristic.UUID), factor: 1, entry: 'motion' })
+                  this.signatures.push({
+                    signature: '1c01',
+                    length: 2,
+                    uuid: this.uuid.toShortFormUUID(characteristic.UUID),
+                    factor: 1,
+                    entry: 'motion'
+                  })
                   break
               }
             })
           })
-          this.accessoryType116 = (' 0' + this.signatures.length.toString() + ' ' + this.signatures.sort((a, b) => (a.signature > b.signature) ? 1 : -1).map(a => a.signature).join(' ') + ' ')
+          this.accessoryType116 = ' 0' +
+            this.signatures.length.toString() +
+            ' ' +
+            this.signatures.sort((a, b) => {
+              return a.signature > b.signature ? 1 : -1
+            }).map(a => a.signature).join(' ') +
+            ' '
           if (!this.disableTimer) {
             homebridge.globalFakeGatoTimer.subscribe(this, this.calculateAverage)
           }
@@ -377,21 +447,21 @@ module.exports = function (pHomebridge) {
     }
 
     calculateAverage (params) { // callback
-      var backLog = params.backLog || []
-      var previousAvrg = params.previousAvrg || {}
-      var timer = params.timer
+      const backLog = params.backLog || []
+      const previousAvrg = params.previousAvrg || {}
+      const timer = params.timer
 
-      var fakegato = this.service
-      var calc = {
+      const fakegato = this.service
+      const calc = {
         sum: {},
         num: {},
         avrg: {}
       }
 
-      for (var h in backLog) {
-        if (backLog.hasOwnProperty(h)) { // only valid keys
+      for (const h in backLog) {
+        if (Object.prototype.hasOwnProperty.call(backLog, h)) { // only valid keys
           for (const key in backLog[h]) { // each record
-            if (backLog[h].hasOwnProperty(key) && key != 'time') { // except time
+            if (Object.prototype.hasOwnProperty.call(backLog[h], key) && key !== 'time') {
               if (!calc.sum[key]) { calc.sum[key] = 0 }
               if (!calc.num[key]) { calc.num[key] = 0 }
               calc.sum[key] += backLog[h][key]
@@ -405,10 +475,8 @@ module.exports = function (pHomebridge) {
 
       if (!fakegato.disableRepeatLastData) {
         for (const key in previousAvrg) { // each record of previous average
-          if (previousAvrg.hasOwnProperty(key) && key != 'time') { // except time
-            if (!backLog.length ||// calc.avrg[key] == 0 || // zero value
-              calc.avrg[key] === undefined) // no key (meaning no value received for this key yet)
-            {
+          if (Object.prototype.hasOwnProperty.call(previousAvrg, key) && key !== 'time') {
+            if (!backLog.length || calc.avrg[key] === undefined) {
               calc.avrg[key] = previousAvrg[key]
             }
           }
@@ -430,7 +498,11 @@ module.exports = function (pHomebridge) {
 
         this.service = thisAccessory.getService(FakeGatoHistoryService)
         if (this.service === undefined) {
-          this.service = thisAccessory.addService(FakeGatoHistoryService, ucfirst(thisAccessory.displayName) + ' History', this.accessoryType)
+          this.service = thisAccessory.addService(
+            FakeGatoHistoryService,
+            ucfirst(thisAccessory.displayName) + ' History',
+            this.accessoryType
+          )
         }
 
         this.service.getCharacteristic(S2R2Characteristic)
@@ -465,7 +537,7 @@ module.exports = function (pHomebridge) {
     }
 
     sendHistory (address) {
-      if (address != 0) {
+      if (address !== 0) {
         this.currentEntry = address
       } else {
         this.currentEntry = 1
@@ -478,28 +550,83 @@ module.exports = function (pHomebridge) {
         case TYPE_DOOR:
         case TYPE_MOTION:
         case TYPE_SWITCH:
-          if (!this.disableTimer) { homebridge.globalFakeGatoTimer.addData({ entry: entry, service: this, immediateCallback: true }) } else { this._addEntry({ time: entry.time, status: entry.status }) }
+          if (!this.disableTimer) {
+            homebridge.globalFakeGatoTimer.addData({
+              entry: entry,
+              service: this,
+              immediateCallback: true
+            })
+          } else {
+            this._addEntry({
+              time: entry.time,
+              status: entry.status
+            })
+          }
           break
         case TYPE_AQUA:
-          this._addEntry({ time: entry.time, status: entry.status, waterAmount: entry.waterAmount })
+          this._addEntry({
+            time: entry.time,
+            status: entry.status,
+            waterAmount: entry.waterAmount
+          })
           break
         case TYPE_WEATHER:
-          if (!this.disableTimer) { homebridge.globalFakeGatoTimer.addData({ entry: entry, service: this }) } else { this._addEntry({ time: entry.time, temp: entry.temp, humidity: entry.humidity, pressure: entry.pressure }) }
+          if (!this.disableTimer) {
+            homebridge.globalFakeGatoTimer.addData({
+              entry: entry,
+              service: this
+            })
+          } else {
+            this._addEntry({
+              time: entry.time,
+              temp: entry.temp,
+              humidity: entry.humidity,
+              pressure: entry.pressure
+            })
+          }
           break
         case TYPE_ROOM:
-          if (!this.disableTimer) { homebridge.globalFakeGatoTimer.addData({ entry: entry, service: this }) } else { this._addEntry({ time: entry.time, temp: entry.temp, humidity: entry.humidity, ppm: entry.ppm }) }
+          if (!this.disableTimer) {
+            homebridge.globalFakeGatoTimer.addData({
+              entry: entry,
+              service: this
+            })
+          } else {
+            this._addEntry({
+              time: entry.time,
+              temp: entry.temp,
+              humidity: entry.humidity,
+              ppm: entry.ppm
+            })
+          }
           break
         case TYPE_ENERGY:
-          if (!this.disableTimer) { homebridge.globalFakeGatoTimer.addData({ entry: entry, service: this }) } else { this._addEntry({ time: entry.time, power: entry.power }) }
+          if (!this.disableTimer) {
+            homebridge.globalFakeGatoTimer.addData({
+              entry: entry,
+              service: this
+            })
+          } else {
+            this._addEntry({
+              time: entry.time,
+              power: entry.power
+            })
+          }
           break
         case TYPE_CUSTOM:
           if (!this.disableTimer) {
-            if ('power' in entry || 'temp' in entry) { // Only put power or temperature thru averager
-              homebridge.globalFakeGatoTimer.addData({ entry: entry, service: this })
+            if ('power' in entry || 'temp' in entry) {
+              // Only put power or temperature thru averager
+              homebridge.globalFakeGatoTimer.addData({
+                entry: entry,
+                service: this
+              })
             } else {
               this._addEntry(entry)
             }
-          } else { this._addEntry(entry) }
+          } else {
+            this._addEntry(entry)
+          }
           break
         default:
           this._addEntry(entry)
@@ -510,12 +637,12 @@ module.exports = function (pHomebridge) {
     // in order to be consistent with Eve, entry address start from 1
     _addEntry (entry) {
       if (this.loaded) {
-        var entry2address = function (val) {
+        const entry2address = function (val) {
           return val % this.memorySize
         }
           .bind(this)
 
-        var val
+        let val
 
         if (this.usedMemory < this.memorySize) {
           this.usedMemory++
@@ -524,7 +651,7 @@ module.exports = function (pHomebridge) {
         } else {
           this.firstEntry++
           this.lastEntry = this.firstEntry + this.usedMemory
-          if (this.restarted == true) {
+          if (this.restarted) {
             this.history[entry2address(this.lastEntry)] = {
               time: entry.time,
               setRefTime: 1
@@ -535,8 +662,8 @@ module.exports = function (pHomebridge) {
           }
         }
 
-        if (this.refTime == 0) {
-          this.refTime = entry.time - EPOCH_OFFSET
+        if (this.refTime === 0) {
+          this.refTime = entry.time - _EPOCH
           this.history[this.lastEntry] = {
             time: entry.time,
             setRefTime: 1
@@ -551,7 +678,7 @@ module.exports = function (pHomebridge) {
         if (this.usedMemory < this.memorySize) {
           val = Format(
             '%s00000000%s%s%s%s%s000000000101',
-            numToHex(swap32(entry.time - this.refTime - EPOCH_OFFSET), 8),
+            numToHex(swap32(entry.time - this.refTime - _EPOCH), 8),
             numToHex(swap32(this.refTime), 8),
             this.accessoryType116,
             numToHex(swap16(this.usedMemory + 1), 4),
@@ -560,7 +687,7 @@ module.exports = function (pHomebridge) {
         } else {
           val = Format(
             '%s00000000%s%s%s%s%s000000000101',
-            numToHex(swap32(entry.time - this.refTime - EPOCH_OFFSET), 8),
+            numToHex(swap32(entry.time - this.refTime - _EPOCH), 8),
             numToHex(swap32(this.refTime), 8),
             this.accessoryType116,
             numToHex(swap16(this.usedMemory), 4),
@@ -574,16 +701,28 @@ module.exports = function (pHomebridge) {
           this.service.getCharacteristic(S2R1Characteristic).setValue(hexToBase64(val))
         }
 
-        this.log.debug('First entry %s: %s', this.accessoryName, this.firstEntry.toString(16))
-        this.log.debug('Last entry %s: %s', this.accessoryName, this.lastEntry.toString(16))
-        this.log.debug('Used memory %s: %s', this.accessoryName, this.usedMemory.toString(16))
+        this.log.debug(
+          'First entry %s: %s',
+          this.accessoryName,
+          this.firstEntry.toString(16)
+        )
+        this.log.debug(
+          'Last entry %s: %s',
+          this.accessoryName,
+          this.lastEntry.toString(16)
+        )
+        this.log.debug(
+          'Used memory %s: %s',
+          this.accessoryName,
+          this.usedMemory.toString(16)
+        )
         this.log.debug('116 %s: %s', this.accessoryName, val)
 
-        if (this.storage !== undefined) this.save()
+        if (this.storage !== undefined) {
+          this.save()
+        }
       } else {
-        setTimeout(function () { // retry in 100ms
-          this._addEntry(entry)
-        }.bind(this), 100)
+        setTimeout(() => this._addEntry(entry), 100)
       }
     }
 
@@ -645,7 +784,10 @@ module.exports = function (pHomebridge) {
                 this.history = jsonFile.history
                 this.extra = jsonFile.extra
               } catch (e) {
-                this.log.debug('**ERROR fetching persisting data restart from zero - invalid JSON**', e)
+                this.log.debug(
+                  '**ERROR fetching persisting data restart from zero - invalid JSON**',
+                  e
+                )
                 cb(e, false)
               }
               cb(null, true)
@@ -666,50 +808,71 @@ module.exports = function (pHomebridge) {
     }
 
     getCurrentS2R2 (callback) {
-      var entry2address = function (val) {
+      const entry2address = function (val) {
         return val % this.memorySize
       }.bind(this)
 
-      if ((this.currentEntry <= this.lastEntry) && (this.transfer == true)) {
+      if (this.currentEntry <= this.lastEntry && this.transfer) {
         this.memoryAddress = entry2address(this.currentEntry)
-        for (var i = 0; i < 11; i++) {
-          if ((this.history[this.memoryAddress].setRefTime == 1) || (this.setTime == true) ||
-            (this.currentEntry == this.firstEntry + 1)) {
+        for (let i = 0; i < 11; i++) {
+          if (
+            this.history[this.memoryAddress].setRefTime === 1 ||
+            this.setTime ||
+            (this.currentEntry === this.firstEntry + 1)
+          ) {
             this.dataStream += Format(
               ',15%s 0100 0000 81%s0000 0000 00 0000',
               numToHex(swap32(this.currentEntry), 8),
-              numToHex(swap32(this.refTime), 8))
+              numToHex(swap32(this.refTime), 8)
+            )
             this.setTime = false
           } else {
-            this.log.debug('%s Entry: %s, Address: %s', this.accessoryName, this.currentEntry, this.memoryAddress)
+            this.log.debug(
+              '%s Entry: %s, Address: %s',
+              this.accessoryName,
+              this.currentEntry,
+              this.memoryAddress
+            )
             switch (this.accessoryType) {
               case TYPE_WEATHER:
                 this.dataStream += Format(
                   ',10 %s%s-%s:%s %s %s',
                   numToHex(swap32(this.currentEntry), 8),
-                  numToHex(swap32(this.history[this.memoryAddress].time - this.refTime - EPOCH_OFFSET), 8),
+                  numToHex(swap32(
+                    this.history[this.memoryAddress].time - this.refTime - _EPOCH),
+                  8
+                  ),
                   this.accessoryType117,
                   numToHex(swap16(this.history[this.memoryAddress].temp * 100), 4),
                   numToHex(swap16(this.history[this.memoryAddress].humidity * 100), 4),
-                  numToHex(swap16(this.history[this.memoryAddress].pressure * 10), 4))
+                  numToHex(swap16(this.history[this.memoryAddress].pressure * 10), 4)
+                )
                 break
               case TYPE_ENERGY:
                 this.dataStream += Format(
                   ',14 %s%s-%s:0000 0000 %s 0000 0000',
                   numToHex(swap32(this.currentEntry), 8),
-                  numToHex(swap32(this.history[this.memoryAddress].time - this.refTime - EPOCH_OFFSET), 8),
+                  numToHex(swap32(
+                    this.history[this.memoryAddress].time - this.refTime - _EPOCH),
+                  8
+                  ),
                   this.accessoryType117,
-                  numToHex(swap16(this.history[this.memoryAddress].power * 10), 4))
+                  numToHex(swap16(this.history[this.memoryAddress].power * 10), 4)
+                )
                 break
               case TYPE_ROOM:
                 this.dataStream += Format(
                   ',13 %s%s%s%s%s%s0000 00',
                   numToHex(swap32(this.currentEntry), 8),
-                  numToHex(swap32(this.history[this.memoryAddress].time - this.refTime - EPOCH_OFFSET), 8),
+                  numToHex(swap32(
+                    this.history[this.memoryAddress].time - this.refTime - _EPOCH),
+                  8
+                  ),
                   this.accessoryType117,
                   numToHex(swap16(this.history[this.memoryAddress].temp * 100), 4),
                   numToHex(swap16(this.history[this.memoryAddress].humidity * 100), 4),
-                  numToHex(swap16(this.history[this.memoryAddress].ppm), 4))
+                  numToHex(swap16(this.history[this.memoryAddress].ppm), 4)
+                )
                 break
               case TYPE_DOOR:
               case TYPE_MOTION:
@@ -717,61 +880,90 @@ module.exports = function (pHomebridge) {
                 this.dataStream += Format(
                   ',0b %s%s%s%s',
                   numToHex(swap32(this.currentEntry), 8),
-                  numToHex(swap32(this.history[this.memoryAddress].time - this.refTime - EPOCH_OFFSET), 8),
+                  numToHex(swap32(
+                    this.history[this.memoryAddress].time - this.refTime - _EPOCH),
+                  8
+                  ),
                   this.accessoryType117,
-                  numToHex(this.history[this.memoryAddress].status, 2))
+                  numToHex(this.history[this.memoryAddress].status, 2)
+                )
                 break
               case TYPE_AQUA:
-                if (this.history[this.memoryAddress].status == true) {
+                if (this.history[this.memoryAddress].status) {
                   this.dataStream += Format(
                     ',0d %s%s%s%s 300c',
                     numToHex(swap32(this.currentEntry), 8),
-                    numToHex(swap32(this.history[this.memoryAddress].time - this.refTime - EPOCH_OFFSET), 8),
+                    numToHex(swap32(
+                      this.history[this.memoryAddress].time - this.refTime - _EPOCH),
+                    8
+                    ),
                     this.accessoryType117,
-                    numToHex(this.history[this.memoryAddress].status, 2))
+                    numToHex(this.history[this.memoryAddress].status, 2)
+                  )
                 } else {
                   this.dataStream += Format(
                     ',15 %s%s%s%s%s 00000000 300c',
                     numToHex(swap32(this.currentEntry), 8),
-                    numToHex(swap32(this.history[this.memoryAddress].time - this.refTime - EPOCH_OFFSET), 8),
+                    numToHex(swap32(
+                      this.history[this.memoryAddress].time - this.refTime - _EPOCH),
+                    8
+                    ),
                     this.accessoryType117bis,
                     numToHex(this.history[this.memoryAddress].status, 2),
-                    numToHex(swap32(this.history[this.memoryAddress].waterAmount), 8))
+                    numToHex(swap32(this.history[this.memoryAddress].waterAmount), 8)
+                  )
                 }
                 break
               case TYPE_THERMO:
                 this.dataStream += Format(
                   ',11 %s%s%s%s%s%s 0000',
                   numToHex(swap32(this.currentEntry), 8),
-                  numToHex(swap32(this.history[this.memoryAddress].time - this.refTime - EPOCH_OFFSET), 8),
+                  numToHex(swap32(
+                    this.history[this.memoryAddress].time - this.refTime - _EPOCH),
+                  8
+                  ),
                   this.accessoryType117,
                   numToHex(swap16(this.history[this.memoryAddress].currentTemp * 100), 4),
                   numToHex(swap16(this.history[this.memoryAddress].setTemp * 100), 4),
-                  numToHex(this.history[this.memoryAddress].valvePosition, 2))
+                  numToHex(this.history[this.memoryAddress].valvePosition, 2)
+                )
                 break
-              case TYPE_CUSTOM:
-                var result = []
-                var bitmask = 0
-                var dataStream = Format('%s%s',
+              case TYPE_CUSTOM: {
+                const result = []
+                let bitmask = 0
+                const dataStream = Format(
+                  '%s%s',
                   numToHex(swap32(this.currentEntry), 8),
-                  numToHex(swap32(this.history[this.memoryAddress].time - this.refTime - EPOCH_OFFSET), 8))
+                  numToHex(swap32(
+                    this.history[this.memoryAddress].time - this.refTime - _EPOCH),
+                  8
+                  )
+                )
                 for (const [key, value] of Object.entries(this.history[this.memoryAddress])) {
                   switch (key) {
                     case 'time':
                       break
                     default:
-                      for (var x = 0, iLen = this.signatures.length; x < iLen; x++) {
+                      for (let x = 0, iLen = this.signatures.length; x < iLen; x++) {
                         if (this.signatures[x].entry === key) {
-                          // console.log('key', key, this.signatures[x].uuid, value, this.signatures[x].factor);
                           switch (this.signatures[x].length) {
                             case 8:
-                              result[x] = Format('%s', numToHex(swap32(value * this.signatures[x].factor), this.signatures[x].length))
+                              result[x] = Format('%s', numToHex(swap32(
+                                value * this.signatures[x].factor),
+                              this.signatures[x].length
+                              ))
                               break
                             case 4:
-                              result[x] = Format('%s', numToHex(swap16(value * this.signatures[x].factor), this.signatures[x].length))
+                              result[x] = Format('%s', numToHex(swap16(
+                                value * this.signatures[x].factor),
+                              this.signatures[x].length
+                              ))
                               break
                             case 2:
-                              result[x] = Format('%s', numToHex(value * this.signatures[x].factor, this.signatures[x].length))
+                              result[x] = Format('%s', numToHex(
+                                value * this.signatures[x].factor,
+                                this.signatures[x].length
+                              ))
                               break
                           }
                           bitmask += Math.pow(2, x)
@@ -779,10 +971,13 @@ module.exports = function (pHomebridge) {
                       }
                   }
                 }
-                var results = dataStream + ' ' + numToHex(bitmask, 2) + ' ' + result.map(a => a).join(' ')
-                // console.log('results', numToHex((results.replace(/[^0-9A-F]/ig, '').length) / 2 + 1) + ' ' + results);
-                this.dataStream += (' ' + numToHex((results.replace(/[^0-9A-F]/ig, '').length) / 2 + 1) + ' ' + results + ',')
+                const results = dataStream + ' ' + numToHex(bitmask, 2) + ' ' +
+                  result.map(a => a).join(' ')
+                this.dataStream += ' ' + numToHex(
+                  (results.replace(/[^0-9A-F]/ig, '').length) / 2 + 1
+                ) + ' ' + results + ','
                 break
+              }
             }
           }
           this.currentEntry++
@@ -801,11 +996,11 @@ module.exports = function (pHomebridge) {
     setCurrentS2W1 (val, callback) {
       callback(null)
       this.log.debug('Data request %s: %s', this.accessoryName, base64ToHex(val))
-      var valHex = base64ToHex(val)
-      var substring = valHex.substring(4, 12)
-      var valInt = parseInt(substring, 16)
-      var address = swap32(valInt)
-      var hexAddress = address.toString('16')
+      const valHex = base64ToHex(val)
+      const substring = valHex.substring(4, 12)
+      const valInt = parseInt(substring, 16)
+      const address = swap32(valInt)
+      const hexAddress = address.toString('16')
 
       this.log.debug('Address requested %s: %s', this.accessoryName, hexAddress)
       this.sendHistory(address)
@@ -816,8 +1011,6 @@ module.exports = function (pHomebridge) {
       callback(null)
     }
   }
-
   FakeGatoHistoryService.UUID = 'E863F007-079E-48FF-8F27-9C2605A29F52'
-
   return FakeGatoHistory
 }
diff --git a/lib/fakegato/fakegato-storage.js b/lib/fakegato/fakegato-storage.js
index 2fa074ce..210687bb 100644
--- a/lib/fakegato/fakegato-storage.js
+++ b/lib/fakegato/fakegato-storage.js
@@ -1,77 +1,49 @@
-/* jshint esversion: 6,node: true,-W041: false */
+/* jshint -W014, -W033, esversion: 9 */
+/* eslint-disable new-cap */
 'use strict'
 
-const DEBUG = true
+const fs = require('fs')
+const os = require('os')
+const path = require('path')
+const hostname = os.hostname().split('.')[0]
+const fileSuffix = '_persist.json'
 
-var fs = require('fs')
-var os = require('os')
-var path = require('path')
-var hostname = os.hostname().split('.')[0]
-
-// var googleDrive = require('./lib/googleDrive').drive;
-
-var fileSuffix = '_persist.json'
-
-var thisStorage
-
-class FakeGatoStorage {
+module.exports = class FakeGatoStorage {
   constructor (params) {
-    if (!params) { params = {} }
-
+    if (!params) {
+      params = {}
+    }
     this.writers = []
-
     this.log = params.log || {}
     if (!this.log.debug) {
-      this.log.debug = DEBUG ? console.log : function () { }
+      this.log.debug = console.log
     }
-    thisStorage = this
     this.addingWriter = false
   }
 
   addWriter (service, params) {
     if (!this.addingWriter) {
       this.addingWriter = true
-      if (!params) { params = {} }
-
+      if (!params) {
+        params = {}
+      }
       this.log.debug('** Fakegato-storage AddWriter :', service.accessoryName)
-
       const newWriter = {
         service: service,
         callback: params.callback,
         storage: params.storage || 'fs',
-        fileName: params.filename || hostname + '_' + service.accessoryName + fileSuffix		// Unique filename per homebridge server.  Allows test environments on other servers not to break prod.
-      }
-      var onReady = typeof (params.onReady) === 'function' ? params.onReady : function () { }
-
-      switch (newWriter.storage) {
-        case 'fs':
-          newWriter.storageHandler = fs
-          newWriter.path = params.path || path.join(os.homedir(), '.homebridge')
-          this.writers.push(newWriter)
-          this.addingWriter = false
-          onReady()
-          break
-        /*
-        case 'googleDrive':
-          newWriter.path = params.path || 'fakegato';
-          newWriter.keyPath = params.keyPath || path.join(os.homedir(), '.homebridge');
-          newWriter.storageHandler = new googleDrive({
-            keyPath: newWriter.keyPath, callback: function () {
-              this.addingWriter = false;
-              onReady(arguments);
-            }.bind(this), folder: newWriter.path
-          });
-          this.writers.push(newWriter);
-          break;
-        case 'memcached' :
-
-        break;
-        */
+        fileName: params.filename || hostname + '_' + service.accessoryName + fileSuffix
       }
+      const onReady = typeof (params.onReady) === 'function'
+        ? params.onReady
+        : () => {}
+      newWriter.storageHandler = fs
+      newWriter.path = params.path || path.join(os.homedir(), '.homebridge')
+      this.writers.push(newWriter)
+      this.addingWriter = false
+      onReady()
     } else {
-      setTimeout(function () {
-        this.addWriter(service, params)
-      }.bind(this), 100)
+      setTimeout(() => this.addWriter(service, params), 100)
     }
   }
 
@@ -98,80 +70,66 @@ class FakeGatoStorage {
     this.writers.splice(index, 1)
   }
 
-  write (params) { // must be asynchronous
+  write (params) {
+    // must be asynchronous
     if (!this.writing) {
       this.writing = true
       const writer = this.getWriter(params.service)
-      const callBack = typeof (params.callback) === 'function' ? params.callback : (typeof (writer.callback) === 'function' ? writer.callback : function () { }) // use parameter callback or writer callback or empty function
-      switch (writer.storage) {
-        case 'fs':
-          this.log.debug('** Fakegato-storage write FS file:', path.join(writer.path, writer.fileName), params.data.substr(1, 80))
-          writer.storageHandler.writeFile(path.join(writer.path, writer.fileName), params.data, 'utf8', function () {
-            this.writing = false
-            callBack(arguments)
-          }.bind(this))
-          break
-        /*
-        case 'googleDrive':
-          this.log.debug("** Fakegato-storage write googleDrive file:", writer.path, writer.fileName, params.data.substr(1, 80));
-          writer.storageHandler.writeFile(writer.path, writer.fileName, params.data, function () {
-            this.writing = false;
-            callBack(arguments);
-          }.bind(this));
-          break;
-        case 'memcached' :
-
-        break;
-        */
-      }
+      // use parameter callback or writer callback or empty function
+      const callBack = typeof (params.callback) === 'function'
+        ? params.callback
+        : (typeof (writer.callback) === 'function'
+          ? writer.callback
+          : () => {})
+      this.log.debug(
+        '** Fakegato-storage write FS file:',
+        path.join(writer.path, writer.fileName),
+        params.data.substr(1, 80)
+      )
+      writer.storageHandler.writeFile(
+        path.join(writer.path, writer.fileName),
+        params.data, 'utf8',
+        () => {
+          this.writing = false
+          callBack(arguments)
+        }
+      )
     } else {
-      setTimeout(function () { // retry in 100ms
-        this.write(params)
-      }.bind(this), 100)
+      setTimeout(() => this.write(params), 100)
     }
   }
 
   read (params) {
     const writer = this.getWriter(params.service)
-    const callBack = typeof (params.callback) === 'function' ? params.callback : (typeof (writer.callback) === 'function' ? writer.callback : function () { }) // use parameter callback or writer callback or empty function
-    switch (writer.storage) {
-      case 'fs':
-        this.log.debug('** Fakegato-storage read FS file:', path.join(writer.path, writer.fileName))
-        writer.storageHandler.readFile(path.join(writer.path, writer.fileName), 'utf8', callBack)
-        break
-      /*
-      case 'googleDrive':
-        this.log.debug("** Fakegato-storage read googleDrive file: %s/%s", writer.path, writer.fileName);
-        writer.storageHandler.readFile(writer.path, writer.fileName, callBack);
-        break;
-      case 'memcached' :
-
-      break;
-      */
-    }
+    // use parameter callback or writer callback or empty function
+    const callBack = typeof (params.callback) === 'function'
+      ? params.callback
+      : (typeof (writer.callback) === 'function'
+        ? writer.callback
+        : () => {})
+    this.log.debug(
+      '** Fakegato-storage read FS file:',
+      path.join(writer.path, writer.fileName)
+    )
+    writer.storageHandler.readFile(
+      path.join(writer.path, writer.fileName),
+      'utf8',
+      callBack
+    )
   }
 
   remove (params) {
     const writer = this.getWriter(params.service)
-    const callBack = typeof (params.callback) === 'function' ? params.callback : (typeof (writer.callback) === 'function' ? writer.callback : function () { }) // use parameter callback or writer callback or empty function
-    switch (writer.storage) {
-      case 'fs':
-        this.log.debug('** Fakegato-storage delete FS file:', path.join(writer.path, writer.fileName))
-        writer.storageHandler.unlink(path.join(writer.path, writer.fileName), callBack)
-        break
-      /*
-      case 'googleDrive':
-        this.log.debug("** Fakegato-storage delete googleDrive file:", writer.path, writer.fileName);
-        writer.storageHandler.deleteFile(writer.path, writer.fileName, callBack);
-        break;
-      case 'memcached' :
-
-      break;
-      */
-    }
+    // use parameter callback or writer callback or empty function
+    const callBack = typeof (params.callback) === 'function'
+      ? params.callback
+      : (typeof (writer.callback) === 'function'
+        ? writer.callback
+        : () => {})
+    this.log.debug(
+      '** Fakegato-storage delete FS file:',
+      path.join(writer.path, writer.fileName)
+    )
+    writer.storageHandler.unlink(path.join(writer.path, writer.fileName), callBack)
   }
 }
-
-module.exports = {
-  FakeGatoStorage: FakeGatoStorage
-}
diff --git a/lib/fakegato/fakegato-timer.js b/lib/fakegato/fakegato-timer.js
index 008d4b93..97fe8b30 100644
--- a/lib/fakegato/fakegato-timer.js
+++ b/lib/fakegato/fakegato-timer.js
@@ -1,33 +1,31 @@
-/* jshint esversion: 6,node: true,-W041: false */
+/* jshint -W014, -W033, esversion: 9 */
+/* eslint-disable new-cap */
 'use strict'
 
-const DEBUG = true
-
-class FakeGatoTimer {
+module.exports = class FakeGatoTimer {
   constructor (params) {
-    if (!params) { params = {} }
+    if (!params) {
+      params = {}
+    }
     this.subscribedServices = []
     this.minutes = params.minutes || 10
-
     this.intervalID = null
     this.running = false
     this.log = params.log || {}
     if (!this.log.debug) {
-      this.log.debug = DEBUG ? console.log : function () { }
+      this.log.debug = console.log
     }
   }
 
-  // Subscription management
   subscribe (service, callback) {
     this.log.debug('** Fakegato-timer Subscription :', service.accessoryName)
     const newService = {
-      service: service,
-      callback: callback,
+      service,
+      callback,
       backLog: [],
       previousBackLog: [],
       previousAvrg: {}
     }
-
     this.subscribedServices.push(newService)
   }
 
@@ -52,30 +50,33 @@ class FakeGatoTimer {
   unsubscribe (service) {
     const index = this._getSubscriberIndex(service)
     this.subscribedServices.splice(index, 1)
-    if (this.subscribedServices.length === 0 && this.running) { this.stop() }
+    if (this.subscribedServices.length === 0 && this.running) {
+      this.stop()
+    }
   }
 
-  // Timer management
   start () {
     this.log.debug('**Start Global Fakegato-Timer - ' + this.minutes + 'min**')
     if (this.running) { this.stop() }
     this.running = true
-    this.intervalID = setInterval(this.executeCallbacks.bind(this), this.minutes * 60 * 1000)
+    this.intervalID = setInterval(
+      () => this.executeCallbacks,
+      this.minutes * 60 * 1000
+    )
   }
 
   stop () {
-    this.log.debug('**Stop Global Fakegato-Timer****')
+    this.log.debug('**Stop Global Fakegato-Timer**')
     clearInterval(this.intervalID)
     this.running = false
     this.intervalID = null
   }
 
-  // Data management
   executeCallbacks () {
     this.log.debug('**Fakegato-timer: executeCallbacks**')
     if (this.subscribedServices.length !== 0) {
       for (const s in this.subscribedServices) {
-        if (this.subscribedServices.hasOwnProperty(s)) {
+        if (Object.prototype.hasOwnProperty.call(this.subscribedServices, s)) {
           const service = this.subscribedServices[s]
           if (typeof (service.callback) === 'function') {
             service.previousAvrg = service.callback({
@@ -92,7 +93,6 @@ class FakeGatoTimer {
 
   executeImmediateCallback (service) {
     this.log.debug('**Fakegato-timer: executeImmediateCallback**')
-
     if (typeof (service.callback) === 'function' && service.backLog.length) {
       service.callback({
         backLog: service.backLog,
@@ -106,29 +106,26 @@ class FakeGatoTimer {
     const data = params.entry
     const service = params.service
     const immediateCallback = params.immediateCallback || false
-
     this.log.debug('**Fakegato-timer: addData ', service.accessoryName, data, ' immediate: ', immediateCallback)
-
-    if (immediateCallback) // door or motion -> replace
-    { this.getSubscriber(service).backLog[0] = data } else { this.getSubscriber(service).backLog.push(data) }
-
     if (immediateCallback) {
-      // setTimeout(this.executeImmediateCallback.bind(this), 0,service);
+      this.getSubscriber(service).backLog[0] = data
+    } else {
+      this.getSubscriber(service).backLog.push(data)
+    }
+    if (immediateCallback) {
       this.executeImmediateCallback(this.getSubscriber(service))
     }
-
-    if (this.running === false) { this.start() }
+    if (this.running === false) {
+      this.start()
+    }
   }
 
   emptyData (service) {
     this.log.debug('**Fakegato-timer: emptyData **', service.accessoryName)
     const source = this.getSubscriber(service)
-
-    if (source.backLog.length) source.previousBackLog = source.backLog
+    if (source.backLog.length) {
+      source.previousBackLog = source.backLog
+    }
     source.backLog = []
   }
 }
-
-module.exports = {
-  FakeGatoTimer: FakeGatoTimer
-}
diff --git a/lib/fakegato/uuid.js b/lib/fakegato/uuid.js
index ede9f670..a1ded642 100644
--- a/lib/fakegato/uuid.js
+++ b/lib/fakegato/uuid.js
@@ -1,17 +1,26 @@
+/* jshint -W014, -W033, esversion: 9 */
+/* eslint-disable new-cap */
+'use strict'
+
 // https://github.com/homebridge/HAP-NodeJS/blob/master/src/lib/util/uuid.ts
 
 const VALID_UUID_REGEX = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i
+const VALID_SHORT_REGEX = /^[0-9a-f]{1,8}$/i
 
 function isValid (UUID) {
   return VALID_UUID_REGEX.test(UUID)
 }
-const VALID_SHORT_REGEX = /^[0-9a-f]{1,8}$/i
 
 function toLongFormUUID (uuid, base = '-0000-1000-8000-0026BB765291') {
-  if (isValid(uuid)) return uuid.toUpperCase()
-  if (!VALID_SHORT_REGEX.test(uuid)) throw new TypeError('uuid was not a valid UUID or short form UUID')
-  if (!isValid('00000000' + base)) throw new TypeError('base was not a valid base UUID')
-
+  if (isValid(uuid)) {
+    return uuid.toUpperCase()
+  }
+  if (!VALID_SHORT_REGEX.test(uuid)) {
+    throw new TypeError('uuid was not a valid UUID or short form UUID')
+  }
+  if (!isValid('00000000' + base)) {
+    throw new TypeError('base was not a valid base UUID')
+  }
   return (('00000000' + uuid).substr(-8) + base).toUpperCase()
 }
 
diff --git a/package.json b/package.json
index 39f7ba50..aadf9df1 100644
--- a/package.json
+++ b/package.json
@@ -53,10 +53,5 @@
     "p-queue": "^6.6.2",
     "websocket-as-promised": "^1.1.0",
     "ws": "^7.4.3"
-  },
-  "standard": {
-    "ignore": [
-      "/lib/fakegato/"
-    ]
   }
 }

From f8bdee17af2623fd18764ca19e05627e5a6ddd5a Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 9 Feb 2021 11:06:12 +0000
Subject: [PATCH 1373/3183] config alphabetical

---
 lib/index.js | 46 +++++++++++++++++++++-------------------------
 1 file changed, 21 insertions(+), 25 deletions(-)

diff --git a/lib/index.js b/lib/index.js
index c02c068c..b4112c0b 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -133,15 +133,30 @@ class eWeLinkPlatform {
             logIgnore(key)
           }
           break
-        case 'countryCode': {
-          if (typeof val === 'string') {
-            logQuotes(key)
+        case 'bulbB02BA60':
+        case 'bulbB02FST64':
+        case 'hideChanFromHB':
+        case 'hideLightFromFan':
+        case 'hideSwitchFromTH':
+        case 'ignoredDevices':
+        case 'outletAsSwitch':
+        case 'resetRFBridge':
+        case 'switchAsOutlet':
+          this.config[key] = []
+          if (typeof val !== 'string' || val === '') {
+            logIgnore(key)
+          } else {
+            const items = val.split(',')
+            items.forEach(item => {
+              this.config[key].push(this.funcs.parseDeviceId(val))
+            })
           }
-          const intVal = parseInt(val)
-          if (isNaN(intVal)) {
+          break
+        case 'countryCode': {
+          if (!val)) {
             throw new Error(this.messages.missingCC)
           } else {
-            this.config.countryCode = '+' + val.toString().replace(/[\s+]+/g, '')
+            this.config.countryCode = this.funcs.parseCountryCode(val)
           }
           break
         }
@@ -232,25 +247,6 @@ class eWeLinkPlatform {
             logIgnore(key)
           }
           break
-        case 'ignoredDevices':
-        case 'hideChanFromHB':
-        case 'switchAsOutlet':
-        case 'outletAsSwitch':
-        case 'hideLightFromFan':
-        case 'hideSwitchFromTH':
-        case 'resetRFBridge':
-        case 'bulbB02BA60':
-        case 'bulbB02FST64':
-          this.config[key] = []
-          if (typeof val !== 'string' || val === '') {
-            logIgnore(key)
-          } else {
-            const items = val.split(',')
-            items.forEach(item => {
-              this.config[key].push(this.funcs.parseDeviceId(val))
-            })
-          }
-          break
         case 'inUsePowerThreshold':
         case 'lowBattThreshold':
         case 'sensorTimeDifference': {

From aac277b1e6e45f021f0e3032c44258a2ea3f3634 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 9 Feb 2021 11:06:18 +0000
Subject: [PATCH 1374/3183] countrycode to string

---
 config.schema.json     | 2 +-
 lib/utils/functions.js | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/config.schema.json b/config.schema.json
index a4326b75..23202fb1 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -13,7 +13,7 @@
         "default": "eWeLink"
       },
       "countryCode": {
-        "type": "number",
+        "type": "string",
         "title": "Country Code",
         "placeholder": "Enter without the +",
         "required": true
diff --git a/lib/utils/functions.js b/lib/utils/functions.js
index 87e5a9e2..c0ba6965 100644
--- a/lib/utils/functions.js
+++ b/lib/utils/functions.js
@@ -24,5 +24,9 @@ module.exports = {
       }
     }
     return toReturn
+  },
+
+  parseCountryCode: code => {
+    return '+' + code.toString().replace(/[^0-9]+/g, '')
   }
 }

From 067d6a65da11a4a3ede90927d30525097482569e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 9 Feb 2021 11:06:58 +0000
Subject: [PATCH 1375/3183] syntax

---
 lib/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/index.js b/lib/index.js
index b4112c0b..fd66c80b 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -153,7 +153,7 @@ class eWeLinkPlatform {
           }
           break
         case 'countryCode': {
-          if (!val)) {
+          if (!val) {
             throw new Error(this.messages.missingCC)
           } else {
             this.config.countryCode = this.funcs.parseCountryCode(val)

From 3ebdc04ef332846b248549871361bda3cd9457d4 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 9 Feb 2021 11:10:04 +0000
Subject: [PATCH 1376/3183] order of fields

---
 config.schema.json     | 58 +++++++++++++++++++++---------------------
 lib/utils/constants.js |  8 +++---
 2 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 23202fb1..d9af378b 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -65,6 +65,9 @@
         "type": "boolean",
         "description": "If checked, debug information will be added to the log."
       },
+      "debugFakegato": {
+        "type": "boolean"
+      },
       "disablePlugin": {
         "title": "Disable Plugin",
         "type": "boolean",
@@ -126,6 +129,32 @@
         "placeholder": 120,
         "minimum": 10
       },
+      "bulbB02BA60": {
+        "type": "string"
+      },
+      "bulbB02FST64": {
+        "type": "string"
+      },
+      "thTempOffset": {
+        "type": "array",
+        "items": {
+          "type": "object",
+          "properties": {
+            "deviceId": {
+              "type": "string"
+            },
+            "offset": {
+              "type": "number"
+            }
+          }
+        }
+      },
+      "hideZBLDPress": {
+        "type": "boolean"
+      },
+      "ZBDWBatt": {
+        "type": "boolean"
+      },
       "groups": {
         "type": "array",
         "items": {
@@ -356,35 +385,6 @@
             }
           }
         }
-      },
-      "debugFakegato": {
-        "type": "boolean"
-      },
-      "bulbB02BA60": {
-        "type": "string"
-      },
-      "bulbB02FST64": {
-        "type": "string"
-      },
-      "thTempOffset": {
-        "type": "array",
-        "items": {
-          "type": "object",
-          "properties": {
-            "deviceId": {
-              "type": "string"
-            },
-            "offset": {
-              "type": "number"
-            }
-          }
-        }
-      },
-      "hideZBLDPress": {
-        "type": "boolean"
-      },
-      "ZBDWBatt": {
-        "type": "boolean"
       }
     }
   },
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 3d746a9e..3b95e7e0 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -11,6 +11,7 @@ module.exports = {
     mode: 'auto',
     disableDeviceLogging: false,
     debug: false,
+    debugFakegato: false,
     disablePlugin: false,
     ignoredDevices: '',
     hideChanFromHB: '',
@@ -22,15 +23,14 @@ module.exports = {
     resetRFBridge: '',
     lowBattThreshold: 25,
     sensorTimeDifference: 120,
-    groups: [],
-    bridgeSensors: [],
-    ipOverride: [],
-    debugFakegato: false,
     bulbB02BA60: '',
     bulbB02FST64: '',
     thTempOffset: [],
     hideZBLDPress: false,
     ZBDWBatt: false,
+    groups: [],
+    bridgeSensors: [],
+    ipOverride: [],
     platform: 'eWeLink'
   },
 

From 48e5a1193d21bb498fe675eaa57ee2d132b983c1 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 9 Feb 2021 11:10:45 +0000
Subject: [PATCH 1377/3183] 4.7.0-6

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 05b4b564..0be8349c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.7.0-5",
+  "version": "4.7.0-6",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index aadf9df1..3478277f 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "4.7.0-5",
+  "version": "4.7.0-6",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 191dc5f9f4921e33c71b77ba8d667a5df29bd183 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 9 Feb 2021 13:09:02 +0000
Subject: [PATCH 1378/3183] log vars

---
 lib/index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/index.js b/lib/index.js
index fd66c80b..76aa5b18 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1028,7 +1028,7 @@ class eWeLinkPlatform {
         /**************
         UNKNOWN DEVICES
         **************/
-        this.log.warn('[%s] %s.', this.messages.devNotSupYet, device.name)
+        this.log.warn('[%s] %s.', device.name, this.messages.devNotSupYet)
         return
         /*************/
       }
@@ -1351,7 +1351,7 @@ class eWeLinkPlatform {
         // Log the update if debug is set to true
         if (this.config.debug) {
           const str = JSON.stringify(device.params)
-          this.log('[%s] %s %s.', device.name, this.messages.recNew, str)
+          this.log('[%s] %s %s.', deviceId, this.messages.recNew, str)
         }
 
         // Obtain full device information from the HTTP API

From 3a9befeb0f462e9969d0b471eff4e06f656cea52 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 9 Feb 2021 13:50:28 +0000
Subject: [PATCH 1379/3183] structure for thermostat device

---
 lib/device/thermostat.js | 68 ++++++++++++++++++++++++++++++++++++++++
 lib/index.js             | 15 +++++++--
 lib/utils/constants.js   | 32 ++++++++-----------
 3 files changed, 93 insertions(+), 22 deletions(-)
 create mode 100644 lib/device/thermostat.js

diff --git a/lib/device/thermostat.js b/lib/device/thermostat.js
new file mode 100644
index 00000000..8084b982
--- /dev/null
+++ b/lib/device/thermostat.js
@@ -0,0 +1,68 @@
+/* jshint -W014, -W033, esversion: 9 */
+/* eslint-disable new-cap */
+'use strict'
+
+module.exports = class deviceThermostat {
+  constructor (platform, accessory) {
+    // Set up variables from the platform
+    this.consts = platform.consts
+    this.disableDeviceLogging = platform.config.disableDeviceLogging
+    this.funcs = platform.funcs
+    this.hapServ = platform.api.hap.Service
+    this.hapChar = platform.api.hap.Characteristic
+    this.log = platform.log
+    this.messages = platform.messages
+    this.platform = platform
+
+    // Set up variables from the accessory
+    this.name = accessory.displayName
+    this.accessory = accessory
+    /*
+      **************
+      *** PARAMS ***
+      **************
+      "volatility": 1, // Deviation
+      "targetTemp": 20, // C or F In 0.5
+      "workMode": 1, // 1=manual, 2=programmed 3=economical
+      "switch": "on",
+      "temperature": 29, // C or F In 0.5
+      "fault": 0, // Not Sure
+      "workState": 2, // 1=heating, 2=auto
+      "tempScale": "c", // guessing "f"
+      "childLock": "off", // Guessing "on"
+      "mon": "016800c801e0009602b20096032a009603fc00dc05280096",
+      "tues": "016800c801e0009602b20096032a009603fc00dc05280096",
+      "wed": "016800c801e0009602b20096032a009603fc00dc05280096",
+      "thur": "016800c801e0009602b20096032a009603fc00dc05280096",
+      "fri": "016800c801e0009602b20096032a009603fc00dc05280096",
+      "sat": "016800c801e000c802b200c8032a00c803fc00c805280096",
+      "sun": "016800c801e000c802b200c8032a00c803fc00c805280096",
+    */
+
+    // Add the thermostat service if it doesn't already exist
+    this.service = this.accessory.getService(this.hapServ.Thermostat) ||
+      this.accessory.addService(this.hapServ.Thermostat)
+
+    /*
+    // Add the set handler to the switch on/off characteristic
+    this.service.getCharacteristic(this.hapChar.On)
+      .on('set', this.internalUpdate.bind(this))
+    */
+  }
+
+  async internalUpdate (value, callback) {
+    try {
+      callback()
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, true)
+    }
+  }
+
+  async externalUpdate (params) {
+    try {
+
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, false)
+    }
+  }
+}
diff --git a/lib/index.js b/lib/index.js
index 76aa5b18..dfedb004 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -655,7 +655,7 @@ class eWeLinkPlatform {
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require(instance))(this, accessory)
         /**********************************/
-      } else if (this.consts.devices.sensor.includes(device.extra.uiid)) {
+      } else if (this.consts.devices.sensorContact.includes(device.extra.uiid)) {
         /*******************
         SENSORS [SONOFF DW2]
         *******************/
@@ -682,10 +682,19 @@ class eWeLinkPlatform {
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/diffuser'))(this, accessory)
         /*******/
+      } else if (this.consts.devices.thermostat.includes(device.extra.uiid)) {
+        /**********
+        THERMOSTATS
+        **********/
+        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
+          ? this.devicesInHB.get(device.deviceid + 'SWX')
+          : this.addAccessory(device, device.deviceid + 'SWX')
+        accessory.control = new (require('./device/thermostat'))(this, accessory)
+        /*******/
       } else if (
         this.simulations[device.deviceid] &&
         this.simulations[device.deviceid].type === 'thermostat' &&
-        this.consts.devices.thermostat.includes(device.extra.uiid)
+        this.consts.devices.sensorAmbient.includes(device.extra.uiid)
       ) {
         /*********************************
         THERMOSTATS [ACCESSORY SIMULATION]
@@ -696,7 +705,7 @@ class eWeLinkPlatform {
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require(instance))(this, accessory)
         /********************************/
-      } else if (this.consts.devices.thermostat.includes(device.extra.uiid)) {
+      } else if (this.consts.devices.sensorAmbient.includes(device.extra.uiid)) {
         /***********************
         SENSOR [AMBIENT-TH10/16]
         ***********************/
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 3b95e7e0..a51421b9 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -148,10 +148,8 @@ module.exports = {
 
   allowed: {
     groups: [
-      'blind', 'garage', 'garage_two', 'garage_four',
-      'garage_eachen', 'lock', 'switch_valve', 'tap',
-      'tap_two', 'thermostat', 'valve', 'valve_two',
-      'valve_four'
+      'blind', 'garage', 'garage_two', 'garage_four', 'garage_eachen', 'lock',
+      'switch_valve', 'tap', 'tap_two', 'thermostat', 'valve', 'valve_two', 'valve_four'
     ],
     modes: ['auto', 'wan', 'lan'],
     obstructs: ['garage', 'garage_eachen'],
@@ -168,8 +166,9 @@ module.exports = {
     colourable: [22, 59, 104],
     cTempable: [103],
     curtain: [11],
-    sensor: [102],
-    thermostat: [15],
+    sensorContact: [102],
+    sensorAmbient: [15],
+    thermostat: [127],
     fan: [34],
     diffuser: [25],
     outlet: [32],
@@ -188,19 +187,13 @@ module.exports = {
   },
 
   paramsToKeep: [
-    'battery', 'bright', 'brightness',
-    'channel', 'cmd', 'color', 'colorB',
-    'colorG', 'colorR', 'current',
-    'currentHumidity', 'currentTemperature',
-    'humidity', 'key', 'lightbright',
-    'lightswitch', 'lightRcolor',
-    'lightGcolor', 'lightBcolor', 'lock',
-    'ltype', 'mainSwitch', 'mode', 'motion',
-    'online', 'power', 'rfChl', 'rfList',
-    'rfTrig', 'sensorType', 'setclose', 'state',
-    'switch', 'switches', 'temperature',
-    'trigTime', 'type', 'voltage', 'white',
-    'zyx_mode'
+    'battery', 'bright', 'brightness', 'channel', 'cmd', 'color', 'colorB', 'colorG',
+    'colorR', 'current', 'currentHumidity', 'currentTemperature', 'humidity', 'key',
+    'lightbright', 'lightswitch', 'lightRcolor', 'lightGcolor', 'lightBcolor', 'lock',
+    'ltype', 'mainSwitch', 'mode', 'motion', 'online', 'power', 'rfChl', 'rfList',
+    'rfTrig', 'sensorType', 'setclose', 'state', 'switch', 'switches', 'targetTemp',
+    'temperature', 'tempScale', 'trigTime', 'type', 'voltage', 'white', 'workMode',
+    'workState', 'zyx_mode'
   ],
 
   eve: {
@@ -302,6 +295,7 @@ module.exports = {
     104: 1, // "WOTEWODE_RGB_TEM_LIGHT"
     107: 0, // "GSM_SOCKET_NO_FLOW"
     109: 0, // "YK_INFRARED_2"
+    127: 1, // "GTTA127"
     1000: 1, // "ZIGBEE_WIRELESS_SWITCH"
     1001: 0, // "BLADELESS_FAN"
     1002: 0, // "NEW_HUMIDIFIER"

From 753a76ec5c6c16cc8081d97f613572cf51b96cb7 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 9 Feb 2021 16:52:51 +0000
Subject: [PATCH 1380/3183] reduce the incoming logging

---
 lib/connection/ws.js | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/lib/connection/ws.js b/lib/connection/ws.js
index ef876243..b25c0584 100644
--- a/lib/connection/ws.js
+++ b/lib/connection/ws.js
@@ -164,6 +164,7 @@ module.exports = class connectionWS {
 
       // Set a device online flag now which we can change later
       let onlineStatus = true
+      let isStatusUpdate
 
       // Set up a params object if one didn't already come within the message
       if (!device.params) {
@@ -173,7 +174,7 @@ module.exports = class connectionWS {
       // We received a device on/offline or error notification
       if (device.deviceid && this.funcs.hasProperty(device, 'error')) {
         device.action = 'update'
-
+        isStatusUpdate = true
         // Set the online status of the device
         onlineStatus = device.error === 0
 
@@ -213,14 +214,16 @@ module.exports = class connectionWS {
             device.params.online = onlineStatus
             device.params.updateSource = 'WS'
 
-            // Generate the object to return to the plugin
-            const returnTemplate = {
-              deviceid: device.deviceid,
-              params: device.params
-            }
+            if (Object.keys(device.params).length > 2 || isStatusUpdate) {
+              // Generate the object to return to the plugin
+              const returnTemplate = {
+                deviceid: device.deviceid,
+                params: device.params
+              }
 
-            // Report the new device params object back to the plugin to deal with
-            this.emitter.emit('update', returnTemplate)
+              // Report the new device params object back to the plugin to deal with
+              this.emitter.emit('update', returnTemplate)
+            }
             break
           }
           case 'reportSubDevice':

From 28c92e376a5638f0823aa4b3023916e24ce40b54 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 9 Feb 2021 16:53:21 +0000
Subject: [PATCH 1381/3183] p-queue settings

---
 lib/index.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/index.js b/lib/index.js
index dfedb004..3f859e7d 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -383,9 +383,10 @@ class eWeLinkPlatform {
 
       // Create the queue used for HTTP requests
       this.queue = new PQueue({
-        concurrency: 1,
+        concurrency: 5,
         interval: 500,
-        intervalCap: 1
+        intervalCap: 1,
+        timeout: 10000
       })
 
       // Set up the HTTP client, get the user HTTP host, and login

From 7a5e7a27ec6b50efe005a0b09ac57bdd652df82f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 9 Feb 2021 16:53:30 +0000
Subject: [PATCH 1382/3183] finalise thermostat implementation

---
 lib/device/thermostat.js | 122 +++++++++++++++++++++++++++++++++++++--
 1 file changed, 116 insertions(+), 6 deletions(-)

diff --git a/lib/device/thermostat.js b/lib/device/thermostat.js
index 8084b982..7f58f920 100644
--- a/lib/device/thermostat.js
+++ b/lib/device/thermostat.js
@@ -17,6 +17,11 @@ module.exports = class deviceThermostat {
     // Set up variables from the accessory
     this.name = accessory.displayName
     this.accessory = accessory
+
+    // Set up custom variables for this device type
+    const eweId = this.accessory.context.eweDeviceId
+    this.tempOffset = Number(platform.thTempOffset[eweId] || 0)
+
     /*
       **************
       *** PARAMS ***
@@ -43,16 +48,65 @@ module.exports = class deviceThermostat {
     this.service = this.accessory.getService(this.hapServ.Thermostat) ||
       this.accessory.addService(this.hapServ.Thermostat)
 
-    /*
-    // Add the set handler to the switch on/off characteristic
-    this.service.getCharacteristic(this.hapChar.On)
-      .on('set', this.internalUpdate.bind(this))
-    */
+    // Set custom properties of the current temperature characteristic
+    this.service.getCharacteristic(this.hapChar.CurrentTemperature).setProps({
+      minValue: -100,
+      minStep: 0.1
+    })
+
+    // Add the set handler to the target state characteristic
+    this.service.getCharacteristic(this.hapChar.TargetHeatingCoolingState)
+      .on('set', this.internalOnOffUpdate.bind(this))
+      .setProps({ validValues: [0, 1] })
+
+    // Add the set handler to the target temperature characteristic
+    this.service.getCharacteristic(this.hapChar.TargetTemperature)
+      .on('set', this.internalTargetTempUpdate.bind(this))
+      .setProps({
+        minValue: 5,
+        maxValue: 45,
+        minStep: 0.5
+      })
+
+    // Pass the accessory to Fakegato to set up with Eve
+    this.accessory.log = platform.config.debugFakegato ? this.log : () => {}
+    this.accessory.eveService = new this.platform.eveService('custom', this.accessory, {
+      storage: 'fs',
+      path: platform.eveLogPath
+    })
+  }
+
+  async internalOnOffUpdate (value, callback) {
+    try {
+      callback()
+      this.cacheOnOff = value !== 0 ? 'on' : 'off'
+      const params = {
+        switch: this.cacheOnOff
+      }
+      if (value === 0) {
+        this.service.updateCharacteristic(this.hapChar.CurrentHeatingCoolingState, 0)
+      }
+      await this.platform.sendDeviceUpdate(this.accessory, params)
+      if (!this.disableDeviceLogging) {
+        this.log('[%s] current state [%s].', this.name, this.cacheOnOff)
+      }
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, true)
+    }
   }
 
-  async internalUpdate (value, callback) {
+  async internalTargetTempUpdate (value, callback) {
     try {
       callback()
+      this.cacheTarget = value
+      const params = {
+        workMode: 1,
+        targetTemp: this.cacheTarget
+      }
+      await this.platform.sendDeviceUpdate(this.accessory, params)
+      if (!this.disableDeviceLogging) {
+        this.log('[%s] current target [%s°C].', this.name, this.cacheTarget)
+      }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
     }
@@ -60,7 +114,63 @@ module.exports = class deviceThermostat {
 
   async externalUpdate (params) {
     try {
+      this.log.error(JSON.stringify(params, null, 2))
+      if (params.switch && params.switch !== this.OnOff) {
+        this.cacheOnOff = params.switch
+        if (this.cacheOnOff === 'off') {
+          this.service.updateCharacteristic(this.hapChar.CurrentHeatingCoolingState, 0)
+        }
+        this.service.updateCharacteristic(
+          this.hapChar.TargetHeatingCoolingState,
+          this.cacheOnOff === 'on' ? 1 : 0
+        )
+        if (params.updateSource && !this.disableDeviceLogging) {
+          this.log('[%s] current state [%s].', this.name, this.cacheOnOff)
+        }
+      }
+
+      if (params.workState) {
+        this.cacheHeating = params.workState === 1 ? 'on' : 'off'
+        this.service.updateCharacteristic(
+          this.hapChar.CurrentHeatingCoolingState,
+          this.cacheHeating === 'on' ? 1 : 0
+        )
+        if (params.updateSource && !this.disableDeviceLogging) {
+          this.log('[%s] current heating [%s].', this.name, this.cacheHeating)
+        }
+      }
+
+      if (this.funcs.hasProperty(params, 'targetTemp')) {
+        const targetTemp = Number(params.targetTemp)
+        if (this.cacheTarget !== targetTemp) {
+          this.cacheTarget = targetTemp
+          this.service.updateCharacteristic(
+            this.hapChar.TargetTemperature,
+            this.cacheTarget
+          )
+          if (params.updateSource && !this.disableDeviceLogging) {
+            this.log('[%s] current target [%s°C].', this.name, this.cacheTarget)
+          }
+        }
+      }
 
+      if (this.funcs.hasProperty(params, 'temperature')) {
+        const currentTemp = Number(params.temperature) + this.tempOffset
+        if (this.cacheTemp !== currentTemp) {
+          this.cacheTemp = currentTemp
+          this.service.updateCharacteristic(
+            this.hapChar.CurrentTemperature,
+            this.cacheTemp
+          )
+          if (params.updateSource && !this.disableDeviceLogging) {
+            this.log('[%s] current temperature [%s°C].', this.name, this.cacheTemp)
+          }
+        }
+        this.accessory.eveService.addEntry({
+          time: Math.round(new Date().valueOf() / 1000),
+          temp: currentTemp
+        })
+      }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }

From ee9019bc94d0b43df1d243fbd8d3c89a5c2bae04 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 9 Feb 2021 16:54:18 +0000
Subject: [PATCH 1383/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f9004525..e473242f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 ### Added
 
+* Support for the eWeLink thermostat device type
 * A queue for device updates to improve reliability, this also results in:
   * Faster device updates with colour bulbs
 * Configuration checks to highlight any unnecessary or incorrectly formatted settings you have

From 4b739c23cf82d07020f5295110f51f7ba4bc50b0 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 9 Feb 2021 16:55:16 +0000
Subject: [PATCH 1384/3183] 4.7.0-7

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 0be8349c..ea8f128f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.7.0-6",
+  "version": "4.7.0-7",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 3478277f..d4ea148b 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "4.7.0-6",
+  "version": "4.7.0-7",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 154ae80d6d9d70ccdd8a6fe21a0f905d9b47bda5 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 9 Feb 2021 20:25:08 +0000
Subject: [PATCH 1385/3183] remove logging

---
 lib/device/thermostat.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/device/thermostat.js b/lib/device/thermostat.js
index 7f58f920..9d086312 100644
--- a/lib/device/thermostat.js
+++ b/lib/device/thermostat.js
@@ -114,7 +114,6 @@ module.exports = class deviceThermostat {
 
   async externalUpdate (params) {
     try {
-      this.log.error(JSON.stringify(params, null, 2))
       if (params.switch && params.switch !== this.OnOff) {
         this.cacheOnOff = params.switch
         if (this.cacheOnOff === 'off') {

From 391d185780046d67370fb9142eecc34744c0259a Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 9 Feb 2021 20:25:35 +0000
Subject: [PATCH 1386/3183] 4.7.0-8

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ea8f128f..0be86ff5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.7.0-7",
+  "version": "4.7.0-8",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index d4ea148b..74c36907 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "4.7.0-7",
+  "version": "4.7.0-8",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From e264c0b1e4018b9af7ca1929b8461e9c85600a18 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 9 Feb 2021 20:29:13 +0000
Subject: [PATCH 1387/3183] cache updating

---
 lib/device/thermostat.js | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/lib/device/thermostat.js b/lib/device/thermostat.js
index 9d086312..17438de3 100644
--- a/lib/device/thermostat.js
+++ b/lib/device/thermostat.js
@@ -129,13 +129,16 @@ module.exports = class deviceThermostat {
       }
 
       if (params.workState) {
-        this.cacheHeating = params.workState === 1 ? 'on' : 'off'
-        this.service.updateCharacteristic(
-          this.hapChar.CurrentHeatingCoolingState,
-          this.cacheHeating === 'on' ? 1 : 0
-        )
-        if (params.updateSource && !this.disableDeviceLogging) {
-          this.log('[%s] current heating [%s].', this.name, this.cacheHeating)
+        const workState = params.workState === 1 ? 'on' : 'off'
+        if (this.cacheHeating !== workState) {
+          this.cacheHeating = workState
+          this.service.updateCharacteristic(
+            this.hapChar.CurrentHeatingCoolingState,
+            this.cacheHeating === 'on' ? 1 : 0
+          )
+          if (params.updateSource && !this.disableDeviceLogging) {
+            this.log('[%s] current heating [%s].', this.name, this.cacheHeating)
+          }
         }
       }
 

From b2106c4b696389e72d7c0ef20df6ea14e6bd730c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 9 Feb 2021 20:29:43 +0000
Subject: [PATCH 1388/3183] 4.7.0-9

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 0be86ff5..c8413c8c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.7.0-8",
+  "version": "4.7.0-9",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 74c36907..efff8d7a 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "4.7.0-8",
+  "version": "4.7.0-9",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 4f8e9a0b31ed8ca049c925d61df2c6fecfe144cd Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 9 Feb 2021 22:08:04 +0000
Subject: [PATCH 1389/3183] min node to 14.15.5

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index efff8d7a..1098c072 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
   "main": "lib/index.js",
   "engines": {
     "homebridge": "^1.1.6",
-    "node": "^14.15.4"
+    "node": "^14.15.5"
   },
   "repository": {
     "type": "git",

From cba3c76b73163829f7b96ce642b8f65e3e17e069 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 9 Feb 2021 22:10:30 +0000
Subject: [PATCH 1390/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e473242f..dc413276 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,6 +24,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 * Error messages refactored to show the most useful information
 * [Backend] Major code refactoring
 * [Backend] Code comments
+* Updated minimum node to v14.15.5
 * Updated dependencies
 
 ## 4.6.1 (2021-02-02)

From dc95394b1263de817ba5978858b6e1950f381659 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 10 Feb 2021 11:20:40 +0000
Subject: [PATCH 1391/3183] remove resetRFBridge + ignored to array

---
 config.schema.json     | 35 +++++++++++++++++++++++------------
 lib/index.js           | 19 ++++++++++++++++---
 lib/utils/constants.js | 29 ++++++++++++++---------------
 3 files changed, 53 insertions(+), 30 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index d9af378b..83c36e63 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -73,11 +73,6 @@
         "type": "boolean",
         "description": "If checked, the plugin will remove all accessories and not load the plugin on restart."
       },
-      "ignoredDevices": {
-        "type": "string",
-        "title": "Ignored Devices",
-        "description": "A list of devices to ignore by device id. For example 10009553c8 or multiple separated by a comma."
-      },
       "hideChanFromHB": {
         "type": "string",
         "title": "Hide Light/Switch Channels",
@@ -110,11 +105,6 @@
         "title": "Hide TH10/16 Switches",
         "description": "A list of TH10/TH16 devices for which the switch will be hidden. For example 10009553c8 or multiple separated by a comma."
       },
-      "resetRFBridge": {
-        "title": "Reset RF Bridges",
-        "type": "string",
-        "description": "A list of RF Bridges to remove and re-add on restart. This is needed when adding/removed sub-devices from the RF Bridge. For example 10009553c8 or multiple separated by a comma."
-      },
       "lowBattThreshold": {
         "type": "number",
         "title": "Low Battery Threshold",
@@ -385,6 +375,15 @@
             }
           }
         }
+      },
+      "ignoredDevices": {
+        "title": "Ignored Devices",
+        "type": "array",
+        "items": {
+          "type": "string",
+          "title": "Device ID",
+          "description": "eWeLink device id of the device to ignore, e.g. 10009553c8."
+        }
       }
     }
   },
@@ -414,14 +413,12 @@
       "title": "Device Settings",
       "expandable": true,
       "items": [
-        "ignoredDevices",
         "hideChanFromHB",
         "switchAsOutlet",
         "outletAsSwitch",
         "inUsePowerThreshold",
         "hideLightFromFan",
         "hideSwitchFromTH",
-        "resetRFBridge",
         "lowBattThreshold",
         "sensorTimeDifference"
       ]
@@ -485,6 +482,20 @@
           ]
         }
       ]
+    },
+    {
+      "key": "ignoredDevices",
+      "expandable": true,
+      "description": "Use this setting to ignore specific devices from your eWeLink account.",
+      "title": "Ignored Devices",
+      "add": "Add Another Device",
+      "type": "array",
+      "items": [{
+        "type": "fieldset",
+        "items": [
+          "ignoredDevices[]"
+        ]
+      }]
     }
   ]
 }
\ No newline at end of file
diff --git a/lib/index.js b/lib/index.js
index 3f859e7d..0c1783d4 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -138,9 +138,7 @@ class eWeLinkPlatform {
         case 'hideChanFromHB':
         case 'hideLightFromFan':
         case 'hideSwitchFromTH':
-        case 'ignoredDevices':
         case 'outletAsSwitch':
-        case 'resetRFBridge':
         case 'switchAsOutlet':
           this.config[key] = []
           if (typeof val !== 'string' || val === '') {
@@ -247,6 +245,22 @@ class eWeLinkPlatform {
             logIgnore(key)
           }
           break
+        case 'ignoredDevices': {
+          if (Array.isArray(val)) {
+            if (val.length > 0) {
+              val.forEach(deviceId => {
+                this.config.ignoredDevices.push(
+                  this.funcs.parseDeviceId(deviceId)
+                )
+              })
+            } else {
+              logRemove(key)
+            }
+          } else {
+            logIgnore(key)
+          }
+          break
+        }
         case 'inUsePowerThreshold':
         case 'lowBattThreshold':
         case 'sensorTimeDifference': {
@@ -910,7 +924,6 @@ class eWeLinkPlatform {
           if ((oAccessory = this.devicesInHB.get(fullDeviceId))) {
             // Check for any changes to user config or types
             if (
-              this.config.resetRFBridge.includes(device.deviceid) ||
               oAccessory.context.subType !== subType ||
               oAccessory.context.sensorTimeLength !== sensorTimeLength ||
               oAccessory.context.swNumber !== swNumber
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index a51421b9..f5bd21a3 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -13,24 +13,23 @@ module.exports = {
     debug: false,
     debugFakegato: false,
     disablePlugin: false,
-    ignoredDevices: '',
-    hideChanFromHB: '',
-    switchAsOutlet: '',
-    outletAsSwitch: '',
-    inUsePowerThreshold: 0,
-    hideLightFromFan: '',
-    hideSwitchFromTH: '',
-    resetRFBridge: '',
-    lowBattThreshold: 25,
-    sensorTimeDifference: 120,
-    bulbB02BA60: '',
-    bulbB02FST64: '',
-    thTempOffset: [],
-    hideZBLDPress: false,
-    ZBDWBatt: false,
+    hideChanFromHB: '', // multiDevices{}
+    switchAsOutlet: '', // singleDevices{}
+    outletAsSwitch: '', // outletDevices{}
+    inUsePowerThreshold: 0, // outletDevices{}
+    hideLightFromFan: '', // fanDevices{}
+    hideSwitchFromTH: '', // thDevices{}
+    lowBattThreshold: 25, // sensorDevices{}
+    sensorTimeDifference: 120, // sensorDevices{}
+    bulbB02BA60: '', // lightDevices{}
+    bulbB02FST64: '', // lightDevices{}
+    thTempOffset: [], // thDevices{}
+    hideZBLDPress: false, // sensorDevices{}
+    ZBDWBatt: false, // sensorDevices{}
     groups: [],
     bridgeSensors: [],
     ipOverride: [],
+    ignoredDevices: [],
     platform: 'eWeLink'
   },
 

From 7c668ace51c1eeb5e2798ec180ab23f72c27b7ea Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 10 Feb 2021 11:20:44 +0000
Subject: [PATCH 1392/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dc413276..955f6f42 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,7 +15,9 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 ### Changes
 
-* ⚠️ Removed `nameOverride` configuration option
+* ⚠️ `ignoredDevices` configuration option is now an array not a string
+* ⚠️ Removed `nameOverride` configuration option - the plugin can now obtain channel names from eWeLink
+* ⚠️ Removed `resetRFBridge` option - the same usage can be achieved with `ignoredDevices`
 * Reinstated `ipOverride` into the Homebridge plugin UI screen
 * Improved colour temperature conversion for L1 and L1 Lite devices
 * Fixed a bug where Adaptive Lighting would not be disabled if the colour was changed from the eWeLink app

From 9f79a41a76a6cd70b575ba2da51e6da36ba52ec4 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Wed, 10 Feb 2021 11:51:05 +0000
Subject: [PATCH 1393/3183] Update README.md

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 6d2ef6c1..f03530de 100644
--- a/README.md
+++ b/README.md
@@ -47,6 +47,7 @@ Homebridge plugin to control eWeLink devices with original firmware
 * [How to enable/disable plugin extended logging](https://github.com/bwp91/homebridge-ewelink/wiki/How-to-enable-disable-plugin-extended-logging)
 * [How to remove an accessory from the cache](https://github.com/bwp91/homebridge-ewelink/wiki/How-to-remove-an-accessory-from-the-cache)
 * [How to update node](https://github.com/bwp91/homebridge-ewelink/wiki/How-to-update-node)
+* [How to uninstall correctly](https://github.com/bwp91/homebridge-ewelink/wiki/How-to-uninstall-correctly)
 
 ### About
 * [About Me](https://github.com/sponsors/bwp91)

From 00f25fbbc0593380bc07dd3dc567d2a2b19e2a22 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 10 Feb 2021 12:04:59 +0000
Subject: [PATCH 1394/3183] uninstall link

---
 lib/homebridge-ui/public/index.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/homebridge-ui/public/index.html b/lib/homebridge-ui/public/index.html
index c74e9b40..8da99a9e 100644
--- a/lib/homebridge-ui/public/index.html
+++ b/lib/homebridge-ui/public/index.html
@@ -87,6 +87,7 @@ <h4>How-to Guides</h4>
     <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/How-to-enable-disable-plugin-extended-logging" target="_blank">How to enable/disable plugin extended logging</a></li>
     <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/How-to-remove-an-accessory-from-the-cache" target="_blank">How to remove an accessory from the cache</a></li>
     <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/How-to-update-node" target="_blank">How to update node</a></li>
+    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/How-to-uninstall-correctly" target="_blank">How to uninstall correctly</a></li>
   </ul>
   <h4>About</h4>
   <ul>

From 72d6ec282e97d884d027fb9a926ef5ae363f0f21 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 10 Feb 2021 12:05:01 +0000
Subject: [PATCH 1395/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 955f6f42..bc30000a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,7 +10,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 * A queue for device updates to improve reliability, this also results in:
   * Faster device updates with colour bulbs
 * Configuration checks to highlight any unnecessary or incorrectly formatted settings you have
-* Link to 'Configuration' wiki page in the plugin-ui
+* Links to 'Configuration' and 'Uninstall' wiki pages in the plugin-ui
 * Added a note in the plugin UI when adding an Accessory Simulation that the accessory will need to be removed from the cache
 
 ### Changes

From a23f64bc2e5a4cc46e9a3fc3f95492e21b4f0a68 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 10 Feb 2021 12:06:48 +0000
Subject: [PATCH 1396/3183] 4.7.0-10

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c8413c8c..3ed4ebe4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.7.0-9",
+  "version": "4.7.0-10",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 1098c072..94f5e871 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "4.7.0-9",
+  "version": "4.7.0-10",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 48e4641d063ce2a1e7041dbe25176fba1ef1aa4d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 10 Feb 2021 14:30:11 +0000
Subject: [PATCH 1397/3183] adjust p-queue settings

---
 lib/index.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/index.js b/lib/index.js
index 0c1783d4..b6d3dd34 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -397,8 +397,7 @@ class eWeLinkPlatform {
 
       // Create the queue used for HTTP requests
       this.queue = new PQueue({
-        concurrency: 5,
-        interval: 500,
+        interval: 250,
         intervalCap: 1,
         timeout: 10000
       })

From bf5f768a6538f53a1e873c8d652921d86ea5faea Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 10 Feb 2021 15:35:49 +0000
Subject: [PATCH 1398/3183] consistent timeouts

---
 lib/device/diffuser.js            | 4 ++--
 lib/device/light-colour.js        | 6 +++---
 lib/device/light-ctemp.js         | 4 ++--
 lib/device/light-dimmer.js        | 2 +-
 lib/device/zigbee/light-dimmer.js | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/lib/device/diffuser.js b/lib/device/diffuser.js
index dc0ce47a..fad06aaa 100644
--- a/lib/device/diffuser.js
+++ b/lib/device/diffuser.js
@@ -147,7 +147,7 @@ module.exports = class deviceDiffuser {
       const updateKeyBright = Math.random().toString(36).substr(2, 8)
       this.updateKeyBright = updateKeyBright
       const params = { lightbright: this.cacheBrightness }
-      await this.funcs.sleep(450)
+      await this.funcs.sleep(500)
       if (updateKeyBright !== this.updateKeyBright) {
         return
       }
@@ -188,7 +188,7 @@ module.exports = class deviceDiffuser {
         lightGcolor: this.cacheG,
         lightBcolor: this.cacheB
       }
-      await this.funcs.sleep(350)
+      await this.funcs.sleep(400)
       if (updateKeyColour !== this.updateKeyColour) {
         return
       }
diff --git a/lib/device/light-colour.js b/lib/device/light-colour.js
index 45edc9d0..d609bad0 100644
--- a/lib/device/light-colour.js
+++ b/lib/device/light-colour.js
@@ -140,7 +140,7 @@ module.exports = class deviceLightColour {
           }
           break
       }
-      await this.funcs.sleep(450)
+      await this.funcs.sleep(500)
       if (updateKeyBright !== this.updateKeyBright) {
         return
       }
@@ -218,7 +218,7 @@ module.exports = class deviceLightColour {
       }
       const updateKeyColour = Math.random().toString(36).substr(2, 8)
       this.updateKeyColour = updateKeyColour
-      await this.funcs.sleep(350)
+      await this.funcs.sleep(400)
       if (updateKeyColour !== this.updateKeyColour) {
         return
       }
@@ -287,7 +287,7 @@ module.exports = class deviceLightColour {
       }
       const updateKeyCT = Math.random().toString(36).substr(2, 8)
       this.updateKeyCT = updateKeyCT
-      await this.funcs.sleep(350)
+      await this.funcs.sleep(400)
       if (updateKeyCT !== this.updateKeyCT) {
         return
       }
diff --git a/lib/device/light-ctemp.js b/lib/device/light-ctemp.js
index 754ce409..82005561 100644
--- a/lib/device/light-ctemp.js
+++ b/lib/device/light-ctemp.js
@@ -102,7 +102,7 @@ module.exports = class deviceLightColour {
           ct: this.cacheCT
         }
       }
-      await this.funcs.sleep(450)
+      await this.funcs.sleep(500)
       if (updateKeyBright !== this.updateKeyBright) {
         return
       }
@@ -146,7 +146,7 @@ module.exports = class deviceLightColour {
       const updateKeyCT = Math.random().toString(36).substr(2, 8)
       this.updateKeyCT = updateKeyCT
       this.updateTimeout = updateKeyCT
-      await this.funcs.sleep(350)
+      await this.funcs.sleep(400)
       if (updateKeyCT !== this.updateKeyCT) {
         return
       }
diff --git a/lib/device/light-dimmer.js b/lib/device/light-dimmer.js
index 4e5c4195..8054eea6 100644
--- a/lib/device/light-dimmer.js
+++ b/lib/device/light-dimmer.js
@@ -72,7 +72,7 @@ module.exports = class deviceLightDimmer {
       }
       const updateKey = Math.random().toString(36).substr(2, 8)
       this.updateKeyBright = updateKey
-      await this.funcs.sleep(350)
+      await this.funcs.sleep(500)
       if (updateKey !== this.updateKeyBright) {
         return
       }
diff --git a/lib/device/zigbee/light-dimmer.js b/lib/device/zigbee/light-dimmer.js
index 223bd578..fe85fd5d 100644
--- a/lib/device/zigbee/light-dimmer.js
+++ b/lib/device/zigbee/light-dimmer.js
@@ -60,7 +60,7 @@ module.exports = class deviceZBLightDimmer {
       }
       const updateKey = Math.random().toString(36).substr(2, 8)
       this.updateKeyBright = updateKey
-      await this.funcs.sleep(350)
+      await this.funcs.sleep(500)
       if (updateKey !== this.updateKeyBright) {
         return
       }

From 016a393ae77844da3c59fdd5404ae3945258f118 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 10 Feb 2021 15:35:53 +0000
Subject: [PATCH 1399/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bc30000a..3dfa3f1e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,9 +6,9 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 ### Added
 
-* Support for the eWeLink thermostat device type
+* Support for the [eWeLink thermostat](https://ewelinkcommunity.net/device-lists/heating/kkmoon-hc-t010-ewf/) device type
 * A queue for device updates to improve reliability, this also results in:
-  * Faster device updates with colour bulbs
+  * Faster device updates for colour bulbs and diffusers
 * Configuration checks to highlight any unnecessary or incorrectly formatted settings you have
 * Links to 'Configuration' and 'Uninstall' wiki pages in the plugin-ui
 * Added a note in the plugin UI when adding an Accessory Simulation that the accessory will need to be removed from the cache

From 1057af6ef8edd758127a81c25e018c3140001487 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 10 Feb 2021 15:58:05 +0000
Subject: [PATCH 1400/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3dfa3f1e..c9fb3519 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,9 +9,9 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 * Support for the [eWeLink thermostat](https://ewelinkcommunity.net/device-lists/heating/kkmoon-hc-t010-ewf/) device type
 * A queue for device updates to improve reliability, this also results in:
   * Faster device updates for colour bulbs and diffusers
-* Configuration checks to highlight any unnecessary or incorrectly formatted settings you have
-* Links to 'Configuration' and 'Uninstall' wiki pages in the plugin-ui
+* Configuration checks to highlight in the logs any unnecessary or incorrectly formatted settings you have
 * Added a note in the plugin UI when adding an Accessory Simulation that the accessory will need to be removed from the cache
+* Links to 'Configuration' and 'Uninstall' wiki pages in the plugin-ui
 
 ### Changes
 

From 92f2518f5a68d3fa0ec2a98ab093a21d172fbde2 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 10 Feb 2021 17:03:51 +0000
Subject: [PATCH 1401/3183] hb to 1.1.7

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 94f5e871..059e2913 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,7 @@
   ],
   "main": "lib/index.js",
   "engines": {
-    "homebridge": "^1.1.6",
+    "homebridge": "^1.1.7",
     "node": "^14.15.5"
   },
   "repository": {

From 764ef577aa298694f09fd3d9abd073e024901e67 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 10 Feb 2021 17:03:54 +0000
Subject: [PATCH 1402/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c9fb3519..6662d409 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,7 +15,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 ### Changes
 
-* ⚠️ `ignoredDevices` configuration option is now an array not a string
+* ⚠️ `ignoredDevices` configuration option is now an array not a string - [see details](https://gist.github.com/bwp91/90db67d578a8206c5a98a3447839f9e5)
 * ⚠️ Removed `nameOverride` configuration option - the plugin can now obtain channel names from eWeLink
 * ⚠️ Removed `resetRFBridge` option - the same usage can be achieved with `ignoredDevices`
 * Reinstated `ipOverride` into the Homebridge plugin UI screen
@@ -26,7 +26,8 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 * Error messages refactored to show the most useful information
 * [Backend] Major code refactoring
 * [Backend] Code comments
-* Updated minimum node to v14.15.5
+* Updated minimum Node to v14.15.5
+* Updated minimum Homebridge to v1.1.7
 * Updated dependencies
 
 ## 4.6.1 (2021-02-02)

From 588843a30e89d71c64e98cb57e76965e77791531 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 10 Feb 2021 17:05:05 +0000
Subject: [PATCH 1403/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6662d409..8a545c66 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 All notable changes to this homebridge-ewelink will be documented in this file.
 
-## BETA
+## v4.7.0 (2021-02-10)
 
 ### Added
 

From f5f70eb6236d26f6be25eb076d0ea4149f32ebfd Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 10 Feb 2021 17:06:31 +0000
Subject: [PATCH 1404/3183] 4.7.0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 3ed4ebe4..0c3105d5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.7.0-10",
+  "version": "4.7.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 059e2913..aab708c7 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "4.7.0-10",
+  "version": "4.7.0",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From a5904ff90795ee019c24a26170df9cdcfff0dec8 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 10 Feb 2021 22:01:07 +0000
Subject: [PATCH 1405/3183] lock init fix

---
 lib/device/simulation/lock-one.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/device/simulation/lock-one.js b/lib/device/simulation/lock-one.js
index 0037b41c..469c6461 100644
--- a/lib/device/simulation/lock-one.js
+++ b/lib/device/simulation/lock-one.js
@@ -14,6 +14,10 @@ module.exports = class deviceLockOne {
     this.messages = platform.messages
     this.platform = platform
 
+    // Set up variables from the accessory
+    this.name = accessory.displayName
+    this.accessory = accessory
+
     // Set up custom variables for this device type
     const asConfig = platform.simulations[this.accessory.context.eweDeviceId]
     this.setup = asConfig.setup

From 83f5a6a734763871d082cc455ad7a56c36fb2049 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 10 Feb 2021 22:02:04 +0000
Subject: [PATCH 1406/3183] 4.7.1-0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 0c3105d5..b2545c8d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.7.0",
+  "version": "4.7.1-0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index aab708c7..7d6afe95 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "4.7.0",
+  "version": "4.7.1-0",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 8f65bef44c791b9d8e6276206dd62c774409e063 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 11 Feb 2021 08:00:15 +0000
Subject: [PATCH 1407/3183] bump websocket as promised

---
 package-lock.json | 14 ++++++++++----
 package.json      |  2 +-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b2545c8d..4570f00c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -195,6 +195,11 @@
         "function-bind": "^1.1.1"
       }
     },
+    "promised-map": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/promised-map/-/promised-map-1.0.0.tgz",
+      "integrity": "sha512-fP9VSMgcml+U2uJ9PBc4/LDQ3ZkJCH4blLNCS6gbH7RHyRZCYs91zxWHqiUy+heFiEMiB2op/qllYoFqmIqdWA=="
+    },
     "string.prototype.trimend": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.3.tgz",
@@ -214,13 +219,14 @@
       }
     },
     "websocket-as-promised": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/websocket-as-promised/-/websocket-as-promised-1.1.0.tgz",
-      "integrity": "sha512-agq8bPsPFKBWinKQkoXwY7LoBYe+2fQ7Gnuxx964+BTIiyAdL130FnB60bXuVQdUCdaS17R/MyRaaO4WIqtl4Q==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/websocket-as-promised/-/websocket-as-promised-2.0.1.tgz",
+      "integrity": "sha512-ePV26D/D37ughXU9j+DjGmwUbelWJrC/vi+6GK++fRlBJmS7aU9T8ABu47KFF0O7r6XN2NAuqJRpegbUwXZxQg==",
       "requires": {
         "chnl": "^1.2.0",
         "promise-controller": "^1.0.0",
-        "promise.prototype.finally": "^3.1.2"
+        "promise.prototype.finally": "^3.1.2",
+        "promised-map": "^1.0.0"
       }
     },
     "ws": {
diff --git a/package.json b/package.json
index 7d6afe95..a7dff16a 100644
--- a/package.json
+++ b/package.json
@@ -51,7 +51,7 @@
     "axios": "^0.21.1",
     "node-dns-sd": "^0.4.2",
     "p-queue": "^6.6.2",
-    "websocket-as-promised": "^1.1.0",
+    "websocket-as-promised": "^2.0.1",
     "ws": "^7.4.3"
   }
 }

From 91ead53197b2f53b6c3615a77497449a82be28eb Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 11 Feb 2021 08:09:29 +0000
Subject: [PATCH 1408/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8a545c66..7ec87ebd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,14 @@
 
 All notable changes to this homebridge-ewelink will be documented in this file.
 
+## BETA
+
+### Changes
+
+* Fixed a bug when initialising lock accessory simulations
+* Updated dependencies:
+  * `websocket-as-promised` to v2.0.1
+
 ## v4.7.0 (2021-02-10)
 
 ### Added

From 9d841d61de7b90aaa75ebc80405dba3cfe7f93ec Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 11 Feb 2021 08:55:14 +0000
Subject: [PATCH 1409/3183] fg not debug

---
 lib/fakegato/fakegato-history.js | 48 ++++++++++++++++----------------
 lib/fakegato/fakegato-storage.js | 12 ++++----
 lib/fakegato/fakegato-timer.js   | 18 ++++++------
 3 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/lib/fakegato/fakegato-history.js b/lib/fakegato/fakegato-history.js
index 16249b46..cc2715b5 100644
--- a/lib/fakegato/fakegato-history.js
+++ b/lib/fakegato/fakegato-history.js
@@ -163,8 +163,8 @@ module.exports = function (pHomebridge) {
         this.log = thisAccessory.log || {}
       }
 
-      if (!this.log.debug) {
-        this.log.debug = function () { }
+      if (!this.log) {
+        this.log = function () { }
       }
 
       if (!this.disableTimer) {
@@ -190,11 +190,11 @@ module.exports = function (pHomebridge) {
           keyPath: optionalParams.keyPath || homebridge.user.storagePath() || undefined,
           onReady: function () {
             this.load(function (err, loaded) {
-              // this.log.debug("Loaded",loaded);
+              // this.log("Loaded",loaded);
               // this.registerEvents();
-              if (err) this.log.debug('Load error :', err)
+              if (err) this.log('Load error :', err)
               else {
-                if (loaded) this.log.debug('History Loaded from Persistant Storage')
+                if (loaded) this.log('History Loaded from Persistant Storage')
                 this.loaded = true
               }
             }.bind(this))
@@ -243,7 +243,7 @@ module.exports = function (pHomebridge) {
                   actualEntry.time = backLog[0].time
                   actualEntry.status = backLog[0].status
                 }
-                fakegato.log.debug(
+                fakegato.log(
                   '**Fakegato-timer callbackDoor: ',
                   fakegato.accessoryName,
                   ', immediate: ',
@@ -276,7 +276,7 @@ module.exports = function (pHomebridge) {
                   actualEntry.time = backLog[0].time
                   actualEntry.status = backLog[0].status
                 }
-                fakegato.log.debug(
+                fakegato.log(
                   '**Fakegato-timer callbackMotion: ',
                   fakegato.accessoryName,
                   ', immediate: ',
@@ -309,7 +309,7 @@ module.exports = function (pHomebridge) {
                   actualEntry.time = backLog[0].time
                   actualEntry.status = backLog[0].status
                 }
-                fakegato.log.debug(
+                fakegato.log(
                   '**Fakegato-timer callbackSwitch: ',
                   fakegato.accessoryName,
                   ', immediate: ',
@@ -491,10 +491,10 @@ module.exports = function (pHomebridge) {
     }
 
     registerEvents () {
-      this.log.debug('Registring Events', thisAccessory.displayName)
+      this.log('Registring Events', thisAccessory.displayName)
       if (typeof thisAccessory.getService === 'function') {
         // Platform API
-        this.log.debug('Platform', thisAccessory.displayName)
+        this.log('Platform', thisAccessory.displayName)
 
         this.service = thisAccessory.getService(FakeGatoHistoryService)
         if (this.service === undefined) {
@@ -518,7 +518,7 @@ module.exports = function (pHomebridge) {
           .on('set', this.setCurrentS2W2.bind(this))
       } else {
         // Accessory API
-        this.log.debug('Accessory', thisAccessory.displayName)
+        this.log('Accessory', thisAccessory.displayName)
 
         this.addCharacteristic(S2R1Characteristic)
 
@@ -701,22 +701,22 @@ module.exports = function (pHomebridge) {
           this.service.getCharacteristic(S2R1Characteristic).setValue(hexToBase64(val))
         }
 
-        this.log.debug(
+        this.log(
           'First entry %s: %s',
           this.accessoryName,
           this.firstEntry.toString(16)
         )
-        this.log.debug(
+        this.log(
           'Last entry %s: %s',
           this.accessoryName,
           this.lastEntry.toString(16)
         )
-        this.log.debug(
+        this.log(
           'Used memory %s: %s',
           this.accessoryName,
           this.usedMemory.toString(16)
         )
-        this.log.debug('116 %s: %s', this.accessoryName, val)
+        this.log('116 %s: %s', this.accessoryName, val)
 
         if (this.storage !== undefined) {
           this.save()
@@ -766,14 +766,14 @@ module.exports = function (pHomebridge) {
     }
 
     load (cb) {
-      this.log.debug('Loading...')
+      this.log('Loading...')
       homebridge.globalFakeGatoStorage.read({
         service: this,
         callback: function (err, data) {
           if (!err) {
             if (data) {
               try {
-                this.log.debug('read data from', this.accessoryName, ':', data)
+                this.log('read data from', this.accessoryName, ':', data)
                 const jsonFile = typeof (data) === 'object' ? data : JSON.parse(data)
 
                 this.firstEntry = jsonFile.firstEntry
@@ -784,7 +784,7 @@ module.exports = function (pHomebridge) {
                 this.history = jsonFile.history
                 this.extra = jsonFile.extra
               } catch (e) {
-                this.log.debug(
+                this.log(
                   '**ERROR fetching persisting data restart from zero - invalid JSON**',
                   e
                 )
@@ -801,7 +801,7 @@ module.exports = function (pHomebridge) {
     }
 
     cleanPersist () {
-      this.log.debug('Cleaning...')
+      this.log('Cleaning...')
       homebridge.globalFakeGatoStorage.remove({
         service: this
       })
@@ -827,7 +827,7 @@ module.exports = function (pHomebridge) {
             )
             this.setTime = false
           } else {
-            this.log.debug(
+            this.log(
               '%s Entry: %s, Address: %s',
               this.accessoryName,
               this.currentEntry,
@@ -984,7 +984,7 @@ module.exports = function (pHomebridge) {
           this.memoryAddress = entry2address(this.currentEntry)
           if (this.currentEntry > this.lastEntry) { break }
         }
-        this.log.debug('Data %s: %s', this.accessoryName, this.dataStream)
+        this.log('Data %s: %s', this.accessoryName, this.dataStream)
         callback(null, hexToBase64(this.dataStream))
         this.dataStream = ''
       } else {
@@ -995,19 +995,19 @@ module.exports = function (pHomebridge) {
 
     setCurrentS2W1 (val, callback) {
       callback(null)
-      this.log.debug('Data request %s: %s', this.accessoryName, base64ToHex(val))
+      this.log('Data request %s: %s', this.accessoryName, base64ToHex(val))
       const valHex = base64ToHex(val)
       const substring = valHex.substring(4, 12)
       const valInt = parseInt(substring, 16)
       const address = swap32(valInt)
       const hexAddress = address.toString('16')
 
-      this.log.debug('Address requested %s: %s', this.accessoryName, hexAddress)
+      this.log('Address requested %s: %s', this.accessoryName, hexAddress)
       this.sendHistory(address)
     }
 
     setCurrentS2W2 (val, callback) {
-      this.log.debug('Clock adjust %s: %s', this.accessoryName, base64ToHex(val))
+      this.log('Clock adjust %s: %s', this.accessoryName, base64ToHex(val))
       callback(null)
     }
   }
diff --git a/lib/fakegato/fakegato-storage.js b/lib/fakegato/fakegato-storage.js
index 210687bb..498b7346 100644
--- a/lib/fakegato/fakegato-storage.js
+++ b/lib/fakegato/fakegato-storage.js
@@ -15,8 +15,8 @@ module.exports = class FakeGatoStorage {
     }
     this.writers = []
     this.log = params.log || {}
-    if (!this.log.debug) {
-      this.log.debug = console.log
+    if (!this.log) {
+      this.log = console.log
     }
     this.addingWriter = false
   }
@@ -27,7 +27,7 @@ module.exports = class FakeGatoStorage {
       if (!params) {
         params = {}
       }
-      this.log.debug('** Fakegato-storage AddWriter :', service.accessoryName)
+      this.log('** Fakegato-storage AddWriter :', service.accessoryName)
       const newWriter = {
         service: service,
         callback: params.callback,
@@ -81,7 +81,7 @@ module.exports = class FakeGatoStorage {
         : (typeof (writer.callback) === 'function'
           ? writer.callback
           : () => {})
-      this.log.debug(
+      this.log(
         '** Fakegato-storage write FS file:',
         path.join(writer.path, writer.fileName),
         params.data.substr(1, 80)
@@ -107,7 +107,7 @@ module.exports = class FakeGatoStorage {
       : (typeof (writer.callback) === 'function'
         ? writer.callback
         : () => {})
-    this.log.debug(
+    this.log(
       '** Fakegato-storage read FS file:',
       path.join(writer.path, writer.fileName)
     )
@@ -126,7 +126,7 @@ module.exports = class FakeGatoStorage {
       : (typeof (writer.callback) === 'function'
         ? writer.callback
         : () => {})
-    this.log.debug(
+    this.log(
       '** Fakegato-storage delete FS file:',
       path.join(writer.path, writer.fileName)
     )
diff --git a/lib/fakegato/fakegato-timer.js b/lib/fakegato/fakegato-timer.js
index 97fe8b30..815e48b9 100644
--- a/lib/fakegato/fakegato-timer.js
+++ b/lib/fakegato/fakegato-timer.js
@@ -12,13 +12,13 @@ module.exports = class FakeGatoTimer {
     this.intervalID = null
     this.running = false
     this.log = params.log || {}
-    if (!this.log.debug) {
-      this.log.debug = console.log
+    if (!this.log) {
+      this.log = console.log
     }
   }
 
   subscribe (service, callback) {
-    this.log.debug('** Fakegato-timer Subscription :', service.accessoryName)
+    this.log('** Fakegato-timer Subscription :', service.accessoryName)
     const newService = {
       service,
       callback,
@@ -56,7 +56,7 @@ module.exports = class FakeGatoTimer {
   }
 
   start () {
-    this.log.debug('**Start Global Fakegato-Timer - ' + this.minutes + 'min**')
+    this.log('**Start Global Fakegato-Timer - ' + this.minutes + 'min**')
     if (this.running) { this.stop() }
     this.running = true
     this.intervalID = setInterval(
@@ -66,14 +66,14 @@ module.exports = class FakeGatoTimer {
   }
 
   stop () {
-    this.log.debug('**Stop Global Fakegato-Timer**')
+    this.log('**Stop Global Fakegato-Timer**')
     clearInterval(this.intervalID)
     this.running = false
     this.intervalID = null
   }
 
   executeCallbacks () {
-    this.log.debug('**Fakegato-timer: executeCallbacks**')
+    this.log('**Fakegato-timer: executeCallbacks**')
     if (this.subscribedServices.length !== 0) {
       for (const s in this.subscribedServices) {
         if (Object.prototype.hasOwnProperty.call(this.subscribedServices, s)) {
@@ -92,7 +92,7 @@ module.exports = class FakeGatoTimer {
   }
 
   executeImmediateCallback (service) {
-    this.log.debug('**Fakegato-timer: executeImmediateCallback**')
+    this.log('**Fakegato-timer: executeImmediateCallback**')
     if (typeof (service.callback) === 'function' && service.backLog.length) {
       service.callback({
         backLog: service.backLog,
@@ -106,7 +106,7 @@ module.exports = class FakeGatoTimer {
     const data = params.entry
     const service = params.service
     const immediateCallback = params.immediateCallback || false
-    this.log.debug('**Fakegato-timer: addData ', service.accessoryName, data, ' immediate: ', immediateCallback)
+    this.log('**Fakegato-timer: addData ', service.accessoryName, data, ' immediate: ', immediateCallback)
     if (immediateCallback) {
       this.getSubscriber(service).backLog[0] = data
     } else {
@@ -121,7 +121,7 @@ module.exports = class FakeGatoTimer {
   }
 
   emptyData (service) {
-    this.log.debug('**Fakegato-timer: emptyData **', service.accessoryName)
+    this.log('**Fakegato-timer: emptyData **', service.accessoryName)
     const source = this.getSubscriber(service)
     if (source.backLog.length) {
       source.previousBackLog = source.backLog

From 212342fd9f3e960032023b3c58370061bc358160 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 11 Feb 2021 08:55:19 +0000
Subject: [PATCH 1410/3183] use v

---
 lib/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/index.js b/lib/index.js
index b6d3dd34..a5200813 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -117,7 +117,7 @@ class eWeLinkPlatform {
                   case 'type':
                     if (typeof v !== 'string' || v === '') {
                       logIgnore(key + '.' + k)
-                    } else if (!this.consts.allowed.sensors.includes(x.type)) {
+                    } else if (!this.consts.allowed.sensors.includes(v)) {
                       logIgnore(key + '.' + k)
                     } else {
                       this.rfSensors[fullDeviceId][k] = v

From 903326a81dcddfa828165cb9c04c647467b3c070 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 11 Feb 2021 10:13:29 +0000
Subject: [PATCH 1411/3183] hide auto+cool in Eve

---
 lib/device/simulation/thermostat.js | 6 +++++-
 lib/device/thermostat.js            | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/lib/device/simulation/thermostat.js b/lib/device/simulation/thermostat.js
index 1504f65e..c59f7a4e 100644
--- a/lib/device/simulation/thermostat.js
+++ b/lib/device/simulation/thermostat.js
@@ -59,7 +59,11 @@ module.exports = class deviceThermostat {
     // Add the set handler to the target state characteristic
     this.service.getCharacteristic(this.hapChar.TargetHeatingCoolingState)
       .on('set', this.internalOnOffUpdate.bind(this))
-      .setProps({ validValues: [0, 1] })
+      .setProps({
+        minValue: 0,
+        maxValue: 1,
+        validValues: [0, 1]
+      })
 
     // Add the set handler to the target temperature characteristic
     this.service.getCharacteristic(this.hapChar.TargetTemperature)
diff --git a/lib/device/thermostat.js b/lib/device/thermostat.js
index 17438de3..006ebe36 100644
--- a/lib/device/thermostat.js
+++ b/lib/device/thermostat.js
@@ -57,7 +57,11 @@ module.exports = class deviceThermostat {
     // Add the set handler to the target state characteristic
     this.service.getCharacteristic(this.hapChar.TargetHeatingCoolingState)
       .on('set', this.internalOnOffUpdate.bind(this))
-      .setProps({ validValues: [0, 1] })
+      .setProps({
+        minValue: 0,
+        maxValue: 1,
+        validValues: [0, 1]
+      })
 
     // Add the set handler to the target temperature characteristic
     this.service.getCharacteristic(this.hapChar.TargetTemperature)

From d296e839fe34c2fd556a7fd7082ff1f96aca0aa8 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 11 Feb 2021 10:58:08 +0000
Subject: [PATCH 1412/3183] check for control

---
 lib/index.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/index.js b/lib/index.js
index a5200813..3c631799 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -965,7 +965,6 @@ class eWeLinkPlatform {
 
         // Update any changes to the accessory to the platform
         accessory.context.channelCount = rfChlCounter
-        this.devicesInHB.set(accessory.context.hbDeviceId, accessory)
         /********************/
       } else if (this.consts.devices.zbBridge.includes(device.extra.uiid)) {
         /************
@@ -1090,7 +1089,7 @@ class eWeLinkPlatform {
           : this.messages.lanUnsupported
 
       // Update accessory characteristics with latest values
-      if (this.wsClient) {
+      if (this.wsClient && accessory.control) {
         accessory.control.externalUpdate(device.params)
       }
 
@@ -1357,7 +1356,9 @@ class eWeLinkPlatform {
       }
       try {
         // Update the accessory with the new data
-        accessory.control.externalUpdate(device.params)
+        if (accessory.control) {
+          accessory.control.externalUpdate(device.params)
+        }
       } catch (err) {
         const eText = this.funcs.parseError(err)
         this.log.warn('[%s] %s %s.', accessory.displayName, this.messages.devNotRf, eText)

From 19f2334f64cf2ad5e146c4fdf4de5a6106cb3528 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 11 Feb 2021 11:43:55 +0000
Subject: [PATCH 1413/3183] add timeout to ws

---
 lib/connection/ws.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/connection/ws.js b/lib/connection/ws.js
index b25c0584..459e76f0 100644
--- a/lib/connection/ws.js
+++ b/lib/connection/ws.js
@@ -85,7 +85,8 @@ module.exports = class connectionWS {
       attachRequestId: (data, requestId) => Object.assign({ sequence: requestId }, data),
       extractRequestId: data => data && data.sequence,
       packMessage: data => JSON.stringify(data),
-      unpackMessage: data => data === 'pong' ? data : JSON.parse(data)
+      unpackMessage: data => data === 'pong' ? data : JSON.parse(data),
+      timeout: 10000
     })
 
     // Open the web socket connection

From 01f01c945286d1875598882b3f26606775d81276 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 11 Feb 2021 11:53:25 +0000
Subject: [PATCH 1414/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7ec87ebd..d90fee86 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,7 +6,9 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 ### Changes
 
+* The 'auto' and 'cool' modes will now be hidden for thermostat devices in the Eve app
 * Fixed a bug when initialising lock accessory simulations
+* Added a 10 second timeout when sending web socket messages
 * Updated dependencies:
   * `websocket-as-promised` to v2.0.1
 

From 53ad47e0f5f387d1fb6a006be30c4ca957fa5a48 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 11 Feb 2021 15:10:45 +0000
Subject: [PATCH 1415/3183] fakegato fixes/formatting

---
 lib/device/outlet.js                  |   9 +-
 lib/device/rf-bridge.js               |  14 +-
 lib/device/scm.js                     |  14 +-
 lib/device/sensor-ambient.js          |  10 +-
 lib/device/sensor-contact.js          |   9 +-
 lib/device/simulation/switch-valve.js |  14 +-
 lib/device/simulation/thermostat.js   |  10 +-
 lib/device/switch-multi.js            |  29 +-
 lib/device/switch-single.js           |  14 +-
 lib/device/thermostat.js              |   9 +-
 lib/device/usb.js                     |  14 +-
 lib/device/zigbee/sensor-ambient.js   |   4 +-
 lib/device/zigbee/sensor-contact.js   |   9 +-
 lib/device/zigbee/sensor-motion.js    |   9 +-
 lib/device/zigbee/switch-single.js    |  14 +-
 lib/fakegato/fakegato-history.js      | 697 ++++++++++----------------
 lib/fakegato/fakegato-storage.js      |  58 +--
 lib/fakegato/fakegato-timer.js        |  43 +-
 lib/fakegato/uuid.js                  |   9 +-
 lib/index.js                          |   1 -
 20 files changed, 340 insertions(+), 650 deletions(-)

diff --git a/lib/device/outlet.js b/lib/device/outlet.js
index 054356e9..a4e5bb38 100644
--- a/lib/device/outlet.js
+++ b/lib/device/outlet.js
@@ -132,10 +132,8 @@ module.exports = class deviceOutlet {
       })
 
     // Pass the accessory to Fakegato to set up with Eve
-    this.accessory.log = platform.config.debugFakegato ? this.log : () => {}
     this.accessory.eveService = new this.platform.eveService('energy', this.accessory, {
-      storage: 'fs',
-      path: platform.eveLogPath
+      log: platform.config.debugFakegato ? this.log : () => {}
     })
 
     // Set up an interval for the plugin to calculate an approx total consumption
@@ -205,10 +203,7 @@ module.exports = class deviceOutlet {
         this.service.updateCharacteristic(this.hapChar.OutletInUse, parseFloat(params.power) > this.inUsePowerThreshold)
           .updateCharacteristic(this.eveCurrentConsumption, parseFloat(params.power))
         const isOn = this.accessory.getService(this.hapServ.Outlet).getCharacteristic(this.hapChar.On).value
-        this.accessory.eveService.addEntry({
-          time: Math.round(new Date().valueOf() / 1000),
-          power: isOn ? parseFloat(params.power) : 0
-        })
+        this.accessory.eveService.addEntry({ power: isOn ? parseFloat(params.power) : 0 })
         this.accessory.context.energyReadings.push(parseFloat(params.power))
         logger = true
       }
diff --git a/lib/device/rf-bridge.js b/lib/device/rf-bridge.js
index 418e03a9..9ed9c75f 100644
--- a/lib/device/rf-bridge.js
+++ b/lib/device/rf-bridge.js
@@ -109,10 +109,8 @@ module.exports = class deviceRFBridge {
       service.updateCharacteristic(char, 0)
 
       // Pass the accessory to Fakegato to set up with Eve
-      this.accessory.log = platform.config.debugFakegato ? this.log : () => {}
       this.accessory.eveService = new this.platform.eveService(eveType, this.accessory, {
-        storage: 'fs',
-        path: platform.eveLogPath
+        log: platform.config.debugFakegato ? this.log : () => {}
       })
     }
   }
@@ -231,19 +229,13 @@ module.exports = class deviceRFBridge {
                     break
                 }
                 oAccessory.getService(serv).updateCharacteristic(char, 1)
-                oAccessory.eveService.addEntry({
-                  time: Math.round(new Date().valueOf() / 1000),
-                  status: 1
-                })
+                oAccessory.eveService.addEntry({ status: 1 })
                 if (params.updateSource && !this.disableDeviceLogging) {
                   this.log('[%s] current state [triggered]', oAccessory.displayName)
                 }
                 await this.funcs.sleep(sensorTimeLength * 1000)
                 oAccessory.getService(serv).updateCharacteristic(char, 0)
-                oAccessory.eveService.addEntry({
-                  time: Math.round(new Date().valueOf() / 1000),
-                  status: 0
-                })
+                oAccessory.eveService.addEntry({ status: 0 })
                 if (params.updateSource && !this.disableDeviceLogging) {
                   this.log('[%s] current state [not triggered]', oAccessory.displayName)
                 }
diff --git a/lib/device/scm.js b/lib/device/scm.js
index f90f989f..98a7ecd8 100644
--- a/lib/device/scm.js
+++ b/lib/device/scm.js
@@ -27,10 +27,8 @@ module.exports = class deviceSCM {
       .on('set', this.internalUpdate.bind(this))
 
     // Pass the accessory to Fakegato to set up with Eve
-    this.accessory.log = platform.config.debugFakegato ? this.log : () => {}
     this.accessory.eveService = new this.platform.eveService('switch', this.accessory, {
-      storage: 'fs',
-      path: platform.eveLogPath
+      log: platform.config.debugFakegato ? this.log : () => {}
     })
   }
 
@@ -41,10 +39,7 @@ module.exports = class deviceSCM {
       params.switches[0].switch = value ? 'on' : 'off'
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.cacheOnOff = value ? 'on' : 'off'
-      this.accessory.eveService.addEntry({
-        time: Math.round(new Date().valueOf() / 1000),
-        status: value ? 1 : 0
-      })
+      this.accessory.eveService.addEntry({ status: value ? 1 : 0 })
       if (!this.disableDeviceLogging) {
         this.log('[%s] current state [%s].', this.name, value ? 'on' : 'off')
       }
@@ -61,10 +56,7 @@ module.exports = class deviceSCM {
       const newStatus = params.switches[0].switch === 'on'
       this.service.updateCharacteristic(this.hapChar.On, newStatus)
       this.cacheOnOff = params.switches[0].switch
-      this.accessory.eveService.addEntry({
-        time: Math.round(new Date().valueOf() / 1000),
-        status: newStatus ? 1 : 0
-      })
+      this.accessory.eveService.addEntry({ status: newStatus ? 1 : 0 })
       if (params.updateSource && !this.disableDeviceLogging) {
         this.log('[%s] current state [%s].', this.name, params.switches[0].switch)
       }
diff --git a/lib/device/sensor-ambient.js b/lib/device/sensor-ambient.js
index ccce8112..982f8da6 100644
--- a/lib/device/sensor-ambient.js
+++ b/lib/device/sensor-ambient.js
@@ -67,10 +67,8 @@ module.exports = class deviceSensorAmbient {
     }
 
     // Pass the accessory to Fakegato to set up with Eve
-    this.accessory.log = platform.config.debugFakegato ? this.log : () => {}
     this.accessory.eveService = new this.platform.eveService('custom', this.accessory, {
-      storage: 'fs',
-      path: platform.eveLogPath
+      log: platform.config.debugFakegato ? this.log : () => {}
     })
   }
 
@@ -97,10 +95,7 @@ module.exports = class deviceSensorAmbient {
         if (this.cacheOnOff !== newState) {
           this.cacheOnOff = newState
           this.switchService.updateCharacteristic(this.hapChar.On, this.cacheOnOff === 'on')
-          this.accessory.eveService.addEntry({
-            time: Math.round(new Date().valueOf() / 1000),
-            status: this.cacheOnOff === 'on' ? 1 : 0
-          })
+          this.accessory.eveService.addEntry({ status: this.cacheOnOff === 'on' ? 1 : 0 })
           if (params.updateSource && !this.disableDeviceLogging) {
             this.log('[%s] current state [%s].', this.name, this.cacheOnOff)
           }
@@ -130,7 +125,6 @@ module.exports = class deviceSensorAmbient {
         }
       }
       if (this.funcs.hasProperty(eveLog, 'temp') || this.funcs.hasProperty(eveLog, 'humidity')) {
-        eveLog.time = Math.round(new Date().valueOf() / 1000)
         this.accessory.eveService.addEntry(eveLog)
       }
     } catch (err) {
diff --git a/lib/device/sensor-contact.js b/lib/device/sensor-contact.js
index 2d5e2ce5..a94faf81 100644
--- a/lib/device/sensor-contact.js
+++ b/lib/device/sensor-contact.js
@@ -45,10 +45,8 @@ module.exports = class deviceSensorContact {
       this.accessory.addService(this.hapServ.BatteryService)
 
     // Pass the accessory to Fakegato to set up with Eve
-    this.accessory.log = platform.config.debugFakegato ? this.log : () => {}
     this.accessory.eveService = new this.platform.eveService('door', this.accessory, {
-      storage: 'fs',
-      path: platform.eveLogPath
+      log: platform.config.debugFakegato ? this.log : () => {}
     })
   }
 
@@ -71,10 +69,7 @@ module.exports = class deviceSensorContact {
       this.cacheOnOff = params.switch
       const newState = params.switch === 'on' ? 1 : 0
       this.contactService.updateCharacteristic(this.hapChar.ContactSensorState, newState)
-      this.accessory.eveService.addEntry({
-        time: Math.round(new Date().valueOf() / 1000),
-        status: newState
-      })
+      this.accessory.eveService.addEntry({ status: newState })
       if (newState) {
         this.contactService.updateCharacteristic(
           this.eveLastActivation,
diff --git a/lib/device/simulation/switch-valve.js b/lib/device/simulation/switch-valve.js
index 5f61bead..c013e01c 100644
--- a/lib/device/simulation/switch-valve.js
+++ b/lib/device/simulation/switch-valve.js
@@ -61,10 +61,8 @@ module.exports = class deviceSwitchValve {
       })
 
     // Pass the accessory to Fakegato to set up with Eve
-    this.accessory.log = platform.config.debugFakegato ? this.log : () => {}
     this.accessory.eveService = new this.platform.eveService('switch', this.accessory, {
-      storage: 'fs',
-      path: platform.eveLogPath
+      log: platform.config.debugFakegato ? this.log : () => {}
     })
   }
 
@@ -76,10 +74,7 @@ module.exports = class deviceSwitchValve {
       params.switches[1].switch = this.vService.getCharacteristic(this.hapChar.Active).value === 1 ? 'on' : 'off'
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.cacheOnOff = value ? 'on' : 'off'
-      this.accessory.eveService.addEntry({
-        time: Math.round(new Date().valueOf() / 1000),
-        status: value ? 1 : 0
-      })
+      this.accessory.eveService.addEntry({ status: value ? 1 : 0 })
       if (!this.disableDeviceLogging) {
         this.log('[%s] current state [%s].', this.name, this.cacheOnOff)
       }
@@ -130,10 +125,7 @@ module.exports = class deviceSwitchValve {
         const newStatus = params.switches[0].switch === 'on'
         this.cacheOnOff = params.switches[0].switch
         this.sService.updateCharacteristic(this.hapChar.On, newStatus)
-        this.accessory.eveService.addEntry({
-          time: Math.round(new Date().valueOf() / 1000),
-          status: newStatus ? 1 : 0
-        })
+        this.accessory.eveService.addEntry({ status: newStatus ? 1 : 0 })
         if (params.updateSource && !this.disableDeviceLogging) {
           this.log('[%s] current state [%s].', this.name, this.cacheOnOff)
         }
diff --git a/lib/device/simulation/thermostat.js b/lib/device/simulation/thermostat.js
index c59f7a4e..146add9e 100644
--- a/lib/device/simulation/thermostat.js
+++ b/lib/device/simulation/thermostat.js
@@ -83,10 +83,8 @@ module.exports = class deviceThermostat {
     }
 
     // Pass the accessory to Fakegato to set up with Eve
-    this.accessory.log = platform.config.debugFakegato ? this.log : () => {}
     this.accessory.eveService = new this.platform.eveService('custom', this.accessory, {
-      storage: 'fs',
-      path: platform.eveLogPath
+      log: platform.config.debugFakegato ? this.log : () => {}
     })
 
     // Setting this now makes the plugin send the payload to setup as thermostat
@@ -163,10 +161,7 @@ module.exports = class deviceThermostat {
         if (this.cacheOnOff !== newState) {
           this.cacheOnOff = newState
           this.service.updateCharacteristic(this.hapChar.TargetHeatingCoolingState, this.cacheOnOff === 'on' ? 1 : 0)
-          this.accessory.eveService.addEntry({
-            time: Math.round(new Date().valueOf() / 1000),
-            status: this.cacheOnOff === 'on' ? 1 : 0
-          })
+          this.accessory.eveService.addEntry({ status: this.cacheOnOff === 'on' ? 1 : 0 })
           if (this.cacheOnOff === 'off') {
             this.cacheHeating = 'off'
           }
@@ -210,7 +205,6 @@ module.exports = class deviceThermostat {
         }
       }
       if (this.funcs.hasProperty(eveLog, 'temp') || this.funcs.hasProperty(eveLog, 'humidity')) {
-        eveLog.time = Math.round(new Date().valueOf() / 1000)
         this.accessory.eveService.addEntry(eveLog)
       }
     } catch (err) {
diff --git a/lib/device/switch-multi.js b/lib/device/switch-multi.js
index 17508ebe..58456558 100644
--- a/lib/device/switch-multi.js
+++ b/lib/device/switch-multi.js
@@ -27,10 +27,8 @@ module.exports = class deviceSwitchMulti {
       .on('set', this.internalUpdate.bind(this))
 
     // Pass the accessory to Fakegato to set up with Eve
-    this.accessory.log = platform.config.debugFakegato ? this.log : () => {}
     this.accessory.eveService = new this.platform.eveService('switch', this.accessory, {
-      storage: 'fs',
-      path: platform.eveLogPath
+      log: platform.config.debugFakegato ? this.log : () => {}
     })
   }
 
@@ -52,10 +50,7 @@ module.exports = class deviceSwitchMulti {
             if ((oAccessory = this.platform.devicesInHB.get(this.accessory.context.eweDeviceId + 'SW' + i))) {
               oAccessory.getService(this.hapServ.Switch).updateCharacteristic(this.hapChar.On, value)
               oAccessory.context.cacheOnOff = value ? 'on' : 'off'
-              oAccessory.eveService.addEntry({
-                time: Math.round(new Date().valueOf() / 1000),
-                status: value ? 1 : 0
-              })
+              oAccessory.eveService.addEntry({ status: value ? 1 : 0 })
               if (i > 0 && !this.disableDeviceLogging) {
                 this.log('[%s] current state [%s].', oAccessory.displayName, value ? 'on' : 'off')
               }
@@ -75,10 +70,7 @@ module.exports = class deviceSwitchMulti {
               if (i === parseInt(this.accessory.context.switchNumber)) {
                 params.switches[i - 1].switch = value ? 'on' : 'off'
                 oAccessory.context.cacheOnOff = value ? 'on' : 'off'
-                oAccessory.eveService.addEntry({
-                  time: Math.round(new Date().valueOf() / 1000),
-                  status: value ? 1 : 0
-                })
+                oAccessory.eveService.addEntry({ status: value ? 1 : 0 })
                 if (i > 0 && !this.disableDeviceLogging) {
                   this.log('[%s] current state [%s].', oAccessory.displayName, value ? 'on' : 'off')
                 }
@@ -92,10 +84,7 @@ module.exports = class deviceSwitchMulti {
           if (!this.platform.hiddenMasters.includes(this.accessory.context.eweDeviceId)) {
             oAccessory = this.platform.devicesInHB.get(this.accessory.context.eweDeviceId + 'SW0')
             oAccessory.getService(this.hapServ.Switch).updateCharacteristic(this.hapChar.On, masterState === 'on')
-            oAccessory.eveService.addEntry({
-              time: Math.round(new Date().valueOf() / 1000),
-              status: masterState === 'on' ? 1 : 0
-            })
+            oAccessory.eveService.addEntry({ status: masterState === 'on' ? 1 : 0 })
           }
           break
       }
@@ -124,10 +113,7 @@ module.exports = class deviceSwitchMulti {
           oAccessory.getService(this.hapServ.Switch)
             .updateCharacteristic(this.hapChar.On, params.switches[i - 1].switch === 'on')
           oAccessory.context.cacheOnOff = params.switches[i - 1].switch
-          oAccessory.eveService.addEntry({
-            time: Math.round(new Date().valueOf() / 1000),
-            status: params.switches[i - 1].switch === 'on' ? 1 : 0
-          })
+          oAccessory.eveService.addEntry({ status: params.switches[i - 1].switch === 'on' ? 1 : 0 })
           if (params.updateSource && !this.disableDeviceLogging) {
             this.log('[%s] current state [%s].', oAccessory.displayName, params.switches[i - 1].switch)
           }
@@ -135,10 +121,7 @@ module.exports = class deviceSwitchMulti {
       }
       if (!this.platform.hiddenMasters.includes(this.accessory.context.eweDeviceId)) {
         this.service.updateCharacteristic(this.hapChar.On, primaryState)
-        this.accessory.eveService.addEntry({
-          time: Math.round(new Date().valueOf() / 1000),
-          status: primaryState ? 1 : 0
-        })
+        this.accessory.eveService.addEntry({ status: primaryState ? 1 : 0 })
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
diff --git a/lib/device/switch-single.js b/lib/device/switch-single.js
index e035fbf3..e0081e99 100644
--- a/lib/device/switch-single.js
+++ b/lib/device/switch-single.js
@@ -32,10 +32,8 @@ module.exports = class deviceSwitchSingle {
       .on('set', this.internalUpdate.bind(this))
 
     // Pass the accessory to Fakegato to set up with Eve
-    this.accessory.log = platform.config.debugFakegato ? this.log : () => {}
     this.accessory.eveService = new this.platform.eveService('switch', this.accessory, {
-      storage: 'fs',
-      path: platform.eveLogPath
+      log: platform.config.debugFakegato ? this.log : () => {}
     })
   }
 
@@ -47,10 +45,7 @@ module.exports = class deviceSwitchSingle {
         switch: value ? 'on' : 'off'
       })
       this.cacheOnOff = value ? 'on' : 'off'
-      this.accessory.eveService.addEntry({
-        time: Math.round(new Date().valueOf() / 1000),
-        status: value ? 1 : 0
-      })
+      this.accessory.eveService.addEntry({ status: value ? 1 : 0 })
       if (!this.disableDeviceLogging) {
         this.log('[%s] current state [%s].', this.name, this.cacheOnOff)
       }
@@ -67,10 +62,7 @@ module.exports = class deviceSwitchSingle {
       const newStatus = params.switch === 'on'
       this.service.updateCharacteristic(this.hapChar.On, newStatus)
       this.cacheOnOff = params.switch
-      this.accessory.eveService.addEntry({
-        time: Math.round(new Date().valueOf() / 1000),
-        status: newStatus ? 1 : 0
-      })
+      this.accessory.eveService.addEntry({ status: newStatus ? 1 : 0 })
       if (params.updateSource && !this.disableDeviceLogging) {
         this.log('[%s] current state [%s].', this.name, this.cacheOnOff)
       }
diff --git a/lib/device/thermostat.js b/lib/device/thermostat.js
index 006ebe36..0122c68c 100644
--- a/lib/device/thermostat.js
+++ b/lib/device/thermostat.js
@@ -73,10 +73,8 @@ module.exports = class deviceThermostat {
       })
 
     // Pass the accessory to Fakegato to set up with Eve
-    this.accessory.log = platform.config.debugFakegato ? this.log : () => {}
     this.accessory.eveService = new this.platform.eveService('custom', this.accessory, {
-      storage: 'fs',
-      path: platform.eveLogPath
+      log: platform.config.debugFakegato ? this.log : () => {}
     })
   }
 
@@ -172,10 +170,7 @@ module.exports = class deviceThermostat {
             this.log('[%s] current temperature [%s°C].', this.name, this.cacheTemp)
           }
         }
-        this.accessory.eveService.addEntry({
-          time: Math.round(new Date().valueOf() / 1000),
-          temp: currentTemp
-        })
+        this.accessory.eveService.addEntry({ temp: currentTemp })
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
diff --git a/lib/device/usb.js b/lib/device/usb.js
index dc1c20c7..cb782ef7 100644
--- a/lib/device/usb.js
+++ b/lib/device/usb.js
@@ -44,10 +44,8 @@ module.exports = class deviceUSB {
       .on('set', this.internalUpdate.bind(this))
 
     // Pass the accessory to Fakegato to set up with Eve
-    this.accessory.log = platform.config.debugFakegato ? this.log : () => {}
     this.accessory.eveService = new this.platform.eveService('switch', this.accessory, {
-      storage: 'fs',
-      path: platform.eveLogPath
+      log: platform.config.debugFakegato ? this.log : () => {}
     })
   }
 
@@ -58,10 +56,7 @@ module.exports = class deviceUSB {
       params.switches[0].switch = value ? 'on' : 'off'
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.cacheOnOff = value ? 'on' : 'off'
-      this.accessory.eveService.addEntry({
-        time: Math.round(new Date().valueOf() / 1000),
-        status: value ? 1 : 0
-      })
+      this.accessory.eveService.addEntry({ status: value ? 1 : 0 })
       if (!this.disableDeviceLogging) {
         this.log('[%s] current state [%s].', this.name, value ? 'on' : 'off')
       }
@@ -78,10 +73,7 @@ module.exports = class deviceUSB {
       const newStatus = params.switches[0].switch === 'on'
       this.service.updateCharacteristic(this.hapChar.On, newStatus)
       this.cacheOnOff = params.switches[0].switch
-      this.accessory.eveService.addEntry({
-        time: Math.round(new Date().valueOf() / 1000),
-        status: newStatus ? 1 : 0
-      })
+      this.accessory.eveService.addEntry({ status: newStatus ? 1 : 0 })
       if (params.updateSource && !this.disableDeviceLogging) {
         this.log('[%s] current state [%s].', this.name, params.switches[0].switch)
       }
diff --git a/lib/device/zigbee/sensor-ambient.js b/lib/device/zigbee/sensor-ambient.js
index 1915f899..2087d548 100644
--- a/lib/device/zigbee/sensor-ambient.js
+++ b/lib/device/zigbee/sensor-ambient.js
@@ -40,10 +40,8 @@ module.exports = class deviceZBSensorAmbient {
       this.accessory.addService(this.hapServ.BatteryService)
 
     // Pass the accessory to Fakegato to set up with Eve
-    this.accessory.log = platform.config.debugFakegato ? this.log : () => {}
     this.accessory.eveService = new this.platform.eveService('weather', this.accessory, {
-      storage: 'fs',
-      path: platform.eveLogPath
+      log: platform.config.debugFakegato ? this.log : () => {}
     })
   }
 
diff --git a/lib/device/zigbee/sensor-contact.js b/lib/device/zigbee/sensor-contact.js
index 7d02f8d4..b19c97e9 100644
--- a/lib/device/zigbee/sensor-contact.js
+++ b/lib/device/zigbee/sensor-contact.js
@@ -45,10 +45,8 @@ module.exports = class deviceZBSensorContact {
       this.accessory.addService(this.hapServ.BatteryService)
 
     // Pass the accessory to Fakegato to set up with Eve
-    this.accessory.log = platform.config.debugFakegato ? this.log : () => {}
     this.accessory.eveService = new this.platform.eveService('door', this.accessory, {
-      storage: 'fs',
-      path: platform.eveLogPath
+      log: platform.config.debugFakegato ? this.log : () => {}
     })
   }
 
@@ -71,10 +69,7 @@ module.exports = class deviceZBSensorContact {
             Math.round(new Date().valueOf() / 1000) - this.accessory.eveService.getInitialTime()
           )
         }
-        this.accessory.eveService.addEntry({
-          time: Math.round(new Date().valueOf() / 1000),
-          status: params.lock
-        })
+        this.accessory.eveService.addEntry({ status: params.lock })
         if (params.updateSource && !this.disableDeviceLogging) {
           this.log('[%s] current state [contact%s detected].', this.name, params.lock === 0 ? '' : ' not')
         }
diff --git a/lib/device/zigbee/sensor-motion.js b/lib/device/zigbee/sensor-motion.js
index cba57659..a777dce2 100644
--- a/lib/device/zigbee/sensor-motion.js
+++ b/lib/device/zigbee/sensor-motion.js
@@ -45,10 +45,8 @@ module.exports = class deviceZBSensorMotion {
     this.battService = this.accessory.getService(this.hapServ.BatteryService) || this.accessory.addService(this.hapServ.BatteryService)
 
     // Pass the accessory to Fakegato to set up with Eve
-    this.accessory.log = platform.config.debugFakegato ? this.log : () => {}
     this.accessory.eveService = new this.platform.eveService('motion', this.accessory, {
-      storage: 'fs',
-      path: platform.eveLogPath
+      log: platform.config.debugFakegato ? this.log : () => {}
     })
   }
 
@@ -73,10 +71,7 @@ module.exports = class deviceZBSensorMotion {
             Math.round(new Date().valueOf() / 1000) - this.accessory.eveService.getInitialTime()
           )
         }
-        this.accessory.eveService.addEntry({
-          time: Math.round(new Date().valueOf() / 1000),
-          status: motionDetected ? 1 : 0
-        })
+        this.accessory.eveService.addEntry({ status: motionDetected ? 1 : 0 })
         if (params.updateSource && !this.disableDeviceLogging) {
           this.log('[%s] current state [motion%s detected].', this.name, motionDetected ? '' : ' not')
         }
diff --git a/lib/device/zigbee/switch-single.js b/lib/device/zigbee/switch-single.js
index 43d7c6b9..60ecfa00 100644
--- a/lib/device/zigbee/switch-single.js
+++ b/lib/device/zigbee/switch-single.js
@@ -27,10 +27,8 @@ module.exports = class deviceZBSwitchSingle {
       .on('set', this.internalUpdate.bind(this))
 
     // Pass the accessory to Fakegato to set up with Eve
-    this.accessory.log = platform.config.debugFakegato ? this.log : () => {}
     this.accessory.eveService = new this.platform.eveService('switch', this.accessory, {
-      storage: 'fs',
-      path: platform.eveLogPath
+      log: platform.config.debugFakegato ? this.log : () => {}
     })
   }
 
@@ -41,10 +39,7 @@ module.exports = class deviceZBSwitchSingle {
         switch: value ? 'on' : 'off'
       })
       this.cacheOnOff = value ? 'on' : 'off'
-      this.accessory.eveService.addEntry({
-        time: Math.round(new Date().valueOf() / 1000),
-        status: value ? 1 : 0
-      })
+      this.accessory.eveService.addEntry({ status: value ? 1 : 0 })
       if (!this.disableDeviceLogging) {
         this.log('[%s] current state [%s].', this.name, value ? 'on' : 'off')
       }
@@ -60,10 +55,7 @@ module.exports = class deviceZBSwitchSingle {
       }
       this.cacheOnOff = params.switch
       this.service.updateCharacteristic(this.hapChar.On, this.cacheOnOff === 'on')
-      this.accessory.eveService.addEntry({
-        time: Math.round(new Date().valueOf() / 1000),
-        status: this.cacheOnOff === 'on' ? 1 : 0
-      })
+      this.accessory.eveService.addEntry({ status: this.cacheOnOff === 'on' ? 1 : 0 })
       if (params.updateSource && !this.disableDeviceLogging) {
         this.log('[%s] current state [%s].', this.name, this.cacheOnOff)
       }
diff --git a/lib/fakegato/fakegato-history.js b/lib/fakegato/fakegato-history.js
index cc2715b5..177028f4 100644
--- a/lib/fakegato/fakegato-history.js
+++ b/lib/fakegato/fakegato-history.js
@@ -3,22 +3,11 @@
 'use strict'
 
 const Format = require('util').format
-const FakeGatoTimer = require('./fakegato-timer')
-const FakeGatoStorage = require('./fakegato-storage')
+const FakeGatoTimer = require('./fakegato-timer').FakeGatoTimer
+const FakeGatoStorage = require('./fakegato-storage').FakeGatoStorage
 const _EPOCH = 978307200
-const TYPE_ENERGY = 'energy'
-const TYPE_ROOM = 'room'
-const TYPE_WEATHER = 'weather'
-const TYPE_DOOR = 'door'
-const TYPE_MOTION = 'motion'
-const TYPE_SWITCH = 'switch'
-const TYPE_THERMO = 'thermo'
-const TYPE_AQUA = 'aqua'
-const TYPE_CUSTOM = 'custom'
-
 let homebridge
-let Characteristic
-let Service
+let Characteristic, Service
 
 module.exports = function (pHomebridge) {
   if (pHomebridge && !homebridge) {
@@ -27,24 +16,29 @@ module.exports = function (pHomebridge) {
     Service = homebridge.hap.Service
   }
 
-  const hexToBase64 = function (val) {
+  const hexToBase64 = val => {
     return Buffer.from(('' + val).replace(/[^0-9A-F]/ig, ''), 'hex').toString('base64')
   }
-  const base64ToHex = function (val) {
-    if (!val) { return val }
+
+  const base64ToHex = val => {
+    if (!val) {
+      return val
+    }
     return Buffer.from(val, 'base64').toString('hex')
   }
-  const swap16 = function (val) {
-    return ((val & 0xFF) << 8) |
-        ((val >>> 8) & 0xFF)
+
+  const swap16 = val => {
+    return ((val & 0xFF) << 8) | ((val >>> 8) & 0xFF)
   }
-  const swap32 = function (val) {
+
+  const swap32 = val => {
     return ((val & 0xFF) << 24) |
-        ((val & 0xFF00) << 8) |
-        ((val >>> 8) & 0xFF00) |
-        ((val >>> 24) & 0xFF)
+      ((val & 0xFF00) << 8) |
+      ((val >>> 8) & 0xFF00) |
+      ((val >>> 24) & 0xFF)
   }
-  const numToHex = function (val, len) {
+
+  const numToHex = (val, len) => {
     let s = Number(val >>> 0).toString(16)
     if (s.length % 2 !== 0) {
       s = '0' + s
@@ -54,10 +48,12 @@ module.exports = function (pHomebridge) {
     }
     return s
   }
-  const ucfirst = function (val) {
+
+  const ucfirst = val => {
     return val.charAt(0).toUpperCase() + val.substr(1)
   }
-  const precisionRound = function (number, precision) {
+
+  const precisionRound = (number, precision) => {
     const factor = Math.pow(10, precision)
     return Math.round(number * factor) / factor
   }
@@ -99,9 +95,7 @@ module.exports = function (pHomebridge) {
       super('S2W1', S2W1Characteristic.UUID)
       this.setProps({
         format: Characteristic.Formats.DATA,
-        perms: [
-          Characteristic.Perms.WRITE, Characteristic.Perms.HIDDEN
-        ]
+        perms: [Characteristic.Perms.WRITE, Characteristic.Perms.HIDDEN]
       })
     }
   }
@@ -113,9 +107,7 @@ module.exports = function (pHomebridge) {
       super('S2W2', S2W2Characteristic.UUID)
       this.setProps({
         format: Characteristic.Formats.DATA,
-        perms: [
-          Characteristic.Perms.WRITE, Characteristic.Perms.HIDDEN
-        ]
+        perms: [Characteristic.Perms.WRITE, Characteristic.Perms.HIDDEN]
       })
     }
   }
@@ -125,7 +117,6 @@ module.exports = function (pHomebridge) {
   class FakeGatoHistoryService extends Service {
     constructor (displayName, subtype) {
       super(displayName, FakeGatoHistoryService.UUID, subtype)
-
       this.addCharacteristic(S2R1Characteristic)
       this.addCharacteristic(S2R2Characteristic)
       this.addCharacteristic(S2W1Characteristic)
@@ -134,200 +125,146 @@ module.exports = function (pHomebridge) {
   }
 
   FakeGatoHistoryService.UUID = 'E863F007-079E-48FF-8F27-9C2605A29F52'
+
   let thisAccessory = {}
+
   class FakeGatoHistory extends Service {
     constructor (accessoryType, accessory, optionalParams) {
       super(accessory.displayName + ' History', FakeGatoHistoryService.UUID)
-
       thisAccessory = accessory
       this.accessoryName = thisAccessory.displayName
       this.signatures = []
       this.uuid = require('./uuid.js')
-
-      if (typeof (optionalParams) === 'object') {
-        this.size = optionalParams.size || 4032
-        this.minutes = optionalParams.minutes || 10 // Optional timer length
-        this.storage = optionalParams.storage // 'fs' or 'googleDrive'
-        this.path = optionalParams.path ||
-          optionalParams.folder ||
-          (this.storage === 'fs' ? homebridge.user.storagePath() : undefined)
-        this.filename = optionalParams.filename
-        this.disableTimer = optionalParams.disableTimer || false
-        this.disableRepeatLastData = optionalParams.disableRepeatLastData || false
-        // workaround for typescript blocking of changing of accessory object definition
-        this.log = optionalParams.log || thisAccessory.log || {}
-      } else {
-        this.size = 4032
-        this.minutes = 10
-        this.disableTimer = false
-        this.log = thisAccessory.log || {}
-      }
-
+      this.path = homebridge.user.storagePath() + '/persist/'
+      this.minutes = optionalParams.minutes || 10
+      this.log = optionalParams.log
       if (!this.log) {
-        this.log = function () { }
-      }
-
-      if (!this.disableTimer) {
-        if (homebridge.globalFakeGatoTimer === undefined) {
-          homebridge.globalFakeGatoTimer = new FakeGatoTimer({
-            minutes: this.minutes,
-            log: this.log
-          })
-        }
+        this.log = () => {}
       }
-
-      if (this.storage !== undefined) {
-        this.loaded = false
-        if (homebridge.globalFakeGatoStorage === undefined) {
-          homebridge.globalFakeGatoStorage = new FakeGatoStorage({
-            log: this.log
-          })
-        }
-        homebridge.globalFakeGatoStorage.addWriter(this, {
-          storage: this.storage,
-          path: this.path,
-          filename: this.filename,
-          keyPath: optionalParams.keyPath || homebridge.user.storagePath() || undefined,
-          onReady: function () {
-            this.load(function (err, loaded) {
-              // this.log("Loaded",loaded);
-              // this.registerEvents();
-              if (err) this.log('Load error :', err)
-              else {
-                if (loaded) this.log('History Loaded from Persistant Storage')
-                this.loaded = true
-              }
-            }.bind(this))
-          }.bind(this)
+      if (homebridge.globalFakeGatoTimer === undefined) {
+        homebridge.globalFakeGatoTimer = new FakeGatoTimer({
+          minutes: this.minutes,
+          log: this.log
         })
       }
-
+      this.loaded = false
+      if (homebridge.globalFakeGatoStorage === undefined) {
+        homebridge.globalFakeGatoStorage = new FakeGatoStorage({ log: this.log })
+      }
+      homebridge.globalFakeGatoStorage.addWriter(this, {
+        path: this.path,
+        onReady: function () {
+          this.load(function (err, loaded) {
+            if (err) {
+              this.log('FG history: load error: %s.', err)
+            } else {
+              if (loaded) {
+                this.log('FG history: loaded from storage.')
+              }
+              this.loaded = true
+            }
+          }.bind(this))
+        }.bind(this)
+      })
       switch (accessoryType) {
-        case TYPE_WEATHER:
+        case 'weather':
           this.accessoryType116 = '03 0102 0202 0302'
           this.accessoryType117 = '07'
-          if (!this.disableTimer) {
-            homebridge.globalFakeGatoTimer.subscribe(this, this.calculateAverage)
-          }
+          homebridge.globalFakeGatoTimer.subscribe(this, this.calculateAverage)
           break
-        case TYPE_ENERGY:
+        case 'energy':
           this.accessoryType116 = '04 0102 0202 0702 0f03'
           this.accessoryType117 = '1f'
-          if (!this.disableTimer) {
-            homebridge.globalFakeGatoTimer.subscribe(this, this.calculateAverage)
-          }
+          homebridge.globalFakeGatoTimer.subscribe(this, this.calculateAverage)
           break
-        case TYPE_ROOM:
+        case 'room':
           this.accessoryType116 = '04 0102 0202 0402 0f03'
           this.accessoryType117 = '0f'
-          if (!this.disableTimer) {
-            homebridge.globalFakeGatoTimer.subscribe(this, this.calculateAverage)
-          }
+          homebridge.globalFakeGatoTimer.subscribe(this, this.calculateAverage)
           break
-        case TYPE_DOOR:
+        case 'door':
           this.accessoryType116 = '01 0601'
           this.accessoryType117 = '01'
-          if (!this.disableTimer) {
-            homebridge.globalFakeGatoTimer.subscribe(this, function (params) { // callback
-              const backLog = params.backLog || []
-              const immediate = params.immediate
-
-              const fakegato = this.service
-              const actualEntry = {}
-
-              if (backLog.length) {
-                if (!immediate) {
-                  actualEntry.time = Math.round(new Date().valueOf() / 1000)
-                  actualEntry.status = backLog[0].status
-                } else {
-                  actualEntry.time = backLog[0].time
-                  actualEntry.status = backLog[0].status
-                }
-                fakegato.log(
-                  '**Fakegato-timer callbackDoor: ',
-                  fakegato.accessoryName,
-                  ', immediate: ',
-                  immediate,
-                  ', entry: ',
-                  actualEntry
-                )
-
-                fakegato._addEntry(actualEntry)
+          homebridge.globalFakeGatoTimer.subscribe(this, function (params) {
+            const backLog = params.backLog || []
+            const immediate = params.immediate
+            const fakegato = this.service
+            const actualEntry = {}
+            if (backLog.length) {
+              if (immediate) {
+                actualEntry.time = backLog[0].time
+                actualEntry.status = backLog[0].status
+              } else {
+                actualEntry.time = Math.round(new Date().valueOf() / 1000)
+                actualEntry.status = backLog[0].status
               }
-            })
-          }
+              fakegato.log(
+                '[%s] FG timer: callbackDoor [%s] immediate [%s].',
+                fakegato.accessoryName,
+                actualEntry,
+                immediate
+              )
+              fakegato._addEntry(actualEntry)
+            }
+          })
           break
-        case TYPE_MOTION:
+        case 'motion':
           this.accessoryType116 = '02 1301 1c01'
           this.accessoryType117 = '02'
-          if (!this.disableTimer) {
-            homebridge.globalFakeGatoTimer.subscribe(this, function (params) { // callback
-              const backLog = params.backLog || []
-              const immediate = params.immediate
-
-              const fakegato = this.service
-              const actualEntry = {}
-
-              if (backLog.length) {
-                if (!immediate) {
-                  actualEntry.time = Math.round(new Date().valueOf() / 1000)
-                  actualEntry.status = backLog[0].status
-                } else {
-                  actualEntry.time = backLog[0].time
-                  actualEntry.status = backLog[0].status
-                }
-                fakegato.log(
-                  '**Fakegato-timer callbackMotion: ',
-                  fakegato.accessoryName,
-                  ', immediate: ',
-                  immediate,
-                  ', entry: ',
-                  actualEntry
-                )
-
-                fakegato._addEntry(actualEntry)
+          homebridge.globalFakeGatoTimer.subscribe(this, function (params) {
+            const backLog = params.backLog || []
+            const immediate = params.immediate
+            const fakegato = this.service
+            const actualEntry = {}
+            if (backLog.length) {
+              if (immediate) {
+                actualEntry.time = backLog[0].time
+                actualEntry.status = backLog[0].status
+              } else {
+                actualEntry.time = Math.round(new Date().valueOf() / 1000)
+                actualEntry.status = backLog[0].status
               }
-            })
-          }
+              fakegato.log(
+                '[%s] FG timer: callbackMotion [%s] immediate [%s].',
+                fakegato.accessoryName,
+                actualEntry,
+                immediate
+              )
+              fakegato._addEntry(actualEntry)
+            }
+          })
           break
-        case TYPE_SWITCH:
+        case 'switch':
           this.accessoryType116 = '01 0e01'
           this.accessoryType117 = '01'
-          if (!this.disableTimer) {
-            homebridge.globalFakeGatoTimer.subscribe(this, function (params) { // callback
-              const backLog = params.backLog || []
-              const immediate = params.immediate
-
-              const fakegato = this.service
-              const actualEntry = {}
-
-              if (backLog.length) {
-                if (!immediate) {
-                  actualEntry.time = Math.round(new Date().valueOf() / 1000)
-                  actualEntry.status = backLog[0].status
-                } else {
-                  actualEntry.time = backLog[0].time
-                  actualEntry.status = backLog[0].status
-                }
-                fakegato.log(
-                  '**Fakegato-timer callbackSwitch: ',
-                  fakegato.accessoryName,
-                  ', immediate: ',
-                  immediate,
-                  ', entry: ',
-                  actualEntry
-                )
-
-                fakegato._addEntry(actualEntry)
+          homebridge.globalFakeGatoTimer.subscribe(this, function (params) {
+            const backLog = params.backLog || []
+            const immediate = params.immediate
+            const fakegato = this.service
+            const actualEntry = {}
+            if (backLog.length) {
+              if (immediate) {
+                actualEntry.time = backLog[0].time
+                actualEntry.status = backLog[0].status
+              } else {
+                actualEntry.time = Math.round(new Date().valueOf() / 1000)
+                actualEntry.status = backLog[0].status
               }
-            })
-          }
+              fakegato.log(
+                '[%s] FG timer: callbackSwitch [%s] immediate [%s].',
+                fakegato.accessoryName,
+                actualEntry,
+                immediate
+              )
+              fakegato._addEntry(actualEntry)
+            }
+          })
           break
-        case TYPE_CUSTOM:
+        case 'custom':
           thisAccessory.services.forEach((service, i) => {
             service.characteristics.forEach((characteristic, i) => {
               switch (this.uuid.toLongFormUUID(characteristic.UUID)) {
-                case Characteristic.CurrentTemperature.UUID: // Temperature
+                case Characteristic.CurrentTemperature.UUID:
                   this.signatures.push({
                     signature: '0102',
                     length: 4,
@@ -336,7 +273,7 @@ module.exports = function (pHomebridge) {
                     entry: 'temp'
                   })
                   break
-                case Characteristic.CurrentRelativeHumidity.UUID: // Humidity
+                case Characteristic.CurrentRelativeHumidity.UUID:
                   this.signatures.push({
                     signature: '0202',
                     length: 4,
@@ -345,7 +282,7 @@ module.exports = function (pHomebridge) {
                     entry: 'humidity'
                   })
                   break
-                case 'E863F10F-079E-48FF-8F27-9C2605A29F52': // CustomCharacteristic.AtmosphericPressureLevel.UUID
+                case 'E863F10F-079E-48FF-8F27-9C2605A29F52':
                   this.signatures.push({
                     signature: '0302',
                     length: 4,
@@ -354,7 +291,7 @@ module.exports = function (pHomebridge) {
                     entry: 'pressure'
                   })
                   break
-                case 'E863F10B-079E-48FF-8F27-9C2605A29F52': // PPM
+                case 'E863F10B-079E-48FF-8F27-9C2605A29F52':
                   this.signatures.push({
                     signature: '0702',
                     length: 4,
@@ -363,7 +300,7 @@ module.exports = function (pHomebridge) {
                     entry: 'ppm'
                   })
                   break
-                case Characteristic.ContactSensorState.UUID: // Contact Sensor State
+                case Characteristic.ContactSensorState.UUID:
                   this.signatures.push({
                     signature: '0601',
                     length: 2,
@@ -372,7 +309,7 @@ module.exports = function (pHomebridge) {
                     entry: 'contact'
                   })
                   break
-                case 'E863F10D-079E-48FF-8F27-9C2605A29F52': // Power
+                case 'E863F10D-079E-48FF-8F27-9C2605A29F52':
                   this.signatures.push({
                     signature: '0702',
                     length: 4,
@@ -381,7 +318,7 @@ module.exports = function (pHomebridge) {
                     entry: 'power'
                   })
                   break
-                case Characteristic.On.UUID: // Switch On
+                case Characteristic.On.UUID:
                   this.signatures.push({
                     signature: '0e01',
                     length: 2,
@@ -390,7 +327,7 @@ module.exports = function (pHomebridge) {
                     entry: 'status'
                   })
                   break
-                case Characteristic.MotionDetected.UUID: // Motion Detected
+                case Characteristic.MotionDetected.UUID:
                   this.signatures.push({
                     signature: '1c01',
                     length: 2,
@@ -409,26 +346,23 @@ module.exports = function (pHomebridge) {
               return a.signature > b.signature ? 1 : -1
             }).map(a => a.signature).join(' ') +
             ' '
-          if (!this.disableTimer) {
-            homebridge.globalFakeGatoTimer.subscribe(this, this.calculateAverage)
-          }
+          homebridge.globalFakeGatoTimer.subscribe(this, this.calculateAverage)
           break
-        case TYPE_AQUA:
+        case 'aqua':
           this.accessoryType116 = '03 1f01 2a08 2302'
           this.accessoryType117 = '05'
           this.accessoryType117bis = '07'
           break
-        case TYPE_THERMO:
+        case 'thermo':
           this.accessoryType116 = '05 0102 1102 1001 1201 1d01'
           this.accessoryType117 = '1f'
           break
       }
-
       this.accessoryType = accessoryType
       this.firstEntry = 0
       this.lastEntry = 0
       this.history = ['noValue']
-      this.memorySize = this.size
+      this.memorySize = 4032
       this.usedMemory = 0
       this.currentEntry = 1
       this.transfer = false
@@ -437,30 +371,23 @@ module.exports = function (pHomebridge) {
       this.refTime = 0
       this.memoryAddress = 0
       this.dataStream = ''
-
       this.saving = false
-
       this.registerEvents()
-      if (this.storage === undefined) {
-        this.loaded = true
-      }
     }
 
-    calculateAverage (params) { // callback
+    calculateAverage (params) {
       const backLog = params.backLog || []
       const previousAvrg = params.previousAvrg || {}
       const timer = params.timer
-
       const fakegato = this.service
       const calc = {
         sum: {},
         num: {},
         avrg: {}
       }
-
       for (const h in backLog) {
-        if (Object.prototype.hasOwnProperty.call(backLog, h)) { // only valid keys
-          for (const key in backLog[h]) { // each record
+        if (Object.prototype.hasOwnProperty.call(backLog, h)) {
+          for (const key in backLog[h]) {
             if (Object.prototype.hasOwnProperty.call(backLog[h], key) && key !== 'time') {
               if (!calc.sum[key]) { calc.sum[key] = 0 }
               if (!calc.num[key]) { calc.num[key] = 0 }
@@ -471,14 +398,12 @@ module.exports = function (pHomebridge) {
           }
         }
       }
-      calc.avrg.time = Math.round(new Date().valueOf() / 1000) // set the time of the avrg
+      calc.avrg.time = Math.round(new Date().valueOf() / 1000)
 
-      if (!fakegato.disableRepeatLastData) {
-        for (const key in previousAvrg) { // each record of previous average
-          if (Object.prototype.hasOwnProperty.call(previousAvrg, key) && key !== 'time') {
-            if (!backLog.length || calc.avrg[key] === undefined) {
-              calc.avrg[key] = previousAvrg[key]
-            }
+      for (const key in previousAvrg) {
+        if (Object.prototype.hasOwnProperty.call(previousAvrg, key) && key !== 'time') {
+          if (!backLog.length || calc.avrg[key] === undefined) {
+            calc.avrg[key] = previousAvrg[key]
           }
         }
       }
@@ -491,49 +416,20 @@ module.exports = function (pHomebridge) {
     }
 
     registerEvents () {
-      this.log('Registring Events', thisAccessory.displayName)
-      if (typeof thisAccessory.getService === 'function') {
-        // Platform API
-        this.log('Platform', thisAccessory.displayName)
-
-        this.service = thisAccessory.getService(FakeGatoHistoryService)
-        if (this.service === undefined) {
-          this.service = thisAccessory.addService(
-            FakeGatoHistoryService,
-            ucfirst(thisAccessory.displayName) + ' History',
-            this.accessoryType
-          )
-        }
-
-        this.service.getCharacteristic(S2R2Characteristic)
-          .removeAllListeners('get')
-          .on('get', this.getCurrentS2R2.bind(this))
-
-        this.service.getCharacteristic(S2W1Characteristic)
-          .removeAllListeners('set')
-          .on('set', this.setCurrentS2W1.bind(this))
-
-        this.service.getCharacteristic(S2W2Characteristic)
-          .removeAllListeners('set')
-          .on('set', this.setCurrentS2W2.bind(this))
-      } else {
-        // Accessory API
-        this.log('Accessory', thisAccessory.displayName)
-
-        this.addCharacteristic(S2R1Characteristic)
-
-        this.addCharacteristic(S2R2Characteristic)
-          .removeAllListeners('get')
-          .on('get', this.getCurrentS2R2.bind(this))
-
-        this.addCharacteristic(S2W1Characteristic)
-          .removeAllListeners('set')
-          .on('set', this.setCurrentS2W1.bind(this))
-
-        this.addCharacteristic(S2W2Characteristic)
-          .removeAllListeners('set')
-          .on('set', this.setCurrentS2W2.bind(this))
+      this.log('[%s] FG history: registering events.', thisAccessory.displayName)
+      this.service = thisAccessory.getService(FakeGatoHistoryService)
+      if (this.service === undefined) {
+        this.service = thisAccessory.addService(FakeGatoHistoryService, ucfirst(thisAccessory.displayName) + ' History', this.accessoryType)
       }
+      this.service.getCharacteristic(S2R2Characteristic)
+        .removeAllListeners('get')
+        .on('get', this.getCurrentS2R2.bind(this))
+      this.service.getCharacteristic(S2W1Characteristic)
+        .removeAllListeners('set')
+        .on('set', this.setCurrentS2W1.bind(this))
+      this.service.getCharacteristic(S2W2Characteristic)
+        .removeAllListeners('set')
+        .on('set', this.setCurrentS2W2.bind(this))
     }
 
     sendHistory (address) {
@@ -546,84 +442,36 @@ module.exports = function (pHomebridge) {
     }
 
     addEntry (entry) {
+      entry.time = Math.round(new Date().valueOf() / 1000)
       switch (this.accessoryType) {
-        case TYPE_DOOR:
-        case TYPE_MOTION:
-        case TYPE_SWITCH:
-          if (!this.disableTimer) {
-            homebridge.globalFakeGatoTimer.addData({
-              entry: entry,
-              service: this,
-              immediateCallback: true
-            })
-          } else {
-            this._addEntry({
-              time: entry.time,
-              status: entry.status
-            })
-          }
+        case 'door':
+        case 'motion':
+        case 'switch':
+          homebridge.globalFakeGatoTimer.addData({
+            entry: entry,
+            service: this,
+            immediateCallback: true
+          })
           break
-        case TYPE_AQUA:
+        case 'aqua':
           this._addEntry({
             time: entry.time,
             status: entry.status,
             waterAmount: entry.waterAmount
           })
           break
-        case TYPE_WEATHER:
-          if (!this.disableTimer) {
-            homebridge.globalFakeGatoTimer.addData({
-              entry: entry,
-              service: this
-            })
-          } else {
-            this._addEntry({
-              time: entry.time,
-              temp: entry.temp,
-              humidity: entry.humidity,
-              pressure: entry.pressure
-            })
-          }
+        case 'weather':
+          homebridge.globalFakeGatoTimer.addData({ entry: entry, service: this })
           break
-        case TYPE_ROOM:
-          if (!this.disableTimer) {
-            homebridge.globalFakeGatoTimer.addData({
-              entry: entry,
-              service: this
-            })
-          } else {
-            this._addEntry({
-              time: entry.time,
-              temp: entry.temp,
-              humidity: entry.humidity,
-              ppm: entry.ppm
-            })
-          }
+        case 'room':
+          homebridge.globalFakeGatoTimer.addData({ entry: entry, service: this })
           break
-        case TYPE_ENERGY:
-          if (!this.disableTimer) {
-            homebridge.globalFakeGatoTimer.addData({
-              entry: entry,
-              service: this
-            })
-          } else {
-            this._addEntry({
-              time: entry.time,
-              power: entry.power
-            })
-          }
+        case 'energy':
+          homebridge.globalFakeGatoTimer.addData({ entry: entry, service: this })
           break
-        case TYPE_CUSTOM:
-          if (!this.disableTimer) {
-            if ('power' in entry || 'temp' in entry) {
-              // Only put power or temperature thru averager
-              homebridge.globalFakeGatoTimer.addData({
-                entry: entry,
-                service: this
-              })
-            } else {
-              this._addEntry(entry)
-            }
+        case 'custom':
+          if ('power' in entry || 'temp' in entry) {
+            homebridge.globalFakeGatoTimer.addData({ entry: entry, service: this })
           } else {
             this._addEntry(entry)
           }
@@ -634,16 +482,10 @@ module.exports = function (pHomebridge) {
       }
     }
 
-    // in order to be consistent with Eve, entry address start from 1
     _addEntry (entry) {
       if (this.loaded) {
-        const entry2address = function (val) {
-          return val % this.memorySize
-        }
-          .bind(this)
-
+        const entry2address = val => val % this.memorySize
         let val
-
         if (this.usedMemory < this.memorySize) {
           this.usedMemory++
           this.firstEntry = 0
@@ -661,7 +503,6 @@ module.exports = function (pHomebridge) {
             this.restarted = false
           }
         }
-
         if (this.refTime === 0) {
           this.refTime = entry.time - _EPOCH
           this.history[this.lastEntry] = {
@@ -672,9 +513,7 @@ module.exports = function (pHomebridge) {
           this.lastEntry++
           this.usedMemory++
         }
-
         this.history[entry2address(this.lastEntry)] = (entry)
-
         if (this.usedMemory < this.memorySize) {
           val = Format(
             '%s00000000%s%s%s%s%s000000000101',
@@ -694,33 +533,16 @@ module.exports = function (pHomebridge) {
             numToHex(swap16(this.memorySize), 4),
             numToHex(swap32(this.firstEntry + 1), 8))
         }
-
-        if (this.service === undefined) { // Accessory API
-          this.getCharacteristic(S2R1Characteristic).setValue(hexToBase64(val))
-        } else { // Platform API
-          this.service.getCharacteristic(S2R1Characteristic).setValue(hexToBase64(val))
-        }
-
-        this.log(
-          'First entry %s: %s',
-          this.accessoryName,
-          this.firstEntry.toString(16)
-        )
+        this.service.getCharacteristic(S2R1Characteristic).setValue(hexToBase64(val))
         this.log(
-          'Last entry %s: %s',
+          '[%s] FG history: first entry [%s] last entry [%s] used memory [%s] 116 [%s].',
           this.accessoryName,
-          this.lastEntry.toString(16)
+          this.firstEntry.toString(16),
+          this.lastEntry.toString(16),
+          this.usedMemory.toString(16),
+          val
         )
-        this.log(
-          'Used memory %s: %s',
-          this.accessoryName,
-          this.usedMemory.toString(16)
-        )
-        this.log('116 %s: %s', this.accessoryName, val)
-
-        if (this.storage !== undefined) {
-          this.save()
-        }
+        this.save()
       } else {
         setTimeout(() => this._addEntry(entry), 100)
       }
@@ -753,29 +575,25 @@ module.exports = function (pHomebridge) {
           history: this.history,
           extra: this.extra
         }
-
         homebridge.globalFakeGatoStorage.write({
           service: this,
           data: typeof (data) === 'object' ? JSON.stringify(data) : data
         })
       } else {
-        setTimeout(function () { // retry in 100ms
-          this.save()
-        }.bind(this), 100)
+        setTimeout(() => this.save(), 100)
       }
     }
 
     load (cb) {
-      this.log('Loading...')
+      this.log('FG history: loading.')
       homebridge.globalFakeGatoStorage.read({
         service: this,
         callback: function (err, data) {
           if (!err) {
             if (data) {
               try {
-                this.log('read data from', this.accessoryName, ':', data)
+                this.log('[%s] read data [%s].', this.accessoryName, data)
                 const jsonFile = typeof (data) === 'object' ? data : JSON.parse(data)
-
                 this.firstEntry = jsonFile.firstEntry
                 this.lastEntry = jsonFile.lastEntry
                 this.usedMemory = jsonFile.usedMemory
@@ -784,16 +602,12 @@ module.exports = function (pHomebridge) {
                 this.history = jsonFile.history
                 this.extra = jsonFile.extra
               } catch (e) {
-                this.log(
-                  '**ERROR fetching persisting data restart from zero - invalid JSON**',
-                  e
-                )
+                this.log('FG history: error fetching data - invalid JSON [%s].', e)
                 cb(e, false)
               }
               cb(null, true)
             }
           } else {
-            // file don't exists
             cb(null, false)
           }
         }.bind(this)
@@ -801,17 +615,12 @@ module.exports = function (pHomebridge) {
     }
 
     cleanPersist () {
-      this.log('Cleaning...')
-      homebridge.globalFakeGatoStorage.remove({
-        service: this
-      })
+      this.log('FG history: cleaning.')
+      homebridge.globalFakeGatoStorage.remove({ service: this })
     }
 
     getCurrentS2R2 (callback) {
-      const entry2address = function (val) {
-        return val % this.memorySize
-      }.bind(this)
-
+      const entry2address = val => val % this.memorySize
       if (this.currentEntry <= this.lastEntry && this.transfer) {
         this.memoryAddress = entry2address(this.currentEntry)
         for (let i = 0; i < 11; i++) {
@@ -823,18 +632,17 @@ module.exports = function (pHomebridge) {
             this.dataStream += Format(
               ',15%s 0100 0000 81%s0000 0000 00 0000',
               numToHex(swap32(this.currentEntry), 8),
-              numToHex(swap32(this.refTime), 8)
-            )
+              numToHex(swap32(this.refTime), 8))
             this.setTime = false
           } else {
             this.log(
-              '%s Entry: %s, Address: %s',
+              '[%s] FG history: entry [%s] address [%s].',
               this.accessoryName,
               this.currentEntry,
               this.memoryAddress
             )
             switch (this.accessoryType) {
-              case TYPE_WEATHER:
+              case 'weather':
                 this.dataStream += Format(
                   ',10 %s%s-%s:%s %s %s',
                   numToHex(swap32(this.currentEntry), 8),
@@ -845,10 +653,9 @@ module.exports = function (pHomebridge) {
                   this.accessoryType117,
                   numToHex(swap16(this.history[this.memoryAddress].temp * 100), 4),
                   numToHex(swap16(this.history[this.memoryAddress].humidity * 100), 4),
-                  numToHex(swap16(this.history[this.memoryAddress].pressure * 10), 4)
-                )
+                  numToHex(swap16(this.history[this.memoryAddress].pressure * 10), 4))
                 break
-              case TYPE_ENERGY:
+              case 'energy':
                 this.dataStream += Format(
                   ',14 %s%s-%s:0000 0000 %s 0000 0000',
                   numToHex(swap32(this.currentEntry), 8),
@@ -857,10 +664,9 @@ module.exports = function (pHomebridge) {
                   8
                   ),
                   this.accessoryType117,
-                  numToHex(swap16(this.history[this.memoryAddress].power * 10), 4)
-                )
+                  numToHex(swap16(this.history[this.memoryAddress].power * 10), 4))
                 break
-              case TYPE_ROOM:
+              case 'room':
                 this.dataStream += Format(
                   ',13 %s%s%s%s%s%s0000 00',
                   numToHex(swap32(this.currentEntry), 8),
@@ -871,12 +677,11 @@ module.exports = function (pHomebridge) {
                   this.accessoryType117,
                   numToHex(swap16(this.history[this.memoryAddress].temp * 100), 4),
                   numToHex(swap16(this.history[this.memoryAddress].humidity * 100), 4),
-                  numToHex(swap16(this.history[this.memoryAddress].ppm), 4)
-                )
+                  numToHex(swap16(this.history[this.memoryAddress].ppm), 4))
                 break
-              case TYPE_DOOR:
-              case TYPE_MOTION:
-              case TYPE_SWITCH:
+              case 'door':
+              case 'motion':
+              case 'switch':
                 this.dataStream += Format(
                   ',0b %s%s%s%s',
                   numToHex(swap32(this.currentEntry), 8),
@@ -885,10 +690,9 @@ module.exports = function (pHomebridge) {
                   8
                   ),
                   this.accessoryType117,
-                  numToHex(this.history[this.memoryAddress].status, 2)
-                )
+                  numToHex(this.history[this.memoryAddress].status, 2))
                 break
-              case TYPE_AQUA:
+              case 'aqua':
                 if (this.history[this.memoryAddress].status) {
                   this.dataStream += Format(
                     ',0d %s%s%s%s 300c',
@@ -898,8 +702,7 @@ module.exports = function (pHomebridge) {
                     8
                     ),
                     this.accessoryType117,
-                    numToHex(this.history[this.memoryAddress].status, 2)
-                  )
+                    numToHex(this.history[this.memoryAddress].status, 2))
                 } else {
                   this.dataStream += Format(
                     ',15 %s%s%s%s%s 00000000 300c',
@@ -910,11 +713,10 @@ module.exports = function (pHomebridge) {
                     ),
                     this.accessoryType117bis,
                     numToHex(this.history[this.memoryAddress].status, 2),
-                    numToHex(swap32(this.history[this.memoryAddress].waterAmount), 8)
-                  )
+                    numToHex(swap32(this.history[this.memoryAddress].waterAmount), 8))
                 }
                 break
-              case TYPE_THERMO:
+              case 'thermo':
                 this.dataStream += Format(
                   ',11 %s%s%s%s%s%s 0000',
                   numToHex(swap32(this.currentEntry), 8),
@@ -925,45 +727,50 @@ module.exports = function (pHomebridge) {
                   this.accessoryType117,
                   numToHex(swap16(this.history[this.memoryAddress].currentTemp * 100), 4),
                   numToHex(swap16(this.history[this.memoryAddress].setTemp * 100), 4),
-                  numToHex(this.history[this.memoryAddress].valvePosition, 2)
-                )
+                  numToHex(this.history[this.memoryAddress].valvePosition, 2))
                 break
-              case TYPE_CUSTOM: {
+              case 'custom': {
                 const result = []
                 let bitmask = 0
-                const dataStream = Format(
-                  '%s%s',
+                const dataStream = Format('%s%s',
                   numToHex(swap32(this.currentEntry), 8),
                   numToHex(swap32(
                     this.history[this.memoryAddress].time - this.refTime - _EPOCH),
                   8
-                  )
-                )
-                for (const [key, value] of Object.entries(this.history[this.memoryAddress])) {
-                  switch (key) {
+                  ))
+                for (const [k, v] of Object.entries(this.history[this.memoryAddress])) {
+                  switch (k) {
                     case 'time':
                       break
                     default:
                       for (let x = 0, iLen = this.signatures.length; x < iLen; x++) {
-                        if (this.signatures[x].entry === key) {
+                        if (this.signatures[x].entry === k) {
                           switch (this.signatures[x].length) {
                             case 8:
-                              result[x] = Format('%s', numToHex(swap32(
-                                value * this.signatures[x].factor),
-                              this.signatures[x].length
-                              ))
+                              result[x] = Format(
+                                '%s',
+                                numToHex(
+                                  swap32(v * this.signatures[x].factor),
+                                  this.signatures[x].length
+                                )
+                              )
                               break
                             case 4:
-                              result[x] = Format('%s', numToHex(swap16(
-                                value * this.signatures[x].factor),
-                              this.signatures[x].length
-                              ))
+                              result[x] = Format(
+                                '%s',
+                                numToHex(
+                                  swap16(v * this.signatures[x].factor),
+                                  this.signatures[x].length
+                                )
+                              )
                               break
                             case 2:
-                              result[x] = Format('%s', numToHex(
-                                value * this.signatures[x].factor,
-                                this.signatures[x].length
-                              ))
+                              result[x] = Format(
+                                '%s',
+                                numToHex(
+                                  v * this.signatures[x].factor,
+                                  this.signatures[x].length)
+                              )
                               break
                           }
                           bitmask += Math.pow(2, x)
@@ -971,20 +778,27 @@ module.exports = function (pHomebridge) {
                       }
                   }
                 }
-                const results = dataStream + ' ' + numToHex(bitmask, 2) + ' ' +
+                const results = dataStream +
+                  ' ' +
+                  numToHex(bitmask, 2) +
+                  ' ' +
                   result.map(a => a).join(' ')
-                this.dataStream += ' ' + numToHex(
-                  (results.replace(/[^0-9A-F]/ig, '').length) / 2 + 1
-                ) + ' ' + results + ','
+                this.dataStream += ' ' +
+                  numToHex((results.replace(/[^0-9A-F]/ig, '').length) / 2 + 1) +
+                  ' ' +
+                  results +
+                  ','
                 break
               }
             }
           }
           this.currentEntry++
           this.memoryAddress = entry2address(this.currentEntry)
-          if (this.currentEntry > this.lastEntry) { break }
+          if (this.currentEntry > this.lastEntry) {
+            break
+          }
         }
-        this.log('Data %s: %s', this.accessoryName, this.dataStream)
+        this.log('[%s] FG history: data [%s].', this.accessoryName, this.dataStream)
         callback(null, hexToBase64(this.dataStream))
         this.dataStream = ''
       } else {
@@ -995,22 +809,23 @@ module.exports = function (pHomebridge) {
 
     setCurrentS2W1 (val, callback) {
       callback(null)
-      this.log('Data request %s: %s', this.accessoryName, base64ToHex(val))
+      this.log('[%s] FG history: data req [%s].', this.accessoryName, base64ToHex(val))
       const valHex = base64ToHex(val)
       const substring = valHex.substring(4, 12)
       const valInt = parseInt(substring, 16)
       const address = swap32(valInt)
       const hexAddress = address.toString('16')
-
-      this.log('Address requested %s: %s', this.accessoryName, hexAddress)
+      this.log('[%s] FG history: address req [%s].', this.accessoryName, hexAddress)
       this.sendHistory(address)
     }
 
     setCurrentS2W2 (val, callback) {
-      this.log('Clock adjust %s: %s', this.accessoryName, base64ToHex(val))
-      callback(null)
+      this.log('[%s] FG history: clock adj [%s].', this.accessoryName, base64ToHex(val))
+      callback()
     }
   }
+
   FakeGatoHistoryService.UUID = 'E863F007-079E-48FF-8F27-9C2605A29F52'
+
   return FakeGatoHistory
 }
diff --git a/lib/fakegato/fakegato-storage.js b/lib/fakegato/fakegato-storage.js
index 498b7346..bcc23eee 100644
--- a/lib/fakegato/fakegato-storage.js
+++ b/lib/fakegato/fakegato-storage.js
@@ -6,9 +6,8 @@ const fs = require('fs')
 const os = require('os')
 const path = require('path')
 const hostname = os.hostname().split('.')[0]
-const fileSuffix = '_persist.json'
 
-module.exports = class FakeGatoStorage {
+class FakeGatoStorage {
   constructor (params) {
     if (!params) {
       params = {}
@@ -16,7 +15,7 @@ module.exports = class FakeGatoStorage {
     this.writers = []
     this.log = params.log || {}
     if (!this.log) {
-      this.log = console.log
+      this.log = () => {}
     }
     this.addingWriter = false
   }
@@ -27,12 +26,11 @@ module.exports = class FakeGatoStorage {
       if (!params) {
         params = {}
       }
-      this.log('** Fakegato-storage AddWriter :', service.accessoryName)
+      this.log('[%s] FS storage: addWriter().', service.accessoryName)
       const newWriter = {
-        service: service,
+        service,
         callback: params.callback,
-        storage: params.storage || 'fs',
-        fileName: params.filename || hostname + '_' + service.accessoryName + fileSuffix
+        fileName: hostname + '_' + service.accessoryName + '_persist.json'
       }
       const onReady = typeof (params.onReady) === 'function'
         ? params.onReady
@@ -48,17 +46,11 @@ module.exports = class FakeGatoStorage {
   }
 
   getWriter (service) {
-    const findServ = function (element) {
-      return element.service === service
-    }
-    return this.writers.find(findServ)
+    return this.writers.find(ele => ele.service === service)
   }
 
   _getWriterIndex (service) {
-    const findServ = function (element) {
-      return element.service === service
-    }
-    return this.writers.findIndex(findServ)
+    return this.writers.findIndex(ele => ele.service === service)
   }
 
   getWriters () {
@@ -71,24 +63,20 @@ module.exports = class FakeGatoStorage {
   }
 
   write (params) {
-    // must be asynchronous
     if (!this.writing) {
       this.writing = true
       const writer = this.getWriter(params.service)
-      // use parameter callback or writer callback or empty function
       const callBack = typeof (params.callback) === 'function'
         ? params.callback
-        : (typeof (writer.callback) === 'function'
-          ? writer.callback
-          : () => {})
+        : (typeof (writer.callback) === 'function' ? writer.callback : () => {})
       this.log(
-        '** Fakegato-storage write FS file:',
-        path.join(writer.path, writer.fileName),
-        params.data.substr(1, 80)
+        'FG storage: write file [%s].',
+        path.join(writer.path, writer.fileName), params.data.substr(1, 80)
       )
       writer.storageHandler.writeFile(
         path.join(writer.path, writer.fileName),
-        params.data, 'utf8',
+        params.data,
+        'utf8',
         () => {
           this.writing = false
           callBack(arguments)
@@ -101,16 +89,10 @@ module.exports = class FakeGatoStorage {
 
   read (params) {
     const writer = this.getWriter(params.service)
-    // use parameter callback or writer callback or empty function
     const callBack = typeof (params.callback) === 'function'
       ? params.callback
-      : (typeof (writer.callback) === 'function'
-        ? writer.callback
-        : () => {})
-    this.log(
-      '** Fakegato-storage read FS file:',
-      path.join(writer.path, writer.fileName)
-    )
+      : (typeof (writer.callback) === 'function' ? writer.callback : () => {})
+    this.log('FG storage: read file [%s].', path.join(writer.path, writer.fileName))
     writer.storageHandler.readFile(
       path.join(writer.path, writer.fileName),
       'utf8',
@@ -120,16 +102,12 @@ module.exports = class FakeGatoStorage {
 
   remove (params) {
     const writer = this.getWriter(params.service)
-    // use parameter callback or writer callback or empty function
     const callBack = typeof (params.callback) === 'function'
       ? params.callback
-      : (typeof (writer.callback) === 'function'
-        ? writer.callback
-        : () => {})
-    this.log(
-      '** Fakegato-storage delete FS file:',
-      path.join(writer.path, writer.fileName)
-    )
+      : (typeof (writer.callback) === 'function' ? writer.callback : () => {})
+    this.log('FG storage: delete file [%s].', path.join(writer.path, writer.fileName))
     writer.storageHandler.unlink(path.join(writer.path, writer.fileName), callBack)
   }
 }
+
+module.exports = { FakeGatoStorage }
diff --git a/lib/fakegato/fakegato-timer.js b/lib/fakegato/fakegato-timer.js
index 815e48b9..0c8661f0 100644
--- a/lib/fakegato/fakegato-timer.js
+++ b/lib/fakegato/fakegato-timer.js
@@ -2,7 +2,7 @@
 /* eslint-disable new-cap */
 'use strict'
 
-module.exports = class FakeGatoTimer {
+class FakeGatoTimer {
   constructor (params) {
     if (!params) {
       params = {}
@@ -13,12 +13,12 @@ module.exports = class FakeGatoTimer {
     this.running = false
     this.log = params.log || {}
     if (!this.log) {
-      this.log = console.log
+      this.log = () => {}
     }
   }
 
   subscribe (service, callback) {
-    this.log('** Fakegato-timer Subscription :', service.accessoryName)
+    this.log('[%s] FG timer: new subscription.', service.accessoryName)
     const newService = {
       service,
       callback,
@@ -30,17 +30,11 @@ module.exports = class FakeGatoTimer {
   }
 
   getSubscriber (service) {
-    const findServ = function (element) {
-      return element.service === service
-    }
-    return this.subscribedServices.find(findServ)
+    return this.subscribedServices.find(el => el.service === service)
   }
 
   _getSubscriberIndex (service) {
-    const findServ = function (element) {
-      return element.service === service
-    }
-    return this.subscribedServices.findIndex(findServ)
+    return this.subscribedServices.findIndex(el => el.service === service)
   }
 
   getSubscribers () {
@@ -56,24 +50,26 @@ module.exports = class FakeGatoTimer {
   }
 
   start () {
-    this.log('**Start Global Fakegato-Timer - ' + this.minutes + 'min**')
-    if (this.running) { this.stop() }
+    this.log('Starting global FG timer [%s minutes].', this.minutes)
+    if (this.running) {
+      this.stop()
+    }
     this.running = true
     this.intervalID = setInterval(
-      () => this.executeCallbacks,
+      this.executeCallbacks.bind(this),
       this.minutes * 60 * 1000
     )
   }
 
   stop () {
-    this.log('**Stop Global Fakegato-Timer**')
+    this.log('Stopping global FG timer.')
     clearInterval(this.intervalID)
     this.running = false
     this.intervalID = null
   }
 
   executeCallbacks () {
-    this.log('**Fakegato-timer: executeCallbacks**')
+    this.log('FG timer: executeCallbacks().')
     if (this.subscribedServices.length !== 0) {
       for (const s in this.subscribedServices) {
         if (Object.prototype.hasOwnProperty.call(this.subscribedServices, s)) {
@@ -92,7 +88,7 @@ module.exports = class FakeGatoTimer {
   }
 
   executeImmediateCallback (service) {
-    this.log('**Fakegato-timer: executeImmediateCallback**')
+    this.log('FG timer: executeImmediateCallback().')
     if (typeof (service.callback) === 'function' && service.backLog.length) {
       service.callback({
         backLog: service.backLog,
@@ -106,7 +102,12 @@ module.exports = class FakeGatoTimer {
     const data = params.entry
     const service = params.service
     const immediateCallback = params.immediateCallback || false
-    this.log('**Fakegato-timer: addData ', service.accessoryName, data, ' immediate: ', immediateCallback)
+    this.log(
+      '[%s] FG timer: addData() [%s] immediate [%s].',
+      service.accessoryName,
+      data,
+      immediateCallback
+    )
     if (immediateCallback) {
       this.getSubscriber(service).backLog[0] = data
     } else {
@@ -115,13 +116,13 @@ module.exports = class FakeGatoTimer {
     if (immediateCallback) {
       this.executeImmediateCallback(this.getSubscriber(service))
     }
-    if (this.running === false) {
+    if (!this.running) {
       this.start()
     }
   }
 
   emptyData (service) {
-    this.log('**Fakegato-timer: emptyData **', service.accessoryName)
+    this.log('[%s] FG timer: emptyData().', service.accessoryName)
     const source = this.getSubscriber(service)
     if (source.backLog.length) {
       source.previousBackLog = source.backLog
@@ -129,3 +130,5 @@ module.exports = class FakeGatoTimer {
     source.backLog = []
   }
 }
+
+module.exports = { FakeGatoTimer }
diff --git a/lib/fakegato/uuid.js b/lib/fakegato/uuid.js
index a1ded642..56a47fd2 100644
--- a/lib/fakegato/uuid.js
+++ b/lib/fakegato/uuid.js
@@ -4,18 +4,17 @@
 
 // https://github.com/homebridge/HAP-NodeJS/blob/master/src/lib/util/uuid.ts
 
-const VALID_UUID_REGEX = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i
-const VALID_SHORT_REGEX = /^[0-9a-f]{1,8}$/i
-
 function isValid (UUID) {
-  return VALID_UUID_REGEX.test(UUID)
+  const uuidRegex = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i
+  return uuidRegex.test(UUID)
 }
 
 function toLongFormUUID (uuid, base = '-0000-1000-8000-0026BB765291') {
+  const shortRegex = /^[0-9a-f]{1,8}$/i
   if (isValid(uuid)) {
     return uuid.toUpperCase()
   }
-  if (!VALID_SHORT_REGEX.test(uuid)) {
+  if (!shortRegex.test(uuid)) {
     throw new TypeError('uuid was not a valid UUID or short form UUID')
   }
   if (!isValid('00000000' + base)) {
diff --git a/lib/index.js b/lib/index.js
index 3c631799..17ea4b3c 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -385,7 +385,6 @@ class eWeLinkPlatform {
       this.log('[v%s] %s.', PLUGIN.version, this.messages.initialised)
 
       // Set up further global variables
-      this.eveLogPath = this.api.user.storagePath() + '/persist/'
       this.hiddenMasters = []
 
       // Require any libraries that the plugin uses

From ec006cd84b0e24be68b4c36e0c8a1dd241d5e0fb Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 11 Feb 2021 15:11:12 +0000
Subject: [PATCH 1416/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d90fee86..da30f4c3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 * Added a 10 second timeout when sending web socket messages
 * Updated dependencies:
   * `websocket-as-promised` to v2.0.1
+* Fakegato library formatting and simplification
 
 ## v4.7.0 (2021-02-10)
 

From 19ca60eba2375b27353d50e74743e4c4e0358078 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 11 Feb 2021 15:11:42 +0000
Subject: [PATCH 1417/3183] 4.7.1-1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 4570f00c..6133e673 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.7.1-0",
+  "version": "4.7.1-1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index a7dff16a..b6ed60b8 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "4.7.1-0",
+  "version": "4.7.1-1",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 74088049cb322dbd1ffcc1663efa45a3c27d762b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 11 Feb 2021 15:38:20 +0000
Subject: [PATCH 1418/3183] logging changes

---
 lib/device/simulation/thermostat.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/device/simulation/thermostat.js b/lib/device/simulation/thermostat.js
index 146add9e..cc35fd54 100644
--- a/lib/device/simulation/thermostat.js
+++ b/lib/device/simulation/thermostat.js
@@ -112,7 +112,7 @@ module.exports = class deviceThermostat {
       this.service.updateCharacteristic(this.hapChar.CurrentHeatingCoolingState, this.cacheHeating === 'on' ? 1 : 0)
       await this.platform.sendDeviceUpdate(this.accessory, params)
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current state [%s] heating [%s].', this.name, this.cacheOnOff, this.cacheHeating)
+        this.log('[%s] current state [%s].', this.name, this.cacheOnOff)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
@@ -147,7 +147,7 @@ module.exports = class deviceThermostat {
       this.service.updateCharacteristic(this.hapChar.CurrentHeatingCoolingState, this.cacheHeating === 'on' ? 1 : 0)
       await this.platform.sendDeviceUpdate(this.accessory, params)
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current state [%s] heating [%s].', this.name, this.cacheOnOff, this.cacheHeating)
+        this.log('[%s] current heating [%s].', this.name, this.cacheHeating)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
@@ -174,7 +174,7 @@ module.exports = class deviceThermostat {
         this.cacheHeating = params.switch
         this.service.updateCharacteristic(this.hapChar.CurrentHeatingCoolingState, params.switch === 'on' ? 1 : 0)
         if (params.updateSource && !this.disableDeviceLogging) {
-          this.log('[%s] current state [%s] heating [%s].', this.name, this.cacheOnOff, params.switch)
+          this.log('[%s] current heating [%s].', this.name, this.cacheHeating)
         }
       }
       const eveLog = {}

From 6a6b62d0dac706f1f07e65344ae0445187c6ef8d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 11 Feb 2021 15:40:00 +0000
Subject: [PATCH 1419/3183] logging changes again

---
 lib/device/simulation/thermostat.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/device/simulation/thermostat.js b/lib/device/simulation/thermostat.js
index cc35fd54..480d63f5 100644
--- a/lib/device/simulation/thermostat.js
+++ b/lib/device/simulation/thermostat.js
@@ -147,7 +147,7 @@ module.exports = class deviceThermostat {
       this.service.updateCharacteristic(this.hapChar.CurrentHeatingCoolingState, this.cacheHeating === 'on' ? 1 : 0)
       await this.platform.sendDeviceUpdate(this.accessory, params)
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current heating [%s].', this.name, this.cacheHeating)
+        this.log('[%s] current target [%s°C].', this.name, value)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)

From ef7c588e1830d2a7cd3a028966cdf7efaf563c35 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 11 Feb 2021 15:45:56 +0000
Subject: [PATCH 1420/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index da30f4c3..07972dd2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 All notable changes to this homebridge-ewelink will be documented in this file.
 
-## BETA
+## v4.7.1 (2021-02-11)
 
 ### Changes
 

From 54859397a3bbc357c6d9671160f3d224283a996f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 11 Feb 2021 15:46:20 +0000
Subject: [PATCH 1421/3183] 4.7.1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 6133e673..70d957e5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.7.1-1",
+  "version": "4.7.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index b6ed60b8..07ba7181 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "4.7.1-1",
+  "version": "4.7.1",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 8b969223f73b57c7e0cda7fda629b51edc17ad39 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 11 Feb 2021 17:42:19 +0000
Subject: [PATCH 1422/3183] comments+simplify

---
 lib/homebridge-ui/server.js | 37 +++++++++++++++++++++++++++----------
 1 file changed, 27 insertions(+), 10 deletions(-)

diff --git a/lib/homebridge-ui/server.js b/lib/homebridge-ui/server.js
index f28e8cbd..83f20a75 100644
--- a/lib/homebridge-ui/server.js
+++ b/lib/homebridge-ui/server.js
@@ -1,28 +1,45 @@
 /* jshint -W014, -W033, esversion: 9 */
 /* eslint-disable new-cap */
+'use strict'
+
 const { HomebridgePluginUiServer } = require('@homebridge/plugin-ui-utils')
 const fs = require('fs')
 
 class PluginUiServer extends HomebridgePluginUiServer {
   constructor () {
     super()
+
+    /*
+      A native method getCachedAccessories() was introduced in config-ui-x v4.37.0
+      The following is for users who have a lower version of config-ui-x
+    */
     this.onRequest('/getCachedAccessories', async () => {
       try {
+        // Define the plugin and create the array to return
+        const plugin = 'homebridge-ewelink'
         const devicesToReturn = []
-        const accessoriesFile = this.homebridgeStoragePath + '/accessories/cachedAccessories'
-        if (fs.existsSync(accessoriesFile)) {
-          let cachedAccessories = await fs.promises.readFile(accessoriesFile)
+
+        // The path and file of the cached accessories
+        const accFile = this.homebridgeStoragePath + '/accessories/cachedAccessories'
+
+        // Check the file exists
+        if (fs.existsSync(accFile)) {
+          // Read the cached accessories file
+          let cachedAccessories = await fs.promises.readFile(accFile)
+
+          // Parse the JSON
           cachedAccessories = JSON.parse(cachedAccessories)
-          cachedAccessories.filter(accessory => accessory.plugin === 'homebridge-ewelink')
-            .forEach(accessory => {
-              devicesToReturn.push({
-                displayName: accessory.displayName,
-                context: accessory.context
-              })
-            })
+
+          // We only want the accessories for this plugin
+          cachedAccessories
+            .filter(accessory => accessory.plugin === plugin)
+            .forEach(accessory => devicesToReturn.push(accessory))
         }
+
+        // Return the array
         return devicesToReturn
       } catch (err) {
+        // Just return an empty accessory list in case of any errors
         return []
       }
     })

From 1c41dcba12812dbabcfba37993dc611218955cca Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 12 Feb 2021 07:46:41 +0000
Subject: [PATCH 1423/3183] check method exists

---
 lib/index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/index.js b/lib/index.js
index 17ea4b3c..f4cc0901 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1088,7 +1088,7 @@ class eWeLinkPlatform {
           : this.messages.lanUnsupported
 
       // Update accessory characteristics with latest values
-      if (this.wsClient && accessory.control) {
+      if (this.wsClient && accessory.control && accessory.control.externalUpdate) {
         accessory.control.externalUpdate(device.params)
       }
 
@@ -1355,7 +1355,7 @@ class eWeLinkPlatform {
       }
       try {
         // Update the accessory with the new data
-        if (accessory.control) {
+        if (accessory.control && accessory.control.externalUpdate) {
           accessory.control.externalUpdate(device.params)
         }
       } catch (err) {

From 31a2acfeddc2d1b9cc6f4bf37c1c908b201d421b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 12 Feb 2021 08:46:09 +0000
Subject: [PATCH 1424/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 07972dd2..fe058963 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 All notable changes to this homebridge-ewelink will be documented in this file.
 
+## BETA
+
+### Changes
+
+* Stop subsequent warning messages if a device fails to initialise
+
 ## v4.7.1 (2021-02-11)
 
 ### Changes

From 7beecd0c3aae8c0a39ba2a18c81070675f6cd25e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 12 Feb 2021 12:33:29 +0000
Subject: [PATCH 1425/3183] remove desc as self explanatory

---
 config.schema.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/config.schema.json b/config.schema.json
index 83c36e63..84c932c9 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -486,7 +486,6 @@
     {
       "key": "ignoredDevices",
       "expandable": true,
-      "description": "Use this setting to ignore specific devices from your eWeLink account.",
       "title": "Ignored Devices",
       "add": "Add Another Device",
       "type": "array",

From 00b25ddcc33ef5e9f2f004febd5917b57f9a0bcc Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 12 Feb 2021 13:29:50 +0000
Subject: [PATCH 1426/3183] descriptions

---
 config.schema.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 84c932c9..315bd254 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -58,12 +58,12 @@
       "disableDeviceLogging": {
         "type": "boolean",
         "title": "Disable Device Logging",
-        "description": "If checked, device updates will not be added to the log."
+        "description": "If true, updates for all devices will not be added to the log when they are controlled."
       },
       "debug": {
         "title": "Debug Logging",
         "type": "boolean",
-        "description": "If checked, debug information will be added to the log."
+        "description": "If true, debug information will be added to the log."
       },
       "debugFakegato": {
         "type": "boolean"
@@ -71,7 +71,7 @@
       "disablePlugin": {
         "title": "Disable Plugin",
         "type": "boolean",
-        "description": "If checked, the plugin will remove all accessories and not load the plugin on restart."
+        "description": "If true, the plugin will remove all accessories and not load the plugin on restart."
       },
       "hideChanFromHB": {
         "type": "string",

From d576c41ce396d74712baf9425f3380b2be6ee894 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 12 Feb 2021 16:20:02 +0000
Subject: [PATCH 1427/3183] add the correct item to array

---
 lib/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/index.js b/lib/index.js
index f4cc0901..5e7e1a2a 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -146,7 +146,7 @@ class eWeLinkPlatform {
           } else {
             const items = val.split(',')
             items.forEach(item => {
-              this.config[key].push(this.funcs.parseDeviceId(val))
+              this.config[key].push(this.funcs.parseDeviceId(item))
             })
           }
           break

From 1a39a8b39d39c411cc75e40143e88d55bb717a0c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 12 Feb 2021 16:20:59 +0000
Subject: [PATCH 1428/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fe058963..18279cd6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,10 +2,11 @@
 
 All notable changes to this homebridge-ewelink will be documented in this file.
 
-## BETA
+## v4.7.2 (2021-02-12)
 
 ### Changes
 
+* Fixes a bug where config items separated by a comma weren't adhered to properly
 * Stop subsequent warning messages if a device fails to initialise
 
 ## v4.7.1 (2021-02-11)

From 997f8dd1d3643b4bcee20c82ec6ec43a238c6969 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 12 Feb 2021 16:21:33 +0000
Subject: [PATCH 1429/3183] 4.7.2

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 70d957e5..1a387e29 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.7.1",
+  "version": "4.7.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 07ba7181..105b0e88 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "4.7.1",
+  "version": "4.7.2",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From aaaf849edc6c658d98805eb094cceee1f0b9689a Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 13 Feb 2021 09:59:46 +0000
Subject: [PATCH 1430/3183] Update fakegato-history.js

---
 lib/fakegato/fakegato-history.js | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/lib/fakegato/fakegato-history.js b/lib/fakegato/fakegato-history.js
index 177028f4..08d19648 100644
--- a/lib/fakegato/fakegato-history.js
+++ b/lib/fakegato/fakegato-history.js
@@ -389,8 +389,12 @@ module.exports = function (pHomebridge) {
         if (Object.prototype.hasOwnProperty.call(backLog, h)) {
           for (const key in backLog[h]) {
             if (Object.prototype.hasOwnProperty.call(backLog[h], key) && key !== 'time') {
-              if (!calc.sum[key]) { calc.sum[key] = 0 }
-              if (!calc.num[key]) { calc.num[key] = 0 }
+              if (!calc.sum[key]) {
+                calc.sum[key] = 0
+              }
+              if (!calc.num[key]) {
+                calc.num[key] = 0
+              }
               calc.sum[key] += backLog[h][key]
               calc.num[key]++
               calc.avrg[key] = precisionRound(calc.sum[key] / calc.num[key], 2)
@@ -592,7 +596,7 @@ module.exports = function (pHomebridge) {
           if (!err) {
             if (data) {
               try {
-                this.log('[%s] read data [%s].', this.accessoryName, data)
+                // this.log('[%s] read data [%s].', this.accessoryName, data)
                 const jsonFile = typeof (data) === 'object' ? data : JSON.parse(data)
                 this.firstEntry = jsonFile.firstEntry
                 this.lastEntry = jsonFile.lastEntry

From 1d12d745d8557b0d956f16a9a0b088de1cf55a9b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 13 Feb 2021 11:42:31 +0000
Subject: [PATCH 1431/3183] delay setting up as thermo

---
 lib/device/simulation/thermostat.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/lib/device/simulation/thermostat.js b/lib/device/simulation/thermostat.js
index 480d63f5..e0d3f06c 100644
--- a/lib/device/simulation/thermostat.js
+++ b/lib/device/simulation/thermostat.js
@@ -88,10 +88,12 @@ module.exports = class deviceThermostat {
     })
 
     // Setting this now makes the plugin send the payload to setup as thermostat
-    this.service.setCharacteristic(
-      this.hapChar.TargetTemperature,
-      this.accessory.context.cacheTarget
-    )
+    setTimeout(() => {
+      this.service.setCharacteristic(
+        this.hapChar.TargetTemperature,
+        this.accessory.context.cacheTarget
+      )
+    }, 5000)
   }
 
   async internalOnOffUpdate (value, callback) {

From 2d4c4341972e04fb1fd2a15def6249f3873cbead Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 13 Feb 2021 12:05:34 +0000
Subject: [PATCH 1432/3183] hide unhelpful entries

---
 lib/connection/ws.js | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/lib/connection/ws.js b/lib/connection/ws.js
index 459e76f0..33a58544 100644
--- a/lib/connection/ws.js
+++ b/lib/connection/ws.js
@@ -175,7 +175,6 @@ module.exports = class connectionWS {
       // We received a device on/offline or error notification
       if (device.deviceid && this.funcs.hasProperty(device, 'error')) {
         device.action = 'update'
-        isStatusUpdate = true
         // Set the online status of the device
         onlineStatus = device.error === 0
 
@@ -211,11 +210,11 @@ module.exports = class connectionWS {
               }
             }
 
-            // Add more params to report back to the plugin
-            device.params.online = onlineStatus
-            device.params.updateSource = 'WS'
-
-            if (Object.keys(device.params).length > 2 || isStatusUpdate) {
+            if (Object.keys(device.params).length > 0) {
+              // Add more params to report back to the plugin
+              device.params.online = onlineStatus
+              device.params.updateSource = 'WS'
+              
               // Generate the object to return to the plugin
               const returnTemplate = {
                 deviceid: device.deviceid,

From 0935cbefca6817d284db463893cd26c1d423154e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 13 Feb 2021 12:05:44 +0000
Subject: [PATCH 1433/3183] add entries separately

---
 lib/device/simulation/thermostat.js | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/lib/device/simulation/thermostat.js b/lib/device/simulation/thermostat.js
index e0d3f06c..d9bf80ac 100644
--- a/lib/device/simulation/thermostat.js
+++ b/lib/device/simulation/thermostat.js
@@ -179,13 +179,12 @@ module.exports = class deviceThermostat {
           this.log('[%s] current heating [%s].', this.name, this.cacheHeating)
         }
       }
-      const eveLog = {}
       if (this.funcs.hasProperty(params, 'currentTemperature') && params.currentTemperature !== 'unavailable') {
         const currentTemp = Number(params.currentTemperature) + this.tempOffset
-        eveLog.temp = currentTemp
         if (this.cacheTemp !== currentTemp) {
           this.cacheTemp = currentTemp
           this.service.updateCharacteristic(this.hapChar.CurrentTemperature, this.cacheTemp)
+          this.accessory.eveService.addEntry({ temp: currentTemp })
           if (params.updateSource && !this.disableDeviceLogging) {
             this.log('[%s] current temperature [%s°C].', this.name, this.cacheTemp)
           }
@@ -197,18 +196,15 @@ module.exports = class deviceThermostat {
         this.service.testCharacteristic(this.hapChar.CurrentRelativeHumidity)
       ) {
         const currentHumi = parseInt(params.currentHumidity)
-        eveLog.humidity = currentHumi
         if (this.cacheHumi !== currentHumi) {
           this.cacheHumi = currentHumi
           this.service.updateCharacteristic(this.hapChar.CurrentRelativeHumidity, this.cacheHumi)
+          this.accessory.eveService.addEntry({ humidity: currentHumi })
           if (params.updateSource && !this.disableDeviceLogging) {
             this.log('[%s] current humidity [%s%].', this.name, this.cacheHumi)
           }
         }
       }
-      if (this.funcs.hasProperty(eveLog, 'temp') || this.funcs.hasProperty(eveLog, 'humidity')) {
-        this.accessory.eveService.addEntry(eveLog)
-      }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }

From 3f3d8bcdc949516d047462c8d4871b8566905726 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 13 Feb 2021 13:44:30 +0000
Subject: [PATCH 1434/3183] colour

---
 lib/connection/ws.js      |  3 +-
 lib/utils/colour-utils.js | 83 +++++++++++++++++++++------------------
 2 files changed, 45 insertions(+), 41 deletions(-)

diff --git a/lib/connection/ws.js b/lib/connection/ws.js
index 33a58544..2be93d53 100644
--- a/lib/connection/ws.js
+++ b/lib/connection/ws.js
@@ -165,7 +165,6 @@ module.exports = class connectionWS {
 
       // Set a device online flag now which we can change later
       let onlineStatus = true
-      let isStatusUpdate
 
       // Set up a params object if one didn't already come within the message
       if (!device.params) {
@@ -214,7 +213,7 @@ module.exports = class connectionWS {
               // Add more params to report back to the plugin
               device.params.online = onlineStatus
               device.params.updateSource = 'WS'
-              
+
               // Generate the object to return to the plugin
               const returnTemplate = {
                 deviceid: device.deviceid,
diff --git a/lib/utils/colour-utils.js b/lib/utils/colour-utils.js
index 6f5903e7..e04a72f9 100644
--- a/lib/utils/colour-utils.js
+++ b/lib/utils/colour-utils.js
@@ -8,35 +8,42 @@ module.exports = {
       Credit:
       https://github.com/WickyNilliams/pure-color
     */
-    h = parseInt(h) / 360
+    h = parseInt(h) / 60
     s = parseInt(s) / 100
-    let t3
-    let val
-    if (s === 0) {
-      return [128, 128, 128]
+    const f = h - Math.floor(h)
+    const p = 255 * (1 - s)
+    const q = 255 * (1 - (s * f))
+    const t = 255 * (1 - (s * (1 - f)))
+    let rgb
+    switch (Math.floor(h) % 6) {
+      case 0:
+        rgb = [255, t, p]
+        break
+      case 1:
+        rgb = [q, 255, p]
+        break
+      case 2:
+        rgb = [p, 255, t]
+        break
+      case 3:
+        rgb = [p, q, 255]
+        break
+      case 4:
+        rgb = [t, p, 255]
+        break
+      case 5:
+        rgb = [255, p, q]
+        break
     }
-    const t2 = 0.5 + s - 0.5 * s
-    const t1 = 1 - t2
-    const rgb = [0, 0, 0]
-    for (let i = 0; i < 3; i++) {
-      t3 = h + 1 / 3 * (1 - i)
-      if (t3 < 0) {
-        t3++
-      } else if (t3 > 1) {
-        t3--
+    if (rgb[0] === 255) {
+      rgb[1] *= 0.60
+      rgb[2] *= 0.60
+      if (rgb[1] <= 25 && rgb[2] <= 25) {
+        rgb[1] = 0
+        rgb[2] = 0
       }
-      if (t3 * 6 < 1) {
-        val = t1 + (t2 - t1) * 6 * t3
-      } else if (t3 * 2 < 1) {
-        val = t2
-      } else if (t3 * 3 < 2) {
-        val = t1 + (t2 - t1) * (2 / 3 - t3) * 6
-      } else {
-        val = t1
-      }
-      rgb[i] = Math.round(val * 255)
     }
-    return rgb
+    return [Math.round(rgb[0]), Math.round(rgb[1]), Math.round(rgb[2])]
   },
 
   rgb2hs: (r, g, b) => {
@@ -44,14 +51,19 @@ module.exports = {
       Credit:
       https://github.com/WickyNilliams/pure-color
     */
-    r = parseInt(r) / 255
-    g = parseInt(g) / 255
-    b = parseInt(b) / 255
+    r = parseInt(r)
+    g = parseInt(g)
+    b = parseInt(b)
     const min = Math.min(r, g, b)
     const max = Math.max(r, g, b)
     const delta = max - min
-    let h = 0
-    let s = 0
+    let h
+    let s
+    if (max === 0) {
+      s = 0
+    } else {
+      s = delta / max * 100
+    }
     if (max === min) {
       h = 0
     } else if (r === max) {
@@ -62,18 +74,11 @@ module.exports = {
       h = 4 + (r - g) / delta
     }
     h = Math.min(h * 60, 360)
+
     if (h < 0) {
       h += 360
     }
-    const l = (min + max) / 2
-    if (max === min) {
-      s = 0
-    } else if (l <= 0.5) {
-      s = delta / (max + min)
-    } else {
-      s = delta / (2 - max - min)
-    }
-    return [Math.round(h), Math.round(s * 100)]
+    return [Math.round(h), Math.round(s)]
   },
 
   k2rgb: k => {

From 64c4f74236389665993058afb27bc91582f15c5a Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 13 Feb 2021 13:46:52 +0000
Subject: [PATCH 1435/3183] Update colour-utils.js

---
 lib/utils/colour-utils.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/utils/colour-utils.js b/lib/utils/colour-utils.js
index e04a72f9..68cdc1a4 100644
--- a/lib/utils/colour-utils.js
+++ b/lib/utils/colour-utils.js
@@ -36,8 +36,8 @@ module.exports = {
         break
     }
     if (rgb[0] === 255) {
-      rgb[1] *= 0.60
-      rgb[2] *= 0.60
+      rgb[1] *= 0.8
+      rgb[2] *= 0.8
       if (rgb[1] <= 25 && rgb[2] <= 25) {
         rgb[1] = 0
         rgb[2] = 0

From f9eb8ba1b5ec0b98980ae68681101a045c8c2587 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 13 Feb 2021 14:27:03 +0000
Subject: [PATCH 1436/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 18279cd6..737c5156 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,15 @@
 
 All notable changes to this homebridge-ewelink will be documented in this file.
 
+## BETA
+
+### Changes
+
+* Thermostat accessory simulation will now setup after a small delay to let the accessory initialise first
+* Changes to colour conversion:
+  * Lighter colours appear brighter
+  * Solid red is now easier to obtain via the Home app
+
 ## v4.7.2 (2021-02-12)
 
 ### Changes

From 2e58631bfdf3b5d851b89444f29a641bb6e63dfe Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 13 Feb 2021 14:28:07 +0000
Subject: [PATCH 1437/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 737c5156..8884070a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 ### Changes
 
+* Hide WS messages that have no useful information about a device
 * Thermostat accessory simulation will now setup after a small delay to let the accessory initialise first
 * Changes to colour conversion:
   * Lighter colours appear brighter

From 5211f342801f0efdd1b84f773c8207c835619775 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 13 Feb 2021 14:28:35 +0000
Subject: [PATCH 1438/3183] 4.7.3-0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 1a387e29..ee82b1af 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.7.2",
+  "version": "4.7.3-0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 105b0e88..6eb9141d 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "4.7.2",
+  "version": "4.7.3-0",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 83b7a315a7e19ca51b557296219b4288747120ef Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 13 Feb 2021 19:46:42 +0000
Subject: [PATCH 1439/3183] convert, but warn about F

---
 lib/device/thermostat.js | 48 +++++++++++++++++++++++++---------------
 1 file changed, 30 insertions(+), 18 deletions(-)

diff --git a/lib/device/thermostat.js b/lib/device/thermostat.js
index 0122c68c..170d3fc8 100644
--- a/lib/device/thermostat.js
+++ b/lib/device/thermostat.js
@@ -26,22 +26,22 @@ module.exports = class deviceThermostat {
       **************
       *** PARAMS ***
       **************
-      "volatility": 1, // Deviation
-      "targetTemp": 20, // C or F In 0.5
-      "workMode": 1, // 1=manual, 2=programmed 3=economical
-      "switch": "on",
-      "temperature": 29, // C or F In 0.5
-      "fault": 0, // Not Sure
-      "workState": 2, // 1=heating, 2=auto
-      "tempScale": "c", // guessing "f"
-      "childLock": "off", // Guessing "on"
-      "mon": "016800c801e0009602b20096032a009603fc00dc05280096",
-      "tues": "016800c801e0009602b20096032a009603fc00dc05280096",
-      "wed": "016800c801e0009602b20096032a009603fc00dc05280096",
-      "thur": "016800c801e0009602b20096032a009603fc00dc05280096",
-      "fri": "016800c801e0009602b20096032a009603fc00dc05280096",
-      "sat": "016800c801e000c802b200c8032a00c803fc00c805280096",
-      "sun": "016800c801e000c802b200c8032a00c803fc00c805280096",
+      "volatility": 1, no plan to implement
+      "targetTemp": 20, implemented; will set mode in ewelink to C
+      "workMode": 1, implemented 1; 1=manual, 2=programmed 3=economical
+      "switch": "on", implemented
+      "temperature": 29, implemented; F will be converted to C
+      "fault": 0, no plan to implemented
+      "workState": 2, implemented 1&2; 1=heating, 2=auto
+      "tempScale": "c", implemented c; no plan to implement f
+      "childLock": "off", no plan to implement
+      "mon": "016800c801e0009602b20096032a009603fc00dc05280096", no
+      "tues": "016800c801e0009602b20096032a009603fc00dc05280096", plans
+      "wed": "016800c801e0009602b20096032a009603fc00dc05280096", to
+      "thur": "016800c801e0009602b20096032a009603fc00dc05280096", implement
+      "fri": "016800c801e0009602b20096032a009603fc00dc05280096", the
+      "sat": "016800c801e000c802b200c8032a00c803fc00c805280096", schedule
+      "sun": "016800c801e000c802b200c8032a00c803fc00c805280096", program
     */
 
     // Add the thermostat service if it doesn't already exist
@@ -103,7 +103,8 @@ module.exports = class deviceThermostat {
       this.cacheTarget = value
       const params = {
         workMode: 1,
-        targetTemp: this.cacheTarget
+        targetTemp: this.cacheTarget,
+        tempScale: 'c'
       }
       await this.platform.sendDeviceUpdate(this.accessory, params)
       if (!this.disableDeviceLogging) {
@@ -159,7 +160,18 @@ module.exports = class deviceThermostat {
       }
 
       if (this.funcs.hasProperty(params, 'temperature')) {
-        const currentTemp = Number(params.temperature) + this.tempOffset
+        let currentTemp
+        if (params.tempScale && params.tempScale === 'f') {
+          // Convert to celcius
+          currentTemp = (Number(params.temperature) - 32) * 5 / 9
+
+          // Round to nearest 0.5
+          currentTemp = Math.round(currentTemp * 2) / 2
+          this.log.warn('[%s] please set mode to celcius from the eWeLink app.', this.name)
+        } else {
+          currentTemp = Number(params.temperature)
+        }
+        currentTemp += this.tempOffset
         if (this.cacheTemp !== currentTemp) {
           this.cacheTemp = currentTemp
           this.service.updateCharacteristic(

From e45f51eb8f681cf44aea59ef0107ea276c46bbf3 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 13 Feb 2021 19:46:45 +0000
Subject: [PATCH 1440/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8884070a..0be8935b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 * Hide WS messages that have no useful information about a device
 * Thermostat accessory simulation will now setup after a small delay to let the accessory initialise first
+* Thermostat device will now suggest changing temperature scale from F to C in the eWeLink app
 * Changes to colour conversion:
   * Lighter colours appear brighter
   * Solid red is now easier to obtain via the Home app

From 8bac6327eb9d7755a182c5800ccf8a5e9f232dbf Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 13 Feb 2021 19:47:42 +0000
Subject: [PATCH 1441/3183] 4.7.3-1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ee82b1af..160e4440 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.7.3-0",
+  "version": "4.7.3-1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 6eb9141d..f829f218 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "4.7.3-0",
+  "version": "4.7.3-1",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 729cf94f59909394766b4b9909a86bfdd962fd1d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 13 Feb 2021 20:04:30 +0000
Subject: [PATCH 1442/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0be8935b..d717ca52 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 All notable changes to this homebridge-ewelink will be documented in this file.
 
-## BETA
+## v4.7.3 (2021-02-13)
 
 ### Changes
 

From e07df629a708dd9d5ffd6845300a72c759fa59c9 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 13 Feb 2021 20:05:08 +0000
Subject: [PATCH 1443/3183] 4.7.3

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 160e4440..e63dd412 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.7.3-1",
+  "version": "4.7.3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index f829f218..099e7a85 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "4.7.3-1",
+  "version": "4.7.3",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From de280c0d54290c258e9ab4c96ab2e51f9fb907c1 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 13 Feb 2021 21:38:37 +0000
Subject: [PATCH 1444/3183] Update fakegato-history.js

---
 lib/fakegato/fakegato-history.js | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/lib/fakegato/fakegato-history.js b/lib/fakegato/fakegato-history.js
index 08d19648..d18727b0 100644
--- a/lib/fakegato/fakegato-history.js
+++ b/lib/fakegato/fakegato-history.js
@@ -9,12 +9,9 @@ const _EPOCH = 978307200
 let homebridge
 let Characteristic, Service
 
-module.exports = function (pHomebridge) {
-  if (pHomebridge && !homebridge) {
-    homebridge = pHomebridge
-    Characteristic = homebridge.hap.Characteristic
-    Service = homebridge.hap.Service
-  }
+module.exports = function (homebridge) {
+  Characteristic = homebridge.hap.Characteristic
+  Service = homebridge.hap.Service
 
   const hexToBase64 = val => {
     return Buffer.from(('' + val).replace(/[^0-9A-F]/ig, ''), 'hex').toString('base64')
@@ -474,7 +471,7 @@ module.exports = function (pHomebridge) {
           homebridge.globalFakeGatoTimer.addData({ entry: entry, service: this })
           break
         case 'custom':
-          if ('power' in entry || 'temp' in entry) {
+          if ('power' in entry || 'temp' in entry || 'humidity' in entry) {
             homebridge.globalFakeGatoTimer.addData({ entry: entry, service: this })
           } else {
             this._addEntry(entry)

From 63a9e20196d0ab50a6a156c04189b31f2936ba8c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 14 Feb 2021 13:34:43 +0000
Subject: [PATCH 1445/3183] Update fakegato-history.js

---
 lib/fakegato/fakegato-history.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/fakegato/fakegato-history.js b/lib/fakegato/fakegato-history.js
index d18727b0..ca8bd50e 100644
--- a/lib/fakegato/fakegato-history.js
+++ b/lib/fakegato/fakegato-history.js
@@ -6,7 +6,6 @@ const Format = require('util').format
 const FakeGatoTimer = require('./fakegato-timer').FakeGatoTimer
 const FakeGatoStorage = require('./fakegato-storage').FakeGatoStorage
 const _EPOCH = 978307200
-let homebridge
 let Characteristic, Service
 
 module.exports = function (homebridge) {

From 21d1dcac6c7e5fa2ade14d038c50684708b4a101 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 15 Feb 2021 08:44:27 +0000
Subject: [PATCH 1446/3183] lighting options

---
 config.schema.json         | 82 +++++++++++++++++++++++++++++++-------
 lib/device/light-colour.js | 18 ++++++++-
 lib/device/light-ctemp.js  | 47 ++++++++++++++++------
 lib/index.js               | 55 +++++++++++++++++++++++--
 lib/utils/constants.js     | 16 +++++---
 5 files changed, 180 insertions(+), 38 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 315bd254..4c4135de 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -37,21 +37,15 @@
         "oneOf": [
           {
             "title": "Auto (Recommended)",
-            "enum": [
-              "auto"
-            ]
+            "enum": ["auto"]
           },
           {
             "title": "Cloud Only",
-            "enum": [
-              "wan"
-            ]
+            "enum": ["wan"]
           },
           {
             "title": "LAN Only",
-            "enum": [
-              "lan"
-            ]
+            "enum": ["lan"]
           }
         ]
       },
@@ -73,6 +67,51 @@
         "type": "boolean",
         "description": "If true, the plugin will remove all accessories and not load the plugin on restart."
       },
+      "lightDevices": {
+        "type": "array",
+        "items": {
+          "type": "object",
+          "properties": {
+            "deviceId": {
+              "type": "string",
+              "title": "Device ID"
+            },
+            "bulbModel": {
+              "type": "string",
+              "title": "Device Model",
+              "description": "If your model is not listed then you do not need to set this.",
+              "oneOf": [
+                {
+                  "title": "B02-B-A60",
+                  "enum": ["bulbB02BA60"]
+                },
+                {
+                  "title": "B02-F-A60",
+                  "enum": ["bulbB02FA60"]
+                },
+                {
+                  "title": "B02-F-ST64",
+                  "enum": ["bulbB02FST64"]
+                }
+              ]
+            },
+            "brightnessStep": {
+              "title": "Brightness Step",
+              "type": "number",
+              "description": "A minimum step for the brightness slider in the Home app. Must be 1 or more.",
+              "placeholder": 1,
+              "minimum": 1
+            },
+            "adaptiveLightingShift": {
+              "title": "Adaptive Lighting Shift",
+              "type": "number",
+              "description": "An adjustment factor for Adaptive Lighting. The mired value for each update will be increased by this setting, making the light appear warmer. A value in the range 50-200 should be appropriate. Must be 0 or more.",
+              "placeholder": 0,
+              "minimum": 0
+            }
+          }
+        }
+      },
       "hideChanFromHB": {
         "type": "string",
         "title": "Hide Light/Switch Channels",
@@ -119,12 +158,6 @@
         "placeholder": 120,
         "minimum": 10
       },
-      "bulbB02BA60": {
-        "type": "string"
-      },
-      "bulbB02FST64": {
-        "type": "string"
-      },
       "thTempOffset": {
         "type": "array",
         "items": {
@@ -408,6 +441,25 @@
         "disablePlugin"
       ]
     },
+    {
+      "key": "lightDevices",
+      "title": "Light Devices",
+      "description": "Applies to bulbs and LED strips.",
+      "expandable": true,
+      "add": "Add Another IP",
+      "type": "array",
+      "items": [
+        {
+          "type": "fieldset",
+          "items": [
+            "lightDevices[].deviceId",
+            "lightDevices[].bulbModel",
+            "lightDevices[].brightnessStep",
+            "lightDevices[].adaptiveLightingShift"
+          ]
+        }
+      ]
+    },
     {
       "type": "fieldset",
       "title": "Device Settings",
diff --git a/lib/device/light-colour.js b/lib/device/light-colour.js
index d609bad0..2605504e 100644
--- a/lib/device/light-colour.js
+++ b/lib/device/light-colour.js
@@ -5,12 +5,12 @@
 module.exports = class deviceLightColour {
   constructor (platform, accessory) {
     // Set up variables from the platform
-    this.colourUtils = platform.colourUtils
     this.consts = platform.consts
     this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
+    this.colourUtils = platform.colourUtils
     this.log = platform.log
     this.messages = platform.messages
     this.platform = platform
@@ -20,6 +20,16 @@ module.exports = class deviceLightColour {
     this.accessory = accessory
     this.isB1 = this.accessory.context.eweUIID === 22
 
+    // Set up custom variables for this device type
+    const deviceId = this.accessory.context.eweDeviceId
+    const deviceConf = platform.lightDevices[deviceId]
+    this.alShift = deviceConf && deviceConf.adaptiveLightingShift
+      ? deviceConf.adaptiveLightingShift
+      : platform.consts.defaultValues.adaptiveLightingShift
+    this.brightStep = deviceConf && deviceConf.brightnessStep
+      ? Math.min(deviceConf.brightnessStep, 100)
+      : platform.consts.defaultValues.brightnessStep
+
     // Add the lightbulb service if it doesn't already exist
     this.service = this.accessory.getService(this.hapServ.Lightbulb) ||
       this.accessory.addService(this.hapServ.Lightbulb)
@@ -31,6 +41,7 @@ module.exports = class deviceLightColour {
     // Add the set handler to the lightbulb brightness characteristic
     this.service.getCharacteristic(this.hapChar.Brightness)
       .on('set', this.internalBrightnessUpdate.bind(this))
+      .setProps({ minStep: this.brightStep })
 
     // Add the set handler to the lightbulb hue characteristic
     this.service.getCharacteristic(this.hapChar.Hue)
@@ -61,7 +72,10 @@ module.exports = class deviceLightColour {
         this.cacheBright = this.service.getCharacteristic(this.hapChar.Brightness).value
 
         // Set up the adaptive lighting controller
-        this.alController = new platform.api.hap.AdaptiveLightingController(this.service)
+        this.alController = new platform.api.hap.AdaptiveLightingController(
+          this.service,
+          { customTemperatureAdjustment: this.alShift }
+        )
         this.accessory.configureController(this.alController)
       }
     }
diff --git a/lib/device/light-ctemp.js b/lib/device/light-ctemp.js
index 82005561..446f97c1 100644
--- a/lib/device/light-ctemp.js
+++ b/lib/device/light-ctemp.js
@@ -18,6 +18,35 @@ module.exports = class deviceLightColour {
     this.name = accessory.displayName
     this.accessory = accessory
 
+    // Set up custom variables for this device type
+    const deviceId = this.accessory.context.eweDeviceId
+    const deviceConf = platform.lightDevices[deviceId]
+    this.model = deviceConf && deviceConf.model
+      ? deviceConf.model
+      : platform.consts.defaultValues.model
+    this.alShift = deviceConf && deviceConf.adaptiveLightingShift
+      ? deviceConf.adaptiveLightingShift
+      : platform.consts.defaultValues.adaptiveLightingShift
+    this.brightStep = deviceConf && deviceConf.brightnessStep
+      ? Math.min(deviceConf.brightnessStep, 100)
+      : platform.consts.defaultValues.brightnessStep
+
+    // Different bulbs have different colour temperature ranges
+    switch (this.model) {
+      case 'bulbB02FST64':
+        this.minK = 1800
+        this.maxK = 5000
+        break
+      case 'bulbB02BA60':
+        this.minK = 2700
+        this.maxK = 6500
+        break
+      default:
+        this.minK = 2200
+        this.maxK = 6500
+        break
+    }
+
     // Add the lightbulb service if it doesn't already exist
     this.service = this.accessory.getService(this.hapServ.Lightbulb) ||
       this.accessory.addService(this.hapServ.Lightbulb)
@@ -29,23 +58,12 @@ module.exports = class deviceLightColour {
     // Add the set handler to the lightbulb brightness characteristic
     this.service.getCharacteristic(this.hapChar.Brightness)
       .on('set', this.internalBrightnessUpdate.bind(this))
+      .setProps({ minStep: this.brightStep })
 
     // Add the set handler to the lightbulb colour temperature characteristic
     this.service.getCharacteristic(this.hapChar.ColorTemperature)
       .on('set', this.internalCTempUpdate.bind(this))
 
-    // Different bulbs have different colour temperature ranges
-    if (platform.config.bulbB02FST64.includes(this.accessory.context.eweDeviceId)) {
-      this.minK = 1800
-      this.maxK = 5000
-    } else if (platform.config.bulbB02BA60.includes(this.accessory.context.eweDeviceId)) {
-      this.minK = 2700
-      this.maxK = 6500
-    } else {
-      this.minK = 2200
-      this.maxK = 6500
-    }
-
     // Set up the adaptive lighting controller if available
     if (
       platform.api.versionGreaterOrEqual &&
@@ -55,7 +73,10 @@ module.exports = class deviceLightColour {
       this.cacheBrightness = this.service.getCharacteristic(this.hapChar.Brightness).value
 
       // Set up the adaptive lighting controller
-      this.alController = new platform.api.hap.AdaptiveLightingController(this.service)
+      this.alController = new platform.api.hap.AdaptiveLightingController(
+        this.service,
+        { customTemperatureAdjustment: this.alShift }
+      )
       this.accessory.configureController(this.alController)
     }
   }
diff --git a/lib/index.js b/lib/index.js
index 5e7e1a2a..7b938f90 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -28,6 +28,7 @@ class eWeLinkPlatform {
       // Initialise these variables before anything else
       this.log = log
       this.api = api
+      this.lightDevices = {}
       this.ipOverride = {}
       this.obstructSwitches = {}
       this.thTempOffset = {}
@@ -133,8 +134,6 @@ class eWeLinkPlatform {
             logIgnore(key)
           }
           break
-        case 'bulbB02BA60':
-        case 'bulbB02FST64':
         case 'hideChanFromHB':
         case 'hideLightFromFan':
         case 'hideSwitchFromTH':
@@ -308,12 +307,62 @@ class eWeLinkPlatform {
             logIgnore(key)
           }
           break
+        case 'lightDevices':
+          if (Array.isArray(val) && val.length > 0) {
+            val.forEach(x => {
+              if (!x.deviceId) {
+                logIgnoreItem(key)
+                return
+              }
+              const deviceId = this.funcs.parseDeviceId(x.deviceId)
+              this.lightDevices[deviceId] = {}
+              for (const [k, v] of Object.entries(x)) {
+                switch (k) {
+                  case 'adaptiveLightingShift':
+                  case 'brightnessStep': {
+                    if (typeof v === 'string') {
+                      logQuotes(key + '.' + k)
+                    }
+                    const intVal = parseInt(v)
+                    if (isNaN(intVal)) {
+                      logDefault(key + '.' + k, this.consts.defaultValues[k])
+                      this.lightDevices[deviceId][k] = this.consts.defaultValues[k]
+                    } else if (intVal < this.consts.minValues[k]) {
+                      logIncrease(key + '.' + k, this.consts.minValues[k])
+                      this.lightDevices[deviceId][k] = this.consts.minValues[k]
+                    } else {
+                      this.lightDevices[deviceId][k] = intVal
+                    }
+                    break
+                  }
+                  case 'deviceId':
+                    break
+                  case 'bulbModel': {
+                    const inSet = this.consts.allowed.bulbModels.includes(v)
+                    if (typeof v !== 'string' || !inSet) {
+                      logIgnore(k)
+                    }
+                    this.lightDevices[deviceId][k] = inSet
+                      ? v
+                      : this.consts.defaultValues[k]
+                    break
+                  }
+                  default:
+                    logRemove(key + '.' + k)
+                    break
+                }
+              }
+            })
+          } else {
+            logIgnore(key)
+          }
+          break
         case 'mode': {
           const inSet = this.consts.allowed.modes.includes(val)
           if (typeof val !== 'string' || !inSet) {
             logIgnore(key)
           }
-          this.config.mode = inSet ? val : 'auto'
+          this.config.mode = inSet ? val : this.consts.defaultValues[key]
           break
         }
         case 'name':
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index f5bd21a3..0f09c361 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -13,6 +13,7 @@ module.exports = {
     debug: false,
     debugFakegato: false,
     disablePlugin: false,
+    lightDevices: [],
     hideChanFromHB: '', // multiDevices{}
     switchAsOutlet: '', // singleDevices{}
     outletAsSwitch: '', // outletDevices{}
@@ -21,8 +22,6 @@ module.exports = {
     hideSwitchFromTH: '', // thDevices{}
     lowBattThreshold: 25, // sensorDevices{}
     sensorTimeDifference: 120, // sensorDevices{}
-    bulbB02BA60: '', // lightDevices{}
-    bulbB02FST64: '', // lightDevices{}
     thTempOffset: [], // thDevices{}
     hideZBLDPress: false, // sensorDevices{}
     ZBDWBatt: false, // sensorDevices{}
@@ -39,7 +38,11 @@ module.exports = {
     sensorTimeLength: 60,
     sensorTimeDifference: 120,
     offset: 0,
-    operationTime: 100
+    operationTime: 100,
+    mode: 'auto',
+    bulbModel: 'bulbB02FA60',
+    brightnessStep: 1,
+    adaptiveLightingShift: 0
   },
 
   minValues: {
@@ -47,7 +50,9 @@ module.exports = {
     lowBattThreshold: 5,
     sensorTimeLength: 1,
     sensorTimeDifference: 10,
-    operationTime: 20
+    operationTime: 20,
+    brightnessStep: 1,
+    adaptiveLightingShift: 0
   },
 
   messages: {
@@ -153,7 +158,8 @@ module.exports = {
     modes: ['auto', 'wan', 'lan'],
     obstructs: ['garage', 'garage_eachen'],
     setups: ['oneSwitch', 'twoSwitch'],
-    sensors: ['water', 'smoke', 'co', 'co2', 'contact', 'occupancy', 'motion']
+    sensors: ['water', 'smoke', 'co', 'co2', 'contact', 'occupancy', 'motion'],
+    bulbModels: ['bulbB02BA60', 'bulbB02FA60', 'bulbB02FST64']
   },
 
   devices: {

From 71d20b5dce17c323882f94d9c2a6daba1e971757 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 15 Feb 2021 08:44:31 +0000
Subject: [PATCH 1447/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d717ca52..448723de 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,15 @@
 
 All notable changes to this homebridge-ewelink will be documented in this file.
 
+## BETA
+
+### Added
+
+* New `lightDevices` configuration option which:
+  * includes a `brightnessStep` option to specify a minimum brightness step in the Home app per light device
+  * includes a `adaptiveLightingShift` option to offset the Adaptive Lighting values per light device
+  * replaces the previous `bulbB02BA60` and `bulbB02FST64` settings
+
 ## v4.7.3 (2021-02-13)
 
 ### Changes

From e22f143e1c7abcb2e6317f3004dfe9129283a910 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 15 Feb 2021 09:33:15 +0000
Subject: [PATCH 1448/3183] overhaul single and multi device settings

---
 config.schema.json     | 82 ++++++++++++++++++++++++++++++------
 lib/index.js           | 95 +++++++++++++++++++++++++++++++++++-------
 lib/utils/constants.js |  4 +-
 3 files changed, 152 insertions(+), 29 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 4c4135de..f013d3f8 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -67,6 +67,40 @@
         "type": "boolean",
         "description": "If true, the plugin will remove all accessories and not load the plugin on restart."
       },
+      "singleDevices": {
+        "type": "array",
+        "items": {
+          "type": "object",
+          "properties": {
+            "deviceId": {
+              "type": "string",
+              "title": "Device ID"
+            },
+            "showAsOutlet": {
+              "type": "boolean",
+              "title": "Show As Outlet",
+              "description": "If true, this accessory will show as an outlet in HomeKit instead of a switch."
+            }
+          }
+        }
+      },
+      "multiDevices": {
+        "type": "array",
+        "items": {
+          "type": "object",
+          "properties": {
+            "deviceId": {
+              "type": "string",
+              "title": "Device ID"
+            },
+            "hideChannels": {
+              "type": "string",
+              "title": "Hide Channels",
+              "description": "A comma separated list of channels to hide for this device. For example '0' or '0,1,2'."
+            }
+          }
+        }
+      },
       "lightDevices": {
         "type": "array",
         "items": {
@@ -112,16 +146,6 @@
           }
         }
       },
-      "hideChanFromHB": {
-        "type": "string",
-        "title": "Hide Light/Switch Channels",
-        "description": "A list of light/switch channels to hide. For example 10009553c8SW0 or multiple separated by a comma."
-      },
-      "switchAsOutlet": {
-        "type": "string",
-        "title": "Switch As Outlet",
-        "description": "A list of switch devices to show as outlets. For example 10009553c8 or multiple separated by a comma."
-      },
       "outletAsSwitch": {
         "type": "string",
         "title": "Outlet As Switch",
@@ -441,12 +465,46 @@
         "disablePlugin"
       ]
     },
+    {
+      "key": "singleDevices",
+      "title": "Single Channel Devices",
+      "description": "Applies to single-channel switch and light switch devices.",
+      "expandable": true,
+      "add": "Add Another Device",
+      "type": "array",
+      "items": [
+        {
+          "type": "fieldset",
+          "items": [
+            "singleDevices[].deviceId",
+            "singleDevices[].showAsOutlet"
+          ]
+        }
+      ]
+    },
+    {
+      "key": "multiDevices",
+      "title": "Multi Channel Devices",
+      "description": "Applies to multi-channel switch and light switch devices.",
+      "expandable": true,
+      "add": "Add Another Device",
+      "type": "array",
+      "items": [
+        {
+          "type": "fieldset",
+          "items": [
+            "multiDevices[].deviceId",
+            "multiDevices[].hideChannels"
+          ]
+        }
+      ]
+    },
     {
       "key": "lightDevices",
       "title": "Light Devices",
       "description": "Applies to bulbs and LED strips.",
       "expandable": true,
-      "add": "Add Another IP",
+      "add": "Add Another Device",
       "type": "array",
       "items": [
         {
@@ -465,8 +523,6 @@
       "title": "Device Settings",
       "expandable": true,
       "items": [
-        "hideChanFromHB",
-        "switchAsOutlet",
         "outletAsSwitch",
         "inUsePowerThreshold",
         "hideLightFromFan",
diff --git a/lib/index.js b/lib/index.js
index 7b938f90..3fc35598 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -29,6 +29,10 @@ class eWeLinkPlatform {
       this.log = log
       this.api = api
       this.lightDevices = {}
+      this.singleDevices = {}
+      this.multiDevices = {}
+      this.hideChannels = []
+      this.hideMasters = []
       this.ipOverride = {}
       this.obstructSwitches = {}
       this.thTempOffset = {}
@@ -134,11 +138,9 @@ class eWeLinkPlatform {
             logIgnore(key)
           }
           break
-        case 'hideChanFromHB':
         case 'hideLightFromFan':
         case 'hideSwitchFromTH':
         case 'outletAsSwitch':
-        case 'switchAsOutlet':
           this.config[key] = []
           if (typeof val !== 'string' || val === '') {
             logIgnore(key)
@@ -293,8 +295,9 @@ class eWeLinkPlatform {
                   case 'deviceIP': {
                     if (typeof v !== 'string' || v === '') {
                       logIgnore(key + '.' + k)
+                    } else {
+                      this.ipOverride[deviceId] = v
                     }
-                    this.ipOverride[deviceId] = v
                     break
                   }
                   default:
@@ -341,10 +344,11 @@ class eWeLinkPlatform {
                     const inSet = this.consts.allowed.bulbModels.includes(v)
                     if (typeof v !== 'string' || !inSet) {
                       logIgnore(k)
+                    } else {
+                      this.lightDevices[deviceId][k] = inSet
+                        ? v
+                        : this.consts.defaultValues[k]
                     }
-                    this.lightDevices[deviceId][k] = inSet
-                      ? v
-                      : this.consts.defaultValues[k]
                     break
                   }
                   default:
@@ -365,6 +369,42 @@ class eWeLinkPlatform {
           this.config.mode = inSet ? val : this.consts.defaultValues[key]
           break
         }
+        case 'multiDevices':
+          if (Array.isArray(val) && val.length > 0) {
+            val.forEach(x => {
+              if (!x.deviceId) {
+                logIgnoreItem(key)
+                return
+              }
+              const deviceId = this.funcs.parseDeviceId(x.deviceId)
+              this.multiDevices[deviceId] = {}
+              for (const [k, v] of Object.entries(x)) {
+                switch (k) {
+                  case 'deviceId':
+                    break
+                  case 'hideChannels': {
+                    if (typeof v !== 'string' || v === '') {
+                      logIgnore(key + '.' + k)
+                    } else {
+                      const channels = v.split(',')
+                      channels.forEach(channel => {
+                        this.hideChannels.push(
+                          deviceId + 'SW' + channel.replace(/[^0-9]+/g, '')
+                        )
+                      })
+                    }
+                    break
+                  }
+                  default:
+                    logRemove(key + '.' + k)
+                    break
+                }
+              }
+            })
+          } else {
+            logIgnore(key)
+          }
+          break
         case 'name':
         case 'platform':
         case 'plugin_map':
@@ -375,6 +415,35 @@ class eWeLinkPlatform {
           }
           this.config.password = val
           break
+        case 'singleDevices':
+          if (Array.isArray(val) && val.length > 0) {
+            val.forEach(x => {
+              if (!x.deviceId) {
+                logIgnoreItem(key)
+                return
+              }
+              const deviceId = this.funcs.parseDeviceId(x.deviceId)
+              this.singleDevices[deviceId] = {}
+              for (const [k, v] of Object.entries(x)) {
+                switch (k) {
+                  case 'deviceId':
+                    break
+                  case 'showAsOutlet':
+                    if (typeof val === 'string') {
+                      logQuotes(k)
+                    }
+                    this.singleDevices[deviceId][k] = v === 'false' ? false : !!v
+                    break
+                  default:
+                    logRemove(key + '.' + k)
+                    break
+                }
+              }
+            })
+          } else {
+            logIgnore(key)
+          }
+          break
         case 'thTempOffset':
           if (Array.isArray(val) && val.length > 0) {
             val.forEach(x => {
@@ -433,9 +502,6 @@ class eWeLinkPlatform {
       // Log that the plugin initialisation has been successful
       this.log('[v%s] %s.', PLUGIN.version, this.messages.initialised)
 
-      // Set up further global variables
-      this.hiddenMasters = []
-
       // Require any libraries that the plugin uses
       this.axios = require('axios')
       this.crypto = require('crypto')
@@ -846,7 +912,8 @@ class eWeLinkPlatform {
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
           : this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = this.config.switchAsOutlet.includes(device.deviceid)
+        accessory.control = this.singleDevices[device.deviceid] &&
+          this.singleDevices[device.deviceid].showAsOutlet
           ? new (require('./device/outlet'))(this, accessory)
           : new (require('./device/switch-single'))(this, accessory)
         /***********************/
@@ -856,7 +923,7 @@ class eWeLinkPlatform {
         ***********************/
         for (let i = 0; i <= this.consts.chansFromUiid[device.extra.uiid]; i++) {
           // Check if the user has chosen to hide any channels for this device
-          if (this.config.hideChanFromHB.includes(device.deviceid + 'sw' + i)) {
+          if (this.hideChannels.includes(device.deviceid + 'SW' + i)) {
             // The user has hidden this channel so if it exists then remove it
             if (this.devicesInHB.has(device.deviceid + 'SW' + i)) {
               this.removeAccessory(this.devicesInHB.get(device.deviceid + 'SW' + i))
@@ -864,7 +931,7 @@ class eWeLinkPlatform {
 
             // If this is the main channel then add it to the array of hidden masters
             if (i === 0) {
-              this.hiddenMasters.push(device.deviceid)
+              this.hideMasters.push(device.deviceid)
             }
 
             // Add the sub accessory, but hidden, to Homebridge
@@ -930,7 +997,7 @@ class eWeLinkPlatform {
         accessory.control = new (require('./device/rf-bridge'))(this, accessory)
 
         // We don't want to add the main bridge as an accessory in Homebridge
-        this.hiddenMasters.push(device.deviceid)
+        this.hideMasters.push(device.deviceid)
 
         // Loop through each sub device connected to the RF Bridge
         rfMap.forEach(subDevice => {
@@ -1104,7 +1171,7 @@ class eWeLinkPlatform {
 
       // Update the current firmware version if the accessory isn't hidden
       if (
-        !this.hiddenMasters.includes(device.deviceid) &&
+        !this.hideMasters.includes(device.deviceid) &&
         !this.obstructSwitches[device.deviceid]
       ) {
         accessory.getService(this.api.hap.Service.AccessoryInformation)
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 0f09c361..01eb747a 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -13,9 +13,9 @@ module.exports = {
     debug: false,
     debugFakegato: false,
     disablePlugin: false,
+    singleDevices: [],
+    multiDevices: [],
     lightDevices: [],
-    hideChanFromHB: '', // multiDevices{}
-    switchAsOutlet: '', // singleDevices{}
     outletAsSwitch: '', // outletDevices{}
     inUsePowerThreshold: 0, // outletDevices{}
     hideLightFromFan: '', // fanDevices{}

From dd556787febd9e4783603e97ccd61572949aab68 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 15 Feb 2021 09:45:38 +0000
Subject: [PATCH 1449/3183] overhaul fan device settings

---
 config.schema.json     | 40 ++++++++++++++++++++++++++++++++++------
 lib/device/fan.js      |  8 ++++++--
 lib/index.js           | 31 ++++++++++++++++++++++++++++++-
 lib/utils/constants.js |  2 +-
 4 files changed, 71 insertions(+), 10 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index f013d3f8..3d0582ef 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -146,6 +146,23 @@
           }
         }
       },
+      "fanDevices": {
+        "type": "array",
+        "items": {
+          "type": "object",
+          "properties": {
+            "deviceId": {
+              "type": "string",
+              "title": "Device ID"
+            },
+            "hideLight": {
+              "type": "boolean",
+              "title": "Hide Light Switch",
+              "description": "If true, the light switch will be hidden from HomeKit."
+            }
+          }
+        }
+      },
       "outletAsSwitch": {
         "type": "string",
         "title": "Outlet As Switch",
@@ -158,11 +175,6 @@
         "placeholder": 0,
         "minimum": 0
       },
-      "hideLightFromFan": {
-        "type": "string",
-        "title": "Hide Fan Lights",
-        "description": "A list of iFan devices for which the light will be hidden. For example 10009553c8 or multiple separated by a comma."
-      },
       "hideSwitchFromTH": {
         "type": "string",
         "title": "Hide TH10/16 Switches",
@@ -518,6 +530,23 @@
         }
       ]
     },
+    {
+      "key": "fanDevices",
+      "title": "Fan Devices",
+      "description": "Applies to iFan devices.",
+      "expandable": true,
+      "add": "Add Another Device",
+      "type": "array",
+      "items": [
+        {
+          "type": "fieldset",
+          "items": [
+            "fanDevices[].deviceId",
+            "fanDevices[].hideLight"
+          ]
+        }
+      ]
+    },
     {
       "type": "fieldset",
       "title": "Device Settings",
@@ -525,7 +554,6 @@
       "items": [
         "outletAsSwitch",
         "inUsePowerThreshold",
-        "hideLightFromFan",
         "hideSwitchFromTH",
         "lowBattThreshold",
         "sensorTimeDifference"
diff --git a/lib/device/fan.js b/lib/device/fan.js
index 94ee5f45..6bd79e51 100644
--- a/lib/device/fan.js
+++ b/lib/device/fan.js
@@ -18,6 +18,11 @@ module.exports = class deviceFan {
     this.name = accessory.displayName
     this.accessory = accessory
 
+    // Set up custom variables for this device type
+    const deviceId = this.accessory.context.eweDeviceId
+    const deviceConf = platform.lightDevices[deviceId]
+    this.hideLight = deviceConf && deviceConf.hideLight
+
     // Add the fan service if it doesn't already exist
     this.service = this.accessory.getService(this.hapServ.Fan) ||
       this.accessory.addService(this.hapServ.Fan)
@@ -37,8 +42,7 @@ module.exports = class deviceFan {
       .setProps({ minStep: 33 })
 
     // Check to see if the user has hidden the light channel
-    const eweId = this.accessory.context.eweDeviceId
-    if (this.platform.config.hideLightFromFan.includes(eweId)) {
+    if (this.hideLight) {
       // The user has hidden the light channel, so remove it if it exists
       if (this.accessory.getService(this.hapServ.Lightbulb)) {
         this.accessory.removeService(this.accessory.getService(this.hapServ.Lightbulb))
diff --git a/lib/index.js b/lib/index.js
index 3fc35598..e3b941a8 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -28,6 +28,7 @@ class eWeLinkPlatform {
       // Initialise these variables before anything else
       this.log = log
       this.api = api
+      this.fanDevices = {}
       this.lightDevices = {}
       this.singleDevices = {}
       this.multiDevices = {}
@@ -138,7 +139,6 @@ class eWeLinkPlatform {
             logIgnore(key)
           }
           break
-        case 'hideLightFromFan':
         case 'hideSwitchFromTH':
         case 'outletAsSwitch':
           this.config[key] = []
@@ -170,6 +170,35 @@ class eWeLinkPlatform {
           }
           this.config[key] = val === 'false' ? false : !!val
           break
+        case 'fanDevices':
+          if (Array.isArray(val) && val.length > 0) {
+            val.forEach(x => {
+              if (!x.deviceId) {
+                logIgnoreItem(key)
+                return
+              }
+              const deviceId = this.funcs.parseDeviceId(x.deviceId)
+              this.fanDevices[deviceId] = {}
+              for (const [k, v] of Object.entries(x)) {
+                switch (k) {
+                  case 'deviceId':
+                    break
+                  case 'hideLight':
+                    if (typeof val === 'string') {
+                      logQuotes(k)
+                    }
+                    this.fanDevices[deviceId][k] = v === 'false' ? false : !!v
+                    break
+                  default:
+                    logRemove(key + '.' + k)
+                    break
+                }
+              }
+            })
+          } else {
+            logIgnore(key)
+          }
+          break
         case 'groups':
           if (Array.isArray(val) && val.length > 0) {
             val.forEach(x => {
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 01eb747a..666cb374 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -16,9 +16,9 @@ module.exports = {
     singleDevices: [],
     multiDevices: [],
     lightDevices: [],
+    fanDevices: [],
     outletAsSwitch: '', // outletDevices{}
     inUsePowerThreshold: 0, // outletDevices{}
-    hideLightFromFan: '', // fanDevices{}
     hideSwitchFromTH: '', // thDevices{}
     lowBattThreshold: 25, // sensorDevices{}
     sensorTimeDifference: 120, // sensorDevices{}

From f5652950e669a6daab0e05e7bd5282d70913e881 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 15 Feb 2021 10:02:50 +0000
Subject: [PATCH 1450/3183] overhaul outlet device settings

---
 config.schema.json     | 59 ++++++++++++++++++++++++++++++++----------
 lib/device/fan.js      |  2 +-
 lib/device/outlet.js   |  6 ++++-
 lib/device/usb.js      |  7 ++++-
 lib/index.js           | 53 ++++++++++++++++++++++++++++++++++---
 lib/utils/constants.js |  3 +--
 6 files changed, 107 insertions(+), 23 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 3d0582ef..2c52a0ec 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -101,6 +101,33 @@
           }
         }
       },
+      "outletDevices": {
+        "type": "array",
+        "items": {
+          "type": "object",
+          "properties": {
+            "deviceId": {
+              "type": "string",
+              "title": "Device ID"
+            },
+            "showAsSwitch": {
+              "type": "boolean",
+              "title": "Show As Switch",
+              "description": "If true, this accessory will show as a switch in HomeKit instead of an outlet."
+            },
+            "inUsePowerThreshold": {
+              "type": "number",
+              "title": "Outlet 'In Use' Threshold",
+              "description": "HomeKit will set the 'In Use' status of outlet devices to true when the wattage is above this number. Must be 0 or more.",
+              "placeholder": 0,
+              "minimum": 0,
+              "condition": {
+                "functionBody": "return (model.outletDevices[arrayIndices] && !model.outletDevices[arrayIndices].showAsSwitch)"
+              }
+            }
+          }
+        }
+      },
       "lightDevices": {
         "type": "array",
         "items": {
@@ -163,18 +190,6 @@
           }
         }
       },
-      "outletAsSwitch": {
-        "type": "string",
-        "title": "Outlet As Switch",
-        "description": "A list of outlet devices to show as switches. For example 10009553c8 or multiple separated by a comma."
-      },
-      "inUsePowerThreshold": {
-        "type": "number",
-        "title": "Outlet 'In Use' Threshold",
-        "description": "HomeKit will set the 'In Use' status of outlet devices to true when the wattage is above this number. Must be 0 or more.",
-        "placeholder": 0,
-        "minimum": 0
-      },
       "hideSwitchFromTH": {
         "type": "string",
         "title": "Hide TH10/16 Switches",
@@ -511,6 +526,24 @@
         }
       ]
     },
+    {
+      "key": "outletDevices",
+      "title": "Outlet Devices",
+      "description": "Applies to outlet devices.",
+      "expandable": true,
+      "add": "Add Another Device",
+      "type": "array",
+      "items": [
+        {
+          "type": "fieldset",
+          "items": [
+            "outletDevices[].deviceId",
+            "outletDevices[].showAsSwitch",
+            "outletDevices[].inUsePowerThreshold"
+          ]
+        }
+      ]
+    },
     {
       "key": "lightDevices",
       "title": "Light Devices",
@@ -552,8 +585,6 @@
       "title": "Device Settings",
       "expandable": true,
       "items": [
-        "outletAsSwitch",
-        "inUsePowerThreshold",
         "hideSwitchFromTH",
         "lowBattThreshold",
         "sensorTimeDifference"
diff --git a/lib/device/fan.js b/lib/device/fan.js
index 6bd79e51..3e83402d 100644
--- a/lib/device/fan.js
+++ b/lib/device/fan.js
@@ -20,7 +20,7 @@ module.exports = class deviceFan {
 
     // Set up custom variables for this device type
     const deviceId = this.accessory.context.eweDeviceId
-    const deviceConf = platform.lightDevices[deviceId]
+    const deviceConf = platform.fanDevices[deviceId]
     this.hideLight = deviceConf && deviceConf.hideLight
 
     // Add the fan service if it doesn't already exist
diff --git a/lib/device/outlet.js b/lib/device/outlet.js
index a4e5bb38..ba44ddb9 100644
--- a/lib/device/outlet.js
+++ b/lib/device/outlet.js
@@ -19,7 +19,11 @@ module.exports = class deviceOutlet {
     this.accessory = accessory
 
     // Set up custom variables for this device type
-    this.inUsePowerThreshold = this.platform.config.inUsePowerThreshold
+    const deviceId = this.accessory.context.eweDeviceId
+    const deviceConf = platform.outletDevices[deviceId]
+    this.inUsePowerThreshold = deviceConf && deviceConf.inUsePowerThreshold
+      ? deviceConf.inUsePowerThreshold
+      : platform.consts.defaultValues.inUsePowerThreshold
 
     // Set up the custom Eve characteristics for this device type
     this.inherits = require('util').inherits
diff --git a/lib/device/usb.js b/lib/device/usb.js
index cb782ef7..a96085cf 100644
--- a/lib/device/usb.js
+++ b/lib/device/usb.js
@@ -18,8 +18,13 @@ module.exports = class deviceUSB {
     this.name = accessory.displayName
     this.accessory = accessory
 
+    // Set up custom variables for this device type
+    const deviceId = this.accessory.context.eweDeviceId
+    const deviceConf = platform.outletDevices[deviceId]
+    this.showAsSwitch = deviceConf && deviceConf.showAsSwitch
+
     // Check if the user has overridden how this accessory should appear
-    if (platform.config.outletAsSwitch.includes(this.accessory.context.eweDeviceId)) {
+    if (this.showAsSwitch) {
       // User has chosen switch so if the accessory has an outlet service then remove it
       if (this.accessory.getService(this.hapServ.Outlet)) {
         this.accessory.removeService(this.accessory.getService(this.hapServ.Outlet))
diff --git a/lib/index.js b/lib/index.js
index e3b941a8..181e8598 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -30,8 +30,9 @@ class eWeLinkPlatform {
       this.api = api
       this.fanDevices = {}
       this.lightDevices = {}
-      this.singleDevices = {}
       this.multiDevices = {}
+      this.outletDevices = {}
+      this.singleDevices = {}
       this.hideChannels = []
       this.hideMasters = []
       this.ipOverride = {}
@@ -140,7 +141,6 @@ class eWeLinkPlatform {
           }
           break
         case 'hideSwitchFromTH':
-        case 'outletAsSwitch':
           this.config[key] = []
           if (typeof val !== 'string' || val === '') {
             logIgnore(key)
@@ -291,7 +291,6 @@ class eWeLinkPlatform {
           }
           break
         }
-        case 'inUsePowerThreshold':
         case 'lowBattThreshold':
         case 'sensorTimeDifference': {
           if (typeof val === 'string') {
@@ -434,6 +433,51 @@ class eWeLinkPlatform {
             logIgnore(key)
           }
           break
+        case 'outletDevices':
+          if (Array.isArray(val) && val.length > 0) {
+            val.forEach(x => {
+              if (!x.deviceId) {
+                logIgnoreItem(key)
+                return
+              }
+              const deviceId = this.funcs.parseDeviceId(x.deviceId)
+              this.outletDevices[deviceId] = {}
+              for (const [k, v] of Object.entries(x)) {
+                switch (k) {
+                  case 'deviceId':
+                    break
+                  case 'inUsePowerThreshold': {
+                    if (typeof v === 'string') {
+                      logQuotes(k)
+                    }
+                    const intVal = parseInt(v)
+                    if (isNaN(intVal)) {
+                      logDefault(key + '.' + k, this.consts.defaultValues[k])
+                      this.outletDevices[deviceId][k] = this.consts.defaultValues[k]
+                    } else if (intVal < this.consts.minValues[k]) {
+                      logIncrease(key + '.' + k, this.consts.minValues[k])
+                      this.outletDevices[deviceId][k] = this.consts.minValues[k]
+                    } else {
+                      this.outletDevices[deviceId][k] = intVal
+                    }
+                    break
+                  }
+                  case 'showAsSwitch':
+                    if (typeof val === 'string') {
+                      logQuotes(k)
+                    }
+                    this.outletDevices[deviceId][k] = v === 'false' ? false : !!v
+                    break
+                  default:
+                    logRemove(key + '.' + k)
+                    break
+                }
+              }
+            })
+          } else {
+            logIgnore(key)
+          }
+          break
         case 'name':
         case 'platform':
         case 'plugin_map':
@@ -885,7 +929,8 @@ class eWeLinkPlatform {
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
           : this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = this.config.outletAsSwitch.includes(device.deviceid)
+        accessory.control = this.outletDevices[device.deviceid] &&
+          this.outletDevices[device.deviceid].showAsSwitch
           ? new (require('./device/switch-single'))(this, accessory)
           : new (require('./device/outlet'))(this, accessory)
         /*****/
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 666cb374..49504e07 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -17,8 +17,7 @@ module.exports = {
     multiDevices: [],
     lightDevices: [],
     fanDevices: [],
-    outletAsSwitch: '', // outletDevices{}
-    inUsePowerThreshold: 0, // outletDevices{}
+    outletDevices: [],
     hideSwitchFromTH: '', // thDevices{}
     lowBattThreshold: 25, // sensorDevices{}
     sensorTimeDifference: 120, // sensorDevices{}

From 3b799fba9e591798ee4dd04b5342acbf97a5b43e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 15 Feb 2021 10:39:21 +0000
Subject: [PATCH 1451/3183] overhaul thermostat settings

---
 config.schema.json                  | 61 +++++++++++++++++++----------
 lib/device/sensor-ambient.js        | 11 ++++--
 lib/device/simulation/thermostat.js |  7 +++-
 lib/device/thermostat.js            |  7 +++-
 lib/index.js                        | 28 ++++++-------
 lib/utils/constants.js              |  5 +--
 6 files changed, 72 insertions(+), 47 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 2c52a0ec..7fd5625a 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -173,6 +173,29 @@
           }
         }
       },
+      "thDevices": {
+        "type": "array",
+        "items": {
+          "type": "object",
+          "properties": {
+            "deviceId": {
+              "type": "string",
+              "title": "Device ID"
+            },
+            "hideSwitch": {
+              "type": "boolean",
+              "title": "Hide Switch",
+              "description": "If true, this accessory will hide the TH10/16 switch from HomeKit."
+            },
+            "offset": {
+              "type": "number",
+              "title": "Temperature Offset",
+              "description": "You can offset the temperature that the sensor reads. An offset of 2 means 2 degrees will be added to the recorded temperature. Can be positive or negative and can include a decimal point '.',
+              "placeholder": 0
+            }
+          }
+        }
+      },
       "fanDevices": {
         "type": "array",
         "items": {
@@ -190,11 +213,6 @@
           }
         }
       },
-      "hideSwitchFromTH": {
-        "type": "string",
-        "title": "Hide TH10/16 Switches",
-        "description": "A list of TH10/TH16 devices for which the switch will be hidden. For example 10009553c8 or multiple separated by a comma."
-      },
       "lowBattThreshold": {
         "type": "number",
         "title": "Low Battery Threshold",
@@ -209,20 +227,6 @@
         "placeholder": 120,
         "minimum": 10
       },
-      "thTempOffset": {
-        "type": "array",
-        "items": {
-          "type": "object",
-          "properties": {
-            "deviceId": {
-              "type": "string"
-            },
-            "offset": {
-              "type": "number"
-            }
-          }
-        }
-      },
       "hideZBLDPress": {
         "type": "boolean"
       },
@@ -563,6 +567,24 @@
         }
       ]
     },
+    {
+      "key": "thDevices",
+      "title": "Thermostat Devices",
+      "description": "Applies to thermostat devices and the TH10/16.",
+      "expandable": true,
+      "add": "Add Another Device",
+      "type": "array",
+      "items": [
+        {
+          "type": "fieldset",
+          "items": [
+            "thDevices[].deviceId",
+            "thDevices[].hideSwitch",
+            "thDevices[].offset"
+          ]
+        }
+      ]
+    },
     {
       "key": "fanDevices",
       "title": "Fan Devices",
@@ -585,7 +607,6 @@
       "title": "Device Settings",
       "expandable": true,
       "items": [
-        "hideSwitchFromTH",
         "lowBattThreshold",
         "sensorTimeDifference"
       ]
diff --git a/lib/device/sensor-ambient.js b/lib/device/sensor-ambient.js
index 982f8da6..6e764820 100644
--- a/lib/device/sensor-ambient.js
+++ b/lib/device/sensor-ambient.js
@@ -19,9 +19,12 @@ module.exports = class deviceSensorAmbient {
     this.accessory = accessory
 
     // Set up custom variables for this device type
-    const eweId = this.accessory.context.eweDeviceId
-    this.tempOffset = Number(platform.thTempOffset[eweId] || 0)
-    this.hideSwitch = this.platform.config.hideSwitchFromTH.includes(eweId)
+    const deviceId = this.accessory.context.eweDeviceId
+    const deviceConf = platform.thDevices[deviceId]
+    this.hideSwitch = deviceConf && deviceConf.hideSwitch
+    this.tempOffset = deviceConf && deviceConf.offset
+      ? deviceConf.offset
+      : platform.consts.defaultValues.offset
 
     // If the accessory has a thermostat service then remove it
     if (this.accessory.getService(this.hapServ.Thermostat)) {
@@ -29,7 +32,7 @@ module.exports = class deviceSensorAmbient {
     }
 
     // The user can choose to hide the switch service if they desire
-    if (this.platform.config.hideSwitchFromTH.includes(eweId)) {
+    if (this.hideSwitch) {
       // User has hidden the switch service so remove it if it exists
       if (this.accessory.getService(this.hapServ.Switch)) {
         this.accessory.removeService(this.accessory.getService(this.hapServ.Switch))
diff --git a/lib/device/simulation/thermostat.js b/lib/device/simulation/thermostat.js
index d9bf80ac..bf6b7013 100644
--- a/lib/device/simulation/thermostat.js
+++ b/lib/device/simulation/thermostat.js
@@ -19,8 +19,11 @@ module.exports = class deviceThermostat {
     this.accessory = accessory
 
     // Set up custom variables for this device type
-    const eweId = this.accessory.context.eweDeviceId
-    this.tempOffset = Number(platform.thTempOffset[eweId] || 0)
+    const deviceId = this.accessory.context.eweDeviceId
+    const deviceConf = platform.thDevices[deviceId]
+    this.tempOffset = deviceConf && deviceConf.offset
+      ? deviceConf.offset
+      : platform.consts.defaultValues.offset
 
     // If the accessory has a switch service then remove it
     if (this.accessory.getService(this.hapServ.Switch)) {
diff --git a/lib/device/thermostat.js b/lib/device/thermostat.js
index 170d3fc8..6e16729a 100644
--- a/lib/device/thermostat.js
+++ b/lib/device/thermostat.js
@@ -19,8 +19,11 @@ module.exports = class deviceThermostat {
     this.accessory = accessory
 
     // Set up custom variables for this device type
-    const eweId = this.accessory.context.eweDeviceId
-    this.tempOffset = Number(platform.thTempOffset[eweId] || 0)
+    const deviceId = this.accessory.context.eweDeviceId
+    const deviceConf = platform.thDevices[deviceId]
+    this.tempOffset = deviceConf && deviceConf.offset
+      ? deviceConf.offset
+      : platform.consts.defaultValues.offset
 
     /*
       **************
diff --git a/lib/index.js b/lib/index.js
index 181e8598..f0cd3f42 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -33,11 +33,11 @@ class eWeLinkPlatform {
       this.multiDevices = {}
       this.outletDevices = {}
       this.singleDevices = {}
+      this.thDevices = {}
       this.hideChannels = []
       this.hideMasters = []
       this.ipOverride = {}
       this.obstructSwitches = {}
-      this.thTempOffset = {}
       this.simulations = {}
       this.rfSensors = {}
 
@@ -140,17 +140,6 @@ class eWeLinkPlatform {
             logIgnore(key)
           }
           break
-        case 'hideSwitchFromTH':
-          this.config[key] = []
-          if (typeof val !== 'string' || val === '') {
-            logIgnore(key)
-          } else {
-            const items = val.split(',')
-            items.forEach(item => {
-              this.config[key].push(this.funcs.parseDeviceId(item))
-            })
-          }
-          break
         case 'countryCode': {
           if (!val) {
             throw new Error(this.messages.missingCC)
@@ -517,7 +506,7 @@ class eWeLinkPlatform {
             logIgnore(key)
           }
           break
-        case 'thTempOffset':
+        case 'thDevices':
           if (Array.isArray(val) && val.length > 0) {
             val.forEach(x => {
               if (!x.deviceId) {
@@ -525,19 +514,26 @@ class eWeLinkPlatform {
                 return
               }
               const deviceId = this.funcs.parseDeviceId(x.deviceId)
+              this.thDevices[deviceId] = {}
               for (const [k, v] of Object.entries(x)) {
                 switch (k) {
                   case 'deviceId':
                     break
+                  case 'hideSwitch':
+                    if (typeof val === 'string') {
+                      logQuotes(k)
+                    }
+                    this.thDevices[deviceId][k] = v === 'false' ? false : !!v
+                    break
                   case 'offset': {
                     if (typeof v === 'string') {
                       logQuotes(key + '.' + k)
                     }
-                    const intVal = Number(v)
-                    if (isNaN(intVal)) {
+                    const numVal = Number(v)
+                    if (isNaN(numVal)) {
                       logIgnore(key + '.' + k)
                     } else {
-                      this.thTempOffset[deviceId] = intVal
+                      this.thDevices[deviceId][k] = numVal
                     }
                     break
                   }
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 49504e07..80f14e62 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -15,13 +15,12 @@ module.exports = {
     disablePlugin: false,
     singleDevices: [],
     multiDevices: [],
+    outletDevices: [],
     lightDevices: [],
+    thDevices: [],
     fanDevices: [],
-    outletDevices: [],
-    hideSwitchFromTH: '', // thDevices{}
     lowBattThreshold: 25, // sensorDevices{}
     sensorTimeDifference: 120, // sensorDevices{}
-    thTempOffset: [], // thDevices{}
     hideZBLDPress: false, // sensorDevices{}
     ZBDWBatt: false, // sensorDevices{}
     groups: [],

From 40dc787d048fd5c0cb231a4addc4ab0462d3df05 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 15 Feb 2021 12:19:36 +0000
Subject: [PATCH 1452/3183] overhaul zigbee settings

---
 config.schema.json                    | 48 +++++++++++++++++++++++----
 lib/device/zigbee/sensor-contact.js   |  5 ++-
 lib/device/zigbee/switch-stateless.js | 10 +++---
 lib/index.js                          | 33 ++++++++++++++++--
 lib/utils/constants.js                |  3 +-
 5 files changed, 83 insertions(+), 16 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 7fd5625a..753fd6ee 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -190,7 +190,7 @@
             "offset": {
               "type": "number",
               "title": "Temperature Offset",
-              "description": "You can offset the temperature that the sensor reads. An offset of 2 means 2 degrees will be added to the recorded temperature. Can be positive or negative and can include a decimal point '.',
+              "description": "You can offset the temperature that the sensor reads. An offset of 2 means 2 degrees will be added to the recorded temperature. Can be positive or negative and can include a decimal point '.'",
               "placeholder": 0
             }
           }
@@ -213,6 +213,28 @@
           }
         }
       },
+      "zigbeeDevices": {
+        "type": "array",
+        "items": {
+          "type": "object",
+          "properties": {
+            "deviceId": {
+              "type": "string",
+              "title": "Device ID"
+            },
+            "hideLongDouble": {
+              "type": "boolean",
+              "title": "Hide Light Switch",
+              "description": "If true, double and long press options will be hidden for this Zigbee Button."
+            },
+            "scaleBattery": {
+              "type": "boolean",
+              "title": "Hide Light Switch",
+              "description": "If true, the battery reading for this Zigbee Contact Sensor will be multiplied by 33."
+            }
+          }
+        }
+      },
       "lowBattThreshold": {
         "type": "number",
         "title": "Low Battery Threshold",
@@ -227,12 +249,6 @@
         "placeholder": 120,
         "minimum": 10
       },
-      "hideZBLDPress": {
-        "type": "boolean"
-      },
-      "ZBDWBatt": {
-        "type": "boolean"
-      },
       "groups": {
         "type": "array",
         "items": {
@@ -602,6 +618,24 @@
         }
       ]
     },
+    {
+      "key": "zigbeeDevices",
+      "title": "Zigbee Devices",
+      "description": "Applies to Zigbee devices.",
+      "expandable": true,
+      "add": "Add Another Device",
+      "type": "array",
+      "items": [
+        {
+          "type": "fieldset",
+          "items": [
+            "zigbeeDevices[].deviceId",
+            "zigbeeDevices[].hideLongDouble",
+            "zigbeeDevices[].scaleBattery"
+          ]
+        }
+      ]
+    },
     {
       "type": "fieldset",
       "title": "Device Settings",
diff --git a/lib/device/zigbee/sensor-contact.js b/lib/device/zigbee/sensor-contact.js
index b19c97e9..69fa4934 100644
--- a/lib/device/zigbee/sensor-contact.js
+++ b/lib/device/zigbee/sensor-contact.js
@@ -19,6 +19,9 @@ module.exports = class deviceZBSensorContact {
     this.accessory = accessory
 
     // Set up custom variables for this device type
+    const deviceId = this.accessory.context.eweDeviceId
+    const deviceConf = platform.zigbeeDevices[deviceId]
+    this.scaleBattery = deviceConf && deviceConf.scaleBattery
     this.lowBattThreshold = this.platform.config.lowBattThreshold
 
     // Set up the custom Eve characteristics for this device type
@@ -54,7 +57,7 @@ module.exports = class deviceZBSensorContact {
     try {
       if (this.funcs.hasProperty(params, 'battery') && params.battery !== this.cacheBattery) {
         this.cacheBattery = params.battery
-        const scaledBatt = this.platform.config.ZBDWBatt ? this.cacheBattery * 10 : this.cacheBattery
+        const scaledBatt = this.scaleBattery ? this.cacheBattery * 33 : this.cacheBattery
         this.battService.updateCharacteristic(this.hapChar.BatteryLevel, scaledBatt)
         this.battService.updateCharacteristic(this.hapChar.StatusLowBattery, scaledBatt < this.lowBattThreshold)
         if (params.updateSource && !this.disableDeviceLogging) {
diff --git a/lib/device/zigbee/switch-stateless.js b/lib/device/zigbee/switch-stateless.js
index f52a841a..cda130d6 100644
--- a/lib/device/zigbee/switch-stateless.js
+++ b/lib/device/zigbee/switch-stateless.js
@@ -19,6 +19,9 @@ module.exports = class deviceZBSwitchStateless {
     this.accessory = accessory
 
     // Set up custom variables for this device type
+    const deviceId = this.accessory.context.eweDeviceId
+    const deviceConf = platform.zigbeeDevices[deviceId]
+    this.hideLongDouble = deviceConf && deviceConf.hideLongDouble
     this.lowBattThreshold = this.platform.config.lowBattThreshold
 
     // Add the stateless switch service if it doesn't already exist
@@ -26,10 +29,9 @@ module.exports = class deviceZBSwitchStateless {
       this.accessory.addService(this.hapServ.StatelessProgrammableSwitch)
 
     // Hide the double and long press options if the user wants
-    if (this.platform.config.hideZBLDPress) {
-      this.service.getCharacteristic(this.hapChar.ProgrammableSwitchEvent).setProps({
-        validValues: [0]
-      })
+    if (this.hideLongDouble) {
+      this.service.getCharacteristic(this.hapChar.ProgrammableSwitchEvent)
+        .setProps({ validValues: [0] })
     }
 
     // Add the battery service if it doesn't already exist
diff --git a/lib/index.js b/lib/index.js
index f0cd3f42..f79e2055 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -34,6 +34,7 @@ class eWeLinkPlatform {
       this.outletDevices = {}
       this.singleDevices = {}
       this.thDevices = {}
+      this.zigbeeDevices = {}
       this.hideChannels = []
       this.hideMasters = []
       this.ipOverride = {}
@@ -152,8 +153,6 @@ class eWeLinkPlatform {
         case 'debugFakegato':
         case 'disableDeviceLogging':
         case 'disablePlugin':
-        case 'hideZBLDPress':
-        case 'ZBDWBatt':
           if (typeof val === 'string') {
             logQuotes(key)
           }
@@ -553,6 +552,36 @@ class eWeLinkPlatform {
           }
           this.config.username = val.replace(/[\s]+/g, '')
           break
+        case 'zigbeeDevices':
+          if (Array.isArray(val) && val.length > 0) {
+            val.forEach(x => {
+              if (!x.deviceId) {
+                logIgnoreItem(key)
+                return
+              }
+              const deviceId = this.funcs.parseDeviceId(x.deviceId)
+              this.zigbeeDevices[deviceId] = {}
+              for (const [k, v] of Object.entries(x)) {
+                switch (k) {
+                  case 'deviceId':
+                    break
+                  case 'hideLongDouble':
+                  case 'scaleBattery':
+                    if (typeof val === 'string') {
+                      logQuotes(k)
+                    }
+                    this.zigbeeDevices[deviceId][k] = v === 'false' ? false : !!v
+                    break
+                  default:
+                    logRemove(key + '.' + k)
+                    break
+                }
+              }
+            })
+          } else {
+            logIgnore(key)
+          }
+          break
       }
     }
   }
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 80f14e62..b42bb16d 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -19,10 +19,9 @@ module.exports = {
     lightDevices: [],
     thDevices: [],
     fanDevices: [],
+    zigbeeDevices: [],
     lowBattThreshold: 25, // sensorDevices{}
     sensorTimeDifference: 120, // sensorDevices{}
-    hideZBLDPress: false, // sensorDevices{}
-    ZBDWBatt: false, // sensorDevices{}
     groups: [],
     bridgeSensors: [],
     ipOverride: [],

From d29b35c0a79916da95b0055257564ab1ba2ea853 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 15 Feb 2021 12:20:38 +0000
Subject: [PATCH 1453/3183] revert to 4.7.3 for patch

---
 config.schema.json                    | 356 +++++---------------------
 lib/device/fan.js                     |   8 +-
 lib/device/light-colour.js            |  18 +-
 lib/device/light-ctemp.js             |  47 +---
 lib/device/outlet.js                  |   6 +-
 lib/device/sensor-ambient.js          |  11 +-
 lib/device/simulation/thermostat.js   |   7 +-
 lib/device/thermostat.js              |   7 +-
 lib/device/usb.js                     |   7 +-
 lib/device/zigbee/sensor-contact.js   |   5 +-
 lib/device/zigbee/switch-stateless.js |  10 +-
 lib/fakegato/fakegato-history.js      |  12 +-
 lib/index.js                          | 287 +++------------------
 lib/utils/constants.js                |  31 +--
 14 files changed, 157 insertions(+), 655 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 753fd6ee..315bd254 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -37,15 +37,21 @@
         "oneOf": [
           {
             "title": "Auto (Recommended)",
-            "enum": ["auto"]
+            "enum": [
+              "auto"
+            ]
           },
           {
             "title": "Cloud Only",
-            "enum": ["wan"]
+            "enum": [
+              "wan"
+            ]
           },
           {
             "title": "LAN Only",
-            "enum": ["lan"]
+            "enum": [
+              "lan"
+            ]
           }
         ]
       },
@@ -67,173 +73,37 @@
         "type": "boolean",
         "description": "If true, the plugin will remove all accessories and not load the plugin on restart."
       },
-      "singleDevices": {
-        "type": "array",
-        "items": {
-          "type": "object",
-          "properties": {
-            "deviceId": {
-              "type": "string",
-              "title": "Device ID"
-            },
-            "showAsOutlet": {
-              "type": "boolean",
-              "title": "Show As Outlet",
-              "description": "If true, this accessory will show as an outlet in HomeKit instead of a switch."
-            }
-          }
-        }
-      },
-      "multiDevices": {
-        "type": "array",
-        "items": {
-          "type": "object",
-          "properties": {
-            "deviceId": {
-              "type": "string",
-              "title": "Device ID"
-            },
-            "hideChannels": {
-              "type": "string",
-              "title": "Hide Channels",
-              "description": "A comma separated list of channels to hide for this device. For example '0' or '0,1,2'."
-            }
-          }
-        }
+      "hideChanFromHB": {
+        "type": "string",
+        "title": "Hide Light/Switch Channels",
+        "description": "A list of light/switch channels to hide. For example 10009553c8SW0 or multiple separated by a comma."
       },
-      "outletDevices": {
-        "type": "array",
-        "items": {
-          "type": "object",
-          "properties": {
-            "deviceId": {
-              "type": "string",
-              "title": "Device ID"
-            },
-            "showAsSwitch": {
-              "type": "boolean",
-              "title": "Show As Switch",
-              "description": "If true, this accessory will show as a switch in HomeKit instead of an outlet."
-            },
-            "inUsePowerThreshold": {
-              "type": "number",
-              "title": "Outlet 'In Use' Threshold",
-              "description": "HomeKit will set the 'In Use' status of outlet devices to true when the wattage is above this number. Must be 0 or more.",
-              "placeholder": 0,
-              "minimum": 0,
-              "condition": {
-                "functionBody": "return (model.outletDevices[arrayIndices] && !model.outletDevices[arrayIndices].showAsSwitch)"
-              }
-            }
-          }
-        }
+      "switchAsOutlet": {
+        "type": "string",
+        "title": "Switch As Outlet",
+        "description": "A list of switch devices to show as outlets. For example 10009553c8 or multiple separated by a comma."
       },
-      "lightDevices": {
-        "type": "array",
-        "items": {
-          "type": "object",
-          "properties": {
-            "deviceId": {
-              "type": "string",
-              "title": "Device ID"
-            },
-            "bulbModel": {
-              "type": "string",
-              "title": "Device Model",
-              "description": "If your model is not listed then you do not need to set this.",
-              "oneOf": [
-                {
-                  "title": "B02-B-A60",
-                  "enum": ["bulbB02BA60"]
-                },
-                {
-                  "title": "B02-F-A60",
-                  "enum": ["bulbB02FA60"]
-                },
-                {
-                  "title": "B02-F-ST64",
-                  "enum": ["bulbB02FST64"]
-                }
-              ]
-            },
-            "brightnessStep": {
-              "title": "Brightness Step",
-              "type": "number",
-              "description": "A minimum step for the brightness slider in the Home app. Must be 1 or more.",
-              "placeholder": 1,
-              "minimum": 1
-            },
-            "adaptiveLightingShift": {
-              "title": "Adaptive Lighting Shift",
-              "type": "number",
-              "description": "An adjustment factor for Adaptive Lighting. The mired value for each update will be increased by this setting, making the light appear warmer. A value in the range 50-200 should be appropriate. Must be 0 or more.",
-              "placeholder": 0,
-              "minimum": 0
-            }
-          }
-        }
+      "outletAsSwitch": {
+        "type": "string",
+        "title": "Outlet As Switch",
+        "description": "A list of outlet devices to show as switches. For example 10009553c8 or multiple separated by a comma."
       },
-      "thDevices": {
-        "type": "array",
-        "items": {
-          "type": "object",
-          "properties": {
-            "deviceId": {
-              "type": "string",
-              "title": "Device ID"
-            },
-            "hideSwitch": {
-              "type": "boolean",
-              "title": "Hide Switch",
-              "description": "If true, this accessory will hide the TH10/16 switch from HomeKit."
-            },
-            "offset": {
-              "type": "number",
-              "title": "Temperature Offset",
-              "description": "You can offset the temperature that the sensor reads. An offset of 2 means 2 degrees will be added to the recorded temperature. Can be positive or negative and can include a decimal point '.'",
-              "placeholder": 0
-            }
-          }
-        }
+      "inUsePowerThreshold": {
+        "type": "number",
+        "title": "Outlet 'In Use' Threshold",
+        "description": "HomeKit will set the 'In Use' status of outlet devices to true when the wattage is above this number. Must be 0 or more.",
+        "placeholder": 0,
+        "minimum": 0
       },
-      "fanDevices": {
-        "type": "array",
-        "items": {
-          "type": "object",
-          "properties": {
-            "deviceId": {
-              "type": "string",
-              "title": "Device ID"
-            },
-            "hideLight": {
-              "type": "boolean",
-              "title": "Hide Light Switch",
-              "description": "If true, the light switch will be hidden from HomeKit."
-            }
-          }
-        }
+      "hideLightFromFan": {
+        "type": "string",
+        "title": "Hide Fan Lights",
+        "description": "A list of iFan devices for which the light will be hidden. For example 10009553c8 or multiple separated by a comma."
       },
-      "zigbeeDevices": {
-        "type": "array",
-        "items": {
-          "type": "object",
-          "properties": {
-            "deviceId": {
-              "type": "string",
-              "title": "Device ID"
-            },
-            "hideLongDouble": {
-              "type": "boolean",
-              "title": "Hide Light Switch",
-              "description": "If true, double and long press options will be hidden for this Zigbee Button."
-            },
-            "scaleBattery": {
-              "type": "boolean",
-              "title": "Hide Light Switch",
-              "description": "If true, the battery reading for this Zigbee Contact Sensor will be multiplied by 33."
-            }
-          }
-        }
+      "hideSwitchFromTH": {
+        "type": "string",
+        "title": "Hide TH10/16 Switches",
+        "description": "A list of TH10/TH16 devices for which the switch will be hidden. For example 10009553c8 or multiple separated by a comma."
       },
       "lowBattThreshold": {
         "type": "number",
@@ -249,6 +119,32 @@
         "placeholder": 120,
         "minimum": 10
       },
+      "bulbB02BA60": {
+        "type": "string"
+      },
+      "bulbB02FST64": {
+        "type": "string"
+      },
+      "thTempOffset": {
+        "type": "array",
+        "items": {
+          "type": "object",
+          "properties": {
+            "deviceId": {
+              "type": "string"
+            },
+            "offset": {
+              "type": "number"
+            }
+          }
+        }
+      },
+      "hideZBLDPress": {
+        "type": "boolean"
+      },
+      "ZBDWBatt": {
+        "type": "boolean"
+      },
       "groups": {
         "type": "array",
         "items": {
@@ -512,135 +408,17 @@
         "disablePlugin"
       ]
     },
-    {
-      "key": "singleDevices",
-      "title": "Single Channel Devices",
-      "description": "Applies to single-channel switch and light switch devices.",
-      "expandable": true,
-      "add": "Add Another Device",
-      "type": "array",
-      "items": [
-        {
-          "type": "fieldset",
-          "items": [
-            "singleDevices[].deviceId",
-            "singleDevices[].showAsOutlet"
-          ]
-        }
-      ]
-    },
-    {
-      "key": "multiDevices",
-      "title": "Multi Channel Devices",
-      "description": "Applies to multi-channel switch and light switch devices.",
-      "expandable": true,
-      "add": "Add Another Device",
-      "type": "array",
-      "items": [
-        {
-          "type": "fieldset",
-          "items": [
-            "multiDevices[].deviceId",
-            "multiDevices[].hideChannels"
-          ]
-        }
-      ]
-    },
-    {
-      "key": "outletDevices",
-      "title": "Outlet Devices",
-      "description": "Applies to outlet devices.",
-      "expandable": true,
-      "add": "Add Another Device",
-      "type": "array",
-      "items": [
-        {
-          "type": "fieldset",
-          "items": [
-            "outletDevices[].deviceId",
-            "outletDevices[].showAsSwitch",
-            "outletDevices[].inUsePowerThreshold"
-          ]
-        }
-      ]
-    },
-    {
-      "key": "lightDevices",
-      "title": "Light Devices",
-      "description": "Applies to bulbs and LED strips.",
-      "expandable": true,
-      "add": "Add Another Device",
-      "type": "array",
-      "items": [
-        {
-          "type": "fieldset",
-          "items": [
-            "lightDevices[].deviceId",
-            "lightDevices[].bulbModel",
-            "lightDevices[].brightnessStep",
-            "lightDevices[].adaptiveLightingShift"
-          ]
-        }
-      ]
-    },
-    {
-      "key": "thDevices",
-      "title": "Thermostat Devices",
-      "description": "Applies to thermostat devices and the TH10/16.",
-      "expandable": true,
-      "add": "Add Another Device",
-      "type": "array",
-      "items": [
-        {
-          "type": "fieldset",
-          "items": [
-            "thDevices[].deviceId",
-            "thDevices[].hideSwitch",
-            "thDevices[].offset"
-          ]
-        }
-      ]
-    },
-    {
-      "key": "fanDevices",
-      "title": "Fan Devices",
-      "description": "Applies to iFan devices.",
-      "expandable": true,
-      "add": "Add Another Device",
-      "type": "array",
-      "items": [
-        {
-          "type": "fieldset",
-          "items": [
-            "fanDevices[].deviceId",
-            "fanDevices[].hideLight"
-          ]
-        }
-      ]
-    },
-    {
-      "key": "zigbeeDevices",
-      "title": "Zigbee Devices",
-      "description": "Applies to Zigbee devices.",
-      "expandable": true,
-      "add": "Add Another Device",
-      "type": "array",
-      "items": [
-        {
-          "type": "fieldset",
-          "items": [
-            "zigbeeDevices[].deviceId",
-            "zigbeeDevices[].hideLongDouble",
-            "zigbeeDevices[].scaleBattery"
-          ]
-        }
-      ]
-    },
     {
       "type": "fieldset",
       "title": "Device Settings",
       "expandable": true,
       "items": [
+        "hideChanFromHB",
+        "switchAsOutlet",
+        "outletAsSwitch",
+        "inUsePowerThreshold",
+        "hideLightFromFan",
+        "hideSwitchFromTH",
         "lowBattThreshold",
         "sensorTimeDifference"
       ]
diff --git a/lib/device/fan.js b/lib/device/fan.js
index 3e83402d..94ee5f45 100644
--- a/lib/device/fan.js
+++ b/lib/device/fan.js
@@ -18,11 +18,6 @@ module.exports = class deviceFan {
     this.name = accessory.displayName
     this.accessory = accessory
 
-    // Set up custom variables for this device type
-    const deviceId = this.accessory.context.eweDeviceId
-    const deviceConf = platform.fanDevices[deviceId]
-    this.hideLight = deviceConf && deviceConf.hideLight
-
     // Add the fan service if it doesn't already exist
     this.service = this.accessory.getService(this.hapServ.Fan) ||
       this.accessory.addService(this.hapServ.Fan)
@@ -42,7 +37,8 @@ module.exports = class deviceFan {
       .setProps({ minStep: 33 })
 
     // Check to see if the user has hidden the light channel
-    if (this.hideLight) {
+    const eweId = this.accessory.context.eweDeviceId
+    if (this.platform.config.hideLightFromFan.includes(eweId)) {
       // The user has hidden the light channel, so remove it if it exists
       if (this.accessory.getService(this.hapServ.Lightbulb)) {
         this.accessory.removeService(this.accessory.getService(this.hapServ.Lightbulb))
diff --git a/lib/device/light-colour.js b/lib/device/light-colour.js
index 2605504e..d609bad0 100644
--- a/lib/device/light-colour.js
+++ b/lib/device/light-colour.js
@@ -5,12 +5,12 @@
 module.exports = class deviceLightColour {
   constructor (platform, accessory) {
     // Set up variables from the platform
+    this.colourUtils = platform.colourUtils
     this.consts = platform.consts
     this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
-    this.colourUtils = platform.colourUtils
     this.log = platform.log
     this.messages = platform.messages
     this.platform = platform
@@ -20,16 +20,6 @@ module.exports = class deviceLightColour {
     this.accessory = accessory
     this.isB1 = this.accessory.context.eweUIID === 22
 
-    // Set up custom variables for this device type
-    const deviceId = this.accessory.context.eweDeviceId
-    const deviceConf = platform.lightDevices[deviceId]
-    this.alShift = deviceConf && deviceConf.adaptiveLightingShift
-      ? deviceConf.adaptiveLightingShift
-      : platform.consts.defaultValues.adaptiveLightingShift
-    this.brightStep = deviceConf && deviceConf.brightnessStep
-      ? Math.min(deviceConf.brightnessStep, 100)
-      : platform.consts.defaultValues.brightnessStep
-
     // Add the lightbulb service if it doesn't already exist
     this.service = this.accessory.getService(this.hapServ.Lightbulb) ||
       this.accessory.addService(this.hapServ.Lightbulb)
@@ -41,7 +31,6 @@ module.exports = class deviceLightColour {
     // Add the set handler to the lightbulb brightness characteristic
     this.service.getCharacteristic(this.hapChar.Brightness)
       .on('set', this.internalBrightnessUpdate.bind(this))
-      .setProps({ minStep: this.brightStep })
 
     // Add the set handler to the lightbulb hue characteristic
     this.service.getCharacteristic(this.hapChar.Hue)
@@ -72,10 +61,7 @@ module.exports = class deviceLightColour {
         this.cacheBright = this.service.getCharacteristic(this.hapChar.Brightness).value
 
         // Set up the adaptive lighting controller
-        this.alController = new platform.api.hap.AdaptiveLightingController(
-          this.service,
-          { customTemperatureAdjustment: this.alShift }
-        )
+        this.alController = new platform.api.hap.AdaptiveLightingController(this.service)
         this.accessory.configureController(this.alController)
       }
     }
diff --git a/lib/device/light-ctemp.js b/lib/device/light-ctemp.js
index 446f97c1..82005561 100644
--- a/lib/device/light-ctemp.js
+++ b/lib/device/light-ctemp.js
@@ -18,35 +18,6 @@ module.exports = class deviceLightColour {
     this.name = accessory.displayName
     this.accessory = accessory
 
-    // Set up custom variables for this device type
-    const deviceId = this.accessory.context.eweDeviceId
-    const deviceConf = platform.lightDevices[deviceId]
-    this.model = deviceConf && deviceConf.model
-      ? deviceConf.model
-      : platform.consts.defaultValues.model
-    this.alShift = deviceConf && deviceConf.adaptiveLightingShift
-      ? deviceConf.adaptiveLightingShift
-      : platform.consts.defaultValues.adaptiveLightingShift
-    this.brightStep = deviceConf && deviceConf.brightnessStep
-      ? Math.min(deviceConf.brightnessStep, 100)
-      : platform.consts.defaultValues.brightnessStep
-
-    // Different bulbs have different colour temperature ranges
-    switch (this.model) {
-      case 'bulbB02FST64':
-        this.minK = 1800
-        this.maxK = 5000
-        break
-      case 'bulbB02BA60':
-        this.minK = 2700
-        this.maxK = 6500
-        break
-      default:
-        this.minK = 2200
-        this.maxK = 6500
-        break
-    }
-
     // Add the lightbulb service if it doesn't already exist
     this.service = this.accessory.getService(this.hapServ.Lightbulb) ||
       this.accessory.addService(this.hapServ.Lightbulb)
@@ -58,12 +29,23 @@ module.exports = class deviceLightColour {
     // Add the set handler to the lightbulb brightness characteristic
     this.service.getCharacteristic(this.hapChar.Brightness)
       .on('set', this.internalBrightnessUpdate.bind(this))
-      .setProps({ minStep: this.brightStep })
 
     // Add the set handler to the lightbulb colour temperature characteristic
     this.service.getCharacteristic(this.hapChar.ColorTemperature)
       .on('set', this.internalCTempUpdate.bind(this))
 
+    // Different bulbs have different colour temperature ranges
+    if (platform.config.bulbB02FST64.includes(this.accessory.context.eweDeviceId)) {
+      this.minK = 1800
+      this.maxK = 5000
+    } else if (platform.config.bulbB02BA60.includes(this.accessory.context.eweDeviceId)) {
+      this.minK = 2700
+      this.maxK = 6500
+    } else {
+      this.minK = 2200
+      this.maxK = 6500
+    }
+
     // Set up the adaptive lighting controller if available
     if (
       platform.api.versionGreaterOrEqual &&
@@ -73,10 +55,7 @@ module.exports = class deviceLightColour {
       this.cacheBrightness = this.service.getCharacteristic(this.hapChar.Brightness).value
 
       // Set up the adaptive lighting controller
-      this.alController = new platform.api.hap.AdaptiveLightingController(
-        this.service,
-        { customTemperatureAdjustment: this.alShift }
-      )
+      this.alController = new platform.api.hap.AdaptiveLightingController(this.service)
       this.accessory.configureController(this.alController)
     }
   }
diff --git a/lib/device/outlet.js b/lib/device/outlet.js
index ba44ddb9..a4e5bb38 100644
--- a/lib/device/outlet.js
+++ b/lib/device/outlet.js
@@ -19,11 +19,7 @@ module.exports = class deviceOutlet {
     this.accessory = accessory
 
     // Set up custom variables for this device type
-    const deviceId = this.accessory.context.eweDeviceId
-    const deviceConf = platform.outletDevices[deviceId]
-    this.inUsePowerThreshold = deviceConf && deviceConf.inUsePowerThreshold
-      ? deviceConf.inUsePowerThreshold
-      : platform.consts.defaultValues.inUsePowerThreshold
+    this.inUsePowerThreshold = this.platform.config.inUsePowerThreshold
 
     // Set up the custom Eve characteristics for this device type
     this.inherits = require('util').inherits
diff --git a/lib/device/sensor-ambient.js b/lib/device/sensor-ambient.js
index 6e764820..982f8da6 100644
--- a/lib/device/sensor-ambient.js
+++ b/lib/device/sensor-ambient.js
@@ -19,12 +19,9 @@ module.exports = class deviceSensorAmbient {
     this.accessory = accessory
 
     // Set up custom variables for this device type
-    const deviceId = this.accessory.context.eweDeviceId
-    const deviceConf = platform.thDevices[deviceId]
-    this.hideSwitch = deviceConf && deviceConf.hideSwitch
-    this.tempOffset = deviceConf && deviceConf.offset
-      ? deviceConf.offset
-      : platform.consts.defaultValues.offset
+    const eweId = this.accessory.context.eweDeviceId
+    this.tempOffset = Number(platform.thTempOffset[eweId] || 0)
+    this.hideSwitch = this.platform.config.hideSwitchFromTH.includes(eweId)
 
     // If the accessory has a thermostat service then remove it
     if (this.accessory.getService(this.hapServ.Thermostat)) {
@@ -32,7 +29,7 @@ module.exports = class deviceSensorAmbient {
     }
 
     // The user can choose to hide the switch service if they desire
-    if (this.hideSwitch) {
+    if (this.platform.config.hideSwitchFromTH.includes(eweId)) {
       // User has hidden the switch service so remove it if it exists
       if (this.accessory.getService(this.hapServ.Switch)) {
         this.accessory.removeService(this.accessory.getService(this.hapServ.Switch))
diff --git a/lib/device/simulation/thermostat.js b/lib/device/simulation/thermostat.js
index bf6b7013..d9bf80ac 100644
--- a/lib/device/simulation/thermostat.js
+++ b/lib/device/simulation/thermostat.js
@@ -19,11 +19,8 @@ module.exports = class deviceThermostat {
     this.accessory = accessory
 
     // Set up custom variables for this device type
-    const deviceId = this.accessory.context.eweDeviceId
-    const deviceConf = platform.thDevices[deviceId]
-    this.tempOffset = deviceConf && deviceConf.offset
-      ? deviceConf.offset
-      : platform.consts.defaultValues.offset
+    const eweId = this.accessory.context.eweDeviceId
+    this.tempOffset = Number(platform.thTempOffset[eweId] || 0)
 
     // If the accessory has a switch service then remove it
     if (this.accessory.getService(this.hapServ.Switch)) {
diff --git a/lib/device/thermostat.js b/lib/device/thermostat.js
index 6e16729a..170d3fc8 100644
--- a/lib/device/thermostat.js
+++ b/lib/device/thermostat.js
@@ -19,11 +19,8 @@ module.exports = class deviceThermostat {
     this.accessory = accessory
 
     // Set up custom variables for this device type
-    const deviceId = this.accessory.context.eweDeviceId
-    const deviceConf = platform.thDevices[deviceId]
-    this.tempOffset = deviceConf && deviceConf.offset
-      ? deviceConf.offset
-      : platform.consts.defaultValues.offset
+    const eweId = this.accessory.context.eweDeviceId
+    this.tempOffset = Number(platform.thTempOffset[eweId] || 0)
 
     /*
       **************
diff --git a/lib/device/usb.js b/lib/device/usb.js
index a96085cf..cb782ef7 100644
--- a/lib/device/usb.js
+++ b/lib/device/usb.js
@@ -18,13 +18,8 @@ module.exports = class deviceUSB {
     this.name = accessory.displayName
     this.accessory = accessory
 
-    // Set up custom variables for this device type
-    const deviceId = this.accessory.context.eweDeviceId
-    const deviceConf = platform.outletDevices[deviceId]
-    this.showAsSwitch = deviceConf && deviceConf.showAsSwitch
-
     // Check if the user has overridden how this accessory should appear
-    if (this.showAsSwitch) {
+    if (platform.config.outletAsSwitch.includes(this.accessory.context.eweDeviceId)) {
       // User has chosen switch so if the accessory has an outlet service then remove it
       if (this.accessory.getService(this.hapServ.Outlet)) {
         this.accessory.removeService(this.accessory.getService(this.hapServ.Outlet))
diff --git a/lib/device/zigbee/sensor-contact.js b/lib/device/zigbee/sensor-contact.js
index 69fa4934..b19c97e9 100644
--- a/lib/device/zigbee/sensor-contact.js
+++ b/lib/device/zigbee/sensor-contact.js
@@ -19,9 +19,6 @@ module.exports = class deviceZBSensorContact {
     this.accessory = accessory
 
     // Set up custom variables for this device type
-    const deviceId = this.accessory.context.eweDeviceId
-    const deviceConf = platform.zigbeeDevices[deviceId]
-    this.scaleBattery = deviceConf && deviceConf.scaleBattery
     this.lowBattThreshold = this.platform.config.lowBattThreshold
 
     // Set up the custom Eve characteristics for this device type
@@ -57,7 +54,7 @@ module.exports = class deviceZBSensorContact {
     try {
       if (this.funcs.hasProperty(params, 'battery') && params.battery !== this.cacheBattery) {
         this.cacheBattery = params.battery
-        const scaledBatt = this.scaleBattery ? this.cacheBattery * 33 : this.cacheBattery
+        const scaledBatt = this.platform.config.ZBDWBatt ? this.cacheBattery * 10 : this.cacheBattery
         this.battService.updateCharacteristic(this.hapChar.BatteryLevel, scaledBatt)
         this.battService.updateCharacteristic(this.hapChar.StatusLowBattery, scaledBatt < this.lowBattThreshold)
         if (params.updateSource && !this.disableDeviceLogging) {
diff --git a/lib/device/zigbee/switch-stateless.js b/lib/device/zigbee/switch-stateless.js
index cda130d6..f52a841a 100644
--- a/lib/device/zigbee/switch-stateless.js
+++ b/lib/device/zigbee/switch-stateless.js
@@ -19,9 +19,6 @@ module.exports = class deviceZBSwitchStateless {
     this.accessory = accessory
 
     // Set up custom variables for this device type
-    const deviceId = this.accessory.context.eweDeviceId
-    const deviceConf = platform.zigbeeDevices[deviceId]
-    this.hideLongDouble = deviceConf && deviceConf.hideLongDouble
     this.lowBattThreshold = this.platform.config.lowBattThreshold
 
     // Add the stateless switch service if it doesn't already exist
@@ -29,9 +26,10 @@ module.exports = class deviceZBSwitchStateless {
       this.accessory.addService(this.hapServ.StatelessProgrammableSwitch)
 
     // Hide the double and long press options if the user wants
-    if (this.hideLongDouble) {
-      this.service.getCharacteristic(this.hapChar.ProgrammableSwitchEvent)
-        .setProps({ validValues: [0] })
+    if (this.platform.config.hideZBLDPress) {
+      this.service.getCharacteristic(this.hapChar.ProgrammableSwitchEvent).setProps({
+        validValues: [0]
+      })
     }
 
     // Add the battery service if it doesn't already exist
diff --git a/lib/fakegato/fakegato-history.js b/lib/fakegato/fakegato-history.js
index ca8bd50e..08d19648 100644
--- a/lib/fakegato/fakegato-history.js
+++ b/lib/fakegato/fakegato-history.js
@@ -6,11 +6,15 @@ const Format = require('util').format
 const FakeGatoTimer = require('./fakegato-timer').FakeGatoTimer
 const FakeGatoStorage = require('./fakegato-storage').FakeGatoStorage
 const _EPOCH = 978307200
+let homebridge
 let Characteristic, Service
 
-module.exports = function (homebridge) {
-  Characteristic = homebridge.hap.Characteristic
-  Service = homebridge.hap.Service
+module.exports = function (pHomebridge) {
+  if (pHomebridge && !homebridge) {
+    homebridge = pHomebridge
+    Characteristic = homebridge.hap.Characteristic
+    Service = homebridge.hap.Service
+  }
 
   const hexToBase64 = val => {
     return Buffer.from(('' + val).replace(/[^0-9A-F]/ig, ''), 'hex').toString('base64')
@@ -470,7 +474,7 @@ module.exports = function (homebridge) {
           homebridge.globalFakeGatoTimer.addData({ entry: entry, service: this })
           break
         case 'custom':
-          if ('power' in entry || 'temp' in entry || 'humidity' in entry) {
+          if ('power' in entry || 'temp' in entry) {
             homebridge.globalFakeGatoTimer.addData({ entry: entry, service: this })
           } else {
             this._addEntry(entry)
diff --git a/lib/index.js b/lib/index.js
index f79e2055..5e7e1a2a 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -28,17 +28,9 @@ class eWeLinkPlatform {
       // Initialise these variables before anything else
       this.log = log
       this.api = api
-      this.fanDevices = {}
-      this.lightDevices = {}
-      this.multiDevices = {}
-      this.outletDevices = {}
-      this.singleDevices = {}
-      this.thDevices = {}
-      this.zigbeeDevices = {}
-      this.hideChannels = []
-      this.hideMasters = []
       this.ipOverride = {}
       this.obstructSwitches = {}
+      this.thTempOffset = {}
       this.simulations = {}
       this.rfSensors = {}
 
@@ -141,6 +133,23 @@ class eWeLinkPlatform {
             logIgnore(key)
           }
           break
+        case 'bulbB02BA60':
+        case 'bulbB02FST64':
+        case 'hideChanFromHB':
+        case 'hideLightFromFan':
+        case 'hideSwitchFromTH':
+        case 'outletAsSwitch':
+        case 'switchAsOutlet':
+          this.config[key] = []
+          if (typeof val !== 'string' || val === '') {
+            logIgnore(key)
+          } else {
+            const items = val.split(',')
+            items.forEach(item => {
+              this.config[key].push(this.funcs.parseDeviceId(item))
+            })
+          }
+          break
         case 'countryCode': {
           if (!val) {
             throw new Error(this.messages.missingCC)
@@ -153,40 +162,13 @@ class eWeLinkPlatform {
         case 'debugFakegato':
         case 'disableDeviceLogging':
         case 'disablePlugin':
+        case 'hideZBLDPress':
+        case 'ZBDWBatt':
           if (typeof val === 'string') {
             logQuotes(key)
           }
           this.config[key] = val === 'false' ? false : !!val
           break
-        case 'fanDevices':
-          if (Array.isArray(val) && val.length > 0) {
-            val.forEach(x => {
-              if (!x.deviceId) {
-                logIgnoreItem(key)
-                return
-              }
-              const deviceId = this.funcs.parseDeviceId(x.deviceId)
-              this.fanDevices[deviceId] = {}
-              for (const [k, v] of Object.entries(x)) {
-                switch (k) {
-                  case 'deviceId':
-                    break
-                  case 'hideLight':
-                    if (typeof val === 'string') {
-                      logQuotes(k)
-                    }
-                    this.fanDevices[deviceId][k] = v === 'false' ? false : !!v
-                    break
-                  default:
-                    logRemove(key + '.' + k)
-                    break
-                }
-              }
-            })
-          } else {
-            logIgnore(key)
-          }
-          break
         case 'groups':
           if (Array.isArray(val) && val.length > 0) {
             val.forEach(x => {
@@ -279,6 +261,7 @@ class eWeLinkPlatform {
           }
           break
         }
+        case 'inUsePowerThreshold':
         case 'lowBattThreshold':
         case 'sensorTimeDifference': {
           if (typeof val === 'string') {
@@ -311,60 +294,8 @@ class eWeLinkPlatform {
                   case 'deviceIP': {
                     if (typeof v !== 'string' || v === '') {
                       logIgnore(key + '.' + k)
-                    } else {
-                      this.ipOverride[deviceId] = v
-                    }
-                    break
-                  }
-                  default:
-                    logRemove(key + '.' + k)
-                    break
-                }
-              }
-            })
-          } else {
-            logIgnore(key)
-          }
-          break
-        case 'lightDevices':
-          if (Array.isArray(val) && val.length > 0) {
-            val.forEach(x => {
-              if (!x.deviceId) {
-                logIgnoreItem(key)
-                return
-              }
-              const deviceId = this.funcs.parseDeviceId(x.deviceId)
-              this.lightDevices[deviceId] = {}
-              for (const [k, v] of Object.entries(x)) {
-                switch (k) {
-                  case 'adaptiveLightingShift':
-                  case 'brightnessStep': {
-                    if (typeof v === 'string') {
-                      logQuotes(key + '.' + k)
-                    }
-                    const intVal = parseInt(v)
-                    if (isNaN(intVal)) {
-                      logDefault(key + '.' + k, this.consts.defaultValues[k])
-                      this.lightDevices[deviceId][k] = this.consts.defaultValues[k]
-                    } else if (intVal < this.consts.minValues[k]) {
-                      logIncrease(key + '.' + k, this.consts.minValues[k])
-                      this.lightDevices[deviceId][k] = this.consts.minValues[k]
-                    } else {
-                      this.lightDevices[deviceId][k] = intVal
-                    }
-                    break
-                  }
-                  case 'deviceId':
-                    break
-                  case 'bulbModel': {
-                    const inSet = this.consts.allowed.bulbModels.includes(v)
-                    if (typeof v !== 'string' || !inSet) {
-                      logIgnore(k)
-                    } else {
-                      this.lightDevices[deviceId][k] = inSet
-                        ? v
-                        : this.consts.defaultValues[k]
                     }
+                    this.ipOverride[deviceId] = v
                     break
                   }
                   default:
@@ -382,90 +313,9 @@ class eWeLinkPlatform {
           if (typeof val !== 'string' || !inSet) {
             logIgnore(key)
           }
-          this.config.mode = inSet ? val : this.consts.defaultValues[key]
+          this.config.mode = inSet ? val : 'auto'
           break
         }
-        case 'multiDevices':
-          if (Array.isArray(val) && val.length > 0) {
-            val.forEach(x => {
-              if (!x.deviceId) {
-                logIgnoreItem(key)
-                return
-              }
-              const deviceId = this.funcs.parseDeviceId(x.deviceId)
-              this.multiDevices[deviceId] = {}
-              for (const [k, v] of Object.entries(x)) {
-                switch (k) {
-                  case 'deviceId':
-                    break
-                  case 'hideChannels': {
-                    if (typeof v !== 'string' || v === '') {
-                      logIgnore(key + '.' + k)
-                    } else {
-                      const channels = v.split(',')
-                      channels.forEach(channel => {
-                        this.hideChannels.push(
-                          deviceId + 'SW' + channel.replace(/[^0-9]+/g, '')
-                        )
-                      })
-                    }
-                    break
-                  }
-                  default:
-                    logRemove(key + '.' + k)
-                    break
-                }
-              }
-            })
-          } else {
-            logIgnore(key)
-          }
-          break
-        case 'outletDevices':
-          if (Array.isArray(val) && val.length > 0) {
-            val.forEach(x => {
-              if (!x.deviceId) {
-                logIgnoreItem(key)
-                return
-              }
-              const deviceId = this.funcs.parseDeviceId(x.deviceId)
-              this.outletDevices[deviceId] = {}
-              for (const [k, v] of Object.entries(x)) {
-                switch (k) {
-                  case 'deviceId':
-                    break
-                  case 'inUsePowerThreshold': {
-                    if (typeof v === 'string') {
-                      logQuotes(k)
-                    }
-                    const intVal = parseInt(v)
-                    if (isNaN(intVal)) {
-                      logDefault(key + '.' + k, this.consts.defaultValues[k])
-                      this.outletDevices[deviceId][k] = this.consts.defaultValues[k]
-                    } else if (intVal < this.consts.minValues[k]) {
-                      logIncrease(key + '.' + k, this.consts.minValues[k])
-                      this.outletDevices[deviceId][k] = this.consts.minValues[k]
-                    } else {
-                      this.outletDevices[deviceId][k] = intVal
-                    }
-                    break
-                  }
-                  case 'showAsSwitch':
-                    if (typeof val === 'string') {
-                      logQuotes(k)
-                    }
-                    this.outletDevices[deviceId][k] = v === 'false' ? false : !!v
-                    break
-                  default:
-                    logRemove(key + '.' + k)
-                    break
-                }
-              }
-            })
-          } else {
-            logIgnore(key)
-          }
-          break
         case 'name':
         case 'platform':
         case 'plugin_map':
@@ -476,7 +326,7 @@ class eWeLinkPlatform {
           }
           this.config.password = val
           break
-        case 'singleDevices':
+        case 'thTempOffset':
           if (Array.isArray(val) && val.length > 0) {
             val.forEach(x => {
               if (!x.deviceId) {
@@ -484,55 +334,19 @@ class eWeLinkPlatform {
                 return
               }
               const deviceId = this.funcs.parseDeviceId(x.deviceId)
-              this.singleDevices[deviceId] = {}
               for (const [k, v] of Object.entries(x)) {
                 switch (k) {
                   case 'deviceId':
                     break
-                  case 'showAsOutlet':
-                    if (typeof val === 'string') {
-                      logQuotes(k)
-                    }
-                    this.singleDevices[deviceId][k] = v === 'false' ? false : !!v
-                    break
-                  default:
-                    logRemove(key + '.' + k)
-                    break
-                }
-              }
-            })
-          } else {
-            logIgnore(key)
-          }
-          break
-        case 'thDevices':
-          if (Array.isArray(val) && val.length > 0) {
-            val.forEach(x => {
-              if (!x.deviceId) {
-                logIgnoreItem(key)
-                return
-              }
-              const deviceId = this.funcs.parseDeviceId(x.deviceId)
-              this.thDevices[deviceId] = {}
-              for (const [k, v] of Object.entries(x)) {
-                switch (k) {
-                  case 'deviceId':
-                    break
-                  case 'hideSwitch':
-                    if (typeof val === 'string') {
-                      logQuotes(k)
-                    }
-                    this.thDevices[deviceId][k] = v === 'false' ? false : !!v
-                    break
                   case 'offset': {
                     if (typeof v === 'string') {
                       logQuotes(key + '.' + k)
                     }
-                    const numVal = Number(v)
-                    if (isNaN(numVal)) {
+                    const intVal = Number(v)
+                    if (isNaN(intVal)) {
                       logIgnore(key + '.' + k)
                     } else {
-                      this.thDevices[deviceId][k] = numVal
+                      this.thTempOffset[deviceId] = intVal
                     }
                     break
                   }
@@ -552,36 +366,6 @@ class eWeLinkPlatform {
           }
           this.config.username = val.replace(/[\s]+/g, '')
           break
-        case 'zigbeeDevices':
-          if (Array.isArray(val) && val.length > 0) {
-            val.forEach(x => {
-              if (!x.deviceId) {
-                logIgnoreItem(key)
-                return
-              }
-              const deviceId = this.funcs.parseDeviceId(x.deviceId)
-              this.zigbeeDevices[deviceId] = {}
-              for (const [k, v] of Object.entries(x)) {
-                switch (k) {
-                  case 'deviceId':
-                    break
-                  case 'hideLongDouble':
-                  case 'scaleBattery':
-                    if (typeof val === 'string') {
-                      logQuotes(k)
-                    }
-                    this.zigbeeDevices[deviceId][k] = v === 'false' ? false : !!v
-                    break
-                  default:
-                    logRemove(key + '.' + k)
-                    break
-                }
-              }
-            })
-          } else {
-            logIgnore(key)
-          }
-          break
       }
     }
   }
@@ -600,6 +384,9 @@ class eWeLinkPlatform {
       // Log that the plugin initialisation has been successful
       this.log('[v%s] %s.', PLUGIN.version, this.messages.initialised)
 
+      // Set up further global variables
+      this.hiddenMasters = []
+
       // Require any libraries that the plugin uses
       this.axios = require('axios')
       this.crypto = require('crypto')
@@ -954,8 +741,7 @@ class eWeLinkPlatform {
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
           : this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = this.outletDevices[device.deviceid] &&
-          this.outletDevices[device.deviceid].showAsSwitch
+        accessory.control = this.config.outletAsSwitch.includes(device.deviceid)
           ? new (require('./device/switch-single'))(this, accessory)
           : new (require('./device/outlet'))(this, accessory)
         /*****/
@@ -1011,8 +797,7 @@ class eWeLinkPlatform {
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
           : this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = this.singleDevices[device.deviceid] &&
-          this.singleDevices[device.deviceid].showAsOutlet
+        accessory.control = this.config.switchAsOutlet.includes(device.deviceid)
           ? new (require('./device/outlet'))(this, accessory)
           : new (require('./device/switch-single'))(this, accessory)
         /***********************/
@@ -1022,7 +807,7 @@ class eWeLinkPlatform {
         ***********************/
         for (let i = 0; i <= this.consts.chansFromUiid[device.extra.uiid]; i++) {
           // Check if the user has chosen to hide any channels for this device
-          if (this.hideChannels.includes(device.deviceid + 'SW' + i)) {
+          if (this.config.hideChanFromHB.includes(device.deviceid + 'sw' + i)) {
             // The user has hidden this channel so if it exists then remove it
             if (this.devicesInHB.has(device.deviceid + 'SW' + i)) {
               this.removeAccessory(this.devicesInHB.get(device.deviceid + 'SW' + i))
@@ -1030,7 +815,7 @@ class eWeLinkPlatform {
 
             // If this is the main channel then add it to the array of hidden masters
             if (i === 0) {
-              this.hideMasters.push(device.deviceid)
+              this.hiddenMasters.push(device.deviceid)
             }
 
             // Add the sub accessory, but hidden, to Homebridge
@@ -1096,7 +881,7 @@ class eWeLinkPlatform {
         accessory.control = new (require('./device/rf-bridge'))(this, accessory)
 
         // We don't want to add the main bridge as an accessory in Homebridge
-        this.hideMasters.push(device.deviceid)
+        this.hiddenMasters.push(device.deviceid)
 
         // Loop through each sub device connected to the RF Bridge
         rfMap.forEach(subDevice => {
@@ -1270,7 +1055,7 @@ class eWeLinkPlatform {
 
       // Update the current firmware version if the accessory isn't hidden
       if (
-        !this.hideMasters.includes(device.deviceid) &&
+        !this.hiddenMasters.includes(device.deviceid) &&
         !this.obstructSwitches[device.deviceid]
       ) {
         accessory.getService(this.api.hap.Service.AccessoryInformation)
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index b42bb16d..f5bd21a3 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -13,15 +13,19 @@ module.exports = {
     debug: false,
     debugFakegato: false,
     disablePlugin: false,
-    singleDevices: [],
-    multiDevices: [],
-    outletDevices: [],
-    lightDevices: [],
-    thDevices: [],
-    fanDevices: [],
-    zigbeeDevices: [],
+    hideChanFromHB: '', // multiDevices{}
+    switchAsOutlet: '', // singleDevices{}
+    outletAsSwitch: '', // outletDevices{}
+    inUsePowerThreshold: 0, // outletDevices{}
+    hideLightFromFan: '', // fanDevices{}
+    hideSwitchFromTH: '', // thDevices{}
     lowBattThreshold: 25, // sensorDevices{}
     sensorTimeDifference: 120, // sensorDevices{}
+    bulbB02BA60: '', // lightDevices{}
+    bulbB02FST64: '', // lightDevices{}
+    thTempOffset: [], // thDevices{}
+    hideZBLDPress: false, // sensorDevices{}
+    ZBDWBatt: false, // sensorDevices{}
     groups: [],
     bridgeSensors: [],
     ipOverride: [],
@@ -35,11 +39,7 @@ module.exports = {
     sensorTimeLength: 60,
     sensorTimeDifference: 120,
     offset: 0,
-    operationTime: 100,
-    mode: 'auto',
-    bulbModel: 'bulbB02FA60',
-    brightnessStep: 1,
-    adaptiveLightingShift: 0
+    operationTime: 100
   },
 
   minValues: {
@@ -47,9 +47,7 @@ module.exports = {
     lowBattThreshold: 5,
     sensorTimeLength: 1,
     sensorTimeDifference: 10,
-    operationTime: 20,
-    brightnessStep: 1,
-    adaptiveLightingShift: 0
+    operationTime: 20
   },
 
   messages: {
@@ -155,8 +153,7 @@ module.exports = {
     modes: ['auto', 'wan', 'lan'],
     obstructs: ['garage', 'garage_eachen'],
     setups: ['oneSwitch', 'twoSwitch'],
-    sensors: ['water', 'smoke', 'co', 'co2', 'contact', 'occupancy', 'motion'],
-    bulbModels: ['bulbB02BA60', 'bulbB02FA60', 'bulbB02FST64']
+    sensors: ['water', 'smoke', 'co', 'co2', 'contact', 'occupancy', 'motion']
   },
 
   devices: {

From e6b3393ab2ce3d1d8035fc82ae7b29a675fef3e2 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 15 Feb 2021 12:25:49 +0000
Subject: [PATCH 1454/3183] rf fix?

---
 lib/index.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/lib/index.js b/lib/index.js
index 5e7e1a2a..8dc36663 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -890,6 +890,7 @@ class eWeLinkPlatform {
           let sensorTimeLength
           let subExtraContext = {}
           const fullDeviceId = device.deviceid + 'SW' + swNumber
+          const lowCaseDeviceId = device.deviceid + 'sw' + swNumber
 
           // Check which eWeLink type the connected sub device is
           if (['1', '2', '3', '4'].includes(subDevice.type)) {
@@ -897,11 +898,11 @@ class eWeLinkPlatform {
           } else if (subDevice.type === '5') {
             subType = 'curtain'
           } else if (subDevice.type === '6') {
-            subType = this.rfSensors[fullDeviceId]
-              ? this.rfSensors[fullDeviceId].type
+            subType = this.rfSensors[lowCaseDeviceId]
+              ? this.rfSensors[lowCaseDeviceId].type
               : 'motion'
-            if (this.rfSensors[fullDeviceId]) {
-              sensorTimeLength = this.rfSensors[fullDeviceId].sensorTimeLength
+            if (this.rfSensors[lowCaseDeviceId]) {
+              sensorTimeLength = this.rfSensors[lowCaseDeviceId].sensorTimeLength
             }
           } else {
             const type = subDevice.type || '?'

From ea56787c77b65777d7b8f6960297eab26db7861f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 15 Feb 2021 12:26:53 +0000
Subject: [PATCH 1455/3183] 4.7.4-0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index e63dd412..6f0d0428 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.7.3",
+  "version": "4.7.4-0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 099e7a85..4703c92a 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "4.7.3",
+  "version": "4.7.4-0",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 23b9f23e0057db20d99cdb593ce818cd94081a08 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 15 Feb 2021 12:39:51 +0000
Subject: [PATCH 1456/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 448723de..5358c4ac 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,7 +11,13 @@ All notable changes to this homebridge-ewelink will be documented in this file.
   * includes a `adaptiveLightingShift` option to offset the Adaptive Lighting values per light device
   * replaces the previous `bulbB02BA60` and `bulbB02FST64` settings
 
-## v4.7.3 (2021-02-13)
+## 4.7.4 (2021-02-15)
+
+### Changes
+
+* Fixes an issue when using custom RF sensors
+
+## 4.7.3 (2021-02-13)
 
 ### Changes
 
@@ -22,14 +28,14 @@ All notable changes to this homebridge-ewelink will be documented in this file.
   * Lighter colours appear brighter
   * Solid red is now easier to obtain via the Home app
 
-## v4.7.2 (2021-02-12)
+## 4.7.2 (2021-02-12)
 
 ### Changes
 
 * Fixes a bug where config items separated by a comma weren't adhered to properly
 * Stop subsequent warning messages if a device fails to initialise
 
-## v4.7.1 (2021-02-11)
+## 4.7.1 (2021-02-11)
 
 ### Changes
 
@@ -40,7 +46,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
   * `websocket-as-promised` to v2.0.1
 * Fakegato library formatting and simplification
 
-## v4.7.0 (2021-02-10)
+## 4.7.0 (2021-02-10)
 
 ### Added
 

From 492903dbedb29ec3b1bb9557a467c4f25dbfc9ed Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 15 Feb 2021 12:40:21 +0000
Subject: [PATCH 1457/3183] 4.7.4

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 6f0d0428..b8366880 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.7.4-0",
+  "version": "4.7.4",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 4703c92a..419dae8a 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "4.7.4-0",
+  "version": "4.7.4",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From a96915ece041a87e4a66096f08812f0a47d4a47d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 15 Feb 2021 12:47:23 +0000
Subject: [PATCH 1458/3183] bring back changes

---
 config.schema.json                    | 356 +++++++++++++++++++++-----
 lib/device/fan.js                     |   8 +-
 lib/device/light-colour.js            |  18 +-
 lib/device/light-ctemp.js             |  47 +++-
 lib/device/outlet.js                  |   6 +-
 lib/device/sensor-ambient.js          |  11 +-
 lib/device/simulation/thermostat.js   |   7 +-
 lib/device/thermostat.js              |   7 +-
 lib/device/usb.js                     |   7 +-
 lib/device/zigbee/sensor-contact.js   |   5 +-
 lib/device/zigbee/switch-stateless.js |  10 +-
 lib/fakegato/fakegato-history.js      |  12 +-
 lib/index.js                          | 296 ++++++++++++++++++---
 lib/utils/constants.js                |  31 ++-
 lib/utils/functions.js                |   2 +-
 15 files changed, 660 insertions(+), 163 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 315bd254..753fd6ee 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -37,21 +37,15 @@
         "oneOf": [
           {
             "title": "Auto (Recommended)",
-            "enum": [
-              "auto"
-            ]
+            "enum": ["auto"]
           },
           {
             "title": "Cloud Only",
-            "enum": [
-              "wan"
-            ]
+            "enum": ["wan"]
           },
           {
             "title": "LAN Only",
-            "enum": [
-              "lan"
-            ]
+            "enum": ["lan"]
           }
         ]
       },
@@ -73,37 +67,173 @@
         "type": "boolean",
         "description": "If true, the plugin will remove all accessories and not load the plugin on restart."
       },
-      "hideChanFromHB": {
-        "type": "string",
-        "title": "Hide Light/Switch Channels",
-        "description": "A list of light/switch channels to hide. For example 10009553c8SW0 or multiple separated by a comma."
+      "singleDevices": {
+        "type": "array",
+        "items": {
+          "type": "object",
+          "properties": {
+            "deviceId": {
+              "type": "string",
+              "title": "Device ID"
+            },
+            "showAsOutlet": {
+              "type": "boolean",
+              "title": "Show As Outlet",
+              "description": "If true, this accessory will show as an outlet in HomeKit instead of a switch."
+            }
+          }
+        }
       },
-      "switchAsOutlet": {
-        "type": "string",
-        "title": "Switch As Outlet",
-        "description": "A list of switch devices to show as outlets. For example 10009553c8 or multiple separated by a comma."
+      "multiDevices": {
+        "type": "array",
+        "items": {
+          "type": "object",
+          "properties": {
+            "deviceId": {
+              "type": "string",
+              "title": "Device ID"
+            },
+            "hideChannels": {
+              "type": "string",
+              "title": "Hide Channels",
+              "description": "A comma separated list of channels to hide for this device. For example '0' or '0,1,2'."
+            }
+          }
+        }
       },
-      "outletAsSwitch": {
-        "type": "string",
-        "title": "Outlet As Switch",
-        "description": "A list of outlet devices to show as switches. For example 10009553c8 or multiple separated by a comma."
+      "outletDevices": {
+        "type": "array",
+        "items": {
+          "type": "object",
+          "properties": {
+            "deviceId": {
+              "type": "string",
+              "title": "Device ID"
+            },
+            "showAsSwitch": {
+              "type": "boolean",
+              "title": "Show As Switch",
+              "description": "If true, this accessory will show as a switch in HomeKit instead of an outlet."
+            },
+            "inUsePowerThreshold": {
+              "type": "number",
+              "title": "Outlet 'In Use' Threshold",
+              "description": "HomeKit will set the 'In Use' status of outlet devices to true when the wattage is above this number. Must be 0 or more.",
+              "placeholder": 0,
+              "minimum": 0,
+              "condition": {
+                "functionBody": "return (model.outletDevices[arrayIndices] && !model.outletDevices[arrayIndices].showAsSwitch)"
+              }
+            }
+          }
+        }
       },
-      "inUsePowerThreshold": {
-        "type": "number",
-        "title": "Outlet 'In Use' Threshold",
-        "description": "HomeKit will set the 'In Use' status of outlet devices to true when the wattage is above this number. Must be 0 or more.",
-        "placeholder": 0,
-        "minimum": 0
+      "lightDevices": {
+        "type": "array",
+        "items": {
+          "type": "object",
+          "properties": {
+            "deviceId": {
+              "type": "string",
+              "title": "Device ID"
+            },
+            "bulbModel": {
+              "type": "string",
+              "title": "Device Model",
+              "description": "If your model is not listed then you do not need to set this.",
+              "oneOf": [
+                {
+                  "title": "B02-B-A60",
+                  "enum": ["bulbB02BA60"]
+                },
+                {
+                  "title": "B02-F-A60",
+                  "enum": ["bulbB02FA60"]
+                },
+                {
+                  "title": "B02-F-ST64",
+                  "enum": ["bulbB02FST64"]
+                }
+              ]
+            },
+            "brightnessStep": {
+              "title": "Brightness Step",
+              "type": "number",
+              "description": "A minimum step for the brightness slider in the Home app. Must be 1 or more.",
+              "placeholder": 1,
+              "minimum": 1
+            },
+            "adaptiveLightingShift": {
+              "title": "Adaptive Lighting Shift",
+              "type": "number",
+              "description": "An adjustment factor for Adaptive Lighting. The mired value for each update will be increased by this setting, making the light appear warmer. A value in the range 50-200 should be appropriate. Must be 0 or more.",
+              "placeholder": 0,
+              "minimum": 0
+            }
+          }
+        }
       },
-      "hideLightFromFan": {
-        "type": "string",
-        "title": "Hide Fan Lights",
-        "description": "A list of iFan devices for which the light will be hidden. For example 10009553c8 or multiple separated by a comma."
+      "thDevices": {
+        "type": "array",
+        "items": {
+          "type": "object",
+          "properties": {
+            "deviceId": {
+              "type": "string",
+              "title": "Device ID"
+            },
+            "hideSwitch": {
+              "type": "boolean",
+              "title": "Hide Switch",
+              "description": "If true, this accessory will hide the TH10/16 switch from HomeKit."
+            },
+            "offset": {
+              "type": "number",
+              "title": "Temperature Offset",
+              "description": "You can offset the temperature that the sensor reads. An offset of 2 means 2 degrees will be added to the recorded temperature. Can be positive or negative and can include a decimal point '.'",
+              "placeholder": 0
+            }
+          }
+        }
       },
-      "hideSwitchFromTH": {
-        "type": "string",
-        "title": "Hide TH10/16 Switches",
-        "description": "A list of TH10/TH16 devices for which the switch will be hidden. For example 10009553c8 or multiple separated by a comma."
+      "fanDevices": {
+        "type": "array",
+        "items": {
+          "type": "object",
+          "properties": {
+            "deviceId": {
+              "type": "string",
+              "title": "Device ID"
+            },
+            "hideLight": {
+              "type": "boolean",
+              "title": "Hide Light Switch",
+              "description": "If true, the light switch will be hidden from HomeKit."
+            }
+          }
+        }
+      },
+      "zigbeeDevices": {
+        "type": "array",
+        "items": {
+          "type": "object",
+          "properties": {
+            "deviceId": {
+              "type": "string",
+              "title": "Device ID"
+            },
+            "hideLongDouble": {
+              "type": "boolean",
+              "title": "Hide Light Switch",
+              "description": "If true, double and long press options will be hidden for this Zigbee Button."
+            },
+            "scaleBattery": {
+              "type": "boolean",
+              "title": "Hide Light Switch",
+              "description": "If true, the battery reading for this Zigbee Contact Sensor will be multiplied by 33."
+            }
+          }
+        }
       },
       "lowBattThreshold": {
         "type": "number",
@@ -119,32 +249,6 @@
         "placeholder": 120,
         "minimum": 10
       },
-      "bulbB02BA60": {
-        "type": "string"
-      },
-      "bulbB02FST64": {
-        "type": "string"
-      },
-      "thTempOffset": {
-        "type": "array",
-        "items": {
-          "type": "object",
-          "properties": {
-            "deviceId": {
-              "type": "string"
-            },
-            "offset": {
-              "type": "number"
-            }
-          }
-        }
-      },
-      "hideZBLDPress": {
-        "type": "boolean"
-      },
-      "ZBDWBatt": {
-        "type": "boolean"
-      },
       "groups": {
         "type": "array",
         "items": {
@@ -408,17 +512,135 @@
         "disablePlugin"
       ]
     },
+    {
+      "key": "singleDevices",
+      "title": "Single Channel Devices",
+      "description": "Applies to single-channel switch and light switch devices.",
+      "expandable": true,
+      "add": "Add Another Device",
+      "type": "array",
+      "items": [
+        {
+          "type": "fieldset",
+          "items": [
+            "singleDevices[].deviceId",
+            "singleDevices[].showAsOutlet"
+          ]
+        }
+      ]
+    },
+    {
+      "key": "multiDevices",
+      "title": "Multi Channel Devices",
+      "description": "Applies to multi-channel switch and light switch devices.",
+      "expandable": true,
+      "add": "Add Another Device",
+      "type": "array",
+      "items": [
+        {
+          "type": "fieldset",
+          "items": [
+            "multiDevices[].deviceId",
+            "multiDevices[].hideChannels"
+          ]
+        }
+      ]
+    },
+    {
+      "key": "outletDevices",
+      "title": "Outlet Devices",
+      "description": "Applies to outlet devices.",
+      "expandable": true,
+      "add": "Add Another Device",
+      "type": "array",
+      "items": [
+        {
+          "type": "fieldset",
+          "items": [
+            "outletDevices[].deviceId",
+            "outletDevices[].showAsSwitch",
+            "outletDevices[].inUsePowerThreshold"
+          ]
+        }
+      ]
+    },
+    {
+      "key": "lightDevices",
+      "title": "Light Devices",
+      "description": "Applies to bulbs and LED strips.",
+      "expandable": true,
+      "add": "Add Another Device",
+      "type": "array",
+      "items": [
+        {
+          "type": "fieldset",
+          "items": [
+            "lightDevices[].deviceId",
+            "lightDevices[].bulbModel",
+            "lightDevices[].brightnessStep",
+            "lightDevices[].adaptiveLightingShift"
+          ]
+        }
+      ]
+    },
+    {
+      "key": "thDevices",
+      "title": "Thermostat Devices",
+      "description": "Applies to thermostat devices and the TH10/16.",
+      "expandable": true,
+      "add": "Add Another Device",
+      "type": "array",
+      "items": [
+        {
+          "type": "fieldset",
+          "items": [
+            "thDevices[].deviceId",
+            "thDevices[].hideSwitch",
+            "thDevices[].offset"
+          ]
+        }
+      ]
+    },
+    {
+      "key": "fanDevices",
+      "title": "Fan Devices",
+      "description": "Applies to iFan devices.",
+      "expandable": true,
+      "add": "Add Another Device",
+      "type": "array",
+      "items": [
+        {
+          "type": "fieldset",
+          "items": [
+            "fanDevices[].deviceId",
+            "fanDevices[].hideLight"
+          ]
+        }
+      ]
+    },
+    {
+      "key": "zigbeeDevices",
+      "title": "Zigbee Devices",
+      "description": "Applies to Zigbee devices.",
+      "expandable": true,
+      "add": "Add Another Device",
+      "type": "array",
+      "items": [
+        {
+          "type": "fieldset",
+          "items": [
+            "zigbeeDevices[].deviceId",
+            "zigbeeDevices[].hideLongDouble",
+            "zigbeeDevices[].scaleBattery"
+          ]
+        }
+      ]
+    },
     {
       "type": "fieldset",
       "title": "Device Settings",
       "expandable": true,
       "items": [
-        "hideChanFromHB",
-        "switchAsOutlet",
-        "outletAsSwitch",
-        "inUsePowerThreshold",
-        "hideLightFromFan",
-        "hideSwitchFromTH",
         "lowBattThreshold",
         "sensorTimeDifference"
       ]
diff --git a/lib/device/fan.js b/lib/device/fan.js
index 94ee5f45..3e83402d 100644
--- a/lib/device/fan.js
+++ b/lib/device/fan.js
@@ -18,6 +18,11 @@ module.exports = class deviceFan {
     this.name = accessory.displayName
     this.accessory = accessory
 
+    // Set up custom variables for this device type
+    const deviceId = this.accessory.context.eweDeviceId
+    const deviceConf = platform.fanDevices[deviceId]
+    this.hideLight = deviceConf && deviceConf.hideLight
+
     // Add the fan service if it doesn't already exist
     this.service = this.accessory.getService(this.hapServ.Fan) ||
       this.accessory.addService(this.hapServ.Fan)
@@ -37,8 +42,7 @@ module.exports = class deviceFan {
       .setProps({ minStep: 33 })
 
     // Check to see if the user has hidden the light channel
-    const eweId = this.accessory.context.eweDeviceId
-    if (this.platform.config.hideLightFromFan.includes(eweId)) {
+    if (this.hideLight) {
       // The user has hidden the light channel, so remove it if it exists
       if (this.accessory.getService(this.hapServ.Lightbulb)) {
         this.accessory.removeService(this.accessory.getService(this.hapServ.Lightbulb))
diff --git a/lib/device/light-colour.js b/lib/device/light-colour.js
index d609bad0..2605504e 100644
--- a/lib/device/light-colour.js
+++ b/lib/device/light-colour.js
@@ -5,12 +5,12 @@
 module.exports = class deviceLightColour {
   constructor (platform, accessory) {
     // Set up variables from the platform
-    this.colourUtils = platform.colourUtils
     this.consts = platform.consts
     this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
+    this.colourUtils = platform.colourUtils
     this.log = platform.log
     this.messages = platform.messages
     this.platform = platform
@@ -20,6 +20,16 @@ module.exports = class deviceLightColour {
     this.accessory = accessory
     this.isB1 = this.accessory.context.eweUIID === 22
 
+    // Set up custom variables for this device type
+    const deviceId = this.accessory.context.eweDeviceId
+    const deviceConf = platform.lightDevices[deviceId]
+    this.alShift = deviceConf && deviceConf.adaptiveLightingShift
+      ? deviceConf.adaptiveLightingShift
+      : platform.consts.defaultValues.adaptiveLightingShift
+    this.brightStep = deviceConf && deviceConf.brightnessStep
+      ? Math.min(deviceConf.brightnessStep, 100)
+      : platform.consts.defaultValues.brightnessStep
+
     // Add the lightbulb service if it doesn't already exist
     this.service = this.accessory.getService(this.hapServ.Lightbulb) ||
       this.accessory.addService(this.hapServ.Lightbulb)
@@ -31,6 +41,7 @@ module.exports = class deviceLightColour {
     // Add the set handler to the lightbulb brightness characteristic
     this.service.getCharacteristic(this.hapChar.Brightness)
       .on('set', this.internalBrightnessUpdate.bind(this))
+      .setProps({ minStep: this.brightStep })
 
     // Add the set handler to the lightbulb hue characteristic
     this.service.getCharacteristic(this.hapChar.Hue)
@@ -61,7 +72,10 @@ module.exports = class deviceLightColour {
         this.cacheBright = this.service.getCharacteristic(this.hapChar.Brightness).value
 
         // Set up the adaptive lighting controller
-        this.alController = new platform.api.hap.AdaptiveLightingController(this.service)
+        this.alController = new platform.api.hap.AdaptiveLightingController(
+          this.service,
+          { customTemperatureAdjustment: this.alShift }
+        )
         this.accessory.configureController(this.alController)
       }
     }
diff --git a/lib/device/light-ctemp.js b/lib/device/light-ctemp.js
index 82005561..446f97c1 100644
--- a/lib/device/light-ctemp.js
+++ b/lib/device/light-ctemp.js
@@ -18,6 +18,35 @@ module.exports = class deviceLightColour {
     this.name = accessory.displayName
     this.accessory = accessory
 
+    // Set up custom variables for this device type
+    const deviceId = this.accessory.context.eweDeviceId
+    const deviceConf = platform.lightDevices[deviceId]
+    this.model = deviceConf && deviceConf.model
+      ? deviceConf.model
+      : platform.consts.defaultValues.model
+    this.alShift = deviceConf && deviceConf.adaptiveLightingShift
+      ? deviceConf.adaptiveLightingShift
+      : platform.consts.defaultValues.adaptiveLightingShift
+    this.brightStep = deviceConf && deviceConf.brightnessStep
+      ? Math.min(deviceConf.brightnessStep, 100)
+      : platform.consts.defaultValues.brightnessStep
+
+    // Different bulbs have different colour temperature ranges
+    switch (this.model) {
+      case 'bulbB02FST64':
+        this.minK = 1800
+        this.maxK = 5000
+        break
+      case 'bulbB02BA60':
+        this.minK = 2700
+        this.maxK = 6500
+        break
+      default:
+        this.minK = 2200
+        this.maxK = 6500
+        break
+    }
+
     // Add the lightbulb service if it doesn't already exist
     this.service = this.accessory.getService(this.hapServ.Lightbulb) ||
       this.accessory.addService(this.hapServ.Lightbulb)
@@ -29,23 +58,12 @@ module.exports = class deviceLightColour {
     // Add the set handler to the lightbulb brightness characteristic
     this.service.getCharacteristic(this.hapChar.Brightness)
       .on('set', this.internalBrightnessUpdate.bind(this))
+      .setProps({ minStep: this.brightStep })
 
     // Add the set handler to the lightbulb colour temperature characteristic
     this.service.getCharacteristic(this.hapChar.ColorTemperature)
       .on('set', this.internalCTempUpdate.bind(this))
 
-    // Different bulbs have different colour temperature ranges
-    if (platform.config.bulbB02FST64.includes(this.accessory.context.eweDeviceId)) {
-      this.minK = 1800
-      this.maxK = 5000
-    } else if (platform.config.bulbB02BA60.includes(this.accessory.context.eweDeviceId)) {
-      this.minK = 2700
-      this.maxK = 6500
-    } else {
-      this.minK = 2200
-      this.maxK = 6500
-    }
-
     // Set up the adaptive lighting controller if available
     if (
       platform.api.versionGreaterOrEqual &&
@@ -55,7 +73,10 @@ module.exports = class deviceLightColour {
       this.cacheBrightness = this.service.getCharacteristic(this.hapChar.Brightness).value
 
       // Set up the adaptive lighting controller
-      this.alController = new platform.api.hap.AdaptiveLightingController(this.service)
+      this.alController = new platform.api.hap.AdaptiveLightingController(
+        this.service,
+        { customTemperatureAdjustment: this.alShift }
+      )
       this.accessory.configureController(this.alController)
     }
   }
diff --git a/lib/device/outlet.js b/lib/device/outlet.js
index a4e5bb38..ba44ddb9 100644
--- a/lib/device/outlet.js
+++ b/lib/device/outlet.js
@@ -19,7 +19,11 @@ module.exports = class deviceOutlet {
     this.accessory = accessory
 
     // Set up custom variables for this device type
-    this.inUsePowerThreshold = this.platform.config.inUsePowerThreshold
+    const deviceId = this.accessory.context.eweDeviceId
+    const deviceConf = platform.outletDevices[deviceId]
+    this.inUsePowerThreshold = deviceConf && deviceConf.inUsePowerThreshold
+      ? deviceConf.inUsePowerThreshold
+      : platform.consts.defaultValues.inUsePowerThreshold
 
     // Set up the custom Eve characteristics for this device type
     this.inherits = require('util').inherits
diff --git a/lib/device/sensor-ambient.js b/lib/device/sensor-ambient.js
index 982f8da6..6e764820 100644
--- a/lib/device/sensor-ambient.js
+++ b/lib/device/sensor-ambient.js
@@ -19,9 +19,12 @@ module.exports = class deviceSensorAmbient {
     this.accessory = accessory
 
     // Set up custom variables for this device type
-    const eweId = this.accessory.context.eweDeviceId
-    this.tempOffset = Number(platform.thTempOffset[eweId] || 0)
-    this.hideSwitch = this.platform.config.hideSwitchFromTH.includes(eweId)
+    const deviceId = this.accessory.context.eweDeviceId
+    const deviceConf = platform.thDevices[deviceId]
+    this.hideSwitch = deviceConf && deviceConf.hideSwitch
+    this.tempOffset = deviceConf && deviceConf.offset
+      ? deviceConf.offset
+      : platform.consts.defaultValues.offset
 
     // If the accessory has a thermostat service then remove it
     if (this.accessory.getService(this.hapServ.Thermostat)) {
@@ -29,7 +32,7 @@ module.exports = class deviceSensorAmbient {
     }
 
     // The user can choose to hide the switch service if they desire
-    if (this.platform.config.hideSwitchFromTH.includes(eweId)) {
+    if (this.hideSwitch) {
       // User has hidden the switch service so remove it if it exists
       if (this.accessory.getService(this.hapServ.Switch)) {
         this.accessory.removeService(this.accessory.getService(this.hapServ.Switch))
diff --git a/lib/device/simulation/thermostat.js b/lib/device/simulation/thermostat.js
index d9bf80ac..bf6b7013 100644
--- a/lib/device/simulation/thermostat.js
+++ b/lib/device/simulation/thermostat.js
@@ -19,8 +19,11 @@ module.exports = class deviceThermostat {
     this.accessory = accessory
 
     // Set up custom variables for this device type
-    const eweId = this.accessory.context.eweDeviceId
-    this.tempOffset = Number(platform.thTempOffset[eweId] || 0)
+    const deviceId = this.accessory.context.eweDeviceId
+    const deviceConf = platform.thDevices[deviceId]
+    this.tempOffset = deviceConf && deviceConf.offset
+      ? deviceConf.offset
+      : platform.consts.defaultValues.offset
 
     // If the accessory has a switch service then remove it
     if (this.accessory.getService(this.hapServ.Switch)) {
diff --git a/lib/device/thermostat.js b/lib/device/thermostat.js
index 170d3fc8..6e16729a 100644
--- a/lib/device/thermostat.js
+++ b/lib/device/thermostat.js
@@ -19,8 +19,11 @@ module.exports = class deviceThermostat {
     this.accessory = accessory
 
     // Set up custom variables for this device type
-    const eweId = this.accessory.context.eweDeviceId
-    this.tempOffset = Number(platform.thTempOffset[eweId] || 0)
+    const deviceId = this.accessory.context.eweDeviceId
+    const deviceConf = platform.thDevices[deviceId]
+    this.tempOffset = deviceConf && deviceConf.offset
+      ? deviceConf.offset
+      : platform.consts.defaultValues.offset
 
     /*
       **************
diff --git a/lib/device/usb.js b/lib/device/usb.js
index cb782ef7..a96085cf 100644
--- a/lib/device/usb.js
+++ b/lib/device/usb.js
@@ -18,8 +18,13 @@ module.exports = class deviceUSB {
     this.name = accessory.displayName
     this.accessory = accessory
 
+    // Set up custom variables for this device type
+    const deviceId = this.accessory.context.eweDeviceId
+    const deviceConf = platform.outletDevices[deviceId]
+    this.showAsSwitch = deviceConf && deviceConf.showAsSwitch
+
     // Check if the user has overridden how this accessory should appear
-    if (platform.config.outletAsSwitch.includes(this.accessory.context.eweDeviceId)) {
+    if (this.showAsSwitch) {
       // User has chosen switch so if the accessory has an outlet service then remove it
       if (this.accessory.getService(this.hapServ.Outlet)) {
         this.accessory.removeService(this.accessory.getService(this.hapServ.Outlet))
diff --git a/lib/device/zigbee/sensor-contact.js b/lib/device/zigbee/sensor-contact.js
index b19c97e9..69fa4934 100644
--- a/lib/device/zigbee/sensor-contact.js
+++ b/lib/device/zigbee/sensor-contact.js
@@ -19,6 +19,9 @@ module.exports = class deviceZBSensorContact {
     this.accessory = accessory
 
     // Set up custom variables for this device type
+    const deviceId = this.accessory.context.eweDeviceId
+    const deviceConf = platform.zigbeeDevices[deviceId]
+    this.scaleBattery = deviceConf && deviceConf.scaleBattery
     this.lowBattThreshold = this.platform.config.lowBattThreshold
 
     // Set up the custom Eve characteristics for this device type
@@ -54,7 +57,7 @@ module.exports = class deviceZBSensorContact {
     try {
       if (this.funcs.hasProperty(params, 'battery') && params.battery !== this.cacheBattery) {
         this.cacheBattery = params.battery
-        const scaledBatt = this.platform.config.ZBDWBatt ? this.cacheBattery * 10 : this.cacheBattery
+        const scaledBatt = this.scaleBattery ? this.cacheBattery * 33 : this.cacheBattery
         this.battService.updateCharacteristic(this.hapChar.BatteryLevel, scaledBatt)
         this.battService.updateCharacteristic(this.hapChar.StatusLowBattery, scaledBatt < this.lowBattThreshold)
         if (params.updateSource && !this.disableDeviceLogging) {
diff --git a/lib/device/zigbee/switch-stateless.js b/lib/device/zigbee/switch-stateless.js
index f52a841a..cda130d6 100644
--- a/lib/device/zigbee/switch-stateless.js
+++ b/lib/device/zigbee/switch-stateless.js
@@ -19,6 +19,9 @@ module.exports = class deviceZBSwitchStateless {
     this.accessory = accessory
 
     // Set up custom variables for this device type
+    const deviceId = this.accessory.context.eweDeviceId
+    const deviceConf = platform.zigbeeDevices[deviceId]
+    this.hideLongDouble = deviceConf && deviceConf.hideLongDouble
     this.lowBattThreshold = this.platform.config.lowBattThreshold
 
     // Add the stateless switch service if it doesn't already exist
@@ -26,10 +29,9 @@ module.exports = class deviceZBSwitchStateless {
       this.accessory.addService(this.hapServ.StatelessProgrammableSwitch)
 
     // Hide the double and long press options if the user wants
-    if (this.platform.config.hideZBLDPress) {
-      this.service.getCharacteristic(this.hapChar.ProgrammableSwitchEvent).setProps({
-        validValues: [0]
-      })
+    if (this.hideLongDouble) {
+      this.service.getCharacteristic(this.hapChar.ProgrammableSwitchEvent)
+        .setProps({ validValues: [0] })
     }
 
     // Add the battery service if it doesn't already exist
diff --git a/lib/fakegato/fakegato-history.js b/lib/fakegato/fakegato-history.js
index 08d19648..ca8bd50e 100644
--- a/lib/fakegato/fakegato-history.js
+++ b/lib/fakegato/fakegato-history.js
@@ -6,15 +6,11 @@ const Format = require('util').format
 const FakeGatoTimer = require('./fakegato-timer').FakeGatoTimer
 const FakeGatoStorage = require('./fakegato-storage').FakeGatoStorage
 const _EPOCH = 978307200
-let homebridge
 let Characteristic, Service
 
-module.exports = function (pHomebridge) {
-  if (pHomebridge && !homebridge) {
-    homebridge = pHomebridge
-    Characteristic = homebridge.hap.Characteristic
-    Service = homebridge.hap.Service
-  }
+module.exports = function (homebridge) {
+  Characteristic = homebridge.hap.Characteristic
+  Service = homebridge.hap.Service
 
   const hexToBase64 = val => {
     return Buffer.from(('' + val).replace(/[^0-9A-F]/ig, ''), 'hex').toString('base64')
@@ -474,7 +470,7 @@ module.exports = function (pHomebridge) {
           homebridge.globalFakeGatoTimer.addData({ entry: entry, service: this })
           break
         case 'custom':
-          if ('power' in entry || 'temp' in entry) {
+          if ('power' in entry || 'temp' in entry || 'humidity' in entry) {
             homebridge.globalFakeGatoTimer.addData({ entry: entry, service: this })
           } else {
             this._addEntry(entry)
diff --git a/lib/index.js b/lib/index.js
index 8dc36663..f79e2055 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -28,9 +28,17 @@ class eWeLinkPlatform {
       // Initialise these variables before anything else
       this.log = log
       this.api = api
+      this.fanDevices = {}
+      this.lightDevices = {}
+      this.multiDevices = {}
+      this.outletDevices = {}
+      this.singleDevices = {}
+      this.thDevices = {}
+      this.zigbeeDevices = {}
+      this.hideChannels = []
+      this.hideMasters = []
       this.ipOverride = {}
       this.obstructSwitches = {}
-      this.thTempOffset = {}
       this.simulations = {}
       this.rfSensors = {}
 
@@ -133,23 +141,6 @@ class eWeLinkPlatform {
             logIgnore(key)
           }
           break
-        case 'bulbB02BA60':
-        case 'bulbB02FST64':
-        case 'hideChanFromHB':
-        case 'hideLightFromFan':
-        case 'hideSwitchFromTH':
-        case 'outletAsSwitch':
-        case 'switchAsOutlet':
-          this.config[key] = []
-          if (typeof val !== 'string' || val === '') {
-            logIgnore(key)
-          } else {
-            const items = val.split(',')
-            items.forEach(item => {
-              this.config[key].push(this.funcs.parseDeviceId(item))
-            })
-          }
-          break
         case 'countryCode': {
           if (!val) {
             throw new Error(this.messages.missingCC)
@@ -162,13 +153,40 @@ class eWeLinkPlatform {
         case 'debugFakegato':
         case 'disableDeviceLogging':
         case 'disablePlugin':
-        case 'hideZBLDPress':
-        case 'ZBDWBatt':
           if (typeof val === 'string') {
             logQuotes(key)
           }
           this.config[key] = val === 'false' ? false : !!val
           break
+        case 'fanDevices':
+          if (Array.isArray(val) && val.length > 0) {
+            val.forEach(x => {
+              if (!x.deviceId) {
+                logIgnoreItem(key)
+                return
+              }
+              const deviceId = this.funcs.parseDeviceId(x.deviceId)
+              this.fanDevices[deviceId] = {}
+              for (const [k, v] of Object.entries(x)) {
+                switch (k) {
+                  case 'deviceId':
+                    break
+                  case 'hideLight':
+                    if (typeof val === 'string') {
+                      logQuotes(k)
+                    }
+                    this.fanDevices[deviceId][k] = v === 'false' ? false : !!v
+                    break
+                  default:
+                    logRemove(key + '.' + k)
+                    break
+                }
+              }
+            })
+          } else {
+            logIgnore(key)
+          }
+          break
         case 'groups':
           if (Array.isArray(val) && val.length > 0) {
             val.forEach(x => {
@@ -261,7 +279,6 @@ class eWeLinkPlatform {
           }
           break
         }
-        case 'inUsePowerThreshold':
         case 'lowBattThreshold':
         case 'sensorTimeDifference': {
           if (typeof val === 'string') {
@@ -294,8 +311,60 @@ class eWeLinkPlatform {
                   case 'deviceIP': {
                     if (typeof v !== 'string' || v === '') {
                       logIgnore(key + '.' + k)
+                    } else {
+                      this.ipOverride[deviceId] = v
+                    }
+                    break
+                  }
+                  default:
+                    logRemove(key + '.' + k)
+                    break
+                }
+              }
+            })
+          } else {
+            logIgnore(key)
+          }
+          break
+        case 'lightDevices':
+          if (Array.isArray(val) && val.length > 0) {
+            val.forEach(x => {
+              if (!x.deviceId) {
+                logIgnoreItem(key)
+                return
+              }
+              const deviceId = this.funcs.parseDeviceId(x.deviceId)
+              this.lightDevices[deviceId] = {}
+              for (const [k, v] of Object.entries(x)) {
+                switch (k) {
+                  case 'adaptiveLightingShift':
+                  case 'brightnessStep': {
+                    if (typeof v === 'string') {
+                      logQuotes(key + '.' + k)
+                    }
+                    const intVal = parseInt(v)
+                    if (isNaN(intVal)) {
+                      logDefault(key + '.' + k, this.consts.defaultValues[k])
+                      this.lightDevices[deviceId][k] = this.consts.defaultValues[k]
+                    } else if (intVal < this.consts.minValues[k]) {
+                      logIncrease(key + '.' + k, this.consts.minValues[k])
+                      this.lightDevices[deviceId][k] = this.consts.minValues[k]
+                    } else {
+                      this.lightDevices[deviceId][k] = intVal
+                    }
+                    break
+                  }
+                  case 'deviceId':
+                    break
+                  case 'bulbModel': {
+                    const inSet = this.consts.allowed.bulbModels.includes(v)
+                    if (typeof v !== 'string' || !inSet) {
+                      logIgnore(k)
+                    } else {
+                      this.lightDevices[deviceId][k] = inSet
+                        ? v
+                        : this.consts.defaultValues[k]
                     }
-                    this.ipOverride[deviceId] = v
                     break
                   }
                   default:
@@ -313,9 +382,90 @@ class eWeLinkPlatform {
           if (typeof val !== 'string' || !inSet) {
             logIgnore(key)
           }
-          this.config.mode = inSet ? val : 'auto'
+          this.config.mode = inSet ? val : this.consts.defaultValues[key]
           break
         }
+        case 'multiDevices':
+          if (Array.isArray(val) && val.length > 0) {
+            val.forEach(x => {
+              if (!x.deviceId) {
+                logIgnoreItem(key)
+                return
+              }
+              const deviceId = this.funcs.parseDeviceId(x.deviceId)
+              this.multiDevices[deviceId] = {}
+              for (const [k, v] of Object.entries(x)) {
+                switch (k) {
+                  case 'deviceId':
+                    break
+                  case 'hideChannels': {
+                    if (typeof v !== 'string' || v === '') {
+                      logIgnore(key + '.' + k)
+                    } else {
+                      const channels = v.split(',')
+                      channels.forEach(channel => {
+                        this.hideChannels.push(
+                          deviceId + 'SW' + channel.replace(/[^0-9]+/g, '')
+                        )
+                      })
+                    }
+                    break
+                  }
+                  default:
+                    logRemove(key + '.' + k)
+                    break
+                }
+              }
+            })
+          } else {
+            logIgnore(key)
+          }
+          break
+        case 'outletDevices':
+          if (Array.isArray(val) && val.length > 0) {
+            val.forEach(x => {
+              if (!x.deviceId) {
+                logIgnoreItem(key)
+                return
+              }
+              const deviceId = this.funcs.parseDeviceId(x.deviceId)
+              this.outletDevices[deviceId] = {}
+              for (const [k, v] of Object.entries(x)) {
+                switch (k) {
+                  case 'deviceId':
+                    break
+                  case 'inUsePowerThreshold': {
+                    if (typeof v === 'string') {
+                      logQuotes(k)
+                    }
+                    const intVal = parseInt(v)
+                    if (isNaN(intVal)) {
+                      logDefault(key + '.' + k, this.consts.defaultValues[k])
+                      this.outletDevices[deviceId][k] = this.consts.defaultValues[k]
+                    } else if (intVal < this.consts.minValues[k]) {
+                      logIncrease(key + '.' + k, this.consts.minValues[k])
+                      this.outletDevices[deviceId][k] = this.consts.minValues[k]
+                    } else {
+                      this.outletDevices[deviceId][k] = intVal
+                    }
+                    break
+                  }
+                  case 'showAsSwitch':
+                    if (typeof val === 'string') {
+                      logQuotes(k)
+                    }
+                    this.outletDevices[deviceId][k] = v === 'false' ? false : !!v
+                    break
+                  default:
+                    logRemove(key + '.' + k)
+                    break
+                }
+              }
+            })
+          } else {
+            logIgnore(key)
+          }
+          break
         case 'name':
         case 'platform':
         case 'plugin_map':
@@ -326,7 +476,7 @@ class eWeLinkPlatform {
           }
           this.config.password = val
           break
-        case 'thTempOffset':
+        case 'singleDevices':
           if (Array.isArray(val) && val.length > 0) {
             val.forEach(x => {
               if (!x.deviceId) {
@@ -334,19 +484,55 @@ class eWeLinkPlatform {
                 return
               }
               const deviceId = this.funcs.parseDeviceId(x.deviceId)
+              this.singleDevices[deviceId] = {}
               for (const [k, v] of Object.entries(x)) {
                 switch (k) {
                   case 'deviceId':
                     break
+                  case 'showAsOutlet':
+                    if (typeof val === 'string') {
+                      logQuotes(k)
+                    }
+                    this.singleDevices[deviceId][k] = v === 'false' ? false : !!v
+                    break
+                  default:
+                    logRemove(key + '.' + k)
+                    break
+                }
+              }
+            })
+          } else {
+            logIgnore(key)
+          }
+          break
+        case 'thDevices':
+          if (Array.isArray(val) && val.length > 0) {
+            val.forEach(x => {
+              if (!x.deviceId) {
+                logIgnoreItem(key)
+                return
+              }
+              const deviceId = this.funcs.parseDeviceId(x.deviceId)
+              this.thDevices[deviceId] = {}
+              for (const [k, v] of Object.entries(x)) {
+                switch (k) {
+                  case 'deviceId':
+                    break
+                  case 'hideSwitch':
+                    if (typeof val === 'string') {
+                      logQuotes(k)
+                    }
+                    this.thDevices[deviceId][k] = v === 'false' ? false : !!v
+                    break
                   case 'offset': {
                     if (typeof v === 'string') {
                       logQuotes(key + '.' + k)
                     }
-                    const intVal = Number(v)
-                    if (isNaN(intVal)) {
+                    const numVal = Number(v)
+                    if (isNaN(numVal)) {
                       logIgnore(key + '.' + k)
                     } else {
-                      this.thTempOffset[deviceId] = intVal
+                      this.thDevices[deviceId][k] = numVal
                     }
                     break
                   }
@@ -366,6 +552,36 @@ class eWeLinkPlatform {
           }
           this.config.username = val.replace(/[\s]+/g, '')
           break
+        case 'zigbeeDevices':
+          if (Array.isArray(val) && val.length > 0) {
+            val.forEach(x => {
+              if (!x.deviceId) {
+                logIgnoreItem(key)
+                return
+              }
+              const deviceId = this.funcs.parseDeviceId(x.deviceId)
+              this.zigbeeDevices[deviceId] = {}
+              for (const [k, v] of Object.entries(x)) {
+                switch (k) {
+                  case 'deviceId':
+                    break
+                  case 'hideLongDouble':
+                  case 'scaleBattery':
+                    if (typeof val === 'string') {
+                      logQuotes(k)
+                    }
+                    this.zigbeeDevices[deviceId][k] = v === 'false' ? false : !!v
+                    break
+                  default:
+                    logRemove(key + '.' + k)
+                    break
+                }
+              }
+            })
+          } else {
+            logIgnore(key)
+          }
+          break
       }
     }
   }
@@ -384,9 +600,6 @@ class eWeLinkPlatform {
       // Log that the plugin initialisation has been successful
       this.log('[v%s] %s.', PLUGIN.version, this.messages.initialised)
 
-      // Set up further global variables
-      this.hiddenMasters = []
-
       // Require any libraries that the plugin uses
       this.axios = require('axios')
       this.crypto = require('crypto')
@@ -741,7 +954,8 @@ class eWeLinkPlatform {
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
           : this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = this.config.outletAsSwitch.includes(device.deviceid)
+        accessory.control = this.outletDevices[device.deviceid] &&
+          this.outletDevices[device.deviceid].showAsSwitch
           ? new (require('./device/switch-single'))(this, accessory)
           : new (require('./device/outlet'))(this, accessory)
         /*****/
@@ -797,7 +1011,8 @@ class eWeLinkPlatform {
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
           : this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = this.config.switchAsOutlet.includes(device.deviceid)
+        accessory.control = this.singleDevices[device.deviceid] &&
+          this.singleDevices[device.deviceid].showAsOutlet
           ? new (require('./device/outlet'))(this, accessory)
           : new (require('./device/switch-single'))(this, accessory)
         /***********************/
@@ -807,7 +1022,7 @@ class eWeLinkPlatform {
         ***********************/
         for (let i = 0; i <= this.consts.chansFromUiid[device.extra.uiid]; i++) {
           // Check if the user has chosen to hide any channels for this device
-          if (this.config.hideChanFromHB.includes(device.deviceid + 'sw' + i)) {
+          if (this.hideChannels.includes(device.deviceid + 'SW' + i)) {
             // The user has hidden this channel so if it exists then remove it
             if (this.devicesInHB.has(device.deviceid + 'SW' + i)) {
               this.removeAccessory(this.devicesInHB.get(device.deviceid + 'SW' + i))
@@ -815,7 +1030,7 @@ class eWeLinkPlatform {
 
             // If this is the main channel then add it to the array of hidden masters
             if (i === 0) {
-              this.hiddenMasters.push(device.deviceid)
+              this.hideMasters.push(device.deviceid)
             }
 
             // Add the sub accessory, but hidden, to Homebridge
@@ -881,7 +1096,7 @@ class eWeLinkPlatform {
         accessory.control = new (require('./device/rf-bridge'))(this, accessory)
 
         // We don't want to add the main bridge as an accessory in Homebridge
-        this.hiddenMasters.push(device.deviceid)
+        this.hideMasters.push(device.deviceid)
 
         // Loop through each sub device connected to the RF Bridge
         rfMap.forEach(subDevice => {
@@ -890,7 +1105,6 @@ class eWeLinkPlatform {
           let sensorTimeLength
           let subExtraContext = {}
           const fullDeviceId = device.deviceid + 'SW' + swNumber
-          const lowCaseDeviceId = device.deviceid + 'sw' + swNumber
 
           // Check which eWeLink type the connected sub device is
           if (['1', '2', '3', '4'].includes(subDevice.type)) {
@@ -898,11 +1112,11 @@ class eWeLinkPlatform {
           } else if (subDevice.type === '5') {
             subType = 'curtain'
           } else if (subDevice.type === '6') {
-            subType = this.rfSensors[lowCaseDeviceId]
-              ? this.rfSensors[lowCaseDeviceId].type
+            subType = this.rfSensors[fullDeviceId]
+              ? this.rfSensors[fullDeviceId].type
               : 'motion'
-            if (this.rfSensors[lowCaseDeviceId]) {
-              sensorTimeLength = this.rfSensors[lowCaseDeviceId].sensorTimeLength
+            if (this.rfSensors[fullDeviceId]) {
+              sensorTimeLength = this.rfSensors[fullDeviceId].sensorTimeLength
             }
           } else {
             const type = subDevice.type || '?'
@@ -1056,7 +1270,7 @@ class eWeLinkPlatform {
 
       // Update the current firmware version if the accessory isn't hidden
       if (
-        !this.hiddenMasters.includes(device.deviceid) &&
+        !this.hideMasters.includes(device.deviceid) &&
         !this.obstructSwitches[device.deviceid]
       ) {
         accessory.getService(this.api.hap.Service.AccessoryInformation)
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index f5bd21a3..b42bb16d 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -13,19 +13,15 @@ module.exports = {
     debug: false,
     debugFakegato: false,
     disablePlugin: false,
-    hideChanFromHB: '', // multiDevices{}
-    switchAsOutlet: '', // singleDevices{}
-    outletAsSwitch: '', // outletDevices{}
-    inUsePowerThreshold: 0, // outletDevices{}
-    hideLightFromFan: '', // fanDevices{}
-    hideSwitchFromTH: '', // thDevices{}
+    singleDevices: [],
+    multiDevices: [],
+    outletDevices: [],
+    lightDevices: [],
+    thDevices: [],
+    fanDevices: [],
+    zigbeeDevices: [],
     lowBattThreshold: 25, // sensorDevices{}
     sensorTimeDifference: 120, // sensorDevices{}
-    bulbB02BA60: '', // lightDevices{}
-    bulbB02FST64: '', // lightDevices{}
-    thTempOffset: [], // thDevices{}
-    hideZBLDPress: false, // sensorDevices{}
-    ZBDWBatt: false, // sensorDevices{}
     groups: [],
     bridgeSensors: [],
     ipOverride: [],
@@ -39,7 +35,11 @@ module.exports = {
     sensorTimeLength: 60,
     sensorTimeDifference: 120,
     offset: 0,
-    operationTime: 100
+    operationTime: 100,
+    mode: 'auto',
+    bulbModel: 'bulbB02FA60',
+    brightnessStep: 1,
+    adaptiveLightingShift: 0
   },
 
   minValues: {
@@ -47,7 +47,9 @@ module.exports = {
     lowBattThreshold: 5,
     sensorTimeLength: 1,
     sensorTimeDifference: 10,
-    operationTime: 20
+    operationTime: 20,
+    brightnessStep: 1,
+    adaptiveLightingShift: 0
   },
 
   messages: {
@@ -153,7 +155,8 @@ module.exports = {
     modes: ['auto', 'wan', 'lan'],
     obstructs: ['garage', 'garage_eachen'],
     setups: ['oneSwitch', 'twoSwitch'],
-    sensors: ['water', 'smoke', 'co', 'co2', 'contact', 'occupancy', 'motion']
+    sensors: ['water', 'smoke', 'co', 'co2', 'contact', 'occupancy', 'motion'],
+    bulbModels: ['bulbB02BA60', 'bulbB02FA60', 'bulbB02FST64']
   },
 
   devices: {
diff --git a/lib/utils/functions.js b/lib/utils/functions.js
index c0ba6965..11b79e60 100644
--- a/lib/utils/functions.js
+++ b/lib/utils/functions.js
@@ -12,7 +12,7 @@ module.exports = {
   },
 
   parseDeviceId: deviceId => {
-    return deviceId.toLowerCase().replace(/[^a-z0-9]+/g, '')
+    return deviceId.toLowerCase().replace(/[^a-z0-9]+/g, '').replace('sw', 'SW')
   },
 
   parseError: err => {

From d3d8b4fb345b5f10706407cd39ce05d9967bbed4 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 15 Feb 2021 13:37:22 +0000
Subject: [PATCH 1459/3183] overhaul sensor devices

---
 config.schema.json                    |  95 ++++++++---------
 lib/device/sensor-contact.js          |   6 +-
 lib/device/zigbee/sensor-ambient.js   |   6 +-
 lib/device/zigbee/sensor-contact.js   |   6 +-
 lib/device/zigbee/sensor-motion.js    |   6 +-
 lib/device/zigbee/switch-stateless.js |   6 +-
 lib/index.js                          | 141 +++++++++++++++-----------
 lib/utils/constants.js                |   3 +-
 8 files changed, 146 insertions(+), 123 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 753fd6ee..a84a615a 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -80,6 +80,11 @@
               "type": "boolean",
               "title": "Show As Outlet",
               "description": "If true, this accessory will show as an outlet in HomeKit instead of a switch."
+            },
+            "ipAddress": {
+              "type": "string",
+              "title": "IP Address",
+              "description": "You can manually set the IP address for this device if it cannot be discovered by the plugin."
             }
           }
         }
@@ -97,6 +102,11 @@
               "type": "string",
               "title": "Hide Channels",
               "description": "A comma separated list of channels to hide for this device. For example '0' or '0,1,2'."
+            },
+            "ipAddress": {
+              "type": "string",
+              "title": "IP Address",
+              "description": "You can manually set the IP address for this device if it cannot be discovered by the plugin."
             }
           }
         }
@@ -124,6 +134,11 @@
               "condition": {
                 "functionBody": "return (model.outletDevices[arrayIndices] && !model.outletDevices[arrayIndices].showAsSwitch)"
               }
+            },
+            "ipAddress": {
+              "type": "string",
+              "title": "IP Address",
+              "description": "You can manually set the IP address for this device if it cannot be discovered by the plugin."
             }
           }
         }
@@ -213,7 +228,7 @@
           }
         }
       },
-      "zigbeeDevices": {
+      "sensorDevices": {
         "type": "array",
         "items": {
           "type": "object",
@@ -222,6 +237,13 @@
               "type": "string",
               "title": "Device ID"
             },
+            "lowBattThreshold": {
+              "type": "number",
+              "title": "Low Battery Threshold",
+              "description": "HomeKit will set the low battery status for this device when the battery (if it has one) reaches this percentage level. Must be 5 or more.",
+              "placeholder": 25,
+              "minimum": 5
+            },
             "hideLongDouble": {
               "type": "boolean",
               "title": "Hide Light Switch",
@@ -235,13 +257,6 @@
           }
         }
       },
-      "lowBattThreshold": {
-        "type": "number",
-        "title": "Low Battery Threshold",
-        "description": "HomeKit will set the low battery status for supported devices when the device battery reaches this percentage level. Must be 5 or more.",
-        "placeholder": 25,
-        "minimum": 5
-      },
       "sensorTimeDifference": {
         "type": "number",
         "title": "Sensor Lag",
@@ -391,6 +406,11 @@
               "condition": {
                 "functionBody": "return (model.groups[arrayIndices] && ['garage', 'garage_eachen'].includes(model.groups[arrayIndices].type))"
               }
+            },
+            "ipAddress": {
+              "type": "string",
+              "title": "IP Address",
+              "description": "You can manually set the IP address for this device if it cannot be discovered by the plugin."
             }
           }
         }
@@ -464,22 +484,6 @@
           }
         }
       },
-      "ipOverride": {
-        "type": "array",
-        "items": {
-          "type": "object",
-          "properties": {
-            "deviceId": {
-              "type": "string",
-              "title": "Device ID"
-            },
-            "deviceIP": {
-              "type": "string",
-              "title": "Device IP"
-            }
-          }
-        }
-      },
       "ignoredDevices": {
         "title": "Ignored Devices",
         "type": "array",
@@ -515,7 +519,7 @@
     {
       "key": "singleDevices",
       "title": "Single Channel Devices",
-      "description": "Applies to single-channel switch and light switch devices.",
+      "description": "Applies to single-channel switch, light switch and Slampher devices.",
       "expandable": true,
       "add": "Add Another Device",
       "type": "array",
@@ -524,7 +528,8 @@
           "type": "fieldset",
           "items": [
             "singleDevices[].deviceId",
-            "singleDevices[].showAsOutlet"
+            "singleDevices[].showAsOutlet",
+            "singleDevices[].ipAddress"
           ]
         }
       ]
@@ -541,7 +546,8 @@
           "type": "fieldset",
           "items": [
             "multiDevices[].deviceId",
-            "multiDevices[].hideChannels"
+            "multiDevices[].hideChannels",
+            "multiDevices[].ipAddress"
           ]
         }
       ]
@@ -559,7 +565,8 @@
           "items": [
             "outletDevices[].deviceId",
             "outletDevices[].showAsSwitch",
-            "outletDevices[].inUsePowerThreshold"
+            "outletDevices[].inUsePowerThreshold",
+            "outletDevices[].ipAddress"
           ]
         }
       ]
@@ -619,9 +626,9 @@
       ]
     },
     {
-      "key": "zigbeeDevices",
-      "title": "Zigbee Devices",
-      "description": "Applies to Zigbee devices.",
+      "key": "sensorDevices",
+      "title": "Sensor Devices",
+      "description": "Applies to the DW2 and Zigbee sensor devices.",
       "expandable": true,
       "add": "Add Another Device",
       "type": "array",
@@ -629,9 +636,10 @@
         {
           "type": "fieldset",
           "items": [
-            "zigbeeDevices[].deviceId",
-            "zigbeeDevices[].hideLongDouble",
-            "zigbeeDevices[].scaleBattery"
+            "sensorDevices[].deviceId",
+            "sensorDevices[].lowBattThreshold",
+            "sensorDevices[].hideLongDouble",
+            "sensorDevices[].scaleBattery"
           ]
         }
       ]
@@ -641,7 +649,6 @@
       "title": "Device Settings",
       "expandable": true,
       "items": [
-        "lowBattThreshold",
         "sensorTimeDifference"
       ]
     },
@@ -662,6 +669,7 @@
             "groups[].operationTime",
             "groups[].sensorId",
             "groups[].obstructId",
+            "groups[].ipAddress",
             {
               "type": "help",
               "helpvalue": "<label class=\"control-label text-warning\">⚠ After restarting Homebridge you will need to remove this accessory from the cache for it set up correctly.</label>"
@@ -688,23 +696,6 @@
         }
       ]
     },
-    {
-      "key": "ipOverride",
-      "title": "Device IPs",
-      "description": "Set manual IPs for your devices if the plugin cannot automatically discover them.",
-      "expandable": true,
-      "add": "Add Another IP",
-      "type": "array",
-      "items": [
-        {
-          "type": "fieldset",
-          "items": [
-            "ipOverride[].deviceId",
-            "ipOverride[].deviceIP"
-          ]
-        }
-      ]
-    },
     {
       "key": "ignoredDevices",
       "expandable": true,
diff --git a/lib/device/sensor-contact.js b/lib/device/sensor-contact.js
index a94faf81..60a4efd0 100644
--- a/lib/device/sensor-contact.js
+++ b/lib/device/sensor-contact.js
@@ -19,7 +19,11 @@ module.exports = class deviceSensorContact {
     this.accessory = accessory
 
     // Set up custom variables for this device type
-    this.lowBattThreshold = this.platform.config.lowBattThreshold
+    const deviceId = this.accessory.context.eweDeviceId
+    const deviceConf = platform.sensorDevices[deviceId]
+    this.lowBattThreshold = deviceConf && deviceConf.lowBattThreshold
+      ? Math.min(deviceConf.lowBattThreshold, 100)
+      : platform.consts.defaultValues.lowBattThreshold
 
     // Set up the custom Eve characteristics for this device type
     this.inherits = require('util').inherits
diff --git a/lib/device/zigbee/sensor-ambient.js b/lib/device/zigbee/sensor-ambient.js
index 2087d548..89ec4ebf 100644
--- a/lib/device/zigbee/sensor-ambient.js
+++ b/lib/device/zigbee/sensor-ambient.js
@@ -19,7 +19,11 @@ module.exports = class deviceZBSensorAmbient {
     this.accessory = accessory
 
     // Set up custom variables for this device type
-    this.lowBattThreshold = this.platform.config.lowBattThreshold
+    const deviceId = this.accessory.context.eweDeviceId
+    const deviceConf = platform.sensorDevices[deviceId]
+    this.lowBattThreshold = deviceConf && deviceConf.lowBattThreshold
+      ? Math.min(deviceConf.lowBattThreshold, 100)
+      : platform.consts.defaultValues.lowBattThreshold
 
     // Add the temperature sensor service if it doesn't already exist
     this.tService = this.accessory.getService(this.hapServ.TemperatureSensor) ||
diff --git a/lib/device/zigbee/sensor-contact.js b/lib/device/zigbee/sensor-contact.js
index 69fa4934..1280e772 100644
--- a/lib/device/zigbee/sensor-contact.js
+++ b/lib/device/zigbee/sensor-contact.js
@@ -20,9 +20,11 @@ module.exports = class deviceZBSensorContact {
 
     // Set up custom variables for this device type
     const deviceId = this.accessory.context.eweDeviceId
-    const deviceConf = platform.zigbeeDevices[deviceId]
+    const deviceConf = platform.sensorDevices[deviceId]
     this.scaleBattery = deviceConf && deviceConf.scaleBattery
-    this.lowBattThreshold = this.platform.config.lowBattThreshold
+    this.lowBattThreshold = deviceConf && deviceConf.lowBattThreshold
+      ? Math.min(deviceConf.lowBattThreshold, 100)
+      : platform.consts.defaultValues.lowBattThreshold
 
     // Set up the custom Eve characteristics for this device type
     this.inherits = require('util').inherits
diff --git a/lib/device/zigbee/sensor-motion.js b/lib/device/zigbee/sensor-motion.js
index a777dce2..9ab43721 100644
--- a/lib/device/zigbee/sensor-motion.js
+++ b/lib/device/zigbee/sensor-motion.js
@@ -19,7 +19,11 @@ module.exports = class deviceZBSensorMotion {
     this.accessory = accessory
 
     // Set up custom variables for this device type
-    this.lowBattThreshold = this.platform.config.lowBattThreshold
+    const deviceId = this.accessory.context.eweDeviceId
+    const deviceConf = platform.sensorDevices[deviceId]
+    this.lowBattThreshold = deviceConf && deviceConf.lowBattThreshold
+      ? Math.min(deviceConf.lowBattThreshold, 100)
+      : platform.consts.defaultValues.lowBattThreshold
     this.sensorTimeDifference = this.platform.config.sensorTimeDifference
 
     // Set up the custom Eve characteristics for this device type
diff --git a/lib/device/zigbee/switch-stateless.js b/lib/device/zigbee/switch-stateless.js
index cda130d6..a61df013 100644
--- a/lib/device/zigbee/switch-stateless.js
+++ b/lib/device/zigbee/switch-stateless.js
@@ -20,9 +20,11 @@ module.exports = class deviceZBSwitchStateless {
 
     // Set up custom variables for this device type
     const deviceId = this.accessory.context.eweDeviceId
-    const deviceConf = platform.zigbeeDevices[deviceId]
+    const deviceConf = platform.sensorDevices[deviceId]
     this.hideLongDouble = deviceConf && deviceConf.hideLongDouble
-    this.lowBattThreshold = this.platform.config.lowBattThreshold
+    this.lowBattThreshold = deviceConf && deviceConf.lowBattThreshold
+      ? Math.min(deviceConf.lowBattThreshold, 100)
+      : platform.consts.defaultValues.lowBattThreshold
 
     // Add the stateless switch service if it doesn't already exist
     this.service = this.accessory.getService(this.hapServ.StatelessProgrammableSwitch) ||
diff --git a/lib/index.js b/lib/index.js
index f79e2055..71f02bd6 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -32,9 +32,9 @@ class eWeLinkPlatform {
       this.lightDevices = {}
       this.multiDevices = {}
       this.outletDevices = {}
+      this.sensorDevices = {}
       this.singleDevices = {}
       this.thDevices = {}
-      this.zigbeeDevices = {}
       this.hideChannels = []
       this.hideMasters = []
       this.ipOverride = {}
@@ -200,6 +200,14 @@ class eWeLinkPlatform {
                 switch (k) {
                   case 'deviceId':
                     break
+                  case 'ipAddress': {
+                    if (typeof v !== 'string' || v === '') {
+                      logIgnore(key + '.' + k)
+                    } else {
+                      this.ipOverride[deviceId] = v
+                    }
+                    break
+                  }
                   case 'obstructId':
                     if (typeof v !== 'string' || v === '') {
                       logIgnore(key + '.' + k)
@@ -279,7 +287,6 @@ class eWeLinkPlatform {
           }
           break
         }
-        case 'lowBattThreshold':
         case 'sensorTimeDifference': {
           if (typeof val === 'string') {
             logQuotes(key)
@@ -296,36 +303,6 @@ class eWeLinkPlatform {
           }
           break
         }
-        case 'ipOverride':
-          if (Array.isArray(val) && val.length > 0) {
-            val.forEach(x => {
-              if (!x.deviceId) {
-                logIgnoreItem(key)
-                return
-              }
-              const deviceId = this.funcs.parseDeviceId(x.deviceId)
-              for (const [k, v] of Object.entries(x)) {
-                switch (k) {
-                  case 'deviceId':
-                    break
-                  case 'deviceIP': {
-                    if (typeof v !== 'string' || v === '') {
-                      logIgnore(key + '.' + k)
-                    } else {
-                      this.ipOverride[deviceId] = v
-                    }
-                    break
-                  }
-                  default:
-                    logRemove(key + '.' + k)
-                    break
-                }
-              }
-            })
-          } else {
-            logIgnore(key)
-          }
-          break
         case 'lightDevices':
           if (Array.isArray(val) && val.length > 0) {
             val.forEach(x => {
@@ -411,6 +388,14 @@ class eWeLinkPlatform {
                     }
                     break
                   }
+                  case 'ipAddress': {
+                    if (typeof v !== 'string' || v === '') {
+                      logIgnore(key + '.' + k)
+                    } else {
+                      this.ipOverride[deviceId] = v
+                    }
+                    break
+                  }
                   default:
                     logRemove(key + '.' + k)
                     break
@@ -450,6 +435,14 @@ class eWeLinkPlatform {
                     }
                     break
                   }
+                  case 'ipAddress': {
+                    if (typeof v !== 'string' || v === '') {
+                      logIgnore(key + '.' + k)
+                    } else {
+                      this.ipOverride[deviceId] = v
+                    }
+                    break
+                  }
                   case 'showAsSwitch':
                     if (typeof val === 'string') {
                       logQuotes(k)
@@ -476,7 +469,7 @@ class eWeLinkPlatform {
           }
           this.config.password = val
           break
-        case 'singleDevices':
+        case 'sensorDevices':
           if (Array.isArray(val) && val.length > 0) {
             val.forEach(x => {
               if (!x.deviceId) {
@@ -484,17 +477,34 @@ class eWeLinkPlatform {
                 return
               }
               const deviceId = this.funcs.parseDeviceId(x.deviceId)
-              this.singleDevices[deviceId] = {}
+              this.sensorDevices[deviceId] = {}
               for (const [k, v] of Object.entries(x)) {
                 switch (k) {
                   case 'deviceId':
                     break
-                  case 'showAsOutlet':
+                  case 'hideLongDouble':
+                  case 'scaleBattery':
                     if (typeof val === 'string') {
                       logQuotes(k)
                     }
-                    this.singleDevices[deviceId][k] = v === 'false' ? false : !!v
+                    this.sensorDevices[deviceId][k] = v === 'false' ? false : !!v
+                    break
+                  case 'lowBattThreshold': {
+                    if (typeof v === 'string') {
+                      logQuotes(key + '.' + k)
+                    }
+                    const intVal = parseInt(v)
+                    if (isNaN(intVal)) {
+                      logDefault(key + '.' + k, this.consts.defaultValues[k])
+                      this.sensorDevices[deviceId][k] = this.consts.defaultValues[k]
+                    } else if (intVal < this.consts.minValues[k]) {
+                      logIncrease(key + '.' + k, this.consts.minValues[k])
+                      this.sensorDevices[deviceId][k] = this.consts.minValues[k]
+                    } else {
+                      this.sensorDevices[deviceId][k] = intVal
+                    }
                     break
+                  }
                   default:
                     logRemove(key + '.' + k)
                     break
@@ -505,7 +515,7 @@ class eWeLinkPlatform {
             logIgnore(key)
           }
           break
-        case 'thDevices':
+        case 'singleDevices':
           if (Array.isArray(val) && val.length > 0) {
             val.forEach(x => {
               if (!x.deviceId) {
@@ -513,29 +523,25 @@ class eWeLinkPlatform {
                 return
               }
               const deviceId = this.funcs.parseDeviceId(x.deviceId)
-              this.thDevices[deviceId] = {}
+              this.singleDevices[deviceId] = {}
               for (const [k, v] of Object.entries(x)) {
                 switch (k) {
                   case 'deviceId':
                     break
-                  case 'hideSwitch':
-                    if (typeof val === 'string') {
-                      logQuotes(k)
-                    }
-                    this.thDevices[deviceId][k] = v === 'false' ? false : !!v
-                    break
-                  case 'offset': {
-                    if (typeof v === 'string') {
-                      logQuotes(key + '.' + k)
-                    }
-                    const numVal = Number(v)
-                    if (isNaN(numVal)) {
+                  case 'ipAddress': {
+                    if (typeof v !== 'string' || v === '') {
                       logIgnore(key + '.' + k)
                     } else {
-                      this.thDevices[deviceId][k] = numVal
+                      this.ipOverride[deviceId] = v
                     }
                     break
                   }
+                  case 'showAsOutlet':
+                    if (typeof val === 'string') {
+                      logQuotes(k)
+                    }
+                    this.singleDevices[deviceId][k] = v === 'false' ? false : !!v
+                    break
                   default:
                     logRemove(key + '.' + k)
                     break
@@ -546,13 +552,7 @@ class eWeLinkPlatform {
             logIgnore(key)
           }
           break
-        case 'username':
-          if (typeof val !== 'string' || val === '') {
-            throw new Error(this.messages.missingUN)
-          }
-          this.config.username = val.replace(/[\s]+/g, '')
-          break
-        case 'zigbeeDevices':
+        case 'thDevices':
           if (Array.isArray(val) && val.length > 0) {
             val.forEach(x => {
               if (!x.deviceId) {
@@ -560,18 +560,29 @@ class eWeLinkPlatform {
                 return
               }
               const deviceId = this.funcs.parseDeviceId(x.deviceId)
-              this.zigbeeDevices[deviceId] = {}
+              this.thDevices[deviceId] = {}
               for (const [k, v] of Object.entries(x)) {
                 switch (k) {
                   case 'deviceId':
                     break
-                  case 'hideLongDouble':
-                  case 'scaleBattery':
+                  case 'hideSwitch':
                     if (typeof val === 'string') {
                       logQuotes(k)
                     }
-                    this.zigbeeDevices[deviceId][k] = v === 'false' ? false : !!v
+                    this.thDevices[deviceId][k] = v === 'false' ? false : !!v
+                    break
+                  case 'offset': {
+                    if (typeof v === 'string') {
+                      logQuotes(key + '.' + k)
+                    }
+                    const numVal = Number(v)
+                    if (isNaN(numVal)) {
+                      logIgnore(key + '.' + k)
+                    } else {
+                      this.thDevices[deviceId][k] = numVal
+                    }
                     break
+                  }
                   default:
                     logRemove(key + '.' + k)
                     break
@@ -582,6 +593,12 @@ class eWeLinkPlatform {
             logIgnore(key)
           }
           break
+        case 'username':
+          if (typeof val !== 'string' || val === '') {
+            throw new Error(this.messages.missingUN)
+          }
+          this.config.username = val.replace(/[\s]+/g, '')
+          break
       }
     }
   }
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index b42bb16d..7ea5b92c 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -19,12 +19,11 @@ module.exports = {
     lightDevices: [],
     thDevices: [],
     fanDevices: [],
-    zigbeeDevices: [],
+    sensorDevices: [],
     lowBattThreshold: 25, // sensorDevices{}
     sensorTimeDifference: 120, // sensorDevices{}
     groups: [],
     bridgeSensors: [],
-    ipOverride: [],
     ignoredDevices: [],
     platform: 'eWeLink'
   },

From c65f217d7551d38ba19e90413cb230905dbc42de Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 15 Feb 2021 13:58:15 +0000
Subject: [PATCH 1460/3183] rf sensor overhaul

---
 config.schema.json                 | 196 ++++++++++++++---------------
 lib/device/rf-bridge.js            |  14 +--
 lib/device/zigbee/sensor-motion.js |   4 +-
 lib/index.js                       |  34 +++--
 lib/utils/constants.js             |   2 -
 5 files changed, 117 insertions(+), 133 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index a84a615a..b0cf6d17 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -246,23 +246,99 @@
             },
             "hideLongDouble": {
               "type": "boolean",
-              "title": "Hide Light Switch",
+              "title": "Hide Long & Double Press",
               "description": "If true, double and long press options will be hidden for this Zigbee Button."
             },
             "scaleBattery": {
               "type": "boolean",
-              "title": "Hide Light Switch",
+              "title": "Scale Battery",
               "description": "If true, the battery reading for this Zigbee Contact Sensor will be multiplied by 33."
+            },
+            "sensorTimeDifference": {
+              "type": "number",
+              "title": "Sensor Lag",
+              "description": "An offset in seconds to ignore any notifications if they is a delay between this Zigbee Motion Sensor detecting something and the plugin receiving the notification. Must be 10 or more.",
+              "placeholder": 120,
+              "minimum": 10
             }
           }
         }
       },
-      "sensorTimeDifference": {
-        "type": "number",
-        "title": "Sensor Lag",
-        "description": "An offset in seconds to ignore any notifications if they is a delay between a sensor detecting something and the plugin receiving the notification. This setting applies to sensors connected to RF/Zigbee Bridges. Must be 10 or more.",
-        "placeholder": 120,
-        "minimum": 10
+      "bridgeSensors": {
+        "type": "array",
+        "items": {
+          "type": "object",
+          "properties": {
+            "fullDeviceId": {
+              "type": "string",
+              "title": "Sensor Device ID",
+              "description": "Device ID of the sensor (13 digits normally in the format 1000ab23cdSW2)."
+            },
+            "type": {
+              "type": "string",
+              "title": "Sensor Type",
+              "description": "Select the type of sensor you would like to expose this as.",
+              "oneOf": [
+                {
+                  "title": "Motion",
+                  "enum": [
+                    "motion"
+                  ]
+                },
+                {
+                  "title": "Smoke/Fire",
+                  "enum": [
+                    "smoke"
+                  ]
+                },
+                {
+                  "title": "Water/Leak",
+                  "enum": [
+                    "water"
+                  ]
+                },
+                {
+                  "title": "Carbon Monoxide",
+                  "enum": [
+                    "co"
+                  ]
+                },
+                {
+                  "title": "Carbon Dioxide",
+                  "enum": [
+                    "co2"
+                  ]
+                },
+                {
+                  "title": "Occupancy",
+                  "enum": [
+                    "occupancy"
+                  ]
+                },
+                {
+                  "title": "Contact",
+                  "enum": [
+                    "contact"
+                  ]
+                }
+              ]
+            },
+            "sensorTimeLength": {
+              "type": "number",
+              "title": "Sensor Time Length",
+              "description": "The number of seconds which the sensor tile in the Home app will light up for if this sensor is activated. Must be 1 or more.",
+              "placeholder": 60,
+              "minimum": 1
+            },
+            "sensorTimeDifference": {
+              "type": "number",
+              "title": "Sensor Lag",
+              "description": "An offset in seconds to ignore any notifications if they is a delay between a sensor detecting something and the plugin receiving the notification. Must be 10 or more.",
+              "placeholder": 120,
+              "minimum": 10
+            }
+          }
+        }
       },
       "groups": {
         "type": "array",
@@ -415,75 +491,6 @@
           }
         }
       },
-      "bridgeSensors": {
-        "type": "array",
-        "items": {
-          "type": "object",
-          "properties": {
-            "fullDeviceId": {
-              "type": "string",
-              "title": "Sensor Device ID",
-              "description": "Device ID of the sensor (13 digits normally in the format 1000ab23cdSW2)."
-            },
-            "type": {
-              "type": "string",
-              "title": "Sensor Type",
-              "description": "Select the type of sensor you would like to expose this as.",
-              "oneOf": [
-                {
-                  "title": "Motion",
-                  "enum": [
-                    "motion"
-                  ]
-                },
-                {
-                  "title": "Smoke/Fire",
-                  "enum": [
-                    "smoke"
-                  ]
-                },
-                {
-                  "title": "Water/Leak",
-                  "enum": [
-                    "water"
-                  ]
-                },
-                {
-                  "title": "Carbon Monoxide",
-                  "enum": [
-                    "co"
-                  ]
-                },
-                {
-                  "title": "Carbon Dioxide",
-                  "enum": [
-                    "co2"
-                  ]
-                },
-                {
-                  "title": "Occupancy",
-                  "enum": [
-                    "occupancy"
-                  ]
-                },
-                {
-                  "title": "Contact",
-                  "enum": [
-                    "contact"
-                  ]
-                }
-              ]
-            },
-            "sensorTimeLength": {
-              "type": "number",
-              "title": "Sensor Time Length",
-              "description": "The number of seconds which the sensor tile in the Home app will light up for if this sensor is activated. Must be 1 or more.",
-              "placeholder": 60,
-              "minimum": 1
-            }
-          }
-        }
-      },
       "ignoredDevices": {
         "title": "Ignored Devices",
         "type": "array",
@@ -645,11 +652,22 @@
       ]
     },
     {
-      "type": "fieldset",
-      "title": "Device Settings",
+      "key": "bridgeSensors",
+      "title": "RF Sensor Devices",
+      "description": "Expose different types of sensors linked to your RF Bridge - <a href=\"https://github.com/bwp91/homebridge-ewelink/wiki/How-to-set-up-RF-Bridge-sensors\" target=\"_blank\">more info</a>.",
       "expandable": true,
+      "add": "Add Another Sensor",
+      "type": "array",
       "items": [
-        "sensorTimeDifference"
+        {
+          "type": "fieldset",
+          "items": [
+            "bridgeSensors[].fullDeviceId",
+            "bridgeSensors[].type",
+            "bridgeSensors[].sensorTimeLength",
+            "bridgeSensors[].sensorTimeDifference"
+          ]
+        }
       ]
     },
     {
@@ -678,24 +696,6 @@
         }
       ]
     },
-    {
-      "key": "bridgeSensors",
-      "title": "RF Bridge Sensors",
-      "description": "Expose different types of sensors linked to your RF Bridge - <a href=\"https://github.com/bwp91/homebridge-ewelink/wiki/How-to-set-up-RF-Bridge-sensors\" target=\"_blank\">more info</a>.",
-      "expandable": true,
-      "add": "Add Another Sensor",
-      "type": "array",
-      "items": [
-        {
-          "type": "fieldset",
-          "items": [
-            "bridgeSensors[].fullDeviceId",
-            "bridgeSensors[].type",
-            "bridgeSensors[].sensorTimeLength"
-          ]
-        }
-      ]
-    },
     {
       "key": "ignoredDevices",
       "expandable": true,
diff --git a/lib/device/rf-bridge.js b/lib/device/rf-bridge.js
index 9ed9c75f..8f536359 100644
--- a/lib/device/rf-bridge.js
+++ b/lib/device/rf-bridge.js
@@ -18,9 +18,6 @@ module.exports = class deviceRFBridge {
     this.name = accessory.displayName
     this.accessory = accessory
 
-    // Set up custom variables for this device type
-    this.sensorTimeDifference = this.platform.config.sensorTimeDifference
-
     // Set up the custom Eve characteristics for this device type
     this.inherits = require('util').inherits
     const self = this
@@ -175,18 +172,11 @@ module.exports = class deviceRFBridge {
               }
             })
             if (oAccessory) {
-              const sensorTimeLengthPri = parseInt(oAccessory.context.sensorTimeLength)
-              const sensorTimeLengthSec = parseInt(this.platform.config.sensorTimeLength)
-              const sensorTimeLength = isNaN(sensorTimeLengthPri) || sensorTimeLengthPri < 0
-                ? isNaN(sensorTimeLengthSec) || sensorTimeLengthSec < 0
-                  ? this.consts.defaultValues.sensorTimeLength
-                  : sensorTimeLengthSec
-                : sensorTimeLengthPri
               const timeOfMotion = new Date(params[chan])
               const diff = (timeNow.getTime() - timeOfMotion.getTime()) / 1000
               let serv
               let char
-              if (diff < this.sensorTimeDifference) {
+              if (diff < oAccessory.context.sensorTimeDiff) {
                 switch (oAccessory.context.subType) {
                   case 'button':
                     return
@@ -233,7 +223,7 @@ module.exports = class deviceRFBridge {
                 if (params.updateSource && !this.disableDeviceLogging) {
                   this.log('[%s] current state [triggered]', oAccessory.displayName)
                 }
-                await this.funcs.sleep(sensorTimeLength * 1000)
+                await this.funcs.sleep(oAccessory.context.sensorTimeLength * 1000)
                 oAccessory.getService(serv).updateCharacteristic(char, 0)
                 oAccessory.eveService.addEntry({ status: 0 })
                 if (params.updateSource && !this.disableDeviceLogging) {
diff --git a/lib/device/zigbee/sensor-motion.js b/lib/device/zigbee/sensor-motion.js
index 9ab43721..f3644055 100644
--- a/lib/device/zigbee/sensor-motion.js
+++ b/lib/device/zigbee/sensor-motion.js
@@ -24,7 +24,9 @@ module.exports = class deviceZBSensorMotion {
     this.lowBattThreshold = deviceConf && deviceConf.lowBattThreshold
       ? Math.min(deviceConf.lowBattThreshold, 100)
       : platform.consts.defaultValues.lowBattThreshold
-    this.sensorTimeDifference = this.platform.config.sensorTimeDifference
+    this.sensorTimeDifference = deviceConf && deviceConf.sensorTimeDifference
+      ? deviceConf.sensorTimeDifference
+      : platform.consts.defaultValues.sensorTimeDifference
 
     // Set up the custom Eve characteristics for this device type
     this.inherits = require('util').inherits
diff --git a/lib/index.js b/lib/index.js
index 71f02bd6..aa108892 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -106,6 +106,7 @@ class eWeLinkPlatform {
                 switch (k) {
                   case 'fullDeviceId':
                     break
+                  case 'sensorTimeDifference':
                   case 'sensorTimeLength': {
                     if (typeof v === 'string') {
                       logQuotes(key + '.' + k)
@@ -287,22 +288,6 @@ class eWeLinkPlatform {
           }
           break
         }
-        case 'sensorTimeDifference': {
-          if (typeof val === 'string') {
-            logQuotes(key)
-          }
-          const intVal = parseInt(val)
-          if (isNaN(intVal)) {
-            logDefault(key, this.consts.defaultValues[key])
-            this.config[key] = this.consts.defaultValues[key]
-          } else if (intVal < this.consts.minValues[key]) {
-            logIncrease(key, this.consts.minValues[key])
-            this.config[key] = this.consts.minValues[key]
-          } else {
-            this.config[key] = intVal
-          }
-          break
-        }
         case 'lightDevices':
           if (Array.isArray(val) && val.length > 0) {
             val.forEach(x => {
@@ -489,7 +474,8 @@ class eWeLinkPlatform {
                     }
                     this.sensorDevices[deviceId][k] = v === 'false' ? false : !!v
                     break
-                  case 'lowBattThreshold': {
+                  case 'lowBattThreshold':
+                  case 'sensorTimeDifference': {
                     if (typeof v === 'string') {
                       logQuotes(key + '.' + k)
                     }
@@ -1120,6 +1106,7 @@ class eWeLinkPlatform {
           const swNumber = rfChlCounter + 1
           let subType
           let sensorTimeLength
+          let sensorTimeDiff
           let subExtraContext = {}
           const fullDeviceId = device.deviceid + 'SW' + swNumber
 
@@ -1132,9 +1119,14 @@ class eWeLinkPlatform {
             subType = this.rfSensors[fullDeviceId]
               ? this.rfSensors[fullDeviceId].type
               : 'motion'
-            if (this.rfSensors[fullDeviceId]) {
-              sensorTimeLength = this.rfSensors[fullDeviceId].sensorTimeLength
-            }
+            const sensorTimeLength = this.rfSensors[fullDeviceId] &&
+              this.rfSensors[fullDeviceId].sensorTimeLength
+              ? this.rfSensors[fullDeviceId].sensorTimeLength
+              : this.consts.defaultValues.sensorTimeLength
+            const sensorTimeDiff = this.rfSensors[fullDeviceId] &&
+              this.rfSensors[fullDeviceId].sensorTimeDifference
+              ? this.rfSensors[fullDeviceId].sensorTimeDifference
+              : this.consts.defaultValues.sensorTimeDifference
           } else {
             const type = subDevice.type || '?'
             this.log.warn('[%s] %s [%s].', device.name, this.messages.unsupDev, type)
@@ -1147,6 +1139,7 @@ class eWeLinkPlatform {
             subType,
             swNumber,
             sensorTimeLength,
+            sensorTimeDiff,
             name: subDevice.name
           }
 
@@ -1156,6 +1149,7 @@ class eWeLinkPlatform {
             if (
               oAccessory.context.subType !== subType ||
               oAccessory.context.sensorTimeLength !== sensorTimeLength ||
+              oAccessory.context.sensorTimeDiff !== sensorTimeDiff ||
               oAccessory.context.swNumber !== swNumber
             ) {
               // Remove the existing sub accessory if any changes are found
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 7ea5b92c..058ebf55 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -20,8 +20,6 @@ module.exports = {
     thDevices: [],
     fanDevices: [],
     sensorDevices: [],
-    lowBattThreshold: 25, // sensorDevices{}
-    sensorTimeDifference: 120, // sensorDevices{}
     groups: [],
     bridgeSensors: [],
     ignoredDevices: [],

From 36e99bbf5d082e6ee875abe651f48728c301d283 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 15 Feb 2021 14:03:28 +0000
Subject: [PATCH 1461/3183] finish off

---
 config.schema.json | 4 ++--
 lib/index.js       | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index b0cf6d17..f39d13e9 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -654,7 +654,7 @@
     {
       "key": "bridgeSensors",
       "title": "RF Sensor Devices",
-      "description": "Expose different types of sensors linked to your RF Bridge - <a href=\"https://github.com/bwp91/homebridge-ewelink/wiki/How-to-set-up-RF-Bridge-sensors\" target=\"_blank\">more info</a>.",
+      "description": "Applies to RF Bridge sensors to expose different sensor types (<a href=\"https://github.com/bwp91/homebridge-ewelink/wiki/How-to-set-up-RF-Bridge-sensors\" target=\"_blank\">more info</a>).",
       "expandable": true,
       "add": "Add Another Sensor",
       "type": "array",
@@ -674,7 +674,7 @@
       "key": "groups",
       "expandable": true,
       "title": "Accessory Simulations",
-      "description": "Set up custom simulated accessories generic devices - <a href=\"https://github.com/bwp91/homebridge-ewelink/wiki/Accessory-Simulations\" target=\"_blank\">more info</a>.",
+      "description": "Set up simulated accessories from generic switch devices (<a href=\"https://github.com/bwp91/homebridge-ewelink/wiki/Accessory-Simulations\" target=\"_blank\">more info</a>).",
       "add": "Add Another Type",
       "type": "array",
       "items": [
diff --git a/lib/index.js b/lib/index.js
index aa108892..7657faaf 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1119,11 +1119,11 @@ class eWeLinkPlatform {
             subType = this.rfSensors[fullDeviceId]
               ? this.rfSensors[fullDeviceId].type
               : 'motion'
-            const sensorTimeLength = this.rfSensors[fullDeviceId] &&
+            sensorTimeLength = this.rfSensors[fullDeviceId] &&
               this.rfSensors[fullDeviceId].sensorTimeLength
               ? this.rfSensors[fullDeviceId].sensorTimeLength
               : this.consts.defaultValues.sensorTimeLength
-            const sensorTimeDiff = this.rfSensors[fullDeviceId] &&
+            sensorTimeDiff = this.rfSensors[fullDeviceId] &&
               this.rfSensors[fullDeviceId].sensorTimeDifference
               ? this.rfSensors[fullDeviceId].sensorTimeDifference
               : this.consts.defaultValues.sensorTimeDifference

From 360f73c5b75b0b1d4b43ecccc286826af3a79c50 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 15 Feb 2021 14:07:31 +0000
Subject: [PATCH 1462/3183] names, etc

---
 lib/device/sensor-contact.js |  2 +-
 lib/index.js                 | 30 +++++++++++++++---------------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/lib/device/sensor-contact.js b/lib/device/sensor-contact.js
index 60a4efd0..fbed878a 100644
--- a/lib/device/sensor-contact.js
+++ b/lib/device/sensor-contact.js
@@ -84,7 +84,7 @@ module.exports = class deviceSensorContact {
         this.log('[%s] current state [contact%s detected].', this.name, newState === 0 ? '' : ' not')
       }
       let oAccessory
-      for (const group of Object.entries(this.platform.rfSensors)) {
+      for (const group of Object.entries(this.platform.simulations)) {
         if (group.sensorId === this.accessory.context.eweDeviceId && group.type === 'garage') {
           if ((oAccessory = this.platform.devicesInHB.get(group.deviceId + 'SWX'))) {
             const gdService = oAccessory.getService(this.hapServ.GarageDoorOpener)
diff --git a/lib/index.js b/lib/index.js
index 7657faaf..01604dd0 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -35,12 +35,12 @@ class eWeLinkPlatform {
       this.sensorDevices = {}
       this.singleDevices = {}
       this.thDevices = {}
+      this.rfDevices = {}
+      this.simulations = {}
       this.hideChannels = []
       this.hideMasters = []
       this.ipOverride = {}
       this.obstructSwitches = {}
-      this.simulations = {}
-      this.rfSensors = {}
 
       // Apply the user's configuration
       this.config = this.consts.defaultConfig
@@ -101,7 +101,7 @@ class eWeLinkPlatform {
                 return
               }
               const fullDeviceId = this.funcs.parseDeviceId(x.fullDeviceId)
-              this.rfSensors[fullDeviceId] = {}
+              this.rfDevices[fullDeviceId] = {}
               for (const [k, v] of Object.entries(x)) {
                 switch (k) {
                   case 'fullDeviceId':
@@ -114,12 +114,12 @@ class eWeLinkPlatform {
                     const intVal = parseInt(v)
                     if (isNaN(intVal)) {
                       logDefault(key + '.' + k, this.consts.defaultValues[k])
-                      this.rfSensors[fullDeviceId][k] = this.consts.defaultValues[k]
+                      this.rfDevices[fullDeviceId][k] = this.consts.defaultValues[k]
                     } else if (intVal < this.consts.minValues[k]) {
                       logIncrease(key + '.' + k, this.consts.minValues[k])
-                      this.rfSensors[fullDeviceId][k] = this.consts.minValues[k]
+                      this.rfDevices[fullDeviceId][k] = this.consts.minValues[k]
                     } else {
-                      this.rfSensors[fullDeviceId][k] = intVal
+                      this.rfDevices[fullDeviceId][k] = intVal
                     }
                     break
                   }
@@ -129,7 +129,7 @@ class eWeLinkPlatform {
                     } else if (!this.consts.allowed.sensors.includes(v)) {
                       logIgnore(key + '.' + k)
                     } else {
-                      this.rfSensors[fullDeviceId][k] = v
+                      this.rfDevices[fullDeviceId][k] = v
                     }
                     break
                   default:
@@ -1116,16 +1116,16 @@ class eWeLinkPlatform {
           } else if (subDevice.type === '5') {
             subType = 'curtain'
           } else if (subDevice.type === '6') {
-            subType = this.rfSensors[fullDeviceId]
-              ? this.rfSensors[fullDeviceId].type
+            subType = this.rfDevices[fullDeviceId]
+              ? this.rfDevices[fullDeviceId].type
               : 'motion'
-            sensorTimeLength = this.rfSensors[fullDeviceId] &&
-              this.rfSensors[fullDeviceId].sensorTimeLength
-              ? this.rfSensors[fullDeviceId].sensorTimeLength
+            sensorTimeLength = this.rfDevices[fullDeviceId] &&
+              this.rfDevices[fullDeviceId].sensorTimeLength
+              ? this.rfDevices[fullDeviceId].sensorTimeLength
               : this.consts.defaultValues.sensorTimeLength
-            sensorTimeDiff = this.rfSensors[fullDeviceId] &&
-              this.rfSensors[fullDeviceId].sensorTimeDifference
-              ? this.rfSensors[fullDeviceId].sensorTimeDifference
+            sensorTimeDiff = this.rfDevices[fullDeviceId] &&
+              this.rfDevices[fullDeviceId].sensorTimeDifference
+              ? this.rfDevices[fullDeviceId].sensorTimeDifference
               : this.consts.defaultValues.sensorTimeDifference
           } else {
             const type = subDevice.type || '?'

From 66dfc2b58da6048b8fa695f46ce4b7676ddc9831 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 15 Feb 2021 14:10:28 +0000
Subject: [PATCH 1463/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5358c4ac..3a746e59 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,10 @@ All notable changes to this homebridge-ewelink will be documented in this file.
   * includes a `adaptiveLightingShift` option to offset the Adaptive Lighting values per light device
   * replaces the previous `bulbB02BA60` and `bulbB02FST64` settings
 
+### Changes
+
+* ⚠️ MAJOR CONFIGURATION CHANGES - BREAKING
+
 ## 4.7.4 (2021-02-15)
 
 ### Changes

From a74f81f1f0583d448371889498941130573b6f3c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 15 Feb 2021 14:11:27 +0000
Subject: [PATCH 1464/3183] 5.0.0-0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b8366880..5c837b1c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.7.4",
+  "version": "5.0.0-0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 419dae8a..a2681c3a 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "4.7.4",
+  "version": "5.0.0-0",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 21fe0fc33cee59cf2831cf46635dc080539b1b37 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 15 Feb 2021 14:16:45 +0000
Subject: [PATCH 1465/3183] fix dw2 garages

---
 lib/device/sensor-contact.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/device/sensor-contact.js b/lib/device/sensor-contact.js
index a94faf81..be530f4d 100644
--- a/lib/device/sensor-contact.js
+++ b/lib/device/sensor-contact.js
@@ -80,7 +80,7 @@ module.exports = class deviceSensorContact {
         this.log('[%s] current state [contact%s detected].', this.name, newState === 0 ? '' : ' not')
       }
       let oAccessory
-      for (const group of Object.entries(this.platform.rfSensors)) {
+      for (const group of Object.entries(this.platform.simulations)) {
         if (group.sensorId === this.accessory.context.eweDeviceId && group.type === 'garage') {
           if ((oAccessory = this.platform.devicesInHB.get(group.deviceId + 'SWX'))) {
             const gdService = oAccessory.getService(this.hapServ.GarageDoorOpener)

From 17f601da141a196911efd166a68291ce1082dba4 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 15 Feb 2021 14:17:25 +0000
Subject: [PATCH 1466/3183] scale of 10

---
 config.schema.json                  | 2 +-
 lib/device/zigbee/sensor-contact.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index f39d13e9..01f3d0b1 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -252,7 +252,7 @@
             "scaleBattery": {
               "type": "boolean",
               "title": "Scale Battery",
-              "description": "If true, the battery reading for this Zigbee Contact Sensor will be multiplied by 33."
+              "description": "If true, the battery reading for this Zigbee Contact Sensor will be multiplied by 10."
             },
             "sensorTimeDifference": {
               "type": "number",
diff --git a/lib/device/zigbee/sensor-contact.js b/lib/device/zigbee/sensor-contact.js
index 1280e772..cf442550 100644
--- a/lib/device/zigbee/sensor-contact.js
+++ b/lib/device/zigbee/sensor-contact.js
@@ -59,7 +59,7 @@ module.exports = class deviceZBSensorContact {
     try {
       if (this.funcs.hasProperty(params, 'battery') && params.battery !== this.cacheBattery) {
         this.cacheBattery = params.battery
-        const scaledBatt = this.scaleBattery ? this.cacheBattery * 33 : this.cacheBattery
+        const scaledBatt = this.scaleBattery ? this.cacheBattery * 10 : this.cacheBattery
         this.battService.updateCharacteristic(this.hapChar.BatteryLevel, scaledBatt)
         this.battService.updateCharacteristic(this.hapChar.StatusLowBattery, scaledBatt < this.lowBattThreshold)
         if (params.updateSource && !this.disableDeviceLogging) {

From 0e42abb0b3e4ba4cd69b0509cf78c3018e8e1576 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 15 Feb 2021 14:20:35 +0000
Subject: [PATCH 1467/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5358c4ac..10d3fa4c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,14 +2,11 @@
 
 All notable changes to this homebridge-ewelink will be documented in this file.
 
-## BETA
+## 4.7.5 (2021-02-15)
 
-### Added
+### Changes
 
-* New `lightDevices` configuration option which:
-  * includes a `brightnessStep` option to specify a minimum brightness step in the Home app per light device
-  * includes a `adaptiveLightingShift` option to offset the Adaptive Lighting values per light device
-  * replaces the previous `bulbB02BA60` and `bulbB02FST64` settings
+* Fixes an issue with the DW2 detecting garage door states
 
 ## 4.7.4 (2021-02-15)
 

From 665cb653b0e0b39921dbf938a2d2f5d7790023d8 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 15 Feb 2021 14:21:11 +0000
Subject: [PATCH 1468/3183] 4.7.5

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b8366880..b6c325c7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.7.4",
+  "version": "4.7.5",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 419dae8a..ec50473c 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "4.7.4",
+  "version": "4.7.5",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 8e5528d9a8776f1c82887820c2dfb3d5a02410bc Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 15 Feb 2021 14:23:49 +0000
Subject: [PATCH 1469/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3a746e59..cb0c71bd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,12 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 * ⚠️ MAJOR CONFIGURATION CHANGES - BREAKING
 
+## 4.7.5 (2021-02-15)
+
+### Changes
+
+* Fixes an issue with the DW2 detecting garage door states
+
 ## 4.7.4 (2021-02-15)
 
 ### Changes

From 5587bde9d590b69a271bff92e6a90a13324ecf89 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 15 Feb 2021 14:25:29 +0000
Subject: [PATCH 1470/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 10d3fa4c..33221bd8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 All notable changes to this homebridge-ewelink will be documented in this file.
 
+## BETA
+
+### ⚠️ Breaking Configuration Changes
+
+* This release includes an overhaul of the configuration
+
 ## 4.7.5 (2021-02-15)
 
 ### Changes

From 594790e158313273402323fd8d89602373b471f5 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 15 Feb 2021 14:25:46 +0000
Subject: [PATCH 1471/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cb0c71bd..33221bd8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,16 +4,9 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 ## BETA
 
-### Added
-
-* New `lightDevices` configuration option which:
-  * includes a `brightnessStep` option to specify a minimum brightness step in the Home app per light device
-  * includes a `adaptiveLightingShift` option to offset the Adaptive Lighting values per light device
-  * replaces the previous `bulbB02BA60` and `bulbB02FST64` settings
-
-### Changes
+### ⚠️ Breaking Configuration Changes
 
-* ⚠️ MAJOR CONFIGURATION CHANGES - BREAKING
+* This release includes an overhaul of the configuration
 
 ## 4.7.5 (2021-02-15)
 

From ea41c48b782176e921f3933355296343dc8efc2a Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 15 Feb 2021 14:28:40 +0000
Subject: [PATCH 1472/3183] rename var from platform change

---
 lib/device/switch-multi.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/device/switch-multi.js b/lib/device/switch-multi.js
index 58456558..28f362fc 100644
--- a/lib/device/switch-multi.js
+++ b/lib/device/switch-multi.js
@@ -81,7 +81,7 @@ module.exports = class deviceSwitchMulti {
               params.switches[i - 1].switch = 'off'
             }
           }
-          if (!this.platform.hiddenMasters.includes(this.accessory.context.eweDeviceId)) {
+          if (!this.platform.hideMasters.includes(this.accessory.context.eweDeviceId)) {
             oAccessory = this.platform.devicesInHB.get(this.accessory.context.eweDeviceId + 'SW0')
             oAccessory.getService(this.hapServ.Switch).updateCharacteristic(this.hapChar.On, masterState === 'on')
             oAccessory.eveService.addEntry({ status: masterState === 'on' ? 1 : 0 })
@@ -119,7 +119,7 @@ module.exports = class deviceSwitchMulti {
           }
         }
       }
-      if (!this.platform.hiddenMasters.includes(this.accessory.context.eweDeviceId)) {
+      if (!this.platform.hideMasters.includes(this.accessory.context.eweDeviceId)) {
         this.service.updateCharacteristic(this.hapChar.On, primaryState)
         this.accessory.eveService.addEntry({ status: primaryState ? 1 : 0 })
       }

From aeddad897b9c584e7c40344a2362f4a08acefdd0 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 15 Feb 2021 14:30:06 +0000
Subject: [PATCH 1473/3183] 5.0.0-1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 5c837b1c..23a179bf 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "5.0.0-0",
+  "version": "5.0.0-1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index a2681c3a..679f4dc0 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "5.0.0-0",
+  "version": "5.0.0-1",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From f8eefb612451a255425b386bb184cca718f259f2 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Mon, 15 Feb 2021 16:21:15 +0000
Subject: [PATCH 1474/3183] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index f03530de..e91afe81 100644
--- a/README.md
+++ b/README.md
@@ -37,11 +37,11 @@ Homebridge plugin to control eWeLink devices with original firmware
 * [Supported Devices](https://github.com/bwp91/homebridge-ewelink/wiki/Supported-Devices)
 * [Multi Channel Devices](https://github.com/bwp91/homebridge-ewelink/wiki/Multi-Channel-Devices)
 * [Accessory Simulations](https://github.com/bwp91/homebridge-ewelink/wiki/Accessory-Simulations)
+* [RF Bridge Sensors](https://github.com/bwp91/homebridge-ewelink/wiki/RF-Bridge-Sensors)
 * [Connection Methods](https://github.com/bwp91/homebridge-ewelink/wiki/Connection-Methods)
 * [Beta Version](https://github.com/bwp91/homebridge-ewelink/wiki/Beta-Version)
 
 ### How-to Guides
-* [How to set up RF Bridge sensors](https://github.com/bwp91/homebridge-ewelink/wiki/How-to-set-up-RF-Bridge-sensors)
 * [How to set up Sonoff Camera (GK-200MP2-B)](https://github.com/bwp91/homebridge-ewelink/wiki/How-to-set-up-Sonoff-Camera)
 * [How to copy Homebridge logs](https://github.com/bwp91/homebridge-ewelink/wiki/How-to-copy-Homebridge-logs)
 * [How to enable/disable plugin extended logging](https://github.com/bwp91/homebridge-ewelink/wiki/How-to-enable-disable-plugin-extended-logging)

From 7cd9d23d4b4ba77eca8204bda088b3add06b2ab6 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 15 Feb 2021 16:21:40 +0000
Subject: [PATCH 1475/3183] Update config.schema.json

---
 config.schema.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config.schema.json b/config.schema.json
index 01f3d0b1..3c6e5739 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -205,7 +205,7 @@
             "offset": {
               "type": "number",
               "title": "Temperature Offset",
-              "description": "You can offset the temperature that the sensor reads. An offset of 2 means 2 degrees will be added to the recorded temperature. Can be positive or negative and can include a decimal point '.'",
+              "description": "You can offset the temperature that the sensor reads. An offset of 2 means 2 degrees will be added to the recorded temperature. Can be positive or negative and can include a decimal point '.'.",
               "placeholder": 0
             }
           }

From 82d959557ab41bc47d2fc6c3d5341d49c05e7eb4 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 15 Feb 2021 16:24:02 +0000
Subject: [PATCH 1476/3183] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index f03530de..e91afe81 100644
--- a/README.md
+++ b/README.md
@@ -37,11 +37,11 @@ Homebridge plugin to control eWeLink devices with original firmware
 * [Supported Devices](https://github.com/bwp91/homebridge-ewelink/wiki/Supported-Devices)
 * [Multi Channel Devices](https://github.com/bwp91/homebridge-ewelink/wiki/Multi-Channel-Devices)
 * [Accessory Simulations](https://github.com/bwp91/homebridge-ewelink/wiki/Accessory-Simulations)
+* [RF Bridge Sensors](https://github.com/bwp91/homebridge-ewelink/wiki/RF-Bridge-Sensors)
 * [Connection Methods](https://github.com/bwp91/homebridge-ewelink/wiki/Connection-Methods)
 * [Beta Version](https://github.com/bwp91/homebridge-ewelink/wiki/Beta-Version)
 
 ### How-to Guides
-* [How to set up RF Bridge sensors](https://github.com/bwp91/homebridge-ewelink/wiki/How-to-set-up-RF-Bridge-sensors)
 * [How to set up Sonoff Camera (GK-200MP2-B)](https://github.com/bwp91/homebridge-ewelink/wiki/How-to-set-up-Sonoff-Camera)
 * [How to copy Homebridge logs](https://github.com/bwp91/homebridge-ewelink/wiki/How-to-copy-Homebridge-logs)
 * [How to enable/disable plugin extended logging](https://github.com/bwp91/homebridge-ewelink/wiki/How-to-enable-disable-plugin-extended-logging)

From efd76d7cfba65873e6fcbda2ec5d1e7c11b2b21f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 15 Feb 2021 16:25:21 +0000
Subject: [PATCH 1477/3183] change link

---
 lib/homebridge-ui/public/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/homebridge-ui/public/index.html b/lib/homebridge-ui/public/index.html
index 8da99a9e..b41685cb 100644
--- a/lib/homebridge-ui/public/index.html
+++ b/lib/homebridge-ui/public/index.html
@@ -77,11 +77,11 @@ <h4>Features</h4>
     <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/Supported-Devices" target="_blank">Supported Devices</a></li>
     <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/Multi-Channel-Devices" target="_blank">Multi Channel Devices</a></li>
     <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/Accessory-Simulations" target="_blank">Accessory Simulations</a></li>
+    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/RF-Bridge-Sensors" target="_blank">RF Bridge Sensors</a></li>
     <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/Connection-Methods" target="_blank">Connection Methods</a></li>
   </ul>
   <h4>How-to Guides</h4>
   <ul>
-    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/How-to-set-up-RF-Bridge-sensors" target="_blank">How to set up RF Bridge sensors</a></li>
     <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/How-to-set-up-Sonoff-Camera" target="_blank">How to set up Sonoff Camera (GK-200MP2-B)</a></li>
     <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/How-to-copy-Homebridge-logs" target="_blank">How to copy Homebridge logs</a></li>
     <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/How-to-enable-disable-plugin-extended-logging" target="_blank">How to enable/disable plugin extended logging</a></li>

From 2b1dedc63797dfbb2edb95457ea5097f138c12ad Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 15 Feb 2021 16:25:52 +0000
Subject: [PATCH 1478/3183] amend link

---
 config.schema.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config.schema.json b/config.schema.json
index 3c6e5739..94467150 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -654,7 +654,7 @@
     {
       "key": "bridgeSensors",
       "title": "RF Sensor Devices",
-      "description": "Applies to RF Bridge sensors to expose different sensor types (<a href=\"https://github.com/bwp91/homebridge-ewelink/wiki/How-to-set-up-RF-Bridge-sensors\" target=\"_blank\">more info</a>).",
+      "description": "Applies to RF Bridge sensors to expose different sensor types (<a href=\"https://github.com/bwp91/homebridge-ewelink/wiki/RF-Bridge-Sensors\" target=\"_blank\">more info</a>).",
       "expandable": true,
       "add": "Add Another Sensor",
       "type": "array",

From 60523d8de8735a6e80e572180cca1ae9853f9456 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Mon, 15 Feb 2021 16:27:34 +0000
Subject: [PATCH 1479/3183] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index e91afe81..6b33cf5f 100644
--- a/README.md
+++ b/README.md
@@ -36,8 +36,8 @@ Homebridge plugin to control eWeLink devices with original firmware
 * [Configuration](https://github.com/bwp91/homebridge-ewelink/wiki/Configuration)
 * [Supported Devices](https://github.com/bwp91/homebridge-ewelink/wiki/Supported-Devices)
 * [Multi Channel Devices](https://github.com/bwp91/homebridge-ewelink/wiki/Multi-Channel-Devices)
-* [Accessory Simulations](https://github.com/bwp91/homebridge-ewelink/wiki/Accessory-Simulations)
 * [RF Bridge Sensors](https://github.com/bwp91/homebridge-ewelink/wiki/RF-Bridge-Sensors)
+* [Accessory Simulations](https://github.com/bwp91/homebridge-ewelink/wiki/Accessory-Simulations)
 * [Connection Methods](https://github.com/bwp91/homebridge-ewelink/wiki/Connection-Methods)
 * [Beta Version](https://github.com/bwp91/homebridge-ewelink/wiki/Beta-Version)
 

From ee401f7257ad26f930ebf7127782960e7a139b5b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 15 Feb 2021 16:28:21 +0000
Subject: [PATCH 1480/3183] order of links

---
 lib/homebridge-ui/public/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/homebridge-ui/public/index.html b/lib/homebridge-ui/public/index.html
index b41685cb..df66fb91 100644
--- a/lib/homebridge-ui/public/index.html
+++ b/lib/homebridge-ui/public/index.html
@@ -76,8 +76,8 @@ <h4>Features</h4>
     <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/Configuration" target="_blank">Configuration</a></li>
     <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/Supported-Devices" target="_blank">Supported Devices</a></li>
     <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/Multi-Channel-Devices" target="_blank">Multi Channel Devices</a></li>
-    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/Accessory-Simulations" target="_blank">Accessory Simulations</a></li>
     <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/RF-Bridge-Sensors" target="_blank">RF Bridge Sensors</a></li>
+    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/Accessory-Simulations" target="_blank">Accessory Simulations</a></li>
     <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/Connection-Methods" target="_blank">Connection Methods</a></li>
   </ul>
   <h4>How-to Guides</h4>

From ba78b3ed2ad51a68eead47c37504691594a8f557 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 15 Feb 2021 16:29:21 +0000
Subject: [PATCH 1481/3183] order of links

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index e91afe81..6b33cf5f 100644
--- a/README.md
+++ b/README.md
@@ -36,8 +36,8 @@ Homebridge plugin to control eWeLink devices with original firmware
 * [Configuration](https://github.com/bwp91/homebridge-ewelink/wiki/Configuration)
 * [Supported Devices](https://github.com/bwp91/homebridge-ewelink/wiki/Supported-Devices)
 * [Multi Channel Devices](https://github.com/bwp91/homebridge-ewelink/wiki/Multi-Channel-Devices)
-* [Accessory Simulations](https://github.com/bwp91/homebridge-ewelink/wiki/Accessory-Simulations)
 * [RF Bridge Sensors](https://github.com/bwp91/homebridge-ewelink/wiki/RF-Bridge-Sensors)
+* [Accessory Simulations](https://github.com/bwp91/homebridge-ewelink/wiki/Accessory-Simulations)
 * [Connection Methods](https://github.com/bwp91/homebridge-ewelink/wiki/Connection-Methods)
 * [Beta Version](https://github.com/bwp91/homebridge-ewelink/wiki/Beta-Version)
 

From 1a5b492615871adcd9d0408f449ba170c55a70c5 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 15 Feb 2021 18:03:15 +0000
Subject: [PATCH 1482/3183] logging override

---
 config.schema.json                        | 189 +++++++++++++---------
 lib/device/curtain.js                     |   8 +-
 lib/device/diffuser.js                    |   8 +-
 lib/device/fan.js                         |   4 +-
 lib/device/light-colour.js                |   4 +-
 lib/device/light-ctemp.js                 |   4 +-
 lib/device/light-dimmer.js                |  12 +-
 lib/device/outlet.js                      |   4 +-
 lib/device/rf-bridge.js                   |   7 +-
 lib/device/scm.js                         |   8 +-
 lib/device/sensor-ambient.js              |   4 +-
 lib/device/sensor-contact.js              |   4 +-
 lib/device/simulation/blind.js            |   8 +-
 lib/device/simulation/garage-eachen.js    |  10 +-
 lib/device/simulation/garage-four.js      |  14 +-
 lib/device/simulation/garage-od-switch.js |   5 +-
 lib/device/simulation/garage-one.js       |  26 +--
 lib/device/simulation/garage-two.js       |  14 +-
 lib/device/simulation/lock-one.js         |  11 +-
 lib/device/simulation/switch-valve.js     |   8 +-
 lib/device/simulation/tap-one.js          |   8 +-
 lib/device/simulation/tap-two.js          |   8 +-
 lib/device/simulation/thermostat.js       |   6 +-
 lib/device/simulation/valve-four.js       |   8 +-
 lib/device/simulation/valve-one.js        |   8 +-
 lib/device/simulation/valve-two.js        |   8 +-
 lib/device/switch-multi.js                |   8 +-
 lib/device/switch-single.js               |   8 +-
 lib/device/template.js                    |   1 -
 lib/device/thermostat.js                  |   4 +-
 lib/device/usb.js                         |   4 +-
 lib/device/zigbee/light-dimmer.js         |  12 +-
 lib/device/zigbee/sensor-ambient.js       |   4 +-
 lib/device/zigbee/sensor-contact.js       |   4 +-
 lib/device/zigbee/sensor-motion.js        |   4 +-
 lib/device/zigbee/switch-single.js        |   8 +-
 lib/device/zigbee/switch-stateless.js     |   4 +-
 lib/index.js                              |  64 +++++++-
 38 files changed, 380 insertions(+), 143 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 94467150..4cf59a4c 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -85,6 +85,14 @@
               "type": "string",
               "title": "IP Address",
               "description": "You can manually set the IP address for this device if it cannot be discovered by the plugin."
+            },
+            "overrideDisabledLogging": {
+              "type": "boolean",
+              "title": "Override Disabled Logging",
+              "description": "If true, updates for this device will be added to the log, even if the general 'Disable Device Logging' setting is true.",
+              "condition": {
+                "functionBody": "return model.disableDeviceLogging;"
+              }
             }
           }
         }
@@ -107,6 +115,14 @@
               "type": "string",
               "title": "IP Address",
               "description": "You can manually set the IP address for this device if it cannot be discovered by the plugin."
+            },
+            "overrideDisabledLogging": {
+              "type": "boolean",
+              "title": "Override Disabled Logging",
+              "description": "If true, updates for this device will be added to the log, even if the general 'Disable Device Logging' setting is true.",
+              "condition": {
+                "functionBody": "return model.disableDeviceLogging;"
+              }
             }
           }
         }
@@ -139,6 +155,14 @@
               "type": "string",
               "title": "IP Address",
               "description": "You can manually set the IP address for this device if it cannot be discovered by the plugin."
+            },
+            "overrideDisabledLogging": {
+              "type": "boolean",
+              "title": "Override Disabled Logging",
+              "description": "If true, updates for this device will be added to the log, even if the general 'Disable Device Logging' setting is true.",
+              "condition": {
+                "functionBody": "return model.disableDeviceLogging;"
+              }
             }
           }
         }
@@ -184,6 +208,14 @@
               "description": "An adjustment factor for Adaptive Lighting. The mired value for each update will be increased by this setting, making the light appear warmer. A value in the range 50-200 should be appropriate. Must be 0 or more.",
               "placeholder": 0,
               "minimum": 0
+            },
+            "overrideDisabledLogging": {
+              "type": "boolean",
+              "title": "Override Disabled Logging",
+              "description": "If true, updates for this device will be added to the log, even if the general 'Disable Device Logging' setting is true.",
+              "condition": {
+                "functionBody": "return model.disableDeviceLogging;"
+              }
             }
           }
         }
@@ -207,6 +239,14 @@
               "title": "Temperature Offset",
               "description": "You can offset the temperature that the sensor reads. An offset of 2 means 2 degrees will be added to the recorded temperature. Can be positive or negative and can include a decimal point '.'.",
               "placeholder": 0
+            },
+            "overrideDisabledLogging": {
+              "type": "boolean",
+              "title": "Override Disabled Logging",
+              "description": "If true, updates for this device will be added to the log, even if the general 'Disable Device Logging' setting is true.",
+              "condition": {
+                "functionBody": "return model.disableDeviceLogging;"
+              }
             }
           }
         }
@@ -224,6 +264,14 @@
               "type": "boolean",
               "title": "Hide Light Switch",
               "description": "If true, the light switch will be hidden from HomeKit."
+            },
+            "overrideDisabledLogging": {
+              "type": "boolean",
+              "title": "Override Disabled Logging",
+              "description": "If true, updates for this device will be added to the log, even if the general 'Disable Device Logging' setting is true.",
+              "condition": {
+                "functionBody": "return model.disableDeviceLogging;"
+              }
             }
           }
         }
@@ -260,6 +308,14 @@
               "description": "An offset in seconds to ignore any notifications if they is a delay between this Zigbee Motion Sensor detecting something and the plugin receiving the notification. Must be 10 or more.",
               "placeholder": 120,
               "minimum": 10
+            },
+            "overrideDisabledLogging": {
+              "type": "boolean",
+              "title": "Override Disabled Logging",
+              "description": "If true, updates for this device will be added to the log, even if the general 'Disable Device Logging' setting is true.",
+              "condition": {
+                "functionBody": "return model.disableDeviceLogging;"
+              }
             }
           }
         }
@@ -281,45 +337,31 @@
               "oneOf": [
                 {
                   "title": "Motion",
-                  "enum": [
-                    "motion"
-                  ]
+                  "enum": ["motion"]
                 },
                 {
                   "title": "Smoke/Fire",
-                  "enum": [
-                    "smoke"
-                  ]
+                  "enum": ["smoke"]
                 },
                 {
                   "title": "Water/Leak",
-                  "enum": [
-                    "water"
-                  ]
+                  "enum": ["water"]
                 },
                 {
                   "title": "Carbon Monoxide",
-                  "enum": [
-                    "co"
-                  ]
+                  "enum": ["co"]
                 },
                 {
                   "title": "Carbon Dioxide",
-                  "enum": [
-                    "co2"
-                  ]
+                  "enum": ["co2"]
                 },
                 {
                   "title": "Occupancy",
-                  "enum": [
-                    "occupancy"
-                  ]
+                  "enum": ["occupancy"]
                 },
                 {
                   "title": "Contact",
-                  "enum": [
-                    "contact"
-                  ]
+                  "enum": ["contact"]
                 }
               ]
             },
@@ -336,6 +378,14 @@
               "description": "An offset in seconds to ignore any notifications if they is a delay between a sensor detecting something and the plugin receiving the notification. Must be 10 or more.",
               "placeholder": 120,
               "minimum": 10
+            },
+            "overrideDisabledLogging": {
+              "type": "boolean",
+              "title": "Override Disabled Logging",
+              "description": "If true, updates for this device will be added to the log, even if the general 'Disable Device Logging' setting is true.",
+              "condition": {
+                "functionBody": "return model.disableDeviceLogging;"
+              }
             }
           }
         }
@@ -357,81 +407,55 @@
               "oneOf": [
                 {
                   "title": "1 Thermostat (w/ TH10/16)",
-                  "enum": [
-                    "thermostat"
-                  ]
+                  "enum": ["thermostat"]
                 },
                 {
                   "title": "1 Garage Door (w/ Eachen GD-DC5)",
-                  "enum": [
-                    "garage_eachen"
-                  ]
+                  "enum": ["garage_eachen"]
                 },
                 {
                   "title": "1 Garage Door (w/ single or multi-channel device)",
-                  "enum": [
-                    "garage"
-                  ]
+                  "enum": ["garage"]
                 },
                 {
                   "title": "2 Garage Doors (w/ multi-channel device)",
-                  "enum": [
-                    "garage_two"
-                  ]
+                  "enum": ["garage_two"]
                 },
                 {
                   "title": "4 Garage Doors (w/ multi-channel device)",
-                  "enum": [
-                    "garage_four"
-                  ]
+                  "enum": ["garage_four"]
                 },
                 {
                   "title": "1 Window Blind (w/ multi-channel device)",
-                  "enum": [
-                    "blind"
-                  ]
+                  "enum": ["blind"]
                 },
                 {
                   "title": "1 Lock (w/ single or multi-channel device)",
-                  "enum": [
-                    "lock"
-                  ]
+                  "enum": ["lock"]
                 },
                 {
                   "title": "1 Tap/Faucet (w/ single or multi-channel device)",
-                  "enum": [
-                    "tap"
-                  ]
+                  "enum": ["tap"]
                 },
                 {
                   "title": "2 Taps/Faucets (w/ multi-channel device)",
-                  "enum": [
-                    "tap_two"
-                  ]
+                  "enum": ["tap_two"]
                 },
                 {
                   "title": "1 Irrigation Valve (w/ single or multi-channel device)",
-                  "enum": [
-                    "valve"
-                  ]
+                  "enum": ["valve"]
                 },
                 {
                   "title": "2 Irrigation Valves (w/ multi-channel device)",
-                  "enum": [
-                    "valve_two"
-                  ]
+                  "enum": ["valve_two"]
                 },
                 {
                   "title": "4 Irrigation Valves (w/ multi-channel device)",
-                  "enum": [
-                    "valve_four"
-                  ]
+                  "enum": ["valve_four"]
                 },
                 {
                   "title": "1 Switch & 1 Valve (w/ multi-channel device)",
-                  "enum": [
-                    "switch_valve"
-                  ]
+                  "enum": ["switch_valve"]
                 }
               ]
             },
@@ -445,15 +469,11 @@
               "oneOf": [
                 {
                   "title": "Single-Channel",
-                  "enum": [
-                    "oneSwitch"
-                  ]
+                  "enum": ["oneSwitch"]
                 },
                 {
                   "title": "Multi-Channel",
-                  "enum": [
-                    "twoSwitch"
-                  ]
+                  "enum": ["twoSwitch"]
                 }
               ]
             },
@@ -487,6 +507,14 @@
               "type": "string",
               "title": "IP Address",
               "description": "You can manually set the IP address for this device if it cannot be discovered by the plugin."
+            },
+            "overrideDisabledLogging": {
+              "type": "boolean",
+              "title": "Override Disabled Logging",
+              "description": "If true, updates for this device will be added to the log, even if the general 'Disable Device Logging' setting is true.",
+              "condition": {
+                "functionBody": "return model.disableDeviceLogging;"
+              }
             }
           }
         }
@@ -536,7 +564,8 @@
           "items": [
             "singleDevices[].deviceId",
             "singleDevices[].showAsOutlet",
-            "singleDevices[].ipAddress"
+            "singleDevices[].ipAddress",
+            "singleDevices[].overrideDisabledLogging"
           ]
         }
       ]
@@ -554,7 +583,8 @@
           "items": [
             "multiDevices[].deviceId",
             "multiDevices[].hideChannels",
-            "multiDevices[].ipAddress"
+            "multiDevices[].ipAddress",
+            "multiDevices[].overrideDisabledLogging"
           ]
         }
       ]
@@ -573,7 +603,8 @@
             "outletDevices[].deviceId",
             "outletDevices[].showAsSwitch",
             "outletDevices[].inUsePowerThreshold",
-            "outletDevices[].ipAddress"
+            "outletDevices[].ipAddress",
+            "outletDevices[].overrideDisabledLogging"
           ]
         }
       ]
@@ -581,7 +612,7 @@
     {
       "key": "lightDevices",
       "title": "Light Devices",
-      "description": "Applies to bulbs and LED strips.",
+      "description": "Applies to dimmer, bulb and LED strip devices.",
       "expandable": true,
       "add": "Add Another Device",
       "type": "array",
@@ -592,7 +623,8 @@
             "lightDevices[].deviceId",
             "lightDevices[].bulbModel",
             "lightDevices[].brightnessStep",
-            "lightDevices[].adaptiveLightingShift"
+            "lightDevices[].adaptiveLightingShift",
+            "lightDevices[].overrideDisabledLogging"
           ]
         }
       ]
@@ -610,7 +642,8 @@
           "items": [
             "thDevices[].deviceId",
             "thDevices[].hideSwitch",
-            "thDevices[].offset"
+            "thDevices[].offset",
+            "thDevices[].overrideDisabledLogging"
           ]
         }
       ]
@@ -627,7 +660,8 @@
           "type": "fieldset",
           "items": [
             "fanDevices[].deviceId",
-            "fanDevices[].hideLight"
+            "fanDevices[].hideLight",
+            "fanDevices[].overrideDisabledLogging"
           ]
         }
       ]
@@ -646,7 +680,8 @@
             "sensorDevices[].deviceId",
             "sensorDevices[].lowBattThreshold",
             "sensorDevices[].hideLongDouble",
-            "sensorDevices[].scaleBattery"
+            "sensorDevices[].scaleBattery",
+            "sensorDevices[].overrideDisabledLogging"
           ]
         }
       ]
@@ -665,7 +700,8 @@
             "bridgeSensors[].fullDeviceId",
             "bridgeSensors[].type",
             "bridgeSensors[].sensorTimeLength",
-            "bridgeSensors[].sensorTimeDifference"
+            "bridgeSensors[].sensorTimeDifference",
+            "bridgeSensors[].overrideDisabledLogging"
           ]
         }
       ]
@@ -687,7 +723,8 @@
             "groups[].operationTime",
             "groups[].sensorId",
             "groups[].obstructId",
-            "groups[].ipAddress",
+            "groups[].ipAddress",,
+            "groups[].overrideDisabledLogging"
             {
               "type": "help",
               "helpvalue": "<label class=\"control-label text-warning\">⚠ After restarting Homebridge you will need to remove this accessory from the cache for it set up correctly.</label>"
diff --git a/lib/device/curtain.js b/lib/device/curtain.js
index 632b8b02..1de2b3d8 100644
--- a/lib/device/curtain.js
+++ b/lib/device/curtain.js
@@ -6,7 +6,6 @@ module.exports = class deviceCurtain {
   constructor (platform, accessory) {
     // Set up variables from the platform
     this.consts = platform.consts
-    this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
@@ -18,6 +17,13 @@ module.exports = class deviceCurtain {
     this.name = accessory.displayName
     this.accessory = accessory
 
+    // Set up custom variables for this device type
+    const deviceId = this.accessory.context.eweDeviceId
+    const deviceConf = platform.singleDevices[deviceId]
+    this.disableDeviceLogging = deviceConf && deviceConf.overrideDisabledLogging
+      ? false
+      : platform.config.disableDeviceLogging
+
     // Add the window covering service if it doesn't already exist
     this.service = this.accessory.getService(this.hapServ.WindowCovering) ||
       this.accessory.addService(this.hapServ.WindowCovering)
diff --git a/lib/device/diffuser.js b/lib/device/diffuser.js
index fad06aaa..3c9475c3 100644
--- a/lib/device/diffuser.js
+++ b/lib/device/diffuser.js
@@ -7,7 +7,6 @@ module.exports = class deviceDiffuser {
     // Set up variables from the platform
     this.colourUtils = platform.colourUtils
     this.consts = platform.consts
-    this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
@@ -19,6 +18,13 @@ module.exports = class deviceDiffuser {
     this.name = accessory.displayName
     this.accessory = accessory
 
+    // Set up custom variables for this device type
+    const deviceId = this.accessory.context.eweDeviceId
+    const deviceConf = platform.singleDevices[deviceId]
+    this.disableDeviceLogging = deviceConf && deviceConf.overrideDisabledLogging
+      ? false
+      : platform.config.disableDeviceLogging
+
     // Add the fan service if it doesn't already exist
     this.fanService = this.accessory.getService('Diffuser') ||
       this.accessory.addService(this.hapServ.Fan, 'Diffuser', 'diffuser')
diff --git a/lib/device/fan.js b/lib/device/fan.js
index 3e83402d..94a33a23 100644
--- a/lib/device/fan.js
+++ b/lib/device/fan.js
@@ -6,7 +6,6 @@ module.exports = class deviceFan {
   constructor (platform, accessory) {
     // Set up variables from the platform
     this.consts = platform.consts
-    this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
@@ -22,6 +21,9 @@ module.exports = class deviceFan {
     const deviceId = this.accessory.context.eweDeviceId
     const deviceConf = platform.fanDevices[deviceId]
     this.hideLight = deviceConf && deviceConf.hideLight
+    this.disableDeviceLogging = deviceConf && deviceConf.overrideDisabledLogging
+      ? false
+      : platform.config.disableDeviceLogging
 
     // Add the fan service if it doesn't already exist
     this.service = this.accessory.getService(this.hapServ.Fan) ||
diff --git a/lib/device/light-colour.js b/lib/device/light-colour.js
index 2605504e..662de5ed 100644
--- a/lib/device/light-colour.js
+++ b/lib/device/light-colour.js
@@ -6,7 +6,6 @@ module.exports = class deviceLightColour {
   constructor (platform, accessory) {
     // Set up variables from the platform
     this.consts = platform.consts
-    this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
@@ -29,6 +28,9 @@ module.exports = class deviceLightColour {
     this.brightStep = deviceConf && deviceConf.brightnessStep
       ? Math.min(deviceConf.brightnessStep, 100)
       : platform.consts.defaultValues.brightnessStep
+    this.disableDeviceLogging = deviceConf && deviceConf.overrideDisabledLogging
+      ? false
+      : platform.config.disableDeviceLogging
 
     // Add the lightbulb service if it doesn't already exist
     this.service = this.accessory.getService(this.hapServ.Lightbulb) ||
diff --git a/lib/device/light-ctemp.js b/lib/device/light-ctemp.js
index 446f97c1..50e7b410 100644
--- a/lib/device/light-ctemp.js
+++ b/lib/device/light-ctemp.js
@@ -6,7 +6,6 @@ module.exports = class deviceLightColour {
   constructor (platform, accessory) {
     // Set up variables from the platform
     this.consts = platform.consts
-    this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
@@ -30,6 +29,9 @@ module.exports = class deviceLightColour {
     this.brightStep = deviceConf && deviceConf.brightnessStep
       ? Math.min(deviceConf.brightnessStep, 100)
       : platform.consts.defaultValues.brightnessStep
+    this.disableDeviceLogging = deviceConf && deviceConf.overrideDisabledLogging
+      ? false
+      : platform.config.disableDeviceLogging
 
     // Different bulbs have different colour temperature ranges
     switch (this.model) {
diff --git a/lib/device/light-dimmer.js b/lib/device/light-dimmer.js
index 8054eea6..83196e46 100644
--- a/lib/device/light-dimmer.js
+++ b/lib/device/light-dimmer.js
@@ -6,7 +6,6 @@ module.exports = class deviceLightDimmer {
   constructor (platform, accessory) {
     // Set up variables from the platform
     this.consts = platform.consts
-    this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
@@ -18,6 +17,16 @@ module.exports = class deviceLightDimmer {
     this.name = accessory.displayName
     this.accessory = accessory
 
+    // Set up custom variables for this device type
+    const deviceId = this.accessory.context.eweDeviceId
+    const deviceConf = platform.lightDevices[deviceId]
+    this.brightStep = deviceConf && deviceConf.brightnessStep
+      ? Math.min(deviceConf.brightnessStep, 100)
+      : platform.consts.defaultValues.brightnessStep
+    this.disableDeviceLogging = deviceConf && deviceConf.overrideDisabledLogging
+      ? false
+      : platform.config.disableDeviceLogging
+
     // Add the lightbulb service if it doesn't already exist
     this.service = this.accessory.getService(this.hapServ.Lightbulb) ||
       this.accessory.addService(this.hapServ.Lightbulb)
@@ -29,6 +38,7 @@ module.exports = class deviceLightDimmer {
     // Add the set handler to the lightbulb brightness characteristic
     this.service.getCharacteristic(this.hapChar.Brightness)
       .on('set', this.internalBrightnessUpdate.bind(this))
+      .setProps({ minStep: this.brightStep })
   }
 
   async internalOnOffUpdate (value, callback) {
diff --git a/lib/device/outlet.js b/lib/device/outlet.js
index ba44ddb9..99d8f0cf 100644
--- a/lib/device/outlet.js
+++ b/lib/device/outlet.js
@@ -6,7 +6,6 @@ module.exports = class deviceOutlet {
   constructor (platform, accessory) {
     // Set up variables from the platform
     this.consts = platform.consts
-    this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
@@ -24,6 +23,9 @@ module.exports = class deviceOutlet {
     this.inUsePowerThreshold = deviceConf && deviceConf.inUsePowerThreshold
       ? deviceConf.inUsePowerThreshold
       : platform.consts.defaultValues.inUsePowerThreshold
+    this.disableDeviceLogging = deviceConf && deviceConf.overrideDisabledLogging
+      ? false
+      : platform.config.disableDeviceLogging
 
     // Set up the custom Eve characteristics for this device type
     this.inherits = require('util').inherits
diff --git a/lib/device/rf-bridge.js b/lib/device/rf-bridge.js
index 8f536359..1b49ce71 100644
--- a/lib/device/rf-bridge.js
+++ b/lib/device/rf-bridge.js
@@ -6,7 +6,6 @@ module.exports = class deviceRFBridge {
   constructor (platform, accessory) {
     // Set up variables from the platform
     this.consts = platform.consts
-    this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
@@ -149,7 +148,7 @@ module.exports = class deviceRFBridge {
         })
         if (oAccessory) {
           oAccessory.getService(oAccessory.context.buttons[params.rfChl]).updateCharacteristic(this.hapChar.On, 1)
-          if (params.updateSource && !this.disableDeviceLogging) {
+          if (params.updateSource && !oAccessory.context.disableDeviceLogging) {
             this.log('[%s] current state [button triggered]', oAccessory.displayName)
           }
           this.funcs.sleep(3000)
@@ -220,13 +219,13 @@ module.exports = class deviceRFBridge {
                 }
                 oAccessory.getService(serv).updateCharacteristic(char, 1)
                 oAccessory.eveService.addEntry({ status: 1 })
-                if (params.updateSource && !this.disableDeviceLogging) {
+                if (params.updateSource && !oAccessory.context.disableDeviceLogging) {
                   this.log('[%s] current state [triggered]', oAccessory.displayName)
                 }
                 await this.funcs.sleep(oAccessory.context.sensorTimeLength * 1000)
                 oAccessory.getService(serv).updateCharacteristic(char, 0)
                 oAccessory.eveService.addEntry({ status: 0 })
-                if (params.updateSource && !this.disableDeviceLogging) {
+                if (params.updateSource && !oAccessory.context.disableDeviceLogging) {
                   this.log('[%s] current state [not triggered]', oAccessory.displayName)
                 }
               }
diff --git a/lib/device/scm.js b/lib/device/scm.js
index 98a7ecd8..a3ba3ad7 100644
--- a/lib/device/scm.js
+++ b/lib/device/scm.js
@@ -6,7 +6,6 @@ module.exports = class deviceSCM {
   constructor (platform, accessory) {
     // Set up variables from the platform
     this.consts = platform.consts
-    this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
@@ -18,6 +17,13 @@ module.exports = class deviceSCM {
     this.name = accessory.displayName
     this.accessory = accessory
 
+    // Set up custom variables for this device type
+    const deviceId = this.accessory.context.eweDeviceId
+    const deviceConf = platform.singleDevices[deviceId]
+    this.disableDeviceLogging = deviceConf && deviceConf.overrideDisabledLogging
+      ? false
+      : platform.config.disableDeviceLogging
+
     // Add the switch service if it doesn't already exist
     this.service = this.accessory.getService(this.hapServ.Switch) ||
       this.accessory.addService(this.hapServ.Switch)
diff --git a/lib/device/sensor-ambient.js b/lib/device/sensor-ambient.js
index 6e764820..7f8e1ecf 100644
--- a/lib/device/sensor-ambient.js
+++ b/lib/device/sensor-ambient.js
@@ -6,7 +6,6 @@ module.exports = class deviceSensorAmbient {
   constructor (platform, accessory) {
     // Set up variables from the platform
     this.consts = platform.consts
-    this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
@@ -25,6 +24,9 @@ module.exports = class deviceSensorAmbient {
     this.tempOffset = deviceConf && deviceConf.offset
       ? deviceConf.offset
       : platform.consts.defaultValues.offset
+    this.disableDeviceLogging = deviceConf && deviceConf.overrideDisabledLogging
+      ? false
+      : platform.config.disableDeviceLogging
 
     // If the accessory has a thermostat service then remove it
     if (this.accessory.getService(this.hapServ.Thermostat)) {
diff --git a/lib/device/sensor-contact.js b/lib/device/sensor-contact.js
index fbed878a..415a1a35 100644
--- a/lib/device/sensor-contact.js
+++ b/lib/device/sensor-contact.js
@@ -6,7 +6,6 @@ module.exports = class deviceSensorContact {
   constructor (platform, accessory) {
     // Set up variables from the platform
     this.consts = platform.consts
-    this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
@@ -24,6 +23,9 @@ module.exports = class deviceSensorContact {
     this.lowBattThreshold = deviceConf && deviceConf.lowBattThreshold
       ? Math.min(deviceConf.lowBattThreshold, 100)
       : platform.consts.defaultValues.lowBattThreshold
+    this.disableDeviceLogging = deviceConf && deviceConf.overrideDisabledLogging
+      ? false
+      : platform.config.disableDeviceLogging
 
     // Set up the custom Eve characteristics for this device type
     this.inherits = require('util').inherits
diff --git a/lib/device/simulation/blind.js b/lib/device/simulation/blind.js
index 7ef5e4f4..2ea9704a 100644
--- a/lib/device/simulation/blind.js
+++ b/lib/device/simulation/blind.js
@@ -6,7 +6,6 @@ module.exports = class deviceBlind {
   constructor (platform, accessory) {
     // Set up variables from the platform
     this.consts = platform.consts
-    this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
@@ -18,6 +17,13 @@ module.exports = class deviceBlind {
     this.name = accessory.displayName
     this.accessory = accessory
 
+    // Set up custom variables for this device type
+    const deviceId = this.accessory.context.eweDeviceId
+    const deviceConf = platform.simulations[deviceId]
+    this.disableDeviceLogging = deviceConf && deviceConf.overrideDisabledLogging
+      ? false
+      : platform.config.disableDeviceLogging
+
     // Set up the accessory with default positions when added the first time
     if (!this.funcs.hasProperty(this.accessory.context, 'cacheCurrentPosition')) {
       this.accessory.context.cacheCurrentPosition = 0
diff --git a/lib/device/simulation/garage-eachen.js b/lib/device/simulation/garage-eachen.js
index 1a4374c3..dbe4cf38 100644
--- a/lib/device/simulation/garage-eachen.js
+++ b/lib/device/simulation/garage-eachen.js
@@ -6,7 +6,6 @@ module.exports = class deviceGarageEachen {
   constructor (platform, accessory) {
     // Set up variables from the platform
     this.consts = platform.consts
-    this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
@@ -19,8 +18,13 @@ module.exports = class deviceGarageEachen {
     this.accessory = accessory
 
     // Set up custom variables for this device type
-    const eweId = this.accessory.context.eweDeviceId
-    this.operationTime = platform.simulations[eweId].operationTime
+    const deviceId = this.accessory.context.eweDeviceId
+    const deviceConf = platform.simulations[deviceId]
+    this.operationTime = deviceConf.operationTime ||
+      this.consts.defaultValues.operationTime
+    this.disableDeviceLogging = deviceConf.overrideDisabledLogging
+      ? false
+      : platform.config.disableDeviceLogging
 
     // Add the garage door service if it doesn't already exist
     if (!(this.service = this.accessory.getService(this.hapServ.GarageDoorOpener))) {
diff --git a/lib/device/simulation/garage-four.js b/lib/device/simulation/garage-four.js
index b36dbfb3..c59b029d 100644
--- a/lib/device/simulation/garage-four.js
+++ b/lib/device/simulation/garage-four.js
@@ -6,7 +6,6 @@ module.exports = class deviceGarageFour {
   constructor (platform, accessory) {
     // Set up variables from the platform
     this.consts = platform.consts
-    this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
@@ -18,6 +17,15 @@ module.exports = class deviceGarageFour {
     this.name = accessory.displayName
     this.accessory = accessory
 
+    // Set up custom variables for this device type
+    const deviceId = this.accessory.context.eweDeviceId
+    const deviceConf = platform.simulations[deviceId]
+    this.operationTime = deviceConf.operationTime ||
+      this.consts.defaultValues.operationTime
+    this.disableDeviceLogging = deviceConf.overrideDisabledLogging
+      ? false
+      : platform.config.disableDeviceLogging
+
     // Set up the accessory with default positions when added the first time
     if (!this.funcs.hasProperty(this.accessory.context, 'cacheStates')) {
       this.accessory.context.cacheStates = [
@@ -28,10 +36,6 @@ module.exports = class deviceGarageFour {
       ]
     }
 
-    // Set up custom variables for this device type
-    const eweId = this.accessory.context.eweDeviceId
-    this.operationTime = platform.simulations[eweId].operationTime
-
     // We want four garage door services for this accessory
     ;['A', 'B', 'C', 'D'].forEach(v => {
       // Add the garage door service if it doesn't already exist
diff --git a/lib/device/simulation/garage-od-switch.js b/lib/device/simulation/garage-od-switch.js
index 3fed70ef..ee02b6cf 100644
--- a/lib/device/simulation/garage-od-switch.js
+++ b/lib/device/simulation/garage-od-switch.js
@@ -6,7 +6,6 @@ module.exports = class deviceGarageODSwitch {
   constructor (platform, accessory) {
     // Set up variables from the platform
     this.consts = platform.consts
-    this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
@@ -21,6 +20,10 @@ module.exports = class deviceGarageODSwitch {
     // Set up custom variables for this device type
     this.garageId = platform.obstructSwitches[this.accessory.context.eweDeviceId]
     this.garage = platform.devicesInHB.get(this.garageId + 'SWX')
+    this.disableDeviceLogging = platform.simulations[this.garageId] &&
+      platform.simulations[this.garageId].overrideDisabledLogging
+      ? false
+      : platform.config.disableDeviceLogging
 
     // Add the switch service if it doesn't already exist
     this.service = this.accessory.getService(this.hapServ.Switch) ||
diff --git a/lib/device/simulation/garage-one.js b/lib/device/simulation/garage-one.js
index 69563918..08d44d18 100644
--- a/lib/device/simulation/garage-one.js
+++ b/lib/device/simulation/garage-one.js
@@ -6,7 +6,6 @@ module.exports = class deviceGarageOne {
   constructor (platform, accessory) {
     // Set up variables from the platform
     this.consts = platform.consts
-    this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
@@ -18,31 +17,34 @@ module.exports = class deviceGarageOne {
     this.name = accessory.displayName
     this.accessory = accessory
 
+    // Set up custom variables for this device type
+    const deviceId = this.accessory.context.eweDeviceId
+    const deviceConf = platform.simulations[deviceId]
+    this.setup = deviceConf.setup
+    this.operationTime = deviceConf.operationTime ||
+      this.consts.defaultValues.operationTime
+    this.disableDeviceLogging = deviceConf.overrideDisabledLogging
+      ? false
+      : platform.config.disableDeviceLogging
+
     // Set up the accessory with default positions when added the first time
     if (!this.funcs.hasProperty(this.accessory.context, 'cacheCurrentDoorState')) {
       this.accessory.context.cacheCurrentDoorState = 1
       this.accessory.context.cacheTargetDoorState = 1
     }
 
-    // Set up custom variables for this device type
-    const asConfig = platform.simulations[this.accessory.context.eweDeviceId]
-    this.setup = platform.simulations[this.accessory.context.eweDeviceId].setup
-
-    // Set up custom variables for this device type
-    this.operationTime = asConfig.operationTime
-
     // Check the sensor is valid if defined by the user
-    if (asConfig.sensorId) {
+    if (deviceConf.sensorId) {
       // Check the sensor exists in Homebridge
-      if (!platform.devicesInHB.has(asConfig.sensorId + 'SWX')) {
+      if (!platform.devicesInHB.has(deviceConf.sensorId + 'SWX')) {
         this.error = 'defined sensor does not exist in Homebridge'
       }
 
       // Check the sensor is a sensor
-      if (platform.devicesInHB.get(asConfig.sensorId + 'SWX').context.eweUIID !== 102) {
+      if (platform.devicesInHB.get(deviceConf.sensorId + 'SWX').context.eweUIID !== 102) {
         this.error = 'defined sensor is not a DW2 sensor'
       }
-      this.definedSensor = this.platform.devicesInHB.get(asConfig.sensorId + 'SWX')
+      this.definedSensor = this.platform.devicesInHB.get(deviceConf.sensorId + 'SWX')
     }
 
     // Add the garage door service if it doesn't already exist
diff --git a/lib/device/simulation/garage-two.js b/lib/device/simulation/garage-two.js
index 0f2bc51d..b6d55903 100644
--- a/lib/device/simulation/garage-two.js
+++ b/lib/device/simulation/garage-two.js
@@ -6,7 +6,6 @@ module.exports = class deviceGarageTwo {
   constructor (platform, accessory) {
     // Set up variables from the platform
     this.consts = platform.consts
-    this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
@@ -18,6 +17,15 @@ module.exports = class deviceGarageTwo {
     this.name = accessory.displayName
     this.accessory = accessory
 
+    // Set up custom variables for this device type
+    const deviceId = this.accessory.context.eweDeviceId
+    const deviceConf = platform.simulations[deviceId]
+    this.operationTime = deviceConf.operationTime ||
+      this.consts.defaultValues.operationTime
+    this.disableDeviceLogging = deviceConf.overrideDisabledLogging
+      ? false
+      : platform.config.disableDeviceLogging
+
     // Set up the accessory with default positions when added the first time
     if (!this.funcs.hasProperty(this.accessory.context, 'cacheCurrentDoorState')) {
       this.accessory.context.cacheOneCurrentDoorState = 1
@@ -26,10 +34,6 @@ module.exports = class deviceGarageTwo {
       this.accessory.context.cacheTwoTargetDoorState = 1
     }
 
-    // Set up custom variables for this device type
-    const eweId = this.accessory.context.eweDeviceId
-    this.operationTime = platform.simulations[eweId].operationTime
-
     // We want two garage door services for this accessory
     ;['1', '2'].forEach(v => {
       // Add the garage door service if it doesn't already exist
diff --git a/lib/device/simulation/lock-one.js b/lib/device/simulation/lock-one.js
index 469c6461..e4fd1f57 100644
--- a/lib/device/simulation/lock-one.js
+++ b/lib/device/simulation/lock-one.js
@@ -6,7 +6,6 @@ module.exports = class deviceLockOne {
   constructor (platform, accessory) {
     // Set up variables from the platform
     this.consts = platform.consts
-    this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
@@ -19,9 +18,13 @@ module.exports = class deviceLockOne {
     this.accessory = accessory
 
     // Set up custom variables for this device type
-    const asConfig = platform.simulations[this.accessory.context.eweDeviceId]
-    this.setup = asConfig.setup
-    this.operationTime = asConfig.operationTime
+    const deviceId = this.accessory.context.eweDeviceId
+    const deviceConf = platform.simulations[deviceId]
+    this.operationTime = deviceConf.operationTime ||
+      this.consts.defaultValues.operationTime
+    this.disableDeviceLogging = deviceConf.overrideDisabledLogging
+      ? false
+      : platform.config.disableDeviceLogging
 
     // Add the lock service if it doesn't already exist
     this.service = this.accessory.getService(this.hapServ.LockMechanism) ||
diff --git a/lib/device/simulation/switch-valve.js b/lib/device/simulation/switch-valve.js
index c013e01c..462d0d1d 100644
--- a/lib/device/simulation/switch-valve.js
+++ b/lib/device/simulation/switch-valve.js
@@ -6,7 +6,6 @@ module.exports = class deviceSwitchValve {
   constructor (platform, accessory) {
     // Set up variables from the platform
     this.consts = platform.consts
-    this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
@@ -18,6 +17,13 @@ module.exports = class deviceSwitchValve {
     this.name = accessory.displayName
     this.accessory = accessory
 
+    // Set up custom variables for this device type
+    const deviceId = this.accessory.context.eweDeviceId
+    const deviceConf = platform.simulations[deviceId]
+    this.disableDeviceLogging = deviceConf.overrideDisabledLogging
+      ? false
+      : platform.config.disableDeviceLogging
+
     // Add the switch service if it doesn't already exist
     this.sService = this.accessory.getService(this.hapServ.Switch) ||
       this.accessory.addService(this.hapServ.Switch)
diff --git a/lib/device/simulation/tap-one.js b/lib/device/simulation/tap-one.js
index 8284b755..ca816bce 100644
--- a/lib/device/simulation/tap-one.js
+++ b/lib/device/simulation/tap-one.js
@@ -6,7 +6,6 @@ module.exports = class deviceTapOne {
   constructor (platform, accessory) {
     // Set up variables from the platform
     this.consts = platform.consts
-    this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
@@ -19,7 +18,12 @@ module.exports = class deviceTapOne {
     this.accessory = accessory
 
     // Set up custom variables for this device type
-    this.setup = platform.simulations[this.accessory.context.eweDeviceId].setup
+    const deviceId = this.accessory.context.eweDeviceId
+    const deviceConf = platform.simulations[deviceId]
+    this.setup = deviceConf.setup
+    this.disableDeviceLogging = deviceConf.overrideDisabledLogging
+      ? false
+      : platform.config.disableDeviceLogging
 
     // Add the tap service if it doesn't already exist
     if (!(this.service = this.accessory.getService(this.hapServ.Valve))) {
diff --git a/lib/device/simulation/tap-two.js b/lib/device/simulation/tap-two.js
index 6a029e55..de2aefca 100644
--- a/lib/device/simulation/tap-two.js
+++ b/lib/device/simulation/tap-two.js
@@ -6,7 +6,6 @@ module.exports = class deviceTapTwo {
   constructor (platform, accessory) {
     // Set up variables from the platform
     this.consts = platform.consts
-    this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
@@ -18,6 +17,13 @@ module.exports = class deviceTapTwo {
     this.name = accessory.displayName
     this.accessory = accessory
 
+    // Set up custom variables for this device type
+    const deviceId = this.accessory.context.eweDeviceId
+    const deviceConf = platform.simulations[deviceId]
+    this.disableDeviceLogging = deviceConf.overrideDisabledLogging
+      ? false
+      : platform.config.disableDeviceLogging
+
     // We want two tap services for this accessory
     ;['A', 'B'].forEach(v => {
       // Add the tap service if it doesn't already exist
diff --git a/lib/device/simulation/thermostat.js b/lib/device/simulation/thermostat.js
index bf6b7013..b25b88bc 100644
--- a/lib/device/simulation/thermostat.js
+++ b/lib/device/simulation/thermostat.js
@@ -6,7 +6,6 @@ module.exports = class deviceThermostat {
   constructor (platform, accessory) {
     // Set up variables from the platform
     this.consts = platform.consts
-    this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
@@ -21,9 +20,14 @@ module.exports = class deviceThermostat {
     // Set up custom variables for this device type
     const deviceId = this.accessory.context.eweDeviceId
     const deviceConf = platform.thDevices[deviceId]
+    const deviceConf2 = platform.simulations[deviceId]
     this.tempOffset = deviceConf && deviceConf.offset
       ? deviceConf.offset
       : platform.consts.defaultValues.offset
+    this.disableDeviceLogging = deviceConf.overrideDisabledLogging ||
+      deviceConf2.overrideDisabledLogging
+      ? false
+      : platform.config.disableDeviceLogging
 
     // If the accessory has a switch service then remove it
     if (this.accessory.getService(this.hapServ.Switch)) {
diff --git a/lib/device/simulation/valve-four.js b/lib/device/simulation/valve-four.js
index bc27f2c9..b93f5327 100644
--- a/lib/device/simulation/valve-four.js
+++ b/lib/device/simulation/valve-four.js
@@ -6,7 +6,6 @@ module.exports = class deviceValveFour {
   constructor (platform, accessory) {
     // Set up variables from the platform
     this.consts = platform.consts
-    this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
@@ -18,6 +17,13 @@ module.exports = class deviceValveFour {
     this.name = accessory.displayName
     this.accessory = accessory
 
+    // Set up custom variables for this device type
+    const deviceId = this.accessory.context.eweDeviceId
+    const deviceConf = platform.simulations[deviceId]
+    this.disableDeviceLogging = deviceConf.overrideDisabledLogging
+      ? false
+      : platform.config.disableDeviceLogging
+
     // We want four valve services for this accessory
     ;['A', 'B', 'C', 'D'].forEach(v => {
       // Add the valve service if it doesn't already exist
diff --git a/lib/device/simulation/valve-one.js b/lib/device/simulation/valve-one.js
index ea3d9535..12abd654 100644
--- a/lib/device/simulation/valve-one.js
+++ b/lib/device/simulation/valve-one.js
@@ -6,7 +6,6 @@ module.exports = class deviceValveOne {
   constructor (platform, accessory) {
     // Set up variables from the platform
     this.consts = platform.consts
-    this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
@@ -19,7 +18,12 @@ module.exports = class deviceValveOne {
     this.accessory = accessory
 
     // Set up custom variables for this device type
-    this.setup = platform.simulations[this.accessory.context.eweDeviceId].setup
+    const deviceId = this.accessory.context.eweDeviceId
+    const deviceConf = platform.simulations[deviceId]
+    this.setup = deviceConf.setup
+    this.disableDeviceLogging = deviceConf.overrideDisabledLogging
+      ? false
+      : platform.config.disableDeviceLogging
 
     // Add the valve service if it doesn't already exist
     if (!(this.service = this.accessory.getService(this.hapServ.Valve))) {
diff --git a/lib/device/simulation/valve-two.js b/lib/device/simulation/valve-two.js
index 75b4f48a..cf43cb73 100644
--- a/lib/device/simulation/valve-two.js
+++ b/lib/device/simulation/valve-two.js
@@ -6,7 +6,6 @@ module.exports = class deviceValveTwo {
   constructor (platform, accessory) {
     // Set up variables from the platform
     this.consts = platform.consts
-    this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
@@ -18,6 +17,13 @@ module.exports = class deviceValveTwo {
     this.name = accessory.displayName
     this.accessory = accessory
 
+    // Set up custom variables for this device type
+    const deviceId = this.accessory.context.eweDeviceId
+    const deviceConf = platform.simulations[deviceId]
+    this.disableDeviceLogging = deviceConf.overrideDisabledLogging
+      ? false
+      : platform.config.disableDeviceLogging
+
     // We want two valve services for this accessory
     ;['A', 'B'].forEach(v => {
       // Add the valve service if it doesn't already exist
diff --git a/lib/device/switch-multi.js b/lib/device/switch-multi.js
index 28f362fc..c045a4b2 100644
--- a/lib/device/switch-multi.js
+++ b/lib/device/switch-multi.js
@@ -6,7 +6,6 @@ module.exports = class deviceSwitchMulti {
   constructor (platform, accessory) {
     // Set up variables from the platform
     this.consts = platform.consts
-    this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
@@ -18,6 +17,13 @@ module.exports = class deviceSwitchMulti {
     this.name = accessory.displayName
     this.accessory = accessory
 
+    // Set up custom variables for this device type
+    const deviceId = this.accessory.context.eweDeviceId
+    const deviceConf = platform.multiDevices[deviceId]
+    this.disableDeviceLogging = deviceConf && deviceConf.overrideDisabledLogging
+      ? false
+      : platform.config.disableDeviceLogging
+
     // Add the switch service if it doesn't already exist
     this.service = this.accessory.getService(this.hapServ.Switch) ||
       this.accessory.addService(this.hapServ.Switch)
diff --git a/lib/device/switch-single.js b/lib/device/switch-single.js
index e0081e99..ee110580 100644
--- a/lib/device/switch-single.js
+++ b/lib/device/switch-single.js
@@ -6,7 +6,6 @@ module.exports = class deviceSwitchSingle {
   constructor (platform, accessory) {
     // Set up variables from the platform
     this.consts = platform.consts
-    this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
@@ -18,6 +17,13 @@ module.exports = class deviceSwitchSingle {
     this.name = accessory.displayName
     this.accessory = accessory
 
+    // Set up custom variables for this device type
+    const deviceId = this.accessory.context.eweDeviceId
+    const deviceConf = platform.singleDevices[deviceId]
+    this.disableDeviceLogging = deviceConf && deviceConf.overrideDisabledLogging
+      ? false
+      : platform.config.disableDeviceLogging
+
     // If the accessory has a outlet service then remove it
     if (this.accessory.getService(this.hapServ.Outlet)) {
       this.accessory.removeService(this.accessory.getService(this.hapServ.Outlet))
diff --git a/lib/device/template.js b/lib/device/template.js
index be89b93d..c52c0d78 100644
--- a/lib/device/template.js
+++ b/lib/device/template.js
@@ -6,7 +6,6 @@ module.exports = class deviceTemplate {
   constructor (platform, accessory) {
     // Set up variables from the platform
     this.consts = platform.consts
-    this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
diff --git a/lib/device/thermostat.js b/lib/device/thermostat.js
index 6e16729a..e44ad2ca 100644
--- a/lib/device/thermostat.js
+++ b/lib/device/thermostat.js
@@ -6,7 +6,6 @@ module.exports = class deviceThermostat {
   constructor (platform, accessory) {
     // Set up variables from the platform
     this.consts = platform.consts
-    this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
@@ -24,6 +23,9 @@ module.exports = class deviceThermostat {
     this.tempOffset = deviceConf && deviceConf.offset
       ? deviceConf.offset
       : platform.consts.defaultValues.offset
+    this.disableDeviceLogging = deviceConf && deviceConf.overrideDisabledLogging
+      ? false
+      : platform.config.disableDeviceLogging
 
     /*
       **************
diff --git a/lib/device/usb.js b/lib/device/usb.js
index a96085cf..f801ab97 100644
--- a/lib/device/usb.js
+++ b/lib/device/usb.js
@@ -6,7 +6,6 @@ module.exports = class deviceUSB {
   constructor (platform, accessory) {
     // Set up variables from the platform
     this.consts = platform.consts
-    this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
@@ -22,6 +21,9 @@ module.exports = class deviceUSB {
     const deviceId = this.accessory.context.eweDeviceId
     const deviceConf = platform.outletDevices[deviceId]
     this.showAsSwitch = deviceConf && deviceConf.showAsSwitch
+    this.disableDeviceLogging = deviceConf && deviceConf.overrideDisabledLogging
+      ? false
+      : platform.config.disableDeviceLogging
 
     // Check if the user has overridden how this accessory should appear
     if (this.showAsSwitch) {
diff --git a/lib/device/zigbee/light-dimmer.js b/lib/device/zigbee/light-dimmer.js
index fe85fd5d..2287cc25 100644
--- a/lib/device/zigbee/light-dimmer.js
+++ b/lib/device/zigbee/light-dimmer.js
@@ -6,7 +6,6 @@ module.exports = class deviceZBLightDimmer {
   constructor (platform, accessory) {
     // Set up variables from the platform
     this.consts = platform.consts
-    this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
@@ -18,6 +17,16 @@ module.exports = class deviceZBLightDimmer {
     this.name = accessory.displayName
     this.accessory = accessory
 
+    // Set up custom variables for this device type
+    const deviceId = this.accessory.context.eweDeviceId
+    const deviceConf = platform.lightDevices[deviceId]
+    this.brightStep = deviceConf && deviceConf.brightnessStep
+      ? Math.min(deviceConf.brightnessStep, 100)
+      : platform.consts.defaultValues.brightnessStep
+    this.disableDeviceLogging = deviceConf && deviceConf.overrideDisabledLogging
+      ? false
+      : platform.config.disableDeviceLogging
+
     // Add the lightbulb service if it doesn't already exist
     this.service = this.accessory.getService(this.hapServ.Lightbulb) ||
       this.accessory.addService(this.hapServ.Lightbulb)
@@ -29,6 +38,7 @@ module.exports = class deviceZBLightDimmer {
     // Add the set handler to the lightbulb brightness characteristic
     this.service.getCharacteristic(this.hapChar.Brightness)
       .on('set', this.internalBrightnessUpdate.bind(this))
+      .setProps({ minStep: this.brightStep })
   }
 
   async internalOnOffUpdate (value, callback) {
diff --git a/lib/device/zigbee/sensor-ambient.js b/lib/device/zigbee/sensor-ambient.js
index 89ec4ebf..1097004f 100644
--- a/lib/device/zigbee/sensor-ambient.js
+++ b/lib/device/zigbee/sensor-ambient.js
@@ -6,7 +6,6 @@ module.exports = class deviceZBSensorAmbient {
   constructor (platform, accessory) {
     // Set up variables from the platform
     this.consts = platform.consts
-    this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
@@ -24,6 +23,9 @@ module.exports = class deviceZBSensorAmbient {
     this.lowBattThreshold = deviceConf && deviceConf.lowBattThreshold
       ? Math.min(deviceConf.lowBattThreshold, 100)
       : platform.consts.defaultValues.lowBattThreshold
+    this.disableDeviceLogging = deviceConf && deviceConf.overrideDisabledLogging
+      ? false
+      : platform.config.disableDeviceLogging
 
     // Add the temperature sensor service if it doesn't already exist
     this.tService = this.accessory.getService(this.hapServ.TemperatureSensor) ||
diff --git a/lib/device/zigbee/sensor-contact.js b/lib/device/zigbee/sensor-contact.js
index cf442550..7b5e28bd 100644
--- a/lib/device/zigbee/sensor-contact.js
+++ b/lib/device/zigbee/sensor-contact.js
@@ -6,7 +6,6 @@ module.exports = class deviceZBSensorContact {
   constructor (platform, accessory) {
     // Set up variables from the platform
     this.consts = platform.consts
-    this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
@@ -25,6 +24,9 @@ module.exports = class deviceZBSensorContact {
     this.lowBattThreshold = deviceConf && deviceConf.lowBattThreshold
       ? Math.min(deviceConf.lowBattThreshold, 100)
       : platform.consts.defaultValues.lowBattThreshold
+    this.disableDeviceLogging = deviceConf && deviceConf.overrideDisabledLogging
+      ? false
+      : platform.config.disableDeviceLogging
 
     // Set up the custom Eve characteristics for this device type
     this.inherits = require('util').inherits
diff --git a/lib/device/zigbee/sensor-motion.js b/lib/device/zigbee/sensor-motion.js
index f3644055..384056ab 100644
--- a/lib/device/zigbee/sensor-motion.js
+++ b/lib/device/zigbee/sensor-motion.js
@@ -6,7 +6,6 @@ module.exports = class deviceZBSensorMotion {
   constructor (platform, accessory) {
     // Set up variables from the platform
     this.consts = platform.consts
-    this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
@@ -27,6 +26,9 @@ module.exports = class deviceZBSensorMotion {
     this.sensorTimeDifference = deviceConf && deviceConf.sensorTimeDifference
       ? deviceConf.sensorTimeDifference
       : platform.consts.defaultValues.sensorTimeDifference
+    this.disableDeviceLogging = deviceConf && deviceConf.overrideDisabledLogging
+      ? false
+      : platform.config.disableDeviceLogging
 
     // Set up the custom Eve characteristics for this device type
     this.inherits = require('util').inherits
diff --git a/lib/device/zigbee/switch-single.js b/lib/device/zigbee/switch-single.js
index 60ecfa00..028a9425 100644
--- a/lib/device/zigbee/switch-single.js
+++ b/lib/device/zigbee/switch-single.js
@@ -6,7 +6,6 @@ module.exports = class deviceZBSwitchSingle {
   constructor (platform, accessory) {
     // Set up variables from the platform
     this.consts = platform.consts
-    this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
@@ -18,6 +17,13 @@ module.exports = class deviceZBSwitchSingle {
     this.name = accessory.displayName
     this.accessory = accessory
 
+    // Set up custom variables for this device type
+    const deviceId = this.accessory.context.eweDeviceId
+    const deviceConf = platform.singleDevices[deviceId]
+    this.disableDeviceLogging = deviceConf && deviceConf.overrideDisabledLogging
+      ? false
+      : platform.config.disableDeviceLogging
+
     // Add the switch service if it doesn't already exist
     this.service = this.accessory.getService(this.hapServ.Switch) ||
       this.accessory.addService(this.hapServ.Switch)
diff --git a/lib/device/zigbee/switch-stateless.js b/lib/device/zigbee/switch-stateless.js
index a61df013..4b75ec2b 100644
--- a/lib/device/zigbee/switch-stateless.js
+++ b/lib/device/zigbee/switch-stateless.js
@@ -6,7 +6,6 @@ module.exports = class deviceZBSwitchStateless {
   constructor (platform, accessory) {
     // Set up variables from the platform
     this.consts = platform.consts
-    this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
@@ -25,6 +24,9 @@ module.exports = class deviceZBSwitchStateless {
     this.lowBattThreshold = deviceConf && deviceConf.lowBattThreshold
       ? Math.min(deviceConf.lowBattThreshold, 100)
       : platform.consts.defaultValues.lowBattThreshold
+    this.disableDeviceLogging = deviceConf && deviceConf.overrideDisabledLogging
+      ? false
+      : platform.config.disableDeviceLogging
 
     // Add the stateless switch service if it doesn't already exist
     this.service = this.accessory.getService(this.hapServ.StatelessProgrammableSwitch) ||
diff --git a/lib/index.js b/lib/index.js
index 01604dd0..1f127fc4 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -106,6 +106,12 @@ class eWeLinkPlatform {
                 switch (k) {
                   case 'fullDeviceId':
                     break
+                  case 'overrideDisabledLogging':
+                    if (typeof v === 'string') {
+                      logQuotes(key + '.' + k)
+                    }
+                    this.rfDevices[fullDeviceId][k] = v === 'false' ? false : !!v
+                    break
                   case 'sensorTimeDifference':
                   case 'sensorTimeLength': {
                     if (typeof v === 'string') {
@@ -178,6 +184,12 @@ class eWeLinkPlatform {
                     }
                     this.fanDevices[deviceId][k] = v === 'false' ? false : !!v
                     break
+                  case 'overrideDisabledLogging':
+                    if (typeof v === 'string') {
+                      logQuotes(key + '.' + k)
+                    }
+                    this.fanDevices[deviceId][k] = v === 'false' ? false : !!v
+                    break
                   default:
                     logRemove(key + '.' + k)
                     break
@@ -236,6 +248,12 @@ class eWeLinkPlatform {
                     }
                     break
                   }
+                  case 'overrideDisabledLogging':
+                    if (typeof v === 'string') {
+                      logQuotes(key + '.' + k)
+                    }
+                    this.simulations[deviceId][k] = v === 'false' ? false : !!v
+                    break
                   case 'sensorId':
                     if (typeof v !== 'string' || v === '') {
                       logIgnore(key + '.' + k)
@@ -316,8 +334,6 @@ class eWeLinkPlatform {
                     }
                     break
                   }
-                  case 'deviceId':
-                    break
                   case 'bulbModel': {
                     const inSet = this.consts.allowed.bulbModels.includes(v)
                     if (typeof v !== 'string' || !inSet) {
@@ -329,6 +345,14 @@ class eWeLinkPlatform {
                     }
                     break
                   }
+                  case 'deviceId':
+                    break
+                  case 'overrideDisabledLogging':
+                    if (typeof v === 'string') {
+                      logQuotes(key + '.' + k)
+                    }
+                    this.lightDevices[deviceId][k] = v === 'false' ? false : !!v
+                    break
                   default:
                     logRemove(key + '.' + k)
                     break
@@ -381,6 +405,12 @@ class eWeLinkPlatform {
                     }
                     break
                   }
+                  case 'overrideDisabledLogging':
+                    if (typeof v === 'string') {
+                      logQuotes(key + '.' + k)
+                    }
+                    this.multiDevices[deviceId][k] = v === 'false' ? false : !!v
+                    break
                   default:
                     logRemove(key + '.' + k)
                     break
@@ -428,6 +458,12 @@ class eWeLinkPlatform {
                     }
                     break
                   }
+                  case 'overrideDisabledLogging':
+                    if (typeof v === 'string') {
+                      logQuotes(key + '.' + k)
+                    }
+                    this.outletDevices[deviceId][k] = v === 'false' ? false : !!v
+                    break
                   case 'showAsSwitch':
                     if (typeof val === 'string') {
                       logQuotes(k)
@@ -491,6 +527,12 @@ class eWeLinkPlatform {
                     }
                     break
                   }
+                  case 'overrideDisabledLogging':
+                    if (typeof v === 'string') {
+                      logQuotes(key + '.' + k)
+                    }
+                    this.sensorDevices[deviceId][k] = v === 'false' ? false : !!v
+                    break
                   default:
                     logRemove(key + '.' + k)
                     break
@@ -522,6 +564,12 @@ class eWeLinkPlatform {
                     }
                     break
                   }
+                  case 'overrideDisabledLogging':
+                    if (typeof v === 'string') {
+                      logQuotes(key + '.' + k)
+                    }
+                    this.singleDevices[deviceId][k] = v === 'false' ? false : !!v
+                    break
                   case 'showAsOutlet':
                     if (typeof val === 'string') {
                       logQuotes(k)
@@ -569,6 +617,12 @@ class eWeLinkPlatform {
                     }
                     break
                   }
+                  case 'overrideDisabledLogging':
+                    if (typeof v === 'string') {
+                      logQuotes(key + '.' + k)
+                    }
+                    this.thDevices[deviceId][k] = v === 'false' ? false : !!v
+                    break
                   default:
                     logRemove(key + '.' + k)
                     break
@@ -1109,6 +1163,10 @@ class eWeLinkPlatform {
           let sensorTimeDiff
           let subExtraContext = {}
           const fullDeviceId = device.deviceid + 'SW' + swNumber
+          const disableDeviceLogging = this.rfDevices[fullDeviceId] &&
+            this.rfDevices[fullDeviceId].overrideDisabledLogging
+            ? false
+            : this.config.disableDeviceLogging
 
           // Check which eWeLink type the connected sub device is
           if (['1', '2', '3', '4'].includes(subDevice.type)) {
@@ -1140,6 +1198,7 @@ class eWeLinkPlatform {
             swNumber,
             sensorTimeLength,
             sensorTimeDiff,
+            disableDeviceLogging,
             name: subDevice.name
           }
 
@@ -1150,6 +1209,7 @@ class eWeLinkPlatform {
               oAccessory.context.subType !== subType ||
               oAccessory.context.sensorTimeLength !== sensorTimeLength ||
               oAccessory.context.sensorTimeDiff !== sensorTimeDiff ||
+              oAccessory.context.disableDeviceLogging !== disableDeviceLogging ||
               oAccessory.context.swNumber !== swNumber
             ) {
               // Remove the existing sub accessory if any changes are found

From fcc8658ba9f85ba7739c834ecbb98bd7d627845a Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 15 Feb 2021 18:05:50 +0000
Subject: [PATCH 1483/3183] fix syntax

---
 config.schema.json | 220 ++++++++++++++++++++-------------------------
 1 file changed, 98 insertions(+), 122 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 4cf59a4c..1e28135e 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -34,8 +34,7 @@
         "title": "Connection Mode",
         "description": "This setting defines how the plugin communicates with your devices.",
         "default": "auto",
-        "oneOf": [
-          {
+        "oneOf": [{
             "title": "Auto (Recommended)",
             "enum": ["auto"]
           },
@@ -180,8 +179,7 @@
               "type": "string",
               "title": "Device Model",
               "description": "If your model is not listed then you do not need to set this.",
-              "oneOf": [
-                {
+              "oneOf": [{
                   "title": "B02-B-A60",
                   "enum": ["bulbB02BA60"]
                 },
@@ -334,8 +332,7 @@
               "type": "string",
               "title": "Sensor Type",
               "description": "Select the type of sensor you would like to expose this as.",
-              "oneOf": [
-                {
+              "oneOf": [{
                   "title": "Motion",
                   "enum": ["motion"]
                 },
@@ -404,8 +401,7 @@
               "type": "string",
               "title": "Type",
               "description": "The new type for this device.",
-              "oneOf": [
-                {
+              "oneOf": [{
                   "title": "1 Thermostat (w/ TH10/16)",
                   "enum": ["thermostat"]
                 },
@@ -466,8 +462,7 @@
               "condition": {
                 "functionBody": "return (model.groups[arrayIndices] && ['garage', 'lock', 'tap', 'valve'].includes(model.groups[arrayIndices].type))"
               },
-              "oneOf": [
-                {
+              "oneOf": [{
                   "title": "Single-Channel",
                   "enum": ["oneSwitch"]
                 },
@@ -530,8 +525,7 @@
       }
     }
   },
-  "layout": [
-    {
+  "layout": [{
       "type": "fieldset",
       "title": "Required Settings",
       "items": [
@@ -558,17 +552,15 @@
       "expandable": true,
       "add": "Add Another Device",
       "type": "array",
-      "items": [
-        {
-          "type": "fieldset",
-          "items": [
-            "singleDevices[].deviceId",
-            "singleDevices[].showAsOutlet",
-            "singleDevices[].ipAddress",
-            "singleDevices[].overrideDisabledLogging"
-          ]
-        }
-      ]
+      "items": [{
+        "type": "fieldset",
+        "items": [
+          "singleDevices[].deviceId",
+          "singleDevices[].showAsOutlet",
+          "singleDevices[].ipAddress",
+          "singleDevices[].overrideDisabledLogging"
+        ]
+      }]
     },
     {
       "key": "multiDevices",
@@ -577,17 +569,15 @@
       "expandable": true,
       "add": "Add Another Device",
       "type": "array",
-      "items": [
-        {
-          "type": "fieldset",
-          "items": [
-            "multiDevices[].deviceId",
-            "multiDevices[].hideChannels",
-            "multiDevices[].ipAddress",
-            "multiDevices[].overrideDisabledLogging"
-          ]
-        }
-      ]
+      "items": [{
+        "type": "fieldset",
+        "items": [
+          "multiDevices[].deviceId",
+          "multiDevices[].hideChannels",
+          "multiDevices[].ipAddress",
+          "multiDevices[].overrideDisabledLogging"
+        ]
+      }]
     },
     {
       "key": "outletDevices",
@@ -596,18 +586,16 @@
       "expandable": true,
       "add": "Add Another Device",
       "type": "array",
-      "items": [
-        {
-          "type": "fieldset",
-          "items": [
-            "outletDevices[].deviceId",
-            "outletDevices[].showAsSwitch",
-            "outletDevices[].inUsePowerThreshold",
-            "outletDevices[].ipAddress",
-            "outletDevices[].overrideDisabledLogging"
-          ]
-        }
-      ]
+      "items": [{
+        "type": "fieldset",
+        "items": [
+          "outletDevices[].deviceId",
+          "outletDevices[].showAsSwitch",
+          "outletDevices[].inUsePowerThreshold",
+          "outletDevices[].ipAddress",
+          "outletDevices[].overrideDisabledLogging"
+        ]
+      }]
     },
     {
       "key": "lightDevices",
@@ -616,18 +604,16 @@
       "expandable": true,
       "add": "Add Another Device",
       "type": "array",
-      "items": [
-        {
-          "type": "fieldset",
-          "items": [
-            "lightDevices[].deviceId",
-            "lightDevices[].bulbModel",
-            "lightDevices[].brightnessStep",
-            "lightDevices[].adaptiveLightingShift",
-            "lightDevices[].overrideDisabledLogging"
-          ]
-        }
-      ]
+      "items": [{
+        "type": "fieldset",
+        "items": [
+          "lightDevices[].deviceId",
+          "lightDevices[].bulbModel",
+          "lightDevices[].brightnessStep",
+          "lightDevices[].adaptiveLightingShift",
+          "lightDevices[].overrideDisabledLogging"
+        ]
+      }]
     },
     {
       "key": "thDevices",
@@ -636,17 +622,15 @@
       "expandable": true,
       "add": "Add Another Device",
       "type": "array",
-      "items": [
-        {
-          "type": "fieldset",
-          "items": [
-            "thDevices[].deviceId",
-            "thDevices[].hideSwitch",
-            "thDevices[].offset",
-            "thDevices[].overrideDisabledLogging"
-          ]
-        }
-      ]
+      "items": [{
+        "type": "fieldset",
+        "items": [
+          "thDevices[].deviceId",
+          "thDevices[].hideSwitch",
+          "thDevices[].offset",
+          "thDevices[].overrideDisabledLogging"
+        ]
+      }]
     },
     {
       "key": "fanDevices",
@@ -655,16 +639,14 @@
       "expandable": true,
       "add": "Add Another Device",
       "type": "array",
-      "items": [
-        {
-          "type": "fieldset",
-          "items": [
-            "fanDevices[].deviceId",
-            "fanDevices[].hideLight",
-            "fanDevices[].overrideDisabledLogging"
-          ]
-        }
-      ]
+      "items": [{
+        "type": "fieldset",
+        "items": [
+          "fanDevices[].deviceId",
+          "fanDevices[].hideLight",
+          "fanDevices[].overrideDisabledLogging"
+        ]
+      }]
     },
     {
       "key": "sensorDevices",
@@ -673,18 +655,16 @@
       "expandable": true,
       "add": "Add Another Device",
       "type": "array",
-      "items": [
-        {
-          "type": "fieldset",
-          "items": [
-            "sensorDevices[].deviceId",
-            "sensorDevices[].lowBattThreshold",
-            "sensorDevices[].hideLongDouble",
-            "sensorDevices[].scaleBattery",
-            "sensorDevices[].overrideDisabledLogging"
-          ]
-        }
-      ]
+      "items": [{
+        "type": "fieldset",
+        "items": [
+          "sensorDevices[].deviceId",
+          "sensorDevices[].lowBattThreshold",
+          "sensorDevices[].hideLongDouble",
+          "sensorDevices[].scaleBattery",
+          "sensorDevices[].overrideDisabledLogging"
+        ]
+      }]
     },
     {
       "key": "bridgeSensors",
@@ -693,18 +673,16 @@
       "expandable": true,
       "add": "Add Another Sensor",
       "type": "array",
-      "items": [
-        {
-          "type": "fieldset",
-          "items": [
-            "bridgeSensors[].fullDeviceId",
-            "bridgeSensors[].type",
-            "bridgeSensors[].sensorTimeLength",
-            "bridgeSensors[].sensorTimeDifference",
-            "bridgeSensors[].overrideDisabledLogging"
-          ]
-        }
-      ]
+      "items": [{
+        "type": "fieldset",
+        "items": [
+          "bridgeSensors[].fullDeviceId",
+          "bridgeSensors[].type",
+          "bridgeSensors[].sensorTimeLength",
+          "bridgeSensors[].sensorTimeDifference",
+          "bridgeSensors[].overrideDisabledLogging"
+        ]
+      }]
     },
     {
       "key": "groups",
@@ -713,25 +691,23 @@
       "description": "Set up simulated accessories from generic switch devices (<a href=\"https://github.com/bwp91/homebridge-ewelink/wiki/Accessory-Simulations\" target=\"_blank\">more info</a>).",
       "add": "Add Another Type",
       "type": "array",
-      "items": [
-        {
-          "type": "fieldset",
-          "items": [
-            "groups[].deviceId",
-            "groups[].type",
-            "groups[].setup",
-            "groups[].operationTime",
-            "groups[].sensorId",
-            "groups[].obstructId",
-            "groups[].ipAddress",,
-            "groups[].overrideDisabledLogging"
-            {
-              "type": "help",
-              "helpvalue": "<label class=\"control-label text-warning\">⚠ After restarting Homebridge you will need to remove this accessory from the cache for it set up correctly.</label>"
-            }
-          ]
-        }
-      ]
+      "items": [{
+        "type": "fieldset",
+        "items": [
+          "groups[].deviceId",
+          "groups[].type",
+          "groups[].setup",
+          "groups[].operationTime",
+          "groups[].sensorId",
+          "groups[].obstructId",
+          "groups[].ipAddress",
+          "groups[].overrideDisabledLogging",
+          {
+            "type": "help",
+            "helpvalue": "<label class=\"control-label text-warning\">⚠ After restarting Homebridge you will need to remove this accessory from the cache for it set up correctly.</label>"
+          }
+        ]
+      }]
     },
     {
       "key": "ignoredDevices",

From ccb6f07e7c5b6bafaeebeb72316c1b16cc8653cf Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 15 Feb 2021 18:08:41 +0000
Subject: [PATCH 1484/3183] lint json

---
 package.json | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 679f4dc0..23caa9fc 100644
--- a/package.json
+++ b/package.json
@@ -28,8 +28,7 @@
   "bugs": {
     "url": "https://github.com/bwp91/homebridge-ewelink/issues"
   },
-  "funding": [
-    {
+  "funding": [{
       "type": "github",
       "url": "https://github.com/sponsors/bwp91"
     },
@@ -54,4 +53,4 @@
     "websocket-as-promised": "^2.0.1",
     "ws": "^7.4.3"
   }
-}
+}
\ No newline at end of file

From 37b797b666572faf98490b75a307de1a9a62e2e0 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 15 Feb 2021 18:34:39 +0000
Subject: [PATCH 1485/3183] check exists

---
 lib/device/simulation/thermostat.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/device/simulation/thermostat.js b/lib/device/simulation/thermostat.js
index b25b88bc..12275b87 100644
--- a/lib/device/simulation/thermostat.js
+++ b/lib/device/simulation/thermostat.js
@@ -24,7 +24,7 @@ module.exports = class deviceThermostat {
     this.tempOffset = deviceConf && deviceConf.offset
       ? deviceConf.offset
       : platform.consts.defaultValues.offset
-    this.disableDeviceLogging = deviceConf.overrideDisabledLogging ||
+    this.disableDeviceLogging = (deviceConf && deviceConf.overrideDisabledLogging) ||
       deviceConf2.overrideDisabledLogging
       ? false
       : platform.config.disableDeviceLogging

From e543750ccb3c57a823d053d6e5462a4c9710b22a Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 15 Feb 2021 18:35:15 +0000
Subject: [PATCH 1486/3183] 5.0.0-2

---
 package-lock.json | 2 +-
 package.json      | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 23a179bf..a943aab6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "5.0.0-1",
+  "version": "5.0.0-2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 23caa9fc..f4e2efbe 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "5.0.0-1",
+  "version": "5.0.0-2",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",
@@ -28,7 +28,8 @@
   "bugs": {
     "url": "https://github.com/bwp91/homebridge-ewelink/issues"
   },
-  "funding": [{
+  "funding": [
+    {
       "type": "github",
       "url": "https://github.com/sponsors/bwp91"
     },
@@ -53,4 +54,4 @@
     "websocket-as-promised": "^2.0.1",
     "ws": "^7.4.3"
   }
-}
\ No newline at end of file
+}

From 1cc779254b85da4404610c3a883fec870633ad71 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 15 Feb 2021 19:03:34 +0000
Subject: [PATCH 1487/3183] fix+repeated code

---
 lib/index.js | 37 ++++++-------------------------------
 1 file changed, 6 insertions(+), 31 deletions(-)

diff --git a/lib/index.js b/lib/index.js
index 1f127fc4..1342fb19 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -179,11 +179,6 @@ class eWeLinkPlatform {
                   case 'deviceId':
                     break
                   case 'hideLight':
-                    if (typeof val === 'string') {
-                      logQuotes(k)
-                    }
-                    this.fanDevices[deviceId][k] = v === 'false' ? false : !!v
-                    break
                   case 'overrideDisabledLogging':
                     if (typeof v === 'string') {
                       logQuotes(key + '.' + k)
@@ -459,17 +454,12 @@ class eWeLinkPlatform {
                     break
                   }
                   case 'overrideDisabledLogging':
+                  case 'showAsSwitch':
                     if (typeof v === 'string') {
                       logQuotes(key + '.' + k)
                     }
                     this.outletDevices[deviceId][k] = v === 'false' ? false : !!v
                     break
-                  case 'showAsSwitch':
-                    if (typeof val === 'string') {
-                      logQuotes(k)
-                    }
-                    this.outletDevices[deviceId][k] = v === 'false' ? false : !!v
-                    break
                   default:
                     logRemove(key + '.' + k)
                     break
@@ -504,8 +494,9 @@ class eWeLinkPlatform {
                   case 'deviceId':
                     break
                   case 'hideLongDouble':
+                  case 'overrideDisabledLogging':
                   case 'scaleBattery':
-                    if (typeof val === 'string') {
+                    if (typeof v === 'string') {
                       logQuotes(k)
                     }
                     this.sensorDevices[deviceId][k] = v === 'false' ? false : !!v
@@ -527,12 +518,6 @@ class eWeLinkPlatform {
                     }
                     break
                   }
-                  case 'overrideDisabledLogging':
-                    if (typeof v === 'string') {
-                      logQuotes(key + '.' + k)
-                    }
-                    this.sensorDevices[deviceId][k] = v === 'false' ? false : !!v
-                    break
                   default:
                     logRemove(key + '.' + k)
                     break
@@ -565,17 +550,12 @@ class eWeLinkPlatform {
                     break
                   }
                   case 'overrideDisabledLogging':
+                  case 'showAsOutlet':
                     if (typeof v === 'string') {
                       logQuotes(key + '.' + k)
                     }
                     this.singleDevices[deviceId][k] = v === 'false' ? false : !!v
                     break
-                  case 'showAsOutlet':
-                    if (typeof val === 'string') {
-                      logQuotes(k)
-                    }
-                    this.singleDevices[deviceId][k] = v === 'false' ? false : !!v
-                    break
                   default:
                     logRemove(key + '.' + k)
                     break
@@ -600,7 +580,8 @@ class eWeLinkPlatform {
                   case 'deviceId':
                     break
                   case 'hideSwitch':
-                    if (typeof val === 'string') {
+                  case 'overrideDisabledLogging':
+                    if (typeof v === 'string') {
                       logQuotes(k)
                     }
                     this.thDevices[deviceId][k] = v === 'false' ? false : !!v
@@ -617,12 +598,6 @@ class eWeLinkPlatform {
                     }
                     break
                   }
-                  case 'overrideDisabledLogging':
-                    if (typeof v === 'string') {
-                      logQuotes(key + '.' + k)
-                    }
-                    this.thDevices[deviceId][k] = v === 'false' ? false : !!v
-                    break
                   default:
                     logRemove(key + '.' + k)
                     break

From cb725b90bab78481cc3f81c8306192f927910d4d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 15 Feb 2021 19:04:07 +0000
Subject: [PATCH 1488/3183] 5.0.0-3

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index a943aab6..9ae93dad 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "5.0.0-2",
+  "version": "5.0.0-3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index f4e2efbe..bf552092 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "5.0.0-2",
+  "version": "5.0.0-3",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From bbba66c92d1f73ae3dfa66ed9a3e6b68a5676603 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 15 Feb 2021 19:58:34 +0000
Subject: [PATCH 1489/3183] check for service

---
 lib/device/simulation/garage-one.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/device/simulation/garage-one.js b/lib/device/simulation/garage-one.js
index 08d44d18..591a8b86 100644
--- a/lib/device/simulation/garage-one.js
+++ b/lib/device/simulation/garage-one.js
@@ -45,6 +45,11 @@ module.exports = class deviceGarageOne {
         this.error = 'defined sensor is not a DW2 sensor'
       }
       this.definedSensor = this.platform.devicesInHB.get(deviceConf.sensorId + 'SWX')
+      
+      // Check the sensor has the ContactSensor service
+      if (!this.definedSensor.getService(this.hapServ.ContactSensor)) {
+        this.error = 'defined sensor is not configured as a sensor'
+      }
     }
 
     // Add the garage door service if it doesn't already exist

From 2b2c51dd7e197e1560e81016b924e8230319ccd9 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 15 Feb 2021 20:56:37 +0000
Subject: [PATCH 1490/3183] sensor

---
 config.schema.json                   |  9 ++-
 lib/device/sensor-contact.js         |  5 ++
 lib/device/simulation/garage-one.js  |  2 +-
 lib/device/simulation/sensor-leak.js | 99 ++++++++++++++++++++++++++++
 lib/index.js                         | 14 ++++
 lib/utils/constants.js               |  3 +-
 6 files changed, 129 insertions(+), 3 deletions(-)
 create mode 100644 lib/device/simulation/sensor-leak.js

diff --git a/config.schema.json b/config.schema.json
index 1e28135e..b241a420 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -452,6 +452,10 @@
                 {
                   "title": "1 Switch & 1 Valve (w/ multi-channel device)",
                   "enum": ["switch_valve"]
+                },
+                {
+                  "title": "1 Leak Sensor (w/ Sonoff DW2)",
+                  "enum": ["sensor_leak"]
                 }
               ]
             },
@@ -501,7 +505,10 @@
             "ipAddress": {
               "type": "string",
               "title": "IP Address",
-              "description": "You can manually set the IP address for this device if it cannot be discovered by the plugin."
+              "description": "You can manually set the IP address for this device if it cannot be discovered by the plugin.",
+              "condition": {
+                "functionBody": "return (model.groups[arrayIndices] && !['thermostat', 'sensor_leak'].includes(model.groups[arrayIndices].type))"
+              }
             },
             "overrideDisabledLogging": {
               "type": "boolean",
diff --git a/lib/device/sensor-contact.js b/lib/device/sensor-contact.js
index 415a1a35..6c02c006 100644
--- a/lib/device/sensor-contact.js
+++ b/lib/device/sensor-contact.js
@@ -42,6 +42,11 @@ module.exports = class deviceSensorContact {
     this.inherits(this.eveLastActivation, this.hapChar)
     this.eveLastActivation.UUID = this.consts.eve.lastActivation
 
+    // If the accessory has a leak sensor service then remove it
+    if (this.accessory.getService(this.hapServ.LeakSensor)) {
+      this.accessory.removeService(this.accessory.getService(this.hapServ.LeakSensor))
+    }
+
     // Add the contact sensor service if it doesn't already exist
     this.contactService = this.accessory.getService(this.hapServ.ContactSensor) ||
       this.accessory.addService(this.hapServ.ContactSensor)
diff --git a/lib/device/simulation/garage-one.js b/lib/device/simulation/garage-one.js
index 591a8b86..09af3961 100644
--- a/lib/device/simulation/garage-one.js
+++ b/lib/device/simulation/garage-one.js
@@ -45,7 +45,7 @@ module.exports = class deviceGarageOne {
         this.error = 'defined sensor is not a DW2 sensor'
       }
       this.definedSensor = this.platform.devicesInHB.get(deviceConf.sensorId + 'SWX')
-      
+
       // Check the sensor has the ContactSensor service
       if (!this.definedSensor.getService(this.hapServ.ContactSensor)) {
         this.error = 'defined sensor is not configured as a sensor'
diff --git a/lib/device/simulation/sensor-leak.js b/lib/device/simulation/sensor-leak.js
new file mode 100644
index 00000000..c64fa8d7
--- /dev/null
+++ b/lib/device/simulation/sensor-leak.js
@@ -0,0 +1,99 @@
+/* jshint -W014, -W033, esversion: 9 */
+/* eslint-disable new-cap */
+'use strict'
+
+module.exports = class deviceSensorLeak {
+  constructor (platform, accessory) {
+    // Set up variables from the platform
+    this.consts = platform.consts
+    this.funcs = platform.funcs
+    this.hapServ = platform.api.hap.Service
+    this.hapChar = platform.api.hap.Characteristic
+    this.log = platform.log
+    this.messages = platform.messages
+    this.platform = platform
+
+    // Set up variables from the accessory
+    this.name = accessory.displayName
+    this.accessory = accessory
+
+    // Set up custom variables for this device type
+    const deviceId = this.accessory.context.eweDeviceId
+    const deviceConf = platform.sensorDevices[deviceId]
+    const deviceConf2 = platform.simulations[deviceId]
+    this.lowBattThreshold = deviceConf && deviceConf.lowBattThreshold
+      ? Math.min(deviceConf.lowBattThreshold, 100)
+      : platform.consts.defaultValues.lowBattThreshold
+    this.disableDeviceLogging = (deviceConf && deviceConf.overrideDisabledLogging) ||
+      deviceConf2.overrideDisabledLogging
+      ? false
+      : platform.config.disableDeviceLogging
+
+    // Set up the custom Eve characteristics for this device type
+    this.inherits = require('util').inherits
+    const self = this
+    this.eveLastActivation = function () {
+      self.hapChar.call(this, 'Last Activation', self.consts.eve.lastActivation)
+      this.setProps({
+        format: self.hapChar.Formats.UINT32,
+        unit: self.hapChar.Units.SECONDS,
+        perms: [self.hapChar.Perms.READ, self.hapChar.Perms.NOTIFY]
+      })
+      this.value = this.getDefaultValue()
+    }
+    this.inherits(this.eveLastActivation, this.hapChar)
+    this.eveLastActivation.UUID = this.consts.eve.lastActivation
+
+    // If the accessory has a contact sensor service then remove it
+    if (this.accessory.getService(this.hapServ.ContactSensor)) {
+      this.accessory.removeService(this.accessory.getService(this.hapServ.ContactSensor))
+    }
+
+    // Add the leak sensor service if it doesn't already exist
+    this.leakService = this.accessory.getService(this.hapServ.LeakSensor) ||
+      this.accessory.addService(this.hapServ.LeakSensor)
+
+    // Add the battery service if it doesn't already exist
+    this.batteryService = this.accessory.getService(this.hapServ.BatteryService) ||
+      this.accessory.addService(this.hapServ.BatteryService)
+
+    // Pass the accessory to Fakegato to set up with Eve
+    this.accessory.eveService = new this.platform.eveService('door', this.accessory, {
+      log: platform.config.debugFakegato ? this.log : () => {}
+    })
+  }
+
+  async externalUpdate (params) {
+    try {
+      if (this.funcs.hasProperty(params, 'battery')) {
+        const scaledBattery = Math.round(params.battery * 33.3)
+        if (this.cacheBattery !== scaledBattery) {
+          this.cacheBattery = scaledBattery
+          this.batteryService.updateCharacteristic(this.hapChar.BatteryLevel, this.cacheBattery)
+            .updateCharacteristic(this.hapChar.StatusLowBattery, this.cacheBattery < this.lowBattThreshold)
+          if (params.updateSource && !this.disableDeviceLogging) {
+            this.log('[%s] current battery [%s%].', this.name, this.cacheBattery)
+          }
+        }
+      }
+      if (!params.switch || params.switch === this.cacheOnOff) {
+        return
+      }
+      this.cacheOnOff = params.switch
+      const newState = params.switch === 'on' ? 1 : 0
+      this.leakService.updateCharacteristic(this.hapChar.LeakDetected, newState)
+      this.accessory.eveService.addEntry({ status: newState })
+      if (newState) {
+        this.leakService.updateCharacteristic(
+          this.eveLastActivation,
+          Math.round(new Date().valueOf() / 1000) - this.accessory.eveService.getInitialTime()
+        )
+      }
+      if (params.updateSource && !this.disableDeviceLogging) {
+        this.log('[%s] current state [water%s detected].', this.name, newState === 0 ? '' : ' not')
+      }
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, false)
+    }
+  }
+}
diff --git a/lib/index.js b/lib/index.js
index 1342fb19..c2643581 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -913,6 +913,20 @@ class eWeLinkPlatform {
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require(instance))(this, accessory)
         /**********************************/
+      } else if (
+        this.simulations[device.deviceid] &&
+        this.simulations[device.deviceid].type === 'sensor_leak' &&
+        this.consts.devices.sensorContact.includes(device.extra.uiid)
+      ) {
+        /**************************************
+        SENSORS [LEAK DW2 ACCESSORY SIMULATION]
+        **************************************/
+        const instance = './device/simulation/sensor-leak'
+        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
+          ? this.devicesInHB.get(device.deviceid + 'SWX')
+          : this.addAccessory(device, device.deviceid + 'SWX')
+        accessory.control = new (require(instance))(this, accessory)
+        /*************************************/
       } else if (this.consts.devices.sensorContact.includes(device.extra.uiid)) {
         /*******************
         SENSORS [SONOFF DW2]
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 058ebf55..e7db8339 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -147,7 +147,8 @@ module.exports = {
   allowed: {
     groups: [
       'blind', 'garage', 'garage_two', 'garage_four', 'garage_eachen', 'lock',
-      'switch_valve', 'tap', 'tap_two', 'thermostat', 'valve', 'valve_two', 'valve_four'
+      'sensor_leak', 'switch_valve', 'tap', 'tap_two', 'thermostat', 'valve', 'valve_two',
+      'valve_four'
     ],
     modes: ['auto', 'wan', 'lan'],
     obstructs: ['garage', 'garage_eachen'],

From f53fba797b64d86c137f1ee87636433be7ab6ade Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 15 Feb 2021 20:57:11 +0000
Subject: [PATCH 1491/3183] 5.0.0-4

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 9ae93dad..89aca968 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "5.0.0-3",
+  "version": "5.0.0-4",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index bf552092..b13647d2 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "5.0.0-3",
+  "version": "5.0.0-4",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From ca6ed67cb71a159819dbf05b3a5cd61242d2f5ec Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 16 Feb 2021 08:33:12 +0000
Subject: [PATCH 1492/3183] min hb b58 for adaptive lighting

---
 lib/device/light-colour.js | 2 +-
 lib/device/light-ctemp.js  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/device/light-colour.js b/lib/device/light-colour.js
index 662de5ed..a86b4063 100644
--- a/lib/device/light-colour.js
+++ b/lib/device/light-colour.js
@@ -68,7 +68,7 @@ module.exports = class deviceLightColour {
       // Set up the adaptive lighting controller if available
       if (
         platform.api.versionGreaterOrEqual &&
-        platform.api.versionGreaterOrEqual('1.3.0-beta.46')
+        platform.api.versionGreaterOrEqual('1.3.0-beta.58')
       ) {
         // This is needed as sometimes we need to send the brightness with a cct update
         this.cacheBright = this.service.getCharacteristic(this.hapChar.Brightness).value
diff --git a/lib/device/light-ctemp.js b/lib/device/light-ctemp.js
index 50e7b410..995a6111 100644
--- a/lib/device/light-ctemp.js
+++ b/lib/device/light-ctemp.js
@@ -69,7 +69,7 @@ module.exports = class deviceLightColour {
     // Set up the adaptive lighting controller if available
     if (
       platform.api.versionGreaterOrEqual &&
-      platform.api.versionGreaterOrEqual('1.3.0-beta.46')
+      platform.api.versionGreaterOrEqual('1.3.0-beta.58')
     ) {
       // This is needed as sometimes we need to send the brightness with a cct update
       this.cacheBrightness = this.service.getCharacteristic(this.hapChar.Brightness).value

From 87abfd85538d572923b1cd907462e2d224bb6d15 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 17 Feb 2021 09:08:44 +0000
Subject: [PATCH 1493/3183] firmware fixes + show in ui

---
 lib/homebridge-ui/public/index.html |  7 +++++-
 lib/index.js                        | 38 +++++++++--------------------
 2 files changed, 18 insertions(+), 27 deletions(-)

diff --git a/lib/homebridge-ui/public/index.html b/lib/homebridge-ui/public/index.html
index df66fb91..9542a92c 100644
--- a/lib/homebridge-ui/public/index.html
+++ b/lib/homebridge-ui/public/index.html
@@ -57,6 +57,10 @@
           <th scope="row">Model (UIID)</th>
           <td id="eweModel"></td>
         </tr>
+        <tr>
+          <th scope="row">Firmware</th>
+          <td id="eweFirmware"></td>
+        </tr>
         <tr>
           <th scope="row">Shared Device</th>
           <td id="eweShared"></td>
@@ -175,12 +179,13 @@ <h4>Disclaimer</h4>
           document.getElementById('hbDeviceId').innerHTML = selectedAccessory.context.hbDeviceId
           document.getElementById('eweDeviceId').innerHTML = selectedAccessory.context.eweDeviceId
           document.getElementById('eweBrandName').innerHTML = selectedAccessory.context.eweBrandName
+          document.getElementById('eweFirmware').innerHTML = selectedAccessory.context.firmware
           document.getElementById('eweModel').innerHTML = selectedAccessory.context.eweModel + ' (' + selectedAccessory.context.eweUIID + ')'
           document.getElementById('eweShared').innerHTML = selectedAccessory.context.eweShared
             ? 'Yes (by ' + selectedAccessory.context.eweShared + ')'
             : 'No'
           document.getElementById('imgIcon').innerHTML = selectedAccessory.context.eweBrandLogo
-            ? '<img src="' + selectedAccessory.context.eweBrandLogo + '" style="width: 100px;">'
+            ? '<img src="' + selectedAccessory.context.eweBrandLogo + '" style="width: 150px;">'
             : ''
           document.getElementById('deviceTable').style.display = 'inline-table'
           homebridge.hideSpinner()
diff --git a/lib/index.js b/lib/index.js
index c2643581..1a13fcdd 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1086,16 +1086,10 @@ class eWeLinkPlatform {
             oAccessory = this.devicesInHB.has(device.deviceid + 'SW' + i)
               ? this.devicesInHB.get(device.deviceid + 'SW' + i)
               : this.addAccessory(device, device.deviceid + 'SW' + i)
-
-            // Set the firmware version for the sub accessory
-            oAccessory.getService(this.api.hap.Service.AccessoryInformation)
-              .setCharacteristic(
-                this.api.hap.Characteristic.FirmwareRevision,
-                device.params.fwVersion || PLUGIN.version
-              )
           }
 
           // Add context information to the sub accessory
+          oAccessory.context.firmware = device.params.fwVersion || PLUGIN.version
           oAccessory.context.reachableWAN = device.online
           oAccessory.context.reachableLAN = this.lanClient &&
             this.lanDevices.has(device.deviceid)
@@ -1211,14 +1205,8 @@ class eWeLinkPlatform {
             ? this.devicesInHB.get(fullDeviceId)
             : this.addAccessory(device, fullDeviceId, false, subExtraContext, 'rf_sub')
 
-          // Set the firmware version for the sub accessory
-          oAccessory.getService(this.api.hap.Service.AccessoryInformation)
-            .setCharacteristic(
-              this.api.hap.Characteristic.FirmwareRevision,
-              device.params.fwVersion || PLUGIN.version
-            )
-
           // Add context information to the sub accessory
+          oAccessory.context.firmware = device.params.fwVersion || PLUGIN.version
           oAccessory.context.reachableWAN = device.online
           oAccessory.context.reachableLAN = false
           oAccessory.context.eweBrandName = device.brandName
@@ -1328,19 +1316,8 @@ class eWeLinkPlatform {
         /*************/
       }
 
-      // Update the current firmware version if the accessory isn't hidden
-      if (
-        !this.hideMasters.includes(device.deviceid) &&
-        !this.obstructSwitches[device.deviceid]
-      ) {
-        accessory.getService(this.api.hap.Service.AccessoryInformation)
-          .setCharacteristic(
-            this.api.hap.Characteristic.FirmwareRevision,
-            device.params.fwVersion || PLUGIN.version
-          )
-      }
-
       // Update the reachability values (via WS and LAN)
+      accessory.context.firmware = device.params.fwVersion || PLUGIN.version
       accessory.context.reachableWAN = device.online
       accessory.context.reachableLAN = this.lanClient &&
         this.lanDevices.has(device.deviceid)
@@ -1478,6 +1455,15 @@ class eWeLinkPlatform {
         return
       }
 
+      // Set the correct firmware version if we can
+      if (this.api && accessory.context.firmware) {
+        accessory.getService(this.api.hap.Service.AccessoryInformation)
+          .updateCharacteristic(
+            this.api.hap.Characteristic.FirmwareRevision,
+            accessory.context.firmware
+          )
+      }
+
       this.devicesInHB.set(accessory.context.hbDeviceId, accessory)
     } catch (err) {
       // Catch any errors during retrieve

From 60de5158ab028e0cc78fe3d190b35df21b86f797 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 17 Feb 2021 09:17:15 +0000
Subject: [PATCH 1494/3183] show status icon in ui

---
 lib/homebridge-ui/public/index.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/homebridge-ui/public/index.html b/lib/homebridge-ui/public/index.html
index 9542a92c..f066cc21 100644
--- a/lib/homebridge-ui/public/index.html
+++ b/lib/homebridge-ui/public/index.html
@@ -168,11 +168,11 @@ <h4>Disclaimer</h4>
           console.log(selectedAccessory)
           document.getElementById('displayName').innerHTML = selectedAccessory.displayName
           document.getElementById('reachableWAN').innerHTML = selectedAccessory.context.reachableWAN
-            ? 'Online'
-            : 'Offline'
+            ? '<i class="fas fa-circle mr-1 green-text"></i> Online'
+            : '<i class="fas fa-circle mr-1 red-text"></i> Offline'
           document.getElementById('reachableLAN').innerHTML = selectedAccessory.context.reachableLAN
-            ? 'Online'
-            : 'Offline'
+            ? '<i class="fas fa-circle mr-1 green-text"></i> Online'
+            : '<i class="fas fa-circle mr-1 red-text"></i> Offline'
           document.getElementById('lanIP').innerHTML = selectedAccessory.context.ip
             ? selectedAccessory.context.ip
             : 'N/A'

From e9d14f31ed08dcc0eb53581b9c7e3809a328fd90 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 17 Feb 2021 09:26:58 +0000
Subject: [PATCH 1495/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 33221bd8..4181ab9e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,9 +4,24 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 ## BETA
 
-### ⚠️ Breaking Configuration Changes
+* ⚠️ This release includes an overhaul of the configuration with some breaking changes
 
-* This release includes an overhaul of the configuration
+### Added
+
+* **Configuration**
+  * The ability to explicitly enable device logging per device if you have disableDeviceLogging set to true
+  * New brightnessStep option to specify a minimum brightness step in the Home app per dimmer/bulb/LED strip
+  * New adaptiveLightingShift option to offset the Adaptive Lighting values per bulb
+* **Accessory Simulations**
+  * Expose a DW2 contact sensor as a leak sensor
+* **Homebridge Plugin UI**
+  * 'My Devices' shows a red/green icon on the to show device WAN/LAN reachability
+  * 'My Devices' shows the firmware version for your device
+
+### Changes
+
+* New plugin configuration format - [see details](https://github.com/bwp91/homebridge-ewelink/wiki/Configuration-%28v5%29)
+* Device firmware version will now show correctly in HomeKit apps
 
 ## 4.7.5 (2021-02-15)
 

From 05b6f91bc1b7ba661b7ce929d12f8e751c3a217f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 17 Feb 2021 09:27:14 +0000
Subject: [PATCH 1496/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 33221bd8..4181ab9e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,9 +4,24 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 ## BETA
 
-### ⚠️ Breaking Configuration Changes
+* ⚠️ This release includes an overhaul of the configuration with some breaking changes
 
-* This release includes an overhaul of the configuration
+### Added
+
+* **Configuration**
+  * The ability to explicitly enable device logging per device if you have disableDeviceLogging set to true
+  * New brightnessStep option to specify a minimum brightness step in the Home app per dimmer/bulb/LED strip
+  * New adaptiveLightingShift option to offset the Adaptive Lighting values per bulb
+* **Accessory Simulations**
+  * Expose a DW2 contact sensor as a leak sensor
+* **Homebridge Plugin UI**
+  * 'My Devices' shows a red/green icon on the to show device WAN/LAN reachability
+  * 'My Devices' shows the firmware version for your device
+
+### Changes
+
+* New plugin configuration format - [see details](https://github.com/bwp91/homebridge-ewelink/wiki/Configuration-%28v5%29)
+* Device firmware version will now show correctly in HomeKit apps
 
 ## 4.7.5 (2021-02-15)
 

From 45c3ccab800d6c337110ae88ddcaebebac66bd70 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 17 Feb 2021 12:01:44 +0000
Subject: [PATCH 1497/3183] garage sensor fix?

---
 lib/device/sensor-contact.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/device/sensor-contact.js b/lib/device/sensor-contact.js
index be530f4d..43cbd46e 100644
--- a/lib/device/sensor-contact.js
+++ b/lib/device/sensor-contact.js
@@ -80,7 +80,7 @@ module.exports = class deviceSensorContact {
         this.log('[%s] current state [contact%s detected].', this.name, newState === 0 ? '' : ' not')
       }
       let oAccessory
-      for (const group of Object.entries(this.platform.simulations)) {
+      for (const group of Object.values(this.platform.simulations)) {
         if (group.sensorId === this.accessory.context.eweDeviceId && group.type === 'garage') {
           if ((oAccessory = this.platform.devicesInHB.get(group.deviceId + 'SWX'))) {
             const gdService = oAccessory.getService(this.hapServ.GarageDoorOpener)

From ffa72a95515c5a64e8e1ccd72f009b72ab352389 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 17 Feb 2021 12:02:19 +0000
Subject: [PATCH 1498/3183] 4.7.6-0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b6c325c7..3374f9f1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.7.5",
+  "version": "4.7.6-0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index ec50473c..9e73f8e9 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "4.7.5",
+  "version": "4.7.6-0",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 6db92aed43db4a80f21573c22748fcf2a4286e0e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 17 Feb 2021 12:04:05 +0000
Subject: [PATCH 1499/3183] Update sensor-contact.js

---
 lib/device/sensor-contact.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/device/sensor-contact.js b/lib/device/sensor-contact.js
index 6c02c006..7d4c405b 100644
--- a/lib/device/sensor-contact.js
+++ b/lib/device/sensor-contact.js
@@ -91,7 +91,7 @@ module.exports = class deviceSensorContact {
         this.log('[%s] current state [contact%s detected].', this.name, newState === 0 ? '' : ' not')
       }
       let oAccessory
-      for (const group of Object.entries(this.platform.simulations)) {
+      for (const group of Object.values(this.platform.simulations)) {
         if (group.sensorId === this.accessory.context.eweDeviceId && group.type === 'garage') {
           if ((oAccessory = this.platform.devicesInHB.get(group.deviceId + 'SWX'))) {
             const gdService = oAccessory.getService(this.hapServ.GarageDoorOpener)

From b0c69aa2584d9d6e63fe509e35c005cd40e1a8de Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 17 Feb 2021 12:34:38 +0000
Subject: [PATCH 1500/3183] hide table if no devices

---
 lib/homebridge-ui/public/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/homebridge-ui/public/index.html b/lib/homebridge-ui/public/index.html
index f066cc21..63adf941 100644
--- a/lib/homebridge-ui/public/index.html
+++ b/lib/homebridge-ui/public/index.html
@@ -21,7 +21,7 @@
         <select class="form-control" id="deviceSelect"></select>
       </div>
     </form>
-    <table class="table w-100" id="deviceTable">
+    <table class="table w-100" id="deviceTable" style="display: none;">
       <thead>
         <tr class="table-active">
           <th scope="col" style="width: 40%;">Device Name</th>

From df10a81d8da8244dde2195a4a4d4c0ade19e0197 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 17 Feb 2021 14:49:16 +0000
Subject: [PATCH 1501/3183] garage door fix?

---
 lib/device/sensor-contact.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/device/sensor-contact.js b/lib/device/sensor-contact.js
index 43cbd46e..15bb833a 100644
--- a/lib/device/sensor-contact.js
+++ b/lib/device/sensor-contact.js
@@ -80,9 +80,9 @@ module.exports = class deviceSensorContact {
         this.log('[%s] current state [contact%s detected].', this.name, newState === 0 ? '' : ' not')
       }
       let oAccessory
-      for (const group of Object.values(this.platform.simulations)) {
+      for (const [deviceId, group] of Object.entries(this.platform.simulations)) {
         if (group.sensorId === this.accessory.context.eweDeviceId && group.type === 'garage') {
-          if ((oAccessory = this.platform.devicesInHB.get(group.deviceId + 'SWX'))) {
+          if ((oAccessory = this.platform.devicesInHB.get(deviceId + 'SWX'))) {
             const gdService = oAccessory.getService(this.hapServ.GarageDoorOpener)
             switch (newState) {
               case 0:

From aba4c2e902e1074bc1fe8fa6fc5b2b93af5f7597 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 17 Feb 2021 14:49:49 +0000
Subject: [PATCH 1502/3183] 4.7.6-1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 3374f9f1..5d40e933 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.7.6-0",
+  "version": "4.7.6-1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 9e73f8e9..8872251e 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "4.7.6-0",
+  "version": "4.7.6-1",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 86a2a715db5f73fad9c47e6fa893406b64acdf5e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 17 Feb 2021 14:51:54 +0000
Subject: [PATCH 1503/3183] fix

---
 lib/device/sensor-contact.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/device/sensor-contact.js b/lib/device/sensor-contact.js
index 7d4c405b..3d769be5 100644
--- a/lib/device/sensor-contact.js
+++ b/lib/device/sensor-contact.js
@@ -91,9 +91,9 @@ module.exports = class deviceSensorContact {
         this.log('[%s] current state [contact%s detected].', this.name, newState === 0 ? '' : ' not')
       }
       let oAccessory
-      for (const group of Object.values(this.platform.simulations)) {
+      for (const [deviceId, group] of Object.entries(this.platform.simulations)) {
         if (group.sensorId === this.accessory.context.eweDeviceId && group.type === 'garage') {
-          if ((oAccessory = this.platform.devicesInHB.get(group.deviceId + 'SWX'))) {
+          if ((oAccessory = this.platform.devicesInHB.get(deviceId + 'SWX'))) {
             const gdService = oAccessory.getService(this.hapServ.GarageDoorOpener)
             switch (newState) {
               case 0:

From 5f9767a5185e11f660d4b286e95797041b2d60b6 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 17 Feb 2021 14:56:31 +0000
Subject: [PATCH 1504/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4181ab9e..ac20e85b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,12 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 * New plugin configuration format - [see details](https://github.com/bwp91/homebridge-ewelink/wiki/Configuration-%28v5%29)
 * Device firmware version will now show correctly in HomeKit apps
 
+## 4.7.6 (2021-02-17)
+
+### Changes
+
+* Fixes an issue with the DW2 detecting garage door states
+
 ## 4.7.5 (2021-02-15)
 
 ### Changes

From ca66cb66b8224d0fd6a87fd1b153482a8dd9f80c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 17 Feb 2021 14:56:47 +0000
Subject: [PATCH 1505/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4181ab9e..ac20e85b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,12 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 * New plugin configuration format - [see details](https://github.com/bwp91/homebridge-ewelink/wiki/Configuration-%28v5%29)
 * Device firmware version will now show correctly in HomeKit apps
 
+## 4.7.6 (2021-02-17)
+
+### Changes
+
+* Fixes an issue with the DW2 detecting garage door states
+
 ## 4.7.5 (2021-02-15)
 
 ### Changes

From 6f69aa61784657e23c77aad3f184cd2226569daf Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 17 Feb 2021 14:57:37 +0000
Subject: [PATCH 1506/3183] 4.7.6

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 5d40e933..dbaf153e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "4.7.6-1",
+  "version": "4.7.6",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 8872251e..798dca7b 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "4.7.6-1",
+  "version": "4.7.6",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 491190a9d9188872892a74df2a91a15652a330bb Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 17 Feb 2021 15:06:20 +0000
Subject: [PATCH 1507/3183] 5.0.0-5

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 89aca968..c16b8116 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "5.0.0-4",
+  "version": "5.0.0-5",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index b13647d2..d195eef4 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "5.0.0-4",
+  "version": "5.0.0-5",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 8b8b55602a34337d2a62be1e4de607f4f7bbd414 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 18 Feb 2021 09:37:56 +0000
Subject: [PATCH 1508/3183] add logging per device

---
 lib/device/curtain.js                     |  7 +++++++
 lib/device/diffuser.js                    |  7 +++++++
 lib/device/fan.js                         | 10 ++++++++++
 lib/device/light-colour.js                | 11 +++++++++++
 lib/device/light-ctemp.js                 | 12 ++++++++++++
 lib/device/light-dimmer.js                | 10 ++++++++++
 lib/device/outlet.js                      | 10 ++++++++++
 lib/device/rf-bridge.js                   |  1 +
 lib/device/scm.js                         |  7 +++++++
 lib/device/sensor-ambient.js              | 11 +++++++++++
 lib/device/sensor-contact.js              | 10 ++++++++++
 lib/device/simulation/blind.js            |  7 +++++++
 lib/device/simulation/garage-eachen.js    | 10 ++++++++++
 lib/device/simulation/garage-four.js      | 10 ++++++++++
 lib/device/simulation/garage-od-switch.js |  7 +++++++
 lib/device/simulation/garage-one.js       | 11 +++++++++++
 lib/device/simulation/garage-two.js       | 10 ++++++++++
 lib/device/simulation/lock-one.js         | 11 +++++++++++
 lib/device/simulation/sensor-leak.js      | 10 ++++++++++
 lib/device/simulation/switch-valve.js     |  7 +++++++
 lib/device/simulation/tap-one.js          | 10 ++++++++++
 lib/device/simulation/tap-two.js          |  7 +++++++
 lib/device/simulation/thermostat.js       | 10 ++++++++++
 lib/device/simulation/valve-four.js       |  7 +++++++
 lib/device/simulation/valve-one.js        | 10 ++++++++++
 lib/device/simulation/valve-two.js        |  7 +++++++
 lib/device/switch-multi.js                |  7 +++++++
 lib/device/switch-single.js               |  7 +++++++
 lib/device/template.js                    |  1 +
 lib/device/thermostat.js                  | 10 ++++++++++
 lib/device/usb.js                         | 10 ++++++++++
 lib/device/zigbee/light-dimmer.js         | 10 ++++++++++
 lib/device/zigbee/sensor-ambient.js       | 10 ++++++++++
 lib/device/zigbee/sensor-contact.js       | 11 +++++++++++
 lib/device/zigbee/sensor-motion.js        | 11 +++++++++++
 lib/device/zigbee/switch-single.js        |  7 +++++++
 lib/device/zigbee/switch-stateless.js     | 11 +++++++++++
 lib/utils/constants.js                    |  1 +
 38 files changed, 326 insertions(+)

diff --git a/lib/device/curtain.js b/lib/device/curtain.js
index 1de2b3d8..17ede1d4 100644
--- a/lib/device/curtain.js
+++ b/lib/device/curtain.js
@@ -6,6 +6,7 @@ module.exports = class deviceCurtain {
   constructor (platform, accessory) {
     // Set up variables from the platform
     this.consts = platform.consts
+    this.debug = platform.config.debug
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
@@ -31,6 +32,12 @@ module.exports = class deviceCurtain {
     // Add the set handler to the target position characteristic
     this.service.getCharacteristic(this.hapChar.TargetPosition)
       .on('set', this.internalUpdate.bind(this))
+
+    // Output the customised options to the log if in debug mode
+    if (this.debug) {
+      const opts = JSON.stringify({ disableDeviceLogging: this.disableDeviceLogging })
+      this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
+    }
   }
 
   async internalUpdate (value, callback) {
diff --git a/lib/device/diffuser.js b/lib/device/diffuser.js
index 3c9475c3..1a02836d 100644
--- a/lib/device/diffuser.js
+++ b/lib/device/diffuser.js
@@ -7,6 +7,7 @@ module.exports = class deviceDiffuser {
     // Set up variables from the platform
     this.colourUtils = platform.colourUtils
     this.consts = platform.consts
+    this.debug = platform.config.debug
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
@@ -57,6 +58,12 @@ module.exports = class deviceDiffuser {
     // Add the set handler to the lightbulb saturation characteristic
     this.lightService.getCharacteristic(this.hapChar.Saturation)
       .on('set', (value, callback) => callback())
+
+    // Output the customised options to the log if in debug mode
+    if (this.debug) {
+      const opts = JSON.stringify({ disableDeviceLogging: this.disableDeviceLogging })
+      this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
+    }
   }
 
   async internalDiffuserOnOffUpdate (value, callback) {
diff --git a/lib/device/fan.js b/lib/device/fan.js
index 94a33a23..9da03335 100644
--- a/lib/device/fan.js
+++ b/lib/device/fan.js
@@ -6,6 +6,7 @@ module.exports = class deviceFan {
   constructor (platform, accessory) {
     // Set up variables from the platform
     this.consts = platform.consts
+    this.debug = platform.config.debug
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
@@ -58,6 +59,15 @@ module.exports = class deviceFan {
       this.lightService.getCharacteristic(this.hapChar.On)
         .on('set', this.internalLightUpdate.bind(this))
     }
+
+    // Output the customised options to the log if in debug mode
+    if (this.debug) {
+      const opts = JSON.stringify({
+        disableDeviceLogging: this.disableDeviceLogging,
+        hideLight: this.hideLight
+      })
+      this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
+    }
   }
 
   async internalSpeedUpdate (value, callback) {
diff --git a/lib/device/light-colour.js b/lib/device/light-colour.js
index a86b4063..b1f8e67a 100644
--- a/lib/device/light-colour.js
+++ b/lib/device/light-colour.js
@@ -6,6 +6,7 @@ module.exports = class deviceLightColour {
   constructor (platform, accessory) {
     // Set up variables from the platform
     this.consts = platform.consts
+    this.debug = platform.config.debug
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
@@ -81,6 +82,16 @@ module.exports = class deviceLightColour {
         this.accessory.configureController(this.alController)
       }
     }
+
+    // Output the customised options to the log if in debug mode
+    if (this.debug) {
+      const opts = JSON.stringify({
+        adaptiveLightingShift: this.alShift,
+        brightnessStep: this.brightStep,
+        disableDeviceLogging: this.disableDeviceLogging
+      })
+      this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
+    }
   }
 
   async internalOnOffUpdate (value, callback) {
diff --git a/lib/device/light-ctemp.js b/lib/device/light-ctemp.js
index 995a6111..d42dc329 100644
--- a/lib/device/light-ctemp.js
+++ b/lib/device/light-ctemp.js
@@ -6,6 +6,7 @@ module.exports = class deviceLightColour {
   constructor (platform, accessory) {
     // Set up variables from the platform
     this.consts = platform.consts
+    this.debug = platform.config.debug
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
@@ -81,6 +82,17 @@ module.exports = class deviceLightColour {
       )
       this.accessory.configureController(this.alController)
     }
+
+    // Output the customised options to the log if in debug mode
+    if (this.debug) {
+      const opts = JSON.stringify({
+        adaptiveLightingShift: this.alShift,
+        brightnessStep: this.brightStep,
+        disableDeviceLogging: this.disableDeviceLogging,
+        model: this.model
+      })
+      this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
+    }
   }
 
   async internalOnOffUpdate (value, callback) {
diff --git a/lib/device/light-dimmer.js b/lib/device/light-dimmer.js
index 83196e46..e3c7eaf9 100644
--- a/lib/device/light-dimmer.js
+++ b/lib/device/light-dimmer.js
@@ -6,6 +6,7 @@ module.exports = class deviceLightDimmer {
   constructor (platform, accessory) {
     // Set up variables from the platform
     this.consts = platform.consts
+    this.debug = platform.config.debug
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
@@ -39,6 +40,15 @@ module.exports = class deviceLightDimmer {
     this.service.getCharacteristic(this.hapChar.Brightness)
       .on('set', this.internalBrightnessUpdate.bind(this))
       .setProps({ minStep: this.brightStep })
+
+    // Output the customised options to the log if in debug mode
+    if (this.debug) {
+      const opts = JSON.stringify({
+        brightnessStep: this.brightStep,
+        disableDeviceLogging: this.disableDeviceLogging
+      })
+      this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
+    }
   }
 
   async internalOnOffUpdate (value, callback) {
diff --git a/lib/device/outlet.js b/lib/device/outlet.js
index 99d8f0cf..0db7ff18 100644
--- a/lib/device/outlet.js
+++ b/lib/device/outlet.js
@@ -6,6 +6,7 @@ module.exports = class deviceOutlet {
   constructor (platform, accessory) {
     // Set up variables from the platform
     this.consts = platform.consts
+    this.debug = platform.config.debug
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
@@ -176,6 +177,15 @@ module.exports = class deviceOutlet {
         this.accessory.context.energyReadingTotal
       )
     }, 300000)
+
+    // Output the customised options to the log if in debug mode
+    if (this.debug) {
+      const opts = JSON.stringify({
+        disableDeviceLogging: this.disableDeviceLogging,
+        inUsePowerThreshold: this.inUsePowerThreshold
+      })
+      this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
+    }
   }
 
   async internalUpdate (value, callback) {
diff --git a/lib/device/rf-bridge.js b/lib/device/rf-bridge.js
index 1b49ce71..80963b90 100644
--- a/lib/device/rf-bridge.js
+++ b/lib/device/rf-bridge.js
@@ -6,6 +6,7 @@ module.exports = class deviceRFBridge {
   constructor (platform, accessory) {
     // Set up variables from the platform
     this.consts = platform.consts
+    this.debug = platform.config.debug
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
diff --git a/lib/device/scm.js b/lib/device/scm.js
index a3ba3ad7..6ec7fe73 100644
--- a/lib/device/scm.js
+++ b/lib/device/scm.js
@@ -6,6 +6,7 @@ module.exports = class deviceSCM {
   constructor (platform, accessory) {
     // Set up variables from the platform
     this.consts = platform.consts
+    this.debug = platform.config.debug
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
@@ -36,6 +37,12 @@ module.exports = class deviceSCM {
     this.accessory.eveService = new this.platform.eveService('switch', this.accessory, {
       log: platform.config.debugFakegato ? this.log : () => {}
     })
+
+    // Output the customised options to the log if in debug mode
+    if (this.debug) {
+      const opts = JSON.stringify({ disableDeviceLogging: this.disableDeviceLogging })
+      this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
+    }
   }
 
   async internalUpdate (value, callback) {
diff --git a/lib/device/sensor-ambient.js b/lib/device/sensor-ambient.js
index 7f8e1ecf..924646ae 100644
--- a/lib/device/sensor-ambient.js
+++ b/lib/device/sensor-ambient.js
@@ -6,6 +6,7 @@ module.exports = class deviceSensorAmbient {
   constructor (platform, accessory) {
     // Set up variables from the platform
     this.consts = platform.consts
+    this.debug = platform.config.debug
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
@@ -75,6 +76,16 @@ module.exports = class deviceSensorAmbient {
     this.accessory.eveService = new this.platform.eveService('custom', this.accessory, {
       log: platform.config.debugFakegato ? this.log : () => {}
     })
+
+    // Output the customised options to the log if in debug mode
+    if (this.debug) {
+      const opts = JSON.stringify({
+        disableDeviceLogging: this.disableDeviceLogging,
+        hideSwitch: this.hideSwitch,
+        offset: this.tempOffset
+      })
+      this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
+    }
   }
 
   async internalUpdate (value, callback) {
diff --git a/lib/device/sensor-contact.js b/lib/device/sensor-contact.js
index 3d769be5..0644a1d4 100644
--- a/lib/device/sensor-contact.js
+++ b/lib/device/sensor-contact.js
@@ -6,6 +6,7 @@ module.exports = class deviceSensorContact {
   constructor (platform, accessory) {
     // Set up variables from the platform
     this.consts = platform.consts
+    this.debug = platform.config.debug
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
@@ -59,6 +60,15 @@ module.exports = class deviceSensorContact {
     this.accessory.eveService = new this.platform.eveService('door', this.accessory, {
       log: platform.config.debugFakegato ? this.log : () => {}
     })
+
+    // Output the customised options to the log if in debug mode
+    if (this.debug) {
+      const opts = JSON.stringify({
+        disableDeviceLogging: this.disableDeviceLogging,
+        lowBattThreshold: this.lowBattThreshold
+      })
+      this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
+    }
   }
 
   async externalUpdate (params) {
diff --git a/lib/device/simulation/blind.js b/lib/device/simulation/blind.js
index 2ea9704a..84b1cc50 100644
--- a/lib/device/simulation/blind.js
+++ b/lib/device/simulation/blind.js
@@ -6,6 +6,7 @@ module.exports = class deviceBlind {
   constructor (platform, accessory) {
     // Set up variables from the platform
     this.consts = platform.consts
+    this.debug = platform.config.debug
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
@@ -42,6 +43,12 @@ module.exports = class deviceBlind {
     // Add the set handler to the target position characteristic
     this.service.getCharacteristic(this.hapChar.TargetPosition)
       .on('set', this.internalUpdate.bind(this))
+
+    // Output the customised options to the log if in debug mode
+    if (this.debug) {
+      const opts = JSON.stringify({ disableDeviceLogging: this.disableDeviceLogging })
+      this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
+    }
   }
 
   async internalUpdate (value, callback) {
diff --git a/lib/device/simulation/garage-eachen.js b/lib/device/simulation/garage-eachen.js
index dbe4cf38..0c1c61be 100644
--- a/lib/device/simulation/garage-eachen.js
+++ b/lib/device/simulation/garage-eachen.js
@@ -6,6 +6,7 @@ module.exports = class deviceGarageEachen {
   constructor (platform, accessory) {
     // Set up variables from the platform
     this.consts = platform.consts
+    this.debug = platform.config.debug
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
@@ -40,6 +41,15 @@ module.exports = class deviceGarageEachen {
 
     // Update the obstruction detected to false on Homebridge restart
     this.service.updateCharacteristic(this.hapChar.ObstructionDetected, false)
+
+    // Output the customised options to the log if in debug mode
+    if (this.debug) {
+      const opts = JSON.stringify({
+        disableDeviceLogging: this.disableDeviceLogging,
+        operationTime: this.operationTime
+      })
+      this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
+    }
   }
 
   async internalUpdate (value, callback) {
diff --git a/lib/device/simulation/garage-four.js b/lib/device/simulation/garage-four.js
index c59b029d..2500185f 100644
--- a/lib/device/simulation/garage-four.js
+++ b/lib/device/simulation/garage-four.js
@@ -6,6 +6,7 @@ module.exports = class deviceGarageFour {
   constructor (platform, accessory) {
     // Set up variables from the platform
     this.consts = platform.consts
+    this.debug = platform.config.debug
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
@@ -55,6 +56,15 @@ module.exports = class deviceGarageFour {
       gdService.getCharacteristic(this.hapChar.TargetDoorState)
         .on('set', (value, callback) => this.internalUpdate(v, value, callback))
     })
+
+    // Output the customised options to the log if in debug mode
+    if (this.debug) {
+      const opts = JSON.stringify({
+        disableDeviceLogging: this.disableDeviceLogging,
+        operationTime: this.operationTime
+      })
+      this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
+    }
   }
 
   async internalUpdate (garage, value, callback) {
diff --git a/lib/device/simulation/garage-od-switch.js b/lib/device/simulation/garage-od-switch.js
index ee02b6cf..0e4d0f58 100644
--- a/lib/device/simulation/garage-od-switch.js
+++ b/lib/device/simulation/garage-od-switch.js
@@ -6,6 +6,7 @@ module.exports = class deviceGarageODSwitch {
   constructor (platform, accessory) {
     // Set up variables from the platform
     this.consts = platform.consts
+    this.debug = platform.config.debug
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
@@ -41,6 +42,12 @@ module.exports = class deviceGarageODSwitch {
       this.hapChar.ObstructionDetected,
       this.service.getCharacteristic(this.hapChar.On).value
     )
+
+    // Output the customised options to the log if in debug mode
+    if (this.debug) {
+      const opts = JSON.stringify({ disableDeviceLogging: this.disableDeviceLogging })
+      this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
+    }
   }
 
   async internalUpdate (value, callback) {
diff --git a/lib/device/simulation/garage-one.js b/lib/device/simulation/garage-one.js
index 09af3961..491e3889 100644
--- a/lib/device/simulation/garage-one.js
+++ b/lib/device/simulation/garage-one.js
@@ -6,6 +6,7 @@ module.exports = class deviceGarageOne {
   constructor (platform, accessory) {
     // Set up variables from the platform
     this.consts = platform.consts
+    this.debug = platform.config.debug
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
@@ -64,6 +65,16 @@ module.exports = class deviceGarageOne {
     // Add the set handler to the target position characteristic
     this.service.getCharacteristic(this.hapChar.TargetDoorState)
       .on('set', this.internalUpdate.bind(this))
+
+    // Output the customised options to the log if in debug mode
+    if (this.debug) {
+      const opts = JSON.stringify({
+        disableDeviceLogging: this.disableDeviceLogging,
+        operationTime: this.operationTime,
+        setup: this.setup
+      })
+      this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
+    }
   }
 
   async internalUpdate (value, callback) {
diff --git a/lib/device/simulation/garage-two.js b/lib/device/simulation/garage-two.js
index b6d55903..95b0c497 100644
--- a/lib/device/simulation/garage-two.js
+++ b/lib/device/simulation/garage-two.js
@@ -6,6 +6,7 @@ module.exports = class deviceGarageTwo {
   constructor (platform, accessory) {
     // Set up variables from the platform
     this.consts = platform.consts
+    this.debug = platform.config.debug
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
@@ -55,6 +56,15 @@ module.exports = class deviceGarageTwo {
           this.internalUpdate('Garage' + v, value, callback)
         })
     })
+
+    // Output the customised options to the log if in debug mode
+    if (this.debug) {
+      const opts = JSON.stringify({
+        disableDeviceLogging: this.disableDeviceLogging,
+        operationTime: this.operationTime
+      })
+      this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
+    }
   }
 
   async internalUpdate (garage, value, callback) {
diff --git a/lib/device/simulation/lock-one.js b/lib/device/simulation/lock-one.js
index e4fd1f57..2f7ddffa 100644
--- a/lib/device/simulation/lock-one.js
+++ b/lib/device/simulation/lock-one.js
@@ -6,6 +6,7 @@ module.exports = class deviceLockOne {
   constructor (platform, accessory) {
     // Set up variables from the platform
     this.consts = platform.consts
+    this.debug = platform.config.debug
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
@@ -37,6 +38,16 @@ module.exports = class deviceLockOne {
     // Always show the accessory as locked on Homebridge restart
     this.service.updateCharacteristic(this.hapChar.LockCurrentState, 1)
       .updateCharacteristic(this.hapChar.LockTargetState, 1)
+
+    // Output the customised options to the log if in debug mode
+    if (this.debug) {
+      const opts = JSON.stringify({
+        disableDeviceLogging: this.disableDeviceLogging,
+        operationTime: this.operationTime,
+        setup: this.setup
+      })
+      this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
+    }
   }
 
   async internalUpdate (value, callback) {
diff --git a/lib/device/simulation/sensor-leak.js b/lib/device/simulation/sensor-leak.js
index c64fa8d7..7dff94e1 100644
--- a/lib/device/simulation/sensor-leak.js
+++ b/lib/device/simulation/sensor-leak.js
@@ -6,6 +6,7 @@ module.exports = class deviceSensorLeak {
   constructor (platform, accessory) {
     // Set up variables from the platform
     this.consts = platform.consts
+    this.debug = platform.config.debug
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
@@ -61,6 +62,15 @@ module.exports = class deviceSensorLeak {
     this.accessory.eveService = new this.platform.eveService('door', this.accessory, {
       log: platform.config.debugFakegato ? this.log : () => {}
     })
+
+    // Output the customised options to the log if in debug mode
+    if (this.debug) {
+      const opts = JSON.stringify({
+        disableDeviceLogging: this.disableDeviceLogging,
+        lowBattThreshold: this.lowBattThreshold
+      })
+      this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
+    }
   }
 
   async externalUpdate (params) {
diff --git a/lib/device/simulation/switch-valve.js b/lib/device/simulation/switch-valve.js
index 462d0d1d..5dd86be5 100644
--- a/lib/device/simulation/switch-valve.js
+++ b/lib/device/simulation/switch-valve.js
@@ -6,6 +6,7 @@ module.exports = class deviceSwitchValve {
   constructor (platform, accessory) {
     // Set up variables from the platform
     this.consts = platform.consts
+    this.debug = platform.config.debug
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
@@ -70,6 +71,12 @@ module.exports = class deviceSwitchValve {
     this.accessory.eveService = new this.platform.eveService('switch', this.accessory, {
       log: platform.config.debugFakegato ? this.log : () => {}
     })
+
+    // Output the customised options to the log if in debug mode
+    if (this.debug) {
+      const opts = JSON.stringify({ disableDeviceLogging: this.disableDeviceLogging })
+      this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
+    }
   }
 
   async internalSwitchUpdate (value, callback) {
diff --git a/lib/device/simulation/tap-one.js b/lib/device/simulation/tap-one.js
index ca816bce..caa873f6 100644
--- a/lib/device/simulation/tap-one.js
+++ b/lib/device/simulation/tap-one.js
@@ -6,6 +6,7 @@ module.exports = class deviceTapOne {
   constructor (platform, accessory) {
     // Set up variables from the platform
     this.consts = platform.consts
+    this.debug = platform.config.debug
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
@@ -36,6 +37,15 @@ module.exports = class deviceTapOne {
     // Add the set handler to the tap active characteristic
     this.service.getCharacteristic(this.hapChar.Active)
       .on('set', this.internalUpdate.bind(this))
+
+    // Output the customised options to the log if in debug mode
+    if (this.debug) {
+      const opts = JSON.stringify({
+        disableDeviceLogging: this.disableDeviceLogging,
+        setup: this.setup
+      })
+      this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
+    }
   }
 
   async internalUpdate (value, callback) {
diff --git a/lib/device/simulation/tap-two.js b/lib/device/simulation/tap-two.js
index de2aefca..fe67d543 100644
--- a/lib/device/simulation/tap-two.js
+++ b/lib/device/simulation/tap-two.js
@@ -6,6 +6,7 @@ module.exports = class deviceTapTwo {
   constructor (platform, accessory) {
     // Set up variables from the platform
     this.consts = platform.consts
+    this.debug = platform.config.debug
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
@@ -39,6 +40,12 @@ module.exports = class deviceTapTwo {
       tapService.getCharacteristic(this.hapChar.Active)
         .on('set', (value, callback) => this.internalUpdate('Tap ' + v, value, callback))
     })
+
+    // Output the customised options to the log if in debug mode
+    if (this.debug) {
+      const opts = JSON.stringify({ disableDeviceLogging: this.disableDeviceLogging })
+      this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
+    }
   }
 
   async internalUpdate (tap, value, callback) {
diff --git a/lib/device/simulation/thermostat.js b/lib/device/simulation/thermostat.js
index 12275b87..624fcb18 100644
--- a/lib/device/simulation/thermostat.js
+++ b/lib/device/simulation/thermostat.js
@@ -6,6 +6,7 @@ module.exports = class deviceThermostat {
   constructor (platform, accessory) {
     // Set up variables from the platform
     this.consts = platform.consts
+    this.debug = platform.config.debug
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
@@ -101,6 +102,15 @@ module.exports = class deviceThermostat {
         this.accessory.context.cacheTarget
       )
     }, 5000)
+
+    // Output the customised options to the log if in debug mode
+    if (this.debug) {
+      const opts = JSON.stringify({
+        disableDeviceLogging: this.disableDeviceLogging,
+        offset: this.tempOffset
+      })
+      this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
+    }
   }
 
   async internalOnOffUpdate (value, callback) {
diff --git a/lib/device/simulation/valve-four.js b/lib/device/simulation/valve-four.js
index b93f5327..f02dcbcd 100644
--- a/lib/device/simulation/valve-four.js
+++ b/lib/device/simulation/valve-four.js
@@ -6,6 +6,7 @@ module.exports = class deviceValveFour {
   constructor (platform, accessory) {
     // Set up variables from the platform
     this.consts = platform.consts
+    this.debug = platform.config.debug
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
@@ -67,6 +68,12 @@ module.exports = class deviceValveFour {
           callback()
         })
     })
+
+    // Output the customised options to the log if in debug mode
+    if (this.debug) {
+      const opts = JSON.stringify({ disableDeviceLogging: this.disableDeviceLogging })
+      this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
+    }
   }
 
   async internalUpdate (valve, value, callback) {
diff --git a/lib/device/simulation/valve-one.js b/lib/device/simulation/valve-one.js
index 12abd654..e1a2aa82 100644
--- a/lib/device/simulation/valve-one.js
+++ b/lib/device/simulation/valve-one.js
@@ -6,6 +6,7 @@ module.exports = class deviceValveOne {
   constructor (platform, accessory) {
     // Set up variables from the platform
     this.consts = platform.consts
+    this.debug = platform.config.debug
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
@@ -58,6 +59,15 @@ module.exports = class deviceValveOne {
         }
         callback()
       })
+
+    // Output the customised options to the log if in debug mode
+    if (this.debug) {
+      const opts = JSON.stringify({
+        disableDeviceLogging: this.disableDeviceLogging,
+        setup: this.setup
+      })
+      this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
+    }
   }
 
   async internalUpdate (value, callback) {
diff --git a/lib/device/simulation/valve-two.js b/lib/device/simulation/valve-two.js
index cf43cb73..7870ae9a 100644
--- a/lib/device/simulation/valve-two.js
+++ b/lib/device/simulation/valve-two.js
@@ -6,6 +6,7 @@ module.exports = class deviceValveTwo {
   constructor (platform, accessory) {
     // Set up variables from the platform
     this.consts = platform.consts
+    this.debug = platform.config.debug
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
@@ -67,6 +68,12 @@ module.exports = class deviceValveTwo {
           callback()
         })
     })
+
+    // Output the customised options to the log if in debug mode
+    if (this.debug) {
+      const opts = JSON.stringify({ disableDeviceLogging: this.disableDeviceLogging })
+      this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
+    }
   }
 
   async internalUpdate (valve, value, callback) {
diff --git a/lib/device/switch-multi.js b/lib/device/switch-multi.js
index c045a4b2..d9b95fab 100644
--- a/lib/device/switch-multi.js
+++ b/lib/device/switch-multi.js
@@ -6,6 +6,7 @@ module.exports = class deviceSwitchMulti {
   constructor (platform, accessory) {
     // Set up variables from the platform
     this.consts = platform.consts
+    this.debug = platform.config.debug
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
@@ -36,6 +37,12 @@ module.exports = class deviceSwitchMulti {
     this.accessory.eveService = new this.platform.eveService('switch', this.accessory, {
       log: platform.config.debugFakegato ? this.log : () => {}
     })
+
+    // Output the customised options to the log if in debug mode
+    if (this.debug) {
+      const opts = JSON.stringify({ disableDeviceLogging: this.disableDeviceLogging })
+      this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
+    }
   }
 
   async internalUpdate (value, callback) {
diff --git a/lib/device/switch-single.js b/lib/device/switch-single.js
index ee110580..e35602f0 100644
--- a/lib/device/switch-single.js
+++ b/lib/device/switch-single.js
@@ -6,6 +6,7 @@ module.exports = class deviceSwitchSingle {
   constructor (platform, accessory) {
     // Set up variables from the platform
     this.consts = platform.consts
+    this.debug = platform.config.debug
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
@@ -41,6 +42,12 @@ module.exports = class deviceSwitchSingle {
     this.accessory.eveService = new this.platform.eveService('switch', this.accessory, {
       log: platform.config.debugFakegato ? this.log : () => {}
     })
+
+    // Output the customised options to the log if in debug mode
+    if (this.debug) {
+      const opts = JSON.stringify({ disableDeviceLogging: this.disableDeviceLogging })
+      this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
+    }
   }
 
   async internalUpdate (value, callback) {
diff --git a/lib/device/template.js b/lib/device/template.js
index c52c0d78..fdab7e87 100644
--- a/lib/device/template.js
+++ b/lib/device/template.js
@@ -6,6 +6,7 @@ module.exports = class deviceTemplate {
   constructor (platform, accessory) {
     // Set up variables from the platform
     this.consts = platform.consts
+    this.debug = platform.config.debug
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
diff --git a/lib/device/thermostat.js b/lib/device/thermostat.js
index e44ad2ca..8cb9d97b 100644
--- a/lib/device/thermostat.js
+++ b/lib/device/thermostat.js
@@ -6,6 +6,7 @@ module.exports = class deviceThermostat {
   constructor (platform, accessory) {
     // Set up variables from the platform
     this.consts = platform.consts
+    this.debug = platform.config.debug
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
@@ -81,6 +82,15 @@ module.exports = class deviceThermostat {
     this.accessory.eveService = new this.platform.eveService('custom', this.accessory, {
       log: platform.config.debugFakegato ? this.log : () => {}
     })
+
+    // Output the customised options to the log if in debug mode
+    if (this.debug) {
+      const opts = JSON.stringify({
+        disableDeviceLogging: this.disableDeviceLogging,
+        offset: this.tempOffset
+      })
+      this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
+    }
   }
 
   async internalOnOffUpdate (value, callback) {
diff --git a/lib/device/usb.js b/lib/device/usb.js
index f801ab97..5f84c15b 100644
--- a/lib/device/usb.js
+++ b/lib/device/usb.js
@@ -6,6 +6,7 @@ module.exports = class deviceUSB {
   constructor (platform, accessory) {
     // Set up variables from the platform
     this.consts = platform.consts
+    this.debug = platform.config.debug
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
@@ -54,6 +55,15 @@ module.exports = class deviceUSB {
     this.accessory.eveService = new this.platform.eveService('switch', this.accessory, {
       log: platform.config.debugFakegato ? this.log : () => {}
     })
+
+    // Output the customised options to the log if in debug mode
+    if (this.debug) {
+      const opts = JSON.stringify({
+        disableDeviceLogging: this.disableDeviceLogging,
+        showAsSwitch: this.showAsSwitch
+      })
+      this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
+    }
   }
 
   async internalUpdate (value, callback) {
diff --git a/lib/device/zigbee/light-dimmer.js b/lib/device/zigbee/light-dimmer.js
index 2287cc25..c38d52a5 100644
--- a/lib/device/zigbee/light-dimmer.js
+++ b/lib/device/zigbee/light-dimmer.js
@@ -6,6 +6,7 @@ module.exports = class deviceZBLightDimmer {
   constructor (platform, accessory) {
     // Set up variables from the platform
     this.consts = platform.consts
+    this.debug = platform.config.debug
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
@@ -39,6 +40,15 @@ module.exports = class deviceZBLightDimmer {
     this.service.getCharacteristic(this.hapChar.Brightness)
       .on('set', this.internalBrightnessUpdate.bind(this))
       .setProps({ minStep: this.brightStep })
+
+    // Output the customised options to the log if in debug mode
+    if (this.debug) {
+      const opts = JSON.stringify({
+        brightnessStep: this.brightStep,
+        disableDeviceLogging: this.disableDeviceLogging
+      })
+      this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
+    }
   }
 
   async internalOnOffUpdate (value, callback) {
diff --git a/lib/device/zigbee/sensor-ambient.js b/lib/device/zigbee/sensor-ambient.js
index 1097004f..058802e9 100644
--- a/lib/device/zigbee/sensor-ambient.js
+++ b/lib/device/zigbee/sensor-ambient.js
@@ -6,6 +6,7 @@ module.exports = class deviceZBSensorAmbient {
   constructor (platform, accessory) {
     // Set up variables from the platform
     this.consts = platform.consts
+    this.debug = platform.config.debug
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
@@ -49,6 +50,15 @@ module.exports = class deviceZBSensorAmbient {
     this.accessory.eveService = new this.platform.eveService('weather', this.accessory, {
       log: platform.config.debugFakegato ? this.log : () => {}
     })
+
+    // Output the customised options to the log if in debug mode
+    if (this.debug) {
+      const opts = JSON.stringify({
+        disableDeviceLogging: this.disableDeviceLogging,
+        lowBattThreshold: this.lowBattThreshold
+      })
+      this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
+    }
   }
 
   async externalUpdate (params) {
diff --git a/lib/device/zigbee/sensor-contact.js b/lib/device/zigbee/sensor-contact.js
index 7b5e28bd..b378ff33 100644
--- a/lib/device/zigbee/sensor-contact.js
+++ b/lib/device/zigbee/sensor-contact.js
@@ -6,6 +6,7 @@ module.exports = class deviceZBSensorContact {
   constructor (platform, accessory) {
     // Set up variables from the platform
     this.consts = platform.consts
+    this.debug = platform.config.debug
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
@@ -55,6 +56,16 @@ module.exports = class deviceZBSensorContact {
     this.accessory.eveService = new this.platform.eveService('door', this.accessory, {
       log: platform.config.debugFakegato ? this.log : () => {}
     })
+
+    // Output the customised options to the log if in debug mode
+    if (this.debug) {
+      const opts = JSON.stringify({
+        disableDeviceLogging: this.disableDeviceLogging,
+        lowBattThreshold: this.lowBattThreshold,
+        scaleBattery: this.scaleBattery
+      })
+      this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
+    }
   }
 
   async externalUpdate (params) {
diff --git a/lib/device/zigbee/sensor-motion.js b/lib/device/zigbee/sensor-motion.js
index 384056ab..a5de0e61 100644
--- a/lib/device/zigbee/sensor-motion.js
+++ b/lib/device/zigbee/sensor-motion.js
@@ -6,6 +6,7 @@ module.exports = class deviceZBSensorMotion {
   constructor (platform, accessory) {
     // Set up variables from the platform
     this.consts = platform.consts
+    this.debug = platform.config.debug
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
@@ -56,6 +57,16 @@ module.exports = class deviceZBSensorMotion {
     this.accessory.eveService = new this.platform.eveService('motion', this.accessory, {
       log: platform.config.debugFakegato ? this.log : () => {}
     })
+
+    // Output the customised options to the log if in debug mode
+    if (this.debug) {
+      const opts = JSON.stringify({
+        disableDeviceLogging: this.disableDeviceLogging,
+        lowBattThreshold: this.lowBattThreshold,
+        sensorTimeDifference: this.sensorTimeDifference
+      })
+      this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
+    }
   }
 
   async externalUpdate (params) {
diff --git a/lib/device/zigbee/switch-single.js b/lib/device/zigbee/switch-single.js
index 028a9425..5f1334c5 100644
--- a/lib/device/zigbee/switch-single.js
+++ b/lib/device/zigbee/switch-single.js
@@ -6,6 +6,7 @@ module.exports = class deviceZBSwitchSingle {
   constructor (platform, accessory) {
     // Set up variables from the platform
     this.consts = platform.consts
+    this.debug = platform.config.debug
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
@@ -36,6 +37,12 @@ module.exports = class deviceZBSwitchSingle {
     this.accessory.eveService = new this.platform.eveService('switch', this.accessory, {
       log: platform.config.debugFakegato ? this.log : () => {}
     })
+
+    // Output the customised options to the log if in debug mode
+    if (this.debug) {
+      const opts = JSON.stringify({ disableDeviceLogging: this.disableDeviceLogging })
+      this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
+    }
   }
 
   async internalUpdate (value, callback) {
diff --git a/lib/device/zigbee/switch-stateless.js b/lib/device/zigbee/switch-stateless.js
index 4b75ec2b..6ba3f9ac 100644
--- a/lib/device/zigbee/switch-stateless.js
+++ b/lib/device/zigbee/switch-stateless.js
@@ -6,6 +6,7 @@ module.exports = class deviceZBSwitchStateless {
   constructor (platform, accessory) {
     // Set up variables from the platform
     this.consts = platform.consts
+    this.debug = platform.config.debug
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
@@ -41,6 +42,16 @@ module.exports = class deviceZBSwitchStateless {
     // Add the battery service if it doesn't already exist
     this.battService = this.accessory.getService(this.hapServ.BatteryService) ||
       this.accessory.addService(this.hapServ.BatteryService)
+
+    // Output the customised options to the log if in debug mode
+    if (this.debug) {
+      const opts = JSON.stringify({
+        disableDeviceLogging: this.disableDeviceLogging,
+        hideLongDouble: this.hideLongDouble,
+        lowBattThreshold: this.lowBattThreshold
+      })
+      this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
+    }
   }
 
   async externalUpdate (params) {
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index e7db8339..46767600 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -62,6 +62,7 @@ module.exports = {
     complete: '✓ Setup complete',
     devAdd: 'has been added to Homebridge',
     devInit: 'initialised and',
+    devInitOpts: 'initialising with options',
     devNewNotAdd: 'restart Homebridge to add new device, failed to add automatically as',
     devNoAPIKey: 'cannot retrieve device API key',
     devNotAdd: 'could not be added to Homebridge as',

From 2b978c3e671e2a4bac7b1a7bcf2b880f5d3c9c48 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 18 Feb 2021 09:38:26 +0000
Subject: [PATCH 1509/3183] 5.0.0-6

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c16b8116..b002e826 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "5.0.0-5",
+  "version": "5.0.0-6",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index d195eef4..b53ed12d 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "5.0.0-5",
+  "version": "5.0.0-6",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 49ab2dc43bb25851448ab40379a7e473dca5d057 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 18 Feb 2021 10:34:05 +0000
Subject: [PATCH 1510/3183] remove subs for simulations

---
 lib/index.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/lib/index.js b/lib/index.js
index 1a13fcdd..d033875d 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -743,6 +743,15 @@ class eWeLinkPlatform {
     let accessory
     let oAccessory
     try {
+      // Remove old sub accessories for Accessory Simulations
+      if (this.simulations[device.deviceid]) {
+        for (let i = 0; i <= 4; i++) {
+          if (this.devicesInHB.has(device.deviceid + 'SW' + i)) {
+            this.removeAccessory(this.devicesInHB.get(device.deviceid + 'SW' + i))
+          }
+        }
+      }
+
       // Set up the correct instance for this particular device
       if (this.consts.devices.curtain.includes(device.extra.uiid)) {
         /***********************

From ed86a1aa8b58239de382924373873c6ca68c7e35 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 18 Feb 2021 10:34:45 +0000
Subject: [PATCH 1511/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ac20e85b..aa691c8d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
   * New adaptiveLightingShift option to offset the Adaptive Lighting values per bulb
 * **Accessory Simulations**
   * Expose a DW2 contact sensor as a leak sensor
+  * Sub-accessories will be removed automatically when setting up a new Accessory Simulation
 * **Homebridge Plugin UI**
   * 'My Devices' shows a red/green icon on the to show device WAN/LAN reachability
   * 'My Devices' shows the firmware version for your device

From d6261a078c1fd6a91de09f2999db52be0e57e71c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 18 Feb 2021 16:02:58 +0000
Subject: [PATCH 1512/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index aa691c8d..849da304 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 ## BETA
 
-* ⚠️ This release includes an overhaul of the configuration with some breaking changes
+* ⚠️ This release includes an overhaul of the configuration with some breaking changes - [more info](https://gist.github.com/bwp91/e87d9d3eb0e5dbc08e9ae7b31e33366e)
 
 ### Added
 
@@ -21,7 +21,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 ### Changes
 
-* New plugin configuration format - [see details](https://github.com/bwp91/homebridge-ewelink/wiki/Configuration-%28v5%29)
+* New plugin configuration format - [more info](https://gist.github.com/bwp91/e87d9d3eb0e5dbc08e9ae7b31e33366e)
 * Device firmware version will now show correctly in HomeKit apps
 
 ## 4.7.6 (2021-02-17)

From 9688db11ae7b1ab4e3b12c871af58d162179e7ab Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 18 Feb 2021 18:57:00 +0000
Subject: [PATCH 1513/3183] 5.0.0-7

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b002e826..93a7d20c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "5.0.0-6",
+  "version": "5.0.0-7",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index b53ed12d..b09776ed 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "5.0.0-6",
+  "version": "5.0.0-7",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 2a634fd382fed8a7d5094931d09b312373996de1 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 19 Feb 2021 13:38:38 +0000
Subject: [PATCH 1514/3183] fix property

---
 lib/device/light-ctemp.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/device/light-ctemp.js b/lib/device/light-ctemp.js
index d42dc329..9e229c99 100644
--- a/lib/device/light-ctemp.js
+++ b/lib/device/light-ctemp.js
@@ -21,9 +21,9 @@ module.exports = class deviceLightColour {
     // Set up custom variables for this device type
     const deviceId = this.accessory.context.eweDeviceId
     const deviceConf = platform.lightDevices[deviceId]
-    this.model = deviceConf && deviceConf.model
-      ? deviceConf.model
-      : platform.consts.defaultValues.model
+    this.bulbModel = deviceConf && deviceConf.bulbModel
+      ? deviceConf.bulbModel
+      : platform.consts.defaultValues.bulbModel
     this.alShift = deviceConf && deviceConf.adaptiveLightingShift
       ? deviceConf.adaptiveLightingShift
       : platform.consts.defaultValues.adaptiveLightingShift
@@ -35,7 +35,7 @@ module.exports = class deviceLightColour {
       : platform.config.disableDeviceLogging
 
     // Different bulbs have different colour temperature ranges
-    switch (this.model) {
+    switch (this.bulbModel) {
       case 'bulbB02FST64':
         this.minK = 1800
         this.maxK = 5000
@@ -89,7 +89,7 @@ module.exports = class deviceLightColour {
         adaptiveLightingShift: this.alShift,
         brightnessStep: this.brightStep,
         disableDeviceLogging: this.disableDeviceLogging,
-        model: this.model
+        bulbModel: this.bulbModel
       })
       this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
     }

From f51b64ad789a4d5c7b26735729fb0f1d3b146415 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 19 Feb 2021 13:38:59 +0000
Subject: [PATCH 1515/3183] fix repeated cases

---
 lib/index.js           | 478 ++++++++++++-----------------------------
 lib/utils/constants.js |  20 +-
 2 files changed, 158 insertions(+), 340 deletions(-)

diff --git a/lib/index.js b/lib/index.js
index d033875d..cdd36a57 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -100,46 +100,51 @@ class eWeLinkPlatform {
                 logIgnoreItem(key)
                 return
               }
-              const fullDeviceId = this.funcs.parseDeviceId(x.fullDeviceId)
-              this.rfDevices[fullDeviceId] = {}
-              for (const [k, v] of Object.entries(x)) {
+              const id = this.funcs.parseDeviceId(x.fullDeviceId)
+              const entries = Object.entries(x)
+              if (entries.length === 1) {
+                logRemove(key + '.' + id)
+                return
+              }
+              this.rfDevices[id] = {}
+              for (const [k, v] of entries) {
                 switch (k) {
                   case 'fullDeviceId':
                     break
                   case 'overrideDisabledLogging':
                     if (typeof v === 'string') {
-                      logQuotes(key + '.' + k)
+                      logQuotes(key + '.' + id + '.' + k)
                     }
-                    this.rfDevices[fullDeviceId][k] = v === 'false' ? false : !!v
+                    this.rfDevices[id][k] = v === 'false' ? false : !!v
                     break
                   case 'sensorTimeDifference':
                   case 'sensorTimeLength': {
                     if (typeof v === 'string') {
-                      logQuotes(key + '.' + k)
+                      logQuotes(key + '.' + id + '.' + k)
                     }
                     const intVal = parseInt(v)
                     if (isNaN(intVal)) {
-                      logDefault(key + '.' + k, this.consts.defaultValues[k])
-                      this.rfDevices[fullDeviceId][k] = this.consts.defaultValues[k]
+                      logDefault(key + '.' + id + '.' + k, this.consts.defaultValues[k])
+                      this.rfDevices[id][k] = this.consts.defaultValues[k]
                     } else if (intVal < this.consts.minValues[k]) {
-                      logIncrease(key + '.' + k, this.consts.minValues[k])
-                      this.rfDevices[fullDeviceId][k] = this.consts.minValues[k]
+                      logIncrease(key + '.' + id + '.' + k, this.consts.minValues[k])
+                      this.rfDevices[id][k] = this.consts.minValues[k]
                     } else {
-                      this.rfDevices[fullDeviceId][k] = intVal
+                      this.rfDevices[id][k] = intVal
                     }
                     break
                   }
                   case 'type':
                     if (typeof v !== 'string' || v === '') {
-                      logIgnore(key + '.' + k)
+                      logIgnore(key + '.' + id + '.' + k)
                     } else if (!this.consts.allowed.sensors.includes(v)) {
-                      logIgnore(key + '.' + k)
+                      logIgnore(key + '.' + id + '.' + k)
                     } else {
-                      this.rfDevices[fullDeviceId][k] = v
+                      this.rfDevices[id][k] = v
                     }
                     break
                   default:
-                    logRemove(key + '.' + k)
+                    logRemove(key + '.' + id + '.' + k)
                     break
                 }
               }
@@ -166,28 +171,109 @@ class eWeLinkPlatform {
           this.config[key] = val === 'false' ? false : !!val
           break
         case 'fanDevices':
+        case 'lightDevices':
+        case 'multiDevices':
+        case 'outletDevices':
+        case 'sensorDevices':
+        case 'singleDevices':
+        case 'thDevices':
           if (Array.isArray(val) && val.length > 0) {
             val.forEach(x => {
               if (!x.deviceId) {
                 logIgnoreItem(key)
                 return
               }
-              const deviceId = this.funcs.parseDeviceId(x.deviceId)
-              this.fanDevices[deviceId] = {}
-              for (const [k, v] of Object.entries(x)) {
+              const id = this.funcs.parseDeviceId(x.deviceId)
+              const entries = Object.entries(x)
+              if (entries.length === 1) {
+                logRemove(key + '.' + id)
+                return
+              }
+              this[key][id] = {}
+              for (const [k, v] of entries) {
+                if (!this.consts.allowed[key].includes(k)) {
+                  logRemove(key + '.' + id + '.' + k)
+                  continue
+                }
                 switch (k) {
+                  case 'adaptiveLightingShift':
+                  case 'brightnessStep':
+                  case 'inUsePowerThreshold':
+                  case 'lowBattThreshold':
+                  case 'sensorTimeDifference': {
+                    if (typeof v === 'string') {
+                      logQuotes(key + '.' + id + '.' + k)
+                    }
+                    const intVal = parseInt(v)
+                    if (isNaN(intVal)) {
+                      logDefault(key + '.' + id + '.' + k, this.consts.defaultValues[k])
+                      this[key][id][k] = this.consts.defaultValues[k]
+                    } else if (intVal < this.consts.minValues[k]) {
+                      logIncrease(key + '.' + id + '.' + k, this.consts.minValues[k])
+                      this[key][id][k] = this.consts.minValues[k]
+                    } else {
+                      this[key][id][k] = intVal
+                    }
+                    break
+                  }
+                  case 'bulbModel': {
+                    const inSet = this.consts.allowed[k].includes(v)
+                    if (typeof v !== 'string' || !inSet) {
+                      logIgnore(key + '.' + id + '.' + k)
+                    } else {
+                      this[key][id][k] = inSet
+                        ? v
+                        : this.consts.defaultValues[k]
+                    }
+                    break
+                  }
                   case 'deviceId':
                     break
+                  case 'hideChannels': {
+                    if (typeof v !== 'string' || v === '') {
+                      logIgnore(key + '.' + id + '.' + k)
+                    } else {
+                      const channels = v.split(',')
+                      channels.forEach(channel => {
+                        this.hideChannels.push(
+                          id + 'SW' + channel.replace(/[^0-9]+/g, '')
+                        )
+                      })
+                    }
+                    break
+                  }
                   case 'hideLight':
+                  case 'hideLongDouble':
+                  case 'hideSwitch':
                   case 'overrideDisabledLogging':
+                  case 'scaleBattery':
+                  case 'showAsOutlet':
+                  case 'showAsSwitch':
                     if (typeof v === 'string') {
-                      logQuotes(key + '.' + k)
+                      logQuotes(key + '.' + id + '.' + k)
                     }
-                    this.fanDevices[deviceId][k] = v === 'false' ? false : !!v
+                    this[key][id][k] = v === 'false' ? false : !!v
                     break
-                  default:
-                    logRemove(key + '.' + k)
+                  case 'ipAddress': {
+                    if (typeof v !== 'string' || v === '') {
+                      logIgnore(key + '.' + id + '.' + k)
+                    } else {
+                      this.ipOverride[id] = v
+                    }
                     break
+                  }
+                  case 'offset': {
+                    if (typeof v === 'string') {
+                      logQuotes(key + '.' + id + '.' + k)
+                    }
+                    const numVal = Number(v)
+                    if (isNaN(numVal)) {
+                      logIgnore(key + '.' + id + '.' + k)
+                    } else {
+                      this[key][id][k] = numVal
+                    }
+                    break
+                  }
                 }
               }
             })
@@ -202,81 +288,86 @@ class eWeLinkPlatform {
                 logIgnoreItem(key)
                 return
               }
-              const deviceId = this.funcs.parseDeviceId(x.deviceId)
-              this.simulations[deviceId] = {}
-              for (const [k, v] of Object.entries(x)) {
+              const id = this.funcs.parseDeviceId(x.deviceId)
+              const entries = Object.entries(x)
+              if (entries.length === 1) {
+                logRemove(key + '.' + id)
+                return
+              }
+              this.simulations[id] = {}
+              for (const [k, v] of entries) {
                 switch (k) {
                   case 'deviceId':
                     break
                   case 'ipAddress': {
                     if (typeof v !== 'string' || v === '') {
-                      logIgnore(key + '.' + k)
+                      logIgnore(key + '.' + id + '.' + k)
                     } else {
-                      this.ipOverride[deviceId] = v
+                      this.ipOverride[id] = v
                     }
                     break
                   }
                   case 'obstructId':
                     if (typeof v !== 'string' || v === '') {
-                      logIgnore(key + '.' + k)
+                      logIgnore(key + '.' + id + '.' + k)
                     } else if (!this.consts.allowed.obstructs.includes(x.type)) {
-                      logIgnore(key + '.' + k)
+                      logIgnore(key + '.' + id + '.' + k)
                     } else {
                       const parsed = this.funcs.parseDeviceId(v)
-                      this.simulations[deviceId].obstructId = parsed
-                      this.obstructSwitches[parsed] = deviceId
+                      this.simulations[id].obstructId = parsed
+                      this.obstructSwitches[parsed] = id
                     }
                     break
                   case 'operationTime': {
                     if (typeof v === 'string') {
-                      logQuotes(key + '.' + k)
+                      logQuotes(key + '.' + id + '.' + k)
                     }
                     const intVal = parseInt(v)
                     if (isNaN(intVal)) {
-                      logDefault(key + '.' + k, this.consts.defaultValues[k])
-                      this.simulations[deviceId][k] = this.consts.defaultValues[k]
+                      logDefault(key + '.' + id + '.' + k, this.consts.defaultValues[k])
+                      this.simulations[id][k] = this.consts.defaultValues[k]
                     } else if (intVal < this.consts.minValues[k]) {
-                      logIncrease(key + '.' + k, this.consts.minValues[k])
-                      this.simulations[deviceId][k] = this.consts.minValues[k]
+                      logIncrease(key + '.' + id + '.' + k, this.consts.minValues[k])
+                      this.simulations[id][k] = this.consts.minValues[k]
                     } else {
-                      this.simulations[deviceId][k] = intVal
+                      this.simulations[id][k] = intVal
                     }
                     break
                   }
                   case 'overrideDisabledLogging':
                     if (typeof v === 'string') {
-                      logQuotes(key + '.' + k)
+                      logQuotes(key + '.' + id + '.' + k)
                     }
-                    this.simulations[deviceId][k] = v === 'false' ? false : !!v
+                    this.simulations[id][k] = v === 'false' ? false : !!v
                     break
                   case 'sensorId':
                     if (typeof v !== 'string' || v === '') {
-                      logIgnore(key + '.' + k)
+                      logIgnore(key + '.' + id + '.' + k)
                     } else {
                       const parsed = this.funcs.parseDeviceId(v)
-                      this.simulations[deviceId].sensorId = parsed
+                      this.simulations[id].sensorId = parsed
                     }
                     break
                   case 'setup':
                     if (typeof v !== 'string' || v === '') {
-                      logIgnore(key + '.' + k)
+                      logIgnore(key + '.' + id + '.' + k)
                     } else if (!this.consts.allowed.setups.includes(v)) {
-                      logIgnore(key + '.' + k)
+                      logIgnore(key + '.' + id + '.' + k)
                     } else {
-                      this.simulations[deviceId][k] = v
+                      this.simulations[id][k] = v
                     }
                     break
                   case 'type':
                     if (typeof v !== 'string' || v === '') {
-                      logIgnore(key + '.' + k)
-                    } else if (!this.consts.allowed.groups.includes(x.type)) {
-                      logIgnore(key + '.' + k)
+                      logIgnore(key + '.' + id + '.' + k)
+                    } else if (!this.consts.allowed.groupTypes.includes(x.type)) {
+                      logIgnore(key + '.' + id + '.' + k)
                     } else {
-                      this.simulations[deviceId][k] = v
+                      this.simulations[id][k] = v
                     }
                     break
                   default:
-                    logRemove(key + '.' + k)
+                    logRemove(key + '.' + id + '.' + k)
                     break
                 }
               }
@@ -301,63 +392,6 @@ class eWeLinkPlatform {
           }
           break
         }
-        case 'lightDevices':
-          if (Array.isArray(val) && val.length > 0) {
-            val.forEach(x => {
-              if (!x.deviceId) {
-                logIgnoreItem(key)
-                return
-              }
-              const deviceId = this.funcs.parseDeviceId(x.deviceId)
-              this.lightDevices[deviceId] = {}
-              for (const [k, v] of Object.entries(x)) {
-                switch (k) {
-                  case 'adaptiveLightingShift':
-                  case 'brightnessStep': {
-                    if (typeof v === 'string') {
-                      logQuotes(key + '.' + k)
-                    }
-                    const intVal = parseInt(v)
-                    if (isNaN(intVal)) {
-                      logDefault(key + '.' + k, this.consts.defaultValues[k])
-                      this.lightDevices[deviceId][k] = this.consts.defaultValues[k]
-                    } else if (intVal < this.consts.minValues[k]) {
-                      logIncrease(key + '.' + k, this.consts.minValues[k])
-                      this.lightDevices[deviceId][k] = this.consts.minValues[k]
-                    } else {
-                      this.lightDevices[deviceId][k] = intVal
-                    }
-                    break
-                  }
-                  case 'bulbModel': {
-                    const inSet = this.consts.allowed.bulbModels.includes(v)
-                    if (typeof v !== 'string' || !inSet) {
-                      logIgnore(k)
-                    } else {
-                      this.lightDevices[deviceId][k] = inSet
-                        ? v
-                        : this.consts.defaultValues[k]
-                    }
-                    break
-                  }
-                  case 'deviceId':
-                    break
-                  case 'overrideDisabledLogging':
-                    if (typeof v === 'string') {
-                      logQuotes(key + '.' + k)
-                    }
-                    this.lightDevices[deviceId][k] = v === 'false' ? false : !!v
-                    break
-                  default:
-                    logRemove(key + '.' + k)
-                    break
-                }
-              }
-            })
-          } else {
-            logIgnore(key)
-          }
-          break
         case 'mode': {
           const inSet = this.consts.allowed.modes.includes(val)
           if (typeof val !== 'string' || !inSet) {
@@ -366,110 +400,6 @@ class eWeLinkPlatform {
           this.config.mode = inSet ? val : this.consts.defaultValues[key]
           break
         }
-        case 'multiDevices':
-          if (Array.isArray(val) && val.length > 0) {
-            val.forEach(x => {
-              if (!x.deviceId) {
-                logIgnoreItem(key)
-                return
-              }
-              const deviceId = this.funcs.parseDeviceId(x.deviceId)
-              this.multiDevices[deviceId] = {}
-              for (const [k, v] of Object.entries(x)) {
-                switch (k) {
-                  case 'deviceId':
-                    break
-                  case 'hideChannels': {
-                    if (typeof v !== 'string' || v === '') {
-                      logIgnore(key + '.' + k)
-                    } else {
-                      const channels = v.split(',')
-                      channels.forEach(channel => {
-                        this.hideChannels.push(
-                          deviceId + 'SW' + channel.replace(/[^0-9]+/g, '')
-                        )
-                      })
-                    }
-                    break
-                  }
-                  case 'ipAddress': {
-                    if (typeof v !== 'string' || v === '') {
-                      logIgnore(key + '.' + k)
-                    } else {
-                      this.ipOverride[deviceId] = v
-                    }
-                    break
-                  }
-                  case 'overrideDisabledLogging':
-                    if (typeof v === 'string') {
-                      logQuotes(key + '.' + k)
-                    }
-                    this.multiDevices[deviceId][k] = v === 'false' ? false : !!v
-                    break
-                  default:
-                    logRemove(key + '.' + k)
-                    break
-                }
-              }
-            })
-          } else {
-            logIgnore(key)
-          }
-          break
-        case 'outletDevices':
-          if (Array.isArray(val) && val.length > 0) {
-            val.forEach(x => {
-              if (!x.deviceId) {
-                logIgnoreItem(key)
-                return
-              }
-              const deviceId = this.funcs.parseDeviceId(x.deviceId)
-              this.outletDevices[deviceId] = {}
-              for (const [k, v] of Object.entries(x)) {
-                switch (k) {
-                  case 'deviceId':
-                    break
-                  case 'inUsePowerThreshold': {
-                    if (typeof v === 'string') {
-                      logQuotes(k)
-                    }
-                    const intVal = parseInt(v)
-                    if (isNaN(intVal)) {
-                      logDefault(key + '.' + k, this.consts.defaultValues[k])
-                      this.outletDevices[deviceId][k] = this.consts.defaultValues[k]
-                    } else if (intVal < this.consts.minValues[k]) {
-                      logIncrease(key + '.' + k, this.consts.minValues[k])
-                      this.outletDevices[deviceId][k] = this.consts.minValues[k]
-                    } else {
-                      this.outletDevices[deviceId][k] = intVal
-                    }
-                    break
-                  }
-                  case 'ipAddress': {
-                    if (typeof v !== 'string' || v === '') {
-                      logIgnore(key + '.' + k)
-                    } else {
-                      this.ipOverride[deviceId] = v
-                    }
-                    break
-                  }
-                  case 'overrideDisabledLogging':
-                  case 'showAsSwitch':
-                    if (typeof v === 'string') {
-                      logQuotes(key + '.' + k)
-                    }
-                    this.outletDevices[deviceId][k] = v === 'false' ? false : !!v
-                    break
-                  default:
-                    logRemove(key + '.' + k)
-                    break
-                }
-              }
-            })
-          } else {
-            logIgnore(key)
-          }
-          break
         case 'name':
         case 'platform':
         case 'plugin_map':
@@ -480,134 +410,6 @@ class eWeLinkPlatform {
           }
           this.config.password = val
           break
-        case 'sensorDevices':
-          if (Array.isArray(val) && val.length > 0) {
-            val.forEach(x => {
-              if (!x.deviceId) {
-                logIgnoreItem(key)
-                return
-              }
-              const deviceId = this.funcs.parseDeviceId(x.deviceId)
-              this.sensorDevices[deviceId] = {}
-              for (const [k, v] of Object.entries(x)) {
-                switch (k) {
-                  case 'deviceId':
-                    break
-                  case 'hideLongDouble':
-                  case 'overrideDisabledLogging':
-                  case 'scaleBattery':
-                    if (typeof v === 'string') {
-                      logQuotes(k)
-                    }
-                    this.sensorDevices[deviceId][k] = v === 'false' ? false : !!v
-                    break
-                  case 'lowBattThreshold':
-                  case 'sensorTimeDifference': {
-                    if (typeof v === 'string') {
-                      logQuotes(key + '.' + k)
-                    }
-                    const intVal = parseInt(v)
-                    if (isNaN(intVal)) {
-                      logDefault(key + '.' + k, this.consts.defaultValues[k])
-                      this.sensorDevices[deviceId][k] = this.consts.defaultValues[k]
-                    } else if (intVal < this.consts.minValues[k]) {
-                      logIncrease(key + '.' + k, this.consts.minValues[k])
-                      this.sensorDevices[deviceId][k] = this.consts.minValues[k]
-                    } else {
-                      this.sensorDevices[deviceId][k] = intVal
-                    }
-                    break
-                  }
-                  default:
-                    logRemove(key + '.' + k)
-                    break
-                }
-              }
-            })
-          } else {
-            logIgnore(key)
-          }
-          break
-        case 'singleDevices':
-          if (Array.isArray(val) && val.length > 0) {
-            val.forEach(x => {
-              if (!x.deviceId) {
-                logIgnoreItem(key)
-                return
-              }
-              const deviceId = this.funcs.parseDeviceId(x.deviceId)
-              this.singleDevices[deviceId] = {}
-              for (const [k, v] of Object.entries(x)) {
-                switch (k) {
-                  case 'deviceId':
-                    break
-                  case 'ipAddress': {
-                    if (typeof v !== 'string' || v === '') {
-                      logIgnore(key + '.' + k)
-                    } else {
-                      this.ipOverride[deviceId] = v
-                    }
-                    break
-                  }
-                  case 'overrideDisabledLogging':
-                  case 'showAsOutlet':
-                    if (typeof v === 'string') {
-                      logQuotes(key + '.' + k)
-                    }
-                    this.singleDevices[deviceId][k] = v === 'false' ? false : !!v
-                    break
-                  default:
-                    logRemove(key + '.' + k)
-                    break
-                }
-              }
-            })
-          } else {
-            logIgnore(key)
-          }
-          break
-        case 'thDevices':
-          if (Array.isArray(val) && val.length > 0) {
-            val.forEach(x => {
-              if (!x.deviceId) {
-                logIgnoreItem(key)
-                return
-              }
-              const deviceId = this.funcs.parseDeviceId(x.deviceId)
-              this.thDevices[deviceId] = {}
-              for (const [k, v] of Object.entries(x)) {
-                switch (k) {
-                  case 'deviceId':
-                    break
-                  case 'hideSwitch':
-                  case 'overrideDisabledLogging':
-                    if (typeof v === 'string') {
-                      logQuotes(k)
-                    }
-                    this.thDevices[deviceId][k] = v === 'false' ? false : !!v
-                    break
-                  case 'offset': {
-                    if (typeof v === 'string') {
-                      logQuotes(key + '.' + k)
-                    }
-                    const numVal = Number(v)
-                    if (isNaN(numVal)) {
-                      logIgnore(key + '.' + k)
-                    } else {
-                      this.thDevices[deviceId][k] = numVal
-                    }
-                    break
-                  }
-                  default:
-                    logRemove(key + '.' + k)
-                    break
-                }
-              }
-            })
-          } else {
-            logIgnore(key)
-          }
-          break
         case 'username':
           if (typeof val !== 'string' || val === '') {
             throw new Error(this.messages.missingUN)
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 46767600..1eec185f 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -146,7 +146,23 @@ module.exports = {
   httpRetryCodes: ['ENOTFOUND', 'ETIMEDOUT', 'EAI_AGAIN'],
 
   allowed: {
-    groups: [
+    singleDevices: ['deviceId', 'showAsOutlet', 'ipAddress', 'overrideDisabledLogging'],
+    multiDevices: ['deviceId', 'hideChannels', 'ipAddress', 'overrideDisabledLogging'],
+    outletDevices: [
+      'deviceId', 'showAsSwitch', 'inUsePowerThreshold', 'ipAddress',
+      'overrideDisabledLogging'
+    ],
+    lightDevices: [
+      'deviceId', 'bulbModel', 'brightnessStep', 'adaptiveLightingShift',
+      'overrideDisabledLogging'
+    ],
+    thDevices: ['deviceId', 'hideSwitch', 'offset', 'overrideDisabledLogging'],
+    fanDevices: ['deviceId', 'hideLight', 'overrideDisabledLogging'],
+    sensorDevices: [
+      'deviceId', 'lowBattThreshold', 'hideLongDouble', 'scaleBattery',
+      'sensorTimeDifference', 'overrideDisabledLogging'
+    ],
+    groupTypes: [
       'blind', 'garage', 'garage_two', 'garage_four', 'garage_eachen', 'lock',
       'sensor_leak', 'switch_valve', 'tap', 'tap_two', 'thermostat', 'valve', 'valve_two',
       'valve_four'
@@ -155,7 +171,7 @@ module.exports = {
     obstructs: ['garage', 'garage_eachen'],
     setups: ['oneSwitch', 'twoSwitch'],
     sensors: ['water', 'smoke', 'co', 'co2', 'contact', 'occupancy', 'motion'],
-    bulbModels: ['bulbB02BA60', 'bulbB02FA60', 'bulbB02FST64']
+    bulbModel: ['bulbB02BA60', 'bulbB02FA60', 'bulbB02FST64']
   },
 
   devices: {

From 2cf0e19628090844e65a0a8c8f4c3f119fa2545b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 19 Feb 2021 13:39:33 +0000
Subject: [PATCH 1516/3183] 5.0.0-8

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 93a7d20c..f3dad5db 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "5.0.0-7",
+  "version": "5.0.0-8",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index b09776ed..6a7d6a8a 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "5.0.0-7",
+  "version": "5.0.0-8",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 2519e13a35a6611af79da48e4ff046fd093e5cd5 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 20 Feb 2021 15:04:26 +0000
Subject: [PATCH 1517/3183] showAsOutlet for multi channel devices

---
 config.schema.json         |  6 ++++
 lib/device/switch-multi.js | 66 +++++++++++++++++++++++++++++++-------
 lib/utils/constants.js     |  4 ++-
 3 files changed, 64 insertions(+), 12 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index b241a420..86af71e2 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -105,6 +105,11 @@
               "type": "string",
               "title": "Device ID"
             },
+            "showAsOutlet": {
+              "type": "boolean",
+              "title": "Show As Outlets",
+              "description": "If true, this accessory will show as outlets in HomeKit instead of switches."
+            },
             "hideChannels": {
               "type": "string",
               "title": "Hide Channels",
@@ -580,6 +585,7 @@
         "type": "fieldset",
         "items": [
           "multiDevices[].deviceId",
+          "multiDevices[].showAsOutlet",
           "multiDevices[].hideChannels",
           "multiDevices[].ipAddress",
           "multiDevices[].overrideDisabledLogging"
diff --git a/lib/device/switch-multi.js b/lib/device/switch-multi.js
index d9b95fab..2b2f3592 100644
--- a/lib/device/switch-multi.js
+++ b/lib/device/switch-multi.js
@@ -21,15 +21,32 @@ module.exports = class deviceSwitchMulti {
     // Set up custom variables for this device type
     const deviceId = this.accessory.context.eweDeviceId
     const deviceConf = platform.multiDevices[deviceId]
+    this.showAsOutlet = deviceConf && deviceConf.showAsOutlet
     this.disableDeviceLogging = deviceConf && deviceConf.overrideDisabledLogging
       ? false
       : platform.config.disableDeviceLogging
 
-    // Add the switch service if it doesn't already exist
-    this.service = this.accessory.getService(this.hapServ.Switch) ||
-      this.accessory.addService(this.hapServ.Switch)
+    if (this.showAsOutlet) {
+      // If the accessory has a switch service then remove it
+      if (this.accessory.getService(this.hapServ.Switch)) {
+        this.accessory.removeService(this.accessory.getService(this.hapServ.Switch))
+      }
+
+      // Add the outlet service if it doesn't already exist
+      this.service = this.accessory.getService(this.hapServ.Outlet) ||
+        this.accessory.addService(this.hapServ.Outlet)
+    } else {
+      // If the accessory has an outlet service then remove it
+      if (this.accessory.getService(this.hapServ.Outlet)) {
+        this.accessory.removeService(this.accessory.getService(this.hapServ.Outlet))
+      }
 
-    // Add the set handler to the switch on/off characteristic
+      // Add the switch service if it doesn't already exist
+      this.service = this.accessory.getService(this.hapServ.Switch) ||
+        this.accessory.addService(this.hapServ.Switch)
+    }
+
+    // Add the set handler to the switch/outlet on/off characteristic
     this.service.getCharacteristic(this.hapChar.On)
       .on('set', this.internalUpdate.bind(this))
 
@@ -40,7 +57,10 @@ module.exports = class deviceSwitchMulti {
 
     // Output the customised options to the log if in debug mode
     if (this.debug) {
-      const opts = JSON.stringify({ disableDeviceLogging: this.disableDeviceLogging })
+      const opts = JSON.stringify({
+        disableDeviceLogging: this.disableDeviceLogging,
+        showAsOutlet: this.showAsOutlet
+      })
       this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
     }
   }
@@ -61,7 +81,12 @@ module.exports = class deviceSwitchMulti {
           params.switches[3].switch = value ? 'on' : 'off'
           for (let i = 0; i <= 4; i++) {
             if ((oAccessory = this.platform.devicesInHB.get(this.accessory.context.eweDeviceId + 'SW' + i))) {
-              oAccessory.getService(this.hapServ.Switch).updateCharacteristic(this.hapChar.On, value)
+              if (this.showAsOutlet) {
+                oAccessory.getService(this.hapServ.Outlet).updateCharacteristic(this.hapChar.On, value)
+                oAccessory.getService(this.hapServ.Outlet).updateCharacteristic(this.hapChar.OutletInUse, value)
+              } else {
+                oAccessory.getService(this.hapServ.Switch).updateCharacteristic(this.hapChar.On, value)
+              }
               oAccessory.context.cacheOnOff = value ? 'on' : 'off'
               oAccessory.eveService.addEntry({ status: value ? 1 : 0 })
               if (i > 0 && !this.disableDeviceLogging) {
@@ -77,13 +102,17 @@ module.exports = class deviceSwitchMulti {
           params.switches = this.consts.defaultMultiSwitchOff
           for (let i = 1; i <= 4; i++) {
             if ((oAccessory = this.platform.devicesInHB.get(this.accessory.context.eweDeviceId + 'SW' + i))) {
-              if (oAccessory.getService(this.hapServ.Switch).getCharacteristic(this.hapChar.On).value) {
+              const serviceToUse = this.showAsOutlet ? this.hapServ.Outlet : this.hapServ.Switch
+              if (oAccessory.getService(serviceToUse).getCharacteristic(this.hapChar.On).value) {
                 masterState = 'on'
               }
               if (i === parseInt(this.accessory.context.switchNumber)) {
                 params.switches[i - 1].switch = value ? 'on' : 'off'
                 oAccessory.context.cacheOnOff = value ? 'on' : 'off'
                 oAccessory.eveService.addEntry({ status: value ? 1 : 0 })
+                if (this.showAsOutlet) {
+                  oAccessory.getService(this.hapServ.Outlet).updateCharacteristic(this.hapChar.OutletInUse, value)
+                }
                 if (i > 0 && !this.disableDeviceLogging) {
                   this.log('[%s] current state [%s].', oAccessory.displayName, value ? 'on' : 'off')
                 }
@@ -96,7 +125,12 @@ module.exports = class deviceSwitchMulti {
           }
           if (!this.platform.hideMasters.includes(this.accessory.context.eweDeviceId)) {
             oAccessory = this.platform.devicesInHB.get(this.accessory.context.eweDeviceId + 'SW0')
-            oAccessory.getService(this.hapServ.Switch).updateCharacteristic(this.hapChar.On, masterState === 'on')
+            if (this.showAsOutlet) {
+              oAccessory.getService(this.hapServ.Outlet).updateCharacteristic(this.hapChar.On, masterState === 'on')
+              oAccessory.getService(this.hapServ.Outlet).updateCharacteristic(this.hapChar.OutletInUse, masterState === 'on')
+            } else {
+              oAccessory.getService(this.hapServ.Switch).updateCharacteristic(this.hapChar.On, masterState === 'on')
+            }
             oAccessory.eveService.addEntry({ status: masterState === 'on' ? 1 : 0 })
           }
           break
@@ -120,11 +154,18 @@ module.exports = class deviceSwitchMulti {
         }
         if (this.platform.devicesInHB.has(idToCheck + i)) {
           const oAccessory = this.platform.devicesInHB.get(idToCheck + i)
-          if (params.switches[i - 1].switch === oAccessory.context.cacheOnOff) {
+          if (params.updateSource && params.switches[i - 1].switch === oAccessory.context.cacheOnOff) {
             continue
           }
-          oAccessory.getService(this.hapServ.Switch)
-            .updateCharacteristic(this.hapChar.On, params.switches[i - 1].switch === 'on')
+          if (this.showAsOutlet) {
+            oAccessory.getService(this.hapServ.Outlet)
+              .updateCharacteristic(this.hapChar.On, params.switches[i - 1].switch === 'on')
+            oAccessory.getService(this.hapServ.Outlet)
+              .updateCharacteristic(this.hapChar.OutletInUse, params.switches[i - 1].switch === 'on')
+          } else {
+            oAccessory.getService(this.hapServ.Switch)
+              .updateCharacteristic(this.hapChar.On, params.switches[i - 1].switch === 'on')
+          }
           oAccessory.context.cacheOnOff = params.switches[i - 1].switch
           oAccessory.eveService.addEntry({ status: params.switches[i - 1].switch === 'on' ? 1 : 0 })
           if (params.updateSource && !this.disableDeviceLogging) {
@@ -134,6 +175,9 @@ module.exports = class deviceSwitchMulti {
       }
       if (!this.platform.hideMasters.includes(this.accessory.context.eweDeviceId)) {
         this.service.updateCharacteristic(this.hapChar.On, primaryState)
+        if (this.showAsOutlet) {
+          this.service.updateCharacteristic(this.hapChar.OutletInUse, primaryState)
+        }
         this.accessory.eveService.addEntry({ status: primaryState ? 1 : 0 })
       }
     } catch (err) {
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 1eec185f..85315871 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -147,7 +147,9 @@ module.exports = {
 
   allowed: {
     singleDevices: ['deviceId', 'showAsOutlet', 'ipAddress', 'overrideDisabledLogging'],
-    multiDevices: ['deviceId', 'hideChannels', 'ipAddress', 'overrideDisabledLogging'],
+    multiDevices: [
+      'deviceId', 'showAsOutlet', 'hideChannels', 'ipAddress', 'overrideDisabledLogging'
+    ],
     outletDevices: [
       'deviceId', 'showAsSwitch', 'inUsePowerThreshold', 'ipAddress',
       'overrideDisabledLogging'

From a8df86686281ee42fc1bb50a20a13c4039000e27 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 20 Feb 2021 15:05:01 +0000
Subject: [PATCH 1518/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 849da304..a8cf8ef3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 * **Homebridge Plugin UI**
   * 'My Devices' shows a red/green icon on the to show device WAN/LAN reachability
   * 'My Devices' shows the firmware version for your device
+* Ability to show multi-channel switch devices as outlets
 
 ### Changes
 

From d59a103a460437223b4b118c3401686fd50e1337 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 20 Feb 2021 15:05:38 +0000
Subject: [PATCH 1519/3183] 5.0.0-9

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index f3dad5db..e9447943 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "5.0.0-8",
+  "version": "5.0.0-9",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 6a7d6a8a..0f512b93 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "5.0.0-8",
+  "version": "5.0.0-9",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 0778465d88d2969f3924ed0d03e9ee149b533246 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 20 Feb 2021 18:29:34 +0000
Subject: [PATCH 1520/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a8cf8ef3..fbe1bd62 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,16 +9,16 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 ### Added
 
 * **Configuration**
-  * The ability to explicitly enable device logging per device if you have disableDeviceLogging set to true
-  * New brightnessStep option to specify a minimum brightness step in the Home app per dimmer/bulb/LED strip
-  * New adaptiveLightingShift option to offset the Adaptive Lighting values per bulb
+  * The ability to explicitly enable device logging per device if you have `disableDeviceLogging` set to true
+  * New `brightnessStep` option to specify a minimum brightness step in the Home app per dimmer/bulb/LED strip
+  * New `adaptiveLightingShift` option to offset the Adaptive Lighting values per bulb
+  * `showAsOutlet` option extended multi-channel switch and light switch devices to expose them as outlets
 * **Accessory Simulations**
   * Expose a DW2 contact sensor as a leak sensor
   * Sub-accessories will be removed automatically when setting up a new Accessory Simulation
 * **Homebridge Plugin UI**
   * 'My Devices' shows a red/green icon on the to show device WAN/LAN reachability
   * 'My Devices' shows the firmware version for your device
-* Ability to show multi-channel switch devices as outlets
 
 ### Changes
 

From ea2a6306146a50f5f97f04f44fd6155f9dd049ca Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 20 Feb 2021 19:00:44 +0000
Subject: [PATCH 1521/3183] support device uiid 107

---
 lib/utils/constants.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 85315871..373c9cbe 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -194,7 +194,7 @@ module.exports = {
     camera: [87],
     eWeCamera: [65],
     usb: [77],
-    scm: [78],
+    scm: [78, 107],
     rfBridge: [28],
     zbBridge: [66],
     zbSwitchStateless: [1000],
@@ -312,7 +312,7 @@ module.exports = {
     102: 1, // "DOOR_MAGNETIC" (OPL-DMA, DW2)
     103: 1, // "WOTEWODE_TEM_LIGHT" (B02-F)
     104: 1, // "WOTEWODE_RGB_TEM_LIGHT"
-    107: 0, // "GSM_SOCKET_NO_FLOW"
+    107: 1, // "GSM_SOCKET_NO_FLOW"
     109: 0, // "YK_INFRARED_2"
     127: 1, // "GTTA127"
     1000: 1, // "ZIGBEE_WIRELESS_SWITCH"

From 80c77cf80b3a76e5994672560e8e038589ce8034 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 20 Feb 2021 19:01:39 +0000
Subject: [PATCH 1522/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fbe1bd62..dfeade8e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,8 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 * **Homebridge Plugin UI**
   * 'My Devices' shows a red/green icon on the to show device WAN/LAN reachability
   * 'My Devices' shows the firmware version for your device
+* **New Devices**
+  * Support for eWeLink switch uiid 107 device type
 
 ### Changes
 

From 3fce319649614a39c3a819ce1913c9f4398950fe Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 20 Feb 2021 19:08:13 +0000
Subject: [PATCH 1523/3183] sort out scm devices

---
 lib/device/{usb.js => outlet-scm.js} |  2 +-
 lib/device/scm.js                    | 80 ----------------------------
 lib/index.js                         | 21 +++-----
 lib/utils/constants.js               |  3 +-
 4 files changed, 8 insertions(+), 98 deletions(-)
 rename lib/device/{usb.js => outlet-scm.js} (99%)
 delete mode 100644 lib/device/scm.js

diff --git a/lib/device/usb.js b/lib/device/outlet-scm.js
similarity index 99%
rename from lib/device/usb.js
rename to lib/device/outlet-scm.js
index 5f84c15b..5fb4dd67 100644
--- a/lib/device/usb.js
+++ b/lib/device/outlet-scm.js
@@ -2,7 +2,7 @@
 /* eslint-disable new-cap */
 'use strict'
 
-module.exports = class deviceUSB {
+module.exports = class outletSCM {
   constructor (platform, accessory) {
     // Set up variables from the platform
     this.consts = platform.consts
diff --git a/lib/device/scm.js b/lib/device/scm.js
deleted file mode 100644
index 6ec7fe73..00000000
--- a/lib/device/scm.js
+++ /dev/null
@@ -1,80 +0,0 @@
-/* jshint -W014, -W033, esversion: 9 */
-/* eslint-disable new-cap */
-'use strict'
-
-module.exports = class deviceSCM {
-  constructor (platform, accessory) {
-    // Set up variables from the platform
-    this.consts = platform.consts
-    this.debug = platform.config.debug
-    this.funcs = platform.funcs
-    this.hapServ = platform.api.hap.Service
-    this.hapChar = platform.api.hap.Characteristic
-    this.log = platform.log
-    this.messages = platform.messages
-    this.platform = platform
-
-    // Set up variables from the accessory
-    this.name = accessory.displayName
-    this.accessory = accessory
-
-    // Set up custom variables for this device type
-    const deviceId = this.accessory.context.eweDeviceId
-    const deviceConf = platform.singleDevices[deviceId]
-    this.disableDeviceLogging = deviceConf && deviceConf.overrideDisabledLogging
-      ? false
-      : platform.config.disableDeviceLogging
-
-    // Add the switch service if it doesn't already exist
-    this.service = this.accessory.getService(this.hapServ.Switch) ||
-      this.accessory.addService(this.hapServ.Switch)
-
-    // Add the set handler to the switch on/off characteristic
-    this.service.getCharacteristic(this.hapChar.On)
-      .on('set', this.internalUpdate.bind(this))
-
-    // Pass the accessory to Fakegato to set up with Eve
-    this.accessory.eveService = new this.platform.eveService('switch', this.accessory, {
-      log: platform.config.debugFakegato ? this.log : () => {}
-    })
-
-    // Output the customised options to the log if in debug mode
-    if (this.debug) {
-      const opts = JSON.stringify({ disableDeviceLogging: this.disableDeviceLogging })
-      this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
-    }
-  }
-
-  async internalUpdate (value, callback) {
-    try {
-      callback()
-      const params = { switches: this.consts.defaultMultiSwitchOff }
-      params.switches[0].switch = value ? 'on' : 'off'
-      await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.cacheOnOff = value ? 'on' : 'off'
-      this.accessory.eveService.addEntry({ status: value ? 1 : 0 })
-      if (!this.disableDeviceLogging) {
-        this.log('[%s] current state [%s].', this.name, value ? 'on' : 'off')
-      }
-    } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
-    }
-  }
-
-  async externalUpdate (params) {
-    try {
-      if (!params.switches || params.switches[0].switch === this.cacheOnOff) {
-        return
-      }
-      const newStatus = params.switches[0].switch === 'on'
-      this.service.updateCharacteristic(this.hapChar.On, newStatus)
-      this.cacheOnOff = params.switches[0].switch
-      this.accessory.eveService.addEntry({ status: newStatus ? 1 : 0 })
-      if (params.updateSource && !this.disableDeviceLogging) {
-        this.log('[%s] current state [%s].', this.name, params.switches[0].switch)
-      }
-    } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, false)
-    }
-  }
-}
diff --git a/lib/index.js b/lib/index.js
index cdd36a57..de926c0c 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -816,24 +816,15 @@ class eWeLinkPlatform {
           ? new (require('./device/switch-single'))(this, accessory)
           : new (require('./device/outlet'))(this, accessory)
         /*****/
-      } else if (this.consts.devices.usb.includes(device.extra.uiid)) {
-        /**********
-        USB OUTLETS
-        **********/
-        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
-          ? this.devicesInHB.get(device.deviceid + 'SWX')
-          : this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require('./device/usb'))(this, accessory)
-        /*********/
-      } else if (this.consts.devices.scm.includes(device.extra.uiid)) {
-        /*********************************
-        SINGLE CHL [MULTIPLE CHL HARDWARE]
-        *********************************/
+      } else if (this.consts.devices.outletSCM.includes(device.extra.uiid)) {
+        /*************************************
+        OUTLETS [SINGLE BUT MULTIPLE HARDWARE]
+        *************************************/
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
           : this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require('./device/scm'))(this, accessory)
-        /********************************/
+        accessory.control = new (require('./device/outlet-scm'))(this, accessory)
+        /************************************/
       } else if (this.consts.devices.cTempable.includes(device.extra.uiid)) {
         /*******************
         LIGHTS [COLOUR TEMP]
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 373c9cbe..f4430140 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -191,10 +191,9 @@ module.exports = {
     fan: [34],
     diffuser: [25],
     outlet: [32],
+    outletSCM: [77, 78, 107],
     camera: [87],
     eWeCamera: [65],
-    usb: [77],
-    scm: [78, 107],
     rfBridge: [28],
     zbBridge: [66],
     zbSwitchStateless: [1000],

From 9791d08216449af5b2ba303c8549a2f01b778c09 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 20 Feb 2021 19:51:39 +0000
Subject: [PATCH 1524/3183] more device support

---
 CHANGELOG.md           |  2 +-
 lib/index.js           |  4 +-
 lib/utils/constants.js | 87 ++++++++++++++++++++++--------------------
 3 files changed, 48 insertions(+), 45 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dfeade8e..47424746 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,7 +20,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
   * 'My Devices' shows a red/green icon on the to show device WAN/LAN reachability
   * 'My Devices' shows the firmware version for your device
 * **New Devices**
-  * Support for eWeLink switch uiid 107 device type
+  * Support for eWeLink switch uiid 81, 82, 83, 84 and 107 device types
 
 ### Changes
 
diff --git a/lib/index.js b/lib/index.js
index de926c0c..4f5e196b 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -868,7 +868,7 @@ class eWeLinkPlatform {
         /***********************
         SWITCHES [MULTI CHANNEL]
         ***********************/
-        for (let i = 0; i <= this.consts.chansFromUiid[device.extra.uiid]; i++) {
+        for (let i = 0; i <= this.consts.supportedDevices[device.extra.uiid]; i++) {
           // Check if the user has chosen to hide any channels for this device
           if (this.hideChannels.includes(device.deviceid + 'SW' + i)) {
             // The user has hidden this channel so if it exists then remove it
@@ -1165,7 +1165,7 @@ class eWeLinkPlatform {
       const switchNumber = hbDeviceId.split('SW')[1].toString()
       const channelCount = type === 'rf_pri'
         ? Object.keys((device.tags && device.tags.zyx_info) || []).length
-        : this.consts.chansFromUiid[device.extra.uiid]
+        : this.consts.supportedDevices[device.extra.uiid]
 
       // Set up the device name which can depend on the accessory type
       if (type === 'rf_sub') {
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index f4430140..72ec5efe 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -178,8 +178,8 @@ module.exports = {
 
   devices: {
     lan: [1, 2, 3, 4, 5, 6, 7, 8, 9, 32, 77, 78],
-    singleSwitch: [1, 5, 6, 14, 15, 22, 24, 27, 32, 36, 44, 59, 104],
-    multiSwitch: [2, 3, 4, 7, 8, 9, 29, 30, 31, 34, 41],
+    singleSwitch: [1, 5, 6, 14, 15, 22, 24, 27, 32, 36, 44, 59, 81, 104],
+    multiSwitch: [2, 3, 4, 7, 8, 9, 29, 30, 31, 34, 41, 82, 83, 84],
     singleSwitchOutlet: ['Sonoff Pow', 'S20', 'S26', 'S26R1', 'S55', 'S55R1'],
     brightable: [36, 44],
     colourable: [22, 59, 104],
@@ -230,7 +230,7 @@ module.exports = {
     { switch: 'off', outlet: 3 }
   ],
 
-  chansFromUiid: {
+  supportedDevices: {
     1: 1, // "SOCKET" (20, MINI, BASIC, S26)
     2: 2, // "SOCKET_2"
     3: 3, // "SOCKET_3"
@@ -240,37 +240,64 @@ module.exports = {
     7: 2, // "SWITCH_2" (T1 2C, TX2C)
     8: 3, // "SWITCH_3" (T1 3C, TX3C)
     9: 4, // "SWITCH_4"
-    10: 0, // "OSPF"
     11: 1, // "CURTAIN" (King Q4 Cover)
-    12: 0, // "EW-RE"
-    13: 0, // "FIREPLACE"
     14: 1, // "SWITCH_CHANGE"
     15: 1, // "THERMOSTAT" (TH10, TH16)
-    16: 0, // "COLD_WARM_LED"
-    17: 0, // "THREE_GEAR_FAN"
-    18: 0, // "SENSORS_CENTER"
-    19: 0, // "HUMIDIFIER"
     22: 1, // "RGB_BALL_LIGHT" (B1, B1_R2)
-    23: 0, // "NEST_THERMOSTAT"
     24: 1, // "GSM_SOCKET"
-    25: 0, // "AROMATHERAPY" (Diffuser, Komeito 1515-X)
-    26: 0, // "RuiMiTeWenKongQi"
+    25: 1, // "AROMATHERAPY" (Diffuser, Komeito 1515-X)
     27: 1, // "GSM_UNLIMIT_SOCKET"
     28: 1, // "RF_BRIDGE" (RFBridge, RF_Bridge)
     29: 2, // "GSM_SOCKET_2"
     30: 3, // "GSM_SOCKET_3"
     31: 4, // "GSM_SOCKET_4"
     32: 1, // "POWER_DETECTION_SOCKET" (POW, Pow_R2)
-    33: 0, // "LIGHT_BELT",
     34: 4, // "FAN_LIGHT" (iFan02, iFan)
-    35: 0, // "EZVIZ_CAMERA",
     36: 1, // "SINGLE_CHANNEL_DIMMER_SWITCH" (KING-M4)
+    41: 4, // "CUN_YOU_DOOR"
+    44: 1, // "SNOFF_LIGHT" (D1)
+    59: 1, // "MUSIC_LIGHT_BELT" (L1)
+    66: 1, // "ZIGBEE_MAIN_DEVICE"
+    77: 4, // "SINGLE_SOCKET_MULTIPLE" (1 socket device using data structure of four :()
+    78: 4, // "SINGLE_SWITCH_MULTIPLE" (1 switch device using data structure of four :()
+    81: 1, // "GSM_SOCKET_NO_FLOW"
+    82: 2, // "GSM_SOCKET_2_NO_FLOW"
+    83: 3, // "GSM_SOCKET_3_NO_FLOW"
+    84: 4, // "GSM_SOCKET_4_NO_FLOW"
+    102: 1, // "DOOR_MAGNETIC" (OPL-DMA, DW2)
+    103: 1, // "WOTEWODE_TEM_LIGHT" (B02-F)
+    104: 1, // "WOTEWODE_RGB_TEM_LIGHT"
+    107: 1, // "GSM_SOCKET_NO_FLOW"
+    127: 1, // "GTTA127"
+    1000: 1, // "ZIGBEE_WIRELESS_SWITCH"
+    1009: 1, // "" (Some sort of single switch device)
+    1256: 1, // "ZIGBEE_SINGLE_SWITCH"
+    1257: 1, // "ZigbeeWhiteLight"
+    1770: 1, // "ZIGBEE_TEMPERATURE_SENSOR"
+    2026: 1, // "ZIGBEE_MOBILE_SENSOR"
+    2256: 2, // "ZIGBEE_SWITCH_2"
+    3026: 1, // "ZIGBEE_DOOR_AND_WINDOW_SENSOR"
+    3256: 3, // "ZIGBEE_SWITCH_3"
+    4026: 1, // "ZIGBEE_WATER_SENSOR"
+    4256: 4 // "ZIGBEE_SWITCH_4"
+  },
+  
+  unsupportedDevices: {
+    10: 0, // "OSPF"
+    12: 0, // "EW-RE"
+    13: 0, // "FIREPLACE"
+    16: 0, // "COLD_WARM_LED"
+    17: 0, // "THREE_GEAR_FAN"
+    18: 0, // "SENSORS_CENTER"
+    19: 0, // "HUMIDIFIER"
+    23: 0, // "NEST_THERMOSTAT"
+    26: 0, // "RuiMiTeWenKongQi"
+    33: 0, // "LIGHT_BELT",
+    35: 0, // "EZVIZ_CAMERA",
     38: 0, // "HOME_KIT_BRIDGE",
     40: 0, // "FUJIN_OPS"
-    41: 4, // "CUN_YOU_DOOR"
     42: 0, // "SMART_BEDSIDE_AND_NEW_RGB_BALL_LIGHT"
     43: 0, // "?"
-    44: 1, // "SNOFF_LIGHT" (D1)
     45: 0, // "DOWN_CEILING_LIGHT"
     46: 0, // "AIR_CLEANER"
     49: 0, // "MACHINE_BED"
@@ -280,25 +307,17 @@ module.exports = {
     55: 0, // "SWEEPING_ROBOT"
     56: 0, // "RGB_BALL_LIGHT_4"
     57: 0, // "MONOCHROMATIC_BALL_LIGHT"
-    59: 1, // "MUSIC_LIGHT_BELT" (L1)
     60: 0, // "NEW_HUMIDIFIER"
     61: 0, // "KAI_WEI_ROUTER"
     62: 0, // "MEARICAMERA"
     64: 0, // "HeatingTable"
     65: 0, // "CustomCamera" (eWeLink Camera App)
-    66: 0, // "ZIGBEE_MAIN_DEVICE"
     67: 0, // "RollingDoor"
     68: 0, // "KOOCHUWAH"
     69: 0, // "ATMOSPHERE_LAMP"
     76: 0, // "YI_GE_ER_LAMP"
-    77: 4, // "SINGLE_SOCKET_MULTIPLE" (1 socket device using data structure of four :()
-    78: 4, // "SINGLE_SWITCH_MULTIPLE" (1 switch device using data structure of four :()
     79: 0, // "CHRISTMAS_LIGHT"
     80: 0, // "HANYUAN_AIR_CONDITION"
-    81: 1, // "GSM_SOCKET_NO_FLOW"
-    82: 2, // "GSM_SOCKET_2_NO_FLOW"
-    83: 3, // "GSM_SOCKET_3_NO_FLOW"
-    84: 4, // "GSM_SOCKET_4_NO_FLOW"
     86: 0, // "CLEAR_BOOT"
     87: 0, // "EWELINK_IOT_CAMERA" (GK-200MP2B)
     88: 0, // "YK_INFRARED"
@@ -308,25 +327,9 @@ module.exports = {
     93: 0, // "HTHD_AIR_CLEANER"
     94: 0, // "YIAN_ELECTRIC_PROTECT"
     98: 0, // "DOORBELL_RFBRIDGE"
-    102: 1, // "DOOR_MAGNETIC" (OPL-DMA, DW2)
-    103: 1, // "WOTEWODE_TEM_LIGHT" (B02-F)
-    104: 1, // "WOTEWODE_RGB_TEM_LIGHT"
-    107: 1, // "GSM_SOCKET_NO_FLOW"
     109: 0, // "YK_INFRARED_2"
-    127: 1, // "GTTA127"
-    1000: 1, // "ZIGBEE_WIRELESS_SWITCH"
     1001: 0, // "BLADELESS_FAN"
     1002: 0, // "NEW_HUMIDIFIER"
-    1003: 0, // "WARM_AIR_BLOWER"
-    1009: 1, // "" (Some sort of single switch device)
-    1256: 1, // "ZIGBEE_SINGLE_SWITCH"
-    1257: 1, // "ZigbeeWhiteLight"
-    1770: 1, // "ZIGBEE_TEMPERATURE_SENSOR"
-    2026: 1, // "ZIGBEE_MOBILE_SENSOR"
-    2256: 2, // "ZIGBEE_SWITCH_2"
-    3026: 1, // "ZIGBEE_DOOR_AND_WINDOW_SENSOR"
-    3256: 3, // "ZIGBEE_SWITCH_3"
-    4026: 1, // "ZIGBEE_WATER_SENSOR"
-    4256: 4 // "ZIGBEE_SWITCH_4"
+    1003: 0 // "WARM_AIR_BLOWER"
   }
 }

From fefe99cacb993b54bc2a1cd870ed3e964cd68ada Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 20 Feb 2021 19:57:45 +0000
Subject: [PATCH 1525/3183] sort out supported

---
 lib/utils/constants.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 72ec5efe..29b9dad3 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -257,6 +257,7 @@ module.exports = {
     41: 4, // "CUN_YOU_DOOR"
     44: 1, // "SNOFF_LIGHT" (D1)
     59: 1, // "MUSIC_LIGHT_BELT" (L1)
+    65: 1, // "CustomCamera" (eWeLink Camera App)
     66: 1, // "ZIGBEE_MAIN_DEVICE"
     77: 4, // "SINGLE_SOCKET_MULTIPLE" (1 socket device using data structure of four :()
     78: 4, // "SINGLE_SWITCH_MULTIPLE" (1 switch device using data structure of four :()
@@ -264,6 +265,7 @@ module.exports = {
     82: 2, // "GSM_SOCKET_2_NO_FLOW"
     83: 3, // "GSM_SOCKET_3_NO_FLOW"
     84: 4, // "GSM_SOCKET_4_NO_FLOW"
+    87: 1, // "EWELINK_IOT_CAMERA" (GK-200MP2B)
     102: 1, // "DOOR_MAGNETIC" (OPL-DMA, DW2)
     103: 1, // "WOTEWODE_TEM_LIGHT" (B02-F)
     104: 1, // "WOTEWODE_RGB_TEM_LIGHT"
@@ -311,7 +313,6 @@ module.exports = {
     61: 0, // "KAI_WEI_ROUTER"
     62: 0, // "MEARICAMERA"
     64: 0, // "HeatingTable"
-    65: 0, // "CustomCamera" (eWeLink Camera App)
     67: 0, // "RollingDoor"
     68: 0, // "KOOCHUWAH"
     69: 0, // "ATMOSPHERE_LAMP"
@@ -319,7 +320,6 @@ module.exports = {
     79: 0, // "CHRISTMAS_LIGHT"
     80: 0, // "HANYUAN_AIR_CONDITION"
     86: 0, // "CLEAR_BOOT"
-    87: 0, // "EWELINK_IOT_CAMERA" (GK-200MP2B)
     88: 0, // "YK_INFRARED"
     89: 0, // "SMART_OPEN_MACHINE"
     90: 0, // "GSM_RFBridge"

From 8796851c7082ca575f245efe06479dca3be5f485 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 20 Feb 2021 20:43:42 +0000
Subject: [PATCH 1526/3183] rename class

---
 lib/device/outlet-scm.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/device/outlet-scm.js b/lib/device/outlet-scm.js
index 5fb4dd67..f9ab24a5 100644
--- a/lib/device/outlet-scm.js
+++ b/lib/device/outlet-scm.js
@@ -2,7 +2,7 @@
 /* eslint-disable new-cap */
 'use strict'
 
-module.exports = class outletSCM {
+module.exports = class deviceOutletSCM {
   constructor (platform, accessory) {
     // Set up variables from the platform
     this.consts = platform.consts

From b3244a2794e89a74822c69f9e2e0bfcf9ad56e45 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 20 Feb 2021 20:43:52 +0000
Subject: [PATCH 1527/3183] basic humidifier support

---
 lib/device/humidifier.js | 118 +++++++++++++++++++++++++++++++++++++++
 lib/index.js             |   9 +++
 lib/utils/constants.js   |   5 +-
 3 files changed, 130 insertions(+), 2 deletions(-)
 create mode 100644 lib/device/humidifier.js

diff --git a/lib/device/humidifier.js b/lib/device/humidifier.js
new file mode 100644
index 00000000..3b3e2ab0
--- /dev/null
+++ b/lib/device/humidifier.js
@@ -0,0 +1,118 @@
+/* jshint -W014, -W033, esversion: 9 */
+/* eslint-disable new-cap */
+'use strict'
+
+module.exports = class deviceHumidifier {
+  constructor (platform, accessory) {
+    // Set up variables from the platform
+    this.consts = platform.consts
+    this.debug = platform.config.debug
+    this.funcs = platform.funcs
+    this.hapServ = platform.api.hap.Service
+    this.hapChar = platform.api.hap.Characteristic
+    this.log = platform.log
+    this.messages = platform.messages
+    this.platform = platform
+
+    // Set up variables from the accessory
+    this.name = accessory.displayName
+    this.accessory = accessory
+
+    /*
+      The device does not provide a current humidity reading so
+      we use a fan accessory to be able to control the on/off state
+      and the modes (1, 2, 3) using a rotation speed of (25%, 50%, 75%)
+    */
+
+    // Add the fan service if it doesn't already exist
+    this.service = this.accessory.getService(this.hapServ.Fan) ||
+      this.accessory.addService(this.hapServ.Fan)
+
+    // Add the set handler to the fan on/off characteristic
+    this.service.getCharacteristic(this.hapChar.On)
+      .on('set', (value, callback) => {
+        callback()
+        if (!value) {
+          this.service.setCharacteristic(this.hapChar.RotationSpeed, 0)
+        }
+      })
+
+    // Add the set handler to the fan rotation speed characteristic
+    this.service.getCharacteristic(this.hapChar.RotationSpeed)
+      .on('set', this.internalUpdate.bind(this))
+      .setProps({ minStep: 33 })
+  }
+
+  async internalUpdate (value, callback) {
+    try {
+      callback()
+      const updateKey = Math.random().toString(36).substr(2, 8)
+      this.updateKey = updateKey
+      await this.funcs.sleep(350)
+      if (updateKey !== this.updateKey) {
+        return
+      }
+      const params = {}
+      if (value <= 25) {
+        this.service.updateCharacteristic(this.hapChar.RotationSpeed, 0)
+        if (this.cacheOnOff === 'off') {
+          return
+        }
+        this.cacheOnOff = 'off'
+        params.switch = this.cacheOnOff
+      } else {
+        let newState
+        if (value > 25 && value <= 50) {
+          newState = 1
+        } else if (value > 50 && value <= 75) {
+          newState = 2
+        } else {
+          newState = 3
+        }
+        this.service.updateCharacteristic(this.hapChar.RotationSpeed, newState * 33)
+        if (this.cacheState === newState) {
+          return
+        }
+        this.cacheOnOff = 'on'
+        this.cacheState = newState
+        params.switch = this.cacheOnOff
+        params.state = this.cacheState
+        if (!this.disableDeviceLogging) {
+          this.log('[%s] current mode [%s%].', this.name, this.cacheState)
+        }
+      }
+      await this.platform.sendDeviceUpdate(this.accessory, params)
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, true)
+    }
+  }
+
+  async externalUpdate (params) {
+    try {
+      if (params.switch && params.switch !== this.cacheOnOff) {
+        this.cacheOnOff = params.switch
+        if (params.updateSource && !this.disableDeviceLogging) {
+          this.log('[%s] current state [%s%].', this.name, this.cacheOnOff)
+        }
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheOnOff === 'on')
+        if (this.cacheOnOff !== 'on') {
+          this.service.updateCharacteristic(this.hapChar.RotationSpeed, 0)
+        }
+      }
+      if (params.state && params.state !== this.cacheState) {
+        this.cacheState = params.state
+        if (this.cacheOnOff === 'on') {
+          if (params.updateSource && !this.disableDeviceLogging) {
+            this.log('[%s] current mode [%s%].', this.name, this.cacheState)
+          }
+          this.service.updateCharacteristic(
+            this.hapChar.RotationSpeed,
+            this.cacheState * 33
+          )
+        }
+      }
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, false)
+    }
+  }
+}
diff --git a/lib/index.js b/lib/index.js
index 4f5e196b..03ff81dd 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -765,6 +765,15 @@ class eWeLinkPlatform {
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/diffuser'))(this, accessory)
         /*******/
+      } else if (this.consts.devices.humidifier.includes(device.extra.uiid)) {
+        /**********
+        HUMIDIFIERS
+        **********/
+        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
+          ? this.devicesInHB.get(device.deviceid + 'SWX')
+          : this.addAccessory(device, device.deviceid + 'SWX')
+        accessory.control = new (require('./device/humidifier'))(this, accessory)
+        /*********/
       } else if (this.consts.devices.thermostat.includes(device.extra.uiid)) {
         /**********
         THERMOSTATS
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 29b9dad3..2f89bf8c 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -189,6 +189,7 @@ module.exports = {
     sensorAmbient: [15],
     thermostat: [127],
     fan: [34],
+    humidifier: [19],
     diffuser: [25],
     outlet: [32],
     outletSCM: [77, 78, 107],
@@ -243,6 +244,7 @@ module.exports = {
     11: 1, // "CURTAIN" (King Q4 Cover)
     14: 1, // "SWITCH_CHANGE"
     15: 1, // "THERMOSTAT" (TH10, TH16)
+    19: 1, // "HUMIDIFIER"
     22: 1, // "RGB_BALL_LIGHT" (B1, B1_R2)
     24: 1, // "GSM_SOCKET"
     25: 1, // "AROMATHERAPY" (Diffuser, Komeito 1515-X)
@@ -283,7 +285,7 @@ module.exports = {
     4026: 1, // "ZIGBEE_WATER_SENSOR"
     4256: 4 // "ZIGBEE_SWITCH_4"
   },
-  
+
   unsupportedDevices: {
     10: 0, // "OSPF"
     12: 0, // "EW-RE"
@@ -291,7 +293,6 @@ module.exports = {
     16: 0, // "COLD_WARM_LED"
     17: 0, // "THREE_GEAR_FAN"
     18: 0, // "SENSORS_CENTER"
-    19: 0, // "HUMIDIFIER"
     23: 0, // "NEST_THERMOSTAT"
     26: 0, // "RuiMiTeWenKongQi"
     33: 0, // "LIGHT_BELT",

From a81eaaf9ca5d457508161c4d16d731b2da7f8b69 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 20 Feb 2021 20:44:39 +0000
Subject: [PATCH 1528/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 47424746..9cbd834c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
   * 'My Devices' shows the firmware version for your device
 * **New Devices**
   * Support for eWeLink switch uiid 81, 82, 83, 84 and 107 device types
+  * Support for the 'Sonoff Hum' humidifier device (on/off and mode)
 
 ### Changes
 

From 83a7bc45fe7afc56d08411c649b805c3761d54a3 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 20 Feb 2021 20:47:50 +0000
Subject: [PATCH 1529/3183] 5.0.0-10

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index e9447943..2a4c9374 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "5.0.0-9",
+  "version": "5.0.0-10",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 0f512b93..90fa55c7 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "5.0.0-9",
+  "version": "5.0.0-10",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From df2af4157e51c80858834dea22504d6e151f99ed Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 21 Feb 2021 08:28:10 +0000
Subject: [PATCH 1530/3183] correct rotation speeds in comment

---
 lib/device/humidifier.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/device/humidifier.js b/lib/device/humidifier.js
index 3b3e2ab0..f7f2be2f 100644
--- a/lib/device/humidifier.js
+++ b/lib/device/humidifier.js
@@ -21,7 +21,7 @@ module.exports = class deviceHumidifier {
     /*
       The device does not provide a current humidity reading so
       we use a fan accessory to be able to control the on/off state
-      and the modes (1, 2, 3) using a rotation speed of (25%, 50%, 75%)
+      and the modes (1, 2, 3) using a rotation speed of (33%, 66%, 99%)
     */
 
     // Add the fan service if it doesn't already exist

From c08932ea59ba2484f6eb49e68cec89dd71fb6d24 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 22 Feb 2021 12:51:03 +0000
Subject: [PATCH 1531/3183] eve door information

---
 lib/device/sensor-contact.js        | 91 +++++++++++++++++++++++++++-
 lib/device/zigbee/sensor-contact.js | 92 ++++++++++++++++++++++++++++-
 lib/utils/constants.js              |  5 +-
 3 files changed, 181 insertions(+), 7 deletions(-)

diff --git a/lib/device/sensor-contact.js b/lib/device/sensor-contact.js
index 0644a1d4..c8b723a8 100644
--- a/lib/device/sensor-contact.js
+++ b/lib/device/sensor-contact.js
@@ -40,8 +40,63 @@ module.exports = class deviceSensorContact {
       })
       this.value = this.getDefaultValue()
     }
+    this.eveResetTotal = function () {
+      self.hapChar.call(this, 'Reset Total', self.consts.eve.resetTotal)
+      this.setProps({
+        format: self.hapChar.Formats.UINT32,
+        unit: self.hapChar.Units.seconds,
+        perms: [
+          self.hapChar.Perms.READ,
+          self.hapChar.Perms.NOTIFY,
+          self.hapChar.Perms.WRITE
+        ]
+      })
+      this.value = this.getDefaultValue()
+    }
+    this.eveOpenDuration = function () {
+      self.hapChar.call(this, 'Open Duration', self.consts.eve.openDuration)
+      this.setProps({
+        format: self.hapChar.Formats.UINT32,
+        unit: self.hapChar.Units.SECONDS,
+        perms: [
+          self.hapChar.Perms.READ,
+          self.hapChar.Perms.NOTIFY,
+          self.hapChar.Perms.WRITE
+        ]
+      })
+      this.value = this.getDefaultValue()
+    }
+    this.eveClosedDuration = function () {
+      self.hapChar.call(this, 'Closed Duration', self.consts.eve.closedDuration)
+      this.setProps({
+        format: self.hapChar.Formats.UINT32,
+        unit: self.hapChar.Units.SECONDS,
+        perms: [
+          self.hapChar.Perms.READ,
+          self.hapChar.Perms.NOTIFY,
+          self.hapChar.Perms.WRITE
+        ]
+      })
+      this.value = this.getDefaultValue()
+    }
+    this.eveTimesOpened = function () {
+      self.hapChar.call(this, 'Times Opened', self.consts.eve.timesOpened)
+      this.setProps({
+        format: self.hapChar.Formats.UINT32,
+        perms: [self.hapChar.Perms.READ, self.hapChar.Perms.NOTIFY]
+      })
+      this.value = this.getDefaultValue()
+    }
     this.inherits(this.eveLastActivation, this.hapChar)
+    this.inherits(this.eveResetTotal, this.hapChar)
+    this.inherits(this.eveOpenDuration, this.hapChar)
+    this.inherits(this.eveClosedDuration, this.hapChar)
+    this.inherits(this.eveTimesOpened, this.hapChar)
     this.eveLastActivation.UUID = this.consts.eve.lastActivation
+    this.eveResetTotal.UUID = this.consts.eve.resetTotal
+    this.eveOpenDuration.UUID = this.consts.eve.openDuration
+    this.eveClosedDurationn.UUID = this.consts.eve.closedDuration
+    this.eveTimesOpened.UUID = this.consts.eve.timesOpened
 
     // If the accessory has a leak sensor service then remove it
     if (this.accessory.getService(this.hapServ.LeakSensor)) {
@@ -52,6 +107,30 @@ module.exports = class deviceSensorContact {
     this.contactService = this.accessory.getService(this.hapServ.ContactSensor) ||
       this.accessory.addService(this.hapServ.ContactSensor)
 
+    // Add the Eve characteristics if they don't already exist
+    if (!this.contactService.testCharacteristic(this.eveLastActivation)) {
+      this.contactService.addCharacteristic(this.eveLastActivation)
+    }
+    if (!this.contactService.testCharacteristic(this.eveResetTotal)) {
+      this.contactService.addCharacteristic(this.eveResetTotal)
+    }
+    if (!this.contactService.testCharacteristic(this.eveOpenDuration)) {
+      this.contactService.addCharacteristic(this.eveOpenDuration)
+    }
+    if (!this.contactService.testCharacteristic(this.eveClosedDuration)) {
+      this.contactService.addCharacteristic(this.eveClosedDuration)
+    }
+    if (!this.contactService.testCharacteristic(this.eveTimesOpened)) {
+      this.contactService.addCharacteristic(this.eveTimesOpened)
+    }
+    this.timesOpened = this.contactService.getCharacteristic(this.eveTimesOpened).value
+    this.contactService.getCharacteristic(this.eveResetTotal)
+      .on('set', (value, callback) => {
+        callback()
+        this.timesOpened = 0
+        this.contactService.updateCharacteristic(this.eveTimesOpened, 0)
+      })
+
     // Add the battery service if it doesn't already exist
     this.batteryService = this.accessory.getService(this.hapServ.BatteryService) ||
       this.accessory.addService(this.hapServ.BatteryService)
@@ -89,13 +168,19 @@ module.exports = class deviceSensorContact {
       }
       this.cacheOnOff = params.switch
       const newState = params.switch === 'on' ? 1 : 0
-      this.contactService.updateCharacteristic(this.hapChar.ContactSensorState, newState)
-      this.accessory.eveService.addEntry({ status: newState })
       if (newState) {
+        this.contactService.updateCharacteristic(this.hapChar.ContactSensorState, 1)
+        this.accessory.eveService.addEntry({ status: 1 })
+        const initialTime = this.accessory.eveService.getInitialTime()
         this.contactService.updateCharacteristic(
           this.eveLastActivation,
-          Math.round(new Date().valueOf() / 1000) - this.accessory.eveService.getInitialTime()
+          Math.round(new Date().valueOf() / 1000) - initialTime
         )
+        this.timesOpened++
+        this.contactService.updateCharacteristic(this.eveTimesOpened, this.timesOpened)
+      } else {
+        this.contactService.updateCharacteristic(this.hapChar.ContactSensorState, 0)
+        this.accessory.eveService.addEntry({ status: 0 })
       }
       if (params.updateSource && !this.disableDeviceLogging) {
         this.log('[%s] current state [contact%s detected].', this.name, newState === 0 ? '' : ' not')
diff --git a/lib/device/zigbee/sensor-contact.js b/lib/device/zigbee/sensor-contact.js
index b378ff33..758e8331 100644
--- a/lib/device/zigbee/sensor-contact.js
+++ b/lib/device/zigbee/sensor-contact.js
@@ -41,12 +41,91 @@ module.exports = class deviceZBSensorContact {
       })
       this.value = this.getDefaultValue()
     }
+    this.eveResetTotal = function () {
+      self.hapChar.call(this, 'Reset Total', self.consts.eve.resetTotal)
+      this.setProps({
+        format: self.hapChar.Formats.UINT32,
+        unit: self.hapChar.Units.seconds,
+        perms: [
+          self.hapChar.Perms.READ,
+          self.hapChar.Perms.NOTIFY,
+          self.hapChar.Perms.WRITE
+        ]
+      })
+      this.value = this.getDefaultValue()
+    }
+    this.eveOpenDuration = function () {
+      self.hapChar.call(this, 'Open Duration', self.consts.eve.openDuration)
+      this.setProps({
+        format: self.hapChar.Formats.UINT32,
+        unit: self.hapChar.Units.SECONDS,
+        perms: [
+          self.hapChar.Perms.READ,
+          self.hapChar.Perms.NOTIFY,
+          self.hapChar.Perms.WRITE
+        ]
+      })
+      this.value = this.getDefaultValue()
+    }
+    this.eveClosedDuration = function () {
+      self.hapChar.call(this, 'Closed Duration', self.consts.eve.closedDuration)
+      this.setProps({
+        format: self.hapChar.Formats.UINT32,
+        unit: self.hapChar.Units.SECONDS,
+        perms: [
+          self.hapChar.Perms.READ,
+          self.hapChar.Perms.NOTIFY,
+          self.hapChar.Perms.WRITE
+        ]
+      })
+      this.value = this.getDefaultValue()
+    }
+    this.eveTimesOpened = function () {
+      self.hapChar.call(this, 'Times Opened', self.consts.eve.timesOpened)
+      this.setProps({
+        format: self.hapChar.Formats.UINT32,
+        perms: [self.hapChar.Perms.READ, self.hapChar.Perms.NOTIFY]
+      })
+      this.value = this.getDefaultValue()
+    }
     this.inherits(this.eveLastActivation, this.hapChar)
+    this.inherits(this.eveResetTotal, this.hapChar)
+    this.inherits(this.eveOpenDuration, this.hapChar)
+    this.inherits(this.eveClosedDuration, this.hapChar)
+    this.inherits(this.eveTimesOpened, this.hapChar)
     this.eveLastActivation.UUID = this.consts.eve.lastActivation
+    this.eveResetTotal.UUID = this.consts.eve.resetTotal
+    this.eveOpenDuration.UUID = this.consts.eve.openDuration
+    this.eveClosedDurationn.UUID = this.consts.eve.closedDuration
+    this.eveTimesOpened.UUID = this.consts.eve.timesOpened
 
     // Add the contact sensor service if it doesn't already exist
     this.service = this.accessory.getService(this.hapServ.ContactSensor) ||
       this.accessory.addService(this.hapServ.ContactSensor)
+    
+    // Add the Eve characteristics if they don't already exist
+    if (!this.service.testCharacteristic(this.eveLastActivation)) {
+      this.service.addCharacteristic(this.eveLastActivation)
+    }
+    if (!this.service.testCharacteristic(this.eveResetTotal)) {
+      this.service.addCharacteristic(this.eveResetTotal)
+    }
+    if (!this.service.testCharacteristic(this.eveOpenDuration)) {
+      this.service.addCharacteristic(this.eveOpenDuration)
+    }
+    if (!this.service.testCharacteristic(this.eveClosedDuration)) {
+      this.service.addCharacteristic(this.eveClosedDuration)
+    }
+    if (!this.service.testCharacteristic(this.eveTimesOpened)) {
+      this.service.addCharacteristic(this.eveTimesOpened)
+    }
+    this.timesOpened = this.service.getCharacteristic(this.eveTimesOpened).value
+    this.service.getCharacteristic(this.eveResetTotal)
+      .on('set', (value, callback) => {
+        callback()
+        this.timesOpened = 0
+        this.service.updateCharacteristic(this.eveTimesOpened, 0)
+      })
 
     // Add the battery service if it doesn't already exist
     this.battService = this.accessory.getService(this.hapServ.BatteryService) ||
@@ -81,13 +160,20 @@ module.exports = class deviceZBSensorContact {
       }
       if (this.funcs.hasProperty(params, 'lock') && [0, 1].includes(params.lock)) {
         this.service.updateCharacteristic(this.hapChar.ContactSensorState, params.lock)
-        if (params.lock === 1) {
+        if (params.lock === 1)
+          this.service.updateCharacteristic(this.hapChar.ContactSensorState, 1)
+          this.accessory.eveService.addEntry({ status: 1 })
+          const initialTime = this.accessory.eveService.getInitialTime()
           this.service.updateCharacteristic(
             this.eveLastActivation,
-            Math.round(new Date().valueOf() / 1000) - this.accessory.eveService.getInitialTime()
+            Math.round(new Date().valueOf() / 1000) - initialTime
           )
+          this.timesOpened++
+          this.service.updateCharacteristic(this.eveTimesOpened, this.timesOpened)
+        } else {
+          this.service.updateCharacteristic(this.hapChar.ContactSensorState, 0)
+          this.accessory.eveService.addEntry({ status: 0 })
         }
-        this.accessory.eveService.addEntry({ status: params.lock })
         if (params.updateSource && !this.disableDeviceLogging) {
           this.log('[%s] current state [contact%s detected].', this.name, params.lock === 0 ? '' : ' not')
         }
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 2f89bf8c..9a5fe8b4 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -221,7 +221,10 @@ module.exports = {
     voltage: 'E863F10A-079E-48FF-8F27-9C2605A29F52',
     electricCurrent: 'E863F126-079E-48FF-8F27-9C2605A29F52',
     resetTotal: 'E863F112-079E-48FF-8F27-9C2605A29F52',
-    lastActivation: 'E863F11A-079E-48FF-8F27-9C2605A29F52'
+    lastActivation: 'E863F11A-079E-48FF-8F27-9C2605A29F52',
+    openDuration: 'E863F118-079E-48FF-8F27-9C2605A29F52',
+    closedDuration: 'E863F119-079E-48FF-8F27-9C2605A29F52',
+    timesOpened: 'E863F129-079E-48FF-8F27-9C2605A29F52'
   },
 
   defaultMultiSwitchOff: [

From a51c7a52468c7225907e895a7b6abf8c39ced7dd Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 22 Feb 2021 12:51:06 +0000
Subject: [PATCH 1532/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9cbd834c..28f1370f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,10 @@ All notable changes to this homebridge-ewelink will be documented in this file.
   * New `brightnessStep` option to specify a minimum brightness step in the Home app per dimmer/bulb/LED strip
   * New `adaptiveLightingShift` option to offset the Adaptive Lighting values per bulb
   * `showAsOutlet` option extended multi-channel switch and light switch devices to expose them as outlets
+* **Accessories**
+  * Enhanced Eve information available for contact sensors:
+    * DW2
+    * Zigbee Contact Sensor
 * **Accessory Simulations**
   * Expose a DW2 contact sensor as a leak sensor
   * Sub-accessories will be removed automatically when setting up a new Accessory Simulation

From e16622941de95ffd29c9823697c4ff9275de2980 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 22 Feb 2021 12:51:32 +0000
Subject: [PATCH 1533/3183] 5.0.0-11

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 2a4c9374..0648c019 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "5.0.0-10",
+  "version": "5.0.0-11",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 90fa55c7..475cf0fa 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "5.0.0-10",
+  "version": "5.0.0-11",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 2d6f616210148a3ff598b203ad5483519a6c6d55 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 22 Feb 2021 14:00:48 +0000
Subject: [PATCH 1534/3183] show uuid for unsupported device

---
 lib/index.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/index.js b/lib/index.js
index 03ff81dd..247a953b 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1122,7 +1122,8 @@ class eWeLinkPlatform {
         /**************
         UNKNOWN DEVICES
         **************/
-        this.log.warn('[%s] %s.', device.name, this.messages.devNotSupYet)
+        const uiid = device.extra.uiid || '?'
+        this.log.warn('[%s] %s [%s].', device.name, this.messages.devNotSupYet, uiid)
         return
         /*************/
       }

From 54ec12245203fd8cc3f866ee41713e906fb30fdc Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 22 Feb 2021 14:29:17 +0000
Subject: [PATCH 1535/3183] comments + logging

---
 lib/device/curtain.js | 42 +++++++++++++++++++++++++++++++++++++-----
 1 file changed, 37 insertions(+), 5 deletions(-)

diff --git a/lib/device/curtain.js b/lib/device/curtain.js
index 17ede1d4..ddaa3e09 100644
--- a/lib/device/curtain.js
+++ b/lib/device/curtain.js
@@ -17,6 +17,12 @@ module.exports = class deviceCurtain {
     // Set up variables from the accessory
     this.name = accessory.displayName
     this.accessory = accessory
+    
+    /*
+      This device's parameters are:
+      switch: str{'on'=OPEN, 'off'=CLOSED}
+      setclose: int[0=OPEN, 100=CLOSED] 
+    */
 
     // Set up custom variables for this device type
     const deviceId = this.accessory.context.eweDeviceId
@@ -42,28 +48,53 @@ module.exports = class deviceCurtain {
 
   async internalUpdate (value, callback) {
     try {
+      // Call callback() first to avoid any 'No Response' errors in HomeKit
       callback()
+      
+      // Create the params object to send
       const params = {}
-      if ([0, 100].includes(value)) {
-        params.switch = value === 100 ? 'on' : 'off'
+      
+      // Update the cache with the new position
+      this.cachePosition = value
+      
+      // If we are to fully open/close the curtain we can use the switch param
+      if ([0, 100].includes(this.cachePosition)) {
+        // 'on' for fully open and 'off' for fully close
+        params.switch = this.cachePosition === 100 ? 'on' : 'off'
       } else {
-        params.setclose = Math.abs(100 - value)
+        // Otherwise for a %-point we can use the setclose param
+        params.setclose = Math.abs(100 - this.cachePosition)
       }
+      
+      // Send the device update
       await this.platform.sendDeviceUpdate(this.accessory, params)
+      
+      // Log the update if appropriate
+      if (!this.disableDeviceLogging) {
+        this.log('[%s] current position [%s].', this.name, this.cachePosition)
+      }
     } catch (err) {
+      // Catch any errors and let the platform display them
       this.platform.deviceUpdateError(this.accessory, err, true)
     }
   }
 
   async externalUpdate (params) {
     try {
+      // Don't continue if there are no useful parameters
       if (!params.switch && !this.funcs.hasProperty(params, 'setclose')) {
         return
       }
+      
+      // setclose is 0=OPEN 100=CLOSED whereas HomeKit is 0=CLOSED 100=OPEN
       const newPos = Math.abs(100 - parseInt(params.setclose))
+      
+      // Update HomeKit with the provided value
       this.service.updateCharacteristic(this.hapChar.TargetPosition, newPos)
-        .updateCharacteristic(this.hapChar.CurrentPosition, newPos)
-        .updateCharacteristic(this.hapChar.PositionState, 2)
+      this.service.updateCharacteristic(this.hapChar.CurrentPosition, newPos)
+      this.service.updateCharacteristic(this.hapChar.PositionState, 2)
+      
+      // Only update the cache and log if the provided value has changed
       if (params.updateSource && this.cachePosition !== newPos) {
         this.cachePosition = newPos
         if (!this.disableDeviceLogging) {
@@ -71,6 +102,7 @@ module.exports = class deviceCurtain {
         }
       }
     } catch (err) {
+      // Catch any errors and let the platform display them
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }

From cf784b0b7e4e039dfba0daf3932ff29be35d0d7f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 22 Feb 2021 14:29:27 +0000
Subject: [PATCH 1536/3183] comments + brightness values

---
 lib/device/diffuser.js | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/lib/device/diffuser.js b/lib/device/diffuser.js
index 1a02836d..575bc3af 100644
--- a/lib/device/diffuser.js
+++ b/lib/device/diffuser.js
@@ -68,13 +68,22 @@ module.exports = class deviceDiffuser {
 
   async internalDiffuserOnOffUpdate (value, callback) {
     try {
+      // Call callback() first to avoid any 'No Response' errors in HomeKit
       callback()
+      
+      // Don't continue if the requested new state is the same as the current state
       const onoff = value ? 'on' : 'off'
       if (this.cacheOnOff === onoff) {
         return
       }
+      
+      // Update the cache with the new state
       this.cacheOnOff = onoff
+      
+      // Create the params object to send
       const params = { switch: this.cacheOnOff }
+      
+      // Set up a ten second timeout for the plugin to ignore incoming updates
       const timerKey = Math.random().toString(36).substr(2, 8)
       this.updateTimeout = timerKey
       setTimeout(() => {
@@ -82,44 +91,72 @@ module.exports = class deviceDiffuser {
           this.updateTimeout = false
         }
       }, 10000)
+      
+      // Send the device update
       await this.platform.sendDeviceUpdate(this.accessory, params)
+      
+      // Log the update if appropriate
       if (!this.disableDeviceLogging) {
         this.log('[%s] current state [%s].', this.name, this.cacheOnOff)
       }
     } catch (err) {
+      // Catch any errors and let the platform display them
       this.platform.deviceUpdateError(this.accessory, err, true)
     }
   }
 
   async internalDiffuserSpeedUpdate (value, callback) {
     try {
+      // Call callback() first to avoid any 'No Response' errors in HomeKit
       callback()
+      
+      // Don't continue if turning off as this will be handled by on/off handler
       if (value === 0) {
         return
       }
+      
+      // The new speed can be {50, 100} so use rounding on the new value
       const newSpeed = value <= 75 ? 50 : 100
+      
+      // Check the rounded speed against the current cache value
       if (newSpeed === this.cacheSpeed) {
         return
       }
+      
+      // Update the cache value with the new speed
       this.cacheSpeed = newSpeed
+      
+      // Create the params object, mapping the state to {50, 100} -> {1, 2}
       const params = { state: this.cacheSpeed / 50 }
+      
+      // This acts like a debounce function when endlessly sliding the brightness scale
       const updateKeySpeed = Math.random().toString(36).substr(2, 8)
       this.updateKeySpeed = updateKeySpeed
       await this.funcs.sleep(450)
       if (updateKeySpeed !== this.updateKeySpeed) {
         return
       }
+      
+      // Update the brightness with the new value as some apps don't support minStep
+      this.fanService.updateCharacteristic(this.hapChar.RotationSpeed, this.cacheSpeed)
+      
+      // Set up a ten second timeout for the plugin to ignore incoming updates
       this.updateTimeout = updateKeySpeed
       setTimeout(() => {
         if (this.updateTimeout === updateKeySpeed) {
           this.updateTimeout = false
         }
       }, 10000)
+      
+      // Send the device update
       await this.platform.sendDeviceUpdate(this.accessory, params)
+      
+      // Log the update if appropriate
       if (!this.disableDeviceLogging) {
         this.log('[%s] current speed [%s%].', this.name, newSpeed)
       }
     } catch (err) {
+      // Catch any errors and let the platform display them
       this.platform.deviceUpdateError(this.accessory, err, true)
     }
   }

From 13e52e529b560de889b5cf19d1a94eefcc660a54 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 22 Feb 2021 16:08:07 +0000
Subject: [PATCH 1537/3183] custom 406 message

---
 lib/connection/ws.js   | 9 +++++++--
 lib/utils/constants.js | 1 +
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/lib/connection/ws.js b/lib/connection/ws.js
index 2be93d53..d9a15a87 100644
--- a/lib/connection/ws.js
+++ b/lib/connection/ws.js
@@ -147,10 +147,15 @@ module.exports = class connectionWS {
           }
         } else {
           // There was a problem with the authentication response
-          throw new Error(this.messages.wsLoginErr + '\n' + JSON.stringify(res, null, 2))
+          if (res.error === 406) {
+            this.log.warn(this.messages.wsLogin406)
+          } else {
+            const str = JSON.stringify(res, null, 2)
+            throw new Error(this.messages.wsLoginErr + '\n' + str)
+          }
         }
       } catch (err) {
-        // Catch any errors authenicating the WS connection
+        // Catch any errors authenticating the WS connection
         const eText = this.funcs.parseError(err)
         this.log.warn('%s %s.', this.messages.wsLoginError, eText)
       }
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 9a5fe8b4..ddc7ea26 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -119,6 +119,7 @@ module.exports = {
     wsLoginErr: 'Unknown WS parameters received',
     wsLoginError: 'WS login failed as',
     wsLoginSuccess: 'WS login successful',
+    wsLogin406: 'WS login failed [406] please see http://bit.ly/hb-ewelink-err-406',
     wsPingError: 'Cound not send WS ping as',
     wsRec: 'WS message received',
     wsReconnect: 'Web socket closed and will try to reconnect in 5 seconds',

From a0e12eba701d4652184035a0e254d116a9194492 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 22 Feb 2021 23:44:19 +0000
Subject: [PATCH 1538/3183] formatting

---
 lib/device/curtain.js  | 20 ++++++++++----------
 lib/device/diffuser.js | 32 ++++++++++++++++----------------
 2 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/lib/device/curtain.js b/lib/device/curtain.js
index ddaa3e09..d4e24589 100644
--- a/lib/device/curtain.js
+++ b/lib/device/curtain.js
@@ -17,11 +17,11 @@ module.exports = class deviceCurtain {
     // Set up variables from the accessory
     this.name = accessory.displayName
     this.accessory = accessory
-    
+
     /*
       This device's parameters are:
       switch: str{'on'=OPEN, 'off'=CLOSED}
-      setclose: int[0=OPEN, 100=CLOSED] 
+      setclose: int[0=OPEN, 100=CLOSED]
     */
 
     // Set up custom variables for this device type
@@ -50,13 +50,13 @@ module.exports = class deviceCurtain {
     try {
       // Call callback() first to avoid any 'No Response' errors in HomeKit
       callback()
-      
+
       // Create the params object to send
       const params = {}
-      
+
       // Update the cache with the new position
       this.cachePosition = value
-      
+
       // If we are to fully open/close the curtain we can use the switch param
       if ([0, 100].includes(this.cachePosition)) {
         // 'on' for fully open and 'off' for fully close
@@ -65,10 +65,10 @@ module.exports = class deviceCurtain {
         // Otherwise for a %-point we can use the setclose param
         params.setclose = Math.abs(100 - this.cachePosition)
       }
-      
+
       // Send the device update
       await this.platform.sendDeviceUpdate(this.accessory, params)
-      
+
       // Log the update if appropriate
       if (!this.disableDeviceLogging) {
         this.log('[%s] current position [%s].', this.name, this.cachePosition)
@@ -85,15 +85,15 @@ module.exports = class deviceCurtain {
       if (!params.switch && !this.funcs.hasProperty(params, 'setclose')) {
         return
       }
-      
+
       // setclose is 0=OPEN 100=CLOSED whereas HomeKit is 0=CLOSED 100=OPEN
       const newPos = Math.abs(100 - parseInt(params.setclose))
-      
+
       // Update HomeKit with the provided value
       this.service.updateCharacteristic(this.hapChar.TargetPosition, newPos)
       this.service.updateCharacteristic(this.hapChar.CurrentPosition, newPos)
       this.service.updateCharacteristic(this.hapChar.PositionState, 2)
-      
+
       // Only update the cache and log if the provided value has changed
       if (params.updateSource && this.cachePosition !== newPos) {
         this.cachePosition = newPos
diff --git a/lib/device/diffuser.js b/lib/device/diffuser.js
index 575bc3af..db8c51c3 100644
--- a/lib/device/diffuser.js
+++ b/lib/device/diffuser.js
@@ -70,19 +70,19 @@ module.exports = class deviceDiffuser {
     try {
       // Call callback() first to avoid any 'No Response' errors in HomeKit
       callback()
-      
+
       // Don't continue if the requested new state is the same as the current state
       const onoff = value ? 'on' : 'off'
       if (this.cacheOnOff === onoff) {
         return
       }
-      
+
       // Update the cache with the new state
       this.cacheOnOff = onoff
-      
+
       // Create the params object to send
       const params = { switch: this.cacheOnOff }
-      
+
       // Set up a ten second timeout for the plugin to ignore incoming updates
       const timerKey = Math.random().toString(36).substr(2, 8)
       this.updateTimeout = timerKey
@@ -91,10 +91,10 @@ module.exports = class deviceDiffuser {
           this.updateTimeout = false
         }
       }, 10000)
-      
+
       // Send the device update
       await this.platform.sendDeviceUpdate(this.accessory, params)
-      
+
       // Log the update if appropriate
       if (!this.disableDeviceLogging) {
         this.log('[%s] current state [%s].', this.name, this.cacheOnOff)
@@ -109,26 +109,26 @@ module.exports = class deviceDiffuser {
     try {
       // Call callback() first to avoid any 'No Response' errors in HomeKit
       callback()
-      
+
       // Don't continue if turning off as this will be handled by on/off handler
       if (value === 0) {
         return
       }
-      
+
       // The new speed can be {50, 100} so use rounding on the new value
       const newSpeed = value <= 75 ? 50 : 100
-      
+
       // Check the rounded speed against the current cache value
       if (newSpeed === this.cacheSpeed) {
         return
       }
-      
+
       // Update the cache value with the new speed
       this.cacheSpeed = newSpeed
-      
+
       // Create the params object, mapping the state to {50, 100} -> {1, 2}
       const params = { state: this.cacheSpeed / 50 }
-      
+
       // This acts like a debounce function when endlessly sliding the brightness scale
       const updateKeySpeed = Math.random().toString(36).substr(2, 8)
       this.updateKeySpeed = updateKeySpeed
@@ -136,10 +136,10 @@ module.exports = class deviceDiffuser {
       if (updateKeySpeed !== this.updateKeySpeed) {
         return
       }
-      
+
       // Update the brightness with the new value as some apps don't support minStep
       this.fanService.updateCharacteristic(this.hapChar.RotationSpeed, this.cacheSpeed)
-      
+
       // Set up a ten second timeout for the plugin to ignore incoming updates
       this.updateTimeout = updateKeySpeed
       setTimeout(() => {
@@ -147,10 +147,10 @@ module.exports = class deviceDiffuser {
           this.updateTimeout = false
         }
       }, 10000)
-      
+
       // Send the device update
       await this.platform.sendDeviceUpdate(this.accessory, params)
-      
+
       // Log the update if appropriate
       if (!this.disableDeviceLogging) {
         this.log('[%s] current speed [%s%].', this.name, newSpeed)

From a5d15891aff16e634eb980b051b8f57ecb62185e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 22 Feb 2021 23:44:27 +0000
Subject: [PATCH 1539/3183] syntax

---
 lib/device/zigbee/sensor-contact.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/device/zigbee/sensor-contact.js b/lib/device/zigbee/sensor-contact.js
index 758e8331..08d10440 100644
--- a/lib/device/zigbee/sensor-contact.js
+++ b/lib/device/zigbee/sensor-contact.js
@@ -102,7 +102,7 @@ module.exports = class deviceZBSensorContact {
     // Add the contact sensor service if it doesn't already exist
     this.service = this.accessory.getService(this.hapServ.ContactSensor) ||
       this.accessory.addService(this.hapServ.ContactSensor)
-    
+
     // Add the Eve characteristics if they don't already exist
     if (!this.service.testCharacteristic(this.eveLastActivation)) {
       this.service.addCharacteristic(this.eveLastActivation)
@@ -160,7 +160,7 @@ module.exports = class deviceZBSensorContact {
       }
       if (this.funcs.hasProperty(params, 'lock') && [0, 1].includes(params.lock)) {
         this.service.updateCharacteristic(this.hapChar.ContactSensorState, params.lock)
-        if (params.lock === 1)
+        if (params.lock === 1) {
           this.service.updateCharacteristic(this.hapChar.ContactSensorState, 1)
           this.accessory.eveService.addEntry({ status: 1 })
           const initialTime = this.accessory.eveService.getInitialTime()

From c8af1eae4e1ef889d9d687a42988891d8392f258 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 23 Feb 2021 09:52:06 +0000
Subject: [PATCH 1540/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 28f1370f..8511f873 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -31,6 +31,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 * New plugin configuration format - [more info](https://gist.github.com/bwp91/e87d9d3eb0e5dbc08e9ae7b31e33366e)
 * Device firmware version will now show correctly in HomeKit apps
+* Information about error 406 added to the logs in the form of a link (shown when error is received)
 
 ## 4.7.6 (2021-02-17)
 

From 21aa0b8b99d8b584914cfe7e79527ab72f4c5de0 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 23 Feb 2021 09:52:42 +0000
Subject: [PATCH 1541/3183] 5.0.0-12

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 0648c019..ceb4e7bd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "5.0.0-11",
+  "version": "5.0.0-12",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 475cf0fa..3118c482 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "5.0.0-11",
+  "version": "5.0.0-12",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 5dfa3e54982eb4db8f29bc39084c2a8aa4cfe4c8 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 23 Feb 2021 15:03:49 +0000
Subject: [PATCH 1542/3183] min node to 14.16.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 3118c482..53d0f296 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
   "main": "lib/index.js",
   "engines": {
     "homebridge": "^1.1.7",
-    "node": "^14.15.5"
+    "node": "^14.16.0"
   },
   "repository": {
     "type": "git",

From cc6122f831060aae96b39f961ea64e4fd49de426 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 23 Feb 2021 15:03:52 +0000
Subject: [PATCH 1543/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8511f873..3310d3ed 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -32,6 +32,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 * New plugin configuration format - [more info](https://gist.github.com/bwp91/e87d9d3eb0e5dbc08e9ae7b31e33366e)
 * Device firmware version will now show correctly in HomeKit apps
 * Information about error 406 added to the logs in the form of a link (shown when error is received)
+* Updated minimum Node to v14.16.0
 
 ## 4.7.6 (2021-02-17)
 

From f4b4e41c572cf8b42a1b3841ae3e19ee6c59a8e0 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 23 Feb 2021 15:28:46 +0000
Subject: [PATCH 1544/3183] Update colour-utils.js

---
 lib/utils/colour-utils.js | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/lib/utils/colour-utils.js b/lib/utils/colour-utils.js
index 68cdc1a4..e713898b 100644
--- a/lib/utils/colour-utils.js
+++ b/lib/utils/colour-utils.js
@@ -35,13 +35,9 @@ module.exports = {
         rgb = [255, p, q]
         break
     }
-    if (rgb[0] === 255) {
-      rgb[1] *= 0.8
-      rgb[2] *= 0.8
-      if (rgb[1] <= 25 && rgb[2] <= 25) {
-        rgb[1] = 0
-        rgb[2] = 0
-      }
+    if (rgb[0] === 255 && rgb[1] <= 25 && rgb[2] <= 25) {
+      rgb[1] = 0
+      rgb[2] = 0
     }
     return [Math.round(rgb[0]), Math.round(rgb[1]), Math.round(rgb[2])]
   },

From 73ddf9541104ced92329778e6b968ba694cec36a Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 23 Feb 2021 15:35:16 +0000
Subject: [PATCH 1545/3183] separate lang

---
 lib/index.js           |  2 +-
 lib/utils/constants.js | 82 ----------------------------------------
 lib/utils/messages.js  | 85 ++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 86 insertions(+), 83 deletions(-)
 create mode 100644 lib/utils/messages.js

diff --git a/lib/index.js b/lib/index.js
index 247a953b..5ec06e0a 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -15,7 +15,7 @@ class eWeLinkPlatform {
 
     // Retrieve the necessary constants and functions before starting
     this.consts = require('./utils/constants')
-    this.messages = this.consts.messages
+    this.messages = require('./utils/messages')
     this.funcs = require('./utils/functions')
 
     // Begin plugin initialisation
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index ddc7ea26..675326b2 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -49,88 +49,6 @@ module.exports = {
     adaptiveLightingShift: 0
   },
 
-  messages: {
-    cantReadPacket: 'LAN message received could not be read as',
-    cantParsePacket: 'Could not parse DNS packet as',
-    cfgDef: 'is not a valid number so using default of',
-    cfgIgn: 'is not configured correctly so ignoring',
-    cfgIgnItem: 'has an invalid entry which will be ignored',
-    cfgItem: 'Config entry',
-    cfgLow: 'is set too low so increasing to',
-    cfgRmv: 'is unused and can be removed',
-    cfgQts: 'should not have quotes around its entry',
-    complete: '✓ Setup complete',
-    devAdd: 'has been added to Homebridge',
-    devInit: 'initialised and',
-    devInitOpts: 'initialising with options',
-    devNewNotAdd: 'restart Homebridge to add new device, failed to add automatically as',
-    devNoAPIKey: 'cannot retrieve device API key',
-    devNotAdd: 'could not be added to Homebridge as',
-    devNotConf: 'could not be configured as',
-    devNotFound: 'device not found in eWeLink',
-    devNotInit: 'could not be initialised as',
-    devNotConfLAN: 'device not configurable via LAN mode',
-    devNotReachLAN: 'device not reachable via LAN mode',
-    devNotRf: 'could not be refreshed as',
-    devNotRemove: 'could not be removed from Homebridge as',
-    devNotSup: 'has not been added as it is not supported',
-    devNotSupYet: 'has not been added as it is not supported, please make a GitHub issue',
-    devNotUpd: 'device update failed as',
-    devRemove: 'has been removed from Homebridge',
-    disabled: 'To change this, set disablePlugin to false',
-    disabling: 'Disabling plugin',
-    eweError: 'An eWeLink error [500] occured, retrying in 30 seconds',
-    foundWithIP: 'found locally with IP',
-    hostReceived: 'HTTP API host received',
-    httpRetry: 'Unable to reach eWeLink, retrying in 30 seconds',
-    identify: 'identify button pressed',
-    initialised: 'initialised. Syncing with eWeLink',
-    lanDisabled: 'LAN mode is disabled',
-    lanNotSup: 'LAN mode is not supported for this device',
-    lanUnreachable: 'LAN mode unavailable as unreachable',
-    lanUnsupported: 'LAN mode unavailable as not supported',
-    missingCC: 'eWeLink country code missing from configuration',
-    missingCreds: 'eWeLink credentials missing from configuration',
-    missingPW: 'eWeLink password missing from configuration',
-    missingUN: 'eWeLink username missing from configuration',
-    newRegionRec: 'New HTTP API host received',
-    noAuthRec: 'No auth token received',
-    noRegion: 'Server did not respond with a region',
-    noRegionRec: 'No valid region received',
-    noWSHost: 'Server did not respond with a web socket host',
-    recNew: 'receiving update for new device',
-    repOffline: 'reported [offline]',
-    repOnline: 'reported [online]',
-    revertWS: 'reverting to web socket as',
-    sendGetHost: 'Sending HTTP getHost() request',
-    sendLogin: 'Sending HTTP login() request',
-    sonoffCamera: 'see the homebridge-ewelink wiki for details to enable the camera',
-    stoppedLAN: 'LAN monitoring gracefully stopped',
-    stoppedWS: 'Web socket gracefully closed',
-    unreachable: 'it is unreachable',
-    unsupDev: 'has an unsupported device type',
-    updRec: 'receiving update',
-    updReq: 'requesting current status',
-    updSend: 'sending update',
-    viaLAN: 'via LAN',
-    viaWS: 'via WS',
-    wsHostRec: 'Web socket host received',
-    wsLogin: 'Sending WS login request',
-    wsLoginErr: 'Unknown WS parameters received',
-    wsLoginError: 'WS login failed as',
-    wsLoginSuccess: 'WS login successful',
-    wsLogin406: 'WS login failed [406] please see http://bit.ly/hb-ewelink-err-406',
-    wsPingError: 'Cound not send WS ping as',
-    wsRec: 'WS message received',
-    wsReconnect: 'Web socket closed and will try to reconnect in 5 seconds',
-    wsRef: 'Refreshing WS connection',
-    wsRefFail: 'Refreshing WS connection failed as',
-    wsResend: 'Request will be sent when WS has reconnected',
-    wsUnkAct: 'WS message received has unknown action',
-    wsUnkCmd: 'WS unknown command received',
-    wsUnkRes: 'Unknown WS response'
-  },
-
   welcomeMessages: [
     "Don't forget to ☆ this plugin on GitHub if you're finding it useful!",
     'Have a feature request? Visit http://bit.ly/hb-ewelink-issues to ask!',
diff --git a/lib/utils/messages.js b/lib/utils/messages.js
new file mode 100644
index 00000000..0c9d95c0
--- /dev/null
+++ b/lib/utils/messages.js
@@ -0,0 +1,85 @@
+/* jshint -W014, -W033, esversion: 9 */
+/* eslint-disable new-cap */
+'use strict'
+
+module.exports = {
+  cantReadPacket: 'LAN message received could not be read as',
+  cantParsePacket: 'Could not parse DNS packet as',
+  cfgDef: 'is not a valid number so using default of',
+  cfgIgn: 'is not configured correctly so ignoring',
+  cfgIgnItem: 'has an invalid entry which will be ignored',
+  cfgItem: 'Config entry',
+  cfgLow: 'is set too low so increasing to',
+  cfgRmv: 'is unused and can be removed',
+  cfgQts: 'should not have quotes around its entry',
+  complete: '✓ Setup complete',
+  devAdd: 'has been added to Homebridge',
+  devInit: 'initialised and',
+  devInitOpts: 'initialising with options',
+  devNewNotAdd: 'restart Homebridge to add new device, failed to add automatically as',
+  devNoAPIKey: 'cannot retrieve device API key',
+  devNotAdd: 'could not be added to Homebridge as',
+  devNotConf: 'could not be configured as',
+  devNotFound: 'device not found in eWeLink',
+  devNotInit: 'could not be initialised as',
+  devNotConfLAN: 'device not configurable via LAN mode',
+  devNotReachLAN: 'device not reachable via LAN mode',
+  devNotRf: 'could not be refreshed as',
+  devNotRemove: 'could not be removed from Homebridge as',
+  devNotSup: 'has not been added as it is not supported',
+  devNotSupYet: 'has not been added as it is not supported, please make a GitHub issue',
+  devNotUpd: 'device update failed as',
+  devRemove: 'has been removed from Homebridge',
+  disabled: 'To change this, set disablePlugin to false',
+  disabling: 'Disabling plugin',
+  eweError: 'An eWeLink error [500] occured, retrying in 30 seconds',
+  foundWithIP: 'found locally with IP',
+  hostReceived: 'HTTP API host received',
+  httpRetry: 'Unable to reach eWeLink, retrying in 30 seconds',
+  identify: 'identify button pressed',
+  initialised: 'initialised. Syncing with eWeLink',
+  lanDisabled: 'LAN mode is disabled',
+  lanNotSup: 'LAN mode is not supported for this device',
+  lanUnreachable: 'LAN mode unavailable as unreachable',
+  lanUnsupported: 'LAN mode unavailable as not supported',
+  missingCC: 'eWeLink country code missing from configuration',
+  missingCreds: 'eWeLink credentials missing from configuration',
+  missingPW: 'eWeLink password missing from configuration',
+  missingUN: 'eWeLink username missing from configuration',
+  newRegionRec: 'New HTTP API host received',
+  noAuthRec: 'No auth token received',
+  noRegion: 'Server did not respond with a region',
+  noRegionRec: 'No valid region received',
+  noWSHost: 'Server did not respond with a web socket host',
+  recNew: 'receiving update for new device',
+  repOffline: 'reported [offline]',
+  repOnline: 'reported [online]',
+  revertWS: 'reverting to web socket as',
+  sendGetHost: 'Sending HTTP getHost() request',
+  sendLogin: 'Sending HTTP login() request',
+  sonoffCamera: 'see the homebridge-ewelink wiki for details to enable the camera',
+  stoppedLAN: 'LAN monitoring gracefully stopped',
+  stoppedWS: 'Web socket gracefully closed',
+  unreachable: 'it is unreachable',
+  unsupDev: 'has an unsupported device type',
+  updRec: 'receiving update',
+  updReq: 'requesting current status',
+  updSend: 'sending update',
+  viaLAN: 'via LAN',
+  viaWS: 'via WS',
+  wsHostRec: 'Web socket host received',
+  wsLogin: 'Sending WS login request',
+  wsLoginErr: 'Unknown WS parameters received',
+  wsLoginError: 'WS login failed as',
+  wsLoginSuccess: 'WS login successful',
+  wsLogin406: 'WS login failed [406] please see http://bit.ly/hb-ewelink-err-406',
+  wsPingError: 'Cound not send WS ping as',
+  wsRec: 'WS message received',
+  wsReconnect: 'Web socket closed and will try to reconnect in 5 seconds',
+  wsRef: 'Refreshing WS connection',
+  wsRefFail: 'Refreshing WS connection failed as',
+  wsResend: 'Request will be sent when WS has reconnected',
+  wsUnkAct: 'WS message received has unknown action',
+  wsUnkCmd: 'WS unknown command received',
+  wsUnkRes: 'Unknown WS response'
+}

From 5f385b2b774ff2a4b7a001403e4715a2957d1cf2 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 23 Feb 2021 15:45:03 +0000
Subject: [PATCH 1546/3183] 5.0.0-13

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ceb4e7bd..a09b4c72 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "5.0.0-12",
+  "version": "5.0.0-13",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 53d0f296..753bfc45 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "5.0.0-12",
+  "version": "5.0.0-13",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 4930b212364ceb9abc739043668b842083eab56e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 23 Feb 2021 16:52:33 +0000
Subject: [PATCH 1547/3183] line lengths <= 80 chars

---
 lib/device/diffuser.js                 | 55 +++++++++++++----
 lib/device/fan.js                      | 12 +++-
 lib/device/light-colour.js             | 59 ++++++++++++++----
 lib/device/light-ctemp.js              | 34 +++++++----
 lib/device/light-dimmer.js             |  3 +-
 lib/device/outlet.js                   | 35 ++++++++---
 lib/device/rf-bridge.js                | 24 +++++---
 lib/device/sensor-ambient.js           | 25 ++++++--
 lib/device/sensor-contact.js           | 19 ++++--
 lib/device/simulation/blind.js         | 13 ++--
 lib/device/simulation/garage-eachen.js | 20 ++++--
 lib/device/simulation/garage-four.js   | 13 +++-
 lib/device/simulation/garage-one.js    | 14 ++++-
 lib/device/simulation/garage-two.js    | 24 ++++++--
 lib/device/simulation/sensor-leak.js   | 19 ++++--
 lib/device/simulation/switch-valve.js  |  6 +-
 lib/device/simulation/tap-one.js       |  3 +-
 lib/device/simulation/tap-two.js       | 37 ++++++++----
 lib/device/simulation/thermostat.js    | 50 ++++++++++-----
 lib/device/simulation/valve-four.js    | 84 ++++++++++++++------------
 lib/device/simulation/valve-two.js     | 18 +++---
 lib/device/switch-multi.js             | 79 +++++++++++++++++-------
 lib/device/thermostat.js               |  2 +-
 lib/device/zigbee/sensor-ambient.js    | 29 ++++++---
 lib/device/zigbee/sensor-contact.js    | 16 ++++-
 lib/device/zigbee/sensor-motion.js     | 34 ++++++++---
 lib/device/zigbee/switch-stateless.js  | 21 +++++--
 27 files changed, 529 insertions(+), 219 deletions(-)

diff --git a/lib/device/diffuser.js b/lib/device/diffuser.js
index db8c51c3..f33725d0 100644
--- a/lib/device/diffuser.js
+++ b/lib/device/diffuser.js
@@ -226,10 +226,9 @@ module.exports = class deviceDiffuser {
       callback()
       const updateKeyColour = Math.random().toString(36).substr(2, 8)
       this.updateKeyColour = updateKeyColour
-      const newRGB = this.colourUtils.hs2rgb(
-        value,
-        this.accessory.getService('Light').getCharacteristic(this.hapChar.Saturation).value
-      )
+      const saturation = this.accessory.getService('Light')
+        .getCharacteristic(this.hapChar.Saturation).value
+      const newRGB = this.colourUtils.hs2rgb(value, saturation)
       this.cacheR = newRGB[0]
       this.cacheG = newRGB[0]
       this.cacheB = newRGB[0]
@@ -250,7 +249,13 @@ module.exports = class deviceDiffuser {
       }, 10000)
       await this.platform.sendDeviceUpdate(this.accessory, params)
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current colour [rgb %s %s %s].', this.name, this.cacheR, this.cacheG, this.cacheB)
+        this.log(
+          '[%s] current colour [rgb %s %s %s].',
+          this.name,
+          this.cacheR,
+          this.cacheG,
+          this.cacheB
+        )
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
@@ -272,29 +277,47 @@ module.exports = class deviceDiffuser {
           this.fanService.updateCharacteristic(this.hapChar.RotationSpeed, this.cacheSpeed)
         }
       }
-      if (this.funcs.hasProperty(params, 'state') && params.state * 50 !== this.cacheSpeed) {
+      if (
+        this.funcs.hasProperty(params, 'state') &&
+        params.state * 50 !== this.cacheSpeed
+      ) {
         this.cacheSpeed = params.state * 50
         this.fanService.updateCharacteristic(this.hapChar.RotationSpeed, this.cacheSpeed)
         if (params.updateSource && !this.disableDeviceLogging) {
           this.log('[%s] current speed [%s%].', this.name, this.cacheSpeed)
         }
       }
-      if (this.funcs.hasProperty(params, 'lightswitch') && this.cacheLightOnOff !== params.lightswitch) {
+      if (
+        this.funcs.hasProperty(params, 'lightswitch') &&
+        this.cacheLightOnOff !== params.lightswitch
+      ) {
         this.cacheLightOnOff = params.lightswitch
         this.lightService.updateCharacteristic(this.hapChar.On, params.lightswitch === 1)
         if (params.updateSource && !this.disableDeviceLogging) {
-          this.log('[%s] current light [%s%].', this.nameparams.lightswitch === 1 ? 'on' : 'off')
+          this.log(
+            '[%s] current light [%s%].',
+            this.name,
+            params.lightswitch === 1 ? 'on' : 'off'
+          )
         }
       }
-      if (this.funcs.hasProperty(params, 'lightbright') && this.cacheBrightness !== params.lightbright) {
+      if (
+        this.funcs.hasProperty(params, 'lightbright') &&
+        this.cacheBrightness !== params.lightbright
+      ) {
         this.cacheBrightness = params.lightbright
-        this.lightService.updateCharacteristic(this.hapChar.Brightness, params.lightbright)
+        this.lightService
+          .updateCharacteristic(this.hapChar.Brightness, params.lightbright)
         if (params.updateSource && !this.disableDeviceLogging) {
-          this.log('[%s] current brightness [%s%].', this.nameparams.lightbright)
+          this.log('[%s] current brightness [%s%].', this.name, params.lightbright)
         }
       }
       if (this.funcs.hasProperty(params, 'lightRcolor')) {
-        if (this.cacheR !== params.lightRcolor || this.cacheG !== params.lightGcolor || this.cacheB !== params.lightBcolor) {
+        if (
+          this.cacheR !== params.lightRcolor ||
+          this.cacheG !== params.lightGcolor ||
+          this.cacheB !== params.lightBcolor
+        ) {
           this.cacheR = params.lightRcolor
           this.cacheG = params.lightGcolor
           this.cacheB = params.lightBcolor
@@ -303,7 +326,13 @@ module.exports = class deviceDiffuser {
           this.lightService.updateCharacteristic(this.hapChar.Hue, this.cacheHue)
             .updateCharacteristic(this.hapChar.Saturation, 100)
           if (params.updateSource && !this.disableDeviceLogging) {
-            this.log('[%s] current colour [rgb %s %s %s].', this.name, this.cacheR, this.cacheG, this.cacheB)
+            this.log(
+              '[%s] current colour [rgb %s %s %s].',
+              this.name,
+              this.cacheR,
+              this.cacheG,
+              this.cacheB
+            )
           }
         }
       }
diff --git a/lib/device/fan.js b/lib/device/fan.js
index 9da03335..ba40346e 100644
--- a/lib/device/fan.js
+++ b/lib/device/fan.js
@@ -76,10 +76,14 @@ module.exports = class deviceFan {
       const params = { switches: this.consts.defaultMultiSwitchOff }
       const newPower = value >= 33
       const newSpeed = value
-      const newLight = this.lightService ? this.lightService.getCharacteristic(this.hapChar.On).value : true
+      const newLight = this.lightService
+        ? this.lightService.getCharacteristic(this.hapChar.On).value
+        : true
       params.switches[0].switch = newLight ? 'on' : 'off'
       params.switches[1].switch = newPower && newSpeed >= 33 ? 'on' : 'off'
-      params.switches[2].switch = newPower && newSpeed >= 66 && newSpeed < 99 ? 'on' : 'off'
+      params.switches[2].switch = newPower && newSpeed >= 66 && newSpeed < 99
+        ? 'on'
+        : 'off'
       params.switches[3].switch = newPower && newSpeed >= 99 ? 'on' : 'off'
       await this.platform.sendDeviceUpdate(this.accessory, params)
       if (newPower !== (this.cacheOnOff === 'on')) {
@@ -108,7 +112,9 @@ module.exports = class deviceFan {
       const newLight = this.lightService ? value : true
       params.switches[0].switch = newLight ? 'on' : 'off'
       params.switches[1].switch = newPower && newSpeed >= 33 ? 'on' : 'off'
-      params.switches[2].switch = newPower && newSpeed >= 66 && newSpeed < 99 ? 'on' : 'off'
+      params.switches[2].switch = newPower && newSpeed >= 66 && newSpeed < 99
+        ? 'on'
+        : 'off'
       params.switches[3].switch = newPower && newSpeed >= 99 ? 'on' : 'off'
       await this.platform.sendDeviceUpdate(this.accessory, params)
       if (newLight !== (this.cacheLight === 'on')) {
diff --git a/lib/device/light-colour.js b/lib/device/light-colour.js
index b1f8e67a..8f5b9829 100644
--- a/lib/device/light-colour.js
+++ b/lib/device/light-colour.js
@@ -196,7 +196,8 @@ module.exports = class deviceLightColour {
       this.service.updateCharacteristic(this.hapChar.ColorTemperature, 140)
       callback()
       let params
-      const newRGB = this.colourUtils.hs2rgb(value, this.service.getCharacteristic(this.hapChar.Saturation).value)
+      const saturation = this.service.getCharacteristic(this.hapChar.Saturation).value
+      const newRGB = this.colourUtils.hs2rgb(value, saturation)
       this.cacheR = newRGB[0]
       this.cacheG = newRGB[1]
       this.cacheB = newRGB[2]
@@ -257,7 +258,13 @@ module.exports = class deviceLightColour {
       }, 10000)
       await this.platform.sendDeviceUpdate(this.accessory, params)
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current colour [rgb %s %s %s].', this.name, this.cacheR, this.cacheG, this.cacheB)
+        this.log(
+          '[%s] current colour [rgb %s %s %s].',
+          this.name,
+          this.cacheR,
+          this.cacheG,
+          this.cacheB
+        )
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
@@ -349,7 +356,10 @@ module.exports = class deviceLightColour {
         this.cacheOnOff = this.isB1 ? params.state : params.switch
         this.service.updateCharacteristic(this.hapChar.On, this.cacheOnOff === 'on')
         if (this.isB1) {
-          this.service.updateCharacteristic(this.hapChar.Brightness, this.cacheOnOff === 'on' ? 100 : 0)
+          this.service.updateCharacteristic(
+            this.hapChar.Brightness,
+            this.cacheOnOff === 'on' ? 100 : 0
+          )
         }
         if (params.updateSource && !this.disableDeviceLogging) {
           this.log('[%s] current state [%s].', this.name, this.cacheOnOff)
@@ -362,7 +372,10 @@ module.exports = class deviceLightColour {
           // B1
           if (params.zyx_mode) {
             mode = parseInt(params.zyx_mode)
-          } else if (this.funcs.hasProperty(params, 'channel0') && parseInt(params.channel0) + parseInt(params.channel1) > 0) {
+          } else if (
+            this.funcs.hasProperty(params, 'channel0') &&
+            parseInt(params.channel0) + parseInt(params.channel1) > 0
+          ) {
             mode = 1
           } else {
             mode = 2
@@ -409,7 +422,11 @@ module.exports = class deviceLightColour {
             }
           }
           if (this.funcs.hasProperty(params, 'colorR')) {
-            if (params.colorR !== this.cacheR || params.colorG !== this.cacheB || params.colorB !== this.cacheB) {
+            if (
+              params.colorR !== this.cacheR ||
+              params.colorG !== this.cacheB ||
+              params.colorB !== this.cacheB
+            ) {
               const rgbDiff = Math.abs(params.colorR - this.cacheR) +
                 Math.abs(params.colorG - this.cacheG) +
                 Math.abs(params.colorG - this.cacheB)
@@ -429,9 +446,16 @@ module.exports = class deviceLightColour {
                     this.cacheR, this.cacheG, this.cacheB
                   )
                 }
-                if (this.alController && this.alController.isAdaptiveLightingActive() && rgbDiff > 10) {
+                if (
+                  this.alController &&
+                  this.alController.isAdaptiveLightingActive() &&
+                  rgbDiff > 10
+                ) {
                   this.alController.disableAdaptiveLighting()
-                  this.log('[%s] adaptive lighting disabled due to significant colour change.', this.name)
+                  this.log(
+                    '[%s] adaptive lighting disabled due to significant colour change.',
+                    this.name
+                  )
                 }
               }
             }
@@ -443,7 +467,8 @@ module.exports = class deviceLightColour {
             if (this.funcs.hasProperty(params.color, 'br')) {
               if (params.color.br !== this.cacheBright) {
                 this.cacheBright = params.color.br
-                this.service.updateCharacteristic(this.hapChar.Brightness, this.cacheBright)
+                this.service
+                  .updateCharacteristic(this.hapChar.Brightness, this.cacheBright)
                 if (params.updateSource && !this.disableDeviceLogging) {
                   this.log('[%s] current brightness [%s%].', this.name, this.cacheBright)
                 }
@@ -481,20 +506,27 @@ module.exports = class deviceLightColour {
               this.alController.isAdaptiveLightingActive()
             ) {
               this.alController.disableAdaptiveLighting()
-              this.log('[%s] adaptive lighting disabled due to significant colour change.', this.name)
+              this.log(
+                '[%s] adaptive lighting disabled due to significant colour change.',
+                this.name
+              )
             }
           }
           if (params.ltype === 'white' && params.white) {
             if (this.funcs.hasProperty(params.white, 'br')) {
               if (params.white.br !== this.cacheBright || this.cacheMode !== 'white') {
                 this.cacheBright = params.white.br
-                this.service.updateCharacteristic(this.hapChar.Brightness, this.cacheBright)
+                this.service
+                  .updateCharacteristic(this.hapChar.Brightness, this.cacheBright)
                 if (params.updateSource && !this.disableDeviceLogging) {
                   this.log('[%s] current brightness [%s%].', this.name, this.cacheBright)
                 }
               }
             }
-            if (this.funcs.hasProperty(params.white, 'ct') && params.white.ct !== this.cacheCT) {
+            if (
+              this.funcs.hasProperty(params.white, 'ct') &&
+              params.white.ct !== this.cacheCT
+            ) {
               this.cacheMode = 'white'
               const ctDiff = Math.abs(params.white.ct - this.cacheCT) > 5
               this.cacheCT = params.white.ct
@@ -516,7 +548,10 @@ module.exports = class deviceLightColour {
                 ) {
                   // look for a variation greater than five
                   this.alController.disableAdaptiveLighting()
-                  this.log('[%s] adaptive lighting disabled due to significant colour change.', this.name)
+                  this.log(
+                    '[%s] adaptive lighting disabled due to significant colour change.',
+                    this.name
+                  )
                 }
               }
             }
diff --git a/lib/device/light-ctemp.js b/lib/device/light-ctemp.js
index 9e229c99..5311c64c 100644
--- a/lib/device/light-ctemp.js
+++ b/lib/device/light-ctemp.js
@@ -164,8 +164,9 @@ module.exports = class deviceLightColour {
       }
       this.cacheMired = value
       callback()
-      const mToK = Math.max(Math.min(Math.round(1000000 / this.cacheMired), this.maxK), this.minK)
-      this.cacheCT = Math.round(((mToK - this.minK) / (this.maxK - this.minK)) * 255)
+      const kelvin = Math.round(1000000 / this.cacheMired)
+      const scaledK = Math.max(Math.min(kelvin, this.maxK), this.minK)
+      this.cacheCT = Math.round(((scaledK - this.minK) / (this.maxK - this.minK)) * 255)
       const params = {
         white: {
           br: this.cacheBrightness,
@@ -193,9 +194,9 @@ module.exports = class deviceLightColour {
       await this.platform.sendDeviceUpdate(this.accessory, params)
       if (!this.disableDeviceLogging) {
         if (this.alController && this.alController.isAdaptiveLightingActive()) {
-          this.log('[%s] current cct [%sK] via adaptive lighting.', this.name, mToK)
+          this.log('[%s] current cct [%sK] via adaptive lighting.', this.name, scaledK)
         } else {
-          this.log('[%s] current cct [%sK].', this.name, mToK)
+          this.log('[%s] current cct [%sK].', this.name, scaledK)
         }
       }
     } catch (err) {
@@ -216,22 +217,30 @@ module.exports = class deviceLightColour {
         }
       }
       if (params.white) {
-        if (this.funcs.hasProperty(params.white, 'br') && this.cacheBrightness !== params.white.br) {
+        if (
+          this.funcs.hasProperty(params.white, 'br') &&
+          this.cacheBrightness !== params.white.br
+        ) {
           this.cacheBrightness = params.white.br
           this.service.updateCharacteristic(this.hapChar.Brightness, this.cacheBrightness)
           if (params.updateSource && !this.disableDeviceLogging) {
             this.log('[%s] current brightness [%s%].', this.name, this.cacheBrightness)
           }
         }
-        if (this.funcs.hasProperty(params.white, 'ct') && this.cacheCT !== params.white.ct) {
+        if (
+          this.funcs.hasProperty(params.white, 'ct') &&
+          this.cacheCT !== params.white.ct
+        ) {
           const ctDiff = Math.abs(params.white.ct - this.cacheCT) > 5
           this.cacheCT = params.white.ct
-          const ctToK = Math.round(this.cacheCT / 255 * (this.maxK - this.minK) + this.minK)
-          this.cacheMired = Math.min(Math.max(Math.round(1000000 / ctToK), 140), 500)
-          this.service.updateCharacteristic(this.hapChar.ColorTemperature, this.cacheMired)
+          const kelvin = this.cacheCT / 255 * (this.maxK - this.minK) + this.minK
+          const scaledK = Math.round(kelvin)
+          this.cacheMired = Math.min(Math.max(Math.round(1000000 / scaledK), 140), 500)
+          this.service
+            .updateCharacteristic(this.hapChar.ColorTemperature, this.cacheMired)
           if (params.updateSource) {
             if (!this.disableDeviceLogging) {
-              this.log('[%s] current cct [%sK].', this.name, ctToK)
+              this.log('[%s] current cct [%sK].', this.name, scaledK)
             }
             if (
               this.alController &&
@@ -240,7 +249,10 @@ module.exports = class deviceLightColour {
             ) {
               // look for a variation greater than five
               this.alController.disableAdaptiveLighting()
-              this.log('[%s] adaptive lighting disabled due to significant colour change.', this.name)
+              this.log(
+                '[%s] adaptive lighting disabled due to significant colour change.',
+                this.name
+              )
             }
           }
         }
diff --git a/lib/device/light-dimmer.js b/lib/device/light-dimmer.js
index e3c7eaf9..2890a93a 100644
--- a/lib/device/light-dimmer.js
+++ b/lib/device/light-dimmer.js
@@ -132,7 +132,8 @@ module.exports = class deviceLightDimmer {
           // D1 eWeLink scale matches HomeKit scale of 0-100
           if (this.funcs.hasProperty(params, 'brightness')) {
             if (params.brightness !== this.cacheBrightness) {
-              this.service.updateCharacteristic(this.hapChar.Brightness, params.brightness)
+              this.service
+                .updateCharacteristic(this.hapChar.Brightness, params.brightness)
               this.cacheBrightness = params.brightness
               if (params.updateSource && !this.disableDeviceLogging) {
                 this.log('[%s] current brightness [%s%].', this.name, params.brightness)
diff --git a/lib/device/outlet.js b/lib/device/outlet.js
index 0db7ff18..14603fe1 100644
--- a/lib/device/outlet.js
+++ b/lib/device/outlet.js
@@ -191,7 +191,9 @@ module.exports = class deviceOutlet {
   async internalUpdate (value, callback) {
     try {
       callback()
-      await this.platform.sendDeviceUpdate(this.accessory, { switch: value ? 'on' : 'off' })
+      await this.platform.sendDeviceUpdate(this.accessory, {
+        switch: value ? 'on' : 'off'
+      })
       this.cacheOnOff = value ? 'on' : 'off'
       if (!this.disableDeviceLogging) {
         this.log('[%s] current state [%s].', this.name, value ? 'on' : 'off')
@@ -210,15 +212,23 @@ module.exports = class deviceOutlet {
           this.log('[%s] current state [%s].', this.name, params.switch)
         }
         if (!this.accessory.context.powerReadings) {
-          this.service.updateCharacteristic(this.hapChar.OutletInUse, params.switch === 'on')
+          this.service
+            .updateCharacteristic(this.hapChar.OutletInUse, params.switch === 'on')
         }
       }
       let logger = false
       if (this.funcs.hasProperty(params, 'power')) {
         this.accessory.context.powerReadings = true
-        this.service.updateCharacteristic(this.hapChar.OutletInUse, parseFloat(params.power) > this.inUsePowerThreshold)
-          .updateCharacteristic(this.eveCurrentConsumption, parseFloat(params.power))
-        const isOn = this.accessory.getService(this.hapServ.Outlet).getCharacteristic(this.hapChar.On).value
+        this.service.updateCharacteristic(
+          this.hapChar.OutletInUse,
+          parseFloat(params.power) > this.inUsePowerThreshold
+        )
+        this.service.updateCharacteristic(
+          this.eveCurrentConsumption,
+          parseFloat(params.power)
+        )
+        const isOn = this.accessory.getService(this.hapServ.Outlet)
+          .getCharacteristic(this.hapChar.On).value
         this.accessory.eveService.addEntry({ power: isOn ? parseFloat(params.power) : 0 })
         this.accessory.context.energyReadings.push(parseFloat(params.power))
         logger = true
@@ -228,16 +238,23 @@ module.exports = class deviceOutlet {
         logger = true
       }
       if (this.funcs.hasProperty(params, 'current')) {
-        this.service.updateCharacteristic(this.eveElectricCurrent, parseFloat(params.current))
+        this.service
+          .updateCharacteristic(this.eveElectricCurrent, parseFloat(params.current))
         logger = true
       }
       if (params.updateSource && logger && !this.disableDeviceLogging) {
         this.log(
           '[%s] current%s%s%s.',
           this.name,
-          this.funcs.hasProperty(params, 'power') ? ' power [' + params.power + 'W]' : '',
-          this.funcs.hasProperty(params, 'voltage') ? ' voltage [' + params.voltage + 'V]' : '',
-          this.funcs.hasProperty(params, 'current') ? ' current [' + params.current + 'A]' : ''
+          this.funcs.hasProperty(params, 'power')
+            ? ' power [' + params.power + 'W]'
+            : '',
+          this.funcs.hasProperty(params, 'voltage')
+            ? ' voltage [' + params.voltage + 'V]'
+            : '',
+          this.funcs.hasProperty(params, 'current')
+            ? ' current [' + params.current + 'A]'
+            : ''
         )
       }
     } catch (err) {
diff --git a/lib/device/rf-bridge.js b/lib/device/rf-bridge.js
index 80963b90..8e0ab8a8 100644
--- a/lib/device/rf-bridge.js
+++ b/lib/device/rf-bridge.js
@@ -137,7 +137,11 @@ module.exports = class deviceRFBridge {
       }
       const timeNow = new Date()
       let oAccessory = false
-      if (this.funcs.hasProperty(params, 'cmd') && params.cmd === 'transmit' && this.funcs.hasProperty(params, 'rfChl')) {
+      if (
+        this.funcs.hasProperty(params, 'cmd') &&
+        params.cmd === 'transmit' &&
+        this.funcs.hasProperty(params, 'rfChl')
+      ) {
         this.platform.devicesInHB.forEach(acc => {
           if (
             acc.context.eweDeviceId === this.accessory.context.eweDeviceId &&
@@ -148,12 +152,14 @@ module.exports = class deviceRFBridge {
           }
         })
         if (oAccessory) {
-          oAccessory.getService(oAccessory.context.buttons[params.rfChl]).updateCharacteristic(this.hapChar.On, 1)
+          oAccessory.getService(oAccessory.context.buttons[params.rfChl])
+            .updateCharacteristic(this.hapChar.On, 1)
           if (params.updateSource && !oAccessory.context.disableDeviceLogging) {
             this.log('[%s] current state [button triggered]', oAccessory.displayName)
           }
           this.funcs.sleep(3000)
-          oAccessory.getService(oAccessory.context.buttons[params.rfChl]).updateCharacteristic(this.hapChar.On, 0)
+          oAccessory.getService(oAccessory.context.buttons[params.rfChl])
+            .updateCharacteristic(this.hapChar.On, 0)
         } else {
           throw new Error('rf button not found in Homebridge')
         }
@@ -197,26 +203,30 @@ module.exports = class deviceRFBridge {
                     serv = this.hapServ.CarbonDioxideSensor
                     char = this.hapChar.CarbonDioxideDetected
                     break
-                  case 'contact':
+                  case 'contact': {
                     serv = this.hapServ.ContactSensor
                     char = this.hapChar.ContactSensorState
+                    const initialTime = oAccessory.eveService.getInitialTime()
                     oAccessory.getService(serv).updateCharacteristic(
                       this.eveLastActivation,
-                      Math.round(new Date().valueOf() / 1000) - oAccessory.eveService.getInitialTime()
+                      Math.round(new Date().valueOf() / 1000) - initialTime
                     )
                     break
+                  }
                   case 'occupancy':
                     serv = this.hapServ.OccupancySensor
                     char = this.hapChar.OccupancyDetected
                     break
-                  default:
+                  default: {
                     serv = this.hapServ.MotionSensor
                     char = this.hapChar.MotionDetected
+                    const initialTime = oAccessory.eveService.getInitialTime()
                     oAccessory.getService(serv).updateCharacteristic(
                       this.eveLastActivation,
-                      Math.round(new Date().valueOf() / 1000) - oAccessory.eveService.getInitialTime()
+                      Math.round(new Date().valueOf() / 1000) - initialTime
                     )
                     break
+                  }
                 }
                 oAccessory.getService(serv).updateCharacteristic(char, 1)
                 oAccessory.eveService.addEntry({ status: 1 })
diff --git a/lib/device/sensor-ambient.js b/lib/device/sensor-ambient.js
index 924646ae..74bba6c2 100644
--- a/lib/device/sensor-ambient.js
+++ b/lib/device/sensor-ambient.js
@@ -110,7 +110,8 @@ module.exports = class deviceSensorAmbient {
         const newState = params.switch
         if (this.cacheOnOff !== newState) {
           this.cacheOnOff = newState
-          this.switchService.updateCharacteristic(this.hapChar.On, this.cacheOnOff === 'on')
+          this.switchService
+            .updateCharacteristic(this.hapChar.On, this.cacheOnOff === 'on')
           this.accessory.eveService.addEntry({ status: this.cacheOnOff === 'on' ? 1 : 0 })
           if (params.updateSource && !this.disableDeviceLogging) {
             this.log('[%s] current state [%s].', this.name, this.cacheOnOff)
@@ -118,29 +119,41 @@ module.exports = class deviceSensorAmbient {
         }
       }
       const eveLog = {}
-      if (this.funcs.hasProperty(params, 'currentTemperature') && params.currentTemperature !== 'unavailable') {
+      if (
+        this.funcs.hasProperty(params, 'currentTemperature') &&
+        params.currentTemperature !== 'unavailable'
+      ) {
         const currentTemp = Number(params.currentTemperature) + this.tempOffset
         eveLog.temp = currentTemp
         if (this.cacheTemp !== currentTemp) {
           this.cacheTemp = currentTemp
-          this.tempService.updateCharacteristic(this.hapChar.CurrentTemperature, this.cacheTemp)
+          this.tempService
+            .updateCharacteristic(this.hapChar.CurrentTemperature, this.cacheTemp)
           if (params.updateSource && !this.disableDeviceLogging) {
             this.log('[%s] current temperature [%s°C].', this.name, this.cacheTemp)
           }
         }
       }
-      if (this.funcs.hasProperty(params, 'currentHumidity') && params.currentHumidity !== 'unavailable' && this.humiService) {
+      if (
+        this.funcs.hasProperty(params, 'currentHumidity') &&
+        params.currentHumidity !== 'unavailable' &&
+        this.humiService
+      ) {
         const currentHumi = parseInt(params.currentHumidity)
         eveLog.humidity = currentHumi
         if (this.cacheHumi !== currentHumi) {
           this.cacheHumi = currentHumi
-          this.humiService.updateCharacteristic(this.hapChar.CurrentRelativeHumidity, this.cacheHumi)
+          this.humiService
+            .updateCharacteristic(this.hapChar.CurrentRelativeHumidity, this.cacheHumi)
           if (params.updateSource && !this.disableDeviceLogging) {
             this.log('[%s] current humidity [%s%].', this.name, this.cacheHumi)
           }
         }
       }
-      if (this.funcs.hasProperty(eveLog, 'temp') || this.funcs.hasProperty(eveLog, 'humidity')) {
+      if (
+        this.funcs.hasProperty(eveLog, 'temp') ||
+        this.funcs.hasProperty(eveLog, 'humidity')
+      ) {
         this.accessory.eveService.addEntry(eveLog)
       }
     } catch (err) {
diff --git a/lib/device/sensor-contact.js b/lib/device/sensor-contact.js
index c8b723a8..a907196e 100644
--- a/lib/device/sensor-contact.js
+++ b/lib/device/sensor-contact.js
@@ -156,8 +156,12 @@ module.exports = class deviceSensorContact {
         const scaledBattery = Math.round(params.battery * 33.3)
         if (this.cacheBattery !== scaledBattery) {
           this.cacheBattery = scaledBattery
-          this.batteryService.updateCharacteristic(this.hapChar.BatteryLevel, this.cacheBattery)
-            .updateCharacteristic(this.hapChar.StatusLowBattery, this.cacheBattery < this.lowBattThreshold)
+          this.batteryService
+            .updateCharacteristic(this.hapChar.BatteryLevel, this.cacheBattery)
+            .updateCharacteristic(
+              this.hapChar.StatusLowBattery,
+              this.cacheBattery < this.lowBattThreshold
+            )
           if (params.updateSource && !this.disableDeviceLogging) {
             this.log('[%s] current battery [%s%].', this.name, this.cacheBattery)
           }
@@ -183,11 +187,18 @@ module.exports = class deviceSensorContact {
         this.accessory.eveService.addEntry({ status: 0 })
       }
       if (params.updateSource && !this.disableDeviceLogging) {
-        this.log('[%s] current state [contact%s detected].', this.name, newState === 0 ? '' : ' not')
+        this.log(
+          '[%s] current state [contact%s detected].',
+          this.name,
+          newState === 0 ? '' : ' not'
+        )
       }
       let oAccessory
       for (const [deviceId, group] of Object.entries(this.platform.simulations)) {
-        if (group.sensorId === this.accessory.context.eweDeviceId && group.type === 'garage') {
+        if (
+          group.sensorId === this.accessory.context.eweDeviceId &&
+          group.type === 'garage'
+        ) {
           if ((oAccessory = this.platform.devicesInHB.get(deviceId + 'SWX'))) {
             const gdService = oAccessory.getService(this.hapServ.GarageDoorOpener)
             switch (newState) {
diff --git a/lib/device/simulation/blind.js b/lib/device/simulation/blind.js
index 84b1cc50..de8c0ab1 100644
--- a/lib/device/simulation/blind.js
+++ b/lib/device/simulation/blind.js
@@ -61,24 +61,25 @@ module.exports = class deviceBlind {
       }
       const params = { switches: this.consts.defaultMultiSwitchOff }
       const prevState = this.accessory.context.cachePositionState
-      const percentStepPerDecisecond = blindConfig.operationTime / 100
+      const percentStepPerDS = blindConfig.operationTime / 100
       const updateKey = Math.random().toString(36).substr(2, 8)
       this.updateKey = updateKey
       if (prevState !== 2) {
         await this.platform.sendDeviceUpdate(this.accessory, params)
-        let positionPercentChange = Math.floor(Date.now() / 100) - this.accessory.context.cacheLastStartTime
-        positionPercentChange = Math.floor(percentStepPerDecisecond * positionPercentChange)
+        let posPercentChange = Math.floor(Date.now() / 100) -
+          this.accessory.context.cacheLastStartTime
+        posPercentChange = Math.floor(percentStepPerDS * posPercentChange)
         if (prevState === 0) {
-          prevPosition -= positionPercentChange
+          prevPosition -= posPercentChange
         } else {
-          prevPosition += positionPercentChange
+          prevPosition += posPercentChange
         }
         this.service.updateCharacteristic(this.hapChar.CurrentPosition, prevPosition)
         this.accessory.context.cacheCurrentPosition = prevPosition
       }
       const diffPosition = value - prevPosition
       const setToMoveUp = diffPosition > 0
-      const decisecondsToMove = Math.round(Math.abs(diffPosition) * percentStepPerDecisecond)
+      const decisecondsToMove = Math.round(Math.abs(diffPosition) * percentStepPerDS)
       params.switches[0].switch = setToMoveUp ? 'on' : 'off'
       params.switches[1].switch = setToMoveUp ? 'off' : 'on'
       await this.platform.sendDeviceUpdate(this.accessory, params)
diff --git a/lib/device/simulation/garage-eachen.js b/lib/device/simulation/garage-eachen.js
index 0c1c61be..b64cec33 100644
--- a/lib/device/simulation/garage-eachen.js
+++ b/lib/device/simulation/garage-eachen.js
@@ -56,7 +56,9 @@ module.exports = class deviceGarageEachen {
     try {
       callback()
       const params = { switch: value === 0 ? 'on' : 'off' }
-      if (value === this.service.getCharacteristic(this.hapChar.CurrentDoorState).value % 2) {
+      if (
+        value === this.service.getCharacteristic(this.hapChar.CurrentDoorState).value % 2
+      ) {
         return
       }
       this.inUse = true
@@ -83,10 +85,20 @@ module.exports = class deviceGarageEachen {
       if (!params.switch || this.inUse) {
         return
       }
-      this.service.updateCharacteristic(this.hapChar.TargetDoorState, params.switch === 'on' ? 0 : 1)
-        .updateCharacteristic(this.hapChar.CurrentDoorState, params.switch === 'on' ? 0 : 1)
+      this.service.updateCharacteristic(
+        this.hapChar.TargetDoorState,
+        params.switch === 'on' ? 0 : 1
+      )
+      this.service.updateCharacteristic(
+        this.hapChar.CurrentDoorState,
+        params.switch === 'on' ? 0 : 1
+      )
       if (params.updateSource && !this.disableDeviceLogging) {
-        this.log('[%s] current state [%s].', this.name, params.switch === 'on' ? 'open' : 'closed')
+        this.log(
+          '[%s] current state [%s].',
+          this.name,
+          params.switch === 'on' ? 'open' : 'closed'
+        )
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
diff --git a/lib/device/simulation/garage-four.js b/lib/device/simulation/garage-four.js
index 2500185f..e9545a8c 100644
--- a/lib/device/simulation/garage-four.js
+++ b/lib/device/simulation/garage-four.js
@@ -85,7 +85,8 @@ module.exports = class deviceGarageFour {
           garageChannel = 3
           break
       }
-      const prevState = this.accessory.context.cacheStates[garageChannel].cacheCurrentDoorState
+      const prevState = this.accessory.context.cacheStates[garageChannel]
+        .cacheCurrentDoorState
       if (value === prevState % 2) {
         return
       }
@@ -98,7 +99,9 @@ module.exports = class deviceGarageFour {
       this.accessory.context.cacheStates[garageChannel].cacheTargetDoorState = value
       this.accessory.context.cacheStates[garageChannel].cacheCurrentDoorState = value + 2
       const params = { switches: this.consts.defaultMultiSwitchOff }
-      ;[0, 1, 2, 3].forEach(i => (params.switches[i].switch = garageChannel === i ? 'on' : 'off'))
+      ;[0, 1, 2, 3].forEach(i => {
+        params.switches[i].switch = garageChannel === i ? 'on' : 'off'
+      })
       await this.platform.sendDeviceUpdate(this.accessory, params)
       await this.funcs.sleep(2000)
       this.inUse = false
@@ -109,7 +112,11 @@ module.exports = class deviceGarageFour {
       gdService.updateCharacteristic(this.hapChar.CurrentDoorState, value)
       this.accessory.context.cacheStates[garageChannel].cacheCurrentDoorState = value
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current state [garage %s %s].', this.name, garageChannel, value === 0 ? 'open' : 'closed')
+        this.log(
+          '[%s] current state [garage %s %s].',
+          this.name, garageChannel,
+          value === 0 ? 'open' : 'closed'
+        )
       }
     } catch (err) {
       this.inUse = false
diff --git a/lib/device/simulation/garage-one.js b/lib/device/simulation/garage-one.js
index 491e3889..aba651a5 100644
--- a/lib/device/simulation/garage-one.js
+++ b/lib/device/simulation/garage-one.js
@@ -88,7 +88,8 @@ module.exports = class deviceGarageOne {
       const params = {}
       let delay = 0
       const prevState = this.definedSensor
-        ? this.definedSensor.getService(this.hapServ.ContactSensor).getCharacteristic(this.hapChar.ContactSensorState).value === 0
+        ? this.definedSensor.getService(this.hapServ.ContactSensor)
+          .getCharacteristic(this.hapChar.ContactSensorState).value === 0
           ? 1
           : 0
         : this.accessory.context.cacheCurrentDoorState
@@ -98,7 +99,10 @@ module.exports = class deviceGarageOne {
       this.inUse = true
       this.cacheState = value
       if (this.setup === 'oneSwitch' && [2, 3].includes(prevState)) {
-        this.service.updateCharacteristic(this.hapChar.CurrentDoorState, ((prevState * 2) % 3) + 2)
+        this.service.updateCharacteristic(
+          this.hapChar.CurrentDoorState,
+          ((prevState * 2) % 3) + 2
+        )
         this.accessory.context.cacheCurrentDoorState = ((prevState * 2) % 3) + 2
         delay = 1500
       }
@@ -128,7 +132,11 @@ module.exports = class deviceGarageOne {
         this.service.updateCharacteristic(this.hapChar.CurrentDoorState, newPos)
         this.accessory.context.cacheCurrentDoorState = newPos
         if (!this.disableDeviceLogging) {
-          this.log('[%s] current state [%s].', this.name, newPos === 0 ? 'open' : 'closed')
+          this.log(
+            '[%s] current state [%s].',
+            this.name,
+            newPos === 0 ? 'open' : 'closed'
+          )
         }
       }
     } catch (err) {
diff --git a/lib/device/simulation/garage-two.js b/lib/device/simulation/garage-two.js
index 95b0c497..d6396df3 100644
--- a/lib/device/simulation/garage-two.js
+++ b/lib/device/simulation/garage-two.js
@@ -107,14 +107,22 @@ module.exports = class deviceGarageTwo {
         case 'Garage 1': {
           this.accessory.context.cacheOneCurrentDoorState = newPos
           if (!this.disableDeviceLogging) {
-            this.log('[%s] current state [garage 1 %s].', this.name, newPos === 0 ? 'open' : 'closed')
+            this.log(
+              '[%s] current state [garage 1 %s].',
+              this.name,
+              newPos === 0 ? 'open' : 'closed'
+            )
           }
           break
         }
         case 'Garage 2': {
           this.accessory.context.cacheTwoCurrentDoorState = newPos
           if (!this.disableDeviceLogging) {
-            this.log('[%s] current state [garage 2 %s].', this.name, newPos === 0 ? 'open' : 'closed')
+            this.log(
+              '[%s] current state [garage 2 %s].',
+              this.name,
+              newPos === 0 ? 'open' : 'closed'
+            )
           }
           break
         }
@@ -176,13 +184,21 @@ module.exports = class deviceGarageTwo {
           case '1':
             this.accessory.context.cacheOneCurrentDoorState = newPos - 2
             if (params.updateSource && !this.disableDeviceLogging) {
-              this.log('[%s] current state [garage 1 %s].', this.name, newPos === 2 ? 'open' : 'closed')
+              this.log(
+                '[%s] current state [garage 1 %s].',
+                this.name,
+                newPos === 2 ? 'open' : 'closed'
+              )
             }
             break
           case '2':
             this.accessory.context.cacheTwoCurrentDoorState = newPos - 2
             if (params.updateSource && !this.disableDeviceLogging) {
-              this.log('[%s] current state [garage 2 %s].', this.name, newPos === 2 ? 'open' : 'closed')
+              this.log(
+                '[%s] current state [garage 2 %s].',
+                this.name,
+                newPos === 2 ? 'open' : 'closed'
+              )
             }
             break
         }
diff --git a/lib/device/simulation/sensor-leak.js b/lib/device/simulation/sensor-leak.js
index 7dff94e1..fbd848b8 100644
--- a/lib/device/simulation/sensor-leak.js
+++ b/lib/device/simulation/sensor-leak.js
@@ -79,8 +79,14 @@ module.exports = class deviceSensorLeak {
         const scaledBattery = Math.round(params.battery * 33.3)
         if (this.cacheBattery !== scaledBattery) {
           this.cacheBattery = scaledBattery
-          this.batteryService.updateCharacteristic(this.hapChar.BatteryLevel, this.cacheBattery)
-            .updateCharacteristic(this.hapChar.StatusLowBattery, this.cacheBattery < this.lowBattThreshold)
+          this.batteryService.updateCharacteristic(
+            this.hapChar.BatteryLevel,
+            this.cacheBattery
+          )
+          this.batteryService.updateCharacteristic(
+            this.hapChar.StatusLowBattery,
+            this.cacheBattery < this.lowBattThreshold
+          )
           if (params.updateSource && !this.disableDeviceLogging) {
             this.log('[%s] current battery [%s%].', this.name, this.cacheBattery)
           }
@@ -94,13 +100,18 @@ module.exports = class deviceSensorLeak {
       this.leakService.updateCharacteristic(this.hapChar.LeakDetected, newState)
       this.accessory.eveService.addEntry({ status: newState })
       if (newState) {
+        const initialTime = this.accessory.eveService.getInitialTime()
         this.leakService.updateCharacteristic(
           this.eveLastActivation,
-          Math.round(new Date().valueOf() / 1000) - this.accessory.eveService.getInitialTime()
+          Math.round(new Date().valueOf() / 1000) - initialTime
         )
       }
       if (params.updateSource && !this.disableDeviceLogging) {
-        this.log('[%s] current state [water%s detected].', this.name, newState === 0 ? '' : ' not')
+        this.log(
+          '[%s] current state [water%s detected].',
+          this.name,
+          newState === 0 ? '' : ' not'
+        )
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
diff --git a/lib/device/simulation/switch-valve.js b/lib/device/simulation/switch-valve.js
index 5dd86be5..9ddfbf41 100644
--- a/lib/device/simulation/switch-valve.js
+++ b/lib/device/simulation/switch-valve.js
@@ -83,8 +83,9 @@ module.exports = class deviceSwitchValve {
     try {
       callback()
       const params = { switches: this.consts.defaultMultiSwitchOff }
+      const valveValue = this.vService.getCharacteristic(this.hapChar.Active).value
       params.switches[0].switch = value ? 'on' : 'off'
-      params.switches[1].switch = this.vService.getCharacteristic(this.hapChar.Active).value === 1 ? 'on' : 'off'
+      params.switches[1].switch = valveValue === 1 ? 'on' : 'off'
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.cacheOnOff = value ? 'on' : 'off'
       this.accessory.eveService.addEntry({ status: value ? 1 : 0 })
@@ -100,7 +101,8 @@ module.exports = class deviceSwitchValve {
     try {
       callback()
       const params = { switches: this.consts.defaultMultiSwitchOff }
-      params.switches[0].switch = this.sService.getCharacteristic(this.hapChar.On).value ? 'on' : 'off'
+      const switchValue = this.sService.getCharacteristic(this.hapChar.On).value
+      params.switches[0].switch = switchValue ? 'on' : 'off'
       params.switches[1].switch = value === 1 ? 'on' : 'off'
       this.vService.updateCharacteristic(this.hapChar.InUse, value)
       switch (value) {
diff --git a/lib/device/simulation/tap-one.js b/lib/device/simulation/tap-one.js
index caa873f6..57f4cc87 100644
--- a/lib/device/simulation/tap-one.js
+++ b/lib/device/simulation/tap-one.js
@@ -88,7 +88,8 @@ module.exports = class deviceTapOne {
           this.cacheOnOff = params.switches[0].switch
           break
       }
-      this.service.updateCharacteristic(this.hapChar.Active, this.cacheOnOff === 'on' ? 1 : 0)
+      this.service
+        .updateCharacteristic(this.hapChar.Active, this.cacheOnOff === 'on' ? 1 : 0)
         .updateCharacteristic(this.hapChar.InUse, this.cacheOnOff === 'on' ? 1 : 0)
       if (params.updateSource && !this.disableDeviceLogging) {
         this.log('[%s] current state [%s].', this.name, this.cacheOnOff)
diff --git a/lib/device/simulation/tap-two.js b/lib/device/simulation/tap-two.js
index fe67d543..4189fffa 100644
--- a/lib/device/simulation/tap-two.js
+++ b/lib/device/simulation/tap-two.js
@@ -54,22 +54,29 @@ module.exports = class deviceTapTwo {
       const params = { switches: this.consts.defaultMultiSwitchOff }
       const tapService = this.accessory.getService(tap)
       switch (tap) {
-        case 'Tap A':
+        case 'Tap A': {
+          const bValue = this.accessory.getService('Tap B')
+            .getCharacteristic(this.hapChar.Active).value
           params.switches[0].switch = value ? 'on' : 'off'
-          params.switches[1].switch = this.accessory.getService('Tap B').getCharacteristic(this.hapChar.Active).value === 1
-            ? 'on'
-            : 'off'
+          params.switches[1].switch = bValue === 1 ? 'on' : 'off'
           break
-        case 'Tap B':
-          params.switches[0].switch = this.accessory.getService('Tap A').getCharacteristic(this.hapChar.Active).value === 1
-            ? 'on'
-            : 'off'
+        }
+        case 'Tap B': {
+          const aValue = this.accessory.getService('Tap A')
+            .getCharacteristic(this.hapChar.Active).value === 1
+          params.switches[0].switch = aValue ? 'on' : 'off'
           params.switches[1].switch = value ? 'on' : 'off'
           break
+        }
       }
       tapService.updateCharacteristic(this.hapChar.InUse, value)
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current state [%s %].', this.name, tap, value === 1 ? 'running' : 'stopped')
+        this.log(
+          '[%s] current state [%s %].',
+          this.name,
+          tap,
+          value === 1 ? 'running' : 'stopped'
+        )
       }
       await this.platform.sendDeviceUpdate(this.accessory, params)
     } catch (err) {
@@ -84,10 +91,16 @@ module.exports = class deviceTapTwo {
       }
       ;['A', 'B'].forEach((v, k) => {
         const tapService = this.accessory.getService('Valve ' + v)
-        tapService.updateCharacteristic(this.hapChar.Active, params.switches[k].switch === 'on' ? 1 : 0)
-          .updateCharacteristic(this.hapChar.InUse, params.switches[k].switch === 'on' ? 1 : 0)
-        const logText = params.switches[k].switch === 'on' ? 'running' : 'stopped'
+        tapService.updateCharacteristic(
+          this.hapChar.Active,
+          params.switches[k].switch === 'on' ? 1 : 0
+        )
+        tapService.updateCharacteristic(
+          this.hapChar.InUse,
+          params.switches[k].switch === 'on' ? 1 : 0
+        )
         if (params.updateSource && !this.disableDeviceLogging) {
+          const logText = params.switches[k].switch === 'on' ? 'running' : 'stopped'
           this.log('[%s] current state [Tap %s running].', this.name, v, logText)
         }
       })
diff --git a/lib/device/simulation/thermostat.js b/lib/device/simulation/thermostat.js
index 624fcb18..30573775 100644
--- a/lib/device/simulation/thermostat.js
+++ b/lib/device/simulation/thermostat.js
@@ -124,11 +124,16 @@ module.exports = class deviceThermostat {
         params.mainSwitch = 'on'
       }
       this.cacheOnOff = value !== 0 ? 'on' : 'off'
-      const currentTemp = this.service.getCharacteristic(this.hapChar.CurrentTemperature).value
-      this.cacheHeating = this.cacheOnOff === 'on' && currentTemp < this.accessory.context.cacheTarget
+      const currentTemp = this.service
+        .getCharacteristic(this.hapChar.CurrentTemperature).value
+      this.cacheHeat = this.cacheOnOff === 'on' &&
+        currentTemp < this.accessory.context.cacheTarget
         ? 'on'
         : 'off'
-      this.service.updateCharacteristic(this.hapChar.CurrentHeatingCoolingState, this.cacheHeating === 'on' ? 1 : 0)
+      this.service.updateCharacteristic(
+        this.hapChar.CurrentHeatingCoolingState,
+        this.cacheHeat === 'on' ? 1 : 0
+      )
       await this.platform.sendDeviceUpdate(this.accessory, params)
       if (!this.disableDeviceLogging) {
         this.log('[%s] current state [%s].', this.name, this.cacheOnOff)
@@ -143,9 +148,8 @@ module.exports = class deviceThermostat {
       callback()
       this.accessory.context.cacheTarget = value
       this.cacheOnOff = 'on'
-      this.cacheHeating = this.service.getCharacteristic(this.hapChar.CurrentTemperature).value < value
-        ? 'on'
-        : 'off'
+      const cTemp = this.service.getCharacteristic(this.hapChar.CurrentTemperature).value
+      this.cacheHeat = cTemp < value ? 'on' : 'off'
       const params = {
         deviceType: 'temperature',
         targets: [
@@ -163,7 +167,10 @@ module.exports = class deviceThermostat {
           }
         ]
       }
-      this.service.updateCharacteristic(this.hapChar.CurrentHeatingCoolingState, this.cacheHeating === 'on' ? 1 : 0)
+      this.service.updateCharacteristic(
+        this.hapChar.CurrentHeatingCoolingState,
+        this.cacheHeat === 'on' ? 1 : 0
+      )
       await this.platform.sendDeviceUpdate(this.accessory, params)
       if (!this.disableDeviceLogging) {
         this.log('[%s] current target [%s°C].', this.name, value)
@@ -179,28 +186,38 @@ module.exports = class deviceThermostat {
         const newState = params.mainSwitch
         if (this.cacheOnOff !== newState) {
           this.cacheOnOff = newState
-          this.service.updateCharacteristic(this.hapChar.TargetHeatingCoolingState, this.cacheOnOff === 'on' ? 1 : 0)
+          this.service.updateCharacteristic(
+            this.hapChar.TargetHeatingCoolingState,
+            this.cacheOnOff === 'on' ? 1 : 0
+          )
           this.accessory.eveService.addEntry({ status: this.cacheOnOff === 'on' ? 1 : 0 })
           if (this.cacheOnOff === 'off') {
-            this.cacheHeating = 'off'
+            this.cacheHeat = 'off'
           }
           if (params.updateSource && !this.disableDeviceLogging && !params.switch) {
             this.log('[%s] current state [%s].', this.name, this.cacheOnOff)
           }
         }
       }
-      if (params.switch && params.switch !== this.cacheHeating) {
-        this.cacheHeating = params.switch
-        this.service.updateCharacteristic(this.hapChar.CurrentHeatingCoolingState, params.switch === 'on' ? 1 : 0)
+      if (params.switch && params.switch !== this.cacheHeat) {
+        this.cacheHeat = params.switch
+        this.service.updateCharacteristic(
+          this.hapChar.CurrentHeatingCoolingState,
+          params.switch === 'on' ? 1 : 0
+        )
         if (params.updateSource && !this.disableDeviceLogging) {
-          this.log('[%s] current heating [%s].', this.name, this.cacheHeating)
+          this.log('[%s] current heating [%s].', this.name, this.cacheHeat)
         }
       }
-      if (this.funcs.hasProperty(params, 'currentTemperature') && params.currentTemperature !== 'unavailable') {
+      if (
+        this.funcs.hasProperty(params, 'currentTemperature') &&
+        params.currentTemperature !== 'unavailable'
+      ) {
         const currentTemp = Number(params.currentTemperature) + this.tempOffset
         if (this.cacheTemp !== currentTemp) {
           this.cacheTemp = currentTemp
-          this.service.updateCharacteristic(this.hapChar.CurrentTemperature, this.cacheTemp)
+          this.service
+            .updateCharacteristic(this.hapChar.CurrentTemperature, this.cacheTemp)
           this.accessory.eveService.addEntry({ temp: currentTemp })
           if (params.updateSource && !this.disableDeviceLogging) {
             this.log('[%s] current temperature [%s°C].', this.name, this.cacheTemp)
@@ -215,7 +232,8 @@ module.exports = class deviceThermostat {
         const currentHumi = parseInt(params.currentHumidity)
         if (this.cacheHumi !== currentHumi) {
           this.cacheHumi = currentHumi
-          this.service.updateCharacteristic(this.hapChar.CurrentRelativeHumidity, this.cacheHumi)
+          this.service
+            .updateCharacteristic(this.hapChar.CurrentRelativeHumidity, this.cacheHumi)
           this.accessory.eveService.addEntry({ humidity: currentHumi })
           if (params.updateSource && !this.disableDeviceLogging) {
             this.log('[%s] current humidity [%s%].', this.name, this.cacheHumi)
diff --git a/lib/device/simulation/valve-four.js b/lib/device/simulation/valve-four.js
index f02dcbcd..58ccc7bc 100644
--- a/lib/device/simulation/valve-four.js
+++ b/lib/device/simulation/valve-four.js
@@ -82,54 +82,58 @@ module.exports = class deviceValveFour {
       const params = { switches: this.consts.defaultMultiSwitchOff }
       const valveService = this.accessory.getService(valve)
       switch (valve) {
-        case 'Valve A':
+        case 'Valve A': {
+          const bValue = this.accessory.getService('Valve B')
+            .getCharacteristic(this.hapChar.Active).value
+          const cValue = this.accessory.getService('Valve C')
+            .getCharacteristic(this.hapChar.Active).value
+          const dValue = this.accessory.getService('Valve D')
+            .getCharacteristic(this.hapChar.Active).value
           params.switches[0].switch = value ? 'on' : 'off'
-          params.switches[1].switch = this.accessory.getService('Valve B').getCharacteristic(this.hapChar.Active).value === 1
-            ? 'on'
-            : 'off'
-          params.switches[2].switch = this.accessory.getService('Valve C').getCharacteristic(this.hapChar.Active).value === 1
-            ? 'on'
-            : 'off'
-          params.switches[3].switch = this.accessory.getService('Valve D').getCharacteristic(this.hapChar.Active).value === 1
-            ? 'on'
-            : 'off'
+          params.switches[1].switch = bValue === 1 ? 'on' : 'off'
+          params.switches[2].switch = cValue === 1 ? 'on' : 'off'
+          params.switches[3].switch = dValue === 1 ? 'on' : 'off'
           break
-        case 'Valve B':
-          params.switches[0].switch = this.accessory.getService('Valve A').getCharacteristic(this.hapChar.Active).value === 1
-            ? 'on'
-            : 'off'
+        }
+        case 'Valve B': {
+          const aValue = this.accessory.getService('Valve A')
+            .getCharacteristic(this.hapChar.Active).value
+          const cValue = this.accessory.getService('Valve C')
+            .getCharacteristic(this.hapChar.Active).value
+          const dValue = this.accessory.getService('Valve D')
+            .getCharacteristic(this.hapChar.Active).value
+          params.switches[0].switch = aValue === 1 ? 'on' : 'off'
           params.switches[1].switch = value ? 'on' : 'off'
-          params.switches[2].switch = this.accessory.getService('Valve C').getCharacteristic(this.hapChar.Active).value === 1
-            ? 'on'
-            : 'off'
-          params.switches[3].switch = this.accessory.getService('Valve D').getCharacteristic(this.hapChar.Active).value === 1
-            ? 'on'
-            : 'off'
+          params.switches[2].switch = cValue === 1 ? 'on' : 'off'
+          params.switches[3].switch = dValue === 1 ? 'on' : 'off'
           break
-        case 'Valve C':
-          params.switches[0].switch = this.accessory.getService('Valve A').getCharacteristic(this.hapChar.Active).value === 1
-            ? 'on'
-            : 'off'
-          params.switches[1].switch = this.accessory.getService('Valve B').getCharacteristic(this.hapChar.Active).value === 1
-            ? 'on'
-            : 'off'
+        }
+        case 'Valve C': {
+          const aValue = this.accessory.getService('Valve A')
+            .getCharacteristic(this.hapChar.Active).value
+          const bValue = this.accessory.getService('Valve B')
+            .getCharacteristic(this.hapChar.Active).value
+          const dValue = this.accessory.getService('Valve D')
+            .getCharacteristic(this.hapChar.Active).value
+          params.switches[0].switch = aValue === 1 ? 'on' : 'off'
+          params.switches[1].switch = bValue === 1 ? 'on' : 'off'
           params.switches[2].switch = value ? 'on' : 'off'
-          params.switches[3].switch = this.accessory.getService('Valve D').getCharacteristic(this.hapChar.Active).value === 1
-            ? 'on'
-            : 'off'
+          params.switches[3].switch = dValue === 1 ? 'on' : 'off'
           break
-        case 'Valve D':
-          params.switches[0].switch = this.accessory.getService('Valve A').getCharacteristic(this.hapChar.Active).value === 1
-            ? 'on'
-            : 'off'
-          params.switches[1].switch = this.accessory.getService('Valve B').getCharacteristic(this.hapChar.Active).value === 1
-            ? 'on'
-            : 'off'
-          params.switches[2].switch = this.accessory.getService('Valve C').getCharacteristic(this.hapChar.Active).value === 1
-            ? 'on'
-            : 'off'
+        }
+        case 'Valve D': {
+          const aValue = this.accessory.getService('Valve A')
+            .getCharacteristic(this.hapChar.Active).value
+          const bValue = this.accessory.getService('Valve B')
+            .getCharacteristic(this.hapChar.Active).value
+          const cValue = this.accessory.getService('Valve C')
+            .getCharacteristic(this.hapChar.Active).value
+          params.switches[0].switch = aValue === 1 ? 'on' : 'off'
+          params.switches[1].switch = bValue === 1 ? 'on' : 'off'
+          params.switches[2].switch = cValue === 1 ? 'on' : 'off'
           params.switches[3].switch = value ? 'on' : 'off'
           break
+        }
       }
       valveService.updateCharacteristic(this.hapChar.InUse, value)
       switch (value) {
diff --git a/lib/device/simulation/valve-two.js b/lib/device/simulation/valve-two.js
index 7870ae9a..d4ae1ca9 100644
--- a/lib/device/simulation/valve-two.js
+++ b/lib/device/simulation/valve-two.js
@@ -82,18 +82,20 @@ module.exports = class deviceValveTwo {
       const params = { switches: this.consts.defaultMultiSwitchOff }
       const valveService = this.accessory.getService(valve)
       switch (valve) {
-        case 'Valve A':
+        case 'Valve A': {
+          const bValue = this.accessory.getService('Valve B')
+            .getCharacteristic(this.hapChar.Active).value
           params.switches[0].switch = value ? 'on' : 'off'
-          params.switches[1].switch = this.accessory.getService('Valve B').getCharacteristic(this.hapChar.Active).value === 1
-            ? 'on'
-            : 'off'
+          params.switches[1].switch = bValue === 1 ? 'on' : 'off'
           break
-        case 'Valve B':
-          params.switches[0].switch = this.accessory.getService('Valve A').getCharacteristic(this.hapChar.Active).value === 1
-            ? 'on'
-            : 'off'
+        }
+        case 'Valve B': {
+          const aValue = this.accessory.getService('Valve A')
+            .getCharacteristic(this.hapChar.Active).value
+          params.switches[0].switch = aValue === 1 ? 'on' : 'off'
           params.switches[1].switch = value ? 'on' : 'off'
           break
+        }
       }
       valveService.updateCharacteristic(this.hapChar.InUse, value)
       switch (value) {
diff --git a/lib/device/switch-multi.js b/lib/device/switch-multi.js
index 2b2f3592..29397eb7 100644
--- a/lib/device/switch-multi.js
+++ b/lib/device/switch-multi.js
@@ -80,17 +80,22 @@ module.exports = class deviceSwitchMulti {
           params.switches[2].switch = value ? 'on' : 'off'
           params.switches[3].switch = value ? 'on' : 'off'
           for (let i = 0; i <= 4; i++) {
-            if ((oAccessory = this.platform.devicesInHB.get(this.accessory.context.eweDeviceId + 'SW' + i))) {
+            const idToCheck = this.accessory.context.eweDeviceId + 'SW' + i
+            if ((oAccessory = this.platform.devicesInHB.get(idToCheck))) {
               if (this.showAsOutlet) {
-                oAccessory.getService(this.hapServ.Outlet).updateCharacteristic(this.hapChar.On, value)
-                oAccessory.getService(this.hapServ.Outlet).updateCharacteristic(this.hapChar.OutletInUse, value)
+                oAccessory.getService(this.hapServ.Outlet)
+                  .updateCharacteristic(this.hapChar.On, value)
+                oAccessory.getService(this.hapServ.Outlet)
+                  .updateCharacteristic(this.hapChar.OutletInUse, value)
               } else {
-                oAccessory.getService(this.hapServ.Switch).updateCharacteristic(this.hapChar.On, value)
+                oAccessory.getService(this.hapServ.Switch)
+                  .updateCharacteristic(this.hapChar.On, value)
               }
               oAccessory.context.cacheOnOff = value ? 'on' : 'off'
               oAccessory.eveService.addEntry({ status: value ? 1 : 0 })
               if (i > 0 && !this.disableDeviceLogging) {
-                this.log('[%s] current state [%s].', oAccessory.displayName, value ? 'on' : 'off')
+                const name = oAccessory.displayName
+                this.log('[%s] current state [%s].', name, value ? 'on' : 'off')
               }
             }
           }
@@ -101,9 +106,12 @@ module.exports = class deviceSwitchMulti {
         case '4':
           params.switches = this.consts.defaultMultiSwitchOff
           for (let i = 1; i <= 4; i++) {
-            if ((oAccessory = this.platform.devicesInHB.get(this.accessory.context.eweDeviceId + 'SW' + i))) {
-              const serviceToUse = this.showAsOutlet ? this.hapServ.Outlet : this.hapServ.Switch
-              if (oAccessory.getService(serviceToUse).getCharacteristic(this.hapChar.On).value) {
+            const idToCheck = this.accessory.context.eweDeviceId + 'SW' + i
+            if ((oAccessory = this.platform.devicesInHB.get(idToCheck))) {
+              const serv = this.showAsOutlet
+                ? this.hapServ.Outlet
+                : this.hapServ.Switch
+              if (oAccessory.getService(serv).getCharacteristic(this.hapChar.On).value) {
                 masterState = 'on'
               }
               if (i === parseInt(this.accessory.context.switchNumber)) {
@@ -111,10 +119,15 @@ module.exports = class deviceSwitchMulti {
                 oAccessory.context.cacheOnOff = value ? 'on' : 'off'
                 oAccessory.eveService.addEntry({ status: value ? 1 : 0 })
                 if (this.showAsOutlet) {
-                  oAccessory.getService(this.hapServ.Outlet).updateCharacteristic(this.hapChar.OutletInUse, value)
+                  oAccessory.getService(this.hapServ.Outlet)
+                    .updateCharacteristic(this.hapChar.OutletInUse, value)
                 }
                 if (i > 0 && !this.disableDeviceLogging) {
-                  this.log('[%s] current state [%s].', oAccessory.displayName, value ? 'on' : 'off')
+                  this.log(
+                    '[%s] current state [%s].',
+                    oAccessory.displayName,
+                    value ? 'on' : 'off'
+                  )
                 }
               } else {
                 params.switches[i - 1].switch = oAccessory.context.cacheOnOff
@@ -124,12 +137,17 @@ module.exports = class deviceSwitchMulti {
             }
           }
           if (!this.platform.hideMasters.includes(this.accessory.context.eweDeviceId)) {
-            oAccessory = this.platform.devicesInHB.get(this.accessory.context.eweDeviceId + 'SW0')
+            oAccessory = this.platform.devicesInHB.get(
+              this.accessory.context.eweDeviceId + 'SW0'
+            )
             if (this.showAsOutlet) {
-              oAccessory.getService(this.hapServ.Outlet).updateCharacteristic(this.hapChar.On, masterState === 'on')
-              oAccessory.getService(this.hapServ.Outlet).updateCharacteristic(this.hapChar.OutletInUse, masterState === 'on')
+              oAccessory.getService(this.hapServ.Outlet)
+                .updateCharacteristic(this.hapChar.On, masterState === 'on')
+              oAccessory.getService(this.hapServ.Outlet)
+                .updateCharacteristic(this.hapChar.OutletInUse, masterState === 'on')
             } else {
-              oAccessory.getService(this.hapServ.Switch).updateCharacteristic(this.hapChar.On, masterState === 'on')
+              oAccessory.getService(this.hapServ.Switch)
+                .updateCharacteristic(this.hapChar.On, masterState === 'on')
             }
             oAccessory.eveService.addEntry({ status: masterState === 'on' ? 1 : 0 })
           }
@@ -154,22 +172,37 @@ module.exports = class deviceSwitchMulti {
         }
         if (this.platform.devicesInHB.has(idToCheck + i)) {
           const oAccessory = this.platform.devicesInHB.get(idToCheck + i)
-          if (params.updateSource && params.switches[i - 1].switch === oAccessory.context.cacheOnOff) {
+          if (
+            params.updateSource &&
+            params.switches[i - 1].switch === oAccessory.context.cacheOnOff
+          ) {
             continue
           }
           if (this.showAsOutlet) {
-            oAccessory.getService(this.hapServ.Outlet)
-              .updateCharacteristic(this.hapChar.On, params.switches[i - 1].switch === 'on')
-            oAccessory.getService(this.hapServ.Outlet)
-              .updateCharacteristic(this.hapChar.OutletInUse, params.switches[i - 1].switch === 'on')
+            oAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
+              this.hapChar.On,
+              params.switches[i - 1].switch === 'on'
+            )
+            oAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
+              this.hapChar.OutletInUse,
+              params.switches[i - 1].switch === 'on'
+            )
           } else {
-            oAccessory.getService(this.hapServ.Switch)
-              .updateCharacteristic(this.hapChar.On, params.switches[i - 1].switch === 'on')
+            oAccessory.getService(this.hapServ.Switch).updateCharacteristic(
+              this.hapChar.On,
+              params.switches[i - 1].switch === 'on'
+            )
           }
           oAccessory.context.cacheOnOff = params.switches[i - 1].switch
-          oAccessory.eveService.addEntry({ status: params.switches[i - 1].switch === 'on' ? 1 : 0 })
+          oAccessory.eveService.addEntry({
+            status: params.switches[i - 1].switch === 'on' ? 1 : 0
+          })
           if (params.updateSource && !this.disableDeviceLogging) {
-            this.log('[%s] current state [%s].', oAccessory.displayName, params.switches[i - 1].switch)
+            this.log(
+              '[%s] current state [%s].',
+              oAccessory.displayName,
+              params.switches[i - 1].switch
+            )
           }
         }
       }
diff --git a/lib/device/thermostat.js b/lib/device/thermostat.js
index 8cb9d97b..9dd655f2 100644
--- a/lib/device/thermostat.js
+++ b/lib/device/thermostat.js
@@ -182,7 +182,7 @@ module.exports = class deviceThermostat {
 
           // Round to nearest 0.5
           currentTemp = Math.round(currentTemp * 2) / 2
-          this.log.warn('[%s] please set mode to celcius from the eWeLink app.', this.name)
+          this.log.warn('[%s] please set mode to celcius in the eWeLink app.', this.name)
         } else {
           currentTemp = Number(params.temperature)
         }
diff --git a/lib/device/zigbee/sensor-ambient.js b/lib/device/zigbee/sensor-ambient.js
index 058802e9..80e30f36 100644
--- a/lib/device/zigbee/sensor-ambient.js
+++ b/lib/device/zigbee/sensor-ambient.js
@@ -63,16 +63,25 @@ module.exports = class deviceZBSensorAmbient {
 
   async externalUpdate (params) {
     try {
-      if (this.funcs.hasProperty(params, 'battery') && params.battery !== this.cacheBattery) {
-        this.cacheBattery = params.battery
-        this.battService.updateCharacteristic(this.hapChar.BatteryLevel, this.cacheBattery)
-        this.battService.updateCharacteristic(this.hapChar.StatusLowBattery, this.cacheBattery < this.lowBattThreshold)
+      if (
+        this.funcs.hasProperty(params, 'battery') &&
+        params.battery !== this.cacheBatt
+      ) {
+        this.cacheBatt = params.battery
+        this.battService.updateCharacteristic(this.hapChar.BatteryLevel, this.cacheBatt)
+        this.battService.updateCharacteristic(
+          this.hapChar.StatusLowBattery,
+          this.cacheBatt < this.lowBattThreshold
+        )
         if (params.updateSource && !this.disableDeviceLogging) {
-          this.log('[%s] current battery [%s%].', this.name, this.cacheBattery)
+          this.log('[%s] current battery [%s%].', this.name, this.cacheBatt)
         }
       }
       const eveLog = {}
-      if (this.funcs.hasProperty(params, 'temperature') && params.temperature !== this.cacheTemp) {
+      if (
+        this.funcs.hasProperty(params, 'temperature') &&
+        params.temperature !== this.cacheTemp
+      ) {
         this.cacheTemp = params.temperature
         const currentTemp = parseInt(this.cacheTemp) / 100
         this.tService.updateCharacteristic(this.hapChar.CurrentTemperature, currentTemp)
@@ -81,10 +90,14 @@ module.exports = class deviceZBSensorAmbient {
           this.log('[%s] current temperature [%s].', this.name, currentTemp)
         }
       }
-      if (this.funcs.hasProperty(params, 'humidity') && params.humidity !== this.cacheHumi) {
+      if (
+        this.funcs.hasProperty(params, 'humidity') &&
+        params.humidity !== this.cacheHumi
+      ) {
         this.cacheHumi = params.humidity
         const currentHumi = parseInt(this.cacheHumi) / 100
-        this.hService.updateCharacteristic(this.hapChar.CurrentRelativeHumidity, currentHumi)
+        this.hService
+          .updateCharacteristic(this.hapChar.CurrentRelativeHumidity, currentHumi)
         eveLog.humidity = currentHumi
         if (params.updateSource && !this.disableDeviceLogging) {
           this.log('[%s] current humidity [%s].', this.name, currentHumi)
diff --git a/lib/device/zigbee/sensor-contact.js b/lib/device/zigbee/sensor-contact.js
index 08d10440..8afebbb6 100644
--- a/lib/device/zigbee/sensor-contact.js
+++ b/lib/device/zigbee/sensor-contact.js
@@ -149,11 +149,17 @@ module.exports = class deviceZBSensorContact {
 
   async externalUpdate (params) {
     try {
-      if (this.funcs.hasProperty(params, 'battery') && params.battery !== this.cacheBattery) {
+      if (
+        this.funcs.hasProperty(params, 'battery') &&
+        params.battery !== this.cacheBattery
+      ) {
         this.cacheBattery = params.battery
         const scaledBatt = this.scaleBattery ? this.cacheBattery * 10 : this.cacheBattery
         this.battService.updateCharacteristic(this.hapChar.BatteryLevel, scaledBatt)
-        this.battService.updateCharacteristic(this.hapChar.StatusLowBattery, scaledBatt < this.lowBattThreshold)
+        this.battService.updateCharacteristic(
+          this.hapChar.StatusLowBattery,
+          scaledBatt < this.lowBattThreshold
+        )
         if (params.updateSource && !this.disableDeviceLogging) {
           this.log('[%s] current battery [%s%].', this.name, scaledBatt)
         }
@@ -175,7 +181,11 @@ module.exports = class deviceZBSensorContact {
           this.accessory.eveService.addEntry({ status: 0 })
         }
         if (params.updateSource && !this.disableDeviceLogging) {
-          this.log('[%s] current state [contact%s detected].', this.name, params.lock === 0 ? '' : ' not')
+          this.log(
+            '[%s] current state [contact%s detected].',
+            this.name,
+            params.lock === 0 ? '' : ' not'
+          )
         }
       }
     } catch (err) {
diff --git a/lib/device/zigbee/sensor-motion.js b/lib/device/zigbee/sensor-motion.js
index a5de0e61..27b77e18 100644
--- a/lib/device/zigbee/sensor-motion.js
+++ b/lib/device/zigbee/sensor-motion.js
@@ -71,28 +71,44 @@ module.exports = class deviceZBSensorMotion {
 
   async externalUpdate (params) {
     try {
-      if (this.funcs.hasProperty(params, 'battery') && params.battery !== this.cacheBattery) {
-        this.cacheBattery = params.battery
-        this.battService.updateCharacteristic(this.hapChar.BatteryLevel, this.cacheBattery)
-        this.battService.updateCharacteristic(this.hapChar.StatusLowBattery, this.cacheBattery < this.lowBattThreshold)
+      if (
+        this.funcs.hasProperty(params, 'battery') &&
+        params.battery !== this.cacheBatt
+      ) {
+        this.cacheBatt = params.battery
+        this.battService.updateCharacteristic(this.hapChar.BatteryLevel, this.cacheBatt)
+        this.battService.updateCharacteristic(
+          this.hapChar.StatusLowBattery,
+          this.cacheBatt < this.lowBattThreshold
+        )
         if (params.updateSource && !this.disableDeviceLogging) {
-          this.log('[%s] current battery [%s%].', this.name, this.cacheBattery)
+          this.log('[%s] current battery [%s%].', this.name, this.cacheBatt)
         }
       }
-      if (this.funcs.hasProperty(params, 'motion') && this.funcs.hasProperty(params, 'trigTime')) {
+      if (
+        this.funcs.hasProperty(params, 'motion') &&
+        this.funcs.hasProperty(params, 'trigTime')
+      ) {
         const timeNow = new Date()
         const diff = (timeNow.getTime() - params.trigTime) / 1000
-        const motionDetected = params.updateSource && params.motion === 1 && diff < this.sensorTimeDifference
+        const motionDetected = params.updateSource &&
+          params.motion === 1 &&
+          diff < this.sensorTimeDifference
         this.service.updateCharacteristic(this.hapChar.MotionDetected, motionDetected)
         if (motionDetected) {
+          const initialTime = this.accessory.eveService.getInitialTime()
           this.service.updateCharacteristic(
             this.eveLastActivation,
-            Math.round(new Date().valueOf() / 1000) - this.accessory.eveService.getInitialTime()
+            Math.round(new Date().valueOf() / 1000) - initialTime
           )
         }
         this.accessory.eveService.addEntry({ status: motionDetected ? 1 : 0 })
         if (params.updateSource && !this.disableDeviceLogging) {
-          this.log('[%s] current state [motion%s detected].', this.name, motionDetected ? '' : ' not')
+          this.log(
+            '[%s] current state [motion%s detected].',
+            this.name,
+            motionDetected ? '' : ' not'
+          )
         }
       }
     } catch (err) {
diff --git a/lib/device/zigbee/switch-stateless.js b/lib/device/zigbee/switch-stateless.js
index 6ba3f9ac..17e67e23 100644
--- a/lib/device/zigbee/switch-stateless.js
+++ b/lib/device/zigbee/switch-stateless.js
@@ -56,18 +56,27 @@ module.exports = class deviceZBSwitchStateless {
 
   async externalUpdate (params) {
     try {
-      if (this.funcs.hasProperty(params, 'battery') && params.battery !== this.cacheBattery) {
-        this.cacheBattery = params.battery
-        this.battService.updateCharacteristic(this.hapChar.BatteryLevel, this.cacheBattery)
-        this.battService.updateCharacteristic(this.hapChar.StatusLowBattery, this.cacheBattery < this.lowBattThreshold)
+      if (
+        this.funcs.hasProperty(params, 'battery') &&
+        params.battery !== this.cacheBatt
+      ) {
+        this.cacheBatt = params.battery
+        this.battService.updateCharacteristic(this.hapChar.BatteryLevel, this.cacheBatt)
+        this.battService.updateCharacteristic(
+          this.hapChar.StatusLowBattery,
+          this.cacheBatt < this.lowBattThreshold
+        )
         if (params.updateSource && !this.disableDeviceLogging) {
           this.log('[%s] current battery [%s%].', this.name, params.battery)
         }
       }
       if (this.funcs.hasProperty(params, 'key') && [0, 1, 2].includes(params.key)) {
-        this.service.updateCharacteristic(this.hapChar.ProgrammableSwitchEvent, params.key)
+        this.service
+          .updateCharacteristic(this.hapChar.ProgrammableSwitchEvent, params.key)
         if (params.updateSource && !this.disableDeviceLogging) {
-          const textLabel = params.key === 0 ? 'single' : (params.key === 1 ? 'double' : 'long')
+          const textLabel = params.key === 0
+            ? 'single'
+            : (params.key === 1 ? 'double' : 'long')
           this.log('[%s] current state [%s press].', this.name, textLabel)
         }
       }

From fcd81ec3140ce6d228c729cefddede9bfc19c24e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 23 Feb 2021 16:53:32 +0000
Subject: [PATCH 1548/3183] 5.0.0-14

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index a09b4c72..84dbc160 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "5.0.0-13",
+  "version": "5.0.0-14",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 753bfc45..dd810dbe 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "5.0.0-13",
+  "version": "5.0.0-14",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From ca96abd36526af3516fd5fc1189eced68bb19b02 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 23 Feb 2021 17:19:23 +0000
Subject: [PATCH 1549/3183] ignore on hb restart

---
 lib/device/zigbee/sensor-motion.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/lib/device/zigbee/sensor-motion.js b/lib/device/zigbee/sensor-motion.js
index 27b77e18..eb234275 100644
--- a/lib/device/zigbee/sensor-motion.js
+++ b/lib/device/zigbee/sensor-motion.js
@@ -86,14 +86,13 @@ module.exports = class deviceZBSensorMotion {
         }
       }
       if (
+        params.updateSource &&
         this.funcs.hasProperty(params, 'motion') &&
         this.funcs.hasProperty(params, 'trigTime')
       ) {
         const timeNow = new Date()
         const diff = (timeNow.getTime() - params.trigTime) / 1000
-        const motionDetected = params.updateSource &&
-          params.motion === 1 &&
-          diff < this.sensorTimeDifference
+        const motionDetected = params.motion === 1 && diff < this.sensorTimeDifference
         this.service.updateCharacteristic(this.hapChar.MotionDetected, motionDetected)
         if (motionDetected) {
           const initialTime = this.accessory.eveService.getInitialTime()
@@ -103,7 +102,7 @@ module.exports = class deviceZBSensorMotion {
           )
         }
         this.accessory.eveService.addEntry({ status: motionDetected ? 1 : 0 })
-        if (params.updateSource && !this.disableDeviceLogging) {
+        if (!this.disableDeviceLogging) {
           this.log(
             '[%s] current state [motion%s detected].',
             this.name,

From d7983cd9e696bd78cb6fafff98ec017eecaf3e60 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 23 Feb 2021 17:31:14 +0000
Subject: [PATCH 1550/3183] Revert "ignore on hb restart"

This reverts commit ca96abd36526af3516fd5fc1189eced68bb19b02.
---
 lib/device/zigbee/sensor-motion.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/device/zigbee/sensor-motion.js b/lib/device/zigbee/sensor-motion.js
index eb234275..27b77e18 100644
--- a/lib/device/zigbee/sensor-motion.js
+++ b/lib/device/zigbee/sensor-motion.js
@@ -86,13 +86,14 @@ module.exports = class deviceZBSensorMotion {
         }
       }
       if (
-        params.updateSource &&
         this.funcs.hasProperty(params, 'motion') &&
         this.funcs.hasProperty(params, 'trigTime')
       ) {
         const timeNow = new Date()
         const diff = (timeNow.getTime() - params.trigTime) / 1000
-        const motionDetected = params.motion === 1 && diff < this.sensorTimeDifference
+        const motionDetected = params.updateSource &&
+          params.motion === 1 &&
+          diff < this.sensorTimeDifference
         this.service.updateCharacteristic(this.hapChar.MotionDetected, motionDetected)
         if (motionDetected) {
           const initialTime = this.accessory.eveService.getInitialTime()
@@ -102,7 +103,7 @@ module.exports = class deviceZBSensorMotion {
           )
         }
         this.accessory.eveService.addEntry({ status: motionDetected ? 1 : 0 })
-        if (!this.disableDeviceLogging) {
+        if (params.updateSource && !this.disableDeviceLogging) {
           this.log(
             '[%s] current state [motion%s detected].',
             this.name,

From 83005711ff90b8fa17e6c1549338152c1ee3d052 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 23 Feb 2021 18:48:24 +0000
Subject: [PATCH 1551/3183] add label per device config

---
 config.schema.json     | 57 ++++++++++++++++++++++++++++++++++++++++--
 lib/index.js           |  3 +++
 lib/utils/constants.js | 15 ++++++-----
 3 files changed, 67 insertions(+), 8 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 86af71e2..5d92ea02 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -75,6 +75,11 @@
               "type": "string",
               "title": "Device ID"
             },
+            "label": {
+              "title": "Label",
+              "type": "string",
+              "description": "This setting has no effect except to be a helpful label for identifying which device this is when editing the configuration."
+            },
             "showAsOutlet": {
               "type": "boolean",
               "title": "Show As Outlet",
@@ -105,6 +110,11 @@
               "type": "string",
               "title": "Device ID"
             },
+            "label": {
+              "title": "Label",
+              "type": "string",
+              "description": "This setting has no effect except to be a helpful label for identifying which device this is when editing the configuration."
+            },
             "showAsOutlet": {
               "type": "boolean",
               "title": "Show As Outlets",
@@ -140,6 +150,11 @@
               "type": "string",
               "title": "Device ID"
             },
+            "label": {
+              "title": "Label",
+              "type": "string",
+              "description": "This setting has no effect except to be a helpful label for identifying which device this is when editing the configuration."
+            },
             "showAsSwitch": {
               "type": "boolean",
               "title": "Show As Switch",
@@ -180,6 +195,11 @@
               "type": "string",
               "title": "Device ID"
             },
+            "label": {
+              "title": "Label",
+              "type": "string",
+              "description": "This setting has no effect except to be a helpful label for identifying which device this is when editing the configuration."
+            },
             "bulbModel": {
               "type": "string",
               "title": "Device Model",
@@ -232,6 +252,11 @@
               "type": "string",
               "title": "Device ID"
             },
+            "label": {
+              "title": "Label",
+              "type": "string",
+              "description": "This setting has no effect except to be a helpful label for identifying which device this is when editing the configuration."
+            },
             "hideSwitch": {
               "type": "boolean",
               "title": "Hide Switch",
@@ -263,6 +288,11 @@
               "type": "string",
               "title": "Device ID"
             },
+            "label": {
+              "title": "Label",
+              "type": "string",
+              "description": "This setting has no effect except to be a helpful label for identifying which device this is when editing the configuration."
+            },
             "hideLight": {
               "type": "boolean",
               "title": "Hide Light Switch",
@@ -288,6 +318,11 @@
               "type": "string",
               "title": "Device ID"
             },
+            "label": {
+              "title": "Label",
+              "type": "string",
+              "description": "This setting has no effect except to be a helpful label for identifying which device this is when editing the configuration."
+            },
             "lowBattThreshold": {
               "type": "number",
               "title": "Low Battery Threshold",
@@ -333,6 +368,11 @@
               "title": "Sensor Device ID",
               "description": "Device ID of the sensor (13 digits normally in the format 1000ab23cdSW2)."
             },
+            "label": {
+              "title": "Label",
+              "type": "string",
+              "description": "This setting has no effect except to be a helpful label for identifying which device this is when editing the configuration."
+            },
             "type": {
               "type": "string",
               "title": "Sensor Type",
@@ -399,8 +439,12 @@
           "properties": {
             "deviceId": {
               "type": "string",
-              "title": "Device ID",
-              "description": "Device ID from your eWeLink app (ten digits normally in the format 1000ab23cd)."
+              "title": "Device ID"
+            },
+            "label": {
+              "title": "Label",
+              "type": "string",
+              "description": "This setting has no effect except to be a helpful label for identifying which device this is when editing the configuration."
             },
             "type": {
               "type": "string",
@@ -568,6 +612,7 @@
         "type": "fieldset",
         "items": [
           "singleDevices[].deviceId",
+          "singleDevices[].label",
           "singleDevices[].showAsOutlet",
           "singleDevices[].ipAddress",
           "singleDevices[].overrideDisabledLogging"
@@ -585,6 +630,7 @@
         "type": "fieldset",
         "items": [
           "multiDevices[].deviceId",
+          "multiDevices[].label",
           "multiDevices[].showAsOutlet",
           "multiDevices[].hideChannels",
           "multiDevices[].ipAddress",
@@ -603,6 +649,7 @@
         "type": "fieldset",
         "items": [
           "outletDevices[].deviceId",
+          "outletDevices[].label",
           "outletDevices[].showAsSwitch",
           "outletDevices[].inUsePowerThreshold",
           "outletDevices[].ipAddress",
@@ -621,6 +668,7 @@
         "type": "fieldset",
         "items": [
           "lightDevices[].deviceId",
+          "lightDevices[].label",
           "lightDevices[].bulbModel",
           "lightDevices[].brightnessStep",
           "lightDevices[].adaptiveLightingShift",
@@ -639,6 +687,7 @@
         "type": "fieldset",
         "items": [
           "thDevices[].deviceId",
+          "thDevices[].label",
           "thDevices[].hideSwitch",
           "thDevices[].offset",
           "thDevices[].overrideDisabledLogging"
@@ -656,6 +705,7 @@
         "type": "fieldset",
         "items": [
           "fanDevices[].deviceId",
+          "fanDevices[].label",
           "fanDevices[].hideLight",
           "fanDevices[].overrideDisabledLogging"
         ]
@@ -672,6 +722,7 @@
         "type": "fieldset",
         "items": [
           "sensorDevices[].deviceId",
+          "sensorDevices[].label",
           "sensorDevices[].lowBattThreshold",
           "sensorDevices[].hideLongDouble",
           "sensorDevices[].scaleBattery",
@@ -690,6 +741,7 @@
         "type": "fieldset",
         "items": [
           "bridgeSensors[].fullDeviceId",
+          "bridgeSensors[].label",
           "bridgeSensors[].type",
           "bridgeSensors[].sensorTimeLength",
           "bridgeSensors[].sensorTimeDifference",
@@ -708,6 +760,7 @@
         "type": "fieldset",
         "items": [
           "groups[].deviceId",
+          "groups[].label",
           "groups[].type",
           "groups[].setup",
           "groups[].operationTime",
diff --git a/lib/index.js b/lib/index.js
index 5ec06e0a..37b42b04 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -110,6 +110,7 @@ class eWeLinkPlatform {
               for (const [k, v] of entries) {
                 switch (k) {
                   case 'fullDeviceId':
+                  case 'label':
                     break
                   case 'overrideDisabledLogging':
                     if (typeof v === 'string') {
@@ -228,6 +229,7 @@ class eWeLinkPlatform {
                     break
                   }
                   case 'deviceId':
+                  case 'label':
                     break
                   case 'hideChannels': {
                     if (typeof v !== 'string' || v === '') {
@@ -298,6 +300,7 @@ class eWeLinkPlatform {
               for (const [k, v] of entries) {
                 switch (k) {
                   case 'deviceId':
+                  case 'label':
                     break
                   case 'ipAddress': {
                     if (typeof v !== 'string' || v === '') {
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 675326b2..ef26d47e 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -65,20 +65,23 @@ module.exports = {
   httpRetryCodes: ['ENOTFOUND', 'ETIMEDOUT', 'EAI_AGAIN'],
 
   allowed: {
-    singleDevices: ['deviceId', 'showAsOutlet', 'ipAddress', 'overrideDisabledLogging'],
+    singleDevices: [
+      'deviceId', 'label', 'showAsOutlet', 'ipAddress', 'overrideDisabledLogging'
+    ],
     multiDevices: [
-      'deviceId', 'showAsOutlet', 'hideChannels', 'ipAddress', 'overrideDisabledLogging'
+      'deviceId', 'label', 'showAsOutlet', 'hideChannels', 'ipAddress',
+      'overrideDisabledLogging'
     ],
     outletDevices: [
-      'deviceId', 'showAsSwitch', 'inUsePowerThreshold', 'ipAddress',
+      'deviceId', 'label', 'showAsSwitch', 'inUsePowerThreshold', 'ipAddress',
       'overrideDisabledLogging'
     ],
     lightDevices: [
-      'deviceId', 'bulbModel', 'brightnessStep', 'adaptiveLightingShift',
+      'deviceId', 'label', 'bulbModel', 'brightnessStep', 'adaptiveLightingShift',
       'overrideDisabledLogging'
     ],
-    thDevices: ['deviceId', 'hideSwitch', 'offset', 'overrideDisabledLogging'],
-    fanDevices: ['deviceId', 'hideLight', 'overrideDisabledLogging'],
+    thDevices: ['deviceId', 'label', 'hideSwitch', 'offset', 'overrideDisabledLogging'],
+    fanDevices: ['deviceId', 'label', 'hideLight', 'overrideDisabledLogging'],
     sensorDevices: [
       'deviceId', 'lowBattThreshold', 'hideLongDouble', 'scaleBattery',
       'sensorTimeDifference', 'overrideDisabledLogging'

From e002a6585314d66a29e06f7a8ada2a17e04fbab7 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 23 Feb 2021 18:51:34 +0000
Subject: [PATCH 1552/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3310d3ed..43f9bc6a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 * **Configuration**
   * The ability to explicitly enable device logging per device if you have `disableDeviceLogging` set to true
+  * A `label` setting per device group which has no effect except to help identify the device when editing the configuration
   * New `brightnessStep` option to specify a minimum brightness step in the Home app per dimmer/bulb/LED strip
   * New `adaptiveLightingShift` option to offset the Adaptive Lighting values per bulb
   * `showAsOutlet` option extended multi-channel switch and light switch devices to expose them as outlets

From 814c48f76f67f7821d8c3919235e56c7f7108ae6 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 23 Feb 2021 19:13:36 +0000
Subject: [PATCH 1553/3183] correct bool result

---
 lib/device/zigbee/sensor-motion.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/device/zigbee/sensor-motion.js b/lib/device/zigbee/sensor-motion.js
index 27b77e18..b8ad4fa2 100644
--- a/lib/device/zigbee/sensor-motion.js
+++ b/lib/device/zigbee/sensor-motion.js
@@ -91,9 +91,9 @@ module.exports = class deviceZBSensorMotion {
       ) {
         const timeNow = new Date()
         const diff = (timeNow.getTime() - params.trigTime) / 1000
-        const motionDetected = params.updateSource &&
+        const motionDetected = !!(params.updateSource &&
           params.motion === 1 &&
-          diff < this.sensorTimeDifference
+          diff < this.sensorTimeDifference)
         this.service.updateCharacteristic(this.hapChar.MotionDetected, motionDetected)
         if (motionDetected) {
           const initialTime = this.accessory.eveService.getInitialTime()

From 052959f96e8ec3d83221d6d722f76755f876a525 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 23 Feb 2021 19:17:15 +0000
Subject: [PATCH 1554/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 43f9bc6a..9c8af468 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -32,6 +32,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 * New plugin configuration format - [more info](https://gist.github.com/bwp91/e87d9d3eb0e5dbc08e9ae7b31e33366e)
 * Device firmware version will now show correctly in HomeKit apps
+* Fixes a characteristic warning for *MotionDetected* for Zigbee Motion Sensors
 * Information about error 406 added to the logs in the form of a link (shown when error is received)
 * Updated minimum Node to v14.16.0
 

From 43995636134c51b82df5376523da3e9341cda00f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 23 Feb 2021 19:18:23 +0000
Subject: [PATCH 1555/3183] 5.0.0-15

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 84dbc160..6e75fcaf 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "5.0.0-14",
+  "version": "5.0.0-15",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index dd810dbe..e1a9e56b 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "5.0.0-14",
+  "version": "5.0.0-15",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 1cb1fb74827f421a741e5f2c9021209a9a570718 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 24 Feb 2021 08:37:48 +0000
Subject: [PATCH 1556/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9c8af468..9424d255 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,12 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 ## BETA
 
-* ⚠️ This release includes an overhaul of the configuration with some breaking changes - [more info](https://gist.github.com/bwp91/e87d9d3eb0e5dbc08e9ae7b31e33366e)
+* ⚠️ This release includes an overhaul of the settings in particular to specific device configuration
+* The following options have been replaced:
+  * `hideChanFromHB`, `switchAsOutlet`, `outletAsSwitch`, `inUsePowerThreshold`, `hideLightFromFan`, `hideSwitchFromTH`, `thAsThermostat`, `resetRFBridge`, `lowBattThreshold`, `sensorTimeDifference`, `bulbB02BA60`, `bulbB02FST64`, `thTempOffset`, `hideZBLDPress`, `ZBDWBatt`, `ipOverride`
+* If you use any of the above options then please take some time to review the changes after updating the plugin
+* Detailed information about the changes can be seen [here](https://gist.github.com/bwp91/e87d9d3eb0e5dbc08e9ae7b31e33366e)
+
 
 ### Added
 

From 731f201c39c3118bbbc3b028f59c145e7837363f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 24 Feb 2021 08:48:08 +0000
Subject: [PATCH 1557/3183] deps

---
 package-lock.json | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 6e75fcaf..97181ed9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -201,20 +201,20 @@
       "integrity": "sha512-fP9VSMgcml+U2uJ9PBc4/LDQ3ZkJCH4blLNCS6gbH7RHyRZCYs91zxWHqiUy+heFiEMiB2op/qllYoFqmIqdWA=="
     },
     "string.prototype.trimend": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.3.tgz",
-      "integrity": "sha512-ayH0pB+uf0U28CtjlLvL7NaohvR1amUvVZk+y3DYb0Ey2PUV5zPkkKy9+U1ndVEIXO8hNg18eIv9Jntbii+dKw==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz",
+      "integrity": "sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==",
       "requires": {
-        "call-bind": "^1.0.0",
+        "call-bind": "^1.0.2",
         "define-properties": "^1.1.3"
       }
     },
     "string.prototype.trimstart": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.3.tgz",
-      "integrity": "sha512-oBIBUy5lea5tt0ovtOFiEQaBkoBBkyJhZXzJYrSmDo5IUUqbOPvVezuRs/agBIdZ2p2Eo1FD6bD9USyBLfl3xg==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz",
+      "integrity": "sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==",
       "requires": {
-        "call-bind": "^1.0.0",
+        "call-bind": "^1.0.2",
         "define-properties": "^1.1.3"
       }
     },

From e3d1dcb2e0dbc7330060845147d08882aabf2856 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 24 Feb 2021 08:48:54 +0000
Subject: [PATCH 1558/3183] 5.0.0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 97181ed9..87cab91a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "5.0.0-15",
+  "version": "5.0.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index e1a9e56b..48275767 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "5.0.0-15",
+  "version": "5.0.0",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 2c3b113f8b0482bbbedaab6f17f91625fa979bed Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 24 Feb 2021 09:41:32 +0000
Subject: [PATCH 1559/3183] separate different light type files

---
 lib/device/{light-ctemp.js => light-cct.js}   |   2 +-
 .../{light-colour.js => light-rgb-cct.js}     | 121 ++--------
 lib/device/light-rgb.js                       | 215 ++++++++++++++++++
 lib/index.js                                  |  35 +--
 lib/utils/constants.js                        |   7 +-
 5 files changed, 262 insertions(+), 118 deletions(-)
 rename lib/device/{light-ctemp.js => light-cct.js} (99%)
 rename lib/device/{light-colour.js => light-rgb-cct.js} (80%)
 create mode 100644 lib/device/light-rgb.js

diff --git a/lib/device/light-ctemp.js b/lib/device/light-cct.js
similarity index 99%
rename from lib/device/light-ctemp.js
rename to lib/device/light-cct.js
index 5311c64c..c562d434 100644
--- a/lib/device/light-ctemp.js
+++ b/lib/device/light-cct.js
@@ -2,7 +2,7 @@
 /* eslint-disable new-cap */
 'use strict'
 
-module.exports = class deviceLightColour {
+module.exports = class deviceLightCCT {
   constructor (platform, accessory) {
     // Set up variables from the platform
     this.consts = platform.consts
diff --git a/lib/device/light-colour.js b/lib/device/light-rgb-cct.js
similarity index 80%
rename from lib/device/light-colour.js
rename to lib/device/light-rgb-cct.js
index 8f5b9829..4ba711d4 100644
--- a/lib/device/light-colour.js
+++ b/lib/device/light-rgb-cct.js
@@ -2,7 +2,7 @@
 /* eslint-disable new-cap */
 'use strict'
 
-module.exports = class deviceLightColour {
+module.exports = class deviceLightRGBCCT {
   constructor (platform, accessory) {
     // Set up variables from the platform
     this.consts = platform.consts
@@ -18,7 +18,6 @@ module.exports = class deviceLightColour {
     // Set up variables from the accessory
     this.name = accessory.displayName
     this.accessory = accessory
-    this.isB1 = this.accessory.context.eweUIID === 22
 
     // Set up custom variables for this device type
     const deviceId = this.accessory.context.eweDeviceId
@@ -54,33 +53,24 @@ module.exports = class deviceLightColour {
     this.service.getCharacteristic(this.hapChar.Saturation)
       .on('set', (value, callback) => callback())
 
-    if (this.isB1) {
-      // B1 doesn't support brightness so set a minimum step (ie on or off)
-      this.service.getCharacteristic(this.hapChar.Brightness)
-        .setProps({ minStep: 100 })
-    }
-
-    // Some bulbs support cct with a range of 2700K-6500K corresponding to ewelink 0-255
-    if ([59, 104].includes(this.accessory.context.eweUIID)) {
-      // Add the set handler to the lightbulb colour temperature characteristic
-      this.service.getCharacteristic(this.hapChar.ColorTemperature)
-        .on('set', this.internalCTempUpdate.bind(this))
+    // Add the set handler to the lightbulb colour temperature characteristic
+    this.service.getCharacteristic(this.hapChar.ColorTemperature)
+      .on('set', this.internalCTempUpdate.bind(this))
 
-      // Set up the adaptive lighting controller if available
-      if (
-        platform.api.versionGreaterOrEqual &&
-        platform.api.versionGreaterOrEqual('1.3.0-beta.58')
-      ) {
-        // This is needed as sometimes we need to send the brightness with a cct update
-        this.cacheBright = this.service.getCharacteristic(this.hapChar.Brightness).value
+    // Set up the adaptive lighting controller if available
+    if (
+      platform.api.versionGreaterOrEqual &&
+      platform.api.versionGreaterOrEqual('1.3.0-beta.58')
+    ) {
+      // This is needed as sometimes we need to send the brightness with a cct update
+      this.cacheBright = this.service.getCharacteristic(this.hapChar.Brightness).value
 
-        // Set up the adaptive lighting controller
-        this.alController = new platform.api.hap.AdaptiveLightingController(
-          this.service,
-          { customTemperatureAdjustment: this.alShift }
-        )
-        this.accessory.configureController(this.alController)
-      }
+      // Set up the adaptive lighting controller
+      this.alController = new platform.api.hap.AdaptiveLightingController(
+        this.service,
+        { customTemperatureAdjustment: this.alShift }
+      )
+      this.accessory.configureController(this.alController)
     }
 
     // Output the customised options to the log if in debug mode
@@ -103,11 +93,7 @@ module.exports = class deviceLightColour {
         return
       }
       this.cacheOnOff = onoff
-      if (this.isB1) {
-        params.state = this.cacheOnOff
-      } else {
-        params.switch = this.cacheOnOff
-      }
+      params.switch = this.cacheOnOff
       const timerKey = Math.random().toString(36).substr(2, 8)
       this.updateTimeout = timerKey
       setTimeout(() => {
@@ -136,9 +122,6 @@ module.exports = class deviceLightColour {
       const updateKeyBright = Math.random().toString(36).substr(2, 8)
       this.updateKeyBright = updateKeyBright
       switch (this.accessory.context.eweUIID) {
-        case 22:
-          // B1 doesn't support brightness
-          return
         case 59:
           // L1
           params = {
@@ -204,18 +187,6 @@ module.exports = class deviceLightColour {
       this.cacheMired = 0
       this.cacheCT = 0
       switch (this.accessory.context.eweUIID) {
-        case 22:
-        // B1
-          params = {
-            zyx_mode: 2,
-            type: 'middle',
-            channel0: '0',
-            channel1: '0',
-            channel2: this.cacheR.toString(),
-            channel3: this.cacheG.toString(),
-            channel4: this.cacheB.toString()
-          }
-          break
         case 59:
           // L1
           params = {
@@ -349,67 +320,15 @@ module.exports = class deviceLightColour {
       if (this.updateTimeout) {
         return
       }
-      if (
-        (this.isB1 && params.state && params.state !== this.cacheOnOff) ||
-        (!this.isB1 && params.switch && params.switch !== this.cacheOnOff)
-      ) {
-        this.cacheOnOff = this.isB1 ? params.state : params.switch
+      if (params.switch && params.switch !== this.cacheOnOff) {
+        this.cacheOnOff = params.switch
         this.service.updateCharacteristic(this.hapChar.On, this.cacheOnOff === 'on')
-        if (this.isB1) {
-          this.service.updateCharacteristic(
-            this.hapChar.Brightness,
-            this.cacheOnOff === 'on' ? 100 : 0
-          )
-        }
         if (params.updateSource && !this.disableDeviceLogging) {
           this.log('[%s] current state [%s].', this.name, this.cacheOnOff)
         }
       }
       let hs
-      let mode
       switch (this.accessory.context.eweUIID) {
-        case 22:
-          // B1
-          if (params.zyx_mode) {
-            mode = parseInt(params.zyx_mode)
-          } else if (
-            this.funcs.hasProperty(params, 'channel0') &&
-            parseInt(params.channel0) + parseInt(params.channel1) > 0
-          ) {
-            mode = 1
-          } else {
-            mode = 2
-          }
-          if (mode === 2) {
-            if (this.funcs.hasProperty(params, 'channel2')) {
-              if (
-                params.channel2 !== (this.cacheR || 0).toString() ||
-                params.channel3 !== (this.cacheG || 0).toString() ||
-                params.channel4 !== (this.cacheB || 0).toString()
-              ) {
-                this.cacheR = parseInt(params.channel2)
-                this.cacheG = parseInt(params.channel3)
-                this.cacheB = parseInt(params.channel4)
-                hs = this.colourUtils.rgb2hs(this.cacheR, this.cacheG, this.cacheB)
-                this.cacheHue = hs[0]
-                this.service.updateCharacteristic(this.hapChar.Hue, this.cacheHue)
-                  .updateCharacteristic(this.hapChar.Saturation, 100)
-                  .updateCharacteristic(this.hapChar.Brightness, 100)
-                if (params.updateSource && !this.disableDeviceLogging) {
-                  this.log(
-                    '[%s] current colour [rgb %s %s %s].',
-                    this.name,
-                    this.cacheR, this.cacheG, this.cacheB
-                  )
-                }
-              }
-            }
-          } else {
-            if (params.updateSource) {
-              this.log('[%s] current mode [white] is unsupported.', this.name)
-            }
-          }
-          break
         case 59:
           // L1
           if (this.funcs.hasProperty(params, 'bright')) {
diff --git a/lib/device/light-rgb.js b/lib/device/light-rgb.js
new file mode 100644
index 00000000..c52f68e6
--- /dev/null
+++ b/lib/device/light-rgb.js
@@ -0,0 +1,215 @@
+/* jshint -W014, -W033, esversion: 9 */
+/* eslint-disable new-cap */
+'use strict'
+
+module.exports = class deviceLightRGB {
+  constructor (platform, accessory) {
+    // Set up variables from the platform
+    this.consts = platform.consts
+    this.debug = platform.config.debug
+    this.funcs = platform.funcs
+    this.hapServ = platform.api.hap.Service
+    this.hapChar = platform.api.hap.Characteristic
+    this.colourUtils = platform.colourUtils
+    this.log = platform.log
+    this.messages = platform.messages
+    this.platform = platform
+
+    // Set up variables from the accessory
+    this.name = accessory.displayName
+    this.accessory = accessory
+    this.isB1 = this.accessory.context.eweUIID === 22
+
+    // Set up custom variables for this device type
+    const deviceId = this.accessory.context.eweDeviceId
+    const deviceConf = platform.lightDevices[deviceId]
+    this.alShift = deviceConf && deviceConf.adaptiveLightingShift
+      ? deviceConf.adaptiveLightingShift
+      : platform.consts.defaultValues.adaptiveLightingShift
+    this.brightStep = deviceConf && deviceConf.brightnessStep
+      ? Math.min(deviceConf.brightnessStep, 100)
+      : platform.consts.defaultValues.brightnessStep
+    this.disableDeviceLogging = deviceConf && deviceConf.overrideDisabledLogging
+      ? false
+      : platform.config.disableDeviceLogging
+
+    // Add the lightbulb service if it doesn't already exist
+    this.service = this.accessory.getService(this.hapServ.Lightbulb) ||
+      this.accessory.addService(this.hapServ.Lightbulb)
+
+    // Add the set handler to the lightbulb on/off characteristic
+    this.service.getCharacteristic(this.hapChar.On)
+      .on('set', this.internalOnOffUpdate.bind(this))
+
+    // Add the set handler to the lightbulb brightness characteristic
+    this.service.getCharacteristic(this.hapChar.Brightness)
+      .on('set', this.internalBrightnessUpdate.bind(this))
+
+    // B1 doesn't support brightness so set a minimum step (ie on or off)
+    this.service.getCharacteristic(this.hapChar.Brightness)
+      .setProps({ minStep: 100 })
+
+    // Add the set handler to the lightbulb hue characteristic
+    this.service.getCharacteristic(this.hapChar.Hue)
+      .on('set', this.internalColourUpdate.bind(this))
+
+    // Add the set handler to the lightbulb saturation characteristic
+    this.service.getCharacteristic(this.hapChar.Saturation)
+      .on('set', (value, callback) => callback())
+
+    // Output the customised options to the log if in debug mode
+    if (this.debug) {
+      const opts = JSON.stringify({ disableDeviceLogging: this.disableDeviceLogging })
+      this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
+    }
+  }
+
+  async internalOnOffUpdate (value, callback) {
+    try {
+      callback()
+      const params = {}
+      const onoff = value ? 'on' : 'off'
+      if (this.cacheOnOff === onoff) {
+        return
+      }
+      this.cacheOnOff = onoff
+      params.state = this.cacheOnOff
+      const timerKey = Math.random().toString(36).substr(2, 8)
+      this.updateTimeout = timerKey
+      setTimeout(() => {
+        if (this.updateTimeout === timerKey) {
+          this.updateTimeout = false
+        }
+      }, 10000)
+      await this.platform.sendDeviceUpdate(this.accessory, params)
+      if (!this.disableDeviceLogging) {
+        this.log('[%s] current state [%s].', this.name, this.cacheOnOff)
+      }
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, true)
+    }
+  }
+
+  async internalBrightnessUpdate (value, callback) {
+    try {
+      this.cacheBright = value
+      callback()
+      // B1 doesn't support brightness
+      return
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, true)
+    }
+  }
+
+  async internalColourUpdate (value, callback) {
+    try {
+      if (this.cacheHue === value) {
+        callback()
+        return
+      }
+      this.cacheHue = value
+      this.service.updateCharacteristic(this.hapChar.ColorTemperature, 140)
+      callback()
+      const saturation = this.service.getCharacteristic(this.hapChar.Saturation).value
+      const newRGB = this.colourUtils.hs2rgb(value, saturation)
+      this.cacheR = newRGB[0]
+      this.cacheG = newRGB[1]
+      this.cacheB = newRGB[2]
+      const params = {
+        zyx_mode: 2,
+        type: 'middle',
+        channel0: '0',
+        channel1: '0',
+        channel2: this.cacheR.toString(),
+        channel3: this.cacheG.toString(),
+        channel4: this.cacheB.toString()
+      }
+      const updateKeyColour = Math.random().toString(36).substr(2, 8)
+      this.updateKeyColour = updateKeyColour
+      await this.funcs.sleep(400)
+      if (updateKeyColour !== this.updateKeyColour) {
+        return
+      }
+      this.updateTimeout = updateKeyColour
+      setTimeout(() => {
+        if (this.updateTimeout === updateKeyColour) {
+          this.updateTimeout = false
+        }
+      }, 10000)
+      await this.platform.sendDeviceUpdate(this.accessory, params)
+      if (!this.disableDeviceLogging) {
+        this.log(
+          '[%s] current colour [rgb %s %s %s].',
+          this.name,
+          this.cacheR,
+          this.cacheG,
+          this.cacheB
+        )
+      }
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, true)
+    }
+  }
+
+  async externalUpdate (params) {
+    try {
+      if (this.updateTimeout) {
+        return
+      }
+      if (params.state && params.state !== this.cacheOnOff) {
+        this.cacheOnOff = params.state
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheOnOff === 'on')
+        this.service.updateCharacteristic(
+          this.hapChar.Brightness,
+          this.cacheOnOff === 'on' ? 100 : 0
+        )
+        if (params.updateSource && !this.disableDeviceLogging) {
+          this.log('[%s] current state [%s].', this.name, this.cacheOnOff)
+        }
+      }
+      let hs
+      let mode
+      if (params.zyx_mode) {
+        mode = parseInt(params.zyx_mode)
+      } else if (
+        this.funcs.hasProperty(params, 'channel0') &&
+        parseInt(params.channel0) + parseInt(params.channel1) > 0
+      ) {
+        mode = 1
+      } else {
+        mode = 2
+      }
+      if (mode === 2) {
+        if (this.funcs.hasProperty(params, 'channel2')) {
+          if (
+            params.channel2 !== (this.cacheR || 0).toString() ||
+            params.channel3 !== (this.cacheG || 0).toString() ||
+            params.channel4 !== (this.cacheB || 0).toString()
+          ) {
+            this.cacheR = parseInt(params.channel2)
+            this.cacheG = parseInt(params.channel3)
+            this.cacheB = parseInt(params.channel4)
+            hs = this.colourUtils.rgb2hs(this.cacheR, this.cacheG, this.cacheB)
+            this.cacheHue = hs[0]
+            this.service.updateCharacteristic(this.hapChar.Hue, this.cacheHue)
+              .updateCharacteristic(this.hapChar.Saturation, 100)
+              .updateCharacteristic(this.hapChar.Brightness, 100)
+            if (params.updateSource && !this.disableDeviceLogging) {
+              this.log(
+                '[%s] current colour [rgb %s %s %s].',
+                this.name,
+                this.cacheR, this.cacheG, this.cacheB
+              )
+            }
+          }
+        }
+      } else {
+        if (params.updateSource) {
+          this.log('[%s] current mode [white] is unsupported.', this.name)
+        }
+      }
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, false)
+    }
+  }
+}
diff --git a/lib/index.js b/lib/index.js
index 37b42b04..d0957cba 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -837,25 +837,34 @@ class eWeLinkPlatform {
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/outlet-scm'))(this, accessory)
         /************************************/
-      } else if (this.consts.devices.cTempable.includes(device.extra.uiid)) {
-        /*******************
-        LIGHTS [COLOUR TEMP]
-        *******************/
+      } else if (this.consts.devices.lightRGB.includes(device.extra.uiid)) {
+        /***********
+        LIGHTS [RGB]
+        ***********/
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
           : this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require('./device/light-ctemp'))(this, accessory)
-        /******************/
-      } else if (this.consts.devices.colourable.includes(device.extra.uiid)) {
-        /******************
-        LIGHTS [COLOUR RGB]
-        ******************/
+        accessory.control = new (require('./device/light-rgb'))(this, accessory)
+        /**********/
+      } else if (this.consts.devices.lightCCT.includes(device.extra.uiid)) {
+        /***********
+        LIGHTS [CCT]
+        ***********/
         accessory = this.devicesInHB.has(device.deviceid + 'SWX')
           ? this.devicesInHB.get(device.deviceid + 'SWX')
           : this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require('./device/light-colour'))(this, accessory)
-        /*****************/
-      } else if (this.consts.devices.brightable.includes(device.extra.uiid)) {
+        accessory.control = new (require('./device/light-cct'))(this, accessory)
+        /**********/
+      } else if (this.consts.devices.lightRGB.includes(device.extra.uiid)) {
+        /*****************
+        LIGHTS [RGB & CCT]
+        *****************/
+        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
+          ? this.devicesInHB.get(device.deviceid + 'SWX')
+          : this.addAccessory(device, device.deviceid + 'SWX')
+        accessory.control = new (require('./device/light-rgb-cct'))(this, accessory)
+        /****************/
+      } else if (this.consts.devices.lightDimmer.includes(device.extra.uiid)) {
         /**************
         LIGHTS [DIMMER]
         **************/
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index ef26d47e..0b96da7a 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -103,9 +103,10 @@ module.exports = {
     singleSwitch: [1, 5, 6, 14, 15, 22, 24, 27, 32, 36, 44, 59, 81, 104],
     multiSwitch: [2, 3, 4, 7, 8, 9, 29, 30, 31, 34, 41, 82, 83, 84],
     singleSwitchOutlet: ['Sonoff Pow', 'S20', 'S26', 'S26R1', 'S55', 'S55R1'],
-    brightable: [36, 44],
-    colourable: [22, 59, 104],
-    cTempable: [103],
+    lightDimmer: [36, 44],
+    lightRGB: [22],
+    lightCCT: [103],
+    lightRGBCCT: [59, 104],
     curtain: [11],
     sensorContact: [102],
     sensorAmbient: [15],

From 70adda5fbd573ad321578646bd6c2b9e9aad80c1 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 24 Feb 2021 09:41:43 +0000
Subject: [PATCH 1560/3183] typo for contact sensors

---
 lib/device/sensor-contact.js        | 2 +-
 lib/device/zigbee/sensor-contact.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/device/sensor-contact.js b/lib/device/sensor-contact.js
index a907196e..630cfbe3 100644
--- a/lib/device/sensor-contact.js
+++ b/lib/device/sensor-contact.js
@@ -95,7 +95,7 @@ module.exports = class deviceSensorContact {
     this.eveLastActivation.UUID = this.consts.eve.lastActivation
     this.eveResetTotal.UUID = this.consts.eve.resetTotal
     this.eveOpenDuration.UUID = this.consts.eve.openDuration
-    this.eveClosedDurationn.UUID = this.consts.eve.closedDuration
+    this.eveClosedDuration.UUID = this.consts.eve.closedDuration
     this.eveTimesOpened.UUID = this.consts.eve.timesOpened
 
     // If the accessory has a leak sensor service then remove it
diff --git a/lib/device/zigbee/sensor-contact.js b/lib/device/zigbee/sensor-contact.js
index 8afebbb6..7b915a40 100644
--- a/lib/device/zigbee/sensor-contact.js
+++ b/lib/device/zigbee/sensor-contact.js
@@ -96,7 +96,7 @@ module.exports = class deviceZBSensorContact {
     this.eveLastActivation.UUID = this.consts.eve.lastActivation
     this.eveResetTotal.UUID = this.consts.eve.resetTotal
     this.eveOpenDuration.UUID = this.consts.eve.openDuration
-    this.eveClosedDurationn.UUID = this.consts.eve.closedDuration
+    this.eveClosedDuration.UUID = this.consts.eve.closedDuration
     this.eveTimesOpened.UUID = this.consts.eve.timesOpened
 
     // Add the contact sensor service if it doesn't already exist

From c21d5ab3cced24cf4bbdfbbcd071c19514a077ba Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 24 Feb 2021 09:42:42 +0000
Subject: [PATCH 1561/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9424d255..443dff4f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,13 @@
 
 All notable changes to this homebridge-ewelink will be documented in this file.
 
-## BETA
+## 5.0.1 (2021-02-24)
+
+### Changes
+
+* Fixes an issue initialising Contact Sensor devices
+
+## 5.0.0 (2021-02-24)
 
 * ⚠️ This release includes an overhaul of the settings in particular to specific device configuration
 * The following options have been replaced:

From 15fe978ef67150b10aa33ae20cf7c3bb4c4f2c39 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 24 Feb 2021 09:43:14 +0000
Subject: [PATCH 1562/3183] 5.0.1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 87cab91a..c794abb5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "5.0.0",
+  "version": "5.0.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 48275767..88cd165a 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "5.0.0",
+  "version": "5.0.1",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 8e9233391721e116ceca89b2d5dcbc3aaf1cc0e8 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 24 Feb 2021 11:25:16 +0000
Subject: [PATCH 1563/3183] fix setup

---
 lib/device/simulation/lock-one.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/device/simulation/lock-one.js b/lib/device/simulation/lock-one.js
index 2f7ddffa..43fb9399 100644
--- a/lib/device/simulation/lock-one.js
+++ b/lib/device/simulation/lock-one.js
@@ -23,6 +23,7 @@ module.exports = class deviceLockOne {
     const deviceConf = platform.simulations[deviceId]
     this.operationTime = deviceConf.operationTime ||
       this.consts.defaultValues.operationTime
+    this.setup = deviceConf.setup
     this.disableDeviceLogging = deviceConf.overrideDisabledLogging
       ? false
       : platform.config.disableDeviceLogging

From e4abee8352d73cc1cfd69490662a77559d13212f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 24 Feb 2021 11:25:21 +0000
Subject: [PATCH 1564/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 443dff4f..f87b3492 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 All notable changes to this homebridge-ewelink will be documented in this file.
 
+## 5.0.2 (2021-02-24)
+
+### Changes
+
+* Fixes an issue initialising Accessory Simulation Lock devices
+
 ## 5.0.1 (2021-02-24)
 
 ### Changes

From 195757763366696fe7f179957a6a66d62a64979f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 24 Feb 2021 11:25:54 +0000
Subject: [PATCH 1565/3183] 5.0.2

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c794abb5..9e699ece 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "5.0.1",
+  "version": "5.0.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 88cd165a..b047bdeb 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "5.0.1",
+  "version": "5.0.2",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 0405bdeb9723f6673857a49c329df93ef3fe57cb Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 24 Feb 2021 12:01:30 +0000
Subject: [PATCH 1566/3183] check to remove old switch services

---
 lib/device/simulation/garage-eachen.js | 5 +++++
 lib/device/simulation/garage-one.js    | 5 +++++
 lib/device/simulation/lock-one.js      | 5 +++++
 lib/device/simulation/tap-one.js       | 5 +++++
 lib/device/simulation/valve-one.js     | 5 +++++
 5 files changed, 25 insertions(+)

diff --git a/lib/device/simulation/garage-eachen.js b/lib/device/simulation/garage-eachen.js
index b64cec33..09d6b8f2 100644
--- a/lib/device/simulation/garage-eachen.js
+++ b/lib/device/simulation/garage-eachen.js
@@ -27,6 +27,11 @@ module.exports = class deviceGarageEachen {
       ? false
       : platform.config.disableDeviceLogging
 
+    // If the accessory has a switch service then remove it
+    if (this.accessory.getService(this.hapServ.Switch)) {
+      this.accessory.removeService(this.accessory.getService(this.hapServ.Switch))
+    }
+
     // Add the garage door service if it doesn't already exist
     if (!(this.service = this.accessory.getService(this.hapServ.GarageDoorOpener))) {
       this.service = this.accessory.addService(this.hapServ.GarageDoorOpener)
diff --git a/lib/device/simulation/garage-one.js b/lib/device/simulation/garage-one.js
index aba651a5..5018b736 100644
--- a/lib/device/simulation/garage-one.js
+++ b/lib/device/simulation/garage-one.js
@@ -53,6 +53,11 @@ module.exports = class deviceGarageOne {
       }
     }
 
+    // If the accessory has a switch service then remove it
+    if (this.accessory.getService(this.hapServ.Switch)) {
+      this.accessory.removeService(this.accessory.getService(this.hapServ.Switch))
+    }
+
     // Add the garage door service if it doesn't already exist
     if (!(this.service = this.accessory.getService(this.hapServ.GarageDoorOpener))) {
       this.accessory.addService(this.hapServ.GarageDoorOpener)
diff --git a/lib/device/simulation/lock-one.js b/lib/device/simulation/lock-one.js
index 43fb9399..0bc5ab64 100644
--- a/lib/device/simulation/lock-one.js
+++ b/lib/device/simulation/lock-one.js
@@ -28,6 +28,11 @@ module.exports = class deviceLockOne {
       ? false
       : platform.config.disableDeviceLogging
 
+    // If the accessory has a switch service then remove it
+    if (this.accessory.getService(this.hapServ.Switch)) {
+      this.accessory.removeService(this.accessory.getService(this.hapServ.Switch))
+    }
+
     // Add the lock service if it doesn't already exist
     this.service = this.accessory.getService(this.hapServ.LockMechanism) ||
       this.accessory.addService(this.hapServ.LockMechanism)
diff --git a/lib/device/simulation/tap-one.js b/lib/device/simulation/tap-one.js
index 57f4cc87..9b689ac3 100644
--- a/lib/device/simulation/tap-one.js
+++ b/lib/device/simulation/tap-one.js
@@ -26,6 +26,11 @@ module.exports = class deviceTapOne {
       ? false
       : platform.config.disableDeviceLogging
 
+    // If the accessory has a switch service then remove it
+    if (this.accessory.getService(this.hapServ.Switch)) {
+      this.accessory.removeService(this.accessory.getService(this.hapServ.Switch))
+    }
+
     // Add the tap service if it doesn't already exist
     if (!(this.service = this.accessory.getService(this.hapServ.Valve))) {
       this.service = this.accessory.addService(this.hapServ.Valve)
diff --git a/lib/device/simulation/valve-one.js b/lib/device/simulation/valve-one.js
index e1a2aa82..f7d2a149 100644
--- a/lib/device/simulation/valve-one.js
+++ b/lib/device/simulation/valve-one.js
@@ -26,6 +26,11 @@ module.exports = class deviceValveOne {
       ? false
       : platform.config.disableDeviceLogging
 
+    // If the accessory has a switch service then remove it
+    if (this.accessory.getService(this.hapServ.Switch)) {
+      this.accessory.removeService(this.accessory.getService(this.hapServ.Switch))
+    }
+
     // Add the valve service if it doesn't already exist
     if (!(this.service = this.accessory.getService(this.hapServ.Valve))) {
       this.service = this.accessory.addService(this.hapServ.Valve)

From 8d4001e54a1752242c361e3c96fa6e97c5c63726 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 24 Feb 2021 12:02:31 +0000
Subject: [PATCH 1567/3183] 5.0.3

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 9e699ece..6347a30e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "5.0.2",
+  "version": "5.0.3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index b047bdeb..8f9119ce 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "5.0.2",
+  "version": "5.0.3",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 13a17c30eaa2d843fb2cc8a30b19c46e0bf00a27 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 24 Feb 2021 12:11:18 +0000
Subject: [PATCH 1568/3183] also log type in opts

---
 lib/device/simulation/blind.js         | 10 +++++++---
 lib/device/simulation/garage-eachen.js |  3 ++-
 lib/device/simulation/garage-four.js   |  3 ++-
 lib/device/simulation/garage-one.js    |  3 ++-
 lib/device/simulation/garage-two.js    |  3 ++-
 lib/device/simulation/lock-one.js      |  3 ++-
 lib/device/simulation/sensor-leak.js   |  3 ++-
 lib/device/simulation/switch-valve.js  |  5 ++++-
 lib/device/simulation/tap-one.js       |  3 ++-
 lib/device/simulation/tap-two.js       |  5 ++++-
 lib/device/simulation/thermostat.js    |  3 ++-
 lib/device/simulation/valve-four.js    |  5 ++++-
 lib/device/simulation/valve-one.js     |  3 ++-
 lib/device/simulation/valve-two.js     |  5 ++++-
 14 files changed, 41 insertions(+), 16 deletions(-)

diff --git a/lib/device/simulation/blind.js b/lib/device/simulation/blind.js
index de8c0ab1..1a014065 100644
--- a/lib/device/simulation/blind.js
+++ b/lib/device/simulation/blind.js
@@ -21,6 +21,8 @@ module.exports = class deviceBlind {
     // Set up custom variables for this device type
     const deviceId = this.accessory.context.eweDeviceId
     const deviceConf = platform.simulations[deviceId]
+    this.operationTime = deviceConf.operationTime ||
+      this.consts.defaultValues.operationTime
     this.disableDeviceLogging = deviceConf && deviceConf.overrideDisabledLogging
       ? false
       : platform.config.disableDeviceLogging
@@ -46,7 +48,10 @@ module.exports = class deviceBlind {
 
     // Output the customised options to the log if in debug mode
     if (this.debug) {
-      const opts = JSON.stringify({ disableDeviceLogging: this.disableDeviceLogging })
+      const opts = JSON.stringify({
+        disableDeviceLogging: this.disableDeviceLogging,
+        type: deviceConf.type
+      })
       this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
     }
   }
@@ -54,14 +59,13 @@ module.exports = class deviceBlind {
   async internalUpdate (value, callback) {
     try {
       callback()
-      const blindConfig = this.platform.simulations[this.accessory.context.eweDeviceId]
       let prevPosition = this.accessory.context.cacheCurrentPosition
       if (value === prevPosition) {
         return
       }
       const params = { switches: this.consts.defaultMultiSwitchOff }
       const prevState = this.accessory.context.cachePositionState
-      const percentStepPerDS = blindConfig.operationTime / 100
+      const percentStepPerDS = this.operationTime / 100
       const updateKey = Math.random().toString(36).substr(2, 8)
       this.updateKey = updateKey
       if (prevState !== 2) {
diff --git a/lib/device/simulation/garage-eachen.js b/lib/device/simulation/garage-eachen.js
index 09d6b8f2..e6c74b96 100644
--- a/lib/device/simulation/garage-eachen.js
+++ b/lib/device/simulation/garage-eachen.js
@@ -51,7 +51,8 @@ module.exports = class deviceGarageEachen {
     if (this.debug) {
       const opts = JSON.stringify({
         disableDeviceLogging: this.disableDeviceLogging,
-        operationTime: this.operationTime
+        operationTime: this.operationTime,
+        type: deviceConf.type
       })
       this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
     }
diff --git a/lib/device/simulation/garage-four.js b/lib/device/simulation/garage-four.js
index e9545a8c..868b376e 100644
--- a/lib/device/simulation/garage-four.js
+++ b/lib/device/simulation/garage-four.js
@@ -61,7 +61,8 @@ module.exports = class deviceGarageFour {
     if (this.debug) {
       const opts = JSON.stringify({
         disableDeviceLogging: this.disableDeviceLogging,
-        operationTime: this.operationTime
+        operationTime: this.operationTime,
+        type: deviceConf.type
       })
       this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
     }
diff --git a/lib/device/simulation/garage-one.js b/lib/device/simulation/garage-one.js
index 5018b736..70f46fac 100644
--- a/lib/device/simulation/garage-one.js
+++ b/lib/device/simulation/garage-one.js
@@ -76,7 +76,8 @@ module.exports = class deviceGarageOne {
       const opts = JSON.stringify({
         disableDeviceLogging: this.disableDeviceLogging,
         operationTime: this.operationTime,
-        setup: this.setup
+        setup: this.setup,
+        type: deviceConf.type
       })
       this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
     }
diff --git a/lib/device/simulation/garage-two.js b/lib/device/simulation/garage-two.js
index d6396df3..e7810549 100644
--- a/lib/device/simulation/garage-two.js
+++ b/lib/device/simulation/garage-two.js
@@ -61,7 +61,8 @@ module.exports = class deviceGarageTwo {
     if (this.debug) {
       const opts = JSON.stringify({
         disableDeviceLogging: this.disableDeviceLogging,
-        operationTime: this.operationTime
+        operationTime: this.operationTime,
+        type: deviceConf.type
       })
       this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
     }
diff --git a/lib/device/simulation/lock-one.js b/lib/device/simulation/lock-one.js
index 0bc5ab64..57f82f43 100644
--- a/lib/device/simulation/lock-one.js
+++ b/lib/device/simulation/lock-one.js
@@ -50,7 +50,8 @@ module.exports = class deviceLockOne {
       const opts = JSON.stringify({
         disableDeviceLogging: this.disableDeviceLogging,
         operationTime: this.operationTime,
-        setup: this.setup
+        setup: this.setup,
+        type: deviceConf.type
       })
       this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
     }
diff --git a/lib/device/simulation/sensor-leak.js b/lib/device/simulation/sensor-leak.js
index fbd848b8..7695f7a4 100644
--- a/lib/device/simulation/sensor-leak.js
+++ b/lib/device/simulation/sensor-leak.js
@@ -67,7 +67,8 @@ module.exports = class deviceSensorLeak {
     if (this.debug) {
       const opts = JSON.stringify({
         disableDeviceLogging: this.disableDeviceLogging,
-        lowBattThreshold: this.lowBattThreshold
+        lowBattThreshold: this.lowBattThreshold,
+        type: deviceConf.type
       })
       this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
     }
diff --git a/lib/device/simulation/switch-valve.js b/lib/device/simulation/switch-valve.js
index 9ddfbf41..c51008c8 100644
--- a/lib/device/simulation/switch-valve.js
+++ b/lib/device/simulation/switch-valve.js
@@ -74,7 +74,10 @@ module.exports = class deviceSwitchValve {
 
     // Output the customised options to the log if in debug mode
     if (this.debug) {
-      const opts = JSON.stringify({ disableDeviceLogging: this.disableDeviceLogging })
+      const opts = JSON.stringify({
+        disableDeviceLogging: this.disableDeviceLogging,
+        type: deviceConf.type
+      })
       this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
     }
   }
diff --git a/lib/device/simulation/tap-one.js b/lib/device/simulation/tap-one.js
index 9b689ac3..8ff15b30 100644
--- a/lib/device/simulation/tap-one.js
+++ b/lib/device/simulation/tap-one.js
@@ -47,7 +47,8 @@ module.exports = class deviceTapOne {
     if (this.debug) {
       const opts = JSON.stringify({
         disableDeviceLogging: this.disableDeviceLogging,
-        setup: this.setup
+        setup: this.setup,
+        type: deviceConf.type
       })
       this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
     }
diff --git a/lib/device/simulation/tap-two.js b/lib/device/simulation/tap-two.js
index 4189fffa..3205e9ce 100644
--- a/lib/device/simulation/tap-two.js
+++ b/lib/device/simulation/tap-two.js
@@ -43,7 +43,10 @@ module.exports = class deviceTapTwo {
 
     // Output the customised options to the log if in debug mode
     if (this.debug) {
-      const opts = JSON.stringify({ disableDeviceLogging: this.disableDeviceLogging })
+      const opts = JSON.stringify({
+        disableDeviceLogging: this.disableDeviceLogging,
+        type: deviceConf.type
+      })
       this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
     }
   }
diff --git a/lib/device/simulation/thermostat.js b/lib/device/simulation/thermostat.js
index 30573775..a4e8f044 100644
--- a/lib/device/simulation/thermostat.js
+++ b/lib/device/simulation/thermostat.js
@@ -107,7 +107,8 @@ module.exports = class deviceThermostat {
     if (this.debug) {
       const opts = JSON.stringify({
         disableDeviceLogging: this.disableDeviceLogging,
-        offset: this.tempOffset
+        offset: this.tempOffset,
+        type: deviceConf2.type
       })
       this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
     }
diff --git a/lib/device/simulation/valve-four.js b/lib/device/simulation/valve-four.js
index 58ccc7bc..d332777d 100644
--- a/lib/device/simulation/valve-four.js
+++ b/lib/device/simulation/valve-four.js
@@ -71,7 +71,10 @@ module.exports = class deviceValveFour {
 
     // Output the customised options to the log if in debug mode
     if (this.debug) {
-      const opts = JSON.stringify({ disableDeviceLogging: this.disableDeviceLogging })
+      const opts = JSON.stringify({
+        disableDeviceLogging: this.disableDeviceLogging,
+        type: deviceConf.type
+      })
       this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
     }
   }
diff --git a/lib/device/simulation/valve-one.js b/lib/device/simulation/valve-one.js
index f7d2a149..4064dd8a 100644
--- a/lib/device/simulation/valve-one.js
+++ b/lib/device/simulation/valve-one.js
@@ -69,7 +69,8 @@ module.exports = class deviceValveOne {
     if (this.debug) {
       const opts = JSON.stringify({
         disableDeviceLogging: this.disableDeviceLogging,
-        setup: this.setup
+        setup: this.setup,
+        type: deviceConf.type
       })
       this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
     }
diff --git a/lib/device/simulation/valve-two.js b/lib/device/simulation/valve-two.js
index d4ae1ca9..7c89456a 100644
--- a/lib/device/simulation/valve-two.js
+++ b/lib/device/simulation/valve-two.js
@@ -71,7 +71,10 @@ module.exports = class deviceValveTwo {
 
     // Output the customised options to the log if in debug mode
     if (this.debug) {
-      const opts = JSON.stringify({ disableDeviceLogging: this.disableDeviceLogging })
+      const opts = JSON.stringify({
+        disableDeviceLogging: this.disableDeviceLogging,
+        type: deviceConf.type
+      })
       this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
     }
   }

From 5df3c767ead09d5ab37209e411d84fc20ebac197 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 24 Feb 2021 12:13:02 +0000
Subject: [PATCH 1569/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f87b3492..627c0707 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,17 @@
 
 All notable changes to this homebridge-ewelink will be documented in this file.
 
+## 5.0.3 (2021-02-24)
+
+### Changes
+
+* Remove old *Switch* services when setting up Accessory Simulations
+* Add the type of Accessory Simulation to the logged options on restart
+
+### Changes
+
+* Fixes an issue initialising Accessory Simulation Lock devices
+
 ## 5.0.2 (2021-02-24)
 
 ### Changes

From cc290731b0dea44d19be32e4fa86f7847590e720 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 24 Feb 2021 12:22:23 +0000
Subject: [PATCH 1570/3183] hide IP field if mode is wan

---
 config.schema.json | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 5d92ea02..a5c0777d 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -88,7 +88,10 @@
             "ipAddress": {
               "type": "string",
               "title": "IP Address",
-              "description": "You can manually set the IP address for this device if it cannot be discovered by the plugin."
+              "description": "You can manually set the IP address for this device if it cannot be discovered by the plugin.",
+              "condition": {
+                "functionBody": "return model.mode !== 'wan';"
+              }
             },
             "overrideDisabledLogging": {
               "type": "boolean",
@@ -128,7 +131,10 @@
             "ipAddress": {
               "type": "string",
               "title": "IP Address",
-              "description": "You can manually set the IP address for this device if it cannot be discovered by the plugin."
+              "description": "You can manually set the IP address for this device if it cannot be discovered by the plugin.",
+              "condition": {
+                "functionBody": "return model.mode !== 'wan';"
+              }
             },
             "overrideDisabledLogging": {
               "type": "boolean",
@@ -173,7 +179,10 @@
             "ipAddress": {
               "type": "string",
               "title": "IP Address",
-              "description": "You can manually set the IP address for this device if it cannot be discovered by the plugin."
+              "description": "You can manually set the IP address for this device if it cannot be discovered by the plugin.",
+              "condition": {
+                "functionBody": "return model.mode !== 'wan';"
+              }
             },
             "overrideDisabledLogging": {
               "type": "boolean",
@@ -556,7 +565,7 @@
               "title": "IP Address",
               "description": "You can manually set the IP address for this device if it cannot be discovered by the plugin.",
               "condition": {
-                "functionBody": "return (model.groups[arrayIndices] && !['thermostat', 'sensor_leak'].includes(model.groups[arrayIndices].type))"
+                "functionBody": "return (model.mode !== 'wan' && model.groups[arrayIndices] && !['thermostat', 'sensor_leak'].includes(model.groups[arrayIndices].type))"
               }
             },
             "overrideDisabledLogging": {

From 6f6cb5171b76230b3466a2c685afe77cb4d96a9d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 24 Feb 2021 12:23:13 +0000
Subject: [PATCH 1571/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 627c0707..1af0529e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 All notable changes to this homebridge-ewelink will be documented in this file.
 
+## BETA
+
+### Changes
+
+* Hide IP address field in plugin settings if plugin `mode` is set to `wan`
+
 ## 5.0.3 (2021-02-24)
 
 ### Changes

From 6501a91a17ba405cc1c474f29cc2fd160d6b5f76 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 24 Feb 2021 12:46:03 +0000
Subject: [PATCH 1572/3183] check for setup config field

---
 lib/device/simulation/garage-one.js |  5 +++++
 lib/device/simulation/lock-one.js   | 13 +++++++++++++
 lib/device/simulation/tap-one.js    | 13 +++++++++++++
 lib/device/simulation/valve-one.js  | 13 +++++++++++++
 4 files changed, 44 insertions(+)

diff --git a/lib/device/simulation/garage-one.js b/lib/device/simulation/garage-one.js
index 70f46fac..5edb91ee 100644
--- a/lib/device/simulation/garage-one.js
+++ b/lib/device/simulation/garage-one.js
@@ -34,6 +34,11 @@ module.exports = class deviceGarageOne {
       this.accessory.context.cacheTargetDoorState = 1
     }
 
+    // Check for a valid setup
+    if (!this.consts.allowed.setups.includes(this.setup)) {
+      this.error = "device has not been set up as 'oneSwitch' or 'twoSwitch'"
+    }
+
     // Check the sensor is valid if defined by the user
     if (deviceConf.sensorId) {
       // Check the sensor exists in Homebridge
diff --git a/lib/device/simulation/lock-one.js b/lib/device/simulation/lock-one.js
index 57f82f43..c26d85e2 100644
--- a/lib/device/simulation/lock-one.js
+++ b/lib/device/simulation/lock-one.js
@@ -28,6 +28,11 @@ module.exports = class deviceLockOne {
       ? false
       : platform.config.disableDeviceLogging
 
+    // Check for a valid setup
+    if (!this.consts.allowed.setups.includes(this.setup)) {
+      this.error = "device has not been set up as 'oneSwitch' or 'twoSwitch'"
+    }
+
     // If the accessory has a switch service then remove it
     if (this.accessory.getService(this.hapServ.Switch)) {
       this.accessory.removeService(this.accessory.getService(this.hapServ.Switch))
@@ -60,6 +65,10 @@ module.exports = class deviceLockOne {
   async internalUpdate (value, callback) {
     try {
       callback()
+      if (this.error) {
+        this.log.warn('[%s] invalid config - %s.', this.name, this.error)
+        return
+      }
       const params = {}
       switch (this.setup) {
         case 'oneSwitch':
@@ -91,6 +100,10 @@ module.exports = class deviceLockOne {
 
   async externalUpdate (params) {
     try {
+      if (this.error) {
+        this.log.warn('[%s] invalid config - %s.', this.name, this.error)
+        return
+      }
       if (this.inUse) {
         return
       }
diff --git a/lib/device/simulation/tap-one.js b/lib/device/simulation/tap-one.js
index 8ff15b30..77d9f3c7 100644
--- a/lib/device/simulation/tap-one.js
+++ b/lib/device/simulation/tap-one.js
@@ -26,6 +26,11 @@ module.exports = class deviceTapOne {
       ? false
       : platform.config.disableDeviceLogging
 
+    // Check for a valid setup
+    if (!this.consts.allowed.setups.includes(this.setup)) {
+      this.error = "device has not been set up as 'oneSwitch' or 'twoSwitch'"
+    }
+
     // If the accessory has a switch service then remove it
     if (this.accessory.getService(this.hapServ.Switch)) {
       this.accessory.removeService(this.accessory.getService(this.hapServ.Switch))
@@ -57,6 +62,10 @@ module.exports = class deviceTapOne {
   async internalUpdate (value, callback) {
     try {
       callback()
+      if (this.error) {
+        this.log.warn('[%s] invalid config - %s.', this.name, this.error)
+        return
+      }
       const params = {}
       switch (this.setup) {
         case 'oneSwitch':
@@ -80,6 +89,10 @@ module.exports = class deviceTapOne {
 
   async externalUpdate (params) {
     try {
+      if (this.error) {
+        this.log.warn('[%s] invalid config - %s.', this.name, this.error)
+        return
+      }
       switch (this.setup) {
         case 'oneSwitch':
           if (!params.switch || params.switch === this.cacheOnOff) {
diff --git a/lib/device/simulation/valve-one.js b/lib/device/simulation/valve-one.js
index 4064dd8a..215ad9d3 100644
--- a/lib/device/simulation/valve-one.js
+++ b/lib/device/simulation/valve-one.js
@@ -26,6 +26,11 @@ module.exports = class deviceValveOne {
       ? false
       : platform.config.disableDeviceLogging
 
+    // Check for a valid setup
+    if (!this.consts.allowed.setups.includes(this.setup)) {
+      this.error = "device has not been set up as 'oneSwitch' or 'twoSwitch'"
+    }
+
     // If the accessory has a switch service then remove it
     if (this.accessory.getService(this.hapServ.Switch)) {
       this.accessory.removeService(this.accessory.getService(this.hapServ.Switch))
@@ -79,6 +84,10 @@ module.exports = class deviceValveOne {
   async internalUpdate (value, callback) {
     try {
       callback()
+      if (this.error) {
+        this.log.warn('[%s] invalid config - %s.', this.name, this.error)
+        return
+      }
       const params = {}
       switch (this.setup) {
         case 'oneSwitch':
@@ -118,6 +127,10 @@ module.exports = class deviceValveOne {
 
   async externalUpdate (params) {
     try {
+      if (this.error) {
+        this.log.warn('[%s] invalid config - %s.', this.name, this.error)
+        return
+      }
       let isOn = false
       switch (this.setup) {
         case 'oneSwitch':

From 255fc823e2b311702010bd0bea550ce329927b3f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 24 Feb 2021 12:46:07 +0000
Subject: [PATCH 1573/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1af0529e..6e9f9ea3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,10 +2,11 @@
 
 All notable changes to this homebridge-ewelink will be documented in this file.
 
-## BETA
+## 5.0.4
 
 ### Changes
 
+* Plugin will check that certain Accessory Simulations have been setup with the device type
 * Hide IP address field in plugin settings if plugin `mode` is set to `wan`
 
 ## 5.0.3 (2021-02-24)

From a1f2b2adc00e8f20712bdfbd2ed3876481bee561 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 24 Feb 2021 12:46:34 +0000
Subject: [PATCH 1574/3183] 5.0.4

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 6347a30e..110bcd88 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "5.0.3",
+  "version": "5.0.4",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 8f9119ce..6ae13860 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "5.0.3",
+  "version": "5.0.4",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From bbdb2606b8fe343960e5f34cb85f44be281d1571 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 24 Feb 2021 12:47:24 +0000
Subject: [PATCH 1575/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6e9f9ea3..8252801b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,10 +16,6 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 * Remove old *Switch* services when setting up Accessory Simulations
 * Add the type of Accessory Simulation to the logged options on restart
 
-### Changes
-
-* Fixes an issue initialising Accessory Simulation Lock devices
-
 ## 5.0.2 (2021-02-24)
 
 ### Changes

From 1403ff7f02983e76e9ac2c8833c2640d96820cf2 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 24 Feb 2021 13:02:09 +0000
Subject: [PATCH 1576/3183] update info message

---
 config.schema.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config.schema.json b/config.schema.json
index a5c0777d..d5784ee8 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -779,7 +779,7 @@
           "groups[].overrideDisabledLogging",
           {
             "type": "help",
-            "helpvalue": "<label class=\"control-label text-warning\">⚠ After restarting Homebridge you will need to remove this accessory from the cache for it set up correctly.</label>"
+            "helpvalue": "<label class=\"control-label text-warning\">⚠ If you find this accessory hasn't set up properly after restarting, then try removing it from the cache so it is re-added.</label>"
           }
         ]
       }]

From 34747f2f44ee6e9fc792ccd6720f33e71fa550d9 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 24 Feb 2021 13:47:24 +0000
Subject: [PATCH 1577/3183] added info

---
 config.schema.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/config.schema.json b/config.schema.json
index d5784ee8..eadb76e9 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -32,7 +32,7 @@
       "mode": {
         "type": "string",
         "title": "Connection Mode",
-        "description": "This setting defines how the plugin communicates with your devices.",
+        "description": "This setting defines how the plugin communicates with your devices. For further guidance, please refer to <a href=\"https://github.com/bwp91/homebridge-ewelink/wiki/Connection-Methods\" target=\"_blank\">this wiki article</a>.",
         "default": "auto",
         "oneOf": [{
             "title": "Auto (Recommended)",
@@ -593,6 +593,7 @@
   "layout": [{
       "type": "fieldset",
       "title": "Required Settings",
+      "description": "If you are configuring this plugin for the first time, you may want to just fill out these three fields and save your settings. You can always return later to explore the rest of the options.",
       "items": [
         "countryCode",
         "username",

From 297deb6f6960a801a02b66555c534009d21ce8a8 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 24 Feb 2021 14:10:48 +0000
Subject: [PATCH 1578/3183] first time user info

---
 config.schema.json | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/config.schema.json b/config.schema.json
index eadb76e9..2e1d689b 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -591,9 +591,12 @@
     }
   },
   "layout": [{
+      "type": "help",
+      "helpvalue": "<label class=\"control-label text-primary text-center\">If you are configuring this plugin for the first time, you may want to just fill out the required fields to get the plugin up and running. You can always return later to explore the rest of the options.</label>"
+    },
+    {
       "type": "fieldset",
       "title": "Required Settings",
-      "description": "If you are configuring this plugin for the first time, you may want to just fill out these three fields and save your settings. You can always return later to explore the rest of the options.",
       "items": [
         "countryCode",
         "username",

From f0babd1faf8ad09d7dd642ffaf89dd5184af9b9f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 25 Feb 2021 14:03:30 +0000
Subject: [PATCH 1579/3183] code comments and structure

---
 lib/device/diffuser.js | 154 +++++++++++++++++++++++++++++++----------
 1 file changed, 119 insertions(+), 35 deletions(-)

diff --git a/lib/device/diffuser.js b/lib/device/diffuser.js
index f33725d0..e7a502e6 100644
--- a/lib/device/diffuser.js
+++ b/lib/device/diffuser.js
@@ -163,13 +163,20 @@ module.exports = class deviceDiffuser {
 
   async internalLightOnOffUpdate (value, callback) {
     try {
+      // Call callback() first to avoid any 'No Response' errors in HomeKit
       callback()
+
+      // Don't continue if the new value is the same as before
       const onoff = value ? 1 : 0
       if (this.cacheLightOnOff === onoff) {
         return
       }
+
+      // Update the cache value and set up the params to send object
       this.cacheLightOnOff = onoff
       const params = { lightswitch: this.cacheLightOnOff }
+
+      // Set up a ten second timeout for the plugin to ignore incoming updates
       const updateKeyLight = Math.random().toString(36).substr(2, 8)
       this.updateTimeout = updateKeyLight
       setTimeout(() => {
@@ -177,58 +184,77 @@ module.exports = class deviceDiffuser {
           this.updateTimeout = false
         }
       }, 10000)
+
+      // Send the device update
       await this.platform.sendDeviceUpdate(this.accessory, params)
+
+      // Log the update if appropriate
       if (!this.disableDeviceLogging) {
         this.log('[%s] current light [%s%].', this.name, value ? 'on' : 'off')
       }
     } catch (err) {
+      // Catch any errors and let the platform display them
       this.platform.deviceUpdateError(this.accessory, err, true)
     }
   }
 
   async internalLightBrightnessUpdate (value, callback) {
     try {
+      // Call callback() first to avoid any 'No Response' errors in HomeKit
+      callback()
+
+      // Don't continue if the new value is the same as before
       if (this.cacheBrightness === value) {
-        callback()
         return
       }
+
+      // Update the cache value and set up the params to send object
       this.cacheBrightness = value
-      callback()
+      const params = { lightbright: this.cacheBrightness }
+
+      // This acts like a debounce function when endlessly sliding the brightness scale
       const updateKeyBright = Math.random().toString(36).substr(2, 8)
       this.updateKeyBright = updateKeyBright
-      const params = { lightbright: this.cacheBrightness }
       await this.funcs.sleep(500)
       if (updateKeyBright !== this.updateKeyBright) {
         return
       }
+
+      // Set up a ten second timeout for the plugin to ignore incoming updates
       this.updateTimeout = updateKeyBright
       setTimeout(() => {
         if (this.updateTimeout === updateKeyBright) {
           this.updateTimeout = false
         }
       }, 10000)
+
+      // Send the device update
       await this.platform.sendDeviceUpdate(this.accessory, params)
+
+      // Log the update if appropriate
       if (!this.disableDeviceLogging) {
         this.log('[%s] current brightness [%s%].', this.name, this.cacheBrightness)
       }
     } catch (err) {
+      // Catch any errors and let the platform display them
       this.platform.deviceUpdateError(this.accessory, err, true)
     }
   }
 
   async internalLightColourUpdate (value, callback) {
     try {
+      // Call callback() first to avoid any 'No Response' errors in HomeKit
+      callback()
+
+      // Don't continue if the light is off or the new value is the same as before
       if (this.cacheOnOff !== 'on' || this.cacheHue === value) {
-        callback()
         return
       }
+
+      // Update the cache value and set up the params to send object
+      const sat = this.lightService.getCharacteristic(this.hapChar.Saturation).value
+      const newRGB = this.colourUtils.hs2rgb(value, sat)
       this.cacheHue = value
-      callback()
-      const updateKeyColour = Math.random().toString(36).substr(2, 8)
-      this.updateKeyColour = updateKeyColour
-      const saturation = this.accessory.getService('Light')
-        .getCharacteristic(this.hapChar.Saturation).value
-      const newRGB = this.colourUtils.hs2rgb(value, saturation)
       this.cacheR = newRGB[0]
       this.cacheG = newRGB[0]
       this.cacheB = newRGB[0]
@@ -237,17 +263,27 @@ module.exports = class deviceDiffuser {
         lightGcolor: this.cacheG,
         lightBcolor: this.cacheB
       }
+
+      // This acts like a debounce function when endlessly sliding the colour wheel
+      const updateKeyColour = Math.random().toString(36).substr(2, 8)
+      this.updateKeyColour = updateKeyColour
       await this.funcs.sleep(400)
       if (updateKeyColour !== this.updateKeyColour) {
         return
       }
+
+      // Set up a ten second timeout for the plugin to ignore incoming updates
       this.updateTimeout = updateKeyColour
       setTimeout(() => {
         if (this.updateTimeout === updateKeyColour) {
           this.updateTimeout = false
         }
       }, 10000)
+
+      // Send the device update
       await this.platform.sendDeviceUpdate(this.accessory, params)
+
+      // Log the update if appropriate
       if (!this.disableDeviceLogging) {
         this.log(
           '[%s] current colour [rgb %s %s %s].',
@@ -258,41 +294,69 @@ module.exports = class deviceDiffuser {
         )
       }
     } catch (err) {
+      // Catch any errors and let the platform display them
       this.platform.deviceUpdateError(this.accessory, err, true)
     }
   }
 
   async externalUpdate (params) {
     try {
+      // We can often receive old info when updating new values so ignore during timeout
       if (this.updateTimeout) {
         return
       }
+
+      // Check to see if we are provided new and different on/off information
       if (params.switch && params.switch !== this.cacheOnOff) {
+        // Update the cache value
         this.cacheOnOff = params.switch
+
+        // Update the HomeKit value
+        this.fanService.updateCharacteristic(this.hapChar.On, this.cacheOnOff === 'on')
+
+        // If the diffuser is on but no speed provided, then update speed with the cache
+        if (this.cacheOnOff === 'on' && !this.funcs.hasProperty(params, 'state')) {
+          this.fanService.updateCharacteristic(
+            this.hapChar.RotationSpeed,
+            this.cacheSpeed
+          )
+        }
+
+        // Log if appropriate
         if (params.updateSource && !this.disableDeviceLogging) {
           this.log('[%s] current state [%s%].', this.name, this.cacheOnOff)
         }
-        this.fanService.updateCharacteristic(this.hapChar.On, this.cacheOnOff === 'on')
-        if (!this.funcs.hasProperty(params, 'state')) {
-          this.fanService.updateCharacteristic(this.hapChar.RotationSpeed, this.cacheSpeed)
-        }
       }
+
+      // Check to see if we are provided new and different speed information
       if (
         this.funcs.hasProperty(params, 'state') &&
         params.state * 50 !== this.cacheSpeed
       ) {
+        // State is {0, 1, 2} corresponding to {0, 50, 100} rotation speed
         this.cacheSpeed = params.state * 50
+
+        // Update the HomeKit value
         this.fanService.updateCharacteristic(this.hapChar.RotationSpeed, this.cacheSpeed)
+
+        // Log if appropriate
         if (params.updateSource && !this.disableDeviceLogging) {
           this.log('[%s] current speed [%s%].', this.name, this.cacheSpeed)
         }
       }
+
+      // Check to see if we are provided new and different light on/off information
       if (
         this.funcs.hasProperty(params, 'lightswitch') &&
         this.cacheLightOnOff !== params.lightswitch
       ) {
+        // Lightswitch is {0, 1} corresponding to {false, true} off/on state
         this.cacheLightOnOff = params.lightswitch
+
+        // Update the HomeKit value
         this.lightService.updateCharacteristic(this.hapChar.On, params.lightswitch === 1)
+
+        // Log if appropriate
         if (params.updateSource && !this.disableDeviceLogging) {
           this.log(
             '[%s] current light [%s%].',
@@ -301,42 +365,62 @@ module.exports = class deviceDiffuser {
           )
         }
       }
+
+      // Check to see if we are provided new and different light brightness information
       if (
         this.funcs.hasProperty(params, 'lightbright') &&
         this.cacheBrightness !== params.lightbright
       ) {
+        // Lightbright is [0, 100] corresponding to [0, 100] brightness
         this.cacheBrightness = params.lightbright
-        this.lightService
-          .updateCharacteristic(this.hapChar.Brightness, params.lightbright)
+
+        // Update the HomeKit value
+        this.lightService.updateCharacteristic(
+          this.hapChar.Brightness,
+          params.lightbright
+        )
+
+        // Log if appropriate
         if (params.updateSource && !this.disableDeviceLogging) {
           this.log('[%s] current brightness [%s%].', this.name, params.lightbright)
         }
       }
-      if (this.funcs.hasProperty(params, 'lightRcolor')) {
-        if (
+
+      // Check to see if we are provided new and different light colour information
+      if (
+        this.funcs.hasProperty(params, 'lightRcolor') &&
+        (
           this.cacheR !== params.lightRcolor ||
           this.cacheG !== params.lightGcolor ||
           this.cacheB !== params.lightBcolor
-        ) {
-          this.cacheR = params.lightRcolor
-          this.cacheG = params.lightGcolor
-          this.cacheB = params.lightBcolor
-          const newColour = this.colourUtils.rgb2hs(this.cacheR, this.cacheG, this.cacheB)
-          this.cacheHue = newColour[0]
-          this.lightService.updateCharacteristic(this.hapChar.Hue, this.cacheHue)
-            .updateCharacteristic(this.hapChar.Saturation, 100)
-          if (params.updateSource && !this.disableDeviceLogging) {
-            this.log(
-              '[%s] current colour [rgb %s %s %s].',
-              this.name,
-              this.cacheR,
-              this.cacheG,
-              this.cacheB
-            )
-          }
+        )
+      ) {
+        // Lightcolor is provided as [0, 255] corresponding to RGB values
+        this.cacheR = params.lightRcolor
+        this.cacheG = params.lightGcolor
+        this.cacheB = params.lightBcolor
+
+        // Get the Hue information from the RGB colour (saturation is always 100)
+        const newColour = this.colourUtils.rgb2hs(this.cacheR, this.cacheG, this.cacheB)
+        this.cacheHue = newColour[0]
+
+        // Update the HomeKit values
+        this.lightService.updateCharacteristic(this.hapChar.Hue, this.cacheHue)
+        this.lightService.updateCharacteristic(this.hapChar.Saturation, 100)
+
+        // Log if appropriate
+        if (params.updateSource && !this.disableDeviceLogging) {
+          this.log(
+            '[%s] current colour [rgb %s %s %s].',
+            this.name,
+            this.cacheR,
+            this.cacheG,
+            this.cacheB
+          )
         }
       }
     } catch (err) {
+      // Catch any errors and let the platform display them
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }

From ec4ffc200a92e39deb7210c8d6bac0989adf30ce Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 25 Feb 2021 14:28:37 +0000
Subject: [PATCH 1580/3183] comments

---
 lib/index.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/index.js b/lib/index.js
index d0957cba..9a24cc8c 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1288,6 +1288,7 @@ class eWeLinkPlatform {
           )
       }
 
+      // Add the configured accessory to our global map
       this.devicesInHB.set(accessory.context.hbDeviceId, accessory)
     } catch (err) {
       // Catch any errors during retrieve
@@ -1448,7 +1449,7 @@ class eWeLinkPlatform {
         this.log.warn('[%s] %s %s.', accessory.displayName, this.messages.devNotRf, eText)
       }
     } else {
-      // The device does not existing in HB so let's try to add it
+      // The device does not exist in HB so let's try to add it
       try {
         // Don't continue if the user has hidden this device
         if (this.config.ignoredDevices.includes(deviceId)) {

From 6bd66c823692bec26e3778fb8f513ce43de4d308 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 25 Feb 2021 15:04:48 +0000
Subject: [PATCH 1581/3183] check int not bool

---
 lib/device/sensor-contact.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/device/sensor-contact.js b/lib/device/sensor-contact.js
index 630cfbe3..f8b3efc3 100644
--- a/lib/device/sensor-contact.js
+++ b/lib/device/sensor-contact.js
@@ -172,7 +172,7 @@ module.exports = class deviceSensorContact {
       }
       this.cacheOnOff = params.switch
       const newState = params.switch === 'on' ? 1 : 0
-      if (newState) {
+      if (newState === 1) {
         this.contactService.updateCharacteristic(this.hapChar.ContactSensorState, 1)
         this.accessory.eveService.addEntry({ status: 1 })
         const initialTime = this.accessory.eveService.getInitialTime()

From b229c8a2c68fabfa4f033037e6f057761be2e54f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 25 Feb 2021 15:04:56 +0000
Subject: [PATCH 1582/3183] reverse polarity

---
 lib/device/simulation/sensor-leak.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/device/simulation/sensor-leak.js b/lib/device/simulation/sensor-leak.js
index 7695f7a4..26f30ce2 100644
--- a/lib/device/simulation/sensor-leak.js
+++ b/lib/device/simulation/sensor-leak.js
@@ -97,10 +97,10 @@ module.exports = class deviceSensorLeak {
         return
       }
       this.cacheOnOff = params.switch
-      const newState = params.switch === 'on' ? 1 : 0
+      const newState = params.switch === 'on' ? 0 : 1
       this.leakService.updateCharacteristic(this.hapChar.LeakDetected, newState)
       this.accessory.eveService.addEntry({ status: newState })
-      if (newState) {
+      if (newState === 1) {
         const initialTime = this.accessory.eveService.getInitialTime()
         this.leakService.updateCharacteristic(
           this.eveLastActivation,
@@ -111,7 +111,7 @@ module.exports = class deviceSensorLeak {
         this.log(
           '[%s] current state [water%s detected].',
           this.name,
-          newState === 0 ? '' : ' not'
+          newState === 1 ? '' : ' not'
         )
       }
     } catch (err) {

From 3f063098da0480b9f0671fd8aa777291a68aa844 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 25 Feb 2021 15:05:25 +0000
Subject: [PATCH 1583/3183] 5.0.5-0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 110bcd88..15a2b4f9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "5.0.4",
+  "version": "5.0.5-0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 6ae13860..6bc43b50 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "5.0.4",
+  "version": "5.0.5-0",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From ef5441d78cb5c141b7c6146a658be28a9a6dd343 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 25 Feb 2021 15:10:54 +0000
Subject: [PATCH 1584/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8252801b..3e96f199 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 All notable changes to this homebridge-ewelink will be documented in this file.
 
+## BETA
+
+### Changes
+
+* Reverse the polarity of the leak sensor simulation
+
 ## 5.0.4
 
 ### Changes

From 451b6f387ab12868bdf8f153c79fe0d9aef0fe0e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 25 Feb 2021 18:57:35 +0000
Subject: [PATCH 1585/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3e96f199..674a2bee 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,11 +2,12 @@
 
 All notable changes to this homebridge-ewelink will be documented in this file.
 
-## BETA
+## 5.0.5 (2021-02-25)
 
 ### Changes
 
 * Reverse the polarity of the leak sensor simulation
+  * You can expose a DW2 sensor as a leak sensor using [this guide](https://www.youtube.com/watch?v=YFu2LZfrrqs) as an Accessory Simulation
 
 ## 5.0.4
 

From 321037479e076ec6f5050bad7cc01ebe5f798abb Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 25 Feb 2021 18:58:23 +0000
Subject: [PATCH 1586/3183] 5.0.5

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 15a2b4f9..6f3019e8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "5.0.5-0",
+  "version": "5.0.5",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 6bc43b50..a497fce9 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "5.0.5-0",
+  "version": "5.0.5",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From a73f0eed7c3c232045ba910eeb089b7fb2bdf2b0 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 25 Feb 2021 19:04:17 +0000
Subject: [PATCH 1587/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 674a2bee..e99423e3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,7 +9,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 * Reverse the polarity of the leak sensor simulation
   * You can expose a DW2 sensor as a leak sensor using [this guide](https://www.youtube.com/watch?v=YFu2LZfrrqs) as an Accessory Simulation
 
-## 5.0.4
+## 5.0.4 (2021-02-24)
 
 ### Changes
 

From a16340a1d429f9830ecf8d053e92965e5034fe45 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 26 Feb 2021 08:45:36 +0000
Subject: [PATCH 1588/3183] fix rgbcct switch bug

---
 lib/device/light-rgb-cct.js | 5 +++++
 lib/index.js                | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/device/light-rgb-cct.js b/lib/device/light-rgb-cct.js
index 4ba711d4..e3ccc237 100644
--- a/lib/device/light-rgb-cct.js
+++ b/lib/device/light-rgb-cct.js
@@ -32,6 +32,11 @@ module.exports = class deviceLightRGBCCT {
       ? false
       : platform.config.disableDeviceLogging
 
+    // If the accessory has a outlet service then remove it (remedies bug int in v5)
+    if (this.accessory.getService(this.hapServ.Switch)) {
+      this.accessory.removeService(this.accessory.getService(this.hapServ.Switch))
+    }
+
     // Add the lightbulb service if it doesn't already exist
     this.service = this.accessory.getService(this.hapServ.Lightbulb) ||
       this.accessory.addService(this.hapServ.Lightbulb)
diff --git a/lib/index.js b/lib/index.js
index 9a24cc8c..e73d791d 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -855,7 +855,7 @@ class eWeLinkPlatform {
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/light-cct'))(this, accessory)
         /**********/
-      } else if (this.consts.devices.lightRGB.includes(device.extra.uiid)) {
+      } else if (this.consts.devices.lightRGBCCT.includes(device.extra.uiid)) {
         /*****************
         LIGHTS [RGB & CCT]
         *****************/

From 34a8e27adb8e2262fad2623644c40247834885ad Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 26 Feb 2021 08:46:53 +0000
Subject: [PATCH 1589/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e99423e3..f7b7652e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 All notable changes to this homebridge-ewelink will be documented in this file.
 
+## 5.0.6 (2021-02-26)
+
+### Changes
+
+* Removes the extra *Switch* service that was accidentally added to certain bulbs
+
 ## 5.0.5 (2021-02-25)
 
 ### Changes

From ba1aef6e3022c22dfd6031b6e7bada1e7f03d2bd Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 26 Feb 2021 08:47:56 +0000
Subject: [PATCH 1590/3183] 5.0.6

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 6f3019e8..70bc61af 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "5.0.5",
+  "version": "5.0.6",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index a497fce9..b42fa924 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "5.0.5",
+  "version": "5.0.6",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 68f0203a36a31c74f538742e3ba2447054c57756 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 26 Feb 2021 09:06:31 +0000
Subject: [PATCH 1591/3183] increase threshold for disabling AL

---
 lib/device/light-cct.js     | 4 ++--
 lib/device/light-rgb-cct.js | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/device/light-cct.js b/lib/device/light-cct.js
index c562d434..a6d9eb27 100644
--- a/lib/device/light-cct.js
+++ b/lib/device/light-cct.js
@@ -231,7 +231,7 @@ module.exports = class deviceLightCCT {
           this.funcs.hasProperty(params.white, 'ct') &&
           this.cacheCT !== params.white.ct
         ) {
-          const ctDiff = Math.abs(params.white.ct - this.cacheCT) > 5
+          const ctDiff = Math.abs(params.white.ct - this.cacheCT)
           this.cacheCT = params.white.ct
           const kelvin = this.cacheCT / 255 * (this.maxK - this.minK) + this.minK
           const scaledK = Math.round(kelvin)
@@ -245,7 +245,7 @@ module.exports = class deviceLightCCT {
             if (
               this.alController &&
               this.alController.isAdaptiveLightingActive() &&
-              ctDiff
+              ctDiff > 20
             ) {
               // look for a variation greater than five
               this.alController.disableAdaptiveLighting()
diff --git a/lib/device/light-rgb-cct.js b/lib/device/light-rgb-cct.js
index e3ccc237..0723e2d3 100644
--- a/lib/device/light-rgb-cct.js
+++ b/lib/device/light-rgb-cct.js
@@ -373,7 +373,7 @@ module.exports = class deviceLightRGBCCT {
                 if (
                   this.alController &&
                   this.alController.isAdaptiveLightingActive() &&
-                  rgbDiff > 10
+                  rgbDiff > 50
                 ) {
                   this.alController.disableAdaptiveLighting()
                   this.log(
@@ -452,7 +452,7 @@ module.exports = class deviceLightRGBCCT {
               params.white.ct !== this.cacheCT
             ) {
               this.cacheMode = 'white'
-              const ctDiff = Math.abs(params.white.ct - this.cacheCT) > 5
+              const ctDiff = Math.abs(params.white.ct - this.cacheCT)
               this.cacheCT = params.white.ct
               const ctToK = Math.round(this.cacheCT / 255 * 3800 + 2700)
               this.cacheMired = Math.max(Math.min(Math.round(1000000 / ctToK), 500), 140)
@@ -468,7 +468,7 @@ module.exports = class deviceLightRGBCCT {
                 if (
                   this.alController &&
                   this.alController.isAdaptiveLightingActive() &&
-                  ctDiff
+                  ctDiff > 20
                 ) {
                   // look for a variation greater than five
                   this.alController.disableAdaptiveLighting()

From 08053c97b8a743a588a790459fa70a2209e6cfe1 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 26 Feb 2021 11:38:04 +0000
Subject: [PATCH 1592/3183] D1 Lan mode test

---
 lib/connection/lan.js  | 11 ++++++++---
 lib/utils/constants.js |  2 +-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/lib/connection/lan.js b/lib/connection/lan.js
index d20c0ec1..97b1fc6e 100644
--- a/lib/connection/lan.js
+++ b/lib/connection/lan.js
@@ -161,9 +161,14 @@ module.exports = class connectionLAN {
       let suffix
       const params = {}
 
-      // For now only /switch and /switches are supported
-      if (json.params.switches) {
-        params.switches = json.params.switches
+      // For now only /dimmable (for D1), /switch /switches are supported
+      if (json.params.brightness) {
+        params.switch = 'on'
+        params.brightness = json.params.brightness
+        params.mode = 0
+        suffix = 'dimmable'
+      } else if (json.params.switches) {
+        params.switch = json.params.switches
         suffix = 'switches'
       } else if (json.params.switch) {
         params.switch = json.params.switch
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 0b96da7a..5f77d3f5 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -99,7 +99,7 @@ module.exports = {
   },
 
   devices: {
-    lan: [1, 2, 3, 4, 5, 6, 7, 8, 9, 32, 77, 78],
+    lan: [1, 2, 3, 4, 5, 6, 7, 8, 9, 32, 44, 77, 78],
     singleSwitch: [1, 5, 6, 14, 15, 22, 24, 27, 32, 36, 44, 59, 81, 104],
     multiSwitch: [2, 3, 4, 7, 8, 9, 29, 30, 31, 34, 41, 82, 83, 84],
     singleSwitchOutlet: ['Sonoff Pow', 'S20', 'S26', 'S26R1', 'S55', 'S55R1'],

From b2fbadaa6671143966c4d124acfd459076cc3368 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 26 Feb 2021 11:38:41 +0000
Subject: [PATCH 1593/3183] 5.0.7-0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 70bc61af..95491870 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "5.0.6",
+  "version": "5.0.7-0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index b42fa924..2fce25c4 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "5.0.6",
+  "version": "5.0.7-0",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From c43d16437ac0b89b9f76302ca1c4702e56044156 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 26 Feb 2021 13:54:14 +0000
Subject: [PATCH 1594/3183] support dualr3

---
 lib/device/switch-double.js | 216 ++++++++++++++++++++++++++++++++++++
 lib/index.js                |   9 +-
 lib/utils/constants.js      |   9 +-
 3 files changed, 231 insertions(+), 3 deletions(-)
 create mode 100644 lib/device/switch-double.js

diff --git a/lib/device/switch-double.js b/lib/device/switch-double.js
new file mode 100644
index 00000000..b09fe6b9
--- /dev/null
+++ b/lib/device/switch-double.js
@@ -0,0 +1,216 @@
+/* jshint -W014, -W033, esversion: 9 */
+/* eslint-disable new-cap */
+'use strict'
+
+module.exports = class deviceSwitchDouble {
+  constructor (platform, accessory) {
+    // Set up variables from the platform
+    this.consts = platform.consts
+    this.debug = platform.config.debug
+    this.funcs = platform.funcs
+    this.hapServ = platform.api.hap.Service
+    this.hapChar = platform.api.hap.Characteristic
+    this.log = platform.log
+    this.messages = platform.messages
+    this.platform = platform
+
+    // Set up variables from the accessory
+    this.name = accessory.displayName
+    this.accessory = accessory
+
+    // Set up custom variables for this device type
+    const deviceId = this.accessory.context.eweDeviceId
+    const deviceConf = platform.multiDevices[deviceId]
+    this.showAsOutlet = deviceConf && deviceConf.showAsOutlet
+    this.disableDeviceLogging = deviceConf && deviceConf.overrideDisabledLogging
+      ? false
+      : platform.config.disableDeviceLogging
+
+    if (this.showAsOutlet) {
+      // If the accessory has a switch service then remove it
+      if (this.accessory.getService(this.hapServ.Switch)) {
+        this.accessory.removeService(this.accessory.getService(this.hapServ.Switch))
+      }
+
+      // Add the outlet service if it doesn't already exist
+      this.service = this.accessory.getService(this.hapServ.Outlet) ||
+        this.accessory.addService(this.hapServ.Outlet)
+    } else {
+      // If the accessory has an outlet service then remove it
+      if (this.accessory.getService(this.hapServ.Outlet)) {
+        this.accessory.removeService(this.accessory.getService(this.hapServ.Outlet))
+      }
+
+      // Add the switch service if it doesn't already exist
+      this.service = this.accessory.getService(this.hapServ.Switch) ||
+        this.accessory.addService(this.hapServ.Switch)
+    }
+
+    // Add the set handler to the switch/outlet on/off characteristic
+    this.service.getCharacteristic(this.hapChar.On)
+      .on('set', this.internalUpdate.bind(this))
+
+    // Pass the accessory to Fakegato to set up with Eve
+    this.accessory.eveService = new this.platform.eveService('switch', this.accessory, {
+      log: platform.config.debugFakegato ? this.log : () => {}
+    })
+
+    // Output the customised options to the log if in debug mode
+    if (this.debug) {
+      const opts = JSON.stringify({
+        disableDeviceLogging: this.disableDeviceLogging,
+        showAsOutlet: this.showAsOutlet
+      })
+      this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
+    }
+  }
+
+  async internalUpdate (value, callback) {
+    try {
+      await this.funcs.sleep(Math.floor(Math.random() * 241 + 10))
+      callback()
+      let oAccessory
+      let masterState = 'off'
+      const params = {}
+      switch (this.accessory.context.switchNumber) {
+        case '0':
+          params.switches = this.consts.defaultDoubleSwitchOff
+          params.switches[0].switch = value ? 'on' : 'off'
+          params.switches[1].switch = value ? 'on' : 'off'
+          for (let i = 0; i <= 2; i++) {
+            const idToCheck = this.accessory.context.eweDeviceId + 'SW' + i
+            if ((oAccessory = this.platform.devicesInHB.get(idToCheck))) {
+              if (this.showAsOutlet) {
+                oAccessory.getService(this.hapServ.Outlet)
+                  .updateCharacteristic(this.hapChar.On, value)
+                oAccessory.getService(this.hapServ.Outlet)
+                  .updateCharacteristic(this.hapChar.OutletInUse, value)
+              } else {
+                oAccessory.getService(this.hapServ.Switch)
+                  .updateCharacteristic(this.hapChar.On, value)
+              }
+              oAccessory.context.cacheOnOff = value ? 'on' : 'off'
+              oAccessory.eveService.addEntry({ status: value ? 1 : 0 })
+              if (i > 0 && !this.disableDeviceLogging) {
+                const name = oAccessory.displayName
+                this.log('[%s] current state [%s].', name, value ? 'on' : 'off')
+              }
+            }
+          }
+          break
+        case '1':
+        case '2':
+          params.switches = this.consts.defaultDoubleSwitchOff
+          for (let i = 1; i <= 2; i++) {
+            const idToCheck = this.accessory.context.eweDeviceId + 'SW' + i
+            if ((oAccessory = this.platform.devicesInHB.get(idToCheck))) {
+              const serv = this.showAsOutlet
+                ? this.hapServ.Outlet
+                : this.hapServ.Switch
+              if (oAccessory.getService(serv).getCharacteristic(this.hapChar.On).value) {
+                masterState = 'on'
+              }
+              if (i === parseInt(this.accessory.context.switchNumber)) {
+                params.switches[i - 1].switch = value ? 'on' : 'off'
+                oAccessory.context.cacheOnOff = value ? 'on' : 'off'
+                oAccessory.eveService.addEntry({ status: value ? 1 : 0 })
+                if (this.showAsOutlet) {
+                  oAccessory.getService(this.hapServ.Outlet)
+                    .updateCharacteristic(this.hapChar.OutletInUse, value)
+                }
+                if (i > 0 && !this.disableDeviceLogging) {
+                  this.log(
+                    '[%s] current state [%s].',
+                    oAccessory.displayName,
+                    value ? 'on' : 'off'
+                  )
+                }
+              } else {
+                params.switches[i - 1].switch = oAccessory.context.cacheOnOff
+              }
+            } else {
+              params.switches[i - 1].switch = 'off'
+            }
+          }
+          if (!this.platform.hideMasters.includes(this.accessory.context.eweDeviceId)) {
+            oAccessory = this.platform.devicesInHB.get(
+              this.accessory.context.eweDeviceId + 'SW0'
+            )
+            if (this.showAsOutlet) {
+              oAccessory.getService(this.hapServ.Outlet)
+                .updateCharacteristic(this.hapChar.On, masterState === 'on')
+              oAccessory.getService(this.hapServ.Outlet)
+                .updateCharacteristic(this.hapChar.OutletInUse, masterState === 'on')
+            } else {
+              oAccessory.getService(this.hapServ.Switch)
+                .updateCharacteristic(this.hapChar.On, masterState === 'on')
+            }
+            oAccessory.eveService.addEntry({ status: masterState === 'on' ? 1 : 0 })
+          }
+          break
+      }
+      await this.platform.sendDeviceUpdate(this.accessory, params)
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, true)
+    }
+  }
+
+  async externalUpdate (params) {
+    try {
+      if (!params.switches) {
+        return
+      }
+      const idToCheck = this.accessory.context.eweDeviceId + 'SW'
+      let primaryState = false
+      for (let i = 1; i <= this.accessory.context.channelCount; i++) {
+        if (params.switches[i - 1].switch === 'on') {
+          primaryState = true
+        }
+        if (this.platform.devicesInHB.has(idToCheck + i)) {
+          const oAccessory = this.platform.devicesInHB.get(idToCheck + i)
+          if (
+            params.updateSource &&
+            params.switches[i - 1].switch === oAccessory.context.cacheOnOff
+          ) {
+            continue
+          }
+          if (this.showAsOutlet) {
+            oAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
+              this.hapChar.On,
+              params.switches[i - 1].switch === 'on'
+            )
+            oAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
+              this.hapChar.OutletInUse,
+              params.switches[i - 1].switch === 'on'
+            )
+          } else {
+            oAccessory.getService(this.hapServ.Switch).updateCharacteristic(
+              this.hapChar.On,
+              params.switches[i - 1].switch === 'on'
+            )
+          }
+          oAccessory.context.cacheOnOff = params.switches[i - 1].switch
+          oAccessory.eveService.addEntry({
+            status: params.switches[i - 1].switch === 'on' ? 1 : 0
+          })
+          if (params.updateSource && !this.disableDeviceLogging) {
+            this.log(
+              '[%s] current state [%s].',
+              oAccessory.displayName,
+              params.switches[i - 1].switch
+            )
+          }
+        }
+      }
+      if (!this.platform.hideMasters.includes(this.accessory.context.eweDeviceId)) {
+        this.service.updateCharacteristic(this.hapChar.On, primaryState)
+        if (this.showAsOutlet) {
+          this.service.updateCharacteristic(this.hapChar.OutletInUse, primaryState)
+        }
+        this.accessory.eveService.addEntry({ status: primaryState ? 1 : 0 })
+      }
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, false)
+    }
+  }
+}
diff --git a/lib/index.js b/lib/index.js
index e73d791d..65dbab59 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -885,7 +885,10 @@ class eWeLinkPlatform {
           ? new (require('./device/outlet'))(this, accessory)
           : new (require('./device/switch-single'))(this, accessory)
         /***********************/
-      } else if (this.consts.devices.multiSwitch.includes(device.extra.uiid)) {
+      } else if (
+        this.consts.devices.doubleSwitch.includes(device.extra.uiid) ||
+        this.consts.devices.multiSwitch.includes(device.extra.uiid)
+      ) {
         /***********************
         SWITCHES [MULTI CHANNEL]
         ***********************/
@@ -926,7 +929,9 @@ class eWeLinkPlatform {
           oAccessory.context.ip = this.lanClient && oAccessory.context.reachableLAN
             ? this.lanDevices.get(device.deviceid).ip
             : false
-          oAccessory.control = new (require('./device/switch-multi'))(this, oAccessory)
+          oAccessory.control = this.consts.devices.multiSwitch.includes(device.extra.uiid)
+            ? new (require('./device/switch-multi'))(this, oAccessory)
+            : new (require('./device/switch-double'))(this, oAccessory)
 
           // Update any changes to the sub accessory to the platform
           this.api.updatePlatformAccessories(PLUGIN.name, PLUGIN.alias, [oAccessory])
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 5f77d3f5..b6a2b488 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -99,8 +99,9 @@ module.exports = {
   },
 
   devices: {
-    lan: [1, 2, 3, 4, 5, 6, 7, 8, 9, 32, 44, 77, 78],
+    lan: [1, 2, 3, 4, 5, 6, 7, 8, 9, 32, 44, 77, 78, 126],
     singleSwitch: [1, 5, 6, 14, 15, 22, 24, 27, 32, 36, 44, 59, 81, 104],
+    doubleSwitch: [126],
     multiSwitch: [2, 3, 4, 7, 8, 9, 29, 30, 31, 34, 41, 82, 83, 84],
     singleSwitchOutlet: ['Sonoff Pow', 'S20', 'S26', 'S26R1', 'S55', 'S55R1'],
     lightDimmer: [36, 44],
@@ -150,6 +151,11 @@ module.exports = {
     timesOpened: 'E863F129-079E-48FF-8F27-9C2605A29F52'
   },
 
+  defaultDoubleSwitchOff: [
+    { switch: 'off', outlet: 0 },
+    { switch: 'off', outlet: 1 }
+  ],
+
   defaultMultiSwitchOff: [
     { switch: 'off', outlet: 0 },
     { switch: 'off', outlet: 1 },
@@ -198,6 +204,7 @@ module.exports = {
     103: 1, // "WOTEWODE_TEM_LIGHT" (B02-F)
     104: 1, // "WOTEWODE_RGB_TEM_LIGHT"
     107: 1, // "GSM_SOCKET_NO_FLOW"
+    126: 2, // "DUALR3"
     127: 1, // "GTTA127"
     1000: 1, // "ZIGBEE_WIRELESS_SWITCH"
     1009: 1, // "" (Some sort of single switch device)

From 83b1ac578a35e25b35ae98b9f3150b6efad36a74 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 26 Feb 2021 13:55:53 +0000
Subject: [PATCH 1595/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f7b7652e..56c8f15a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,17 @@
 
 All notable changes to this homebridge-ewelink will be documented in this file.
 
+## BETA
+
+### Added
+
+* [experimental] Support for Sonoff D1 LAN control
+* Support for Sonoff DUALR3
+
+### Changes
+
+* Less strict threshold for determining a 'significant' colour change for disabling Adaptive Lighting
+
 ## 5.0.6 (2021-02-26)
 
 ### Changes

From 0cb63ba5b5361401f579d39857140fb76bb75b43 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 26 Feb 2021 13:56:19 +0000
Subject: [PATCH 1596/3183] 5.0.7-1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 95491870..0369cf93 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "5.0.7-0",
+  "version": "5.0.7-1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 2fce25c4..19b07458 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "5.0.7-0",
+  "version": "5.0.7-1",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 6171acf7c4a4e900693d3aad3817045fdcb86e01 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 26 Feb 2021 14:47:40 +0000
Subject: [PATCH 1597/3183] new devices

---
 lib/device/light-dimmer.js     | 56 ++++++++++++++++----
 lib/device/sensor-temp-humi.js | 97 ++++++++++++++++++++++++++++++++++
 lib/index.js                   |  9 ++++
 lib/utils/constants.js         | 19 +++----
 4 files changed, 162 insertions(+), 19 deletions(-)
 create mode 100644 lib/device/sensor-temp-humi.js

diff --git a/lib/device/light-dimmer.js b/lib/device/light-dimmer.js
index 2890a93a..231d3ccb 100644
--- a/lib/device/light-dimmer.js
+++ b/lib/device/light-dimmer.js
@@ -59,9 +59,17 @@ module.exports = class deviceLightDimmer {
         return
       }
       this.cacheOnOff = onoff
-      await this.platform.sendDeviceUpdate(this.accessory, {
-        switch: this.cacheOnOff
-      })
+      const params = {}
+      switch (this.accessory.context.eweUIID) {
+        case 36:
+        case 44:
+          params.switch = this.cacheOnOff
+          break
+        case 57:
+          params.state = this.cacheOnOff
+          break
+      }
+      await this.platform.sendDeviceUpdate(this.accessory, params)
       if (!this.disableDeviceLogging) {
         this.log('[%s] current state [%s].', this.name, this.cacheOnOff)
       }
@@ -81,14 +89,18 @@ module.exports = class deviceLightDimmer {
       const params = {}
       switch (this.accessory.context.eweUIID) {
         case 36:
-        // KING-M4 eWeLink scale is 10-100 and HomeKit scale is 0-100.
           params.bright = Math.round((this.cacheBrightness * 9) / 10 + 10)
+          // KING-M4 eWeLink scale is 10-100 and HomeKit scale is 0-100
           break
         case 44:
-        // D1 eWeLink scale matches HomeKit scale of 0-100
           params.brightness = this.cacheBrightness
+          // D1 eWeLink scale matches HomeKit scale of 0-100
           params.mode = 0
           break
+        case 57:
+          params.channel0 = Math.round((this.cacheBrightness * 23) / 10 + 25).toString()
+          // Device eWeLink scale is 25-255 and HomeKit scale is 0-100.
+          break
       }
       const updateKey = Math.random().toString(36).substr(2, 8)
       this.updateKeyBright = updateKey
@@ -107,13 +119,24 @@ module.exports = class deviceLightDimmer {
 
   async externalUpdate (params) {
     try {
-      if (params.switch && params.switch !== this.cacheOnOff) {
-        this.service.updateCharacteristic(this.hapChar.On, params.switch === 'on')
-        this.cacheOnOff = params.switch
-        if (params.updateSource && !this.disableDeviceLogging) {
-          this.log('[%s] current state [%s].', this.name, params.switch)
+      if (this.accessory.context.eweUIID === 57) {
+        if (params.state && params.state !== this.cacheOnOff) {
+          this.service.updateCharacteristic(this.hapChar.On, params.state === 'on')
+          this.cacheOnOff = params.state
+          if (params.updateSource && !this.disableDeviceLogging) {
+            this.log('[%s] current state [%s].', this.name, params.state)
+          }
+        }
+      } else {
+        if (params.switch && params.switch !== this.cacheOnOff) {
+          this.service.updateCharacteristic(this.hapChar.On, params.switch === 'on')
+          this.cacheOnOff = params.switch
+          if (params.updateSource && !this.disableDeviceLogging) {
+            this.log('[%s] current state [%s].', this.name, params.switch)
+          }
         }
       }
+
       switch (this.accessory.context.eweUIID) {
         case 36:
           // KING-M4 eWeLink scale is 10-100 and HomeKit scale is 0-100.
@@ -141,6 +164,19 @@ module.exports = class deviceLightDimmer {
             }
           }
           break
+        case 57:
+          // Device eWeLink scale is 25-255 and HomeKit scale is 0-100.
+          if (this.funcs.hasProperty(params, 'channel0')) {
+            const nb = Math.round(((parseInt(params.channel0) - 25) * 10) / 23)
+            if (nb !== this.cacheBrightness) {
+              this.service.updateCharacteristic(this.hapChar.Brightness, nb)
+              this.cacheBrightness = nb
+              if (params.updateSource && !this.disableDeviceLogging) {
+                this.log('[%s] current brightness [%s%].', this.name, nb)
+              }
+            }
+          }
+          break
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
diff --git a/lib/device/sensor-temp-humi.js b/lib/device/sensor-temp-humi.js
new file mode 100644
index 00000000..f1632be7
--- /dev/null
+++ b/lib/device/sensor-temp-humi.js
@@ -0,0 +1,97 @@
+/* jshint -W014, -W033, esversion: 9 */
+/* eslint-disable new-cap */
+'use strict'
+
+module.exports = class deviceSensorTempHumi {
+  constructor (platform, accessory) {
+    // Set up variables from the platform
+    this.consts = platform.consts
+    this.debug = platform.config.debug
+    this.funcs = platform.funcs
+    this.hapServ = platform.api.hap.Service
+    this.hapChar = platform.api.hap.Characteristic
+    this.log = platform.log
+    this.messages = platform.messages
+    this.platform = platform
+
+    // Set up variables from the accessory
+    this.name = accessory.displayName
+    this.accessory = accessory
+
+    // Set up custom variables for this device type
+    const deviceId = this.accessory.context.eweDeviceId
+    const deviceConf = platform.thDevices[deviceId]
+    this.tempOffset = deviceConf && deviceConf.offset
+      ? deviceConf.offset
+      : platform.consts.defaultValues.offset
+    this.disableDeviceLogging = deviceConf && deviceConf.overrideDisabledLogging
+      ? false
+      : platform.config.disableDeviceLogging
+
+    // Add the temperature sensor service if it doesn't already exist
+    this.tempService = this.accessory.getService(this.hapServ.TemperatureSensor) ||
+      this.accessory.addService(this.hapServ.TemperatureSensor)
+
+    // Set custom properties of the current temperature characteristic
+    this.tempService.getCharacteristic(this.hapChar.CurrentTemperature).setProps({
+      minValue: -100,
+      minStep: 0.1
+    })
+
+    // Add the humidity sensor service if it doesn't already exist
+    this.humiService = this.accessory.getService(this.hapServ.HumiditySensor) ||
+      this.accessory.addService(this.hapServ.HumiditySensor)
+
+    // Pass the accessory to Fakegato to set up with Eve
+    this.accessory.eveService = new this.platform.eveService('custom', this.accessory, {
+      log: platform.config.debugFakegato ? this.log : () => {}
+    })
+
+    // Output the customised options to the log if in debug mode
+    if (this.debug) {
+      const opts = JSON.stringify({
+        disableDeviceLogging: this.disableDeviceLogging,
+        offset: this.tempOffset
+      })
+      this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
+    }
+  }
+
+  async externalUpdate (params) {
+    try {
+      const eveLog = {}
+      if (this.funcs.hasProperty(params, 'temperature')) {
+        const currentTemp = Number(params.temperature) + this.tempOffset
+        eveLog.temp = currentTemp
+        if (this.cacheTemp !== currentTemp) {
+          this.cacheTemp = currentTemp
+          this.tempService
+            .updateCharacteristic(this.hapChar.CurrentTemperature, this.cacheTemp)
+          if (params.updateSource && !this.disableDeviceLogging) {
+            this.log('[%s] current temperature [%s°C].', this.name, this.cacheTemp)
+          }
+        }
+      }
+      if (this.funcs.hasProperty(params, 'humidity')) {
+        const currentHumi = parseInt(params.humidity)
+        eveLog.humidity = currentHumi
+        if (this.cacheHumi !== currentHumi) {
+          this.cacheHumi = currentHumi
+          this.humiService
+            .updateCharacteristic(this.hapChar.CurrentRelativeHumidity, this.cacheHumi)
+          if (params.updateSource && !this.disableDeviceLogging) {
+            this.log('[%s] current humidity [%s%].', this.name, this.cacheHumi)
+          }
+        }
+      }
+      if (
+        this.funcs.hasProperty(eveLog, 'temp') ||
+        this.funcs.hasProperty(eveLog, 'humidity')
+      ) {
+        this.accessory.eveService.addEntry(eveLog)
+      }
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, false)
+    }
+  }
+}
diff --git a/lib/index.js b/lib/index.js
index 65dbab59..32dd3848 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -810,6 +810,15 @@ class eWeLinkPlatform {
         accessory.context.sensorType = device.params.sensorType
         accessory.control = new (require('./device/sensor-ambient'))(this, accessory)
         /**********************/
+      } else if (this.consts.devices.sensorTempHumi.includes(device.extra.uiid)) {
+        /*************************
+        SENSOR [AMBIENT-SONOFF SC]
+        *************************/
+        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
+          ? this.devicesInHB.get(device.deviceid + 'SWX')
+          : this.addAccessory(device, device.deviceid + 'SWX')
+        accessory.control = new (require('./device/sensor-temp-humi'))(this, accessory)
+        /************************/
       } else if (
         this.consts.devices.outlet.includes(device.extra.uiid) ||
         (
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index b6a2b488..db01cfcc 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -100,17 +100,18 @@ module.exports = {
 
   devices: {
     lan: [1, 2, 3, 4, 5, 6, 7, 8, 9, 32, 44, 77, 78, 126],
-    singleSwitch: [1, 5, 6, 14, 15, 22, 24, 27, 32, 36, 44, 59, 81, 104],
+    singleSwitch: [1, 5, 6, 14, 24, 27, 81],
     doubleSwitch: [126],
-    multiSwitch: [2, 3, 4, 7, 8, 9, 29, 30, 31, 34, 41, 82, 83, 84],
+    multiSwitch: [2, 3, 4, 7, 8, 9, 29, 30, 31, 41, 82, 83, 84],
     singleSwitchOutlet: ['Sonoff Pow', 'S20', 'S26', 'S26R1', 'S55', 'S55R1'],
-    lightDimmer: [36, 44],
+    lightDimmer: [36, 44, 57],
     lightRGB: [22],
     lightCCT: [103],
     lightRGBCCT: [59, 104],
     curtain: [11],
     sensorContact: [102],
     sensorAmbient: [15],
+    sensorTempHumi: [18],
     thermostat: [127],
     fan: [34],
     humidifier: [19],
@@ -130,10 +131,10 @@ module.exports = {
   },
 
   paramsToKeep: [
-    'battery', 'bright', 'brightness', 'channel', 'cmd', 'color', 'colorB', 'colorG',
-    'colorR', 'current', 'currentHumidity', 'currentTemperature', 'humidity', 'key',
-    'lightbright', 'lightswitch', 'lightRcolor', 'lightGcolor', 'lightBcolor', 'lock',
-    'ltype', 'mainSwitch', 'mode', 'motion', 'online', 'power', 'rfChl', 'rfList',
+    'battery', 'bright', 'brightness', 'channel', 'channel0', 'cmd', 'color', 'colorB',
+    'colorG', 'colorR', 'current', 'currentHumidity', 'currentTemperature', 'humidity',
+    'key', 'lightbright', 'lightswitch', 'lightRcolor', 'lightGcolor', 'lightBcolor',
+    'lock', 'ltype', 'mainSwitch', 'mode', 'motion', 'online', 'power', 'rfChl', 'rfList',
     'rfTrig', 'sensorType', 'setclose', 'state', 'switch', 'switches', 'targetTemp',
     'temperature', 'tempScale', 'trigTime', 'type', 'voltage', 'white', 'workMode',
     'workState', 'zyx_mode'
@@ -176,6 +177,7 @@ module.exports = {
     11: 1, // "CURTAIN" (King Q4 Cover)
     14: 1, // "SWITCH_CHANGE"
     15: 1, // "THERMOSTAT" (TH10, TH16)
+    18: 1, // "SENSORS_CENTER" (Sonoff SC)
     19: 1, // "HUMIDIFIER"
     22: 1, // "RGB_BALL_LIGHT" (B1, B1_R2)
     24: 1, // "GSM_SOCKET"
@@ -190,6 +192,7 @@ module.exports = {
     36: 1, // "SINGLE_CHANNEL_DIMMER_SWITCH" (KING-M4)
     41: 4, // "CUN_YOU_DOOR"
     44: 1, // "SNOFF_LIGHT" (D1)
+    57: 1, // "MONOCHROMATIC_BALL_LIGHT" (mosquito killer)
     59: 1, // "MUSIC_LIGHT_BELT" (L1)
     65: 1, // "CustomCamera" (eWeLink Camera App)
     66: 1, // "ZIGBEE_MAIN_DEVICE"
@@ -225,7 +228,6 @@ module.exports = {
     13: 0, // "FIREPLACE"
     16: 0, // "COLD_WARM_LED"
     17: 0, // "THREE_GEAR_FAN"
-    18: 0, // "SENSORS_CENTER"
     23: 0, // "NEST_THERMOSTAT"
     26: 0, // "RuiMiTeWenKongQi"
     33: 0, // "LIGHT_BELT",
@@ -242,7 +244,6 @@ module.exports = {
     53: 0, // "ELECTRIC_FAN_WITH_LAMP"
     55: 0, // "SWEEPING_ROBOT"
     56: 0, // "RGB_BALL_LIGHT_4"
-    57: 0, // "MONOCHROMATIC_BALL_LIGHT"
     60: 0, // "NEW_HUMIDIFIER"
     61: 0, // "KAI_WEI_ROUTER"
     62: 0, // "MEARICAMERA"

From 102316c99a1cd96aa57408fcc74f149024f6e48e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 26 Feb 2021 14:48:13 +0000
Subject: [PATCH 1598/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 56c8f15a..52dc9240 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,8 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 * [experimental] Support for Sonoff D1 LAN control
 * Support for Sonoff DUALR3
+* Support for Sonoff Mosquito Killer
+* Support for Sonoff SC (Sensor Centre)
 
 ### Changes
 

From 1517d6869661978eaa0bb28fdf6a6e74613e6cb6 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 26 Feb 2021 14:48:40 +0000
Subject: [PATCH 1599/3183] 5.0.7-2

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 0369cf93..f82922d9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "5.0.7-1",
+  "version": "5.0.7-2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 19b07458..09e8f085 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "5.0.7-1",
+  "version": "5.0.7-2",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 7e9640de08b34ddf14ef04b866b9d6cd0a79cdf8 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 28 Feb 2021 15:59:36 +0000
Subject: [PATCH 1600/3183] op time up and down

---
 config.schema.json             | 11 +++++++++++
 lib/device/simulation/blind.js | 19 +++++++++++++------
 lib/index.js                   |  3 ++-
 lib/utils/constants.js         |  2 ++
 package-lock.json              | 12 ++++++------
 5 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 2e1d689b..226a315a 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -544,6 +544,16 @@
               "placeholder": 100,
               "minimum": 20
             },
+            "operationTimeDown": {
+              "type": "number",
+              "title": "Operation Time Down (Deciseconds)",
+              "description": "If your garage door or blind has a different operation time for up and down, use this setting to specify the operation time DOWN (in deciseconds) and the other setting to specify the operation time UP. Otherwise leave blank. Must be 20 or more.",
+              "condition": {
+                "functionBody": "return (model.groups[arrayIndices] && ['garage', 'garage_two', 'garage_four', 'garage_eachen', 'blind', 'lock'].includes(model.groups[arrayIndices].type))"
+              },
+              "placeholder": 100,
+              "minimum": 20
+            },
             "sensorId": {
               "type": "string",
               "title": "Sensor",
@@ -777,6 +787,7 @@
           "groups[].type",
           "groups[].setup",
           "groups[].operationTime",
+          "groups[].operationTimeDown",
           "groups[].sensorId",
           "groups[].obstructId",
           "groups[].ipAddress",
diff --git a/lib/device/simulation/blind.js b/lib/device/simulation/blind.js
index 1a014065..09e45498 100644
--- a/lib/device/simulation/blind.js
+++ b/lib/device/simulation/blind.js
@@ -23,6 +23,7 @@ module.exports = class deviceBlind {
     const deviceConf = platform.simulations[deviceId]
     this.operationTime = deviceConf.operationTime ||
       this.consts.defaultValues.operationTime
+    this.operationTimeDown = deviceConf.operationTimeDown || this.operationTime
     this.disableDeviceLogging = deviceConf && deviceConf.overrideDisabledLogging
       ? false
       : platform.config.disableDeviceLogging
@@ -50,6 +51,8 @@ module.exports = class deviceBlind {
     if (this.debug) {
       const opts = JSON.stringify({
         disableDeviceLogging: this.disableDeviceLogging,
+        operationTime: this.operationTime,
+        operationTimeDown: this.operationTimeDown,
         type: deviceConf.type
       })
       this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
@@ -65,25 +68,29 @@ module.exports = class deviceBlind {
       }
       const params = { switches: this.consts.defaultMultiSwitchOff }
       const prevState = this.accessory.context.cachePositionState
-      const percentStepPerDS = this.operationTime / 100
+      const percentStepUpPerDS = this.operationTime / 100
+      const percentStepDownPerDS = this.operationTimeDown / 100
       const updateKey = Math.random().toString(36).substr(2, 8)
       this.updateKey = updateKey
       if (prevState !== 2) {
         await this.platform.sendDeviceUpdate(this.accessory, params)
-        let posPercentChange = Math.floor(Date.now() / 100) -
+        const posPercentChange = Math.floor(Date.now() / 100) -
           this.accessory.context.cacheLastStartTime
-        posPercentChange = Math.floor(percentStepPerDS * posPercentChange)
         if (prevState === 0) {
-          prevPosition -= posPercentChange
+          // Was going down
+          prevPosition -= Math.floor(percentStepDownPerDS * posPercentChange)
         } else {
-          prevPosition += posPercentChange
+          // Was going up
+          prevPosition += Math.floor(percentStepUpPerDS * posPercentChange)
         }
         this.service.updateCharacteristic(this.hapChar.CurrentPosition, prevPosition)
         this.accessory.context.cacheCurrentPosition = prevPosition
       }
       const diffPosition = value - prevPosition
       const setToMoveUp = diffPosition > 0
-      const decisecondsToMove = Math.round(Math.abs(diffPosition) * percentStepPerDS)
+      const decisecondsToMove = setToMoveUp
+        ? Math.round(Math.abs(diffPosition) * percentStepUpPerDS)
+        : Math.round(Math.abs(diffPosition) * percentStepDownPerDS)
       params.switches[0].switch = setToMoveUp ? 'on' : 'off'
       params.switches[1].switch = setToMoveUp ? 'off' : 'on'
       await this.platform.sendDeviceUpdate(this.accessory, params)
diff --git a/lib/index.js b/lib/index.js
index 32dd3848..c5d641ba 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -321,7 +321,8 @@ class eWeLinkPlatform {
                       this.obstructSwitches[parsed] = id
                     }
                     break
-                  case 'operationTime': {
+                  case 'operationTime':
+                  case 'operationTimeDown': {
                     if (typeof v === 'string') {
                       logQuotes(key + '.' + id + '.' + k)
                     }
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index db01cfcc..336beb18 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -33,6 +33,7 @@ module.exports = {
     sensorTimeDifference: 120,
     offset: 0,
     operationTime: 100,
+    operationTimeDown: 100,
     mode: 'auto',
     bulbModel: 'bulbB02FA60',
     brightnessStep: 1,
@@ -45,6 +46,7 @@ module.exports = {
     sensorTimeLength: 1,
     sensorTimeDifference: 10,
     operationTime: 20,
+    operationTimeDown: 20,
     brightnessStep: 1,
     adaptiveLightingShift: 0
   },
diff --git a/package-lock.json b/package-lock.json
index f82922d9..9e471226 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -73,9 +73,9 @@
       "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="
     },
     "follow-redirects": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.2.tgz",
-      "integrity": "sha512-6mPTgLxYm3r6Bkkg0vNM0HTjfGrOEtsfbhagQvbxDEsEkpNhw582upBaoRZylzen6krEmxXJgt9Ju6HiI4O7BA=="
+      "version": "1.13.3",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.3.tgz",
+      "integrity": "sha512-DUgl6+HDzB0iEptNQEXLx/KhTmDb8tZUHSeLqpnjpknR70H0nC2t9N73BK6fN4hOvJ84pKlIQVQ4k5FFlBedKA=="
     },
     "function-bind": {
       "version": "1.1.1",
@@ -101,9 +101,9 @@
       }
     },
     "has-symbols": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz",
-      "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg=="
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
+      "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw=="
     },
     "is-callable": {
       "version": "1.2.3",

From 8f36c11ff427e43cb52ec46c05d83d872f7ee068 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 28 Feb 2021 16:00:18 +0000
Subject: [PATCH 1601/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 52dc9240..0391ea81 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 ### Added
 
 * [experimental] Support for Sonoff D1 LAN control
+* [experimental] Specify different operation time for UP and DOWN for window blinds
 * Support for Sonoff DUALR3
 * Support for Sonoff Mosquito Killer
 * Support for Sonoff SC (Sensor Centre)

From cb079c65c33e52e31a8e973c867fbacfb1f276d2 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 28 Feb 2021 16:01:07 +0000
Subject: [PATCH 1602/3183] 5.0.7-3

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 9e471226..607d6ad9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "5.0.7-2",
+  "version": "5.0.7-3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 09e8f085..5fa897a7 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "5.0.7-2",
+  "version": "5.0.7-3",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 2265f3e6928450c52ee3414d85f6644dea385ded Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 1 Mar 2021 07:54:57 +0000
Subject: [PATCH 1603/3183] op time up and down two

---
 lib/device/simulation/blind.js | 34 +++++++++++++++++++++++-----------
 1 file changed, 23 insertions(+), 11 deletions(-)

diff --git a/lib/device/simulation/blind.js b/lib/device/simulation/blind.js
index 09e45498..de75d640 100644
--- a/lib/device/simulation/blind.js
+++ b/lib/device/simulation/blind.js
@@ -21,9 +21,9 @@ module.exports = class deviceBlind {
     // Set up custom variables for this device type
     const deviceId = this.accessory.context.eweDeviceId
     const deviceConf = platform.simulations[deviceId]
-    this.operationTime = deviceConf.operationTime ||
+    this.operationTimeUp = deviceConf.operationTime ||
       this.consts.defaultValues.operationTime
-    this.operationTimeDown = deviceConf.operationTimeDown || this.operationTime
+    this.operationTimeDown = deviceConf.operationTimeDown || this.operationTimeUp
     this.disableDeviceLogging = deviceConf && deviceConf.overrideDisabledLogging
       ? false
       : platform.config.disableDeviceLogging
@@ -51,12 +51,17 @@ module.exports = class deviceBlind {
     if (this.debug) {
       const opts = JSON.stringify({
         disableDeviceLogging: this.disableDeviceLogging,
-        operationTime: this.operationTime,
         operationTimeDown: this.operationTimeDown,
+        operationTimeUp: this.operationTimeUp,
         type: deviceConf.type
       })
       this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
     }
+    
+    // Reset for beta
+    this.accessory.context.cacheCurrentPosition = 0
+    this.accessory.context.cachePositionState = 2
+    this.accessory.context.cacheTargetPosition = 0
   }
 
   async internalUpdate (value, callback) {
@@ -68,7 +73,7 @@ module.exports = class deviceBlind {
       }
       const params = { switches: this.consts.defaultMultiSwitchOff }
       const prevState = this.accessory.context.cachePositionState
-      const percentStepUpPerDS = this.operationTime / 100
+      const percentStepUpPerDS = this.operationTimeUp / 100
       const percentStepDownPerDS = this.operationTimeDown / 100
       const updateKey = Math.random().toString(36).substr(2, 8)
       this.updateKey = updateKey
@@ -76,23 +81,30 @@ module.exports = class deviceBlind {
         await this.platform.sendDeviceUpdate(this.accessory, params)
         const posPercentChange = Math.floor(Date.now() / 100) -
           this.accessory.context.cacheLastStartTime
+        const posPercentChangeUp = Math.floor(percentStepUpPerDS * posPercentChange)
+        const posPercentChangeDown = Math.floor(percentStepDownPerDS * posPercentChange)
         if (prevState === 0) {
           // Was going down
-          prevPosition -= Math.floor(percentStepDownPerDS * posPercentChange)
+          prevPosition -= posPercentChangeDown
         } else {
           // Was going up
-          prevPosition += Math.floor(percentStepUpPerDS * posPercentChange)
+          prevPosition += posPercentChangeUp
         }
         this.service.updateCharacteristic(this.hapChar.CurrentPosition, prevPosition)
         this.accessory.context.cacheCurrentPosition = prevPosition
       }
       const diffPosition = value - prevPosition
       const setToMoveUp = diffPosition > 0
-      const decisecondsToMove = setToMoveUp
-        ? Math.round(Math.abs(diffPosition) * percentStepUpPerDS)
-        : Math.round(Math.abs(diffPosition) * percentStepDownPerDS)
-      params.switches[0].switch = setToMoveUp ? 'on' : 'off'
-      params.switches[1].switch = setToMoveUp ? 'off' : 'on'
+      let decisecondsToMove
+      if (setToMoveUp) {
+        decisecondsToMove = Math.round(Math.abs(diffPosition) * percentStepUpPerDS)
+        params.switches[0].switch = 'on'
+        params.switches[1].switch = 'off'
+      } else {
+        decisecondsToMove = Math.round(Math.abs(diffPosition) * percentStepDownPerDS)
+        params.switches[0].switch = 'off'
+        params.switches[1].switch = 'on'
+      }
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.accessory.context.cacheTargetPosition = value
       this.accessory.context.cachePositionState = setToMoveUp ? 1 : 0

From 9ec0ff84662b45fc338cd5062b37218b9033e805 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 1 Mar 2021 07:55:36 +0000
Subject: [PATCH 1604/3183] 5.0.7-4

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 607d6ad9..b5a2dc8a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "5.0.7-3",
+  "version": "5.0.7-4",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 5fa897a7..026c90ed 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "5.0.7-3",
+  "version": "5.0.7-4",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 89abe49de839c81058b6f1bc665a60acd2446efd Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 1 Mar 2021 08:24:57 +0000
Subject: [PATCH 1605/3183] adhere to [0, 100] range

---
 lib/device/simulation/blind.js | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/lib/device/simulation/blind.js b/lib/device/simulation/blind.js
index de75d640..f1ddbae5 100644
--- a/lib/device/simulation/blind.js
+++ b/lib/device/simulation/blind.js
@@ -57,11 +57,6 @@ module.exports = class deviceBlind {
       })
       this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
     }
-    
-    // Reset for beta
-    this.accessory.context.cacheCurrentPosition = 0
-    this.accessory.context.cachePositionState = 2
-    this.accessory.context.cacheTargetPosition = 0
   }
 
   async internalUpdate (value, callback) {
@@ -90,6 +85,7 @@ module.exports = class deviceBlind {
           // Was going up
           prevPosition += posPercentChangeUp
         }
+        prevPosition = Math.min(Math.max(prevPosition, 0), 100)
         this.service.updateCharacteristic(this.hapChar.CurrentPosition, prevPosition)
         this.accessory.context.cacheCurrentPosition = prevPosition
       }

From 6e27c00720d1f70606ca584601e2f3b3c32c4a8a Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 1 Mar 2021 08:25:34 +0000
Subject: [PATCH 1606/3183] 5.0.7-5

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b5a2dc8a..3ca2ae45 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "5.0.7-4",
+  "version": "5.0.7-5",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 026c90ed..80fbec88 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "5.0.7-4",
+  "version": "5.0.7-5",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 1e0d91704213d91e68db29708b45788c2684b9e0 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 1 Mar 2021 09:08:08 +0000
Subject: [PATCH 1607/3183] enable dualr3 for simulations

---
 lib/device/fan.js                     |  12 +-
 lib/device/simulation/blind.js        |   6 +-
 lib/device/simulation/garage-four.js  |   6 +-
 lib/device/simulation/garage-one.js   |   4 +-
 lib/device/simulation/lock-one.js     |   4 +-
 lib/device/simulation/switch-valve.js |  12 +-
 lib/device/simulation/tap-one.js      |   4 +-
 lib/device/simulation/tap-two.js      |   6 +-
 lib/device/simulation/valve-four.js   |   6 +-
 lib/device/simulation/valve-one.js    |   4 +-
 lib/device/simulation/valve-two.js    |   6 +-
 lib/device/switch-double.js           | 216 --------------------------
 lib/device/switch-multi.js            |  12 +-
 lib/index.js                          |   9 +-
 lib/utils/constants.js                |   3 +-
 15 files changed, 68 insertions(+), 242 deletions(-)
 delete mode 100644 lib/device/switch-double.js

diff --git a/lib/device/fan.js b/lib/device/fan.js
index ba40346e..aaffc63c 100644
--- a/lib/device/fan.js
+++ b/lib/device/fan.js
@@ -73,7 +73,11 @@ module.exports = class deviceFan {
   async internalSpeedUpdate (value, callback) {
     try {
       callback()
-      const params = { switches: this.consts.defaultMultiSwitchOff }
+      const params = {
+        switches: this.accessory.context.eweUIID === 126
+          ? this.consts.defaultDoubleSwitchOff
+          : this.consts.defaultMultiSwitchOff
+      }
       const newPower = value >= 33
       const newSpeed = value
       const newLight = this.lightService
@@ -106,7 +110,11 @@ module.exports = class deviceFan {
   async internalLightUpdate (value, callback) {
     try {
       callback()
-      const params = { switches: this.consts.defaultMultiSwitchOff }
+      const params = {
+        switches: this.accessory.context.eweUIID === 126
+          ? this.consts.defaultDoubleSwitchOff
+          : this.consts.defaultMultiSwitchOff
+      }
       const newPower = this.service.getCharacteristic(this.hapChar.On).value
       const newSpeed = this.service.getCharacteristic(this.hapChar.RotationSpeed).value
       const newLight = this.lightService ? value : true
diff --git a/lib/device/simulation/blind.js b/lib/device/simulation/blind.js
index f1ddbae5..86f26904 100644
--- a/lib/device/simulation/blind.js
+++ b/lib/device/simulation/blind.js
@@ -66,7 +66,11 @@ module.exports = class deviceBlind {
       if (value === prevPosition) {
         return
       }
-      const params = { switches: this.consts.defaultMultiSwitchOff }
+      const params = {
+        switches: this.accessory.context.eweUIID === 126
+          ? this.consts.defaultDoubleSwitchOff
+          : this.consts.defaultMultiSwitchOff
+      }
       const prevState = this.accessory.context.cachePositionState
       const percentStepUpPerDS = this.operationTimeUp / 100
       const percentStepDownPerDS = this.operationTimeDown / 100
diff --git a/lib/device/simulation/garage-four.js b/lib/device/simulation/garage-four.js
index 868b376e..b26f4ab2 100644
--- a/lib/device/simulation/garage-four.js
+++ b/lib/device/simulation/garage-four.js
@@ -99,7 +99,11 @@ module.exports = class deviceGarageFour {
         .updateCharacteristic(this.hapChar.CurrentDoorState, value + 2)
       this.accessory.context.cacheStates[garageChannel].cacheTargetDoorState = value
       this.accessory.context.cacheStates[garageChannel].cacheCurrentDoorState = value + 2
-      const params = { switches: this.consts.defaultMultiSwitchOff }
+      const params = {
+        switches: this.accessory.context.eweUIID === 126
+          ? this.consts.defaultDoubleSwitchOff
+          : this.consts.defaultMultiSwitchOff
+      }
       ;[0, 1, 2, 3].forEach(i => {
         params.switches[i].switch = garageChannel === i ? 'on' : 'off'
       })
diff --git a/lib/device/simulation/garage-one.js b/lib/device/simulation/garage-one.js
index 5edb91ee..8fcc55bd 100644
--- a/lib/device/simulation/garage-one.js
+++ b/lib/device/simulation/garage-one.js
@@ -130,7 +130,9 @@ module.exports = class deviceGarageOne {
           params.switch = 'on'
           break
         case 'twoSwitch':
-          params.switches = this.consts.defaultMultiSwitchOff
+          params.switches = this.accessory.context.eweUIID === 126
+            ? this.consts.defaultDoubleSwitchOff
+            : this.consts.defaultMultiSwitchOff
           params.switches[0].switch = newPos === 0 ? 'on' : 'off'
           params.switches[1].switch = newPos === 1 ? 'on' : 'off'
           break
diff --git a/lib/device/simulation/lock-one.js b/lib/device/simulation/lock-one.js
index c26d85e2..b8eb8aa5 100644
--- a/lib/device/simulation/lock-one.js
+++ b/lib/device/simulation/lock-one.js
@@ -75,7 +75,9 @@ module.exports = class deviceLockOne {
           params.switch = 'on'
           break
         case 'twoSwitch':
-          params.switches = this.consts.defaultMultiSwitchOff
+          params.switches = this.accessory.context.eweUIID === 126
+            ? this.consts.defaultDoubleSwitchOff
+            : this.consts.defaultMultiSwitchOff
           params.switches[0].switch = 'on'
           break
       }
diff --git a/lib/device/simulation/switch-valve.js b/lib/device/simulation/switch-valve.js
index c51008c8..05eb91eb 100644
--- a/lib/device/simulation/switch-valve.js
+++ b/lib/device/simulation/switch-valve.js
@@ -85,7 +85,11 @@ module.exports = class deviceSwitchValve {
   async internalSwitchUpdate (value, callback) {
     try {
       callback()
-      const params = { switches: this.consts.defaultMultiSwitchOff }
+      const params = {
+        switches: this.accessory.context.eweUIID === 126
+          ? this.consts.defaultDoubleSwitchOff
+          : this.consts.defaultMultiSwitchOff
+      }
       const valveValue = this.vService.getCharacteristic(this.hapChar.Active).value
       params.switches[0].switch = value ? 'on' : 'off'
       params.switches[1].switch = valveValue === 1 ? 'on' : 'off'
@@ -103,7 +107,11 @@ module.exports = class deviceSwitchValve {
   async internalValveUpdate (value, callback) {
     try {
       callback()
-      const params = { switches: this.consts.defaultMultiSwitchOff }
+      const params = {
+        switches: this.accessory.context.eweUIID === 126
+          ? this.consts.defaultDoubleSwitchOff
+          : this.consts.defaultMultiSwitchOff
+      }
       const switchValue = this.sService.getCharacteristic(this.hapChar.On).value
       params.switches[0].switch = switchValue ? 'on' : 'off'
       params.switches[1].switch = value === 1 ? 'on' : 'off'
diff --git a/lib/device/simulation/tap-one.js b/lib/device/simulation/tap-one.js
index 77d9f3c7..dda149e0 100644
--- a/lib/device/simulation/tap-one.js
+++ b/lib/device/simulation/tap-one.js
@@ -72,7 +72,9 @@ module.exports = class deviceTapOne {
           params.switch = value ? 'on' : 'off'
           break
         case 'twoSwitch':
-          params.switches = this.consts.defaultMultiSwitchOff
+          params.switches = this.accessory.context.eweUIID === 126
+            ? this.consts.defaultDoubleSwitchOff
+            : this.consts.defaultMultiSwitchOff
           params.switches[0].switch = value ? 'on' : 'off'
           break
       }
diff --git a/lib/device/simulation/tap-two.js b/lib/device/simulation/tap-two.js
index 3205e9ce..48728c3d 100644
--- a/lib/device/simulation/tap-two.js
+++ b/lib/device/simulation/tap-two.js
@@ -54,7 +54,11 @@ module.exports = class deviceTapTwo {
   async internalUpdate (tap, value, callback) {
     try {
       callback()
-      const params = { switches: this.consts.defaultMultiSwitchOff }
+      const params = {
+        switches: this.accessory.context.eweUIID === 126
+          ? this.consts.defaultDoubleSwitchOff
+          : this.consts.defaultMultiSwitchOff
+      }
       const tapService = this.accessory.getService(tap)
       switch (tap) {
         case 'Tap A': {
diff --git a/lib/device/simulation/valve-four.js b/lib/device/simulation/valve-four.js
index d332777d..924d5fb9 100644
--- a/lib/device/simulation/valve-four.js
+++ b/lib/device/simulation/valve-four.js
@@ -82,7 +82,11 @@ module.exports = class deviceValveFour {
   async internalUpdate (valve, value, callback) {
     try {
       callback()
-      const params = { switches: this.consts.defaultMultiSwitchOff }
+      const params = {
+        switches: this.accessory.context.eweUIID === 126
+          ? this.consts.defaultDoubleSwitchOff
+          : this.consts.defaultMultiSwitchOff
+      }
       const valveService = this.accessory.getService(valve)
       switch (valve) {
         case 'Valve A': {
diff --git a/lib/device/simulation/valve-one.js b/lib/device/simulation/valve-one.js
index 215ad9d3..a3c19a78 100644
--- a/lib/device/simulation/valve-one.js
+++ b/lib/device/simulation/valve-one.js
@@ -94,7 +94,9 @@ module.exports = class deviceValveOne {
           params.switch = value ? 'on' : 'off'
           break
         case 'twoSwitch':
-          params.switches = this.consts.defaultMultiSwitchOff
+          params.switches = this.accessory.context.eweUIID === 126
+            ? this.consts.defaultDoubleSwitchOff
+            : this.consts.defaultMultiSwitchOff
           params.switches[0].switch = value ? 'on' : 'off'
           break
       }
diff --git a/lib/device/simulation/valve-two.js b/lib/device/simulation/valve-two.js
index 7c89456a..9ad51b5c 100644
--- a/lib/device/simulation/valve-two.js
+++ b/lib/device/simulation/valve-two.js
@@ -82,7 +82,11 @@ module.exports = class deviceValveTwo {
   async internalUpdate (valve, value, callback) {
     try {
       callback()
-      const params = { switches: this.consts.defaultMultiSwitchOff }
+      const params = {
+        switches: this.accessory.context.eweUIID === 126
+          ? this.consts.defaultDoubleSwitchOff
+          : this.consts.defaultMultiSwitchOff
+      }
       const valveService = this.accessory.getService(valve)
       switch (valve) {
         case 'Valve A': {
diff --git a/lib/device/switch-double.js b/lib/device/switch-double.js
deleted file mode 100644
index b09fe6b9..00000000
--- a/lib/device/switch-double.js
+++ /dev/null
@@ -1,216 +0,0 @@
-/* jshint -W014, -W033, esversion: 9 */
-/* eslint-disable new-cap */
-'use strict'
-
-module.exports = class deviceSwitchDouble {
-  constructor (platform, accessory) {
-    // Set up variables from the platform
-    this.consts = platform.consts
-    this.debug = platform.config.debug
-    this.funcs = platform.funcs
-    this.hapServ = platform.api.hap.Service
-    this.hapChar = platform.api.hap.Characteristic
-    this.log = platform.log
-    this.messages = platform.messages
-    this.platform = platform
-
-    // Set up variables from the accessory
-    this.name = accessory.displayName
-    this.accessory = accessory
-
-    // Set up custom variables for this device type
-    const deviceId = this.accessory.context.eweDeviceId
-    const deviceConf = platform.multiDevices[deviceId]
-    this.showAsOutlet = deviceConf && deviceConf.showAsOutlet
-    this.disableDeviceLogging = deviceConf && deviceConf.overrideDisabledLogging
-      ? false
-      : platform.config.disableDeviceLogging
-
-    if (this.showAsOutlet) {
-      // If the accessory has a switch service then remove it
-      if (this.accessory.getService(this.hapServ.Switch)) {
-        this.accessory.removeService(this.accessory.getService(this.hapServ.Switch))
-      }
-
-      // Add the outlet service if it doesn't already exist
-      this.service = this.accessory.getService(this.hapServ.Outlet) ||
-        this.accessory.addService(this.hapServ.Outlet)
-    } else {
-      // If the accessory has an outlet service then remove it
-      if (this.accessory.getService(this.hapServ.Outlet)) {
-        this.accessory.removeService(this.accessory.getService(this.hapServ.Outlet))
-      }
-
-      // Add the switch service if it doesn't already exist
-      this.service = this.accessory.getService(this.hapServ.Switch) ||
-        this.accessory.addService(this.hapServ.Switch)
-    }
-
-    // Add the set handler to the switch/outlet on/off characteristic
-    this.service.getCharacteristic(this.hapChar.On)
-      .on('set', this.internalUpdate.bind(this))
-
-    // Pass the accessory to Fakegato to set up with Eve
-    this.accessory.eveService = new this.platform.eveService('switch', this.accessory, {
-      log: platform.config.debugFakegato ? this.log : () => {}
-    })
-
-    // Output the customised options to the log if in debug mode
-    if (this.debug) {
-      const opts = JSON.stringify({
-        disableDeviceLogging: this.disableDeviceLogging,
-        showAsOutlet: this.showAsOutlet
-      })
-      this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
-    }
-  }
-
-  async internalUpdate (value, callback) {
-    try {
-      await this.funcs.sleep(Math.floor(Math.random() * 241 + 10))
-      callback()
-      let oAccessory
-      let masterState = 'off'
-      const params = {}
-      switch (this.accessory.context.switchNumber) {
-        case '0':
-          params.switches = this.consts.defaultDoubleSwitchOff
-          params.switches[0].switch = value ? 'on' : 'off'
-          params.switches[1].switch = value ? 'on' : 'off'
-          for (let i = 0; i <= 2; i++) {
-            const idToCheck = this.accessory.context.eweDeviceId + 'SW' + i
-            if ((oAccessory = this.platform.devicesInHB.get(idToCheck))) {
-              if (this.showAsOutlet) {
-                oAccessory.getService(this.hapServ.Outlet)
-                  .updateCharacteristic(this.hapChar.On, value)
-                oAccessory.getService(this.hapServ.Outlet)
-                  .updateCharacteristic(this.hapChar.OutletInUse, value)
-              } else {
-                oAccessory.getService(this.hapServ.Switch)
-                  .updateCharacteristic(this.hapChar.On, value)
-              }
-              oAccessory.context.cacheOnOff = value ? 'on' : 'off'
-              oAccessory.eveService.addEntry({ status: value ? 1 : 0 })
-              if (i > 0 && !this.disableDeviceLogging) {
-                const name = oAccessory.displayName
-                this.log('[%s] current state [%s].', name, value ? 'on' : 'off')
-              }
-            }
-          }
-          break
-        case '1':
-        case '2':
-          params.switches = this.consts.defaultDoubleSwitchOff
-          for (let i = 1; i <= 2; i++) {
-            const idToCheck = this.accessory.context.eweDeviceId + 'SW' + i
-            if ((oAccessory = this.platform.devicesInHB.get(idToCheck))) {
-              const serv = this.showAsOutlet
-                ? this.hapServ.Outlet
-                : this.hapServ.Switch
-              if (oAccessory.getService(serv).getCharacteristic(this.hapChar.On).value) {
-                masterState = 'on'
-              }
-              if (i === parseInt(this.accessory.context.switchNumber)) {
-                params.switches[i - 1].switch = value ? 'on' : 'off'
-                oAccessory.context.cacheOnOff = value ? 'on' : 'off'
-                oAccessory.eveService.addEntry({ status: value ? 1 : 0 })
-                if (this.showAsOutlet) {
-                  oAccessory.getService(this.hapServ.Outlet)
-                    .updateCharacteristic(this.hapChar.OutletInUse, value)
-                }
-                if (i > 0 && !this.disableDeviceLogging) {
-                  this.log(
-                    '[%s] current state [%s].',
-                    oAccessory.displayName,
-                    value ? 'on' : 'off'
-                  )
-                }
-              } else {
-                params.switches[i - 1].switch = oAccessory.context.cacheOnOff
-              }
-            } else {
-              params.switches[i - 1].switch = 'off'
-            }
-          }
-          if (!this.platform.hideMasters.includes(this.accessory.context.eweDeviceId)) {
-            oAccessory = this.platform.devicesInHB.get(
-              this.accessory.context.eweDeviceId + 'SW0'
-            )
-            if (this.showAsOutlet) {
-              oAccessory.getService(this.hapServ.Outlet)
-                .updateCharacteristic(this.hapChar.On, masterState === 'on')
-              oAccessory.getService(this.hapServ.Outlet)
-                .updateCharacteristic(this.hapChar.OutletInUse, masterState === 'on')
-            } else {
-              oAccessory.getService(this.hapServ.Switch)
-                .updateCharacteristic(this.hapChar.On, masterState === 'on')
-            }
-            oAccessory.eveService.addEntry({ status: masterState === 'on' ? 1 : 0 })
-          }
-          break
-      }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
-    } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
-    }
-  }
-
-  async externalUpdate (params) {
-    try {
-      if (!params.switches) {
-        return
-      }
-      const idToCheck = this.accessory.context.eweDeviceId + 'SW'
-      let primaryState = false
-      for (let i = 1; i <= this.accessory.context.channelCount; i++) {
-        if (params.switches[i - 1].switch === 'on') {
-          primaryState = true
-        }
-        if (this.platform.devicesInHB.has(idToCheck + i)) {
-          const oAccessory = this.platform.devicesInHB.get(idToCheck + i)
-          if (
-            params.updateSource &&
-            params.switches[i - 1].switch === oAccessory.context.cacheOnOff
-          ) {
-            continue
-          }
-          if (this.showAsOutlet) {
-            oAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
-              this.hapChar.On,
-              params.switches[i - 1].switch === 'on'
-            )
-            oAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
-              this.hapChar.OutletInUse,
-              params.switches[i - 1].switch === 'on'
-            )
-          } else {
-            oAccessory.getService(this.hapServ.Switch).updateCharacteristic(
-              this.hapChar.On,
-              params.switches[i - 1].switch === 'on'
-            )
-          }
-          oAccessory.context.cacheOnOff = params.switches[i - 1].switch
-          oAccessory.eveService.addEntry({
-            status: params.switches[i - 1].switch === 'on' ? 1 : 0
-          })
-          if (params.updateSource && !this.disableDeviceLogging) {
-            this.log(
-              '[%s] current state [%s].',
-              oAccessory.displayName,
-              params.switches[i - 1].switch
-            )
-          }
-        }
-      }
-      if (!this.platform.hideMasters.includes(this.accessory.context.eweDeviceId)) {
-        this.service.updateCharacteristic(this.hapChar.On, primaryState)
-        if (this.showAsOutlet) {
-          this.service.updateCharacteristic(this.hapChar.OutletInUse, primaryState)
-        }
-        this.accessory.eveService.addEntry({ status: primaryState ? 1 : 0 })
-      }
-    } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, false)
-    }
-  }
-}
diff --git a/lib/device/switch-multi.js b/lib/device/switch-multi.js
index 29397eb7..e1aeca10 100644
--- a/lib/device/switch-multi.js
+++ b/lib/device/switch-multi.js
@@ -74,12 +74,14 @@ module.exports = class deviceSwitchMulti {
       const params = {}
       switch (this.accessory.context.switchNumber) {
         case '0':
-          params.switches = this.consts.defaultMultiSwitchOff
+          params.switches = this.accessory.context.eweUIID === 126
+            ? this.consts.defaultDoubleSwitchOff
+            : this.consts.defaultMultiSwitchOff
           params.switches[0].switch = value ? 'on' : 'off'
           params.switches[1].switch = value ? 'on' : 'off'
           params.switches[2].switch = value ? 'on' : 'off'
           params.switches[3].switch = value ? 'on' : 'off'
-          for (let i = 0; i <= 4; i++) {
+          for (let i = 0; i <= this.accessory.context.channelCount; i++) {
             const idToCheck = this.accessory.context.eweDeviceId + 'SW' + i
             if ((oAccessory = this.platform.devicesInHB.get(idToCheck))) {
               if (this.showAsOutlet) {
@@ -104,8 +106,10 @@ module.exports = class deviceSwitchMulti {
         case '2':
         case '3':
         case '4':
-          params.switches = this.consts.defaultMultiSwitchOff
-          for (let i = 1; i <= 4; i++) {
+          params.switches = this.accessory.context.eweUIID === 126
+            ? this.consts.defaultDoubleSwitchOff
+            : this.consts.defaultMultiSwitchOff
+          for (let i = 1; i <= this.accessory.context.channelCount; i++) {
             const idToCheck = this.accessory.context.eweDeviceId + 'SW' + i
             if ((oAccessory = this.platform.devicesInHB.get(idToCheck))) {
               const serv = this.showAsOutlet
diff --git a/lib/index.js b/lib/index.js
index c5d641ba..2ead87e7 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -895,10 +895,7 @@ class eWeLinkPlatform {
           ? new (require('./device/outlet'))(this, accessory)
           : new (require('./device/switch-single'))(this, accessory)
         /***********************/
-      } else if (
-        this.consts.devices.doubleSwitch.includes(device.extra.uiid) ||
-        this.consts.devices.multiSwitch.includes(device.extra.uiid)
-      ) {
+      } else if (this.consts.devices.multiSwitch.includes(device.extra.uiid)) {
         /***********************
         SWITCHES [MULTI CHANNEL]
         ***********************/
@@ -939,9 +936,7 @@ class eWeLinkPlatform {
           oAccessory.context.ip = this.lanClient && oAccessory.context.reachableLAN
             ? this.lanDevices.get(device.deviceid).ip
             : false
-          oAccessory.control = this.consts.devices.multiSwitch.includes(device.extra.uiid)
-            ? new (require('./device/switch-multi'))(this, oAccessory)
-            : new (require('./device/switch-double'))(this, oAccessory)
+          oAccessory.control = new (require('./device/switch-multi'))(this, oAccessory)
 
           // Update any changes to the sub accessory to the platform
           this.api.updatePlatformAccessories(PLUGIN.name, PLUGIN.alias, [oAccessory])
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 336beb18..7a35b63f 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -103,8 +103,7 @@ module.exports = {
   devices: {
     lan: [1, 2, 3, 4, 5, 6, 7, 8, 9, 32, 44, 77, 78, 126],
     singleSwitch: [1, 5, 6, 14, 24, 27, 81],
-    doubleSwitch: [126],
-    multiSwitch: [2, 3, 4, 7, 8, 9, 29, 30, 31, 41, 82, 83, 84],
+    multiSwitch: [2, 3, 4, 7, 8, 9, 29, 30, 31, 41, 82, 83, 84, 126],
     singleSwitchOutlet: ['Sonoff Pow', 'S20', 'S26', 'S26R1', 'S55', 'S55R1'],
     lightDimmer: [36, 44, 57],
     lightRGB: [22],

From 18a303bd9fbcd4849310c8849b303a46bdf048a6 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 1 Mar 2021 09:34:19 +0000
Subject: [PATCH 1608/3183] split operationtime for garages

---
 lib/device/simulation/garage-four.js |  9 ++++++---
 lib/device/simulation/garage-one.js  | 12 ++++++++----
 lib/device/simulation/garage-two.js  | 12 ++++++++----
 3 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/lib/device/simulation/garage-four.js b/lib/device/simulation/garage-four.js
index b26f4ab2..f5030ddd 100644
--- a/lib/device/simulation/garage-four.js
+++ b/lib/device/simulation/garage-four.js
@@ -21,8 +21,9 @@ module.exports = class deviceGarageFour {
     // Set up custom variables for this device type
     const deviceId = this.accessory.context.eweDeviceId
     const deviceConf = platform.simulations[deviceId]
-    this.operationTime = deviceConf.operationTime ||
+    this.operationTimeUp = deviceConf.operationTime ||
       this.consts.defaultValues.operationTime
+    this.operationTimeDown = deviceConf.operationTimeDown || this.operationTimeUp
     this.disableDeviceLogging = deviceConf.overrideDisabledLogging
       ? false
       : platform.config.disableDeviceLogging
@@ -61,7 +62,8 @@ module.exports = class deviceGarageFour {
     if (this.debug) {
       const opts = JSON.stringify({
         disableDeviceLogging: this.disableDeviceLogging,
-        operationTime: this.operationTime,
+        operationTimeDown: this.operationTimeDown,
+        operationTimeUp: this.operationTimeUp,
         type: deviceConf.type
       })
       this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
@@ -110,7 +112,8 @@ module.exports = class deviceGarageFour {
       await this.platform.sendDeviceUpdate(this.accessory, params)
       await this.funcs.sleep(2000)
       this.inUse = false
-      await this.funcs.sleep(Math.max((this.operationTime - 20) * 100, 0))
+      const operationTime = value === 0 ? this.operationTimeUp : this.operationTimeDown
+      await this.funcs.sleep(Math.max((operationTime - 20) * 100, 0))
       if (this.updateKey !== updateKey) {
         return
       }
diff --git a/lib/device/simulation/garage-one.js b/lib/device/simulation/garage-one.js
index 8fcc55bd..b15997d3 100644
--- a/lib/device/simulation/garage-one.js
+++ b/lib/device/simulation/garage-one.js
@@ -22,8 +22,9 @@ module.exports = class deviceGarageOne {
     const deviceId = this.accessory.context.eweDeviceId
     const deviceConf = platform.simulations[deviceId]
     this.setup = deviceConf.setup
-    this.operationTime = deviceConf.operationTime ||
+    this.operationTimeUp = deviceConf.operationTime ||
       this.consts.defaultValues.operationTime
+    this.operationTimeDown = deviceConf.operationTimeDown || this.operationTimeUp
     this.disableDeviceLogging = deviceConf.overrideDisabledLogging
       ? false
       : platform.config.disableDeviceLogging
@@ -80,7 +81,8 @@ module.exports = class deviceGarageOne {
     if (this.debug) {
       const opts = JSON.stringify({
         disableDeviceLogging: this.disableDeviceLogging,
-        operationTime: this.operationTime,
+        operationTimeDown: this.operationTimeDown,
+        operationTimeUp: this.operationTimeUp,
         setup: this.setup,
         type: deviceConf.type
       })
@@ -140,7 +142,8 @@ module.exports = class deviceGarageOne {
       await this.platform.sendDeviceUpdate(this.accessory, params)
       await this.funcs.sleep(2000)
       this.inUse = false
-      await this.funcs.sleep(Math.max((this.operationTime - 20) * 100, 0))
+      const operationTime = newPos === 0 ? this.operationTimeUp : this.operationTimeDown
+      await this.funcs.sleep(Math.max((operationTime - 20) * 100, 0))
       if (!this.definedSensor) {
         this.service.updateCharacteristic(this.hapChar.CurrentDoorState, newPos)
         this.accessory.context.cacheCurrentDoorState = newPos
@@ -191,7 +194,8 @@ module.exports = class deviceGarageOne {
       this.accessory.context.cacheTargetDoorState = newPos - 2
       await this.funcs.sleep(2000)
       this.inUse = false
-      await this.funcs.sleep(Math.max((this.operationTime - 20) * 100, 0))
+      const operationTime = newPos === 2 ? this.operationTimeUp : this.operationTimeDown
+      await this.funcs.sleep(Math.max((operationTime - 20) * 100, 0))
       this.service.updateCharacteristic(this.hapChar.CurrentDoorState, newPos - 2)
       this.accessory.context.cacheCurrentDoorState = newPos - 2
       if (!this.disableDeviceLogging) {
diff --git a/lib/device/simulation/garage-two.js b/lib/device/simulation/garage-two.js
index e7810549..00ca5c4a 100644
--- a/lib/device/simulation/garage-two.js
+++ b/lib/device/simulation/garage-two.js
@@ -21,8 +21,9 @@ module.exports = class deviceGarageTwo {
     // Set up custom variables for this device type
     const deviceId = this.accessory.context.eweDeviceId
     const deviceConf = platform.simulations[deviceId]
-    this.operationTime = deviceConf.operationTime ||
+    this.operationTimeUp = deviceConf.operationTime ||
       this.consts.defaultValues.operationTime
+    this.operationTimeDown = deviceConf.operationTimeDown || this.operationTimeUp
     this.disableDeviceLogging = deviceConf.overrideDisabledLogging
       ? false
       : platform.config.disableDeviceLogging
@@ -61,7 +62,8 @@ module.exports = class deviceGarageTwo {
     if (this.debug) {
       const opts = JSON.stringify({
         disableDeviceLogging: this.disableDeviceLogging,
-        operationTime: this.operationTime,
+        operationTimeDown: this.operationTimeDown,
+        operationTimeUp: this.operationTimeUp,
         type: deviceConf.type
       })
       this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
@@ -102,7 +104,8 @@ module.exports = class deviceGarageTwo {
       await this.platform.sendDeviceUpdate(this.accessory, params)
       await this.funcs.sleep(2000)
       this.inUse = false
-      await this.funcs.sleep(Math.max((this.operationTime - 20) * 100, 0))
+      const operationTime = newPos === 0 ? this.operationTimeUp : this.operationTimeDown
+      await this.funcs.sleep(Math.max((operationTime - 20) * 100, 0))
       gdService.updateCharacteristic(this.hapChar.CurrentDoorState, newPos)
       switch (garage) {
         case 'Garage 1': {
@@ -179,7 +182,8 @@ module.exports = class deviceGarageTwo {
         }
         await this.funcs.sleep(2000)
         this.inUse = false
-        await this.funcs.sleep(Math.max((this.operationTime - 20) * 100, 0))
+        const operationTime = newPos === 2 ? this.operationTimeUp : this.operationTimeDown
+        await this.funcs.sleep(Math.max((operationTime - 20) * 100, 0))
         gcService.updateCharacteristic(this.hapChar.CurrentDoorState, newPos - 2)
         switch (v) {
           case '1':

From ba52fba9ff421e265c66dac21b5fd5097aec79ff Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 1 Mar 2021 16:04:28 +0000
Subject: [PATCH 1609/3183] add door + window simulations

---
 config.schema.json              |  12 ++-
 lib/device/simulation/door.js   | 134 ++++++++++++++++++++++++++++++++
 lib/device/simulation/window.js | 134 ++++++++++++++++++++++++++++++++
 lib/index.js                    |  24 ++++++
 lib/utils/constants.js          |   4 +-
 5 files changed, 304 insertions(+), 4 deletions(-)
 create mode 100644 lib/device/simulation/door.js
 create mode 100644 lib/device/simulation/window.js

diff --git a/config.schema.json b/config.schema.json
index 226a315a..de14c874 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -483,6 +483,14 @@
                   "title": "1 Window Blind (w/ multi-channel device)",
                   "enum": ["blind"]
                 },
+                {
+                  "title": "1 Door (w/ multi-channel device)",
+                  "enum": ["door"]
+                },
+                {
+                  "title": "1 Window (w/ multi-channel device)",
+                  "enum": ["window"]
+                },
                 {
                   "title": "1 Lock (w/ single or multi-channel device)",
                   "enum": ["lock"]
@@ -539,7 +547,7 @@
               "title": "Operation Time (Deciseconds)",
               "description": "Blinds/garage doors: the time to open/close the device. Locks: the time to show as unlocked. This setting is in deciseconds - count the time in seconds and multiply by 10, for example 75 for 7.5 seconds. Must be 20 or more.",
               "condition": {
-                "functionBody": "return (model.groups[arrayIndices] && ['garage', 'garage_two', 'garage_four', 'garage_eachen', 'blind', 'lock'].includes(model.groups[arrayIndices].type))"
+                "functionBody": "return (model.groups[arrayIndices] && ['garage', 'garage_two', 'garage_four', 'garage_eachen', 'blind', 'door', 'window', 'lock'].includes(model.groups[arrayIndices].type))"
               },
               "placeholder": 100,
               "minimum": 20
@@ -549,7 +557,7 @@
               "title": "Operation Time Down (Deciseconds)",
               "description": "If your garage door or blind has a different operation time for up and down, use this setting to specify the operation time DOWN (in deciseconds) and the other setting to specify the operation time UP. Otherwise leave blank. Must be 20 or more.",
               "condition": {
-                "functionBody": "return (model.groups[arrayIndices] && ['garage', 'garage_two', 'garage_four', 'garage_eachen', 'blind', 'lock'].includes(model.groups[arrayIndices].type))"
+                "functionBody": "return (model.groups[arrayIndices] && ['garage', 'garage_two', 'garage_four', 'garage_eachen', 'blind', 'door, 'window', 'lock'].includes(model.groups[arrayIndices].type))"
               },
               "placeholder": 100,
               "minimum": 20
diff --git a/lib/device/simulation/door.js b/lib/device/simulation/door.js
new file mode 100644
index 00000000..b5984903
--- /dev/null
+++ b/lib/device/simulation/door.js
@@ -0,0 +1,134 @@
+/* jshint -W014, -W033, esversion: 9 */
+/* eslint-disable new-cap */
+'use strict'
+
+module.exports = class deviceDoor {
+  constructor (platform, accessory) {
+    // Set up variables from the platform
+    this.consts = platform.consts
+    this.debug = platform.config.debug
+    this.funcs = platform.funcs
+    this.hapServ = platform.api.hap.Service
+    this.hapChar = platform.api.hap.Characteristic
+    this.log = platform.log
+    this.messages = platform.messages
+    this.platform = platform
+
+    // Set up variables from the accessory
+    this.name = accessory.displayName
+    this.accessory = accessory
+
+    // Set up custom variables for this device type
+    const deviceId = this.accessory.context.eweDeviceId
+    const deviceConf = platform.simulations[deviceId]
+    this.operationTimeUp = deviceConf.operationTime ||
+      this.consts.defaultValues.operationTime
+    this.operationTimeDown = deviceConf.operationTimeDown || this.operationTimeUp
+    this.disableDeviceLogging = deviceConf && deviceConf.overrideDisabledLogging
+      ? false
+      : platform.config.disableDeviceLogging
+
+    // Set up the accessory with default positions when added the first time
+    if (!this.funcs.hasProperty(this.accessory.context, 'cacheCurrentPosition')) {
+      this.accessory.context.cacheCurrentPosition = 0
+      this.accessory.context.cachePositionState = 2
+      this.accessory.context.cacheTargetPosition = 0
+    }
+
+    // Add the door service if it doesn't already exist
+    if (!(this.service = this.accessory.getService(this.hapServ.Door))) {
+      this.service = this.accessory.addService(this.hapServ.Door)
+      this.service.setCharacteristic(this.hapChar.CurrentPosition, 0)
+        .setCharacteristic(this.hapChar.TargetPosition, 0)
+        .setCharacteristic(this.hapChar.PositionState, 2)
+    }
+
+    // Add the set handler to the target position characteristic
+    this.service.getCharacteristic(this.hapChar.TargetPosition)
+      .on('set', this.internalUpdate.bind(this))
+
+    // Output the customised options to the log if in debug mode
+    if (this.debug) {
+      const opts = JSON.stringify({
+        disableDeviceLogging: this.disableDeviceLogging,
+        operationTimeDown: this.operationTimeDown,
+        operationTimeUp: this.operationTimeUp,
+        type: deviceConf.type
+      })
+      this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
+    }
+  }
+
+  async internalUpdate (value, callback) {
+    try {
+      callback()
+      let prevPosition = this.accessory.context.cacheCurrentPosition
+      if (value === prevPosition) {
+        return
+      }
+      const params = {
+        switches: this.accessory.context.eweUIID === 126
+          ? this.consts.defaultDoubleSwitchOff
+          : this.consts.defaultMultiSwitchOff
+      }
+      const prevState = this.accessory.context.cachePositionState
+      const percentStepUpPerDS = this.operationTimeUp / 100
+      const percentStepDownPerDS = this.operationTimeDown / 100
+      const updateKey = Math.random().toString(36).substr(2, 8)
+      this.updateKey = updateKey
+      if (prevState !== 2) {
+        await this.platform.sendDeviceUpdate(this.accessory, params)
+        const posPercentChange = Math.floor(Date.now() / 100) -
+          this.accessory.context.cacheLastStartTime
+        const posPercentChangeUp = Math.floor(percentStepUpPerDS * posPercentChange)
+        const posPercentChangeDown = Math.floor(percentStepDownPerDS * posPercentChange)
+        if (prevState === 0) {
+          // Was going down
+          prevPosition -= posPercentChangeDown
+        } else {
+          // Was going up
+          prevPosition += posPercentChangeUp
+        }
+        prevPosition = Math.min(Math.max(prevPosition, 0), 100)
+        this.service.updateCharacteristic(this.hapChar.CurrentPosition, prevPosition)
+        this.accessory.context.cacheCurrentPosition = prevPosition
+      }
+      const diffPosition = value - prevPosition
+      const setToMoveUp = diffPosition > 0
+      let decisecondsToMove
+      if (setToMoveUp) {
+        decisecondsToMove = Math.round(Math.abs(diffPosition) * percentStepUpPerDS)
+        params.switches[0].switch = 'on'
+        params.switches[1].switch = 'off'
+      } else {
+        decisecondsToMove = Math.round(Math.abs(diffPosition) * percentStepDownPerDS)
+        params.switches[0].switch = 'off'
+        params.switches[1].switch = 'on'
+      }
+      await this.platform.sendDeviceUpdate(this.accessory, params)
+      this.accessory.context.cacheTargetPosition = value
+      this.accessory.context.cachePositionState = setToMoveUp ? 1 : 0
+      this.accessory.context.cacheLastStartTime = Math.floor(Date.now() / 100)
+      await this.funcs.sleep(decisecondsToMove * 100)
+      if (this.updateKey !== updateKey) {
+        return
+      }
+      params.switches[0].switch = 'off'
+      params.switches[1].switch = 'off'
+      await this.platform.sendDeviceUpdate(this.accessory, params)
+      this.service.updateCharacteristic(this.hapChar.PositionState, 2)
+        .updateCharacteristic(this.hapChar.CurrentPosition, value)
+      this.accessory.context.cachePositionState = 2
+      this.accessory.context.cacheCurrentPosition = value
+      if (!this.disableDeviceLogging) {
+        this.log('[%s] current position [%s%]', this.name, value)
+      }
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, true)
+    }
+  }
+
+  async externalUpdate (params) {
+
+  }
+}
diff --git a/lib/device/simulation/window.js b/lib/device/simulation/window.js
new file mode 100644
index 00000000..7eae7bf0
--- /dev/null
+++ b/lib/device/simulation/window.js
@@ -0,0 +1,134 @@
+/* jshint -W014, -W033, esversion: 9 */
+/* eslint-disable new-cap */
+'use strict'
+
+module.exports = class deviceWindow {
+  constructor (platform, accessory) {
+    // Set up variables from the platform
+    this.consts = platform.consts
+    this.debug = platform.config.debug
+    this.funcs = platform.funcs
+    this.hapServ = platform.api.hap.Service
+    this.hapChar = platform.api.hap.Characteristic
+    this.log = platform.log
+    this.messages = platform.messages
+    this.platform = platform
+
+    // Set up variables from the accessory
+    this.name = accessory.displayName
+    this.accessory = accessory
+
+    // Set up custom variables for this device type
+    const deviceId = this.accessory.context.eweDeviceId
+    const deviceConf = platform.simulations[deviceId]
+    this.operationTimeUp = deviceConf.operationTime ||
+      this.consts.defaultValues.operationTime
+    this.operationTimeDown = deviceConf.operationTimeDown || this.operationTimeUp
+    this.disableDeviceLogging = deviceConf && deviceConf.overrideDisabledLogging
+      ? false
+      : platform.config.disableDeviceLogging
+
+    // Set up the accessory with default positions when added the first time
+    if (!this.funcs.hasProperty(this.accessory.context, 'cacheCurrentPosition')) {
+      this.accessory.context.cacheCurrentPosition = 0
+      this.accessory.context.cachePositionState = 2
+      this.accessory.context.cacheTargetPosition = 0
+    }
+
+    // Add the window service if it doesn't already exist
+    if (!(this.service = this.accessory.getService(this.hapServ.Window))) {
+      this.service = this.accessory.addService(this.hapServ.Window)
+      this.service.setCharacteristic(this.hapChar.CurrentPosition, 0)
+        .setCharacteristic(this.hapChar.TargetPosition, 0)
+        .setCharacteristic(this.hapChar.PositionState, 2)
+    }
+
+    // Add the set handler to the target position characteristic
+    this.service.getCharacteristic(this.hapChar.TargetPosition)
+      .on('set', this.internalUpdate.bind(this))
+
+    // Output the customised options to the log if in debug mode
+    if (this.debug) {
+      const opts = JSON.stringify({
+        disableDeviceLogging: this.disableDeviceLogging,
+        operationTimeDown: this.operationTimeDown,
+        operationTimeUp: this.operationTimeUp,
+        type: deviceConf.type
+      })
+      this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
+    }
+  }
+
+  async internalUpdate (value, callback) {
+    try {
+      callback()
+      let prevPosition = this.accessory.context.cacheCurrentPosition
+      if (value === prevPosition) {
+        return
+      }
+      const params = {
+        switches: this.accessory.context.eweUIID === 126
+          ? this.consts.defaultDoubleSwitchOff
+          : this.consts.defaultMultiSwitchOff
+      }
+      const prevState = this.accessory.context.cachePositionState
+      const percentStepUpPerDS = this.operationTimeUp / 100
+      const percentStepDownPerDS = this.operationTimeDown / 100
+      const updateKey = Math.random().toString(36).substr(2, 8)
+      this.updateKey = updateKey
+      if (prevState !== 2) {
+        await this.platform.sendDeviceUpdate(this.accessory, params)
+        const posPercentChange = Math.floor(Date.now() / 100) -
+          this.accessory.context.cacheLastStartTime
+        const posPercentChangeUp = Math.floor(percentStepUpPerDS * posPercentChange)
+        const posPercentChangeDown = Math.floor(percentStepDownPerDS * posPercentChange)
+        if (prevState === 0) {
+          // Was going down
+          prevPosition -= posPercentChangeDown
+        } else {
+          // Was going up
+          prevPosition += posPercentChangeUp
+        }
+        prevPosition = Math.min(Math.max(prevPosition, 0), 100)
+        this.service.updateCharacteristic(this.hapChar.CurrentPosition, prevPosition)
+        this.accessory.context.cacheCurrentPosition = prevPosition
+      }
+      const diffPosition = value - prevPosition
+      const setToMoveUp = diffPosition > 0
+      let decisecondsToMove
+      if (setToMoveUp) {
+        decisecondsToMove = Math.round(Math.abs(diffPosition) * percentStepUpPerDS)
+        params.switches[0].switch = 'on'
+        params.switches[1].switch = 'off'
+      } else {
+        decisecondsToMove = Math.round(Math.abs(diffPosition) * percentStepDownPerDS)
+        params.switches[0].switch = 'off'
+        params.switches[1].switch = 'on'
+      }
+      await this.platform.sendDeviceUpdate(this.accessory, params)
+      this.accessory.context.cacheTargetPosition = value
+      this.accessory.context.cachePositionState = setToMoveUp ? 1 : 0
+      this.accessory.context.cacheLastStartTime = Math.floor(Date.now() / 100)
+      await this.funcs.sleep(decisecondsToMove * 100)
+      if (this.updateKey !== updateKey) {
+        return
+      }
+      params.switches[0].switch = 'off'
+      params.switches[1].switch = 'off'
+      await this.platform.sendDeviceUpdate(this.accessory, params)
+      this.service.updateCharacteristic(this.hapChar.PositionState, 2)
+        .updateCharacteristic(this.hapChar.CurrentPosition, value)
+      this.accessory.context.cachePositionState = 2
+      this.accessory.context.cacheCurrentPosition = value
+      if (!this.disableDeviceLogging) {
+        this.log('[%s] current position [%s%]', this.name, value)
+      }
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, true)
+    }
+  }
+
+  async externalUpdate (params) {
+
+  }
+}
diff --git a/lib/index.js b/lib/index.js
index 2ead87e7..4ec639c9 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -580,6 +580,30 @@ class eWeLinkPlatform {
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/simulation/blind'))(this, accessory)
         /***************************/
+      } else if (
+        this.simulations[device.deviceid] &&
+        this.simulations[device.deviceid].type === 'door'
+      ) {
+        /***************************
+        DOORS [ACCESSORY SIMULATION]
+        ***************************/
+        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
+          ? this.devicesInHB.get(device.deviceid + 'SWX')
+          : this.addAccessory(device, device.deviceid + 'SWX')
+        accessory.control = new (require('./device/simulation/door'))(this, accessory)
+        /**************************/
+      } else if (
+        this.simulations[device.deviceid] &&
+        this.simulations[device.deviceid].type === 'window'
+      ) {
+        /*****************************
+        WINDOWS [ACCESSORY SIMULATION]
+        *****************************/
+        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
+          ? this.devicesInHB.get(device.deviceid + 'SWX')
+          : this.addAccessory(device, device.deviceid + 'SWX')
+        accessory.control = new (require('./device/simulation/window'))(this, accessory)
+        /****************************/
       } else if (this.obstructSwitches[device.deviceid]) {
         /*****************************
         OBSTRUCTION DETECTION SWITCHES
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 7a35b63f..37a3f96e 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -89,9 +89,9 @@ module.exports = {
       'sensorTimeDifference', 'overrideDisabledLogging'
     ],
     groupTypes: [
-      'blind', 'garage', 'garage_two', 'garage_four', 'garage_eachen', 'lock',
+      'blind', 'door', 'garage', 'garage_two', 'garage_four', 'garage_eachen', 'lock',
       'sensor_leak', 'switch_valve', 'tap', 'tap_two', 'thermostat', 'valve', 'valve_two',
-      'valve_four'
+      'valve_four', 'window'
     ],
     modes: ['auto', 'wan', 'lan'],
     obstructs: ['garage', 'garage_eachen'],

From 30c15bba3352bd0a43c1d2e8b4e277a1e71d8c91 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 1 Mar 2021 16:05:52 +0000
Subject: [PATCH 1610/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0391ea81..69d1d8f6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,11 +6,15 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 ### Added
 
-* [experimental] Support for Sonoff D1 LAN control
-* [experimental] Specify different operation time for UP and DOWN for window blinds
-* Support for Sonoff DUALR3
-* Support for Sonoff Mosquito Killer
-* Support for Sonoff SC (Sensor Centre)
+* **Accessory Simulations**
+  * Added `Door` service type simulation
+  * Added `Window` service type simulation
+  * [experimental] Specify different operation time for UP and DOWN for garages and window blinds
+* **Accessories**
+  * Support for Sonoff DUALR3
+  * Support for Sonoff Mosquito Killer
+  * Support for Sonoff SC (Sensor Centre)
+  * [experimental] Support for Sonoff D1 LAN control
 
 ### Changes
 

From 8bc0fd59694aa8040f7d3895c6869e26dee73288 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 1 Mar 2021 16:06:30 +0000
Subject: [PATCH 1611/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 69d1d8f6..e8c26169 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,7 +9,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 * **Accessory Simulations**
   * Added `Door` service type simulation
   * Added `Window` service type simulation
-  * [experimental] Specify different operation time for UP and DOWN for garages and window blinds
+  * [experimental] Specify different operation time for UP and DOWN for garages, blinds, doors and windows
 * **Accessories**
   * Support for Sonoff DUALR3
   * Support for Sonoff Mosquito Killer

From 780b4b2a8f36d6f7a951c37e4a009f1ae3513c30 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 1 Mar 2021 16:07:41 +0000
Subject: [PATCH 1612/3183] 5.0.7-6

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 3ca2ae45..cf78b88b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "5.0.7-5",
+  "version": "5.0.7-6",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 80fbec88..52a8e2d0 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "5.0.7-5",
+  "version": "5.0.7-6",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From f06d85964221a196e979a1aff2e9285a1dda35e3 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 2 Mar 2021 08:20:57 +0000
Subject: [PATCH 1613/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e8c26169..6f598e4e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 All notable changes to this homebridge-ewelink will be documented in this file.
 
-## BETA
+## 5.1.0 (2021-03-02)
 
 ### Added
 
@@ -12,7 +12,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
   * [experimental] Specify different operation time for UP and DOWN for garages, blinds, doors and windows
 * **Accessories**
   * Support for Sonoff DUALR3
-  * Support for Sonoff Mosquito Killer
+  * Support for Konesky Mosquito Killer
   * Support for Sonoff SC (Sensor Centre)
   * [experimental] Support for Sonoff D1 LAN control
 

From b20c7bc7678913646ecb2e5906d36f1cab4af80e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 2 Mar 2021 08:27:40 +0000
Subject: [PATCH 1614/3183] 5.1.0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index cf78b88b..fbe39f01 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "5.0.7-6",
+  "version": "5.1.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 52a8e2d0..8a118f93 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "5.0.7-6",
+  "version": "5.1.0",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From fd4f0ce3eca61cd941e7d96b8326fd57a5c955f2 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 2 Mar 2021 08:32:32 +0000
Subject: [PATCH 1615/3183] remove help item

---
 config.schema.json | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index de14c874..12020287 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -609,10 +609,6 @@
     }
   },
   "layout": [{
-      "type": "help",
-      "helpvalue": "<label class=\"control-label text-primary text-center\">If you are configuring this plugin for the first time, you may want to just fill out the required fields to get the plugin up and running. You can always return later to explore the rest of the options.</label>"
-    },
-    {
       "type": "fieldset",
       "title": "Required Settings",
       "items": [

From 2988e5b15d79b986ed230ca50a3c22ee11dfb4c3 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 2 Mar 2021 14:49:57 +0000
Subject: [PATCH 1616/3183] correct params

---
 lib/connection/lan.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/connection/lan.js b/lib/connection/lan.js
index 97b1fc6e..9be8684e 100644
--- a/lib/connection/lan.js
+++ b/lib/connection/lan.js
@@ -168,7 +168,7 @@ module.exports = class connectionLAN {
         params.mode = 0
         suffix = 'dimmable'
       } else if (json.params.switches) {
-        params.switch = json.params.switches
+        params.switches = json.params.switches
         suffix = 'switches'
       } else if (json.params.switch) {
         params.switch = json.params.switch

From c2f93697b0ec2c54018158004754b1b981059d3c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 2 Mar 2021 14:50:57 +0000
Subject: [PATCH 1617/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6f598e4e..a776dfec 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 All notable changes to this homebridge-ewelink will be documented in this file.
 
+## 5.1.1 (2021-03-02)
+
+### Changes
+
+* Fixes an issue sending LAN updates to multi-channel devices
+
 ## 5.1.0 (2021-03-02)
 
 ### Added

From d537cff9171fe2b4d0c3505ae5a3fa79d209d328 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 2 Mar 2021 14:51:28 +0000
Subject: [PATCH 1618/3183] 5.1.1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index fbe39f01..5097fa80 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "5.1.0",
+  "version": "5.1.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 8a118f93..0faab4c9 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "5.1.0",
+  "version": "5.1.1",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 5422bdea3eef9ee5903f16a848db070ab1365d6e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 3 Mar 2021 11:20:27 +0000
Subject: [PATCH 1619/3183] custom IP for D1

---
 config.schema.json     | 9 +++++++++
 lib/utils/constants.js | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/config.schema.json b/config.schema.json
index 12020287..305e415b 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -241,6 +241,14 @@
               "placeholder": 0,
               "minimum": 0
             },
+            "ipAddress": {
+              "type": "string",
+              "title": "IP Address",
+              "description": "You can manually set the IP address for this device if it cannot be discovered by the plugin. Only applicable to Sonoff D1.",
+              "condition": {
+                "functionBody": "return model.mode !== 'wan';"
+              }
+            },
             "overrideDisabledLogging": {
               "type": "boolean",
               "title": "Override Disabled Logging",
@@ -699,6 +707,7 @@
           "lightDevices[].bulbModel",
           "lightDevices[].brightnessStep",
           "lightDevices[].adaptiveLightingShift",
+          "lightDevices[].ipAddress",
           "lightDevices[].overrideDisabledLogging"
         ]
       }]
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 37a3f96e..ff48415c 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -80,7 +80,7 @@ module.exports = {
     ],
     lightDevices: [
       'deviceId', 'label', 'bulbModel', 'brightnessStep', 'adaptiveLightingShift',
-      'overrideDisabledLogging'
+      'ipAddress', 'overrideDisabledLogging'
     ],
     thDevices: ['deviceId', 'label', 'hideSwitch', 'offset', 'overrideDisabledLogging'],
     fanDevices: ['deviceId', 'label', 'hideLight', 'overrideDisabledLogging'],

From 78e2d5bd920125b3604ef50c72d4beb64520c215 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 3 Mar 2021 11:21:03 +0000
Subject: [PATCH 1620/3183] 5.1.2-0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 5097fa80..331fd95c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "5.1.1",
+  "version": "5.1.2-0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 0faab4c9..66926189 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "5.1.1",
+  "version": "5.1.2-0",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From f61427c95d601fa9756c9a0c2d2720aa974ede89 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 3 Mar 2021 11:21:42 +0000
Subject: [PATCH 1621/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a776dfec..5ba2c0f9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 All notable changes to this homebridge-ewelink will be documented in this file.
 
+## BETA
+
+### Changes
+
+* Specify a custom IP for the Sonoff D1
+
 ## 5.1.1 (2021-03-02)
 
 ### Changes

From 50f898458c3ccdc960f17d7964ff07a248523a22 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 4 Mar 2021 09:51:33 +0000
Subject: [PATCH 1622/3183] add doorbell notes

---
 lib/index.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/index.js b/lib/index.js
index 4ec639c9..538fbc26 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1026,6 +1026,7 @@ class eWeLinkPlatform {
               ? this.rfDevices[fullDeviceId].sensorTimeDifference
               : this.consts.defaultValues.sensorTimeDifference
           } else {
+            // 7 = doorbell?
             const type = subDevice.type || '?'
             this.log.warn('[%s] %s [%s].', device.name, this.messages.unsupDev, type)
             return

From c5c48662a1fae49842f8a8e39ab6f625d23d3175 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 4 Mar 2021 10:07:59 +0000
Subject: [PATCH 1623/3183] deps

---
 package-lock.json | 81 +++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 71 insertions(+), 10 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 331fd95c..87c0dbbd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -40,21 +40,26 @@
       }
     },
     "es-abstract": {
-      "version": "1.17.7",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz",
-      "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==",
+      "version": "1.18.0",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0.tgz",
+      "integrity": "sha512-LJzK7MrQa8TS0ja2w3YNLzUgJCGPdPOV1yVvezjNnS89D+VR08+Szt2mz3YB2Dck/+w5tfIq/RoUAFqJJGM2yw==",
       "requires": {
+        "call-bind": "^1.0.2",
         "es-to-primitive": "^1.2.1",
         "function-bind": "^1.1.1",
+        "get-intrinsic": "^1.1.1",
         "has": "^1.0.3",
-        "has-symbols": "^1.0.1",
-        "is-callable": "^1.2.2",
-        "is-regex": "^1.1.1",
-        "object-inspect": "^1.8.0",
+        "has-symbols": "^1.0.2",
+        "is-callable": "^1.2.3",
+        "is-negative-zero": "^2.0.1",
+        "is-regex": "^1.1.2",
+        "is-string": "^1.0.5",
+        "object-inspect": "^1.9.0",
         "object-keys": "^1.1.1",
-        "object.assign": "^4.1.1",
-        "string.prototype.trimend": "^1.0.1",
-        "string.prototype.trimstart": "^1.0.1"
+        "object.assign": "^4.1.2",
+        "string.prototype.trimend": "^1.0.4",
+        "string.prototype.trimstart": "^1.0.4",
+        "unbox-primitive": "^1.0.0"
       }
     },
     "es-to-primitive": {
@@ -100,11 +105,29 @@
         "function-bind": "^1.1.1"
       }
     },
+    "has-bigints": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.1.tgz",
+      "integrity": "sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA=="
+    },
     "has-symbols": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
       "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw=="
     },
+    "is-bigint": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.1.tgz",
+      "integrity": "sha512-J0ELF4yHFxHy0cmSxZuheDOz2luOdVvqjwmEcj8H/L1JHeuEDSDbeRP+Dk9kFVk5RTFzbucJ2Kb9F7ixY2QaCg=="
+    },
+    "is-boolean-object": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.0.tgz",
+      "integrity": "sha512-a7Uprx8UtD+HWdyYwnD1+ExtTgqQtD2k/1yJgtXP6wnMm8byhkoTZRl+95LLThpzNZJ5aEvi46cdH+ayMFRwmA==",
+      "requires": {
+        "call-bind": "^1.0.0"
+      }
+    },
     "is-callable": {
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.3.tgz",
@@ -115,6 +138,16 @@
       "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz",
       "integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g=="
     },
+    "is-negative-zero": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.1.tgz",
+      "integrity": "sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w=="
+    },
+    "is-number-object": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.4.tgz",
+      "integrity": "sha512-zohwelOAur+5uXtk8O3GPQ1eAcu4ZX3UwxQhUlfFFMNpUd83gXgjbhJh6HmB6LUNV/ieOLQuDwJO3dWJosUeMw=="
+    },
     "is-regex": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.2.tgz",
@@ -124,6 +157,11 @@
         "has-symbols": "^1.0.1"
       }
     },
+    "is-string": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.5.tgz",
+      "integrity": "sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ=="
+    },
     "is-symbol": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz",
@@ -218,6 +256,17 @@
         "define-properties": "^1.1.3"
       }
     },
+    "unbox-primitive": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.0.tgz",
+      "integrity": "sha512-P/51NX+JXyxK/aigg1/ZgyccdAxm5K1+n8+tvqSntjOivPt19gvm1VC49RWYetsiub8WViUchdxl/KWHHB0kzA==",
+      "requires": {
+        "function-bind": "^1.1.1",
+        "has-bigints": "^1.0.0",
+        "has-symbols": "^1.0.0",
+        "which-boxed-primitive": "^1.0.1"
+      }
+    },
     "websocket-as-promised": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/websocket-as-promised/-/websocket-as-promised-2.0.1.tgz",
@@ -229,6 +278,18 @@
         "promised-map": "^1.0.0"
       }
     },
+    "which-boxed-primitive": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
+      "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
+      "requires": {
+        "is-bigint": "^1.0.1",
+        "is-boolean-object": "^1.1.0",
+        "is-number-object": "^1.0.4",
+        "is-string": "^1.0.5",
+        "is-symbol": "^1.0.3"
+      }
+    },
     "ws": {
       "version": "7.4.3",
       "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.3.tgz",

From 8939020fd7281c41430d92a474bc6bdce10d0ade Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 4 Mar 2021 10:54:29 +0000
Subject: [PATCH 1624/3183] eve contact sensor for eachen

---
 config.schema.json                     |   9 ++
 lib/device/simulation/garage-eachen.js | 157 ++++++++++++++++++++++++-
 lib/index.js                           |  13 +-
 3 files changed, 169 insertions(+), 10 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 305e415b..81cfd02c 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -578,6 +578,14 @@
                 "functionBody": "return (model.groups[arrayIndices] && model.groups[arrayIndices].type==='garage')"
               }
             },
+            "exposeContactSensor": {
+              "type": "boolean",
+              "title": "Expose Contact Sensor",
+              "description": "Expose a contact sensor which can be useful to view history in the Eve app.",
+              "condition": {
+                "functionBody": "return (model.groups[arrayIndices] && model.groups[arrayIndices].type==='garage_eachen')"
+              }
+            },
             "obstructId": {
               "type": "string",
               "title": "Obstruction Switch",
@@ -802,6 +810,7 @@
           "groups[].operationTime",
           "groups[].operationTimeDown",
           "groups[].sensorId",
+          "groups[].exposeContactSensor",
           "groups[].obstructId",
           "groups[].ipAddress",
           "groups[].overrideDisabledLogging",
diff --git a/lib/device/simulation/garage-eachen.js b/lib/device/simulation/garage-eachen.js
index e6c74b96..33dd79b7 100644
--- a/lib/device/simulation/garage-eachen.js
+++ b/lib/device/simulation/garage-eachen.js
@@ -23,15 +23,123 @@ module.exports = class deviceGarageEachen {
     const deviceConf = platform.simulations[deviceId]
     this.operationTime = deviceConf.operationTime ||
       this.consts.defaultValues.operationTime
+    this.exposeContactSensor = deviceConf.exposeContactSensor || false
     this.disableDeviceLogging = deviceConf.overrideDisabledLogging
       ? false
       : platform.config.disableDeviceLogging
 
+    // Set up the custom Eve characteristics for this device type
+    this.inherits = require('util').inherits
+    const self = this
+    this.eveLastActivation = function () {
+      self.hapChar.call(this, 'Last Activation', self.consts.eve.lastActivation)
+      this.setProps({
+        format: self.hapChar.Formats.UINT32,
+        unit: self.hapChar.Units.SECONDS,
+        perms: [self.hapChar.Perms.READ, self.hapChar.Perms.NOTIFY]
+      })
+      this.value = this.getDefaultValue()
+    }
+    this.eveResetTotal = function () {
+      self.hapChar.call(this, 'Reset Total', self.consts.eve.resetTotal)
+      this.setProps({
+        format: self.hapChar.Formats.UINT32,
+        unit: self.hapChar.Units.seconds,
+        perms: [
+          self.hapChar.Perms.READ,
+          self.hapChar.Perms.NOTIFY,
+          self.hapChar.Perms.WRITE
+        ]
+      })
+      this.value = this.getDefaultValue()
+    }
+    this.eveOpenDuration = function () {
+      self.hapChar.call(this, 'Open Duration', self.consts.eve.openDuration)
+      this.setProps({
+        format: self.hapChar.Formats.UINT32,
+        unit: self.hapChar.Units.SECONDS,
+        perms: [
+          self.hapChar.Perms.READ,
+          self.hapChar.Perms.NOTIFY,
+          self.hapChar.Perms.WRITE
+        ]
+      })
+      this.value = this.getDefaultValue()
+    }
+    this.eveClosedDuration = function () {
+      self.hapChar.call(this, 'Closed Duration', self.consts.eve.closedDuration)
+      this.setProps({
+        format: self.hapChar.Formats.UINT32,
+        unit: self.hapChar.Units.SECONDS,
+        perms: [
+          self.hapChar.Perms.READ,
+          self.hapChar.Perms.NOTIFY,
+          self.hapChar.Perms.WRITE
+        ]
+      })
+      this.value = this.getDefaultValue()
+    }
+    this.eveTimesOpened = function () {
+      self.hapChar.call(this, 'Times Opened', self.consts.eve.timesOpened)
+      this.setProps({
+        format: self.hapChar.Formats.UINT32,
+        perms: [self.hapChar.Perms.READ, self.hapChar.Perms.NOTIFY]
+      })
+      this.value = this.getDefaultValue()
+    }
+    this.inherits(this.eveLastActivation, this.hapChar)
+    this.inherits(this.eveResetTotal, this.hapChar)
+    this.inherits(this.eveOpenDuration, this.hapChar)
+    this.inherits(this.eveClosedDuration, this.hapChar)
+    this.inherits(this.eveTimesOpened, this.hapChar)
+    this.eveLastActivation.UUID = this.consts.eve.lastActivation
+    this.eveResetTotal.UUID = this.consts.eve.resetTotal
+    this.eveOpenDuration.UUID = this.consts.eve.openDuration
+    this.eveClosedDuration.UUID = this.consts.eve.closedDuration
+    this.eveTimesOpened.UUID = this.consts.eve.timesOpened
+
     // If the accessory has a switch service then remove it
     if (this.accessory.getService(this.hapServ.Switch)) {
       this.accessory.removeService(this.accessory.getService(this.hapServ.Switch))
     }
 
+    // Check if the user wants to expose a contact sensor for this accessory
+    if (this.exposeContactSensor) {
+      // Add the contact sensor service if it doesn't already exist
+      this.contactService = this.accessory.getService(this.hapServ.ContactSensor) ||
+        this.accessory.addService(this.hapServ.ContactSensor)
+      if (!this.contactService.testCharacteristic(this.eveLastActivation)) {
+        this.contactService.addCharacteristic(this.eveLastActivation)
+      }
+      if (!this.contactService.testCharacteristic(this.eveResetTotal)) {
+        this.contactService.addCharacteristic(this.eveResetTotal)
+      }
+      if (!this.contactService.testCharacteristic(this.eveOpenDuration)) {
+        this.contactService.addCharacteristic(this.eveOpenDuration)
+      }
+      if (!this.contactService.testCharacteristic(this.eveClosedDuration)) {
+        this.contactService.addCharacteristic(this.eveClosedDuration)
+      }
+      if (!this.contactService.testCharacteristic(this.eveTimesOpened)) {
+        this.contactService.addCharacteristic(this.eveTimesOpened)
+      }
+      this.timesOpened = this.contactService.getCharacteristic(this.eveTimesOpened).value
+      this.contactService.getCharacteristic(this.eveResetTotal)
+        .removeAllListeners('set')
+        .on('set', (value, callback) => {
+          callback()
+          this.timesOpened = 0
+          this.contactService.updateCharacteristic(this.eveTimesOpened, 0)
+        })
+    } else {
+      // If the accessory has a contact sensor service then remove it
+      if (this.accessory.getService(this.hapServ.ContactSensor)) {
+        this.accessory.removeService(
+          this.accessory.getService(this.hapServ.ContactSensor)
+        )
+      }
+    }
+
     // Add the garage door service if it doesn't already exist
     if (!(this.service = this.accessory.getService(this.hapServ.GarageDoorOpener))) {
       this.service = this.accessory.addService(this.hapServ.GarageDoorOpener)
@@ -40,6 +148,9 @@ module.exports = class deviceGarageEachen {
         .setCharacteristic(this.hapChar.ObstructionDetected, false)
     }
 
+    // Set the garage door service as the primary service (ie not the contact sensor)
+    this.service.setPrimaryService()
+
     // Add the set handler to the target position characteristic
     this.service.getCharacteristic(this.hapChar.TargetDoorState)
       .on('set', this.internalUpdate.bind(this))
@@ -47,10 +158,16 @@ module.exports = class deviceGarageEachen {
     // Update the obstruction detected to false on Homebridge restart
     this.service.updateCharacteristic(this.hapChar.ObstructionDetected, false)
 
+    // Pass the accessory to Fakegato to set up with Eve
+    this.accessory.eveService = new this.platform.eveService('door', this.accessory, {
+      log: platform.config.debugFakegato ? this.log : () => {}
+    })
+
     // Output the customised options to the log if in debug mode
     if (this.debug) {
       const opts = JSON.stringify({
         disableDeviceLogging: this.disableDeviceLogging,
+        exposeContactSensor: this.exposeContactSensor,
         operationTime: this.operationTime,
         type: deviceConf.type
       })
@@ -62,18 +179,31 @@ module.exports = class deviceGarageEachen {
     try {
       callback()
       const params = { switch: value === 0 ? 'on' : 'off' }
-      if (
-        value === this.service.getCharacteristic(this.hapChar.CurrentDoorState).value % 2
-      ) {
+      const curState = this.service.getCharacteristic(this.hapChar.CurrentDoorState).value
+      if (value === curState % 2) {
         return
       }
       this.inUse = true
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.service.updateCharacteristic(this.hapChar.TargetDoorState, value)
-        .updateCharacteristic(this.hapChar.CurrentDoorState, value + 2)
+      this.service.updateCharacteristic(this.hapChar.CurrentDoorState, value + 2)
       await this.funcs.sleep(2000)
       this.inUse = false
       if (value === 0) {
+        if (this.exposeContactSensor) {
+          this.contactService.updateCharacteristic(this.hapChar.ContactSensorState, 1)
+          this.accessory.eveService.addEntry({ status: 0 })
+          const initialTime = this.accessory.eveService.getInitialTime()
+          this.contactService.updateCharacteristic(
+            this.eveLastActivation,
+            Math.round(new Date().valueOf() / 1000) - initialTime
+          )
+          this.timesOpened++
+          this.contactService.updateCharacteristic(
+            this.eveTimesOpened,
+            this.timesOpened
+          )
+        }
         await this.funcs.sleep(Math.max((this.operationTime - 20) * 100, 0))
         this.service.updateCharacteristic(this.hapChar.CurrentDoorState, 0)
         if (!this.disableDeviceLogging) {
@@ -99,6 +229,25 @@ module.exports = class deviceGarageEachen {
         this.hapChar.CurrentDoorState,
         params.switch === 'on' ? 0 : 1
       )
+      if (this.exposeContactSensor) {
+        if (params.switch === 'on') {
+          this.contactService.updateCharacteristic(this.hapChar.ContactSensorState, 1)
+          this.accessory.eveService.addEntry({ status: 0 })
+          const initialTime = this.accessory.eveService.getInitialTime()
+          this.contactService.updateCharacteristic(
+            this.eveLastActivation,
+            Math.round(new Date().valueOf() / 1000) - initialTime
+          )
+          this.timesOpened++
+          this.contactService.updateCharacteristic(
+            this.eveTimesOpened,
+            this.timesOpened
+          )
+        } else {
+          this.contactService.updateCharacteristic(this.hapChar.ContactSensorState, 0)
+          this.accessory.eveService.addEntry({ status: 1 }) // swapped
+        }
+      }
       if (params.updateSource && !this.disableDeviceLogging) {
         this.log(
           '[%s] current state [%s].',
diff --git a/lib/index.js b/lib/index.js
index 538fbc26..a61068ec 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -310,6 +310,13 @@ class eWeLinkPlatform {
                     }
                     break
                   }
+                  case 'exposeContactSensor':
+                  case 'overrideDisabledLogging':
+                    if (typeof v === 'string') {
+                      logQuotes(key + '.' + id + '.' + k)
+                    }
+                    this.simulations[id][k] = v === 'false' ? false : !!v
+                    break
                   case 'obstructId':
                     if (typeof v !== 'string' || v === '') {
                       logIgnore(key + '.' + id + '.' + k)
@@ -338,12 +345,6 @@ class eWeLinkPlatform {
                     }
                     break
                   }
-                  case 'overrideDisabledLogging':
-                    if (typeof v === 'string') {
-                      logQuotes(key + '.' + id + '.' + k)
-                    }
-                    this.simulations[id][k] = v === 'false' ? false : !!v
-                    break
                   case 'sensorId':
                     if (typeof v !== 'string' || v === '') {
                       logIgnore(key + '.' + id + '.' + k)

From 741c40f243bf561644dc6c178cedab3c3fb5e44f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 4 Mar 2021 10:55:47 +0000
Subject: [PATCH 1625/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5ba2c0f9..214d034a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 ## BETA
 
+### Added
+
+* Expose an optional contact sensor for Eachen garage devices for historical data in the Eve app
+
 ### Changes
 
 * Specify a custom IP for the Sonoff D1

From 39eb4bef65bc2e52afc01795440f395b9257f44c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 4 Mar 2021 10:56:07 +0000
Subject: [PATCH 1626/3183] 5.1.2-1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 87c0dbbd..83f215e5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "5.1.2-0",
+  "version": "5.1.2-1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 66926189..190ec328 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "5.1.2-0",
+  "version": "5.1.2-1",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From c44696293d5733cae1ac9665e5a1405fb052f86c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 4 Mar 2021 13:45:11 +0000
Subject: [PATCH 1627/3183] update simulation titles to match wiki

---
 config.schema.json | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 81cfd02c..9b4bd1cd 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -468,67 +468,67 @@
               "title": "Type",
               "description": "The new type for this device.",
               "oneOf": [{
-                  "title": "1 Thermostat (w/ TH10/16)",
+                  "title": "1 Thermostat (with Sonoff TH10 or TH16)",
                   "enum": ["thermostat"]
                 },
                 {
-                  "title": "1 Garage Door (w/ Eachen GD-DC5)",
+                  "title": "1 Garage Door (with Eachen GDDC5)",
                   "enum": ["garage_eachen"]
                 },
                 {
-                  "title": "1 Garage Door (w/ single or multi-channel device)",
+                  "title": "1 Garage Door (with single or multi channel device)",
                   "enum": ["garage"]
                 },
                 {
-                  "title": "2 Garage Doors (w/ multi-channel device)",
+                  "title": "2 Garage Doors (with multi channel device)",
                   "enum": ["garage_two"]
                 },
                 {
-                  "title": "4 Garage Doors (w/ multi-channel device)",
+                  "title": "4 Garage Doors (with multi channel device)",
                   "enum": ["garage_four"]
                 },
                 {
-                  "title": "1 Window Blind (w/ multi-channel device)",
+                  "title": "1 Window Blind (with multi channel device)",
                   "enum": ["blind"]
                 },
                 {
-                  "title": "1 Door (w/ multi-channel device)",
+                  "title": "1 Door (with multi channel device)",
                   "enum": ["door"]
                 },
                 {
-                  "title": "1 Window (w/ multi-channel device)",
+                  "title": "1 Window (with multi channel device)",
                   "enum": ["window"]
                 },
                 {
-                  "title": "1 Lock (w/ single or multi-channel device)",
+                  "title": "1 Lock (with single or multi channel device)",
                   "enum": ["lock"]
                 },
                 {
-                  "title": "1 Tap/Faucet (w/ single or multi-channel device)",
+                  "title": "1 Tap/Faucet (with single or multi channel device)",
                   "enum": ["tap"]
                 },
                 {
-                  "title": "2 Taps/Faucets (w/ multi-channel device)",
+                  "title": "2 Taps/Faucets (with multi channel device)",
                   "enum": ["tap_two"]
                 },
                 {
-                  "title": "1 Irrigation Valve (w/ single or multi-channel device)",
+                  "title": "1 Irrigation Valve (with single or multi channel device)",
                   "enum": ["valve"]
                 },
                 {
-                  "title": "2 Irrigation Valves (w/ multi-channel device)",
+                  "title": "2 Irrigation Valves (with multi channel device)",
                   "enum": ["valve_two"]
                 },
                 {
-                  "title": "4 Irrigation Valves (w/ multi-channel device)",
+                  "title": "4 Irrigation Valves (with multi channel device)",
                   "enum": ["valve_four"]
                 },
                 {
-                  "title": "1 Switch & 1 Valve (w/ multi-channel device)",
+                  "title": "1 Switch & 1 Valve (with multi channel device)",
                   "enum": ["switch_valve"]
                 },
                 {
-                  "title": "1 Leak Sensor (w/ Sonoff DW2)",
+                  "title": "1 Leak Sensor (with Sonoff DW2)",
                   "enum": ["sensor_leak"]
                 }
               ]

From f9acb30b0a7cac044b09eca6113eb1b60be76915 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 4 Mar 2021 16:47:26 +0000
Subject: [PATCH 1628/3183] modify desc

---
 config.schema.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config.schema.json b/config.schema.json
index 9b4bd1cd..75737354 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -581,7 +581,7 @@
             "exposeContactSensor": {
               "type": "boolean",
               "title": "Expose Contact Sensor",
-              "description": "Expose a contact sensor which can be useful to view history in the Eve app.",
+              "description": "If true, a contact sensor will be exposed which can be useful to view history in the Eve app.",
               "condition": {
                 "functionBody": "return (model.groups[arrayIndices] && model.groups[arrayIndices].type==='garage_eachen')"
               }

From 68f6a3b5327ba0e2a9edc24f6afb9f90951f991a Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 4 Mar 2021 16:52:15 +0000
Subject: [PATCH 1629/3183] semicolons

---
 config.schema.json | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 75737354..20f5953f 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -173,7 +173,7 @@
               "placeholder": 0,
               "minimum": 0,
               "condition": {
-                "functionBody": "return (model.outletDevices[arrayIndices] && !model.outletDevices[arrayIndices].showAsSwitch)"
+                "functionBody": "return (model.outletDevices[arrayIndices] && !model.outletDevices[arrayIndices].showAsSwitch);"
               }
             },
             "ipAddress": {
@@ -538,7 +538,7 @@
               "title": "Device Setup",
               "description": "The type of generic device being used.",
               "condition": {
-                "functionBody": "return (model.groups[arrayIndices] && ['garage', 'lock', 'tap', 'valve'].includes(model.groups[arrayIndices].type))"
+                "functionBody": "return (model.groups[arrayIndices] && ['garage', 'lock', 'tap', 'valve'].includes(model.groups[arrayIndices].type));"
               },
               "oneOf": [{
                   "title": "Single-Channel",
@@ -555,7 +555,7 @@
               "title": "Operation Time (Deciseconds)",
               "description": "Blinds/garage doors: the time to open/close the device. Locks: the time to show as unlocked. This setting is in deciseconds - count the time in seconds and multiply by 10, for example 75 for 7.5 seconds. Must be 20 or more.",
               "condition": {
-                "functionBody": "return (model.groups[arrayIndices] && ['garage', 'garage_two', 'garage_four', 'garage_eachen', 'blind', 'door', 'window', 'lock'].includes(model.groups[arrayIndices].type))"
+                "functionBody": "return (model.groups[arrayIndices] && ['garage', 'garage_two', 'garage_four', 'garage_eachen', 'blind', 'door', 'window', 'lock'].includes(model.groups[arrayIndices].type));"
               },
               "placeholder": 100,
               "minimum": 20
@@ -565,7 +565,7 @@
               "title": "Operation Time Down (Deciseconds)",
               "description": "If your garage door or blind has a different operation time for up and down, use this setting to specify the operation time DOWN (in deciseconds) and the other setting to specify the operation time UP. Otherwise leave blank. Must be 20 or more.",
               "condition": {
-                "functionBody": "return (model.groups[arrayIndices] && ['garage', 'garage_two', 'garage_four', 'garage_eachen', 'blind', 'door, 'window', 'lock'].includes(model.groups[arrayIndices].type))"
+                "functionBody": "return (model.groups[arrayIndices] && ['garage', 'garage_two', 'garage_four', 'garage_eachen', 'blind', 'door, 'window', 'lock'].includes(model.groups[arrayIndices].type));"
               },
               "placeholder": 100,
               "minimum": 20
@@ -575,7 +575,7 @@
               "title": "Sensor",
               "description": "A DW2 sensor can be used for a single garage door to determine the current state. Enter the 10 digit eWeLink device ID (normally in the format 1000ab23cd). Otherwise leave blank.",
               "condition": {
-                "functionBody": "return (model.groups[arrayIndices] && model.groups[arrayIndices].type==='garage')"
+                "functionBody": "return (model.groups[arrayIndices] && model.groups[arrayIndices].type==='garage');"
               }
             },
             "exposeContactSensor": {
@@ -583,7 +583,7 @@
               "title": "Expose Contact Sensor",
               "description": "If true, a contact sensor will be exposed which can be useful to view history in the Eve app.",
               "condition": {
-                "functionBody": "return (model.groups[arrayIndices] && model.groups[arrayIndices].type==='garage_eachen')"
+                "functionBody": "return (model.groups[arrayIndices] && model.groups[arrayIndices].type==='garage_eachen');"
               }
             },
             "obstructId": {
@@ -591,7 +591,7 @@
               "title": "Obstruction Switch",
               "description": "An optional switch that will trigger the Obstruction Detected feature depending on its value. Otherwise leave blank.",
               "condition": {
-                "functionBody": "return (model.groups[arrayIndices] && ['garage', 'garage_eachen'].includes(model.groups[arrayIndices].type))"
+                "functionBody": "return (model.groups[arrayIndices] && ['garage', 'garage_eachen'].includes(model.groups[arrayIndices].type));"
               }
             },
             "ipAddress": {
@@ -599,7 +599,7 @@
               "title": "IP Address",
               "description": "You can manually set the IP address for this device if it cannot be discovered by the plugin.",
               "condition": {
-                "functionBody": "return (model.mode !== 'wan' && model.groups[arrayIndices] && !['thermostat', 'sensor_leak'].includes(model.groups[arrayIndices].type))"
+                "functionBody": "return (model.mode !== 'wan' && model.groups[arrayIndices] && !['thermostat', 'sensor_leak'].includes(model.groups[arrayIndices].type));"
               }
             },
             "overrideDisabledLogging": {

From a3f4cc5dce09b7dc5121d664bd26fbc67c3401e7 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 4 Mar 2021 17:02:07 +0000
Subject: [PATCH 1630/3183] eve history for garage_one

---
 config.schema.json                  |  18 ++---
 lib/device/simulation/garage-one.js | 117 ++++++++++++++++++++++++++++
 2 files changed, 126 insertions(+), 9 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 20f5953f..56c22334 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -570,6 +570,14 @@
               "placeholder": 100,
               "minimum": 20
             },
+            "exposeContactSensor": {
+              "type": "boolean",
+              "title": "Expose Contact Sensor",
+              "description": "If true, a contact sensor will be exposed which can be useful to view history in the Eve app.",
+              "condition": {
+                "functionBody": "return (model.groups[arrayIndices] && ['garage', 'garage_eachen'].includes(model.groups[arrayIndices].type));"
+              }
+            },
             "sensorId": {
               "type": "string",
               "title": "Sensor",
@@ -578,14 +586,6 @@
                 "functionBody": "return (model.groups[arrayIndices] && model.groups[arrayIndices].type==='garage');"
               }
             },
-            "exposeContactSensor": {
-              "type": "boolean",
-              "title": "Expose Contact Sensor",
-              "description": "If true, a contact sensor will be exposed which can be useful to view history in the Eve app.",
-              "condition": {
-                "functionBody": "return (model.groups[arrayIndices] && model.groups[arrayIndices].type==='garage_eachen');"
-              }
-            },
             "obstructId": {
               "type": "string",
               "title": "Obstruction Switch",
@@ -809,8 +809,8 @@
           "groups[].setup",
           "groups[].operationTime",
           "groups[].operationTimeDown",
-          "groups[].sensorId",
           "groups[].exposeContactSensor",
+          "groups[].sensorId",
           "groups[].obstructId",
           "groups[].ipAddress",
           "groups[].overrideDisabledLogging",
diff --git a/lib/device/simulation/garage-one.js b/lib/device/simulation/garage-one.js
index b15997d3..9b1f981e 100644
--- a/lib/device/simulation/garage-one.js
+++ b/lib/device/simulation/garage-one.js
@@ -25,10 +25,81 @@ module.exports = class deviceGarageOne {
     this.operationTimeUp = deviceConf.operationTime ||
       this.consts.defaultValues.operationTime
     this.operationTimeDown = deviceConf.operationTimeDown || this.operationTimeUp
+    this.exposeContactSensor = deviceConf.exposeContactSensor || false
     this.disableDeviceLogging = deviceConf.overrideDisabledLogging
       ? false
       : platform.config.disableDeviceLogging
 
+    // Set up the custom Eve characteristics for this device type
+    this.inherits = require('util').inherits
+    const self = this
+    this.eveLastActivation = function () {
+      self.hapChar.call(this, 'Last Activation', self.consts.eve.lastActivation)
+      this.setProps({
+        format: self.hapChar.Formats.UINT32,
+        unit: self.hapChar.Units.SECONDS,
+        perms: [self.hapChar.Perms.READ, self.hapChar.Perms.NOTIFY]
+      })
+      this.value = this.getDefaultValue()
+    }
+    this.eveResetTotal = function () {
+      self.hapChar.call(this, 'Reset Total', self.consts.eve.resetTotal)
+      this.setProps({
+        format: self.hapChar.Formats.UINT32,
+        unit: self.hapChar.Units.seconds,
+        perms: [
+          self.hapChar.Perms.READ,
+          self.hapChar.Perms.NOTIFY,
+          self.hapChar.Perms.WRITE
+        ]
+      })
+      this.value = this.getDefaultValue()
+    }
+    this.eveOpenDuration = function () {
+      self.hapChar.call(this, 'Open Duration', self.consts.eve.openDuration)
+      this.setProps({
+        format: self.hapChar.Formats.UINT32,
+        unit: self.hapChar.Units.SECONDS,
+        perms: [
+          self.hapChar.Perms.READ,
+          self.hapChar.Perms.NOTIFY,
+          self.hapChar.Perms.WRITE
+        ]
+      })
+      this.value = this.getDefaultValue()
+    }
+    this.eveClosedDuration = function () {
+      self.hapChar.call(this, 'Closed Duration', self.consts.eve.closedDuration)
+      this.setProps({
+        format: self.hapChar.Formats.UINT32,
+        unit: self.hapChar.Units.SECONDS,
+        perms: [
+          self.hapChar.Perms.READ,
+          self.hapChar.Perms.NOTIFY,
+          self.hapChar.Perms.WRITE
+        ]
+      })
+      this.value = this.getDefaultValue()
+    }
+    this.eveTimesOpened = function () {
+      self.hapChar.call(this, 'Times Opened', self.consts.eve.timesOpened)
+      this.setProps({
+        format: self.hapChar.Formats.UINT32,
+        perms: [self.hapChar.Perms.READ, self.hapChar.Perms.NOTIFY]
+      })
+      this.value = this.getDefaultValue()
+    }
+    this.inherits(this.eveLastActivation, this.hapChar)
+    this.inherits(this.eveResetTotal, this.hapChar)
+    this.inherits(this.eveOpenDuration, this.hapChar)
+    this.inherits(this.eveClosedDuration, this.hapChar)
+    this.inherits(this.eveTimesOpened, this.hapChar)
+    this.eveLastActivation.UUID = this.consts.eve.lastActivation
+    this.eveResetTotal.UUID = this.consts.eve.resetTotal
+    this.eveOpenDuration.UUID = this.consts.eve.openDuration
+    this.eveClosedDuration.UUID = this.consts.eve.closedDuration
+    this.eveTimesOpened.UUID = this.consts.eve.timesOpened
+
     // Set up the accessory with default positions when added the first time
     if (!this.funcs.hasProperty(this.accessory.context, 'cacheCurrentDoorState')) {
       this.accessory.context.cacheCurrentDoorState = 1
@@ -64,6 +135,43 @@ module.exports = class deviceGarageOne {
       this.accessory.removeService(this.accessory.getService(this.hapServ.Switch))
     }
 
+    // Check if the user wants to expose a contact sensor for this accessory
+    if (this.exposeContactSensor) {
+      // Add the contact sensor service if it doesn't already exist
+      this.contactService = this.accessory.getService(this.hapServ.ContactSensor) ||
+        this.accessory.addService(this.hapServ.ContactSensor)
+      if (!this.contactService.testCharacteristic(this.eveLastActivation)) {
+        this.contactService.addCharacteristic(this.eveLastActivation)
+      }
+      if (!this.contactService.testCharacteristic(this.eveResetTotal)) {
+        this.contactService.addCharacteristic(this.eveResetTotal)
+      }
+      if (!this.contactService.testCharacteristic(this.eveOpenDuration)) {
+        this.contactService.addCharacteristic(this.eveOpenDuration)
+      }
+      if (!this.contactService.testCharacteristic(this.eveClosedDuration)) {
+        this.contactService.addCharacteristic(this.eveClosedDuration)
+      }
+      if (!this.contactService.testCharacteristic(this.eveTimesOpened)) {
+        this.contactService.addCharacteristic(this.eveTimesOpened)
+      }
+      this.timesOpened = this.contactService.getCharacteristic(this.eveTimesOpened).value
+      this.contactService.getCharacteristic(this.eveResetTotal)
+        .removeAllListeners('set')
+        .on('set', (value, callback) => {
+          callback()
+          this.timesOpened = 0
+          this.contactService.updateCharacteristic(this.eveTimesOpened, 0)
+        })
+    } else {
+      // If the accessory has a contact sensor service then remove it
+      if (this.accessory.getService(this.hapServ.ContactSensor)) {
+        this.accessory.removeService(
+          this.accessory.getService(this.hapServ.ContactSensor)
+        )
+      }
+    }
+
     // Add the garage door service if it doesn't already exist
     if (!(this.service = this.accessory.getService(this.hapServ.GarageDoorOpener))) {
       this.accessory.addService(this.hapServ.GarageDoorOpener)
@@ -73,14 +181,23 @@ module.exports = class deviceGarageOne {
       this.service = this.accessory.getService(this.hapServ.GarageDoorOpener)
     }
 
+    // Set the garage door service as the primary service (ie not the contact sensor)
+    this.service.setPrimaryService()
+
     // Add the set handler to the target position characteristic
     this.service.getCharacteristic(this.hapChar.TargetDoorState)
       .on('set', this.internalUpdate.bind(this))
 
+    // Pass the accessory to Fakegato to set up with Eve
+    this.accessory.eveService = new this.platform.eveService('door', this.accessory, {
+      log: platform.config.debugFakegato ? this.log : () => {}
+    })
+
     // Output the customised options to the log if in debug mode
     if (this.debug) {
       const opts = JSON.stringify({
         disableDeviceLogging: this.disableDeviceLogging,
+        exposeContactSensor: this.exposeContactSensor,
         operationTimeDown: this.operationTimeDown,
         operationTimeUp: this.operationTimeUp,
         setup: this.setup,

From 740e0af4bca68878319bc70ca16878f5db503f02 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 4 Mar 2021 17:02:35 +0000
Subject: [PATCH 1631/3183] 5.1.2-2

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 83f215e5..03f3ba9b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "5.1.2-1",
+  "version": "5.1.2-2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 190ec328..12462826 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "5.1.2-1",
+  "version": "5.1.2-2",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 3369f7af2445a39edc2357f7bfdcaac1ba03c23d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 4 Mar 2021 19:33:36 +0000
Subject: [PATCH 1632/3183] Update package.json

---
 package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package.json b/package.json
index 12462826..db10743e 100644
--- a/package.json
+++ b/package.json
@@ -10,6 +10,7 @@
     "homebridge-plugin",
     "homebridge-ewelink",
     "hoobs",
+    "hoobs-plugin",
     "homekit",
     "siri",
     "ewelink",

From c059ba59b978767d051bfa8b880b70eb19fa4df2 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 5 Mar 2021 10:15:15 +0000
Subject: [PATCH 1633/3183] show full error on disable in debug

---
 lib/index.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/index.js b/lib/index.js
index a61068ec..02c99929 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -521,7 +521,9 @@ class eWeLinkPlatform {
       // Catch any errors during setup
       const eText = err.message === this.messages.disabled
         ? err.message
-        : this.funcs.parseError(err)
+        : this.config.debug
+          ? err
+          : this.funcs.parseError(err)
       this.log.warn('***** %s [v%s]. *****', this.messages.disabling, PLUGIN.version)
       this.log.warn('***** %s. *****', eText)
       this.pluginShutdown()

From 7e3072dd3580d070f26ea62b61defe48e3b1f2fc Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 5 Mar 2021 10:15:45 +0000
Subject: [PATCH 1634/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 214d034a..daa18416 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 ### Changes
 
 * Specify a custom IP for the Sonoff D1
+* Show full error stack on plugin disable in debug mode
 
 ## 5.1.1 (2021-03-02)
 

From 49582e52252a1d639a3d7c6e6e90571118019f3f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 5 Mar 2021 10:16:14 +0000
Subject: [PATCH 1635/3183] 5.1.2-3

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 03f3ba9b..cc71a1a9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "5.1.2-2",
+  "version": "5.1.2-3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index db10743e..345ff992 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "5.1.2-2",
+  "version": "5.1.2-3",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From a603e9db56c5b1b81442d1a4641563fda65d717e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 7 Mar 2021 12:03:21 +0000
Subject: [PATCH 1636/3183] Bump ws dependency

---
 package-lock.json | 6 +++---
 package.json      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index cc71a1a9..86d8436e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -291,9 +291,9 @@
       }
     },
     "ws": {
-      "version": "7.4.3",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.3.tgz",
-      "integrity": "sha512-hr6vCR76GsossIRsr8OLR9acVVm1jyfEWvhbNjtgPOrfvAlKzvyeg/P6r8RuDjRyrcQoPQT7K0DGEPc7Ae6jzA=="
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.4.tgz",
+      "integrity": "sha512-Qm8k8ojNQIMx7S+Zp8u/uHOx7Qazv3Yv4q68MiWWWOJhiwG5W3x7iqmRtJo8xxrciZUY4vRxUTJCKuRnF28ZZw=="
     }
   }
 }
diff --git a/package.json b/package.json
index 345ff992..8cb4d8bd 100644
--- a/package.json
+++ b/package.json
@@ -53,6 +53,6 @@
     "node-dns-sd": "^0.4.2",
     "p-queue": "^6.6.2",
     "websocket-as-promised": "^2.0.1",
-    "ws": "^7.4.3"
+    "ws": "^7.4.4"
   }
 }

From cda5ab781936eb1e6cdfbbee84f3f08f63db97f7 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 8 Mar 2021 08:47:25 +0000
Subject: [PATCH 1637/3183] custom min/max target for TH simulation

---
 config.schema.json                  | 18 +++++++++++++++++-
 lib/device/simulation/thermostat.js | 12 ++++++++++--
 lib/index.js                        |  2 ++
 lib/utils/constants.js              |  9 ++++++++-
 4 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 56c22334..5a7e8527 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -285,6 +285,20 @@
               "description": "You can offset the temperature that the sensor reads. An offset of 2 means 2 degrees will be added to the recorded temperature. Can be positive or negative and can include a decimal point '.'.",
               "placeholder": 0
             },
+            "minTarget": {
+              "type": "number",
+              "title": "Minimum Target Temperature",
+              "description": "Minimum target temperature for TH10/16 thermostat simulation to show in HomeKit apps. Must be at least 0.",
+              "placeholder": 0,
+              "minimum": 0
+            },
+            "maxTarget": {
+              "type": "number",
+              "title": "Maximum Target Temperature",
+              "description": "Maximum target temperature for TH10/16 thermostat simulation to show in HomeKit apps. Must be at least 1, and greater than the minimum value set above.",
+              "placeholder": 30,
+              "minimum": 1
+            },
             "overrideDisabledLogging": {
               "type": "boolean",
               "title": "Override Disabled Logging",
@@ -565,7 +579,7 @@
               "title": "Operation Time Down (Deciseconds)",
               "description": "If your garage door or blind has a different operation time for up and down, use this setting to specify the operation time DOWN (in deciseconds) and the other setting to specify the operation time UP. Otherwise leave blank. Must be 20 or more.",
               "condition": {
-                "functionBody": "return (model.groups[arrayIndices] && ['garage', 'garage_two', 'garage_four', 'garage_eachen', 'blind', 'door, 'window', 'lock'].includes(model.groups[arrayIndices].type));"
+                "functionBody": "return (model.groups[arrayIndices] && ['garage', 'garage_two', 'garage_four', 'garage_eachen', 'blind', 'door', 'window', 'lock'].includes(model.groups[arrayIndices].type));"
               },
               "placeholder": 100,
               "minimum": 20
@@ -734,6 +748,8 @@
           "thDevices[].label",
           "thDevices[].hideSwitch",
           "thDevices[].offset",
+          "thDevices[].minTarget",
+          "thDevices[].maxTarget",
           "thDevices[].overrideDisabledLogging"
         ]
       }]
diff --git a/lib/device/simulation/thermostat.js b/lib/device/simulation/thermostat.js
index a4e8f044..49f75887 100644
--- a/lib/device/simulation/thermostat.js
+++ b/lib/device/simulation/thermostat.js
@@ -25,6 +25,12 @@ module.exports = class deviceThermostat {
     this.tempOffset = deviceConf && deviceConf.offset
       ? deviceConf.offset
       : platform.consts.defaultValues.offset
+    this.minTarget = deviceConf && deviceConf.minTarget
+      ? deviceConf.minTarget
+      : platform.consts.defaultValues.minTarget
+    this.maxTarget = deviceConf && deviceConf.maxTarget
+      ? Math.max(deviceConf.maxTarget, this.minTarget + 1)
+      : platform.consts.defaultValues.maxTarget
     this.disableDeviceLogging = (deviceConf && deviceConf.overrideDisabledLogging) ||
       deviceConf2.overrideDisabledLogging
       ? false
@@ -77,8 +83,8 @@ module.exports = class deviceThermostat {
     this.service.getCharacteristic(this.hapChar.TargetTemperature)
       .on('set', this.internalTargetTempUpdate.bind(this))
       .setProps({
-        minValue: 0,
-        maxValue: 30,
+        minValue: this.minTarget,
+        maxValue: this.maxTarget,
         minStep: 0.5
       })
 
@@ -107,6 +113,8 @@ module.exports = class deviceThermostat {
     if (this.debug) {
       const opts = JSON.stringify({
         disableDeviceLogging: this.disableDeviceLogging,
+        maxTarget: this.maxTarget,
+        minTarget: this.minTarget,
         offset: this.tempOffset,
         type: deviceConf2.type
       })
diff --git a/lib/index.js b/lib/index.js
index 02c99929..1f253d91 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -201,6 +201,8 @@ class eWeLinkPlatform {
                   case 'brightnessStep':
                   case 'inUsePowerThreshold':
                   case 'lowBattThreshold':
+                  case 'minTarget':
+                  case 'maxTarget':
                   case 'sensorTimeDifference': {
                     if (typeof v === 'string') {
                       logQuotes(key + '.' + id + '.' + k)
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index ff48415c..37038459 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -32,6 +32,8 @@ module.exports = {
     sensorTimeLength: 60,
     sensorTimeDifference: 120,
     offset: 0,
+    minTarget: 0,
+    maxTarget: 30,
     operationTime: 100,
     operationTimeDown: 100,
     mode: 'auto',
@@ -45,6 +47,8 @@ module.exports = {
     lowBattThreshold: 5,
     sensorTimeLength: 1,
     sensorTimeDifference: 10,
+    minTarget: 0,
+    maxTarget: 1,
     operationTime: 20,
     operationTimeDown: 20,
     brightnessStep: 1,
@@ -82,7 +86,10 @@ module.exports = {
       'deviceId', 'label', 'bulbModel', 'brightnessStep', 'adaptiveLightingShift',
       'ipAddress', 'overrideDisabledLogging'
     ],
-    thDevices: ['deviceId', 'label', 'hideSwitch', 'offset', 'overrideDisabledLogging'],
+    thDevices: [
+      'deviceId', 'label', 'hideSwitch', 'offset', 'minTarget', 'maxTarget',
+      'overrideDisabledLogging'
+    ],
     fanDevices: ['deviceId', 'label', 'hideLight', 'overrideDisabledLogging'],
     sensorDevices: [
       'deviceId', 'lowBattThreshold', 'hideLongDouble', 'scaleBattery',

From 6f964581d4dcc883a7b9cfab8c4a1d8df544c052 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 8 Mar 2021 08:48:22 +0000
Subject: [PATCH 1638/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index daa18416..23c7ab05 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,7 +6,10 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 ### Added
 
-* Expose an optional contact sensor for Eachen garage devices for historical data in the Eve app
+* **Accessory Simulations**
+  * Expose an optional contact sensor for Eachen garage devices for historical data in the Eve app
+  * Set custom minimum/maximum target temperatures for the TH10/16 thermostat simulation
+
 
 ### Changes
 

From 6dda7aa42759a100c6d98014ca87698bfb581885 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 8 Mar 2021 08:54:10 +0000
Subject: [PATCH 1639/3183] Update light-cct.js

---
 lib/device/light-cct.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/device/light-cct.js b/lib/device/light-cct.js
index a6d9eb27..9098bcbe 100644
--- a/lib/device/light-cct.js
+++ b/lib/device/light-cct.js
@@ -176,7 +176,6 @@ module.exports = class deviceLightCCT {
       // For adaptive lighting we still want to update the would have been so
       // it's not disabled when the light comes back on so do this check now not before
       if (this.cacheOnOff !== 'on') {
-        callback()
         return
       }
       const updateKeyCT = Math.random().toString(36).substr(2, 8)

From 8a70208a79be560a7aed7e5d2acbf525750d1a0c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 8 Mar 2021 08:54:14 +0000
Subject: [PATCH 1640/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 23c7ab05..f02a03eb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,11 +10,11 @@ All notable changes to this homebridge-ewelink will be documented in this file.
   * Expose an optional contact sensor for Eachen garage devices for historical data in the Eve app
   * Set custom minimum/maximum target temperatures for the TH10/16 thermostat simulation
 
-
 ### Changes
 
 * Specify a custom IP for the Sonoff D1
 * Show full error stack on plugin disable in debug mode
+* Fixes a `multiple callback` error with CCT bulb accessories
 
 ## 5.1.1 (2021-03-02)
 

From f0e181c9344bfed725e5e301ce8c60abd32f7366 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 8 Mar 2021 09:03:35 +0000
Subject: [PATCH 1641/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f02a03eb..858acd91 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 * Specify a custom IP for the Sonoff D1
 * Show full error stack on plugin disable in debug mode
 * Fixes a `multiple callback` error with CCT bulb accessories
+* Updated dependencies
 
 ## 5.1.1 (2021-03-02)
 

From c230cc83f3b7dc2faf0c0a762ef715dbffc4f4d7 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 8 Mar 2021 09:04:18 +0000
Subject: [PATCH 1642/3183] 5.2.0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 86d8436e..6e521bfe 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "5.1.2-3",
+  "version": "5.2.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 8cb4d8bd..0c8d86c2 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "5.1.2-3",
+  "version": "5.2.0",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From a1df74ceb8e206aa0514d710ab6655d66a2c8bf1 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 8 Mar 2021 09:05:02 +0000
Subject: [PATCH 1643/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 858acd91..147a33ee 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 All notable changes to this homebridge-ewelink will be documented in this file.
 
-## BETA
+## 5.2.0 (2021-03-08)
 
 ### Added
 

From b41374021156d381d5cb25e0ba89c21f668c0bdd Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 10 Mar 2021 08:39:08 +0000
Subject: [PATCH 1644/3183] [test] use eve with garage opener directly

---
 lib/device/simulation/garage-eachen.js | 80 ++++++++++++--------------
 1 file changed, 36 insertions(+), 44 deletions(-)

diff --git a/lib/device/simulation/garage-eachen.js b/lib/device/simulation/garage-eachen.js
index 33dd79b7..b5c34d74 100644
--- a/lib/device/simulation/garage-eachen.js
+++ b/lib/device/simulation/garage-eachen.js
@@ -103,41 +103,11 @@ module.exports = class deviceGarageEachen {
       this.accessory.removeService(this.accessory.getService(this.hapServ.Switch))
     }
 
-    // Check if the user wants to expose a contact sensor for this accessory
-    if (this.exposeContactSensor) {
-      // Add the contact sensor service if it doesn't already exist
-      this.contactService = this.accessory.getService(this.hapServ.ContactSensor) ||
-        this.accessory.addService(this.hapServ.ContactSensor)
-      if (!this.contactService.testCharacteristic(this.eveLastActivation)) {
-        this.contactService.addCharacteristic(this.eveLastActivation)
-      }
-      if (!this.contactService.testCharacteristic(this.eveResetTotal)) {
-        this.contactService.addCharacteristic(this.eveResetTotal)
-      }
-      if (!this.contactService.testCharacteristic(this.eveOpenDuration)) {
-        this.contactService.addCharacteristic(this.eveOpenDuration)
-      }
-      if (!this.contactService.testCharacteristic(this.eveClosedDuration)) {
-        this.contactService.addCharacteristic(this.eveClosedDuration)
-      }
-      if (!this.contactService.testCharacteristic(this.eveTimesOpened)) {
-        this.contactService.addCharacteristic(this.eveTimesOpened)
-      }
-      this.timesOpened = this.contactService.getCharacteristic(this.eveTimesOpened).value
-      this.contactService.getCharacteristic(this.eveResetTotal)
-        .removeAllListeners('set')
-        .on('set', (value, callback) => {
-          callback()
-          this.timesOpened = 0
-          this.contactService.updateCharacteristic(this.eveTimesOpened, 0)
-        })
-    } else {
-      // If the accessory has a contact sensor service then remove it
-      if (this.accessory.getService(this.hapServ.ContactSensor)) {
-        this.accessory.removeService(
-          this.accessory.getService(this.hapServ.ContactSensor)
-        )
-      }
+    // If the accessory has a contact sensor service then remove it
+    if (this.accessory.getService(this.hapServ.ContactSensor)) {
+      this.accessory.removeService(
+        this.accessory.getService(this.hapServ.ContactSensor)
+      )
     }
 
     // Add the garage door service if it doesn't already exist
@@ -148,8 +118,30 @@ module.exports = class deviceGarageEachen {
         .setCharacteristic(this.hapChar.ObstructionDetected, false)
     }
 
-    // Set the garage door service as the primary service (ie not the contact sensor)
-    this.service.setPrimaryService()
+    // Add the Eve characteristics if they don't already exist
+    if (!this.service.testCharacteristic(this.eveLastActivation)) {
+      this.service.addCharacteristic(this.eveLastActivation)
+    }
+    if (!this.service.testCharacteristic(this.eveResetTotal)) {
+      this.service.addCharacteristic(this.eveResetTotal)
+    }
+    if (!this.service.testCharacteristic(this.eveOpenDuration)) {
+      this.service.addCharacteristic(this.eveOpenDuration)
+    }
+    if (!this.service.testCharacteristic(this.eveClosedDuration)) {
+      this.service.addCharacteristic(this.eveClosedDuration)
+    }
+    if (!this.service.testCharacteristic(this.eveTimesOpened)) {
+      this.service.addCharacteristic(this.eveTimesOpened)
+    }
+    this.timesOpened = this.service.getCharacteristic(this.eveTimesOpened).value
+    this.service.getCharacteristic(this.eveResetTotal)
+      .removeAllListeners('set')
+      .on('set', (value, callback) => {
+        callback()
+        this.timesOpened = 0
+        this.service.updateCharacteristic(this.eveTimesOpened, 0)
+      })
 
     // Add the set handler to the target position characteristic
     this.service.getCharacteristic(this.hapChar.TargetDoorState)
@@ -191,15 +183,15 @@ module.exports = class deviceGarageEachen {
       this.inUse = false
       if (value === 0) {
         if (this.exposeContactSensor) {
-          this.contactService.updateCharacteristic(this.hapChar.ContactSensorState, 1)
+          this.service.updateCharacteristic(this.hapChar.ContactSensorState, 1)
           this.accessory.eveService.addEntry({ status: 0 })
           const initialTime = this.accessory.eveService.getInitialTime()
-          this.contactService.updateCharacteristic(
+          this.service.updateCharacteristic(
             this.eveLastActivation,
             Math.round(new Date().valueOf() / 1000) - initialTime
           )
           this.timesOpened++
-          this.contactService.updateCharacteristic(
+          this.service.updateCharacteristic(
             this.eveTimesOpened,
             this.timesOpened
           )
@@ -231,20 +223,20 @@ module.exports = class deviceGarageEachen {
       )
       if (this.exposeContactSensor) {
         if (params.switch === 'on') {
-          this.contactService.updateCharacteristic(this.hapChar.ContactSensorState, 1)
+          this.service.updateCharacteristic(this.hapChar.ContactSensorState, 1)
           this.accessory.eveService.addEntry({ status: 0 })
           const initialTime = this.accessory.eveService.getInitialTime()
-          this.contactService.updateCharacteristic(
+          this.service.updateCharacteristic(
             this.eveLastActivation,
             Math.round(new Date().valueOf() / 1000) - initialTime
           )
           this.timesOpened++
-          this.contactService.updateCharacteristic(
+          this.service.updateCharacteristic(
             this.eveTimesOpened,
             this.timesOpened
           )
         } else {
-          this.contactService.updateCharacteristic(this.hapChar.ContactSensorState, 0)
+          this.service.updateCharacteristic(this.hapChar.ContactSensorState, 0)
           this.accessory.eveService.addEntry({ status: 1 }) // swapped
         }
       }

From 72eb96a91bf7d233e394bc7176994153e7cd68d5 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 10 Mar 2021 08:39:36 +0000
Subject: [PATCH 1645/3183] 5.2.1-0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 6e521bfe..71297f0b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "5.2.0",
+  "version": "5.2.1-0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 0c8d86c2..ad5017a5 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "5.2.0",
+  "version": "5.2.1-0",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 8b92c381ffc7140005ef35f1e57b1cda21ea8c07 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 10 Mar 2021 08:55:22 +0000
Subject: [PATCH 1646/3183] [test] use eve with garage opener directly

---
 lib/device/simulation/garage-eachen.js | 54 +++++++++++---------------
 1 file changed, 22 insertions(+), 32 deletions(-)

diff --git a/lib/device/simulation/garage-eachen.js b/lib/device/simulation/garage-eachen.js
index b5c34d74..cdc415b1 100644
--- a/lib/device/simulation/garage-eachen.js
+++ b/lib/device/simulation/garage-eachen.js
@@ -182,20 +182,14 @@ module.exports = class deviceGarageEachen {
       await this.funcs.sleep(2000)
       this.inUse = false
       if (value === 0) {
-        if (this.exposeContactSensor) {
-          this.service.updateCharacteristic(this.hapChar.ContactSensorState, 1)
-          this.accessory.eveService.addEntry({ status: 0 })
-          const initialTime = this.accessory.eveService.getInitialTime()
-          this.service.updateCharacteristic(
-            this.eveLastActivation,
-            Math.round(new Date().valueOf() / 1000) - initialTime
-          )
-          this.timesOpened++
-          this.service.updateCharacteristic(
-            this.eveTimesOpened,
-            this.timesOpened
-          )
-        }
+        this.accessory.eveService.addEntry({ status: 0 })
+        const initialTime = this.accessory.eveService.getInitialTime()
+        this.service.updateCharacteristic(
+          this.eveLastActivation,
+          Math.round(new Date().valueOf() / 1000) - initialTime
+        )
+        this.timesOpened++
+        this.service.updateCharacteristic(this.eveTimesOpened, this.timesOpened)
         await this.funcs.sleep(Math.max((this.operationTime - 20) * 100, 0))
         this.service.updateCharacteristic(this.hapChar.CurrentDoorState, 0)
         if (!this.disableDeviceLogging) {
@@ -221,24 +215,20 @@ module.exports = class deviceGarageEachen {
         this.hapChar.CurrentDoorState,
         params.switch === 'on' ? 0 : 1
       )
-      if (this.exposeContactSensor) {
-        if (params.switch === 'on') {
-          this.service.updateCharacteristic(this.hapChar.ContactSensorState, 1)
-          this.accessory.eveService.addEntry({ status: 0 })
-          const initialTime = this.accessory.eveService.getInitialTime()
-          this.service.updateCharacteristic(
-            this.eveLastActivation,
-            Math.round(new Date().valueOf() / 1000) - initialTime
-          )
-          this.timesOpened++
-          this.service.updateCharacteristic(
-            this.eveTimesOpened,
-            this.timesOpened
-          )
-        } else {
-          this.service.updateCharacteristic(this.hapChar.ContactSensorState, 0)
-          this.accessory.eveService.addEntry({ status: 1 }) // swapped
-        }
+      if (params.switch === 'on') {
+        this.accessory.eveService.addEntry({ status: 0 })
+        const initialTime = this.accessory.eveService.getInitialTime()
+        this.service.updateCharacteristic(
+          this.eveLastActivation,
+          Math.round(new Date().valueOf() / 1000) - initialTime
+        )
+        this.timesOpened++
+        this.service.updateCharacteristic(
+          this.eveTimesOpened,
+          this.timesOpened
+        )
+      } else {
+        this.accessory.eveService.addEntry({ status: 1 }) // swapped
       }
       if (params.updateSource && !this.disableDeviceLogging) {
         this.log(

From 1e0d96a7ab7b4fb9bed9e5f554a8e372474ab71b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 10 Mar 2021 08:56:14 +0000
Subject: [PATCH 1647/3183] 5.2.1-1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 71297f0b..44dc6b61 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "5.2.1-0",
+  "version": "5.2.1-1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index ad5017a5..c49b6d1e 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "5.2.1-0",
+  "version": "5.2.1-1",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 1cb0497386546fbba6cdc88a705508f155094210 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 10 Mar 2021 11:54:28 +0000
Subject: [PATCH 1648/3183] adaptive lighting require 1.3.0

---
 lib/device/light-cct.js     | 2 +-
 lib/device/light-rgb-cct.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/device/light-cct.js b/lib/device/light-cct.js
index 9098bcbe..790389a4 100644
--- a/lib/device/light-cct.js
+++ b/lib/device/light-cct.js
@@ -70,7 +70,7 @@ module.exports = class deviceLightCCT {
     // Set up the adaptive lighting controller if available
     if (
       platform.api.versionGreaterOrEqual &&
-      platform.api.versionGreaterOrEqual('1.3.0-beta.58')
+      platform.api.versionGreaterOrEqual('1.3.0')
     ) {
       // This is needed as sometimes we need to send the brightness with a cct update
       this.cacheBrightness = this.service.getCharacteristic(this.hapChar.Brightness).value
diff --git a/lib/device/light-rgb-cct.js b/lib/device/light-rgb-cct.js
index 0723e2d3..ec9337da 100644
--- a/lib/device/light-rgb-cct.js
+++ b/lib/device/light-rgb-cct.js
@@ -65,7 +65,7 @@ module.exports = class deviceLightRGBCCT {
     // Set up the adaptive lighting controller if available
     if (
       platform.api.versionGreaterOrEqual &&
-      platform.api.versionGreaterOrEqual('1.3.0-beta.58')
+      platform.api.versionGreaterOrEqual('1.3.0')
     ) {
       // This is needed as sometimes we need to send the brightness with a cct update
       this.cacheBright = this.service.getCharacteristic(this.hapChar.Brightness).value

From 2e0275282cc7380c6568be39278b22ca85305a16 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 10 Mar 2021 12:04:38 +0000
Subject: [PATCH 1649/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 147a33ee..b445fd33 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 All notable changes to this homebridge-ewelink will be documented in this file.
 
+## BETA
+
+### Changes
+
+* Adaptive Lighting now requires Homebridge 1.3 release
+
 ## 5.2.0 (2021-03-08)
 
 ### Added

From 71c765f2dc13605153edce4a3f575af4e2c2e95f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 10 Mar 2021 12:49:46 +0000
Subject: [PATCH 1650/3183] remove exposecontactsensor options

---
 config.schema.json                     |  9 ----
 lib/device/simulation/garage-eachen.js |  2 -
 lib/device/simulation/garage-one.js    | 68 +++++++++++---------------
 lib/index.js                           |  1 -
 4 files changed, 29 insertions(+), 51 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 5a7e8527..04fb8a0e 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -584,14 +584,6 @@
               "placeholder": 100,
               "minimum": 20
             },
-            "exposeContactSensor": {
-              "type": "boolean",
-              "title": "Expose Contact Sensor",
-              "description": "If true, a contact sensor will be exposed which can be useful to view history in the Eve app.",
-              "condition": {
-                "functionBody": "return (model.groups[arrayIndices] && ['garage', 'garage_eachen'].includes(model.groups[arrayIndices].type));"
-              }
-            },
             "sensorId": {
               "type": "string",
               "title": "Sensor",
@@ -825,7 +817,6 @@
           "groups[].setup",
           "groups[].operationTime",
           "groups[].operationTimeDown",
-          "groups[].exposeContactSensor",
           "groups[].sensorId",
           "groups[].obstructId",
           "groups[].ipAddress",
diff --git a/lib/device/simulation/garage-eachen.js b/lib/device/simulation/garage-eachen.js
index cdc415b1..8a549f54 100644
--- a/lib/device/simulation/garage-eachen.js
+++ b/lib/device/simulation/garage-eachen.js
@@ -23,7 +23,6 @@ module.exports = class deviceGarageEachen {
     const deviceConf = platform.simulations[deviceId]
     this.operationTime = deviceConf.operationTime ||
       this.consts.defaultValues.operationTime
-    this.exposeContactSensor = deviceConf.exposeContactSensor || false
     this.disableDeviceLogging = deviceConf.overrideDisabledLogging
       ? false
       : platform.config.disableDeviceLogging
@@ -159,7 +158,6 @@ module.exports = class deviceGarageEachen {
     if (this.debug) {
       const opts = JSON.stringify({
         disableDeviceLogging: this.disableDeviceLogging,
-        exposeContactSensor: this.exposeContactSensor,
         operationTime: this.operationTime,
         type: deviceConf.type
       })
diff --git a/lib/device/simulation/garage-one.js b/lib/device/simulation/garage-one.js
index 9b1f981e..1ff26dad 100644
--- a/lib/device/simulation/garage-one.js
+++ b/lib/device/simulation/garage-one.js
@@ -25,7 +25,6 @@ module.exports = class deviceGarageOne {
     this.operationTimeUp = deviceConf.operationTime ||
       this.consts.defaultValues.operationTime
     this.operationTimeDown = deviceConf.operationTimeDown || this.operationTimeUp
-    this.exposeContactSensor = deviceConf.exposeContactSensor || false
     this.disableDeviceLogging = deviceConf.overrideDisabledLogging
       ? false
       : platform.config.disableDeviceLogging
@@ -135,41 +134,11 @@ module.exports = class deviceGarageOne {
       this.accessory.removeService(this.accessory.getService(this.hapServ.Switch))
     }
 
-    // Check if the user wants to expose a contact sensor for this accessory
-    if (this.exposeContactSensor) {
-      // Add the contact sensor service if it doesn't already exist
-      this.contactService = this.accessory.getService(this.hapServ.ContactSensor) ||
-        this.accessory.addService(this.hapServ.ContactSensor)
-      if (!this.contactService.testCharacteristic(this.eveLastActivation)) {
-        this.contactService.addCharacteristic(this.eveLastActivation)
-      }
-      if (!this.contactService.testCharacteristic(this.eveResetTotal)) {
-        this.contactService.addCharacteristic(this.eveResetTotal)
-      }
-      if (!this.contactService.testCharacteristic(this.eveOpenDuration)) {
-        this.contactService.addCharacteristic(this.eveOpenDuration)
-      }
-      if (!this.contactService.testCharacteristic(this.eveClosedDuration)) {
-        this.contactService.addCharacteristic(this.eveClosedDuration)
-      }
-      if (!this.contactService.testCharacteristic(this.eveTimesOpened)) {
-        this.contactService.addCharacteristic(this.eveTimesOpened)
-      }
-      this.timesOpened = this.contactService.getCharacteristic(this.eveTimesOpened).value
-      this.contactService.getCharacteristic(this.eveResetTotal)
-        .removeAllListeners('set')
-        .on('set', (value, callback) => {
-          callback()
-          this.timesOpened = 0
-          this.contactService.updateCharacteristic(this.eveTimesOpened, 0)
-        })
-    } else {
-      // If the accessory has a contact sensor service then remove it
-      if (this.accessory.getService(this.hapServ.ContactSensor)) {
-        this.accessory.removeService(
-          this.accessory.getService(this.hapServ.ContactSensor)
-        )
-      }
+    // If the accessory has a contact sensor service then remove it
+    if (this.accessory.getService(this.hapServ.ContactSensor)) {
+      this.accessory.removeService(
+        this.accessory.getService(this.hapServ.ContactSensor)
+      )
     }
 
     // Add the garage door service if it doesn't already exist
@@ -181,8 +150,30 @@ module.exports = class deviceGarageOne {
       this.service = this.accessory.getService(this.hapServ.GarageDoorOpener)
     }
 
-    // Set the garage door service as the primary service (ie not the contact sensor)
-    this.service.setPrimaryService()
+    // Add the Eve characteristics if they don't already exist
+    if (!this.service.testCharacteristic(this.eveLastActivation)) {
+      this.service.addCharacteristic(this.eveLastActivation)
+    }
+    if (!this.service.testCharacteristic(this.eveResetTotal)) {
+      this.service.addCharacteristic(this.eveResetTotal)
+    }
+    if (!this.service.testCharacteristic(this.eveOpenDuration)) {
+      this.service.addCharacteristic(this.eveOpenDuration)
+    }
+    if (!this.service.testCharacteristic(this.eveClosedDuration)) {
+      this.service.addCharacteristic(this.eveClosedDuration)
+    }
+    if (!this.service.testCharacteristic(this.eveTimesOpened)) {
+      this.service.addCharacteristic(this.eveTimesOpened)
+    }
+    this.timesOpened = this.service.getCharacteristic(this.eveTimesOpened).value
+    this.service.getCharacteristic(this.eveResetTotal)
+      .removeAllListeners('set')
+      .on('set', (value, callback) => {
+        callback()
+        this.timesOpened = 0
+        this.service.updateCharacteristic(this.eveTimesOpened, 0)
+      })
 
     // Add the set handler to the target position characteristic
     this.service.getCharacteristic(this.hapChar.TargetDoorState)
@@ -197,7 +188,6 @@ module.exports = class deviceGarageOne {
     if (this.debug) {
       const opts = JSON.stringify({
         disableDeviceLogging: this.disableDeviceLogging,
-        exposeContactSensor: this.exposeContactSensor,
         operationTimeDown: this.operationTimeDown,
         operationTimeUp: this.operationTimeUp,
         setup: this.setup,
diff --git a/lib/index.js b/lib/index.js
index 1f253d91..7ea2a15c 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -312,7 +312,6 @@ class eWeLinkPlatform {
                     }
                     break
                   }
-                  case 'exposeContactSensor':
                   case 'overrideDisabledLogging':
                     if (typeof v === 'string') {
                       logQuotes(key + '.' + id + '.' + k)

From 1e0c7b827a227837d91a6c8f8cd3d894538c638a Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 10 Mar 2021 13:03:01 +0000
Subject: [PATCH 1651/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b445fd33..36bc46c6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 ### Changes
 
 * Adaptive Lighting now requires Homebridge 1.3 release
+* Garages no longer need 'dummy' contact sensor to view Eve history
 
 ## 5.2.0 (2021-03-08)
 

From cb81a35c38fa9f9fb12289acffdd1cc0b65c9e49 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 10 Mar 2021 13:38:18 +0000
Subject: [PATCH 1652/3183] 5.2.1-2

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 44dc6b61..81c20362 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "5.2.1-1",
+  "version": "5.2.1-2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index c49b6d1e..e88e8b1b 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "5.2.1-1",
+  "version": "5.2.1-2",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 6df341b6cdbd884d01cbb20cf3331cf7d554d052 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 10 Mar 2021 15:52:14 +0000
Subject: [PATCH 1653/3183] add contactsensorstate char for eve

---
 lib/device/simulation/garage-eachen.js | 6 ++++++
 lib/device/simulation/garage-one.js    | 3 +++
 2 files changed, 9 insertions(+)

diff --git a/lib/device/simulation/garage-eachen.js b/lib/device/simulation/garage-eachen.js
index 8a549f54..d8c2ac32 100644
--- a/lib/device/simulation/garage-eachen.js
+++ b/lib/device/simulation/garage-eachen.js
@@ -118,6 +118,9 @@ module.exports = class deviceGarageEachen {
     }
 
     // Add the Eve characteristics if they don't already exist
+    if (!this.service.testCharacteristic(this.hapChar.ContactSensorState)) {
+      this.service.addCharacteristic(this.hapChar.ContactSensorState)
+    }
     if (!this.service.testCharacteristic(this.eveLastActivation)) {
       this.service.addCharacteristic(this.eveLastActivation)
     }
@@ -180,6 +183,7 @@ module.exports = class deviceGarageEachen {
       await this.funcs.sleep(2000)
       this.inUse = false
       if (value === 0) {
+        this.service.updateCharacteristic(this.hapChar.ContactSensorState, 1)
         this.accessory.eveService.addEntry({ status: 0 })
         const initialTime = this.accessory.eveService.getInitialTime()
         this.service.updateCharacteristic(
@@ -214,6 +218,7 @@ module.exports = class deviceGarageEachen {
         params.switch === 'on' ? 0 : 1
       )
       if (params.switch === 'on') {
+        this.service.updateCharacteristic(this.hapChar.ContactSensorState, 1)
         this.accessory.eveService.addEntry({ status: 0 })
         const initialTime = this.accessory.eveService.getInitialTime()
         this.service.updateCharacteristic(
@@ -226,6 +231,7 @@ module.exports = class deviceGarageEachen {
           this.timesOpened
         )
       } else {
+        this.service.updateCharacteristic(this.hapChar.ContactSensorState, 0)
         this.accessory.eveService.addEntry({ status: 1 }) // swapped
       }
       if (params.updateSource && !this.disableDeviceLogging) {
diff --git a/lib/device/simulation/garage-one.js b/lib/device/simulation/garage-one.js
index 1ff26dad..2d264bbd 100644
--- a/lib/device/simulation/garage-one.js
+++ b/lib/device/simulation/garage-one.js
@@ -151,6 +151,9 @@ module.exports = class deviceGarageOne {
     }
 
     // Add the Eve characteristics if they don't already exist
+    if (!this.service.testCharacteristic(this.hapChar.ContactSensorState)) {
+      this.service.addCharacteristic(this.hapChar.ContactSensorState)
+    }
     if (!this.service.testCharacteristic(this.eveLastActivation)) {
       this.service.addCharacteristic(this.eveLastActivation)
     }

From 927c21ad03e7078c548b814dc083e1bf855decb3 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 10 Mar 2021 15:57:02 +0000
Subject: [PATCH 1654/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 36bc46c6..e6079280 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 * Adaptive Lighting now requires Homebridge 1.3 release
 * Garages no longer need 'dummy' contact sensor to view Eve history
+  * For this reason, the `exposeContactSensor` setting is now redundant and so has been removed
 
 ## 5.2.0 (2021-03-08)
 

From f4d75abf4ad7237f040a57d2be53a4695ce8b66d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 10 Mar 2021 16:34:36 +0000
Subject: [PATCH 1655/3183] polling option for outletDevices

---
 config.schema.json     | 11 +++++++++++
 lib/device/outlet.js   | 12 +++++++++++-
 lib/index.js           |  1 +
 lib/utils/constants.js |  6 ++++--
 4 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 04fb8a0e..bd2e1b63 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -176,6 +176,16 @@
                 "functionBody": "return (model.outletDevices[arrayIndices] && !model.outletDevices[arrayIndices].showAsSwitch);"
               }
             },
+            "pollingInterval": {
+              "type": "number",
+              "title": "Polling Interval",
+              "description": "If your outlet doesn't regularly send power usage to the plugin you can use this to set up a polling interval. Set to 0 to disable.",
+              "placeholder": 0,
+              "minimum": 0,
+              "condition": {
+                "functionBody": "return (model.outletDevices[arrayIndices] && !model.outletDevices[arrayIndices].showAsSwitch);"
+              }
+            },
             "ipAddress": {
               "type": "string",
               "title": "IP Address",
@@ -701,6 +711,7 @@
           "outletDevices[].label",
           "outletDevices[].showAsSwitch",
           "outletDevices[].inUsePowerThreshold",
+          "outletDevices[].pollingInterval",
           "outletDevices[].ipAddress",
           "outletDevices[].overrideDisabledLogging"
         ]
diff --git a/lib/device/outlet.js b/lib/device/outlet.js
index 14603fe1..528cfe47 100644
--- a/lib/device/outlet.js
+++ b/lib/device/outlet.js
@@ -24,6 +24,9 @@ module.exports = class deviceOutlet {
     this.inUsePowerThreshold = deviceConf && deviceConf.inUsePowerThreshold
       ? deviceConf.inUsePowerThreshold
       : platform.consts.defaultValues.inUsePowerThreshold
+    this.pollingInterval = deviceConf && deviceConf.pollingInterval
+      ? deviceConf.pollingInterval
+      : platform.consts.defaultValues.pollingInterval
     this.disableDeviceLogging = deviceConf && deviceConf.overrideDisabledLogging
       ? false
       : platform.config.disableDeviceLogging
@@ -178,11 +181,18 @@ module.exports = class deviceOutlet {
       )
     }, 300000)
 
+    // Set up the polling interval if the user has enabled it
+    if (this.pollingInterval > 0) {
+      setInterval(() => {
+        platform.wsClient.requestUpdate(this.accessory)
+      }, this.pollingInterval * 1000)
+    }
     // Output the customised options to the log if in debug mode
     if (this.debug) {
       const opts = JSON.stringify({
         disableDeviceLogging: this.disableDeviceLogging,
-        inUsePowerThreshold: this.inUsePowerThreshold
+        inUsePowerThreshold: this.inUsePowerThreshold,
+        pollingInterval: this.pollingInterval
       })
       this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
     }
diff --git a/lib/index.js b/lib/index.js
index 7ea2a15c..59686576 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -203,6 +203,7 @@ class eWeLinkPlatform {
                   case 'lowBattThreshold':
                   case 'minTarget':
                   case 'maxTarget':
+                  case 'pollingInterval':
                   case 'sensorTimeDifference': {
                     if (typeof v === 'string') {
                       logQuotes(key + '.' + id + '.' + k)
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 37038459..aade3428 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -28,6 +28,7 @@ module.exports = {
 
   defaultValues: {
     inUsePowerThreshold: 0,
+    pollingInterval: 0,
     lowBattThreshold: 25,
     sensorTimeLength: 60,
     sensorTimeDifference: 120,
@@ -44,6 +45,7 @@ module.exports = {
 
   minValues: {
     inUsePowerThreshold: 0,
+    pollingInterval: 0,
     lowBattThreshold: 5,
     sensorTimeLength: 1,
     sensorTimeDifference: 10,
@@ -80,7 +82,7 @@ module.exports = {
     ],
     outletDevices: [
       'deviceId', 'label', 'showAsSwitch', 'inUsePowerThreshold', 'ipAddress',
-      'overrideDisabledLogging'
+      'pollingInterval', 'overrideDisabledLogging'
     ],
     lightDevices: [
       'deviceId', 'label', 'bulbModel', 'brightnessStep', 'adaptiveLightingShift',
@@ -195,7 +197,7 @@ module.exports = {
     29: 2, // "GSM_SOCKET_2"
     30: 3, // "GSM_SOCKET_3"
     31: 4, // "GSM_SOCKET_4"
-    32: 1, // "POWER_DETECTION_SOCKET" (POW, Pow_R2)
+    32: 1, // "POWER_DETECTION_SOCKET" (POW, Pow_R2, S31)
     34: 4, // "FAN_LIGHT" (iFan02, iFan)
     36: 1, // "SINGLE_CHANNEL_DIMMER_SWITCH" (KING-M4)
     41: 4, // "CUN_YOU_DOOR"

From 4e595ee248fd3bdaa25cefae19d0fd90955d1acb Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 10 Mar 2021 16:36:05 +0000
Subject: [PATCH 1656/3183] 5.2.1-3

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 81c20362..6b58146f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "5.2.1-2",
+  "version": "5.2.1-3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index e88e8b1b..3d93a36f 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "5.2.1-2",
+  "version": "5.2.1-3",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 8342c294827ac03564603fb7e62b340fb919ba7d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 10 Mar 2021 16:43:01 +0000
Subject: [PATCH 1657/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e6079280..9e52f260 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 ## BETA
 
+### Added
+
+* Set up a polling interval for outlet devices to obtain power information on a regular basis (useful when the device doesn't automatically send frequent updates)
+
 ### Changes
 
 * Adaptive Lighting now requires Homebridge 1.3 release

From f700216e88eb99134edad2e65dd401c69bd3a5f7 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 10 Mar 2021 17:29:55 +0000
Subject: [PATCH 1658/3183] stop intervals on hb shutdown

---
 lib/device/outlet.js | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/lib/device/outlet.js b/lib/device/outlet.js
index 528cfe47..151b3980 100644
--- a/lib/device/outlet.js
+++ b/lib/device/outlet.js
@@ -147,7 +147,7 @@ module.exports = class deviceOutlet {
     })
 
     // Set up an interval for the plugin to calculate an approx total consumption
-    setInterval(() => {
+    this.intervalPower = setInterval(() => {
       // Every 30 seconds start with a zero reading
       let total = 0
 
@@ -183,10 +183,17 @@ module.exports = class deviceOutlet {
 
     // Set up the polling interval if the user has enabled it
     if (this.pollingInterval > 0) {
-      setInterval(() => {
+      this.intervalPoll = setInterval(() => {
         platform.wsClient.requestUpdate(this.accessory)
       }, this.pollingInterval * 1000)
     }
+
+    // Stop the intervals on Homebridge shutdown
+    platform.api.on('shutdown', () => {
+      clearInterval(this.intervalPoll)
+      clearInterval(this.intervalPower)
+    })
+
     // Output the customised options to the log if in debug mode
     if (this.debug) {
       const opts = JSON.stringify({

From 4121e0ab3cedb2554a8ba7d9c500c8ccd554754e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 10 Mar 2021 17:31:16 +0000
Subject: [PATCH 1659/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9e52f260..84d7c7c7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 * Adaptive Lighting now requires Homebridge 1.3 release
 * Garages no longer need 'dummy' contact sensor to view Eve history
   * For this reason, the `exposeContactSensor` setting is now redundant and so has been removed
+* Outlet intervals for energy calculation and updates will stop on Homebridge shutdown
 
 ## 5.2.0 (2021-03-08)
 

From 0680d66ad8d0b3b7f672f6349019ce0f2040bce4 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 10 Mar 2021 17:35:19 +0000
Subject: [PATCH 1660/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 84d7c7c7..c479e8d0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 All notable changes to this homebridge-ewelink will be documented in this file.
 
-## BETA
+## 5.3.0 (2021-03-10)
 
 ### Added
 

From 18c160ec63f19c1cd8460e9f00763889da6505c6 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 10 Mar 2021 17:35:44 +0000
Subject: [PATCH 1661/3183] 5.3.0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 6b58146f..9aef932a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "5.2.1-3",
+  "version": "5.3.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 3d93a36f..64535cfb 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "5.2.1-3",
+  "version": "5.3.0",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 9607270f4d4927802fc73ca19ac663f5643fa14f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 11 Mar 2021 11:26:14 +0000
Subject: [PATCH 1662/3183] pow is uiid 5

---
 lib/utils/constants.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index aade3428..0f09bd4f 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -179,7 +179,7 @@ module.exports = {
     2: 2, // "SOCKET_2"
     3: 3, // "SOCKET_3"
     4: 4, // "SOCKET_4"
-    5: 1, // "SOCKET_POWER"
+    5: 1, // "SOCKET_POWER" (Sonoff Pow)
     6: 1, // "SWITCH" (T1 1C, TX1C)
     7: 2, // "SWITCH_2" (T1 2C, TX2C)
     8: 3, // "SWITCH_3" (T1 3C, TX3C)
@@ -197,7 +197,7 @@ module.exports = {
     29: 2, // "GSM_SOCKET_2"
     30: 3, // "GSM_SOCKET_3"
     31: 4, // "GSM_SOCKET_4"
-    32: 1, // "POWER_DETECTION_SOCKET" (POW, Pow_R2, S31)
+    32: 1, // "POWER_DETECTION_SOCKET" (Pow_R2, S31)
     34: 4, // "FAN_LIGHT" (iFan02, iFan)
     36: 1, // "SINGLE_CHANNEL_DIMMER_SWITCH" (KING-M4)
     41: 4, // "CUN_YOU_DOOR"

From 3cc7c2729bf9e9f64b4424ffd70cc23ca564f706 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 11 Mar 2021 12:46:06 +0000
Subject: [PATCH 1663/3183] more models to uiid list

---
 lib/utils/constants.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 0f09bd4f..a71169ee 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -175,12 +175,12 @@ module.exports = {
   ],
 
   supportedDevices: {
-    1: 1, // "SOCKET" (20, MINI, BASIC, S26)
+    1: 1, // "SOCKET" (MINI, BASIC, S20, S26)
     2: 2, // "SOCKET_2"
     3: 3, // "SOCKET_3"
     4: 4, // "SOCKET_4"
     5: 1, // "SOCKET_POWER" (Sonoff Pow)
-    6: 1, // "SWITCH" (T1 1C, TX1C)
+    6: 1, // "SWITCH" (T1 1C, TX1C, G1)
     7: 2, // "SWITCH_2" (T1 2C, TX2C)
     8: 3, // "SWITCH_3" (T1 3C, TX3C)
     9: 4, // "SWITCH_4"
@@ -197,7 +197,7 @@ module.exports = {
     29: 2, // "GSM_SOCKET_2"
     30: 3, // "GSM_SOCKET_3"
     31: 4, // "GSM_SOCKET_4"
-    32: 1, // "POWER_DETECTION_SOCKET" (Pow_R2, S31)
+    32: 1, // "POWER_DETECTION_SOCKET" (Pow_R2, S31, IW101)
     34: 4, // "FAN_LIGHT" (iFan02, iFan)
     36: 1, // "SINGLE_CHANNEL_DIMMER_SWITCH" (KING-M4)
     41: 4, // "CUN_YOU_DOOR"

From aaa3735ea18f861ca0e36bc25865be3b152c655f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 11 Mar 2021 12:52:39 +0000
Subject: [PATCH 1664/3183] more product models

---
 lib/utils/constants.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index a71169ee..8a0a1bdb 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -175,7 +175,7 @@ module.exports = {
   ],
 
   supportedDevices: {
-    1: 1, // "SOCKET" (MINI, BASIC, S20, S26)
+    1: 1, // "SOCKET" (MINI, BASIC, S20, S26, S55, RF, RF_R2)
     2: 2, // "SOCKET_2"
     3: 3, // "SOCKET_3"
     4: 4, // "SOCKET_4"

From 73d96465c59fa1a6ae5c586b5be4455e0c6db653 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 11 Mar 2021 19:53:43 +0000
Subject: [PATCH 1665/3183] option to force WS over LAN

---
 lib/index.js          | 14 ++++++++------
 lib/utils/messages.js |  1 +
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/lib/index.js b/lib/index.js
index 59686576..a7adc51d 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1351,7 +1351,7 @@ class eWeLinkPlatform {
     }
   }
 
-  async sendDeviceUpdate (accessory, params) {
+  async sendDeviceUpdate (accessory, params, useWS) {
     // Add to a queue so multiple updates are at least 500ms apart
     return await this.queue.add(async () => {
     // Log the update being sent
@@ -1368,11 +1368,13 @@ class eWeLinkPlatform {
       }
 
       // Quick check to see if LAN mode is supported
-      const res = !this.lanClient
-        ? this.messages.lanDisabled
-        : !this.consts.devices.lan.includes(accessory.context.eweUIID)
-          ? this.messages.lanNotSup
-          : await this.lanClient.sendUpdate(payload)
+      const res = useWS
+        ? this.messages.wsRequired
+        : !this.lanClient
+          ? this.messages.lanDisabled
+          : !this.consts.devices.lan.includes(accessory.context.eweUIID)
+            ? this.messages.lanNotSup
+            : await this.lanClient.sendUpdate(payload)
 
       // Revert to WS if LAN mode not possible for whatever reason
       if (res !== 'ok') {
diff --git a/lib/utils/messages.js b/lib/utils/messages.js
index 0c9d95c0..4b6abfd0 100644
--- a/lib/utils/messages.js
+++ b/lib/utils/messages.js
@@ -78,6 +78,7 @@ module.exports = {
   wsReconnect: 'Web socket closed and will try to reconnect in 5 seconds',
   wsRef: 'Refreshing WS connection',
   wsRefFail: 'Refreshing WS connection failed as',
+  wsRequired: 'update cannot be sent via LAN mode',
   wsResend: 'Request will be sent when WS has reconnected',
   wsUnkAct: 'WS message received has unknown action',
   wsUnkCmd: 'WS unknown command received',

From 727265991bf068222fcbb1d91b55085ba7db2abe Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 11 Mar 2021 19:53:55 +0000
Subject: [PATCH 1666/3183] enable real time power updates test

---
 lib/device/outlet.js | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/lib/device/outlet.js b/lib/device/outlet.js
index 151b3980..45821109 100644
--- a/lib/device/outlet.js
+++ b/lib/device/outlet.js
@@ -182,11 +182,20 @@ module.exports = class deviceOutlet {
     }, 300000)
 
     // Set up the polling interval if the user has enabled it
+    /*
     if (this.pollingInterval > 0) {
       this.intervalPoll = setInterval(() => {
         platform.wsClient.requestUpdate(this.accessory)
       }, this.pollingInterval * 1000)
     }
+    */
+
+    if (this.consts.devices.outlet.includes(this.accessory.context.eweUIID)) {
+      setTimeout(() => {
+        this.internalUIUpdate()
+        this.intervalPoll = setInterval(() => this.internalUIUpdate, 1800000)
+      }, 5000)
+    }
 
     // Stop the intervals on Homebridge shutdown
     platform.api.on('shutdown', () => {
@@ -220,6 +229,14 @@ module.exports = class deviceOutlet {
     }
   }
 
+  async internalUIUpdate () {
+    try {
+      await this.platform.sendDeviceUpdate(this.accessory, { uiActive: 1800 }, true)
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, true)
+    }
+  }
+
   async externalUpdate (params) {
     try {
       if (params.switch && params.switch !== this.cacheOnOff) {

From 36eb148e65d80460953f228f70b3b9521264473e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 11 Mar 2021 19:56:18 +0000
Subject: [PATCH 1667/3183] 5.3.1-0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 9aef932a..580a756b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "5.3.0",
+  "version": "5.3.1-0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 64535cfb..eab4e4e2 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "5.3.0",
+  "version": "5.3.1-0",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From d060bf09f8c971f909d4ae17d3617617e288f7f4 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 12 Mar 2021 07:22:53 +0000
Subject: [PATCH 1668/3183] eval function!

---
 lib/device/outlet.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/device/outlet.js b/lib/device/outlet.js
index 45821109..5ca81bf2 100644
--- a/lib/device/outlet.js
+++ b/lib/device/outlet.js
@@ -193,7 +193,7 @@ module.exports = class deviceOutlet {
     if (this.consts.devices.outlet.includes(this.accessory.context.eweUIID)) {
       setTimeout(() => {
         this.internalUIUpdate()
-        this.intervalPoll = setInterval(() => this.internalUIUpdate, 1800000)
+        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 1800000)
       }, 5000)
     }
 

From 4152719290dcf24de4ec0e31138dfcb8bc966425 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 12 Mar 2021 07:23:19 +0000
Subject: [PATCH 1669/3183] 5.3.1-1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 580a756b..f21d3964 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "5.3.1-0",
+  "version": "5.3.1-1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index eab4e4e2..4133d0a7 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "5.3.1-0",
+  "version": "5.3.1-1",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 62c6dedd29001905c05d0746872e66b68ca9dc86 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 12 Mar 2021 08:04:10 +0000
Subject: [PATCH 1670/3183] use polling interval for update request

---
 config.schema.json     |  6 +++---
 lib/device/outlet.js   | 22 +++++++++-------------
 lib/utils/constants.js |  4 ++--
 lib/utils/messages.js  |  2 +-
 4 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index bd2e1b63..d54c877d 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -179,9 +179,9 @@
             "pollingInterval": {
               "type": "number",
               "title": "Polling Interval",
-              "description": "If your outlet doesn't regularly send power usage to the plugin you can use this to set up a polling interval. Set to 0 to disable.",
-              "placeholder": 0,
-              "minimum": 0,
+              "description": "If your outlet doesn't regularly send power usage to the plugin you can use this to set up a polling interval in seconds. Must be 15 or more.",
+              "placeholder": 15,
+              "minimum": 30,
               "condition": {
                 "functionBody": "return (model.outletDevices[arrayIndices] && !model.outletDevices[arrayIndices].showAsSwitch);"
               }
diff --git a/lib/device/outlet.js b/lib/device/outlet.js
index 5ca81bf2..f06a4d49 100644
--- a/lib/device/outlet.js
+++ b/lib/device/outlet.js
@@ -26,7 +26,7 @@ module.exports = class deviceOutlet {
       : platform.consts.defaultValues.inUsePowerThreshold
     this.pollingInterval = deviceConf && deviceConf.pollingInterval
       ? deviceConf.pollingInterval
-      : platform.consts.defaultValues.pollingInterval
+      : false
     this.disableDeviceLogging = deviceConf && deviceConf.overrideDisabledLogging
       ? false
       : platform.config.disableDeviceLogging
@@ -181,19 +181,14 @@ module.exports = class deviceOutlet {
       )
     }, 300000)
 
-    // Set up the polling interval if the user has enabled it
-    /*
-    if (this.pollingInterval > 0) {
-      this.intervalPoll = setInterval(() => {
-        platform.wsClient.requestUpdate(this.accessory)
-      }, this.pollingInterval * 1000)
-    }
-    */
-
-    if (this.consts.devices.outlet.includes(this.accessory.context.eweUIID)) {
+    if (
+      this.consts.devices.outlet.includes(this.accessory.context.eweUIID) &&
+      this.pollingInterval
+    ) {
       setTimeout(() => {
+        const milli = this.pollingInterval * 1000
         this.internalUIUpdate()
-        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 1800000)
+        this.intervalPoll = setInterval(() => this.internalUIUpdate(), milli)
       }, 5000)
     }
 
@@ -231,7 +226,8 @@ module.exports = class deviceOutlet {
 
   async internalUIUpdate () {
     try {
-      await this.platform.sendDeviceUpdate(this.accessory, { uiActive: 1800 }, true)
+      const params = { uiActive: this.pollingInterval }
+      await this.platform.sendDeviceUpdate(this.accessory, params, true)
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
     }
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 8a0a1bdb..9c2504a5 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -28,7 +28,7 @@ module.exports = {
 
   defaultValues: {
     inUsePowerThreshold: 0,
-    pollingInterval: 0,
+    pollingInterval: 30,
     lowBattThreshold: 25,
     sensorTimeLength: 60,
     sensorTimeDifference: 120,
@@ -45,7 +45,7 @@ module.exports = {
 
   minValues: {
     inUsePowerThreshold: 0,
-    pollingInterval: 0,
+    pollingInterval: 15,
     lowBattThreshold: 5,
     sensorTimeLength: 1,
     sensorTimeDifference: 10,
diff --git a/lib/utils/messages.js b/lib/utils/messages.js
index 4b6abfd0..76b3afef 100644
--- a/lib/utils/messages.js
+++ b/lib/utils/messages.js
@@ -78,7 +78,7 @@ module.exports = {
   wsReconnect: 'Web socket closed and will try to reconnect in 5 seconds',
   wsRef: 'Refreshing WS connection',
   wsRefFail: 'Refreshing WS connection failed as',
-  wsRequired: 'update cannot be sent via LAN mode',
+  wsRequired: 'update must be sent this way',
   wsResend: 'Request will be sent when WS has reconnected',
   wsUnkAct: 'WS message received has unknown action',
   wsUnkCmd: 'WS unknown command received',

From ec90de80f06d4fb0e2d7b6e27f05d2af8d8d00b5 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 12 Mar 2021 08:14:49 +0000
Subject: [PATCH 1671/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c479e8d0..48945c8c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 All notable changes to this homebridge-ewelink will be documented in this file.
 
+## BETA
+
+* Attempt to fix outlet polling updates so the device reports updated info rather than the previous info.
+
 ## 5.3.0 (2021-03-10)
 
 ### Added

From 44a8244a08a31c831f2c96dd0594a83cb97ac05d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 12 Mar 2021 08:21:01 +0000
Subject: [PATCH 1672/3183] enable lan mode for TH10/16

---
 lib/device/simulation/thermostat.js | 4 ++--
 lib/utils/constants.js              | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/device/simulation/thermostat.js b/lib/device/simulation/thermostat.js
index 49f75887..1d63bafe 100644
--- a/lib/device/simulation/thermostat.js
+++ b/lib/device/simulation/thermostat.js
@@ -143,7 +143,7 @@ module.exports = class deviceThermostat {
         this.hapChar.CurrentHeatingCoolingState,
         this.cacheHeat === 'on' ? 1 : 0
       )
-      await this.platform.sendDeviceUpdate(this.accessory, params)
+      await this.platform.sendDeviceUpdate(this.accessory, params, true)
       if (!this.disableDeviceLogging) {
         this.log('[%s] current state [%s].', this.name, this.cacheOnOff)
       }
@@ -180,7 +180,7 @@ module.exports = class deviceThermostat {
         this.hapChar.CurrentHeatingCoolingState,
         this.cacheHeat === 'on' ? 1 : 0
       )
-      await this.platform.sendDeviceUpdate(this.accessory, params)
+      await this.platform.sendDeviceUpdate(this.accessory, params, true)
       if (!this.disableDeviceLogging) {
         this.log('[%s] current target [%s°C].', this.name, value)
       }
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 9c2504a5..c1f38a7c 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -110,7 +110,7 @@ module.exports = {
   },
 
   devices: {
-    lan: [1, 2, 3, 4, 5, 6, 7, 8, 9, 32, 44, 77, 78, 126],
+    lan: [1, 2, 3, 4, 5, 6, 7, 8, 9, 15, 32, 44, 77, 78, 126],
     singleSwitch: [1, 5, 6, 14, 24, 27, 81],
     multiSwitch: [2, 3, 4, 7, 8, 9, 29, 30, 31, 41, 82, 83, 84, 126],
     singleSwitchOutlet: ['Sonoff Pow', 'S20', 'S26', 'S26R1', 'S55', 'S55R1'],

From 117f2752e138a5c5051e926f40ec3c7f2dca71a1 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 12 Mar 2021 08:23:42 +0000
Subject: [PATCH 1673/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 48945c8c..49ba352e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,12 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 ## BETA
 
+### Added
+
+* Enable LAN mode for TH10/TH16 devices (usage as a thermostat simulation requires cloud connection)
+
+### Changes
+
 * Attempt to fix outlet polling updates so the device reports updated info rather than the previous info.
 
 ## 5.3.0 (2021-03-10)

From e67a7f64c63594bac0fab4964a02d29ac9e4490e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 12 Mar 2021 08:45:17 +0000
Subject: [PATCH 1674/3183] differentiate between lan in and out supported

---
 lib/connection/lan.js  | 7 +++++--
 lib/index.js           | 6 +++---
 lib/utils/constants.js | 3 ++-
 lib/utils/messages.js  | 3 ++-
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/lib/connection/lan.js b/lib/connection/lan.js
index 9be8684e..5d1f8ba9 100644
--- a/lib/connection/lan.js
+++ b/lib/connection/lan.js
@@ -26,7 +26,7 @@ module.exports = class connectionLAN {
     // Create a template map with our device list from the HTTP client
     devices.forEach(device => {
       // Don't continue if the device doesn't support LAN mode
-      if (!this.consts.devices.lan.includes(device.extra.uiid)) {
+      if (!this.consts.devices.lanIn.includes(device.extra.uiid)) {
         return
       }
 
@@ -212,7 +212,10 @@ module.exports = class connectionLAN {
 
       // Check for any errors in the response
       if (!res.data || res.data.error !== 0) {
-        throw new Error(res.data)
+        const error = res.data && res.data.error
+          ? res.data.error
+          : this.messages.lanErr
+        throw new Error(error)
       }
 
       // This ok is needed by the plugin
diff --git a/lib/index.js b/lib/index.js
index a7adc51d..a5fff3df 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1199,7 +1199,7 @@ class eWeLinkPlatform {
       // Helpful logging for each device
       const str = accessory.context.reachableLAN
         ? this.messages.foundWithIP + ' [' + this.lanDevices.get(device.deviceid).ip + ']'
-        : this.consts.devices.lan.includes(device.extra.uiid)
+        : this.consts.devices.lanIn.includes(device.extra.uiid)
           ? this.messages.lanUnreachable
           : this.messages.lanUnsupported
 
@@ -1372,7 +1372,7 @@ class eWeLinkPlatform {
         ? this.messages.wsRequired
         : !this.lanClient
           ? this.messages.lanDisabled
-          : !this.consts.devices.lan.includes(accessory.context.eweUIID)
+          : !this.consts.devices.lanOut.includes(accessory.context.eweUIID)
             ? this.messages.lanNotSup
             : await this.lanClient.sendUpdate(payload)
 
@@ -1511,7 +1511,7 @@ class eWeLinkPlatform {
         this.initialiseDevice(newDevice)
 
         // Add the device to the LAN client map
-        if (this.lanClient && this.consts.devices.lan.includes(newDevice.extra.uiid)) {
+        if (this.lanClient && this.consts.devices.lanIn.includes(newDevice.extra.uiid)) {
           this.lanClient.addDeviceToMap(newDevice)
         }
       } catch (err) {
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index c1f38a7c..ee1753fc 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -110,7 +110,8 @@ module.exports = {
   },
 
   devices: {
-    lan: [1, 2, 3, 4, 5, 6, 7, 8, 9, 15, 32, 44, 77, 78, 126],
+    lanIn: [1, 2, 3, 4, 5, 6, 7, 8, 9, 15, 32, 44, 77, 78, 126],
+    lanOut: [1, 2, 3, 4, 5, 6, 7, 8, 9, 32, 44, 77, 78, 126],
     singleSwitch: [1, 5, 6, 14, 24, 27, 81],
     multiSwitch: [2, 3, 4, 7, 8, 9, 29, 30, 31, 41, 82, 83, 84, 126],
     singleSwitchOutlet: ['Sonoff Pow', 'S20', 'S26', 'S26R1', 'S55', 'S55R1'],
diff --git a/lib/utils/messages.js b/lib/utils/messages.js
index 76b3afef..0bcad33c 100644
--- a/lib/utils/messages.js
+++ b/lib/utils/messages.js
@@ -39,7 +39,8 @@ module.exports = {
   identify: 'identify button pressed',
   initialised: 'initialised. Syncing with eWeLink',
   lanDisabled: 'LAN mode is disabled',
-  lanNotSup: 'LAN mode is not supported for this device',
+  lanErr: 'unknown LAN error',
+  lanNotSup: 'LAN mode is not supported for sending updates to this device',
   lanUnreachable: 'LAN mode unavailable as unreachable',
   lanUnsupported: 'LAN mode unavailable as not supported',
   missingCC: 'eWeLink country code missing from configuration',

From 975970b27ecce2363aadb021d330e0d58f639d56 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 12 Mar 2021 08:46:04 +0000
Subject: [PATCH 1675/3183] Update thermostat.js

---
 lib/device/simulation/thermostat.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/device/simulation/thermostat.js b/lib/device/simulation/thermostat.js
index 1d63bafe..49f75887 100644
--- a/lib/device/simulation/thermostat.js
+++ b/lib/device/simulation/thermostat.js
@@ -143,7 +143,7 @@ module.exports = class deviceThermostat {
         this.hapChar.CurrentHeatingCoolingState,
         this.cacheHeat === 'on' ? 1 : 0
       )
-      await this.platform.sendDeviceUpdate(this.accessory, params, true)
+      await this.platform.sendDeviceUpdate(this.accessory, params)
       if (!this.disableDeviceLogging) {
         this.log('[%s] current state [%s].', this.name, this.cacheOnOff)
       }
@@ -180,7 +180,7 @@ module.exports = class deviceThermostat {
         this.hapChar.CurrentHeatingCoolingState,
         this.cacheHeat === 'on' ? 1 : 0
       )
-      await this.platform.sendDeviceUpdate(this.accessory, params, true)
+      await this.platform.sendDeviceUpdate(this.accessory, params)
       if (!this.disableDeviceLogging) {
         this.log('[%s] current target [%s°C].', this.name, value)
       }

From e32045f44fe4992e3c67614b10e79579f0b6ae98 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 12 Mar 2021 08:52:12 +0000
Subject: [PATCH 1676/3183] lan in for bulbs

---
 lib/utils/constants.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index ee1753fc..a48e5149 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -110,7 +110,7 @@ module.exports = {
   },
 
   devices: {
-    lanIn: [1, 2, 3, 4, 5, 6, 7, 8, 9, 15, 32, 44, 77, 78, 126],
+    lanIn: [1, 2, 3, 4, 5, 6, 7, 8, 9, 15, 32, 44, 77, 78, 103, 104, 126],
     lanOut: [1, 2, 3, 4, 5, 6, 7, 8, 9, 32, 44, 77, 78, 126],
     singleSwitch: [1, 5, 6, 14, 24, 27, 81],
     multiSwitch: [2, 3, 4, 7, 8, 9, 29, 30, 31, 41, 82, 83, 84, 126],

From 33c6d14b602d0a162b5bcf5eb940196c7d9f76a3 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 12 Mar 2021 08:53:26 +0000
Subject: [PATCH 1677/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 49ba352e..ccffd7ce 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,7 +6,9 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 ### Added
 
-* Enable LAN mode for TH10/TH16 devices (usage as a thermostat simulation requires cloud connection)
+* The plugin now differentiates between LAN support for **incoming** and **outgoing** updates, allowing incoming updates for:
+  * TH10/16
+  * B02 and B05 bulbs
 
 ### Changes
 

From 4fb0adc38467fee5a1c6921e17b04828fca26d64 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 12 Mar 2021 08:56:23 +0000
Subject: [PATCH 1678/3183] 5.3.1-2

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index f21d3964..9f5c063d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "5.3.1-1",
+  "version": "5.3.1-2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 4133d0a7..484fd1a3 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "5.3.1-1",
+  "version": "5.3.1-2",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 5657ac42eff310de789dd7f56f3caf247f51dfb0 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 12 Mar 2021 11:18:36 +0000
Subject: [PATCH 1679/3183] switch min and placeholder

---
 config.schema.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index d54c877d..84c68568 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -180,8 +180,8 @@
               "type": "number",
               "title": "Polling Interval",
               "description": "If your outlet doesn't regularly send power usage to the plugin you can use this to set up a polling interval in seconds. Must be 15 or more.",
-              "placeholder": 15,
-              "minimum": 30,
+              "placeholder": 30,
+              "minimum": 15,
               "condition": {
                 "functionBody": "return (model.outletDevices[arrayIndices] && !model.outletDevices[arrayIndices].showAsSwitch);"
               }

From 6422f1080a95d1092692c2bee9a957267adbc733 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 12 Mar 2021 12:04:01 +0000
Subject: [PATCH 1680/3183] 5.3.1-3

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 9f5c063d..c0f90416 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "5.3.1-2",
+  "version": "5.3.1-3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 484fd1a3..07bcd27e 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "5.3.1-2",
+  "version": "5.3.1-3",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 8c15a49295fc2449414690f48048c329e644d9dc Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 13 Mar 2021 18:31:20 +0000
Subject: [PATCH 1681/3183] Update constants.js

---
 lib/utils/constants.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index a48e5149..250da1e3 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -112,7 +112,7 @@ module.exports = {
   devices: {
     lanIn: [1, 2, 3, 4, 5, 6, 7, 8, 9, 15, 32, 44, 77, 78, 103, 104, 126],
     lanOut: [1, 2, 3, 4, 5, 6, 7, 8, 9, 32, 44, 77, 78, 126],
-    singleSwitch: [1, 5, 6, 14, 24, 27, 81],
+    singleSwitch: [1, 5, 6, 14, 24, 27],
     multiSwitch: [2, 3, 4, 7, 8, 9, 29, 30, 31, 41, 82, 83, 84, 126],
     singleSwitchOutlet: ['Sonoff Pow', 'S20', 'S26', 'S26R1', 'S55', 'S55R1'],
     lightDimmer: [36, 44, 57],
@@ -128,7 +128,7 @@ module.exports = {
     humidifier: [19],
     diffuser: [25],
     outlet: [32],
-    outletSCM: [77, 78, 107],
+    outletSCM: [77, 78, 81, 107],
     camera: [87],
     eWeCamera: [65],
     rfBridge: [28],
@@ -207,9 +207,9 @@ module.exports = {
     59: 1, // "MUSIC_LIGHT_BELT" (L1)
     65: 1, // "CustomCamera" (eWeLink Camera App)
     66: 1, // "ZIGBEE_MAIN_DEVICE"
-    77: 4, // "SINGLE_SOCKET_MULTIPLE" (1 socket device using data structure of four :()
-    78: 4, // "SINGLE_SWITCH_MULTIPLE" (1 switch device using data structure of four :()
-    81: 1, // "GSM_SOCKET_NO_FLOW"
+    77: 4, // "SINGLE_SOCKET_MULTIPLE" (1 socket device using data structure of four)
+    78: 4, // "SINGLE_SWITCH_MULTIPLE" (1 switch device using data structure of four
+    81: 1, // "GSM_SOCKET_NO_FLOW" (1 socket device using data structure of four)
     82: 2, // "GSM_SOCKET_2_NO_FLOW"
     83: 3, // "GSM_SOCKET_3_NO_FLOW"
     84: 4, // "GSM_SOCKET_4_NO_FLOW"

From 4ca6a1d86405d3d2ac44a71eebd3fe22d00d5d22 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 13 Mar 2021 18:41:05 +0000
Subject: [PATCH 1682/3183] identify which point fails

---
 lib/connection/http.js | 6 +++---
 lib/connection/ws.js   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/connection/http.js b/lib/connection/http.js
index 9f655e77..c373ed78 100644
--- a/lib/connection/http.js
+++ b/lib/connection/http.js
@@ -90,7 +90,7 @@ module.exports = class connectionHTTP {
       // Check to see if it's a eWeLink server problem and we can retry
       if (err.code && this.consts.httpRetryCodes.includes(err.code)) {
         // Retry if another attempt could be successful
-        this.log.warn('%s (%s).', this.messages.httpRetry, err.code)
+        this.log.warn('%s (%s - 1).', this.messages.httpRetry, err.code)
         await this.funcs.sleep(30000)
         return await this.getHost()
       } else {
@@ -238,7 +238,7 @@ module.exports = class connectionHTTP {
       // Check to see if it's a eWeLink server problem and we can retry
       if (err.code && this.consts.httpRetryCodes.includes(err.code)) {
         // Retry if another attempt could be successful
-        this.log.warn('%s (%s).', this.messages.httpRetry, err.code)
+        this.log.warn('%s (%s - 2).', this.messages.httpRetry, err.code)
         await this.funcs.sleep(30000)
         return await this.getDevices()
       } else {
@@ -284,7 +284,7 @@ module.exports = class connectionHTTP {
     } catch (err) {
       if (err.code && this.consts.httpRetryCodes.includes(err.code)) {
         // Retry if another attempt could be successful
-        this.log.warn('%s (%s).', this.messages.httpRetry, err.code)
+        this.log.warn('%s (%s - 3).', this.messages.httpRetry, err.code)
         await this.funcs.sleep(30000)
         return await this.getDevice(deviceId)
       } else {
diff --git a/lib/connection/ws.js b/lib/connection/ws.js
index d9a15a87..00893c61 100644
--- a/lib/connection/ws.js
+++ b/lib/connection/ws.js
@@ -65,7 +65,7 @@ module.exports = class connectionWS {
       // Check to see if it's a eWeLink server problem and we can retry
       if (err.code && this.consts.httpRetryCodes.includes(err.code)) {
         // Retry if another attempt could be successful
-        this.log.warn('%s (%s).', this.messages.httpRetry, err.code)
+        this.log.warn('%s (%s - 4).', this.messages.httpRetry, err.code)
         await this.funcs.sleep(30000)
         return await this.getHost()
       } else {

From ff00eab99b220f6f553f436be8f59b824999ad26 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 13 Mar 2021 18:41:33 +0000
Subject: [PATCH 1683/3183] 5.3.1-4

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c0f90416..bb580579 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "5.3.1-3",
+  "version": "5.3.1-4",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 07bcd27e..a5750ecb 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "5.3.1-3",
+  "version": "5.3.1-4",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 34b644055886ce4d985274f8d1d3827bfc8a933c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 14 Mar 2021 12:20:01 +0000
Subject: [PATCH 1684/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ccffd7ce..268c9ab9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 All notable changes to this homebridge-ewelink will be documented in this file.
 
-## BETA
+## 5.4.0 (2021-03-14)
 
 ### Added
 

From bcd0f38c7d3bd851a548a899d0a182ecab224450 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 14 Mar 2021 12:20:35 +0000
Subject: [PATCH 1685/3183] 5.4.0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index bb580579..d8332723 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "5.3.1-4",
+  "version": "5.4.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index a5750ecb..f9509745 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "5.3.1-4",
+  "version": "5.4.0",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From e0d1a53f4989a79d21258487af770fdaae15419f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 14 Mar 2021 17:43:30 +0000
Subject: [PATCH 1686/3183] [test] remove countryCode option

---
 config.schema.json                  |  7 ---
 lib/connection/http.js              | 94 +++--------------------------
 lib/connection/ws.js                |  2 +-
 lib/homebridge-ui/public/index.html |  2 +-
 lib/index.js                        | 15 ++---
 lib/utils/constants.js              |  1 -
 lib/utils/functions.js              |  4 --
 lib/utils/messages.js               |  4 --
 8 files changed, 15 insertions(+), 114 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 84c68568..385081cf 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -12,12 +12,6 @@
         "type": "string",
         "default": "eWeLink"
       },
-      "countryCode": {
-        "type": "string",
-        "title": "Country Code",
-        "placeholder": "Enter without the +",
-        "required": true
-      },
       "username": {
         "type": "string",
         "title": "Username",
@@ -644,7 +638,6 @@
       "type": "fieldset",
       "title": "Required Settings",
       "items": [
-        "countryCode",
         "username",
         "password"
       ]
diff --git a/lib/connection/http.js b/lib/connection/http.js
index c373ed78..0da2e3c3 100644
--- a/lib/connection/http.js
+++ b/lib/connection/http.js
@@ -12,7 +12,6 @@ module.exports = class connectionHTTP {
     this.obstructSwitches = platform.obstructSwitches
 
     // Set up config variables from the platform
-    this.cCode = platform.config.countryCode
     this.debug = platform.config.debug
     this.ignoredDevices = platform.config.ignoredDevices
     this.password = platform.config.password
@@ -21,94 +20,15 @@ module.exports = class connectionHTTP {
     // Set up libraries from the platform
     this.axios = platform.axios
     this.crypto = platform.crypto
-  }
-
-  async getHost () {
-    // Used to get the user's regional (continent) HTTP API host
-    const params = {
-      appid: this.consts.appId,
-      country_code: this.cCode,
-      nonce: Math.random().toString(36).substr(2, 8),
-      ts: Math.floor(new Date().getTime() / 1000),
-      version: 8
-    }
-
-    // Set up the request signature
-    let dataToSign = []
-    try {
-      Object.keys(params).forEach(k => {
-        dataToSign.push({
-          key: k,
-          value: params.k
-        })
-      })
-      dataToSign.sort((a, b) => (a.key < b.key ? -1 : 1))
-      dataToSign = dataToSign.map(k => k.key + '=' + k.value).join('&')
-      dataToSign = this.crypto.createHmac('sha256', this.consts.appSecret)
-        .update(dataToSign).digest('base64')
-
-      // Log the data depending on the debug setting
-      if (this.debug) {
-        this.log('%s.', this.messages.sendGetHost)
-      }
-
-      // Send the request
-      const res = await this.axios.get('https://api.coolkit.cc:8080/api/user/region', {
-        headers: {
-          Authorization: 'Sign ' + dataToSign,
-          'Content-Type': 'application/json'
-        },
-        params
-      })
 
-      // Parse the response
-      const body = res.data
-      if (!body.region) {
-        throw new Error(this.messages.noRegion + '.\n' + JSON.stringify(body, null, 2))
-      }
-
-      // Check we have received a valid region
-      switch (body.region) {
-        case 'eu':
-        case 'us':
-        case 'as':
-          this.httpHost = body.region + '-apia.coolkit.cc'
-          break
-        case 'cn':
-          this.httpHost = 'cn-apia.coolkit.cn'
-          break
-        default:
-          // No valid region received
-          throw new Error(this.messages.noRegionRec + ' - [' + body.region + '].')
-      }
-
-      // Log no valid region received
-      if (this.debug) {
-        this.log('%s [%s].', this.messages.hostReceived, this.httpHost)
-      }
-    } catch (err) {
-      // Check to see if it's a eWeLink server problem and we can retry
-      if (err.code && this.consts.httpRetryCodes.includes(err.code)) {
-        // Retry if another attempt could be successful
-        this.log.warn('%s (%s - 1).', this.messages.httpRetry, err.code)
-        await this.funcs.sleep(30000)
-        return await this.getHost()
-      } else {
-        // It's not a eWeLink problem so report the error back
-        throw err
-      }
-    }
+    // Try a default http host which will be changed for other regions automatically
+    this.httpHost = 'eu-apia.coolkit.cc'
   }
 
   async login () {
     // Used to log the user in and obtain the user api key and token
-    if (this.httpHost === undefined) {
-      this.httpHost = 'eu-apia.coolkit.cc'
-    }
-
-    // Set up the data to send object
     const data = {
-      countryCode: this.cCode,
+      countryCode: '+1',
       password: this.password
     }
 
@@ -160,9 +80,13 @@ module.exports = class connectionHTTP {
         default:
           throw new Error(this.messages.noRegionRec + ' - [' + givenRegion + '].')
       }
+
+      // Log the new http host if appropriate
       if (this.debug) {
         this.log('%s [%s].', this.messages.newRegionRec, this.httpHost)
       }
+
+      // Retry the login with the new http host
       return await this.login()
     } else {
       if (body.data.at) {
@@ -238,7 +162,7 @@ module.exports = class connectionHTTP {
       // Check to see if it's a eWeLink server problem and we can retry
       if (err.code && this.consts.httpRetryCodes.includes(err.code)) {
         // Retry if another attempt could be successful
-        this.log.warn('%s (%s - 2).', this.messages.httpRetry, err.code)
+        this.log.warn('%s (%s - 1).', this.messages.httpRetry, err.code)
         await this.funcs.sleep(30000)
         return await this.getDevices()
       } else {
@@ -284,7 +208,7 @@ module.exports = class connectionHTTP {
     } catch (err) {
       if (err.code && this.consts.httpRetryCodes.includes(err.code)) {
         // Retry if another attempt could be successful
-        this.log.warn('%s (%s - 3).', this.messages.httpRetry, err.code)
+        this.log.warn('%s (%s - 2).', this.messages.httpRetry, err.code)
         await this.funcs.sleep(30000)
         return await this.getDevice(deviceId)
       } else {
diff --git a/lib/connection/ws.js b/lib/connection/ws.js
index 00893c61..8ab1cd9b 100644
--- a/lib/connection/ws.js
+++ b/lib/connection/ws.js
@@ -65,7 +65,7 @@ module.exports = class connectionWS {
       // Check to see if it's a eWeLink server problem and we can retry
       if (err.code && this.consts.httpRetryCodes.includes(err.code)) {
         // Retry if another attempt could be successful
-        this.log.warn('%s (%s - 4).', this.messages.httpRetry, err.code)
+        this.log.warn('%s (%s - 3).', this.messages.httpRetry, err.code)
         await this.funcs.sleep(30000)
         return await this.getHost()
       } else {
diff --git a/lib/homebridge-ui/public/index.html b/lib/homebridge-ui/public/index.html
index 63adf941..46f8693e 100644
--- a/lib/homebridge-ui/public/index.html
+++ b/lib/homebridge-ui/public/index.html
@@ -3,7 +3,7 @@
 </p>
 <div id="pageIntro" class="text-center" style="display: none;">
   <p class="lead">Thank you for installing <strong>homebridge-ewelink</strong></p>
-  <p>You will need to enter your eWeLink username, password and country code on the next page</p>
+  <p>You will need to enter your eWeLink username and password on the next page</p>
   <button type="button" class="btn btn-primary" id="introContinue">Continue &rarr;</button>
 </div>
 <div id="menuWrapper" class="btn-group w-100 mb-0" role="group" aria-label="UI Menu" style="display: none;">
diff --git a/lib/index.js b/lib/index.js
index a5fff3df..cf48d247 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -21,7 +21,7 @@ class eWeLinkPlatform {
     // Begin plugin initialisation
     try {
       // Check the user has configured the plugin
-      if (!config || !config.username || !config.password || !config.countryCode) {
+      if (!config || !config.username || !config.password) {
         throw new Error(this.messages.missingCreds)
       }
 
@@ -56,7 +56,6 @@ class eWeLinkPlatform {
     } catch (err) {
       // Catch any errors during initialisation
       const hideErrLines = [
-        this.messages.missingCC,
         this.messages.missingCreds,
         this.messages.missingPW,
         this.messages.missingUN
@@ -154,14 +153,6 @@ class eWeLinkPlatform {
             logIgnore(key)
           }
           break
-        case 'countryCode': {
-          if (!val) {
-            throw new Error(this.messages.missingCC)
-          } else {
-            this.config.countryCode = this.funcs.parseCountryCode(val)
-          }
-          break
-        }
         case 'debug':
         case 'debugFakegato':
         case 'disableDeviceLogging':
@@ -423,6 +414,9 @@ class eWeLinkPlatform {
           }
           this.config.username = val.replace(/[\s]+/g, '')
           break
+        default:
+          logRemove(key)
+          break
       }
     }
   }
@@ -457,7 +451,6 @@ class eWeLinkPlatform {
 
       // Set up the HTTP client, get the user HTTP host, and login
       this.httpClient = new (require('./connection/http'))(this)
-      await this.httpClient.getHost()
       const authData = await this.httpClient.login()
 
       // Get a device list and add to the devicesInEW map
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 250da1e3..bfc177f1 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -5,7 +5,6 @@
 module.exports = {
   defaultConfig: {
     name: 'eWeLink',
-    countryCode: '',
     username: '',
     password: '',
     mode: 'auto',
diff --git a/lib/utils/functions.js b/lib/utils/functions.js
index 11b79e60..4dcc2ae8 100644
--- a/lib/utils/functions.js
+++ b/lib/utils/functions.js
@@ -24,9 +24,5 @@ module.exports = {
       }
     }
     return toReturn
-  },
-
-  parseCountryCode: code => {
-    return '+' + code.toString().replace(/[^0-9]+/g, '')
   }
 }
diff --git a/lib/utils/messages.js b/lib/utils/messages.js
index 0bcad33c..86516b09 100644
--- a/lib/utils/messages.js
+++ b/lib/utils/messages.js
@@ -34,7 +34,6 @@ module.exports = {
   disabling: 'Disabling plugin',
   eweError: 'An eWeLink error [500] occured, retrying in 30 seconds',
   foundWithIP: 'found locally with IP',
-  hostReceived: 'HTTP API host received',
   httpRetry: 'Unable to reach eWeLink, retrying in 30 seconds',
   identify: 'identify button pressed',
   initialised: 'initialised. Syncing with eWeLink',
@@ -43,20 +42,17 @@ module.exports = {
   lanNotSup: 'LAN mode is not supported for sending updates to this device',
   lanUnreachable: 'LAN mode unavailable as unreachable',
   lanUnsupported: 'LAN mode unavailable as not supported',
-  missingCC: 'eWeLink country code missing from configuration',
   missingCreds: 'eWeLink credentials missing from configuration',
   missingPW: 'eWeLink password missing from configuration',
   missingUN: 'eWeLink username missing from configuration',
   newRegionRec: 'New HTTP API host received',
   noAuthRec: 'No auth token received',
-  noRegion: 'Server did not respond with a region',
   noRegionRec: 'No valid region received',
   noWSHost: 'Server did not respond with a web socket host',
   recNew: 'receiving update for new device',
   repOffline: 'reported [offline]',
   repOnline: 'reported [online]',
   revertWS: 'reverting to web socket as',
-  sendGetHost: 'Sending HTTP getHost() request',
   sendLogin: 'Sending HTTP login() request',
   sonoffCamera: 'see the homebridge-ewelink wiki for details to enable the camera',
   stoppedLAN: 'LAN monitoring gracefully stopped',

From 340ac29ca7767d371c5160661fd66e36ab64c88e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 14 Mar 2021 17:44:58 +0000
Subject: [PATCH 1687/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 268c9ab9..bca9602a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,13 @@
 
 All notable changes to this homebridge-ewelink will be documented in this file.
 
+## BETA
+
+### Changes
+
+* Remove country code configuration option as the plugin can determine your region automatically
+* Log entries to highlight unnecessary top-level configuration options you may have set
+
 ## 5.4.0 (2021-03-14)
 
 ### Added

From 3d655b6923386844c8832138e47daee254a7401e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 14 Mar 2021 17:45:34 +0000
Subject: [PATCH 1688/3183] 5.4.1-0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d8332723..d72f8ed9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "5.4.0",
+  "version": "5.4.1-0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index f9509745..c16d1f53 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "5.4.0",
+  "version": "5.4.1-0",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 2f157756d433442e68886d994ded59a675532f03 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Sun, 14 Mar 2021 17:51:30 +0000
Subject: [PATCH 1689/3183] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 6b33cf5f..540fe424 100644
--- a/README.md
+++ b/README.md
@@ -34,11 +34,11 @@ Homebridge plugin to control eWeLink devices with original firmware
 
 ### Features
 * [Configuration](https://github.com/bwp91/homebridge-ewelink/wiki/Configuration)
+* [Connection Methods](https://github.com/bwp91/homebridge-ewelink/wiki/Connection-Methods)
 * [Supported Devices](https://github.com/bwp91/homebridge-ewelink/wiki/Supported-Devices)
 * [Multi Channel Devices](https://github.com/bwp91/homebridge-ewelink/wiki/Multi-Channel-Devices)
 * [RF Bridge Sensors](https://github.com/bwp91/homebridge-ewelink/wiki/RF-Bridge-Sensors)
 * [Accessory Simulations](https://github.com/bwp91/homebridge-ewelink/wiki/Accessory-Simulations)
-* [Connection Methods](https://github.com/bwp91/homebridge-ewelink/wiki/Connection-Methods)
 * [Beta Version](https://github.com/bwp91/homebridge-ewelink/wiki/Beta-Version)
 
 ### How-to Guides

From a198cbf17da42a6ae3fe9815a50221fee575e243 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 14 Mar 2021 17:52:38 +0000
Subject: [PATCH 1690/3183] match links with wiki

---
 lib/homebridge-ui/public/index.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/homebridge-ui/public/index.html b/lib/homebridge-ui/public/index.html
index 46f8693e..28117e95 100644
--- a/lib/homebridge-ui/public/index.html
+++ b/lib/homebridge-ui/public/index.html
@@ -78,11 +78,12 @@
   <h4>Features</h4>
   <ul>
     <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/Configuration" target="_blank">Configuration</a></li>
+    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/Connection-Methods" target="_blank">Connection Methods</a></li>
     <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/Supported-Devices" target="_blank">Supported Devices</a></li>
     <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/Multi-Channel-Devices" target="_blank">Multi Channel Devices</a></li>
     <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/RF-Bridge-Sensors" target="_blank">RF Bridge Sensors</a></li>
     <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/Accessory-Simulations" target="_blank">Accessory Simulations</a></li>
-    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/Connection-Methods" target="_blank">Connection Methods</a></li>
+    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/Beta-Version" target="_blank">Beta Version</a></li>
   </ul>
   <h4>How-to Guides</h4>
   <ul>

From c38f887c0b4989f12be6c5445c812f02a92a42c9 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 14 Mar 2021 17:53:57 +0000
Subject: [PATCH 1691/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bca9602a..629e2e38 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 * Remove country code configuration option as the plugin can determine your region automatically
 * Log entries to highlight unnecessary top-level configuration options you may have set
+* Updated links on plugin-ui to match github wiki
 
 ## 5.4.0 (2021-03-14)
 

From 11a6fd6bf77b6bc84045e066b497038f46402392 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 14 Mar 2021 18:00:42 +0000
Subject: [PATCH 1692/3183] 5.4.1-1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d72f8ed9..76992f54 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "5.4.1-0",
+  "version": "5.4.1-1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index c16d1f53..5d70b02f 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "5.4.1-0",
+  "version": "5.4.1-1",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 968de4b30dbe07cc12ab1ed74caf635fbfecef99 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 15 Mar 2021 07:49:09 +0000
Subject: [PATCH 1693/3183] update cache before update

---
 lib/device/sensor-ambient.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/device/sensor-ambient.js b/lib/device/sensor-ambient.js
index 74bba6c2..51b4ee44 100644
--- a/lib/device/sensor-ambient.js
+++ b/lib/device/sensor-ambient.js
@@ -94,8 +94,8 @@ module.exports = class deviceSensorAmbient {
       const params = {
         switch: value ? 'on' : 'off'
       }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
       this.cacheOnOff = value ? 'on' : 'off'
+      await this.platform.sendDeviceUpdate(this.accessory, params)
       if (!this.disableDeviceLogging) {
         this.log('[%s] current state [%s].', this.name, this.cacheOnOff)
       }

From c5ff7b6094966f7e0bb3543b25cbb49d3bed242d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 15 Mar 2021 10:37:07 +0000
Subject: [PATCH 1694/3183] show params for unsupported devices

---
 lib/index.js          | 9 +++++----
 lib/utils/messages.js | 3 +--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/index.js b/lib/index.js
index cf48d247..3c1aab23 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1025,8 +1025,9 @@ class eWeLinkPlatform {
               : this.consts.defaultValues.sensorTimeDifference
           } else {
             // 7 = doorbell?
-            const type = subDevice.type || '?'
-            this.log.warn('[%s] %s [%s].', device.name, this.messages.unsupDev, type)
+            this.log.warn('[%s] %s:', device.name, this.messages.devNotSupYet)
+            const params = JSON.stringify(device.params)
+            this.log.warn('[%s-%s] %s', device.extra.uiid, subDevice.type || '?', params)
             return
           }
 
@@ -1167,8 +1168,8 @@ class eWeLinkPlatform {
         /**************
         UNKNOWN DEVICES
         **************/
-        const uiid = device.extra.uiid || '?'
-        this.log.warn('[%s] %s [%s].', device.name, this.messages.devNotSupYet, uiid)
+        this.log.warn('[%s] %s:', device.name, this.messages.devNotSupYet)
+        this.log.warn('[%s] %s', device.extra.uiid || '?', JSON.stringify(device.params))
         return
         /*************/
       }
diff --git a/lib/utils/messages.js b/lib/utils/messages.js
index 86516b09..cb5f2ee9 100644
--- a/lib/utils/messages.js
+++ b/lib/utils/messages.js
@@ -27,7 +27,7 @@ module.exports = {
   devNotRf: 'could not be refreshed as',
   devNotRemove: 'could not be removed from Homebridge as',
   devNotSup: 'has not been added as it is not supported',
-  devNotSupYet: 'has not been added as it is not supported, please make a GitHub issue',
+  devNotSupYet: 'is not supported, please make a GitHub issue with the following info',
   devNotUpd: 'device update failed as',
   devRemove: 'has been removed from Homebridge',
   disabled: 'To change this, set disablePlugin to false',
@@ -58,7 +58,6 @@ module.exports = {
   stoppedLAN: 'LAN monitoring gracefully stopped',
   stoppedWS: 'Web socket gracefully closed',
   unreachable: 'it is unreachable',
-  unsupDev: 'has an unsupported device type',
   updRec: 'receiving update',
   updReq: 'requesting current status',
   updSend: 'sending update',

From f8878f3dea6a84fa453d2f4b123b94524718bcce Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 15 Mar 2021 10:37:57 +0000
Subject: [PATCH 1695/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 629e2e38..5986b596 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 * Remove country code configuration option as the plugin can determine your region automatically
 * Log entries to highlight unnecessary top-level configuration options you may have set
+* Automatically show useful info in logs for 'yet to implement' devices
 * Updated links on plugin-ui to match github wiki
 
 ## 5.4.0 (2021-03-14)

From 2467370ff31debef49a5b532b703c0c6fcc746e6 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 15 Mar 2021 12:22:46 +0000
Subject: [PATCH 1696/3183] add message for unsupported if mode:lan

---
 lib/index.js          | 6 ++++++
 lib/utils/messages.js | 1 +
 2 files changed, 7 insertions(+)

diff --git a/lib/index.js b/lib/index.js
index 3c1aab23..260539e8 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1206,6 +1206,12 @@ class eWeLinkPlatform {
       this.api.updatePlatformAccessories(PLUGIN.name, PLUGIN.alias, [accessory])
       this.devicesInHB.set(accessory.context.hbDeviceId, accessory)
       this.log('[%s] %s %s.', device.name, this.messages.devInit, str)
+      if (
+        this.config.mode === 'lan' &&
+        !this.consts.devices.lanOut.includes(device.extra.uiid)
+      ) {
+        this.log.warn('[%s] %s.', device.name, this.messages.devNoControl)
+      }
     } catch (err) {
       // Catch any errors during initialisation
       const eText = this.funcs.parseError(err)
diff --git a/lib/utils/messages.js b/lib/utils/messages.js
index cb5f2ee9..cc23f369 100644
--- a/lib/utils/messages.js
+++ b/lib/utils/messages.js
@@ -18,6 +18,7 @@ module.exports = {
   devInitOpts: 'initialising with options',
   devNewNotAdd: 'restart Homebridge to add new device, failed to add automatically as',
   devNoAPIKey: 'cannot retrieve device API key',
+  devNoControl: 'cannot be controlled as mode:lan is not compatible with this device',
   devNotAdd: 'could not be added to Homebridge as',
   devNotConf: 'could not be configured as',
   devNotFound: 'device not found in eWeLink',

From 500c16ad9ea130dbfd4700825ae7d22916d0c7d7 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 15 Mar 2021 12:33:00 +0000
Subject: [PATCH 1697/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5986b596..a081c68e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 * Remove country code configuration option as the plugin can determine your region automatically
 * Log entries to highlight unnecessary top-level configuration options you may have set
 * Automatically show useful info in logs for 'yet to implement' devices
+* Log entries will show for 'uncontrollable' devices if `mode:lan` on plugin startup
 * Updated links on plugin-ui to match github wiki
 
 ## 5.4.0 (2021-03-14)

From d61201da5ab7b69b9429ea102f3b649be6ed9992 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 15 Mar 2021 12:39:24 +0000
Subject: [PATCH 1698/3183] enabled lan for sonoff sv

---
 lib/utils/constants.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index bfc177f1..706eb22a 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -109,8 +109,8 @@ module.exports = {
   },
 
   devices: {
-    lanIn: [1, 2, 3, 4, 5, 6, 7, 8, 9, 15, 32, 44, 77, 78, 103, 104, 126],
-    lanOut: [1, 2, 3, 4, 5, 6, 7, 8, 9, 32, 44, 77, 78, 126],
+    lanIn: [1, 2, 3, 4, 5, 6, 7, 8, 9, 14, 15, 32, 44, 77, 78, 103, 104, 126],
+    lanOut: [1, 2, 3, 4, 5, 6, 7, 8, 9, 14, 32, 44, 77, 78, 126],
     singleSwitch: [1, 5, 6, 14, 24, 27],
     multiSwitch: [2, 3, 4, 7, 8, 9, 29, 30, 31, 41, 82, 83, 84, 126],
     singleSwitchOutlet: ['Sonoff Pow', 'S20', 'S26', 'S26R1', 'S55', 'S55R1'],
@@ -185,7 +185,7 @@ module.exports = {
     8: 3, // "SWITCH_3" (T1 3C, TX3C)
     9: 4, // "SWITCH_4"
     11: 1, // "CURTAIN" (King Q4 Cover)
-    14: 1, // "SWITCH_CHANGE"
+    14: 1, // "SWITCH_CHANGE" (Sonoff SV)
     15: 1, // "THERMOSTAT" (TH10, TH16)
     18: 1, // "SENSORS_CENTER" (Sonoff SC)
     19: 1, // "HUMIDIFIER"

From 7e71c551228f916a5719883dd6699b3870330820 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 15 Mar 2021 12:40:52 +0000
Subject: [PATCH 1699/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a081c68e..f571d380 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,12 +4,16 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 ## BETA
 
+### Added
+
+* Enable LAN control for the Sonoff SV
+* Log entries will show for 'uncontrollable' devices if `mode:lan` on plugin startup
+* Log entries to highlight unnecessary top-level configuration options you may have set
+
 ### Changes
 
 * Remove country code configuration option as the plugin can determine your region automatically
-* Log entries to highlight unnecessary top-level configuration options you may have set
 * Automatically show useful info in logs for 'yet to implement' devices
-* Log entries will show for 'uncontrollable' devices if `mode:lan` on plugin startup
 * Updated links on plugin-ui to match github wiki
 
 ## 5.4.0 (2021-03-14)

From 169ba12d9d83c197df403215ca14649321c01199 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 15 Mar 2021 12:41:18 +0000
Subject: [PATCH 1700/3183] 5.4.1-2

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 76992f54..b03cd89c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "5.4.1-1",
+  "version": "5.4.1-2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 5d70b02f..1f34494a 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "5.4.1-1",
+  "version": "5.4.1-2",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 83b8f34693be94e44eb5009307b224e61ac571dd Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 15 Mar 2021 12:46:54 +0000
Subject: [PATCH 1701/3183] always show reason for fail

---
 lib/index.js | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/lib/index.js b/lib/index.js
index 260539e8..485de314 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1389,11 +1389,7 @@ class eWeLinkPlatform {
           await this.wsClient.sendUpdate(payload)
         } else {
         // Device isn't online via WS so report the error back
-          let eText = this.messages.unreachable
-          if (![this.messages.lanDisabled, this.messages.lanNotSup].includes(res)) {
-            eText += ' [' + res + ']'
-          }
-          throw new Error(eText)
+          throw new Error(this.messages.unreachable + ' [' + res + ']')
         }
       }
     })

From 0d515fda3853e336a917dd8ba0570b9667efb622 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 15 Mar 2021 13:33:01 +0000
Subject: [PATCH 1702/3183] [test] dw2 lan notifications?

---
 lib/utils/constants.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 706eb22a..149a226d 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -109,7 +109,7 @@ module.exports = {
   },
 
   devices: {
-    lanIn: [1, 2, 3, 4, 5, 6, 7, 8, 9, 14, 15, 32, 44, 77, 78, 103, 104, 126],
+    lanIn: [1, 2, 3, 4, 5, 6, 7, 8, 9, 14, 15, 32, 44, 77, 78, 102, 103, 104, 126],
     lanOut: [1, 2, 3, 4, 5, 6, 7, 8, 9, 14, 32, 44, 77, 78, 126],
     singleSwitch: [1, 5, 6, 14, 24, 27],
     multiSwitch: [2, 3, 4, 7, 8, 9, 29, 30, 31, 41, 82, 83, 84, 126],

From 5b9cc27dcc1983fa92e552128b627dfbdef7d683 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 15 Mar 2021 13:33:29 +0000
Subject: [PATCH 1703/3183] 5.4.1-3

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b03cd89c..f28e2ae5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "5.4.1-2",
+  "version": "5.4.1-3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 1f34494a..3fa0a3ea 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "5.4.1-2",
+  "version": "5.4.1-3",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From f9d9a8808e8dc216a692297ca6cc44c2c2e9216b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 15 Mar 2021 15:34:17 +0000
Subject: [PATCH 1704/3183] amend error message

---
 lib/index.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/index.js b/lib/index.js
index 485de314..3488e9e1 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1389,7 +1389,10 @@ class eWeLinkPlatform {
           await this.wsClient.sendUpdate(payload)
         } else {
         // Device isn't online via WS so report the error back
-          throw new Error(this.messages.unreachable + ' [' + res + ']')
+          const eText = [this.messages.lanDisabled, this.messages.lanNotSup].includes(res)
+            ? res
+            : this.messages.unreachable + ' [' + res + ']'
+          throw new Error(eText)
         }
       }
     })

From 869ab5370096c0a088a42ddb2dcc499a869b6515 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 15 Mar 2021 15:36:56 +0000
Subject: [PATCH 1705/3183] revert dw2 lan

---
 lib/utils/constants.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 149a226d..706eb22a 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -109,7 +109,7 @@ module.exports = {
   },
 
   devices: {
-    lanIn: [1, 2, 3, 4, 5, 6, 7, 8, 9, 14, 15, 32, 44, 77, 78, 102, 103, 104, 126],
+    lanIn: [1, 2, 3, 4, 5, 6, 7, 8, 9, 14, 15, 32, 44, 77, 78, 103, 104, 126],
     lanOut: [1, 2, 3, 4, 5, 6, 7, 8, 9, 14, 32, 44, 77, 78, 126],
     singleSwitch: [1, 5, 6, 14, 24, 27],
     multiSwitch: [2, 3, 4, 7, 8, 9, 29, 30, 31, 41, 82, 83, 84, 126],

From 821309ede9553efc0cc2acdadd4e85d54efe1129 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 15 Mar 2021 15:44:41 +0000
Subject: [PATCH 1706/3183] 5.4.1-4

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index f28e2ae5..e3ead495 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "5.4.1-3",
+  "version": "5.4.1-4",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 3fa0a3ea..e4cca537 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "5.4.1-3",
+  "version": "5.4.1-4",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 7266118bd059a311881e048bcfb8edf6f7595305 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 16 Mar 2021 08:25:52 +0000
Subject: [PATCH 1707/3183] consistent log formats

---
 lib/connection/ws.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/connection/ws.js b/lib/connection/ws.js
index 8ab1cd9b..f2a97d94 100644
--- a/lib/connection/ws.js
+++ b/lib/connection/ws.js
@@ -267,7 +267,7 @@ module.exports = class connectionWS {
 
       // Log that the web socket has closed if appropriate
       if (this.debug) {
-        this.log.warn('%s, %s.', this.messages.wsReconnect, e)
+        this.log.warn('%s [%s].', this.messages.wsReconnect, e)
       }
 
       // Wait for 5 seconds and try to re-establish the web socket connection
@@ -291,7 +291,7 @@ module.exports = class connectionWS {
 
       // Log that the web socket has closed if appropriate
       if (this.debug) {
-        this.log.warn('%s, %s.', this.messages.wsReconnect, e)
+        this.log.warn('%s [%s].', this.messages.wsReconnect, e)
       }
 
       // Wait for 5 seconds and try to re-establish the web socket connection

From 9b52365198054e7efa70d21df173d1a086714d19 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 16 Mar 2021 08:26:18 +0000
Subject: [PATCH 1708/3183] logging and api save on status change

---
 lib/index.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/lib/index.js b/lib/index.js
index 3488e9e1..af99fbc4 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1367,7 +1367,7 @@ class eWeLinkPlatform {
         params
       }
 
-      // Quick check to see if LAN mode is supported
+      // Check if we can send via LAN otherwise send via WS
       const res = useWS
         ? this.messages.wsRequired
         : !this.lanClient
@@ -1378,7 +1378,7 @@ class eWeLinkPlatform {
 
       // Revert to WS if LAN mode not possible for whatever reason
       if (res !== 'ok') {
-      // Check to see if the device is online
+        // Check to see if the device is online
         if (this.wsClient && accessory.context.reachableWAN) {
         // Log the revert if appropriate
           if (this.config.debug) {
@@ -1388,7 +1388,7 @@ class eWeLinkPlatform {
           // Device is online via WS so send the update
           await this.wsClient.sendUpdate(payload)
         } else {
-        // Device isn't online via WS so report the error back
+          // Device isn't online via WS so report the error back
           const eText = [this.messages.lanDisabled, this.messages.lanNotSup].includes(res)
             ? res
             : this.messages.unreachable + ' [' + res + ']'
@@ -1416,6 +1416,7 @@ class eWeLinkPlatform {
         // The update is from WS so update the WS online/offline status
         if (device.params.online !== accessory.context.reachableWAN) {
           accessory.context.reachableWAN = device.params.online
+          this.api.updatePlatformAccessories(PLUGIN.name, PLUGIN.alias, [accessory])
           this.devicesInHB.set(accessory.context.hbDeviceId, accessory)
 
           // Flag this true to update the sub accessories later
@@ -1440,6 +1441,7 @@ class eWeLinkPlatform {
       if (device.params.updateSource === 'LAN' && !accessory.context.reachableLAN) {
         // The update is from LAN so it must be online
         accessory.context.reachableLAN = true
+        this.api.updatePlatformAccessories(PLUGIN.name, PLUGIN.alias, [accessory])
         this.devicesInHB.set(accessory.context.hbDeviceId, accessory)
 
         // Flag this true to update the sub accessories later
@@ -1476,6 +1478,7 @@ class eWeLinkPlatform {
             }
 
             // Save the sub accessory updates to the platform
+            this.api.updatePlatformAccessories(PLUGIN.name, PLUGIN.alias, [oAccessory])
             this.devicesInHB.set(oAccessory.context.hbDeviceId, oAccessory)
           }
         }

From 4c91ae9a452012a18f0e742fb114106c1fa1babd Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 16 Mar 2021 09:22:34 +0000
Subject: [PATCH 1709/3183] add warning about changes

---
 config.schema.json | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/config.schema.json b/config.schema.json
index 385081cf..c11397d0 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -801,7 +801,11 @@
           "bridgeSensors[].type",
           "bridgeSensors[].sensorTimeLength",
           "bridgeSensors[].sensorTimeDifference",
-          "bridgeSensors[].overrideDisabledLogging"
+          "bridgeSensors[].overrideDisabledLogging",
+          {
+            "type": "help",
+            "helpvalue": "<label class=\"control-label text-warning\">⚠ Any changes you make to a sensor will reset its connected RF Bridge, resetting all its devices' HomeKit names, room associations and automations.</label>"
+          }
         ]
       }]
     },

From 2b368ecd0cf48edc88e2638b0809cf9d309a7f41 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 16 Mar 2021 09:23:15 +0000
Subject: [PATCH 1710/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f571d380..0dc1a4a3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 * Enable LAN control for the Sonoff SV
 * Log entries will show for 'uncontrollable' devices if `mode:lan` on plugin startup
 * Log entries to highlight unnecessary top-level configuration options you may have set
+* Added a note in the plugin settings about changing RF bridge sensors and its consequences
 
 ### Changes
 

From 4d958f2f229ba3751dadd4087bbabd80865ffd19 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 16 Mar 2021 10:59:03 +0000
Subject: [PATCH 1711/3183] extract eve chars to separate file

---
 lib/device/outlet.js                   | 100 +++--------------
 lib/device/rf-bridge.js                |  20 +---
 lib/device/sensor-contact.js           | 116 ++++----------------
 lib/device/simulation/garage-eachen.js | 118 ++++----------------
 lib/device/simulation/garage-one.js    | 115 +++-----------------
 lib/device/simulation/sensor-leak.js   |  28 ++---
 lib/device/zigbee/sensor-contact.js    | 108 +++---------------
 lib/device/zigbee/sensor-motion.js     |  24 +---
 lib/index.js                           |   1 +
 lib/utils/constants.js                 |  12 --
 lib/utils/eve-chars.js                 | 145 +++++++++++++++++++++++++
 11 files changed, 250 insertions(+), 537 deletions(-)
 create mode 100644 lib/utils/eve-chars.js

diff --git a/lib/device/outlet.js b/lib/device/outlet.js
index f06a4d49..aab76d21 100644
--- a/lib/device/outlet.js
+++ b/lib/device/outlet.js
@@ -10,6 +10,7 @@ module.exports = class deviceOutlet {
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
+    this.eveChar = platform.eveChar
     this.log = platform.log
     this.messages = platform.messages
     this.platform = platform
@@ -31,80 +32,6 @@ module.exports = class deviceOutlet {
       ? false
       : platform.config.disableDeviceLogging
 
-    // Set up the custom Eve characteristics for this device type
-    this.inherits = require('util').inherits
-    const self = this
-    this.eveCurrentConsumption = function () {
-      self.hapChar.call(this, 'Current Consumption', self.consts.eve.currentConsumption)
-      this.setProps({
-        format: self.hapChar.Formats.UINT16,
-        unit: 'W',
-        maxValue: 100000,
-        minValue: 0,
-        minStep: 1,
-        perms: [self.hapChar.Perms.READ, self.hapChar.Perms.NOTIFY]
-      })
-      this.value = this.getDefaultValue()
-    }
-    this.eveTotalConsumption = function () {
-      self.hapChar.call(this, 'Total Consumption', self.consts.eve.totalConsumption)
-      this.setProps({
-        format: self.hapChar.Formats.FLOAT,
-        unit: 'kWh',
-        maxValue: 100000000000,
-        minValue: 0,
-        minStep: 0.01,
-        perms: [self.hapChar.Perms.READ, self.hapChar.Perms.NOTIFY]
-      })
-      this.value = this.getDefaultValue()
-    }
-    this.eveVoltage = function () {
-      self.hapChar.call(this, 'Voltage', self.consts.eve.voltage)
-      this.setProps({
-        format: self.hapChar.Formats.FLOAT,
-        unit: 'V',
-        maxValue: 100000000000,
-        minValue: 0,
-        minStep: 1,
-        perms: [self.hapChar.Perms.READ, self.hapChar.Perms.NOTIFY]
-      })
-      this.value = this.getDefaultValue()
-    }
-    this.eveElectricCurrent = function () {
-      self.hapChar.call(this, 'Electric Current', self.consts.eve.electricCurrent)
-      this.setProps({
-        format: self.hapChar.Formats.FLOAT,
-        unit: 'A',
-        maxValue: 100000000000,
-        minValue: 0,
-        minStep: 0.1,
-        perms: [self.hapChar.Perms.READ, self.hapChar.Perms.NOTIFY]
-      })
-      this.value = this.getDefaultValue()
-    }
-    this.eveResetTotal = function () {
-      self.hapChar.call(this, 'Reset Total', self.consts.eve.resetTotal)
-      this.setProps({
-        format: self.hapChar.Formats.UINT32,
-        perms: [
-          self.hapChar.Perms.READ,
-          self.hapChar.Perms.NOTIFY,
-          self.hapChar.Perms.WRITE
-        ]
-      })
-      this.value = this.getDefaultValue()
-    }
-    this.inherits(this.eveCurrentConsumption, this.hapChar)
-    this.inherits(this.eveTotalConsumption, this.hapChar)
-    this.inherits(this.eveVoltage, this.hapChar)
-    this.inherits(this.eveElectricCurrent, this.hapChar)
-    this.inherits(this.eveResetTotal, this.hapChar)
-    this.eveCurrentConsumption.UUID = this.consts.eve.currentConsumption
-    this.eveTotalConsumption.UUID = this.consts.eve.totalConsumption
-    this.eveVoltage.UUID = this.consts.eve.voltage
-    this.eveElectricCurrent.UUID = this.consts.eve.electricCurrent
-    this.eveResetTotal.UUID = this.consts.eve.resetTotal
-
     // TotalConsumption is calculated by the plugin with these context readings
     if (!this.funcs.hasProperty(this.accessory.context, 'energyReadings')) {
       this.accessory.context.energyReadings = []
@@ -121,11 +48,11 @@ module.exports = class deviceOutlet {
     // Add the outlet service if it doesn't already exist
     if (!(this.service = this.accessory.getService(this.hapServ.Outlet))) {
       this.service = this.accessory.addService(this.hapServ.Outlet)
-      this.service.addCharacteristic(this.eveVoltage)
-      this.service.addCharacteristic(this.eveCurrentConsumption)
-      this.service.addCharacteristic(this.eveElectricCurrent)
-      this.service.addCharacteristic(this.eveTotalConsumption)
-      this.service.addCharacteristic(this.eveResetTotal)
+      this.service.addCharacteristic(this.eveChar.Voltage)
+      this.service.addCharacteristic(this.eveChar.CurrentConsumption)
+      this.service.addCharacteristic(this.eveChar.ElectricCurrent)
+      this.service.addCharacteristic(this.eveChar.TotalConsumption)
+      this.service.addCharacteristic(this.eveChar.ResetTotal)
     }
 
     // Add the set handler to the outlet on/off characteristic
@@ -133,12 +60,12 @@ module.exports = class deviceOutlet {
       .on('set', this.internalUpdate.bind(this))
 
     // Add the set handler to the outlet eve reset total energy characteristic
-    this.service.getCharacteristic(this.eveResetTotal)
+    this.service.getCharacteristic(this.eveChar.ResetTotal)
       .on('set', (value, callback) => {
         callback()
         this.accessory.context.energyReadings = []
         this.accessory.context.energyReadingTotal = 0
-        this.service.updateCharacteristic(this.eveTotalConsumption, 0)
+        this.service.updateCharacteristic(this.eveChar.TotalConsumption, 0)
       })
 
     // Pass the accessory to Fakegato to set up with Eve
@@ -176,7 +103,7 @@ module.exports = class deviceOutlet {
 
       // Update Eve with the new grand total
       this.service.updateCharacteristic(
-        this.eveTotalConsumption,
+        this.eveChar.TotalConsumption,
         this.accessory.context.energyReadingTotal
       )
     }, 300000)
@@ -254,7 +181,7 @@ module.exports = class deviceOutlet {
           parseFloat(params.power) > this.inUsePowerThreshold
         )
         this.service.updateCharacteristic(
-          this.eveCurrentConsumption,
+          this.eveChar.CurrentConsumption,
           parseFloat(params.power)
         )
         const isOn = this.accessory.getService(this.hapServ.Outlet)
@@ -264,12 +191,15 @@ module.exports = class deviceOutlet {
         logger = true
       }
       if (this.funcs.hasProperty(params, 'voltage')) {
-        this.service.updateCharacteristic(this.eveVoltage, parseFloat(params.voltage))
+        this.service.updateCharacteristic(
+          this.eveChar.Voltage,
+          parseFloat(params.voltage)
+        )
         logger = true
       }
       if (this.funcs.hasProperty(params, 'current')) {
         this.service
-          .updateCharacteristic(this.eveElectricCurrent, parseFloat(params.current))
+          .updateCharacteristic(this.eveChar.ElectricCurrent, parseFloat(params.current))
         logger = true
       }
       if (params.updateSource && logger && !this.disableDeviceLogging) {
diff --git a/lib/device/rf-bridge.js b/lib/device/rf-bridge.js
index 8e0ab8a8..225ab4f8 100644
--- a/lib/device/rf-bridge.js
+++ b/lib/device/rf-bridge.js
@@ -10,6 +10,7 @@ module.exports = class deviceRFBridge {
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
+    this.eveChar = platform.eveChar
     this.log = platform.log
     this.messages = platform.messages
     this.platform = platform
@@ -18,21 +19,6 @@ module.exports = class deviceRFBridge {
     this.name = accessory.displayName
     this.accessory = accessory
 
-    // Set up the custom Eve characteristics for this device type
-    this.inherits = require('util').inherits
-    const self = this
-    this.eveLastActivation = function () {
-      self.hapChar.call(this, 'Last Activation', self.consts.eve.lastActivation)
-      this.setProps({
-        format: self.hapChar.Formats.UINT32,
-        unit: self.hapChar.Units.SECONDS,
-        perms: [self.hapChar.Perms.READ, self.hapChar.Perms.NOTIFY]
-      })
-      this.value = this.getDefaultValue()
-    }
-    this.inherits(this.eveLastActivation, this.hapChar)
-    this.eveLastActivation.UUID = this.consts.eve.lastActivation
-
     // There are two types of RF sub types [curtains, buttons] and [sensors]
     if (['curtain', 'button'].includes(this.accessory.context.subType)) {
       // This instance is a remote control with buttons or curtain control
@@ -208,7 +194,7 @@ module.exports = class deviceRFBridge {
                     char = this.hapChar.ContactSensorState
                     const initialTime = oAccessory.eveService.getInitialTime()
                     oAccessory.getService(serv).updateCharacteristic(
-                      this.eveLastActivation,
+                      this.eveChar.LastActivation,
                       Math.round(new Date().valueOf() / 1000) - initialTime
                     )
                     break
@@ -222,7 +208,7 @@ module.exports = class deviceRFBridge {
                     char = this.hapChar.MotionDetected
                     const initialTime = oAccessory.eveService.getInitialTime()
                     oAccessory.getService(serv).updateCharacteristic(
-                      this.eveLastActivation,
+                      this.eveChar.LastActivation,
                       Math.round(new Date().valueOf() / 1000) - initialTime
                     )
                     break
diff --git a/lib/device/sensor-contact.js b/lib/device/sensor-contact.js
index f8b3efc3..78d187bc 100644
--- a/lib/device/sensor-contact.js
+++ b/lib/device/sensor-contact.js
@@ -10,6 +10,7 @@ module.exports = class deviceSensorContact {
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
+    this.eveChar = platform.eveChar
     this.log = platform.log
     this.messages = platform.messages
     this.platform = platform
@@ -28,107 +29,30 @@ module.exports = class deviceSensorContact {
       ? false
       : platform.config.disableDeviceLogging
 
-    // Set up the custom Eve characteristics for this device type
-    this.inherits = require('util').inherits
-    const self = this
-    this.eveLastActivation = function () {
-      self.hapChar.call(this, 'Last Activation', self.consts.eve.lastActivation)
-      this.setProps({
-        format: self.hapChar.Formats.UINT32,
-        unit: self.hapChar.Units.SECONDS,
-        perms: [self.hapChar.Perms.READ, self.hapChar.Perms.NOTIFY]
-      })
-      this.value = this.getDefaultValue()
-    }
-    this.eveResetTotal = function () {
-      self.hapChar.call(this, 'Reset Total', self.consts.eve.resetTotal)
-      this.setProps({
-        format: self.hapChar.Formats.UINT32,
-        unit: self.hapChar.Units.seconds,
-        perms: [
-          self.hapChar.Perms.READ,
-          self.hapChar.Perms.NOTIFY,
-          self.hapChar.Perms.WRITE
-        ]
-      })
-      this.value = this.getDefaultValue()
-    }
-    this.eveOpenDuration = function () {
-      self.hapChar.call(this, 'Open Duration', self.consts.eve.openDuration)
-      this.setProps({
-        format: self.hapChar.Formats.UINT32,
-        unit: self.hapChar.Units.SECONDS,
-        perms: [
-          self.hapChar.Perms.READ,
-          self.hapChar.Perms.NOTIFY,
-          self.hapChar.Perms.WRITE
-        ]
-      })
-      this.value = this.getDefaultValue()
-    }
-    this.eveClosedDuration = function () {
-      self.hapChar.call(this, 'Closed Duration', self.consts.eve.closedDuration)
-      this.setProps({
-        format: self.hapChar.Formats.UINT32,
-        unit: self.hapChar.Units.SECONDS,
-        perms: [
-          self.hapChar.Perms.READ,
-          self.hapChar.Perms.NOTIFY,
-          self.hapChar.Perms.WRITE
-        ]
-      })
-      this.value = this.getDefaultValue()
-    }
-    this.eveTimesOpened = function () {
-      self.hapChar.call(this, 'Times Opened', self.consts.eve.timesOpened)
-      this.setProps({
-        format: self.hapChar.Formats.UINT32,
-        perms: [self.hapChar.Perms.READ, self.hapChar.Perms.NOTIFY]
-      })
-      this.value = this.getDefaultValue()
-    }
-    this.inherits(this.eveLastActivation, this.hapChar)
-    this.inherits(this.eveResetTotal, this.hapChar)
-    this.inherits(this.eveOpenDuration, this.hapChar)
-    this.inherits(this.eveClosedDuration, this.hapChar)
-    this.inherits(this.eveTimesOpened, this.hapChar)
-    this.eveLastActivation.UUID = this.consts.eve.lastActivation
-    this.eveResetTotal.UUID = this.consts.eve.resetTotal
-    this.eveOpenDuration.UUID = this.consts.eve.openDuration
-    this.eveClosedDuration.UUID = this.consts.eve.closedDuration
-    this.eveTimesOpened.UUID = this.consts.eve.timesOpened
-
     // If the accessory has a leak sensor service then remove it
     if (this.accessory.getService(this.hapServ.LeakSensor)) {
       this.accessory.removeService(this.accessory.getService(this.hapServ.LeakSensor))
     }
 
     // Add the contact sensor service if it doesn't already exist
-    this.contactService = this.accessory.getService(this.hapServ.ContactSensor) ||
-      this.accessory.addService(this.hapServ.ContactSensor)
-
-    // Add the Eve characteristics if they don't already exist
-    if (!this.contactService.testCharacteristic(this.eveLastActivation)) {
-      this.contactService.addCharacteristic(this.eveLastActivation)
-    }
-    if (!this.contactService.testCharacteristic(this.eveResetTotal)) {
-      this.contactService.addCharacteristic(this.eveResetTotal)
-    }
-    if (!this.contactService.testCharacteristic(this.eveOpenDuration)) {
-      this.contactService.addCharacteristic(this.eveOpenDuration)
+    if (!(this.service = this.accessory.getService(this.hapServ.ContactSensor))) {
+      this.service = this.accessory.addService(this.hapServ.ContactSensor)
+      this.service.addCharacteristic(this.eveChar.LastActivation)
+      this.service.addCharacteristic(this.eveChar.ResetTotal)
+      this.service.addCharacteristic(this.eveChar.OpenDuration)
+      this.service.addCharacteristic(this.eveChar.ClosedDuration)
+      this.service.addCharacteristic(this.eveChar.TimesOpened)
     }
-    if (!this.contactService.testCharacteristic(this.eveClosedDuration)) {
-      this.contactService.addCharacteristic(this.eveClosedDuration)
-    }
-    if (!this.contactService.testCharacteristic(this.eveTimesOpened)) {
-      this.contactService.addCharacteristic(this.eveTimesOpened)
-    }
-    this.timesOpened = this.contactService.getCharacteristic(this.eveTimesOpened).value
-    this.contactService.getCharacteristic(this.eveResetTotal)
+
+    // Obtain the current times opened value
+    this.timesOpened = this.service.getCharacteristic(this.eveChar.TimesOpened).value
+
+    // Add the set handler to the contact sensor reset total characteristic
+    this.service.getCharacteristic(this.eveChar.ResetTotal)
       .on('set', (value, callback) => {
         callback()
         this.timesOpened = 0
-        this.contactService.updateCharacteristic(this.eveTimesOpened, 0)
+        this.service.updateCharacteristic(this.eveChar.TimesOpened, 0)
       })
 
     // Add the battery service if it doesn't already exist
@@ -173,17 +97,17 @@ module.exports = class deviceSensorContact {
       this.cacheOnOff = params.switch
       const newState = params.switch === 'on' ? 1 : 0
       if (newState === 1) {
-        this.contactService.updateCharacteristic(this.hapChar.ContactSensorState, 1)
+        this.service.updateCharacteristic(this.hapChar.ContactSensorState, 1)
         this.accessory.eveService.addEntry({ status: 1 })
         const initialTime = this.accessory.eveService.getInitialTime()
-        this.contactService.updateCharacteristic(
-          this.eveLastActivation,
+        this.service.updateCharacteristic(
+          this.eveChar.LastActivation,
           Math.round(new Date().valueOf() / 1000) - initialTime
         )
         this.timesOpened++
-        this.contactService.updateCharacteristic(this.eveTimesOpened, this.timesOpened)
+        this.service.updateCharacteristic(this.eveChar.TimesOpened, this.timesOpened)
       } else {
-        this.contactService.updateCharacteristic(this.hapChar.ContactSensorState, 0)
+        this.service.updateCharacteristic(this.hapChar.ContactSensorState, 0)
         this.accessory.eveService.addEntry({ status: 0 })
       }
       if (params.updateSource && !this.disableDeviceLogging) {
diff --git a/lib/device/simulation/garage-eachen.js b/lib/device/simulation/garage-eachen.js
index d8c2ac32..122e8429 100644
--- a/lib/device/simulation/garage-eachen.js
+++ b/lib/device/simulation/garage-eachen.js
@@ -10,6 +10,7 @@ module.exports = class deviceGarageEachen {
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
+    this.eveChar = platform.eveChar
     this.log = platform.log
     this.messages = platform.messages
     this.platform = platform
@@ -27,76 +28,6 @@ module.exports = class deviceGarageEachen {
       ? false
       : platform.config.disableDeviceLogging
 
-    // Set up the custom Eve characteristics for this device type
-    this.inherits = require('util').inherits
-    const self = this
-    this.eveLastActivation = function () {
-      self.hapChar.call(this, 'Last Activation', self.consts.eve.lastActivation)
-      this.setProps({
-        format: self.hapChar.Formats.UINT32,
-        unit: self.hapChar.Units.SECONDS,
-        perms: [self.hapChar.Perms.READ, self.hapChar.Perms.NOTIFY]
-      })
-      this.value = this.getDefaultValue()
-    }
-    this.eveResetTotal = function () {
-      self.hapChar.call(this, 'Reset Total', self.consts.eve.resetTotal)
-      this.setProps({
-        format: self.hapChar.Formats.UINT32,
-        unit: self.hapChar.Units.seconds,
-        perms: [
-          self.hapChar.Perms.READ,
-          self.hapChar.Perms.NOTIFY,
-          self.hapChar.Perms.WRITE
-        ]
-      })
-      this.value = this.getDefaultValue()
-    }
-    this.eveOpenDuration = function () {
-      self.hapChar.call(this, 'Open Duration', self.consts.eve.openDuration)
-      this.setProps({
-        format: self.hapChar.Formats.UINT32,
-        unit: self.hapChar.Units.SECONDS,
-        perms: [
-          self.hapChar.Perms.READ,
-          self.hapChar.Perms.NOTIFY,
-          self.hapChar.Perms.WRITE
-        ]
-      })
-      this.value = this.getDefaultValue()
-    }
-    this.eveClosedDuration = function () {
-      self.hapChar.call(this, 'Closed Duration', self.consts.eve.closedDuration)
-      this.setProps({
-        format: self.hapChar.Formats.UINT32,
-        unit: self.hapChar.Units.SECONDS,
-        perms: [
-          self.hapChar.Perms.READ,
-          self.hapChar.Perms.NOTIFY,
-          self.hapChar.Perms.WRITE
-        ]
-      })
-      this.value = this.getDefaultValue()
-    }
-    this.eveTimesOpened = function () {
-      self.hapChar.call(this, 'Times Opened', self.consts.eve.timesOpened)
-      this.setProps({
-        format: self.hapChar.Formats.UINT32,
-        perms: [self.hapChar.Perms.READ, self.hapChar.Perms.NOTIFY]
-      })
-      this.value = this.getDefaultValue()
-    }
-    this.inherits(this.eveLastActivation, this.hapChar)
-    this.inherits(this.eveResetTotal, this.hapChar)
-    this.inherits(this.eveOpenDuration, this.hapChar)
-    this.inherits(this.eveClosedDuration, this.hapChar)
-    this.inherits(this.eveTimesOpened, this.hapChar)
-    this.eveLastActivation.UUID = this.consts.eve.lastActivation
-    this.eveResetTotal.UUID = this.consts.eve.resetTotal
-    this.eveOpenDuration.UUID = this.consts.eve.openDuration
-    this.eveClosedDuration.UUID = this.consts.eve.closedDuration
-    this.eveTimesOpened.UUID = this.consts.eve.timesOpened
-
     // If the accessory has a switch service then remove it
     if (this.accessory.getService(this.hapServ.Switch)) {
       this.accessory.removeService(this.accessory.getService(this.hapServ.Switch))
@@ -113,36 +44,25 @@ module.exports = class deviceGarageEachen {
     if (!(this.service = this.accessory.getService(this.hapServ.GarageDoorOpener))) {
       this.service = this.accessory.addService(this.hapServ.GarageDoorOpener)
       this.service.setCharacteristic(this.hapChar.CurrentDoorState, 1)
-        .setCharacteristic(this.hapChar.TargetDoorState, 1)
-        .setCharacteristic(this.hapChar.ObstructionDetected, false)
-    }
-
-    // Add the Eve characteristics if they don't already exist
-    if (!this.service.testCharacteristic(this.hapChar.ContactSensorState)) {
+      this.service.setCharacteristic(this.hapChar.TargetDoorState, 1)
+      this.service.setCharacteristic(this.hapChar.ObstructionDetected, false)
       this.service.addCharacteristic(this.hapChar.ContactSensorState)
+      this.service.addCharacteristic(this.eveChar.LastActivation)
+      this.service.addCharacteristic(this.eveChar.ResetTotal)
+      this.service.addCharacteristic(this.eveChar.OpenDuration)
+      this.service.addCharacteristic(this.eveChar.ClosedDuration)
+      this.service.addCharacteristic(this.eveChar.TimesOpened)
     }
-    if (!this.service.testCharacteristic(this.eveLastActivation)) {
-      this.service.addCharacteristic(this.eveLastActivation)
-    }
-    if (!this.service.testCharacteristic(this.eveResetTotal)) {
-      this.service.addCharacteristic(this.eveResetTotal)
-    }
-    if (!this.service.testCharacteristic(this.eveOpenDuration)) {
-      this.service.addCharacteristic(this.eveOpenDuration)
-    }
-    if (!this.service.testCharacteristic(this.eveClosedDuration)) {
-      this.service.addCharacteristic(this.eveClosedDuration)
-    }
-    if (!this.service.testCharacteristic(this.eveTimesOpened)) {
-      this.service.addCharacteristic(this.eveTimesOpened)
-    }
-    this.timesOpened = this.service.getCharacteristic(this.eveTimesOpened).value
-    this.service.getCharacteristic(this.eveResetTotal)
-      .removeAllListeners('set')
+
+    // Obtain the current times opened value
+    this.timesOpened = this.service.getCharacteristic(this.eveChar.TimesOpened).value
+
+    // Add the set handler to the garage door reset total characteristic
+    this.service.getCharacteristic(this.eveChar.ResetTotal)
       .on('set', (value, callback) => {
         callback()
         this.timesOpened = 0
-        this.service.updateCharacteristic(this.eveTimesOpened, 0)
+        this.service.updateCharacteristic(this.eveChar.TimesOpened, 0)
       })
 
     // Add the set handler to the target position characteristic
@@ -187,11 +107,11 @@ module.exports = class deviceGarageEachen {
         this.accessory.eveService.addEntry({ status: 0 })
         const initialTime = this.accessory.eveService.getInitialTime()
         this.service.updateCharacteristic(
-          this.eveLastActivation,
+          this.eveChar.LastActivation,
           Math.round(new Date().valueOf() / 1000) - initialTime
         )
         this.timesOpened++
-        this.service.updateCharacteristic(this.eveTimesOpened, this.timesOpened)
+        this.service.updateCharacteristic(this.eveChar.TimesOpened, this.timesOpened)
         await this.funcs.sleep(Math.max((this.operationTime - 20) * 100, 0))
         this.service.updateCharacteristic(this.hapChar.CurrentDoorState, 0)
         if (!this.disableDeviceLogging) {
@@ -222,12 +142,12 @@ module.exports = class deviceGarageEachen {
         this.accessory.eveService.addEntry({ status: 0 })
         const initialTime = this.accessory.eveService.getInitialTime()
         this.service.updateCharacteristic(
-          this.eveLastActivation,
+          this.eveChar.LastActivation,
           Math.round(new Date().valueOf() / 1000) - initialTime
         )
         this.timesOpened++
         this.service.updateCharacteristic(
-          this.eveTimesOpened,
+          this.eveChar.TimesOpened,
           this.timesOpened
         )
       } else {
diff --git a/lib/device/simulation/garage-one.js b/lib/device/simulation/garage-one.js
index 2d264bbd..abce733a 100644
--- a/lib/device/simulation/garage-one.js
+++ b/lib/device/simulation/garage-one.js
@@ -10,6 +10,7 @@ module.exports = class deviceGarageOne {
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
+    this.eveChar = platform.eveChar
     this.log = platform.log
     this.messages = platform.messages
     this.platform = platform
@@ -29,76 +30,6 @@ module.exports = class deviceGarageOne {
       ? false
       : platform.config.disableDeviceLogging
 
-    // Set up the custom Eve characteristics for this device type
-    this.inherits = require('util').inherits
-    const self = this
-    this.eveLastActivation = function () {
-      self.hapChar.call(this, 'Last Activation', self.consts.eve.lastActivation)
-      this.setProps({
-        format: self.hapChar.Formats.UINT32,
-        unit: self.hapChar.Units.SECONDS,
-        perms: [self.hapChar.Perms.READ, self.hapChar.Perms.NOTIFY]
-      })
-      this.value = this.getDefaultValue()
-    }
-    this.eveResetTotal = function () {
-      self.hapChar.call(this, 'Reset Total', self.consts.eve.resetTotal)
-      this.setProps({
-        format: self.hapChar.Formats.UINT32,
-        unit: self.hapChar.Units.seconds,
-        perms: [
-          self.hapChar.Perms.READ,
-          self.hapChar.Perms.NOTIFY,
-          self.hapChar.Perms.WRITE
-        ]
-      })
-      this.value = this.getDefaultValue()
-    }
-    this.eveOpenDuration = function () {
-      self.hapChar.call(this, 'Open Duration', self.consts.eve.openDuration)
-      this.setProps({
-        format: self.hapChar.Formats.UINT32,
-        unit: self.hapChar.Units.SECONDS,
-        perms: [
-          self.hapChar.Perms.READ,
-          self.hapChar.Perms.NOTIFY,
-          self.hapChar.Perms.WRITE
-        ]
-      })
-      this.value = this.getDefaultValue()
-    }
-    this.eveClosedDuration = function () {
-      self.hapChar.call(this, 'Closed Duration', self.consts.eve.closedDuration)
-      this.setProps({
-        format: self.hapChar.Formats.UINT32,
-        unit: self.hapChar.Units.SECONDS,
-        perms: [
-          self.hapChar.Perms.READ,
-          self.hapChar.Perms.NOTIFY,
-          self.hapChar.Perms.WRITE
-        ]
-      })
-      this.value = this.getDefaultValue()
-    }
-    this.eveTimesOpened = function () {
-      self.hapChar.call(this, 'Times Opened', self.consts.eve.timesOpened)
-      this.setProps({
-        format: self.hapChar.Formats.UINT32,
-        perms: [self.hapChar.Perms.READ, self.hapChar.Perms.NOTIFY]
-      })
-      this.value = this.getDefaultValue()
-    }
-    this.inherits(this.eveLastActivation, this.hapChar)
-    this.inherits(this.eveResetTotal, this.hapChar)
-    this.inherits(this.eveOpenDuration, this.hapChar)
-    this.inherits(this.eveClosedDuration, this.hapChar)
-    this.inherits(this.eveTimesOpened, this.hapChar)
-    this.eveLastActivation.UUID = this.consts.eve.lastActivation
-    this.eveResetTotal.UUID = this.consts.eve.resetTotal
-    this.eveOpenDuration.UUID = this.consts.eve.openDuration
-    this.eveClosedDuration.UUID = this.consts.eve.closedDuration
-    this.eveTimesOpened.UUID = this.consts.eve.timesOpened
-
     // Set up the accessory with default positions when added the first time
     if (!this.funcs.hasProperty(this.accessory.context, 'cacheCurrentDoorState')) {
       this.accessory.context.cacheCurrentDoorState = 1
@@ -143,39 +74,27 @@ module.exports = class deviceGarageOne {
 
     // Add the garage door service if it doesn't already exist
     if (!(this.service = this.accessory.getService(this.hapServ.GarageDoorOpener))) {
-      this.accessory.addService(this.hapServ.GarageDoorOpener)
-        .setCharacteristic(this.hapChar.CurrentDoorState, 1)
-        .setCharacteristic(this.hapChar.TargetDoorState, 1)
-        .setCharacteristic(this.hapChar.ObstructionDetected, false)
-      this.service = this.accessory.getService(this.hapServ.GarageDoorOpener)
-    }
-
-    // Add the Eve characteristics if they don't already exist
-    if (!this.service.testCharacteristic(this.hapChar.ContactSensorState)) {
+      this.service = this.accessory.addService(this.hapServ.GarageDoorOpener)
+      this.service.setCharacteristic(this.hapChar.CurrentDoorState, 1)
+      this.service.setCharacteristic(this.hapChar.TargetDoorState, 1)
+      this.service.setCharacteristic(this.hapChar.ObstructionDetected, false)
       this.service.addCharacteristic(this.hapChar.ContactSensorState)
+      this.service.addCharacteristic(this.eveChar.LastActivation)
+      this.service.addCharacteristic(this.eveChar.ResetTotal)
+      this.service.addCharacteristic(this.eveChar.OpenDuration)
+      this.service.addCharacteristic(this.eveChar.ClosedDuration)
+      this.service.addCharacteristic(this.eveChar.TimesOpened)
     }
-    if (!this.service.testCharacteristic(this.eveLastActivation)) {
-      this.service.addCharacteristic(this.eveLastActivation)
-    }
-    if (!this.service.testCharacteristic(this.eveResetTotal)) {
-      this.service.addCharacteristic(this.eveResetTotal)
-    }
-    if (!this.service.testCharacteristic(this.eveOpenDuration)) {
-      this.service.addCharacteristic(this.eveOpenDuration)
-    }
-    if (!this.service.testCharacteristic(this.eveClosedDuration)) {
-      this.service.addCharacteristic(this.eveClosedDuration)
-    }
-    if (!this.service.testCharacteristic(this.eveTimesOpened)) {
-      this.service.addCharacteristic(this.eveTimesOpened)
-    }
-    this.timesOpened = this.service.getCharacteristic(this.eveTimesOpened).value
-    this.service.getCharacteristic(this.eveResetTotal)
-      .removeAllListeners('set')
+
+    // Obtain the current times opened value
+    this.timesOpened = this.service.getCharacteristic(this.eveChar.TimesOpened).value
+
+    // Add the set handler to the garage door reset total characteristic
+    this.service.getCharacteristic(this.eveChar.ResetTotal)
       .on('set', (value, callback) => {
         callback()
         this.timesOpened = 0
-        this.service.updateCharacteristic(this.eveTimesOpened, 0)
+        this.service.updateCharacteristic(this.eveChar.TimesOpened, 0)
       })
 
     // Add the set handler to the target position characteristic
diff --git a/lib/device/simulation/sensor-leak.js b/lib/device/simulation/sensor-leak.js
index 26f30ce2..a0526c03 100644
--- a/lib/device/simulation/sensor-leak.js
+++ b/lib/device/simulation/sensor-leak.js
@@ -10,6 +10,7 @@ module.exports = class deviceSensorLeak {
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
+    this.eveChar = platform.eveChar
     this.log = platform.log
     this.messages = platform.messages
     this.platform = platform
@@ -30,29 +31,16 @@ module.exports = class deviceSensorLeak {
       ? false
       : platform.config.disableDeviceLogging
 
-    // Set up the custom Eve characteristics for this device type
-    this.inherits = require('util').inherits
-    const self = this
-    this.eveLastActivation = function () {
-      self.hapChar.call(this, 'Last Activation', self.consts.eve.lastActivation)
-      this.setProps({
-        format: self.hapChar.Formats.UINT32,
-        unit: self.hapChar.Units.SECONDS,
-        perms: [self.hapChar.Perms.READ, self.hapChar.Perms.NOTIFY]
-      })
-      this.value = this.getDefaultValue()
-    }
-    this.inherits(this.eveLastActivation, this.hapChar)
-    this.eveLastActivation.UUID = this.consts.eve.lastActivation
-
     // If the accessory has a contact sensor service then remove it
     if (this.accessory.getService(this.hapServ.ContactSensor)) {
       this.accessory.removeService(this.accessory.getService(this.hapServ.ContactSensor))
     }
 
     // Add the leak sensor service if it doesn't already exist
-    this.leakService = this.accessory.getService(this.hapServ.LeakSensor) ||
-      this.accessory.addService(this.hapServ.LeakSensor)
+    if (!(this.service = this.accessory.getService(this.hapServ.LeakSensor))) {
+      this.service = this.accessory.addService(this.hapServ.LeakSensor)
+      this.service.addCharacteristic(this.eveChar.LastActivation)
+    }
 
     // Add the battery service if it doesn't already exist
     this.batteryService = this.accessory.getService(this.hapServ.BatteryService) ||
@@ -98,12 +86,12 @@ module.exports = class deviceSensorLeak {
       }
       this.cacheOnOff = params.switch
       const newState = params.switch === 'on' ? 0 : 1
-      this.leakService.updateCharacteristic(this.hapChar.LeakDetected, newState)
+      this.service.updateCharacteristic(this.hapChar.LeakDetected, newState)
       this.accessory.eveService.addEntry({ status: newState })
       if (newState === 1) {
         const initialTime = this.accessory.eveService.getInitialTime()
-        this.leakService.updateCharacteristic(
-          this.eveLastActivation,
+        this.service.updateCharacteristic(
+          this.eveChar.LastActivation,
           Math.round(new Date().valueOf() / 1000) - initialTime
         )
       }
diff --git a/lib/device/zigbee/sensor-contact.js b/lib/device/zigbee/sensor-contact.js
index 7b915a40..b9e60cc7 100644
--- a/lib/device/zigbee/sensor-contact.js
+++ b/lib/device/zigbee/sensor-contact.js
@@ -10,6 +10,7 @@ module.exports = class deviceZBSensorContact {
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
+    this.eveChar = platform.eveChar
     this.log = platform.log
     this.messages = platform.messages
     this.platform = platform
@@ -29,102 +30,25 @@ module.exports = class deviceZBSensorContact {
       ? false
       : platform.config.disableDeviceLogging
 
-    // Set up the custom Eve characteristics for this device type
-    this.inherits = require('util').inherits
-    const self = this
-    this.eveLastActivation = function () {
-      self.hapChar.call(this, 'Last Activation', self.consts.eve.lastActivation)
-      this.setProps({
-        format: self.hapChar.Formats.UINT32,
-        unit: self.hapChar.Units.SECONDS,
-        perms: [self.hapChar.Perms.READ, self.hapChar.Perms.NOTIFY]
-      })
-      this.value = this.getDefaultValue()
-    }
-    this.eveResetTotal = function () {
-      self.hapChar.call(this, 'Reset Total', self.consts.eve.resetTotal)
-      this.setProps({
-        format: self.hapChar.Formats.UINT32,
-        unit: self.hapChar.Units.seconds,
-        perms: [
-          self.hapChar.Perms.READ,
-          self.hapChar.Perms.NOTIFY,
-          self.hapChar.Perms.WRITE
-        ]
-      })
-      this.value = this.getDefaultValue()
-    }
-    this.eveOpenDuration = function () {
-      self.hapChar.call(this, 'Open Duration', self.consts.eve.openDuration)
-      this.setProps({
-        format: self.hapChar.Formats.UINT32,
-        unit: self.hapChar.Units.SECONDS,
-        perms: [
-          self.hapChar.Perms.READ,
-          self.hapChar.Perms.NOTIFY,
-          self.hapChar.Perms.WRITE
-        ]
-      })
-      this.value = this.getDefaultValue()
-    }
-    this.eveClosedDuration = function () {
-      self.hapChar.call(this, 'Closed Duration', self.consts.eve.closedDuration)
-      this.setProps({
-        format: self.hapChar.Formats.UINT32,
-        unit: self.hapChar.Units.SECONDS,
-        perms: [
-          self.hapChar.Perms.READ,
-          self.hapChar.Perms.NOTIFY,
-          self.hapChar.Perms.WRITE
-        ]
-      })
-      this.value = this.getDefaultValue()
-    }
-    this.eveTimesOpened = function () {
-      self.hapChar.call(this, 'Times Opened', self.consts.eve.timesOpened)
-      this.setProps({
-        format: self.hapChar.Formats.UINT32,
-        perms: [self.hapChar.Perms.READ, self.hapChar.Perms.NOTIFY]
-      })
-      this.value = this.getDefaultValue()
+    // Add the contact sensor service if it doesn't already exist
+    if (!(this.service = this.accessory.getService(this.hapServ.ContactSensor))) {
+      this.service = this.accessory.addService(this.hapServ.ContactSensor)
+      this.service.addCharacteristic(this.eveChar.LastActivation)
+      this.service.addCharacteristic(this.eveChar.ResetTotal)
+      this.service.addCharacteristic(this.eveChar.OpenDuration)
+      this.service.addCharacteristic(this.eveChar.ClosedDuration)
+      this.service.addCharacteristic(this.eveChar.TimesOpened)
     }
-    this.inherits(this.eveLastActivation, this.hapChar)
-    this.inherits(this.eveResetTotal, this.hapChar)
-    this.inherits(this.eveOpenDuration, this.hapChar)
-    this.inherits(this.eveClosedDuration, this.hapChar)
-    this.inherits(this.eveTimesOpened, this.hapChar)
-    this.eveLastActivation.UUID = this.consts.eve.lastActivation
-    this.eveResetTotal.UUID = this.consts.eve.resetTotal
-    this.eveOpenDuration.UUID = this.consts.eve.openDuration
-    this.eveClosedDuration.UUID = this.consts.eve.closedDuration
-    this.eveTimesOpened.UUID = this.consts.eve.timesOpened
 
-    // Add the contact sensor service if it doesn't already exist
-    this.service = this.accessory.getService(this.hapServ.ContactSensor) ||
-      this.accessory.addService(this.hapServ.ContactSensor)
+    // Obtain the current times opened value
+    this.timesOpened = this.service.getCharacteristic(this.eveChar.TimesOpened).value
 
-    // Add the Eve characteristics if they don't already exist
-    if (!this.service.testCharacteristic(this.eveLastActivation)) {
-      this.service.addCharacteristic(this.eveLastActivation)
-    }
-    if (!this.service.testCharacteristic(this.eveResetTotal)) {
-      this.service.addCharacteristic(this.eveResetTotal)
-    }
-    if (!this.service.testCharacteristic(this.eveOpenDuration)) {
-      this.service.addCharacteristic(this.eveOpenDuration)
-    }
-    if (!this.service.testCharacteristic(this.eveClosedDuration)) {
-      this.service.addCharacteristic(this.eveClosedDuration)
-    }
-    if (!this.service.testCharacteristic(this.eveTimesOpened)) {
-      this.service.addCharacteristic(this.eveTimesOpened)
-    }
-    this.timesOpened = this.service.getCharacteristic(this.eveTimesOpened).value
-    this.service.getCharacteristic(this.eveResetTotal)
+    // Add the set handler to the contact sensor reset total characteristic
+    this.service.getCharacteristic(this.eveChar.ResetTotal)
       .on('set', (value, callback) => {
         callback()
         this.timesOpened = 0
-        this.service.updateCharacteristic(this.eveTimesOpened, 0)
+        this.service.updateCharacteristic(this.eveChar.TimesOpened, 0)
       })
 
     // Add the battery service if it doesn't already exist
@@ -171,11 +95,11 @@ module.exports = class deviceZBSensorContact {
           this.accessory.eveService.addEntry({ status: 1 })
           const initialTime = this.accessory.eveService.getInitialTime()
           this.service.updateCharacteristic(
-            this.eveLastActivation,
+            this.eveChar.LastActivation,
             Math.round(new Date().valueOf() / 1000) - initialTime
           )
           this.timesOpened++
-          this.service.updateCharacteristic(this.eveTimesOpened, this.timesOpened)
+          this.service.updateCharacteristic(this.eveChar.TimesOpened, this.timesOpened)
         } else {
           this.service.updateCharacteristic(this.hapChar.ContactSensorState, 0)
           this.accessory.eveService.addEntry({ status: 0 })
diff --git a/lib/device/zigbee/sensor-motion.js b/lib/device/zigbee/sensor-motion.js
index b8ad4fa2..a2238e46 100644
--- a/lib/device/zigbee/sensor-motion.js
+++ b/lib/device/zigbee/sensor-motion.js
@@ -10,6 +10,7 @@ module.exports = class deviceZBSensorMotion {
     this.funcs = platform.funcs
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
+    this.eveChar = platform.eveChar
     this.log = platform.log
     this.messages = platform.messages
     this.platform = platform
@@ -31,24 +32,11 @@ module.exports = class deviceZBSensorMotion {
       ? false
       : platform.config.disableDeviceLogging
 
-    // Set up the custom Eve characteristics for this device type
-    this.inherits = require('util').inherits
-    const self = this
-    this.eveLastActivation = function () {
-      self.hapChar.call(this, 'Last Activation', self.consts.eve.lastActivation)
-      this.setProps({
-        format: self.hapChar.Formats.UINT32,
-        unit: self.hapChar.Units.SECONDS,
-        perms: [self.hapChar.Perms.READ, self.hapChar.Perms.NOTIFY]
-      })
-      this.value = this.getDefaultValue()
-    }
-    this.inherits(this.eveLastActivation, this.hapChar)
-    this.eveLastActivation.UUID = this.consts.eve.lastActivation
-
     // Add the motion sensor service if it doesn't already exist
-    this.service = this.accessory.getService(this.hapServ.MotionSensor) ||
-      this.accessory.addService(this.hapServ.MotionSensor)
+    if (!(this.service = this.accessory.getService(this.hapServ.MotionSensor))) {
+      this.service = this.accessory.addService(this.hapServ.MotionSensor)
+      this.service.addCharacteristic(this.eveChar.LastActivation)
+    }
 
     // Add the battery service if it doesn't already exist
     this.battService = this.accessory.getService(this.hapServ.BatteryService) || this.accessory.addService(this.hapServ.BatteryService)
@@ -98,7 +86,7 @@ module.exports = class deviceZBSensorMotion {
         if (motionDetected) {
           const initialTime = this.accessory.eveService.getInitialTime()
           this.service.updateCharacteristic(
-            this.eveLastActivation,
+            this.eveChar.LastActivation,
             Math.round(new Date().valueOf() / 1000) - initialTime
           )
         }
diff --git a/lib/index.js b/lib/index.js
index af99fbc4..ba4fc78b 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -440,6 +440,7 @@ class eWeLinkPlatform {
       this.crypto = require('crypto')
       this.colourUtils = require('./utils/colour-utils')
       this.eveService = require('./fakegato/fakegato-history')(this.api)
+      this.eveChar = new (require('./utils/eve-chars'))(this.api)
       const { default: PQueue } = require('p-queue')
 
       // Create the queue used for HTTP requests
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 706eb22a..ac29613f 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -150,18 +150,6 @@ module.exports = {
     'workState', 'zyx_mode'
   ],
 
-  eve: {
-    currentConsumption: 'E863F10D-079E-48FF-8F27-9C2605A29F52',
-    totalConsumption: 'E863F10C-079E-48FF-8F27-9C2605A29F52',
-    voltage: 'E863F10A-079E-48FF-8F27-9C2605A29F52',
-    electricCurrent: 'E863F126-079E-48FF-8F27-9C2605A29F52',
-    resetTotal: 'E863F112-079E-48FF-8F27-9C2605A29F52',
-    lastActivation: 'E863F11A-079E-48FF-8F27-9C2605A29F52',
-    openDuration: 'E863F118-079E-48FF-8F27-9C2605A29F52',
-    closedDuration: 'E863F119-079E-48FF-8F27-9C2605A29F52',
-    timesOpened: 'E863F129-079E-48FF-8F27-9C2605A29F52'
-  },
-
   defaultDoubleSwitchOff: [
     { switch: 'off', outlet: 0 },
     { switch: 'off', outlet: 1 }
diff --git a/lib/utils/eve-chars.js b/lib/utils/eve-chars.js
new file mode 100644
index 00000000..0e882655
--- /dev/null
+++ b/lib/utils/eve-chars.js
@@ -0,0 +1,145 @@
+/* jshint -W014, -W033, esversion: 9 */
+/* eslint-disable new-cap */
+'use strict'
+
+module.exports = class eveCharacteristics {
+  constructor (api) {
+    this.hapServ = api.hap.Service
+    this.hapChar = api.hap.Characteristic
+    this.uuids = {
+      currentConsumption: 'E863F10D-079E-48FF-8F27-9C2605A29F52',
+      totalConsumption: 'E863F10C-079E-48FF-8F27-9C2605A29F52',
+      voltage: 'E863F10A-079E-48FF-8F27-9C2605A29F52',
+      electricCurrent: 'E863F126-079E-48FF-8F27-9C2605A29F52',
+      resetTotal: 'E863F112-079E-48FF-8F27-9C2605A29F52',
+      lastActivation: 'E863F11A-079E-48FF-8F27-9C2605A29F52',
+      openDuration: 'E863F118-079E-48FF-8F27-9C2605A29F52',
+      closedDuration: 'E863F119-079E-48FF-8F27-9C2605A29F52',
+      timesOpened: 'E863F129-079E-48FF-8F27-9C2605A29F52'
+    }
+    const self = this
+    this.CurrentConsumption = function () {
+      self.hapChar.call(this, 'Current Consumption', self.uuids.currentConsumption)
+      this.setProps({
+        format: self.hapChar.Formats.UINT16,
+        unit: 'W',
+        maxValue: 100000,
+        minValue: 0,
+        minStep: 1,
+        perms: [self.hapChar.Perms.READ, self.hapChar.Perms.NOTIFY]
+      })
+      this.value = this.getDefaultValue()
+    }
+    this.TotalConsumption = function () {
+      self.hapChar.call(this, 'Total Consumption', self.uuids.totalConsumption)
+      this.setProps({
+        format: self.hapChar.Formats.FLOAT,
+        unit: 'kWh',
+        maxValue: 100000000000,
+        minValue: 0,
+        minStep: 0.01,
+        perms: [self.hapChar.Perms.READ, self.hapChar.Perms.NOTIFY]
+      })
+      this.value = this.getDefaultValue()
+    }
+    this.Voltage = function () {
+      self.hapChar.call(this, 'Voltage', self.uuids.voltage)
+      this.setProps({
+        format: self.hapChar.Formats.FLOAT,
+        unit: 'V',
+        maxValue: 100000000000,
+        minValue: 0,
+        minStep: 1,
+        perms: [self.hapChar.Perms.READ, self.hapChar.Perms.NOTIFY]
+      })
+      this.value = this.getDefaultValue()
+    }
+    this.ElectricCurrent = function () {
+      self.hapChar.call(this, 'Electric Current', self.uuids.electricCurrent)
+      this.setProps({
+        format: self.hapChar.Formats.FLOAT,
+        unit: 'A',
+        maxValue: 100000000000,
+        minValue: 0,
+        minStep: 0.1,
+        perms: [self.hapChar.Perms.READ, self.hapChar.Perms.NOTIFY]
+      })
+      this.value = this.getDefaultValue()
+    }
+    this.ResetTotal = function () {
+      self.hapChar.call(this, 'Reset Total', self.uuids.resetTotal)
+      this.setProps({
+        format: self.hapChar.Formats.UINT32,
+        unit: self.hapChar.Units.seconds,
+        perms: [
+          self.hapChar.Perms.READ,
+          self.hapChar.Perms.NOTIFY,
+          self.hapChar.Perms.WRITE
+        ]
+      })
+      this.value = this.getDefaultValue()
+    }
+    this.LastActivation = function () {
+      self.hapChar.call(this, 'Last Activation', self.uuids.lastActivation)
+      this.setProps({
+        format: self.hapChar.Formats.UINT32,
+        unit: self.hapChar.Units.SECONDS,
+        perms: [self.hapChar.Perms.READ, self.hapChar.Perms.NOTIFY]
+      })
+      this.value = this.getDefaultValue()
+    }
+    this.OpenDuration = function () {
+      self.hapChar.call(this, 'Open Duration', self.uuids.openDuration)
+      this.setProps({
+        format: self.hapChar.Formats.UINT32,
+        unit: self.hapChar.Units.SECONDS,
+        perms: [
+          self.hapChar.Perms.READ,
+          self.hapChar.Perms.NOTIFY,
+          self.hapChar.Perms.WRITE
+        ]
+      })
+      this.value = this.getDefaultValue()
+    }
+    this.ClosedDuration = function () {
+      self.hapChar.call(this, 'Closed Duration', self.uuids.closedDuration)
+      this.setProps({
+        format: self.hapChar.Formats.UINT32,
+        unit: self.hapChar.Units.SECONDS,
+        perms: [
+          self.hapChar.Perms.READ,
+          self.hapChar.Perms.NOTIFY,
+          self.hapChar.Perms.WRITE
+        ]
+      })
+      this.value = this.getDefaultValue()
+    }
+    this.TimesOpened = function () {
+      self.hapChar.call(this, 'Times Opened', self.uuids.timesOpened)
+      this.setProps({
+        format: self.hapChar.Formats.UINT32,
+        perms: [self.hapChar.Perms.READ, self.hapChar.Perms.NOTIFY]
+      })
+      this.value = this.getDefaultValue()
+    }
+    const inherits = require('util').inherits
+    inherits(this.CurrentConsumption, this.hapChar)
+    inherits(this.TotalConsumption, this.hapChar)
+    inherits(this.Voltage, this.hapChar)
+    inherits(this.ElectricCurrent, this.hapChar)
+    inherits(this.LastActivation, this.hapChar)
+    inherits(this.ResetTotal, this.hapChar)
+    inherits(this.OpenDuration, this.hapChar)
+    inherits(this.ClosedDuration, this.hapChar)
+    inherits(this.TimesOpened, this.hapChar)
+    this.CurrentConsumption.UUID = this.uuids.currentConsumption
+    this.TotalConsumption.UUID = this.uuids.totalConsumption
+    this.Voltage.UUID = this.uuids.voltage
+    this.ElectricCurrent.UUID = this.uuids.electricCurrent
+    this.LastActivation.UUID = this.uuids.lastActivation
+    this.ResetTotal.UUID = this.uuids.resetTotal
+    this.OpenDuration.UUID = this.uuids.openDuration
+    this.ClosedDuration.UUID = this.uuids.closedDuration
+    this.TimesOpened.UUID = this.uuids.timesOpened
+  }
+}

From c19fcfdacd45d507aab99888edbc9d5452225bdd Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 16 Mar 2021 11:15:32 +0000
Subject: [PATCH 1712/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0dc1a4a3..76ca12b3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,7 +15,8 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 * Remove country code configuration option as the plugin can determine your region automatically
 * Automatically show useful info in logs for 'yet to implement' devices
-* Updated links on plugin-ui to match github wiki
+* Updated links on plugin-ui to match GitHub wiki
+* [backend] Eve characteristics abstracted into separate file for better efficiency
 
 ## 5.4.0 (2021-03-14)
 

From 82ba25422aea3587034e07c2fcd28a303bc51f0e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 16 Mar 2021 11:16:05 +0000
Subject: [PATCH 1713/3183] 5.5.0-0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index e3ead495..a4aed3f5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "5.4.1-4",
+  "version": "5.5.0-0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index e4cca537..4dc77737 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "5.4.1-4",
+  "version": "5.5.0-0",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 173cd68adfd2de821d32ed8b95b28fe040bc7eda Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 16 Mar 2021 18:01:16 +0000
Subject: [PATCH 1714/3183] titles + desc for hoobs

---
 config.schema.json | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/config.schema.json b/config.schema.json
index c11397d0..b04d90d5 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -61,6 +61,8 @@
         "description": "If true, the plugin will remove all accessories and not load the plugin on restart."
       },
       "singleDevices": {
+        "title": "Single Channel Devices",
+        "description": "Applies to single-channel switch, light switch and Slampher devices.",
         "type": "array",
         "items": {
           "type": "object",
@@ -99,6 +101,8 @@
         }
       },
       "multiDevices": {
+        "title": "Multi Channel Devices",
+        "description": "Applies to multi-channel switch and light switch devices.",
         "type": "array",
         "items": {
           "type": "object",
@@ -142,6 +146,8 @@
         }
       },
       "outletDevices": {
+        "title": "Outlet Devices",
+        "description": "Applies to outlet devices.",
         "type": "array",
         "items": {
           "type": "object",
@@ -200,6 +206,8 @@
         }
       },
       "lightDevices": {
+        "title": "Light Devices",
+        "description": "Applies to dimmer, bulb and LED strip devices.",
         "type": "array",
         "items": {
           "type": "object",
@@ -265,6 +273,8 @@
         }
       },
       "thDevices": {
+        "title": "Thermostat Devices",
+        "description": "Applies to thermostat devices and the TH10/16.",
         "type": "array",
         "items": {
           "type": "object",
@@ -315,6 +325,8 @@
         }
       },
       "fanDevices": {
+        "title": "Fan Devices",
+        "description": "Applies to iFan devices.",
         "type": "array",
         "items": {
           "type": "object",
@@ -345,6 +357,8 @@
         }
       },
       "sensorDevices": {
+        "title": "Sensor Devices",
+        "description": "Applies to the DW2 and Zigbee sensor devices.",
         "type": "array",
         "items": {
           "type": "object",
@@ -394,6 +408,7 @@
         }
       },
       "bridgeSensors": {
+        "title": "RF Sensor Devices",      "description": "Applies to RF Bridge sensors to expose different sensor types (<a href=\"https://github.com/bwp91/homebridge-ewelink/wiki/RF-Bridge-Sensors\" target=\"_blank\">more info</a>).",
         "type": "array",
         "items": {
           "type": "object",
@@ -468,6 +483,8 @@
         }
       },
       "groups": {
+        "title": "Accessory Simulations",
+        "description": "Set up simulated accessories from generic switch devices (<a href=\"https://github.com/bwp91/homebridge-ewelink/wiki/Accessory-Simulations\" target=\"_blank\">more info</a>).",
         "type": "array",
         "items": {
           "type": "object",

From 1449a0bde41b5606a18bee6bd8ec05caafd682a5 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 16 Mar 2021 18:04:05 +0000
Subject: [PATCH 1715/3183] 5.5.0-1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index a4aed3f5..3663c27b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "5.5.0-0",
+  "version": "5.5.0-1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 4dc77737..cff978c3 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "5.5.0-0",
+  "version": "5.5.0-1",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 0a3a46043cd1aa3d683e06b5c8f0b0d33d308585 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 16 Mar 2021 18:07:56 +0000
Subject: [PATCH 1716/3183] Revert "titles + desc for hoobs"

This reverts commit 173cd68adfd2de821d32ed8b95b28fe040bc7eda.
---
 config.schema.json | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index b04d90d5..c11397d0 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -61,8 +61,6 @@
         "description": "If true, the plugin will remove all accessories and not load the plugin on restart."
       },
       "singleDevices": {
-        "title": "Single Channel Devices",
-        "description": "Applies to single-channel switch, light switch and Slampher devices.",
         "type": "array",
         "items": {
           "type": "object",
@@ -101,8 +99,6 @@
         }
       },
       "multiDevices": {
-        "title": "Multi Channel Devices",
-        "description": "Applies to multi-channel switch and light switch devices.",
         "type": "array",
         "items": {
           "type": "object",
@@ -146,8 +142,6 @@
         }
       },
       "outletDevices": {
-        "title": "Outlet Devices",
-        "description": "Applies to outlet devices.",
         "type": "array",
         "items": {
           "type": "object",
@@ -206,8 +200,6 @@
         }
       },
       "lightDevices": {
-        "title": "Light Devices",
-        "description": "Applies to dimmer, bulb and LED strip devices.",
         "type": "array",
         "items": {
           "type": "object",
@@ -273,8 +265,6 @@
         }
       },
       "thDevices": {
-        "title": "Thermostat Devices",
-        "description": "Applies to thermostat devices and the TH10/16.",
         "type": "array",
         "items": {
           "type": "object",
@@ -325,8 +315,6 @@
         }
       },
       "fanDevices": {
-        "title": "Fan Devices",
-        "description": "Applies to iFan devices.",
         "type": "array",
         "items": {
           "type": "object",
@@ -357,8 +345,6 @@
         }
       },
       "sensorDevices": {
-        "title": "Sensor Devices",
-        "description": "Applies to the DW2 and Zigbee sensor devices.",
         "type": "array",
         "items": {
           "type": "object",
@@ -408,7 +394,6 @@
         }
       },
       "bridgeSensors": {
-        "title": "RF Sensor Devices",      "description": "Applies to RF Bridge sensors to expose different sensor types (<a href=\"https://github.com/bwp91/homebridge-ewelink/wiki/RF-Bridge-Sensors\" target=\"_blank\">more info</a>).",
         "type": "array",
         "items": {
           "type": "object",
@@ -483,8 +468,6 @@
         }
       },
       "groups": {
-        "title": "Accessory Simulations",
-        "description": "Set up simulated accessories from generic switch devices (<a href=\"https://github.com/bwp91/homebridge-ewelink/wiki/Accessory-Simulations\" target=\"_blank\">more info</a>).",
         "type": "array",
         "items": {
           "type": "object",

From 19d4126789e6481ea25de968465ff5a5b70aa830 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 16 Mar 2021 19:23:18 +0000
Subject: [PATCH 1717/3183] Revert "Revert "titles + desc for hoobs""

This reverts commit 0a3a46043cd1aa3d683e06b5c8f0b0d33d308585.
---
 config.schema.json | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/config.schema.json b/config.schema.json
index c11397d0..b04d90d5 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -61,6 +61,8 @@
         "description": "If true, the plugin will remove all accessories and not load the plugin on restart."
       },
       "singleDevices": {
+        "title": "Single Channel Devices",
+        "description": "Applies to single-channel switch, light switch and Slampher devices.",
         "type": "array",
         "items": {
           "type": "object",
@@ -99,6 +101,8 @@
         }
       },
       "multiDevices": {
+        "title": "Multi Channel Devices",
+        "description": "Applies to multi-channel switch and light switch devices.",
         "type": "array",
         "items": {
           "type": "object",
@@ -142,6 +146,8 @@
         }
       },
       "outletDevices": {
+        "title": "Outlet Devices",
+        "description": "Applies to outlet devices.",
         "type": "array",
         "items": {
           "type": "object",
@@ -200,6 +206,8 @@
         }
       },
       "lightDevices": {
+        "title": "Light Devices",
+        "description": "Applies to dimmer, bulb and LED strip devices.",
         "type": "array",
         "items": {
           "type": "object",
@@ -265,6 +273,8 @@
         }
       },
       "thDevices": {
+        "title": "Thermostat Devices",
+        "description": "Applies to thermostat devices and the TH10/16.",
         "type": "array",
         "items": {
           "type": "object",
@@ -315,6 +325,8 @@
         }
       },
       "fanDevices": {
+        "title": "Fan Devices",
+        "description": "Applies to iFan devices.",
         "type": "array",
         "items": {
           "type": "object",
@@ -345,6 +357,8 @@
         }
       },
       "sensorDevices": {
+        "title": "Sensor Devices",
+        "description": "Applies to the DW2 and Zigbee sensor devices.",
         "type": "array",
         "items": {
           "type": "object",
@@ -394,6 +408,7 @@
         }
       },
       "bridgeSensors": {
+        "title": "RF Sensor Devices",      "description": "Applies to RF Bridge sensors to expose different sensor types (<a href=\"https://github.com/bwp91/homebridge-ewelink/wiki/RF-Bridge-Sensors\" target=\"_blank\">more info</a>).",
         "type": "array",
         "items": {
           "type": "object",
@@ -468,6 +483,8 @@
         }
       },
       "groups": {
+        "title": "Accessory Simulations",
+        "description": "Set up simulated accessories from generic switch devices (<a href=\"https://github.com/bwp91/homebridge-ewelink/wiki/Accessory-Simulations\" target=\"_blank\">more info</a>).",
         "type": "array",
         "items": {
           "type": "object",

From b3f7293b1d931324538ad0564fc296a65082eec7 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 16 Mar 2021 19:23:53 +0000
Subject: [PATCH 1718/3183] Update config.schema.json

---
 config.schema.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/config.schema.json b/config.schema.json
index b04d90d5..62a1fc94 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -408,7 +408,8 @@
         }
       },
       "bridgeSensors": {
-        "title": "RF Sensor Devices",      "description": "Applies to RF Bridge sensors to expose different sensor types (<a href=\"https://github.com/bwp91/homebridge-ewelink/wiki/RF-Bridge-Sensors\" target=\"_blank\">more info</a>).",
+        "title": "RF Sensor Devices",
+        "description": "Applies to RF Bridge sensors to expose different sensor types (<a href=\"https://github.com/bwp91/homebridge-ewelink/wiki/RF-Bridge-Sensors\" target=\"_blank\">more info</a>).",
         "type": "array",
         "items": {
           "type": "object",

From 4bda00d44841742db2794feb12455d3cbdefbf81 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 16 Mar 2021 19:26:17 +0000
Subject: [PATCH 1719/3183] 5.5.0-2

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 3663c27b..02a9e03e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "5.5.0-1",
+  "version": "5.5.0-2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index cff978c3..55d82151 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "5.5.0-1",
+  "version": "5.5.0-2",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 90bd0d020414923d224706797d4e27b6909e0b15 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 17 Mar 2021 07:56:07 +0000
Subject: [PATCH 1720/3183] add titles

---
 config.schema.json | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/config.schema.json b/config.schema.json
index 62a1fc94..76ffd31e 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -10,6 +10,7 @@
     "properties": {
       "name": {
         "type": "string",
+        "title": "Plugin Name",
         "default": "eWeLink"
       },
       "username": {
@@ -53,7 +54,9 @@
         "description": "If true, debug information will be added to the log."
       },
       "debugFakegato": {
-        "type": "boolean"
+        "title": "Debug Fakegato",
+        "type": "boolean",
+        "description": "If true, the included Fakegato library will debug to the log."
       },
       "disablePlugin": {
         "title": "Disable Plugin",

From 2a301da941013d9970c934cee72e5ead05aee0dc Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 17 Mar 2021 10:27:18 +0000
Subject: [PATCH 1721/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 76ca12b3..f79e94a7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 ### Changes
 
 * Remove country code configuration option as the plugin can determine your region automatically
+* Modified config schema to show titles/descriptions for non Homebridge UI users
 * Automatically show useful info in logs for 'yet to implement' devices
 * Updated links on plugin-ui to match GitHub wiki
 * [backend] Eve characteristics abstracted into separate file for better efficiency

From ca27c91f64f91e852f43d5ea2d05c451587183ce Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 17 Mar 2021 10:31:44 +0000
Subject: [PATCH 1722/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f79e94a7..0308e6e0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 All notable changes to this homebridge-ewelink will be documented in this file.
 
-## BETA
+## v5.5.0 (2021-03-17)
 
 ### Added
 

From c3aecdbe0d431da0c1a0f7dccbe05a7c94e7432b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 17 Mar 2021 10:32:18 +0000
Subject: [PATCH 1723/3183] 5.5.0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 02a9e03e..26c227f2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "5.5.0-2",
+  "version": "5.5.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 55d82151..132f7ff5 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "5.5.0-2",
+  "version": "5.5.0",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From fc113942fe31842fdbe0ac161f1ed5a7cefcd875 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 17 Mar 2021 12:54:34 +0000
Subject: [PATCH 1724/3183] make descs consistent

---
 config.schema.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 76ffd31e..109042d0 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -305,14 +305,14 @@
             "minTarget": {
               "type": "number",
               "title": "Minimum Target Temperature",
-              "description": "Minimum target temperature for TH10/16 thermostat simulation to show in HomeKit apps. Must be at least 0.",
+              "description": "Minimum target temperature for TH10/16 thermostat simulation to show in HomeKit apps. Must be 0 or more.",
               "placeholder": 0,
               "minimum": 0
             },
             "maxTarget": {
               "type": "number",
               "title": "Maximum Target Temperature",
-              "description": "Maximum target temperature for TH10/16 thermostat simulation to show in HomeKit apps. Must be at least 1, and greater than the minimum value set above.",
+              "description": "Maximum target temperature for TH10/16 thermostat simulation to show in HomeKit apps. Must be 1 or more, and greater than the minimum value set above.",
               "placeholder": 30,
               "minimum": 1
             },

From afdb78f6b615b439a1249cadf248881f271df27f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 17 Mar 2021 13:10:45 +0000
Subject: [PATCH 1725/3183] change default mintemp to 10

---
 config.schema.json     | 2 +-
 lib/utils/constants.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 109042d0..0693da2d 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -306,7 +306,7 @@
               "type": "number",
               "title": "Minimum Target Temperature",
               "description": "Minimum target temperature for TH10/16 thermostat simulation to show in HomeKit apps. Must be 0 or more.",
-              "placeholder": 0,
+              "placeholder": 10,
               "minimum": 0
             },
             "maxTarget": {
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index ac29613f..9daec217 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -32,7 +32,7 @@ module.exports = {
     sensorTimeLength: 60,
     sensorTimeDifference: 120,
     offset: 0,
-    minTarget: 0,
+    minTarget: 10,
     maxTarget: 30,
     operationTime: 100,
     operationTimeDown: 100,

From 9945b66d9a8ee83298cea945e3cc31ab4d770126 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 17 Mar 2021 13:25:48 +0000
Subject: [PATCH 1726/3183] remove mintemp since hb change

---
 lib/device/sensor-ambient.js        | 1 -
 lib/device/sensor-temp-humi.js      | 1 -
 lib/device/simulation/thermostat.js | 1 -
 lib/device/thermostat.js            | 1 -
 lib/device/zigbee/sensor-ambient.js | 1 -
 5 files changed, 5 deletions(-)

diff --git a/lib/device/sensor-ambient.js b/lib/device/sensor-ambient.js
index 51b4ee44..bcd3b05d 100644
--- a/lib/device/sensor-ambient.js
+++ b/lib/device/sensor-ambient.js
@@ -56,7 +56,6 @@ module.exports = class deviceSensorAmbient {
 
     // Set custom properties of the current temperature characteristic
     this.tempService.getCharacteristic(this.hapChar.CurrentTemperature).setProps({
-      minValue: -100,
       minStep: 0.1
     })
 
diff --git a/lib/device/sensor-temp-humi.js b/lib/device/sensor-temp-humi.js
index f1632be7..8df03f8a 100644
--- a/lib/device/sensor-temp-humi.js
+++ b/lib/device/sensor-temp-humi.js
@@ -34,7 +34,6 @@ module.exports = class deviceSensorTempHumi {
 
     // Set custom properties of the current temperature characteristic
     this.tempService.getCharacteristic(this.hapChar.CurrentTemperature).setProps({
-      minValue: -100,
       minStep: 0.1
     })
 
diff --git a/lib/device/simulation/thermostat.js b/lib/device/simulation/thermostat.js
index 49f75887..94099916 100644
--- a/lib/device/simulation/thermostat.js
+++ b/lib/device/simulation/thermostat.js
@@ -66,7 +66,6 @@ module.exports = class deviceThermostat {
 
     // Set custom properties of the current temperature characteristic
     this.service.getCharacteristic(this.hapChar.CurrentTemperature).setProps({
-      minValue: -100,
       minStep: 0.1
     })
 
diff --git a/lib/device/thermostat.js b/lib/device/thermostat.js
index 9dd655f2..ce32c6be 100644
--- a/lib/device/thermostat.js
+++ b/lib/device/thermostat.js
@@ -56,7 +56,6 @@ module.exports = class deviceThermostat {
 
     // Set custom properties of the current temperature characteristic
     this.service.getCharacteristic(this.hapChar.CurrentTemperature).setProps({
-      minValue: -100,
       minStep: 0.1
     })
 
diff --git a/lib/device/zigbee/sensor-ambient.js b/lib/device/zigbee/sensor-ambient.js
index 80e30f36..e37ddd2b 100644
--- a/lib/device/zigbee/sensor-ambient.js
+++ b/lib/device/zigbee/sensor-ambient.js
@@ -34,7 +34,6 @@ module.exports = class deviceZBSensorAmbient {
 
     // Set custom properties of the current temperature characteristic
     this.tService.getCharacteristic(this.hapChar.CurrentTemperature).setProps({
-      minValue: -100,
       minStep: 0.1
     })
 

From 1558ce6942ed1cf5b343697a5afd59084e0815fc Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 17 Mar 2021 13:36:10 +0000
Subject: [PATCH 1727/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0308e6e0..d333bde3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 All notable changes to this homebridge-ewelink will be documented in this file.
 
+## BETA
+
+### Changes
+
+* Remove the custom `minValue` for `CurrentTemperature` characteristic
+
 ## v5.5.0 (2021-03-17)
 
 ### Added

From badad1835e2cec2567541f38c3965da45a1904cc Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 19 Mar 2021 11:07:18 +0000
Subject: [PATCH 1728/3183] move welcome messages to lang file

---
 lib/index.js                          |  6 +++---
 lib/utils/constants.js                |  9 ---------
 lib/utils/{messages.js => lang-en.js} | 10 +++++++++-
 3 files changed, 12 insertions(+), 13 deletions(-)
 rename lib/utils/{messages.js => lang-en.js} (88%)

diff --git a/lib/index.js b/lib/index.js
index ba4fc78b..9819a993 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -15,7 +15,7 @@ class eWeLinkPlatform {
 
     // Retrieve the necessary constants and functions before starting
     this.consts = require('./utils/constants')
-    this.messages = require('./utils/messages')
+    this.messages = require('./utils/lang-en')
     this.funcs = require('./utils/functions')
 
     // Begin plugin initialisation
@@ -511,8 +511,8 @@ class eWeLinkPlatform {
       }
 
       // Log that the plugin setup has been successful with a welcome message
-      const randIndex = Math.floor(Math.random() * this.consts.welcomeMessages.length)
-      this.log('%s. %s', this.messages.complete, this.consts.welcomeMessages[randIndex])
+      const randIndex = Math.floor(Math.random() * this.messages.zWelcome.length)
+      this.log('%s. %s', this.messages.complete, this.messages.zWelcome[randIndex])
     } catch (err) {
       // Catch any errors during setup
       const eText = err.message === this.messages.disabled
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 9daec217..8cdc8c89 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -56,15 +56,6 @@ module.exports = {
     adaptiveLightingShift: 0
   },
 
-  welcomeMessages: [
-    "Don't forget to ☆ this plugin on GitHub if you're finding it useful!",
-    'Have a feature request? Visit http://bit.ly/hb-ewelink-issues to ask!',
-    'Interested in sponsoring this plugin? https://github.com/sponsors/bwp91',
-    "Join the plugin's Discord community! https://discord.gg/cMGhNtZ3tW",
-    'Thanks for using this plugin, I hope you find it helpful!',
-    'This plugin has been made with ♥ by bwp91 from the UK!'
-  ],
-
   appId: 'oeVkj2lYFGnJu5XUtWisfW4utiN4u9Mq',
 
   appSecret: '6Nz4n0xA8s8qdxQf2GqurZj2Fs55FUvM',
diff --git a/lib/utils/messages.js b/lib/utils/lang-en.js
similarity index 88%
rename from lib/utils/messages.js
rename to lib/utils/lang-en.js
index cc23f369..0df33d8b 100644
--- a/lib/utils/messages.js
+++ b/lib/utils/lang-en.js
@@ -79,5 +79,13 @@ module.exports = {
   wsResend: 'Request will be sent when WS has reconnected',
   wsUnkAct: 'WS message received has unknown action',
   wsUnkCmd: 'WS unknown command received',
-  wsUnkRes: 'Unknown WS response'
+  wsUnkRes: 'Unknown WS response',
+  zWelcome: [
+    "Don't forget to ☆ this plugin on GitHub if you're finding it useful!",
+    'Have a feature request? Visit http://bit.ly/hb-ewelink-issues to ask!',
+    'Interested in sponsoring this plugin? https://github.com/sponsors/bwp91',
+    "Join the plugin's Discord community! https://discord.gg/cMGhNtZ3tW",
+    'Thanks for using this plugin, I hope you find it helpful!',
+    'This plugin has been made with ♥ by bwp91 from the UK!'
+  ]
 }

From e0429718dfa65c499970e8a4716ac89e8c5bba63 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 19 Mar 2021 11:08:53 +0000
Subject: [PATCH 1729/3183] add messages

---
 lib/utils/lang-en.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/utils/lang-en.js b/lib/utils/lang-en.js
index 0df33d8b..aff26573 100644
--- a/lib/utils/lang-en.js
+++ b/lib/utils/lang-en.js
@@ -86,6 +86,8 @@ module.exports = {
     'Interested in sponsoring this plugin? https://github.com/sponsors/bwp91',
     "Join the plugin's Discord community! https://discord.gg/cMGhNtZ3tW",
     'Thanks for using this plugin, I hope you find it helpful!',
-    'This plugin has been made with ♥ by bwp91 from the UK!'
+    'This plugin has been made with ♥ by bwp91 from the UK!',
+    'Have time to give this plugin a review? http://bit.ly/hb-ewelink-review',
+    'Want to see this plugin in your own language? Let me know!'
   ]
 }

From 513e0714bcce8ffa9bd92dd4a04f26bc9516c63b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 19 Mar 2021 11:19:55 +0000
Subject: [PATCH 1730/3183] add messages

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d333bde3..af511158 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 ### Changes
 
 * Remove the custom `minValue` for `CurrentTemperature` characteristic
+* More welcome messages
 
 ## v5.5.0 (2021-03-17)
 

From c69aea06f5db6879e2507f85146bef8f37894e8a Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 19 Mar 2021 11:20:21 +0000
Subject: [PATCH 1731/3183] 5.5.1-0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 26c227f2..0873444b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "5.5.0",
+  "version": "5.5.1-0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 132f7ff5..61f6a850 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "5.5.0",
+  "version": "5.5.1-0",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 1389346b575895937a8438d4c5d843ed694a143e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 21 Mar 2021 12:16:14 +0000
Subject: [PATCH 1732/3183] update plugin-ui-utils

---
 package-lock.json | 6 +++---
 package.json      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 0873444b..dc80d946 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5,9 +5,9 @@
   "requires": true,
   "dependencies": {
     "@homebridge/plugin-ui-utils": {
-      "version": "0.0.18",
-      "resolved": "https://registry.npmjs.org/@homebridge/plugin-ui-utils/-/plugin-ui-utils-0.0.18.tgz",
-      "integrity": "sha512-ZxiSSxMKXHtv4IUtI3oVPCQwwtRPDfCGYa+SMhj0avLM9amVoqwTqFxa4psj6VjF5RJV1cuUMNJWJa8T8R/Pbg=="
+      "version": "0.0.19",
+      "resolved": "https://registry.npmjs.org/@homebridge/plugin-ui-utils/-/plugin-ui-utils-0.0.19.tgz",
+      "integrity": "sha512-axFX7lN2Yd7bz/6SlD7dzq5sY/N9+XYuLHPukuiyHQRDtNMRL1uDqJhOx6RVaN2tYDHB75h7YxRQWP7U44Mgzg=="
     },
     "axios": {
       "version": "0.21.1",
diff --git a/package.json b/package.json
index 61f6a850..ba764c4a 100644
--- a/package.json
+++ b/package.json
@@ -48,7 +48,7 @@
     }
   ],
   "dependencies": {
-    "@homebridge/plugin-ui-utils": "^0.0.18",
+    "@homebridge/plugin-ui-utils": "^0.0.19",
     "axios": "^0.21.1",
     "node-dns-sd": "^0.4.2",
     "p-queue": "^6.6.2",

From 2c0efb20a80f7cf47ce2e47d821e977d98c9567e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 21 Mar 2021 12:17:19 +0000
Subject: [PATCH 1733/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index af511158..ab41558a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 * Remove the custom `minValue` for `CurrentTemperature` characteristic
 * More welcome messages
+* Updated `plugin-ui-utils` dependency
 
 ## v5.5.0 (2021-03-17)
 

From 1f81930fa8d5dcddd0f17c5e4b667745bb0f708c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 21 Mar 2021 16:30:22 +0000
Subject: [PATCH 1734/3183] 5.5.1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index dc80d946..86730aa2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "5.5.1-0",
+  "version": "5.5.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index ba764c4a..dc2689e8 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "5.5.1-0",
+  "version": "5.5.1",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From db48248275085c167aa950d42dcc0b1d2d82721f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 21 Mar 2021 16:34:31 +0000
Subject: [PATCH 1735/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ab41558a..b05c0149 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 All notable changes to this homebridge-ewelink will be documented in this file.
 
-## BETA
+## 5.5.1 (2021-03-21)
 
 ### Changes
 
@@ -10,7 +10,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 * More welcome messages
 * Updated `plugin-ui-utils` dependency
 
-## v5.5.0 (2021-03-17)
+## 5.5.0 (2021-03-17)
 
 ### Added
 

From a2631d87cb6a98dbc734e165962043511feb6cbf Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 22 Mar 2021 11:53:47 +0000
Subject: [PATCH 1736/3183] initial attempt for uiid 1258

---
 lib/device/zigbee/light-cct.js | 215 +++++++++++++++++++++++++++++++++
 lib/index.js                   |   9 ++
 lib/utils/constants.js         |   2 +
 3 files changed, 226 insertions(+)
 create mode 100644 lib/device/zigbee/light-cct.js

diff --git a/lib/device/zigbee/light-cct.js b/lib/device/zigbee/light-cct.js
new file mode 100644
index 00000000..a5cead18
--- /dev/null
+++ b/lib/device/zigbee/light-cct.js
@@ -0,0 +1,215 @@
+/* jshint -W014, -W033, esversion: 9 */
+/* eslint-disable new-cap */
+'use strict'
+
+module.exports = class deviceZBLightCCT {
+  constructor (platform, accessory) {
+    // Set up variables from the platform
+    this.consts = platform.consts
+    this.debug = platform.config.debug
+    this.funcs = platform.funcs
+    this.hapServ = platform.api.hap.Service
+    this.hapChar = platform.api.hap.Characteristic
+    this.log = platform.log
+    this.messages = platform.messages
+    this.platform = platform
+
+    // Set up variables from the accessory
+    this.name = accessory.displayName
+    this.accessory = accessory
+
+    // Set up custom variables for this device type
+    const deviceId = this.accessory.context.eweDeviceId
+    const deviceConf = platform.lightDevices[deviceId]
+    this.brightStep = deviceConf && deviceConf.brightnessStep
+      ? Math.min(deviceConf.brightnessStep, 100)
+      : platform.consts.defaultValues.brightnessStep
+    this.alShift = deviceConf && deviceConf.adaptiveLightingShift
+      ? deviceConf.adaptiveLightingShift
+      : platform.consts.defaultValues.adaptiveLightingShift
+    this.disableDeviceLogging = deviceConf && deviceConf.overrideDisabledLogging
+      ? false
+      : platform.config.disableDeviceLogging
+
+    // Different bulbs have different colour temperature ranges
+    this.minK = 2000
+    this.maxK = 6000
+
+    // Add the lightbulb service if it doesn't already exist
+    this.service = this.accessory.getService(this.hapServ.Lightbulb) ||
+      this.accessory.addService(this.hapServ.Lightbulb)
+
+    // Add the set handler to the lightbulb on/off characteristic
+    this.service.getCharacteristic(this.hapChar.On)
+      .on('set', this.internalOnOffUpdate.bind(this))
+
+    // Add the set handler to the lightbulb brightness characteristic
+    this.service.getCharacteristic(this.hapChar.Brightness)
+      .on('set', this.internalBrightnessUpdate.bind(this))
+      .setProps({ minStep: this.brightStep })
+
+    // Add the set handler to the lightbulb colour temperature characteristic
+    this.service.getCharacteristic(this.hapChar.ColorTemperature)
+      .on('set', this.internalCTempUpdate.bind(this))
+
+    // Set up the adaptive lighting controller if available
+    if (
+      platform.api.versionGreaterOrEqual &&
+      platform.api.versionGreaterOrEqual('1.3.0')
+    ) {
+      // This is needed as sometimes we need to send the brightness with a cct update
+      this.cacheBrightness = this.service.getCharacteristic(this.hapChar.Brightness).value
+
+      // Set up the adaptive lighting controller
+      this.alController = new platform.api.hap.AdaptiveLightingController(
+        this.service,
+        { customTemperatureAdjustment: this.alShift }
+      )
+      this.accessory.configureController(this.alController)
+    }
+
+    // Output the customised options to the log if in debug mode
+    if (this.debug) {
+      const opts = JSON.stringify({
+        adaptiveLightingShift: this.alShift,
+        brightnessStep: this.brightStep,
+        disableDeviceLogging: this.disableDeviceLogging
+      })
+      this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
+    }
+  }
+
+  async internalOnOffUpdate (value, callback) {
+    try {
+      callback()
+      await this.platform.sendDeviceUpdate(this.accessory, {
+        switch: value ? 'on' : 'off'
+      })
+      this.cacheOnOff = value ? 'on' : 'off'
+      if (!this.disableDeviceLogging) {
+        this.log('[%s] current state [%s].', this.name, value ? 'on' : 'off')
+      }
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, true)
+    }
+  }
+
+  async internalBrightnessUpdate (value, callback) {
+    try {
+      if (this.cacheBrightness === value || value === 0) {
+        callback()
+        return
+      }
+      this.cacheBrightness = value
+      callback()
+      const params = {
+        switch: 'on',
+        brightness: this.cacheBrightness
+      }
+      const updateKey = Math.random().toString(36).substr(2, 8)
+      this.updateKeyBright = updateKey
+      await this.funcs.sleep(500)
+      if (updateKey !== this.updateKeyBright) {
+        return
+      }
+      await this.platform.sendDeviceUpdate(this.accessory, params)
+      if (!this.disableDeviceLogging) {
+        this.log('[%s] current brightness [%s%].', this.name, this.cacheBrightness)
+      }
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, true)
+    }
+  }
+
+  async internalCTempUpdate (value, callback) {
+    try {
+      if (this.cacheMired === value) {
+        callback()
+        return
+      }
+      this.cacheMired = value
+      callback()
+      const kelvin = Math.round(1000000 / this.cacheMired)
+      const scaledK = Math.max(Math.min(kelvin, this.maxK), this.minK)
+      this.cacheCT = Math.round(((scaledK - this.minK) / (this.maxK - this.minK)) * 255)
+      const params = {
+        switch: 'on',
+        colorTemp: this.cacheCT
+      }
+      // For adaptive lighting we still want to update the would have been so
+      // it's not disabled when the light comes back on so do this check now not before
+      if (this.cacheOnOff !== 'on') {
+        return
+      }
+      const updateKey = Math.random().toString(36).substr(2, 8)
+      this.updateKeyCT = updateKey
+      await this.funcs.sleep(400)
+      if (updateKey !== this.updateKeyCT) {
+        return
+      }
+      await this.platform.sendDeviceUpdate(this.accessory, params)
+      if (!this.disableDeviceLogging) {
+        if (this.alController && this.alController.isAdaptiveLightingActive()) {
+          this.log('[%s] current cct [%sK] via adaptive lighting.', this.name, scaledK)
+        } else {
+          this.log('[%s] current cct [%sK].', this.name, scaledK)
+        }
+      }
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, true)
+    }
+  }
+
+  async externalUpdate (params) {
+    try {
+      if (params.switch && params.switch !== this.cacheOnOff) {
+        this.cacheOnOff = params.switch
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheOnOff === 'on')
+        if (params.updateSource && !this.disableDeviceLogging) {
+          this.log('[%s] current state [%s].', this.name, this.cacheOnOff)
+        }
+      }
+      if (this.funcs.hasProperty(params, 'brightness')) {
+        if (params.brightness !== this.cacheBrightness) {
+          this.cacheBrightness = params.brightness
+          this.service.updateCharacteristic(this.hapChar.Brightness, this.cacheBrightness)
+          if (params.updateSource && !this.disableDeviceLogging) {
+            this.log('[%s] current brightness [%s%].', this.name, this.cacheBrightness)
+          }
+        }
+      }
+      if (this.funcs.hasProperty(params, 'colorTemp')) {
+        if (params.colorTemp !== this.cacheCT) {
+          const ctDiff = Math.abs(params.colorTemp - this.cacheCT)
+          this.cacheCT = params.colorTemp
+          const kelvin = this.cacheCT / 255 * (this.maxK - this.minK) + this.minK
+          const scaledK = Math.round(kelvin)
+          this.cacheMired = Math.min(Math.max(Math.round(1000000 / scaledK), 140), 500)
+          this.service.updateCharacteristic(
+            this.hapChar.ColorTemperature,
+            this.cacheMired
+          )
+          if (params.updateSource) {
+            if (!this.disableDeviceLogging) {
+              this.log('[%s] current cct [%sK].', this.name, scaledK)
+            }
+            if (
+              this.alController &&
+              this.alController.isAdaptiveLightingActive() &&
+              ctDiff > 20
+            ) {
+              // look for a variation greater than five
+              this.alController.disableAdaptiveLighting()
+              this.log(
+                '[%s] adaptive lighting disabled due to significant colour change.',
+                this.name
+              )
+            }
+          }
+        }
+      }
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, false)
+    }
+  }
+}
diff --git a/lib/index.js b/lib/index.js
index 9819a993..822d4009 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1121,6 +1121,15 @@ class eWeLinkPlatform {
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/zigbee/light-dimmer'))(this, accessory)
         /****************/
+      } else if (this.consts.devices.zbLightCCT.includes(device.extra.uiid)) {
+        /**************
+        ZB LIGHTS [CCT]
+        **************/
+        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
+          ? this.devicesInHB.get(device.deviceid + 'SWX')
+          : this.addAccessory(device, device.deviceid + 'SWX')
+        accessory.control = new (require('./device/zigbee/light-cct'))(this, accessory)
+        /*************/
       } else if (this.consts.devices.zbSensorAmbient.includes(device.extra.uiid)) {
         /******************
         ZB SENSOR [AMBIENT]
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 8cdc8c89..b1174928 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -126,6 +126,7 @@ module.exports = {
     zbSwitchStateless: [1000],
     zbSwitchSingle: [1009, 1256],
     zbLightDimmer: [1257],
+    zbLightCCT: [1258],
     zbSensorAmbient: [1770],
     zbSensorMotion: [2026],
     zbSensorContact: [3026]
@@ -202,6 +203,7 @@ module.exports = {
     1009: 1, // "" (Some sort of single switch device)
     1256: 1, // "ZIGBEE_SINGLE_SWITCH"
     1257: 1, // "ZigbeeWhiteLight"
+    1258: 1,
     1770: 1, // "ZIGBEE_TEMPERATURE_SENSOR"
     2026: 1, // "ZIGBEE_MOBILE_SENSOR"
     2256: 2, // "ZIGBEE_SWITCH_2"

From 44e8555f94e00e991a6e579b37a067a1173ab596 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 22 Mar 2021 11:54:22 +0000
Subject: [PATCH 1737/3183] 5.5.2-0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 86730aa2..1ed1f8d7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "5.5.1",
+  "version": "5.5.2-0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index dc2689e8..e5fda048 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "5.5.1",
+  "version": "5.5.2-0",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 7914ddd7c70577f2f37967099517cc8e4741def5 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 22 Mar 2021 11:58:23 +0000
Subject: [PATCH 1738/3183] amend ranges for zbcct

---
 lib/device/zigbee/light-cct.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/device/zigbee/light-cct.js b/lib/device/zigbee/light-cct.js
index a5cead18..655b1d8c 100644
--- a/lib/device/zigbee/light-cct.js
+++ b/lib/device/zigbee/light-cct.js
@@ -32,8 +32,8 @@ module.exports = class deviceZBLightCCT {
       : platform.config.disableDeviceLogging
 
     // Different bulbs have different colour temperature ranges
-    this.minK = 2000
-    this.maxK = 6000
+    this.minK = 2200
+    this.maxK = 4000
 
     // Add the lightbulb service if it doesn't already exist
     this.service = this.accessory.getService(this.hapServ.Lightbulb) ||
@@ -131,7 +131,7 @@ module.exports = class deviceZBLightCCT {
       callback()
       const kelvin = Math.round(1000000 / this.cacheMired)
       const scaledK = Math.max(Math.min(kelvin, this.maxK), this.minK)
-      this.cacheCT = Math.round(((scaledK - this.minK) / (this.maxK - this.minK)) * 255)
+      this.cacheCT = Math.round(((scaledK - this.minK) / (this.maxK - this.minK)) * 100)
       const params = {
         switch: 'on',
         colorTemp: this.cacheCT
@@ -182,7 +182,7 @@ module.exports = class deviceZBLightCCT {
         if (params.colorTemp !== this.cacheCT) {
           const ctDiff = Math.abs(params.colorTemp - this.cacheCT)
           this.cacheCT = params.colorTemp
-          const kelvin = this.cacheCT / 255 * (this.maxK - this.minK) + this.minK
+          const kelvin = this.cacheCT / 100 * (this.maxK - this.minK) + this.minK
           const scaledK = Math.round(kelvin)
           this.cacheMired = Math.min(Math.max(Math.round(1000000 / scaledK), 140), 500)
           this.service.updateCharacteristic(

From bd8d5e723455a76e9a30af92d9f73da18ac451fb Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 22 Mar 2021 11:59:02 +0000
Subject: [PATCH 1739/3183] 5.5.2-1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 1ed1f8d7..f7acfd15 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "5.5.2-0",
+  "version": "5.5.2-1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index e5fda048..f6c3f635 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "5.5.2-0",
+  "version": "5.5.2-1",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 59f15436b9e321266171578b5d164f7c57bc382b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 22 Mar 2021 13:40:00 +0000
Subject: [PATCH 1740/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b05c0149..f8acfd75 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,13 @@
 
 All notable changes to this homebridge-ewelink will be documented in this file.
 
+## BETA
+
+### Added
+
+* Support for zigbee colour temperature lights (ewelink uiid 1258), including:
+  * Ikea Tradfri E14 600 lumen
+
 ## 5.5.1 (2021-03-21)
 
 ### Changes

From 2b503d141898e540a0aafcd87a9ea0fad459986f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 23 Mar 2021 09:31:07 +0000
Subject: [PATCH 1741/3183] encoded password option

---
 config.schema.json | 5 +++++
 lib/index.js       | 7 +++++++
 2 files changed, 12 insertions(+)

diff --git a/config.schema.json b/config.schema.json
index 0693da2d..e43c6e1b 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -24,6 +24,10 @@
         "title": "Password",
         "required": true
       },
+      "encodedPassword": {
+        "title": "Encoded Password",
+        "type": "boolean"
+      },
       "mode": {
         "type": "string",
         "title": "Connection Mode",
@@ -668,6 +672,7 @@
       "title": "Optional Settings",
       "expandable": true,
       "items": [
+        "encodedPassword",
         "mode",
         "disableDeviceLogging",
         "debug",
diff --git a/lib/index.js b/lib/index.js
index 822d4009..dad29f5e 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -157,6 +157,7 @@ class eWeLinkPlatform {
         case 'debugFakegato':
         case 'disableDeviceLogging':
         case 'disablePlugin':
+        case 'encodedPassword':
           if (typeof val === 'string') {
             logQuotes(key)
           }
@@ -450,6 +451,12 @@ class eWeLinkPlatform {
         timeout: 10000
       })
 
+      // Check to see if the user has encoded their password
+      if (this.config.encodedPassword) {
+        const buff = Buffer.from(this.config.password, 'base64')
+        this.config.password = buff.toString('utf8')
+      }
+
       // Set up the HTTP client, get the user HTTP host, and login
       this.httpClient = new (require('./connection/http'))(this)
       const authData = await this.httpClient.login()

From ea9b6225d6727ab55cfb26283eeb5b2e5cfd382d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 23 Mar 2021 09:31:50 +0000
Subject: [PATCH 1742/3183] 5.5.2-2

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index f7acfd15..5963eb4e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "5.5.2-1",
+  "version": "5.5.2-2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index f6c3f635..9ca74c03 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "5.5.2-1",
+  "version": "5.5.2-2",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 3c93a04a585f78df2af0eff38a787851388bf1b4 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 24 Mar 2021 07:49:28 +0000
Subject: [PATCH 1743/3183] get new ws host on error/close

---
 lib/connection/ws.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/connection/ws.js b/lib/connection/ws.js
index f2a97d94..9f89cdd6 100644
--- a/lib/connection/ws.js
+++ b/lib/connection/ws.js
@@ -271,7 +271,9 @@ module.exports = class connectionWS {
       }
 
       // Wait for 5 seconds and try to re-establish the web socket connection
-      await this.funcs.sleep(5000)
+      await this.funcs.sleep(4500)
+      await this.getHost()
+      await this.funcs.sleep(500)
       await this.login()
     })
 
@@ -295,7 +297,9 @@ module.exports = class connectionWS {
       }
 
       // Wait for 5 seconds and try to re-establish the web socket connection
-      await this.funcs.sleep(5000)
+      await this.funcs.sleep(4500)
+      await this.getHost()
+      await this.funcs.sleep(500)
       await this.login()
     })
   }

From 020262fcf34d1c44fc2ccd1f2fbc034fe5af094d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 24 Mar 2021 07:51:22 +0000
Subject: [PATCH 1744/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f8acfd75..a016c286 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,9 +6,14 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 ### Added
 
+* Enter your eWeLink password as a base64 encoded string and use the option `encodedPassword` to let the plugin know
 * Support for zigbee colour temperature lights (ewelink uiid 1258), including:
   * Ikea Tradfri E14 600 lumen
 
+### Changes
+
+* Attempt to request a new web socket host if the connection closes or returns an error
+
 ## 5.5.1 (2021-03-21)
 
 ### Changes

From 042b8df2d251626a3594741bf7cdd1b3882eaa3a Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 24 Mar 2021 07:51:49 +0000
Subject: [PATCH 1745/3183] 5.5.2-3

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 5963eb4e..1059b0cd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "5.5.2-2",
+  "version": "5.5.2-3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 9ca74c03..c3793aad 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "5.5.2-2",
+  "version": "5.5.2-3",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 8a067253e092d68462c03a904c4f6b57b819807f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 24 Mar 2021 07:56:01 +0000
Subject: [PATCH 1746/3183] Update config.schema.json

---
 config.schema.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/config.schema.json b/config.schema.json
index e43c6e1b..b6e82620 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -26,7 +26,8 @@
       },
       "encodedPassword": {
         "title": "Encoded Password",
-        "type": "boolean"
+        "type": "boolean",
+        "description": "If true, the plugin will decode your entered password from a base64 encoded string to plain text and use this to log into eWeLink."
       },
       "mode": {
         "type": "string",

From d48f5b973a0cb490ad9e1f42ee4340ed129889e7 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 24 Mar 2021 07:56:24 +0000
Subject: [PATCH 1747/3183] 5.5.2-4

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 1059b0cd..330d8146 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "5.5.2-3",
+  "version": "5.5.2-4",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index c3793aad..f975da3e 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "5.5.2-3",
+  "version": "5.5.2-4",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From ce093c0ff04028af7357397282f83d0d0d74c913 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 24 Mar 2021 08:46:14 +0000
Subject: [PATCH 1748/3183] minor edits

---
 lib/connection/ws.js | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/lib/connection/ws.js b/lib/connection/ws.js
index 9f89cdd6..f5f4116c 100644
--- a/lib/connection/ws.js
+++ b/lib/connection/ws.js
@@ -25,6 +25,9 @@ module.exports = class connectionWS {
     this.emitter = new (require('events'))()
     this.ws = require('ws')
     this.wsp = require('websocket-as-promised')
+    
+    // Flag used to determine ws connection status
+    this.wsIsOpen = false
   }
 
   async getHost () {
@@ -77,6 +80,11 @@ module.exports = class connectionWS {
 
   login () {
     // Used to create the web socket connection and authenticate
+    
+    // Don't continue if a good connection already exists
+    if (this.wsIsOpen) {
+      return
+    }
 
     // Create the web socket client
     this.wsClient = new this.wsp('wss://' + this.wsHost + ':8080/api/ws', {
@@ -248,7 +256,7 @@ module.exports = class connectionWS {
 
     // Add a listener for when the web socket closes for any reason
     this.wsClient.onClose.addListener(async e => {
-      // Set the global flag to false
+      // Set the connection flag to false
       this.wsIsOpen = false
 
       // Clear the ping interval
@@ -271,15 +279,14 @@ module.exports = class connectionWS {
       }
 
       // Wait for 5 seconds and try to re-establish the web socket connection
-      await this.funcs.sleep(4500)
+      await this.funcs.sleep(6000)
       await this.getHost()
-      await this.funcs.sleep(500)
       await this.login()
     })
 
     // Add a listener for when the web socket throws an error
     this.wsClient.onError.addListener(async e => {
-      // Set the global flag to false
+      // Set the connection flag to false
       this.wsIsOpen = false
 
       // Clear the ping interval
@@ -297,9 +304,8 @@ module.exports = class connectionWS {
       }
 
       // Wait for 5 seconds and try to re-establish the web socket connection
-      await this.funcs.sleep(4500)
+      await this.funcs.sleep(4000)
       await this.getHost()
-      await this.funcs.sleep(500)
       await this.login()
     })
   }

From e30c1249cd77ed6d285b29b72797f1239a354d89 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 24 Mar 2021 12:41:40 +0000
Subject: [PATCH 1749/3183] 5.5.2-5

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 330d8146..d910e6fe 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "5.5.2-4",
+  "version": "5.5.2-5",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index f975da3e..9ddacaff 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "5.5.2-4",
+  "version": "5.5.2-5",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From c51ce6c2812a441fc48f656ecfb413582fea22f0 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 24 Mar 2021 12:43:48 +0000
Subject: [PATCH 1750/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a016c286..2d056cea 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,13 +6,13 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 ### Added
 
-* Enter your eWeLink password as a base64 encoded string and use the option `encodedPassword` to let the plugin know
+* Enter your eWeLink password as a base64 encoded string and use the option `encodedPassword` to let the plugin know ([#223](https://github.com/bwp91/homebridge-ewelink/issues/223))
 * Support for zigbee colour temperature lights (ewelink uiid 1258), including:
   * Ikea Tradfri E14 600 lumen
 
 ### Changes
 
-* Attempt to request a new web socket host if the connection closes or returns an error
+* Attempt to request a new web socket host if the connection closes or returns an error ([#224](https://github.com/bwp91/homebridge-ewelink/issues/224))
 
 ## 5.5.1 (2021-03-21)
 

From 6c8aad005c508c75d957d54b7cfab1973652704f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 24 Mar 2021 12:44:29 +0000
Subject: [PATCH 1751/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2d056cea..c5ad5822 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,7 +7,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 ### Added
 
 * Enter your eWeLink password as a base64 encoded string and use the option `encodedPassword` to let the plugin know ([#223](https://github.com/bwp91/homebridge-ewelink/issues/223))
-* Support for zigbee colour temperature lights (ewelink uiid 1258), including:
+* Support for zigbee colour temperature lights (ewelink uiid 1258) ([#222](https://github.com/bwp91/homebridge-ewelink/issues/222)), including:
   * Ikea Tradfri E14 600 lumen
 
 ### Changes

From 6c1c0eaadde0b23b241cc41df260129fd552f1f9 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 24 Mar 2021 16:47:56 +0000
Subject: [PATCH 1752/3183] catch errors on ws login issues

---
 lib/connection/ws.js | 18 ++++++++++++++----
 lib/index.js         |  2 +-
 lib/utils/lang-en.js |  1 +
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/lib/connection/ws.js b/lib/connection/ws.js
index f5f4116c..4034e9bd 100644
--- a/lib/connection/ws.js
+++ b/lib/connection/ws.js
@@ -25,7 +25,7 @@ module.exports = class connectionWS {
     this.emitter = new (require('events'))()
     this.ws = require('ws')
     this.wsp = require('websocket-as-promised')
-    
+
     // Flag used to determine ws connection status
     this.wsIsOpen = false
   }
@@ -78,9 +78,9 @@ module.exports = class connectionWS {
     }
   }
 
-  login () {
+  async login () {
     // Used to create the web socket connection and authenticate
-    
+
     // Don't continue if a good connection already exists
     if (this.wsIsOpen) {
       return
@@ -98,7 +98,17 @@ module.exports = class connectionWS {
     })
 
     // Open the web socket connection
-    this.wsClient.open()
+    try {
+      await this.wsClient.open()
+    } catch (err) {
+      const errToShow = this.funcs.parseError(err)
+      this.log.warn('%s: %s', this.messages.wsLoginErrRecon, errToShow)
+
+      // Wait for 5 seconds and try to re-establish the web socket connection
+      await this.funcs.sleep(5000)
+      await this.getHost()
+      await this.login()
+    }
 
     // Add a listener to authenticate when a web socket connection is opened
     this.wsClient.onOpen.addListener(async () => {
diff --git a/lib/index.js b/lib/index.js
index dad29f5e..97061159 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -471,7 +471,7 @@ class eWeLinkPlatform {
       if (this.config.mode !== 'lan') {
         this.wsClient = new (require('./connection/ws'))(this, authData)
         await this.wsClient.getHost()
-        this.wsClient.login()
+        await this.wsClient.login()
       }
 
       // Set up the LAN client, scan for devices and start monitoring
diff --git a/lib/utils/lang-en.js b/lib/utils/lang-en.js
index aff26573..df12df49 100644
--- a/lib/utils/lang-en.js
+++ b/lib/utils/lang-en.js
@@ -68,6 +68,7 @@ module.exports = {
   wsLogin: 'Sending WS login request',
   wsLoginErr: 'Unknown WS parameters received',
   wsLoginError: 'WS login failed as',
+  wsLoginErrRecon: 'WS could not be opened and will try again in 5 seconds',
   wsLoginSuccess: 'WS login successful',
   wsLogin406: 'WS login failed [406] please see http://bit.ly/hb-ewelink-err-406',
   wsPingError: 'Cound not send WS ping as',

From 98a915277fc7c25d731fcdaa31d87dc013c1693d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 24 Mar 2021 16:48:22 +0000
Subject: [PATCH 1753/3183] Update ws.js

---
 lib/connection/ws.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/connection/ws.js b/lib/connection/ws.js
index 4034e9bd..3c8bd6dd 100644
--- a/lib/connection/ws.js
+++ b/lib/connection/ws.js
@@ -102,7 +102,7 @@ module.exports = class connectionWS {
       await this.wsClient.open()
     } catch (err) {
       const errToShow = this.funcs.parseError(err)
-      this.log.warn('%s: %s', this.messages.wsLoginErrRecon, errToShow)
+      this.log.warn('%s: %s.', this.messages.wsLoginErrRecon, errToShow)
 
       // Wait for 5 seconds and try to re-establish the web socket connection
       await this.funcs.sleep(5000)

From d5e540704f5ad9abfe705996149e91fe7fe3b827 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 24 Mar 2021 16:48:52 +0000
Subject: [PATCH 1754/3183] 5.5.2-6

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d910e6fe..7ae9d77b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "5.5.2-5",
+  "version": "5.5.2-6",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 9ddacaff..eae1773a 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "5.5.2-5",
+  "version": "5.5.2-6",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 398ce295c5ad8e1260792860bc6e31a2bb409f05 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 24 Mar 2021 17:34:43 +0000
Subject: [PATCH 1755/3183] setup listeners first

---
 lib/connection/ws.js | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/lib/connection/ws.js b/lib/connection/ws.js
index 3c8bd6dd..1feb8689 100644
--- a/lib/connection/ws.js
+++ b/lib/connection/ws.js
@@ -97,19 +97,6 @@ module.exports = class connectionWS {
       timeout: 10000
     })
 
-    // Open the web socket connection
-    try {
-      await this.wsClient.open()
-    } catch (err) {
-      const errToShow = this.funcs.parseError(err)
-      this.log.warn('%s: %s.', this.messages.wsLoginErrRecon, errToShow)
-
-      // Wait for 5 seconds and try to re-establish the web socket connection
-      await this.funcs.sleep(5000)
-      await this.getHost()
-      await this.login()
-    }
-
     // Add a listener to authenticate when a web socket connection is opened
     this.wsClient.onOpen.addListener(async () => {
       this.wsIsOpen = true
@@ -318,6 +305,19 @@ module.exports = class connectionWS {
       await this.getHost()
       await this.login()
     })
+
+    // Open the web socket connection
+    try {
+      await this.wsClient.open()
+    } catch (err) {
+      const errToShow = this.funcs.parseError(err)
+      this.log.warn('%s: %s.', this.messages.wsLoginErrRecon, errToShow)
+
+      // Wait for 5 seconds and try to re-establish the web socket connection
+      await this.funcs.sleep(5000)
+      await this.getHost()
+      await this.login()
+    }
   }
 
   async sendUpdate (json) {

From 682c49c867e5d19cba13acb95706ab02405ed6f9 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 24 Mar 2021 17:36:24 +0000
Subject: [PATCH 1756/3183] 5.5.2-7

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 7ae9d77b..6cadc597 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "5.5.2-6",
+  "version": "5.5.2-7",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index eae1773a..a45a4756 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "5.5.2-6",
+  "version": "5.5.2-7",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From ea4b2a8879289055bd17071f81851953462231db Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 25 Mar 2021 09:33:42 +0000
Subject: [PATCH 1757/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c5ad5822..ff1f3a61 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 All notable changes to this homebridge-ewelink will be documented in this file.
 
-## BETA
+## 5.6.0 (2021-03-25)
 
 ### Added
 
@@ -12,7 +12,9 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 ### Changes
 
-* Attempt to request a new web socket host if the connection closes or returns an error ([#224](https://github.com/bwp91/homebridge-ewelink/issues/224))
+* Improvements to web socket connection: ([#224](https://github.com/bwp91/homebridge-ewelink/issues/224))
+  * On startup, the plugin will wait to connect to the web socket before initialising devices
+  * A new web socket address will be requested if the provided address causes errors
 
 ## 5.5.1 (2021-03-21)
 

From 9ca6bb927263154c0cfe16f0b7a0e6dff5c54b34 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 25 Mar 2021 09:34:14 +0000
Subject: [PATCH 1758/3183] 5.6.0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 6cadc597..f6ed4191 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "5.5.2-7",
+  "version": "5.6.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index a45a4756..f163bfd5 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "5.5.2-7",
+  "version": "5.6.0",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From d06af789520e7d3c2c24cc2afebec821f6bf2296 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 25 Mar 2021 11:45:51 +0000
Subject: [PATCH 1759/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ff1f3a61..704f2133 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 * Improvements to web socket connection: ([#224](https://github.com/bwp91/homebridge-ewelink/issues/224))
   * On startup, the plugin will wait to connect to the web socket before initialising devices
   * A new web socket address will be requested if the provided address causes errors
+  * In particular this should fix the `ENOTFOUND as-pconnect4.coolkit.cc` error that some users in the Asia continent were receiving
 
 ## 5.5.1 (2021-03-21)
 

From ae3420ee717fcfe45d906749e9ea724c3c745ae7 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 26 Mar 2021 08:21:44 +0000
Subject: [PATCH 1760/3183] Update package-lock.json

---
 package-lock.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index f6ed4191..70d934b9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -257,14 +257,14 @@
       }
     },
     "unbox-primitive": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.0.tgz",
-      "integrity": "sha512-P/51NX+JXyxK/aigg1/ZgyccdAxm5K1+n8+tvqSntjOivPt19gvm1VC49RWYetsiub8WViUchdxl/KWHHB0kzA==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.1.tgz",
+      "integrity": "sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw==",
       "requires": {
         "function-bind": "^1.1.1",
-        "has-bigints": "^1.0.0",
-        "has-symbols": "^1.0.0",
-        "which-boxed-primitive": "^1.0.1"
+        "has-bigints": "^1.0.1",
+        "has-symbols": "^1.0.2",
+        "which-boxed-primitive": "^1.0.2"
       }
     },
     "websocket-as-promised": {

From 1454bdcc35f141b1390fd26611d315684bb7f087 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 26 Mar 2021 10:44:07 +0000
Subject: [PATCH 1761/3183] ws amends

---
 lib/connection/ws.js | 366 ++++++++++++++++++++++---------------------
 lib/index.js         |   3 -
 2 files changed, 187 insertions(+), 182 deletions(-)

diff --git a/lib/connection/ws.js b/lib/connection/ws.js
index 1feb8689..356e22d3 100644
--- a/lib/connection/ws.js
+++ b/lib/connection/ws.js
@@ -27,7 +27,7 @@ module.exports = class connectionWS {
     this.wsp = require('websocket-as-promised')
 
     // Flag used to determine ws connection status
-    this.wsIsOpen = false
+    this.wsIsConnected = false
   }
 
   async getHost () {
@@ -81,241 +81,249 @@ module.exports = class connectionWS {
   async login () {
     // Used to create the web socket connection and authenticate
 
+    try {
     // Don't continue if a good connection already exists
-    if (this.wsIsOpen) {
-      return
-    }
-
-    // Create the web socket client
-    this.wsClient = new this.wsp('wss://' + this.wsHost + ':8080/api/ws', {
-      createWebSocket: url => new this.ws(url),
-      extractMessageData: event => event,
-      attachRequestId: (data, requestId) => Object.assign({ sequence: requestId }, data),
-      extractRequestId: data => data && data.sequence,
-      packMessage: data => JSON.stringify(data),
-      unpackMessage: data => data === 'pong' ? data : JSON.parse(data),
-      timeout: 10000
-    })
-
-    // Add a listener to authenticate when a web socket connection is opened
-    this.wsClient.onOpen.addListener(async () => {
-      this.wsIsOpen = true
-      const sequence = Math.floor(new Date()).toString()
-
-      // Generate the login payload for the web socket
-      const payload = {
-        action: 'userOnline',
-        apikey: this.apiKey,
-        appid: this.consts.appId,
-        at: this.aToken,
-        nonce: Math.random().toString(36).substr(2, 8),
-        sequence,
-        ts: Math.floor(new Date() / 1000),
-        userAgent: 'app',
-        version: 8
+      if (this.wsIsConnected) {
+        return
       }
 
-      // Log the web socket login if appropriate
-      if (this.debug) {
-        this.log('%s.', this.messages.wsLogin)
+      if (this.debounce) {
+        return
       }
+      this.debounce = true
+      setTimeout(() => (this.debounce = false), 3000)
 
-      // Attempt to authenticate the web socket connection
-      try {
+      await this.getHost()
+
+      // Create the web socket client
+      this.wsClient = new this.wsp('wss://' + this.wsHost + ':8080/api/ws', {
+        createWebSocket: url => new this.ws(url),
+        extractMessageData: event => event,
+        attachRequestId: (data, requestId) => Object.assign({ sequence: requestId }, data),
+        extractRequestId: data => data && data.sequence,
+        packMessage: data => JSON.stringify(data),
+        unpackMessage: data => data === 'pong' ? data : JSON.parse(data),
+        timeout: 10000
+      })
+
+      // Add a listener to authenticate when a web socket connection is opened
+      this.wsClient.onOpen.addListener(async () => {
+        const sequence = Math.floor(new Date()).toString()
+
+        // Generate the login payload for the web socket
+        const payload = {
+          action: 'userOnline',
+          apikey: this.apiKey,
+          appid: this.consts.appId,
+          at: this.aToken,
+          nonce: Math.random().toString(36).substr(2, 8),
+          sequence,
+          ts: Math.floor(new Date() / 1000),
+          userAgent: 'app',
+          version: 8
+        }
+
+        // Log the web socket login if appropriate
+        if (this.debug) {
+          this.log('%s.', this.messages.wsLogin)
+        }
+
+        // Attempt to authenticate the web socket connection
+        try {
         // Send the request
-        const res = await this.wsClient.sendRequest(payload, { requestId: sequence })
+          const res = await this.wsClient.sendRequest(payload, { requestId: sequence })
 
-        // Parse the response
-        if (res.config && res.config.hb && res.config.hbInterval) {
+          // Parse the response
+          if (res.config && res.config.hb && res.config.hbInterval) {
           // Clear any existing ping intervals
-          if (this.hbInterval) {
-            clearInterval(this.hbInterval)
-          }
+            if (this.hbInterval) {
+              clearInterval(this.hbInterval)
+            }
 
-          // Create a new ping interval
-          this.hbInterval = setInterval(() => {
-            try {
+            // Update the flags
+            this.wsIsConnected = true
+
+            // Create a new ping interval
+            this.hbInterval = setInterval(() => {
+              try {
               // Send the ping
-              this.wsClient.send('ping')
-            } catch (err) {
+                this.wsClient.send('ping')
+              } catch (err) {
               // Catch errors sending ping and show in debug mode
-              if (this.debug) {
-                const eText = this.funcs.parseError(err)
-                this.log.warn('%s %s.', this.messages.wsPingError, eText)
+                if (this.debug) {
+                  const eText = this.funcs.parseError(err)
+                  this.log.warn('%s %s.', this.messages.wsPingError, eText)
+                }
               }
-            }
-          }, (res.config.hbInterval + 7) * 1000)
+            }, (res.config.hbInterval + 7) * 1000)
 
-          // Login was successful and log if appropriate
-          if (this.debug) {
-            this.log('%s.', this.messages.wsLoginSuccess)
-          }
-        } else {
-          // There was a problem with the authentication response
-          if (res.error === 406) {
-            this.log.warn(this.messages.wsLogin406)
+            // Login was successful and log if appropriate
+            if (this.debug) {
+              this.log('%s.', this.messages.wsLoginSuccess)
+            }
           } else {
-            const str = JSON.stringify(res, null, 2)
-            throw new Error(this.messages.wsLoginErr + '\n' + str)
+          // There was a problem with the authentication response
+            if (res.error === 406) {
+              this.log.warn(this.messages.wsLogin406)
+            } else {
+              const str = JSON.stringify(res, null, 2)
+              throw new Error(this.messages.wsLoginErr + '\n' + str)
+            }
           }
-        }
-      } catch (err) {
+        } catch (err) {
         // Catch any errors authenticating the WS connection
-        const eText = this.funcs.parseError(err)
-        this.log.warn('%s %s.', this.messages.wsLoginError, eText)
-      }
-    })
+          const eText = this.funcs.parseError(err)
+          this.log.warn('%s %s.', this.messages.wsLoginError, eText)
+        }
+      })
 
-    // Add a listener for when we receive a WS message
-    this.wsClient.onUnpackedMessage.addListener(device => {
+      // Add a listener for when we receive a WS message
+      this.wsClient.onUnpackedMessage.addListener(device => {
       // Don't continue if it's a simple pong
-      if (device === 'pong') {
-        return
-      }
+        if (device === 'pong') {
+          return
+        }
 
-      // Set a device online flag now which we can change later
-      let onlineStatus = true
+        // Set a device online flag now which we can change later
+        let onlineStatus = true
 
-      // Set up a params object if one didn't already come within the message
-      if (!device.params) {
-        device.params = {}
-      }
+        // Set up a params object if one didn't already come within the message
+        if (!device.params) {
+          device.params = {}
+        }
+
+        // We received a device on/offline or error notification
+        if (device.deviceid && this.funcs.hasProperty(device, 'error')) {
+          device.action = 'update'
+          // Set the online status of the device
+          onlineStatus = device.error === 0
 
-      // We received a device on/offline or error notification
-      if (device.deviceid && this.funcs.hasProperty(device, 'error')) {
-        device.action = 'update'
-        // Set the online status of the device
-        onlineStatus = device.error === 0
-
-        // Check if the device has reported an error
-        if (device.error !== 0) {
-          const str = JSON.stringify(device, null, 2)
-          const redacted = str.replace(this.apiKey, '**hidden**')
-          this.log.warn('[%s] %s.\n%s', device.deviceid, this.messages.wsRec, redacted)
+          // Check if the device has reported an error
+          if (device.error !== 0) {
+            const str = JSON.stringify(device, null, 2)
+            const redacted = str.replace(this.apiKey, '**hidden**')
+            this.log.warn('[%s] %s.\n%s', device.deviceid, this.messages.wsRec, redacted)
+          }
         }
-      }
 
-      // Normally the WS messages comes with an action
-      if (device.action) {
+        // Normally the WS messages comes with an action
+        if (device.action) {
         // Check which action the WS message includes
-        switch (device.action) {
-          case 'update':
-          case 'sysmsg': {
-            if (
-              device.action === 'sysmsg' &&
+          switch (device.action) {
+            case 'update':
+            case 'sysmsg': {
+              if (
+                device.action === 'sysmsg' &&
               this.funcs.hasProperty(device.params, 'online')
-            ) {
+              ) {
               // Update the online/offline status provided in the message
-              onlineStatus = device.params.online
-            }
+                onlineStatus = device.params.online
+              }
 
-            // Loop through the device parameters received
-            for (const param in device.params) {
-              if (this.funcs.hasProperty(device.params, param)) {
+              // Loop through the device parameters received
+              for (const param in device.params) {
+                if (this.funcs.hasProperty(device.params, param)) {
                 // Remove any params that the plugin doesn't need
-                if (!this.consts.paramsToKeep.includes(param.replace(/[0-9]/g, ''))) {
-                  delete device.params[param]
+                  if (!this.consts.paramsToKeep.includes(param.replace(/[0-9]/g, ''))) {
+                    delete device.params[param]
+                  }
                 }
               }
-            }
 
-            if (Object.keys(device.params).length > 0) {
+              if (Object.keys(device.params).length > 0) {
               // Add more params to report back to the plugin
-              device.params.online = onlineStatus
-              device.params.updateSource = 'WS'
+                device.params.online = onlineStatus
+                device.params.updateSource = 'WS'
 
-              // Generate the object to return to the plugin
-              const returnTemplate = {
-                deviceid: device.deviceid,
-                params: device.params
-              }
+                // Generate the object to return to the plugin
+                const returnTemplate = {
+                  deviceid: device.deviceid,
+                  params: device.params
+                }
 
-              // Report the new device params object back to the plugin to deal with
-              this.emitter.emit('update', returnTemplate)
+                // Report the new device params object back to the plugin to deal with
+                this.emitter.emit('update', returnTemplate)
+              }
+              break
             }
-            break
-          }
-          case 'reportSubDevice':
+            case 'reportSubDevice':
             // We don't need to do anything with this action
-            return
-          default: {
-            const str = JSON.stringify(device, null, 2)
-            this.log.warn('[%s] %s.\n%s', device.deviceid, this.messages.wsUnkAct, str)
+              return
+            default: {
+              const str = JSON.stringify(device, null, 2)
+              this.log.warn('[%s] %s.\n%s', device.deviceid, this.messages.wsUnkAct, str)
+            }
           }
-        }
-      } else if (this.funcs.hasProperty(device, 'error') && device.error === 0) {
+        } else if (this.funcs.hasProperty(device, 'error') && device.error === 0) {
         // Safe to ignore these messages
-      } else {
+        } else {
         // WS message received has an unknown action
-        this.log.warn('%s.\n%s', this.messages.wsUnkCmd, JSON.stringify(device, null, 2))
-      }
-    })
+          this.log.warn('%s.\n%s', this.messages.wsUnkCmd, JSON.stringify(device, null, 2))
+        }
+      })
 
-    // Add a listener for when the web socket closes for any reason
-    this.wsClient.onClose.addListener(async e => {
+      // Add a listener for when the web socket closes for any reason
+      this.wsClient.onClose.addListener(async e => {
       // Set the connection flag to false
-      this.wsIsOpen = false
+        this.wsIsConnected = false
 
-      // Clear the ping interval
-      if (this.hbInterval) {
-        clearInterval(this.hbInterval)
-        this.hbInterval = null
-      }
+        // Clear the ping interval
+        if (this.hbInterval) {
+          clearInterval(this.hbInterval)
+          this.hbInterval = null
+        }
 
-      // Remove all existing listeners for web socket events
-      this.wsClient.removeAllListeners()
+        // Remove all existing listeners for web socket events
+        this.wsClient.removeAllListeners()
 
-      // Don't continue further with logging/reconnection if it's a wanted closure
-      if (e === 1005) {
-        return
-      }
+        // Don't continue further with logging/reconnection if it's a wanted closure
+        if (e === 1005) {
+          return
+        }
 
-      // Log that the web socket has closed if appropriate
-      if (this.debug) {
-        this.log.warn('%s [%s].', this.messages.wsReconnect, e)
-      }
+        // Log that the web socket has closed if appropriate
+        if (this.debug) {
+          this.log.warn('%s [%s].', this.messages.wsReconnect, e)
+        }
 
-      // Wait for 5 seconds and try to re-establish the web socket connection
-      await this.funcs.sleep(6000)
-      await this.getHost()
-      await this.login()
-    })
+        // Wait for 4 seconds and try to re-establish the web socket connection
+        await this.funcs.sleep(4000)
+        await this.login()
+      })
 
-    // Add a listener for when the web socket throws an error
-    this.wsClient.onError.addListener(async e => {
+      // Add a listener for when the web socket throws an error
+      this.wsClient.onError.addListener(async e => {
       // Set the connection flag to false
-      this.wsIsOpen = false
+        this.wsIsConnected = false
 
-      // Clear the ping interval
-      if (this.hbInterval) {
-        clearInterval(this.hbInterval)
-        this.hbInterval = null
-      }
+        // Clear the ping interval
+        if (this.hbInterval) {
+          clearInterval(this.hbInterval)
+          this.hbInterval = null
+        }
 
-      // Remove all existing listeners for web socket events
-      this.wsClient.removeAllListeners()
+        // Remove all existing listeners for web socket events
+        this.wsClient.removeAllListeners()
 
-      // Log that the web socket has closed if appropriate
-      if (this.debug) {
-        this.log.warn('%s [%s].', this.messages.wsReconnect, e)
-      }
+        // Log that the web socket has closed if appropriate
+        if (this.debug) {
+          this.log.warn('%s [%s].', this.messages.wsReconnect, e)
+        }
 
-      // Wait for 5 seconds and try to re-establish the web socket connection
-      await this.funcs.sleep(4000)
-      await this.getHost()
-      await this.login()
-    })
+        // Wait for 6 seconds and try to re-establish the web socket connection
+        await this.funcs.sleep(6000)
+        await this.login()
+      })
 
-    // Open the web socket connection
-    try {
+      // Open the web socket connection
       await this.wsClient.open()
     } catch (err) {
+      this.log.error(err)
       const errToShow = this.funcs.parseError(err)
       this.log.warn('%s: %s.', this.messages.wsLoginErrRecon, errToShow)
 
       // Wait for 5 seconds and try to re-establish the web socket connection
       await this.funcs.sleep(5000)
-      await this.getHost()
       await this.login()
     }
   }
@@ -336,7 +344,7 @@ module.exports = class connectionWS {
     }
 
     // Check the web socket is open
-    if (this.wsClient && this.wsIsOpen) {
+    if (this.wsClient && this.wsIsConnected) {
       try {
         // Send the request to eWeLink
         const res = await this.wsClient.sendRequest(toSend, { requestId: sequence })
@@ -393,7 +401,7 @@ module.exports = class connectionWS {
     }
 
     // Check the web socket is open
-    if (this.wsClient && this.wsIsOpen) {
+    if (this.wsClient && this.wsIsConnected) {
       // Send the request
       this.wsClient.send(JSON.stringify(json))
     } else {
@@ -408,7 +416,7 @@ module.exports = class connectionWS {
 
   async closeConnection () {
     // This is called when Homebridge is shutdown
-    if (this.wsClient && this.wsIsOpen) {
+    if (this.wsClient && this.wsIsConnected) {
       // Close the web socket connection
       await this.wsClient.close()
 
diff --git a/lib/index.js b/lib/index.js
index 97061159..8ffd3d35 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -470,7 +470,6 @@ class eWeLinkPlatform {
       // Set up the WS client, get the user WS host, and login
       if (this.config.mode !== 'lan') {
         this.wsClient = new (require('./connection/ws'))(this, authData)
-        await this.wsClient.getHost()
         await this.wsClient.login()
       }
 
@@ -506,9 +505,7 @@ class eWeLinkPlatform {
             if (this.config.debug) {
               this.log('%s.', this.messages.wsRef)
             }
-            await this.wsClient.getHost()
             await this.wsClient.closeConnection()
-            await this.funcs.sleep(250)
             await this.wsClient.login()
           } catch (e) {
             const eText = this.funcs.parseError(e)

From 7525d2c7db0132a32695b147e758ca99bb86acf3 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 26 Mar 2021 10:45:08 +0000
Subject: [PATCH 1762/3183] Update ws.js

---
 lib/connection/ws.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/connection/ws.js b/lib/connection/ws.js
index 356e22d3..e6835369 100644
--- a/lib/connection/ws.js
+++ b/lib/connection/ws.js
@@ -318,7 +318,6 @@ module.exports = class connectionWS {
       // Open the web socket connection
       await this.wsClient.open()
     } catch (err) {
-      this.log.error(err)
       const errToShow = this.funcs.parseError(err)
       this.log.warn('%s: %s.', this.messages.wsLoginErrRecon, errToShow)
 

From 8aa295e60c80ee7cbfdcb99b76dc1d70b000718c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 26 Mar 2021 14:47:40 +0000
Subject: [PATCH 1763/3183] tidy up

---
 lib/connection/ws.js | 62 +++++++++++++++++++++-----------------------
 1 file changed, 29 insertions(+), 33 deletions(-)

diff --git a/lib/connection/ws.js b/lib/connection/ws.js
index e6835369..cbd5ff94 100644
--- a/lib/connection/ws.js
+++ b/lib/connection/ws.js
@@ -80,19 +80,15 @@ module.exports = class connectionWS {
 
   async login () {
     // Used to create the web socket connection and authenticate
-
     try {
-    // Don't continue if a good connection already exists
-      if (this.wsIsConnected) {
-        return
-      }
-
+      // This may be called onClose and onError, we just want it to run once
       if (this.debounce) {
         return
       }
       this.debounce = true
       setTimeout(() => (this.debounce = false), 3000)
 
+      // Refresh the web socket host
       await this.getHost()
 
       // Create the web socket client
@@ -178,9 +174,9 @@ module.exports = class connectionWS {
       })
 
       // Add a listener for when we receive a WS message
-      this.wsClient.onUnpackedMessage.addListener(device => {
+      this.wsClient.onUnpackedMessage.addListener(msg => {
       // Don't continue if it's a simple pong
-        if (device === 'pong') {
+        if (msg === 'pong') {
           return
         }
 
@@ -188,57 +184,57 @@ module.exports = class connectionWS {
         let onlineStatus = true
 
         // Set up a params object if one didn't already come within the message
-        if (!device.params) {
-          device.params = {}
+        if (!msg.params) {
+          msg.params = {}
         }
 
         // We received a device on/offline or error notification
-        if (device.deviceid && this.funcs.hasProperty(device, 'error')) {
-          device.action = 'update'
+        if (msg.deviceid && this.funcs.hasProperty(msg, 'error')) {
+          msg.action = 'update'
           // Set the online status of the device
-          onlineStatus = device.error === 0
+          onlineStatus = msg.error === 0
 
           // Check if the device has reported an error
-          if (device.error !== 0) {
-            const str = JSON.stringify(device, null, 2)
+          if (msg.error !== 0) {
+            const str = JSON.stringify(msg, null, 2)
             const redacted = str.replace(this.apiKey, '**hidden**')
-            this.log.warn('[%s] %s.\n%s', device.deviceid, this.messages.wsRec, redacted)
+            this.log.warn('[%s] %s.\n%s', msg.deviceid, this.messages.wsRec, redacted)
           }
         }
 
         // Normally the WS messages comes with an action
-        if (device.action) {
+        if (msg.action) {
         // Check which action the WS message includes
-          switch (device.action) {
+          switch (msg.action) {
             case 'update':
             case 'sysmsg': {
               if (
-                device.action === 'sysmsg' &&
-              this.funcs.hasProperty(device.params, 'online')
+                msg.action === 'sysmsg' &&
+              this.funcs.hasProperty(msg.params, 'online')
               ) {
               // Update the online/offline status provided in the message
-                onlineStatus = device.params.online
+                onlineStatus = msg.params.online
               }
 
               // Loop through the device parameters received
-              for (const param in device.params) {
-                if (this.funcs.hasProperty(device.params, param)) {
+              for (const param in msg.params) {
+                if (this.funcs.hasProperty(msg.params, param)) {
                 // Remove any params that the plugin doesn't need
                   if (!this.consts.paramsToKeep.includes(param.replace(/[0-9]/g, ''))) {
-                    delete device.params[param]
+                    delete msg.params[param]
                   }
                 }
               }
 
-              if (Object.keys(device.params).length > 0) {
+              if (Object.keys(msg.params).length > 0) {
               // Add more params to report back to the plugin
-                device.params.online = onlineStatus
-                device.params.updateSource = 'WS'
+                msg.params.online = onlineStatus
+                msg.params.updateSource = 'WS'
 
                 // Generate the object to return to the plugin
                 const returnTemplate = {
-                  deviceid: device.deviceid,
-                  params: device.params
+                  deviceid: msg.deviceid,
+                  params: msg.params
                 }
 
                 // Report the new device params object back to the plugin to deal with
@@ -250,15 +246,15 @@ module.exports = class connectionWS {
             // We don't need to do anything with this action
               return
             default: {
-              const str = JSON.stringify(device, null, 2)
-              this.log.warn('[%s] %s.\n%s', device.deviceid, this.messages.wsUnkAct, str)
+              const str = JSON.stringify(msg, null, 2)
+              this.log.warn('[%s] %s.\n%s', msg.deviceid, this.messages.wsUnkAct, str)
             }
           }
-        } else if (this.funcs.hasProperty(device, 'error') && device.error === 0) {
+        } else if (this.funcs.hasProperty(msg, 'error') && msg.error === 0) {
         // Safe to ignore these messages
         } else {
         // WS message received has an unknown action
-          this.log.warn('%s.\n%s', this.messages.wsUnkCmd, JSON.stringify(device, null, 2))
+          this.log.warn('%s.\n%s', this.messages.wsUnkCmd, JSON.stringify(msg, null, 2))
         }
       })
 

From d63a09e1ca04fd177f6576e0bb49016b40905e8a Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 26 Mar 2021 14:48:40 +0000
Subject: [PATCH 1764/3183] 5.6.1-0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 70d934b9..dbf8e244 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "5.6.0",
+  "version": "5.6.1-0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index f163bfd5..03fba57c 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "5.6.0",
+  "version": "5.6.1-0",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 2c478c7c3e895e4a9816f31f9ad8ede0e7835ee6 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 26 Mar 2021 15:36:07 +0000
Subject: [PATCH 1765/3183] Update constants.js

---
 lib/utils/constants.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index b1174928..d1bc4311 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -7,6 +7,7 @@ module.exports = {
     name: 'eWeLink',
     username: '',
     password: '',
+    encodedPassword: false,
     mode: 'auto',
     disableDeviceLogging: false,
     debug: false,

From 20354ab88387e88bc90cbce2f8fa06fb9cecb902 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 28 Mar 2021 14:59:20 +0100
Subject: [PATCH 1766/3183] use correct cache for on/off

---
 lib/device/fan.js | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/lib/device/fan.js b/lib/device/fan.js
index aaffc63c..66f11bcb 100644
--- a/lib/device/fan.js
+++ b/lib/device/fan.js
@@ -74,9 +74,7 @@ module.exports = class deviceFan {
     try {
       callback()
       const params = {
-        switches: this.accessory.context.eweUIID === 126
-          ? this.consts.defaultDoubleSwitchOff
-          : this.consts.defaultMultiSwitchOff
+        switches: this.consts.defaultMultiSwitchOff
       }
       const newPower = value >= 33
       const newSpeed = value
@@ -111,9 +109,7 @@ module.exports = class deviceFan {
     try {
       callback()
       const params = {
-        switches: this.accessory.context.eweUIID === 126
-          ? this.consts.defaultDoubleSwitchOff
-          : this.consts.defaultMultiSwitchOff
+        switches: this.consts.defaultMultiSwitchOff
       }
       const newPower = this.service.getCharacteristic(this.hapChar.On).value
       const newSpeed = this.service.getCharacteristic(this.hapChar.RotationSpeed).value
@@ -143,7 +139,7 @@ module.exports = class deviceFan {
       }
       if (params.switches[1].switch !== this.cacheOnOff) {
         this.cacheOnOff = params.switches[1].switch
-        this.service.updateCharacteristic(this.hapChar.On, this.cacheLight === 'on')
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheOnOff === 'on')
         if (params.updateSource && !this.disableDeviceLogging) {
           this.log('[%s] current state [%s].', this.name, this.cacheOnOff)
         }

From 300161feef2789978bfdfbc7c725e955c984857e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 28 Mar 2021 14:59:47 +0100
Subject: [PATCH 1767/3183] 5.6.1-1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index dbf8e244..bbed5f11 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "5.6.1-0",
+  "version": "5.6.1-1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 03fba57c..363c3d96 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "5.6.1-0",
+  "version": "5.6.1-1",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From aeff13df70c683e8d84d729c2ecacbf02dc53967 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 30 Mar 2021 08:38:03 +0100
Subject: [PATCH 1768/3183] hb 1.3 updates

---
 lib/device/curtain.js              |  29 ++--
 lib/device/diffuser.js             | 168 ++++++++++--------
 lib/device/fan.js                  |  39 +++--
 lib/device/humidifier.js           |  49 ++++--
 lib/device/light-cct.js            | 131 +++++++-------
 lib/device/light-dimmer.js         |  42 +++--
 lib/device/light-rgb-cct.js        | 269 ++++++++++++++---------------
 lib/device/light-rgb.js            |  90 +++++-----
 lib/device/outlet-scm.js           |  19 +-
 lib/device/outlet.js               |  31 ++--
 lib/device/rf-bridge.js            |  11 +-
 lib/device/sensor-ambient.js       |  17 +-
 lib/device/sensor-contact.js       |  10 +-
 lib/device/switch-multi.js         |  94 ++++++----
 lib/device/switch-single.js        |  17 +-
 lib/device/template.js             |  15 +-
 lib/device/thermostat.js           |  57 +++---
 lib/device/zigbee/switch-single.js |  17 +-
 package.json                       |   2 +-
 19 files changed, 618 insertions(+), 489 deletions(-)

diff --git a/lib/device/curtain.js b/lib/device/curtain.js
index d4e24589..1905fdb9 100644
--- a/lib/device/curtain.js
+++ b/lib/device/curtain.js
@@ -36,8 +36,9 @@ module.exports = class deviceCurtain {
       this.accessory.addService(this.hapServ.WindowCovering)
 
     // Add the set handler to the target position characteristic
-    this.service.getCharacteristic(this.hapChar.TargetPosition)
-      .on('set', this.internalUpdate.bind(this))
+    this.service.getCharacteristic(this.hapChar.TargetPosition).onSet(async value => {
+      await this.internalUpdate(value)
+    })
 
     // Output the customised options to the log if in debug mode
     if (this.debug) {
@@ -46,29 +47,26 @@ module.exports = class deviceCurtain {
     }
   }
 
-  async internalUpdate (value, callback) {
+  async internalUpdate (value) {
     try {
-      // Call callback() first to avoid any 'No Response' errors in HomeKit
-      callback()
-
       // Create the params object to send
       const params = {}
 
-      // Update the cache with the new position
-      this.cachePosition = value
-
       // If we are to fully open/close the curtain we can use the switch param
-      if ([0, 100].includes(this.cachePosition)) {
+      if ([0, 100].includes(value)) {
         // 'on' for fully open and 'off' for fully close
-        params.switch = this.cachePosition === 100 ? 'on' : 'off'
+        params.switch = value === 100 ? 'on' : 'off'
       } else {
         // Otherwise for a %-point we can use the setclose param
-        params.setclose = Math.abs(100 - this.cachePosition)
+        params.setclose = Math.abs(100 - value)
       }
 
       // Send the device update
       await this.platform.sendDeviceUpdate(this.accessory, params)
 
+      // Update the cache with the new position
+      this.cachePosition = value
+
       // Log the update if appropriate
       if (!this.disableDeviceLogging) {
         this.log('[%s] current position [%s].', this.name, this.cachePosition)
@@ -76,6 +74,13 @@ module.exports = class deviceCurtain {
     } catch (err) {
       // Catch any errors and let the platform display them
       this.platform.deviceUpdateError(this.accessory, err, true)
+      setTimeout(() => {
+        this.service.updateCharacteristic(
+          this.hapChar.TargetPosition,
+          this.cachePosition
+        )
+      }, 5000)
+      throw new this.platform.api.hap.HapStatusError(-70402)
     }
   }
 
diff --git a/lib/device/diffuser.js b/lib/device/diffuser.js
index e7a502e6..f8a9f855 100644
--- a/lib/device/diffuser.js
+++ b/lib/device/diffuser.js
@@ -35,29 +35,31 @@ module.exports = class deviceDiffuser {
       this.accessory.addService(this.hapServ.Lightbulb, 'Light', 'light')
 
     // Add the set handler to the fan on/off characteristic
-    this.fanService.getCharacteristic(this.hapChar.On)
-      .on('set', this.internalDiffuserOnOffUpdate.bind(this))
+    this.fanService.getCharacteristic(this.hapChar.On).onSet(async value => {
+      await this.internalDiffuserOnOffUpdate(value)
+    })
 
     // Add the set handler to the fan rotation characteristic
     this.fanService.getCharacteristic(this.hapChar.RotationSpeed)
-      .on('set', this.internalDiffuserSpeedUpdate.bind(this))
       .setProps({ minStep: 50 })
+      .onSet(async value => {
+        await this.internalDiffuserSpeedUpdate(value)
+      })
 
     // Add the set handler to the lightbulb on/off characteristic
-    this.lightService.getCharacteristic(this.hapChar.On)
-      .on('set', this.internalLightOnOffUpdate.bind(this))
+    this.lightService.getCharacteristic(this.hapChar.On).onSet(async value => {
+      await this.internalLightOnOffUpdate(value)
+    })
 
     // Add the set handler to the lightbulb brightness characteristic
-    this.lightService.getCharacteristic(this.hapChar.Brightness)
-      .on('set', this.internalLightBrightnessUpdate.bind(this))
+    this.lightService.getCharacteristic(this.hapChar.Brightness).onSet(async value => {
+      await this.internalLightBrightnessUpdate(value)
+    })
 
     // Add the set handler to the lightbulb hue characteristic
-    this.lightService.getCharacteristic(this.hapChar.Hue)
-      .on('set', this.internalLightColourUpdate.bind(this))
-
-    // Add the set handler to the lightbulb saturation characteristic
-    this.lightService.getCharacteristic(this.hapChar.Saturation)
-      .on('set', (value, callback) => callback())
+    this.lightService.getCharacteristic(this.hapChar.Hue).onSet(async value => {
+      await this.internalLightColourUpdate(value)
+    })
 
     // Output the customised options to the log if in debug mode
     if (this.debug) {
@@ -66,35 +68,32 @@ module.exports = class deviceDiffuser {
     }
   }
 
-  async internalDiffuserOnOffUpdate (value, callback) {
+  async internalDiffuserOnOffUpdate (value) {
     try {
-      // Call callback() first to avoid any 'No Response' errors in HomeKit
-      callback()
-
       // Don't continue if the requested new state is the same as the current state
-      const onoff = value ? 'on' : 'off'
-      if (this.cacheOnOff === onoff) {
+      const newValue = value ? 'on' : 'off'
+      if (this.cacheOnOff === newValue) {
         return
       }
 
-      // Update the cache with the new state
-      this.cacheOnOff = onoff
-
       // Create the params object to send
-      const params = { switch: this.cacheOnOff }
+      const params = { switch: newValue }
 
-      // Set up a ten second timeout for the plugin to ignore incoming updates
+      // Set up a five second timeout for the plugin to ignore incoming updates
       const timerKey = Math.random().toString(36).substr(2, 8)
       this.updateTimeout = timerKey
       setTimeout(() => {
         if (this.updateTimeout === timerKey) {
           this.updateTimeout = false
         }
-      }, 10000)
+      }, 5000)
 
       // Send the device update
       await this.platform.sendDeviceUpdate(this.accessory, params)
 
+      // Update the cache with the new state
+      this.cacheOnOff = newValue
+
       // Log the update if appropriate
       if (!this.disableDeviceLogging) {
         this.log('[%s] current state [%s].', this.name, this.cacheOnOff)
@@ -102,32 +101,30 @@ module.exports = class deviceDiffuser {
     } catch (err) {
       // Catch any errors and let the platform display them
       this.platform.deviceUpdateError(this.accessory, err, true)
+      setTimeout(() => {
+        this.fanService.updateCharacteristic(this.hapChar.On, this.cacheOnOff === 'on')
+      }, 5000)
+      throw new this.platform.api.hap.HapStatusError(-70402)
     }
   }
 
-  async internalDiffuserSpeedUpdate (value, callback) {
+  async internalDiffuserSpeedUpdate (value) {
     try {
-      // Call callback() first to avoid any 'No Response' errors in HomeKit
-      callback()
-
       // Don't continue if turning off as this will be handled by on/off handler
       if (value === 0) {
         return
       }
 
       // The new speed can be {50, 100} so use rounding on the new value
-      const newSpeed = value <= 75 ? 50 : 100
+      const newValue = value <= 75 ? 50 : 100
 
       // Check the rounded speed against the current cache value
-      if (newSpeed === this.cacheSpeed) {
+      if (newValue === this.cacheSpeed) {
         return
       }
 
-      // Update the cache value with the new speed
-      this.cacheSpeed = newSpeed
-
       // Create the params object, mapping the state to {50, 100} -> {1, 2}
-      const params = { state: this.cacheSpeed / 50 }
+      const params = { state: newValue / 50 }
 
       // This acts like a debounce function when endlessly sliding the brightness scale
       const updateKeySpeed = Math.random().toString(36).substr(2, 8)
@@ -138,79 +135,88 @@ module.exports = class deviceDiffuser {
       }
 
       // Update the brightness with the new value as some apps don't support minStep
-      this.fanService.updateCharacteristic(this.hapChar.RotationSpeed, this.cacheSpeed)
+      this.fanService.updateCharacteristic(this.hapChar.RotationSpeed, newValue)
 
-      // Set up a ten second timeout for the plugin to ignore incoming updates
+      // Set up a five second timeout for the plugin to ignore incoming updates
       this.updateTimeout = updateKeySpeed
       setTimeout(() => {
         if (this.updateTimeout === updateKeySpeed) {
           this.updateTimeout = false
         }
-      }, 10000)
+      }, 5000)
 
       // Send the device update
       await this.platform.sendDeviceUpdate(this.accessory, params)
 
+      // Update the cache value with the new speed
+      this.cacheSpeed = newValue
+
       // Log the update if appropriate
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current speed [%s%].', this.name, newSpeed)
+        this.log('[%s] current speed [%s%].', this.name, this.cacheSpeed)
       }
     } catch (err) {
       // Catch any errors and let the platform display them
       this.platform.deviceUpdateError(this.accessory, err, true)
+      setTimeout(() => {
+        this.fanService.updateCharacteristic(this.hapChar.On, this.cacheOnOff === 'on')
+      }, 5000)
+      throw new this.platform.api.hap.HapStatusError(-70402)
     }
   }
 
-  async internalLightOnOffUpdate (value, callback) {
+  async internalLightOnOffUpdate (value) {
     try {
-      // Call callback() first to avoid any 'No Response' errors in HomeKit
-      callback()
-
       // Don't continue if the new value is the same as before
-      const onoff = value ? 1 : 0
-      if (this.cacheLightOnOff === onoff) {
+      const newValue = value ? 1 : 0
+      if (this.cacheLightOnOff === newValue) {
         return
       }
 
-      // Update the cache value and set up the params to send object
-      this.cacheLightOnOff = onoff
+      // Create the params object
       const params = { lightswitch: this.cacheLightOnOff }
 
-      // Set up a ten second timeout for the plugin to ignore incoming updates
+      // Set up a five second timeout for the plugin to ignore incoming updates
       const updateKeyLight = Math.random().toString(36).substr(2, 8)
       this.updateTimeout = updateKeyLight
       setTimeout(() => {
         if (this.updateTimeout === updateKeyLight) {
           this.updateTimeout = false
         }
-      }, 10000)
+      }, 5000)
 
       // Send the device update
       await this.platform.sendDeviceUpdate(this.accessory, params)
 
+      // Update the cache value
+      this.cacheLightOnOff = newValue
+
       // Log the update if appropriate
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current light [%s%].', this.name, value ? 'on' : 'off')
+        this.log('[%s] current light [%s%].', this.name, value === 1 ? 'on' : 'off')
       }
     } catch (err) {
       // Catch any errors and let the platform display them
       this.platform.deviceUpdateError(this.accessory, err, true)
+      setTimeout(() => {
+        this.lightService.updateCharacteristic(
+          this.hapChar.On,
+          this.cacheLightOnOff === 'on'
+        )
+      }, 5000)
+      throw new this.platform.api.hap.HapStatusError(-70402)
     }
   }
 
-  async internalLightBrightnessUpdate (value, callback) {
+  async internalLightBrightnessUpdate (value) {
     try {
-      // Call callback() first to avoid any 'No Response' errors in HomeKit
-      callback()
-
       // Don't continue if the new value is the same as before
       if (this.cacheBrightness === value) {
         return
       }
 
-      // Update the cache value and set up the params to send object
-      this.cacheBrightness = value
-      const params = { lightbright: this.cacheBrightness }
+      // Create the params object
+      const params = { lightbright: value }
 
       // This acts like a debounce function when endlessly sliding the brightness scale
       const updateKeyBright = Math.random().toString(36).substr(2, 8)
@@ -220,17 +226,20 @@ module.exports = class deviceDiffuser {
         return
       }
 
-      // Set up a ten second timeout for the plugin to ignore incoming updates
+      // Set up a five second timeout for the plugin to ignore incoming updates
       this.updateTimeout = updateKeyBright
       setTimeout(() => {
         if (this.updateTimeout === updateKeyBright) {
           this.updateTimeout = false
         }
-      }, 10000)
+      }, 5000)
 
       // Send the device update
       await this.platform.sendDeviceUpdate(this.accessory, params)
 
+      // Update the cache value
+      this.cacheBrightness = value
+
       // Log the update if appropriate
       if (!this.disableDeviceLogging) {
         this.log('[%s] current brightness [%s%].', this.name, this.cacheBrightness)
@@ -238,30 +247,30 @@ module.exports = class deviceDiffuser {
     } catch (err) {
       // Catch any errors and let the platform display them
       this.platform.deviceUpdateError(this.accessory, err, true)
+      setTimeout(() => {
+        this.lightService.updateCharacteristic(
+          this.hapChar.On,
+          this.cacheLightOnOff === 'on'
+        )
+      }, 5000)
+      throw new this.platform.api.hap.HapStatusError(-70402)
     }
   }
 
-  async internalLightColourUpdate (value, callback) {
+  async internalLightColourUpdate (value) {
     try {
-      // Call callback() first to avoid any 'No Response' errors in HomeKit
-      callback()
-
       // Don't continue if the light is off or the new value is the same as before
       if (this.cacheOnOff !== 'on' || this.cacheHue === value) {
         return
       }
 
-      // Update the cache value and set up the params to send object
+      // Create the params object
       const sat = this.lightService.getCharacteristic(this.hapChar.Saturation).value
       const newRGB = this.colourUtils.hs2rgb(value, sat)
-      this.cacheHue = value
-      this.cacheR = newRGB[0]
-      this.cacheG = newRGB[0]
-      this.cacheB = newRGB[0]
       const params = {
-        lightRcolor: this.cacheR,
-        lightGcolor: this.cacheG,
-        lightBcolor: this.cacheB
+        lightRcolor: newRGB[0],
+        lightGcolor: newRGB[1],
+        lightBcolor: newRGB[2]
       }
 
       // This acts like a debounce function when endlessly sliding the colour wheel
@@ -272,17 +281,23 @@ module.exports = class deviceDiffuser {
         return
       }
 
-      // Set up a ten second timeout for the plugin to ignore incoming updates
+      // Set up a five second timeout for the plugin to ignore incoming updates
       this.updateTimeout = updateKeyColour
       setTimeout(() => {
         if (this.updateTimeout === updateKeyColour) {
           this.updateTimeout = false
         }
-      }, 10000)
+      }, 5000)
 
       // Send the device update
       await this.platform.sendDeviceUpdate(this.accessory, params)
 
+      // Update the cache values
+      this.cacheHue = value
+      this.cacheR = newRGB[0]
+      this.cacheG = newRGB[0]
+      this.cacheB = newRGB[0]
+
       // Log the update if appropriate
       if (!this.disableDeviceLogging) {
         this.log(
@@ -296,6 +311,13 @@ module.exports = class deviceDiffuser {
     } catch (err) {
       // Catch any errors and let the platform display them
       this.platform.deviceUpdateError(this.accessory, err, true)
+      setTimeout(() => {
+        this.lightService.updateCharacteristic(
+          this.hapChar.On,
+          this.cacheLightOnOff === 'on'
+        )
+      }, 5000)
+      throw new this.platform.api.hap.HapStatusError(-70402)
     }
   }
 
diff --git a/lib/device/fan.js b/lib/device/fan.js
index 66f11bcb..bb7da237 100644
--- a/lib/device/fan.js
+++ b/lib/device/fan.js
@@ -31,18 +31,18 @@ module.exports = class deviceFan {
       this.accessory.addService(this.hapServ.Fan)
 
     // Add the set handler to the fan on/off characteristic
-    this.service.getCharacteristic(this.hapChar.On)
-      .on('set', (value, callback) => {
-        callback()
-        if (!value) {
-          this.service.setCharacteristic(this.hapChar.RotationSpeed, 0)
-        }
-      })
+    this.service.getCharacteristic(this.hapChar.On).onSet(async value => {
+      if (!value) {
+        this.service.updateCharacteristic(this.hapChar.RotationSpeed, 0)
+        await this.internalSpeedUpdate(0)
+      }
+    })
 
     // Add the set handler to the fan rotation speed characteristic
-    this.service.getCharacteristic(this.hapChar.RotationSpeed)
-      .on('set', this.internalSpeedUpdate.bind(this))
-      .setProps({ minStep: 33 })
+    this.service.getCharacteristic(this.hapChar.RotationSpeed).setProps({ minStep: 33 })
+      .onSet(async value => {
+        await this.internalSpeedUpdate(value)
+      })
 
     // Check to see if the user has hidden the light channel
     if (this.hideLight) {
@@ -56,8 +56,9 @@ module.exports = class deviceFan {
         this.accessory.addService(this.hapServ.Lightbulb)
 
       // Add the set handler to the lightbulb on/off characteristic
-      this.lightService.getCharacteristic(this.hapChar.On)
-        .on('set', this.internalLightUpdate.bind(this))
+      this.lightService.getCharacteristic(this.hapChar.On).onSet(async value => {
+        await this.internalLightUpdate(value)
+      })
     }
 
     // Output the customised options to the log if in debug mode
@@ -70,9 +71,8 @@ module.exports = class deviceFan {
     }
   }
 
-  async internalSpeedUpdate (value, callback) {
+  async internalSpeedUpdate (value) {
     try {
-      callback()
       const params = {
         switches: this.consts.defaultMultiSwitchOff
       }
@@ -102,12 +102,15 @@ module.exports = class deviceFan {
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
+      setTimeout(() => {
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheOnOff === 'on')
+      }, 5000)
+      throw new this.platform.api.hap.HapStatusError(-70402)
     }
   }
 
-  async internalLightUpdate (value, callback) {
+  async internalLightUpdate (value) {
     try {
-      callback()
       const params = {
         switches: this.consts.defaultMultiSwitchOff
       }
@@ -129,6 +132,10 @@ module.exports = class deviceFan {
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
+      setTimeout(() => {
+        this.lightService.updateCharacteristic(this.hapChar.On, this.cacheLight === 'on')
+      }, 5000)
+      throw new this.platform.api.hap.HapStatusError(-70402)
     }
   }
 
diff --git a/lib/device/humidifier.js b/lib/device/humidifier.js
index f7f2be2f..005ad781 100644
--- a/lib/device/humidifier.js
+++ b/lib/device/humidifier.js
@@ -29,23 +29,23 @@ module.exports = class deviceHumidifier {
       this.accessory.addService(this.hapServ.Fan)
 
     // Add the set handler to the fan on/off characteristic
-    this.service.getCharacteristic(this.hapChar.On)
-      .on('set', (value, callback) => {
-        callback()
-        if (!value) {
-          this.service.setCharacteristic(this.hapChar.RotationSpeed, 0)
-        }
-      })
+    this.service.getCharacteristic(this.hapChar.On).onSet(async value => {
+      if (!value) {
+        this.service.updateCharacteristic(this.hapChar.RotationSpeed, 0)
+        await this.internalUpdate(0)
+      }
+    })
 
     // Add the set handler to the fan rotation speed characteristic
     this.service.getCharacteristic(this.hapChar.RotationSpeed)
-      .on('set', this.internalUpdate.bind(this))
       .setProps({ minStep: 33 })
+      .onSet(async value => {
+        await this.internalUpdate(value)
+      })
   }
 
-  async internalUpdate (value, callback) {
+  async internalUpdate (value) {
     try {
-      callback()
       const updateKey = Math.random().toString(36).substr(2, 8)
       this.updateKey = updateKey
       await this.funcs.sleep(350)
@@ -54,12 +54,10 @@ module.exports = class deviceHumidifier {
       }
       const params = {}
       if (value <= 25) {
-        this.service.updateCharacteristic(this.hapChar.RotationSpeed, 0)
         if (this.cacheOnOff === 'off') {
           return
         }
-        this.cacheOnOff = 'off'
-        params.switch = this.cacheOnOff
+        params.switch = 'off'
       } else {
         let newState
         if (value > 25 && value <= 50) {
@@ -69,21 +67,38 @@ module.exports = class deviceHumidifier {
         } else {
           newState = 3
         }
-        this.service.updateCharacteristic(this.hapChar.RotationSpeed, newState * 33)
         if (this.cacheState === newState) {
           return
         }
+        params.switch = 'on'
+        params.state = newState
+      }
+      await this.platform.sendDeviceUpdate(this.accessory, params)
+      if (value <= 25) {
+        this.service.updateCharacteristic(this.hapChar.RotationSpeed, 0)
+        this.cacheOnOff = 'off'
+      } else {
+        let newState
+        if (value > 25 && value <= 50) {
+          newState = 1
+        } else if (value > 50 && value <= 75) {
+          newState = 2
+        } else {
+          newState = 3
+        }
+        this.service.updateCharacteristic(this.hapChar.RotationSpeed, newState * 33)
         this.cacheOnOff = 'on'
         this.cacheState = newState
-        params.switch = this.cacheOnOff
-        params.state = this.cacheState
         if (!this.disableDeviceLogging) {
           this.log('[%s] current mode [%s%].', this.name, this.cacheState)
         }
       }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
+      setTimeout(() => {
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheOnOff === 'on')
+      }, 5000)
+      throw new this.platform.api.hap.HapStatusError(-70402)
     }
   }
 
diff --git a/lib/device/light-cct.js b/lib/device/light-cct.js
index 790389a4..c51500bb 100644
--- a/lib/device/light-cct.js
+++ b/lib/device/light-cct.js
@@ -55,33 +55,31 @@ module.exports = class deviceLightCCT {
       this.accessory.addService(this.hapServ.Lightbulb)
 
     // Add the set handler to the lightbulb on/off characteristic
-    this.service.getCharacteristic(this.hapChar.On)
-      .on('set', this.internalOnOffUpdate.bind(this))
+    this.service.getCharacteristic(this.hapChar.On).onSet(async value => {
+      await this.internalOnOffUpdate(value)
+    })
 
     // Add the set handler to the lightbulb brightness characteristic
     this.service.getCharacteristic(this.hapChar.Brightness)
-      .on('set', this.internalBrightnessUpdate.bind(this))
       .setProps({ minStep: this.brightStep })
+      .onSet(async value => {
+        await this.internalBrightnessUpdate(value)
+      })
 
     // Add the set handler to the lightbulb colour temperature characteristic
-    this.service.getCharacteristic(this.hapChar.ColorTemperature)
-      .on('set', this.internalCTempUpdate.bind(this))
+    this.service.getCharacteristic(this.hapChar.ColorTemperature).onSet(async value => {
+      this.internalCTempUpdate(value)
+    })
 
-    // Set up the adaptive lighting controller if available
-    if (
-      platform.api.versionGreaterOrEqual &&
-      platform.api.versionGreaterOrEqual('1.3.0')
-    ) {
-      // This is needed as sometimes we need to send the brightness with a cct update
-      this.cacheBrightness = this.service.getCharacteristic(this.hapChar.Brightness).value
+    // This is needed as sometimes we need to send the brightness with a cct update
+    this.cacheBrightness = this.service.getCharacteristic(this.hapChar.Brightness).value
 
-      // Set up the adaptive lighting controller
-      this.alController = new platform.api.hap.AdaptiveLightingController(
-        this.service,
-        { customTemperatureAdjustment: this.alShift }
-      )
-      this.accessory.configureController(this.alController)
-    }
+    // Set up the adaptive lighting controller
+    this.alController = new platform.api.hap.AdaptiveLightingController(
+      this.service,
+      { customTemperatureAdjustment: this.alShift }
+    )
+    this.accessory.configureController(this.alController)
 
     // Output the customised options to the log if in debug mode
     if (this.debug) {
@@ -95,48 +93,42 @@ module.exports = class deviceLightCCT {
     }
   }
 
-  async internalOnOffUpdate (value, callback) {
+  async internalOnOffUpdate (value) {
     try {
-      callback()
-      const onoff = value ? 'on' : 'off'
-      if (this.cacheOnOff === onoff) {
+      const newValue = value ? 'on' : 'off'
+      if (this.cacheOnOff === newValue) {
         return
       }
-      this.cacheOnOff = onoff
       const timerKey = Math.random().toString(36).substr(2, 8)
       this.updateTimeout = timerKey
       setTimeout(() => {
         if (this.updateTimeout === timerKey) {
           this.updateTimeout = false
         }
-      }, 10000)
+      }, 5000)
       await this.platform.sendDeviceUpdate(this.accessory, {
-        switch: this.cacheOnOff
+        switch: newValue
       })
+      this.cacheOnOff = newValue
       if (!this.disableDeviceLogging) {
         this.log('[%s] current state [%s].', this.name, this.cacheOnOff)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
+      setTimeout(() => {
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheOnOff === 'on')
+      }, 5000)
+      throw new this.platform.api.hap.HapStatusError(-70402)
     }
   }
 
-  async internalBrightnessUpdate (value, callback) {
+  async internalBrightnessUpdate (value) {
     try {
       if (this.cacheBrightness === value) {
-        callback()
         return
       }
-      this.cacheBrightness = value
-      callback()
       const updateKeyBright = Math.random().toString(36).substr(2, 8)
       this.updateKeyBright = updateKeyBright
-      const params = {
-        white: {
-          br: this.cacheBrightness,
-          ct: this.cacheCT
-        }
-      }
       await this.funcs.sleep(500)
       if (updateKeyBright !== this.updateKeyBright) {
         return
@@ -146,36 +138,30 @@ module.exports = class deviceLightCCT {
         if (this.updateTimeout === updateKeyBright) {
           this.updateTimeout = false
         }
-      }, 10000)
+      }, 5000)
+      const params = {
+        white: {
+          br: value,
+          ct: this.cacheCT
+        }
+      }
       await this.platform.sendDeviceUpdate(this.accessory, params)
+      this.cacheBrightness = value
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current brightness [%s%].', this.name, value)
+        this.log('[%s] current brightness [%s%].', this.name, this.cacheBrightness)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
+      setTimeout(() => {
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheOnOff === 'on')
+      }, 5000)
+      throw new this.platform.api.hap.HapStatusError(-70402)
     }
   }
 
-  async internalCTempUpdate (value, callback) {
+  async internalCTempUpdate (value) {
     try {
-      if (this.cacheMired === value) {
-        callback()
-        return
-      }
-      this.cacheMired = value
-      callback()
-      const kelvin = Math.round(1000000 / this.cacheMired)
-      const scaledK = Math.max(Math.min(kelvin, this.maxK), this.minK)
-      this.cacheCT = Math.round(((scaledK - this.minK) / (this.maxK - this.minK)) * 255)
-      const params = {
-        white: {
-          br: this.cacheBrightness,
-          ct: this.cacheCT
-        }
-      }
-      // For adaptive lighting we still want to update the would have been so
-      // it's not disabled when the light comes back on so do this check now not before
-      if (this.cacheOnOff !== 'on') {
+      if (this.cacheMired === value || this.cacheOnOff !== 'on') {
         return
       }
       const updateKeyCT = Math.random().toString(36).substr(2, 8)
@@ -189,8 +175,19 @@ module.exports = class deviceLightCCT {
         if (this.updateTimeout === updateKeyCT) {
           this.updateTimeout = false
         }
-      }, 10000)
+      }, 5000)
+      const kelvin = Math.round(1000000 / value)
+      const scaledK = Math.max(Math.min(kelvin, this.maxK), this.minK)
+      const scaledCT = Math.round(((scaledK - this.minK) / (this.maxK - this.minK)) * 255)
+      const params = {
+        white: {
+          br: this.cacheBrightness,
+          ct: scaledCT
+        }
+      }
       await this.platform.sendDeviceUpdate(this.accessory, params)
+      this.cacheMired = value
+      this.cacheCT = scaledCT
       if (!this.disableDeviceLogging) {
         if (this.alController && this.alController.isAdaptiveLightingActive()) {
           this.log('[%s] current cct [%sK] via adaptive lighting.', this.name, scaledK)
@@ -200,6 +197,10 @@ module.exports = class deviceLightCCT {
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
+      setTimeout(() => {
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheOnOff === 'on')
+      }, 5000)
+      throw new this.platform.api.hap.HapStatusError(-70402)
     }
   }
 
@@ -235,18 +236,16 @@ module.exports = class deviceLightCCT {
           const kelvin = this.cacheCT / 255 * (this.maxK - this.minK) + this.minK
           const scaledK = Math.round(kelvin)
           this.cacheMired = Math.min(Math.max(Math.round(1000000 / scaledK), 140), 500)
-          this.service
-            .updateCharacteristic(this.hapChar.ColorTemperature, this.cacheMired)
+          this.service.updateCharacteristic(
+            this.hapChar.ColorTemperature,
+            this.cacheMired
+          )
           if (params.updateSource) {
             if (!this.disableDeviceLogging) {
               this.log('[%s] current cct [%sK].', this.name, scaledK)
             }
-            if (
-              this.alController &&
-              this.alController.isAdaptiveLightingActive() &&
-              ctDiff > 20
-            ) {
-              // look for a variation greater than five
+            if (this.alController.isAdaptiveLightingActive() && ctDiff > 20) {
+              // look for a variation greater than twenty
               this.alController.disableAdaptiveLighting()
               this.log(
                 '[%s] adaptive lighting disabled due to significant colour change.',
diff --git a/lib/device/light-dimmer.js b/lib/device/light-dimmer.js
index 231d3ccb..99cbd954 100644
--- a/lib/device/light-dimmer.js
+++ b/lib/device/light-dimmer.js
@@ -33,13 +33,16 @@ module.exports = class deviceLightDimmer {
       this.accessory.addService(this.hapServ.Lightbulb)
 
     // Add the set handler to the lightbulb on/off characteristic
-    this.service.getCharacteristic(this.hapChar.On)
-      .on('set', this.internalOnOffUpdate.bind(this))
+    this.service.getCharacteristic(this.hapChar.On).onSet(async value => {
+      await this.internalOnOffUpdate(value)
+    })
 
     // Add the set handler to the lightbulb brightness characteristic
     this.service.getCharacteristic(this.hapChar.Brightness)
-      .on('set', this.internalBrightnessUpdate.bind(this))
       .setProps({ minStep: this.brightStep })
+      .onSet(async value => {
+        await this.internalBrightnessUpdate(value)
+      })
 
     // Output the customised options to the log if in debug mode
     if (this.debug) {
@@ -51,54 +54,54 @@ module.exports = class deviceLightDimmer {
     }
   }
 
-  async internalOnOffUpdate (value, callback) {
+  async internalOnOffUpdate (value) {
     try {
-      callback()
-      const onoff = value ? 'on' : 'off'
-      if (this.cacheOnOff === onoff) {
+      const newValue = value ? 'on' : 'off'
+      if (this.cacheOnOff === newValue) {
         return
       }
-      this.cacheOnOff = onoff
       const params = {}
       switch (this.accessory.context.eweUIID) {
         case 36:
         case 44:
-          params.switch = this.cacheOnOff
+          params.switch = newValue
           break
         case 57:
-          params.state = this.cacheOnOff
+          params.state = newValue
           break
       }
       await this.platform.sendDeviceUpdate(this.accessory, params)
+      this.cacheOnOff = newValue
       if (!this.disableDeviceLogging) {
         this.log('[%s] current state [%s].', this.name, this.cacheOnOff)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
+      setTimeout(() => {
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheOnOff === 'on')
+      }, 5000)
+      throw new this.platform.api.hap.HapStatusError(-70402)
     }
   }
 
-  async internalBrightnessUpdate (value, callback) {
+  async internalBrightnessUpdate (value) {
     try {
       if (this.cacheBrightness === value) {
-        callback()
         return
       }
-      this.cacheBrightness = value
-      callback()
       const params = {}
       switch (this.accessory.context.eweUIID) {
         case 36:
-          params.bright = Math.round((this.cacheBrightness * 9) / 10 + 10)
+          params.bright = Math.round((value * 9) / 10 + 10)
           // KING-M4 eWeLink scale is 10-100 and HomeKit scale is 0-100
           break
         case 44:
-          params.brightness = this.cacheBrightness
+          params.brightness = value
           // D1 eWeLink scale matches HomeKit scale of 0-100
           params.mode = 0
           break
         case 57:
-          params.channel0 = Math.round((this.cacheBrightness * 23) / 10 + 25).toString()
+          params.channel0 = Math.round((value * 23) / 10 + 25).toString()
           // Device eWeLink scale is 25-255 and HomeKit scale is 0-100.
           break
       }
@@ -109,11 +112,16 @@ module.exports = class deviceLightDimmer {
         return
       }
       await this.platform.sendDeviceUpdate(this.accessory, params)
+      this.cacheBrightness = value
       if (!this.disableDeviceLogging) {
         this.log('[%s] current brightness [%s%].', this.name, this.cacheBrightness)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
+      setTimeout(() => {
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheOnOff === 'on')
+      }, 5000)
+      throw new this.platform.api.hap.HapStatusError(-70402)
     }
   }
 
diff --git a/lib/device/light-rgb-cct.js b/lib/device/light-rgb-cct.js
index ec9337da..78cc3923 100644
--- a/lib/device/light-rgb-cct.js
+++ b/lib/device/light-rgb-cct.js
@@ -42,41 +42,36 @@ module.exports = class deviceLightRGBCCT {
       this.accessory.addService(this.hapServ.Lightbulb)
 
     // Add the set handler to the lightbulb on/off characteristic
-    this.service.getCharacteristic(this.hapChar.On)
-      .on('set', this.internalOnOffUpdate.bind(this))
+    this.service.getCharacteristic(this.hapChar.On).onSet(async value => {
+      await this.internalOnOffUpdate(value)
+    })
 
     // Add the set handler to the lightbulb brightness characteristic
     this.service.getCharacteristic(this.hapChar.Brightness)
-      .on('set', this.internalBrightnessUpdate.bind(this))
       .setProps({ minStep: this.brightStep })
+      .onSet(async value => {
+        await this.internalBrightnessUpdate(value)
+      })
 
     // Add the set handler to the lightbulb hue characteristic
-    this.service.getCharacteristic(this.hapChar.Hue)
-      .on('set', this.internalColourUpdate.bind(this))
-
-    // Add the set handler to the lightbulb saturation characteristic
-    this.service.getCharacteristic(this.hapChar.Saturation)
-      .on('set', (value, callback) => callback())
+    this.service.getCharacteristic(this.hapChar.Hue).onSet(async value => {
+      await this.internalColourUpdate(value)
+    })
 
     // Add the set handler to the lightbulb colour temperature characteristic
-    this.service.getCharacteristic(this.hapChar.ColorTemperature)
-      .on('set', this.internalCTempUpdate.bind(this))
+    this.service.getCharacteristic(this.hapChar.ColorTemperature).onSet(async value => {
+      await this.internalCTempUpdate(value)
+    })
 
-    // Set up the adaptive lighting controller if available
-    if (
-      platform.api.versionGreaterOrEqual &&
-      platform.api.versionGreaterOrEqual('1.3.0')
-    ) {
-      // This is needed as sometimes we need to send the brightness with a cct update
-      this.cacheBright = this.service.getCharacteristic(this.hapChar.Brightness).value
+    // This is needed as sometimes we need to send the brightness with a cct update
+    this.cacheBright = this.service.getCharacteristic(this.hapChar.Brightness).value
 
-      // Set up the adaptive lighting controller
-      this.alController = new platform.api.hap.AdaptiveLightingController(
-        this.service,
-        { customTemperatureAdjustment: this.alShift }
-      )
-      this.accessory.configureController(this.alController)
-    }
+    // Set up the adaptive lighting controller
+    this.alController = new platform.api.hap.AdaptiveLightingController(
+      this.service,
+      { customTemperatureAdjustment: this.alShift }
+    )
+    this.accessory.configureController(this.alController)
 
     // Output the customised options to the log if in debug mode
     if (this.debug) {
@@ -89,43 +84,52 @@ module.exports = class deviceLightRGBCCT {
     }
   }
 
-  async internalOnOffUpdate (value, callback) {
+  async internalOnOffUpdate (value) {
     try {
-      callback()
-      const params = {}
-      const onoff = value ? 'on' : 'off'
-      if (this.cacheOnOff === onoff) {
+      const newValue = value ? 'on' : 'off'
+      if (this.cacheOnOff === newValue) {
         return
       }
-      this.cacheOnOff = onoff
-      params.switch = this.cacheOnOff
       const timerKey = Math.random().toString(36).substr(2, 8)
       this.updateTimeout = timerKey
       setTimeout(() => {
         if (this.updateTimeout === timerKey) {
           this.updateTimeout = false
         }
-      }, 10000)
+      }, 5000)
+      const params = { switch: newValue }
       await this.platform.sendDeviceUpdate(this.accessory, params)
+      this.cacheOnOff = newValue
       if (!this.disableDeviceLogging) {
         this.log('[%s] current state [%s].', this.name, this.cacheOnOff)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
+      setTimeout(() => {
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheOnOff === 'on')
+      }, 5000)
+      throw new this.platform.api.hap.HapStatusError(-70402)
     }
   }
 
-  async internalBrightnessUpdate (value, callback) {
+  async internalBrightnessUpdate (value) {
     try {
       if (this.cacheBright === value) {
-        callback()
         return
       }
-      this.cacheBright = value
-      callback()
       let params
       const updateKeyBright = Math.random().toString(36).substr(2, 8)
       this.updateKeyBright = updateKeyBright
+      await this.funcs.sleep(500)
+      if (updateKeyBright !== this.updateKeyBright) {
+        return
+      }
+      this.updateTimeout = updateKeyBright
+      setTimeout(() => {
+        if (this.updateTimeout === updateKeyBright) {
+          this.updateTimeout = false
+        }
+      }, 5000)
       switch (this.accessory.context.eweUIID) {
         case 59:
           // L1
@@ -155,50 +159,49 @@ module.exports = class deviceLightRGBCCT {
           }
           break
       }
-      await this.funcs.sleep(500)
-      if (updateKeyBright !== this.updateKeyBright) {
-        return
-      }
-      this.updateTimeout = updateKeyBright
-      setTimeout(() => {
-        if (this.updateTimeout === updateKeyBright) {
-          this.updateTimeout = false
-        }
-      }, 10000)
       await this.platform.sendDeviceUpdate(this.accessory, params)
+      this.cacheBright = value
       if (!this.disableDeviceLogging) {
         this.log('[%s] current brightness [%s%].', this.name, value)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
+      setTimeout(() => {
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheOnOff === 'on')
+      }, 5000)
+      throw new this.platform.api.hap.HapStatusError(-70402)
     }
   }
 
-  async internalColourUpdate (value, callback) {
+  async internalColourUpdate (value) {
     try {
-      if (this.cacheHue === value) {
-        callback()
+      if (this.cacheHue === value || this.cacheOnOff !== 'on') {
         return
       }
-      this.cacheHue = value
+      const updateKeyColour = Math.random().toString(36).substr(2, 8)
+      this.updateKeyColour = updateKeyColour
+      await this.funcs.sleep(400)
+      if (updateKeyColour !== this.updateKeyColour) {
+        return
+      }
+      this.updateTimeout = updateKeyColour
+      setTimeout(() => {
+        if (this.updateTimeout === updateKeyColour) {
+          this.updateTimeout = false
+        }
+      }, 5000)
       this.service.updateCharacteristic(this.hapChar.ColorTemperature, 140)
-      callback()
       let params
-      const saturation = this.service.getCharacteristic(this.hapChar.Saturation).value
-      const newRGB = this.colourUtils.hs2rgb(value, saturation)
-      this.cacheR = newRGB[0]
-      this.cacheG = newRGB[1]
-      this.cacheB = newRGB[2]
-      this.cacheMired = 0
-      this.cacheCT = 0
+      const sat = this.service.getCharacteristic(this.hapChar.Saturation).value
+      const rgb = this.colourUtils.hs2rgb(value, sat)
       switch (this.accessory.context.eweUIID) {
         case 59:
           // L1
           params = {
             mode: 1,
-            colorR: this.cacheR,
-            colorG: this.cacheG,
-            colorB: this.cacheB
+            colorR: rgb[0],
+            colorG: rgb[1],
+            colorB: rgb[2]
           }
           break
         case 104:
@@ -207,32 +210,23 @@ module.exports = class deviceLightRGBCCT {
             ltype: this.cacheMode === 'color' ? undefined : 'color',
             color: {
               br: this.cacheBright,
-              r: this.cacheR,
-              g: this.cacheG,
-              b: this.cacheB
+              r: rgb[0],
+              g: rgb[1],
+              b: rgb[2]
             }
           }
-          this.cacheMode = 'color'
           break
       }
-      // For adaptive lighting we still want to update the would have been so
-      // it's not disabled when the light comes back on so do this check now not before
-      if (this.cacheOnOff !== 'on') {
-        return
-      }
-      const updateKeyColour = Math.random().toString(36).substr(2, 8)
-      this.updateKeyColour = updateKeyColour
-      await this.funcs.sleep(400)
-      if (updateKeyColour !== this.updateKeyColour) {
-        return
-      }
-      this.updateTimeout = updateKeyColour
-      setTimeout(() => {
-        if (this.updateTimeout === updateKeyColour) {
-          this.updateTimeout = false
-        }
-      }, 10000)
       await this.platform.sendDeviceUpdate(this.accessory, params)
+      this.cacheHue = value
+      this.cacheR = rgb[0]
+      this.cacheG = rgb[1]
+      this.cacheB = rgb[2]
+      this.cacheMired = 0
+      this.cacheCT = 0
+      if (this.accessory.context.eweUIID === 104) {
+        this.cacheMode = 'color'
+      }
       if (!this.disableDeviceLogging) {
         this.log(
           '[%s] current colour [rgb %s %s %s].',
@@ -244,37 +238,46 @@ module.exports = class deviceLightRGBCCT {
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
+      setTimeout(() => {
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheOnOff === 'on')
+      }, 5000)
+      throw new this.platform.api.hap.HapStatusError(-70402)
     }
   }
 
-  async internalCTempUpdate (value, callback) {
+  async internalCTempUpdate (value) {
     try {
-      if (this.cacheMired === value) {
-        callback()
+      if (this.cacheMired === value || this.cacheOnOff !== 'on') {
         return
       }
-      this.cacheMired = value
-      const hs = this.colourUtils.m2hs(this.cacheMired)
-      this.cacheHue = hs[0]
-      this.service.updateCharacteristic(this.hapChar.Hue, this.cacheHue)
-        .updateCharacteristic(this.hapChar.Saturation, hs[1])
-      callback()
+      const updateKeyCT = Math.random().toString(36).substr(2, 8)
+      this.updateKeyCT = updateKeyCT
+      await this.funcs.sleep(400)
+      if (updateKeyCT !== this.updateKeyCT) {
+        return
+      }
+      this.updateTimeout = updateKeyCT
+      setTimeout(() => {
+        if (this.updateTimeout === updateKeyCT) {
+          this.updateTimeout = false
+        }
+      }, 5000)
+      const hs = this.colourUtils.m2hs(value)
+      this.service.updateCharacteristic(this.hapChar.Hue, hs[0])
+      this.service.updateCharacteristic(this.hapChar.Saturation, hs[1])
       const mToK = Math.max(Math.min(Math.round(1000000 / value), 6500), 2700)
-      this.cacheCT = Math.round(((mToK - 2700) / 3800) * 255)
-      this.cacheHue = 0
+      const scaledCT = Math.round(((mToK - 2700) / 3800) * 255)
       let params
+      let newRGB
       switch (this.accessory.context.eweUIID) {
         case 59: {
           // L1
-          const newRGB = this.colourUtils.k2rgb(mToK)
-          this.cacheR = newRGB[0]
-          this.cacheG = newRGB[1]
-          this.cacheB = newRGB[2]
+          newRGB = this.colourUtils.k2rgb(mToK)
           params = {
             mode: 1,
-            colorR: this.cacheR,
-            colorG: this.cacheG,
-            colorB: this.cacheB
+            colorR: newRGB[0],
+            colorG: newRGB[1],
+            colorB: newRGB[2]
           }
           break
         }
@@ -284,32 +287,30 @@ module.exports = class deviceLightRGBCCT {
             ltype: this.cacheMode === 'white' ? undefined : 'white',
             white: {
               br: this.cacheBright,
-              ct: this.cacheCT
+              ct: scaledCT
             }
           }
-          this.cacheMode = 'white'
           break
       }
-      // For adaptive lighting we still want to update the would have been so
-      // it's not disabled when the light comes back on so do this check now not before
-      if (this.cacheOnOff !== 'on') {
-        return
-      }
-      const updateKeyCT = Math.random().toString(36).substr(2, 8)
-      this.updateKeyCT = updateKeyCT
-      await this.funcs.sleep(400)
-      if (updateKeyCT !== this.updateKeyCT) {
-        return
-      }
-      this.updateTimeout = updateKeyCT
-      setTimeout(() => {
-        if (this.updateTimeout === updateKeyCT) {
-          this.updateTimeout = false
-        }
-      }, 10000)
       await this.platform.sendDeviceUpdate(this.accessory, params)
+      this.cacheMired = value
+      this.cacheHue = hs[0]
+      this.cacheCT = scaledCT
+      this.cacheHue = 0
+      switch (this.accessory.context.eweUIID) {
+        case 59: {
+          // L1
+          this.cacheR = newRGB[0]
+          this.cacheG = newRGB[1]
+          this.cacheB = newRGB[2]
+          break
+        }
+        case 104:
+          this.cacheMode = 'white'
+          break
+      }
       if (!this.disableDeviceLogging) {
-        if (this.alController && this.alController.isAdaptiveLightingActive()) {
+        if (this.alController.isAdaptiveLightingActive()) {
           this.log('[%s] current cct [%sK] via adaptive lighting.', this.name, mToK)
         } else {
           this.log('[%s] current cct [%sK].', this.name, mToK)
@@ -317,6 +318,10 @@ module.exports = class deviceLightRGBCCT {
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
+      setTimeout(() => {
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheOnOff === 'on')
+      }, 5000)
+      throw new this.platform.api.hap.HapStatusError(-70402)
     }
   }
 
@@ -361,7 +366,7 @@ module.exports = class deviceLightRGBCCT {
               this.cacheHue = hs[0]
               this.cacheMired = 140
               this.service.updateCharacteristic(this.hapChar.Hue, this.cacheHue)
-                .updateCharacteristic(this.hapChar.Saturation, hs[1])
+              this.service.updateCharacteristic(this.hapChar.Saturation, hs[1])
               if (params.updateSource) {
                 if (!this.disableDeviceLogging) {
                   this.log(
@@ -370,11 +375,7 @@ module.exports = class deviceLightRGBCCT {
                     this.cacheR, this.cacheG, this.cacheB
                   )
                 }
-                if (
-                  this.alController &&
-                  this.alController.isAdaptiveLightingActive() &&
-                  rgbDiff > 50
-                ) {
+                if (this.alController.isAdaptiveLightingActive() && rgbDiff > 50) {
                   this.alController.disableAdaptiveLighting()
                   this.log(
                     '[%s] adaptive lighting disabled due to significant colour change.',
@@ -424,11 +425,7 @@ module.exports = class deviceLightRGBCCT {
                 }
               }
             }
-            if (
-              params.updateSource &&
-              this.alController &&
-              this.alController.isAdaptiveLightingActive()
-            ) {
+            if (params.updateSource && this.alController.isAdaptiveLightingActive()) {
               this.alController.disableAdaptiveLighting()
               this.log(
                 '[%s] adaptive lighting disabled due to significant colour change.',
@@ -465,12 +462,8 @@ module.exports = class deviceLightRGBCCT {
                 if (!this.disableDeviceLogging) {
                   this.log('[%s] current cct [%sK].', this.name, ctToK)
                 }
-                if (
-                  this.alController &&
-                  this.alController.isAdaptiveLightingActive() &&
-                  ctDiff > 20
-                ) {
-                  // look for a variation greater than five
+                if (this.alController.isAdaptiveLightingActive() && ctDiff > 20) {
+                  // look for a variation greater than twenty
                   this.alController.disableAdaptiveLighting()
                   this.log(
                     '[%s] adaptive lighting disabled due to significant colour change.',
diff --git a/lib/device/light-rgb.js b/lib/device/light-rgb.js
index c52f68e6..052fae0b 100644
--- a/lib/device/light-rgb.js
+++ b/lib/device/light-rgb.js
@@ -38,24 +38,21 @@ module.exports = class deviceLightRGB {
       this.accessory.addService(this.hapServ.Lightbulb)
 
     // Add the set handler to the lightbulb on/off characteristic
-    this.service.getCharacteristic(this.hapChar.On)
-      .on('set', this.internalOnOffUpdate.bind(this))
+    this.service.getCharacteristic(this.hapChar.On).onSet(async value => {
+      await this.internalOnOffUpdate(value)
+    })
 
     // Add the set handler to the lightbulb brightness characteristic
-    this.service.getCharacteristic(this.hapChar.Brightness)
-      .on('set', this.internalBrightnessUpdate.bind(this))
-
-    // B1 doesn't support brightness so set a minimum step (ie on or off)
     this.service.getCharacteristic(this.hapChar.Brightness)
       .setProps({ minStep: 100 })
+      .onSet(async value => {
+        await this.internalBrightnessUpdate(value)
+      })
 
     // Add the set handler to the lightbulb hue characteristic
-    this.service.getCharacteristic(this.hapChar.Hue)
-      .on('set', this.internalColourUpdate.bind(this))
-
-    // Add the set handler to the lightbulb saturation characteristic
-    this.service.getCharacteristic(this.hapChar.Saturation)
-      .on('set', (value, callback) => callback())
+    this.service.getCharacteristic(this.hapChar.Hue).onSet(async value => {
+      await this.internalColourUpdate(value)
+    })
 
     // Output the customised options to the log if in debug mode
     if (this.debug) {
@@ -64,66 +61,53 @@ module.exports = class deviceLightRGB {
     }
   }
 
-  async internalOnOffUpdate (value, callback) {
+  async internalOnOffUpdate (value) {
     try {
-      callback()
       const params = {}
-      const onoff = value ? 'on' : 'off'
-      if (this.cacheOnOff === onoff) {
+      const newValue = value ? 'on' : 'off'
+      if (this.cacheOnOff === newValue) {
         return
       }
-      this.cacheOnOff = onoff
-      params.state = this.cacheOnOff
+      params.state = newValue
       const timerKey = Math.random().toString(36).substr(2, 8)
       this.updateTimeout = timerKey
       setTimeout(() => {
         if (this.updateTimeout === timerKey) {
           this.updateTimeout = false
         }
-      }, 10000)
+      }, 5000)
       await this.platform.sendDeviceUpdate(this.accessory, params)
+      this.cacheOnOff = newValue
       if (!this.disableDeviceLogging) {
         this.log('[%s] current state [%s].', this.name, this.cacheOnOff)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
+      setTimeout(() => {
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheOnOff === 'on')
+      }, 5000)
+      throw new this.platform.api.hap.HapStatusError(-70402)
     }
   }
 
-  async internalBrightnessUpdate (value, callback) {
+  async internalBrightnessUpdate (value) {
     try {
-      this.cacheBright = value
-      callback()
       // B1 doesn't support brightness
-      return
+      this.cacheBright = value
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
+      setTimeout(() => {
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheOnOff === 'on')
+      }, 5000)
+      throw new this.platform.api.hap.HapStatusError(-70402)
     }
   }
 
-  async internalColourUpdate (value, callback) {
+  async internalColourUpdate (value) {
     try {
       if (this.cacheHue === value) {
-        callback()
         return
       }
-      this.cacheHue = value
-      this.service.updateCharacteristic(this.hapChar.ColorTemperature, 140)
-      callback()
-      const saturation = this.service.getCharacteristic(this.hapChar.Saturation).value
-      const newRGB = this.colourUtils.hs2rgb(value, saturation)
-      this.cacheR = newRGB[0]
-      this.cacheG = newRGB[1]
-      this.cacheB = newRGB[2]
-      const params = {
-        zyx_mode: 2,
-        type: 'middle',
-        channel0: '0',
-        channel1: '0',
-        channel2: this.cacheR.toString(),
-        channel3: this.cacheG.toString(),
-        channel4: this.cacheB.toString()
-      }
       const updateKeyColour = Math.random().toString(36).substr(2, 8)
       this.updateKeyColour = updateKeyColour
       await this.funcs.sleep(400)
@@ -135,8 +119,24 @@ module.exports = class deviceLightRGB {
         if (this.updateTimeout === updateKeyColour) {
           this.updateTimeout = false
         }
-      }, 10000)
+      }, 5000)
+      this.service.updateCharacteristic(this.hapChar.ColorTemperature, 140)
+      const saturation = this.service.getCharacteristic(this.hapChar.Saturation).value
+      const newRGB = this.colourUtils.hs2rgb(value, saturation)
+      const params = {
+        zyx_mode: 2,
+        type: 'middle',
+        channel0: '0',
+        channel1: '0',
+        channel2: newRGB[0].toString(),
+        channel3: newRGB[1].toString(),
+        channel4: newRGB[2].toString()
+      }
       await this.platform.sendDeviceUpdate(this.accessory, params)
+      this.cacheHue = value
+      this.cacheR = newRGB[0]
+      this.cacheG = newRGB[1]
+      this.cacheB = newRGB[2]
       if (!this.disableDeviceLogging) {
         this.log(
           '[%s] current colour [rgb %s %s %s].',
@@ -148,6 +148,10 @@ module.exports = class deviceLightRGB {
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
+      setTimeout(() => {
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheOnOff === 'on')
+      }, 5000)
+      throw new this.platform.api.hap.HapStatusError(-70402)
     }
   }
 
diff --git a/lib/device/outlet-scm.js b/lib/device/outlet-scm.js
index f9ab24a5..b19201f0 100644
--- a/lib/device/outlet-scm.js
+++ b/lib/device/outlet-scm.js
@@ -48,8 +48,9 @@ module.exports = class deviceOutletSCM {
     }
 
     // Add the set handler to the switch/outlet on/off characteristic
-    this.service.getCharacteristic(this.hapChar.On)
-      .on('set', this.internalUpdate.bind(this))
+    this.service.getCharacteristic(this.hapChar.On).onSet(async value => {
+      await this.internalUpdate(value)
+    })
 
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new this.platform.eveService('switch', this.accessory, {
@@ -66,19 +67,23 @@ module.exports = class deviceOutletSCM {
     }
   }
 
-  async internalUpdate (value, callback) {
+  async internalUpdate (value) {
     try {
-      callback()
+      const newValue = value ? 'on' : 'off'
       const params = { switches: this.consts.defaultMultiSwitchOff }
-      params.switches[0].switch = value ? 'on' : 'off'
+      params.switches[0].switch = newValue
       await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.cacheOnOff = value ? 'on' : 'off'
+      this.cacheOnOff = newValue
       this.accessory.eveService.addEntry({ status: value ? 1 : 0 })
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current state [%s].', this.name, value ? 'on' : 'off')
+        this.log('[%s] current state [%s].', this.name, this.cacheOnOff)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
+      setTimeout(() => {
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheOnOff === 'on')
+      }, 5000)
+      throw new this.platform.api.hap.HapStatusError(-70402)
     }
   }
 
diff --git a/lib/device/outlet.js b/lib/device/outlet.js
index aab76d21..f48b3097 100644
--- a/lib/device/outlet.js
+++ b/lib/device/outlet.js
@@ -56,17 +56,16 @@ module.exports = class deviceOutlet {
     }
 
     // Add the set handler to the outlet on/off characteristic
-    this.service.getCharacteristic(this.hapChar.On)
-      .on('set', this.internalUpdate.bind(this))
+    this.service.getCharacteristic(this.hapChar.On).onSet(async value => {
+      await this.internalUpdate(value)
+    })
 
     // Add the set handler to the outlet eve reset total energy characteristic
-    this.service.getCharacteristic(this.eveChar.ResetTotal)
-      .on('set', (value, callback) => {
-        callback()
-        this.accessory.context.energyReadings = []
-        this.accessory.context.energyReadingTotal = 0
-        this.service.updateCharacteristic(this.eveChar.TotalConsumption, 0)
-      })
+    this.service.getCharacteristic(this.eveChar.ResetTotal).onSet(value => {
+      this.accessory.context.energyReadings = []
+      this.accessory.context.energyReadingTotal = 0
+      this.service.updateCharacteristic(this.eveChar.TotalConsumption, 0)
+    })
 
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new this.platform.eveService('energy', this.accessory, {
@@ -136,18 +135,22 @@ module.exports = class deviceOutlet {
     }
   }
 
-  async internalUpdate (value, callback) {
+  async internalUpdate (value) {
     try {
-      callback()
+      const newValue = value ? 'on' : 'off'
       await this.platform.sendDeviceUpdate(this.accessory, {
-        switch: value ? 'on' : 'off'
+        switch: newValue
       })
-      this.cacheOnOff = value ? 'on' : 'off'
+      this.cacheOnOff = newValue
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current state [%s].', this.name, value ? 'on' : 'off')
+        this.log('[%s] current state [%s].', this.name, this.cacheOnOff)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
+      setTimeout(() => {
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheOnOff === 'on')
+      }, 5000)
+      throw new this.platform.api.hap.HapStatusError(-70402)
     }
   }
 
diff --git a/lib/device/rf-bridge.js b/lib/device/rf-bridge.js
index 225ab4f8..c097b52d 100644
--- a/lib/device/rf-bridge.js
+++ b/lib/device/rf-bridge.js
@@ -35,8 +35,8 @@ module.exports = class deviceRFBridge {
 
         // Add the set handler to the switch on/off characteristic
         this.accessory.getService(name).getCharacteristic(this.hapChar.On)
-          .on('set', (value, callback) => {
-            this.internalUpdate(chan, name, value, callback)
+          .onSet(async value => {
+            await this.internalUpdate(chan, name, value)
           })
       })
     } else {
@@ -98,9 +98,8 @@ module.exports = class deviceRFBridge {
     }
   }
 
-  async internalUpdate (rfChl, service, value, callback) {
+  async internalUpdate (rfChl, service, value) {
     try {
-      callback()
       if (!value) {
         return
       }
@@ -113,6 +112,10 @@ module.exports = class deviceRFBridge {
       await this.platform.sendDeviceUpdate(this.accessory, params)
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
+      setTimeout(() => {
+        this.accessory.getService(service).updateCharacteristic(this.hapChar.On, false)
+      }, 5000)
+      throw new this.platform.api.hap.HapStatusError(-70402)
     }
   }
 
diff --git a/lib/device/sensor-ambient.js b/lib/device/sensor-ambient.js
index bcd3b05d..5d26e74c 100644
--- a/lib/device/sensor-ambient.js
+++ b/lib/device/sensor-ambient.js
@@ -46,8 +46,9 @@ module.exports = class deviceSensorAmbient {
         this.accessory.addService(this.hapServ.Switch)
 
       // Add the set handler to the switch on/off characteristic
-      this.switchService.getCharacteristic(this.hapChar.On)
-        .on('set', this.internalUpdate.bind(this))
+      this.switchService.getCharacteristic(this.hapChar.On).onSet(async value => {
+        await this.internalUpdate(value)
+      })
     }
 
     // Add the temperature sensor service if it doesn't already exist
@@ -87,19 +88,23 @@ module.exports = class deviceSensorAmbient {
     }
   }
 
-  async internalUpdate (value, callback) {
+  async internalUpdate (value) {
     try {
-      callback()
+      const newValue = value ? 'on' : 'off'
       const params = {
-        switch: value ? 'on' : 'off'
+        switch: newValue
       }
-      this.cacheOnOff = value ? 'on' : 'off'
       await this.platform.sendDeviceUpdate(this.accessory, params)
+      this.cacheOnOff = newValue
       if (!this.disableDeviceLogging) {
         this.log('[%s] current state [%s].', this.name, this.cacheOnOff)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
+      setTimeout(() => {
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheOnOff === 'on')
+      }, 5000)
+      throw new this.platform.api.hap.HapStatusError(-70402)
     }
   }
 
diff --git a/lib/device/sensor-contact.js b/lib/device/sensor-contact.js
index 78d187bc..7f10e8c1 100644
--- a/lib/device/sensor-contact.js
+++ b/lib/device/sensor-contact.js
@@ -48,12 +48,10 @@ module.exports = class deviceSensorContact {
     this.timesOpened = this.service.getCharacteristic(this.eveChar.TimesOpened).value
 
     // Add the set handler to the contact sensor reset total characteristic
-    this.service.getCharacteristic(this.eveChar.ResetTotal)
-      .on('set', (value, callback) => {
-        callback()
-        this.timesOpened = 0
-        this.service.updateCharacteristic(this.eveChar.TimesOpened, 0)
-      })
+    this.service.getCharacteristic(this.eveChar.ResetTotal).onSet(value => {
+      this.timesOpened = 0
+      this.service.updateCharacteristic(this.eveChar.TimesOpened, 0)
+    })
 
     // Add the battery service if it doesn't already exist
     this.batteryService = this.accessory.getService(this.hapServ.BatteryService) ||
diff --git a/lib/device/switch-multi.js b/lib/device/switch-multi.js
index e1aeca10..a5fa7bac 100644
--- a/lib/device/switch-multi.js
+++ b/lib/device/switch-multi.js
@@ -47,8 +47,9 @@ module.exports = class deviceSwitchMulti {
     }
 
     // Add the set handler to the switch/outlet on/off characteristic
-    this.service.getCharacteristic(this.hapChar.On)
-      .on('set', this.internalUpdate.bind(this))
+    this.service.getCharacteristic(this.hapChar.On).onSet(async value => {
+      await this.internalUpdate(value)
+    })
 
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new this.platform.eveService('switch', this.accessory, {
@@ -65,33 +66,61 @@ module.exports = class deviceSwitchMulti {
     }
   }
 
-  async internalUpdate (value, callback) {
+  async internalUpdate (value) {
     try {
       await this.funcs.sleep(Math.floor(Math.random() * 241 + 10))
-      callback()
       let oAccessory
       let masterState = 'off'
-      const params = {}
+      const params = {
+        switches: this.accessory.context.eweUIID === 126
+          ? this.consts.defaultDoubleSwitchOff
+          : this.consts.defaultMultiSwitchOff
+      }
       switch (this.accessory.context.switchNumber) {
         case '0':
-          params.switches = this.accessory.context.eweUIID === 126
-            ? this.consts.defaultDoubleSwitchOff
-            : this.consts.defaultMultiSwitchOff
           params.switches[0].switch = value ? 'on' : 'off'
           params.switches[1].switch = value ? 'on' : 'off'
           params.switches[2].switch = value ? 'on' : 'off'
           params.switches[3].switch = value ? 'on' : 'off'
+          break
+        case '1':
+        case '2':
+        case '3':
+        case '4':
+          for (let i = 1; i <= this.accessory.context.channelCount; i++) {
+            const idToCheck = this.accessory.context.eweDeviceId + 'SW' + i
+            if ((oAccessory = this.platform.devicesInHB.get(idToCheck))) {
+              if (i === parseInt(this.accessory.context.switchNumber)) {
+                params.switches[i - 1].switch = value ? 'on' : 'off'
+              } else {
+                params.switches[i - 1].switch = oAccessory.context.cacheOnOff
+              }
+            } else {
+              params.switches[i - 1].switch = 'off'
+            }
+          }
+          break
+      }
+      await this.platform.sendDeviceUpdate(this.accessory, params)
+      switch (this.accessory.context.switchNumber) {
+        case '0':
           for (let i = 0; i <= this.accessory.context.channelCount; i++) {
             const idToCheck = this.accessory.context.eweDeviceId + 'SW' + i
             if ((oAccessory = this.platform.devicesInHB.get(idToCheck))) {
               if (this.showAsOutlet) {
-                oAccessory.getService(this.hapServ.Outlet)
-                  .updateCharacteristic(this.hapChar.On, value)
-                oAccessory.getService(this.hapServ.Outlet)
-                  .updateCharacteristic(this.hapChar.OutletInUse, value)
+                oAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
+                  this.hapChar.On,
+                  value
+                )
+                oAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
+                  this.hapChar.OutletInUse,
+                  value
+                )
               } else {
-                oAccessory.getService(this.hapServ.Switch)
-                  .updateCharacteristic(this.hapChar.On, value)
+                oAccessory.getService(this.hapServ.Switch).updateCharacteristic(
+                  this.hapChar.On,
+                  value
+                )
               }
               oAccessory.context.cacheOnOff = value ? 'on' : 'off'
               oAccessory.eveService.addEntry({ status: value ? 1 : 0 })
@@ -106,9 +135,6 @@ module.exports = class deviceSwitchMulti {
         case '2':
         case '3':
         case '4':
-          params.switches = this.accessory.context.eweUIID === 126
-            ? this.consts.defaultDoubleSwitchOff
-            : this.consts.defaultMultiSwitchOff
           for (let i = 1; i <= this.accessory.context.channelCount; i++) {
             const idToCheck = this.accessory.context.eweDeviceId + 'SW' + i
             if ((oAccessory = this.platform.devicesInHB.get(idToCheck))) {
@@ -119,12 +145,13 @@ module.exports = class deviceSwitchMulti {
                 masterState = 'on'
               }
               if (i === parseInt(this.accessory.context.switchNumber)) {
-                params.switches[i - 1].switch = value ? 'on' : 'off'
                 oAccessory.context.cacheOnOff = value ? 'on' : 'off'
                 oAccessory.eveService.addEntry({ status: value ? 1 : 0 })
                 if (this.showAsOutlet) {
-                  oAccessory.getService(this.hapServ.Outlet)
-                    .updateCharacteristic(this.hapChar.OutletInUse, value)
+                  oAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
+                    this.hapChar.OutletInUse,
+                    value
+                  )
                 }
                 if (i > 0 && !this.disableDeviceLogging) {
                   this.log(
@@ -133,11 +160,7 @@ module.exports = class deviceSwitchMulti {
                     value ? 'on' : 'off'
                   )
                 }
-              } else {
-                params.switches[i - 1].switch = oAccessory.context.cacheOnOff
               }
-            } else {
-              params.switches[i - 1].switch = 'off'
             }
           }
           if (!this.platform.hideMasters.includes(this.accessory.context.eweDeviceId)) {
@@ -145,21 +168,30 @@ module.exports = class deviceSwitchMulti {
               this.accessory.context.eweDeviceId + 'SW0'
             )
             if (this.showAsOutlet) {
-              oAccessory.getService(this.hapServ.Outlet)
-                .updateCharacteristic(this.hapChar.On, masterState === 'on')
-              oAccessory.getService(this.hapServ.Outlet)
-                .updateCharacteristic(this.hapChar.OutletInUse, masterState === 'on')
+              oAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
+                this.hapChar.On,
+                masterState === 'on'
+              )
+              oAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
+                this.hapChar.OutletInUse,
+                masterState === 'on'
+              )
             } else {
-              oAccessory.getService(this.hapServ.Switch)
-                .updateCharacteristic(this.hapChar.On, masterState === 'on')
+              oAccessory.getService(this.hapServ.Switch).updateCharacteristic(
+                this.hapChar.On,
+                masterState === 'on'
+              )
             }
             oAccessory.eveService.addEntry({ status: masterState === 'on' ? 1 : 0 })
           }
           break
       }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
+      setTimeout(() => {
+        this.service.updateCharacteristic(this.hapChar.On, !value)
+      }, 5000)
+      throw new this.platform.api.hap.HapStatusError(-70402)
     }
   }
 
diff --git a/lib/device/switch-single.js b/lib/device/switch-single.js
index e35602f0..dae88352 100644
--- a/lib/device/switch-single.js
+++ b/lib/device/switch-single.js
@@ -35,8 +35,9 @@ module.exports = class deviceSwitchSingle {
       this.accessory.addService(this.hapServ.Switch)
 
     // Add the set handler to the switch on/off characteristic
-    this.service.getCharacteristic(this.hapChar.On)
-      .on('set', this.internalUpdate.bind(this))
+    this.service.getCharacteristic(this.hapChar.On).onSet(async value => {
+      await this.internalUpdate(value)
+    })
 
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new this.platform.eveService('switch', this.accessory, {
@@ -50,20 +51,24 @@ module.exports = class deviceSwitchSingle {
     }
   }
 
-  async internalUpdate (value, callback) {
+  async internalUpdate (value) {
     try {
       await this.funcs.sleep(Math.floor(Math.random() * 241 + 10))
-      callback()
+      const newValue = value ? 'on' : 'off'
       await this.platform.sendDeviceUpdate(this.accessory, {
-        switch: value ? 'on' : 'off'
+        switch: newValue
       })
-      this.cacheOnOff = value ? 'on' : 'off'
+      this.cacheOnOff = newValue
       this.accessory.eveService.addEntry({ status: value ? 1 : 0 })
       if (!this.disableDeviceLogging) {
         this.log('[%s] current state [%s].', this.name, this.cacheOnOff)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
+      setTimeout(() => {
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheOnOff === 'on')
+      }, 5000)
+      throw new this.platform.api.hap.HapStatusError(-70402)
     }
   }
 
diff --git a/lib/device/template.js b/lib/device/template.js
index fdab7e87..d461129c 100644
--- a/lib/device/template.js
+++ b/lib/device/template.js
@@ -23,21 +23,26 @@ module.exports = class deviceTemplate {
       this.accessory.addService(this.hapServ.Switch)
 
     // Add the set handler to the switch on/off characteristic
-    this.service.getCharacteristic(this.hapChar.On)
-      .on('set', this.internalUpdate.bind(this))
+    this.service.getCharacteristic(this.hapChar.On).onSet(async value => {
+      await this.internalUpdate(value)
+    })
   }
 
-  async internalUpdate (value, callback) {
+  async internalUpdate (value) {
     try {
-      callback()
+      // logic
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
+      setTimeout(() => {
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheOnOff === 'on')
+      }, 5000)
+      throw new this.platform.api.hap.HapStatusError(-70402)
     }
   }
 
   async externalUpdate (params) {
     try {
-
+      // logic
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
diff --git a/lib/device/thermostat.js b/lib/device/thermostat.js
index ce32c6be..fa360b0a 100644
--- a/lib/device/thermostat.js
+++ b/lib/device/thermostat.js
@@ -60,21 +60,23 @@ module.exports = class deviceThermostat {
     })
 
     // Add the set handler to the target state characteristic
-    this.service.getCharacteristic(this.hapChar.TargetHeatingCoolingState)
-      .on('set', this.internalOnOffUpdate.bind(this))
-      .setProps({
-        minValue: 0,
-        maxValue: 1,
-        validValues: [0, 1]
+    this.service.getCharacteristic(this.hapChar.TargetHeatingCoolingState).setProps({
+      minValue: 0,
+      maxValue: 1,
+      validValues: [0, 1]
+    })
+      .onSet(async value => {
+        await this.internalOnOffUpdate(value)
       })
 
     // Add the set handler to the target temperature characteristic
-    this.service.getCharacteristic(this.hapChar.TargetTemperature)
-      .on('set', this.internalTargetTempUpdate.bind(this))
-      .setProps({
-        minValue: 5,
-        maxValue: 45,
-        minStep: 0.5
+    this.service.getCharacteristic(this.hapChar.TargetTemperature).setProps({
+      minValue: 5,
+      maxValue: 45,
+      minStep: 0.5
+    })
+      .onSet(async value => {
+        await this.internalTargetTempUpdate(value)
       })
 
     // Pass the accessory to Fakegato to set up with Eve
@@ -92,40 +94,53 @@ module.exports = class deviceThermostat {
     }
   }
 
-  async internalOnOffUpdate (value, callback) {
+  async internalOnOffUpdate (value) {
     try {
-      callback()
-      this.cacheOnOff = value !== 0 ? 'on' : 'off'
+      const newValue = value !== 0 ? 'on' : 'off'
       const params = {
-        switch: this.cacheOnOff
+        switch: newValue
       }
+      await this.platform.sendDeviceUpdate(this.accessory, params)
       if (value === 0) {
         this.service.updateCharacteristic(this.hapChar.CurrentHeatingCoolingState, 0)
       }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
+      this.cacheOnOff = newValue
       if (!this.disableDeviceLogging) {
         this.log('[%s] current state [%s].', this.name, this.cacheOnOff)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
+      setTimeout(() => {
+        this.service.updateCharacteristic(
+          this.hapChar.TargetHeatingCoolingState,
+          this.cacheOnOff === 'on'
+        )
+      }, 5000)
+      throw new this.platform.api.hap.HapStatusError(-70402)
     }
   }
 
-  async internalTargetTempUpdate (value, callback) {
+  async internalTargetTempUpdate (value) {
     try {
-      callback()
-      this.cacheTarget = value
       const params = {
         workMode: 1,
-        targetTemp: this.cacheTarget,
+        targetTemp: value,
         tempScale: 'c'
       }
       await this.platform.sendDeviceUpdate(this.accessory, params)
+      this.cacheTarget = value
       if (!this.disableDeviceLogging) {
         this.log('[%s] current target [%s°C].', this.name, this.cacheTarget)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
+      setTimeout(() => {
+        this.service.updateCharacteristic(
+          this.hapChar.TargetHeatingCoolingState,
+          this.cacheOnOff === 'on'
+        )
+      }, 5000)
+      throw new this.platform.api.hap.HapStatusError(-70402)
     }
   }
 
diff --git a/lib/device/zigbee/switch-single.js b/lib/device/zigbee/switch-single.js
index 5f1334c5..64cd12e5 100644
--- a/lib/device/zigbee/switch-single.js
+++ b/lib/device/zigbee/switch-single.js
@@ -30,8 +30,9 @@ module.exports = class deviceZBSwitchSingle {
       this.accessory.addService(this.hapServ.Switch)
 
     // Add the set handler to the switch on/off characteristic
-    this.service.getCharacteristic(this.hapChar.On)
-      .on('set', this.internalUpdate.bind(this))
+    this.service.getCharacteristic(this.hapChar.On).onSet(async value => {
+      await this.internalUpdate(value)
+    })
 
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new this.platform.eveService('switch', this.accessory, {
@@ -45,19 +46,23 @@ module.exports = class deviceZBSwitchSingle {
     }
   }
 
-  async internalUpdate (value, callback) {
+  async internalUpdate (value) {
     try {
-      callback()
+      const newValue = value ? 'on' : 'off'
       await this.platform.sendDeviceUpdate(this.accessory, {
-        switch: value ? 'on' : 'off'
+        switch: newValue
       })
-      this.cacheOnOff = value ? 'on' : 'off'
+      this.cacheOnOff = newValue
       this.accessory.eveService.addEntry({ status: value ? 1 : 0 })
       if (!this.disableDeviceLogging) {
         this.log('[%s] current state [%s].', this.name, value ? 'on' : 'off')
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
+      setTimeout(() => {
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheOnOff === 'on')
+      }, 5000)
+      throw new this.platform.api.hap.HapStatusError(-70402)
     }
   }
 
diff --git a/package.json b/package.json
index 363c3d96..4ccc0388 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
   ],
   "main": "lib/index.js",
   "engines": {
-    "homebridge": "^1.1.7",
+    "homebridge": "^1.3.3",
     "node": "^14.16.0"
   },
   "repository": {

From 4dc0cc99de11f073d3fa7c6379406c01fb32dd33 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 30 Mar 2021 08:38:05 +0100
Subject: [PATCH 1769/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 704f2133..1726714c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,22 @@
 
 All notable changes to this homebridge-ewelink will be documented in this file.
 
+## BETA
+
+### Requirements
+
+* **Homebridge Users**
+  * This plugin has a minimum requirement of Homebridge v1.3.3
+
+* **HOOBS Users**
+  * This plugin has a minimum requirement of HOOBS v3.3.4
+
+### Changes
+
+* Use the new `.onSet` methods available in Homebridge v1.3
+* Plugin will report 'offline' devices with a 'No Response' message in HomeKit apps when controlled (and this status will be reverted after 5 seconds)
+  * These changes **do not** apply to Accessory Simulations nor Zigbee devices (except wired switches) yet
+
 ## 5.6.0 (2021-03-25)
 
 ### Added

From 0fae620fb81c60aa972839385503338eb53a2614 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 30 Mar 2021 08:39:00 +0100
Subject: [PATCH 1770/3183] 6.0.0-0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index bbed5f11..1a5951bb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "5.6.1-1",
+  "version": "6.0.0-0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 4ccc0388..cb8e616a 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "5.6.1-1",
+  "version": "6.0.0-0",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 840f96b87d536e5356e82c8a0f4a8a193b6fec4b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 30 Mar 2021 09:17:20 +0100
Subject: [PATCH 1771/3183] throw these errors

---
 lib/connection/ws.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/connection/ws.js b/lib/connection/ws.js
index cbd5ff94..4a3e2a0f 100644
--- a/lib/connection/ws.js
+++ b/lib/connection/ws.js
@@ -359,7 +359,7 @@ module.exports = class connectionWS {
       } catch (err) {
         // Catch any errors sending the device update
         const eText = this.funcs.parseError(err)
-        return new Error(this.messages.devNotUpd + ' ' + eText)
+        throw new Error(eText)
       }
     } else {
       // The web socket isn't currently open so log this

From 03ab6200dbd77ccbc2cfc59895d40c8553d6b925 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 30 Mar 2021 09:17:44 +0100
Subject: [PATCH 1772/3183] 6.0.0-1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 1a5951bb..756fdadc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.0.0-0",
+  "version": "6.0.0-1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index cb8e616a..79f952de 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.0.0-0",
+  "version": "6.0.0-1",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 39a58f8726afa56c6308c239261d31e7cb328e6c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 30 Mar 2021 09:54:46 +0100
Subject: [PATCH 1773/3183] zigbee status

---
 lib/device/zigbee/light-cct.js        | 13 ++++++++++++-
 lib/device/zigbee/light-dimmer.js     | 13 ++++++++++++-
 lib/device/zigbee/sensor-ambient.js   | 18 ++++++++++++++----
 lib/device/zigbee/sensor-contact.js   | 13 +++++++++++++
 lib/device/zigbee/sensor-motion.js    | 13 +++++++++++++
 lib/device/zigbee/switch-single.js    | 20 ++++++++++++++++----
 lib/device/zigbee/switch-stateless.js | 13 +++++++++++++
 lib/index.js                          | 10 ++++++++++
 lib/utils/constants.js                |  1 +
 9 files changed, 104 insertions(+), 10 deletions(-)

diff --git a/lib/device/zigbee/light-cct.js b/lib/device/zigbee/light-cct.js
index 655b1d8c..d13d26ae 100644
--- a/lib/device/zigbee/light-cct.js
+++ b/lib/device/zigbee/light-cct.js
@@ -39,8 +39,15 @@ module.exports = class deviceZBLightCCT {
     this.service = this.accessory.getService(this.hapServ.Lightbulb) ||
       this.accessory.addService(this.hapServ.Lightbulb)
 
-    // Add the set handler to the lightbulb on/off characteristic
+    // Add the get/set handler to the lightbulb on/off characteristic
     this.service.getCharacteristic(this.hapChar.On)
+      .onGet(() => {
+        if (this.isOnline) {
+          return this.service.getCharacteristic(this.hapChar.On).value
+        } else {
+          throw new this.platform.api.hap.HapStatusError(-70402)
+        }
+      })
       .on('set', this.internalOnOffUpdate.bind(this))
 
     // Add the set handler to the lightbulb brightness characteristic
@@ -212,4 +219,8 @@ module.exports = class deviceZBLightCCT {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
+
+  markStatus (isOnline) {
+    this.isOnline = isOnline
+  }
 }
diff --git a/lib/device/zigbee/light-dimmer.js b/lib/device/zigbee/light-dimmer.js
index c38d52a5..2671bf2f 100644
--- a/lib/device/zigbee/light-dimmer.js
+++ b/lib/device/zigbee/light-dimmer.js
@@ -32,8 +32,15 @@ module.exports = class deviceZBLightDimmer {
     this.service = this.accessory.getService(this.hapServ.Lightbulb) ||
       this.accessory.addService(this.hapServ.Lightbulb)
 
-    // Add the set handler to the lightbulb on/off characteristic
+    // Add the get/set handler to the lightbulb on/off characteristic
     this.service.getCharacteristic(this.hapChar.On)
+      .onGet(() => {
+        if (this.isOnline) {
+          return this.service.getCharacteristic(this.hapChar.On).value
+        } else {
+          throw new this.platform.api.hap.HapStatusError(-70402)
+        }
+      })
       .on('set', this.internalOnOffUpdate.bind(this))
 
     // Add the set handler to the lightbulb brightness characteristic
@@ -115,4 +122,8 @@ module.exports = class deviceZBLightDimmer {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
+
+  markStatus (isOnline) {
+    this.isOnline = isOnline
+  }
 }
diff --git a/lib/device/zigbee/sensor-ambient.js b/lib/device/zigbee/sensor-ambient.js
index e37ddd2b..618344f0 100644
--- a/lib/device/zigbee/sensor-ambient.js
+++ b/lib/device/zigbee/sensor-ambient.js
@@ -32,10 +32,16 @@ module.exports = class deviceZBSensorAmbient {
     this.tService = this.accessory.getService(this.hapServ.TemperatureSensor) ||
       this.accessory.addService(this.hapServ.TemperatureSensor)
 
-    // Set custom properties of the current temperature characteristic
-    this.tService.getCharacteristic(this.hapChar.CurrentTemperature).setProps({
-      minStep: 0.1
-    })
+    // Add the get handler to the current temperature characteristic
+    this.tService.getCharacteristic(this.hapChar.CurrentTemperature)
+      .setProps({ minStep: 0.1 })
+      .onGet(() => {
+        if (this.isOnline) {
+          return this.tService.getCharacteristic(this.hapChar.CurrentTemperature).value
+        } else {
+          throw new this.platform.api.hap.HapStatusError(-70402)
+        }
+      })
 
     // Add the humidity sensor service if it doesn't already exist
     this.hService = this.accessory.getService(this.hapServ.HumiditySensor) ||
@@ -110,4 +116,8 @@ module.exports = class deviceZBSensorAmbient {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
+
+  markStatus (isOnline) {
+    this.isOnline = isOnline
+  }
 }
diff --git a/lib/device/zigbee/sensor-contact.js b/lib/device/zigbee/sensor-contact.js
index b9e60cc7..22f69026 100644
--- a/lib/device/zigbee/sensor-contact.js
+++ b/lib/device/zigbee/sensor-contact.js
@@ -40,6 +40,15 @@ module.exports = class deviceZBSensorContact {
       this.service.addCharacteristic(this.eveChar.TimesOpened)
     }
 
+    // Add the get handler to the contact sensor state characteristic
+    this.service.getCharacteristic(this.hapChar.ContactSensorState).onGet(() => {
+      if (this.isOnline) {
+        return this.service.getCharacteristic(this.hapChar.ContactSensorState).value
+      } else {
+        throw new this.platform.api.hap.HapStatusError(-70402)
+      }
+    })
+
     // Obtain the current times opened value
     this.timesOpened = this.service.getCharacteristic(this.eveChar.TimesOpened).value
 
@@ -116,4 +125,8 @@ module.exports = class deviceZBSensorContact {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
+
+  markStatus (isOnline) {
+    this.isOnline = isOnline
+  }
 }
diff --git a/lib/device/zigbee/sensor-motion.js b/lib/device/zigbee/sensor-motion.js
index a2238e46..d9dceb29 100644
--- a/lib/device/zigbee/sensor-motion.js
+++ b/lib/device/zigbee/sensor-motion.js
@@ -38,6 +38,15 @@ module.exports = class deviceZBSensorMotion {
       this.service.addCharacteristic(this.eveChar.LastActivation)
     }
 
+    // Add the get handler to the motion detected characteristic
+    this.service.getCharacteristic(this.hapChar.MotionDetected).onGet(() => {
+      if (this.isOnline) {
+        return this.service.getCharacteristic(this.hapChar.MotionDetected).value
+      } else {
+        throw new this.platform.api.hap.HapStatusError(-70402)
+      }
+    })
+
     // Add the battery service if it doesn't already exist
     this.battService = this.accessory.getService(this.hapServ.BatteryService) || this.accessory.addService(this.hapServ.BatteryService)
 
@@ -103,4 +112,8 @@ module.exports = class deviceZBSensorMotion {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
+
+  markStatus (isOnline) {
+    this.isOnline = isOnline
+  }
 }
diff --git a/lib/device/zigbee/switch-single.js b/lib/device/zigbee/switch-single.js
index 64cd12e5..7cd451f6 100644
--- a/lib/device/zigbee/switch-single.js
+++ b/lib/device/zigbee/switch-single.js
@@ -29,10 +29,18 @@ module.exports = class deviceZBSwitchSingle {
     this.service = this.accessory.getService(this.hapServ.Switch) ||
       this.accessory.addService(this.hapServ.Switch)
 
-    // Add the set handler to the switch on/off characteristic
-    this.service.getCharacteristic(this.hapChar.On).onSet(async value => {
-      await this.internalUpdate(value)
-    })
+    // Add the get/set handler to the switch on/off characteristic
+    this.service.getCharacteristic(this.hapChar.On)
+      .onGet(() => {
+        if (this.isOnline) {
+          return this.service.getCharacteristic(this.hapChar.On).value
+        } else {
+          throw new this.platform.api.hap.HapStatusError(-70402)
+        }
+      })
+      .onSet(async value => {
+        await this.internalUpdate(value)
+      })
 
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new this.platform.eveService('switch', this.accessory, {
@@ -81,4 +89,8 @@ module.exports = class deviceZBSwitchSingle {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
+
+  markStatus (isOnline) {
+    this.isOnline = isOnline
+  }
 }
diff --git a/lib/device/zigbee/switch-stateless.js b/lib/device/zigbee/switch-stateless.js
index 17e67e23..d931f6d3 100644
--- a/lib/device/zigbee/switch-stateless.js
+++ b/lib/device/zigbee/switch-stateless.js
@@ -33,6 +33,15 @@ module.exports = class deviceZBSwitchStateless {
     this.service = this.accessory.getService(this.hapServ.StatelessProgrammableSwitch) ||
       this.accessory.addService(this.hapServ.StatelessProgrammableSwitch)
 
+    // Add the get handler to the state characteristic
+    this.service.getCharacteristic(this.hapChar.ProgrammableSwitchEvent).onGet(() => {
+      if (this.isOnline) {
+        return this.service.getCharacteristic(this.hapChar.ProgrammableSwitchEvent).value
+      } else {
+        throw new this.platform.api.hap.HapStatusError(-70402)
+      }
+    })
+
     // Hide the double and long press options if the user wants
     if (this.hideLongDouble) {
       this.service.getCharacteristic(this.hapChar.ProgrammableSwitchEvent)
@@ -84,4 +93,8 @@ module.exports = class deviceZBSwitchStateless {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
+
+  markStatus (isOnline) {
+    this.isOnline = isOnline
+  }
 }
diff --git a/lib/index.js b/lib/index.js
index 8ffd3d35..0c2e67c9 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1214,6 +1214,11 @@ class eWeLinkPlatform {
       // Update accessory characteristics with latest values
       if (this.wsClient && accessory.control && accessory.control.externalUpdate) {
         accessory.control.externalUpdate(device.params)
+
+        // Mark the online/offline status of zigbee devices
+        if (this.consts.devices.zigbee.includes(accessory.context.eweUIID)) {
+          accessory.control.markStatus(device.online)
+        }
       }
 
       // Update any changes to the device into our devicesInHB map
@@ -1442,6 +1447,11 @@ class eWeLinkPlatform {
             : this.messages.repOffline
           this.log('[%s] %s %s.', accessory.displayName, status, this.messages.viaWS)
 
+          // Mark the online/offline status of zigbee devices
+          if (this.consts.devices.zigbee.includes(accessory.context.eweUIID)) {
+            accessory.control.markStatus(device.params.online)
+          }
+
           // Try and request an update through WS if the device has come back online
           if (accessory.context.reachableWAN && this.wsClient) {
             try {
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index d1bc4311..4525cc27 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -124,6 +124,7 @@ module.exports = {
     eWeCamera: [65],
     rfBridge: [28],
     zbBridge: [66],
+    zigbee: [1000, 1009, 1256, 1257, 1258, 1770, 2026, 3026],
     zbSwitchStateless: [1000],
     zbSwitchSingle: [1009, 1256],
     zbLightDimmer: [1257],

From 93ed0ca7094a9a1db0ca20715ce2b6e49cf56f25 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 30 Mar 2021 09:55:07 +0100
Subject: [PATCH 1774/3183] 6.0.0-2

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 756fdadc..dadaa24a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.0.0-1",
+  "version": "6.0.0-2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 79f952de..8d9133f4 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.0.0-1",
+  "version": "6.0.0-2",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 5beea2e90c5e7755f7a6e7e50e23c1c585188431 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 30 Mar 2021 10:13:24 +0100
Subject: [PATCH 1775/3183] dw2 status

---
 lib/device/sensor-contact.js | 13 +++++++++++++
 lib/index.js                 |  4 ++--
 lib/utils/constants.js       |  2 +-
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/lib/device/sensor-contact.js b/lib/device/sensor-contact.js
index 7f10e8c1..23510b62 100644
--- a/lib/device/sensor-contact.js
+++ b/lib/device/sensor-contact.js
@@ -44,6 +44,15 @@ module.exports = class deviceSensorContact {
       this.service.addCharacteristic(this.eveChar.TimesOpened)
     }
 
+    // Add the get handler to the contact sensor state characteristic
+    this.service.getCharacteristic(this.hapChar.ContactSensorState).onGet(() => {
+      if (this.isOnline) {
+        return this.service.getCharacteristic(this.hapChar.ContactSensorState).value
+      } else {
+        throw new this.platform.api.hap.HapStatusError(-70402)
+      }
+    })
+
     // Obtain the current times opened value
     this.timesOpened = this.service.getCharacteristic(this.eveChar.TimesOpened).value
 
@@ -147,4 +156,8 @@ module.exports = class deviceSensorContact {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
+
+  markStatus (isOnline) {
+    this.isOnline = isOnline
+  }
 }
diff --git a/lib/index.js b/lib/index.js
index 0c2e67c9..ded2f91d 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1216,7 +1216,7 @@ class eWeLinkPlatform {
         accessory.control.externalUpdate(device.params)
 
         // Mark the online/offline status of zigbee devices
-        if (this.consts.devices.zigbee.includes(accessory.context.eweUIID)) {
+        if (this.consts.devices.markStatus.includes(accessory.context.eweUIID)) {
           accessory.control.markStatus(device.online)
         }
       }
@@ -1448,7 +1448,7 @@ class eWeLinkPlatform {
           this.log('[%s] %s %s.', accessory.displayName, status, this.messages.viaWS)
 
           // Mark the online/offline status of zigbee devices
-          if (this.consts.devices.zigbee.includes(accessory.context.eweUIID)) {
+          if (this.consts.devices.markStatus.includes(accessory.context.eweUIID)) {
             accessory.control.markStatus(device.params.online)
           }
 
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 4525cc27..86fe6841 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -103,6 +103,7 @@ module.exports = {
   devices: {
     lanIn: [1, 2, 3, 4, 5, 6, 7, 8, 9, 14, 15, 32, 44, 77, 78, 103, 104, 126],
     lanOut: [1, 2, 3, 4, 5, 6, 7, 8, 9, 14, 32, 44, 77, 78, 126],
+    markStatus: [102, 1000, 1009, 1256, 1257, 1258, 1770, 2026, 3026],
     singleSwitch: [1, 5, 6, 14, 24, 27],
     multiSwitch: [2, 3, 4, 7, 8, 9, 29, 30, 31, 41, 82, 83, 84, 126],
     singleSwitchOutlet: ['Sonoff Pow', 'S20', 'S26', 'S26R1', 'S55', 'S55R1'],
@@ -124,7 +125,6 @@ module.exports = {
     eWeCamera: [65],
     rfBridge: [28],
     zbBridge: [66],
-    zigbee: [1000, 1009, 1256, 1257, 1258, 1770, 2026, 3026],
     zbSwitchStateless: [1000],
     zbSwitchSingle: [1009, 1256],
     zbLightDimmer: [1257],

From ad18ea3a1e4a4e9d7fd7083ee6b5494f3c7b0dc4 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 30 Mar 2021 10:17:28 +0100
Subject: [PATCH 1776/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1726714c..92c0aced 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,10 +14,12 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 ### Changes
 
+* 'No Response' messages for **Zigbee and DW2** devices as they go on and offline
+* 'No Response' messages for  **all devices** if controlled and unsuccessful (and this status will be reverted after 5 seconds)
+  * This change **does not** apply to Accessory Simulations nor Zigbee devices (except wired switches) yet
 * Use the new `.onSet` methods available in Homebridge v1.3
-* Plugin will report 'offline' devices with a 'No Response' message in HomeKit apps when controlled (and this status will be reverted after 5 seconds)
-  * These changes **do not** apply to Accessory Simulations nor Zigbee devices (except wired switches) yet
-
+  * This change **does not** apply to Accessory Simulations nor Zigbee devices yet
+  
 ## 5.6.0 (2021-03-25)
 
 ### Added

From 159bb2b059040ab16869af6ecf2c72a2d74eee05 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 30 Mar 2021 10:18:25 +0100
Subject: [PATCH 1777/3183] 6.0.0-3

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index dadaa24a..8979b201 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.0.0-2",
+  "version": "6.0.0-3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 8d9133f4..c1afc641 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.0.0-2",
+  "version": "6.0.0-3",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From dabca4cf35420a666063ec58bd0e5219bebd2f37 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 30 Mar 2021 11:03:27 +0100
Subject: [PATCH 1778/3183] zigbee hb 1.3 updates

---
 lib/device/zigbee/light-cct.js        | 113 +++++++++++++-------------
 lib/device/zigbee/light-dimmer.js     |  40 +++++----
 lib/device/zigbee/sensor-ambient.js   |   6 +-
 lib/device/zigbee/sensor-contact.js   |  10 +--
 lib/device/zigbee/switch-stateless.js |  11 ++-
 5 files changed, 96 insertions(+), 84 deletions(-)

diff --git a/lib/device/zigbee/light-cct.js b/lib/device/zigbee/light-cct.js
index d13d26ae..86fac952 100644
--- a/lib/device/zigbee/light-cct.js
+++ b/lib/device/zigbee/light-cct.js
@@ -48,32 +48,31 @@ module.exports = class deviceZBLightCCT {
           throw new this.platform.api.hap.HapStatusError(-70402)
         }
       })
-      .on('set', this.internalOnOffUpdate.bind(this))
+      .onSet(async value => {
+        await this.internalOnOffUpdate(value)
+      })
 
     // Add the set handler to the lightbulb brightness characteristic
     this.service.getCharacteristic(this.hapChar.Brightness)
-      .on('set', this.internalBrightnessUpdate.bind(this))
       .setProps({ minStep: this.brightStep })
+      .onSet(async value => {
+        await this.internalBrightnessUpdate(value)
+      })
 
     // Add the set handler to the lightbulb colour temperature characteristic
-    this.service.getCharacteristic(this.hapChar.ColorTemperature)
-      .on('set', this.internalCTempUpdate.bind(this))
-
-    // Set up the adaptive lighting controller if available
-    if (
-      platform.api.versionGreaterOrEqual &&
-      platform.api.versionGreaterOrEqual('1.3.0')
-    ) {
-      // This is needed as sometimes we need to send the brightness with a cct update
-      this.cacheBrightness = this.service.getCharacteristic(this.hapChar.Brightness).value
-
-      // Set up the adaptive lighting controller
-      this.alController = new platform.api.hap.AdaptiveLightingController(
-        this.service,
-        { customTemperatureAdjustment: this.alShift }
-      )
-      this.accessory.configureController(this.alController)
-    }
+    this.service.getCharacteristic(this.hapChar.ColorTemperature).onSet(async value => {
+      this.internalCTempUpdate(value)
+    })
+
+    // This is needed as sometimes we need to send the brightness with a cct update
+    this.cacheBrightness = this.service.getCharacteristic(this.hapChar.Brightness).value
+
+    // Set up the adaptive lighting controller
+    this.alController = new platform.api.hap.AdaptiveLightingController(
+      this.service,
+      { customTemperatureAdjustment: this.alShift }
+    )
+    this.accessory.configureController(this.alController)
 
     // Output the customised options to the log if in debug mode
     if (this.debug) {
@@ -86,66 +85,57 @@ module.exports = class deviceZBLightCCT {
     }
   }
 
-  async internalOnOffUpdate (value, callback) {
+  async internalOnOffUpdate (value) {
     try {
-      callback()
+      const newValue = value ? 'on' : 'off'
       await this.platform.sendDeviceUpdate(this.accessory, {
-        switch: value ? 'on' : 'off'
+        switch: newValue
       })
-      this.cacheOnOff = value ? 'on' : 'off'
+      this.cacheOnOff = newValue
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current state [%s].', this.name, value ? 'on' : 'off')
+        this.log('[%s] current state [%s].', this.name, this.cacheOnOff)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
+      setTimeout(() => {
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheOnOff === 'on')
+      }, 5000)
+      throw new this.platform.api.hap.HapStatusError(-70402)
     }
   }
 
-  async internalBrightnessUpdate (value, callback) {
+  async internalBrightnessUpdate (value) {
     try {
       if (this.cacheBrightness === value || value === 0) {
-        callback()
         return
       }
-      this.cacheBrightness = value
-      callback()
-      const params = {
-        switch: 'on',
-        brightness: this.cacheBrightness
-      }
       const updateKey = Math.random().toString(36).substr(2, 8)
       this.updateKeyBright = updateKey
       await this.funcs.sleep(500)
       if (updateKey !== this.updateKeyBright) {
         return
       }
+      const params = {
+        switch: 'on',
+        brightness: value
+      }
       await this.platform.sendDeviceUpdate(this.accessory, params)
+      this.cacheBrightness = value
       if (!this.disableDeviceLogging) {
         this.log('[%s] current brightness [%s%].', this.name, this.cacheBrightness)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
+      setTimeout(() => {
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheOnOff === 'on')
+      }, 5000)
+      throw new this.platform.api.hap.HapStatusError(-70402)
     }
   }
 
-  async internalCTempUpdate (value, callback) {
+  async internalCTempUpdate (value) {
     try {
-      if (this.cacheMired === value) {
-        callback()
-        return
-      }
-      this.cacheMired = value
-      callback()
-      const kelvin = Math.round(1000000 / this.cacheMired)
-      const scaledK = Math.max(Math.min(kelvin, this.maxK), this.minK)
-      this.cacheCT = Math.round(((scaledK - this.minK) / (this.maxK - this.minK)) * 100)
-      const params = {
-        switch: 'on',
-        colorTemp: this.cacheCT
-      }
-      // For adaptive lighting we still want to update the would have been so
-      // it's not disabled when the light comes back on so do this check now not before
-      if (this.cacheOnOff !== 'on') {
+      if (this.cacheMired === value || this.cacheOnOff !== 'on') {
         return
       }
       const updateKey = Math.random().toString(36).substr(2, 8)
@@ -154,9 +144,18 @@ module.exports = class deviceZBLightCCT {
       if (updateKey !== this.updateKeyCT) {
         return
       }
+      const kelvin = Math.round(1000000 / value)
+      const scaledK = Math.max(Math.min(kelvin, this.maxK), this.minK)
+      const scaledCT = Math.round(((scaledK - this.minK) / (this.maxK - this.minK)) * 100)
+      const params = {
+        switch: 'on',
+        colorTemp: scaledCT
+      }
       await this.platform.sendDeviceUpdate(this.accessory, params)
+      this.cacheMired = value
+      this.cacheCT = scaledCT
       if (!this.disableDeviceLogging) {
-        if (this.alController && this.alController.isAdaptiveLightingActive()) {
+        if (this.alController.isAdaptiveLightingActive()) {
           this.log('[%s] current cct [%sK] via adaptive lighting.', this.name, scaledK)
         } else {
           this.log('[%s] current cct [%sK].', this.name, scaledK)
@@ -164,6 +163,10 @@ module.exports = class deviceZBLightCCT {
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
+      setTimeout(() => {
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheOnOff === 'on')
+      }, 5000)
+      throw new this.platform.api.hap.HapStatusError(-70402)
     }
   }
 
@@ -200,12 +203,8 @@ module.exports = class deviceZBLightCCT {
             if (!this.disableDeviceLogging) {
               this.log('[%s] current cct [%sK].', this.name, scaledK)
             }
-            if (
-              this.alController &&
-              this.alController.isAdaptiveLightingActive() &&
-              ctDiff > 20
-            ) {
-              // look for a variation greater than five
+            if (this.alController.isAdaptiveLightingActive() && ctDiff > 20) {
+              // look for a variation greater than twenty
               this.alController.disableAdaptiveLighting()
               this.log(
                 '[%s] adaptive lighting disabled due to significant colour change.',
diff --git a/lib/device/zigbee/light-dimmer.js b/lib/device/zigbee/light-dimmer.js
index 2671bf2f..2ab8ec08 100644
--- a/lib/device/zigbee/light-dimmer.js
+++ b/lib/device/zigbee/light-dimmer.js
@@ -41,12 +41,16 @@ module.exports = class deviceZBLightDimmer {
           throw new this.platform.api.hap.HapStatusError(-70402)
         }
       })
-      .on('set', this.internalOnOffUpdate.bind(this))
+      .onSet(async value => {
+        await this.internalOnOffUpdate(value)
+      })
 
     // Add the set handler to the lightbulb brightness characteristic
     this.service.getCharacteristic(this.hapChar.Brightness)
-      .on('set', this.internalBrightnessUpdate.bind(this))
       .setProps({ minStep: this.brightStep })
+      .onSet(async value => {
+        await this.internalBrightnessUpdate(value)
+      })
 
     // Output the customised options to the log if in debug mode
     if (this.debug) {
@@ -58,45 +62,51 @@ module.exports = class deviceZBLightDimmer {
     }
   }
 
-  async internalOnOffUpdate (value, callback) {
+  async internalOnOffUpdate (value) {
     try {
-      callback()
+      const newValue = value ? 'on' : 'off'
       await this.platform.sendDeviceUpdate(this.accessory, {
-        switch: value ? 'on' : 'off'
+        switch: newValue
       })
-      this.cacheOnOff = value ? 'on' : 'off'
+      this.cacheOnOff = newValue
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current state [%s].', this.name, value ? 'on' : 'off')
+        this.log('[%s] current state [%s].', this.name, this.cacheOnOff)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
+      setTimeout(() => {
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheOnOff === 'on')
+      }, 5000)
+      throw new this.platform.api.hap.HapStatusError(-70402)
     }
   }
 
-  async internalBrightnessUpdate (value, callback) {
+  async internalBrightnessUpdate (value) {
     try {
       if (this.cacheBrightness === value || value === 0) {
-        callback()
         return
       }
-      this.cacheBrightness = value
-      callback()
-      const params = {
-        switch: 'on',
-        brightness: this.cacheBrightness
-      }
       const updateKey = Math.random().toString(36).substr(2, 8)
       this.updateKeyBright = updateKey
       await this.funcs.sleep(500)
       if (updateKey !== this.updateKeyBright) {
         return
       }
+      const params = {
+        switch: 'on',
+        brightness: value
+      }
       await this.platform.sendDeviceUpdate(this.accessory, params)
+      this.cacheBrightness = value
       if (!this.disableDeviceLogging) {
         this.log('[%s] current brightness [%s%].', this.name, this.cacheBrightness)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
+      setTimeout(() => {
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheOnOff === 'on')
+      }, 5000)
+      throw new this.platform.api.hap.HapStatusError(-70402)
     }
   }
 
diff --git a/lib/device/zigbee/sensor-ambient.js b/lib/device/zigbee/sensor-ambient.js
index 618344f0..71efb93e 100644
--- a/lib/device/zigbee/sensor-ambient.js
+++ b/lib/device/zigbee/sensor-ambient.js
@@ -101,8 +101,10 @@ module.exports = class deviceZBSensorAmbient {
       ) {
         this.cacheHumi = params.humidity
         const currentHumi = parseInt(this.cacheHumi) / 100
-        this.hService
-          .updateCharacteristic(this.hapChar.CurrentRelativeHumidity, currentHumi)
+        this.hService.updateCharacteristic(
+          this.hapChar.CurrentRelativeHumidity,
+          currentHumi
+        )
         eveLog.humidity = currentHumi
         if (params.updateSource && !this.disableDeviceLogging) {
           this.log('[%s] current humidity [%s].', this.name, currentHumi)
diff --git a/lib/device/zigbee/sensor-contact.js b/lib/device/zigbee/sensor-contact.js
index 22f69026..38c5db12 100644
--- a/lib/device/zigbee/sensor-contact.js
+++ b/lib/device/zigbee/sensor-contact.js
@@ -53,12 +53,10 @@ module.exports = class deviceZBSensorContact {
     this.timesOpened = this.service.getCharacteristic(this.eveChar.TimesOpened).value
 
     // Add the set handler to the contact sensor reset total characteristic
-    this.service.getCharacteristic(this.eveChar.ResetTotal)
-      .on('set', (value, callback) => {
-        callback()
-        this.timesOpened = 0
-        this.service.updateCharacteristic(this.eveChar.TimesOpened, 0)
-      })
+    this.service.getCharacteristic(this.eveChar.ResetTotal).onSet(value => {
+      this.timesOpened = 0
+      this.service.updateCharacteristic(this.eveChar.TimesOpened, 0)
+    })
 
     // Add the battery service if it doesn't already exist
     this.battService = this.accessory.getService(this.hapServ.BatteryService) ||
diff --git a/lib/device/zigbee/switch-stateless.js b/lib/device/zigbee/switch-stateless.js
index d931f6d3..269cdb9a 100644
--- a/lib/device/zigbee/switch-stateless.js
+++ b/lib/device/zigbee/switch-stateless.js
@@ -44,8 +44,9 @@ module.exports = class deviceZBSwitchStateless {
 
     // Hide the double and long press options if the user wants
     if (this.hideLongDouble) {
-      this.service.getCharacteristic(this.hapChar.ProgrammableSwitchEvent)
-        .setProps({ validValues: [0] })
+      this.service.getCharacteristic(this.hapChar.ProgrammableSwitchEvent).setProps({
+        validValues: [0]
+      })
     }
 
     // Add the battery service if it doesn't already exist
@@ -80,8 +81,10 @@ module.exports = class deviceZBSwitchStateless {
         }
       }
       if (this.funcs.hasProperty(params, 'key') && [0, 1, 2].includes(params.key)) {
-        this.service
-          .updateCharacteristic(this.hapChar.ProgrammableSwitchEvent, params.key)
+        this.service.updateCharacteristic(
+          this.hapChar.ProgrammableSwitchEvent,
+          params.key
+        )
         if (params.updateSource && !this.disableDeviceLogging) {
           const textLabel = params.key === 0
             ? 'single'

From 107c017eebb60a7f85c3e55c227c1b05c4f15935 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 30 Mar 2021 11:04:03 +0100
Subject: [PATCH 1779/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 92c0aced..d063e16b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,9 +16,9 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 * 'No Response' messages for **Zigbee and DW2** devices as they go on and offline
 * 'No Response' messages for  **all devices** if controlled and unsuccessful (and this status will be reverted after 5 seconds)
-  * This change **does not** apply to Accessory Simulations nor Zigbee devices (except wired switches) yet
+  * This change **does not** apply to Accessory Simulations yet
 * Use the new `.onSet` methods available in Homebridge v1.3
-  * This change **does not** apply to Accessory Simulations nor Zigbee devices yet
+  * This change **does not** apply to Accessory Simulations yet
   
 ## 5.6.0 (2021-03-25)
 

From 1ce13d8b2895ab99736a85c2cc1af584a436acf7 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 30 Mar 2021 11:04:44 +0100
Subject: [PATCH 1780/3183] 6.0.0-4

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 8979b201..05328bb1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.0.0-3",
+  "version": "6.0.0-4",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index c1afc641..0067e8d3 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.0.0-3",
+  "version": "6.0.0-4",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From e9aa35a8148f77b30614ed38231439d41dd02a72 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 30 Mar 2021 11:48:52 +0100
Subject: [PATCH 1781/3183] rearrange error logic for updates

---
 lib/index.js | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/lib/index.js b/lib/index.js
index ded2f91d..aaa33104 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1398,14 +1398,20 @@ class eWeLinkPlatform {
       // Revert to WS if LAN mode not possible for whatever reason
       if (res !== 'ok') {
         // Check to see if the device is online
-        if (this.wsClient && accessory.context.reachableWAN) {
-        // Log the revert if appropriate
+        if (this.wsClient) {
+          // Log the revert if appropriate
           if (this.config.debug) {
             this.log('[%s] %s %s.', accessory.displayName, this.messages.revertWS, res)
           }
 
-          // Device is online via WS so send the update
-          await this.wsClient.sendUpdate(payload)
+          // Attempt the update
+          if (accessory.context.reachableWAN) {
+            // Device is online via WS so send the update
+            await this.wsClient.sendUpdate(payload)
+          } else {
+            // Device appears to be offline
+            throw new Error(this.messages.unreachable)
+          }
         } else {
           // Device isn't online via WS so report the error back
           const eText = [this.messages.lanDisabled, this.messages.lanNotSup].includes(res)

From b2fbb43e82e31e89156fdb8fa7888478486748be Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 30 Mar 2021 12:37:15 +0100
Subject: [PATCH 1782/3183] code consistency

---
 lib/device/simulation/blind.js        | 4 ++--
 lib/device/simulation/door.js         | 4 ++--
 lib/device/simulation/garage-four.js  | 4 ++--
 lib/device/simulation/garage-two.js   | 4 ++--
 lib/device/simulation/switch-valve.js | 8 ++++----
 lib/device/simulation/tap-one.js      | 4 ++--
 lib/device/simulation/tap-two.js      | 4 ++--
 lib/device/simulation/valve-four.js   | 8 ++++----
 lib/device/simulation/valve-one.js    | 8 ++++----
 lib/device/simulation/valve-two.js    | 8 ++++----
 lib/device/simulation/window.js       | 4 ++--
 11 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/lib/device/simulation/blind.js b/lib/device/simulation/blind.js
index 86f26904..97a594dd 100644
--- a/lib/device/simulation/blind.js
+++ b/lib/device/simulation/blind.js
@@ -39,8 +39,8 @@ module.exports = class deviceBlind {
     if (!(this.service = this.accessory.getService(this.hapServ.WindowCovering))) {
       this.service = this.accessory.addService(this.hapServ.WindowCovering)
       this.service.setCharacteristic(this.hapChar.CurrentPosition, 0)
-        .setCharacteristic(this.hapChar.TargetPosition, 0)
-        .setCharacteristic(this.hapChar.PositionState, 2)
+      this.service.setCharacteristic(this.hapChar.TargetPosition, 0)
+      this.service.setCharacteristic(this.hapChar.PositionState, 2)
     }
 
     // Add the set handler to the target position characteristic
diff --git a/lib/device/simulation/door.js b/lib/device/simulation/door.js
index b5984903..3f14243c 100644
--- a/lib/device/simulation/door.js
+++ b/lib/device/simulation/door.js
@@ -39,8 +39,8 @@ module.exports = class deviceDoor {
     if (!(this.service = this.accessory.getService(this.hapServ.Door))) {
       this.service = this.accessory.addService(this.hapServ.Door)
       this.service.setCharacteristic(this.hapChar.CurrentPosition, 0)
-        .setCharacteristic(this.hapChar.TargetPosition, 0)
-        .setCharacteristic(this.hapChar.PositionState, 2)
+      this.service.setCharacteristic(this.hapChar.TargetPosition, 0)
+      this.service.setCharacteristic(this.hapChar.PositionState, 2)
     }
 
     // Add the set handler to the target position characteristic
diff --git a/lib/device/simulation/garage-four.js b/lib/device/simulation/garage-four.js
index f5030ddd..4b469c54 100644
--- a/lib/device/simulation/garage-four.js
+++ b/lib/device/simulation/garage-four.js
@@ -49,8 +49,8 @@ module.exports = class deviceGarageFour {
           'garage' + v
         )
         gdService.setCharacteristic(this.hapChar.CurrentDoorState, 1)
-          .setCharacteristic(this.hapChar.TargetDoorState, 1)
-          .setCharacteristic(this.hapChar.ObstructionDetected, false)
+        gdService..setCharacteristic(this.hapChar.TargetDoorState, 1)
+        gdService..setCharacteristic(this.hapChar.ObstructionDetected, false)
       }
 
       // Add the set handler to the target position characteristic
diff --git a/lib/device/simulation/garage-two.js b/lib/device/simulation/garage-two.js
index 00ca5c4a..905f934d 100644
--- a/lib/device/simulation/garage-two.js
+++ b/lib/device/simulation/garage-two.js
@@ -47,8 +47,8 @@ module.exports = class deviceGarageTwo {
           'garage' + v
         )
         gdService.setCharacteristic(this.hapChar.CurrentDoorState, 1)
-          .setCharacteristic(this.hapChar.TargetDoorState, 1)
-          .setCharacteristic(this.hapChar.ObstructionDetected, false)
+        gdService.setCharacteristic(this.hapChar.TargetDoorState, 1)
+        gdService.setCharacteristic(this.hapChar.ObstructionDetected, false)
       }
 
       // Add the set handler to the target position characteristic
diff --git a/lib/device/simulation/switch-valve.js b/lib/device/simulation/switch-valve.js
index 05eb91eb..15e57415 100644
--- a/lib/device/simulation/switch-valve.js
+++ b/lib/device/simulation/switch-valve.js
@@ -33,10 +33,10 @@ module.exports = class deviceSwitchValve {
     if (!(this.vService = this.accessory.getService(this.hapServ.Valve))) {
       this.vService = this.accessory.addService(this.hapServ.Valve)
       this.vService.setCharacteristic(this.hapChar.Active, 0)
-        .setCharacteristic(this.hapChar.InUse, 0)
-        .setCharacteristic(this.hapChar.ValveType, 1)
-        .setCharacteristic(this.hapChar.SetDuration, 120)
-        .addCharacteristic(this.hapChar.RemainingDuration)
+      this.vService.setCharacteristic(this.hapChar.InUse, 0)
+      this.vService.setCharacteristic(this.hapChar.ValveType, 1)
+      this.vService.setCharacteristic(this.hapChar.SetDuration, 120)
+      this.vService.addCharacteristic(this.hapChar.RemainingDuration)
     }
 
     // Add the set handler to the switch on/off characteristic
diff --git a/lib/device/simulation/tap-one.js b/lib/device/simulation/tap-one.js
index dda149e0..51f891d2 100644
--- a/lib/device/simulation/tap-one.js
+++ b/lib/device/simulation/tap-one.js
@@ -40,8 +40,8 @@ module.exports = class deviceTapOne {
     if (!(this.service = this.accessory.getService(this.hapServ.Valve))) {
       this.service = this.accessory.addService(this.hapServ.Valve)
       this.service.setCharacteristic(this.hapChar.Active, 0)
-        .setCharacteristic(this.hapChar.InUse, 0)
-        .setCharacteristic(this.hapChar.ValveType, 3)
+      this.service.setCharacteristic(this.hapChar.InUse, 0)
+      this.service.setCharacteristic(this.hapChar.ValveType, 3)
     }
 
     // Add the set handler to the tap active characteristic
diff --git a/lib/device/simulation/tap-two.js b/lib/device/simulation/tap-two.js
index 48728c3d..f86701ca 100644
--- a/lib/device/simulation/tap-two.js
+++ b/lib/device/simulation/tap-two.js
@@ -32,8 +32,8 @@ module.exports = class deviceTapTwo {
       if (!(tapService = this.accessory.getService(this.hapServ.Valve))) {
         tapService = this.accessory.addService(this.hapServ.Valve)
         tapService.setCharacteristic(this.hapChar.Active, 0)
-          .setCharacteristic(this.hapChar.InUse, 0)
-          .setCharacteristic(this.hapChar.ValveType, 3)
+        tapService.setCharacteristic(this.hapChar.InUse, 0)
+        tapService.setCharacteristic(this.hapChar.ValveType, 3)
       }
 
       // Add the set handler to the tap active characteristic
diff --git a/lib/device/simulation/valve-four.js b/lib/device/simulation/valve-four.js
index 924d5fb9..93be13e2 100644
--- a/lib/device/simulation/valve-four.js
+++ b/lib/device/simulation/valve-four.js
@@ -36,10 +36,10 @@ module.exports = class deviceValveFour {
           'valve' + v.toLowerCase()
         )
         valveService.setCharacteristic(this.hapChar.Active, 0)
-          .setCharacteristic(this.hapChar.InUse, 0)
-          .setCharacteristic(this.hapChar.ValveType, 1)
-          .setCharacteristic(this.hapChar.SetDuration, 120)
-          .addCharacteristic(this.hapChar.RemainingDuration)
+        valveService.setCharacteristic(this.hapChar.InUse, 0)
+        valveService.setCharacteristic(this.hapChar.ValveType, 1)
+        valveService.setCharacteristic(this.hapChar.SetDuration, 120)
+        valveService.addCharacteristic(this.hapChar.RemainingDuration)
       }
 
       // Add the set handler to the valve active characteristic
diff --git a/lib/device/simulation/valve-one.js b/lib/device/simulation/valve-one.js
index a3c19a78..664a32e4 100644
--- a/lib/device/simulation/valve-one.js
+++ b/lib/device/simulation/valve-one.js
@@ -40,10 +40,10 @@ module.exports = class deviceValveOne {
     if (!(this.service = this.accessory.getService(this.hapServ.Valve))) {
       this.service = this.accessory.addService(this.hapServ.Valve)
       this.service.setCharacteristic(this.hapChar.Active, 0)
-        .setCharacteristic(this.hapChar.InUse, 0)
-        .setCharacteristic(this.hapChar.ValveType, 1)
-        .setCharacteristic(this.hapChar.SetDuration, 120)
-        .addCharacteristic(this.hapChar.RemainingDuration)
+      this.service.setCharacteristic(this.hapChar.InUse, 0)
+      this.service.setCharacteristic(this.hapChar.ValveType, 1)
+      this.service.setCharacteristic(this.hapChar.SetDuration, 120)
+      this.service.addCharacteristic(this.hapChar.RemainingDuration)
     }
 
     // Add the set handler to the valve active characteristic
diff --git a/lib/device/simulation/valve-two.js b/lib/device/simulation/valve-two.js
index 9ad51b5c..9f35f3dc 100644
--- a/lib/device/simulation/valve-two.js
+++ b/lib/device/simulation/valve-two.js
@@ -36,10 +36,10 @@ module.exports = class deviceValveTwo {
           'valve' + v.toLowerCase()
         )
         valveService.setCharacteristic(this.hapChar.Active, 0)
-          .setCharacteristic(this.hapChar.InUse, 0)
-          .setCharacteristic(this.hapChar.ValveType, 1)
-          .setCharacteristic(this.hapChar.SetDuration, 120)
-          .addCharacteristic(this.hapChar.RemainingDuration)
+        valveService.setCharacteristic(this.hapChar.InUse, 0)
+        valveService.setCharacteristic(this.hapChar.ValveType, 1)
+        valveService.setCharacteristic(this.hapChar.SetDuration, 120)
+        valveService.addCharacteristic(this.hapChar.RemainingDuration)
       }
 
       // Add the set handler to the valve active characteristic
diff --git a/lib/device/simulation/window.js b/lib/device/simulation/window.js
index 7eae7bf0..c771c8fe 100644
--- a/lib/device/simulation/window.js
+++ b/lib/device/simulation/window.js
@@ -39,8 +39,8 @@ module.exports = class deviceWindow {
     if (!(this.service = this.accessory.getService(this.hapServ.Window))) {
       this.service = this.accessory.addService(this.hapServ.Window)
       this.service.setCharacteristic(this.hapChar.CurrentPosition, 0)
-        .setCharacteristic(this.hapChar.TargetPosition, 0)
-        .setCharacteristic(this.hapChar.PositionState, 2)
+      this.service.setCharacteristic(this.hapChar.TargetPosition, 0)
+      this.service.setCharacteristic(this.hapChar.PositionState, 2)
     }
 
     // Add the set handler to the target position characteristic

From 7e8a43eec72b3def3950ade2b34ab17639b770ba Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 30 Mar 2021 14:13:18 +0100
Subject: [PATCH 1783/3183] simulations hb 1.3 updates

---
 lib/device/simulation/blind.js            | 19 ++++++--
 lib/device/simulation/door.js             | 19 ++++++--
 lib/device/simulation/garage-eachen.js    | 29 +++++++-----
 lib/device/simulation/garage-four.js      | 24 +++++++---
 lib/device/simulation/garage-od-switch.js | 20 ---------
 lib/device/simulation/garage-one.js       | 32 +++++++++-----
 lib/device/simulation/garage-two.js       | 22 ++++++---
 lib/device/simulation/lock-one.js         | 19 +++++---
 lib/device/simulation/switch-valve.js     | 54 +++++++++++++----------
 lib/device/simulation/tap-one.js          | 18 ++++----
 lib/device/simulation/tap-two.js          | 13 ++++--
 lib/device/simulation/thermostat.js       | 49 +++++++++++++-------
 lib/device/simulation/valve-four.js       | 45 ++++++++++---------
 lib/device/simulation/valve-one.js        | 45 ++++++++++---------
 lib/device/simulation/valve-two.js        | 45 ++++++++++---------
 lib/device/simulation/window.js           | 19 ++++++--
 16 files changed, 282 insertions(+), 190 deletions(-)

diff --git a/lib/device/simulation/blind.js b/lib/device/simulation/blind.js
index 97a594dd..a4741579 100644
--- a/lib/device/simulation/blind.js
+++ b/lib/device/simulation/blind.js
@@ -44,8 +44,10 @@ module.exports = class deviceBlind {
     }
 
     // Add the set handler to the target position characteristic
-    this.service.getCharacteristic(this.hapChar.TargetPosition)
-      .on('set', this.internalUpdate.bind(this))
+    this.service.getCharacteristic(this.hapChar.TargetPosition).onSet(value => {
+      // We don't use await as we want the callback to be run straight away
+      this.internalUpdate(value)
+    })
 
     // Output the customised options to the log if in debug mode
     if (this.debug) {
@@ -59,9 +61,8 @@ module.exports = class deviceBlind {
     }
   }
 
-  async internalUpdate (value, callback) {
+  async internalUpdate (value) {
     try {
-      callback()
       let prevPosition = this.accessory.context.cacheCurrentPosition
       if (value === prevPosition) {
         return
@@ -125,6 +126,16 @@ module.exports = class deviceBlind {
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
+      setTimeout(() => {
+        this.service.updateCharacteristic(
+          this.hapChar.TargetPosition,
+          this.accessory.context.cacheTargetPosition
+        )
+      }, 5000)
+      this.service.updateCharacteristic(
+        this.hapChar.TargetPosition,
+        new this.platform.api.hap.HapStatusError(-70402)
+      )
     }
   }
 
diff --git a/lib/device/simulation/door.js b/lib/device/simulation/door.js
index 3f14243c..ff30765e 100644
--- a/lib/device/simulation/door.js
+++ b/lib/device/simulation/door.js
@@ -44,8 +44,10 @@ module.exports = class deviceDoor {
     }
 
     // Add the set handler to the target position characteristic
-    this.service.getCharacteristic(this.hapChar.TargetPosition)
-      .on('set', this.internalUpdate.bind(this))
+    this.service.getCharacteristic(this.hapChar.TargetPosition).onSet(value => {
+      // We don't use await as we want the callback to be run straight away
+      this.internalUpdate(value)
+    })
 
     // Output the customised options to the log if in debug mode
     if (this.debug) {
@@ -59,9 +61,8 @@ module.exports = class deviceDoor {
     }
   }
 
-  async internalUpdate (value, callback) {
+  async internalUpdate (value) {
     try {
-      callback()
       let prevPosition = this.accessory.context.cacheCurrentPosition
       if (value === prevPosition) {
         return
@@ -125,6 +126,16 @@ module.exports = class deviceDoor {
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
+      setTimeout(() => {
+        this.service.updateCharacteristic(
+          this.hapChar.TargetPosition,
+          this.accessory.context.cacheTargetPosition
+        )
+      }, 5000)
+      this.service.updateCharacteristic(
+        this.hapChar.TargetPosition,
+        new this.platform.api.hap.HapStatusError(-70402)
+      )
     }
   }
 
diff --git a/lib/device/simulation/garage-eachen.js b/lib/device/simulation/garage-eachen.js
index 122e8429..73d97f94 100644
--- a/lib/device/simulation/garage-eachen.js
+++ b/lib/device/simulation/garage-eachen.js
@@ -58,16 +58,16 @@ module.exports = class deviceGarageEachen {
     this.timesOpened = this.service.getCharacteristic(this.eveChar.TimesOpened).value
 
     // Add the set handler to the garage door reset total characteristic
-    this.service.getCharacteristic(this.eveChar.ResetTotal)
-      .on('set', (value, callback) => {
-        callback()
-        this.timesOpened = 0
-        this.service.updateCharacteristic(this.eveChar.TimesOpened, 0)
-      })
+    this.service.getCharacteristic(this.eveChar.ResetTotal).onSet(value => {
+      this.timesOpened = 0
+      this.service.updateCharacteristic(this.eveChar.TimesOpened, 0)
+    })
 
     // Add the set handler to the target position characteristic
-    this.service.getCharacteristic(this.hapChar.TargetDoorState)
-      .on('set', this.internalUpdate.bind(this))
+    this.service.getCharacteristic(this.hapChar.TargetDoorState).onSet(value => {
+      // We don't use await as we want the callback to be run straight away
+      this.internalUpdate(value)
+    })
 
     // Update the obstruction detected to false on Homebridge restart
     this.service.updateCharacteristic(this.hapChar.ObstructionDetected, false)
@@ -88,9 +88,8 @@ module.exports = class deviceGarageEachen {
     }
   }
 
-  async internalUpdate (value, callback) {
+  async internalUpdate (value) {
     try {
-      callback()
       const params = { switch: value === 0 ? 'on' : 'off' }
       const curState = this.service.getCharacteristic(this.hapChar.CurrentDoorState).value
       if (value === curState % 2) {
@@ -121,6 +120,16 @@ module.exports = class deviceGarageEachen {
     } catch (err) {
       this.inUse = false
       this.platform.deviceUpdateError(this.accessory, err, true)
+      setTimeout(() => {
+        this.service.updateCharacteristic(
+          this.hapChar.TargetPosition,
+          this.accessory.context.cacheTargetPosition
+        )
+      }, 5000)
+      this.service.updateCharacteristic(
+        this.hapChar.TargetPosition,
+        new this.platform.api.hap.HapStatusError(-70402)
+      )
     }
   }
 
diff --git a/lib/device/simulation/garage-four.js b/lib/device/simulation/garage-four.js
index 4b469c54..7bd51bbd 100644
--- a/lib/device/simulation/garage-four.js
+++ b/lib/device/simulation/garage-four.js
@@ -49,13 +49,15 @@ module.exports = class deviceGarageFour {
           'garage' + v
         )
         gdService.setCharacteristic(this.hapChar.CurrentDoorState, 1)
-        gdService..setCharacteristic(this.hapChar.TargetDoorState, 1)
-        gdService..setCharacteristic(this.hapChar.ObstructionDetected, false)
+        gdService.setCharacteristic(this.hapChar.TargetDoorState, 1)
+        gdService.setCharacteristic(this.hapChar.ObstructionDetected, false)
       }
 
       // Add the set handler to the target position characteristic
-      gdService.getCharacteristic(this.hapChar.TargetDoorState)
-        .on('set', (value, callback) => this.internalUpdate(v, value, callback))
+      gdService.getCharacteristic(this.hapChar.TargetDoorState).onSet(value => {
+        // We don't use await as we want the callback to be run straight away
+        this.internalUpdate(v, value)
+      })
     })
 
     // Output the customised options to the log if in debug mode
@@ -70,9 +72,8 @@ module.exports = class deviceGarageFour {
     }
   }
 
-  async internalUpdate (garage, value, callback) {
+  async internalUpdate (garage, value) {
     try {
-      callback()
       let garageChannel
       switch (garage) {
         case 'A':
@@ -129,6 +130,17 @@ module.exports = class deviceGarageFour {
     } catch (err) {
       this.inUse = false
       this.platform.deviceUpdateError(this.accessory, err, true)
+      const gdService = this.accessory.getService('Garage ' + garage)
+      setTimeout(() => {
+        gdService.updateCharacteristic(
+          this.hapChar.TargetPosition,
+          this.accessory.context.cacheTargetPosition
+        )
+      }, 5000)
+      gdService.updateCharacteristic(
+        this.hapChar.TargetPosition,
+        new this.platform.api.hap.HapStatusError(-70402)
+      )
     }
   }
 
diff --git a/lib/device/simulation/garage-od-switch.js b/lib/device/simulation/garage-od-switch.js
index 0e4d0f58..dcbd237e 100644
--- a/lib/device/simulation/garage-od-switch.js
+++ b/lib/device/simulation/garage-od-switch.js
@@ -30,10 +30,6 @@ module.exports = class deviceGarageODSwitch {
     this.service = this.accessory.getService(this.hapServ.Switch) ||
       this.accessory.addService(this.hapServ.Switch)
 
-    // Add the set handler to the switch on/off characteristic
-    this.service.getCharacteristic(this.hapChar.On)
-      .on('set', this.internalUpdate.bind(this))
-
     // Get the garage door accessory to which this switch relates
     this.gService = this.garage.getService(this.hapServ.GarageDoorOpener)
 
@@ -50,22 +46,6 @@ module.exports = class deviceGarageODSwitch {
     }
   }
 
-  async internalUpdate (value, callback) {
-    try {
-      callback()
-      await this.platform.sendDeviceUpdate(this.accessory, {
-        switch: value ? 'on' : 'off'
-      })
-      this.cacheOnOff = value ? 'on' : 'off'
-      if (!this.disableDeviceLogging) {
-        this.log('[%s] current state [%s].', this.name, this.cacheOnOff)
-      }
-      this.gService.updateCharacteristic(this.hapChar.ObstructionDetected, value)
-    } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
-    }
-  }
-
   async externalUpdate (params) {
     try {
       if (!params.switch || params.switch === this.cacheOnOff) {
diff --git a/lib/device/simulation/garage-one.js b/lib/device/simulation/garage-one.js
index abce733a..11e890d7 100644
--- a/lib/device/simulation/garage-one.js
+++ b/lib/device/simulation/garage-one.js
@@ -90,16 +90,16 @@ module.exports = class deviceGarageOne {
     this.timesOpened = this.service.getCharacteristic(this.eveChar.TimesOpened).value
 
     // Add the set handler to the garage door reset total characteristic
-    this.service.getCharacteristic(this.eveChar.ResetTotal)
-      .on('set', (value, callback) => {
-        callback()
-        this.timesOpened = 0
-        this.service.updateCharacteristic(this.eveChar.TimesOpened, 0)
-      })
+    this.service.getCharacteristic(this.eveChar.ResetTotal).onSet(value => {
+      this.timesOpened = 0
+      this.service.updateCharacteristic(this.eveChar.TimesOpened, 0)
+    })
 
     // Add the set handler to the target position characteristic
-    this.service.getCharacteristic(this.hapChar.TargetDoorState)
-      .on('set', this.internalUpdate.bind(this))
+    this.service.getCharacteristic(this.hapChar.TargetDoorState).onSet(value => {
+      // We don't use await as we want the callback to be run straight away
+      this.internalUpdate(value)
+    })
 
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new this.platform.eveService('door', this.accessory, {
@@ -119,12 +119,10 @@ module.exports = class deviceGarageOne {
     }
   }
 
-  async internalUpdate (value, callback) {
+  async internalUpdate (value) {
     try {
-      callback()
       if (this.error) {
-        this.log.warn('[%s] invalid config - %s.', this.name, this.error)
-        return
+        throw new Error('invalid config - ' + this.error)
       }
       const newPos = value
       const params = {}
@@ -187,6 +185,16 @@ module.exports = class deviceGarageOne {
     } catch (err) {
       this.inUse = false
       this.platform.deviceUpdateError(this.accessory, err, true)
+      setTimeout(() => {
+        this.service.updateCharacteristic(
+          this.hapChar.TargetPosition,
+          this.accessory.context.cacheTargetPosition
+        )
+      }, 5000)
+      this.service.updateCharacteristic(
+        this.hapChar.TargetPosition,
+        new this.platform.api.hap.HapStatusError(-70402)
+      )
     }
   }
 
diff --git a/lib/device/simulation/garage-two.js b/lib/device/simulation/garage-two.js
index 905f934d..ee97e496 100644
--- a/lib/device/simulation/garage-two.js
+++ b/lib/device/simulation/garage-two.js
@@ -52,10 +52,10 @@ module.exports = class deviceGarageTwo {
       }
 
       // Add the set handler to the target position characteristic
-      gdService.getCharacteristic(this.hapChar.TargetDoorState)
-        .on('set', (value, callback) => {
-          this.internalUpdate('Garage' + v, value, callback)
-        })
+      gdService.getCharacteristic(this.hapChar.TargetDoorState).onSet(value => {
+        // We don't use await as we want the callback to be run straight away
+        this.internalUpdate('Garage' + v, value)
+      })
     })
 
     // Output the customised options to the log if in debug mode
@@ -70,9 +70,8 @@ module.exports = class deviceGarageTwo {
     }
   }
 
-  async internalUpdate (garage, value, callback) {
+  async internalUpdate (garage, value) {
     try {
-      callback()
       const newPos = value
       const params = { switches: this.cacheSwitchState }
       const gdService = this.accessory.getService(garage)
@@ -134,6 +133,17 @@ module.exports = class deviceGarageTwo {
     } catch (err) {
       this.inUse = false
       this.platform.deviceUpdateError(this.accessory, err, true)
+      const gdService = this.accessory.getService(garage)
+      setTimeout(() => {
+        gdService.updateCharacteristic(
+          this.hapChar.TargetPosition,
+          this.accessory.context.cacheTargetPosition
+        )
+      }, 5000)
+      gdService.updateCharacteristic(
+        this.hapChar.TargetPosition,
+        new this.platform.api.hap.HapStatusError(-70402)
+      )
     }
   }
 
diff --git a/lib/device/simulation/lock-one.js b/lib/device/simulation/lock-one.js
index b8eb8aa5..8485aae0 100644
--- a/lib/device/simulation/lock-one.js
+++ b/lib/device/simulation/lock-one.js
@@ -43,8 +43,10 @@ module.exports = class deviceLockOne {
       this.accessory.addService(this.hapServ.LockMechanism)
 
     // Add the set handler to the lock target state characteristic
-    this.service.getCharacteristic(this.hapChar.LockTargetState)
-      .on('set', this.internalUpdate.bind(this))
+    this.service.getCharacteristic(this.hapChar.LockTargetState).onSet(value => {
+      // We don't use await as we want the callback to be run straight away
+      this.internalUpdate(value)
+    })
 
     // Always show the accessory as locked on Homebridge restart
     this.service.updateCharacteristic(this.hapChar.LockCurrentState, 1)
@@ -62,12 +64,10 @@ module.exports = class deviceLockOne {
     }
   }
 
-  async internalUpdate (value, callback) {
+  async internalUpdate (value) {
     try {
-      callback()
       if (this.error) {
-        this.log.warn('[%s] invalid config - %s.', this.name, this.error)
-        return
+        throw new Error('invalid config - ' + this.error)
       }
       const params = {}
       switch (this.setup) {
@@ -97,6 +97,13 @@ module.exports = class deviceLockOne {
     } catch (err) {
       this.inUse = false
       this.platform.deviceUpdateError(this.accessory, err, true)
+      setTimeout(() => {
+        this.service.updateCharacteristic(this.hapChar.LockTargetState, 1)
+      }, 5000)
+      this.service.updateCharacteristic(
+        this.hapChar.LockTargetState,
+        new this.platform.api.hap.HapStatusError(-70402)
+      )
     }
   }
 
diff --git a/lib/device/simulation/switch-valve.js b/lib/device/simulation/switch-valve.js
index 15e57415..897af4e2 100644
--- a/lib/device/simulation/switch-valve.js
+++ b/lib/device/simulation/switch-valve.js
@@ -40,32 +40,32 @@ module.exports = class deviceSwitchValve {
     }
 
     // Add the set handler to the switch on/off characteristic
-    this.sService.getCharacteristic(this.hapChar.On)
-      .on('set', this.internalSwitchUpdate.bind(this))
+    this.sService.getCharacteristic(this.hapChar.On).onSet(async value => {
+      await this.internalSwitchUpdate(value)
+    })
 
     // Add the set handler to the valve active characteristic
-    this.vService.getCharacteristic(this.hapChar.Active)
-      .on('set', this.internalValveUpdate.bind(this))
+    this.vService.getCharacteristic(this.hapChar.Active).onSet(async value => {
+      await this.internalValveUpdate(value)
+    })
 
     // Add the set handler to the valve set duration characteristic
-    this.vService.getCharacteristic(this.hapChar.SetDuration)
-      .on('set', (value, callback) => {
-        // Check if the valve is currently active
-        if (this.vService.getCharacteristic(this.hapChar.InUse).value === 1) {
-          // Update the remaining duration characteristic with the new value
-          this.vService.updateCharacteristic(this.hapChar.RemainingDuration, value)
+    this.vService.getCharacteristic(this.hapChar.SetDuration).onSet(value => {
+      // Check if the valve is currently active
+      if (this.vService.getCharacteristic(this.hapChar.InUse).value === 1) {
+        // Update the remaining duration characteristic with the new value
+        this.vService.updateCharacteristic(this.hapChar.RemainingDuration, value)
 
-          // Clear any existing active timers
-          clearTimeout(this.timer)
+        // Clear any existing active timers
+        clearTimeout(this.timer)
 
-          // Set a new active timer with the new time amount
-          this.timer = setTimeout(
-            () => this.vService.setCharacteristic(this.hapChar.Active, 0),
-            value * 1000
-          )
-        }
-        callback()
-      })
+        // Set a new active timer with the new time amount
+        this.timer = setTimeout(
+          () => this.vService.setCharacteristic(this.hapChar.Active, 0),
+          value * 1000
+        )
+      }
+    })
 
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new this.platform.eveService('switch', this.accessory, {
@@ -82,9 +82,8 @@ module.exports = class deviceSwitchValve {
     }
   }
 
-  async internalSwitchUpdate (value, callback) {
+  async internalSwitchUpdate (value) {
     try {
-      callback()
       const params = {
         switches: this.accessory.context.eweUIID === 126
           ? this.consts.defaultDoubleSwitchOff
@@ -101,12 +100,15 @@ module.exports = class deviceSwitchValve {
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
+      setTimeout(() => {
+        this.sService.updateCharacteristic(this.hapChar.On, this.cacheOnOff === 'on')
+      }, 5000)
+      throw new this.platform.api.hap.HapStatusError(-70402)
     }
   }
 
-  async internalValveUpdate (value, callback) {
+  async internalValveUpdate (value) {
     try {
-      callback()
       const params = {
         switches: this.accessory.context.eweUIID === 126
           ? this.consts.defaultDoubleSwitchOff
@@ -139,6 +141,10 @@ module.exports = class deviceSwitchValve {
       await this.platform.sendDeviceUpdate(this.accessory, params)
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
+      setTimeout(() => {
+        this.sService.updateCharacteristic(this.hapChar.Active, 0)
+      }, 5000)
+      throw new this.platform.api.hap.HapStatusError(-70402)
     }
   }
 
diff --git a/lib/device/simulation/tap-one.js b/lib/device/simulation/tap-one.js
index 51f891d2..758de81d 100644
--- a/lib/device/simulation/tap-one.js
+++ b/lib/device/simulation/tap-one.js
@@ -45,8 +45,9 @@ module.exports = class deviceTapOne {
     }
 
     // Add the set handler to the tap active characteristic
-    this.service.getCharacteristic(this.hapChar.Active)
-      .on('set', this.internalUpdate.bind(this))
+    this.service.getCharacteristic(this.hapChar.Active).onSet(async value => {
+      await this.internalUpdate(value)
+    })
 
     // Output the customised options to the log if in debug mode
     if (this.debug) {
@@ -59,12 +60,10 @@ module.exports = class deviceTapOne {
     }
   }
 
-  async internalUpdate (value, callback) {
+  async internalUpdate (value) {
     try {
-      callback()
       if (this.error) {
-        this.log.warn('[%s] invalid config - %s.', this.name, this.error)
-        return
+        throw new Error('invalid config - ' + this.error)
       }
       const params = {}
       switch (this.setup) {
@@ -86,14 +85,17 @@ module.exports = class deviceTapOne {
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
+      setTimeout(() => {
+        this.service.updateCharacteristic(this.hapChar.Active, this.cacheOnOff === 'on')
+      }, 5000)
+      throw new this.platform.api.hap.HapStatusError(-70402)
     }
   }
 
   async externalUpdate (params) {
     try {
       if (this.error) {
-        this.log.warn('[%s] invalid config - %s.', this.name, this.error)
-        return
+        throw new Error('invalid config - ' + this.error)
       }
       switch (this.setup) {
         case 'oneSwitch':
diff --git a/lib/device/simulation/tap-two.js b/lib/device/simulation/tap-two.js
index f86701ca..78d2e8db 100644
--- a/lib/device/simulation/tap-two.js
+++ b/lib/device/simulation/tap-two.js
@@ -37,8 +37,9 @@ module.exports = class deviceTapTwo {
       }
 
       // Add the set handler to the tap active characteristic
-      tapService.getCharacteristic(this.hapChar.Active)
-        .on('set', (value, callback) => this.internalUpdate('Tap ' + v, value, callback))
+      tapService.getCharacteristic(this.hapChar.Active).onSet(async value => {
+        await this.internalUpdate('Tap ' + v, value)
+      })
     })
 
     // Output the customised options to the log if in debug mode
@@ -51,9 +52,8 @@ module.exports = class deviceTapTwo {
     }
   }
 
-  async internalUpdate (tap, value, callback) {
+  async internalUpdate (tap, value) {
     try {
-      callback()
       const params = {
         switches: this.accessory.context.eweUIID === 126
           ? this.consts.defaultDoubleSwitchOff
@@ -88,6 +88,11 @@ module.exports = class deviceTapTwo {
       await this.platform.sendDeviceUpdate(this.accessory, params)
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
+      const tapService = this.accessory.getService(tap)
+      setTimeout(() => {
+        tapService.updateCharacteristic(this.hapChar.Active, value === 1 ? 0 : 1)
+      }, 5000)
+      throw new this.platform.api.hap.HapStatusError(-70402)
     }
   }
 
diff --git a/lib/device/simulation/thermostat.js b/lib/device/simulation/thermostat.js
index 94099916..2cfb2fbc 100644
--- a/lib/device/simulation/thermostat.js
+++ b/lib/device/simulation/thermostat.js
@@ -71,21 +71,25 @@ module.exports = class deviceThermostat {
 
     // Add the set handler to the target state characteristic
     this.service.getCharacteristic(this.hapChar.TargetHeatingCoolingState)
-      .on('set', this.internalOnOffUpdate.bind(this))
       .setProps({
         minValue: 0,
         maxValue: 1,
         validValues: [0, 1]
       })
+      .onSet(async value => {
+        await this.internalOnOffUpdate(value)
+      })
 
     // Add the set handler to the target temperature characteristic
     this.service.getCharacteristic(this.hapChar.TargetTemperature)
-      .on('set', this.internalTargetTempUpdate.bind(this))
       .setProps({
         minValue: this.minTarget,
         maxValue: this.maxTarget,
         minStep: 0.5
       })
+      .onSet(async value => {
+        await this.internalTargetTempUpdate(value)
+      })
 
     // The DS18B20 sensor does not provide humidity readings
     if (
@@ -121,9 +125,8 @@ module.exports = class deviceThermostat {
     }
   }
 
-  async internalOnOffUpdate (value, callback) {
+  async internalOnOffUpdate (value) {
     try {
-      callback()
       const params = {}
       if (value === 0) {
         params.mainSwitch = 'off'
@@ -131,33 +134,37 @@ module.exports = class deviceThermostat {
       } else {
         params.mainSwitch = 'on'
       }
-      this.cacheOnOff = value !== 0 ? 'on' : 'off'
-      const currentTemp = this.service
-        .getCharacteristic(this.hapChar.CurrentTemperature).value
-      this.cacheHeat = this.cacheOnOff === 'on' &&
-        currentTemp < this.accessory.context.cacheTarget
+      const newValue = value !== 0 ? 'on' : 'off'
+      const currentTemp = this.service.getCharacteristic(this.hapChar.CurrentTemperature)
+      this.cacheHeat = newValue === 'on' &&
+        currentTemp.value < this.accessory.context.cacheTarget
         ? 'on'
         : 'off'
       this.service.updateCharacteristic(
         this.hapChar.CurrentHeatingCoolingState,
-        this.cacheHeat === 'on' ? 1 : 0
+        newValue === 'on' ? 1 : 0
       )
       await this.platform.sendDeviceUpdate(this.accessory, params)
+      this.cacheOnOff = newValue
       if (!this.disableDeviceLogging) {
         this.log('[%s] current state [%s].', this.name, this.cacheOnOff)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
+      setTimeout(() => {
+        this.service.updateCharacteristic(
+          this.hapChar.TargetHeatingCoolingState,
+          this.cacheOnOff === 'on'
+        )
+      }, 5000)
+      throw new this.platform.api.hap.HapStatusError(-70402)
     }
   }
 
-  async internalTargetTempUpdate (value, callback) {
+  async internalTargetTempUpdate (value) {
     try {
-      callback()
-      this.accessory.context.cacheTarget = value
-      this.cacheOnOff = 'on'
       const cTemp = this.service.getCharacteristic(this.hapChar.CurrentTemperature).value
-      this.cacheHeat = cTemp < value ? 'on' : 'off'
+      const newValue = cTemp < value ? 'on' : 'off'
       const params = {
         deviceType: 'temperature',
         targets: [
@@ -177,14 +184,24 @@ module.exports = class deviceThermostat {
       }
       this.service.updateCharacteristic(
         this.hapChar.CurrentHeatingCoolingState,
-        this.cacheHeat === 'on' ? 1 : 0
+        newValue === 'on' ? 1 : 0
       )
       await this.platform.sendDeviceUpdate(this.accessory, params)
+      this.accessory.context.cacheTarget = value
+      this.cacheOnOff = 'on'
+      this.cacheHeat = newValue
       if (!this.disableDeviceLogging) {
         this.log('[%s] current target [%s°C].', this.name, value)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
+      setTimeout(() => {
+        this.service.updateCharacteristic(
+          this.hapChar.TargetHeatingCoolingState,
+          this.cacheOnOff === 'on'
+        )
+      }, 5000)
+      throw new this.platform.api.hap.HapStatusError(-70402)
     }
   }
 
diff --git a/lib/device/simulation/valve-four.js b/lib/device/simulation/valve-four.js
index 93be13e2..dc46d7fd 100644
--- a/lib/device/simulation/valve-four.js
+++ b/lib/device/simulation/valve-four.js
@@ -43,30 +43,27 @@ module.exports = class deviceValveFour {
       }
 
       // Add the set handler to the valve active characteristic
-      valveService.getCharacteristic(this.hapChar.Active)
-        .on('set', (value, callback) => {
-          this.internalUpdate('Valve ' + v, value, callback)
-        })
+      valveService.getCharacteristic(this.hapChar.Active).onSet(async value => {
+        await this.internalUpdate('Valve ' + v, value)
+      })
 
       // Add the set handler to the valve set duration characteristic
-      valveService.getCharacteristic(this.hapChar.SetDuration)
-        .on('set', (value, callback) => {
-          // Check if the valve is currently active
-          if (valveService.getCharacteristic(this.hapChar.InUse).value === 1) {
-            // Update the remaining duration characteristic with the new value
-            valveService.updateCharacteristic(this.hapChar.RemainingDuration, value)
+      valveService.getCharacteristic(this.hapChar.SetDuration).onSet(value => {
+        // Check if the valve is currently active
+        if (valveService.getCharacteristic(this.hapChar.InUse).value === 1) {
+          // Update the remaining duration characteristic with the new value
+          valveService.updateCharacteristic(this.hapChar.RemainingDuration, value)
 
-            // Clear any existing active timers
-            clearTimeout(valveService.timer)
+          // Clear any existing active timers
+          clearTimeout(valveService.timer)
 
-            // Set a new active timer with the new time amount
-            valveService.timer = setTimeout(
-              () => valveService.setCharacteristic(this.hapChar.Active, 0),
-              value * 1000
-            )
-          }
-          callback()
-        })
+          // Set a new active timer with the new time amount
+          valveService.timer = setTimeout(
+            () => valveService.setCharacteristic(this.hapChar.Active, 0),
+            value * 1000
+          )
+        }
+      })
     })
 
     // Output the customised options to the log if in debug mode
@@ -79,9 +76,8 @@ module.exports = class deviceValveFour {
     }
   }
 
-  async internalUpdate (valve, value, callback) {
+  async internalUpdate (valve, value) {
     try {
-      callback()
       const params = {
         switches: this.accessory.context.eweUIID === 126
           ? this.consts.defaultDoubleSwitchOff
@@ -166,6 +162,11 @@ module.exports = class deviceValveFour {
       await this.platform.sendDeviceUpdate(this.accessory, params)
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
+      const valveService = this.accessory.getService(valve)
+      setTimeout(() => {
+        valveService.updateCharacteristic(this.hapChar.Active, value === 1 ? 0 : 1)
+      }, 5000)
+      throw new this.platform.api.hap.HapStatusError(-70402)
     }
   }
 
diff --git a/lib/device/simulation/valve-one.js b/lib/device/simulation/valve-one.js
index 664a32e4..9aacd86b 100644
--- a/lib/device/simulation/valve-one.js
+++ b/lib/device/simulation/valve-one.js
@@ -47,28 +47,27 @@ module.exports = class deviceValveOne {
     }
 
     // Add the set handler to the valve active characteristic
-    this.service.getCharacteristic(this.hapChar.Active)
-      .on('set', this.internalUpdate.bind(this))
+    this.service.getCharacteristic(this.hapChar.Active).onSet(async value => {
+      await this.internalUpdate(value)
+    })
 
     // Add the set handler to the valve set duration characteristic
-    this.service.getCharacteristic(this.hapChar.SetDuration)
-      .on('set', (value, callback) => {
-        // Check if the valve is currently active
-        if (this.service.getCharacteristic(this.hapChar.InUse).value === 1) {
-          // Update the remaining duration characteristic with the new value
-          this.service.updateCharacteristic(this.hapChar.RemainingDuration, value)
+    this.service.getCharacteristic(this.hapChar.SetDuration).onSet(value => {
+      // Check if the valve is currently active
+      if (this.service.getCharacteristic(this.hapChar.InUse).value === 1) {
+        // Update the remaining duration characteristic with the new value
+        this.service.updateCharacteristic(this.hapChar.RemainingDuration, value)
 
-          // Clear any existing active timers
-          clearTimeout(this.timer)
+        // Clear any existing active timers
+        clearTimeout(this.timer)
 
-          // Set a new active timer with the new time amount
-          this.timer = setTimeout(
-            () => this.service.setCharacteristic(this.hapChar.Active, 0),
-            value * 1000
-          )
-        }
-        callback()
-      })
+        // Set a new active timer with the new time amount
+        this.timer = setTimeout(
+          () => this.service.setCharacteristic(this.hapChar.Active, 0),
+          value * 1000
+        )
+      }
+    })
 
     // Output the customised options to the log if in debug mode
     if (this.debug) {
@@ -81,12 +80,10 @@ module.exports = class deviceValveOne {
     }
   }
 
-  async internalUpdate (value, callback) {
+  async internalUpdate (value) {
     try {
-      callback()
       if (this.error) {
-        this.log.warn('[%s] invalid config - %s.', this.name, this.error)
-        return
+        throw new Error('invalid config - ' + this.error)
       }
       const params = {}
       switch (this.setup) {
@@ -124,6 +121,10 @@ module.exports = class deviceValveOne {
       await this.platform.sendDeviceUpdate(this.accessory, params)
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
+      setTimeout(() => {
+        this.service.updateCharacteristic(this.hapChar.Active, value === 1 ? 0 : 1)
+      }, 5000)
+      throw new this.platform.api.hap.HapStatusError(-70402)
     }
   }
 
diff --git a/lib/device/simulation/valve-two.js b/lib/device/simulation/valve-two.js
index 9f35f3dc..ed1f850c 100644
--- a/lib/device/simulation/valve-two.js
+++ b/lib/device/simulation/valve-two.js
@@ -43,30 +43,27 @@ module.exports = class deviceValveTwo {
       }
 
       // Add the set handler to the valve active characteristic
-      valveService.getCharacteristic(this.hapChar.Active)
-        .on('set', (value, callback) => {
-          this.internalUpdate('Valve ' + v, value, callback)
-        })
+      valveService.getCharacteristic(this.hapChar.Active).onSet(async value => {
+        await this.internalUpdate('Valve ' + v, value)
+      })
 
       // Add the set handler to the valve set duration characteristic
-      valveService.getCharacteristic(this.hapChar.SetDuration)
-        .on('set', (value, callback) => {
-          // Check if the valve is currently active
-          if (valveService.getCharacteristic(this.hapChar.InUse).value === 1) {
-            // Update the remaining duration characteristic with the new value
-            valveService.updateCharacteristic(this.hapChar.RemainingDuration, value)
+      valveService.getCharacteristic(this.hapChar.SetDuration).onSet(value => {
+        // Check if the valve is currently active
+        if (valveService.getCharacteristic(this.hapChar.InUse).value === 1) {
+          // Update the remaining duration characteristic with the new value
+          valveService.updateCharacteristic(this.hapChar.RemainingDuration, value)
 
-            // Clear any existing active timers
-            clearTimeout(valveService.timer)
+          // Clear any existing active timers
+          clearTimeout(valveService.timer)
 
-            // Set a new active timer with the new time amount
-            valveService.timer = setTimeout(
-              () => valveService.setCharacteristic(this.hapChar.Active, 0),
-              value * 1000
-            )
-          }
-          callback()
-        })
+          // Set a new active timer with the new time amount
+          valveService.timer = setTimeout(
+            () => valveService.setCharacteristic(this.hapChar.Active, 0),
+            value * 1000
+          )
+        }
+      })
     })
 
     // Output the customised options to the log if in debug mode
@@ -79,9 +76,8 @@ module.exports = class deviceValveTwo {
     }
   }
 
-  async internalUpdate (valve, value, callback) {
+  async internalUpdate (valve, value) {
     try {
-      callback()
       const params = {
         switches: this.accessory.context.eweUIID === 126
           ? this.consts.defaultDoubleSwitchOff
@@ -128,6 +124,11 @@ module.exports = class deviceValveTwo {
       await this.platform.sendDeviceUpdate(this.accessory, params)
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
+      const valveService = this.accessory.getService(valve)
+      setTimeout(() => {
+        valveService.updateCharacteristic(this.hapChar.Active, value === 1 ? 0 : 1)
+      }, 5000)
+      throw new this.platform.api.hap.HapStatusError(-70402)
     }
   }
 
diff --git a/lib/device/simulation/window.js b/lib/device/simulation/window.js
index c771c8fe..c0356e67 100644
--- a/lib/device/simulation/window.js
+++ b/lib/device/simulation/window.js
@@ -44,8 +44,10 @@ module.exports = class deviceWindow {
     }
 
     // Add the set handler to the target position characteristic
-    this.service.getCharacteristic(this.hapChar.TargetPosition)
-      .on('set', this.internalUpdate.bind(this))
+    this.service.getCharacteristic(this.hapChar.TargetPosition).onSet(value => {
+      // We don't use await as we want the callback to be run straight away
+      this.internalUpdate(value)
+    })
 
     // Output the customised options to the log if in debug mode
     if (this.debug) {
@@ -59,9 +61,8 @@ module.exports = class deviceWindow {
     }
   }
 
-  async internalUpdate (value, callback) {
+  async internalUpdate (value) {
     try {
-      callback()
       let prevPosition = this.accessory.context.cacheCurrentPosition
       if (value === prevPosition) {
         return
@@ -125,6 +126,16 @@ module.exports = class deviceWindow {
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
+      setTimeout(() => {
+        this.service.updateCharacteristic(
+          this.hapChar.TargetPosition,
+          this.accessory.context.cacheTargetPosition
+        )
+      }, 5000)
+      this.service.updateCharacteristic(
+        this.hapChar.TargetPosition,
+        new this.platform.api.hap.HapStatusError(-70402)
+      )
     }
   }
 

From 638838aa4e743701a2ef629f328dfaa6c45d1e4c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 30 Mar 2021 14:13:46 +0100
Subject: [PATCH 1784/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d063e16b..ea7e8bd6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,9 +16,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 * 'No Response' messages for **Zigbee and DW2** devices as they go on and offline
 * 'No Response' messages for  **all devices** if controlled and unsuccessful (and this status will be reverted after 5 seconds)
-  * This change **does not** apply to Accessory Simulations yet
 * Use the new `.onSet` methods available in Homebridge v1.3
-  * This change **does not** apply to Accessory Simulations yet
   
 ## 5.6.0 (2021-03-25)
 

From ef0a6c014a31523c9b5ee31966824e5c2d2902c4 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 30 Mar 2021 14:15:03 +0100
Subject: [PATCH 1785/3183] 6.0.0-5

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 05328bb1..a3a3523b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.0.0-4",
+  "version": "6.0.0-5",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 0067e8d3..00163f0e 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.0.0-4",
+  "version": "6.0.0-5",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 6f386efcae4495cad8965a428fa020bc0192bfd6 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 31 Mar 2021 08:57:50 +0100
Subject: [PATCH 1786/3183] divide pending support and cannot support

---
 lib/index.js           | 18 +++++++++---------
 lib/utils/constants.js | 15 +++++++++++----
 lib/utils/lang-en.js   |  2 +-
 3 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/lib/index.js b/lib/index.js
index aaa33104..1fab69b0 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1171,21 +1171,21 @@ class eWeLinkPlatform {
         this.log('[%s] %s.', device.name, this.messages.sonoffCamera)
         return
         /************/
-      } else if (this.consts.devices.eWeCamera.includes(device.extra.uiid)) {
-        /******************
-        EWELINK APP CAMERAS
-        ******************/
+      } else if (this.consts.devices.cannotSupport.includes(device.extra.uiid)) {
+        /*******************************
+        DEVICES THAT CANNOT BE SUPPORTED
+        *******************************/
         this.log('[%s] %s.', device.name, this.messages.devNotSup)
         return
-        /*****************/
+        /******************************/
       } else {
-        /**************
-        UNKNOWN DEVICES
-        **************/
+        /**********************
+        DEVICES PENDING SUPPORT
+        **********************/
         this.log.warn('[%s] %s:', device.name, this.messages.devNotSupYet)
         this.log.warn('[%s] %s', device.extra.uiid || '?', JSON.stringify(device.params))
         return
-        /*************/
+        /*********************/
       }
 
       // Update the reachability values (via WS and LAN)
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 86fe6841..27d19fe5 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -122,7 +122,6 @@ module.exports = {
     outlet: [32],
     outletSCM: [77, 78, 81, 107],
     camera: [87],
-    eWeCamera: [65],
     rfBridge: [28],
     zbBridge: [66],
     zbSwitchStateless: [1000],
@@ -131,7 +130,8 @@ module.exports = {
     zbLightCCT: [1258],
     zbSensorAmbient: [1770],
     zbSensorMotion: [2026],
-    zbSensorContact: [3026]
+    zbSensorContact: [3026],
+    cannotSupport: [65, 118, 119, 120, 121]
   },
 
   paramsToKeep: [
@@ -186,7 +186,6 @@ module.exports = {
     44: 1, // "SNOFF_LIGHT" (D1)
     57: 1, // "MONOCHROMATIC_BALL_LIGHT" (mosquito killer)
     59: 1, // "MUSIC_LIGHT_BELT" (L1)
-    65: 1, // "CustomCamera" (eWeLink Camera App)
     66: 1, // "ZIGBEE_MAIN_DEVICE"
     77: 4, // "SINGLE_SOCKET_MULTIPLE" (1 socket device using data structure of four)
     78: 4, // "SINGLE_SWITCH_MULTIPLE" (1 switch device using data structure of four
@@ -215,7 +214,15 @@ module.exports = {
     4256: 4 // "ZIGBEE_SWITCH_4"
   },
 
-  unsupportedDevices: {
+  cannotSupportDevices: {
+    65: 0, // "CustomCamera" (eWeLink Camera App)
+    118: 0, // "2.4G-1C" (eWeLink 2.4G Remote)
+    119: 0, // "2.4G-2C" (eWeLink 2.4G Remote)
+    120: 0, // "2.4G-3C" (eWeLink 2.4G Remote)
+    121: 0 // "2.4G-6C" (eWeLink 2.4G Remote)
+  },
+
+  yetToSupportDevices: {
     10: 0, // "OSPF"
     12: 0, // "EW-RE"
     13: 0, // "FIREPLACE"
diff --git a/lib/utils/lang-en.js b/lib/utils/lang-en.js
index df12df49..cdfe5032 100644
--- a/lib/utils/lang-en.js
+++ b/lib/utils/lang-en.js
@@ -27,7 +27,7 @@ module.exports = {
   devNotReachLAN: 'device not reachable via LAN mode',
   devNotRf: 'could not be refreshed as',
   devNotRemove: 'could not be removed from Homebridge as',
-  devNotSup: 'has not been added as it is not supported',
+  devNotSup: 'has not been added as it cannot be supported',
   devNotSupYet: 'is not supported, please make a GitHub issue with the following info',
   devNotUpd: 'device update failed as',
   devRemove: 'has been removed from Homebridge',

From 72a126a02258446912d6a587b705a154fadf7133 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 31 Mar 2021 09:03:55 +0100
Subject: [PATCH 1787/3183] update p-queue dep

---
 package-lock.json | 24 ++++++++----------------
 package.json      |  2 +-
 2 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index a3a3523b..e88d53d8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -196,27 +196,19 @@
         "object-keys": "^1.1.1"
       }
     },
-    "p-finally": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
-      "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4="
-    },
     "p-queue": {
-      "version": "6.6.2",
-      "resolved": "https://registry.npmjs.org/p-queue/-/p-queue-6.6.2.tgz",
-      "integrity": "sha512-RwFpb72c/BhQLEXIZ5K2e+AhgNVmIejGlTgiB9MzZ0e93GRvqZ7uSi0dvRF7/XIXDeNkra2fNHBxTyPDGySpjQ==",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/p-queue/-/p-queue-7.0.0.tgz",
+      "integrity": "sha512-Nm7BFnoAFw2BA6EdIbblm/HjTyagQQqOijAaT2jnGDz/wjn2dwnOk6GEiVlQvHfCJwcXFr2evMpkghLNZsonAQ==",
       "requires": {
-        "eventemitter3": "^4.0.4",
-        "p-timeout": "^3.2.0"
+        "eventemitter3": "^4.0.7",
+        "p-timeout": "^4.1.0"
       }
     },
     "p-timeout": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-3.2.0.tgz",
-      "integrity": "sha512-rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg==",
-      "requires": {
-        "p-finally": "^1.0.0"
-      }
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-4.1.0.tgz",
+      "integrity": "sha512-+/wmHtzJuWii1sXn3HCuH/FTwGhrp4tmJTxSKJbfS+vkipci6osxXM5mY0jUiRzWKMTgUT8l7HFbeSwZAynqHw=="
     },
     "promise-controller": {
       "version": "1.0.0",
diff --git a/package.json b/package.json
index 00163f0e..4e57579e 100644
--- a/package.json
+++ b/package.json
@@ -51,7 +51,7 @@
     "@homebridge/plugin-ui-utils": "^0.0.19",
     "axios": "^0.21.1",
     "node-dns-sd": "^0.4.2",
-    "p-queue": "^6.6.2",
+    "p-queue": "^7.0.0",
     "websocket-as-promised": "^2.0.1",
     "ws": "^7.4.4"
   }

From 5619709fc73cdd6307d2cb9d63e53929b8278cad Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 31 Mar 2021 09:05:09 +0100
Subject: [PATCH 1788/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ea7e8bd6..34a1810e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,9 +8,11 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 * **Homebridge Users**
   * This plugin has a minimum requirement of Homebridge v1.3.3
+  * This plugin has a minimum requirement of Node v12
 
 * **HOOBS Users**
   * This plugin has a minimum requirement of HOOBS v3.3.4
+  * This plugin has a minimum requirement of Node v12
 
 ### Changes
 

From 14bf0e6678102a72fbcef3d4057d85398da676e3 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 31 Mar 2021 09:21:24 +0100
Subject: [PATCH 1789/3183] downgrade p-queue

---
 CHANGELOG.md      |  2 --
 package-lock.json | 24 ++++++++++++++++--------
 package.json      |  2 +-
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 34a1810e..ea7e8bd6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,11 +8,9 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 * **Homebridge Users**
   * This plugin has a minimum requirement of Homebridge v1.3.3
-  * This plugin has a minimum requirement of Node v12
 
 * **HOOBS Users**
   * This plugin has a minimum requirement of HOOBS v3.3.4
-  * This plugin has a minimum requirement of Node v12
 
 ### Changes
 
diff --git a/package-lock.json b/package-lock.json
index e88d53d8..a3a3523b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -196,19 +196,27 @@
         "object-keys": "^1.1.1"
       }
     },
+    "p-finally": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
+      "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4="
+    },
     "p-queue": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/p-queue/-/p-queue-7.0.0.tgz",
-      "integrity": "sha512-Nm7BFnoAFw2BA6EdIbblm/HjTyagQQqOijAaT2jnGDz/wjn2dwnOk6GEiVlQvHfCJwcXFr2evMpkghLNZsonAQ==",
+      "version": "6.6.2",
+      "resolved": "https://registry.npmjs.org/p-queue/-/p-queue-6.6.2.tgz",
+      "integrity": "sha512-RwFpb72c/BhQLEXIZ5K2e+AhgNVmIejGlTgiB9MzZ0e93GRvqZ7uSi0dvRF7/XIXDeNkra2fNHBxTyPDGySpjQ==",
       "requires": {
-        "eventemitter3": "^4.0.7",
-        "p-timeout": "^4.1.0"
+        "eventemitter3": "^4.0.4",
+        "p-timeout": "^3.2.0"
       }
     },
     "p-timeout": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-4.1.0.tgz",
-      "integrity": "sha512-+/wmHtzJuWii1sXn3HCuH/FTwGhrp4tmJTxSKJbfS+vkipci6osxXM5mY0jUiRzWKMTgUT8l7HFbeSwZAynqHw=="
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-3.2.0.tgz",
+      "integrity": "sha512-rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg==",
+      "requires": {
+        "p-finally": "^1.0.0"
+      }
     },
     "promise-controller": {
       "version": "1.0.0",
diff --git a/package.json b/package.json
index 4e57579e..00163f0e 100644
--- a/package.json
+++ b/package.json
@@ -51,7 +51,7 @@
     "@homebridge/plugin-ui-utils": "^0.0.19",
     "axios": "^0.21.1",
     "node-dns-sd": "^0.4.2",
-    "p-queue": "^7.0.0",
+    "p-queue": "^6.6.2",
     "websocket-as-promised": "^2.0.1",
     "ws": "^7.4.4"
   }

From 96470460145ff04cd5218a3d96a6c3e5d4d6bbba Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 31 Mar 2021 14:32:17 +0100
Subject: [PATCH 1790/3183] lan debug logging

---
 lib/connection/lan.js | 10 +++++++++-
 lib/utils/lang-en.js  |  3 +++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/lib/connection/lan.js b/lib/connection/lan.js
index 5d1f8ba9..4c1f7727 100644
--- a/lib/connection/lan.js
+++ b/lib/connection/lan.js
@@ -9,6 +9,7 @@ module.exports = class connectionLAN {
     this.funcs = platform.funcs
     this.log = platform.log
     this.messages = platform.messages
+    this.debug = platform.config.debug
 
     // Set up config variables from the platform
     this.mode = platform.config.mode
@@ -40,9 +41,15 @@ module.exports = class connectionLAN {
 
   async getHosts () {
     // Perform an initial discovery of devices on the local network
+    if (this.debug) {
+      this.log('%s.', this.messages.lanStarting)
+    }
     const res = await this.dns.discover({
       name: '_ewelink._tcp.local'
     })
+    if (this.debug) {
+      this.log('%s.', this.messages.lanStarted)
+    }
 
     // Update the device map for each device found on the local network
     res.forEach(device => {
@@ -148,7 +155,8 @@ module.exports = class connectionLAN {
     }
 
     // Start the DNS packet monitoring
-    this.dns.startMonitoring()
+    await this.dns.startMonitoring()
+    this.log('%s.', this.messages.lanMonitor)
   }
 
   async sendUpdate (json) {
diff --git a/lib/utils/lang-en.js b/lib/utils/lang-en.js
index cdfe5032..23ec430a 100644
--- a/lib/utils/lang-en.js
+++ b/lib/utils/lang-en.js
@@ -40,7 +40,10 @@ module.exports = {
   initialised: 'initialised. Syncing with eWeLink',
   lanDisabled: 'LAN mode is disabled',
   lanErr: 'unknown LAN error',
+  lanMonitor: 'LAN monitoring started',
   lanNotSup: 'LAN mode is not supported for sending updates to this device',
+  lanStarted: 'LAN discovery complete',
+  lanStarting: 'LAN discovery starting',
   lanUnreachable: 'LAN mode unavailable as unreachable',
   lanUnsupported: 'LAN mode unavailable as not supported',
   missingCreds: 'eWeLink credentials missing from configuration',

From 0225ae94a104f18d1343f6def512b77697333943 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 1 Apr 2021 09:23:27 +0100
Subject: [PATCH 1791/3183] ws edits

---
 lib/connection/http.js |  2 +-
 lib/connection/ws.js   | 55 ++++++++++++++++++------------------------
 lib/index.js           |  3 +--
 3 files changed, 26 insertions(+), 34 deletions(-)

diff --git a/lib/connection/http.js b/lib/connection/http.js
index 0da2e3c3..35da5ce8 100644
--- a/lib/connection/http.js
+++ b/lib/connection/http.js
@@ -28,7 +28,7 @@ module.exports = class connectionHTTP {
   async login () {
     // Used to log the user in and obtain the user api key and token
     const data = {
-      countryCode: '+1',
+      countryCode: '+44',
       password: this.password
     }
 
diff --git a/lib/connection/ws.js b/lib/connection/ws.js
index 4a3e2a0f..db2a4571 100644
--- a/lib/connection/ws.js
+++ b/lib/connection/ws.js
@@ -86,7 +86,19 @@ module.exports = class connectionWS {
         return
       }
       this.debounce = true
-      setTimeout(() => (this.debounce = false), 3000)
+      setTimeout(() => (this.debounce = false), 4000)
+
+      // Set the connection flag to false
+      this.wsIsConnected = false
+
+      // Clear any existing ping interval
+      if (this.hbInterval) {
+        clearInterval(this.hbInterval)
+        this.hbInterval = null
+      }
+
+      // Close any existing web socket connection
+      await this.closeConnection()
 
       // Refresh the web socket host
       await this.getHost()
@@ -260,18 +272,6 @@ module.exports = class connectionWS {
 
       // Add a listener for when the web socket closes for any reason
       this.wsClient.onClose.addListener(async e => {
-      // Set the connection flag to false
-        this.wsIsConnected = false
-
-        // Clear the ping interval
-        if (this.hbInterval) {
-          clearInterval(this.hbInterval)
-          this.hbInterval = null
-        }
-
-        // Remove all existing listeners for web socket events
-        this.wsClient.removeAllListeners()
-
         // Don't continue further with logging/reconnection if it's a wanted closure
         if (e === 1005) {
           return
@@ -289,18 +289,6 @@ module.exports = class connectionWS {
 
       // Add a listener for when the web socket throws an error
       this.wsClient.onError.addListener(async e => {
-      // Set the connection flag to false
-        this.wsIsConnected = false
-
-        // Clear the ping interval
-        if (this.hbInterval) {
-          clearInterval(this.hbInterval)
-          this.hbInterval = null
-        }
-
-        // Remove all existing listeners for web socket events
-        this.wsClient.removeAllListeners()
-
         // Log that the web socket has closed if appropriate
         if (this.debug) {
           this.log.warn('%s [%s].', this.messages.wsReconnect, e)
@@ -410,14 +398,19 @@ module.exports = class connectionWS {
   }
 
   async closeConnection () {
-    // This is called when Homebridge is shutdown
-    if (this.wsClient && this.wsIsConnected) {
+    // This is called when refreshing connection or if Homebridge shuts down
+    if (this.wsClient) {
+      // Remove any existing existing listeners
+      this.wsClient.removeAllListeners()
+
       // Close the web socket connection
-      await this.wsClient.close()
+      if (this.wsIsConnected) {
+        await this.wsClient.close()
 
-      // Log if appropriate
-      if (this.debug) {
-        this.log('%s.', this.messages.stoppedWS)
+        // Log if appropriate
+        if (this.debug) {
+          this.log('%s.', this.messages.stoppedWS)
+        }
       }
     }
   }
diff --git a/lib/index.js b/lib/index.js
index 1fab69b0..ba9c5a02 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -444,7 +444,7 @@ class eWeLinkPlatform {
       this.eveChar = new (require('./utils/eve-chars'))(this.api)
       const { default: PQueue } = require('p-queue')
 
-      // Create the queue used for HTTP requests
+      // Create the queue used for sending device updates
       this.queue = new PQueue({
         interval: 250,
         intervalCap: 1,
@@ -505,7 +505,6 @@ class eWeLinkPlatform {
             if (this.config.debug) {
               this.log('%s.', this.messages.wsRef)
             }
-            await this.wsClient.closeConnection()
             await this.wsClient.login()
           } catch (e) {
             const eText = this.funcs.parseError(e)

From 77b29fa8798bd2d04e9dc59810487e48faf44015 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 1 Apr 2021 09:24:01 +0100
Subject: [PATCH 1792/3183] 6.0.0-6

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index a3a3523b..12f9be0f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.0.0-5",
+  "version": "6.0.0-6",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 00163f0e..0400f0aa 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.0.0-5",
+  "version": "6.0.0-6",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 489c55d553115b7ff100e026641070402c46656d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 1 Apr 2021 10:00:06 +0100
Subject: [PATCH 1793/3183] dont await it

---
 lib/connection/ws.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/connection/ws.js b/lib/connection/ws.js
index db2a4571..60a30c43 100644
--- a/lib/connection/ws.js
+++ b/lib/connection/ws.js
@@ -284,7 +284,7 @@ module.exports = class connectionWS {
 
         // Wait for 4 seconds and try to re-establish the web socket connection
         await this.funcs.sleep(4000)
-        await this.login()
+        this.login()
       })
 
       // Add a listener for when the web socket throws an error
@@ -296,7 +296,7 @@ module.exports = class connectionWS {
 
         // Wait for 6 seconds and try to re-establish the web socket connection
         await this.funcs.sleep(6000)
-        await this.login()
+        this.login()
       })
 
       // Open the web socket connection

From ed9d4242ac8f659293fbb1b56323734397935643 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 1 Apr 2021 10:00:34 +0100
Subject: [PATCH 1794/3183] 6.0.0-7

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 12f9be0f..ca3ff1ca 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.0.0-6",
+  "version": "6.0.0-7",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 0400f0aa..18a1f293 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.0.0-6",
+  "version": "6.0.0-7",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 52c75cc08386967052feb8a2393a9946ac26d798 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 1 Apr 2021 10:34:21 +0100
Subject: [PATCH 1795/3183] Update ws.js

---
 lib/connection/ws.js | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/lib/connection/ws.js b/lib/connection/ws.js
index 60a30c43..2c89fead 100644
--- a/lib/connection/ws.js
+++ b/lib/connection/ws.js
@@ -88,15 +88,6 @@ module.exports = class connectionWS {
       this.debounce = true
       setTimeout(() => (this.debounce = false), 4000)
 
-      // Set the connection flag to false
-      this.wsIsConnected = false
-
-      // Clear any existing ping interval
-      if (this.hbInterval) {
-        clearInterval(this.hbInterval)
-        this.hbInterval = null
-      }
-
       // Close any existing web socket connection
       await this.closeConnection()
 
@@ -143,11 +134,6 @@ module.exports = class connectionWS {
 
           // Parse the response
           if (res.config && res.config.hb && res.config.hbInterval) {
-          // Clear any existing ping intervals
-            if (this.hbInterval) {
-              clearInterval(this.hbInterval)
-            }
-
             // Update the flags
             this.wsIsConnected = true
 
@@ -399,6 +385,16 @@ module.exports = class connectionWS {
 
   async closeConnection () {
     // This is called when refreshing connection or if Homebridge shuts down
+
+    // Set the connection flag to false
+    this.wsIsConnected = false
+
+    // Clear any existing ping interval
+    if (this.hbInterval) {
+      clearInterval(this.hbInterval)
+      this.hbInterval = null
+    }
+    
     if (this.wsClient) {
       // Remove any existing existing listeners
       this.wsClient.removeAllListeners()

From 3382b8a4c7b68fd3150e2163f867f699cd4f63ab Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 1 Apr 2021 10:51:11 +0100
Subject: [PATCH 1796/3183] text

---
 lib/connection/ws.js | 4 ++--
 lib/utils/lang-en.js | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/connection/ws.js b/lib/connection/ws.js
index 2c89fead..9ee9ea67 100644
--- a/lib/connection/ws.js
+++ b/lib/connection/ws.js
@@ -265,7 +265,7 @@ module.exports = class connectionWS {
 
         // Log that the web socket has closed if appropriate
         if (this.debug) {
-          this.log.warn('%s [%s].', this.messages.wsReconnect, e)
+          this.log.warn('%s [%s].', this.messages.wsReconnectError, e)
         }
 
         // Wait for 4 seconds and try to re-establish the web socket connection
@@ -277,7 +277,7 @@ module.exports = class connectionWS {
       this.wsClient.onError.addListener(async e => {
         // Log that the web socket has closed if appropriate
         if (this.debug) {
-          this.log.warn('%s [%s].', this.messages.wsReconnect, e)
+          this.log.warn('%s [%s].', this.messages.wsReconnectClose, e)
         }
 
         // Wait for 6 seconds and try to re-establish the web socket connection
diff --git a/lib/utils/lang-en.js b/lib/utils/lang-en.js
index 23ec430a..dbf7a839 100644
--- a/lib/utils/lang-en.js
+++ b/lib/utils/lang-en.js
@@ -76,7 +76,8 @@ module.exports = {
   wsLogin406: 'WS login failed [406] please see http://bit.ly/hb-ewelink-err-406',
   wsPingError: 'Cound not send WS ping as',
   wsRec: 'WS message received',
-  wsReconnect: 'Web socket closed and will try to reconnect in 5 seconds',
+  wsReconnectClose: 'WS close event and will try to reconnect in 5 seconds',
+  wsReconnectError: 'WS error event and will try to reconnect in 5 seconds',
   wsRef: 'Refreshing WS connection',
   wsRefFail: 'Refreshing WS connection failed as',
   wsRequired: 'update must be sent this way',

From 4d6299d027a102600454584df0450965e5cd3409 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 1 Apr 2021 10:51:41 +0100
Subject: [PATCH 1797/3183] 6.0.0-8

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ca3ff1ca..e769649f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.0.0-7",
+  "version": "6.0.0-8",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 18a1f293..7103b998 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.0.0-7",
+  "version": "6.0.0-8",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 870e225b33f49553303753bdf987af41a8d1627d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 1 Apr 2021 10:52:31 +0100
Subject: [PATCH 1798/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ea7e8bd6..64425301 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 * 'No Response' messages for **Zigbee and DW2** devices as they go on and offline
 * 'No Response' messages for  **all devices** if controlled and unsuccessful (and this status will be reverted after 5 seconds)
 * Use the new `.onSet` methods available in Homebridge v1.3
+* Fixes a caching issue with the iFan accessory
   
 ## 5.6.0 (2021-03-25)
 

From c5238ef74ebb727746db80ed810591cda6bb6498 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 3 Apr 2021 09:14:52 +0100
Subject: [PATCH 1799/3183] fixes

---
 lib/connection/ws.js     |  6 +++---
 lib/device/humidifier.js | 13 +------------
 2 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/lib/connection/ws.js b/lib/connection/ws.js
index 9ee9ea67..160a3745 100644
--- a/lib/connection/ws.js
+++ b/lib/connection/ws.js
@@ -270,7 +270,7 @@ module.exports = class connectionWS {
 
         // Wait for 4 seconds and try to re-establish the web socket connection
         await this.funcs.sleep(4000)
-        this.login()
+        await this.login()
       })
 
       // Add a listener for when the web socket throws an error
@@ -282,7 +282,7 @@ module.exports = class connectionWS {
 
         // Wait for 6 seconds and try to re-establish the web socket connection
         await this.funcs.sleep(6000)
-        this.login()
+        await this.login()
       })
 
       // Open the web socket connection
@@ -394,7 +394,7 @@ module.exports = class connectionWS {
       clearInterval(this.hbInterval)
       this.hbInterval = null
     }
-    
+
     if (this.wsClient) {
       // Remove any existing existing listeners
       this.wsClient.removeAllListeners()
diff --git a/lib/device/humidifier.js b/lib/device/humidifier.js
index 005ad781..2f6a57a2 100644
--- a/lib/device/humidifier.js
+++ b/lib/device/humidifier.js
@@ -31,7 +31,6 @@ module.exports = class deviceHumidifier {
     // Add the set handler to the fan on/off characteristic
     this.service.getCharacteristic(this.hapChar.On).onSet(async value => {
       if (!value) {
-        this.service.updateCharacteristic(this.hapChar.RotationSpeed, 0)
         await this.internalUpdate(0)
       }
     })
@@ -53,13 +52,13 @@ module.exports = class deviceHumidifier {
         return
       }
       const params = {}
+      let newState
       if (value <= 25) {
         if (this.cacheOnOff === 'off') {
           return
         }
         params.switch = 'off'
       } else {
-        let newState
         if (value > 25 && value <= 50) {
           newState = 1
         } else if (value > 50 && value <= 75) {
@@ -75,18 +74,8 @@ module.exports = class deviceHumidifier {
       }
       await this.platform.sendDeviceUpdate(this.accessory, params)
       if (value <= 25) {
-        this.service.updateCharacteristic(this.hapChar.RotationSpeed, 0)
         this.cacheOnOff = 'off'
       } else {
-        let newState
-        if (value > 25 && value <= 50) {
-          newState = 1
-        } else if (value > 50 && value <= 75) {
-          newState = 2
-        } else {
-          newState = 3
-        }
-        this.service.updateCharacteristic(this.hapChar.RotationSpeed, newState * 33)
         this.cacheOnOff = 'on'
         this.cacheState = newState
         if (!this.disableDeviceLogging) {

From 46437fa0f49c01f3d28e8a71dfe774de692f9ed8 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 3 Apr 2021 09:16:31 +0100
Subject: [PATCH 1800/3183] Update ws.js

---
 lib/connection/ws.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/connection/ws.js b/lib/connection/ws.js
index 160a3745..c02e099c 100644
--- a/lib/connection/ws.js
+++ b/lib/connection/ws.js
@@ -289,7 +289,11 @@ module.exports = class connectionWS {
       await this.wsClient.open()
     } catch (err) {
       const errToShow = this.funcs.parseError(err)
-      this.log.warn('%s: %s.', this.messages.wsLoginErrRecon, errToShow)
+      
+      // Log the error if appropriate (debug on)
+      if (this.debug) {
+        this.log('%s: %s.', this.messages.wsLoginErrRecon, errToShow)
+      }
 
       // Wait for 5 seconds and try to re-establish the web socket connection
       await this.funcs.sleep(5000)

From 825f011e4c1b7d04c53fe3fab50770642cd46fdc Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 3 Apr 2021 09:17:05 +0100
Subject: [PATCH 1801/3183] 6.0.0-9

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index e769649f..b9c6e130 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.0.0-8",
+  "version": "6.0.0-9",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 7103b998..103e31c0 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.0.0-8",
+  "version": "6.0.0-9",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 3b72a15f5cfbfffe2a37c81940ffae5a6a14f974 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 3 Apr 2021 09:27:41 +0100
Subject: [PATCH 1802/3183] edits

---
 lib/device/diffuser.js     | 5 +----
 lib/device/humidifier.js   | 8 ++++----
 lib/device/light-dimmer.js | 1 +
 lib/device/rf-bridge.js    | 5 +++--
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/lib/device/diffuser.js b/lib/device/diffuser.js
index f8a9f855..69623cbe 100644
--- a/lib/device/diffuser.js
+++ b/lib/device/diffuser.js
@@ -116,7 +116,7 @@ module.exports = class deviceDiffuser {
       }
 
       // The new speed can be {50, 100} so use rounding on the new value
-      const newValue = value <= 75 ? 50 : 100
+      const newValue = value <= 50 ? 50 : 100
 
       // Check the rounded speed against the current cache value
       if (newValue === this.cacheSpeed) {
@@ -134,9 +134,6 @@ module.exports = class deviceDiffuser {
         return
       }
 
-      // Update the brightness with the new value as some apps don't support minStep
-      this.fanService.updateCharacteristic(this.hapChar.RotationSpeed, newValue)
-
       // Set up a five second timeout for the plugin to ignore incoming updates
       this.updateTimeout = updateKeySpeed
       setTimeout(() => {
diff --git a/lib/device/humidifier.js b/lib/device/humidifier.js
index 2f6a57a2..d206fa7e 100644
--- a/lib/device/humidifier.js
+++ b/lib/device/humidifier.js
@@ -53,15 +53,15 @@ module.exports = class deviceHumidifier {
       }
       const params = {}
       let newState
-      if (value <= 25) {
+      if (value === 0) {
         if (this.cacheOnOff === 'off') {
           return
         }
         params.switch = 'off'
       } else {
-        if (value > 25 && value <= 50) {
+        if (value > 0 && value <= 33) {
           newState = 1
-        } else if (value > 50 && value <= 75) {
+        } else if (value > 33 && value <= 66) {
           newState = 2
         } else {
           newState = 3
@@ -73,7 +73,7 @@ module.exports = class deviceHumidifier {
         params.state = newState
       }
       await this.platform.sendDeviceUpdate(this.accessory, params)
-      if (value <= 25) {
+      if (value === 0) {
         this.cacheOnOff = 'off'
       } else {
         this.cacheOnOff = 'on'
diff --git a/lib/device/light-dimmer.js b/lib/device/light-dimmer.js
index 99cbd954..749eb4dc 100644
--- a/lib/device/light-dimmer.js
+++ b/lib/device/light-dimmer.js
@@ -64,6 +64,7 @@ module.exports = class deviceLightDimmer {
       switch (this.accessory.context.eweUIID) {
         case 36:
         case 44:
+          // KING-M4, D1
           params.switch = newValue
           break
         case 57:
diff --git a/lib/device/rf-bridge.js b/lib/device/rf-bridge.js
index c097b52d..d9057580 100644
--- a/lib/device/rf-bridge.js
+++ b/lib/device/rf-bridge.js
@@ -107,9 +107,10 @@ module.exports = class deviceRFBridge {
         cmd: 'transmit',
         rfChl: parseInt(rfChl)
       }
-      await this.funcs.sleep(1000)
-      this.accessory.getService(service).updateCharacteristic(this.hapChar.On, false)
       await this.platform.sendDeviceUpdate(this.accessory, params)
+      setTimeout(() => {
+        this.accessory.getService(service).updateCharacteristic(this.hapChar.On, false)
+      }, 1000)
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {

From b02c865bbc35500328b7563f8cc988ec55476823 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 3 Apr 2021 09:28:06 +0100
Subject: [PATCH 1803/3183] 6.0.0-10

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b9c6e130..7a6e9dda 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.0.0-9",
+  "version": "6.0.0-10",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 103e31c0..59b74685 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.0.0-9",
+  "version": "6.0.0-10",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 2322e40c8b6d596fdf0f4472344e7f9e70816488 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 4 Apr 2021 18:48:23 +0100
Subject: [PATCH 1804/3183] onGet/onSet

---
 lib/fakegato/fakegato-history.js | 37 ++++++++++++++++----------------
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/lib/fakegato/fakegato-history.js b/lib/fakegato/fakegato-history.js
index ca8bd50e..c8d04cdf 100644
--- a/lib/fakegato/fakegato-history.js
+++ b/lib/fakegato/fakegato-history.js
@@ -421,15 +421,15 @@ module.exports = function (homebridge) {
       if (this.service === undefined) {
         this.service = thisAccessory.addService(FakeGatoHistoryService, ucfirst(thisAccessory.displayName) + ' History', this.accessoryType)
       }
-      this.service.getCharacteristic(S2R2Characteristic)
-        .removeAllListeners('get')
-        .on('get', this.getCurrentS2R2.bind(this))
-      this.service.getCharacteristic(S2W1Characteristic)
-        .removeAllListeners('set')
-        .on('set', this.setCurrentS2W1.bind(this))
-      this.service.getCharacteristic(S2W2Characteristic)
-        .removeAllListeners('set')
-        .on('set', this.setCurrentS2W2.bind(this))
+      this.service.getCharacteristic(S2R2Characteristic).onGet(() => {
+        this.getCurrentS2R2()
+      })
+      this.service.getCharacteristic(S2W1Characteristic).onSet(value => {
+        this.setCurrentS2W1(value)
+      })
+      this.service.getCharacteristic(S2W2Characteristic).onSet(value => {
+        this.setCurrentS2W2(value)
+      })
     }
 
     sendHistory (address) {
@@ -619,7 +619,7 @@ module.exports = function (homebridge) {
       homebridge.globalFakeGatoStorage.remove({ service: this })
     }
 
-    getCurrentS2R2 (callback) {
+    getCurrentS2R2 () {
       const entry2address = val => val % this.memorySize
       if (this.currentEntry <= this.lastEntry && this.transfer) {
         this.memoryAddress = entry2address(this.currentEntry)
@@ -799,18 +799,18 @@ module.exports = function (homebridge) {
           }
         }
         this.log('[%s] FG history: data [%s].', this.accessoryName, this.dataStream)
-        callback(null, hexToBase64(this.dataStream))
+        const toReturn = hexToBase64(this.dataStream)
         this.dataStream = ''
+        return toReturn
       } else {
         this.transfer = false
-        callback(null, hexToBase64('00'))
+        return hexToBase64('00')
       }
     }
 
-    setCurrentS2W1 (val, callback) {
-      callback(null)
-      this.log('[%s] FG history: data req [%s].', this.accessoryName, base64ToHex(val))
-      const valHex = base64ToHex(val)
+    setCurrentS2W1 (value) {
+      this.log('[%s] FG history: data req [%s].', this.accessoryName, base64ToHex(value))
+      const valHex = base64ToHex(value)
       const substring = valHex.substring(4, 12)
       const valInt = parseInt(substring, 16)
       const address = swap32(valInt)
@@ -819,9 +819,8 @@ module.exports = function (homebridge) {
       this.sendHistory(address)
     }
 
-    setCurrentS2W2 (val, callback) {
-      this.log('[%s] FG history: clock adj [%s].', this.accessoryName, base64ToHex(val))
-      callback()
+    setCurrentS2W2 (value) {
+      this.log('[%s] FG history: clock adj [%s].', this.accessoryName, base64ToHex(value))
     }
   }
 

From d6a79239fbe1250b95a0c572eb3ad0f00265f40f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 4 Apr 2021 18:51:05 +0100
Subject: [PATCH 1805/3183] 6.0.0-11

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 7a6e9dda..4f9f083e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.0.0-10",
+  "version": "6.0.0-11",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 59b74685..d6f23527 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.0.0-10",
+  "version": "6.0.0-11",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 05e24579754dadbdc3644d0d03c6735829535d83 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 4 Apr 2021 19:07:03 +0100
Subject: [PATCH 1806/3183] fix s2r2

---
 lib/fakegato/fakegato-history.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/fakegato/fakegato-history.js b/lib/fakegato/fakegato-history.js
index c8d04cdf..b11b6479 100644
--- a/lib/fakegato/fakegato-history.js
+++ b/lib/fakegato/fakegato-history.js
@@ -422,7 +422,7 @@ module.exports = function (homebridge) {
         this.service = thisAccessory.addService(FakeGatoHistoryService, ucfirst(thisAccessory.displayName) + ' History', this.accessoryType)
       }
       this.service.getCharacteristic(S2R2Characteristic).onGet(() => {
-        this.getCurrentS2R2()
+        return this.getCurrentS2R2()
       })
       this.service.getCharacteristic(S2W1Characteristic).onSet(value => {
         this.setCurrentS2W1(value)

From aa6ca4d49b025fa5c4f3fc0f252a87008abaaf67 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 4 Apr 2021 19:07:34 +0100
Subject: [PATCH 1807/3183] 6.0.0-12

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 4f9f083e..f529b03d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.0.0-11",
+  "version": "6.0.0-12",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index d6f23527..4c200280 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.0.0-11",
+  "version": "6.0.0-12",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 59c9789f33b77690600217308c7e5806fab2b6b1 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 6 Apr 2021 08:39:15 +0100
Subject: [PATCH 1808/3183] manual asia wsHost fix

---
 lib/connection/ws.js | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/lib/connection/ws.js b/lib/connection/ws.js
index c02e099c..c63825f8 100644
--- a/lib/connection/ws.js
+++ b/lib/connection/ws.js
@@ -62,8 +62,13 @@ module.exports = class connectionWS {
         this.log('%s [%s].', this.messages.wsHostRec, body.domain)
       }
 
+      // Temporary fix for the problematic asia host
+      if (body.domain === 'as-pconnect4.coolkit.cc') {
+        return await this.getHost()
+      }
+
       // Make the received host global
-      this.wsHost = body.domain
+      return body.domain
     } catch (err) {
       // Check to see if it's a eWeLink server problem and we can retry
       if (err.code && this.consts.httpRetryCodes.includes(err.code)) {
@@ -92,16 +97,17 @@ module.exports = class connectionWS {
       await this.closeConnection()
 
       // Refresh the web socket host
-      await this.getHost()
+      const wsHost = await this.getHost()
 
       // Create the web socket client
-      this.wsClient = new this.wsp('wss://' + this.wsHost + ':8080/api/ws', {
+      this.wsClient = new this.wsp('wss://' + wsHost + ':8080/api/ws', {
         createWebSocket: url => new this.ws(url),
         extractMessageData: event => event,
         attachRequestId: (data, requestId) => Object.assign({ sequence: requestId }, data),
         extractRequestId: data => data && data.sequence,
         packMessage: data => JSON.stringify(data),
         unpackMessage: data => data === 'pong' ? data : JSON.parse(data),
+        connectionTimeout: 5000,
         timeout: 10000
       })
 
@@ -289,7 +295,7 @@ module.exports = class connectionWS {
       await this.wsClient.open()
     } catch (err) {
       const errToShow = this.funcs.parseError(err)
-      
+
       // Log the error if appropriate (debug on)
       if (this.debug) {
         this.log('%s: %s.', this.messages.wsLoginErrRecon, errToShow)

From a83efe32fc5d87fa212c518a970ea8dde392a7b8 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 6 Apr 2021 08:39:58 +0100
Subject: [PATCH 1809/3183] 6.0.0-13

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index f529b03d..ef3f77c4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.0.0-12",
+  "version": "6.0.0-13",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 4c200280..79d13625 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.0.0-12",
+  "version": "6.0.0-13",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 7dd53bef60d76bdab09342e302db1122f128bef4 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 6 Apr 2021 08:52:41 +0100
Subject: [PATCH 1810/3183] 6.0.1-beta.0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ef3f77c4..d315b641 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.0.0-13",
+  "version": "6.0.1-beta.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 79d13625..d80a053e 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.0.0-13",
+  "version": "6.0.1-beta.0",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 63e8ea3072130aa7b3b3269f342d0acf89fc4f29 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 6 Apr 2021 09:23:07 +0100
Subject: [PATCH 1811/3183] 6.0.1-beta.1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d315b641..c90cf243 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.0.1-beta.0",
+  "version": "6.0.1-beta.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index d80a053e..cd68c6ea 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.0.1-beta.0",
+  "version": "6.0.1-beta.1",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 056ec7db098740df01aabdd9a7dd6ebeefa9ce90 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Tue, 6 Apr 2021 12:26:52 +0100
Subject: [PATCH 1812/3183] Update README.md

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 540fe424..96ec6c07 100644
--- a/README.md
+++ b/README.md
@@ -26,7 +26,8 @@ Homebridge plugin to control eWeLink devices with original firmware
   * uses a web socket for real-time device control and updates
 
 ### Prerequisites
-* To use this plugin, you will need to already have [Homebridge](https://homebridge.io) or [HOOBS](https://hoobs.org) installed. Please refer to the links for more information and installation instructions.
+* To use this plugin, you will need to already have [Homebridge](https://homebridge.io) (at least v1.3.3) or [HOOBS](https://hoobs.org) (at least v3.3.4) installed. Please refer to the links for more information and installation instructions.
+* It is recommended to use the current LTS version of Node, currently v14, however Node v10 and v12 are also supported.
 
 ### Setup
 * [Installation (Homebridge)](https://github.com/bwp91/homebridge-ewelink/wiki/Installation-(Homebridge))

From 843115f8f6c8bd8d366c897f8eab4a5fef4a686b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 6 Apr 2021 13:55:30 +0100
Subject: [PATCH 1813/3183] Update ws.js

---
 lib/connection/ws.js | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/lib/connection/ws.js b/lib/connection/ws.js
index c63825f8..11931285 100644
--- a/lib/connection/ws.js
+++ b/lib/connection/ws.js
@@ -62,12 +62,7 @@ module.exports = class connectionWS {
         this.log('%s [%s].', this.messages.wsHostRec, body.domain)
       }
 
-      // Temporary fix for the problematic asia host
-      if (body.domain === 'as-pconnect4.coolkit.cc') {
-        return await this.getHost()
-      }
-
-      // Make the received host global
+      // Return the received web socket host
       return body.domain
     } catch (err) {
       // Check to see if it's a eWeLink server problem and we can retry
@@ -308,15 +303,11 @@ module.exports = class connectionWS {
   }
 
   async sendUpdate (json) {
-    // Used to send a device update to eWeLink
-    const sequence = Math.floor(new Date()).toString()
-
     // Generate the payload to send
     const toSend = {
       ...json,
       ...{
         action: 'update',
-        sequence,
         ts: 0,
         userAgent: 'app'
       }
@@ -325,6 +316,9 @@ module.exports = class connectionWS {
     // Check the web socket is open
     if (this.wsClient && this.wsIsConnected) {
       try {
+        // Generate the sequence that will be attached to the message
+        const sequence = Math.floor(new Date()).toString()
+
         // Send the request to eWeLink
         const res = await this.wsClient.sendRequest(toSend, { requestId: sequence })
 
@@ -360,16 +354,13 @@ module.exports = class connectionWS {
   }
 
   async requestUpdate (accessory) {
-    // Used to request a device update from eWeLink
-    const sequence = Math.floor(new Date()).toString()
-
     // Generate the payload to send
     const json = {
       action: 'query',
       apikey: accessory.context.eweApiKey,
       deviceid: accessory.context.eweDeviceId,
       params: [],
-      sequence,
+      sequence: Math.floor(new Date()).toString(),
       ts: 0,
       userAgent: 'app'
     }

From 89ef12074d13b6ed1419d9ee2996b3c5f297a5da Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 6 Apr 2021 13:56:07 +0100
Subject: [PATCH 1814/3183] 6.0.1-beta.2

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c90cf243..4cd1ab06 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.0.1-beta.1",
+  "version": "6.0.1-beta.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index cd68c6ea..3c72f078 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.0.1-beta.1",
+  "version": "6.0.1-beta.2",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From d2fea6c4ce82ec0fa817e8ad1a40785d60cc805c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 6 Apr 2021 14:04:17 +0100
Subject: [PATCH 1815/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 64425301..7577cf77 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,8 +16,9 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 * 'No Response' messages for **Zigbee and DW2** devices as they go on and offline
 * 'No Response' messages for  **all devices** if controlled and unsuccessful (and this status will be reverted after 5 seconds)
-* Use the new `.onSet` methods available in Homebridge v1.3
+* Use the new `.onGet`/`.onSet` methods available in Homebridge v1.3
 * Fixes a caching issue with the iFan accessory
+* Updated README to reflect minimum supported Homebridge/HOOBS and Node versions
   
 ## 5.6.0 (2021-03-25)
 

From d7c9bba404d71036cca615e2b48c8bdf219506ef Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Tue, 6 Apr 2021 21:48:06 +0100
Subject: [PATCH 1816/3183] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 96ec6c07..71b1d893 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@
 Homebridge plugin to control eWeLink devices with original firmware
 
 [![verified-by-homebridge](https://badgen.net/badge/homebridge/verified/purple)](https://github.com/homebridge/homebridge/wiki/Verified-Plugins)
-[![hoobs-certified](https://badgen.net/badge/HOOBS/Certified/yellow)](https://plugins.hoobs.org/plugin/homebridge-ewelink)   
+[![hoobs-certified](https://badgen.net/badge/HOOBS/certified/yellow)](https://plugins.hoobs.org/plugin/homebridge-ewelink)   
 [![npm](https://img.shields.io/npm/v/homebridge-ewelink/latest?label=latest)](https://www.npmjs.com/package/homebridge-ewelink)
 [![npm](https://img.shields.io/npm/v/homebridge-ewelink/beta?label=beta)](https://github.com/bwp91/homebridge-ewelink/wiki/Beta-Version)   
 [![npm](https://img.shields.io/npm/dt/homebridge-ewelink)](https://www.npmjs.com/package/homebridge-ewelink)

From 8ba055601019286ef60377b7095699095713aaef Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 6 Apr 2021 21:51:50 +0100
Subject: [PATCH 1817/3183] node to 14.16.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 3c72f078..9b4897dc 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
   "main": "lib/index.js",
   "engines": {
     "homebridge": "^1.3.3",
-    "node": "^14.16.0"
+    "node": "^14.16.1"
   },
   "repository": {
     "type": "git",

From 1b781dd0e3ad3daa92797014e489c0e0066392cd Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 6 Apr 2021 22:12:23 +0100
Subject: [PATCH 1818/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7577cf77..7d0c551b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 * Use the new `.onGet`/`.onSet` methods available in Homebridge v1.3
 * Fixes a caching issue with the iFan accessory
 * Updated README to reflect minimum supported Homebridge/HOOBS and Node versions
+* Updated recommended Node to v14.16.1
   
 ## 5.6.0 (2021-03-25)
 

From 727d575c17b0a25366fccffe6e1e5aa8423fea7d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 7 Apr 2021 07:55:34 +0100
Subject: [PATCH 1819/3183] 6.0.1-beta.3

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 4cd1ab06..0e3c5785 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.0.1-beta.2",
+  "version": "6.0.1-beta.3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 9b4897dc..2bb01ae5 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.0.1-beta.2",
+  "version": "6.0.1-beta.3",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From d91f842cd34f818f91211aa34b6e854f6c1f03a2 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 7 Apr 2021 11:17:22 +0100
Subject: [PATCH 1820/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7d0c551b..e8ae1b36 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 All notable changes to this homebridge-ewelink will be documented in this file.
 
-## BETA
+## 6.0.1 (2021-04-07)
 
 ### Requirements
 

From dd8b150e4914f0ecb6672ae269a20077350a0ecb Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 7 Apr 2021 11:18:05 +0100
Subject: [PATCH 1821/3183] 6.0.1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 0e3c5785..1549739f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.0.1-beta.3",
+  "version": "6.0.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 2bb01ae5..6d7316f6 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.0.1-beta.3",
+  "version": "6.0.1",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From c268a4698fb82dd3e6be120306d3b1bf186e82aa Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 7 Apr 2021 18:10:39 +0100
Subject: [PATCH 1822/3183] remove no response status for dw2

---
 lib/device/sensor-contact.js | 4 ----
 lib/utils/constants.js       | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/lib/device/sensor-contact.js b/lib/device/sensor-contact.js
index 23510b62..69dc9a53 100644
--- a/lib/device/sensor-contact.js
+++ b/lib/device/sensor-contact.js
@@ -156,8 +156,4 @@ module.exports = class deviceSensorContact {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
-
-  markStatus (isOnline) {
-    this.isOnline = isOnline
-  }
 }
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 27d19fe5..ae83934e 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -103,7 +103,7 @@ module.exports = {
   devices: {
     lanIn: [1, 2, 3, 4, 5, 6, 7, 8, 9, 14, 15, 32, 44, 77, 78, 103, 104, 126],
     lanOut: [1, 2, 3, 4, 5, 6, 7, 8, 9, 14, 32, 44, 77, 78, 126],
-    markStatus: [102, 1000, 1009, 1256, 1257, 1258, 1770, 2026, 3026],
+    markStatus: [1000, 1009, 1256, 1257, 1258, 1770, 2026, 3026],
     singleSwitch: [1, 5, 6, 14, 24, 27],
     multiSwitch: [2, 3, 4, 7, 8, 9, 29, 30, 31, 41, 82, 83, 84, 126],
     singleSwitchOutlet: ['Sonoff Pow', 'S20', 'S26', 'S26R1', 'S55', 'S55R1'],

From dc3beed7fceac6a3192f95a888de46e9234551ad Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 7 Apr 2021 18:12:17 +0100
Subject: [PATCH 1823/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e8ae1b36..b2e14018 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 All notable changes to this homebridge-ewelink will be documented in this file.
 
+## 6.0.2 (2021-04-07)
+
+### Changes
+
+* Revert 'No Response' messages for **DW2** devices as they go on and offline
+
 ## 6.0.1 (2021-04-07)
 
 ### Requirements

From 195ec7e403292aef1125f266f36f3d5a50bf661b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 7 Apr 2021 18:12:46 +0100
Subject: [PATCH 1824/3183] 6.0.2

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 1549739f..9cc50988 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.0.1",
+  "version": "6.0.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 6d7316f6..c7271cc2 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.0.1",
+  "version": "6.0.2",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From a610dc016a88f5d58c5fdd2ed8852c2d94a5e18d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 8 Apr 2021 09:40:05 +0100
Subject: [PATCH 1825/3183] remove onGet

---
 lib/device/sensor-contact.js | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/lib/device/sensor-contact.js b/lib/device/sensor-contact.js
index 69dc9a53..7f10e8c1 100644
--- a/lib/device/sensor-contact.js
+++ b/lib/device/sensor-contact.js
@@ -44,15 +44,6 @@ module.exports = class deviceSensorContact {
       this.service.addCharacteristic(this.eveChar.TimesOpened)
     }
 
-    // Add the get handler to the contact sensor state characteristic
-    this.service.getCharacteristic(this.hapChar.ContactSensorState).onGet(() => {
-      if (this.isOnline) {
-        return this.service.getCharacteristic(this.hapChar.ContactSensorState).value
-      } else {
-        throw new this.platform.api.hap.HapStatusError(-70402)
-      }
-    })
-
     // Obtain the current times opened value
     this.timesOpened = this.service.getCharacteristic(this.eveChar.TimesOpened).value
 

From 4f7b8b98bbb344e3e33c86e76b5fd08a6d8c64f6 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 8 Apr 2021 09:40:07 +0100
Subject: [PATCH 1826/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b2e14018..204d44cd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 All notable changes to this homebridge-ewelink will be documented in this file.
 
+## 6.0.3 (2021-04-08)
+
+### Changes
+
+* [fix] Revert 'No Response' messages for **DW2** devices as they go on and offline
+
 ## 6.0.2 (2021-04-07)
 
 ### Changes

From d5c9e975005b17b25aeb579f7d30cb6f2dcd7e13 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 8 Apr 2021 09:40:32 +0100
Subject: [PATCH 1827/3183] 6.0.3

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 9cc50988..bbf081c9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.0.2",
+  "version": "6.0.3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index c7271cc2..e90d6051 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.0.2",
+  "version": "6.0.3",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 21b8b87f252e76efcff5c4c9b48117a7b4335134 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 9 Apr 2021 09:33:00 +0100
Subject: [PATCH 1828/3183] separate file for dualr3

---
 lib/device/switch-double.js | 248 ++++++++++++++++++++++++++++++++++++
 lib/device/switch-multi.js  |   4 +-
 lib/index.js                |   4 +-
 3 files changed, 252 insertions(+), 4 deletions(-)
 create mode 100644 lib/device/switch-double.js

diff --git a/lib/device/switch-double.js b/lib/device/switch-double.js
new file mode 100644
index 00000000..7cf5869a
--- /dev/null
+++ b/lib/device/switch-double.js
@@ -0,0 +1,248 @@
+/* jshint -W014, -W033, esversion: 9 */
+/* eslint-disable new-cap */
+'use strict'
+
+module.exports = class deviceSwitchMulti {
+  constructor (platform, accessory) {
+    // Set up variables from the platform
+    this.consts = platform.consts
+    this.debug = platform.config.debug
+    this.funcs = platform.funcs
+    this.hapServ = platform.api.hap.Service
+    this.hapChar = platform.api.hap.Characteristic
+    this.log = platform.log
+    this.messages = platform.messages
+    this.platform = platform
+
+    // Set up variables from the accessory
+    this.name = accessory.displayName
+    this.accessory = accessory
+
+    // Set up custom variables for this device type
+    const deviceId = this.accessory.context.eweDeviceId
+    const deviceConf = platform.multiDevices[deviceId]
+    this.showAsOutlet = deviceConf && deviceConf.showAsOutlet
+    this.disableDeviceLogging = deviceConf && deviceConf.overrideDisabledLogging
+      ? false
+      : platform.config.disableDeviceLogging
+
+    if (this.showAsOutlet) {
+      // If the accessory has a switch service then remove it
+      if (this.accessory.getService(this.hapServ.Switch)) {
+        this.accessory.removeService(this.accessory.getService(this.hapServ.Switch))
+      }
+
+      // Add the outlet service if it doesn't already exist
+      this.service = this.accessory.getService(this.hapServ.Outlet) ||
+        this.accessory.addService(this.hapServ.Outlet)
+    } else {
+      // If the accessory has an outlet service then remove it
+      if (this.accessory.getService(this.hapServ.Outlet)) {
+        this.accessory.removeService(this.accessory.getService(this.hapServ.Outlet))
+      }
+
+      // Add the switch service if it doesn't already exist
+      this.service = this.accessory.getService(this.hapServ.Switch) ||
+        this.accessory.addService(this.hapServ.Switch)
+    }
+
+    // Add the set handler to the switch/outlet on/off characteristic
+    this.service.getCharacteristic(this.hapChar.On).onSet(async value => {
+      await this.internalUpdate(value)
+    })
+
+    // Pass the accessory to Fakegato to set up with Eve
+    this.accessory.eveService = new this.platform.eveService('switch', this.accessory, {
+      log: platform.config.debugFakegato ? this.log : () => {}
+    })
+
+    // Output the customised options to the log if in debug mode
+    if (this.debug) {
+      const opts = JSON.stringify({
+        disableDeviceLogging: this.disableDeviceLogging,
+        showAsOutlet: this.showAsOutlet
+      })
+      this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
+    }
+  }
+
+  async internalUpdate (value) {
+    try {
+      await this.funcs.sleep(Math.floor(Math.random() * 241 + 10))
+      let oAccessory
+      let masterState = 'off'
+      const params = {
+        switches: this.consts.defaultDoubleSwitchOff
+      }
+      switch (this.accessory.context.switchNumber) {
+        case '0':
+          params.switches[0].switch = value ? 'on' : 'off'
+          params.switches[1].switch = value ? 'on' : 'off'
+          break
+        case '1':
+        case '2':
+          for (let i = 1; i <= this.accessory.context.channelCount; i++) {
+            const idToCheck = this.accessory.context.eweDeviceId + 'SW' + i
+            if ((oAccessory = this.platform.devicesInHB.get(idToCheck))) {
+              if (i === parseInt(this.accessory.context.switchNumber)) {
+                params.switches[i - 1].switch = value ? 'on' : 'off'
+              } else {
+                params.switches[i - 1].switch = oAccessory.context.cacheOnOff
+              }
+            } else {
+              params.switches[i - 1].switch = 'off'
+            }
+          }
+          break
+      }
+      await this.platform.sendDeviceUpdate(this.accessory, params)
+      switch (this.accessory.context.switchNumber) {
+        case '0':
+          for (let i = 0; i <= this.accessory.context.channelCount; i++) {
+            const idToCheck = this.accessory.context.eweDeviceId + 'SW' + i
+            if ((oAccessory = this.platform.devicesInHB.get(idToCheck))) {
+              if (this.showAsOutlet) {
+                oAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
+                  this.hapChar.On,
+                  value
+                )
+                oAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
+                  this.hapChar.OutletInUse,
+                  value
+                )
+              } else {
+                oAccessory.getService(this.hapServ.Switch).updateCharacteristic(
+                  this.hapChar.On,
+                  value
+                )
+              }
+              oAccessory.context.cacheOnOff = value ? 'on' : 'off'
+              oAccessory.eveService.addEntry({ status: value ? 1 : 0 })
+              if (i > 0 && !this.disableDeviceLogging) {
+                const name = oAccessory.displayName
+                this.log('[%s] current state [%s].', name, value ? 'on' : 'off')
+              }
+            }
+          }
+          break
+        case '1':
+        case '2':
+          for (let i = 1; i <= this.accessory.context.channelCount; i++) {
+            const idToCheck = this.accessory.context.eweDeviceId + 'SW' + i
+            if ((oAccessory = this.platform.devicesInHB.get(idToCheck))) {
+              const serv = this.showAsOutlet
+                ? this.hapServ.Outlet
+                : this.hapServ.Switch
+              if (oAccessory.getService(serv).getCharacteristic(this.hapChar.On).value) {
+                masterState = 'on'
+              }
+              if (i === parseInt(this.accessory.context.switchNumber)) {
+                oAccessory.context.cacheOnOff = value ? 'on' : 'off'
+                oAccessory.eveService.addEntry({ status: value ? 1 : 0 })
+                if (this.showAsOutlet) {
+                  oAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
+                    this.hapChar.OutletInUse,
+                    value
+                  )
+                }
+                if (i > 0 && !this.disableDeviceLogging) {
+                  this.log(
+                    '[%s] current state [%s].',
+                    oAccessory.displayName,
+                    value ? 'on' : 'off'
+                  )
+                }
+              }
+            }
+          }
+          if (!this.platform.hideMasters.includes(this.accessory.context.eweDeviceId)) {
+            oAccessory = this.platform.devicesInHB.get(
+              this.accessory.context.eweDeviceId + 'SW0'
+            )
+            if (this.showAsOutlet) {
+              oAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
+                this.hapChar.On,
+                masterState === 'on'
+              )
+              oAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
+                this.hapChar.OutletInUse,
+                masterState === 'on'
+              )
+            } else {
+              oAccessory.getService(this.hapServ.Switch).updateCharacteristic(
+                this.hapChar.On,
+                masterState === 'on'
+              )
+            }
+            oAccessory.eveService.addEntry({ status: masterState === 'on' ? 1 : 0 })
+          }
+          break
+      }
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, true)
+      setTimeout(() => {
+        this.service.updateCharacteristic(this.hapChar.On, !value)
+      }, 5000)
+      throw new this.platform.api.hap.HapStatusError(-70402)
+    }
+  }
+
+  async externalUpdate (params) {
+    try {
+      if (!params.switches) {
+        return
+      }
+      const idToCheck = this.accessory.context.eweDeviceId + 'SW'
+      let primaryState = false
+      for (let i = 1; i <= this.accessory.context.channelCount; i++) {
+        if (params.switches[i - 1].switch === 'on') {
+          primaryState = true
+        }
+        if (this.platform.devicesInHB.has(idToCheck + i)) {
+          const oAccessory = this.platform.devicesInHB.get(idToCheck + i)
+          if (
+            params.updateSource &&
+            params.switches[i - 1].switch === oAccessory.context.cacheOnOff
+          ) {
+            continue
+          }
+          if (this.showAsOutlet) {
+            oAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
+              this.hapChar.On,
+              params.switches[i - 1].switch === 'on'
+            )
+            oAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
+              this.hapChar.OutletInUse,
+              params.switches[i - 1].switch === 'on'
+            )
+          } else {
+            oAccessory.getService(this.hapServ.Switch).updateCharacteristic(
+              this.hapChar.On,
+              params.switches[i - 1].switch === 'on'
+            )
+          }
+          oAccessory.context.cacheOnOff = params.switches[i - 1].switch
+          oAccessory.eveService.addEntry({
+            status: params.switches[i - 1].switch === 'on' ? 1 : 0
+          })
+          if (params.updateSource && !this.disableDeviceLogging) {
+            this.log(
+              '[%s] current state [%s].',
+              oAccessory.displayName,
+              params.switches[i - 1].switch
+            )
+          }
+        }
+      }
+      if (!this.platform.hideMasters.includes(this.accessory.context.eweDeviceId)) {
+        this.service.updateCharacteristic(this.hapChar.On, primaryState)
+        if (this.showAsOutlet) {
+          this.service.updateCharacteristic(this.hapChar.OutletInUse, primaryState)
+        }
+        this.accessory.eveService.addEntry({ status: primaryState ? 1 : 0 })
+      }
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, false)
+    }
+  }
+}
diff --git a/lib/device/switch-multi.js b/lib/device/switch-multi.js
index a5fa7bac..868ee309 100644
--- a/lib/device/switch-multi.js
+++ b/lib/device/switch-multi.js
@@ -72,9 +72,7 @@ module.exports = class deviceSwitchMulti {
       let oAccessory
       let masterState = 'off'
       const params = {
-        switches: this.accessory.context.eweUIID === 126
-          ? this.consts.defaultDoubleSwitchOff
-          : this.consts.defaultMultiSwitchOff
+        switches: this.consts.defaultMultiSwitchOff
       }
       switch (this.accessory.context.switchNumber) {
         case '0':
diff --git a/lib/index.js b/lib/index.js
index ba9c5a02..e864e928 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -962,7 +962,9 @@ class eWeLinkPlatform {
           oAccessory.context.ip = this.lanClient && oAccessory.context.reachableLAN
             ? this.lanDevices.get(device.deviceid).ip
             : false
-          oAccessory.control = new (require('./device/switch-multi'))(this, oAccessory)
+          oAccessory.control = oAccessory.context.eweUIID === 126
+            ? new (require('./device/switch-double'))(this, oAccessory)
+            : new (require('./device/switch-multi'))(this, oAccessory)
 
           // Update any changes to the sub accessory to the platform
           this.api.updatePlatformAccessories(PLUGIN.name, PLUGIN.alias, [oAccessory])

From 052d43209f6b69f3e86222ff5ae7ecb1b45c4aeb Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 9 Apr 2021 09:33:11 +0100
Subject: [PATCH 1829/3183] fix interval

---
 lib/device/outlet.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/device/outlet.js b/lib/device/outlet.js
index f48b3097..11e92ad4 100644
--- a/lib/device/outlet.js
+++ b/lib/device/outlet.js
@@ -105,7 +105,7 @@ module.exports = class deviceOutlet {
         this.eveChar.TotalConsumption,
         this.accessory.context.energyReadingTotal
       )
-    }, 300000)
+    }, 30000)
 
     if (
       this.consts.devices.outlet.includes(this.accessory.context.eweUIID) &&

From 8377b82a240b8aa0cce96685ad64c3340392710d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 9 Apr 2021 14:43:36 +0100
Subject: [PATCH 1830/3183] remove warnings + not triggered

---
 lib/device/rf-bridge.js | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/lib/device/rf-bridge.js b/lib/device/rf-bridge.js
index d9057580..cf8446bf 100644
--- a/lib/device/rf-bridge.js
+++ b/lib/device/rf-bridge.js
@@ -44,6 +44,7 @@ module.exports = class deviceRFBridge {
       let serv
       let char
       let eveType
+      let addLACharacteristic = false
 
       // Check which type this sensor is and get the correct service/characteristic
       switch (this.accessory.context.subType) {
@@ -72,6 +73,7 @@ module.exports = class deviceRFBridge {
           serv = this.hapServ.ContactSensor
           char = this.hapChar.ContactSensorState
           eveType = 'door'
+          addLACharacteristic = true
           break
         case 'occupancy':
           serv = this.hapServ.OccupancySensor
@@ -82,11 +84,20 @@ module.exports = class deviceRFBridge {
           serv = this.hapServ.MotionSensor
           char = this.hapChar.MotionDetected
           eveType = 'motion'
+          addLACharacteristic = true
           break
       }
 
       // Add the sensor if it doesn't already exist
-      const service = this.accessory.getService(serv) || this.accessory.addService(serv)
+      let service
+      let justAdded = false
+      if (!(service = this.accessory.getService(serv))) {
+        service = this.accessory.addService(serv)
+        if (addLACharacteristic) {
+          service.addCharacteristic(this.eveChar.LastActivation)
+        }
+        justAdded = true
+      }
 
       // Always start with the sensor off (useful when restarting Homebridge)
       service.updateCharacteristic(char, 0)
@@ -95,6 +106,10 @@ module.exports = class deviceRFBridge {
       this.accessory.eveService = new this.platform.eveService(eveType, this.accessory, {
         log: platform.config.debugFakegato ? this.log : () => {}
       })
+
+      if (justAdded) {
+        this.accessory.eveService.addEntry({ status: 0 })
+      }
     }
   }
 
@@ -223,7 +238,12 @@ module.exports = class deviceRFBridge {
                 if (params.updateSource && !oAccessory.context.disableDeviceLogging) {
                   this.log('[%s] current state [triggered]', oAccessory.displayName)
                 }
+                const updateKey = Math.random().toString(36).substr(2, 8)
+                oAccessory.context.updateKey = updateKey
                 await this.funcs.sleep(oAccessory.context.sensorTimeLength * 1000)
+                if (updateKey !== oAccessory.context.updateKey) {
+                  return
+                }
                 oAccessory.getService(serv).updateCharacteristic(char, 0)
                 oAccessory.eveService.addEntry({ status: 0 })
                 if (params.updateSource && !oAccessory.context.disableDeviceLogging) {

From 1a77e540db044272ac38e32a3d01bda882702fdd Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 9 Apr 2021 14:43:45 +0100
Subject: [PATCH 1831/3183] add doorbell model SA-026

---
 lib/index.js           | 5 ++---
 lib/utils/constants.js | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/lib/index.js b/lib/index.js
index e864e928..95054de4 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1017,8 +1017,8 @@ class eWeLinkPlatform {
             subType = 'button'
           } else if (subDevice.type === '5') {
             subType = 'curtain'
-          } else if (subDevice.type === '6') {
-            subType = this.rfDevices[fullDeviceId]
+          } else if (['6', '7'].includes(subDevice.type)) {
+            subType = this.rfDevices[fullDeviceId] && subDevice.type === '6'
               ? this.rfDevices[fullDeviceId].type
               : 'motion'
             sensorTimeLength = this.rfDevices[fullDeviceId] &&
@@ -1030,7 +1030,6 @@ class eWeLinkPlatform {
               ? this.rfDevices[fullDeviceId].sensorTimeDifference
               : this.consts.defaultValues.sensorTimeDifference
           } else {
-            // 7 = doorbell?
             this.log.warn('[%s] %s:', device.name, this.messages.devNotSupYet)
             const params = JSON.stringify(device.params)
             this.log.warn('[%s-%s] %s', device.extra.uiid, subDevice.type || '?', params)
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index ae83934e..53ffbc2d 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -122,7 +122,7 @@ module.exports = {
     outlet: [32],
     outletSCM: [77, 78, 81, 107],
     camera: [87],
-    rfBridge: [28],
+    rfBridge: [28, 98],
     zbBridge: [66],
     zbSwitchStateless: [1000],
     zbSwitchSingle: [1009, 1256],
@@ -194,6 +194,7 @@ module.exports = {
     83: 3, // "GSM_SOCKET_3_NO_FLOW"
     84: 4, // "GSM_SOCKET_4_NO_FLOW"
     87: 1, // "EWELINK_IOT_CAMERA" (GK-200MP2B)
+    98: 1, // "DOORBELL_RFBRIDGE"
     102: 1, // "DOOR_MAGNETIC" (OPL-DMA, DW2)
     103: 1, // "WOTEWODE_TEM_LIGHT" (B02-F)
     104: 1, // "WOTEWODE_RGB_TEM_LIGHT"
@@ -261,7 +262,6 @@ module.exports = {
     91: 0, // "ROLLING_DOOR_91"
     93: 0, // "HTHD_AIR_CLEANER"
     94: 0, // "YIAN_ELECTRIC_PROTECT"
-    98: 0, // "DOORBELL_RFBRIDGE"
     109: 0, // "YK_INFRARED_2"
     1001: 0, // "BLADELESS_FAN"
     1002: 0, // "NEW_HUMIDIFIER"

From 71a1600e4ace77d7ab929c249098a7b47680498c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 9 Apr 2021 14:43:49 +0100
Subject: [PATCH 1832/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 204d44cd..93270790 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,17 @@
 
 All notable changes to this homebridge-ewelink will be documented in this file.
 
+## BETA
+
+### Added
+
+* Support for doorbell model SA-026 (exposed as a motion sensor)
+
+### Changes
+
+* Improvements to RF Bridge:
+  * No more characteristic warnings for `LastActivation` for motion and contact sensors
+
 ## 6.0.3 (2021-04-08)
 
 ### Changes

From bed77187dffe5d78798a63725915a866a38c016d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 9 Apr 2021 14:44:59 +0100
Subject: [PATCH 1833/3183] 6.1.0-beta.0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index bbf081c9..a6072a48 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.0.3",
+  "version": "6.1.0-beta.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index e90d6051..01e127fb 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.0.3",
+  "version": "6.1.0-beta.0",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From c1425bf5d029309a27d34c3063fbf3e0734f9151 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 9 Apr 2021 14:45:36 +0100
Subject: [PATCH 1834/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 93270790..5e6d8f94 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 * Improvements to RF Bridge:
   * No more characteristic warnings for `LastActivation` for motion and contact sensors
+  * Removed logs for 'not triggered' if device has since been triggered again
 
 ## 6.0.3 (2021-04-08)
 

From 9c79bac0db8b051257bf81c7f287fbb35d5e2b98 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Sun, 11 Apr 2021 11:57:20 +0100
Subject: [PATCH 1835/3183] Update README.md

---
 README.md | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 71b1d893..ba62f916 100644
--- a/README.md
+++ b/README.md
@@ -50,10 +50,12 @@ Homebridge plugin to control eWeLink devices with original firmware
 * [How to update node](https://github.com/bwp91/homebridge-ewelink/wiki/How-to-update-node)
 * [How to uninstall correctly](https://github.com/bwp91/homebridge-ewelink/wiki/How-to-uninstall-correctly)
 
-### About
-* [About Me](https://github.com/sponsors/bwp91)
-* [Changelog](https://github.com/bwp91/homebridge-ewelink/releases)
+### Help/About
+
+* [Common Errors](https://github.com/bwp91/homebridge-ewelink/wiki/Common-Errors)
 * [Support Request](https://github.com/bwp91/homebridge-ewelink/issues/new/choose)
+* [Changelog](https://github.com/bwp91/homebridge-ewelink/blob/latest/CHANGELOG.md)
+* [About Me](https://github.com/sponsors/bwp91)
 
 ### Credits
 * To the original plugin maintainer: [@gbro115](https://github.com/gbro115).

From eb355006856ef637345c1e883243082a8a58c27a Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 11 Apr 2021 11:58:28 +0100
Subject: [PATCH 1836/3183] Update index.html

---
 lib/homebridge-ui/public/index.html | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/homebridge-ui/public/index.html b/lib/homebridge-ui/public/index.html
index 28117e95..96703779 100644
--- a/lib/homebridge-ui/public/index.html
+++ b/lib/homebridge-ui/public/index.html
@@ -94,11 +94,12 @@ <h4>How-to Guides</h4>
     <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/How-to-update-node" target="_blank">How to update node</a></li>
     <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/How-to-uninstall-correctly" target="_blank">How to uninstall correctly</a></li>
   </ul>
-  <h4>About</h4>
+  <h4>Help/About</h4>
   <ul>
-    <li><a href="https://github.com/sponsors/bwp91" target="_blank">About Me</a></li>
-    <li><a href="https://github.com/bwp91/homebridge-ewelink/releases" target="_blank">Changelog</a></li>
+    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/Common-Errors" target="_blank">Common Errors</a></li>
     <li><a href="https://github.com/bwp91/homebridge-ewelink/issues/new/choose" target="_blank">Support Request</a></li>
+    <li><a href="https://github.com/sponsors/bwp91" target="_blank">About Me</a></li>
+    <li><a href="https://github.com/bwp91/homebridge-ewelink/blob/latest/CHANGELOG.md" target="_blank">Changelog</a></li>
   </ul>
   <h4>Credits</h4>
   <ul>

From ba5c8bff3a28c2fe779a377627f07347915690d3 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 11 Apr 2021 11:59:20 +0100
Subject: [PATCH 1837/3183] Update index.html

---
 lib/homebridge-ui/public/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/homebridge-ui/public/index.html b/lib/homebridge-ui/public/index.html
index 96703779..63b73ae1 100644
--- a/lib/homebridge-ui/public/index.html
+++ b/lib/homebridge-ui/public/index.html
@@ -98,8 +98,8 @@ <h4>Help/About</h4>
   <ul>
     <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/Common-Errors" target="_blank">Common Errors</a></li>
     <li><a href="https://github.com/bwp91/homebridge-ewelink/issues/new/choose" target="_blank">Support Request</a></li>
-    <li><a href="https://github.com/sponsors/bwp91" target="_blank">About Me</a></li>
     <li><a href="https://github.com/bwp91/homebridge-ewelink/blob/latest/CHANGELOG.md" target="_blank">Changelog</a></li>
+    <li><a href="https://github.com/sponsors/bwp91" target="_blank">About Me</a></li>
   </ul>
   <h4>Credits</h4>
   <ul>

From 7ca99975e91965e1cd6f46c95c7c2caa6af0e320 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 11 Apr 2021 17:50:27 +0100
Subject: [PATCH 1838/3183] update 406 error link

---
 lib/utils/lang-en.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/utils/lang-en.js b/lib/utils/lang-en.js
index dbf7a839..5a94ccd2 100644
--- a/lib/utils/lang-en.js
+++ b/lib/utils/lang-en.js
@@ -73,7 +73,7 @@ module.exports = {
   wsLoginError: 'WS login failed as',
   wsLoginErrRecon: 'WS could not be opened and will try again in 5 seconds',
   wsLoginSuccess: 'WS login successful',
-  wsLogin406: 'WS login failed [406] please see http://bit.ly/hb-ewelink-err-406',
+  wsLogin406: 'WS login failed [406] please see http://bit.ly/hb-ewelink-errors',
   wsPingError: 'Cound not send WS ping as',
   wsRec: 'WS message received',
   wsReconnectClose: 'WS close event and will try to reconnect in 5 seconds',

From 55db28e3ed414e01bd78f348ab23fcde5f28b813 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 11 Apr 2021 17:51:38 +0100
Subject: [PATCH 1839/3183] allow doorbell to be configured as any sensor

---
 lib/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/index.js b/lib/index.js
index 95054de4..c874dbb9 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1018,7 +1018,7 @@ class eWeLinkPlatform {
           } else if (subDevice.type === '5') {
             subType = 'curtain'
           } else if (['6', '7'].includes(subDevice.type)) {
-            subType = this.rfDevices[fullDeviceId] && subDevice.type === '6'
+            subType = this.rfDevices[fullDeviceId]
               ? this.rfDevices[fullDeviceId].type
               : 'motion'
             sensorTimeLength = this.rfDevices[fullDeviceId] &&

From 5bf87d6e745b6e3c1ed9eed467a46fd114355899 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 11 Apr 2021 17:55:51 +0100
Subject: [PATCH 1840/3183] refactor rf subtypes to switch

---
 lib/index.js | 51 ++++++++++++++++++++++++++++++---------------------
 1 file changed, 30 insertions(+), 21 deletions(-)

diff --git a/lib/index.js b/lib/index.js
index c874dbb9..afe618d6 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1013,27 +1013,36 @@ class eWeLinkPlatform {
             : this.config.disableDeviceLogging
 
           // Check which eWeLink type the connected sub device is
-          if (['1', '2', '3', '4'].includes(subDevice.type)) {
-            subType = 'button'
-          } else if (subDevice.type === '5') {
-            subType = 'curtain'
-          } else if (['6', '7'].includes(subDevice.type)) {
-            subType = this.rfDevices[fullDeviceId]
-              ? this.rfDevices[fullDeviceId].type
-              : 'motion'
-            sensorTimeLength = this.rfDevices[fullDeviceId] &&
-              this.rfDevices[fullDeviceId].sensorTimeLength
-              ? this.rfDevices[fullDeviceId].sensorTimeLength
-              : this.consts.defaultValues.sensorTimeLength
-            sensorTimeDiff = this.rfDevices[fullDeviceId] &&
-              this.rfDevices[fullDeviceId].sensorTimeDifference
-              ? this.rfDevices[fullDeviceId].sensorTimeDifference
-              : this.consts.defaultValues.sensorTimeDifference
-          } else {
-            this.log.warn('[%s] %s:', device.name, this.messages.devNotSupYet)
-            const params = JSON.stringify(device.params)
-            this.log.warn('[%s-%s] %s', device.extra.uiid, subDevice.type || '?', params)
-            return
+          switch (subDevice.type) {
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+              subType = 'button'
+              break
+            case '5':
+              subType = 'curtain'
+              break
+            case '6':
+            case '7':
+              subType = this.rfDevices[fullDeviceId]
+                ? this.rfDevices[fullDeviceId].type
+                : 'motion'
+              sensorTimeLength = this.rfDevices[fullDeviceId] &&
+                this.rfDevices[fullDeviceId].sensorTimeLength
+                ? this.rfDevices[fullDeviceId].sensorTimeLength
+                : this.consts.defaultValues.sensorTimeLength
+              sensorTimeDiff = this.rfDevices[fullDeviceId] &&
+                this.rfDevices[fullDeviceId].sensorTimeDifference
+                ? this.rfDevices[fullDeviceId].sensorTimeDifference
+                : this.consts.defaultValues.sensorTimeDifference
+              break
+            default: {
+              this.log.warn('[%s] %s:', device.name, this.messages.devNotSupYet)
+              const params = JSON.stringify(device.params)
+              this.log.warn('[%s-%s] %s', device.extra.uiid, subDevice.type || '?', params)
+              return
+            }
           }
 
           // Create an object to save to the sub accessory context

From 8f632cfec4d1ed1657a1fc1ba865f5fe142bc619 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 11 Apr 2021 17:56:57 +0100
Subject: [PATCH 1841/3183] shorten for line length

---
 lib/index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/index.js b/lib/index.js
index afe618d6..340b3337 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1039,8 +1039,8 @@ class eWeLinkPlatform {
               break
             default: {
               this.log.warn('[%s] %s:', device.name, this.messages.devNotSupYet)
-              const params = JSON.stringify(device.params)
-              this.log.warn('[%s-%s] %s', device.extra.uiid, subDevice.type || '?', params)
+              const data = JSON.stringify(device.params)
+              this.log.warn('[%s-%s] %s', device.extra.uiid, subDevice.type || '?', data)
               return
             }
           }

From 9920a0f8e5301cb2df6315b8236cf56a628894a8 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 11 Apr 2021 18:01:05 +0100
Subject: [PATCH 1842/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5e6d8f94..19b5caf5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,13 +6,15 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 ### Added
 
-* Support for doorbell model SA-026 (exposed as a motion sensor)
+* Support for doorbell model SA-026 (can be exposed as any sensor type as per other RF sensors)
+* Updated plugin-ui 'Support' page links to match GitHub readme file
 
 ### Changes
 
 * Improvements to RF Bridge:
   * No more characteristic warnings for `LastActivation` for motion and contact sensors
   * Removed logs for 'not triggered' if device has since been triggered again
+* Fixed the interval time length for calculating total energy consumption for relevant devices
 
 ## 6.0.3 (2021-04-08)
 

From 9f53c1f8b05ea66e4a696c669fa553e74da607e2 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 11 Apr 2021 18:01:43 +0100
Subject: [PATCH 1843/3183] 6.1.0-beta.1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index a6072a48..e49b5248 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.1.0-beta.0",
+  "version": "6.1.0-beta.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 01e127fb..752f6431 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.1.0-beta.0",
+  "version": "6.1.0-beta.1",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 86f36da7d6938a9cc96924e8e2ae9e9ecaeb5dea Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 12 Apr 2021 08:18:55 +0100
Subject: [PATCH 1844/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 19b5caf5..6febd66c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 All notable changes to this homebridge-ewelink will be documented in this file.
 
-## BETA
+## 6.1.0 (2021-04-12)
 
 ### Added
 

From 2de52b051002bab7693dbdfc842fd4cfb5eddd4c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 12 Apr 2021 08:19:21 +0100
Subject: [PATCH 1845/3183] 6.1.0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index e49b5248..824aea13 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.1.0-beta.1",
+  "version": "6.1.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 752f6431..05b5e0bf 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.1.0-beta.1",
+  "version": "6.1.0",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From f99b25fc622a85fd5507d1fb598a0011f0fccd00 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 12 Apr 2021 20:36:56 +0100
Subject: [PATCH 1846/3183] await ctemp update

---
 lib/device/light-cct.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/device/light-cct.js b/lib/device/light-cct.js
index c51500bb..1673063b 100644
--- a/lib/device/light-cct.js
+++ b/lib/device/light-cct.js
@@ -68,7 +68,7 @@ module.exports = class deviceLightCCT {
 
     // Add the set handler to the lightbulb colour temperature characteristic
     this.service.getCharacteristic(this.hapChar.ColorTemperature).onSet(async value => {
-      this.internalCTempUpdate(value)
+      await this.internalCTempUpdate(value)
     })
 
     // This is needed as sometimes we need to send the brightness with a cct update

From f5b5f60e6b8d02a2e695f9b58ef1ed925a84b098 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 12 Apr 2021 20:39:30 +0100
Subject: [PATCH 1847/3183] await ctemp update

---
 lib/device/zigbee/light-cct.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/device/zigbee/light-cct.js b/lib/device/zigbee/light-cct.js
index 86fac952..e6ef214a 100644
--- a/lib/device/zigbee/light-cct.js
+++ b/lib/device/zigbee/light-cct.js
@@ -61,7 +61,7 @@ module.exports = class deviceZBLightCCT {
 
     // Add the set handler to the lightbulb colour temperature characteristic
     this.service.getCharacteristic(this.hapChar.ColorTemperature).onSet(async value => {
-      this.internalCTempUpdate(value)
+      await this.internalCTempUpdate(value)
     })
 
     // This is needed as sometimes we need to send the brightness with a cct update

From e6eef420dd2c917b8904bdac03baa1cad29748e6 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 13 Apr 2021 07:43:09 +0100
Subject: [PATCH 1848/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6febd66c..f81a9a6b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 All notable changes to this homebridge-ewelink will be documented in this file.
 
+## 6.1.1 (2021-04-13)
+
+### Changes
+
+* Fixed an unhandled rejection error when controlling certain CCT bulbs
+
 ## 6.1.0 (2021-04-12)
 
 ### Added

From 480613a1454e563864e10fddf9eb40b675588826 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 13 Apr 2021 07:43:42 +0100
Subject: [PATCH 1849/3183] 6.1.1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 824aea13..4c306355 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.1.0",
+  "version": "6.1.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 05b5e0bf..93178b0e 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.1.0",
+  "version": "6.1.1",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From b1c482df55b898862fa74bc0f35fd8d77dc177d1 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 14 Apr 2021 07:50:28 +0100
Subject: [PATCH 1850/3183] remove service if exists

---
 lib/device/sensor-ambient.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/device/sensor-ambient.js b/lib/device/sensor-ambient.js
index 5d26e74c..4d05fdb7 100644
--- a/lib/device/sensor-ambient.js
+++ b/lib/device/sensor-ambient.js
@@ -61,7 +61,13 @@ module.exports = class deviceSensorAmbient {
     })
 
     // The DS18B20 sensor does not provide humidity readings
-    if (this.accessory.context.sensorType !== 'DS18B20') {
+    if (this.accessory.context.sensorType === 'DS18B20') {
+      if (this.accessory.getService(this.hapServ.HumiditySensor)) {
+        this.accessory.removeService(
+          this.accessory.getService(this.hapServ.HumiditySensor)
+        )
+      }
+    } else {
       // Add the humidity sensor service if it doesn't already exist
       this.humiService = this.accessory.getService(this.hapServ.HumiditySensor) ||
         this.accessory.addService(this.hapServ.HumiditySensor)

From 8566ac5d3b7ff7c21cf910f01c55529977f1d12a Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 14 Apr 2021 07:50:34 +0100
Subject: [PATCH 1851/3183] formatting

---
 lib/device/sensor-ambient.js        | 6 ++++--
 lib/device/simulation/thermostat.js | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/lib/device/sensor-ambient.js b/lib/device/sensor-ambient.js
index 4d05fdb7..ad621867 100644
--- a/lib/device/sensor-ambient.js
+++ b/lib/device/sensor-ambient.js
@@ -153,8 +153,10 @@ module.exports = class deviceSensorAmbient {
         eveLog.humidity = currentHumi
         if (this.cacheHumi !== currentHumi) {
           this.cacheHumi = currentHumi
-          this.humiService
-            .updateCharacteristic(this.hapChar.CurrentRelativeHumidity, this.cacheHumi)
+          this.humiService.updateCharacteristic(
+            this.hapChar.CurrentRelativeHumidity,
+            this.cacheHumi
+          )
           if (params.updateSource && !this.disableDeviceLogging) {
             this.log('[%s] current humidity [%s%].', this.name, this.cacheHumi)
           }
diff --git a/lib/device/simulation/thermostat.js b/lib/device/simulation/thermostat.js
index 2cfb2fbc..443c1b6b 100644
--- a/lib/device/simulation/thermostat.js
+++ b/lib/device/simulation/thermostat.js
@@ -257,8 +257,10 @@ module.exports = class deviceThermostat {
         const currentHumi = parseInt(params.currentHumidity)
         if (this.cacheHumi !== currentHumi) {
           this.cacheHumi = currentHumi
-          this.service
-            .updateCharacteristic(this.hapChar.CurrentRelativeHumidity, this.cacheHumi)
+          this.service.updateCharacteristic(
+            this.hapChar.CurrentRelativeHumidity,
+            this.cacheHumi
+          )
           this.accessory.eveService.addEntry({ humidity: currentHumi })
           if (params.updateSource && !this.disableDeviceLogging) {
             this.log('[%s] current humidity [%s%].', this.name, this.cacheHumi)

From 1a5b43948faf276cc226c0a8ffc04dd37c04da6f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 14 Apr 2021 08:07:45 +0100
Subject: [PATCH 1852/3183] 6.1.2-beta.0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 4c306355..416954f9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.1.1",
+  "version": "6.1.2-beta.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 93178b0e..356b0947 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.1.1",
+  "version": "6.1.2-beta.0",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From c620397a646a4167d77b168adced5c1ea80bea4a Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 14 Apr 2021 08:20:52 +0100
Subject: [PATCH 1853/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f81a9a6b..7ed44d64 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 All notable changes to this homebridge-ewelink will be documented in this file.
 
+## BETA
+
+### Changes
+
+* Remove any existing humidity sensor for TH10/16 if DS18B20 sensor is used
+
 ## 6.1.1 (2021-04-13)
 
 ### Changes

From d8fbf0c4db7b026e8c5fd29c73417f72e066f243 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 14 Apr 2021 09:53:34 +0100
Subject: [PATCH 1854/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7ed44d64..4b3880f4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 All notable changes to this homebridge-ewelink will be documented in this file.
 
-## BETA
+## 6.1.2 (2021-04-14)
 
 ### Changes
 

From b89029a64de9e3c526bc2fd2aefbba8dcdf8e1c9 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 14 Apr 2021 09:54:14 +0100
Subject: [PATCH 1855/3183] 6.1.2

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 416954f9..64fcfc09 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.1.2-beta.0",
+  "version": "6.1.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 356b0947..8d613c2b 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.1.2-beta.0",
+  "version": "6.1.2",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From aba518a720223db018af5a7a57ce2c7df14cb160 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 14 Apr 2021 11:50:56 +0100
Subject: [PATCH 1856/3183] log to restart hb on rf button not found

---
 lib/device/rf-bridge.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/device/rf-bridge.js b/lib/device/rf-bridge.js
index cf8446bf..1b0a1ba1 100644
--- a/lib/device/rf-bridge.js
+++ b/lib/device/rf-bridge.js
@@ -166,7 +166,7 @@ module.exports = class deviceRFBridge {
           oAccessory.getService(oAccessory.context.buttons[params.rfChl])
             .updateCharacteristic(this.hapChar.On, 0)
         } else {
-          throw new Error('rf button not found in Homebridge')
+          throw new Error('rf button not found (please restart Homebridge)')
         }
       } else if (this.funcs.hasProperty(params, 'cmd') && params.cmd === 'trigger') {
         //* ** RF Sensor ***\\

From 8d536535c4aee79147e936fbc97b87dbfe190217 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 15 Apr 2021 09:39:06 +0100
Subject: [PATCH 1857/3183] explicit 504 error response

---
 lib/connection/ws.js | 15 +++++----------
 lib/utils/lang-en.js |  3 ++-
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/lib/connection/ws.js b/lib/connection/ws.js
index 11931285..c47139f5 100644
--- a/lib/connection/ws.js
+++ b/lib/connection/ws.js
@@ -192,13 +192,6 @@ module.exports = class connectionWS {
           msg.action = 'update'
           // Set the online status of the device
           onlineStatus = msg.error === 0
-
-          // Check if the device has reported an error
-          if (msg.error !== 0) {
-            const str = JSON.stringify(msg, null, 2)
-            const redacted = str.replace(this.apiKey, '**hidden**')
-            this.log.warn('[%s] %s.\n%s', msg.deviceid, this.messages.wsRec, redacted)
-          }
         }
 
         // Normally the WS messages comes with an action
@@ -209,7 +202,7 @@ module.exports = class connectionWS {
             case 'sysmsg': {
               if (
                 msg.action === 'sysmsg' &&
-              this.funcs.hasProperty(msg.params, 'online')
+                this.funcs.hasProperty(msg.params, 'online')
               ) {
               // Update the online/offline status provided in the message
                 onlineStatus = msg.params.online
@@ -323,16 +316,18 @@ module.exports = class connectionWS {
         const res = await this.wsClient.sendRequest(toSend, { requestId: sequence })
 
         // Parse the response and see if any error has been reported back
-        res.error = this.funcs.hasProperty(res, 'error') ? res.error : 504
+        res.error = this.funcs.hasProperty(res, 'error') ? res.error : -1
 
         // Check if and which error has been reported back
         switch (res.error) {
           case 0:
             // No error is always what is wanted
             return
+          case 504:
+            throw new Error(this.messages.wsReqTimeout + ' [504]')
           default:
             // An error has occurred
-            throw new Error(this.messages.wsUnkRes)
+            throw new Error(this.messages.wsUnkRes + ' [' + res.error + ']')
         }
       } catch (err) {
         // Catch any errors sending the device update
diff --git a/lib/utils/lang-en.js b/lib/utils/lang-en.js
index 5a94ccd2..c26404e1 100644
--- a/lib/utils/lang-en.js
+++ b/lib/utils/lang-en.js
@@ -81,10 +81,11 @@ module.exports = {
   wsRef: 'Refreshing WS connection',
   wsRefFail: 'Refreshing WS connection failed as',
   wsRequired: 'update must be sent this way',
+  wsReqTimeout: 'request timeout',
   wsResend: 'Request will be sent when WS has reconnected',
   wsUnkAct: 'WS message received has unknown action',
   wsUnkCmd: 'WS unknown command received',
-  wsUnkRes: 'Unknown WS response',
+  wsUnkRes: 'unknown WS response',
   zWelcome: [
     "Don't forget to ☆ this plugin on GitHub if you're finding it useful!",
     'Have a feature request? Visit http://bit.ly/hb-ewelink-issues to ask!',

From 664d587ca4a874598e6c8909f09ea1a019f01cd3 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 15 Apr 2021 09:39:22 +0100
Subject: [PATCH 1858/3183] log if no rf accessory found

---
 lib/device/rf-bridge.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/device/rf-bridge.js b/lib/device/rf-bridge.js
index 1b0a1ba1..8a3c3a50 100644
--- a/lib/device/rf-bridge.js
+++ b/lib/device/rf-bridge.js
@@ -250,6 +250,12 @@ module.exports = class deviceRFBridge {
                   this.log('[%s] current state [not triggered]', oAccessory.displayName)
                 }
               }
+            } else {
+              this.log.warn(
+                '[%s] no accessory found for [%s], please try restarting Homebridge.',
+                this.name,
+                chan
+              )
             }
           })
       }

From 7d1cd7964703d0cd54fe555f7edbe5c14b896fd0 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 15 Apr 2021 11:40:07 +0100
Subject: [PATCH 1859/3183] rf bridge lan mode

---
 lib/connection/lan.js   |  4 ++++
 lib/device/rf-bridge.js | 28 +++++++++++++++++++++++-----
 lib/utils/constants.js  |  4 ++--
 3 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/lib/connection/lan.js b/lib/connection/lan.js
index 4c1f7727..9e9238d9 100644
--- a/lib/connection/lan.js
+++ b/lib/connection/lan.js
@@ -181,6 +181,10 @@ module.exports = class connectionLAN {
       } else if (json.params.switch) {
         params.switch = json.params.switch
         suffix = 'switch'
+      } else if (json.params.cmd) {
+        params.cmd = 'transmit'
+        params.rfChl = json.params.rfChl
+        suffix = 'transmit'
       } else {
         throw new Error(this.messages.devNotConfLAN)
       }
diff --git a/lib/device/rf-bridge.js b/lib/device/rf-bridge.js
index 8a3c3a50..a1c20d8a 100644
--- a/lib/device/rf-bridge.js
+++ b/lib/device/rf-bridge.js
@@ -123,6 +123,7 @@ module.exports = class deviceRFBridge {
         rfChl: parseInt(rfChl)
       }
       await this.platform.sendDeviceUpdate(this.accessory, params)
+      this.log('[%s] current state [button triggered].', this.name)
       setTimeout(() => {
         this.accessory.getService(service).updateCharacteristic(this.hapChar.On, false)
       }, 1000)
@@ -160,7 +161,7 @@ module.exports = class deviceRFBridge {
           oAccessory.getService(oAccessory.context.buttons[params.rfChl])
             .updateCharacteristic(this.hapChar.On, 1)
           if (params.updateSource && !oAccessory.context.disableDeviceLogging) {
-            this.log('[%s] current state [button triggered]', oAccessory.displayName)
+            this.log('[%s] current state [button triggered].', oAccessory.displayName)
           }
           this.funcs.sleep(3000)
           oAccessory.getService(oAccessory.context.buttons[params.rfChl])
@@ -168,7 +169,10 @@ module.exports = class deviceRFBridge {
         } else {
           throw new Error('rf button not found (please restart Homebridge)')
         }
-      } else if (this.funcs.hasProperty(params, 'cmd') && params.cmd === 'trigger') {
+      } else if (
+        (this.funcs.hasProperty(params, 'cmd') && params.cmd === 'trigger') ||
+        params.updateSource === 'LAN'
+      ) {
         //* ** RF Sensor ***\\
         Object.keys(params)
           .filter(name => /rfTrig/.test(name))
@@ -183,13 +187,27 @@ module.exports = class deviceRFBridge {
               }
             })
             if (oAccessory) {
+              // Avoid duplicate triggers from LAN and WS
+              if (params[chan] === oAccessory.context.cacheLastAct) {
+                return
+              }
+
+              oAccessory.context.cacheLastAct = params[chan]
               const timeOfMotion = new Date(params[chan])
               const diff = (timeNow.getTime() - timeOfMotion.getTime()) / 1000
               let serv
               let char
-              if (diff < oAccessory.context.sensorTimeDiff) {
+              if (
+                diff < oAccessory.context.sensorTimeDiff ||
+                ['button', 'curtain'].includes(oAccessory.context.subType)
+              ) {
                 switch (oAccessory.context.subType) {
                   case 'button':
+                  case 'curtain':
+                    this.log(
+                      '[%s] current state [button triggered].',
+                      oAccessory.displayName
+                    )
                     return
                   case 'water':
                     serv = this.hapServ.LeakSensor
@@ -236,7 +254,7 @@ module.exports = class deviceRFBridge {
                 oAccessory.getService(serv).updateCharacteristic(char, 1)
                 oAccessory.eveService.addEntry({ status: 1 })
                 if (params.updateSource && !oAccessory.context.disableDeviceLogging) {
-                  this.log('[%s] current state [triggered]', oAccessory.displayName)
+                  this.log('[%s] current state [triggered].', oAccessory.displayName)
                 }
                 const updateKey = Math.random().toString(36).substr(2, 8)
                 oAccessory.context.updateKey = updateKey
@@ -247,7 +265,7 @@ module.exports = class deviceRFBridge {
                 oAccessory.getService(serv).updateCharacteristic(char, 0)
                 oAccessory.eveService.addEntry({ status: 0 })
                 if (params.updateSource && !oAccessory.context.disableDeviceLogging) {
-                  this.log('[%s] current state [not triggered]', oAccessory.displayName)
+                  this.log('[%s] current state [not triggered].', oAccessory.displayName)
                 }
               }
             } else {
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 53ffbc2d..33a6f5c5 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -101,8 +101,8 @@ module.exports = {
   },
 
   devices: {
-    lanIn: [1, 2, 3, 4, 5, 6, 7, 8, 9, 14, 15, 32, 44, 77, 78, 103, 104, 126],
-    lanOut: [1, 2, 3, 4, 5, 6, 7, 8, 9, 14, 32, 44, 77, 78, 126],
+    lanIn: [1, 2, 3, 4, 5, 6, 7, 8, 9, 14, 15, 28, 32, 44, 77, 78, 103, 104, 126],
+    lanOut: [1, 2, 3, 4, 5, 6, 7, 8, 9, 14, 28, 32, 44, 77, 78, 126],
     markStatus: [1000, 1009, 1256, 1257, 1258, 1770, 2026, 3026],
     singleSwitch: [1, 5, 6, 14, 24, 27],
     multiSwitch: [2, 3, 4, 7, 8, 9, 29, 30, 31, 41, 82, 83, 84, 126],

From f122708a7e8b2ecfabd9364598719aadfe5ad62b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 15 Apr 2021 11:40:56 +0100
Subject: [PATCH 1860/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4b3880f4..40e5de82 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 All notable changes to this homebridge-ewelink will be documented in this file.
 
+## BETA
+
+### Added
+
+* LAN mode for Sonoff RF Bridge
+
 ## 6.1.2 (2021-04-14)
 
 ### Changes

From 827d9b131da29b1989694a4300476342dea6fe56 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 15 Apr 2021 11:41:41 +0100
Subject: [PATCH 1861/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 40e5de82..25fe6b9f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,10 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 * LAN mode for Sonoff RF Bridge
 
+### Changes
+
+* More compact logging for eWeLink 504 error
+
 ## 6.1.2 (2021-04-14)
 
 ### Changes

From 2645961b6070d69c5de2fbf9ff5b6ff125242283 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 15 Apr 2021 11:42:13 +0100
Subject: [PATCH 1862/3183] 6.1.3-beta.0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 64fcfc09..c95fe191 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.1.2",
+  "version": "6.1.3-beta.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 8d613c2b..f2ab1bd5 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.1.2",
+  "version": "6.1.3-beta.0",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From e0fef604f2655aa9f523f0c9c068a66b122f3511 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 15 Apr 2021 14:52:11 +0100
Subject: [PATCH 1863/3183] revert offline zigbee status

---
 lib/device/zigbee/light-cct.js        | 20 ++++----------------
 lib/device/zigbee/light-dimmer.js     | 20 ++++----------------
 lib/device/zigbee/sensor-ambient.js   | 16 +++-------------
 lib/device/zigbee/sensor-contact.js   | 13 -------------
 lib/device/zigbee/sensor-motion.js    | 13 -------------
 lib/device/zigbee/switch-single.js    | 20 ++++----------------
 lib/device/zigbee/switch-stateless.js | 13 -------------
 lib/index.js                          | 10 ----------
 lib/utils/constants.js                |  1 -
 9 files changed, 15 insertions(+), 111 deletions(-)

diff --git a/lib/device/zigbee/light-cct.js b/lib/device/zigbee/light-cct.js
index e6ef214a..20fd3979 100644
--- a/lib/device/zigbee/light-cct.js
+++ b/lib/device/zigbee/light-cct.js
@@ -39,18 +39,10 @@ module.exports = class deviceZBLightCCT {
     this.service = this.accessory.getService(this.hapServ.Lightbulb) ||
       this.accessory.addService(this.hapServ.Lightbulb)
 
-    // Add the get/set handler to the lightbulb on/off characteristic
-    this.service.getCharacteristic(this.hapChar.On)
-      .onGet(() => {
-        if (this.isOnline) {
-          return this.service.getCharacteristic(this.hapChar.On).value
-        } else {
-          throw new this.platform.api.hap.HapStatusError(-70402)
-        }
-      })
-      .onSet(async value => {
-        await this.internalOnOffUpdate(value)
-      })
+    // Add the set handler to the lightbulb on/off characteristic
+    this.service.getCharacteristic(this.hapChar.On).onSet(async value => {
+      await this.internalOnOffUpdate(value)
+    })
 
     // Add the set handler to the lightbulb brightness characteristic
     this.service.getCharacteristic(this.hapChar.Brightness)
@@ -218,8 +210,4 @@ module.exports = class deviceZBLightCCT {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
-
-  markStatus (isOnline) {
-    this.isOnline = isOnline
-  }
 }
diff --git a/lib/device/zigbee/light-dimmer.js b/lib/device/zigbee/light-dimmer.js
index 2ab8ec08..15c23cea 100644
--- a/lib/device/zigbee/light-dimmer.js
+++ b/lib/device/zigbee/light-dimmer.js
@@ -32,18 +32,10 @@ module.exports = class deviceZBLightDimmer {
     this.service = this.accessory.getService(this.hapServ.Lightbulb) ||
       this.accessory.addService(this.hapServ.Lightbulb)
 
-    // Add the get/set handler to the lightbulb on/off characteristic
-    this.service.getCharacteristic(this.hapChar.On)
-      .onGet(() => {
-        if (this.isOnline) {
-          return this.service.getCharacteristic(this.hapChar.On).value
-        } else {
-          throw new this.platform.api.hap.HapStatusError(-70402)
-        }
-      })
-      .onSet(async value => {
-        await this.internalOnOffUpdate(value)
-      })
+    // Add the set handler to the lightbulb on/off characteristic
+    this.service.getCharacteristic(this.hapChar.On).onSet(async value => {
+      await this.internalOnOffUpdate(value)
+    })
 
     // Add the set handler to the lightbulb brightness characteristic
     this.service.getCharacteristic(this.hapChar.Brightness)
@@ -132,8 +124,4 @@ module.exports = class deviceZBLightDimmer {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
-
-  markStatus (isOnline) {
-    this.isOnline = isOnline
-  }
 }
diff --git a/lib/device/zigbee/sensor-ambient.js b/lib/device/zigbee/sensor-ambient.js
index 71efb93e..5ef05c57 100644
--- a/lib/device/zigbee/sensor-ambient.js
+++ b/lib/device/zigbee/sensor-ambient.js
@@ -33,15 +33,9 @@ module.exports = class deviceZBSensorAmbient {
       this.accessory.addService(this.hapServ.TemperatureSensor)
 
     // Add the get handler to the current temperature characteristic
-    this.tService.getCharacteristic(this.hapChar.CurrentTemperature)
-      .setProps({ minStep: 0.1 })
-      .onGet(() => {
-        if (this.isOnline) {
-          return this.tService.getCharacteristic(this.hapChar.CurrentTemperature).value
-        } else {
-          throw new this.platform.api.hap.HapStatusError(-70402)
-        }
-      })
+    this.tService.getCharacteristic(this.hapChar.CurrentTemperature).setProps({
+      minStep: 0.1
+    })
 
     // Add the humidity sensor service if it doesn't already exist
     this.hService = this.accessory.getService(this.hapServ.HumiditySensor) ||
@@ -118,8 +112,4 @@ module.exports = class deviceZBSensorAmbient {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
-
-  markStatus (isOnline) {
-    this.isOnline = isOnline
-  }
 }
diff --git a/lib/device/zigbee/sensor-contact.js b/lib/device/zigbee/sensor-contact.js
index 38c5db12..6df57d51 100644
--- a/lib/device/zigbee/sensor-contact.js
+++ b/lib/device/zigbee/sensor-contact.js
@@ -40,15 +40,6 @@ module.exports = class deviceZBSensorContact {
       this.service.addCharacteristic(this.eveChar.TimesOpened)
     }
 
-    // Add the get handler to the contact sensor state characteristic
-    this.service.getCharacteristic(this.hapChar.ContactSensorState).onGet(() => {
-      if (this.isOnline) {
-        return this.service.getCharacteristic(this.hapChar.ContactSensorState).value
-      } else {
-        throw new this.platform.api.hap.HapStatusError(-70402)
-      }
-    })
-
     // Obtain the current times opened value
     this.timesOpened = this.service.getCharacteristic(this.eveChar.TimesOpened).value
 
@@ -123,8 +114,4 @@ module.exports = class deviceZBSensorContact {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
-
-  markStatus (isOnline) {
-    this.isOnline = isOnline
-  }
 }
diff --git a/lib/device/zigbee/sensor-motion.js b/lib/device/zigbee/sensor-motion.js
index d9dceb29..a2238e46 100644
--- a/lib/device/zigbee/sensor-motion.js
+++ b/lib/device/zigbee/sensor-motion.js
@@ -38,15 +38,6 @@ module.exports = class deviceZBSensorMotion {
       this.service.addCharacteristic(this.eveChar.LastActivation)
     }
 
-    // Add the get handler to the motion detected characteristic
-    this.service.getCharacteristic(this.hapChar.MotionDetected).onGet(() => {
-      if (this.isOnline) {
-        return this.service.getCharacteristic(this.hapChar.MotionDetected).value
-      } else {
-        throw new this.platform.api.hap.HapStatusError(-70402)
-      }
-    })
-
     // Add the battery service if it doesn't already exist
     this.battService = this.accessory.getService(this.hapServ.BatteryService) || this.accessory.addService(this.hapServ.BatteryService)
 
@@ -112,8 +103,4 @@ module.exports = class deviceZBSensorMotion {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
-
-  markStatus (isOnline) {
-    this.isOnline = isOnline
-  }
 }
diff --git a/lib/device/zigbee/switch-single.js b/lib/device/zigbee/switch-single.js
index 7cd451f6..64cd12e5 100644
--- a/lib/device/zigbee/switch-single.js
+++ b/lib/device/zigbee/switch-single.js
@@ -29,18 +29,10 @@ module.exports = class deviceZBSwitchSingle {
     this.service = this.accessory.getService(this.hapServ.Switch) ||
       this.accessory.addService(this.hapServ.Switch)
 
-    // Add the get/set handler to the switch on/off characteristic
-    this.service.getCharacteristic(this.hapChar.On)
-      .onGet(() => {
-        if (this.isOnline) {
-          return this.service.getCharacteristic(this.hapChar.On).value
-        } else {
-          throw new this.platform.api.hap.HapStatusError(-70402)
-        }
-      })
-      .onSet(async value => {
-        await this.internalUpdate(value)
-      })
+    // Add the set handler to the switch on/off characteristic
+    this.service.getCharacteristic(this.hapChar.On).onSet(async value => {
+      await this.internalUpdate(value)
+    })
 
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new this.platform.eveService('switch', this.accessory, {
@@ -89,8 +81,4 @@ module.exports = class deviceZBSwitchSingle {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
-
-  markStatus (isOnline) {
-    this.isOnline = isOnline
-  }
 }
diff --git a/lib/device/zigbee/switch-stateless.js b/lib/device/zigbee/switch-stateless.js
index 269cdb9a..20497814 100644
--- a/lib/device/zigbee/switch-stateless.js
+++ b/lib/device/zigbee/switch-stateless.js
@@ -33,15 +33,6 @@ module.exports = class deviceZBSwitchStateless {
     this.service = this.accessory.getService(this.hapServ.StatelessProgrammableSwitch) ||
       this.accessory.addService(this.hapServ.StatelessProgrammableSwitch)
 
-    // Add the get handler to the state characteristic
-    this.service.getCharacteristic(this.hapChar.ProgrammableSwitchEvent).onGet(() => {
-      if (this.isOnline) {
-        return this.service.getCharacteristic(this.hapChar.ProgrammableSwitchEvent).value
-      } else {
-        throw new this.platform.api.hap.HapStatusError(-70402)
-      }
-    })
-
     // Hide the double and long press options if the user wants
     if (this.hideLongDouble) {
       this.service.getCharacteristic(this.hapChar.ProgrammableSwitchEvent).setProps({
@@ -96,8 +87,4 @@ module.exports = class deviceZBSwitchStateless {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
-
-  markStatus (isOnline) {
-    this.isOnline = isOnline
-  }
 }
diff --git a/lib/index.js b/lib/index.js
index 340b3337..a1674018 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1223,11 +1223,6 @@ class eWeLinkPlatform {
       // Update accessory characteristics with latest values
       if (this.wsClient && accessory.control && accessory.control.externalUpdate) {
         accessory.control.externalUpdate(device.params)
-
-        // Mark the online/offline status of zigbee devices
-        if (this.consts.devices.markStatus.includes(accessory.context.eweUIID)) {
-          accessory.control.markStatus(device.online)
-        }
       }
 
       // Update any changes to the device into our devicesInHB map
@@ -1462,11 +1457,6 @@ class eWeLinkPlatform {
             : this.messages.repOffline
           this.log('[%s] %s %s.', accessory.displayName, status, this.messages.viaWS)
 
-          // Mark the online/offline status of zigbee devices
-          if (this.consts.devices.markStatus.includes(accessory.context.eweUIID)) {
-            accessory.control.markStatus(device.params.online)
-          }
-
           // Try and request an update through WS if the device has come back online
           if (accessory.context.reachableWAN && this.wsClient) {
             try {
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 33a6f5c5..cb80ff1a 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -103,7 +103,6 @@ module.exports = {
   devices: {
     lanIn: [1, 2, 3, 4, 5, 6, 7, 8, 9, 14, 15, 28, 32, 44, 77, 78, 103, 104, 126],
     lanOut: [1, 2, 3, 4, 5, 6, 7, 8, 9, 14, 28, 32, 44, 77, 78, 126],
-    markStatus: [1000, 1009, 1256, 1257, 1258, 1770, 2026, 3026],
     singleSwitch: [1, 5, 6, 14, 24, 27],
     multiSwitch: [2, 3, 4, 7, 8, 9, 29, 30, 31, 41, 82, 83, 84, 126],
     singleSwitchOutlet: ['Sonoff Pow', 'S20', 'S26', 'S26R1', 'S55', 'S55R1'],

From c26911d1a78cec46a0881b7c585d20a69f090668 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 15 Apr 2021 15:37:55 +0100
Subject: [PATCH 1864/3183] recover from cache from uuid

---
 lib/device/sensor-contact.js              |   3 +-
 lib/device/simulation/garage-od-switch.js |   3 +-
 lib/device/simulation/garage-one.js       |   7 +-
 lib/device/switch-double.js               |  20 ++-
 lib/device/switch-multi.js                |  20 ++-
 lib/index.js                              | 210 +++++++++++-----------
 6 files changed, 140 insertions(+), 123 deletions(-)

diff --git a/lib/device/sensor-contact.js b/lib/device/sensor-contact.js
index 7f10e8c1..8f21c765 100644
--- a/lib/device/sensor-contact.js
+++ b/lib/device/sensor-contact.js
@@ -121,7 +121,8 @@ module.exports = class deviceSensorContact {
           group.sensorId === this.accessory.context.eweDeviceId &&
           group.type === 'garage'
         ) {
-          if ((oAccessory = this.platform.devicesInHB.get(deviceId + 'SWX'))) {
+          const uuid = this.platform.api.hap.uuid.generate(deviceId + 'SWX')
+          if ((oAccessory = this.platform.devicesInHB.get(uuid))) {
             const gdService = oAccessory.getService(this.hapServ.GarageDoorOpener)
             switch (newState) {
               case 0:
diff --git a/lib/device/simulation/garage-od-switch.js b/lib/device/simulation/garage-od-switch.js
index dcbd237e..7d13edee 100644
--- a/lib/device/simulation/garage-od-switch.js
+++ b/lib/device/simulation/garage-od-switch.js
@@ -20,7 +20,8 @@ module.exports = class deviceGarageODSwitch {
 
     // Set up custom variables for this device type
     this.garageId = platform.obstructSwitches[this.accessory.context.eweDeviceId]
-    this.garage = platform.devicesInHB.get(this.garageId + 'SWX')
+    const uuid = this.platform.api.hap.uuid.generate(this.garageId + 'SWX')
+    this.garage = platform.devicesInHB.get(uuid)
     this.disableDeviceLogging = platform.simulations[this.garageId] &&
       platform.simulations[this.garageId].overrideDisabledLogging
       ? false
diff --git a/lib/device/simulation/garage-one.js b/lib/device/simulation/garage-one.js
index 11e890d7..1b2068e8 100644
--- a/lib/device/simulation/garage-one.js
+++ b/lib/device/simulation/garage-one.js
@@ -44,15 +44,16 @@ module.exports = class deviceGarageOne {
     // Check the sensor is valid if defined by the user
     if (deviceConf.sensorId) {
       // Check the sensor exists in Homebridge
-      if (!platform.devicesInHB.has(deviceConf.sensorId + 'SWX')) {
+      const uuid = this.platform.api.hap.uuid.generate(deviceConf.sensorId + 'SWX')
+      if (!platform.devicesInHB.has(uuid)) {
         this.error = 'defined sensor does not exist in Homebridge'
       }
 
       // Check the sensor is a sensor
-      if (platform.devicesInHB.get(deviceConf.sensorId + 'SWX').context.eweUIID !== 102) {
+      if (platform.devicesInHB.get(uuid).context.eweUIID !== 102) {
         this.error = 'defined sensor is not a DW2 sensor'
       }
-      this.definedSensor = this.platform.devicesInHB.get(deviceConf.sensorId + 'SWX')
+      this.definedSensor = this.platform.devicesInHB.get(uuid)
 
       // Check the sensor has the ContactSensor service
       if (!this.definedSensor.getService(this.hapServ.ContactSensor)) {
diff --git a/lib/device/switch-double.js b/lib/device/switch-double.js
index 7cf5869a..5da4e675 100644
--- a/lib/device/switch-double.js
+++ b/lib/device/switch-double.js
@@ -83,7 +83,8 @@ module.exports = class deviceSwitchMulti {
         case '2':
           for (let i = 1; i <= this.accessory.context.channelCount; i++) {
             const idToCheck = this.accessory.context.eweDeviceId + 'SW' + i
-            if ((oAccessory = this.platform.devicesInHB.get(idToCheck))) {
+            const uuid = this.platform.api.hap.uuid.generate(idToCheck)
+            if ((oAccessory = this.platform.devicesInHB.get(uuid))) {
               if (i === parseInt(this.accessory.context.switchNumber)) {
                 params.switches[i - 1].switch = value ? 'on' : 'off'
               } else {
@@ -100,7 +101,8 @@ module.exports = class deviceSwitchMulti {
         case '0':
           for (let i = 0; i <= this.accessory.context.channelCount; i++) {
             const idToCheck = this.accessory.context.eweDeviceId + 'SW' + i
-            if ((oAccessory = this.platform.devicesInHB.get(idToCheck))) {
+            const uuid = this.platform.api.hap.uuid.generate(idToCheck)
+            if ((oAccessory = this.platform.devicesInHB.get(uuid))) {
               if (this.showAsOutlet) {
                 oAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
                   this.hapChar.On,
@@ -129,7 +131,8 @@ module.exports = class deviceSwitchMulti {
         case '2':
           for (let i = 1; i <= this.accessory.context.channelCount; i++) {
             const idToCheck = this.accessory.context.eweDeviceId + 'SW' + i
-            if ((oAccessory = this.platform.devicesInHB.get(idToCheck))) {
+            const uuid = this.platform.api.hap.uuid.generate(idToCheck)
+            if ((oAccessory = this.platform.devicesInHB.get(uuid))) {
               const serv = this.showAsOutlet
                 ? this.hapServ.Outlet
                 : this.hapServ.Switch
@@ -156,9 +159,9 @@ module.exports = class deviceSwitchMulti {
             }
           }
           if (!this.platform.hideMasters.includes(this.accessory.context.eweDeviceId)) {
-            oAccessory = this.platform.devicesInHB.get(
-              this.accessory.context.eweDeviceId + 'SW0'
-            )
+            const idToCheck = this.accessory.context.eweDeviceId + 'SW0'
+            const uuid = this.platform.api.hap.uuid.generate(idToCheck)
+            oAccessory = this.platform.devicesInHB.get(uuid)
             if (this.showAsOutlet) {
               oAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
                 this.hapChar.On,
@@ -198,8 +201,9 @@ module.exports = class deviceSwitchMulti {
         if (params.switches[i - 1].switch === 'on') {
           primaryState = true
         }
-        if (this.platform.devicesInHB.has(idToCheck + i)) {
-          const oAccessory = this.platform.devicesInHB.get(idToCheck + i)
+        const uuid = this.platform.api.hap.uuid.generate(idToCheck + i)
+        if (this.platform.devicesInHB.has(uuid)) {
+          const oAccessory = this.platform.devicesInHB.get(uuid)
           if (
             params.updateSource &&
             params.switches[i - 1].switch === oAccessory.context.cacheOnOff
diff --git a/lib/device/switch-multi.js b/lib/device/switch-multi.js
index 868ee309..2c067fa6 100644
--- a/lib/device/switch-multi.js
+++ b/lib/device/switch-multi.js
@@ -87,7 +87,8 @@ module.exports = class deviceSwitchMulti {
         case '4':
           for (let i = 1; i <= this.accessory.context.channelCount; i++) {
             const idToCheck = this.accessory.context.eweDeviceId + 'SW' + i
-            if ((oAccessory = this.platform.devicesInHB.get(idToCheck))) {
+            const uuid = this.platform.api.hap.uuid.generate(idToCheck)
+            if ((oAccessory = this.platform.devicesInHB.get(uuid))) {
               if (i === parseInt(this.accessory.context.switchNumber)) {
                 params.switches[i - 1].switch = value ? 'on' : 'off'
               } else {
@@ -104,7 +105,8 @@ module.exports = class deviceSwitchMulti {
         case '0':
           for (let i = 0; i <= this.accessory.context.channelCount; i++) {
             const idToCheck = this.accessory.context.eweDeviceId + 'SW' + i
-            if ((oAccessory = this.platform.devicesInHB.get(idToCheck))) {
+            const uuid = this.platform.api.hap.uuid.generate(idToCheck)
+            if ((oAccessory = this.platform.devicesInHB.get(uuid))) {
               if (this.showAsOutlet) {
                 oAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
                   this.hapChar.On,
@@ -135,7 +137,8 @@ module.exports = class deviceSwitchMulti {
         case '4':
           for (let i = 1; i <= this.accessory.context.channelCount; i++) {
             const idToCheck = this.accessory.context.eweDeviceId + 'SW' + i
-            if ((oAccessory = this.platform.devicesInHB.get(idToCheck))) {
+            const uuid = this.platform.api.hap.uuid.generate(idToCheck)
+            if ((oAccessory = this.platform.devicesInHB.get(uuid))) {
               const serv = this.showAsOutlet
                 ? this.hapServ.Outlet
                 : this.hapServ.Switch
@@ -162,9 +165,9 @@ module.exports = class deviceSwitchMulti {
             }
           }
           if (!this.platform.hideMasters.includes(this.accessory.context.eweDeviceId)) {
-            oAccessory = this.platform.devicesInHB.get(
-              this.accessory.context.eweDeviceId + 'SW0'
-            )
+            const idToCheck = this.accessory.context.eweDeviceId + 'SW0'
+            const uuid = this.platform.api.hap.uuid.generate(idToCheck)
+            oAccessory = this.platform.devicesInHB.get(uuid)
             if (this.showAsOutlet) {
               oAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
                 this.hapChar.On,
@@ -204,8 +207,9 @@ module.exports = class deviceSwitchMulti {
         if (params.switches[i - 1].switch === 'on') {
           primaryState = true
         }
-        if (this.platform.devicesInHB.has(idToCheck + i)) {
-          const oAccessory = this.platform.devicesInHB.get(idToCheck + i)
+        const uuid = this.platform.api.hap.uuid.generate(idToCheck + i)
+        if (this.platform.devicesInHB.has(uuid)) {
+          const oAccessory = this.platform.devicesInHB.get(uuid)
           if (
             params.updateSource &&
             params.switches[i - 1].switch === oAccessory.context.cacheOnOff
diff --git a/lib/index.js b/lib/index.js
index a1674018..2949b9d8 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -550,12 +550,14 @@ class eWeLinkPlatform {
   initialiseDevice (device) {
     let accessory
     let oAccessory
+    const uuid = this.api.hap.uuid.generate(device.deviceid + 'SWX')
     try {
       // Remove old sub accessories for Accessory Simulations
       if (this.simulations[device.deviceid]) {
         for (let i = 0; i <= 4; i++) {
-          if (this.devicesInHB.has(device.deviceid + 'SW' + i)) {
-            this.removeAccessory(this.devicesInHB.get(device.deviceid + 'SW' + i))
+          const uuidsub = this.api.hap.uuid.generate(device.deviceid + 'SW' + i)
+          if (this.devicesInHB.has(uuidsub)) {
+            this.removeAccessory(this.devicesInHB.get(uuidsub))
           }
         }
       }
@@ -565,8 +567,8 @@ class eWeLinkPlatform {
         /***********************
         BLINDS [EWELINK UIID 11]
         ***********************/
-        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
-          ? this.devicesInHB.get(device.deviceid + 'SWX')
+        accessory = this.devicesInHB.has(uuid)
+          ? this.devicesInHB.get(uuid)
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/curtain'))(this, accessory)
         /**********************/
@@ -577,8 +579,8 @@ class eWeLinkPlatform {
         /****************************
         BLINDS [ACCESSORY SIMULATION]
         ****************************/
-        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
-          ? this.devicesInHB.get(device.deviceid + 'SWX')
+        accessory = this.devicesInHB.has(uuid)
+          ? this.devicesInHB.get(uuid)
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/simulation/blind'))(this, accessory)
         /***************************/
@@ -589,8 +591,8 @@ class eWeLinkPlatform {
         /***************************
         DOORS [ACCESSORY SIMULATION]
         ***************************/
-        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
-          ? this.devicesInHB.get(device.deviceid + 'SWX')
+        accessory = this.devicesInHB.has(uuid)
+          ? this.devicesInHB.get(uuid)
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/simulation/door'))(this, accessory)
         /**************************/
@@ -601,8 +603,8 @@ class eWeLinkPlatform {
         /*****************************
         WINDOWS [ACCESSORY SIMULATION]
         *****************************/
-        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
-          ? this.devicesInHB.get(device.deviceid + 'SWX')
+        accessory = this.devicesInHB.has(uuid)
+          ? this.devicesInHB.get(uuid)
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/simulation/window'))(this, accessory)
         /****************************/
@@ -622,8 +624,8 @@ class eWeLinkPlatform {
         GARAGE DOORS [ONE] [ACCESSORY SIMULATION]
         ****************************************/
         const instance = './device/simulation/garage-one'
-        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
-          ? this.devicesInHB.get(device.deviceid + 'SWX')
+        accessory = this.devicesInHB.has(uuid)
+          ? this.devicesInHB.get(uuid)
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require(instance))(this, accessory)
         /***************************************/
@@ -635,8 +637,8 @@ class eWeLinkPlatform {
         GARAGE DOORS [TWO] [ACCESSORY SIMULATION]
         ****************************************/
         const instance = './device/simulation/garage-two'
-        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
-          ? this.devicesInHB.get(device.deviceid + 'SWX')
+        accessory = this.devicesInHB.has(uuid)
+          ? this.devicesInHB.get(uuid)
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require(instance))(this, accessory)
         /***************************************/
@@ -648,8 +650,8 @@ class eWeLinkPlatform {
         GARAGE DOORS [FOUR] [ACCESSORY SIMULATION]
         *****************************************/
         const instance = './device/simulation/garage-four'
-        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
-          ? this.devicesInHB.get(device.deviceid + 'SWX')
+        accessory = this.devicesInHB.has(uuid)
+          ? this.devicesInHB.get(uuid)
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require(instance))(this, accessory)
         /****************************************/
@@ -661,8 +663,8 @@ class eWeLinkPlatform {
         GARAGE DOORS [EACHEN GD-DC5]
         ***************************/
         const instance = './device/simulation/garage-eachen'
-        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
-          ? this.devicesInHB.get(device.deviceid + 'SWX')
+        accessory = this.devicesInHB.has(uuid)
+          ? this.devicesInHB.get(uuid)
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require(instance))(this, accessory)
         /**************************/
@@ -673,8 +675,8 @@ class eWeLinkPlatform {
         /***************************
         LOCKS [ACCESSORY SIMULATION]
         ***************************/
-        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
-          ? this.devicesInHB.get(device.deviceid + 'SWX')
+        accessory = this.devicesInHB.has(uuid)
+          ? this.devicesInHB.get(uuid)
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/simulation/lock-one'))(this, accessory)
         /**************************/
@@ -686,8 +688,8 @@ class eWeLinkPlatform {
         SWITCH-VALVE [ACCESSORY SIMULATION]
         **********************************/
         const instance = './device/simulation/switch-valve'
-        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
-          ? this.devicesInHB.get(device.deviceid + 'SWX')
+        accessory = this.devicesInHB.has(uuid)
+          ? this.devicesInHB.get(uuid)
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require(instance))(this, accessory)
         /*********************************/
@@ -698,8 +700,8 @@ class eWeLinkPlatform {
         /********************************
         TAPS [ONE] [ACCESSORY SIMULATION]
         ********************************/
-        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
-          ? this.devicesInHB.get(device.deviceid + 'SWX')
+        accessory = this.devicesInHB.has(uuid)
+          ? this.devicesInHB.get(uuid)
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/simulation/tap-one'))(this, accessory)
         /*******************************/
@@ -710,8 +712,8 @@ class eWeLinkPlatform {
         /********************************
         TAPS [TWO] [ACCESSORY SIMULATION]
         ********************************/
-        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
-          ? this.devicesInHB.get(device.deviceid + 'SWX')
+        accessory = this.devicesInHB.has(uuid)
+          ? this.devicesInHB.get(uuid)
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/simulation/tap-two'))(this, accessory)
         /*******************************/
@@ -723,8 +725,8 @@ class eWeLinkPlatform {
         VALVES [ONE] [ACCESSORY SIMULATION]
         **********************************/
         const instance = './device/simulation/valve-one'
-        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
-          ? this.devicesInHB.get(device.deviceid + 'SWX')
+        accessory = this.devicesInHB.has(uuid)
+          ? this.devicesInHB.get(uuid)
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require(instance))(this, accessory)
         /*********************************/
@@ -736,8 +738,8 @@ class eWeLinkPlatform {
         VALVES [TWO] [ACCESSORY SIMULATION]
         **********************************/
         const instance = './device/simulation/valve-two'
-        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
-          ? this.devicesInHB.get(device.deviceid + 'SWX')
+        accessory = this.devicesInHB.has(uuid)
+          ? this.devicesInHB.get(uuid)
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require(instance))(this, accessory)
         /*********************************/
@@ -749,8 +751,8 @@ class eWeLinkPlatform {
         VALVES [FOUR] [ACCESSORY SIMULATION]
         ***********************************/
         const instance = './device/simulation/valve-four'
-        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
-          ? this.devicesInHB.get(device.deviceid + 'SWX')
+        accessory = this.devicesInHB.has(uuid)
+          ? this.devicesInHB.get(uuid)
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require(instance))(this, accessory)
         /**********************************/
@@ -763,8 +765,8 @@ class eWeLinkPlatform {
         SENSORS [LEAK DW2 ACCESSORY SIMULATION]
         **************************************/
         const instance = './device/simulation/sensor-leak'
-        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
-          ? this.devicesInHB.get(device.deviceid + 'SWX')
+        accessory = this.devicesInHB.has(uuid)
+          ? this.devicesInHB.get(uuid)
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require(instance))(this, accessory)
         /*************************************/
@@ -772,8 +774,8 @@ class eWeLinkPlatform {
         /*******************
         SENSORS [SONOFF DW2]
         *******************/
-        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
-          ? this.devicesInHB.get(device.deviceid + 'SWX')
+        accessory = this.devicesInHB.has(uuid)
+          ? this.devicesInHB.get(uuid)
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/sensor-contact'))(this, accessory)
         /******************/
@@ -781,8 +783,8 @@ class eWeLinkPlatform {
         /***
         FANS
         ***/
-        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
-          ? this.devicesInHB.get(device.deviceid + 'SWX')
+        accessory = this.devicesInHB.has(uuid)
+          ? this.devicesInHB.get(uuid)
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/fan'))(this, accessory)
         /**/
@@ -790,8 +792,8 @@ class eWeLinkPlatform {
         /********
         DIFFUSERS
         ********/
-        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
-          ? this.devicesInHB.get(device.deviceid + 'SWX')
+        accessory = this.devicesInHB.has(uuid)
+          ? this.devicesInHB.get(uuid)
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/diffuser'))(this, accessory)
         /*******/
@@ -799,8 +801,8 @@ class eWeLinkPlatform {
         /**********
         HUMIDIFIERS
         **********/
-        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
-          ? this.devicesInHB.get(device.deviceid + 'SWX')
+        accessory = this.devicesInHB.has(uuid)
+          ? this.devicesInHB.get(uuid)
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/humidifier'))(this, accessory)
         /*********/
@@ -808,8 +810,8 @@ class eWeLinkPlatform {
         /**********
         THERMOSTATS
         **********/
-        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
-          ? this.devicesInHB.get(device.deviceid + 'SWX')
+        accessory = this.devicesInHB.has(uuid)
+          ? this.devicesInHB.get(uuid)
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/thermostat'))(this, accessory)
         /*******/
@@ -822,8 +824,8 @@ class eWeLinkPlatform {
         THERMOSTATS [ACCESSORY SIMULATION]
         *********************************/
         const instance = './device/simulation/thermostat'
-        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
-          ? this.devicesInHB.get(device.deviceid + 'SWX')
+        accessory = this.devicesInHB.has(uuid)
+          ? this.devicesInHB.get(uuid)
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require(instance))(this, accessory)
         /********************************/
@@ -831,8 +833,8 @@ class eWeLinkPlatform {
         /***********************
         SENSOR [AMBIENT-TH10/16]
         ***********************/
-        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
-          ? this.devicesInHB.get(device.deviceid + 'SWX')
+        accessory = this.devicesInHB.has(uuid)
+          ? this.devicesInHB.get(uuid)
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.context.sensorType = device.params.sensorType
         accessory.control = new (require('./device/sensor-ambient'))(this, accessory)
@@ -841,8 +843,8 @@ class eWeLinkPlatform {
         /*************************
         SENSOR [AMBIENT-SONOFF SC]
         *************************/
-        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
-          ? this.devicesInHB.get(device.deviceid + 'SWX')
+        accessory = this.devicesInHB.has(uuid)
+          ? this.devicesInHB.get(uuid)
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/sensor-temp-humi'))(this, accessory)
         /************************/
@@ -856,8 +858,8 @@ class eWeLinkPlatform {
         /******
         OUTLETS
         ******/
-        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
-          ? this.devicesInHB.get(device.deviceid + 'SWX')
+        accessory = this.devicesInHB.has(uuid)
+          ? this.devicesInHB.get(uuid)
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = this.outletDevices[device.deviceid] &&
           this.outletDevices[device.deviceid].showAsSwitch
@@ -868,8 +870,8 @@ class eWeLinkPlatform {
         /*************************************
         OUTLETS [SINGLE BUT MULTIPLE HARDWARE]
         *************************************/
-        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
-          ? this.devicesInHB.get(device.deviceid + 'SWX')
+        accessory = this.devicesInHB.has(uuid)
+          ? this.devicesInHB.get(uuid)
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/outlet-scm'))(this, accessory)
         /************************************/
@@ -877,8 +879,8 @@ class eWeLinkPlatform {
         /***********
         LIGHTS [RGB]
         ***********/
-        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
-          ? this.devicesInHB.get(device.deviceid + 'SWX')
+        accessory = this.devicesInHB.has(uuid)
+          ? this.devicesInHB.get(uuid)
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/light-rgb'))(this, accessory)
         /**********/
@@ -886,8 +888,8 @@ class eWeLinkPlatform {
         /***********
         LIGHTS [CCT]
         ***********/
-        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
-          ? this.devicesInHB.get(device.deviceid + 'SWX')
+        accessory = this.devicesInHB.has(uuid)
+          ? this.devicesInHB.get(uuid)
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/light-cct'))(this, accessory)
         /**********/
@@ -895,8 +897,8 @@ class eWeLinkPlatform {
         /*****************
         LIGHTS [RGB & CCT]
         *****************/
-        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
-          ? this.devicesInHB.get(device.deviceid + 'SWX')
+        accessory = this.devicesInHB.has(uuid)
+          ? this.devicesInHB.get(uuid)
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/light-rgb-cct'))(this, accessory)
         /****************/
@@ -904,8 +906,8 @@ class eWeLinkPlatform {
         /**************
         LIGHTS [DIMMER]
         **************/
-        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
-          ? this.devicesInHB.get(device.deviceid + 'SWX')
+        accessory = this.devicesInHB.has(uuid)
+          ? this.devicesInHB.get(uuid)
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/light-dimmer'))(this, accessory)
         /*************/
@@ -913,8 +915,8 @@ class eWeLinkPlatform {
         /************************
         SWITCHES [SINGLE CHANNEL]
         ************************/
-        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
-          ? this.devicesInHB.get(device.deviceid + 'SWX')
+        accessory = this.devicesInHB.has(uuid)
+          ? this.devicesInHB.get(uuid)
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = this.singleDevices[device.deviceid] &&
           this.singleDevices[device.deviceid].showAsOutlet
@@ -926,11 +928,13 @@ class eWeLinkPlatform {
         SWITCHES [MULTI CHANNEL]
         ***********************/
         for (let i = 0; i <= this.consts.supportedDevices[device.extra.uiid]; i++) {
+          const uuidsub = this.api.hap.uuid.generate(device.deviceid + 'SW' + i)
+
           // Check if the user has chosen to hide any channels for this device
           if (this.hideChannels.includes(device.deviceid + 'SW' + i)) {
             // The user has hidden this channel so if it exists then remove it
-            if (this.devicesInHB.has(device.deviceid + 'SW' + i)) {
-              this.removeAccessory(this.devicesInHB.get(device.deviceid + 'SW' + i))
+            if (this.devicesInHB.has(uuidsub)) {
+              this.removeAccessory(this.devicesInHB.get(uuidsub))
             }
 
             // If this is the main channel then add it to the array of hidden masters
@@ -942,8 +946,8 @@ class eWeLinkPlatform {
             oAccessory = this.addAccessory(device, device.deviceid + 'SW' + i, true)
           } else {
             // The user has not hidden this channel
-            oAccessory = this.devicesInHB.has(device.deviceid + 'SW' + i)
-              ? this.devicesInHB.get(device.deviceid + 'SW' + i)
+            oAccessory = this.devicesInHB.has(uuidsub)
+              ? this.devicesInHB.get(uuidsub)
               : this.addAccessory(device, device.deviceid + 'SW' + i)
           }
 
@@ -968,7 +972,7 @@ class eWeLinkPlatform {
 
           // Update any changes to the sub accessory to the platform
           this.api.updatePlatformAccessories(PLUGIN.name, PLUGIN.alias, [oAccessory])
-          this.devicesInHB.set(oAccessory.context.hbDeviceId, oAccessory)
+          this.devicesInHB.set(oAccessory.UUID, oAccessory)
           if (i === 0) {
             accessory = oAccessory
           }
@@ -991,9 +995,9 @@ class eWeLinkPlatform {
             })
           )
         }
-        accessory = this.devicesInHB.has(device.deviceid + 'SW0')
-          ? this.devicesInHB.get(device.deviceid + 'SW0')
-          : this.addAccessory(device, device.deviceid + 'SW0', true, { rfMap }, 'rf_pri')
+        accessory = this.addAccessory(
+          device, device.deviceid + 'SW0', true, { rfMap }, 'rf_pri'
+        )
         accessory.control = new (require('./device/rf-bridge'))(this, accessory)
 
         // We don't want to add the main bridge as an accessory in Homebridge
@@ -1007,6 +1011,7 @@ class eWeLinkPlatform {
           let sensorTimeDiff
           let subExtraContext = {}
           const fullDeviceId = device.deviceid + 'SW' + swNumber
+          const uuidsub = this.api.hap.uuid.generate(fullDeviceId)
           const disableDeviceLogging = this.rfDevices[fullDeviceId] &&
             this.rfDevices[fullDeviceId].overrideDisabledLogging
             ? false
@@ -1057,7 +1062,7 @@ class eWeLinkPlatform {
           }
 
           // Check if the sub accessory already exists in Homebridge
-          if ((oAccessory = this.devicesInHB.get(fullDeviceId))) {
+          if ((oAccessory = this.devicesInHB.get(uuidsub))) {
             // Check for any changes to user config or types
             if (
               oAccessory.context.subType !== subType ||
@@ -1072,8 +1077,9 @@ class eWeLinkPlatform {
           }
 
           // Get the sub accessory if it's new or hasn't been removed above
-          oAccessory = this.devicesInHB.has(fullDeviceId)
-            ? this.devicesInHB.get(fullDeviceId)
+
+          oAccessory = this.devicesInHB.has(uuidsub)
+            ? this.devicesInHB.get(uuidsub)
             : this.addAccessory(device, fullDeviceId, false, subExtraContext, 'rf_sub')
 
           // Add context information to the sub accessory
@@ -1091,7 +1097,7 @@ class eWeLinkPlatform {
 
           // Update any changes to the sub accessory to the platform
           this.api.updatePlatformAccessories(PLUGIN.name, PLUGIN.alias, [oAccessory])
-          this.devicesInHB.set(oAccessory.context.hbDeviceId, oAccessory)
+          this.devicesInHB.set(oAccessory.UUID, oAccessory)
           oAccessory.control = new (require('./device/rf-bridge'))(this, oAccessory)
           rfChlCounter += Object.keys(subDevice.buttons || {}).length
         })
@@ -1110,8 +1116,8 @@ class eWeLinkPlatform {
         ZIGBEE STATELESS SWITCH
         **********************/
         const instance = './device/zigbee/switch-stateless'
-        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
-          ? this.devicesInHB.get(device.deviceid + 'SWX')
+        accessory = this.devicesInHB.has(uuid)
+          ? this.devicesInHB.get(uuid)
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require(instance))(this, accessory)
         /*********************/
@@ -1120,8 +1126,8 @@ class eWeLinkPlatform {
         ZB SINGLE SWITCH
         ***************/
         const instance = './device/zigbee/switch-single'
-        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
-          ? this.devicesInHB.get(device.deviceid + 'SWX')
+        accessory = this.devicesInHB.has(uuid)
+          ? this.devicesInHB.get(uuid)
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require(instance))(this, accessory)
         /**************/
@@ -1129,8 +1135,8 @@ class eWeLinkPlatform {
         /*****************
         ZB LIGHTS [DIMMER]
         *****************/
-        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
-          ? this.devicesInHB.get(device.deviceid + 'SWX')
+        accessory = this.devicesInHB.has(uuid)
+          ? this.devicesInHB.get(uuid)
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/zigbee/light-dimmer'))(this, accessory)
         /****************/
@@ -1138,8 +1144,8 @@ class eWeLinkPlatform {
         /**************
         ZB LIGHTS [CCT]
         **************/
-        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
-          ? this.devicesInHB.get(device.deviceid + 'SWX')
+        accessory = this.devicesInHB.has(uuid)
+          ? this.devicesInHB.get(uuid)
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/zigbee/light-cct'))(this, accessory)
         /*************/
@@ -1148,8 +1154,8 @@ class eWeLinkPlatform {
         ZB SENSOR [AMBIENT]
         ******************/
         const instance = './device/zigbee/sensor-ambient'
-        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
-          ? this.devicesInHB.get(device.deviceid + 'SWX')
+        accessory = this.devicesInHB.has(uuid)
+          ? this.devicesInHB.get(uuid)
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require(instance))(this, accessory)
         /*****************/
@@ -1158,8 +1164,8 @@ class eWeLinkPlatform {
         ZB SENSOR [MOTION]
         *****************/
         const instance = './device/zigbee/sensor-motion'
-        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
-          ? this.devicesInHB.get(device.deviceid + 'SWX')
+        accessory = this.devicesInHB.has(uuid)
+          ? this.devicesInHB.get(uuid)
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require(instance))(this, accessory)
         /****************/
@@ -1168,8 +1174,8 @@ class eWeLinkPlatform {
         ZB SENSOR [CONTACT]
         ******************/
         const instance = './device/zigbee/sensor-contact'
-        accessory = this.devicesInHB.has(device.deviceid + 'SWX')
-          ? this.devicesInHB.get(device.deviceid + 'SWX')
+        accessory = this.devicesInHB.has(uuid)
+          ? this.devicesInHB.get(uuid)
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require(instance))(this, accessory)
         /*****************/
@@ -1227,7 +1233,7 @@ class eWeLinkPlatform {
 
       // Update any changes to the device into our devicesInHB map
       this.api.updatePlatformAccessories(PLUGIN.name, PLUGIN.alias, [accessory])
-      this.devicesInHB.set(accessory.context.hbDeviceId, accessory)
+      this.devicesInHB.set(accessory.UUID, accessory)
       this.log('[%s] %s %s.', device.name, this.messages.devInit, str)
       if (
         this.config.mode === 'lan' &&
@@ -1352,7 +1358,7 @@ class eWeLinkPlatform {
       }
 
       // Add the configured accessory to our global map
-      this.devicesInHB.set(accessory.context.hbDeviceId, accessory)
+      this.devicesInHB.set(accessory.UUID, accessory)
     } catch (err) {
       // Catch any errors during retrieve
       const eText = this.funcs.parseError(err)
@@ -1364,7 +1370,7 @@ class eWeLinkPlatform {
     try {
       // Remove an accessory from Homebridge
       this.api.unregisterPlatformAccessories(PLUGIN.name, PLUGIN.alias, [accessory])
-      this.devicesInHB.delete(accessory.context.hbDeviceId)
+      this.devicesInHB.delete(accessory.UUID)
       this.log('[%s] %s.', accessory.displayName, this.messages.devRemove)
     } catch (err) {
       // Catch any errors during remove
@@ -1433,10 +1439,9 @@ class eWeLinkPlatform {
     let reachableChange = false
 
     // Find our accessory for which the updates relates to
-    if ((
-      accessory = this.devicesInHB.get(deviceId + 'SWX') ||
-        this.devicesInHB.get(deviceId + 'SW0'))
-    ) {
+    const uuid1 = this.api.hap.uuid.generate(deviceId + 'SWX')
+    const uuid2 = this.api.hap.uuid.generate(deviceId + 'SW0')
+    if ((accessory = this.devicesInHB.get(uuid1) || this.devicesInHB.get(uuid2))) {
       if (this.config.debug) {
         const str = JSON.stringify(device.params)
         this.log('[%s] %s %s.', accessory.displayName, this.messages.updRec, str)
@@ -1446,7 +1451,7 @@ class eWeLinkPlatform {
         if (device.params.online !== accessory.context.reachableWAN) {
           accessory.context.reachableWAN = device.params.online
           this.api.updatePlatformAccessories(PLUGIN.name, PLUGIN.alias, [accessory])
-          this.devicesInHB.set(accessory.context.hbDeviceId, accessory)
+          this.devicesInHB.set(accessory.UUID, accessory)
 
           // Flag this true to update the sub accessories later
           reachableChange = true
@@ -1471,7 +1476,7 @@ class eWeLinkPlatform {
         // The update is from LAN so it must be online
         accessory.context.reachableLAN = true
         this.api.updatePlatformAccessories(PLUGIN.name, PLUGIN.alias, [accessory])
-        this.devicesInHB.set(accessory.context.hbDeviceId, accessory)
+        this.devicesInHB.set(accessory.UUID, accessory)
 
         // Flag this true to update the sub accessories later
         reachableChange = true
@@ -1494,9 +1499,10 @@ class eWeLinkPlatform {
       if (reachableChange && accessory.context.hbDeviceId.substr(-1) !== 'X') {
         // Loop through to see which channels are in HB
         for (let i = 1; i <= accessory.context.channelCount; i++) {
-          if (this.devicesInHB.has(deviceId + 'SW' + i)) {
+          const uuid = this.api.hap.uuid.generate(deviceId + 'SW' + i)
+          if (this.devicesInHB.has(uuid)) {
             // Find the sub accessory
-            const oAccessory = this.devicesInHB.get(deviceId + 'SW' + i)
+            const oAccessory = this.devicesInHB.get(uuid)
 
             // Update the WAN status
             oAccessory.context.reachableWAN = device.params.online
@@ -1508,7 +1514,7 @@ class eWeLinkPlatform {
 
             // Save the sub accessory updates to the platform
             this.api.updatePlatformAccessories(PLUGIN.name, PLUGIN.alias, [oAccessory])
-            this.devicesInHB.set(oAccessory.context.hbDeviceId, oAccessory)
+            this.devicesInHB.set(oAccessory.UUID, oAccessory)
           }
         }
       }

From 3242cffa476fce32a84a66d896fa25273be538bb Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 15 Apr 2021 15:39:45 +0100
Subject: [PATCH 1865/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 25fe6b9f..c145411d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,8 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 ### Changes
 
 * More compact logging for eWeLink 504 error
+* Remove online/offline status for Zigbee devices
+* Recover accessories from the cache using the UUID
 
 ## 6.1.2 (2021-04-14)
 

From 34f26ba6a67d6956591c7be261ae61099f984a83 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 15 Apr 2021 15:40:16 +0100
Subject: [PATCH 1866/3183] 6.1.3-beta.1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c95fe191..1ac2ddac 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.1.3-beta.0",
+  "version": "6.1.3-beta.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index f2ab1bd5..db9302f2 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.1.3-beta.0",
+  "version": "6.1.3-beta.1",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 13e751c40f743ccde2b2b86f8e179938953bc34a Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Fri, 16 Apr 2021 01:23:33 +0100
Subject: [PATCH 1867/3183] reduce ws timeout to 5 seconds

---
 lib/connection/ws.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/connection/ws.js b/lib/connection/ws.js
index c47139f5..9fdabffb 100644
--- a/lib/connection/ws.js
+++ b/lib/connection/ws.js
@@ -102,8 +102,7 @@ module.exports = class connectionWS {
         extractRequestId: data => data && data.sequence,
         packMessage: data => JSON.stringify(data),
         unpackMessage: data => data === 'pong' ? data : JSON.parse(data),
-        connectionTimeout: 5000,
-        timeout: 10000
+        timeout: 5000
       })
 
       // Add a listener to authenticate when a web socket connection is opened

From ced39d193f01d22439c78fc887da293df275303a Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 16 Apr 2021 07:25:01 +0100
Subject: [PATCH 1868/3183] Revert "revert offline zigbee status"

This reverts commit e0fef604f2655aa9f523f0c9c068a66b122f3511.
---
 lib/device/zigbee/light-cct.js        | 20 ++++++++++++++++----
 lib/device/zigbee/light-dimmer.js     | 20 ++++++++++++++++----
 lib/device/zigbee/sensor-ambient.js   | 16 +++++++++++++---
 lib/device/zigbee/sensor-contact.js   | 13 +++++++++++++
 lib/device/zigbee/sensor-motion.js    | 13 +++++++++++++
 lib/device/zigbee/switch-single.js    | 20 ++++++++++++++++----
 lib/device/zigbee/switch-stateless.js | 13 +++++++++++++
 lib/index.js                          | 10 ++++++++++
 lib/utils/constants.js                |  1 +
 9 files changed, 111 insertions(+), 15 deletions(-)

diff --git a/lib/device/zigbee/light-cct.js b/lib/device/zigbee/light-cct.js
index 20fd3979..e6ef214a 100644
--- a/lib/device/zigbee/light-cct.js
+++ b/lib/device/zigbee/light-cct.js
@@ -39,10 +39,18 @@ module.exports = class deviceZBLightCCT {
     this.service = this.accessory.getService(this.hapServ.Lightbulb) ||
       this.accessory.addService(this.hapServ.Lightbulb)
 
-    // Add the set handler to the lightbulb on/off characteristic
-    this.service.getCharacteristic(this.hapChar.On).onSet(async value => {
-      await this.internalOnOffUpdate(value)
-    })
+    // Add the get/set handler to the lightbulb on/off characteristic
+    this.service.getCharacteristic(this.hapChar.On)
+      .onGet(() => {
+        if (this.isOnline) {
+          return this.service.getCharacteristic(this.hapChar.On).value
+        } else {
+          throw new this.platform.api.hap.HapStatusError(-70402)
+        }
+      })
+      .onSet(async value => {
+        await this.internalOnOffUpdate(value)
+      })
 
     // Add the set handler to the lightbulb brightness characteristic
     this.service.getCharacteristic(this.hapChar.Brightness)
@@ -210,4 +218,8 @@ module.exports = class deviceZBLightCCT {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
+
+  markStatus (isOnline) {
+    this.isOnline = isOnline
+  }
 }
diff --git a/lib/device/zigbee/light-dimmer.js b/lib/device/zigbee/light-dimmer.js
index 15c23cea..2ab8ec08 100644
--- a/lib/device/zigbee/light-dimmer.js
+++ b/lib/device/zigbee/light-dimmer.js
@@ -32,10 +32,18 @@ module.exports = class deviceZBLightDimmer {
     this.service = this.accessory.getService(this.hapServ.Lightbulb) ||
       this.accessory.addService(this.hapServ.Lightbulb)
 
-    // Add the set handler to the lightbulb on/off characteristic
-    this.service.getCharacteristic(this.hapChar.On).onSet(async value => {
-      await this.internalOnOffUpdate(value)
-    })
+    // Add the get/set handler to the lightbulb on/off characteristic
+    this.service.getCharacteristic(this.hapChar.On)
+      .onGet(() => {
+        if (this.isOnline) {
+          return this.service.getCharacteristic(this.hapChar.On).value
+        } else {
+          throw new this.platform.api.hap.HapStatusError(-70402)
+        }
+      })
+      .onSet(async value => {
+        await this.internalOnOffUpdate(value)
+      })
 
     // Add the set handler to the lightbulb brightness characteristic
     this.service.getCharacteristic(this.hapChar.Brightness)
@@ -124,4 +132,8 @@ module.exports = class deviceZBLightDimmer {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
+
+  markStatus (isOnline) {
+    this.isOnline = isOnline
+  }
 }
diff --git a/lib/device/zigbee/sensor-ambient.js b/lib/device/zigbee/sensor-ambient.js
index 5ef05c57..71efb93e 100644
--- a/lib/device/zigbee/sensor-ambient.js
+++ b/lib/device/zigbee/sensor-ambient.js
@@ -33,9 +33,15 @@ module.exports = class deviceZBSensorAmbient {
       this.accessory.addService(this.hapServ.TemperatureSensor)
 
     // Add the get handler to the current temperature characteristic
-    this.tService.getCharacteristic(this.hapChar.CurrentTemperature).setProps({
-      minStep: 0.1
-    })
+    this.tService.getCharacteristic(this.hapChar.CurrentTemperature)
+      .setProps({ minStep: 0.1 })
+      .onGet(() => {
+        if (this.isOnline) {
+          return this.tService.getCharacteristic(this.hapChar.CurrentTemperature).value
+        } else {
+          throw new this.platform.api.hap.HapStatusError(-70402)
+        }
+      })
 
     // Add the humidity sensor service if it doesn't already exist
     this.hService = this.accessory.getService(this.hapServ.HumiditySensor) ||
@@ -112,4 +118,8 @@ module.exports = class deviceZBSensorAmbient {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
+
+  markStatus (isOnline) {
+    this.isOnline = isOnline
+  }
 }
diff --git a/lib/device/zigbee/sensor-contact.js b/lib/device/zigbee/sensor-contact.js
index 6df57d51..38c5db12 100644
--- a/lib/device/zigbee/sensor-contact.js
+++ b/lib/device/zigbee/sensor-contact.js
@@ -40,6 +40,15 @@ module.exports = class deviceZBSensorContact {
       this.service.addCharacteristic(this.eveChar.TimesOpened)
     }
 
+    // Add the get handler to the contact sensor state characteristic
+    this.service.getCharacteristic(this.hapChar.ContactSensorState).onGet(() => {
+      if (this.isOnline) {
+        return this.service.getCharacteristic(this.hapChar.ContactSensorState).value
+      } else {
+        throw new this.platform.api.hap.HapStatusError(-70402)
+      }
+    })
+
     // Obtain the current times opened value
     this.timesOpened = this.service.getCharacteristic(this.eveChar.TimesOpened).value
 
@@ -114,4 +123,8 @@ module.exports = class deviceZBSensorContact {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
+
+  markStatus (isOnline) {
+    this.isOnline = isOnline
+  }
 }
diff --git a/lib/device/zigbee/sensor-motion.js b/lib/device/zigbee/sensor-motion.js
index a2238e46..d9dceb29 100644
--- a/lib/device/zigbee/sensor-motion.js
+++ b/lib/device/zigbee/sensor-motion.js
@@ -38,6 +38,15 @@ module.exports = class deviceZBSensorMotion {
       this.service.addCharacteristic(this.eveChar.LastActivation)
     }
 
+    // Add the get handler to the motion detected characteristic
+    this.service.getCharacteristic(this.hapChar.MotionDetected).onGet(() => {
+      if (this.isOnline) {
+        return this.service.getCharacteristic(this.hapChar.MotionDetected).value
+      } else {
+        throw new this.platform.api.hap.HapStatusError(-70402)
+      }
+    })
+
     // Add the battery service if it doesn't already exist
     this.battService = this.accessory.getService(this.hapServ.BatteryService) || this.accessory.addService(this.hapServ.BatteryService)
 
@@ -103,4 +112,8 @@ module.exports = class deviceZBSensorMotion {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
+
+  markStatus (isOnline) {
+    this.isOnline = isOnline
+  }
 }
diff --git a/lib/device/zigbee/switch-single.js b/lib/device/zigbee/switch-single.js
index 64cd12e5..7cd451f6 100644
--- a/lib/device/zigbee/switch-single.js
+++ b/lib/device/zigbee/switch-single.js
@@ -29,10 +29,18 @@ module.exports = class deviceZBSwitchSingle {
     this.service = this.accessory.getService(this.hapServ.Switch) ||
       this.accessory.addService(this.hapServ.Switch)
 
-    // Add the set handler to the switch on/off characteristic
-    this.service.getCharacteristic(this.hapChar.On).onSet(async value => {
-      await this.internalUpdate(value)
-    })
+    // Add the get/set handler to the switch on/off characteristic
+    this.service.getCharacteristic(this.hapChar.On)
+      .onGet(() => {
+        if (this.isOnline) {
+          return this.service.getCharacteristic(this.hapChar.On).value
+        } else {
+          throw new this.platform.api.hap.HapStatusError(-70402)
+        }
+      })
+      .onSet(async value => {
+        await this.internalUpdate(value)
+      })
 
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new this.platform.eveService('switch', this.accessory, {
@@ -81,4 +89,8 @@ module.exports = class deviceZBSwitchSingle {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
+
+  markStatus (isOnline) {
+    this.isOnline = isOnline
+  }
 }
diff --git a/lib/device/zigbee/switch-stateless.js b/lib/device/zigbee/switch-stateless.js
index 20497814..269cdb9a 100644
--- a/lib/device/zigbee/switch-stateless.js
+++ b/lib/device/zigbee/switch-stateless.js
@@ -33,6 +33,15 @@ module.exports = class deviceZBSwitchStateless {
     this.service = this.accessory.getService(this.hapServ.StatelessProgrammableSwitch) ||
       this.accessory.addService(this.hapServ.StatelessProgrammableSwitch)
 
+    // Add the get handler to the state characteristic
+    this.service.getCharacteristic(this.hapChar.ProgrammableSwitchEvent).onGet(() => {
+      if (this.isOnline) {
+        return this.service.getCharacteristic(this.hapChar.ProgrammableSwitchEvent).value
+      } else {
+        throw new this.platform.api.hap.HapStatusError(-70402)
+      }
+    })
+
     // Hide the double and long press options if the user wants
     if (this.hideLongDouble) {
       this.service.getCharacteristic(this.hapChar.ProgrammableSwitchEvent).setProps({
@@ -87,4 +96,8 @@ module.exports = class deviceZBSwitchStateless {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
+
+  markStatus (isOnline) {
+    this.isOnline = isOnline
+  }
 }
diff --git a/lib/index.js b/lib/index.js
index 2949b9d8..64b99f6b 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1229,6 +1229,11 @@ class eWeLinkPlatform {
       // Update accessory characteristics with latest values
       if (this.wsClient && accessory.control && accessory.control.externalUpdate) {
         accessory.control.externalUpdate(device.params)
+
+        // Mark the online/offline status of zigbee devices
+        if (this.consts.devices.markStatus.includes(accessory.context.eweUIID)) {
+          accessory.control.markStatus(device.online)
+        }
       }
 
       // Update any changes to the device into our devicesInHB map
@@ -1462,6 +1467,11 @@ class eWeLinkPlatform {
             : this.messages.repOffline
           this.log('[%s] %s %s.', accessory.displayName, status, this.messages.viaWS)
 
+          // Mark the online/offline status of zigbee devices
+          if (this.consts.devices.markStatus.includes(accessory.context.eweUIID)) {
+            accessory.control.markStatus(device.params.online)
+          }
+
           // Try and request an update through WS if the device has come back online
           if (accessory.context.reachableWAN && this.wsClient) {
             try {
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index cb80ff1a..33a6f5c5 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -103,6 +103,7 @@ module.exports = {
   devices: {
     lanIn: [1, 2, 3, 4, 5, 6, 7, 8, 9, 14, 15, 28, 32, 44, 77, 78, 103, 104, 126],
     lanOut: [1, 2, 3, 4, 5, 6, 7, 8, 9, 14, 28, 32, 44, 77, 78, 126],
+    markStatus: [1000, 1009, 1256, 1257, 1258, 1770, 2026, 3026],
     singleSwitch: [1, 5, 6, 14, 24, 27],
     multiSwitch: [2, 3, 4, 7, 8, 9, 29, 30, 31, 41, 82, 83, 84, 126],
     singleSwitchOutlet: ['Sonoff Pow', 'S20', 'S26', 'S26R1', 'S55', 'S55R1'],

From 13bcdd972292b6c5572b05c49da3fbdb5609bc0a Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 16 Apr 2021 07:27:15 +0100
Subject: [PATCH 1869/3183] remove mark status of zigbee sensors

---
 lib/utils/constants.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 33a6f5c5..b87763b0 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -103,7 +103,7 @@ module.exports = {
   devices: {
     lanIn: [1, 2, 3, 4, 5, 6, 7, 8, 9, 14, 15, 28, 32, 44, 77, 78, 103, 104, 126],
     lanOut: [1, 2, 3, 4, 5, 6, 7, 8, 9, 14, 28, 32, 44, 77, 78, 126],
-    markStatus: [1000, 1009, 1256, 1257, 1258, 1770, 2026, 3026],
+    markStatus: [1000, 1009, 1256, 1257, 1258],
     singleSwitch: [1, 5, 6, 14, 24, 27],
     multiSwitch: [2, 3, 4, 7, 8, 9, 29, 30, 31, 41, 82, 83, 84, 126],
     singleSwitchOutlet: ['Sonoff Pow', 'S20', 'S26', 'S26R1', 'S55', 'S55R1'],
@@ -208,11 +208,7 @@ module.exports = {
     1258: 1,
     1770: 1, // "ZIGBEE_TEMPERATURE_SENSOR"
     2026: 1, // "ZIGBEE_MOBILE_SENSOR"
-    2256: 2, // "ZIGBEE_SWITCH_2"
-    3026: 1, // "ZIGBEE_DOOR_AND_WINDOW_SENSOR"
-    3256: 3, // "ZIGBEE_SWITCH_3"
-    4026: 1, // "ZIGBEE_WATER_SENSOR"
-    4256: 4 // "ZIGBEE_SWITCH_4"
+    3026: 1 // "ZIGBEE_DOOR_AND_WINDOW_SENSOR"
   },
 
   cannotSupportDevices: {
@@ -265,6 +261,10 @@ module.exports = {
     109: 0, // "YK_INFRARED_2"
     1001: 0, // "BLADELESS_FAN"
     1002: 0, // "NEW_HUMIDIFIER"
-    1003: 0 // "WARM_AIR_BLOWER"
+    1003: 0, // "WARM_AIR_BLOWER"
+    2256: 2, // "ZIGBEE_SWITCH_2"
+    3256: 3, // "ZIGBEE_SWITCH_3"
+    4026: 1, // "ZIGBEE_WATER_SENSOR"
+    4256: 4 // "ZIGBEE_SWITCH_4"
   }
 }

From 9b70206b9bac66eea61bc6af90d1828b337120ee Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 16 Apr 2021 07:28:33 +0100
Subject: [PATCH 1870/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c145411d..d8f895fa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,8 +11,9 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 ### Changes
 
 * More compact logging for eWeLink 504 error
-* Remove online/offline status for Zigbee devices
+* Remove online/offline status for Zigbee sensor devices
 * Recover accessories from the cache using the UUID
+* Reduce ws timeout to 5 seconds to reduce cases of `was slow to respond` HB warning
 
 ## 6.1.2 (2021-04-14)
 

From 6fe3b7918b490f53d095d0cd96c3b37aa868c941 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 16 Apr 2021 07:29:07 +0100
Subject: [PATCH 1871/3183] 6.1.3-beta.2

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 1ac2ddac..9b2745e2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.1.3-beta.1",
+  "version": "6.1.3-beta.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index db9302f2..c10f6cf3 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.1.3-beta.1",
+  "version": "6.1.3-beta.2",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 31faac61c9c927102c22872c0a56faa956663da8 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 16 Apr 2021 07:53:21 +0100
Subject: [PATCH 1872/3183] remove mark status of zigbee button sensor

---
 lib/utils/constants.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index b87763b0..b977d027 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -103,7 +103,7 @@ module.exports = {
   devices: {
     lanIn: [1, 2, 3, 4, 5, 6, 7, 8, 9, 14, 15, 28, 32, 44, 77, 78, 103, 104, 126],
     lanOut: [1, 2, 3, 4, 5, 6, 7, 8, 9, 14, 28, 32, 44, 77, 78, 126],
-    markStatus: [1000, 1009, 1256, 1257, 1258],
+    markStatus: [1009, 1256, 1257, 1258],
     singleSwitch: [1, 5, 6, 14, 24, 27],
     multiSwitch: [2, 3, 4, 7, 8, 9, 29, 30, 31, 41, 82, 83, 84, 126],
     singleSwitchOutlet: ['Sonoff Pow', 'S20', 'S26', 'S26R1', 'S55', 'S55R1'],

From f4350f63aff84b53d177020974cf7e5973e31e92 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 16 Apr 2021 07:54:32 +0100
Subject: [PATCH 1873/3183] 6.1.3-beta.3

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 9b2745e2..722668ed 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.1.3-beta.2",
+  "version": "6.1.3-beta.3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index c10f6cf3..fe17a65b 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.1.3-beta.2",
+  "version": "6.1.3-beta.3",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From ef31b5473b74bf024b05d29504d21683901a3fac Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 16 Apr 2021 07:57:34 +0100
Subject: [PATCH 1874/3183] remove get handlers from zigbee sensors

---
 lib/device/zigbee/sensor-ambient.js   | 18 ++++--------------
 lib/device/zigbee/sensor-contact.js   | 13 -------------
 lib/device/zigbee/sensor-motion.js    | 13 -------------
 lib/device/zigbee/switch-stateless.js | 13 -------------
 4 files changed, 4 insertions(+), 53 deletions(-)

diff --git a/lib/device/zigbee/sensor-ambient.js b/lib/device/zigbee/sensor-ambient.js
index 71efb93e..f2292340 100644
--- a/lib/device/zigbee/sensor-ambient.js
+++ b/lib/device/zigbee/sensor-ambient.js
@@ -32,16 +32,10 @@ module.exports = class deviceZBSensorAmbient {
     this.tService = this.accessory.getService(this.hapServ.TemperatureSensor) ||
       this.accessory.addService(this.hapServ.TemperatureSensor)
 
-    // Add the get handler to the current temperature characteristic
-    this.tService.getCharacteristic(this.hapChar.CurrentTemperature)
-      .setProps({ minStep: 0.1 })
-      .onGet(() => {
-        if (this.isOnline) {
-          return this.tService.getCharacteristic(this.hapChar.CurrentTemperature).value
-        } else {
-          throw new this.platform.api.hap.HapStatusError(-70402)
-        }
-      })
+    // Add options to the current temperature characteristic
+    this.tService.getCharacteristic(this.hapChar.CurrentTemperature).setProps({
+      minStep: 0.1
+    })
 
     // Add the humidity sensor service if it doesn't already exist
     this.hService = this.accessory.getService(this.hapServ.HumiditySensor) ||
@@ -118,8 +112,4 @@ module.exports = class deviceZBSensorAmbient {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
-
-  markStatus (isOnline) {
-    this.isOnline = isOnline
-  }
 }
diff --git a/lib/device/zigbee/sensor-contact.js b/lib/device/zigbee/sensor-contact.js
index 38c5db12..6df57d51 100644
--- a/lib/device/zigbee/sensor-contact.js
+++ b/lib/device/zigbee/sensor-contact.js
@@ -40,15 +40,6 @@ module.exports = class deviceZBSensorContact {
       this.service.addCharacteristic(this.eveChar.TimesOpened)
     }
 
-    // Add the get handler to the contact sensor state characteristic
-    this.service.getCharacteristic(this.hapChar.ContactSensorState).onGet(() => {
-      if (this.isOnline) {
-        return this.service.getCharacteristic(this.hapChar.ContactSensorState).value
-      } else {
-        throw new this.platform.api.hap.HapStatusError(-70402)
-      }
-    })
-
     // Obtain the current times opened value
     this.timesOpened = this.service.getCharacteristic(this.eveChar.TimesOpened).value
 
@@ -123,8 +114,4 @@ module.exports = class deviceZBSensorContact {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
-
-  markStatus (isOnline) {
-    this.isOnline = isOnline
-  }
 }
diff --git a/lib/device/zigbee/sensor-motion.js b/lib/device/zigbee/sensor-motion.js
index d9dceb29..a2238e46 100644
--- a/lib/device/zigbee/sensor-motion.js
+++ b/lib/device/zigbee/sensor-motion.js
@@ -38,15 +38,6 @@ module.exports = class deviceZBSensorMotion {
       this.service.addCharacteristic(this.eveChar.LastActivation)
     }
 
-    // Add the get handler to the motion detected characteristic
-    this.service.getCharacteristic(this.hapChar.MotionDetected).onGet(() => {
-      if (this.isOnline) {
-        return this.service.getCharacteristic(this.hapChar.MotionDetected).value
-      } else {
-        throw new this.platform.api.hap.HapStatusError(-70402)
-      }
-    })
-
     // Add the battery service if it doesn't already exist
     this.battService = this.accessory.getService(this.hapServ.BatteryService) || this.accessory.addService(this.hapServ.BatteryService)
 
@@ -112,8 +103,4 @@ module.exports = class deviceZBSensorMotion {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
-
-  markStatus (isOnline) {
-    this.isOnline = isOnline
-  }
 }
diff --git a/lib/device/zigbee/switch-stateless.js b/lib/device/zigbee/switch-stateless.js
index 269cdb9a..20497814 100644
--- a/lib/device/zigbee/switch-stateless.js
+++ b/lib/device/zigbee/switch-stateless.js
@@ -33,15 +33,6 @@ module.exports = class deviceZBSwitchStateless {
     this.service = this.accessory.getService(this.hapServ.StatelessProgrammableSwitch) ||
       this.accessory.addService(this.hapServ.StatelessProgrammableSwitch)
 
-    // Add the get handler to the state characteristic
-    this.service.getCharacteristic(this.hapChar.ProgrammableSwitchEvent).onGet(() => {
-      if (this.isOnline) {
-        return this.service.getCharacteristic(this.hapChar.ProgrammableSwitchEvent).value
-      } else {
-        throw new this.platform.api.hap.HapStatusError(-70402)
-      }
-    })
-
     // Hide the double and long press options if the user wants
     if (this.hideLongDouble) {
       this.service.getCharacteristic(this.hapChar.ProgrammableSwitchEvent).setProps({
@@ -96,8 +87,4 @@ module.exports = class deviceZBSwitchStateless {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
-
-  markStatus (isOnline) {
-    this.isOnline = isOnline
-  }
 }

From be91ddf44193c4426d4ffe3aec27772c28254231 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 16 Apr 2021 07:57:57 +0100
Subject: [PATCH 1875/3183] 6.1.3-beta.4

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 722668ed..c9e61e62 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.1.3-beta.3",
+  "version": "6.1.3-beta.4",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index fe17a65b..02b1fdb9 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.1.3-beta.3",
+  "version": "6.1.3-beta.4",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From e4238caca067334dde1e9971152f5c1306ecc230 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Fri, 16 Apr 2021 09:02:16 +0100
Subject: [PATCH 1876/3183] Update README.md

---
 README.md | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index ba62f916..863956d5 100644
--- a/README.md
+++ b/README.md
@@ -30,25 +30,24 @@ Homebridge plugin to control eWeLink devices with original firmware
 * It is recommended to use the current LTS version of Node, currently v14, however Node v10 and v12 are also supported.
 
 ### Setup
-* [Installation (Homebridge)](https://github.com/bwp91/homebridge-ewelink/wiki/Installation-(Homebridge))
-* [Installation (HOOBS)](https://github.com/bwp91/homebridge-ewelink/wiki/Installation-(HOOBS))
+* [Installation](https://github.com/bwp91/homebridge-ewelink/wiki/Installation)
+* [Configuration](https://github.com/bwp91/homebridge-ewelink/wiki/Configuration)
+* [Beta Version](https://github.com/bwp91/homebridge-ewelink/wiki/Beta-Version)
+* [Node Version](https://github.com/bwp91/homebridge-ewelink/wiki/Node-Version)
+* [Uninstallation](https://github.com/bwp91/homebridge-ewelink/wiki/Uninstallation)
 
 ### Features
-* [Configuration](https://github.com/bwp91/homebridge-ewelink/wiki/Configuration)
 * [Connection Methods](https://github.com/bwp91/homebridge-ewelink/wiki/Connection-Methods)
 * [Supported Devices](https://github.com/bwp91/homebridge-ewelink/wiki/Supported-Devices)
 * [Multi Channel Devices](https://github.com/bwp91/homebridge-ewelink/wiki/Multi-Channel-Devices)
 * [RF Bridge Sensors](https://github.com/bwp91/homebridge-ewelink/wiki/RF-Bridge-Sensors)
 * [Accessory Simulations](https://github.com/bwp91/homebridge-ewelink/wiki/Accessory-Simulations)
-* [Beta Version](https://github.com/bwp91/homebridge-ewelink/wiki/Beta-Version)
 
 ### How-to Guides
 * [How to set up Sonoff Camera (GK-200MP2-B)](https://github.com/bwp91/homebridge-ewelink/wiki/How-to-set-up-Sonoff-Camera)
 * [How to copy Homebridge logs](https://github.com/bwp91/homebridge-ewelink/wiki/How-to-copy-Homebridge-logs)
 * [How to enable/disable plugin extended logging](https://github.com/bwp91/homebridge-ewelink/wiki/How-to-enable-disable-plugin-extended-logging)
 * [How to remove an accessory from the cache](https://github.com/bwp91/homebridge-ewelink/wiki/How-to-remove-an-accessory-from-the-cache)
-* [How to update node](https://github.com/bwp91/homebridge-ewelink/wiki/How-to-update-node)
-* [How to uninstall correctly](https://github.com/bwp91/homebridge-ewelink/wiki/How-to-uninstall-correctly)
 
 ### Help/About
 

From f855cc8f006cd6a074f8fd289d830b770ce77417 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 16 Apr 2021 09:02:32 +0100
Subject: [PATCH 1877/3183] uiid 1000

---
 lib/utils/constants.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index b977d027..6ac8f2bc 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -201,7 +201,7 @@ module.exports = {
     107: 1, // "GSM_SOCKET_NO_FLOW"
     126: 2, // "DUALR3"
     127: 1, // "GTTA127"
-    1000: 1, // "ZIGBEE_WIRELESS_SWITCH"
+    1000: 1, // "zigbee_ON_OFF_SWITCH_1000" (button device)
     1009: 1, // "" (Some sort of single switch device)
     1256: 1, // "ZIGBEE_SINGLE_SWITCH"
     1257: 1, // "ZigbeeWhiteLight"

From 3487b3e1e625c59dadfe713ba8721da84624011d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 16 Apr 2021 09:04:09 +0100
Subject: [PATCH 1878/3183] links to match readme

---
 lib/homebridge-ui/public/index.html | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/lib/homebridge-ui/public/index.html b/lib/homebridge-ui/public/index.html
index 63b73ae1..9d833198 100644
--- a/lib/homebridge-ui/public/index.html
+++ b/lib/homebridge-ui/public/index.html
@@ -75,15 +75,21 @@
 <div id="pageSupport" class="mt-4" style="display: none;">
   <p class="text-center lead">Thank you for using <strong>homebridge-ewelink</strong></p>
   <p class="text-center">The links below will take you to our GitHub wiki</p>
-  <h4>Features</h4>
+  <h4>Setup</h4>
   <ul>
+    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/Installation" target="_blank">Installation</a></li>
     <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/Configuration" target="_blank">Configuration</a></li>
+    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/Beta-Version" target="_blank">Beta Version</a></li>
+    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/Node-Version" target="_blank">Node Version</a></li>
+    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/Uninstallation" target="_blank">Uninstallation</a></li>
+  </ul>
+  <h4>Features</h4>
+  <ul>
     <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/Connection-Methods" target="_blank">Connection Methods</a></li>
     <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/Supported-Devices" target="_blank">Supported Devices</a></li>
     <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/Multi-Channel-Devices" target="_blank">Multi Channel Devices</a></li>
     <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/RF-Bridge-Sensors" target="_blank">RF Bridge Sensors</a></li>
     <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/Accessory-Simulations" target="_blank">Accessory Simulations</a></li>
-    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/Beta-Version" target="_blank">Beta Version</a></li>
   </ul>
   <h4>How-to Guides</h4>
   <ul>
@@ -91,8 +97,6 @@ <h4>How-to Guides</h4>
     <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/How-to-copy-Homebridge-logs" target="_blank">How to copy Homebridge logs</a></li>
     <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/How-to-enable-disable-plugin-extended-logging" target="_blank">How to enable/disable plugin extended logging</a></li>
     <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/How-to-remove-an-accessory-from-the-cache" target="_blank">How to remove an accessory from the cache</a></li>
-    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/How-to-update-node" target="_blank">How to update node</a></li>
-    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/How-to-uninstall-correctly" target="_blank">How to uninstall correctly</a></li>
   </ul>
   <h4>Help/About</h4>
   <ul>

From 193f599599d7c535dc480dc014f579c755d0e9a4 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Fri, 16 Apr 2021 09:17:20 +0100
Subject: [PATCH 1879/3183] Update README.md

---
 README.md | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 863956d5..2ef8b341 100644
--- a/README.md
+++ b/README.md
@@ -37,17 +37,11 @@ Homebridge plugin to control eWeLink devices with original firmware
 * [Uninstallation](https://github.com/bwp91/homebridge-ewelink/wiki/Uninstallation)
 
 ### Features
-* [Connection Methods](https://github.com/bwp91/homebridge-ewelink/wiki/Connection-Methods)
 * [Supported Devices](https://github.com/bwp91/homebridge-ewelink/wiki/Supported-Devices)
 * [Multi Channel Devices](https://github.com/bwp91/homebridge-ewelink/wiki/Multi-Channel-Devices)
 * [RF Bridge Sensors](https://github.com/bwp91/homebridge-ewelink/wiki/RF-Bridge-Sensors)
 * [Accessory Simulations](https://github.com/bwp91/homebridge-ewelink/wiki/Accessory-Simulations)
-
-### How-to Guides
-* [How to set up Sonoff Camera (GK-200MP2-B)](https://github.com/bwp91/homebridge-ewelink/wiki/How-to-set-up-Sonoff-Camera)
-* [How to copy Homebridge logs](https://github.com/bwp91/homebridge-ewelink/wiki/How-to-copy-Homebridge-logs)
-* [How to enable/disable plugin extended logging](https://github.com/bwp91/homebridge-ewelink/wiki/How-to-enable-disable-plugin-extended-logging)
-* [How to remove an accessory from the cache](https://github.com/bwp91/homebridge-ewelink/wiki/How-to-remove-an-accessory-from-the-cache)
+* [Connection Methods](https://github.com/bwp91/homebridge-ewelink/wiki/Connection-Methods)
 
 ### Help/About
 

From c62abd854d48bef5fe2dcafaa10346dea8aadcce Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 16 Apr 2021 09:18:11 +0100
Subject: [PATCH 1880/3183] remove how to links

---
 lib/homebridge-ui/public/index.html | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/lib/homebridge-ui/public/index.html b/lib/homebridge-ui/public/index.html
index 9d833198..287a9f73 100644
--- a/lib/homebridge-ui/public/index.html
+++ b/lib/homebridge-ui/public/index.html
@@ -91,13 +91,6 @@ <h4>Features</h4>
     <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/RF-Bridge-Sensors" target="_blank">RF Bridge Sensors</a></li>
     <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/Accessory-Simulations" target="_blank">Accessory Simulations</a></li>
   </ul>
-  <h4>How-to Guides</h4>
-  <ul>
-    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/How-to-set-up-Sonoff-Camera" target="_blank">How to set up Sonoff Camera (GK-200MP2-B)</a></li>
-    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/How-to-copy-Homebridge-logs" target="_blank">How to copy Homebridge logs</a></li>
-    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/How-to-enable-disable-plugin-extended-logging" target="_blank">How to enable/disable plugin extended logging</a></li>
-    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/How-to-remove-an-accessory-from-the-cache" target="_blank">How to remove an accessory from the cache</a></li>
-  </ul>
   <h4>Help/About</h4>
   <ul>
     <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/Common-Errors" target="_blank">Common Errors</a></li>

From 67c1a3c60923ee7034d73a2f9197927b4a4d0765 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 16 Apr 2021 09:57:20 +0100
Subject: [PATCH 1881/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d8f895fa..047b5fca 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 * Remove online/offline status for Zigbee sensor devices
 * Recover accessories from the cache using the UUID
 * Reduce ws timeout to 5 seconds to reduce cases of `was slow to respond` HB warning
+* Update wiki links in the Homebridge plugin-ui
 
 ## 6.1.2 (2021-04-14)
 

From 6b49b3daa2766a7d989357a6b09468b051daa4f1 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 16 Apr 2021 09:57:46 +0100
Subject: [PATCH 1882/3183] 6.1.3-beta.5

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c9e61e62..6335d798 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.1.3-beta.4",
+  "version": "6.1.3-beta.5",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 02b1fdb9..caf912c6 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.1.3-beta.4",
+  "version": "6.1.3-beta.5",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 0589c424e6cdc100a311b5f19daee3b1f48ba870 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 16 Apr 2021 10:51:50 +0100
Subject: [PATCH 1883/3183] stop initial entry

---
 lib/device/rf-bridge.js | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/lib/device/rf-bridge.js b/lib/device/rf-bridge.js
index a1c20d8a..b75de13b 100644
--- a/lib/device/rf-bridge.js
+++ b/lib/device/rf-bridge.js
@@ -90,13 +90,11 @@ module.exports = class deviceRFBridge {
 
       // Add the sensor if it doesn't already exist
       let service
-      let justAdded = false
       if (!(service = this.accessory.getService(serv))) {
         service = this.accessory.addService(serv)
         if (addLACharacteristic) {
           service.addCharacteristic(this.eveChar.LastActivation)
         }
-        justAdded = true
       }
 
       // Always start with the sensor off (useful when restarting Homebridge)
@@ -106,10 +104,6 @@ module.exports = class deviceRFBridge {
       this.accessory.eveService = new this.platform.eveService(eveType, this.accessory, {
         log: platform.config.debugFakegato ? this.log : () => {}
       })
-
-      if (justAdded) {
-        this.accessory.eveService.addEntry({ status: 0 })
-      }
     }
   }
 

From f4d2def8cff6338c163cd6ffc08d3f98415ff8d9 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 16 Apr 2021 10:52:21 +0100
Subject: [PATCH 1884/3183] stop LastActivation NaN HB error

---
 lib/fakegato/fakegato-history.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/fakegato/fakegato-history.js b/lib/fakegato/fakegato-history.js
index b11b6479..a281b320 100644
--- a/lib/fakegato/fakegato-history.js
+++ b/lib/fakegato/fakegato-history.js
@@ -549,7 +549,7 @@ module.exports = function (homebridge) {
     }
 
     getInitialTime () {
-      return this.initialTime
+      return this.initialTime || 0
     }
 
     setExtraPersistedData (extra) {

From 557af2e0aa5b77d701ef54894ef54cc16d2e913c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 16 Apr 2021 10:53:11 +0100
Subject: [PATCH 1885/3183] line length

---
 lib/fakegato/fakegato-history.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/fakegato/fakegato-history.js b/lib/fakegato/fakegato-history.js
index a281b320..2d6f6a64 100644
--- a/lib/fakegato/fakegato-history.js
+++ b/lib/fakegato/fakegato-history.js
@@ -419,7 +419,11 @@ module.exports = function (homebridge) {
       this.log('[%s] FG history: registering events.', thisAccessory.displayName)
       this.service = thisAccessory.getService(FakeGatoHistoryService)
       if (this.service === undefined) {
-        this.service = thisAccessory.addService(FakeGatoHistoryService, ucfirst(thisAccessory.displayName) + ' History', this.accessoryType)
+        this.service = thisAccessory.addService(
+          FakeGatoHistoryService,
+          ucfirst(thisAccessory.displayName) + ' History',
+          this.accessoryType
+        )
       }
       this.service.getCharacteristic(S2R2Characteristic).onGet(() => {
         return this.getCurrentS2R2()

From 0ac99bf7003b5cfa254d15d0f3107e67c09d7fb2 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 16 Apr 2021 10:56:30 +0100
Subject: [PATCH 1886/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 047b5fca..19c4a4d9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 ### Changes
 
+* Fix characteristic NaN warning for `LastActivation`
 * More compact logging for eWeLink 504 error
 * Remove online/offline status for Zigbee sensor devices
 * Recover accessories from the cache using the UUID

From 35194793ce4c519a4187c258371faec028e5058e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 16 Apr 2021 11:09:29 +0100
Subject: [PATCH 1887/3183] 6.1.3-beta.6

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 6335d798..c126500e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.1.3-beta.5",
+  "version": "6.1.3-beta.6",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index caf912c6..911ab5d4 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.1.3-beta.5",
+  "version": "6.1.3-beta.6",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From d25859ea9b2accf25ab5fcc76923b15bd86a5017 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 16 Apr 2021 16:57:45 +0100
Subject: [PATCH 1888/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 19c4a4d9..e4870498 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 All notable changes to this homebridge-ewelink will be documented in this file.
 
-## BETA
+## 6.2.0 (2021-04-16)
 
 ### Added
 
@@ -14,7 +14,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 * More compact logging for eWeLink 504 error
 * Remove online/offline status for Zigbee sensor devices
 * Recover accessories from the cache using the UUID
-* Reduce ws timeout to 5 seconds to reduce cases of `was slow to respond` HB warning
+* Reduce WS timeout to 5 seconds to reduce cases of `was slow to respond` HB warning
 * Update wiki links in the Homebridge plugin-ui
 
 ## 6.1.2 (2021-04-14)

From 477c50112e41c58c88ebd81b4ac6cbbd377b37dc Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 16 Apr 2021 16:58:10 +0100
Subject: [PATCH 1889/3183] 6.2.0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c126500e..77f55ab6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.1.3-beta.6",
+  "version": "6.2.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 911ab5d4..f4b944ef 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.1.3-beta.6",
+  "version": "6.2.0",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From d78d0181c6d53d1cfca88616cec47998f9c0414a Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 18 Apr 2021 10:45:16 +0100
Subject: [PATCH 1890/3183] update ws dependency

---
 package-lock.json | 12 ++++++------
 package.json      |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 77f55ab6..13977c72 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -176,9 +176,9 @@
       "integrity": "sha512-fZvDqy19zyaiSXajmRjwue1VWLrJcy8bTV/LJVtAx8DeEFVlXRBMyZknW+q6CEfiW8Y4MQDDKh9x5wF32BHAHQ=="
     },
     "object-inspect": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.9.0.tgz",
-      "integrity": "sha512-i3Bp9iTqwhaLZBxGkRfo5ZbE07BQRT7MGu8+nNgwW9ItGp1TzCTw2DLEoWwjClxBjOFI/hWljTAmYGCEwmtnOw=="
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.10.2.tgz",
+      "integrity": "sha512-gz58rdPpadwztRrPjZE9DZLOABUpTGdcANUgOwBFO1C+HZZhePoP83M65WGDmbpwFYJSWqavbl4SgDn4k8RYTA=="
     },
     "object-keys": {
       "version": "1.1.1",
@@ -291,9 +291,9 @@
       }
     },
     "ws": {
-      "version": "7.4.4",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.4.tgz",
-      "integrity": "sha512-Qm8k8ojNQIMx7S+Zp8u/uHOx7Qazv3Yv4q68MiWWWOJhiwG5W3x7iqmRtJo8xxrciZUY4vRxUTJCKuRnF28ZZw=="
+      "version": "7.4.5",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.5.tgz",
+      "integrity": "sha512-xzyu3hFvomRfXKH8vOFMU3OguG6oOvhXMo3xsGy3xWExqaM2dxBbVxuD99O7m3ZUFMvvscsZDqxfgMaRr/Nr1g=="
     }
   }
 }
diff --git a/package.json b/package.json
index f4b944ef..b2fa5e24 100644
--- a/package.json
+++ b/package.json
@@ -53,6 +53,6 @@
     "node-dns-sd": "^0.4.2",
     "p-queue": "^6.6.2",
     "websocket-as-promised": "^2.0.1",
-    "ws": "^7.4.4"
+    "ws": "^7.4.5"
   }
 }

From 31eef20cdec2fa46806759c78cac30c14159d1fa Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 18 Apr 2021 11:54:11 +0100
Subject: [PATCH 1891/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e4870498..97af21ef 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 All notable changes to this homebridge-ewelink will be documented in this file.
 
+## BETA
+
+### Changes
+
+* Updated dependencies (`ws`)
+
 ## 6.2.0 (2021-04-16)
 
 ### Added

From e96e9b854ba3d17a96f92f659473ee411ecedcf2 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 18 Apr 2021 15:37:59 +0100
Subject: [PATCH 1892/3183] trim encoded password

---
 lib/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/index.js b/lib/index.js
index 64b99f6b..901aef46 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -454,7 +454,7 @@ class eWeLinkPlatform {
       // Check to see if the user has encoded their password
       if (this.config.encodedPassword) {
         const buff = Buffer.from(this.config.password, 'base64')
-        this.config.password = buff.toString('utf8')
+        this.config.password = buff.toString('utf8').replace(/(\r\n|\n|\r)/gm, '').trim()
       }
 
       // Set up the HTTP client, get the user HTTP host, and login

From 19442360ff13c7d629782ce8bd2c78c4619505e1 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 18 Apr 2021 15:45:28 +0100
Subject: [PATCH 1893/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 97af21ef..83308050 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 ### Changes
 
+* Trim new lines and spaces from password when decoded from base64
 * Updated dependencies (`ws`)
 
 ## 6.2.0 (2021-04-16)

From d6bfdaa9b081645a679056826999758efec3b384 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 18 Apr 2021 15:47:39 +0100
Subject: [PATCH 1894/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 83308050..94dd5671 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 All notable changes to this homebridge-ewelink will be documented in this file.
 
-## BETA
+## 6.2.1 (2021-04-18)
 
 ### Changes
 

From 928168bace4e912505e0f719d93df5f04294a627 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 18 Apr 2021 15:48:03 +0100
Subject: [PATCH 1895/3183] 6.2.1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 13977c72..2386c542 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.2.0",
+  "version": "6.2.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index b2fa5e24..d4f70cba 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.2.0",
+  "version": "6.2.1",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 8199f9e00251887cd348b36a1d43b90cd2cb9bb2 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 19 Apr 2021 19:03:19 +0100
Subject: [PATCH 1896/3183] display more debug errors

---
 lib/connection/http.js | 2 ++
 lib/connection/ws.js   | 7 ++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/lib/connection/http.js b/lib/connection/http.js
index 35da5ce8..544a5e78 100644
--- a/lib/connection/http.js
+++ b/lib/connection/http.js
@@ -167,6 +167,7 @@ module.exports = class connectionHTTP {
         return await this.getDevices()
       } else {
         // It's not a eWeLink problem so report the error back
+        this.log.warn('An error occurred during getDevices().')
         throw err
       }
     }
@@ -213,6 +214,7 @@ module.exports = class connectionHTTP {
         return await this.getDevice(deviceId)
       } else {
         // It's not a eWeLink problem so report the error back
+        this.log.warn('An error occurred during getDevice().')
         throw err
       }
     }
diff --git a/lib/connection/ws.js b/lib/connection/ws.js
index 9fdabffb..6f0137c8 100644
--- a/lib/connection/ws.js
+++ b/lib/connection/ws.js
@@ -30,7 +30,7 @@ module.exports = class connectionWS {
     this.wsIsConnected = false
   }
 
-  async getHost () {
+  async getWSHost () {
     // Used to get the web socket host
     try {
       // Send the HTTP request to get the web socket host
@@ -70,9 +70,10 @@ module.exports = class connectionWS {
         // Retry if another attempt could be successful
         this.log.warn('%s (%s - 3).', this.messages.httpRetry, err.code)
         await this.funcs.sleep(30000)
-        return await this.getHost()
+        return await this.getWSHost()
       } else {
         // It's not a eWeLink problem so report the error back
+        this.log.warn('An error occurred during getWSHost().')
         throw err
       }
     }
@@ -92,7 +93,7 @@ module.exports = class connectionWS {
       await this.closeConnection()
 
       // Refresh the web socket host
-      const wsHost = await this.getHost()
+      const wsHost = await this.getWSHost()
 
       // Create the web socket client
       this.wsClient = new this.wsp('wss://' + wsHost + ':8080/api/ws', {

From 99c4f2f58e913ec2f2debdb8c9b4e6c85e99c1dd Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 19 Apr 2021 19:03:54 +0100
Subject: [PATCH 1897/3183] 6.2.2-beta.0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 2386c542..e7388937 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.2.1",
+  "version": "6.2.2-beta.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index d4f70cba..faee2f79 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.2.1",
+  "version": "6.2.2-beta.0",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 47a6b195f5a912b8c0c6fdcf53c4a6b13ac648f0 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 19 Apr 2021 19:27:21 +0100
Subject: [PATCH 1898/3183] put warnings into lang file

---
 lib/connection/http.js | 4 ++--
 lib/connection/ws.js   | 2 +-
 lib/utils/lang-en.js   | 3 +++
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/lib/connection/http.js b/lib/connection/http.js
index 544a5e78..e30ff238 100644
--- a/lib/connection/http.js
+++ b/lib/connection/http.js
@@ -167,7 +167,7 @@ module.exports = class connectionHTTP {
         return await this.getDevices()
       } else {
         // It's not a eWeLink problem so report the error back
-        this.log.warn('An error occurred during getDevices().')
+        this.log.warn('%s.', this.messages.errGetDevices)
         throw err
       }
     }
@@ -214,7 +214,7 @@ module.exports = class connectionHTTP {
         return await this.getDevice(deviceId)
       } else {
         // It's not a eWeLink problem so report the error back
-        this.log.warn('An error occurred during getDevice().')
+        this.log.warn('%s.', this.messages.errGetDevice)
         throw err
       }
     }
diff --git a/lib/connection/ws.js b/lib/connection/ws.js
index 6f0137c8..b6c9b39b 100644
--- a/lib/connection/ws.js
+++ b/lib/connection/ws.js
@@ -73,7 +73,7 @@ module.exports = class connectionWS {
         return await this.getWSHost()
       } else {
         // It's not a eWeLink problem so report the error back
-        this.log.warn('An error occurred during getWSHost().')
+        this.log.warn('%s.', this.messages.errGetWSHost)
         throw err
       }
     }
diff --git a/lib/utils/lang-en.js b/lib/utils/lang-en.js
index c26404e1..1a79adde 100644
--- a/lib/utils/lang-en.js
+++ b/lib/utils/lang-en.js
@@ -33,6 +33,9 @@ module.exports = {
   devRemove: 'has been removed from Homebridge',
   disabled: 'To change this, set disablePlugin to false',
   disabling: 'Disabling plugin',
+  errGetDevice: 'An error occurred during getDevice()',
+  errGetDevices: 'An error occurred during getDevices()',
+  errGetWSHost: '',
   eweError: 'An eWeLink error [500] occured, retrying in 30 seconds',
   foundWithIP: 'found locally with IP',
   httpRetry: 'Unable to reach eWeLink, retrying in 30 seconds',

From 7a70b0ec67befbeb439215fe5e784a71aca2f174 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 19 Apr 2021 19:40:30 +0100
Subject: [PATCH 1899/3183] update messages

---
 lib/connection/http.js | 142 +++++++++++++++++++++--------------------
 lib/connection/ws.js   |   8 +--
 lib/utils/lang-en.js   |   7 +-
 3 files changed, 82 insertions(+), 75 deletions(-)

diff --git a/lib/connection/http.js b/lib/connection/http.js
index e30ff238..d400c191 100644
--- a/lib/connection/http.js
+++ b/lib/connection/http.js
@@ -26,88 +26,94 @@ module.exports = class connectionHTTP {
   }
 
   async login () {
+    try {
     // Used to log the user in and obtain the user api key and token
-    const data = {
-      countryCode: '+44',
-      password: this.password
-    }
+      const data = {
+        countryCode: '+44',
+        password: this.password
+      }
 
-    // See if the user has provided an email or phone as username
-    if (this.username.includes('@')) {
-      data.email = this.username
-    } else {
-      data.phoneNumber = this.username
-    }
+      // See if the user has provided an email or phone as username
+      if (this.username.includes('@')) {
+        data.email = this.username
+      } else {
+        data.phoneNumber = this.username
+      }
 
-    // Log the data depending on the debug setting
-    if (this.debug) {
-      this.log('%s.', this.messages.sendLogin)
-    }
+      // Log the data depending on the debug setting
+      if (this.debug) {
+        this.log('%s.', this.messages.sendLogin)
+      }
 
-    // Set up the request signature
-    const dataToSign = this.crypto.createHmac('sha256', this.consts.appSecret)
-      .update(JSON.stringify(data)).digest('base64')
+      // Set up the request signature
+      const dataToSign = this.crypto.createHmac('sha256', this.consts.appSecret)
+        .update(JSON.stringify(data)).digest('base64')
 
-    // Send the request
-    const res = await this.axios.post(
-      'https://' + this.httpHost + '/v2/user/login', data,
-      {
-        headers: {
-          Authorization: 'Sign ' + dataToSign,
-          'Content-Type': 'application/json',
-          'X-CK-Appid': this.consts.appId,
-          'X-CK-Nonce': Math.random().toString(36).substr(2, 8)
+      // Send the request
+      const res = await this.axios.post(
+        'https://' + this.httpHost + '/v2/user/login', data,
+        {
+          headers: {
+            Authorization: 'Sign ' + dataToSign,
+            'Content-Type': 'application/json',
+            'X-CK-Appid': this.consts.appId,
+            'X-CK-Nonce': Math.random().toString(36).substr(2, 8)
+          }
         }
-      }
-    )
+      )
 
-    // Parse the response
-    const body = res.data
-    if (body.error === 10004 && body.data && body.data.region) {
+      // Parse the response
+      const body = res.data
+      if (body.error === 10004 && body.data && body.data.region) {
       // In this case the user has been given a different region so retry login
-      const givenRegion = body.data.region
-
-      // Check the new received region is valid
-      switch (givenRegion) {
-        case 'eu':
-        case 'us':
-        case 'as':
-          this.httpHost = givenRegion + '-apia.coolkit.cc'
-          break
-        case 'cn':
-          this.httpHost = 'cn-apia.coolkit.cn'
-          break
-        default:
-          throw new Error(this.messages.noRegionRec + ' - [' + givenRegion + '].')
-      }
-
-      // Log the new http host if appropriate
-      if (this.debug) {
-        this.log('%s [%s].', this.messages.newRegionRec, this.httpHost)
-      }
+        const givenRegion = body.data.region
+
+        // Check the new received region is valid
+        switch (givenRegion) {
+          case 'eu':
+          case 'us':
+          case 'as':
+            this.httpHost = givenRegion + '-apia.coolkit.cc'
+            break
+          case 'cn':
+            this.httpHost = 'cn-apia.coolkit.cn'
+            break
+          default:
+            throw new Error(this.messages.noRegionRec + ' - [' + givenRegion + '].')
+        }
 
-      // Retry the login with the new http host
-      return await this.login()
-    } else {
-      if (body.data.at) {
-        // User api key and token received successfully
-        this.aToken = body.data.at
-        this.apiKey = body.data.user.apikey
-        return {
-          aToken: this.aToken,
-          apiKey: this.apiKey,
-          httpHost: this.httpHost
+        // Log the new http host if appropriate
+        if (this.debug) {
+          this.log('%s [%s].', this.messages.newRegionRec, this.httpHost)
         }
+
+        // Retry the login with the new http host
+        return await this.login()
       } else {
-        if (body.error === 500) {
-          // Retry if another attempt could be successful
-          this.log.warn('%s.', this.messages.eweError)
-          await this.funcs.sleep(30000)
-          return await this.login()
+        if (body.data.at) {
+        // User api key and token received successfully
+          this.aToken = body.data.at
+          this.apiKey = body.data.user.apikey
+          return {
+            aToken: this.aToken,
+            apiKey: this.apiKey,
+            httpHost: this.httpHost
+          }
         } else {
-          throw new Error(this.messages.noAuthRec + '.\n' + JSON.stringify(body, null, 2))
+          if (body.error === 500) {
+          // Retry if another attempt could be successful
+            this.log.warn('%s.', this.messages.eweError)
+            await this.funcs.sleep(30000)
+            return await this.login()
+          } else {
+            const text = JSON.stringify(body, null, 2)
+            throw new Error(this.messages.noAuthRec + '.\n' + text)
+          }
         }
       }
+    } catch (err) {
+      this.log.warn('%s.', this.messages.errLogin)
+      throw err
     }
   }
 
diff --git a/lib/connection/ws.js b/lib/connection/ws.js
index b6c9b39b..1b63d2b0 100644
--- a/lib/connection/ws.js
+++ b/lib/connection/ws.js
@@ -30,7 +30,7 @@ module.exports = class connectionWS {
     this.wsIsConnected = false
   }
 
-  async getWSHost () {
+  async getHost () {
     // Used to get the web socket host
     try {
       // Send the HTTP request to get the web socket host
@@ -70,10 +70,10 @@ module.exports = class connectionWS {
         // Retry if another attempt could be successful
         this.log.warn('%s (%s - 3).', this.messages.httpRetry, err.code)
         await this.funcs.sleep(30000)
-        return await this.getWSHost()
+        return await this.getHost()
       } else {
         // It's not a eWeLink problem so report the error back
-        this.log.warn('%s.', this.messages.errGetWSHost)
+        this.log.warn('%s.', this.messages.errgetHost)
         throw err
       }
     }
@@ -93,7 +93,7 @@ module.exports = class connectionWS {
       await this.closeConnection()
 
       // Refresh the web socket host
-      const wsHost = await this.getWSHost()
+      const wsHost = await this.getHost()
 
       // Create the web socket client
       this.wsClient = new this.wsp('wss://' + wsHost + ':8080/api/ws', {
diff --git a/lib/utils/lang-en.js b/lib/utils/lang-en.js
index 1a79adde..7b098696 100644
--- a/lib/utils/lang-en.js
+++ b/lib/utils/lang-en.js
@@ -33,9 +33,10 @@ module.exports = {
   devRemove: 'has been removed from Homebridge',
   disabled: 'To change this, set disablePlugin to false',
   disabling: 'Disabling plugin',
-  errGetDevice: 'An error occurred during getDevice()',
-  errGetDevices: 'An error occurred during getDevices()',
-  errGetWSHost: '',
+  errGetDevice: 'An error occurred during http getDevice()',
+  errGetDevices: 'An error occurred during http getDevices()',
+  errGetHost: 'An error occurred during ws getHost()',
+  errLogin: 'An error occurred during http login()',
   eweError: 'An eWeLink error [500] occured, retrying in 30 seconds',
   foundWithIP: 'found locally with IP',
   httpRetry: 'Unable to reach eWeLink, retrying in 30 seconds',

From c26d68932c43fd7711f343a9be370a0ffae66012 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 19 Apr 2021 19:40:58 +0100
Subject: [PATCH 1900/3183] 6.2.2-beta.1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index e7388937..9efda74b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.2.2-beta.0",
+  "version": "6.2.2-beta.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index faee2f79..e2b54d34 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.2.2-beta.0",
+  "version": "6.2.2-beta.1",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From ef373bbe637954e2763559c69db67fe63a3d2651 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 20 Apr 2021 08:25:52 +0100
Subject: [PATCH 1901/3183] retry login on certain http error codes

---
 lib/connection/http.js | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/lib/connection/http.js b/lib/connection/http.js
index d400c191..a0d3048c 100644
--- a/lib/connection/http.js
+++ b/lib/connection/http.js
@@ -112,8 +112,17 @@ module.exports = class connectionHTTP {
         }
       }
     } catch (err) {
-      this.log.warn('%s.', this.messages.errLogin)
-      throw err
+      // Check to see if it's a eWeLink server problem and we can retry
+      if (err.code && this.consts.httpRetryCodes.includes(err.code)) {
+        // Retry if another attempt could be successful
+        this.log.warn('%s [login() - %s].', this.messages.httpRetry, err.code)
+        await this.funcs.sleep(30000)
+        return await this.login()
+      } else {
+        // It's not a eWeLink problem so report the error back
+        this.log.warn('%s.', this.messages.errLogin)
+        throw err
+      }
     }
   }
 

From 569cad6bf89a36eb3951627c57d6445a53d4cee2 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 20 Apr 2021 08:26:23 +0100
Subject: [PATCH 1902/3183] clarify functions in log errors

---
 lib/connection/http.js | 4 ++--
 lib/connection/ws.js   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/connection/http.js b/lib/connection/http.js
index a0d3048c..8876415b 100644
--- a/lib/connection/http.js
+++ b/lib/connection/http.js
@@ -177,7 +177,7 @@ module.exports = class connectionHTTP {
       // Check to see if it's a eWeLink server problem and we can retry
       if (err.code && this.consts.httpRetryCodes.includes(err.code)) {
         // Retry if another attempt could be successful
-        this.log.warn('%s (%s - 1).', this.messages.httpRetry, err.code)
+        this.log.warn('%s [getDevices() - %s].', this.messages.httpRetry, err.code)
         await this.funcs.sleep(30000)
         return await this.getDevices()
       } else {
@@ -224,7 +224,7 @@ module.exports = class connectionHTTP {
     } catch (err) {
       if (err.code && this.consts.httpRetryCodes.includes(err.code)) {
         // Retry if another attempt could be successful
-        this.log.warn('%s (%s - 2).', this.messages.httpRetry, err.code)
+        this.log.warn('%s [getDevice() - %s].', this.messages.httpRetry, err.code)
         await this.funcs.sleep(30000)
         return await this.getDevice(deviceId)
       } else {
diff --git a/lib/connection/ws.js b/lib/connection/ws.js
index 1b63d2b0..408c5a13 100644
--- a/lib/connection/ws.js
+++ b/lib/connection/ws.js
@@ -68,7 +68,7 @@ module.exports = class connectionWS {
       // Check to see if it's a eWeLink server problem and we can retry
       if (err.code && this.consts.httpRetryCodes.includes(err.code)) {
         // Retry if another attempt could be successful
-        this.log.warn('%s (%s - 3).', this.messages.httpRetry, err.code)
+        this.log.warn('%s [getHost() - %s].', this.messages.httpRetry, err.code)
         await this.funcs.sleep(30000)
         return await this.getHost()
       } else {

From d6242b67d66bb77af53582ff8c128d0b0bbba776 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 20 Apr 2021 08:26:31 +0100
Subject: [PATCH 1903/3183] formatting indentation

---
 lib/connection/http.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/connection/http.js b/lib/connection/http.js
index 8876415b..becde388 100644
--- a/lib/connection/http.js
+++ b/lib/connection/http.js
@@ -27,7 +27,7 @@ module.exports = class connectionHTTP {
 
   async login () {
     try {
-    // Used to log the user in and obtain the user api key and token
+      // Used to log the user in and obtain the user api key and token
       const data = {
         countryCode: '+44',
         password: this.password
@@ -65,7 +65,7 @@ module.exports = class connectionHTTP {
       // Parse the response
       const body = res.data
       if (body.error === 10004 && body.data && body.data.region) {
-      // In this case the user has been given a different region so retry login
+        // In this case the user has been given a different region so retry login
         const givenRegion = body.data.region
 
         // Check the new received region is valid
@@ -91,7 +91,7 @@ module.exports = class connectionHTTP {
         return await this.login()
       } else {
         if (body.data.at) {
-        // User api key and token received successfully
+          // User api key and token received successfully
           this.aToken = body.data.at
           this.apiKey = body.data.user.apikey
           return {
@@ -101,7 +101,7 @@ module.exports = class connectionHTTP {
           }
         } else {
           if (body.error === 500) {
-          // Retry if another attempt could be successful
+            // Retry if another attempt could be successful
             this.log.warn('%s.', this.messages.eweError)
             await this.funcs.sleep(30000)
             return await this.login()

From 3147a6ee7dfb8592e94121070c159e537bcf3ca8 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 20 Apr 2021 08:27:17 +0100
Subject: [PATCH 1904/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 94dd5671..75745c74 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 All notable changes to this homebridge-ewelink will be documented in this file.
 
+## BETA
+
+### Changes
+
+* Automatically retry eWeLink login on startup in case of certain error codes
+
 ## 6.2.1 (2021-04-18)
 
 ### Changes

From bb7841dab79366d114535b411fae64504ad67367 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 20 Apr 2021 08:28:24 +0100
Subject: [PATCH 1905/3183] 6.2.2-beta.2

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 9efda74b..8e8df742 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.2.2-beta.1",
+  "version": "6.2.2-beta.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index e2b54d34..ecc4e8ce 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.2.2-beta.1",
+  "version": "6.2.2-beta.2",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From b260cb730874fa25c212d49cb3b0b2232529b5e9 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 20 Apr 2021 09:08:11 +0100
Subject: [PATCH 1906/3183] output multi switch hide channels to log

---
 lib/device/switch-double.js | 4 ++++
 lib/device/switch-multi.js  | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/lib/device/switch-double.js b/lib/device/switch-double.js
index 5da4e675..581284b6 100644
--- a/lib/device/switch-double.js
+++ b/lib/device/switch-double.js
@@ -22,6 +22,9 @@ module.exports = class deviceSwitchMulti {
     const deviceId = this.accessory.context.eweDeviceId
     const deviceConf = platform.multiDevices[deviceId]
     this.showAsOutlet = deviceConf && deviceConf.showAsOutlet
+    this.hideChannels = deviceConf && deviceConf.hideChannels
+      ? deviceConf.hideChannels
+      : ''
     this.disableDeviceLogging = deviceConf && deviceConf.overrideDisabledLogging
       ? false
       : platform.config.disableDeviceLogging
@@ -60,6 +63,7 @@ module.exports = class deviceSwitchMulti {
     if (this.debug) {
       const opts = JSON.stringify({
         disableDeviceLogging: this.disableDeviceLogging,
+        hideChannels: this.hideChannels,
         showAsOutlet: this.showAsOutlet
       })
       this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
diff --git a/lib/device/switch-multi.js b/lib/device/switch-multi.js
index 2c067fa6..7cb62f43 100644
--- a/lib/device/switch-multi.js
+++ b/lib/device/switch-multi.js
@@ -22,6 +22,9 @@ module.exports = class deviceSwitchMulti {
     const deviceId = this.accessory.context.eweDeviceId
     const deviceConf = platform.multiDevices[deviceId]
     this.showAsOutlet = deviceConf && deviceConf.showAsOutlet
+    this.hideChannels = deviceConf && deviceConf.hideChannels
+      ? deviceConf.hideChannels
+      : ''
     this.disableDeviceLogging = deviceConf && deviceConf.overrideDisabledLogging
       ? false
       : platform.config.disableDeviceLogging
@@ -60,6 +63,7 @@ module.exports = class deviceSwitchMulti {
     if (this.debug) {
       const opts = JSON.stringify({
         disableDeviceLogging: this.disableDeviceLogging,
+        hideChannels: this.hideChannels,
         showAsOutlet: this.showAsOutlet
       })
       this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)

From 495d4c037b0852616431dd6f79533ec093832048 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 20 Apr 2021 09:13:14 +0100
Subject: [PATCH 1907/3183] hide opts if default

---
 lib/device/switch-double.js | 2 +-
 lib/device/switch-multi.js  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/device/switch-double.js b/lib/device/switch-double.js
index 581284b6..1ced76e9 100644
--- a/lib/device/switch-double.js
+++ b/lib/device/switch-double.js
@@ -24,7 +24,7 @@ module.exports = class deviceSwitchMulti {
     this.showAsOutlet = deviceConf && deviceConf.showAsOutlet
     this.hideChannels = deviceConf && deviceConf.hideChannels
       ? deviceConf.hideChannels
-      : ''
+      : undefined
     this.disableDeviceLogging = deviceConf && deviceConf.overrideDisabledLogging
       ? false
       : platform.config.disableDeviceLogging
diff --git a/lib/device/switch-multi.js b/lib/device/switch-multi.js
index 7cb62f43..27d642a1 100644
--- a/lib/device/switch-multi.js
+++ b/lib/device/switch-multi.js
@@ -24,7 +24,7 @@ module.exports = class deviceSwitchMulti {
     this.showAsOutlet = deviceConf && deviceConf.showAsOutlet
     this.hideChannels = deviceConf && deviceConf.hideChannels
       ? deviceConf.hideChannels
-      : ''
+      : undefined
     this.disableDeviceLogging = deviceConf && deviceConf.overrideDisabledLogging
       ? false
       : platform.config.disableDeviceLogging

From 7f1621a5b47ebd89c3b10609d374a54044b266ec Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 22 Apr 2021 14:23:45 +0100
Subject: [PATCH 1908/3183] skeleton for dualr3 motor

---
 lib/device/motor.js    | 74 ++++++++++++++++++++++++++++++++++++++++++
 lib/index.js           |  9 +++++
 lib/utils/constants.js |  8 ++---
 3 files changed, 87 insertions(+), 4 deletions(-)
 create mode 100644 lib/device/motor.js

diff --git a/lib/device/motor.js b/lib/device/motor.js
new file mode 100644
index 00000000..11846630
--- /dev/null
+++ b/lib/device/motor.js
@@ -0,0 +1,74 @@
+/* jshint -W014, -W033, esversion: 9 */
+/* eslint-disable new-cap */
+'use strict'
+
+module.exports = class deviceMotor {
+  constructor (platform, accessory) {
+    // Set up variables from the platform
+    this.consts = platform.consts
+    this.debug = platform.config.debug
+    this.funcs = platform.funcs
+    this.hapServ = platform.api.hap.Service
+    this.hapChar = platform.api.hap.Characteristic
+    this.log = platform.log
+    this.messages = platform.messages
+    this.platform = platform
+
+    // Set up variables from the accessory
+    this.name = accessory.displayName
+    this.accessory = accessory
+
+    /*
+      This is for the DUALR3 using motor mode
+      This device's parameters are:
+      motorTurn: 1=OPEN, 0=STOP, 2=CLOSE
+    */
+
+    // Set up custom variables for this device type
+    const deviceId = this.accessory.context.eweDeviceId
+    const deviceConf = platform.multiDevices[deviceId]
+    this.disableDeviceLogging = deviceConf && deviceConf.overrideDisabledLogging
+      ? false
+      : platform.config.disableDeviceLogging
+
+    // Add the window covering service if it doesn't already exist
+    this.service = this.accessory.getService(this.hapServ.WindowCovering) ||
+      this.accessory.addService(this.hapServ.WindowCovering)
+
+    // Add the set handler to the target position characteristic
+    this.service.getCharacteristic(this.hapChar.TargetPosition).onSet(async value => {
+      await this.internalUpdate(value)
+    })
+
+    // Output the customised options to the log if in debug mode
+    if (this.debug) {
+      const opts = JSON.stringify({ disableDeviceLogging: this.disableDeviceLogging })
+      this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
+    }
+  }
+
+  async internalUpdate (value) {
+    try {
+      //
+    } catch (err) {
+      // Catch any errors and let the platform display them
+      this.platform.deviceUpdateError(this.accessory, err, true)
+      setTimeout(() => {
+        this.service.updateCharacteristic(
+          this.hapChar.TargetPosition,
+          this.cachePosition
+        )
+      }, 5000)
+      throw new this.platform.api.hap.HapStatusError(-70402)
+    }
+  }
+
+  async externalUpdate (params) {
+    try {
+      //
+    } catch (err) {
+      // Catch any errors and let the platform display them
+      this.platform.deviceUpdateError(this.accessory, err, false)
+    }
+  }
+}
diff --git a/lib/index.js b/lib/index.js
index 901aef46..23e9fba5 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -572,6 +572,15 @@ class eWeLinkPlatform {
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/curtain'))(this, accessory)
         /**********************/
+      } else if (device.extra.uiid === 126 && device.params.workMode === 2) {
+        /*************************
+        BLINDS [DUALR3 MOTOR MODE]
+        *************************/
+        accessory = this.devicesInHB.has(uuid)
+          ? this.devicesInHB.get(uuid)
+          : this.addAccessory(device, device.deviceid + 'SWX')
+        accessory.control = new (require('./device/motor'))(this, accessory)
+        /************************/
       } else if (
         this.simulations[device.deviceid] &&
         this.simulations[device.deviceid].type === 'blind'
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 6ac8f2bc..87f9365c 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -138,10 +138,10 @@ module.exports = {
     'battery', 'bright', 'brightness', 'channel', 'channel0', 'cmd', 'color', 'colorB',
     'colorG', 'colorR', 'current', 'currentHumidity', 'currentTemperature', 'humidity',
     'key', 'lightbright', 'lightswitch', 'lightRcolor', 'lightGcolor', 'lightBcolor',
-    'lock', 'ltype', 'mainSwitch', 'mode', 'motion', 'online', 'power', 'rfChl', 'rfList',
-    'rfTrig', 'sensorType', 'setclose', 'state', 'switch', 'switches', 'targetTemp',
-    'temperature', 'tempScale', 'trigTime', 'type', 'voltage', 'white', 'workMode',
-    'workState', 'zyx_mode'
+    'lock', 'ltype', 'mainSwitch', 'mode', 'motion', 'motorTurn', 'online', 'power',
+    'rfChl', 'rfList', 'rfTrig', 'sensorType', 'setclose', 'state', 'switch', 'switches',
+    'targetTemp', 'temperature', 'tempScale', 'trigTime', 'type', 'voltage', 'white',
+    'workMode', 'workState', 'zyx_mode'
   ],
 
   defaultDoubleSwitchOff: [

From f1443f2d41d78dc2345756387db228d5fb59c510 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 23 Apr 2021 19:13:40 +0100
Subject: [PATCH 1909/3183] only update needed switch

---
 lib/device/switch-double.js | 40 ++++++++++++---------------------
 lib/device/switch-multi.js  | 44 ++++++++++++++-----------------------
 2 files changed, 30 insertions(+), 54 deletions(-)

diff --git a/lib/device/switch-double.js b/lib/device/switch-double.js
index 1ced76e9..02c068dd 100644
--- a/lib/device/switch-double.js
+++ b/lib/device/switch-double.js
@@ -76,32 +76,21 @@ module.exports = class deviceSwitchMulti {
       let oAccessory
       let masterState = 'off'
       const params = {
-        switches: this.consts.defaultDoubleSwitchOff
+        switches: []
       }
-      switch (this.accessory.context.switchNumber) {
+      const switchNumber = this.accessory.context.switchNumber
+      switch (switchNumber) {
         case '0':
-          params.switches[0].switch = value ? 'on' : 'off'
-          params.switches[1].switch = value ? 'on' : 'off'
+          params.switches.push({ switch: value ? 'on' : 'off', outlet: 0 })
+          params.switches.push({ switch: value ? 'on' : 'off', outlet: 1 })
           break
         case '1':
         case '2':
-          for (let i = 1; i <= this.accessory.context.channelCount; i++) {
-            const idToCheck = this.accessory.context.eweDeviceId + 'SW' + i
-            const uuid = this.platform.api.hap.uuid.generate(idToCheck)
-            if ((oAccessory = this.platform.devicesInHB.get(uuid))) {
-              if (i === parseInt(this.accessory.context.switchNumber)) {
-                params.switches[i - 1].switch = value ? 'on' : 'off'
-              } else {
-                params.switches[i - 1].switch = oAccessory.context.cacheOnOff
-              }
-            } else {
-              params.switches[i - 1].switch = 'off'
-            }
-          }
+          params.switches.push({ switch: value ? 'on' : 'off', outlet: switchNumber - 1 })
           break
       }
       await this.platform.sendDeviceUpdate(this.accessory, params)
-      switch (this.accessory.context.switchNumber) {
+      switch (switchNumber) {
         case '0':
           for (let i = 0; i <= this.accessory.context.channelCount; i++) {
             const idToCheck = this.accessory.context.eweDeviceId + 'SW' + i
@@ -122,7 +111,6 @@ module.exports = class deviceSwitchMulti {
                   value
                 )
               }
-              oAccessory.context.cacheOnOff = value ? 'on' : 'off'
               oAccessory.eveService.addEntry({ status: value ? 1 : 0 })
               if (i > 0 && !this.disableDeviceLogging) {
                 const name = oAccessory.displayName
@@ -143,8 +131,7 @@ module.exports = class deviceSwitchMulti {
               if (oAccessory.getService(serv).getCharacteristic(this.hapChar.On).value) {
                 masterState = 'on'
               }
-              if (i === parseInt(this.accessory.context.switchNumber)) {
-                oAccessory.context.cacheOnOff = value ? 'on' : 'off'
+              if (i === parseInt(switchNumber)) {
                 oAccessory.eveService.addEntry({ status: value ? 1 : 0 })
                 if (this.showAsOutlet) {
                   oAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
@@ -208,10 +195,12 @@ module.exports = class deviceSwitchMulti {
         const uuid = this.platform.api.hap.uuid.generate(idToCheck + i)
         if (this.platform.devicesInHB.has(uuid)) {
           const oAccessory = this.platform.devicesInHB.get(uuid)
-          if (
-            params.updateSource &&
-            params.switches[i - 1].switch === oAccessory.context.cacheOnOff
-          ) {
+          const servToUse = this.showAsOutlet ? this.hapServ.Outlet : this.hapServ.Switch
+          const service = oAccessory.getService(servToUse)
+          const currentState = service.getCharacteristic(this.hapChar.On).value
+            ? 'on'
+            : 'off'
+          if (params.updateSource && params.switches[i - 1].switch === currentState) {
             continue
           }
           if (this.showAsOutlet) {
@@ -229,7 +218,6 @@ module.exports = class deviceSwitchMulti {
               params.switches[i - 1].switch === 'on'
             )
           }
-          oAccessory.context.cacheOnOff = params.switches[i - 1].switch
           oAccessory.eveService.addEntry({
             status: params.switches[i - 1].switch === 'on' ? 1 : 0
           })
diff --git a/lib/device/switch-multi.js b/lib/device/switch-multi.js
index 27d642a1..1d187e47 100644
--- a/lib/device/switch-multi.js
+++ b/lib/device/switch-multi.js
@@ -76,36 +76,25 @@ module.exports = class deviceSwitchMulti {
       let oAccessory
       let masterState = 'off'
       const params = {
-        switches: this.consts.defaultMultiSwitchOff
+        switches: []
       }
-      switch (this.accessory.context.switchNumber) {
+      const switchNumber = this.accessory.context.switchNumber
+      switch (switchNumber) {
         case '0':
-          params.switches[0].switch = value ? 'on' : 'off'
-          params.switches[1].switch = value ? 'on' : 'off'
-          params.switches[2].switch = value ? 'on' : 'off'
-          params.switches[3].switch = value ? 'on' : 'off'
+          params.switches.push({ switch: value ? 'on' : 'off', outlet: 0 })
+          params.switches.push({ switch: value ? 'on' : 'off', outlet: 1 })
+          params.switches.push({ switch: value ? 'on' : 'off', outlet: 2 })
+          params.switches.push({ switch: value ? 'on' : 'off', outlet: 3 })
           break
         case '1':
         case '2':
         case '3':
         case '4':
-          for (let i = 1; i <= this.accessory.context.channelCount; i++) {
-            const idToCheck = this.accessory.context.eweDeviceId + 'SW' + i
-            const uuid = this.platform.api.hap.uuid.generate(idToCheck)
-            if ((oAccessory = this.platform.devicesInHB.get(uuid))) {
-              if (i === parseInt(this.accessory.context.switchNumber)) {
-                params.switches[i - 1].switch = value ? 'on' : 'off'
-              } else {
-                params.switches[i - 1].switch = oAccessory.context.cacheOnOff
-              }
-            } else {
-              params.switches[i - 1].switch = 'off'
-            }
-          }
+          params.switches.push({ switch: value ? 'on' : 'off', outlet: switchNumber - 1 })
           break
       }
       await this.platform.sendDeviceUpdate(this.accessory, params)
-      switch (this.accessory.context.switchNumber) {
+      switch (switchNumber) {
         case '0':
           for (let i = 0; i <= this.accessory.context.channelCount; i++) {
             const idToCheck = this.accessory.context.eweDeviceId + 'SW' + i
@@ -126,7 +115,6 @@ module.exports = class deviceSwitchMulti {
                   value
                 )
               }
-              oAccessory.context.cacheOnOff = value ? 'on' : 'off'
               oAccessory.eveService.addEntry({ status: value ? 1 : 0 })
               if (i > 0 && !this.disableDeviceLogging) {
                 const name = oAccessory.displayName
@@ -149,8 +137,7 @@ module.exports = class deviceSwitchMulti {
               if (oAccessory.getService(serv).getCharacteristic(this.hapChar.On).value) {
                 masterState = 'on'
               }
-              if (i === parseInt(this.accessory.context.switchNumber)) {
-                oAccessory.context.cacheOnOff = value ? 'on' : 'off'
+              if (i === parseInt(switchNumber)) {
                 oAccessory.eveService.addEntry({ status: value ? 1 : 0 })
                 if (this.showAsOutlet) {
                   oAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
@@ -214,10 +201,12 @@ module.exports = class deviceSwitchMulti {
         const uuid = this.platform.api.hap.uuid.generate(idToCheck + i)
         if (this.platform.devicesInHB.has(uuid)) {
           const oAccessory = this.platform.devicesInHB.get(uuid)
-          if (
-            params.updateSource &&
-            params.switches[i - 1].switch === oAccessory.context.cacheOnOff
-          ) {
+          const servToUse = this.showAsOutlet ? this.hapServ.Outlet : this.hapServ.Switch
+          const service = oAccessory.getService(servToUse)
+          const currentState = service.getCharacteristic(this.hapChar.On).value
+            ? 'on'
+            : 'off'
+          if (params.updateSource && params.switches[i - 1].switch === currentState) {
             continue
           }
           if (this.showAsOutlet) {
@@ -235,7 +224,6 @@ module.exports = class deviceSwitchMulti {
               params.switches[i - 1].switch === 'on'
             )
           }
-          oAccessory.context.cacheOnOff = params.switches[i - 1].switch
           oAccessory.eveService.addEntry({
             status: params.switches[i - 1].switch === 'on' ? 1 : 0
           })

From 73388ac3ac8e86ae5dd1f80fb5b0aacf71c59554 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 23 Apr 2021 19:15:07 +0100
Subject: [PATCH 1910/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 75745c74..da3cff74 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 ### Changes
 
+* Changed update command for multi-switch devices to only update desired switch
 * Automatically retry eWeLink login on startup in case of certain error codes
 
 ## 6.2.1 (2021-04-18)

From 02bff1c410307b35ef1cb89ae2d50d184997ca16 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 23 Apr 2021 19:15:42 +0100
Subject: [PATCH 1911/3183] 6.2.2-beta.3

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 8e8df742..e65fa630 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.2.2-beta.2",
+  "version": "6.2.2-beta.3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index ecc4e8ce..eb9c18bc 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.2.2-beta.2",
+  "version": "6.2.2-beta.3",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 1a3b51a6879a65b26ef900a6dd59bee881f7854d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 23 Apr 2021 19:17:50 +0100
Subject: [PATCH 1912/3183] remove awaits with switches

---
 lib/device/switch-double.js | 1 -
 lib/device/switch-multi.js  | 1 -
 lib/device/switch-single.js | 1 -
 3 files changed, 3 deletions(-)

diff --git a/lib/device/switch-double.js b/lib/device/switch-double.js
index 02c068dd..ab692ce7 100644
--- a/lib/device/switch-double.js
+++ b/lib/device/switch-double.js
@@ -72,7 +72,6 @@ module.exports = class deviceSwitchMulti {
 
   async internalUpdate (value) {
     try {
-      await this.funcs.sleep(Math.floor(Math.random() * 241 + 10))
       let oAccessory
       let masterState = 'off'
       const params = {
diff --git a/lib/device/switch-multi.js b/lib/device/switch-multi.js
index 1d187e47..a41672c3 100644
--- a/lib/device/switch-multi.js
+++ b/lib/device/switch-multi.js
@@ -72,7 +72,6 @@ module.exports = class deviceSwitchMulti {
 
   async internalUpdate (value) {
     try {
-      await this.funcs.sleep(Math.floor(Math.random() * 241 + 10))
       let oAccessory
       let masterState = 'off'
       const params = {
diff --git a/lib/device/switch-single.js b/lib/device/switch-single.js
index dae88352..264aa605 100644
--- a/lib/device/switch-single.js
+++ b/lib/device/switch-single.js
@@ -53,7 +53,6 @@ module.exports = class deviceSwitchSingle {
 
   async internalUpdate (value) {
     try {
-      await this.funcs.sleep(Math.floor(Math.random() * 241 + 10))
       const newValue = value ? 'on' : 'off'
       await this.platform.sendDeviceUpdate(this.accessory, {
         switch: newValue

From 00d5a3f6f27de60118d6d05879ba0208b82ae27f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 23 Apr 2021 19:18:18 +0100
Subject: [PATCH 1913/3183] 6.2.2-beta.4

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index e65fa630..e77b15aa 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.2.2-beta.3",
+  "version": "6.2.2-beta.4",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index eb9c18bc..b8b37f3f 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.2.2-beta.3",
+  "version": "6.2.2-beta.4",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From dae612082e39f1173f8f2255307a73d6555b4ec6 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 24 Apr 2021 09:38:45 +0100
Subject: [PATCH 1914/3183] only update needed switch

---
 lib/device/fan.js                     | 39 ++++++++-------
 lib/device/outlet-scm.js              |  5 +-
 lib/device/simulation/blind.js        | 22 +++++----
 lib/device/simulation/door.js         | 22 +++++----
 lib/device/simulation/garage-four.js  | 10 ++--
 lib/device/simulation/garage-one.js   | 15 ++++--
 lib/device/simulation/garage-two.js   | 21 +++++----
 lib/device/simulation/lock-one.js     |  8 ++--
 lib/device/simulation/switch-valve.js | 20 ++++----
 lib/device/simulation/tap-one.js      |  8 ++--
 lib/device/simulation/tap-two.js      | 20 ++------
 lib/device/simulation/valve-four.js   | 68 +++++----------------------
 lib/device/simulation/valve-one.js    |  8 ++--
 lib/device/simulation/valve-two.js    | 28 ++++-------
 lib/device/simulation/window.js       | 22 +++++----
 lib/utils/constants.js                | 12 -----
 16 files changed, 131 insertions(+), 197 deletions(-)

diff --git a/lib/device/fan.js b/lib/device/fan.js
index bb7da237..0868eaa9 100644
--- a/lib/device/fan.js
+++ b/lib/device/fan.js
@@ -74,19 +74,22 @@ module.exports = class deviceFan {
   async internalSpeedUpdate (value) {
     try {
       const params = {
-        switches: this.consts.defaultMultiSwitchOff
+        switches: []
       }
       const newPower = value >= 33
       const newSpeed = value
-      const newLight = this.lightService
-        ? this.lightService.getCharacteristic(this.hapChar.On).value
-        : true
-      params.switches[0].switch = newLight ? 'on' : 'off'
-      params.switches[1].switch = newPower && newSpeed >= 33 ? 'on' : 'off'
-      params.switches[2].switch = newPower && newSpeed >= 66 && newSpeed < 99
-        ? 'on'
-        : 'off'
-      params.switches[3].switch = newPower && newSpeed >= 99 ? 'on' : 'off'
+      params.switches.push({
+        switch: newPower && newSpeed >= 33 ? 'on' : 'off',
+        outlet: 1
+      })
+      params.switches.push({
+        switch: newPower && newSpeed >= 66 && newSpeed < 99 ? 'on' : 'off',
+        outlet: 2
+      })
+      params.switches.push({
+        switch: newPower && newSpeed >= 99 ? 'on' : 'off',
+        outlet: 3
+      })
       await this.platform.sendDeviceUpdate(this.accessory, params)
       if (newPower !== (this.cacheOnOff === 'on')) {
         this.cacheOnOff = newPower ? 'on' : 'off'
@@ -112,17 +115,13 @@ module.exports = class deviceFan {
   async internalLightUpdate (value) {
     try {
       const params = {
-        switches: this.consts.defaultMultiSwitchOff
+        switches: []
       }
-      const newPower = this.service.getCharacteristic(this.hapChar.On).value
-      const newSpeed = this.service.getCharacteristic(this.hapChar.RotationSpeed).value
-      const newLight = this.lightService ? value : true
-      params.switches[0].switch = newLight ? 'on' : 'off'
-      params.switches[1].switch = newPower && newSpeed >= 33 ? 'on' : 'off'
-      params.switches[2].switch = newPower && newSpeed >= 66 && newSpeed < 99
-        ? 'on'
-        : 'off'
-      params.switches[3].switch = newPower && newSpeed >= 99 ? 'on' : 'off'
+      const newLight = value
+      params.switches.push({
+        switch: newLight ? 'on' : 'off',
+        outlet: 0
+      })
       await this.platform.sendDeviceUpdate(this.accessory, params)
       if (newLight !== (this.cacheLight === 'on')) {
         this.cacheLight = newLight ? 'on' : 'off'
diff --git a/lib/device/outlet-scm.js b/lib/device/outlet-scm.js
index b19201f0..f32485f1 100644
--- a/lib/device/outlet-scm.js
+++ b/lib/device/outlet-scm.js
@@ -70,8 +70,9 @@ module.exports = class deviceOutletSCM {
   async internalUpdate (value) {
     try {
       const newValue = value ? 'on' : 'off'
-      const params = { switches: this.consts.defaultMultiSwitchOff }
-      params.switches[0].switch = newValue
+      const params = {
+        switches: [{ switch: newValue, outlet: 0 }]
+      }
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.cacheOnOff = newValue
       this.accessory.eveService.addEntry({ status: value ? 1 : 0 })
diff --git a/lib/device/simulation/blind.js b/lib/device/simulation/blind.js
index a4741579..31a7f4a9 100644
--- a/lib/device/simulation/blind.js
+++ b/lib/device/simulation/blind.js
@@ -68,9 +68,7 @@ module.exports = class deviceBlind {
         return
       }
       const params = {
-        switches: this.accessory.context.eweUIID === 126
-          ? this.consts.defaultDoubleSwitchOff
-          : this.consts.defaultMultiSwitchOff
+        switches: []
       }
       const prevState = this.accessory.context.cachePositionState
       const percentStepUpPerDS = this.operationTimeUp / 100
@@ -78,7 +76,10 @@ module.exports = class deviceBlind {
       const updateKey = Math.random().toString(36).substr(2, 8)
       this.updateKey = updateKey
       if (prevState !== 2) {
+        params.switches.push({ switch: 'off', outlet: 0 })
+        params.switches.push({ switch: 'off', outlet: 1 })
         await this.platform.sendDeviceUpdate(this.accessory, params)
+        params.switches = []
         const posPercentChange = Math.floor(Date.now() / 100) -
           this.accessory.context.cacheLastStartTime
         const posPercentChangeUp = Math.floor(percentStepUpPerDS * posPercentChange)
@@ -99,14 +100,13 @@ module.exports = class deviceBlind {
       let decisecondsToMove
       if (setToMoveUp) {
         decisecondsToMove = Math.round(Math.abs(diffPosition) * percentStepUpPerDS)
-        params.switches[0].switch = 'on'
-        params.switches[1].switch = 'off'
+        params.switches.push({ switch: 'on', outlet: 0 })
       } else {
         decisecondsToMove = Math.round(Math.abs(diffPosition) * percentStepDownPerDS)
-        params.switches[0].switch = 'off'
-        params.switches[1].switch = 'on'
+        params.switches.push({ switch: 'on', outlet: 1 })
       }
       await this.platform.sendDeviceUpdate(this.accessory, params)
+      params.switches = []
       this.accessory.context.cacheTargetPosition = value
       this.accessory.context.cachePositionState = setToMoveUp ? 1 : 0
       this.accessory.context.cacheLastStartTime = Math.floor(Date.now() / 100)
@@ -114,11 +114,13 @@ module.exports = class deviceBlind {
       if (this.updateKey !== updateKey) {
         return
       }
-      params.switches[0].switch = 'off'
-      params.switches[1].switch = 'off'
+      params.switches.push({
+        switch: 'off',
+        outlet: setToMoveUp ? 0 : 1
+      })
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.service.updateCharacteristic(this.hapChar.PositionState, 2)
-        .updateCharacteristic(this.hapChar.CurrentPosition, value)
+      this.service.updateCharacteristic(this.hapChar.CurrentPosition, value)
       this.accessory.context.cachePositionState = 2
       this.accessory.context.cacheCurrentPosition = value
       if (!this.disableDeviceLogging) {
diff --git a/lib/device/simulation/door.js b/lib/device/simulation/door.js
index ff30765e..3c78e98f 100644
--- a/lib/device/simulation/door.js
+++ b/lib/device/simulation/door.js
@@ -68,9 +68,7 @@ module.exports = class deviceDoor {
         return
       }
       const params = {
-        switches: this.accessory.context.eweUIID === 126
-          ? this.consts.defaultDoubleSwitchOff
-          : this.consts.defaultMultiSwitchOff
+        switches: []
       }
       const prevState = this.accessory.context.cachePositionState
       const percentStepUpPerDS = this.operationTimeUp / 100
@@ -78,7 +76,10 @@ module.exports = class deviceDoor {
       const updateKey = Math.random().toString(36).substr(2, 8)
       this.updateKey = updateKey
       if (prevState !== 2) {
+        params.switches.push({ switch: 'off', outlet: 0 })
+        params.switches.push({ switch: 'off', outlet: 1 })
         await this.platform.sendDeviceUpdate(this.accessory, params)
+        params.switches = []
         const posPercentChange = Math.floor(Date.now() / 100) -
           this.accessory.context.cacheLastStartTime
         const posPercentChangeUp = Math.floor(percentStepUpPerDS * posPercentChange)
@@ -99,14 +100,13 @@ module.exports = class deviceDoor {
       let decisecondsToMove
       if (setToMoveUp) {
         decisecondsToMove = Math.round(Math.abs(diffPosition) * percentStepUpPerDS)
-        params.switches[0].switch = 'on'
-        params.switches[1].switch = 'off'
+        params.switches.push({ switch: 'on', outlet: 0 })
       } else {
         decisecondsToMove = Math.round(Math.abs(diffPosition) * percentStepDownPerDS)
-        params.switches[0].switch = 'off'
-        params.switches[1].switch = 'on'
+        params.switches.push({ switch: 'on', outlet: 1 })
       }
       await this.platform.sendDeviceUpdate(this.accessory, params)
+      params.switches = []
       this.accessory.context.cacheTargetPosition = value
       this.accessory.context.cachePositionState = setToMoveUp ? 1 : 0
       this.accessory.context.cacheLastStartTime = Math.floor(Date.now() / 100)
@@ -114,11 +114,13 @@ module.exports = class deviceDoor {
       if (this.updateKey !== updateKey) {
         return
       }
-      params.switches[0].switch = 'off'
-      params.switches[1].switch = 'off'
+      params.switches.push({
+        switch: 'off',
+        outlet: setToMoveUp ? 0 : 1
+      })
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.service.updateCharacteristic(this.hapChar.PositionState, 2)
-        .updateCharacteristic(this.hapChar.CurrentPosition, value)
+      this.service.updateCharacteristic(this.hapChar.CurrentPosition, value)
       this.accessory.context.cachePositionState = 2
       this.accessory.context.cacheCurrentPosition = value
       if (!this.disableDeviceLogging) {
diff --git a/lib/device/simulation/garage-four.js b/lib/device/simulation/garage-four.js
index 7bd51bbd..cbd38d00 100644
--- a/lib/device/simulation/garage-four.js
+++ b/lib/device/simulation/garage-four.js
@@ -103,13 +103,11 @@ module.exports = class deviceGarageFour {
       this.accessory.context.cacheStates[garageChannel].cacheTargetDoorState = value
       this.accessory.context.cacheStates[garageChannel].cacheCurrentDoorState = value + 2
       const params = {
-        switches: this.accessory.context.eweUIID === 126
-          ? this.consts.defaultDoubleSwitchOff
-          : this.consts.defaultMultiSwitchOff
+        switches: [{
+          switch: 'on',
+          outlet: garageChannel
+        }]
       }
-      ;[0, 1, 2, 3].forEach(i => {
-        params.switches[i].switch = garageChannel === i ? 'on' : 'off'
-      })
       await this.platform.sendDeviceUpdate(this.accessory, params)
       await this.funcs.sleep(2000)
       this.inUse = false
diff --git a/lib/device/simulation/garage-one.js b/lib/device/simulation/garage-one.js
index 1b2068e8..d44a86c7 100644
--- a/lib/device/simulation/garage-one.js
+++ b/lib/device/simulation/garage-one.js
@@ -160,11 +160,16 @@ module.exports = class deviceGarageOne {
           params.switch = 'on'
           break
         case 'twoSwitch':
-          params.switches = this.accessory.context.eweUIID === 126
-            ? this.consts.defaultDoubleSwitchOff
-            : this.consts.defaultMultiSwitchOff
-          params.switches[0].switch = newPos === 0 ? 'on' : 'off'
-          params.switches[1].switch = newPos === 1 ? 'on' : 'off'
+          params.switches = [
+            {
+              switch: newPos === 0 ? 'on' : 'off',
+              outlet: 0
+            },
+            {
+              switch: newPos === 1 ? 'on' : 'off',
+              outlet: 1
+            }
+          ]
           break
       }
       await this.platform.sendDeviceUpdate(this.accessory, params)
diff --git a/lib/device/simulation/garage-two.js b/lib/device/simulation/garage-two.js
index ee97e496..d39a0c02 100644
--- a/lib/device/simulation/garage-two.js
+++ b/lib/device/simulation/garage-two.js
@@ -73,7 +73,9 @@ module.exports = class deviceGarageTwo {
   async internalUpdate (garage, value) {
     try {
       const newPos = value
-      const params = { switches: this.cacheSwitchState }
+      const params = {
+        switches: []
+      }
       const gdService = this.accessory.getService(garage)
       const prevState = garage === 'Garage 1'
         ? this.accessory.context.cacheOneCurrentDoorState
@@ -83,27 +85,29 @@ module.exports = class deviceGarageTwo {
       }
       this.inUse = true
       gdService.updateCharacteristic(this.hapChar.TargetDoorState, newPos)
-        .updateCharacteristic(this.hapChar.CurrentDoorState, newPos + 2)
+      gdService.updateCharacteristic(this.hapChar.CurrentDoorState, newPos + 2)
       switch (garage) {
         case 'Garage 1': {
           this.accessory.context.cacheOneTargetDoorState = newPos
           this.accessory.context.cacheOneCurrentDoorState = newPos + 2
-          params.switches[0].switch = newPos === 0 ? 'on' : 'off'
-          params.switches[1].switch = newPos === 1 ? 'on' : 'off'
+          params.switches.push({ switch: newPos === 0 ? 'on' : 'off', outlet: 0 })
+          params.switches.push({ switch: newPos === 1 ? 'on' : 'off', outlet: 1 })
           break
         }
         case 'Garage 2': {
           this.accessory.context.cacheTwoTargetDoorState = newPos
           this.accessory.context.cacheTwoCurrentDoorState = newPos + 2
-          params.switches[2].switch = newPos === 0 ? 'on' : 'off'
-          params.switches[3].switch = newPos === 1 ? 'on' : 'off'
+          params.switches.push({ switch: newPos === 0 ? 'on' : 'off', outlet: 2 })
+          params.switches.push({ switch: newPos === 1 ? 'on' : 'off', outlet: 3 })
           break
         }
       }
       await this.platform.sendDeviceUpdate(this.accessory, params)
       await this.funcs.sleep(2000)
       this.inUse = false
-      const operationTime = newPos === 0 ? this.operationTimeUp : this.operationTimeDown
+      const operationTime = newPos === 0
+        ? this.operationTimeUp
+        : this.operationTimeDown
       await this.funcs.sleep(Math.max((operationTime - 20) * 100, 0))
       gdService.updateCharacteristic(this.hapChar.CurrentDoorState, newPos)
       switch (garage) {
@@ -152,7 +156,6 @@ module.exports = class deviceGarageTwo {
       if (!params.switches || this.inUse) {
         return
       }
-      this.cacheSwitchState = params.switches
       ;['1', '2'].forEach(async v => {
         const gcService = this.accessory.getService('Garage ' + v)
         const prevState = v === '1'
@@ -179,7 +182,7 @@ module.exports = class deviceGarageTwo {
         }
         this.inUse = true
         gcService.updateCharacteristic(this.hapChar.TargetDoorState, newPos - 2)
-          .updateCharacteristic(this.hapChar.CurrentDoorState, newPos)
+        gcService.updateCharacteristic(this.hapChar.CurrentDoorState, newPos)
         switch (v) {
           case '1':
             this.accessory.context.cacheOneCurrentDoorState = newPos
diff --git a/lib/device/simulation/lock-one.js b/lib/device/simulation/lock-one.js
index 8485aae0..297d4682 100644
--- a/lib/device/simulation/lock-one.js
+++ b/lib/device/simulation/lock-one.js
@@ -75,10 +75,10 @@ module.exports = class deviceLockOne {
           params.switch = 'on'
           break
         case 'twoSwitch':
-          params.switches = this.accessory.context.eweUIID === 126
-            ? this.consts.defaultDoubleSwitchOff
-            : this.consts.defaultMultiSwitchOff
-          params.switches[0].switch = 'on'
+          params.switches = [{
+            switch: 'on',
+            outlet: 0
+          }]
           break
       }
       this.inUse = true
diff --git a/lib/device/simulation/switch-valve.js b/lib/device/simulation/switch-valve.js
index 897af4e2..736b63dc 100644
--- a/lib/device/simulation/switch-valve.js
+++ b/lib/device/simulation/switch-valve.js
@@ -85,13 +85,11 @@ module.exports = class deviceSwitchValve {
   async internalSwitchUpdate (value) {
     try {
       const params = {
-        switches: this.accessory.context.eweUIID === 126
-          ? this.consts.defaultDoubleSwitchOff
-          : this.consts.defaultMultiSwitchOff
+        switches: [{
+          switch: value ? 'on' : 'off',
+          outlet: 0
+        }]
       }
-      const valveValue = this.vService.getCharacteristic(this.hapChar.Active).value
-      params.switches[0].switch = value ? 'on' : 'off'
-      params.switches[1].switch = valveValue === 1 ? 'on' : 'off'
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.cacheOnOff = value ? 'on' : 'off'
       this.accessory.eveService.addEntry({ status: value ? 1 : 0 })
@@ -110,13 +108,11 @@ module.exports = class deviceSwitchValve {
   async internalValveUpdate (value) {
     try {
       const params = {
-        switches: this.accessory.context.eweUIID === 126
-          ? this.consts.defaultDoubleSwitchOff
-          : this.consts.defaultMultiSwitchOff
+        switches: [{
+          switch: value ? 'on' : 'off',
+          outlet: 1
+        }]
       }
-      const switchValue = this.sService.getCharacteristic(this.hapChar.On).value
-      params.switches[0].switch = switchValue ? 'on' : 'off'
-      params.switches[1].switch = value === 1 ? 'on' : 'off'
       this.vService.updateCharacteristic(this.hapChar.InUse, value)
       switch (value) {
         case 0:
diff --git a/lib/device/simulation/tap-one.js b/lib/device/simulation/tap-one.js
index 758de81d..28e7a8a8 100644
--- a/lib/device/simulation/tap-one.js
+++ b/lib/device/simulation/tap-one.js
@@ -71,10 +71,10 @@ module.exports = class deviceTapOne {
           params.switch = value ? 'on' : 'off'
           break
         case 'twoSwitch':
-          params.switches = this.accessory.context.eweUIID === 126
-            ? this.consts.defaultDoubleSwitchOff
-            : this.consts.defaultMultiSwitchOff
-          params.switches[0].switch = value ? 'on' : 'off'
+          params.switches = [{
+            switch: value ? 'on' : 'off',
+            outlet: 0
+          }]
           break
       }
       await this.platform.sendDeviceUpdate(this.accessory, params)
diff --git a/lib/device/simulation/tap-two.js b/lib/device/simulation/tap-two.js
index 78d2e8db..88463f8a 100644
--- a/lib/device/simulation/tap-two.js
+++ b/lib/device/simulation/tap-two.js
@@ -55,26 +55,16 @@ module.exports = class deviceTapTwo {
   async internalUpdate (tap, value) {
     try {
       const params = {
-        switches: this.accessory.context.eweUIID === 126
-          ? this.consts.defaultDoubleSwitchOff
-          : this.consts.defaultMultiSwitchOff
+        switches: []
       }
       const tapService = this.accessory.getService(tap)
       switch (tap) {
-        case 'Tap A': {
-          const bValue = this.accessory.getService('Tap B')
-            .getCharacteristic(this.hapChar.Active).value
-          params.switches[0].switch = value ? 'on' : 'off'
-          params.switches[1].switch = bValue === 1 ? 'on' : 'off'
+        case 'Tap A':
+          params.switches.push({ switch: value ? 'on' : 'off', outlet: 0 })
           break
-        }
-        case 'Tap B': {
-          const aValue = this.accessory.getService('Tap A')
-            .getCharacteristic(this.hapChar.Active).value === 1
-          params.switches[0].switch = aValue ? 'on' : 'off'
-          params.switches[1].switch = value ? 'on' : 'off'
+        case 'Tap B':
+          params.switches.push({ switch: value ? 'on' : 'off', outlet: 1 })
           break
-        }
       }
       tapService.updateCharacteristic(this.hapChar.InUse, value)
       if (!this.disableDeviceLogging) {
diff --git a/lib/device/simulation/valve-four.js b/lib/device/simulation/valve-four.js
index dc46d7fd..95101be1 100644
--- a/lib/device/simulation/valve-four.js
+++ b/lib/device/simulation/valve-four.js
@@ -79,64 +79,22 @@ module.exports = class deviceValveFour {
   async internalUpdate (valve, value) {
     try {
       const params = {
-        switches: this.accessory.context.eweUIID === 126
-          ? this.consts.defaultDoubleSwitchOff
-          : this.consts.defaultMultiSwitchOff
+        switches: []
       }
       const valveService = this.accessory.getService(valve)
       switch (valve) {
-        case 'Valve A': {
-          const bValue = this.accessory.getService('Valve B')
-            .getCharacteristic(this.hapChar.Active).value
-          const cValue = this.accessory.getService('Valve C')
-            .getCharacteristic(this.hapChar.Active).value
-          const dValue = this.accessory.getService('Valve D')
-            .getCharacteristic(this.hapChar.Active).value
-          params.switches[0].switch = value ? 'on' : 'off'
-          params.switches[1].switch = bValue === 1 ? 'on' : 'off'
-          params.switches[2].switch = cValue === 1 ? 'on' : 'off'
-          params.switches[3].switch = dValue === 1 ? 'on' : 'off'
+        case 'Valve A':
+          params.switches.push({ switch: value ? 'on' : 'off', outlet: 0 })
           break
-        }
-        case 'Valve B': {
-          const aValue = this.accessory.getService('Valve A')
-            .getCharacteristic(this.hapChar.Active).value
-          const cValue = this.accessory.getService('Valve C')
-            .getCharacteristic(this.hapChar.Active).value
-          const dValue = this.accessory.getService('Valve D')
-            .getCharacteristic(this.hapChar.Active).value
-          params.switches[0].switch = aValue === 1 ? 'on' : 'off'
-          params.switches[1].switch = value ? 'on' : 'off'
-          params.switches[2].switch = cValue === 1 ? 'on' : 'off'
-          params.switches[3].switch = dValue === 1 ? 'on' : 'off'
+        case 'Valve B':
+          params.switches.push({ switch: value ? 'on' : 'off', outlet: 1 })
           break
-        }
-        case 'Valve C': {
-          const aValue = this.accessory.getService('Valve A')
-            .getCharacteristic(this.hapChar.Active).value
-          const bValue = this.accessory.getService('Valve B')
-            .getCharacteristic(this.hapChar.Active).value
-          const dValue = this.accessory.getService('Valve D')
-            .getCharacteristic(this.hapChar.Active).value
-          params.switches[0].switch = aValue === 1 ? 'on' : 'off'
-          params.switches[1].switch = bValue === 1 ? 'on' : 'off'
-          params.switches[2].switch = value ? 'on' : 'off'
-          params.switches[3].switch = dValue === 1 ? 'on' : 'off'
+        case 'Valve C':
+          params.switches.push({ switch: value ? 'on' : 'off', outlet: 2 })
           break
-        }
-        case 'Valve D': {
-          const aValue = this.accessory.getService('Valve A')
-            .getCharacteristic(this.hapChar.Active).value
-          const bValue = this.accessory.getService('Valve B')
-            .getCharacteristic(this.hapChar.Active).value
-          const cValue = this.accessory.getService('Valve C')
-            .getCharacteristic(this.hapChar.Active).value
-          params.switches[0].switch = aValue === 1 ? 'on' : 'off'
-          params.switches[1].switch = bValue === 1 ? 'on' : 'off'
-          params.switches[2].switch = cValue === 1 ? 'on' : 'off'
-          params.switches[3].switch = value ? 'on' : 'off'
+        case 'Valve D':
+          params.switches.push({ switch: value ? 'on' : 'off', outlet: 3 })
           break
-        }
       }
       valveService.updateCharacteristic(this.hapChar.InUse, value)
       switch (value) {
@@ -181,8 +139,8 @@ module.exports = class deviceValveFour {
           if (valveService.getCharacteristic(this.hapChar.Active).value === 0) {
             const timer = valveService.getCharacteristic(this.hapChar.SetDuration).value
             valveService.updateCharacteristic(this.hapChar.Active, 1)
-              .updateCharacteristic(this.hapChar.InUse, 1)
-              .updateCharacteristic(this.hapChar.RemainingDuration, timer)
+            valveService.updateCharacteristic(this.hapChar.InUse, 1)
+            valveService.updateCharacteristic(this.hapChar.RemainingDuration, timer)
             if (params.updateSource && !this.disableDeviceLogging) {
               this.log('[%s] current state [Valve %s running].', this.name, v)
             }
@@ -193,8 +151,8 @@ module.exports = class deviceValveFour {
           return
         }
         valveService.updateCharacteristic(this.hapChar.Active, 0)
-          .updateCharacteristic(this.hapChar.InUse, 0)
-          .updateCharacteristic(this.hapChar.RemainingDuration, 0)
+        valveService.updateCharacteristic(this.hapChar.InUse, 0)
+        valveService.updateCharacteristic(this.hapChar.RemainingDuration, 0)
         clearTimeout(valveService.timer)
       })
     } catch (err) {
diff --git a/lib/device/simulation/valve-one.js b/lib/device/simulation/valve-one.js
index 9aacd86b..c831e997 100644
--- a/lib/device/simulation/valve-one.js
+++ b/lib/device/simulation/valve-one.js
@@ -91,10 +91,10 @@ module.exports = class deviceValveOne {
           params.switch = value ? 'on' : 'off'
           break
         case 'twoSwitch':
-          params.switches = this.accessory.context.eweUIID === 126
-            ? this.consts.defaultDoubleSwitchOff
-            : this.consts.defaultMultiSwitchOff
-          params.switches[0].switch = value ? 'on' : 'off'
+          params.switches = [{
+            switch: value ? 'on' : 'off',
+            outlet: 0
+          }]
           break
       }
       this.service.updateCharacteristic(this.hapChar.InUse, value)
diff --git a/lib/device/simulation/valve-two.js b/lib/device/simulation/valve-two.js
index ed1f850c..6f88baca 100644
--- a/lib/device/simulation/valve-two.js
+++ b/lib/device/simulation/valve-two.js
@@ -79,26 +79,16 @@ module.exports = class deviceValveTwo {
   async internalUpdate (valve, value) {
     try {
       const params = {
-        switches: this.accessory.context.eweUIID === 126
-          ? this.consts.defaultDoubleSwitchOff
-          : this.consts.defaultMultiSwitchOff
+        switches: []
       }
       const valveService = this.accessory.getService(valve)
       switch (valve) {
-        case 'Valve A': {
-          const bValue = this.accessory.getService('Valve B')
-            .getCharacteristic(this.hapChar.Active).value
-          params.switches[0].switch = value ? 'on' : 'off'
-          params.switches[1].switch = bValue === 1 ? 'on' : 'off'
+        case 'Valve A':
+          params.switches.push({ switch: value ? 'on' : 'off', outlet: 0 })
           break
-        }
-        case 'Valve B': {
-          const aValue = this.accessory.getService('Valve A')
-            .getCharacteristic(this.hapChar.Active).value
-          params.switches[0].switch = aValue === 1 ? 'on' : 'off'
-          params.switches[1].switch = value ? 'on' : 'off'
+        case 'Valve B':
+          params.switches.push({ switch: value ? 'on' : 'off', outlet: 1 })
           break
-        }
       }
       valveService.updateCharacteristic(this.hapChar.InUse, value)
       switch (value) {
@@ -143,8 +133,8 @@ module.exports = class deviceValveTwo {
           if (valveService.getCharacteristic(this.hapChar.Active).value === 0) {
             const timer = valveService.getCharacteristic(this.hapChar.SetDuration).value
             valveService.updateCharacteristic(this.hapChar.Active, 1)
-              .updateCharacteristic(this.hapChar.InUse, 1)
-              .updateCharacteristic(this.hapChar.RemainingDuration, timer)
+            valveService.updateCharacteristic(this.hapChar.InUse, 1)
+            valveService.updateCharacteristic(this.hapChar.RemainingDuration, timer)
             if (params.updateSource && !this.disableDeviceLogging) {
               this.log('[%s] current state [Valve %s running].', this.name, v)
             }
@@ -155,8 +145,8 @@ module.exports = class deviceValveTwo {
           return
         }
         valveService.updateCharacteristic(this.hapChar.Active, 0)
-          .updateCharacteristic(this.hapChar.InUse, 0)
-          .updateCharacteristic(this.hapChar.RemainingDuration, 0)
+        valveService.updateCharacteristic(this.hapChar.InUse, 0)
+        valveService.updateCharacteristic(this.hapChar.RemainingDuration, 0)
         clearTimeout(valveService.timer)
       })
     } catch (err) {
diff --git a/lib/device/simulation/window.js b/lib/device/simulation/window.js
index c0356e67..78ab84a2 100644
--- a/lib/device/simulation/window.js
+++ b/lib/device/simulation/window.js
@@ -68,9 +68,7 @@ module.exports = class deviceWindow {
         return
       }
       const params = {
-        switches: this.accessory.context.eweUIID === 126
-          ? this.consts.defaultDoubleSwitchOff
-          : this.consts.defaultMultiSwitchOff
+        switches: []
       }
       const prevState = this.accessory.context.cachePositionState
       const percentStepUpPerDS = this.operationTimeUp / 100
@@ -78,7 +76,10 @@ module.exports = class deviceWindow {
       const updateKey = Math.random().toString(36).substr(2, 8)
       this.updateKey = updateKey
       if (prevState !== 2) {
+        params.switches.push({ switch: 'off', outlet: 0 })
+        params.switches.push({ switch: 'off', outlet: 1 })
         await this.platform.sendDeviceUpdate(this.accessory, params)
+        params.switches = []
         const posPercentChange = Math.floor(Date.now() / 100) -
           this.accessory.context.cacheLastStartTime
         const posPercentChangeUp = Math.floor(percentStepUpPerDS * posPercentChange)
@@ -99,14 +100,13 @@ module.exports = class deviceWindow {
       let decisecondsToMove
       if (setToMoveUp) {
         decisecondsToMove = Math.round(Math.abs(diffPosition) * percentStepUpPerDS)
-        params.switches[0].switch = 'on'
-        params.switches[1].switch = 'off'
+        params.switches.push({ switch: 'on', outlet: 0 })
       } else {
         decisecondsToMove = Math.round(Math.abs(diffPosition) * percentStepDownPerDS)
-        params.switches[0].switch = 'off'
-        params.switches[1].switch = 'on'
+        params.switches.push({ switch: 'on', outlet: 1 })
       }
       await this.platform.sendDeviceUpdate(this.accessory, params)
+      params.switches = []
       this.accessory.context.cacheTargetPosition = value
       this.accessory.context.cachePositionState = setToMoveUp ? 1 : 0
       this.accessory.context.cacheLastStartTime = Math.floor(Date.now() / 100)
@@ -114,11 +114,13 @@ module.exports = class deviceWindow {
       if (this.updateKey !== updateKey) {
         return
       }
-      params.switches[0].switch = 'off'
-      params.switches[1].switch = 'off'
+      params.switches.push({
+        switch: 'off',
+        outlet: setToMoveUp ? 0 : 1
+      })
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.service.updateCharacteristic(this.hapChar.PositionState, 2)
-        .updateCharacteristic(this.hapChar.CurrentPosition, value)
+      this.service.updateCharacteristic(this.hapChar.CurrentPosition, value)
       this.accessory.context.cachePositionState = 2
       this.accessory.context.cacheCurrentPosition = value
       if (!this.disableDeviceLogging) {
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 87f9365c..fd14c245 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -144,18 +144,6 @@ module.exports = {
     'workMode', 'workState', 'zyx_mode'
   ],
 
-  defaultDoubleSwitchOff: [
-    { switch: 'off', outlet: 0 },
-    { switch: 'off', outlet: 1 }
-  ],
-
-  defaultMultiSwitchOff: [
-    { switch: 'off', outlet: 0 },
-    { switch: 'off', outlet: 1 },
-    { switch: 'off', outlet: 2 },
-    { switch: 'off', outlet: 3 }
-  ],
-
   supportedDevices: {
     1: 1, // "SOCKET" (MINI, BASIC, S20, S26, S55, RF, RF_R2)
     2: 2, // "SOCKET_2"

From 0db24b430865918afbc417b037c4f995f2f72797 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 24 Apr 2021 09:47:57 +0100
Subject: [PATCH 1915/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index da3cff74..20dfdc3e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,7 +6,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 ### Changes
 
-* Changed update command for multi-switch devices to only update desired switch
+* Changed commands for multi-channel devices to only update desired channel (not all channels)
 * Automatically retry eWeLink login on startup in case of certain error codes
 
 ## 6.2.1 (2021-04-18)

From 7d08795823456559d813437bea9792c05813a924 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 24 Apr 2021 09:48:26 +0100
Subject: [PATCH 1916/3183] 6.2.2-beta.5

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index e77b15aa..21590991 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.2.2-beta.4",
+  "version": "6.2.2-beta.5",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index b8b37f3f..8c4f9a6f 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.2.2-beta.4",
+  "version": "6.2.2-beta.5",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices with original firmware.",
   "license": "MIT",

From 115f5f739a9a82badd7f7af2bcd66c34372c7dd5 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Sun, 25 Apr 2021 16:20:52 +0100
Subject: [PATCH 1917/3183] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 2ef8b341..1f98684d 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
   
 # homebridge-ewelink 
 
-Homebridge plugin to control eWeLink devices with original firmware
+Homebridge plugin to control eWeLink devices
 
 [![verified-by-homebridge](https://badgen.net/badge/homebridge/verified/purple)](https://github.com/homebridge/homebridge/wiki/Verified-Plugins)
 [![hoobs-certified](https://badgen.net/badge/HOOBS/certified/yellow)](https://plugins.hoobs.org/plugin/homebridge-ewelink)   

From c95cc427ac4ed80f9ff600c2c13e4940a62aa758 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 25 Apr 2021 16:21:39 +0100
Subject: [PATCH 1918/3183] update plugin description

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 8c4f9a6f..895c89c8 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "alias": "eWeLink",
   "version": "6.2.2-beta.5",
   "author": "bwp91",
-  "description": "Homebridge plugin to control eWeLink devices with original firmware.",
+  "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",
   "keywords": [
     "homebridge",

From c40d7c1ed346b6db55b1411af12c0671e9321181 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 25 Apr 2021 16:22:18 +0100
Subject: [PATCH 1919/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 20dfdc3e..10376876 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 * Changed commands for multi-channel devices to only update desired channel (not all channels)
 * Automatically retry eWeLink login on startup in case of certain error codes
+* Update package description (remove 'with original firmware' as this is redundant for eWeLink devices)
 
 ## 6.2.1 (2021-04-18)
 

From 22c7afae01913cc0052d9fa0e1fa5da1258c5f21 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 26 Apr 2021 08:27:58 +0100
Subject: [PATCH 1920/3183] deps

---
 package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 21590991..7c7c4b27 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -78,9 +78,9 @@
       "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="
     },
     "follow-redirects": {
-      "version": "1.13.3",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.3.tgz",
-      "integrity": "sha512-DUgl6+HDzB0iEptNQEXLx/KhTmDb8tZUHSeLqpnjpknR70H0nC2t9N73BK6fN4hOvJ84pKlIQVQ4k5FFlBedKA=="
+      "version": "1.14.0",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.0.tgz",
+      "integrity": "sha512-0vRwd7RKQBTt+mgu87mtYeofLFZpTas2S9zY+jIeuLJMNvudIgF52nr19q40HOwH5RrhWIPuj9puybzSJiRrVg=="
     },
     "function-bind": {
       "version": "1.1.1",

From 368a689f04e981cd1462e9f6d91b8763786f8fa0 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 26 Apr 2021 08:36:29 +0100
Subject: [PATCH 1921/3183] pause adaptive lighting if device offline

---
 lib/device/light-cct.js        | 6 +++++-
 lib/device/light-rgb-cct.js    | 6 +++++-
 lib/device/zigbee/light-cct.js | 2 +-
 lib/index.js                   | 4 ++--
 lib/utils/constants.js         | 2 +-
 5 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/lib/device/light-cct.js b/lib/device/light-cct.js
index 1673063b..993d5274 100644
--- a/lib/device/light-cct.js
+++ b/lib/device/light-cct.js
@@ -161,7 +161,7 @@ module.exports = class deviceLightCCT {
 
   async internalCTempUpdate (value) {
     try {
-      if (this.cacheMired === value || this.cacheOnOff !== 'on') {
+      if (this.cacheMired === value || this.cacheOnOff !== 'on' || !this.isOnline) {
         return
       }
       const updateKeyCT = Math.random().toString(36).substr(2, 8)
@@ -259,4 +259,8 @@ module.exports = class deviceLightCCT {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
+
+  markStatus (isOnline) {
+    this.isOnline = isOnline
+  }
 }
diff --git a/lib/device/light-rgb-cct.js b/lib/device/light-rgb-cct.js
index 78cc3923..8c52bfa1 100644
--- a/lib/device/light-rgb-cct.js
+++ b/lib/device/light-rgb-cct.js
@@ -247,7 +247,7 @@ module.exports = class deviceLightRGBCCT {
 
   async internalCTempUpdate (value) {
     try {
-      if (this.cacheMired === value || this.cacheOnOff !== 'on') {
+      if (this.cacheMired === value || this.cacheOnOff !== 'on' || !this.isOnline) {
         return
       }
       const updateKeyCT = Math.random().toString(36).substr(2, 8)
@@ -479,4 +479,8 @@ module.exports = class deviceLightRGBCCT {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
+
+  markStatus (isOnline) {
+    this.isOnline = isOnline
+  }
 }
diff --git a/lib/device/zigbee/light-cct.js b/lib/device/zigbee/light-cct.js
index e6ef214a..ff26718a 100644
--- a/lib/device/zigbee/light-cct.js
+++ b/lib/device/zigbee/light-cct.js
@@ -135,7 +135,7 @@ module.exports = class deviceZBLightCCT {
 
   async internalCTempUpdate (value) {
     try {
-      if (this.cacheMired === value || this.cacheOnOff !== 'on') {
+      if (this.cacheMired === value || this.cacheOnOff !== 'on' || !this.isOnline) {
         return
       }
       const updateKey = Math.random().toString(36).substr(2, 8)
diff --git a/lib/index.js b/lib/index.js
index 23e9fba5..c82332e1 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1239,7 +1239,7 @@ class eWeLinkPlatform {
       if (this.wsClient && accessory.control && accessory.control.externalUpdate) {
         accessory.control.externalUpdate(device.params)
 
-        // Mark the online/offline status of zigbee devices
+        // Mark the online/offline status of certain devices
         if (this.consts.devices.markStatus.includes(accessory.context.eweUIID)) {
           accessory.control.markStatus(device.online)
         }
@@ -1476,7 +1476,7 @@ class eWeLinkPlatform {
             : this.messages.repOffline
           this.log('[%s] %s %s.', accessory.displayName, status, this.messages.viaWS)
 
-          // Mark the online/offline status of zigbee devices
+          // Mark the online/offline status of certain devices
           if (this.consts.devices.markStatus.includes(accessory.context.eweUIID)) {
             accessory.control.markStatus(device.params.online)
           }
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index fd14c245..caf0cc07 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -103,7 +103,7 @@ module.exports = {
   devices: {
     lanIn: [1, 2, 3, 4, 5, 6, 7, 8, 9, 14, 15, 28, 32, 44, 77, 78, 103, 104, 126],
     lanOut: [1, 2, 3, 4, 5, 6, 7, 8, 9, 14, 28, 32, 44, 77, 78, 126],
-    markStatus: [1009, 1256, 1257, 1258],
+    markStatus: [59, 103, 104, 1009, 1256, 1257, 1258],
     singleSwitch: [1, 5, 6, 14, 24, 27],
     multiSwitch: [2, 3, 4, 7, 8, 9, 29, 30, 31, 41, 82, 83, 84, 126],
     singleSwitchOutlet: ['Sonoff Pow', 'S20', 'S26', 'S26R1', 'S55', 'S55R1'],

From faf7794eb759fab0afc9fa370dfbb4d7c36c27af Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 26 Apr 2021 08:36:31 +0100
Subject: [PATCH 1922/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 10376876..320e5200 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 ### Changes
 
 * Changed commands for multi-channel devices to only update desired channel (not all channels)
+* Pause Adaptive Lighting if device is offline
 * Automatically retry eWeLink login on startup in case of certain error codes
 * Update package description (remove 'with original firmware' as this is redundant for eWeLink devices)
 

From 2a8b92790849bac6a2dda5a2588f3a5b9ffb2a79 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 26 Apr 2021 08:37:01 +0100
Subject: [PATCH 1923/3183] 6.2.2-beta.6

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 7c7c4b27..146ef359 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.2.2-beta.5",
+  "version": "6.2.2-beta.6",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 895c89c8..fe9cf0c0 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.2.2-beta.5",
+  "version": "6.2.2-beta.6",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 7d55ec104c9c6605e702cab630c83d449c8b9d33 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 26 Apr 2021 08:39:23 +0100
Subject: [PATCH 1924/3183] pause adaptive lighting if device offline 2

---
 lib/device/light-cct.js        | 5 ++++-
 lib/device/light-rgb-cct.js    | 5 ++++-
 lib/device/zigbee/light-cct.js | 5 ++++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/lib/device/light-cct.js b/lib/device/light-cct.js
index 993d5274..ef2da3b1 100644
--- a/lib/device/light-cct.js
+++ b/lib/device/light-cct.js
@@ -161,7 +161,10 @@ module.exports = class deviceLightCCT {
 
   async internalCTempUpdate (value) {
     try {
-      if (this.cacheMired === value || this.cacheOnOff !== 'on' || !this.isOnline) {
+      if (this.cacheMired === value || this.cacheOnOff !== 'on') {
+        return
+      }
+      if (!this.isOnline && this.alController.isAdaptiveLightingActive()) {
         return
       }
       const updateKeyCT = Math.random().toString(36).substr(2, 8)
diff --git a/lib/device/light-rgb-cct.js b/lib/device/light-rgb-cct.js
index 8c52bfa1..b18bb992 100644
--- a/lib/device/light-rgb-cct.js
+++ b/lib/device/light-rgb-cct.js
@@ -247,7 +247,10 @@ module.exports = class deviceLightRGBCCT {
 
   async internalCTempUpdate (value) {
     try {
-      if (this.cacheMired === value || this.cacheOnOff !== 'on' || !this.isOnline) {
+      if (this.cacheMired === value || this.cacheOnOff !== 'on') {
+        return
+      }
+      if (!this.isOnline && this.alController.isAdaptiveLightingActive()) {
         return
       }
       const updateKeyCT = Math.random().toString(36).substr(2, 8)
diff --git a/lib/device/zigbee/light-cct.js b/lib/device/zigbee/light-cct.js
index ff26718a..067ff6ec 100644
--- a/lib/device/zigbee/light-cct.js
+++ b/lib/device/zigbee/light-cct.js
@@ -135,7 +135,10 @@ module.exports = class deviceZBLightCCT {
 
   async internalCTempUpdate (value) {
     try {
-      if (this.cacheMired === value || this.cacheOnOff !== 'on' || !this.isOnline) {
+      if (this.cacheMired === value || this.cacheOnOff !== 'on') {
+        return
+      }
+      if (!this.isOnline && this.alController.isAdaptiveLightingActive()) {
         return
       }
       const updateKey = Math.random().toString(36).substr(2, 8)

From 2061980f95d7250030f6f85ece99ac569f50d384 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 26 Apr 2021 08:39:53 +0100
Subject: [PATCH 1925/3183] 6.2.2-beta.7

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 146ef359..39d30723 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.2.2-beta.6",
+  "version": "6.2.2-beta.7",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index fe9cf0c0..bb31d153 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.2.2-beta.6",
+  "version": "6.2.2-beta.7",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From b975d8450b48401d6f624272b6fdd41849e818f2 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 26 Apr 2021 14:24:11 +0100
Subject: [PATCH 1926/3183] adjust iFan thresholds

---
 lib/device/fan.js | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/lib/device/fan.js b/lib/device/fan.js
index 0868eaa9..a831714a 100644
--- a/lib/device/fan.js
+++ b/lib/device/fan.js
@@ -76,18 +76,27 @@ module.exports = class deviceFan {
       const params = {
         switches: []
       }
-      const newPower = value >= 33
-      const newSpeed = value
+      const newPower = value >= 1
+      let newSpeed
+      if (value === 0) {
+        newSpeed = 0
+      } else if (value <= 33) {
+        newSpeed = 33
+      } else if (value <= 66) {
+        newSpeed = 66
+      } else {
+        newSpeed = 99
+      }
       params.switches.push({
         switch: newPower && newSpeed >= 33 ? 'on' : 'off',
         outlet: 1
       })
       params.switches.push({
-        switch: newPower && newSpeed >= 66 && newSpeed < 99 ? 'on' : 'off',
+        switch: newPower && newSpeed === 66 ? 'on' : 'off',
         outlet: 2
       })
       params.switches.push({
-        switch: newPower && newSpeed >= 99 ? 'on' : 'off',
+        switch: newPower && newSpeed === 99 ? 'on' : 'off',
         outlet: 3
       })
       await this.platform.sendDeviceUpdate(this.accessory, params)

From e8b158e11e0ae4d766a9609b994309903b42cfa3 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 26 Apr 2021 14:25:25 +0100
Subject: [PATCH 1927/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 320e5200..6075f90b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 ### Changes
 
+* Adjust iFan speed thresholds (now 0% is off, 1-33% is low, 34-66% is medium and 67-100% is high)
 * Changed commands for multi-channel devices to only update desired channel (not all channels)
 * Pause Adaptive Lighting if device is offline
 * Automatically retry eWeLink login on startup in case of certain error codes

From 6a3cc34bf2d0021a35840b672a2cd8a2851c8694 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 26 Apr 2021 14:31:24 +0100
Subject: [PATCH 1928/3183] 6.2.2-beta.8

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 39d30723..1f324fba 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.2.2-beta.7",
+  "version": "6.2.2-beta.8",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index bb31d153..b9c0ab0e 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.2.2-beta.7",
+  "version": "6.2.2-beta.8",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From c5ed4b81294e78b4aff83c42a55e29b75ad28e9f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 27 Apr 2021 10:03:56 +0100
Subject: [PATCH 1929/3183] 6.2.2

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 1f324fba..da8a067f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.2.2-beta.8",
+  "version": "6.2.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index b9c0ab0e..665fb774 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.2.2-beta.8",
+  "version": "6.2.2",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 5d0966366ce8f624aa99643b711978feae181d50 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 27 Apr 2021 10:04:41 +0100
Subject: [PATCH 1930/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6075f90b..c191f9d9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 All notable changes to this homebridge-ewelink will be documented in this file.
 
-## BETA
+## 6.2.2 (2021-04-27)
 
 ### Changes
 

From 5af37b6860ae8c164770d62b698c650614271645 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 27 Apr 2021 10:31:54 +0100
Subject: [PATCH 1931/3183] increase ws timeout to 6 seconds

---
 lib/connection/ws.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/connection/ws.js b/lib/connection/ws.js
index 408c5a13..35d00809 100644
--- a/lib/connection/ws.js
+++ b/lib/connection/ws.js
@@ -103,7 +103,7 @@ module.exports = class connectionWS {
         extractRequestId: data => data && data.sequence,
         packMessage: data => JSON.stringify(data),
         unpackMessage: data => data === 'pong' ? data : JSON.parse(data),
-        timeout: 5000
+        timeout: 6000
       })
 
       // Add a listener to authenticate when a web socket connection is opened

From 1918261c53fc052331c6ff35ad6daea84a53c747 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 27 Apr 2021 10:32:26 +0100
Subject: [PATCH 1932/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c191f9d9..c5318bbd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 All notable changes to this homebridge-ewelink will be documented in this file.
 
+## BETA
+
+### Changes
+
+* Increase ws timeout from 5 to 6 seconds
+
 ## 6.2.2 (2021-04-27)
 
 ### Changes

From c64d68241c1b35d92eb7ea0684dbf979a9893646 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 27 Apr 2021 15:32:05 +0100
Subject: [PATCH 1933/3183] use fan caches to avoid duplicate commands

---
 lib/device/fan.js | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/lib/device/fan.js b/lib/device/fan.js
index a831714a..78d6fedf 100644
--- a/lib/device/fan.js
+++ b/lib/device/fan.js
@@ -87,6 +87,9 @@ module.exports = class deviceFan {
       } else {
         newSpeed = 99
       }
+      if (newSpeed === this.cacheSpeed) {
+        return
+      }
       params.switches.push({
         switch: newPower && newSpeed >= 33 ? 'on' : 'off',
         outlet: 1
@@ -126,17 +129,18 @@ module.exports = class deviceFan {
       const params = {
         switches: []
       }
-      const newLight = value
+      const newLight = value ? 'on' : 'off'
+      if (newLight === this.cacheLight) {
+        return
+      }
       params.switches.push({
-        switch: newLight ? 'on' : 'off',
+        switch: newLight,
         outlet: 0
       })
       await this.platform.sendDeviceUpdate(this.accessory, params)
-      if (newLight !== (this.cacheLight === 'on')) {
-        this.cacheLight = newLight ? 'on' : 'off'
-        if (!this.disableDeviceLogging) {
-          this.log('[%s] current light [%s].', this.name, this.cacheLight)
-        }
+      this.cacheLight = newLight
+      if (!this.disableDeviceLogging) {
+        this.log('[%s] current light [%s].', this.name, this.cacheLight)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)

From 7fe1c9e7ae03d9993ab13054af4807af7e56ca3b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 27 Apr 2021 15:32:45 +0100
Subject: [PATCH 1934/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c5318bbd..87bfdee8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 ### Changes
 
+* iFan devices now use caching to avoid unnecessary duplicate updates
 * Increase ws timeout from 5 to 6 seconds
 
 ## 6.2.2 (2021-04-27)

From 9c0dd0ae43e068df9e6d80619e3b6335c8cfc278 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 27 Apr 2021 15:33:14 +0100
Subject: [PATCH 1935/3183] 6.2.3-beta.0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index da8a067f..f29302ab 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.2.2",
+  "version": "6.2.3-beta.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 665fb774..9264eb77 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.2.2",
+  "version": "6.2.3-beta.0",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 29ed9d9fd018ebe8a65f0ac263654ded4b46ee22 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 27 Apr 2021 17:25:08 +0100
Subject: [PATCH 1936/3183] add % to log

---
 lib/device/curtain.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/device/curtain.js b/lib/device/curtain.js
index 1905fdb9..b70f837f 100644
--- a/lib/device/curtain.js
+++ b/lib/device/curtain.js
@@ -69,7 +69,7 @@ module.exports = class deviceCurtain {
 
       // Log the update if appropriate
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current position [%s].', this.name, this.cachePosition)
+        this.log('[%s] current position [%s%].', this.name, this.cachePosition)
       }
     } catch (err) {
       // Catch any errors and let the platform display them

From c5b671f314dde3f784554aa326ed34cb754e5509 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 27 Apr 2021 17:25:17 +0100
Subject: [PATCH 1937/3183] dualr3 motor mode

---
 lib/device/motor.js    | 42 ++++++++++++++++++++++++++++++++++++++++--
 lib/utils/constants.js | 12 ++++++------
 2 files changed, 46 insertions(+), 8 deletions(-)

diff --git a/lib/device/motor.js b/lib/device/motor.js
index 11846630..abe3a081 100644
--- a/lib/device/motor.js
+++ b/lib/device/motor.js
@@ -22,6 +22,8 @@ module.exports = class deviceMotor {
       This is for the DUALR3 using motor mode
       This device's parameters are:
       motorTurn: 1=OPEN, 0=STOP, 2=CLOSE
+      location: 0=CLOSED, 100=OPEN
+      currLocation: 0=CLOSED, 100=OPEN
     */
 
     // Set up custom variables for this device type
@@ -49,7 +51,23 @@ module.exports = class deviceMotor {
 
   async internalUpdate (value) {
     try {
-      //
+      if (this.cachePosition === value) {
+        return
+      }
+      const updateKey = Math.random().toString(36).substr(2, 8)
+      this.updateKey = updateKey
+      await this.funcs.sleep(500)
+      if (updateKey !== this.updateKey) {
+        return
+      }
+      const params = {
+        location: value
+      }
+      await this.platform.sendDeviceUpdate(this.accessory, params)
+      this.cachePosition = value
+      if (!this.disableDeviceLogging) {
+        this.log('[%s] current position [%s%].', this.name, this.cachePosition)
+      }
     } catch (err) {
       // Catch any errors and let the platform display them
       this.platform.deviceUpdateError(this.accessory, err, true)
@@ -65,7 +83,27 @@ module.exports = class deviceMotor {
 
   async externalUpdate (params) {
     try {
-      //
+      if (
+        this.funcs.hasProperty(params, 'location') &&
+        this.funcs.hasProperty(params, 'currLocation') &&
+        params.location === params.currLocation
+      ) {
+        if (this.cachePosition !== params.location) {
+          this.cachePosition = params.location
+          this.service.updateCharacteristic(
+            this.hapChar.TargetPosition,
+            this.cachePosition
+          )
+          this.service.updateCharacteristic(
+            this.hapChar.CurrentPosition,
+            this.cachePosition
+          )
+          this.service.updateCharacteristic(this.hapChar.PositionState, 2)
+          if (!this.disableDeviceLogging) {
+            this.log('[%s] current position [%s%].', this.name, this.cachePosition)
+          }
+        }
+      }
     } catch (err) {
       // Catch any errors and let the platform display them
       this.platform.deviceUpdateError(this.accessory, err, false)
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index caf0cc07..6cdab0a3 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -136,12 +136,12 @@ module.exports = {
 
   paramsToKeep: [
     'battery', 'bright', 'brightness', 'channel', 'channel0', 'cmd', 'color', 'colorB',
-    'colorG', 'colorR', 'current', 'currentHumidity', 'currentTemperature', 'humidity',
-    'key', 'lightbright', 'lightswitch', 'lightRcolor', 'lightGcolor', 'lightBcolor',
-    'lock', 'ltype', 'mainSwitch', 'mode', 'motion', 'motorTurn', 'online', 'power',
-    'rfChl', 'rfList', 'rfTrig', 'sensorType', 'setclose', 'state', 'switch', 'switches',
-    'targetTemp', 'temperature', 'tempScale', 'trigTime', 'type', 'voltage', 'white',
-    'workMode', 'workState', 'zyx_mode'
+    'colorG', 'colorR', 'current', 'currentHumidity', 'currentTemperature',
+    'currLocation', 'humidity', 'key', 'lightbright', 'lightswitch', 'lightRcolor',
+    'lightGcolor', 'lightBcolor', 'location', 'lock', 'ltype', 'mainSwitch', 'mode',
+    'motion', 'motorTurn', 'online', 'power', 'rfChl', 'rfList', 'rfTrig', 'sensorType',
+    'setclose', 'state', 'switch', 'switches', 'targetTemp', 'temperature', 'tempScale',
+    'trigTime', 'type', 'voltage', 'white', 'workMode', 'workState', 'zyx_mode'
   ],
 
   supportedDevices: {

From a41cce94da028800913ee3a2b003f93bda39b5a4 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 27 Apr 2021 17:25:52 +0100
Subject: [PATCH 1938/3183] 6.2.3-beta.1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index f29302ab..d64e3d82 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.2.3-beta.0",
+  "version": "6.2.3-beta.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 9264eb77..7b9869cd 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.2.3-beta.0",
+  "version": "6.2.3-beta.1",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 6705384f993fc2dba082b54ffc4a9272af05922e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 27 Apr 2021 17:43:03 +0100
Subject: [PATCH 1939/3183] remove sub accessories if dualr3 in motor mode

---
 lib/index.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/index.js b/lib/index.js
index c82332e1..24e9aa8a 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -552,8 +552,11 @@ class eWeLinkPlatform {
     let oAccessory
     const uuid = this.api.hap.uuid.generate(device.deviceid + 'SWX')
     try {
-      // Remove old sub accessories for Accessory Simulations
-      if (this.simulations[device.deviceid]) {
+      // Remove old sub accessories for Accessory Simulations or DUALR3 in motor mode
+      if (
+        this.simulations[device.deviceid] ||
+        (device.extra.uiid === 126 && device.params.workMode === 2)
+      ) {
         for (let i = 0; i <= 4; i++) {
           const uuidsub = this.api.hap.uuid.generate(device.deviceid + 'SW' + i)
           if (this.devicesInHB.has(uuidsub)) {

From e110f8d45edea95ba73125c1eb664fbf3d6cfe20 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 27 Apr 2021 17:44:38 +0100
Subject: [PATCH 1940/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 87bfdee8..1e83507b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 ## BETA
 
+### Added
+
+* Support DUALR3 motor mode (as a *WindowCovering* service)
+
 ### Changes
 
 * iFan devices now use caching to avoid unnecessary duplicate updates

From 2e27ed4a4fb673e7e327be87339a062cf0c08068 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 27 Apr 2021 17:46:45 +0100
Subject: [PATCH 1941/3183] remove motorTurn as used param

---
 lib/device/motor.js    | 2 +-
 lib/utils/constants.js | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/device/motor.js b/lib/device/motor.js
index abe3a081..2dda0ae2 100644
--- a/lib/device/motor.js
+++ b/lib/device/motor.js
@@ -21,7 +21,7 @@ module.exports = class deviceMotor {
     /*
       This is for the DUALR3 using motor mode
       This device's parameters are:
-      motorTurn: 1=OPEN, 0=STOP, 2=CLOSE
+      motorTurn: 1=OPEN, 0=STOP, 2=CLOSE (not needed by plugin)
       location: 0=CLOSED, 100=OPEN
       currLocation: 0=CLOSED, 100=OPEN
     */
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 6cdab0a3..429553ce 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -139,9 +139,9 @@ module.exports = {
     'colorG', 'colorR', 'current', 'currentHumidity', 'currentTemperature',
     'currLocation', 'humidity', 'key', 'lightbright', 'lightswitch', 'lightRcolor',
     'lightGcolor', 'lightBcolor', 'location', 'lock', 'ltype', 'mainSwitch', 'mode',
-    'motion', 'motorTurn', 'online', 'power', 'rfChl', 'rfList', 'rfTrig', 'sensorType',
-    'setclose', 'state', 'switch', 'switches', 'targetTemp', 'temperature', 'tempScale',
-    'trigTime', 'type', 'voltage', 'white', 'workMode', 'workState', 'zyx_mode'
+    'motion', 'online', 'power', 'rfChl', 'rfList', 'rfTrig', 'sensorType', 'setclose',
+    'state', 'switch', 'switches', 'targetTemp', 'temperature', 'tempScale', 'trigTime',
+    'type', 'voltage', 'white', 'workMode', 'workState', 'zyx_mode'
   ],
 
   supportedDevices: {

From cd33896da679fcb95c9a709002c21e7c7a67e459 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 27 Apr 2021 17:48:36 +0100
Subject: [PATCH 1942/3183] 6.2.3-beta.2

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d64e3d82..15f43c11 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.2.3-beta.1",
+  "version": "6.2.3-beta.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 7b9869cd..d75c40f8 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.2.3-beta.1",
+  "version": "6.2.3-beta.2",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From a0695366ffec2c410d29b52d1301c8e70c1a3d56 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 28 Apr 2021 07:34:09 +0100
Subject: [PATCH 1943/3183] update lang to show a command may not be lan
 compatible

even if the device is lan compatible
---
 lib/utils/lang-en.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/utils/lang-en.js b/lib/utils/lang-en.js
index 7b098696..811a7b1f 100644
--- a/lib/utils/lang-en.js
+++ b/lib/utils/lang-en.js
@@ -21,9 +21,9 @@ module.exports = {
   devNoControl: 'cannot be controlled as mode:lan is not compatible with this device',
   devNotAdd: 'could not be added to Homebridge as',
   devNotConf: 'could not be configured as',
+  devNotConfLAN: 'device/command not available via LAN mode',
   devNotFound: 'device not found in eWeLink',
   devNotInit: 'could not be initialised as',
-  devNotConfLAN: 'device not configurable via LAN mode',
   devNotReachLAN: 'device not reachable via LAN mode',
   devNotRf: 'could not be refreshed as',
   devNotRemove: 'could not be removed from Homebridge as',

From 1359fcbae290b0583a2110e237dfe3a2ae292780 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 28 Apr 2021 07:35:45 +0100
Subject: [PATCH 1944/3183] decrease lan timeout to 9 seconds

---
 lib/connection/lan.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/connection/lan.js b/lib/connection/lan.js
index 9e9238d9..f332d600 100644
--- a/lib/connection/lan.js
+++ b/lib/connection/lan.js
@@ -169,7 +169,7 @@ module.exports = class connectionLAN {
       let suffix
       const params = {}
 
-      // For now only /dimmable (for D1), /switch /switches are supported
+      // /dimmable for D1, /transmit for RF Bridge and /switch /switches are supported
       if (json.params.brightness) {
         params.switch = 'on'
         params.brightness = json.params.brightness
@@ -219,7 +219,7 @@ module.exports = class connectionLAN {
           'Content-Type': 'application/json'
         },
         data,
-        timeout: this.mode === 'lan' ? 10000 : 3000
+        timeout: this.mode === 'lan' ? 9000 : 3000
       })
 
       // Check for any errors in the response

From cd6be52b8d6d904ee13d7aac07ce7c039f1c81fd Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 28 Apr 2021 07:49:30 +0100
Subject: [PATCH 1945/3183] var names, consts

---
 lib/index.js           | 167 ++++++++++++++++++++++-------------------
 lib/utils/constants.js |   6 +-
 2 files changed, 92 insertions(+), 81 deletions(-)

diff --git a/lib/index.js b/lib/index.js
index 24e9aa8a..30ad17fd 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -548,14 +548,15 @@ class eWeLinkPlatform {
   }
 
   initialiseDevice (device) {
-    let accessory
-    let oAccessory
-    const uuid = this.api.hap.uuid.generate(device.deviceid + 'SWX')
     try {
-      // Remove old sub accessories for Accessory Simulations or DUALR3 in motor mode
+      let accessory
+      const uiid = device.extra && device.extra.uiid ? device.extra.uiid : 0
+      const uuid = this.api.hap.uuid.generate(device.deviceid + 'SWX')
+
+      // Remove old sub accessories for Accessory Simulations and DUALR3 in motor mode
       if (
         this.simulations[device.deviceid] ||
-        (device.extra.uiid === 126 && device.params.workMode === 2)
+        (this.consts.devices.doubleSwitch.includes(uiid) && device.params.workMode === 2)
       ) {
         for (let i = 0; i <= 4; i++) {
           const uuidsub = this.api.hap.uuid.generate(device.deviceid + 'SW' + i)
@@ -566,7 +567,7 @@ class eWeLinkPlatform {
       }
 
       // Set up the correct instance for this particular device
-      if (this.consts.devices.curtain.includes(device.extra.uiid)) {
+      if (this.consts.devices.curtain.includes(uiid)) {
         /***********************
         BLINDS [EWELINK UIID 11]
         ***********************/
@@ -575,7 +576,10 @@ class eWeLinkPlatform {
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/curtain'))(this, accessory)
         /**********************/
-      } else if (device.extra.uiid === 126 && device.params.workMode === 2) {
+      } else if (
+        this.consts.devices.doubleSwitch.includes(uiid) &&
+        device.params.workMode === 2
+      ) {
         /*************************
         BLINDS [DUALR3 MOTOR MODE]
         *************************/
@@ -771,7 +775,7 @@ class eWeLinkPlatform {
       } else if (
         this.simulations[device.deviceid] &&
         this.simulations[device.deviceid].type === 'sensor_leak' &&
-        this.consts.devices.sensorContact.includes(device.extra.uiid)
+        this.consts.devices.sensorContact.includes(uiid)
       ) {
         /**************************************
         SENSORS [LEAK DW2 ACCESSORY SIMULATION]
@@ -782,7 +786,7 @@ class eWeLinkPlatform {
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require(instance))(this, accessory)
         /*************************************/
-      } else if (this.consts.devices.sensorContact.includes(device.extra.uiid)) {
+      } else if (this.consts.devices.sensorContact.includes(uiid)) {
         /*******************
         SENSORS [SONOFF DW2]
         *******************/
@@ -791,7 +795,7 @@ class eWeLinkPlatform {
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/sensor-contact'))(this, accessory)
         /******************/
-      } else if (this.consts.devices.fan.includes(device.extra.uiid)) {
+      } else if (this.consts.devices.fan.includes(uiid)) {
         /***
         FANS
         ***/
@@ -800,7 +804,7 @@ class eWeLinkPlatform {
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/fan'))(this, accessory)
         /**/
-      } else if (this.consts.devices.diffuser.includes(device.extra.uiid)) {
+      } else if (this.consts.devices.diffuser.includes(uiid)) {
         /********
         DIFFUSERS
         ********/
@@ -809,7 +813,7 @@ class eWeLinkPlatform {
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/diffuser'))(this, accessory)
         /*******/
-      } else if (this.consts.devices.humidifier.includes(device.extra.uiid)) {
+      } else if (this.consts.devices.humidifier.includes(uiid)) {
         /**********
         HUMIDIFIERS
         **********/
@@ -818,7 +822,7 @@ class eWeLinkPlatform {
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/humidifier'))(this, accessory)
         /*********/
-      } else if (this.consts.devices.thermostat.includes(device.extra.uiid)) {
+      } else if (this.consts.devices.thermostat.includes(uiid)) {
         /**********
         THERMOSTATS
         **********/
@@ -830,7 +834,7 @@ class eWeLinkPlatform {
       } else if (
         this.simulations[device.deviceid] &&
         this.simulations[device.deviceid].type === 'thermostat' &&
-        this.consts.devices.sensorAmbient.includes(device.extra.uiid)
+        this.consts.devices.sensorAmbient.includes(uiid)
       ) {
         /*********************************
         THERMOSTATS [ACCESSORY SIMULATION]
@@ -841,7 +845,7 @@ class eWeLinkPlatform {
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require(instance))(this, accessory)
         /********************************/
-      } else if (this.consts.devices.sensorAmbient.includes(device.extra.uiid)) {
+      } else if (this.consts.devices.sensorAmbient.includes(uiid)) {
         /***********************
         SENSOR [AMBIENT-TH10/16]
         ***********************/
@@ -851,7 +855,7 @@ class eWeLinkPlatform {
         accessory.context.sensorType = device.params.sensorType
         accessory.control = new (require('./device/sensor-ambient'))(this, accessory)
         /**********************/
-      } else if (this.consts.devices.sensorTempHumi.includes(device.extra.uiid)) {
+      } else if (this.consts.devices.sensorTempHumi.includes(uiid)) {
         /*************************
         SENSOR [AMBIENT-SONOFF SC]
         *************************/
@@ -861,9 +865,9 @@ class eWeLinkPlatform {
         accessory.control = new (require('./device/sensor-temp-humi'))(this, accessory)
         /************************/
       } else if (
-        this.consts.devices.outlet.includes(device.extra.uiid) ||
+        this.consts.devices.outlet.includes(uiid) ||
         (
-          this.consts.devices.singleSwitch.includes(device.extra.uiid) &&
+          this.consts.devices.singleSwitch.includes(uiid) &&
           this.consts.devices.singleSwitchOutlet.includes(device.productModel)
         )
       ) {
@@ -878,7 +882,7 @@ class eWeLinkPlatform {
           ? new (require('./device/switch-single'))(this, accessory)
           : new (require('./device/outlet'))(this, accessory)
         /*****/
-      } else if (this.consts.devices.outletSCM.includes(device.extra.uiid)) {
+      } else if (this.consts.devices.outletSCM.includes(uiid)) {
         /*************************************
         OUTLETS [SINGLE BUT MULTIPLE HARDWARE]
         *************************************/
@@ -887,7 +891,7 @@ class eWeLinkPlatform {
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/outlet-scm'))(this, accessory)
         /************************************/
-      } else if (this.consts.devices.lightRGB.includes(device.extra.uiid)) {
+      } else if (this.consts.devices.lightRGB.includes(uiid)) {
         /***********
         LIGHTS [RGB]
         ***********/
@@ -896,7 +900,7 @@ class eWeLinkPlatform {
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/light-rgb'))(this, accessory)
         /**********/
-      } else if (this.consts.devices.lightCCT.includes(device.extra.uiid)) {
+      } else if (this.consts.devices.lightCCT.includes(uiid)) {
         /***********
         LIGHTS [CCT]
         ***********/
@@ -905,7 +909,7 @@ class eWeLinkPlatform {
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/light-cct'))(this, accessory)
         /**********/
-      } else if (this.consts.devices.lightRGBCCT.includes(device.extra.uiid)) {
+      } else if (this.consts.devices.lightRGBCCT.includes(uiid)) {
         /*****************
         LIGHTS [RGB & CCT]
         *****************/
@@ -914,7 +918,7 @@ class eWeLinkPlatform {
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/light-rgb-cct'))(this, accessory)
         /****************/
-      } else if (this.consts.devices.lightDimmer.includes(device.extra.uiid)) {
+      } else if (this.consts.devices.lightDimmer.includes(uiid)) {
         /**************
         LIGHTS [DIMMER]
         **************/
@@ -923,7 +927,7 @@ class eWeLinkPlatform {
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/light-dimmer'))(this, accessory)
         /*************/
-      } else if (this.consts.devices.singleSwitch.includes(device.extra.uiid)) {
+      } else if (this.consts.devices.singleSwitch.includes(uiid)) {
         /************************
         SWITCHES [SINGLE CHANNEL]
         ************************/
@@ -935,11 +939,15 @@ class eWeLinkPlatform {
           ? new (require('./device/outlet'))(this, accessory)
           : new (require('./device/switch-single'))(this, accessory)
         /***********************/
-      } else if (this.consts.devices.multiSwitch.includes(device.extra.uiid)) {
+      } else if (
+        this.consts.devices.doubleSwitch.includes(uiid) ||
+        this.consts.devices.multiSwitch.includes(uiid)
+      ) {
         /***********************
         SWITCHES [MULTI CHANNEL]
         ***********************/
-        for (let i = 0; i <= this.consts.supportedDevices[device.extra.uiid]; i++) {
+        for (let i = 0; i <= this.consts.supportedDevices[uiid]; i++) {
+          let subAccessory
           const uuidsub = this.api.hap.uuid.generate(device.deviceid + 'SW' + i)
 
           // Check if the user has chosen to hide any channels for this device
@@ -955,42 +963,42 @@ class eWeLinkPlatform {
             }
 
             // Add the sub accessory, but hidden, to Homebridge
-            oAccessory = this.addAccessory(device, device.deviceid + 'SW' + i, true)
+            subAccessory = this.addAccessory(device, device.deviceid + 'SW' + i, true)
           } else {
             // The user has not hidden this channel
-            oAccessory = this.devicesInHB.has(uuidsub)
+            subAccessory = this.devicesInHB.has(uuidsub)
               ? this.devicesInHB.get(uuidsub)
               : this.addAccessory(device, device.deviceid + 'SW' + i)
           }
 
           // Add context information to the sub accessory
-          oAccessory.context.firmware = device.params.fwVersion || PLUGIN.version
-          oAccessory.context.reachableWAN = device.online
-          oAccessory.context.reachableLAN = this.lanClient &&
+          subAccessory.context.firmware = device.params.fwVersion || PLUGIN.version
+          subAccessory.context.reachableWAN = device.online
+          subAccessory.context.reachableLAN = this.lanClient &&
             this.lanDevices.has(device.deviceid)
             ? this.lanDevices.get(device.deviceid).ip
             : false
-          oAccessory.context.eweBrandName = device.brandName
-          oAccessory.context.eweBrandLogo = device.brandLogo
-          oAccessory.context.eweShared = device.sharedBy && device.sharedBy.email
+          subAccessory.context.eweBrandName = device.brandName
+          subAccessory.context.eweBrandLogo = device.brandLogo
+          subAccessory.context.eweShared = device.sharedBy && device.sharedBy.email
             ? device.sharedBy.email
             : false
-          oAccessory.context.ip = this.lanClient && oAccessory.context.reachableLAN
+          subAccessory.context.ip = this.lanClient && subAccessory.context.reachableLAN
             ? this.lanDevices.get(device.deviceid).ip
             : false
-          oAccessory.control = oAccessory.context.eweUIID === 126
-            ? new (require('./device/switch-double'))(this, oAccessory)
-            : new (require('./device/switch-multi'))(this, oAccessory)
+          subAccessory.control = this.consts.devices.doubleSwitch.includes(uiid)
+            ? new (require('./device/switch-double'))(this, subAccessory)
+            : new (require('./device/switch-multi'))(this, subAccessory)
 
           // Update any changes to the sub accessory to the platform
-          this.api.updatePlatformAccessories(PLUGIN.name, PLUGIN.alias, [oAccessory])
-          this.devicesInHB.set(oAccessory.UUID, oAccessory)
+          this.api.updatePlatformAccessories(PLUGIN.name, PLUGIN.alias, [subAccessory])
+          this.devicesInHB.set(subAccessory.UUID, subAccessory)
           if (i === 0) {
-            accessory = oAccessory
+            accessory = subAccessory
           }
         }
         /**********************/
-      } else if (this.consts.devices.rfBridge.includes(device.extra.uiid)) {
+      } else if (this.consts.devices.rfBridge.includes(uiid)) {
         /*********************
         RF BRIDGE + SUBDEVICES
         *********************/
@@ -1018,6 +1026,7 @@ class eWeLinkPlatform {
         // Loop through each sub device connected to the RF Bridge
         rfMap.forEach(subDevice => {
           const swNumber = rfChlCounter + 1
+          let subAccessory
           let subType
           let sensorTimeLength
           let sensorTimeDiff
@@ -1057,7 +1066,7 @@ class eWeLinkPlatform {
             default: {
               this.log.warn('[%s] %s:', device.name, this.messages.devNotSupYet)
               const data = JSON.stringify(device.params)
-              this.log.warn('[%s-%s] %s', device.extra.uiid, subDevice.type || '?', data)
+              this.log.warn('[%s-%s] %s', uiid, subDevice.type || '?', data)
               return
             }
           }
@@ -1074,56 +1083,56 @@ class eWeLinkPlatform {
           }
 
           // Check if the sub accessory already exists in Homebridge
-          if ((oAccessory = this.devicesInHB.get(uuidsub))) {
+          if ((subAccessory = this.devicesInHB.get(uuidsub))) {
             // Check for any changes to user config or types
             if (
-              oAccessory.context.subType !== subType ||
-              oAccessory.context.sensorTimeLength !== sensorTimeLength ||
-              oAccessory.context.sensorTimeDiff !== sensorTimeDiff ||
-              oAccessory.context.disableDeviceLogging !== disableDeviceLogging ||
-              oAccessory.context.swNumber !== swNumber
+              subAccessory.context.subType !== subType ||
+              subAccessory.context.sensorTimeLength !== sensorTimeLength ||
+              subAccessory.context.sensorTimeDiff !== sensorTimeDiff ||
+              subAccessory.context.disableDeviceLogging !== disableDeviceLogging ||
+              subAccessory.context.swNumber !== swNumber
             ) {
               // Remove the existing sub accessory if any changes are found
-              this.removeAccessory(oAccessory)
+              this.removeAccessory(subAccessory)
             }
           }
 
           // Get the sub accessory if it's new or hasn't been removed above
 
-          oAccessory = this.devicesInHB.has(uuidsub)
+          subAccessory = this.devicesInHB.has(uuidsub)
             ? this.devicesInHB.get(uuidsub)
             : this.addAccessory(device, fullDeviceId, false, subExtraContext, 'rf_sub')
 
           // Add context information to the sub accessory
-          oAccessory.context.firmware = device.params.fwVersion || PLUGIN.version
-          oAccessory.context.reachableWAN = device.online
-          oAccessory.context.reachableLAN = false
-          oAccessory.context.eweBrandName = device.brandName
-          oAccessory.context.eweBrandLogo = device.brandLogo
-          oAccessory.context.eweShared = device.sharedBy && device.sharedBy.email
+          subAccessory.context.firmware = device.params.fwVersion || PLUGIN.version
+          subAccessory.context.reachableWAN = device.online
+          subAccessory.context.reachableLAN = false
+          subAccessory.context.eweBrandName = device.brandName
+          subAccessory.context.eweBrandLogo = device.brandLogo
+          subAccessory.context.eweShared = device.sharedBy && device.sharedBy.email
             ? device.sharedBy.email
             : false
-          oAccessory.context.ip = this.lanClient && oAccessory.context.reachableLAN
+          subAccessory.context.ip = this.lanClient && subAccessory.context.reachableLAN
             ? this.lanDevices.get(device.deviceid).ip
             : false
 
           // Update any changes to the sub accessory to the platform
-          this.api.updatePlatformAccessories(PLUGIN.name, PLUGIN.alias, [oAccessory])
-          this.devicesInHB.set(oAccessory.UUID, oAccessory)
-          oAccessory.control = new (require('./device/rf-bridge'))(this, oAccessory)
+          this.api.updatePlatformAccessories(PLUGIN.name, PLUGIN.alias, [subAccessory])
+          this.devicesInHB.set(subAccessory.UUID, subAccessory)
+          subAccessory.control = new (require('./device/rf-bridge'))(this, subAccessory)
           rfChlCounter += Object.keys(subDevice.buttons || {}).length
         })
 
         // Update any changes to the accessory to the platform
         accessory.context.channelCount = rfChlCounter
         /********************/
-      } else if (this.consts.devices.zbBridge.includes(device.extra.uiid)) {
+      } else if (this.consts.devices.zbBridge.includes(uiid)) {
         /************
         ZIGBEE BRIDGE
         ************/
         return
         /***********/
-      } else if (this.consts.devices.zbSwitchStateless.includes(device.extra.uiid)) {
+      } else if (this.consts.devices.zbSwitchStateless.includes(uiid)) {
         /**********************
         ZIGBEE STATELESS SWITCH
         **********************/
@@ -1133,7 +1142,7 @@ class eWeLinkPlatform {
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require(instance))(this, accessory)
         /*********************/
-      } else if (this.consts.devices.zbSwitchSingle.includes(device.extra.uiid)) {
+      } else if (this.consts.devices.zbSwitchSingle.includes(uiid)) {
         /***************
         ZB SINGLE SWITCH
         ***************/
@@ -1143,7 +1152,7 @@ class eWeLinkPlatform {
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require(instance))(this, accessory)
         /**************/
-      } else if (this.consts.devices.zbLightDimmer.includes(device.extra.uiid)) {
+      } else if (this.consts.devices.zbLightDimmer.includes(uiid)) {
         /*****************
         ZB LIGHTS [DIMMER]
         *****************/
@@ -1152,7 +1161,7 @@ class eWeLinkPlatform {
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/zigbee/light-dimmer'))(this, accessory)
         /****************/
-      } else if (this.consts.devices.zbLightCCT.includes(device.extra.uiid)) {
+      } else if (this.consts.devices.zbLightCCT.includes(uiid)) {
         /**************
         ZB LIGHTS [CCT]
         **************/
@@ -1161,7 +1170,7 @@ class eWeLinkPlatform {
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/zigbee/light-cct'))(this, accessory)
         /*************/
-      } else if (this.consts.devices.zbSensorAmbient.includes(device.extra.uiid)) {
+      } else if (this.consts.devices.zbSensorAmbient.includes(uiid)) {
         /******************
         ZB SENSOR [AMBIENT]
         ******************/
@@ -1171,7 +1180,7 @@ class eWeLinkPlatform {
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require(instance))(this, accessory)
         /*****************/
-      } else if (this.consts.devices.zbSensorMotion.includes(device.extra.uiid)) {
+      } else if (this.consts.devices.zbSensorMotion.includes(uiid)) {
         /*****************
         ZB SENSOR [MOTION]
         *****************/
@@ -1181,7 +1190,7 @@ class eWeLinkPlatform {
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require(instance))(this, accessory)
         /****************/
-      } else if (this.consts.devices.zbSensorContact.includes(device.extra.uiid)) {
+      } else if (this.consts.devices.zbSensorContact.includes(uiid)) {
         /******************
         ZB SENSOR [CONTACT]
         ******************/
@@ -1191,14 +1200,14 @@ class eWeLinkPlatform {
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require(instance))(this, accessory)
         /*****************/
-      } else if (this.consts.devices.camera.includes(device.extra.uiid)) {
+      } else if (this.consts.devices.camera.includes(uiid)) {
         /*************
         SONOFF CAMERAS
         *************/
         this.log('[%s] %s.', device.name, this.messages.sonoffCamera)
         return
         /************/
-      } else if (this.consts.devices.cannotSupport.includes(device.extra.uiid)) {
+      } else if (this.consts.devices.cannotSupport.includes(uiid)) {
         /*******************************
         DEVICES THAT CANNOT BE SUPPORTED
         *******************************/
@@ -1210,7 +1219,7 @@ class eWeLinkPlatform {
         DEVICES PENDING SUPPORT
         **********************/
         this.log.warn('[%s] %s:', device.name, this.messages.devNotSupYet)
-        this.log.warn('[%s] %s', device.extra.uiid || '?', JSON.stringify(device.params))
+        this.log.warn('[%s] %s', uiid || '?', JSON.stringify(device.params))
         return
         /*********************/
       }
@@ -1234,7 +1243,7 @@ class eWeLinkPlatform {
       // Helpful logging for each device
       const str = accessory.context.reachableLAN
         ? this.messages.foundWithIP + ' [' + this.lanDevices.get(device.deviceid).ip + ']'
-        : this.consts.devices.lanIn.includes(device.extra.uiid)
+        : this.consts.devices.lanIn.includes(uiid)
           ? this.messages.lanUnreachable
           : this.messages.lanUnsupported
 
@@ -1254,7 +1263,7 @@ class eWeLinkPlatform {
       this.log('[%s] %s %s.', device.name, this.messages.devInit, str)
       if (
         this.config.mode === 'lan' &&
-        !this.consts.devices.lanOut.includes(device.extra.uiid)
+        !this.consts.devices.lanOut.includes(uiid)
       ) {
         this.log.warn('[%s] %s.', device.name, this.messages.devNoControl)
       }
@@ -1524,19 +1533,19 @@ class eWeLinkPlatform {
           const uuid = this.api.hap.uuid.generate(deviceId + 'SW' + i)
           if (this.devicesInHB.has(uuid)) {
             // Find the sub accessory
-            const oAccessory = this.devicesInHB.get(uuid)
+            const subAccessory = this.devicesInHB.get(uuid)
 
             // Update the WAN status
-            oAccessory.context.reachableWAN = device.params.online
+            subAccessory.context.reachableWAN = device.params.online
 
             // Update the LAN status
             if (device.params.updateSource === 'LAN') {
-              oAccessory.context.reachableLAN = true
+              subAccessory.context.reachableLAN = true
             }
 
             // Save the sub accessory updates to the platform
-            this.api.updatePlatformAccessories(PLUGIN.name, PLUGIN.alias, [oAccessory])
-            this.devicesInHB.set(oAccessory.UUID, oAccessory)
+            this.api.updatePlatformAccessories(PLUGIN.name, PLUGIN.alias, [subAccessory])
+            this.devicesInHB.set(subAccessory.UUID, subAccessory)
           }
         }
       }
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 429553ce..e58b1066 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -105,7 +105,8 @@ module.exports = {
     lanOut: [1, 2, 3, 4, 5, 6, 7, 8, 9, 14, 28, 32, 44, 77, 78, 126],
     markStatus: [59, 103, 104, 1009, 1256, 1257, 1258],
     singleSwitch: [1, 5, 6, 14, 24, 27],
-    multiSwitch: [2, 3, 4, 7, 8, 9, 29, 30, 31, 41, 82, 83, 84, 126],
+    doubleSwitch: [126],
+    multiSwitch: [2, 3, 4, 7, 8, 9, 29, 30, 31, 41, 82, 83, 84],
     singleSwitchOutlet: ['Sonoff Pow', 'S20', 'S26', 'S26R1', 'S55', 'S55R1'],
     lightDimmer: [36, 44, 57],
     lightRGB: [22],
@@ -131,7 +132,7 @@ module.exports = {
     zbSensorAmbient: [1770],
     zbSensorMotion: [2026],
     zbSensorContact: [3026],
-    cannotSupport: [65, 118, 119, 120, 121]
+    cannotSupport: [0, 65, 118, 119, 120, 121]
   },
 
   paramsToKeep: [
@@ -200,6 +201,7 @@ module.exports = {
   },
 
   cannotSupportDevices: {
+    0: 0, // Placeholder for devices reported without a uiid (should be a never case)
     65: 0, // "CustomCamera" (eWeLink Camera App)
     118: 0, // "2.4G-1C" (eWeLink 2.4G Remote)
     119: 0, // "2.4G-2C" (eWeLink 2.4G Remote)

From 91ebd1eac169a6c4eea6b7f7f0d6be111ac15655 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 28 Apr 2021 07:55:58 +0100
Subject: [PATCH 1946/3183] better var names

---
 lib/device/rf-bridge.js      | 63 +++++++++++++++++++-----------------
 lib/device/sensor-contact.js | 14 ++++----
 lib/device/switch-double.js  | 53 ++++++++++++++++--------------
 lib/device/switch-multi.js   | 53 ++++++++++++++++--------------
 4 files changed, 96 insertions(+), 87 deletions(-)

diff --git a/lib/device/rf-bridge.js b/lib/device/rf-bridge.js
index b75de13b..e778ae8f 100644
--- a/lib/device/rf-bridge.js
+++ b/lib/device/rf-bridge.js
@@ -136,7 +136,7 @@ module.exports = class deviceRFBridge {
         return
       }
       const timeNow = new Date()
-      let oAccessory = false
+      let subAccessory = false
       if (
         this.funcs.hasProperty(params, 'cmd') &&
         params.cmd === 'transmit' &&
@@ -148,17 +148,17 @@ module.exports = class deviceRFBridge {
             this.funcs.hasProperty(acc.context, 'buttons') &&
             this.funcs.hasProperty(acc.context.buttons, params.rfChl.toString())
           ) {
-            oAccessory = acc
+            subAccessory = acc
           }
         })
-        if (oAccessory) {
-          oAccessory.getService(oAccessory.context.buttons[params.rfChl])
+        if (subAccessory) {
+          subAccessory.getService(subAccessory.context.buttons[params.rfChl])
             .updateCharacteristic(this.hapChar.On, 1)
-          if (params.updateSource && !oAccessory.context.disableDeviceLogging) {
-            this.log('[%s] current state [button triggered].', oAccessory.displayName)
+          if (params.updateSource && !subAccessory.context.disableDeviceLogging) {
+            this.log('[%s] current state [button triggered].', subAccessory.displayName)
           }
           this.funcs.sleep(3000)
-          oAccessory.getService(oAccessory.context.buttons[params.rfChl])
+          subAccessory.getService(subAccessory.context.buttons[params.rfChl])
             .updateCharacteristic(this.hapChar.On, 0)
         } else {
           throw new Error('rf button not found (please restart Homebridge)')
@@ -177,30 +177,30 @@ module.exports = class deviceRFBridge {
                 this.funcs.hasProperty(acc.context, 'buttons') &&
                 this.funcs.hasProperty(acc.context.buttons, chan.split('g')[1].toString())
               ) {
-                oAccessory = acc
+                subAccessory = acc
               }
             })
-            if (oAccessory) {
+            if (subAccessory) {
               // Avoid duplicate triggers from LAN and WS
-              if (params[chan] === oAccessory.context.cacheLastAct) {
+              if (params[chan] === subAccessory.context.cacheLastAct) {
                 return
               }
 
-              oAccessory.context.cacheLastAct = params[chan]
+              subAccessory.context.cacheLastAct = params[chan]
               const timeOfMotion = new Date(params[chan])
               const diff = (timeNow.getTime() - timeOfMotion.getTime()) / 1000
               let serv
               let char
               if (
-                diff < oAccessory.context.sensorTimeDiff ||
-                ['button', 'curtain'].includes(oAccessory.context.subType)
+                diff < subAccessory.context.sensorTimeDiff ||
+                ['button', 'curtain'].includes(subAccessory.context.subType)
               ) {
-                switch (oAccessory.context.subType) {
+                switch (subAccessory.context.subType) {
                   case 'button':
                   case 'curtain':
                     this.log(
                       '[%s] current state [button triggered].',
-                      oAccessory.displayName
+                      subAccessory.displayName
                     )
                     return
                   case 'water':
@@ -223,8 +223,8 @@ module.exports = class deviceRFBridge {
                   case 'contact': {
                     serv = this.hapServ.ContactSensor
                     char = this.hapChar.ContactSensorState
-                    const initialTime = oAccessory.eveService.getInitialTime()
-                    oAccessory.getService(serv).updateCharacteristic(
+                    const initialTime = subAccessory.eveService.getInitialTime()
+                    subAccessory.getService(serv).updateCharacteristic(
                       this.eveChar.LastActivation,
                       Math.round(new Date().valueOf() / 1000) - initialTime
                     )
@@ -237,29 +237,32 @@ module.exports = class deviceRFBridge {
                   default: {
                     serv = this.hapServ.MotionSensor
                     char = this.hapChar.MotionDetected
-                    const initialTime = oAccessory.eveService.getInitialTime()
-                    oAccessory.getService(serv).updateCharacteristic(
+                    const initialTime = subAccessory.eveService.getInitialTime()
+                    subAccessory.getService(serv).updateCharacteristic(
                       this.eveChar.LastActivation,
                       Math.round(new Date().valueOf() / 1000) - initialTime
                     )
                     break
                   }
                 }
-                oAccessory.getService(serv).updateCharacteristic(char, 1)
-                oAccessory.eveService.addEntry({ status: 1 })
-                if (params.updateSource && !oAccessory.context.disableDeviceLogging) {
-                  this.log('[%s] current state [triggered].', oAccessory.displayName)
+                subAccessory.getService(serv).updateCharacteristic(char, 1)
+                subAccessory.eveService.addEntry({ status: 1 })
+                if (params.updateSource && !subAccessory.context.disableDeviceLogging) {
+                  this.log('[%s] current state [triggered].', subAccessory.displayName)
                 }
                 const updateKey = Math.random().toString(36).substr(2, 8)
-                oAccessory.context.updateKey = updateKey
-                await this.funcs.sleep(oAccessory.context.sensorTimeLength * 1000)
-                if (updateKey !== oAccessory.context.updateKey) {
+                subAccessory.context.updateKey = updateKey
+                await this.funcs.sleep(subAccessory.context.sensorTimeLength * 1000)
+                if (updateKey !== subAccessory.context.updateKey) {
                   return
                 }
-                oAccessory.getService(serv).updateCharacteristic(char, 0)
-                oAccessory.eveService.addEntry({ status: 0 })
-                if (params.updateSource && !oAccessory.context.disableDeviceLogging) {
-                  this.log('[%s] current state [not triggered].', oAccessory.displayName)
+                subAccessory.getService(serv).updateCharacteristic(char, 0)
+                subAccessory.eveService.addEntry({ status: 0 })
+                if (params.updateSource && !subAccessory.context.disableDeviceLogging) {
+                  this.log(
+                    '[%s] current state [not triggered].',
+                    subAccessory.displayName
+                  )
                 }
               }
             } else {
diff --git a/lib/device/sensor-contact.js b/lib/device/sensor-contact.js
index 8f21c765..07b12dff 100644
--- a/lib/device/sensor-contact.js
+++ b/lib/device/sensor-contact.js
@@ -115,29 +115,29 @@ module.exports = class deviceSensorContact {
           newState === 0 ? '' : ' not'
         )
       }
-      let oAccessory
       for (const [deviceId, group] of Object.entries(this.platform.simulations)) {
         if (
           group.sensorId === this.accessory.context.eweDeviceId &&
           group.type === 'garage'
         ) {
           const uuid = this.platform.api.hap.uuid.generate(deviceId + 'SWX')
-          if ((oAccessory = this.platform.devicesInHB.get(uuid))) {
-            const gdService = oAccessory.getService(this.hapServ.GarageDoorOpener)
+          let subAccessory
+          if ((subAccessory = this.platform.devicesInHB.get(uuid))) {
+            const gdService = subAccessory.getService(this.hapServ.GarageDoorOpener)
             switch (newState) {
               case 0:
                 gdService.updateCharacteristic(this.hapChar.TargetDoorState, 1)
-                  .updateCharacteristic(this.hapChar.CurrentDoorState, 1)
+                gdService.updateCharacteristic(this.hapChar.CurrentDoorState, 1)
                 if (params.updateSource && !this.disableDeviceLogging) {
-                  this.log('[%s] current state [closed].', oAccessory.displayName)
+                  this.log('[%s] current state [closed].', subAccessory.displayName)
                 }
                 break
               case 1:
                 await this.funcs.sleep(Math.max(group.operationTime * 100, 2000))
                 gdService.updateCharacteristic(this.hapChar.TargetDoorState, 0)
-                  .updateCharacteristic(this.hapChar.CurrentDoorState, 0)
+                gdService.updateCharacteristic(this.hapChar.CurrentDoorState, 0)
                 if (params.updateSource && !this.disableDeviceLogging) {
-                  this.log('[%s] current state [open].', oAccessory.displayName)
+                  this.log('[%s] current state [open].', subAccessory.displayName)
                 }
                 break
             }
diff --git a/lib/device/switch-double.js b/lib/device/switch-double.js
index ab692ce7..6247aa28 100644
--- a/lib/device/switch-double.js
+++ b/lib/device/switch-double.js
@@ -72,7 +72,6 @@ module.exports = class deviceSwitchMulti {
 
   async internalUpdate (value) {
     try {
-      let oAccessory
       let masterState = 'off'
       const params = {
         switches: []
@@ -94,25 +93,26 @@ module.exports = class deviceSwitchMulti {
           for (let i = 0; i <= this.accessory.context.channelCount; i++) {
             const idToCheck = this.accessory.context.eweDeviceId + 'SW' + i
             const uuid = this.platform.api.hap.uuid.generate(idToCheck)
-            if ((oAccessory = this.platform.devicesInHB.get(uuid))) {
+            let subAccessory
+            if ((subAccessory = this.platform.devicesInHB.get(uuid))) {
               if (this.showAsOutlet) {
-                oAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
+                subAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
                   this.hapChar.On,
                   value
                 )
-                oAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
+                subAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
                   this.hapChar.OutletInUse,
                   value
                 )
               } else {
-                oAccessory.getService(this.hapServ.Switch).updateCharacteristic(
+                subAccessory.getService(this.hapServ.Switch).updateCharacteristic(
                   this.hapChar.On,
                   value
                 )
               }
-              oAccessory.eveService.addEntry({ status: value ? 1 : 0 })
+              subAccessory.eveService.addEntry({ status: value ? 1 : 0 })
               if (i > 0 && !this.disableDeviceLogging) {
-                const name = oAccessory.displayName
+                const name = subAccessory.displayName
                 this.log('[%s] current state [%s].', name, value ? 'on' : 'off')
               }
             }
@@ -123,17 +123,20 @@ module.exports = class deviceSwitchMulti {
           for (let i = 1; i <= this.accessory.context.channelCount; i++) {
             const idToCheck = this.accessory.context.eweDeviceId + 'SW' + i
             const uuid = this.platform.api.hap.uuid.generate(idToCheck)
-            if ((oAccessory = this.platform.devicesInHB.get(uuid))) {
-              const serv = this.showAsOutlet
+            let subAccessory
+            if ((subAccessory = this.platform.devicesInHB.get(uuid))) {
+              const service = this.showAsOutlet
                 ? this.hapServ.Outlet
                 : this.hapServ.Switch
-              if (oAccessory.getService(serv).getCharacteristic(this.hapChar.On).value) {
+              if (
+                subAccessory.getService(service).getCharacteristic(this.hapChar.On).value
+              ) {
                 masterState = 'on'
               }
               if (i === parseInt(switchNumber)) {
-                oAccessory.eveService.addEntry({ status: value ? 1 : 0 })
+                subAccessory.eveService.addEntry({ status: value ? 1 : 0 })
                 if (this.showAsOutlet) {
-                  oAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
+                  subAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
                     this.hapChar.OutletInUse,
                     value
                   )
@@ -141,7 +144,7 @@ module.exports = class deviceSwitchMulti {
                 if (i > 0 && !this.disableDeviceLogging) {
                   this.log(
                     '[%s] current state [%s].',
-                    oAccessory.displayName,
+                    subAccessory.displayName,
                     value ? 'on' : 'off'
                   )
                 }
@@ -151,23 +154,23 @@ module.exports = class deviceSwitchMulti {
           if (!this.platform.hideMasters.includes(this.accessory.context.eweDeviceId)) {
             const idToCheck = this.accessory.context.eweDeviceId + 'SW0'
             const uuid = this.platform.api.hap.uuid.generate(idToCheck)
-            oAccessory = this.platform.devicesInHB.get(uuid)
+            const subAccessory = this.platform.devicesInHB.get(uuid)
             if (this.showAsOutlet) {
-              oAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
+              subAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
                 this.hapChar.On,
                 masterState === 'on'
               )
-              oAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
+              subAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
                 this.hapChar.OutletInUse,
                 masterState === 'on'
               )
             } else {
-              oAccessory.getService(this.hapServ.Switch).updateCharacteristic(
+              subAccessory.getService(this.hapServ.Switch).updateCharacteristic(
                 this.hapChar.On,
                 masterState === 'on'
               )
             }
-            oAccessory.eveService.addEntry({ status: masterState === 'on' ? 1 : 0 })
+            subAccessory.eveService.addEntry({ status: masterState === 'on' ? 1 : 0 })
           }
           break
       }
@@ -193,9 +196,9 @@ module.exports = class deviceSwitchMulti {
         }
         const uuid = this.platform.api.hap.uuid.generate(idToCheck + i)
         if (this.platform.devicesInHB.has(uuid)) {
-          const oAccessory = this.platform.devicesInHB.get(uuid)
+          const subAccessory = this.platform.devicesInHB.get(uuid)
           const servToUse = this.showAsOutlet ? this.hapServ.Outlet : this.hapServ.Switch
-          const service = oAccessory.getService(servToUse)
+          const service = subAccessory.getService(servToUse)
           const currentState = service.getCharacteristic(this.hapChar.On).value
             ? 'on'
             : 'off'
@@ -203,27 +206,27 @@ module.exports = class deviceSwitchMulti {
             continue
           }
           if (this.showAsOutlet) {
-            oAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
+            subAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
               this.hapChar.On,
               params.switches[i - 1].switch === 'on'
             )
-            oAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
+            subAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
               this.hapChar.OutletInUse,
               params.switches[i - 1].switch === 'on'
             )
           } else {
-            oAccessory.getService(this.hapServ.Switch).updateCharacteristic(
+            subAccessory.getService(this.hapServ.Switch).updateCharacteristic(
               this.hapChar.On,
               params.switches[i - 1].switch === 'on'
             )
           }
-          oAccessory.eveService.addEntry({
+          subAccessory.eveService.addEntry({
             status: params.switches[i - 1].switch === 'on' ? 1 : 0
           })
           if (params.updateSource && !this.disableDeviceLogging) {
             this.log(
               '[%s] current state [%s].',
-              oAccessory.displayName,
+              subAccessory.displayName,
               params.switches[i - 1].switch
             )
           }
diff --git a/lib/device/switch-multi.js b/lib/device/switch-multi.js
index a41672c3..810fb248 100644
--- a/lib/device/switch-multi.js
+++ b/lib/device/switch-multi.js
@@ -72,7 +72,6 @@ module.exports = class deviceSwitchMulti {
 
   async internalUpdate (value) {
     try {
-      let oAccessory
       let masterState = 'off'
       const params = {
         switches: []
@@ -98,25 +97,26 @@ module.exports = class deviceSwitchMulti {
           for (let i = 0; i <= this.accessory.context.channelCount; i++) {
             const idToCheck = this.accessory.context.eweDeviceId + 'SW' + i
             const uuid = this.platform.api.hap.uuid.generate(idToCheck)
-            if ((oAccessory = this.platform.devicesInHB.get(uuid))) {
+            let subAccessory
+            if ((subAccessory = this.platform.devicesInHB.get(uuid))) {
               if (this.showAsOutlet) {
-                oAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
+                subAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
                   this.hapChar.On,
                   value
                 )
-                oAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
+                subAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
                   this.hapChar.OutletInUse,
                   value
                 )
               } else {
-                oAccessory.getService(this.hapServ.Switch).updateCharacteristic(
+                subAccessory.getService(this.hapServ.Switch).updateCharacteristic(
                   this.hapChar.On,
                   value
                 )
               }
-              oAccessory.eveService.addEntry({ status: value ? 1 : 0 })
+              subAccessory.eveService.addEntry({ status: value ? 1 : 0 })
               if (i > 0 && !this.disableDeviceLogging) {
-                const name = oAccessory.displayName
+                const name = subAccessory.displayName
                 this.log('[%s] current state [%s].', name, value ? 'on' : 'off')
               }
             }
@@ -129,17 +129,20 @@ module.exports = class deviceSwitchMulti {
           for (let i = 1; i <= this.accessory.context.channelCount; i++) {
             const idToCheck = this.accessory.context.eweDeviceId + 'SW' + i
             const uuid = this.platform.api.hap.uuid.generate(idToCheck)
-            if ((oAccessory = this.platform.devicesInHB.get(uuid))) {
-              const serv = this.showAsOutlet
+            let subAccessory
+            if ((subAccessory = this.platform.devicesInHB.get(uuid))) {
+              const service = this.showAsOutlet
                 ? this.hapServ.Outlet
                 : this.hapServ.Switch
-              if (oAccessory.getService(serv).getCharacteristic(this.hapChar.On).value) {
+              if (
+                subAccessory.getService(service).getCharacteristic(this.hapChar.On).value
+              ) {
                 masterState = 'on'
               }
               if (i === parseInt(switchNumber)) {
-                oAccessory.eveService.addEntry({ status: value ? 1 : 0 })
+                subAccessory.eveService.addEntry({ status: value ? 1 : 0 })
                 if (this.showAsOutlet) {
-                  oAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
+                  subAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
                     this.hapChar.OutletInUse,
                     value
                   )
@@ -147,7 +150,7 @@ module.exports = class deviceSwitchMulti {
                 if (i > 0 && !this.disableDeviceLogging) {
                   this.log(
                     '[%s] current state [%s].',
-                    oAccessory.displayName,
+                    subAccessory.displayName,
                     value ? 'on' : 'off'
                   )
                 }
@@ -157,23 +160,23 @@ module.exports = class deviceSwitchMulti {
           if (!this.platform.hideMasters.includes(this.accessory.context.eweDeviceId)) {
             const idToCheck = this.accessory.context.eweDeviceId + 'SW0'
             const uuid = this.platform.api.hap.uuid.generate(idToCheck)
-            oAccessory = this.platform.devicesInHB.get(uuid)
+            const subAccessory = this.platform.devicesInHB.get(uuid)
             if (this.showAsOutlet) {
-              oAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
+              subAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
                 this.hapChar.On,
                 masterState === 'on'
               )
-              oAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
+              subAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
                 this.hapChar.OutletInUse,
                 masterState === 'on'
               )
             } else {
-              oAccessory.getService(this.hapServ.Switch).updateCharacteristic(
+              subAccessory.getService(this.hapServ.Switch).updateCharacteristic(
                 this.hapChar.On,
                 masterState === 'on'
               )
             }
-            oAccessory.eveService.addEntry({ status: masterState === 'on' ? 1 : 0 })
+            subAccessory.eveService.addEntry({ status: masterState === 'on' ? 1 : 0 })
           }
           break
       }
@@ -199,9 +202,9 @@ module.exports = class deviceSwitchMulti {
         }
         const uuid = this.platform.api.hap.uuid.generate(idToCheck + i)
         if (this.platform.devicesInHB.has(uuid)) {
-          const oAccessory = this.platform.devicesInHB.get(uuid)
+          const subAccessory = this.platform.devicesInHB.get(uuid)
           const servToUse = this.showAsOutlet ? this.hapServ.Outlet : this.hapServ.Switch
-          const service = oAccessory.getService(servToUse)
+          const service = subAccessory.getService(servToUse)
           const currentState = service.getCharacteristic(this.hapChar.On).value
             ? 'on'
             : 'off'
@@ -209,27 +212,27 @@ module.exports = class deviceSwitchMulti {
             continue
           }
           if (this.showAsOutlet) {
-            oAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
+            subAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
               this.hapChar.On,
               params.switches[i - 1].switch === 'on'
             )
-            oAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
+            subAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
               this.hapChar.OutletInUse,
               params.switches[i - 1].switch === 'on'
             )
           } else {
-            oAccessory.getService(this.hapServ.Switch).updateCharacteristic(
+            subAccessory.getService(this.hapServ.Switch).updateCharacteristic(
               this.hapChar.On,
               params.switches[i - 1].switch === 'on'
             )
           }
-          oAccessory.eveService.addEntry({
+          subAccessory.eveService.addEntry({
             status: params.switches[i - 1].switch === 'on' ? 1 : 0
           })
           if (params.updateSource && !this.disableDeviceLogging) {
             this.log(
               '[%s] current state [%s].',
-              oAccessory.displayName,
+              subAccessory.displayName,
               params.switches[i - 1].switch
             )
           }

From ebef657ec5adfe8052c1f7b2af17d136ab1e3bde Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 28 Apr 2021 07:58:07 +0100
Subject: [PATCH 1947/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1e83507b..6ea664ee 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,8 +10,10 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 ### Changes
 
+* Remove old *Switch* services from DUALR3 when in motor mode
 * iFan devices now use caching to avoid unnecessary duplicate updates
 * Increase ws timeout from 5 to 6 seconds
+* Decrease lan-only timeout from 10 to 9 seconds
 
 ## 6.2.2 (2021-04-27)
 

From c637188cf53a7b594dc51fb54d545de3235fffa8 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 28 Apr 2021 07:59:00 +0100
Subject: [PATCH 1948/3183] 6.2.3-beta.3

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 15f43c11..c3343f74 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.2.3-beta.2",
+  "version": "6.2.3-beta.3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index d75c40f8..29f1ef6c 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.2.3-beta.2",
+  "version": "6.2.3-beta.3",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From b4e5f71a85dadd78f9b760de98aa36e336b1b99a Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 28 Apr 2021 09:16:30 +0100
Subject: [PATCH 1949/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6ea664ee..a4a12b15 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 All notable changes to this homebridge-ewelink will be documented in this file.
 
-## BETA
+## 6.3.0 (2021-04-28)
 
 ### Added
 

From 22444b2dc88608eb01ae05387e1500007f1a7e0b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 28 Apr 2021 09:16:53 +0100
Subject: [PATCH 1950/3183] 6.3.0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c3343f74..bc9cbad8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.2.3-beta.3",
+  "version": "6.3.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 29f1ef6c..f4fdaa2a 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.2.3-beta.3",
+  "version": "6.3.0",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 8fc0546c54d7cd6b872e9349b408510e9b21c5d7 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 30 Apr 2021 17:58:24 +0100
Subject: [PATCH 1951/3183] logging, var names, consistency

---
 lib/device/curtain.js          |  20 +++--
 lib/device/diffuser.js         |  70 ++++++++--------
 lib/device/fan.js              |  52 ++++++++----
 lib/device/humidifier.js       |  62 ++++++++------
 lib/device/light-cct.js        |  86 ++++++++++---------
 lib/device/light-dimmer.js     |  62 +++++++-------
 lib/device/light-rgb-cct.js    | 146 ++++++++++++++++-----------------
 lib/device/light-rgb.js        |  48 ++++-------
 lib/device/motor.js            |  22 +++--
 lib/device/outlet-scm.js       |  12 +--
 lib/device/outlet.js           |  32 ++++----
 lib/device/rf-bridge.js        |  41 ++++++---
 lib/device/sensor-ambient.js   |  30 ++++---
 lib/device/sensor-contact.js   |  40 ++++++---
 lib/device/sensor-temp-humi.js |  16 ++--
 lib/device/switch-double.js    |   9 +-
 lib/device/switch-multi.js     |   9 +-
 lib/device/switch-single.js    |  12 +--
 lib/device/thermostat.js       |  39 +++++----
 lib/utils/lang-en.js           |  26 ++++++
 20 files changed, 467 insertions(+), 367 deletions(-)

diff --git a/lib/device/curtain.js b/lib/device/curtain.js
index b70f837f..556e6115 100644
--- a/lib/device/curtain.js
+++ b/lib/device/curtain.js
@@ -49,6 +49,14 @@ module.exports = class deviceCurtain {
 
   async internalUpdate (value) {
     try {
+      // This acts like a debounce function when endlessly sliding the slider
+      const updateKey = Math.random().toString(36).substr(2, 8)
+      this.updateKey = updateKey
+      await this.funcs.sleep(500)
+      if (updateKey !== this.updateKey) {
+        return
+      }
+
       // Create the params object to send
       const params = {}
 
@@ -65,11 +73,11 @@ module.exports = class deviceCurtain {
       await this.platform.sendDeviceUpdate(this.accessory, params)
 
       // Update the cache with the new position
-      this.cachePosition = value
+      this.cachePos = value
 
       // Log the update if appropriate
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current position [%s%].', this.name, this.cachePosition)
+        this.log('[%s] %s [%s%].', this.name, this.messages.curPos, this.cachePos)
       }
     } catch (err) {
       // Catch any errors and let the platform display them
@@ -77,7 +85,7 @@ module.exports = class deviceCurtain {
       setTimeout(() => {
         this.service.updateCharacteristic(
           this.hapChar.TargetPosition,
-          this.cachePosition
+          this.cachePos
         )
       }, 5000)
       throw new this.platform.api.hap.HapStatusError(-70402)
@@ -100,10 +108,10 @@ module.exports = class deviceCurtain {
       this.service.updateCharacteristic(this.hapChar.PositionState, 2)
 
       // Only update the cache and log if the provided value has changed
-      if (params.updateSource && this.cachePosition !== newPos) {
-        this.cachePosition = newPos
+      if (params.updateSource && this.cachePos !== newPos) {
+        this.cachePos = newPos
         if (!this.disableDeviceLogging) {
-          this.log('[%s] current position [%s%].', this.name, this.cachePosition)
+          this.log('[%s] %s [%s%].', this.name, this.messages.curPos, this.cachePos)
         }
       }
     } catch (err) {
diff --git a/lib/device/diffuser.js b/lib/device/diffuser.js
index 69623cbe..611b2976 100644
--- a/lib/device/diffuser.js
+++ b/lib/device/diffuser.js
@@ -72,7 +72,7 @@ module.exports = class deviceDiffuser {
     try {
       // Don't continue if the requested new state is the same as the current state
       const newValue = value ? 'on' : 'off'
-      if (this.cacheOnOff === newValue) {
+      if (this.cacheState === newValue) {
         return
       }
 
@@ -92,17 +92,17 @@ module.exports = class deviceDiffuser {
       await this.platform.sendDeviceUpdate(this.accessory, params)
 
       // Update the cache with the new state
-      this.cacheOnOff = newValue
+      this.cacheState = newValue
 
       // Log the update if appropriate
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current state [%s].', this.name, this.cacheOnOff)
+        this.log('[%s] %s [%s].', this.name, this.messages.curState, this.cacheState)
       }
     } catch (err) {
       // Catch any errors and let the platform display them
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
-        this.fanService.updateCharacteristic(this.hapChar.On, this.cacheOnOff === 'on')
+        this.fanService.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
       }, 5000)
       throw new this.platform.api.hap.HapStatusError(-70402)
     }
@@ -150,13 +150,13 @@ module.exports = class deviceDiffuser {
 
       // Log the update if appropriate
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current speed [%s%].', this.name, this.cacheSpeed)
+        this.log('[%s] %s [%s%].', this.name, this.messages.curSpeed, this.cacheSpeed)
       }
     } catch (err) {
       // Catch any errors and let the platform display them
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
-        this.fanService.updateCharacteristic(this.hapChar.On, this.cacheOnOff === 'on')
+        this.fanService.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
       }, 5000)
       throw new this.platform.api.hap.HapStatusError(-70402)
     }
@@ -166,12 +166,12 @@ module.exports = class deviceDiffuser {
     try {
       // Don't continue if the new value is the same as before
       const newValue = value ? 1 : 0
-      if (this.cacheLightOnOff === newValue) {
+      if (this.cacheLight === newValue) {
         return
       }
 
       // Create the params object
-      const params = { lightswitch: this.cacheLightOnOff }
+      const params = { lightswitch: this.cacheLight }
 
       // Set up a five second timeout for the plugin to ignore incoming updates
       const updateKeyLight = Math.random().toString(36).substr(2, 8)
@@ -186,11 +186,12 @@ module.exports = class deviceDiffuser {
       await this.platform.sendDeviceUpdate(this.accessory, params)
 
       // Update the cache value
-      this.cacheLightOnOff = newValue
+      this.cacheLight = newValue
 
       // Log the update if appropriate
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current light [%s%].', this.name, value === 1 ? 'on' : 'off')
+        const label = value === 1 ? 'on' : 'off'
+        this.log('[%s] %s [%s%].', this.name, this.messages.curLight, label)
       }
     } catch (err) {
       // Catch any errors and let the platform display them
@@ -198,7 +199,7 @@ module.exports = class deviceDiffuser {
       setTimeout(() => {
         this.lightService.updateCharacteristic(
           this.hapChar.On,
-          this.cacheLightOnOff === 'on'
+          this.cacheLight === 'on'
         )
       }, 5000)
       throw new this.platform.api.hap.HapStatusError(-70402)
@@ -208,7 +209,7 @@ module.exports = class deviceDiffuser {
   async internalLightBrightnessUpdate (value) {
     try {
       // Don't continue if the new value is the same as before
-      if (this.cacheBrightness === value) {
+      if (this.cacheBright === value) {
         return
       }
 
@@ -235,11 +236,11 @@ module.exports = class deviceDiffuser {
       await this.platform.sendDeviceUpdate(this.accessory, params)
 
       // Update the cache value
-      this.cacheBrightness = value
+      this.cacheBright = value
 
       // Log the update if appropriate
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current brightness [%s%].', this.name, this.cacheBrightness)
+        this.log('[%s] %s [%s%].', this.name, this.messages.curBright, this.cacheBright)
       }
     } catch (err) {
       // Catch any errors and let the platform display them
@@ -247,7 +248,7 @@ module.exports = class deviceDiffuser {
       setTimeout(() => {
         this.lightService.updateCharacteristic(
           this.hapChar.On,
-          this.cacheLightOnOff === 'on'
+          this.cacheLight === 'on'
         )
       }, 5000)
       throw new this.platform.api.hap.HapStatusError(-70402)
@@ -257,7 +258,7 @@ module.exports = class deviceDiffuser {
   async internalLightColourUpdate (value) {
     try {
       // Don't continue if the light is off or the new value is the same as before
-      if (this.cacheOnOff !== 'on' || this.cacheHue === value) {
+      if (this.cacheState !== 'on' || this.cacheHue === value) {
         return
       }
 
@@ -298,8 +299,9 @@ module.exports = class deviceDiffuser {
       // Log the update if appropriate
       if (!this.disableDeviceLogging) {
         this.log(
-          '[%s] current colour [rgb %s %s %s].',
+          '[%s] %s [rgb %s %s %s].',
           this.name,
+          this.messages.curColour,
           this.cacheR,
           this.cacheG,
           this.cacheB
@@ -311,7 +313,7 @@ module.exports = class deviceDiffuser {
       setTimeout(() => {
         this.lightService.updateCharacteristic(
           this.hapChar.On,
-          this.cacheLightOnOff === 'on'
+          this.cacheLight === 'on'
         )
       }, 5000)
       throw new this.platform.api.hap.HapStatusError(-70402)
@@ -326,15 +328,15 @@ module.exports = class deviceDiffuser {
       }
 
       // Check to see if we are provided new and different on/off information
-      if (params.switch && params.switch !== this.cacheOnOff) {
+      if (params.switch && params.switch !== this.cacheState) {
         // Update the cache value
-        this.cacheOnOff = params.switch
+        this.cacheState = params.switch
 
         // Update the HomeKit value
-        this.fanService.updateCharacteristic(this.hapChar.On, this.cacheOnOff === 'on')
+        this.fanService.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
 
         // If the diffuser is on but no speed provided, then update speed with the cache
-        if (this.cacheOnOff === 'on' && !this.funcs.hasProperty(params, 'state')) {
+        if (this.cacheState === 'on' && !this.funcs.hasProperty(params, 'state')) {
           this.fanService.updateCharacteristic(
             this.hapChar.RotationSpeed,
             this.cacheSpeed
@@ -343,7 +345,7 @@ module.exports = class deviceDiffuser {
 
         // Log if appropriate
         if (params.updateSource && !this.disableDeviceLogging) {
-          this.log('[%s] current state [%s%].', this.name, this.cacheOnOff)
+          this.log('[%s] %s [%s%].', this.name, this.messages.curState, this.cacheState)
         }
       }
 
@@ -360,38 +362,35 @@ module.exports = class deviceDiffuser {
 
         // Log if appropriate
         if (params.updateSource && !this.disableDeviceLogging) {
-          this.log('[%s] current speed [%s%].', this.name, this.cacheSpeed)
+          this.log('[%s] %s [%s%].', this.name, this.messages.curSpeed, this.cacheSpeed)
         }
       }
 
       // Check to see if we are provided new and different light on/off information
       if (
         this.funcs.hasProperty(params, 'lightswitch') &&
-        this.cacheLightOnOff !== params.lightswitch
+        this.cacheLight !== params.lightswitch
       ) {
         // Lightswitch is {0, 1} corresponding to {false, true} off/on state
-        this.cacheLightOnOff = params.lightswitch
+        this.cacheLight = params.lightswitch
 
         // Update the HomeKit value
         this.lightService.updateCharacteristic(this.hapChar.On, params.lightswitch === 1)
 
         // Log if appropriate
         if (params.updateSource && !this.disableDeviceLogging) {
-          this.log(
-            '[%s] current light [%s%].',
-            this.name,
-            params.lightswitch === 1 ? 'on' : 'off'
-          )
+          const label = params.lightswitch === 1 ? 'on' : 'off'
+          this.log('[%s] %s [%s%].', this.name, this.messages.curLight, label)
         }
       }
 
       // Check to see if we are provided new and different light brightness information
       if (
         this.funcs.hasProperty(params, 'lightbright') &&
-        this.cacheBrightness !== params.lightbright
+        this.cacheBright !== params.lightbright
       ) {
         // Lightbright is [0, 100] corresponding to [0, 100] brightness
-        this.cacheBrightness = params.lightbright
+        this.cacheBright = params.lightbright
 
         // Update the HomeKit value
         this.lightService.updateCharacteristic(
@@ -401,7 +400,7 @@ module.exports = class deviceDiffuser {
 
         // Log if appropriate
         if (params.updateSource && !this.disableDeviceLogging) {
-          this.log('[%s] current brightness [%s%].', this.name, params.lightbright)
+          this.log('[%s] %s [%s%].', this.name, this.messages.curBright, this.cacheBright)
         }
       }
 
@@ -430,8 +429,9 @@ module.exports = class deviceDiffuser {
         // Log if appropriate
         if (params.updateSource && !this.disableDeviceLogging) {
           this.log(
-            '[%s] current colour [rgb %s %s %s].',
+            '[%s] %s [rgb %s %s %s].',
             this.name,
+            this.messages.curColour,
             this.cacheR,
             this.cacheG,
             this.cacheB
diff --git a/lib/device/fan.js b/lib/device/fan.js
index 78d6fedf..43b72744 100644
--- a/lib/device/fan.js
+++ b/lib/device/fan.js
@@ -61,6 +61,13 @@ module.exports = class deviceFan {
       })
     }
 
+    // Conversion object eWeLink mode to text label
+    this.speed2label = {
+      33: 'low',
+      66: 'medium',
+      99: 'high'
+    }
+
     // Output the customised options to the log if in debug mode
     if (this.debug) {
       const opts = JSON.stringify({
@@ -73,10 +80,17 @@ module.exports = class deviceFan {
 
   async internalSpeedUpdate (value) {
     try {
+      // This acts like a debounce function when endlessly sliding the slider
+      const updateKey = Math.random().toString(36).substr(2, 8)
+      this.updateKey = updateKey
+      await this.funcs.sleep(500)
+      if (updateKey !== this.updateKey) {
+        return
+      }
       const params = {
         switches: []
       }
-      const newPower = value >= 1
+      const newState = value >= 1
       let newSpeed
       if (value === 0) {
         newSpeed = 0
@@ -91,34 +105,35 @@ module.exports = class deviceFan {
         return
       }
       params.switches.push({
-        switch: newPower && newSpeed >= 33 ? 'on' : 'off',
+        switch: newState && newSpeed >= 33 ? 'on' : 'off',
         outlet: 1
       })
       params.switches.push({
-        switch: newPower && newSpeed === 66 ? 'on' : 'off',
+        switch: newState && newSpeed === 66 ? 'on' : 'off',
         outlet: 2
       })
       params.switches.push({
-        switch: newPower && newSpeed === 99 ? 'on' : 'off',
+        switch: newState && newSpeed === 99 ? 'on' : 'off',
         outlet: 3
       })
       await this.platform.sendDeviceUpdate(this.accessory, params)
-      if (newPower !== (this.cacheOnOff === 'on')) {
-        this.cacheOnOff = newPower ? 'on' : 'off'
+      if (newState !== (this.cacheState === 'on')) {
+        this.cacheState = newState ? 'on' : 'off'
         if (!this.disableDeviceLogging) {
-          this.log('[%s] current state [%s].', this.name, this.cacheOnOff)
+          this.log('[%s] %s [%s].', this.name, this.messages.curState, this.cacheState)
         }
       }
-      if (newSpeed !== this.cacheSpeed) {
+      if (newSpeed !== this.cacheSpeed && newSpeed > 0) {
         this.cacheSpeed = newSpeed
         if (!this.disableDeviceLogging) {
-          this.log('[%s] current speed [%s%].', this.name, this.cacheSpeed)
+          const label = this.speed2label[this.cacheSpeed]
+          this.log('[%s] %s [%s].', this.name, this.messages.curSpeed, label)
         }
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
-        this.service.updateCharacteristic(this.hapChar.On, this.cacheOnOff === 'on')
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
       }, 5000)
       throw new this.platform.api.hap.HapStatusError(-70402)
     }
@@ -140,7 +155,7 @@ module.exports = class deviceFan {
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.cacheLight = newLight
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current light [%s].', this.name, this.cacheLight)
+        this.log('[%s] %s [%s].', this.name, this.messages.curLight, this.cacheLight)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
@@ -156,11 +171,11 @@ module.exports = class deviceFan {
       if (!params.switches) {
         return
       }
-      if (params.switches[1].switch !== this.cacheOnOff) {
-        this.cacheOnOff = params.switches[1].switch
-        this.service.updateCharacteristic(this.hapChar.On, this.cacheOnOff === 'on')
+      if (params.switches[1].switch !== this.cacheState) {
+        this.cacheState = params.switches[1].switch
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
         if (params.updateSource && !this.disableDeviceLogging) {
-          this.log('[%s] current state [%s].', this.name, this.cacheOnOff)
+          this.log('[%s] %s [%s].', this.name, this.messages.curState, this.cacheState)
         }
       }
       let speed = 0
@@ -177,15 +192,16 @@ module.exports = class deviceFan {
       if (speed !== this.cacheSpeed) {
         this.cacheSpeed = speed
         this.service.updateCharacteristic(this.hapChar.RotationSpeed, this.cacheSpeed)
-        if (params.updateSource && !this.disableDeviceLogging) {
-          this.log('[%s] current speed [%s%].', this.name, this.cacheSpeed)
+        if (params.updateSource && !this.disableDeviceLogging && this.cacheSpeed > 0) {
+          const label = this.speed2label[this.cacheSpeed]
+          this.log('[%s] %s [%s].', this.name, this.messages.curSpeed, label)
         }
       }
       if (this.lightService && params.switches[0].switch !== this.cacheLight) {
         this.cacheLight = params.switches[0].switch
         this.lightService.updateCharacteristic(this.hapChar.On, this.cacheLight === 'on')
         if (params.updateSource && !this.disableDeviceLogging) {
-          this.log('[%s] current light state [%s].', this.name, this.cacheLight)
+          this.log('[%s] %s [%s].', this.name, this.messages.curLight, this.cacheLight)
         }
       }
     } catch (err) {
diff --git a/lib/device/humidifier.js b/lib/device/humidifier.js
index d206fa7e..57ab93bf 100644
--- a/lib/device/humidifier.js
+++ b/lib/device/humidifier.js
@@ -41,51 +41,62 @@ module.exports = class deviceHumidifier {
       .onSet(async value => {
         await this.internalUpdate(value)
       })
+
+    // Conversion object eWeLink mode to text label
+    this.mode2label = {
+      1: 'low',
+      2: 'medium',
+      3: 'high'
+    }
   }
 
   async internalUpdate (value) {
     try {
       const updateKey = Math.random().toString(36).substr(2, 8)
       this.updateKey = updateKey
-      await this.funcs.sleep(350)
+      await this.funcs.sleep(500)
       if (updateKey !== this.updateKey) {
         return
       }
       const params = {}
-      let newState
+      let newMode
       if (value === 0) {
-        if (this.cacheOnOff === 'off') {
+        if (this.cacheState === 'off') {
           return
         }
         params.switch = 'off'
       } else {
-        if (value > 0 && value <= 33) {
-          newState = 1
-        } else if (value > 33 && value <= 66) {
-          newState = 2
+        if (value <= 33) {
+          newMode = 1
+        } else if (value <= 66) {
+          newMode = 2
         } else {
-          newState = 3
+          newMode = 3
         }
-        if (this.cacheState === newState) {
+        if (this.cacheMode === newMode) {
           return
         }
         params.switch = 'on'
-        params.state = newState
+        params.state = newMode
       }
       await this.platform.sendDeviceUpdate(this.accessory, params)
       if (value === 0) {
-        this.cacheOnOff = 'off'
+        this.cacheState = 'off'
+        if (!this.disableDeviceLogging) {
+          this.log('[%s] %s [off].', this.name, this.messages.curState)
+        }
       } else {
-        this.cacheOnOff = 'on'
-        this.cacheState = newState
+        this.cacheState = 'on'
+        this.cacheMode = newMode
         if (!this.disableDeviceLogging) {
-          this.log('[%s] current mode [%s%].', this.name, this.cacheState)
+          const label = this.mode2label[this.cacheMode]
+          this.log('[%s] %s [%s].', this.name, this.messages.curMode, label)
         }
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
-        this.service.updateCharacteristic(this.hapChar.On, this.cacheOnOff === 'on')
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
       }, 5000)
       throw new this.platform.api.hap.HapStatusError(-70402)
     }
@@ -93,25 +104,26 @@ module.exports = class deviceHumidifier {
 
   async externalUpdate (params) {
     try {
-      if (params.switch && params.switch !== this.cacheOnOff) {
-        this.cacheOnOff = params.switch
+      if (params.switch && params.switch !== this.cacheState) {
+        this.cacheState = params.switch
         if (params.updateSource && !this.disableDeviceLogging) {
-          this.log('[%s] current state [%s%].', this.name, this.cacheOnOff)
+          this.log('[%s] %s [%s].', this.name, this.messages.curState, this.cacheState)
         }
-        this.service.updateCharacteristic(this.hapChar.On, this.cacheOnOff === 'on')
-        if (this.cacheOnOff !== 'on') {
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
+        if (this.cacheState !== 'on') {
           this.service.updateCharacteristic(this.hapChar.RotationSpeed, 0)
         }
       }
-      if (params.state && params.state !== this.cacheState) {
-        this.cacheState = params.state
-        if (this.cacheOnOff === 'on') {
+      if (params.state && params.state !== this.cacheMode) {
+        this.cacheMode = params.state
+        if (this.cacheState === 'on') {
           if (params.updateSource && !this.disableDeviceLogging) {
-            this.log('[%s] current mode [%s%].', this.name, this.cacheState)
+            const label = this.mode2label[this.cacheMode]
+            this.log('[%s] %s [%s].', this.name, this.messages.curMode, label)
           }
           this.service.updateCharacteristic(
             this.hapChar.RotationSpeed,
-            this.cacheState * 33
+            this.cacheMode * 33
           )
         }
       }
diff --git a/lib/device/light-cct.js b/lib/device/light-cct.js
index ef2da3b1..51671793 100644
--- a/lib/device/light-cct.js
+++ b/lib/device/light-cct.js
@@ -72,7 +72,7 @@ module.exports = class deviceLightCCT {
     })
 
     // This is needed as sometimes we need to send the brightness with a cct update
-    this.cacheBrightness = this.service.getCharacteristic(this.hapChar.Brightness).value
+    this.cacheBright = this.service.getCharacteristic(this.hapChar.Brightness).value
 
     // Set up the adaptive lighting controller
     this.alController = new platform.api.hap.AdaptiveLightingController(
@@ -96,7 +96,7 @@ module.exports = class deviceLightCCT {
   async internalOnOffUpdate (value) {
     try {
       const newValue = value ? 'on' : 'off'
-      if (this.cacheOnOff === newValue) {
+      if (this.cacheState === newValue) {
         return
       }
       const timerKey = Math.random().toString(36).substr(2, 8)
@@ -109,14 +109,14 @@ module.exports = class deviceLightCCT {
       await this.platform.sendDeviceUpdate(this.accessory, {
         switch: newValue
       })
-      this.cacheOnOff = newValue
+      this.cacheState = newValue
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current state [%s].', this.name, this.cacheOnOff)
+        this.log('[%s] %s [%s].', this.name, this.messages.curState, this.cacheState)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
-        this.service.updateCharacteristic(this.hapChar.On, this.cacheOnOff === 'on')
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
       }, 5000)
       throw new this.platform.api.hap.HapStatusError(-70402)
     }
@@ -124,18 +124,18 @@ module.exports = class deviceLightCCT {
 
   async internalBrightnessUpdate (value) {
     try {
-      if (this.cacheBrightness === value) {
+      if (this.cacheBright === value) {
         return
       }
-      const updateKeyBright = Math.random().toString(36).substr(2, 8)
-      this.updateKeyBright = updateKeyBright
+      const updateKey = Math.random().toString(36).substr(2, 8)
+      this.updateKeyBright = updateKey
       await this.funcs.sleep(500)
-      if (updateKeyBright !== this.updateKeyBright) {
+      if (updateKey !== this.updateKeyBright) {
         return
       }
-      this.updateTimeout = updateKeyBright
+      this.updateTimeout = updateKey
       setTimeout(() => {
-        if (this.updateTimeout === updateKeyBright) {
+        if (this.updateTimeout === updateKey) {
           this.updateTimeout = false
         }
       }, 5000)
@@ -146,14 +146,14 @@ module.exports = class deviceLightCCT {
         }
       }
       await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.cacheBrightness = value
+      this.cacheBright = value
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current brightness [%s%].', this.name, this.cacheBrightness)
+        this.log('[%s] %s [%s%].', this.name, this.messages.curBright, this.cacheBright)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
-        this.service.updateCharacteristic(this.hapChar.On, this.cacheOnOff === 'on')
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
       }, 5000)
       throw new this.platform.api.hap.HapStatusError(-70402)
     }
@@ -161,21 +161,21 @@ module.exports = class deviceLightCCT {
 
   async internalCTempUpdate (value) {
     try {
-      if (this.cacheMired === value || this.cacheOnOff !== 'on') {
+      if (this.cacheMired === value || this.cacheState !== 'on') {
         return
       }
       if (!this.isOnline && this.alController.isAdaptiveLightingActive()) {
         return
       }
-      const updateKeyCT = Math.random().toString(36).substr(2, 8)
-      this.updateKeyCT = updateKeyCT
-      this.updateTimeout = updateKeyCT
+      const updateKey = Math.random().toString(36).substr(2, 8)
+      this.updateKeyCT = updateKey
       await this.funcs.sleep(400)
-      if (updateKeyCT !== this.updateKeyCT) {
+      if (updateKey !== this.updateKeyCT) {
         return
       }
+      this.updateTimeout = updateKey
       setTimeout(() => {
-        if (this.updateTimeout === updateKeyCT) {
+        if (this.updateTimeout === updateKey) {
           this.updateTimeout = false
         }
       }, 5000)
@@ -184,7 +184,7 @@ module.exports = class deviceLightCCT {
       const scaledCT = Math.round(((scaledK - this.minK) / (this.maxK - this.minK)) * 255)
       const params = {
         white: {
-          br: this.cacheBrightness,
+          br: this.cacheBright,
           ct: scaledCT
         }
       }
@@ -193,15 +193,21 @@ module.exports = class deviceLightCCT {
       this.cacheCT = scaledCT
       if (!this.disableDeviceLogging) {
         if (this.alController && this.alController.isAdaptiveLightingActive()) {
-          this.log('[%s] current cct [%sK] via adaptive lighting.', this.name, scaledK)
+          this.log(
+            '[%s] %s [%sK] %s.',
+            this.name,
+            this.messages.curColour,
+            scaledK,
+            this.messages.viaAL
+          )
         } else {
-          this.log('[%s] current cct [%sK].', this.name, scaledK)
+          this.log('[%s] %s [%sK].', this.name, this.messages.curColour, scaledK)
         }
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
-        this.service.updateCharacteristic(this.hapChar.On, this.cacheOnOff === 'on')
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
       }, 5000)
       throw new this.platform.api.hap.HapStatusError(-70402)
     }
@@ -212,22 +218,27 @@ module.exports = class deviceLightCCT {
       if (this.updateTimeout) {
         return
       }
-      if (params.switch && params.switch !== this.cacheOnOff) {
-        this.cacheOnOff = params.switch
-        this.service.updateCharacteristic(this.hapChar.On, this.cacheOnOff === 'on')
+      if (params.switch && params.switch !== this.cacheState) {
+        this.cacheState = params.switch
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
         if (params.updateSource && !this.disableDeviceLogging) {
-          this.log('[%s] current state [%s].', this.name, this.cacheOnOff)
+          this.log('[%s] %s [%s].', this.name, this.messages.curState, this.cacheState)
         }
       }
       if (params.white) {
         if (
           this.funcs.hasProperty(params.white, 'br') &&
-          this.cacheBrightness !== params.white.br
+          this.cacheBright !== params.white.br
         ) {
-          this.cacheBrightness = params.white.br
-          this.service.updateCharacteristic(this.hapChar.Brightness, this.cacheBrightness)
+          this.cacheBright = params.white.br
+          this.service.updateCharacteristic(this.hapChar.Brightness, this.cacheBright)
           if (params.updateSource && !this.disableDeviceLogging) {
-            this.log('[%s] current brightness [%s%].', this.name, this.cacheBrightness)
+            this.log(
+              '[%s] %s [%s%].',
+              this.name,
+              this.messages.curBright,
+              this.cacheBright
+            )
           }
         }
         if (
@@ -245,15 +256,14 @@ module.exports = class deviceLightCCT {
           )
           if (params.updateSource) {
             if (!this.disableDeviceLogging) {
-              this.log('[%s] current cct [%sK].', this.name, scaledK)
+              this.log('[%s] %s [%sK].', this.name, this.messages.curColour, scaledK)
             }
             if (this.alController.isAdaptiveLightingActive() && ctDiff > 20) {
-              // look for a variation greater than twenty
+              // Look for a variation greater than twenty
               this.alController.disableAdaptiveLighting()
-              this.log(
-                '[%s] adaptive lighting disabled due to significant colour change.',
-                this.name
-              )
+              if (!this.disableDeviceLogging) {
+                this.log('[%s] %s.', this.name, this.messages.disabledAL)
+              }
             }
           }
         }
diff --git a/lib/device/light-dimmer.js b/lib/device/light-dimmer.js
index 749eb4dc..e70c7956 100644
--- a/lib/device/light-dimmer.js
+++ b/lib/device/light-dimmer.js
@@ -57,7 +57,7 @@ module.exports = class deviceLightDimmer {
   async internalOnOffUpdate (value) {
     try {
       const newValue = value ? 'on' : 'off'
-      if (this.cacheOnOff === newValue) {
+      if (this.cacheState === newValue) {
         return
       }
       const params = {}
@@ -72,14 +72,14 @@ module.exports = class deviceLightDimmer {
           break
       }
       await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.cacheOnOff = newValue
+      this.cacheState = newValue
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current state [%s].', this.name, this.cacheOnOff)
+        this.log('[%s] %s [%s].', this.name, this.messages.curState, this.cacheState)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
-        this.service.updateCharacteristic(this.hapChar.On, this.cacheOnOff === 'on')
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
       }, 5000)
       throw new this.platform.api.hap.HapStatusError(-70402)
     }
@@ -87,7 +87,13 @@ module.exports = class deviceLightDimmer {
 
   async internalBrightnessUpdate (value) {
     try {
-      if (this.cacheBrightness === value) {
+      if (this.cacheBright === value) {
+        return
+      }
+      const updateKey = Math.random().toString(36).substr(2, 8)
+      this.updateKeyBright = updateKey
+      await this.funcs.sleep(500)
+      if (updateKey !== this.updateKeyBright) {
         return
       }
       const params = {}
@@ -106,21 +112,15 @@ module.exports = class deviceLightDimmer {
           // Device eWeLink scale is 25-255 and HomeKit scale is 0-100.
           break
       }
-      const updateKey = Math.random().toString(36).substr(2, 8)
-      this.updateKeyBright = updateKey
-      await this.funcs.sleep(500)
-      if (updateKey !== this.updateKeyBright) {
-        return
-      }
       await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.cacheBrightness = value
+      this.cacheBright = value
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current brightness [%s%].', this.name, this.cacheBrightness)
+        this.log('[%s] %s [%s%].', this.name, this.messages.curBright, this.cacheBright)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
-        this.service.updateCharacteristic(this.hapChar.On, this.cacheOnOff === 'on')
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
       }, 5000)
       throw new this.platform.api.hap.HapStatusError(-70402)
     }
@@ -129,19 +129,19 @@ module.exports = class deviceLightDimmer {
   async externalUpdate (params) {
     try {
       if (this.accessory.context.eweUIID === 57) {
-        if (params.state && params.state !== this.cacheOnOff) {
+        if (params.state && params.state !== this.cacheState) {
           this.service.updateCharacteristic(this.hapChar.On, params.state === 'on')
-          this.cacheOnOff = params.state
+          this.cacheState = params.state
           if (params.updateSource && !this.disableDeviceLogging) {
-            this.log('[%s] current state [%s].', this.name, params.state)
+            this.log('[%s] %s [%s].', this.name, this.messages.curState, this.cacheState)
           }
         }
       } else {
-        if (params.switch && params.switch !== this.cacheOnOff) {
+        if (params.switch && params.switch !== this.cacheState) {
           this.service.updateCharacteristic(this.hapChar.On, params.switch === 'on')
-          this.cacheOnOff = params.switch
+          this.cacheState = params.switch
           if (params.updateSource && !this.disableDeviceLogging) {
-            this.log('[%s] current state [%s].', this.name, params.switch)
+            this.log('[%s] %s [%s].', this.name, this.messages.curState, this.cacheState)
           }
         }
       }
@@ -151,11 +151,11 @@ module.exports = class deviceLightDimmer {
           // KING-M4 eWeLink scale is 10-100 and HomeKit scale is 0-100.
           if (this.funcs.hasProperty(params, 'bright')) {
             const nb = Math.round(((params.bright - 10) * 10) / 9)
-            if (nb !== this.cacheBrightness) {
+            if (nb !== this.cacheBright) {
               this.service.updateCharacteristic(this.hapChar.Brightness, nb)
-              this.cacheBrightness = nb
+              this.cacheBright = nb
               if (params.updateSource && !this.disableDeviceLogging) {
-                this.log('[%s] current brightness [%s%].', this.name, nb)
+                this.log('[%s] %s [%s%].', this.name, this.messages.curBright, nb)
               }
             }
           }
@@ -163,12 +163,12 @@ module.exports = class deviceLightDimmer {
         case 44:
           // D1 eWeLink scale matches HomeKit scale of 0-100
           if (this.funcs.hasProperty(params, 'brightness')) {
-            if (params.brightness !== this.cacheBrightness) {
-              this.service
-                .updateCharacteristic(this.hapChar.Brightness, params.brightness)
-              this.cacheBrightness = params.brightness
+            const nb = params.brightness
+            if (nb !== this.cacheBright) {
+              this.service.updateCharacteristic(this.hapChar.Brightness, nb)
+              this.cacheBright = nb
               if (params.updateSource && !this.disableDeviceLogging) {
-                this.log('[%s] current brightness [%s%].', this.name, params.brightness)
+                this.log('[%s] %s [%s%].', this.name, this.messages.curBright, nb)
               }
             }
           }
@@ -177,11 +177,11 @@ module.exports = class deviceLightDimmer {
           // Device eWeLink scale is 25-255 and HomeKit scale is 0-100.
           if (this.funcs.hasProperty(params, 'channel0')) {
             const nb = Math.round(((parseInt(params.channel0) - 25) * 10) / 23)
-            if (nb !== this.cacheBrightness) {
+            if (nb !== this.cacheBright) {
               this.service.updateCharacteristic(this.hapChar.Brightness, nb)
-              this.cacheBrightness = nb
+              this.cacheBright = nb
               if (params.updateSource && !this.disableDeviceLogging) {
-                this.log('[%s] current brightness [%s%].', this.name, nb)
+                this.log('[%s] %s [%s%].', this.name, this.messages.curBright, nb)
               }
             }
           }
diff --git a/lib/device/light-rgb-cct.js b/lib/device/light-rgb-cct.js
index b18bb992..de48f915 100644
--- a/lib/device/light-rgb-cct.js
+++ b/lib/device/light-rgb-cct.js
@@ -87,7 +87,7 @@ module.exports = class deviceLightRGBCCT {
   async internalOnOffUpdate (value) {
     try {
       const newValue = value ? 'on' : 'off'
-      if (this.cacheOnOff === newValue) {
+      if (this.cacheState === newValue) {
         return
       }
       const timerKey = Math.random().toString(36).substr(2, 8)
@@ -99,14 +99,14 @@ module.exports = class deviceLightRGBCCT {
       }, 5000)
       const params = { switch: newValue }
       await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.cacheOnOff = newValue
+      this.cacheState = newValue
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current state [%s].', this.name, this.cacheOnOff)
+        this.log('[%s] %s [%s].', this.name, this.messages.curState, this.cacheState)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
-        this.service.updateCharacteristic(this.hapChar.On, this.cacheOnOff === 'on')
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
       }, 5000)
       throw new this.platform.api.hap.HapStatusError(-70402)
     }
@@ -117,16 +117,16 @@ module.exports = class deviceLightRGBCCT {
       if (this.cacheBright === value) {
         return
       }
-      let params
-      const updateKeyBright = Math.random().toString(36).substr(2, 8)
-      this.updateKeyBright = updateKeyBright
+      const updateKey = Math.random().toString(36).substr(2, 8)
+      this.updateKeyBright = updateKey
       await this.funcs.sleep(500)
-      if (updateKeyBright !== this.updateKeyBright) {
+      if (updateKey !== this.updateKeyBright) {
         return
       }
-      this.updateTimeout = updateKeyBright
+      let params
+      this.updateTimeout = updateKey
       setTimeout(() => {
-        if (this.updateTimeout === updateKeyBright) {
+        if (this.updateTimeout === updateKey) {
           this.updateTimeout = false
         }
       }, 5000)
@@ -162,12 +162,12 @@ module.exports = class deviceLightRGBCCT {
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.cacheBright = value
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current brightness [%s%].', this.name, value)
+        this.log('[%s] %s [%s%].', this.name, this.messages.curBright, this.cacheBright)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
-        this.service.updateCharacteristic(this.hapChar.On, this.cacheOnOff === 'on')
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
       }, 5000)
       throw new this.platform.api.hap.HapStatusError(-70402)
     }
@@ -175,18 +175,18 @@ module.exports = class deviceLightRGBCCT {
 
   async internalColourUpdate (value) {
     try {
-      if (this.cacheHue === value || this.cacheOnOff !== 'on') {
+      if (this.cacheHue === value || this.cacheState !== 'on') {
         return
       }
-      const updateKeyColour = Math.random().toString(36).substr(2, 8)
-      this.updateKeyColour = updateKeyColour
+      const updateKey = Math.random().toString(36).substr(2, 8)
+      this.updateKey = updateKey
       await this.funcs.sleep(400)
-      if (updateKeyColour !== this.updateKeyColour) {
+      if (updateKey !== this.updateKey) {
         return
       }
-      this.updateTimeout = updateKeyColour
+      this.updateTimeout = updateKey
       setTimeout(() => {
-        if (this.updateTimeout === updateKeyColour) {
+        if (this.updateTimeout === updateKey) {
           this.updateTimeout = false
         }
       }, 5000)
@@ -228,18 +228,13 @@ module.exports = class deviceLightRGBCCT {
         this.cacheMode = 'color'
       }
       if (!this.disableDeviceLogging) {
-        this.log(
-          '[%s] current colour [rgb %s %s %s].',
-          this.name,
-          this.cacheR,
-          this.cacheG,
-          this.cacheB
-        )
+        const label = this.cacheR + ' ' + this.cacheG + ' ' + this.cacheB
+        this.log('[%s] %s [rgb %s].', this.name, this.messages.curColour, label)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
-        this.service.updateCharacteristic(this.hapChar.On, this.cacheOnOff === 'on')
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
       }, 5000)
       throw new this.platform.api.hap.HapStatusError(-70402)
     }
@@ -247,21 +242,21 @@ module.exports = class deviceLightRGBCCT {
 
   async internalCTempUpdate (value) {
     try {
-      if (this.cacheMired === value || this.cacheOnOff !== 'on') {
+      if (this.cacheMired === value || this.cacheState !== 'on') {
         return
       }
       if (!this.isOnline && this.alController.isAdaptiveLightingActive()) {
         return
       }
-      const updateKeyCT = Math.random().toString(36).substr(2, 8)
-      this.updateKeyCT = updateKeyCT
+      const updateKey = Math.random().toString(36).substr(2, 8)
+      this.updateKey = updateKey
       await this.funcs.sleep(400)
-      if (updateKeyCT !== this.updateKeyCT) {
+      if (updateKey !== this.updateKey) {
         return
       }
-      this.updateTimeout = updateKeyCT
+      this.updateTimeout = updateKey
       setTimeout(() => {
-        if (this.updateTimeout === updateKeyCT) {
+        if (this.updateTimeout === updateKey) {
           this.updateTimeout = false
         }
       }, 5000)
@@ -314,15 +309,21 @@ module.exports = class deviceLightRGBCCT {
       }
       if (!this.disableDeviceLogging) {
         if (this.alController.isAdaptiveLightingActive()) {
-          this.log('[%s] current cct [%sK] via adaptive lighting.', this.name, mToK)
+          this.log(
+            '[%s] %s [%sK] %s.',
+            this.name,
+            this.messages.curColour,
+            mToK,
+            this.messages.viaAL
+          )
         } else {
-          this.log('[%s] current cct [%sK].', this.name, mToK)
+          this.log('[%s] %s [%sK].', this.name, this.messages.curColour, mToK)
         }
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
-        this.service.updateCharacteristic(this.hapChar.On, this.cacheOnOff === 'on')
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
       }, 5000)
       throw new this.platform.api.hap.HapStatusError(-70402)
     }
@@ -333,11 +334,11 @@ module.exports = class deviceLightRGBCCT {
       if (this.updateTimeout) {
         return
       }
-      if (params.switch && params.switch !== this.cacheOnOff) {
-        this.cacheOnOff = params.switch
-        this.service.updateCharacteristic(this.hapChar.On, this.cacheOnOff === 'on')
+      if (params.switch && params.switch !== this.cacheState) {
+        this.cacheState = params.switch
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
         if (params.updateSource && !this.disableDeviceLogging) {
-          this.log('[%s] current state [%s].', this.name, this.cacheOnOff)
+          this.log('[%s] %s [%s].', this.name, this.messages.curState, this.cacheState)
         }
       }
       let hs
@@ -349,7 +350,8 @@ module.exports = class deviceLightRGBCCT {
               this.cacheBright = params.bright
               this.service.updateCharacteristic(this.hapChar.Brightness, this.cacheBright)
               if (params.updateSource && !this.disableDeviceLogging) {
-                this.log('[%s] current brightness [%s%].', this.name, this.cacheBright)
+                const nb = this.cacheBright
+                this.log('[%s] %s [%s%].', this.name, this.messages.curBright, nb)
               }
             }
           }
@@ -372,18 +374,12 @@ module.exports = class deviceLightRGBCCT {
               this.service.updateCharacteristic(this.hapChar.Saturation, hs[1])
               if (params.updateSource) {
                 if (!this.disableDeviceLogging) {
-                  this.log(
-                    '[%s] current colour [rgb %s %s %s].',
-                    this.name,
-                    this.cacheR, this.cacheG, this.cacheB
-                  )
+                  const label = this.cacheR + ' ' + this.cacheG + ' ' + this.cacheB
+                  this.log('[%s] %s [rgb %s].', this.name, this.messages.curColour, label)
                 }
                 if (this.alController.isAdaptiveLightingActive() && rgbDiff > 50) {
                   this.alController.disableAdaptiveLighting()
-                  this.log(
-                    '[%s] adaptive lighting disabled due to significant colour change.',
-                    this.name
-                  )
+                  this.log('[%s] %s.', this.name, this.messages.disabledAL)
                 }
               }
             }
@@ -395,10 +391,13 @@ module.exports = class deviceLightRGBCCT {
             if (this.funcs.hasProperty(params.color, 'br')) {
               if (params.color.br !== this.cacheBright) {
                 this.cacheBright = params.color.br
-                this.service
-                  .updateCharacteristic(this.hapChar.Brightness, this.cacheBright)
+                this.service.updateCharacteristic(
+                  this.hapChar.Brightness,
+                  this.cacheBright
+                )
                 if (params.updateSource && !this.disableDeviceLogging) {
-                  this.log('[%s] current brightness [%s%].', this.name, this.cacheBright)
+                  const nb = this.cacheBright
+                  this.log('[%s] %s [%s%].', this.name, this.messages.curBright, nb)
                 }
               }
             }
@@ -417,33 +416,30 @@ module.exports = class deviceLightRGBCCT {
                 hs = this.colourUtils.rgb2hs(this.cacheR, this.cacheG, this.cacheB)
                 this.cacheHue = hs[0]
                 this.service.updateCharacteristic(this.hapChar.ColorTemperature, 140)
-                  .updateCharacteristic(this.hapChar.Hue, this.cacheHue)
-                  .updateCharacteristic(this.hapChar.Saturation, 100)
+                this.service.updateCharacteristic(this.hapChar.Hue, this.cacheHue)
+                this.service.updateCharacteristic(this.hapChar.Saturation, 100)
                 if (params.updateSource && !this.disableDeviceLogging) {
-                  this.log(
-                    '[%s] current colour [rgb %s %s %s].',
-                    this.name,
-                    this.cacheR, this.cacheG, this.cacheB
-                  )
+                  const label = this.cacheR + ' ' + this.cacheG + ' ' + this.cacheB
+                  this.log('[%s] %s [rgb %s].', this.name, this.messages.curColour, label)
                 }
               }
             }
             if (params.updateSource && this.alController.isAdaptiveLightingActive()) {
               this.alController.disableAdaptiveLighting()
-              this.log(
-                '[%s] adaptive lighting disabled due to significant colour change.',
-                this.name
-              )
+              this.log('[%s] %s.', this.name, this.messages.disabledAL)
             }
           }
           if (params.ltype === 'white' && params.white) {
             if (this.funcs.hasProperty(params.white, 'br')) {
               if (params.white.br !== this.cacheBright || this.cacheMode !== 'white') {
                 this.cacheBright = params.white.br
-                this.service
-                  .updateCharacteristic(this.hapChar.Brightness, this.cacheBright)
+                this.service.updateCharacteristic(
+                  this.hapChar.Brightness,
+                  this.cacheBright
+                )
                 if (params.updateSource && !this.disableDeviceLogging) {
-                  this.log('[%s] current brightness [%s%].', this.name, this.cacheBright)
+                  const nb = this.cacheBright
+                  this.log('[%s] %s [%s%].', this.name, this.messages.curBright, nb)
                 }
               }
             }
@@ -459,19 +455,21 @@ module.exports = class deviceLightRGBCCT {
               hs = this.colourUtils.m2hs(this.cacheMired)
               this.cacheHue = hs[0]
               this.service.updateCharacteristic(this.hapChar.Hue, this.cacheHue)
-                .updateCharacteristic(this.hapChar.Saturation, hs[1])
-                .updateCharacteristic(this.hapChar.ColorTemperature, this.cacheMired)
+              this.service.updateCharacteristic(this.hapChar.Saturation, hs[1])
+              this.service.updateCharacteristic(
+                this.hapChar.ColorTemperature,
+                this.cacheMired
+              )
               if (params.updateSource) {
                 if (!this.disableDeviceLogging) {
-                  this.log('[%s] current cct [%sK].', this.name, ctToK)
+                  this.log('[%s] %s [%sK].', this.name, this.messages.curColour, ctToK)
                 }
                 if (this.alController.isAdaptiveLightingActive() && ctDiff > 20) {
-                  // look for a variation greater than twenty
+                  // Look for a variation greater than twenty
                   this.alController.disableAdaptiveLighting()
-                  this.log(
-                    '[%s] adaptive lighting disabled due to significant colour change.',
-                    this.name
-                  )
+                  if (!this.disableDeviceLogging) {
+                    this.log('[%s] %s.', this.name, this.messages.disabledAL)
+                  }
                 }
               }
             }
diff --git a/lib/device/light-rgb.js b/lib/device/light-rgb.js
index 052fae0b..454ac75d 100644
--- a/lib/device/light-rgb.js
+++ b/lib/device/light-rgb.js
@@ -18,7 +18,6 @@ module.exports = class deviceLightRGB {
     // Set up variables from the accessory
     this.name = accessory.displayName
     this.accessory = accessory
-    this.isB1 = this.accessory.context.eweUIID === 22
 
     // Set up custom variables for this device type
     const deviceId = this.accessory.context.eweDeviceId
@@ -65,7 +64,7 @@ module.exports = class deviceLightRGB {
     try {
       const params = {}
       const newValue = value ? 'on' : 'off'
-      if (this.cacheOnOff === newValue) {
+      if (this.cacheState === newValue) {
         return
       }
       params.state = newValue
@@ -77,14 +76,14 @@ module.exports = class deviceLightRGB {
         }
       }, 5000)
       await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.cacheOnOff = newValue
+      this.cacheState = newValue
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current state [%s].', this.name, this.cacheOnOff)
+        this.log('[%s] %s [%s].', this.name, this.messages.curState, this.cacheState)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
-        this.service.updateCharacteristic(this.hapChar.On, this.cacheOnOff === 'on')
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
       }, 5000)
       throw new this.platform.api.hap.HapStatusError(-70402)
     }
@@ -97,7 +96,7 @@ module.exports = class deviceLightRGB {
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
-        this.service.updateCharacteristic(this.hapChar.On, this.cacheOnOff === 'on')
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
       }, 5000)
       throw new this.platform.api.hap.HapStatusError(-70402)
     }
@@ -120,7 +119,6 @@ module.exports = class deviceLightRGB {
           this.updateTimeout = false
         }
       }, 5000)
-      this.service.updateCharacteristic(this.hapChar.ColorTemperature, 140)
       const saturation = this.service.getCharacteristic(this.hapChar.Saturation).value
       const newRGB = this.colourUtils.hs2rgb(value, saturation)
       const params = {
@@ -138,18 +136,13 @@ module.exports = class deviceLightRGB {
       this.cacheG = newRGB[1]
       this.cacheB = newRGB[2]
       if (!this.disableDeviceLogging) {
-        this.log(
-          '[%s] current colour [rgb %s %s %s].',
-          this.name,
-          this.cacheR,
-          this.cacheG,
-          this.cacheB
-        )
+        const label = this.cacheR + ' ' + this.cacheG + ' ' + this.cacheB
+        this.log('[%s] %s [rgb %s].', this.name, this.messages.curColour, label)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
-        this.service.updateCharacteristic(this.hapChar.On, this.cacheOnOff === 'on')
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
       }, 5000)
       throw new this.platform.api.hap.HapStatusError(-70402)
     }
@@ -160,15 +153,15 @@ module.exports = class deviceLightRGB {
       if (this.updateTimeout) {
         return
       }
-      if (params.state && params.state !== this.cacheOnOff) {
-        this.cacheOnOff = params.state
-        this.service.updateCharacteristic(this.hapChar.On, this.cacheOnOff === 'on')
+      if (params.state && params.state !== this.cacheState) {
+        this.cacheState = params.state
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
         this.service.updateCharacteristic(
           this.hapChar.Brightness,
-          this.cacheOnOff === 'on' ? 100 : 0
+          this.cacheState === 'on' ? 100 : 0
         )
         if (params.updateSource && !this.disableDeviceLogging) {
-          this.log('[%s] current state [%s].', this.name, this.cacheOnOff)
+          this.log('[%s] %s [%s].', this.name, this.messages.curState, this.cacheState)
         }
       }
       let hs
@@ -196,21 +189,14 @@ module.exports = class deviceLightRGB {
             hs = this.colourUtils.rgb2hs(this.cacheR, this.cacheG, this.cacheB)
             this.cacheHue = hs[0]
             this.service.updateCharacteristic(this.hapChar.Hue, this.cacheHue)
-              .updateCharacteristic(this.hapChar.Saturation, 100)
-              .updateCharacteristic(this.hapChar.Brightness, 100)
+            this.service.updateCharacteristic(this.hapChar.Saturation, 100)
+            this.service.updateCharacteristic(this.hapChar.Brightness, 100)
             if (params.updateSource && !this.disableDeviceLogging) {
-              this.log(
-                '[%s] current colour [rgb %s %s %s].',
-                this.name,
-                this.cacheR, this.cacheG, this.cacheB
-              )
+              const label = this.cacheR + ' ' + this.cacheG + ' ' + this.cacheB
+              this.log('[%s] %s [rgb %s].', this.name, this.messages.curColour, label)
             }
           }
         }
-      } else {
-        if (params.updateSource) {
-          this.log('[%s] current mode [white] is unsupported.', this.name)
-        }
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
diff --git a/lib/device/motor.js b/lib/device/motor.js
index 2dda0ae2..cbea596c 100644
--- a/lib/device/motor.js
+++ b/lib/device/motor.js
@@ -51,7 +51,7 @@ module.exports = class deviceMotor {
 
   async internalUpdate (value) {
     try {
-      if (this.cachePosition === value) {
+      if (this.cachePos === value) {
         return
       }
       const updateKey = Math.random().toString(36).substr(2, 8)
@@ -60,13 +60,11 @@ module.exports = class deviceMotor {
       if (updateKey !== this.updateKey) {
         return
       }
-      const params = {
-        location: value
-      }
+      const params = { location: value }
       await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.cachePosition = value
+      this.cachePos = value
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current position [%s%].', this.name, this.cachePosition)
+        this.log('[%s] %s [%s%].', this.name, this.messages.curPos, this.cachePos)
       }
     } catch (err) {
       // Catch any errors and let the platform display them
@@ -74,7 +72,7 @@ module.exports = class deviceMotor {
       setTimeout(() => {
         this.service.updateCharacteristic(
           this.hapChar.TargetPosition,
-          this.cachePosition
+          this.cachePos
         )
       }, 5000)
       throw new this.platform.api.hap.HapStatusError(-70402)
@@ -88,19 +86,19 @@ module.exports = class deviceMotor {
         this.funcs.hasProperty(params, 'currLocation') &&
         params.location === params.currLocation
       ) {
-        if (this.cachePosition !== params.location) {
-          this.cachePosition = params.location
+        if (this.cachePos !== params.location) {
+          this.cachePos = params.location
           this.service.updateCharacteristic(
             this.hapChar.TargetPosition,
-            this.cachePosition
+            this.cachePos
           )
           this.service.updateCharacteristic(
             this.hapChar.CurrentPosition,
-            this.cachePosition
+            this.cachePos
           )
           this.service.updateCharacteristic(this.hapChar.PositionState, 2)
           if (!this.disableDeviceLogging) {
-            this.log('[%s] current position [%s%].', this.name, this.cachePosition)
+            this.log('[%s] %s [%s%].', this.name, this.messages.curPos, this.cachePos)
           }
         }
       }
diff --git a/lib/device/outlet-scm.js b/lib/device/outlet-scm.js
index f32485f1..aa395247 100644
--- a/lib/device/outlet-scm.js
+++ b/lib/device/outlet-scm.js
@@ -74,15 +74,15 @@ module.exports = class deviceOutletSCM {
         switches: [{ switch: newValue, outlet: 0 }]
       }
       await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.cacheOnOff = newValue
+      this.cacheState = newValue
       this.accessory.eveService.addEntry({ status: value ? 1 : 0 })
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current state [%s].', this.name, this.cacheOnOff)
+        this.log('[%s] %s [%s].', this.name, this.messages.curState, this.cacheState)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
-        this.service.updateCharacteristic(this.hapChar.On, this.cacheOnOff === 'on')
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
       }, 5000)
       throw new this.platform.api.hap.HapStatusError(-70402)
     }
@@ -90,15 +90,15 @@ module.exports = class deviceOutletSCM {
 
   async externalUpdate (params) {
     try {
-      if (!params.switches || params.switches[0].switch === this.cacheOnOff) {
+      if (!params.switches || params.switches[0].switch === this.cacheState) {
         return
       }
       const newStatus = params.switches[0].switch === 'on'
       this.service.updateCharacteristic(this.hapChar.On, newStatus)
-      this.cacheOnOff = params.switches[0].switch
+      this.cacheState = params.switches[0].switch
       this.accessory.eveService.addEntry({ status: newStatus ? 1 : 0 })
       if (params.updateSource && !this.disableDeviceLogging) {
-        this.log('[%s] current state [%s].', this.name, params.switches[0].switch)
+        this.log('[%s] %s [%s].', this.name, this.messages.curState, this.cacheState)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
diff --git a/lib/device/outlet.js b/lib/device/outlet.js
index 11e92ad4..2925a7a6 100644
--- a/lib/device/outlet.js
+++ b/lib/device/outlet.js
@@ -141,14 +141,14 @@ module.exports = class deviceOutlet {
       await this.platform.sendDeviceUpdate(this.accessory, {
         switch: newValue
       })
-      this.cacheOnOff = newValue
+      this.cacheState = newValue
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current state [%s].', this.name, this.cacheOnOff)
+        this.log('[%s] %s [%s].', this.name, this.messages.curState, this.cacheState)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
-        this.service.updateCharacteristic(this.hapChar.On, this.cacheOnOff === 'on')
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
       }, 5000)
       throw new this.platform.api.hap.HapStatusError(-70402)
     }
@@ -165,15 +165,17 @@ module.exports = class deviceOutlet {
 
   async externalUpdate (params) {
     try {
-      if (params.switch && params.switch !== this.cacheOnOff) {
+      if (params.switch && params.switch !== this.cacheState) {
         this.service.updateCharacteristic(this.hapChar.On, params.switch === 'on')
-        this.cacheOnOff = params.switch
+        this.cacheState = params.switch
         if (params.updateSource && !this.disableDeviceLogging) {
-          this.log('[%s] current state [%s].', this.name, params.switch)
+          this.log('[%s] %s [%s].', this.name, this.messages.curState, params.switch)
         }
         if (!this.accessory.context.powerReadings) {
-          this.service
-            .updateCharacteristic(this.hapChar.OutletInUse, params.switch === 'on')
+          this.service.updateCharacteristic(
+            this.hapChar.OutletInUse,
+            params.switch === 'on'
+          )
         }
       }
       let logger = false
@@ -201,22 +203,24 @@ module.exports = class deviceOutlet {
         logger = true
       }
       if (this.funcs.hasProperty(params, 'current')) {
-        this.service
-          .updateCharacteristic(this.eveChar.ElectricCurrent, parseFloat(params.current))
+        this.service.updateCharacteristic(
+          this.eveChar.ElectricCurrent,
+          parseFloat(params.current)
+        )
         logger = true
       }
       if (params.updateSource && logger && !this.disableDeviceLogging) {
         this.log(
-          '[%s] current%s%s%s.',
+          '[%s] %s%s%s.',
           this.name,
           this.funcs.hasProperty(params, 'power')
-            ? ' power [' + params.power + 'W]'
+            ? ' ' + this.messages.curPower + ' [' + params.power + 'W]'
             : '',
           this.funcs.hasProperty(params, 'voltage')
-            ? ' voltage [' + params.voltage + 'V]'
+            ? ' ' + this.messages.curVolt + ' [' + params.voltage + 'V]'
             : '',
           this.funcs.hasProperty(params, 'current')
-            ? ' current [' + params.current + 'A]'
+            ? ' ' + this.messages.curCurr + ' [' + params.current + 'A]'
             : ''
         )
       }
diff --git a/lib/device/rf-bridge.js b/lib/device/rf-bridge.js
index e778ae8f..3fb868af 100644
--- a/lib/device/rf-bridge.js
+++ b/lib/device/rf-bridge.js
@@ -117,7 +117,12 @@ module.exports = class deviceRFBridge {
         rfChl: parseInt(rfChl)
       }
       await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.log('[%s] current state [button triggered].', this.name)
+      this.log(
+        '[%s] %s [%s].',
+        this.name,
+        this.messages.curState,
+        this.messages.buttonTrig
+      )
       setTimeout(() => {
         this.accessory.getService(service).updateCharacteristic(this.hapChar.On, false)
       }, 1000)
@@ -155,13 +160,18 @@ module.exports = class deviceRFBridge {
           subAccessory.getService(subAccessory.context.buttons[params.rfChl])
             .updateCharacteristic(this.hapChar.On, 1)
           if (params.updateSource && !subAccessory.context.disableDeviceLogging) {
-            this.log('[%s] current state [button triggered].', subAccessory.displayName)
+            this.log(
+              '[%s] %s [%s].',
+              subAccessory.displayName,
+              this.messages.curState,
+              this.messages.buttonTrig
+            )
           }
           this.funcs.sleep(3000)
           subAccessory.getService(subAccessory.context.buttons[params.rfChl])
             .updateCharacteristic(this.hapChar.On, 0)
         } else {
-          throw new Error('rf button not found (please restart Homebridge)')
+          throw new Error(this.messages.buttonNotFound)
         }
       } else if (
         (this.funcs.hasProperty(params, 'cmd') && params.cmd === 'trigger') ||
@@ -199,8 +209,10 @@ module.exports = class deviceRFBridge {
                   case 'button':
                   case 'curtain':
                     this.log(
-                      '[%s] current state [button triggered].',
-                      subAccessory.displayName
+                      '[%s] %s [%s].',
+                      subAccessory.displayName,
+                      this.messages.curState,
+                      this.messages.buttonTrig
                     )
                     return
                   case 'water':
@@ -248,7 +260,12 @@ module.exports = class deviceRFBridge {
                 subAccessory.getService(serv).updateCharacteristic(char, 1)
                 subAccessory.eveService.addEntry({ status: 1 })
                 if (params.updateSource && !subAccessory.context.disableDeviceLogging) {
-                  this.log('[%s] current state [triggered].', subAccessory.displayName)
+                  this.log(
+                    '[%s] %s [%s].',
+                    subAccessory.displayName,
+                    this.messages.curState,
+                    this.messages.rfTrigYes
+                  )
                 }
                 const updateKey = Math.random().toString(36).substr(2, 8)
                 subAccessory.context.updateKey = updateKey
@@ -260,17 +277,15 @@ module.exports = class deviceRFBridge {
                 subAccessory.eveService.addEntry({ status: 0 })
                 if (params.updateSource && !subAccessory.context.disableDeviceLogging) {
                   this.log(
-                    '[%s] current state [not triggered].',
-                    subAccessory.displayName
+                    '[%s] %s [%s].',
+                    subAccessory.displayName,
+                    this.messages.curState,
+                    this.messages.rfTrigNo
                   )
                 }
               }
             } else {
-              this.log.warn(
-                '[%s] no accessory found for [%s], please try restarting Homebridge.',
-                this.name,
-                chan
-              )
+              this.log.warn('[%s] %s [%s].', this.name, this.messages.rfNotFound, chan)
             }
           })
       }
diff --git a/lib/device/sensor-ambient.js b/lib/device/sensor-ambient.js
index ad621867..0e5425fd 100644
--- a/lib/device/sensor-ambient.js
+++ b/lib/device/sensor-ambient.js
@@ -101,14 +101,14 @@ module.exports = class deviceSensorAmbient {
         switch: newValue
       }
       await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.cacheOnOff = newValue
+      this.cacheState = newValue
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current state [%s].', this.name, this.cacheOnOff)
+        this.log('[%s] %s [%s].', this.name, this.messages.curState, this.cacheState)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
-        this.service.updateCharacteristic(this.hapChar.On, this.cacheOnOff === 'on')
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
       }, 5000)
       throw new this.platform.api.hap.HapStatusError(-70402)
     }
@@ -118,13 +118,15 @@ module.exports = class deviceSensorAmbient {
     try {
       if (!this.hideSwitch && params.switch) {
         const newState = params.switch
-        if (this.cacheOnOff !== newState) {
-          this.cacheOnOff = newState
-          this.switchService
-            .updateCharacteristic(this.hapChar.On, this.cacheOnOff === 'on')
-          this.accessory.eveService.addEntry({ status: this.cacheOnOff === 'on' ? 1 : 0 })
+        if (this.cacheState !== newState) {
+          this.cacheState = newState
+          this.switchService.updateCharacteristic(
+            this.hapChar.On,
+            this.cacheState === 'on'
+          )
+          this.accessory.eveService.addEntry({ status: this.cacheState === 'on' ? 1 : 0 })
           if (params.updateSource && !this.disableDeviceLogging) {
-            this.log('[%s] current state [%s].', this.name, this.cacheOnOff)
+            this.log('[%s] %s [%s].', this.name, this.messages.curState, this.cacheState)
           }
         }
       }
@@ -137,10 +139,12 @@ module.exports = class deviceSensorAmbient {
         eveLog.temp = currentTemp
         if (this.cacheTemp !== currentTemp) {
           this.cacheTemp = currentTemp
-          this.tempService
-            .updateCharacteristic(this.hapChar.CurrentTemperature, this.cacheTemp)
+          this.tempService.updateCharacteristic(
+            this.hapChar.CurrentTemperature,
+            this.cacheTemp
+          )
           if (params.updateSource && !this.disableDeviceLogging) {
-            this.log('[%s] current temperature [%s°C].', this.name, this.cacheTemp)
+            this.log('[%s] %s [%s°C].', this.name, this.messages.curTemp, this.cacheTemp)
           }
         }
       }
@@ -158,7 +162,7 @@ module.exports = class deviceSensorAmbient {
             this.cacheHumi
           )
           if (params.updateSource && !this.disableDeviceLogging) {
-            this.log('[%s] current humidity [%s%].', this.name, this.cacheHumi)
+            this.log('[%s] %s [%s%].', this.name, this.messages.curHumi, this.cacheHumi)
           }
         }
       }
diff --git a/lib/device/sensor-contact.js b/lib/device/sensor-contact.js
index 07b12dff..c703891b 100644
--- a/lib/device/sensor-contact.js
+++ b/lib/device/sensor-contact.js
@@ -76,16 +76,18 @@ module.exports = class deviceSensorContact {
     try {
       if (this.funcs.hasProperty(params, 'battery')) {
         const scaledBattery = Math.round(params.battery * 33.3)
-        if (this.cacheBattery !== scaledBattery) {
-          this.cacheBattery = scaledBattery
-          this.batteryService
-            .updateCharacteristic(this.hapChar.BatteryLevel, this.cacheBattery)
-            .updateCharacteristic(
-              this.hapChar.StatusLowBattery,
-              this.cacheBattery < this.lowBattThreshold
-            )
+        if (this.cacheBatt !== scaledBattery) {
+          this.cacheBatt = scaledBattery
+          this.batteryService.updateCharacteristic(
+            this.hapChar.BatteryLevel,
+            this.cacheBatt
+          )
+          this.batteryService.updateCharacteristic(
+            this.hapChar.StatusLowBattery,
+            this.cacheBatt < this.lowBattThreshold
+          )
           if (params.updateSource && !this.disableDeviceLogging) {
-            this.log('[%s] current battery [%s%].', this.name, this.cacheBattery)
+            this.log('[%s] %s [%s%].', this.name, this.messages.curBatt, this.cacheBatt)
           }
         }
       }
@@ -110,9 +112,10 @@ module.exports = class deviceSensorContact {
       }
       if (params.updateSource && !this.disableDeviceLogging) {
         this.log(
-          '[%s] current state [contact%s detected].',
+          '[%s] %s [%s].',
           this.name,
-          newState === 0 ? '' : ' not'
+          this.messages.curState,
+          newState === 0 ? this.messages.contactYes : this.messages.contactNo
         )
       }
       for (const [deviceId, group] of Object.entries(this.platform.simulations)) {
@@ -124,12 +127,18 @@ module.exports = class deviceSensorContact {
           let subAccessory
           if ((subAccessory = this.platform.devicesInHB.get(uuid))) {
             const gdService = subAccessory.getService(this.hapServ.GarageDoorOpener)
+            const name = subAccessory.displayName
             switch (newState) {
               case 0:
                 gdService.updateCharacteristic(this.hapChar.TargetDoorState, 1)
                 gdService.updateCharacteristic(this.hapChar.CurrentDoorState, 1)
                 if (params.updateSource && !this.disableDeviceLogging) {
-                  this.log('[%s] current state [closed].', subAccessory.displayName)
+                  this.log(
+                    '[%s] %s [%s].',
+                    name,
+                    this.messages.curState,
+                    this.messages.doorClosed
+                  )
                 }
                 break
               case 1:
@@ -137,7 +146,12 @@ module.exports = class deviceSensorContact {
                 gdService.updateCharacteristic(this.hapChar.TargetDoorState, 0)
                 gdService.updateCharacteristic(this.hapChar.CurrentDoorState, 0)
                 if (params.updateSource && !this.disableDeviceLogging) {
-                  this.log('[%s] current state [open].', subAccessory.displayName)
+                  this.log(
+                    '[%s] %s [%s].',
+                    name,
+                    this.messages.curState,
+                    this.messages.doorOpen
+                  )
                 }
                 break
             }
diff --git a/lib/device/sensor-temp-humi.js b/lib/device/sensor-temp-humi.js
index 8df03f8a..78742967 100644
--- a/lib/device/sensor-temp-humi.js
+++ b/lib/device/sensor-temp-humi.js
@@ -64,10 +64,12 @@ module.exports = class deviceSensorTempHumi {
         eveLog.temp = currentTemp
         if (this.cacheTemp !== currentTemp) {
           this.cacheTemp = currentTemp
-          this.tempService
-            .updateCharacteristic(this.hapChar.CurrentTemperature, this.cacheTemp)
+          this.tempService.updateCharacteristic(
+            this.hapChar.CurrentTemperature,
+            this.cacheTemp
+          )
           if (params.updateSource && !this.disableDeviceLogging) {
-            this.log('[%s] current temperature [%s°C].', this.name, this.cacheTemp)
+            this.log('[%s] %s [%s°C].', this.name, this.messages.curTemp, this.cacheTemp)
           }
         }
       }
@@ -76,10 +78,12 @@ module.exports = class deviceSensorTempHumi {
         eveLog.humidity = currentHumi
         if (this.cacheHumi !== currentHumi) {
           this.cacheHumi = currentHumi
-          this.humiService
-            .updateCharacteristic(this.hapChar.CurrentRelativeHumidity, this.cacheHumi)
+          this.humiService.updateCharacteristic(
+            this.hapChar.CurrentRelativeHumidity,
+            this.cacheHumi
+          )
           if (params.updateSource && !this.disableDeviceLogging) {
-            this.log('[%s] current humidity [%s%].', this.name, this.cacheHumi)
+            this.log('[%s] %s [%s%].', this.name, this.messages.curHumi, this.cacheHumi)
           }
         }
       }
diff --git a/lib/device/switch-double.js b/lib/device/switch-double.js
index 6247aa28..5a4542e2 100644
--- a/lib/device/switch-double.js
+++ b/lib/device/switch-double.js
@@ -113,7 +113,8 @@ module.exports = class deviceSwitchMulti {
               subAccessory.eveService.addEntry({ status: value ? 1 : 0 })
               if (i > 0 && !this.disableDeviceLogging) {
                 const name = subAccessory.displayName
-                this.log('[%s] current state [%s].', name, value ? 'on' : 'off')
+                const label = value ? 'on' : 'off'
+                this.log('[%s] %s [%s].', name, this.messages.curState, label)
               }
             }
           }
@@ -143,8 +144,9 @@ module.exports = class deviceSwitchMulti {
                 }
                 if (i > 0 && !this.disableDeviceLogging) {
                   this.log(
-                    '[%s] current state [%s].',
+                    '[%s] %s [%s].',
                     subAccessory.displayName,
+                    this.messages.curState,
                     value ? 'on' : 'off'
                   )
                 }
@@ -225,8 +227,9 @@ module.exports = class deviceSwitchMulti {
           })
           if (params.updateSource && !this.disableDeviceLogging) {
             this.log(
-              '[%s] current state [%s].',
+              '[%s] %s [%s].',
               subAccessory.displayName,
+              this.messages.curState,
               params.switches[i - 1].switch
             )
           }
diff --git a/lib/device/switch-multi.js b/lib/device/switch-multi.js
index 810fb248..c2501cb5 100644
--- a/lib/device/switch-multi.js
+++ b/lib/device/switch-multi.js
@@ -117,7 +117,8 @@ module.exports = class deviceSwitchMulti {
               subAccessory.eveService.addEntry({ status: value ? 1 : 0 })
               if (i > 0 && !this.disableDeviceLogging) {
                 const name = subAccessory.displayName
-                this.log('[%s] current state [%s].', name, value ? 'on' : 'off')
+                const label = value ? 'on' : 'off'
+                this.log('[%s] %s [%s].', name, this.messages.curState, label)
               }
             }
           }
@@ -149,8 +150,9 @@ module.exports = class deviceSwitchMulti {
                 }
                 if (i > 0 && !this.disableDeviceLogging) {
                   this.log(
-                    '[%s] current state [%s].',
+                    '[%s] %s [%s].',
                     subAccessory.displayName,
+                    this.messages.curState,
                     value ? 'on' : 'off'
                   )
                 }
@@ -231,8 +233,9 @@ module.exports = class deviceSwitchMulti {
           })
           if (params.updateSource && !this.disableDeviceLogging) {
             this.log(
-              '[%s] current state [%s].',
+              '[%s] %s [%s].',
               subAccessory.displayName,
+              this.messages.curState,
               params.switches[i - 1].switch
             )
           }
diff --git a/lib/device/switch-single.js b/lib/device/switch-single.js
index 264aa605..4685564b 100644
--- a/lib/device/switch-single.js
+++ b/lib/device/switch-single.js
@@ -57,15 +57,15 @@ module.exports = class deviceSwitchSingle {
       await this.platform.sendDeviceUpdate(this.accessory, {
         switch: newValue
       })
-      this.cacheOnOff = newValue
+      this.cacheState = newValue
       this.accessory.eveService.addEntry({ status: value ? 1 : 0 })
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current state [%s].', this.name, this.cacheOnOff)
+        this.log('[%s] %s [%s].', this.name, this.messages.curState, this.cacheState)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
-        this.service.updateCharacteristic(this.hapChar.On, this.cacheOnOff === 'on')
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
       }, 5000)
       throw new this.platform.api.hap.HapStatusError(-70402)
     }
@@ -73,15 +73,15 @@ module.exports = class deviceSwitchSingle {
 
   async externalUpdate (params) {
     try {
-      if (!params.switch || params.switch === this.cacheOnOff) {
+      if (!params.switch || params.switch === this.cacheState) {
         return
       }
       const newStatus = params.switch === 'on'
       this.service.updateCharacteristic(this.hapChar.On, newStatus)
-      this.cacheOnOff = params.switch
+      this.cacheState = params.switch
       this.accessory.eveService.addEntry({ status: newStatus ? 1 : 0 })
       if (params.updateSource && !this.disableDeviceLogging) {
-        this.log('[%s] current state [%s].', this.name, this.cacheOnOff)
+        this.log('[%s] %s [%s].', this.name, this.messages.curState, this.cacheState)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
diff --git a/lib/device/thermostat.js b/lib/device/thermostat.js
index fa360b0a..443a4938 100644
--- a/lib/device/thermostat.js
+++ b/lib/device/thermostat.js
@@ -104,16 +104,16 @@ module.exports = class deviceThermostat {
       if (value === 0) {
         this.service.updateCharacteristic(this.hapChar.CurrentHeatingCoolingState, 0)
       }
-      this.cacheOnOff = newValue
+      this.cacheState = newValue
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current state [%s].', this.name, this.cacheOnOff)
+        this.log('[%s] %s [%s].', this.name, this.messages.curState, this.cacheState)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
         this.service.updateCharacteristic(
           this.hapChar.TargetHeatingCoolingState,
-          this.cacheOnOff === 'on'
+          this.cacheState === 'on'
         )
       }, 5000)
       throw new this.platform.api.hap.HapStatusError(-70402)
@@ -128,16 +128,16 @@ module.exports = class deviceThermostat {
         tempScale: 'c'
       }
       await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.cacheTarget = value
+      this.cacheTarg = value
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current target [%s°C].', this.name, this.cacheTarget)
+        this.log('[%s] %s [%s°C].', this.name, this.messages.curTarg, this.cacheTarg)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
         this.service.updateCharacteristic(
           this.hapChar.TargetHeatingCoolingState,
-          this.cacheOnOff === 'on'
+          this.cacheState === 'on'
         )
       }, 5000)
       throw new this.platform.api.hap.HapStatusError(-70402)
@@ -147,43 +147,43 @@ module.exports = class deviceThermostat {
   async externalUpdate (params) {
     try {
       if (params.switch && params.switch !== this.OnOff) {
-        this.cacheOnOff = params.switch
-        if (this.cacheOnOff === 'off') {
+        this.cacheState = params.switch
+        if (this.cacheState === 'off') {
           this.service.updateCharacteristic(this.hapChar.CurrentHeatingCoolingState, 0)
         }
         this.service.updateCharacteristic(
           this.hapChar.TargetHeatingCoolingState,
-          this.cacheOnOff === 'on' ? 1 : 0
+          this.cacheState === 'on' ? 1 : 0
         )
         if (params.updateSource && !this.disableDeviceLogging) {
-          this.log('[%s] current state [%s].', this.name, this.cacheOnOff)
+          this.log('[%s] %s [%s].', this.name, this.messages.curState, this.cacheState)
         }
       }
 
       if (params.workState) {
         const workState = params.workState === 1 ? 'on' : 'off'
-        if (this.cacheHeating !== workState) {
-          this.cacheHeating = workState
+        if (this.cacheHeat !== workState) {
+          this.cacheHeat = workState
           this.service.updateCharacteristic(
             this.hapChar.CurrentHeatingCoolingState,
-            this.cacheHeating === 'on' ? 1 : 0
+            this.cacheHeat === 'on' ? 1 : 0
           )
           if (params.updateSource && !this.disableDeviceLogging) {
-            this.log('[%s] current heating [%s].', this.name, this.cacheHeating)
+            this.log('[%s] %s [%s].', this.name, this.messages.curHeat, this.cacheHeat)
           }
         }
       }
 
       if (this.funcs.hasProperty(params, 'targetTemp')) {
         const targetTemp = Number(params.targetTemp)
-        if (this.cacheTarget !== targetTemp) {
-          this.cacheTarget = targetTemp
+        if (this.cacheTarg !== targetTemp) {
+          this.cacheTarg = targetTemp
           this.service.updateCharacteristic(
             this.hapChar.TargetTemperature,
-            this.cacheTarget
+            this.cacheTarg
           )
           if (params.updateSource && !this.disableDeviceLogging) {
-            this.log('[%s] current target [%s°C].', this.name, this.cacheTarget)
+            this.log('[%s] %s [%s°C].', this.name, this.messages.curTarg, this.cacheTarg)
           }
         }
       }
@@ -196,7 +196,6 @@ module.exports = class deviceThermostat {
 
           // Round to nearest 0.5
           currentTemp = Math.round(currentTemp * 2) / 2
-          this.log.warn('[%s] please set mode to celcius in the eWeLink app.', this.name)
         } else {
           currentTemp = Number(params.temperature)
         }
@@ -208,7 +207,7 @@ module.exports = class deviceThermostat {
             this.cacheTemp
           )
           if (params.updateSource && !this.disableDeviceLogging) {
-            this.log('[%s] current temperature [%s°C].', this.name, this.cacheTemp)
+            this.log('[%s] %s [%s°C].', this.name, this.messages.curTemp, this.cacheTemp)
           }
         }
         this.accessory.eveService.addEntry({ temp: currentTemp })
diff --git a/lib/utils/lang-en.js b/lib/utils/lang-en.js
index 811a7b1f..f96cab48 100644
--- a/lib/utils/lang-en.js
+++ b/lib/utils/lang-en.js
@@ -3,6 +3,8 @@
 'use strict'
 
 module.exports = {
+  buttonTrig: 'button triggered',
+  buttonNotFound: 'rf button not found (please restart Homebridge)',
   cantReadPacket: 'LAN message received could not be read as',
   cantParsePacket: 'Could not parse DNS packet as',
   cfgDef: 'is not a valid number so using default of',
@@ -13,6 +15,23 @@ module.exports = {
   cfgRmv: 'is unused and can be removed',
   cfgQts: 'should not have quotes around its entry',
   complete: '✓ Setup complete',
+  contactNo: 'contact not detected',
+  contactYes: 'contact detected',
+  curBatt: 'current battery',
+  curBright: 'current brightness',
+  curColour: 'current colour',
+  curCurr: 'current current',
+  curHeat: 'current heating',
+  curHumi: 'current humidity',
+  curLight: 'current light',
+  curMode: 'current mode',
+  curPos: 'current position',
+  curPower: 'current power',
+  curSpeed: 'current speed',
+  curState: 'current state',
+  curTarg: 'current target',
+  curTemp: 'current temperature',
+  curVolt: 'current voltage',
   devAdd: 'has been added to Homebridge',
   devInit: 'initialised and',
   devInitOpts: 'initialising with options',
@@ -32,7 +51,10 @@ module.exports = {
   devNotUpd: 'device update failed as',
   devRemove: 'has been removed from Homebridge',
   disabled: 'To change this, set disablePlugin to false',
+  disabledAL: 'adaptive lighting disabled due to significant colour change',
   disabling: 'Disabling plugin',
+  doorClosed: 'closed',
+  doorOpen: 'open',
   errGetDevice: 'An error occurred during http getDevice()',
   errGetDevices: 'An error occurred during http getDevices()',
   errGetHost: 'An error occurred during ws getHost()',
@@ -61,6 +83,9 @@ module.exports = {
   repOffline: 'reported [offline]',
   repOnline: 'reported [online]',
   revertWS: 'reverting to web socket as',
+  rfNotFound: 'try restarting Homebridge as no accessory found for',
+  rfTrigNo: 'not triggered',
+  rfTrigYes: 'triggered',
   sendLogin: 'Sending HTTP login() request',
   sonoffCamera: 'see the homebridge-ewelink wiki for details to enable the camera',
   stoppedLAN: 'LAN monitoring gracefully stopped',
@@ -69,6 +94,7 @@ module.exports = {
   updRec: 'receiving update',
   updReq: 'requesting current status',
   updSend: 'sending update',
+  viaAL: 'via adaptive lighting',
   viaLAN: 'via LAN',
   viaWS: 'via WS',
   wsHostRec: 'Web socket host received',

From 39c56ef4061373c34d4566a00faa87dfb879d282 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 30 Apr 2021 18:52:36 +0100
Subject: [PATCH 1952/3183] logging, var names, func names, consistency

---
 lib/device/curtain.js                 |  4 +-
 lib/device/diffuser.js                | 14 ++-----
 lib/device/humidifier.js              |  6 +--
 lib/device/light-cct.js               |  4 +-
 lib/device/light-dimmer.js            |  4 +-
 lib/device/light-rgb-cct.js           |  4 +-
 lib/device/light-rgb.js               |  4 +-
 lib/device/motor.js                   |  4 +-
 lib/device/outlet-scm.js              |  4 +-
 lib/device/outlet.js                  |  4 +-
 lib/device/rf-bridge.js               |  4 +-
 lib/device/sensor-ambient.js          |  4 +-
 lib/device/simulation/thermostat.js   |  4 +-
 lib/device/switch-double.js           |  4 +-
 lib/device/switch-multi.js            |  4 +-
 lib/device/switch-single.js           |  4 +-
 lib/device/thermostat.js              |  8 ++--
 lib/device/zigbee/light-cct.js        | 60 ++++++++++++++-------------
 lib/device/zigbee/light-dimmer.js     | 39 ++++++++---------
 lib/device/zigbee/sensor-ambient.js   |  6 +--
 lib/device/zigbee/sensor-contact.js   |  7 ++--
 lib/device/zigbee/sensor-motion.js    |  7 ++--
 lib/device/zigbee/switch-single.js    | 20 ++++-----
 lib/device/zigbee/switch-stateless.js |  8 ++--
 lib/utils/lang-en.js                  |  7 +++-
 25 files changed, 122 insertions(+), 116 deletions(-)

diff --git a/lib/device/curtain.js b/lib/device/curtain.js
index 556e6115..c0592401 100644
--- a/lib/device/curtain.js
+++ b/lib/device/curtain.js
@@ -37,7 +37,7 @@ module.exports = class deviceCurtain {
 
     // Add the set handler to the target position characteristic
     this.service.getCharacteristic(this.hapChar.TargetPosition).onSet(async value => {
-      await this.internalUpdate(value)
+      await this.internalPositionUpdate(value)
     })
 
     // Output the customised options to the log if in debug mode
@@ -47,7 +47,7 @@ module.exports = class deviceCurtain {
     }
   }
 
-  async internalUpdate (value) {
+  async internalPositionUpdate (value) {
     try {
       // This acts like a debounce function when endlessly sliding the slider
       const updateKey = Math.random().toString(36).substr(2, 8)
diff --git a/lib/device/diffuser.js b/lib/device/diffuser.js
index 611b2976..ea02e409 100644
--- a/lib/device/diffuser.js
+++ b/lib/device/diffuser.js
@@ -48,7 +48,7 @@ module.exports = class deviceDiffuser {
 
     // Add the set handler to the lightbulb on/off characteristic
     this.lightService.getCharacteristic(this.hapChar.On).onSet(async value => {
-      await this.internalLightOnOffUpdate(value)
+      await this.internalLightStateUpdate(value)
     })
 
     // Add the set handler to the lightbulb brightness characteristic
@@ -162,7 +162,7 @@ module.exports = class deviceDiffuser {
     }
   }
 
-  async internalLightOnOffUpdate (value) {
+  async internalLightStateUpdate (value) {
     try {
       // Don't continue if the new value is the same as before
       const newValue = value ? 1 : 0
@@ -298,14 +298,8 @@ module.exports = class deviceDiffuser {
 
       // Log the update if appropriate
       if (!this.disableDeviceLogging) {
-        this.log(
-          '[%s] %s [rgb %s %s %s].',
-          this.name,
-          this.messages.curColour,
-          this.cacheR,
-          this.cacheG,
-          this.cacheB
-        )
+        const label = this.cacheR + ' ' + this.cacheG + ' ' + this.cacheB
+        this.log('[%s] %s [rgb %s].', this.name, this.messages.curColour, label)
       }
     } catch (err) {
       // Catch any errors and let the platform display them
diff --git a/lib/device/humidifier.js b/lib/device/humidifier.js
index 57ab93bf..44c6b18b 100644
--- a/lib/device/humidifier.js
+++ b/lib/device/humidifier.js
@@ -31,7 +31,7 @@ module.exports = class deviceHumidifier {
     // Add the set handler to the fan on/off characteristic
     this.service.getCharacteristic(this.hapChar.On).onSet(async value => {
       if (!value) {
-        await this.internalUpdate(0)
+        await this.internalModeUpdate(0)
       }
     })
 
@@ -39,7 +39,7 @@ module.exports = class deviceHumidifier {
     this.service.getCharacteristic(this.hapChar.RotationSpeed)
       .setProps({ minStep: 33 })
       .onSet(async value => {
-        await this.internalUpdate(value)
+        await this.internalModeUpdate(value)
       })
 
     // Conversion object eWeLink mode to text label
@@ -50,7 +50,7 @@ module.exports = class deviceHumidifier {
     }
   }
 
-  async internalUpdate (value) {
+  async internalModeUpdate (value) {
     try {
       const updateKey = Math.random().toString(36).substr(2, 8)
       this.updateKey = updateKey
diff --git a/lib/device/light-cct.js b/lib/device/light-cct.js
index 51671793..bb7c79f1 100644
--- a/lib/device/light-cct.js
+++ b/lib/device/light-cct.js
@@ -56,7 +56,7 @@ module.exports = class deviceLightCCT {
 
     // Add the set handler to the lightbulb on/off characteristic
     this.service.getCharacteristic(this.hapChar.On).onSet(async value => {
-      await this.internalOnOffUpdate(value)
+      await this.internalStateUpdate(value)
     })
 
     // Add the set handler to the lightbulb brightness characteristic
@@ -93,7 +93,7 @@ module.exports = class deviceLightCCT {
     }
   }
 
-  async internalOnOffUpdate (value) {
+  async internalStateUpdate (value) {
     try {
       const newValue = value ? 'on' : 'off'
       if (this.cacheState === newValue) {
diff --git a/lib/device/light-dimmer.js b/lib/device/light-dimmer.js
index e70c7956..2619cd45 100644
--- a/lib/device/light-dimmer.js
+++ b/lib/device/light-dimmer.js
@@ -34,7 +34,7 @@ module.exports = class deviceLightDimmer {
 
     // Add the set handler to the lightbulb on/off characteristic
     this.service.getCharacteristic(this.hapChar.On).onSet(async value => {
-      await this.internalOnOffUpdate(value)
+      await this.internalStateUpdate(value)
     })
 
     // Add the set handler to the lightbulb brightness characteristic
@@ -54,7 +54,7 @@ module.exports = class deviceLightDimmer {
     }
   }
 
-  async internalOnOffUpdate (value) {
+  async internalStateUpdate (value) {
     try {
       const newValue = value ? 'on' : 'off'
       if (this.cacheState === newValue) {
diff --git a/lib/device/light-rgb-cct.js b/lib/device/light-rgb-cct.js
index de48f915..4a795414 100644
--- a/lib/device/light-rgb-cct.js
+++ b/lib/device/light-rgb-cct.js
@@ -43,7 +43,7 @@ module.exports = class deviceLightRGBCCT {
 
     // Add the set handler to the lightbulb on/off characteristic
     this.service.getCharacteristic(this.hapChar.On).onSet(async value => {
-      await this.internalOnOffUpdate(value)
+      await this.internalStateUpdate(value)
     })
 
     // Add the set handler to the lightbulb brightness characteristic
@@ -84,7 +84,7 @@ module.exports = class deviceLightRGBCCT {
     }
   }
 
-  async internalOnOffUpdate (value) {
+  async internalStateUpdate (value) {
     try {
       const newValue = value ? 'on' : 'off'
       if (this.cacheState === newValue) {
diff --git a/lib/device/light-rgb.js b/lib/device/light-rgb.js
index 454ac75d..2391455d 100644
--- a/lib/device/light-rgb.js
+++ b/lib/device/light-rgb.js
@@ -38,7 +38,7 @@ module.exports = class deviceLightRGB {
 
     // Add the set handler to the lightbulb on/off characteristic
     this.service.getCharacteristic(this.hapChar.On).onSet(async value => {
-      await this.internalOnOffUpdate(value)
+      await this.internalStateUpdate(value)
     })
 
     // Add the set handler to the lightbulb brightness characteristic
@@ -60,7 +60,7 @@ module.exports = class deviceLightRGB {
     }
   }
 
-  async internalOnOffUpdate (value) {
+  async internalStateUpdate (value) {
     try {
       const params = {}
       const newValue = value ? 'on' : 'off'
diff --git a/lib/device/motor.js b/lib/device/motor.js
index cbea596c..8e58c3dd 100644
--- a/lib/device/motor.js
+++ b/lib/device/motor.js
@@ -39,7 +39,7 @@ module.exports = class deviceMotor {
 
     // Add the set handler to the target position characteristic
     this.service.getCharacteristic(this.hapChar.TargetPosition).onSet(async value => {
-      await this.internalUpdate(value)
+      await this.internalPositionUpdate(value)
     })
 
     // Output the customised options to the log if in debug mode
@@ -49,7 +49,7 @@ module.exports = class deviceMotor {
     }
   }
 
-  async internalUpdate (value) {
+  async internalPositionUpdate (value) {
     try {
       if (this.cachePos === value) {
         return
diff --git a/lib/device/outlet-scm.js b/lib/device/outlet-scm.js
index aa395247..e04c1d9d 100644
--- a/lib/device/outlet-scm.js
+++ b/lib/device/outlet-scm.js
@@ -49,7 +49,7 @@ module.exports = class deviceOutletSCM {
 
     // Add the set handler to the switch/outlet on/off characteristic
     this.service.getCharacteristic(this.hapChar.On).onSet(async value => {
-      await this.internalUpdate(value)
+      await this.internalStateUpdate(value)
     })
 
     // Pass the accessory to Fakegato to set up with Eve
@@ -67,7 +67,7 @@ module.exports = class deviceOutletSCM {
     }
   }
 
-  async internalUpdate (value) {
+  async internalStateUpdate (value) {
     try {
       const newValue = value ? 'on' : 'off'
       const params = {
diff --git a/lib/device/outlet.js b/lib/device/outlet.js
index 2925a7a6..addcddd8 100644
--- a/lib/device/outlet.js
+++ b/lib/device/outlet.js
@@ -57,7 +57,7 @@ module.exports = class deviceOutlet {
 
     // Add the set handler to the outlet on/off characteristic
     this.service.getCharacteristic(this.hapChar.On).onSet(async value => {
-      await this.internalUpdate(value)
+      await this.internalStateUpdate(value)
     })
 
     // Add the set handler to the outlet eve reset total energy characteristic
@@ -135,7 +135,7 @@ module.exports = class deviceOutlet {
     }
   }
 
-  async internalUpdate (value) {
+  async internalStateUpdate (value) {
     try {
       const newValue = value ? 'on' : 'off'
       await this.platform.sendDeviceUpdate(this.accessory, {
diff --git a/lib/device/rf-bridge.js b/lib/device/rf-bridge.js
index 3fb868af..45607536 100644
--- a/lib/device/rf-bridge.js
+++ b/lib/device/rf-bridge.js
@@ -36,7 +36,7 @@ module.exports = class deviceRFBridge {
         // Add the set handler to the switch on/off characteristic
         this.accessory.getService(name).getCharacteristic(this.hapChar.On)
           .onSet(async value => {
-            await this.internalUpdate(chan, name, value)
+            await this.internalPressUpdate(chan, name, value)
           })
       })
     } else {
@@ -107,7 +107,7 @@ module.exports = class deviceRFBridge {
     }
   }
 
-  async internalUpdate (rfChl, service, value) {
+  async internalPressUpdate (rfChl, service, value) {
     try {
       if (!value) {
         return
diff --git a/lib/device/sensor-ambient.js b/lib/device/sensor-ambient.js
index 0e5425fd..c72ac343 100644
--- a/lib/device/sensor-ambient.js
+++ b/lib/device/sensor-ambient.js
@@ -47,7 +47,7 @@ module.exports = class deviceSensorAmbient {
 
       // Add the set handler to the switch on/off characteristic
       this.switchService.getCharacteristic(this.hapChar.On).onSet(async value => {
-        await this.internalUpdate(value)
+        await this.internalStateUpdate(value)
       })
     }
 
@@ -94,7 +94,7 @@ module.exports = class deviceSensorAmbient {
     }
   }
 
-  async internalUpdate (value) {
+  async internalStateUpdate (value) {
     try {
       const newValue = value ? 'on' : 'off'
       const params = {
diff --git a/lib/device/simulation/thermostat.js b/lib/device/simulation/thermostat.js
index 443c1b6b..4ee1f342 100644
--- a/lib/device/simulation/thermostat.js
+++ b/lib/device/simulation/thermostat.js
@@ -77,7 +77,7 @@ module.exports = class deviceThermostat {
         validValues: [0, 1]
       })
       .onSet(async value => {
-        await this.internalOnOffUpdate(value)
+        await this.internalStateUpdate(value)
       })
 
     // Add the set handler to the target temperature characteristic
@@ -125,7 +125,7 @@ module.exports = class deviceThermostat {
     }
   }
 
-  async internalOnOffUpdate (value) {
+  async internalStateUpdate (value) {
     try {
       const params = {}
       if (value === 0) {
diff --git a/lib/device/switch-double.js b/lib/device/switch-double.js
index 5a4542e2..fe4592b2 100644
--- a/lib/device/switch-double.js
+++ b/lib/device/switch-double.js
@@ -51,7 +51,7 @@ module.exports = class deviceSwitchMulti {
 
     // Add the set handler to the switch/outlet on/off characteristic
     this.service.getCharacteristic(this.hapChar.On).onSet(async value => {
-      await this.internalUpdate(value)
+      await this.internalStateUpdate(value)
     })
 
     // Pass the accessory to Fakegato to set up with Eve
@@ -70,7 +70,7 @@ module.exports = class deviceSwitchMulti {
     }
   }
 
-  async internalUpdate (value) {
+  async internalStateUpdate (value) {
     try {
       let masterState = 'off'
       const params = {
diff --git a/lib/device/switch-multi.js b/lib/device/switch-multi.js
index c2501cb5..1677a0f8 100644
--- a/lib/device/switch-multi.js
+++ b/lib/device/switch-multi.js
@@ -51,7 +51,7 @@ module.exports = class deviceSwitchMulti {
 
     // Add the set handler to the switch/outlet on/off characteristic
     this.service.getCharacteristic(this.hapChar.On).onSet(async value => {
-      await this.internalUpdate(value)
+      await this.internalStateUpdate(value)
     })
 
     // Pass the accessory to Fakegato to set up with Eve
@@ -70,7 +70,7 @@ module.exports = class deviceSwitchMulti {
     }
   }
 
-  async internalUpdate (value) {
+  async internalStateUpdate (value) {
     try {
       let masterState = 'off'
       const params = {
diff --git a/lib/device/switch-single.js b/lib/device/switch-single.js
index 4685564b..ef5465b7 100644
--- a/lib/device/switch-single.js
+++ b/lib/device/switch-single.js
@@ -36,7 +36,7 @@ module.exports = class deviceSwitchSingle {
 
     // Add the set handler to the switch on/off characteristic
     this.service.getCharacteristic(this.hapChar.On).onSet(async value => {
-      await this.internalUpdate(value)
+      await this.internalStateUpdate(value)
     })
 
     // Pass the accessory to Fakegato to set up with Eve
@@ -51,7 +51,7 @@ module.exports = class deviceSwitchSingle {
     }
   }
 
-  async internalUpdate (value) {
+  async internalStateUpdate (value) {
     try {
       const newValue = value ? 'on' : 'off'
       await this.platform.sendDeviceUpdate(this.accessory, {
diff --git a/lib/device/thermostat.js b/lib/device/thermostat.js
index 443a4938..f299f7d1 100644
--- a/lib/device/thermostat.js
+++ b/lib/device/thermostat.js
@@ -66,7 +66,7 @@ module.exports = class deviceThermostat {
       validValues: [0, 1]
     })
       .onSet(async value => {
-        await this.internalOnOffUpdate(value)
+        await this.internalStateUpdate(value)
       })
 
     // Add the set handler to the target temperature characteristic
@@ -76,7 +76,7 @@ module.exports = class deviceThermostat {
       minStep: 0.5
     })
       .onSet(async value => {
-        await this.internalTargetTempUpdate(value)
+        await this.internalTargetUpdate(value)
       })
 
     // Pass the accessory to Fakegato to set up with Eve
@@ -94,7 +94,7 @@ module.exports = class deviceThermostat {
     }
   }
 
-  async internalOnOffUpdate (value) {
+  async internalStateUpdate (value) {
     try {
       const newValue = value !== 0 ? 'on' : 'off'
       const params = {
@@ -120,7 +120,7 @@ module.exports = class deviceThermostat {
     }
   }
 
-  async internalTargetTempUpdate (value) {
+  async internalTargetUpdate (value) {
     try {
       const params = {
         workMode: 1,
diff --git a/lib/device/zigbee/light-cct.js b/lib/device/zigbee/light-cct.js
index 067ff6ec..3211ac7e 100644
--- a/lib/device/zigbee/light-cct.js
+++ b/lib/device/zigbee/light-cct.js
@@ -49,7 +49,7 @@ module.exports = class deviceZBLightCCT {
         }
       })
       .onSet(async value => {
-        await this.internalOnOffUpdate(value)
+        await this.internalStateUpdate(value)
       })
 
     // Add the set handler to the lightbulb brightness characteristic
@@ -65,7 +65,7 @@ module.exports = class deviceZBLightCCT {
     })
 
     // This is needed as sometimes we need to send the brightness with a cct update
-    this.cacheBrightness = this.service.getCharacteristic(this.hapChar.Brightness).value
+    this.cacheBright = this.service.getCharacteristic(this.hapChar.Brightness).value
 
     // Set up the adaptive lighting controller
     this.alController = new platform.api.hap.AdaptiveLightingController(
@@ -85,20 +85,20 @@ module.exports = class deviceZBLightCCT {
     }
   }
 
-  async internalOnOffUpdate (value) {
+  async internalStateUpdate (value) {
     try {
       const newValue = value ? 'on' : 'off'
       await this.platform.sendDeviceUpdate(this.accessory, {
         switch: newValue
       })
-      this.cacheOnOff = newValue
+      this.cacheState = newValue
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current state [%s].', this.name, this.cacheOnOff)
+        this.log('[%s] %s [%s].', this.name, this.messages.curState, this.cacheState)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
-        this.service.updateCharacteristic(this.hapChar.On, this.cacheOnOff === 'on')
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
       }, 5000)
       throw new this.platform.api.hap.HapStatusError(-70402)
     }
@@ -106,7 +106,7 @@ module.exports = class deviceZBLightCCT {
 
   async internalBrightnessUpdate (value) {
     try {
-      if (this.cacheBrightness === value || value === 0) {
+      if (this.cacheBright === value || value === 0) {
         return
       }
       const updateKey = Math.random().toString(36).substr(2, 8)
@@ -120,14 +120,14 @@ module.exports = class deviceZBLightCCT {
         brightness: value
       }
       await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.cacheBrightness = value
+      this.cacheBright = value
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current brightness [%s%].', this.name, this.cacheBrightness)
+        this.log('[%s] %s [%s%].', this.name, this.messages.curBright, this.cacheBright)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
-        this.service.updateCharacteristic(this.hapChar.On, this.cacheOnOff === 'on')
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
       }, 5000)
       throw new this.platform.api.hap.HapStatusError(-70402)
     }
@@ -135,7 +135,7 @@ module.exports = class deviceZBLightCCT {
 
   async internalCTempUpdate (value) {
     try {
-      if (this.cacheMired === value || this.cacheOnOff !== 'on') {
+      if (this.cacheMired === value || this.cacheState !== 'on') {
         return
       }
       if (!this.isOnline && this.alController.isAdaptiveLightingActive()) {
@@ -159,15 +159,21 @@ module.exports = class deviceZBLightCCT {
       this.cacheCT = scaledCT
       if (!this.disableDeviceLogging) {
         if (this.alController.isAdaptiveLightingActive()) {
-          this.log('[%s] current cct [%sK] via adaptive lighting.', this.name, scaledK)
+          this.log(
+            '[%s] %s [%sK] %s.',
+            this.name,
+            this.messages.curColour,
+            scaledK,
+            this.messages.viaAL
+          )
         } else {
-          this.log('[%s] current cct [%sK].', this.name, scaledK)
+          this.log('[%s] %s [%sK].', this.name, this.messages.curColour, scaledK)
         }
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
-        this.service.updateCharacteristic(this.hapChar.On, this.cacheOnOff === 'on')
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
       }, 5000)
       throw new this.platform.api.hap.HapStatusError(-70402)
     }
@@ -175,19 +181,20 @@ module.exports = class deviceZBLightCCT {
 
   async externalUpdate (params) {
     try {
-      if (params.switch && params.switch !== this.cacheOnOff) {
-        this.cacheOnOff = params.switch
-        this.service.updateCharacteristic(this.hapChar.On, this.cacheOnOff === 'on')
+      if (params.switch && params.switch !== this.cacheState) {
+        this.cacheState = params.switch
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
         if (params.updateSource && !this.disableDeviceLogging) {
-          this.log('[%s] current state [%s].', this.name, this.cacheOnOff)
+          this.log('[%s] %s [%s].', this.name, this.messages.curState, this.cacheState)
         }
       }
       if (this.funcs.hasProperty(params, 'brightness')) {
-        if (params.brightness !== this.cacheBrightness) {
-          this.cacheBrightness = params.brightness
-          this.service.updateCharacteristic(this.hapChar.Brightness, this.cacheBrightness)
+        if (params.brightness !== this.cacheBright) {
+          this.cacheBright = params.brightness
+          this.service.updateCharacteristic(this.hapChar.Brightness, this.cacheBright)
           if (params.updateSource && !this.disableDeviceLogging) {
-            this.log('[%s] current brightness [%s%].', this.name, this.cacheBrightness)
+            const nb = this.cacheBright
+            this.log('[%s] %s [%s%].', this.name, this.messages.curBright, nb)
           }
         }
       }
@@ -204,15 +211,12 @@ module.exports = class deviceZBLightCCT {
           )
           if (params.updateSource) {
             if (!this.disableDeviceLogging) {
-              this.log('[%s] current cct [%sK].', this.name, scaledK)
+              this.log('[%s] %s [%sK].', this.name, this.messages.curColour, scaledK)
             }
             if (this.alController.isAdaptiveLightingActive() && ctDiff > 20) {
-              // look for a variation greater than twenty
+              // Look for a variation greater than twenty
               this.alController.disableAdaptiveLighting()
-              this.log(
-                '[%s] adaptive lighting disabled due to significant colour change.',
-                this.name
-              )
+              this.log('[%s] %s.', this.name, this.messages.disabledAL)
             }
           }
         }
diff --git a/lib/device/zigbee/light-dimmer.js b/lib/device/zigbee/light-dimmer.js
index 2ab8ec08..6722f3cb 100644
--- a/lib/device/zigbee/light-dimmer.js
+++ b/lib/device/zigbee/light-dimmer.js
@@ -42,7 +42,7 @@ module.exports = class deviceZBLightDimmer {
         }
       })
       .onSet(async value => {
-        await this.internalOnOffUpdate(value)
+        await this.internalStateUpdate(value)
       })
 
     // Add the set handler to the lightbulb brightness characteristic
@@ -62,20 +62,20 @@ module.exports = class deviceZBLightDimmer {
     }
   }
 
-  async internalOnOffUpdate (value) {
+  async internalStateUpdate (value) {
     try {
       const newValue = value ? 'on' : 'off'
       await this.platform.sendDeviceUpdate(this.accessory, {
         switch: newValue
       })
-      this.cacheOnOff = newValue
+      this.cacheState = newValue
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current state [%s].', this.name, this.cacheOnOff)
+        this.log('[%s] %s [%s].', this.name, this.messages.curState, this.cacheState)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
-        this.service.updateCharacteristic(this.hapChar.On, this.cacheOnOff === 'on')
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
       }, 5000)
       throw new this.platform.api.hap.HapStatusError(-70402)
     }
@@ -83,13 +83,13 @@ module.exports = class deviceZBLightDimmer {
 
   async internalBrightnessUpdate (value) {
     try {
-      if (this.cacheBrightness === value || value === 0) {
+      if (this.cacheBright === value || value === 0) {
         return
       }
       const updateKey = Math.random().toString(36).substr(2, 8)
-      this.updateKeyBright = updateKey
+      this.updateKey = updateKey
       await this.funcs.sleep(500)
-      if (updateKey !== this.updateKeyBright) {
+      if (updateKey !== this.updateKey) {
         return
       }
       const params = {
@@ -97,14 +97,14 @@ module.exports = class deviceZBLightDimmer {
         brightness: value
       }
       await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.cacheBrightness = value
+      this.cacheBright = value
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current brightness [%s%].', this.name, this.cacheBrightness)
+        this.log('[%s] %s [%s%].', this.name, this.messages.curBright, this.cacheBright)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
-        this.service.updateCharacteristic(this.hapChar.On, this.cacheOnOff === 'on')
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
       }, 5000)
       throw new this.platform.api.hap.HapStatusError(-70402)
     }
@@ -112,19 +112,20 @@ module.exports = class deviceZBLightDimmer {
 
   async externalUpdate (params) {
     try {
-      if (params.switch && params.switch !== this.cacheOnOff) {
-        this.cacheOnOff = params.switch
-        this.service.updateCharacteristic(this.hapChar.On, this.cacheOnOff === 'on')
+      if (params.switch && params.switch !== this.cacheState) {
+        this.cacheState = params.switch
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
         if (params.updateSource && !this.disableDeviceLogging) {
-          this.log('[%s] current state [%s].', this.name, this.cacheOnOff)
+          this.log('[%s] %s [%s].', this.name, this.messages.curState, this.cacheState)
         }
       }
       if (this.funcs.hasProperty(params, 'brightness')) {
-        if (params.brightness !== this.cacheBrightness) {
-          this.cacheBrightness = params.brightness
-          this.service.updateCharacteristic(this.hapChar.Brightness, this.cacheBrightness)
+        if (params.brightness !== this.cacheBright) {
+          this.cacheBright = params.brightness
+          this.service.updateCharacteristic(this.hapChar.Brightness, this.cacheBright)
           if (params.updateSource && !this.disableDeviceLogging) {
-            this.log('[%s] current brightness [%s%].', this.name, this.cacheBrightness)
+            const nb = this.cacheBright
+            this.log('[%s] %s [%s%].', this.name, this.messages.curBright, nb)
           }
         }
       }
diff --git a/lib/device/zigbee/sensor-ambient.js b/lib/device/zigbee/sensor-ambient.js
index f2292340..f46c2ac5 100644
--- a/lib/device/zigbee/sensor-ambient.js
+++ b/lib/device/zigbee/sensor-ambient.js
@@ -73,7 +73,7 @@ module.exports = class deviceZBSensorAmbient {
           this.cacheBatt < this.lowBattThreshold
         )
         if (params.updateSource && !this.disableDeviceLogging) {
-          this.log('[%s] current battery [%s%].', this.name, this.cacheBatt)
+          this.log('[%s] %s [%s%].', this.name, this.messages.curBatt, this.cacheBatt)
         }
       }
       const eveLog = {}
@@ -86,7 +86,7 @@ module.exports = class deviceZBSensorAmbient {
         this.tService.updateCharacteristic(this.hapChar.CurrentTemperature, currentTemp)
         eveLog.temp = currentTemp
         if (params.updateSource && !this.disableDeviceLogging) {
-          this.log('[%s] current temperature [%s].', this.name, currentTemp)
+          this.log('[%s] %s [%s].', this.name, this.messages.curTemp, currentTemp)
         }
       }
       if (
@@ -101,7 +101,7 @@ module.exports = class deviceZBSensorAmbient {
         )
         eveLog.humidity = currentHumi
         if (params.updateSource && !this.disableDeviceLogging) {
-          this.log('[%s] current humidity [%s].', this.name, currentHumi)
+          this.log('[%s] %s [%s].', this.name, this.messages.curHumi, currentHumi)
         }
       }
       if (eveLog.temp || eveLog.humidity) {
diff --git a/lib/device/zigbee/sensor-contact.js b/lib/device/zigbee/sensor-contact.js
index 6df57d51..26f045ab 100644
--- a/lib/device/zigbee/sensor-contact.js
+++ b/lib/device/zigbee/sensor-contact.js
@@ -83,7 +83,7 @@ module.exports = class deviceZBSensorContact {
           scaledBatt < this.lowBattThreshold
         )
         if (params.updateSource && !this.disableDeviceLogging) {
-          this.log('[%s] current battery [%s%].', this.name, scaledBatt)
+          this.log('[%s] %s [%s%].', this.name, this.messages.curBatt, scaledBatt)
         }
       }
       if (this.funcs.hasProperty(params, 'lock') && [0, 1].includes(params.lock)) {
@@ -104,9 +104,10 @@ module.exports = class deviceZBSensorContact {
         }
         if (params.updateSource && !this.disableDeviceLogging) {
           this.log(
-            '[%s] current state [contact%s detected].',
+            '[%s] current state [%s].',
             this.name,
-            params.lock === 0 ? '' : ' not'
+            this.messages.curState,
+            params.lock === 0 ? this.messages.contactYes : this.messages.contactNo
           )
         }
       }
diff --git a/lib/device/zigbee/sensor-motion.js b/lib/device/zigbee/sensor-motion.js
index a2238e46..8a681b1e 100644
--- a/lib/device/zigbee/sensor-motion.js
+++ b/lib/device/zigbee/sensor-motion.js
@@ -70,7 +70,7 @@ module.exports = class deviceZBSensorMotion {
           this.cacheBatt < this.lowBattThreshold
         )
         if (params.updateSource && !this.disableDeviceLogging) {
-          this.log('[%s] current battery [%s%].', this.name, this.cacheBatt)
+          this.log('[%s] %s [%s%].', this.name, this.messages.curBatt, this.cacheBatt)
         }
       }
       if (
@@ -93,9 +93,10 @@ module.exports = class deviceZBSensorMotion {
         this.accessory.eveService.addEntry({ status: motionDetected ? 1 : 0 })
         if (params.updateSource && !this.disableDeviceLogging) {
           this.log(
-            '[%s] current state [motion%s detected].',
+            '[%s] %s [%s].',
             this.name,
-            motionDetected ? '' : ' not'
+            this.messages.curState,
+            motionDetected ? this.messages.motionYes : this.messages.motionNo
           )
         }
       }
diff --git a/lib/device/zigbee/switch-single.js b/lib/device/zigbee/switch-single.js
index 7cd451f6..e0769dc3 100644
--- a/lib/device/zigbee/switch-single.js
+++ b/lib/device/zigbee/switch-single.js
@@ -39,7 +39,7 @@ module.exports = class deviceZBSwitchSingle {
         }
       })
       .onSet(async value => {
-        await this.internalUpdate(value)
+        await this.internalStateUpdate(value)
       })
 
     // Pass the accessory to Fakegato to set up with Eve
@@ -54,21 +54,21 @@ module.exports = class deviceZBSwitchSingle {
     }
   }
 
-  async internalUpdate (value) {
+  async internalStateUpdate (value) {
     try {
       const newValue = value ? 'on' : 'off'
       await this.platform.sendDeviceUpdate(this.accessory, {
         switch: newValue
       })
-      this.cacheOnOff = newValue
+      this.cacheState = newValue
       this.accessory.eveService.addEntry({ status: value ? 1 : 0 })
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current state [%s].', this.name, value ? 'on' : 'off')
+        this.log('[%s] %s [%s].', this.name, this.messages.curState, newValue)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
-        this.service.updateCharacteristic(this.hapChar.On, this.cacheOnOff === 'on')
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
       }, 5000)
       throw new this.platform.api.hap.HapStatusError(-70402)
     }
@@ -76,14 +76,14 @@ module.exports = class deviceZBSwitchSingle {
 
   async externalUpdate (params) {
     try {
-      if (!params.switch || params.switch === this.cacheOnOff) {
+      if (!params.switch || params.switch === this.cacheState) {
         return
       }
-      this.cacheOnOff = params.switch
-      this.service.updateCharacteristic(this.hapChar.On, this.cacheOnOff === 'on')
-      this.accessory.eveService.addEntry({ status: this.cacheOnOff === 'on' ? 1 : 0 })
+      this.cacheState = params.switch
+      this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
+      this.accessory.eveService.addEntry({ status: this.cacheState === 'on' ? 1 : 0 })
       if (params.updateSource && !this.disableDeviceLogging) {
-        this.log('[%s] current state [%s].', this.name, this.cacheOnOff)
+        this.log('[%s] %s [%s].', this.name, this.messages.curState, this.cacheState)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
diff --git a/lib/device/zigbee/switch-stateless.js b/lib/device/zigbee/switch-stateless.js
index 20497814..37682623 100644
--- a/lib/device/zigbee/switch-stateless.js
+++ b/lib/device/zigbee/switch-stateless.js
@@ -68,7 +68,7 @@ module.exports = class deviceZBSwitchStateless {
           this.cacheBatt < this.lowBattThreshold
         )
         if (params.updateSource && !this.disableDeviceLogging) {
-          this.log('[%s] current battery [%s%].', this.name, params.battery)
+          this.log('[%s] %s [%s%].', this.name, this.messages.curBatt, this.cacheBatt)
         }
       }
       if (this.funcs.hasProperty(params, 'key') && [0, 1, 2].includes(params.key)) {
@@ -78,9 +78,9 @@ module.exports = class deviceZBSwitchStateless {
         )
         if (params.updateSource && !this.disableDeviceLogging) {
           const textLabel = params.key === 0
-            ? 'single'
-            : (params.key === 1 ? 'double' : 'long')
-          this.log('[%s] current state [%s press].', this.name, textLabel)
+            ? this.messages.buttonSingle
+            : (params.key === 1 ? this.messages.buttonDouble : this.messages.buttonLong)
+          this.log('[%s] %s [%s].', this.name, this.messages.curState, textLabel)
         }
       }
     } catch (err) {
diff --git a/lib/utils/lang-en.js b/lib/utils/lang-en.js
index f96cab48..71c92f61 100644
--- a/lib/utils/lang-en.js
+++ b/lib/utils/lang-en.js
@@ -3,8 +3,11 @@
 'use strict'
 
 module.exports = {
-  buttonTrig: 'button triggered',
+  buttonDouble: 'double press',
+  buttonLong: 'long press',
   buttonNotFound: 'rf button not found (please restart Homebridge)',
+  buttonSingle: 'single press',
+  buttonTrig: 'button triggered',
   cantReadPacket: 'LAN message received could not be read as',
   cantParsePacket: 'Could not parse DNS packet as',
   cfgDef: 'is not a valid number so using default of',
@@ -75,6 +78,8 @@ module.exports = {
   missingCreds: 'eWeLink credentials missing from configuration',
   missingPW: 'eWeLink password missing from configuration',
   missingUN: 'eWeLink username missing from configuration',
+  motionNo: 'motion not detected',
+  motionYes: 'motion detected',
   newRegionRec: 'New HTTP API host received',
   noAuthRec: 'No auth token received',
   noRegionRec: 'No valid region received',

From 18908e6daeecbea4cec562ed90d4da55d278325b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 30 Apr 2021 18:54:50 +0100
Subject: [PATCH 1953/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a4a12b15..24bd2565 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,14 @@
 
 All notable changes to this homebridge-ewelink will be documented in this file.
 
+## BETA
+
+### Changes
+
+* iFan speed will now log as {low, medium, high}
+* More language strings added to separate language file
+* Backend function and variable name changes
+
 ## 6.3.0 (2021-04-28)
 
 ### Added

From 9de8bd4560fd80501c9735a71608af1a8f082487 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 30 Apr 2021 18:55:20 +0100
Subject: [PATCH 1954/3183] 6.3.1-beta.0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index bc9cbad8..e7b8a2ab 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.3.0",
+  "version": "6.3.1-beta.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index f4fdaa2a..0351cbfc 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.3.0",
+  "version": "6.3.1-beta.0",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From a88fa3f36759218f3e2c23d9def2f22d09a23dc3 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 30 Apr 2021 19:05:38 +0100
Subject: [PATCH 1955/3183] ct func update

---
 lib/device/light-cct.js        | 4 ++--
 lib/device/light-rgb-cct.js    | 4 ++--
 lib/device/zigbee/light-cct.js | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/device/light-cct.js b/lib/device/light-cct.js
index bb7c79f1..65477281 100644
--- a/lib/device/light-cct.js
+++ b/lib/device/light-cct.js
@@ -68,7 +68,7 @@ module.exports = class deviceLightCCT {
 
     // Add the set handler to the lightbulb colour temperature characteristic
     this.service.getCharacteristic(this.hapChar.ColorTemperature).onSet(async value => {
-      await this.internalCTempUpdate(value)
+      await this.internalCTUpdate(value)
     })
 
     // This is needed as sometimes we need to send the brightness with a cct update
@@ -159,7 +159,7 @@ module.exports = class deviceLightCCT {
     }
   }
 
-  async internalCTempUpdate (value) {
+  async internalCTUpdate (value) {
     try {
       if (this.cacheMired === value || this.cacheState !== 'on') {
         return
diff --git a/lib/device/light-rgb-cct.js b/lib/device/light-rgb-cct.js
index 4a795414..86ab0269 100644
--- a/lib/device/light-rgb-cct.js
+++ b/lib/device/light-rgb-cct.js
@@ -60,7 +60,7 @@ module.exports = class deviceLightRGBCCT {
 
     // Add the set handler to the lightbulb colour temperature characteristic
     this.service.getCharacteristic(this.hapChar.ColorTemperature).onSet(async value => {
-      await this.internalCTempUpdate(value)
+      await this.internalCTUpdate(value)
     })
 
     // This is needed as sometimes we need to send the brightness with a cct update
@@ -240,7 +240,7 @@ module.exports = class deviceLightRGBCCT {
     }
   }
 
-  async internalCTempUpdate (value) {
+  async internalCTUpdate (value) {
     try {
       if (this.cacheMired === value || this.cacheState !== 'on') {
         return
diff --git a/lib/device/zigbee/light-cct.js b/lib/device/zigbee/light-cct.js
index 3211ac7e..f4072895 100644
--- a/lib/device/zigbee/light-cct.js
+++ b/lib/device/zigbee/light-cct.js
@@ -61,7 +61,7 @@ module.exports = class deviceZBLightCCT {
 
     // Add the set handler to the lightbulb colour temperature characteristic
     this.service.getCharacteristic(this.hapChar.ColorTemperature).onSet(async value => {
-      await this.internalCTempUpdate(value)
+      await this.internalCTUpdate(value)
     })
 
     // This is needed as sometimes we need to send the brightness with a cct update
@@ -133,7 +133,7 @@ module.exports = class deviceZBLightCCT {
     }
   }
 
-  async internalCTempUpdate (value) {
+  async internalCTUpdate (value) {
     try {
       if (this.cacheMired === value || this.cacheState !== 'on') {
         return

From aabb0bd60599d0501b8be8f3533ba397354e4bf9 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 30 Apr 2021 19:56:38 +0100
Subject: [PATCH 1956/3183] more backend changes

---
 lib/connection/http.js                    |  26 ++---
 lib/connection/lan.js                     |  22 ++--
 lib/connection/ws.js                      |  50 ++++----
 lib/device/curtain.js                     |   8 +-
 lib/device/diffuser.js                    |  48 +++++---
 lib/device/fan.js                         |  28 +++--
 lib/device/humidifier.js                  |  22 ++--
 lib/device/light-cct.js                   |  27 ++---
 lib/device/light-dimmer.js                |  18 +--
 lib/device/light-rgb-cct.js               |  76 ++++++++----
 lib/device/light-rgb.js                   |  24 ++--
 lib/device/motor.js                       |   8 +-
 lib/device/outlet-scm.js                  |   8 +-
 lib/device/outlet.js                      |  14 +--
 lib/device/rf-bridge.js                   |  26 ++---
 lib/device/sensor-ambient.js              |  12 +-
 lib/device/sensor-contact.js              |  22 ++--
 lib/device/sensor-temp-humi.js            |   8 +-
 lib/device/simulation/blind.js            |  10 +-
 lib/device/simulation/door.js             |  10 +-
 lib/device/simulation/garage-eachen.js    |  15 +--
 lib/device/simulation/garage-four.js      |  18 +--
 lib/device/simulation/garage-od-switch.js |  10 +-
 lib/device/simulation/garage-one.js       |   4 +-
 lib/device/simulation/garage-two.js       |   4 +-
 lib/device/simulation/lock-one.js         |   4 +-
 lib/device/simulation/sensor-leak.js      |   4 +-
 lib/device/simulation/switch-valve.js     |   4 +-
 lib/device/simulation/tap-one.js          |   4 +-
 lib/device/simulation/tap-two.js          |   4 +-
 lib/device/simulation/thermostat.js       |   4 +-
 lib/device/simulation/valve-four.js       |   4 +-
 lib/device/simulation/valve-one.js        |   4 +-
 lib/device/simulation/valve-two.js        |   4 +-
 lib/device/simulation/window.js           |  10 +-
 lib/device/switch-double.js               |  17 +--
 lib/device/switch-multi.js                |  17 +--
 lib/device/switch-single.js               |   8 +-
 lib/device/template.js                    |   2 +-
 lib/device/thermostat.js                  |  16 +--
 lib/device/zigbee/light-cct.js            |  25 ++--
 lib/device/zigbee/light-dimmer.js         |  13 +--
 lib/device/zigbee/sensor-ambient.js       |  10 +-
 lib/device/zigbee/sensor-contact.js       |  10 +-
 lib/device/zigbee/sensor-motion.js        |  10 +-
 lib/device/zigbee/switch-single.js        |   8 +-
 lib/device/zigbee/switch-stateless.js     |  12 +-
 lib/index.js                              | 135 ++++++++++++----------
 48 files changed, 466 insertions(+), 381 deletions(-)

diff --git a/lib/connection/http.js b/lib/connection/http.js
index becde388..49fa4220 100644
--- a/lib/connection/http.js
+++ b/lib/connection/http.js
@@ -8,7 +8,7 @@ module.exports = class connectionHTTP {
     this.consts = platform.consts
     this.funcs = platform.funcs
     this.log = platform.log
-    this.messages = platform.messages
+    this.lang = platform.lang
     this.obstructSwitches = platform.obstructSwitches
 
     // Set up config variables from the platform
@@ -42,7 +42,7 @@ module.exports = class connectionHTTP {
 
       // Log the data depending on the debug setting
       if (this.debug) {
-        this.log('%s.', this.messages.sendLogin)
+        this.log('%s.', this.lang.sendLogin)
       }
 
       // Set up the request signature
@@ -79,12 +79,12 @@ module.exports = class connectionHTTP {
             this.httpHost = 'cn-apia.coolkit.cn'
             break
           default:
-            throw new Error(this.messages.noRegionRec + ' - [' + givenRegion + '].')
+            throw new Error(this.lang.noRegionRec + ' - [' + givenRegion + '].')
         }
 
         // Log the new http host if appropriate
         if (this.debug) {
-          this.log('%s [%s].', this.messages.newRegionRec, this.httpHost)
+          this.log('%s [%s].', this.lang.newRegionRec, this.httpHost)
         }
 
         // Retry the login with the new http host
@@ -102,12 +102,12 @@ module.exports = class connectionHTTP {
         } else {
           if (body.error === 500) {
             // Retry if another attempt could be successful
-            this.log.warn('%s.', this.messages.eweError)
+            this.log.warn('%s.', this.lang.eweError)
             await this.funcs.sleep(30000)
             return await this.login()
           } else {
             const text = JSON.stringify(body, null, 2)
-            throw new Error(this.messages.noAuthRec + '.\n' + text)
+            throw new Error(this.lang.noAuthRec + '.\n' + text)
           }
         }
       }
@@ -115,12 +115,12 @@ module.exports = class connectionHTTP {
       // Check to see if it's a eWeLink server problem and we can retry
       if (err.code && this.consts.httpRetryCodes.includes(err.code)) {
         // Retry if another attempt could be successful
-        this.log.warn('%s [login() - %s].', this.messages.httpRetry, err.code)
+        this.log.warn('%s [login() - %s].', this.lang.httpRetry, err.code)
         await this.funcs.sleep(30000)
         return await this.login()
       } else {
         // It's not a eWeLink problem so report the error back
-        this.log.warn('%s.', this.messages.errLogin)
+        this.log.warn('%s.', this.lang.errLogin)
         throw err
       }
     }
@@ -177,12 +177,12 @@ module.exports = class connectionHTTP {
       // Check to see if it's a eWeLink server problem and we can retry
       if (err.code && this.consts.httpRetryCodes.includes(err.code)) {
         // Retry if another attempt could be successful
-        this.log.warn('%s [getDevices() - %s].', this.messages.httpRetry, err.code)
+        this.log.warn('%s [getDevices() - %s].', this.lang.httpRetry, err.code)
         await this.funcs.sleep(30000)
         return await this.getDevices()
       } else {
         // It's not a eWeLink problem so report the error back
-        this.log.warn('%s.', this.messages.errGetDevices)
+        this.log.warn('%s.', this.lang.errGetDevices)
         throw err
       }
     }
@@ -219,17 +219,17 @@ module.exports = class connectionHTTP {
         // Return the device data
         return body.data.thingList[0].itemData
       } else {
-        throw new Error(this.messages.devNotFound)
+        throw new Error(this.lang.devNotFound)
       }
     } catch (err) {
       if (err.code && this.consts.httpRetryCodes.includes(err.code)) {
         // Retry if another attempt could be successful
-        this.log.warn('%s [getDevice() - %s].', this.messages.httpRetry, err.code)
+        this.log.warn('%s [getDevice() - %s].', this.lang.httpRetry, err.code)
         await this.funcs.sleep(30000)
         return await this.getDevice(deviceId)
       } else {
         // It's not a eWeLink problem so report the error back
-        this.log.warn('%s.', this.messages.errGetDevice)
+        this.log.warn('%s.', this.lang.errGetDevice)
         throw err
       }
     }
diff --git a/lib/connection/lan.js b/lib/connection/lan.js
index f332d600..7ebfde56 100644
--- a/lib/connection/lan.js
+++ b/lib/connection/lan.js
@@ -8,7 +8,7 @@ module.exports = class connectionLAN {
     this.consts = platform.consts
     this.funcs = platform.funcs
     this.log = platform.log
-    this.messages = platform.messages
+    this.lang = platform.lang
     this.debug = platform.config.debug
 
     // Set up config variables from the platform
@@ -42,13 +42,13 @@ module.exports = class connectionLAN {
   async getHosts () {
     // Perform an initial discovery of devices on the local network
     if (this.debug) {
-      this.log('%s.', this.messages.lanStarting)
+      this.log('%s.', this.lang.lanStarting)
     }
     const res = await this.dns.discover({
       name: '_ewelink._tcp.local'
     })
     if (this.debug) {
-      this.log('%s.', this.messages.lanStarted)
+      this.log('%s.', this.lang.lanStarted)
     }
 
     // Update the device map for each device found on the local network
@@ -121,7 +121,7 @@ module.exports = class connectionLAN {
               this.log.warn(
                 '[%s] %s %s:\n%s',
                 rdata.id,
-                this.messages.cantReadPacket,
+                this.lang.cantReadPacket,
                 e.message,
                 pText
               )
@@ -150,20 +150,20 @@ module.exports = class connectionLAN {
           })
       } catch (err) {
         const eText = this.funcs.parseError(err)
-        this.log.warn('%s %s.', this.messages.cantParsePacket, eText)
+        this.log.warn('%s %s.', this.lang.cantParsePacket, eText)
       }
     }
 
     // Start the DNS packet monitoring
     await this.dns.startMonitoring()
-    this.log('%s.', this.messages.lanMonitor)
+    this.log('%s.', this.lang.lanMonitor)
   }
 
   async sendUpdate (json) {
     try {
       // Check we have an IP address for the device
       if (!this.deviceMap.get(json.deviceid).ip) {
-        throw new Error(this.messages.devNotReachLAN)
+        throw new Error(this.lang.devNotReachLAN)
       }
       let apiKey
       let suffix
@@ -186,12 +186,12 @@ module.exports = class connectionLAN {
         params.rfChl = json.params.rfChl
         suffix = 'transmit'
       } else {
-        throw new Error(this.messages.devNotConfLAN)
+        throw new Error(this.lang.devNotConfLAN)
       }
 
       // Check we have the device API key
       if (!(apiKey = this.deviceMap.get(json.deviceid).apiKey)) {
-        throw new Error(this.messages.devNoAPIKey)
+        throw new Error(this.lang.devNoAPIKey)
       }
 
       // Generate the HTTP request
@@ -226,7 +226,7 @@ module.exports = class connectionLAN {
       if (!res.data || res.data.error !== 0) {
         const error = res.data && res.data.error
           ? res.data.error
-          : this.messages.lanErr
+          : this.lang.lanErr
         throw new Error(error)
       }
 
@@ -254,7 +254,7 @@ module.exports = class connectionLAN {
     // This is called when Homebridge is shutdown
     await this.dns.stopMonitoring()
     if (this.debug) {
-      this.log('%s.', this.messages.stoppedLAN)
+      this.log('%s.', this.lang.stoppedLAN)
     }
   }
 }
diff --git a/lib/connection/ws.js b/lib/connection/ws.js
index 35d00809..f038356e 100644
--- a/lib/connection/ws.js
+++ b/lib/connection/ws.js
@@ -8,7 +8,7 @@ module.exports = class connectionWS {
     this.consts = platform.consts
     this.funcs = platform.funcs
     this.log = platform.log
-    this.messages = platform.messages
+    this.lang = platform.lang
 
     // Set up config variables from the platform
     this.debug = platform.config.debug
@@ -54,12 +54,12 @@ module.exports = class connectionWS {
 
       // Check for any reason a host wasn't received
       if (!body.domain) {
-        throw new Error(this.messages.noWSHost)
+        throw new Error(this.lang.noWSHost)
       }
 
       // Log the received host if appropriate
       if (this.debug) {
-        this.log('%s [%s].', this.messages.wsHostRec, body.domain)
+        this.log('%s [%s].', this.lang.wsHostRec, body.domain)
       }
 
       // Return the received web socket host
@@ -68,12 +68,12 @@ module.exports = class connectionWS {
       // Check to see if it's a eWeLink server problem and we can retry
       if (err.code && this.consts.httpRetryCodes.includes(err.code)) {
         // Retry if another attempt could be successful
-        this.log.warn('%s [getHost() - %s].', this.messages.httpRetry, err.code)
+        this.log.warn('%s [getHost() - %s].', this.lang.httpRetry, err.code)
         await this.funcs.sleep(30000)
         return await this.getHost()
       } else {
         // It's not a eWeLink problem so report the error back
-        this.log.warn('%s.', this.messages.errgetHost)
+        this.log.warn('%s.', this.lang.errgetHost)
         throw err
       }
     }
@@ -125,7 +125,7 @@ module.exports = class connectionWS {
 
         // Log the web socket login if appropriate
         if (this.debug) {
-          this.log('%s.', this.messages.wsLogin)
+          this.log('%s.', this.lang.wsLogin)
         }
 
         // Attempt to authenticate the web socket connection
@@ -147,28 +147,28 @@ module.exports = class connectionWS {
               // Catch errors sending ping and show in debug mode
                 if (this.debug) {
                   const eText = this.funcs.parseError(err)
-                  this.log.warn('%s %s.', this.messages.wsPingError, eText)
+                  this.log.warn('%s %s.', this.lang.wsPingError, eText)
                 }
               }
             }, (res.config.hbInterval + 7) * 1000)
 
             // Login was successful and log if appropriate
             if (this.debug) {
-              this.log('%s.', this.messages.wsLoginSuccess)
+              this.log('%s.', this.lang.wsLoginSuccess)
             }
           } else {
           // There was a problem with the authentication response
             if (res.error === 406) {
-              this.log.warn(this.messages.wsLogin406)
+              this.log.warn(this.lang.wsLogin406)
             } else {
               const str = JSON.stringify(res, null, 2)
-              throw new Error(this.messages.wsLoginErr + '\n' + str)
+              throw new Error(this.lang.wsLoginErr + '\n' + str)
             }
           }
         } catch (err) {
         // Catch any errors authenticating the WS connection
           const eText = this.funcs.parseError(err)
-          this.log.warn('%s %s.', this.messages.wsLoginError, eText)
+          this.log.warn('%s %s.', this.lang.wsLoginError, eText)
         }
       })
 
@@ -238,15 +238,19 @@ module.exports = class connectionWS {
             // We don't need to do anything with this action
               return
             default: {
-              const str = JSON.stringify(msg, null, 2)
-              this.log.warn('[%s] %s.\n%s', msg.deviceid, this.messages.wsUnkAct, str)
+              this.log.warn(
+                '[%s] %s.\n%s',
+                msg.deviceid,
+                this.lang.wsUnkAct,
+                JSON.stringify(msg, null, 2)
+              )
             }
           }
         } else if (this.funcs.hasProperty(msg, 'error') && msg.error === 0) {
         // Safe to ignore these messages
         } else {
         // WS message received has an unknown action
-          this.log.warn('%s.\n%s', this.messages.wsUnkCmd, JSON.stringify(msg, null, 2))
+          this.log.warn('%s.\n%s', this.lang.wsUnkCmd, JSON.stringify(msg, null, 2))
         }
       })
 
@@ -259,7 +263,7 @@ module.exports = class connectionWS {
 
         // Log that the web socket has closed if appropriate
         if (this.debug) {
-          this.log.warn('%s [%s].', this.messages.wsReconnectError, e)
+          this.log.warn('%s [%s].', this.lang.wsReconnectError, e)
         }
 
         // Wait for 4 seconds and try to re-establish the web socket connection
@@ -271,7 +275,7 @@ module.exports = class connectionWS {
       this.wsClient.onError.addListener(async e => {
         // Log that the web socket has closed if appropriate
         if (this.debug) {
-          this.log.warn('%s [%s].', this.messages.wsReconnectClose, e)
+          this.log.warn('%s [%s].', this.lang.wsReconnectClose, e)
         }
 
         // Wait for 6 seconds and try to re-establish the web socket connection
@@ -286,7 +290,7 @@ module.exports = class connectionWS {
 
       // Log the error if appropriate (debug on)
       if (this.debug) {
-        this.log('%s: %s.', this.messages.wsLoginErrRecon, errToShow)
+        this.log('%s: %s.', this.lang.wsLoginErrRecon, errToShow)
       }
 
       // Wait for 5 seconds and try to re-establish the web socket connection
@@ -324,10 +328,10 @@ module.exports = class connectionWS {
             // No error is always what is wanted
             return
           case 504:
-            throw new Error(this.messages.wsReqTimeout + ' [504]')
+            throw new Error(this.lang.wsReqTimeout + ' [504]')
           default:
             // An error has occurred
-            throw new Error(this.messages.wsUnkRes + ' [' + res.error + ']')
+            throw new Error(this.lang.wsUnkRes + ' [' + res.error + ']')
         }
       } catch (err) {
         // Catch any errors sending the device update
@@ -336,7 +340,7 @@ module.exports = class connectionWS {
       }
     } else {
       // The web socket isn't currently open so log this
-      this.log.warn('%s.', this.messages.wsResend)
+      this.log.warn('%s.', this.lang.wsResend)
 
       // Try sending the update again in 30 seconds when it's hopefully open again
       await this.funcs.sleep(30000)
@@ -362,7 +366,7 @@ module.exports = class connectionWS {
 
     // Log the action if appropriate
     if (this.debug) {
-      this.log('[%s] %s.', accessory.displayName, this.messages.updReq)
+      this.log('[%s] %s.', accessory.displayName, this.lang.updReq)
     }
 
     // Check the web socket is open
@@ -371,7 +375,7 @@ module.exports = class connectionWS {
       this.wsClient.send(JSON.stringify(json))
     } else {
       // The web socket isn't currently open so log this
-      this.log.warn('[%s] %s.', accessory.displayName, this.messages.wsResend)
+      this.log.warn('[%s] %s.', accessory.displayName, this.lang.wsResend)
 
       // Try sending the update again in 30 seconds when it's hopefully open again
       await this.funcs.sleep(30000)
@@ -401,7 +405,7 @@ module.exports = class connectionWS {
 
         // Log if appropriate
         if (this.debug) {
-          this.log('%s.', this.messages.stoppedWS)
+          this.log('%s.', this.lang.stoppedWS)
         }
       }
     }
diff --git a/lib/device/curtain.js b/lib/device/curtain.js
index c0592401..43242d1b 100644
--- a/lib/device/curtain.js
+++ b/lib/device/curtain.js
@@ -11,7 +11,7 @@ module.exports = class deviceCurtain {
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
     this.log = platform.log
-    this.messages = platform.messages
+    this.lang = platform.lang
     this.platform = platform
 
     // Set up variables from the accessory
@@ -43,7 +43,7 @@ module.exports = class deviceCurtain {
     // Output the customised options to the log if in debug mode
     if (this.debug) {
       const opts = JSON.stringify({ disableDeviceLogging: this.disableDeviceLogging })
-      this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
+      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
     }
   }
 
@@ -77,7 +77,7 @@ module.exports = class deviceCurtain {
 
       // Log the update if appropriate
       if (!this.disableDeviceLogging) {
-        this.log('[%s] %s [%s%].', this.name, this.messages.curPos, this.cachePos)
+        this.log('[%s] %s [%s%].', this.name, this.lang.curPos, this.cachePos)
       }
     } catch (err) {
       // Catch any errors and let the platform display them
@@ -111,7 +111,7 @@ module.exports = class deviceCurtain {
       if (params.updateSource && this.cachePos !== newPos) {
         this.cachePos = newPos
         if (!this.disableDeviceLogging) {
-          this.log('[%s] %s [%s%].', this.name, this.messages.curPos, this.cachePos)
+          this.log('[%s] %s [%s%].', this.name, this.lang.curPos, this.cachePos)
         }
       }
     } catch (err) {
diff --git a/lib/device/diffuser.js b/lib/device/diffuser.js
index ea02e409..b812fd4b 100644
--- a/lib/device/diffuser.js
+++ b/lib/device/diffuser.js
@@ -12,7 +12,7 @@ module.exports = class deviceDiffuser {
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
     this.log = platform.log
-    this.messages = platform.messages
+    this.lang = platform.lang
     this.platform = platform
 
     // Set up variables from the accessory
@@ -64,7 +64,7 @@ module.exports = class deviceDiffuser {
     // Output the customised options to the log if in debug mode
     if (this.debug) {
       const opts = JSON.stringify({ disableDeviceLogging: this.disableDeviceLogging })
-      this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
+      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
     }
   }
 
@@ -96,7 +96,7 @@ module.exports = class deviceDiffuser {
 
       // Log the update if appropriate
       if (!this.disableDeviceLogging) {
-        this.log('[%s] %s [%s].', this.name, this.messages.curState, this.cacheState)
+        this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
       }
     } catch (err) {
       // Catch any errors and let the platform display them
@@ -150,7 +150,7 @@ module.exports = class deviceDiffuser {
 
       // Log the update if appropriate
       if (!this.disableDeviceLogging) {
-        this.log('[%s] %s [%s%].', this.name, this.messages.curSpeed, this.cacheSpeed)
+        this.log('[%s] %s [%s%].', this.name, this.lang.curSpeed, this.cacheSpeed)
       }
     } catch (err) {
       // Catch any errors and let the platform display them
@@ -190,8 +190,12 @@ module.exports = class deviceDiffuser {
 
       // Log the update if appropriate
       if (!this.disableDeviceLogging) {
-        const label = value === 1 ? 'on' : 'off'
-        this.log('[%s] %s [%s%].', this.name, this.messages.curLight, label)
+        this.log(
+          '[%s] %s [%s%].',
+          this.name,
+          this.lang.curLight,
+          value === 1 ? 'on' : 'off'
+        )
       }
     } catch (err) {
       // Catch any errors and let the platform display them
@@ -240,7 +244,7 @@ module.exports = class deviceDiffuser {
 
       // Log the update if appropriate
       if (!this.disableDeviceLogging) {
-        this.log('[%s] %s [%s%].', this.name, this.messages.curBright, this.cacheBright)
+        this.log('[%s] %s [%s%].', this.name, this.lang.curBright, this.cacheBright)
       }
     } catch (err) {
       // Catch any errors and let the platform display them
@@ -298,8 +302,12 @@ module.exports = class deviceDiffuser {
 
       // Log the update if appropriate
       if (!this.disableDeviceLogging) {
-        const label = this.cacheR + ' ' + this.cacheG + ' ' + this.cacheB
-        this.log('[%s] %s [rgb %s].', this.name, this.messages.curColour, label)
+        this.log(
+          '[%s] %s [rgb %s].',
+          this.name,
+          this.lang.curColour,
+          this.cacheR + ' ' + this.cacheG + ' ' + this.cacheB
+        )
       }
     } catch (err) {
       // Catch any errors and let the platform display them
@@ -339,7 +347,7 @@ module.exports = class deviceDiffuser {
 
         // Log if appropriate
         if (params.updateSource && !this.disableDeviceLogging) {
-          this.log('[%s] %s [%s%].', this.name, this.messages.curState, this.cacheState)
+          this.log('[%s] %s [%s%].', this.name, this.lang.curState, this.cacheState)
         }
       }
 
@@ -356,7 +364,7 @@ module.exports = class deviceDiffuser {
 
         // Log if appropriate
         if (params.updateSource && !this.disableDeviceLogging) {
-          this.log('[%s] %s [%s%].', this.name, this.messages.curSpeed, this.cacheSpeed)
+          this.log('[%s] %s [%s%].', this.name, this.lang.curSpeed, this.cacheSpeed)
         }
       }
 
@@ -373,8 +381,12 @@ module.exports = class deviceDiffuser {
 
         // Log if appropriate
         if (params.updateSource && !this.disableDeviceLogging) {
-          const label = params.lightswitch === 1 ? 'on' : 'off'
-          this.log('[%s] %s [%s%].', this.name, this.messages.curLight, label)
+          this.log(
+            '[%s] %s [%s%].',
+            this.name,
+            this.lang.curLight,
+            params.lightswitch === 1 ? 'on' : 'off'
+          )
         }
       }
 
@@ -394,7 +406,7 @@ module.exports = class deviceDiffuser {
 
         // Log if appropriate
         if (params.updateSource && !this.disableDeviceLogging) {
-          this.log('[%s] %s [%s%].', this.name, this.messages.curBright, this.cacheBright)
+          this.log('[%s] %s [%s%].', this.name, this.lang.curBright, this.cacheBright)
         }
       }
 
@@ -423,12 +435,10 @@ module.exports = class deviceDiffuser {
         // Log if appropriate
         if (params.updateSource && !this.disableDeviceLogging) {
           this.log(
-            '[%s] %s [rgb %s %s %s].',
+            '[%s] %s [rgb %s].',
             this.name,
-            this.messages.curColour,
-            this.cacheR,
-            this.cacheG,
-            this.cacheB
+            this.lang.curColour,
+            this.cacheR + ' ' + this.cacheG + ' ' + this.cacheB
           )
         }
       }
diff --git a/lib/device/fan.js b/lib/device/fan.js
index 43b72744..cdaceb86 100644
--- a/lib/device/fan.js
+++ b/lib/device/fan.js
@@ -11,7 +11,7 @@ module.exports = class deviceFan {
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
     this.log = platform.log
-    this.messages = platform.messages
+    this.lang = platform.lang
     this.platform = platform
 
     // Set up variables from the accessory
@@ -74,7 +74,7 @@ module.exports = class deviceFan {
         disableDeviceLogging: this.disableDeviceLogging,
         hideLight: this.hideLight
       })
-      this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
+      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
     }
   }
 
@@ -120,14 +120,18 @@ module.exports = class deviceFan {
       if (newState !== (this.cacheState === 'on')) {
         this.cacheState = newState ? 'on' : 'off'
         if (!this.disableDeviceLogging) {
-          this.log('[%s] %s [%s].', this.name, this.messages.curState, this.cacheState)
+          this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
         }
       }
       if (newSpeed !== this.cacheSpeed && newSpeed > 0) {
         this.cacheSpeed = newSpeed
         if (!this.disableDeviceLogging) {
-          const label = this.speed2label[this.cacheSpeed]
-          this.log('[%s] %s [%s].', this.name, this.messages.curSpeed, label)
+          this.log(
+            '[%s] %s [%s].',
+            this.name,
+            this.lang.curSpeed,
+            this.speed2label[this.cacheSpeed]
+          )
         }
       }
     } catch (err) {
@@ -155,7 +159,7 @@ module.exports = class deviceFan {
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.cacheLight = newLight
       if (!this.disableDeviceLogging) {
-        this.log('[%s] %s [%s].', this.name, this.messages.curLight, this.cacheLight)
+        this.log('[%s] %s [%s].', this.name, this.lang.curLight, this.cacheLight)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
@@ -175,7 +179,7 @@ module.exports = class deviceFan {
         this.cacheState = params.switches[1].switch
         this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
         if (params.updateSource && !this.disableDeviceLogging) {
-          this.log('[%s] %s [%s].', this.name, this.messages.curState, this.cacheState)
+          this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
         }
       }
       let speed = 0
@@ -193,15 +197,19 @@ module.exports = class deviceFan {
         this.cacheSpeed = speed
         this.service.updateCharacteristic(this.hapChar.RotationSpeed, this.cacheSpeed)
         if (params.updateSource && !this.disableDeviceLogging && this.cacheSpeed > 0) {
-          const label = this.speed2label[this.cacheSpeed]
-          this.log('[%s] %s [%s].', this.name, this.messages.curSpeed, label)
+          this.log(
+            '[%s] %s [%s].',
+            this.name,
+            this.lang.curSpeed,
+            this.speed2label[this.cacheSpeed]
+          )
         }
       }
       if (this.lightService && params.switches[0].switch !== this.cacheLight) {
         this.cacheLight = params.switches[0].switch
         this.lightService.updateCharacteristic(this.hapChar.On, this.cacheLight === 'on')
         if (params.updateSource && !this.disableDeviceLogging) {
-          this.log('[%s] %s [%s].', this.name, this.messages.curLight, this.cacheLight)
+          this.log('[%s] %s [%s].', this.name, this.lang.curLight, this.cacheLight)
         }
       }
     } catch (err) {
diff --git a/lib/device/humidifier.js b/lib/device/humidifier.js
index 44c6b18b..c06e3cb5 100644
--- a/lib/device/humidifier.js
+++ b/lib/device/humidifier.js
@@ -11,7 +11,7 @@ module.exports = class deviceHumidifier {
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
     this.log = platform.log
-    this.messages = platform.messages
+    this.lang = platform.lang
     this.platform = platform
 
     // Set up variables from the accessory
@@ -83,14 +83,18 @@ module.exports = class deviceHumidifier {
       if (value === 0) {
         this.cacheState = 'off'
         if (!this.disableDeviceLogging) {
-          this.log('[%s] %s [off].', this.name, this.messages.curState)
+          this.log('[%s] %s [off].', this.name, this.lang.curState)
         }
       } else {
         this.cacheState = 'on'
         this.cacheMode = newMode
         if (!this.disableDeviceLogging) {
-          const label = this.mode2label[this.cacheMode]
-          this.log('[%s] %s [%s].', this.name, this.messages.curMode, label)
+          this.log(
+            '[%s] %s [%s].',
+            this.name,
+            this.lang.curMode,
+            this.mode2label[this.cacheMode]
+          )
         }
       }
     } catch (err) {
@@ -107,7 +111,7 @@ module.exports = class deviceHumidifier {
       if (params.switch && params.switch !== this.cacheState) {
         this.cacheState = params.switch
         if (params.updateSource && !this.disableDeviceLogging) {
-          this.log('[%s] %s [%s].', this.name, this.messages.curState, this.cacheState)
+          this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
         }
         this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
         if (this.cacheState !== 'on') {
@@ -118,8 +122,12 @@ module.exports = class deviceHumidifier {
         this.cacheMode = params.state
         if (this.cacheState === 'on') {
           if (params.updateSource && !this.disableDeviceLogging) {
-            const label = this.mode2label[this.cacheMode]
-            this.log('[%s] %s [%s].', this.name, this.messages.curMode, label)
+            this.log(
+              '[%s] %s [%s].',
+              this.name,
+              this.lang.curMode,
+              this.mode2label[this.cacheMode]
+            )
           }
           this.service.updateCharacteristic(
             this.hapChar.RotationSpeed,
diff --git a/lib/device/light-cct.js b/lib/device/light-cct.js
index 65477281..6c630a28 100644
--- a/lib/device/light-cct.js
+++ b/lib/device/light-cct.js
@@ -11,7 +11,7 @@ module.exports = class deviceLightCCT {
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
     this.log = platform.log
-    this.messages = platform.messages
+    this.lang = platform.lang
     this.platform = platform
 
     // Set up variables from the accessory
@@ -89,7 +89,7 @@ module.exports = class deviceLightCCT {
         disableDeviceLogging: this.disableDeviceLogging,
         bulbModel: this.bulbModel
       })
-      this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
+      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
     }
   }
 
@@ -111,7 +111,7 @@ module.exports = class deviceLightCCT {
       })
       this.cacheState = newValue
       if (!this.disableDeviceLogging) {
-        this.log('[%s] %s [%s].', this.name, this.messages.curState, this.cacheState)
+        this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
@@ -148,7 +148,7 @@ module.exports = class deviceLightCCT {
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.cacheBright = value
       if (!this.disableDeviceLogging) {
-        this.log('[%s] %s [%s%].', this.name, this.messages.curBright, this.cacheBright)
+        this.log('[%s] %s [%s%].', this.name, this.lang.curBright, this.cacheBright)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
@@ -196,12 +196,12 @@ module.exports = class deviceLightCCT {
           this.log(
             '[%s] %s [%sK] %s.',
             this.name,
-            this.messages.curColour,
+            this.lang.curColour,
             scaledK,
-            this.messages.viaAL
+            this.lang.viaAL
           )
         } else {
-          this.log('[%s] %s [%sK].', this.name, this.messages.curColour, scaledK)
+          this.log('[%s] %s [%sK].', this.name, this.lang.curColour, scaledK)
         }
       }
     } catch (err) {
@@ -222,7 +222,7 @@ module.exports = class deviceLightCCT {
         this.cacheState = params.switch
         this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
         if (params.updateSource && !this.disableDeviceLogging) {
-          this.log('[%s] %s [%s].', this.name, this.messages.curState, this.cacheState)
+          this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
         }
       }
       if (params.white) {
@@ -233,12 +233,7 @@ module.exports = class deviceLightCCT {
           this.cacheBright = params.white.br
           this.service.updateCharacteristic(this.hapChar.Brightness, this.cacheBright)
           if (params.updateSource && !this.disableDeviceLogging) {
-            this.log(
-              '[%s] %s [%s%].',
-              this.name,
-              this.messages.curBright,
-              this.cacheBright
-            )
+            this.log('[%s] %s [%s%].', this.name, this.lang.curBright, this.cacheBright)
           }
         }
         if (
@@ -256,13 +251,13 @@ module.exports = class deviceLightCCT {
           )
           if (params.updateSource) {
             if (!this.disableDeviceLogging) {
-              this.log('[%s] %s [%sK].', this.name, this.messages.curColour, scaledK)
+              this.log('[%s] %s [%sK].', this.name, this.lang.curColour, scaledK)
             }
             if (this.alController.isAdaptiveLightingActive() && ctDiff > 20) {
               // Look for a variation greater than twenty
               this.alController.disableAdaptiveLighting()
               if (!this.disableDeviceLogging) {
-                this.log('[%s] %s.', this.name, this.messages.disabledAL)
+                this.log('[%s] %s.', this.name, this.lang.disabledAL)
               }
             }
           }
diff --git a/lib/device/light-dimmer.js b/lib/device/light-dimmer.js
index 2619cd45..bda2c43c 100644
--- a/lib/device/light-dimmer.js
+++ b/lib/device/light-dimmer.js
@@ -11,7 +11,7 @@ module.exports = class deviceLightDimmer {
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
     this.log = platform.log
-    this.messages = platform.messages
+    this.lang = platform.lang
     this.platform = platform
 
     // Set up variables from the accessory
@@ -50,7 +50,7 @@ module.exports = class deviceLightDimmer {
         brightnessStep: this.brightStep,
         disableDeviceLogging: this.disableDeviceLogging
       })
-      this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
+      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
     }
   }
 
@@ -74,7 +74,7 @@ module.exports = class deviceLightDimmer {
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.cacheState = newValue
       if (!this.disableDeviceLogging) {
-        this.log('[%s] %s [%s].', this.name, this.messages.curState, this.cacheState)
+        this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
@@ -115,7 +115,7 @@ module.exports = class deviceLightDimmer {
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.cacheBright = value
       if (!this.disableDeviceLogging) {
-        this.log('[%s] %s [%s%].', this.name, this.messages.curBright, this.cacheBright)
+        this.log('[%s] %s [%s%].', this.name, this.lang.curBright, this.cacheBright)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
@@ -133,7 +133,7 @@ module.exports = class deviceLightDimmer {
           this.service.updateCharacteristic(this.hapChar.On, params.state === 'on')
           this.cacheState = params.state
           if (params.updateSource && !this.disableDeviceLogging) {
-            this.log('[%s] %s [%s].', this.name, this.messages.curState, this.cacheState)
+            this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
           }
         }
       } else {
@@ -141,7 +141,7 @@ module.exports = class deviceLightDimmer {
           this.service.updateCharacteristic(this.hapChar.On, params.switch === 'on')
           this.cacheState = params.switch
           if (params.updateSource && !this.disableDeviceLogging) {
-            this.log('[%s] %s [%s].', this.name, this.messages.curState, this.cacheState)
+            this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
           }
         }
       }
@@ -155,7 +155,7 @@ module.exports = class deviceLightDimmer {
               this.service.updateCharacteristic(this.hapChar.Brightness, nb)
               this.cacheBright = nb
               if (params.updateSource && !this.disableDeviceLogging) {
-                this.log('[%s] %s [%s%].', this.name, this.messages.curBright, nb)
+                this.log('[%s] %s [%s%].', this.name, this.lang.curBright, nb)
               }
             }
           }
@@ -168,7 +168,7 @@ module.exports = class deviceLightDimmer {
               this.service.updateCharacteristic(this.hapChar.Brightness, nb)
               this.cacheBright = nb
               if (params.updateSource && !this.disableDeviceLogging) {
-                this.log('[%s] %s [%s%].', this.name, this.messages.curBright, nb)
+                this.log('[%s] %s [%s%].', this.name, this.lang.curBright, nb)
               }
             }
           }
@@ -181,7 +181,7 @@ module.exports = class deviceLightDimmer {
               this.service.updateCharacteristic(this.hapChar.Brightness, nb)
               this.cacheBright = nb
               if (params.updateSource && !this.disableDeviceLogging) {
-                this.log('[%s] %s [%s%].', this.name, this.messages.curBright, nb)
+                this.log('[%s] %s [%s%].', this.name, this.lang.curBright, nb)
               }
             }
           }
diff --git a/lib/device/light-rgb-cct.js b/lib/device/light-rgb-cct.js
index 86ab0269..41aa3843 100644
--- a/lib/device/light-rgb-cct.js
+++ b/lib/device/light-rgb-cct.js
@@ -12,7 +12,7 @@ module.exports = class deviceLightRGBCCT {
     this.hapChar = platform.api.hap.Characteristic
     this.colourUtils = platform.colourUtils
     this.log = platform.log
-    this.messages = platform.messages
+    this.lang = platform.lang
     this.platform = platform
 
     // Set up variables from the accessory
@@ -80,7 +80,7 @@ module.exports = class deviceLightRGBCCT {
         brightnessStep: this.brightStep,
         disableDeviceLogging: this.disableDeviceLogging
       })
-      this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
+      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
     }
   }
 
@@ -101,7 +101,7 @@ module.exports = class deviceLightRGBCCT {
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.cacheState = newValue
       if (!this.disableDeviceLogging) {
-        this.log('[%s] %s [%s].', this.name, this.messages.curState, this.cacheState)
+        this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
@@ -162,7 +162,7 @@ module.exports = class deviceLightRGBCCT {
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.cacheBright = value
       if (!this.disableDeviceLogging) {
-        this.log('[%s] %s [%s%].', this.name, this.messages.curBright, this.cacheBright)
+        this.log('[%s] %s [%s%].', this.name, this.lang.curBright, this.cacheBright)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
@@ -228,8 +228,12 @@ module.exports = class deviceLightRGBCCT {
         this.cacheMode = 'color'
       }
       if (!this.disableDeviceLogging) {
-        const label = this.cacheR + ' ' + this.cacheG + ' ' + this.cacheB
-        this.log('[%s] %s [rgb %s].', this.name, this.messages.curColour, label)
+        this.log(
+          '[%s] %s [rgb %s].',
+          this.name,
+          this.lang.curColour,
+          this.cacheR + ' ' + this.cacheG + ' ' + this.cacheB
+        )
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
@@ -312,12 +316,12 @@ module.exports = class deviceLightRGBCCT {
           this.log(
             '[%s] %s [%sK] %s.',
             this.name,
-            this.messages.curColour,
+            this.lang.curColour,
             mToK,
-            this.messages.viaAL
+            this.lang.viaAL
           )
         } else {
-          this.log('[%s] %s [%sK].', this.name, this.messages.curColour, mToK)
+          this.log('[%s] %s [%sK].', this.name, this.lang.curColour, mToK)
         }
       }
     } catch (err) {
@@ -338,7 +342,7 @@ module.exports = class deviceLightRGBCCT {
         this.cacheState = params.switch
         this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
         if (params.updateSource && !this.disableDeviceLogging) {
-          this.log('[%s] %s [%s].', this.name, this.messages.curState, this.cacheState)
+          this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
         }
       }
       let hs
@@ -350,8 +354,12 @@ module.exports = class deviceLightRGBCCT {
               this.cacheBright = params.bright
               this.service.updateCharacteristic(this.hapChar.Brightness, this.cacheBright)
               if (params.updateSource && !this.disableDeviceLogging) {
-                const nb = this.cacheBright
-                this.log('[%s] %s [%s%].', this.name, this.messages.curBright, nb)
+                this.log(
+                  '[%s] %s [%s%].',
+                  this.name,
+                  this.lang.curBright,
+                  this.cacheBright
+                )
               }
             }
           }
@@ -374,12 +382,18 @@ module.exports = class deviceLightRGBCCT {
               this.service.updateCharacteristic(this.hapChar.Saturation, hs[1])
               if (params.updateSource) {
                 if (!this.disableDeviceLogging) {
-                  const label = this.cacheR + ' ' + this.cacheG + ' ' + this.cacheB
-                  this.log('[%s] %s [rgb %s].', this.name, this.messages.curColour, label)
+                  this.log(
+                    '[%s] %s [rgb %s].',
+                    this.name,
+                    this.lang.curColour,
+                    this.cacheR + ' ' + this.cacheG + ' ' + this.cacheB
+                  )
                 }
                 if (this.alController.isAdaptiveLightingActive() && rgbDiff > 50) {
                   this.alController.disableAdaptiveLighting()
-                  this.log('[%s] %s.', this.name, this.messages.disabledAL)
+                  if (!this.disableDeviceLogging) {
+                    this.log('[%s] %s.', this.name, this.lang.disabledAL)
+                  }
                 }
               }
             }
@@ -396,8 +410,12 @@ module.exports = class deviceLightRGBCCT {
                   this.cacheBright
                 )
                 if (params.updateSource && !this.disableDeviceLogging) {
-                  const nb = this.cacheBright
-                  this.log('[%s] %s [%s%].', this.name, this.messages.curBright, nb)
+                  this.log(
+                    '[%s] %s [%s%].',
+                    this.name,
+                    this.lang.curBright,
+                    this.cacheBright
+                  )
                 }
               }
             }
@@ -419,14 +437,20 @@ module.exports = class deviceLightRGBCCT {
                 this.service.updateCharacteristic(this.hapChar.Hue, this.cacheHue)
                 this.service.updateCharacteristic(this.hapChar.Saturation, 100)
                 if (params.updateSource && !this.disableDeviceLogging) {
-                  const label = this.cacheR + ' ' + this.cacheG + ' ' + this.cacheB
-                  this.log('[%s] %s [rgb %s].', this.name, this.messages.curColour, label)
+                  this.log(
+                    '[%s] %s [rgb %s].',
+                    this.name,
+                    this.lang.curColour,
+                    this.cacheR + ' ' + this.cacheG + ' ' + this.cacheB
+                  )
                 }
               }
             }
             if (params.updateSource && this.alController.isAdaptiveLightingActive()) {
               this.alController.disableAdaptiveLighting()
-              this.log('[%s] %s.', this.name, this.messages.disabledAL)
+              if (!this.disableDeviceLogging) {
+                this.log('[%s] %s.', this.name, this.lang.disabledAL)
+              }
             }
           }
           if (params.ltype === 'white' && params.white) {
@@ -438,8 +462,12 @@ module.exports = class deviceLightRGBCCT {
                   this.cacheBright
                 )
                 if (params.updateSource && !this.disableDeviceLogging) {
-                  const nb = this.cacheBright
-                  this.log('[%s] %s [%s%].', this.name, this.messages.curBright, nb)
+                  this.log(
+                    '[%s] %s [%s%].',
+                    this.name,
+                    this.lang.curBright,
+                    this.cacheBright
+                  )
                 }
               }
             }
@@ -462,13 +490,13 @@ module.exports = class deviceLightRGBCCT {
               )
               if (params.updateSource) {
                 if (!this.disableDeviceLogging) {
-                  this.log('[%s] %s [%sK].', this.name, this.messages.curColour, ctToK)
+                  this.log('[%s] %s [%sK].', this.name, this.lang.curColour, ctToK)
                 }
                 if (this.alController.isAdaptiveLightingActive() && ctDiff > 20) {
                   // Look for a variation greater than twenty
                   this.alController.disableAdaptiveLighting()
                   if (!this.disableDeviceLogging) {
-                    this.log('[%s] %s.', this.name, this.messages.disabledAL)
+                    this.log('[%s] %s.', this.name, this.lang.disabledAL)
                   }
                 }
               }
diff --git a/lib/device/light-rgb.js b/lib/device/light-rgb.js
index 2391455d..4384c059 100644
--- a/lib/device/light-rgb.js
+++ b/lib/device/light-rgb.js
@@ -12,7 +12,7 @@ module.exports = class deviceLightRGB {
     this.hapChar = platform.api.hap.Characteristic
     this.colourUtils = platform.colourUtils
     this.log = platform.log
-    this.messages = platform.messages
+    this.lang = platform.lang
     this.platform = platform
 
     // Set up variables from the accessory
@@ -56,7 +56,7 @@ module.exports = class deviceLightRGB {
     // Output the customised options to the log if in debug mode
     if (this.debug) {
       const opts = JSON.stringify({ disableDeviceLogging: this.disableDeviceLogging })
-      this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
+      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
     }
   }
 
@@ -78,7 +78,7 @@ module.exports = class deviceLightRGB {
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.cacheState = newValue
       if (!this.disableDeviceLogging) {
-        this.log('[%s] %s [%s].', this.name, this.messages.curState, this.cacheState)
+        this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
@@ -136,8 +136,12 @@ module.exports = class deviceLightRGB {
       this.cacheG = newRGB[1]
       this.cacheB = newRGB[2]
       if (!this.disableDeviceLogging) {
-        const label = this.cacheR + ' ' + this.cacheG + ' ' + this.cacheB
-        this.log('[%s] %s [rgb %s].', this.name, this.messages.curColour, label)
+        this.log(
+          '[%s] %s [rgb %s].',
+          this.name,
+          this.lang.curColour,
+          this.cacheR + ' ' + this.cacheG + ' ' + this.cacheB
+        )
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
@@ -161,7 +165,7 @@ module.exports = class deviceLightRGB {
           this.cacheState === 'on' ? 100 : 0
         )
         if (params.updateSource && !this.disableDeviceLogging) {
-          this.log('[%s] %s [%s].', this.name, this.messages.curState, this.cacheState)
+          this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
         }
       }
       let hs
@@ -192,8 +196,12 @@ module.exports = class deviceLightRGB {
             this.service.updateCharacteristic(this.hapChar.Saturation, 100)
             this.service.updateCharacteristic(this.hapChar.Brightness, 100)
             if (params.updateSource && !this.disableDeviceLogging) {
-              const label = this.cacheR + ' ' + this.cacheG + ' ' + this.cacheB
-              this.log('[%s] %s [rgb %s].', this.name, this.messages.curColour, label)
+              this.log(
+                '[%s] %s [rgb %s].',
+                this.name,
+                this.lang.curColour,
+                this.cacheR + ' ' + this.cacheG + ' ' + this.cacheB
+              )
             }
           }
         }
diff --git a/lib/device/motor.js b/lib/device/motor.js
index 8e58c3dd..8ff5801e 100644
--- a/lib/device/motor.js
+++ b/lib/device/motor.js
@@ -11,7 +11,7 @@ module.exports = class deviceMotor {
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
     this.log = platform.log
-    this.messages = platform.messages
+    this.lang = platform.lang
     this.platform = platform
 
     // Set up variables from the accessory
@@ -45,7 +45,7 @@ module.exports = class deviceMotor {
     // Output the customised options to the log if in debug mode
     if (this.debug) {
       const opts = JSON.stringify({ disableDeviceLogging: this.disableDeviceLogging })
-      this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
+      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
     }
   }
 
@@ -64,7 +64,7 @@ module.exports = class deviceMotor {
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.cachePos = value
       if (!this.disableDeviceLogging) {
-        this.log('[%s] %s [%s%].', this.name, this.messages.curPos, this.cachePos)
+        this.log('[%s] %s [%s%].', this.name, this.lang.curPos, this.cachePos)
       }
     } catch (err) {
       // Catch any errors and let the platform display them
@@ -98,7 +98,7 @@ module.exports = class deviceMotor {
           )
           this.service.updateCharacteristic(this.hapChar.PositionState, 2)
           if (!this.disableDeviceLogging) {
-            this.log('[%s] %s [%s%].', this.name, this.messages.curPos, this.cachePos)
+            this.log('[%s] %s [%s%].', this.name, this.lang.curPos, this.cachePos)
           }
         }
       }
diff --git a/lib/device/outlet-scm.js b/lib/device/outlet-scm.js
index e04c1d9d..b5fc86e8 100644
--- a/lib/device/outlet-scm.js
+++ b/lib/device/outlet-scm.js
@@ -11,7 +11,7 @@ module.exports = class deviceOutletSCM {
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
     this.log = platform.log
-    this.messages = platform.messages
+    this.lang = platform.lang
     this.platform = platform
 
     // Set up variables from the accessory
@@ -63,7 +63,7 @@ module.exports = class deviceOutletSCM {
         disableDeviceLogging: this.disableDeviceLogging,
         showAsSwitch: this.showAsSwitch
       })
-      this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
+      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
     }
   }
 
@@ -77,7 +77,7 @@ module.exports = class deviceOutletSCM {
       this.cacheState = newValue
       this.accessory.eveService.addEntry({ status: value ? 1 : 0 })
       if (!this.disableDeviceLogging) {
-        this.log('[%s] %s [%s].', this.name, this.messages.curState, this.cacheState)
+        this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
@@ -98,7 +98,7 @@ module.exports = class deviceOutletSCM {
       this.cacheState = params.switches[0].switch
       this.accessory.eveService.addEntry({ status: newStatus ? 1 : 0 })
       if (params.updateSource && !this.disableDeviceLogging) {
-        this.log('[%s] %s [%s].', this.name, this.messages.curState, this.cacheState)
+        this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
diff --git a/lib/device/outlet.js b/lib/device/outlet.js
index addcddd8..85524204 100644
--- a/lib/device/outlet.js
+++ b/lib/device/outlet.js
@@ -12,7 +12,7 @@ module.exports = class deviceOutlet {
     this.hapChar = platform.api.hap.Characteristic
     this.eveChar = platform.eveChar
     this.log = platform.log
-    this.messages = platform.messages
+    this.lang = platform.lang
     this.platform = platform
 
     // Set up variables from the accessory
@@ -131,7 +131,7 @@ module.exports = class deviceOutlet {
         inUsePowerThreshold: this.inUsePowerThreshold,
         pollingInterval: this.pollingInterval
       })
-      this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
+      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
     }
   }
 
@@ -143,7 +143,7 @@ module.exports = class deviceOutlet {
       })
       this.cacheState = newValue
       if (!this.disableDeviceLogging) {
-        this.log('[%s] %s [%s].', this.name, this.messages.curState, this.cacheState)
+        this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
@@ -169,7 +169,7 @@ module.exports = class deviceOutlet {
         this.service.updateCharacteristic(this.hapChar.On, params.switch === 'on')
         this.cacheState = params.switch
         if (params.updateSource && !this.disableDeviceLogging) {
-          this.log('[%s] %s [%s].', this.name, this.messages.curState, params.switch)
+          this.log('[%s] %s [%s].', this.name, this.lang.curState, params.switch)
         }
         if (!this.accessory.context.powerReadings) {
           this.service.updateCharacteristic(
@@ -214,13 +214,13 @@ module.exports = class deviceOutlet {
           '[%s] %s%s%s.',
           this.name,
           this.funcs.hasProperty(params, 'power')
-            ? ' ' + this.messages.curPower + ' [' + params.power + 'W]'
+            ? ' ' + this.lang.curPower + ' [' + params.power + 'W]'
             : '',
           this.funcs.hasProperty(params, 'voltage')
-            ? ' ' + this.messages.curVolt + ' [' + params.voltage + 'V]'
+            ? ' ' + this.lang.curVolt + ' [' + params.voltage + 'V]'
             : '',
           this.funcs.hasProperty(params, 'current')
-            ? ' ' + this.messages.curCurr + ' [' + params.current + 'A]'
+            ? ' ' + this.lang.curCurr + ' [' + params.current + 'A]'
             : ''
         )
       }
diff --git a/lib/device/rf-bridge.js b/lib/device/rf-bridge.js
index 45607536..8b23b13f 100644
--- a/lib/device/rf-bridge.js
+++ b/lib/device/rf-bridge.js
@@ -12,7 +12,7 @@ module.exports = class deviceRFBridge {
     this.hapChar = platform.api.hap.Characteristic
     this.eveChar = platform.eveChar
     this.log = platform.log
-    this.messages = platform.messages
+    this.lang = platform.lang
     this.platform = platform
 
     // Set up variables from the accessory
@@ -120,8 +120,8 @@ module.exports = class deviceRFBridge {
       this.log(
         '[%s] %s [%s].',
         this.name,
-        this.messages.curState,
-        this.messages.buttonTrig
+        this.lang.curState,
+        this.lang.buttonTrig
       )
       setTimeout(() => {
         this.accessory.getService(service).updateCharacteristic(this.hapChar.On, false)
@@ -163,15 +163,15 @@ module.exports = class deviceRFBridge {
             this.log(
               '[%s] %s [%s].',
               subAccessory.displayName,
-              this.messages.curState,
-              this.messages.buttonTrig
+              this.lang.curState,
+              this.lang.buttonTrig
             )
           }
           this.funcs.sleep(3000)
           subAccessory.getService(subAccessory.context.buttons[params.rfChl])
             .updateCharacteristic(this.hapChar.On, 0)
         } else {
-          throw new Error(this.messages.buttonNotFound)
+          throw new Error(this.lang.buttonNotFound)
         }
       } else if (
         (this.funcs.hasProperty(params, 'cmd') && params.cmd === 'trigger') ||
@@ -211,8 +211,8 @@ module.exports = class deviceRFBridge {
                     this.log(
                       '[%s] %s [%s].',
                       subAccessory.displayName,
-                      this.messages.curState,
-                      this.messages.buttonTrig
+                      this.lang.curState,
+                      this.lang.buttonTrig
                     )
                     return
                   case 'water':
@@ -263,8 +263,8 @@ module.exports = class deviceRFBridge {
                   this.log(
                     '[%s] %s [%s].',
                     subAccessory.displayName,
-                    this.messages.curState,
-                    this.messages.rfTrigYes
+                    this.lang.curState,
+                    this.lang.rfTrigYes
                   )
                 }
                 const updateKey = Math.random().toString(36).substr(2, 8)
@@ -279,13 +279,13 @@ module.exports = class deviceRFBridge {
                   this.log(
                     '[%s] %s [%s].',
                     subAccessory.displayName,
-                    this.messages.curState,
-                    this.messages.rfTrigNo
+                    this.lang.curState,
+                    this.lang.rfTrigNo
                   )
                 }
               }
             } else {
-              this.log.warn('[%s] %s [%s].', this.name, this.messages.rfNotFound, chan)
+              this.log.warn('[%s] %s [%s].', this.name, this.lang.rfNotFound, chan)
             }
           })
       }
diff --git a/lib/device/sensor-ambient.js b/lib/device/sensor-ambient.js
index c72ac343..71242cff 100644
--- a/lib/device/sensor-ambient.js
+++ b/lib/device/sensor-ambient.js
@@ -11,7 +11,7 @@ module.exports = class deviceSensorAmbient {
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
     this.log = platform.log
-    this.messages = platform.messages
+    this.lang = platform.lang
     this.platform = platform
 
     // Set up variables from the accessory
@@ -90,7 +90,7 @@ module.exports = class deviceSensorAmbient {
         hideSwitch: this.hideSwitch,
         offset: this.tempOffset
       })
-      this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
+      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
     }
   }
 
@@ -103,7 +103,7 @@ module.exports = class deviceSensorAmbient {
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.cacheState = newValue
       if (!this.disableDeviceLogging) {
-        this.log('[%s] %s [%s].', this.name, this.messages.curState, this.cacheState)
+        this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
@@ -126,7 +126,7 @@ module.exports = class deviceSensorAmbient {
           )
           this.accessory.eveService.addEntry({ status: this.cacheState === 'on' ? 1 : 0 })
           if (params.updateSource && !this.disableDeviceLogging) {
-            this.log('[%s] %s [%s].', this.name, this.messages.curState, this.cacheState)
+            this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
           }
         }
       }
@@ -144,7 +144,7 @@ module.exports = class deviceSensorAmbient {
             this.cacheTemp
           )
           if (params.updateSource && !this.disableDeviceLogging) {
-            this.log('[%s] %s [%s°C].', this.name, this.messages.curTemp, this.cacheTemp)
+            this.log('[%s] %s [%s°C].', this.name, this.lang.curTemp, this.cacheTemp)
           }
         }
       }
@@ -162,7 +162,7 @@ module.exports = class deviceSensorAmbient {
             this.cacheHumi
           )
           if (params.updateSource && !this.disableDeviceLogging) {
-            this.log('[%s] %s [%s%].', this.name, this.messages.curHumi, this.cacheHumi)
+            this.log('[%s] %s [%s%].', this.name, this.lang.curHumi, this.cacheHumi)
           }
         }
       }
diff --git a/lib/device/sensor-contact.js b/lib/device/sensor-contact.js
index c703891b..9ae1526c 100644
--- a/lib/device/sensor-contact.js
+++ b/lib/device/sensor-contact.js
@@ -12,7 +12,7 @@ module.exports = class deviceSensorContact {
     this.hapChar = platform.api.hap.Characteristic
     this.eveChar = platform.eveChar
     this.log = platform.log
-    this.messages = platform.messages
+    this.lang = platform.lang
     this.platform = platform
 
     // Set up variables from the accessory
@@ -68,7 +68,7 @@ module.exports = class deviceSensorContact {
         disableDeviceLogging: this.disableDeviceLogging,
         lowBattThreshold: this.lowBattThreshold
       })
-      this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
+      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
     }
   }
 
@@ -87,14 +87,14 @@ module.exports = class deviceSensorContact {
             this.cacheBatt < this.lowBattThreshold
           )
           if (params.updateSource && !this.disableDeviceLogging) {
-            this.log('[%s] %s [%s%].', this.name, this.messages.curBatt, this.cacheBatt)
+            this.log('[%s] %s [%s%].', this.name, this.lang.curBatt, this.cacheBatt)
           }
         }
       }
-      if (!params.switch || params.switch === this.cacheOnOff) {
+      if (!params.switch || params.switch === this.cacheState) {
         return
       }
-      this.cacheOnOff = params.switch
+      this.cacheState = params.switch
       const newState = params.switch === 'on' ? 1 : 0
       if (newState === 1) {
         this.service.updateCharacteristic(this.hapChar.ContactSensorState, 1)
@@ -114,8 +114,8 @@ module.exports = class deviceSensorContact {
         this.log(
           '[%s] %s [%s].',
           this.name,
-          this.messages.curState,
-          newState === 0 ? this.messages.contactYes : this.messages.contactNo
+          this.lang.curState,
+          newState === 0 ? this.lang.contactYes : this.lang.contactNo
         )
       }
       for (const [deviceId, group] of Object.entries(this.platform.simulations)) {
@@ -136,8 +136,8 @@ module.exports = class deviceSensorContact {
                   this.log(
                     '[%s] %s [%s].',
                     name,
-                    this.messages.curState,
-                    this.messages.doorClosed
+                    this.lang.curState,
+                    this.lang.doorClosed
                   )
                 }
                 break
@@ -149,8 +149,8 @@ module.exports = class deviceSensorContact {
                   this.log(
                     '[%s] %s [%s].',
                     name,
-                    this.messages.curState,
-                    this.messages.doorOpen
+                    this.lang.curState,
+                    this.lang.doorOpen
                   )
                 }
                 break
diff --git a/lib/device/sensor-temp-humi.js b/lib/device/sensor-temp-humi.js
index 78742967..cb713d16 100644
--- a/lib/device/sensor-temp-humi.js
+++ b/lib/device/sensor-temp-humi.js
@@ -11,7 +11,7 @@ module.exports = class deviceSensorTempHumi {
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
     this.log = platform.log
-    this.messages = platform.messages
+    this.lang = platform.lang
     this.platform = platform
 
     // Set up variables from the accessory
@@ -52,7 +52,7 @@ module.exports = class deviceSensorTempHumi {
         disableDeviceLogging: this.disableDeviceLogging,
         offset: this.tempOffset
       })
-      this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
+      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
     }
   }
 
@@ -69,7 +69,7 @@ module.exports = class deviceSensorTempHumi {
             this.cacheTemp
           )
           if (params.updateSource && !this.disableDeviceLogging) {
-            this.log('[%s] %s [%s°C].', this.name, this.messages.curTemp, this.cacheTemp)
+            this.log('[%s] %s [%s°C].', this.name, this.lang.curTemp, this.cacheTemp)
           }
         }
       }
@@ -83,7 +83,7 @@ module.exports = class deviceSensorTempHumi {
             this.cacheHumi
           )
           if (params.updateSource && !this.disableDeviceLogging) {
-            this.log('[%s] %s [%s%].', this.name, this.messages.curHumi, this.cacheHumi)
+            this.log('[%s] %s [%s%].', this.name, this.lang.curHumi, this.cacheHumi)
           }
         }
       }
diff --git a/lib/device/simulation/blind.js b/lib/device/simulation/blind.js
index 31a7f4a9..45b808a0 100644
--- a/lib/device/simulation/blind.js
+++ b/lib/device/simulation/blind.js
@@ -11,7 +11,7 @@ module.exports = class deviceBlind {
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
     this.log = platform.log
-    this.messages = platform.messages
+    this.lang = platform.lang
     this.platform = platform
 
     // Set up variables from the accessory
@@ -46,7 +46,7 @@ module.exports = class deviceBlind {
     // Add the set handler to the target position characteristic
     this.service.getCharacteristic(this.hapChar.TargetPosition).onSet(value => {
       // We don't use await as we want the callback to be run straight away
-      this.internalUpdate(value)
+      this.internalPositionUpdate(value)
     })
 
     // Output the customised options to the log if in debug mode
@@ -57,11 +57,11 @@ module.exports = class deviceBlind {
         operationTimeUp: this.operationTimeUp,
         type: deviceConf.type
       })
-      this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
+      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
     }
   }
 
-  async internalUpdate (value) {
+  async internalPositionUpdate (value) {
     try {
       let prevPosition = this.accessory.context.cacheCurrentPosition
       if (value === prevPosition) {
@@ -124,7 +124,7 @@ module.exports = class deviceBlind {
       this.accessory.context.cachePositionState = 2
       this.accessory.context.cacheCurrentPosition = value
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current position [%s%]', this.name, value)
+        this.log('[%s] %s [%s%]', this.name, this.lang.curPos, value)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
diff --git a/lib/device/simulation/door.js b/lib/device/simulation/door.js
index 3c78e98f..7e5e3810 100644
--- a/lib/device/simulation/door.js
+++ b/lib/device/simulation/door.js
@@ -11,7 +11,7 @@ module.exports = class deviceDoor {
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
     this.log = platform.log
-    this.messages = platform.messages
+    this.lang = platform.lang
     this.platform = platform
 
     // Set up variables from the accessory
@@ -46,7 +46,7 @@ module.exports = class deviceDoor {
     // Add the set handler to the target position characteristic
     this.service.getCharacteristic(this.hapChar.TargetPosition).onSet(value => {
       // We don't use await as we want the callback to be run straight away
-      this.internalUpdate(value)
+      this.internalPositionUpdate(value)
     })
 
     // Output the customised options to the log if in debug mode
@@ -57,11 +57,11 @@ module.exports = class deviceDoor {
         operationTimeUp: this.operationTimeUp,
         type: deviceConf.type
       })
-      this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
+      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
     }
   }
 
-  async internalUpdate (value) {
+  async internalPositionUpdate (value) {
     try {
       let prevPosition = this.accessory.context.cacheCurrentPosition
       if (value === prevPosition) {
@@ -124,7 +124,7 @@ module.exports = class deviceDoor {
       this.accessory.context.cachePositionState = 2
       this.accessory.context.cacheCurrentPosition = value
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current position [%s%]', this.name, value)
+        this.log('[%s] %s [%s%]', this.name, this.lang.curPos, value)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
diff --git a/lib/device/simulation/garage-eachen.js b/lib/device/simulation/garage-eachen.js
index 73d97f94..8d2aead9 100644
--- a/lib/device/simulation/garage-eachen.js
+++ b/lib/device/simulation/garage-eachen.js
@@ -12,7 +12,7 @@ module.exports = class deviceGarageEachen {
     this.hapChar = platform.api.hap.Characteristic
     this.eveChar = platform.eveChar
     this.log = platform.log
-    this.messages = platform.messages
+    this.lang = platform.lang
     this.platform = platform
 
     // Set up variables from the accessory
@@ -66,7 +66,7 @@ module.exports = class deviceGarageEachen {
     // Add the set handler to the target position characteristic
     this.service.getCharacteristic(this.hapChar.TargetDoorState).onSet(value => {
       // We don't use await as we want the callback to be run straight away
-      this.internalUpdate(value)
+      this.internalStateUpdate(value)
     })
 
     // Update the obstruction detected to false on Homebridge restart
@@ -84,11 +84,11 @@ module.exports = class deviceGarageEachen {
         operationTime: this.operationTime,
         type: deviceConf.type
       })
-      this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
+      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
     }
   }
 
-  async internalUpdate (value) {
+  async internalStateUpdate (value) {
     try {
       const params = { switch: value === 0 ? 'on' : 'off' }
       const curState = this.service.getCharacteristic(this.hapChar.CurrentDoorState).value
@@ -114,7 +114,7 @@ module.exports = class deviceGarageEachen {
         await this.funcs.sleep(Math.max((this.operationTime - 20) * 100, 0))
         this.service.updateCharacteristic(this.hapChar.CurrentDoorState, 0)
         if (!this.disableDeviceLogging) {
-          this.log('[%s] current state [open].', this.name)
+          this.log('[%s] %s [%s].', this.name, this.lang.curState, this.lang.doorOpen)
         }
       }
     } catch (err) {
@@ -165,9 +165,10 @@ module.exports = class deviceGarageEachen {
       }
       if (params.updateSource && !this.disableDeviceLogging) {
         this.log(
-          '[%s] current state [%s].',
+          '[%s] %s [%s].',
           this.name,
-          params.switch === 'on' ? 'open' : 'closed'
+          this.lang.curState,
+          params.switch === 'on' ? this.lang.doorOpen : this.lang.doorClosed
         )
       }
     } catch (err) {
diff --git a/lib/device/simulation/garage-four.js b/lib/device/simulation/garage-four.js
index cbd38d00..f7eccb36 100644
--- a/lib/device/simulation/garage-four.js
+++ b/lib/device/simulation/garage-four.js
@@ -11,7 +11,7 @@ module.exports = class deviceGarageFour {
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
     this.log = platform.log
-    this.messages = platform.messages
+    this.lang = platform.lang
     this.platform = platform
 
     // Set up variables from the accessory
@@ -56,7 +56,7 @@ module.exports = class deviceGarageFour {
       // Add the set handler to the target position characteristic
       gdService.getCharacteristic(this.hapChar.TargetDoorState).onSet(value => {
         // We don't use await as we want the callback to be run straight away
-        this.internalUpdate(v, value)
+        this.internalStateUpdate(v, value)
       })
     })
 
@@ -68,11 +68,11 @@ module.exports = class deviceGarageFour {
         operationTimeUp: this.operationTimeUp,
         type: deviceConf.type
       })
-      this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
+      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
     }
   }
 
-  async internalUpdate (garage, value) {
+  async internalStateUpdate (garage, value) {
     try {
       let garageChannel
       switch (garage) {
@@ -99,7 +99,7 @@ module.exports = class deviceGarageFour {
       const updateKey = Math.random().toString(36).substr(2, 8)
       this.updateKey = updateKey
       gdService.updateCharacteristic(this.hapChar.TargetDoorState, value)
-        .updateCharacteristic(this.hapChar.CurrentDoorState, value + 2)
+      gdService.updateCharacteristic(this.hapChar.CurrentDoorState, value + 2)
       this.accessory.context.cacheStates[garageChannel].cacheTargetDoorState = value
       this.accessory.context.cacheStates[garageChannel].cacheCurrentDoorState = value + 2
       const params = {
@@ -120,9 +120,11 @@ module.exports = class deviceGarageFour {
       this.accessory.context.cacheStates[garageChannel].cacheCurrentDoorState = value
       if (!this.disableDeviceLogging) {
         this.log(
-          '[%s] current state [garage %s %s].',
-          this.name, garageChannel,
-          value === 0 ? 'open' : 'closed'
+          '[%s] %s [garage %s %s].',
+          this.name,
+          this.lang.curState,
+          garageChannel,
+          value === 0 ? this.lang.doorOpen : this.lang.doorClosed
         )
       }
     } catch (err) {
diff --git a/lib/device/simulation/garage-od-switch.js b/lib/device/simulation/garage-od-switch.js
index 7d13edee..1db2688b 100644
--- a/lib/device/simulation/garage-od-switch.js
+++ b/lib/device/simulation/garage-od-switch.js
@@ -11,7 +11,7 @@ module.exports = class deviceGarageODSwitch {
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
     this.log = platform.log
-    this.messages = platform.messages
+    this.lang = platform.lang
     this.platform = platform
 
     // Set up variables from the accessory
@@ -43,21 +43,21 @@ module.exports = class deviceGarageODSwitch {
     // Output the customised options to the log if in debug mode
     if (this.debug) {
       const opts = JSON.stringify({ disableDeviceLogging: this.disableDeviceLogging })
-      this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
+      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
     }
   }
 
   async externalUpdate (params) {
     try {
-      if (!params.switch || params.switch === this.cacheOnOff) {
+      if (!params.switch || params.switch === this.cacheState) {
         return
       }
       const newStatus = params.switch === 'on'
       this.service.updateCharacteristic(this.hapChar.On, newStatus)
       this.gService.updateCharacteristic(this.hapChar.ObstructionDetected, newStatus)
-      this.cacheOnOff = params.switch
+      this.cacheState = params.switch
       if (params.updateSource && !this.disableDeviceLogging) {
-        this.log('[%s] current state [%s].', this.name, this.cacheOnOff)
+        this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
diff --git a/lib/device/simulation/garage-one.js b/lib/device/simulation/garage-one.js
index d44a86c7..7b6e0880 100644
--- a/lib/device/simulation/garage-one.js
+++ b/lib/device/simulation/garage-one.js
@@ -12,7 +12,7 @@ module.exports = class deviceGarageOne {
     this.hapChar = platform.api.hap.Characteristic
     this.eveChar = platform.eveChar
     this.log = platform.log
-    this.messages = platform.messages
+    this.lang = platform.lang
     this.platform = platform
 
     // Set up variables from the accessory
@@ -116,7 +116,7 @@ module.exports = class deviceGarageOne {
         setup: this.setup,
         type: deviceConf.type
       })
-      this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
+      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
     }
   }
 
diff --git a/lib/device/simulation/garage-two.js b/lib/device/simulation/garage-two.js
index d39a0c02..d1555c16 100644
--- a/lib/device/simulation/garage-two.js
+++ b/lib/device/simulation/garage-two.js
@@ -11,7 +11,7 @@ module.exports = class deviceGarageTwo {
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
     this.log = platform.log
-    this.messages = platform.messages
+    this.lang = platform.lang
     this.platform = platform
 
     // Set up variables from the accessory
@@ -66,7 +66,7 @@ module.exports = class deviceGarageTwo {
         operationTimeUp: this.operationTimeUp,
         type: deviceConf.type
       })
-      this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
+      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
     }
   }
 
diff --git a/lib/device/simulation/lock-one.js b/lib/device/simulation/lock-one.js
index 297d4682..eeade651 100644
--- a/lib/device/simulation/lock-one.js
+++ b/lib/device/simulation/lock-one.js
@@ -11,7 +11,7 @@ module.exports = class deviceLockOne {
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
     this.log = platform.log
-    this.messages = platform.messages
+    this.lang = platform.lang
     this.platform = platform
 
     // Set up variables from the accessory
@@ -60,7 +60,7 @@ module.exports = class deviceLockOne {
         setup: this.setup,
         type: deviceConf.type
       })
-      this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
+      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
     }
   }
 
diff --git a/lib/device/simulation/sensor-leak.js b/lib/device/simulation/sensor-leak.js
index a0526c03..b018b74e 100644
--- a/lib/device/simulation/sensor-leak.js
+++ b/lib/device/simulation/sensor-leak.js
@@ -12,7 +12,7 @@ module.exports = class deviceSensorLeak {
     this.hapChar = platform.api.hap.Characteristic
     this.eveChar = platform.eveChar
     this.log = platform.log
-    this.messages = platform.messages
+    this.lang = platform.lang
     this.platform = platform
 
     // Set up variables from the accessory
@@ -58,7 +58,7 @@ module.exports = class deviceSensorLeak {
         lowBattThreshold: this.lowBattThreshold,
         type: deviceConf.type
       })
-      this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
+      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
     }
   }
 
diff --git a/lib/device/simulation/switch-valve.js b/lib/device/simulation/switch-valve.js
index 736b63dc..cd31ddb6 100644
--- a/lib/device/simulation/switch-valve.js
+++ b/lib/device/simulation/switch-valve.js
@@ -11,7 +11,7 @@ module.exports = class deviceSwitchValve {
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
     this.log = platform.log
-    this.messages = platform.messages
+    this.lang = platform.lang
     this.platform = platform
 
     // Set up variables from the accessory
@@ -78,7 +78,7 @@ module.exports = class deviceSwitchValve {
         disableDeviceLogging: this.disableDeviceLogging,
         type: deviceConf.type
       })
-      this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
+      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
     }
   }
 
diff --git a/lib/device/simulation/tap-one.js b/lib/device/simulation/tap-one.js
index 28e7a8a8..1139e1b9 100644
--- a/lib/device/simulation/tap-one.js
+++ b/lib/device/simulation/tap-one.js
@@ -11,7 +11,7 @@ module.exports = class deviceTapOne {
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
     this.log = platform.log
-    this.messages = platform.messages
+    this.lang = platform.lang
     this.platform = platform
 
     // Set up variables from the accessory
@@ -56,7 +56,7 @@ module.exports = class deviceTapOne {
         setup: this.setup,
         type: deviceConf.type
       })
-      this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
+      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
     }
   }
 
diff --git a/lib/device/simulation/tap-two.js b/lib/device/simulation/tap-two.js
index 88463f8a..94f9e306 100644
--- a/lib/device/simulation/tap-two.js
+++ b/lib/device/simulation/tap-two.js
@@ -11,7 +11,7 @@ module.exports = class deviceTapTwo {
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
     this.log = platform.log
-    this.messages = platform.messages
+    this.lang = platform.lang
     this.platform = platform
 
     // Set up variables from the accessory
@@ -48,7 +48,7 @@ module.exports = class deviceTapTwo {
         disableDeviceLogging: this.disableDeviceLogging,
         type: deviceConf.type
       })
-      this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
+      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
     }
   }
 
diff --git a/lib/device/simulation/thermostat.js b/lib/device/simulation/thermostat.js
index 4ee1f342..36c1192a 100644
--- a/lib/device/simulation/thermostat.js
+++ b/lib/device/simulation/thermostat.js
@@ -11,7 +11,7 @@ module.exports = class deviceThermostat {
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
     this.log = platform.log
-    this.messages = platform.messages
+    this.lang = platform.lang
     this.platform = platform
 
     // Set up variables from the accessory
@@ -121,7 +121,7 @@ module.exports = class deviceThermostat {
         offset: this.tempOffset,
         type: deviceConf2.type
       })
-      this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
+      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
     }
   }
 
diff --git a/lib/device/simulation/valve-four.js b/lib/device/simulation/valve-four.js
index 95101be1..651d51d5 100644
--- a/lib/device/simulation/valve-four.js
+++ b/lib/device/simulation/valve-four.js
@@ -11,7 +11,7 @@ module.exports = class deviceValveFour {
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
     this.log = platform.log
-    this.messages = platform.messages
+    this.lang = platform.lang
     this.platform = platform
 
     // Set up variables from the accessory
@@ -72,7 +72,7 @@ module.exports = class deviceValveFour {
         disableDeviceLogging: this.disableDeviceLogging,
         type: deviceConf.type
       })
-      this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
+      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
     }
   }
 
diff --git a/lib/device/simulation/valve-one.js b/lib/device/simulation/valve-one.js
index c831e997..c6278b4c 100644
--- a/lib/device/simulation/valve-one.js
+++ b/lib/device/simulation/valve-one.js
@@ -11,7 +11,7 @@ module.exports = class deviceValveOne {
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
     this.log = platform.log
-    this.messages = platform.messages
+    this.lang = platform.lang
     this.platform = platform
 
     // Set up variables from the accessory
@@ -76,7 +76,7 @@ module.exports = class deviceValveOne {
         setup: this.setup,
         type: deviceConf.type
       })
-      this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
+      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
     }
   }
 
diff --git a/lib/device/simulation/valve-two.js b/lib/device/simulation/valve-two.js
index 6f88baca..d67717e8 100644
--- a/lib/device/simulation/valve-two.js
+++ b/lib/device/simulation/valve-two.js
@@ -11,7 +11,7 @@ module.exports = class deviceValveTwo {
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
     this.log = platform.log
-    this.messages = platform.messages
+    this.lang = platform.lang
     this.platform = platform
 
     // Set up variables from the accessory
@@ -72,7 +72,7 @@ module.exports = class deviceValveTwo {
         disableDeviceLogging: this.disableDeviceLogging,
         type: deviceConf.type
       })
-      this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
+      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
     }
   }
 
diff --git a/lib/device/simulation/window.js b/lib/device/simulation/window.js
index 78ab84a2..629a6175 100644
--- a/lib/device/simulation/window.js
+++ b/lib/device/simulation/window.js
@@ -11,7 +11,7 @@ module.exports = class deviceWindow {
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
     this.log = platform.log
-    this.messages = platform.messages
+    this.lang = platform.lang
     this.platform = platform
 
     // Set up variables from the accessory
@@ -46,7 +46,7 @@ module.exports = class deviceWindow {
     // Add the set handler to the target position characteristic
     this.service.getCharacteristic(this.hapChar.TargetPosition).onSet(value => {
       // We don't use await as we want the callback to be run straight away
-      this.internalUpdate(value)
+      this.internalPositionUpdate(value)
     })
 
     // Output the customised options to the log if in debug mode
@@ -57,11 +57,11 @@ module.exports = class deviceWindow {
         operationTimeUp: this.operationTimeUp,
         type: deviceConf.type
       })
-      this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
+      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
     }
   }
 
-  async internalUpdate (value) {
+  async internalPositionUpdate (value) {
     try {
       let prevPosition = this.accessory.context.cacheCurrentPosition
       if (value === prevPosition) {
@@ -124,7 +124,7 @@ module.exports = class deviceWindow {
       this.accessory.context.cachePositionState = 2
       this.accessory.context.cacheCurrentPosition = value
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current position [%s%]', this.name, value)
+        this.log('[%s] %s [%s%]', this.name, this.lang.curPos, value)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
diff --git a/lib/device/switch-double.js b/lib/device/switch-double.js
index fe4592b2..88138812 100644
--- a/lib/device/switch-double.js
+++ b/lib/device/switch-double.js
@@ -11,7 +11,7 @@ module.exports = class deviceSwitchMulti {
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
     this.log = platform.log
-    this.messages = platform.messages
+    this.lang = platform.lang
     this.platform = platform
 
     // Set up variables from the accessory
@@ -66,7 +66,7 @@ module.exports = class deviceSwitchMulti {
         hideChannels: this.hideChannels,
         showAsOutlet: this.showAsOutlet
       })
-      this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
+      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
     }
   }
 
@@ -112,9 +112,12 @@ module.exports = class deviceSwitchMulti {
               }
               subAccessory.eveService.addEntry({ status: value ? 1 : 0 })
               if (i > 0 && !this.disableDeviceLogging) {
-                const name = subAccessory.displayName
-                const label = value ? 'on' : 'off'
-                this.log('[%s] %s [%s].', name, this.messages.curState, label)
+                this.log(
+                  '[%s] %s [%s].',
+                  subAccessory.displayName,
+                  this.lang.curState,
+                  value ? 'on' : 'off'
+                )
               }
             }
           }
@@ -146,7 +149,7 @@ module.exports = class deviceSwitchMulti {
                   this.log(
                     '[%s] %s [%s].',
                     subAccessory.displayName,
-                    this.messages.curState,
+                    this.lang.curState,
                     value ? 'on' : 'off'
                   )
                 }
@@ -229,7 +232,7 @@ module.exports = class deviceSwitchMulti {
             this.log(
               '[%s] %s [%s].',
               subAccessory.displayName,
-              this.messages.curState,
+              this.lang.curState,
               params.switches[i - 1].switch
             )
           }
diff --git a/lib/device/switch-multi.js b/lib/device/switch-multi.js
index 1677a0f8..f1c04966 100644
--- a/lib/device/switch-multi.js
+++ b/lib/device/switch-multi.js
@@ -11,7 +11,7 @@ module.exports = class deviceSwitchMulti {
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
     this.log = platform.log
-    this.messages = platform.messages
+    this.lang = platform.lang
     this.platform = platform
 
     // Set up variables from the accessory
@@ -66,7 +66,7 @@ module.exports = class deviceSwitchMulti {
         hideChannels: this.hideChannels,
         showAsOutlet: this.showAsOutlet
       })
-      this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
+      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
     }
   }
 
@@ -116,9 +116,12 @@ module.exports = class deviceSwitchMulti {
               }
               subAccessory.eveService.addEntry({ status: value ? 1 : 0 })
               if (i > 0 && !this.disableDeviceLogging) {
-                const name = subAccessory.displayName
-                const label = value ? 'on' : 'off'
-                this.log('[%s] %s [%s].', name, this.messages.curState, label)
+                this.log(
+                  '[%s] %s [%s].',
+                  subAccessory.displayName,
+                  this.lang.curState,
+                  value ? 'on' : 'off'
+                )
               }
             }
           }
@@ -152,7 +155,7 @@ module.exports = class deviceSwitchMulti {
                   this.log(
                     '[%s] %s [%s].',
                     subAccessory.displayName,
-                    this.messages.curState,
+                    this.lang.curState,
                     value ? 'on' : 'off'
                   )
                 }
@@ -235,7 +238,7 @@ module.exports = class deviceSwitchMulti {
             this.log(
               '[%s] %s [%s].',
               subAccessory.displayName,
-              this.messages.curState,
+              this.lang.curState,
               params.switches[i - 1].switch
             )
           }
diff --git a/lib/device/switch-single.js b/lib/device/switch-single.js
index ef5465b7..3d6301a0 100644
--- a/lib/device/switch-single.js
+++ b/lib/device/switch-single.js
@@ -11,7 +11,7 @@ module.exports = class deviceSwitchSingle {
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
     this.log = platform.log
-    this.messages = platform.messages
+    this.lang = platform.lang
     this.platform = platform
 
     // Set up variables from the accessory
@@ -47,7 +47,7 @@ module.exports = class deviceSwitchSingle {
     // Output the customised options to the log if in debug mode
     if (this.debug) {
       const opts = JSON.stringify({ disableDeviceLogging: this.disableDeviceLogging })
-      this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
+      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
     }
   }
 
@@ -60,7 +60,7 @@ module.exports = class deviceSwitchSingle {
       this.cacheState = newValue
       this.accessory.eveService.addEntry({ status: value ? 1 : 0 })
       if (!this.disableDeviceLogging) {
-        this.log('[%s] %s [%s].', this.name, this.messages.curState, this.cacheState)
+        this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
@@ -81,7 +81,7 @@ module.exports = class deviceSwitchSingle {
       this.cacheState = params.switch
       this.accessory.eveService.addEntry({ status: newStatus ? 1 : 0 })
       if (params.updateSource && !this.disableDeviceLogging) {
-        this.log('[%s] %s [%s].', this.name, this.messages.curState, this.cacheState)
+        this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
diff --git a/lib/device/template.js b/lib/device/template.js
index d461129c..218d66b8 100644
--- a/lib/device/template.js
+++ b/lib/device/template.js
@@ -11,7 +11,7 @@ module.exports = class deviceTemplate {
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
     this.log = platform.log
-    this.messages = platform.messages
+    this.lang = platform.lang
     this.platform = platform
 
     // Set up variables from the accessory
diff --git a/lib/device/thermostat.js b/lib/device/thermostat.js
index f299f7d1..e0c19ce2 100644
--- a/lib/device/thermostat.js
+++ b/lib/device/thermostat.js
@@ -11,7 +11,7 @@ module.exports = class deviceThermostat {
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
     this.log = platform.log
-    this.messages = platform.messages
+    this.lang = platform.lang
     this.platform = platform
 
     // Set up variables from the accessory
@@ -90,7 +90,7 @@ module.exports = class deviceThermostat {
         disableDeviceLogging: this.disableDeviceLogging,
         offset: this.tempOffset
       })
-      this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
+      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
     }
   }
 
@@ -106,7 +106,7 @@ module.exports = class deviceThermostat {
       }
       this.cacheState = newValue
       if (!this.disableDeviceLogging) {
-        this.log('[%s] %s [%s].', this.name, this.messages.curState, this.cacheState)
+        this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
@@ -130,7 +130,7 @@ module.exports = class deviceThermostat {
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.cacheTarg = value
       if (!this.disableDeviceLogging) {
-        this.log('[%s] %s [%s°C].', this.name, this.messages.curTarg, this.cacheTarg)
+        this.log('[%s] %s [%s°C].', this.name, this.lang.curTarg, this.cacheTarg)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
@@ -156,7 +156,7 @@ module.exports = class deviceThermostat {
           this.cacheState === 'on' ? 1 : 0
         )
         if (params.updateSource && !this.disableDeviceLogging) {
-          this.log('[%s] %s [%s].', this.name, this.messages.curState, this.cacheState)
+          this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
         }
       }
 
@@ -169,7 +169,7 @@ module.exports = class deviceThermostat {
             this.cacheHeat === 'on' ? 1 : 0
           )
           if (params.updateSource && !this.disableDeviceLogging) {
-            this.log('[%s] %s [%s].', this.name, this.messages.curHeat, this.cacheHeat)
+            this.log('[%s] %s [%s].', this.name, this.lang.curHeat, this.cacheHeat)
           }
         }
       }
@@ -183,7 +183,7 @@ module.exports = class deviceThermostat {
             this.cacheTarg
           )
           if (params.updateSource && !this.disableDeviceLogging) {
-            this.log('[%s] %s [%s°C].', this.name, this.messages.curTarg, this.cacheTarg)
+            this.log('[%s] %s [%s°C].', this.name, this.lang.curTarg, this.cacheTarg)
           }
         }
       }
@@ -207,7 +207,7 @@ module.exports = class deviceThermostat {
             this.cacheTemp
           )
           if (params.updateSource && !this.disableDeviceLogging) {
-            this.log('[%s] %s [%s°C].', this.name, this.messages.curTemp, this.cacheTemp)
+            this.log('[%s] %s [%s°C].', this.name, this.lang.curTemp, this.cacheTemp)
           }
         }
         this.accessory.eveService.addEntry({ temp: currentTemp })
diff --git a/lib/device/zigbee/light-cct.js b/lib/device/zigbee/light-cct.js
index f4072895..6fbfeb1b 100644
--- a/lib/device/zigbee/light-cct.js
+++ b/lib/device/zigbee/light-cct.js
@@ -11,7 +11,7 @@ module.exports = class deviceZBLightCCT {
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
     this.log = platform.log
-    this.messages = platform.messages
+    this.lang = platform.lang
     this.platform = platform
 
     // Set up variables from the accessory
@@ -81,7 +81,7 @@ module.exports = class deviceZBLightCCT {
         brightnessStep: this.brightStep,
         disableDeviceLogging: this.disableDeviceLogging
       })
-      this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
+      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
     }
   }
 
@@ -93,7 +93,7 @@ module.exports = class deviceZBLightCCT {
       })
       this.cacheState = newValue
       if (!this.disableDeviceLogging) {
-        this.log('[%s] %s [%s].', this.name, this.messages.curState, this.cacheState)
+        this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
@@ -122,7 +122,7 @@ module.exports = class deviceZBLightCCT {
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.cacheBright = value
       if (!this.disableDeviceLogging) {
-        this.log('[%s] %s [%s%].', this.name, this.messages.curBright, this.cacheBright)
+        this.log('[%s] %s [%s%].', this.name, this.lang.curBright, this.cacheBright)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
@@ -162,12 +162,12 @@ module.exports = class deviceZBLightCCT {
           this.log(
             '[%s] %s [%sK] %s.',
             this.name,
-            this.messages.curColour,
+            this.lang.curColour,
             scaledK,
-            this.messages.viaAL
+            this.lang.viaAL
           )
         } else {
-          this.log('[%s] %s [%sK].', this.name, this.messages.curColour, scaledK)
+          this.log('[%s] %s [%sK].', this.name, this.lang.curColour, scaledK)
         }
       }
     } catch (err) {
@@ -185,7 +185,7 @@ module.exports = class deviceZBLightCCT {
         this.cacheState = params.switch
         this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
         if (params.updateSource && !this.disableDeviceLogging) {
-          this.log('[%s] %s [%s].', this.name, this.messages.curState, this.cacheState)
+          this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
         }
       }
       if (this.funcs.hasProperty(params, 'brightness')) {
@@ -193,8 +193,7 @@ module.exports = class deviceZBLightCCT {
           this.cacheBright = params.brightness
           this.service.updateCharacteristic(this.hapChar.Brightness, this.cacheBright)
           if (params.updateSource && !this.disableDeviceLogging) {
-            const nb = this.cacheBright
-            this.log('[%s] %s [%s%].', this.name, this.messages.curBright, nb)
+            this.log('[%s] %s [%s%].', this.name, this.lang.curBright, this.cacheBright)
           }
         }
       }
@@ -211,12 +210,14 @@ module.exports = class deviceZBLightCCT {
           )
           if (params.updateSource) {
             if (!this.disableDeviceLogging) {
-              this.log('[%s] %s [%sK].', this.name, this.messages.curColour, scaledK)
+              this.log('[%s] %s [%sK].', this.name, this.lang.curColour, scaledK)
             }
             if (this.alController.isAdaptiveLightingActive() && ctDiff > 20) {
               // Look for a variation greater than twenty
               this.alController.disableAdaptiveLighting()
-              this.log('[%s] %s.', this.name, this.messages.disabledAL)
+              if (!this.disableDeviceLogging) {
+                this.log('[%s] %s.', this.name, this.lang.disabledAL)
+              }
             }
           }
         }
diff --git a/lib/device/zigbee/light-dimmer.js b/lib/device/zigbee/light-dimmer.js
index 6722f3cb..6db48fd0 100644
--- a/lib/device/zigbee/light-dimmer.js
+++ b/lib/device/zigbee/light-dimmer.js
@@ -11,7 +11,7 @@ module.exports = class deviceZBLightDimmer {
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
     this.log = platform.log
-    this.messages = platform.messages
+    this.lang = platform.lang
     this.platform = platform
 
     // Set up variables from the accessory
@@ -58,7 +58,7 @@ module.exports = class deviceZBLightDimmer {
         brightnessStep: this.brightStep,
         disableDeviceLogging: this.disableDeviceLogging
       })
-      this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
+      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
     }
   }
 
@@ -70,7 +70,7 @@ module.exports = class deviceZBLightDimmer {
       })
       this.cacheState = newValue
       if (!this.disableDeviceLogging) {
-        this.log('[%s] %s [%s].', this.name, this.messages.curState, this.cacheState)
+        this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
@@ -99,7 +99,7 @@ module.exports = class deviceZBLightDimmer {
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.cacheBright = value
       if (!this.disableDeviceLogging) {
-        this.log('[%s] %s [%s%].', this.name, this.messages.curBright, this.cacheBright)
+        this.log('[%s] %s [%s%].', this.name, this.lang.curBright, this.cacheBright)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
@@ -116,7 +116,7 @@ module.exports = class deviceZBLightDimmer {
         this.cacheState = params.switch
         this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
         if (params.updateSource && !this.disableDeviceLogging) {
-          this.log('[%s] %s [%s].', this.name, this.messages.curState, this.cacheState)
+          this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
         }
       }
       if (this.funcs.hasProperty(params, 'brightness')) {
@@ -124,8 +124,7 @@ module.exports = class deviceZBLightDimmer {
           this.cacheBright = params.brightness
           this.service.updateCharacteristic(this.hapChar.Brightness, this.cacheBright)
           if (params.updateSource && !this.disableDeviceLogging) {
-            const nb = this.cacheBright
-            this.log('[%s] %s [%s%].', this.name, this.messages.curBright, nb)
+            this.log('[%s] %s [%s%].', this.name, this.lang.curBright, this.cacheBright)
           }
         }
       }
diff --git a/lib/device/zigbee/sensor-ambient.js b/lib/device/zigbee/sensor-ambient.js
index f46c2ac5..d116f8c2 100644
--- a/lib/device/zigbee/sensor-ambient.js
+++ b/lib/device/zigbee/sensor-ambient.js
@@ -11,7 +11,7 @@ module.exports = class deviceZBSensorAmbient {
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
     this.log = platform.log
-    this.messages = platform.messages
+    this.lang = platform.lang
     this.platform = platform
 
     // Set up variables from the accessory
@@ -56,7 +56,7 @@ module.exports = class deviceZBSensorAmbient {
         disableDeviceLogging: this.disableDeviceLogging,
         lowBattThreshold: this.lowBattThreshold
       })
-      this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
+      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
     }
   }
 
@@ -73,7 +73,7 @@ module.exports = class deviceZBSensorAmbient {
           this.cacheBatt < this.lowBattThreshold
         )
         if (params.updateSource && !this.disableDeviceLogging) {
-          this.log('[%s] %s [%s%].', this.name, this.messages.curBatt, this.cacheBatt)
+          this.log('[%s] %s [%s%].', this.name, this.lang.curBatt, this.cacheBatt)
         }
       }
       const eveLog = {}
@@ -86,7 +86,7 @@ module.exports = class deviceZBSensorAmbient {
         this.tService.updateCharacteristic(this.hapChar.CurrentTemperature, currentTemp)
         eveLog.temp = currentTemp
         if (params.updateSource && !this.disableDeviceLogging) {
-          this.log('[%s] %s [%s].', this.name, this.messages.curTemp, currentTemp)
+          this.log('[%s] %s [%s].', this.name, this.lang.curTemp, currentTemp)
         }
       }
       if (
@@ -101,7 +101,7 @@ module.exports = class deviceZBSensorAmbient {
         )
         eveLog.humidity = currentHumi
         if (params.updateSource && !this.disableDeviceLogging) {
-          this.log('[%s] %s [%s].', this.name, this.messages.curHumi, currentHumi)
+          this.log('[%s] %s [%s].', this.name, this.lang.curHumi, currentHumi)
         }
       }
       if (eveLog.temp || eveLog.humidity) {
diff --git a/lib/device/zigbee/sensor-contact.js b/lib/device/zigbee/sensor-contact.js
index 26f045ab..6ad70bf4 100644
--- a/lib/device/zigbee/sensor-contact.js
+++ b/lib/device/zigbee/sensor-contact.js
@@ -12,7 +12,7 @@ module.exports = class deviceZBSensorContact {
     this.hapChar = platform.api.hap.Characteristic
     this.eveChar = platform.eveChar
     this.log = platform.log
-    this.messages = platform.messages
+    this.lang = platform.lang
     this.platform = platform
 
     // Set up variables from the accessory
@@ -65,7 +65,7 @@ module.exports = class deviceZBSensorContact {
         lowBattThreshold: this.lowBattThreshold,
         scaleBattery: this.scaleBattery
       })
-      this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
+      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
     }
   }
 
@@ -83,7 +83,7 @@ module.exports = class deviceZBSensorContact {
           scaledBatt < this.lowBattThreshold
         )
         if (params.updateSource && !this.disableDeviceLogging) {
-          this.log('[%s] %s [%s%].', this.name, this.messages.curBatt, scaledBatt)
+          this.log('[%s] %s [%s%].', this.name, this.lang.curBatt, scaledBatt)
         }
       }
       if (this.funcs.hasProperty(params, 'lock') && [0, 1].includes(params.lock)) {
@@ -106,8 +106,8 @@ module.exports = class deviceZBSensorContact {
           this.log(
             '[%s] current state [%s].',
             this.name,
-            this.messages.curState,
-            params.lock === 0 ? this.messages.contactYes : this.messages.contactNo
+            this.lang.curState,
+            params.lock === 0 ? this.lang.contactYes : this.lang.contactNo
           )
         }
       }
diff --git a/lib/device/zigbee/sensor-motion.js b/lib/device/zigbee/sensor-motion.js
index 8a681b1e..0ea2ab2c 100644
--- a/lib/device/zigbee/sensor-motion.js
+++ b/lib/device/zigbee/sensor-motion.js
@@ -12,7 +12,7 @@ module.exports = class deviceZBSensorMotion {
     this.hapChar = platform.api.hap.Characteristic
     this.eveChar = platform.eveChar
     this.log = platform.log
-    this.messages = platform.messages
+    this.lang = platform.lang
     this.platform = platform
 
     // Set up variables from the accessory
@@ -53,7 +53,7 @@ module.exports = class deviceZBSensorMotion {
         lowBattThreshold: this.lowBattThreshold,
         sensorTimeDifference: this.sensorTimeDifference
       })
-      this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
+      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
     }
   }
 
@@ -70,7 +70,7 @@ module.exports = class deviceZBSensorMotion {
           this.cacheBatt < this.lowBattThreshold
         )
         if (params.updateSource && !this.disableDeviceLogging) {
-          this.log('[%s] %s [%s%].', this.name, this.messages.curBatt, this.cacheBatt)
+          this.log('[%s] %s [%s%].', this.name, this.lang.curBatt, this.cacheBatt)
         }
       }
       if (
@@ -95,8 +95,8 @@ module.exports = class deviceZBSensorMotion {
           this.log(
             '[%s] %s [%s].',
             this.name,
-            this.messages.curState,
-            motionDetected ? this.messages.motionYes : this.messages.motionNo
+            this.lang.curState,
+            motionDetected ? this.lang.motionYes : this.lang.motionNo
           )
         }
       }
diff --git a/lib/device/zigbee/switch-single.js b/lib/device/zigbee/switch-single.js
index e0769dc3..f44c17e9 100644
--- a/lib/device/zigbee/switch-single.js
+++ b/lib/device/zigbee/switch-single.js
@@ -11,7 +11,7 @@ module.exports = class deviceZBSwitchSingle {
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
     this.log = platform.log
-    this.messages = platform.messages
+    this.lang = platform.lang
     this.platform = platform
 
     // Set up variables from the accessory
@@ -50,7 +50,7 @@ module.exports = class deviceZBSwitchSingle {
     // Output the customised options to the log if in debug mode
     if (this.debug) {
       const opts = JSON.stringify({ disableDeviceLogging: this.disableDeviceLogging })
-      this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
+      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
     }
   }
 
@@ -63,7 +63,7 @@ module.exports = class deviceZBSwitchSingle {
       this.cacheState = newValue
       this.accessory.eveService.addEntry({ status: value ? 1 : 0 })
       if (!this.disableDeviceLogging) {
-        this.log('[%s] %s [%s].', this.name, this.messages.curState, newValue)
+        this.log('[%s] %s [%s].', this.name, this.lang.curState, newValue)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
@@ -83,7 +83,7 @@ module.exports = class deviceZBSwitchSingle {
       this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
       this.accessory.eveService.addEntry({ status: this.cacheState === 'on' ? 1 : 0 })
       if (params.updateSource && !this.disableDeviceLogging) {
-        this.log('[%s] %s [%s].', this.name, this.messages.curState, this.cacheState)
+        this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
diff --git a/lib/device/zigbee/switch-stateless.js b/lib/device/zigbee/switch-stateless.js
index 37682623..20b90fce 100644
--- a/lib/device/zigbee/switch-stateless.js
+++ b/lib/device/zigbee/switch-stateless.js
@@ -11,7 +11,7 @@ module.exports = class deviceZBSwitchStateless {
     this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
     this.log = platform.log
-    this.messages = platform.messages
+    this.lang = platform.lang
     this.platform = platform
 
     // Set up variables from the accessory
@@ -51,7 +51,7 @@ module.exports = class deviceZBSwitchStateless {
         hideLongDouble: this.hideLongDouble,
         lowBattThreshold: this.lowBattThreshold
       })
-      this.log('[%s] %s %s.', this.name, this.messages.devInitOpts, opts)
+      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
     }
   }
 
@@ -68,7 +68,7 @@ module.exports = class deviceZBSwitchStateless {
           this.cacheBatt < this.lowBattThreshold
         )
         if (params.updateSource && !this.disableDeviceLogging) {
-          this.log('[%s] %s [%s%].', this.name, this.messages.curBatt, this.cacheBatt)
+          this.log('[%s] %s [%s%].', this.name, this.lang.curBatt, this.cacheBatt)
         }
       }
       if (this.funcs.hasProperty(params, 'key') && [0, 1, 2].includes(params.key)) {
@@ -78,9 +78,9 @@ module.exports = class deviceZBSwitchStateless {
         )
         if (params.updateSource && !this.disableDeviceLogging) {
           const textLabel = params.key === 0
-            ? this.messages.buttonSingle
-            : (params.key === 1 ? this.messages.buttonDouble : this.messages.buttonLong)
-          this.log('[%s] %s [%s].', this.name, this.messages.curState, textLabel)
+            ? this.lang.buttonSingle
+            : (params.key === 1 ? this.lang.buttonDouble : this.lang.buttonLong)
+          this.log('[%s] %s [%s].', this.name, this.lang.curState, textLabel)
         }
       }
     } catch (err) {
diff --git a/lib/index.js b/lib/index.js
index 30ad17fd..985c6efe 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -15,14 +15,14 @@ class eWeLinkPlatform {
 
     // Retrieve the necessary constants and functions before starting
     this.consts = require('./utils/constants')
-    this.messages = require('./utils/lang-en')
+    this.lang = require('./utils/lang-en')
     this.funcs = require('./utils/functions')
 
     // Begin plugin initialisation
     try {
       // Check the user has configured the plugin
       if (!config || !config.username || !config.password) {
-        throw new Error(this.messages.missingCreds)
+        throw new Error(this.lang.missingCreds)
       }
 
       // Initialise these variables before anything else
@@ -56,14 +56,14 @@ class eWeLinkPlatform {
     } catch (err) {
       // Catch any errors during initialisation
       const hideErrLines = [
-        this.messages.missingCreds,
-        this.messages.missingPW,
-        this.messages.missingUN
+        this.lang.missingCreds,
+        this.lang.missingPW,
+        this.lang.missingUN
       ]
       const eText = hideErrLines.includes(err.message)
         ? err.message
         : this.funcs.parseError(err)
-      log.warn('***** %s [v%s]. *****', this.messages.disabling, PLUGIN.version)
+      log.warn('***** %s [v%s]. *****', this.lang.disabling, PLUGIN.version)
       log.warn('***** %s. *****', eText)
     }
   }
@@ -71,22 +71,22 @@ class eWeLinkPlatform {
   applyUserConfig (config) {
     // These shorthand functions save line space during config parsing
     const logDefault = (k, def) => {
-      this.log.warn('%s [%s] %s %s.', this.messages.cfgItem, k, this.messages.cfgDef, def)
+      this.log.warn('%s [%s] %s %s.', this.lang.cfgItem, k, this.lang.cfgDef, def)
     }
     const logIgnore = k => {
-      this.log.warn('%s [%s] %s.', this.messages.cfgItem, k, this.messages.cfgIgn)
+      this.log.warn('%s [%s] %s.', this.lang.cfgItem, k, this.lang.cfgIgn)
     }
     const logIgnoreItem = k => {
-      this.log.warn('%s [%s] %s.', this.messages.cfgItem, k, this.messages.cfgIgnItem)
+      this.log.warn('%s [%s] %s.', this.lang.cfgItem, k, this.lang.cfgIgnItem)
     }
     const logIncrease = (k, min) => {
-      this.log.warn('%s [%s] %s %s.', this.messages.cfgItem, k, this.messages.cfgLow, min)
+      this.log.warn('%s [%s] %s %s.', this.lang.cfgItem, k, this.lang.cfgLow, min)
     }
     const logQuotes = k => {
-      this.log.warn('%s [%s] %s.', this.messages.cfgItem, k, this.messages.cfgQts)
+      this.log.warn('%s [%s] %s.', this.lang.cfgItem, k, this.lang.cfgQts)
     }
     const logRemove = k => {
-      this.log.warn('%s [%s] %s.', this.messages.cfgItem, k, this.messages.cfgRmv)
+      this.log.warn('%s [%s] %s.', this.lang.cfgItem, k, this.lang.cfgRmv)
     }
 
     // Begin applying the user's config
@@ -405,13 +405,13 @@ class eWeLinkPlatform {
           break
         case 'password':
           if (typeof val !== 'string' || val === '') {
-            throw new Error(this.messages.missingPW)
+            throw new Error(this.lang.missingPW)
           }
           this.config.password = val
           break
         case 'username':
           if (typeof val !== 'string' || val === '') {
-            throw new Error(this.messages.missingUN)
+            throw new Error(this.lang.missingUN)
           }
           this.config.username = val.replace(/[\s]+/g, '')
           break
@@ -430,11 +430,11 @@ class eWeLinkPlatform {
         this.devicesInHB.forEach(accessory => {
           this.removeAccessory(accessory)
         })
-        throw new Error(this.messages.disabled)
+        throw new Error(this.lang.disabled)
       }
 
       // Log that the plugin initialisation has been successful
-      this.log('[v%s] %s.', PLUGIN.version, this.messages.initialised)
+      this.log('[v%s] %s.', PLUGIN.version, this.lang.initialised)
 
       // Require any libraries that the plugin uses
       this.axios = require('axios')
@@ -503,27 +503,27 @@ class eWeLinkPlatform {
         this.wsRefresh = setInterval(async () => {
           try {
             if (this.config.debug) {
-              this.log('%s.', this.messages.wsRef)
+              this.log('%s.', this.lang.wsRef)
             }
             await this.wsClient.login()
           } catch (e) {
             const eText = this.funcs.parseError(e)
-            this.log.warn('%s %s.', this.messages.wsRefFail, eText)
+            this.log.warn('%s %s.', this.lang.wsRefFail, eText)
           }
         }, 3600000)
       }
 
       // Log that the plugin setup has been successful with a welcome message
-      const randIndex = Math.floor(Math.random() * this.messages.zWelcome.length)
-      this.log('%s. %s', this.messages.complete, this.messages.zWelcome[randIndex])
+      const randIndex = Math.floor(Math.random() * this.lang.zWelcome.length)
+      this.log('%s. %s', this.lang.complete, this.lang.zWelcome[randIndex])
     } catch (err) {
       // Catch any errors during setup
-      const eText = err.message === this.messages.disabled
+      const eText = err.message === this.lang.disabled
         ? err.message
         : this.config.debug
           ? err
           : this.funcs.parseError(err)
-      this.log.warn('***** %s [v%s]. *****', this.messages.disabling, PLUGIN.version)
+      this.log.warn('***** %s [v%s]. *****', this.lang.disabling, PLUGIN.version)
       this.log.warn('***** %s. *****', eText)
       this.pluginShutdown()
     }
@@ -1064,7 +1064,7 @@ class eWeLinkPlatform {
                 : this.consts.defaultValues.sensorTimeDifference
               break
             default: {
-              this.log.warn('[%s] %s:', device.name, this.messages.devNotSupYet)
+              this.log.warn('[%s] %s:', device.name, this.lang.devNotSupYet)
               const data = JSON.stringify(device.params)
               this.log.warn('[%s-%s] %s', uiid, subDevice.type || '?', data)
               return
@@ -1204,21 +1204,21 @@ class eWeLinkPlatform {
         /*************
         SONOFF CAMERAS
         *************/
-        this.log('[%s] %s.', device.name, this.messages.sonoffCamera)
+        this.log('[%s] %s.', device.name, this.lang.sonoffCamera)
         return
         /************/
       } else if (this.consts.devices.cannotSupport.includes(uiid)) {
         /*******************************
         DEVICES THAT CANNOT BE SUPPORTED
         *******************************/
-        this.log('[%s] %s.', device.name, this.messages.devNotSup)
+        this.log('[%s] %s.', device.name, this.lang.devNotSup)
         return
         /******************************/
       } else {
         /**********************
         DEVICES PENDING SUPPORT
         **********************/
-        this.log.warn('[%s] %s:', device.name, this.messages.devNotSupYet)
+        this.log.warn('[%s] %s:', device.name, this.lang.devNotSupYet)
         this.log.warn('[%s] %s', uiid || '?', JSON.stringify(device.params))
         return
         /*********************/
@@ -1242,10 +1242,10 @@ class eWeLinkPlatform {
 
       // Helpful logging for each device
       const str = accessory.context.reachableLAN
-        ? this.messages.foundWithIP + ' [' + this.lanDevices.get(device.deviceid).ip + ']'
+        ? this.lang.foundWithIP + ' [' + this.lanDevices.get(device.deviceid).ip + ']'
         : this.consts.devices.lanIn.includes(uiid)
-          ? this.messages.lanUnreachable
-          : this.messages.lanUnsupported
+          ? this.lang.lanUnreachable
+          : this.lang.lanUnsupported
 
       // Update accessory characteristics with latest values
       if (this.wsClient && accessory.control && accessory.control.externalUpdate) {
@@ -1260,17 +1260,17 @@ class eWeLinkPlatform {
       // Update any changes to the device into our devicesInHB map
       this.api.updatePlatformAccessories(PLUGIN.name, PLUGIN.alias, [accessory])
       this.devicesInHB.set(accessory.UUID, accessory)
-      this.log('[%s] %s %s.', device.name, this.messages.devInit, str)
+      this.log('[%s] %s %s.', device.name, this.lang.devInit, str)
       if (
         this.config.mode === 'lan' &&
         !this.consts.devices.lanOut.includes(uiid)
       ) {
-        this.log.warn('[%s] %s.', device.name, this.messages.devNoControl)
+        this.log.warn('[%s] %s.', device.name, this.lang.devNoControl)
       }
     } catch (err) {
       // Catch any errors during initialisation
       const eText = this.funcs.parseError(err)
-      this.log.warn('[%s] %s %s.', device.name, this.messages.devNotInit, eText)
+      this.log.warn('[%s] %s %s.', device.name, this.lang.devNotInit, eText)
     }
   }
 
@@ -1333,7 +1333,7 @@ class eWeLinkPlatform {
         // A function for when the identify button is pressed in HomeKit apps
         accessory.on('identify', (paired, callback) => {
           callback()
-          this.log('[%s] %s.', accessory.displayName, this.messages.identify)
+          this.log('[%s] %s.', accessory.displayName, this.lang.identify)
         })
       }
 
@@ -1354,7 +1354,7 @@ class eWeLinkPlatform {
       // Register the accessory if it hasn't been hidden by the user
       if (!hidden) {
         this.api.registerPlatformAccessories(PLUGIN.name, PLUGIN.alias, [accessory])
-        this.log('[%s] %s.', newDeviceName, this.messages.devAdd)
+        this.log('[%s] %s.', newDeviceName, this.lang.devAdd)
       }
 
       // Return the new accessory
@@ -1362,7 +1362,7 @@ class eWeLinkPlatform {
     } catch (err) {
       // Catch any errors during add
       const eText = this.funcs.parseError(err)
-      this.log.warn('[%s] %s %s.', newDeviceName, this.messages.devNotAdd, eText)
+      this.log.warn('[%s] %s %s.', newDeviceName, this.lang.devNotAdd, eText)
       return false
     }
   }
@@ -1388,7 +1388,7 @@ class eWeLinkPlatform {
     } catch (err) {
       // Catch any errors during retrieve
       const eText = this.funcs.parseError(err)
-      this.log.warn('[%s] %s %s.', accessory.displayName, this.messages.devNotConf, eText)
+      this.log.warn('[%s] %s %s.', accessory.displayName, this.lang.devNotConf, eText)
     }
   }
 
@@ -1397,12 +1397,11 @@ class eWeLinkPlatform {
       // Remove an accessory from Homebridge
       this.api.unregisterPlatformAccessories(PLUGIN.name, PLUGIN.alias, [accessory])
       this.devicesInHB.delete(accessory.UUID)
-      this.log('[%s] %s.', accessory.displayName, this.messages.devRemove)
+      this.log('[%s] %s.', accessory.displayName, this.lang.devRemove)
     } catch (err) {
       // Catch any errors during remove
       const eText = this.funcs.parseError(err)
-      const name = accessory.displayName
-      this.log.warn('[%s] %s %s.', name, this.messages.devNotRemove, eText)
+      this.log.warn('[%s] %s %s.', accessory.displayName, this.lang.devNotRemove, eText)
     }
   }
 
@@ -1411,8 +1410,12 @@ class eWeLinkPlatform {
     return await this.queue.add(async () => {
     // Log the update being sent
       if (this.config.debug) {
-        const str = JSON.stringify(params)
-        this.log('[%s] %s %s.', accessory.displayName, this.messages.updSend, str)
+        this.log(
+          '[%s] %s %s.',
+          accessory.displayName,
+          this.lang.updSend,
+          JSON.stringify(params)
+        )
       }
 
       // Set up the payload to send via LAN/WS
@@ -1424,11 +1427,11 @@ class eWeLinkPlatform {
 
       // Check if we can send via LAN otherwise send via WS
       const res = useWS
-        ? this.messages.wsRequired
+        ? this.lang.wsRequired
         : !this.lanClient
-          ? this.messages.lanDisabled
+          ? this.lang.lanDisabled
           : !this.consts.devices.lanOut.includes(accessory.context.eweUIID)
-            ? this.messages.lanNotSup
+            ? this.lang.lanNotSup
             : await this.lanClient.sendUpdate(payload)
 
       // Revert to WS if LAN mode not possible for whatever reason
@@ -1437,7 +1440,7 @@ class eWeLinkPlatform {
         if (this.wsClient) {
           // Log the revert if appropriate
           if (this.config.debug) {
-            this.log('[%s] %s %s.', accessory.displayName, this.messages.revertWS, res)
+            this.log('[%s] %s %s.', accessory.displayName, this.lang.revertWS, res)
           }
 
           // Attempt the update
@@ -1446,13 +1449,13 @@ class eWeLinkPlatform {
             await this.wsClient.sendUpdate(payload)
           } else {
             // Device appears to be offline
-            throw new Error(this.messages.unreachable)
+            throw new Error(this.lang.unreachable)
           }
         } else {
           // Device isn't online via WS so report the error back
-          const eText = [this.messages.lanDisabled, this.messages.lanNotSup].includes(res)
+          const eText = [this.lang.lanDisabled, this.lang.lanNotSup].includes(res)
             ? res
-            : this.messages.unreachable + ' [' + res + ']'
+            : this.lang.unreachable + ' [' + res + ']'
           throw new Error(eText)
         }
       }
@@ -1469,8 +1472,12 @@ class eWeLinkPlatform {
     const uuid2 = this.api.hap.uuid.generate(deviceId + 'SW0')
     if ((accessory = this.devicesInHB.get(uuid1) || this.devicesInHB.get(uuid2))) {
       if (this.config.debug) {
-        const str = JSON.stringify(device.params)
-        this.log('[%s] %s %s.', accessory.displayName, this.messages.updRec, str)
+        this.log(
+          '[%s] %s %s.',
+          accessory.displayName,
+          this.lang.updRec,
+          JSON.stringify(device.params)
+        )
       }
       if (device.params.updateSource === 'WS') {
         // The update is from WS so update the WS online/offline status
@@ -1484,9 +1491,9 @@ class eWeLinkPlatform {
 
           // Log the new reachability of the device
           const status = accessory.context.reachableWAN
-            ? this.messages.repOnline
-            : this.messages.repOffline
-          this.log('[%s] %s %s.', accessory.displayName, status, this.messages.viaWS)
+            ? this.lang.repOnline
+            : this.lang.repOffline
+          this.log('[%s] %s %s.', accessory.displayName, status, this.lang.viaWS)
 
           // Mark the online/offline status of certain devices
           if (this.consts.devices.markStatus.includes(accessory.context.eweUIID)) {
@@ -1513,8 +1520,12 @@ class eWeLinkPlatform {
         reachableChange = true
 
         // Log the new reachability of the device
-        const name = accessory.displayName
-        this.log('[%s] %s %s.', name, this.messages.repOnline, this.messages.viaLAN)
+        this.log(
+          '[%s] %s %s.',
+          accessory.displayName,
+          this.lang.repOnline,
+          this.lang.viaLAN
+        )
 
         // Try and request an update through WS if the device has come back online
         if (accessory.context.reachableWAN && this.wsClient) {
@@ -1556,7 +1567,7 @@ class eWeLinkPlatform {
         }
       } catch (err) {
         const eText = this.funcs.parseError(err)
-        this.log.warn('[%s] %s %s.', accessory.displayName, this.messages.devNotRf, eText)
+        this.log.warn('[%s] %s %s.', accessory.displayName, this.lang.devNotRf, eText)
       }
     } else {
       // The device does not exist in HB so let's try to add it
@@ -1568,8 +1579,12 @@ class eWeLinkPlatform {
 
         // Log the update if debug is set to true
         if (this.config.debug) {
-          const str = JSON.stringify(device.params)
-          this.log('[%s] %s %s.', deviceId, this.messages.recNew, str)
+          this.log(
+            '[%s] %s %s.',
+            deviceId,
+            this.lang.recNew,
+            JSON.stringify(device.params)
+          )
         }
 
         // Obtain full device information from the HTTP API
@@ -1585,7 +1600,7 @@ class eWeLinkPlatform {
       } catch (err) {
         // Automatically adding the new device failed for some reason
         const eText = this.funcs.parseError(err)
-        this.log.warn('[%s] %s %s.', deviceId, this.messages.devNewNotAdd, eText)
+        this.log.warn('[%s] %s %s.', deviceId, this.lang.devNewNotAdd, eText)
       }
     }
   }
@@ -1593,7 +1608,7 @@ class eWeLinkPlatform {
   async deviceUpdateError (accessory, err, requestRefresh) {
     // Log the error
     const eText = this.funcs.parseError(err)
-    this.log.warn('[%s] %s %s.', accessory.displayName, this.messages.devNotUpd, eText)
+    this.log.warn('[%s] %s %s.', accessory.displayName, this.lang.devNotUpd, eText)
 
     // We only request a device refresh on failed internal updates
     if (requestRefresh && accessory.context.reachableWAN && this.wsClient) {

From 35a753760e39604830df5855390280b155edd524 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 30 Apr 2021 19:57:26 +0100
Subject: [PATCH 1957/3183] 6.3.1-beta.1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index e7b8a2ab..57b97c71 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.3.1-beta.0",
+  "version": "6.3.1-beta.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 0351cbfc..e710bcfb 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.3.1-beta.0",
+  "version": "6.3.1-beta.1",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From eabde01671f46a49ec7889c8e2609d7f858767aa Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 1 May 2021 10:40:07 +0100
Subject: [PATCH 1958/3183] more backend changes

---
 lib/device/simulation/garage-one.js   | 25 +++++++++-------
 lib/device/simulation/garage-two.js   | 20 ++++++++-----
 lib/device/simulation/lock-one.js     | 17 +++++------
 lib/device/simulation/sensor-leak.js  | 15 +++++-----
 lib/device/simulation/switch-valve.js | 26 ++++++++--------
 lib/device/simulation/tap-one.js      | 43 ++++++++++++++++++---------
 lib/device/simulation/tap-two.js      | 14 ++++++---
 lib/device/simulation/thermostat.js   | 30 +++++++++----------
 lib/device/simulation/valve-four.js   | 24 +++++++++++++--
 lib/device/simulation/valve-one.js    | 13 ++++----
 lib/device/simulation/valve-two.js    | 24 +++++++++++++--
 lib/utils/lang-en.js                  | 11 +++++++
 12 files changed, 169 insertions(+), 93 deletions(-)

diff --git a/lib/device/simulation/garage-one.js b/lib/device/simulation/garage-one.js
index 7b6e0880..f174f39e 100644
--- a/lib/device/simulation/garage-one.js
+++ b/lib/device/simulation/garage-one.js
@@ -38,7 +38,7 @@ module.exports = class deviceGarageOne {
 
     // Check for a valid setup
     if (!this.consts.allowed.setups.includes(this.setup)) {
-      this.error = "device has not been set up as 'oneSwitch' or 'twoSwitch'"
+      this.error = this.lang.simErrSetup
     }
 
     // Check the sensor is valid if defined by the user
@@ -46,18 +46,18 @@ module.exports = class deviceGarageOne {
       // Check the sensor exists in Homebridge
       const uuid = this.platform.api.hap.uuid.generate(deviceConf.sensorId + 'SWX')
       if (!platform.devicesInHB.has(uuid)) {
-        this.error = 'defined sensor does not exist in Homebridge'
+        this.error = this.lang.simErrNoSensor
       }
 
       // Check the sensor is a sensor
       if (platform.devicesInHB.get(uuid).context.eweUIID !== 102) {
-        this.error = 'defined sensor is not a DW2 sensor'
+        this.error = this.lang.simErrNotSensor
       }
       this.definedSensor = this.platform.devicesInHB.get(uuid)
 
       // Check the sensor has the ContactSensor service
       if (!this.definedSensor.getService(this.hapServ.ContactSensor)) {
-        this.error = 'defined sensor is not configured as a sensor'
+        this.error = this.lang.simErrNotConfSensor
       }
     }
 
@@ -123,7 +123,7 @@ module.exports = class deviceGarageOne {
   async internalUpdate (value) {
     try {
       if (this.error) {
-        throw new Error('invalid config - ' + this.error)
+        throw new Error(this.lang.invalidConfig + ' - ' + this.error)
       }
       const newPos = value
       const params = {}
@@ -182,9 +182,10 @@ module.exports = class deviceGarageOne {
         this.accessory.context.cacheCurrentDoorState = newPos
         if (!this.disableDeviceLogging) {
           this.log(
-            '[%s] current state [%s].',
+            '[%s] %s [%s].',
             this.name,
-            newPos === 0 ? 'open' : 'closed'
+            this.lang.curState,
+            newPos === 0 ? this.lang.doorOpen : this.lang.doorClosed
           )
         }
       }
@@ -207,8 +208,7 @@ module.exports = class deviceGarageOne {
   async externalUpdate (params) {
     try {
       if (this.error) {
-        this.log.warn('[%s] invalid config - %s.', this.name, this.error)
-        return
+        throw new Error(this.lang.invalidConfig + ' - ' + this.error)
       }
       if ((!params.switch && !params.switches) || this.inUse || this.definedSensor) {
         return
@@ -242,7 +242,12 @@ module.exports = class deviceGarageOne {
       this.service.updateCharacteristic(this.hapChar.CurrentDoorState, newPos - 2)
       this.accessory.context.cacheCurrentDoorState = newPos - 2
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current state [%s].', this.name, newPos === 2 ? 'open' : 'closed')
+        this.log(
+          '[%s] %s [%s].',
+          this.name,
+          this.messages.curState,
+          newPos === 2 ? this.lang.doorOpen : this.lang.doorClosed
+        )
       }
     } catch (err) {
       this.inUse = false
diff --git a/lib/device/simulation/garage-two.js b/lib/device/simulation/garage-two.js
index d1555c16..e74c20ec 100644
--- a/lib/device/simulation/garage-two.js
+++ b/lib/device/simulation/garage-two.js
@@ -115,9 +115,10 @@ module.exports = class deviceGarageTwo {
           this.accessory.context.cacheOneCurrentDoorState = newPos
           if (!this.disableDeviceLogging) {
             this.log(
-              '[%s] current state [garage 1 %s].',
+              '[%s] %s [garage 1 %s].',
               this.name,
-              newPos === 0 ? 'open' : 'closed'
+              this.lang.curState,
+              newPos === 0 ? this.lang.doorOpen : this.lang.doorClosed
             )
           }
           break
@@ -126,9 +127,10 @@ module.exports = class deviceGarageTwo {
           this.accessory.context.cacheTwoCurrentDoorState = newPos
           if (!this.disableDeviceLogging) {
             this.log(
-              '[%s] current state [garage 2 %s].',
+              '[%s] %s [garage 2 %s].',
               this.name,
-              newPos === 0 ? 'open' : 'closed'
+              this.lang.curState,
+              newPos === 0 ? this.lang.doorOpen : this.lang.doorClosed
             )
           }
           break
@@ -203,9 +205,10 @@ module.exports = class deviceGarageTwo {
             this.accessory.context.cacheOneCurrentDoorState = newPos - 2
             if (params.updateSource && !this.disableDeviceLogging) {
               this.log(
-                '[%s] current state [garage 1 %s].',
+                '[%s] %s [garage 1 %s].',
                 this.name,
-                newPos === 2 ? 'open' : 'closed'
+                this.lang.curState,
+                newPos === 2 ? this.lang.doorOpen : this.lang.doorClosed
               )
             }
             break
@@ -213,9 +216,10 @@ module.exports = class deviceGarageTwo {
             this.accessory.context.cacheTwoCurrentDoorState = newPos - 2
             if (params.updateSource && !this.disableDeviceLogging) {
               this.log(
-                '[%s] current state [garage 2 %s].',
+                '[%s] %s [garage 2 %s].',
                 this.name,
-                newPos === 2 ? 'open' : 'closed'
+                this.lang.curState,
+                newPos === 2 ? this.lang.doorOpen : this.lang.doorClosed
               )
             }
             break
diff --git a/lib/device/simulation/lock-one.js b/lib/device/simulation/lock-one.js
index eeade651..7af5aa5d 100644
--- a/lib/device/simulation/lock-one.js
+++ b/lib/device/simulation/lock-one.js
@@ -30,7 +30,7 @@ module.exports = class deviceLockOne {
 
     // Check for a valid setup
     if (!this.consts.allowed.setups.includes(this.setup)) {
-      this.error = "device has not been set up as 'oneSwitch' or 'twoSwitch'"
+      this.error = this.lang.simErrSetup
     }
 
     // If the accessory has a switch service then remove it
@@ -67,7 +67,7 @@ module.exports = class deviceLockOne {
   async internalUpdate (value) {
     try {
       if (this.error) {
-        throw new Error('invalid config - ' + this.error)
+        throw new Error(this.lang.invalidConfig + ' - ' + this.error)
       }
       const params = {}
       switch (this.setup) {
@@ -85,14 +85,14 @@ module.exports = class deviceLockOne {
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.service.setCharacteristic(this.hapChar.LockCurrentState, 0)
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current status [unlocked].', this.name)
+        this.log('[%s] %s [%s].', this.name, this.lang.curState, this.lang.lockUnlocked)
       }
       await this.funcs.sleep(Math.max(this.operationTime * 100, 1000))
       this.service.updateCharacteristic(this.hapChar.LockTargetState, 1)
       this.service.setCharacteristic(this.hapChar.LockCurrentState, 1)
       this.inUse = false
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current status [locked].', this.name)
+        this.log('[%s] %s [%s].', this.name, this.lang.curState, this.lang.lockLocked)
       }
     } catch (err) {
       this.inUse = false
@@ -110,8 +110,7 @@ module.exports = class deviceLockOne {
   async externalUpdate (params) {
     try {
       if (this.error) {
-        this.log.warn('[%s] invalid config - %s.', this.name, this.error)
-        return
+        throw new Error(this.lang.invalidConfig + ' - ' + this.error)
       }
       if (this.inUse) {
         return
@@ -130,16 +129,16 @@ module.exports = class deviceLockOne {
       }
       this.inUse = true
       this.service.updateCharacteristic(this.hapChar.LockCurrentState, 0)
-        .updateCharacteristic(this.hapChar.LockTargetState, 0)
+      this.service.updateCharacteristic(this.hapChar.LockTargetState, 0)
       if (params.updateSource && !this.disableDeviceLogging) {
-        this.log('[%s] current status [unlocked].', this.name)
+        this.log('[%s] %s [%s].', this.name, this.lang.curState, this.lang.lockUnlocked)
       }
       await this.funcs.sleep(Math.max(this.operationTime * 100, 1000))
       this.service.updateCharacteristic(this.hapChar.LockCurrentState, 1)
         .updateCharacteristic(this.hapChar.LockTargetState, 1)
       this.inUse = false
       if (params.updateSource && !this.disableDeviceLogging) {
-        this.log('[%s] current status [locked].', this.name)
+        this.log('[%s] %s [%s].', this.name, this.lang.curState, this.lang.lockLocked)
       }
     } catch (err) {
       this.inUse = false
diff --git a/lib/device/simulation/sensor-leak.js b/lib/device/simulation/sensor-leak.js
index b018b74e..ec384461 100644
--- a/lib/device/simulation/sensor-leak.js
+++ b/lib/device/simulation/sensor-leak.js
@@ -66,18 +66,18 @@ module.exports = class deviceSensorLeak {
     try {
       if (this.funcs.hasProperty(params, 'battery')) {
         const scaledBattery = Math.round(params.battery * 33.3)
-        if (this.cacheBattery !== scaledBattery) {
-          this.cacheBattery = scaledBattery
+        if (this.cacheBatt !== scaledBattery) {
+          this.cacheBatt = scaledBattery
           this.batteryService.updateCharacteristic(
             this.hapChar.BatteryLevel,
-            this.cacheBattery
+            this.cacheBatt
           )
           this.batteryService.updateCharacteristic(
             this.hapChar.StatusLowBattery,
-            this.cacheBattery < this.lowBattThreshold
+            this.cacheBatt < this.lowBattThreshold
           )
           if (params.updateSource && !this.disableDeviceLogging) {
-            this.log('[%s] current battery [%s%].', this.name, this.cacheBattery)
+            this.log('[%s] %s [%s%].', this.name, this.lang.curBatt, this.cacheBatt)
           }
         }
       }
@@ -97,9 +97,10 @@ module.exports = class deviceSensorLeak {
       }
       if (params.updateSource && !this.disableDeviceLogging) {
         this.log(
-          '[%s] current state [water%s detected].',
+          '[%s] %s [%s].',
           this.name,
-          newState === 1 ? '' : ' not'
+          this.lang.curState,
+          newState === 1 ? this.lang.leakYes : this.lang.leakNo
         )
       }
     } catch (err) {
diff --git a/lib/device/simulation/switch-valve.js b/lib/device/simulation/switch-valve.js
index cd31ddb6..383fa3d6 100644
--- a/lib/device/simulation/switch-valve.js
+++ b/lib/device/simulation/switch-valve.js
@@ -91,15 +91,15 @@ module.exports = class deviceSwitchValve {
         }]
       }
       await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.cacheOnOff = value ? 'on' : 'off'
+      this.cacheState = value ? 'on' : 'off'
       this.accessory.eveService.addEntry({ status: value ? 1 : 0 })
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current state [%s].', this.name, this.cacheOnOff)
+        this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
-        this.sService.updateCharacteristic(this.hapChar.On, this.cacheOnOff === 'on')
+        this.sService.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
       }, 5000)
       throw new this.platform.api.hap.HapStatusError(-70402)
     }
@@ -119,14 +119,14 @@ module.exports = class deviceSwitchValve {
           this.vService.updateCharacteristic(this.hapChar.RemainingDuration, 0)
           clearTimeout(this.timer)
           if (!this.disableDeviceLogging) {
-            this.log('[%s] current state [stopped].', this.name)
+            this.log('[%s] %s [%s].', this.name, this.lang.curState, this.lang.valveNo)
           }
           break
         case 1: {
           const timer = this.vService.getCharacteristic(this.hapChar.SetDuration).value
           this.vService.updateCharacteristic(this.hapChar.RemainingDuration, timer)
           if (!this.disableDeviceLogging) {
-            this.log('[%s] current state [running].', this.name)
+            this.log('[%s] %s [%s].', this.name, this.lang.curState, this.lang.valveYes)
           }
           this.timer = setTimeout(() => {
             this.vService.setCharacteristic(this.hapChar.Active, 0)
@@ -149,23 +149,23 @@ module.exports = class deviceSwitchValve {
       if (!params.switches) {
         return
       }
-      if (this.cacheOnOff !== (params.switches[0].switch === 'on')) {
+      if (this.cacheState !== (params.switches[0].switch === 'on')) {
         const newStatus = params.switches[0].switch === 'on'
-        this.cacheOnOff = params.switches[0].switch
+        this.cacheState = params.switches[0].switch
         this.sService.updateCharacteristic(this.hapChar.On, newStatus)
         this.accessory.eveService.addEntry({ status: newStatus ? 1 : 0 })
         if (params.updateSource && !this.disableDeviceLogging) {
-          this.log('[%s] current state [%s].', this.name, this.cacheOnOff)
+          this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
         }
       }
       if (params.switches[1].switch === 'on') {
         if (this.vService.getCharacteristic(this.hapChar.Active).value === 0) {
           const timer = this.vService.getCharacteristic(this.hapChar.SetDuration).value
           this.vService.updateCharacteristic(this.hapChar.Active, 1)
-            .updateCharacteristic(this.hapChar.InUse, 1)
-            .updateCharacteristic(this.hapChar.RemainingDuration, timer)
+          this.vService.updateCharacteristic(this.hapChar.InUse, 1)
+          this.vService.updateCharacteristic(this.hapChar.RemainingDuration, timer)
           if (params.updateSource && !this.disableDeviceLogging) {
-            this.log('[%s] current state [running].', this.name)
+            this.log('[%s] %s [%s].', this.name, this.lang.curState, this.lang.valveYes)
           }
           this.timer = setTimeout(() => {
             this.vService.setCharacteristic(this.hapChar.Active, 0)
@@ -174,8 +174,8 @@ module.exports = class deviceSwitchValve {
         return
       }
       this.vService.updateCharacteristic(this.hapChar.Active, 0)
-        .updateCharacteristic(this.hapChar.InUse, 0)
-        .updateCharacteristic(this.hapChar.RemainingDuration, 0)
+      this.vService.updateCharacteristic(this.hapChar.InUse, 0)
+      this.vService.updateCharacteristic(this.hapChar.RemainingDuration, 0)
       clearTimeout(this.timer)
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
diff --git a/lib/device/simulation/tap-one.js b/lib/device/simulation/tap-one.js
index 1139e1b9..a0d33834 100644
--- a/lib/device/simulation/tap-one.js
+++ b/lib/device/simulation/tap-one.js
@@ -28,7 +28,7 @@ module.exports = class deviceTapOne {
 
     // Check for a valid setup
     if (!this.consts.allowed.setups.includes(this.setup)) {
-      this.error = "device has not been set up as 'oneSwitch' or 'twoSwitch'"
+      this.error = this.lang.simErrSetup
     }
 
     // If the accessory has a switch service then remove it
@@ -63,7 +63,7 @@ module.exports = class deviceTapOne {
   async internalUpdate (value) {
     try {
       if (this.error) {
-        throw new Error('invalid config - ' + this.error)
+        throw new Error(this.lang.invalidConfig + ' - ' + this.error)
       }
       const params = {}
       switch (this.setup) {
@@ -78,15 +78,20 @@ module.exports = class deviceTapOne {
           break
       }
       await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.cacheOnOff = value ? 'on' : 'off'
+      this.cacheState = value ? 'on' : 'off'
       this.service.updateCharacteristic(this.hapChar.InUse, value)
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current state [%s].', this.name, this.cacheOnOff)
+        this.log(
+          '[%s] %s [%s].',
+          this.name,
+          this.lang.curState,
+          value === 1 ? this.lang.valveYes : this.lang.valveNo
+        )
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
-        this.service.updateCharacteristic(this.hapChar.Active, this.cacheOnOff === 'on')
+        this.service.updateCharacteristic(this.hapChar.Active, this.cacheState === 'on')
       }, 5000)
       throw new this.platform.api.hap.HapStatusError(-70402)
     }
@@ -95,27 +100,37 @@ module.exports = class deviceTapOne {
   async externalUpdate (params) {
     try {
       if (this.error) {
-        throw new Error('invalid config - ' + this.error)
+        throw new Error(this.lang.invalidConfig + ' - ' + this.error)
       }
       switch (this.setup) {
         case 'oneSwitch':
-          if (!params.switch || params.switch === this.cacheOnOff) {
+          if (!params.switch || params.switch === this.cacheState) {
             return
           }
-          this.cacheOnOff = params.switch
+          this.cacheState = params.switch
           break
         case 'twoSwitch':
-          if (!params.switches || params.switches[0].switch === this.cacheOnOff) {
+          if (!params.switches || params.switches[0].switch === this.cacheState) {
             return
           }
-          this.cacheOnOff = params.switches[0].switch
+          this.cacheState = params.switches[0].switch
           break
       }
-      this.service
-        .updateCharacteristic(this.hapChar.Active, this.cacheOnOff === 'on' ? 1 : 0)
-        .updateCharacteristic(this.hapChar.InUse, this.cacheOnOff === 'on' ? 1 : 0)
+      this.service.updateCharacteristic(
+        this.hapChar.Active,
+        this.cacheState === 'on' ? 1 : 0
+      )
+      this.service.updateCharacteristic(
+        this.hapChar.InUse,
+        this.cacheState === 'on' ? 1 : 0
+      )
       if (params.updateSource && !this.disableDeviceLogging) {
-        this.log('[%s] current state [%s].', this.name, this.cacheOnOff)
+        this.log(
+          '[%s] %s [%s].',
+          this.name,
+          this.lang.curState,
+          this.cacheState === 'on' ? this.lang.valveYes : this.lang.valveNo
+        )
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
diff --git a/lib/device/simulation/tap-two.js b/lib/device/simulation/tap-two.js
index 94f9e306..ec110a10 100644
--- a/lib/device/simulation/tap-two.js
+++ b/lib/device/simulation/tap-two.js
@@ -69,10 +69,11 @@ module.exports = class deviceTapTwo {
       tapService.updateCharacteristic(this.hapChar.InUse, value)
       if (!this.disableDeviceLogging) {
         this.log(
-          '[%s] current state [%s %].',
+          '[%s] %s [%s %s].',
           this.name,
+          this.lang.curState,
           tap,
-          value === 1 ? 'running' : 'stopped'
+          value === 1 ? this.lang.valveYes : this.lang.valveNo
         )
       }
       await this.platform.sendDeviceUpdate(this.accessory, params)
@@ -102,8 +103,13 @@ module.exports = class deviceTapTwo {
           params.switches[k].switch === 'on' ? 1 : 0
         )
         if (params.updateSource && !this.disableDeviceLogging) {
-          const logText = params.switches[k].switch === 'on' ? 'running' : 'stopped'
-          this.log('[%s] current state [Tap %s running].', this.name, v, logText)
+          this.log(
+            '[%s] %s [Tap %s %s].',
+            this.name,
+            this.lang.curState,
+            v,
+            params.switches[k].switch === 'on' ? this.lang.valveYes : this.lang.valveNo
+          )
         }
       })
     } catch (err) {
diff --git a/lib/device/simulation/thermostat.js b/lib/device/simulation/thermostat.js
index 36c1192a..e3d2d6e9 100644
--- a/lib/device/simulation/thermostat.js
+++ b/lib/device/simulation/thermostat.js
@@ -145,16 +145,16 @@ module.exports = class deviceThermostat {
         newValue === 'on' ? 1 : 0
       )
       await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.cacheOnOff = newValue
+      this.cacheState = newValue
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current state [%s].', this.name, this.cacheOnOff)
+        this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
         this.service.updateCharacteristic(
           this.hapChar.TargetHeatingCoolingState,
-          this.cacheOnOff === 'on'
+          this.cacheState === 'on'
         )
       }, 5000)
       throw new this.platform.api.hap.HapStatusError(-70402)
@@ -188,17 +188,17 @@ module.exports = class deviceThermostat {
       )
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.accessory.context.cacheTarget = value
-      this.cacheOnOff = 'on'
+      this.cacheState = 'on'
       this.cacheHeat = newValue
       if (!this.disableDeviceLogging) {
-        this.log('[%s] current target [%s°C].', this.name, value)
+        this.log('[%s] %s [%s°C].', this.name, this.lang.curTarg, value)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
         this.service.updateCharacteristic(
           this.hapChar.TargetHeatingCoolingState,
-          this.cacheOnOff === 'on'
+          this.cacheState === 'on'
         )
       }, 5000)
       throw new this.platform.api.hap.HapStatusError(-70402)
@@ -209,18 +209,18 @@ module.exports = class deviceThermostat {
     try {
       if (params.mainSwitch) {
         const newState = params.mainSwitch
-        if (this.cacheOnOff !== newState) {
-          this.cacheOnOff = newState
+        if (this.cacheState !== newState) {
+          this.cacheState = newState
           this.service.updateCharacteristic(
             this.hapChar.TargetHeatingCoolingState,
-            this.cacheOnOff === 'on' ? 1 : 0
+            this.cacheState === 'on' ? 1 : 0
           )
-          this.accessory.eveService.addEntry({ status: this.cacheOnOff === 'on' ? 1 : 0 })
-          if (this.cacheOnOff === 'off') {
+          this.accessory.eveService.addEntry({ status: this.cacheState === 'on' ? 1 : 0 })
+          if (this.cacheState === 'off') {
             this.cacheHeat = 'off'
           }
           if (params.updateSource && !this.disableDeviceLogging && !params.switch) {
-            this.log('[%s] current state [%s].', this.name, this.cacheOnOff)
+            this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
           }
         }
       }
@@ -231,7 +231,7 @@ module.exports = class deviceThermostat {
           params.switch === 'on' ? 1 : 0
         )
         if (params.updateSource && !this.disableDeviceLogging) {
-          this.log('[%s] current heating [%s].', this.name, this.cacheHeat)
+          this.log('[%s] %s [%s].', this.name, this.lang.curHeat, this.cacheHeat)
         }
       }
       if (
@@ -245,7 +245,7 @@ module.exports = class deviceThermostat {
             .updateCharacteristic(this.hapChar.CurrentTemperature, this.cacheTemp)
           this.accessory.eveService.addEntry({ temp: currentTemp })
           if (params.updateSource && !this.disableDeviceLogging) {
-            this.log('[%s] current temperature [%s°C].', this.name, this.cacheTemp)
+            this.log('[%s] %s [%s°C].', this.name, this.lang.curTemp, this.cacheTemp)
           }
         }
       }
@@ -263,7 +263,7 @@ module.exports = class deviceThermostat {
           )
           this.accessory.eveService.addEntry({ humidity: currentHumi })
           if (params.updateSource && !this.disableDeviceLogging) {
-            this.log('[%s] current humidity [%s%].', this.name, this.cacheHumi)
+            this.log('[%s] %s [%s%].', this.name, this.lang.curHumi, this.cacheHumi)
           }
         }
       }
diff --git a/lib/device/simulation/valve-four.js b/lib/device/simulation/valve-four.js
index 651d51d5..5ff1ac1f 100644
--- a/lib/device/simulation/valve-four.js
+++ b/lib/device/simulation/valve-four.js
@@ -102,14 +102,26 @@ module.exports = class deviceValveFour {
           valveService.updateCharacteristic(this.hapChar.RemainingDuration, 0)
           clearTimeout(this.accessory.getService(valve).timer)
           if (!this.disableDeviceLogging) {
-            this.log('[%s] current state [%s stopped].', this.name, valve)
+            this.log(
+              '[%s] %s [%s %s].',
+              this.name,
+              this.lang.curState,
+              valve,
+              this.lang.valveNo
+            )
           }
           break
         case 1: {
           const timer = valveService.getCharacteristic(this.hapChar.SetDuration).value
           valveService.updateCharacteristic(this.hapChar.RemainingDuration, timer)
           if (!this.disableDeviceLogging) {
-            this.log('[%s] current state [%s running].', this.name, valve)
+            this.log(
+              '[%s] %s [%s %s].',
+              this.name,
+              this.lang.curState,
+              valve,
+              this.lang.valveYes
+            )
           }
           valveService.timer = setTimeout(() => {
             valveService.setCharacteristic(this.hapChar.Active, 0)
@@ -142,7 +154,13 @@ module.exports = class deviceValveFour {
             valveService.updateCharacteristic(this.hapChar.InUse, 1)
             valveService.updateCharacteristic(this.hapChar.RemainingDuration, timer)
             if (params.updateSource && !this.disableDeviceLogging) {
-              this.log('[%s] current state [Valve %s running].', this.name, v)
+              this.log(
+                '[%s] %s [Valve %s %s].',
+                this.name,
+                this.lang.curState,
+                v,
+                this.lang.valveYes
+              )
             }
             valveService.timer = setTimeout(() => {
               valveService.setCharacteristic(this.hapChar.Active, 0)
diff --git a/lib/device/simulation/valve-one.js b/lib/device/simulation/valve-one.js
index c6278b4c..945fb790 100644
--- a/lib/device/simulation/valve-one.js
+++ b/lib/device/simulation/valve-one.js
@@ -28,7 +28,7 @@ module.exports = class deviceValveOne {
 
     // Check for a valid setup
     if (!this.consts.allowed.setups.includes(this.setup)) {
-      this.error = "device has not been set up as 'oneSwitch' or 'twoSwitch'"
+      this.error = this.lang.simErrSetup
     }
 
     // If the accessory has a switch service then remove it
@@ -83,7 +83,7 @@ module.exports = class deviceValveOne {
   async internalUpdate (value) {
     try {
       if (this.error) {
-        throw new Error('invalid config - ' + this.error)
+        throw new Error(this.lang.invalidConfig + ' - ' + this.error)
       }
       const params = {}
       switch (this.setup) {
@@ -103,14 +103,14 @@ module.exports = class deviceValveOne {
           this.service.updateCharacteristic(this.hapChar.RemainingDuration, 0)
           clearTimeout(this.timer)
           if (!this.disableDeviceLogging) {
-            this.log('[%s] current state [stopped].', this.name)
+            this.log('[%s] %s [%s].', this.name, this.lang.curState, this.lang.valveNo)
           }
           break
         case 1: {
           const timer = this.service.getCharacteristic(this.hapChar.SetDuration).value
           this.service.updateCharacteristic(this.hapChar.RemainingDuration, timer)
           if (!this.disableDeviceLogging) {
-            this.log('[%s] current state [running].', this.name)
+            this.log('[%s] %s [%s].', this.name, this.lang.curState, this.lang.valveYes)
           }
           this.timer = setTimeout(() => {
             this.service.setCharacteristic(this.hapChar.Active, 0)
@@ -131,8 +131,7 @@ module.exports = class deviceValveOne {
   async externalUpdate (params) {
     try {
       if (this.error) {
-        this.log.warn('[%s] invalid config - %s.', this.name, this.error)
-        return
+        throw new Error(this.lang.invalidConfig + ' - ' + this.error)
       }
       let isOn = false
       switch (this.setup) {
@@ -156,7 +155,7 @@ module.exports = class deviceValveOne {
             .updateCharacteristic(this.hapChar.InUse, 1)
             .updateCharacteristic(this.hapChar.RemainingDuration, timer)
           if (params.updateSource && !this.disableDeviceLogging) {
-            this.log('[%s] current state [running].', this.name)
+            this.log('[%s] %s [%s].', this.name, this.lang.curState, this.lang.valveYes)
           }
           this.timer = setTimeout(() => {
             this.service.setCharacteristic(this.hapChar.Active, 0)
diff --git a/lib/device/simulation/valve-two.js b/lib/device/simulation/valve-two.js
index d67717e8..2a10e2a6 100644
--- a/lib/device/simulation/valve-two.js
+++ b/lib/device/simulation/valve-two.js
@@ -96,14 +96,26 @@ module.exports = class deviceValveTwo {
           valveService.updateCharacteristic(this.hapChar.RemainingDuration, 0)
           clearTimeout(this.accessory.getService(valve).timer)
           if (!this.disableDeviceLogging) {
-            this.log('[%s] current state [%s stopped].', this.name, valve)
+            this.log(
+              '[%s] %s [%s %s].',
+              this.name,
+              this.lang.curState,
+              valve,
+              this.lang.valveNo
+            )
           }
           break
         case 1: {
           const timer = valveService.getCharacteristic(this.hapChar.SetDuration).value
           valveService.updateCharacteristic(this.hapChar.RemainingDuration, timer)
           if (!this.disableDeviceLogging) {
-            this.log('[%s] current state [%s running].', this.name, valve)
+            this.log(
+              '[%s] %s [%s %s].',
+              this.name,
+              this.lang.curState,
+              valve,
+              this.lang.valveYes
+            )
           }
           valveService.timer = setTimeout(() => {
             valveService.setCharacteristic(this.hapChar.Active, 0)
@@ -136,7 +148,13 @@ module.exports = class deviceValveTwo {
             valveService.updateCharacteristic(this.hapChar.InUse, 1)
             valveService.updateCharacteristic(this.hapChar.RemainingDuration, timer)
             if (params.updateSource && !this.disableDeviceLogging) {
-              this.log('[%s] current state [Valve %s running].', this.name, v)
+              this.log(
+                '[%s] %s [Valve %s %s].',
+                this.name,
+                this.lang.curState,
+                v,
+                this.lang.valveYes
+              )
             }
             valveService.timer = setTimeout(() => {
               valveService.setCharacteristic(this.hapChar.Active, 0)
diff --git a/lib/utils/lang-en.js b/lib/utils/lang-en.js
index 71c92f61..b00f0156 100644
--- a/lib/utils/lang-en.js
+++ b/lib/utils/lang-en.js
@@ -67,6 +67,7 @@ module.exports = {
   httpRetry: 'Unable to reach eWeLink, retrying in 30 seconds',
   identify: 'identify button pressed',
   initialised: 'initialised. Syncing with eWeLink',
+  invalidConfig: 'invalid config',
   lanDisabled: 'LAN mode is disabled',
   lanErr: 'unknown LAN error',
   lanMonitor: 'LAN monitoring started',
@@ -75,6 +76,10 @@ module.exports = {
   lanStarting: 'LAN discovery starting',
   lanUnreachable: 'LAN mode unavailable as unreachable',
   lanUnsupported: 'LAN mode unavailable as not supported',
+  leakNo: 'leak not detected',
+  leakYes: 'leak detected',
+  lockLocked: 'locked',
+  lockUnlocked: 'unlocked',
   missingCreds: 'eWeLink credentials missing from configuration',
   missingPW: 'eWeLink password missing from configuration',
   missingUN: 'eWeLink username missing from configuration',
@@ -92,6 +97,10 @@ module.exports = {
   rfTrigNo: 'not triggered',
   rfTrigYes: 'triggered',
   sendLogin: 'Sending HTTP login() request',
+  simErrNoSensor: 'defined sensor does not exist in Homebridge',
+  simErrNotSensor: 'defined sensor is not a DW2 sensor',
+  simErrNotConfSensor: 'defined sensor is not configured as a sensor',
+  simErrSetup: "device has not been set up as 'oneSwitch' or 'twoSwitch'",
   sonoffCamera: 'see the homebridge-ewelink wiki for details to enable the camera',
   stoppedLAN: 'LAN monitoring gracefully stopped',
   stoppedWS: 'Web socket gracefully closed',
@@ -99,6 +108,8 @@ module.exports = {
   updRec: 'receiving update',
   updReq: 'requesting current status',
   updSend: 'sending update',
+  valveNo: 'stopped',
+  valveYes: 'running',
   viaAL: 'via adaptive lighting',
   viaLAN: 'via LAN',
   viaWS: 'via WS',

From ce223c322afd098e61b7937ab45a5ccffb5ef46a Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 1 May 2021 10:42:58 +0100
Subject: [PATCH 1959/3183] 6.3.1-beta.2

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 57b97c71..2226f826 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.3.1-beta.1",
+  "version": "6.3.1-beta.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index e710bcfb..119c9034 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.3.1-beta.1",
+  "version": "6.3.1-beta.2",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 3abe1b32bb6ea3dc7371ac46d2823311fe35dcb7 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 3 May 2021 08:00:00 +0100
Subject: [PATCH 1960/3183] activate homekit button when device pressed

---
 lib/device/rf-bridge.js | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/lib/device/rf-bridge.js b/lib/device/rf-bridge.js
index 8b23b13f..8022c438 100644
--- a/lib/device/rf-bridge.js
+++ b/lib/device/rf-bridge.js
@@ -142,6 +142,7 @@ module.exports = class deviceRFBridge {
       }
       const timeNow = new Date()
       let subAccessory = false
+      let channel
       if (
         this.funcs.hasProperty(params, 'cmd') &&
         params.cmd === 'transmit' &&
@@ -157,8 +158,8 @@ module.exports = class deviceRFBridge {
           }
         })
         if (subAccessory) {
-          subAccessory.getService(subAccessory.context.buttons[params.rfChl])
-            .updateCharacteristic(this.hapChar.On, 1)
+          const service = subAccessory.context.buttons[params.rfChl]
+          subAccessory.getService(service).updateCharacteristic(this.hapChar.On, true)
           if (params.updateSource && !subAccessory.context.disableDeviceLogging) {
             this.log(
               '[%s] %s [%s].',
@@ -167,9 +168,8 @@ module.exports = class deviceRFBridge {
               this.lang.buttonTrig
             )
           }
-          this.funcs.sleep(3000)
-          subAccessory.getService(subAccessory.context.buttons[params.rfChl])
-            .updateCharacteristic(this.hapChar.On, 0)
+          await this.funcs.sleep(3000)
+          subAccessory.getService(service).updateCharacteristic(this.hapChar.On, false)
         } else {
           throw new Error(this.lang.buttonNotFound)
         }
@@ -188,6 +188,7 @@ module.exports = class deviceRFBridge {
                 this.funcs.hasProperty(acc.context.buttons, chan.split('g')[1].toString())
               ) {
                 subAccessory = acc
+                channel = chan.split('g')[1].toString()
               }
             })
             if (subAccessory) {
@@ -207,13 +208,23 @@ module.exports = class deviceRFBridge {
               ) {
                 switch (subAccessory.context.subType) {
                   case 'button':
-                  case 'curtain':
+                  case 'curtain': {
+                    const service = subAccessory.context.buttons[channel]
+                    subAccessory.getService(service).updateCharacteristic(
+                      this.hapChar.On,
+                      true
+                    )
                     this.log(
                       '[%s] %s [%s].',
                       subAccessory.displayName,
                       this.lang.curState,
                       this.lang.buttonTrig
                     )
+                    await this.funcs.sleep(3000)
+                    subAccessory.getService(service).updateCharacteristic(
+                      this.hapChar.On,
+                      false
+                    )
                     return
                   case 'water':
                     serv = this.hapServ.LeakSensor

From 06423275c0b3e2817cfd8b6e470809bc3cd0bd17 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 3 May 2021 08:00:02 +0100
Subject: [PATCH 1961/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 24bd2565..fcd696a1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 ### Changes
 
+* RF Bridge remote buttons will turn on for 3 seconds in HomeKit when pressed
 * iFan speed will now log as {low, medium, high}
 * More language strings added to separate language file
 * Backend function and variable name changes

From f1ed28ed5f7271973d8e24915cc2452ef2ce12e9 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 3 May 2021 08:00:30 +0100
Subject: [PATCH 1962/3183] 6.3.1-beta.3

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 2226f826..dc0cc9c8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.3.1-beta.2",
+  "version": "6.3.1-beta.3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 119c9034..07e1673a 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.3.1-beta.2",
+  "version": "6.3.1-beta.3",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 56ff3a04493429c81d0df13fe9bd818fd9c69049 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 3 May 2021 08:42:10 +0100
Subject: [PATCH 1963/3183] fix syntax on rf cases

---
 lib/device/rf-bridge.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/device/rf-bridge.js b/lib/device/rf-bridge.js
index 8022c438..efabcd12 100644
--- a/lib/device/rf-bridge.js
+++ b/lib/device/rf-bridge.js
@@ -226,6 +226,7 @@ module.exports = class deviceRFBridge {
                       false
                     )
                     return
+                  }
                   case 'water':
                     serv = this.hapServ.LeakSensor
                     char = this.hapChar.LeakDetected

From e73d8b759cb7f187b88b01f77b9727d0e49f3508 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 3 May 2021 08:43:21 +0100
Subject: [PATCH 1964/3183] 6.3.1-beta.4

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index dc0cc9c8..920c57d5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.3.1-beta.3",
+  "version": "6.3.1-beta.4",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 07e1673a..6abd5d79 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.3.1-beta.3",
+  "version": "6.3.1-beta.4",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From c0fd49e824cc42082041abdf8a9ed8e5d7a193b4 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 3 May 2021 14:22:29 +0100
Subject: [PATCH 1965/3183] split outlet and switch files

---
 lib/device/outlet-double.js                | 233 +++++++++++++++++++++
 lib/device/outlet-multi.js                 | 212 +++++++++++++++++++
 lib/device/outlet-scm.js                   |   7 -
 lib/device/{outlet.js => outlet-single.js} |   4 +-
 lib/device/rf-bridge.js                    |   2 +-
 lib/device/sensor-ambient.js               |   2 +-
 lib/device/sensor-contact.js               |   2 +-
 lib/device/sensor-temp-humi.js             |   2 +-
 lib/device/simulation/garage-eachen.js     |   2 +-
 lib/device/simulation/garage-one.js        |   2 +-
 lib/device/simulation/sensor-leak.js       |   2 +-
 lib/device/simulation/switch-valve.js      |   2 +-
 lib/device/simulation/thermostat.js        |   2 +-
 lib/device/switch-double.js                | 108 +++-------
 lib/device/switch-multi.js                 | 106 +++-------
 lib/device/switch-single.js                |   2 +-
 lib/device/thermostat.js                   |   2 +-
 lib/device/zigbee/sensor-ambient.js        |   2 +-
 lib/device/zigbee/sensor-contact.js        |   2 +-
 lib/device/zigbee/sensor-motion.js         |   2 +-
 lib/device/zigbee/switch-single.js         |   2 +-
 lib/index.js                               |  14 +-
 22 files changed, 521 insertions(+), 193 deletions(-)
 create mode 100644 lib/device/outlet-double.js
 create mode 100644 lib/device/outlet-multi.js
 rename lib/device/{outlet.js => outlet-single.js} (98%)

diff --git a/lib/device/outlet-double.js b/lib/device/outlet-double.js
new file mode 100644
index 00000000..01a6c76a
--- /dev/null
+++ b/lib/device/outlet-double.js
@@ -0,0 +1,233 @@
+/* jshint -W014, -W033, esversion: 9 */
+/* eslint-disable new-cap */
+'use strict'
+
+module.exports = class deviceOutletDouble {
+  constructor (platform, accessory) {
+    // Set up variables from the platform
+    this.consts = platform.consts
+    this.debug = platform.config.debug
+    this.funcs = platform.funcs
+    this.hapServ = platform.api.hap.Service
+    this.hapChar = platform.api.hap.Characteristic
+    this.eveChar = platform.eveChar
+    this.log = platform.log
+    this.lang = platform.lang
+    this.platform = platform
+
+    // Set up variables from the accessory
+    this.name = accessory.displayName
+    this.accessory = accessory
+
+    // Set up custom variables for this device type
+    const deviceId = this.accessory.context.eweDeviceId
+    const deviceConf = platform.multiDevices[deviceId]
+    this.hideChannels = deviceConf && deviceConf.hideChannels
+      ? deviceConf.hideChannels
+      : undefined
+    this.inUsePowerThreshold = deviceConf && deviceConf.inUsePowerThreshold
+      ? deviceConf.inUsePowerThreshold
+      : platform.consts.defaultValues.inUsePowerThreshold
+    this.disableDeviceLogging = deviceConf && deviceConf.overrideDisabledLogging
+      ? false
+      : platform.config.disableDeviceLogging
+
+    // TotalConsumption is calculated by the plugin with these context readings
+    if (!this.funcs.hasProperty(this.accessory.context, 'energyReadingsOne')) {
+      this.accessory.context.energyReadingsOne = []
+    }
+    if (!this.funcs.hasProperty(this.accessory.context, 'energyReadingsTwo')) {
+      this.accessory.context.energyReadingsTwo = []
+    }
+    if (!this.funcs.hasProperty(this.accessory.context, 'energyReadingOneTotal')) {
+      this.accessory.context.energyReadingOneTotal = 0
+    }
+    if (!this.funcs.hasProperty(this.accessory.context, 'energyReadingTwoTotal')) {
+      this.accessory.context.energyReadingTwoTotal = 0
+    }
+
+    // If the accessory has a switch service then remove it
+    if (this.accessory.getService(this.hapServ.Switch)) {
+      this.accessory.removeService(this.accessory.getService(this.hapServ.Switch))
+    }
+
+    // Add the outlet service if it doesn't already exist
+    if (!(this.service = this.accessory.getService(this.hapServ.Outlet))) {
+      this.service = this.accessory.addService(this.hapServ.Outlet)
+      this.service.addCharacteristic(this.eveChar.Voltage)
+      this.service.addCharacteristic(this.eveChar.CurrentConsumption)
+      this.service.addCharacteristic(this.eveChar.ElectricCurrent)
+    }
+
+    // Add the set handler to the switch/outlet on/off characteristic
+    this.service.getCharacteristic(this.hapChar.On).onSet(async value => {
+      await this.internalStateUpdate(value)
+    })
+
+    // Pass the accessory to Fakegato to set up with Eve
+    this.accessory.eveService = new platform.eveService('energy', this.accessory, {
+      log: platform.config.debugFakegato ? this.log : () => {}
+    })
+
+    // Output the customised options to the log if in debug mode
+    if (this.debug) {
+      const opts = JSON.stringify({
+        disableDeviceLogging: this.disableDeviceLogging,
+        hideChannels: this.hideChannels,
+        showAsOutlet: true
+      })
+      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
+    }
+  }
+
+  async internalStateUpdate (value) {
+    try {
+      let masterState = 'off'
+      const params = {
+        switches: []
+      }
+      const switchNumber = this.accessory.context.switchNumber
+      switch (switchNumber) {
+        case '0':
+          params.switches.push({ switch: value ? 'on' : 'off', outlet: 0 })
+          params.switches.push({ switch: value ? 'on' : 'off', outlet: 1 })
+          break
+        case '1':
+        case '2':
+          params.switches.push({ switch: value ? 'on' : 'off', outlet: switchNumber - 1 })
+          break
+      }
+      await this.platform.sendDeviceUpdate(this.accessory, params)
+      switch (switchNumber) {
+        case '0':
+          for (let i = 0; i <= this.accessory.context.channelCount; i++) {
+            const idToCheck = this.accessory.context.eweDeviceId + 'SW' + i
+            const uuid = this.platform.api.hap.uuid.generate(idToCheck)
+            let subAccessory
+            if ((subAccessory = this.platform.devicesInHB.get(uuid))) {
+              subAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
+                this.hapChar.On,
+                value
+              )
+              subAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
+                this.hapChar.OutletInUse,
+                value
+              )
+              subAccessory.eveService.addEntry({ status: value ? 1 : 0 })
+              if (i > 0 && !this.disableDeviceLogging) {
+                this.log(
+                  '[%s] %s [%s].',
+                  subAccessory.displayName,
+                  this.lang.curState,
+                  value ? 'on' : 'off'
+                )
+              }
+            }
+          }
+          break
+        case '1':
+        case '2':
+          for (let i = 1; i <= this.accessory.context.channelCount; i++) {
+            const idToCheck = this.accessory.context.eweDeviceId + 'SW' + i
+            const uuid = this.platform.api.hap.uuid.generate(idToCheck)
+            let subAccessory
+            if ((subAccessory = this.platform.devicesInHB.get(uuid))) {
+              if (
+                subAccessory.getService(this.hapServ.Outlet)
+                  .getCharacteristic(this.hapChar.On).value
+              ) {
+                masterState = 'on'
+              }
+              if (i === parseInt(switchNumber)) {
+                subAccessory.eveService.addEntry({ status: value ? 1 : 0 })
+                subAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
+                  this.hapChar.OutletInUse,
+                  value
+                )
+                if (i > 0 && !this.disableDeviceLogging) {
+                  this.log(
+                    '[%s] %s [%s].',
+                    subAccessory.displayName,
+                    this.lang.curState,
+                    value ? 'on' : 'off'
+                  )
+                }
+              }
+            }
+          }
+          if (!this.platform.hideMasters.includes(this.accessory.context.eweDeviceId)) {
+            const idToCheck = this.accessory.context.eweDeviceId + 'SW0'
+            const uuid = this.platform.api.hap.uuid.generate(idToCheck)
+            const subAccessory = this.platform.devicesInHB.get(uuid)
+            subAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
+              this.hapChar.On,
+              masterState === 'on'
+            )
+            subAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
+              this.hapChar.OutletInUse,
+              masterState === 'on'
+            )
+            subAccessory.eveService.addEntry({ status: masterState === 'on' ? 1 : 0 })
+          }
+          break
+      }
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, true)
+      setTimeout(() => {
+        this.service.updateCharacteristic(this.hapChar.On, !value)
+      }, 5000)
+      throw new this.platform.api.hap.HapStatusError(-70402)
+    }
+  }
+
+  async externalUpdate (params) {
+    try {
+      if (!params.switches) {
+        return
+      }
+      const idToCheck = this.accessory.context.eweDeviceId + 'SW'
+      let primaryState = false
+      for (let i = 1; i <= this.accessory.context.channelCount; i++) {
+        if (params.switches[i - 1].switch === 'on') {
+          primaryState = true
+        }
+        const uuid = this.platform.api.hap.uuid.generate(idToCheck + i)
+        if (this.platform.devicesInHB.has(uuid)) {
+          const subAccessory = this.platform.devicesInHB.get(uuid)
+          const service = subAccessory.getService(this.hapServ.Outlet)
+          const currentState = service.getCharacteristic(this.hapChar.On).value
+            ? 'on'
+            : 'off'
+          if (params.updateSource && params.switches[i - 1].switch === currentState) {
+            continue
+          }
+          subAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
+            this.hapChar.On,
+            params.switches[i - 1].switch === 'on'
+          )
+          subAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
+            this.hapChar.OutletInUse,
+            params.switches[i - 1].switch === 'on'
+          )
+          subAccessory.eveService.addEntry({
+            status: params.switches[i - 1].switch === 'on' ? 1 : 0
+          })
+          if (params.updateSource && !this.disableDeviceLogging) {
+            this.log(
+              '[%s] %s [%s].',
+              subAccessory.displayName,
+              this.lang.curState,
+              params.switches[i - 1].switch
+            )
+          }
+        }
+      }
+      if (!this.platform.hideMasters.includes(this.accessory.context.eweDeviceId)) {
+        this.service.updateCharacteristic(this.hapChar.On, primaryState)
+        this.service.updateCharacteristic(this.hapChar.OutletInUse, primaryState)
+      }
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, false)
+    }
+  }
+}
diff --git a/lib/device/outlet-multi.js b/lib/device/outlet-multi.js
new file mode 100644
index 00000000..d88c17f0
--- /dev/null
+++ b/lib/device/outlet-multi.js
@@ -0,0 +1,212 @@
+/* jshint -W014, -W033, esversion: 9 */
+/* eslint-disable new-cap */
+'use strict'
+
+module.exports = class deviceOutletMulti {
+  constructor (platform, accessory) {
+    // Set up variables from the platform
+    this.consts = platform.consts
+    this.debug = platform.config.debug
+    this.funcs = platform.funcs
+    this.hapServ = platform.api.hap.Service
+    this.hapChar = platform.api.hap.Characteristic
+    this.log = platform.log
+    this.lang = platform.lang
+    this.platform = platform
+
+    // Set up variables from the accessory
+    this.name = accessory.displayName
+    this.accessory = accessory
+
+    // Set up custom variables for this device type
+    const deviceId = this.accessory.context.eweDeviceId
+    const deviceConf = platform.multiDevices[deviceId]
+    this.hideChannels = deviceConf && deviceConf.hideChannels
+      ? deviceConf.hideChannels
+      : undefined
+    this.disableDeviceLogging = deviceConf && deviceConf.overrideDisabledLogging
+      ? false
+      : platform.config.disableDeviceLogging
+
+    // If the accessory has a switch service then remove it
+    if (this.accessory.getService(this.hapServ.Switch)) {
+      this.accessory.removeService(this.accessory.getService(this.hapServ.Switch))
+    }
+
+    // Add the outlet service if it doesn't already exist
+    this.service = this.accessory.getService(this.hapServ.Outlet) ||
+      this.accessory.addService(this.hapServ.Outlet)
+
+    // Add the set handler to the switch/outlet on/off characteristic
+    this.service.getCharacteristic(this.hapChar.On).onSet(async value => {
+      await this.internalStateUpdate(value)
+    })
+
+    // Output the customised options to the log if in debug mode
+    if (this.debug) {
+      const opts = JSON.stringify({
+        disableDeviceLogging: this.disableDeviceLogging,
+        hideChannels: this.hideChannels,
+        showAsOutlet: true
+      })
+      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
+    }
+  }
+
+  async internalStateUpdate (value) {
+    try {
+      let masterState = 'off'
+      const params = {
+        switches: []
+      }
+      const switchNumber = this.accessory.context.switchNumber
+      switch (switchNumber) {
+        case '0':
+          params.switches.push({ switch: value ? 'on' : 'off', outlet: 0 })
+          params.switches.push({ switch: value ? 'on' : 'off', outlet: 1 })
+          params.switches.push({ switch: value ? 'on' : 'off', outlet: 2 })
+          params.switches.push({ switch: value ? 'on' : 'off', outlet: 3 })
+          break
+        case '1':
+        case '2':
+        case '3':
+        case '4':
+          params.switches.push({ switch: value ? 'on' : 'off', outlet: switchNumber - 1 })
+          break
+      }
+      await this.platform.sendDeviceUpdate(this.accessory, params)
+      switch (switchNumber) {
+        case '0':
+          for (let i = 0; i <= this.accessory.context.channelCount; i++) {
+            const idToCheck = this.accessory.context.eweDeviceId + 'SW' + i
+            const uuid = this.platform.api.hap.uuid.generate(idToCheck)
+            let subAccessory
+            if ((subAccessory = this.platform.devicesInHB.get(uuid))) {
+              subAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
+                this.hapChar.On,
+                value
+              )
+              subAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
+                this.hapChar.OutletInUse,
+                value
+              )
+              subAccessory.eveService.addEntry({ status: value ? 1 : 0 })
+              if (i > 0 && !this.disableDeviceLogging) {
+                this.log(
+                  '[%s] %s [%s].',
+                  subAccessory.displayName,
+                  this.lang.curState,
+                  value ? 'on' : 'off'
+                )
+              }
+            }
+          }
+          break
+        case '1':
+        case '2':
+        case '3':
+        case '4':
+          for (let i = 1; i <= this.accessory.context.channelCount; i++) {
+            const idToCheck = this.accessory.context.eweDeviceId + 'SW' + i
+            const uuid = this.platform.api.hap.uuid.generate(idToCheck)
+            let subAccessory
+            if ((subAccessory = this.platform.devicesInHB.get(uuid))) {
+              if (
+                subAccessory.getService(this.hapServ.Outlet)
+                  .getCharacteristic(this.hapChar.On).value
+              ) {
+                masterState = 'on'
+              }
+              if (i === parseInt(switchNumber)) {
+                subAccessory.eveService.addEntry({ status: value ? 1 : 0 })
+                subAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
+                  this.hapChar.OutletInUse,
+                  value
+                )
+                if (i > 0 && !this.disableDeviceLogging) {
+                  this.log(
+                    '[%s] %s [%s].',
+                    subAccessory.displayName,
+                    this.lang.curState,
+                    value ? 'on' : 'off'
+                  )
+                }
+              }
+            }
+          }
+          if (!this.platform.hideMasters.includes(this.accessory.context.eweDeviceId)) {
+            const idToCheck = this.accessory.context.eweDeviceId + 'SW0'
+            const uuid = this.platform.api.hap.uuid.generate(idToCheck)
+            const subAccessory = this.platform.devicesInHB.get(uuid)
+            subAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
+              this.hapChar.On,
+              masterState === 'on'
+            )
+            subAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
+              this.hapChar.OutletInUse,
+              masterState === 'on'
+            )
+            subAccessory.eveService.addEntry({ status: masterState === 'on' ? 1 : 0 })
+          }
+          break
+      }
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, true)
+      setTimeout(() => {
+        this.service.updateCharacteristic(this.hapChar.On, !value)
+      }, 5000)
+      throw new this.platform.api.hap.HapStatusError(-70402)
+    }
+  }
+
+  async externalUpdate (params) {
+    try {
+      if (!params.switches) {
+        return
+      }
+      const idToCheck = this.accessory.context.eweDeviceId + 'SW'
+      let primaryState = false
+      for (let i = 1; i <= this.accessory.context.channelCount; i++) {
+        if (params.switches[i - 1].switch === 'on') {
+          primaryState = true
+        }
+        const uuid = this.platform.api.hap.uuid.generate(idToCheck + i)
+        if (this.platform.devicesInHB.has(uuid)) {
+          const subAccessory = this.platform.devicesInHB.get(uuid)
+          const service = subAccessory.getService(this.hapServ.Outlet)
+          const currentState = service.getCharacteristic(this.hapChar.On).value
+            ? 'on'
+            : 'off'
+          if (params.updateSource && params.switches[i - 1].switch === currentState) {
+            continue
+          }
+          subAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
+            this.hapChar.On,
+            params.switches[i - 1].switch === 'on'
+          )
+          subAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
+            this.hapChar.OutletInUse,
+            params.switches[i - 1].switch === 'on'
+          )
+          subAccessory.eveService.addEntry({
+            status: params.switches[i - 1].switch === 'on' ? 1 : 0
+          })
+          if (params.updateSource && !this.disableDeviceLogging) {
+            this.log(
+              '[%s] %s [%s].',
+              subAccessory.displayName,
+              this.lang.curState,
+              params.switches[i - 1].switch
+            )
+          }
+        }
+      }
+      if (!this.platform.hideMasters.includes(this.accessory.context.eweDeviceId)) {
+        this.service.updateCharacteristic(this.hapChar.On, primaryState)
+        this.service.updateCharacteristic(this.hapChar.OutletInUse, primaryState)
+      }
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, false)
+    }
+  }
+}
diff --git a/lib/device/outlet-scm.js b/lib/device/outlet-scm.js
index b5fc86e8..bdf92cec 100644
--- a/lib/device/outlet-scm.js
+++ b/lib/device/outlet-scm.js
@@ -52,11 +52,6 @@ module.exports = class deviceOutletSCM {
       await this.internalStateUpdate(value)
     })
 
-    // Pass the accessory to Fakegato to set up with Eve
-    this.accessory.eveService = new this.platform.eveService('switch', this.accessory, {
-      log: platform.config.debugFakegato ? this.log : () => {}
-    })
-
     // Output the customised options to the log if in debug mode
     if (this.debug) {
       const opts = JSON.stringify({
@@ -75,7 +70,6 @@ module.exports = class deviceOutletSCM {
       }
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.cacheState = newValue
-      this.accessory.eveService.addEntry({ status: value ? 1 : 0 })
       if (!this.disableDeviceLogging) {
         this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
       }
@@ -96,7 +90,6 @@ module.exports = class deviceOutletSCM {
       const newStatus = params.switches[0].switch === 'on'
       this.service.updateCharacteristic(this.hapChar.On, newStatus)
       this.cacheState = params.switches[0].switch
-      this.accessory.eveService.addEntry({ status: newStatus ? 1 : 0 })
       if (params.updateSource && !this.disableDeviceLogging) {
         this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
       }
diff --git a/lib/device/outlet.js b/lib/device/outlet-single.js
similarity index 98%
rename from lib/device/outlet.js
rename to lib/device/outlet-single.js
index 85524204..fbd1c863 100644
--- a/lib/device/outlet.js
+++ b/lib/device/outlet-single.js
@@ -2,7 +2,7 @@
 /* eslint-disable new-cap */
 'use strict'
 
-module.exports = class deviceOutlet {
+module.exports = class deviceOutletSingle {
   constructor (platform, accessory) {
     // Set up variables from the platform
     this.consts = platform.consts
@@ -68,7 +68,7 @@ module.exports = class deviceOutlet {
     })
 
     // Pass the accessory to Fakegato to set up with Eve
-    this.accessory.eveService = new this.platform.eveService('energy', this.accessory, {
+    this.accessory.eveService = new platform.eveService('energy', this.accessory, {
       log: platform.config.debugFakegato ? this.log : () => {}
     })
 
diff --git a/lib/device/rf-bridge.js b/lib/device/rf-bridge.js
index efabcd12..27196ab1 100644
--- a/lib/device/rf-bridge.js
+++ b/lib/device/rf-bridge.js
@@ -101,7 +101,7 @@ module.exports = class deviceRFBridge {
       service.updateCharacteristic(char, 0)
 
       // Pass the accessory to Fakegato to set up with Eve
-      this.accessory.eveService = new this.platform.eveService(eveType, this.accessory, {
+      this.accessory.eveService = new platform.eveService(eveType, this.accessory, {
         log: platform.config.debugFakegato ? this.log : () => {}
       })
     }
diff --git a/lib/device/sensor-ambient.js b/lib/device/sensor-ambient.js
index 71242cff..0c34b28e 100644
--- a/lib/device/sensor-ambient.js
+++ b/lib/device/sensor-ambient.js
@@ -79,7 +79,7 @@ module.exports = class deviceSensorAmbient {
     }
 
     // Pass the accessory to Fakegato to set up with Eve
-    this.accessory.eveService = new this.platform.eveService('custom', this.accessory, {
+    this.accessory.eveService = new platform.eveService('custom', this.accessory, {
       log: platform.config.debugFakegato ? this.log : () => {}
     })
 
diff --git a/lib/device/sensor-contact.js b/lib/device/sensor-contact.js
index 9ae1526c..7550c244 100644
--- a/lib/device/sensor-contact.js
+++ b/lib/device/sensor-contact.js
@@ -58,7 +58,7 @@ module.exports = class deviceSensorContact {
       this.accessory.addService(this.hapServ.BatteryService)
 
     // Pass the accessory to Fakegato to set up with Eve
-    this.accessory.eveService = new this.platform.eveService('door', this.accessory, {
+    this.accessory.eveService = new platform.eveService('door', this.accessory, {
       log: platform.config.debugFakegato ? this.log : () => {}
     })
 
diff --git a/lib/device/sensor-temp-humi.js b/lib/device/sensor-temp-humi.js
index cb713d16..40c68b73 100644
--- a/lib/device/sensor-temp-humi.js
+++ b/lib/device/sensor-temp-humi.js
@@ -42,7 +42,7 @@ module.exports = class deviceSensorTempHumi {
       this.accessory.addService(this.hapServ.HumiditySensor)
 
     // Pass the accessory to Fakegato to set up with Eve
-    this.accessory.eveService = new this.platform.eveService('custom', this.accessory, {
+    this.accessory.eveService = new platform.eveService('custom', this.accessory, {
       log: platform.config.debugFakegato ? this.log : () => {}
     })
 
diff --git a/lib/device/simulation/garage-eachen.js b/lib/device/simulation/garage-eachen.js
index 8d2aead9..6656f49a 100644
--- a/lib/device/simulation/garage-eachen.js
+++ b/lib/device/simulation/garage-eachen.js
@@ -73,7 +73,7 @@ module.exports = class deviceGarageEachen {
     this.service.updateCharacteristic(this.hapChar.ObstructionDetected, false)
 
     // Pass the accessory to Fakegato to set up with Eve
-    this.accessory.eveService = new this.platform.eveService('door', this.accessory, {
+    this.accessory.eveService = new platform.eveService('door', this.accessory, {
       log: platform.config.debugFakegato ? this.log : () => {}
     })
 
diff --git a/lib/device/simulation/garage-one.js b/lib/device/simulation/garage-one.js
index f174f39e..61e7f9da 100644
--- a/lib/device/simulation/garage-one.js
+++ b/lib/device/simulation/garage-one.js
@@ -103,7 +103,7 @@ module.exports = class deviceGarageOne {
     })
 
     // Pass the accessory to Fakegato to set up with Eve
-    this.accessory.eveService = new this.platform.eveService('door', this.accessory, {
+    this.accessory.eveService = new platform.eveService('door', this.accessory, {
       log: platform.config.debugFakegato ? this.log : () => {}
     })
 
diff --git a/lib/device/simulation/sensor-leak.js b/lib/device/simulation/sensor-leak.js
index ec384461..26486c1e 100644
--- a/lib/device/simulation/sensor-leak.js
+++ b/lib/device/simulation/sensor-leak.js
@@ -47,7 +47,7 @@ module.exports = class deviceSensorLeak {
       this.accessory.addService(this.hapServ.BatteryService)
 
     // Pass the accessory to Fakegato to set up with Eve
-    this.accessory.eveService = new this.platform.eveService('door', this.accessory, {
+    this.accessory.eveService = new platform.eveService('door', this.accessory, {
       log: platform.config.debugFakegato ? this.log : () => {}
     })
 
diff --git a/lib/device/simulation/switch-valve.js b/lib/device/simulation/switch-valve.js
index 383fa3d6..a146d77e 100644
--- a/lib/device/simulation/switch-valve.js
+++ b/lib/device/simulation/switch-valve.js
@@ -68,7 +68,7 @@ module.exports = class deviceSwitchValve {
     })
 
     // Pass the accessory to Fakegato to set up with Eve
-    this.accessory.eveService = new this.platform.eveService('switch', this.accessory, {
+    this.accessory.eveService = new platform.eveService('switch', this.accessory, {
       log: platform.config.debugFakegato ? this.log : () => {}
     })
 
diff --git a/lib/device/simulation/thermostat.js b/lib/device/simulation/thermostat.js
index e3d2d6e9..1bbd724f 100644
--- a/lib/device/simulation/thermostat.js
+++ b/lib/device/simulation/thermostat.js
@@ -100,7 +100,7 @@ module.exports = class deviceThermostat {
     }
 
     // Pass the accessory to Fakegato to set up with Eve
-    this.accessory.eveService = new this.platform.eveService('custom', this.accessory, {
+    this.accessory.eveService = new platform.eveService('custom', this.accessory, {
       log: platform.config.debugFakegato ? this.log : () => {}
     })
 
diff --git a/lib/device/switch-double.js b/lib/device/switch-double.js
index 88138812..192c2b50 100644
--- a/lib/device/switch-double.js
+++ b/lib/device/switch-double.js
@@ -2,7 +2,7 @@
 /* eslint-disable new-cap */
 'use strict'
 
-module.exports = class deviceSwitchMulti {
+module.exports = class deviceSwitchDouble {
   constructor (platform, accessory) {
     // Set up variables from the platform
     this.consts = platform.consts
@@ -21,7 +21,6 @@ module.exports = class deviceSwitchMulti {
     // Set up custom variables for this device type
     const deviceId = this.accessory.context.eweDeviceId
     const deviceConf = platform.multiDevices[deviceId]
-    this.showAsOutlet = deviceConf && deviceConf.showAsOutlet
     this.hideChannels = deviceConf && deviceConf.hideChannels
       ? deviceConf.hideChannels
       : undefined
@@ -29,33 +28,22 @@ module.exports = class deviceSwitchMulti {
       ? false
       : platform.config.disableDeviceLogging
 
-    if (this.showAsOutlet) {
-      // If the accessory has a switch service then remove it
-      if (this.accessory.getService(this.hapServ.Switch)) {
-        this.accessory.removeService(this.accessory.getService(this.hapServ.Switch))
-      }
-
-      // Add the outlet service if it doesn't already exist
-      this.service = this.accessory.getService(this.hapServ.Outlet) ||
-        this.accessory.addService(this.hapServ.Outlet)
-    } else {
-      // If the accessory has an outlet service then remove it
-      if (this.accessory.getService(this.hapServ.Outlet)) {
-        this.accessory.removeService(this.accessory.getService(this.hapServ.Outlet))
-      }
-
-      // Add the switch service if it doesn't already exist
-      this.service = this.accessory.getService(this.hapServ.Switch) ||
-        this.accessory.addService(this.hapServ.Switch)
+    // If the accessory has an outlet service then remove it
+    if (this.accessory.getService(this.hapServ.Outlet)) {
+      this.accessory.removeService(this.accessory.getService(this.hapServ.Outlet))
     }
 
+    // Add the switch service if it doesn't already exist
+    this.service = this.accessory.getService(this.hapServ.Switch) ||
+      this.accessory.addService(this.hapServ.Switch)
+
     // Add the set handler to the switch/outlet on/off characteristic
     this.service.getCharacteristic(this.hapChar.On).onSet(async value => {
       await this.internalStateUpdate(value)
     })
 
     // Pass the accessory to Fakegato to set up with Eve
-    this.accessory.eveService = new this.platform.eveService('switch', this.accessory, {
+    this.accessory.eveService = new platform.eveService('switch', this.accessory, {
       log: platform.config.debugFakegato ? this.log : () => {}
     })
 
@@ -63,8 +51,7 @@ module.exports = class deviceSwitchMulti {
     if (this.debug) {
       const opts = JSON.stringify({
         disableDeviceLogging: this.disableDeviceLogging,
-        hideChannels: this.hideChannels,
-        showAsOutlet: this.showAsOutlet
+        hideChannels: this.hideChannels
       })
       this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
     }
@@ -95,21 +82,10 @@ module.exports = class deviceSwitchMulti {
             const uuid = this.platform.api.hap.uuid.generate(idToCheck)
             let subAccessory
             if ((subAccessory = this.platform.devicesInHB.get(uuid))) {
-              if (this.showAsOutlet) {
-                subAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
-                  this.hapChar.On,
-                  value
-                )
-                subAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
-                  this.hapChar.OutletInUse,
-                  value
-                )
-              } else {
-                subAccessory.getService(this.hapServ.Switch).updateCharacteristic(
-                  this.hapChar.On,
-                  value
-                )
-              }
+              subAccessory.getService(this.hapServ.Switch).updateCharacteristic(
+                this.hapChar.On,
+                value
+              )
               subAccessory.eveService.addEntry({ status: value ? 1 : 0 })
               if (i > 0 && !this.disableDeviceLogging) {
                 this.log(
@@ -129,22 +105,14 @@ module.exports = class deviceSwitchMulti {
             const uuid = this.platform.api.hap.uuid.generate(idToCheck)
             let subAccessory
             if ((subAccessory = this.platform.devicesInHB.get(uuid))) {
-              const service = this.showAsOutlet
-                ? this.hapServ.Outlet
-                : this.hapServ.Switch
               if (
-                subAccessory.getService(service).getCharacteristic(this.hapChar.On).value
+                subAccessory.getService(this.hapServ.Switch)
+                  .getCharacteristic(this.hapChar.On).value
               ) {
                 masterState = 'on'
               }
               if (i === parseInt(switchNumber)) {
                 subAccessory.eveService.addEntry({ status: value ? 1 : 0 })
-                if (this.showAsOutlet) {
-                  subAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
-                    this.hapChar.OutletInUse,
-                    value
-                  )
-                }
                 if (i > 0 && !this.disableDeviceLogging) {
                   this.log(
                     '[%s] %s [%s].',
@@ -160,21 +128,10 @@ module.exports = class deviceSwitchMulti {
             const idToCheck = this.accessory.context.eweDeviceId + 'SW0'
             const uuid = this.platform.api.hap.uuid.generate(idToCheck)
             const subAccessory = this.platform.devicesInHB.get(uuid)
-            if (this.showAsOutlet) {
-              subAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
-                this.hapChar.On,
-                masterState === 'on'
-              )
-              subAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
-                this.hapChar.OutletInUse,
-                masterState === 'on'
-              )
-            } else {
-              subAccessory.getService(this.hapServ.Switch).updateCharacteristic(
-                this.hapChar.On,
-                masterState === 'on'
-              )
-            }
+            subAccessory.getService(this.hapServ.Switch).updateCharacteristic(
+              this.hapChar.On,
+              masterState === 'on'
+            )
             subAccessory.eveService.addEntry({ status: masterState === 'on' ? 1 : 0 })
           }
           break
@@ -202,29 +159,17 @@ module.exports = class deviceSwitchMulti {
         const uuid = this.platform.api.hap.uuid.generate(idToCheck + i)
         if (this.platform.devicesInHB.has(uuid)) {
           const subAccessory = this.platform.devicesInHB.get(uuid)
-          const servToUse = this.showAsOutlet ? this.hapServ.Outlet : this.hapServ.Switch
-          const service = subAccessory.getService(servToUse)
+          const service = subAccessory.getService(this.hapServ.Switch)
           const currentState = service.getCharacteristic(this.hapChar.On).value
             ? 'on'
             : 'off'
           if (params.updateSource && params.switches[i - 1].switch === currentState) {
             continue
           }
-          if (this.showAsOutlet) {
-            subAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
-              this.hapChar.On,
-              params.switches[i - 1].switch === 'on'
-            )
-            subAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
-              this.hapChar.OutletInUse,
-              params.switches[i - 1].switch === 'on'
-            )
-          } else {
-            subAccessory.getService(this.hapServ.Switch).updateCharacteristic(
-              this.hapChar.On,
-              params.switches[i - 1].switch === 'on'
-            )
-          }
+          subAccessory.getService(this.hapServ.Switch).updateCharacteristic(
+            this.hapChar.On,
+            params.switches[i - 1].switch === 'on'
+          )
           subAccessory.eveService.addEntry({
             status: params.switches[i - 1].switch === 'on' ? 1 : 0
           })
@@ -240,9 +185,6 @@ module.exports = class deviceSwitchMulti {
       }
       if (!this.platform.hideMasters.includes(this.accessory.context.eweDeviceId)) {
         this.service.updateCharacteristic(this.hapChar.On, primaryState)
-        if (this.showAsOutlet) {
-          this.service.updateCharacteristic(this.hapChar.OutletInUse, primaryState)
-        }
         this.accessory.eveService.addEntry({ status: primaryState ? 1 : 0 })
       }
     } catch (err) {
diff --git a/lib/device/switch-multi.js b/lib/device/switch-multi.js
index f1c04966..d697fade 100644
--- a/lib/device/switch-multi.js
+++ b/lib/device/switch-multi.js
@@ -21,7 +21,6 @@ module.exports = class deviceSwitchMulti {
     // Set up custom variables for this device type
     const deviceId = this.accessory.context.eweDeviceId
     const deviceConf = platform.multiDevices[deviceId]
-    this.showAsOutlet = deviceConf && deviceConf.showAsOutlet
     this.hideChannels = deviceConf && deviceConf.hideChannels
       ? deviceConf.hideChannels
       : undefined
@@ -29,33 +28,22 @@ module.exports = class deviceSwitchMulti {
       ? false
       : platform.config.disableDeviceLogging
 
-    if (this.showAsOutlet) {
-      // If the accessory has a switch service then remove it
-      if (this.accessory.getService(this.hapServ.Switch)) {
-        this.accessory.removeService(this.accessory.getService(this.hapServ.Switch))
-      }
-
-      // Add the outlet service if it doesn't already exist
-      this.service = this.accessory.getService(this.hapServ.Outlet) ||
-        this.accessory.addService(this.hapServ.Outlet)
-    } else {
-      // If the accessory has an outlet service then remove it
-      if (this.accessory.getService(this.hapServ.Outlet)) {
-        this.accessory.removeService(this.accessory.getService(this.hapServ.Outlet))
-      }
-
-      // Add the switch service if it doesn't already exist
-      this.service = this.accessory.getService(this.hapServ.Switch) ||
-        this.accessory.addService(this.hapServ.Switch)
+    // If the accessory has an outlet service then remove it
+    if (this.accessory.getService(this.hapServ.Outlet)) {
+      this.accessory.removeService(this.accessory.getService(this.hapServ.Outlet))
     }
 
+    // Add the switch service if it doesn't already exist
+    this.service = this.accessory.getService(this.hapServ.Switch) ||
+      this.accessory.addService(this.hapServ.Switch)
+
     // Add the set handler to the switch/outlet on/off characteristic
     this.service.getCharacteristic(this.hapChar.On).onSet(async value => {
       await this.internalStateUpdate(value)
     })
 
     // Pass the accessory to Fakegato to set up with Eve
-    this.accessory.eveService = new this.platform.eveService('switch', this.accessory, {
+    this.accessory.eveService = new platform.eveService('switch', this.accessory, {
       log: platform.config.debugFakegato ? this.log : () => {}
     })
 
@@ -63,8 +51,7 @@ module.exports = class deviceSwitchMulti {
     if (this.debug) {
       const opts = JSON.stringify({
         disableDeviceLogging: this.disableDeviceLogging,
-        hideChannels: this.hideChannels,
-        showAsOutlet: this.showAsOutlet
+        hideChannels: this.hideChannels
       })
       this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
     }
@@ -99,21 +86,10 @@ module.exports = class deviceSwitchMulti {
             const uuid = this.platform.api.hap.uuid.generate(idToCheck)
             let subAccessory
             if ((subAccessory = this.platform.devicesInHB.get(uuid))) {
-              if (this.showAsOutlet) {
-                subAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
-                  this.hapChar.On,
-                  value
-                )
-                subAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
-                  this.hapChar.OutletInUse,
-                  value
-                )
-              } else {
-                subAccessory.getService(this.hapServ.Switch).updateCharacteristic(
-                  this.hapChar.On,
-                  value
-                )
-              }
+              subAccessory.getService(this.hapServ.Switch).updateCharacteristic(
+                this.hapChar.On,
+                value
+              )
               subAccessory.eveService.addEntry({ status: value ? 1 : 0 })
               if (i > 0 && !this.disableDeviceLogging) {
                 this.log(
@@ -135,22 +111,14 @@ module.exports = class deviceSwitchMulti {
             const uuid = this.platform.api.hap.uuid.generate(idToCheck)
             let subAccessory
             if ((subAccessory = this.platform.devicesInHB.get(uuid))) {
-              const service = this.showAsOutlet
-                ? this.hapServ.Outlet
-                : this.hapServ.Switch
               if (
-                subAccessory.getService(service).getCharacteristic(this.hapChar.On).value
+                subAccessory.getService(this.hapServ.Switch)
+                  .getCharacteristic(this.hapChar.On).value
               ) {
                 masterState = 'on'
               }
               if (i === parseInt(switchNumber)) {
                 subAccessory.eveService.addEntry({ status: value ? 1 : 0 })
-                if (this.showAsOutlet) {
-                  subAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
-                    this.hapChar.OutletInUse,
-                    value
-                  )
-                }
                 if (i > 0 && !this.disableDeviceLogging) {
                   this.log(
                     '[%s] %s [%s].',
@@ -166,21 +134,10 @@ module.exports = class deviceSwitchMulti {
             const idToCheck = this.accessory.context.eweDeviceId + 'SW0'
             const uuid = this.platform.api.hap.uuid.generate(idToCheck)
             const subAccessory = this.platform.devicesInHB.get(uuid)
-            if (this.showAsOutlet) {
-              subAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
-                this.hapChar.On,
-                masterState === 'on'
-              )
-              subAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
-                this.hapChar.OutletInUse,
-                masterState === 'on'
-              )
-            } else {
-              subAccessory.getService(this.hapServ.Switch).updateCharacteristic(
-                this.hapChar.On,
-                masterState === 'on'
-              )
-            }
+            subAccessory.getService(this.hapServ.Switch).updateCharacteristic(
+              this.hapChar.On,
+              masterState === 'on'
+            )
             subAccessory.eveService.addEntry({ status: masterState === 'on' ? 1 : 0 })
           }
           break
@@ -208,29 +165,17 @@ module.exports = class deviceSwitchMulti {
         const uuid = this.platform.api.hap.uuid.generate(idToCheck + i)
         if (this.platform.devicesInHB.has(uuid)) {
           const subAccessory = this.platform.devicesInHB.get(uuid)
-          const servToUse = this.showAsOutlet ? this.hapServ.Outlet : this.hapServ.Switch
-          const service = subAccessory.getService(servToUse)
+          const service = subAccessory.getService(this.hapServ.Switch)
           const currentState = service.getCharacteristic(this.hapChar.On).value
             ? 'on'
             : 'off'
           if (params.updateSource && params.switches[i - 1].switch === currentState) {
             continue
           }
-          if (this.showAsOutlet) {
-            subAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
-              this.hapChar.On,
-              params.switches[i - 1].switch === 'on'
-            )
-            subAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
-              this.hapChar.OutletInUse,
-              params.switches[i - 1].switch === 'on'
-            )
-          } else {
-            subAccessory.getService(this.hapServ.Switch).updateCharacteristic(
-              this.hapChar.On,
-              params.switches[i - 1].switch === 'on'
-            )
-          }
+          subAccessory.getService(this.hapServ.Switch).updateCharacteristic(
+            this.hapChar.On,
+            params.switches[i - 1].switch === 'on'
+          )
           subAccessory.eveService.addEntry({
             status: params.switches[i - 1].switch === 'on' ? 1 : 0
           })
@@ -246,9 +191,6 @@ module.exports = class deviceSwitchMulti {
       }
       if (!this.platform.hideMasters.includes(this.accessory.context.eweDeviceId)) {
         this.service.updateCharacteristic(this.hapChar.On, primaryState)
-        if (this.showAsOutlet) {
-          this.service.updateCharacteristic(this.hapChar.OutletInUse, primaryState)
-        }
         this.accessory.eveService.addEntry({ status: primaryState ? 1 : 0 })
       }
     } catch (err) {
diff --git a/lib/device/switch-single.js b/lib/device/switch-single.js
index 3d6301a0..d37b4b39 100644
--- a/lib/device/switch-single.js
+++ b/lib/device/switch-single.js
@@ -40,7 +40,7 @@ module.exports = class deviceSwitchSingle {
     })
 
     // Pass the accessory to Fakegato to set up with Eve
-    this.accessory.eveService = new this.platform.eveService('switch', this.accessory, {
+    this.accessory.eveService = new platform.eveService('switch', this.accessory, {
       log: platform.config.debugFakegato ? this.log : () => {}
     })
 
diff --git a/lib/device/thermostat.js b/lib/device/thermostat.js
index e0c19ce2..e49d0551 100644
--- a/lib/device/thermostat.js
+++ b/lib/device/thermostat.js
@@ -80,7 +80,7 @@ module.exports = class deviceThermostat {
       })
 
     // Pass the accessory to Fakegato to set up with Eve
-    this.accessory.eveService = new this.platform.eveService('custom', this.accessory, {
+    this.accessory.eveService = new platform.eveService('custom', this.accessory, {
       log: platform.config.debugFakegato ? this.log : () => {}
     })
 
diff --git a/lib/device/zigbee/sensor-ambient.js b/lib/device/zigbee/sensor-ambient.js
index d116f8c2..cb4a16c5 100644
--- a/lib/device/zigbee/sensor-ambient.js
+++ b/lib/device/zigbee/sensor-ambient.js
@@ -46,7 +46,7 @@ module.exports = class deviceZBSensorAmbient {
       this.accessory.addService(this.hapServ.BatteryService)
 
     // Pass the accessory to Fakegato to set up with Eve
-    this.accessory.eveService = new this.platform.eveService('weather', this.accessory, {
+    this.accessory.eveService = new platform.eveService('weather', this.accessory, {
       log: platform.config.debugFakegato ? this.log : () => {}
     })
 
diff --git a/lib/device/zigbee/sensor-contact.js b/lib/device/zigbee/sensor-contact.js
index 6ad70bf4..1a42828f 100644
--- a/lib/device/zigbee/sensor-contact.js
+++ b/lib/device/zigbee/sensor-contact.js
@@ -54,7 +54,7 @@ module.exports = class deviceZBSensorContact {
       this.accessory.addService(this.hapServ.BatteryService)
 
     // Pass the accessory to Fakegato to set up with Eve
-    this.accessory.eveService = new this.platform.eveService('door', this.accessory, {
+    this.accessory.eveService = new platform.eveService('door', this.accessory, {
       log: platform.config.debugFakegato ? this.log : () => {}
     })
 
diff --git a/lib/device/zigbee/sensor-motion.js b/lib/device/zigbee/sensor-motion.js
index 0ea2ab2c..1c4b58c2 100644
--- a/lib/device/zigbee/sensor-motion.js
+++ b/lib/device/zigbee/sensor-motion.js
@@ -42,7 +42,7 @@ module.exports = class deviceZBSensorMotion {
     this.battService = this.accessory.getService(this.hapServ.BatteryService) || this.accessory.addService(this.hapServ.BatteryService)
 
     // Pass the accessory to Fakegato to set up with Eve
-    this.accessory.eveService = new this.platform.eveService('motion', this.accessory, {
+    this.accessory.eveService = new platform.eveService('motion', this.accessory, {
       log: platform.config.debugFakegato ? this.log : () => {}
     })
 
diff --git a/lib/device/zigbee/switch-single.js b/lib/device/zigbee/switch-single.js
index f44c17e9..435119bb 100644
--- a/lib/device/zigbee/switch-single.js
+++ b/lib/device/zigbee/switch-single.js
@@ -43,7 +43,7 @@ module.exports = class deviceZBSwitchSingle {
       })
 
     // Pass the accessory to Fakegato to set up with Eve
-    this.accessory.eveService = new this.platform.eveService('switch', this.accessory, {
+    this.accessory.eveService = new platform.eveService('switch', this.accessory, {
       log: platform.config.debugFakegato ? this.log : () => {}
     })
 
diff --git a/lib/index.js b/lib/index.js
index 985c6efe..d8700d42 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -880,7 +880,7 @@ class eWeLinkPlatform {
         accessory.control = this.outletDevices[device.deviceid] &&
           this.outletDevices[device.deviceid].showAsSwitch
           ? new (require('./device/switch-single'))(this, accessory)
-          : new (require('./device/outlet'))(this, accessory)
+          : new (require('./device/outlet-single'))(this, accessory)
         /*****/
       } else if (this.consts.devices.outletSCM.includes(uiid)) {
         /*************************************
@@ -936,7 +936,7 @@ class eWeLinkPlatform {
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = this.singleDevices[device.deviceid] &&
           this.singleDevices[device.deviceid].showAsOutlet
-          ? new (require('./device/outlet'))(this, accessory)
+          ? new (require('./device/outlet-single'))(this, accessory)
           : new (require('./device/switch-single'))(this, accessory)
         /***********************/
       } else if (
@@ -987,8 +987,14 @@ class eWeLinkPlatform {
             ? this.lanDevices.get(device.deviceid).ip
             : false
           subAccessory.control = this.consts.devices.doubleSwitch.includes(uiid)
-            ? new (require('./device/switch-double'))(this, subAccessory)
-            : new (require('./device/switch-multi'))(this, subAccessory)
+            ? this.multiDevices[device.deviceid] &&
+              this.multiDevices[device.deviceid].showAsOutlet
+              ? new (require('./device/outlet-double'))(this, subAccessory)
+              : new (require('./device/switch-double'))(this, subAccessory)
+            : this.multiDevices[device.deviceid] &&
+              this.multiDevices[device.deviceid].showAsOutlet
+              ? new (require('./device/outlet-multi'))(this, subAccessory)
+              : new (require('./device/switch-multi'))(this, subAccessory)
 
           // Update any changes to the sub accessory to the platform
           this.api.updatePlatformAccessories(PLUGIN.name, PLUGIN.alias, [subAccessory])

From a18ffe3e8865dbf708711b44b27d2923f17ea878 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 3 May 2021 14:36:12 +0100
Subject: [PATCH 1966/3183] change polling interval to 60 seconds

---
 config.schema.json          | 11 -----
 lib/device/outlet-double.js | 19 +++++++++
 lib/device/outlet-single.js | 85 +++++++++++++++++--------------------
 lib/index.js                |  1 -
 lib/utils/constants.js      |  4 +-
 5 files changed, 59 insertions(+), 61 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index b6e82620..d88e95ee 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -184,16 +184,6 @@
                 "functionBody": "return (model.outletDevices[arrayIndices] && !model.outletDevices[arrayIndices].showAsSwitch);"
               }
             },
-            "pollingInterval": {
-              "type": "number",
-              "title": "Polling Interval",
-              "description": "If your outlet doesn't regularly send power usage to the plugin you can use this to set up a polling interval in seconds. Must be 15 or more.",
-              "placeholder": 30,
-              "minimum": 15,
-              "condition": {
-                "functionBody": "return (model.outletDevices[arrayIndices] && !model.outletDevices[arrayIndices].showAsSwitch);"
-              }
-            },
             "ipAddress": {
               "type": "string",
               "title": "IP Address",
@@ -731,7 +721,6 @@
           "outletDevices[].label",
           "outletDevices[].showAsSwitch",
           "outletDevices[].inUsePowerThreshold",
-          "outletDevices[].pollingInterval",
           "outletDevices[].ipAddress",
           "outletDevices[].overrideDisabledLogging"
         ]
diff --git a/lib/device/outlet-double.js b/lib/device/outlet-double.js
index 01a6c76a..75f559ae 100644
--- a/lib/device/outlet-double.js
+++ b/lib/device/outlet-double.js
@@ -69,6 +69,16 @@ module.exports = class deviceOutletDouble {
       log: platform.config.debugFakegato ? this.log : () => {}
     })
 
+    setTimeout(() => {
+      this.internalUIUpdate()
+      this.intervalPoll = setInterval(() => this.internalUIUpdate(), 60000)
+    }, 5000)
+
+    // Stop the intervals on Homebridge shutdown
+    platform.api.on('shutdown', () => {
+      clearInterval(this.intervalPoll)
+    })
+
     // Output the customised options to the log if in debug mode
     if (this.debug) {
       const opts = JSON.stringify({
@@ -180,6 +190,15 @@ module.exports = class deviceOutletDouble {
     }
   }
 
+  async internalUIUpdate () {
+    try {
+      const params = { uiActive: 60 }
+      await this.platform.sendDeviceUpdate(this.accessory, params, true)
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, true)
+    }
+  }
+
   async externalUpdate (params) {
     try {
       if (!params.switches) {
diff --git a/lib/device/outlet-single.js b/lib/device/outlet-single.js
index fbd1c863..a5a425fb 100644
--- a/lib/device/outlet-single.js
+++ b/lib/device/outlet-single.js
@@ -25,9 +25,6 @@ module.exports = class deviceOutletSingle {
     this.inUsePowerThreshold = deviceConf && deviceConf.inUsePowerThreshold
       ? deviceConf.inUsePowerThreshold
       : platform.consts.defaultValues.inUsePowerThreshold
-    this.pollingInterval = deviceConf && deviceConf.pollingInterval
-      ? deviceConf.pollingInterval
-      : false
     this.disableDeviceLogging = deviceConf && deviceConf.overrideDisabledLogging
       ? false
       : platform.config.disableDeviceLogging
@@ -72,64 +69,60 @@ module.exports = class deviceOutletSingle {
       log: platform.config.debugFakegato ? this.log : () => {}
     })
 
-    // Set up an interval for the plugin to calculate an approx total consumption
-    this.intervalPower = setInterval(() => {
-      // Every 30 seconds start with a zero reading
-      let total = 0
+    if (this.consts.devices.outlet.includes(this.accessory.context.eweUIID)) {
+      // Set up an interval for the plugin to calculate an approx total consumption
+      this.intervalPower = setInterval(() => {
+        // Every 30 seconds start with a zero reading
+        let total = 0
 
-      // Check we have had readings within the previous 30 seconds
-      if (this.accessory.context.energyReadings.length > 0) {
-        // Accumulate the total from the energy readings
-        this.accessory.context.energyReadings.forEach(x => {
-          total += x
-        })
+        // Check we have had readings within the previous 30 seconds
+        if (this.accessory.context.energyReadings.length > 0) {
+          // Accumulate the total from the energy readings
+          this.accessory.context.energyReadings.forEach(x => {
+            total += x
+          })
 
-        // Divide this by the number of entries to get an average W5m
-        total /= this.accessory.context.energyReadings.length
+          // Divide this by the number of entries to get an average W5m
+          total /= this.accessory.context.energyReadings.length
 
-        // Convert this to Wh
-        total /= 12
+          // Convert this to Wh
+          total /= 12
 
-        // Convert this to kWh
-        total /= 1000
+          // Convert this to kWh
+          total /= 1000
 
-        // Accumulate the grand total that Eve reads as the total consumption
-        this.accessory.context.energyReadingTotal += total
-      }
+          // Accumulate the grand total that Eve reads as the total consumption
+          this.accessory.context.energyReadingTotal += total
+        }
 
-      // Reset the array for each 30 second readings
-      this.accessory.context.energyReadings = []
+        // Reset the array for each 30 second readings
+        this.accessory.context.energyReadings = []
+
+        // Update Eve with the new grand total
+        this.service.updateCharacteristic(
+          this.eveChar.TotalConsumption,
+          this.accessory.context.energyReadingTotal
+        )
+      }, 30000)
 
-      // Update Eve with the new grand total
-      this.service.updateCharacteristic(
-        this.eveChar.TotalConsumption,
-        this.accessory.context.energyReadingTotal
-      )
-    }, 30000)
-
-    if (
-      this.consts.devices.outlet.includes(this.accessory.context.eweUIID) &&
-      this.pollingInterval
-    ) {
+      // Set up an interval to get eWeLink to send power updates
       setTimeout(() => {
-        const milli = this.pollingInterval * 1000
         this.internalUIUpdate()
-        this.intervalPoll = setInterval(() => this.internalUIUpdate(), milli)
+        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 60000)
       }, 5000)
-    }
 
-    // Stop the intervals on Homebridge shutdown
-    platform.api.on('shutdown', () => {
-      clearInterval(this.intervalPoll)
-      clearInterval(this.intervalPower)
-    })
+      // Stop the intervals on Homebridge shutdown
+      platform.api.on('shutdown', () => {
+        clearInterval(this.intervalPoll)
+        clearInterval(this.intervalPower)
+      })
+    }
 
     // Output the customised options to the log if in debug mode
     if (this.debug) {
       const opts = JSON.stringify({
         disableDeviceLogging: this.disableDeviceLogging,
-        inUsePowerThreshold: this.inUsePowerThreshold,
-        pollingInterval: this.pollingInterval
+        inUsePowerThreshold: this.inUsePowerThreshold
       })
       this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
     }
@@ -156,7 +149,7 @@ module.exports = class deviceOutletSingle {
 
   async internalUIUpdate () {
     try {
-      const params = { uiActive: this.pollingInterval }
+      const params = { uiActive: 60 }
       await this.platform.sendDeviceUpdate(this.accessory, params, true)
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
diff --git a/lib/index.js b/lib/index.js
index d8700d42..1b5d9ae8 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -195,7 +195,6 @@ class eWeLinkPlatform {
                   case 'lowBattThreshold':
                   case 'minTarget':
                   case 'maxTarget':
-                  case 'pollingInterval':
                   case 'sensorTimeDifference': {
                     if (typeof v === 'string') {
                       logQuotes(key + '.' + id + '.' + k)
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index e58b1066..5db8ebfe 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -28,7 +28,6 @@ module.exports = {
 
   defaultValues: {
     inUsePowerThreshold: 0,
-    pollingInterval: 30,
     lowBattThreshold: 25,
     sensorTimeLength: 60,
     sensorTimeDifference: 120,
@@ -45,7 +44,6 @@ module.exports = {
 
   minValues: {
     inUsePowerThreshold: 0,
-    pollingInterval: 15,
     lowBattThreshold: 5,
     sensorTimeLength: 1,
     sensorTimeDifference: 10,
@@ -73,7 +71,7 @@ module.exports = {
     ],
     outletDevices: [
       'deviceId', 'label', 'showAsSwitch', 'inUsePowerThreshold', 'ipAddress',
-      'pollingInterval', 'overrideDisabledLogging'
+      'overrideDisabledLogging'
     ],
     lightDevices: [
       'deviceId', 'label', 'bulbModel', 'brightnessStep', 'adaptiveLightingShift',

From 2889dfd7876c21dc9aeae23946f192d2cd2bce7b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 3 May 2021 14:36:14 +0100
Subject: [PATCH 1967/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fcd696a1..2bb0ab16 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 ### Changes
 
+* Change Sonoff POWR2/S31 polling interval to a fixed 60 seconds
 * RF Bridge remote buttons will turn on for 3 seconds in HomeKit when pressed
 * iFan speed will now log as {low, medium, high}
 * More language strings added to separate language file

From e30663af8b0c36928f25feb8f89841e724270094 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 3 May 2021 14:36:41 +0100
Subject: [PATCH 1968/3183] 6.3.1-beta.5

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 920c57d5..c1e60059 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.3.1-beta.4",
+  "version": "6.3.1-beta.5",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 6abd5d79..9ca85d78 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.3.1-beta.4",
+  "version": "6.3.1-beta.5",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 2f84f9ed7133ad3acb1311b5fa86052524d57b89 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 3 May 2021 15:12:38 +0100
Subject: [PATCH 1969/3183] attempt to add power readings to dualr3 as outlet

---
 lib/device/outlet-double.js | 96 +++++++++++++++++++++++--------------
 lib/device/outlet-multi.js  |  6 ---
 2 files changed, 60 insertions(+), 42 deletions(-)

diff --git a/lib/device/outlet-double.js b/lib/device/outlet-double.js
index 75f559ae..64c5975e 100644
--- a/lib/device/outlet-double.js
+++ b/lib/device/outlet-double.js
@@ -110,7 +110,7 @@ module.exports = class deviceOutletDouble {
       await this.platform.sendDeviceUpdate(this.accessory, params)
       switch (switchNumber) {
         case '0':
-          for (let i = 0; i <= this.accessory.context.channelCount; i++) {
+          for (let i = 0; i <= 2; i++) {
             const idToCheck = this.accessory.context.eweDeviceId + 'SW' + i
             const uuid = this.platform.api.hap.uuid.generate(idToCheck)
             let subAccessory
@@ -123,7 +123,6 @@ module.exports = class deviceOutletDouble {
                 this.hapChar.OutletInUse,
                 value
               )
-              subAccessory.eveService.addEntry({ status: value ? 1 : 0 })
               if (i > 0 && !this.disableDeviceLogging) {
                 this.log(
                   '[%s] %s [%s].',
@@ -149,7 +148,6 @@ module.exports = class deviceOutletDouble {
                 masterState = 'on'
               }
               if (i === parseInt(switchNumber)) {
-                subAccessory.eveService.addEntry({ status: value ? 1 : 0 })
                 subAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
                   this.hapChar.OutletInUse,
                   value
@@ -173,11 +171,6 @@ module.exports = class deviceOutletDouble {
               this.hapChar.On,
               masterState === 'on'
             )
-            subAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
-              this.hapChar.OutletInUse,
-              masterState === 'on'
-            )
-            subAccessory.eveService.addEntry({ status: masterState === 'on' ? 1 : 0 })
           }
           break
       }
@@ -201,42 +194,73 @@ module.exports = class deviceOutletDouble {
 
   async externalUpdate (params) {
     try {
-      if (!params.switches) {
-        return
-      }
       const idToCheck = this.accessory.context.eweDeviceId + 'SW'
       let primaryState = false
-      for (let i = 1; i <= this.accessory.context.channelCount; i++) {
-        if (params.switches[i - 1].switch === 'on') {
-          primaryState = true
-        }
+      for (let i = 1; i <= 2; i++) {
         const uuid = this.platform.api.hap.uuid.generate(idToCheck + i)
         if (this.platform.devicesInHB.has(uuid)) {
           const subAccessory = this.platform.devicesInHB.get(uuid)
           const service = subAccessory.getService(this.hapServ.Outlet)
-          const currentState = service.getCharacteristic(this.hapChar.On).value
-            ? 'on'
-            : 'off'
-          if (params.updateSource && params.switches[i - 1].switch === currentState) {
-            continue
+          if (params.switches) {
+            const currentState = service.getCharacteristic(this.hapChar.On).value
+              ? 'on'
+              : 'off'
+            if (!params.updateSource || params.switches[i - 1].switch !== currentState) {
+              service.updateCharacteristic(
+                this.hapChar.On,
+                params.switches[i - 1].switch === 'on'
+              )
+              if (params.updateSource && !this.disableDeviceLogging) {
+                this.log(
+                  '[%s] %s [%s].',
+                  subAccessory.displayName,
+                  this.lang.curState,
+                  params.switches[i - 1].switch
+                )
+              }
+            }
+          }
+          let logger = false
+          let power
+          let voltage
+          let current
+          if (this.funcs.hasProperty(params, 'actPow_0' + (i - 1))) {
+            power = parseFloat(params['actPow_0' + (i - 1)]) / 100
+            service.updateCharacteristic(
+              this.hapChar.OutletInUse,
+              power > this.inUsePowerThreshold
+            )
+            if (!primaryState && power > this.inUsePowerThreshold) {
+              primaryState = true
+            }
+            service.updateCharacteristic(this.eveChar.CurrentConsumption, power)
+            const isOn = service.getCharacteristic(this.hapChar.On).value
+            subAccessory.eveService.addEntry({ power: isOn ? power : 0 })
+            logger = true
+          }
+          if (this.funcs.hasProperty(params, 'voltage_0' + (i - 1))) {
+            voltage = parseFloat(params['voltage_0' + (i - 1)]) / 100
+            service.updateCharacteristic(this.eveChar.Voltage, voltage)
+            logger = true
+          }
+          if (this.funcs.hasProperty(params, 'current_0' + (i - 1))) {
+            current = parseFloat(params['current_0' + (i - 1)]) / 100
+            this.service.updateCharacteristic(this.eveChar.ElectricCurrent, current)
+            logger = true
           }
-          subAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
-            this.hapChar.On,
-            params.switches[i - 1].switch === 'on'
-          )
-          subAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
-            this.hapChar.OutletInUse,
-            params.switches[i - 1].switch === 'on'
-          )
-          subAccessory.eveService.addEntry({
-            status: params.switches[i - 1].switch === 'on' ? 1 : 0
-          })
-          if (params.updateSource && !this.disableDeviceLogging) {
+          if (params.updateSource && logger && !this.disableDeviceLogging) {
             this.log(
-              '[%s] %s [%s].',
-              subAccessory.displayName,
-              this.lang.curState,
-              params.switches[i - 1].switch
+              '[%s] %s%s%s.',
+              this.name,
+              power !== undefined
+                ? ' ' + this.lang.curPower + ' [' + power + 'W]'
+                : '',
+              voltage !== undefined
+                ? ' ' + this.lang.curVolt + ' [' + voltage + 'V]'
+                : '',
+              current !== undefined
+                ? ' ' + this.lang.curCurr + ' [' + current + 'A]'
+                : ''
             )
           }
         }
diff --git a/lib/device/outlet-multi.js b/lib/device/outlet-multi.js
index d88c17f0..ec6f9b46 100644
--- a/lib/device/outlet-multi.js
+++ b/lib/device/outlet-multi.js
@@ -90,7 +90,6 @@ module.exports = class deviceOutletMulti {
                 this.hapChar.OutletInUse,
                 value
               )
-              subAccessory.eveService.addEntry({ status: value ? 1 : 0 })
               if (i > 0 && !this.disableDeviceLogging) {
                 this.log(
                   '[%s] %s [%s].',
@@ -118,7 +117,6 @@ module.exports = class deviceOutletMulti {
                 masterState = 'on'
               }
               if (i === parseInt(switchNumber)) {
-                subAccessory.eveService.addEntry({ status: value ? 1 : 0 })
                 subAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
                   this.hapChar.OutletInUse,
                   value
@@ -146,7 +144,6 @@ module.exports = class deviceOutletMulti {
               this.hapChar.OutletInUse,
               masterState === 'on'
             )
-            subAccessory.eveService.addEntry({ status: masterState === 'on' ? 1 : 0 })
           }
           break
       }
@@ -188,9 +185,6 @@ module.exports = class deviceOutletMulti {
             this.hapChar.OutletInUse,
             params.switches[i - 1].switch === 'on'
           )
-          subAccessory.eveService.addEntry({
-            status: params.switches[i - 1].switch === 'on' ? 1 : 0
-          })
           if (params.updateSource && !this.disableDeviceLogging) {
             this.log(
               '[%s] %s [%s].',

From e6e3d07610ec38eaafc4344d4d5b80d3189e1f49 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 3 May 2021 15:13:35 +0100
Subject: [PATCH 1970/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2bb0ab16..eb667c4e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,10 +4,14 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 ## BETA
 
+### Added
+
+* Power, voltage and current readings for DUALR3 when exposed as outlets
+* RF Bridge remote buttons will turn on for 3 seconds in HomeKit when pressed
+
 ### Changes
 
 * Change Sonoff POWR2/S31 polling interval to a fixed 60 seconds
-* RF Bridge remote buttons will turn on for 3 seconds in HomeKit when pressed
 * iFan speed will now log as {low, medium, high}
 * More language strings added to separate language file
 * Backend function and variable name changes

From 5227ac394c4c6697776182abc03bc54c9fd7f5d2 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 3 May 2021 15:14:05 +0100
Subject: [PATCH 1971/3183] 6.3.1-beta.6

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c1e60059..4e2aa499 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.3.1-beta.5",
+  "version": "6.3.1-beta.6",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 9ca85d78..4343a1ff 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.3.1-beta.5",
+  "version": "6.3.1-beta.6",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From b358d9a169be7fb8a5e871b045aa5fe1790b4caa Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 3 May 2021 15:15:48 +0100
Subject: [PATCH 1972/3183] use service var

---
 lib/device/outlet-multi.js  | 4 ++--
 lib/device/switch-double.js | 2 +-
 lib/device/switch-multi.js  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/device/outlet-multi.js b/lib/device/outlet-multi.js
index ec6f9b46..748daac5 100644
--- a/lib/device/outlet-multi.js
+++ b/lib/device/outlet-multi.js
@@ -177,11 +177,11 @@ module.exports = class deviceOutletMulti {
           if (params.updateSource && params.switches[i - 1].switch === currentState) {
             continue
           }
-          subAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
+          service.updateCharacteristic(
             this.hapChar.On,
             params.switches[i - 1].switch === 'on'
           )
-          subAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
+          service.updateCharacteristic(
             this.hapChar.OutletInUse,
             params.switches[i - 1].switch === 'on'
           )
diff --git a/lib/device/switch-double.js b/lib/device/switch-double.js
index 192c2b50..3e79dbab 100644
--- a/lib/device/switch-double.js
+++ b/lib/device/switch-double.js
@@ -166,7 +166,7 @@ module.exports = class deviceSwitchDouble {
           if (params.updateSource && params.switches[i - 1].switch === currentState) {
             continue
           }
-          subAccessory.getService(this.hapServ.Switch).updateCharacteristic(
+          service.updateCharacteristic(
             this.hapChar.On,
             params.switches[i - 1].switch === 'on'
           )
diff --git a/lib/device/switch-multi.js b/lib/device/switch-multi.js
index d697fade..5c074817 100644
--- a/lib/device/switch-multi.js
+++ b/lib/device/switch-multi.js
@@ -172,7 +172,7 @@ module.exports = class deviceSwitchMulti {
           if (params.updateSource && params.switches[i - 1].switch === currentState) {
             continue
           }
-          subAccessory.getService(this.hapServ.Switch).updateCharacteristic(
+          service.updateCharacteristic(
             this.hapChar.On,
             params.switches[i - 1].switch === 'on'
           )

From d2f8f37a3d9c32637fc7e02d32182d89323b408b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 3 May 2021 15:16:14 +0100
Subject: [PATCH 1973/3183] 6.3.1-beta.7

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 4e2aa499..984c4cde 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.3.1-beta.6",
+  "version": "6.3.1-beta.7",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 4343a1ff..fbe894e5 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.3.1-beta.6",
+  "version": "6.3.1-beta.7",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From da4a487a6340eceba503b966050331ad795df0b6 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 3 May 2021 15:30:25 +0100
Subject: [PATCH 1974/3183] add inUsePowerThreshold for dualr3 in outlet mode

---
 config.schema.json          | 11 +++++++++++
 lib/device/outlet-double.js | 15 +--------------
 lib/utils/constants.js      |  4 ++--
 3 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index d88e95ee..5f214922 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -129,6 +129,16 @@
               "title": "Show As Outlets",
               "description": "If true, this accessory will show as outlets in HomeKit instead of switches."
             },
+            "inUsePowerThreshold": {
+              "type": "number",
+              "title": "Outlet 'In Use' Threshold",
+              "description": "Applies to DUALR3 devices. HomeKit will set the 'In Use' status of outlet devices to true when the wattage is above this number. Must be 0 or more.",
+              "placeholder": 0,
+              "minimum": 0,
+              "condition": {
+                "functionBody": "return (model.multiDevices[arrayIndices] && model.multiDevices[arrayIndices].showAsOutlet);"
+              }
+            },
             "hideChannels": {
               "type": "string",
               "title": "Hide Channels",
@@ -701,6 +711,7 @@
           "multiDevices[].deviceId",
           "multiDevices[].label",
           "multiDevices[].showAsOutlet",
+          "multiDevices[].inUsePowerThreshold",
           "multiDevices[].hideChannels",
           "multiDevices[].ipAddress",
           "multiDevices[].overrideDisabledLogging"
diff --git a/lib/device/outlet-double.js b/lib/device/outlet-double.js
index 64c5975e..a8375f1b 100644
--- a/lib/device/outlet-double.js
+++ b/lib/device/outlet-double.js
@@ -32,20 +32,6 @@ module.exports = class deviceOutletDouble {
       ? false
       : platform.config.disableDeviceLogging
 
-    // TotalConsumption is calculated by the plugin with these context readings
-    if (!this.funcs.hasProperty(this.accessory.context, 'energyReadingsOne')) {
-      this.accessory.context.energyReadingsOne = []
-    }
-    if (!this.funcs.hasProperty(this.accessory.context, 'energyReadingsTwo')) {
-      this.accessory.context.energyReadingsTwo = []
-    }
-    if (!this.funcs.hasProperty(this.accessory.context, 'energyReadingOneTotal')) {
-      this.accessory.context.energyReadingOneTotal = 0
-    }
-    if (!this.funcs.hasProperty(this.accessory.context, 'energyReadingTwoTotal')) {
-      this.accessory.context.energyReadingTwoTotal = 0
-    }
-
     // If the accessory has a switch service then remove it
     if (this.accessory.getService(this.hapServ.Switch)) {
       this.accessory.removeService(this.accessory.getService(this.hapServ.Switch))
@@ -84,6 +70,7 @@ module.exports = class deviceOutletDouble {
       const opts = JSON.stringify({
         disableDeviceLogging: this.disableDeviceLogging,
         hideChannels: this.hideChannels,
+        inUsePowerThreshold: this.inUsePowerThreshold,
         showAsOutlet: true
       })
       this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 5db8ebfe..8a500e36 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -66,8 +66,8 @@ module.exports = {
       'deviceId', 'label', 'showAsOutlet', 'ipAddress', 'overrideDisabledLogging'
     ],
     multiDevices: [
-      'deviceId', 'label', 'showAsOutlet', 'hideChannels', 'ipAddress',
-      'overrideDisabledLogging'
+      'deviceId', 'label', 'showAsOutlet', 'inUsePowerThreshold', 'hideChannels',
+      'ipAddress', 'overrideDisabledLogging'
     ],
     outletDevices: [
       'deviceId', 'label', 'showAsSwitch', 'inUsePowerThreshold', 'ipAddress',

From 75bfa69f12c97f0048da32dbfc96d19b5512ab11 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 3 May 2021 15:30:56 +0100
Subject: [PATCH 1975/3183] 6.3.1-beta.8

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 984c4cde..be40cc3e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.3.1-beta.7",
+  "version": "6.3.1-beta.8",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index fbe894e5..86fb07ad 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.3.1-beta.7",
+  "version": "6.3.1-beta.8",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 117452f49e3b5d7de85aaacf610af8ec31ebdd57 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 3 May 2021 15:39:17 +0100
Subject: [PATCH 1976/3183] turn outletinuse off is outlet off for dualr3

---
 lib/device/outlet-double.js | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/lib/device/outlet-double.js b/lib/device/outlet-double.js
index a8375f1b..8b3d7bd9 100644
--- a/lib/device/outlet-double.js
+++ b/lib/device/outlet-double.js
@@ -106,10 +106,12 @@ module.exports = class deviceOutletDouble {
                 this.hapChar.On,
                 value
               )
-              subAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
-                this.hapChar.OutletInUse,
-                value
-              )
+              if (!value) {
+                subAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
+                  this.hapChar.OutletInUse,
+                  false
+                )
+              }
               if (i > 0 && !this.disableDeviceLogging) {
                 this.log(
                   '[%s] %s [%s].',
@@ -135,10 +137,12 @@ module.exports = class deviceOutletDouble {
                 masterState = 'on'
               }
               if (i === parseInt(switchNumber)) {
-                subAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
-                  this.hapChar.OutletInUse,
-                  value
-                )
+                if (!value) {
+                  subAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
+                    this.hapChar.OutletInUse,
+                    false
+                  )
+                }
                 if (i > 0 && !this.disableDeviceLogging) {
                   this.log(
                     '[%s] %s [%s].',

From 3d3d653764e292ed29ea130f82578f7325f1c340 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 3 May 2021 15:39:42 +0100
Subject: [PATCH 1977/3183] 6.3.1-beta.9

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index be40cc3e..c521eb69 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.3.1-beta.8",
+  "version": "6.3.1-beta.9",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 86fb07ad..7ffa1f90 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.3.1-beta.8",
+  "version": "6.3.1-beta.9",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 6f3ae73c328d05a2c806941c4b48bcb4a83a0e2f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 3 May 2021 15:41:22 +0100
Subject: [PATCH 1978/3183] Update outlet-double.js

---
 lib/device/outlet-double.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/device/outlet-double.js b/lib/device/outlet-double.js
index 8b3d7bd9..8b13e5f5 100644
--- a/lib/device/outlet-double.js
+++ b/lib/device/outlet-double.js
@@ -162,6 +162,12 @@ module.exports = class deviceOutletDouble {
               this.hapChar.On,
               masterState === 'on'
             )
+            if (masterState !== 'on') {
+              subAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
+                this.hapChar.OutletInUse,
+                false
+              )
+            }
           }
           break
       }

From ff206c34eb2687173d11231e0dda64ef5c76cdff Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 3 May 2021 15:42:20 +0100
Subject: [PATCH 1979/3183] 6.3.1-beta.10

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c521eb69..14e8219c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.3.1-beta.9",
+  "version": "6.3.1-beta.10",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 7ffa1f90..2aeebbd2 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.3.1-beta.9",
+  "version": "6.3.1-beta.10",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From ff8038a7b9e132bd77f79936cdb71a6f9fa40e3f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 3 May 2021 21:15:40 +0100
Subject: [PATCH 1980/3183] switch & outlet cleanups

---
 lib/device/outlet-double.js | 91 +++++++++++++++++++-----------------
 lib/device/outlet-multi.js  | 66 ++++++++++++--------------
 lib/device/outlet-single.js | 92 ++++++++++++++++++++++---------------
 lib/device/switch-double.js | 46 ++++++++++---------
 lib/device/switch-multi.js  | 40 ++++++++--------
 lib/device/template.js      | 50 --------------------
 6 files changed, 182 insertions(+), 203 deletions(-)
 delete mode 100644 lib/device/template.js

diff --git a/lib/device/outlet-double.js b/lib/device/outlet-double.js
index 8b13e5f5..ee2f6a72 100644
--- a/lib/device/outlet-double.js
+++ b/lib/device/outlet-double.js
@@ -40,9 +40,11 @@ module.exports = class deviceOutletDouble {
     // Add the outlet service if it doesn't already exist
     if (!(this.service = this.accessory.getService(this.hapServ.Outlet))) {
       this.service = this.accessory.addService(this.hapServ.Outlet)
-      this.service.addCharacteristic(this.eveChar.Voltage)
-      this.service.addCharacteristic(this.eveChar.CurrentConsumption)
-      this.service.addCharacteristic(this.eveChar.ElectricCurrent)
+      if (accessory.context.switchNumber !== '0') {
+        this.service.addCharacteristic(this.eveChar.Voltage)
+        this.service.addCharacteristic(this.eveChar.CurrentConsumption)
+        this.service.addCharacteristic(this.eveChar.ElectricCurrent)
+      }
     }
 
     // Add the set handler to the switch/outlet on/off characteristic
@@ -65,13 +67,31 @@ module.exports = class deviceOutletDouble {
       clearInterval(this.intervalPoll)
     })
 
+    if (accessory.context.switchNumber === '0') {
+      if (this.service.testCharacteristic(this.hapChar.OutletInUse)) {
+        this.service.removeCharacteristic(
+          this.service.getCharacteristic(this.hapChar.OutletInUse)
+        )
+      }
+      if (this.service.testCharacteristic(this.eveChar.Voltage)) {
+        this.service.removeCharacteristic(
+          this.service.getCharacteristic(this.eveChar.Voltage)
+        )
+        this.service.removeCharacteristic(
+          this.service.getCharacteristic(this.eveChar.CurrentConsumption)
+        )
+        this.service.removeCharacteristic(
+          this.service.getCharacteristic(this.eveChar.ElectricCurrent)
+        )
+      }
+    }
+
     // Output the customised options to the log if in debug mode
     if (this.debug) {
       const opts = JSON.stringify({
         disableDeviceLogging: this.disableDeviceLogging,
         hideChannels: this.hideChannels,
-        inUsePowerThreshold: this.inUsePowerThreshold,
-        showAsOutlet: true
+        inUsePowerThreshold: this.inUsePowerThreshold
       })
       this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
     }
@@ -79,7 +99,7 @@ module.exports = class deviceOutletDouble {
 
   async internalStateUpdate (value) {
     try {
-      let masterState = 'off'
+      let primaryState = false
       const params = {
         switches: []
       }
@@ -100,18 +120,12 @@ module.exports = class deviceOutletDouble {
           for (let i = 0; i <= 2; i++) {
             const idToCheck = this.accessory.context.eweDeviceId + 'SW' + i
             const uuid = this.platform.api.hap.uuid.generate(idToCheck)
-            let subAccessory
-            if ((subAccessory = this.platform.devicesInHB.get(uuid))) {
+            if (this.platform.devicesInHB.has(uuid)) {
+              const subAccessory = this.platform.devicesInHB.get(uuid)
               subAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
                 this.hapChar.On,
                 value
               )
-              if (!value) {
-                subAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
-                  this.hapChar.OutletInUse,
-                  false
-                )
-              }
               if (i > 0 && !this.disableDeviceLogging) {
                 this.log(
                   '[%s] %s [%s].',
@@ -125,24 +139,16 @@ module.exports = class deviceOutletDouble {
           break
         case '1':
         case '2':
-          for (let i = 1; i <= this.accessory.context.channelCount; i++) {
+          for (let i = 1; i <= 2; i++) {
             const idToCheck = this.accessory.context.eweDeviceId + 'SW' + i
             const uuid = this.platform.api.hap.uuid.generate(idToCheck)
-            let subAccessory
-            if ((subAccessory = this.platform.devicesInHB.get(uuid))) {
-              if (
-                subAccessory.getService(this.hapServ.Outlet)
-                  .getCharacteristic(this.hapChar.On).value
-              ) {
-                masterState = 'on'
-              }
+            if (this.platform.devicesInHB.has(uuid)) {
+              const subAccessory = this.platform.devicesInHB.get(uuid)
               if (i === parseInt(switchNumber)) {
-                if (!value) {
-                  subAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
-                    this.hapChar.OutletInUse,
-                    false
-                  )
+                if (value) {
+                  primaryState = true
                 }
+                subAccessory.eveService.addEntry({ status: value ? 1 : 0 })
                 if (i > 0 && !this.disableDeviceLogging) {
                   this.log(
                     '[%s] %s [%s].',
@@ -151,23 +157,24 @@ module.exports = class deviceOutletDouble {
                     value ? 'on' : 'off'
                   )
                 }
+              } else {
+                if (
+                  subAccessory.getService(this.hapServ.Switch)
+                    .getCharacteristic(this.hapChar.On).value
+                ) {
+                  primaryState = true
+                }
               }
             }
           }
           if (!this.platform.hideMasters.includes(this.accessory.context.eweDeviceId)) {
             const idToCheck = this.accessory.context.eweDeviceId + 'SW0'
             const uuid = this.platform.api.hap.uuid.generate(idToCheck)
-            const subAccessory = this.platform.devicesInHB.get(uuid)
-            subAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
+            const priAccessory = this.platform.devicesInHB.get(uuid)
+            priAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
               this.hapChar.On,
-              masterState === 'on'
+              primaryState
             )
-            if (masterState !== 'on') {
-              subAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
-                this.hapChar.OutletInUse,
-                false
-              )
-            }
           }
           break
       }
@@ -199,6 +206,9 @@ module.exports = class deviceOutletDouble {
           const subAccessory = this.platform.devicesInHB.get(uuid)
           const service = subAccessory.getService(this.hapServ.Outlet)
           if (params.switches) {
+            if (params.switches[i - 1].switch === 'on') {
+              primaryState = true
+            }
             const currentState = service.getCharacteristic(this.hapChar.On).value
               ? 'on'
               : 'off'
@@ -222,7 +232,7 @@ module.exports = class deviceOutletDouble {
           let voltage
           let current
           if (this.funcs.hasProperty(params, 'actPow_0' + (i - 1))) {
-            power = parseFloat(params['actPow_0' + (i - 1)]) / 100
+            power = parseInt(params['actPow_0' + (i - 1)]) / 100
             service.updateCharacteristic(
               this.hapChar.OutletInUse,
               power > this.inUsePowerThreshold
@@ -236,12 +246,12 @@ module.exports = class deviceOutletDouble {
             logger = true
           }
           if (this.funcs.hasProperty(params, 'voltage_0' + (i - 1))) {
-            voltage = parseFloat(params['voltage_0' + (i - 1)]) / 100
+            voltage = parseInt(params['voltage_0' + (i - 1)]) / 100
             service.updateCharacteristic(this.eveChar.Voltage, voltage)
             logger = true
           }
           if (this.funcs.hasProperty(params, 'current_0' + (i - 1))) {
-            current = parseFloat(params['current_0' + (i - 1)]) / 100
+            current = parseInt(params['current_0' + (i - 1)]) / 100
             this.service.updateCharacteristic(this.eveChar.ElectricCurrent, current)
             logger = true
           }
@@ -264,7 +274,6 @@ module.exports = class deviceOutletDouble {
       }
       if (!this.platform.hideMasters.includes(this.accessory.context.eweDeviceId)) {
         this.service.updateCharacteristic(this.hapChar.On, primaryState)
-        this.service.updateCharacteristic(this.hapChar.OutletInUse, primaryState)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
diff --git a/lib/device/outlet-multi.js b/lib/device/outlet-multi.js
index 748daac5..34f7c97c 100644
--- a/lib/device/outlet-multi.js
+++ b/lib/device/outlet-multi.js
@@ -42,12 +42,18 @@ module.exports = class deviceOutletMulti {
       await this.internalStateUpdate(value)
     })
 
+    // Remove any OutletInUse characteristics from previous plugin versions
+    if (this.service.testCharacteristic(this.hapChar.OutletInUse)) {
+      this.service.removeCharacteristic(
+        this.service.getCharacteristic(this.hapChar.OutletInUse)
+      )
+    }
+
     // Output the customised options to the log if in debug mode
     if (this.debug) {
       const opts = JSON.stringify({
         disableDeviceLogging: this.disableDeviceLogging,
-        hideChannels: this.hideChannels,
-        showAsOutlet: true
+        hideChannels: this.hideChannels
       })
       this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
     }
@@ -55,7 +61,7 @@ module.exports = class deviceOutletMulti {
 
   async internalStateUpdate (value) {
     try {
-      let masterState = 'off'
+      let primaryState = false
       const params = {
         switches: []
       }
@@ -80,16 +86,12 @@ module.exports = class deviceOutletMulti {
           for (let i = 0; i <= this.accessory.context.channelCount; i++) {
             const idToCheck = this.accessory.context.eweDeviceId + 'SW' + i
             const uuid = this.platform.api.hap.uuid.generate(idToCheck)
-            let subAccessory
-            if ((subAccessory = this.platform.devicesInHB.get(uuid))) {
+            if (this.platform.devicesInHB.has(uuid)) {
+              const subAccessory = this.platform.devicesInHB.get(uuid)
               subAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
                 this.hapChar.On,
                 value
               )
-              subAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
-                this.hapChar.OutletInUse,
-                value
-              )
               if (i > 0 && !this.disableDeviceLogging) {
                 this.log(
                   '[%s] %s [%s].',
@@ -108,19 +110,13 @@ module.exports = class deviceOutletMulti {
           for (let i = 1; i <= this.accessory.context.channelCount; i++) {
             const idToCheck = this.accessory.context.eweDeviceId + 'SW' + i
             const uuid = this.platform.api.hap.uuid.generate(idToCheck)
-            let subAccessory
-            if ((subAccessory = this.platform.devicesInHB.get(uuid))) {
-              if (
-                subAccessory.getService(this.hapServ.Outlet)
-                  .getCharacteristic(this.hapChar.On).value
-              ) {
-                masterState = 'on'
-              }
+            if (this.platform.devicesInHB.has(uuid)) {
+              const subAccessory = this.platform.devicesInHB.get(uuid)
               if (i === parseInt(switchNumber)) {
-                subAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
-                  this.hapChar.OutletInUse,
-                  value
-                )
+                if (value) {
+                  primaryState = true
+                }
+                subAccessory.eveService.addEntry({ status: value ? 1 : 0 })
                 if (i > 0 && !this.disableDeviceLogging) {
                   this.log(
                     '[%s] %s [%s].',
@@ -129,20 +125,23 @@ module.exports = class deviceOutletMulti {
                     value ? 'on' : 'off'
                   )
                 }
+              } else {
+                if (
+                  subAccessory.getService(this.hapServ.Switch)
+                    .getCharacteristic(this.hapChar.On).value
+                ) {
+                  primaryState = true
+                }
               }
             }
           }
           if (!this.platform.hideMasters.includes(this.accessory.context.eweDeviceId)) {
             const idToCheck = this.accessory.context.eweDeviceId + 'SW0'
             const uuid = this.platform.api.hap.uuid.generate(idToCheck)
-            const subAccessory = this.platform.devicesInHB.get(uuid)
-            subAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
+            const priAccessory = this.platform.devicesInHB.get(uuid)
+            priAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
               this.hapChar.On,
-              masterState === 'on'
-            )
-            subAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
-              this.hapChar.OutletInUse,
-              masterState === 'on'
+              primaryState
             )
           }
           break
@@ -164,11 +163,11 @@ module.exports = class deviceOutletMulti {
       const idToCheck = this.accessory.context.eweDeviceId + 'SW'
       let primaryState = false
       for (let i = 1; i <= this.accessory.context.channelCount; i++) {
-        if (params.switches[i - 1].switch === 'on') {
-          primaryState = true
-        }
         const uuid = this.platform.api.hap.uuid.generate(idToCheck + i)
         if (this.platform.devicesInHB.has(uuid)) {
+          if (params.switches[i - 1].switch === 'on') {
+            primaryState = true
+          }
           const subAccessory = this.platform.devicesInHB.get(uuid)
           const service = subAccessory.getService(this.hapServ.Outlet)
           const currentState = service.getCharacteristic(this.hapChar.On).value
@@ -181,10 +180,6 @@ module.exports = class deviceOutletMulti {
             this.hapChar.On,
             params.switches[i - 1].switch === 'on'
           )
-          service.updateCharacteristic(
-            this.hapChar.OutletInUse,
-            params.switches[i - 1].switch === 'on'
-          )
           if (params.updateSource && !this.disableDeviceLogging) {
             this.log(
               '[%s] %s [%s].',
@@ -197,7 +192,6 @@ module.exports = class deviceOutletMulti {
       }
       if (!this.platform.hideMasters.includes(this.accessory.context.eweDeviceId)) {
         this.service.updateCharacteristic(this.hapChar.On, primaryState)
-        this.service.updateCharacteristic(this.hapChar.OutletInUse, primaryState)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
diff --git a/lib/device/outlet-single.js b/lib/device/outlet-single.js
index a5a425fb..f21f5347 100644
--- a/lib/device/outlet-single.js
+++ b/lib/device/outlet-single.js
@@ -18,6 +18,7 @@ module.exports = class deviceOutletSingle {
     // Set up variables from the accessory
     this.name = accessory.displayName
     this.accessory = accessory
+    this.hasReadings = this.consts.devices.outlet.includes(accessory.context.eweUIID)
 
     // Set up custom variables for this device type
     const deviceId = this.accessory.context.eweDeviceId
@@ -29,14 +30,6 @@ module.exports = class deviceOutletSingle {
       ? false
       : platform.config.disableDeviceLogging
 
-    // TotalConsumption is calculated by the plugin with these context readings
-    if (!this.funcs.hasProperty(this.accessory.context, 'energyReadings')) {
-      this.accessory.context.energyReadings = []
-    }
-    if (!this.funcs.hasProperty(this.accessory.context, 'energyReadingTotal')) {
-      this.accessory.context.energyReadingTotal = 0
-    }
-
     // If the accessory has a switch service then remove it
     if (this.accessory.getService(this.hapServ.Switch)) {
       this.accessory.removeService(this.accessory.getService(this.hapServ.Switch))
@@ -45,11 +38,13 @@ module.exports = class deviceOutletSingle {
     // Add the outlet service if it doesn't already exist
     if (!(this.service = this.accessory.getService(this.hapServ.Outlet))) {
       this.service = this.accessory.addService(this.hapServ.Outlet)
-      this.service.addCharacteristic(this.eveChar.Voltage)
-      this.service.addCharacteristic(this.eveChar.CurrentConsumption)
-      this.service.addCharacteristic(this.eveChar.ElectricCurrent)
-      this.service.addCharacteristic(this.eveChar.TotalConsumption)
-      this.service.addCharacteristic(this.eveChar.ResetTotal)
+      if (this.hasReadings) {
+        this.service.addCharacteristic(this.eveChar.Voltage)
+        this.service.addCharacteristic(this.eveChar.CurrentConsumption)
+        this.service.addCharacteristic(this.eveChar.ElectricCurrent)
+        this.service.addCharacteristic(this.eveChar.TotalConsumption)
+        this.service.addCharacteristic(this.eveChar.ResetTotal)
+      }
     }
 
     // Add the set handler to the outlet on/off characteristic
@@ -57,19 +52,27 @@ module.exports = class deviceOutletSingle {
       await this.internalStateUpdate(value)
     })
 
-    // Add the set handler to the outlet eve reset total energy characteristic
-    this.service.getCharacteristic(this.eveChar.ResetTotal).onSet(value => {
-      this.accessory.context.energyReadings = []
-      this.accessory.context.energyReadingTotal = 0
-      this.service.updateCharacteristic(this.eveChar.TotalConsumption, 0)
-    })
-
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new platform.eveService('energy', this.accessory, {
       log: platform.config.debugFakegato ? this.log : () => {}
     })
 
-    if (this.consts.devices.outlet.includes(this.accessory.context.eweUIID)) {
+    if (this.hasReadings) {
+      // TotalConsumption is calculated by the plugin with these context readings
+      if (!this.funcs.hasProperty(this.accessory.context, 'energyReadings')) {
+        this.accessory.context.energyReadings = []
+      }
+      if (!this.funcs.hasProperty(this.accessory.context, 'energyReadingTotal')) {
+        this.accessory.context.energyReadingTotal = 0
+      }
+
+      // Add the set handler to the outlet eve reset total energy characteristic
+      this.service.getCharacteristic(this.eveChar.ResetTotal).onSet(value => {
+        this.accessory.context.energyReadings = []
+        this.accessory.context.energyReadingTotal = 0
+        this.service.updateCharacteristic(this.eveChar.TotalConsumption, 0)
+      })
+
       // Set up an interval for the plugin to calculate an approx total consumption
       this.intervalPower = setInterval(() => {
         // Every 30 seconds start with a zero reading
@@ -116,6 +119,28 @@ module.exports = class deviceOutletSingle {
         clearInterval(this.intervalPoll)
         clearInterval(this.intervalPower)
       })
+    } else {
+      // Just a simple outlet model so remove any existing power characteristics
+      if (this.service.testCharacteristic(this.eveChar.Voltage)) {
+        this.service.removeCharacteristic(
+          this.service.getCharacteristic(this.eveChar.Voltage)
+        )
+        this.service.removeCharacteristic(
+          this.service.getCharacteristic(this.eveChar.CurrentConsumption)
+        )
+        this.service.removeCharacteristic(
+          this.service.getCharacteristic(this.eveChar.ElectricCurrent)
+        )
+        this.service.removeCharacteristic(
+          this.service.getCharacteristic(this.eveChar.TotalConsumption)
+        )
+        this.service.removeCharacteristic(
+          this.service.getCharacteristic(this.eveChar.ResetTotal)
+        )
+        this.service.removeCharacteristic(
+          this.service.getCharacteristic(this.hapChar.OutletInUse)
+        )
+      }
     }
 
     // Output the customised options to the log if in debug mode
@@ -164,28 +189,21 @@ module.exports = class deviceOutletSingle {
         if (params.updateSource && !this.disableDeviceLogging) {
           this.log('[%s] %s [%s].', this.name, this.lang.curState, params.switch)
         }
-        if (!this.accessory.context.powerReadings) {
-          this.service.updateCharacteristic(
-            this.hapChar.OutletInUse,
-            params.switch === 'on'
-          )
-        }
+      }
+      if (!this.hasReadings) {
+        return
       }
       let logger = false
       if (this.funcs.hasProperty(params, 'power')) {
-        this.accessory.context.powerReadings = true
+        const power = parseFloat(params.power)
         this.service.updateCharacteristic(
           this.hapChar.OutletInUse,
-          parseFloat(params.power) > this.inUsePowerThreshold
-        )
-        this.service.updateCharacteristic(
-          this.eveChar.CurrentConsumption,
-          parseFloat(params.power)
+          power > this.inUsePowerThreshold
         )
-        const isOn = this.accessory.getService(this.hapServ.Outlet)
-          .getCharacteristic(this.hapChar.On).value
-        this.accessory.eveService.addEntry({ power: isOn ? parseFloat(params.power) : 0 })
-        this.accessory.context.energyReadings.push(parseFloat(params.power))
+        this.service.updateCharacteristic(this.eveChar.CurrentConsumption, power)
+        const isOn = this.cacheState === 'on'
+        this.accessory.eveService.addEntry({ power: isOn ? power : 0 })
+        this.accessory.context.energyReadings.push(power)
         logger = true
       }
       if (this.funcs.hasProperty(params, 'voltage')) {
diff --git a/lib/device/switch-double.js b/lib/device/switch-double.js
index 3e79dbab..23dd9253 100644
--- a/lib/device/switch-double.js
+++ b/lib/device/switch-double.js
@@ -59,7 +59,7 @@ module.exports = class deviceSwitchDouble {
 
   async internalStateUpdate (value) {
     try {
-      let masterState = 'off'
+      let primaryState = false
       const params = {
         switches: []
       }
@@ -77,11 +77,11 @@ module.exports = class deviceSwitchDouble {
       await this.platform.sendDeviceUpdate(this.accessory, params)
       switch (switchNumber) {
         case '0':
-          for (let i = 0; i <= this.accessory.context.channelCount; i++) {
+          for (let i = 0; i <= 2; i++) {
             const idToCheck = this.accessory.context.eweDeviceId + 'SW' + i
             const uuid = this.platform.api.hap.uuid.generate(idToCheck)
-            let subAccessory
-            if ((subAccessory = this.platform.devicesInHB.get(uuid))) {
+            if (this.platform.devicesInHB.has(uuid)) {
+              const subAccessory = this.platform.devicesInHB.get(uuid)
               subAccessory.getService(this.hapServ.Switch).updateCharacteristic(
                 this.hapChar.On,
                 value
@@ -100,18 +100,15 @@ module.exports = class deviceSwitchDouble {
           break
         case '1':
         case '2':
-          for (let i = 1; i <= this.accessory.context.channelCount; i++) {
+          for (let i = 1; i <= 2; i++) {
             const idToCheck = this.accessory.context.eweDeviceId + 'SW' + i
             const uuid = this.platform.api.hap.uuid.generate(idToCheck)
-            let subAccessory
-            if ((subAccessory = this.platform.devicesInHB.get(uuid))) {
-              if (
-                subAccessory.getService(this.hapServ.Switch)
-                  .getCharacteristic(this.hapChar.On).value
-              ) {
-                masterState = 'on'
-              }
+            if (this.platform.devicesInHB.has(uuid)) {
+              const subAccessory = this.platform.devicesInHB.get(uuid)
               if (i === parseInt(switchNumber)) {
+                if (value) {
+                  primaryState = true
+                }
                 subAccessory.eveService.addEntry({ status: value ? 1 : 0 })
                 if (i > 0 && !this.disableDeviceLogging) {
                   this.log(
@@ -121,18 +118,25 @@ module.exports = class deviceSwitchDouble {
                     value ? 'on' : 'off'
                   )
                 }
+              } else {
+                if (
+                  subAccessory.getService(this.hapServ.Switch)
+                    .getCharacteristic(this.hapChar.On).value
+                ) {
+                  primaryState = true
+                }
               }
             }
           }
           if (!this.platform.hideMasters.includes(this.accessory.context.eweDeviceId)) {
             const idToCheck = this.accessory.context.eweDeviceId + 'SW0'
             const uuid = this.platform.api.hap.uuid.generate(idToCheck)
-            const subAccessory = this.platform.devicesInHB.get(uuid)
-            subAccessory.getService(this.hapServ.Switch).updateCharacteristic(
+            const priAccessory = this.platform.devicesInHB.get(uuid)
+            priAccessory.getService(this.hapServ.Switch).updateCharacteristic(
               this.hapChar.On,
-              masterState === 'on'
+              primaryState
             )
-            subAccessory.eveService.addEntry({ status: masterState === 'on' ? 1 : 0 })
+            priAccessory.eveService.addEntry({ status: primaryState ? 1 : 0 })
           }
           break
       }
@@ -152,12 +156,12 @@ module.exports = class deviceSwitchDouble {
       }
       const idToCheck = this.accessory.context.eweDeviceId + 'SW'
       let primaryState = false
-      for (let i = 1; i <= this.accessory.context.channelCount; i++) {
-        if (params.switches[i - 1].switch === 'on') {
-          primaryState = true
-        }
+      for (let i = 1; i <= 2; i++) {
         const uuid = this.platform.api.hap.uuid.generate(idToCheck + i)
         if (this.platform.devicesInHB.has(uuid)) {
+          if (params.switches[i - 1].switch === 'on') {
+            primaryState = true
+          }
           const subAccessory = this.platform.devicesInHB.get(uuid)
           const service = subAccessory.getService(this.hapServ.Switch)
           const currentState = service.getCharacteristic(this.hapChar.On).value
diff --git a/lib/device/switch-multi.js b/lib/device/switch-multi.js
index 5c074817..6761017c 100644
--- a/lib/device/switch-multi.js
+++ b/lib/device/switch-multi.js
@@ -59,7 +59,7 @@ module.exports = class deviceSwitchMulti {
 
   async internalStateUpdate (value) {
     try {
-      let masterState = 'off'
+      let primaryState = false
       const params = {
         switches: []
       }
@@ -84,8 +84,8 @@ module.exports = class deviceSwitchMulti {
           for (let i = 0; i <= this.accessory.context.channelCount; i++) {
             const idToCheck = this.accessory.context.eweDeviceId + 'SW' + i
             const uuid = this.platform.api.hap.uuid.generate(idToCheck)
-            let subAccessory
-            if ((subAccessory = this.platform.devicesInHB.get(uuid))) {
+            if (this.platform.devicesInHB.has(uuid)) {
+              const subAccessory = this.platform.devicesInHB.get(uuid)
               subAccessory.getService(this.hapServ.Switch).updateCharacteristic(
                 this.hapChar.On,
                 value
@@ -109,15 +109,12 @@ module.exports = class deviceSwitchMulti {
           for (let i = 1; i <= this.accessory.context.channelCount; i++) {
             const idToCheck = this.accessory.context.eweDeviceId + 'SW' + i
             const uuid = this.platform.api.hap.uuid.generate(idToCheck)
-            let subAccessory
-            if ((subAccessory = this.platform.devicesInHB.get(uuid))) {
-              if (
-                subAccessory.getService(this.hapServ.Switch)
-                  .getCharacteristic(this.hapChar.On).value
-              ) {
-                masterState = 'on'
-              }
+            if (this.platform.devicesInHB.has(uuid)) {
+              const subAccessory = this.platform.devicesInHB.get(uuid)
               if (i === parseInt(switchNumber)) {
+                if (value) {
+                  primaryState = true
+                }
                 subAccessory.eveService.addEntry({ status: value ? 1 : 0 })
                 if (i > 0 && !this.disableDeviceLogging) {
                   this.log(
@@ -127,18 +124,25 @@ module.exports = class deviceSwitchMulti {
                     value ? 'on' : 'off'
                   )
                 }
+              } else {
+                if (
+                  subAccessory.getService(this.hapServ.Switch)
+                    .getCharacteristic(this.hapChar.On).value
+                ) {
+                  primaryState = true
+                }
               }
             }
           }
           if (!this.platform.hideMasters.includes(this.accessory.context.eweDeviceId)) {
             const idToCheck = this.accessory.context.eweDeviceId + 'SW0'
             const uuid = this.platform.api.hap.uuid.generate(idToCheck)
-            const subAccessory = this.platform.devicesInHB.get(uuid)
-            subAccessory.getService(this.hapServ.Switch).updateCharacteristic(
+            const priAccessory = this.platform.devicesInHB.get(uuid)
+            priAccessory.getService(this.hapServ.Switch).updateCharacteristic(
               this.hapChar.On,
-              masterState === 'on'
+              primaryState
             )
-            subAccessory.eveService.addEntry({ status: masterState === 'on' ? 1 : 0 })
+            priAccessory.eveService.addEntry({ status: primaryState ? 1 : 0 })
           }
           break
       }
@@ -159,11 +163,11 @@ module.exports = class deviceSwitchMulti {
       const idToCheck = this.accessory.context.eweDeviceId + 'SW'
       let primaryState = false
       for (let i = 1; i <= this.accessory.context.channelCount; i++) {
-        if (params.switches[i - 1].switch === 'on') {
-          primaryState = true
-        }
         const uuid = this.platform.api.hap.uuid.generate(idToCheck + i)
         if (this.platform.devicesInHB.has(uuid)) {
+          if (params.switches[i - 1].switch === 'on') {
+            primaryState = true
+          }
           const subAccessory = this.platform.devicesInHB.get(uuid)
           const service = subAccessory.getService(this.hapServ.Switch)
           const currentState = service.getCharacteristic(this.hapChar.On).value
diff --git a/lib/device/template.js b/lib/device/template.js
deleted file mode 100644
index 218d66b8..00000000
--- a/lib/device/template.js
+++ /dev/null
@@ -1,50 +0,0 @@
-/* jshint -W014, -W033, esversion: 9 */
-/* eslint-disable new-cap */
-'use strict'
-
-module.exports = class deviceTemplate {
-  constructor (platform, accessory) {
-    // Set up variables from the platform
-    this.consts = platform.consts
-    this.debug = platform.config.debug
-    this.funcs = platform.funcs
-    this.hapServ = platform.api.hap.Service
-    this.hapChar = platform.api.hap.Characteristic
-    this.log = platform.log
-    this.lang = platform.lang
-    this.platform = platform
-
-    // Set up variables from the accessory
-    this.name = accessory.displayName
-    this.accessory = accessory
-
-    // Add the switch service if it doesn't already exist
-    this.service = this.accessory.getService(this.hapServ.Switch) ||
-      this.accessory.addService(this.hapServ.Switch)
-
-    // Add the set handler to the switch on/off characteristic
-    this.service.getCharacteristic(this.hapChar.On).onSet(async value => {
-      await this.internalUpdate(value)
-    })
-  }
-
-  async internalUpdate (value) {
-    try {
-      // logic
-    } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
-      setTimeout(() => {
-        this.service.updateCharacteristic(this.hapChar.On, this.cacheOnOff === 'on')
-      }, 5000)
-      throw new this.platform.api.hap.HapStatusError(-70402)
-    }
-  }
-
-  async externalUpdate (params) {
-    try {
-      // logic
-    } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, false)
-    }
-  }
-}

From e8b2e795254c0929d31435c52dca05bf0586034e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 3 May 2021 21:33:37 +0100
Subject: [PATCH 1981/3183] more switch & outlet cleanups

---
 lib/device/outlet-double.js | 55 ++++++++++++++++++++-----------------
 lib/device/outlet-multi.js  |  3 +-
 lib/device/outlet-single.js | 10 +++++--
 3 files changed, 38 insertions(+), 30 deletions(-)

diff --git a/lib/device/outlet-double.js b/lib/device/outlet-double.js
index ee2f6a72..1859a4d5 100644
--- a/lib/device/outlet-double.js
+++ b/lib/device/outlet-double.js
@@ -122,17 +122,20 @@ module.exports = class deviceOutletDouble {
             const uuid = this.platform.api.hap.uuid.generate(idToCheck)
             if (this.platform.devicesInHB.has(uuid)) {
               const subAccessory = this.platform.devicesInHB.get(uuid)
-              subAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
-                this.hapChar.On,
-                value
-              )
-              if (i > 0 && !this.disableDeviceLogging) {
-                this.log(
-                  '[%s] %s [%s].',
-                  subAccessory.displayName,
-                  this.lang.curState,
-                  value ? 'on' : 'off'
-                )
+              const service = subAccessory.getService(this.hapServ.Outlet)
+              service.updateCharacteristic(this.hapChar.On, value)
+              if (i > 0) {
+                if (!value) {
+                  service.updateCharacteristic(this.hapChar.OutletInUse, false)
+                }
+                if (!this.disableDeviceLogging) {
+                  this.log(
+                    '[%s] %s [%s].',
+                    subAccessory.displayName,
+                    this.lang.curState,
+                    value ? 'on' : 'off'
+                  )
+                }
               }
             }
           }
@@ -144,24 +147,26 @@ module.exports = class deviceOutletDouble {
             const uuid = this.platform.api.hap.uuid.generate(idToCheck)
             if (this.platform.devicesInHB.has(uuid)) {
               const subAccessory = this.platform.devicesInHB.get(uuid)
+              const service = subAccessory.getService(this.hapServ.Outlet)
               if (i === parseInt(switchNumber)) {
                 if (value) {
                   primaryState = true
                 }
-                subAccessory.eveService.addEntry({ status: value ? 1 : 0 })
-                if (i > 0 && !this.disableDeviceLogging) {
-                  this.log(
-                    '[%s] %s [%s].',
-                    subAccessory.displayName,
-                    this.lang.curState,
-                    value ? 'on' : 'off'
-                  )
+                if (i > 0) {
+                  if (!value) {
+                    service.updateCharacteristic(this.hapChar.OutletInUse, false)
+                  }
+                  if (!this.disableDeviceLogging) {
+                    this.log(
+                      '[%s] %s [%s].',
+                      subAccessory.displayName,
+                      this.lang.curState,
+                      value ? 'on' : 'off'
+                    )
+                  }
                 }
               } else {
-                if (
-                  subAccessory.getService(this.hapServ.Switch)
-                    .getCharacteristic(this.hapChar.On).value
-                ) {
+                if (service.getCharacteristic(this.hapChar.On).value) {
                   primaryState = true
                 }
               }
@@ -232,16 +237,16 @@ module.exports = class deviceOutletDouble {
           let voltage
           let current
           if (this.funcs.hasProperty(params, 'actPow_0' + (i - 1))) {
+            const isOn = service.getCharacteristic(this.hapChar.On).value
             power = parseInt(params['actPow_0' + (i - 1)]) / 100
             service.updateCharacteristic(
               this.hapChar.OutletInUse,
-              power > this.inUsePowerThreshold
+              isOn && power > this.inUsePowerThreshold
             )
             if (!primaryState && power > this.inUsePowerThreshold) {
               primaryState = true
             }
             service.updateCharacteristic(this.eveChar.CurrentConsumption, power)
-            const isOn = service.getCharacteristic(this.hapChar.On).value
             subAccessory.eveService.addEntry({ power: isOn ? power : 0 })
             logger = true
           }
diff --git a/lib/device/outlet-multi.js b/lib/device/outlet-multi.js
index 34f7c97c..5b8d120f 100644
--- a/lib/device/outlet-multi.js
+++ b/lib/device/outlet-multi.js
@@ -116,7 +116,6 @@ module.exports = class deviceOutletMulti {
                 if (value) {
                   primaryState = true
                 }
-                subAccessory.eveService.addEntry({ status: value ? 1 : 0 })
                 if (i > 0 && !this.disableDeviceLogging) {
                   this.log(
                     '[%s] %s [%s].',
@@ -127,7 +126,7 @@ module.exports = class deviceOutletMulti {
                 }
               } else {
                 if (
-                  subAccessory.getService(this.hapServ.Switch)
+                  subAccessory.getService(this.hapServ.Outlet)
                     .getCharacteristic(this.hapChar.On).value
                 ) {
                   primaryState = true
diff --git a/lib/device/outlet-single.js b/lib/device/outlet-single.js
index f21f5347..478a1f7a 100644
--- a/lib/device/outlet-single.js
+++ b/lib/device/outlet-single.js
@@ -160,6 +160,9 @@ module.exports = class deviceOutletSingle {
         switch: newValue
       })
       this.cacheState = newValue
+      if (this.hasReadings && !value) {
+        this.service.updateCharacteristic(this.hapChar.OutletInUse, false)
+      }
       if (!this.disableDeviceLogging) {
         this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
       }
@@ -198,11 +201,12 @@ module.exports = class deviceOutletSingle {
         const power = parseFloat(params.power)
         this.service.updateCharacteristic(
           this.hapChar.OutletInUse,
-          power > this.inUsePowerThreshold
+          this.cacheState === 'on' && power > this.inUsePowerThreshold
         )
         this.service.updateCharacteristic(this.eveChar.CurrentConsumption, power)
-        const isOn = this.cacheState === 'on'
-        this.accessory.eveService.addEntry({ power: isOn ? power : 0 })
+        this.accessory.eveService.addEntry({
+          power: this.cacheState === 'on' ? power : 0
+        })
         this.accessory.context.energyReadings.push(power)
         logger = true
       }

From fbc844f28e185f1f40eb11b40abc92cad5410441 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 3 May 2021 21:49:10 +0100
Subject: [PATCH 1982/3183] set power to 0 when turning off

---
 lib/device/outlet-double.js | 6 ++++++
 lib/device/outlet-single.js | 9 +++++++++
 2 files changed, 15 insertions(+)

diff --git a/lib/device/outlet-double.js b/lib/device/outlet-double.js
index 1859a4d5..cc417468 100644
--- a/lib/device/outlet-double.js
+++ b/lib/device/outlet-double.js
@@ -127,6 +127,8 @@ module.exports = class deviceOutletDouble {
               if (i > 0) {
                 if (!value) {
                   service.updateCharacteristic(this.hapChar.OutletInUse, false)
+                  service.updateCharacteristic(this.eveChar.CurrentConsumption, 0)
+                  subAccessory.eveService.addEntry({ power: 0 })
                 }
                 if (!this.disableDeviceLogging) {
                   this.log(
@@ -222,6 +224,10 @@ module.exports = class deviceOutletDouble {
                 this.hapChar.On,
                 params.switches[i - 1].switch === 'on'
               )
+              if (params.switches[i - 1].switch === 'off') {
+                service.updateCharacteristic(this.hapChar.OutletInUse, false)
+                service.updateCharacteristic(this.eveChar.CurrentConsumption, 0)
+              }
               if (params.updateSource && !this.disableDeviceLogging) {
                 this.log(
                   '[%s] %s [%s].',
diff --git a/lib/device/outlet-single.js b/lib/device/outlet-single.js
index 478a1f7a..91a27dca 100644
--- a/lib/device/outlet-single.js
+++ b/lib/device/outlet-single.js
@@ -162,6 +162,9 @@ module.exports = class deviceOutletSingle {
       this.cacheState = newValue
       if (this.hasReadings && !value) {
         this.service.updateCharacteristic(this.hapChar.OutletInUse, false)
+        this.service.updateCharacteristic(this.eveChar.CurrentConsumption, 0)
+        this.accessory.eveService.addEntry({ power: 0 })
+        this.accessory.context.energyReadings.push(0)
       }
       if (!this.disableDeviceLogging) {
         this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
@@ -189,6 +192,12 @@ module.exports = class deviceOutletSingle {
       if (params.switch && params.switch !== this.cacheState) {
         this.service.updateCharacteristic(this.hapChar.On, params.switch === 'on')
         this.cacheState = params.switch
+        if (this.hasReadings && this.cacheState === 'off') {
+          this.service.updateCharacteristic(this.hapChar.OutletInUse, false)
+          this.service.updateCharacteristic(this.eveChar.CurrentConsumption, 0)
+          this.accessory.eveService.addEntry({ power: 0 })
+          this.accessory.context.energyReadings.push(0)
+        }
         if (params.updateSource && !this.disableDeviceLogging) {
           this.log('[%s] %s [%s].', this.name, this.lang.curState, params.switch)
         }

From 53d2aef05aa8cec9c8171a3a77c071c74e5ae86e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 3 May 2021 21:50:05 +0100
Subject: [PATCH 1983/3183] 6.3.1-beta.11

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 14e8219c..dbb54d66 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.3.1-beta.10",
+  "version": "6.3.1-beta.11",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 2aeebbd2..91284437 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.3.1-beta.10",
+  "version": "6.3.1-beta.11",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 2623b64502396003f85ee951644fe8f4ab52c459 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 3 May 2021 21:58:29 +0100
Subject: [PATCH 1984/3183] Update outlet-double.js

---
 lib/device/outlet-double.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/device/outlet-double.js b/lib/device/outlet-double.js
index cc417468..c2114f4f 100644
--- a/lib/device/outlet-double.js
+++ b/lib/device/outlet-double.js
@@ -157,6 +157,7 @@ module.exports = class deviceOutletDouble {
                 if (i > 0) {
                   if (!value) {
                     service.updateCharacteristic(this.hapChar.OutletInUse, false)
+                    service.updateCharacteristic(this.eveChar.CurrentConsumption, 0)
                   }
                   if (!this.disableDeviceLogging) {
                     this.log(

From 870f266f625f00eaa49ca9b389417b4ee5d2ed56 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 3 May 2021 22:00:57 +0100
Subject: [PATCH 1985/3183] Update outlet-double.js

---
 lib/device/outlet-double.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/device/outlet-double.js b/lib/device/outlet-double.js
index c2114f4f..123d6fed 100644
--- a/lib/device/outlet-double.js
+++ b/lib/device/outlet-double.js
@@ -44,6 +44,7 @@ module.exports = class deviceOutletDouble {
         this.service.addCharacteristic(this.eveChar.Voltage)
         this.service.addCharacteristic(this.eveChar.CurrentConsumption)
         this.service.addCharacteristic(this.eveChar.ElectricCurrent)
+        this.service.addCharacteristic(this.eveChar.TotalConsumption)
       }
     }
 
@@ -83,6 +84,9 @@ module.exports = class deviceOutletDouble {
         this.service.removeCharacteristic(
           this.service.getCharacteristic(this.eveChar.ElectricCurrent)
         )
+        this.service.removeCharacteristic(
+          this.service.getCharacteristic(this.eveChar.TotalConsumption)
+        )
       }
     }
 
@@ -158,6 +162,7 @@ module.exports = class deviceOutletDouble {
                   if (!value) {
                     service.updateCharacteristic(this.hapChar.OutletInUse, false)
                     service.updateCharacteristic(this.eveChar.CurrentConsumption, 0)
+                    subAccessory.eveService.addEntry({ power: 0 })
                   }
                   if (!this.disableDeviceLogging) {
                     this.log(
@@ -228,6 +233,7 @@ module.exports = class deviceOutletDouble {
               if (params.switches[i - 1].switch === 'off') {
                 service.updateCharacteristic(this.hapChar.OutletInUse, false)
                 service.updateCharacteristic(this.eveChar.CurrentConsumption, 0)
+                subAccessory.eveService.addEntry({ power: 0 })
               }
               if (params.updateSource && !this.disableDeviceLogging) {
                 this.log(

From 404263d279b47d3c666ccbce7964b9b095c3a74e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 3 May 2021 22:01:24 +0100
Subject: [PATCH 1986/3183] 6.3.1-beta.12

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index dbb54d66..f6eaeefb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.3.1-beta.11",
+  "version": "6.3.1-beta.12",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 91284437..ec5ef4b9 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.3.1-beta.11",
+  "version": "6.3.1-beta.12",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From ad6e8cb5b8a965c624652a63c4f2ccfd06cc9701 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Mon, 3 May 2021 23:12:47 +0100
Subject: [PATCH 1987/3183] Update outlet-double.js

---
 lib/device/outlet-double.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/device/outlet-double.js b/lib/device/outlet-double.js
index 123d6fed..f4986ab4 100644
--- a/lib/device/outlet-double.js
+++ b/lib/device/outlet-double.js
@@ -290,7 +290,10 @@ module.exports = class deviceOutletDouble {
           }
         }
       }
-      if (!this.platform.hideMasters.includes(this.accessory.context.eweDeviceId)) {
+      if (
+        !this.platform.hideMasters.includes(this.accessory.context.eweDeviceId) &&
+        params.switches
+      ) {
         this.service.updateCharacteristic(this.hapChar.On, primaryState)
       }
     } catch (err) {

From 44a082b96a3c7361ea09927526f7ef2e42a3309c Mon Sep 17 00:00:00 2001
From: Levi Buzolic <levibuzolic@gmail.com>
Date: Tue, 4 May 2021 11:36:58 +1000
Subject: [PATCH 1988/3183] Allow user to configure httpHost and countryCode
 manually

---
 config.schema.json     | 18 ++++++++++++++++--
 lib/connection/http.js |  5 +++--
 lib/index.js           | 10 ++++++++++
 3 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index b6e82620..318a5a3d 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -68,6 +68,18 @@
         "type": "boolean",
         "description": "If true, the plugin will remove all accessories and not load the plugin on restart."
       },
+      "httpHost": {
+        "title": "HTTP Host",
+        "type": "string",
+        "description": "Override the default eWeLink HTTP API host, useful if you need to force a specific region/host.",
+        "placeholder": "eu-apia.coolkit.cc"
+      },
+      "countryCode": {
+        "title": "Country code",
+        "type": "string",
+        "description": "Override the default country code sent for login, may help with auth issues for users in other regions.",
+        "placeholder": "+44"
+      },
       "singleDevices": {
         "title": "Single Channel Devices",
         "description": "Applies to single-channel switch, light switch and Slampher devices.",
@@ -677,7 +689,9 @@
         "mode",
         "disableDeviceLogging",
         "debug",
-        "disablePlugin"
+        "disablePlugin",
+        "httpHost",
+        "countryCode"
       ]
     },
     {
@@ -877,4 +891,4 @@
       }]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/lib/connection/http.js b/lib/connection/http.js
index becde388..42cd660c 100644
--- a/lib/connection/http.js
+++ b/lib/connection/http.js
@@ -22,14 +22,15 @@ module.exports = class connectionHTTP {
     this.crypto = platform.crypto
 
     // Try a default http host which will be changed for other regions automatically
-    this.httpHost = 'eu-apia.coolkit.cc'
+    this.httpHost = platform.config.httpHost || 'eu-apia.coolkit.cc'
+    this.countryCode = platform.config.countryCode || '+44'
   }
 
   async login () {
     try {
       // Used to log the user in and obtain the user api key and token
       const data = {
-        countryCode: '+44',
+        countryCode: this.countryCode,
         password: this.password
       }
 
diff --git a/lib/index.js b/lib/index.js
index 30ad17fd..d82a3000 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -415,6 +415,16 @@ class eWeLinkPlatform {
           }
           this.config.username = val.replace(/[\s]+/g, '')
           break
+        case 'httpHost':
+          if (typeof val === 'string' && val != '') {
+            this.config.httpHost = val
+          }
+          break
+        case 'countryCode':
+          if (typeof val === 'string' && val != '') {
+            this.config.countryCode = val
+          }
+          break
         default:
           logRemove(key)
           break

From 39e2730a51832a9d0d2637a1502c1a55a8ce9d93 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 4 May 2021 08:22:35 +0100
Subject: [PATCH 1989/3183] amendments to pr

---
 config.schema.json     | 51 +++++++++++++++++++++++++++++-------------
 lib/connection/http.js |  5 +++--
 lib/index.js           | 29 +++++++++++++++---------
 lib/utils/constants.js |  7 ++++++
 4 files changed, 65 insertions(+), 27 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index c9464fc2..c079e4e4 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -29,6 +29,39 @@
         "type": "boolean",
         "description": "If true, the plugin will decode your entered password from a base64 encoded string to plain text and use this to log into eWeLink."
       },
+      "httpHost": {
+        "title": "HTTP Host",
+        "type": "string",
+        "description": "Override the default eWeLink HTTP API host, useful if you need to force a specific region/host.",
+        "placeholder": "eu-apia.coolkit.cc",
+        "oneOf": [{
+          "title": "Auto (Recommended)",
+          "enum": ["auto"]
+        },
+        {
+          "title": "eu-apia.coolkit.cc",
+          "enum": ["eu-apia.coolkit.cc"]
+        },
+        {
+          "title": "us-apia.coolkit.cc",
+          "enum": ["us-apia.coolkit.cc"]
+        },
+        {
+          "title": "as-apia.coolkit.cc",
+          "enum": ["as-apia.coolkit.cc"]
+        },
+        {
+          "title": "cn-apia.coolkit.cn",
+          "enum": ["cn-apia.coolkit.cn"]
+        }
+      ]
+      },
+      "countryCode": {
+        "title": "Country Code",
+        "type": "string",
+        "description": "Override the default country code sent for login, may help with auth issues for users in other regions.",
+        "placeholder": "+44"
+      },
       "mode": {
         "type": "string",
         "title": "Connection Mode",
@@ -68,18 +101,6 @@
         "type": "boolean",
         "description": "If true, the plugin will remove all accessories and not load the plugin on restart."
       },
-      "httpHost": {
-        "title": "HTTP Host",
-        "type": "string",
-        "description": "Override the default eWeLink HTTP API host, useful if you need to force a specific region/host.",
-        "placeholder": "eu-apia.coolkit.cc"
-      },
-      "countryCode": {
-        "title": "Country code",
-        "type": "string",
-        "description": "Override the default country code sent for login, may help with auth issues for users in other regions.",
-        "placeholder": "+44"
-      },
       "singleDevices": {
         "title": "Single Channel Devices",
         "description": "Applies to single-channel switch, light switch and Slampher devices.",
@@ -686,12 +707,12 @@
       "expandable": true,
       "items": [
         "encodedPassword",
+        "httpHost",
+        "countryCode",
         "mode",
         "disableDeviceLogging",
         "debug",
-        "disablePlugin",
-        "httpHost",
-        "countryCode"
+        "disablePlugin"
       ]
     },
     {
diff --git a/lib/connection/http.js b/lib/connection/http.js
index 4ee129d5..b877d4cc 100644
--- a/lib/connection/http.js
+++ b/lib/connection/http.js
@@ -22,8 +22,9 @@ module.exports = class connectionHTTP {
     this.crypto = platform.crypto
 
     // Try a default http host which will be changed for other regions automatically
-    this.httpHost = platform.config.httpHost || 'eu-apia.coolkit.cc'
-    this.countryCode = platform.config.countryCode || '+44'
+    this.httpHost = platform.config.httpHost
+    this.countryCode = platform.config.countryCode
+    this.log.error(this.httpHost)
   }
 
   async login () {
diff --git a/lib/index.js b/lib/index.js
index 5bb20909..c69c5d49 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -153,6 +153,13 @@ class eWeLinkPlatform {
             logIgnore(key)
           }
           break
+        case 'countryCode':
+          if (typeof val !== 'string' || val === '') {
+            logIgnore(key)
+          } else {
+            this.config.countryCode = '+' + val.replace(/[^0-9]/g, '')
+          }
+          break
         case 'debug':
         case 'debugFakegato':
         case 'disableDeviceLogging':
@@ -374,6 +381,18 @@ class eWeLinkPlatform {
             logIgnore(key)
           }
           break
+        case 'httpHost': {
+          const inSet = this.consts.allowed.httpHosts.includes(val)
+          if (typeof val !== 'string' || !inSet) {
+            logIgnore(key)
+          }
+          this.config.httpHost = inSet
+            ? val === 'auto'
+              ? this.consts.defaultValues[key]
+              : val
+            : this.consts.defaultValues[key]
+          break
+        }
         case 'ignoredDevices': {
           if (Array.isArray(val)) {
             if (val.length > 0) {
@@ -414,16 +433,6 @@ class eWeLinkPlatform {
           }
           this.config.username = val.replace(/[\s]+/g, '')
           break
-        case 'httpHost':
-          if (typeof val === 'string' && val != '') {
-            this.config.httpHost = val
-          }
-          break
-        case 'countryCode':
-          if (typeof val === 'string' && val != '') {
-            this.config.countryCode = val
-          }
-          break
         default:
           logRemove(key)
           break
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 8a500e36..12f50705 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -7,6 +7,8 @@ module.exports = {
     name: 'eWeLink',
     username: '',
     password: '',
+    countryCode: '+44',
+    httpHost: 'eu-apia.coolkit.cc',
     encodedPassword: false,
     mode: 'auto',
     disableDeviceLogging: false,
@@ -27,6 +29,7 @@ module.exports = {
   },
 
   defaultValues: {
+    httpHost: 'eu-apia.coolkit.cc',
     inUsePowerThreshold: 0,
     lowBattThreshold: 25,
     sensorTimeLength: 60,
@@ -92,6 +95,10 @@ module.exports = {
       'valve_four', 'window'
     ],
     modes: ['auto', 'wan', 'lan'],
+    httpHosts: [
+      'auto', 'eu-apia.coolkit.cc', 'us-apia.coolkit.cc', 'as-apia.coolkit.cc',
+      'cn-apia.coolkit.cn'
+    ],
     obstructs: ['garage', 'garage_eachen'],
     setups: ['oneSwitch', 'twoSwitch'],
     sensors: ['water', 'smoke', 'co', 'co2', 'contact', 'occupancy', 'motion'],

From 7994f5e0e8ff3f43db455315b265151973af9440 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 4 May 2021 08:23:00 +0100
Subject: [PATCH 1990/3183] remove dev logging

---
 lib/connection/http.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/connection/http.js b/lib/connection/http.js
index b877d4cc..cf09812f 100644
--- a/lib/connection/http.js
+++ b/lib/connection/http.js
@@ -24,7 +24,6 @@ module.exports = class connectionHTTP {
     // Try a default http host which will be changed for other regions automatically
     this.httpHost = platform.config.httpHost
     this.countryCode = platform.config.countryCode
-    this.log.error(this.httpHost)
   }
 
   async login () {

From 003792a7858048adea99ebd34f517ee021bfe257 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 4 May 2021 11:42:39 +0100
Subject: [PATCH 1991/3183] changes

---
 config.schema.json                        |   9 +-
 lib/connection/http.js                    |  34 +--
 lib/connection/lan.js                     |  43 ++-
 lib/connection/ws.js                      |  29 +-
 lib/device/curtain.js                     |  14 +-
 lib/device/diffuser.js                    |  22 +-
 lib/device/fan.js                         |  16 +-
 lib/device/humidifier.js                  |  21 +-
 lib/device/light-cct.js                   |  18 +-
 lib/device/light-dimmer.js                |  16 +-
 lib/device/light-rgb-cct.js               |  22 +-
 lib/device/light-rgb.js                   |  20 +-
 lib/device/motor.js                       |  14 +-
 lib/device/outlet-double.js               |  42 +--
 lib/device/outlet-multi.js                |  40 +--
 lib/device/outlet-scm.js                  |  15 +-
 lib/device/outlet-single.js               |  18 +-
 lib/device/rf-bridge.js                   |  18 +-
 lib/device/sensor-ambient.js              |  14 +-
 lib/device/sensor-contact.js              |  23 +-
 lib/device/sensor-temp-humi.js            |  11 +-
 lib/device/simulation/blind.js            |  16 +-
 lib/device/simulation/door.js             |  16 +-
 lib/device/simulation/garage-eachen.js    |  18 +-
 lib/device/simulation/garage-four.js      |  16 +-
 lib/device/simulation/garage-od-switch.js |  14 +-
 lib/device/simulation/garage-one.js       |  31 +-
 lib/device/simulation/garage-two.js       |  16 +-
 lib/device/simulation/lock-one.js         |  18 +-
 lib/device/simulation/sensor-leak.js      |  15 +-
 lib/device/simulation/switch-valve.js     |  17 +-
 lib/device/simulation/tap-one.js          |  17 +-
 lib/device/simulation/tap-two.js          |  15 +-
 lib/device/simulation/thermostat.js       |  18 +-
 lib/device/simulation/valve-four.js       |  15 +-
 lib/device/simulation/valve-one.js        |  17 +-
 lib/device/simulation/valve-two.js        |  15 +-
 lib/device/simulation/window.js           |  16 +-
 lib/device/switch-double.js               |  40 +--
 lib/device/switch-multi.js                |  41 ++-
 lib/device/switch-single.js               |  15 +-
 lib/device/thermostat.js                  |  16 +-
 lib/device/zigbee/light-cct.js            |  20 +-
 lib/device/zigbee/light-dimmer.js         |  18 +-
 lib/device/zigbee/sensor-ambient.js       |  19 +-
 lib/device/zigbee/sensor-contact.js       |  53 +++-
 lib/device/zigbee/sensor-motion.js        |  13 +-
 lib/device/zigbee/switch-single.js        |  17 +-
 lib/device/zigbee/switch-stateless.js     |  11 +-
 lib/index.js                              | 346 +++++++++++-----------
 lib/utils/constants.js                    |   5 +-
 51 files changed, 665 insertions(+), 698 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index c079e4e4..5d49f612 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -420,6 +420,12 @@
               "placeholder": 25,
               "minimum": 5
             },
+            "offset": {
+              "type": "number",
+              "title": "Temperature Offset",
+              "description": "You can offset the temperature that the sensor reads. An offset of 2 means 2 degrees will be added to the recorded temperature. Can be positive or negative and can include a decimal point '.'.",
+              "placeholder": 0
+            },
             "hideLongDouble": {
               "type": "boolean",
               "title": "Hide Long & Double Press",
@@ -650,7 +656,7 @@
             "sensorId": {
               "type": "string",
               "title": "Sensor",
-              "description": "A DW2 sensor can be used for a single garage door to determine the current state. Enter the 10 digit eWeLink device ID (normally in the format 1000ab23cd). Otherwise leave blank.",
+              "description": "A DW2 or Zigbee contact sensor can be used for a single garage door to determine the current state. Enter the 10 digit eWeLink device ID (normally in the format 1000ab23cd). Otherwise leave blank.",
               "condition": {
                 "functionBody": "return (model.groups[arrayIndices] && model.groups[arrayIndices].type==='garage');"
               }
@@ -842,6 +848,7 @@
           "sensorDevices[].deviceId",
           "sensorDevices[].label",
           "sensorDevices[].lowBattThreshold",
+          "sensorDevices[].offset",
           "sensorDevices[].hideLongDouble",
           "sensorDevices[].scaleBattery",
           "sensorDevices[].overrideDisabledLogging"
diff --git a/lib/connection/http.js b/lib/connection/http.js
index cf09812f..86acdb17 100644
--- a/lib/connection/http.js
+++ b/lib/connection/http.js
@@ -2,28 +2,23 @@
 /* eslint-disable new-cap */
 'use strict'
 
+const axios = require('axios')
+const crypto = require('crypto')
+
 module.exports = class connectionHTTP {
   constructor (platform) {
     // Set up variables from the platform
     this.consts = platform.consts
+    this.countryCode = platform.config.countryCode
+    this.debug = platform.config.debug
     this.funcs = platform.funcs
-    this.log = platform.log
+    this.httpHost = platform.config.httpHost
+    this.ignoredDevices = platform.config.ignoredDevices
     this.lang = platform.lang
+    this.log = platform.log
     this.obstructSwitches = platform.obstructSwitches
-
-    // Set up config variables from the platform
-    this.debug = platform.config.debug
-    this.ignoredDevices = platform.config.ignoredDevices
     this.password = platform.config.password
     this.username = platform.config.username
-
-    // Set up libraries from the platform
-    this.axios = platform.axios
-    this.crypto = platform.crypto
-
-    // Try a default http host which will be changed for other regions automatically
-    this.httpHost = platform.config.httpHost
-    this.countryCode = platform.config.countryCode
   }
 
   async login () {
@@ -47,11 +42,11 @@ module.exports = class connectionHTTP {
       }
 
       // Set up the request signature
-      const dataToSign = this.crypto.createHmac('sha256', this.consts.appSecret)
+      const dataToSign = crypto.createHmac('sha256', this.consts.appSecret)
         .update(JSON.stringify(data)).digest('base64')
 
       // Send the request
-      const res = await this.axios.post(
+      const res = await axios.post(
         'https://' + this.httpHost + '/v2/user/login', data,
         {
           headers: {
@@ -131,7 +126,7 @@ module.exports = class connectionHTTP {
     // Used to get a user's device list
     try {
       // Send the request
-      const res = await this.axios.get('https://' + this.httpHost + '/v2/device/thing', {
+      const res = await axios.get('https://' + this.httpHost + '/v2/device/thing', {
         headers: {
           Authorization: 'Bearer ' + this.aToken,
           'Content-Type': 'application/json',
@@ -163,7 +158,10 @@ module.exports = class connectionHTTP {
           ) {
             // Separate the sensors as these need to be set up last
             const isObstructSwitch = this.obstructSwitches[d.itemData.deviceid]
-            if (d.itemData.extra.uiid === 102 || isObstructSwitch) {
+            if (
+              this.consts.devices.garageSensors.includes(d.itemData.extra.uiid) ||
+              isObstructSwitch
+            ) {
               sensorList.push(d.itemData)
             } else {
               deviceList.push(d.itemData)
@@ -193,7 +191,7 @@ module.exports = class connectionHTTP {
     // Used to get info about a specific device
     try {
       // Send the request
-      const res = await this.axios.post(
+      const res = await axios.post(
         'https://' + this.httpHost + '/v2/device/thing',
         {
           thingList: [{
diff --git a/lib/connection/lan.js b/lib/connection/lan.js
index 7ebfde56..a571c72a 100644
--- a/lib/connection/lan.js
+++ b/lib/connection/lan.js
@@ -2,27 +2,24 @@
 /* eslint-disable new-cap */
 'use strict'
 
+const axios = require('axios')
+const crypto = require('crypto')
+const dnsSd = require('node-dns-sd')
+const emitter = new (require('events'))()
+
 module.exports = class connectionLAN {
   constructor (platform, devices) {
     // Set up variables from the platform
     this.consts = platform.consts
+    this.debug = platform.config.debug
     this.funcs = platform.funcs
-    this.log = platform.log
+    this.ipOverride = platform.ipOverride
     this.lang = platform.lang
-    this.debug = platform.config.debug
-
-    // Set up config variables from the platform
+    this.log = platform.log
     this.mode = platform.config.mode
-    this.ipOverride = platform.ipOverride
-
-    // Set up libraries from the platform
-    this.axios = platform.axios
-    this.crypto = platform.crypto
 
     // Set up other variables and libraries needed by this class
     this.deviceMap = new Map()
-    this.dns = require('node-dns-sd')
-    this.emitter = new (require('events'))()
 
     // Create a template map with our device list from the HTTP client
     devices.forEach(device => {
@@ -44,7 +41,7 @@ module.exports = class connectionLAN {
     if (this.debug) {
       this.log('%s.', this.lang.lanStarting)
     }
-    const res = await this.dns.discover({
+    const res = await dnsSd.discover({
       name: '_ewelink._tcp.local'
     })
     if (this.debug) {
@@ -71,7 +68,7 @@ module.exports = class connectionLAN {
 
   async startMonitor () {
     // Function to parse DNS packets picked up by node-dns-sd
-    this.dns.ondata = packet => {
+    dnsSd.ondata = packet => {
       try {
         if (!packet.answers) {
           return
@@ -96,9 +93,9 @@ module.exports = class connectionLAN {
               (rdata.data2 || '') +
               (rdata.data3 || '') +
               (rdata.data4 || '')
-            const key = this.crypto.createHash('md5')
+            const key = crypto.createHash('md5')
               .update(Buffer.from(deviceInfo.apiKey, 'utf8')).digest()
-            const dText = this.crypto
+            const dText = crypto
               .createDecipheriv('aes-128-cbc', key, Buffer.from(rdata.iv, 'base64'))
             const pText = Buffer
               .concat([dText.update(Buffer.from(data, 'base64')), dText.final()])
@@ -145,7 +142,7 @@ module.exports = class connectionLAN {
                 deviceid: rdata.id,
                 params
               }
-              this.emitter.emit('update', returnTemplate)
+              emitter.emit('update', returnTemplate)
             }
           })
       } catch (err) {
@@ -155,7 +152,7 @@ module.exports = class connectionLAN {
     }
 
     // Start the DNS packet monitoring
-    await this.dns.startMonitoring()
+    await dnsSd.startMonitoring()
     this.log('%s.', this.lang.lanMonitor)
   }
 
@@ -195,10 +192,10 @@ module.exports = class connectionLAN {
       }
 
       // Generate the HTTP request
-      const key = this.crypto.createHash('md5')
+      const key = crypto.createHash('md5')
         .update(Buffer.from(apiKey, 'utf8')).digest()
-      const iv = this.crypto.randomBytes(16)
-      const enc = this.crypto.createCipheriv('aes-128-cbc', key, iv)
+      const iv = crypto.randomBytes(16)
+      const enc = crypto.createCipheriv('aes-128-cbc', key, iv)
       const data = {
         data: Buffer.concat([enc.update(JSON.stringify(params)), enc.final()])
           .toString('base64'),
@@ -211,7 +208,7 @@ module.exports = class connectionLAN {
 
       // Send the HTTP request
       const ip = this.deviceMap.get(json.deviceid).ip
-      const res = await this.axios({
+      const res = await axios({
         method: 'post',
         url: 'http://' + ip + ':8081/zeroconf/' + suffix,
         headers: {
@@ -238,7 +235,7 @@ module.exports = class connectionLAN {
   }
 
   receiveUpdate (f) {
-    this.emitter.addListener('update', f)
+    emitter.addListener('update', f)
   }
 
   addDeviceToMap (device) {
@@ -252,7 +249,7 @@ module.exports = class connectionLAN {
 
   async closeConnection () {
     // This is called when Homebridge is shutdown
-    await this.dns.stopMonitoring()
+    await dnsSd.stopMonitoring()
     if (this.debug) {
       this.log('%s.', this.lang.stoppedLAN)
     }
diff --git a/lib/connection/ws.js b/lib/connection/ws.js
index f038356e..34653f8f 100644
--- a/lib/connection/ws.js
+++ b/lib/connection/ws.js
@@ -2,30 +2,25 @@
 /* eslint-disable new-cap */
 'use strict'
 
+const axios = require('axios')
+const emitter = new (require('events'))()
+const ws = require('ws')
+const wsp = require('websocket-as-promised')
+
 module.exports = class connectionWS {
   constructor (platform, authData) {
     // Set up variables from the platform
     this.consts = platform.consts
+    this.debug = platform.config.debug
     this.funcs = platform.funcs
-    this.log = platform.log
     this.lang = platform.lang
-
-    // Set up config variables from the platform
-    this.debug = platform.config.debug
-
-    // Set up libraries from the platform
-    this.axios = platform.axios
+    this.log = platform.log
 
     // Set up variables from the authData (from HTTP)
     this.httpHost = authData.httpHost
     this.aToken = authData.aToken
     this.apiKey = authData.apiKey
 
-    // Set up other libraries needed by this class
-    this.emitter = new (require('events'))()
-    this.ws = require('ws')
-    this.wsp = require('websocket-as-promised')
-
     // Flag used to determine ws connection status
     this.wsIsConnected = false
   }
@@ -34,7 +29,7 @@ module.exports = class connectionWS {
     // Used to get the web socket host
     try {
       // Send the HTTP request to get the web socket host
-      const res = await this.axios({
+      const res = await axios({
         method: 'post',
         url: 'https://' + this.httpHost.replace('-api', '-disp') + '/dispatch/app',
         headers: {
@@ -96,8 +91,8 @@ module.exports = class connectionWS {
       const wsHost = await this.getHost()
 
       // Create the web socket client
-      this.wsClient = new this.wsp('wss://' + wsHost + ':8080/api/ws', {
-        createWebSocket: url => new this.ws(url),
+      this.wsClient = new wsp('wss://' + wsHost + ':8080/api/ws', {
+        createWebSocket: url => new ws(url),
         extractMessageData: event => event,
         attachRequestId: (data, requestId) => Object.assign({ sequence: requestId }, data),
         extractRequestId: data => data && data.sequence,
@@ -230,7 +225,7 @@ module.exports = class connectionWS {
                 }
 
                 // Report the new device params object back to the plugin to deal with
-                this.emitter.emit('update', returnTemplate)
+                emitter.emit('update', returnTemplate)
               }
               break
             }
@@ -349,7 +344,7 @@ module.exports = class connectionWS {
   }
 
   receiveUpdate (f) {
-    this.emitter.addListener('update', f)
+    emitter.addListener('update', f)
   }
 
   async requestUpdate (accessory) {
diff --git a/lib/device/curtain.js b/lib/device/curtain.js
index 43242d1b..fbb66826 100644
--- a/lib/device/curtain.js
+++ b/lib/device/curtain.js
@@ -5,13 +5,12 @@
 module.exports = class deviceCurtain {
   constructor (platform, accessory) {
     // Set up variables from the platform
-    this.consts = platform.consts
-    this.debug = platform.config.debug
     this.funcs = platform.funcs
-    this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
-    this.log = platform.log
+    this.hapErr = platform.api.hap.HapStatusError
+    this.hapServ = platform.api.hap.Service
     this.lang = platform.lang
+    this.log = platform.log
     this.platform = platform
 
     // Set up variables from the accessory
@@ -25,8 +24,7 @@ module.exports = class deviceCurtain {
     */
 
     // Set up custom variables for this device type
-    const deviceId = this.accessory.context.eweDeviceId
-    const deviceConf = platform.singleDevices[deviceId]
+    const deviceConf = platform.singleDevices[accessory.context.eweDeviceId]
     this.disableDeviceLogging = deviceConf && deviceConf.overrideDisabledLogging
       ? false
       : platform.config.disableDeviceLogging
@@ -41,7 +39,7 @@ module.exports = class deviceCurtain {
     })
 
     // Output the customised options to the log if in debug mode
-    if (this.debug) {
+    if (platform.config.debug) {
       const opts = JSON.stringify({ disableDeviceLogging: this.disableDeviceLogging })
       this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
     }
@@ -88,7 +86,7 @@ module.exports = class deviceCurtain {
           this.cachePos
         )
       }, 5000)
-      throw new this.platform.api.hap.HapStatusError(-70402)
+      throw new this.hapErr(-70402)
     }
   }
 
diff --git a/lib/device/diffuser.js b/lib/device/diffuser.js
index b812fd4b..3308bbc4 100644
--- a/lib/device/diffuser.js
+++ b/lib/device/diffuser.js
@@ -6,13 +6,12 @@ module.exports = class deviceDiffuser {
   constructor (platform, accessory) {
     // Set up variables from the platform
     this.colourUtils = platform.colourUtils
-    this.consts = platform.consts
-    this.debug = platform.config.debug
     this.funcs = platform.funcs
-    this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
-    this.log = platform.log
+    this.hapErr = platform.api.hap.HapStatusError
+    this.hapServ = platform.api.hap.Service
     this.lang = platform.lang
+    this.log = platform.log
     this.platform = platform
 
     // Set up variables from the accessory
@@ -20,8 +19,7 @@ module.exports = class deviceDiffuser {
     this.accessory = accessory
 
     // Set up custom variables for this device type
-    const deviceId = this.accessory.context.eweDeviceId
-    const deviceConf = platform.singleDevices[deviceId]
+    const deviceConf = platform.singleDevices[accessory.context.eweDeviceId]
     this.disableDeviceLogging = deviceConf && deviceConf.overrideDisabledLogging
       ? false
       : platform.config.disableDeviceLogging
@@ -62,7 +60,7 @@ module.exports = class deviceDiffuser {
     })
 
     // Output the customised options to the log if in debug mode
-    if (this.debug) {
+    if (platform.config.debug) {
       const opts = JSON.stringify({ disableDeviceLogging: this.disableDeviceLogging })
       this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
     }
@@ -104,7 +102,7 @@ module.exports = class deviceDiffuser {
       setTimeout(() => {
         this.fanService.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
       }, 5000)
-      throw new this.platform.api.hap.HapStatusError(-70402)
+      throw new this.hapErr(-70402)
     }
   }
 
@@ -158,7 +156,7 @@ module.exports = class deviceDiffuser {
       setTimeout(() => {
         this.fanService.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
       }, 5000)
-      throw new this.platform.api.hap.HapStatusError(-70402)
+      throw new this.hapErr(-70402)
     }
   }
 
@@ -206,7 +204,7 @@ module.exports = class deviceDiffuser {
           this.cacheLight === 'on'
         )
       }, 5000)
-      throw new this.platform.api.hap.HapStatusError(-70402)
+      throw new this.hapErr(-70402)
     }
   }
 
@@ -255,7 +253,7 @@ module.exports = class deviceDiffuser {
           this.cacheLight === 'on'
         )
       }, 5000)
-      throw new this.platform.api.hap.HapStatusError(-70402)
+      throw new this.hapErr(-70402)
     }
   }
 
@@ -318,7 +316,7 @@ module.exports = class deviceDiffuser {
           this.cacheLight === 'on'
         )
       }, 5000)
-      throw new this.platform.api.hap.HapStatusError(-70402)
+      throw new this.hapErr(-70402)
     }
   }
 
diff --git a/lib/device/fan.js b/lib/device/fan.js
index cdaceb86..839a3be7 100644
--- a/lib/device/fan.js
+++ b/lib/device/fan.js
@@ -5,13 +5,12 @@
 module.exports = class deviceFan {
   constructor (platform, accessory) {
     // Set up variables from the platform
-    this.consts = platform.consts
-    this.debug = platform.config.debug
     this.funcs = platform.funcs
-    this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
-    this.log = platform.log
+    this.hapErr = platform.api.hap.HapStatusError
+    this.hapServ = platform.api.hap.Service
     this.lang = platform.lang
+    this.log = platform.log
     this.platform = platform
 
     // Set up variables from the accessory
@@ -19,8 +18,7 @@ module.exports = class deviceFan {
     this.accessory = accessory
 
     // Set up custom variables for this device type
-    const deviceId = this.accessory.context.eweDeviceId
-    const deviceConf = platform.fanDevices[deviceId]
+    const deviceConf = platform.fanDevices[accessory.context.eweDeviceId]
     this.hideLight = deviceConf && deviceConf.hideLight
     this.disableDeviceLogging = deviceConf && deviceConf.overrideDisabledLogging
       ? false
@@ -69,7 +67,7 @@ module.exports = class deviceFan {
     }
 
     // Output the customised options to the log if in debug mode
-    if (this.debug) {
+    if (platform.config.debug) {
       const opts = JSON.stringify({
         disableDeviceLogging: this.disableDeviceLogging,
         hideLight: this.hideLight
@@ -139,7 +137,7 @@ module.exports = class deviceFan {
       setTimeout(() => {
         this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
       }, 5000)
-      throw new this.platform.api.hap.HapStatusError(-70402)
+      throw new this.hapErr(-70402)
     }
   }
 
@@ -166,7 +164,7 @@ module.exports = class deviceFan {
       setTimeout(() => {
         this.lightService.updateCharacteristic(this.hapChar.On, this.cacheLight === 'on')
       }, 5000)
-      throw new this.platform.api.hap.HapStatusError(-70402)
+      throw new this.hapErr(-70402)
     }
   }
 
diff --git a/lib/device/humidifier.js b/lib/device/humidifier.js
index c06e3cb5..cb02602d 100644
--- a/lib/device/humidifier.js
+++ b/lib/device/humidifier.js
@@ -5,19 +5,24 @@
 module.exports = class deviceHumidifier {
   constructor (platform, accessory) {
     // Set up variables from the platform
-    this.consts = platform.consts
-    this.debug = platform.config.debug
     this.funcs = platform.funcs
-    this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
-    this.log = platform.log
+    this.hapErr = platform.api.hap.HapStatusError
+    this.hapServ = platform.api.hap.Service
     this.lang = platform.lang
+    this.log = platform.log
     this.platform = platform
 
     // Set up variables from the accessory
     this.name = accessory.displayName
     this.accessory = accessory
 
+    // Set up custom variables for this device type
+    const deviceConf = platform.singleDevices[accessory.context.eweDeviceId]
+    this.disableDeviceLogging = deviceConf && deviceConf.overrideDisabledLogging
+      ? false
+      : platform.config.disableDeviceLogging
+
     /*
       The device does not provide a current humidity reading so
       we use a fan accessory to be able to control the on/off state
@@ -48,6 +53,12 @@ module.exports = class deviceHumidifier {
       2: 'medium',
       3: 'high'
     }
+
+    // Output the customised options to the log if in debug mode
+    if (platform.config.debug) {
+      const opts = JSON.stringify({ disableDeviceLogging: this.disableDeviceLogging })
+      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
+    }
   }
 
   async internalModeUpdate (value) {
@@ -102,7 +113,7 @@ module.exports = class deviceHumidifier {
       setTimeout(() => {
         this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
       }, 5000)
-      throw new this.platform.api.hap.HapStatusError(-70402)
+      throw new this.hapErr(-70402)
     }
   }
 
diff --git a/lib/device/light-cct.js b/lib/device/light-cct.js
index 6c630a28..65fed136 100644
--- a/lib/device/light-cct.js
+++ b/lib/device/light-cct.js
@@ -5,13 +5,12 @@
 module.exports = class deviceLightCCT {
   constructor (platform, accessory) {
     // Set up variables from the platform
-    this.consts = platform.consts
-    this.debug = platform.config.debug
     this.funcs = platform.funcs
-    this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
-    this.log = platform.log
+    this.hapErr = platform.api.hap.HapStatusError
+    this.hapServ = platform.api.hap.Service
     this.lang = platform.lang
+    this.log = platform.log
     this.platform = platform
 
     // Set up variables from the accessory
@@ -19,8 +18,7 @@ module.exports = class deviceLightCCT {
     this.accessory = accessory
 
     // Set up custom variables for this device type
-    const deviceId = this.accessory.context.eweDeviceId
-    const deviceConf = platform.lightDevices[deviceId]
+    const deviceConf = platform.lightDevices[accessory.context.eweDeviceId]
     this.bulbModel = deviceConf && deviceConf.bulbModel
       ? deviceConf.bulbModel
       : platform.consts.defaultValues.bulbModel
@@ -82,7 +80,7 @@ module.exports = class deviceLightCCT {
     this.accessory.configureController(this.alController)
 
     // Output the customised options to the log if in debug mode
-    if (this.debug) {
+    if (platform.config.debug) {
       const opts = JSON.stringify({
         adaptiveLightingShift: this.alShift,
         brightnessStep: this.brightStep,
@@ -118,7 +116,7 @@ module.exports = class deviceLightCCT {
       setTimeout(() => {
         this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
       }, 5000)
-      throw new this.platform.api.hap.HapStatusError(-70402)
+      throw new this.hapErr(-70402)
     }
   }
 
@@ -155,7 +153,7 @@ module.exports = class deviceLightCCT {
       setTimeout(() => {
         this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
       }, 5000)
-      throw new this.platform.api.hap.HapStatusError(-70402)
+      throw new this.hapErr(-70402)
     }
   }
 
@@ -209,7 +207,7 @@ module.exports = class deviceLightCCT {
       setTimeout(() => {
         this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
       }, 5000)
-      throw new this.platform.api.hap.HapStatusError(-70402)
+      throw new this.hapErr(-70402)
     }
   }
 
diff --git a/lib/device/light-dimmer.js b/lib/device/light-dimmer.js
index bda2c43c..66b89132 100644
--- a/lib/device/light-dimmer.js
+++ b/lib/device/light-dimmer.js
@@ -5,13 +5,12 @@
 module.exports = class deviceLightDimmer {
   constructor (platform, accessory) {
     // Set up variables from the platform
-    this.consts = platform.consts
-    this.debug = platform.config.debug
     this.funcs = platform.funcs
-    this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
-    this.log = platform.log
+    this.hapErr = platform.api.hap.HapStatusError
+    this.hapServ = platform.api.hap.Service
     this.lang = platform.lang
+    this.log = platform.log
     this.platform = platform
 
     // Set up variables from the accessory
@@ -19,8 +18,7 @@ module.exports = class deviceLightDimmer {
     this.accessory = accessory
 
     // Set up custom variables for this device type
-    const deviceId = this.accessory.context.eweDeviceId
-    const deviceConf = platform.lightDevices[deviceId]
+    const deviceConf = platform.lightDevices[accessory.context.eweDeviceId]
     this.brightStep = deviceConf && deviceConf.brightnessStep
       ? Math.min(deviceConf.brightnessStep, 100)
       : platform.consts.defaultValues.brightnessStep
@@ -45,7 +43,7 @@ module.exports = class deviceLightDimmer {
       })
 
     // Output the customised options to the log if in debug mode
-    if (this.debug) {
+    if (platform.config.debug) {
       const opts = JSON.stringify({
         brightnessStep: this.brightStep,
         disableDeviceLogging: this.disableDeviceLogging
@@ -81,7 +79,7 @@ module.exports = class deviceLightDimmer {
       setTimeout(() => {
         this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
       }, 5000)
-      throw new this.platform.api.hap.HapStatusError(-70402)
+      throw new this.hapErr(-70402)
     }
   }
 
@@ -122,7 +120,7 @@ module.exports = class deviceLightDimmer {
       setTimeout(() => {
         this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
       }, 5000)
-      throw new this.platform.api.hap.HapStatusError(-70402)
+      throw new this.hapErr(-70402)
     }
   }
 
diff --git a/lib/device/light-rgb-cct.js b/lib/device/light-rgb-cct.js
index 41aa3843..b403f5cb 100644
--- a/lib/device/light-rgb-cct.js
+++ b/lib/device/light-rgb-cct.js
@@ -5,14 +5,13 @@
 module.exports = class deviceLightRGBCCT {
   constructor (platform, accessory) {
     // Set up variables from the platform
-    this.consts = platform.consts
-    this.debug = platform.config.debug
+    this.colourUtils = platform.colourUtils
     this.funcs = platform.funcs
-    this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
-    this.colourUtils = platform.colourUtils
-    this.log = platform.log
+    this.hapErr = platform.api.hap.HapStatusError
+    this.hapServ = platform.api.hap.Service
     this.lang = platform.lang
+    this.log = platform.log
     this.platform = platform
 
     // Set up variables from the accessory
@@ -20,8 +19,7 @@ module.exports = class deviceLightRGBCCT {
     this.accessory = accessory
 
     // Set up custom variables for this device type
-    const deviceId = this.accessory.context.eweDeviceId
-    const deviceConf = platform.lightDevices[deviceId]
+    const deviceConf = platform.lightDevices[accessory.context.eweDeviceId]
     this.alShift = deviceConf && deviceConf.adaptiveLightingShift
       ? deviceConf.adaptiveLightingShift
       : platform.consts.defaultValues.adaptiveLightingShift
@@ -74,7 +72,7 @@ module.exports = class deviceLightRGBCCT {
     this.accessory.configureController(this.alController)
 
     // Output the customised options to the log if in debug mode
-    if (this.debug) {
+    if (platform.config.debug) {
       const opts = JSON.stringify({
         adaptiveLightingShift: this.alShift,
         brightnessStep: this.brightStep,
@@ -108,7 +106,7 @@ module.exports = class deviceLightRGBCCT {
       setTimeout(() => {
         this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
       }, 5000)
-      throw new this.platform.api.hap.HapStatusError(-70402)
+      throw new this.hapErr(-70402)
     }
   }
 
@@ -169,7 +167,7 @@ module.exports = class deviceLightRGBCCT {
       setTimeout(() => {
         this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
       }, 5000)
-      throw new this.platform.api.hap.HapStatusError(-70402)
+      throw new this.hapErr(-70402)
     }
   }
 
@@ -240,7 +238,7 @@ module.exports = class deviceLightRGBCCT {
       setTimeout(() => {
         this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
       }, 5000)
-      throw new this.platform.api.hap.HapStatusError(-70402)
+      throw new this.hapErr(-70402)
     }
   }
 
@@ -329,7 +327,7 @@ module.exports = class deviceLightRGBCCT {
       setTimeout(() => {
         this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
       }, 5000)
-      throw new this.platform.api.hap.HapStatusError(-70402)
+      throw new this.hapErr(-70402)
     }
   }
 
diff --git a/lib/device/light-rgb.js b/lib/device/light-rgb.js
index 4384c059..c0d4d971 100644
--- a/lib/device/light-rgb.js
+++ b/lib/device/light-rgb.js
@@ -5,14 +5,13 @@
 module.exports = class deviceLightRGB {
   constructor (platform, accessory) {
     // Set up variables from the platform
-    this.consts = platform.consts
-    this.debug = platform.config.debug
+    this.colourUtils = platform.colourUtils
     this.funcs = platform.funcs
-    this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
-    this.colourUtils = platform.colourUtils
-    this.log = platform.log
+    this.hapErr = platform.api.hap.HapStatusError
+    this.hapServ = platform.api.hap.Service
     this.lang = platform.lang
+    this.log = platform.log
     this.platform = platform
 
     // Set up variables from the accessory
@@ -20,8 +19,7 @@ module.exports = class deviceLightRGB {
     this.accessory = accessory
 
     // Set up custom variables for this device type
-    const deviceId = this.accessory.context.eweDeviceId
-    const deviceConf = platform.lightDevices[deviceId]
+    const deviceConf = platform.lightDevices[accessory.context.eweDeviceId]
     this.alShift = deviceConf && deviceConf.adaptiveLightingShift
       ? deviceConf.adaptiveLightingShift
       : platform.consts.defaultValues.adaptiveLightingShift
@@ -54,7 +52,7 @@ module.exports = class deviceLightRGB {
     })
 
     // Output the customised options to the log if in debug mode
-    if (this.debug) {
+    if (platform.config.debug) {
       const opts = JSON.stringify({ disableDeviceLogging: this.disableDeviceLogging })
       this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
     }
@@ -85,7 +83,7 @@ module.exports = class deviceLightRGB {
       setTimeout(() => {
         this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
       }, 5000)
-      throw new this.platform.api.hap.HapStatusError(-70402)
+      throw new this.hapErr(-70402)
     }
   }
 
@@ -98,7 +96,7 @@ module.exports = class deviceLightRGB {
       setTimeout(() => {
         this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
       }, 5000)
-      throw new this.platform.api.hap.HapStatusError(-70402)
+      throw new this.hapErr(-70402)
     }
   }
 
@@ -148,7 +146,7 @@ module.exports = class deviceLightRGB {
       setTimeout(() => {
         this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
       }, 5000)
-      throw new this.platform.api.hap.HapStatusError(-70402)
+      throw new this.hapErr(-70402)
     }
   }
 
diff --git a/lib/device/motor.js b/lib/device/motor.js
index 8ff5801e..f68d073b 100644
--- a/lib/device/motor.js
+++ b/lib/device/motor.js
@@ -5,13 +5,12 @@
 module.exports = class deviceMotor {
   constructor (platform, accessory) {
     // Set up variables from the platform
-    this.consts = platform.consts
-    this.debug = platform.config.debug
     this.funcs = platform.funcs
-    this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
-    this.log = platform.log
+    this.hapErr = platform.api.hap.HapStatusError
+    this.hapServ = platform.api.hap.Service
     this.lang = platform.lang
+    this.log = platform.log
     this.platform = platform
 
     // Set up variables from the accessory
@@ -27,8 +26,7 @@ module.exports = class deviceMotor {
     */
 
     // Set up custom variables for this device type
-    const deviceId = this.accessory.context.eweDeviceId
-    const deviceConf = platform.multiDevices[deviceId]
+    const deviceConf = platform.multiDevices[accessory.context.eweDeviceId]
     this.disableDeviceLogging = deviceConf && deviceConf.overrideDisabledLogging
       ? false
       : platform.config.disableDeviceLogging
@@ -43,7 +41,7 @@ module.exports = class deviceMotor {
     })
 
     // Output the customised options to the log if in debug mode
-    if (this.debug) {
+    if (platform.config.debug) {
       const opts = JSON.stringify({ disableDeviceLogging: this.disableDeviceLogging })
       this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
     }
@@ -75,7 +73,7 @@ module.exports = class deviceMotor {
           this.cachePos
         )
       }, 5000)
-      throw new this.platform.api.hap.HapStatusError(-70402)
+      throw new this.hapErr(-70402)
     }
   }
 
diff --git a/lib/device/outlet-double.js b/lib/device/outlet-double.js
index f4986ab4..b81512d1 100644
--- a/lib/device/outlet-double.js
+++ b/lib/device/outlet-double.js
@@ -3,16 +3,17 @@
 'use strict'
 
 module.exports = class deviceOutletDouble {
-  constructor (platform, accessory) {
+  constructor (platform, accessory, devicesInHB) {
     // Set up variables from the platform
-    this.consts = platform.consts
-    this.debug = platform.config.debug
+    this.devicesInHB = devicesInHB
+    this.eveChar = platform.eveChar
     this.funcs = platform.funcs
-    this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
-    this.eveChar = platform.eveChar
-    this.log = platform.log
+    this.hapErr = platform.api.hap.HapStatusError
+    this.hapServ = platform.api.hap.Service
+    this.hapUUIDGen = platform.api.hap.uuid.generate
     this.lang = platform.lang
+    this.log = platform.log
     this.platform = platform
 
     // Set up variables from the accessory
@@ -20,8 +21,7 @@ module.exports = class deviceOutletDouble {
     this.accessory = accessory
 
     // Set up custom variables for this device type
-    const deviceId = this.accessory.context.eweDeviceId
-    const deviceConf = platform.multiDevices[deviceId]
+    const deviceConf = platform.multiDevices[accessory.context.eweDeviceId]
     this.hideChannels = deviceConf && deviceConf.hideChannels
       ? deviceConf.hideChannels
       : undefined
@@ -91,7 +91,7 @@ module.exports = class deviceOutletDouble {
     }
 
     // Output the customised options to the log if in debug mode
-    if (this.debug) {
+    if (platform.config.debug) {
       const opts = JSON.stringify({
         disableDeviceLogging: this.disableDeviceLogging,
         hideChannels: this.hideChannels,
@@ -123,9 +123,9 @@ module.exports = class deviceOutletDouble {
         case '0':
           for (let i = 0; i <= 2; i++) {
             const idToCheck = this.accessory.context.eweDeviceId + 'SW' + i
-            const uuid = this.platform.api.hap.uuid.generate(idToCheck)
-            if (this.platform.devicesInHB.has(uuid)) {
-              const subAccessory = this.platform.devicesInHB.get(uuid)
+            const uuid = this.hapUUIDGen(idToCheck)
+            if (this.devicesInHB.has(uuid)) {
+              const subAccessory = this.devicesInHB.get(uuid)
               const service = subAccessory.getService(this.hapServ.Outlet)
               service.updateCharacteristic(this.hapChar.On, value)
               if (i > 0) {
@@ -150,9 +150,9 @@ module.exports = class deviceOutletDouble {
         case '2':
           for (let i = 1; i <= 2; i++) {
             const idToCheck = this.accessory.context.eweDeviceId + 'SW' + i
-            const uuid = this.platform.api.hap.uuid.generate(idToCheck)
-            if (this.platform.devicesInHB.has(uuid)) {
-              const subAccessory = this.platform.devicesInHB.get(uuid)
+            const uuid = this.hapUUIDGen(idToCheck)
+            if (this.devicesInHB.has(uuid)) {
+              const subAccessory = this.devicesInHB.get(uuid)
               const service = subAccessory.getService(this.hapServ.Outlet)
               if (i === parseInt(switchNumber)) {
                 if (value) {
@@ -182,8 +182,8 @@ module.exports = class deviceOutletDouble {
           }
           if (!this.platform.hideMasters.includes(this.accessory.context.eweDeviceId)) {
             const idToCheck = this.accessory.context.eweDeviceId + 'SW0'
-            const uuid = this.platform.api.hap.uuid.generate(idToCheck)
-            const priAccessory = this.platform.devicesInHB.get(uuid)
+            const uuid = this.hapUUIDGen(idToCheck)
+            const priAccessory = this.devicesInHB.get(uuid)
             priAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
               this.hapChar.On,
               primaryState
@@ -196,7 +196,7 @@ module.exports = class deviceOutletDouble {
       setTimeout(() => {
         this.service.updateCharacteristic(this.hapChar.On, !value)
       }, 5000)
-      throw new this.platform.api.hap.HapStatusError(-70402)
+      throw new this.hapErr(-70402)
     }
   }
 
@@ -214,9 +214,9 @@ module.exports = class deviceOutletDouble {
       const idToCheck = this.accessory.context.eweDeviceId + 'SW'
       let primaryState = false
       for (let i = 1; i <= 2; i++) {
-        const uuid = this.platform.api.hap.uuid.generate(idToCheck + i)
-        if (this.platform.devicesInHB.has(uuid)) {
-          const subAccessory = this.platform.devicesInHB.get(uuid)
+        const uuid = this.hapUUIDGen(idToCheck + i)
+        if (this.devicesInHB.has(uuid)) {
+          const subAccessory = this.devicesInHB.get(uuid)
           const service = subAccessory.getService(this.hapServ.Outlet)
           if (params.switches) {
             if (params.switches[i - 1].switch === 'on') {
diff --git a/lib/device/outlet-multi.js b/lib/device/outlet-multi.js
index 5b8d120f..cdd3e325 100644
--- a/lib/device/outlet-multi.js
+++ b/lib/device/outlet-multi.js
@@ -3,15 +3,16 @@
 'use strict'
 
 module.exports = class deviceOutletMulti {
-  constructor (platform, accessory) {
+  constructor (platform, accessory, devicesInHB) {
     // Set up variables from the platform
-    this.consts = platform.consts
-    this.debug = platform.config.debug
+    this.devicesInHB = devicesInHB
     this.funcs = platform.funcs
-    this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
-    this.log = platform.log
+    this.hapErr = platform.api.hap.HapStatusError
+    this.hapServ = platform.api.hap.Service
+    this.hapUUIDGen = platform.api.hap.uuid.generate
     this.lang = platform.lang
+    this.log = platform.log
     this.platform = platform
 
     // Set up variables from the accessory
@@ -19,8 +20,7 @@ module.exports = class deviceOutletMulti {
     this.accessory = accessory
 
     // Set up custom variables for this device type
-    const deviceId = this.accessory.context.eweDeviceId
-    const deviceConf = platform.multiDevices[deviceId]
+    const deviceConf = platform.multiDevices[accessory.context.eweDeviceId]
     this.hideChannels = deviceConf && deviceConf.hideChannels
       ? deviceConf.hideChannels
       : undefined
@@ -50,7 +50,7 @@ module.exports = class deviceOutletMulti {
     }
 
     // Output the customised options to the log if in debug mode
-    if (this.debug) {
+    if (platform.config.debug) {
       const opts = JSON.stringify({
         disableDeviceLogging: this.disableDeviceLogging,
         hideChannels: this.hideChannels
@@ -85,9 +85,9 @@ module.exports = class deviceOutletMulti {
         case '0':
           for (let i = 0; i <= this.accessory.context.channelCount; i++) {
             const idToCheck = this.accessory.context.eweDeviceId + 'SW' + i
-            const uuid = this.platform.api.hap.uuid.generate(idToCheck)
-            if (this.platform.devicesInHB.has(uuid)) {
-              const subAccessory = this.platform.devicesInHB.get(uuid)
+            const uuid = this.hapUUIDGen(idToCheck)
+            if (this.devicesInHB.has(uuid)) {
+              const subAccessory = this.devicesInHB.get(uuid)
               subAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
                 this.hapChar.On,
                 value
@@ -109,9 +109,9 @@ module.exports = class deviceOutletMulti {
         case '4':
           for (let i = 1; i <= this.accessory.context.channelCount; i++) {
             const idToCheck = this.accessory.context.eweDeviceId + 'SW' + i
-            const uuid = this.platform.api.hap.uuid.generate(idToCheck)
-            if (this.platform.devicesInHB.has(uuid)) {
-              const subAccessory = this.platform.devicesInHB.get(uuid)
+            const uuid = this.hapUUIDGen(idToCheck)
+            if (this.devicesInHB.has(uuid)) {
+              const subAccessory = this.devicesInHB.get(uuid)
               if (i === parseInt(switchNumber)) {
                 if (value) {
                   primaryState = true
@@ -136,8 +136,8 @@ module.exports = class deviceOutletMulti {
           }
           if (!this.platform.hideMasters.includes(this.accessory.context.eweDeviceId)) {
             const idToCheck = this.accessory.context.eweDeviceId + 'SW0'
-            const uuid = this.platform.api.hap.uuid.generate(idToCheck)
-            const priAccessory = this.platform.devicesInHB.get(uuid)
+            const uuid = this.hapUUIDGen(idToCheck)
+            const priAccessory = this.devicesInHB.get(uuid)
             priAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
               this.hapChar.On,
               primaryState
@@ -150,7 +150,7 @@ module.exports = class deviceOutletMulti {
       setTimeout(() => {
         this.service.updateCharacteristic(this.hapChar.On, !value)
       }, 5000)
-      throw new this.platform.api.hap.HapStatusError(-70402)
+      throw new this.hapErr(-70402)
     }
   }
 
@@ -162,12 +162,12 @@ module.exports = class deviceOutletMulti {
       const idToCheck = this.accessory.context.eweDeviceId + 'SW'
       let primaryState = false
       for (let i = 1; i <= this.accessory.context.channelCount; i++) {
-        const uuid = this.platform.api.hap.uuid.generate(idToCheck + i)
-        if (this.platform.devicesInHB.has(uuid)) {
+        const uuid = this.hapUUIDGen(idToCheck + i)
+        if (this.devicesInHB.has(uuid)) {
           if (params.switches[i - 1].switch === 'on') {
             primaryState = true
           }
-          const subAccessory = this.platform.devicesInHB.get(uuid)
+          const subAccessory = this.devicesInHB.get(uuid)
           const service = subAccessory.getService(this.hapServ.Outlet)
           const currentState = service.getCharacteristic(this.hapChar.On).value
             ? 'on'
diff --git a/lib/device/outlet-scm.js b/lib/device/outlet-scm.js
index bdf92cec..33f92c31 100644
--- a/lib/device/outlet-scm.js
+++ b/lib/device/outlet-scm.js
@@ -5,13 +5,11 @@
 module.exports = class deviceOutletSCM {
   constructor (platform, accessory) {
     // Set up variables from the platform
-    this.consts = platform.consts
-    this.debug = platform.config.debug
-    this.funcs = platform.funcs
-    this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
-    this.log = platform.log
+    this.hapErr = platform.api.hap.HapStatusError
+    this.hapServ = platform.api.hap.Service
     this.lang = platform.lang
+    this.log = platform.log
     this.platform = platform
 
     // Set up variables from the accessory
@@ -19,8 +17,7 @@ module.exports = class deviceOutletSCM {
     this.accessory = accessory
 
     // Set up custom variables for this device type
-    const deviceId = this.accessory.context.eweDeviceId
-    const deviceConf = platform.outletDevices[deviceId]
+    const deviceConf = platform.outletDevices[accessory.context.eweDeviceId]
     this.showAsSwitch = deviceConf && deviceConf.showAsSwitch
     this.disableDeviceLogging = deviceConf && deviceConf.overrideDisabledLogging
       ? false
@@ -53,7 +50,7 @@ module.exports = class deviceOutletSCM {
     })
 
     // Output the customised options to the log if in debug mode
-    if (this.debug) {
+    if (platform.config.debug) {
       const opts = JSON.stringify({
         disableDeviceLogging: this.disableDeviceLogging,
         showAsSwitch: this.showAsSwitch
@@ -78,7 +75,7 @@ module.exports = class deviceOutletSCM {
       setTimeout(() => {
         this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
       }, 5000)
-      throw new this.platform.api.hap.HapStatusError(-70402)
+      throw new this.hapErr(-70402)
     }
   }
 
diff --git a/lib/device/outlet-single.js b/lib/device/outlet-single.js
index 91a27dca..97ce858e 100644
--- a/lib/device/outlet-single.js
+++ b/lib/device/outlet-single.js
@@ -5,24 +5,22 @@
 module.exports = class deviceOutletSingle {
   constructor (platform, accessory) {
     // Set up variables from the platform
-    this.consts = platform.consts
-    this.debug = platform.config.debug
+    this.eveChar = platform.eveChar
     this.funcs = platform.funcs
-    this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
-    this.eveChar = platform.eveChar
-    this.log = platform.log
+    this.hapErr = platform.api.hap.HapStatusError
+    this.hapServ = platform.api.hap.Service
     this.lang = platform.lang
+    this.log = platform.log
     this.platform = platform
 
     // Set up variables from the accessory
     this.name = accessory.displayName
     this.accessory = accessory
-    this.hasReadings = this.consts.devices.outlet.includes(accessory.context.eweUIID)
+    this.hasReadings = platform.consts.devices.outlet.includes(accessory.context.eweUIID)
 
     // Set up custom variables for this device type
-    const deviceId = this.accessory.context.eweDeviceId
-    const deviceConf = platform.outletDevices[deviceId]
+    const deviceConf = platform.outletDevices[accessory.context.eweDeviceId]
     this.inUsePowerThreshold = deviceConf && deviceConf.inUsePowerThreshold
       ? deviceConf.inUsePowerThreshold
       : platform.consts.defaultValues.inUsePowerThreshold
@@ -144,7 +142,7 @@ module.exports = class deviceOutletSingle {
     }
 
     // Output the customised options to the log if in debug mode
-    if (this.debug) {
+    if (platform.config.debug) {
       const opts = JSON.stringify({
         disableDeviceLogging: this.disableDeviceLogging,
         inUsePowerThreshold: this.inUsePowerThreshold
@@ -174,7 +172,7 @@ module.exports = class deviceOutletSingle {
       setTimeout(() => {
         this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
       }, 5000)
-      throw new this.platform.api.hap.HapStatusError(-70402)
+      throw new this.hapErr(-70402)
     }
   }
 
diff --git a/lib/device/rf-bridge.js b/lib/device/rf-bridge.js
index 27196ab1..b155fc05 100644
--- a/lib/device/rf-bridge.js
+++ b/lib/device/rf-bridge.js
@@ -3,16 +3,16 @@
 'use strict'
 
 module.exports = class deviceRFBridge {
-  constructor (platform, accessory) {
+  constructor (platform, accessory, devicesInHB) {
     // Set up variables from the platform
-    this.consts = platform.consts
-    this.debug = platform.config.debug
+    this.devicesInHB = devicesInHB
+    this.eveChar = platform.eveChar
     this.funcs = platform.funcs
-    this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
-    this.eveChar = platform.eveChar
-    this.log = platform.log
+    this.hapErr = platform.api.hap.HapStatusError
+    this.hapServ = platform.api.hap.Service
     this.lang = platform.lang
+    this.log = platform.log
     this.platform = platform
 
     // Set up variables from the accessory
@@ -131,7 +131,7 @@ module.exports = class deviceRFBridge {
       setTimeout(() => {
         this.accessory.getService(service).updateCharacteristic(this.hapChar.On, false)
       }, 5000)
-      throw new this.platform.api.hap.HapStatusError(-70402)
+      throw new this.hapErr(-70402)
     }
   }
 
@@ -148,7 +148,7 @@ module.exports = class deviceRFBridge {
         params.cmd === 'transmit' &&
         this.funcs.hasProperty(params, 'rfChl')
       ) {
-        this.platform.devicesInHB.forEach(acc => {
+        this.devicesInHB.forEach(acc => {
           if (
             acc.context.eweDeviceId === this.accessory.context.eweDeviceId &&
             this.funcs.hasProperty(acc.context, 'buttons') &&
@@ -181,7 +181,7 @@ module.exports = class deviceRFBridge {
         Object.keys(params)
           .filter(name => /rfTrig/.test(name))
           .forEach(async chan => {
-            this.platform.devicesInHB.forEach(acc => {
+            this.devicesInHB.forEach(acc => {
               if (
                 acc.context.eweDeviceId === this.accessory.context.eweDeviceId &&
                 this.funcs.hasProperty(acc.context, 'buttons') &&
diff --git a/lib/device/sensor-ambient.js b/lib/device/sensor-ambient.js
index 0c34b28e..17ea0ec4 100644
--- a/lib/device/sensor-ambient.js
+++ b/lib/device/sensor-ambient.js
@@ -5,13 +5,12 @@
 module.exports = class deviceSensorAmbient {
   constructor (platform, accessory) {
     // Set up variables from the platform
-    this.consts = platform.consts
-    this.debug = platform.config.debug
     this.funcs = platform.funcs
-    this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
-    this.log = platform.log
+    this.hapServ = platform.api.hap.Service
+    this.hapErr = platform.api.hap.HapStatusError
     this.lang = platform.lang
+    this.log = platform.log
     this.platform = platform
 
     // Set up variables from the accessory
@@ -19,8 +18,7 @@ module.exports = class deviceSensorAmbient {
     this.accessory = accessory
 
     // Set up custom variables for this device type
-    const deviceId = this.accessory.context.eweDeviceId
-    const deviceConf = platform.thDevices[deviceId]
+    const deviceConf = platform.thDevices[accessory.context.eweDeviceId]
     this.hideSwitch = deviceConf && deviceConf.hideSwitch
     this.tempOffset = deviceConf && deviceConf.offset
       ? deviceConf.offset
@@ -84,7 +82,7 @@ module.exports = class deviceSensorAmbient {
     })
 
     // Output the customised options to the log if in debug mode
-    if (this.debug) {
+    if (platform.config.debug) {
       const opts = JSON.stringify({
         disableDeviceLogging: this.disableDeviceLogging,
         hideSwitch: this.hideSwitch,
@@ -110,7 +108,7 @@ module.exports = class deviceSensorAmbient {
       setTimeout(() => {
         this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
       }, 5000)
-      throw new this.platform.api.hap.HapStatusError(-70402)
+      throw new this.hapErr(-70402)
     }
   }
 
diff --git a/lib/device/sensor-contact.js b/lib/device/sensor-contact.js
index 7550c244..72b7eb74 100644
--- a/lib/device/sensor-contact.js
+++ b/lib/device/sensor-contact.js
@@ -3,16 +3,16 @@
 'use strict'
 
 module.exports = class deviceSensorContact {
-  constructor (platform, accessory) {
+  constructor (platform, accessory, devicesInHB) {
     // Set up variables from the platform
-    this.consts = platform.consts
-    this.debug = platform.config.debug
+    this.devicesInHB = devicesInHB
+    this.eveChar = platform.eveChar
     this.funcs = platform.funcs
-    this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
-    this.eveChar = platform.eveChar
-    this.log = platform.log
+    this.hapServ = platform.api.hap.Service
+    this.hapUUIDGen = platform.api.hap.uuid.generate
     this.lang = platform.lang
+    this.log = platform.log
     this.platform = platform
 
     // Set up variables from the accessory
@@ -20,8 +20,7 @@ module.exports = class deviceSensorContact {
     this.accessory = accessory
 
     // Set up custom variables for this device type
-    const deviceId = this.accessory.context.eweDeviceId
-    const deviceConf = platform.sensorDevices[deviceId]
+    const deviceConf = platform.sensorDevices[accessory.context.eweDeviceId]
     this.lowBattThreshold = deviceConf && deviceConf.lowBattThreshold
       ? Math.min(deviceConf.lowBattThreshold, 100)
       : platform.consts.defaultValues.lowBattThreshold
@@ -63,7 +62,7 @@ module.exports = class deviceSensorContact {
     })
 
     // Output the customised options to the log if in debug mode
-    if (this.debug) {
+    if (platform.config.debug) {
       const opts = JSON.stringify({
         disableDeviceLogging: this.disableDeviceLogging,
         lowBattThreshold: this.lowBattThreshold
@@ -123,9 +122,9 @@ module.exports = class deviceSensorContact {
           group.sensorId === this.accessory.context.eweDeviceId &&
           group.type === 'garage'
         ) {
-          const uuid = this.platform.api.hap.uuid.generate(deviceId + 'SWX')
-          let subAccessory
-          if ((subAccessory = this.platform.devicesInHB.get(uuid))) {
+          const uuid = this.hapUUIDGen(deviceId + 'SWX')
+          if (this.devicesInHB.has(uuid)) {
+            const subAccessory = this.devicesInHB.get(uuid)
             const gdService = subAccessory.getService(this.hapServ.GarageDoorOpener)
             const name = subAccessory.displayName
             switch (newState) {
diff --git a/lib/device/sensor-temp-humi.js b/lib/device/sensor-temp-humi.js
index 40c68b73..e59d2c4b 100644
--- a/lib/device/sensor-temp-humi.js
+++ b/lib/device/sensor-temp-humi.js
@@ -5,13 +5,11 @@
 module.exports = class deviceSensorTempHumi {
   constructor (platform, accessory) {
     // Set up variables from the platform
-    this.consts = platform.consts
-    this.debug = platform.config.debug
     this.funcs = platform.funcs
-    this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
-    this.log = platform.log
+    this.hapServ = platform.api.hap.Service
     this.lang = platform.lang
+    this.log = platform.log
     this.platform = platform
 
     // Set up variables from the accessory
@@ -19,8 +17,7 @@ module.exports = class deviceSensorTempHumi {
     this.accessory = accessory
 
     // Set up custom variables for this device type
-    const deviceId = this.accessory.context.eweDeviceId
-    const deviceConf = platform.thDevices[deviceId]
+    const deviceConf = platform.thDevices[accessory.context.eweDeviceId]
     this.tempOffset = deviceConf && deviceConf.offset
       ? deviceConf.offset
       : platform.consts.defaultValues.offset
@@ -47,7 +44,7 @@ module.exports = class deviceSensorTempHumi {
     })
 
     // Output the customised options to the log if in debug mode
-    if (this.debug) {
+    if (platform.config.debug) {
       const opts = JSON.stringify({
         disableDeviceLogging: this.disableDeviceLogging,
         offset: this.tempOffset
diff --git a/lib/device/simulation/blind.js b/lib/device/simulation/blind.js
index 45b808a0..6561b62e 100644
--- a/lib/device/simulation/blind.js
+++ b/lib/device/simulation/blind.js
@@ -5,13 +5,12 @@
 module.exports = class deviceBlind {
   constructor (platform, accessory) {
     // Set up variables from the platform
-    this.consts = platform.consts
-    this.debug = platform.config.debug
     this.funcs = platform.funcs
-    this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
-    this.log = platform.log
+    this.hapErr = platform.api.hap.HapStatusError
+    this.hapServ = platform.api.hap.Service
     this.lang = platform.lang
+    this.log = platform.log
     this.platform = platform
 
     // Set up variables from the accessory
@@ -19,10 +18,9 @@ module.exports = class deviceBlind {
     this.accessory = accessory
 
     // Set up custom variables for this device type
-    const deviceId = this.accessory.context.eweDeviceId
-    const deviceConf = platform.simulations[deviceId]
+    const deviceConf = platform.simulations[accessory.context.eweDeviceId]
     this.operationTimeUp = deviceConf.operationTime ||
-      this.consts.defaultValues.operationTime
+      platform.consts.defaultValues.operationTime
     this.operationTimeDown = deviceConf.operationTimeDown || this.operationTimeUp
     this.disableDeviceLogging = deviceConf && deviceConf.overrideDisabledLogging
       ? false
@@ -50,7 +48,7 @@ module.exports = class deviceBlind {
     })
 
     // Output the customised options to the log if in debug mode
-    if (this.debug) {
+    if (platform.config.debug) {
       const opts = JSON.stringify({
         disableDeviceLogging: this.disableDeviceLogging,
         operationTimeDown: this.operationTimeDown,
@@ -136,7 +134,7 @@ module.exports = class deviceBlind {
       }, 5000)
       this.service.updateCharacteristic(
         this.hapChar.TargetPosition,
-        new this.platform.api.hap.HapStatusError(-70402)
+        new this.hapErr(-70402)
       )
     }
   }
diff --git a/lib/device/simulation/door.js b/lib/device/simulation/door.js
index 7e5e3810..ba168627 100644
--- a/lib/device/simulation/door.js
+++ b/lib/device/simulation/door.js
@@ -5,13 +5,12 @@
 module.exports = class deviceDoor {
   constructor (platform, accessory) {
     // Set up variables from the platform
-    this.consts = platform.consts
-    this.debug = platform.config.debug
     this.funcs = platform.funcs
-    this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
-    this.log = platform.log
+    this.hapErr = platform.api.hap.HapStatusError
+    this.hapServ = platform.api.hap.Service
     this.lang = platform.lang
+    this.log = platform.log
     this.platform = platform
 
     // Set up variables from the accessory
@@ -19,10 +18,9 @@ module.exports = class deviceDoor {
     this.accessory = accessory
 
     // Set up custom variables for this device type
-    const deviceId = this.accessory.context.eweDeviceId
-    const deviceConf = platform.simulations[deviceId]
+    const deviceConf = platform.simulations[accessory.context.eweDeviceId]
     this.operationTimeUp = deviceConf.operationTime ||
-      this.consts.defaultValues.operationTime
+      platform.consts.defaultValues.operationTime
     this.operationTimeDown = deviceConf.operationTimeDown || this.operationTimeUp
     this.disableDeviceLogging = deviceConf && deviceConf.overrideDisabledLogging
       ? false
@@ -50,7 +48,7 @@ module.exports = class deviceDoor {
     })
 
     // Output the customised options to the log if in debug mode
-    if (this.debug) {
+    if (platform.config.debug) {
       const opts = JSON.stringify({
         disableDeviceLogging: this.disableDeviceLogging,
         operationTimeDown: this.operationTimeDown,
@@ -136,7 +134,7 @@ module.exports = class deviceDoor {
       }, 5000)
       this.service.updateCharacteristic(
         this.hapChar.TargetPosition,
-        new this.platform.api.hap.HapStatusError(-70402)
+        new this.hapErr(-70402)
       )
     }
   }
diff --git a/lib/device/simulation/garage-eachen.js b/lib/device/simulation/garage-eachen.js
index 6656f49a..888c3246 100644
--- a/lib/device/simulation/garage-eachen.js
+++ b/lib/device/simulation/garage-eachen.js
@@ -5,14 +5,13 @@
 module.exports = class deviceGarageEachen {
   constructor (platform, accessory) {
     // Set up variables from the platform
-    this.consts = platform.consts
-    this.debug = platform.config.debug
+    this.eveChar = platform.eveChar
     this.funcs = platform.funcs
-    this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
-    this.eveChar = platform.eveChar
-    this.log = platform.log
+    this.hapErr = platform.api.hap.HapStatusError
+    this.hapServ = platform.api.hap.Service
     this.lang = platform.lang
+    this.log = platform.log
     this.platform = platform
 
     // Set up variables from the accessory
@@ -20,10 +19,9 @@ module.exports = class deviceGarageEachen {
     this.accessory = accessory
 
     // Set up custom variables for this device type
-    const deviceId = this.accessory.context.eweDeviceId
-    const deviceConf = platform.simulations[deviceId]
+    const deviceConf = platform.simulations[accessory.context.eweDeviceId]
     this.operationTime = deviceConf.operationTime ||
-      this.consts.defaultValues.operationTime
+      platform.consts.defaultValues.operationTime
     this.disableDeviceLogging = deviceConf.overrideDisabledLogging
       ? false
       : platform.config.disableDeviceLogging
@@ -78,7 +76,7 @@ module.exports = class deviceGarageEachen {
     })
 
     // Output the customised options to the log if in debug mode
-    if (this.debug) {
+    if (platform.config.debug) {
       const opts = JSON.stringify({
         disableDeviceLogging: this.disableDeviceLogging,
         operationTime: this.operationTime,
@@ -128,7 +126,7 @@ module.exports = class deviceGarageEachen {
       }, 5000)
       this.service.updateCharacteristic(
         this.hapChar.TargetPosition,
-        new this.platform.api.hap.HapStatusError(-70402)
+        new this.hapErr(-70402)
       )
     }
   }
diff --git a/lib/device/simulation/garage-four.js b/lib/device/simulation/garage-four.js
index f7eccb36..87a77fbd 100644
--- a/lib/device/simulation/garage-four.js
+++ b/lib/device/simulation/garage-four.js
@@ -5,13 +5,12 @@
 module.exports = class deviceGarageFour {
   constructor (platform, accessory) {
     // Set up variables from the platform
-    this.consts = platform.consts
-    this.debug = platform.config.debug
     this.funcs = platform.funcs
-    this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
-    this.log = platform.log
+    this.hapErr = platform.api.hap.HapStatusError
+    this.hapServ = platform.api.hap.Service
     this.lang = platform.lang
+    this.log = platform.log
     this.platform = platform
 
     // Set up variables from the accessory
@@ -19,10 +18,9 @@ module.exports = class deviceGarageFour {
     this.accessory = accessory
 
     // Set up custom variables for this device type
-    const deviceId = this.accessory.context.eweDeviceId
-    const deviceConf = platform.simulations[deviceId]
+    const deviceConf = platform.simulations[accessory.context.eweDeviceId]
     this.operationTimeUp = deviceConf.operationTime ||
-      this.consts.defaultValues.operationTime
+      platform.consts.defaultValues.operationTime
     this.operationTimeDown = deviceConf.operationTimeDown || this.operationTimeUp
     this.disableDeviceLogging = deviceConf.overrideDisabledLogging
       ? false
@@ -61,7 +59,7 @@ module.exports = class deviceGarageFour {
     })
 
     // Output the customised options to the log if in debug mode
-    if (this.debug) {
+    if (platform.config.debug) {
       const opts = JSON.stringify({
         disableDeviceLogging: this.disableDeviceLogging,
         operationTimeDown: this.operationTimeDown,
@@ -139,7 +137,7 @@ module.exports = class deviceGarageFour {
       }, 5000)
       gdService.updateCharacteristic(
         this.hapChar.TargetPosition,
-        new this.platform.api.hap.HapStatusError(-70402)
+        new this.hapErr(-70402)
       )
     }
   }
diff --git a/lib/device/simulation/garage-od-switch.js b/lib/device/simulation/garage-od-switch.js
index 1db2688b..f9c33e4b 100644
--- a/lib/device/simulation/garage-od-switch.js
+++ b/lib/device/simulation/garage-od-switch.js
@@ -5,13 +5,11 @@
 module.exports = class deviceGarageODSwitch {
   constructor (platform, accessory) {
     // Set up variables from the platform
-    this.consts = platform.consts
-    this.debug = platform.config.debug
-    this.funcs = platform.funcs
-    this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
-    this.log = platform.log
+    this.hapServ = platform.api.hap.Service
+    this.hapUUIDGen = platform.api.hap.uuid.generate
     this.lang = platform.lang
+    this.log = platform.log
     this.platform = platform
 
     // Set up variables from the accessory
@@ -19,8 +17,8 @@ module.exports = class deviceGarageODSwitch {
     this.accessory = accessory
 
     // Set up custom variables for this device type
-    this.garageId = platform.obstructSwitches[this.accessory.context.eweDeviceId]
-    const uuid = this.platform.api.hap.uuid.generate(this.garageId + 'SWX')
+    this.garageId = platform.obstructSwitches[accessory.context.eweDeviceId]
+    const uuid = this.hapUUIDGen(this.garageId + 'SWX')
     this.garage = platform.devicesInHB.get(uuid)
     this.disableDeviceLogging = platform.simulations[this.garageId] &&
       platform.simulations[this.garageId].overrideDisabledLogging
@@ -41,7 +39,7 @@ module.exports = class deviceGarageODSwitch {
     )
 
     // Output the customised options to the log if in debug mode
-    if (this.debug) {
+    if (platform.config.debug) {
       const opts = JSON.stringify({ disableDeviceLogging: this.disableDeviceLogging })
       this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
     }
diff --git a/lib/device/simulation/garage-one.js b/lib/device/simulation/garage-one.js
index 61e7f9da..afff559e 100644
--- a/lib/device/simulation/garage-one.js
+++ b/lib/device/simulation/garage-one.js
@@ -5,14 +5,14 @@
 module.exports = class deviceGarageOne {
   constructor (platform, accessory) {
     // Set up variables from the platform
-    this.consts = platform.consts
-    this.debug = platform.config.debug
+    this.eveChar = platform.eveChar
     this.funcs = platform.funcs
-    this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
-    this.eveChar = platform.eveChar
-    this.log = platform.log
+    this.hapErr = platform.api.hap.HapStatusError
+    this.hapServ = platform.api.hap.Service
+    this.hapUUIDGen = platform.api.hap.uuid.generate
     this.lang = platform.lang
+    this.log = platform.log
     this.platform = platform
 
     // Set up variables from the accessory
@@ -20,11 +20,10 @@ module.exports = class deviceGarageOne {
     this.accessory = accessory
 
     // Set up custom variables for this device type
-    const deviceId = this.accessory.context.eweDeviceId
-    const deviceConf = platform.simulations[deviceId]
+    const deviceConf = platform.simulations[accessory.context.eweDeviceId]
     this.setup = deviceConf.setup
     this.operationTimeUp = deviceConf.operationTime ||
-      this.consts.defaultValues.operationTime
+      platform.consts.defaultValues.operationTime
     this.operationTimeDown = deviceConf.operationTimeDown || this.operationTimeUp
     this.disableDeviceLogging = deviceConf.overrideDisabledLogging
       ? false
@@ -37,20 +36,22 @@ module.exports = class deviceGarageOne {
     }
 
     // Check for a valid setup
-    if (!this.consts.allowed.setups.includes(this.setup)) {
+    if (!platform.consts.allowed.setups.includes(this.setup)) {
       this.error = this.lang.simErrSetup
     }
 
     // Check the sensor is valid if defined by the user
     if (deviceConf.sensorId) {
       // Check the sensor exists in Homebridge
-      const uuid = this.platform.api.hap.uuid.generate(deviceConf.sensorId + 'SWX')
+      const uuid = this.hapUUIDGen(deviceConf.sensorId + 'SWX')
       if (!platform.devicesInHB.has(uuid)) {
         this.error = this.lang.simErrNoSensor
       }
 
       // Check the sensor is a sensor
-      if (platform.devicesInHB.get(uuid).context.eweUIID !== 102) {
+      if (!platform.consts.devices.garageSensors.includes(
+        platform.devicesInHB.get(uuid).context.eweUIID
+      )) {
         this.error = this.lang.simErrNotSensor
       }
       this.definedSensor = this.platform.devicesInHB.get(uuid)
@@ -108,7 +109,7 @@ module.exports = class deviceGarageOne {
     })
 
     // Output the customised options to the log if in debug mode
-    if (this.debug) {
+    if (platform.config.debug) {
       const opts = JSON.stringify({
         disableDeviceLogging: this.disableDeviceLogging,
         operationTimeDown: this.operationTimeDown,
@@ -152,7 +153,7 @@ module.exports = class deviceGarageOne {
       }
       await this.funcs.sleep(delay)
       this.service.updateCharacteristic(this.hapChar.TargetDoorState, newPos)
-        .updateCharacteristic(this.hapChar.CurrentDoorState, newPos + 2)
+      this.service.updateCharacteristic(this.hapChar.CurrentDoorState, newPos + 2)
       this.accessory.context.cacheTargetDoorState = newPos
       this.accessory.context.cacheCurrentDoorState = newPos + 2
       switch (this.setup) {
@@ -200,7 +201,7 @@ module.exports = class deviceGarageOne {
       }, 5000)
       this.service.updateCharacteristic(
         this.hapChar.TargetPosition,
-        new this.platform.api.hap.HapStatusError(-70402)
+        new this.hapErr(-70402)
       )
     }
   }
@@ -232,7 +233,7 @@ module.exports = class deviceGarageOne {
       }
       this.inUse = true
       this.service.updateCharacteristic(this.hapChar.TargetDoorState, newPos - 2)
-        .updateCharacteristic(this.hapChar.CurrentDoorState, newPos)
+      this.service.updateCharacteristic(this.hapChar.CurrentDoorState, newPos)
       this.accessory.context.cacheCurrentDoorState = newPos
       this.accessory.context.cacheTargetDoorState = newPos - 2
       await this.funcs.sleep(2000)
diff --git a/lib/device/simulation/garage-two.js b/lib/device/simulation/garage-two.js
index e74c20ec..d0cc187a 100644
--- a/lib/device/simulation/garage-two.js
+++ b/lib/device/simulation/garage-two.js
@@ -5,13 +5,12 @@
 module.exports = class deviceGarageTwo {
   constructor (platform, accessory) {
     // Set up variables from the platform
-    this.consts = platform.consts
-    this.debug = platform.config.debug
     this.funcs = platform.funcs
-    this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
-    this.log = platform.log
+    this.hapErr = platform.api.hap.HapStatusError
+    this.hapServ = platform.api.hap.Service
     this.lang = platform.lang
+    this.log = platform.log
     this.platform = platform
 
     // Set up variables from the accessory
@@ -19,10 +18,9 @@ module.exports = class deviceGarageTwo {
     this.accessory = accessory
 
     // Set up custom variables for this device type
-    const deviceId = this.accessory.context.eweDeviceId
-    const deviceConf = platform.simulations[deviceId]
+    const deviceConf = platform.simulations[accessory.context.eweDeviceId]
     this.operationTimeUp = deviceConf.operationTime ||
-      this.consts.defaultValues.operationTime
+      platform.consts.defaultValues.operationTime
     this.operationTimeDown = deviceConf.operationTimeDown || this.operationTimeUp
     this.disableDeviceLogging = deviceConf.overrideDisabledLogging
       ? false
@@ -59,7 +57,7 @@ module.exports = class deviceGarageTwo {
     })
 
     // Output the customised options to the log if in debug mode
-    if (this.debug) {
+    if (platform.config.debug) {
       const opts = JSON.stringify({
         disableDeviceLogging: this.disableDeviceLogging,
         operationTimeDown: this.operationTimeDown,
@@ -148,7 +146,7 @@ module.exports = class deviceGarageTwo {
       }, 5000)
       gdService.updateCharacteristic(
         this.hapChar.TargetPosition,
-        new this.platform.api.hap.HapStatusError(-70402)
+        new this.hapErr(-70402)
       )
     }
   }
diff --git a/lib/device/simulation/lock-one.js b/lib/device/simulation/lock-one.js
index 7af5aa5d..0153c99a 100644
--- a/lib/device/simulation/lock-one.js
+++ b/lib/device/simulation/lock-one.js
@@ -5,13 +5,12 @@
 module.exports = class deviceLockOne {
   constructor (platform, accessory) {
     // Set up variables from the platform
-    this.consts = platform.consts
-    this.debug = platform.config.debug
     this.funcs = platform.funcs
-    this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
-    this.log = platform.log
+    this.hapErr = platform.api.hap.HapStatusError
+    this.hapServ = platform.api.hap.Service
     this.lang = platform.lang
+    this.log = platform.log
     this.platform = platform
 
     // Set up variables from the accessory
@@ -19,17 +18,16 @@ module.exports = class deviceLockOne {
     this.accessory = accessory
 
     // Set up custom variables for this device type
-    const deviceId = this.accessory.context.eweDeviceId
-    const deviceConf = platform.simulations[deviceId]
+    const deviceConf = platform.simulations[accessory.context.eweDeviceId]
     this.operationTime = deviceConf.operationTime ||
-      this.consts.defaultValues.operationTime
+      platform.consts.defaultValues.operationTime
     this.setup = deviceConf.setup
     this.disableDeviceLogging = deviceConf.overrideDisabledLogging
       ? false
       : platform.config.disableDeviceLogging
 
     // Check for a valid setup
-    if (!this.consts.allowed.setups.includes(this.setup)) {
+    if (!platform.consts.allowed.setups.includes(this.setup)) {
       this.error = this.lang.simErrSetup
     }
 
@@ -53,7 +51,7 @@ module.exports = class deviceLockOne {
       .updateCharacteristic(this.hapChar.LockTargetState, 1)
 
     // Output the customised options to the log if in debug mode
-    if (this.debug) {
+    if (platform.config.debug) {
       const opts = JSON.stringify({
         disableDeviceLogging: this.disableDeviceLogging,
         operationTime: this.operationTime,
@@ -102,7 +100,7 @@ module.exports = class deviceLockOne {
       }, 5000)
       this.service.updateCharacteristic(
         this.hapChar.LockTargetState,
-        new this.platform.api.hap.HapStatusError(-70402)
+        new this.hapErr(-70402)
       )
     }
   }
diff --git a/lib/device/simulation/sensor-leak.js b/lib/device/simulation/sensor-leak.js
index 26486c1e..7e38b22d 100644
--- a/lib/device/simulation/sensor-leak.js
+++ b/lib/device/simulation/sensor-leak.js
@@ -5,14 +5,12 @@
 module.exports = class deviceSensorLeak {
   constructor (platform, accessory) {
     // Set up variables from the platform
-    this.consts = platform.consts
-    this.debug = platform.config.debug
+    this.eveChar = platform.eveChar
     this.funcs = platform.funcs
-    this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
-    this.eveChar = platform.eveChar
-    this.log = platform.log
+    this.hapServ = platform.api.hap.Service
     this.lang = platform.lang
+    this.log = platform.log
     this.platform = platform
 
     // Set up variables from the accessory
@@ -20,9 +18,8 @@ module.exports = class deviceSensorLeak {
     this.accessory = accessory
 
     // Set up custom variables for this device type
-    const deviceId = this.accessory.context.eweDeviceId
-    const deviceConf = platform.sensorDevices[deviceId]
-    const deviceConf2 = platform.simulations[deviceId]
+    const deviceConf = platform.sensorDevices[accessory.context.eweDeviceId]
+    const deviceConf2 = platform.simulations[accessory.context.eweDeviceId]
     this.lowBattThreshold = deviceConf && deviceConf.lowBattThreshold
       ? Math.min(deviceConf.lowBattThreshold, 100)
       : platform.consts.defaultValues.lowBattThreshold
@@ -52,7 +49,7 @@ module.exports = class deviceSensorLeak {
     })
 
     // Output the customised options to the log if in debug mode
-    if (this.debug) {
+    if (platform.config.debug) {
       const opts = JSON.stringify({
         disableDeviceLogging: this.disableDeviceLogging,
         lowBattThreshold: this.lowBattThreshold,
diff --git a/lib/device/simulation/switch-valve.js b/lib/device/simulation/switch-valve.js
index a146d77e..1286b4dc 100644
--- a/lib/device/simulation/switch-valve.js
+++ b/lib/device/simulation/switch-valve.js
@@ -5,13 +5,11 @@
 module.exports = class deviceSwitchValve {
   constructor (platform, accessory) {
     // Set up variables from the platform
-    this.consts = platform.consts
-    this.debug = platform.config.debug
-    this.funcs = platform.funcs
-    this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
-    this.log = platform.log
+    this.hapErr = platform.api.hap.HapStatusError
+    this.hapServ = platform.api.hap.Service
     this.lang = platform.lang
+    this.log = platform.log
     this.platform = platform
 
     // Set up variables from the accessory
@@ -19,8 +17,7 @@ module.exports = class deviceSwitchValve {
     this.accessory = accessory
 
     // Set up custom variables for this device type
-    const deviceId = this.accessory.context.eweDeviceId
-    const deviceConf = platform.simulations[deviceId]
+    const deviceConf = platform.simulations[accessory.context.eweDeviceId]
     this.disableDeviceLogging = deviceConf.overrideDisabledLogging
       ? false
       : platform.config.disableDeviceLogging
@@ -73,7 +70,7 @@ module.exports = class deviceSwitchValve {
     })
 
     // Output the customised options to the log if in debug mode
-    if (this.debug) {
+    if (platform.config.debug) {
       const opts = JSON.stringify({
         disableDeviceLogging: this.disableDeviceLogging,
         type: deviceConf.type
@@ -101,7 +98,7 @@ module.exports = class deviceSwitchValve {
       setTimeout(() => {
         this.sService.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
       }, 5000)
-      throw new this.platform.api.hap.HapStatusError(-70402)
+      throw new this.hapErr(-70402)
     }
   }
 
@@ -140,7 +137,7 @@ module.exports = class deviceSwitchValve {
       setTimeout(() => {
         this.sService.updateCharacteristic(this.hapChar.Active, 0)
       }, 5000)
-      throw new this.platform.api.hap.HapStatusError(-70402)
+      throw new this.hapErr(-70402)
     }
   }
 
diff --git a/lib/device/simulation/tap-one.js b/lib/device/simulation/tap-one.js
index a0d33834..b5e467c9 100644
--- a/lib/device/simulation/tap-one.js
+++ b/lib/device/simulation/tap-one.js
@@ -5,13 +5,11 @@
 module.exports = class deviceTapOne {
   constructor (platform, accessory) {
     // Set up variables from the platform
-    this.consts = platform.consts
-    this.debug = platform.config.debug
-    this.funcs = platform.funcs
-    this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
-    this.log = platform.log
+    this.hapErr = platform.api.hap.HapStatusError
+    this.hapServ = platform.api.hap.Service
     this.lang = platform.lang
+    this.log = platform.log
     this.platform = platform
 
     // Set up variables from the accessory
@@ -19,15 +17,14 @@ module.exports = class deviceTapOne {
     this.accessory = accessory
 
     // Set up custom variables for this device type
-    const deviceId = this.accessory.context.eweDeviceId
-    const deviceConf = platform.simulations[deviceId]
+    const deviceConf = platform.simulations[accessory.context.eweDeviceId]
     this.setup = deviceConf.setup
     this.disableDeviceLogging = deviceConf.overrideDisabledLogging
       ? false
       : platform.config.disableDeviceLogging
 
     // Check for a valid setup
-    if (!this.consts.allowed.setups.includes(this.setup)) {
+    if (!platform.consts.allowed.setups.includes(this.setup)) {
       this.error = this.lang.simErrSetup
     }
 
@@ -50,7 +47,7 @@ module.exports = class deviceTapOne {
     })
 
     // Output the customised options to the log if in debug mode
-    if (this.debug) {
+    if (platform.config.debug) {
       const opts = JSON.stringify({
         disableDeviceLogging: this.disableDeviceLogging,
         setup: this.setup,
@@ -93,7 +90,7 @@ module.exports = class deviceTapOne {
       setTimeout(() => {
         this.service.updateCharacteristic(this.hapChar.Active, this.cacheState === 'on')
       }, 5000)
-      throw new this.platform.api.hap.HapStatusError(-70402)
+      throw new this.hapErr(-70402)
     }
   }
 
diff --git a/lib/device/simulation/tap-two.js b/lib/device/simulation/tap-two.js
index ec110a10..072ddd8f 100644
--- a/lib/device/simulation/tap-two.js
+++ b/lib/device/simulation/tap-two.js
@@ -5,13 +5,11 @@
 module.exports = class deviceTapTwo {
   constructor (platform, accessory) {
     // Set up variables from the platform
-    this.consts = platform.consts
-    this.debug = platform.config.debug
-    this.funcs = platform.funcs
-    this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
-    this.log = platform.log
+    this.hapErr = platform.api.hap.HapStatusError
+    this.hapServ = platform.api.hap.Service
     this.lang = platform.lang
+    this.log = platform.log
     this.platform = platform
 
     // Set up variables from the accessory
@@ -19,8 +17,7 @@ module.exports = class deviceTapTwo {
     this.accessory = accessory
 
     // Set up custom variables for this device type
-    const deviceId = this.accessory.context.eweDeviceId
-    const deviceConf = platform.simulations[deviceId]
+    const deviceConf = platform.simulations[accessory.context.eweDeviceId]
     this.disableDeviceLogging = deviceConf.overrideDisabledLogging
       ? false
       : platform.config.disableDeviceLogging
@@ -43,7 +40,7 @@ module.exports = class deviceTapTwo {
     })
 
     // Output the customised options to the log if in debug mode
-    if (this.debug) {
+    if (platform.config.debug) {
       const opts = JSON.stringify({
         disableDeviceLogging: this.disableDeviceLogging,
         type: deviceConf.type
@@ -83,7 +80,7 @@ module.exports = class deviceTapTwo {
       setTimeout(() => {
         tapService.updateCharacteristic(this.hapChar.Active, value === 1 ? 0 : 1)
       }, 5000)
-      throw new this.platform.api.hap.HapStatusError(-70402)
+      throw new this.hapErr(-70402)
     }
   }
 
diff --git a/lib/device/simulation/thermostat.js b/lib/device/simulation/thermostat.js
index 1bbd724f..dbbcea61 100644
--- a/lib/device/simulation/thermostat.js
+++ b/lib/device/simulation/thermostat.js
@@ -5,13 +5,12 @@
 module.exports = class deviceThermostat {
   constructor (platform, accessory) {
     // Set up variables from the platform
-    this.consts = platform.consts
-    this.debug = platform.config.debug
     this.funcs = platform.funcs
-    this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
-    this.log = platform.log
+    this.hapErr = platform.api.hap.HapStatusError
+    this.hapServ = platform.api.hap.Service
     this.lang = platform.lang
+    this.log = platform.log
     this.platform = platform
 
     // Set up variables from the accessory
@@ -19,9 +18,8 @@ module.exports = class deviceThermostat {
     this.accessory = accessory
 
     // Set up custom variables for this device type
-    const deviceId = this.accessory.context.eweDeviceId
-    const deviceConf = platform.thDevices[deviceId]
-    const deviceConf2 = platform.simulations[deviceId]
+    const deviceConf = platform.thDevices[accessory.context.eweDeviceId]
+    const deviceConf2 = platform.simulations[accessory.context.eweDeviceId]
     this.tempOffset = deviceConf && deviceConf.offset
       ? deviceConf.offset
       : platform.consts.defaultValues.offset
@@ -113,7 +111,7 @@ module.exports = class deviceThermostat {
     }, 5000)
 
     // Output the customised options to the log if in debug mode
-    if (this.debug) {
+    if (platform.config.debug) {
       const opts = JSON.stringify({
         disableDeviceLogging: this.disableDeviceLogging,
         maxTarget: this.maxTarget,
@@ -157,7 +155,7 @@ module.exports = class deviceThermostat {
           this.cacheState === 'on'
         )
       }, 5000)
-      throw new this.platform.api.hap.HapStatusError(-70402)
+      throw new this.hapErr(-70402)
     }
   }
 
@@ -201,7 +199,7 @@ module.exports = class deviceThermostat {
           this.cacheState === 'on'
         )
       }, 5000)
-      throw new this.platform.api.hap.HapStatusError(-70402)
+      throw new this.hapErr(-70402)
     }
   }
 
diff --git a/lib/device/simulation/valve-four.js b/lib/device/simulation/valve-four.js
index 5ff1ac1f..db60886b 100644
--- a/lib/device/simulation/valve-four.js
+++ b/lib/device/simulation/valve-four.js
@@ -5,13 +5,11 @@
 module.exports = class deviceValveFour {
   constructor (platform, accessory) {
     // Set up variables from the platform
-    this.consts = platform.consts
-    this.debug = platform.config.debug
-    this.funcs = platform.funcs
-    this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
-    this.log = platform.log
+    this.hapErr = platform.api.hap.HapStatusError
+    this.hapServ = platform.api.hap.Service
     this.lang = platform.lang
+    this.log = platform.log
     this.platform = platform
 
     // Set up variables from the accessory
@@ -19,8 +17,7 @@ module.exports = class deviceValveFour {
     this.accessory = accessory
 
     // Set up custom variables for this device type
-    const deviceId = this.accessory.context.eweDeviceId
-    const deviceConf = platform.simulations[deviceId]
+    const deviceConf = platform.simulations[accessory.context.eweDeviceId]
     this.disableDeviceLogging = deviceConf.overrideDisabledLogging
       ? false
       : platform.config.disableDeviceLogging
@@ -67,7 +64,7 @@ module.exports = class deviceValveFour {
     })
 
     // Output the customised options to the log if in debug mode
-    if (this.debug) {
+    if (platform.config.debug) {
       const opts = JSON.stringify({
         disableDeviceLogging: this.disableDeviceLogging,
         type: deviceConf.type
@@ -136,7 +133,7 @@ module.exports = class deviceValveFour {
       setTimeout(() => {
         valveService.updateCharacteristic(this.hapChar.Active, value === 1 ? 0 : 1)
       }, 5000)
-      throw new this.platform.api.hap.HapStatusError(-70402)
+      throw new this.hapErr(-70402)
     }
   }
 
diff --git a/lib/device/simulation/valve-one.js b/lib/device/simulation/valve-one.js
index 945fb790..719f1a51 100644
--- a/lib/device/simulation/valve-one.js
+++ b/lib/device/simulation/valve-one.js
@@ -5,13 +5,11 @@
 module.exports = class deviceValveOne {
   constructor (platform, accessory) {
     // Set up variables from the platform
-    this.consts = platform.consts
-    this.debug = platform.config.debug
-    this.funcs = platform.funcs
-    this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
-    this.log = platform.log
+    this.hapErr = platform.api.hap.HapStatusError
+    this.hapServ = platform.api.hap.Service
     this.lang = platform.lang
+    this.log = platform.log
     this.platform = platform
 
     // Set up variables from the accessory
@@ -19,15 +17,14 @@ module.exports = class deviceValveOne {
     this.accessory = accessory
 
     // Set up custom variables for this device type
-    const deviceId = this.accessory.context.eweDeviceId
-    const deviceConf = platform.simulations[deviceId]
+    const deviceConf = platform.simulations[accessory.context.eweDeviceId]
     this.setup = deviceConf.setup
     this.disableDeviceLogging = deviceConf.overrideDisabledLogging
       ? false
       : platform.config.disableDeviceLogging
 
     // Check for a valid setup
-    if (!this.consts.allowed.setups.includes(this.setup)) {
+    if (!platform.consts.allowed.setups.includes(this.setup)) {
       this.error = this.lang.simErrSetup
     }
 
@@ -70,7 +67,7 @@ module.exports = class deviceValveOne {
     })
 
     // Output the customised options to the log if in debug mode
-    if (this.debug) {
+    if (platform.config.debug) {
       const opts = JSON.stringify({
         disableDeviceLogging: this.disableDeviceLogging,
         setup: this.setup,
@@ -124,7 +121,7 @@ module.exports = class deviceValveOne {
       setTimeout(() => {
         this.service.updateCharacteristic(this.hapChar.Active, value === 1 ? 0 : 1)
       }, 5000)
-      throw new this.platform.api.hap.HapStatusError(-70402)
+      throw new this.hapErr(-70402)
     }
   }
 
diff --git a/lib/device/simulation/valve-two.js b/lib/device/simulation/valve-two.js
index 2a10e2a6..a28abcea 100644
--- a/lib/device/simulation/valve-two.js
+++ b/lib/device/simulation/valve-two.js
@@ -5,13 +5,11 @@
 module.exports = class deviceValveTwo {
   constructor (platform, accessory) {
     // Set up variables from the platform
-    this.consts = platform.consts
-    this.debug = platform.config.debug
-    this.funcs = platform.funcs
-    this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
-    this.log = platform.log
+    this.hapErr = platform.api.hap.HapStatusError
+    this.hapServ = platform.api.hap.Service
     this.lang = platform.lang
+    this.log = platform.log
     this.platform = platform
 
     // Set up variables from the accessory
@@ -19,8 +17,7 @@ module.exports = class deviceValveTwo {
     this.accessory = accessory
 
     // Set up custom variables for this device type
-    const deviceId = this.accessory.context.eweDeviceId
-    const deviceConf = platform.simulations[deviceId]
+    const deviceConf = platform.simulations[accessory.context.eweDeviceId]
     this.disableDeviceLogging = deviceConf.overrideDisabledLogging
       ? false
       : platform.config.disableDeviceLogging
@@ -67,7 +64,7 @@ module.exports = class deviceValveTwo {
     })
 
     // Output the customised options to the log if in debug mode
-    if (this.debug) {
+    if (platform.config.debug) {
       const opts = JSON.stringify({
         disableDeviceLogging: this.disableDeviceLogging,
         type: deviceConf.type
@@ -130,7 +127,7 @@ module.exports = class deviceValveTwo {
       setTimeout(() => {
         valveService.updateCharacteristic(this.hapChar.Active, value === 1 ? 0 : 1)
       }, 5000)
-      throw new this.platform.api.hap.HapStatusError(-70402)
+      throw new this.hapErr(-70402)
     }
   }
 
diff --git a/lib/device/simulation/window.js b/lib/device/simulation/window.js
index 629a6175..09972186 100644
--- a/lib/device/simulation/window.js
+++ b/lib/device/simulation/window.js
@@ -5,13 +5,12 @@
 module.exports = class deviceWindow {
   constructor (platform, accessory) {
     // Set up variables from the platform
-    this.consts = platform.consts
-    this.debug = platform.config.debug
     this.funcs = platform.funcs
-    this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
-    this.log = platform.log
+    this.hapErr = platform.api.hap.HapStatusError
+    this.hapServ = platform.api.hap.Service
     this.lang = platform.lang
+    this.log = platform.log
     this.platform = platform
 
     // Set up variables from the accessory
@@ -19,10 +18,9 @@ module.exports = class deviceWindow {
     this.accessory = accessory
 
     // Set up custom variables for this device type
-    const deviceId = this.accessory.context.eweDeviceId
-    const deviceConf = platform.simulations[deviceId]
+    const deviceConf = platform.simulations[accessory.context.eweDeviceId]
     this.operationTimeUp = deviceConf.operationTime ||
-      this.consts.defaultValues.operationTime
+      platform.consts.defaultValues.operationTime
     this.operationTimeDown = deviceConf.operationTimeDown || this.operationTimeUp
     this.disableDeviceLogging = deviceConf && deviceConf.overrideDisabledLogging
       ? false
@@ -50,7 +48,7 @@ module.exports = class deviceWindow {
     })
 
     // Output the customised options to the log if in debug mode
-    if (this.debug) {
+    if (platform.config.debug) {
       const opts = JSON.stringify({
         disableDeviceLogging: this.disableDeviceLogging,
         operationTimeDown: this.operationTimeDown,
@@ -136,7 +134,7 @@ module.exports = class deviceWindow {
       }, 5000)
       this.service.updateCharacteristic(
         this.hapChar.TargetPosition,
-        new this.platform.api.hap.HapStatusError(-70402)
+        new this.hapErr(-70402)
       )
     }
   }
diff --git a/lib/device/switch-double.js b/lib/device/switch-double.js
index 23dd9253..927dd982 100644
--- a/lib/device/switch-double.js
+++ b/lib/device/switch-double.js
@@ -3,15 +3,16 @@
 'use strict'
 
 module.exports = class deviceSwitchDouble {
-  constructor (platform, accessory) {
+  constructor (platform, accessory, devicesInHB) {
     // Set up variables from the platform
-    this.consts = platform.consts
-    this.debug = platform.config.debug
+    this.devicesInHB = devicesInHB
     this.funcs = platform.funcs
-    this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
-    this.log = platform.log
+    this.hapErr = platform.api.hap.HapStatusError
+    this.hapServ = platform.api.hap.Service
+    this.hapUUIDGen = platform.api.hap.uuid.generate
     this.lang = platform.lang
+    this.log = platform.log
     this.platform = platform
 
     // Set up variables from the accessory
@@ -19,8 +20,7 @@ module.exports = class deviceSwitchDouble {
     this.accessory = accessory
 
     // Set up custom variables for this device type
-    const deviceId = this.accessory.context.eweDeviceId
-    const deviceConf = platform.multiDevices[deviceId]
+    const deviceConf = platform.multiDevices[accessory.context.eweDeviceId]
     this.hideChannels = deviceConf && deviceConf.hideChannels
       ? deviceConf.hideChannels
       : undefined
@@ -48,7 +48,7 @@ module.exports = class deviceSwitchDouble {
     })
 
     // Output the customised options to the log if in debug mode
-    if (this.debug) {
+    if (platform.config.debug) {
       const opts = JSON.stringify({
         disableDeviceLogging: this.disableDeviceLogging,
         hideChannels: this.hideChannels
@@ -79,9 +79,9 @@ module.exports = class deviceSwitchDouble {
         case '0':
           for (let i = 0; i <= 2; i++) {
             const idToCheck = this.accessory.context.eweDeviceId + 'SW' + i
-            const uuid = this.platform.api.hap.uuid.generate(idToCheck)
-            if (this.platform.devicesInHB.has(uuid)) {
-              const subAccessory = this.platform.devicesInHB.get(uuid)
+            const uuid = this.hapUUIDGen(idToCheck)
+            if (this.devicesInHB.has(uuid)) {
+              const subAccessory = this.devicesInHB.get(uuid)
               subAccessory.getService(this.hapServ.Switch).updateCharacteristic(
                 this.hapChar.On,
                 value
@@ -102,9 +102,9 @@ module.exports = class deviceSwitchDouble {
         case '2':
           for (let i = 1; i <= 2; i++) {
             const idToCheck = this.accessory.context.eweDeviceId + 'SW' + i
-            const uuid = this.platform.api.hap.uuid.generate(idToCheck)
-            if (this.platform.devicesInHB.has(uuid)) {
-              const subAccessory = this.platform.devicesInHB.get(uuid)
+            const uuid = this.hapUUIDGen(idToCheck)
+            if (this.devicesInHB.has(uuid)) {
+              const subAccessory = this.devicesInHB.get(uuid)
               if (i === parseInt(switchNumber)) {
                 if (value) {
                   primaryState = true
@@ -130,8 +130,8 @@ module.exports = class deviceSwitchDouble {
           }
           if (!this.platform.hideMasters.includes(this.accessory.context.eweDeviceId)) {
             const idToCheck = this.accessory.context.eweDeviceId + 'SW0'
-            const uuid = this.platform.api.hap.uuid.generate(idToCheck)
-            const priAccessory = this.platform.devicesInHB.get(uuid)
+            const uuid = this.hapUUIDGen(idToCheck)
+            const priAccessory = this.devicesInHB.get(uuid)
             priAccessory.getService(this.hapServ.Switch).updateCharacteristic(
               this.hapChar.On,
               primaryState
@@ -145,7 +145,7 @@ module.exports = class deviceSwitchDouble {
       setTimeout(() => {
         this.service.updateCharacteristic(this.hapChar.On, !value)
       }, 5000)
-      throw new this.platform.api.hap.HapStatusError(-70402)
+      throw new this.hapErr(-70402)
     }
   }
 
@@ -157,12 +157,12 @@ module.exports = class deviceSwitchDouble {
       const idToCheck = this.accessory.context.eweDeviceId + 'SW'
       let primaryState = false
       for (let i = 1; i <= 2; i++) {
-        const uuid = this.platform.api.hap.uuid.generate(idToCheck + i)
-        if (this.platform.devicesInHB.has(uuid)) {
+        const uuid = this.hapUUIDGen(idToCheck + i)
+        if (this.devicesInHB.has(uuid)) {
           if (params.switches[i - 1].switch === 'on') {
             primaryState = true
           }
-          const subAccessory = this.platform.devicesInHB.get(uuid)
+          const subAccessory = this.devicesInHB.get(uuid)
           const service = subAccessory.getService(this.hapServ.Switch)
           const currentState = service.getCharacteristic(this.hapChar.On).value
             ? 'on'
diff --git a/lib/device/switch-multi.js b/lib/device/switch-multi.js
index 6761017c..25e08714 100644
--- a/lib/device/switch-multi.js
+++ b/lib/device/switch-multi.js
@@ -3,15 +3,15 @@
 'use strict'
 
 module.exports = class deviceSwitchMulti {
-  constructor (platform, accessory) {
+  constructor (platform, accessory, devicesInHB) {
     // Set up variables from the platform
-    this.consts = platform.consts
-    this.debug = platform.config.debug
-    this.funcs = platform.funcs
-    this.hapServ = platform.api.hap.Service
+    this.devicesInHB = devicesInHB
     this.hapChar = platform.api.hap.Characteristic
-    this.log = platform.log
+    this.hapErr = platform.api.hap.HapStatusError
+    this.hapServ = platform.api.hap.Service
+    this.hapUUIDGen = platform.api.hap.uuid.generate
     this.lang = platform.lang
+    this.log = platform.log
     this.platform = platform
 
     // Set up variables from the accessory
@@ -19,8 +19,7 @@ module.exports = class deviceSwitchMulti {
     this.accessory = accessory
 
     // Set up custom variables for this device type
-    const deviceId = this.accessory.context.eweDeviceId
-    const deviceConf = platform.multiDevices[deviceId]
+    const deviceConf = platform.multiDevices[accessory.context.eweDeviceId]
     this.hideChannels = deviceConf && deviceConf.hideChannels
       ? deviceConf.hideChannels
       : undefined
@@ -48,7 +47,7 @@ module.exports = class deviceSwitchMulti {
     })
 
     // Output the customised options to the log if in debug mode
-    if (this.debug) {
+    if (platform.config.debug) {
       const opts = JSON.stringify({
         disableDeviceLogging: this.disableDeviceLogging,
         hideChannels: this.hideChannels
@@ -83,9 +82,9 @@ module.exports = class deviceSwitchMulti {
         case '0':
           for (let i = 0; i <= this.accessory.context.channelCount; i++) {
             const idToCheck = this.accessory.context.eweDeviceId + 'SW' + i
-            const uuid = this.platform.api.hap.uuid.generate(idToCheck)
-            if (this.platform.devicesInHB.has(uuid)) {
-              const subAccessory = this.platform.devicesInHB.get(uuid)
+            const uuid = this.hapUUIDGen(idToCheck)
+            if (this.devicesInHB.has(uuid)) {
+              const subAccessory = this.devicesInHB.get(uuid)
               subAccessory.getService(this.hapServ.Switch).updateCharacteristic(
                 this.hapChar.On,
                 value
@@ -108,9 +107,9 @@ module.exports = class deviceSwitchMulti {
         case '4':
           for (let i = 1; i <= this.accessory.context.channelCount; i++) {
             const idToCheck = this.accessory.context.eweDeviceId + 'SW' + i
-            const uuid = this.platform.api.hap.uuid.generate(idToCheck)
-            if (this.platform.devicesInHB.has(uuid)) {
-              const subAccessory = this.platform.devicesInHB.get(uuid)
+            const uuid = this.hapUUIDGen(idToCheck)
+            if (this.devicesInHB.has(uuid)) {
+              const subAccessory = this.devicesInHB.get(uuid)
               if (i === parseInt(switchNumber)) {
                 if (value) {
                   primaryState = true
@@ -136,8 +135,8 @@ module.exports = class deviceSwitchMulti {
           }
           if (!this.platform.hideMasters.includes(this.accessory.context.eweDeviceId)) {
             const idToCheck = this.accessory.context.eweDeviceId + 'SW0'
-            const uuid = this.platform.api.hap.uuid.generate(idToCheck)
-            const priAccessory = this.platform.devicesInHB.get(uuid)
+            const uuid = this.hapUUIDGen(idToCheck)
+            const priAccessory = this.devicesInHB.get(uuid)
             priAccessory.getService(this.hapServ.Switch).updateCharacteristic(
               this.hapChar.On,
               primaryState
@@ -151,7 +150,7 @@ module.exports = class deviceSwitchMulti {
       setTimeout(() => {
         this.service.updateCharacteristic(this.hapChar.On, !value)
       }, 5000)
-      throw new this.platform.api.hap.HapStatusError(-70402)
+      throw new this.hapErr(-70402)
     }
   }
 
@@ -163,12 +162,12 @@ module.exports = class deviceSwitchMulti {
       const idToCheck = this.accessory.context.eweDeviceId + 'SW'
       let primaryState = false
       for (let i = 1; i <= this.accessory.context.channelCount; i++) {
-        const uuid = this.platform.api.hap.uuid.generate(idToCheck + i)
-        if (this.platform.devicesInHB.has(uuid)) {
+        const uuid = this.hapUUIDGen(idToCheck + i)
+        if (this.devicesInHB.has(uuid)) {
           if (params.switches[i - 1].switch === 'on') {
             primaryState = true
           }
-          const subAccessory = this.platform.devicesInHB.get(uuid)
+          const subAccessory = this.devicesInHB.get(uuid)
           const service = subAccessory.getService(this.hapServ.Switch)
           const currentState = service.getCharacteristic(this.hapChar.On).value
             ? 'on'
diff --git a/lib/device/switch-single.js b/lib/device/switch-single.js
index d37b4b39..8ee1beda 100644
--- a/lib/device/switch-single.js
+++ b/lib/device/switch-single.js
@@ -5,13 +5,11 @@
 module.exports = class deviceSwitchSingle {
   constructor (platform, accessory) {
     // Set up variables from the platform
-    this.consts = platform.consts
-    this.debug = platform.config.debug
-    this.funcs = platform.funcs
-    this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
-    this.log = platform.log
+    this.hapErr = platform.api.hap.HapStatusError
+    this.hapServ = platform.api.hap.Service
     this.lang = platform.lang
+    this.log = platform.log
     this.platform = platform
 
     // Set up variables from the accessory
@@ -19,8 +17,7 @@ module.exports = class deviceSwitchSingle {
     this.accessory = accessory
 
     // Set up custom variables for this device type
-    const deviceId = this.accessory.context.eweDeviceId
-    const deviceConf = platform.singleDevices[deviceId]
+    const deviceConf = platform.singleDevices[accessory.context.eweDeviceId]
     this.disableDeviceLogging = deviceConf && deviceConf.overrideDisabledLogging
       ? false
       : platform.config.disableDeviceLogging
@@ -45,7 +42,7 @@ module.exports = class deviceSwitchSingle {
     })
 
     // Output the customised options to the log if in debug mode
-    if (this.debug) {
+    if (platform.config.debug) {
       const opts = JSON.stringify({ disableDeviceLogging: this.disableDeviceLogging })
       this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
     }
@@ -67,7 +64,7 @@ module.exports = class deviceSwitchSingle {
       setTimeout(() => {
         this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
       }, 5000)
-      throw new this.platform.api.hap.HapStatusError(-70402)
+      throw new this.hapErr(-70402)
     }
   }
 
diff --git a/lib/device/thermostat.js b/lib/device/thermostat.js
index e49d0551..00c1aec3 100644
--- a/lib/device/thermostat.js
+++ b/lib/device/thermostat.js
@@ -5,13 +5,12 @@
 module.exports = class deviceThermostat {
   constructor (platform, accessory) {
     // Set up variables from the platform
-    this.consts = platform.consts
-    this.debug = platform.config.debug
     this.funcs = platform.funcs
-    this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
-    this.log = platform.log
+    this.hapServ = platform.api.hap.Service
+    this.hapErr = platform.api.hap.HapStatusError
     this.lang = platform.lang
+    this.log = platform.log
     this.platform = platform
 
     // Set up variables from the accessory
@@ -19,8 +18,7 @@ module.exports = class deviceThermostat {
     this.accessory = accessory
 
     // Set up custom variables for this device type
-    const deviceId = this.accessory.context.eweDeviceId
-    const deviceConf = platform.thDevices[deviceId]
+    const deviceConf = platform.thDevices[accessory.context.eweDeviceId]
     this.tempOffset = deviceConf && deviceConf.offset
       ? deviceConf.offset
       : platform.consts.defaultValues.offset
@@ -85,7 +83,7 @@ module.exports = class deviceThermostat {
     })
 
     // Output the customised options to the log if in debug mode
-    if (this.debug) {
+    if (platform.config.debug) {
       const opts = JSON.stringify({
         disableDeviceLogging: this.disableDeviceLogging,
         offset: this.tempOffset
@@ -116,7 +114,7 @@ module.exports = class deviceThermostat {
           this.cacheState === 'on'
         )
       }, 5000)
-      throw new this.platform.api.hap.HapStatusError(-70402)
+      throw new this.hapErr(-70402)
     }
   }
 
@@ -140,7 +138,7 @@ module.exports = class deviceThermostat {
           this.cacheState === 'on'
         )
       }, 5000)
-      throw new this.platform.api.hap.HapStatusError(-70402)
+      throw new this.hapErr(-70402)
     }
   }
 
diff --git a/lib/device/zigbee/light-cct.js b/lib/device/zigbee/light-cct.js
index 6fbfeb1b..e9a62fe6 100644
--- a/lib/device/zigbee/light-cct.js
+++ b/lib/device/zigbee/light-cct.js
@@ -5,13 +5,12 @@
 module.exports = class deviceZBLightCCT {
   constructor (platform, accessory) {
     // Set up variables from the platform
-    this.consts = platform.consts
-    this.debug = platform.config.debug
     this.funcs = platform.funcs
-    this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
-    this.log = platform.log
+    this.hapErr = platform.api.hap.HapStatusError
+    this.hapServ = platform.api.hap.Service
     this.lang = platform.lang
+    this.log = platform.log
     this.platform = platform
 
     // Set up variables from the accessory
@@ -19,8 +18,7 @@ module.exports = class deviceZBLightCCT {
     this.accessory = accessory
 
     // Set up custom variables for this device type
-    const deviceId = this.accessory.context.eweDeviceId
-    const deviceConf = platform.lightDevices[deviceId]
+    const deviceConf = platform.lightDevices[accessory.context.eweDeviceId]
     this.brightStep = deviceConf && deviceConf.brightnessStep
       ? Math.min(deviceConf.brightnessStep, 100)
       : platform.consts.defaultValues.brightnessStep
@@ -45,7 +43,7 @@ module.exports = class deviceZBLightCCT {
         if (this.isOnline) {
           return this.service.getCharacteristic(this.hapChar.On).value
         } else {
-          throw new this.platform.api.hap.HapStatusError(-70402)
+          throw new this.hapErr(-70402)
         }
       })
       .onSet(async value => {
@@ -75,7 +73,7 @@ module.exports = class deviceZBLightCCT {
     this.accessory.configureController(this.alController)
 
     // Output the customised options to the log if in debug mode
-    if (this.debug) {
+    if (platform.config.debug) {
       const opts = JSON.stringify({
         adaptiveLightingShift: this.alShift,
         brightnessStep: this.brightStep,
@@ -100,7 +98,7 @@ module.exports = class deviceZBLightCCT {
       setTimeout(() => {
         this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
       }, 5000)
-      throw new this.platform.api.hap.HapStatusError(-70402)
+      throw new this.hapErr(-70402)
     }
   }
 
@@ -129,7 +127,7 @@ module.exports = class deviceZBLightCCT {
       setTimeout(() => {
         this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
       }, 5000)
-      throw new this.platform.api.hap.HapStatusError(-70402)
+      throw new this.hapErr(-70402)
     }
   }
 
@@ -175,7 +173,7 @@ module.exports = class deviceZBLightCCT {
       setTimeout(() => {
         this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
       }, 5000)
-      throw new this.platform.api.hap.HapStatusError(-70402)
+      throw new this.hapErr(-70402)
     }
   }
 
diff --git a/lib/device/zigbee/light-dimmer.js b/lib/device/zigbee/light-dimmer.js
index 6db48fd0..5037894a 100644
--- a/lib/device/zigbee/light-dimmer.js
+++ b/lib/device/zigbee/light-dimmer.js
@@ -5,13 +5,12 @@
 module.exports = class deviceZBLightDimmer {
   constructor (platform, accessory) {
     // Set up variables from the platform
-    this.consts = platform.consts
-    this.debug = platform.config.debug
     this.funcs = platform.funcs
-    this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
-    this.log = platform.log
+    this.hapErr = platform.api.hap.HapStatusError
+    this.hapServ = platform.api.hap.Service
     this.lang = platform.lang
+    this.log = platform.log
     this.platform = platform
 
     // Set up variables from the accessory
@@ -19,8 +18,7 @@ module.exports = class deviceZBLightDimmer {
     this.accessory = accessory
 
     // Set up custom variables for this device type
-    const deviceId = this.accessory.context.eweDeviceId
-    const deviceConf = platform.lightDevices[deviceId]
+    const deviceConf = platform.lightDevices[accessory.context.eweDeviceId]
     this.brightStep = deviceConf && deviceConf.brightnessStep
       ? Math.min(deviceConf.brightnessStep, 100)
       : platform.consts.defaultValues.brightnessStep
@@ -38,7 +36,7 @@ module.exports = class deviceZBLightDimmer {
         if (this.isOnline) {
           return this.service.getCharacteristic(this.hapChar.On).value
         } else {
-          throw new this.platform.api.hap.HapStatusError(-70402)
+          throw new this.hapErr(-70402)
         }
       })
       .onSet(async value => {
@@ -53,7 +51,7 @@ module.exports = class deviceZBLightDimmer {
       })
 
     // Output the customised options to the log if in debug mode
-    if (this.debug) {
+    if (platform.config.debug) {
       const opts = JSON.stringify({
         brightnessStep: this.brightStep,
         disableDeviceLogging: this.disableDeviceLogging
@@ -77,7 +75,7 @@ module.exports = class deviceZBLightDimmer {
       setTimeout(() => {
         this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
       }, 5000)
-      throw new this.platform.api.hap.HapStatusError(-70402)
+      throw new this.hapErr(-70402)
     }
   }
 
@@ -106,7 +104,7 @@ module.exports = class deviceZBLightDimmer {
       setTimeout(() => {
         this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
       }, 5000)
-      throw new this.platform.api.hap.HapStatusError(-70402)
+      throw new this.hapErr(-70402)
     }
   }
 
diff --git a/lib/device/zigbee/sensor-ambient.js b/lib/device/zigbee/sensor-ambient.js
index cb4a16c5..edaacc95 100644
--- a/lib/device/zigbee/sensor-ambient.js
+++ b/lib/device/zigbee/sensor-ambient.js
@@ -5,13 +5,11 @@
 module.exports = class deviceZBSensorAmbient {
   constructor (platform, accessory) {
     // Set up variables from the platform
-    this.consts = platform.consts
-    this.debug = platform.config.debug
     this.funcs = platform.funcs
-    this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
-    this.log = platform.log
+    this.hapServ = platform.api.hap.Service
     this.lang = platform.lang
+    this.log = platform.log
     this.platform = platform
 
     // Set up variables from the accessory
@@ -19,11 +17,13 @@ module.exports = class deviceZBSensorAmbient {
     this.accessory = accessory
 
     // Set up custom variables for this device type
-    const deviceId = this.accessory.context.eweDeviceId
-    const deviceConf = platform.sensorDevices[deviceId]
+    const deviceConf = platform.sensorDevices[accessory.context.eweDeviceId]
     this.lowBattThreshold = deviceConf && deviceConf.lowBattThreshold
       ? Math.min(deviceConf.lowBattThreshold, 100)
       : platform.consts.defaultValues.lowBattThreshold
+    this.tempOffset = deviceConf && deviceConf.offset
+      ? deviceConf.offset
+      : platform.consts.defaultValues.offset
     this.disableDeviceLogging = deviceConf && deviceConf.overrideDisabledLogging
       ? false
       : platform.config.disableDeviceLogging
@@ -51,10 +51,11 @@ module.exports = class deviceZBSensorAmbient {
     })
 
     // Output the customised options to the log if in debug mode
-    if (this.debug) {
+    if (platform.config.debug) {
       const opts = JSON.stringify({
         disableDeviceLogging: this.disableDeviceLogging,
-        lowBattThreshold: this.lowBattThreshold
+        lowBattThreshold: this.lowBattThreshold,
+        offset: this.tempOffset
       })
       this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
     }
@@ -82,7 +83,7 @@ module.exports = class deviceZBSensorAmbient {
         params.temperature !== this.cacheTemp
       ) {
         this.cacheTemp = params.temperature
-        const currentTemp = parseInt(this.cacheTemp) / 100
+        const currentTemp = parseInt(this.cacheTemp) / 100 + this.tempOffset
         this.tService.updateCharacteristic(this.hapChar.CurrentTemperature, currentTemp)
         eveLog.temp = currentTemp
         if (params.updateSource && !this.disableDeviceLogging) {
diff --git a/lib/device/zigbee/sensor-contact.js b/lib/device/zigbee/sensor-contact.js
index 1a42828f..e3ac9310 100644
--- a/lib/device/zigbee/sensor-contact.js
+++ b/lib/device/zigbee/sensor-contact.js
@@ -5,14 +5,12 @@
 module.exports = class deviceZBSensorContact {
   constructor (platform, accessory) {
     // Set up variables from the platform
-    this.consts = platform.consts
-    this.debug = platform.config.debug
+    this.eveChar = platform.eveChar
     this.funcs = platform.funcs
-    this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
-    this.eveChar = platform.eveChar
-    this.log = platform.log
+    this.hapServ = platform.api.hap.Service
     this.lang = platform.lang
+    this.log = platform.log
     this.platform = platform
 
     // Set up variables from the accessory
@@ -20,8 +18,7 @@ module.exports = class deviceZBSensorContact {
     this.accessory = accessory
 
     // Set up custom variables for this device type
-    const deviceId = this.accessory.context.eweDeviceId
-    const deviceConf = platform.sensorDevices[deviceId]
+    const deviceConf = platform.sensorDevices[accessory.context.eweDeviceId]
     this.scaleBattery = deviceConf && deviceConf.scaleBattery
     this.lowBattThreshold = deviceConf && deviceConf.lowBattThreshold
       ? Math.min(deviceConf.lowBattThreshold, 100)
@@ -59,7 +56,7 @@ module.exports = class deviceZBSensorContact {
     })
 
     // Output the customised options to the log if in debug mode
-    if (this.debug) {
+    if (platform.config.debug) {
       const opts = JSON.stringify({
         disableDeviceLogging: this.disableDeviceLogging,
         lowBattThreshold: this.lowBattThreshold,
@@ -111,6 +108,46 @@ module.exports = class deviceZBSensorContact {
           )
         }
       }
+      for (const [deviceId, group] of Object.entries(this.platform.simulations)) {
+        if (
+          group.sensorId === this.accessory.context.eweDeviceId &&
+          group.type === 'garage'
+        ) {
+          const uuid = this.hapUUIDGen(deviceId + 'SWX')
+          if (this.devicesInHB.has(uuid)) {
+            const subAccessory = this.devicesInHB.get(uuid)
+            const gdService = subAccessory.getService(this.hapServ.GarageDoorOpener)
+            const name = subAccessory.displayName
+            switch (params.lock) {
+              case 0:
+                gdService.updateCharacteristic(this.hapChar.TargetDoorState, 1)
+                gdService.updateCharacteristic(this.hapChar.CurrentDoorState, 1)
+                if (params.updateSource && !this.disableDeviceLogging) {
+                  this.log(
+                    '[%s] %s [%s].',
+                    name,
+                    this.lang.curState,
+                    this.lang.doorClosed
+                  )
+                }
+                break
+              case 1:
+                await this.funcs.sleep(Math.max(group.operationTime * 100, 2000))
+                gdService.updateCharacteristic(this.hapChar.TargetDoorState, 0)
+                gdService.updateCharacteristic(this.hapChar.CurrentDoorState, 0)
+                if (params.updateSource && !this.disableDeviceLogging) {
+                  this.log(
+                    '[%s] %s [%s].',
+                    name,
+                    this.lang.curState,
+                    this.lang.doorOpen
+                  )
+                }
+                break
+            }
+          }
+        }
+      }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
diff --git a/lib/device/zigbee/sensor-motion.js b/lib/device/zigbee/sensor-motion.js
index 1c4b58c2..c43eb056 100644
--- a/lib/device/zigbee/sensor-motion.js
+++ b/lib/device/zigbee/sensor-motion.js
@@ -5,14 +5,12 @@
 module.exports = class deviceZBSensorMotion {
   constructor (platform, accessory) {
     // Set up variables from the platform
-    this.consts = platform.consts
-    this.debug = platform.config.debug
+    this.eveChar = platform.eveChar
     this.funcs = platform.funcs
-    this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
-    this.eveChar = platform.eveChar
-    this.log = platform.log
+    this.hapServ = platform.api.hap.Service
     this.lang = platform.lang
+    this.log = platform.log
     this.platform = platform
 
     // Set up variables from the accessory
@@ -20,8 +18,7 @@ module.exports = class deviceZBSensorMotion {
     this.accessory = accessory
 
     // Set up custom variables for this device type
-    const deviceId = this.accessory.context.eweDeviceId
-    const deviceConf = platform.sensorDevices[deviceId]
+    const deviceConf = platform.sensorDevices[accessory.context.eweDeviceId]
     this.lowBattThreshold = deviceConf && deviceConf.lowBattThreshold
       ? Math.min(deviceConf.lowBattThreshold, 100)
       : platform.consts.defaultValues.lowBattThreshold
@@ -47,7 +44,7 @@ module.exports = class deviceZBSensorMotion {
     })
 
     // Output the customised options to the log if in debug mode
-    if (this.debug) {
+    if (platform.config.debug) {
       const opts = JSON.stringify({
         disableDeviceLogging: this.disableDeviceLogging,
         lowBattThreshold: this.lowBattThreshold,
diff --git a/lib/device/zigbee/switch-single.js b/lib/device/zigbee/switch-single.js
index 435119bb..24f71cef 100644
--- a/lib/device/zigbee/switch-single.js
+++ b/lib/device/zigbee/switch-single.js
@@ -5,13 +5,11 @@
 module.exports = class deviceZBSwitchSingle {
   constructor (platform, accessory) {
     // Set up variables from the platform
-    this.consts = platform.consts
-    this.debug = platform.config.debug
-    this.funcs = platform.funcs
-    this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
-    this.log = platform.log
+    this.hapErr = platform.api.hap.HapStatusError
+    this.hapServ = platform.api.hap.Service
     this.lang = platform.lang
+    this.log = platform.log
     this.platform = platform
 
     // Set up variables from the accessory
@@ -19,8 +17,7 @@ module.exports = class deviceZBSwitchSingle {
     this.accessory = accessory
 
     // Set up custom variables for this device type
-    const deviceId = this.accessory.context.eweDeviceId
-    const deviceConf = platform.singleDevices[deviceId]
+    const deviceConf = platform.singleDevices[accessory.context.eweDeviceId]
     this.disableDeviceLogging = deviceConf && deviceConf.overrideDisabledLogging
       ? false
       : platform.config.disableDeviceLogging
@@ -35,7 +32,7 @@ module.exports = class deviceZBSwitchSingle {
         if (this.isOnline) {
           return this.service.getCharacteristic(this.hapChar.On).value
         } else {
-          throw new this.platform.api.hap.HapStatusError(-70402)
+          throw new this.hapErr(-70402)
         }
       })
       .onSet(async value => {
@@ -48,7 +45,7 @@ module.exports = class deviceZBSwitchSingle {
     })
 
     // Output the customised options to the log if in debug mode
-    if (this.debug) {
+    if (platform.config.debug) {
       const opts = JSON.stringify({ disableDeviceLogging: this.disableDeviceLogging })
       this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
     }
@@ -70,7 +67,7 @@ module.exports = class deviceZBSwitchSingle {
       setTimeout(() => {
         this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
       }, 5000)
-      throw new this.platform.api.hap.HapStatusError(-70402)
+      throw new this.hapErr(-70402)
     }
   }
 
diff --git a/lib/device/zigbee/switch-stateless.js b/lib/device/zigbee/switch-stateless.js
index 20b90fce..4dc7addc 100644
--- a/lib/device/zigbee/switch-stateless.js
+++ b/lib/device/zigbee/switch-stateless.js
@@ -5,13 +5,11 @@
 module.exports = class deviceZBSwitchStateless {
   constructor (platform, accessory) {
     // Set up variables from the platform
-    this.consts = platform.consts
-    this.debug = platform.config.debug
     this.funcs = platform.funcs
-    this.hapServ = platform.api.hap.Service
     this.hapChar = platform.api.hap.Characteristic
-    this.log = platform.log
+    this.hapServ = platform.api.hap.Service
     this.lang = platform.lang
+    this.log = platform.log
     this.platform = platform
 
     // Set up variables from the accessory
@@ -19,8 +17,7 @@ module.exports = class deviceZBSwitchStateless {
     this.accessory = accessory
 
     // Set up custom variables for this device type
-    const deviceId = this.accessory.context.eweDeviceId
-    const deviceConf = platform.sensorDevices[deviceId]
+    const deviceConf = platform.sensorDevices[accessory.context.eweDeviceId]
     this.hideLongDouble = deviceConf && deviceConf.hideLongDouble
     this.lowBattThreshold = deviceConf && deviceConf.lowBattThreshold
       ? Math.min(deviceConf.lowBattThreshold, 100)
@@ -45,7 +42,7 @@ module.exports = class deviceZBSwitchStateless {
       this.accessory.addService(this.hapServ.BatteryService)
 
     // Output the customised options to the log if in debug mode
-    if (this.debug) {
+    if (platform.config.debug) {
       const opts = JSON.stringify({
         disableDeviceLogging: this.disableDeviceLogging,
         hideLongDouble: this.hideLongDouble,
diff --git a/lib/index.js b/lib/index.js
index c69c5d49..47352a37 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -2,9 +2,24 @@
 /* eslint-disable new-cap */
 'use strict'
 
+const devicesInHB = new Map()
+const devicesInEW = new Map()
+let httpClient
+let lanClient
+let lanDevices
+let wsClient
+
 // Retrieve necessary fields from the package.json file
 const PLUGIN = require('./../package.json')
 
+// Create the queue used for sending device updates
+const { default: PQueue } = require('p-queue')
+const queue = new PQueue({
+  interval: 250,
+  intervalCap: 1,
+  timeout: 10000
+})
+
 // Create the platform class
 class eWeLinkPlatform {
   constructor (log, config, api) {
@@ -46,10 +61,6 @@ class eWeLinkPlatform {
       this.config = this.consts.defaultConfig
       this.applyUserConfig(config)
 
-      // Create further variables needed by the plugin
-      this.devicesInHB = new Map()
-      this.devicesInEW = new Map()
-
       // Set up the Homebridge events
       this.api.on('didFinishLaunching', this.pluginSetup.bind(this))
       this.api.on('shutdown', this.pluginShutdown.bind(this))
@@ -445,7 +456,7 @@ class eWeLinkPlatform {
     try {
       // If the user has disabled the plugin then remove all accessories
       if (this.config.disablePlugin) {
-        this.devicesInHB.forEach(accessory => {
+        devicesInHB.forEach(accessory => {
           this.removeAccessory(accessory)
         })
         throw new Error(this.lang.disabled)
@@ -454,20 +465,10 @@ class eWeLinkPlatform {
       // Log that the plugin initialisation has been successful
       this.log('[v%s] %s.', PLUGIN.version, this.lang.initialised)
 
-      // Require any libraries that the plugin uses
-      this.axios = require('axios')
-      this.crypto = require('crypto')
+      // Require any libraries that the accessory instances use
       this.colourUtils = require('./utils/colour-utils')
       this.eveService = require('./fakegato/fakegato-history')(this.api)
       this.eveChar = new (require('./utils/eve-chars'))(this.api)
-      const { default: PQueue } = require('p-queue')
-
-      // Create the queue used for sending device updates
-      this.queue = new PQueue({
-        interval: 250,
-        intervalCap: 1,
-        timeout: 10000
-      })
 
       // Check to see if the user has encoded their password
       if (this.config.encodedPassword) {
@@ -476,54 +477,54 @@ class eWeLinkPlatform {
       }
 
       // Set up the HTTP client, get the user HTTP host, and login
-      this.httpClient = new (require('./connection/http'))(this)
-      const authData = await this.httpClient.login()
+      httpClient = new (require('./connection/http'))(this)
+      const authData = await httpClient.login()
 
       // Get a device list and add to the devicesInEW map
-      const deviceList = await this.httpClient.getDevices()
+      const deviceList = await httpClient.getDevices()
       deviceList.forEach(device => {
-        this.devicesInEW.set(device.deviceid, device)
+        devicesInEW.set(device.deviceid, device)
       })
 
       // Set up the WS client, get the user WS host, and login
       if (this.config.mode !== 'lan') {
-        this.wsClient = new (require('./connection/ws'))(this, authData)
-        await this.wsClient.login()
+        wsClient = new (require('./connection/ws'))(this, authData)
+        await wsClient.login()
       }
 
       // Set up the LAN client, scan for devices and start monitoring
       if (this.config.mode !== 'wan') {
-        this.lanClient = new (require('./connection/lan'))(this, deviceList)
-        this.lanDevices = await this.lanClient.getHosts()
-        await this.lanClient.startMonitor()
+        lanClient = new (require('./connection/lan'))(this, deviceList)
+        lanDevices = await lanClient.getHosts()
+        await lanClient.startMonitor()
       }
 
       // Remove HB accessories that are no longer in eWeLink account
-      this.devicesInHB.forEach(accessory => {
-        if (!this.devicesInEW.has(accessory.context.eweDeviceId)) {
+      devicesInHB.forEach(accessory => {
+        if (!devicesInEW.has(accessory.context.eweDeviceId)) {
           this.removeAccessory(accessory)
         }
       })
 
       // Initialise each device into HB
-      this.devicesInEW.forEach(device => this.initialiseDevice(device))
+      devicesInEW.forEach(device => this.initialiseDevice(device))
 
       // Set up the WS and LAN listener for device updates
-      if (this.wsClient) {
-        this.wsClient.receiveUpdate(device => this.receiveDeviceUpdate(device))
+      if (wsClient) {
+        wsClient.receiveUpdate(device => this.receiveDeviceUpdate(device))
       }
-      if (this.lanClient) {
-        this.lanClient.receiveUpdate(device => this.receiveDeviceUpdate(device))
+      if (lanClient) {
+        lanClient.receiveUpdate(device => this.receiveDeviceUpdate(device))
       }
 
       // Refresh the WS connection every 60 minutes
-      if (this.wsClient) {
+      if (wsClient) {
         this.wsRefresh = setInterval(async () => {
           try {
             if (this.config.debug) {
               this.log('%s.', this.lang.wsRef)
             }
-            await this.wsClient.login()
+            await wsClient.login()
           } catch (e) {
             const eText = this.funcs.parseError(e)
             this.log.warn('%s %s.', this.lang.wsRefFail, eText)
@@ -551,14 +552,14 @@ class eWeLinkPlatform {
     // A function that is called when the plugin fails to load or Homebridge restarts
     try {
       // Stop the LAN monitoring
-      if (this.lanClient) {
-        this.lanClient.closeConnection()
+      if (lanClient) {
+        lanClient.closeConnection()
       }
 
       // Close the WS connection
-      if (this.wsClient) {
+      if (wsClient) {
         clearInterval(this.wsRefresh)
-        this.wsClient.closeConnection()
+        wsClient.closeConnection()
       }
     } catch (err) {
       // No need to show errors at this point
@@ -578,8 +579,8 @@ class eWeLinkPlatform {
       ) {
         for (let i = 0; i <= 4; i++) {
           const uuidsub = this.api.hap.uuid.generate(device.deviceid + 'SW' + i)
-          if (this.devicesInHB.has(uuidsub)) {
-            this.removeAccessory(this.devicesInHB.get(uuidsub))
+          if (devicesInHB.has(uuidsub)) {
+            this.removeAccessory(devicesInHB.get(uuidsub))
           }
         }
       }
@@ -589,8 +590,8 @@ class eWeLinkPlatform {
         /***********************
         BLINDS [EWELINK UIID 11]
         ***********************/
-        accessory = this.devicesInHB.has(uuid)
-          ? this.devicesInHB.get(uuid)
+        accessory = devicesInHB.has(uuid)
+          ? devicesInHB.get(uuid)
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/curtain'))(this, accessory)
         /**********************/
@@ -601,8 +602,8 @@ class eWeLinkPlatform {
         /*************************
         BLINDS [DUALR3 MOTOR MODE]
         *************************/
-        accessory = this.devicesInHB.has(uuid)
-          ? this.devicesInHB.get(uuid)
+        accessory = devicesInHB.has(uuid)
+          ? devicesInHB.get(uuid)
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/motor'))(this, accessory)
         /************************/
@@ -613,8 +614,8 @@ class eWeLinkPlatform {
         /****************************
         BLINDS [ACCESSORY SIMULATION]
         ****************************/
-        accessory = this.devicesInHB.has(uuid)
-          ? this.devicesInHB.get(uuid)
+        accessory = devicesInHB.has(uuid)
+          ? devicesInHB.get(uuid)
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/simulation/blind'))(this, accessory)
         /***************************/
@@ -625,8 +626,8 @@ class eWeLinkPlatform {
         /***************************
         DOORS [ACCESSORY SIMULATION]
         ***************************/
-        accessory = this.devicesInHB.has(uuid)
-          ? this.devicesInHB.get(uuid)
+        accessory = devicesInHB.has(uuid)
+          ? devicesInHB.get(uuid)
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/simulation/door'))(this, accessory)
         /**************************/
@@ -637,8 +638,8 @@ class eWeLinkPlatform {
         /*****************************
         WINDOWS [ACCESSORY SIMULATION]
         *****************************/
-        accessory = this.devicesInHB.has(uuid)
-          ? this.devicesInHB.get(uuid)
+        accessory = devicesInHB.has(uuid)
+          ? devicesInHB.get(uuid)
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/simulation/window'))(this, accessory)
         /****************************/
@@ -658,8 +659,8 @@ class eWeLinkPlatform {
         GARAGE DOORS [ONE] [ACCESSORY SIMULATION]
         ****************************************/
         const instance = './device/simulation/garage-one'
-        accessory = this.devicesInHB.has(uuid)
-          ? this.devicesInHB.get(uuid)
+        accessory = devicesInHB.has(uuid)
+          ? devicesInHB.get(uuid)
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require(instance))(this, accessory)
         /***************************************/
@@ -671,8 +672,8 @@ class eWeLinkPlatform {
         GARAGE DOORS [TWO] [ACCESSORY SIMULATION]
         ****************************************/
         const instance = './device/simulation/garage-two'
-        accessory = this.devicesInHB.has(uuid)
-          ? this.devicesInHB.get(uuid)
+        accessory = devicesInHB.has(uuid)
+          ? devicesInHB.get(uuid)
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require(instance))(this, accessory)
         /***************************************/
@@ -684,8 +685,8 @@ class eWeLinkPlatform {
         GARAGE DOORS [FOUR] [ACCESSORY SIMULATION]
         *****************************************/
         const instance = './device/simulation/garage-four'
-        accessory = this.devicesInHB.has(uuid)
-          ? this.devicesInHB.get(uuid)
+        accessory = devicesInHB.has(uuid)
+          ? devicesInHB.get(uuid)
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require(instance))(this, accessory)
         /****************************************/
@@ -697,8 +698,8 @@ class eWeLinkPlatform {
         GARAGE DOORS [EACHEN GD-DC5]
         ***************************/
         const instance = './device/simulation/garage-eachen'
-        accessory = this.devicesInHB.has(uuid)
-          ? this.devicesInHB.get(uuid)
+        accessory = devicesInHB.has(uuid)
+          ? devicesInHB.get(uuid)
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require(instance))(this, accessory)
         /**************************/
@@ -709,8 +710,8 @@ class eWeLinkPlatform {
         /***************************
         LOCKS [ACCESSORY SIMULATION]
         ***************************/
-        accessory = this.devicesInHB.has(uuid)
-          ? this.devicesInHB.get(uuid)
+        accessory = devicesInHB.has(uuid)
+          ? devicesInHB.get(uuid)
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/simulation/lock-one'))(this, accessory)
         /**************************/
@@ -722,8 +723,8 @@ class eWeLinkPlatform {
         SWITCH-VALVE [ACCESSORY SIMULATION]
         **********************************/
         const instance = './device/simulation/switch-valve'
-        accessory = this.devicesInHB.has(uuid)
-          ? this.devicesInHB.get(uuid)
+        accessory = devicesInHB.has(uuid)
+          ? devicesInHB.get(uuid)
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require(instance))(this, accessory)
         /*********************************/
@@ -734,8 +735,8 @@ class eWeLinkPlatform {
         /********************************
         TAPS [ONE] [ACCESSORY SIMULATION]
         ********************************/
-        accessory = this.devicesInHB.has(uuid)
-          ? this.devicesInHB.get(uuid)
+        accessory = devicesInHB.has(uuid)
+          ? devicesInHB.get(uuid)
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/simulation/tap-one'))(this, accessory)
         /*******************************/
@@ -746,8 +747,8 @@ class eWeLinkPlatform {
         /********************************
         TAPS [TWO] [ACCESSORY SIMULATION]
         ********************************/
-        accessory = this.devicesInHB.has(uuid)
-          ? this.devicesInHB.get(uuid)
+        accessory = devicesInHB.has(uuid)
+          ? devicesInHB.get(uuid)
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/simulation/tap-two'))(this, accessory)
         /*******************************/
@@ -759,8 +760,8 @@ class eWeLinkPlatform {
         VALVES [ONE] [ACCESSORY SIMULATION]
         **********************************/
         const instance = './device/simulation/valve-one'
-        accessory = this.devicesInHB.has(uuid)
-          ? this.devicesInHB.get(uuid)
+        accessory = devicesInHB.has(uuid)
+          ? devicesInHB.get(uuid)
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require(instance))(this, accessory)
         /*********************************/
@@ -772,8 +773,8 @@ class eWeLinkPlatform {
         VALVES [TWO] [ACCESSORY SIMULATION]
         **********************************/
         const instance = './device/simulation/valve-two'
-        accessory = this.devicesInHB.has(uuid)
-          ? this.devicesInHB.get(uuid)
+        accessory = devicesInHB.has(uuid)
+          ? devicesInHB.get(uuid)
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require(instance))(this, accessory)
         /*********************************/
@@ -785,8 +786,8 @@ class eWeLinkPlatform {
         VALVES [FOUR] [ACCESSORY SIMULATION]
         ***********************************/
         const instance = './device/simulation/valve-four'
-        accessory = this.devicesInHB.has(uuid)
-          ? this.devicesInHB.get(uuid)
+        accessory = devicesInHB.has(uuid)
+          ? devicesInHB.get(uuid)
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require(instance))(this, accessory)
         /**********************************/
@@ -799,8 +800,8 @@ class eWeLinkPlatform {
         SENSORS [LEAK DW2 ACCESSORY SIMULATION]
         **************************************/
         const instance = './device/simulation/sensor-leak'
-        accessory = this.devicesInHB.has(uuid)
-          ? this.devicesInHB.get(uuid)
+        accessory = devicesInHB.has(uuid)
+          ? devicesInHB.get(uuid)
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require(instance))(this, accessory)
         /*************************************/
@@ -808,17 +809,18 @@ class eWeLinkPlatform {
         /*******************
         SENSORS [SONOFF DW2]
         *******************/
-        accessory = this.devicesInHB.has(uuid)
-          ? this.devicesInHB.get(uuid)
+        const instance = './device/sensor-contact'
+        accessory = devicesInHB.has(uuid)
+          ? devicesInHB.get(uuid)
           : this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require('./device/sensor-contact'))(this, accessory)
+        accessory.control = new (require(instance))(this, accessory, devicesInHB)
         /******************/
       } else if (this.consts.devices.fan.includes(uiid)) {
         /***
         FANS
         ***/
-        accessory = this.devicesInHB.has(uuid)
-          ? this.devicesInHB.get(uuid)
+        accessory = devicesInHB.has(uuid)
+          ? devicesInHB.get(uuid)
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/fan'))(this, accessory)
         /**/
@@ -826,8 +828,8 @@ class eWeLinkPlatform {
         /********
         DIFFUSERS
         ********/
-        accessory = this.devicesInHB.has(uuid)
-          ? this.devicesInHB.get(uuid)
+        accessory = devicesInHB.has(uuid)
+          ? devicesInHB.get(uuid)
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/diffuser'))(this, accessory)
         /*******/
@@ -835,8 +837,8 @@ class eWeLinkPlatform {
         /**********
         HUMIDIFIERS
         **********/
-        accessory = this.devicesInHB.has(uuid)
-          ? this.devicesInHB.get(uuid)
+        accessory = devicesInHB.has(uuid)
+          ? devicesInHB.get(uuid)
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/humidifier'))(this, accessory)
         /*********/
@@ -844,8 +846,8 @@ class eWeLinkPlatform {
         /**********
         THERMOSTATS
         **********/
-        accessory = this.devicesInHB.has(uuid)
-          ? this.devicesInHB.get(uuid)
+        accessory = devicesInHB.has(uuid)
+          ? devicesInHB.get(uuid)
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/thermostat'))(this, accessory)
         /*******/
@@ -858,8 +860,8 @@ class eWeLinkPlatform {
         THERMOSTATS [ACCESSORY SIMULATION]
         *********************************/
         const instance = './device/simulation/thermostat'
-        accessory = this.devicesInHB.has(uuid)
-          ? this.devicesInHB.get(uuid)
+        accessory = devicesInHB.has(uuid)
+          ? devicesInHB.get(uuid)
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require(instance))(this, accessory)
         /********************************/
@@ -867,8 +869,8 @@ class eWeLinkPlatform {
         /***********************
         SENSOR [AMBIENT-TH10/16]
         ***********************/
-        accessory = this.devicesInHB.has(uuid)
-          ? this.devicesInHB.get(uuid)
+        accessory = devicesInHB.has(uuid)
+          ? devicesInHB.get(uuid)
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.context.sensorType = device.params.sensorType
         accessory.control = new (require('./device/sensor-ambient'))(this, accessory)
@@ -877,8 +879,8 @@ class eWeLinkPlatform {
         /*************************
         SENSOR [AMBIENT-SONOFF SC]
         *************************/
-        accessory = this.devicesInHB.has(uuid)
-          ? this.devicesInHB.get(uuid)
+        accessory = devicesInHB.has(uuid)
+          ? devicesInHB.get(uuid)
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/sensor-temp-humi'))(this, accessory)
         /************************/
@@ -892,8 +894,8 @@ class eWeLinkPlatform {
         /******
         OUTLETS
         ******/
-        accessory = this.devicesInHB.has(uuid)
-          ? this.devicesInHB.get(uuid)
+        accessory = devicesInHB.has(uuid)
+          ? devicesInHB.get(uuid)
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = this.outletDevices[device.deviceid] &&
           this.outletDevices[device.deviceid].showAsSwitch
@@ -904,8 +906,8 @@ class eWeLinkPlatform {
         /*************************************
         OUTLETS [SINGLE BUT MULTIPLE HARDWARE]
         *************************************/
-        accessory = this.devicesInHB.has(uuid)
-          ? this.devicesInHB.get(uuid)
+        accessory = devicesInHB.has(uuid)
+          ? devicesInHB.get(uuid)
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/outlet-scm'))(this, accessory)
         /************************************/
@@ -913,8 +915,8 @@ class eWeLinkPlatform {
         /***********
         LIGHTS [RGB]
         ***********/
-        accessory = this.devicesInHB.has(uuid)
-          ? this.devicesInHB.get(uuid)
+        accessory = devicesInHB.has(uuid)
+          ? devicesInHB.get(uuid)
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/light-rgb'))(this, accessory)
         /**********/
@@ -922,8 +924,8 @@ class eWeLinkPlatform {
         /***********
         LIGHTS [CCT]
         ***********/
-        accessory = this.devicesInHB.has(uuid)
-          ? this.devicesInHB.get(uuid)
+        accessory = devicesInHB.has(uuid)
+          ? devicesInHB.get(uuid)
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/light-cct'))(this, accessory)
         /**********/
@@ -931,8 +933,8 @@ class eWeLinkPlatform {
         /*****************
         LIGHTS [RGB & CCT]
         *****************/
-        accessory = this.devicesInHB.has(uuid)
-          ? this.devicesInHB.get(uuid)
+        accessory = devicesInHB.has(uuid)
+          ? devicesInHB.get(uuid)
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/light-rgb-cct'))(this, accessory)
         /****************/
@@ -940,8 +942,8 @@ class eWeLinkPlatform {
         /**************
         LIGHTS [DIMMER]
         **************/
-        accessory = this.devicesInHB.has(uuid)
-          ? this.devicesInHB.get(uuid)
+        accessory = devicesInHB.has(uuid)
+          ? devicesInHB.get(uuid)
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/light-dimmer'))(this, accessory)
         /*************/
@@ -949,8 +951,8 @@ class eWeLinkPlatform {
         /************************
         SWITCHES [SINGLE CHANNEL]
         ************************/
-        accessory = this.devicesInHB.has(uuid)
-          ? this.devicesInHB.get(uuid)
+        accessory = devicesInHB.has(uuid)
+          ? devicesInHB.get(uuid)
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = this.singleDevices[device.deviceid] &&
           this.singleDevices[device.deviceid].showAsOutlet
@@ -971,8 +973,8 @@ class eWeLinkPlatform {
           // Check if the user has chosen to hide any channels for this device
           if (this.hideChannels.includes(device.deviceid + 'SW' + i)) {
             // The user has hidden this channel so if it exists then remove it
-            if (this.devicesInHB.has(uuidsub)) {
-              this.removeAccessory(this.devicesInHB.get(uuidsub))
+            if (devicesInHB.has(uuidsub)) {
+              this.removeAccessory(devicesInHB.get(uuidsub))
             }
 
             // If this is the main channel then add it to the array of hidden masters
@@ -984,39 +986,39 @@ class eWeLinkPlatform {
             subAccessory = this.addAccessory(device, device.deviceid + 'SW' + i, true)
           } else {
             // The user has not hidden this channel
-            subAccessory = this.devicesInHB.has(uuidsub)
-              ? this.devicesInHB.get(uuidsub)
+            subAccessory = devicesInHB.has(uuidsub)
+              ? devicesInHB.get(uuidsub)
               : this.addAccessory(device, device.deviceid + 'SW' + i)
           }
 
           // Add context information to the sub accessory
           subAccessory.context.firmware = device.params.fwVersion || PLUGIN.version
           subAccessory.context.reachableWAN = device.online
-          subAccessory.context.reachableLAN = this.lanClient &&
-            this.lanDevices.has(device.deviceid)
-            ? this.lanDevices.get(device.deviceid).ip
+          subAccessory.context.reachableLAN = lanClient &&
+            lanDevices.has(device.deviceid)
+            ? lanDevices.get(device.deviceid).ip
             : false
           subAccessory.context.eweBrandName = device.brandName
           subAccessory.context.eweBrandLogo = device.brandLogo
           subAccessory.context.eweShared = device.sharedBy && device.sharedBy.email
             ? device.sharedBy.email
             : false
-          subAccessory.context.ip = this.lanClient && subAccessory.context.reachableLAN
-            ? this.lanDevices.get(device.deviceid).ip
+          subAccessory.context.ip = lanClient && subAccessory.context.reachableLAN
+            ? lanDevices.get(device.deviceid).ip
             : false
           subAccessory.control = this.consts.devices.doubleSwitch.includes(uiid)
             ? this.multiDevices[device.deviceid] &&
               this.multiDevices[device.deviceid].showAsOutlet
-              ? new (require('./device/outlet-double'))(this, subAccessory)
-              : new (require('./device/switch-double'))(this, subAccessory)
+              ? new (require('./device/outlet-double'))(this, subAccessory, devicesInHB)
+              : new (require('./device/switch-double'))(this, subAccessory, devicesInHB)
             : this.multiDevices[device.deviceid] &&
               this.multiDevices[device.deviceid].showAsOutlet
-              ? new (require('./device/outlet-multi'))(this, subAccessory)
-              : new (require('./device/switch-multi'))(this, subAccessory)
+              ? new (require('./device/outlet-multi'))(this, subAccessory, devicesInHB)
+              : new (require('./device/switch-multi'))(this, subAccessory, devicesInHB)
 
           // Update any changes to the sub accessory to the platform
           this.api.updatePlatformAccessories(PLUGIN.name, PLUGIN.alias, [subAccessory])
-          this.devicesInHB.set(subAccessory.UUID, subAccessory)
+          devicesInHB.set(subAccessory.UUID, subAccessory)
           if (i === 0) {
             accessory = subAccessory
           }
@@ -1042,7 +1044,8 @@ class eWeLinkPlatform {
         accessory = this.addAccessory(
           device, device.deviceid + 'SW0', true, { rfMap }, 'rf_pri'
         )
-        accessory.control = new (require('./device/rf-bridge'))(this, accessory)
+        const instance = './device/rf-bridge'
+        accessory.control = new (require(instance))(this, accessory, devicesInHB)
 
         // We don't want to add the main bridge as an accessory in Homebridge
         this.hideMasters.push(device.deviceid)
@@ -1107,7 +1110,7 @@ class eWeLinkPlatform {
           }
 
           // Check if the sub accessory already exists in Homebridge
-          if ((subAccessory = this.devicesInHB.get(uuidsub))) {
+          if ((subAccessory = devicesInHB.get(uuidsub))) {
             // Check for any changes to user config or types
             if (
               subAccessory.context.subType !== subType ||
@@ -1123,8 +1126,8 @@ class eWeLinkPlatform {
 
           // Get the sub accessory if it's new or hasn't been removed above
 
-          subAccessory = this.devicesInHB.has(uuidsub)
-            ? this.devicesInHB.get(uuidsub)
+          subAccessory = devicesInHB.has(uuidsub)
+            ? devicesInHB.get(uuidsub)
             : this.addAccessory(device, fullDeviceId, false, subExtraContext, 'rf_sub')
 
           // Add context information to the sub accessory
@@ -1136,14 +1139,15 @@ class eWeLinkPlatform {
           subAccessory.context.eweShared = device.sharedBy && device.sharedBy.email
             ? device.sharedBy.email
             : false
-          subAccessory.context.ip = this.lanClient && subAccessory.context.reachableLAN
-            ? this.lanDevices.get(device.deviceid).ip
+          subAccessory.context.ip = lanClient && subAccessory.context.reachableLAN
+            ? lanDevices.get(device.deviceid).ip
             : false
 
           // Update any changes to the sub accessory to the platform
           this.api.updatePlatformAccessories(PLUGIN.name, PLUGIN.alias, [subAccessory])
-          this.devicesInHB.set(subAccessory.UUID, subAccessory)
-          subAccessory.control = new (require('./device/rf-bridge'))(this, subAccessory)
+          devicesInHB.set(subAccessory.UUID, subAccessory)
+          const instance = './device/rf-bridge'
+          subAccessory.control = new (require(instance))(this, subAccessory, devicesInHB)
           rfChlCounter += Object.keys(subDevice.buttons || {}).length
         })
 
@@ -1161,8 +1165,8 @@ class eWeLinkPlatform {
         ZIGBEE STATELESS SWITCH
         **********************/
         const instance = './device/zigbee/switch-stateless'
-        accessory = this.devicesInHB.has(uuid)
-          ? this.devicesInHB.get(uuid)
+        accessory = devicesInHB.has(uuid)
+          ? devicesInHB.get(uuid)
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require(instance))(this, accessory)
         /*********************/
@@ -1171,8 +1175,8 @@ class eWeLinkPlatform {
         ZB SINGLE SWITCH
         ***************/
         const instance = './device/zigbee/switch-single'
-        accessory = this.devicesInHB.has(uuid)
-          ? this.devicesInHB.get(uuid)
+        accessory = devicesInHB.has(uuid)
+          ? devicesInHB.get(uuid)
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require(instance))(this, accessory)
         /**************/
@@ -1180,8 +1184,8 @@ class eWeLinkPlatform {
         /*****************
         ZB LIGHTS [DIMMER]
         *****************/
-        accessory = this.devicesInHB.has(uuid)
-          ? this.devicesInHB.get(uuid)
+        accessory = devicesInHB.has(uuid)
+          ? devicesInHB.get(uuid)
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/zigbee/light-dimmer'))(this, accessory)
         /****************/
@@ -1189,8 +1193,8 @@ class eWeLinkPlatform {
         /**************
         ZB LIGHTS [CCT]
         **************/
-        accessory = this.devicesInHB.has(uuid)
-          ? this.devicesInHB.get(uuid)
+        accessory = devicesInHB.has(uuid)
+          ? devicesInHB.get(uuid)
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/zigbee/light-cct'))(this, accessory)
         /*************/
@@ -1199,8 +1203,8 @@ class eWeLinkPlatform {
         ZB SENSOR [AMBIENT]
         ******************/
         const instance = './device/zigbee/sensor-ambient'
-        accessory = this.devicesInHB.has(uuid)
-          ? this.devicesInHB.get(uuid)
+        accessory = devicesInHB.has(uuid)
+          ? devicesInHB.get(uuid)
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require(instance))(this, accessory)
         /*****************/
@@ -1209,8 +1213,8 @@ class eWeLinkPlatform {
         ZB SENSOR [MOTION]
         *****************/
         const instance = './device/zigbee/sensor-motion'
-        accessory = this.devicesInHB.has(uuid)
-          ? this.devicesInHB.get(uuid)
+        accessory = devicesInHB.has(uuid)
+          ? devicesInHB.get(uuid)
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require(instance))(this, accessory)
         /****************/
@@ -1219,8 +1223,8 @@ class eWeLinkPlatform {
         ZB SENSOR [CONTACT]
         ******************/
         const instance = './device/zigbee/sensor-contact'
-        accessory = this.devicesInHB.has(uuid)
-          ? this.devicesInHB.get(uuid)
+        accessory = devicesInHB.has(uuid)
+          ? devicesInHB.get(uuid)
           : this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require(instance))(this, accessory)
         /*****************/
@@ -1251,28 +1255,28 @@ class eWeLinkPlatform {
       // Update the reachability values (via WS and LAN)
       accessory.context.firmware = device.params.fwVersion || PLUGIN.version
       accessory.context.reachableWAN = device.online
-      accessory.context.reachableLAN = this.lanClient &&
-        this.lanDevices.has(device.deviceid)
-        ? this.lanDevices.get(device.deviceid).ip
+      accessory.context.reachableLAN = lanClient &&
+        lanDevices.has(device.deviceid)
+        ? lanDevices.get(device.deviceid).ip
         : false
       accessory.context.eweBrandName = device.brandName
       accessory.context.eweBrandLogo = device.brandLogo
       accessory.context.eweShared = device.sharedBy && device.sharedBy.email
         ? device.sharedBy.email
         : false
-      accessory.context.ip = this.lanClient && accessory.context.reachableLAN
-        ? this.lanDevices.get(device.deviceid).ip
+      accessory.context.ip = lanClient && accessory.context.reachableLAN
+        ? lanDevices.get(device.deviceid).ip
         : false
 
       // Helpful logging for each device
       const str = accessory.context.reachableLAN
-        ? this.lang.foundWithIP + ' [' + this.lanDevices.get(device.deviceid).ip + ']'
+        ? this.lang.foundWithIP + ' [' + lanDevices.get(device.deviceid).ip + ']'
         : this.consts.devices.lanIn.includes(uiid)
           ? this.lang.lanUnreachable
           : this.lang.lanUnsupported
 
       // Update accessory characteristics with latest values
-      if (this.wsClient && accessory.control && accessory.control.externalUpdate) {
+      if (wsClient && accessory.control && accessory.control.externalUpdate) {
         accessory.control.externalUpdate(device.params)
 
         // Mark the online/offline status of certain devices
@@ -1283,7 +1287,7 @@ class eWeLinkPlatform {
 
       // Update any changes to the device into our devicesInHB map
       this.api.updatePlatformAccessories(PLUGIN.name, PLUGIN.alias, [accessory])
-      this.devicesInHB.set(accessory.UUID, accessory)
+      devicesInHB.set(accessory.UUID, accessory)
       this.log('[%s] %s %s.', device.name, this.lang.devInit, str)
       if (
         this.config.mode === 'lan' &&
@@ -1408,7 +1412,7 @@ class eWeLinkPlatform {
       }
 
       // Add the configured accessory to our global map
-      this.devicesInHB.set(accessory.UUID, accessory)
+      devicesInHB.set(accessory.UUID, accessory)
     } catch (err) {
       // Catch any errors during retrieve
       const eText = this.funcs.parseError(err)
@@ -1420,7 +1424,7 @@ class eWeLinkPlatform {
     try {
       // Remove an accessory from Homebridge
       this.api.unregisterPlatformAccessories(PLUGIN.name, PLUGIN.alias, [accessory])
-      this.devicesInHB.delete(accessory.UUID)
+      devicesInHB.delete(accessory.UUID)
       this.log('[%s] %s.', accessory.displayName, this.lang.devRemove)
     } catch (err) {
       // Catch any errors during remove
@@ -1431,7 +1435,7 @@ class eWeLinkPlatform {
 
   async sendDeviceUpdate (accessory, params, useWS) {
     // Add to a queue so multiple updates are at least 500ms apart
-    return await this.queue.add(async () => {
+    return await queue.add(async () => {
     // Log the update being sent
       if (this.config.debug) {
         this.log(
@@ -1452,16 +1456,16 @@ class eWeLinkPlatform {
       // Check if we can send via LAN otherwise send via WS
       const res = useWS
         ? this.lang.wsRequired
-        : !this.lanClient
+        : !lanClient
           ? this.lang.lanDisabled
           : !this.consts.devices.lanOut.includes(accessory.context.eweUIID)
             ? this.lang.lanNotSup
-            : await this.lanClient.sendUpdate(payload)
+            : await lanClient.sendUpdate(payload)
 
       // Revert to WS if LAN mode not possible for whatever reason
       if (res !== 'ok') {
         // Check to see if the device is online
-        if (this.wsClient) {
+        if (wsClient) {
           // Log the revert if appropriate
           if (this.config.debug) {
             this.log('[%s] %s %s.', accessory.displayName, this.lang.revertWS, res)
@@ -1470,7 +1474,7 @@ class eWeLinkPlatform {
           // Attempt the update
           if (accessory.context.reachableWAN) {
             // Device is online via WS so send the update
-            await this.wsClient.sendUpdate(payload)
+            await wsClient.sendUpdate(payload)
           } else {
             // Device appears to be offline
             throw new Error(this.lang.unreachable)
@@ -1494,7 +1498,7 @@ class eWeLinkPlatform {
     // Find our accessory for which the updates relates to
     const uuid1 = this.api.hap.uuid.generate(deviceId + 'SWX')
     const uuid2 = this.api.hap.uuid.generate(deviceId + 'SW0')
-    if ((accessory = this.devicesInHB.get(uuid1) || this.devicesInHB.get(uuid2))) {
+    if ((accessory = devicesInHB.get(uuid1) || devicesInHB.get(uuid2))) {
       if (this.config.debug) {
         this.log(
           '[%s] %s %s.',
@@ -1508,7 +1512,7 @@ class eWeLinkPlatform {
         if (device.params.online !== accessory.context.reachableWAN) {
           accessory.context.reachableWAN = device.params.online
           this.api.updatePlatformAccessories(PLUGIN.name, PLUGIN.alias, [accessory])
-          this.devicesInHB.set(accessory.UUID, accessory)
+          devicesInHB.set(accessory.UUID, accessory)
 
           // Flag this true to update the sub accessories later
           reachableChange = true
@@ -1525,9 +1529,9 @@ class eWeLinkPlatform {
           }
 
           // Try and request an update through WS if the device has come back online
-          if (accessory.context.reachableWAN && this.wsClient) {
+          if (accessory.context.reachableWAN && wsClient) {
             try {
-              this.wsClient.requestUpdate(accessory)
+              wsClient.requestUpdate(accessory)
             } catch (err) {
               // Suppress any errors here
             }
@@ -1538,7 +1542,7 @@ class eWeLinkPlatform {
         // The update is from LAN so it must be online
         accessory.context.reachableLAN = true
         this.api.updatePlatformAccessories(PLUGIN.name, PLUGIN.alias, [accessory])
-        this.devicesInHB.set(accessory.UUID, accessory)
+        devicesInHB.set(accessory.UUID, accessory)
 
         // Flag this true to update the sub accessories later
         reachableChange = true
@@ -1552,9 +1556,9 @@ class eWeLinkPlatform {
         )
 
         // Try and request an update through WS if the device has come back online
-        if (accessory.context.reachableWAN && this.wsClient) {
+        if (accessory.context.reachableWAN && wsClient) {
           try {
-            this.wsClient.requestUpdate(accessory)
+            wsClient.requestUpdate(accessory)
           } catch (err) {
             // Suppress any errors here
           }
@@ -1566,9 +1570,9 @@ class eWeLinkPlatform {
         // Loop through to see which channels are in HB
         for (let i = 1; i <= accessory.context.channelCount; i++) {
           const uuid = this.api.hap.uuid.generate(deviceId + 'SW' + i)
-          if (this.devicesInHB.has(uuid)) {
+          if (devicesInHB.has(uuid)) {
             // Find the sub accessory
-            const subAccessory = this.devicesInHB.get(uuid)
+            const subAccessory = devicesInHB.get(uuid)
 
             // Update the WAN status
             subAccessory.context.reachableWAN = device.params.online
@@ -1580,7 +1584,7 @@ class eWeLinkPlatform {
 
             // Save the sub accessory updates to the platform
             this.api.updatePlatformAccessories(PLUGIN.name, PLUGIN.alias, [subAccessory])
-            this.devicesInHB.set(subAccessory.UUID, subAccessory)
+            devicesInHB.set(subAccessory.UUID, subAccessory)
           }
         }
       }
@@ -1612,14 +1616,14 @@ class eWeLinkPlatform {
         }
 
         // Obtain full device information from the HTTP API
-        const newDevice = await this.httpClient.getDevice(deviceId)
+        const newDevice = await httpClient.getDevice(deviceId)
 
         // Initialise the device in HB
         this.initialiseDevice(newDevice)
 
         // Add the device to the LAN client map
-        if (this.lanClient && this.consts.devices.lanIn.includes(newDevice.extra.uiid)) {
-          this.lanClient.addDeviceToMap(newDevice)
+        if (lanClient && this.consts.devices.lanIn.includes(newDevice.extra.uiid)) {
+          lanClient.addDeviceToMap(newDevice)
         }
       } catch (err) {
         // Automatically adding the new device failed for some reason
@@ -1635,9 +1639,9 @@ class eWeLinkPlatform {
     this.log.warn('[%s] %s %s.', accessory.displayName, this.lang.devNotUpd, eText)
 
     // We only request a device refresh on failed internal updates
-    if (requestRefresh && accessory.context.reachableWAN && this.wsClient) {
+    if (requestRefresh && accessory.context.reachableWAN && wsClient) {
       try {
-        await this.wsClient.requestUpdate(accessory)
+        await wsClient.requestUpdate(accessory)
       } catch (err) {
         // Suppress any errors at this point
       }
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 12f50705..9ff829c6 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -86,7 +86,7 @@ module.exports = {
     ],
     fanDevices: ['deviceId', 'label', 'hideLight', 'overrideDisabledLogging'],
     sensorDevices: [
-      'deviceId', 'lowBattThreshold', 'hideLongDouble', 'scaleBattery',
+      'deviceId', 'lowBattThreshold', 'offset', 'hideLongDouble', 'scaleBattery',
       'sensorTimeDifference', 'overrideDisabledLogging'
     ],
     groupTypes: [
@@ -137,7 +137,8 @@ module.exports = {
     zbSensorAmbient: [1770],
     zbSensorMotion: [2026],
     zbSensorContact: [3026],
-    cannotSupport: [0, 65, 118, 119, 120, 121]
+    cannotSupport: [0, 65, 118, 119, 120, 121],
+    garageSensors: [102, 3026]
   },
 
   paramsToKeep: [

From 897b4b077eacbebde0a79e2fcb0df11d63e6b5aa Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 4 May 2021 11:45:11 +0100
Subject: [PATCH 1992/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index eb667c4e..2dc773ff 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,13 +8,16 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 * Power, voltage and current readings for DUALR3 when exposed as outlets
 * RF Bridge remote buttons will turn on for 3 seconds in HomeKit when pressed
+* Link a Zigbee contact sensor to a single garage door to report the garage door state
+* Set a temperature offset for the Zigbee temperature/humidity sensor
+* Configuration options to manually set account http host and country code [#249](https://github.com/bwp91/homebridge-ewelink/pull/249)
 
 ### Changes
 
 * Change Sonoff POWR2/S31 polling interval to a fixed 60 seconds
 * iFan speed will now log as {low, medium, high}
 * More language strings added to separate language file
-* Backend function and variable name changes
+* Backend refactoring, function and variable name changes
 
 ## 6.3.0 (2021-04-28)
 

From 0c743ac98cfc7b59256f88c981207a9c3e50e104 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 4 May 2021 11:48:16 +0100
Subject: [PATCH 1993/3183] 6.4.0-beta.0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index f6eaeefb..b2e0bf63 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.3.1-beta.12",
+  "version": "6.4.0-beta.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index ec5ef4b9..55ba8246 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.3.1-beta.12",
+  "version": "6.4.0-beta.0",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From b98959914133bbce1bcf35176e5ef941f4dcc884 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 4 May 2021 11:49:48 +0100
Subject: [PATCH 1994/3183] pass devices to contact sensor

---
 lib/device/zigbee/sensor-contact.js | 4 +++-
 lib/index.js                        | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/device/zigbee/sensor-contact.js b/lib/device/zigbee/sensor-contact.js
index e3ac9310..b382cfcc 100644
--- a/lib/device/zigbee/sensor-contact.js
+++ b/lib/device/zigbee/sensor-contact.js
@@ -3,12 +3,14 @@
 'use strict'
 
 module.exports = class deviceZBSensorContact {
-  constructor (platform, accessory) {
+  constructor (platform, accessory, devicesInHB) {
     // Set up variables from the platform
+    this.devicesInHB = devicesInHB
     this.eveChar = platform.eveChar
     this.funcs = platform.funcs
     this.hapChar = platform.api.hap.Characteristic
     this.hapServ = platform.api.hap.Service
+    this.hapUUIDGen = platform.api.hap.uuid.generate
     this.lang = platform.lang
     this.log = platform.log
     this.platform = platform
diff --git a/lib/index.js b/lib/index.js
index 47352a37..dbb8b8fa 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1226,7 +1226,7 @@ class eWeLinkPlatform {
         accessory = devicesInHB.has(uuid)
           ? devicesInHB.get(uuid)
           : this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require(instance))(this, accessory)
+        accessory.control = new (require(instance))(this, accessory, devicesInHB)
         /*****************/
       } else if (this.consts.devices.camera.includes(uiid)) {
         /*************

From 87dd4b245e0649fe137669fd493fb765fc4e909f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 4 May 2021 11:50:17 +0100
Subject: [PATCH 1995/3183] 6.4.0-beta.1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b2e0bf63..d27947ea 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.4.0-beta.0",
+  "version": "6.4.0-beta.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 55ba8246..d1faf7c0 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.4.0-beta.0",
+  "version": "6.4.0-beta.1",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 74ff049cf80167363bbb7a45fe3a1fd4ac948a8c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 4 May 2021 11:53:29 +0100
Subject: [PATCH 1996/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2dc773ff..8223bdd9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,8 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 * Change Sonoff POWR2/S31 polling interval to a fixed 60 seconds
 * iFan speed will now log as {low, medium, high}
+* Remove 'Outlet In Use' characteristics for outlets that don't support power readings
+* Remove Eve power characteristics for outlets that don't support power readings
 * More language strings added to separate language file
 * Backend refactoring, function and variable name changes
 

From 994d2f4d1baaa6310afcec911cd50f361bfa3328 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 4 May 2021 12:18:39 +0100
Subject: [PATCH 1997/3183] add language config option

---
 lib/index.js           | 15 ++++++++++++++-
 lib/utils/constants.js | 19 +++++++++++--------
 2 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/lib/index.js b/lib/index.js
index dbb8b8fa..0a4a9d64 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -30,8 +30,13 @@ class eWeLinkPlatform {
 
     // Retrieve the necessary constants and functions before starting
     this.consts = require('./utils/constants')
-    this.lang = require('./utils/lang-en')
     this.funcs = require('./utils/functions')
+    const language = config && config.language &&
+      this.consts.allowed.languages.includes(config.language)
+      ? config.language
+      : this.consts.defaultValues.language
+    
+    this.lang = require('./utils/lang-' + language)
 
     // Begin plugin initialisation
     try {
@@ -420,6 +425,14 @@ class eWeLinkPlatform {
           }
           break
         }
+        case 'language': {
+          const inSet = this.consts.allowed.languages.includes(val)
+          if (typeof val !== 'string' || !inSet) {
+            logIgnore(key)
+          }
+          this.config.language = inSet ? val : this.consts.defaultValues[key]
+          break
+        }
         case 'mode': {
           const inSet = this.consts.allowed.modes.includes(val)
           if (typeof val !== 'string' || !inSet) {
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 9ff829c6..70a67358 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -7,9 +7,10 @@ module.exports = {
     name: 'eWeLink',
     username: '',
     password: '',
-    countryCode: '+44',
-    httpHost: 'eu-apia.coolkit.cc',
+    language: 'en',
     encodedPassword: false,
+    httpHost: 'eu-apia.coolkit.cc',
+    countryCode: '+44',
     mode: 'auto',
     disableDeviceLogging: false,
     debug: false,
@@ -29,6 +30,7 @@ module.exports = {
   },
 
   defaultValues: {
+    language: 'en',
     httpHost: 'eu-apia.coolkit.cc',
     inUsePowerThreshold: 0,
     lowBattThreshold: 25,
@@ -65,6 +67,12 @@ module.exports = {
   httpRetryCodes: ['ENOTFOUND', 'ETIMEDOUT', 'EAI_AGAIN'],
 
   allowed: {
+    languages: ['en'],
+    httpHosts: [
+      'auto', 'eu-apia.coolkit.cc', 'us-apia.coolkit.cc', 'as-apia.coolkit.cc',
+      'cn-apia.coolkit.cn'
+    ],
+    modes: ['auto', 'wan', 'lan'],
     singleDevices: [
       'deviceId', 'label', 'showAsOutlet', 'ipAddress', 'overrideDisabledLogging'
     ],
@@ -94,13 +102,8 @@ module.exports = {
       'sensor_leak', 'switch_valve', 'tap', 'tap_two', 'thermostat', 'valve', 'valve_two',
       'valve_four', 'window'
     ],
-    modes: ['auto', 'wan', 'lan'],
-    httpHosts: [
-      'auto', 'eu-apia.coolkit.cc', 'us-apia.coolkit.cc', 'as-apia.coolkit.cc',
-      'cn-apia.coolkit.cn'
-    ],
-    obstructs: ['garage', 'garage_eachen'],
     setups: ['oneSwitch', 'twoSwitch'],
+    obstructs: ['garage', 'garage_eachen'],
     sensors: ['water', 'smoke', 'co', 'co2', 'contact', 'occupancy', 'motion'],
     bulbModel: ['bulbB02BA60', 'bulbB02FA60', 'bulbB02FST64']
   },

From 48542ac9017b40b97653e798d7508a8714726999 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 4 May 2021 12:22:40 +0100
Subject: [PATCH 1998/3183] add lang option

---
 config.schema.json | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/config.schema.json b/config.schema.json
index 5d49f612..d9a59561 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -24,6 +24,17 @@
         "title": "Password",
         "required": true
       },
+      "language": {
+        "type": "string",
+        "title": "Language",
+        "description": "If you wish to see the plugin logging in your language and can help translate then let me know!",
+        "default": "en",
+        "oneOf": [{
+            "title": "English",
+            "enum": ["en"]
+          }
+        ]
+      },
       "encodedPassword": {
         "title": "Encoded Password",
         "type": "boolean",
@@ -712,6 +723,7 @@
       "title": "Optional Settings",
       "expandable": true,
       "items": [
+        "language",
         "encodedPassword",
         "httpHost",
         "countryCode",

From 4ab90b1afd40545cebe077b907750536cff32195 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 4 May 2021 12:25:36 +0100
Subject: [PATCH 1999/3183] formatting

---
 lib/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/index.js b/lib/index.js
index 0a4a9d64..87e672d0 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -35,7 +35,7 @@ class eWeLinkPlatform {
       this.consts.allowed.languages.includes(config.language)
       ? config.language
       : this.consts.defaultValues.language
-    
+
     this.lang = require('./utils/lang-' + language)
 
     // Begin plugin initialisation

From 3d9908445ec42cacfbe9c85eff1b06c66b7859b4 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 4 May 2021 12:26:23 +0100
Subject: [PATCH 2000/3183] 6.4.0-beta.2

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d27947ea..3daa1e81 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.4.0-beta.1",
+  "version": "6.4.0-beta.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index d1faf7c0..ab2f2f20 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.4.0-beta.1",
+  "version": "6.4.0-beta.2",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From db9e1a440718627f4c98d328c9e067bb201c970c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 4 May 2021 13:51:26 +0100
Subject: [PATCH 2001/3183] Update index.js

---
 lib/index.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/index.js b/lib/index.js
index 87e672d0..12380333 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -35,7 +35,6 @@ class eWeLinkPlatform {
       this.consts.allowed.languages.includes(config.language)
       ? config.language
       : this.consts.defaultValues.language
-
     this.lang = require('./utils/lang-' + language)
 
     // Begin plugin initialisation

From 61b3b9c64ef390f9f79f853cc92b1771975b28fb Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 4 May 2021 17:00:09 +0100
Subject: [PATCH 2002/3183] more edits

---
 lib/index.js | 256 ++++++++++++++++++++++-----------------------------
 1 file changed, 109 insertions(+), 147 deletions(-)

diff --git a/lib/index.js b/lib/index.js
index 12380333..74523bdf 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -2,8 +2,9 @@
 /* eslint-disable new-cap */
 'use strict'
 
+const { default: PQueue } = require('p-queue')
 const devicesInHB = new Map()
-const devicesInEW = new Map()
+
 let httpClient
 let lanClient
 let lanDevices
@@ -13,7 +14,6 @@ let wsClient
 const PLUGIN = require('./../package.json')
 
 // Create the queue used for sending device updates
-const { default: PQueue } = require('p-queue')
 const queue = new PQueue({
   interval: 250,
   intervalCap: 1,
@@ -28,25 +28,14 @@ class eWeLinkPlatform {
       return
     }
 
-    // Retrieve the necessary constants and functions before starting
-    this.consts = require('./utils/constants')
-    this.funcs = require('./utils/functions')
-    const language = config && config.language &&
-      this.consts.allowed.languages.includes(config.language)
-      ? config.language
-      : this.consts.defaultValues.language
-    this.lang = require('./utils/lang-' + language)
-
     // Begin plugin initialisation
     try {
-      // Check the user has configured the plugin
-      if (!config || !config.username || !config.password) {
-        throw new Error(this.lang.missingCreds)
-      }
-
-      // Initialise these variables before anything else
-      this.log = log
       this.api = api
+      this.consts = require('./utils/constants')
+      this.funcs = require('./utils/functions')
+      this.log = log
+
+      // Configuration objects for accessories
       this.fanDevices = {}
       this.lightDevices = {}
       this.multiDevices = {}
@@ -61,6 +50,18 @@ class eWeLinkPlatform {
       this.ipOverride = {}
       this.obstructSwitches = {}
 
+      // Retrieve the user's chosen language file
+      const language = config && config.language &&
+        this.consts.allowed.languages.includes(config.language)
+        ? config.language
+        : this.consts.defaultValues.language
+      this.lang = require('./utils/lang-' + language)
+
+      // Check the user has configured the plugin
+      if (!config || !config.username || !config.password) {
+        throw new Error(this.lang.missingCreds)
+      }
+
       // Apply the user's configuration
       this.config = this.consts.defaultConfig
       this.applyUserConfig(config)
@@ -494,6 +495,7 @@ class eWeLinkPlatform {
 
       // Get a device list and add to the devicesInEW map
       const deviceList = await httpClient.getDevices()
+      const devicesInEW = new Map()
       deviceList.forEach(device => {
         devicesInEW.set(device.deviceid, device)
       })
@@ -602,9 +604,8 @@ class eWeLinkPlatform {
         /***********************
         BLINDS [EWELINK UIID 11]
         ***********************/
-        accessory = devicesInHB.has(uuid)
-          ? devicesInHB.get(uuid)
-          : this.addAccessory(device, device.deviceid + 'SWX')
+        accessory = devicesInHB.get(uuid) ||
+          this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/curtain'))(this, accessory)
         /**********************/
       } else if (
@@ -614,9 +615,8 @@ class eWeLinkPlatform {
         /*************************
         BLINDS [DUALR3 MOTOR MODE]
         *************************/
-        accessory = devicesInHB.has(uuid)
-          ? devicesInHB.get(uuid)
-          : this.addAccessory(device, device.deviceid + 'SWX')
+        accessory = devicesInHB.get(uuid) ||
+          this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/motor'))(this, accessory)
         /************************/
       } else if (
@@ -626,9 +626,8 @@ class eWeLinkPlatform {
         /****************************
         BLINDS [ACCESSORY SIMULATION]
         ****************************/
-        accessory = devicesInHB.has(uuid)
-          ? devicesInHB.get(uuid)
-          : this.addAccessory(device, device.deviceid + 'SWX')
+        accessory = devicesInHB.get(uuid) ||
+          this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/simulation/blind'))(this, accessory)
         /***************************/
       } else if (
@@ -638,9 +637,8 @@ class eWeLinkPlatform {
         /***************************
         DOORS [ACCESSORY SIMULATION]
         ***************************/
-        accessory = devicesInHB.has(uuid)
-          ? devicesInHB.get(uuid)
-          : this.addAccessory(device, device.deviceid + 'SWX')
+        accessory = devicesInHB.get(uuid) ||
+          this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/simulation/door'))(this, accessory)
         /**************************/
       } else if (
@@ -650,9 +648,8 @@ class eWeLinkPlatform {
         /*****************************
         WINDOWS [ACCESSORY SIMULATION]
         *****************************/
-        accessory = devicesInHB.has(uuid)
-          ? devicesInHB.get(uuid)
-          : this.addAccessory(device, device.deviceid + 'SWX')
+        accessory = devicesInHB.get(uuid) ||
+          this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/simulation/window'))(this, accessory)
         /****************************/
       } else if (this.obstructSwitches[device.deviceid]) {
@@ -671,9 +668,8 @@ class eWeLinkPlatform {
         GARAGE DOORS [ONE] [ACCESSORY SIMULATION]
         ****************************************/
         const instance = './device/simulation/garage-one'
-        accessory = devicesInHB.has(uuid)
-          ? devicesInHB.get(uuid)
-          : this.addAccessory(device, device.deviceid + 'SWX')
+        accessory = devicesInHB.get(uuid) ||
+          this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require(instance))(this, accessory)
         /***************************************/
       } else if (
@@ -684,9 +680,8 @@ class eWeLinkPlatform {
         GARAGE DOORS [TWO] [ACCESSORY SIMULATION]
         ****************************************/
         const instance = './device/simulation/garage-two'
-        accessory = devicesInHB.has(uuid)
-          ? devicesInHB.get(uuid)
-          : this.addAccessory(device, device.deviceid + 'SWX')
+        accessory = devicesInHB.get(uuid) ||
+          this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require(instance))(this, accessory)
         /***************************************/
       } else if (
@@ -697,9 +692,8 @@ class eWeLinkPlatform {
         GARAGE DOORS [FOUR] [ACCESSORY SIMULATION]
         *****************************************/
         const instance = './device/simulation/garage-four'
-        accessory = devicesInHB.has(uuid)
-          ? devicesInHB.get(uuid)
-          : this.addAccessory(device, device.deviceid + 'SWX')
+        accessory = devicesInHB.get(uuid) ||
+          this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require(instance))(this, accessory)
         /****************************************/
       } else if (
@@ -710,9 +704,8 @@ class eWeLinkPlatform {
         GARAGE DOORS [EACHEN GD-DC5]
         ***************************/
         const instance = './device/simulation/garage-eachen'
-        accessory = devicesInHB.has(uuid)
-          ? devicesInHB.get(uuid)
-          : this.addAccessory(device, device.deviceid + 'SWX')
+        accessory = devicesInHB.get(uuid) ||
+          this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require(instance))(this, accessory)
         /**************************/
       } else if (
@@ -722,9 +715,8 @@ class eWeLinkPlatform {
         /***************************
         LOCKS [ACCESSORY SIMULATION]
         ***************************/
-        accessory = devicesInHB.has(uuid)
-          ? devicesInHB.get(uuid)
-          : this.addAccessory(device, device.deviceid + 'SWX')
+        accessory = devicesInHB.get(uuid) ||
+          this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/simulation/lock-one'))(this, accessory)
         /**************************/
       } else if (
@@ -735,9 +727,8 @@ class eWeLinkPlatform {
         SWITCH-VALVE [ACCESSORY SIMULATION]
         **********************************/
         const instance = './device/simulation/switch-valve'
-        accessory = devicesInHB.has(uuid)
-          ? devicesInHB.get(uuid)
-          : this.addAccessory(device, device.deviceid + 'SWX')
+        accessory = devicesInHB.get(uuid) ||
+          this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require(instance))(this, accessory)
         /*********************************/
       } else if (
@@ -747,9 +738,8 @@ class eWeLinkPlatform {
         /********************************
         TAPS [ONE] [ACCESSORY SIMULATION]
         ********************************/
-        accessory = devicesInHB.has(uuid)
-          ? devicesInHB.get(uuid)
-          : this.addAccessory(device, device.deviceid + 'SWX')
+        accessory = devicesInHB.get(uuid) ||
+          this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/simulation/tap-one'))(this, accessory)
         /*******************************/
       } else if (
@@ -759,9 +749,8 @@ class eWeLinkPlatform {
         /********************************
         TAPS [TWO] [ACCESSORY SIMULATION]
         ********************************/
-        accessory = devicesInHB.has(uuid)
-          ? devicesInHB.get(uuid)
-          : this.addAccessory(device, device.deviceid + 'SWX')
+        accessory = devicesInHB.get(uuid) ||
+          this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/simulation/tap-two'))(this, accessory)
         /*******************************/
       } else if (
@@ -772,9 +761,8 @@ class eWeLinkPlatform {
         VALVES [ONE] [ACCESSORY SIMULATION]
         **********************************/
         const instance = './device/simulation/valve-one'
-        accessory = devicesInHB.has(uuid)
-          ? devicesInHB.get(uuid)
-          : this.addAccessory(device, device.deviceid + 'SWX')
+        accessory = devicesInHB.get(uuid) ||
+          this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require(instance))(this, accessory)
         /*********************************/
       } else if (
@@ -785,9 +773,8 @@ class eWeLinkPlatform {
         VALVES [TWO] [ACCESSORY SIMULATION]
         **********************************/
         const instance = './device/simulation/valve-two'
-        accessory = devicesInHB.has(uuid)
-          ? devicesInHB.get(uuid)
-          : this.addAccessory(device, device.deviceid + 'SWX')
+        accessory = devicesInHB.get(uuid) ||
+          this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require(instance))(this, accessory)
         /*********************************/
       } else if (
@@ -798,9 +785,8 @@ class eWeLinkPlatform {
         VALVES [FOUR] [ACCESSORY SIMULATION]
         ***********************************/
         const instance = './device/simulation/valve-four'
-        accessory = devicesInHB.has(uuid)
-          ? devicesInHB.get(uuid)
-          : this.addAccessory(device, device.deviceid + 'SWX')
+        accessory = devicesInHB.get(uuid) ||
+          this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require(instance))(this, accessory)
         /**********************************/
       } else if (
@@ -812,9 +798,8 @@ class eWeLinkPlatform {
         SENSORS [LEAK DW2 ACCESSORY SIMULATION]
         **************************************/
         const instance = './device/simulation/sensor-leak'
-        accessory = devicesInHB.has(uuid)
-          ? devicesInHB.get(uuid)
-          : this.addAccessory(device, device.deviceid + 'SWX')
+        accessory = devicesInHB.get(uuid) ||
+          this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require(instance))(this, accessory)
         /*************************************/
       } else if (this.consts.devices.sensorContact.includes(uiid)) {
@@ -822,45 +807,40 @@ class eWeLinkPlatform {
         SENSORS [SONOFF DW2]
         *******************/
         const instance = './device/sensor-contact'
-        accessory = devicesInHB.has(uuid)
-          ? devicesInHB.get(uuid)
-          : this.addAccessory(device, device.deviceid + 'SWX')
+        accessory = devicesInHB.get(uuid) ||
+          this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require(instance))(this, accessory, devicesInHB)
         /******************/
       } else if (this.consts.devices.fan.includes(uiid)) {
         /***
         FANS
         ***/
-        accessory = devicesInHB.has(uuid)
-          ? devicesInHB.get(uuid)
-          : this.addAccessory(device, device.deviceid + 'SWX')
+        accessory = devicesInHB.get(uuid) ||
+          this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/fan'))(this, accessory)
         /**/
       } else if (this.consts.devices.diffuser.includes(uiid)) {
         /********
         DIFFUSERS
         ********/
-        accessory = devicesInHB.has(uuid)
-          ? devicesInHB.get(uuid)
-          : this.addAccessory(device, device.deviceid + 'SWX')
+        accessory = devicesInHB.get(uuid) ||
+          this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/diffuser'))(this, accessory)
         /*******/
       } else if (this.consts.devices.humidifier.includes(uiid)) {
         /**********
         HUMIDIFIERS
         **********/
-        accessory = devicesInHB.has(uuid)
-          ? devicesInHB.get(uuid)
-          : this.addAccessory(device, device.deviceid + 'SWX')
+        accessory = devicesInHB.get(uuid) ||
+          this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/humidifier'))(this, accessory)
         /*********/
       } else if (this.consts.devices.thermostat.includes(uiid)) {
         /**********
         THERMOSTATS
         **********/
-        accessory = devicesInHB.has(uuid)
-          ? devicesInHB.get(uuid)
-          : this.addAccessory(device, device.deviceid + 'SWX')
+        accessory = devicesInHB.get(uuid) ||
+          this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/thermostat'))(this, accessory)
         /*******/
       } else if (
@@ -872,18 +852,16 @@ class eWeLinkPlatform {
         THERMOSTATS [ACCESSORY SIMULATION]
         *********************************/
         const instance = './device/simulation/thermostat'
-        accessory = devicesInHB.has(uuid)
-          ? devicesInHB.get(uuid)
-          : this.addAccessory(device, device.deviceid + 'SWX')
+        accessory = devicesInHB.get(uuid) ||
+          this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require(instance))(this, accessory)
         /********************************/
       } else if (this.consts.devices.sensorAmbient.includes(uiid)) {
         /***********************
         SENSOR [AMBIENT-TH10/16]
         ***********************/
-        accessory = devicesInHB.has(uuid)
-          ? devicesInHB.get(uuid)
-          : this.addAccessory(device, device.deviceid + 'SWX')
+        accessory = devicesInHB.get(uuid) ||
+          this.addAccessory(device, device.deviceid + 'SWX')
         accessory.context.sensorType = device.params.sensorType
         accessory.control = new (require('./device/sensor-ambient'))(this, accessory)
         /**********************/
@@ -891,9 +869,8 @@ class eWeLinkPlatform {
         /*************************
         SENSOR [AMBIENT-SONOFF SC]
         *************************/
-        accessory = devicesInHB.has(uuid)
-          ? devicesInHB.get(uuid)
-          : this.addAccessory(device, device.deviceid + 'SWX')
+        accessory = devicesInHB.get(uuid) ||
+          this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/sensor-temp-humi'))(this, accessory)
         /************************/
       } else if (
@@ -906,9 +883,8 @@ class eWeLinkPlatform {
         /******
         OUTLETS
         ******/
-        accessory = devicesInHB.has(uuid)
-          ? devicesInHB.get(uuid)
-          : this.addAccessory(device, device.deviceid + 'SWX')
+        accessory = devicesInHB.get(uuid) ||
+          this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = this.outletDevices[device.deviceid] &&
           this.outletDevices[device.deviceid].showAsSwitch
           ? new (require('./device/switch-single'))(this, accessory)
@@ -918,54 +894,48 @@ class eWeLinkPlatform {
         /*************************************
         OUTLETS [SINGLE BUT MULTIPLE HARDWARE]
         *************************************/
-        accessory = devicesInHB.has(uuid)
-          ? devicesInHB.get(uuid)
-          : this.addAccessory(device, device.deviceid + 'SWX')
+        accessory = devicesInHB.get(uuid) ||
+          this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/outlet-scm'))(this, accessory)
         /************************************/
       } else if (this.consts.devices.lightRGB.includes(uiid)) {
         /***********
         LIGHTS [RGB]
         ***********/
-        accessory = devicesInHB.has(uuid)
-          ? devicesInHB.get(uuid)
-          : this.addAccessory(device, device.deviceid + 'SWX')
+        accessory = devicesInHB.get(uuid) ||
+          this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/light-rgb'))(this, accessory)
         /**********/
       } else if (this.consts.devices.lightCCT.includes(uiid)) {
         /***********
         LIGHTS [CCT]
         ***********/
-        accessory = devicesInHB.has(uuid)
-          ? devicesInHB.get(uuid)
-          : this.addAccessory(device, device.deviceid + 'SWX')
+        accessory = devicesInHB.get(uuid) ||
+          this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/light-cct'))(this, accessory)
         /**********/
       } else if (this.consts.devices.lightRGBCCT.includes(uiid)) {
         /*****************
         LIGHTS [RGB & CCT]
         *****************/
-        accessory = devicesInHB.has(uuid)
-          ? devicesInHB.get(uuid)
-          : this.addAccessory(device, device.deviceid + 'SWX')
+        accessory = devicesInHB.get(uuid) ||
+          this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/light-rgb-cct'))(this, accessory)
         /****************/
       } else if (this.consts.devices.lightDimmer.includes(uiid)) {
         /**************
         LIGHTS [DIMMER]
         **************/
-        accessory = devicesInHB.has(uuid)
-          ? devicesInHB.get(uuid)
-          : this.addAccessory(device, device.deviceid + 'SWX')
+        accessory = devicesInHB.get(uuid) ||
+          this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/light-dimmer'))(this, accessory)
         /*************/
       } else if (this.consts.devices.singleSwitch.includes(uiid)) {
         /************************
         SWITCHES [SINGLE CHANNEL]
         ************************/
-        accessory = devicesInHB.has(uuid)
-          ? devicesInHB.get(uuid)
-          : this.addAccessory(device, device.deviceid + 'SWX')
+        accessory = devicesInHB.get(uuid) ||
+          this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = this.singleDevices[device.deviceid] &&
           this.singleDevices[device.deviceid].showAsOutlet
           ? new (require('./device/outlet-single'))(this, accessory)
@@ -998,9 +968,8 @@ class eWeLinkPlatform {
             subAccessory = this.addAccessory(device, device.deviceid + 'SW' + i, true)
           } else {
             // The user has not hidden this channel
-            subAccessory = devicesInHB.has(uuidsub)
-              ? devicesInHB.get(uuidsub)
-              : this.addAccessory(device, device.deviceid + 'SW' + i)
+            subAccessory = devicesInHB.get(uuidsub) ||
+              this.addAccessory(device, device.deviceid + 'SW' + i)
           }
 
           // Add context information to the sub accessory
@@ -1138,9 +1107,8 @@ class eWeLinkPlatform {
 
           // Get the sub accessory if it's new or hasn't been removed above
 
-          subAccessory = devicesInHB.has(uuidsub)
-            ? devicesInHB.get(uuidsub)
-            : this.addAccessory(device, fullDeviceId, false, subExtraContext, 'rf_sub')
+          subAccessory = devicesInHB.get(uuidsub) ||
+            this.addAccessory(device, fullDeviceId, false, subExtraContext, 'rf_sub')
 
           // Add context information to the sub accessory
           subAccessory.context.firmware = device.params.fwVersion || PLUGIN.version
@@ -1177,9 +1145,8 @@ class eWeLinkPlatform {
         ZIGBEE STATELESS SWITCH
         **********************/
         const instance = './device/zigbee/switch-stateless'
-        accessory = devicesInHB.has(uuid)
-          ? devicesInHB.get(uuid)
-          : this.addAccessory(device, device.deviceid + 'SWX')
+        accessory = devicesInHB.get(uuid) ||
+          this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require(instance))(this, accessory)
         /*********************/
       } else if (this.consts.devices.zbSwitchSingle.includes(uiid)) {
@@ -1187,27 +1154,24 @@ class eWeLinkPlatform {
         ZB SINGLE SWITCH
         ***************/
         const instance = './device/zigbee/switch-single'
-        accessory = devicesInHB.has(uuid)
-          ? devicesInHB.get(uuid)
-          : this.addAccessory(device, device.deviceid + 'SWX')
+        accessory = devicesInHB.get(uuid) ||
+          this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require(instance))(this, accessory)
         /**************/
       } else if (this.consts.devices.zbLightDimmer.includes(uiid)) {
         /*****************
         ZB LIGHTS [DIMMER]
         *****************/
-        accessory = devicesInHB.has(uuid)
-          ? devicesInHB.get(uuid)
-          : this.addAccessory(device, device.deviceid + 'SWX')
+        accessory = devicesInHB.get(uuid) ||
+          this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/zigbee/light-dimmer'))(this, accessory)
         /****************/
       } else if (this.consts.devices.zbLightCCT.includes(uiid)) {
         /**************
         ZB LIGHTS [CCT]
         **************/
-        accessory = devicesInHB.has(uuid)
-          ? devicesInHB.get(uuid)
-          : this.addAccessory(device, device.deviceid + 'SWX')
+        accessory = devicesInHB.get(uuid) ||
+          this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/zigbee/light-cct'))(this, accessory)
         /*************/
       } else if (this.consts.devices.zbSensorAmbient.includes(uiid)) {
@@ -1215,9 +1179,8 @@ class eWeLinkPlatform {
         ZB SENSOR [AMBIENT]
         ******************/
         const instance = './device/zigbee/sensor-ambient'
-        accessory = devicesInHB.has(uuid)
-          ? devicesInHB.get(uuid)
-          : this.addAccessory(device, device.deviceid + 'SWX')
+        accessory = devicesInHB.get(uuid) ||
+          this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require(instance))(this, accessory)
         /*****************/
       } else if (this.consts.devices.zbSensorMotion.includes(uiid)) {
@@ -1225,9 +1188,8 @@ class eWeLinkPlatform {
         ZB SENSOR [MOTION]
         *****************/
         const instance = './device/zigbee/sensor-motion'
-        accessory = devicesInHB.has(uuid)
-          ? devicesInHB.get(uuid)
-          : this.addAccessory(device, device.deviceid + 'SWX')
+        accessory = devicesInHB.get(uuid) ||
+          this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require(instance))(this, accessory)
         /****************/
       } else if (this.consts.devices.zbSensorContact.includes(uiid)) {
@@ -1235,9 +1197,8 @@ class eWeLinkPlatform {
         ZB SENSOR [CONTACT]
         ******************/
         const instance = './device/zigbee/sensor-contact'
-        accessory = devicesInHB.has(uuid)
-          ? devicesInHB.get(uuid)
-          : this.addAccessory(device, device.deviceid + 'SWX')
+        accessory = devicesInHB.get(uuid) ||
+          this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require(instance))(this, accessory, devicesInHB)
         /*****************/
       } else if (this.consts.devices.camera.includes(uiid)) {
@@ -1369,12 +1330,6 @@ class eWeLinkPlatform {
             device.params.fwVersion || PLUGIN.version
           )
           .setCharacteristic(this.api.hap.Characteristic.Identify, true)
-
-        // A function for when the identify button is pressed in HomeKit apps
-        accessory.on('identify', (paired, callback) => {
-          callback()
-          this.log('[%s] %s.', accessory.displayName, this.lang.identify)
-        })
       }
 
       // Add helpful context values to the accessory
@@ -1398,6 +1353,7 @@ class eWeLinkPlatform {
       }
 
       // Return the new accessory
+      this.configureAccessory(accessory)
       return accessory
     } catch (err) {
       // Catch any errors during add
@@ -1414,6 +1370,12 @@ class eWeLinkPlatform {
         return
       }
 
+      // A function for when the identify button is pressed in HomeKit apps
+      accessory.on('identify', (paired, callback) => {
+        callback()
+        this.log('[%s] %s.', accessory.displayName, this.lang.identify)
+      })
+
       // Set the correct firmware version if we can
       if (this.api && accessory.context.firmware) {
         accessory.getService(this.api.hap.Service.AccessoryInformation)

From ddd410f258be216bf68e8329c37f30be7831a673 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 4 May 2021 17:00:53 +0100
Subject: [PATCH 2003/3183] 6.4.0-beta.3

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 3daa1e81..cd69ee99 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.4.0-beta.2",
+  "version": "6.4.0-beta.3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index ab2f2f20..663f8cf3 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.4.0-beta.2",
+  "version": "6.4.0-beta.3",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 807b89d1499c93db398423582ec5e51e90dcb0e9 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 4 May 2021 17:15:35 +0100
Subject: [PATCH 2004/3183] Update index.js

---
 lib/index.js | 52 +++++++++++++++++++++++++---------------------------
 1 file changed, 25 insertions(+), 27 deletions(-)

diff --git a/lib/index.js b/lib/index.js
index 74523bdf..ce722ad5 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -2,24 +2,22 @@
 /* eslint-disable new-cap */
 'use strict'
 
-const { default: PQueue } = require('p-queue')
+// Packages and constant variables for this class
 const devicesInHB = new Map()
-
-let httpClient
-let lanClient
-let lanDevices
-let wsClient
-
-// Retrieve necessary fields from the package.json file
-const PLUGIN = require('./../package.json')
-
-// Create the queue used for sending device updates
+const { default: PQueue } = require('p-queue')
+const plugin = require('./../package.json')
 const queue = new PQueue({
   interval: 250,
   intervalCap: 1,
   timeout: 10000
 })
 
+// Variables for this class to use later
+let httpClient
+let lanClient
+let lanDevices
+let wsClient
+
 // Create the platform class
 class eWeLinkPlatform {
   constructor (log, config, api) {
@@ -79,7 +77,7 @@ class eWeLinkPlatform {
       const eText = hideErrLines.includes(err.message)
         ? err.message
         : this.funcs.parseError(err)
-      log.warn('***** %s [v%s]. *****', this.lang.disabling, PLUGIN.version)
+      log.warn('***** %s [v%s]. *****', this.lang.disabling, plugin.version)
       log.warn('***** %s. *****', eText)
     }
   }
@@ -476,7 +474,7 @@ class eWeLinkPlatform {
       }
 
       // Log that the plugin initialisation has been successful
-      this.log('[v%s] %s.', PLUGIN.version, this.lang.initialised)
+      this.log('[v%s] %s.', plugin.version, this.lang.initialised)
 
       // Require any libraries that the accessory instances use
       this.colourUtils = require('./utils/colour-utils')
@@ -556,7 +554,7 @@ class eWeLinkPlatform {
         : this.config.debug
           ? err
           : this.funcs.parseError(err)
-      this.log.warn('***** %s [v%s]. *****', this.lang.disabling, PLUGIN.version)
+      this.log.warn('***** %s [v%s]. *****', this.lang.disabling, plugin.version)
       this.log.warn('***** %s. *****', eText)
       this.pluginShutdown()
     }
@@ -973,7 +971,7 @@ class eWeLinkPlatform {
           }
 
           // Add context information to the sub accessory
-          subAccessory.context.firmware = device.params.fwVersion || PLUGIN.version
+          subAccessory.context.firmware = device.params.fwVersion || plugin.version
           subAccessory.context.reachableWAN = device.online
           subAccessory.context.reachableLAN = lanClient &&
             lanDevices.has(device.deviceid)
@@ -998,7 +996,7 @@ class eWeLinkPlatform {
               : new (require('./device/switch-multi'))(this, subAccessory, devicesInHB)
 
           // Update any changes to the sub accessory to the platform
-          this.api.updatePlatformAccessories(PLUGIN.name, PLUGIN.alias, [subAccessory])
+          this.api.updatePlatformAccessories(plugin.name, plugin.alias, [subAccessory])
           devicesInHB.set(subAccessory.UUID, subAccessory)
           if (i === 0) {
             accessory = subAccessory
@@ -1111,7 +1109,7 @@ class eWeLinkPlatform {
             this.addAccessory(device, fullDeviceId, false, subExtraContext, 'rf_sub')
 
           // Add context information to the sub accessory
-          subAccessory.context.firmware = device.params.fwVersion || PLUGIN.version
+          subAccessory.context.firmware = device.params.fwVersion || plugin.version
           subAccessory.context.reachableWAN = device.online
           subAccessory.context.reachableLAN = false
           subAccessory.context.eweBrandName = device.brandName
@@ -1124,7 +1122,7 @@ class eWeLinkPlatform {
             : false
 
           // Update any changes to the sub accessory to the platform
-          this.api.updatePlatformAccessories(PLUGIN.name, PLUGIN.alias, [subAccessory])
+          this.api.updatePlatformAccessories(plugin.name, plugin.alias, [subAccessory])
           devicesInHB.set(subAccessory.UUID, subAccessory)
           const instance = './device/rf-bridge'
           subAccessory.control = new (require(instance))(this, subAccessory, devicesInHB)
@@ -1226,7 +1224,7 @@ class eWeLinkPlatform {
       }
 
       // Update the reachability values (via WS and LAN)
-      accessory.context.firmware = device.params.fwVersion || PLUGIN.version
+      accessory.context.firmware = device.params.fwVersion || plugin.version
       accessory.context.reachableWAN = device.online
       accessory.context.reachableLAN = lanClient &&
         lanDevices.has(device.deviceid)
@@ -1259,7 +1257,7 @@ class eWeLinkPlatform {
       }
 
       // Update any changes to the device into our devicesInHB map
-      this.api.updatePlatformAccessories(PLUGIN.name, PLUGIN.alias, [accessory])
+      this.api.updatePlatformAccessories(plugin.name, plugin.alias, [accessory])
       devicesInHB.set(accessory.UUID, accessory)
       this.log('[%s] %s %s.', device.name, this.lang.devInit, str)
       if (
@@ -1327,7 +1325,7 @@ class eWeLinkPlatform {
           )
           .setCharacteristic(
             this.api.hap.Characteristic.FirmwareRevision,
-            device.params.fwVersion || PLUGIN.version
+            device.params.fwVersion || plugin.version
           )
           .setCharacteristic(this.api.hap.Characteristic.Identify, true)
       }
@@ -1348,7 +1346,7 @@ class eWeLinkPlatform {
 
       // Register the accessory if it hasn't been hidden by the user
       if (!hidden) {
-        this.api.registerPlatformAccessories(PLUGIN.name, PLUGIN.alias, [accessory])
+        this.api.registerPlatformAccessories(plugin.name, plugin.alias, [accessory])
         this.log('[%s] %s.', newDeviceName, this.lang.devAdd)
       }
 
@@ -1397,7 +1395,7 @@ class eWeLinkPlatform {
   removeAccessory (accessory) {
     try {
       // Remove an accessory from Homebridge
-      this.api.unregisterPlatformAccessories(PLUGIN.name, PLUGIN.alias, [accessory])
+      this.api.unregisterPlatformAccessories(plugin.name, plugin.alias, [accessory])
       devicesInHB.delete(accessory.UUID)
       this.log('[%s] %s.', accessory.displayName, this.lang.devRemove)
     } catch (err) {
@@ -1485,7 +1483,7 @@ class eWeLinkPlatform {
         // The update is from WS so update the WS online/offline status
         if (device.params.online !== accessory.context.reachableWAN) {
           accessory.context.reachableWAN = device.params.online
-          this.api.updatePlatformAccessories(PLUGIN.name, PLUGIN.alias, [accessory])
+          this.api.updatePlatformAccessories(plugin.name, plugin.alias, [accessory])
           devicesInHB.set(accessory.UUID, accessory)
 
           // Flag this true to update the sub accessories later
@@ -1515,7 +1513,7 @@ class eWeLinkPlatform {
       if (device.params.updateSource === 'LAN' && !accessory.context.reachableLAN) {
         // The update is from LAN so it must be online
         accessory.context.reachableLAN = true
-        this.api.updatePlatformAccessories(PLUGIN.name, PLUGIN.alias, [accessory])
+        this.api.updatePlatformAccessories(plugin.name, plugin.alias, [accessory])
         devicesInHB.set(accessory.UUID, accessory)
 
         // Flag this true to update the sub accessories later
@@ -1557,7 +1555,7 @@ class eWeLinkPlatform {
             }
 
             // Save the sub accessory updates to the platform
-            this.api.updatePlatformAccessories(PLUGIN.name, PLUGIN.alias, [subAccessory])
+            this.api.updatePlatformAccessories(plugin.name, plugin.alias, [subAccessory])
             devicesInHB.set(subAccessory.UUID, subAccessory)
           }
         }
@@ -1624,4 +1622,4 @@ class eWeLinkPlatform {
 }
 
 // Export the plugin to Homebridge
-module.exports = hb => hb.registerPlatform(PLUGIN.alias, eWeLinkPlatform)
+module.exports = hb => hb.registerPlatform(plugin.alias, eWeLinkPlatform)

From 44014a5a87dffdd27d5e24961336bc270aba7370 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 4 May 2021 17:18:39 +0100
Subject: [PATCH 2005/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8223bdd9..e9af7fd4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 * Remove 'Outlet In Use' characteristics for outlets that don't support power readings
 * Remove Eve power characteristics for outlets that don't support power readings
 * More language strings added to separate language file
+* Accessory 'identify' function will now add an entry to the log
 * Backend refactoring, function and variable name changes
 
 ## 6.3.0 (2021-04-28)

From 0d326049a0064eee4d2034dff23f4abd4e1a117d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 4 May 2021 17:19:25 +0100
Subject: [PATCH 2006/3183] 6.4.0-beta.4

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index cd69ee99..23f4514b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.4.0-beta.3",
+  "version": "6.4.0-beta.4",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 663f8cf3..5902552e 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.4.0-beta.3",
+  "version": "6.4.0-beta.4",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 8b3ae3e5ae273ddb760399fa68b24eb54cb43388 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 4 May 2021 18:49:19 +0100
Subject: [PATCH 2007/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e9af7fd4..75b2f65c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,11 @@
 
 All notable changes to this homebridge-ewelink will be documented in this file.
 
-## BETA
+## 6.4.0 (2021-05-04)
+
+**Please Note**
+
+Since it is impossible for me to test *every* device type and all Accessory Simulations, there may be some unexpected issues. A lot of code has changed in this release. If you encounter any issues please let me know on Github or Discord and I will get it sorted as soon as I can :)
 
 ### Added
 

From d9da62a2102bbc4516b2923d98bba05a0bcab8f3 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 4 May 2021 18:49:46 +0100
Subject: [PATCH 2008/3183] 6.4.0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 23f4514b..646173af 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.4.0-beta.4",
+  "version": "6.4.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 5902552e..76bf8ba0 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.4.0-beta.4",
+  "version": "6.4.0",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 9c631c63699f4cf774c4afe9a3f74bcde3af91f2 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 5 May 2021 11:46:36 +0100
Subject: [PATCH 2009/3183] deps

---
 package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 646173af..8a63e5a1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -116,9 +116,9 @@
       "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw=="
     },
     "is-bigint": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.1.tgz",
-      "integrity": "sha512-J0ELF4yHFxHy0cmSxZuheDOz2luOdVvqjwmEcj8H/L1JHeuEDSDbeRP+Dk9kFVk5RTFzbucJ2Kb9F7ixY2QaCg=="
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.2.tgz",
+      "integrity": "sha512-0JV5+SOCQkIdzjBK9buARcV804Ddu7A0Qet6sHi3FimE9ne6m4BGQZfRn+NZiXbBk4F4XmHfDZIipLj9pX8dSA=="
     },
     "is-boolean-object": {
       "version": "1.1.0",

From eed2ec35ffcb3040944539d7782952015166d6fa Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 5 May 2021 11:56:19 +0100
Subject: [PATCH 2010/3183] initial internal api

---
 config.schema.json     |  6 +++
 lib/connection/api.js  | 89 ++++++++++++++++++++++++++++++++++++++++++
 lib/index.js           | 52 ++++++++++++++++++++++++
 lib/utils/constants.js |  3 ++
 lib/utils/lang-en.js   |  2 +
 5 files changed, 152 insertions(+)
 create mode 100644 lib/connection/api.js

diff --git a/config.schema.json b/config.schema.json
index d9a59561..63b892f7 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -92,6 +92,11 @@
           }
         ]
       },
+      "apiPort": {
+        "type": "number",
+        "title": "Server API Port",
+        "description": "Port to use for the internal HTTP API. Set to 0 to disable. Set to 1 to choose a randomly available port."
+      },
       "disableDeviceLogging": {
         "type": "boolean",
         "title": "Disable Device Logging",
@@ -728,6 +733,7 @@
         "httpHost",
         "countryCode",
         "mode",
+        "apiPort",
         "disableDeviceLogging",
         "debug",
         "disablePlugin"
diff --git a/lib/connection/api.js b/lib/connection/api.js
new file mode 100644
index 00000000..089580f9
--- /dev/null
+++ b/lib/connection/api.js
@@ -0,0 +1,89 @@
+/* jshint -W014, -W033, esversion: 9 */
+/* eslint-disable new-cap */
+'use strict'
+
+module.exports = class connectionAPI {
+  constructor (platform, devicesInHB) {
+    // Set up variables from the platform
+    this.consts = platform.consts
+    this.debug = platform.config.debug
+    this.devicesInHB = devicesInHB
+    this.funcs = platform.funcs
+    this.hapChar = platform.api.hap.Characteristic
+    this.hapServ = platform.api.hap.Service
+    this.hapUUIDGen = platform.api.hap.uuid.generate
+    this.lang = platform.lang
+    this.log = platform.log
+    this.lastDate = new Date()
+  }
+
+  action (url) {
+    const nowDate = new Date()
+    if ((nowDate - this.lastDate) / 1000 < 1) {
+      throw new Error('Requested too soon')
+    }
+    this.lastDate = nowDate
+    const pathParts = url.split('/')
+    const device = pathParts[1]
+    const action = pathParts[2]
+    const attribute = pathParts[3]
+    const newStatus = pathParts[4]
+    if (!device) {
+      throw new Error('No accessory specified')
+    }
+    const uuid = this.hapUUIDGen(device)
+    if (!this.devicesInHB.has(uuid)) {
+      throw new Error('Accessory not found in Homebridge')
+    }
+    if (!action) {
+      throw new Error('No action specified')
+    }
+    if (!['get', 'set'].includes(action)) {
+      throw new Error("Action must be 'get' or 'set'")
+    }
+    if (!attribute) {
+      throw new Error('No attribute specified')
+    }
+    if (!['state'].includes(attribute)) {
+      throw new Error("Action must be 'state'")
+    }
+    if (action === 'set') {
+      if (!newStatus) {
+        throw new Error('No new status specified')
+      }
+      if (!['on', 'off', 'toggle'].includes(newStatus)) {
+        throw new Error("New status must be 'on', 'off' or 'toggle' for attribute:state")
+      }
+    }
+    const accessory = this.devicesInHB.get(uuid)
+    const service = accessory.getService(this.hapServ.Switch) ||
+      accessory.getService(this.hapServ.Outlet) ||
+      accessory.getService(this.hapServ.Lightbulb)
+
+    if (!service) {
+      throw new Error("Accessory is not 'Switch', 'Outlet' or 'Lightbulb'")
+    }
+
+    const currentHKStatus = service.getCharacteristic(this.hapChar.On).value
+
+    if (action === 'get') {
+      return currentHKStatus ? 'on' : 'off'
+    }
+
+    if (action === 'set') {
+      let newHKStatus
+      switch (newStatus) {
+        case 'on':
+          newHKStatus = true
+          break
+        case 'off':
+          newHKStatus = false
+          break
+        case 'toggle':
+          newHKStatus = !currentHKStatus
+          break
+      }
+      service.setCharacteristic(this.hapChar.On, newHKStatus)
+    }
+  }
+}
diff --git a/lib/index.js b/lib/index.js
index ce722ad5..ac02815c 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -4,6 +4,7 @@
 
 // Packages and constant variables for this class
 const devicesInHB = new Map()
+const http = require('http')
 const { default: PQueue } = require('p-queue')
 const plugin = require('./../package.json')
 const queue = new PQueue({
@@ -13,6 +14,8 @@ const queue = new PQueue({
 })
 
 // Variables for this class to use later
+let apiClient
+let apiServer
 let httpClient
 let lanClient
 let lanDevices
@@ -106,6 +109,22 @@ class eWeLinkPlatform {
     // Begin applying the user's config
     for (const [key, val] of Object.entries(config)) {
       switch (key) {
+        case 'apiPort': {
+          if (typeof v === 'string') {
+            logQuotes(key)
+          }
+          const intVal = parseInt(val)
+          if (isNaN(intVal)) {
+            logDefault(key, this.consts.defaultValues[key])
+            this.config.apiPort = this.consts.defaultValues[key]
+          } else if (intVal < this.consts.minValues[key]) {
+            logIncrease(key, this.consts.minValues[key])
+            this.config.apiPort = this.consts.minValues[key]
+          } else {
+            this.config.apiPort = intVal
+          }
+          break
+        }
         case 'bridgeSensors':
           if (Array.isArray(val) && val.length > 0) {
             val.forEach(x => {
@@ -544,6 +563,30 @@ class eWeLinkPlatform {
         }, 3600000)
       }
 
+      // Set up the listener server for the API if the user has this enabled
+      if (this.config.apiPort !== 0) {
+        apiClient = new (require('./connection/api'))(this, devicesInHB)
+        apiServer = http.createServer((req, res) => {
+          res.writeHead(200, { 'Content-Type': 'application/json' })
+          try {
+            const response = apiClient.action(req.url)
+            res.end(JSON.stringify({ success: true, response }))
+          } catch (e) {
+            const eText = this.funcs.parseError(e)
+            res.end(JSON.stringify({ success: false, error: eText }))
+          }
+        })
+
+        // Start listening on the above created server
+        apiServer.listen(this.config.apiPort === 1 ? 0 : this.config.apiPort, err => {
+          if (err) {
+            this.log.warn('%s [%s].', this.lang.apiListenErr, err)
+          } else {
+            this.log('%s [%s].', this.lang.apiListening, apiServer.address().port)
+          }
+        })
+      }
+
       // Log that the plugin setup has been successful with a welcome message
       const randIndex = Math.floor(Math.random() * this.lang.zWelcome.length)
       this.log('%s. %s', this.lang.complete, this.lang.zWelcome[randIndex])
@@ -563,6 +606,15 @@ class eWeLinkPlatform {
   pluginShutdown () {
     // A function that is called when the plugin fails to load or Homebridge restarts
     try {
+      // Shutdown the listener server if it's running
+      if (apiServer) {
+        apiServer.close(() => {
+          if (this.config.debug) {
+            this.log('%s.', 'listener closed')
+          }
+        })
+      }
+
       // Stop the LAN monitoring
       if (lanClient) {
         lanClient.closeConnection()
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 70a67358..3034ff9b 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -12,6 +12,7 @@ module.exports = {
     httpHost: 'eu-apia.coolkit.cc',
     countryCode: '+44',
     mode: 'auto',
+    apiPort: 0,
     disableDeviceLogging: false,
     debug: false,
     debugFakegato: false,
@@ -32,6 +33,7 @@ module.exports = {
   defaultValues: {
     language: 'en',
     httpHost: 'eu-apia.coolkit.cc',
+    apiPort: 0,
     inUsePowerThreshold: 0,
     lowBattThreshold: 25,
     sensorTimeLength: 60,
@@ -48,6 +50,7 @@ module.exports = {
   },
 
   minValues: {
+    apiPort: 0,
     inUsePowerThreshold: 0,
     lowBattThreshold: 5,
     sensorTimeLength: 1,
diff --git a/lib/utils/lang-en.js b/lib/utils/lang-en.js
index b00f0156..46c1dd99 100644
--- a/lib/utils/lang-en.js
+++ b/lib/utils/lang-en.js
@@ -3,6 +3,8 @@
 'use strict'
 
 module.exports = {
+  apiListenErr: 'Internal HTTP API server error',
+  apiListening: 'Internal HTTP API listening on port',
   buttonDouble: 'double press',
   buttonLong: 'long press',
   buttonNotFound: 'rf button not found (please restart Homebridge)',

From 5b5dde5be472f8e12f32fa8e4e4e33f5123f0395 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 5 May 2021 11:56:54 +0100
Subject: [PATCH 2011/3183] 6.4.1-beta.0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 8a63e5a1..829b089b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.4.0",
+  "version": "6.4.1-beta.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 76bf8ba0..7e647dca 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.4.0",
+  "version": "6.4.1-beta.0",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From ff53903b30ba16ab9b6bc5f72f40e62798b49660 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 5 May 2021 14:49:17 +0100
Subject: [PATCH 2012/3183] add api docs in root html file

---
 lib/connection/api.js | 122 +++++++++++++++++++++++++++++++++++++++---
 lib/index.js          |   5 ++
 2 files changed, 121 insertions(+), 6 deletions(-)

diff --git a/lib/connection/api.js b/lib/connection/api.js
index 089580f9..6cfbc6bb 100644
--- a/lib/connection/api.js
+++ b/lib/connection/api.js
@@ -14,15 +14,125 @@ module.exports = class connectionAPI {
     this.hapUUIDGen = platform.api.hap.uuid.generate
     this.lang = platform.lang
     this.log = platform.log
-    this.lastDate = new Date()
+  }
+
+  showHome () {
+    let accList = ''
+    const mapAsc = new Map([...this.devicesInHB.entries()].sort((a, b) => {
+      return a[1].displayName.toLowerCase() > b[1].displayName.toLowerCase()
+        ? 1
+        : b[1].displayName.toLowerCase() > a[1].displayName.toLowerCase()
+          ? -1
+          : 0
+    }))
+    mapAsc.forEach(accessory => {
+      accList += `<tr>
+        <td class="small">${accessory.displayName}</td>
+        <td class="small"><code>${accessory.context.hbDeviceId}</code></td>
+      </tr>`
+    })
+    return `<!doctype html>
+    <html lang="en">
+      <head>
+        <meta charset="utf-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1">
+        <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.0-beta3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-eOJMYsd53ii+scO/bJGFsiCZc+5NDVN2yr8+0RDqr0Ql0h+rP48ckxlpbzKgwra6" crossorigin="anonymous">
+        <title>homebridge-ewelink API Docs</title>
+      </head>
+      <body>
+        <div class="container-fluid mt-3">
+          <div class="row content">
+            <div class="col-sm-2"></div>
+            <div class="col-sm-8">
+              <p class="text-center">
+                <img src="https://user-images.githubusercontent.com/43026681/101325266-63126600-3863-11eb-9382-4a2924f0e540.png" alt="homebridge-ewelink logo" style="width: 60%;">
+                <h4 class="text-center">homebridge-ewelink</h3>
+              </p>
+              <hr class="mb-0">
+              <h5 class="mt-4 mb-2">API Docs</h5>
+              <ul class="small">
+                <li>All requests are of type <code>GET</code></li>
+                <li>All requests will return a <code>HTTP 200 OK</code> success code</li>
+                <li>All requests will return a JSON response</li>
+                <li>Success or failure of any request can be determined by the <code>success</code> response property which will be <code>true</code> or <code>false</code></li>
+                <li>Any error will be returned in an <code>error</code> parameter as a <code>string</code></li>
+                <li>Supported devices are currently:
+                  <ul>
+                    <li>Switches</li>
+                    <li>Outlets</li>
+                    <li>Lights</li>
+                  </ul>
+                </li>
+              </ul>
+              <h5 class="mt-4 mb-2">Available Commands</h5>
+              <div class="table-responsive">
+              <table class="table table-sm table-hover">
+                <thead>
+                  <tr>
+                    <th scope="col" class="small" style="width: 50%;">Function</th>
+                    <th scope="col" class="small" style="width: 50%;">Path</th>
+                  </tr>
+                </thead>
+                <tbody>
+                <tr>
+                  <td class="small">
+                    Query the ON/OFF state.<br>
+                    Example response:<br>
+                    <code>{"success":true,"response":"on"}</code>
+                  </td>
+                  <td class="align-middle small"><code>/{hbDeviceId}/get/state</code></td>
+                </tr>
+                <tr>
+                  <td class="small">
+                    Set the state to ON.<br>
+                    Example response:<br>
+                    <code>{"success":true}</code>
+                  </td>
+                  <td class="align-middle small"><code>/{hbDeviceId}/set/state/on</code></td>
+                </tr>
+                <tr>
+                  <td class="small">
+                    Set the state to OFF.<br>
+                    Example response:<br>
+                    <code>{"success":true}</code>
+                  </td>
+                  <td class="align-middle small"><code>/{hbDeviceId}/set/state/off</code></td>
+                </tr>
+                <tr>
+                  <td class="small">
+                    Toggle the current state.<br>
+                    Example response:<br>
+                    <code>{"success":true}</code>
+                  </td>
+                  <td class="align-middle small"><code>/{hbDeviceId}/set/state/toggle</code></td>
+                </tr>
+                </tbody>
+              </table>
+              </div>
+              <h5 class="mt-4 mb-2">Accessory List</h5>
+              <div class="table-responsive">
+              <table class="table table-sm table-hover">
+                <thead>
+                  <tr>
+                    <th scope="col" class="small" style="width: 50%;">Accessory Name</th>
+                    <th scope="col" class="small" style="width: 50%;">HB Device ID</th>
+                  </tr>
+                </thead>
+                <tbody>
+                  ${accList}
+                </tbody>
+              </table>
+              </div>
+            </div>
+            <div class="col-sm-2"></div>
+          </div>
+        </div>
+        <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.0.0-beta3/dist/js/bootstrap.bundle.min.js" integrity="sha384-JEW9xMcG8R+pH31jmWH6WWP0WintQrMb4s7ZOdauHnUtxwoG2vI5DkLtS3qm9Ekf" crossorigin="anonymous"></script>
+      </body>
+    </html>`
   }
 
   action (url) {
-    const nowDate = new Date()
-    if ((nowDate - this.lastDate) / 1000 < 1) {
-      throw new Error('Requested too soon')
-    }
-    this.lastDate = nowDate
     const pathParts = url.split('/')
     const device = pathParts[1]
     const action = pathParts[2]
diff --git a/lib/index.js b/lib/index.js
index ac02815c..5905f6a6 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -567,6 +567,11 @@ class eWeLinkPlatform {
       if (this.config.apiPort !== 0) {
         apiClient = new (require('./connection/api'))(this, devicesInHB)
         apiServer = http.createServer((req, res) => {
+          if (req.url === '/') {
+            res.writeHead(200, { 'Content-Type': 'text/html' })
+            res.end(apiClient.showHome())
+            return
+          }
           res.writeHead(200, { 'Content-Type': 'application/json' })
           try {
             const response = apiClient.action(req.url)

From 2bb54b95bb82cac124cad83c99bbbf27523492e7 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 5 May 2021 14:49:45 +0100
Subject: [PATCH 2013/3183] 6.4.1-beta.1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 829b089b..83a4afb1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.4.1-beta.0",
+  "version": "6.4.1-beta.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 7e647dca..a08fd2ce 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.4.1-beta.0",
+  "version": "6.4.1-beta.1",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 55c054dadc48a7210f8b64704d5a799b4b7011fc Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 5 May 2021 16:54:10 +0100
Subject: [PATCH 2014/3183] add brightness, change api method to
 updateCharacteristic

---
 lib/connection/api.js | 120 +++++++++++++++++++++++++++++++++---------
 lib/index.js          |   4 +-
 2 files changed, 96 insertions(+), 28 deletions(-)

diff --git a/lib/connection/api.js b/lib/connection/api.js
index 6cfbc6bb..9773bfa6 100644
--- a/lib/connection/api.js
+++ b/lib/connection/api.js
@@ -76,7 +76,7 @@ module.exports = class connectionAPI {
                 <tbody>
                 <tr>
                   <td class="small">
-                    Query the ON/OFF state.<br>
+                    Query the <code>on</code>/<code>off</code> state.<br>
                     Example response:<br>
                     <code>{"success":true,"response":"on"}</code>
                   </td>
@@ -84,7 +84,15 @@ module.exports = class connectionAPI {
                 </tr>
                 <tr>
                   <td class="small">
-                    Set the state to ON.<br>
+                    Query the brightness between <code>0</code>% and <code>100</code>%.<br>
+                    Example response:<br>
+                    <code>{"success":true,"response":34}</code>
+                  </td>
+                  <td class="align-middle small"><code>/{hbDeviceId}/get/brightness</code></td>
+                </tr>
+                <tr>
+                  <td class="small">
+                    Set the state to <code>on</code>.<br>
                     Example response:<br>
                     <code>{"success":true}</code>
                   </td>
@@ -92,7 +100,7 @@ module.exports = class connectionAPI {
                 </tr>
                 <tr>
                   <td class="small">
-                    Set the state to OFF.<br>
+                    Set the state to <code>off</code>.<br>
                     Example response:<br>
                     <code>{"success":true}</code>
                   </td>
@@ -100,12 +108,20 @@ module.exports = class connectionAPI {
                 </tr>
                 <tr>
                   <td class="small">
-                    Toggle the current state.<br>
+                    Switch (<code>toggle</code>) the current state.<br>
                     Example response:<br>
                     <code>{"success":true}</code>
                   </td>
                   <td class="align-middle small"><code>/{hbDeviceId}/set/state/toggle</code></td>
                 </tr>
+                <tr>
+                  <td class="small">
+                    Set the brightness between <code>0</code>% and <code>100</code>%.<br>
+                    Example response:<br>
+                    <code>{"success":true}</code>
+                  </td>
+                  <td class="align-middle small"><code>/{hbDeviceId}/set/brightness/54</code></td>
+                </tr>
                 </tbody>
               </table>
               </div>
@@ -132,7 +148,7 @@ module.exports = class connectionAPI {
     </html>`
   }
 
-  action (url) {
+  async action (url) {
     const pathParts = url.split('/')
     const device = pathParts[1]
     const action = pathParts[2]
@@ -154,46 +170,98 @@ module.exports = class connectionAPI {
     if (!attribute) {
       throw new Error('No attribute specified')
     }
-    if (!['state'].includes(attribute)) {
-      throw new Error("Action must be 'state'")
+    if (!['state', 'brightness'].includes(attribute)) {
+      throw new Error("Attribute must be 'state' or 'brightness'")
     }
     if (action === 'set') {
       if (!newStatus) {
         throw new Error('No new status specified')
       }
-      if (!['on', 'off', 'toggle'].includes(newStatus)) {
-        throw new Error("New status must be 'on', 'off' or 'toggle' for attribute:state")
-      }
     }
     const accessory = this.devicesInHB.get(uuid)
-    const service = accessory.getService(this.hapServ.Switch) ||
-      accessory.getService(this.hapServ.Outlet) ||
-      accessory.getService(this.hapServ.Lightbulb)
+    if (!accessory.control) {
+      throw new Error('Accessory has not been initialised yet')
+    }
+
+    let service
+    let charName
 
-    if (!service) {
-      throw new Error("Accessory is not 'Switch', 'Outlet' or 'Lightbulb'")
+    switch (attribute) {
+      case 'state':
+        service = accessory.getService(this.hapServ.Switch) ||
+          accessory.getService(this.hapServ.Outlet) ||
+          accessory.getService(this.hapServ.Lightbulb)
+        if (service) {
+          charName = service.testCharacteristic(this.hapChar.On)
+            ? this.hapChar.On
+            : false
+        }
+        break
+      case 'brightness':
+        service = accessory.getService(this.hapServ.Lightbulb)
+        if (service) {
+          charName = service.testCharacteristic(this.hapChar.Brightness)
+            ? this.hapChar.Brightness
+            : false
+        }
+        break
     }
 
-    const currentHKStatus = service.getCharacteristic(this.hapChar.On).value
+    if (!charName) {
+      throw new Error("Accessory does not support attribute '" + attribute + "'")
+    }
+
+    const currentHKStatus = service.getCharacteristic(charName).value
 
     if (action === 'get') {
-      return currentHKStatus ? 'on' : 'off'
+      switch (attribute) {
+        case 'state':
+          return service.getCharacteristic(charName).value ? 'on' : 'off'
+        case 'brightness':
+          return service.getCharacteristic(charName).value
+      }
     }
 
     if (action === 'set') {
       let newHKStatus
-      switch (newStatus) {
-        case 'on':
-          newHKStatus = true
-          break
-        case 'off':
-          newHKStatus = false
+      switch (attribute) {
+        case 'state':
+          switch (newStatus) {
+            case 'on':
+              newHKStatus = true
+              break
+            case 'off':
+              newHKStatus = false
+              break
+            case 'toggle':
+              newHKStatus = !currentHKStatus
+              break
+            default:
+              throw new Error(
+                "New status must be 'on', 'off' or 'toggle' for attribute:state"
+              )
+          }
+          if (!accessory.control.internalStateUpdate) {
+            throw new Error('Function to control accessory not found')
+          }
+          await accessory.control.internalStateUpdate(newHKStatus)
           break
-        case 'toggle':
-          newHKStatus = !currentHKStatus
+        case 'brightness': {
+          newHKStatus = parseInt(newStatus)
+          if (isNaN(newHKStatus) || newHKStatus < 0 || newHKStatus > 100) {
+            throw new Error(
+              'New status must be integer 0-100 for attribute:brightness'
+            )
+          }
+          if (!accessory.control.internalBrightnessUpdate) {
+            throw new Error('Function to control accessory not found')
+          }
+          await accessory.control.internalBrightnessUpdate(newHKStatus)
           break
+        }
       }
-      service.setCharacteristic(this.hapChar.On, newHKStatus)
+      // service.setCharacteristic(charName, newHKStatus)
+      service.updateCharacteristic(charName, newHKStatus)
     }
   }
 }
diff --git a/lib/index.js b/lib/index.js
index 5905f6a6..b6db1d6e 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -566,7 +566,7 @@ class eWeLinkPlatform {
       // Set up the listener server for the API if the user has this enabled
       if (this.config.apiPort !== 0) {
         apiClient = new (require('./connection/api'))(this, devicesInHB)
-        apiServer = http.createServer((req, res) => {
+        apiServer = http.createServer(async (req, res) => {
           if (req.url === '/') {
             res.writeHead(200, { 'Content-Type': 'text/html' })
             res.end(apiClient.showHome())
@@ -574,7 +574,7 @@ class eWeLinkPlatform {
           }
           res.writeHead(200, { 'Content-Type': 'application/json' })
           try {
-            const response = apiClient.action(req.url)
+            const response = await apiClient.action(req.url)
             res.end(JSON.stringify({ success: true, response }))
           } catch (e) {
             const eText = this.funcs.parseError(e)

From bf782dbc182151047faacfd3e6c3bb90e8348a16 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 5 May 2021 16:54:45 +0100
Subject: [PATCH 2015/3183] 6.4.1-beta.2

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 83a4afb1..0bb960dd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.4.1-beta.1",
+  "version": "6.4.1-beta.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index a08fd2ce..303dc081 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.4.1-beta.1",
+  "version": "6.4.1-beta.2",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 0505494da5c6e14ac8f88a6ab285bd8409c2dc5e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 5 May 2021 17:27:29 +0100
Subject: [PATCH 2016/3183] use more caching

---
 lib/device/outlet-scm.js           | 3 +++
 lib/device/outlet-single.js        | 3 +++
 lib/device/sensor-ambient.js       | 5 +++--
 lib/device/switch-single.js        | 3 +++
 lib/device/zigbee/switch-single.js | 3 +++
 5 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/lib/device/outlet-scm.js b/lib/device/outlet-scm.js
index 33f92c31..b3ed2845 100644
--- a/lib/device/outlet-scm.js
+++ b/lib/device/outlet-scm.js
@@ -62,6 +62,9 @@ module.exports = class deviceOutletSCM {
   async internalStateUpdate (value) {
     try {
       const newValue = value ? 'on' : 'off'
+      if (newValue === this.cacheState) {
+        return
+      }
       const params = {
         switches: [{ switch: newValue, outlet: 0 }]
       }
diff --git a/lib/device/outlet-single.js b/lib/device/outlet-single.js
index 97ce858e..472a48a9 100644
--- a/lib/device/outlet-single.js
+++ b/lib/device/outlet-single.js
@@ -154,6 +154,9 @@ module.exports = class deviceOutletSingle {
   async internalStateUpdate (value) {
     try {
       const newValue = value ? 'on' : 'off'
+      if (newValue === this.cacheState) {
+        return
+      }
       await this.platform.sendDeviceUpdate(this.accessory, {
         switch: newValue
       })
diff --git a/lib/device/sensor-ambient.js b/lib/device/sensor-ambient.js
index 17ea0ec4..c629cf0c 100644
--- a/lib/device/sensor-ambient.js
+++ b/lib/device/sensor-ambient.js
@@ -95,9 +95,10 @@ module.exports = class deviceSensorAmbient {
   async internalStateUpdate (value) {
     try {
       const newValue = value ? 'on' : 'off'
-      const params = {
-        switch: newValue
+      if (newValue === this.cacheState) {
+        return
       }
+      const params = { switch: newValue }
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.cacheState = newValue
       if (!this.disableDeviceLogging) {
diff --git a/lib/device/switch-single.js b/lib/device/switch-single.js
index 8ee1beda..e7df4557 100644
--- a/lib/device/switch-single.js
+++ b/lib/device/switch-single.js
@@ -51,6 +51,9 @@ module.exports = class deviceSwitchSingle {
   async internalStateUpdate (value) {
     try {
       const newValue = value ? 'on' : 'off'
+      if (newValue === this.cacheState) {
+        return
+      }
       await this.platform.sendDeviceUpdate(this.accessory, {
         switch: newValue
       })
diff --git a/lib/device/zigbee/switch-single.js b/lib/device/zigbee/switch-single.js
index 24f71cef..4fe426ab 100644
--- a/lib/device/zigbee/switch-single.js
+++ b/lib/device/zigbee/switch-single.js
@@ -54,6 +54,9 @@ module.exports = class deviceZBSwitchSingle {
   async internalStateUpdate (value) {
     try {
       const newValue = value ? 'on' : 'off'
+      if (newValue === this.cacheState) {
+        return
+      }
       await this.platform.sendDeviceUpdate(this.accessory, {
         switch: newValue
       })

From e736c13353764de3aa606db29756952be0f723fb Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 5 May 2021 17:39:57 +0100
Subject: [PATCH 2017/3183] offline device docs, and more checks for attribute

---
 lib/connection/api.js | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/lib/connection/api.js b/lib/connection/api.js
index 9773bfa6..03baa3cc 100644
--- a/lib/connection/api.js
+++ b/lib/connection/api.js
@@ -63,6 +63,13 @@ module.exports = class connectionAPI {
                     <li>Lights</li>
                   </ul>
                 </li>
+                <li>A note about offline devices:
+                  <ul>
+                    <li>Querying any attribute will return the HomeKit cache value</li>
+                    <li>Updating an attribute which matches the HomeKit cache value will return a <code>success:true</code> response</li>
+                    <li>Updating an attribute which does not match the HomeKit cache value will return a <code>success:false</code> with an <code>error:"HAP Status Error: -70402"</code> response</li>
+                  </ul>
+                </li>
               </ul>
               <h5 class="mt-4 mb-2">Available Commands</h5>
               <div class="table-responsive">
@@ -170,9 +177,6 @@ module.exports = class connectionAPI {
     if (!attribute) {
       throw new Error('No attribute specified')
     }
-    if (!['state', 'brightness'].includes(attribute)) {
-      throw new Error("Attribute must be 'state' or 'brightness'")
-    }
     if (action === 'set') {
       if (!newStatus) {
         throw new Error('No new status specified')
@@ -208,7 +212,7 @@ module.exports = class connectionAPI {
     }
 
     if (!charName) {
-      throw new Error("Accessory does not support attribute '" + attribute + "'")
+      throw new Error('Accessory does not support attribute:' + attribute)
     }
 
     const currentHKStatus = service.getCharacteristic(charName).value
@@ -219,6 +223,8 @@ module.exports = class connectionAPI {
           return service.getCharacteristic(charName).value ? 'on' : 'off'
         case 'brightness':
           return service.getCharacteristic(charName).value
+        default:
+          throw new Error("Invalid attribute for action:get'")
       }
     }
 
@@ -259,6 +265,8 @@ module.exports = class connectionAPI {
           await accessory.control.internalBrightnessUpdate(newHKStatus)
           break
         }
+        default:
+          throw new Error("Invalid attribute for action:set'")
       }
       // service.setCharacteristic(charName, newHKStatus)
       service.updateCharacteristic(charName, newHKStatus)

From a9868353e64e686a15c679cf0ec196f4dc4a912e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 5 May 2021 17:40:39 +0100
Subject: [PATCH 2018/3183] 6.4.1-beta.3

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 0bb960dd..5ae0e93c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.4.1-beta.2",
+  "version": "6.4.1-beta.3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 303dc081..df7d9625 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.4.1-beta.2",
+  "version": "6.4.1-beta.3",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From a47340277e3f5b30a66fe56f435a6e07b06ad047 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 5 May 2021 18:14:00 +0100
Subject: [PATCH 2019/3183] code comments

---
 lib/connection/api.js | 48 +++++++++++++++++++++++++++++++++++++++++--
 lib/index.js          |  6 ++++++
 2 files changed, 52 insertions(+), 2 deletions(-)

diff --git a/lib/connection/api.js b/lib/connection/api.js
index 03baa3cc..c97210a0 100644
--- a/lib/connection/api.js
+++ b/lib/connection/api.js
@@ -17,7 +17,7 @@ module.exports = class connectionAPI {
   }
 
   showHome () {
-    let accList = ''
+    // This nifty little function creates a map of devices sorted by display name
     const mapAsc = new Map([...this.devicesInHB.entries()].sort((a, b) => {
       return a[1].displayName.toLowerCase() > b[1].displayName.toLowerCase()
         ? 1
@@ -25,12 +25,17 @@ module.exports = class connectionAPI {
           ? -1
           : 0
     }))
+
+    // This variable stores the html table rows for displaying the devices
+    let accList = ''
     mapAsc.forEach(accessory => {
       accList += `<tr>
         <td class="small">${accessory.displayName}</td>
         <td class="small"><code>${accessory.context.hbDeviceId}</code></td>
       </tr>`
     })
+
+    // Return the home page for the API
     return `<!doctype html>
     <html lang="en">
       <head>
@@ -156,45 +161,66 @@ module.exports = class connectionAPI {
   }
 
   async action (url) {
+    // Obtain the parts of the request url
     const pathParts = url.split('/')
     const device = pathParts[1]
     const action = pathParts[2]
     const attribute = pathParts[3]
     const newStatus = pathParts[4]
+
+    // Check a device was specified
     if (!device) {
       throw new Error('No accessory specified')
     }
+
+    // Try and find the device in Homebridge
     const uuid = this.hapUUIDGen(device)
     if (!this.devicesInHB.has(uuid)) {
       throw new Error('Accessory not found in Homebridge')
     }
+
+    // Check an action was specified
     if (!action) {
       throw new Error('No action specified')
     }
+
+    // Check the action is either get or set
     if (!['get', 'set'].includes(action)) {
       throw new Error("Action must be 'get' or 'set'")
     }
+
+    // Check an attribute was specified
     if (!attribute) {
       throw new Error('No attribute specified')
     }
+
+    // Check a new status was supplied if the action is set
     if (action === 'set') {
       if (!newStatus) {
         throw new Error('No new status specified')
       }
     }
+
+    // Obtain the corresponding accessory
     const accessory = this.devicesInHB.get(uuid)
+
+    // Check the device is controllable
     if (!accessory.control) {
       throw new Error('Accessory has not been initialised yet')
     }
 
+    // These variables depend on the attribute that was supplied
     let service
     let charName
 
     switch (attribute) {
       case 'state':
+        // This can apply to switches outlets and lights
         service = accessory.getService(this.hapServ.Switch) ||
           accessory.getService(this.hapServ.Outlet) ||
           accessory.getService(this.hapServ.Lightbulb)
+
+        // Check the accessory has one of these services
         if (service) {
           charName = service.testCharacteristic(this.hapChar.On)
             ? this.hapChar.On
@@ -202,7 +228,10 @@ module.exports = class connectionAPI {
         }
         break
       case 'brightness':
+        // This can apply to lights
         service = accessory.getService(this.hapServ.Lightbulb)
+
+        // Check the accessory has one of these services
         if (service) {
           charName = service.testCharacteristic(this.hapChar.Brightness)
             ? this.hapChar.Brightness
@@ -211,12 +240,15 @@ module.exports = class connectionAPI {
         break
     }
 
+    // Check that the accessory has the corresponding characteristic for the attribute
     if (!charName) {
       throw new Error('Accessory does not support attribute:' + attribute)
     }
 
+    // Obtain the cached value of the accessory-service-characteristic
     const currentHKStatus = service.getCharacteristic(charName).value
 
+    // With a get action we return the cache value from above
     if (action === 'get') {
       switch (attribute) {
         case 'state':
@@ -228,10 +260,12 @@ module.exports = class connectionAPI {
       }
     }
 
+    // With a set action we need to call the set handler for the characteristic
     if (action === 'set') {
       let newHKStatus
       switch (attribute) {
         case 'state':
+          // The new status for state must be on, off or toggle
           switch (newStatus) {
             case 'on':
               newHKStatus = true
@@ -247,28 +281,38 @@ module.exports = class connectionAPI {
                 "New status must be 'on', 'off' or 'toggle' for attribute:state"
               )
           }
+
+          // Check the accessory has a correct set handler for on/off
           if (!accessory.control.internalStateUpdate) {
             throw new Error('Function to control accessory not found')
           }
+
+          // Call the set handler to send the request to eWeLink
           await accessory.control.internalStateUpdate(newHKStatus)
           break
         case 'brightness': {
+          // The new status for brightness must be an integer between 0 and 100
           newHKStatus = parseInt(newStatus)
           if (isNaN(newHKStatus) || newHKStatus < 0 || newHKStatus > 100) {
             throw new Error(
               'New status must be integer 0-100 for attribute:brightness'
             )
           }
+
+          // Check the accessory has a correct set handler for on/off
           if (!accessory.control.internalBrightnessUpdate) {
             throw new Error('Function to control accessory not found')
           }
+
+          // Call the set handler to send the request to eWeLink
           await accessory.control.internalBrightnessUpdate(newHKStatus)
           break
         }
         default:
           throw new Error("Invalid attribute for action:set'")
       }
-      // service.setCharacteristic(charName, newHKStatus)
+
+      // The eWeLink request was successful so update the characteristic in HomeKit
       service.updateCharacteristic(charName, newHKStatus)
     }
   }
diff --git a/lib/index.js b/lib/index.js
index b6db1d6e..f81bf3d7 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -567,16 +567,22 @@ class eWeLinkPlatform {
       if (this.config.apiPort !== 0) {
         apiClient = new (require('./connection/api'))(this, devicesInHB)
         apiServer = http.createServer(async (req, res) => {
+          // The 'homepage' shows an html document with info about the API
           if (req.url === '/') {
             res.writeHead(200, { 'Content-Type': 'text/html' })
             res.end(apiClient.showHome())
             return
           }
+
+          // Request is not for the homepage so action appropriately
           res.writeHead(200, { 'Content-Type': 'application/json' })
           try {
             const response = await apiClient.action(req.url)
+
+            // Actioning the request was successful so respond with a success
             res.end(JSON.stringify({ success: true, response }))
           } catch (e) {
+            // An error occurred actioning the request so respond with the error
             const eText = this.funcs.parseError(e)
             res.end(JSON.stringify({ success: false, error: eText }))
           }

From f68633bd22578fa9f918997708e66758160151e5 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 5 May 2021 18:14:42 +0100
Subject: [PATCH 2020/3183] 6.4.1-beta.4

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 5ae0e93c..664f9cdd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.4.1-beta.3",
+  "version": "6.4.1-beta.4",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index df7d9625..f2109deb 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.4.1-beta.3",
+  "version": "6.4.1-beta.4",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 066192d8c4726b8877aea710bc20e7102615a23e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 5 May 2021 19:59:37 +0100
Subject: [PATCH 2021/3183] add more endpoints to api

---
 lib/connection/api.js          | 308 +++++++++++++++++++++++++--------
 lib/device/light-cct.js        |  15 +-
 lib/device/light-rgb-cct.js    |  29 ++--
 lib/device/zigbee/light-cct.js |  12 +-
 4 files changed, 269 insertions(+), 95 deletions(-)

diff --git a/lib/connection/api.js b/lib/connection/api.js
index c97210a0..eb910dff 100644
--- a/lib/connection/api.js
+++ b/lib/connection/api.js
@@ -66,6 +66,8 @@ module.exports = class connectionAPI {
                     <li>Switches</li>
                     <li>Outlets</li>
                     <li>Lights</li>
+                    <li>Temperature Sensors</li>
+                    <li>Humidity Sensors</li>
                   </ul>
                 </li>
                 <li>A note about offline devices:
@@ -86,54 +88,110 @@ module.exports = class connectionAPI {
                   </tr>
                 </thead>
                 <tbody>
-                <tr>
-                  <td class="small">
-                    Query the <code>on</code>/<code>off</code> state.<br>
-                    Example response:<br>
-                    <code>{"success":true,"response":"on"}</code>
-                  </td>
-                  <td class="align-middle small"><code>/{hbDeviceId}/get/state</code></td>
-                </tr>
-                <tr>
-                  <td class="small">
-                    Query the brightness between <code>0</code>% and <code>100</code>%.<br>
-                    Example response:<br>
-                    <code>{"success":true,"response":34}</code>
-                  </td>
-                  <td class="align-middle small"><code>/{hbDeviceId}/get/brightness</code></td>
-                </tr>
-                <tr>
-                  <td class="small">
-                    Set the state to <code>on</code>.<br>
-                    Example response:<br>
-                    <code>{"success":true}</code>
-                  </td>
-                  <td class="align-middle small"><code>/{hbDeviceId}/set/state/on</code></td>
-                </tr>
-                <tr>
-                  <td class="small">
-                    Set the state to <code>off</code>.<br>
-                    Example response:<br>
-                    <code>{"success":true}</code>
-                  </td>
-                  <td class="align-middle small"><code>/{hbDeviceId}/set/state/off</code></td>
-                </tr>
-                <tr>
-                  <td class="small">
-                    Switch (<code>toggle</code>) the current state.<br>
-                    Example response:<br>
-                    <code>{"success":true}</code>
-                  </td>
-                  <td class="align-middle small"><code>/{hbDeviceId}/set/state/toggle</code></td>
-                </tr>
-                <tr>
-                  <td class="small">
-                    Set the brightness between <code>0</code>% and <code>100</code>%.<br>
-                    Example response:<br>
-                    <code>{"success":true}</code>
-                  </td>
-                  <td class="align-middle small"><code>/{hbDeviceId}/set/brightness/54</code></td>
-                </tr>
+                  <tr>
+                    <td class="small">
+                      Query the <code>on</code>/<code>off</code> state.<br>
+                      Example response:<br>
+                      <code>{"success":true,"response":"on"}</code>
+                    </td>
+                    <td class="align-middle small"><code>/{hbDeviceId}/get/state</code></td>
+                  </tr>
+                  <tr>
+                    <td class="small">
+                      Query the brightness between <code>0</code>% and <code>100</code>%.<br>
+                      Example response:<br>
+                      <code>{"success":true,"response":34}</code>
+                    </td>
+                    <td class="align-middle small"><code>/{hbDeviceId}/get/brightness</code></td>
+                  </tr>
+                  <tr>
+                    <td class="small">
+                      Query the hue between <code>0</code>° and <code>360</code>°.<br>
+                      Example response:<br>
+                      <code>{"success":true,"response":17}</code>
+                    </td>
+                    <td class="align-middle small"><code>/{hbDeviceId}/get/hue</code></td>
+                  </tr>
+                  <tr>
+                    <td class="small">
+                      Query the colour temperature between <code>140</code> and <code>500</code> mired.<br>
+                      Example response:<br>
+                      <code>{"success":true,"response":345}</code>
+                    </td>
+                    <td class="align-middle small"><code>/{hbDeviceId}/get/colourtemperature</code></td>
+                  </tr>
+                  <tr>
+                    <td class="small">
+                      Query the Adaptive Lighting <code>on</code>/<code>off</code> state.<br>
+                      Example response:<br>
+                      <code>{"success":true,"response":"on"}</code>
+                    </td>
+                    <td class="align-middle small"><code>/{hbDeviceId}/get/adaptivelighting</code></td>
+                  </tr>
+                  <tr>
+                    <td class="small">
+                      Query the temperature as °C.<br>
+                      Example response:<br>
+                      <code>{"success":true,"response":16.3}</code>
+                    </td>
+                    <td class="align-middle small"><code>/{hbDeviceId}/get/temperature</code></td>
+                  </tr>
+                  <tr>
+                    <td class="small">
+                      Query the humidity a %.<br>
+                      Example response:<br>
+                      <code>{"success":true,"response":54}</code>
+                    </td>
+                    <td class="align-middle small"><code>/{hbDeviceId}/get/humidity</code></td>
+                  </tr>
+                  <tr>
+                    <td class="small">
+                      Set the state to <code>on</code>.<br>
+                      Example response:<br>
+                      <code>{"success":true}</code>
+                    </td>
+                    <td class="align-middle small"><code>/{hbDeviceId}/set/state/on</code></td>
+                  </tr>
+                  <tr>
+                    <td class="small">
+                      Set the state to <code>off</code>.<br>
+                      Example response:<br>
+                      <code>{"success":true}</code>
+                    </td>
+                    <td class="align-middle small"><code>/{hbDeviceId}/set/state/off</code></td>
+                  </tr>
+                  <tr>
+                    <td class="small">
+                      Switch (<code>toggle</code>) the current state.<br>
+                      Example response:<br>
+                      <code>{"success":true}</code>
+                    </td>
+                    <td class="align-middle small"><code>/{hbDeviceId}/set/state/toggle</code></td>
+                  </tr>
+                  <tr>
+                    <td class="small">
+                      Set the brightness between <code>0</code>% and <code>100</code>%.<br>
+                      Example response:<br>
+                      <code>{"success":true}</code>
+                    </td>
+                    <td class="align-middle small"><code>/{hbDeviceId}/set/brightness/54</code></td>
+                  </tr>
+                  <tr>
+                    <td class="small">
+                      Set the hue between <code>0</code>° and <code>360</code>°.<br>
+                      Example response:<br>
+                      <code>{"success":true}</code>
+                    </td>
+                    <td class="align-middle small"><code>/{hbDeviceId}/set/hue/157</code></td>
+                  </tr>
+                  <tr>
+                    <td class="small">
+                      Set the colour temperature between <code>140</code> and <code>500</code> mired.<br>
+                      Example response:<br>
+                      <code>{"success":true}</code>
+                    </td>
+                    <td class="align-middle small"><code>/{hbDeviceId}/set/colourtemperature/300</code></td>
+                  </tr>
                 </tbody>
               </table>
               </div>
@@ -214,6 +272,51 @@ module.exports = class connectionAPI {
     let charName
 
     switch (attribute) {
+      case 'adaptivelighting':
+      case 'colourtemperature':
+        // This can apply to lights that support colour
+        service = accessory.getService(this.hapServ.Lightbulb)
+
+        // Check the accessory has one of these services
+        if (service) {
+          charName = service.testCharacteristic(this.hapChar.ColorTemperature)
+            ? this.hapChar.ColorTemperature
+            : false
+        }
+        break
+      case 'brightness':
+        // This can apply to lights
+        service = accessory.getService(this.hapServ.Lightbulb)
+
+        // Check the accessory has one of these services
+        if (service) {
+          charName = service.testCharacteristic(this.hapChar.Brightness)
+            ? this.hapChar.Brightness
+            : false
+        }
+        break
+      case 'hue':
+        // This can apply to lights that support colour
+        service = accessory.getService(this.hapServ.Lightbulb)
+
+        // Check the accessory has one of these services
+        if (service) {
+          charName = service.testCharacteristic(this.hapChar.Hue)
+            ? this.hapChar.Hue
+            : false
+        }
+        break
+      case 'humidity':
+        // This can apply to humidity sensors
+        service = accessory.getService(this.hapServ.HumiditySensor)
+
+        // Check the accessory has one of these services
+        if (service) {
+          charName = service.testCharacteristic(this.hapChar.CurrentRelativeHumidity)
+            ? this.hapChar.CurrentRelativeHumidity
+            : false
+        }
+        break
       case 'state':
         // This can apply to switches outlets and lights
         service = accessory.getService(this.hapServ.Switch) ||
@@ -227,17 +330,19 @@ module.exports = class connectionAPI {
             : false
         }
         break
-      case 'brightness':
-        // This can apply to lights
-        service = accessory.getService(this.hapServ.Lightbulb)
+      case 'temperature':
+        // This can apply to temperature sensors
+        service = accessory.getService(this.hapServ.TemperatureSensor)
 
         // Check the accessory has one of these services
         if (service) {
-          charName = service.testCharacteristic(this.hapChar.Brightness)
-            ? this.hapChar.Brightness
+          charName = service.testCharacteristic(this.hapChar.CurrentTemperature)
+            ? this.hapChar.CurrentTemperature
             : false
         }
         break
+      default:
+        throw new Error('Invalid attribute given')
     }
 
     // Check that the accessory has the corresponding characteristic for the attribute
@@ -251,10 +356,19 @@ module.exports = class connectionAPI {
     // With a get action we return the cache value from above
     if (action === 'get') {
       switch (attribute) {
-        case 'state':
-          return service.getCharacteristic(charName).value ? 'on' : 'off'
+        case 'adaptivelighting':
+          return accessory.alController &&
+            accessory.alController.isAdaptiveLightingActive()
+            ? 'on'
+            : 'off'
         case 'brightness':
+        case 'colourtemperature':
+        case 'hue':
+        case 'humidity':
+        case 'temperature':
           return service.getCharacteristic(charName).value
+        case 'state':
+          return service.getCharacteristic(charName).value ? 'on' : 'off'
         default:
           throw new Error("Invalid attribute for action:get'")
       }
@@ -264,6 +378,72 @@ module.exports = class connectionAPI {
     if (action === 'set') {
       let newHKStatus
       switch (attribute) {
+        case 'brightness': {
+          // The new status for brightness must be an integer between 0 and 100
+          newHKStatus = parseInt(newStatus)
+          if (isNaN(newHKStatus) || newHKStatus < 0 || newHKStatus > 100) {
+            throw new Error(
+              'New status must be integer 0-100 for attribute:brightness'
+            )
+          }
+
+          // Check the accessory has a correct set handler for on/off
+          if (!accessory.control.internalBrightnessUpdate) {
+            throw new Error('Function to control accessory not found')
+          }
+
+          // Call the set handler to send the request to eWeLink
+          await accessory.control.internalBrightnessUpdate(newHKStatus)
+          break
+        }
+        case 'colourtemperature': {
+          // The new status for colour temperature must be an integer between 140 and 500
+          newHKStatus = parseInt(newStatus)
+          if (isNaN(newHKStatus) || newHKStatus < 140 || newHKStatus > 500) {
+            throw new Error(
+              'New status must be integer 140-500 for attribute:colourtemperature'
+            )
+          }
+
+          // Check the accessory has a correct set handler for on/off
+          if (!accessory.control.internalCTUpdate) {
+            throw new Error('Function to control accessory not found')
+          }
+
+          // Call the set handler to send the request to eWeLink
+          if (
+            accessory.alController &&
+            accessory.alController.isAdaptiveLightingActive()
+          ) {
+            accessory.alController.disableAdaptiveLighting()
+          }
+          await accessory.control.internalCTUpdate(newHKStatus)
+          break
+        }
+        case 'hue': {
+          // The new status for hue must be an integer between 0 and 360
+          newHKStatus = parseInt(newStatus)
+          if (isNaN(newHKStatus) || newHKStatus < 0 || newHKStatus > 360) {
+            throw new Error(
+              'New status must be integer 0-360 for attribute:hue'
+            )
+          }
+
+          // Check the accessory has a correct set handler for on/off
+          if (!accessory.control.internalColourUpdate) {
+            throw new Error('Function to control accessory not found')
+          }
+
+          // Call the set handler to send the request to eWeLink
+          if (
+            accessory.alController &&
+            accessory.alController.isAdaptiveLightingActive()
+          ) {
+            accessory.alController.disableAdaptiveLighting()
+          }
+          await accessory.control.internalColourUpdate(newHKStatus)
+          break
+        }
         case 'state':
           // The new status for state must be on, off or toggle
           switch (newStatus) {
@@ -290,24 +470,6 @@ module.exports = class connectionAPI {
           // Call the set handler to send the request to eWeLink
           await accessory.control.internalStateUpdate(newHKStatus)
           break
-        case 'brightness': {
-          // The new status for brightness must be an integer between 0 and 100
-          newHKStatus = parseInt(newStatus)
-          if (isNaN(newHKStatus) || newHKStatus < 0 || newHKStatus > 100) {
-            throw new Error(
-              'New status must be integer 0-100 for attribute:brightness'
-            )
-          }
-
-          // Check the accessory has a correct set handler for on/off
-          if (!accessory.control.internalBrightnessUpdate) {
-            throw new Error('Function to control accessory not found')
-          }
-
-          // Call the set handler to send the request to eWeLink
-          await accessory.control.internalBrightnessUpdate(newHKStatus)
-          break
-        }
         default:
           throw new Error("Invalid attribute for action:set'")
       }
diff --git a/lib/device/light-cct.js b/lib/device/light-cct.js
index 65fed136..6cb24ebb 100644
--- a/lib/device/light-cct.js
+++ b/lib/device/light-cct.js
@@ -73,11 +73,11 @@ module.exports = class deviceLightCCT {
     this.cacheBright = this.service.getCharacteristic(this.hapChar.Brightness).value
 
     // Set up the adaptive lighting controller
-    this.alController = new platform.api.hap.AdaptiveLightingController(
+    this.accessory.alController = new platform.api.hap.AdaptiveLightingController(
       this.service,
       { customTemperatureAdjustment: this.alShift }
     )
-    this.accessory.configureController(this.alController)
+    this.accessory.configureController(this.accessory.alController)
 
     // Output the customised options to the log if in debug mode
     if (platform.config.debug) {
@@ -162,7 +162,7 @@ module.exports = class deviceLightCCT {
       if (this.cacheMired === value || this.cacheState !== 'on') {
         return
       }
-      if (!this.isOnline && this.alController.isAdaptiveLightingActive()) {
+      if (!this.isOnline && this.accessory.alController.isAdaptiveLightingActive()) {
         return
       }
       const updateKey = Math.random().toString(36).substr(2, 8)
@@ -190,7 +190,10 @@ module.exports = class deviceLightCCT {
       this.cacheMired = value
       this.cacheCT = scaledCT
       if (!this.disableDeviceLogging) {
-        if (this.alController && this.alController.isAdaptiveLightingActive()) {
+        if (
+          this.accessory.alController &&
+          this.accessory.alController.isAdaptiveLightingActive()
+        ) {
           this.log(
             '[%s] %s [%sK] %s.',
             this.name,
@@ -251,9 +254,9 @@ module.exports = class deviceLightCCT {
             if (!this.disableDeviceLogging) {
               this.log('[%s] %s [%sK].', this.name, this.lang.curColour, scaledK)
             }
-            if (this.alController.isAdaptiveLightingActive() && ctDiff > 20) {
+            if (this.accessory.alController.isAdaptiveLightingActive() && ctDiff > 20) {
               // Look for a variation greater than twenty
-              this.alController.disableAdaptiveLighting()
+              this.accessory.alController.disableAdaptiveLighting()
               if (!this.disableDeviceLogging) {
                 this.log('[%s] %s.', this.name, this.lang.disabledAL)
               }
diff --git a/lib/device/light-rgb-cct.js b/lib/device/light-rgb-cct.js
index b403f5cb..887e7ab7 100644
--- a/lib/device/light-rgb-cct.js
+++ b/lib/device/light-rgb-cct.js
@@ -65,11 +65,11 @@ module.exports = class deviceLightRGBCCT {
     this.cacheBright = this.service.getCharacteristic(this.hapChar.Brightness).value
 
     // Set up the adaptive lighting controller
-    this.alController = new platform.api.hap.AdaptiveLightingController(
+    this.accessory.alController = new platform.api.hap.AdaptiveLightingController(
       this.service,
       { customTemperatureAdjustment: this.alShift }
     )
-    this.accessory.configureController(this.alController)
+    this.accessory.configureController(this.accessory.alController)
 
     // Output the customised options to the log if in debug mode
     if (platform.config.debug) {
@@ -247,7 +247,7 @@ module.exports = class deviceLightRGBCCT {
       if (this.cacheMired === value || this.cacheState !== 'on') {
         return
       }
-      if (!this.isOnline && this.alController.isAdaptiveLightingActive()) {
+      if (!this.isOnline && this.accessory.alController.isAdaptiveLightingActive()) {
         return
       }
       const updateKey = Math.random().toString(36).substr(2, 8)
@@ -310,7 +310,7 @@ module.exports = class deviceLightRGBCCT {
           break
       }
       if (!this.disableDeviceLogging) {
-        if (this.alController.isAdaptiveLightingActive()) {
+        if (this.accessory.alController.isAdaptiveLightingActive()) {
           this.log(
             '[%s] %s [%sK] %s.',
             this.name,
@@ -387,8 +387,11 @@ module.exports = class deviceLightRGBCCT {
                     this.cacheR + ' ' + this.cacheG + ' ' + this.cacheB
                   )
                 }
-                if (this.alController.isAdaptiveLightingActive() && rgbDiff > 50) {
-                  this.alController.disableAdaptiveLighting()
+                if (
+                  this.accessory.alController.isAdaptiveLightingActive() &&
+                  rgbDiff > 50
+                ) {
+                  this.accessory.alController.disableAdaptiveLighting()
                   if (!this.disableDeviceLogging) {
                     this.log('[%s] %s.', this.name, this.lang.disabledAL)
                   }
@@ -444,8 +447,11 @@ module.exports = class deviceLightRGBCCT {
                 }
               }
             }
-            if (params.updateSource && this.alController.isAdaptiveLightingActive()) {
-              this.alController.disableAdaptiveLighting()
+            if (
+              params.updateSource &&
+              this.accessory.alController.isAdaptiveLightingActive()
+            ) {
+              this.accessory.alController.disableAdaptiveLighting()
               if (!this.disableDeviceLogging) {
                 this.log('[%s] %s.', this.name, this.lang.disabledAL)
               }
@@ -490,9 +496,12 @@ module.exports = class deviceLightRGBCCT {
                 if (!this.disableDeviceLogging) {
                   this.log('[%s] %s [%sK].', this.name, this.lang.curColour, ctToK)
                 }
-                if (this.alController.isAdaptiveLightingActive() && ctDiff > 20) {
+                if (
+                  this.accessory.alController.isAdaptiveLightingActive() &&
+                  ctDiff > 20
+                ) {
                   // Look for a variation greater than twenty
-                  this.alController.disableAdaptiveLighting()
+                  this.accessory.alController.disableAdaptiveLighting()
                   if (!this.disableDeviceLogging) {
                     this.log('[%s] %s.', this.name, this.lang.disabledAL)
                   }
diff --git a/lib/device/zigbee/light-cct.js b/lib/device/zigbee/light-cct.js
index e9a62fe6..07f205e8 100644
--- a/lib/device/zigbee/light-cct.js
+++ b/lib/device/zigbee/light-cct.js
@@ -66,11 +66,11 @@ module.exports = class deviceZBLightCCT {
     this.cacheBright = this.service.getCharacteristic(this.hapChar.Brightness).value
 
     // Set up the adaptive lighting controller
-    this.alController = new platform.api.hap.AdaptiveLightingController(
+    this.accessory.alController = new platform.api.hap.AdaptiveLightingController(
       this.service,
       { customTemperatureAdjustment: this.alShift }
     )
-    this.accessory.configureController(this.alController)
+    this.accessory.configureController(this.accessory.alController)
 
     // Output the customised options to the log if in debug mode
     if (platform.config.debug) {
@@ -136,7 +136,7 @@ module.exports = class deviceZBLightCCT {
       if (this.cacheMired === value || this.cacheState !== 'on') {
         return
       }
-      if (!this.isOnline && this.alController.isAdaptiveLightingActive()) {
+      if (!this.isOnline && this.accessory.alController.isAdaptiveLightingActive()) {
         return
       }
       const updateKey = Math.random().toString(36).substr(2, 8)
@@ -156,7 +156,7 @@ module.exports = class deviceZBLightCCT {
       this.cacheMired = value
       this.cacheCT = scaledCT
       if (!this.disableDeviceLogging) {
-        if (this.alController.isAdaptiveLightingActive()) {
+        if (this.accessory.alController.isAdaptiveLightingActive()) {
           this.log(
             '[%s] %s [%sK] %s.',
             this.name,
@@ -210,9 +210,9 @@ module.exports = class deviceZBLightCCT {
             if (!this.disableDeviceLogging) {
               this.log('[%s] %s [%sK].', this.name, this.lang.curColour, scaledK)
             }
-            if (this.alController.isAdaptiveLightingActive() && ctDiff > 20) {
+            if (this.accessory.alController.isAdaptiveLightingActive() && ctDiff > 20) {
               // Look for a variation greater than twenty
-              this.alController.disableAdaptiveLighting()
+              this.accessory.alController.disableAdaptiveLighting()
               if (!this.disableDeviceLogging) {
                 this.log('[%s] %s.', this.name, this.lang.disabledAL)
               }

From 476f49e74b97d0fb9a6fd9d753d286447f94e78a Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 5 May 2021 20:01:09 +0100
Subject: [PATCH 2022/3183] 6.4.1-beta.5

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 664f9cdd..fb2fedb3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.4.1-beta.4",
+  "version": "6.4.1-beta.5",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index f2109deb..405431a9 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.4.1-beta.4",
+  "version": "6.4.1-beta.5",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From c2e98910b8651c8a727397303ca86073765f3e13 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 5 May 2021 20:46:17 +0100
Subject: [PATCH 2023/3183] more api funcs, docs

---
 lib/connection/api.js | 55 ++++++++++++++++++++++++++++++++++---------
 1 file changed, 44 insertions(+), 11 deletions(-)

diff --git a/lib/connection/api.js b/lib/connection/api.js
index eb910dff..feefa4fb 100644
--- a/lib/connection/api.js
+++ b/lib/connection/api.js
@@ -29,9 +29,13 @@ module.exports = class connectionAPI {
     // This variable stores the html table rows for displaying the devices
     let accList = ''
     mapAsc.forEach(accessory => {
+      const colourWAN = accessory.context.reachableWAN ? '4caf50' : 'f44336'
+      const colourLAN = accessory.context.reachableLAN ? '4caf50' : 'f44336'
       accList += `<tr>
         <td class="small">${accessory.displayName}</td>
         <td class="small"><code>${accessory.context.hbDeviceId}</code></td>
+        <td class="small text-center"><i class="fa fa-circle" style="color: #${colourWAN} !important;"></i></td>
+        <td class="small text-center"><i class="fa fa-circle" style="color: #${colourLAN} !important;"></i></td>
       </tr>`
     })
 
@@ -43,6 +47,7 @@ module.exports = class connectionAPI {
         <meta name="viewport" content="width=device-width, initial-scale=1">
         <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.0-beta3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-eOJMYsd53ii+scO/bJGFsiCZc+5NDVN2yr8+0RDqr0Ql0h+rP48ckxlpbzKgwra6" crossorigin="anonymous">
         <title>homebridge-ewelink API Docs</title>
+        <script src="https://kit.fontawesome.com/7b8907c984.js" crossorigin="anonymous"></script>
       </head>
       <body>
         <div class="container-fluid mt-3">
@@ -88,6 +93,22 @@ module.exports = class connectionAPI {
                   </tr>
                 </thead>
                 <tbody>
+                  <tr>
+                    <td class="small">
+                      Query the <code>online</code>/<code>offline</code> cloud (WAN) state.<br>
+                      Example response:<br>
+                      <code>{"success":true,"response":"online"}</code>
+                    </td>
+                    <td class="align-middle small"><code>/{hbDeviceId}/get/reachablewan</code></td>
+                  </tr>
+                  <tr>
+                    <td class="small">
+                      Query the <code>online</code>/<code>offline</code> local (LAN) state.<br>
+                      Example response:<br>
+                      <code>{"success":true,"response":"offline"}</code>
+                    </td>
+                    <td class="align-middle small"><code>/{hbDeviceId}/get/reachablelan</code></td>
+                  </tr>
                   <tr>
                     <td class="small">
                       Query the <code>on</code>/<code>off</code> state.<br>
@@ -197,17 +218,19 @@ module.exports = class connectionAPI {
               </div>
               <h5 class="mt-4 mb-2">Accessory List</h5>
               <div class="table-responsive">
-              <table class="table table-sm table-hover">
-                <thead>
-                  <tr>
-                    <th scope="col" class="small" style="width: 50%;">Accessory Name</th>
-                    <th scope="col" class="small" style="width: 50%;">HB Device ID</th>
-                  </tr>
-                </thead>
-                <tbody>
-                  ${accList}
-                </tbody>
-              </table>
+                <table class="table table-sm table-hover">
+                  <thead>
+                    <tr>
+                      <th scope="col" class="small" style="width: 43%;">Accessory Name</th>
+                      <th scope="col" class="small" style="width: 43%;">HB Device ID</th>
+                      <th scope="col" class="small text-center" style="width: 7%;">WAN</th>
+                      <th scope="col" class="small text-center" style="width: 7%;">LAN</th>
+                    </tr>
+                  </thead>
+                  <tbody>
+                    ${accList}
+                  </tbody>
+                </table>
               </div>
             </div>
             <div class="col-sm-2"></div>
@@ -262,6 +285,16 @@ module.exports = class connectionAPI {
     // Obtain the corresponding accessory
     const accessory = this.devicesInHB.get(uuid)
 
+    // Special case for the reachable WAN and LAN attributes
+    if (action === 'get') {
+      if (attribute === 'reachablewan') {
+        return accessory.context.reachableWAN ? 'online' : 'offline'
+      }
+      if (attribute === 'reachablelan') {
+        return accessory.context.reachableLAN ? 'online' : 'offline'
+      }
+    }
+
     // Check the device is controllable
     if (!accessory.control) {
       throw new Error('Accessory has not been initialised yet')

From ec662a2b268928ae98c496e326386ba37b4f11ed Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 5 May 2021 20:46:44 +0100
Subject: [PATCH 2024/3183] 6.4.1-beta.6

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index fb2fedb3..b320ba4b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.4.1-beta.5",
+  "version": "6.4.1-beta.6",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 405431a9..e9828781 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.4.1-beta.5",
+  "version": "6.4.1-beta.6",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 578b8779e5db6056c817f74b2698bc40b5350447 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 5 May 2021 20:54:11 +0100
Subject: [PATCH 2025/3183] adjust sides and margins

---
 lib/connection/api.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/connection/api.js b/lib/connection/api.js
index feefa4fb..3cc7e1d8 100644
--- a/lib/connection/api.js
+++ b/lib/connection/api.js
@@ -50,10 +50,10 @@ module.exports = class connectionAPI {
         <script src="https://kit.fontawesome.com/7b8907c984.js" crossorigin="anonymous"></script>
       </head>
       <body>
-        <div class="container-fluid mt-3">
+        <div class="container-fluid my-3">
           <div class="row content">
-            <div class="col-sm-2"></div>
-            <div class="col-sm-8">
+            <div class="col-lg-2"></div>
+            <div class="col-lg-8">
               <p class="text-center">
                 <img src="https://user-images.githubusercontent.com/43026681/101325266-63126600-3863-11eb-9382-4a2924f0e540.png" alt="homebridge-ewelink logo" style="width: 60%;">
                 <h4 class="text-center">homebridge-ewelink</h3>
@@ -233,7 +233,7 @@ module.exports = class connectionAPI {
                 </table>
               </div>
             </div>
-            <div class="col-sm-2"></div>
+            <div class="col-lg-2"></div>
           </div>
         </div>
         <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.0.0-beta3/dist/js/bootstrap.bundle.min.js" integrity="sha384-JEW9xMcG8R+pH31jmWH6WWP0WintQrMb4s7ZOdauHnUtxwoG2vI5DkLtS3qm9Ekf" crossorigin="anonymous"></script>

From bba3723a35a745472ba5ed35cdc87e1ab1a203f5 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 5 May 2021 20:54:38 +0100
Subject: [PATCH 2026/3183] 6.4.1-beta.7

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b320ba4b..6bf9eea1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.4.1-beta.6",
+  "version": "6.4.1-beta.7",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index e9828781..fa96c301 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.4.1-beta.6",
+  "version": "6.4.1-beta.7",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 615391cb1d2487586d13a3ae80a97c3de5a45ae2 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 5 May 2021 20:58:46 +0100
Subject: [PATCH 2027/3183] rename endpoints

---
 lib/connection/api.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/connection/api.js b/lib/connection/api.js
index 3cc7e1d8..8a3b5d86 100644
--- a/lib/connection/api.js
+++ b/lib/connection/api.js
@@ -99,7 +99,7 @@ module.exports = class connectionAPI {
                       Example response:<br>
                       <code>{"success":true,"response":"online"}</code>
                     </td>
-                    <td class="align-middle small"><code>/{hbDeviceId}/get/reachablewan</code></td>
+                    <td class="align-middle small"><code>/{hbDeviceId}/get/statuswan</code></td>
                   </tr>
                   <tr>
                     <td class="small">
@@ -107,7 +107,7 @@ module.exports = class connectionAPI {
                       Example response:<br>
                       <code>{"success":true,"response":"offline"}</code>
                     </td>
-                    <td class="align-middle small"><code>/{hbDeviceId}/get/reachablelan</code></td>
+                    <td class="align-middle small"><code>/{hbDeviceId}/get/statuslan</code></td>
                   </tr>
                   <tr>
                     <td class="small">
@@ -287,10 +287,10 @@ module.exports = class connectionAPI {
 
     // Special case for the reachable WAN and LAN attributes
     if (action === 'get') {
-      if (attribute === 'reachablewan') {
+      if (attribute === 'statuswan') {
         return accessory.context.reachableWAN ? 'online' : 'offline'
       }
-      if (attribute === 'reachablelan') {
+      if (attribute === 'statuslan') {
         return accessory.context.reachableLAN ? 'online' : 'offline'
       }
     }

From e158a29c39d56cbe569f2bd44df3c63944d3611c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 5 May 2021 20:59:13 +0100
Subject: [PATCH 2028/3183] 6.4.1-beta.8

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 6bf9eea1..ae393bf2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.4.1-beta.7",
+  "version": "6.4.1-beta.8",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index fa96c301..8e539c48 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.4.1-beta.7",
+  "version": "6.4.1-beta.8",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From b04f2ca7258878927e1693207d218923ca0e016f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 5 May 2021 21:09:05 +0100
Subject: [PATCH 2029/3183] mark wan offline if mode is lan

---
 lib/index.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/index.js b/lib/index.js
index f81bf3d7..70618dd3 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1035,7 +1035,7 @@ class eWeLinkPlatform {
 
           // Add context information to the sub accessory
           subAccessory.context.firmware = device.params.fwVersion || plugin.version
-          subAccessory.context.reachableWAN = device.online
+          subAccessory.context.reachableWAN = wsClient && device.online
           subAccessory.context.reachableLAN = lanClient &&
             lanDevices.has(device.deviceid)
             ? lanDevices.get(device.deviceid).ip
@@ -1173,7 +1173,7 @@ class eWeLinkPlatform {
 
           // Add context information to the sub accessory
           subAccessory.context.firmware = device.params.fwVersion || plugin.version
-          subAccessory.context.reachableWAN = device.online
+          subAccessory.context.reachableWAN = wsClient && device.online
           subAccessory.context.reachableLAN = false
           subAccessory.context.eweBrandName = device.brandName
           subAccessory.context.eweBrandLogo = device.brandLogo
@@ -1288,7 +1288,7 @@ class eWeLinkPlatform {
 
       // Update the reachability values (via WS and LAN)
       accessory.context.firmware = device.params.fwVersion || plugin.version
-      accessory.context.reachableWAN = device.online
+      accessory.context.reachableWAN = wsClient && device.online
       accessory.context.reachableLAN = lanClient &&
         lanDevices.has(device.deviceid)
         ? lanDevices.get(device.deviceid).ip

From acbd52ee4d5a1bd5eba4f1aa4326d15cb88fd888 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 5 May 2021 21:11:02 +0100
Subject: [PATCH 2030/3183] 6.4.1-beta.9

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ae393bf2..5a62f00a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.4.1-beta.8",
+  "version": "6.4.1-beta.9",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 8e539c48..f518e330 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.4.1-beta.8",
+  "version": "6.4.1-beta.9",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From f4f792cde6d2fe522f4ce08f6d1b764e16b7a25d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 5 May 2021 21:15:08 +0100
Subject: [PATCH 2031/3183] don't show hidden accessories on api page

---
 lib/connection/api.js | 8 ++++++++
 lib/index.js          | 3 ++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/lib/connection/api.js b/lib/connection/api.js
index 8a3b5d86..62fe52d4 100644
--- a/lib/connection/api.js
+++ b/lib/connection/api.js
@@ -29,8 +29,16 @@ module.exports = class connectionAPI {
     // This variable stores the html table rows for displaying the devices
     let accList = ''
     mapAsc.forEach(accessory => {
+      // Skip if it's a hidden accessory
+      if (accessory.context.hidden) {
+        return
+      }
+      
+      // Get the colours for the status icons
       const colourWAN = accessory.context.reachableWAN ? '4caf50' : 'f44336'
       const colourLAN = accessory.context.reachableLAN ? '4caf50' : 'f44336'
+      
+      // Add the html table row
       accList += `<tr>
         <td class="small">${accessory.displayName}</td>
         <td class="small"><code>${accessory.context.hbDeviceId}</code></td>
diff --git a/lib/index.js b/lib/index.js
index 70618dd3..088dce31 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1402,7 +1402,8 @@ class eWeLinkPlatform {
           eweModel: device.productModel,
           eweApiKey: device.apikey,
           switchNumber,
-          channelCount
+          channelCount,
+          hidden
         },
         ...extraContext
       }

From 1c0d9d7accd51daa5dddb1799df433ebfc7b0b7b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 5 May 2021 21:15:32 +0100
Subject: [PATCH 2032/3183] 6.4.1-beta.10

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 5a62f00a..aba18360 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.4.1-beta.9",
+  "version": "6.4.1-beta.10",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index f518e330..2a8e86cb 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.4.1-beta.9",
+  "version": "6.4.1-beta.10",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From ea22381d0396987156fdcabec6428016c9f8af28 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 5 May 2021 21:16:25 +0100
Subject: [PATCH 2033/3183] spacing

---
 lib/connection/api.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/connection/api.js b/lib/connection/api.js
index 62fe52d4..d11dfed8 100644
--- a/lib/connection/api.js
+++ b/lib/connection/api.js
@@ -33,11 +33,11 @@ module.exports = class connectionAPI {
       if (accessory.context.hidden) {
         return
       }
-      
+
       // Get the colours for the status icons
       const colourWAN = accessory.context.reachableWAN ? '4caf50' : 'f44336'
       const colourLAN = accessory.context.reachableLAN ? '4caf50' : 'f44336'
-      
+
       // Add the html table row
       accList += `<tr>
         <td class="small">${accessory.displayName}</td>

From 7ea05b77e45152ef8a699ef54646f47682de6dae Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 6 May 2021 09:16:04 +0100
Subject: [PATCH 2034/3183] Update package-lock.json

---
 package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index aba18360..faf5aa97 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -134,9 +134,9 @@
       "integrity": "sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ=="
     },
     "is-date-object": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz",
-      "integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g=="
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.3.tgz",
+      "integrity": "sha512-tDpEUInNcy2Yw3lNSepK3Wdw1RnXLcIVienz6Ou631Acl15cJyRWK4dgA1vCmOEgIbtOV0W7MHg+AR2Gdg1NXQ=="
     },
     "is-negative-zero": {
       "version": "2.0.1",

From 69090250ee99ae5b660cb85f503826737c4f839e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 6 May 2021 09:21:31 +0100
Subject: [PATCH 2035/3183] api auth, remove device list, add devices endpoint

---
 lib/connection/api.js | 103 ++++++++++++++++++++++--------------------
 lib/index.js          |   5 +-
 2 files changed, 57 insertions(+), 51 deletions(-)

diff --git a/lib/connection/api.js b/lib/connection/api.js
index d11dfed8..f4cf0cab 100644
--- a/lib/connection/api.js
+++ b/lib/connection/api.js
@@ -5,6 +5,7 @@
 module.exports = class connectionAPI {
   constructor (platform, devicesInHB) {
     // Set up variables from the platform
+    this.config = platform.config
     this.consts = platform.consts
     this.debug = platform.config.debug
     this.devicesInHB = devicesInHB
@@ -17,36 +18,6 @@ module.exports = class connectionAPI {
   }
 
   showHome () {
-    // This nifty little function creates a map of devices sorted by display name
-    const mapAsc = new Map([...this.devicesInHB.entries()].sort((a, b) => {
-      return a[1].displayName.toLowerCase() > b[1].displayName.toLowerCase()
-        ? 1
-        : b[1].displayName.toLowerCase() > a[1].displayName.toLowerCase()
-          ? -1
-          : 0
-    }))
-
-    // This variable stores the html table rows for displaying the devices
-    let accList = ''
-    mapAsc.forEach(accessory => {
-      // Skip if it's a hidden accessory
-      if (accessory.context.hidden) {
-        return
-      }
-
-      // Get the colours for the status icons
-      const colourWAN = accessory.context.reachableWAN ? '4caf50' : 'f44336'
-      const colourLAN = accessory.context.reachableLAN ? '4caf50' : 'f44336'
-
-      // Add the html table row
-      accList += `<tr>
-        <td class="small">${accessory.displayName}</td>
-        <td class="small"><code>${accessory.context.hbDeviceId}</code></td>
-        <td class="small text-center"><i class="fa fa-circle" style="color: #${colourWAN} !important;"></i></td>
-        <td class="small text-center"><i class="fa fa-circle" style="color: #${colourLAN} !important;"></i></td>
-      </tr>`
-    })
-
     // Return the home page for the API
     return `<!doctype html>
     <html lang="en">
@@ -70,6 +41,12 @@ module.exports = class connectionAPI {
               <h5 class="mt-4 mb-2">API Docs</h5>
               <ul class="small">
                 <li>All requests are of type <code>GET</code></li>
+                <li>All requests must include a HTTP authentication header in the form:
+                  <ul>
+                    <li><code>Authorization: "Basic %%%"</code></li>
+                    <li>Where <code>%%%</code> is a base64 encoded string of your eWeLink username and password in the form <code>username:password</code></li>
+                  </ul>
+                </li>
                 <li>All requests will return a <code>HTTP 200 OK</code> success code</li>
                 <li>All requests will return a JSON response</li>
                 <li>Success or failure of any request can be determined by the <code>success</code> response property which will be <code>true</code> or <code>false</code></li>
@@ -101,6 +78,14 @@ module.exports = class connectionAPI {
                   </tr>
                 </thead>
                 <tbody>
+                  <tr>
+                    <td class="small">
+                      Obtain a device list as an array.<br>
+                      Example response:<br>
+                      <code>{"success":true,"response":[]}</code>
+                    </td>
+                    <td class="align-middle small"><code>/devicelist</code></td>
+                  </tr>
                   <tr>
                     <td class="small">
                       Query the <code>online</code>/<code>offline</code> cloud (WAN) state.<br>
@@ -224,22 +209,6 @@ module.exports = class connectionAPI {
                 </tbody>
               </table>
               </div>
-              <h5 class="mt-4 mb-2">Accessory List</h5>
-              <div class="table-responsive">
-                <table class="table table-sm table-hover">
-                  <thead>
-                    <tr>
-                      <th scope="col" class="small" style="width: 43%;">Accessory Name</th>
-                      <th scope="col" class="small" style="width: 43%;">HB Device ID</th>
-                      <th scope="col" class="small text-center" style="width: 7%;">WAN</th>
-                      <th scope="col" class="small text-center" style="width: 7%;">LAN</th>
-                    </tr>
-                  </thead>
-                  <tbody>
-                    ${accList}
-                  </tbody>
-                </table>
-              </div>
             </div>
             <div class="col-lg-2"></div>
           </div>
@@ -249,14 +218,48 @@ module.exports = class connectionAPI {
     </html>`
   }
 
-  async action (url) {
+  async action (req) {
+    // Authenticate the request
+    if (
+      !req.headers ||
+      !req.headers.authorization ||
+      req.headers.authorization.indexOf('Basic ') === -1
+    ) {
+      throw new Error('Invalid authentication')
+    }
+    const encodedCreds = req.headers.authorization.split(' ')[1]
+    const buff = Buffer.from(encodedCreds, 'base64')
+    const decodedCreds = buff.toString('utf8').replace(/(\r\n|\n|\r)/gm, '').trim()
+    const [user, pass] = decodedCreds.split(':')
+    if (user !== this.config.username || pass !== this.config.password) {
+      throw new Error('Invalid authentication')
+    }
+
     // Obtain the parts of the request url
-    const pathParts = url.split('/')
+    const pathParts = req.url.split('/')
     const device = pathParts[1]
     const action = pathParts[2]
     const attribute = pathParts[3]
     const newStatus = pathParts[4]
 
+    // Special case for the devicelist
+    if (device === 'devicelist') {
+      const deviceList = []
+      this.devicesInHB.forEach(accessory => {
+        if (accessory.context.hidden) {
+          return
+        }
+        deviceList.push({
+          name: accessory.displayName,
+          hbdeviceid: accessory.context.hbDeviceId,
+          statuswan: !!accessory.context.reachableWAN,
+          statuslan: !!accessory.context.reachableLAN,
+          localip: accessory.context.reachableLAN || false
+        })
+      })
+      return deviceList
+    }
+
     // Check a device was specified
     if (!device) {
       throw new Error('No accessory specified')
@@ -293,6 +296,10 @@ module.exports = class connectionAPI {
     // Obtain the corresponding accessory
     const accessory = this.devicesInHB.get(uuid)
 
+    if (accessory.context.hidden) {
+      throw new Error('Accessory not found in Homebridge')
+    }
+
     // Special case for the reachable WAN and LAN attributes
     if (action === 'get') {
       if (attribute === 'statuswan') {
diff --git a/lib/index.js b/lib/index.js
index 088dce31..e335fbb8 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -577,14 +577,13 @@ class eWeLinkPlatform {
           // Request is not for the homepage so action appropriately
           res.writeHead(200, { 'Content-Type': 'application/json' })
           try {
-            const response = await apiClient.action(req.url)
+            const response = await apiClient.action(req)
 
             // Actioning the request was successful so respond with a success
             res.end(JSON.stringify({ success: true, response }))
           } catch (e) {
             // An error occurred actioning the request so respond with the error
-            const eText = this.funcs.parseError(e)
-            res.end(JSON.stringify({ success: false, error: eText }))
+            res.end(JSON.stringify({ success: false, error: e.message + '.' }))
           }
         })
 

From cdbac9662b25e9389a6c7b02e08e42c30504578c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 6 May 2021 09:21:54 +0100
Subject: [PATCH 2036/3183] 6.4.1-beta.11

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index faf5aa97..ad00aea9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.4.1-beta.10",
+  "version": "6.4.1-beta.11",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 2a8e86cb..1c2d36df 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.4.1-beta.10",
+  "version": "6.4.1-beta.11",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From a2cd8622ed6579893d7dacdb73011d7ab293381b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 6 May 2021 10:26:11 +0100
Subject: [PATCH 2037/3183] change paths, clarify set ranges

---
 lib/connection/api.js | 139 +++++++++++++++++++++++-------------------
 1 file changed, 77 insertions(+), 62 deletions(-)

diff --git a/lib/connection/api.js b/lib/connection/api.js
index f4cf0cab..69db7e89 100644
--- a/lib/connection/api.js
+++ b/lib/connection/api.js
@@ -51,6 +51,7 @@ module.exports = class connectionAPI {
                 <li>All requests will return a JSON response</li>
                 <li>Success or failure of any request can be determined by the <code>success</code> response property which will be <code>true</code> or <code>false</code></li>
                 <li>Any error will be returned in an <code>error</code> parameter as a <code>string</code></li>
+                <li>Replace <code>{hbDeviceId}</code> with the Homebridge ID of the device, e.g. <code>10000abcdeSWX</code></li>
                 <li>Supported devices are currently:
                   <ul>
                     <li>Switches</li>
@@ -68,7 +69,7 @@ module.exports = class connectionAPI {
                   </ul>
                 </li>
               </ul>
-              <h5 class="mt-4 mb-2">Available Commands</h5>
+              <h5 class="mt-4 mb-2">Accessory Query Commands</h5>
               <div class="table-responsive">
               <table class="table table-sm table-hover">
                 <thead>
@@ -84,7 +85,7 @@ module.exports = class connectionAPI {
                       Example response:<br>
                       <code>{"success":true,"response":[]}</code>
                     </td>
-                    <td class="align-middle small"><code>/devicelist</code></td>
+                    <td class="align-middle small"><code>/get/devicelist</code></td>
                   </tr>
                   <tr>
                     <td class="small">
@@ -92,7 +93,7 @@ module.exports = class connectionAPI {
                       Example response:<br>
                       <code>{"success":true,"response":"online"}</code>
                     </td>
-                    <td class="align-middle small"><code>/{hbDeviceId}/get/statuswan</code></td>
+                    <td class="align-middle small"><code>/get/{hbDeviceId}/statuswan</code></td>
                   </tr>
                   <tr>
                     <td class="small">
@@ -100,7 +101,7 @@ module.exports = class connectionAPI {
                       Example response:<br>
                       <code>{"success":true,"response":"offline"}</code>
                     </td>
-                    <td class="align-middle small"><code>/{hbDeviceId}/get/statuslan</code></td>
+                    <td class="align-middle small"><code>/get/{hbDeviceId}/statuslan</code></td>
                   </tr>
                   <tr>
                     <td class="small">
@@ -108,7 +109,7 @@ module.exports = class connectionAPI {
                       Example response:<br>
                       <code>{"success":true,"response":"on"}</code>
                     </td>
-                    <td class="align-middle small"><code>/{hbDeviceId}/get/state</code></td>
+                    <td class="align-middle small"><code>/get/{hbDeviceId}/state</code></td>
                   </tr>
                   <tr>
                     <td class="small">
@@ -116,7 +117,7 @@ module.exports = class connectionAPI {
                       Example response:<br>
                       <code>{"success":true,"response":34}</code>
                     </td>
-                    <td class="align-middle small"><code>/{hbDeviceId}/get/brightness</code></td>
+                    <td class="align-middle small"><code>/get/{hbDeviceId}/brightness</code></td>
                   </tr>
                   <tr>
                     <td class="small">
@@ -124,7 +125,7 @@ module.exports = class connectionAPI {
                       Example response:<br>
                       <code>{"success":true,"response":17}</code>
                     </td>
-                    <td class="align-middle small"><code>/{hbDeviceId}/get/hue</code></td>
+                    <td class="align-middle small"><code>/get/{hbDeviceId}/hue</code></td>
                   </tr>
                   <tr>
                     <td class="small">
@@ -132,7 +133,7 @@ module.exports = class connectionAPI {
                       Example response:<br>
                       <code>{"success":true,"response":345}</code>
                     </td>
-                    <td class="align-middle small"><code>/{hbDeviceId}/get/colourtemperature</code></td>
+                    <td class="align-middle small"><code>/get/{hbDeviceId}/colourtemperature</code></td>
                   </tr>
                   <tr>
                     <td class="small">
@@ -140,7 +141,7 @@ module.exports = class connectionAPI {
                       Example response:<br>
                       <code>{"success":true,"response":"on"}</code>
                     </td>
-                    <td class="align-middle small"><code>/{hbDeviceId}/get/adaptivelighting</code></td>
+                    <td class="align-middle small"><code>/get/{hbDeviceId}/adaptivelighting</code></td>
                   </tr>
                   <tr>
                     <td class="small">
@@ -148,7 +149,7 @@ module.exports = class connectionAPI {
                       Example response:<br>
                       <code>{"success":true,"response":16.3}</code>
                     </td>
-                    <td class="align-middle small"><code>/{hbDeviceId}/get/temperature</code></td>
+                    <td class="align-middle small"><code>/get/{hbDeviceId}/temperature</code></td>
                   </tr>
                   <tr>
                     <td class="small">
@@ -156,55 +157,68 @@ module.exports = class connectionAPI {
                       Example response:<br>
                       <code>{"success":true,"response":54}</code>
                     </td>
-                    <td class="align-middle small"><code>/{hbDeviceId}/get/humidity</code></td>
+                    <td class="align-middle small"><code>/get/{hbDeviceId}/humidity</code></td>
                   </tr>
+                </tbody>
+              </table>
+            </div>
+            <h5 class="mt-4 mb-2">Accessory Control Commands</h5>
+            <div class="table-responsive">
+              <table class="table table-sm table-hover">
+                <thead>
+                  <tr>
+                    <th scope="col" class="small" style="width: 50%;">Function</th>
+                    <th scope="col" class="small" style="width: 50%;">Path</th>
+                  </tr>
+                </thead>
+                <tbody>
                   <tr>
                     <td class="small">
                       Set the state to <code>on</code>.<br>
-                      Example response:<br>
-                      <code>{"success":true}</code>
+                      Command range:<br>
+                      Must be <code>on</code>.
                     </td>
-                    <td class="align-middle small"><code>/{hbDeviceId}/set/state/on</code></td>
+                    <td class="align-middle small"><code>/set/{hbDeviceId}/state/on</code></td>
                   </tr>
                   <tr>
                     <td class="small">
                       Set the state to <code>off</code>.<br>
-                      Example response:<br>
-                      <code>{"success":true}</code>
+                      Command range:<br>
+                      Must be <code>off</code>.
                     </td>
-                    <td class="align-middle small"><code>/{hbDeviceId}/set/state/off</code></td>
+                    <td class="align-middle small"><code>/set/{hbDeviceId}/state/off</code></td>
                   </tr>
                   <tr>
                     <td class="small">
                       Switch (<code>toggle</code>) the current state.<br>
-                      Example response:<br>
-                      <code>{"success":true}</code>
+                      Command range:<br>
+                      Must be <code>toggle</code>.
                     </td>
-                    <td class="align-middle small"><code>/{hbDeviceId}/set/state/toggle</code></td>
+                    <td class="align-middle small"><code>/set/{hbDeviceId}/state/toggle</code></td>
                   </tr>
                   <tr>
                     <td class="small">
-                      Set the brightness between <code>0</code>% and <code>100</code>%.<br>
-                      Example response:<br>
-                      <code>{"success":true}</code>
+                      Set the to <code>54</code>%.<br>
+                      Command range:<br>
+                      Must be between <code>0</code> and <code>100</code>.
                     </td>
-                    <td class="align-middle small"><code>/{hbDeviceId}/set/brightness/54</code></td>
+                    <td class="align-middle small"><code>/set/{hbDeviceId}/brightness/54</code></td>
                   </tr>
                   <tr>
                     <td class="small">
-                      Set the hue between <code>0</code>° and <code>360</code>°.<br>
-                      Example response:<br>
-                      <code>{"success":true}</code>
+                      Set the hue to <code>157</code>°.<br>
+                      Command range:<br>
+                      Must be between <code>0</code> and <code>360</code>.
                     </td>
-                    <td class="align-middle small"><code>/{hbDeviceId}/set/hue/157</code></td>
+                    <td class="align-middle small"><code>/set/{hbDeviceId}/hue/157</code></td>
                   </tr>
                   <tr>
                     <td class="small">
-                      Set the colour temperature between <code>140</code> and <code>500</code> mired.<br>
-                      Example response:<br>
-                      <code>{"success":true}</code>
+                      Set the colour temperature to <code>300</code> mired.<br>
+                      Command range:<br>
+                      Must be between <code>140</code> and <code>500</code>.
                     </td>
-                    <td class="align-middle small"><code>/{hbDeviceId}/set/colourtemperature/300</code></td>
+                    <td class="align-middle small"><code>/set/{hbDeviceId}/colourtemperature/300</code></td>
                   </tr>
                 </tbody>
               </table>
@@ -237,12 +251,27 @@ module.exports = class connectionAPI {
 
     // Obtain the parts of the request url
     const pathParts = req.url.split('/')
-    const device = pathParts[1]
-    const action = pathParts[2]
+    const action = pathParts[1]
+    const device = pathParts[2]
     const attribute = pathParts[3]
     const newStatus = pathParts[4]
 
-    // Special case for the devicelist
+    // Check an action was specified
+    if (!action) {
+      throw new Error('No action specified')
+    }
+
+    // Check the action is either get or set
+    if (!['get', 'set'].includes(action)) {
+      throw new Error("Action must be 'get' or 'set'")
+    }
+
+    // Check a device was specified
+    if (!device) {
+      throw new Error('No accessory specified')
+    }
+
+    // Special case for the device list
     if (device === 'devicelist') {
       const deviceList = []
       this.devicesInHB.forEach(accessory => {
@@ -260,42 +289,16 @@ module.exports = class connectionAPI {
       return deviceList
     }
 
-    // Check a device was specified
-    if (!device) {
-      throw new Error('No accessory specified')
-    }
-
     // Try and find the device in Homebridge
     const uuid = this.hapUUIDGen(device)
     if (!this.devicesInHB.has(uuid)) {
       throw new Error('Accessory not found in Homebridge')
     }
 
-    // Check an action was specified
-    if (!action) {
-      throw new Error('No action specified')
-    }
-
-    // Check the action is either get or set
-    if (!['get', 'set'].includes(action)) {
-      throw new Error("Action must be 'get' or 'set'")
-    }
-
-    // Check an attribute was specified
-    if (!attribute) {
-      throw new Error('No attribute specified')
-    }
-
-    // Check a new status was supplied if the action is set
-    if (action === 'set') {
-      if (!newStatus) {
-        throw new Error('No new status specified')
-      }
-    }
-
     // Obtain the corresponding accessory
     const accessory = this.devicesInHB.get(uuid)
 
+    // Check the accessory isn't hidden from Homebridge
     if (accessory.context.hidden) {
       throw new Error('Accessory not found in Homebridge')
     }
@@ -315,6 +318,18 @@ module.exports = class connectionAPI {
       throw new Error('Accessory has not been initialised yet')
     }
 
+    // Check an attribute was specified
+    if (!attribute) {
+      throw new Error('No attribute specified')
+    }
+
+    // Check a new status was supplied if the action is set
+    if (action === 'set') {
+      if (!newStatus) {
+        throw new Error('No new status specified')
+      }
+    }
+
     // These variables depend on the attribute that was supplied
     let service
     let charName

From cefee0e0225ecc7377b25724c44b368eb29dac33 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 6 May 2021 10:26:49 +0100
Subject: [PATCH 2038/3183] 6.4.1-beta.12

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ad00aea9..8ec08e20 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.4.1-beta.11",
+  "version": "6.4.1-beta.12",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 1c2d36df..c5ed4a82 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.4.1-beta.11",
+  "version": "6.4.1-beta.12",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 671579cfcbd730214daa6260e96ba4acee6134f5 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 6 May 2021 12:57:20 +0100
Subject: [PATCH 2039/3183] bootstrap to 5.0.0-dist, remove fontawesome, add
 base path banner

---
 lib/connection/api.js | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/lib/connection/api.js b/lib/connection/api.js
index 69db7e89..fa4603fb 100644
--- a/lib/connection/api.js
+++ b/lib/connection/api.js
@@ -24,9 +24,8 @@ module.exports = class connectionAPI {
       <head>
         <meta charset="utf-8">
         <meta name="viewport" content="width=device-width, initial-scale=1">
-        <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.0-beta3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-eOJMYsd53ii+scO/bJGFsiCZc+5NDVN2yr8+0RDqr0Ql0h+rP48ckxlpbzKgwra6" crossorigin="anonymous">
+        <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.0/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-wEmeIV1mKuiNpC+IOBjI7aAzPcEZeedi5yW5f2yOq55WWLwNGmvvx4Um1vskeMj0" crossorigin="anonymous">
         <title>homebridge-ewelink API Docs</title>
-        <script src="https://kit.fontawesome.com/7b8907c984.js" crossorigin="anonymous"></script>
       </head>
       <body>
         <div class="container-fluid my-3">
@@ -69,6 +68,7 @@ module.exports = class connectionAPI {
                   </ul>
                 </li>
               </ul>
+              <div class="alert alert-secondary small text-center" role="alert" style="display: none;" id="baseUrlBanner"></div>
               <h5 class="mt-4 mb-2">Accessory Query Commands</h5>
               <div class="table-responsive">
               <table class="table table-sm table-hover">
@@ -227,7 +227,13 @@ module.exports = class connectionAPI {
             <div class="col-lg-2"></div>
           </div>
         </div>
-        <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.0.0-beta3/dist/js/bootstrap.bundle.min.js" integrity="sha384-JEW9xMcG8R+pH31jmWH6WWP0WintQrMb4s7ZOdauHnUtxwoG2vI5DkLtS3qm9Ekf" crossorigin="anonymous"></script>
+        <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.0.0/dist/js/bootstrap.min.js" integrity="sha384-lpyLfhYuitXl2zRZ5Bn2fqnhNAKOAaM/0Kr9laMspuaMiZfGmfwRNFh8HlMy49eQ" crossorigin="anonymous"></script>
+        <script>
+          const base = window.location.href.slice(0, -1)
+          const banner = document.getElementById('baseUrlBanner')
+          banner.innerHTML = 'All paths are relative to <strong><code>' + base + '</code></strong>'
+          banner.style.display = 'block'
+        </script>
       </body>
     </html>`
   }

From 7e29b3c631c31341859073e1c579152d5a9231ff Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 6 May 2021 13:03:46 +0100
Subject: [PATCH 2040/3183] clean up docs

---
 lib/connection/api.js | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/lib/connection/api.js b/lib/connection/api.js
index fa4603fb..41ac373d 100644
--- a/lib/connection/api.js
+++ b/lib/connection/api.js
@@ -39,27 +39,17 @@ module.exports = class connectionAPI {
               <hr class="mb-0">
               <h5 class="mt-4 mb-2">API Docs</h5>
               <ul class="small">
-                <li>All requests are of type <code>GET</code></li>
+                <li>All requests are of type <code>HTTP GET</code></li>
                 <li>All requests must include a HTTP authentication header in the form:
                   <ul>
                     <li><code>Authorization: "Basic %%%"</code></li>
-                    <li>Where <code>%%%</code> is a base64 encoded string of your eWeLink username and password in the form <code>username:password</code></li>
+                    <li>Where <code>%%%</code> is a base64-encoded string of your eWeLink credentials in the form <code>username:password</code></li>
                   </ul>
                 </li>
-                <li>All requests will return a <code>HTTP 200 OK</code> success code</li>
-                <li>All requests will return a JSON response</li>
+                <li>All requests will return a <code>HTTP 200 OK</code> success code with a JSON response</li>
                 <li>Success or failure of any request can be determined by the <code>success</code> response property which will be <code>true</code> or <code>false</code></li>
-                <li>Any error will be returned in an <code>error</code> parameter as a <code>string</code></li>
+                <li>Error messages will be returned in the <code>error</code> parameter as a <code>string</code></li>
                 <li>Replace <code>{hbDeviceId}</code> with the Homebridge ID of the device, e.g. <code>10000abcdeSWX</code></li>
-                <li>Supported devices are currently:
-                  <ul>
-                    <li>Switches</li>
-                    <li>Outlets</li>
-                    <li>Lights</li>
-                    <li>Temperature Sensors</li>
-                    <li>Humidity Sensors</li>
-                  </ul>
-                </li>
                 <li>A note about offline devices:
                   <ul>
                     <li>Querying any attribute will return the HomeKit cache value</li>

From ab6cd5a06ac0d9310317cdad21b10671a9917157 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 6 May 2021 13:19:54 +0100
Subject: [PATCH 2041/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 75b2f65c..6a9312ec 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,11 +2,18 @@
 
 All notable changes to this homebridge-ewelink will be documented in this file.
 
-## 6.4.0 (2021-05-04)
+## 6.5.0 (2021-05-06)
+
+### Added
 
-**Please Note**
+* Internal HTTP API to query/control the state of certain homebridge-ewelink accessories
+  * Options for new configuration setting `apiPort` are:
+    * `0` to disable the API (default setting)
+    * `1` to enable the API with a random available port (port will be shown in the log)
+    * Any higher integer to enable the API on this fixed port
+  * Documentation for the API can be seen at the base url (Homebridge IP + API port)
 
-Since it is impossible for me to test *every* device type and all Accessory Simulations, there may be some unexpected issues. A lot of code has changed in this release. If you encounter any issues please let me know on Github or Discord and I will get it sorted as soon as I can :)
+## 6.4.0 (2021-05-04)
 
 ### Added
 

From c4489e0411b7e068cda3083ae2a907191eb987b6 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 6 May 2021 13:21:15 +0100
Subject: [PATCH 2042/3183] 6.5.0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 8ec08e20..eed6d47e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.4.1-beta.12",
+  "version": "6.5.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index c5ed4a82..304f0fda 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.4.1-beta.12",
+  "version": "6.5.0",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From d8be1bb1202a87cec2f933976a3553c2a83b7d39 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 6 May 2021 19:58:11 +0100
Subject: [PATCH 2043/3183] handle ip change better

---
 lib/connection/lan.js |  1 +
 lib/index.js          | 72 ++++++++++++++++++++++++++-----------------
 2 files changed, 44 insertions(+), 29 deletions(-)

diff --git a/lib/connection/lan.js b/lib/connection/lan.js
index a571c72a..ced38be3 100644
--- a/lib/connection/lan.js
+++ b/lib/connection/lan.js
@@ -138,6 +138,7 @@ module.exports = class connectionLAN {
             if (Object.keys(params).length > 0) {
               params.online = true
               params.updateSource = 'LAN'
+              params.ip = packet.address
               const returnTemplate = {
                 deviceid: rdata.id,
                 params
diff --git a/lib/index.js b/lib/index.js
index e335fbb8..b8ba7739 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1035,10 +1035,8 @@ class eWeLinkPlatform {
           // Add context information to the sub accessory
           subAccessory.context.firmware = device.params.fwVersion || plugin.version
           subAccessory.context.reachableWAN = wsClient && device.online
-          subAccessory.context.reachableLAN = lanClient &&
-            lanDevices.has(device.deviceid)
-            ? lanDevices.get(device.deviceid).ip
-            : false
+          subAccessory.context.reachableLAN = lanClient && lanDevices.has(device.deviceid) &&
+            lanDevices.get(device.deviceid).ip
           subAccessory.context.eweBrandName = device.brandName
           subAccessory.context.eweBrandLogo = device.brandLogo
           subAccessory.context.eweShared = device.sharedBy && device.sharedBy.email
@@ -1173,7 +1171,8 @@ class eWeLinkPlatform {
           // Add context information to the sub accessory
           subAccessory.context.firmware = device.params.fwVersion || plugin.version
           subAccessory.context.reachableWAN = wsClient && device.online
-          subAccessory.context.reachableLAN = false
+          subAccessory.context.reachableLAN = lanClient && lanDevices.has(device.deviceid) &&
+            lanDevices.get(device.deviceid).ip
           subAccessory.context.eweBrandName = device.brandName
           subAccessory.context.eweBrandLogo = device.brandLogo
           subAccessory.context.eweShared = device.sharedBy && device.sharedBy.email
@@ -1288,10 +1287,8 @@ class eWeLinkPlatform {
       // Update the reachability values (via WS and LAN)
       accessory.context.firmware = device.params.fwVersion || plugin.version
       accessory.context.reachableWAN = wsClient && device.online
-      accessory.context.reachableLAN = lanClient &&
-        lanDevices.has(device.deviceid)
-        ? lanDevices.get(device.deviceid).ip
-        : false
+      accessory.context.reachableLAN = lanClient && lanDevices.has(device.deviceid) &&
+        lanDevices.get(device.deviceid).ip
       accessory.context.eweBrandName = device.brandName
       accessory.context.eweBrandLogo = device.brandLogo
       accessory.context.eweShared = device.sharedBy && device.sharedBy.email
@@ -1573,29 +1570,45 @@ class eWeLinkPlatform {
           }
         }
       }
-      if (device.params.updateSource === 'LAN' && !accessory.context.reachableLAN) {
-        // The update is from LAN so it must be online
-        accessory.context.reachableLAN = true
-        this.api.updatePlatformAccessories(plugin.name, plugin.alias, [accessory])
-        devicesInHB.set(accessory.UUID, accessory)
+      if (device.params.updateSource === 'LAN') {
+        // Check to see if the IP of the device has changed
+        if (
+          accessory.context.reachableLAN &&
+          device.params.ip &&
+          device.params.ip !== accessory.context.ip
+        ) {
+          accessory.context.ip = device.params.ip
+          this.api.updatePlatformAccessories(plugin.name, plugin.alias, [accessory])
+          devicesInHB.set(accessory.UUID, accessory)
 
-        // Flag this true to update the sub accessories later
-        reachableChange = true
+          // Flag this true to update the sub accessories later
+          reachableChange = true
+        }
+        if (!accessory.context.reachableLAN) {
+          // The update is from LAN so it must be online
+          accessory.context.reachableLAN = true
+          accessory.context.ip = device.params.ip
+          this.api.updatePlatformAccessories(plugin.name, plugin.alias, [accessory])
+          devicesInHB.set(accessory.UUID, accessory)
 
-        // Log the new reachability of the device
-        this.log(
-          '[%s] %s %s.',
-          accessory.displayName,
-          this.lang.repOnline,
-          this.lang.viaLAN
-        )
+          // Flag this true to update the sub accessories later
+          reachableChange = true
 
-        // Try and request an update through WS if the device has come back online
-        if (accessory.context.reachableWAN && wsClient) {
-          try {
-            wsClient.requestUpdate(accessory)
-          } catch (err) {
-            // Suppress any errors here
+          // Log the new reachability of the device
+          this.log(
+            '[%s] %s %s.',
+            accessory.displayName,
+            this.lang.repOnline,
+            this.lang.viaLAN
+          )
+
+          // Try and request an update through WS if the device has come back online
+          if (accessory.context.reachableWAN && wsClient) {
+            try {
+              wsClient.requestUpdate(accessory)
+            } catch (err) {
+              // Suppress any errors here
+            }
           }
         }
       }
@@ -1615,6 +1628,7 @@ class eWeLinkPlatform {
             // Update the LAN status
             if (device.params.updateSource === 'LAN') {
               subAccessory.context.reachableLAN = true
+              subAccessory.context.ip = device.params.ip
             }
 
             // Save the sub accessory updates to the platform

From 929790dc262d84fa60334785a4907fb91e111ba4 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 6 May 2021 19:58:28 +0100
Subject: [PATCH 2044/3183] create initial currentState func

---
 lib/device/light-cct.js     | 12 ++++++++++++
 lib/device/light-dimmer.js  | 10 ++++++++++
 lib/device/light-rgb-cct.js | 15 +++++++++++++++
 lib/device/light-rgb.js     | 12 ++++++++++++
 lib/device/outlet-double.js |  9 +++++++++
 lib/device/outlet-multi.js  |  9 +++++++++
 lib/device/outlet-scm.js    | 10 ++++++++++
 lib/device/outlet-single.js |  9 +++++++++
 lib/device/switch-double.js |  9 +++++++++
 lib/device/switch-multi.js  |  9 +++++++++
 lib/device/switch-single.js |  9 +++++++++
 11 files changed, 113 insertions(+)

diff --git a/lib/device/light-cct.js b/lib/device/light-cct.js
index 6cb24ebb..990e935f 100644
--- a/lib/device/light-cct.js
+++ b/lib/device/light-cct.js
@@ -272,4 +272,16 @@ module.exports = class deviceLightCCT {
   markStatus (isOnline) {
     this.isOnline = isOnline
   }
+
+  currentState () {
+    const toReturn = {}
+    toReturn.services = ['light']
+    toReturn.light = {
+      state: this.service.getCharacteristic(this.hapChar.On).value ? 'on' : 'off',
+      brightness: this.service.getCharacteristic(this.hapChar.Brightness).value,
+      colourtemperature: this.service.getCharacteristic(this.hapChar.ColorTemperature).value,
+      adaptivelighting: this.accessory.alController.isAdaptiveLightingActive() ? 'on' : 'off'
+    }
+    return toReturn
+  }
 }
diff --git a/lib/device/light-dimmer.js b/lib/device/light-dimmer.js
index 66b89132..b2f34653 100644
--- a/lib/device/light-dimmer.js
+++ b/lib/device/light-dimmer.js
@@ -189,4 +189,14 @@ module.exports = class deviceLightDimmer {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
+
+  currentState () {
+    const toReturn = {}
+    toReturn.services = ['light']
+    toReturn.light = {
+      state: this.service.getCharacteristic(this.hapChar.On).value ? 'on' : 'off',
+      brightness: this.service.getCharacteristic(this.hapChar.Brightness).value
+    }
+    return toReturn
+  }
 }
diff --git a/lib/device/light-rgb-cct.js b/lib/device/light-rgb-cct.js
index 887e7ab7..80683a03 100644
--- a/lib/device/light-rgb-cct.js
+++ b/lib/device/light-rgb-cct.js
@@ -519,4 +519,19 @@ module.exports = class deviceLightRGBCCT {
   markStatus (isOnline) {
     this.isOnline = isOnline
   }
+
+  currentState () {
+    const toReturn = {}
+    toReturn.services = ['light']
+    toReturn.light = {
+      state: this.service.getCharacteristic(this.hapChar.On).value ? 'on' : 'off',
+      brightness: this.service.getCharacteristic(this.hapChar.Brightness).value,
+      colourmode: this.cacheMode === 'white' ? 'colourtemperature' : 'hue',
+      hue: this.service.getCharacteristic(this.hapChar.Hue).value,
+      saturation: this.service.getCharacteristic(this.hapChar.Saturation).value,
+      colourtemperature: this.service.getCharacteristic(this.hapChar.ColorTemperature).value,
+      adaptivelighting: this.accessory.alController.isAdaptiveLightingActive() ? 'on' : 'off'
+    }
+    return toReturn
+  }
 }
diff --git a/lib/device/light-rgb.js b/lib/device/light-rgb.js
index c0d4d971..06258ac9 100644
--- a/lib/device/light-rgb.js
+++ b/lib/device/light-rgb.js
@@ -208,4 +208,16 @@ module.exports = class deviceLightRGB {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
+
+  currentState () {
+    const toReturn = {}
+    toReturn.services = ['light']
+    toReturn.light = {
+      state: this.service.getCharacteristic(this.hapChar.On).value ? 'on' : 'off',
+      brightness: this.service.getCharacteristic(this.hapChar.Brightness).value,
+      hue: this.service.getCharacteristic(this.hapChar.Hue).value,
+      saturation: this.service.getCharacteristic(this.hapChar.Saturation).value
+    }
+    return toReturn
+  }
 }
diff --git a/lib/device/outlet-double.js b/lib/device/outlet-double.js
index b81512d1..4a9baf8e 100644
--- a/lib/device/outlet-double.js
+++ b/lib/device/outlet-double.js
@@ -300,4 +300,13 @@ module.exports = class deviceOutletDouble {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
+
+  currentState () {
+    const toReturn = {}
+    toReturn.services = ['outlet']
+    toReturn.outlet = {
+      state: this.service.getCharacteristic(this.hapChar.On).value ? 'on' : 'off'
+    }
+    return toReturn
+  }
 }
diff --git a/lib/device/outlet-multi.js b/lib/device/outlet-multi.js
index cdd3e325..16b80193 100644
--- a/lib/device/outlet-multi.js
+++ b/lib/device/outlet-multi.js
@@ -196,4 +196,13 @@ module.exports = class deviceOutletMulti {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
+
+  currentState () {
+    const toReturn = {}
+    toReturn.services = ['outlet']
+    toReturn.outlet = {
+      state: this.service.getCharacteristic(this.hapChar.On).value ? 'on' : 'off'
+    }
+    return toReturn
+  }
 }
diff --git a/lib/device/outlet-scm.js b/lib/device/outlet-scm.js
index b3ed2845..b1ff7fbe 100644
--- a/lib/device/outlet-scm.js
+++ b/lib/device/outlet-scm.js
@@ -97,4 +97,14 @@ module.exports = class deviceOutletSCM {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
+
+  currentState () {
+    const toReturn = {}
+    const service = this.showAsSwitch ? 'switch' : 'outlet'
+    toReturn.services = [service]
+    toReturn[service] = {
+      state: this.service.getCharacteristic(this.hapChar.On).value ? 'on' : 'off'
+    }
+    return toReturn
+  }
 }
diff --git a/lib/device/outlet-single.js b/lib/device/outlet-single.js
index 472a48a9..20c61733 100644
--- a/lib/device/outlet-single.js
+++ b/lib/device/outlet-single.js
@@ -253,4 +253,13 @@ module.exports = class deviceOutletSingle {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
+
+  currentState () {
+    const toReturn = {}
+    toReturn.services = ['outlet']
+    toReturn.outlet = {
+      state: this.service.getCharacteristic(this.hapChar.On).value ? 'on' : 'off'
+    }
+    return toReturn
+  }
 }
diff --git a/lib/device/switch-double.js b/lib/device/switch-double.js
index 927dd982..6c46449a 100644
--- a/lib/device/switch-double.js
+++ b/lib/device/switch-double.js
@@ -195,4 +195,13 @@ module.exports = class deviceSwitchDouble {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
+
+  currentState () {
+    const toReturn = {}
+    toReturn.services = ['switch']
+    toReturn.switch = {
+      state: this.service.getCharacteristic(this.hapChar.On).value ? 'on' : 'off'
+    }
+    return toReturn
+  }
 }
diff --git a/lib/device/switch-multi.js b/lib/device/switch-multi.js
index 25e08714..3464597e 100644
--- a/lib/device/switch-multi.js
+++ b/lib/device/switch-multi.js
@@ -200,4 +200,13 @@ module.exports = class deviceSwitchMulti {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
+
+  currentState () {
+    const toReturn = {}
+    toReturn.services = ['switch']
+    toReturn.switch = {
+      state: this.service.getCharacteristic(this.hapChar.On).value ? 'on' : 'off'
+    }
+    return toReturn
+  }
 }
diff --git a/lib/device/switch-single.js b/lib/device/switch-single.js
index e7df4557..498c89d2 100644
--- a/lib/device/switch-single.js
+++ b/lib/device/switch-single.js
@@ -87,4 +87,13 @@ module.exports = class deviceSwitchSingle {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
+
+  currentState () {
+    const toReturn = {}
+    toReturn.services = ['switch']
+    toReturn.switch = {
+      state: this.service.getCharacteristic(this.hapChar.On).value ? 'on' : 'off'
+    }
+    return toReturn
+  }
 }

From 189f881e8faf3ca7336c6e96a517f5673804f9d4 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 6 May 2021 19:58:34 +0100
Subject: [PATCH 2045/3183] changes to api

---
 lib/connection/api.js | 707 +++++++++++++++++++++---------------------
 1 file changed, 355 insertions(+), 352 deletions(-)

diff --git a/lib/connection/api.js b/lib/connection/api.js
index 41ac373d..342bb03b 100644
--- a/lib/connection/api.js
+++ b/lib/connection/api.js
@@ -52,166 +52,218 @@ module.exports = class connectionAPI {
                 <li>Replace <code>{hbDeviceId}</code> with the Homebridge ID of the device, e.g. <code>10000abcdeSWX</code></li>
                 <li>A note about offline devices:
                   <ul>
-                    <li>Querying any attribute will return the HomeKit cache value</li>
-                    <li>Updating an attribute which matches the HomeKit cache value will return a <code>success:true</code> response</li>
-                    <li>Updating an attribute which does not match the HomeKit cache value will return a <code>success:false</code> with an <code>error:"HAP Status Error: -70402"</code> response</li>
+                    <li>Querying any characteristic will return the HomeKit cache value</li>
+                    <li>Updating an characteristic which matches the HomeKit cache value will return a <code>success:true</code> response</li>
+                    <li>Updating an characteristic which does not match the HomeKit cache value will return a <code>success:false</code> with an <code>error:"HAP Status Error: -70402"</code> response</li>
                   </ul>
                 </li>
               </ul>
               <div class="alert alert-secondary small text-center" role="alert" style="display: none;" id="baseUrlBanner"></div>
               <h5 class="mt-4 mb-2">Accessory Query Commands</h5>
               <div class="table-responsive">
-              <table class="table table-sm table-hover">
-                <thead>
-                  <tr>
-                    <th scope="col" class="small" style="width: 50%;">Function</th>
-                    <th scope="col" class="small" style="width: 50%;">Path</th>
-                  </tr>
-                </thead>
-                <tbody>
-                  <tr>
-                    <td class="small">
-                      Obtain a device list as an array.<br>
-                      Example response:<br>
-                      <code>{"success":true,"response":[]}</code>
-                    </td>
-                    <td class="align-middle small"><code>/get/devicelist</code></td>
-                  </tr>
-                  <tr>
-                    <td class="small">
-                      Query the <code>online</code>/<code>offline</code> cloud (WAN) state.<br>
-                      Example response:<br>
-                      <code>{"success":true,"response":"online"}</code>
-                    </td>
-                    <td class="align-middle small"><code>/get/{hbDeviceId}/statuswan</code></td>
-                  </tr>
-                  <tr>
-                    <td class="small">
-                      Query the <code>online</code>/<code>offline</code> local (LAN) state.<br>
-                      Example response:<br>
-                      <code>{"success":true,"response":"offline"}</code>
-                    </td>
-                    <td class="align-middle small"><code>/get/{hbDeviceId}/statuslan</code></td>
-                  </tr>
-                  <tr>
-                    <td class="small">
-                      Query the <code>on</code>/<code>off</code> state.<br>
-                      Example response:<br>
-                      <code>{"success":true,"response":"on"}</code>
-                    </td>
-                    <td class="align-middle small"><code>/get/{hbDeviceId}/state</code></td>
-                  </tr>
-                  <tr>
-                    <td class="small">
-                      Query the brightness between <code>0</code>% and <code>100</code>%.<br>
-                      Example response:<br>
-                      <code>{"success":true,"response":34}</code>
-                    </td>
-                    <td class="align-middle small"><code>/get/{hbDeviceId}/brightness</code></td>
-                  </tr>
-                  <tr>
-                    <td class="small">
-                      Query the hue between <code>0</code>° and <code>360</code>°.<br>
-                      Example response:<br>
-                      <code>{"success":true,"response":17}</code>
-                    </td>
-                    <td class="align-middle small"><code>/get/{hbDeviceId}/hue</code></td>
-                  </tr>
-                  <tr>
-                    <td class="small">
-                      Query the colour temperature between <code>140</code> and <code>500</code> mired.<br>
-                      Example response:<br>
-                      <code>{"success":true,"response":345}</code>
-                    </td>
-                    <td class="align-middle small"><code>/get/{hbDeviceId}/colourtemperature</code></td>
-                  </tr>
-                  <tr>
-                    <td class="small">
-                      Query the Adaptive Lighting <code>on</code>/<code>off</code> state.<br>
-                      Example response:<br>
-                      <code>{"success":true,"response":"on"}</code>
-                    </td>
-                    <td class="align-middle small"><code>/get/{hbDeviceId}/adaptivelighting</code></td>
-                  </tr>
-                  <tr>
-                    <td class="small">
-                      Query the temperature as °C.<br>
-                      Example response:<br>
-                      <code>{"success":true,"response":16.3}</code>
-                    </td>
-                    <td class="align-middle small"><code>/get/{hbDeviceId}/temperature</code></td>
-                  </tr>
-                  <tr>
-                    <td class="small">
-                      Query the humidity a %.<br>
-                      Example response:<br>
-                      <code>{"success":true,"response":54}</code>
-                    </td>
-                    <td class="align-middle small"><code>/get/{hbDeviceId}/humidity</code></td>
-                  </tr>
-                </tbody>
-              </table>
-            </div>
-            <h5 class="mt-4 mb-2">Accessory Control Commands</h5>
-            <div class="table-responsive">
-              <table class="table table-sm table-hover">
-                <thead>
-                  <tr>
-                    <th scope="col" class="small" style="width: 50%;">Function</th>
-                    <th scope="col" class="small" style="width: 50%;">Path</th>
-                  </tr>
-                </thead>
-                <tbody>
-                  <tr>
-                    <td class="small">
-                      Set the state to <code>on</code>.<br>
-                      Command range:<br>
-                      Must be <code>on</code>.
-                    </td>
-                    <td class="align-middle small"><code>/set/{hbDeviceId}/state/on</code></td>
-                  </tr>
-                  <tr>
-                    <td class="small">
-                      Set the state to <code>off</code>.<br>
-                      Command range:<br>
-                      Must be <code>off</code>.
-                    </td>
-                    <td class="align-middle small"><code>/set/{hbDeviceId}/state/off</code></td>
-                  </tr>
-                  <tr>
-                    <td class="small">
-                      Switch (<code>toggle</code>) the current state.<br>
-                      Command range:<br>
-                      Must be <code>toggle</code>.
-                    </td>
-                    <td class="align-middle small"><code>/set/{hbDeviceId}/state/toggle</code></td>
-                  </tr>
-                  <tr>
-                    <td class="small">
-                      Set the to <code>54</code>%.<br>
-                      Command range:<br>
-                      Must be between <code>0</code> and <code>100</code>.
-                    </td>
-                    <td class="align-middle small"><code>/set/{hbDeviceId}/brightness/54</code></td>
-                  </tr>
-                  <tr>
-                    <td class="small">
-                      Set the hue to <code>157</code>°.<br>
-                      Command range:<br>
-                      Must be between <code>0</code> and <code>360</code>.
-                    </td>
-                    <td class="align-middle small"><code>/set/{hbDeviceId}/hue/157</code></td>
-                  </tr>
+                <table class="table table-sm table-hover">
+                  <thead>
+                    <tr>
+                      <th scope="col" class="small" style="width: 50%;">Function</th>
+                      <th scope="col" class="small" style="width: 50%;">Path</th>
+                    </tr>
+                  </thead>
+                  <tbody>
+                    <tr>
+                      <td class="small">
+                        Obtain a device list as an array.<br>
+                        Example response:<br>
+                        <code>{"success":true,"response":[]}</code>
+                      </td>
+                      <td class="align-middle small"><code>/get/devicelist</code></td>
+                    </tr>
+                    <tr>
+                      <td class="small">
+                        Obtain a device's current state as an object.<br>
+                        Example response:<br>
+                        <code>{"success":true,"response":{}}</code>
+                      </td>
+                      <td class="align-middle small"><code>/get/{hbDeviceId}</code></td>
+                    </tr>
+                  </tbody>
+                </table>
+              </div>
+              <h5 class="mt-4 mb-2">Accessory Control Commands</h5>
+              <div class="table-responsive">
+                <table class="table table-sm table-hover">
+                  <thead>
+                    <tr>
+                      <th scope="col" class="small" style="width: 50%;">Function</th>
+                      <th scope="col" class="small" style="width: 50%;">Path</th>
+                    </tr>
+                  </thead>
+                  <tbody>
                   <tr>
-                    <td class="small">
-                      Set the colour temperature to <code>300</code> mired.<br>
-                      Command range:<br>
-                      Must be between <code>140</code> and <code>500</code>.
-                    </td>
-                    <td class="align-middle small"><code>/set/{hbDeviceId}/colourtemperature/300</code></td>
+                    <td class="small"></td>
+                    <td class="align-middle small"><code>/set/{hbDeviceId}/{service}/{characteristic}/{value}</code></td>
                   </tr>
-                </tbody>
-              </table>
+                    <tr>
+                      <td class="small">
+                        <strong>Switch:</strong> set the state to <code>on</code>.<br>
+                        Command range:<br>
+                        Must be <code>on</code>.
+                      </td>
+                      <td class="align-middle small"><code>/set/{hbDeviceId}/switch/state/on</code></td>
+                    </tr>
+                    <tr>
+                      <td class="small">
+                        <strong>Switch:</strong> set the state to <code>off</code>.<br>
+                        Command range:<br>
+                        Must be <code>off</code>.
+                      </td>
+                      <td class="align-middle small"><code>/set/{hbDeviceId}/switch/state/off</code></td>
+                    </tr>
+                    <tr>
+                      <td class="small">
+                        <strong>Switch:</strong> <code>toggle</code> the current state.<br>
+                        Command range:<br>
+                        Must be <code>toggle</code>.
+                      </td>
+                      <td class="align-middle small"><code>/set/{hbDeviceId}/switch/state/toggle</code></td>
+                    </tr>
+                    <tr>
+                      <td class="small">
+                        <strong>Outlet:</strong> set the state to <code>on</code>.<br>
+                        Command range:<br>
+                        Must be <code>on</code>.
+                      </td>
+                      <td class="align-middle small"><code>/set/{hbDeviceId}/outlet/state/on</code></td>
+                    </tr>
+                    <tr>
+                      <td class="small">
+                        <strong>Outlet:</strong> set the state to <code>off</code>.<br>
+                        Command range:<br>
+                        Must be <code>off</code>.
+                      </td>
+                      <td class="align-middle small"><code>/set/{hbDeviceId}/outlet/state/off</code></td>
+                    </tr>
+                    <tr>
+                      <td class="small">
+                        <strong>Outlet:</strong> <code>toggle</code> the current state.<br>
+                        Command range:<br>
+                        Must be <code>toggle</code>.
+                      </td>
+                      <td class="align-middle small"><code>/set/{hbDeviceId}/outlet/state/toggle</code></td>
+                    </tr>
+                    <tr>
+                      <td class="small">
+                        <strong>Light:</strong> set the state to <code>on</code>.<br>
+                        Command range:<br>
+                        Must be <code>on</code>.
+                      </td>
+                      <td class="align-middle small"><code>/set/{hbDeviceId}/light/state/on</code></td>
+                    </tr>
+                    <tr>
+                      <td class="small">
+                        <strong>Light:</strong> set the state to <code>off</code>.<br>
+                        Command range:<br>
+                        Must be <code>off</code>.
+                      </td>
+                      <td class="align-middle small"><code>/set/{hbDeviceId}/light/state/off</code></td>
+                    </tr>
+                    <tr>
+                      <td class="small">
+                        <strong>Light:</strong> <code>toggle</code> the current state.<br>
+                        Command range:<br>
+                        Must be <code>toggle</code>.
+                      </td>
+                      <td class="align-middle small"><code>/set/{hbDeviceId}/light/state/toggle</code></td>
+                    </tr>
+                    <tr>
+                      <td class="small">
+                        <strong>Light:</strong> set the brightness to <code>54</code>%.<br>
+                        Command range:<br>
+                        Must be between <code>0</code> and <code>100</code>.
+                      </td>
+                      <td class="align-middle small"><code>/set/{hbDeviceId}/light/brightness/54</code></td>
+                    </tr>
+                    <tr>
+                      <td class="small">
+                        <strong>Light:</strong> set the hue to <code>157</code>°.<br>
+                        Command range:<br>
+                        Must be between <code>0</code> and <code>360</code>.
+                      </td>
+                      <td class="align-middle small"><code>/set/{hbDeviceId}/light/hue/157</code></td>
+                    </tr>
+                    <tr>
+                      <td class="small">
+                        <strong>Light:</strong> set the colour temperature to <code>300</code> mired.<br>
+                        Command range:<br>
+                        Must be between <code>140</code> and <code>500</code>.
+                      </td>
+                      <td class="align-middle small"><code>/set/{hbDeviceId}/light/colourtemperature/300</code></td>
+                    </tr>
+                  </tbody>
+                </table>
+              </div>
+              <h5 class="mt-4 mb-2">Example Responses</h5>
+              <div class="table-responsive">
+                <table class="table table-sm table-hover">
+                  <thead>
+                    <tr>
+                      <th scope="col" class="small" style="width: 50%;">Device List Array</th>
+                      <th scope="col" class="small" style="width: 50%;">Device Query Object</th>
+                    </tr>
+                  </thead>
+                  <tbody>
+                    <tr>
+                      <td class="small">
+                        <code><pre>{
+  "success": true,
+  "response":[
+    {
+      "name": "Bedroom Switch",
+      "hbdeviceid": "1000aa1a1aSW1",
+      "status": {
+        "wan": true,
+        "lan": true,
+        "ip": "192.168.1.20"
+      }
+    },
+    {
+      "name": "Hall Light Bulb",
+      "hbdeviceid": "1000aa1a1aSWX",
+      "status": {
+        "wan": true,
+        "lan": false,
+        "ip": false
+      }
+    }
+  ]
+}</pre>
+                        </code>
+                      </td>
+                      <td class="small">
+                        <code><pre>{
+  "success": true,
+  "response": {
+    "status": {
+      "wan": true,
+      "lan": true,
+      "ip": "192.168.1.20"
+    },
+    "services": ["switch"],
+    "switch": {
+      "state": "off"
+    }
+  }
+}</pre>
+                        </code>
+                        <ul>
+                          <li><code>services</code> is an array of services that the device has</li>
+                          <li>Possible services include <code>switch</code>, <code>outlet</code> and <code>light</code>
+                          <li>Each service will have a corresponding object of characteristics, in this example the service is <code>switch</code> and a characteristic is <code>state</code></li>
+                          <li>Use the service and characteristic when using the API to control an accessory</li>
+                        </ul>
+                      </td>
+                    </tr>
+                  </tbody>
+                </table>
               </div>
             </div>
             <div class="col-lg-2"></div>
@@ -230,6 +282,7 @@ module.exports = class connectionAPI {
 
   async action (req) {
     // Authenticate the request
+    /*
     if (
       !req.headers ||
       !req.headers.authorization ||
@@ -244,13 +297,15 @@ module.exports = class connectionAPI {
     if (user !== this.config.username || pass !== this.config.password) {
       throw new Error('Invalid authentication')
     }
+    */
 
     // Obtain the parts of the request url
     const pathParts = req.url.split('/')
     const action = pathParts[1]
     const device = pathParts[2]
-    const attribute = pathParts[3]
-    const newStatus = pathParts[4]
+    const servToUpdate = pathParts[3]
+    const charToUpdate = pathParts[4]
+    const newValue = pathParts[5]
 
     // Check an action was specified
     if (!action) {
@@ -277,9 +332,11 @@ module.exports = class connectionAPI {
         deviceList.push({
           name: accessory.displayName,
           hbdeviceid: accessory.context.hbDeviceId,
-          statuswan: !!accessory.context.reachableWAN,
-          statuslan: !!accessory.context.reachableLAN,
-          localip: accessory.context.reachableLAN || false
+          status: {
+            wan: !!accessory.context.reachableWAN,
+            lan: !!accessory.context.reachableLAN,
+            ip: accessory.context.ip || false
+          }
         })
       })
       return deviceList
@@ -299,242 +356,188 @@ module.exports = class connectionAPI {
       throw new Error('Accessory not found in Homebridge')
     }
 
-    // Special case for the reachable WAN and LAN attributes
+    // Check the device is controllable
+    if (!accessory.control) {
+      throw new Error('Accessory has not been initialised yet')
+    }
+
+    // If the action is 'get' then return the properties
     if (action === 'get') {
-      if (attribute === 'statuswan') {
-        return accessory.context.reachableWAN ? 'online' : 'offline'
+      if (!accessory.control.currentState()) {
+        throw new Error('Accessory does not yet support querying')
       }
-      if (attribute === 'statuslan') {
-        return accessory.context.reachableLAN ? 'online' : 'offline'
+      return {
+        status: {
+          wan: !!accessory.context.reachableWAN,
+          lan: !!accessory.context.reachableLAN,
+          ip: accessory.context.ip || false
+        },
+        ...accessory.control.currentState()
       }
     }
 
-    // Check the device is controllable
-    if (!accessory.control) {
-      throw new Error('Accessory has not been initialised yet')
+    // From now on the action must be 'set'
+
+    // Check a servToUpdate to update was specified
+    if (!servToUpdate) {
+      throw new Error('No service specified')
     }
 
-    // Check an attribute was specified
-    if (!attribute) {
-      throw new Error('No attribute specified')
+    let service
+    switch (servToUpdate) {
+      case 'fan':
+        service = this.hapServ.Fan
+        break
+      case 'light':
+        service = this.hapServ.Lightbulb
+        break
+      case 'outlet':
+        service = this.hapServ.Outlet
+        break
+      case 'switch':
+        service = this.hapServ.Switch
+        break
+      default:
+        throw new Error('Invalid service specified')
     }
 
-    // Check a new status was supplied if the action is set
-    if (action === 'set') {
-      if (!newStatus) {
-        throw new Error('No new status specified')
-      }
+    if (!accessory.getService(service)) {
+      throw new Error('Accessory does not have service:' + servToUpdate)
     }
 
-    // These variables depend on the attribute that was supplied
-    let service
+    // Check an charToUpdate for a servToUpdate was specified
+    if (!charToUpdate) {
+      throw new Error('No characteristic specified for service:' + servToUpdate)
+    }
+
+    const accServ = accessory.getService(service)
+
+    // These variables depend on the charToUpdate that was supplied
     let charName
 
-    switch (attribute) {
+    switch (charToUpdate) {
       case 'adaptivelighting':
       case 'colourtemperature':
-        // This can apply to lights that support colour
-        service = accessory.getService(this.hapServ.Lightbulb)
-
-        // Check the accessory has one of these services
-        if (service) {
-          charName = service.testCharacteristic(this.hapChar.ColorTemperature)
-            ? this.hapChar.ColorTemperature
-            : false
-        }
+        charName = accServ.testCharacteristic(this.hapChar.ColorTemperature)
+          ? this.hapChar.ColorTemperature
+          : false
         break
       case 'brightness':
-        // This can apply to lights
-        service = accessory.getService(this.hapServ.Lightbulb)
-
-        // Check the accessory has one of these services
-        if (service) {
-          charName = service.testCharacteristic(this.hapChar.Brightness)
-            ? this.hapChar.Brightness
-            : false
-        }
+        charName = accServ.testCharacteristic(this.hapChar.Brightness)
+          ? this.hapChar.Brightness
+          : false
         break
       case 'hue':
-        // This can apply to lights that support colour
-        service = accessory.getService(this.hapServ.Lightbulb)
-
-        // Check the accessory has one of these services
-        if (service) {
-          charName = service.testCharacteristic(this.hapChar.Hue)
-            ? this.hapChar.Hue
-            : false
-        }
-        break
-      case 'humidity':
-        // This can apply to humidity sensors
-        service = accessory.getService(this.hapServ.HumiditySensor)
-
-        // Check the accessory has one of these services
-        if (service) {
-          charName = service.testCharacteristic(this.hapChar.CurrentRelativeHumidity)
-            ? this.hapChar.CurrentRelativeHumidity
-            : false
-        }
+        charName = accServ.testCharacteristic(this.hapChar.Hue)
+          ? this.hapChar.Hue
+          : false
         break
       case 'state':
-        // This can apply to switches outlets and lights
-        service = accessory.getService(this.hapServ.Switch) ||
-          accessory.getService(this.hapServ.Outlet) ||
-          accessory.getService(this.hapServ.Lightbulb)
-
-        // Check the accessory has one of these services
-        if (service) {
-          charName = service.testCharacteristic(this.hapChar.On)
-            ? this.hapChar.On
-            : false
-        }
-        break
-      case 'temperature':
-        // This can apply to temperature sensors
-        service = accessory.getService(this.hapServ.TemperatureSensor)
-
-        // Check the accessory has one of these services
-        if (service) {
-          charName = service.testCharacteristic(this.hapChar.CurrentTemperature)
-            ? this.hapChar.CurrentTemperature
-            : false
-        }
+        charName = accServ.testCharacteristic(this.hapChar.On)
+          ? this.hapChar.On
+          : false
         break
       default:
-        throw new Error('Invalid attribute given')
+        throw new Error('Invalid characteristic specified for service:' + servToUpdate)
     }
 
-    // Check that the accessory has the corresponding characteristic for the attribute
+    // Check that the accessory has the corresponding characteristic for the charToUpdate
     if (!charName) {
-      throw new Error('Accessory does not support attribute:' + attribute)
+      throw new Error(
+        'Accessory service:' + servToUpdate + ' does not support characteristic:' + charToUpdate
+      )
     }
 
-    // Obtain the cached value of the accessory-service-characteristic
-    const currentHKStatus = service.getCharacteristic(charName).value
-
-    // With a get action we return the cache value from above
-    if (action === 'get') {
-      switch (attribute) {
-        case 'adaptivelighting':
-          return accessory.alController &&
-            accessory.alController.isAdaptiveLightingActive()
-            ? 'on'
-            : 'off'
-        case 'brightness':
-        case 'colourtemperature':
-        case 'hue':
-        case 'humidity':
-        case 'temperature':
-          return service.getCharacteristic(charName).value
-        case 'state':
-          return service.getCharacteristic(charName).value ? 'on' : 'off'
-        default:
-          throw new Error("Invalid attribute for action:get'")
-      }
+    // Check a new status was supplied if the action is set
+    if (!newValue) {
+      throw new Error('No value specified for characteristic:' + charToUpdate)
     }
 
-    // With a set action we need to call the set handler for the characteristic
-    if (action === 'set') {
-      let newHKStatus
-      switch (attribute) {
-        case 'brightness': {
-          // The new status for brightness must be an integer between 0 and 100
-          newHKStatus = parseInt(newStatus)
-          if (isNaN(newHKStatus) || newHKStatus < 0 || newHKStatus > 100) {
-            throw new Error(
-              'New status must be integer 0-100 for attribute:brightness'
-            )
-          }
-
-          // Check the accessory has a correct set handler for on/off
-          if (!accessory.control.internalBrightnessUpdate) {
-            throw new Error('Function to control accessory not found')
-          }
-
-          // Call the set handler to send the request to eWeLink
-          await accessory.control.internalBrightnessUpdate(newHKStatus)
-          break
+    let newHKStatus
+    switch (charToUpdate) {
+      case 'brightness': {
+        // The new status for brightness must be an integer between 0 and 100
+        newHKStatus = parseInt(newValue)
+        if (isNaN(newHKStatus) || newHKStatus < 0 || newHKStatus > 100) {
+          throw new Error('Value must be integer 0-100 for characteristic:brightness')
         }
-        case 'colourtemperature': {
-          // The new status for colour temperature must be an integer between 140 and 500
-          newHKStatus = parseInt(newStatus)
-          if (isNaN(newHKStatus) || newHKStatus < 140 || newHKStatus > 500) {
-            throw new Error(
-              'New status must be integer 140-500 for attribute:colourtemperature'
-            )
-          }
 
-          // Check the accessory has a correct set handler for on/off
-          if (!accessory.control.internalCTUpdate) {
-            throw new Error('Function to control accessory not found')
-          }
+        // Check the accessory has a correct set handler for on/off
+        if (!accessory.control.internalBrightnessUpdate) {
+          throw new Error('Function to control accessory not found')
+        }
 
-          // Call the set handler to send the request to eWeLink
-          if (
-            accessory.alController &&
-            accessory.alController.isAdaptiveLightingActive()
-          ) {
-            accessory.alController.disableAdaptiveLighting()
-          }
-          await accessory.control.internalCTUpdate(newHKStatus)
-          break
+        // Call the set handler to send the request to eWeLink
+        await accessory.control.internalBrightnessUpdate(newHKStatus)
+        break
+      }
+      case 'colourtemperature': {
+        // The new status for colour temperature must be an integer between 140 and 500
+        newHKStatus = parseInt(newValue)
+        if (isNaN(newHKStatus) || newHKStatus < 140 || newHKStatus > 500) {
+          throw new Error('Value must be integer 140-500 for characteristic:colourtemperature')
         }
-        case 'hue': {
-          // The new status for hue must be an integer between 0 and 360
-          newHKStatus = parseInt(newStatus)
-          if (isNaN(newHKStatus) || newHKStatus < 0 || newHKStatus > 360) {
-            throw new Error(
-              'New status must be integer 0-360 for attribute:hue'
-            )
-          }
 
-          // Check the accessory has a correct set handler for on/off
-          if (!accessory.control.internalColourUpdate) {
-            throw new Error('Function to control accessory not found')
-          }
+        // Check the accessory has a correct set handler for on/off
+        if (!accessory.control.internalCTUpdate) {
+          throw new Error('Accessory does not support controlling characteristic:' + charToUpdate)
+        }
 
-          // Call the set handler to send the request to eWeLink
-          if (
-            accessory.alController &&
-            accessory.alController.isAdaptiveLightingActive()
-          ) {
-            accessory.alController.disableAdaptiveLighting()
-          }
-          await accessory.control.internalColourUpdate(newHKStatus)
-          break
+        // Call the set handler to send the request to eWeLink
+        if (accessory.alController && accessory.alController.isAdaptiveLightingActive()) {
+          accessory.alController.disableAdaptiveLighting()
+        }
+        await accessory.control.internalCTUpdate(newHKStatus)
+        break
+      }
+      case 'hue': {
+        // The new status for hue must be an integer between 0 and 360
+        newHKStatus = parseInt(newValue)
+        if (isNaN(newHKStatus) || newHKStatus < 0 || newHKStatus > 360) {
+          throw new Error('Value must be integer 0-360 for characteristic:hue')
         }
-        case 'state':
-          // The new status for state must be on, off or toggle
-          switch (newStatus) {
-            case 'on':
-              newHKStatus = true
-              break
-            case 'off':
-              newHKStatus = false
-              break
-            case 'toggle':
-              newHKStatus = !currentHKStatus
-              break
-            default:
-              throw new Error(
-                "New status must be 'on', 'off' or 'toggle' for attribute:state"
-              )
-          }
 
-          // Check the accessory has a correct set handler for on/off
-          if (!accessory.control.internalStateUpdate) {
-            throw new Error('Function to control accessory not found')
-          }
+        // Check the accessory has a correct set handler for on/off
+        if (!accessory.control.internalColourUpdate) {
+          throw new Error('Function to control accessory not found')
+        }
 
-          // Call the set handler to send the request to eWeLink
-          await accessory.control.internalStateUpdate(newHKStatus)
-          break
-        default:
-          throw new Error("Invalid attribute for action:set'")
+        // Call the set handler to send the request to eWeLink
+        if (accessory.alController && accessory.alController.isAdaptiveLightingActive()) {
+          accessory.alController.disableAdaptiveLighting()
+        }
+        await accessory.control.internalColourUpdate(newHKStatus)
+        break
       }
+      case 'state':
+        // The new status for state must be on, off or toggle
+        switch (newValue) {
+          case 'on':
+            newHKStatus = true
+            break
+          case 'off':
+            newHKStatus = false
+            break
+          case 'toggle':
+            newHKStatus = !accServ.getCharacteristic(this.hapChar.On).value
+            break
+          default:
+            throw new Error("Value must be 'on', 'off' or 'toggle' for characteristic:state")
+        }
+
+        // Check the accessory has a correct set handler for on/off
+        if (!accessory.control.internalStateUpdate) {
+          throw new Error('Function to control accessory not found')
+        }
 
-      // The eWeLink request was successful so update the characteristic in HomeKit
-      service.updateCharacteristic(charName, newHKStatus)
+        // Call the set handler to send the request to eWeLink
+        await accessory.control.internalStateUpdate(newHKStatus)
+        break
+      default:
+        throw new Error('Invalid value for characteristic:' + charToUpdate)
     }
+
+    // The eWeLink request was successful so update the characteristic in HomeKit
+    accServ.updateCharacteristic(charName, newHKStatus)
   }
 }

From 32386388881db244260e910bea10e79ebb9fe387 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 6 May 2021 19:59:12 +0100
Subject: [PATCH 2046/3183] 6.5.1-beta.0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index eed6d47e..72e2f578 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.5.0",
+  "version": "6.5.1-beta.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 304f0fda..6b3099aa 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.5.0",
+  "version": "6.5.1-beta.0",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From e5c88edf55c14e9abc10db504584c6da3c68605e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 6 May 2021 20:01:23 +0100
Subject: [PATCH 2047/3183] reinstate auth

---
 lib/connection/api.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/lib/connection/api.js b/lib/connection/api.js
index 342bb03b..3552f00d 100644
--- a/lib/connection/api.js
+++ b/lib/connection/api.js
@@ -282,7 +282,6 @@ module.exports = class connectionAPI {
 
   async action (req) {
     // Authenticate the request
-    /*
     if (
       !req.headers ||
       !req.headers.authorization ||
@@ -297,7 +296,6 @@ module.exports = class connectionAPI {
     if (user !== this.config.username || pass !== this.config.password) {
       throw new Error('Invalid authentication')
     }
-    */
 
     // Obtain the parts of the request url
     const pathParts = req.url.split('/')

From 63e910eb9d3f03e4193a30712458663fc9352b44 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 6 May 2021 20:01:54 +0100
Subject: [PATCH 2048/3183] 6.5.1-beta.1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 72e2f578..4b6a4aad 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.5.1-beta.0",
+  "version": "6.5.1-beta.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 6b3099aa..4a38e41c 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.5.1-beta.0",
+  "version": "6.5.1-beta.1",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 24d55cb2e1ed50b1b78ec01eff583be1496e013e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 6 May 2021 20:51:14 +0100
Subject: [PATCH 2049/3183] add fan to api, rearrange docs

---
 lib/connection/api.js | 139 ++++++++++++++++++++++--------------------
 lib/device/fan.js     |  39 ++++++++++--
 2 files changed, 108 insertions(+), 70 deletions(-)

diff --git a/lib/connection/api.js b/lib/connection/api.js
index 3552f00d..1aaac912 100644
--- a/lib/connection/api.js
+++ b/lib/connection/api.js
@@ -71,23 +71,57 @@ module.exports = class connectionAPI {
                   <tbody>
                     <tr>
                       <td class="small">
-                        Obtain a device list as an array.<br>
-                        Example response:<br>
-                        <code>{"success":true,"response":[]}</code>
+                        <strong>Obtain a device list.</strong><br>
+                        Returns an <code>array</code>, for example:<br>
+                        <code><pre>{
+  "success": true,
+  "response":[
+    {
+      "name": "Bedroom Switch",
+      "hbdeviceid": "1000aa1a1aSW1",
+      "status": {
+        "wan": true,
+        "lan": true,
+        "ip": "192.168.1.20"
+      }
+    }
+  ]
+}</pre>
+                        </code>
                       </td>
                       <td class="align-middle small"><code>/get/devicelist</code></td>
                     </tr>
                     <tr>
                       <td class="small">
-                        Obtain a device's current state as an object.<br>
-                        Example response:<br>
-                        <code>{"success":true,"response":{}}</code>
+                        <strong>Obtain a device's current state.</strong><br>
+                        Returns an <code>object</code>, for example:<br>
+                        <code><pre>{
+  "success": true,
+  "response": {
+    "status": {
+      "wan": true,
+      "lan": true,
+      "ip": "192.168.1.20"
+    },
+    "services": ["switch"],
+    "switch": {
+      "state": "off"
+    }
+  }
+}</pre>
+                        </code>
                       </td>
                       <td class="align-middle small"><code>/get/{hbDeviceId}</code></td>
                     </tr>
                   </tbody>
                 </table>
               </div>
+              <ul class="small">
+                <li><code>services</code> is an array of services that the device has</li>
+                <li>Possible services include <code>switch</code>, <code>outlet</code> and <code>light</code>
+                <li>Each service will have a corresponding object of characteristics, in this example the service is <code>switch</code> and a characteristic is <code>state</code></li>
+                <li>Use the service and characteristic when using the API to control an accessory</li>
+              </ul>
               <h5 class="mt-4 mb-2">Accessory Control Commands</h5>
               <div class="table-responsive">
                 <table class="table table-sm table-hover">
@@ -198,69 +232,13 @@ module.exports = class connectionAPI {
                       </td>
                       <td class="align-middle small"><code>/set/{hbDeviceId}/light/colourtemperature/300</code></td>
                     </tr>
-                  </tbody>
-                </table>
-              </div>
-              <h5 class="mt-4 mb-2">Example Responses</h5>
-              <div class="table-responsive">
-                <table class="table table-sm table-hover">
-                  <thead>
-                    <tr>
-                      <th scope="col" class="small" style="width: 50%;">Device List Array</th>
-                      <th scope="col" class="small" style="width: 50%;">Device Query Object</th>
-                    </tr>
-                  </thead>
-                  <tbody>
                     <tr>
                       <td class="small">
-                        <code><pre>{
-  "success": true,
-  "response":[
-    {
-      "name": "Bedroom Switch",
-      "hbdeviceid": "1000aa1a1aSW1",
-      "status": {
-        "wan": true,
-        "lan": true,
-        "ip": "192.168.1.20"
-      }
-    },
-    {
-      "name": "Hall Light Bulb",
-      "hbdeviceid": "1000aa1a1aSWX",
-      "status": {
-        "wan": true,
-        "lan": false,
-        "ip": false
-      }
-    }
-  ]
-}</pre>
-                        </code>
-                      </td>
-                      <td class="small">
-                        <code><pre>{
-  "success": true,
-  "response": {
-    "status": {
-      "wan": true,
-      "lan": true,
-      "ip": "192.168.1.20"
-    },
-    "services": ["switch"],
-    "switch": {
-      "state": "off"
-    }
-  }
-}</pre>
-                        </code>
-                        <ul>
-                          <li><code>services</code> is an array of services that the device has</li>
-                          <li>Possible services include <code>switch</code>, <code>outlet</code> and <code>light</code>
-                          <li>Each service will have a corresponding object of characteristics, in this example the service is <code>switch</code> and a characteristic is <code>state</code></li>
-                          <li>Use the service and characteristic when using the API to control an accessory</li>
-                        </ul>
+                        <strong>Fan:</strong> set the speed to <code>medium</code>.<br>
+                        Command range:<br>
+                        Must be <code>low</code>, <code>medium</code> or <code>high</code>.
                       </td>
+                      <td class="align-middle small"><code>/set/{hbDeviceId}/fan/speed/medium</code></td>
                     </tr>
                   </tbody>
                 </table>
@@ -430,6 +408,11 @@ module.exports = class connectionAPI {
           ? this.hapChar.Hue
           : false
         break
+      case 'speed':
+        charName = accServ.testCharacteristic(this.hapChar.RotationSpeed)
+          ? this.hapChar.RotationSpeed
+          : false
+        break
       case 'state':
         charName = accServ.testCharacteristic(this.hapChar.On)
           ? this.hapChar.On
@@ -507,6 +490,30 @@ module.exports = class connectionAPI {
         await accessory.control.internalColourUpdate(newHKStatus)
         break
       }
+      case 'speed':
+        // The new status for speed must be low, medium or high
+        switch (newValue) {
+          case 'low':
+            newHKStatus = 33
+            break
+          case 'medium':
+            newHKStatus = 66
+            break
+          case 'high':
+            newHKStatus = 99
+            break
+          default:
+            throw new Error("Value must be 'low', 'medium' or 'high' for characteristic:speed")
+        }
+
+        // Check the accessory has a correct set handler for speed
+        if (!accessory.control.internalSpeedUpdate) {
+          throw new Error('Function to control accessory not found')
+        }
+
+        // Call the set handler to send the request to eWeLink
+        await accessory.control.internalSpeedUpdate(newHKStatus)
+        break
       case 'state':
         // The new status for state must be on, off or toggle
         switch (newValue) {
diff --git a/lib/device/fan.js b/lib/device/fan.js
index 839a3be7..dd265394 100644
--- a/lib/device/fan.js
+++ b/lib/device/fan.js
@@ -30,10 +30,7 @@ module.exports = class deviceFan {
 
     // Add the set handler to the fan on/off characteristic
     this.service.getCharacteristic(this.hapChar.On).onSet(async value => {
-      if (!value) {
-        this.service.updateCharacteristic(this.hapChar.RotationSpeed, 0)
-        await this.internalSpeedUpdate(0)
-      }
+      await this.internalStateUpdate(value)
     })
 
     // Add the set handler to the fan rotation speed characteristic
@@ -76,6 +73,13 @@ module.exports = class deviceFan {
     }
   }
 
+  async internalStateUpdate (value) {
+    if (!value) {
+      this.service.updateCharacteristic(this.hapChar.RotationSpeed, 0)
+      await this.internalSpeedUpdate(0)
+    }
+  }
+
   async internalSpeedUpdate (value) {
     try {
       // This acts like a debounce function when endlessly sliding the slider
@@ -214,4 +218,31 @@ module.exports = class deviceFan {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
+
+  currentState () {
+    const toReturn = {}
+    let speedLabel
+    const speed = this.service.getCharacteristic(this.hapChar.RotationSpeed).value
+    if (speed === 0) {
+      speedLabel = 'off'
+    } else if (speed <= 33) {
+      speedLabel = 'low'
+    } else if (speed <= 66) {
+      speedLabel = 'medium'
+    } else {
+      speedLabel = 'high'
+    }
+    toReturn.services = ['fan']
+    toReturn.fan = {
+      state: this.service.getCharacteristic(this.hapChar.On).value ? 'on' : 'off',
+      speed: speedLabel
+    }
+    if (!this.hideLight) {
+      toReturn.services.push('light')
+      toReturn.light = {
+        state: this.lightService.getCharacteristic(this.hapChar.On).value ? 'on' : 'off'
+      }
+    }
+    return toReturn
+  }
 }

From 2bde3fd4614597d565507508a06c06e6feb0a6e8 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 6 May 2021 21:11:10 +0100
Subject: [PATCH 2050/3183] rearrange docs again

---
 lib/connection/api.js | 106 ++++++++++++------------------------------
 1 file changed, 31 insertions(+), 75 deletions(-)

diff --git a/lib/connection/api.js b/lib/connection/api.js
index 1aaac912..24b9bbe8 100644
--- a/lib/connection/api.js
+++ b/lib/connection/api.js
@@ -72,7 +72,7 @@ module.exports = class connectionAPI {
                     <tr>
                       <td class="small">
                         <strong>Obtain a device list.</strong><br>
-                        Returns an <code>array</code>, for example:<br>
+                        <code>response</code> property is an <code>array</code>, for example:<br>
                         <code><pre>{
   "success": true,
   "response":[
@@ -94,7 +94,7 @@ module.exports = class connectionAPI {
                     <tr>
                       <td class="small">
                         <strong>Obtain a device's current state.</strong><br>
-                        Returns an <code>object</code>, for example:<br>
+                        <code>response</code> property is an <code>object</code>, for example:<br>
                         <code><pre>{
   "success": true,
   "response": {
@@ -118,9 +118,13 @@ module.exports = class connectionAPI {
               </div>
               <ul class="small">
                 <li><code>services</code> is an array of services that the device has</li>
-                <li>Possible services include <code>switch</code>, <code>outlet</code> and <code>light</code>
-                <li>Each service will have a corresponding object of characteristics, in this example the service is <code>switch</code> and a characteristic is <code>state</code></li>
-                <li>Use the service and characteristic when using the API to control an accessory</li>
+                <li>Possible services include <code>switch</code>, <code>outlet</code>, <code>light</code> and <code>fan</code>
+                <li>Each service will have a corresponding property of characteristic(s)
+                  <ul>
+                    <li>In the above example the service is <code>switch</code> and the only characteristic is <code>state</code></li>
+                  </ul>
+                </li>
+                <li>Use the service and characteristic when using the below commands to control an accessory</li>
               </ul>
               <h5 class="mt-4 mb-2">Accessory Control Commands</h5>
               <div class="table-responsive">
@@ -133,110 +137,62 @@ module.exports = class connectionAPI {
                   </thead>
                   <tbody>
                   <tr>
-                    <td class="small"></td>
+                    <td class="small">Template</td>
                     <td class="align-middle small"><code>/set/{hbDeviceId}/{service}/{characteristic}/{value}</code></td>
                   </tr>
                     <tr>
                       <td class="small">
-                        <strong>Switch:</strong> set the state to <code>on</code>.<br>
-                        Command range:<br>
-                        Must be <code>on</code>.
+                        Service: <code>switch</code>.<br>
+                        Characteristic: <code>state</code>.<br>
+                        Value: must be <code>on</code>, <code>off</code> or <code>toggle</code>.
                       </td>
                       <td class="align-middle small"><code>/set/{hbDeviceId}/switch/state/on</code></td>
                     </tr>
                     <tr>
                       <td class="small">
-                        <strong>Switch:</strong> set the state to <code>off</code>.<br>
-                        Command range:<br>
-                        Must be <code>off</code>.
-                      </td>
-                      <td class="align-middle small"><code>/set/{hbDeviceId}/switch/state/off</code></td>
-                    </tr>
-                    <tr>
-                      <td class="small">
-                        <strong>Switch:</strong> <code>toggle</code> the current state.<br>
-                        Command range:<br>
-                        Must be <code>toggle</code>.
-                      </td>
-                      <td class="align-middle small"><code>/set/{hbDeviceId}/switch/state/toggle</code></td>
-                    </tr>
-                    <tr>
-                      <td class="small">
-                        <strong>Outlet:</strong> set the state to <code>on</code>.<br>
-                        Command range:<br>
-                        Must be <code>on</code>.
-                      </td>
-                      <td class="align-middle small"><code>/set/{hbDeviceId}/outlet/state/on</code></td>
-                    </tr>
-                    <tr>
-                      <td class="small">
-                        <strong>Outlet:</strong> set the state to <code>off</code>.<br>
-                        Command range:<br>
-                        Must be <code>off</code>.
+                        Service: <code>outlet</code>.<br>
+                        Characteristic: <code>state</code>.<br>
+                        Value: must be <code>on</code>, <code>off</code> or <code>toggle</code>.
                       </td>
                       <td class="align-middle small"><code>/set/{hbDeviceId}/outlet/state/off</code></td>
                     </tr>
                     <tr>
                       <td class="small">
-                        <strong>Outlet:</strong> <code>toggle</code> the current state.<br>
-                        Command range:<br>
-                        Must be <code>toggle</code>.
-                      </td>
-                      <td class="align-middle small"><code>/set/{hbDeviceId}/outlet/state/toggle</code></td>
-                    </tr>
-                    <tr>
-                      <td class="small">
-                        <strong>Light:</strong> set the state to <code>on</code>.<br>
-                        Command range:<br>
-                        Must be <code>on</code>.
+                        Service: <code>light</code>.<br>
+                        Characteristic: <code>state</code>.<br>
+                        Value: must be <code>on</code>, <code>off</code> or <code>toggle</code>.
                       </td>
                       <td class="align-middle small"><code>/set/{hbDeviceId}/light/state/on</code></td>
                     </tr>
                     <tr>
                       <td class="small">
-                        <strong>Light:</strong> set the state to <code>off</code>.<br>
-                        Command range:<br>
-                        Must be <code>off</code>.
-                      </td>
-                      <td class="align-middle small"><code>/set/{hbDeviceId}/light/state/off</code></td>
-                    </tr>
-                    <tr>
-                      <td class="small">
-                        <strong>Light:</strong> <code>toggle</code> the current state.<br>
-                        Command range:<br>
-                        Must be <code>toggle</code>.
-                      </td>
-                      <td class="align-middle small"><code>/set/{hbDeviceId}/light/state/toggle</code></td>
-                    </tr>
-                    <tr>
-                      <td class="small">
-                        <strong>Light:</strong> set the brightness to <code>54</code>%.<br>
-                        Command range:<br>
-                        Must be between <code>0</code> and <code>100</code>.
+                        Service: <code>light</code>.<br>
+                        Characteristic: <code>brightness</code>.<br>
+                        Value: must be between <code>0</code> and <code>100</code>.
                       </td>
                       <td class="align-middle small"><code>/set/{hbDeviceId}/light/brightness/54</code></td>
                     </tr>
                     <tr>
                       <td class="small">
-                        <strong>Light:</strong> set the hue to <code>157</code>°.<br>
-                        Command range:<br>
-                        Must be between <code>0</code> and <code>360</code>.
+                        Service: <code>light</code>.<br>
+                        Characteristic: <code>hue</code>.<br>
+                        Value: must be between <code>0</code> and <code>360</code>.
                       </td>
                       <td class="align-middle small"><code>/set/{hbDeviceId}/light/hue/157</code></td>
                     </tr>
                     <tr>
                       <td class="small">
-                        <strong>Light:</strong> set the colour temperature to <code>300</code> mired.<br>
-                        Command range:<br>
-                        Must be between <code>140</code> and <code>500</code>.
+                        Service: <code>light</code>.<br>
+                        Characteristic: <code>colourtemperature</code>.<br>
+                        Value: must be between <code>140</code> and <code>500</code>.
                       </td>
                       <td class="align-middle small"><code>/set/{hbDeviceId}/light/colourtemperature/300</code></td>
                     </tr>
                     <tr>
                       <td class="small">
-                        <strong>Fan:</strong> set the speed to <code>medium</code>.<br>
-                        Command range:<br>
-                        Must be <code>low</code>, <code>medium</code> or <code>high</code>.
+                        Service: <code>fan</code>.<br>
+                        Characteristic: <code>speed</code>.<br>
+                        Value: must be <code>low</code>, <code>medium</code> or <code>high</code>.
                       </td>
                       <td class="align-middle small"><code>/set/{hbDeviceId}/fan/speed/medium</code></td>
                     </tr>

From c3749b948a5dde3428b014b1afeebfd6e32c3d9d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 6 May 2021 21:11:37 +0100
Subject: [PATCH 2051/3183] 6.5.1-beta.2

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 4b6a4aad..2f6bcf08 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.5.1-beta.1",
+  "version": "6.5.1-beta.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 4a38e41c..a20ebbb9 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.5.1-beta.1",
+  "version": "6.5.1-beta.2",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 77a99df852a10e49b202d060c5081b829e4d0846 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 7 May 2021 06:32:58 +0100
Subject: [PATCH 2052/3183] fix garage devicesInHB issues

---
 lib/device/simulation/garage-od-switch.js | 4 ++--
 lib/device/simulation/garage-one.js       | 8 ++++----
 lib/index.js                              | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/device/simulation/garage-od-switch.js b/lib/device/simulation/garage-od-switch.js
index f9c33e4b..3887e4c5 100644
--- a/lib/device/simulation/garage-od-switch.js
+++ b/lib/device/simulation/garage-od-switch.js
@@ -3,7 +3,7 @@
 'use strict'
 
 module.exports = class deviceGarageODSwitch {
-  constructor (platform, accessory) {
+  constructor (platform, accessory, devicesInHB) {
     // Set up variables from the platform
     this.hapChar = platform.api.hap.Characteristic
     this.hapServ = platform.api.hap.Service
@@ -19,7 +19,7 @@ module.exports = class deviceGarageODSwitch {
     // Set up custom variables for this device type
     this.garageId = platform.obstructSwitches[accessory.context.eweDeviceId]
     const uuid = this.hapUUIDGen(this.garageId + 'SWX')
-    this.garage = platform.devicesInHB.get(uuid)
+    this.garage = devicesInHB.get(uuid)
     this.disableDeviceLogging = platform.simulations[this.garageId] &&
       platform.simulations[this.garageId].overrideDisabledLogging
       ? false
diff --git a/lib/device/simulation/garage-one.js b/lib/device/simulation/garage-one.js
index afff559e..d88552f8 100644
--- a/lib/device/simulation/garage-one.js
+++ b/lib/device/simulation/garage-one.js
@@ -3,7 +3,7 @@
 'use strict'
 
 module.exports = class deviceGarageOne {
-  constructor (platform, accessory) {
+  constructor (platform, accessory, devicesInHB) {
     // Set up variables from the platform
     this.eveChar = platform.eveChar
     this.funcs = platform.funcs
@@ -44,17 +44,17 @@ module.exports = class deviceGarageOne {
     if (deviceConf.sensorId) {
       // Check the sensor exists in Homebridge
       const uuid = this.hapUUIDGen(deviceConf.sensorId + 'SWX')
-      if (!platform.devicesInHB.has(uuid)) {
+      if (!devicesInHB.has(uuid)) {
         this.error = this.lang.simErrNoSensor
       }
 
       // Check the sensor is a sensor
       if (!platform.consts.devices.garageSensors.includes(
-        platform.devicesInHB.get(uuid).context.eweUIID
+        devicesInHB.get(uuid).context.eweUIID
       )) {
         this.error = this.lang.simErrNotSensor
       }
-      this.definedSensor = this.platform.devicesInHB.get(uuid)
+      this.definedSensor = devicesInHB.get(uuid)
 
       // Check the sensor has the ContactSensor service
       if (!this.definedSensor.getService(this.hapServ.ContactSensor)) {
diff --git a/lib/index.js b/lib/index.js
index b8ba7739..cc0a181b 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -718,7 +718,7 @@ class eWeLinkPlatform {
         *****************************/
         const instance = './device/simulation/garage-od-switch'
         accessory = this.addAccessory(device, device.deviceid + 'SWX', true)
-        accessory.control = new (require(instance))(this, accessory)
+        accessory.control = new (require(instance))(this, accessory, devicesInHB)
         /****************************/
       } else if (
         this.simulations[device.deviceid] &&
@@ -730,7 +730,7 @@ class eWeLinkPlatform {
         const instance = './device/simulation/garage-one'
         accessory = devicesInHB.get(uuid) ||
           this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require(instance))(this, accessory)
+        accessory.control = new (require(instance))(this, accessory, devicesInHB)
         /***************************************/
       } else if (
         this.simulations[device.deviceid] &&

From 05a23718fe80608cb92798e9d41d66ad5dc2d6da Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 7 May 2021 06:36:02 +0100
Subject: [PATCH 2053/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6a9312ec..e744683b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,14 @@
 
 All notable changes to this homebridge-ewelink will be documented in this file.
 
+## 6.5.1 (2021-05.07)
+
+### Changes
+
+* Fixes an initialisation issue with the 'garage' and 'obstruction detection' switch simulations
+* Amendments to internal API endpoints
+* Device IP changes will now reflect correctly
+
 ## 6.5.0 (2021-05-06)
 
 ### Added

From c255cfb8fc43ffe68eb9aecbb19a93659f48a102 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 7 May 2021 06:36:11 +0100
Subject: [PATCH 2054/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e744683b..601da390 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 All notable changes to this homebridge-ewelink will be documented in this file.
 
-## 6.5.1 (2021-05.07)
+## 6.5.1 (2021-05-07)
 
 ### Changes
 

From d998c39fe526b281b23c5b17adedbc85873cabe7 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 7 May 2021 06:36:38 +0100
Subject: [PATCH 2055/3183] 6.5.1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 2f6bcf08..79ad1442 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.5.1-beta.2",
+  "version": "6.5.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index a20ebbb9..0592510d 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.5.1-beta.2",
+  "version": "6.5.1",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From f23a9698f9f492d64d4268cfce310c514a91eb1a Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 7 May 2021 07:07:02 +0100
Subject: [PATCH 2056/3183] Update sensor-ambient.js

---
 lib/device/zigbee/sensor-ambient.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/device/zigbee/sensor-ambient.js b/lib/device/zigbee/sensor-ambient.js
index edaacc95..eb9f40b8 100644
--- a/lib/device/zigbee/sensor-ambient.js
+++ b/lib/device/zigbee/sensor-ambient.js
@@ -87,7 +87,7 @@ module.exports = class deviceZBSensorAmbient {
         this.tService.updateCharacteristic(this.hapChar.CurrentTemperature, currentTemp)
         eveLog.temp = currentTemp
         if (params.updateSource && !this.disableDeviceLogging) {
-          this.log('[%s] %s [%s].', this.name, this.lang.curTemp, currentTemp)
+          this.log('[%s] %s [%s°C].', this.name, this.lang.curTemp, currentTemp)
         }
       }
       if (
@@ -102,7 +102,7 @@ module.exports = class deviceZBSensorAmbient {
         )
         eveLog.humidity = currentHumi
         if (params.updateSource && !this.disableDeviceLogging) {
-          this.log('[%s] %s [%s].', this.name, this.lang.curHumi, currentHumi)
+          this.log('[%s] %s [%s%].', this.name, this.lang.curHumi, currentHumi)
         }
       }
       if (eveLog.temp || eveLog.humidity) {

From aa31e59dfb3786b5c838fd93579522ad1fe55e5f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 7 May 2021 07:32:19 +0100
Subject: [PATCH 2057/3183] add temp+humidity query to api

---
 lib/device/sensor-ambient.js        | 15 +++++++++++++++
 lib/device/sensor-temp-humi.js      | 12 ++++++++++++
 lib/device/zigbee/sensor-ambient.js | 25 ++++++++++++++++++++-----
 3 files changed, 47 insertions(+), 5 deletions(-)

diff --git a/lib/device/sensor-ambient.js b/lib/device/sensor-ambient.js
index c629cf0c..0b5f4e9e 100644
--- a/lib/device/sensor-ambient.js
+++ b/lib/device/sensor-ambient.js
@@ -175,4 +175,19 @@ module.exports = class deviceSensorAmbient {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
+  
+  currentState () {
+    const toReturn = {}
+    toReturn.services = ['temperature']
+    toReturn.temperature = {
+      current: this.tempService.getCharacteristic(this.hapChar.CurrentTemperature).value
+    }
+    if (this.humiService) {
+      toReturn.services.push('humidity')
+      toReturn.humidity = {
+        current: this.humiService.getCharacteristic(this.hapChar.CurrentRelativeHumidity).value
+      }
+    }
+    return toReturn
+  }
 }
diff --git a/lib/device/sensor-temp-humi.js b/lib/device/sensor-temp-humi.js
index e59d2c4b..40ba77bc 100644
--- a/lib/device/sensor-temp-humi.js
+++ b/lib/device/sensor-temp-humi.js
@@ -94,4 +94,16 @@ module.exports = class deviceSensorTempHumi {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
+  
+  currentState () {
+    const toReturn = {}
+    toReturn.services = ['temperature', 'humidity']
+    toReturn.temperature = {
+      current: this.tempService.getCharacteristic(this.hapChar.CurrentTemperature).value
+    }
+    toReturn.humidity = {
+      current: this.humiService.getCharacteristic(this.hapChar.CurrentRelativeHumidity).value
+    }
+    return toReturn
+  }
 }
diff --git a/lib/device/zigbee/sensor-ambient.js b/lib/device/zigbee/sensor-ambient.js
index eb9f40b8..43d9dc76 100644
--- a/lib/device/zigbee/sensor-ambient.js
+++ b/lib/device/zigbee/sensor-ambient.js
@@ -29,16 +29,16 @@ module.exports = class deviceZBSensorAmbient {
       : platform.config.disableDeviceLogging
 
     // Add the temperature sensor service if it doesn't already exist
-    this.tService = this.accessory.getService(this.hapServ.TemperatureSensor) ||
+    this.tempService = this.accessory.getService(this.hapServ.TemperatureSensor) ||
       this.accessory.addService(this.hapServ.TemperatureSensor)
 
     // Add options to the current temperature characteristic
-    this.tService.getCharacteristic(this.hapChar.CurrentTemperature).setProps({
+    this.tempService.getCharacteristic(this.hapChar.CurrentTemperature).setProps({
       minStep: 0.1
     })
 
     // Add the humidity sensor service if it doesn't already exist
-    this.hService = this.accessory.getService(this.hapServ.HumiditySensor) ||
+    this.humiService = this.accessory.getService(this.hapServ.HumiditySensor) ||
       this.accessory.addService(this.hapServ.HumiditySensor)
 
     // Add the battery service if it doesn't already exist
@@ -84,7 +84,7 @@ module.exports = class deviceZBSensorAmbient {
       ) {
         this.cacheTemp = params.temperature
         const currentTemp = parseInt(this.cacheTemp) / 100 + this.tempOffset
-        this.tService.updateCharacteristic(this.hapChar.CurrentTemperature, currentTemp)
+        this.tempService.updateCharacteristic(this.hapChar.CurrentTemperature, currentTemp)
         eveLog.temp = currentTemp
         if (params.updateSource && !this.disableDeviceLogging) {
           this.log('[%s] %s [%s°C].', this.name, this.lang.curTemp, currentTemp)
@@ -96,7 +96,7 @@ module.exports = class deviceZBSensorAmbient {
       ) {
         this.cacheHumi = params.humidity
         const currentHumi = parseInt(this.cacheHumi) / 100
-        this.hService.updateCharacteristic(
+        this.humiService.updateCharacteristic(
           this.hapChar.CurrentRelativeHumidity,
           currentHumi
         )
@@ -113,4 +113,19 @@ module.exports = class deviceZBSensorAmbient {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
+  
+  currentState () {
+    const toReturn = {}
+    toReturn.services = ['temperature', 'humidity', 'battery']
+    toReturn.temperature = {
+      current: this.tempService.getCharacteristic(this.hapChar.CurrentTemperature).value
+    }
+    toReturn.humidity = {
+      current: this.humiService.getCharacteristic(this.hapChar.CurrentRelativeHumidity).value
+    }
+    toReturn.battery = {
+      current: this.battService.getCharacteristic(this.hapChar.BatteryLevel).value
+    }
+    return toReturn
+  }
 }

From f92823ff14ee4d1847d4f19eaa4f4f518d97de8b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 7 May 2021 07:55:18 +0100
Subject: [PATCH 2058/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 601da390..57ba960e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,16 @@
 
 All notable changes to this homebridge-ewelink will be documented in this file.
 
+## BETA
+
+### Added
+
+* Support querying temperature and humidity values via the internal API
+
+### Changes
+
+* Display temperature and humidity units for the zigbee temperature/humidity sensor in the logs
+
 ## 6.5.1 (2021-05-07)
 
 ### Changes

From 21345bce3cbed2f95d9bce9c989905e355245246 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 7 May 2021 07:56:14 +0100
Subject: [PATCH 2059/3183] 6.5.2-beta.0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 79ad1442..84bf8f1a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.5.1",
+  "version": "6.5.2-beta.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 0592510d..844aa024 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.5.1",
+  "version": "6.5.2-beta.0",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From de8cd80714d62f4361f5d0d887d3baa47bb18266 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 7 May 2021 08:06:26 +0100
Subject: [PATCH 2060/3183] log api requests

---
 lib/connection/api.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/connection/api.js b/lib/connection/api.js
index 24b9bbe8..5f276bda 100644
--- a/lib/connection/api.js
+++ b/lib/connection/api.js
@@ -215,6 +215,11 @@ module.exports = class connectionAPI {
   }
 
   async action (req) {
+    // Log the request if appropriate
+    if (this.debug) {
+      this.log('API request [%s].', req.url)
+    }
+
     // Authenticate the request
     if (
       !req.headers ||

From a926b9994ac187d91cf376598bac1fab5206aa9a Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 7 May 2021 08:06:32 +0100
Subject: [PATCH 2061/3183] formatting

---
 lib/device/sensor-ambient.js        | 2 +-
 lib/device/sensor-temp-humi.js      | 2 +-
 lib/device/zigbee/sensor-ambient.js | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/device/sensor-ambient.js b/lib/device/sensor-ambient.js
index 0b5f4e9e..50b2de5d 100644
--- a/lib/device/sensor-ambient.js
+++ b/lib/device/sensor-ambient.js
@@ -175,7 +175,7 @@ module.exports = class deviceSensorAmbient {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
-  
+
   currentState () {
     const toReturn = {}
     toReturn.services = ['temperature']
diff --git a/lib/device/sensor-temp-humi.js b/lib/device/sensor-temp-humi.js
index 40ba77bc..5cf033b5 100644
--- a/lib/device/sensor-temp-humi.js
+++ b/lib/device/sensor-temp-humi.js
@@ -94,7 +94,7 @@ module.exports = class deviceSensorTempHumi {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
-  
+
   currentState () {
     const toReturn = {}
     toReturn.services = ['temperature', 'humidity']
diff --git a/lib/device/zigbee/sensor-ambient.js b/lib/device/zigbee/sensor-ambient.js
index 43d9dc76..875f9560 100644
--- a/lib/device/zigbee/sensor-ambient.js
+++ b/lib/device/zigbee/sensor-ambient.js
@@ -113,7 +113,7 @@ module.exports = class deviceZBSensorAmbient {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
-  
+
   currentState () {
     const toReturn = {}
     toReturn.services = ['temperature', 'humidity', 'battery']

From fdc9c1a4535c5f1b1edc1c2a6787fb7599c0b61a Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 7 May 2021 08:06:34 +0100
Subject: [PATCH 2062/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 57ba960e..14827d5a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 ### Added
 
+* Log internal API requests when in debug mode
 * Support querying temperature and humidity values via the internal API
 
 ### Changes

From 158097255d38a45fd13d6be7d7894df9f9ccf700 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 7 May 2021 08:13:16 +0100
Subject: [PATCH 2063/3183] 6.5.2-beta.1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 84bf8f1a..221736e9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.5.2-beta.0",
+  "version": "6.5.2-beta.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 844aa024..49dc4da2 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.5.2-beta.0",
+  "version": "6.5.2-beta.1",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 2906f6540013ffc86590c0a014e33c36d06c9c87 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 7 May 2021 09:48:38 +0100
Subject: [PATCH 2064/3183] close ws on shutdown + lang for api shutdown

---
 lib/connection/ws.js | 7 ++++---
 lib/index.js         | 2 +-
 lib/utils/lang-en.js | 5 +++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/lib/connection/ws.js b/lib/connection/ws.js
index 34653f8f..cd3d1b68 100644
--- a/lib/connection/ws.js
+++ b/lib/connection/ws.js
@@ -381,19 +381,20 @@ module.exports = class connectionWS {
   async closeConnection () {
     // This is called when refreshing connection or if Homebridge shuts down
 
-    // Set the connection flag to false
-    this.wsIsConnected = false
-
     // Clear any existing ping interval
     if (this.hbInterval) {
       clearInterval(this.hbInterval)
       this.hbInterval = null
     }
 
+    // Check the ws client is setup
     if (this.wsClient) {
       // Remove any existing existing listeners
       this.wsClient.removeAllListeners()
 
+      // Set the connection flag to false
+      this.wsIsConnected = false
+
       // Close the web socket connection
       if (this.wsIsConnected) {
         await this.wsClient.close()
diff --git a/lib/index.js b/lib/index.js
index cc0a181b..c88d5b24 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -620,7 +620,7 @@ class eWeLinkPlatform {
       if (apiServer) {
         apiServer.close(() => {
           if (this.config.debug) {
-            this.log('%s.', 'listener closed')
+            this.log('%s.', this.lang.apiShutdown)
           }
         })
       }
diff --git a/lib/utils/lang-en.js b/lib/utils/lang-en.js
index 46c1dd99..ae8031ce 100644
--- a/lib/utils/lang-en.js
+++ b/lib/utils/lang-en.js
@@ -3,8 +3,9 @@
 'use strict'
 
 module.exports = {
-  apiListenErr: 'Internal HTTP API server error',
-  apiListening: 'Internal HTTP API listening on port',
+  apiListenErr: 'Internal API server error',
+  apiListening: 'Internal API listening on port',
+  apiShutdown: 'Internal API gracefully shutdown',
   buttonDouble: 'double press',
   buttonLong: 'long press',
   buttonNotFound: 'rf button not found (please restart Homebridge)',

From 987678da356890bead88e0a6209b30c5705abf5d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 7 May 2021 09:48:42 +0100
Subject: [PATCH 2065/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 14827d5a..e2a8dc92 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 ### Changes
 
 * Display temperature and humidity units for the zigbee temperature/humidity sensor in the logs
+* Fixes an issue where the web socket would not close on plugin shutdown
 
 ## 6.5.1 (2021-05-07)
 

From a657903f1106b702370581e3f07124c32ffcce15 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 7 May 2021 09:49:15 +0100
Subject: [PATCH 2066/3183] 6.5.2-beta.2

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 221736e9..99233d5a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.5.2-beta.1",
+  "version": "6.5.2-beta.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 49dc4da2..a0e9ebc7 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.5.2-beta.1",
+  "version": "6.5.2-beta.2",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 1e2ad84c040d892b8b65ce5371492220625404ba Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 7 May 2021 09:55:17 +0100
Subject: [PATCH 2067/3183] Update index.js

---
 lib/index.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/index.js b/lib/index.js
index c88d5b24..8ac116ee 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -599,7 +599,11 @@ class eWeLinkPlatform {
 
       // Log that the plugin setup has been successful with a welcome message
       const randIndex = Math.floor(Math.random() * this.lang.zWelcome.length)
-      this.log('%s. %s', this.lang.complete, this.lang.zWelcome[randIndex])
+      
+      // Set a small timeout so the message should appear after the API port log entry
+      setTimeout(() => {
+        this.log('%s. %s', this.lang.complete, this.lang.zWelcome[randIndex])
+      }, 2000)
     } catch (err) {
       // Catch any errors during setup
       const eText = err.message === this.lang.disabled

From 16636e40b55350fd6d7ec67c25a0698e2d59e95f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 7 May 2021 09:55:41 +0100
Subject: [PATCH 2068/3183] formatting

---
 lib/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/index.js b/lib/index.js
index 8ac116ee..7f29a84c 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -599,7 +599,7 @@ class eWeLinkPlatform {
 
       // Log that the plugin setup has been successful with a welcome message
       const randIndex = Math.floor(Math.random() * this.lang.zWelcome.length)
-      
+
       // Set a small timeout so the message should appear after the API port log entry
       setTimeout(() => {
         this.log('%s. %s', this.lang.complete, this.lang.zWelcome[randIndex])

From 430bc100dda5dcbb368452c13a405b1344fd860c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 7 May 2021 09:56:07 +0100
Subject: [PATCH 2069/3183] 6.5.2-beta.3

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 99233d5a..5afd4e12 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.5.2-beta.2",
+  "version": "6.5.2-beta.3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index a0e9ebc7..327bf6a6 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.5.2-beta.2",
+  "version": "6.5.2-beta.3",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 588b61b18d24bc55fabeaadd3cecdeec226455c0 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 7 May 2021 13:14:07 +0100
Subject: [PATCH 2070/3183] Update ws.js

---
 lib/connection/ws.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/connection/ws.js b/lib/connection/ws.js
index cd3d1b68..f6810ba5 100644
--- a/lib/connection/ws.js
+++ b/lib/connection/ws.js
@@ -392,11 +392,12 @@ module.exports = class connectionWS {
       // Remove any existing existing listeners
       this.wsClient.removeAllListeners()
 
-      // Set the connection flag to false
-      this.wsIsConnected = false
-
       // Close the web socket connection
       if (this.wsIsConnected) {
+        // Set the connection flag to false
+        this.wsIsConnected = false
+        
+        // Close the connection
         await this.wsClient.close()
 
         // Log if appropriate

From 0a429f03a93bc7a1cb932c0b5d017240180cbcdc Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 7 May 2021 13:14:40 +0100
Subject: [PATCH 2071/3183] Update ws.js

---
 lib/connection/ws.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/connection/ws.js b/lib/connection/ws.js
index f6810ba5..4bd62a65 100644
--- a/lib/connection/ws.js
+++ b/lib/connection/ws.js
@@ -396,7 +396,7 @@ module.exports = class connectionWS {
       if (this.wsIsConnected) {
         // Set the connection flag to false
         this.wsIsConnected = false
-        
+
         // Close the connection
         await this.wsClient.close()
 

From a4c9ad7641438c77d8a9a685a17a6c81eab7b547 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 7 May 2021 13:15:01 +0100
Subject: [PATCH 2072/3183] 6.5.2-beta.4

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 5afd4e12..9c373d83 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.5.2-beta.3",
+  "version": "6.5.2-beta.4",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 327bf6a6..cf02b93c 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.5.2-beta.3",
+  "version": "6.5.2-beta.4",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 0659055c8ed3f45361c7cd6e88f7f1b7d67560e8 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 8 May 2021 09:02:17 +0100
Subject: [PATCH 2073/3183] Update package-lock.json

---
 package-lock.json | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 9c373d83..b85634fe 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -121,11 +121,11 @@
       "integrity": "sha512-0JV5+SOCQkIdzjBK9buARcV804Ddu7A0Qet6sHi3FimE9ne6m4BGQZfRn+NZiXbBk4F4XmHfDZIipLj9pX8dSA=="
     },
     "is-boolean-object": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.0.tgz",
-      "integrity": "sha512-a7Uprx8UtD+HWdyYwnD1+ExtTgqQtD2k/1yJgtXP6wnMm8byhkoTZRl+95LLThpzNZJ5aEvi46cdH+ayMFRwmA==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.1.tgz",
+      "integrity": "sha512-bXdQWkECBUIAcCkeH1unwJLIpZYaa5VvuygSyS/c2lf719mTKZDU5UdDRlpd01UjADgmW8RfqaP+mRaVPdr/Ng==",
       "requires": {
-        "call-bind": "^1.0.0"
+        "call-bind": "^1.0.2"
       }
     },
     "is-callable": {
@@ -134,9 +134,9 @@
       "integrity": "sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ=="
     },
     "is-date-object": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.3.tgz",
-      "integrity": "sha512-tDpEUInNcy2Yw3lNSepK3Wdw1RnXLcIVienz6Ou631Acl15cJyRWK4dgA1vCmOEgIbtOV0W7MHg+AR2Gdg1NXQ=="
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.4.tgz",
+      "integrity": "sha512-/b4ZVsG7Z5XVtIxs/h9W8nvfLgSAyKYdtGWQLbqy6jA1icmgjf8WCoTKgeS4wy5tYaPePouzFMANbnj94c2Z+A=="
     },
     "is-negative-zero": {
       "version": "2.0.1",
@@ -144,23 +144,23 @@
       "integrity": "sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w=="
     },
     "is-number-object": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.4.tgz",
-      "integrity": "sha512-zohwelOAur+5uXtk8O3GPQ1eAcu4ZX3UwxQhUlfFFMNpUd83gXgjbhJh6HmB6LUNV/ieOLQuDwJO3dWJosUeMw=="
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.5.tgz",
+      "integrity": "sha512-RU0lI/n95pMoUKu9v1BZP5MBcZuNSVJkMkAG2dJqC4z2GlkGUNeH68SuHuBKBD/XFe+LHZ+f9BKkLET60Niedw=="
     },
     "is-regex": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.2.tgz",
-      "integrity": "sha512-axvdhb5pdhEVThqJzYXwMlVuZwC+FF2DpcOhTS+y/8jVq4trxyPgfcwIxIKiyeuLlSQYKkmUaPQJ8ZE4yNKXDg==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.3.tgz",
+      "integrity": "sha512-qSVXFz28HM7y+IWX6vLCsexdlvzT1PJNFSBuaQLQ5o0IEw8UDYW6/2+eCMVyIsbM8CNLX2a/QWmSpyxYEHY7CQ==",
       "requires": {
         "call-bind": "^1.0.2",
-        "has-symbols": "^1.0.1"
+        "has-symbols": "^1.0.2"
       }
     },
     "is-string": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.5.tgz",
-      "integrity": "sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ=="
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.6.tgz",
+      "integrity": "sha512-2gdzbKUuqtQ3lYNrUTQYoClPhm7oQu4UdpSZMp1/DGgkHBT8E2Z1l0yMdb6D4zNAxwDiMv8MdulKROJGNl0Q0w=="
     },
     "is-symbol": {
       "version": "1.0.3",
@@ -176,9 +176,9 @@
       "integrity": "sha512-fZvDqy19zyaiSXajmRjwue1VWLrJcy8bTV/LJVtAx8DeEFVlXRBMyZknW+q6CEfiW8Y4MQDDKh9x5wF32BHAHQ=="
     },
     "object-inspect": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.10.2.tgz",
-      "integrity": "sha512-gz58rdPpadwztRrPjZE9DZLOABUpTGdcANUgOwBFO1C+HZZhePoP83M65WGDmbpwFYJSWqavbl4SgDn4k8RYTA=="
+      "version": "1.10.3",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.10.3.tgz",
+      "integrity": "sha512-e5mCJlSH7poANfC8z8S9s9S2IN5/4Zb3aZ33f5s8YqoazCFzNLloLU8r5VCG+G7WoqLvAAZoVMcy3tp/3X0Plw=="
     },
     "object-keys": {
       "version": "1.1.1",

From 0223a95b0c86c336706f2ae7b71af9d9d14015e0 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 8 May 2021 09:09:29 +0100
Subject: [PATCH 2074/3183] ensure hb version is 1.3 or more

---
 lib/index.js         | 6 ++++++
 lib/utils/lang-en.js | 1 +
 2 files changed, 7 insertions(+)

diff --git a/lib/index.js b/lib/index.js
index 7f29a84c..f66d57c4 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -58,6 +58,11 @@ class eWeLinkPlatform {
         : this.consts.defaultValues.language
       this.lang = require('./utils/lang-' + language)
 
+      // Make sure user is running Homebridge v1.3 or above
+      if (!api.versionGreaterOrEqual || !api.versionGreaterOrEqual('1.3.0')) {
+        throw new Error(this.lang.hbVerionFail)
+      }
+
       // Check the user has configured the plugin
       if (!config || !config.username || !config.password) {
         throw new Error(this.lang.missingCreds)
@@ -73,6 +78,7 @@ class eWeLinkPlatform {
     } catch (err) {
       // Catch any errors during initialisation
       const hideErrLines = [
+        this.lang.hbVerionFail,
         this.lang.missingCreds,
         this.lang.missingPW,
         this.lang.missingUN
diff --git a/lib/utils/lang-en.js b/lib/utils/lang-en.js
index ae8031ce..0ccf2724 100644
--- a/lib/utils/lang-en.js
+++ b/lib/utils/lang-en.js
@@ -67,6 +67,7 @@ module.exports = {
   errLogin: 'An error occurred during http login()',
   eweError: 'An eWeLink error [500] occured, retrying in 30 seconds',
   foundWithIP: 'found locally with IP',
+  hbVersionFail: 'Your version of Homebridge is too low - please update to v1.3',
   httpRetry: 'Unable to reach eWeLink, retrying in 30 seconds',
   identify: 'identify button pressed',
   initialised: 'initialised. Syncing with eWeLink',

From 2e025e445996632531ae97c82d13320312177c51 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 8 May 2021 09:14:29 +0100
Subject: [PATCH 2075/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e2a8dc92..5de2fbdc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 * Display temperature and humidity units for the zigbee temperature/humidity sensor in the logs
 * Fixes an issue where the web socket would not close on plugin shutdown
+* Ensure user is using at least Homebridge v1.3.0
 
 ## 6.5.1 (2021-05-07)
 

From 04753d07944cc2472b9580ed7b7655fc364fb15a Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 8 May 2021 09:57:03 +0100
Subject: [PATCH 2076/3183] 6.5.2-beta.5

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b85634fe..80868b67 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.5.2-beta.4",
+  "version": "6.5.2-beta.5",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index cf02b93c..1f0d5b57 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.5.2-beta.4",
+  "version": "6.5.2-beta.5",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 3001cfb2da49b63d1ed2f15c3f91ed88faac7689 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Sat, 8 May 2021 14:45:33 +0100
Subject: [PATCH 2077/3183] Update README.md

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 1f98684d..8c299192 100644
--- a/README.md
+++ b/README.md
@@ -42,6 +42,7 @@ Homebridge plugin to control eWeLink devices
 * [RF Bridge Sensors](https://github.com/bwp91/homebridge-ewelink/wiki/RF-Bridge-Sensors)
 * [Accessory Simulations](https://github.com/bwp91/homebridge-ewelink/wiki/Accessory-Simulations)
 * [Connection Methods](https://github.com/bwp91/homebridge-ewelink/wiki/Connection-Methods)
+* [Internal API](https://github.com/bwp91/homebridge-ewelink/wiki/Internal-API)
 
 ### Help/About
 

From f9110403ef9c4cd0fbcf593fbb8cdd39abfe6391 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 8 May 2021 14:46:35 +0100
Subject: [PATCH 2078/3183] add api link

---
 lib/homebridge-ui/public/index.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/homebridge-ui/public/index.html b/lib/homebridge-ui/public/index.html
index 287a9f73..da445271 100644
--- a/lib/homebridge-ui/public/index.html
+++ b/lib/homebridge-ui/public/index.html
@@ -85,11 +85,12 @@ <h4>Setup</h4>
   </ul>
   <h4>Features</h4>
   <ul>
-    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/Connection-Methods" target="_blank">Connection Methods</a></li>
     <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/Supported-Devices" target="_blank">Supported Devices</a></li>
     <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/Multi-Channel-Devices" target="_blank">Multi Channel Devices</a></li>
     <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/RF-Bridge-Sensors" target="_blank">RF Bridge Sensors</a></li>
     <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/Accessory-Simulations" target="_blank">Accessory Simulations</a></li>
+    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/Connection-Methods" target="_blank">Connection Methods</a></li>
+    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/Internal-API" target="_blank">Internal API</a></li>
   </ul>
   <h4>Help/About</h4>
   <ul>

From 495cb411703277263e5f6dcc3dde48eb64fa7c69 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 8 May 2021 14:50:58 +0100
Subject: [PATCH 2079/3183] update api docs

---
 lib/connection/api.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/connection/api.js b/lib/connection/api.js
index 5f276bda..1a914172 100644
--- a/lib/connection/api.js
+++ b/lib/connection/api.js
@@ -37,7 +37,11 @@ module.exports = class connectionAPI {
                 <h4 class="text-center">homebridge-ewelink</h3>
               </p>
               <hr class="mb-0">
-              <h5 class="mt-4 mb-2">API Docs</h5>
+              <h5 class="mt-4 mb-2">Intro</h5>
+              <ul class="small">
+                <li>The internal API allows you to query and control your homebridge-ewelink accessories using HTTP requests</li>
+              </ul>
+              <h5 class="mt-4 mb-2">Documentation</h5>
               <ul class="small">
                 <li>All requests are of type <code>HTTP GET</code></li>
                 <li>All requests must include a HTTP authentication header in the form:
@@ -118,7 +122,7 @@ module.exports = class connectionAPI {
               </div>
               <ul class="small">
                 <li><code>services</code> is an array of services that the device has</li>
-                <li>Possible services include <code>switch</code>, <code>outlet</code>, <code>light</code> and <code>fan</code>
+                <li>Possible services include <code>switch</code>, <code>outlet</code>, <code>light</code>, <code>fan</code>, <code>temperature</code> and <code>humidity</code>
                 <li>Each service will have a corresponding property of characteristic(s)
                   <ul>
                     <li>In the above example the service is <code>switch</code> and the only characteristic is <code>state</code></li>

From c00161f7ecae38545b5abf484ee3938c45945972 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 8 May 2021 14:51:24 +0100
Subject: [PATCH 2080/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5de2fbdc..c0b8c137 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 * Display temperature and humidity units for the zigbee temperature/humidity sensor in the logs
 * Fixes an issue where the web socket would not close on plugin shutdown
 * Ensure user is using at least Homebridge v1.3.0
+* Update homebridge-ui wiki links to match github readme file
 
 ## 6.5.1 (2021-05-07)
 

From 1d3105dbc6676eaea75d275d5229a80852eb2eda Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 8 May 2021 14:52:10 +0100
Subject: [PATCH 2081/3183] 6.5.2-beta.6

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 80868b67..76156c65 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.5.2-beta.5",
+  "version": "6.5.2-beta.6",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 1f0d5b57..56fb5929 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.5.2-beta.5",
+  "version": "6.5.2-beta.6",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From fdb93c27beabec87960c05be08b3ca322de93465 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 9 May 2021 07:30:18 +0100
Subject: [PATCH 2082/3183] change no response timeout to 2 seconds

---
 lib/device/curtain.js                 |  2 +-
 lib/device/diffuser.js                | 10 +++++-----
 lib/device/fan.js                     |  4 ++--
 lib/device/humidifier.js              |  2 +-
 lib/device/light-cct.js               |  6 +++---
 lib/device/light-dimmer.js            |  4 ++--
 lib/device/light-rgb-cct.js           |  8 ++++----
 lib/device/light-rgb.js               |  6 +++---
 lib/device/motor.js                   |  2 +-
 lib/device/outlet-double.js           |  2 +-
 lib/device/outlet-multi.js            |  2 +-
 lib/device/outlet-scm.js              |  2 +-
 lib/device/outlet-single.js           |  2 +-
 lib/device/rf-bridge.js               |  2 +-
 lib/device/sensor-ambient.js          |  2 +-
 lib/device/simulation/switch-valve.js |  4 ++--
 lib/device/simulation/tap-one.js      |  2 +-
 lib/device/simulation/tap-two.js      |  2 +-
 lib/device/simulation/thermostat.js   |  4 ++--
 lib/device/simulation/valve-four.js   |  2 +-
 lib/device/simulation/valve-one.js    |  2 +-
 lib/device/simulation/valve-two.js    |  2 +-
 lib/device/switch-double.js           |  2 +-
 lib/device/switch-multi.js            |  2 +-
 lib/device/switch-single.js           |  2 +-
 lib/device/thermostat.js              |  4 ++--
 lib/device/zigbee/light-cct.js        |  6 +++---
 lib/device/zigbee/light-dimmer.js     |  4 ++--
 lib/device/zigbee/switch-single.js    |  2 +-
 29 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/lib/device/curtain.js b/lib/device/curtain.js
index fbb66826..8a660758 100644
--- a/lib/device/curtain.js
+++ b/lib/device/curtain.js
@@ -85,7 +85,7 @@ module.exports = class deviceCurtain {
           this.hapChar.TargetPosition,
           this.cachePos
         )
-      }, 5000)
+      }, 2000)
       throw new this.hapErr(-70402)
     }
   }
diff --git a/lib/device/diffuser.js b/lib/device/diffuser.js
index 3308bbc4..5ae0216e 100644
--- a/lib/device/diffuser.js
+++ b/lib/device/diffuser.js
@@ -101,7 +101,7 @@ module.exports = class deviceDiffuser {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
         this.fanService.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
-      }, 5000)
+      }, 2000)
       throw new this.hapErr(-70402)
     }
   }
@@ -155,7 +155,7 @@ module.exports = class deviceDiffuser {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
         this.fanService.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
-      }, 5000)
+      }, 2000)
       throw new this.hapErr(-70402)
     }
   }
@@ -203,7 +203,7 @@ module.exports = class deviceDiffuser {
           this.hapChar.On,
           this.cacheLight === 'on'
         )
-      }, 5000)
+      }, 2000)
       throw new this.hapErr(-70402)
     }
   }
@@ -252,7 +252,7 @@ module.exports = class deviceDiffuser {
           this.hapChar.On,
           this.cacheLight === 'on'
         )
-      }, 5000)
+      }, 2000)
       throw new this.hapErr(-70402)
     }
   }
@@ -315,7 +315,7 @@ module.exports = class deviceDiffuser {
           this.hapChar.On,
           this.cacheLight === 'on'
         )
-      }, 5000)
+      }, 2000)
       throw new this.hapErr(-70402)
     }
   }
diff --git a/lib/device/fan.js b/lib/device/fan.js
index dd265394..bb3c9419 100644
--- a/lib/device/fan.js
+++ b/lib/device/fan.js
@@ -140,7 +140,7 @@ module.exports = class deviceFan {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
         this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
-      }, 5000)
+      }, 2000)
       throw new this.hapErr(-70402)
     }
   }
@@ -167,7 +167,7 @@ module.exports = class deviceFan {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
         this.lightService.updateCharacteristic(this.hapChar.On, this.cacheLight === 'on')
-      }, 5000)
+      }, 2000)
       throw new this.hapErr(-70402)
     }
   }
diff --git a/lib/device/humidifier.js b/lib/device/humidifier.js
index cb02602d..4fc4325f 100644
--- a/lib/device/humidifier.js
+++ b/lib/device/humidifier.js
@@ -112,7 +112,7 @@ module.exports = class deviceHumidifier {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
         this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
-      }, 5000)
+      }, 2000)
       throw new this.hapErr(-70402)
     }
   }
diff --git a/lib/device/light-cct.js b/lib/device/light-cct.js
index 990e935f..c37615fa 100644
--- a/lib/device/light-cct.js
+++ b/lib/device/light-cct.js
@@ -115,7 +115,7 @@ module.exports = class deviceLightCCT {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
         this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
-      }, 5000)
+      }, 2000)
       throw new this.hapErr(-70402)
     }
   }
@@ -152,7 +152,7 @@ module.exports = class deviceLightCCT {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
         this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
-      }, 5000)
+      }, 2000)
       throw new this.hapErr(-70402)
     }
   }
@@ -209,7 +209,7 @@ module.exports = class deviceLightCCT {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
         this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
-      }, 5000)
+      }, 2000)
       throw new this.hapErr(-70402)
     }
   }
diff --git a/lib/device/light-dimmer.js b/lib/device/light-dimmer.js
index b2f34653..5a13cb8f 100644
--- a/lib/device/light-dimmer.js
+++ b/lib/device/light-dimmer.js
@@ -78,7 +78,7 @@ module.exports = class deviceLightDimmer {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
         this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
-      }, 5000)
+      }, 2000)
       throw new this.hapErr(-70402)
     }
   }
@@ -119,7 +119,7 @@ module.exports = class deviceLightDimmer {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
         this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
-      }, 5000)
+      }, 2000)
       throw new this.hapErr(-70402)
     }
   }
diff --git a/lib/device/light-rgb-cct.js b/lib/device/light-rgb-cct.js
index 80683a03..8ff50f48 100644
--- a/lib/device/light-rgb-cct.js
+++ b/lib/device/light-rgb-cct.js
@@ -105,7 +105,7 @@ module.exports = class deviceLightRGBCCT {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
         this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
-      }, 5000)
+      }, 2000)
       throw new this.hapErr(-70402)
     }
   }
@@ -166,7 +166,7 @@ module.exports = class deviceLightRGBCCT {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
         this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
-      }, 5000)
+      }, 2000)
       throw new this.hapErr(-70402)
     }
   }
@@ -237,7 +237,7 @@ module.exports = class deviceLightRGBCCT {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
         this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
-      }, 5000)
+      }, 2000)
       throw new this.hapErr(-70402)
     }
   }
@@ -326,7 +326,7 @@ module.exports = class deviceLightRGBCCT {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
         this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
-      }, 5000)
+      }, 2000)
       throw new this.hapErr(-70402)
     }
   }
diff --git a/lib/device/light-rgb.js b/lib/device/light-rgb.js
index 06258ac9..17c9e137 100644
--- a/lib/device/light-rgb.js
+++ b/lib/device/light-rgb.js
@@ -82,7 +82,7 @@ module.exports = class deviceLightRGB {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
         this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
-      }, 5000)
+      }, 2000)
       throw new this.hapErr(-70402)
     }
   }
@@ -95,7 +95,7 @@ module.exports = class deviceLightRGB {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
         this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
-      }, 5000)
+      }, 2000)
       throw new this.hapErr(-70402)
     }
   }
@@ -145,7 +145,7 @@ module.exports = class deviceLightRGB {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
         this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
-      }, 5000)
+      }, 2000)
       throw new this.hapErr(-70402)
     }
   }
diff --git a/lib/device/motor.js b/lib/device/motor.js
index f68d073b..f28f53a2 100644
--- a/lib/device/motor.js
+++ b/lib/device/motor.js
@@ -72,7 +72,7 @@ module.exports = class deviceMotor {
           this.hapChar.TargetPosition,
           this.cachePos
         )
-      }, 5000)
+      }, 2000)
       throw new this.hapErr(-70402)
     }
   }
diff --git a/lib/device/outlet-double.js b/lib/device/outlet-double.js
index 4a9baf8e..8b3f2892 100644
--- a/lib/device/outlet-double.js
+++ b/lib/device/outlet-double.js
@@ -195,7 +195,7 @@ module.exports = class deviceOutletDouble {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
         this.service.updateCharacteristic(this.hapChar.On, !value)
-      }, 5000)
+      }, 2000)
       throw new this.hapErr(-70402)
     }
   }
diff --git a/lib/device/outlet-multi.js b/lib/device/outlet-multi.js
index 16b80193..1ed65cd6 100644
--- a/lib/device/outlet-multi.js
+++ b/lib/device/outlet-multi.js
@@ -149,7 +149,7 @@ module.exports = class deviceOutletMulti {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
         this.service.updateCharacteristic(this.hapChar.On, !value)
-      }, 5000)
+      }, 2000)
       throw new this.hapErr(-70402)
     }
   }
diff --git a/lib/device/outlet-scm.js b/lib/device/outlet-scm.js
index b1ff7fbe..eb86e64f 100644
--- a/lib/device/outlet-scm.js
+++ b/lib/device/outlet-scm.js
@@ -77,7 +77,7 @@ module.exports = class deviceOutletSCM {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
         this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
-      }, 5000)
+      }, 2000)
       throw new this.hapErr(-70402)
     }
   }
diff --git a/lib/device/outlet-single.js b/lib/device/outlet-single.js
index 20c61733..f72687df 100644
--- a/lib/device/outlet-single.js
+++ b/lib/device/outlet-single.js
@@ -174,7 +174,7 @@ module.exports = class deviceOutletSingle {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
         this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
-      }, 5000)
+      }, 2000)
       throw new this.hapErr(-70402)
     }
   }
diff --git a/lib/device/rf-bridge.js b/lib/device/rf-bridge.js
index b155fc05..4a93db08 100644
--- a/lib/device/rf-bridge.js
+++ b/lib/device/rf-bridge.js
@@ -130,7 +130,7 @@ module.exports = class deviceRFBridge {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
         this.accessory.getService(service).updateCharacteristic(this.hapChar.On, false)
-      }, 5000)
+      }, 2000)
       throw new this.hapErr(-70402)
     }
   }
diff --git a/lib/device/sensor-ambient.js b/lib/device/sensor-ambient.js
index 50b2de5d..07ad636f 100644
--- a/lib/device/sensor-ambient.js
+++ b/lib/device/sensor-ambient.js
@@ -108,7 +108,7 @@ module.exports = class deviceSensorAmbient {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
         this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
-      }, 5000)
+      }, 2000)
       throw new this.hapErr(-70402)
     }
   }
diff --git a/lib/device/simulation/switch-valve.js b/lib/device/simulation/switch-valve.js
index 1286b4dc..aac1dd44 100644
--- a/lib/device/simulation/switch-valve.js
+++ b/lib/device/simulation/switch-valve.js
@@ -97,7 +97,7 @@ module.exports = class deviceSwitchValve {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
         this.sService.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
-      }, 5000)
+      }, 2000)
       throw new this.hapErr(-70402)
     }
   }
@@ -136,7 +136,7 @@ module.exports = class deviceSwitchValve {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
         this.sService.updateCharacteristic(this.hapChar.Active, 0)
-      }, 5000)
+      }, 2000)
       throw new this.hapErr(-70402)
     }
   }
diff --git a/lib/device/simulation/tap-one.js b/lib/device/simulation/tap-one.js
index b5e467c9..4f2f397e 100644
--- a/lib/device/simulation/tap-one.js
+++ b/lib/device/simulation/tap-one.js
@@ -89,7 +89,7 @@ module.exports = class deviceTapOne {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
         this.service.updateCharacteristic(this.hapChar.Active, this.cacheState === 'on')
-      }, 5000)
+      }, 2000)
       throw new this.hapErr(-70402)
     }
   }
diff --git a/lib/device/simulation/tap-two.js b/lib/device/simulation/tap-two.js
index 072ddd8f..89ab5e61 100644
--- a/lib/device/simulation/tap-two.js
+++ b/lib/device/simulation/tap-two.js
@@ -79,7 +79,7 @@ module.exports = class deviceTapTwo {
       const tapService = this.accessory.getService(tap)
       setTimeout(() => {
         tapService.updateCharacteristic(this.hapChar.Active, value === 1 ? 0 : 1)
-      }, 5000)
+      }, 2000)
       throw new this.hapErr(-70402)
     }
   }
diff --git a/lib/device/simulation/thermostat.js b/lib/device/simulation/thermostat.js
index dbbcea61..af9b6e70 100644
--- a/lib/device/simulation/thermostat.js
+++ b/lib/device/simulation/thermostat.js
@@ -154,7 +154,7 @@ module.exports = class deviceThermostat {
           this.hapChar.TargetHeatingCoolingState,
           this.cacheState === 'on'
         )
-      }, 5000)
+      }, 2000)
       throw new this.hapErr(-70402)
     }
   }
@@ -198,7 +198,7 @@ module.exports = class deviceThermostat {
           this.hapChar.TargetHeatingCoolingState,
           this.cacheState === 'on'
         )
-      }, 5000)
+      }, 2000)
       throw new this.hapErr(-70402)
     }
   }
diff --git a/lib/device/simulation/valve-four.js b/lib/device/simulation/valve-four.js
index db60886b..6e517bd3 100644
--- a/lib/device/simulation/valve-four.js
+++ b/lib/device/simulation/valve-four.js
@@ -132,7 +132,7 @@ module.exports = class deviceValveFour {
       const valveService = this.accessory.getService(valve)
       setTimeout(() => {
         valveService.updateCharacteristic(this.hapChar.Active, value === 1 ? 0 : 1)
-      }, 5000)
+      }, 2000)
       throw new this.hapErr(-70402)
     }
   }
diff --git a/lib/device/simulation/valve-one.js b/lib/device/simulation/valve-one.js
index 719f1a51..14c62d9a 100644
--- a/lib/device/simulation/valve-one.js
+++ b/lib/device/simulation/valve-one.js
@@ -120,7 +120,7 @@ module.exports = class deviceValveOne {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
         this.service.updateCharacteristic(this.hapChar.Active, value === 1 ? 0 : 1)
-      }, 5000)
+      }, 2000)
       throw new this.hapErr(-70402)
     }
   }
diff --git a/lib/device/simulation/valve-two.js b/lib/device/simulation/valve-two.js
index a28abcea..2d777f4d 100644
--- a/lib/device/simulation/valve-two.js
+++ b/lib/device/simulation/valve-two.js
@@ -126,7 +126,7 @@ module.exports = class deviceValveTwo {
       const valveService = this.accessory.getService(valve)
       setTimeout(() => {
         valveService.updateCharacteristic(this.hapChar.Active, value === 1 ? 0 : 1)
-      }, 5000)
+      }, 2000)
       throw new this.hapErr(-70402)
     }
   }
diff --git a/lib/device/switch-double.js b/lib/device/switch-double.js
index 6c46449a..b53c2799 100644
--- a/lib/device/switch-double.js
+++ b/lib/device/switch-double.js
@@ -144,7 +144,7 @@ module.exports = class deviceSwitchDouble {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
         this.service.updateCharacteristic(this.hapChar.On, !value)
-      }, 5000)
+      }, 2000)
       throw new this.hapErr(-70402)
     }
   }
diff --git a/lib/device/switch-multi.js b/lib/device/switch-multi.js
index 3464597e..c6a60a5a 100644
--- a/lib/device/switch-multi.js
+++ b/lib/device/switch-multi.js
@@ -149,7 +149,7 @@ module.exports = class deviceSwitchMulti {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
         this.service.updateCharacteristic(this.hapChar.On, !value)
-      }, 5000)
+      }, 2000)
       throw new this.hapErr(-70402)
     }
   }
diff --git a/lib/device/switch-single.js b/lib/device/switch-single.js
index 498c89d2..af43e1f5 100644
--- a/lib/device/switch-single.js
+++ b/lib/device/switch-single.js
@@ -66,7 +66,7 @@ module.exports = class deviceSwitchSingle {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
         this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
-      }, 5000)
+      }, 2000)
       throw new this.hapErr(-70402)
     }
   }
diff --git a/lib/device/thermostat.js b/lib/device/thermostat.js
index 00c1aec3..10cd246d 100644
--- a/lib/device/thermostat.js
+++ b/lib/device/thermostat.js
@@ -113,7 +113,7 @@ module.exports = class deviceThermostat {
           this.hapChar.TargetHeatingCoolingState,
           this.cacheState === 'on'
         )
-      }, 5000)
+      }, 2000)
       throw new this.hapErr(-70402)
     }
   }
@@ -137,7 +137,7 @@ module.exports = class deviceThermostat {
           this.hapChar.TargetHeatingCoolingState,
           this.cacheState === 'on'
         )
-      }, 5000)
+      }, 2000)
       throw new this.hapErr(-70402)
     }
   }
diff --git a/lib/device/zigbee/light-cct.js b/lib/device/zigbee/light-cct.js
index 07f205e8..a7ec522d 100644
--- a/lib/device/zigbee/light-cct.js
+++ b/lib/device/zigbee/light-cct.js
@@ -97,7 +97,7 @@ module.exports = class deviceZBLightCCT {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
         this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
-      }, 5000)
+      }, 2000)
       throw new this.hapErr(-70402)
     }
   }
@@ -126,7 +126,7 @@ module.exports = class deviceZBLightCCT {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
         this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
-      }, 5000)
+      }, 2000)
       throw new this.hapErr(-70402)
     }
   }
@@ -172,7 +172,7 @@ module.exports = class deviceZBLightCCT {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
         this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
-      }, 5000)
+      }, 2000)
       throw new this.hapErr(-70402)
     }
   }
diff --git a/lib/device/zigbee/light-dimmer.js b/lib/device/zigbee/light-dimmer.js
index 5037894a..81f3d26b 100644
--- a/lib/device/zigbee/light-dimmer.js
+++ b/lib/device/zigbee/light-dimmer.js
@@ -74,7 +74,7 @@ module.exports = class deviceZBLightDimmer {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
         this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
-      }, 5000)
+      }, 2000)
       throw new this.hapErr(-70402)
     }
   }
@@ -103,7 +103,7 @@ module.exports = class deviceZBLightDimmer {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
         this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
-      }, 5000)
+      }, 2000)
       throw new this.hapErr(-70402)
     }
   }
diff --git a/lib/device/zigbee/switch-single.js b/lib/device/zigbee/switch-single.js
index 4fe426ab..590f50a5 100644
--- a/lib/device/zigbee/switch-single.js
+++ b/lib/device/zigbee/switch-single.js
@@ -69,7 +69,7 @@ module.exports = class deviceZBSwitchSingle {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
         this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
-      }, 5000)
+      }, 2000)
       throw new this.hapErr(-70402)
     }
   }

From 1f892122be203b1be9f6455a61107184cfe9c68a Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 9 May 2021 07:31:20 +0100
Subject: [PATCH 2083/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c0b8c137..7f6aac94 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 * Display temperature and humidity units for the zigbee temperature/humidity sensor in the logs
 * Fixes an issue where the web socket would not close on plugin shutdown
+* Reduce the 'No Response' timeout to 2 seconds
 * Ensure user is using at least Homebridge v1.3.0
 * Update homebridge-ui wiki links to match github readme file
 

From 70d2fef1b75f2cdb7fa4950d40d65753c3fba845 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 9 May 2021 07:32:15 +0100
Subject: [PATCH 2084/3183] Update package-lock.json

---
 package-lock.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 76156c65..1d124247 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -163,11 +163,11 @@
       "integrity": "sha512-2gdzbKUuqtQ3lYNrUTQYoClPhm7oQu4UdpSZMp1/DGgkHBT8E2Z1l0yMdb6D4zNAxwDiMv8MdulKROJGNl0Q0w=="
     },
     "is-symbol": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz",
-      "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
+      "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
       "requires": {
-        "has-symbols": "^1.0.1"
+        "has-symbols": "^1.0.2"
       }
     },
     "node-dns-sd": {

From 88c99453a68b3380925c0c583206e42c2d56b377 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 9 May 2021 09:06:57 +0100
Subject: [PATCH 2085/3183] update correct characteristic on no response
 timeout

---
 lib/device/diffuser.js                 | 10 +++++-----
 lib/device/fan.js                      |  2 +-
 lib/device/humidifier.js               |  2 +-
 lib/device/light-cct.js                |  4 ++--
 lib/device/light-dimmer.js             |  2 +-
 lib/device/light-rgb-cct.js            |  6 +++---
 lib/device/light-rgb.js                |  4 ++--
 lib/device/simulation/blind.js         |  2 +-
 lib/device/simulation/door.js          |  2 +-
 lib/device/simulation/garage-eachen.js |  2 +-
 lib/device/simulation/garage-four.js   |  2 +-
 lib/device/simulation/garage-one.js    |  2 +-
 lib/device/simulation/garage-two.js    |  2 +-
 lib/device/simulation/lock-one.js      |  2 +-
 lib/device/simulation/thermostat.js    | 12 +++++-------
 lib/device/simulation/window.js        |  2 +-
 lib/device/thermostat.js               |  6 +++---
 lib/device/zigbee/light-cct.js         |  4 ++--
 lib/device/zigbee/light-dimmer.js      |  2 +-
 19 files changed, 34 insertions(+), 36 deletions(-)

diff --git a/lib/device/diffuser.js b/lib/device/diffuser.js
index 5ae0216e..1ae55218 100644
--- a/lib/device/diffuser.js
+++ b/lib/device/diffuser.js
@@ -154,7 +154,7 @@ module.exports = class deviceDiffuser {
       // Catch any errors and let the platform display them
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
-        this.fanService.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
+        this.fanService.updateCharacteristic(this.hapChar.RotationSpeed, this.cacheSpeed)
       }, 2000)
       throw new this.hapErr(-70402)
     }
@@ -249,8 +249,8 @@ module.exports = class deviceDiffuser {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
         this.lightService.updateCharacteristic(
-          this.hapChar.On,
-          this.cacheLight === 'on'
+          this.hapChar.Brightness,
+          this.cacheBright
         )
       }, 2000)
       throw new this.hapErr(-70402)
@@ -312,8 +312,8 @@ module.exports = class deviceDiffuser {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
         this.lightService.updateCharacteristic(
-          this.hapChar.On,
-          this.cacheLight === 'on'
+          this.hapChar.Hue,
+          this.cacheHue
         )
       }, 2000)
       throw new this.hapErr(-70402)
diff --git a/lib/device/fan.js b/lib/device/fan.js
index bb3c9419..8a2e261e 100644
--- a/lib/device/fan.js
+++ b/lib/device/fan.js
@@ -139,7 +139,7 @@ module.exports = class deviceFan {
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
-        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
+        this.service.updateCharacteristic(this.hapChar.RotationSpeed, this.cacheSpeed)
       }, 2000)
       throw new this.hapErr(-70402)
     }
diff --git a/lib/device/humidifier.js b/lib/device/humidifier.js
index 4fc4325f..c0a5e09a 100644
--- a/lib/device/humidifier.js
+++ b/lib/device/humidifier.js
@@ -111,7 +111,7 @@ module.exports = class deviceHumidifier {
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
-        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
+        this.service.updateCharacteristic(this.hapChar.RotationSpeed, this.cacheMode * 33)
       }, 2000)
       throw new this.hapErr(-70402)
     }
diff --git a/lib/device/light-cct.js b/lib/device/light-cct.js
index c37615fa..8357a5e2 100644
--- a/lib/device/light-cct.js
+++ b/lib/device/light-cct.js
@@ -151,7 +151,7 @@ module.exports = class deviceLightCCT {
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
-        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
+        this.service.updateCharacteristic(this.hapChar.Brightness, this.cacheBright)
       }, 2000)
       throw new this.hapErr(-70402)
     }
@@ -208,7 +208,7 @@ module.exports = class deviceLightCCT {
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
-        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
+        this.service.updateCharacteristic(this.hapChar.ColorTemperature, this.cacheMired)
       }, 2000)
       throw new this.hapErr(-70402)
     }
diff --git a/lib/device/light-dimmer.js b/lib/device/light-dimmer.js
index 5a13cb8f..e0ede673 100644
--- a/lib/device/light-dimmer.js
+++ b/lib/device/light-dimmer.js
@@ -118,7 +118,7 @@ module.exports = class deviceLightDimmer {
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
-        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
+        this.service.updateCharacteristic(this.hapChar.Brightness, this.cacheBright)
       }, 2000)
       throw new this.hapErr(-70402)
     }
diff --git a/lib/device/light-rgb-cct.js b/lib/device/light-rgb-cct.js
index 8ff50f48..0e925252 100644
--- a/lib/device/light-rgb-cct.js
+++ b/lib/device/light-rgb-cct.js
@@ -165,7 +165,7 @@ module.exports = class deviceLightRGBCCT {
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
-        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
+        this.service.updateCharacteristic(this.hapChar.Brightness, this.cacheBright)
       }, 2000)
       throw new this.hapErr(-70402)
     }
@@ -236,7 +236,7 @@ module.exports = class deviceLightRGBCCT {
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
-        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
+        this.service.updateCharacteristic(this.hapChar.Hue, this.cacheHue)
       }, 2000)
       throw new this.hapErr(-70402)
     }
@@ -325,7 +325,7 @@ module.exports = class deviceLightRGBCCT {
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
-        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
+        this.service.updateCharacteristic(this.hapChar.ColorTemperature, this.cacheMired)
       }, 2000)
       throw new this.hapErr(-70402)
     }
diff --git a/lib/device/light-rgb.js b/lib/device/light-rgb.js
index 17c9e137..d185a032 100644
--- a/lib/device/light-rgb.js
+++ b/lib/device/light-rgb.js
@@ -94,7 +94,7 @@ module.exports = class deviceLightRGB {
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
-        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
+        this.service.updateCharacteristic(this.hapChar.Brightness, this.cacheBright)
       }, 2000)
       throw new this.hapErr(-70402)
     }
@@ -144,7 +144,7 @@ module.exports = class deviceLightRGB {
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
-        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
+        this.service.updateCharacteristic(this.hapChar.Hue, this.cacheHue)
       }, 2000)
       throw new this.hapErr(-70402)
     }
diff --git a/lib/device/simulation/blind.js b/lib/device/simulation/blind.js
index 6561b62e..10981bf7 100644
--- a/lib/device/simulation/blind.js
+++ b/lib/device/simulation/blind.js
@@ -131,7 +131,7 @@ module.exports = class deviceBlind {
           this.hapChar.TargetPosition,
           this.accessory.context.cacheTargetPosition
         )
-      }, 5000)
+      }, 2000)
       this.service.updateCharacteristic(
         this.hapChar.TargetPosition,
         new this.hapErr(-70402)
diff --git a/lib/device/simulation/door.js b/lib/device/simulation/door.js
index ba168627..9a36f093 100644
--- a/lib/device/simulation/door.js
+++ b/lib/device/simulation/door.js
@@ -131,7 +131,7 @@ module.exports = class deviceDoor {
           this.hapChar.TargetPosition,
           this.accessory.context.cacheTargetPosition
         )
-      }, 5000)
+      }, 2000)
       this.service.updateCharacteristic(
         this.hapChar.TargetPosition,
         new this.hapErr(-70402)
diff --git a/lib/device/simulation/garage-eachen.js b/lib/device/simulation/garage-eachen.js
index 888c3246..281e780e 100644
--- a/lib/device/simulation/garage-eachen.js
+++ b/lib/device/simulation/garage-eachen.js
@@ -123,7 +123,7 @@ module.exports = class deviceGarageEachen {
           this.hapChar.TargetPosition,
           this.accessory.context.cacheTargetPosition
         )
-      }, 5000)
+      }, 2000)
       this.service.updateCharacteristic(
         this.hapChar.TargetPosition,
         new this.hapErr(-70402)
diff --git a/lib/device/simulation/garage-four.js b/lib/device/simulation/garage-four.js
index 87a77fbd..4e3adca6 100644
--- a/lib/device/simulation/garage-four.js
+++ b/lib/device/simulation/garage-four.js
@@ -134,7 +134,7 @@ module.exports = class deviceGarageFour {
           this.hapChar.TargetPosition,
           this.accessory.context.cacheTargetPosition
         )
-      }, 5000)
+      }, 2000)
       gdService.updateCharacteristic(
         this.hapChar.TargetPosition,
         new this.hapErr(-70402)
diff --git a/lib/device/simulation/garage-one.js b/lib/device/simulation/garage-one.js
index d88552f8..bc84044b 100644
--- a/lib/device/simulation/garage-one.js
+++ b/lib/device/simulation/garage-one.js
@@ -198,7 +198,7 @@ module.exports = class deviceGarageOne {
           this.hapChar.TargetPosition,
           this.accessory.context.cacheTargetPosition
         )
-      }, 5000)
+      }, 2000)
       this.service.updateCharacteristic(
         this.hapChar.TargetPosition,
         new this.hapErr(-70402)
diff --git a/lib/device/simulation/garage-two.js b/lib/device/simulation/garage-two.js
index d0cc187a..9f911a21 100644
--- a/lib/device/simulation/garage-two.js
+++ b/lib/device/simulation/garage-two.js
@@ -143,7 +143,7 @@ module.exports = class deviceGarageTwo {
           this.hapChar.TargetPosition,
           this.accessory.context.cacheTargetPosition
         )
-      }, 5000)
+      }, 2000)
       gdService.updateCharacteristic(
         this.hapChar.TargetPosition,
         new this.hapErr(-70402)
diff --git a/lib/device/simulation/lock-one.js b/lib/device/simulation/lock-one.js
index 0153c99a..50ce701c 100644
--- a/lib/device/simulation/lock-one.js
+++ b/lib/device/simulation/lock-one.js
@@ -97,7 +97,7 @@ module.exports = class deviceLockOne {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
         this.service.updateCharacteristic(this.hapChar.LockTargetState, 1)
-      }, 5000)
+      }, 2000)
       this.service.updateCharacteristic(
         this.hapChar.LockTargetState,
         new this.hapErr(-70402)
diff --git a/lib/device/simulation/thermostat.js b/lib/device/simulation/thermostat.js
index af9b6e70..5105a631 100644
--- a/lib/device/simulation/thermostat.js
+++ b/lib/device/simulation/thermostat.js
@@ -88,6 +88,7 @@ module.exports = class deviceThermostat {
       .onSet(async value => {
         await this.internalTargetTempUpdate(value)
       })
+    this.cacheTarg = this.service.getCharacteristic(this.hapChar.TargetTemperature).value
 
     // The DS18B20 sensor does not provide humidity readings
     if (
@@ -152,7 +153,7 @@ module.exports = class deviceThermostat {
       setTimeout(() => {
         this.service.updateCharacteristic(
           this.hapChar.TargetHeatingCoolingState,
-          this.cacheState === 'on'
+          this.cacheState === 'on' ? 1 : 0
         )
       }, 2000)
       throw new this.hapErr(-70402)
@@ -188,16 +189,14 @@ module.exports = class deviceThermostat {
       this.accessory.context.cacheTarget = value
       this.cacheState = 'on'
       this.cacheHeat = newValue
+      this.cacheTarg = value
       if (!this.disableDeviceLogging) {
         this.log('[%s] %s [%s°C].', this.name, this.lang.curTarg, value)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
-        this.service.updateCharacteristic(
-          this.hapChar.TargetHeatingCoolingState,
-          this.cacheState === 'on'
-        )
+        this.service.updateCharacteristic(this.hapChar.TargetTemperature, this.cacheTarg)
       }, 2000)
       throw new this.hapErr(-70402)
     }
@@ -239,8 +238,7 @@ module.exports = class deviceThermostat {
         const currentTemp = Number(params.currentTemperature) + this.tempOffset
         if (this.cacheTemp !== currentTemp) {
           this.cacheTemp = currentTemp
-          this.service
-            .updateCharacteristic(this.hapChar.CurrentTemperature, this.cacheTemp)
+          this.service.updateCharacteristic(this.hapChar.CurrentTemperature, this.cacheTemp)
           this.accessory.eveService.addEntry({ temp: currentTemp })
           if (params.updateSource && !this.disableDeviceLogging) {
             this.log('[%s] %s [%s°C].', this.name, this.lang.curTemp, this.cacheTemp)
diff --git a/lib/device/simulation/window.js b/lib/device/simulation/window.js
index 09972186..58d38d92 100644
--- a/lib/device/simulation/window.js
+++ b/lib/device/simulation/window.js
@@ -131,7 +131,7 @@ module.exports = class deviceWindow {
           this.hapChar.TargetPosition,
           this.accessory.context.cacheTargetPosition
         )
-      }, 5000)
+      }, 2000)
       this.service.updateCharacteristic(
         this.hapChar.TargetPosition,
         new this.hapErr(-70402)
diff --git a/lib/device/thermostat.js b/lib/device/thermostat.js
index 10cd246d..bb12ad61 100644
--- a/lib/device/thermostat.js
+++ b/lib/device/thermostat.js
@@ -111,7 +111,7 @@ module.exports = class deviceThermostat {
       setTimeout(() => {
         this.service.updateCharacteristic(
           this.hapChar.TargetHeatingCoolingState,
-          this.cacheState === 'on'
+          this.cacheState === 'on' ? 1 : 0
         )
       }, 2000)
       throw new this.hapErr(-70402)
@@ -134,8 +134,8 @@ module.exports = class deviceThermostat {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
         this.service.updateCharacteristic(
-          this.hapChar.TargetHeatingCoolingState,
-          this.cacheState === 'on'
+          this.hapChar.TargetTemperature,
+          this.cacheTarg
         )
       }, 2000)
       throw new this.hapErr(-70402)
diff --git a/lib/device/zigbee/light-cct.js b/lib/device/zigbee/light-cct.js
index a7ec522d..50d30225 100644
--- a/lib/device/zigbee/light-cct.js
+++ b/lib/device/zigbee/light-cct.js
@@ -125,7 +125,7 @@ module.exports = class deviceZBLightCCT {
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
-        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
+        this.service.updateCharacteristic(this.hapChar.Brightness, this.cacheBright)
       }, 2000)
       throw new this.hapErr(-70402)
     }
@@ -171,7 +171,7 @@ module.exports = class deviceZBLightCCT {
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
-        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
+        this.service.updateCharacteristic(this.hapChar.ColorTemperature, this.cacheMired)
       }, 2000)
       throw new this.hapErr(-70402)
     }
diff --git a/lib/device/zigbee/light-dimmer.js b/lib/device/zigbee/light-dimmer.js
index 81f3d26b..273d4d3c 100644
--- a/lib/device/zigbee/light-dimmer.js
+++ b/lib/device/zigbee/light-dimmer.js
@@ -102,7 +102,7 @@ module.exports = class deviceZBLightDimmer {
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
-        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
+        this.service.updateCharacteristic(this.hapChar.Brightness, this.cacheBright)
       }, 2000)
       throw new this.hapErr(-70402)
     }

From da0ad8cddf383b7aeceb055ecbfd3ed7e26874bc Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 9 May 2021 09:08:37 +0100
Subject: [PATCH 2086/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7f6aac94..fddb8f4e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 * Display temperature and humidity units for the zigbee temperature/humidity sensor in the logs
 * Fixes an issue where the web socket would not close on plugin shutdown
 * Reduce the 'No Response' timeout to 2 seconds
+* Update the correct corresponding characteristic after the 'No Response' timeout
 * Ensure user is using at least Homebridge v1.3.0
 * Update homebridge-ui wiki links to match github readme file
 

From 38d2a460e2713457c1af985c2da856e16a81fd59 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 9 May 2021 09:09:17 +0100
Subject: [PATCH 2087/3183] 6.5.2-beta.7

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 1d124247..fa8a0bac 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.5.2-beta.6",
+  "version": "6.5.2-beta.7",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 56fb5929..02285ac9 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.5.2-beta.6",
+  "version": "6.5.2-beta.7",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 49a944aced3ea725fce893cf2e94e9f697b40b33 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 9 May 2021 17:44:31 +0100
Subject: [PATCH 2088/3183] remove encodedPassword and language options

---
 config.schema.json     | 64 +++++++++++++++---------------------------
 lib/connection/http.js | 24 +++++++++-------
 lib/index.js           | 25 ++---------------
 lib/utils/constants.js |  8 ++----
 4 files changed, 41 insertions(+), 80 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 63b892f7..b12f8484 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -24,26 +24,35 @@
         "title": "Password",
         "required": true
       },
-      "language": {
+      "mode": {
         "type": "string",
-        "title": "Language",
-        "description": "If you wish to see the plugin logging in your language and can help translate then let me know!",
-        "default": "en",
+        "title": "Connection Mode",
+        "description": "This setting defines how the plugin communicates with your devices. For further guidance, please refer to <a href=\"https://github.com/bwp91/homebridge-ewelink/wiki/Connection-Methods\" target=\"_blank\">this wiki article</a>.",
+        "default": "auto",
         "oneOf": [{
-            "title": "English",
-            "enum": ["en"]
+            "title": "Auto (Recommended)",
+            "enum": ["auto"]
+          },
+          {
+            "title": "Cloud Only",
+            "enum": ["wan"]
+          },
+          {
+            "title": "LAN Only",
+            "enum": ["lan"]
           }
         ]
       },
-      "encodedPassword": {
-        "title": "Encoded Password",
-        "type": "boolean",
-        "description": "If true, the plugin will decode your entered password from a base64 encoded string to plain text and use this to log into eWeLink."
+      "countryCode": {
+        "title": "Country Code",
+        "type": "string",
+        "description": "Override the default country code sent, may help with login issues for users in other regions.",
+        "placeholder": "+44"
       },
       "httpHost": {
         "title": "HTTP Host",
         "type": "string",
-        "description": "Override the default eWeLink HTTP API host, useful if you need to force a specific region/host.",
+        "description": "Override the default API host, may help with login issues for users in other regions.",
         "placeholder": "eu-apia.coolkit.cc",
         "oneOf": [{
           "title": "Auto (Recommended)",
@@ -67,34 +76,9 @@
         }
       ]
       },
-      "countryCode": {
-        "title": "Country Code",
-        "type": "string",
-        "description": "Override the default country code sent for login, may help with auth issues for users in other regions.",
-        "placeholder": "+44"
-      },
-      "mode": {
-        "type": "string",
-        "title": "Connection Mode",
-        "description": "This setting defines how the plugin communicates with your devices. For further guidance, please refer to <a href=\"https://github.com/bwp91/homebridge-ewelink/wiki/Connection-Methods\" target=\"_blank\">this wiki article</a>.",
-        "default": "auto",
-        "oneOf": [{
-            "title": "Auto (Recommended)",
-            "enum": ["auto"]
-          },
-          {
-            "title": "Cloud Only",
-            "enum": ["wan"]
-          },
-          {
-            "title": "LAN Only",
-            "enum": ["lan"]
-          }
-        ]
-      },
       "apiPort": {
         "type": "number",
-        "title": "Server API Port",
+        "title": "Internal API Port",
         "description": "Port to use for the internal HTTP API. Set to 0 to disable. Set to 1 to choose a randomly available port."
       },
       "disableDeviceLogging": {
@@ -728,11 +712,9 @@
       "title": "Optional Settings",
       "expandable": true,
       "items": [
-        "language",
-        "encodedPassword",
-        "httpHost",
-        "countryCode",
         "mode",
+        "countryCode",
+        "httpHost",
         "apiPort",
         "disableDeviceLogging",
         "debug",
diff --git a/lib/connection/http.js b/lib/connection/http.js
index 86acdb17..05b51ead 100644
--- a/lib/connection/http.js
+++ b/lib/connection/http.js
@@ -18,6 +18,7 @@ module.exports = class connectionHTTP {
     this.log = platform.log
     this.obstructSwitches = platform.obstructSwitches
     this.password = platform.config.password
+    this.triedBase64 = false
     this.username = platform.config.username
   }
 
@@ -46,17 +47,14 @@ module.exports = class connectionHTTP {
         .update(JSON.stringify(data)).digest('base64')
 
       // Send the request
-      const res = await axios.post(
-        'https://' + this.httpHost + '/v2/user/login', data,
-        {
-          headers: {
-            Authorization: 'Sign ' + dataToSign,
-            'Content-Type': 'application/json',
-            'X-CK-Appid': this.consts.appId,
-            'X-CK-Nonce': Math.random().toString(36).substr(2, 8)
-          }
+      const res = await axios.post('https://' + this.httpHost + '/v2/user/login', data, {
+        headers: {
+          Authorization: 'Sign ' + dataToSign,
+          'Content-Type': 'application/json',
+          'X-CK-Appid': this.consts.appId,
+          'X-CK-Nonce': Math.random().toString(36).substr(2, 8)
         }
-      )
+      })
 
       // Parse the response
       const body = res.data
@@ -85,6 +83,12 @@ module.exports = class connectionHTTP {
 
         // Retry the login with the new http host
         return await this.login()
+      } else if (body.error === 10001 && !this.triedBase64) {
+        // In this case the password is incorrect so try base64 decoding just once
+        this.triedBase64 = true
+        const buff = Buffer.from(this.password, 'base64')
+        this.password = buff.toString('utf8').replace(/(\r\n|\n|\r)/gm, '').trim()
+        return await this.login()
       } else {
         if (body.data.at) {
           // User api key and token received successfully
diff --git a/lib/index.js b/lib/index.js
index f66d57c4..9f129e7d 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -52,11 +52,7 @@ class eWeLinkPlatform {
       this.obstructSwitches = {}
 
       // Retrieve the user's chosen language file
-      const language = config && config.language &&
-        this.consts.allowed.languages.includes(config.language)
-        ? config.language
-        : this.consts.defaultValues.language
-      this.lang = require('./utils/lang-' + language)
+      this.lang = require('./utils/lang-en')
 
       // Make sure user is running Homebridge v1.3 or above
       if (!api.versionGreaterOrEqual || !api.versionGreaterOrEqual('1.3.0')) {
@@ -203,7 +199,6 @@ class eWeLinkPlatform {
         case 'debugFakegato':
         case 'disableDeviceLogging':
         case 'disablePlugin':
-        case 'encodedPassword':
           if (typeof val === 'string') {
             logQuotes(key)
           }
@@ -448,14 +443,6 @@ class eWeLinkPlatform {
           }
           break
         }
-        case 'language': {
-          const inSet = this.consts.allowed.languages.includes(val)
-          if (typeof val !== 'string' || !inSet) {
-            logIgnore(key)
-          }
-          this.config.language = inSet ? val : this.consts.defaultValues[key]
-          break
-        }
         case 'mode': {
           const inSet = this.consts.allowed.modes.includes(val)
           if (typeof val !== 'string' || !inSet) {
@@ -492,9 +479,7 @@ class eWeLinkPlatform {
     try {
       // If the user has disabled the plugin then remove all accessories
       if (this.config.disablePlugin) {
-        devicesInHB.forEach(accessory => {
-          this.removeAccessory(accessory)
-        })
+        devicesInHB.forEach(accessory => this.removeAccessory(accessory))
         throw new Error(this.lang.disabled)
       }
 
@@ -506,12 +491,6 @@ class eWeLinkPlatform {
       this.eveService = require('./fakegato/fakegato-history')(this.api)
       this.eveChar = new (require('./utils/eve-chars'))(this.api)
 
-      // Check to see if the user has encoded their password
-      if (this.config.encodedPassword) {
-        const buff = Buffer.from(this.config.password, 'base64')
-        this.config.password = buff.toString('utf8').replace(/(\r\n|\n|\r)/gm, '').trim()
-      }
-
       // Set up the HTTP client, get the user HTTP host, and login
       httpClient = new (require('./connection/http'))(this)
       const authData = await httpClient.login()
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 3034ff9b..3320fb99 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -7,11 +7,9 @@ module.exports = {
     name: 'eWeLink',
     username: '',
     password: '',
-    language: 'en',
-    encodedPassword: false,
-    httpHost: 'eu-apia.coolkit.cc',
-    countryCode: '+44',
     mode: 'auto',
+    countryCode: '+44',
+    httpHost: 'eu-apia.coolkit.cc',
     apiPort: 0,
     disableDeviceLogging: false,
     debug: false,
@@ -31,7 +29,6 @@ module.exports = {
   },
 
   defaultValues: {
-    language: 'en',
     httpHost: 'eu-apia.coolkit.cc',
     apiPort: 0,
     inUsePowerThreshold: 0,
@@ -70,7 +67,6 @@ module.exports = {
   httpRetryCodes: ['ENOTFOUND', 'ETIMEDOUT', 'EAI_AGAIN'],
 
   allowed: {
-    languages: ['en'],
     httpHosts: [
       'auto', 'eu-apia.coolkit.cc', 'us-apia.coolkit.cc', 'as-apia.coolkit.cc',
       'cn-apia.coolkit.cn'

From 1174474730a07b99700b0c7aaaef966ffdefb2ff Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 9 May 2021 17:44:34 +0100
Subject: [PATCH 2089/3183] Update package-lock.json

---
 package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index fa8a0bac..cb462b70 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -78,9 +78,9 @@
       "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="
     },
     "follow-redirects": {
-      "version": "1.14.0",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.0.tgz",
-      "integrity": "sha512-0vRwd7RKQBTt+mgu87mtYeofLFZpTas2S9zY+jIeuLJMNvudIgF52nr19q40HOwH5RrhWIPuj9puybzSJiRrVg=="
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.1.tgz",
+      "integrity": "sha512-HWqDgT7ZEkqRzBvc2s64vSZ/hfOceEol3ac/7tKwzuvEyWx3/4UegXh5oBOIotkGsObyk3xznnSRVADBgWSQVg=="
     },
     "function-bind": {
       "version": "1.1.1",

From 5e30a13f948824ab332a5e1b00cff99ed8365ef1 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 9 May 2021 17:44:39 +0100
Subject: [PATCH 2090/3183] line lengths

---
 lib/connection/lan.js | 20 ++++++--------------
 lib/connection/ws.js  | 13 +++++--------
 2 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/lib/connection/lan.js b/lib/connection/lan.js
index ced38be3..a34420e0 100644
--- a/lib/connection/lan.js
+++ b/lib/connection/lan.js
@@ -41,9 +41,7 @@ module.exports = class connectionLAN {
     if (this.debug) {
       this.log('%s.', this.lang.lanStarting)
     }
-    const res = await dnsSd.discover({
-      name: '_ewelink._tcp.local'
-    })
+    const res = await dnsSd.discover({ name: '_ewelink._tcp.local' })
     if (this.debug) {
       this.log('%s.', this.lang.lanStarted)
     }
@@ -51,8 +49,7 @@ module.exports = class connectionLAN {
     // Update the device map for each device found on the local network
     res.forEach(device => {
       // Obtain the ewelink deviceId and check to see it is in our map
-      const deviceId = device.fqdn.replace('._ewelink._tcp.local', '')
-        .replace('eWeLink_', '')
+      const deviceId = device.fqdn.replace('._ewelink._tcp.local', '').replace('eWeLink_', '')
       let d
       if ((d = this.deviceMap.get(deviceId)) && !d.ip) {
         // Update the map with the found IP address
@@ -98,8 +95,7 @@ module.exports = class connectionLAN {
             const dText = crypto
               .createDecipheriv('aes-128-cbc', key, Buffer.from(rdata.iv, 'base64'))
             const pText = Buffer
-              .concat([dText.update(Buffer.from(data, 'base64')), dText.final()])
-              .toString('utf8')
+              .concat([dText.update(Buffer.from(data, 'base64')), dText.final()]).toString('utf8')
 
             // Check to see if the IP address of the device has changed
             if (packet.address !== deviceInfo.ip && !this.ipOverride[rdata.id]) {
@@ -193,13 +189,11 @@ module.exports = class connectionLAN {
       }
 
       // Generate the HTTP request
-      const key = crypto.createHash('md5')
-        .update(Buffer.from(apiKey, 'utf8')).digest()
+      const key = crypto.createHash('md5').update(Buffer.from(apiKey, 'utf8')).digest()
       const iv = crypto.randomBytes(16)
       const enc = crypto.createCipheriv('aes-128-cbc', key, iv)
       const data = {
-        data: Buffer.concat([enc.update(JSON.stringify(params)), enc.final()])
-          .toString('base64'),
+        data: Buffer.concat([enc.update(JSON.stringify(params)), enc.final()]).toString('base64'),
         deviceid: json.deviceid,
         encrypt: true,
         iv: iv.toString('base64'),
@@ -222,9 +216,7 @@ module.exports = class connectionLAN {
 
       // Check for any errors in the response
       if (!res.data || res.data.error !== 0) {
-        const error = res.data && res.data.error
-          ? res.data.error
-          : this.lang.lanErr
+        const error = res.data && res.data.error ? res.data.error : this.lang.lanErr
         throw new Error(error)
       }
 
diff --git a/lib/connection/ws.js b/lib/connection/ws.js
index 4bd62a65..a4588d9e 100644
--- a/lib/connection/ws.js
+++ b/lib/connection/ws.js
@@ -195,10 +195,7 @@ module.exports = class connectionWS {
           switch (msg.action) {
             case 'update':
             case 'sysmsg': {
-              if (
-                msg.action === 'sysmsg' &&
-                this.funcs.hasProperty(msg.params, 'online')
-              ) {
+              if (msg.action === 'sysmsg' && this.funcs.hasProperty(msg.params, 'online')) {
               // Update the online/offline status provided in the message
                 onlineStatus = msg.params.online
               }
@@ -337,8 +334,8 @@ module.exports = class connectionWS {
       // The web socket isn't currently open so log this
       this.log.warn('%s.', this.lang.wsResend)
 
-      // Try sending the update again in 30 seconds when it's hopefully open again
-      await this.funcs.sleep(30000)
+      // Try sending the update again in 10 seconds when it's hopefully open again
+      await this.funcs.sleep(10000)
       await this.sendUpdate(json)
     }
   }
@@ -372,8 +369,8 @@ module.exports = class connectionWS {
       // The web socket isn't currently open so log this
       this.log.warn('[%s] %s.', accessory.displayName, this.lang.wsResend)
 
-      // Try sending the update again in 30 seconds when it's hopefully open again
-      await this.funcs.sleep(30000)
+      // Try sending the update again in 10 seconds when it's hopefully open again
+      await this.funcs.sleep(10000)
       await this.requestUpdate(accessory)
     }
   }

From 4fe3ed44fb6d91dc8f0b2255d8361750a5ff0261 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 9 May 2021 17:44:41 +0100
Subject: [PATCH 2091/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fddb8f4e..940d2b8e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,9 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 ### Changes
 
+* Removed `encodedPassword` and `language` config options
+  * The plugin will now initially try the supplied password and if incorrect will attempt another login with a base64 decoded version
+  * Language option unnecessary until other languages are available
 * Display temperature and humidity units for the zigbee temperature/humidity sensor in the logs
 * Fixes an issue where the web socket would not close on plugin shutdown
 * Reduce the 'No Response' timeout to 2 seconds

From d8891b6d0a51af83f98d59a4af0caac8c3993009 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 9 May 2021 17:54:09 +0100
Subject: [PATCH 2092/3183] line lengths

---
 lib/fakegato/fakegato-history.js | 105 +++++++++++--------------------
 lib/fakegato/fakegato-storage.js |  10 +--
 lib/fakegato/fakegato-timer.js   |   5 +-
 3 files changed, 40 insertions(+), 80 deletions(-)

diff --git a/lib/fakegato/fakegato-history.js b/lib/fakegato/fakegato-history.js
index 2d6f6a64..592fb856 100644
--- a/lib/fakegato/fakegato-history.js
+++ b/lib/fakegato/fakegato-history.js
@@ -59,11 +59,7 @@ module.exports = function (homebridge) {
       super('S2R1', S2R1Characteristic.UUID)
       this.setProps({
         format: Characteristic.Formats.DATA,
-        perms: [
-          Characteristic.Perms.READ,
-          Characteristic.Perms.NOTIFY,
-          Characteristic.Perms.HIDDEN
-        ]
+        perms: [Characteristic.Perms.READ, Characteristic.Perms.NOTIFY, Characteristic.Perms.HIDDEN]
       })
     }
   }
@@ -75,11 +71,7 @@ module.exports = function (homebridge) {
       super('S2R2', S2R2Characteristic.UUID)
       this.setProps({
         format: Characteristic.Formats.DATA,
-        perms: [
-          Characteristic.Perms.READ,
-          Characteristic.Perms.NOTIFY,
-          Characteristic.Perms.HIDDEN
-        ]
+        perms: [Characteristic.Perms.READ, Characteristic.Perms.NOTIFY, Characteristic.Perms.HIDDEN]
       })
     }
   }
@@ -365,7 +357,7 @@ module.exports = function (homebridge) {
       this.setTime = true
       this.restarted = true
       this.refTime = 0
-      this.memoryAddress = 0
+      this.memAddress = 0
       this.dataStream = ''
       this.saving = false
       this.registerEvents()
@@ -626,62 +618,54 @@ module.exports = function (homebridge) {
     getCurrentS2R2 () {
       const entry2address = val => val % this.memorySize
       if (this.currentEntry <= this.lastEntry && this.transfer) {
-        this.memoryAddress = entry2address(this.currentEntry)
+        this.memAddress = entry2address(this.currentEntry)
         for (let i = 0; i < 11; i++) {
           if (
-            this.history[this.memoryAddress].setRefTime === 1 ||
+            this.history[this.memAddress].setRefTime === 1 ||
             this.setTime ||
             (this.currentEntry === this.firstEntry + 1)
           ) {
             this.dataStream += Format(
               ',15%s 0100 0000 81%s0000 0000 00 0000',
               numToHex(swap32(this.currentEntry), 8),
-              numToHex(swap32(this.refTime), 8))
+              numToHex(swap32(this.refTime), 8)
+            )
             this.setTime = false
           } else {
             this.log(
               '[%s] FG history: entry [%s] address [%s].',
               this.accessoryName,
               this.currentEntry,
-              this.memoryAddress
+              this.memAddress
             )
             switch (this.accessoryType) {
               case 'weather':
                 this.dataStream += Format(
                   ',10 %s%s-%s:%s %s %s',
                   numToHex(swap32(this.currentEntry), 8),
-                  numToHex(swap32(
-                    this.history[this.memoryAddress].time - this.refTime - _EPOCH),
-                  8
-                  ),
+                  numToHex(swap32(this.history[this.memAddress].time - this.refTime - _EPOCH), 8),
                   this.accessoryType117,
-                  numToHex(swap16(this.history[this.memoryAddress].temp * 100), 4),
-                  numToHex(swap16(this.history[this.memoryAddress].humidity * 100), 4),
-                  numToHex(swap16(this.history[this.memoryAddress].pressure * 10), 4))
+                  numToHex(swap16(this.history[this.memAddress].temp * 100), 4),
+                  numToHex(swap16(this.history[this.memAddress].humidity * 100), 4),
+                  numToHex(swap16(this.history[this.memAddress].pressure * 10), 4))
                 break
               case 'energy':
                 this.dataStream += Format(
                   ',14 %s%s-%s:0000 0000 %s 0000 0000',
                   numToHex(swap32(this.currentEntry), 8),
-                  numToHex(swap32(
-                    this.history[this.memoryAddress].time - this.refTime - _EPOCH),
-                  8
-                  ),
+                  numToHex(swap32(this.history[this.memAddress].time - this.refTime - _EPOCH), 8),
                   this.accessoryType117,
-                  numToHex(swap16(this.history[this.memoryAddress].power * 10), 4))
+                  numToHex(swap16(this.history[this.memAddress].power * 10), 4))
                 break
               case 'room':
                 this.dataStream += Format(
                   ',13 %s%s%s%s%s%s0000 00',
                   numToHex(swap32(this.currentEntry), 8),
-                  numToHex(swap32(
-                    this.history[this.memoryAddress].time - this.refTime - _EPOCH),
-                  8
-                  ),
+                  numToHex(swap32(this.history[this.memAddress].time - this.refTime - _EPOCH), 8),
                   this.accessoryType117,
-                  numToHex(swap16(this.history[this.memoryAddress].temp * 100), 4),
-                  numToHex(swap16(this.history[this.memoryAddress].humidity * 100), 4),
-                  numToHex(swap16(this.history[this.memoryAddress].ppm), 4))
+                  numToHex(swap16(this.history[this.memAddress].temp * 100), 4),
+                  numToHex(swap16(this.history[this.memAddress].humidity * 100), 4),
+                  numToHex(swap16(this.history[this.memAddress].ppm), 4))
                 break
               case 'door':
               case 'motion':
@@ -689,60 +673,47 @@ module.exports = function (homebridge) {
                 this.dataStream += Format(
                   ',0b %s%s%s%s',
                   numToHex(swap32(this.currentEntry), 8),
-                  numToHex(swap32(
-                    this.history[this.memoryAddress].time - this.refTime - _EPOCH),
-                  8
-                  ),
+                  numToHex(swap32(this.history[this.memAddress].time - this.refTime - _EPOCH), 8),
                   this.accessoryType117,
-                  numToHex(this.history[this.memoryAddress].status, 2))
+                  numToHex(this.history[this.memAddress].status, 2))
                 break
               case 'aqua':
-                if (this.history[this.memoryAddress].status) {
+                if (this.history[this.memAddress].status) {
                   this.dataStream += Format(
                     ',0d %s%s%s%s 300c',
                     numToHex(swap32(this.currentEntry), 8),
-                    numToHex(swap32(
-                      this.history[this.memoryAddress].time - this.refTime - _EPOCH),
-                    8
-                    ),
+                    numToHex(swap32(this.history[this.memAddress].time - this.refTime - _EPOCH), 8),
                     this.accessoryType117,
-                    numToHex(this.history[this.memoryAddress].status, 2))
+                    numToHex(this.history[this.memAddress].status, 2))
                 } else {
                   this.dataStream += Format(
                     ',15 %s%s%s%s%s 00000000 300c',
                     numToHex(swap32(this.currentEntry), 8),
-                    numToHex(swap32(
-                      this.history[this.memoryAddress].time - this.refTime - _EPOCH),
-                    8
-                    ),
+                    numToHex(swap32(this.history[this.memAddress].time - this.refTime - _EPOCH), 8),
                     this.accessoryType117bis,
-                    numToHex(this.history[this.memoryAddress].status, 2),
-                    numToHex(swap32(this.history[this.memoryAddress].waterAmount), 8))
+                    numToHex(this.history[this.memAddress].status, 2),
+                    numToHex(swap32(this.history[this.memAddress].waterAmount), 8))
                 }
                 break
               case 'thermo':
                 this.dataStream += Format(
                   ',11 %s%s%s%s%s%s 0000',
                   numToHex(swap32(this.currentEntry), 8),
-                  numToHex(swap32(
-                    this.history[this.memoryAddress].time - this.refTime - _EPOCH),
-                  8
-                  ),
+                  numToHex(swap32(this.history[this.memAddress].time - this.refTime - _EPOCH), 8),
                   this.accessoryType117,
-                  numToHex(swap16(this.history[this.memoryAddress].currentTemp * 100), 4),
-                  numToHex(swap16(this.history[this.memoryAddress].setTemp * 100), 4),
-                  numToHex(this.history[this.memoryAddress].valvePosition, 2))
+                  numToHex(swap16(this.history[this.memAddress].currentTemp * 100), 4),
+                  numToHex(swap16(this.history[this.memAddress].setTemp * 100), 4),
+                  numToHex(this.history[this.memAddress].valvePosition, 2))
                 break
               case 'custom': {
                 const result = []
                 let bitmask = 0
-                const dataStream = Format('%s%s',
+                const dataStream = Format(
+                  '%s%s',
                   numToHex(swap32(this.currentEntry), 8),
-                  numToHex(swap32(
-                    this.history[this.memoryAddress].time - this.refTime - _EPOCH),
-                  8
-                  ))
-                for (const [k, v] of Object.entries(this.history[this.memoryAddress])) {
+                  numToHex(swap32(this.history[this.memAddress].time - this.refTime - _EPOCH), 8)
+                )
+                for (const [k, v] of Object.entries(this.history[this.memAddress])) {
                   switch (k) {
                     case 'time':
                       break
@@ -771,9 +742,7 @@ module.exports = function (homebridge) {
                             case 2:
                               result[x] = Format(
                                 '%s',
-                                numToHex(
-                                  v * this.signatures[x].factor,
-                                  this.signatures[x].length)
+                                numToHex(v * this.signatures[x].factor, this.signatures[x].length)
                               )
                               break
                           }
@@ -797,7 +766,7 @@ module.exports = function (homebridge) {
             }
           }
           this.currentEntry++
-          this.memoryAddress = entry2address(this.currentEntry)
+          this.memAddress = entry2address(this.currentEntry)
           if (this.currentEntry > this.lastEntry) {
             break
           }
diff --git a/lib/fakegato/fakegato-storage.js b/lib/fakegato/fakegato-storage.js
index bcc23eee..a97be704 100644
--- a/lib/fakegato/fakegato-storage.js
+++ b/lib/fakegato/fakegato-storage.js
@@ -32,9 +32,7 @@ class FakeGatoStorage {
         callback: params.callback,
         fileName: hostname + '_' + service.accessoryName + '_persist.json'
       }
-      const onReady = typeof (params.onReady) === 'function'
-        ? params.onReady
-        : () => {}
+      const onReady = typeof (params.onReady) === 'function' ? params.onReady : () => {}
       newWriter.storageHandler = fs
       newWriter.path = params.path || path.join(os.homedir(), '.homebridge')
       this.writers.push(newWriter)
@@ -93,11 +91,7 @@ class FakeGatoStorage {
       ? params.callback
       : (typeof (writer.callback) === 'function' ? writer.callback : () => {})
     this.log('FG storage: read file [%s].', path.join(writer.path, writer.fileName))
-    writer.storageHandler.readFile(
-      path.join(writer.path, writer.fileName),
-      'utf8',
-      callBack
-    )
+    writer.storageHandler.readFile(path.join(writer.path, writer.fileName), 'utf8', callBack)
   }
 
   remove (params) {
diff --git a/lib/fakegato/fakegato-timer.js b/lib/fakegato/fakegato-timer.js
index 0c8661f0..d64a3441 100644
--- a/lib/fakegato/fakegato-timer.js
+++ b/lib/fakegato/fakegato-timer.js
@@ -55,10 +55,7 @@ class FakeGatoTimer {
       this.stop()
     }
     this.running = true
-    this.intervalID = setInterval(
-      this.executeCallbacks.bind(this),
-      this.minutes * 60 * 1000
-    )
+    this.intervalID = setInterval(this.executeCallbacks.bind(this), this.minutes * 60 * 1000)
   }
 
   stop () {

From 0917336e9cfd0854095fa55582c8306b1797feeb Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 9 May 2021 17:57:14 +0100
Subject: [PATCH 2093/3183] 6.5.2-beta.8

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index cb462b70..1584c920 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.5.2-beta.7",
+  "version": "6.5.2-beta.8",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 02285ac9..2437482b 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.5.2-beta.7",
+  "version": "6.5.2-beta.8",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 33428d1af8038ba1f183717b690f1dfa235e33e4 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 9 May 2021 19:06:36 +0100
Subject: [PATCH 2094/3183] dont use unnecessary devicesInEwe map

---
 lib/index.js | 207 ++++++++++++++++-----------------------------------
 1 file changed, 65 insertions(+), 142 deletions(-)

diff --git a/lib/index.js b/lib/index.js
index 9f129e7d..b5392246 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -495,12 +495,8 @@ class eWeLinkPlatform {
       httpClient = new (require('./connection/http'))(this)
       const authData = await httpClient.login()
 
-      // Get a device list and add to the devicesInEW map
+      // Get a device list via HTTP request
       const deviceList = await httpClient.getDevices()
-      const devicesInEW = new Map()
-      deviceList.forEach(device => {
-        devicesInEW.set(device.deviceid, device)
-      })
 
       // Set up the WS client, get the user WS host, and login
       if (this.config.mode !== 'lan') {
@@ -517,13 +513,13 @@ class eWeLinkPlatform {
 
       // Remove HB accessories that are no longer in eWeLink account
       devicesInHB.forEach(accessory => {
-        if (!devicesInEW.has(accessory.context.eweDeviceId)) {
+        if (!deviceList.some(el => el.deviceid === accessory.context.eweDeviceId)) {
           this.removeAccessory(accessory)
         }
       })
 
       // Initialise each device into HB
-      devicesInEW.forEach(device => this.initialiseDevice(device))
+      deviceList.forEach(device => this.initialiseDevice(device))
 
       // Set up the WS and LAN listener for device updates
       if (wsClient) {
@@ -653,8 +649,7 @@ class eWeLinkPlatform {
         /***********************
         BLINDS [EWELINK UIID 11]
         ***********************/
-        accessory = devicesInHB.get(uuid) ||
-          this.addAccessory(device, device.deviceid + 'SWX')
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/curtain'))(this, accessory)
         /**********************/
       } else if (
@@ -664,8 +659,7 @@ class eWeLinkPlatform {
         /*************************
         BLINDS [DUALR3 MOTOR MODE]
         *************************/
-        accessory = devicesInHB.get(uuid) ||
-          this.addAccessory(device, device.deviceid + 'SWX')
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/motor'))(this, accessory)
         /************************/
       } else if (
@@ -675,8 +669,7 @@ class eWeLinkPlatform {
         /****************************
         BLINDS [ACCESSORY SIMULATION]
         ****************************/
-        accessory = devicesInHB.get(uuid) ||
-          this.addAccessory(device, device.deviceid + 'SWX')
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/simulation/blind'))(this, accessory)
         /***************************/
       } else if (
@@ -686,8 +679,7 @@ class eWeLinkPlatform {
         /***************************
         DOORS [ACCESSORY SIMULATION]
         ***************************/
-        accessory = devicesInHB.get(uuid) ||
-          this.addAccessory(device, device.deviceid + 'SWX')
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/simulation/door'))(this, accessory)
         /**************************/
       } else if (
@@ -697,8 +689,7 @@ class eWeLinkPlatform {
         /*****************************
         WINDOWS [ACCESSORY SIMULATION]
         *****************************/
-        accessory = devicesInHB.get(uuid) ||
-          this.addAccessory(device, device.deviceid + 'SWX')
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/simulation/window'))(this, accessory)
         /****************************/
       } else if (this.obstructSwitches[device.deviceid]) {
@@ -717,8 +708,7 @@ class eWeLinkPlatform {
         GARAGE DOORS [ONE] [ACCESSORY SIMULATION]
         ****************************************/
         const instance = './device/simulation/garage-one'
-        accessory = devicesInHB.get(uuid) ||
-          this.addAccessory(device, device.deviceid + 'SWX')
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require(instance))(this, accessory, devicesInHB)
         /***************************************/
       } else if (
@@ -728,10 +718,8 @@ class eWeLinkPlatform {
         /****************************************
         GARAGE DOORS [TWO] [ACCESSORY SIMULATION]
         ****************************************/
-        const instance = './device/simulation/garage-two'
-        accessory = devicesInHB.get(uuid) ||
-          this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require(instance))(this, accessory)
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
+        accessory.control = new (require('./device/simulation/garage-two'))(this, accessory)
         /***************************************/
       } else if (
         this.simulations[device.deviceid] &&
@@ -740,10 +728,8 @@ class eWeLinkPlatform {
         /*****************************************
         GARAGE DOORS [FOUR] [ACCESSORY SIMULATION]
         *****************************************/
-        const instance = './device/simulation/garage-four'
-        accessory = devicesInHB.get(uuid) ||
-          this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require(instance))(this, accessory)
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
+        accessory.control = new (require('./device/simulation/garage-four'))(this, accessory)
         /****************************************/
       } else if (
         this.simulations[device.deviceid] &&
@@ -752,10 +738,8 @@ class eWeLinkPlatform {
         /***************************
         GARAGE DOORS [EACHEN GD-DC5]
         ***************************/
-        const instance = './device/simulation/garage-eachen'
-        accessory = devicesInHB.get(uuid) ||
-          this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require(instance))(this, accessory)
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
+        accessory.control = new (require('./device/simulation/garage-eachen'))(this, accessory)
         /**************************/
       } else if (
         this.simulations[device.deviceid] &&
@@ -764,8 +748,7 @@ class eWeLinkPlatform {
         /***************************
         LOCKS [ACCESSORY SIMULATION]
         ***************************/
-        accessory = devicesInHB.get(uuid) ||
-          this.addAccessory(device, device.deviceid + 'SWX')
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/simulation/lock-one'))(this, accessory)
         /**************************/
       } else if (
@@ -775,10 +758,8 @@ class eWeLinkPlatform {
         /**********************************
         SWITCH-VALVE [ACCESSORY SIMULATION]
         **********************************/
-        const instance = './device/simulation/switch-valve'
-        accessory = devicesInHB.get(uuid) ||
-          this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require(instance))(this, accessory)
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
+        accessory.control = new (require('./device/simulation/switch-valve'))(this, accessory)
         /*********************************/
       } else if (
         this.simulations[device.deviceid] &&
@@ -787,8 +768,7 @@ class eWeLinkPlatform {
         /********************************
         TAPS [ONE] [ACCESSORY SIMULATION]
         ********************************/
-        accessory = devicesInHB.get(uuid) ||
-          this.addAccessory(device, device.deviceid + 'SWX')
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/simulation/tap-one'))(this, accessory)
         /*******************************/
       } else if (
@@ -798,8 +778,7 @@ class eWeLinkPlatform {
         /********************************
         TAPS [TWO] [ACCESSORY SIMULATION]
         ********************************/
-        accessory = devicesInHB.get(uuid) ||
-          this.addAccessory(device, device.deviceid + 'SWX')
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/simulation/tap-two'))(this, accessory)
         /*******************************/
       } else if (
@@ -809,10 +788,8 @@ class eWeLinkPlatform {
         /**********************************
         VALVES [ONE] [ACCESSORY SIMULATION]
         **********************************/
-        const instance = './device/simulation/valve-one'
-        accessory = devicesInHB.get(uuid) ||
-          this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require(instance))(this, accessory)
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
+        accessory.control = new (require('./device/simulation/valve-one'))(this, accessory)
         /*********************************/
       } else if (
         this.simulations[device.deviceid] &&
@@ -821,10 +798,8 @@ class eWeLinkPlatform {
         /**********************************
         VALVES [TWO] [ACCESSORY SIMULATION]
         **********************************/
-        const instance = './device/simulation/valve-two'
-        accessory = devicesInHB.get(uuid) ||
-          this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require(instance))(this, accessory)
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
+        accessory.control = new (require('./device/simulation/valve-two'))(this, accessory)
         /*********************************/
       } else if (
         this.simulations[device.deviceid] &&
@@ -833,10 +808,8 @@ class eWeLinkPlatform {
         /***********************************
         VALVES [FOUR] [ACCESSORY SIMULATION]
         ***********************************/
-        const instance = './device/simulation/valve-four'
-        accessory = devicesInHB.get(uuid) ||
-          this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require(instance))(this, accessory)
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
+        accessory.control = new (require('./device/simulation/valve-four'))(this, accessory)
         /**********************************/
       } else if (
         this.simulations[device.deviceid] &&
@@ -846,50 +819,42 @@ class eWeLinkPlatform {
         /**************************************
         SENSORS [LEAK DW2 ACCESSORY SIMULATION]
         **************************************/
-        const instance = './device/simulation/sensor-leak'
-        accessory = devicesInHB.get(uuid) ||
-          this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require(instance))(this, accessory)
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
+        accessory.control = new (require('./device/simulation/sensor-leak'))(this, accessory)
         /*************************************/
       } else if (this.consts.devices.sensorContact.includes(uiid)) {
         /*******************
         SENSORS [SONOFF DW2]
         *******************/
-        const instance = './device/sensor-contact'
-        accessory = devicesInHB.get(uuid) ||
-          this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require(instance))(this, accessory, devicesInHB)
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
+        accessory.control = new (require('./device/sensor-contact'))(this, accessory, devicesInHB)
         /******************/
       } else if (this.consts.devices.fan.includes(uiid)) {
         /***
         FANS
         ***/
-        accessory = devicesInHB.get(uuid) ||
-          this.addAccessory(device, device.deviceid + 'SWX')
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/fan'))(this, accessory)
         /**/
       } else if (this.consts.devices.diffuser.includes(uiid)) {
         /********
         DIFFUSERS
         ********/
-        accessory = devicesInHB.get(uuid) ||
-          this.addAccessory(device, device.deviceid + 'SWX')
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/diffuser'))(this, accessory)
         /*******/
       } else if (this.consts.devices.humidifier.includes(uiid)) {
         /**********
         HUMIDIFIERS
         **********/
-        accessory = devicesInHB.get(uuid) ||
-          this.addAccessory(device, device.deviceid + 'SWX')
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/humidifier'))(this, accessory)
         /*********/
       } else if (this.consts.devices.thermostat.includes(uiid)) {
         /**********
         THERMOSTATS
         **********/
-        accessory = devicesInHB.get(uuid) ||
-          this.addAccessory(device, device.deviceid + 'SWX')
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/thermostat'))(this, accessory)
         /*******/
       } else if (
@@ -900,17 +865,14 @@ class eWeLinkPlatform {
         /*********************************
         THERMOSTATS [ACCESSORY SIMULATION]
         *********************************/
-        const instance = './device/simulation/thermostat'
-        accessory = devicesInHB.get(uuid) ||
-          this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require(instance))(this, accessory)
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
+        accessory.control = new (require('./device/simulation/thermostat'))(this, accessory)
         /********************************/
       } else if (this.consts.devices.sensorAmbient.includes(uiid)) {
         /***********************
         SENSOR [AMBIENT-TH10/16]
         ***********************/
-        accessory = devicesInHB.get(uuid) ||
-          this.addAccessory(device, device.deviceid + 'SWX')
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
         accessory.context.sensorType = device.params.sensorType
         accessory.control = new (require('./device/sensor-ambient'))(this, accessory)
         /**********************/
@@ -918,8 +880,7 @@ class eWeLinkPlatform {
         /*************************
         SENSOR [AMBIENT-SONOFF SC]
         *************************/
-        accessory = devicesInHB.get(uuid) ||
-          this.addAccessory(device, device.deviceid + 'SWX')
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/sensor-temp-humi'))(this, accessory)
         /************************/
       } else if (
@@ -932,8 +893,7 @@ class eWeLinkPlatform {
         /******
         OUTLETS
         ******/
-        accessory = devicesInHB.get(uuid) ||
-          this.addAccessory(device, device.deviceid + 'SWX')
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = this.outletDevices[device.deviceid] &&
           this.outletDevices[device.deviceid].showAsSwitch
           ? new (require('./device/switch-single'))(this, accessory)
@@ -943,48 +903,42 @@ class eWeLinkPlatform {
         /*************************************
         OUTLETS [SINGLE BUT MULTIPLE HARDWARE]
         *************************************/
-        accessory = devicesInHB.get(uuid) ||
-          this.addAccessory(device, device.deviceid + 'SWX')
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/outlet-scm'))(this, accessory)
         /************************************/
       } else if (this.consts.devices.lightRGB.includes(uiid)) {
         /***********
         LIGHTS [RGB]
         ***********/
-        accessory = devicesInHB.get(uuid) ||
-          this.addAccessory(device, device.deviceid + 'SWX')
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/light-rgb'))(this, accessory)
         /**********/
       } else if (this.consts.devices.lightCCT.includes(uiid)) {
         /***********
         LIGHTS [CCT]
         ***********/
-        accessory = devicesInHB.get(uuid) ||
-          this.addAccessory(device, device.deviceid + 'SWX')
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/light-cct'))(this, accessory)
         /**********/
       } else if (this.consts.devices.lightRGBCCT.includes(uiid)) {
         /*****************
         LIGHTS [RGB & CCT]
         *****************/
-        accessory = devicesInHB.get(uuid) ||
-          this.addAccessory(device, device.deviceid + 'SWX')
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/light-rgb-cct'))(this, accessory)
         /****************/
       } else if (this.consts.devices.lightDimmer.includes(uiid)) {
         /**************
         LIGHTS [DIMMER]
         **************/
-        accessory = devicesInHB.get(uuid) ||
-          this.addAccessory(device, device.deviceid + 'SWX')
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/light-dimmer'))(this, accessory)
         /*************/
       } else if (this.consts.devices.singleSwitch.includes(uiid)) {
         /************************
         SWITCHES [SINGLE CHANNEL]
         ************************/
-        accessory = devicesInHB.get(uuid) ||
-          this.addAccessory(device, device.deviceid + 'SWX')
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = this.singleDevices[device.deviceid] &&
           this.singleDevices[device.deviceid].showAsOutlet
           ? new (require('./device/outlet-single'))(this, accessory)
@@ -1192,62 +1146,50 @@ class eWeLinkPlatform {
         /**********************
         ZIGBEE STATELESS SWITCH
         **********************/
-        const instance = './device/zigbee/switch-stateless'
-        accessory = devicesInHB.get(uuid) ||
-          this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require(instance))(this, accessory)
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
+        accessory.control = new (require('./device/zigbee/switch-stateless'))(this, accessory)
         /*********************/
       } else if (this.consts.devices.zbSwitchSingle.includes(uiid)) {
         /***************
         ZB SINGLE SWITCH
         ***************/
-        const instance = './device/zigbee/switch-single'
-        accessory = devicesInHB.get(uuid) ||
-          this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require(instance))(this, accessory)
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
+        accessory.control = new (require('./device/zigbee/switch-single'))(this, accessory)
         /**************/
       } else if (this.consts.devices.zbLightDimmer.includes(uiid)) {
         /*****************
         ZB LIGHTS [DIMMER]
         *****************/
-        accessory = devicesInHB.get(uuid) ||
-          this.addAccessory(device, device.deviceid + 'SWX')
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/zigbee/light-dimmer'))(this, accessory)
         /****************/
       } else if (this.consts.devices.zbLightCCT.includes(uiid)) {
         /**************
         ZB LIGHTS [CCT]
         **************/
-        accessory = devicesInHB.get(uuid) ||
-          this.addAccessory(device, device.deviceid + 'SWX')
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/zigbee/light-cct'))(this, accessory)
         /*************/
       } else if (this.consts.devices.zbSensorAmbient.includes(uiid)) {
         /******************
         ZB SENSOR [AMBIENT]
         ******************/
-        const instance = './device/zigbee/sensor-ambient'
-        accessory = devicesInHB.get(uuid) ||
-          this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require(instance))(this, accessory)
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
+        accessory.control = new (require('./device/zigbee/sensor-ambient'))(this, accessory)
         /*****************/
       } else if (this.consts.devices.zbSensorMotion.includes(uiid)) {
         /*****************
         ZB SENSOR [MOTION]
         *****************/
-        const instance = './device/zigbee/sensor-motion'
-        accessory = devicesInHB.get(uuid) ||
-          this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require(instance))(this, accessory)
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
+        accessory.control = new (require('./device/zigbee/sensor-motion'))(this, accessory)
         /****************/
       } else if (this.consts.devices.zbSensorContact.includes(uiid)) {
         /******************
         ZB SENSOR [CONTACT]
         ******************/
-        const instance = './device/zigbee/sensor-contact'
-        accessory = devicesInHB.get(uuid) ||
-          this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require(instance))(this, accessory, devicesInHB)
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
+        accessory.control = new (require('./device/zigbee/sensor-contact'))(this, accessory, devicesInHB)
         /*****************/
       } else if (this.consts.devices.camera.includes(uiid)) {
         /*************
@@ -1308,10 +1250,7 @@ class eWeLinkPlatform {
       this.api.updatePlatformAccessories(plugin.name, plugin.alias, [accessory])
       devicesInHB.set(accessory.UUID, accessory)
       this.log('[%s] %s %s.', device.name, this.lang.devInit, str)
-      if (
-        this.config.mode === 'lan' &&
-        !this.consts.devices.lanOut.includes(uiid)
-      ) {
+      if (this.config.mode === 'lan' && !this.consts.devices.lanOut.includes(uiid)) {
         this.log.warn('[%s] %s.', device.name, this.lang.devNoControl)
       }
     } catch (err) {
@@ -1425,11 +1364,10 @@ class eWeLinkPlatform {
 
       // Set the correct firmware version if we can
       if (this.api && accessory.context.firmware) {
-        accessory.getService(this.api.hap.Service.AccessoryInformation)
-          .updateCharacteristic(
-            this.api.hap.Characteristic.FirmwareRevision,
-            accessory.context.firmware
-          )
+        accessory.getService(this.api.hap.Service.AccessoryInformation).updateCharacteristic(
+          this.api.hap.Characteristic.FirmwareRevision,
+          accessory.context.firmware
+        )
       }
 
       // Add the configured accessory to our global map
@@ -1459,12 +1397,7 @@ class eWeLinkPlatform {
     return await queue.add(async () => {
     // Log the update being sent
       if (this.config.debug) {
-        this.log(
-          '[%s] %s %s.',
-          accessory.displayName,
-          this.lang.updSend,
-          JSON.stringify(params)
-        )
+        this.log('[%s] %s %s.', accessory.displayName, this.lang.updSend, JSON.stringify(params))
       }
 
       // Set up the payload to send via LAN/WS
@@ -1584,12 +1517,7 @@ class eWeLinkPlatform {
           reachableChange = true
 
           // Log the new reachability of the device
-          this.log(
-            '[%s] %s %s.',
-            accessory.displayName,
-            this.lang.repOnline,
-            this.lang.viaLAN
-          )
+          this.log('[%s] %s %s.', accessory.displayName, this.lang.repOnline, this.lang.viaLAN)
 
           // Try and request an update through WS if the device has come back online
           if (accessory.context.reachableWAN && wsClient) {
@@ -1645,12 +1573,7 @@ class eWeLinkPlatform {
 
         // Log the update if debug is set to true
         if (this.config.debug) {
-          this.log(
-            '[%s] %s %s.',
-            deviceId,
-            this.lang.recNew,
-            JSON.stringify(device.params)
-          )
+          this.log('[%s] %s %s.', deviceId, this.lang.recNew, JSON.stringify(device.params))
         }
 
         // Obtain full device information from the HTTP API

From 053971e732a597fcf5d5e3a20dd4bb38bad065a3 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 9 May 2021 19:07:35 +0100
Subject: [PATCH 2095/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 940d2b8e..ffa6232f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,7 +13,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 * Removed `encodedPassword` and `language` config options
   * The plugin will now initially try the supplied password and if incorrect will attempt another login with a base64 decoded version
-  * Language option unnecessary until other languages are available
+  * Language option unnecessary until if and when other languages are available
 * Display temperature and humidity units for the zigbee temperature/humidity sensor in the logs
 * Fixes an issue where the web socket would not close on plugin shutdown
 * Reduce the 'No Response' timeout to 2 seconds

From b91b83c067d6cabc47f13e574049da745fc005a3 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 9 May 2021 19:08:04 +0100
Subject: [PATCH 2096/3183] 6.5.2-beta.9

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 1584c920..168687e8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.5.2-beta.8",
+  "version": "6.5.2-beta.9",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 2437482b..5da94925 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.5.2-beta.8",
+  "version": "6.5.2-beta.9",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 5eed16be19b8d83823e4fdce8841fd911f146fb7 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 10 May 2021 09:32:18 +0100
Subject: [PATCH 2097/3183] add descriptions for username & password

---
 config.schema.json | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index b12f8484..5e28212a 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -17,12 +17,14 @@
         "type": "string",
         "title": "Username",
         "required": true,
-        "placeholder": "Email or full phone (e.g. +8613185260282)"
+        "placeholder": "Email or full phone (e.g. +8613185260282)",
+        "description": "Your eWeLink username, please use your main eWeLink credentials (not a secondary/shared account)."
       },
       "password": {
         "type": "string",
         "title": "Password",
-        "required": true
+        "required": true,
+        "description": "Your eWeLink password, can also be a base64 encoded version of your password."
       },
       "mode": {
         "type": "string",

From 0865775b236e4920ade823137906afac5d44b7d1 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 10 May 2021 09:57:28 +0100
Subject: [PATCH 2098/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ffa6232f..40fd2434 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 All notable changes to this homebridge-ewelink will be documented in this file.
 
-## BETA
+## 6.6.0 (2021-05-10)
 
 ### Added
 

From 3a08e58408b1b4b1a7035902c426ee457381e326 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 10 May 2021 09:57:55 +0100
Subject: [PATCH 2099/3183] 6.6.0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 168687e8..a89142a3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.5.2-beta.9",
+  "version": "6.6.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 5da94925..92ba05df 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.5.2-beta.9",
+  "version": "6.6.0",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From e4931f19306cc4037e970d4bfd24b9d6772032e3 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 11 May 2021 13:15:21 +0100
Subject: [PATCH 2100/3183] Update config.schema.json

---
 config.schema.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config.schema.json b/config.schema.json
index 5e28212a..3dbbf602 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -48,7 +48,7 @@
       "countryCode": {
         "title": "Country Code",
         "type": "string",
-        "description": "Override the default country code sent, may help with login issues for users in other regions.",
+        "description": "Override the default country code, may help with login issues for users in other regions.",
         "placeholder": "+44"
       },
       "httpHost": {

From 4c9f038b465268c1c3ad8ac64bb2da2e9ff0bdef Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 11 May 2021 14:17:26 +0100
Subject: [PATCH 2101/3183] split outlet and power outlet files

---
 lib/device/outlet-power.js  | 225 ++++++++++++++++++++++++++++++++++++
 lib/device/outlet-single.js | 184 +++--------------------------
 lib/index.js                |  28 +++--
 3 files changed, 258 insertions(+), 179 deletions(-)
 create mode 100644 lib/device/outlet-power.js

diff --git a/lib/device/outlet-power.js b/lib/device/outlet-power.js
new file mode 100644
index 00000000..39e59fc8
--- /dev/null
+++ b/lib/device/outlet-power.js
@@ -0,0 +1,225 @@
+/* jshint -W014, -W033, esversion: 9 */
+/* eslint-disable new-cap */
+'use strict'
+
+module.exports = class deviceOutletPower {
+  constructor (platform, accessory) {
+    // Set up variables from the platform
+    this.eveChar = platform.eveChar
+    this.funcs = platform.funcs
+    this.hapChar = platform.api.hap.Characteristic
+    this.hapErr = platform.api.hap.HapStatusError
+    this.hapServ = platform.api.hap.Service
+    this.lang = platform.lang
+    this.log = platform.log
+    this.platform = platform
+
+    // Set up variables from the accessory
+    this.name = accessory.displayName
+    this.accessory = accessory
+
+    // Set up custom variables for this device type
+    const deviceConf = platform.outletDevices[accessory.context.eweDeviceId]
+    this.inUsePowerThreshold = deviceConf && deviceConf.inUsePowerThreshold
+      ? deviceConf.inUsePowerThreshold
+      : platform.consts.defaultValues.inUsePowerThreshold
+    this.disableDeviceLogging = deviceConf && deviceConf.overrideDisabledLogging
+      ? false
+      : platform.config.disableDeviceLogging
+
+    // If the accessory has a switch service then remove it
+    if (this.accessory.getService(this.hapServ.Switch)) {
+      this.accessory.removeService(this.accessory.getService(this.hapServ.Switch))
+    }
+
+    // Add the outlet service if it doesn't already exist
+    if (!(this.service = this.accessory.getService(this.hapServ.Outlet))) {
+      this.service = this.accessory.addService(this.hapServ.Outlet)
+      this.service.addCharacteristic(this.eveChar.Voltage)
+      this.service.addCharacteristic(this.eveChar.CurrentConsumption)
+      this.service.addCharacteristic(this.eveChar.ElectricCurrent)
+      this.service.addCharacteristic(this.eveChar.TotalConsumption)
+      this.service.addCharacteristic(this.eveChar.ResetTotal)
+    }
+
+    // Add the set handler to the outlet on/off characteristic
+    this.service.getCharacteristic(this.hapChar.On).onSet(async value => {
+      await this.internalStateUpdate(value)
+    })
+
+    // Pass the accessory to Fakegato to set up with Eve
+    this.accessory.eveService = new platform.eveService('energy', this.accessory, {
+      log: platform.config.debugFakegato ? this.log : () => {}
+    })
+
+    // TotalConsumption is calculated by the plugin with these context readings
+    if (!this.funcs.hasProperty(this.accessory.context, 'energyReadings')) {
+      this.accessory.context.energyReadings = []
+    }
+    if (!this.funcs.hasProperty(this.accessory.context, 'energyReadingTotal')) {
+      this.accessory.context.energyReadingTotal = 0
+    }
+
+    // Add the set handler to the outlet eve reset total energy characteristic
+    this.service.getCharacteristic(this.eveChar.ResetTotal).onSet(value => {
+      this.accessory.context.energyReadings = []
+      this.accessory.context.energyReadingTotal = 0
+      this.service.updateCharacteristic(this.eveChar.TotalConsumption, 0)
+    })
+
+    // Set up an interval for the plugin to calculate an approx total consumption
+    this.intervalPower = setInterval(() => {
+      // Every 30 seconds start with a zero reading
+      let total = 0
+
+      // Check we have had readings within the previous 30 seconds
+      if (this.accessory.context.energyReadings.length > 0) {
+        // Accumulate the total from the energy readings
+        this.accessory.context.energyReadings.forEach(x => {
+          total += x
+        })
+
+        // Divide this by the number of entries to get an average W5m
+        total /= this.accessory.context.energyReadings.length
+
+        // Convert this to Wh then kWh
+        total /= 12
+        total /= 1000
+
+        // Accumulate the grand total that Eve reads as the total consumption
+        this.accessory.context.energyReadingTotal += total
+      }
+
+      // Reset the array for each 30 second readings
+      this.accessory.context.energyReadings = []
+
+      // Update Eve with the new grand total
+      this.service.updateCharacteristic(
+        this.eveChar.TotalConsumption,
+        this.accessory.context.energyReadingTotal
+      )
+    }, 30000)
+
+    // Set up an interval to get eWeLink to send power updates
+    setTimeout(() => {
+      this.internalUIUpdate()
+      this.intervalPoll = setInterval(() => this.internalUIUpdate(), 60000)
+    }, 5000)
+
+    // Stop the intervals on Homebridge shutdown
+    platform.api.on('shutdown', () => {
+      clearInterval(this.intervalPoll)
+      clearInterval(this.intervalPower)
+    })
+
+    // Output the customised options to the log if in debug mode
+    if (platform.config.debug) {
+      const opts = JSON.stringify({
+        disableDeviceLogging: this.disableDeviceLogging,
+        inUsePowerThreshold: this.inUsePowerThreshold
+      })
+      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
+    }
+  }
+
+  async internalStateUpdate (value) {
+    try {
+      const newValue = value ? 'on' : 'off'
+      if (newValue === this.cacheState) {
+        return
+      }
+      await this.platform.sendDeviceUpdate(this.accessory, {
+        switch: newValue
+      })
+      this.cacheState = newValue
+      if (!value) {
+        this.service.updateCharacteristic(this.hapChar.OutletInUse, false)
+        this.service.updateCharacteristic(this.eveChar.CurrentConsumption, 0)
+        this.accessory.eveService.addEntry({ power: 0 })
+        this.accessory.context.energyReadings.push(0)
+      }
+      if (!this.disableDeviceLogging) {
+        this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
+      }
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, true)
+      setTimeout(() => {
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
+      }, 2000)
+      throw new this.hapErr(-70402)
+    }
+  }
+
+  async internalUIUpdate () {
+    try {
+      const params = { uiActive: 60 }
+      await this.platform.sendDeviceUpdate(this.accessory, params, true)
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, true)
+    }
+  }
+
+  async externalUpdate (params) {
+    try {
+      if (params.switch && params.switch !== this.cacheState) {
+        this.service.updateCharacteristic(this.hapChar.On, params.switch === 'on')
+        this.cacheState = params.switch
+        if (this.cacheState === 'off') {
+          this.service.updateCharacteristic(this.hapChar.OutletInUse, false)
+          this.service.updateCharacteristic(this.eveChar.CurrentConsumption, 0)
+          this.accessory.eveService.addEntry({ power: 0 })
+          this.accessory.context.energyReadings.push(0)
+        }
+        if (params.updateSource && !this.disableDeviceLogging) {
+          this.log('[%s] %s [%s].', this.name, this.lang.curState, params.switch)
+        }
+      }
+      let logger = false
+      if (this.funcs.hasProperty(params, 'power')) {
+        const power = parseFloat(params.power)
+        this.service.updateCharacteristic(
+          this.hapChar.OutletInUse,
+          this.cacheState === 'on' && power > this.inUsePowerThreshold
+        )
+        this.service.updateCharacteristic(this.eveChar.CurrentConsumption, power)
+        this.accessory.eveService.addEntry({ power: this.cacheState === 'on' ? power : 0 })
+        this.accessory.context.energyReadings.push(power)
+        logger = true
+      }
+      if (this.funcs.hasProperty(params, 'voltage')) {
+        this.service.updateCharacteristic(this.eveChar.Voltage, parseFloat(params.voltage))
+        logger = true
+      }
+      if (this.funcs.hasProperty(params, 'current')) {
+        this.service.updateCharacteristic(this.eveChar.ElectricCurrent, parseFloat(params.current))
+        logger = true
+      }
+      if (params.updateSource && logger && !this.disableDeviceLogging) {
+        this.log(
+          '[%s] %s%s%s.',
+          this.name,
+          this.funcs.hasProperty(params, 'power')
+            ? ' ' + this.lang.curPower + ' [' + params.power + 'W]'
+            : '',
+          this.funcs.hasProperty(params, 'voltage')
+            ? ' ' + this.lang.curVolt + ' [' + params.voltage + 'V]'
+            : '',
+          this.funcs.hasProperty(params, 'current')
+            ? ' ' + this.lang.curCurr + ' [' + params.current + 'A]'
+            : ''
+        )
+      }
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, false)
+    }
+  }
+
+  currentState () {
+    const toReturn = {}
+    toReturn.services = ['outlet']
+    toReturn.outlet = {
+      state: this.service.getCharacteristic(this.hapChar.On).value ? 'on' : 'off'
+    }
+    return toReturn
+  }
+}
diff --git a/lib/device/outlet-single.js b/lib/device/outlet-single.js
index f72687df..3506992b 100644
--- a/lib/device/outlet-single.js
+++ b/lib/device/outlet-single.js
@@ -17,13 +17,9 @@ module.exports = class deviceOutletSingle {
     // Set up variables from the accessory
     this.name = accessory.displayName
     this.accessory = accessory
-    this.hasReadings = platform.consts.devices.outlet.includes(accessory.context.eweUIID)
 
     // Set up custom variables for this device type
     const deviceConf = platform.outletDevices[accessory.context.eweDeviceId]
-    this.inUsePowerThreshold = deviceConf && deviceConf.inUsePowerThreshold
-      ? deviceConf.inUsePowerThreshold
-      : platform.consts.defaultValues.inUsePowerThreshold
     this.disableDeviceLogging = deviceConf && deviceConf.overrideDisabledLogging
       ? false
       : platform.config.disableDeviceLogging
@@ -34,16 +30,8 @@ module.exports = class deviceOutletSingle {
     }
 
     // Add the outlet service if it doesn't already exist
-    if (!(this.service = this.accessory.getService(this.hapServ.Outlet))) {
-      this.service = this.accessory.addService(this.hapServ.Outlet)
-      if (this.hasReadings) {
-        this.service.addCharacteristic(this.eveChar.Voltage)
-        this.service.addCharacteristic(this.eveChar.CurrentConsumption)
-        this.service.addCharacteristic(this.eveChar.ElectricCurrent)
-        this.service.addCharacteristic(this.eveChar.TotalConsumption)
-        this.service.addCharacteristic(this.eveChar.ResetTotal)
-      }
-    }
+    this.service = this.accessory.getService(this.hapServ.Outlet) ||
+      this.accessory.addService(this.hapServ.Outlet)
 
     // Add the set handler to the outlet on/off characteristic
     this.service.getCharacteristic(this.hapChar.On).onSet(async value => {
@@ -55,97 +43,26 @@ module.exports = class deviceOutletSingle {
       log: platform.config.debugFakegato ? this.log : () => {}
     })
 
-    if (this.hasReadings) {
-      // TotalConsumption is calculated by the plugin with these context readings
-      if (!this.funcs.hasProperty(this.accessory.context, 'energyReadings')) {
-        this.accessory.context.energyReadings = []
-      }
-      if (!this.funcs.hasProperty(this.accessory.context, 'energyReadingTotal')) {
-        this.accessory.context.energyReadingTotal = 0
-      }
-
-      // Add the set handler to the outlet eve reset total energy characteristic
-      this.service.getCharacteristic(this.eveChar.ResetTotal).onSet(value => {
-        this.accessory.context.energyReadings = []
-        this.accessory.context.energyReadingTotal = 0
-        this.service.updateCharacteristic(this.eveChar.TotalConsumption, 0)
-      })
-
-      // Set up an interval for the plugin to calculate an approx total consumption
-      this.intervalPower = setInterval(() => {
-        // Every 30 seconds start with a zero reading
-        let total = 0
-
-        // Check we have had readings within the previous 30 seconds
-        if (this.accessory.context.energyReadings.length > 0) {
-          // Accumulate the total from the energy readings
-          this.accessory.context.energyReadings.forEach(x => {
-            total += x
-          })
-
-          // Divide this by the number of entries to get an average W5m
-          total /= this.accessory.context.energyReadings.length
-
-          // Convert this to Wh
-          total /= 12
-
-          // Convert this to kWh
-          total /= 1000
-
-          // Accumulate the grand total that Eve reads as the total consumption
-          this.accessory.context.energyReadingTotal += total
-        }
-
-        // Reset the array for each 30 second readings
-        this.accessory.context.energyReadings = []
-
-        // Update Eve with the new grand total
-        this.service.updateCharacteristic(
-          this.eveChar.TotalConsumption,
-          this.accessory.context.energyReadingTotal
-        )
-      }, 30000)
-
-      // Set up an interval to get eWeLink to send power updates
-      setTimeout(() => {
-        this.internalUIUpdate()
-        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 60000)
-      }, 5000)
-
-      // Stop the intervals on Homebridge shutdown
-      platform.api.on('shutdown', () => {
-        clearInterval(this.intervalPoll)
-        clearInterval(this.intervalPower)
-      })
-    } else {
-      // Just a simple outlet model so remove any existing power characteristics
-      if (this.service.testCharacteristic(this.eveChar.Voltage)) {
-        this.service.removeCharacteristic(
-          this.service.getCharacteristic(this.eveChar.Voltage)
-        )
-        this.service.removeCharacteristic(
-          this.service.getCharacteristic(this.eveChar.CurrentConsumption)
-        )
-        this.service.removeCharacteristic(
-          this.service.getCharacteristic(this.eveChar.ElectricCurrent)
-        )
-        this.service.removeCharacteristic(
-          this.service.getCharacteristic(this.eveChar.TotalConsumption)
-        )
-        this.service.removeCharacteristic(
-          this.service.getCharacteristic(this.eveChar.ResetTotal)
-        )
-        this.service.removeCharacteristic(
-          this.service.getCharacteristic(this.hapChar.OutletInUse)
-        )
-      }
+    // Just a simple outlet model so remove any existing power characteristics
+    if (this.service.testCharacteristic(this.eveChar.Voltage)) {
+      this.service.removeCharacteristic(this.service.getCharacteristic(this.eveChar.Voltage))
+      this.service.removeCharacteristic(
+        this.service.getCharacteristic(this.eveChar.CurrentConsumption)
+      )
+      this.service.removeCharacteristic(
+        this.service.getCharacteristic(this.eveChar.ElectricCurrent)
+      )
+      this.service.removeCharacteristic(
+        this.service.getCharacteristic(this.eveChar.TotalConsumption)
+      )
+      this.service.removeCharacteristic(this.service.getCharacteristic(this.eveChar.ResetTotal))
+      this.service.removeCharacteristic(this.service.getCharacteristic(this.hapChar.OutletInUse))
     }
 
     // Output the customised options to the log if in debug mode
     if (platform.config.debug) {
       const opts = JSON.stringify({
-        disableDeviceLogging: this.disableDeviceLogging,
-        inUsePowerThreshold: this.inUsePowerThreshold
+        disableDeviceLogging: this.disableDeviceLogging
       })
       this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
     }
@@ -161,12 +78,6 @@ module.exports = class deviceOutletSingle {
         switch: newValue
       })
       this.cacheState = newValue
-      if (this.hasReadings && !value) {
-        this.service.updateCharacteristic(this.hapChar.OutletInUse, false)
-        this.service.updateCharacteristic(this.eveChar.CurrentConsumption, 0)
-        this.accessory.eveService.addEntry({ power: 0 })
-        this.accessory.context.energyReadings.push(0)
-      }
       if (!this.disableDeviceLogging) {
         this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
       }
@@ -179,76 +90,15 @@ module.exports = class deviceOutletSingle {
     }
   }
 
-  async internalUIUpdate () {
-    try {
-      const params = { uiActive: 60 }
-      await this.platform.sendDeviceUpdate(this.accessory, params, true)
-    } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
-    }
-  }
-
   async externalUpdate (params) {
     try {
       if (params.switch && params.switch !== this.cacheState) {
         this.service.updateCharacteristic(this.hapChar.On, params.switch === 'on')
         this.cacheState = params.switch
-        if (this.hasReadings && this.cacheState === 'off') {
-          this.service.updateCharacteristic(this.hapChar.OutletInUse, false)
-          this.service.updateCharacteristic(this.eveChar.CurrentConsumption, 0)
-          this.accessory.eveService.addEntry({ power: 0 })
-          this.accessory.context.energyReadings.push(0)
-        }
         if (params.updateSource && !this.disableDeviceLogging) {
           this.log('[%s] %s [%s].', this.name, this.lang.curState, params.switch)
         }
       }
-      if (!this.hasReadings) {
-        return
-      }
-      let logger = false
-      if (this.funcs.hasProperty(params, 'power')) {
-        const power = parseFloat(params.power)
-        this.service.updateCharacteristic(
-          this.hapChar.OutletInUse,
-          this.cacheState === 'on' && power > this.inUsePowerThreshold
-        )
-        this.service.updateCharacteristic(this.eveChar.CurrentConsumption, power)
-        this.accessory.eveService.addEntry({
-          power: this.cacheState === 'on' ? power : 0
-        })
-        this.accessory.context.energyReadings.push(power)
-        logger = true
-      }
-      if (this.funcs.hasProperty(params, 'voltage')) {
-        this.service.updateCharacteristic(
-          this.eveChar.Voltage,
-          parseFloat(params.voltage)
-        )
-        logger = true
-      }
-      if (this.funcs.hasProperty(params, 'current')) {
-        this.service.updateCharacteristic(
-          this.eveChar.ElectricCurrent,
-          parseFloat(params.current)
-        )
-        logger = true
-      }
-      if (params.updateSource && logger && !this.disableDeviceLogging) {
-        this.log(
-          '[%s] %s%s%s.',
-          this.name,
-          this.funcs.hasProperty(params, 'power')
-            ? ' ' + this.lang.curPower + ' [' + params.power + 'W]'
-            : '',
-          this.funcs.hasProperty(params, 'voltage')
-            ? ' ' + this.lang.curVolt + ' [' + params.voltage + 'V]'
-            : '',
-          this.funcs.hasProperty(params, 'current')
-            ? ' ' + this.lang.curCurr + ' [' + params.current + 'A]'
-            : ''
-        )
-      }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
diff --git a/lib/index.js b/lib/index.js
index b5392246..26d82b52 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -883,22 +883,16 @@ class eWeLinkPlatform {
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/sensor-temp-humi'))(this, accessory)
         /************************/
-      } else if (
-        this.consts.devices.outlet.includes(uiid) ||
-        (
-          this.consts.devices.singleSwitch.includes(uiid) &&
-          this.consts.devices.singleSwitchOutlet.includes(device.productModel)
-        )
-      ) {
-        /******
-        OUTLETS
-        ******/
+      } else if (this.consts.devices.outlet.includes(uiid)) {
+        /****************************
+        OUTLETS [WITH POWER READINGS]
+        ****************************/
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = this.outletDevices[device.deviceid] &&
           this.outletDevices[device.deviceid].showAsSwitch
           ? new (require('./device/switch-single'))(this, accessory)
-          : new (require('./device/outlet-single'))(this, accessory)
-        /*****/
+          : new (require('./device/outlet-power'))(this, accessory)
+        /***************************/
       } else if (this.consts.devices.outletSCM.includes(uiid)) {
         /*************************************
         OUTLETS [SINGLE BUT MULTIPLE HARDWARE]
@@ -906,6 +900,16 @@ class eWeLinkPlatform {
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/outlet-scm'))(this, accessory)
         /************************************/
+      } else if (this.consts.devices.singleSwitchOutlet.includes(device.productModel)) {
+        /******
+        OUTLETS
+        ******/
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
+        accessory.control = this.outletDevices[device.deviceid] &&
+          this.outletDevices[device.deviceid].showAsSwitch
+          ? new (require('./device/switch-single'))(this, accessory)
+          : new (require('./device/outlet-single'))(this, accessory)
+        /*****/
       } else if (this.consts.devices.lightRGB.includes(uiid)) {
         /***********
         LIGHTS [RGB]

From fea888e417a8b046c6fef2383ba3680336167e6b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 11 May 2021 14:21:47 +0100
Subject: [PATCH 2102/3183] line lengths

---
 lib/utils/eve-chars.js | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/lib/utils/eve-chars.js b/lib/utils/eve-chars.js
index 0e882655..526e8d67 100644
--- a/lib/utils/eve-chars.js
+++ b/lib/utils/eve-chars.js
@@ -71,11 +71,7 @@ module.exports = class eveCharacteristics {
       this.setProps({
         format: self.hapChar.Formats.UINT32,
         unit: self.hapChar.Units.seconds,
-        perms: [
-          self.hapChar.Perms.READ,
-          self.hapChar.Perms.NOTIFY,
-          self.hapChar.Perms.WRITE
-        ]
+        perms: [self.hapChar.Perms.READ, self.hapChar.Perms.NOTIFY, self.hapChar.Perms.WRITE]
       })
       this.value = this.getDefaultValue()
     }
@@ -93,11 +89,7 @@ module.exports = class eveCharacteristics {
       this.setProps({
         format: self.hapChar.Formats.UINT32,
         unit: self.hapChar.Units.SECONDS,
-        perms: [
-          self.hapChar.Perms.READ,
-          self.hapChar.Perms.NOTIFY,
-          self.hapChar.Perms.WRITE
-        ]
+        perms: [self.hapChar.Perms.READ, self.hapChar.Perms.NOTIFY, self.hapChar.Perms.WRITE]
       })
       this.value = this.getDefaultValue()
     }
@@ -106,11 +98,7 @@ module.exports = class eveCharacteristics {
       this.setProps({
         format: self.hapChar.Formats.UINT32,
         unit: self.hapChar.Units.SECONDS,
-        perms: [
-          self.hapChar.Perms.READ,
-          self.hapChar.Perms.NOTIFY,
-          self.hapChar.Perms.WRITE
-        ]
+        perms: [self.hapChar.Perms.READ, self.hapChar.Perms.NOTIFY, self.hapChar.Perms.WRITE]
       })
       this.value = this.getDefaultValue()
     }

From adcd2a12462534de035f3887ce7f27cae9780737 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Tue, 11 May 2021 14:27:38 +0100
Subject: [PATCH 2103/3183] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 8c299192..808394e3 100644
--- a/README.md
+++ b/README.md
@@ -27,7 +27,7 @@ Homebridge plugin to control eWeLink devices
 
 ### Prerequisites
 * To use this plugin, you will need to already have [Homebridge](https://homebridge.io) (at least v1.3.3) or [HOOBS](https://hoobs.org) (at least v3.3.4) installed. Please refer to the links for more information and installation instructions.
-* It is recommended to use the current LTS version of Node, currently v14, however Node v10 and v12 are also supported.
+* It is recommended to use the current LTS version of Node, currently v14, however Node v12 is also supported.
 
 ### Setup
 * [Installation](https://github.com/bwp91/homebridge-ewelink/wiki/Installation)

From 5b676e16322795e86c51e2c31c0974ed32cf5a58 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 11 May 2021 15:01:04 +0100
Subject: [PATCH 2104/3183] correct lang property typo

---
 lib/index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/index.js b/lib/index.js
index 26d82b52..682680ee 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -56,7 +56,7 @@ class eWeLinkPlatform {
 
       // Make sure user is running Homebridge v1.3 or above
       if (!api.versionGreaterOrEqual || !api.versionGreaterOrEqual('1.3.0')) {
-        throw new Error(this.lang.hbVerionFail)
+        throw new Error(this.lang.hbVersionFail)
       }
 
       // Check the user has configured the plugin
@@ -74,7 +74,7 @@ class eWeLinkPlatform {
     } catch (err) {
       // Catch any errors during initialisation
       const hideErrLines = [
-        this.lang.hbVerionFail,
+        this.lang.hbVersionFail,
         this.lang.missingCreds,
         this.lang.missingPW,
         this.lang.missingUN

From b2891ebdf1f0bdd10f7a97eadb9e04023496abf7 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 12 May 2021 09:13:10 +0100
Subject: [PATCH 2105/3183] use prettier code style

---
 .prettierignore | 2 ++
 package.json    | 3 +++
 2 files changed, 5 insertions(+)
 create mode 100644 .prettierignore

diff --git a/.prettierignore b/.prettierignore
new file mode 100644
index 00000000..8b42361c
--- /dev/null
+++ b/.prettierignore
@@ -0,0 +1,2 @@
+.github/
+.nova
\ No newline at end of file
diff --git a/package.json b/package.json
index 92ba05df..fde639ee 100644
--- a/package.json
+++ b/package.json
@@ -54,5 +54,8 @@
     "p-queue": "^6.6.2",
     "websocket-as-promised": "^2.0.1",
     "ws": "^7.4.5"
+  },
+  "prettier": {
+    "printWidth": 100
   }
 }

From e5b5168e77d1e1f97ed9ffece2ec9b5c8d45ca11 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 12 May 2021 09:14:36 +0100
Subject: [PATCH 2106/3183] prettier formatted code

---
 CHANGELOG.md                              | 484 +++++++++++-----------
 README.md                                 |  73 ++--
 config.schema.json                        | 320 +++++++-------
 lib/connection/api.js                     |  13 +-
 lib/connection/http.js                    |  33 +-
 lib/connection/lan.js                     |  41 +-
 lib/connection/ws.js                      |  44 +-
 lib/device/curtain.js                     |  23 +-
 lib/device/diffuser.js                    |  88 ++--
 lib/device/fan.js                         |  22 +-
 lib/device/humidifier.js                  |  41 +-
 lib/device/light-cct.js                   |  83 ++--
 lib/device/light-dimmer.js                |  24 +-
 lib/device/light-rgb-cct.js               | 119 ++----
 lib/device/light-rgb.js                   |  39 +-
 lib/device/motor.js                       |  33 +-
 lib/device/outlet-double.js               |  59 +--
 lib/device/outlet-multi.js                |  50 +--
 lib/device/outlet-power.js                |  18 +-
 lib/device/outlet-scm.js                  |  13 +-
 lib/device/outlet-single.js               |  10 +-
 lib/device/rf-bridge.js                   |  45 +-
 lib/device/sensor-ambient.js              |  44 +-
 lib/device/sensor-contact.js              |  41 +-
 lib/device/sensor-temp-humi.js            |  28 +-
 lib/device/simulation/blind.js            |  27 +-
 lib/device/simulation/door.js             |  27 +-
 lib/device/simulation/garage-eachen.js    |  17 +-
 lib/device/simulation/garage-four.js      |  33 +-
 lib/device/simulation/garage-od-switch.js |  14 +-
 lib/device/simulation/garage-one.js       |  26 +-
 lib/device/simulation/garage-two.js       |  46 +-
 lib/device/simulation/lock-one.js         |  27 +-
 lib/device/simulation/sensor-leak.js      |  23 +-
 lib/device/simulation/switch-valve.js     |  23 +-
 lib/device/simulation/tap-one.js          |  20 +-
 lib/device/simulation/thermostat.js       |  59 ++-
 lib/device/simulation/valve-four.js       |  16 +-
 lib/device/simulation/valve-one.js        |  16 +-
 lib/device/simulation/valve-two.js        |  16 +-
 lib/device/simulation/window.js           |  27 +-
 lib/device/switch-double.js               |  46 +-
 lib/device/switch-multi.js                |  46 +-
 lib/device/switch-single.js               |  14 +-
 lib/device/thermostat.js                  |  56 ++-
 lib/device/zigbee/light-cct.js            |  60 +--
 lib/device/zigbee/light-dimmer.js         |  27 +-
 lib/device/zigbee/sensor-ambient.js       |  48 +--
 lib/device/zigbee/sensor-contact.js       |  41 +-
 lib/device/zigbee/sensor-motion.js        |  41 +-
 lib/device/zigbee/switch-single.js        |  21 +-
 lib/device/zigbee/switch-stateless.js     |  39 +-
 lib/fakegato/fakegato-history.js          | 112 +++--
 lib/fakegato/fakegato-storage.js          |  32 +-
 lib/fakegato/fakegato-timer.js            |   4 +-
 lib/fakegato/uuid.js                      |   2 +-
 lib/homebridge-ui/public/index.html       | 201 +++++++--
 lib/homebridge-ui/server.js               |   2 +-
 lib/index.js                              | 191 ++++-----
 lib/utils/colour-utils.js                 |   6 +-
 lib/utils/constants.js                    | 122 +++++-
 lib/utils/functions.js                    |   5 +-
 62 files changed, 1734 insertions(+), 1587 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 40fd2434..2c7aec8f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,530 +6,530 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 ### Added
 
-* Log internal API requests when in debug mode
-* Support querying temperature and humidity values via the internal API
+- Log internal API requests when in debug mode
+- Support querying temperature and humidity values via the internal API
 
 ### Changes
 
-* Removed `encodedPassword` and `language` config options
-  * The plugin will now initially try the supplied password and if incorrect will attempt another login with a base64 decoded version
-  * Language option unnecessary until if and when other languages are available
-* Display temperature and humidity units for the zigbee temperature/humidity sensor in the logs
-* Fixes an issue where the web socket would not close on plugin shutdown
-* Reduce the 'No Response' timeout to 2 seconds
-* Update the correct corresponding characteristic after the 'No Response' timeout
-* Ensure user is using at least Homebridge v1.3.0
-* Update homebridge-ui wiki links to match github readme file
+- Removed `encodedPassword` and `language` config options
+  - The plugin will now initially try the supplied password and if incorrect will attempt another login with a base64 decoded version
+  - Language option unnecessary until if and when other languages are available
+- Display temperature and humidity units for the zigbee temperature/humidity sensor in the logs
+- Fixes an issue where the web socket would not close on plugin shutdown
+- Reduce the 'No Response' timeout to 2 seconds
+- Update the correct corresponding characteristic after the 'No Response' timeout
+- Ensure user is using at least Homebridge v1.3.0
+- Update homebridge-ui wiki links to match github readme file
 
 ## 6.5.1 (2021-05-07)
 
 ### Changes
 
-* Fixes an initialisation issue with the 'garage' and 'obstruction detection' switch simulations
-* Amendments to internal API endpoints
-* Device IP changes will now reflect correctly
+- Fixes an initialisation issue with the 'garage' and 'obstruction detection' switch simulations
+- Amendments to internal API endpoints
+- Device IP changes will now reflect correctly
 
 ## 6.5.0 (2021-05-06)
 
 ### Added
 
-* Internal HTTP API to query/control the state of certain homebridge-ewelink accessories
-  * Options for new configuration setting `apiPort` are:
-    * `0` to disable the API (default setting)
-    * `1` to enable the API with a random available port (port will be shown in the log)
-    * Any higher integer to enable the API on this fixed port
-  * Documentation for the API can be seen at the base url (Homebridge IP + API port)
+- Internal HTTP API to query/control the state of certain homebridge-ewelink accessories
+  - Options for new configuration setting `apiPort` are:
+    - `0` to disable the API (default setting)
+    - `1` to enable the API with a random available port (port will be shown in the log)
+    - Any higher integer to enable the API on this fixed port
+  - Documentation for the API can be seen at the base url (Homebridge IP + API port)
 
 ## 6.4.0 (2021-05-04)
 
 ### Added
 
-* Power, voltage and current readings for DUALR3 when exposed as outlets
-* RF Bridge remote buttons will turn on for 3 seconds in HomeKit when pressed
-* Link a Zigbee contact sensor to a single garage door to report the garage door state
-* Set a temperature offset for the Zigbee temperature/humidity sensor
-* Configuration options to manually set account http host and country code [#249](https://github.com/bwp91/homebridge-ewelink/pull/249)
+- Power, voltage and current readings for DUALR3 when exposed as outlets
+- RF Bridge remote buttons will turn on for 3 seconds in HomeKit when pressed
+- Link a Zigbee contact sensor to a single garage door to report the garage door state
+- Set a temperature offset for the Zigbee temperature/humidity sensor
+- Configuration options to manually set account http host and country code [#249](https://github.com/bwp91/homebridge-ewelink/pull/249)
 
 ### Changes
 
-* Change Sonoff POWR2/S31 polling interval to a fixed 60 seconds
-* iFan speed will now log as {low, medium, high}
-* Remove 'Outlet In Use' characteristics for outlets that don't support power readings
-* Remove Eve power characteristics for outlets that don't support power readings
-* More language strings added to separate language file
-* Accessory 'identify' function will now add an entry to the log
-* Backend refactoring, function and variable name changes
+- Change Sonoff POWR2/S31 polling interval to a fixed 60 seconds
+- iFan speed will now log as {low, medium, high}
+- Remove 'Outlet In Use' characteristics for outlets that don't support power readings
+- Remove Eve power characteristics for outlets that don't support power readings
+- More language strings added to separate language file
+- Accessory 'identify' function will now add an entry to the log
+- Backend refactoring, function and variable name changes
 
 ## 6.3.0 (2021-04-28)
 
 ### Added
 
-* Support DUALR3 motor mode (as a *WindowCovering* service)
+- Support DUALR3 motor mode (as a _WindowCovering_ service)
 
 ### Changes
 
-* Remove old *Switch* services from DUALR3 when in motor mode
-* iFan devices now use caching to avoid unnecessary duplicate updates
-* Increase ws timeout from 5 to 6 seconds
-* Decrease lan-only timeout from 10 to 9 seconds
+- Remove old _Switch_ services from DUALR3 when in motor mode
+- iFan devices now use caching to avoid unnecessary duplicate updates
+- Increase ws timeout from 5 to 6 seconds
+- Decrease lan-only timeout from 10 to 9 seconds
 
 ## 6.2.2 (2021-04-27)
 
 ### Changes
 
-* Adjust iFan speed thresholds (now 0% is off, 1-33% is low, 34-66% is medium and 67-100% is high)
-* Changed commands for multi-channel devices to only update desired channel (not all channels)
-* Pause Adaptive Lighting if device is offline
-* Automatically retry eWeLink login on startup in case of certain error codes
-* Update package description (remove 'with original firmware' as this is redundant for eWeLink devices)
+- Adjust iFan speed thresholds (now 0% is off, 1-33% is low, 34-66% is medium and 67-100% is high)
+- Changed commands for multi-channel devices to only update desired channel (not all channels)
+- Pause Adaptive Lighting if device is offline
+- Automatically retry eWeLink login on startup in case of certain error codes
+- Update package description (remove 'with original firmware' as this is redundant for eWeLink devices)
 
 ## 6.2.1 (2021-04-18)
 
 ### Changes
 
-* Trim new lines and spaces from password when decoded from base64
-* Updated dependencies (`ws`)
+- Trim new lines and spaces from password when decoded from base64
+- Updated dependencies (`ws`)
 
 ## 6.2.0 (2021-04-16)
 
 ### Added
 
-* LAN mode for Sonoff RF Bridge
+- LAN mode for Sonoff RF Bridge
 
 ### Changes
 
-* Fix characteristic NaN warning for `LastActivation`
-* More compact logging for eWeLink 504 error
-* Remove online/offline status for Zigbee sensor devices
-* Recover accessories from the cache using the UUID
-* Reduce WS timeout to 5 seconds to reduce cases of `was slow to respond` HB warning
-* Update wiki links in the Homebridge plugin-ui
+- Fix characteristic NaN warning for `LastActivation`
+- More compact logging for eWeLink 504 error
+- Remove online/offline status for Zigbee sensor devices
+- Recover accessories from the cache using the UUID
+- Reduce WS timeout to 5 seconds to reduce cases of `was slow to respond` HB warning
+- Update wiki links in the Homebridge plugin-ui
 
 ## 6.1.2 (2021-04-14)
 
 ### Changes
 
-* Remove any existing humidity sensor for TH10/16 if DS18B20 sensor is used
+- Remove any existing humidity sensor for TH10/16 if DS18B20 sensor is used
 
 ## 6.1.1 (2021-04-13)
 
 ### Changes
 
-* Fixed an unhandled rejection error when controlling certain CCT bulbs
+- Fixed an unhandled rejection error when controlling certain CCT bulbs
 
 ## 6.1.0 (2021-04-12)
 
 ### Added
 
-* Support for doorbell model SA-026 (can be exposed as any sensor type as per other RF sensors)
-* Updated plugin-ui 'Support' page links to match GitHub readme file
+- Support for doorbell model SA-026 (can be exposed as any sensor type as per other RF sensors)
+- Updated plugin-ui 'Support' page links to match GitHub readme file
 
 ### Changes
 
-* Improvements to RF Bridge:
-  * No more characteristic warnings for `LastActivation` for motion and contact sensors
-  * Removed logs for 'not triggered' if device has since been triggered again
-* Fixed the interval time length for calculating total energy consumption for relevant devices
+- Improvements to RF Bridge:
+  - No more characteristic warnings for `LastActivation` for motion and contact sensors
+  - Removed logs for 'not triggered' if device has since been triggered again
+- Fixed the interval time length for calculating total energy consumption for relevant devices
 
 ## 6.0.3 (2021-04-08)
 
 ### Changes
 
-* [fix] Revert 'No Response' messages for **DW2** devices as they go on and offline
+- [fix] Revert 'No Response' messages for **DW2** devices as they go on and offline
 
 ## 6.0.2 (2021-04-07)
 
 ### Changes
 
-* Revert 'No Response' messages for **DW2** devices as they go on and offline
+- Revert 'No Response' messages for **DW2** devices as they go on and offline
 
 ## 6.0.1 (2021-04-07)
 
 ### Requirements
 
-* **Homebridge Users**
-  * This plugin has a minimum requirement of Homebridge v1.3.3
+- **Homebridge Users**
 
-* **HOOBS Users**
-  * This plugin has a minimum requirement of HOOBS v3.3.4
+  - This plugin has a minimum requirement of Homebridge v1.3.3
+
+- **HOOBS Users**
+  - This plugin has a minimum requirement of HOOBS v3.3.4
 
 ### Changes
 
-* 'No Response' messages for **Zigbee and DW2** devices as they go on and offline
-* 'No Response' messages for  **all devices** if controlled and unsuccessful (and this status will be reverted after 5 seconds)
-* Use the new `.onGet`/`.onSet` methods available in Homebridge v1.3
-* Fixes a caching issue with the iFan accessory
-* Updated README to reflect minimum supported Homebridge/HOOBS and Node versions
-* Updated recommended Node to v14.16.1
-  
+- 'No Response' messages for **Zigbee and DW2** devices as they go on and offline
+- 'No Response' messages for **all devices** if controlled and unsuccessful (and this status will be reverted after 5 seconds)
+- Use the new `.onGet`/`.onSet` methods available in Homebridge v1.3
+- Fixes a caching issue with the iFan accessory
+- Updated README to reflect minimum supported Homebridge/HOOBS and Node versions
+- Updated recommended Node to v14.16.1
+
 ## 5.6.0 (2021-03-25)
 
 ### Added
 
-* Enter your eWeLink password as a base64 encoded string and use the option `encodedPassword` to let the plugin know ([#223](https://github.com/bwp91/homebridge-ewelink/issues/223))
-* Support for zigbee colour temperature lights (ewelink uiid 1258) ([#222](https://github.com/bwp91/homebridge-ewelink/issues/222)), including:
-  * Ikea Tradfri E14 600 lumen
+- Enter your eWeLink password as a base64 encoded string and use the option `encodedPassword` to let the plugin know ([#223](https://github.com/bwp91/homebridge-ewelink/issues/223))
+- Support for zigbee colour temperature lights (ewelink uiid 1258) ([#222](https://github.com/bwp91/homebridge-ewelink/issues/222)), including:
+  - Ikea Tradfri E14 600 lumen
 
 ### Changes
 
-* Improvements to web socket connection: ([#224](https://github.com/bwp91/homebridge-ewelink/issues/224))
-  * On startup, the plugin will wait to connect to the web socket before initialising devices
-  * A new web socket address will be requested if the provided address causes errors
-  * In particular this should fix the `ENOTFOUND as-pconnect4.coolkit.cc` error that some users in the Asia continent were receiving
+- Improvements to web socket connection: ([#224](https://github.com/bwp91/homebridge-ewelink/issues/224))
+  - On startup, the plugin will wait to connect to the web socket before initialising devices
+  - A new web socket address will be requested if the provided address causes errors
+  - In particular this should fix the `ENOTFOUND as-pconnect4.coolkit.cc` error that some users in the Asia continent were receiving
 
 ## 5.5.1 (2021-03-21)
 
 ### Changes
 
-* Remove the custom `minValue` for `CurrentTemperature` characteristic
-* More welcome messages
-* Updated `plugin-ui-utils` dependency
+- Remove the custom `minValue` for `CurrentTemperature` characteristic
+- More welcome messages
+- Updated `plugin-ui-utils` dependency
 
 ## 5.5.0 (2021-03-17)
 
 ### Added
 
-* Enable LAN control for the Sonoff SV
-* Log entries will show for 'uncontrollable' devices if `mode:lan` on plugin startup
-* Log entries to highlight unnecessary top-level configuration options you may have set
-* Added a note in the plugin settings about changing RF bridge sensors and its consequences
+- Enable LAN control for the Sonoff SV
+- Log entries will show for 'uncontrollable' devices if `mode:lan` on plugin startup
+- Log entries to highlight unnecessary top-level configuration options you may have set
+- Added a note in the plugin settings about changing RF bridge sensors and its consequences
 
 ### Changes
 
-* Remove country code configuration option as the plugin can determine your region automatically
-* Modified config schema to show titles/descriptions for non Homebridge UI users
-* Automatically show useful info in logs for 'yet to implement' devices
-* Updated links on plugin-ui to match GitHub wiki
-* [backend] Eve characteristics abstracted into separate file for better efficiency
+- Remove country code configuration option as the plugin can determine your region automatically
+- Modified config schema to show titles/descriptions for non Homebridge UI users
+- Automatically show useful info in logs for 'yet to implement' devices
+- Updated links on plugin-ui to match GitHub wiki
+- [backend] Eve characteristics abstracted into separate file for better efficiency
 
 ## 5.4.0 (2021-03-14)
 
 ### Added
 
-* The plugin now differentiates between LAN support for **incoming** and **outgoing** updates, allowing incoming updates for:
-  * TH10/16
-  * B02 and B05 bulbs
+- The plugin now differentiates between LAN support for **incoming** and **outgoing** updates, allowing incoming updates for:
+  - TH10/16
+  - B02 and B05 bulbs
 
 ### Changes
 
-* Attempt to fix outlet polling updates so the device reports updated info rather than the previous info.
+- Attempt to fix outlet polling updates so the device reports updated info rather than the previous info.
 
 ## 5.3.0 (2021-03-10)
 
 ### Added
 
-* Set up a polling interval for outlet devices to obtain power information on a regular basis (useful when the device doesn't automatically send frequent updates)
+- Set up a polling interval for outlet devices to obtain power information on a regular basis (useful when the device doesn't automatically send frequent updates)
 
 ### Changes
 
-* Adaptive Lighting now requires Homebridge 1.3 release
-* Garages no longer need 'dummy' contact sensor to view Eve history
-  * For this reason, the `exposeContactSensor` setting is now redundant and so has been removed
-* Outlet intervals for energy calculation and updates will stop on Homebridge shutdown
+- Adaptive Lighting now requires Homebridge 1.3 release
+- Garages no longer need 'dummy' contact sensor to view Eve history
+  - For this reason, the `exposeContactSensor` setting is now redundant and so has been removed
+- Outlet intervals for energy calculation and updates will stop on Homebridge shutdown
 
 ## 5.2.0 (2021-03-08)
 
 ### Added
 
-* **Accessory Simulations**
-  * Expose an optional contact sensor for Eachen garage devices for historical data in the Eve app
-  * Set custom minimum/maximum target temperatures for the TH10/16 thermostat simulation
+- **Accessory Simulations**
+  - Expose an optional contact sensor for Eachen garage devices for historical data in the Eve app
+  - Set custom minimum/maximum target temperatures for the TH10/16 thermostat simulation
 
 ### Changes
 
-* Specify a custom IP for the Sonoff D1
-* Show full error stack on plugin disable in debug mode
-* Fixes a `multiple callback` error with CCT bulb accessories
-* Updated dependencies
+- Specify a custom IP for the Sonoff D1
+- Show full error stack on plugin disable in debug mode
+- Fixes a `multiple callback` error with CCT bulb accessories
+- Updated dependencies
 
 ## 5.1.1 (2021-03-02)
 
 ### Changes
 
-* Fixes an issue sending LAN updates to multi-channel devices
+- Fixes an issue sending LAN updates to multi-channel devices
 
 ## 5.1.0 (2021-03-02)
 
 ### Added
 
-* **Accessory Simulations**
-  * Added `Door` service type simulation
-  * Added `Window` service type simulation
-  * [experimental] Specify different operation time for UP and DOWN for garages, blinds, doors and windows
-* **Accessories**
-  * Support for Sonoff DUALR3
-  * Support for Konesky Mosquito Killer
-  * Support for Sonoff SC (Sensor Centre)
-  * [experimental] Support for Sonoff D1 LAN control
+- **Accessory Simulations**
+  - Added `Door` service type simulation
+  - Added `Window` service type simulation
+  - [experimental] Specify different operation time for UP and DOWN for garages, blinds, doors and windows
+- **Accessories**
+  - Support for Sonoff DUALR3
+  - Support for Konesky Mosquito Killer
+  - Support for Sonoff SC (Sensor Centre)
+  - [experimental] Support for Sonoff D1 LAN control
 
 ### Changes
 
-* Less strict threshold for determining a 'significant' colour change for disabling Adaptive Lighting
+- Less strict threshold for determining a 'significant' colour change for disabling Adaptive Lighting
 
 ## 5.0.6 (2021-02-26)
 
 ### Changes
 
-* Removes the extra *Switch* service that was accidentally added to certain bulbs
+- Removes the extra _Switch_ service that was accidentally added to certain bulbs
 
 ## 5.0.5 (2021-02-25)
 
 ### Changes
 
-* Reverse the polarity of the leak sensor simulation
-  * You can expose a DW2 sensor as a leak sensor using [this guide](https://www.youtube.com/watch?v=YFu2LZfrrqs) as an Accessory Simulation
+- Reverse the polarity of the leak sensor simulation
+  - You can expose a DW2 sensor as a leak sensor using [this guide](https://www.youtube.com/watch?v=YFu2LZfrrqs) as an Accessory Simulation
 
 ## 5.0.4 (2021-02-24)
 
 ### Changes
 
-* Plugin will check that certain Accessory Simulations have been setup with the device type
-* Hide IP address field in plugin settings if plugin `mode` is set to `wan`
+- Plugin will check that certain Accessory Simulations have been setup with the device type
+- Hide IP address field in plugin settings if plugin `mode` is set to `wan`
 
 ## 5.0.3 (2021-02-24)
 
 ### Changes
 
-* Remove old *Switch* services when setting up Accessory Simulations
-* Add the type of Accessory Simulation to the logged options on restart
+- Remove old _Switch_ services when setting up Accessory Simulations
+- Add the type of Accessory Simulation to the logged options on restart
 
 ## 5.0.2 (2021-02-24)
 
 ### Changes
 
-* Fixes an issue initialising Accessory Simulation Lock devices
+- Fixes an issue initialising Accessory Simulation Lock devices
 
 ## 5.0.1 (2021-02-24)
 
 ### Changes
 
-* Fixes an issue initialising Contact Sensor devices
+- Fixes an issue initialising Contact Sensor devices
 
 ## 5.0.0 (2021-02-24)
 
-* ⚠️ This release includes an overhaul of the settings in particular to specific device configuration
-* The following options have been replaced:
-  * `hideChanFromHB`, `switchAsOutlet`, `outletAsSwitch`, `inUsePowerThreshold`, `hideLightFromFan`, `hideSwitchFromTH`, `thAsThermostat`, `resetRFBridge`, `lowBattThreshold`, `sensorTimeDifference`, `bulbB02BA60`, `bulbB02FST64`, `thTempOffset`, `hideZBLDPress`, `ZBDWBatt`, `ipOverride`
-* If you use any of the above options then please take some time to review the changes after updating the plugin
-* Detailed information about the changes can be seen [here](https://gist.github.com/bwp91/e87d9d3eb0e5dbc08e9ae7b31e33366e)
-
+- ⚠️ This release includes an overhaul of the settings in particular to specific device configuration
+- The following options have been replaced:
+  - `hideChanFromHB`, `switchAsOutlet`, `outletAsSwitch`, `inUsePowerThreshold`, `hideLightFromFan`, `hideSwitchFromTH`, `thAsThermostat`, `resetRFBridge`, `lowBattThreshold`, `sensorTimeDifference`, `bulbB02BA60`, `bulbB02FST64`, `thTempOffset`, `hideZBLDPress`, `ZBDWBatt`, `ipOverride`
+- If you use any of the above options then please take some time to review the changes after updating the plugin
+- Detailed information about the changes can be seen [here](https://gist.github.com/bwp91/e87d9d3eb0e5dbc08e9ae7b31e33366e)
 
 ### Added
 
-* **Configuration**
-  * The ability to explicitly enable device logging per device if you have `disableDeviceLogging` set to true
-  * A `label` setting per device group which has no effect except to help identify the device when editing the configuration
-  * New `brightnessStep` option to specify a minimum brightness step in the Home app per dimmer/bulb/LED strip
-  * New `adaptiveLightingShift` option to offset the Adaptive Lighting values per bulb
-  * `showAsOutlet` option extended multi-channel switch and light switch devices to expose them as outlets
-* **Accessories**
-  * Enhanced Eve information available for contact sensors:
-    * DW2
-    * Zigbee Contact Sensor
-* **Accessory Simulations**
-  * Expose a DW2 contact sensor as a leak sensor
-  * Sub-accessories will be removed automatically when setting up a new Accessory Simulation
-* **Homebridge Plugin UI**
-  * 'My Devices' shows a red/green icon on the to show device WAN/LAN reachability
-  * 'My Devices' shows the firmware version for your device
-* **New Devices**
-  * Support for eWeLink switch uiid 81, 82, 83, 84 and 107 device types
-  * Support for the 'Sonoff Hum' humidifier device (on/off and mode)
-
-### Changes
-
-* New plugin configuration format - [more info](https://gist.github.com/bwp91/e87d9d3eb0e5dbc08e9ae7b31e33366e)
-* Device firmware version will now show correctly in HomeKit apps
-* Fixes a characteristic warning for *MotionDetected* for Zigbee Motion Sensors
-* Information about error 406 added to the logs in the form of a link (shown when error is received)
-* Updated minimum Node to v14.16.0
+- **Configuration**
+  - The ability to explicitly enable device logging per device if you have `disableDeviceLogging` set to true
+  - A `label` setting per device group which has no effect except to help identify the device when editing the configuration
+  - New `brightnessStep` option to specify a minimum brightness step in the Home app per dimmer/bulb/LED strip
+  - New `adaptiveLightingShift` option to offset the Adaptive Lighting values per bulb
+  - `showAsOutlet` option extended multi-channel switch and light switch devices to expose them as outlets
+- **Accessories**
+  - Enhanced Eve information available for contact sensors:
+    - DW2
+    - Zigbee Contact Sensor
+- **Accessory Simulations**
+  - Expose a DW2 contact sensor as a leak sensor
+  - Sub-accessories will be removed automatically when setting up a new Accessory Simulation
+- **Homebridge Plugin UI**
+  - 'My Devices' shows a red/green icon on the to show device WAN/LAN reachability
+  - 'My Devices' shows the firmware version for your device
+- **New Devices**
+  - Support for eWeLink switch uiid 81, 82, 83, 84 and 107 device types
+  - Support for the 'Sonoff Hum' humidifier device (on/off and mode)
+
+### Changes
+
+- New plugin configuration format - [more info](https://gist.github.com/bwp91/e87d9d3eb0e5dbc08e9ae7b31e33366e)
+- Device firmware version will now show correctly in HomeKit apps
+- Fixes a characteristic warning for _MotionDetected_ for Zigbee Motion Sensors
+- Information about error 406 added to the logs in the form of a link (shown when error is received)
+- Updated minimum Node to v14.16.0
 
 ## 4.7.6 (2021-02-17)
 
 ### Changes
 
-* Fixes an issue with the DW2 detecting garage door states
+- Fixes an issue with the DW2 detecting garage door states
 
 ## 4.7.5 (2021-02-15)
 
 ### Changes
 
-* Fixes an issue with the DW2 detecting garage door states
+- Fixes an issue with the DW2 detecting garage door states
 
 ## 4.7.4 (2021-02-15)
 
 ### Changes
 
-* Fixes an issue when using custom RF sensors
+- Fixes an issue when using custom RF sensors
 
 ## 4.7.3 (2021-02-13)
 
 ### Changes
 
-* Hide WS messages that have no useful information about a device
-* Thermostat accessory simulation will now setup after a small delay to let the accessory initialise first
-* Thermostat device will now suggest changing temperature scale from F to C in the eWeLink app
-* Changes to colour conversion:
-  * Lighter colours appear brighter
-  * Solid red is now easier to obtain via the Home app
+- Hide WS messages that have no useful information about a device
+- Thermostat accessory simulation will now setup after a small delay to let the accessory initialise first
+- Thermostat device will now suggest changing temperature scale from F to C in the eWeLink app
+- Changes to colour conversion:
+  - Lighter colours appear brighter
+  - Solid red is now easier to obtain via the Home app
 
 ## 4.7.2 (2021-02-12)
 
 ### Changes
 
-* Fixes a bug where config items separated by a comma weren't adhered to properly
-* Stop subsequent warning messages if a device fails to initialise
+- Fixes a bug where config items separated by a comma weren't adhered to properly
+- Stop subsequent warning messages if a device fails to initialise
 
 ## 4.7.1 (2021-02-11)
 
 ### Changes
 
-* The 'auto' and 'cool' modes will now be hidden for thermostat devices in the Eve app
-* Fixed a bug when initialising lock accessory simulations
-* Added a 10 second timeout when sending web socket messages
-* Updated dependencies:
-  * `websocket-as-promised` to v2.0.1
-* Fakegato library formatting and simplification
+- The 'auto' and 'cool' modes will now be hidden for thermostat devices in the Eve app
+- Fixed a bug when initialising lock accessory simulations
+- Added a 10 second timeout when sending web socket messages
+- Updated dependencies:
+  - `websocket-as-promised` to v2.0.1
+- Fakegato library formatting and simplification
 
 ## 4.7.0 (2021-02-10)
 
 ### Added
 
-* Support for the [eWeLink thermostat](https://ewelinkcommunity.net/device-lists/heating/kkmoon-hc-t010-ewf/) device type
-* A queue for device updates to improve reliability, this also results in:
-  * Faster device updates for colour bulbs and diffusers
-* Configuration checks to highlight in the logs any unnecessary or incorrectly formatted settings you have
-* Added a note in the plugin UI when adding an Accessory Simulation that the accessory will need to be removed from the cache
-* Links to 'Configuration' and 'Uninstall' wiki pages in the plugin-ui
-
-### Changes
-
-* ⚠️ `ignoredDevices` configuration option is now an array not a string - [see details](https://gist.github.com/bwp91/90db67d578a8206c5a98a3447839f9e5)
-* ⚠️ Removed `nameOverride` configuration option - the plugin can now obtain channel names from eWeLink
-* ⚠️ Removed `resetRFBridge` option - the same usage can be achieved with `ignoredDevices`
-* Reinstated `ipOverride` into the Homebridge plugin UI screen
-* Improved colour temperature conversion for L1 and L1 Lite devices
-* Fixed a bug where Adaptive Lighting would not be disabled if the colour was changed from the eWeLink app
-* Fixed an issue with the 'Lock' Accessory Simulation where the status would never update as 'Unlocked'
-* HTTP error codes will be displayed in the logs if and when the plugin re-attempts the connection
-* Error messages refactored to show the most useful information
-* [Backend] Major code refactoring
-* [Backend] Code comments
-* Updated minimum Node to v14.15.5
-* Updated minimum Homebridge to v1.1.7
-* Updated dependencies
+- Support for the [eWeLink thermostat](https://ewelinkcommunity.net/device-lists/heating/kkmoon-hc-t010-ewf/) device type
+- A queue for device updates to improve reliability, this also results in:
+  - Faster device updates for colour bulbs and diffusers
+- Configuration checks to highlight in the logs any unnecessary or incorrectly formatted settings you have
+- Added a note in the plugin UI when adding an Accessory Simulation that the accessory will need to be removed from the cache
+- Links to 'Configuration' and 'Uninstall' wiki pages in the plugin-ui
+
+### Changes
+
+- ⚠️ `ignoredDevices` configuration option is now an array not a string - [see details](https://gist.github.com/bwp91/90db67d578a8206c5a98a3447839f9e5)
+- ⚠️ Removed `nameOverride` configuration option - the plugin can now obtain channel names from eWeLink
+- ⚠️ Removed `resetRFBridge` option - the same usage can be achieved with `ignoredDevices`
+- Reinstated `ipOverride` into the Homebridge plugin UI screen
+- Improved colour temperature conversion for L1 and L1 Lite devices
+- Fixed a bug where Adaptive Lighting would not be disabled if the colour was changed from the eWeLink app
+- Fixed an issue with the 'Lock' Accessory Simulation where the status would never update as 'Unlocked'
+- HTTP error codes will be displayed in the logs if and when the plugin re-attempts the connection
+- Error messages refactored to show the most useful information
+- [Backend] Major code refactoring
+- [Backend] Code comments
+- Updated minimum Node to v14.15.5
+- Updated minimum Homebridge to v1.1.7
+- Updated dependencies
 
 ## 4.6.1 (2021-02-02)
 
 ### Changes
 
-* Extra debug logging for WS reconnection status
-* Updated `ws` dependency to v7.4.3
+- Extra debug logging for WS reconnection status
+- Updated `ws` dependency to v7.4.3
 
 ## 4.6.0 (2021-01-30)
 
 ### New
 
-* **[Experimental]** Use a TH10/16 device as a thermostat using an Accessory Simulation [more info](https://github.com/bwp91/homebridge-ewelink/issues/161#issuecomment-770230157)
-* Support for the Zigbee type white bulb
+- **[Experimental]** Use a TH10/16 device as a thermostat using an Accessory Simulation [more info](https://github.com/bwp91/homebridge-ewelink/issues/161#issuecomment-770230157)
+- Support for the Zigbee type white bulb
 
 ### Changes
 
-* Updated plugin-ui-utils dep and use new method to get cached accessories
-* Increase the timeout for LAN control to 10 seconds for LAN only settings
-* Show LAN update errors in the log
+- Updated plugin-ui-utils dep and use new method to get cached accessories
+- Increase the timeout for LAN control to 10 seconds for LAN only settings
+- Show LAN update errors in the log
 
 ## 4.5.1 (2021-01-28)
 
 ### Changes
 
-* Set the switch as the primary service of a TH10/16 device
-* Only show the line in error logs if it exists (no more `[line undefined]`)
-* Fixes an issue where RF sensors would not use a custom defined type (again!)
+- Set the switch as the primary service of a TH10/16 device
+- Only show the line in error logs if it exists (no more `[line undefined]`)
+- Fixes an issue where RF sensors would not use a custom defined type (again!)
 
 ## 4.5.0 (2021-01-28)
 
 ### New
 
-* Use a switch to control the `Obstruction Detected` feature of a garage door
+- Use a switch to control the `Obstruction Detected` feature of a garage door
 
 ### Changes
 
-* Fix for TH10/16 devices when the HomeKit switch would show the state of 'auto' mode
-* Fix for TH10/16 devices (shown as thermostat) where the plugin would not show the current state of the device
-* Fix for the display of watts/amps/volts for outlets that support this
-* More consistent and clearer error logging
+- Fix for TH10/16 devices when the HomeKit switch would show the state of 'auto' mode
+- Fix for TH10/16 devices (shown as thermostat) where the plugin would not show the current state of the device
+- Fix for the display of watts/amps/volts for outlets that support this
+- More consistent and clearer error logging
 
 ## 4.4.5 (2021-01-24)
 
 ### Changes
 
-* Fix where the battery for DW2 device would not update
+- Fix where the battery for DW2 device would not update
 
 ## 4.4.4 (2021-01-24)
 
 ### Changes
 
-* Backend - better handling of errors
+- Backend - better handling of errors
 
 ## 4.4.3 (2021-01-20)
 
 ### Changes
 
-* Fixes an issue where RF sensors would not use a custom defined type
+- Fixes an issue where RF sensors would not use a custom defined type
 
 ## 4.4.2 (2021-01-20)
 
 ### Changes
 
-* Fixes an issue when adding new RF bridge devices
-* Minimum Homebridge beta needed for Adaptive Lighting bumped to beta-46
+- Fixes an issue when adding new RF bridge devices
+- Minimum Homebridge beta needed for Adaptive Lighting bumped to beta-46
 
 ## 4.4.1 (2021-01-20)
 
 ### Changes
 
-* Fakegato logging disabled in Homebridge `debug` mode, can be explicitly enabled with `debugFakegato`
+- Fakegato logging disabled in Homebridge `debug` mode, can be explicitly enabled with `debugFakegato`
 
 ## 4.4.0 (2021-01-14)
 
 ### ⚠️ Breaking Changes
 
-* **Accessory Simulations** - if use the following:
-  * 1 Lock
-  * 1 Tap/Faucet
-  * 1 Valve
-* you will need to update your configuration with the Device Setup field (via Homebridge UI) or adding the line `"setup": "oneSwitch"` directly to your configuration file in the groups section
+- **Accessory Simulations** - if use the following:
+  - 1 Lock
+  - 1 Tap/Faucet
+  - 1 Valve
+- you will need to update your configuration with the Device Setup field (via Homebridge UI) or adding the line `"setup": "oneSwitch"` directly to your configuration file in the groups section
 
 ### New
 
-* Single Accessory Simulations for multi-channel devices (e.g. 1 valve using a Sonoff 4CH)
-* `operationTime` for Accessory Simulations will now be validated and increased to 20 if less than 20 or an invalid number
+- Single Accessory Simulations for multi-channel devices (e.g. 1 valve using a Sonoff 4CH)
+- `operationTime` for Accessory Simulations will now be validated and increased to 20 if less than 20 or an invalid number
 
 ### Changes
 
-* Changes to plugin now in CHANGELOG.md
-* Removed `Obstruction Detected` tests
+- Changes to plugin now in CHANGELOG.md
+- Removed `Obstruction Detected` tests
 
 ## 4.3.0 (2021-01-12)
 
 ### ⚠️ Breaking Changes
 
-* `hideDevFromHB` config option renamed to `ignoredDevices`
-  * After installing this update any hidden devices may reappear in Homebridge. Please edit your configuration directly, changing `hideDevFromHB` to `ignoredDevices`. The devices will be removed upon Homebridge restart.
+- `hideDevFromHB` config option renamed to `ignoredDevices`
+  - After installing this update any hidden devices may reappear in Homebridge. Please edit your configuration directly, changing `hideDevFromHB` to `ignoredDevices`. The devices will be removed upon Homebridge restart.
 
 ### New
 
-* New Accessory Simulations:
-  * 2 Taps/Faucets using a multi-channel device
-  * 4 Irrigation Valves using a multi-channel device #182 
-* New `disableDeviceLogging` config option to hide device state logging #183 
+- New Accessory Simulations:
+  - 2 Taps/Faucets using a multi-channel device
+  - 4 Irrigation Valves using a multi-channel device #182
+- New `disableDeviceLogging` config option to hide device state logging #183
 
 ### Changes
 
-* Minimum `operationTime` for associated Accessory Simulations increased to 20 (2 seconds)
-* Removal of maximum values on plugin settings screen for all `number` types
-* Changes to startup log messages
-* Adaptive lighting minimum Homebridge beta version is now beta-42
-* Backend code changes
-* Updated dependencies
+- Minimum `operationTime` for associated Accessory Simulations increased to 20 (2 seconds)
+- Removal of maximum values on plugin settings screen for all `number` types
+- Changes to startup log messages
+- Adaptive lighting minimum Homebridge beta version is now beta-42
+- Backend code changes
+- Updated dependencies
diff --git a/README.md b/README.md
index 808394e3..71178f1e 100644
--- a/README.md
+++ b/README.md
@@ -3,62 +3,67 @@
 </p>
 <span align="center">
   
-# homebridge-ewelink 
+# homebridge-ewelink
 
 Homebridge plugin to control eWeLink devices
 
 [![verified-by-homebridge](https://badgen.net/badge/homebridge/verified/purple)](https://github.com/homebridge/homebridge/wiki/Verified-Plugins)
-[![hoobs-certified](https://badgen.net/badge/HOOBS/certified/yellow)](https://plugins.hoobs.org/plugin/homebridge-ewelink)   
+[![hoobs-certified](https://badgen.net/badge/HOOBS/certified/yellow)](https://plugins.hoobs.org/plugin/homebridge-ewelink)  
 [![npm](https://img.shields.io/npm/v/homebridge-ewelink/latest?label=latest)](https://www.npmjs.com/package/homebridge-ewelink)
-[![npm](https://img.shields.io/npm/v/homebridge-ewelink/beta?label=beta)](https://github.com/bwp91/homebridge-ewelink/wiki/Beta-Version)   
+[![npm](https://img.shields.io/npm/v/homebridge-ewelink/beta?label=beta)](https://github.com/bwp91/homebridge-ewelink/wiki/Beta-Version)  
 [![npm](https://img.shields.io/npm/dt/homebridge-ewelink)](https://www.npmjs.com/package/homebridge-ewelink)
-[![JavaScript Style Guide](https://img.shields.io/badge/code_style-standard-brightgreen.svg)](https://standardjs.com)   
+[![JavaScript Style Guide](https://img.shields.io/badge/code_style-standard-brightgreen.svg)](https://standardjs.com)  
 [![Discord](https://img.shields.io/discord/784827113378676736?color=728ED5&logo=discord&label=bwp91-discord)](https://discord.com/channels/784827113378676736/784827113378676739)
 [![Discord](https://img.shields.io/discord/432663330281226270?color=728ED5&logo=discord&label=hb-discord)](https://discord.com/channels/432663330281226270/742733745743855627)
 
 </span>
 
-
 ### Plugin Information
-* This plugin allows you to view and control your eWeLink devices within HomeKit. The plugin:
-  * requires your eWeLink credentials to function
-  * supports LAN control for certain devices
-  * uses a web socket for real-time device control and updates
+
+- This plugin allows you to view and control your eWeLink devices within HomeKit. The plugin:
+  - requires your eWeLink credentials to function
+  - supports LAN control for certain devices
+  - uses a web socket for real-time device control and updates
 
 ### Prerequisites
-* To use this plugin, you will need to already have [Homebridge](https://homebridge.io) (at least v1.3.3) or [HOOBS](https://hoobs.org) (at least v3.3.4) installed. Please refer to the links for more information and installation instructions.
-* It is recommended to use the current LTS version of Node, currently v14, however Node v12 is also supported.
+
+- To use this plugin, you will need to already have [Homebridge](https://homebridge.io) (at least v1.3.3) or [HOOBS](https://hoobs.org) (at least v3.3.4) installed. Please refer to the links for more information and installation instructions.
+- It is recommended to use the current LTS version of Node, currently v14, however Node v12 is also supported.
 
 ### Setup
-* [Installation](https://github.com/bwp91/homebridge-ewelink/wiki/Installation)
-* [Configuration](https://github.com/bwp91/homebridge-ewelink/wiki/Configuration)
-* [Beta Version](https://github.com/bwp91/homebridge-ewelink/wiki/Beta-Version)
-* [Node Version](https://github.com/bwp91/homebridge-ewelink/wiki/Node-Version)
-* [Uninstallation](https://github.com/bwp91/homebridge-ewelink/wiki/Uninstallation)
+
+- [Installation](https://github.com/bwp91/homebridge-ewelink/wiki/Installation)
+- [Configuration](https://github.com/bwp91/homebridge-ewelink/wiki/Configuration)
+- [Beta Version](https://github.com/bwp91/homebridge-ewelink/wiki/Beta-Version)
+- [Node Version](https://github.com/bwp91/homebridge-ewelink/wiki/Node-Version)
+- [Uninstallation](https://github.com/bwp91/homebridge-ewelink/wiki/Uninstallation)
 
 ### Features
-* [Supported Devices](https://github.com/bwp91/homebridge-ewelink/wiki/Supported-Devices)
-* [Multi Channel Devices](https://github.com/bwp91/homebridge-ewelink/wiki/Multi-Channel-Devices)
-* [RF Bridge Sensors](https://github.com/bwp91/homebridge-ewelink/wiki/RF-Bridge-Sensors)
-* [Accessory Simulations](https://github.com/bwp91/homebridge-ewelink/wiki/Accessory-Simulations)
-* [Connection Methods](https://github.com/bwp91/homebridge-ewelink/wiki/Connection-Methods)
-* [Internal API](https://github.com/bwp91/homebridge-ewelink/wiki/Internal-API)
+
+- [Supported Devices](https://github.com/bwp91/homebridge-ewelink/wiki/Supported-Devices)
+- [Multi Channel Devices](https://github.com/bwp91/homebridge-ewelink/wiki/Multi-Channel-Devices)
+- [RF Bridge Sensors](https://github.com/bwp91/homebridge-ewelink/wiki/RF-Bridge-Sensors)
+- [Accessory Simulations](https://github.com/bwp91/homebridge-ewelink/wiki/Accessory-Simulations)
+- [Connection Methods](https://github.com/bwp91/homebridge-ewelink/wiki/Connection-Methods)
+- [Internal API](https://github.com/bwp91/homebridge-ewelink/wiki/Internal-API)
 
 ### Help/About
 
-* [Common Errors](https://github.com/bwp91/homebridge-ewelink/wiki/Common-Errors)
-* [Support Request](https://github.com/bwp91/homebridge-ewelink/issues/new/choose)
-* [Changelog](https://github.com/bwp91/homebridge-ewelink/blob/latest/CHANGELOG.md)
-* [About Me](https://github.com/sponsors/bwp91)
+- [Common Errors](https://github.com/bwp91/homebridge-ewelink/wiki/Common-Errors)
+- [Support Request](https://github.com/bwp91/homebridge-ewelink/issues/new/choose)
+- [Changelog](https://github.com/bwp91/homebridge-ewelink/blob/latest/CHANGELOG.md)
+- [About Me](https://github.com/sponsors/bwp91)
 
 ### Credits
-* To the original plugin maintainer: [@gbro115](https://github.com/gbro115).
-* To successive contributors: [@MrTomAsh](https://github.com/MrTomAsh) and [@howanghk](https://github.com/howanghk) for [homebridge-ewelink-max](https://github.com/howanghk/homebridge-ewelink).
-* To the creators/contributors of [Homebridge](https://homebridge.io) who make this plugin possible.
-* To the creators/contributors of [Fakegato](https://github.com/simont77/fakegato-history): [@simont77](https://github.com/simont77) and [@NorthernMan54](https://github.com/NorthernMan54).
-* To the creator of the awesome plugin header logo: [Keryan Belahcene](https://www.instagram.com/keryan.me).
-* To all users who have shared their devices to enable functionality.
+
+- To the original plugin maintainer: [@gbro115](https://github.com/gbro115).
+- To successive contributors: [@MrTomAsh](https://github.com/MrTomAsh) and [@howanghk](https://github.com/howanghk) for [homebridge-ewelink-max](https://github.com/howanghk/homebridge-ewelink).
+- To the creators/contributors of [Homebridge](https://homebridge.io) who make this plugin possible.
+- To the creators/contributors of [Fakegato](https://github.com/simont77/fakegato-history): [@simont77](https://github.com/simont77) and [@NorthernMan54](https://github.com/NorthernMan54).
+- To the creator of the awesome plugin header logo: [Keryan Belahcene](https://www.instagram.com/keryan.me).
+- To all users who have shared their devices to enable functionality.
 
 ### Disclaimer
-* I am in no way affiliated with eWeLink nor any of the device brands (like Sonoff) and this plugin is a personal project that I maintain in my free time.
-* Use this plugin entirely at your own risk - please see licence for more information.
+
+- I am in no way affiliated with eWeLink nor any of the device brands (like Sonoff) and this plugin is a personal project that I maintain in my free time.
+- Use this plugin entirely at your own risk - please see licence for more information.
diff --git a/config.schema.json b/config.schema.json
index 3dbbf602..3000fab9 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -31,7 +31,8 @@
         "title": "Connection Mode",
         "description": "This setting defines how the plugin communicates with your devices. For further guidance, please refer to <a href=\"https://github.com/bwp91/homebridge-ewelink/wiki/Connection-Methods\" target=\"_blank\">this wiki article</a>.",
         "default": "auto",
-        "oneOf": [{
+        "oneOf": [
+          {
             "title": "Auto (Recommended)",
             "enum": ["auto"]
           },
@@ -56,27 +57,28 @@
         "type": "string",
         "description": "Override the default API host, may help with login issues for users in other regions.",
         "placeholder": "eu-apia.coolkit.cc",
-        "oneOf": [{
-          "title": "Auto (Recommended)",
-          "enum": ["auto"]
-        },
-        {
-          "title": "eu-apia.coolkit.cc",
-          "enum": ["eu-apia.coolkit.cc"]
-        },
-        {
-          "title": "us-apia.coolkit.cc",
-          "enum": ["us-apia.coolkit.cc"]
-        },
-        {
-          "title": "as-apia.coolkit.cc",
-          "enum": ["as-apia.coolkit.cc"]
-        },
-        {
-          "title": "cn-apia.coolkit.cn",
-          "enum": ["cn-apia.coolkit.cn"]
-        }
-      ]
+        "oneOf": [
+          {
+            "title": "Auto (Recommended)",
+            "enum": ["auto"]
+          },
+          {
+            "title": "eu-apia.coolkit.cc",
+            "enum": ["eu-apia.coolkit.cc"]
+          },
+          {
+            "title": "us-apia.coolkit.cc",
+            "enum": ["us-apia.coolkit.cc"]
+          },
+          {
+            "title": "as-apia.coolkit.cc",
+            "enum": ["as-apia.coolkit.cc"]
+          },
+          {
+            "title": "cn-apia.coolkit.cn",
+            "enum": ["cn-apia.coolkit.cn"]
+          }
+        ]
       },
       "apiPort": {
         "type": "number",
@@ -268,7 +270,8 @@
               "type": "string",
               "title": "Device Model",
               "description": "If your model is not listed then you do not need to set this.",
-              "oneOf": [{
+              "oneOf": [
+                {
                   "title": "B02-B-A60",
                   "enum": ["bulbB02BA60"]
                 },
@@ -477,7 +480,8 @@
               "type": "string",
               "title": "Sensor Type",
               "description": "Select the type of sensor you would like to expose this as.",
-              "oneOf": [{
+              "oneOf": [
+                {
                   "title": "Motion",
                   "enum": ["motion"]
                 },
@@ -552,7 +556,8 @@
               "type": "string",
               "title": "Type",
               "description": "The new type for this device.",
-              "oneOf": [{
+              "oneOf": [
+                {
                   "title": "1 Thermostat (with Sonoff TH10 or TH16)",
                   "enum": ["thermostat"]
                 },
@@ -625,7 +630,8 @@
               "condition": {
                 "functionBody": "return (model.groups[arrayIndices] && ['garage', 'lock', 'tap', 'valve'].includes(model.groups[arrayIndices].type));"
               },
-              "oneOf": [{
+              "oneOf": [
+                {
                   "title": "Single-Channel",
                   "enum": ["oneSwitch"]
                 },
@@ -701,13 +707,11 @@
       }
     }
   },
-  "layout": [{
+  "layout": [
+    {
       "type": "fieldset",
       "title": "Required Settings",
-      "items": [
-        "username",
-        "password"
-      ]
+      "items": ["username", "password"]
     },
     {
       "type": "fieldset",
@@ -730,16 +734,18 @@
       "expandable": true,
       "add": "Add Another Device",
       "type": "array",
-      "items": [{
-        "type": "fieldset",
-        "items": [
-          "singleDevices[].deviceId",
-          "singleDevices[].label",
-          "singleDevices[].showAsOutlet",
-          "singleDevices[].ipAddress",
-          "singleDevices[].overrideDisabledLogging"
-        ]
-      }]
+      "items": [
+        {
+          "type": "fieldset",
+          "items": [
+            "singleDevices[].deviceId",
+            "singleDevices[].label",
+            "singleDevices[].showAsOutlet",
+            "singleDevices[].ipAddress",
+            "singleDevices[].overrideDisabledLogging"
+          ]
+        }
+      ]
     },
     {
       "key": "multiDevices",
@@ -748,18 +754,20 @@
       "expandable": true,
       "add": "Add Another Device",
       "type": "array",
-      "items": [{
-        "type": "fieldset",
-        "items": [
-          "multiDevices[].deviceId",
-          "multiDevices[].label",
-          "multiDevices[].showAsOutlet",
-          "multiDevices[].inUsePowerThreshold",
-          "multiDevices[].hideChannels",
-          "multiDevices[].ipAddress",
-          "multiDevices[].overrideDisabledLogging"
-        ]
-      }]
+      "items": [
+        {
+          "type": "fieldset",
+          "items": [
+            "multiDevices[].deviceId",
+            "multiDevices[].label",
+            "multiDevices[].showAsOutlet",
+            "multiDevices[].inUsePowerThreshold",
+            "multiDevices[].hideChannels",
+            "multiDevices[].ipAddress",
+            "multiDevices[].overrideDisabledLogging"
+          ]
+        }
+      ]
     },
     {
       "key": "outletDevices",
@@ -768,17 +776,19 @@
       "expandable": true,
       "add": "Add Another Device",
       "type": "array",
-      "items": [{
-        "type": "fieldset",
-        "items": [
-          "outletDevices[].deviceId",
-          "outletDevices[].label",
-          "outletDevices[].showAsSwitch",
-          "outletDevices[].inUsePowerThreshold",
-          "outletDevices[].ipAddress",
-          "outletDevices[].overrideDisabledLogging"
-        ]
-      }]
+      "items": [
+        {
+          "type": "fieldset",
+          "items": [
+            "outletDevices[].deviceId",
+            "outletDevices[].label",
+            "outletDevices[].showAsSwitch",
+            "outletDevices[].inUsePowerThreshold",
+            "outletDevices[].ipAddress",
+            "outletDevices[].overrideDisabledLogging"
+          ]
+        }
+      ]
     },
     {
       "key": "lightDevices",
@@ -787,18 +797,20 @@
       "expandable": true,
       "add": "Add Another Device",
       "type": "array",
-      "items": [{
-        "type": "fieldset",
-        "items": [
-          "lightDevices[].deviceId",
-          "lightDevices[].label",
-          "lightDevices[].bulbModel",
-          "lightDevices[].brightnessStep",
-          "lightDevices[].adaptiveLightingShift",
-          "lightDevices[].ipAddress",
-          "lightDevices[].overrideDisabledLogging"
-        ]
-      }]
+      "items": [
+        {
+          "type": "fieldset",
+          "items": [
+            "lightDevices[].deviceId",
+            "lightDevices[].label",
+            "lightDevices[].bulbModel",
+            "lightDevices[].brightnessStep",
+            "lightDevices[].adaptiveLightingShift",
+            "lightDevices[].ipAddress",
+            "lightDevices[].overrideDisabledLogging"
+          ]
+        }
+      ]
     },
     {
       "key": "thDevices",
@@ -807,18 +819,20 @@
       "expandable": true,
       "add": "Add Another Device",
       "type": "array",
-      "items": [{
-        "type": "fieldset",
-        "items": [
-          "thDevices[].deviceId",
-          "thDevices[].label",
-          "thDevices[].hideSwitch",
-          "thDevices[].offset",
-          "thDevices[].minTarget",
-          "thDevices[].maxTarget",
-          "thDevices[].overrideDisabledLogging"
-        ]
-      }]
+      "items": [
+        {
+          "type": "fieldset",
+          "items": [
+            "thDevices[].deviceId",
+            "thDevices[].label",
+            "thDevices[].hideSwitch",
+            "thDevices[].offset",
+            "thDevices[].minTarget",
+            "thDevices[].maxTarget",
+            "thDevices[].overrideDisabledLogging"
+          ]
+        }
+      ]
     },
     {
       "key": "fanDevices",
@@ -827,15 +841,17 @@
       "expandable": true,
       "add": "Add Another Device",
       "type": "array",
-      "items": [{
-        "type": "fieldset",
-        "items": [
-          "fanDevices[].deviceId",
-          "fanDevices[].label",
-          "fanDevices[].hideLight",
-          "fanDevices[].overrideDisabledLogging"
-        ]
-      }]
+      "items": [
+        {
+          "type": "fieldset",
+          "items": [
+            "fanDevices[].deviceId",
+            "fanDevices[].label",
+            "fanDevices[].hideLight",
+            "fanDevices[].overrideDisabledLogging"
+          ]
+        }
+      ]
     },
     {
       "key": "sensorDevices",
@@ -844,18 +860,20 @@
       "expandable": true,
       "add": "Add Another Device",
       "type": "array",
-      "items": [{
-        "type": "fieldset",
-        "items": [
-          "sensorDevices[].deviceId",
-          "sensorDevices[].label",
-          "sensorDevices[].lowBattThreshold",
-          "sensorDevices[].offset",
-          "sensorDevices[].hideLongDouble",
-          "sensorDevices[].scaleBattery",
-          "sensorDevices[].overrideDisabledLogging"
-        ]
-      }]
+      "items": [
+        {
+          "type": "fieldset",
+          "items": [
+            "sensorDevices[].deviceId",
+            "sensorDevices[].label",
+            "sensorDevices[].lowBattThreshold",
+            "sensorDevices[].offset",
+            "sensorDevices[].hideLongDouble",
+            "sensorDevices[].scaleBattery",
+            "sensorDevices[].overrideDisabledLogging"
+          ]
+        }
+      ]
     },
     {
       "key": "bridgeSensors",
@@ -864,21 +882,23 @@
       "expandable": true,
       "add": "Add Another Sensor",
       "type": "array",
-      "items": [{
-        "type": "fieldset",
-        "items": [
-          "bridgeSensors[].fullDeviceId",
-          "bridgeSensors[].label",
-          "bridgeSensors[].type",
-          "bridgeSensors[].sensorTimeLength",
-          "bridgeSensors[].sensorTimeDifference",
-          "bridgeSensors[].overrideDisabledLogging",
-          {
-            "type": "help",
-            "helpvalue": "<label class=\"control-label text-warning\">⚠ Any changes you make to a sensor will reset its connected RF Bridge, resetting all its devices' HomeKit names, room associations and automations.</label>"
-          }
-        ]
-      }]
+      "items": [
+        {
+          "type": "fieldset",
+          "items": [
+            "bridgeSensors[].fullDeviceId",
+            "bridgeSensors[].label",
+            "bridgeSensors[].type",
+            "bridgeSensors[].sensorTimeLength",
+            "bridgeSensors[].sensorTimeDifference",
+            "bridgeSensors[].overrideDisabledLogging",
+            {
+              "type": "help",
+              "helpvalue": "<label class=\"control-label text-warning\">⚠ Any changes you make to a sensor will reset its connected RF Bridge, resetting all its devices' HomeKit names, room associations and automations.</label>"
+            }
+          ]
+        }
+      ]
     },
     {
       "key": "groups",
@@ -887,25 +907,27 @@
       "description": "Set up simulated accessories from generic switch devices (<a href=\"https://github.com/bwp91/homebridge-ewelink/wiki/Accessory-Simulations\" target=\"_blank\">more info</a>).",
       "add": "Add Another Type",
       "type": "array",
-      "items": [{
-        "type": "fieldset",
-        "items": [
-          "groups[].deviceId",
-          "groups[].label",
-          "groups[].type",
-          "groups[].setup",
-          "groups[].operationTime",
-          "groups[].operationTimeDown",
-          "groups[].sensorId",
-          "groups[].obstructId",
-          "groups[].ipAddress",
-          "groups[].overrideDisabledLogging",
-          {
-            "type": "help",
-            "helpvalue": "<label class=\"control-label text-warning\">⚠ If you find this accessory hasn't set up properly after restarting, then try removing it from the cache so it is re-added.</label>"
-          }
-        ]
-      }]
+      "items": [
+        {
+          "type": "fieldset",
+          "items": [
+            "groups[].deviceId",
+            "groups[].label",
+            "groups[].type",
+            "groups[].setup",
+            "groups[].operationTime",
+            "groups[].operationTimeDown",
+            "groups[].sensorId",
+            "groups[].obstructId",
+            "groups[].ipAddress",
+            "groups[].overrideDisabledLogging",
+            {
+              "type": "help",
+              "helpvalue": "<label class=\"control-label text-warning\">⚠ If you find this accessory hasn't set up properly after restarting, then try removing it from the cache so it is re-added.</label>"
+            }
+          ]
+        }
+      ]
     },
     {
       "key": "ignoredDevices",
@@ -913,12 +935,12 @@
       "title": "Ignored Devices",
       "add": "Add Another Device",
       "type": "array",
-      "items": [{
-        "type": "fieldset",
-        "items": [
-          "ignoredDevices[]"
-        ]
-      }]
+      "items": [
+        {
+          "type": "fieldset",
+          "items": ["ignoredDevices[]"]
+        }
+      ]
     }
   ]
 }
diff --git a/lib/connection/api.js b/lib/connection/api.js
index 1a914172..016d37b4 100644
--- a/lib/connection/api.js
+++ b/lib/connection/api.js
@@ -234,7 +234,10 @@ module.exports = class connectionAPI {
     }
     const encodedCreds = req.headers.authorization.split(' ')[1]
     const buff = Buffer.from(encodedCreds, 'base64')
-    const decodedCreds = buff.toString('utf8').replace(/(\r\n|\n|\r)/gm, '').trim()
+    const decodedCreds = buff
+      .toString('utf8')
+      .replace(/(\r\n|\n|\r)/gm, '')
+      .trim()
     const [user, pass] = decodedCreds.split(':')
     if (user !== this.config.username || pass !== this.config.password) {
       throw new Error('Invalid authentication')
@@ -369,9 +372,7 @@ module.exports = class connectionAPI {
           : false
         break
       case 'hue':
-        charName = accServ.testCharacteristic(this.hapChar.Hue)
-          ? this.hapChar.Hue
-          : false
+        charName = accServ.testCharacteristic(this.hapChar.Hue) ? this.hapChar.Hue : false
         break
       case 'speed':
         charName = accServ.testCharacteristic(this.hapChar.RotationSpeed)
@@ -379,9 +380,7 @@ module.exports = class connectionAPI {
           : false
         break
       case 'state':
-        charName = accServ.testCharacteristic(this.hapChar.On)
-          ? this.hapChar.On
-          : false
+        charName = accServ.testCharacteristic(this.hapChar.On) ? this.hapChar.On : false
         break
       default:
         throw new Error('Invalid characteristic specified for service:' + servToUpdate)
diff --git a/lib/connection/http.js b/lib/connection/http.js
index 05b51ead..2582a136 100644
--- a/lib/connection/http.js
+++ b/lib/connection/http.js
@@ -43,8 +43,10 @@ module.exports = class connectionHTTP {
       }
 
       // Set up the request signature
-      const dataToSign = crypto.createHmac('sha256', this.consts.appSecret)
-        .update(JSON.stringify(data)).digest('base64')
+      const dataToSign = crypto
+        .createHmac('sha256', this.consts.appSecret)
+        .update(JSON.stringify(data))
+        .digest('base64')
 
       // Send the request
       const res = await axios.post('https://' + this.httpHost + '/v2/user/login', data, {
@@ -52,7 +54,9 @@ module.exports = class connectionHTTP {
           Authorization: 'Sign ' + dataToSign,
           'Content-Type': 'application/json',
           'X-CK-Appid': this.consts.appId,
-          'X-CK-Nonce': Math.random().toString(36).substr(2, 8)
+          'X-CK-Nonce': Math.random()
+            .toString(36)
+            .substr(2, 8)
         }
       })
 
@@ -87,7 +91,10 @@ module.exports = class connectionHTTP {
         // In this case the password is incorrect so try base64 decoding just once
         this.triedBase64 = true
         const buff = Buffer.from(this.password, 'base64')
-        this.password = buff.toString('utf8').replace(/(\r\n|\n|\r)/gm, '').trim()
+        this.password = buff
+          .toString('utf8')
+          .replace(/(\r\n|\n|\r)/gm, '')
+          .trim()
         return await this.login()
       } else {
         if (body.data.at) {
@@ -135,7 +142,9 @@ module.exports = class connectionHTTP {
           Authorization: 'Bearer ' + this.aToken,
           'Content-Type': 'application/json',
           'X-CK-Appid': this.consts.appId,
-          'X-CK-Nonce': Math.random().toString(36).substr(2, 8)
+          'X-CK-Nonce': Math.random()
+            .toString(36)
+            .substr(2, 8)
         },
         params: {
           num: 0
@@ -198,17 +207,21 @@ module.exports = class connectionHTTP {
       const res = await axios.post(
         'https://' + this.httpHost + '/v2/device/thing',
         {
-          thingList: [{
-            itemType: 1,
-            id: deviceId
-          }]
+          thingList: [
+            {
+              itemType: 1,
+              id: deviceId
+            }
+          ]
         },
         {
           headers: {
             Authorization: 'Bearer ' + this.aToken,
             'Content-Type': 'application/json',
             'X-CK-Appid': this.consts.appId,
-            'X-CK-Nonce': Math.random().toString(36).substr(2, 8)
+            'X-CK-Nonce': Math.random()
+              .toString(36)
+              .substr(2, 8)
           }
         }
       )
diff --git a/lib/connection/lan.js b/lib/connection/lan.js
index a34420e0..8046b785 100644
--- a/lib/connection/lan.js
+++ b/lib/connection/lan.js
@@ -70,7 +70,8 @@ module.exports = class connectionLAN {
         if (!packet.answers) {
           return
         }
-        packet.answers.filter(value => value.name.includes('_ewelink._tcp.local'))
+        packet.answers
+          .filter(value => value.name.includes('_ewelink._tcp.local'))
           .filter(value => value.type === 'TXT')
           .filter(value => this.deviceMap.has(value.rdata.id))
           .forEach(value => {
@@ -86,16 +87,21 @@ module.exports = class connectionLAN {
             deviceInfo.lastIV = rdata.iv
 
             // Obtain the packet information
-            const data = rdata.data1 +
-              (rdata.data2 || '') +
-              (rdata.data3 || '') +
-              (rdata.data4 || '')
-            const key = crypto.createHash('md5')
-              .update(Buffer.from(deviceInfo.apiKey, 'utf8')).digest()
-            const dText = crypto
-              .createDecipheriv('aes-128-cbc', key, Buffer.from(rdata.iv, 'base64'))
-            const pText = Buffer
-              .concat([dText.update(Buffer.from(data, 'base64')), dText.final()]).toString('utf8')
+            const data =
+              rdata.data1 + (rdata.data2 || '') + (rdata.data3 || '') + (rdata.data4 || '')
+            const key = crypto
+              .createHash('md5')
+              .update(Buffer.from(deviceInfo.apiKey, 'utf8'))
+              .digest()
+            const dText = crypto.createDecipheriv(
+              'aes-128-cbc',
+              key,
+              Buffer.from(rdata.iv, 'base64')
+            )
+            const pText = Buffer.concat([
+              dText.update(Buffer.from(data, 'base64')),
+              dText.final()
+            ]).toString('utf8')
 
             // Check to see if the IP address of the device has changed
             if (packet.address !== deviceInfo.ip && !this.ipOverride[rdata.id]) {
@@ -111,13 +117,7 @@ module.exports = class connectionLAN {
             try {
               params = JSON.parse(pText)
             } catch (e) {
-              this.log.warn(
-                '[%s] %s %s:\n%s',
-                rdata.id,
-                this.lang.cantReadPacket,
-                e.message,
-                pText
-              )
+              this.log.warn('[%s] %s %s:\n%s', rdata.id, this.lang.cantReadPacket, e.message, pText)
               return
             }
 
@@ -189,7 +189,10 @@ module.exports = class connectionLAN {
       }
 
       // Generate the HTTP request
-      const key = crypto.createHash('md5').update(Buffer.from(apiKey, 'utf8')).digest()
+      const key = crypto
+        .createHash('md5')
+        .update(Buffer.from(apiKey, 'utf8'))
+        .digest()
       const iv = crypto.randomBytes(16)
       const enc = crypto.createCipheriv('aes-128-cbc', key, iv)
       const data = {
diff --git a/lib/connection/ws.js b/lib/connection/ws.js
index a4588d9e..1c9f449a 100644
--- a/lib/connection/ws.js
+++ b/lib/connection/ws.js
@@ -38,7 +38,9 @@ module.exports = class connectionWS {
         },
         data: {
           appid: this.consts.appId,
-          nonce: Math.random().toString(36).substr(2, 8),
+          nonce: Math.random()
+            .toString(36)
+            .substr(2, 8),
           ts: Math.floor(new Date().getTime() / 1000),
           version: 8
         }
@@ -97,7 +99,7 @@ module.exports = class connectionWS {
         attachRequestId: (data, requestId) => Object.assign({ sequence: requestId }, data),
         extractRequestId: data => data && data.sequence,
         packMessage: data => JSON.stringify(data),
-        unpackMessage: data => data === 'pong' ? data : JSON.parse(data),
+        unpackMessage: data => (data === 'pong' ? data : JSON.parse(data)),
         timeout: 6000
       })
 
@@ -111,7 +113,9 @@ module.exports = class connectionWS {
           apikey: this.apiKey,
           appid: this.consts.appId,
           at: this.aToken,
-          nonce: Math.random().toString(36).substr(2, 8),
+          nonce: Math.random()
+            .toString(36)
+            .substr(2, 8),
           sequence,
           ts: Math.floor(new Date() / 1000),
           userAgent: 'app',
@@ -125,8 +129,10 @@ module.exports = class connectionWS {
 
         // Attempt to authenticate the web socket connection
         try {
-        // Send the request
-          const res = await this.wsClient.sendRequest(payload, { requestId: sequence })
+          // Send the request
+          const res = await this.wsClient.sendRequest(payload, {
+            requestId: sequence
+          })
 
           // Parse the response
           if (res.config && res.config.hb && res.config.hbInterval) {
@@ -136,10 +142,10 @@ module.exports = class connectionWS {
             // Create a new ping interval
             this.hbInterval = setInterval(() => {
               try {
-              // Send the ping
+                // Send the ping
                 this.wsClient.send('ping')
               } catch (err) {
-              // Catch errors sending ping and show in debug mode
+                // Catch errors sending ping and show in debug mode
                 if (this.debug) {
                   const eText = this.funcs.parseError(err)
                   this.log.warn('%s %s.', this.lang.wsPingError, eText)
@@ -152,7 +158,7 @@ module.exports = class connectionWS {
               this.log('%s.', this.lang.wsLoginSuccess)
             }
           } else {
-          // There was a problem with the authentication response
+            // There was a problem with the authentication response
             if (res.error === 406) {
               this.log.warn(this.lang.wsLogin406)
             } else {
@@ -161,7 +167,7 @@ module.exports = class connectionWS {
             }
           }
         } catch (err) {
-        // Catch any errors authenticating the WS connection
+          // Catch any errors authenticating the WS connection
           const eText = this.funcs.parseError(err)
           this.log.warn('%s %s.', this.lang.wsLoginError, eText)
         }
@@ -169,7 +175,7 @@ module.exports = class connectionWS {
 
       // Add a listener for when we receive a WS message
       this.wsClient.onUnpackedMessage.addListener(msg => {
-      // Don't continue if it's a simple pong
+        // Don't continue if it's a simple pong
         if (msg === 'pong') {
           return
         }
@@ -191,19 +197,19 @@ module.exports = class connectionWS {
 
         // Normally the WS messages comes with an action
         if (msg.action) {
-        // Check which action the WS message includes
+          // Check which action the WS message includes
           switch (msg.action) {
             case 'update':
             case 'sysmsg': {
               if (msg.action === 'sysmsg' && this.funcs.hasProperty(msg.params, 'online')) {
-              // Update the online/offline status provided in the message
+                // Update the online/offline status provided in the message
                 onlineStatus = msg.params.online
               }
 
               // Loop through the device parameters received
               for (const param in msg.params) {
                 if (this.funcs.hasProperty(msg.params, param)) {
-                // Remove any params that the plugin doesn't need
+                  // Remove any params that the plugin doesn't need
                   if (!this.consts.paramsToKeep.includes(param.replace(/[0-9]/g, ''))) {
                     delete msg.params[param]
                   }
@@ -211,7 +217,7 @@ module.exports = class connectionWS {
               }
 
               if (Object.keys(msg.params).length > 0) {
-              // Add more params to report back to the plugin
+                // Add more params to report back to the plugin
                 msg.params.online = onlineStatus
                 msg.params.updateSource = 'WS'
 
@@ -227,7 +233,7 @@ module.exports = class connectionWS {
               break
             }
             case 'reportSubDevice':
-            // We don't need to do anything with this action
+              // We don't need to do anything with this action
               return
             default: {
               this.log.warn(
@@ -239,9 +245,9 @@ module.exports = class connectionWS {
             }
           }
         } else if (this.funcs.hasProperty(msg, 'error') && msg.error === 0) {
-        // Safe to ignore these messages
+          // Safe to ignore these messages
         } else {
-        // WS message received has an unknown action
+          // WS message received has an unknown action
           this.log.warn('%s.\n%s', this.lang.wsUnkCmd, JSON.stringify(msg, null, 2))
         }
       })
@@ -309,7 +315,9 @@ module.exports = class connectionWS {
         const sequence = Math.floor(new Date()).toString()
 
         // Send the request to eWeLink
-        const res = await this.wsClient.sendRequest(toSend, { requestId: sequence })
+        const res = await this.wsClient.sendRequest(toSend, {
+          requestId: sequence
+        })
 
         // Parse the response and see if any error has been reported back
         res.error = this.funcs.hasProperty(res, 'error') ? res.error : -1
diff --git a/lib/device/curtain.js b/lib/device/curtain.js
index 8a660758..864495bd 100644
--- a/lib/device/curtain.js
+++ b/lib/device/curtain.js
@@ -25,12 +25,14 @@ module.exports = class deviceCurtain {
 
     // Set up custom variables for this device type
     const deviceConf = platform.singleDevices[accessory.context.eweDeviceId]
-    this.disableDeviceLogging = deviceConf && deviceConf.overrideDisabledLogging
-      ? false
-      : platform.config.disableDeviceLogging
+    this.disableDeviceLogging =
+      deviceConf && deviceConf.overrideDisabledLogging
+        ? false
+        : platform.config.disableDeviceLogging
 
     // Add the window covering service if it doesn't already exist
-    this.service = this.accessory.getService(this.hapServ.WindowCovering) ||
+    this.service =
+      this.accessory.getService(this.hapServ.WindowCovering) ||
       this.accessory.addService(this.hapServ.WindowCovering)
 
     // Add the set handler to the target position characteristic
@@ -40,7 +42,9 @@ module.exports = class deviceCurtain {
 
     // Output the customised options to the log if in debug mode
     if (platform.config.debug) {
-      const opts = JSON.stringify({ disableDeviceLogging: this.disableDeviceLogging })
+      const opts = JSON.stringify({
+        disableDeviceLogging: this.disableDeviceLogging
+      })
       this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
     }
   }
@@ -48,7 +52,9 @@ module.exports = class deviceCurtain {
   async internalPositionUpdate (value) {
     try {
       // This acts like a debounce function when endlessly sliding the slider
-      const updateKey = Math.random().toString(36).substr(2, 8)
+      const updateKey = Math.random()
+        .toString(36)
+        .substr(2, 8)
       this.updateKey = updateKey
       await this.funcs.sleep(500)
       if (updateKey !== this.updateKey) {
@@ -81,10 +87,7 @@ module.exports = class deviceCurtain {
       // Catch any errors and let the platform display them
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
-        this.service.updateCharacteristic(
-          this.hapChar.TargetPosition,
-          this.cachePos
-        )
+        this.service.updateCharacteristic(this.hapChar.TargetPosition, this.cachePos)
       }, 2000)
       throw new this.hapErr(-70402)
     }
diff --git a/lib/device/diffuser.js b/lib/device/diffuser.js
index 1ae55218..001e3158 100644
--- a/lib/device/diffuser.js
+++ b/lib/device/diffuser.js
@@ -20,16 +20,19 @@ module.exports = class deviceDiffuser {
 
     // Set up custom variables for this device type
     const deviceConf = platform.singleDevices[accessory.context.eweDeviceId]
-    this.disableDeviceLogging = deviceConf && deviceConf.overrideDisabledLogging
-      ? false
-      : platform.config.disableDeviceLogging
+    this.disableDeviceLogging =
+      deviceConf && deviceConf.overrideDisabledLogging
+        ? false
+        : platform.config.disableDeviceLogging
 
     // Add the fan service if it doesn't already exist
-    this.fanService = this.accessory.getService('Diffuser') ||
+    this.fanService =
+      this.accessory.getService('Diffuser') ||
       this.accessory.addService(this.hapServ.Fan, 'Diffuser', 'diffuser')
 
     // Add the lightbulb service if it doesn't already exist
-    this.lightService = this.accessory.getService('Light') ||
+    this.lightService =
+      this.accessory.getService('Light') ||
       this.accessory.addService(this.hapServ.Lightbulb, 'Light', 'light')
 
     // Add the set handler to the fan on/off characteristic
@@ -38,7 +41,8 @@ module.exports = class deviceDiffuser {
     })
 
     // Add the set handler to the fan rotation characteristic
-    this.fanService.getCharacteristic(this.hapChar.RotationSpeed)
+    this.fanService
+      .getCharacteristic(this.hapChar.RotationSpeed)
       .setProps({ minStep: 50 })
       .onSet(async value => {
         await this.internalDiffuserSpeedUpdate(value)
@@ -61,7 +65,9 @@ module.exports = class deviceDiffuser {
 
     // Output the customised options to the log if in debug mode
     if (platform.config.debug) {
-      const opts = JSON.stringify({ disableDeviceLogging: this.disableDeviceLogging })
+      const opts = JSON.stringify({
+        disableDeviceLogging: this.disableDeviceLogging
+      })
       this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
     }
   }
@@ -78,7 +84,9 @@ module.exports = class deviceDiffuser {
       const params = { switch: newValue }
 
       // Set up a five second timeout for the plugin to ignore incoming updates
-      const timerKey = Math.random().toString(36).substr(2, 8)
+      const timerKey = Math.random()
+        .toString(36)
+        .substr(2, 8)
       this.updateTimeout = timerKey
       setTimeout(() => {
         if (this.updateTimeout === timerKey) {
@@ -125,7 +133,9 @@ module.exports = class deviceDiffuser {
       const params = { state: newValue / 50 }
 
       // This acts like a debounce function when endlessly sliding the brightness scale
-      const updateKeySpeed = Math.random().toString(36).substr(2, 8)
+      const updateKeySpeed = Math.random()
+        .toString(36)
+        .substr(2, 8)
       this.updateKeySpeed = updateKeySpeed
       await this.funcs.sleep(450)
       if (updateKeySpeed !== this.updateKeySpeed) {
@@ -172,7 +182,9 @@ module.exports = class deviceDiffuser {
       const params = { lightswitch: this.cacheLight }
 
       // Set up a five second timeout for the plugin to ignore incoming updates
-      const updateKeyLight = Math.random().toString(36).substr(2, 8)
+      const updateKeyLight = Math.random()
+        .toString(36)
+        .substr(2, 8)
       this.updateTimeout = updateKeyLight
       setTimeout(() => {
         if (this.updateTimeout === updateKeyLight) {
@@ -188,21 +200,13 @@ module.exports = class deviceDiffuser {
 
       // Log the update if appropriate
       if (!this.disableDeviceLogging) {
-        this.log(
-          '[%s] %s [%s%].',
-          this.name,
-          this.lang.curLight,
-          value === 1 ? 'on' : 'off'
-        )
+        this.log('[%s] %s [%s%].', this.name, this.lang.curLight, value === 1 ? 'on' : 'off')
       }
     } catch (err) {
       // Catch any errors and let the platform display them
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
-        this.lightService.updateCharacteristic(
-          this.hapChar.On,
-          this.cacheLight === 'on'
-        )
+        this.lightService.updateCharacteristic(this.hapChar.On, this.cacheLight === 'on')
       }, 2000)
       throw new this.hapErr(-70402)
     }
@@ -219,7 +223,9 @@ module.exports = class deviceDiffuser {
       const params = { lightbright: value }
 
       // This acts like a debounce function when endlessly sliding the brightness scale
-      const updateKeyBright = Math.random().toString(36).substr(2, 8)
+      const updateKeyBright = Math.random()
+        .toString(36)
+        .substr(2, 8)
       this.updateKeyBright = updateKeyBright
       await this.funcs.sleep(500)
       if (updateKeyBright !== this.updateKeyBright) {
@@ -248,10 +254,7 @@ module.exports = class deviceDiffuser {
       // Catch any errors and let the platform display them
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
-        this.lightService.updateCharacteristic(
-          this.hapChar.Brightness,
-          this.cacheBright
-        )
+        this.lightService.updateCharacteristic(this.hapChar.Brightness, this.cacheBright)
       }, 2000)
       throw new this.hapErr(-70402)
     }
@@ -274,7 +277,9 @@ module.exports = class deviceDiffuser {
       }
 
       // This acts like a debounce function when endlessly sliding the colour wheel
-      const updateKeyColour = Math.random().toString(36).substr(2, 8)
+      const updateKeyColour = Math.random()
+        .toString(36)
+        .substr(2, 8)
       this.updateKeyColour = updateKeyColour
       await this.funcs.sleep(400)
       if (updateKeyColour !== this.updateKeyColour) {
@@ -311,10 +316,7 @@ module.exports = class deviceDiffuser {
       // Catch any errors and let the platform display them
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
-        this.lightService.updateCharacteristic(
-          this.hapChar.Hue,
-          this.cacheHue
-        )
+        this.lightService.updateCharacteristic(this.hapChar.Hue, this.cacheHue)
       }, 2000)
       throw new this.hapErr(-70402)
     }
@@ -337,10 +339,7 @@ module.exports = class deviceDiffuser {
 
         // If the diffuser is on but no speed provided, then update speed with the cache
         if (this.cacheState === 'on' && !this.funcs.hasProperty(params, 'state')) {
-          this.fanService.updateCharacteristic(
-            this.hapChar.RotationSpeed,
-            this.cacheSpeed
-          )
+          this.fanService.updateCharacteristic(this.hapChar.RotationSpeed, this.cacheSpeed)
         }
 
         // Log if appropriate
@@ -350,10 +349,7 @@ module.exports = class deviceDiffuser {
       }
 
       // Check to see if we are provided new and different speed information
-      if (
-        this.funcs.hasProperty(params, 'state') &&
-        params.state * 50 !== this.cacheSpeed
-      ) {
+      if (this.funcs.hasProperty(params, 'state') && params.state * 50 !== this.cacheSpeed) {
         // State is {0, 1, 2} corresponding to {0, 50, 100} rotation speed
         this.cacheSpeed = params.state * 50
 
@@ -367,10 +363,7 @@ module.exports = class deviceDiffuser {
       }
 
       // Check to see if we are provided new and different light on/off information
-      if (
-        this.funcs.hasProperty(params, 'lightswitch') &&
-        this.cacheLight !== params.lightswitch
-      ) {
+      if (this.funcs.hasProperty(params, 'lightswitch') && this.cacheLight !== params.lightswitch) {
         // Lightswitch is {0, 1} corresponding to {false, true} off/on state
         this.cacheLight = params.lightswitch
 
@@ -397,10 +390,7 @@ module.exports = class deviceDiffuser {
         this.cacheBright = params.lightbright
 
         // Update the HomeKit value
-        this.lightService.updateCharacteristic(
-          this.hapChar.Brightness,
-          params.lightbright
-        )
+        this.lightService.updateCharacteristic(this.hapChar.Brightness, params.lightbright)
 
         // Log if appropriate
         if (params.updateSource && !this.disableDeviceLogging) {
@@ -411,11 +401,9 @@ module.exports = class deviceDiffuser {
       // Check to see if we are provided new and different light colour information
       if (
         this.funcs.hasProperty(params, 'lightRcolor') &&
-        (
-          this.cacheR !== params.lightRcolor ||
+        (this.cacheR !== params.lightRcolor ||
           this.cacheG !== params.lightGcolor ||
-          this.cacheB !== params.lightBcolor
-        )
+          this.cacheB !== params.lightBcolor)
       ) {
         // Lightcolor is provided as [0, 255] corresponding to RGB values
         this.cacheR = params.lightRcolor
diff --git a/lib/device/fan.js b/lib/device/fan.js
index 8a2e261e..8749d859 100644
--- a/lib/device/fan.js
+++ b/lib/device/fan.js
@@ -20,13 +20,14 @@ module.exports = class deviceFan {
     // Set up custom variables for this device type
     const deviceConf = platform.fanDevices[accessory.context.eweDeviceId]
     this.hideLight = deviceConf && deviceConf.hideLight
-    this.disableDeviceLogging = deviceConf && deviceConf.overrideDisabledLogging
-      ? false
-      : platform.config.disableDeviceLogging
+    this.disableDeviceLogging =
+      deviceConf && deviceConf.overrideDisabledLogging
+        ? false
+        : platform.config.disableDeviceLogging
 
     // Add the fan service if it doesn't already exist
-    this.service = this.accessory.getService(this.hapServ.Fan) ||
-      this.accessory.addService(this.hapServ.Fan)
+    this.service =
+      this.accessory.getService(this.hapServ.Fan) || this.accessory.addService(this.hapServ.Fan)
 
     // Add the set handler to the fan on/off characteristic
     this.service.getCharacteristic(this.hapChar.On).onSet(async value => {
@@ -34,7 +35,9 @@ module.exports = class deviceFan {
     })
 
     // Add the set handler to the fan rotation speed characteristic
-    this.service.getCharacteristic(this.hapChar.RotationSpeed).setProps({ minStep: 33 })
+    this.service
+      .getCharacteristic(this.hapChar.RotationSpeed)
+      .setProps({ minStep: 33 })
       .onSet(async value => {
         await this.internalSpeedUpdate(value)
       })
@@ -47,7 +50,8 @@ module.exports = class deviceFan {
       }
     } else {
       // The user has not hidden the light channel, so add it if it doesn't exist
-      this.lightService = this.accessory.getService(this.hapServ.Lightbulb) ||
+      this.lightService =
+        this.accessory.getService(this.hapServ.Lightbulb) ||
         this.accessory.addService(this.hapServ.Lightbulb)
 
       // Add the set handler to the lightbulb on/off characteristic
@@ -83,7 +87,9 @@ module.exports = class deviceFan {
   async internalSpeedUpdate (value) {
     try {
       // This acts like a debounce function when endlessly sliding the slider
-      const updateKey = Math.random().toString(36).substr(2, 8)
+      const updateKey = Math.random()
+        .toString(36)
+        .substr(2, 8)
       this.updateKey = updateKey
       await this.funcs.sleep(500)
       if (updateKey !== this.updateKey) {
diff --git a/lib/device/humidifier.js b/lib/device/humidifier.js
index c0a5e09a..3695e382 100644
--- a/lib/device/humidifier.js
+++ b/lib/device/humidifier.js
@@ -19,9 +19,10 @@ module.exports = class deviceHumidifier {
 
     // Set up custom variables for this device type
     const deviceConf = platform.singleDevices[accessory.context.eweDeviceId]
-    this.disableDeviceLogging = deviceConf && deviceConf.overrideDisabledLogging
-      ? false
-      : platform.config.disableDeviceLogging
+    this.disableDeviceLogging =
+      deviceConf && deviceConf.overrideDisabledLogging
+        ? false
+        : platform.config.disableDeviceLogging
 
     /*
       The device does not provide a current humidity reading so
@@ -30,8 +31,8 @@ module.exports = class deviceHumidifier {
     */
 
     // Add the fan service if it doesn't already exist
-    this.service = this.accessory.getService(this.hapServ.Fan) ||
-      this.accessory.addService(this.hapServ.Fan)
+    this.service =
+      this.accessory.getService(this.hapServ.Fan) || this.accessory.addService(this.hapServ.Fan)
 
     // Add the set handler to the fan on/off characteristic
     this.service.getCharacteristic(this.hapChar.On).onSet(async value => {
@@ -41,7 +42,8 @@ module.exports = class deviceHumidifier {
     })
 
     // Add the set handler to the fan rotation speed characteristic
-    this.service.getCharacteristic(this.hapChar.RotationSpeed)
+    this.service
+      .getCharacteristic(this.hapChar.RotationSpeed)
       .setProps({ minStep: 33 })
       .onSet(async value => {
         await this.internalModeUpdate(value)
@@ -56,14 +58,18 @@ module.exports = class deviceHumidifier {
 
     // Output the customised options to the log if in debug mode
     if (platform.config.debug) {
-      const opts = JSON.stringify({ disableDeviceLogging: this.disableDeviceLogging })
+      const opts = JSON.stringify({
+        disableDeviceLogging: this.disableDeviceLogging
+      })
       this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
     }
   }
 
   async internalModeUpdate (value) {
     try {
-      const updateKey = Math.random().toString(36).substr(2, 8)
+      const updateKey = Math.random()
+        .toString(36)
+        .substr(2, 8)
       this.updateKey = updateKey
       await this.funcs.sleep(500)
       if (updateKey !== this.updateKey) {
@@ -100,12 +106,7 @@ module.exports = class deviceHumidifier {
         this.cacheState = 'on'
         this.cacheMode = newMode
         if (!this.disableDeviceLogging) {
-          this.log(
-            '[%s] %s [%s].',
-            this.name,
-            this.lang.curMode,
-            this.mode2label[this.cacheMode]
-          )
+          this.log('[%s] %s [%s].', this.name, this.lang.curMode, this.mode2label[this.cacheMode])
         }
       }
     } catch (err) {
@@ -133,17 +134,9 @@ module.exports = class deviceHumidifier {
         this.cacheMode = params.state
         if (this.cacheState === 'on') {
           if (params.updateSource && !this.disableDeviceLogging) {
-            this.log(
-              '[%s] %s [%s].',
-              this.name,
-              this.lang.curMode,
-              this.mode2label[this.cacheMode]
-            )
+            this.log('[%s] %s [%s].', this.name, this.lang.curMode, this.mode2label[this.cacheMode])
           }
-          this.service.updateCharacteristic(
-            this.hapChar.RotationSpeed,
-            this.cacheMode * 33
-          )
+          this.service.updateCharacteristic(this.hapChar.RotationSpeed, this.cacheMode * 33)
         }
       }
     } catch (err) {
diff --git a/lib/device/light-cct.js b/lib/device/light-cct.js
index 8357a5e2..bc25f773 100644
--- a/lib/device/light-cct.js
+++ b/lib/device/light-cct.js
@@ -19,18 +19,22 @@ module.exports = class deviceLightCCT {
 
     // Set up custom variables for this device type
     const deviceConf = platform.lightDevices[accessory.context.eweDeviceId]
-    this.bulbModel = deviceConf && deviceConf.bulbModel
-      ? deviceConf.bulbModel
-      : platform.consts.defaultValues.bulbModel
-    this.alShift = deviceConf && deviceConf.adaptiveLightingShift
-      ? deviceConf.adaptiveLightingShift
-      : platform.consts.defaultValues.adaptiveLightingShift
-    this.brightStep = deviceConf && deviceConf.brightnessStep
-      ? Math.min(deviceConf.brightnessStep, 100)
-      : platform.consts.defaultValues.brightnessStep
-    this.disableDeviceLogging = deviceConf && deviceConf.overrideDisabledLogging
-      ? false
-      : platform.config.disableDeviceLogging
+    this.bulbModel =
+      deviceConf && deviceConf.bulbModel
+        ? deviceConf.bulbModel
+        : platform.consts.defaultValues.bulbModel
+    this.alShift =
+      deviceConf && deviceConf.adaptiveLightingShift
+        ? deviceConf.adaptiveLightingShift
+        : platform.consts.defaultValues.adaptiveLightingShift
+    this.brightStep =
+      deviceConf && deviceConf.brightnessStep
+        ? Math.min(deviceConf.brightnessStep, 100)
+        : platform.consts.defaultValues.brightnessStep
+    this.disableDeviceLogging =
+      deviceConf && deviceConf.overrideDisabledLogging
+        ? false
+        : platform.config.disableDeviceLogging
 
     // Different bulbs have different colour temperature ranges
     switch (this.bulbModel) {
@@ -49,7 +53,8 @@ module.exports = class deviceLightCCT {
     }
 
     // Add the lightbulb service if it doesn't already exist
-    this.service = this.accessory.getService(this.hapServ.Lightbulb) ||
+    this.service =
+      this.accessory.getService(this.hapServ.Lightbulb) ||
       this.accessory.addService(this.hapServ.Lightbulb)
 
     // Add the set handler to the lightbulb on/off characteristic
@@ -58,7 +63,8 @@ module.exports = class deviceLightCCT {
     })
 
     // Add the set handler to the lightbulb brightness characteristic
-    this.service.getCharacteristic(this.hapChar.Brightness)
+    this.service
+      .getCharacteristic(this.hapChar.Brightness)
       .setProps({ minStep: this.brightStep })
       .onSet(async value => {
         await this.internalBrightnessUpdate(value)
@@ -73,10 +79,9 @@ module.exports = class deviceLightCCT {
     this.cacheBright = this.service.getCharacteristic(this.hapChar.Brightness).value
 
     // Set up the adaptive lighting controller
-    this.accessory.alController = new platform.api.hap.AdaptiveLightingController(
-      this.service,
-      { customTemperatureAdjustment: this.alShift }
-    )
+    this.accessory.alController = new platform.api.hap.AdaptiveLightingController(this.service, {
+      customTemperatureAdjustment: this.alShift
+    })
     this.accessory.configureController(this.accessory.alController)
 
     // Output the customised options to the log if in debug mode
@@ -97,7 +102,9 @@ module.exports = class deviceLightCCT {
       if (this.cacheState === newValue) {
         return
       }
-      const timerKey = Math.random().toString(36).substr(2, 8)
+      const timerKey = Math.random()
+        .toString(36)
+        .substr(2, 8)
       this.updateTimeout = timerKey
       setTimeout(() => {
         if (this.updateTimeout === timerKey) {
@@ -125,7 +132,9 @@ module.exports = class deviceLightCCT {
       if (this.cacheBright === value) {
         return
       }
-      const updateKey = Math.random().toString(36).substr(2, 8)
+      const updateKey = Math.random()
+        .toString(36)
+        .substr(2, 8)
       this.updateKeyBright = updateKey
       await this.funcs.sleep(500)
       if (updateKey !== this.updateKeyBright) {
@@ -165,7 +174,9 @@ module.exports = class deviceLightCCT {
       if (!this.isOnline && this.accessory.alController.isAdaptiveLightingActive()) {
         return
       }
-      const updateKey = Math.random().toString(36).substr(2, 8)
+      const updateKey = Math.random()
+        .toString(36)
+        .substr(2, 8)
       this.updateKeyCT = updateKey
       await this.funcs.sleep(400)
       if (updateKey !== this.updateKeyCT) {
@@ -190,17 +201,8 @@ module.exports = class deviceLightCCT {
       this.cacheMired = value
       this.cacheCT = scaledCT
       if (!this.disableDeviceLogging) {
-        if (
-          this.accessory.alController &&
-          this.accessory.alController.isAdaptiveLightingActive()
-        ) {
-          this.log(
-            '[%s] %s [%sK] %s.',
-            this.name,
-            this.lang.curColour,
-            scaledK,
-            this.lang.viaAL
-          )
+        if (this.accessory.alController && this.accessory.alController.isAdaptiveLightingActive()) {
+          this.log('[%s] %s [%sK] %s.', this.name, this.lang.curColour, scaledK, this.lang.viaAL)
         } else {
           this.log('[%s] %s [%sK].', this.name, this.lang.curColour, scaledK)
         }
@@ -227,29 +229,20 @@ module.exports = class deviceLightCCT {
         }
       }
       if (params.white) {
-        if (
-          this.funcs.hasProperty(params.white, 'br') &&
-          this.cacheBright !== params.white.br
-        ) {
+        if (this.funcs.hasProperty(params.white, 'br') && this.cacheBright !== params.white.br) {
           this.cacheBright = params.white.br
           this.service.updateCharacteristic(this.hapChar.Brightness, this.cacheBright)
           if (params.updateSource && !this.disableDeviceLogging) {
             this.log('[%s] %s [%s%].', this.name, this.lang.curBright, this.cacheBright)
           }
         }
-        if (
-          this.funcs.hasProperty(params.white, 'ct') &&
-          this.cacheCT !== params.white.ct
-        ) {
+        if (this.funcs.hasProperty(params.white, 'ct') && this.cacheCT !== params.white.ct) {
           const ctDiff = Math.abs(params.white.ct - this.cacheCT)
           this.cacheCT = params.white.ct
-          const kelvin = this.cacheCT / 255 * (this.maxK - this.minK) + this.minK
+          const kelvin = (this.cacheCT / 255) * (this.maxK - this.minK) + this.minK
           const scaledK = Math.round(kelvin)
           this.cacheMired = Math.min(Math.max(Math.round(1000000 / scaledK), 140), 500)
-          this.service.updateCharacteristic(
-            this.hapChar.ColorTemperature,
-            this.cacheMired
-          )
+          this.service.updateCharacteristic(this.hapChar.ColorTemperature, this.cacheMired)
           if (params.updateSource) {
             if (!this.disableDeviceLogging) {
               this.log('[%s] %s [%sK].', this.name, this.lang.curColour, scaledK)
diff --git a/lib/device/light-dimmer.js b/lib/device/light-dimmer.js
index e0ede673..ddb52ea2 100644
--- a/lib/device/light-dimmer.js
+++ b/lib/device/light-dimmer.js
@@ -19,15 +19,18 @@ module.exports = class deviceLightDimmer {
 
     // Set up custom variables for this device type
     const deviceConf = platform.lightDevices[accessory.context.eweDeviceId]
-    this.brightStep = deviceConf && deviceConf.brightnessStep
-      ? Math.min(deviceConf.brightnessStep, 100)
-      : platform.consts.defaultValues.brightnessStep
-    this.disableDeviceLogging = deviceConf && deviceConf.overrideDisabledLogging
-      ? false
-      : platform.config.disableDeviceLogging
+    this.brightStep =
+      deviceConf && deviceConf.brightnessStep
+        ? Math.min(deviceConf.brightnessStep, 100)
+        : platform.consts.defaultValues.brightnessStep
+    this.disableDeviceLogging =
+      deviceConf && deviceConf.overrideDisabledLogging
+        ? false
+        : platform.config.disableDeviceLogging
 
     // Add the lightbulb service if it doesn't already exist
-    this.service = this.accessory.getService(this.hapServ.Lightbulb) ||
+    this.service =
+      this.accessory.getService(this.hapServ.Lightbulb) ||
       this.accessory.addService(this.hapServ.Lightbulb)
 
     // Add the set handler to the lightbulb on/off characteristic
@@ -36,7 +39,8 @@ module.exports = class deviceLightDimmer {
     })
 
     // Add the set handler to the lightbulb brightness characteristic
-    this.service.getCharacteristic(this.hapChar.Brightness)
+    this.service
+      .getCharacteristic(this.hapChar.Brightness)
       .setProps({ minStep: this.brightStep })
       .onSet(async value => {
         await this.internalBrightnessUpdate(value)
@@ -88,7 +92,9 @@ module.exports = class deviceLightDimmer {
       if (this.cacheBright === value) {
         return
       }
-      const updateKey = Math.random().toString(36).substr(2, 8)
+      const updateKey = Math.random()
+        .toString(36)
+        .substr(2, 8)
       this.updateKeyBright = updateKey
       await this.funcs.sleep(500)
       if (updateKey !== this.updateKeyBright) {
diff --git a/lib/device/light-rgb-cct.js b/lib/device/light-rgb-cct.js
index 0e925252..22eb7e82 100644
--- a/lib/device/light-rgb-cct.js
+++ b/lib/device/light-rgb-cct.js
@@ -20,15 +20,18 @@ module.exports = class deviceLightRGBCCT {
 
     // Set up custom variables for this device type
     const deviceConf = platform.lightDevices[accessory.context.eweDeviceId]
-    this.alShift = deviceConf && deviceConf.adaptiveLightingShift
-      ? deviceConf.adaptiveLightingShift
-      : platform.consts.defaultValues.adaptiveLightingShift
-    this.brightStep = deviceConf && deviceConf.brightnessStep
-      ? Math.min(deviceConf.brightnessStep, 100)
-      : platform.consts.defaultValues.brightnessStep
-    this.disableDeviceLogging = deviceConf && deviceConf.overrideDisabledLogging
-      ? false
-      : platform.config.disableDeviceLogging
+    this.alShift =
+      deviceConf && deviceConf.adaptiveLightingShift
+        ? deviceConf.adaptiveLightingShift
+        : platform.consts.defaultValues.adaptiveLightingShift
+    this.brightStep =
+      deviceConf && deviceConf.brightnessStep
+        ? Math.min(deviceConf.brightnessStep, 100)
+        : platform.consts.defaultValues.brightnessStep
+    this.disableDeviceLogging =
+      deviceConf && deviceConf.overrideDisabledLogging
+        ? false
+        : platform.config.disableDeviceLogging
 
     // If the accessory has a outlet service then remove it (remedies bug int in v5)
     if (this.accessory.getService(this.hapServ.Switch)) {
@@ -36,7 +39,8 @@ module.exports = class deviceLightRGBCCT {
     }
 
     // Add the lightbulb service if it doesn't already exist
-    this.service = this.accessory.getService(this.hapServ.Lightbulb) ||
+    this.service =
+      this.accessory.getService(this.hapServ.Lightbulb) ||
       this.accessory.addService(this.hapServ.Lightbulb)
 
     // Add the set handler to the lightbulb on/off characteristic
@@ -45,7 +49,8 @@ module.exports = class deviceLightRGBCCT {
     })
 
     // Add the set handler to the lightbulb brightness characteristic
-    this.service.getCharacteristic(this.hapChar.Brightness)
+    this.service
+      .getCharacteristic(this.hapChar.Brightness)
       .setProps({ minStep: this.brightStep })
       .onSet(async value => {
         await this.internalBrightnessUpdate(value)
@@ -65,10 +70,9 @@ module.exports = class deviceLightRGBCCT {
     this.cacheBright = this.service.getCharacteristic(this.hapChar.Brightness).value
 
     // Set up the adaptive lighting controller
-    this.accessory.alController = new platform.api.hap.AdaptiveLightingController(
-      this.service,
-      { customTemperatureAdjustment: this.alShift }
-    )
+    this.accessory.alController = new platform.api.hap.AdaptiveLightingController(this.service, {
+      customTemperatureAdjustment: this.alShift
+    })
     this.accessory.configureController(this.accessory.alController)
 
     // Output the customised options to the log if in debug mode
@@ -88,7 +92,9 @@ module.exports = class deviceLightRGBCCT {
       if (this.cacheState === newValue) {
         return
       }
-      const timerKey = Math.random().toString(36).substr(2, 8)
+      const timerKey = Math.random()
+        .toString(36)
+        .substr(2, 8)
       this.updateTimeout = timerKey
       setTimeout(() => {
         if (this.updateTimeout === timerKey) {
@@ -115,7 +121,9 @@ module.exports = class deviceLightRGBCCT {
       if (this.cacheBright === value) {
         return
       }
-      const updateKey = Math.random().toString(36).substr(2, 8)
+      const updateKey = Math.random()
+        .toString(36)
+        .substr(2, 8)
       this.updateKeyBright = updateKey
       await this.funcs.sleep(500)
       if (updateKey !== this.updateKeyBright) {
@@ -176,7 +184,9 @@ module.exports = class deviceLightRGBCCT {
       if (this.cacheHue === value || this.cacheState !== 'on') {
         return
       }
-      const updateKey = Math.random().toString(36).substr(2, 8)
+      const updateKey = Math.random()
+        .toString(36)
+        .substr(2, 8)
       this.updateKey = updateKey
       await this.funcs.sleep(400)
       if (updateKey !== this.updateKey) {
@@ -250,7 +260,9 @@ module.exports = class deviceLightRGBCCT {
       if (!this.isOnline && this.accessory.alController.isAdaptiveLightingActive()) {
         return
       }
-      const updateKey = Math.random().toString(36).substr(2, 8)
+      const updateKey = Math.random()
+        .toString(36)
+        .substr(2, 8)
       this.updateKey = updateKey
       await this.funcs.sleep(400)
       if (updateKey !== this.updateKey) {
@@ -311,13 +323,7 @@ module.exports = class deviceLightRGBCCT {
       }
       if (!this.disableDeviceLogging) {
         if (this.accessory.alController.isAdaptiveLightingActive()) {
-          this.log(
-            '[%s] %s [%sK] %s.',
-            this.name,
-            this.lang.curColour,
-            mToK,
-            this.lang.viaAL
-          )
+          this.log('[%s] %s [%sK] %s.', this.name, this.lang.curColour, mToK, this.lang.viaAL)
         } else {
           this.log('[%s] %s [%sK].', this.name, this.lang.curColour, mToK)
         }
@@ -352,12 +358,7 @@ module.exports = class deviceLightRGBCCT {
               this.cacheBright = params.bright
               this.service.updateCharacteristic(this.hapChar.Brightness, this.cacheBright)
               if (params.updateSource && !this.disableDeviceLogging) {
-                this.log(
-                  '[%s] %s [%s%].',
-                  this.name,
-                  this.lang.curBright,
-                  this.cacheBright
-                )
+                this.log('[%s] %s [%s%].', this.name, this.lang.curBright, this.cacheBright)
               }
             }
           }
@@ -367,7 +368,8 @@ module.exports = class deviceLightRGBCCT {
               params.colorG !== this.cacheB ||
               params.colorB !== this.cacheB
             ) {
-              const rgbDiff = Math.abs(params.colorR - this.cacheR) +
+              const rgbDiff =
+                Math.abs(params.colorR - this.cacheR) +
                 Math.abs(params.colorG - this.cacheG) +
                 Math.abs(params.colorG - this.cacheB)
               this.cacheR = params.colorR
@@ -387,10 +389,7 @@ module.exports = class deviceLightRGBCCT {
                     this.cacheR + ' ' + this.cacheG + ' ' + this.cacheB
                   )
                 }
-                if (
-                  this.accessory.alController.isAdaptiveLightingActive() &&
-                  rgbDiff > 50
-                ) {
+                if (this.accessory.alController.isAdaptiveLightingActive() && rgbDiff > 50) {
                   this.accessory.alController.disableAdaptiveLighting()
                   if (!this.disableDeviceLogging) {
                     this.log('[%s] %s.', this.name, this.lang.disabledAL)
@@ -406,17 +405,9 @@ module.exports = class deviceLightRGBCCT {
             if (this.funcs.hasProperty(params.color, 'br')) {
               if (params.color.br !== this.cacheBright) {
                 this.cacheBright = params.color.br
-                this.service.updateCharacteristic(
-                  this.hapChar.Brightness,
-                  this.cacheBright
-                )
+                this.service.updateCharacteristic(this.hapChar.Brightness, this.cacheBright)
                 if (params.updateSource && !this.disableDeviceLogging) {
-                  this.log(
-                    '[%s] %s [%s%].',
-                    this.name,
-                    this.lang.curBright,
-                    this.cacheBright
-                  )
+                  this.log('[%s] %s [%s%].', this.name, this.lang.curBright, this.cacheBright)
                 }
               }
             }
@@ -447,10 +438,7 @@ module.exports = class deviceLightRGBCCT {
                 }
               }
             }
-            if (
-              params.updateSource &&
-              this.accessory.alController.isAdaptiveLightingActive()
-            ) {
+            if (params.updateSource && this.accessory.alController.isAdaptiveLightingActive()) {
               this.accessory.alController.disableAdaptiveLighting()
               if (!this.disableDeviceLogging) {
                 this.log('[%s] %s.', this.name, this.lang.disabledAL)
@@ -461,45 +449,28 @@ module.exports = class deviceLightRGBCCT {
             if (this.funcs.hasProperty(params.white, 'br')) {
               if (params.white.br !== this.cacheBright || this.cacheMode !== 'white') {
                 this.cacheBright = params.white.br
-                this.service.updateCharacteristic(
-                  this.hapChar.Brightness,
-                  this.cacheBright
-                )
+                this.service.updateCharacteristic(this.hapChar.Brightness, this.cacheBright)
                 if (params.updateSource && !this.disableDeviceLogging) {
-                  this.log(
-                    '[%s] %s [%s%].',
-                    this.name,
-                    this.lang.curBright,
-                    this.cacheBright
-                  )
+                  this.log('[%s] %s [%s%].', this.name, this.lang.curBright, this.cacheBright)
                 }
               }
             }
-            if (
-              this.funcs.hasProperty(params.white, 'ct') &&
-              params.white.ct !== this.cacheCT
-            ) {
+            if (this.funcs.hasProperty(params.white, 'ct') && params.white.ct !== this.cacheCT) {
               this.cacheMode = 'white'
               const ctDiff = Math.abs(params.white.ct - this.cacheCT)
               this.cacheCT = params.white.ct
-              const ctToK = Math.round(this.cacheCT / 255 * 3800 + 2700)
+              const ctToK = Math.round((this.cacheCT / 255) * 3800 + 2700)
               this.cacheMired = Math.max(Math.min(Math.round(1000000 / ctToK), 500), 140)
               hs = this.colourUtils.m2hs(this.cacheMired)
               this.cacheHue = hs[0]
               this.service.updateCharacteristic(this.hapChar.Hue, this.cacheHue)
               this.service.updateCharacteristic(this.hapChar.Saturation, hs[1])
-              this.service.updateCharacteristic(
-                this.hapChar.ColorTemperature,
-                this.cacheMired
-              )
+              this.service.updateCharacteristic(this.hapChar.ColorTemperature, this.cacheMired)
               if (params.updateSource) {
                 if (!this.disableDeviceLogging) {
                   this.log('[%s] %s [%sK].', this.name, this.lang.curColour, ctToK)
                 }
-                if (
-                  this.accessory.alController.isAdaptiveLightingActive() &&
-                  ctDiff > 20
-                ) {
+                if (this.accessory.alController.isAdaptiveLightingActive() && ctDiff > 20) {
                   // Look for a variation greater than twenty
                   this.accessory.alController.disableAdaptiveLighting()
                   if (!this.disableDeviceLogging) {
diff --git a/lib/device/light-rgb.js b/lib/device/light-rgb.js
index d185a032..cd0d73b0 100644
--- a/lib/device/light-rgb.js
+++ b/lib/device/light-rgb.js
@@ -20,18 +20,22 @@ module.exports = class deviceLightRGB {
 
     // Set up custom variables for this device type
     const deviceConf = platform.lightDevices[accessory.context.eweDeviceId]
-    this.alShift = deviceConf && deviceConf.adaptiveLightingShift
-      ? deviceConf.adaptiveLightingShift
-      : platform.consts.defaultValues.adaptiveLightingShift
-    this.brightStep = deviceConf && deviceConf.brightnessStep
-      ? Math.min(deviceConf.brightnessStep, 100)
-      : platform.consts.defaultValues.brightnessStep
-    this.disableDeviceLogging = deviceConf && deviceConf.overrideDisabledLogging
-      ? false
-      : platform.config.disableDeviceLogging
+    this.alShift =
+      deviceConf && deviceConf.adaptiveLightingShift
+        ? deviceConf.adaptiveLightingShift
+        : platform.consts.defaultValues.adaptiveLightingShift
+    this.brightStep =
+      deviceConf && deviceConf.brightnessStep
+        ? Math.min(deviceConf.brightnessStep, 100)
+        : platform.consts.defaultValues.brightnessStep
+    this.disableDeviceLogging =
+      deviceConf && deviceConf.overrideDisabledLogging
+        ? false
+        : platform.config.disableDeviceLogging
 
     // Add the lightbulb service if it doesn't already exist
-    this.service = this.accessory.getService(this.hapServ.Lightbulb) ||
+    this.service =
+      this.accessory.getService(this.hapServ.Lightbulb) ||
       this.accessory.addService(this.hapServ.Lightbulb)
 
     // Add the set handler to the lightbulb on/off characteristic
@@ -40,7 +44,8 @@ module.exports = class deviceLightRGB {
     })
 
     // Add the set handler to the lightbulb brightness characteristic
-    this.service.getCharacteristic(this.hapChar.Brightness)
+    this.service
+      .getCharacteristic(this.hapChar.Brightness)
       .setProps({ minStep: 100 })
       .onSet(async value => {
         await this.internalBrightnessUpdate(value)
@@ -53,7 +58,9 @@ module.exports = class deviceLightRGB {
 
     // Output the customised options to the log if in debug mode
     if (platform.config.debug) {
-      const opts = JSON.stringify({ disableDeviceLogging: this.disableDeviceLogging })
+      const opts = JSON.stringify({
+        disableDeviceLogging: this.disableDeviceLogging
+      })
       this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
     }
   }
@@ -66,7 +73,9 @@ module.exports = class deviceLightRGB {
         return
       }
       params.state = newValue
-      const timerKey = Math.random().toString(36).substr(2, 8)
+      const timerKey = Math.random()
+        .toString(36)
+        .substr(2, 8)
       this.updateTimeout = timerKey
       setTimeout(() => {
         if (this.updateTimeout === timerKey) {
@@ -105,7 +114,9 @@ module.exports = class deviceLightRGB {
       if (this.cacheHue === value) {
         return
       }
-      const updateKeyColour = Math.random().toString(36).substr(2, 8)
+      const updateKeyColour = Math.random()
+        .toString(36)
+        .substr(2, 8)
       this.updateKeyColour = updateKeyColour
       await this.funcs.sleep(400)
       if (updateKeyColour !== this.updateKeyColour) {
diff --git a/lib/device/motor.js b/lib/device/motor.js
index f28f53a2..36940590 100644
--- a/lib/device/motor.js
+++ b/lib/device/motor.js
@@ -27,12 +27,14 @@ module.exports = class deviceMotor {
 
     // Set up custom variables for this device type
     const deviceConf = platform.multiDevices[accessory.context.eweDeviceId]
-    this.disableDeviceLogging = deviceConf && deviceConf.overrideDisabledLogging
-      ? false
-      : platform.config.disableDeviceLogging
+    this.disableDeviceLogging =
+      deviceConf && deviceConf.overrideDisabledLogging
+        ? false
+        : platform.config.disableDeviceLogging
 
     // Add the window covering service if it doesn't already exist
-    this.service = this.accessory.getService(this.hapServ.WindowCovering) ||
+    this.service =
+      this.accessory.getService(this.hapServ.WindowCovering) ||
       this.accessory.addService(this.hapServ.WindowCovering)
 
     // Add the set handler to the target position characteristic
@@ -42,7 +44,9 @@ module.exports = class deviceMotor {
 
     // Output the customised options to the log if in debug mode
     if (platform.config.debug) {
-      const opts = JSON.stringify({ disableDeviceLogging: this.disableDeviceLogging })
+      const opts = JSON.stringify({
+        disableDeviceLogging: this.disableDeviceLogging
+      })
       this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
     }
   }
@@ -52,7 +56,9 @@ module.exports = class deviceMotor {
       if (this.cachePos === value) {
         return
       }
-      const updateKey = Math.random().toString(36).substr(2, 8)
+      const updateKey = Math.random()
+        .toString(36)
+        .substr(2, 8)
       this.updateKey = updateKey
       await this.funcs.sleep(500)
       if (updateKey !== this.updateKey) {
@@ -68,10 +74,7 @@ module.exports = class deviceMotor {
       // Catch any errors and let the platform display them
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
-        this.service.updateCharacteristic(
-          this.hapChar.TargetPosition,
-          this.cachePos
-        )
+        this.service.updateCharacteristic(this.hapChar.TargetPosition, this.cachePos)
       }, 2000)
       throw new this.hapErr(-70402)
     }
@@ -86,14 +89,8 @@ module.exports = class deviceMotor {
       ) {
         if (this.cachePos !== params.location) {
           this.cachePos = params.location
-          this.service.updateCharacteristic(
-            this.hapChar.TargetPosition,
-            this.cachePos
-          )
-          this.service.updateCharacteristic(
-            this.hapChar.CurrentPosition,
-            this.cachePos
-          )
+          this.service.updateCharacteristic(this.hapChar.TargetPosition, this.cachePos)
+          this.service.updateCharacteristic(this.hapChar.CurrentPosition, this.cachePos)
           this.service.updateCharacteristic(this.hapChar.PositionState, 2)
           if (!this.disableDeviceLogging) {
             this.log('[%s] %s [%s%].', this.name, this.lang.curPos, this.cachePos)
diff --git a/lib/device/outlet-double.js b/lib/device/outlet-double.js
index 8b3f2892..2d335c0e 100644
--- a/lib/device/outlet-double.js
+++ b/lib/device/outlet-double.js
@@ -22,15 +22,15 @@ module.exports = class deviceOutletDouble {
 
     // Set up custom variables for this device type
     const deviceConf = platform.multiDevices[accessory.context.eweDeviceId]
-    this.hideChannels = deviceConf && deviceConf.hideChannels
-      ? deviceConf.hideChannels
-      : undefined
-    this.inUsePowerThreshold = deviceConf && deviceConf.inUsePowerThreshold
-      ? deviceConf.inUsePowerThreshold
-      : platform.consts.defaultValues.inUsePowerThreshold
-    this.disableDeviceLogging = deviceConf && deviceConf.overrideDisabledLogging
-      ? false
-      : platform.config.disableDeviceLogging
+    this.hideChannels = deviceConf && deviceConf.hideChannels ? deviceConf.hideChannels : undefined
+    this.inUsePowerThreshold =
+      deviceConf && deviceConf.inUsePowerThreshold
+        ? deviceConf.inUsePowerThreshold
+        : platform.consts.defaultValues.inUsePowerThreshold
+    this.disableDeviceLogging =
+      deviceConf && deviceConf.overrideDisabledLogging
+        ? false
+        : platform.config.disableDeviceLogging
 
     // If the accessory has a switch service then remove it
     if (this.accessory.getService(this.hapServ.Switch)) {
@@ -70,14 +70,10 @@ module.exports = class deviceOutletDouble {
 
     if (accessory.context.switchNumber === '0') {
       if (this.service.testCharacteristic(this.hapChar.OutletInUse)) {
-        this.service.removeCharacteristic(
-          this.service.getCharacteristic(this.hapChar.OutletInUse)
-        )
+        this.service.removeCharacteristic(this.service.getCharacteristic(this.hapChar.OutletInUse))
       }
       if (this.service.testCharacteristic(this.eveChar.Voltage)) {
-        this.service.removeCharacteristic(
-          this.service.getCharacteristic(this.eveChar.Voltage)
-        )
+        this.service.removeCharacteristic(this.service.getCharacteristic(this.eveChar.Voltage))
         this.service.removeCharacteristic(
           this.service.getCharacteristic(this.eveChar.CurrentConsumption)
         )
@@ -115,7 +111,10 @@ module.exports = class deviceOutletDouble {
           break
         case '1':
         case '2':
-          params.switches.push({ switch: value ? 'on' : 'off', outlet: switchNumber - 1 })
+          params.switches.push({
+            switch: value ? 'on' : 'off',
+            outlet: switchNumber - 1
+          })
           break
       }
       await this.platform.sendDeviceUpdate(this.accessory, params)
@@ -184,10 +183,9 @@ module.exports = class deviceOutletDouble {
             const idToCheck = this.accessory.context.eweDeviceId + 'SW0'
             const uuid = this.hapUUIDGen(idToCheck)
             const priAccessory = this.devicesInHB.get(uuid)
-            priAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
-              this.hapChar.On,
-              primaryState
-            )
+            priAccessory
+              .getService(this.hapServ.Outlet)
+              .updateCharacteristic(this.hapChar.On, primaryState)
           }
           break
       }
@@ -222,14 +220,9 @@ module.exports = class deviceOutletDouble {
             if (params.switches[i - 1].switch === 'on') {
               primaryState = true
             }
-            const currentState = service.getCharacteristic(this.hapChar.On).value
-              ? 'on'
-              : 'off'
+            const currentState = service.getCharacteristic(this.hapChar.On).value ? 'on' : 'off'
             if (!params.updateSource || params.switches[i - 1].switch !== currentState) {
-              service.updateCharacteristic(
-                this.hapChar.On,
-                params.switches[i - 1].switch === 'on'
-              )
+              service.updateCharacteristic(this.hapChar.On, params.switches[i - 1].switch === 'on')
               if (params.switches[i - 1].switch === 'off') {
                 service.updateCharacteristic(this.hapChar.OutletInUse, false)
                 service.updateCharacteristic(this.eveChar.CurrentConsumption, 0)
@@ -277,15 +270,9 @@ module.exports = class deviceOutletDouble {
             this.log(
               '[%s] %s%s%s.',
               this.name,
-              power !== undefined
-                ? ' ' + this.lang.curPower + ' [' + power + 'W]'
-                : '',
-              voltage !== undefined
-                ? ' ' + this.lang.curVolt + ' [' + voltage + 'V]'
-                : '',
-              current !== undefined
-                ? ' ' + this.lang.curCurr + ' [' + current + 'A]'
-                : ''
+              power !== undefined ? ' ' + this.lang.curPower + ' [' + power + 'W]' : '',
+              voltage !== undefined ? ' ' + this.lang.curVolt + ' [' + voltage + 'V]' : '',
+              current !== undefined ? ' ' + this.lang.curCurr + ' [' + current + 'A]' : ''
             )
           }
         }
diff --git a/lib/device/outlet-multi.js b/lib/device/outlet-multi.js
index 1ed65cd6..6a286bcb 100644
--- a/lib/device/outlet-multi.js
+++ b/lib/device/outlet-multi.js
@@ -21,12 +21,11 @@ module.exports = class deviceOutletMulti {
 
     // Set up custom variables for this device type
     const deviceConf = platform.multiDevices[accessory.context.eweDeviceId]
-    this.hideChannels = deviceConf && deviceConf.hideChannels
-      ? deviceConf.hideChannels
-      : undefined
-    this.disableDeviceLogging = deviceConf && deviceConf.overrideDisabledLogging
-      ? false
-      : platform.config.disableDeviceLogging
+    this.hideChannels = deviceConf && deviceConf.hideChannels ? deviceConf.hideChannels : undefined
+    this.disableDeviceLogging =
+      deviceConf && deviceConf.overrideDisabledLogging
+        ? false
+        : platform.config.disableDeviceLogging
 
     // If the accessory has a switch service then remove it
     if (this.accessory.getService(this.hapServ.Switch)) {
@@ -34,7 +33,8 @@ module.exports = class deviceOutletMulti {
     }
 
     // Add the outlet service if it doesn't already exist
-    this.service = this.accessory.getService(this.hapServ.Outlet) ||
+    this.service =
+      this.accessory.getService(this.hapServ.Outlet) ||
       this.accessory.addService(this.hapServ.Outlet)
 
     // Add the set handler to the switch/outlet on/off characteristic
@@ -44,9 +44,7 @@ module.exports = class deviceOutletMulti {
 
     // Remove any OutletInUse characteristics from previous plugin versions
     if (this.service.testCharacteristic(this.hapChar.OutletInUse)) {
-      this.service.removeCharacteristic(
-        this.service.getCharacteristic(this.hapChar.OutletInUse)
-      )
+      this.service.removeCharacteristic(this.service.getCharacteristic(this.hapChar.OutletInUse))
     }
 
     // Output the customised options to the log if in debug mode
@@ -77,7 +75,10 @@ module.exports = class deviceOutletMulti {
         case '2':
         case '3':
         case '4':
-          params.switches.push({ switch: value ? 'on' : 'off', outlet: switchNumber - 1 })
+          params.switches.push({
+            switch: value ? 'on' : 'off',
+            outlet: switchNumber - 1
+          })
           break
       }
       await this.platform.sendDeviceUpdate(this.accessory, params)
@@ -88,10 +89,9 @@ module.exports = class deviceOutletMulti {
             const uuid = this.hapUUIDGen(idToCheck)
             if (this.devicesInHB.has(uuid)) {
               const subAccessory = this.devicesInHB.get(uuid)
-              subAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
-                this.hapChar.On,
-                value
-              )
+              subAccessory
+                .getService(this.hapServ.Outlet)
+                .updateCharacteristic(this.hapChar.On, value)
               if (i > 0 && !this.disableDeviceLogging) {
                 this.log(
                   '[%s] %s [%s].',
@@ -126,8 +126,8 @@ module.exports = class deviceOutletMulti {
                 }
               } else {
                 if (
-                  subAccessory.getService(this.hapServ.Outlet)
-                    .getCharacteristic(this.hapChar.On).value
+                  subAccessory.getService(this.hapServ.Outlet).getCharacteristic(this.hapChar.On)
+                    .value
                 ) {
                   primaryState = true
                 }
@@ -138,10 +138,9 @@ module.exports = class deviceOutletMulti {
             const idToCheck = this.accessory.context.eweDeviceId + 'SW0'
             const uuid = this.hapUUIDGen(idToCheck)
             const priAccessory = this.devicesInHB.get(uuid)
-            priAccessory.getService(this.hapServ.Outlet).updateCharacteristic(
-              this.hapChar.On,
-              primaryState
-            )
+            priAccessory
+              .getService(this.hapServ.Outlet)
+              .updateCharacteristic(this.hapChar.On, primaryState)
           }
           break
       }
@@ -169,16 +168,11 @@ module.exports = class deviceOutletMulti {
           }
           const subAccessory = this.devicesInHB.get(uuid)
           const service = subAccessory.getService(this.hapServ.Outlet)
-          const currentState = service.getCharacteristic(this.hapChar.On).value
-            ? 'on'
-            : 'off'
+          const currentState = service.getCharacteristic(this.hapChar.On).value ? 'on' : 'off'
           if (params.updateSource && params.switches[i - 1].switch === currentState) {
             continue
           }
-          service.updateCharacteristic(
-            this.hapChar.On,
-            params.switches[i - 1].switch === 'on'
-          )
+          service.updateCharacteristic(this.hapChar.On, params.switches[i - 1].switch === 'on')
           if (params.updateSource && !this.disableDeviceLogging) {
             this.log(
               '[%s] %s [%s].',
diff --git a/lib/device/outlet-power.js b/lib/device/outlet-power.js
index 39e59fc8..29862e6f 100644
--- a/lib/device/outlet-power.js
+++ b/lib/device/outlet-power.js
@@ -20,12 +20,14 @@ module.exports = class deviceOutletPower {
 
     // Set up custom variables for this device type
     const deviceConf = platform.outletDevices[accessory.context.eweDeviceId]
-    this.inUsePowerThreshold = deviceConf && deviceConf.inUsePowerThreshold
-      ? deviceConf.inUsePowerThreshold
-      : platform.consts.defaultValues.inUsePowerThreshold
-    this.disableDeviceLogging = deviceConf && deviceConf.overrideDisabledLogging
-      ? false
-      : platform.config.disableDeviceLogging
+    this.inUsePowerThreshold =
+      deviceConf && deviceConf.inUsePowerThreshold
+        ? deviceConf.inUsePowerThreshold
+        : platform.consts.defaultValues.inUsePowerThreshold
+    this.disableDeviceLogging =
+      deviceConf && deviceConf.overrideDisabledLogging
+        ? false
+        : platform.config.disableDeviceLogging
 
     // If the accessory has a switch service then remove it
     if (this.accessory.getService(this.hapServ.Switch)) {
@@ -182,7 +184,9 @@ module.exports = class deviceOutletPower {
           this.cacheState === 'on' && power > this.inUsePowerThreshold
         )
         this.service.updateCharacteristic(this.eveChar.CurrentConsumption, power)
-        this.accessory.eveService.addEntry({ power: this.cacheState === 'on' ? power : 0 })
+        this.accessory.eveService.addEntry({
+          power: this.cacheState === 'on' ? power : 0
+        })
         this.accessory.context.energyReadings.push(power)
         logger = true
       }
diff --git a/lib/device/outlet-scm.js b/lib/device/outlet-scm.js
index eb86e64f..30c54e0c 100644
--- a/lib/device/outlet-scm.js
+++ b/lib/device/outlet-scm.js
@@ -19,9 +19,10 @@ module.exports = class deviceOutletSCM {
     // Set up custom variables for this device type
     const deviceConf = platform.outletDevices[accessory.context.eweDeviceId]
     this.showAsSwitch = deviceConf && deviceConf.showAsSwitch
-    this.disableDeviceLogging = deviceConf && deviceConf.overrideDisabledLogging
-      ? false
-      : platform.config.disableDeviceLogging
+    this.disableDeviceLogging =
+      deviceConf && deviceConf.overrideDisabledLogging
+        ? false
+        : platform.config.disableDeviceLogging
 
     // Check if the user has overridden how this accessory should appear
     if (this.showAsSwitch) {
@@ -31,7 +32,8 @@ module.exports = class deviceOutletSCM {
       }
 
       // Add the switch service if it doesn't already exist
-      this.service = this.accessory.getService(this.hapServ.Switch) ||
+      this.service =
+        this.accessory.getService(this.hapServ.Switch) ||
         this.accessory.addService(this.hapServ.Switch)
     } else {
       // The default is an outlet so if the accessory has an switch service then remove it
@@ -40,7 +42,8 @@ module.exports = class deviceOutletSCM {
       }
 
       // Add the outlet service if it doesn't already exist
-      this.service = this.accessory.getService(this.hapServ.Outlet) ||
+      this.service =
+        this.accessory.getService(this.hapServ.Outlet) ||
         this.accessory.addService(this.hapServ.Outlet)
     }
 
diff --git a/lib/device/outlet-single.js b/lib/device/outlet-single.js
index 3506992b..40955a43 100644
--- a/lib/device/outlet-single.js
+++ b/lib/device/outlet-single.js
@@ -20,9 +20,10 @@ module.exports = class deviceOutletSingle {
 
     // Set up custom variables for this device type
     const deviceConf = platform.outletDevices[accessory.context.eweDeviceId]
-    this.disableDeviceLogging = deviceConf && deviceConf.overrideDisabledLogging
-      ? false
-      : platform.config.disableDeviceLogging
+    this.disableDeviceLogging =
+      deviceConf && deviceConf.overrideDisabledLogging
+        ? false
+        : platform.config.disableDeviceLogging
 
     // If the accessory has a switch service then remove it
     if (this.accessory.getService(this.hapServ.Switch)) {
@@ -30,7 +31,8 @@ module.exports = class deviceOutletSingle {
     }
 
     // Add the outlet service if it doesn't already exist
-    this.service = this.accessory.getService(this.hapServ.Outlet) ||
+    this.service =
+      this.accessory.getService(this.hapServ.Outlet) ||
       this.accessory.addService(this.hapServ.Outlet)
 
     // Add the set handler to the outlet on/off characteristic
diff --git a/lib/device/rf-bridge.js b/lib/device/rf-bridge.js
index 4a93db08..f4e1d95e 100644
--- a/lib/device/rf-bridge.js
+++ b/lib/device/rf-bridge.js
@@ -34,7 +34,9 @@ module.exports = class deviceRFBridge {
         this.accessory.getService(name).updateCharacteristic(this.hapChar.On, false)
 
         // Add the set handler to the switch on/off characteristic
-        this.accessory.getService(name).getCharacteristic(this.hapChar.On)
+        this.accessory
+          .getService(name)
+          .getCharacteristic(this.hapChar.On)
           .onSet(async value => {
             await this.internalPressUpdate(chan, name, value)
           })
@@ -117,12 +119,7 @@ module.exports = class deviceRFBridge {
         rfChl: parseInt(rfChl)
       }
       await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.log(
-        '[%s] %s [%s].',
-        this.name,
-        this.lang.curState,
-        this.lang.buttonTrig
-      )
+      this.log('[%s] %s [%s].', this.name, this.lang.curState, this.lang.buttonTrig)
       setTimeout(() => {
         this.accessory.getService(service).updateCharacteristic(this.hapChar.On, false)
       }, 1000)
@@ -210,10 +207,7 @@ module.exports = class deviceRFBridge {
                   case 'button':
                   case 'curtain': {
                     const service = subAccessory.context.buttons[channel]
-                    subAccessory.getService(service).updateCharacteristic(
-                      this.hapChar.On,
-                      true
-                    )
+                    subAccessory.getService(service).updateCharacteristic(this.hapChar.On, true)
                     this.log(
                       '[%s] %s [%s].',
                       subAccessory.displayName,
@@ -221,10 +215,7 @@ module.exports = class deviceRFBridge {
                       this.lang.buttonTrig
                     )
                     await this.funcs.sleep(3000)
-                    subAccessory.getService(service).updateCharacteristic(
-                      this.hapChar.On,
-                      false
-                    )
+                    subAccessory.getService(service).updateCharacteristic(this.hapChar.On, false)
                     return
                   }
                   case 'water':
@@ -248,10 +239,12 @@ module.exports = class deviceRFBridge {
                     serv = this.hapServ.ContactSensor
                     char = this.hapChar.ContactSensorState
                     const initialTime = subAccessory.eveService.getInitialTime()
-                    subAccessory.getService(serv).updateCharacteristic(
-                      this.eveChar.LastActivation,
-                      Math.round(new Date().valueOf() / 1000) - initialTime
-                    )
+                    subAccessory
+                      .getService(serv)
+                      .updateCharacteristic(
+                        this.eveChar.LastActivation,
+                        Math.round(new Date().valueOf() / 1000) - initialTime
+                      )
                     break
                   }
                   case 'occupancy':
@@ -262,10 +255,12 @@ module.exports = class deviceRFBridge {
                     serv = this.hapServ.MotionSensor
                     char = this.hapChar.MotionDetected
                     const initialTime = subAccessory.eveService.getInitialTime()
-                    subAccessory.getService(serv).updateCharacteristic(
-                      this.eveChar.LastActivation,
-                      Math.round(new Date().valueOf() / 1000) - initialTime
-                    )
+                    subAccessory
+                      .getService(serv)
+                      .updateCharacteristic(
+                        this.eveChar.LastActivation,
+                        Math.round(new Date().valueOf() / 1000) - initialTime
+                      )
                     break
                   }
                 }
@@ -279,7 +274,9 @@ module.exports = class deviceRFBridge {
                     this.lang.rfTrigYes
                   )
                 }
-                const updateKey = Math.random().toString(36).substr(2, 8)
+                const updateKey = Math.random()
+                  .toString(36)
+                  .substr(2, 8)
                 subAccessory.context.updateKey = updateKey
                 await this.funcs.sleep(subAccessory.context.sensorTimeLength * 1000)
                 if (updateKey !== subAccessory.context.updateKey) {
diff --git a/lib/device/sensor-ambient.js b/lib/device/sensor-ambient.js
index 07ad636f..b0a54b9c 100644
--- a/lib/device/sensor-ambient.js
+++ b/lib/device/sensor-ambient.js
@@ -20,12 +20,12 @@ module.exports = class deviceSensorAmbient {
     // Set up custom variables for this device type
     const deviceConf = platform.thDevices[accessory.context.eweDeviceId]
     this.hideSwitch = deviceConf && deviceConf.hideSwitch
-    this.tempOffset = deviceConf && deviceConf.offset
-      ? deviceConf.offset
-      : platform.consts.defaultValues.offset
-    this.disableDeviceLogging = deviceConf && deviceConf.overrideDisabledLogging
-      ? false
-      : platform.config.disableDeviceLogging
+    this.tempOffset =
+      deviceConf && deviceConf.offset ? deviceConf.offset : platform.consts.defaultValues.offset
+    this.disableDeviceLogging =
+      deviceConf && deviceConf.overrideDisabledLogging
+        ? false
+        : platform.config.disableDeviceLogging
 
     // If the accessory has a thermostat service then remove it
     if (this.accessory.getService(this.hapServ.Thermostat)) {
@@ -40,7 +40,8 @@ module.exports = class deviceSensorAmbient {
       }
     } else {
       // User has not hidden the switch service so add it if it doesn't already exist
-      this.switchService = this.accessory.getService(this.hapServ.Switch) ||
+      this.switchService =
+        this.accessory.getService(this.hapServ.Switch) ||
         this.accessory.addService(this.hapServ.Switch)
 
       // Add the set handler to the switch on/off characteristic
@@ -50,7 +51,8 @@ module.exports = class deviceSensorAmbient {
     }
 
     // Add the temperature sensor service if it doesn't already exist
-    this.tempService = this.accessory.getService(this.hapServ.TemperatureSensor) ||
+    this.tempService =
+      this.accessory.getService(this.hapServ.TemperatureSensor) ||
       this.accessory.addService(this.hapServ.TemperatureSensor)
 
     // Set custom properties of the current temperature characteristic
@@ -61,13 +63,12 @@ module.exports = class deviceSensorAmbient {
     // The DS18B20 sensor does not provide humidity readings
     if (this.accessory.context.sensorType === 'DS18B20') {
       if (this.accessory.getService(this.hapServ.HumiditySensor)) {
-        this.accessory.removeService(
-          this.accessory.getService(this.hapServ.HumiditySensor)
-        )
+        this.accessory.removeService(this.accessory.getService(this.hapServ.HumiditySensor))
       }
     } else {
       // Add the humidity sensor service if it doesn't already exist
-      this.humiService = this.accessory.getService(this.hapServ.HumiditySensor) ||
+      this.humiService =
+        this.accessory.getService(this.hapServ.HumiditySensor) ||
         this.accessory.addService(this.hapServ.HumiditySensor)
     }
 
@@ -119,11 +120,10 @@ module.exports = class deviceSensorAmbient {
         const newState = params.switch
         if (this.cacheState !== newState) {
           this.cacheState = newState
-          this.switchService.updateCharacteristic(
-            this.hapChar.On,
-            this.cacheState === 'on'
-          )
-          this.accessory.eveService.addEntry({ status: this.cacheState === 'on' ? 1 : 0 })
+          this.switchService.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
+          this.accessory.eveService.addEntry({
+            status: this.cacheState === 'on' ? 1 : 0
+          })
           if (params.updateSource && !this.disableDeviceLogging) {
             this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
           }
@@ -138,10 +138,7 @@ module.exports = class deviceSensorAmbient {
         eveLog.temp = currentTemp
         if (this.cacheTemp !== currentTemp) {
           this.cacheTemp = currentTemp
-          this.tempService.updateCharacteristic(
-            this.hapChar.CurrentTemperature,
-            this.cacheTemp
-          )
+          this.tempService.updateCharacteristic(this.hapChar.CurrentTemperature, this.cacheTemp)
           if (params.updateSource && !this.disableDeviceLogging) {
             this.log('[%s] %s [%s°C].', this.name, this.lang.curTemp, this.cacheTemp)
           }
@@ -165,10 +162,7 @@ module.exports = class deviceSensorAmbient {
           }
         }
       }
-      if (
-        this.funcs.hasProperty(eveLog, 'temp') ||
-        this.funcs.hasProperty(eveLog, 'humidity')
-      ) {
+      if (this.funcs.hasProperty(eveLog, 'temp') || this.funcs.hasProperty(eveLog, 'humidity')) {
         this.accessory.eveService.addEntry(eveLog)
       }
     } catch (err) {
diff --git a/lib/device/sensor-contact.js b/lib/device/sensor-contact.js
index 72b7eb74..be636de3 100644
--- a/lib/device/sensor-contact.js
+++ b/lib/device/sensor-contact.js
@@ -21,12 +21,14 @@ module.exports = class deviceSensorContact {
 
     // Set up custom variables for this device type
     const deviceConf = platform.sensorDevices[accessory.context.eweDeviceId]
-    this.lowBattThreshold = deviceConf && deviceConf.lowBattThreshold
-      ? Math.min(deviceConf.lowBattThreshold, 100)
-      : platform.consts.defaultValues.lowBattThreshold
-    this.disableDeviceLogging = deviceConf && deviceConf.overrideDisabledLogging
-      ? false
-      : platform.config.disableDeviceLogging
+    this.lowBattThreshold =
+      deviceConf && deviceConf.lowBattThreshold
+        ? Math.min(deviceConf.lowBattThreshold, 100)
+        : platform.consts.defaultValues.lowBattThreshold
+    this.disableDeviceLogging =
+      deviceConf && deviceConf.overrideDisabledLogging
+        ? false
+        : platform.config.disableDeviceLogging
 
     // If the accessory has a leak sensor service then remove it
     if (this.accessory.getService(this.hapServ.LeakSensor)) {
@@ -53,7 +55,8 @@ module.exports = class deviceSensorContact {
     })
 
     // Add the battery service if it doesn't already exist
-    this.batteryService = this.accessory.getService(this.hapServ.BatteryService) ||
+    this.batteryService =
+      this.accessory.getService(this.hapServ.BatteryService) ||
       this.accessory.addService(this.hapServ.BatteryService)
 
     // Pass the accessory to Fakegato to set up with Eve
@@ -77,10 +80,7 @@ module.exports = class deviceSensorContact {
         const scaledBattery = Math.round(params.battery * 33.3)
         if (this.cacheBatt !== scaledBattery) {
           this.cacheBatt = scaledBattery
-          this.batteryService.updateCharacteristic(
-            this.hapChar.BatteryLevel,
-            this.cacheBatt
-          )
+          this.batteryService.updateCharacteristic(this.hapChar.BatteryLevel, this.cacheBatt)
           this.batteryService.updateCharacteristic(
             this.hapChar.StatusLowBattery,
             this.cacheBatt < this.lowBattThreshold
@@ -118,10 +118,7 @@ module.exports = class deviceSensorContact {
         )
       }
       for (const [deviceId, group] of Object.entries(this.platform.simulations)) {
-        if (
-          group.sensorId === this.accessory.context.eweDeviceId &&
-          group.type === 'garage'
-        ) {
+        if (group.sensorId === this.accessory.context.eweDeviceId && group.type === 'garage') {
           const uuid = this.hapUUIDGen(deviceId + 'SWX')
           if (this.devicesInHB.has(uuid)) {
             const subAccessory = this.devicesInHB.get(uuid)
@@ -132,12 +129,7 @@ module.exports = class deviceSensorContact {
                 gdService.updateCharacteristic(this.hapChar.TargetDoorState, 1)
                 gdService.updateCharacteristic(this.hapChar.CurrentDoorState, 1)
                 if (params.updateSource && !this.disableDeviceLogging) {
-                  this.log(
-                    '[%s] %s [%s].',
-                    name,
-                    this.lang.curState,
-                    this.lang.doorClosed
-                  )
+                  this.log('[%s] %s [%s].', name, this.lang.curState, this.lang.doorClosed)
                 }
                 break
               case 1:
@@ -145,12 +137,7 @@ module.exports = class deviceSensorContact {
                 gdService.updateCharacteristic(this.hapChar.TargetDoorState, 0)
                 gdService.updateCharacteristic(this.hapChar.CurrentDoorState, 0)
                 if (params.updateSource && !this.disableDeviceLogging) {
-                  this.log(
-                    '[%s] %s [%s].',
-                    name,
-                    this.lang.curState,
-                    this.lang.doorOpen
-                  )
+                  this.log('[%s] %s [%s].', name, this.lang.curState, this.lang.doorOpen)
                 }
                 break
             }
diff --git a/lib/device/sensor-temp-humi.js b/lib/device/sensor-temp-humi.js
index 5cf033b5..89a6cca1 100644
--- a/lib/device/sensor-temp-humi.js
+++ b/lib/device/sensor-temp-humi.js
@@ -18,15 +18,16 @@ module.exports = class deviceSensorTempHumi {
 
     // Set up custom variables for this device type
     const deviceConf = platform.thDevices[accessory.context.eweDeviceId]
-    this.tempOffset = deviceConf && deviceConf.offset
-      ? deviceConf.offset
-      : platform.consts.defaultValues.offset
-    this.disableDeviceLogging = deviceConf && deviceConf.overrideDisabledLogging
-      ? false
-      : platform.config.disableDeviceLogging
+    this.tempOffset =
+      deviceConf && deviceConf.offset ? deviceConf.offset : platform.consts.defaultValues.offset
+    this.disableDeviceLogging =
+      deviceConf && deviceConf.overrideDisabledLogging
+        ? false
+        : platform.config.disableDeviceLogging
 
     // Add the temperature sensor service if it doesn't already exist
-    this.tempService = this.accessory.getService(this.hapServ.TemperatureSensor) ||
+    this.tempService =
+      this.accessory.getService(this.hapServ.TemperatureSensor) ||
       this.accessory.addService(this.hapServ.TemperatureSensor)
 
     // Set custom properties of the current temperature characteristic
@@ -35,7 +36,8 @@ module.exports = class deviceSensorTempHumi {
     })
 
     // Add the humidity sensor service if it doesn't already exist
-    this.humiService = this.accessory.getService(this.hapServ.HumiditySensor) ||
+    this.humiService =
+      this.accessory.getService(this.hapServ.HumiditySensor) ||
       this.accessory.addService(this.hapServ.HumiditySensor)
 
     // Pass the accessory to Fakegato to set up with Eve
@@ -61,10 +63,7 @@ module.exports = class deviceSensorTempHumi {
         eveLog.temp = currentTemp
         if (this.cacheTemp !== currentTemp) {
           this.cacheTemp = currentTemp
-          this.tempService.updateCharacteristic(
-            this.hapChar.CurrentTemperature,
-            this.cacheTemp
-          )
+          this.tempService.updateCharacteristic(this.hapChar.CurrentTemperature, this.cacheTemp)
           if (params.updateSource && !this.disableDeviceLogging) {
             this.log('[%s] %s [%s°C].', this.name, this.lang.curTemp, this.cacheTemp)
           }
@@ -84,10 +83,7 @@ module.exports = class deviceSensorTempHumi {
           }
         }
       }
-      if (
-        this.funcs.hasProperty(eveLog, 'temp') ||
-        this.funcs.hasProperty(eveLog, 'humidity')
-      ) {
+      if (this.funcs.hasProperty(eveLog, 'temp') || this.funcs.hasProperty(eveLog, 'humidity')) {
         this.accessory.eveService.addEntry(eveLog)
       }
     } catch (err) {
diff --git a/lib/device/simulation/blind.js b/lib/device/simulation/blind.js
index 10981bf7..5101b2ba 100644
--- a/lib/device/simulation/blind.js
+++ b/lib/device/simulation/blind.js
@@ -19,12 +19,12 @@ module.exports = class deviceBlind {
 
     // Set up custom variables for this device type
     const deviceConf = platform.simulations[accessory.context.eweDeviceId]
-    this.operationTimeUp = deviceConf.operationTime ||
-      platform.consts.defaultValues.operationTime
+    this.operationTimeUp = deviceConf.operationTime || platform.consts.defaultValues.operationTime
     this.operationTimeDown = deviceConf.operationTimeDown || this.operationTimeUp
-    this.disableDeviceLogging = deviceConf && deviceConf.overrideDisabledLogging
-      ? false
-      : platform.config.disableDeviceLogging
+    this.disableDeviceLogging =
+      deviceConf && deviceConf.overrideDisabledLogging
+        ? false
+        : platform.config.disableDeviceLogging
 
     // Set up the accessory with default positions when added the first time
     if (!this.funcs.hasProperty(this.accessory.context, 'cacheCurrentPosition')) {
@@ -71,15 +71,17 @@ module.exports = class deviceBlind {
       const prevState = this.accessory.context.cachePositionState
       const percentStepUpPerDS = this.operationTimeUp / 100
       const percentStepDownPerDS = this.operationTimeDown / 100
-      const updateKey = Math.random().toString(36).substr(2, 8)
+      const updateKey = Math.random()
+        .toString(36)
+        .substr(2, 8)
       this.updateKey = updateKey
       if (prevState !== 2) {
         params.switches.push({ switch: 'off', outlet: 0 })
         params.switches.push({ switch: 'off', outlet: 1 })
         await this.platform.sendDeviceUpdate(this.accessory, params)
         params.switches = []
-        const posPercentChange = Math.floor(Date.now() / 100) -
-          this.accessory.context.cacheLastStartTime
+        const posPercentChange =
+          Math.floor(Date.now() / 100) - this.accessory.context.cacheLastStartTime
         const posPercentChangeUp = Math.floor(percentStepUpPerDS * posPercentChange)
         const posPercentChangeDown = Math.floor(percentStepDownPerDS * posPercentChange)
         if (prevState === 0) {
@@ -132,14 +134,9 @@ module.exports = class deviceBlind {
           this.accessory.context.cacheTargetPosition
         )
       }, 2000)
-      this.service.updateCharacteristic(
-        this.hapChar.TargetPosition,
-        new this.hapErr(-70402)
-      )
+      this.service.updateCharacteristic(this.hapChar.TargetPosition, new this.hapErr(-70402))
     }
   }
 
-  async externalUpdate (params) {
-
-  }
+  async externalUpdate (params) {}
 }
diff --git a/lib/device/simulation/door.js b/lib/device/simulation/door.js
index 9a36f093..634dbb0e 100644
--- a/lib/device/simulation/door.js
+++ b/lib/device/simulation/door.js
@@ -19,12 +19,12 @@ module.exports = class deviceDoor {
 
     // Set up custom variables for this device type
     const deviceConf = platform.simulations[accessory.context.eweDeviceId]
-    this.operationTimeUp = deviceConf.operationTime ||
-      platform.consts.defaultValues.operationTime
+    this.operationTimeUp = deviceConf.operationTime || platform.consts.defaultValues.operationTime
     this.operationTimeDown = deviceConf.operationTimeDown || this.operationTimeUp
-    this.disableDeviceLogging = deviceConf && deviceConf.overrideDisabledLogging
-      ? false
-      : platform.config.disableDeviceLogging
+    this.disableDeviceLogging =
+      deviceConf && deviceConf.overrideDisabledLogging
+        ? false
+        : platform.config.disableDeviceLogging
 
     // Set up the accessory with default positions when added the first time
     if (!this.funcs.hasProperty(this.accessory.context, 'cacheCurrentPosition')) {
@@ -71,15 +71,17 @@ module.exports = class deviceDoor {
       const prevState = this.accessory.context.cachePositionState
       const percentStepUpPerDS = this.operationTimeUp / 100
       const percentStepDownPerDS = this.operationTimeDown / 100
-      const updateKey = Math.random().toString(36).substr(2, 8)
+      const updateKey = Math.random()
+        .toString(36)
+        .substr(2, 8)
       this.updateKey = updateKey
       if (prevState !== 2) {
         params.switches.push({ switch: 'off', outlet: 0 })
         params.switches.push({ switch: 'off', outlet: 1 })
         await this.platform.sendDeviceUpdate(this.accessory, params)
         params.switches = []
-        const posPercentChange = Math.floor(Date.now() / 100) -
-          this.accessory.context.cacheLastStartTime
+        const posPercentChange =
+          Math.floor(Date.now() / 100) - this.accessory.context.cacheLastStartTime
         const posPercentChangeUp = Math.floor(percentStepUpPerDS * posPercentChange)
         const posPercentChangeDown = Math.floor(percentStepDownPerDS * posPercentChange)
         if (prevState === 0) {
@@ -132,14 +134,9 @@ module.exports = class deviceDoor {
           this.accessory.context.cacheTargetPosition
         )
       }, 2000)
-      this.service.updateCharacteristic(
-        this.hapChar.TargetPosition,
-        new this.hapErr(-70402)
-      )
+      this.service.updateCharacteristic(this.hapChar.TargetPosition, new this.hapErr(-70402))
     }
   }
 
-  async externalUpdate (params) {
-
-  }
+  async externalUpdate (params) {}
 }
diff --git a/lib/device/simulation/garage-eachen.js b/lib/device/simulation/garage-eachen.js
index 281e780e..719889ae 100644
--- a/lib/device/simulation/garage-eachen.js
+++ b/lib/device/simulation/garage-eachen.js
@@ -20,8 +20,7 @@ module.exports = class deviceGarageEachen {
 
     // Set up custom variables for this device type
     const deviceConf = platform.simulations[accessory.context.eweDeviceId]
-    this.operationTime = deviceConf.operationTime ||
-      platform.consts.defaultValues.operationTime
+    this.operationTime = deviceConf.operationTime || platform.consts.defaultValues.operationTime
     this.disableDeviceLogging = deviceConf.overrideDisabledLogging
       ? false
       : platform.config.disableDeviceLogging
@@ -33,9 +32,7 @@ module.exports = class deviceGarageEachen {
 
     // If the accessory has a contact sensor service then remove it
     if (this.accessory.getService(this.hapServ.ContactSensor)) {
-      this.accessory.removeService(
-        this.accessory.getService(this.hapServ.ContactSensor)
-      )
+      this.accessory.removeService(this.accessory.getService(this.hapServ.ContactSensor))
     }
 
     // Add the garage door service if it doesn't already exist
@@ -124,10 +121,7 @@ module.exports = class deviceGarageEachen {
           this.accessory.context.cacheTargetPosition
         )
       }, 2000)
-      this.service.updateCharacteristic(
-        this.hapChar.TargetPosition,
-        new this.hapErr(-70402)
-      )
+      this.service.updateCharacteristic(this.hapChar.TargetPosition, new this.hapErr(-70402))
     }
   }
 
@@ -153,10 +147,7 @@ module.exports = class deviceGarageEachen {
           Math.round(new Date().valueOf() / 1000) - initialTime
         )
         this.timesOpened++
-        this.service.updateCharacteristic(
-          this.eveChar.TimesOpened,
-          this.timesOpened
-        )
+        this.service.updateCharacteristic(this.eveChar.TimesOpened, this.timesOpened)
       } else {
         this.service.updateCharacteristic(this.hapChar.ContactSensorState, 0)
         this.accessory.eveService.addEntry({ status: 1 }) // swapped
diff --git a/lib/device/simulation/garage-four.js b/lib/device/simulation/garage-four.js
index 4e3adca6..8be00288 100644
--- a/lib/device/simulation/garage-four.js
+++ b/lib/device/simulation/garage-four.js
@@ -19,8 +19,7 @@ module.exports = class deviceGarageFour {
 
     // Set up custom variables for this device type
     const deviceConf = platform.simulations[accessory.context.eweDeviceId]
-    this.operationTimeUp = deviceConf.operationTime ||
-      platform.consts.defaultValues.operationTime
+    this.operationTimeUp = deviceConf.operationTime || platform.consts.defaultValues.operationTime
     this.operationTimeDown = deviceConf.operationTimeDown || this.operationTimeUp
     this.disableDeviceLogging = deviceConf.overrideDisabledLogging
       ? false
@@ -87,24 +86,27 @@ module.exports = class deviceGarageFour {
           garageChannel = 3
           break
       }
-      const prevState = this.accessory.context.cacheStates[garageChannel]
-        .cacheCurrentDoorState
+      const prevState = this.accessory.context.cacheStates[garageChannel].cacheCurrentDoorState
       if (value === prevState % 2) {
         return
       }
       const gdService = this.accessory.getService('Garage ' + garage)
       this.inUse = true
-      const updateKey = Math.random().toString(36).substr(2, 8)
+      const updateKey = Math.random()
+        .toString(36)
+        .substr(2, 8)
       this.updateKey = updateKey
       gdService.updateCharacteristic(this.hapChar.TargetDoorState, value)
       gdService.updateCharacteristic(this.hapChar.CurrentDoorState, value + 2)
       this.accessory.context.cacheStates[garageChannel].cacheTargetDoorState = value
       this.accessory.context.cacheStates[garageChannel].cacheCurrentDoorState = value + 2
       const params = {
-        switches: [{
-          switch: 'on',
-          outlet: garageChannel
-        }]
+        switches: [
+          {
+            switch: 'on',
+            outlet: garageChannel
+          }
+        ]
       }
       await this.platform.sendDeviceUpdate(this.accessory, params)
       await this.funcs.sleep(2000)
@@ -135,18 +137,9 @@ module.exports = class deviceGarageFour {
           this.accessory.context.cacheTargetPosition
         )
       }, 2000)
-      gdService.updateCharacteristic(
-        this.hapChar.TargetPosition,
-        new this.hapErr(-70402)
-      )
+      gdService.updateCharacteristic(this.hapChar.TargetPosition, new this.hapErr(-70402))
     }
   }
 
-  async externalUpdate (params) {
-    try {
-
-    } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, false)
-    }
-  }
+  async externalUpdate (params) {}
 }
diff --git a/lib/device/simulation/garage-od-switch.js b/lib/device/simulation/garage-od-switch.js
index 3887e4c5..51c77399 100644
--- a/lib/device/simulation/garage-od-switch.js
+++ b/lib/device/simulation/garage-od-switch.js
@@ -20,13 +20,15 @@ module.exports = class deviceGarageODSwitch {
     this.garageId = platform.obstructSwitches[accessory.context.eweDeviceId]
     const uuid = this.hapUUIDGen(this.garageId + 'SWX')
     this.garage = devicesInHB.get(uuid)
-    this.disableDeviceLogging = platform.simulations[this.garageId] &&
+    this.disableDeviceLogging =
+      platform.simulations[this.garageId] &&
       platform.simulations[this.garageId].overrideDisabledLogging
-      ? false
-      : platform.config.disableDeviceLogging
+        ? false
+        : platform.config.disableDeviceLogging
 
     // Add the switch service if it doesn't already exist
-    this.service = this.accessory.getService(this.hapServ.Switch) ||
+    this.service =
+      this.accessory.getService(this.hapServ.Switch) ||
       this.accessory.addService(this.hapServ.Switch)
 
     // Get the garage door accessory to which this switch relates
@@ -40,7 +42,9 @@ module.exports = class deviceGarageODSwitch {
 
     // Output the customised options to the log if in debug mode
     if (platform.config.debug) {
-      const opts = JSON.stringify({ disableDeviceLogging: this.disableDeviceLogging })
+      const opts = JSON.stringify({
+        disableDeviceLogging: this.disableDeviceLogging
+      })
       this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
     }
   }
diff --git a/lib/device/simulation/garage-one.js b/lib/device/simulation/garage-one.js
index bc84044b..1885c636 100644
--- a/lib/device/simulation/garage-one.js
+++ b/lib/device/simulation/garage-one.js
@@ -22,8 +22,7 @@ module.exports = class deviceGarageOne {
     // Set up custom variables for this device type
     const deviceConf = platform.simulations[accessory.context.eweDeviceId]
     this.setup = deviceConf.setup
-    this.operationTimeUp = deviceConf.operationTime ||
-      platform.consts.defaultValues.operationTime
+    this.operationTimeUp = deviceConf.operationTime || platform.consts.defaultValues.operationTime
     this.operationTimeDown = deviceConf.operationTimeDown || this.operationTimeUp
     this.disableDeviceLogging = deviceConf.overrideDisabledLogging
       ? false
@@ -49,9 +48,7 @@ module.exports = class deviceGarageOne {
       }
 
       // Check the sensor is a sensor
-      if (!platform.consts.devices.garageSensors.includes(
-        devicesInHB.get(uuid).context.eweUIID
-      )) {
+      if (!platform.consts.devices.garageSensors.includes(devicesInHB.get(uuid).context.eweUIID)) {
         this.error = this.lang.simErrNotSensor
       }
       this.definedSensor = devicesInHB.get(uuid)
@@ -69,9 +66,7 @@ module.exports = class deviceGarageOne {
 
     // If the accessory has a contact sensor service then remove it
     if (this.accessory.getService(this.hapServ.ContactSensor)) {
-      this.accessory.removeService(
-        this.accessory.getService(this.hapServ.ContactSensor)
-      )
+      this.accessory.removeService(this.accessory.getService(this.hapServ.ContactSensor))
     }
 
     // Add the garage door service if it doesn't already exist
@@ -130,8 +125,9 @@ module.exports = class deviceGarageOne {
       const params = {}
       let delay = 0
       const prevState = this.definedSensor
-        ? this.definedSensor.getService(this.hapServ.ContactSensor)
-          .getCharacteristic(this.hapChar.ContactSensorState).value === 0
+        ? this.definedSensor
+            .getService(this.hapServ.ContactSensor)
+            .getCharacteristic(this.hapChar.ContactSensorState).value === 0
           ? 1
           : 0
         : this.accessory.context.cacheCurrentDoorState
@@ -141,10 +137,7 @@ module.exports = class deviceGarageOne {
       this.inUse = true
       this.cacheState = value
       if (this.setup === 'oneSwitch' && [2, 3].includes(prevState)) {
-        this.service.updateCharacteristic(
-          this.hapChar.CurrentDoorState,
-          ((prevState * 2) % 3) + 2
-        )
+        this.service.updateCharacteristic(this.hapChar.CurrentDoorState, ((prevState * 2) % 3) + 2)
         this.accessory.context.cacheCurrentDoorState = ((prevState * 2) % 3) + 2
         delay = 1500
       }
@@ -199,10 +192,7 @@ module.exports = class deviceGarageOne {
           this.accessory.context.cacheTargetPosition
         )
       }, 2000)
-      this.service.updateCharacteristic(
-        this.hapChar.TargetPosition,
-        new this.hapErr(-70402)
-      )
+      this.service.updateCharacteristic(this.hapChar.TargetPosition, new this.hapErr(-70402))
     }
   }
 
diff --git a/lib/device/simulation/garage-two.js b/lib/device/simulation/garage-two.js
index 9f911a21..4b4eafb0 100644
--- a/lib/device/simulation/garage-two.js
+++ b/lib/device/simulation/garage-two.js
@@ -19,8 +19,7 @@ module.exports = class deviceGarageTwo {
 
     // Set up custom variables for this device type
     const deviceConf = platform.simulations[accessory.context.eweDeviceId]
-    this.operationTimeUp = deviceConf.operationTime ||
-      platform.consts.defaultValues.operationTime
+    this.operationTimeUp = deviceConf.operationTime || platform.consts.defaultValues.operationTime
     this.operationTimeDown = deviceConf.operationTimeDown || this.operationTimeUp
     this.disableDeviceLogging = deviceConf.overrideDisabledLogging
       ? false
@@ -75,9 +74,10 @@ module.exports = class deviceGarageTwo {
         switches: []
       }
       const gdService = this.accessory.getService(garage)
-      const prevState = garage === 'Garage 1'
-        ? this.accessory.context.cacheOneCurrentDoorState
-        : this.accessory.context.cacheTwoCurrentDoorState
+      const prevState =
+        garage === 'Garage 1'
+          ? this.accessory.context.cacheOneCurrentDoorState
+          : this.accessory.context.cacheTwoCurrentDoorState
       if (newPos === prevState % 2) {
         return
       }
@@ -88,24 +88,34 @@ module.exports = class deviceGarageTwo {
         case 'Garage 1': {
           this.accessory.context.cacheOneTargetDoorState = newPos
           this.accessory.context.cacheOneCurrentDoorState = newPos + 2
-          params.switches.push({ switch: newPos === 0 ? 'on' : 'off', outlet: 0 })
-          params.switches.push({ switch: newPos === 1 ? 'on' : 'off', outlet: 1 })
+          params.switches.push({
+            switch: newPos === 0 ? 'on' : 'off',
+            outlet: 0
+          })
+          params.switches.push({
+            switch: newPos === 1 ? 'on' : 'off',
+            outlet: 1
+          })
           break
         }
         case 'Garage 2': {
           this.accessory.context.cacheTwoTargetDoorState = newPos
           this.accessory.context.cacheTwoCurrentDoorState = newPos + 2
-          params.switches.push({ switch: newPos === 0 ? 'on' : 'off', outlet: 2 })
-          params.switches.push({ switch: newPos === 1 ? 'on' : 'off', outlet: 3 })
+          params.switches.push({
+            switch: newPos === 0 ? 'on' : 'off',
+            outlet: 2
+          })
+          params.switches.push({
+            switch: newPos === 1 ? 'on' : 'off',
+            outlet: 3
+          })
           break
         }
       }
       await this.platform.sendDeviceUpdate(this.accessory, params)
       await this.funcs.sleep(2000)
       this.inUse = false
-      const operationTime = newPos === 0
-        ? this.operationTimeUp
-        : this.operationTimeDown
+      const operationTime = newPos === 0 ? this.operationTimeUp : this.operationTimeDown
       await this.funcs.sleep(Math.max((operationTime - 20) * 100, 0))
       gdService.updateCharacteristic(this.hapChar.CurrentDoorState, newPos)
       switch (garage) {
@@ -144,10 +154,7 @@ module.exports = class deviceGarageTwo {
           this.accessory.context.cacheTargetPosition
         )
       }, 2000)
-      gdService.updateCharacteristic(
-        this.hapChar.TargetPosition,
-        new this.hapErr(-70402)
-      )
+      gdService.updateCharacteristic(this.hapChar.TargetPosition, new this.hapErr(-70402))
     }
   }
 
@@ -158,9 +165,10 @@ module.exports = class deviceGarageTwo {
       }
       ;['1', '2'].forEach(async v => {
         const gcService = this.accessory.getService('Garage ' + v)
-        const prevState = v === '1'
-          ? this.accessory.context.cacheOneCurrentDoorState
-          : this.accessory.context.cacheTwoCurrentDoorState
+        const prevState =
+          v === '1'
+            ? this.accessory.context.cacheOneCurrentDoorState
+            : this.accessory.context.cacheTwoCurrentDoorState
         const newPos = [0, 2].includes(prevState) ? 3 : 2
         switch (v) {
           case '1':
diff --git a/lib/device/simulation/lock-one.js b/lib/device/simulation/lock-one.js
index 50ce701c..eddbcbdd 100644
--- a/lib/device/simulation/lock-one.js
+++ b/lib/device/simulation/lock-one.js
@@ -19,8 +19,7 @@ module.exports = class deviceLockOne {
 
     // Set up custom variables for this device type
     const deviceConf = platform.simulations[accessory.context.eweDeviceId]
-    this.operationTime = deviceConf.operationTime ||
-      platform.consts.defaultValues.operationTime
+    this.operationTime = deviceConf.operationTime || platform.consts.defaultValues.operationTime
     this.setup = deviceConf.setup
     this.disableDeviceLogging = deviceConf.overrideDisabledLogging
       ? false
@@ -37,7 +36,8 @@ module.exports = class deviceLockOne {
     }
 
     // Add the lock service if it doesn't already exist
-    this.service = this.accessory.getService(this.hapServ.LockMechanism) ||
+    this.service =
+      this.accessory.getService(this.hapServ.LockMechanism) ||
       this.accessory.addService(this.hapServ.LockMechanism)
 
     // Add the set handler to the lock target state characteristic
@@ -47,7 +47,8 @@ module.exports = class deviceLockOne {
     })
 
     // Always show the accessory as locked on Homebridge restart
-    this.service.updateCharacteristic(this.hapChar.LockCurrentState, 1)
+    this.service
+      .updateCharacteristic(this.hapChar.LockCurrentState, 1)
       .updateCharacteristic(this.hapChar.LockTargetState, 1)
 
     // Output the customised options to the log if in debug mode
@@ -73,10 +74,12 @@ module.exports = class deviceLockOne {
           params.switch = 'on'
           break
         case 'twoSwitch':
-          params.switches = [{
-            switch: 'on',
-            outlet: 0
-          }]
+          params.switches = [
+            {
+              switch: 'on',
+              outlet: 0
+            }
+          ]
           break
       }
       this.inUse = true
@@ -98,10 +101,7 @@ module.exports = class deviceLockOne {
       setTimeout(() => {
         this.service.updateCharacteristic(this.hapChar.LockTargetState, 1)
       }, 2000)
-      this.service.updateCharacteristic(
-        this.hapChar.LockTargetState,
-        new this.hapErr(-70402)
-      )
+      this.service.updateCharacteristic(this.hapChar.LockTargetState, new this.hapErr(-70402))
     }
   }
 
@@ -132,7 +132,8 @@ module.exports = class deviceLockOne {
         this.log('[%s] %s [%s].', this.name, this.lang.curState, this.lang.lockUnlocked)
       }
       await this.funcs.sleep(Math.max(this.operationTime * 100, 1000))
-      this.service.updateCharacteristic(this.hapChar.LockCurrentState, 1)
+      this.service
+        .updateCharacteristic(this.hapChar.LockCurrentState, 1)
         .updateCharacteristic(this.hapChar.LockTargetState, 1)
       this.inUse = false
       if (params.updateSource && !this.disableDeviceLogging) {
diff --git a/lib/device/simulation/sensor-leak.js b/lib/device/simulation/sensor-leak.js
index 7e38b22d..0569ae6e 100644
--- a/lib/device/simulation/sensor-leak.js
+++ b/lib/device/simulation/sensor-leak.js
@@ -20,13 +20,14 @@ module.exports = class deviceSensorLeak {
     // Set up custom variables for this device type
     const deviceConf = platform.sensorDevices[accessory.context.eweDeviceId]
     const deviceConf2 = platform.simulations[accessory.context.eweDeviceId]
-    this.lowBattThreshold = deviceConf && deviceConf.lowBattThreshold
-      ? Math.min(deviceConf.lowBattThreshold, 100)
-      : platform.consts.defaultValues.lowBattThreshold
-    this.disableDeviceLogging = (deviceConf && deviceConf.overrideDisabledLogging) ||
-      deviceConf2.overrideDisabledLogging
-      ? false
-      : platform.config.disableDeviceLogging
+    this.lowBattThreshold =
+      deviceConf && deviceConf.lowBattThreshold
+        ? Math.min(deviceConf.lowBattThreshold, 100)
+        : platform.consts.defaultValues.lowBattThreshold
+    this.disableDeviceLogging =
+      (deviceConf && deviceConf.overrideDisabledLogging) || deviceConf2.overrideDisabledLogging
+        ? false
+        : platform.config.disableDeviceLogging
 
     // If the accessory has a contact sensor service then remove it
     if (this.accessory.getService(this.hapServ.ContactSensor)) {
@@ -40,7 +41,8 @@ module.exports = class deviceSensorLeak {
     }
 
     // Add the battery service if it doesn't already exist
-    this.batteryService = this.accessory.getService(this.hapServ.BatteryService) ||
+    this.batteryService =
+      this.accessory.getService(this.hapServ.BatteryService) ||
       this.accessory.addService(this.hapServ.BatteryService)
 
     // Pass the accessory to Fakegato to set up with Eve
@@ -65,10 +67,7 @@ module.exports = class deviceSensorLeak {
         const scaledBattery = Math.round(params.battery * 33.3)
         if (this.cacheBatt !== scaledBattery) {
           this.cacheBatt = scaledBattery
-          this.batteryService.updateCharacteristic(
-            this.hapChar.BatteryLevel,
-            this.cacheBatt
-          )
+          this.batteryService.updateCharacteristic(this.hapChar.BatteryLevel, this.cacheBatt)
           this.batteryService.updateCharacteristic(
             this.hapChar.StatusLowBattery,
             this.cacheBatt < this.lowBattThreshold
diff --git a/lib/device/simulation/switch-valve.js b/lib/device/simulation/switch-valve.js
index aac1dd44..8547dd8e 100644
--- a/lib/device/simulation/switch-valve.js
+++ b/lib/device/simulation/switch-valve.js
@@ -23,7 +23,8 @@ module.exports = class deviceSwitchValve {
       : platform.config.disableDeviceLogging
 
     // Add the switch service if it doesn't already exist
-    this.sService = this.accessory.getService(this.hapServ.Switch) ||
+    this.sService =
+      this.accessory.getService(this.hapServ.Switch) ||
       this.accessory.addService(this.hapServ.Switch)
 
     // Add the valve service if it doesn't already exist
@@ -82,10 +83,12 @@ module.exports = class deviceSwitchValve {
   async internalSwitchUpdate (value) {
     try {
       const params = {
-        switches: [{
-          switch: value ? 'on' : 'off',
-          outlet: 0
-        }]
+        switches: [
+          {
+            switch: value ? 'on' : 'off',
+            outlet: 0
+          }
+        ]
       }
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.cacheState = value ? 'on' : 'off'
@@ -105,10 +108,12 @@ module.exports = class deviceSwitchValve {
   async internalValveUpdate (value) {
     try {
       const params = {
-        switches: [{
-          switch: value ? 'on' : 'off',
-          outlet: 1
-        }]
+        switches: [
+          {
+            switch: value ? 'on' : 'off',
+            outlet: 1
+          }
+        ]
       }
       this.vService.updateCharacteristic(this.hapChar.InUse, value)
       switch (value) {
diff --git a/lib/device/simulation/tap-one.js b/lib/device/simulation/tap-one.js
index 4f2f397e..82512afb 100644
--- a/lib/device/simulation/tap-one.js
+++ b/lib/device/simulation/tap-one.js
@@ -68,10 +68,12 @@ module.exports = class deviceTapOne {
           params.switch = value ? 'on' : 'off'
           break
         case 'twoSwitch':
-          params.switches = [{
-            switch: value ? 'on' : 'off',
-            outlet: 0
-          }]
+          params.switches = [
+            {
+              switch: value ? 'on' : 'off',
+              outlet: 0
+            }
+          ]
           break
       }
       await this.platform.sendDeviceUpdate(this.accessory, params)
@@ -113,14 +115,8 @@ module.exports = class deviceTapOne {
           this.cacheState = params.switches[0].switch
           break
       }
-      this.service.updateCharacteristic(
-        this.hapChar.Active,
-        this.cacheState === 'on' ? 1 : 0
-      )
-      this.service.updateCharacteristic(
-        this.hapChar.InUse,
-        this.cacheState === 'on' ? 1 : 0
-      )
+      this.service.updateCharacteristic(this.hapChar.Active, this.cacheState === 'on' ? 1 : 0)
+      this.service.updateCharacteristic(this.hapChar.InUse, this.cacheState === 'on' ? 1 : 0)
       if (params.updateSource && !this.disableDeviceLogging) {
         this.log(
           '[%s] %s [%s].',
diff --git a/lib/device/simulation/thermostat.js b/lib/device/simulation/thermostat.js
index 5105a631..2f5e8030 100644
--- a/lib/device/simulation/thermostat.js
+++ b/lib/device/simulation/thermostat.js
@@ -20,19 +20,20 @@ module.exports = class deviceThermostat {
     // Set up custom variables for this device type
     const deviceConf = platform.thDevices[accessory.context.eweDeviceId]
     const deviceConf2 = platform.simulations[accessory.context.eweDeviceId]
-    this.tempOffset = deviceConf && deviceConf.offset
-      ? deviceConf.offset
-      : platform.consts.defaultValues.offset
-    this.minTarget = deviceConf && deviceConf.minTarget
-      ? deviceConf.minTarget
-      : platform.consts.defaultValues.minTarget
-    this.maxTarget = deviceConf && deviceConf.maxTarget
-      ? Math.max(deviceConf.maxTarget, this.minTarget + 1)
-      : platform.consts.defaultValues.maxTarget
-    this.disableDeviceLogging = (deviceConf && deviceConf.overrideDisabledLogging) ||
-      deviceConf2.overrideDisabledLogging
-      ? false
-      : platform.config.disableDeviceLogging
+    this.tempOffset =
+      deviceConf && deviceConf.offset ? deviceConf.offset : platform.consts.defaultValues.offset
+    this.minTarget =
+      deviceConf && deviceConf.minTarget
+        ? deviceConf.minTarget
+        : platform.consts.defaultValues.minTarget
+    this.maxTarget =
+      deviceConf && deviceConf.maxTarget
+        ? Math.max(deviceConf.maxTarget, this.minTarget + 1)
+        : platform.consts.defaultValues.maxTarget
+    this.disableDeviceLogging =
+      (deviceConf && deviceConf.overrideDisabledLogging) || deviceConf2.overrideDisabledLogging
+        ? false
+        : platform.config.disableDeviceLogging
 
     // If the accessory has a switch service then remove it
     if (this.accessory.getService(this.hapServ.Switch)) {
@@ -41,16 +42,12 @@ module.exports = class deviceThermostat {
 
     // If the accessory has a temperature sensor service then remove it
     if (this.accessory.getService(this.hapServ.TemperatureSensor)) {
-      this.accessory.removeService(
-        this.accessory.getService(this.hapServ.TemperatureSensor)
-      )
+      this.accessory.removeService(this.accessory.getService(this.hapServ.TemperatureSensor))
     }
 
     // If the accessory has a humidity sensor service then remove it
     if (this.accessory.getService(this.hapServ.HumiditySensor)) {
-      this.accessory.removeService(
-        this.accessory.getService(this.hapServ.HumiditySensor)
-      )
+      this.accessory.removeService(this.accessory.getService(this.hapServ.HumiditySensor))
     }
 
     // Set up the accessory with default target temp when added the first time
@@ -59,7 +56,8 @@ module.exports = class deviceThermostat {
     }
 
     // Add the thermostat service if it doesn't already exist
-    this.service = this.accessory.getService(this.hapServ.Thermostat) ||
+    this.service =
+      this.accessory.getService(this.hapServ.Thermostat) ||
       this.accessory.addService(this.hapServ.Thermostat)
 
     // Set custom properties of the current temperature characteristic
@@ -68,7 +66,8 @@ module.exports = class deviceThermostat {
     })
 
     // Add the set handler to the target state characteristic
-    this.service.getCharacteristic(this.hapChar.TargetHeatingCoolingState)
+    this.service
+      .getCharacteristic(this.hapChar.TargetHeatingCoolingState)
       .setProps({
         minValue: 0,
         maxValue: 1,
@@ -79,7 +78,8 @@ module.exports = class deviceThermostat {
       })
 
     // Add the set handler to the target temperature characteristic
-    this.service.getCharacteristic(this.hapChar.TargetTemperature)
+    this.service
+      .getCharacteristic(this.hapChar.TargetTemperature)
       .setProps({
         minValue: this.minTarget,
         maxValue: this.maxTarget,
@@ -135,10 +135,8 @@ module.exports = class deviceThermostat {
       }
       const newValue = value !== 0 ? 'on' : 'off'
       const currentTemp = this.service.getCharacteristic(this.hapChar.CurrentTemperature)
-      this.cacheHeat = newValue === 'on' &&
-        currentTemp.value < this.accessory.context.cacheTarget
-        ? 'on'
-        : 'off'
+      this.cacheHeat =
+        newValue === 'on' && currentTemp.value < this.accessory.context.cacheTarget ? 'on' : 'off'
       this.service.updateCharacteristic(
         this.hapChar.CurrentHeatingCoolingState,
         newValue === 'on' ? 1 : 0
@@ -212,7 +210,9 @@ module.exports = class deviceThermostat {
             this.hapChar.TargetHeatingCoolingState,
             this.cacheState === 'on' ? 1 : 0
           )
-          this.accessory.eveService.addEntry({ status: this.cacheState === 'on' ? 1 : 0 })
+          this.accessory.eveService.addEntry({
+            status: this.cacheState === 'on' ? 1 : 0
+          })
           if (this.cacheState === 'off') {
             this.cacheHeat = 'off'
           }
@@ -253,10 +253,7 @@ module.exports = class deviceThermostat {
         const currentHumi = parseInt(params.currentHumidity)
         if (this.cacheHumi !== currentHumi) {
           this.cacheHumi = currentHumi
-          this.service.updateCharacteristic(
-            this.hapChar.CurrentRelativeHumidity,
-            this.cacheHumi
-          )
+          this.service.updateCharacteristic(this.hapChar.CurrentRelativeHumidity, this.cacheHumi)
           this.accessory.eveService.addEntry({ humidity: currentHumi })
           if (params.updateSource && !this.disableDeviceLogging) {
             this.log('[%s] %s [%s%].', this.name, this.lang.curHumi, this.cacheHumi)
diff --git a/lib/device/simulation/valve-four.js b/lib/device/simulation/valve-four.js
index 6e517bd3..319df775 100644
--- a/lib/device/simulation/valve-four.js
+++ b/lib/device/simulation/valve-four.js
@@ -99,26 +99,14 @@ module.exports = class deviceValveFour {
           valveService.updateCharacteristic(this.hapChar.RemainingDuration, 0)
           clearTimeout(this.accessory.getService(valve).timer)
           if (!this.disableDeviceLogging) {
-            this.log(
-              '[%s] %s [%s %s].',
-              this.name,
-              this.lang.curState,
-              valve,
-              this.lang.valveNo
-            )
+            this.log('[%s] %s [%s %s].', this.name, this.lang.curState, valve, this.lang.valveNo)
           }
           break
         case 1: {
           const timer = valveService.getCharacteristic(this.hapChar.SetDuration).value
           valveService.updateCharacteristic(this.hapChar.RemainingDuration, timer)
           if (!this.disableDeviceLogging) {
-            this.log(
-              '[%s] %s [%s %s].',
-              this.name,
-              this.lang.curState,
-              valve,
-              this.lang.valveYes
-            )
+            this.log('[%s] %s [%s %s].', this.name, this.lang.curState, valve, this.lang.valveYes)
           }
           valveService.timer = setTimeout(() => {
             valveService.setCharacteristic(this.hapChar.Active, 0)
diff --git a/lib/device/simulation/valve-one.js b/lib/device/simulation/valve-one.js
index 14c62d9a..21fea9fc 100644
--- a/lib/device/simulation/valve-one.js
+++ b/lib/device/simulation/valve-one.js
@@ -88,10 +88,12 @@ module.exports = class deviceValveOne {
           params.switch = value ? 'on' : 'off'
           break
         case 'twoSwitch':
-          params.switches = [{
-            switch: value ? 'on' : 'off',
-            outlet: 0
-          }]
+          params.switches = [
+            {
+              switch: value ? 'on' : 'off',
+              outlet: 0
+            }
+          ]
           break
       }
       this.service.updateCharacteristic(this.hapChar.InUse, value)
@@ -148,7 +150,8 @@ module.exports = class deviceValveOne {
       if (isOn) {
         if (this.service.getCharacteristic(this.hapChar.Active).value === 0) {
           const timer = this.service.getCharacteristic(this.hapChar.SetDuration).value
-          this.service.updateCharacteristic(this.hapChar.Active, 1)
+          this.service
+            .updateCharacteristic(this.hapChar.Active, 1)
             .updateCharacteristic(this.hapChar.InUse, 1)
             .updateCharacteristic(this.hapChar.RemainingDuration, timer)
           if (params.updateSource && !this.disableDeviceLogging) {
@@ -160,7 +163,8 @@ module.exports = class deviceValveOne {
         }
         return
       }
-      this.service.updateCharacteristic(this.hapChar.Active, 0)
+      this.service
+        .updateCharacteristic(this.hapChar.Active, 0)
         .updateCharacteristic(this.hapChar.InUse, 0)
         .updateCharacteristic(this.hapChar.RemainingDuration, 0)
       clearTimeout(this.timer)
diff --git a/lib/device/simulation/valve-two.js b/lib/device/simulation/valve-two.js
index 2d777f4d..ff4188e9 100644
--- a/lib/device/simulation/valve-two.js
+++ b/lib/device/simulation/valve-two.js
@@ -93,26 +93,14 @@ module.exports = class deviceValveTwo {
           valveService.updateCharacteristic(this.hapChar.RemainingDuration, 0)
           clearTimeout(this.accessory.getService(valve).timer)
           if (!this.disableDeviceLogging) {
-            this.log(
-              '[%s] %s [%s %s].',
-              this.name,
-              this.lang.curState,
-              valve,
-              this.lang.valveNo
-            )
+            this.log('[%s] %s [%s %s].', this.name, this.lang.curState, valve, this.lang.valveNo)
           }
           break
         case 1: {
           const timer = valveService.getCharacteristic(this.hapChar.SetDuration).value
           valveService.updateCharacteristic(this.hapChar.RemainingDuration, timer)
           if (!this.disableDeviceLogging) {
-            this.log(
-              '[%s] %s [%s %s].',
-              this.name,
-              this.lang.curState,
-              valve,
-              this.lang.valveYes
-            )
+            this.log('[%s] %s [%s %s].', this.name, this.lang.curState, valve, this.lang.valveYes)
           }
           valveService.timer = setTimeout(() => {
             valveService.setCharacteristic(this.hapChar.Active, 0)
diff --git a/lib/device/simulation/window.js b/lib/device/simulation/window.js
index 58d38d92..938f90b5 100644
--- a/lib/device/simulation/window.js
+++ b/lib/device/simulation/window.js
@@ -19,12 +19,12 @@ module.exports = class deviceWindow {
 
     // Set up custom variables for this device type
     const deviceConf = platform.simulations[accessory.context.eweDeviceId]
-    this.operationTimeUp = deviceConf.operationTime ||
-      platform.consts.defaultValues.operationTime
+    this.operationTimeUp = deviceConf.operationTime || platform.consts.defaultValues.operationTime
     this.operationTimeDown = deviceConf.operationTimeDown || this.operationTimeUp
-    this.disableDeviceLogging = deviceConf && deviceConf.overrideDisabledLogging
-      ? false
-      : platform.config.disableDeviceLogging
+    this.disableDeviceLogging =
+      deviceConf && deviceConf.overrideDisabledLogging
+        ? false
+        : platform.config.disableDeviceLogging
 
     // Set up the accessory with default positions when added the first time
     if (!this.funcs.hasProperty(this.accessory.context, 'cacheCurrentPosition')) {
@@ -71,15 +71,17 @@ module.exports = class deviceWindow {
       const prevState = this.accessory.context.cachePositionState
       const percentStepUpPerDS = this.operationTimeUp / 100
       const percentStepDownPerDS = this.operationTimeDown / 100
-      const updateKey = Math.random().toString(36).substr(2, 8)
+      const updateKey = Math.random()
+        .toString(36)
+        .substr(2, 8)
       this.updateKey = updateKey
       if (prevState !== 2) {
         params.switches.push({ switch: 'off', outlet: 0 })
         params.switches.push({ switch: 'off', outlet: 1 })
         await this.platform.sendDeviceUpdate(this.accessory, params)
         params.switches = []
-        const posPercentChange = Math.floor(Date.now() / 100) -
-          this.accessory.context.cacheLastStartTime
+        const posPercentChange =
+          Math.floor(Date.now() / 100) - this.accessory.context.cacheLastStartTime
         const posPercentChangeUp = Math.floor(percentStepUpPerDS * posPercentChange)
         const posPercentChangeDown = Math.floor(percentStepDownPerDS * posPercentChange)
         if (prevState === 0) {
@@ -132,14 +134,9 @@ module.exports = class deviceWindow {
           this.accessory.context.cacheTargetPosition
         )
       }, 2000)
-      this.service.updateCharacteristic(
-        this.hapChar.TargetPosition,
-        new this.hapErr(-70402)
-      )
+      this.service.updateCharacteristic(this.hapChar.TargetPosition, new this.hapErr(-70402))
     }
   }
 
-  async externalUpdate (params) {
-
-  }
+  async externalUpdate (params) {}
 }
diff --git a/lib/device/switch-double.js b/lib/device/switch-double.js
index b53c2799..382cd581 100644
--- a/lib/device/switch-double.js
+++ b/lib/device/switch-double.js
@@ -21,12 +21,11 @@ module.exports = class deviceSwitchDouble {
 
     // Set up custom variables for this device type
     const deviceConf = platform.multiDevices[accessory.context.eweDeviceId]
-    this.hideChannels = deviceConf && deviceConf.hideChannels
-      ? deviceConf.hideChannels
-      : undefined
-    this.disableDeviceLogging = deviceConf && deviceConf.overrideDisabledLogging
-      ? false
-      : platform.config.disableDeviceLogging
+    this.hideChannels = deviceConf && deviceConf.hideChannels ? deviceConf.hideChannels : undefined
+    this.disableDeviceLogging =
+      deviceConf && deviceConf.overrideDisabledLogging
+        ? false
+        : platform.config.disableDeviceLogging
 
     // If the accessory has an outlet service then remove it
     if (this.accessory.getService(this.hapServ.Outlet)) {
@@ -34,7 +33,8 @@ module.exports = class deviceSwitchDouble {
     }
 
     // Add the switch service if it doesn't already exist
-    this.service = this.accessory.getService(this.hapServ.Switch) ||
+    this.service =
+      this.accessory.getService(this.hapServ.Switch) ||
       this.accessory.addService(this.hapServ.Switch)
 
     // Add the set handler to the switch/outlet on/off characteristic
@@ -71,7 +71,10 @@ module.exports = class deviceSwitchDouble {
           break
         case '1':
         case '2':
-          params.switches.push({ switch: value ? 'on' : 'off', outlet: switchNumber - 1 })
+          params.switches.push({
+            switch: value ? 'on' : 'off',
+            outlet: switchNumber - 1
+          })
           break
       }
       await this.platform.sendDeviceUpdate(this.accessory, params)
@@ -82,10 +85,9 @@ module.exports = class deviceSwitchDouble {
             const uuid = this.hapUUIDGen(idToCheck)
             if (this.devicesInHB.has(uuid)) {
               const subAccessory = this.devicesInHB.get(uuid)
-              subAccessory.getService(this.hapServ.Switch).updateCharacteristic(
-                this.hapChar.On,
-                value
-              )
+              subAccessory
+                .getService(this.hapServ.Switch)
+                .updateCharacteristic(this.hapChar.On, value)
               subAccessory.eveService.addEntry({ status: value ? 1 : 0 })
               if (i > 0 && !this.disableDeviceLogging) {
                 this.log(
@@ -120,8 +122,8 @@ module.exports = class deviceSwitchDouble {
                 }
               } else {
                 if (
-                  subAccessory.getService(this.hapServ.Switch)
-                    .getCharacteristic(this.hapChar.On).value
+                  subAccessory.getService(this.hapServ.Switch).getCharacteristic(this.hapChar.On)
+                    .value
                 ) {
                   primaryState = true
                 }
@@ -132,10 +134,9 @@ module.exports = class deviceSwitchDouble {
             const idToCheck = this.accessory.context.eweDeviceId + 'SW0'
             const uuid = this.hapUUIDGen(idToCheck)
             const priAccessory = this.devicesInHB.get(uuid)
-            priAccessory.getService(this.hapServ.Switch).updateCharacteristic(
-              this.hapChar.On,
-              primaryState
-            )
+            priAccessory
+              .getService(this.hapServ.Switch)
+              .updateCharacteristic(this.hapChar.On, primaryState)
             priAccessory.eveService.addEntry({ status: primaryState ? 1 : 0 })
           }
           break
@@ -164,16 +165,11 @@ module.exports = class deviceSwitchDouble {
           }
           const subAccessory = this.devicesInHB.get(uuid)
           const service = subAccessory.getService(this.hapServ.Switch)
-          const currentState = service.getCharacteristic(this.hapChar.On).value
-            ? 'on'
-            : 'off'
+          const currentState = service.getCharacteristic(this.hapChar.On).value ? 'on' : 'off'
           if (params.updateSource && params.switches[i - 1].switch === currentState) {
             continue
           }
-          service.updateCharacteristic(
-            this.hapChar.On,
-            params.switches[i - 1].switch === 'on'
-          )
+          service.updateCharacteristic(this.hapChar.On, params.switches[i - 1].switch === 'on')
           subAccessory.eveService.addEntry({
             status: params.switches[i - 1].switch === 'on' ? 1 : 0
           })
diff --git a/lib/device/switch-multi.js b/lib/device/switch-multi.js
index c6a60a5a..35f9a468 100644
--- a/lib/device/switch-multi.js
+++ b/lib/device/switch-multi.js
@@ -20,12 +20,11 @@ module.exports = class deviceSwitchMulti {
 
     // Set up custom variables for this device type
     const deviceConf = platform.multiDevices[accessory.context.eweDeviceId]
-    this.hideChannels = deviceConf && deviceConf.hideChannels
-      ? deviceConf.hideChannels
-      : undefined
-    this.disableDeviceLogging = deviceConf && deviceConf.overrideDisabledLogging
-      ? false
-      : platform.config.disableDeviceLogging
+    this.hideChannels = deviceConf && deviceConf.hideChannels ? deviceConf.hideChannels : undefined
+    this.disableDeviceLogging =
+      deviceConf && deviceConf.overrideDisabledLogging
+        ? false
+        : platform.config.disableDeviceLogging
 
     // If the accessory has an outlet service then remove it
     if (this.accessory.getService(this.hapServ.Outlet)) {
@@ -33,7 +32,8 @@ module.exports = class deviceSwitchMulti {
     }
 
     // Add the switch service if it doesn't already exist
-    this.service = this.accessory.getService(this.hapServ.Switch) ||
+    this.service =
+      this.accessory.getService(this.hapServ.Switch) ||
       this.accessory.addService(this.hapServ.Switch)
 
     // Add the set handler to the switch/outlet on/off characteristic
@@ -74,7 +74,10 @@ module.exports = class deviceSwitchMulti {
         case '2':
         case '3':
         case '4':
-          params.switches.push({ switch: value ? 'on' : 'off', outlet: switchNumber - 1 })
+          params.switches.push({
+            switch: value ? 'on' : 'off',
+            outlet: switchNumber - 1
+          })
           break
       }
       await this.platform.sendDeviceUpdate(this.accessory, params)
@@ -85,10 +88,9 @@ module.exports = class deviceSwitchMulti {
             const uuid = this.hapUUIDGen(idToCheck)
             if (this.devicesInHB.has(uuid)) {
               const subAccessory = this.devicesInHB.get(uuid)
-              subAccessory.getService(this.hapServ.Switch).updateCharacteristic(
-                this.hapChar.On,
-                value
-              )
+              subAccessory
+                .getService(this.hapServ.Switch)
+                .updateCharacteristic(this.hapChar.On, value)
               subAccessory.eveService.addEntry({ status: value ? 1 : 0 })
               if (i > 0 && !this.disableDeviceLogging) {
                 this.log(
@@ -125,8 +127,8 @@ module.exports = class deviceSwitchMulti {
                 }
               } else {
                 if (
-                  subAccessory.getService(this.hapServ.Switch)
-                    .getCharacteristic(this.hapChar.On).value
+                  subAccessory.getService(this.hapServ.Switch).getCharacteristic(this.hapChar.On)
+                    .value
                 ) {
                   primaryState = true
                 }
@@ -137,10 +139,9 @@ module.exports = class deviceSwitchMulti {
             const idToCheck = this.accessory.context.eweDeviceId + 'SW0'
             const uuid = this.hapUUIDGen(idToCheck)
             const priAccessory = this.devicesInHB.get(uuid)
-            priAccessory.getService(this.hapServ.Switch).updateCharacteristic(
-              this.hapChar.On,
-              primaryState
-            )
+            priAccessory
+              .getService(this.hapServ.Switch)
+              .updateCharacteristic(this.hapChar.On, primaryState)
             priAccessory.eveService.addEntry({ status: primaryState ? 1 : 0 })
           }
           break
@@ -169,16 +170,11 @@ module.exports = class deviceSwitchMulti {
           }
           const subAccessory = this.devicesInHB.get(uuid)
           const service = subAccessory.getService(this.hapServ.Switch)
-          const currentState = service.getCharacteristic(this.hapChar.On).value
-            ? 'on'
-            : 'off'
+          const currentState = service.getCharacteristic(this.hapChar.On).value ? 'on' : 'off'
           if (params.updateSource && params.switches[i - 1].switch === currentState) {
             continue
           }
-          service.updateCharacteristic(
-            this.hapChar.On,
-            params.switches[i - 1].switch === 'on'
-          )
+          service.updateCharacteristic(this.hapChar.On, params.switches[i - 1].switch === 'on')
           subAccessory.eveService.addEntry({
             status: params.switches[i - 1].switch === 'on' ? 1 : 0
           })
diff --git a/lib/device/switch-single.js b/lib/device/switch-single.js
index af43e1f5..88015215 100644
--- a/lib/device/switch-single.js
+++ b/lib/device/switch-single.js
@@ -18,9 +18,10 @@ module.exports = class deviceSwitchSingle {
 
     // Set up custom variables for this device type
     const deviceConf = platform.singleDevices[accessory.context.eweDeviceId]
-    this.disableDeviceLogging = deviceConf && deviceConf.overrideDisabledLogging
-      ? false
-      : platform.config.disableDeviceLogging
+    this.disableDeviceLogging =
+      deviceConf && deviceConf.overrideDisabledLogging
+        ? false
+        : platform.config.disableDeviceLogging
 
     // If the accessory has a outlet service then remove it
     if (this.accessory.getService(this.hapServ.Outlet)) {
@@ -28,7 +29,8 @@ module.exports = class deviceSwitchSingle {
     }
 
     // Add the switch service if it doesn't already exist
-    this.service = this.accessory.getService(this.hapServ.Switch) ||
+    this.service =
+      this.accessory.getService(this.hapServ.Switch) ||
       this.accessory.addService(this.hapServ.Switch)
 
     // Add the set handler to the switch on/off characteristic
@@ -43,7 +45,9 @@ module.exports = class deviceSwitchSingle {
 
     // Output the customised options to the log if in debug mode
     if (platform.config.debug) {
-      const opts = JSON.stringify({ disableDeviceLogging: this.disableDeviceLogging })
+      const opts = JSON.stringify({
+        disableDeviceLogging: this.disableDeviceLogging
+      })
       this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
     }
   }
diff --git a/lib/device/thermostat.js b/lib/device/thermostat.js
index bb12ad61..c5b6a305 100644
--- a/lib/device/thermostat.js
+++ b/lib/device/thermostat.js
@@ -19,12 +19,12 @@ module.exports = class deviceThermostat {
 
     // Set up custom variables for this device type
     const deviceConf = platform.thDevices[accessory.context.eweDeviceId]
-    this.tempOffset = deviceConf && deviceConf.offset
-      ? deviceConf.offset
-      : platform.consts.defaultValues.offset
-    this.disableDeviceLogging = deviceConf && deviceConf.overrideDisabledLogging
-      ? false
-      : platform.config.disableDeviceLogging
+    this.tempOffset =
+      deviceConf && deviceConf.offset ? deviceConf.offset : platform.consts.defaultValues.offset
+    this.disableDeviceLogging =
+      deviceConf && deviceConf.overrideDisabledLogging
+        ? false
+        : platform.config.disableDeviceLogging
 
     /*
       **************
@@ -49,7 +49,8 @@ module.exports = class deviceThermostat {
     */
 
     // Add the thermostat service if it doesn't already exist
-    this.service = this.accessory.getService(this.hapServ.Thermostat) ||
+    this.service =
+      this.accessory.getService(this.hapServ.Thermostat) ||
       this.accessory.addService(this.hapServ.Thermostat)
 
     // Set custom properties of the current temperature characteristic
@@ -58,21 +59,25 @@ module.exports = class deviceThermostat {
     })
 
     // Add the set handler to the target state characteristic
-    this.service.getCharacteristic(this.hapChar.TargetHeatingCoolingState).setProps({
-      minValue: 0,
-      maxValue: 1,
-      validValues: [0, 1]
-    })
+    this.service
+      .getCharacteristic(this.hapChar.TargetHeatingCoolingState)
+      .setProps({
+        minValue: 0,
+        maxValue: 1,
+        validValues: [0, 1]
+      })
       .onSet(async value => {
         await this.internalStateUpdate(value)
       })
 
     // Add the set handler to the target temperature characteristic
-    this.service.getCharacteristic(this.hapChar.TargetTemperature).setProps({
-      minValue: 5,
-      maxValue: 45,
-      minStep: 0.5
-    })
+    this.service
+      .getCharacteristic(this.hapChar.TargetTemperature)
+      .setProps({
+        minValue: 5,
+        maxValue: 45,
+        minStep: 0.5
+      })
       .onSet(async value => {
         await this.internalTargetUpdate(value)
       })
@@ -133,10 +138,7 @@ module.exports = class deviceThermostat {
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
-        this.service.updateCharacteristic(
-          this.hapChar.TargetTemperature,
-          this.cacheTarg
-        )
+        this.service.updateCharacteristic(this.hapChar.TargetTemperature, this.cacheTarg)
       }, 2000)
       throw new this.hapErr(-70402)
     }
@@ -176,10 +178,7 @@ module.exports = class deviceThermostat {
         const targetTemp = Number(params.targetTemp)
         if (this.cacheTarg !== targetTemp) {
           this.cacheTarg = targetTemp
-          this.service.updateCharacteristic(
-            this.hapChar.TargetTemperature,
-            this.cacheTarg
-          )
+          this.service.updateCharacteristic(this.hapChar.TargetTemperature, this.cacheTarg)
           if (params.updateSource && !this.disableDeviceLogging) {
             this.log('[%s] %s [%s°C].', this.name, this.lang.curTarg, this.cacheTarg)
           }
@@ -190,7 +189,7 @@ module.exports = class deviceThermostat {
         let currentTemp
         if (params.tempScale && params.tempScale === 'f') {
           // Convert to celcius
-          currentTemp = (Number(params.temperature) - 32) * 5 / 9
+          currentTemp = ((Number(params.temperature) - 32) * 5) / 9
 
           // Round to nearest 0.5
           currentTemp = Math.round(currentTemp * 2) / 2
@@ -200,10 +199,7 @@ module.exports = class deviceThermostat {
         currentTemp += this.tempOffset
         if (this.cacheTemp !== currentTemp) {
           this.cacheTemp = currentTemp
-          this.service.updateCharacteristic(
-            this.hapChar.CurrentTemperature,
-            this.cacheTemp
-          )
+          this.service.updateCharacteristic(this.hapChar.CurrentTemperature, this.cacheTemp)
           if (params.updateSource && !this.disableDeviceLogging) {
             this.log('[%s] %s [%s°C].', this.name, this.lang.curTemp, this.cacheTemp)
           }
diff --git a/lib/device/zigbee/light-cct.js b/lib/device/zigbee/light-cct.js
index 50d30225..e4d7c23b 100644
--- a/lib/device/zigbee/light-cct.js
+++ b/lib/device/zigbee/light-cct.js
@@ -19,26 +19,31 @@ module.exports = class deviceZBLightCCT {
 
     // Set up custom variables for this device type
     const deviceConf = platform.lightDevices[accessory.context.eweDeviceId]
-    this.brightStep = deviceConf && deviceConf.brightnessStep
-      ? Math.min(deviceConf.brightnessStep, 100)
-      : platform.consts.defaultValues.brightnessStep
-    this.alShift = deviceConf && deviceConf.adaptiveLightingShift
-      ? deviceConf.adaptiveLightingShift
-      : platform.consts.defaultValues.adaptiveLightingShift
-    this.disableDeviceLogging = deviceConf && deviceConf.overrideDisabledLogging
-      ? false
-      : platform.config.disableDeviceLogging
+    this.brightStep =
+      deviceConf && deviceConf.brightnessStep
+        ? Math.min(deviceConf.brightnessStep, 100)
+        : platform.consts.defaultValues.brightnessStep
+    this.alShift =
+      deviceConf && deviceConf.adaptiveLightingShift
+        ? deviceConf.adaptiveLightingShift
+        : platform.consts.defaultValues.adaptiveLightingShift
+    this.disableDeviceLogging =
+      deviceConf && deviceConf.overrideDisabledLogging
+        ? false
+        : platform.config.disableDeviceLogging
 
     // Different bulbs have different colour temperature ranges
     this.minK = 2200
     this.maxK = 4000
 
     // Add the lightbulb service if it doesn't already exist
-    this.service = this.accessory.getService(this.hapServ.Lightbulb) ||
+    this.service =
+      this.accessory.getService(this.hapServ.Lightbulb) ||
       this.accessory.addService(this.hapServ.Lightbulb)
 
     // Add the get/set handler to the lightbulb on/off characteristic
-    this.service.getCharacteristic(this.hapChar.On)
+    this.service
+      .getCharacteristic(this.hapChar.On)
       .onGet(() => {
         if (this.isOnline) {
           return this.service.getCharacteristic(this.hapChar.On).value
@@ -51,7 +56,8 @@ module.exports = class deviceZBLightCCT {
       })
 
     // Add the set handler to the lightbulb brightness characteristic
-    this.service.getCharacteristic(this.hapChar.Brightness)
+    this.service
+      .getCharacteristic(this.hapChar.Brightness)
       .setProps({ minStep: this.brightStep })
       .onSet(async value => {
         await this.internalBrightnessUpdate(value)
@@ -66,10 +72,9 @@ module.exports = class deviceZBLightCCT {
     this.cacheBright = this.service.getCharacteristic(this.hapChar.Brightness).value
 
     // Set up the adaptive lighting controller
-    this.accessory.alController = new platform.api.hap.AdaptiveLightingController(
-      this.service,
-      { customTemperatureAdjustment: this.alShift }
-    )
+    this.accessory.alController = new platform.api.hap.AdaptiveLightingController(this.service, {
+      customTemperatureAdjustment: this.alShift
+    })
     this.accessory.configureController(this.accessory.alController)
 
     // Output the customised options to the log if in debug mode
@@ -107,7 +112,9 @@ module.exports = class deviceZBLightCCT {
       if (this.cacheBright === value || value === 0) {
         return
       }
-      const updateKey = Math.random().toString(36).substr(2, 8)
+      const updateKey = Math.random()
+        .toString(36)
+        .substr(2, 8)
       this.updateKeyBright = updateKey
       await this.funcs.sleep(500)
       if (updateKey !== this.updateKeyBright) {
@@ -139,7 +146,9 @@ module.exports = class deviceZBLightCCT {
       if (!this.isOnline && this.accessory.alController.isAdaptiveLightingActive()) {
         return
       }
-      const updateKey = Math.random().toString(36).substr(2, 8)
+      const updateKey = Math.random()
+        .toString(36)
+        .substr(2, 8)
       this.updateKeyCT = updateKey
       await this.funcs.sleep(400)
       if (updateKey !== this.updateKeyCT) {
@@ -157,13 +166,7 @@ module.exports = class deviceZBLightCCT {
       this.cacheCT = scaledCT
       if (!this.disableDeviceLogging) {
         if (this.accessory.alController.isAdaptiveLightingActive()) {
-          this.log(
-            '[%s] %s [%sK] %s.',
-            this.name,
-            this.lang.curColour,
-            scaledK,
-            this.lang.viaAL
-          )
+          this.log('[%s] %s [%sK] %s.', this.name, this.lang.curColour, scaledK, this.lang.viaAL)
         } else {
           this.log('[%s] %s [%sK].', this.name, this.lang.curColour, scaledK)
         }
@@ -199,13 +202,10 @@ module.exports = class deviceZBLightCCT {
         if (params.colorTemp !== this.cacheCT) {
           const ctDiff = Math.abs(params.colorTemp - this.cacheCT)
           this.cacheCT = params.colorTemp
-          const kelvin = this.cacheCT / 100 * (this.maxK - this.minK) + this.minK
+          const kelvin = (this.cacheCT / 100) * (this.maxK - this.minK) + this.minK
           const scaledK = Math.round(kelvin)
           this.cacheMired = Math.min(Math.max(Math.round(1000000 / scaledK), 140), 500)
-          this.service.updateCharacteristic(
-            this.hapChar.ColorTemperature,
-            this.cacheMired
-          )
+          this.service.updateCharacteristic(this.hapChar.ColorTemperature, this.cacheMired)
           if (params.updateSource) {
             if (!this.disableDeviceLogging) {
               this.log('[%s] %s [%sK].', this.name, this.lang.curColour, scaledK)
diff --git a/lib/device/zigbee/light-dimmer.js b/lib/device/zigbee/light-dimmer.js
index 273d4d3c..9d431110 100644
--- a/lib/device/zigbee/light-dimmer.js
+++ b/lib/device/zigbee/light-dimmer.js
@@ -19,19 +19,23 @@ module.exports = class deviceZBLightDimmer {
 
     // Set up custom variables for this device type
     const deviceConf = platform.lightDevices[accessory.context.eweDeviceId]
-    this.brightStep = deviceConf && deviceConf.brightnessStep
-      ? Math.min(deviceConf.brightnessStep, 100)
-      : platform.consts.defaultValues.brightnessStep
-    this.disableDeviceLogging = deviceConf && deviceConf.overrideDisabledLogging
-      ? false
-      : platform.config.disableDeviceLogging
+    this.brightStep =
+      deviceConf && deviceConf.brightnessStep
+        ? Math.min(deviceConf.brightnessStep, 100)
+        : platform.consts.defaultValues.brightnessStep
+    this.disableDeviceLogging =
+      deviceConf && deviceConf.overrideDisabledLogging
+        ? false
+        : platform.config.disableDeviceLogging
 
     // Add the lightbulb service if it doesn't already exist
-    this.service = this.accessory.getService(this.hapServ.Lightbulb) ||
+    this.service =
+      this.accessory.getService(this.hapServ.Lightbulb) ||
       this.accessory.addService(this.hapServ.Lightbulb)
 
     // Add the get/set handler to the lightbulb on/off characteristic
-    this.service.getCharacteristic(this.hapChar.On)
+    this.service
+      .getCharacteristic(this.hapChar.On)
       .onGet(() => {
         if (this.isOnline) {
           return this.service.getCharacteristic(this.hapChar.On).value
@@ -44,7 +48,8 @@ module.exports = class deviceZBLightDimmer {
       })
 
     // Add the set handler to the lightbulb brightness characteristic
-    this.service.getCharacteristic(this.hapChar.Brightness)
+    this.service
+      .getCharacteristic(this.hapChar.Brightness)
       .setProps({ minStep: this.brightStep })
       .onSet(async value => {
         await this.internalBrightnessUpdate(value)
@@ -84,7 +89,9 @@ module.exports = class deviceZBLightDimmer {
       if (this.cacheBright === value || value === 0) {
         return
       }
-      const updateKey = Math.random().toString(36).substr(2, 8)
+      const updateKey = Math.random()
+        .toString(36)
+        .substr(2, 8)
       this.updateKey = updateKey
       await this.funcs.sleep(500)
       if (updateKey !== this.updateKey) {
diff --git a/lib/device/zigbee/sensor-ambient.js b/lib/device/zigbee/sensor-ambient.js
index 875f9560..06caae4f 100644
--- a/lib/device/zigbee/sensor-ambient.js
+++ b/lib/device/zigbee/sensor-ambient.js
@@ -18,18 +18,20 @@ module.exports = class deviceZBSensorAmbient {
 
     // Set up custom variables for this device type
     const deviceConf = platform.sensorDevices[accessory.context.eweDeviceId]
-    this.lowBattThreshold = deviceConf && deviceConf.lowBattThreshold
-      ? Math.min(deviceConf.lowBattThreshold, 100)
-      : platform.consts.defaultValues.lowBattThreshold
-    this.tempOffset = deviceConf && deviceConf.offset
-      ? deviceConf.offset
-      : platform.consts.defaultValues.offset
-    this.disableDeviceLogging = deviceConf && deviceConf.overrideDisabledLogging
-      ? false
-      : platform.config.disableDeviceLogging
+    this.lowBattThreshold =
+      deviceConf && deviceConf.lowBattThreshold
+        ? Math.min(deviceConf.lowBattThreshold, 100)
+        : platform.consts.defaultValues.lowBattThreshold
+    this.tempOffset =
+      deviceConf && deviceConf.offset ? deviceConf.offset : platform.consts.defaultValues.offset
+    this.disableDeviceLogging =
+      deviceConf && deviceConf.overrideDisabledLogging
+        ? false
+        : platform.config.disableDeviceLogging
 
     // Add the temperature sensor service if it doesn't already exist
-    this.tempService = this.accessory.getService(this.hapServ.TemperatureSensor) ||
+    this.tempService =
+      this.accessory.getService(this.hapServ.TemperatureSensor) ||
       this.accessory.addService(this.hapServ.TemperatureSensor)
 
     // Add options to the current temperature characteristic
@@ -38,11 +40,13 @@ module.exports = class deviceZBSensorAmbient {
     })
 
     // Add the humidity sensor service if it doesn't already exist
-    this.humiService = this.accessory.getService(this.hapServ.HumiditySensor) ||
+    this.humiService =
+      this.accessory.getService(this.hapServ.HumiditySensor) ||
       this.accessory.addService(this.hapServ.HumiditySensor)
 
     // Add the battery service if it doesn't already exist
-    this.battService = this.accessory.getService(this.hapServ.BatteryService) ||
+    this.battService =
+      this.accessory.getService(this.hapServ.BatteryService) ||
       this.accessory.addService(this.hapServ.BatteryService)
 
     // Pass the accessory to Fakegato to set up with Eve
@@ -63,10 +67,7 @@ module.exports = class deviceZBSensorAmbient {
 
   async externalUpdate (params) {
     try {
-      if (
-        this.funcs.hasProperty(params, 'battery') &&
-        params.battery !== this.cacheBatt
-      ) {
+      if (this.funcs.hasProperty(params, 'battery') && params.battery !== this.cacheBatt) {
         this.cacheBatt = params.battery
         this.battService.updateCharacteristic(this.hapChar.BatteryLevel, this.cacheBatt)
         this.battService.updateCharacteristic(
@@ -78,10 +79,7 @@ module.exports = class deviceZBSensorAmbient {
         }
       }
       const eveLog = {}
-      if (
-        this.funcs.hasProperty(params, 'temperature') &&
-        params.temperature !== this.cacheTemp
-      ) {
+      if (this.funcs.hasProperty(params, 'temperature') && params.temperature !== this.cacheTemp) {
         this.cacheTemp = params.temperature
         const currentTemp = parseInt(this.cacheTemp) / 100 + this.tempOffset
         this.tempService.updateCharacteristic(this.hapChar.CurrentTemperature, currentTemp)
@@ -90,16 +88,10 @@ module.exports = class deviceZBSensorAmbient {
           this.log('[%s] %s [%s°C].', this.name, this.lang.curTemp, currentTemp)
         }
       }
-      if (
-        this.funcs.hasProperty(params, 'humidity') &&
-        params.humidity !== this.cacheHumi
-      ) {
+      if (this.funcs.hasProperty(params, 'humidity') && params.humidity !== this.cacheHumi) {
         this.cacheHumi = params.humidity
         const currentHumi = parseInt(this.cacheHumi) / 100
-        this.humiService.updateCharacteristic(
-          this.hapChar.CurrentRelativeHumidity,
-          currentHumi
-        )
+        this.humiService.updateCharacteristic(this.hapChar.CurrentRelativeHumidity, currentHumi)
         eveLog.humidity = currentHumi
         if (params.updateSource && !this.disableDeviceLogging) {
           this.log('[%s] %s [%s%].', this.name, this.lang.curHumi, currentHumi)
diff --git a/lib/device/zigbee/sensor-contact.js b/lib/device/zigbee/sensor-contact.js
index b382cfcc..2aafebc9 100644
--- a/lib/device/zigbee/sensor-contact.js
+++ b/lib/device/zigbee/sensor-contact.js
@@ -22,12 +22,14 @@ module.exports = class deviceZBSensorContact {
     // Set up custom variables for this device type
     const deviceConf = platform.sensorDevices[accessory.context.eweDeviceId]
     this.scaleBattery = deviceConf && deviceConf.scaleBattery
-    this.lowBattThreshold = deviceConf && deviceConf.lowBattThreshold
-      ? Math.min(deviceConf.lowBattThreshold, 100)
-      : platform.consts.defaultValues.lowBattThreshold
-    this.disableDeviceLogging = deviceConf && deviceConf.overrideDisabledLogging
-      ? false
-      : platform.config.disableDeviceLogging
+    this.lowBattThreshold =
+      deviceConf && deviceConf.lowBattThreshold
+        ? Math.min(deviceConf.lowBattThreshold, 100)
+        : platform.consts.defaultValues.lowBattThreshold
+    this.disableDeviceLogging =
+      deviceConf && deviceConf.overrideDisabledLogging
+        ? false
+        : platform.config.disableDeviceLogging
 
     // Add the contact sensor service if it doesn't already exist
     if (!(this.service = this.accessory.getService(this.hapServ.ContactSensor))) {
@@ -49,7 +51,8 @@ module.exports = class deviceZBSensorContact {
     })
 
     // Add the battery service if it doesn't already exist
-    this.battService = this.accessory.getService(this.hapServ.BatteryService) ||
+    this.battService =
+      this.accessory.getService(this.hapServ.BatteryService) ||
       this.accessory.addService(this.hapServ.BatteryService)
 
     // Pass the accessory to Fakegato to set up with Eve
@@ -70,10 +73,7 @@ module.exports = class deviceZBSensorContact {
 
   async externalUpdate (params) {
     try {
-      if (
-        this.funcs.hasProperty(params, 'battery') &&
-        params.battery !== this.cacheBattery
-      ) {
+      if (this.funcs.hasProperty(params, 'battery') && params.battery !== this.cacheBattery) {
         this.cacheBattery = params.battery
         const scaledBatt = this.scaleBattery ? this.cacheBattery * 10 : this.cacheBattery
         this.battService.updateCharacteristic(this.hapChar.BatteryLevel, scaledBatt)
@@ -111,10 +111,7 @@ module.exports = class deviceZBSensorContact {
         }
       }
       for (const [deviceId, group] of Object.entries(this.platform.simulations)) {
-        if (
-          group.sensorId === this.accessory.context.eweDeviceId &&
-          group.type === 'garage'
-        ) {
+        if (group.sensorId === this.accessory.context.eweDeviceId && group.type === 'garage') {
           const uuid = this.hapUUIDGen(deviceId + 'SWX')
           if (this.devicesInHB.has(uuid)) {
             const subAccessory = this.devicesInHB.get(uuid)
@@ -125,12 +122,7 @@ module.exports = class deviceZBSensorContact {
                 gdService.updateCharacteristic(this.hapChar.TargetDoorState, 1)
                 gdService.updateCharacteristic(this.hapChar.CurrentDoorState, 1)
                 if (params.updateSource && !this.disableDeviceLogging) {
-                  this.log(
-                    '[%s] %s [%s].',
-                    name,
-                    this.lang.curState,
-                    this.lang.doorClosed
-                  )
+                  this.log('[%s] %s [%s].', name, this.lang.curState, this.lang.doorClosed)
                 }
                 break
               case 1:
@@ -138,12 +130,7 @@ module.exports = class deviceZBSensorContact {
                 gdService.updateCharacteristic(this.hapChar.TargetDoorState, 0)
                 gdService.updateCharacteristic(this.hapChar.CurrentDoorState, 0)
                 if (params.updateSource && !this.disableDeviceLogging) {
-                  this.log(
-                    '[%s] %s [%s].',
-                    name,
-                    this.lang.curState,
-                    this.lang.doorOpen
-                  )
+                  this.log('[%s] %s [%s].', name, this.lang.curState, this.lang.doorOpen)
                 }
                 break
             }
diff --git a/lib/device/zigbee/sensor-motion.js b/lib/device/zigbee/sensor-motion.js
index c43eb056..9f3bb085 100644
--- a/lib/device/zigbee/sensor-motion.js
+++ b/lib/device/zigbee/sensor-motion.js
@@ -19,15 +19,18 @@ module.exports = class deviceZBSensorMotion {
 
     // Set up custom variables for this device type
     const deviceConf = platform.sensorDevices[accessory.context.eweDeviceId]
-    this.lowBattThreshold = deviceConf && deviceConf.lowBattThreshold
-      ? Math.min(deviceConf.lowBattThreshold, 100)
-      : platform.consts.defaultValues.lowBattThreshold
-    this.sensorTimeDifference = deviceConf && deviceConf.sensorTimeDifference
-      ? deviceConf.sensorTimeDifference
-      : platform.consts.defaultValues.sensorTimeDifference
-    this.disableDeviceLogging = deviceConf && deviceConf.overrideDisabledLogging
-      ? false
-      : platform.config.disableDeviceLogging
+    this.lowBattThreshold =
+      deviceConf && deviceConf.lowBattThreshold
+        ? Math.min(deviceConf.lowBattThreshold, 100)
+        : platform.consts.defaultValues.lowBattThreshold
+    this.sensorTimeDifference =
+      deviceConf && deviceConf.sensorTimeDifference
+        ? deviceConf.sensorTimeDifference
+        : platform.consts.defaultValues.sensorTimeDifference
+    this.disableDeviceLogging =
+      deviceConf && deviceConf.overrideDisabledLogging
+        ? false
+        : platform.config.disableDeviceLogging
 
     // Add the motion sensor service if it doesn't already exist
     if (!(this.service = this.accessory.getService(this.hapServ.MotionSensor))) {
@@ -36,7 +39,9 @@ module.exports = class deviceZBSensorMotion {
     }
 
     // Add the battery service if it doesn't already exist
-    this.battService = this.accessory.getService(this.hapServ.BatteryService) || this.accessory.addService(this.hapServ.BatteryService)
+    this.battService =
+      this.accessory.getService(this.hapServ.BatteryService) ||
+      this.accessory.addService(this.hapServ.BatteryService)
 
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new platform.eveService('motion', this.accessory, {
@@ -56,10 +61,7 @@ module.exports = class deviceZBSensorMotion {
 
   async externalUpdate (params) {
     try {
-      if (
-        this.funcs.hasProperty(params, 'battery') &&
-        params.battery !== this.cacheBatt
-      ) {
+      if (this.funcs.hasProperty(params, 'battery') && params.battery !== this.cacheBatt) {
         this.cacheBatt = params.battery
         this.battService.updateCharacteristic(this.hapChar.BatteryLevel, this.cacheBatt)
         this.battService.updateCharacteristic(
@@ -70,15 +72,14 @@ module.exports = class deviceZBSensorMotion {
           this.log('[%s] %s [%s%].', this.name, this.lang.curBatt, this.cacheBatt)
         }
       }
-      if (
-        this.funcs.hasProperty(params, 'motion') &&
-        this.funcs.hasProperty(params, 'trigTime')
-      ) {
+      if (this.funcs.hasProperty(params, 'motion') && this.funcs.hasProperty(params, 'trigTime')) {
         const timeNow = new Date()
         const diff = (timeNow.getTime() - params.trigTime) / 1000
-        const motionDetected = !!(params.updateSource &&
+        const motionDetected = !!(
+          params.updateSource &&
           params.motion === 1 &&
-          diff < this.sensorTimeDifference)
+          diff < this.sensorTimeDifference
+        )
         this.service.updateCharacteristic(this.hapChar.MotionDetected, motionDetected)
         if (motionDetected) {
           const initialTime = this.accessory.eveService.getInitialTime()
diff --git a/lib/device/zigbee/switch-single.js b/lib/device/zigbee/switch-single.js
index 590f50a5..dcf57f8f 100644
--- a/lib/device/zigbee/switch-single.js
+++ b/lib/device/zigbee/switch-single.js
@@ -18,16 +18,19 @@ module.exports = class deviceZBSwitchSingle {
 
     // Set up custom variables for this device type
     const deviceConf = platform.singleDevices[accessory.context.eweDeviceId]
-    this.disableDeviceLogging = deviceConf && deviceConf.overrideDisabledLogging
-      ? false
-      : platform.config.disableDeviceLogging
+    this.disableDeviceLogging =
+      deviceConf && deviceConf.overrideDisabledLogging
+        ? false
+        : platform.config.disableDeviceLogging
 
     // Add the switch service if it doesn't already exist
-    this.service = this.accessory.getService(this.hapServ.Switch) ||
+    this.service =
+      this.accessory.getService(this.hapServ.Switch) ||
       this.accessory.addService(this.hapServ.Switch)
 
     // Add the get/set handler to the switch on/off characteristic
-    this.service.getCharacteristic(this.hapChar.On)
+    this.service
+      .getCharacteristic(this.hapChar.On)
       .onGet(() => {
         if (this.isOnline) {
           return this.service.getCharacteristic(this.hapChar.On).value
@@ -46,7 +49,9 @@ module.exports = class deviceZBSwitchSingle {
 
     // Output the customised options to the log if in debug mode
     if (platform.config.debug) {
-      const opts = JSON.stringify({ disableDeviceLogging: this.disableDeviceLogging })
+      const opts = JSON.stringify({
+        disableDeviceLogging: this.disableDeviceLogging
+      })
       this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
     }
   }
@@ -81,7 +86,9 @@ module.exports = class deviceZBSwitchSingle {
       }
       this.cacheState = params.switch
       this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
-      this.accessory.eveService.addEntry({ status: this.cacheState === 'on' ? 1 : 0 })
+      this.accessory.eveService.addEntry({
+        status: this.cacheState === 'on' ? 1 : 0
+      })
       if (params.updateSource && !this.disableDeviceLogging) {
         this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
       }
diff --git a/lib/device/zigbee/switch-stateless.js b/lib/device/zigbee/switch-stateless.js
index 4dc7addc..a5a39991 100644
--- a/lib/device/zigbee/switch-stateless.js
+++ b/lib/device/zigbee/switch-stateless.js
@@ -19,15 +19,18 @@ module.exports = class deviceZBSwitchStateless {
     // Set up custom variables for this device type
     const deviceConf = platform.sensorDevices[accessory.context.eweDeviceId]
     this.hideLongDouble = deviceConf && deviceConf.hideLongDouble
-    this.lowBattThreshold = deviceConf && deviceConf.lowBattThreshold
-      ? Math.min(deviceConf.lowBattThreshold, 100)
-      : platform.consts.defaultValues.lowBattThreshold
-    this.disableDeviceLogging = deviceConf && deviceConf.overrideDisabledLogging
-      ? false
-      : platform.config.disableDeviceLogging
+    this.lowBattThreshold =
+      deviceConf && deviceConf.lowBattThreshold
+        ? Math.min(deviceConf.lowBattThreshold, 100)
+        : platform.consts.defaultValues.lowBattThreshold
+    this.disableDeviceLogging =
+      deviceConf && deviceConf.overrideDisabledLogging
+        ? false
+        : platform.config.disableDeviceLogging
 
     // Add the stateless switch service if it doesn't already exist
-    this.service = this.accessory.getService(this.hapServ.StatelessProgrammableSwitch) ||
+    this.service =
+      this.accessory.getService(this.hapServ.StatelessProgrammableSwitch) ||
       this.accessory.addService(this.hapServ.StatelessProgrammableSwitch)
 
     // Hide the double and long press options if the user wants
@@ -38,7 +41,8 @@ module.exports = class deviceZBSwitchStateless {
     }
 
     // Add the battery service if it doesn't already exist
-    this.battService = this.accessory.getService(this.hapServ.BatteryService) ||
+    this.battService =
+      this.accessory.getService(this.hapServ.BatteryService) ||
       this.accessory.addService(this.hapServ.BatteryService)
 
     // Output the customised options to the log if in debug mode
@@ -54,10 +58,7 @@ module.exports = class deviceZBSwitchStateless {
 
   async externalUpdate (params) {
     try {
-      if (
-        this.funcs.hasProperty(params, 'battery') &&
-        params.battery !== this.cacheBatt
-      ) {
+      if (this.funcs.hasProperty(params, 'battery') && params.battery !== this.cacheBatt) {
         this.cacheBatt = params.battery
         this.battService.updateCharacteristic(this.hapChar.BatteryLevel, this.cacheBatt)
         this.battService.updateCharacteristic(
@@ -69,14 +70,14 @@ module.exports = class deviceZBSwitchStateless {
         }
       }
       if (this.funcs.hasProperty(params, 'key') && [0, 1, 2].includes(params.key)) {
-        this.service.updateCharacteristic(
-          this.hapChar.ProgrammableSwitchEvent,
-          params.key
-        )
+        this.service.updateCharacteristic(this.hapChar.ProgrammableSwitchEvent, params.key)
         if (params.updateSource && !this.disableDeviceLogging) {
-          const textLabel = params.key === 0
-            ? this.lang.buttonSingle
-            : (params.key === 1 ? this.lang.buttonDouble : this.lang.buttonLong)
+          const textLabel =
+            params.key === 0
+              ? this.lang.buttonSingle
+              : params.key === 1
+              ? this.lang.buttonDouble
+              : this.lang.buttonLong
           this.log('[%s] %s [%s].', this.name, this.lang.curState, textLabel)
         }
       }
diff --git a/lib/fakegato/fakegato-history.js b/lib/fakegato/fakegato-history.js
index 592fb856..820db050 100644
--- a/lib/fakegato/fakegato-history.js
+++ b/lib/fakegato/fakegato-history.js
@@ -13,7 +13,7 @@ module.exports = function (homebridge) {
   Service = homebridge.hap.Service
 
   const hexToBase64 = val => {
-    return Buffer.from(('' + val).replace(/[^0-9A-F]/ig, ''), 'hex').toString('base64')
+    return Buffer.from(('' + val).replace(/[^0-9A-F]/gi, ''), 'hex').toString('base64')
   }
 
   const base64ToHex = val => {
@@ -24,14 +24,13 @@ module.exports = function (homebridge) {
   }
 
   const swap16 = val => {
-    return ((val & 0xFF) << 8) | ((val >>> 8) & 0xFF)
+    return ((val & 0xff) << 8) | ((val >>> 8) & 0xff)
   }
 
   const swap32 = val => {
-    return ((val & 0xFF) << 24) |
-      ((val & 0xFF00) << 8) |
-      ((val >>> 8) & 0xFF00) |
-      ((val >>> 24) & 0xFF)
+    return (
+      ((val & 0xff) << 24) | ((val & 0xff00) << 8) | ((val >>> 8) & 0xff00) | ((val >>> 24) & 0xff)
+    )
   }
 
   const numToHex = (val, len) => {
@@ -137,21 +136,25 @@ module.exports = function (homebridge) {
       }
       this.loaded = false
       if (homebridge.globalFakeGatoStorage === undefined) {
-        homebridge.globalFakeGatoStorage = new FakeGatoStorage({ log: this.log })
+        homebridge.globalFakeGatoStorage = new FakeGatoStorage({
+          log: this.log
+        })
       }
       homebridge.globalFakeGatoStorage.addWriter(this, {
         path: this.path,
         onReady: function () {
-          this.load(function (err, loaded) {
-            if (err) {
-              this.log('FG history: load error: %s.', err)
-            } else {
-              if (loaded) {
-                this.log('FG history: loaded from storage.')
+          this.load(
+            function (err, loaded) {
+              if (err) {
+                this.log('FG history: load error: %s.', err)
+              } else {
+                if (loaded) {
+                  this.log('FG history: loaded from storage.')
+                }
+                this.loaded = true
               }
-              this.loaded = true
-            }
-          }.bind(this))
+            }.bind(this)
+          )
         }.bind(this)
       })
       switch (accessoryType) {
@@ -327,12 +330,16 @@ module.exports = function (homebridge) {
               }
             })
           })
-          this.accessoryType116 = ' 0' +
+          this.accessoryType116 =
+            ' 0' +
             this.signatures.length.toString() +
             ' ' +
-            this.signatures.sort((a, b) => {
-              return a.signature > b.signature ? 1 : -1
-            }).map(a => a.signature).join(' ') +
+            this.signatures
+              .sort((a, b) => {
+                return a.signature > b.signature ? 1 : -1
+              })
+              .map(a => a.signature)
+              .join(' ') +
             ' '
           homebridge.globalFakeGatoTimer.subscribe(this, this.calculateAverage)
           break
@@ -457,17 +464,29 @@ module.exports = function (homebridge) {
           })
           break
         case 'weather':
-          homebridge.globalFakeGatoTimer.addData({ entry: entry, service: this })
+          homebridge.globalFakeGatoTimer.addData({
+            entry: entry,
+            service: this
+          })
           break
         case 'room':
-          homebridge.globalFakeGatoTimer.addData({ entry: entry, service: this })
+          homebridge.globalFakeGatoTimer.addData({
+            entry: entry,
+            service: this
+          })
           break
         case 'energy':
-          homebridge.globalFakeGatoTimer.addData({ entry: entry, service: this })
+          homebridge.globalFakeGatoTimer.addData({
+            entry: entry,
+            service: this
+          })
           break
         case 'custom':
           if ('power' in entry || 'temp' in entry || 'humidity' in entry) {
-            homebridge.globalFakeGatoTimer.addData({ entry: entry, service: this })
+            homebridge.globalFakeGatoTimer.addData({
+              entry: entry,
+              service: this
+            })
           } else {
             this._addEntry(entry)
           }
@@ -509,7 +528,7 @@ module.exports = function (homebridge) {
           this.lastEntry++
           this.usedMemory++
         }
-        this.history[entry2address(this.lastEntry)] = (entry)
+        this.history[entry2address(this.lastEntry)] = entry
         if (this.usedMemory < this.memorySize) {
           val = Format(
             '%s00000000%s%s%s%s%s000000000101',
@@ -518,7 +537,8 @@ module.exports = function (homebridge) {
             this.accessoryType116,
             numToHex(swap16(this.usedMemory + 1), 4),
             numToHex(swap16(this.memorySize), 4),
-            numToHex(swap32(this.firstEntry), 8))
+            numToHex(swap32(this.firstEntry), 8)
+          )
         } else {
           val = Format(
             '%s00000000%s%s%s%s%s000000000101',
@@ -527,7 +547,8 @@ module.exports = function (homebridge) {
             this.accessoryType116,
             numToHex(swap16(this.usedMemory), 4),
             numToHex(swap16(this.memorySize), 4),
-            numToHex(swap32(this.firstEntry + 1), 8))
+            numToHex(swap32(this.firstEntry + 1), 8)
+          )
         }
         this.service.getCharacteristic(S2R1Characteristic).setValue(hexToBase64(val))
         this.log(
@@ -573,7 +594,7 @@ module.exports = function (homebridge) {
         }
         homebridge.globalFakeGatoStorage.write({
           service: this,
-          data: typeof (data) === 'object' ? JSON.stringify(data) : data
+          data: typeof data === 'object' ? JSON.stringify(data) : data
         })
       } else {
         setTimeout(() => this.save(), 100)
@@ -589,7 +610,7 @@ module.exports = function (homebridge) {
             if (data) {
               try {
                 // this.log('[%s] read data [%s].', this.accessoryName, data)
-                const jsonFile = typeof (data) === 'object' ? data : JSON.parse(data)
+                const jsonFile = typeof data === 'object' ? data : JSON.parse(data)
                 this.firstEntry = jsonFile.firstEntry
                 this.lastEntry = jsonFile.lastEntry
                 this.usedMemory = jsonFile.usedMemory
@@ -623,7 +644,7 @@ module.exports = function (homebridge) {
           if (
             this.history[this.memAddress].setRefTime === 1 ||
             this.setTime ||
-            (this.currentEntry === this.firstEntry + 1)
+            this.currentEntry === this.firstEntry + 1
           ) {
             this.dataStream += Format(
               ',15%s 0100 0000 81%s0000 0000 00 0000',
@@ -647,7 +668,8 @@ module.exports = function (homebridge) {
                   this.accessoryType117,
                   numToHex(swap16(this.history[this.memAddress].temp * 100), 4),
                   numToHex(swap16(this.history[this.memAddress].humidity * 100), 4),
-                  numToHex(swap16(this.history[this.memAddress].pressure * 10), 4))
+                  numToHex(swap16(this.history[this.memAddress].pressure * 10), 4)
+                )
                 break
               case 'energy':
                 this.dataStream += Format(
@@ -655,7 +677,8 @@ module.exports = function (homebridge) {
                   numToHex(swap32(this.currentEntry), 8),
                   numToHex(swap32(this.history[this.memAddress].time - this.refTime - _EPOCH), 8),
                   this.accessoryType117,
-                  numToHex(swap16(this.history[this.memAddress].power * 10), 4))
+                  numToHex(swap16(this.history[this.memAddress].power * 10), 4)
+                )
                 break
               case 'room':
                 this.dataStream += Format(
@@ -665,7 +688,8 @@ module.exports = function (homebridge) {
                   this.accessoryType117,
                   numToHex(swap16(this.history[this.memAddress].temp * 100), 4),
                   numToHex(swap16(this.history[this.memAddress].humidity * 100), 4),
-                  numToHex(swap16(this.history[this.memAddress].ppm), 4))
+                  numToHex(swap16(this.history[this.memAddress].ppm), 4)
+                )
                 break
               case 'door':
               case 'motion':
@@ -675,7 +699,8 @@ module.exports = function (homebridge) {
                   numToHex(swap32(this.currentEntry), 8),
                   numToHex(swap32(this.history[this.memAddress].time - this.refTime - _EPOCH), 8),
                   this.accessoryType117,
-                  numToHex(this.history[this.memAddress].status, 2))
+                  numToHex(this.history[this.memAddress].status, 2)
+                )
                 break
               case 'aqua':
                 if (this.history[this.memAddress].status) {
@@ -684,7 +709,8 @@ module.exports = function (homebridge) {
                     numToHex(swap32(this.currentEntry), 8),
                     numToHex(swap32(this.history[this.memAddress].time - this.refTime - _EPOCH), 8),
                     this.accessoryType117,
-                    numToHex(this.history[this.memAddress].status, 2))
+                    numToHex(this.history[this.memAddress].status, 2)
+                  )
                 } else {
                   this.dataStream += Format(
                     ',15 %s%s%s%s%s 00000000 300c',
@@ -692,7 +718,8 @@ module.exports = function (homebridge) {
                     numToHex(swap32(this.history[this.memAddress].time - this.refTime - _EPOCH), 8),
                     this.accessoryType117bis,
                     numToHex(this.history[this.memAddress].status, 2),
-                    numToHex(swap32(this.history[this.memAddress].waterAmount), 8))
+                    numToHex(swap32(this.history[this.memAddress].waterAmount), 8)
+                  )
                 }
                 break
               case 'thermo':
@@ -703,7 +730,8 @@ module.exports = function (homebridge) {
                   this.accessoryType117,
                   numToHex(swap16(this.history[this.memAddress].currentTemp * 100), 4),
                   numToHex(swap16(this.history[this.memAddress].setTemp * 100), 4),
-                  numToHex(this.history[this.memAddress].valvePosition, 2))
+                  numToHex(this.history[this.memAddress].valvePosition, 2)
+                )
                 break
               case 'custom': {
                 const result = []
@@ -751,13 +779,11 @@ module.exports = function (homebridge) {
                       }
                   }
                 }
-                const results = dataStream +
-                  ' ' +
-                  numToHex(bitmask, 2) +
+                const results =
+                  dataStream + ' ' + numToHex(bitmask, 2) + ' ' + result.map(a => a).join(' ')
+                this.dataStream +=
                   ' ' +
-                  result.map(a => a).join(' ')
-                this.dataStream += ' ' +
-                  numToHex((results.replace(/[^0-9A-F]/ig, '').length) / 2 + 1) +
+                  numToHex(results.replace(/[^0-9A-F]/gi, '').length / 2 + 1) +
                   ' ' +
                   results +
                   ','
diff --git a/lib/fakegato/fakegato-storage.js b/lib/fakegato/fakegato-storage.js
index a97be704..290184b3 100644
--- a/lib/fakegato/fakegato-storage.js
+++ b/lib/fakegato/fakegato-storage.js
@@ -32,7 +32,7 @@ class FakeGatoStorage {
         callback: params.callback,
         fileName: hostname + '_' + service.accessoryName + '_persist.json'
       }
-      const onReady = typeof (params.onReady) === 'function' ? params.onReady : () => {}
+      const onReady = typeof params.onReady === 'function' ? params.onReady : () => {}
       newWriter.storageHandler = fs
       newWriter.path = params.path || path.join(os.homedir(), '.homebridge')
       this.writers.push(newWriter)
@@ -64,12 +64,16 @@ class FakeGatoStorage {
     if (!this.writing) {
       this.writing = true
       const writer = this.getWriter(params.service)
-      const callBack = typeof (params.callback) === 'function'
-        ? params.callback
-        : (typeof (writer.callback) === 'function' ? writer.callback : () => {})
+      const callBack =
+        typeof params.callback === 'function'
+          ? params.callback
+          : typeof writer.callback === 'function'
+          ? writer.callback
+          : () => {}
       this.log(
         'FG storage: write file [%s].',
-        path.join(writer.path, writer.fileName), params.data.substr(1, 80)
+        path.join(writer.path, writer.fileName),
+        params.data.substr(1, 80)
       )
       writer.storageHandler.writeFile(
         path.join(writer.path, writer.fileName),
@@ -87,18 +91,24 @@ class FakeGatoStorage {
 
   read (params) {
     const writer = this.getWriter(params.service)
-    const callBack = typeof (params.callback) === 'function'
-      ? params.callback
-      : (typeof (writer.callback) === 'function' ? writer.callback : () => {})
+    const callBack =
+      typeof params.callback === 'function'
+        ? params.callback
+        : typeof writer.callback === 'function'
+        ? writer.callback
+        : () => {}
     this.log('FG storage: read file [%s].', path.join(writer.path, writer.fileName))
     writer.storageHandler.readFile(path.join(writer.path, writer.fileName), 'utf8', callBack)
   }
 
   remove (params) {
     const writer = this.getWriter(params.service)
-    const callBack = typeof (params.callback) === 'function'
-      ? params.callback
-      : (typeof (writer.callback) === 'function' ? writer.callback : () => {})
+    const callBack =
+      typeof params.callback === 'function'
+        ? params.callback
+        : typeof writer.callback === 'function'
+        ? writer.callback
+        : () => {}
     this.log('FG storage: delete file [%s].', path.join(writer.path, writer.fileName))
     writer.storageHandler.unlink(path.join(writer.path, writer.fileName), callBack)
   }
diff --git a/lib/fakegato/fakegato-timer.js b/lib/fakegato/fakegato-timer.js
index d64a3441..2d0e1119 100644
--- a/lib/fakegato/fakegato-timer.js
+++ b/lib/fakegato/fakegato-timer.js
@@ -71,7 +71,7 @@ class FakeGatoTimer {
       for (const s in this.subscribedServices) {
         if (Object.prototype.hasOwnProperty.call(this.subscribedServices, s)) {
           const service = this.subscribedServices[s]
-          if (typeof (service.callback) === 'function') {
+          if (typeof service.callback === 'function') {
             service.previousAvrg = service.callback({
               backLog: service.backLog,
               previousAvrg: service.previousAvrg,
@@ -86,7 +86,7 @@ class FakeGatoTimer {
 
   executeImmediateCallback (service) {
     this.log('FG timer: executeImmediateCallback().')
-    if (typeof (service.callback) === 'function' && service.backLog.length) {
+    if (typeof service.callback === 'function' && service.backLog.length) {
       service.callback({
         backLog: service.backLog,
         timer: this,
diff --git a/lib/fakegato/uuid.js b/lib/fakegato/uuid.js
index 56a47fd2..f7b8f19c 100644
--- a/lib/fakegato/uuid.js
+++ b/lib/fakegato/uuid.js
@@ -25,7 +25,7 @@ function toLongFormUUID (uuid, base = '-0000-1000-8000-0026BB765291') {
 
 function toShortFormUUID (uuid, base = '-0000-1000-8000-0026BB765291') {
   uuid = toLongFormUUID(uuid, base)
-  return (uuid.substr(0, 8))
+  return uuid.substr(0, 8)
 }
 
 exports.isValid = isValid
diff --git a/lib/homebridge-ui/public/index.html b/lib/homebridge-ui/public/index.html
index da445271..a9385ca0 100644
--- a/lib/homebridge-ui/public/index.html
+++ b/lib/homebridge-ui/public/index.html
@@ -1,18 +1,46 @@
 <p class="text-center">
-  <img src="https://user-images.githubusercontent.com/43026681/101325266-63126600-3863-11eb-9382-4a2924f0e540.png" alt="homebridge-ewelink logo" style="width: 60%;">
+  <img
+    src="https://user-images.githubusercontent.com/43026681/101325266-63126600-3863-11eb-9382-4a2924f0e540.png"
+    alt="homebridge-ewelink logo"
+    style="width: 60%;"
+  />
 </p>
 <div id="pageIntro" class="text-center" style="display: none;">
   <p class="lead">Thank you for installing <strong>homebridge-ewelink</strong></p>
-  <p>You will need to enter your eWeLink username and password on the next page</p>
-  <button type="button" class="btn btn-primary" id="introContinue">Continue &rarr;</button>
+  <p>
+    You will need to enter your eWeLink username and password on the next page
+  </p>
+  <button type="button" class="btn btn-primary" id="introContinue">
+    Continue &rarr;
+  </button>
 </div>
-<div id="menuWrapper" class="btn-group w-100 mb-0" role="group" aria-label="UI Menu" style="display: none;">
-  <button type="button" class="btn btn-primary ml-0" id="menuSettings">Settings</button>
-  <button type="button" class="btn btn-primary" id="menuDevices">My Devices</button>
-  <button type="button" class="btn btn-primary mr-0" id="menuHome">Support</button>
+<div
+  id="menuWrapper"
+  class="btn-group w-100 mb-0"
+  role="group"
+  aria-label="UI Menu"
+  style="display: none;"
+>
+  <button type="button" class="btn btn-primary ml-0" id="menuSettings">
+    Settings
+  </button>
+  <button type="button" class="btn btn-primary" id="menuDevices">
+    My Devices
+  </button>
+  <button type="button" class="btn btn-primary mr-0" id="menuHome">
+    Support
+  </button>
 </div>
-<div id="disabledBanner" class="alert alert-secondary mb-0 mt-3" role="alert" style="display: none;">
-  Plugin is currently disabled <button id="disabledEnable" type="button" class="btn btn-link p-0 m-0 float-right">Enable</button>
+<div
+  id="disabledBanner"
+  class="alert alert-secondary mb-0 mt-3"
+  role="alert"
+  style="display: none;"
+>
+  Plugin is currently disabled
+  <button id="disabledEnable" type="button" class="btn btn-link p-0 m-0 float-right">
+    Enable
+  </button>
 </div>
 <div id="pageDevices" class="mt-4" style="display: none;">
   <div id="deviceInfo">
@@ -77,46 +105,134 @@
   <p class="text-center">The links below will take you to our GitHub wiki</p>
   <h4>Setup</h4>
   <ul>
-    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/Installation" target="_blank">Installation</a></li>
-    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/Configuration" target="_blank">Configuration</a></li>
-    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/Beta-Version" target="_blank">Beta Version</a></li>
-    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/Node-Version" target="_blank">Node Version</a></li>
-    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/Uninstallation" target="_blank">Uninstallation</a></li>
+    <li>
+      <a href="https://github.com/bwp91/homebridge-ewelink/wiki/Installation" target="_blank"
+        >Installation</a
+      >
+    </li>
+    <li>
+      <a href="https://github.com/bwp91/homebridge-ewelink/wiki/Configuration" target="_blank"
+        >Configuration</a
+      >
+    </li>
+    <li>
+      <a href="https://github.com/bwp91/homebridge-ewelink/wiki/Beta-Version" target="_blank"
+        >Beta Version</a
+      >
+    </li>
+    <li>
+      <a href="https://github.com/bwp91/homebridge-ewelink/wiki/Node-Version" target="_blank"
+        >Node Version</a
+      >
+    </li>
+    <li>
+      <a href="https://github.com/bwp91/homebridge-ewelink/wiki/Uninstallation" target="_blank"
+        >Uninstallation</a
+      >
+    </li>
   </ul>
   <h4>Features</h4>
   <ul>
-    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/Supported-Devices" target="_blank">Supported Devices</a></li>
-    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/Multi-Channel-Devices" target="_blank">Multi Channel Devices</a></li>
-    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/RF-Bridge-Sensors" target="_blank">RF Bridge Sensors</a></li>
-    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/Accessory-Simulations" target="_blank">Accessory Simulations</a></li>
-    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/Connection-Methods" target="_blank">Connection Methods</a></li>
-    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/Internal-API" target="_blank">Internal API</a></li>
+    <li>
+      <a href="https://github.com/bwp91/homebridge-ewelink/wiki/Supported-Devices" target="_blank"
+        >Supported Devices</a
+      >
+    </li>
+    <li>
+      <a
+        href="https://github.com/bwp91/homebridge-ewelink/wiki/Multi-Channel-Devices"
+        target="_blank"
+        >Multi Channel Devices</a
+      >
+    </li>
+    <li>
+      <a href="https://github.com/bwp91/homebridge-ewelink/wiki/RF-Bridge-Sensors" target="_blank"
+        >RF Bridge Sensors</a
+      >
+    </li>
+    <li>
+      <a
+        href="https://github.com/bwp91/homebridge-ewelink/wiki/Accessory-Simulations"
+        target="_blank"
+        >Accessory Simulations</a
+      >
+    </li>
+    <li>
+      <a href="https://github.com/bwp91/homebridge-ewelink/wiki/Connection-Methods" target="_blank"
+        >Connection Methods</a
+      >
+    </li>
+    <li>
+      <a href="https://github.com/bwp91/homebridge-ewelink/wiki/Internal-API" target="_blank"
+        >Internal API</a
+      >
+    </li>
   </ul>
   <h4>Help/About</h4>
   <ul>
-    <li><a href="https://github.com/bwp91/homebridge-ewelink/wiki/Common-Errors" target="_blank">Common Errors</a></li>
-    <li><a href="https://github.com/bwp91/homebridge-ewelink/issues/new/choose" target="_blank">Support Request</a></li>
-    <li><a href="https://github.com/bwp91/homebridge-ewelink/blob/latest/CHANGELOG.md" target="_blank">Changelog</a></li>
-    <li><a href="https://github.com/sponsors/bwp91" target="_blank">About Me</a></li>
+    <li>
+      <a href="https://github.com/bwp91/homebridge-ewelink/wiki/Common-Errors" target="_blank"
+        >Common Errors</a
+      >
+    </li>
+    <li>
+      <a href="https://github.com/bwp91/homebridge-ewelink/issues/new/choose" target="_blank"
+        >Support Request</a
+      >
+    </li>
+    <li>
+      <a href="https://github.com/bwp91/homebridge-ewelink/blob/latest/CHANGELOG.md" target="_blank"
+        >Changelog</a
+      >
+    </li>
+    <li>
+      <a href="https://github.com/sponsors/bwp91" target="_blank">About Me</a>
+    </li>
   </ul>
   <h4>Credits</h4>
   <ul>
-    <li>To the original plugin maintainer: <a href="https://github.com/gbro115" target="_blank">@gbro115</a>.</li>
-    <li>To successive contributors: <a href="https://github.com/MrTomAsh" target="_blank">@MrTomAsh</a> and <a href="https://github.com/howanghk" target="_blank">@howanghk</a> for <a href="https://github.com/howanghk/homebridge-ewelink" target="_blank">homebridge-ewelink-max</a>.</li>
-    <li>To the creators/contributors of <a href="https://homebridge.io" target="_blank">Homebridge</a> who make this plugin possible.</li>
-    <li>To the creators/contributors of <a href="https://github.com/simont77/fakegato-history" target="_blank">Fakegato</a>: <a href="https://github.com/simont77" target="_blank">@simont77</a> and <a href="https://github.com/NorthernMan54" target="_blank">@NorthernMan54</a>.</li>
-    <li>To the creator of the awesome plugin header logo: <a href="https://www.instagram.com/keryan.me" target="_blank">Keryan Belahcene</a>.</li>
+    <li>
+      To the original plugin maintainer:
+      <a href="https://github.com/gbro115" target="_blank">@gbro115</a>.
+    </li>
+    <li>
+      To successive contributors:
+      <a href="https://github.com/MrTomAsh" target="_blank">@MrTomAsh</a> and
+      <a href="https://github.com/howanghk" target="_blank">@howanghk</a> for
+      <a href="https://github.com/howanghk/homebridge-ewelink" target="_blank"
+        >homebridge-ewelink-max</a
+      >.
+    </li>
+    <li>
+      To the creators/contributors of
+      <a href="https://homebridge.io" target="_blank">Homebridge</a> who make this plugin possible.
+    </li>
+    <li>
+      To the creators/contributors of
+      <a href="https://github.com/simont77/fakegato-history" target="_blank">Fakegato</a>:
+      <a href="https://github.com/simont77" target="_blank">@simont77</a> and
+      <a href="https://github.com/NorthernMan54" target="_blank">@NorthernMan54</a>.
+    </li>
+    <li>
+      To the creator of the awesome plugin header logo:
+      <a href="https://www.instagram.com/keryan.me" target="_blank">Keryan Belahcene</a>.
+    </li>
     <li>To all users who have shared their devices to enable functionality.</li>
   </ul>
-    
+
   <h4>Disclaimer</h4>
   <ul>
-    <li>I am in no way affiliated with eWeLink nor any of the device brands (like Sonoff) and this plugin is a personal project that I maintain in my free time.</li>
-    <li>Use this plugin entirely at your own risk - please see licence for more information.</li>
+    <li>
+      I am in no way affiliated with eWeLink nor any of the device brands (like Sonoff) and this
+      plugin is a personal project that I maintain in my free time.
+    </li>
+    <li>
+      Use this plugin entirely at your own risk - please see licence for more information.
+    </li>
   </ul>
 </div>
 <script>
-  (async () => {
+  ;(async () => {
     try {
       const currentConfig = await homebridge.getPluginConfig()
       showIntro = () => {
@@ -141,16 +257,17 @@ <h4>Disclaimer</h4>
         document.getElementById('menuSettings').classList.add('btn-primary')
         document.getElementById('pageSupport').style.display = 'none'
         document.getElementById('pageDevices').style.display = 'block'
-        const cachedAccessories = typeof homebridge.getCachedAccessories === 'function'
-          ? await homebridge.getCachedAccessories()
-          : await homebridge.request('/getCachedAccessories')
+        const cachedAccessories =
+          typeof homebridge.getCachedAccessories === 'function'
+            ? await homebridge.getCachedAccessories()
+            : await homebridge.request('/getCachedAccessories')
         if (cachedAccessories.length > 0) {
           cachedAccessories.sort((a, b) => {
             return a.displayName.toLowerCase() > b.displayName.toLowerCase()
               ? 1
               : b.displayName.toLowerCase() > a.displayName.toLowerCase()
-                ? -1
-                : 0
+              ? -1
+              : 0
           })
         }
         const deviceSelect = document.getElementById('deviceSelect')
@@ -164,7 +281,7 @@ <h4>Disclaimer</h4>
         showDeviceInfo = async hbDeviceId => {
           homebridge.showSpinner()
           const selectedAccessory = cachedAccessories.find(x => x.context.hbDeviceId === hbDeviceId)
-          
+
           console.log(selectedAccessory)
           document.getElementById('displayName').innerHTML = selectedAccessory.displayName
           document.getElementById('reachableWAN').innerHTML = selectedAccessory.context.reachableWAN
@@ -180,7 +297,8 @@ <h4>Disclaimer</h4>
           document.getElementById('eweDeviceId').innerHTML = selectedAccessory.context.eweDeviceId
           document.getElementById('eweBrandName').innerHTML = selectedAccessory.context.eweBrandName
           document.getElementById('eweFirmware').innerHTML = selectedAccessory.context.firmware
-          document.getElementById('eweModel').innerHTML = selectedAccessory.context.eweModel + ' (' + selectedAccessory.context.eweUIID + ')'
+          document.getElementById('eweModel').innerHTML =
+            selectedAccessory.context.eweModel + ' (' + selectedAccessory.context.eweUIID + ')'
           document.getElementById('eweShared').innerHTML = selectedAccessory.context.eweShared
             ? 'Yes (by ' + selectedAccessory.context.eweShared + ')'
             : 'No'
@@ -253,11 +371,10 @@ <h4>Disclaimer</h4>
         await homebridge.updatePluginConfig(currentConfig)
         showIntro()
       }
-      
     } catch (err) {
       homebridge.toast.error(err.message, 'Error')
     } finally {
       homebridge.hideSpinner()
     }
   })()
-</script>
\ No newline at end of file
+</script>
diff --git a/lib/homebridge-ui/server.js b/lib/homebridge-ui/server.js
index 83f20a75..e6965ebd 100644
--- a/lib/homebridge-ui/server.js
+++ b/lib/homebridge-ui/server.js
@@ -47,4 +47,4 @@ class PluginUiServer extends HomebridgePluginUiServer {
   }
 }
 
-(() => new PluginUiServer())()
+;(() => new PluginUiServer())()
diff --git a/lib/index.js b/lib/index.js
index 682680ee..30fe1dcb 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -79,9 +79,7 @@ class eWeLinkPlatform {
         this.lang.missingPW,
         this.lang.missingUN
       ]
-      const eText = hideErrLines.includes(err.message)
-        ? err.message
-        : this.funcs.parseError(err)
+      const eText = hideErrLines.includes(err.message) ? err.message : this.funcs.parseError(err)
       log.warn('***** %s [v%s]. *****', this.lang.disabling, plugin.version)
       log.warn('***** %s. *****', eText)
     }
@@ -257,9 +255,7 @@ class eWeLinkPlatform {
                     if (typeof v !== 'string' || !inSet) {
                       logIgnore(key + '.' + id + '.' + k)
                     } else {
-                      this[key][id][k] = inSet
-                        ? v
-                        : this.consts.defaultValues[k]
+                      this[key][id][k] = inSet ? v : this.consts.defaultValues[k]
                     }
                     break
                   }
@@ -272,9 +268,7 @@ class eWeLinkPlatform {
                     } else {
                       const channels = v.split(',')
                       channels.forEach(channel => {
-                        this.hideChannels.push(
-                          id + 'SW' + channel.replace(/[^0-9]+/g, '')
-                        )
+                        this.hideChannels.push(id + 'SW' + channel.replace(/[^0-9]+/g, ''))
                       })
                     }
                     break
@@ -431,9 +425,7 @@ class eWeLinkPlatform {
           if (Array.isArray(val)) {
             if (val.length > 0) {
               val.forEach(deviceId => {
-                this.config.ignoredDevices.push(
-                  this.funcs.parseDeviceId(deviceId)
-                )
+                this.config.ignoredDevices.push(this.funcs.parseDeviceId(deviceId))
               })
             } else {
               logRemove(key)
@@ -587,9 +579,10 @@ class eWeLinkPlatform {
       }, 2000)
     } catch (err) {
       // Catch any errors during setup
-      const eText = err.message === this.lang.disabled
-        ? err.message
-        : this.config.debug
+      const eText =
+        err.message === this.lang.disabled
+          ? err.message
+          : this.config.debug
           ? err
           : this.funcs.parseError(err)
       this.log.warn('***** %s [v%s]. *****', this.lang.disabling, plugin.version)
@@ -652,10 +645,7 @@ class eWeLinkPlatform {
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/curtain'))(this, accessory)
         /**********************/
-      } else if (
-        this.consts.devices.doubleSwitch.includes(uiid) &&
-        device.params.workMode === 2
-      ) {
+      } else if (this.consts.devices.doubleSwitch.includes(uiid) && device.params.workMode === 2) {
         /*************************
         BLINDS [DUALR3 MOTOR MODE]
         *************************/
@@ -888,10 +878,10 @@ class eWeLinkPlatform {
         OUTLETS [WITH POWER READINGS]
         ****************************/
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = this.outletDevices[device.deviceid] &&
-          this.outletDevices[device.deviceid].showAsSwitch
-          ? new (require('./device/switch-single'))(this, accessory)
-          : new (require('./device/outlet-power'))(this, accessory)
+        accessory.control =
+          this.outletDevices[device.deviceid] && this.outletDevices[device.deviceid].showAsSwitch
+            ? new (require('./device/switch-single'))(this, accessory)
+            : new (require('./device/outlet-power'))(this, accessory)
         /***************************/
       } else if (this.consts.devices.outletSCM.includes(uiid)) {
         /*************************************
@@ -905,10 +895,10 @@ class eWeLinkPlatform {
         OUTLETS
         ******/
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = this.outletDevices[device.deviceid] &&
-          this.outletDevices[device.deviceid].showAsSwitch
-          ? new (require('./device/switch-single'))(this, accessory)
-          : new (require('./device/outlet-single'))(this, accessory)
+        accessory.control =
+          this.outletDevices[device.deviceid] && this.outletDevices[device.deviceid].showAsSwitch
+            ? new (require('./device/switch-single'))(this, accessory)
+            : new (require('./device/outlet-single'))(this, accessory)
         /*****/
       } else if (this.consts.devices.lightRGB.includes(uiid)) {
         /***********
@@ -943,10 +933,10 @@ class eWeLinkPlatform {
         SWITCHES [SINGLE CHANNEL]
         ************************/
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = this.singleDevices[device.deviceid] &&
-          this.singleDevices[device.deviceid].showAsOutlet
-          ? new (require('./device/outlet-single'))(this, accessory)
-          : new (require('./device/switch-single'))(this, accessory)
+        accessory.control =
+          this.singleDevices[device.deviceid] && this.singleDevices[device.deviceid].showAsOutlet
+            ? new (require('./device/outlet-single'))(this, accessory)
+            : new (require('./device/switch-single'))(this, accessory)
         /***********************/
       } else if (
         this.consts.devices.doubleSwitch.includes(uiid) ||
@@ -975,32 +965,30 @@ class eWeLinkPlatform {
             subAccessory = this.addAccessory(device, device.deviceid + 'SW' + i, true)
           } else {
             // The user has not hidden this channel
-            subAccessory = devicesInHB.get(uuidsub) ||
-              this.addAccessory(device, device.deviceid + 'SW' + i)
+            subAccessory =
+              devicesInHB.get(uuidsub) || this.addAccessory(device, device.deviceid + 'SW' + i)
           }
 
           // Add context information to the sub accessory
           subAccessory.context.firmware = device.params.fwVersion || plugin.version
           subAccessory.context.reachableWAN = wsClient && device.online
-          subAccessory.context.reachableLAN = lanClient && lanDevices.has(device.deviceid) &&
-            lanDevices.get(device.deviceid).ip
+          subAccessory.context.reachableLAN =
+            lanClient && lanDevices.has(device.deviceid) && lanDevices.get(device.deviceid).ip
           subAccessory.context.eweBrandName = device.brandName
           subAccessory.context.eweBrandLogo = device.brandLogo
-          subAccessory.context.eweShared = device.sharedBy && device.sharedBy.email
-            ? device.sharedBy.email
-            : false
-          subAccessory.context.ip = lanClient && subAccessory.context.reachableLAN
-            ? lanDevices.get(device.deviceid).ip
-            : false
+          subAccessory.context.eweShared =
+            device.sharedBy && device.sharedBy.email ? device.sharedBy.email : false
+          subAccessory.context.ip =
+            lanClient && subAccessory.context.reachableLAN
+              ? lanDevices.get(device.deviceid).ip
+              : false
           subAccessory.control = this.consts.devices.doubleSwitch.includes(uiid)
-            ? this.multiDevices[device.deviceid] &&
-              this.multiDevices[device.deviceid].showAsOutlet
+            ? this.multiDevices[device.deviceid] && this.multiDevices[device.deviceid].showAsOutlet
               ? new (require('./device/outlet-double'))(this, subAccessory, devicesInHB)
               : new (require('./device/switch-double'))(this, subAccessory, devicesInHB)
-            : this.multiDevices[device.deviceid] &&
-              this.multiDevices[device.deviceid].showAsOutlet
-              ? new (require('./device/outlet-multi'))(this, subAccessory, devicesInHB)
-              : new (require('./device/switch-multi'))(this, subAccessory, devicesInHB)
+            : this.multiDevices[device.deviceid] && this.multiDevices[device.deviceid].showAsOutlet
+            ? new (require('./device/outlet-multi'))(this, subAccessory, devicesInHB)
+            : new (require('./device/switch-multi'))(this, subAccessory, devicesInHB)
 
           // Update any changes to the sub accessory to the platform
           this.api.updatePlatformAccessories(plugin.name, plugin.alias, [subAccessory])
@@ -1027,9 +1015,7 @@ class eWeLinkPlatform {
             })
           )
         }
-        accessory = this.addAccessory(
-          device, device.deviceid + 'SW0', true, { rfMap }, 'rf_pri'
-        )
+        accessory = this.addAccessory(device, device.deviceid + 'SW0', true, { rfMap }, 'rf_pri')
         const instance = './device/rf-bridge'
         accessory.control = new (require(instance))(this, accessory, devicesInHB)
 
@@ -1046,10 +1032,10 @@ class eWeLinkPlatform {
           let subExtraContext = {}
           const fullDeviceId = device.deviceid + 'SW' + swNumber
           const uuidsub = this.api.hap.uuid.generate(fullDeviceId)
-          const disableDeviceLogging = this.rfDevices[fullDeviceId] &&
-            this.rfDevices[fullDeviceId].overrideDisabledLogging
-            ? false
-            : this.config.disableDeviceLogging
+          const disableDeviceLogging =
+            this.rfDevices[fullDeviceId] && this.rfDevices[fullDeviceId].overrideDisabledLogging
+              ? false
+              : this.config.disableDeviceLogging
 
           // Check which eWeLink type the connected sub device is
           switch (subDevice.type) {
@@ -1064,17 +1050,15 @@ class eWeLinkPlatform {
               break
             case '6':
             case '7':
-              subType = this.rfDevices[fullDeviceId]
-                ? this.rfDevices[fullDeviceId].type
-                : 'motion'
-              sensorTimeLength = this.rfDevices[fullDeviceId] &&
-                this.rfDevices[fullDeviceId].sensorTimeLength
-                ? this.rfDevices[fullDeviceId].sensorTimeLength
-                : this.consts.defaultValues.sensorTimeLength
-              sensorTimeDiff = this.rfDevices[fullDeviceId] &&
-                this.rfDevices[fullDeviceId].sensorTimeDifference
-                ? this.rfDevices[fullDeviceId].sensorTimeDifference
-                : this.consts.defaultValues.sensorTimeDifference
+              subType = this.rfDevices[fullDeviceId] ? this.rfDevices[fullDeviceId].type : 'motion'
+              sensorTimeLength =
+                this.rfDevices[fullDeviceId] && this.rfDevices[fullDeviceId].sensorTimeLength
+                  ? this.rfDevices[fullDeviceId].sensorTimeLength
+                  : this.consts.defaultValues.sensorTimeLength
+              sensorTimeDiff =
+                this.rfDevices[fullDeviceId] && this.rfDevices[fullDeviceId].sensorTimeDifference
+                  ? this.rfDevices[fullDeviceId].sensorTimeDifference
+                  : this.consts.defaultValues.sensorTimeDifference
               break
             default: {
               this.log.warn('[%s] %s:', device.name, this.lang.devNotSupYet)
@@ -1112,22 +1096,23 @@ class eWeLinkPlatform {
 
           // Get the sub accessory if it's new or hasn't been removed above
 
-          subAccessory = devicesInHB.get(uuidsub) ||
+          subAccessory =
+            devicesInHB.get(uuidsub) ||
             this.addAccessory(device, fullDeviceId, false, subExtraContext, 'rf_sub')
 
           // Add context information to the sub accessory
           subAccessory.context.firmware = device.params.fwVersion || plugin.version
           subAccessory.context.reachableWAN = wsClient && device.online
-          subAccessory.context.reachableLAN = lanClient && lanDevices.has(device.deviceid) &&
-            lanDevices.get(device.deviceid).ip
+          subAccessory.context.reachableLAN =
+            lanClient && lanDevices.has(device.deviceid) && lanDevices.get(device.deviceid).ip
           subAccessory.context.eweBrandName = device.brandName
           subAccessory.context.eweBrandLogo = device.brandLogo
-          subAccessory.context.eweShared = device.sharedBy && device.sharedBy.email
-            ? device.sharedBy.email
-            : false
-          subAccessory.context.ip = lanClient && subAccessory.context.reachableLAN
-            ? lanDevices.get(device.deviceid).ip
-            : false
+          subAccessory.context.eweShared =
+            device.sharedBy && device.sharedBy.email ? device.sharedBy.email : false
+          subAccessory.context.ip =
+            lanClient && subAccessory.context.reachableLAN
+              ? lanDevices.get(device.deviceid).ip
+              : false
 
           // Update any changes to the sub accessory to the platform
           this.api.updatePlatformAccessories(plugin.name, plugin.alias, [subAccessory])
@@ -1193,7 +1178,11 @@ class eWeLinkPlatform {
         ZB SENSOR [CONTACT]
         ******************/
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require('./device/zigbee/sensor-contact'))(this, accessory, devicesInHB)
+        accessory.control = new (require('./device/zigbee/sensor-contact'))(
+          this,
+          accessory,
+          devicesInHB
+        )
         /*****************/
       } else if (this.consts.devices.camera.includes(uiid)) {
         /*************
@@ -1222,23 +1211,21 @@ class eWeLinkPlatform {
       // Update the reachability values (via WS and LAN)
       accessory.context.firmware = device.params.fwVersion || plugin.version
       accessory.context.reachableWAN = wsClient && device.online
-      accessory.context.reachableLAN = lanClient && lanDevices.has(device.deviceid) &&
-        lanDevices.get(device.deviceid).ip
+      accessory.context.reachableLAN =
+        lanClient && lanDevices.has(device.deviceid) && lanDevices.get(device.deviceid).ip
       accessory.context.eweBrandName = device.brandName
       accessory.context.eweBrandLogo = device.brandLogo
-      accessory.context.eweShared = device.sharedBy && device.sharedBy.email
-        ? device.sharedBy.email
-        : false
-      accessory.context.ip = lanClient && accessory.context.reachableLAN
-        ? lanDevices.get(device.deviceid).ip
-        : false
+      accessory.context.eweShared =
+        device.sharedBy && device.sharedBy.email ? device.sharedBy.email : false
+      accessory.context.ip =
+        lanClient && accessory.context.reachableLAN ? lanDevices.get(device.deviceid).ip : false
 
       // Helpful logging for each device
       const str = accessory.context.reachableLAN
         ? this.lang.foundWithIP + ' [' + lanDevices.get(device.deviceid).ip + ']'
         : this.consts.devices.lanIn.includes(uiid)
-          ? this.lang.lanUnreachable
-          : this.lang.lanUnsupported
+        ? this.lang.lanUnreachable
+        : this.lang.lanUnsupported
 
       // Update accessory characteristics with latest values
       if (wsClient && accessory.control && accessory.control.externalUpdate) {
@@ -1270,9 +1257,10 @@ class eWeLinkPlatform {
     try {
       // Get the switchNumber which can be {X, 0, 1, 2, 3, 4, ...}
       const switchNumber = hbDeviceId.split('SW')[1].toString()
-      const channelCount = type === 'rf_pri'
-        ? Object.keys((device.tags && device.tags.zyx_info) || []).length
-        : this.consts.supportedDevices[device.extra.uiid]
+      const channelCount =
+        type === 'rf_pri'
+          ? Object.keys((device.tags && device.tags.zyx_info) || []).length
+          : this.consts.supportedDevices[device.extra.uiid]
 
       // Set up the device name which can depend on the accessory type
       if (type === 'rf_sub') {
@@ -1307,7 +1295,8 @@ class eWeLinkPlatform {
 
       // If it isn't a hidden device then set the accessory characteristics
       if (!hidden) {
-        accessory.getService(this.api.hap.Service.AccessoryInformation)
+        accessory
+          .getService(this.api.hap.Service.AccessoryInformation)
           .setCharacteristic(this.api.hap.Characteristic.SerialNumber, hbDeviceId)
           .setCharacteristic(this.api.hap.Characteristic.Manufacturer, device.brandName)
           .setCharacteristic(
@@ -1368,10 +1357,12 @@ class eWeLinkPlatform {
 
       // Set the correct firmware version if we can
       if (this.api && accessory.context.firmware) {
-        accessory.getService(this.api.hap.Service.AccessoryInformation).updateCharacteristic(
-          this.api.hap.Characteristic.FirmwareRevision,
-          accessory.context.firmware
-        )
+        accessory
+          .getService(this.api.hap.Service.AccessoryInformation)
+          .updateCharacteristic(
+            this.api.hap.Characteristic.FirmwareRevision,
+            accessory.context.firmware
+          )
       }
 
       // Add the configured accessory to our global map
@@ -1399,7 +1390,7 @@ class eWeLinkPlatform {
   async sendDeviceUpdate (accessory, params, useWS) {
     // Add to a queue so multiple updates are at least 500ms apart
     return await queue.add(async () => {
-    // Log the update being sent
+      // Log the update being sent
       if (this.config.debug) {
         this.log('[%s] %s %s.', accessory.displayName, this.lang.updSend, JSON.stringify(params))
       }
@@ -1415,10 +1406,10 @@ class eWeLinkPlatform {
       const res = useWS
         ? this.lang.wsRequired
         : !lanClient
-          ? this.lang.lanDisabled
-          : !this.consts.devices.lanOut.includes(accessory.context.eweUIID)
-            ? this.lang.lanNotSup
-            : await lanClient.sendUpdate(payload)
+        ? this.lang.lanDisabled
+        : !this.consts.devices.lanOut.includes(accessory.context.eweUIID)
+        ? this.lang.lanNotSup
+        : await lanClient.sendUpdate(payload)
 
       // Revert to WS if LAN mode not possible for whatever reason
       if (res !== 'ok') {
@@ -1476,9 +1467,7 @@ class eWeLinkPlatform {
           reachableChange = true
 
           // Log the new reachability of the device
-          const status = accessory.context.reachableWAN
-            ? this.lang.repOnline
-            : this.lang.repOffline
+          const status = accessory.context.reachableWAN ? this.lang.repOnline : this.lang.repOffline
           this.log('[%s] %s %s.', accessory.displayName, status, this.lang.viaWS)
 
           // Mark the online/offline status of certain devices
diff --git a/lib/utils/colour-utils.js b/lib/utils/colour-utils.js
index e713898b..42474d70 100644
--- a/lib/utils/colour-utils.js
+++ b/lib/utils/colour-utils.js
@@ -12,8 +12,8 @@ module.exports = {
     s = parseInt(s) / 100
     const f = h - Math.floor(h)
     const p = 255 * (1 - s)
-    const q = 255 * (1 - (s * f))
-    const t = 255 * (1 - (s * (1 - f)))
+    const q = 255 * (1 - s * f)
+    const t = 255 * (1 - s * (1 - f))
     let rgb
     switch (Math.floor(h) % 6) {
       case 0:
@@ -58,7 +58,7 @@ module.exports = {
     if (max === 0) {
       s = 0
     } else {
-      s = delta / max * 100
+      s = (delta / max) * 100
     }
     if (max === min) {
       h = 0
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 3320fb99..faaf1fe8 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -68,38 +68,76 @@ module.exports = {
 
   allowed: {
     httpHosts: [
-      'auto', 'eu-apia.coolkit.cc', 'us-apia.coolkit.cc', 'as-apia.coolkit.cc',
+      'auto',
+      'eu-apia.coolkit.cc',
+      'us-apia.coolkit.cc',
+      'as-apia.coolkit.cc',
       'cn-apia.coolkit.cn'
     ],
     modes: ['auto', 'wan', 'lan'],
-    singleDevices: [
-      'deviceId', 'label', 'showAsOutlet', 'ipAddress', 'overrideDisabledLogging'
-    ],
+    singleDevices: ['deviceId', 'label', 'showAsOutlet', 'ipAddress', 'overrideDisabledLogging'],
     multiDevices: [
-      'deviceId', 'label', 'showAsOutlet', 'inUsePowerThreshold', 'hideChannels',
-      'ipAddress', 'overrideDisabledLogging'
+      'deviceId',
+      'label',
+      'showAsOutlet',
+      'inUsePowerThreshold',
+      'hideChannels',
+      'ipAddress',
+      'overrideDisabledLogging'
     ],
     outletDevices: [
-      'deviceId', 'label', 'showAsSwitch', 'inUsePowerThreshold', 'ipAddress',
+      'deviceId',
+      'label',
+      'showAsSwitch',
+      'inUsePowerThreshold',
+      'ipAddress',
       'overrideDisabledLogging'
     ],
     lightDevices: [
-      'deviceId', 'label', 'bulbModel', 'brightnessStep', 'adaptiveLightingShift',
-      'ipAddress', 'overrideDisabledLogging'
+      'deviceId',
+      'label',
+      'bulbModel',
+      'brightnessStep',
+      'adaptiveLightingShift',
+      'ipAddress',
+      'overrideDisabledLogging'
     ],
     thDevices: [
-      'deviceId', 'label', 'hideSwitch', 'offset', 'minTarget', 'maxTarget',
+      'deviceId',
+      'label',
+      'hideSwitch',
+      'offset',
+      'minTarget',
+      'maxTarget',
       'overrideDisabledLogging'
     ],
     fanDevices: ['deviceId', 'label', 'hideLight', 'overrideDisabledLogging'],
     sensorDevices: [
-      'deviceId', 'lowBattThreshold', 'offset', 'hideLongDouble', 'scaleBattery',
-      'sensorTimeDifference', 'overrideDisabledLogging'
+      'deviceId',
+      'lowBattThreshold',
+      'offset',
+      'hideLongDouble',
+      'scaleBattery',
+      'sensorTimeDifference',
+      'overrideDisabledLogging'
     ],
     groupTypes: [
-      'blind', 'door', 'garage', 'garage_two', 'garage_four', 'garage_eachen', 'lock',
-      'sensor_leak', 'switch_valve', 'tap', 'tap_two', 'thermostat', 'valve', 'valve_two',
-      'valve_four', 'window'
+      'blind',
+      'door',
+      'garage',
+      'garage_two',
+      'garage_four',
+      'garage_eachen',
+      'lock',
+      'sensor_leak',
+      'switch_valve',
+      'tap',
+      'tap_two',
+      'thermostat',
+      'valve',
+      'valve_two',
+      'valve_four',
+      'window'
     ],
     setups: ['oneSwitch', 'twoSwitch'],
     obstructs: ['garage', 'garage_eachen'],
@@ -144,13 +182,53 @@ module.exports = {
   },
 
   paramsToKeep: [
-    'battery', 'bright', 'brightness', 'channel', 'channel0', 'cmd', 'color', 'colorB',
-    'colorG', 'colorR', 'current', 'currentHumidity', 'currentTemperature',
-    'currLocation', 'humidity', 'key', 'lightbright', 'lightswitch', 'lightRcolor',
-    'lightGcolor', 'lightBcolor', 'location', 'lock', 'ltype', 'mainSwitch', 'mode',
-    'motion', 'online', 'power', 'rfChl', 'rfList', 'rfTrig', 'sensorType', 'setclose',
-    'state', 'switch', 'switches', 'targetTemp', 'temperature', 'tempScale', 'trigTime',
-    'type', 'voltage', 'white', 'workMode', 'workState', 'zyx_mode'
+    'battery',
+    'bright',
+    'brightness',
+    'channel',
+    'channel0',
+    'cmd',
+    'color',
+    'colorB',
+    'colorG',
+    'colorR',
+    'current',
+    'currentHumidity',
+    'currentTemperature',
+    'currLocation',
+    'humidity',
+    'key',
+    'lightbright',
+    'lightswitch',
+    'lightRcolor',
+    'lightGcolor',
+    'lightBcolor',
+    'location',
+    'lock',
+    'ltype',
+    'mainSwitch',
+    'mode',
+    'motion',
+    'online',
+    'power',
+    'rfChl',
+    'rfList',
+    'rfTrig',
+    'sensorType',
+    'setclose',
+    'state',
+    'switch',
+    'switches',
+    'targetTemp',
+    'temperature',
+    'tempScale',
+    'trigTime',
+    'type',
+    'voltage',
+    'white',
+    'workMode',
+    'workState',
+    'zyx_mode'
   ],
 
   supportedDevices: {
diff --git a/lib/utils/functions.js b/lib/utils/functions.js
index 4dcc2ae8..023d0f4b 100644
--- a/lib/utils/functions.js
+++ b/lib/utils/functions.js
@@ -12,7 +12,10 @@ module.exports = {
   },
 
   parseDeviceId: deviceId => {
-    return deviceId.toLowerCase().replace(/[^a-z0-9]+/g, '').replace('sw', 'SW')
+    return deviceId
+      .toLowerCase()
+      .replace(/[^a-z0-9]+/g, '')
+      .replace('sw', 'SW')
   },
 
   parseError: err => {

From aa4d5d1c714a5aa592b523901e98fc81b99f75d8 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 12 May 2021 09:17:38 +0100
Subject: [PATCH 2107/3183] node to 14.17.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index fde639ee..b29fa2a1 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
   "main": "lib/index.js",
   "engines": {
     "homebridge": "^1.3.3",
-    "node": "^14.16.1"
+    "node": "^14.17.0"
   },
   "repository": {
     "type": "git",

From 86072b787ef56686fe027c843cd1b5c5ef43561c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 12 May 2021 09:26:24 +0100
Subject: [PATCH 2108/3183] npm ignore prettierignore

---
 .npmignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.npmignore b/.npmignore
index 45fb205e..ac00d842 100644
--- a/.npmignore
+++ b/.npmignore
@@ -2,4 +2,5 @@
 .nova
 .github
 .npm
+.prettierignore
 node_modules/
\ No newline at end of file

From 609cd1cc527aa299aa6d01adccda2aa815aea7c1 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 12 May 2021 09:45:07 +0100
Subject: [PATCH 2109/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2c7aec8f..52475e00 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,13 @@
 
 All notable changes to this homebridge-ewelink will be documented in this file.
 
+## BETA
+
+### Changes
+
+- [Backend] Use `standard-prettier` code formatting
+- Recommended node version bump to v14.17.0
+
 ## 6.6.0 (2021-05-10)
 
 ### Added

From 22f0be1e7a248c8bddb9af3d5b4214e574ff8e3a Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 12 May 2021 09:46:55 +0100
Subject: [PATCH 2110/3183] 6.6.1-beta.0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index a89142a3..7fad4299 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.6.0",
+  "version": "6.6.1-beta.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index b29fa2a1..1415456a 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.6.0",
+  "version": "6.6.1-beta.0",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From f9b4cf8c27227e447a483096f737e2a8f9f74523 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 12 May 2021 11:35:36 +0100
Subject: [PATCH 2111/3183] fix api auth

---
 lib/connection/http.js | 3 ++-
 lib/index.js           | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/connection/http.js b/lib/connection/http.js
index 2582a136..6d724e6c 100644
--- a/lib/connection/http.js
+++ b/lib/connection/http.js
@@ -104,7 +104,8 @@ module.exports = class connectionHTTP {
           return {
             aToken: this.aToken,
             apiKey: this.apiKey,
-            httpHost: this.httpHost
+            httpHost: this.httpHost,
+            password: this.password
           }
         } else {
           if (body.error === 500) {
diff --git a/lib/index.js b/lib/index.js
index 30fe1dcb..d6341253 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -486,6 +486,7 @@ class eWeLinkPlatform {
       // Set up the HTTP client, get the user HTTP host, and login
       httpClient = new (require('./connection/http'))(this)
       const authData = await httpClient.login()
+      this.config.password = authData.password
 
       // Get a device list via HTTP request
       const deviceList = await httpClient.getDevices()

From e8d5da00d71a1cf792f6622cce4de6eaa9729d3b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 12 May 2021 11:36:01 +0100
Subject: [PATCH 2112/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 52475e00..de6218b3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 ### Changes
 
+- Fix internal API auth issue when using a base64 encoded password
 - [Backend] Use `standard-prettier` code formatting
 - Recommended node version bump to v14.17.0
 

From d645771a1e680ee362fe7bea530b718b59795133 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 12 May 2021 11:36:31 +0100
Subject: [PATCH 2113/3183] 6.6.1-beta.1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 7fad4299..f0d68768 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.6.1-beta.0",
+  "version": "6.6.1-beta.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 1415456a..b69bc4c3 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.6.1-beta.0",
+  "version": "6.6.1-beta.1",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 621af7a61b614fc62dfe5fb1928d6ee528764109 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 13 May 2021 08:58:29 +0100
Subject: [PATCH 2114/3183] backend changes to contact sensors

---
 config.schema.json                        |   9 ++
 lib/device/sensor-contact.js              |  52 ++-----
 lib/device/simulation/garage-od-switch.js |  52 ++-----
 lib/device/simulation/sensor-hidden.js    |  67 +++++++++
 lib/device/simulation/sensor-visible.js   | 164 ++++++++++++++++++++++
 lib/device/zigbee/sensor-contact.js       |  43 +-----
 lib/index.js                              |  27 +++-
 lib/utils/lang-en.js                      |   1 +
 8 files changed, 292 insertions(+), 123 deletions(-)
 create mode 100644 lib/device/simulation/sensor-hidden.js
 create mode 100644 lib/device/simulation/sensor-visible.js

diff --git a/config.schema.json b/config.schema.json
index 3000fab9..976a76e0 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -669,6 +669,14 @@
                 "functionBody": "return (model.groups[arrayIndices] && model.groups[arrayIndices].type==='garage');"
               }
             },
+            "hideSensor": {
+              "type": "boolean",
+              "title": "Hide Sensor",
+              "description": "Hide the contact sensor from HomeKit",
+              "condition": {
+                "functionBody": "return (model.groups[arrayIndices] && model.groups[arrayIndices].sensorId);"
+              }
+            },
             "obstructId": {
               "type": "string",
               "title": "Obstruction Switch",
@@ -918,6 +926,7 @@
             "groups[].operationTime",
             "groups[].operationTimeDown",
             "groups[].sensorId",
+            "groups[].hideSensor",
             "groups[].obstructId",
             "groups[].ipAddress",
             "groups[].overrideDisabledLogging",
diff --git a/lib/device/sensor-contact.js b/lib/device/sensor-contact.js
index be636de3..cb7e2876 100644
--- a/lib/device/sensor-contact.js
+++ b/lib/device/sensor-contact.js
@@ -3,9 +3,8 @@
 'use strict'
 
 module.exports = class deviceSensorContact {
-  constructor (platform, accessory, devicesInHB) {
+  constructor (platform, accessory) {
     // Set up variables from the platform
-    this.devicesInHB = devicesInHB
     this.eveChar = platform.eveChar
     this.funcs = platform.funcs
     this.hapChar = platform.api.hap.Characteristic
@@ -76,18 +75,16 @@ module.exports = class deviceSensorContact {
 
   async externalUpdate (params) {
     try {
-      if (this.funcs.hasProperty(params, 'battery')) {
-        const scaledBattery = Math.round(params.battery * 33.3)
-        if (this.cacheBatt !== scaledBattery) {
-          this.cacheBatt = scaledBattery
-          this.batteryService.updateCharacteristic(this.hapChar.BatteryLevel, this.cacheBatt)
-          this.batteryService.updateCharacteristic(
-            this.hapChar.StatusLowBattery,
-            this.cacheBatt < this.lowBattThreshold
-          )
-          if (params.updateSource && !this.disableDeviceLogging) {
-            this.log('[%s] %s [%s%].', this.name, this.lang.curBatt, this.cacheBatt)
-          }
+      if (this.funcs.hasProperty(params, 'battery') && params.battery !== this.cacheBatt) {
+        this.cacheBatt = params.battery
+        this.cacheBattScaled = Math.round(this.cacheBatt * 33.3)
+        this.batteryService.updateCharacteristic(this.hapChar.BatteryLevel, this.cacheBattScaled)
+        this.batteryService.updateCharacteristic(
+          this.hapChar.StatusLowBattery,
+          this.cacheBattScaled < this.lowBattThreshold
+        )
+        if (params.updateSource && !this.disableDeviceLogging) {
+          this.log('[%s] %s [%s%].', this.name, this.lang.curBatt, this.cacheBattScaled)
         }
       }
       if (!params.switch || params.switch === this.cacheState) {
@@ -117,33 +114,6 @@ module.exports = class deviceSensorContact {
           newState === 0 ? this.lang.contactYes : this.lang.contactNo
         )
       }
-      for (const [deviceId, group] of Object.entries(this.platform.simulations)) {
-        if (group.sensorId === this.accessory.context.eweDeviceId && group.type === 'garage') {
-          const uuid = this.hapUUIDGen(deviceId + 'SWX')
-          if (this.devicesInHB.has(uuid)) {
-            const subAccessory = this.devicesInHB.get(uuid)
-            const gdService = subAccessory.getService(this.hapServ.GarageDoorOpener)
-            const name = subAccessory.displayName
-            switch (newState) {
-              case 0:
-                gdService.updateCharacteristic(this.hapChar.TargetDoorState, 1)
-                gdService.updateCharacteristic(this.hapChar.CurrentDoorState, 1)
-                if (params.updateSource && !this.disableDeviceLogging) {
-                  this.log('[%s] %s [%s].', name, this.lang.curState, this.lang.doorClosed)
-                }
-                break
-              case 1:
-                await this.funcs.sleep(Math.max(group.operationTime * 100, 2000))
-                gdService.updateCharacteristic(this.hapChar.TargetDoorState, 0)
-                gdService.updateCharacteristic(this.hapChar.CurrentDoorState, 0)
-                if (params.updateSource && !this.disableDeviceLogging) {
-                  this.log('[%s] %s [%s].', name, this.lang.curState, this.lang.doorOpen)
-                }
-                break
-            }
-          }
-        }
-      }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
diff --git a/lib/device/simulation/garage-od-switch.js b/lib/device/simulation/garage-od-switch.js
index 51c77399..e360c475 100644
--- a/lib/device/simulation/garage-od-switch.js
+++ b/lib/device/simulation/garage-od-switch.js
@@ -7,60 +7,32 @@ module.exports = class deviceGarageODSwitch {
     // Set up variables from the platform
     this.hapChar = platform.api.hap.Characteristic
     this.hapServ = platform.api.hap.Service
-    this.hapUUIDGen = platform.api.hap.uuid.generate
-    this.lang = platform.lang
-    this.log = platform.log
     this.platform = platform
 
     // Set up variables from the accessory
-    this.name = accessory.displayName
     this.accessory = accessory
 
     // Set up custom variables for this device type
-    this.garageId = platform.obstructSwitches[accessory.context.eweDeviceId]
-    const uuid = this.hapUUIDGen(this.garageId + 'SWX')
-    this.garage = devicesInHB.get(uuid)
-    this.disableDeviceLogging =
-      platform.simulations[this.garageId] &&
-      platform.simulations[this.garageId].overrideDisabledLogging
-        ? false
-        : platform.config.disableDeviceLogging
-
-    // Add the switch service if it doesn't already exist
-    this.service =
-      this.accessory.getService(this.hapServ.Switch) ||
-      this.accessory.addService(this.hapServ.Switch)
-
-    // Get the garage door accessory to which this switch relates
-    this.gService = this.garage.getService(this.hapServ.GarageDoorOpener)
-
-    // Update the obstruction detected of the garage depending on the switch state
-    this.gService.updateCharacteristic(
-      this.hapChar.ObstructionDetected,
-      this.service.getCharacteristic(this.hapChar.On).value
-    )
-
-    // Output the customised options to the log if in debug mode
-    if (platform.config.debug) {
-      const opts = JSON.stringify({
-        disableDeviceLogging: this.disableDeviceLogging
-      })
-      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
+    const garageId = platform.obstructSwitches[accessory.context.eweDeviceId]
+
+    // Check the garage door exists in Homebridge
+    const uuid = platform.api.hap.uuid.generate(garageId + 'SWX')
+    if (!devicesInHB.has(uuid)) {
+      // Can't find garage so throw an error
+      throw new Error(platform.lang.noGarageForOD)
+    } else {
+      // Get the garage door accessory
+      this.gService = devicesInHB.get(uuid).getService(this.hapServ.GarageDoorOpener)
     }
   }
 
   async externalUpdate (params) {
     try {
-      if (!params.switch || params.switch === this.cacheState) {
+      if (!params.switch || params.switch === this.cacheState || !this.gService) {
         return
       }
-      const newStatus = params.switch === 'on'
-      this.service.updateCharacteristic(this.hapChar.On, newStatus)
-      this.gService.updateCharacteristic(this.hapChar.ObstructionDetected, newStatus)
+      this.gService.updateCharacteristic(this.hapChar.ObstructionDetected, params.switch === 'on')
       this.cacheState = params.switch
-      if (params.updateSource && !this.disableDeviceLogging) {
-        this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
-      }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
diff --git a/lib/device/simulation/sensor-hidden.js b/lib/device/simulation/sensor-hidden.js
new file mode 100644
index 00000000..6dcb5d97
--- /dev/null
+++ b/lib/device/simulation/sensor-hidden.js
@@ -0,0 +1,67 @@
+/* jshint -W014, -W033, esversion: 9 */
+/* eslint-disable new-cap */
+'use strict'
+
+module.exports = class deviceSensorHidden {
+  constructor (platform, accessory, devicesInHB) {
+    // Set up variables from the platform
+    this.devicesInHB = devicesInHB
+    this.funcs = platform.funcs
+    this.hapChar = platform.api.hap.Characteristic
+    this.hapServ = platform.api.hap.Service
+    this.hapUUIDGen = platform.api.hap.uuid.generate
+    this.lang = platform.lang
+    this.log = platform.log
+    this.platform = platform
+
+    // Set up variables from the accessory
+    this.accessory = accessory
+  }
+
+  async externalUpdate (params) {
+    try {
+      if (!this.funcs.hasProperty(params, 'lock') && !params.switch) {
+        return
+      }
+      let newState
+      if (params.switch) {
+        newState = params.switch === 'on' ? 1 : 0
+      } else {
+        newState = params.lock
+      }
+      if (newState === this.cacheState) {
+        return
+      }
+      this.cacheState = newState
+      for (const [deviceId, group] of Object.entries(this.platform.simulations)) {
+        if (group.sensorId === this.accessory.context.eweDeviceId && group.type === 'garage') {
+          const uuid = this.hapUUIDGen(deviceId + 'SWX')
+          if (this.devicesInHB.has(uuid)) {
+            const subAccessory = this.devicesInHB.get(uuid)
+            const gdService = subAccessory.getService(this.hapServ.GarageDoorOpener)
+            const name = subAccessory.displayName
+            switch (newState) {
+              case 0:
+                gdService.updateCharacteristic(this.hapChar.TargetDoorState, 1)
+                gdService.updateCharacteristic(this.hapChar.CurrentDoorState, 1)
+                if (params.updateSource && !this.disableDeviceLogging) {
+                  this.log('[%s] %s [%s].', name, this.lang.curState, this.lang.doorClosed)
+                }
+                break
+              case 1:
+                await this.funcs.sleep(Math.max(group.operationTime * 100, 2000))
+                gdService.updateCharacteristic(this.hapChar.TargetDoorState, 0)
+                gdService.updateCharacteristic(this.hapChar.CurrentDoorState, 0)
+                if (params.updateSource && !this.disableDeviceLogging) {
+                  this.log('[%s] %s [%s].', name, this.lang.curState, this.lang.doorOpen)
+                }
+                break
+            }
+          }
+        }
+      }
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, false)
+    }
+  }
+}
diff --git a/lib/device/simulation/sensor-visible.js b/lib/device/simulation/sensor-visible.js
new file mode 100644
index 00000000..08c8589b
--- /dev/null
+++ b/lib/device/simulation/sensor-visible.js
@@ -0,0 +1,164 @@
+/* jshint -W014, -W033, esversion: 9 */
+/* eslint-disable new-cap */
+'use strict'
+
+module.exports = class deviceSensorVisible {
+  constructor (platform, accessory, devicesInHB) {
+    // Set up variables from the platform
+    this.devicesInHB = devicesInHB
+    this.eveChar = platform.eveChar
+    this.funcs = platform.funcs
+    this.hapChar = platform.api.hap.Characteristic
+    this.hapServ = platform.api.hap.Service
+    this.hapUUIDGen = platform.api.hap.uuid.generate
+    this.lang = platform.lang
+    this.log = platform.log
+    this.platform = platform
+
+    // Set up variables from the accessory
+    this.name = accessory.displayName
+    this.accessory = accessory
+
+    // Set up custom variables for this device type
+    this.isDW2 = platform.consts.devices.sensorContact.includes(accessory.context.eweUIID)
+    const deviceConf = platform.sensorDevices[accessory.context.eweDeviceId]
+    this.scaleBattery = deviceConf && deviceConf.scaleBattery
+    this.lowBattThreshold =
+      deviceConf && deviceConf.lowBattThreshold
+        ? Math.min(deviceConf.lowBattThreshold, 100)
+        : platform.consts.defaultValues.lowBattThreshold
+    this.disableDeviceLogging =
+      deviceConf && deviceConf.overrideDisabledLogging
+        ? false
+        : platform.config.disableDeviceLogging
+
+    // If the accessory has a leak sensor service then remove it
+    if (this.accessory.getService(this.hapServ.LeakSensor)) {
+      this.accessory.removeService(this.accessory.getService(this.hapServ.LeakSensor))
+    }
+
+    // Add the contact sensor service if it doesn't already exist
+    if (!(this.service = this.accessory.getService(this.hapServ.ContactSensor))) {
+      this.service = this.accessory.addService(this.hapServ.ContactSensor)
+      this.service.addCharacteristic(this.eveChar.LastActivation)
+      this.service.addCharacteristic(this.eveChar.ResetTotal)
+      this.service.addCharacteristic(this.eveChar.OpenDuration)
+      this.service.addCharacteristic(this.eveChar.ClosedDuration)
+      this.service.addCharacteristic(this.eveChar.TimesOpened)
+    }
+
+    // Obtain the current times opened value
+    this.timesOpened = this.service.getCharacteristic(this.eveChar.TimesOpened).value
+
+    // Add the set handler to the contact sensor reset total characteristic
+    this.service.getCharacteristic(this.eveChar.ResetTotal).onSet(value => {
+      this.timesOpened = 0
+      this.service.updateCharacteristic(this.eveChar.TimesOpened, 0)
+    })
+
+    // Add the battery service if it doesn't already exist
+    this.batteryService =
+      this.accessory.getService(this.hapServ.BatteryService) ||
+      this.accessory.addService(this.hapServ.BatteryService)
+
+    // Pass the accessory to Fakegato to set up with Eve
+    this.accessory.eveService = new platform.eveService('door', this.accessory, {
+      log: platform.config.debugFakegato ? this.log : () => {}
+    })
+
+    // Output the customised options to the log if in debug mode
+    if (platform.config.debug) {
+      const opts = JSON.stringify({
+        disableDeviceLogging: this.disableDeviceLogging,
+        lowBattThreshold: this.lowBattThreshold,
+        scaleBattery: this.scaleBattery
+      })
+      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
+    }
+  }
+
+  async externalUpdate (params) {
+    try {
+      if (this.funcs.hasProperty(params, 'battery') && params.battery !== this.cacheBatt) {
+        this.cacheBatt = params.battery
+        this.cacheBattScaled = this.isDW2
+          ? Math.round(this.cacheBatt * 33.3)
+          : this.scaleBattery
+          ? this.cacheBatt * 10
+          : this.cacheBatt
+        this.batteryService.updateCharacteristic(this.hapChar.BatteryLevel, this.cacheBattScaled)
+        this.batteryService.updateCharacteristic(
+          this.hapChar.StatusLowBattery,
+          this.cacheBattScaled < this.lowBattThreshold
+        )
+        if (params.updateSource && !this.disableDeviceLogging) {
+          this.log('[%s] %s [%s%].', this.name, this.lang.curBatt, this.cacheBattScaled)
+        }
+      }
+      if (!this.funcs.hasProperty(params, 'lock') && !params.switch) {
+        return
+      }
+      let newState
+      if (params.switch) {
+        newState = params.switch === 'on' ? 1 : 0
+      } else {
+        newState = params.lock
+      }
+      if (newState === this.cacheState) {
+        return
+      }
+      this.cacheState = newState
+      if (newState === 1) {
+        this.service.updateCharacteristic(this.hapChar.ContactSensorState, 1)
+        this.accessory.eveService.addEntry({ status: 1 })
+        const initialTime = this.accessory.eveService.getInitialTime()
+        this.service.updateCharacteristic(
+          this.eveChar.LastActivation,
+          Math.round(new Date().valueOf() / 1000) - initialTime
+        )
+        this.timesOpened++
+        this.service.updateCharacteristic(this.eveChar.TimesOpened, this.timesOpened)
+      } else {
+        this.service.updateCharacteristic(this.hapChar.ContactSensorState, 0)
+        this.accessory.eveService.addEntry({ status: 0 })
+      }
+      if (params.updateSource && !this.disableDeviceLogging) {
+        this.log(
+          '[%s] %s [%s].',
+          this.name,
+          this.lang.curState,
+          newState === 0 ? this.lang.contactYes : this.lang.contactNo
+        )
+      }
+      for (const [deviceId, group] of Object.entries(this.platform.simulations)) {
+        if (group.sensorId === this.accessory.context.eweDeviceId && group.type === 'garage') {
+          const uuid = this.hapUUIDGen(deviceId + 'SWX')
+          if (this.devicesInHB.has(uuid)) {
+            const subAccessory = this.devicesInHB.get(uuid)
+            const gdService = subAccessory.getService(this.hapServ.GarageDoorOpener)
+            const name = subAccessory.displayName
+            switch (newState) {
+              case 0:
+                gdService.updateCharacteristic(this.hapChar.TargetDoorState, 1)
+                gdService.updateCharacteristic(this.hapChar.CurrentDoorState, 1)
+                if (params.updateSource && !this.disableDeviceLogging) {
+                  this.log('[%s] %s [%s].', name, this.lang.curState, this.lang.doorClosed)
+                }
+                break
+              case 1:
+                await this.funcs.sleep(Math.max(group.operationTime * 100, 2000))
+                gdService.updateCharacteristic(this.hapChar.TargetDoorState, 0)
+                gdService.updateCharacteristic(this.hapChar.CurrentDoorState, 0)
+                if (params.updateSource && !this.disableDeviceLogging) {
+                  this.log('[%s] %s [%s].', name, this.lang.curState, this.lang.doorOpen)
+                }
+                break
+            }
+          }
+        }
+      }
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, false)
+    }
+  }
+}
diff --git a/lib/device/zigbee/sensor-contact.js b/lib/device/zigbee/sensor-contact.js
index 2aafebc9..faf454d1 100644
--- a/lib/device/zigbee/sensor-contact.js
+++ b/lib/device/zigbee/sensor-contact.js
@@ -3,9 +3,8 @@
 'use strict'
 
 module.exports = class deviceZBSensorContact {
-  constructor (platform, accessory, devicesInHB) {
+  constructor (platform, accessory) {
     // Set up variables from the platform
-    this.devicesInHB = devicesInHB
     this.eveChar = platform.eveChar
     this.funcs = platform.funcs
     this.hapChar = platform.api.hap.Characteristic
@@ -73,20 +72,19 @@ module.exports = class deviceZBSensorContact {
 
   async externalUpdate (params) {
     try {
-      if (this.funcs.hasProperty(params, 'battery') && params.battery !== this.cacheBattery) {
-        this.cacheBattery = params.battery
-        const scaledBatt = this.scaleBattery ? this.cacheBattery * 10 : this.cacheBattery
-        this.battService.updateCharacteristic(this.hapChar.BatteryLevel, scaledBatt)
+      if (this.funcs.hasProperty(params, 'battery') && params.battery !== this.cacheBatt) {
+        this.cacheBatt = params.battery
+        this.cacheBattScaled = this.scaleBattery ? this.cacheBatt * 10 : this.cacheBatt
+        this.battService.updateCharacteristic(this.hapChar.BatteryLevel, this.cacheBattScaled)
         this.battService.updateCharacteristic(
           this.hapChar.StatusLowBattery,
-          scaledBatt < this.lowBattThreshold
+          this.cacheBattScaled < this.lowBattThreshold
         )
         if (params.updateSource && !this.disableDeviceLogging) {
-          this.log('[%s] %s [%s%].', this.name, this.lang.curBatt, scaledBatt)
+          this.log('[%s] %s [%s%].', this.name, this.lang.curBatt, this.cacheBattScaled)
         }
       }
       if (this.funcs.hasProperty(params, 'lock') && [0, 1].includes(params.lock)) {
-        this.service.updateCharacteristic(this.hapChar.ContactSensorState, params.lock)
         if (params.lock === 1) {
           this.service.updateCharacteristic(this.hapChar.ContactSensorState, 1)
           this.accessory.eveService.addEntry({ status: 1 })
@@ -110,33 +108,6 @@ module.exports = class deviceZBSensorContact {
           )
         }
       }
-      for (const [deviceId, group] of Object.entries(this.platform.simulations)) {
-        if (group.sensorId === this.accessory.context.eweDeviceId && group.type === 'garage') {
-          const uuid = this.hapUUIDGen(deviceId + 'SWX')
-          if (this.devicesInHB.has(uuid)) {
-            const subAccessory = this.devicesInHB.get(uuid)
-            const gdService = subAccessory.getService(this.hapServ.GarageDoorOpener)
-            const name = subAccessory.displayName
-            switch (params.lock) {
-              case 0:
-                gdService.updateCharacteristic(this.hapChar.TargetDoorState, 1)
-                gdService.updateCharacteristic(this.hapChar.CurrentDoorState, 1)
-                if (params.updateSource && !this.disableDeviceLogging) {
-                  this.log('[%s] %s [%s].', name, this.lang.curState, this.lang.doorClosed)
-                }
-                break
-              case 1:
-                await this.funcs.sleep(Math.max(group.operationTime * 100, 2000))
-                gdService.updateCharacteristic(this.hapChar.TargetDoorState, 0)
-                gdService.updateCharacteristic(this.hapChar.CurrentDoorState, 0)
-                if (params.updateSource && !this.disableDeviceLogging) {
-                  this.log('[%s] %s [%s].', name, this.lang.curState, this.lang.doorOpen)
-                }
-                break
-            }
-          }
-        }
-      }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
diff --git a/lib/index.js b/lib/index.js
index d6341253..da7c82b1 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -339,6 +339,7 @@ class eWeLinkPlatform {
                     }
                     break
                   }
+                  case 'hideSensor':
                   case 'overrideDisabledLogging':
                     if (typeof v === 'string') {
                       logQuotes(key + '.' + id + '.' + k)
@@ -691,6 +692,24 @@ class eWeLinkPlatform {
         accessory = this.addAccessory(device, device.deviceid + 'SWX', true)
         accessory.control = new (require(instance))(this, accessory, devicesInHB)
         /****************************/
+      } else if (
+        this.consts.devices.garageSensors.includes(uiid) &&
+        Object.values(this.simulations).some(el => el.sensorId === device.deviceId)
+      ) {
+        /************************************
+        SENSORS [SONOFF DW2 AS GARAGE SENSOR]
+        ************************************/
+        const sim = Object.values(this.simulations).find(el => el.sensorId === device.deviceId)
+        let instance
+        if (sim.hideSensor) {
+          instance = './device/simulation/sensor-hidden'
+          accessory = this.addAccessory(device, device.deviceid + 'SWX', true)
+        } else {
+          instance = './device/simulation/sensor-visible'
+          accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
+        }
+        accessory.control = new (require(instance))(this, accessory, devicesInHB)
+        /******************************************/
       } else if (
         this.simulations[device.deviceid] &&
         this.simulations[device.deviceid].type === 'garage'
@@ -818,7 +837,7 @@ class eWeLinkPlatform {
         SENSORS [SONOFF DW2]
         *******************/
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require('./device/sensor-contact'))(this, accessory, devicesInHB)
+        accessory.control = new (require('./device/sensor-contact'))(this, accessory)
         /******************/
       } else if (this.consts.devices.fan.includes(uiid)) {
         /***
@@ -1179,11 +1198,7 @@ class eWeLinkPlatform {
         ZB SENSOR [CONTACT]
         ******************/
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require('./device/zigbee/sensor-contact'))(
-          this,
-          accessory,
-          devicesInHB
-        )
+        accessory.control = new (require('./device/zigbee/sensor-contact'))(this, accessory)
         /*****************/
       } else if (this.consts.devices.camera.includes(uiid)) {
         /*************
diff --git a/lib/utils/lang-en.js b/lib/utils/lang-en.js
index 0ccf2724..3101d222 100644
--- a/lib/utils/lang-en.js
+++ b/lib/utils/lang-en.js
@@ -91,6 +91,7 @@ module.exports = {
   motionYes: 'motion detected',
   newRegionRec: 'New HTTP API host received',
   noAuthRec: 'No auth token received',
+  noGarageForOD: 'No corresponding garage door accessory found',
   noRegionRec: 'No valid region received',
   noWSHost: 'Server did not respond with a web socket host',
   recNew: 'receiving update for new device',

From c25e5054afd2073846b4aee9d504552a124f8840 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 13 May 2021 09:03:03 +0100
Subject: [PATCH 2115/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index de6218b3..70295327 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,8 +4,13 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 ## BETA
 
+### Added
+
+- The ability to hide a contact sensor from HomeKit when used with a garage door simulation
+
 ### Changes
 
+- Avoid repeated battery logging for the Sonoff DW2
 - Fix internal API auth issue when using a base64 encoded password
 - [Backend] Use `standard-prettier` code formatting
 - Recommended node version bump to v14.17.0

From 3e4e0509516078a5198be13fa1b194f0e503e8a7 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 13 May 2021 09:03:37 +0100
Subject: [PATCH 2116/3183] 6.6.1-beta.2

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index f0d68768..6fd24492 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.6.1-beta.1",
+  "version": "6.6.1-beta.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index b69bc4c3..c1e4f729 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.6.1-beta.1",
+  "version": "6.6.1-beta.2",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 029503741036e76da06ed75d22277c8b4c5e55db Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 13 May 2021 13:58:26 +0100
Subject: [PATCH 2117/3183] add specific sensor name to desc

---
 config.schema.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config.schema.json b/config.schema.json
index 976a76e0..c41a5d5f 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -428,7 +428,7 @@
             "offset": {
               "type": "number",
               "title": "Temperature Offset",
-              "description": "You can offset the temperature that the sensor reads. An offset of 2 means 2 degrees will be added to the recorded temperature. Can be positive or negative and can include a decimal point '.'.",
+              "description": "You can offset the temperature that the SNZB-02 sensor reads. An offset of 2 means 2 degrees will be added to the recorded temperature. Can be positive or negative and can include a decimal point '.'.",
               "placeholder": 0
             },
             "hideLongDouble": {

From 98e16321f3d8d67f777d8bc891be26b0f84abc55 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 13 May 2021 15:45:51 +0100
Subject: [PATCH 2118/3183] Update index.js

---
 lib/index.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/index.js b/lib/index.js
index da7c82b1..df680196 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1115,7 +1115,6 @@ class eWeLinkPlatform {
           }
 
           // Get the sub accessory if it's new or hasn't been removed above
-
           subAccessory =
             devicesInHB.get(uuidsub) ||
             this.addAccessory(device, fullDeviceId, false, subExtraContext, 'rf_sub')

From c73c29fbf1619dc5b5c846c66072a3c437b6ccc1 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 13 May 2021 15:50:48 +0100
Subject: [PATCH 2119/3183] Update config.schema.json

---
 config.schema.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config.schema.json b/config.schema.json
index c41a5d5f..9742f02d 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -672,7 +672,7 @@
             "hideSensor": {
               "type": "boolean",
               "title": "Hide Sensor",
-              "description": "Hide the contact sensor from HomeKit",
+              "description": "Hide this contact sensor accessory from HomeKit.",
               "condition": {
                 "functionBody": "return (model.groups[arrayIndices] && model.groups[arrayIndices].sensorId);"
               }

From 9f012ad3c97c3ef0cb1aef8cbea92ae92c9327da Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 17 May 2021 12:53:48 +0100
Subject: [PATCH 2120/3183] attempt fix for ifan

---
 lib/device/fan.js | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/lib/device/fan.js b/lib/device/fan.js
index 8749d859..c9789466 100644
--- a/lib/device/fan.js
+++ b/lib/device/fan.js
@@ -131,16 +131,9 @@ module.exports = class deviceFan {
           this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
         }
       }
-      if (newSpeed !== this.cacheSpeed && newSpeed > 0) {
-        this.cacheSpeed = newSpeed
-        if (!this.disableDeviceLogging) {
-          this.log(
-            '[%s] %s [%s].',
-            this.name,
-            this.lang.curSpeed,
-            this.speed2label[this.cacheSpeed]
-          )
-        }
+      this.cacheSpeed = newSpeed
+      if (!this.disableDeviceLogging) {
+        this.log('[%s] %s [%s].', this.name, this.lang.curSpeed, this.speed2label[this.cacheSpeed])
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)

From 8bea73728c1e6227abafc3b0e24e4e32da1dddfd Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 17 May 2021 12:54:42 +0100
Subject: [PATCH 2121/3183] 6.6.1-beta.3

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 6fd24492..540e8a7d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.6.1-beta.2",
+  "version": "6.6.1-beta.3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index c1e4f729..6cbe4a0b 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.6.1-beta.2",
+  "version": "6.6.1-beta.3",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 192187de7ea10e950908291dd0d285e772ab40b3 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 17 May 2021 13:13:29 +0100
Subject: [PATCH 2122/3183] support uiids 112, 113, 114

---
 lib/utils/constants.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index faaf1fe8..31719090 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -149,9 +149,9 @@ module.exports = {
     lanIn: [1, 2, 3, 4, 5, 6, 7, 8, 9, 14, 15, 28, 32, 44, 77, 78, 103, 104, 126],
     lanOut: [1, 2, 3, 4, 5, 6, 7, 8, 9, 14, 28, 32, 44, 77, 78, 126],
     markStatus: [59, 103, 104, 1009, 1256, 1257, 1258],
-    singleSwitch: [1, 5, 6, 14, 24, 27],
+    singleSwitch: [1, 5, 6, 14, 24, 27, 112],
     doubleSwitch: [126],
-    multiSwitch: [2, 3, 4, 7, 8, 9, 29, 30, 31, 41, 82, 83, 84],
+    multiSwitch: [2, 3, 4, 7, 8, 9, 29, 30, 31, 41, 82, 83, 84, 113, 114],
     singleSwitchOutlet: ['Sonoff Pow', 'S20', 'S26', 'S26R1', 'S55', 'S55R1'],
     lightDimmer: [36, 44, 57],
     lightRGB: [22],
@@ -274,6 +274,9 @@ module.exports = {
     103: 1, // "WOTEWODE_TEM_LIGHT" (B02-F)
     104: 1, // "WOTEWODE_RGB_TEM_LIGHT"
     107: 1, // "GSM_SOCKET_NO_FLOW"
+    112: 1,
+    113: 2,
+    114: 3,
     126: 2, // "DUALR3"
     127: 1, // "GTTA127"
     1000: 1, // "zigbee_ON_OFF_SWITCH_1000" (button device)

From 9e24649c1cb91afa338112aaba7e0d5cb761b992 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 20 May 2021 08:10:29 +0100
Subject: [PATCH 2123/3183] don't log ifan speed if turned off

---
 lib/device/fan.js | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/lib/device/fan.js b/lib/device/fan.js
index c9789466..5d210e4b 100644
--- a/lib/device/fan.js
+++ b/lib/device/fan.js
@@ -98,7 +98,7 @@ module.exports = class deviceFan {
       const params = {
         switches: []
       }
-      const newState = value >= 1
+      const newState = value >= 1 ? 'on' : 'off'
       let newSpeed
       if (value === 0) {
         newSpeed = 0
@@ -113,25 +113,28 @@ module.exports = class deviceFan {
         return
       }
       params.switches.push({
-        switch: newState && newSpeed >= 33 ? 'on' : 'off',
+        switch: newState === 'on' && newSpeed >= 33 ? 'on' : 'off',
         outlet: 1
       })
       params.switches.push({
-        switch: newState && newSpeed === 66 ? 'on' : 'off',
+        switch: newState === 'on' && newSpeed === 66 ? 'on' : 'off',
         outlet: 2
       })
       params.switches.push({
-        switch: newState && newSpeed === 99 ? 'on' : 'off',
+        switch: newState === 'on' && newSpeed === 99 ? 'on' : 'off',
         outlet: 3
       })
       await this.platform.sendDeviceUpdate(this.accessory, params)
-      if (newState !== (this.cacheState === 'on')) {
-        this.cacheState = newState ? 'on' : 'off'
+      if (newState !== this.cacheState) {
+        this.cacheState = newState
         if (!this.disableDeviceLogging) {
           this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
         }
       }
       this.cacheSpeed = newSpeed
+      if (this.cacheSpeed === 0) {
+        return
+      }
       if (!this.disableDeviceLogging) {
         this.log('[%s] %s [%s].', this.name, this.lang.curSpeed, this.speed2label[this.cacheSpeed])
       }

From 0bd49014f095bc272861a6d9a41405845d9930c1 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 20 May 2021 08:13:23 +0100
Subject: [PATCH 2124/3183] use accessory name when init

---
 lib/index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/index.js b/lib/index.js
index df680196..968910b0 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1255,9 +1255,9 @@ class eWeLinkPlatform {
       // Update any changes to the device into our devicesInHB map
       this.api.updatePlatformAccessories(plugin.name, plugin.alias, [accessory])
       devicesInHB.set(accessory.UUID, accessory)
-      this.log('[%s] %s %s.', device.name, this.lang.devInit, str)
+      this.log('[%s] %s %s.', accessory.displayName, this.lang.devInit, str)
       if (this.config.mode === 'lan' && !this.consts.devices.lanOut.includes(uiid)) {
-        this.log.warn('[%s] %s.', device.name, this.lang.devNoControl)
+        this.log.warn('[%s] %s.', accessory.displayName, this.lang.devNoControl)
       }
     } catch (err) {
       // Catch any errors during initialisation

From b82545c3efe83163276b3dfd3cf9cfdc6375882e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 20 May 2021 08:14:40 +0100
Subject: [PATCH 2125/3183] 6.6.1-beta.4

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 540e8a7d..9bed5463 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.6.1-beta.3",
+  "version": "6.6.1-beta.4",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 6cbe4a0b..1ae21fca 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.6.1-beta.3",
+  "version": "6.6.1-beta.4",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 70392c595a095a99cce0b51f5a5c44157d61f338 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 20 May 2021 10:53:17 +0100
Subject: [PATCH 2126/3183] don't queue ws updates

---
 lib/connection/ws.js | 12 ++----------
 lib/utils/lang-en.js |  2 +-
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/lib/connection/ws.js b/lib/connection/ws.js
index 1c9f449a..a9434e09 100644
--- a/lib/connection/ws.js
+++ b/lib/connection/ws.js
@@ -340,11 +340,7 @@ module.exports = class connectionWS {
       }
     } else {
       // The web socket isn't currently open so log this
-      this.log.warn('%s.', this.lang.wsResend)
-
-      // Try sending the update again in 10 seconds when it's hopefully open again
-      await this.funcs.sleep(10000)
-      await this.sendUpdate(json)
+      throw new Error(this.lang.wsResend)
     }
   }
 
@@ -375,11 +371,7 @@ module.exports = class connectionWS {
       this.wsClient.send(JSON.stringify(json))
     } else {
       // The web socket isn't currently open so log this
-      this.log.warn('[%s] %s.', accessory.displayName, this.lang.wsResend)
-
-      // Try sending the update again in 10 seconds when it's hopefully open again
-      await this.funcs.sleep(10000)
-      await this.requestUpdate(accessory)
+      throw new Error(this.lang.wsResend)
     }
   }
 
diff --git a/lib/utils/lang-en.js b/lib/utils/lang-en.js
index 3101d222..d846f2df 100644
--- a/lib/utils/lang-en.js
+++ b/lib/utils/lang-en.js
@@ -133,7 +133,7 @@ module.exports = {
   wsRefFail: 'Refreshing WS connection failed as',
   wsRequired: 'update must be sent this way',
   wsReqTimeout: 'request timeout',
-  wsResend: 'Request will be sent when WS has reconnected',
+  wsResend: 'Web socket is not open - please try again after a few seconds',
   wsUnkAct: 'WS message received has unknown action',
   wsUnkCmd: 'WS unknown command received',
   wsUnkRes: 'unknown WS response',

From f263bddecf2c6018ebf42939c14e9c2d6960d543 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 20 May 2021 10:53:19 +0100
Subject: [PATCH 2127/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 70295327..ab6bb776 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,12 +6,15 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 ### Added
 
-- The ability to hide a contact sensor from HomeKit when used with a garage door simulation
+- Hide a contact sensor from HomeKit when used with a garage door simulation
+- Support devices with eWeLink UIID 112, 113, 114
 
 ### Changes
 
 - Avoid repeated battery logging for the Sonoff DW2
+- iFan logging modifications
 - Fix internal API auth issue when using a base64 encoded password
+- Throw an error when controlling a device when the web socket is closed (avoid queuing updates)
 - [Backend] Use `standard-prettier` code formatting
 - Recommended node version bump to v14.17.0
 

From 3f2a067dd49f9db21baba531a6c321d75d0ad1c0 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 20 May 2021 10:53:48 +0100
Subject: [PATCH 2128/3183] 6.6.1-beta.5

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 9bed5463..efb24839 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.6.1-beta.4",
+  "version": "6.6.1-beta.5",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 1ae21fca..ab9e40a2 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.6.1-beta.4",
+  "version": "6.6.1-beta.5",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From ef2464ba85cb315a1ff65aecc1424d7064b2ece0 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 21 May 2021 14:39:37 +0100
Subject: [PATCH 2129/3183] remove markStatus list

---
 lib/index.js           | 4 ++--
 lib/utils/constants.js | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/index.js b/lib/index.js
index 968910b0..7c53a02d 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1247,7 +1247,7 @@ class eWeLinkPlatform {
         accessory.control.externalUpdate(device.params)
 
         // Mark the online/offline status of certain devices
-        if (this.consts.devices.markStatus.includes(accessory.context.eweUIID)) {
+        if (accessory.control.markStatus) {
           accessory.control.markStatus(device.online)
         }
       }
@@ -1486,7 +1486,7 @@ class eWeLinkPlatform {
           this.log('[%s] %s %s.', accessory.displayName, status, this.lang.viaWS)
 
           // Mark the online/offline status of certain devices
-          if (this.consts.devices.markStatus.includes(accessory.context.eweUIID)) {
+          if (accessory.control.markStatus) {
             accessory.control.markStatus(device.params.online)
           }
 
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 31719090..30b084b7 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -148,7 +148,6 @@ module.exports = {
   devices: {
     lanIn: [1, 2, 3, 4, 5, 6, 7, 8, 9, 14, 15, 28, 32, 44, 77, 78, 103, 104, 126],
     lanOut: [1, 2, 3, 4, 5, 6, 7, 8, 9, 14, 28, 32, 44, 77, 78, 126],
-    markStatus: [59, 103, 104, 1009, 1256, 1257, 1258],
     singleSwitch: [1, 5, 6, 14, 24, 27, 112],
     doubleSwitch: [126],
     multiSwitch: [2, 3, 4, 7, 8, 9, 29, 30, 31, 41, 82, 83, 84, 113, 114],

From 91e5c8c32c5209b72395f9799724c3273d635438 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 24 May 2021 16:49:17 +0100
Subject: [PATCH 2130/3183] remove sensor if exists

---
 lib/index.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/index.js b/lib/index.js
index 7c53a02d..0c7040b0 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -702,6 +702,10 @@ class eWeLinkPlatform {
         const sim = Object.values(this.simulations).find(el => el.sensorId === device.deviceId)
         let instance
         if (sim.hideSensor) {
+          // If the sensor exists in Homebridge then remove it as needs to be re-added as hidden
+          if (devicesInHB.has(uuid)) {
+            this.removeAccessory(devicesInHB.get(uuid))
+          }
           instance = './device/simulation/sensor-hidden'
           accessory = this.addAccessory(device, device.deviceid + 'SWX', true)
         } else {

From 504090838c6180f98e8684d05f2b27b6d5d7ea3e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 26 May 2021 07:34:41 +0100
Subject: [PATCH 2131/3183] bump ws dep

---
 package-lock.json | 20 ++++++++++----------
 package.json      |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index efb24839..da0f1351 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -40,9 +40,9 @@
       }
     },
     "es-abstract": {
-      "version": "1.18.0",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0.tgz",
-      "integrity": "sha512-LJzK7MrQa8TS0ja2w3YNLzUgJCGPdPOV1yVvezjNnS89D+VR08+Szt2mz3YB2Dck/+w5tfIq/RoUAFqJJGM2yw==",
+      "version": "1.18.2",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.2.tgz",
+      "integrity": "sha512-byRiNIQXE6HWNySaU6JohoNXzYgbBjztwFnBLUTiJmWXjaU9bSq3urQLUlNLQ292tc+gc07zYZXNZjaOoAX3sw==",
       "requires": {
         "call-bind": "^1.0.2",
         "es-to-primitive": "^1.2.1",
@@ -52,14 +52,14 @@
         "has-symbols": "^1.0.2",
         "is-callable": "^1.2.3",
         "is-negative-zero": "^2.0.1",
-        "is-regex": "^1.1.2",
-        "is-string": "^1.0.5",
-        "object-inspect": "^1.9.0",
+        "is-regex": "^1.1.3",
+        "is-string": "^1.0.6",
+        "object-inspect": "^1.10.3",
         "object-keys": "^1.1.1",
         "object.assign": "^4.1.2",
         "string.prototype.trimend": "^1.0.4",
         "string.prototype.trimstart": "^1.0.4",
-        "unbox-primitive": "^1.0.0"
+        "unbox-primitive": "^1.0.1"
       }
     },
     "es-to-primitive": {
@@ -291,9 +291,9 @@
       }
     },
     "ws": {
-      "version": "7.4.5",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.5.tgz",
-      "integrity": "sha512-xzyu3hFvomRfXKH8vOFMU3OguG6oOvhXMo3xsGy3xWExqaM2dxBbVxuD99O7m3ZUFMvvscsZDqxfgMaRr/Nr1g=="
+      "version": "7.4.6",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.6.tgz",
+      "integrity": "sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A=="
     }
   }
 }
diff --git a/package.json b/package.json
index ab9e40a2..7fbe5d84 100644
--- a/package.json
+++ b/package.json
@@ -53,7 +53,7 @@
     "node-dns-sd": "^0.4.2",
     "p-queue": "^6.6.2",
     "websocket-as-promised": "^2.0.1",
-    "ws": "^7.4.5"
+    "ws": "^7.4.6"
   },
   "prettier": {
     "printWidth": 100

From 00d244ad1049d66d1c3e201706f28c46306f2b4f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 26 May 2021 07:35:38 +0100
Subject: [PATCH 2132/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ab6bb776..a1d9014d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 - Throw an error when controlling a device when the web socket is closed (avoid queuing updates)
 - [Backend] Use `standard-prettier` code formatting
 - Recommended node version bump to v14.17.0
+- Bump `ws` dependency to v7.4.6
 
 ## 6.6.0 (2021-05-10)
 

From cebc6c49217b6444407512eb1260dfd607727a99 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 26 May 2021 08:32:29 +0100
Subject: [PATCH 2133/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a1d9014d..2ca7b44e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 All notable changes to this homebridge-ewelink will be documented in this file.
 
-## BETA
+## 6.7.0 (2021-05-26)
 
 ### Added
 
@@ -15,9 +15,9 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 - iFan logging modifications
 - Fix internal API auth issue when using a base64 encoded password
 - Throw an error when controlling a device when the web socket is closed (avoid queuing updates)
-- [Backend] Use `standard-prettier` code formatting
 - Recommended node version bump to v14.17.0
 - Bump `ws` dependency to v7.4.6
+- Use `standard-prettier` code formatting
 
 ## 6.6.0 (2021-05-10)
 

From 17e53cc8002dff1390c00e015d153523d86a0110 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 26 May 2021 08:33:01 +0100
Subject: [PATCH 2134/3183] 6.7.0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index da0f1351..4ff863b0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.6.1-beta.5",
+  "version": "6.7.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 7fbe5d84..f2b59f73 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.6.1-beta.5",
+  "version": "6.7.0",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From b5f949b0a74bb313435677e481403a6d98d42321 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 26 May 2021 11:04:00 +0100
Subject: [PATCH 2135/3183] =?UTF-8?q?ensure=20battery=20=CF=B5=20[0,=20100?=
 =?UTF-8?q?]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/device/sensor-contact.js            |  1 +
 lib/device/simulation/sensor-leak.js    | 23 +++++++++++------------
 lib/device/simulation/sensor-visible.js |  1 +
 lib/device/zigbee/sensor-ambient.js     |  7 ++++---
 lib/device/zigbee/sensor-contact.js     |  1 +
 lib/device/zigbee/sensor-motion.js      |  7 ++++---
 lib/device/zigbee/switch-stateless.js   |  7 ++++---
 7 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/lib/device/sensor-contact.js b/lib/device/sensor-contact.js
index cb7e2876..5af5e86d 100644
--- a/lib/device/sensor-contact.js
+++ b/lib/device/sensor-contact.js
@@ -78,6 +78,7 @@ module.exports = class deviceSensorContact {
       if (this.funcs.hasProperty(params, 'battery') && params.battery !== this.cacheBatt) {
         this.cacheBatt = params.battery
         this.cacheBattScaled = Math.round(this.cacheBatt * 33.3)
+        this.cacheBattScaled = Math.max(Math.min(this.cacheBattScaled, 100), 0)
         this.batteryService.updateCharacteristic(this.hapChar.BatteryLevel, this.cacheBattScaled)
         this.batteryService.updateCharacteristic(
           this.hapChar.StatusLowBattery,
diff --git a/lib/device/simulation/sensor-leak.js b/lib/device/simulation/sensor-leak.js
index 0569ae6e..1ad72855 100644
--- a/lib/device/simulation/sensor-leak.js
+++ b/lib/device/simulation/sensor-leak.js
@@ -63,18 +63,17 @@ module.exports = class deviceSensorLeak {
 
   async externalUpdate (params) {
     try {
-      if (this.funcs.hasProperty(params, 'battery')) {
-        const scaledBattery = Math.round(params.battery * 33.3)
-        if (this.cacheBatt !== scaledBattery) {
-          this.cacheBatt = scaledBattery
-          this.batteryService.updateCharacteristic(this.hapChar.BatteryLevel, this.cacheBatt)
-          this.batteryService.updateCharacteristic(
-            this.hapChar.StatusLowBattery,
-            this.cacheBatt < this.lowBattThreshold
-          )
-          if (params.updateSource && !this.disableDeviceLogging) {
-            this.log('[%s] %s [%s%].', this.name, this.lang.curBatt, this.cacheBatt)
-          }
+      if (this.funcs.hasProperty(params, 'battery') && this.cacheBatt !== params.battery) {
+        this.cacheBatt = params.battery
+        this.cacheBattScaled = Math.round(params.battery * 33.3)
+        this.cacheBattScaled = Math.max(Math.min(this.cacheBattScaled, 100), 0)
+        this.batteryService.updateCharacteristic(this.hapChar.BatteryLevel, this.cacheBattScaled)
+        this.batteryService.updateCharacteristic(
+          this.hapChar.StatusLowBattery,
+          this.cacheBattScaled < this.lowBattThreshold
+        )
+        if (params.updateSource && !this.disableDeviceLogging) {
+          this.log('[%s] %s [%s%].', this.name, this.lang.curBatt, this.cacheBattScaled)
         }
       }
       if (!params.switch || params.switch === this.cacheOnOff) {
diff --git a/lib/device/simulation/sensor-visible.js b/lib/device/simulation/sensor-visible.js
index 08c8589b..35292e60 100644
--- a/lib/device/simulation/sensor-visible.js
+++ b/lib/device/simulation/sensor-visible.js
@@ -86,6 +86,7 @@ module.exports = class deviceSensorVisible {
           : this.scaleBattery
           ? this.cacheBatt * 10
           : this.cacheBatt
+        this.cacheBattScaled = Math.max(Math.min(this.cacheBattScaled, 100), 0)
         this.batteryService.updateCharacteristic(this.hapChar.BatteryLevel, this.cacheBattScaled)
         this.batteryService.updateCharacteristic(
           this.hapChar.StatusLowBattery,
diff --git a/lib/device/zigbee/sensor-ambient.js b/lib/device/zigbee/sensor-ambient.js
index 06caae4f..c1a42ef1 100644
--- a/lib/device/zigbee/sensor-ambient.js
+++ b/lib/device/zigbee/sensor-ambient.js
@@ -69,13 +69,14 @@ module.exports = class deviceZBSensorAmbient {
     try {
       if (this.funcs.hasProperty(params, 'battery') && params.battery !== this.cacheBatt) {
         this.cacheBatt = params.battery
-        this.battService.updateCharacteristic(this.hapChar.BatteryLevel, this.cacheBatt)
+        this.cacheBattScaled = Math.max(Math.min(this.cacheBatt, 100), 0)
+        this.battService.updateCharacteristic(this.hapChar.BatteryLevel, this.cacheBattScaled)
         this.battService.updateCharacteristic(
           this.hapChar.StatusLowBattery,
-          this.cacheBatt < this.lowBattThreshold
+          this.cacheBattScaled < this.lowBattThreshold
         )
         if (params.updateSource && !this.disableDeviceLogging) {
-          this.log('[%s] %s [%s%].', this.name, this.lang.curBatt, this.cacheBatt)
+          this.log('[%s] %s [%s%].', this.name, this.lang.curBatt, this.cacheBattScaled)
         }
       }
       const eveLog = {}
diff --git a/lib/device/zigbee/sensor-contact.js b/lib/device/zigbee/sensor-contact.js
index faf454d1..862bd1a6 100644
--- a/lib/device/zigbee/sensor-contact.js
+++ b/lib/device/zigbee/sensor-contact.js
@@ -75,6 +75,7 @@ module.exports = class deviceZBSensorContact {
       if (this.funcs.hasProperty(params, 'battery') && params.battery !== this.cacheBatt) {
         this.cacheBatt = params.battery
         this.cacheBattScaled = this.scaleBattery ? this.cacheBatt * 10 : this.cacheBatt
+        this.cacheBattScaled = Math.max(Math.min(this.cacheBattScaled, 100), 0)
         this.battService.updateCharacteristic(this.hapChar.BatteryLevel, this.cacheBattScaled)
         this.battService.updateCharacteristic(
           this.hapChar.StatusLowBattery,
diff --git a/lib/device/zigbee/sensor-motion.js b/lib/device/zigbee/sensor-motion.js
index 9f3bb085..119f2ec4 100644
--- a/lib/device/zigbee/sensor-motion.js
+++ b/lib/device/zigbee/sensor-motion.js
@@ -63,13 +63,14 @@ module.exports = class deviceZBSensorMotion {
     try {
       if (this.funcs.hasProperty(params, 'battery') && params.battery !== this.cacheBatt) {
         this.cacheBatt = params.battery
-        this.battService.updateCharacteristic(this.hapChar.BatteryLevel, this.cacheBatt)
+        this.cacheBattScaled = Math.max(Math.min(this.cacheBatt, 100), 0)
+        this.battService.updateCharacteristic(this.hapChar.BatteryLevel, this.cacheBattScaled)
         this.battService.updateCharacteristic(
           this.hapChar.StatusLowBattery,
-          this.cacheBatt < this.lowBattThreshold
+          this.cacheBattScaled < this.lowBattThreshold
         )
         if (params.updateSource && !this.disableDeviceLogging) {
-          this.log('[%s] %s [%s%].', this.name, this.lang.curBatt, this.cacheBatt)
+          this.log('[%s] %s [%s%].', this.name, this.lang.curBatt, this.cacheBattScaled)
         }
       }
       if (this.funcs.hasProperty(params, 'motion') && this.funcs.hasProperty(params, 'trigTime')) {
diff --git a/lib/device/zigbee/switch-stateless.js b/lib/device/zigbee/switch-stateless.js
index a5a39991..8dda5a63 100644
--- a/lib/device/zigbee/switch-stateless.js
+++ b/lib/device/zigbee/switch-stateless.js
@@ -60,13 +60,14 @@ module.exports = class deviceZBSwitchStateless {
     try {
       if (this.funcs.hasProperty(params, 'battery') && params.battery !== this.cacheBatt) {
         this.cacheBatt = params.battery
-        this.battService.updateCharacteristic(this.hapChar.BatteryLevel, this.cacheBatt)
+        this.cacheBattScaled = Math.max(Math.min(this.cacheBatt, 100), 0)
+        this.battService.updateCharacteristic(this.hapChar.BatteryLevel, this.cacheBattScaled)
         this.battService.updateCharacteristic(
           this.hapChar.StatusLowBattery,
-          this.cacheBatt < this.lowBattThreshold
+          this.cacheBattScaled < this.lowBattThreshold
         )
         if (params.updateSource && !this.disableDeviceLogging) {
-          this.log('[%s] %s [%s%].', this.name, this.lang.curBatt, this.cacheBatt)
+          this.log('[%s] %s [%s%].', this.name, this.lang.curBatt, this.cacheBattScaled)
         }
       }
       if (this.funcs.hasProperty(params, 'key') && [0, 1, 2].includes(params.key)) {

From 4868957f15d0d5729559523fbcb286590608bf39 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 26 May 2021 11:21:06 +0100
Subject: [PATCH 2136/3183] remove garage sensor checks + cache

---
 lib/device/simulation/garage-one.js | 42 +++--------------------------
 lib/utils/lang-en.js                |  3 ---
 2 files changed, 4 insertions(+), 41 deletions(-)

diff --git a/lib/device/simulation/garage-one.js b/lib/device/simulation/garage-one.js
index 1885c636..74d3e581 100644
--- a/lib/device/simulation/garage-one.js
+++ b/lib/device/simulation/garage-one.js
@@ -28,12 +28,6 @@ module.exports = class deviceGarageOne {
       ? false
       : platform.config.disableDeviceLogging
 
-    // Set up the accessory with default positions when added the first time
-    if (!this.funcs.hasProperty(this.accessory.context, 'cacheCurrentDoorState')) {
-      this.accessory.context.cacheCurrentDoorState = 1
-      this.accessory.context.cacheTargetDoorState = 1
-    }
-
     // Check for a valid setup
     if (!platform.consts.allowed.setups.includes(this.setup)) {
       this.error = this.lang.simErrSetup
@@ -41,22 +35,7 @@ module.exports = class deviceGarageOne {
 
     // Check the sensor is valid if defined by the user
     if (deviceConf.sensorId) {
-      // Check the sensor exists in Homebridge
-      const uuid = this.hapUUIDGen(deviceConf.sensorId + 'SWX')
-      if (!devicesInHB.has(uuid)) {
-        this.error = this.lang.simErrNoSensor
-      }
-
-      // Check the sensor is a sensor
-      if (!platform.consts.devices.garageSensors.includes(devicesInHB.get(uuid).context.eweUIID)) {
-        this.error = this.lang.simErrNotSensor
-      }
-      this.definedSensor = devicesInHB.get(uuid)
-
-      // Check the sensor has the ContactSensor service
-      if (!this.definedSensor.getService(this.hapServ.ContactSensor)) {
-        this.error = this.lang.simErrNotConfSensor
-      }
+      this.definedSensor = true
     }
 
     // If the accessory has a switch service then remove it
@@ -124,13 +103,7 @@ module.exports = class deviceGarageOne {
       const newPos = value
       const params = {}
       let delay = 0
-      const prevState = this.definedSensor
-        ? this.definedSensor
-            .getService(this.hapServ.ContactSensor)
-            .getCharacteristic(this.hapChar.ContactSensorState).value === 0
-          ? 1
-          : 0
-        : this.accessory.context.cacheCurrentDoorState
+      const prevState = this.service.getCharacteristic(this.hapChar.CurrentDoorState).value
       if (newPos === prevState % 2) {
         return
       }
@@ -138,7 +111,6 @@ module.exports = class deviceGarageOne {
       this.cacheState = value
       if (this.setup === 'oneSwitch' && [2, 3].includes(prevState)) {
         this.service.updateCharacteristic(this.hapChar.CurrentDoorState, ((prevState * 2) % 3) + 2)
-        this.accessory.context.cacheCurrentDoorState = ((prevState * 2) % 3) + 2
         delay = 1500
       }
       if (this.cacheState !== newPos) {
@@ -147,8 +119,6 @@ module.exports = class deviceGarageOne {
       await this.funcs.sleep(delay)
       this.service.updateCharacteristic(this.hapChar.TargetDoorState, newPos)
       this.service.updateCharacteristic(this.hapChar.CurrentDoorState, newPos + 2)
-      this.accessory.context.cacheTargetDoorState = newPos
-      this.accessory.context.cacheCurrentDoorState = newPos + 2
       switch (this.setup) {
         case 'oneSwitch':
           params.switch = 'on'
@@ -173,7 +143,6 @@ module.exports = class deviceGarageOne {
       await this.funcs.sleep(Math.max((operationTime - 20) * 100, 0))
       if (!this.definedSensor) {
         this.service.updateCharacteristic(this.hapChar.CurrentDoorState, newPos)
-        this.accessory.context.cacheCurrentDoorState = newPos
         if (!this.disableDeviceLogging) {
           this.log(
             '[%s] %s [%s].',
@@ -189,7 +158,7 @@ module.exports = class deviceGarageOne {
       setTimeout(() => {
         this.service.updateCharacteristic(
           this.hapChar.TargetPosition,
-          this.accessory.context.cacheTargetPosition
+          this.service.getCharacteristic(this.hapChar.TargetPosition).value
         )
       }, 2000)
       this.service.updateCharacteristic(this.hapChar.TargetPosition, new this.hapErr(-70402))
@@ -204,7 +173,7 @@ module.exports = class deviceGarageOne {
       if ((!params.switch && !params.switches) || this.inUse || this.definedSensor) {
         return
       }
-      const prevState = this.accessory.context.cacheCurrentDoorState
+      const prevState = this.service.getCharacteristic(this.hapChar.CurrentDoorState).value
       const newPos = [0, 2].includes(prevState) ? 3 : 2
       switch (this.setup) {
         case 'oneSwitch':
@@ -224,14 +193,11 @@ module.exports = class deviceGarageOne {
       this.inUse = true
       this.service.updateCharacteristic(this.hapChar.TargetDoorState, newPos - 2)
       this.service.updateCharacteristic(this.hapChar.CurrentDoorState, newPos)
-      this.accessory.context.cacheCurrentDoorState = newPos
-      this.accessory.context.cacheTargetDoorState = newPos - 2
       await this.funcs.sleep(2000)
       this.inUse = false
       const operationTime = newPos === 2 ? this.operationTimeUp : this.operationTimeDown
       await this.funcs.sleep(Math.max((operationTime - 20) * 100, 0))
       this.service.updateCharacteristic(this.hapChar.CurrentDoorState, newPos - 2)
-      this.accessory.context.cacheCurrentDoorState = newPos - 2
       if (!this.disableDeviceLogging) {
         this.log(
           '[%s] %s [%s].',
diff --git a/lib/utils/lang-en.js b/lib/utils/lang-en.js
index d846f2df..8adc80d2 100644
--- a/lib/utils/lang-en.js
+++ b/lib/utils/lang-en.js
@@ -102,9 +102,6 @@ module.exports = {
   rfTrigNo: 'not triggered',
   rfTrigYes: 'triggered',
   sendLogin: 'Sending HTTP login() request',
-  simErrNoSensor: 'defined sensor does not exist in Homebridge',
-  simErrNotSensor: 'defined sensor is not a DW2 sensor',
-  simErrNotConfSensor: 'defined sensor is not configured as a sensor',
   simErrSetup: "device has not been set up as 'oneSwitch' or 'twoSwitch'",
   sonoffCamera: 'see the homebridge-ewelink wiki for details to enable the camera',
   stoppedLAN: 'LAN monitoring gracefully stopped',

From 8680d677809fe36c7471d13cdbc1d2cb2c523184 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 26 May 2021 11:21:45 +0100
Subject: [PATCH 2137/3183] 6.7.1-beta.0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 4ff863b0..6a9202d1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.7.0",
+  "version": "6.7.1-beta.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index f2b59f73..5c1a50e3 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.7.0",
+  "version": "6.7.1-beta.0",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From d728d07bccef891e1673274b8b815327809e0be5 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 26 May 2021 20:11:13 +0100
Subject: [PATCH 2138/3183] fix th10/16 fail error

---
 lib/device/sensor-ambient.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/device/sensor-ambient.js b/lib/device/sensor-ambient.js
index b0a54b9c..33237330 100644
--- a/lib/device/sensor-ambient.js
+++ b/lib/device/sensor-ambient.js
@@ -108,7 +108,7 @@ module.exports = class deviceSensorAmbient {
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
-        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
+        this.switchService.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
       }, 2000)
       throw new this.hapErr(-70402)
     }

From 2e79efbbe5aef29a7dc13f010b4a35ec61cdee5f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 26 May 2021 20:11:48 +0100
Subject: [PATCH 2139/3183] 6.7.1-beta.1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 6a9202d1..f0f76fb9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.7.1-beta.0",
+  "version": "6.7.1-beta.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 5c1a50e3..6abd8c9b 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.7.1-beta.0",
+  "version": "6.7.1-beta.1",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From f6cd80b2c9222dd15addad37de8071e000d25e91 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 27 May 2021 08:43:11 +0100
Subject: [PATCH 2140/3183] deviceid syntax

---
 lib/index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/index.js b/lib/index.js
index 0c7040b0..45776504 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -694,12 +694,12 @@ class eWeLinkPlatform {
         /****************************/
       } else if (
         this.consts.devices.garageSensors.includes(uiid) &&
-        Object.values(this.simulations).some(el => el.sensorId === device.deviceId)
+        Object.values(this.simulations).some(el => el.sensorId === device.deviceid)
       ) {
         /************************************
         SENSORS [SONOFF DW2 AS GARAGE SENSOR]
         ************************************/
-        const sim = Object.values(this.simulations).find(el => el.sensorId === device.deviceId)
+        const sim = Object.values(this.simulations).find(el => el.sensorId === device.deviceid)
         let instance
         if (sim.hideSensor) {
           // If the sensor exists in Homebridge then remove it as needs to be re-added as hidden

From 2f5b9cc5f9c7b0580e5dbcfce484c4899107bbae Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 27 May 2021 08:43:45 +0100
Subject: [PATCH 2141/3183] 6.7.1-beta.2

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index f0f76fb9..9bc7f887 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.7.1-beta.1",
+  "version": "6.7.1-beta.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 6abd8c9b..e3a9f3a4 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.7.1-beta.1",
+  "version": "6.7.1-beta.2",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 19f2c535f25861279c6216fa6960e08ba4b49b8d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 27 May 2021 09:04:20 +0100
Subject: [PATCH 2142/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2ca7b44e..da0764d9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,13 @@
 
 All notable changes to this homebridge-ewelink will be documented in this file.
 
+## 6.7.1 (2021-05-27)
+
+### Changes
+
+- Fixes an issue with sensors with a garage simulation
+- Fixes an issue with TH10/16 devices with web socket timeouts
+
 ## 6.7.0 (2021-05-26)
 
 ### Added

From 570120ec319df5a0a9186d0fd3643d19c9b166fb Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 27 May 2021 09:04:47 +0100
Subject: [PATCH 2143/3183] 6.7.1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 9bc7f887..7abe7262 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.7.1-beta.2",
+  "version": "6.7.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index e3a9f3a4..836ff9e9 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.7.1-beta.2",
+  "version": "6.7.1",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From c316edb62f7540336512fb4d60ab7e7584946037 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 28 May 2021 15:18:57 +0100
Subject: [PATCH 2144/3183] Update package-lock.json

---
 package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 7abe7262..554a0b17 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -40,9 +40,9 @@
       }
     },
     "es-abstract": {
-      "version": "1.18.2",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.2.tgz",
-      "integrity": "sha512-byRiNIQXE6HWNySaU6JohoNXzYgbBjztwFnBLUTiJmWXjaU9bSq3urQLUlNLQ292tc+gc07zYZXNZjaOoAX3sw==",
+      "version": "1.18.3",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.3.tgz",
+      "integrity": "sha512-nQIr12dxV7SSxE6r6f1l3DtAeEYdsGpps13dR0TwJg1S8gyp4ZPgy3FZcHBgbiQqnoqSTb+oC+kO4UQ0C/J8vw==",
       "requires": {
         "call-bind": "^1.0.2",
         "es-to-primitive": "^1.2.1",

From c33b05b19cbf7084cc0edf79e261c06803a713fb Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 9 Jun 2021 08:47:24 +0100
Subject: [PATCH 2145/3183] fix logging typo for zigbee contact

---
 lib/device/zigbee/sensor-contact.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/device/zigbee/sensor-contact.js b/lib/device/zigbee/sensor-contact.js
index 862bd1a6..257383e1 100644
--- a/lib/device/zigbee/sensor-contact.js
+++ b/lib/device/zigbee/sensor-contact.js
@@ -102,7 +102,7 @@ module.exports = class deviceZBSensorContact {
         }
         if (params.updateSource && !this.disableDeviceLogging) {
           this.log(
-            '[%s] current state [%s].',
+            '[%s] %s [%s].',
             this.name,
             this.lang.curState,
             params.lock === 0 ? this.lang.contactYes : this.lang.contactNo

From f2b48d6502c9a5c4cfa244296ff4497fda91c782 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 9 Jun 2021 08:48:51 +0100
Subject: [PATCH 2146/3183] expose switch as sensor

---
 config.schema.json              |  45 ++++++++-
 lib/device/simulation/sensor.js | 159 ++++++++++++++++++++++++++++++++
 lib/index.js                    |  19 ++++
 lib/utils/constants.js          |   1 +
 lib/utils/lang-en.js            |   2 +
 5 files changed, 225 insertions(+), 1 deletion(-)
 create mode 100644 lib/device/simulation/sensor.js

diff --git a/config.schema.json b/config.schema.json
index 9742f02d..aff5596c 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -617,6 +617,10 @@
                   "title": "1 Switch & 1 Valve (with multi channel device)",
                   "enum": ["switch_valve"]
                 },
+                {
+                  "title": "1 Sensor (with single or multi channel device)",
+                  "enum": ["sensor"]
+                },
                 {
                   "title": "1 Leak Sensor (with Sonoff DW2)",
                   "enum": ["sensor_leak"]
@@ -628,7 +632,7 @@
               "title": "Device Setup",
               "description": "The type of generic device being used.",
               "condition": {
-                "functionBody": "return (model.groups[arrayIndices] && ['garage', 'lock', 'tap', 'valve'].includes(model.groups[arrayIndices].type));"
+                "functionBody": "return (model.groups[arrayIndices] && ['garage', 'lock', 'tap', 'valve', 'sensor'].includes(model.groups[arrayIndices].type));"
               },
               "oneOf": [
                 {
@@ -641,6 +645,44 @@
                 }
               ]
             },
+            "sensorType": {
+              "type": "string",
+              "title": "Sensor Type",
+              "description": "The type of sensor to use.",
+              "condition": {
+                "functionBody": "return (model.groups[arrayIndices] && model.groups[arrayIndices].type === 'sensor');"
+              },
+              "oneOf": [
+                {
+                  "title": "Motion",
+                  "enum": ["motion"]
+                },
+                {
+                  "title": "Smoke/Fire",
+                  "enum": ["smoke"]
+                },
+                {
+                  "title": "Water/Leak",
+                  "enum": ["water"]
+                },
+                {
+                  "title": "Carbon Monoxide",
+                  "enum": ["co"]
+                },
+                {
+                  "title": "Carbon Dioxide",
+                  "enum": ["co2"]
+                },
+                {
+                  "title": "Occupancy",
+                  "enum": ["occupancy"]
+                },
+                {
+                  "title": "Contact",
+                  "enum": ["contact"]
+                }
+              ]
+            },
             "operationTime": {
               "type": "number",
               "title": "Operation Time (Deciseconds)",
@@ -923,6 +965,7 @@
             "groups[].label",
             "groups[].type",
             "groups[].setup",
+            "groups[].sensorType",
             "groups[].operationTime",
             "groups[].operationTimeDown",
             "groups[].sensorId",
diff --git a/lib/device/simulation/sensor.js b/lib/device/simulation/sensor.js
new file mode 100644
index 00000000..0e814876
--- /dev/null
+++ b/lib/device/simulation/sensor.js
@@ -0,0 +1,159 @@
+/* jshint -W014, -W033, esversion: 9 */
+/* eslint-disable new-cap */
+'use strict'
+
+module.exports = class deviceSensor {
+  constructor (platform, accessory) {
+    // Set up variables from the platform
+    this.eveChar = platform.eveChar
+    this.funcs = platform.funcs
+    this.hapChar = platform.api.hap.Characteristic
+    this.hapServ = platform.api.hap.Service
+    this.lang = platform.lang
+    this.log = platform.log
+    this.platform = platform
+
+    // Set up variables from the accessory
+    this.name = accessory.displayName
+    this.accessory = accessory
+
+    // Set up custom variables for this device type
+    const deviceConf = platform.simulations[accessory.context.eweDeviceId]
+    this.sensorType = deviceConf.sensorType || 'motion'
+    this.setup = deviceConf.setup
+    this.disableDeviceLogging = deviceConf.overrideDisabledLogging
+      ? false
+      : platform.config.disableDeviceLogging
+
+    // Check for a valid setup
+    if (!platform.consts.allowed.setups.includes(this.setup)) {
+      this.error = this.lang.simErrSetup
+    }
+
+    // If the accessory has a switch service then remove it
+    if (this.accessory.getService(this.hapServ.Switch)) {
+      this.accessory.removeService(this.accessory.getService(this.hapServ.Switch))
+    }
+
+    // If the accessory has an outlet service then remove it
+    if (this.accessory.getService(this.hapServ.Outlet)) {
+      this.accessory.removeService(this.accessory.getService(this.hapServ.Outlet))
+    }
+
+    // This instance is a sensor which the user can define as different types
+    let serv
+    let eveType
+
+    // Check which type this sensor is and get the correct service/characteristic
+    switch (this.sensorType) {
+      case 'water':
+        serv = this.hapServ.LeakSensor
+        this.char = this.hapChar.LeakDetected
+        eveType = 'motion'
+        break
+      case 'fire':
+      case 'smoke':
+        serv = this.hapServ.SmokeSensor
+        this.char = this.hapChar.SmokeDetected
+        eveType = 'motion'
+        break
+      case 'co':
+        serv = this.hapServ.CarbonMonoxideSensor
+        this.char = this.hapChar.CarbonMonoxideDetected
+        eveType = 'motion'
+        break
+      case 'co2':
+        serv = this.hapServ.CarbonDioxideSensor
+        this.char = this.hapChar.CarbonDioxideDetected
+        eveType = 'motion'
+        break
+      case 'contact':
+        serv = this.hapServ.ContactSensor
+        this.char = this.hapChar.ContactSensorState
+        eveType = 'door'
+        this.useLastActivation = true
+        break
+      case 'occupancy':
+        serv = this.hapServ.OccupancySensor
+        this.char = this.hapChar.OccupancyDetected
+        eveType = 'motion'
+        break
+      default:
+        serv = this.hapServ.MotionSensor
+        this.char = this.hapChar.MotionDetected
+        eveType = 'motion'
+        this.useLastActivation = true
+        break
+    }
+
+    // Add the sensor if it doesn't already exist
+    if (!(this.service = this.accessory.getService(serv))) {
+      this.service = this.accessory.addService(serv)
+      if (this.useLastActivation) {
+        this.service.addCharacteristic(this.eveChar.LastActivation)
+      }
+    }
+
+    // Pass the accessory to Fakegato to set up with Eve
+    this.accessory.eveService = new platform.eveService(eveType, this.accessory, {
+      log: platform.config.debugFakegato ? this.log : () => {}
+    })
+
+    // Output the customised options to the log if in debug mode
+    if (platform.config.debug) {
+      const opts = JSON.stringify({
+        sensorType: this.sensorType,
+        setup: this.setup,
+        disableDeviceLogging: this.disableDeviceLogging
+      })
+      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
+    }
+  }
+
+  async externalUpdate (params) {
+    try {
+      if (this.error) {
+        throw new Error(this.lang.invalidConfig + ' - ' + this.error)
+      }
+      switch (this.setup) {
+        case 'oneSwitch':
+          if (!params.switch || params.switch === this.cacheState) {
+            return
+          }
+          this.cacheState = params.switch
+          break
+        case 'twoSwitch':
+          if (!params.switches || params.switches[0].switch === this.cacheState) {
+            return
+          }
+          this.cacheState = params.switches[0].switch
+          break
+      }
+
+      if (this.cacheState === 'on') {
+        this.service.updateCharacteristic(this.char, 1)
+        this.accessory.eveService.addEntry({ status: 1 })
+        if (this.useLastActivation) {
+          const initialTime = this.accessory.eveService.getInitialTime()
+          this.service.updateCharacteristic(
+            this.eveChar.LastActivation,
+            Math.round(new Date().valueOf() / 1000) - initialTime
+          )
+        }
+      } else {
+        this.service.updateCharacteristic(this.char, 0)
+        this.accessory.eveService.addEntry({ status: 0 })
+      }
+      if (params.updateSource && !this.disableDeviceLogging) {
+        this.log(
+          '[%s] %s [%s].',
+          this.name,
+          this.lang.curState,
+          this.cacheState === 'on' ? this.lang.sensorYes : this.lang.sensorNo
+        )
+      }
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, false)
+    }
+  }
+}
diff --git a/lib/index.js b/lib/index.js
index 45776504..560deb16 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -382,6 +382,15 @@ class eWeLinkPlatform {
                       this.simulations[id].sensorId = parsed
                     }
                     break
+                  case 'sensorType':
+                    if (typeof v !== 'string' || v === '') {
+                      logIgnore(key + '.' + id + '.' + k)
+                    } else if (!this.consts.allowed.sensors.includes(v)) {
+                      logIgnore(key + '.' + id + '.' + k)
+                    } else {
+                      this.simulations[id][k] = v
+                    }
+                    break
                   case 'setup':
                     if (typeof v !== 'string' || v === '') {
                       logIgnore(key + '.' + id + '.' + k)
@@ -825,6 +834,16 @@ class eWeLinkPlatform {
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/simulation/valve-four'))(this, accessory)
         /**********************************/
+      } else if (
+        this.simulations[device.deviceid] &&
+        this.simulations[device.deviceid].type === 'sensor'
+      ) {
+        /*******************
+        SENSORS [SIMULATION]
+        *******************/
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
+        accessory.control = new (require('./device/simulation/sensor'))(this, accessory)
+        /******************/
       } else if (
         this.simulations[device.deviceid] &&
         this.simulations[device.deviceid].type === 'sensor_leak' &&
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 30b084b7..e8daa4c5 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -129,6 +129,7 @@ module.exports = {
       'garage_four',
       'garage_eachen',
       'lock',
+      'sensor',
       'sensor_leak',
       'switch_valve',
       'tap',
diff --git a/lib/utils/lang-en.js b/lib/utils/lang-en.js
index 8adc80d2..16f206eb 100644
--- a/lib/utils/lang-en.js
+++ b/lib/utils/lang-en.js
@@ -102,6 +102,8 @@ module.exports = {
   rfTrigNo: 'not triggered',
   rfTrigYes: 'triggered',
   sendLogin: 'Sending HTTP login() request',
+  sensorNo: 'deactivated',
+  sensorYes: 'activated',
   simErrSetup: "device has not been set up as 'oneSwitch' or 'twoSwitch'",
   sonoffCamera: 'see the homebridge-ewelink wiki for details to enable the camera',
   stoppedLAN: 'LAN monitoring gracefully stopped',

From 097462056475d33c627aa32f7084fc96fefad82d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 9 Jun 2021 08:50:02 +0100
Subject: [PATCH 2147/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index da0764d9..a676e546 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,16 @@
 
 All notable changes to this homebridge-ewelink will be documented in this file.
 
+## BETA
+
+### Added
+
+- Expose a single/multi channel device as any type of sensor
+
+### Changes
+
+- Fix a logging issue for the zigbee contact sensor
+
 ## 6.7.1 (2021-05-27)
 
 ### Changes

From 07e4c9c5eb73e2d953f061a7e4a52f1c5864939b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 9 Jun 2021 08:50:44 +0100
Subject: [PATCH 2148/3183] 6.7.2-beta.0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 554a0b17..294054ce 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.7.1",
+  "version": "6.7.2-beta.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 836ff9e9..336c02d7 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.7.1",
+  "version": "6.7.2-beta.0",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From edc02f4f706d109ec88618099d8d1eec478e5e82 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 9 Jun 2021 12:35:30 +0100
Subject: [PATCH 2149/3183] try powr2 local polling for updates

---
 lib/connection/lan.js       | 3 +++
 lib/device/outlet-double.js | 2 +-
 lib/device/outlet-power.js  | 2 +-
 lib/index.js                | 6 ++----
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/lib/connection/lan.js b/lib/connection/lan.js
index 8046b785..5fe45fe3 100644
--- a/lib/connection/lan.js
+++ b/lib/connection/lan.js
@@ -175,6 +175,9 @@ module.exports = class connectionLAN {
       } else if (json.params.switch) {
         params.switch = json.params.switch
         suffix = 'switch'
+      } else if (json.params.uiActive) {
+        params.uiActive = json.params.uiActive
+        suffix = 'monitor'
       } else if (json.params.cmd) {
         params.cmd = 'transmit'
         params.rfChl = json.params.rfChl
diff --git a/lib/device/outlet-double.js b/lib/device/outlet-double.js
index 2d335c0e..60d30af4 100644
--- a/lib/device/outlet-double.js
+++ b/lib/device/outlet-double.js
@@ -201,7 +201,7 @@ module.exports = class deviceOutletDouble {
   async internalUIUpdate () {
     try {
       const params = { uiActive: 60 }
-      await this.platform.sendDeviceUpdate(this.accessory, params, true)
+      await this.platform.sendDeviceUpdate(this.accessory, params)
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
     }
diff --git a/lib/device/outlet-power.js b/lib/device/outlet-power.js
index 29862e6f..bc2d3086 100644
--- a/lib/device/outlet-power.js
+++ b/lib/device/outlet-power.js
@@ -155,7 +155,7 @@ module.exports = class deviceOutletPower {
   async internalUIUpdate () {
     try {
       const params = { uiActive: 60 }
-      await this.platform.sendDeviceUpdate(this.accessory, params, true)
+      await this.platform.sendDeviceUpdate(this.accessory, params)
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
     }
diff --git a/lib/index.js b/lib/index.js
index 560deb16..332a4c1d 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1425,7 +1425,7 @@ class eWeLinkPlatform {
     }
   }
 
-  async sendDeviceUpdate (accessory, params, useWS) {
+  async sendDeviceUpdate (accessory, params) {
     // Add to a queue so multiple updates are at least 500ms apart
     return await queue.add(async () => {
       // Log the update being sent
@@ -1441,9 +1441,7 @@ class eWeLinkPlatform {
       }
 
       // Check if we can send via LAN otherwise send via WS
-      const res = useWS
-        ? this.lang.wsRequired
-        : !lanClient
+      const res = !lanClient
         ? this.lang.lanDisabled
         : !this.consts.devices.lanOut.includes(accessory.context.eweUIID)
         ? this.lang.lanNotSup

From 3d3c299191b0b0cfdad6f6e15325e68f4254d4eb Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 9 Jun 2021 12:35:48 +0100
Subject: [PATCH 2150/3183] enable lan control for th10/16

---
 lib/utils/constants.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index e8daa4c5..dd68da72 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -148,7 +148,7 @@ module.exports = {
 
   devices: {
     lanIn: [1, 2, 3, 4, 5, 6, 7, 8, 9, 14, 15, 28, 32, 44, 77, 78, 103, 104, 126],
-    lanOut: [1, 2, 3, 4, 5, 6, 7, 8, 9, 14, 28, 32, 44, 77, 78, 126],
+    lanOut: [1, 2, 3, 4, 5, 6, 7, 8, 9, 14, 15, 28, 32, 44, 77, 78, 126],
     singleSwitch: [1, 5, 6, 14, 24, 27, 112],
     doubleSwitch: [126],
     multiSwitch: [2, 3, 4, 7, 8, 9, 29, 30, 31, 41, 82, 83, 84, 113, 114],

From 47dd81fb0e9585e919d1244049de389ad21e6a63 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 9 Jun 2021 12:43:46 +0100
Subject: [PATCH 2151/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a676e546..ddfcf693 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,8 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 ### Added
 
 - Expose a single/multi channel device as any type of sensor
+- [test] LAN control polling for POWR2 devices
+- [test] LAN control for TH10/16 (requires firmware 3.5.0)
 
 ### Changes
 

From ba2e6071568c360264181b81238f8c4b609e1a14 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 11 Jun 2021 11:42:06 +0100
Subject: [PATCH 2152/3183] determine 'setup' automatically and remove config
 option

---
 config.schema.json                  | 19 -----------
 lib/device/simulation/garage-one.js | 50 +++++++++++++----------------
 lib/device/simulation/lock-one.js   | 42 +++++++++++-------------
 lib/device/simulation/sensor.js     | 36 +++++++--------------
 lib/device/simulation/tap-one.js    | 46 ++++++++++++--------------
 lib/device/simulation/valve-one.js  |  7 ----
 lib/index.js                        |  9 ------
 lib/utils/constants.js              |  1 -
 lib/utils/lang-en.js                |  1 -
 9 files changed, 72 insertions(+), 139 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index aff5596c..441dda8e 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -627,24 +627,6 @@
                 }
               ]
             },
-            "setup": {
-              "type": "string",
-              "title": "Device Setup",
-              "description": "The type of generic device being used.",
-              "condition": {
-                "functionBody": "return (model.groups[arrayIndices] && ['garage', 'lock', 'tap', 'valve', 'sensor'].includes(model.groups[arrayIndices].type));"
-              },
-              "oneOf": [
-                {
-                  "title": "Single-Channel",
-                  "enum": ["oneSwitch"]
-                },
-                {
-                  "title": "Multi-Channel",
-                  "enum": ["twoSwitch"]
-                }
-              ]
-            },
             "sensorType": {
               "type": "string",
               "title": "Sensor Type",
@@ -964,7 +946,6 @@
             "groups[].deviceId",
             "groups[].label",
             "groups[].type",
-            "groups[].setup",
             "groups[].sensorType",
             "groups[].operationTime",
             "groups[].operationTimeDown",
diff --git a/lib/device/simulation/garage-one.js b/lib/device/simulation/garage-one.js
index 74d3e581..9aba90d4 100644
--- a/lib/device/simulation/garage-one.js
+++ b/lib/device/simulation/garage-one.js
@@ -21,18 +21,12 @@ module.exports = class deviceGarageOne {
 
     // Set up custom variables for this device type
     const deviceConf = platform.simulations[accessory.context.eweDeviceId]
-    this.setup = deviceConf.setup
     this.operationTimeUp = deviceConf.operationTime || platform.consts.defaultValues.operationTime
     this.operationTimeDown = deviceConf.operationTimeDown || this.operationTimeUp
     this.disableDeviceLogging = deviceConf.overrideDisabledLogging
       ? false
       : platform.config.disableDeviceLogging
 
-    // Check for a valid setup
-    if (!platform.consts.allowed.setups.includes(this.setup)) {
-      this.error = this.lang.simErrSetup
-    }
-
     // Check the sensor is valid if defined by the user
     if (deviceConf.sensorId) {
       this.definedSensor = true
@@ -88,7 +82,6 @@ module.exports = class deviceGarageOne {
         disableDeviceLogging: this.disableDeviceLogging,
         operationTimeDown: this.operationTimeDown,
         operationTimeUp: this.operationTimeUp,
-        setup: this.setup,
         type: deviceConf.type
       })
       this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
@@ -97,9 +90,6 @@ module.exports = class deviceGarageOne {
 
   async internalUpdate (value) {
     try {
-      if (this.error) {
-        throw new Error(this.lang.invalidConfig + ' - ' + this.error)
-      }
       const newPos = value
       const params = {}
       let delay = 0
@@ -135,6 +125,8 @@ module.exports = class deviceGarageOne {
             }
           ]
           break
+        default:
+          return
       }
       await this.platform.sendDeviceUpdate(this.accessory, params)
       await this.funcs.sleep(2000)
@@ -167,28 +159,30 @@ module.exports = class deviceGarageOne {
 
   async externalUpdate (params) {
     try {
-      if (this.error) {
-        throw new Error(this.lang.invalidConfig + ' - ' + this.error)
-      }
-      if ((!params.switch && !params.switches) || this.inUse || this.definedSensor) {
+      if (this.inUse || this.definedSensor) {
         return
       }
       const prevState = this.service.getCharacteristic(this.hapChar.CurrentDoorState).value
       const newPos = [0, 2].includes(prevState) ? 3 : 2
-      switch (this.setup) {
-        case 'oneSwitch':
-          if (params.switch === 'off') {
-            return
-          }
-          break
-        case 'twoSwitch':
-          if (
-            params.switches[0].switch === params.switches[1].switch ||
-            params.switches[prevState % 2].switch === 'on'
-          ) {
-            return
-          }
-          break
+      if (params.switch) {
+        if (!this.setup) {
+          this.setup = 'oneSwitch'
+        }
+        if (params.switch === 'off') {
+          return
+        }
+      } else if (params.switches) {
+        if (!this.setup) {
+          this.setup = 'twoSwitch'
+        }
+        if (
+          params.switches[0].switch === params.switches[1].switch ||
+          params.switches[prevState % 2].switch === 'on'
+        ) {
+          return
+        }
+      } else {
+        return
       }
       this.inUse = true
       this.service.updateCharacteristic(this.hapChar.TargetDoorState, newPos - 2)
diff --git a/lib/device/simulation/lock-one.js b/lib/device/simulation/lock-one.js
index eddbcbdd..f6403f64 100644
--- a/lib/device/simulation/lock-one.js
+++ b/lib/device/simulation/lock-one.js
@@ -20,16 +20,10 @@ module.exports = class deviceLockOne {
     // Set up custom variables for this device type
     const deviceConf = platform.simulations[accessory.context.eweDeviceId]
     this.operationTime = deviceConf.operationTime || platform.consts.defaultValues.operationTime
-    this.setup = deviceConf.setup
     this.disableDeviceLogging = deviceConf.overrideDisabledLogging
       ? false
       : platform.config.disableDeviceLogging
 
-    // Check for a valid setup
-    if (!platform.consts.allowed.setups.includes(this.setup)) {
-      this.error = this.lang.simErrSetup
-    }
-
     // If the accessory has a switch service then remove it
     if (this.accessory.getService(this.hapServ.Switch)) {
       this.accessory.removeService(this.accessory.getService(this.hapServ.Switch))
@@ -56,7 +50,6 @@ module.exports = class deviceLockOne {
       const opts = JSON.stringify({
         disableDeviceLogging: this.disableDeviceLogging,
         operationTime: this.operationTime,
-        setup: this.setup,
         type: deviceConf.type
       })
       this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
@@ -65,9 +58,6 @@ module.exports = class deviceLockOne {
 
   async internalUpdate (value) {
     try {
-      if (this.error) {
-        throw new Error(this.lang.invalidConfig + ' - ' + this.error)
-      }
       const params = {}
       switch (this.setup) {
         case 'oneSwitch':
@@ -81,6 +71,8 @@ module.exports = class deviceLockOne {
             }
           ]
           break
+        default:
+          return
       }
       this.inUse = true
       await this.platform.sendDeviceUpdate(this.accessory, params)
@@ -107,23 +99,25 @@ module.exports = class deviceLockOne {
 
   async externalUpdate (params) {
     try {
-      if (this.error) {
-        throw new Error(this.lang.invalidConfig + ' - ' + this.error)
-      }
       if (this.inUse) {
         return
       }
-      switch (this.setup) {
-        case 'oneSwitch':
-          if (!params.switch || params.switch === 'off') {
-            return
-          }
-          break
-        case 'twoSwitch':
-          if (!params.switches || params.switches[0].switch === 'off') {
-            return
-          }
-          break
+      if (params.switch) {
+        if (!this.setup) {
+          this.setup = 'oneSwitch'
+        }
+        if (params.switch === 'off') {
+          return
+        }
+      } else if (params.switches) {
+        if (!this.setup) {
+          this.setup = 'twoSwitch'
+        }
+        if (params.switches[0].switch === 'off') {
+          return
+        }
+      } else {
+        return
       }
       this.inUse = true
       this.service.updateCharacteristic(this.hapChar.LockCurrentState, 0)
diff --git a/lib/device/simulation/sensor.js b/lib/device/simulation/sensor.js
index 0e814876..951d9c1b 100644
--- a/lib/device/simulation/sensor.js
+++ b/lib/device/simulation/sensor.js
@@ -20,16 +20,10 @@ module.exports = class deviceSensor {
     // Set up custom variables for this device type
     const deviceConf = platform.simulations[accessory.context.eweDeviceId]
     this.sensorType = deviceConf.sensorType || 'motion'
-    this.setup = deviceConf.setup
     this.disableDeviceLogging = deviceConf.overrideDisabledLogging
       ? false
       : platform.config.disableDeviceLogging
 
-    // Check for a valid setup
-    if (!platform.consts.allowed.setups.includes(this.setup)) {
-      this.error = this.lang.simErrSetup
-    }
-
     // If the accessory has a switch service then remove it
     if (this.accessory.getService(this.hapServ.Switch)) {
       this.accessory.removeService(this.accessory.getService(this.hapServ.Switch))
@@ -103,7 +97,6 @@ module.exports = class deviceSensor {
     if (platform.config.debug) {
       const opts = JSON.stringify({
         sensorType: this.sensorType,
-        setup: this.setup,
         disableDeviceLogging: this.disableDeviceLogging
       })
       this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
@@ -112,24 +105,19 @@ module.exports = class deviceSensor {
 
   async externalUpdate (params) {
     try {
-      if (this.error) {
-        throw new Error(this.lang.invalidConfig + ' - ' + this.error)
-      }
-      switch (this.setup) {
-        case 'oneSwitch':
-          if (!params.switch || params.switch === this.cacheState) {
-            return
-          }
-          this.cacheState = params.switch
-          break
-        case 'twoSwitch':
-          if (!params.switches || params.switches[0].switch === this.cacheState) {
-            return
-          }
-          this.cacheState = params.switches[0].switch
-          break
+      if (params.switch) {
+        if (params.switch === this.cacheState) {
+          return
+        }
+        this.cacheState = params.switch
+      } else if (params.switches) {
+        if (params.switches[0].switch === this.cacheState) {
+          return
+        }
+        this.cacheState = params.switches[0].switch
+      } else {
+        return
       }
-
       if (this.cacheState === 'on') {
         this.service.updateCharacteristic(this.char, 1)
         this.accessory.eveService.addEntry({ status: 1 })
diff --git a/lib/device/simulation/tap-one.js b/lib/device/simulation/tap-one.js
index 82512afb..8ce34b8a 100644
--- a/lib/device/simulation/tap-one.js
+++ b/lib/device/simulation/tap-one.js
@@ -18,16 +18,10 @@ module.exports = class deviceTapOne {
 
     // Set up custom variables for this device type
     const deviceConf = platform.simulations[accessory.context.eweDeviceId]
-    this.setup = deviceConf.setup
     this.disableDeviceLogging = deviceConf.overrideDisabledLogging
       ? false
       : platform.config.disableDeviceLogging
 
-    // Check for a valid setup
-    if (!platform.consts.allowed.setups.includes(this.setup)) {
-      this.error = this.lang.simErrSetup
-    }
-
     // If the accessory has a switch service then remove it
     if (this.accessory.getService(this.hapServ.Switch)) {
       this.accessory.removeService(this.accessory.getService(this.hapServ.Switch))
@@ -50,7 +44,6 @@ module.exports = class deviceTapOne {
     if (platform.config.debug) {
       const opts = JSON.stringify({
         disableDeviceLogging: this.disableDeviceLogging,
-        setup: this.setup,
         type: deviceConf.type
       })
       this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
@@ -59,9 +52,6 @@ module.exports = class deviceTapOne {
 
   async internalUpdate (value) {
     try {
-      if (this.error) {
-        throw new Error(this.lang.invalidConfig + ' - ' + this.error)
-      }
       const params = {}
       switch (this.setup) {
         case 'oneSwitch':
@@ -75,6 +65,8 @@ module.exports = class deviceTapOne {
             }
           ]
           break
+        default:
+          return
       }
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.cacheState = value ? 'on' : 'off'
@@ -98,22 +90,24 @@ module.exports = class deviceTapOne {
 
   async externalUpdate (params) {
     try {
-      if (this.error) {
-        throw new Error(this.lang.invalidConfig + ' - ' + this.error)
-      }
-      switch (this.setup) {
-        case 'oneSwitch':
-          if (!params.switch || params.switch === this.cacheState) {
-            return
-          }
-          this.cacheState = params.switch
-          break
-        case 'twoSwitch':
-          if (!params.switches || params.switches[0].switch === this.cacheState) {
-            return
-          }
-          this.cacheState = params.switches[0].switch
-          break
+      if (params.switch) {
+        if (!this.setup) {
+          this.setup = 'oneSwitch'
+        }
+        if (params.switch === this.cacheState) {
+          return
+        }
+        this.cacheState = params.switch
+      } else if (params.switches) {
+        if (!this.setup) {
+          this.setup = 'twoSwitch'
+        }
+        if (params.switches[0].switch === this.cacheState) {
+          return
+        }
+        this.cacheState = params.switches[0].switch
+      } else {
+        return
       }
       this.service.updateCharacteristic(this.hapChar.Active, this.cacheState === 'on' ? 1 : 0)
       this.service.updateCharacteristic(this.hapChar.InUse, this.cacheState === 'on' ? 1 : 0)
diff --git a/lib/device/simulation/valve-one.js b/lib/device/simulation/valve-one.js
index 21fea9fc..72e0194a 100644
--- a/lib/device/simulation/valve-one.js
+++ b/lib/device/simulation/valve-one.js
@@ -18,16 +18,10 @@ module.exports = class deviceValveOne {
 
     // Set up custom variables for this device type
     const deviceConf = platform.simulations[accessory.context.eweDeviceId]
-    this.setup = deviceConf.setup
     this.disableDeviceLogging = deviceConf.overrideDisabledLogging
       ? false
       : platform.config.disableDeviceLogging
 
-    // Check for a valid setup
-    if (!platform.consts.allowed.setups.includes(this.setup)) {
-      this.error = this.lang.simErrSetup
-    }
-
     // If the accessory has a switch service then remove it
     if (this.accessory.getService(this.hapServ.Switch)) {
       this.accessory.removeService(this.accessory.getService(this.hapServ.Switch))
@@ -70,7 +64,6 @@ module.exports = class deviceValveOne {
     if (platform.config.debug) {
       const opts = JSON.stringify({
         disableDeviceLogging: this.disableDeviceLogging,
-        setup: this.setup,
         type: deviceConf.type
       })
       this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
diff --git a/lib/index.js b/lib/index.js
index 332a4c1d..f90c95c8 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -391,15 +391,6 @@ class eWeLinkPlatform {
                       this.simulations[id][k] = v
                     }
                     break
-                  case 'setup':
-                    if (typeof v !== 'string' || v === '') {
-                      logIgnore(key + '.' + id + '.' + k)
-                    } else if (!this.consts.allowed.setups.includes(v)) {
-                      logIgnore(key + '.' + id + '.' + k)
-                    } else {
-                      this.simulations[id][k] = v
-                    }
-                    break
                   case 'type':
                     if (typeof v !== 'string' || v === '') {
                       logIgnore(key + '.' + id + '.' + k)
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index dd68da72..5c56f549 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -140,7 +140,6 @@ module.exports = {
       'valve_four',
       'window'
     ],
-    setups: ['oneSwitch', 'twoSwitch'],
     obstructs: ['garage', 'garage_eachen'],
     sensors: ['water', 'smoke', 'co', 'co2', 'contact', 'occupancy', 'motion'],
     bulbModel: ['bulbB02BA60', 'bulbB02FA60', 'bulbB02FST64']
diff --git a/lib/utils/lang-en.js b/lib/utils/lang-en.js
index 16f206eb..ee1bddab 100644
--- a/lib/utils/lang-en.js
+++ b/lib/utils/lang-en.js
@@ -104,7 +104,6 @@ module.exports = {
   sendLogin: 'Sending HTTP login() request',
   sensorNo: 'deactivated',
   sensorYes: 'activated',
-  simErrSetup: "device has not been set up as 'oneSwitch' or 'twoSwitch'",
   sonoffCamera: 'see the homebridge-ewelink wiki for details to enable the camera',
   stoppedLAN: 'LAN monitoring gracefully stopped',
   stoppedWS: 'Web socket gracefully closed',

From 305f77f2423354e075a96780abad8fa04d3524d3 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 11 Jun 2021 11:42:54 +0100
Subject: [PATCH 2153/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ddfcf693..1ae8df2c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 ### Changes
 
+- Remove `setup` config option for simulations as device type is now automatically determined
 - Fix a logging issue for the zigbee contact sensor
 
 ## 6.7.1 (2021-05-27)

From 262b58d6b2146c3698a54949a690ad2570c3c834 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 11 Jun 2021 11:44:23 +0100
Subject: [PATCH 2154/3183] 6.7.2-beta.1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 294054ce..74e1912e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.7.2-beta.0",
+  "version": "6.7.2-beta.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 336c02d7..d827bf6b 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.7.2-beta.0",
+  "version": "6.7.2-beta.1",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 567dae91ffe45af8a724ac6754baca3aa547d0c8 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 12 Jun 2021 09:13:42 +0100
Subject: [PATCH 2155/3183] amend lan mode for TH10/16

---
 lib/connection/lan.js | 7 ++++++-
 lib/index.js          | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/lib/connection/lan.js b/lib/connection/lan.js
index 5fe45fe3..deebd1d5 100644
--- a/lib/connection/lan.js
+++ b/lib/connection/lan.js
@@ -153,7 +153,7 @@ module.exports = class connectionLAN {
     this.log('%s.', this.lang.lanMonitor)
   }
 
-  async sendUpdate (json) {
+  async sendUpdate (json, uiid) {
     try {
       // Check we have an IP address for the device
       if (!this.deviceMap.get(json.deviceid).ip) {
@@ -175,6 +175,11 @@ module.exports = class connectionLAN {
       } else if (json.params.switch) {
         params.switch = json.params.switch
         suffix = 'switch'
+        if (uiid === 15) {
+          // Extra params for the TH10/16
+          params.mainSwitch = json.params.switch
+          params.deviceType = 'normal'
+        }
       } else if (json.params.uiActive) {
         params.uiActive = json.params.uiActive
         suffix = 'monitor'
diff --git a/lib/index.js b/lib/index.js
index f90c95c8..1408bdff 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1436,7 +1436,7 @@ class eWeLinkPlatform {
         ? this.lang.lanDisabled
         : !this.consts.devices.lanOut.includes(accessory.context.eweUIID)
         ? this.lang.lanNotSup
-        : await lanClient.sendUpdate(payload)
+        : await lanClient.sendUpdate(payload, accessory.context.eweUIID)
 
       // Revert to WS if LAN mode not possible for whatever reason
       if (res !== 'ok') {

From f020ca0811bdfe16bf5c8869eb85e0622d2c6a48 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 12 Jun 2021 09:13:57 +0100
Subject: [PATCH 2156/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1ae8df2c..7516baff 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,8 +7,8 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 ### Added
 
 - Expose a single/multi channel device as any type of sensor
+- LAN control for TH10/16 (requires firmware 3.5.0)
 - [test] LAN control polling for POWR2 devices
-- [test] LAN control for TH10/16 (requires firmware 3.5.0)
 
 ### Changes
 

From 4fa2b512bc27bea988a1223c9dabe94066ffa58f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 12 Jun 2021 09:14:28 +0100
Subject: [PATCH 2157/3183] 6.7.2-beta.2

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 74e1912e..5cba7eb6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.7.2-beta.1",
+  "version": "6.7.2-beta.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index d827bf6b..d439fa57 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.7.2-beta.1",
+  "version": "6.7.2-beta.2",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From ddceec615cda8621e11bbfffe6963dd823916b03 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 12 Jun 2021 11:34:41 +0100
Subject: [PATCH 2158/3183] Update lan.js

---
 lib/connection/lan.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/connection/lan.js b/lib/connection/lan.js
index deebd1d5..759237f6 100644
--- a/lib/connection/lan.js
+++ b/lib/connection/lan.js
@@ -174,12 +174,12 @@ module.exports = class connectionLAN {
         suffix = 'switches'
       } else if (json.params.switch) {
         params.switch = json.params.switch
-        suffix = 'switch'
         if (uiid === 15) {
           // Extra params for the TH10/16
           params.mainSwitch = json.params.switch
           params.deviceType = 'normal'
         }
+        suffix = 'switch'
       } else if (json.params.uiActive) {
         params.uiActive = json.params.uiActive
         suffix = 'monitor'

From eecdb6a6c70ee7929fb710669b06c1626e28b5c5 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 12 Jun 2021 12:16:39 +0100
Subject: [PATCH 2159/3183] update TH params in normal mode

---
 lib/connection/lan.js        | 4 ++--
 lib/device/sensor-ambient.js | 6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/lib/connection/lan.js b/lib/connection/lan.js
index 759237f6..f68d88ba 100644
--- a/lib/connection/lan.js
+++ b/lib/connection/lan.js
@@ -176,8 +176,8 @@ module.exports = class connectionLAN {
         params.switch = json.params.switch
         if (uiid === 15) {
           // Extra params for the TH10/16
-          params.mainSwitch = json.params.switch
-          params.deviceType = 'normal'
+          params.mainSwitch = json.params.mainSwitch
+          params.deviceType = json.params.deviceType
         }
         suffix = 'switch'
       } else if (json.params.uiActive) {
diff --git a/lib/device/sensor-ambient.js b/lib/device/sensor-ambient.js
index 33237330..e0e59f82 100644
--- a/lib/device/sensor-ambient.js
+++ b/lib/device/sensor-ambient.js
@@ -99,7 +99,11 @@ module.exports = class deviceSensorAmbient {
       if (newValue === this.cacheState) {
         return
       }
-      const params = { switch: newValue }
+      const params = {
+        switch: newValue,
+        mainSwitch: newValue,
+        deviceType: 'normal'
+      }
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.cacheState = newValue
       if (!this.disableDeviceLogging) {

From bfe233ba7ae830d0b8f2f35470a640d35e0d5e7e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 12 Jun 2021 14:33:21 +0100
Subject: [PATCH 2160/3183] thermostat simulation to heater accessory

---
 config.schema.json                  |   6 +-
 lib/connection/lan.js               |  11 ++-
 lib/device/sensor-ambient.js        |   5 ++
 lib/device/simulation/thermostat.js | 134 +++++++++++++++-------------
 lib/utils/constants.js              |   1 +
 5 files changed, 91 insertions(+), 66 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 441dda8e..445da035 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -348,14 +348,14 @@
             "minTarget": {
               "type": "number",
               "title": "Minimum Target Temperature",
-              "description": "Minimum target temperature for TH10/16 thermostat simulation to show in HomeKit apps. Must be 0 or more.",
+              "description": "Minimum target temperature for TH10/16 heater simulation to show in HomeKit apps. Must be 0 or more.",
               "placeholder": 10,
               "minimum": 0
             },
             "maxTarget": {
               "type": "number",
               "title": "Maximum Target Temperature",
-              "description": "Maximum target temperature for TH10/16 thermostat simulation to show in HomeKit apps. Must be 1 or more, and greater than the minimum value set above.",
+              "description": "Maximum target temperature for TH10/16 heater simulation to show in HomeKit apps. Must be 1 or more, and greater than the minimum value set above.",
               "placeholder": 30,
               "minimum": 1
             },
@@ -558,7 +558,7 @@
               "description": "The new type for this device.",
               "oneOf": [
                 {
-                  "title": "1 Thermostat (with Sonoff TH10 or TH16)",
+                  "title": "1 Heater (with Sonoff TH10 or TH16)",
                   "enum": ["thermostat"]
                 },
                 {
diff --git a/lib/connection/lan.js b/lib/connection/lan.js
index f68d88ba..ac1b1a0b 100644
--- a/lib/connection/lan.js
+++ b/lib/connection/lan.js
@@ -175,9 +175,14 @@ module.exports = class connectionLAN {
       } else if (json.params.switch) {
         params.switch = json.params.switch
         if (uiid === 15) {
-          // Extra params for the TH10/16
-          params.mainSwitch = json.params.mainSwitch
-          params.deviceType = json.params.deviceType
+          // TH10/16 only supports LAN in normal mode
+          if (json.params.deviceType === 'normal') {
+            // Extra params for the TH10/16
+            params.mainSwitch = json.params.mainSwitch
+            params.deviceType = json.params.deviceType
+          } else {
+            throw new Error(this.lang.devNotConfLAN)
+          }
         }
         suffix = 'switch'
       } else if (json.params.uiActive) {
diff --git a/lib/device/sensor-ambient.js b/lib/device/sensor-ambient.js
index e0e59f82..892f13b1 100644
--- a/lib/device/sensor-ambient.js
+++ b/lib/device/sensor-ambient.js
@@ -32,6 +32,11 @@ module.exports = class deviceSensorAmbient {
       this.accessory.removeService(this.accessory.getService(this.hapServ.Thermostat))
     }
 
+    // If the accessory has a heater service then remove it
+    if (this.accessory.getService(this.hapServ.HeaterCooler)) {
+      this.accessory.removeService(this.accessory.getService(this.hapServ.HeaterCooler))
+    }
+
     // The user can choose to hide the switch service if they desire
     if (this.hideSwitch) {
       // User has hidden the switch service so remove it if it exists
diff --git a/lib/device/simulation/thermostat.js b/lib/device/simulation/thermostat.js
index 2f5e8030..0d677348 100644
--- a/lib/device/simulation/thermostat.js
+++ b/lib/device/simulation/thermostat.js
@@ -45,41 +45,55 @@ module.exports = class deviceThermostat {
       this.accessory.removeService(this.accessory.getService(this.hapServ.TemperatureSensor))
     }
 
-    // If the accessory has a humidity sensor service then remove it
-    if (this.accessory.getService(this.hapServ.HumiditySensor)) {
-      this.accessory.removeService(this.accessory.getService(this.hapServ.HumiditySensor))
-    }
-
     // Set up the accessory with default target temp when added the first time
     if (!this.funcs.hasProperty(this.accessory.context, 'cacheTarget')) {
       this.accessory.context.cacheTarget = 20
     }
 
-    // Add the thermostat service if it doesn't already exist
+    // If the accessory has a thermostat service then remove it
+    if (this.accessory.getService(this.hapServ.Thermostat)) {
+      this.accessory.removeService(this.accessory.getService(this.hapServ.Thermostat))
+    }
+
+    // Add the heater service if it doesn't already exist
     this.service =
-      this.accessory.getService(this.hapServ.Thermostat) ||
-      this.accessory.addService(this.hapServ.Thermostat)
+      this.accessory.getService(this.hapServ.HeaterCooler) ||
+      this.accessory.addService(this.hapServ.HeaterCooler)
+
+    // The DS18B20 sensor does not provide humidity readings
+    if (this.accessory.context.sensorType === 'DS18B20') {
+      if (this.accessory.getService(this.hapServ.HumiditySensor)) {
+        this.accessory.removeService(this.accessory.getService(this.hapServ.HumiditySensor))
+      }
+    } else {
+      // Add the humidity sensor service if it doesn't already exist
+      this.humiService =
+        this.accessory.getService(this.hapServ.HumiditySensor) ||
+        this.accessory.addService(this.hapServ.HumiditySensor)
+    }
+
+    this.service.setPrimaryService()
 
     // Set custom properties of the current temperature characteristic
     this.service.getCharacteristic(this.hapChar.CurrentTemperature).setProps({
       minStep: 0.1
     })
 
+    // Add the set handler to the heater active characteristic
+    this.service.getCharacteristic(this.hapChar.Active).onSet(async value => {
+      await this.internalStateUpdate(value)
+    })
+
     // Add the set handler to the target state characteristic
-    this.service
-      .getCharacteristic(this.hapChar.TargetHeatingCoolingState)
-      .setProps({
-        minValue: 0,
-        maxValue: 1,
-        validValues: [0, 1]
-      })
-      .onSet(async value => {
-        await this.internalStateUpdate(value)
-      })
+    this.service.getCharacteristic(this.hapChar.TargetHeaterCoolerState).setProps({
+      minValue: 0,
+      maxValue: 0,
+      validValues: [0]
+    })
 
     // Add the set handler to the target temperature characteristic
     this.service
-      .getCharacteristic(this.hapChar.TargetTemperature)
+      .getCharacteristic(this.hapChar.HeatingThresholdTemperature)
       .setProps({
         minValue: this.minTarget,
         maxValue: this.maxTarget,
@@ -88,7 +102,6 @@ module.exports = class deviceThermostat {
       .onSet(async value => {
         await this.internalTargetTempUpdate(value)
       })
-    this.cacheTarg = this.service.getCharacteristic(this.hapChar.TargetTemperature).value
 
     // The DS18B20 sensor does not provide humidity readings
     if (
@@ -106,7 +119,7 @@ module.exports = class deviceThermostat {
     // Setting this now makes the plugin send the payload to setup as thermostat
     setTimeout(() => {
       this.service.setCharacteristic(
-        this.hapChar.TargetTemperature,
+        this.hapChar.HeatingThresholdTemperature,
         this.accessory.context.cacheTarget
       )
     }, 5000)
@@ -126,33 +139,34 @@ module.exports = class deviceThermostat {
 
   async internalStateUpdate (value) {
     try {
-      const params = {}
+      const params = { deviceType: 'temperature' }
       if (value === 0) {
         params.mainSwitch = 'off'
         params.switch = 'off'
       } else {
-        params.mainSwitch = 'on'
+        params.mainSwitch = 'on',
+        this.cacheHeat = this.cacheTemp < this.accessory.context.cacheTarget ? 'on' : 'off'
+        params.switch = this.cacheHeat
       }
-      const newValue = value !== 0 ? 'on' : 'off'
-      const currentTemp = this.service.getCharacteristic(this.hapChar.CurrentTemperature)
-      this.cacheHeat =
-        newValue === 'on' && currentTemp.value < this.accessory.context.cacheTarget ? 'on' : 'off'
-      this.service.updateCharacteristic(
-        this.hapChar.CurrentHeatingCoolingState,
-        newValue === 'on' ? 1 : 0
-      )
+      const newValue = value === 0 ? 'off' : 'on'
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.cacheState = newValue
       if (!this.disableDeviceLogging) {
         this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
+        if (value === 1) {
+          this.service.updateCharacteristic(
+            this.hapChar.CurrentHeaterCoolerState,
+            this.cacheHeat === 'on' ? 2 : 1
+          )
+          this.log('[%s] %s [%s].', this.name, this.lang.curHeat, this.cacheHeat)
+        } else {
+          this.service.updateCharacteristic(this.hapChar.CurrentHeaterCoolerState, 0)
+        }
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
-        this.service.updateCharacteristic(
-          this.hapChar.TargetHeatingCoolingState,
-          this.cacheState === 'on' ? 1 : 0
-        )
+        this.service.updateCharacteristic(this.hapChar.Active, this.cacheState === 'on' ? 1 : 0)
       }, 2000)
       throw new this.hapErr(-70402)
     }
@@ -160,10 +174,12 @@ module.exports = class deviceThermostat {
 
   async internalTargetTempUpdate (value) {
     try {
-      const cTemp = this.service.getCharacteristic(this.hapChar.CurrentTemperature).value
-      const newValue = cTemp < value ? 'on' : 'off'
+      if (value === this.accessory.context.cacheTarget) {
+        return
+      }
       const params = {
         deviceType: 'temperature',
+        mainSwitch: 'on',
         targets: [
           {
             targetHigh: value.toFixed(1),
@@ -179,22 +195,20 @@ module.exports = class deviceThermostat {
           }
         ]
       }
-      this.service.updateCharacteristic(
-        this.hapChar.CurrentHeatingCoolingState,
-        newValue === 'on' ? 1 : 0
-      )
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.accessory.context.cacheTarget = value
       this.cacheState = 'on'
-      this.cacheHeat = newValue
-      this.cacheTarg = value
+      this.accessory.context.cacheTarget = value
       if (!this.disableDeviceLogging) {
         this.log('[%s] %s [%s°C].', this.name, this.lang.curTarg, value)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
-        this.service.updateCharacteristic(this.hapChar.TargetTemperature, this.cacheTarg)
+        this.service.updateCharacteristic(
+          this.hapChar.HeatingThresholdTemperature,
+          this.accessory.context.cacheTarget
+        )
       }, 2000)
       throw new this.hapErr(-70402)
     }
@@ -206,10 +220,7 @@ module.exports = class deviceThermostat {
         const newState = params.mainSwitch
         if (this.cacheState !== newState) {
           this.cacheState = newState
-          this.service.updateCharacteristic(
-            this.hapChar.TargetHeatingCoolingState,
-            this.cacheState === 'on' ? 1 : 0
-          )
+          this.service.updateCharacteristic(this.hapChar.Active, this.cacheState === 'on' ? 1 : 0)
           this.accessory.eveService.addEntry({
             status: this.cacheState === 'on' ? 1 : 0
           })
@@ -224,8 +235,8 @@ module.exports = class deviceThermostat {
       if (params.switch && params.switch !== this.cacheHeat) {
         this.cacheHeat = params.switch
         this.service.updateCharacteristic(
-          this.hapChar.CurrentHeatingCoolingState,
-          params.switch === 'on' ? 1 : 0
+          this.hapChar.CurrentHeaterCoolerState,
+          this.cacheHeat === 'on' ? 2 : this.cacheState === 'on' ? 1 : 0
         )
         if (params.updateSource && !this.disableDeviceLogging) {
           this.log('[%s] %s [%s].', this.name, this.lang.curHeat, this.cacheHeat)
@@ -235,11 +246,11 @@ module.exports = class deviceThermostat {
         this.funcs.hasProperty(params, 'currentTemperature') &&
         params.currentTemperature !== 'unavailable'
       ) {
-        const currentTemp = Number(params.currentTemperature) + this.tempOffset
-        if (this.cacheTemp !== currentTemp) {
-          this.cacheTemp = currentTemp
+        if (this.cacheTempRaw !== params.currentTemperature) {
+          this.cacheTempRaw = params.currentTemperature
+          this.cacheTemp = Number(params.currentTemperature) + this.tempOffset
           this.service.updateCharacteristic(this.hapChar.CurrentTemperature, this.cacheTemp)
-          this.accessory.eveService.addEntry({ temp: currentTemp })
+          this.accessory.eveService.addEntry({ temp: this.cacheTemp })
           if (params.updateSource && !this.disableDeviceLogging) {
             this.log('[%s] %s [%s°C].', this.name, this.lang.curTemp, this.cacheTemp)
           }
@@ -248,13 +259,16 @@ module.exports = class deviceThermostat {
       if (
         this.funcs.hasProperty(params, 'currentHumidity') &&
         params.currentHumidity !== 'unavailable' &&
-        this.service.testCharacteristic(this.hapChar.CurrentRelativeHumidity)
+        this.humiService
       ) {
-        const currentHumi = parseInt(params.currentHumidity)
-        if (this.cacheHumi !== currentHumi) {
-          this.cacheHumi = currentHumi
-          this.service.updateCharacteristic(this.hapChar.CurrentRelativeHumidity, this.cacheHumi)
-          this.accessory.eveService.addEntry({ humidity: currentHumi })
+        if (this.cacheHumiRaw !== params.currentHumidity) {
+          this.cacheHumiRaw = params.currentHumidity
+          this.cacheHumi = parseInt(params.currentHumidity)
+          this.humiService.updateCharacteristic(
+            this.hapChar.CurrentRelativeHumidity,
+            this.cacheHumi
+          )
+          this.accessory.eveService.addEntry({ humidity: this.cacheHumi })
           if (params.updateSource && !this.disableDeviceLogging) {
             this.log('[%s] %s [%s%].', this.name, this.lang.curHumi, this.cacheHumi)
           }
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 5c56f549..a491a640 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -195,6 +195,7 @@ module.exports = {
     'currentHumidity',
     'currentTemperature',
     'currLocation',
+    'deviceType',
     'humidity',
     'key',
     'lightbright',

From e63a6e6f4270021c67f62103d65d4642217fa00c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 12 Jun 2021 14:34:14 +0100
Subject: [PATCH 2161/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7516baff..fe8f2619 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 ### Changes
 
+- TH10/16 simulation accessory type change from thermostat to heater
 - Remove `setup` config option for simulations as device type is now automatically determined
 - Fix a logging issue for the zigbee contact sensor
 

From f0033b281b50c99a5bec9cf4b1d04f80c4bb43d2 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 12 Jun 2021 14:34:56 +0100
Subject: [PATCH 2162/3183] 6.7.2-beta.3

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 5cba7eb6..2adab278 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.7.2-beta.2",
+  "version": "6.7.2-beta.3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index d439fa57..4398098c 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.7.2-beta.2",
+  "version": "6.7.2-beta.3",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 9038f31ce3160c031eb4f4dcf9134b8f2a3798cb Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 12 Jun 2021 14:36:27 +0100
Subject: [PATCH 2163/3183] adjust file names

---
 lib/device/simulation/{thermostat.js => heater.js} |  2 +-
 lib/index.js                                       | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)
 rename lib/device/simulation/{thermostat.js => heater.js} (99%)

diff --git a/lib/device/simulation/thermostat.js b/lib/device/simulation/heater.js
similarity index 99%
rename from lib/device/simulation/thermostat.js
rename to lib/device/simulation/heater.js
index 0d677348..0c9ec00b 100644
--- a/lib/device/simulation/thermostat.js
+++ b/lib/device/simulation/heater.js
@@ -2,7 +2,7 @@
 /* eslint-disable new-cap */
 'use strict'
 
-module.exports = class deviceThermostat {
+module.exports = class deviceHeater {
   constructor (platform, accessory) {
     // Set up variables from the platform
     this.funcs = platform.funcs
diff --git a/lib/index.js b/lib/index.js
index 1408bdff..c85605e0 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -886,12 +886,12 @@ class eWeLinkPlatform {
         this.simulations[device.deviceid].type === 'thermostat' &&
         this.consts.devices.sensorAmbient.includes(uiid)
       ) {
-        /*********************************
-        THERMOSTATS [ACCESSORY SIMULATION]
-        *********************************/
+        /*************************************
+        HEATERS [TH10/16 ACCESSORY SIMULATION]
+        *************************************/
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require('./device/simulation/thermostat'))(this, accessory)
-        /********************************/
+        accessory.control = new (require('./device/simulation/heater'))(this, accessory)
+        /************************************/
       } else if (this.consts.devices.sensorAmbient.includes(uiid)) {
         /***********************
         SENSOR [AMBIENT-TH10/16]

From decfc1aeff71faf33667f3083ef60d05320be0d3 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 12 Jun 2021 14:48:45 +0100
Subject: [PATCH 2164/3183] fixes for heater

---
 lib/device/simulation/heater.js | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/lib/device/simulation/heater.js b/lib/device/simulation/heater.js
index 0c9ec00b..0f559bad 100644
--- a/lib/device/simulation/heater.js
+++ b/lib/device/simulation/heater.js
@@ -50,6 +50,15 @@ module.exports = class deviceHeater {
       this.accessory.context.cacheTarget = 20
     }
 
+    // Check to make sure user has not switched from cooler to heater
+    if (this.accessory.context.cacheType !== 'heater') {
+      // Remove and re-setup as a HeaterCooler
+      if (this.accessory.getService(this.hapServ.HeaterCooler)) {
+        this.accessory.removeService(this.accessory.getService(this.hapServ.HeaterCooler))
+      }
+      this.accessory.context.cacheType = 'heater'
+    }
+
     // If the accessory has a thermostat service then remove it
     if (this.accessory.getService(this.hapServ.Thermostat)) {
       this.accessory.removeService(this.accessory.getService(this.hapServ.Thermostat))
@@ -144,7 +153,7 @@ module.exports = class deviceHeater {
         params.mainSwitch = 'off'
         params.switch = 'off'
       } else {
-        params.mainSwitch = 'on',
+        params.mainSwitch = 'on'
         this.cacheHeat = this.cacheTemp < this.accessory.context.cacheTarget ? 'on' : 'off'
         params.switch = this.cacheHeat
       }

From b110ecaeebe345530cb421c373f57e72aeabcb8f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 12 Jun 2021 14:58:31 +0100
Subject: [PATCH 2165/3183] add cooler simulation for TH10/16

---
 config.schema.json              |   6 +-
 lib/device/simulation/cooler.js | 290 ++++++++++++++++++++++++++++++++
 lib/index.js                    |  11 ++
 lib/utils/constants.js          |   1 +
 lib/utils/lang-en.js            |   1 +
 5 files changed, 308 insertions(+), 1 deletion(-)
 create mode 100644 lib/device/simulation/cooler.js

diff --git a/config.schema.json b/config.schema.json
index 445da035..a6dfc09f 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -561,6 +561,10 @@
                   "title": "1 Heater (with Sonoff TH10 or TH16)",
                   "enum": ["thermostat"]
                 },
+                {
+                  "title": "1 Cooler (with Sonoff TH10 or TH16)",
+                  "enum": ["cooler"]
+                },
                 {
                   "title": "1 Garage Door (with Eachen GDDC5)",
                   "enum": ["garage_eachen"]
@@ -714,7 +718,7 @@
               "title": "IP Address",
               "description": "You can manually set the IP address for this device if it cannot be discovered by the plugin.",
               "condition": {
-                "functionBody": "return (model.mode !== 'wan' && model.groups[arrayIndices] && !['thermostat', 'sensor_leak'].includes(model.groups[arrayIndices].type));"
+                "functionBody": "return (model.mode !== 'wan' && model.groups[arrayIndices] && !['thermostat', 'cooler', 'sensor_leak'].includes(model.groups[arrayIndices].type));"
               }
             },
             "overrideDisabledLogging": {
diff --git a/lib/device/simulation/cooler.js b/lib/device/simulation/cooler.js
new file mode 100644
index 00000000..49640100
--- /dev/null
+++ b/lib/device/simulation/cooler.js
@@ -0,0 +1,290 @@
+/* jshint -W014, -W033, esversion: 9 */
+/* eslint-disable new-cap */
+'use strict'
+
+module.exports = class deviceCooler {
+  constructor (platform, accessory) {
+    // Set up variables from the platform
+    this.funcs = platform.funcs
+    this.hapChar = platform.api.hap.Characteristic
+    this.hapErr = platform.api.hap.HapStatusError
+    this.hapServ = platform.api.hap.Service
+    this.lang = platform.lang
+    this.log = platform.log
+    this.platform = platform
+
+    // Set up variables from the accessory
+    this.name = accessory.displayName
+    this.accessory = accessory
+
+    // Set up custom variables for this device type
+    const deviceConf = platform.thDevices[accessory.context.eweDeviceId]
+    const deviceConf2 = platform.simulations[accessory.context.eweDeviceId]
+    this.tempOffset =
+      deviceConf && deviceConf.offset ? deviceConf.offset : platform.consts.defaultValues.offset
+    this.minTarget =
+      deviceConf && deviceConf.minTarget
+        ? deviceConf.minTarget
+        : platform.consts.defaultValues.minTarget
+    this.maxTarget =
+      deviceConf && deviceConf.maxTarget
+        ? Math.max(deviceConf.maxTarget, this.minTarget + 1)
+        : platform.consts.defaultValues.maxTarget
+    this.disableDeviceLogging =
+      (deviceConf && deviceConf.overrideDisabledLogging) || deviceConf2.overrideDisabledLogging
+        ? false
+        : platform.config.disableDeviceLogging
+
+    // If the accessory has a switch service then remove it
+    if (this.accessory.getService(this.hapServ.Switch)) {
+      this.accessory.removeService(this.accessory.getService(this.hapServ.Switch))
+    }
+
+    // If the accessory has a temperature sensor service then remove it
+    if (this.accessory.getService(this.hapServ.TemperatureSensor)) {
+      this.accessory.removeService(this.accessory.getService(this.hapServ.TemperatureSensor))
+    }
+
+    // Set up the accessory with default target temp when added the first time
+    if (!this.funcs.hasProperty(this.accessory.context, 'cacheTarget')) {
+      this.accessory.context.cacheTarget = 20
+    }
+
+    // Check to make sure user has not switched from cooler to heater
+    if (this.accessory.context.cacheType !== 'cooler') {
+      // Remove and re-setup as a HeaterCooler
+      if (this.accessory.getService(this.hapServ.HeaterCooler)) {
+        this.accessory.removeService(this.accessory.getService(this.hapServ.HeaterCooler))
+      }
+      this.accessory.context.cacheType = 'cooler'
+    }
+
+    // If the accessory has a thermostat service then remove it
+    if (this.accessory.getService(this.hapServ.Thermostat)) {
+      this.accessory.removeService(this.accessory.getService(this.hapServ.Thermostat))
+    }
+
+    // Add the heater service if it doesn't already exist
+    this.service =
+      this.accessory.getService(this.hapServ.HeaterCooler) ||
+      this.accessory.addService(this.hapServ.HeaterCooler)
+
+    // The DS18B20 sensor does not provide humidity readings
+    if (this.accessory.context.sensorType === 'DS18B20') {
+      if (this.accessory.getService(this.hapServ.HumiditySensor)) {
+        this.accessory.removeService(this.accessory.getService(this.hapServ.HumiditySensor))
+      }
+    } else {
+      // Add the humidity sensor service if it doesn't already exist
+      this.humiService =
+        this.accessory.getService(this.hapServ.HumiditySensor) ||
+        this.accessory.addService(this.hapServ.HumiditySensor)
+    }
+
+    this.service.setPrimaryService()
+
+    // Set custom properties of the current temperature characteristic
+    this.service.getCharacteristic(this.hapChar.CurrentTemperature).setProps({
+      minStep: 0.1
+    })
+
+    // Add the set handler to the heater active characteristic
+    this.service.getCharacteristic(this.hapChar.Active).onSet(async value => {
+      await this.internalStateUpdate(value)
+    })
+
+    // Add the set handler to the target state characteristic
+    this.service.getCharacteristic(this.hapChar.TargetHeaterCoolerState).setProps({
+      minValue: 0,
+      maxValue: 0,
+      validValues: [0]
+    })
+
+    // Add the set handler to the target temperature characteristic
+    this.service
+      .getCharacteristic(this.hapChar.CoolingThresholdTemperature)
+      .setProps({
+        minValue: this.minTarget,
+        maxValue: this.maxTarget,
+        minStep: 0.5
+      })
+      .onSet(async value => {
+        await this.internalTargetTempUpdate(value)
+      })
+
+    // The DS18B20 sensor does not provide humidity readings
+    if (
+      this.accessory.context.sensorType !== 'DS18B20' &&
+      !this.service.testCharacteristic(this.hapChar.CurrentRelativeHumidity)
+    ) {
+      this.service.addCharacteristic(this.hapChar.CurrentRelativeHumidity)
+    }
+
+    // Pass the accessory to Fakegato to set up with Eve
+    this.accessory.eveService = new platform.eveService('custom', this.accessory, {
+      log: platform.config.debugFakegato ? this.log : () => {}
+    })
+
+    // Setting this now makes the plugin send the payload to setup as thermostat
+    setTimeout(() => {
+      this.service.setCharacteristic(
+        this.hapChar.CoolingThresholdTemperature,
+        this.accessory.context.cacheTarget
+      )
+    }, 5000)
+
+    // Output the customised options to the log if in debug mode
+    if (platform.config.debug) {
+      const opts = JSON.stringify({
+        disableDeviceLogging: this.disableDeviceLogging,
+        maxTarget: this.maxTarget,
+        minTarget: this.minTarget,
+        offset: this.tempOffset,
+        type: deviceConf2.type
+      })
+      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
+    }
+  }
+
+  async internalStateUpdate (value) {
+    try {
+      const params = { deviceType: 'temperature' }
+      if (value === 0) {
+        params.mainSwitch = 'off'
+        params.switch = 'off'
+      } else {
+        params.mainSwitch = 'on'
+        this.cacheCool = this.cacheTemp > this.accessory.context.cacheTarget ? 'on' : 'off'
+        params.switch = this.cacheCool
+      }
+      const newValue = value === 0 ? 'off' : 'on'
+      await this.platform.sendDeviceUpdate(this.accessory, params)
+      this.cacheState = newValue
+      if (!this.disableDeviceLogging) {
+        this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
+        if (value === 1) {
+          this.service.updateCharacteristic(
+            this.hapChar.CurrentHeaterCoolerState,
+            this.cacheCool === 'on' ? 3 : 1
+          )
+          this.log('[%s] %s [%s].', this.name, this.lang.curCool, this.cacheCool)
+        } else {
+          this.service.updateCharacteristic(this.hapChar.CurrentHeaterCoolerState, 0)
+        }
+      }
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, true)
+      setTimeout(() => {
+        this.service.updateCharacteristic(this.hapChar.Active, this.cacheState === 'on' ? 1 : 0)
+      }, 2000)
+      throw new this.hapErr(-70402)
+    }
+  }
+
+  async internalTargetTempUpdate (value) {
+    try {
+      if (value === this.accessory.context.cacheTarget) {
+        return
+      }
+      const params = {
+        deviceType: 'temperature',
+        mainSwitch: 'on',
+        targets: [
+          {
+            targetHigh: value.toFixed(1),
+            reaction: {
+              switch: 'on'
+            }
+          },
+          {
+            targetLow: value.toFixed(1),
+            reaction: {
+              switch: 'off'
+            }
+          }
+        ]
+      }
+      await this.platform.sendDeviceUpdate(this.accessory, params)
+      this.accessory.context.cacheTarget = value
+      this.cacheState = 'on'
+      this.accessory.context.cacheTarget = value
+      if (!this.disableDeviceLogging) {
+        this.log('[%s] %s [%s°C].', this.name, this.lang.curTarg, value)
+      }
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, true)
+      setTimeout(() => {
+        this.service.updateCharacteristic(
+          this.hapChar.CoolingThresholdTemperature,
+          this.accessory.context.cacheTarget
+        )
+      }, 2000)
+      throw new this.hapErr(-70402)
+    }
+  }
+
+  async externalUpdate (params) {
+    try {
+      if (params.mainSwitch) {
+        const newState = params.mainSwitch
+        if (this.cacheState !== newState) {
+          this.cacheState = newState
+          this.service.updateCharacteristic(this.hapChar.Active, this.cacheState === 'on' ? 1 : 0)
+          this.accessory.eveService.addEntry({
+            status: this.cacheState === 'on' ? 1 : 0
+          })
+          if (this.cacheState === 'off') {
+            this.cacheCool = 'off'
+          }
+          if (params.updateSource && !this.disableDeviceLogging && !params.switch) {
+            this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
+          }
+        }
+      }
+      if (params.switch && params.switch !== this.cacheCool) {
+        this.cacheCool = params.switch
+        this.service.updateCharacteristic(
+          this.hapChar.CurrentHeaterCoolerState,
+          this.cacheCool === 'on' ? 3 : this.cacheState === 'on' ? 1 : 0
+        )
+        if (params.updateSource && !this.disableDeviceLogging) {
+          this.log('[%s] %s [%s].', this.name, this.lang.curCool, this.cacheCool)
+        }
+      }
+      if (
+        this.funcs.hasProperty(params, 'currentTemperature') &&
+        params.currentTemperature !== 'unavailable'
+      ) {
+        if (this.cacheTempRaw !== params.currentTemperature) {
+          this.cacheTempRaw = params.currentTemperature
+          this.cacheTemp = Number(params.currentTemperature) + this.tempOffset
+          this.service.updateCharacteristic(this.hapChar.CurrentTemperature, this.cacheTemp)
+          this.accessory.eveService.addEntry({ temp: this.cacheTemp })
+          if (params.updateSource && !this.disableDeviceLogging) {
+            this.log('[%s] %s [%s°C].', this.name, this.lang.curTemp, this.cacheTemp)
+          }
+        }
+      }
+      if (
+        this.funcs.hasProperty(params, 'currentHumidity') &&
+        params.currentHumidity !== 'unavailable' &&
+        this.humiService
+      ) {
+        if (this.cacheHumiRaw !== params.currentHumidity) {
+          this.cacheHumiRaw = params.currentHumidity
+          this.cacheHumi = parseInt(params.currentHumidity)
+          this.humiService.updateCharacteristic(
+            this.hapChar.CurrentRelativeHumidity,
+            this.cacheHumi
+          )
+          this.accessory.eveService.addEntry({ humidity: this.cacheHumi })
+          if (params.updateSource && !this.disableDeviceLogging) {
+            this.log('[%s] %s [%s%].', this.name, this.lang.curHumi, this.cacheHumi)
+          }
+        }
+      }
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, false)
+    }
+  }
+}
diff --git a/lib/index.js b/lib/index.js
index c85605e0..bfd1c533 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -892,6 +892,17 @@ class eWeLinkPlatform {
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/simulation/heater'))(this, accessory)
         /************************************/
+      } else if (
+        this.simulations[device.deviceid] &&
+        this.simulations[device.deviceid].type === 'cooler' &&
+        this.consts.devices.sensorAmbient.includes(uiid)
+      ) {
+        /*************************************
+        COOLERS [TH10/16 ACCESSORY SIMULATION]
+        *************************************/
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
+        accessory.control = new (require('./device/simulation/cooler'))(this, accessory)
+        /************************************/
       } else if (this.consts.devices.sensorAmbient.includes(uiid)) {
         /***********************
         SENSOR [AMBIENT-TH10/16]
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index a491a640..43e90d68 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -123,6 +123,7 @@ module.exports = {
     ],
     groupTypes: [
       'blind',
+      'cooler',
       'door',
       'garage',
       'garage_two',
diff --git a/lib/utils/lang-en.js b/lib/utils/lang-en.js
index ee1bddab..dc38f97e 100644
--- a/lib/utils/lang-en.js
+++ b/lib/utils/lang-en.js
@@ -26,6 +26,7 @@ module.exports = {
   curBatt: 'current battery',
   curBright: 'current brightness',
   curColour: 'current colour',
+  curCool: 'current cooling',
   curCurr: 'current current',
   curHeat: 'current heating',
   curHumi: 'current humidity',

From 719c4e2f2fbe178eb6a51800e6e5a687ee38743e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 12 Jun 2021 14:59:23 +0100
Subject: [PATCH 2166/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fe8f2619..182fa34e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 ### Added
 
 - Expose a single/multi channel device as any type of sensor
+- Expose a TH10/16 device as a *Cooler* accessory type (via simulation)
 - LAN control for TH10/16 (requires firmware 3.5.0)
 - [test] LAN control polling for POWR2 devices
 

From da5166083f71b928a8ac098e3402127e2aec7429 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 12 Jun 2021 15:02:46 +0100
Subject: [PATCH 2167/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 182fa34e..0e9c7b93 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,7 +7,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 ### Added
 
 - Expose a single/multi channel device as any type of sensor
-- Expose a TH10/16 device as a *Cooler* accessory type (via simulation)
+- Expose a TH10/16 device as a _Cooler_ accessory type (via simulation)
 - LAN control for TH10/16 (requires firmware 3.5.0)
 - [test] LAN control polling for POWR2 devices
 

From 300e1fb09fff5397473cf3fa02c446396ed37b7e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 12 Jun 2021 15:03:25 +0100
Subject: [PATCH 2168/3183] 6.7.2-beta.4

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 2adab278..d029a368 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.7.2-beta.3",
+  "version": "6.7.2-beta.4",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 4398098c..b0f2ff84 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.7.2-beta.3",
+  "version": "6.7.2-beta.4",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 2b1f3d286ef368bee318bdac394fb97ce937e426 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 12 Jun 2021 15:07:38 +0100
Subject: [PATCH 2169/3183] use humidity service

---
 lib/device/simulation/cooler.js | 4 ++--
 lib/device/simulation/heater.js | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/device/simulation/cooler.js b/lib/device/simulation/cooler.js
index 49640100..81eeb472 100644
--- a/lib/device/simulation/cooler.js
+++ b/lib/device/simulation/cooler.js
@@ -115,9 +115,9 @@ module.exports = class deviceCooler {
     // The DS18B20 sensor does not provide humidity readings
     if (
       this.accessory.context.sensorType !== 'DS18B20' &&
-      !this.service.testCharacteristic(this.hapChar.CurrentRelativeHumidity)
+      !this.humiService.testCharacteristic(this.hapChar.CurrentRelativeHumidity)
     ) {
-      this.service.addCharacteristic(this.hapChar.CurrentRelativeHumidity)
+      this.humiService.addCharacteristic(this.hapChar.CurrentRelativeHumidity)
     }
 
     // Pass the accessory to Fakegato to set up with Eve
diff --git a/lib/device/simulation/heater.js b/lib/device/simulation/heater.js
index 0f559bad..0a17f566 100644
--- a/lib/device/simulation/heater.js
+++ b/lib/device/simulation/heater.js
@@ -115,9 +115,9 @@ module.exports = class deviceHeater {
     // The DS18B20 sensor does not provide humidity readings
     if (
       this.accessory.context.sensorType !== 'DS18B20' &&
-      !this.service.testCharacteristic(this.hapChar.CurrentRelativeHumidity)
+      !this.humiService.testCharacteristic(this.hapChar.CurrentRelativeHumidity)
     ) {
-      this.service.addCharacteristic(this.hapChar.CurrentRelativeHumidity)
+      this.humiService.addCharacteristic(this.hapChar.CurrentRelativeHumidity)
     }
 
     // Pass the accessory to Fakegato to set up with Eve

From 90e065d1469af72744b4131d32dfd3635b1df83e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 12 Jun 2021 15:08:30 +0100
Subject: [PATCH 2170/3183] fix humi service

---
 lib/device/simulation/cooler.js | 8 --------
 lib/device/simulation/heater.js | 8 --------
 2 files changed, 16 deletions(-)

diff --git a/lib/device/simulation/cooler.js b/lib/device/simulation/cooler.js
index 81eeb472..57383be4 100644
--- a/lib/device/simulation/cooler.js
+++ b/lib/device/simulation/cooler.js
@@ -112,14 +112,6 @@ module.exports = class deviceCooler {
         await this.internalTargetTempUpdate(value)
       })
 
-    // The DS18B20 sensor does not provide humidity readings
-    if (
-      this.accessory.context.sensorType !== 'DS18B20' &&
-      !this.humiService.testCharacteristic(this.hapChar.CurrentRelativeHumidity)
-    ) {
-      this.humiService.addCharacteristic(this.hapChar.CurrentRelativeHumidity)
-    }
-
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new platform.eveService('custom', this.accessory, {
       log: platform.config.debugFakegato ? this.log : () => {}
diff --git a/lib/device/simulation/heater.js b/lib/device/simulation/heater.js
index 0a17f566..9d91496e 100644
--- a/lib/device/simulation/heater.js
+++ b/lib/device/simulation/heater.js
@@ -112,14 +112,6 @@ module.exports = class deviceHeater {
         await this.internalTargetTempUpdate(value)
       })
 
-    // The DS18B20 sensor does not provide humidity readings
-    if (
-      this.accessory.context.sensorType !== 'DS18B20' &&
-      !this.humiService.testCharacteristic(this.hapChar.CurrentRelativeHumidity)
-    ) {
-      this.humiService.addCharacteristic(this.hapChar.CurrentRelativeHumidity)
-    }
-
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new platform.eveService('custom', this.accessory, {
       log: platform.config.debugFakegato ? this.log : () => {}

From 51af511462db0ff8df9a4d310bbd1474c4f8f6ff Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 12 Jun 2021 15:09:09 +0100
Subject: [PATCH 2171/3183] 6.7.2-beta.5

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d029a368..9384da33 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.7.2-beta.4",
+  "version": "6.7.2-beta.5",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index b0f2ff84..351a5344 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.7.2-beta.4",
+  "version": "6.7.2-beta.5",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 325f9ab68a68315b9f40f51318fe9be049fb9143 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 12 Jun 2021 15:17:03 +0100
Subject: [PATCH 2172/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0e9c7b93..07c76f4a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,9 +6,9 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 ### Added
 
-- Expose a single/multi channel device as any type of sensor
+- Expose a single/multi channel device as any type of sensor (via simulation)
 - Expose a TH10/16 device as a _Cooler_ accessory type (via simulation)
-- LAN control for TH10/16 (requires firmware 3.5.0)
+- LAN control for TH10/16 (requires firmware 3.5.0, not available when using heater/cooler simulation)
 - [test] LAN control polling for POWR2 devices
 
 ### Changes

From c255200d29f20008e887f72d920191aec3f33543 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 12 Jun 2021 15:25:59 +0100
Subject: [PATCH 2173/3183] remove any humidifier service for TH10/16

---
 lib/device/sensor-ambient.js    | 5 +++++
 lib/device/simulation/cooler.js | 5 +++++
 lib/device/simulation/heater.js | 5 +++++
 3 files changed, 15 insertions(+)

diff --git a/lib/device/sensor-ambient.js b/lib/device/sensor-ambient.js
index 892f13b1..a6823654 100644
--- a/lib/device/sensor-ambient.js
+++ b/lib/device/sensor-ambient.js
@@ -37,6 +37,11 @@ module.exports = class deviceSensorAmbient {
       this.accessory.removeService(this.accessory.getService(this.hapServ.HeaterCooler))
     }
 
+    // If the accessory has a humidifier service then remove it
+    if (this.accessory.getService(this.hapServ.HumidifierDehumidifier)) {
+      this.accessory.removeService(this.accessory.getService(this.hapServ.HumidifierDehumidifier))
+    }
+
     // The user can choose to hide the switch service if they desire
     if (this.hideSwitch) {
       // User has hidden the switch service so remove it if it exists
diff --git a/lib/device/simulation/cooler.js b/lib/device/simulation/cooler.js
index 57383be4..27b50451 100644
--- a/lib/device/simulation/cooler.js
+++ b/lib/device/simulation/cooler.js
@@ -64,6 +64,11 @@ module.exports = class deviceCooler {
       this.accessory.removeService(this.accessory.getService(this.hapServ.Thermostat))
     }
 
+    // If the accessory has a humidifier service then remove it
+    if (this.accessory.getService(this.hapServ.HumidifierDehumidifier)) {
+      this.accessory.removeService(this.accessory.getService(this.hapServ.HumidifierDehumidifier))
+    }
+
     // Add the heater service if it doesn't already exist
     this.service =
       this.accessory.getService(this.hapServ.HeaterCooler) ||
diff --git a/lib/device/simulation/heater.js b/lib/device/simulation/heater.js
index 9d91496e..ddfbc365 100644
--- a/lib/device/simulation/heater.js
+++ b/lib/device/simulation/heater.js
@@ -64,6 +64,11 @@ module.exports = class deviceHeater {
       this.accessory.removeService(this.accessory.getService(this.hapServ.Thermostat))
     }
 
+    // If the accessory has a humidifier service then remove it
+    if (this.accessory.getService(this.hapServ.HumidifierDehumidifier)) {
+      this.accessory.removeService(this.accessory.getService(this.hapServ.HumidifierDehumidifier))
+    }
+
     // Add the heater service if it doesn't already exist
     this.service =
       this.accessory.getService(this.hapServ.HeaterCooler) ||

From 9af55b92db07a6d80c46dfbc410cd679170c6b12 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 12 Jun 2021 15:32:17 +0100
Subject: [PATCH 2174/3183] base for humidifier and dehumidifier

---
 config.schema.json     | 14 +++++++++++---
 lib/index.js           | 22 ++++++++++++++++++++++
 lib/utils/constants.js |  2 ++
 lib/utils/lang-en.js   |  2 ++
 4 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index a6dfc09f..356cf5ef 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -348,14 +348,14 @@
             "minTarget": {
               "type": "number",
               "title": "Minimum Target Temperature",
-              "description": "Minimum target temperature for TH10/16 heater simulation to show in HomeKit apps. Must be 0 or more.",
+              "description": "Minimum target temperature/humidity for TH10/16 heater/cooler/humidifer/dehumidifier simulation to show in HomeKit apps. Must be 0 or more.",
               "placeholder": 10,
               "minimum": 0
             },
             "maxTarget": {
               "type": "number",
               "title": "Maximum Target Temperature",
-              "description": "Maximum target temperature for TH10/16 heater simulation to show in HomeKit apps. Must be 1 or more, and greater than the minimum value set above.",
+              "description": "Maximum target temperature/humidity for TH10/16 heater/cooler/humidifer/dehumidifier simulation to show in HomeKit apps. Must be 1 or more, and greater than the minimum value set above.",
               "placeholder": 30,
               "minimum": 1
             },
@@ -565,6 +565,14 @@
                   "title": "1 Cooler (with Sonoff TH10 or TH16)",
                   "enum": ["cooler"]
                 },
+                {
+                  "title": "1 Humidifier (with Sonoff TH10 or TH16)",
+                  "enum": ["humidifier"]
+                },
+                {
+                  "title": "1 Dehumidifier (with Sonoff TH10 or TH16)",
+                  "enum": ["dehumidifier"]
+                },
                 {
                   "title": "1 Garage Door (with Eachen GDDC5)",
                   "enum": ["garage_eachen"]
@@ -718,7 +726,7 @@
               "title": "IP Address",
               "description": "You can manually set the IP address for this device if it cannot be discovered by the plugin.",
               "condition": {
-                "functionBody": "return (model.mode !== 'wan' && model.groups[arrayIndices] && !['thermostat', 'cooler', 'sensor_leak'].includes(model.groups[arrayIndices].type));"
+                "functionBody": "return (model.mode !== 'wan' && model.groups[arrayIndices] && !['thermostat', 'cooler', 'humidifier', 'dehumidifier', 'sensor_leak'].includes(model.groups[arrayIndices].type));"
               }
             },
             "overrideDisabledLogging": {
diff --git a/lib/index.js b/lib/index.js
index bfd1c533..269dfd9c 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -903,6 +903,28 @@ class eWeLinkPlatform {
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/simulation/cooler'))(this, accessory)
         /************************************/
+      } else if (
+        this.simulations[device.deviceid] &&
+        this.simulations[device.deviceid].type === 'humidifier' &&
+        this.consts.devices.sensorAmbient.includes(uiid)
+      ) {
+        /*****************************************
+        HUMIDIFIERS [TH10/16 ACCESSORY SIMULATION]
+        *****************************************/
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
+        accessory.control = new (require('./device/simulation/humidifier'))(this, accessory)
+        /*****************************************/
+      } else if (
+        this.simulations[device.deviceid] &&
+        this.simulations[device.deviceid].type === 'dehumidifier' &&
+        this.consts.devices.sensorAmbient.includes(uiid)
+      ) {
+        /*******************************************
+        DEHUMIDIFIERS [TH10/16 ACCESSORY SIMULATION]
+        *******************************************/
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
+        accessory.control = new (require('./device/simulation/dehumidifier'))(this, accessory)
+        /*******************************************/
       } else if (this.consts.devices.sensorAmbient.includes(uiid)) {
         /***********************
         SENSOR [AMBIENT-TH10/16]
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 43e90d68..1c063a4f 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -124,11 +124,13 @@ module.exports = {
     groupTypes: [
       'blind',
       'cooler',
+      'dehumidifier',
       'door',
       'garage',
       'garage_two',
       'garage_four',
       'garage_eachen',
+      'humidifier',
       'lock',
       'sensor',
       'sensor_leak',
diff --git a/lib/utils/lang-en.js b/lib/utils/lang-en.js
index dc38f97e..889ce507 100644
--- a/lib/utils/lang-en.js
+++ b/lib/utils/lang-en.js
@@ -28,8 +28,10 @@ module.exports = {
   curColour: 'current colour',
   curCool: 'current cooling',
   curCurr: 'current current',
+  curDehumid: 'current dehumidifying',
   curHeat: 'current heating',
   curHumi: 'current humidity',
+  curHumid: 'current humidifying',
   curLight: 'current light',
   curMode: 'current mode',
   curPos: 'current position',

From 1e30687955171ab2ed7fc3b1d79c0737be5d4b2c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 13 Jun 2021 09:40:19 +0100
Subject: [PATCH 2175/3183] reorder available simulations

---
 config.schema.json | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 356cf5ef..af0c977e 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -348,14 +348,14 @@
             "minTarget": {
               "type": "number",
               "title": "Minimum Target Temperature",
-              "description": "Minimum target temperature/humidity for TH10/16 heater/cooler/humidifer/dehumidifier simulation to show in HomeKit apps. Must be 0 or more.",
+              "description": "Minimum target temperature for TH10/16 heater/cooler simulation to show in HomeKit apps. Must be 0 or more.",
               "placeholder": 10,
               "minimum": 0
             },
             "maxTarget": {
               "type": "number",
               "title": "Maximum Target Temperature",
-              "description": "Maximum target temperature/humidity for TH10/16 heater/cooler/humidifer/dehumidifier simulation to show in HomeKit apps. Must be 1 or more, and greater than the minimum value set above.",
+              "description": "Maximum target temperature for TH10/16 heater/cooler simulation to show in HomeKit apps. Must be 1 or more, and greater than the minimum value set above.",
               "placeholder": 30,
               "minimum": 1
             },
@@ -558,29 +558,13 @@
               "description": "The new type for this device.",
               "oneOf": [
                 {
-                  "title": "1 Heater (with Sonoff TH10 or TH16)",
-                  "enum": ["thermostat"]
-                },
-                {
-                  "title": "1 Cooler (with Sonoff TH10 or TH16)",
-                  "enum": ["cooler"]
-                },
-                {
-                  "title": "1 Humidifier (with Sonoff TH10 or TH16)",
-                  "enum": ["humidifier"]
-                },
-                {
-                  "title": "1 Dehumidifier (with Sonoff TH10 or TH16)",
-                  "enum": ["dehumidifier"]
+                  "title": "1 Garage Door (with single or multi channel device)",
+                  "enum": ["garage"]
                 },
                 {
                   "title": "1 Garage Door (with Eachen GDDC5)",
                   "enum": ["garage_eachen"]
                 },
-                {
-                  "title": "1 Garage Door (with single or multi channel device)",
-                  "enum": ["garage"]
-                },
                 {
                   "title": "2 Garage Doors (with multi channel device)",
                   "enum": ["garage_two"]
@@ -633,6 +617,22 @@
                   "title": "1 Sensor (with single or multi channel device)",
                   "enum": ["sensor"]
                 },
+                {
+                  "title": "1 Heater (with Sonoff TH10 or TH16)",
+                  "enum": ["thermostat"]
+                },
+                {
+                  "title": "1 Cooler (with Sonoff TH10 or TH16)",
+                  "enum": ["cooler"]
+                },
+                {
+                  "title": "1 Humidifier (with Sonoff TH10 or TH16)",
+                  "enum": ["humidifier"]
+                },
+                {
+                  "title": "1 Dehumidifier (with Sonoff TH10 or TH16)",
+                  "enum": ["dehumidifier"]
+                },
                 {
                   "title": "1 Leak Sensor (with Sonoff DW2)",
                   "enum": ["sensor_leak"]

From c293f8f57bb43671007c8f403abe9fb198975521 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 13 Jun 2021 09:41:07 +0100
Subject: [PATCH 2176/3183] humidifier dehumidifier for TH10/16

---
 lib/device/simulation/cooler.js       |   6 +-
 lib/device/simulation/dehumidifier.js | 266 ++++++++++++++++++++++++++
 lib/device/simulation/heater.js       |   6 +-
 lib/device/simulation/humidifier.js   | 266 ++++++++++++++++++++++++++
 lib/index.js                          |  12 ++
 lib/utils/lang-en.js                  |   1 +
 6 files changed, 555 insertions(+), 2 deletions(-)
 create mode 100644 lib/device/simulation/dehumidifier.js
 create mode 100644 lib/device/simulation/humidifier.js

diff --git a/lib/device/simulation/cooler.js b/lib/device/simulation/cooler.js
index 27b50451..7f10d9ab 100644
--- a/lib/device/simulation/cooler.js
+++ b/lib/device/simulation/cooler.js
@@ -69,6 +69,11 @@ module.exports = class deviceCooler {
       this.accessory.removeService(this.accessory.getService(this.hapServ.HumidifierDehumidifier))
     }
 
+    // If the accessory has a temperature sensor service then remove it
+    if (this.accessory.getService(this.hapServ.TemperatureSensor)) {
+      this.accessory.removeService(this.accessory.getService(this.hapServ.TemperatureSensor))
+    }
+
     // Add the heater service if it doesn't already exist
     this.service =
       this.accessory.getService(this.hapServ.HeaterCooler) ||
@@ -204,7 +209,6 @@ module.exports = class deviceCooler {
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.accessory.context.cacheTarget = value
       this.cacheState = 'on'
-      this.accessory.context.cacheTarget = value
       if (!this.disableDeviceLogging) {
         this.log('[%s] %s [%s°C].', this.name, this.lang.curTarg, value)
       }
diff --git a/lib/device/simulation/dehumidifier.js b/lib/device/simulation/dehumidifier.js
new file mode 100644
index 00000000..b4c2e7a4
--- /dev/null
+++ b/lib/device/simulation/dehumidifier.js
@@ -0,0 +1,266 @@
+/* jshint -W014, -W033, esversion: 9 */
+/* eslint-disable new-cap */
+'use strict'
+
+module.exports = class deviceHumidifier {
+  constructor (platform, accessory) {
+    // Set up variables from the platform
+    this.funcs = platform.funcs
+    this.hapChar = platform.api.hap.Characteristic
+    this.hapErr = platform.api.hap.HapStatusError
+    this.hapServ = platform.api.hap.Service
+    this.lang = platform.lang
+    this.log = platform.log
+    this.platform = platform
+
+    // Set up variables from the accessory
+    this.name = accessory.displayName
+    this.accessory = accessory
+
+    // Set up custom variables for this device type
+    const deviceConf = platform.thDevices[accessory.context.eweDeviceId]
+    const deviceConf2 = platform.simulations[accessory.context.eweDeviceId]
+    this.tempOffset =
+      deviceConf && deviceConf.offset ? deviceConf.offset : platform.consts.defaultValues.offset
+    this.disableDeviceLogging =
+      (deviceConf && deviceConf.overrideDisabledLogging) || deviceConf2.overrideDisabledLogging
+        ? false
+        : platform.config.disableDeviceLogging
+
+    // If the accessory has a switch service then remove it
+    if (this.accessory.getService(this.hapServ.Switch)) {
+      this.accessory.removeService(this.accessory.getService(this.hapServ.Switch))
+    }
+
+    // Set up the accessory with default target temp when added the first time
+    if (!this.funcs.hasProperty(this.accessory.context, 'cacheTarget')) {
+      this.accessory.context.cacheTarget = 50
+    }
+
+    // Check to make sure user has not switched from dehumidifier to humidifier
+    if (this.accessory.context.cacheType !== 'dehumidifier') {
+      // Remove and re-setup as a HeaterCooler
+      if (this.accessory.getService(this.hapServ.HumidifierDehumidifier)) {
+        this.accessory.removeService(this.accessory.getService(this.hapServ.HumidifierDehumidifier))
+      }
+      this.accessory.context.cacheType = 'dehumidifier'
+    }
+
+    // If the accessory has a thermostat service then remove it
+    if (this.accessory.getService(this.hapServ.Thermostat)) {
+      this.accessory.removeService(this.accessory.getService(this.hapServ.Thermostat))
+    }
+
+    // If the accessory has a heater service then remove it
+    if (this.accessory.getService(this.hapServ.HeaterCooler)) {
+      this.accessory.removeService(this.accessory.getService(this.hapServ.HeaterCooler))
+    }
+
+    // If the accessory has a humidity sensor service then remove it
+    if (this.accessory.getService(this.hapServ.HumiditySensor)) {
+      this.accessory.removeService(this.accessory.getService(this.hapServ.HumiditySensor))
+    }
+
+    // Add the humidifier service if it doesn't already exist
+    this.service =
+      this.accessory.getService(this.hapServ.HumidifierDehumidifier) ||
+      this.accessory.addService(this.hapServ.HumidifierDehumidifier)
+
+    // Add the temperature service if it doesn't already exist
+    this.tempService =
+      this.accessory.getService(this.hapServ.TemperatureSensor) ||
+      this.accessory.addService(this.hapServ.TemperatureSensor)
+
+    this.service.setPrimaryService()
+
+    // Add the set handler to the heater active characteristic
+    this.service.getCharacteristic(this.hapChar.Active).onSet(async value => {
+      await this.internalStateUpdate(value)
+    })
+
+    // Add the set handler to the target state characteristic
+    this.service
+      .getCharacteristic(this.hapChar.TargetHumidifierDehumidifierState)
+      .setProps({
+        minValue: 2,
+        maxValue: 2,
+        validValues: [2]
+      })
+      .updateValue(2)
+
+    // Add the set handler to the target temperature characteristic
+    this.service
+      .getCharacteristic(this.hapChar.RelativeHumidityDehumidifierThreshold)
+      .onSet(async value => {
+        await this.internalTargetHumidityUpdate(value)
+      })
+
+    // Pass the accessory to Fakegato to set up with Eve
+    this.accessory.eveService = new platform.eveService('custom', this.accessory, {
+      log: platform.config.debugFakegato ? this.log : () => {}
+    })
+
+    // Setting this now makes the plugin send the payload to setup as thermostat
+    setTimeout(() => {
+      this.service.setCharacteristic(
+        this.hapChar.RelativeHumidityDehumidifierThreshold,
+        this.accessory.context.cacheTarget
+      )
+    }, 5000)
+
+    // Output the customised options to the log if in debug mode
+    if (platform.config.debug) {
+      const opts = JSON.stringify({
+        disableDeviceLogging: this.disableDeviceLogging,
+        offset: this.tempOffset,
+        type: deviceConf2.type
+      })
+      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
+    }
+  }
+
+  async internalStateUpdate (value) {
+    try {
+      const params = { deviceType: 'humidity' }
+      if (value === 0) {
+        params.mainSwitch = 'off'
+        params.switch = 'off'
+      } else {
+        params.mainSwitch = 'on'
+        this.cacheHumid = this.cacheHumi > this.accessory.context.cacheTarget ? 'on' : 'off'
+        params.switch = this.cacheHumid
+      }
+      const newValue = value === 0 ? 'off' : 'on'
+      await this.platform.sendDeviceUpdate(this.accessory, params)
+      this.cacheState = newValue
+      if (!this.disableDeviceLogging) {
+        this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
+        if (value === 1) {
+          this.service.updateCharacteristic(
+            this.hapChar.CurrentHumidifierDehumidifierState,
+            this.cacheHumid === 'on' ? 3 : 1
+          )
+          this.log('[%s] %s [%s].', this.name, this.lang.curDehumid, this.cacheHumid)
+        } else {
+          this.service.updateCharacteristic(this.hapChar.CurrentHumidifierDehumidifierState, 0)
+        }
+      }
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, true)
+      setTimeout(() => {
+        this.service.updateCharacteristic(this.hapChar.Active, this.cacheState === 'on' ? 1 : 0)
+      }, 2000)
+      throw new this.hapErr(-70402)
+    }
+  }
+
+  async internalTargetHumidityUpdate (value) {
+    try {
+      if (value === this.accessory.context.cacheTarget) {
+        return
+      }
+      const updateKey = Math.random()
+        .toString(36)
+        .substr(2, 8)
+      this.updateKey = updateKey
+      await this.funcs.sleep(500)
+      if (updateKey !== this.updateKey) {
+        return
+      }
+      const params = {
+        deviceType: 'humidity',
+        mainSwitch: 'on',
+        targets: [
+          {
+            targetHigh: value.toString(),
+            reaction: {
+              switch: 'on'
+            }
+          },
+          {
+            targetLow: value.toString(),
+            reaction: {
+              switch: 'off'
+            }
+          }
+        ]
+      }
+      await this.platform.sendDeviceUpdate(this.accessory, params)
+      this.accessory.context.cacheTarget = value
+      this.cacheState = 'on'
+      if (!this.disableDeviceLogging) {
+        this.log('[%s] %s [%s%].', this.name, this.lang.curTarg, value)
+      }
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, true)
+      setTimeout(() => {
+        this.service.updateCharacteristic(
+          this.hapChar.RelativeHumidityDehumidifierThreshold,
+          this.accessory.context.cacheTarget
+        )
+      }, 2000)
+      throw new this.hapErr(-70402)
+    }
+  }
+
+  async externalUpdate (params) {
+    try {
+      if (params.mainSwitch) {
+        const newState = params.mainSwitch
+        if (this.cacheState !== newState) {
+          this.cacheState = newState
+          this.service.updateCharacteristic(this.hapChar.Active, this.cacheState === 'on' ? 1 : 0)
+          this.accessory.eveService.addEntry({
+            status: this.cacheState === 'on' ? 1 : 0
+          })
+          if (this.cacheState === 'off') {
+            this.cacheHumid = 'off'
+          }
+          if (params.updateSource && !this.disableDeviceLogging && !params.switch) {
+            this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
+          }
+        }
+      }
+      if (params.switch && params.switch !== this.cacheHumid) {
+        this.cacheHumid = params.switch
+        this.service.updateCharacteristic(
+          this.hapChar.CurrentHumidifierDehumidifierState,
+          this.cacheHumid === 'on' ? 3 : this.cacheState === 'on' ? 1 : 0
+        )
+        if (params.updateSource && !this.disableDeviceLogging) {
+          this.log('[%s] %s [%s].', this.name, this.lang.curDehumid, this.cacheHumid)
+        }
+      }
+      if (
+        this.funcs.hasProperty(params, 'currentTemperature') &&
+        params.currentTemperature !== 'unavailable'
+      ) {
+        if (this.cacheTempRaw !== params.currentTemperature) {
+          this.cacheTempRaw = params.currentTemperature
+          this.cacheTemp = Number(params.currentTemperature) + this.tempOffset
+          this.tempService.updateCharacteristic(this.hapChar.CurrentTemperature, this.cacheTemp)
+          this.accessory.eveService.addEntry({ temp: this.cacheTemp })
+          if (params.updateSource && !this.disableDeviceLogging) {
+            this.log('[%s] %s [%s°C].', this.name, this.lang.curTemp, this.cacheTemp)
+          }
+        }
+      }
+      if (
+        this.funcs.hasProperty(params, 'currentHumidity') &&
+        params.currentHumidity !== 'unavailable'
+      ) {
+        if (this.cacheHumiRaw !== params.currentHumidity) {
+          this.cacheHumiRaw = params.currentHumidity
+          this.cacheHumi = parseInt(params.currentHumidity)
+          this.service.updateCharacteristic(this.hapChar.CurrentRelativeHumidity, this.cacheHumi)
+          this.accessory.eveService.addEntry({ humidity: this.cacheHumi })
+          if (params.updateSource && !this.disableDeviceLogging) {
+            this.log('[%s] %s [%s%].', this.name, this.lang.curHumi, this.cacheHumi)
+          }
+        }
+      }
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, false)
+    }
+  }
+}
diff --git a/lib/device/simulation/heater.js b/lib/device/simulation/heater.js
index ddfbc365..b213680a 100644
--- a/lib/device/simulation/heater.js
+++ b/lib/device/simulation/heater.js
@@ -69,6 +69,11 @@ module.exports = class deviceHeater {
       this.accessory.removeService(this.accessory.getService(this.hapServ.HumidifierDehumidifier))
     }
 
+    // If the accessory has a temperature sensor service then remove it
+    if (this.accessory.getService(this.hapServ.TemperatureSensor)) {
+      this.accessory.removeService(this.accessory.getService(this.hapServ.TemperatureSensor))
+    }
+
     // Add the heater service if it doesn't already exist
     this.service =
       this.accessory.getService(this.hapServ.HeaterCooler) ||
@@ -204,7 +209,6 @@ module.exports = class deviceHeater {
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.accessory.context.cacheTarget = value
       this.cacheState = 'on'
-      this.accessory.context.cacheTarget = value
       if (!this.disableDeviceLogging) {
         this.log('[%s] %s [%s°C].', this.name, this.lang.curTarg, value)
       }
diff --git a/lib/device/simulation/humidifier.js b/lib/device/simulation/humidifier.js
new file mode 100644
index 00000000..e64d8f1d
--- /dev/null
+++ b/lib/device/simulation/humidifier.js
@@ -0,0 +1,266 @@
+/* jshint -W014, -W033, esversion: 9 */
+/* eslint-disable new-cap */
+'use strict'
+
+module.exports = class deviceHumidifier {
+  constructor (platform, accessory) {
+    // Set up variables from the platform
+    this.funcs = platform.funcs
+    this.hapChar = platform.api.hap.Characteristic
+    this.hapErr = platform.api.hap.HapStatusError
+    this.hapServ = platform.api.hap.Service
+    this.lang = platform.lang
+    this.log = platform.log
+    this.platform = platform
+
+    // Set up variables from the accessory
+    this.name = accessory.displayName
+    this.accessory = accessory
+
+    // Set up custom variables for this device type
+    const deviceConf = platform.thDevices[accessory.context.eweDeviceId]
+    const deviceConf2 = platform.simulations[accessory.context.eweDeviceId]
+    this.tempOffset =
+      deviceConf && deviceConf.offset ? deviceConf.offset : platform.consts.defaultValues.offset
+    this.disableDeviceLogging =
+      (deviceConf && deviceConf.overrideDisabledLogging) || deviceConf2.overrideDisabledLogging
+        ? false
+        : platform.config.disableDeviceLogging
+
+    // If the accessory has a switch service then remove it
+    if (this.accessory.getService(this.hapServ.Switch)) {
+      this.accessory.removeService(this.accessory.getService(this.hapServ.Switch))
+    }
+
+    // Set up the accessory with default target temp when added the first time
+    if (!this.funcs.hasProperty(this.accessory.context, 'cacheTarget')) {
+      this.accessory.context.cacheTarget = 50
+    }
+
+    // Check to make sure user has not switched from dehumidifier to humidifier
+    if (this.accessory.context.cacheType !== 'humidifier') {
+      // Remove and re-setup as a HeaterCooler
+      if (this.accessory.getService(this.hapServ.HumidifierDehumidifier)) {
+        this.accessory.removeService(this.accessory.getService(this.hapServ.HumidifierDehumidifier))
+      }
+      this.accessory.context.cacheType = 'humidifier'
+    }
+
+    // If the accessory has a thermostat service then remove it
+    if (this.accessory.getService(this.hapServ.Thermostat)) {
+      this.accessory.removeService(this.accessory.getService(this.hapServ.Thermostat))
+    }
+
+    // If the accessory has a heater service then remove it
+    if (this.accessory.getService(this.hapServ.HeaterCooler)) {
+      this.accessory.removeService(this.accessory.getService(this.hapServ.HeaterCooler))
+    }
+
+    // If the accessory has a humidity sensor service then remove it
+    if (this.accessory.getService(this.hapServ.HumiditySensor)) {
+      this.accessory.removeService(this.accessory.getService(this.hapServ.HumiditySensor))
+    }
+
+    // Add the humidifier service if it doesn't already exist
+    this.service =
+      this.accessory.getService(this.hapServ.HumidifierDehumidifier) ||
+      this.accessory.addService(this.hapServ.HumidifierDehumidifier)
+
+    // Add the temperature service if it doesn't already exist
+    this.tempService =
+      this.accessory.getService(this.hapServ.TemperatureSensor) ||
+      this.accessory.addService(this.hapServ.TemperatureSensor)
+
+    this.service.setPrimaryService()
+
+    // Add the set handler to the heater active characteristic
+    this.service.getCharacteristic(this.hapChar.Active).onSet(async value => {
+      await this.internalStateUpdate(value)
+    })
+
+    // Add the set handler to the target state characteristic
+    this.service
+      .getCharacteristic(this.hapChar.TargetHumidifierDehumidifierState)
+      .setProps({
+        minValue: 1,
+        maxValue: 1,
+        validValues: [1]
+      })
+      .updateValue(1)
+
+    // Add the set handler to the target temperature characteristic
+    this.service
+      .getCharacteristic(this.hapChar.RelativeHumidityHumidifierThreshold)
+      .onSet(async value => {
+        await this.internalTargetHumidityUpdate(value)
+      })
+
+    // Pass the accessory to Fakegato to set up with Eve
+    this.accessory.eveService = new platform.eveService('custom', this.accessory, {
+      log: platform.config.debugFakegato ? this.log : () => {}
+    })
+
+    // Setting this now makes the plugin send the payload to setup as thermostat
+    setTimeout(() => {
+      this.service.setCharacteristic(
+        this.hapChar.RelativeHumidityHumidifierThreshold,
+        this.accessory.context.cacheTarget
+      )
+    }, 5000)
+
+    // Output the customised options to the log if in debug mode
+    if (platform.config.debug) {
+      const opts = JSON.stringify({
+        disableDeviceLogging: this.disableDeviceLogging,
+        offset: this.tempOffset,
+        type: deviceConf2.type
+      })
+      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
+    }
+  }
+
+  async internalStateUpdate (value) {
+    try {
+      const params = { deviceType: 'humidity' }
+      if (value === 0) {
+        params.mainSwitch = 'off'
+        params.switch = 'off'
+      } else {
+        params.mainSwitch = 'on'
+        this.cacheHumid = this.cacheHumi < this.accessory.context.cacheTarget ? 'on' : 'off'
+        params.switch = this.cacheHumid
+      }
+      const newValue = value === 0 ? 'off' : 'on'
+      await this.platform.sendDeviceUpdate(this.accessory, params)
+      this.cacheState = newValue
+      if (!this.disableDeviceLogging) {
+        this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
+        if (value === 1) {
+          this.service.updateCharacteristic(
+            this.hapChar.CurrentHumidifierDehumidifierState,
+            this.cacheHumid === 'on' ? 2 : 1
+          )
+          this.log('[%s] %s [%s].', this.name, this.lang.curHumid, this.cacheHumid)
+        } else {
+          this.service.updateCharacteristic(this.hapChar.CurrentHumidifierDehumidifierState, 0)
+        }
+      }
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, true)
+      setTimeout(() => {
+        this.service.updateCharacteristic(this.hapChar.Active, this.cacheState === 'on' ? 1 : 0)
+      }, 2000)
+      throw new this.hapErr(-70402)
+    }
+  }
+
+  async internalTargetHumidityUpdate (value) {
+    try {
+      if (value === this.accessory.context.cacheTarget) {
+        return
+      }
+      const updateKey = Math.random()
+        .toString(36)
+        .substr(2, 8)
+      this.updateKey = updateKey
+      await this.funcs.sleep(500)
+      if (updateKey !== this.updateKey) {
+        return
+      }
+      const params = {
+        deviceType: 'humidity',
+        mainSwitch: 'on',
+        targets: [
+          {
+            targetHigh: value.toString(),
+            reaction: {
+              switch: 'off'
+            }
+          },
+          {
+            targetLow: value.toString(),
+            reaction: {
+              switch: 'on'
+            }
+          }
+        ]
+      }
+      await this.platform.sendDeviceUpdate(this.accessory, params)
+      this.accessory.context.cacheTarget = value
+      this.cacheState = 'on'
+      if (!this.disableDeviceLogging) {
+        this.log('[%s] %s [%s%].', this.name, this.lang.curTarg, value)
+      }
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, true)
+      setTimeout(() => {
+        this.service.updateCharacteristic(
+          this.hapChar.RelativeHumidityHumidifierThreshold,
+          this.accessory.context.cacheTarget
+        )
+      }, 2000)
+      throw new this.hapErr(-70402)
+    }
+  }
+
+  async externalUpdate (params) {
+    try {
+      if (params.mainSwitch) {
+        const newState = params.mainSwitch
+        if (this.cacheState !== newState) {
+          this.cacheState = newState
+          this.service.updateCharacteristic(this.hapChar.Active, this.cacheState === 'on' ? 1 : 0)
+          this.accessory.eveService.addEntry({
+            status: this.cacheState === 'on' ? 1 : 0
+          })
+          if (this.cacheState === 'off') {
+            this.cacheHumid = 'off'
+          }
+          if (params.updateSource && !this.disableDeviceLogging && !params.switch) {
+            this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
+          }
+        }
+      }
+      if (params.switch && params.switch !== this.cacheHumid) {
+        this.cacheHumid = params.switch
+        this.service.updateCharacteristic(
+          this.hapChar.CurrentHumidifierDehumidifierState,
+          this.cacheHumid === 'on' ? 2 : this.cacheState === 'on' ? 1 : 0
+        )
+        if (params.updateSource && !this.disableDeviceLogging) {
+          this.log('[%s] %s [%s].', this.name, this.lang.curHumid, this.cacheHumid)
+        }
+      }
+      if (
+        this.funcs.hasProperty(params, 'currentTemperature') &&
+        params.currentTemperature !== 'unavailable'
+      ) {
+        if (this.cacheTempRaw !== params.currentTemperature) {
+          this.cacheTempRaw = params.currentTemperature
+          this.cacheTemp = Number(params.currentTemperature) + this.tempOffset
+          this.tempService.updateCharacteristic(this.hapChar.CurrentTemperature, this.cacheTemp)
+          this.accessory.eveService.addEntry({ temp: this.cacheTemp })
+          if (params.updateSource && !this.disableDeviceLogging) {
+            this.log('[%s] %s [%s°C].', this.name, this.lang.curTemp, this.cacheTemp)
+          }
+        }
+      }
+      if (
+        this.funcs.hasProperty(params, 'currentHumidity') &&
+        params.currentHumidity !== 'unavailable'
+      ) {
+        if (this.cacheHumiRaw !== params.currentHumidity) {
+          this.cacheHumiRaw = params.currentHumidity
+          this.cacheHumi = parseInt(params.currentHumidity)
+          this.service.updateCharacteristic(this.hapChar.CurrentRelativeHumidity, this.cacheHumi)
+          this.accessory.eveService.addEntry({ humidity: this.cacheHumi })
+          if (params.updateSource && !this.disableDeviceLogging) {
+            this.log('[%s] %s [%s%].', this.name, this.lang.curHumi, this.cacheHumi)
+          }
+        }
+      }
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, false)
+    }
+  }
+}
diff --git a/lib/index.js b/lib/index.js
index 269dfd9c..2f210691 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -890,6 +890,7 @@ class eWeLinkPlatform {
         HEATERS [TH10/16 ACCESSORY SIMULATION]
         *************************************/
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
+        accessory.context.sensorType = device.params.sensorType
         accessory.control = new (require('./device/simulation/heater'))(this, accessory)
         /************************************/
       } else if (
@@ -901,6 +902,7 @@ class eWeLinkPlatform {
         COOLERS [TH10/16 ACCESSORY SIMULATION]
         *************************************/
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
+        accessory.context.sensorType = device.params.sensorType
         accessory.control = new (require('./device/simulation/cooler'))(this, accessory)
         /************************************/
       } else if (
@@ -912,6 +914,11 @@ class eWeLinkPlatform {
         HUMIDIFIERS [TH10/16 ACCESSORY SIMULATION]
         *****************************************/
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
+        if (device.params.sensorType === 'DS18B20') {
+          this.log.warn('[%s] %s.', accessory.displayName, this.lang.sensorErr)
+          return
+        }
+        accessory.context.sensorType = device.params.sensorType
         accessory.control = new (require('./device/simulation/humidifier'))(this, accessory)
         /*****************************************/
       } else if (
@@ -923,6 +930,11 @@ class eWeLinkPlatform {
         DEHUMIDIFIERS [TH10/16 ACCESSORY SIMULATION]
         *******************************************/
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
+        if (device.params.sensorType === 'DS18B20') {
+          this.log.warn('[%s] %s.', accessory.displayName, this.lang.sensorErr)
+          return
+        }
+        accessory.context.sensorType = device.params.sensorType
         accessory.control = new (require('./device/simulation/dehumidifier'))(this, accessory)
         /*******************************************/
       } else if (this.consts.devices.sensorAmbient.includes(uiid)) {
diff --git a/lib/utils/lang-en.js b/lib/utils/lang-en.js
index 889ce507..1a74d71a 100644
--- a/lib/utils/lang-en.js
+++ b/lib/utils/lang-en.js
@@ -105,6 +105,7 @@ module.exports = {
   rfTrigNo: 'not triggered',
   rfTrigYes: 'triggered',
   sendLogin: 'Sending HTTP login() request',
+  sensorErr: 'unsupported as de/humidifier since device does not have supported sensor',
   sensorNo: 'deactivated',
   sensorYes: 'activated',
   sonoffCamera: 'see the homebridge-ewelink wiki for details to enable the camera',

From 65eb6b7a284c917d5e8ff57c915d3e0310a6d7a9 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 13 Jun 2021 09:42:04 +0100
Subject: [PATCH 2177/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 07c76f4a..3e759bb6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,12 +8,14 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 - Expose a single/multi channel device as any type of sensor (via simulation)
 - Expose a TH10/16 device as a _Cooler_ accessory type (via simulation)
+- Expose a TH10/16 device as a _Humidifier_ accessory type (via simulation)
+- Expose a TH10/16 device as a _Dehumidfier_ accessory type (via simulation)
 - LAN control for TH10/16 (requires firmware 3.5.0, not available when using heater/cooler simulation)
 - [test] LAN control polling for POWR2 devices
 
 ### Changes
 
-- TH10/16 simulation accessory type change from thermostat to heater
+- TH10/16 simulation accessory type change from _Thermostat_ to _Heater_
 - Remove `setup` config option for simulations as device type is now automatically determined
 - Fix a logging issue for the zigbee contact sensor
 

From 29b1867b5ee32739b13fd19aa85d83721925c86d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 13 Jun 2021 09:47:20 +0100
Subject: [PATCH 2178/3183] 6.7.2-beta.6

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 9384da33..4992fcf8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.7.2-beta.5",
+  "version": "6.7.2-beta.6",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 351a5344..e83d653c 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.7.2-beta.5",
+  "version": "6.7.2-beta.6",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From c84a0ea5f86933baa987dc21a81278264256ca46 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 13 Jun 2021 12:40:29 +0100
Subject: [PATCH 2179/3183] check for switches first

---
 lib/device/simulation/garage-one.js | 16 ++++++++--------
 lib/device/simulation/lock-one.js   | 12 ++++++------
 lib/device/simulation/tap-one.js    | 16 ++++++++--------
 3 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/lib/device/simulation/garage-one.js b/lib/device/simulation/garage-one.js
index 9aba90d4..f7374aaa 100644
--- a/lib/device/simulation/garage-one.js
+++ b/lib/device/simulation/garage-one.js
@@ -164,14 +164,7 @@ module.exports = class deviceGarageOne {
       }
       const prevState = this.service.getCharacteristic(this.hapChar.CurrentDoorState).value
       const newPos = [0, 2].includes(prevState) ? 3 : 2
-      if (params.switch) {
-        if (!this.setup) {
-          this.setup = 'oneSwitch'
-        }
-        if (params.switch === 'off') {
-          return
-        }
-      } else if (params.switches) {
+      if (params.switches) {
         if (!this.setup) {
           this.setup = 'twoSwitch'
         }
@@ -181,6 +174,13 @@ module.exports = class deviceGarageOne {
         ) {
           return
         }
+      } else if (params.switch) {
+        if (!this.setup) {
+          this.setup = 'oneSwitch'
+        }
+        if (params.switch === 'off') {
+          return
+        }
       } else {
         return
       }
diff --git a/lib/device/simulation/lock-one.js b/lib/device/simulation/lock-one.js
index f6403f64..0c0c8e43 100644
--- a/lib/device/simulation/lock-one.js
+++ b/lib/device/simulation/lock-one.js
@@ -102,18 +102,18 @@ module.exports = class deviceLockOne {
       if (this.inUse) {
         return
       }
-      if (params.switch) {
+      if (params.switches) {
         if (!this.setup) {
-          this.setup = 'oneSwitch'
+          this.setup = 'twoSwitch'
         }
-        if (params.switch === 'off') {
+        if (params.switches[0].switch === 'off') {
           return
         }
-      } else if (params.switches) {
+      } else if (params.switch) {
         if (!this.setup) {
-          this.setup = 'twoSwitch'
+          this.setup = 'oneSwitch'
         }
-        if (params.switches[0].switch === 'off') {
+        if (params.switch === 'off') {
           return
         }
       } else {
diff --git a/lib/device/simulation/tap-one.js b/lib/device/simulation/tap-one.js
index 8ce34b8a..4dc851ae 100644
--- a/lib/device/simulation/tap-one.js
+++ b/lib/device/simulation/tap-one.js
@@ -90,22 +90,22 @@ module.exports = class deviceTapOne {
 
   async externalUpdate (params) {
     try {
-      if (params.switch) {
+      if (params.switches) {
         if (!this.setup) {
-          this.setup = 'oneSwitch'
+          this.setup = 'twoSwitch'
         }
-        if (params.switch === this.cacheState) {
+        if (params.switches[0].switch === this.cacheState) {
           return
         }
-        this.cacheState = params.switch
-      } else if (params.switches) {
+        this.cacheState = params.switches[0].switch
+      } else if (params.switch) {
         if (!this.setup) {
-          this.setup = 'twoSwitch'
+          this.setup = 'oneSwitch'
         }
-        if (params.switches[0].switch === this.cacheState) {
+        if (params.switch === this.cacheState) {
           return
         }
-        this.cacheState = params.switches[0].switch
+        this.cacheState = params.switch
       } else {
         return
       }

From 3915a0bd45d8a59aaac31df46b869d116903a303 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 13 Jun 2021 12:45:46 +0100
Subject: [PATCH 2180/3183] purifier simulation

---
 config.schema.json                |   4 +
 lib/device/simulation/purifier.js | 131 ++++++++++++++++++++++++++++++
 lib/index.js                      |  10 +++
 lib/utils/constants.js            |   1 +
 lib/utils/lang-en.js              |   1 +
 5 files changed, 147 insertions(+)
 create mode 100644 lib/device/simulation/purifier.js

diff --git a/config.schema.json b/config.schema.json
index af0c977e..d26d6aa7 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -617,6 +617,10 @@
                   "title": "1 Sensor (with single or multi channel device)",
                   "enum": ["sensor"]
                 },
+                {
+                  "title": "1 Air Purifier (with single or multi channel device)",
+                  "enum": ["purifier"]
+                },
                 {
                   "title": "1 Heater (with Sonoff TH10 or TH16)",
                   "enum": ["thermostat"]
diff --git a/lib/device/simulation/purifier.js b/lib/device/simulation/purifier.js
new file mode 100644
index 00000000..d420f169
--- /dev/null
+++ b/lib/device/simulation/purifier.js
@@ -0,0 +1,131 @@
+/* jshint -W014, -W033, esversion: 9 */
+/* eslint-disable new-cap */
+'use strict'
+
+module.exports = class devicePurifier {
+  constructor (platform, accessory) {
+    // Set up variables from the platform
+    this.funcs = platform.funcs
+    this.hapChar = platform.api.hap.Characteristic
+    this.hapErr = platform.api.hap.HapStatusError
+    this.hapServ = platform.api.hap.Service
+    this.lang = platform.lang
+    this.log = platform.log
+    this.platform = platform
+
+    // Set up variables from the accessory
+    this.name = accessory.displayName
+    this.accessory = accessory
+
+    // Set up custom variables for this device type
+    const deviceConf = platform.simulations[accessory.context.eweDeviceId]
+    this.disableDeviceLogging = deviceConf.overrideDisabledLogging
+      ? false
+      : platform.config.disableDeviceLogging
+
+    // If the accessory has a switch service then remove it
+    if (this.accessory.getService(this.hapServ.Switch)) {
+      this.accessory.removeService(this.accessory.getService(this.hapServ.Switch))
+    }
+
+    // If the accessory has an outlet service then remove it
+    if (this.accessory.getService(this.hapServ.Outlet)) {
+      this.accessory.removeService(this.accessory.getService(this.hapServ.Outlet))
+    }
+
+    // Add the air purifier service if it doesn't already exist
+    this.service =
+      this.accessory.getService(this.hapServ.AirPurifier) ||
+      this.accessory.addService(this.hapServ.AirPurifier)
+
+    // Add the set handler to the heater active characteristic
+    this.service.getCharacteristic(this.hapChar.Active).onSet(async value => {
+      await this.internalStateUpdate(value)
+    })
+
+    // Add options to the purifier target state characteristic
+    this.service
+      .getCharacteristic(this.hapChar.TargetAirPurifierState)
+      .setProps({
+        minValue: 1,
+        maxValue: 1,
+        validValues: [1]
+      })
+      .updateValue(1)
+
+    // Output the customised options to the log if in debug mode
+    if (platform.config.debug) {
+      const opts = JSON.stringify({
+        disableDeviceLogging: this.disableDeviceLogging
+      })
+      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
+    }
+  }
+
+  async internalStateUpdate (value) {
+    try {
+      const params = {}
+      switch (this.setup) {
+        case 'oneSwitch':
+          params.switch = value === 1 ? 'on' : 'off'
+          break
+        case 'twoSwitch':
+          params.switches = [
+            {
+              switch: value === 1 ? 'on' : 'off',
+              outlet: 0
+            }
+          ]
+          break
+        default:
+          return
+      }
+      await this.platform.sendDeviceUpdate(this.accessory, params)
+      this.cacheState = value === 1 ? 'on' : 'off'
+      this.service.updateCharacteristic(this.hapChar.CurrentAirPurifierState, value === 1 ? 2 : 0)
+      if (!this.disableDeviceLogging) {
+        this.log('[%s] %s [%s].', this.name, this.lang.curPur, this.cacheState)
+      }
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, true)
+      setTimeout(() => {
+        this.service.updateCharacteristic(this.hapChar.Active, this.cacheState === 'on' ? 1 : 0)
+      }, 2000)
+      throw new this.hapErr(-70402)
+    }
+  }
+
+  async externalUpdate (params) {
+    try {
+      if (params.switches) {
+        if (!this.setup) {
+          this.setup = 'twoSwitch'
+        }
+        if (params.switches[0].switch === this.cacheState) {
+          return
+        }
+        this.cacheState = params.switches[0].switch
+      } else if (params.switch) {
+        if (!this.setup) {
+          this.setup = 'oneSwitch'
+        }
+        if (params.switch === this.cacheState) {
+          return
+        }
+        this.cacheState = params.switch
+      } else {
+        return
+      }
+      this.service.updateCharacteristic(this.hapChar.Active, this.cacheState === 'on' ? 1 : 0)
+      this.service.updateCharacteristic(
+        this.hapChar.CurrentAirPurifierState,
+        this.cacheState === 'on' ? 2 : 0
+      )
+      if (params.updateSource && !this.disableDeviceLogging) {
+        this.log('[%s] %s [%s].', this.name, this.lang.curPur, this.cacheState)
+      }
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, false)
+    }
+  }
+}
diff --git a/lib/index.js b/lib/index.js
index 2f210691..5c30d5af 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -835,6 +835,16 @@ class eWeLinkPlatform {
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/simulation/sensor'))(this, accessory)
         /******************/
+      } else if (
+        this.simulations[device.deviceid] &&
+        this.simulations[device.deviceid].type === 'purifier'
+      ) {
+        /*********************
+        PURIFIERS [SIMULATION]
+        *********************/
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
+        accessory.control = new (require('./device/simulation/purifier'))(this, accessory)
+        /********************/
       } else if (
         this.simulations[device.deviceid] &&
         this.simulations[device.deviceid].type === 'sensor_leak' &&
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 1c063a4f..16593861 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -132,6 +132,7 @@ module.exports = {
       'garage_eachen',
       'humidifier',
       'lock',
+      'purifier',
       'sensor',
       'sensor_leak',
       'switch_valve',
diff --git a/lib/utils/lang-en.js b/lib/utils/lang-en.js
index 1a74d71a..6832d429 100644
--- a/lib/utils/lang-en.js
+++ b/lib/utils/lang-en.js
@@ -36,6 +36,7 @@ module.exports = {
   curMode: 'current mode',
   curPos: 'current position',
   curPower: 'current power',
+  curPur: 'current purifying',
   curSpeed: 'current speed',
   curState: 'current state',
   curTarg: 'current target',

From b0e9d958669e90c426a1b6a59bd0607d0db58160 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 13 Jun 2021 12:49:06 +0100
Subject: [PATCH 2181/3183] show mac address in plugin-ui

---
 lib/homebridge-ui/public/index.html | 7 +++++++
 lib/index.js                        | 6 ++++++
 2 files changed, 13 insertions(+)

diff --git a/lib/homebridge-ui/public/index.html b/lib/homebridge-ui/public/index.html
index a9385ca0..ecb677d0 100644
--- a/lib/homebridge-ui/public/index.html
+++ b/lib/homebridge-ui/public/index.html
@@ -89,6 +89,10 @@
           <th scope="row">Firmware</th>
           <td id="eweFirmware"></td>
         </tr>
+        <tr>
+          <th scope="row">MAC Address</th>
+          <td id="eweMacAddress"></td>
+        </tr>
         <tr>
           <th scope="row">Shared Device</th>
           <td id="eweShared"></td>
@@ -297,6 +301,9 @@ <h4>Disclaimer</h4>
           document.getElementById('eweDeviceId').innerHTML = selectedAccessory.context.eweDeviceId
           document.getElementById('eweBrandName').innerHTML = selectedAccessory.context.eweBrandName
           document.getElementById('eweFirmware').innerHTML = selectedAccessory.context.firmware
+          document.getElementById('eweMacAddress').innerHTML = selectedAccessory.context.macAddress
+            ? selectedAccessory.context.macAddress
+            : 'N/A'
           document.getElementById('eweModel').innerHTML =
             selectedAccessory.context.eweModel + ' (' + selectedAccessory.context.eweUIID + ')'
           document.getElementById('eweShared').innerHTML = selectedAccessory.context.eweShared
diff --git a/lib/index.js b/lib/index.js
index 5c30d5af..d911f985 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1071,6 +1071,8 @@ class eWeLinkPlatform {
             lanClient && subAccessory.context.reachableLAN
               ? lanDevices.get(device.deviceid).ip
               : false
+          subAccessory.context.macAddress =
+            device.extra && device.extra.staMac ? device.extra.staMac : false
           subAccessory.control = this.consts.devices.doubleSwitch.includes(uiid)
             ? this.multiDevices[device.deviceid] && this.multiDevices[device.deviceid].showAsOutlet
               ? new (require('./device/outlet-double'))(this, subAccessory, devicesInHB)
@@ -1201,6 +1203,8 @@ class eWeLinkPlatform {
             lanClient && subAccessory.context.reachableLAN
               ? lanDevices.get(device.deviceid).ip
               : false
+          subAccessory.context.macAddress =
+            device.extra && device.extra.staMac ? device.extra.staMac : false
 
           // Update any changes to the sub accessory to the platform
           this.api.updatePlatformAccessories(plugin.name, plugin.alias, [subAccessory])
@@ -1303,6 +1307,8 @@ class eWeLinkPlatform {
         device.sharedBy && device.sharedBy.email ? device.sharedBy.email : false
       accessory.context.ip =
         lanClient && accessory.context.reachableLAN ? lanDevices.get(device.deviceid).ip : false
+      accessory.context.macAddress =
+        device.extra && device.extra.staMac ? device.extra.staMac : false
 
       // Helpful logging for each device
       const str = accessory.context.reachableLAN

From a89a3416131e57405765dffa46fe34e974d6646e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 13 Jun 2021 12:50:00 +0100
Subject: [PATCH 2182/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3e759bb6..e63c2151 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,11 +7,13 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 ### Added
 
 - Expose a single/multi channel device as any type of sensor (via simulation)
+- Expose a single/multi channel device an _Air Purifier_ (via simulation)
 - Expose a TH10/16 device as a _Cooler_ accessory type (via simulation)
 - Expose a TH10/16 device as a _Humidifier_ accessory type (via simulation)
 - Expose a TH10/16 device as a _Dehumidfier_ accessory type (via simulation)
 - LAN control for TH10/16 (requires firmware 3.5.0, not available when using heater/cooler simulation)
 - [test] LAN control polling for POWR2 devices
+- Show MAC address of accessory in plugin-ui
 
 ### Changes
 

From e573d2ab0d1ebdf1f1803d33a8288a3c0fdbab5b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 13 Jun 2021 12:50:39 +0100
Subject: [PATCH 2183/3183] 6.7.2-beta.7

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 4992fcf8..8384a459 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.7.2-beta.6",
+  "version": "6.7.2-beta.7",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index e83d653c..6dad0bf9 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.7.2-beta.6",
+  "version": "6.7.2-beta.7",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 40f9f167515475cd9ab463d2344d980c5479f505 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 13 Jun 2021 13:12:46 +0100
Subject: [PATCH 2184/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e63c2151..7f6bc3aa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,15 +5,19 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 ## BETA
 
 ### Added
-
-- Expose a single/multi channel device as any type of sensor (via simulation)
-- Expose a single/multi channel device an _Air Purifier_ (via simulation)
-- Expose a TH10/16 device as a _Cooler_ accessory type (via simulation)
-- Expose a TH10/16 device as a _Humidifier_ accessory type (via simulation)
-- Expose a TH10/16 device as a _Dehumidfier_ accessory type (via simulation)
-- LAN control for TH10/16 (requires firmware 3.5.0, not available when using heater/cooler simulation)
-- [test] LAN control polling for POWR2 devices
-- Show MAC address of accessory in plugin-ui
+- **Accessory Simulations**
+  - Expose a single/multi channel device as any type of sensor
+  - Expose a single/multi channel device an _Air Purifier_
+  - Expose a TH10/16 device as a _Cooler_
+  - Expose a TH10/16 device as a _Humidifier_
+  - Expose a TH10/16 device as a _Dehumidfier_
+- **LAN Mode**
+  - Enabled for TH10/16
+    - Requires firmware 3.5.0
+    - Not available when using an accessory simulation
+  - [test] Enabled for polling for POWR2 devices
+- **Plugin UI**
+  - Show MAC address of accessory in plugin-ui
 
 ### Changes
 

From 8150023491d1f55591ad9af028702b30baeb6708 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 13 Jun 2021 14:41:02 +0100
Subject: [PATCH 2185/3183] remove leftover accessory when removing simulation

---
 lib/index.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/lib/index.js b/lib/index.js
index d911f985..bd12f00e 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1034,6 +1034,13 @@ class eWeLinkPlatform {
         /***********************
         SWITCHES [MULTI CHANNEL]
         ***********************/
+
+        // If a single accessory is leftover from a simulation then remove it
+        if (devicesInHB.has(uuid)) {
+          this.removeAccessory(devicesInHB.get(uuid))
+        }
+
+        // Loop through the channels of the device
         for (let i = 0; i <= this.consts.supportedDevices[uiid]; i++) {
           let subAccessory
           const uuidsub = this.api.hap.uuid.generate(device.deviceid + 'SW' + i)

From 22c0bf5dba3b6672c1b57ff11a1db8ee8136b667 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 13 Jun 2021 14:41:04 +0100
Subject: [PATCH 2186/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7f6bc3aa..20c46ee6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 ## BETA
 
 ### Added
+
 - **Accessory Simulations**
   - Expose a single/multi channel device as any type of sensor
   - Expose a single/multi channel device an _Air Purifier_

From c8b5a4152da6387b2c2565513b604b21aa1b984d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 13 Jun 2021 15:16:26 +0100
Subject: [PATCH 2187/3183] use awaits when request update

---
 lib/index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/index.js b/lib/index.js
index bd12f00e..eebcfcd8 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1573,7 +1573,7 @@ class eWeLinkPlatform {
           // Try and request an update through WS if the device has come back online
           if (accessory.context.reachableWAN && wsClient) {
             try {
-              wsClient.requestUpdate(accessory)
+              await wsClient.requestUpdate(accessory)
             } catch (err) {
               // Suppress any errors here
             }
@@ -1610,7 +1610,7 @@ class eWeLinkPlatform {
           // Try and request an update through WS if the device has come back online
           if (accessory.context.reachableWAN && wsClient) {
             try {
-              wsClient.requestUpdate(accessory)
+              await wsClient.requestUpdate(accessory)
             } catch (err) {
               // Suppress any errors here
             }

From 592be0cf7a4a5ce363d6c05eac71227208edd636 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 13 Jun 2021 15:17:00 +0100
Subject: [PATCH 2188/3183] 6.7.2-beta.8

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 8384a459..6a683311 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.7.2-beta.7",
+  "version": "6.7.2-beta.8",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 6dad0bf9..cd49e015 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.7.2-beta.7",
+  "version": "6.7.2-beta.8",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 0120c2e8cd811cbe855a624fcaafc0285a0eba61 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 13 Jun 2021 15:37:16 +0100
Subject: [PATCH 2189/3183] clean up comments

---
 lib/device/simulation/cooler.js       |  7 ++++---
 lib/device/simulation/dehumidifier.js | 17 +++++++++--------
 lib/device/simulation/heater.js       |  5 +++--
 lib/device/simulation/humidifier.js   | 13 +++++++------
 4 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/lib/device/simulation/cooler.js b/lib/device/simulation/cooler.js
index 7f10d9ab..d988c4c4 100644
--- a/lib/device/simulation/cooler.js
+++ b/lib/device/simulation/cooler.js
@@ -50,7 +50,7 @@ module.exports = class deviceCooler {
       this.accessory.context.cacheTarget = 20
     }
 
-    // Check to make sure user has not switched from cooler to heater
+    // Check to make sure user has not switched from heater to cooler
     if (this.accessory.context.cacheType !== 'cooler') {
       // Remove and re-setup as a HeaterCooler
       if (this.accessory.getService(this.hapServ.HeaterCooler)) {
@@ -91,6 +91,7 @@ module.exports = class deviceCooler {
         this.accessory.addService(this.hapServ.HumiditySensor)
     }
 
+    // Set the cooler as the primary service
     this.service.setPrimaryService()
 
     // Set custom properties of the current temperature characteristic
@@ -98,7 +99,7 @@ module.exports = class deviceCooler {
       minStep: 0.1
     })
 
-    // Add the set handler to the heater active characteristic
+    // Add the set handler to the cooler active characteristic
     this.service.getCharacteristic(this.hapChar.Active).onSet(async value => {
       await this.internalStateUpdate(value)
     })
@@ -127,7 +128,7 @@ module.exports = class deviceCooler {
       log: platform.config.debugFakegato ? this.log : () => {}
     })
 
-    // Setting this now makes the plugin send the payload to setup as thermostat
+    // Setting this now makes the plugin send the payload to setup as a cooler
     setTimeout(() => {
       this.service.setCharacteristic(
         this.hapChar.CoolingThresholdTemperature,
diff --git a/lib/device/simulation/dehumidifier.js b/lib/device/simulation/dehumidifier.js
index b4c2e7a4..2ddca85e 100644
--- a/lib/device/simulation/dehumidifier.js
+++ b/lib/device/simulation/dehumidifier.js
@@ -32,12 +32,12 @@ module.exports = class deviceHumidifier {
       this.accessory.removeService(this.accessory.getService(this.hapServ.Switch))
     }
 
-    // Set up the accessory with default target temp when added the first time
+    // Set up the accessory with default target relative humidity when added the first time
     if (!this.funcs.hasProperty(this.accessory.context, 'cacheTarget')) {
       this.accessory.context.cacheTarget = 50
     }
 
-    // Check to make sure user has not switched from dehumidifier to humidifier
+    // Check to make sure user has not switched from humidifier to dehumidifier
     if (this.accessory.context.cacheType !== 'dehumidifier') {
       // Remove and re-setup as a HeaterCooler
       if (this.accessory.getService(this.hapServ.HumidifierDehumidifier)) {
@@ -61,24 +61,25 @@ module.exports = class deviceHumidifier {
       this.accessory.removeService(this.accessory.getService(this.hapServ.HumiditySensor))
     }
 
-    // Add the humidifier service if it doesn't already exist
+    // Add the dehumidifier service if it doesn't already exist
     this.service =
       this.accessory.getService(this.hapServ.HumidifierDehumidifier) ||
       this.accessory.addService(this.hapServ.HumidifierDehumidifier)
 
-    // Add the temperature service if it doesn't already exist
+    // Add the temperature sensor service if it doesn't already exist
     this.tempService =
       this.accessory.getService(this.hapServ.TemperatureSensor) ||
       this.accessory.addService(this.hapServ.TemperatureSensor)
 
+    // Set the dehumidifier as the primary service
     this.service.setPrimaryService()
 
-    // Add the set handler to the heater active characteristic
+    // Add the set handler to the dehumidifier active characteristic
     this.service.getCharacteristic(this.hapChar.Active).onSet(async value => {
       await this.internalStateUpdate(value)
     })
 
-    // Add the set handler to the target state characteristic
+    // Add options to the target state characteristic
     this.service
       .getCharacteristic(this.hapChar.TargetHumidifierDehumidifierState)
       .setProps({
@@ -88,7 +89,7 @@ module.exports = class deviceHumidifier {
       })
       .updateValue(2)
 
-    // Add the set handler to the target temperature characteristic
+    // Add the set handler to the target relative humidity characteristic
     this.service
       .getCharacteristic(this.hapChar.RelativeHumidityDehumidifierThreshold)
       .onSet(async value => {
@@ -100,7 +101,7 @@ module.exports = class deviceHumidifier {
       log: platform.config.debugFakegato ? this.log : () => {}
     })
 
-    // Setting this now makes the plugin send the payload to setup as thermostat
+    // Setting this now makes the plugin send the payload to setup as a dehumidifier
     setTimeout(() => {
       this.service.setCharacteristic(
         this.hapChar.RelativeHumidityDehumidifierThreshold,
diff --git a/lib/device/simulation/heater.js b/lib/device/simulation/heater.js
index b213680a..8c7d8037 100644
--- a/lib/device/simulation/heater.js
+++ b/lib/device/simulation/heater.js
@@ -91,6 +91,7 @@ module.exports = class deviceHeater {
         this.accessory.addService(this.hapServ.HumiditySensor)
     }
 
+    // Set the heater as the primary service
     this.service.setPrimaryService()
 
     // Set custom properties of the current temperature characteristic
@@ -103,7 +104,7 @@ module.exports = class deviceHeater {
       await this.internalStateUpdate(value)
     })
 
-    // Add the set handler to the target state characteristic
+    // Add options to the target state characteristic
     this.service.getCharacteristic(this.hapChar.TargetHeaterCoolerState).setProps({
       minValue: 0,
       maxValue: 0,
@@ -127,7 +128,7 @@ module.exports = class deviceHeater {
       log: platform.config.debugFakegato ? this.log : () => {}
     })
 
-    // Setting this now makes the plugin send the payload to setup as thermostat
+    // Setting this now makes the plugin send the payload to setup as a heater
     setTimeout(() => {
       this.service.setCharacteristic(
         this.hapChar.HeatingThresholdTemperature,
diff --git a/lib/device/simulation/humidifier.js b/lib/device/simulation/humidifier.js
index e64d8f1d..42c94ea9 100644
--- a/lib/device/simulation/humidifier.js
+++ b/lib/device/simulation/humidifier.js
@@ -32,7 +32,7 @@ module.exports = class deviceHumidifier {
       this.accessory.removeService(this.accessory.getService(this.hapServ.Switch))
     }
 
-    // Set up the accessory with default target temp when added the first time
+    // Set up the accessory with default target relative humidity when added the first time
     if (!this.funcs.hasProperty(this.accessory.context, 'cacheTarget')) {
       this.accessory.context.cacheTarget = 50
     }
@@ -66,19 +66,20 @@ module.exports = class deviceHumidifier {
       this.accessory.getService(this.hapServ.HumidifierDehumidifier) ||
       this.accessory.addService(this.hapServ.HumidifierDehumidifier)
 
-    // Add the temperature service if it doesn't already exist
+    // Add the temperature sensor service if it doesn't already exist
     this.tempService =
       this.accessory.getService(this.hapServ.TemperatureSensor) ||
       this.accessory.addService(this.hapServ.TemperatureSensor)
 
+    // Set the humidifier as the primary service
     this.service.setPrimaryService()
 
-    // Add the set handler to the heater active characteristic
+    // Add the set handler to the humidifier active characteristic
     this.service.getCharacteristic(this.hapChar.Active).onSet(async value => {
       await this.internalStateUpdate(value)
     })
 
-    // Add the set handler to the target state characteristic
+    // Add options to the target state characteristic
     this.service
       .getCharacteristic(this.hapChar.TargetHumidifierDehumidifierState)
       .setProps({
@@ -88,7 +89,7 @@ module.exports = class deviceHumidifier {
       })
       .updateValue(1)
 
-    // Add the set handler to the target temperature characteristic
+    // Add the set handler to the target relative humidity characteristic
     this.service
       .getCharacteristic(this.hapChar.RelativeHumidityHumidifierThreshold)
       .onSet(async value => {
@@ -100,7 +101,7 @@ module.exports = class deviceHumidifier {
       log: platform.config.debugFakegato ? this.log : () => {}
     })
 
-    // Setting this now makes the plugin send the payload to setup as thermostat
+    // Setting this now makes the plugin send the payload to setup as a humidifier
     setTimeout(() => {
       this.service.setCharacteristic(
         this.hapChar.RelativeHumidityHumidifierThreshold,

From 255d4668bfe756dc20e8ee654928ec0e238a9ab0 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 13 Jun 2021 15:37:36 +0100
Subject: [PATCH 2190/3183] new accessory file for scm switch type

---
 lib/device/outlet-scm.js | 35 ++++----------
 lib/device/switch-scm.js | 98 ++++++++++++++++++++++++++++++++++++++++
 lib/index.js             |  5 +-
 3 files changed, 112 insertions(+), 26 deletions(-)
 create mode 100644 lib/device/switch-scm.js

diff --git a/lib/device/outlet-scm.js b/lib/device/outlet-scm.js
index 30c54e0c..ffbf605e 100644
--- a/lib/device/outlet-scm.js
+++ b/lib/device/outlet-scm.js
@@ -18,35 +18,21 @@ module.exports = class deviceOutletSCM {
 
     // Set up custom variables for this device type
     const deviceConf = platform.outletDevices[accessory.context.eweDeviceId]
-    this.showAsSwitch = deviceConf && deviceConf.showAsSwitch
     this.disableDeviceLogging =
       deviceConf && deviceConf.overrideDisabledLogging
         ? false
         : platform.config.disableDeviceLogging
 
-    // Check if the user has overridden how this accessory should appear
-    if (this.showAsSwitch) {
-      // User has chosen switch so if the accessory has an outlet service then remove it
-      if (this.accessory.getService(this.hapServ.Outlet)) {
-        this.accessory.removeService(this.accessory.getService(this.hapServ.Outlet))
-      }
-
-      // Add the switch service if it doesn't already exist
-      this.service =
-        this.accessory.getService(this.hapServ.Switch) ||
-        this.accessory.addService(this.hapServ.Switch)
-    } else {
-      // The default is an outlet so if the accessory has an switch service then remove it
-      if (this.accessory.getService(this.hapServ.Switch)) {
-        this.accessory.removeService(this.accessory.getService(this.hapServ.Switch))
-      }
-
-      // Add the outlet service if it doesn't already exist
-      this.service =
-        this.accessory.getService(this.hapServ.Outlet) ||
-        this.accessory.addService(this.hapServ.Outlet)
+    // The default is an outlet so if the accessory has an switch service then remove it
+    if (this.accessory.getService(this.hapServ.Switch)) {
+      this.accessory.removeService(this.accessory.getService(this.hapServ.Switch))
     }
 
+    // Add the outlet service if it doesn't already exist
+    this.service =
+      this.accessory.getService(this.hapServ.Outlet) ||
+      this.accessory.addService(this.hapServ.Outlet)
+
     // Add the set handler to the switch/outlet on/off characteristic
     this.service.getCharacteristic(this.hapChar.On).onSet(async value => {
       await this.internalStateUpdate(value)
@@ -55,8 +41,7 @@ module.exports = class deviceOutletSCM {
     // Output the customised options to the log if in debug mode
     if (platform.config.debug) {
       const opts = JSON.stringify({
-        disableDeviceLogging: this.disableDeviceLogging,
-        showAsSwitch: this.showAsSwitch
+        disableDeviceLogging: this.disableDeviceLogging
       })
       this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
     }
@@ -103,7 +88,7 @@ module.exports = class deviceOutletSCM {
 
   currentState () {
     const toReturn = {}
-    const service = this.showAsSwitch ? 'switch' : 'outlet'
+    const service = 'outlet'
     toReturn.services = [service]
     toReturn[service] = {
       state: this.service.getCharacteristic(this.hapChar.On).value ? 'on' : 'off'
diff --git a/lib/device/switch-scm.js b/lib/device/switch-scm.js
new file mode 100644
index 00000000..80b77437
--- /dev/null
+++ b/lib/device/switch-scm.js
@@ -0,0 +1,98 @@
+/* jshint -W014, -W033, esversion: 9 */
+/* eslint-disable new-cap */
+'use strict'
+
+module.exports = class deviceSwitchSCM {
+  constructor (platform, accessory) {
+    // Set up variables from the platform
+    this.hapChar = platform.api.hap.Characteristic
+    this.hapErr = platform.api.hap.HapStatusError
+    this.hapServ = platform.api.hap.Service
+    this.lang = platform.lang
+    this.log = platform.log
+    this.platform = platform
+
+    // Set up variables from the accessory
+    this.name = accessory.displayName
+    this.accessory = accessory
+
+    // Set up custom variables for this device type
+    const deviceConf = platform.outletDevices[accessory.context.eweDeviceId]
+    this.disableDeviceLogging =
+      deviceConf && deviceConf.overrideDisabledLogging
+        ? false
+        : platform.config.disableDeviceLogging
+
+    // User has chosen switch so if the accessory has an outlet service then remove it
+    if (this.accessory.getService(this.hapServ.Outlet)) {
+      this.accessory.removeService(this.accessory.getService(this.hapServ.Outlet))
+    }
+
+    // Add the switch service if it doesn't already exist
+    this.service =
+      this.accessory.getService(this.hapServ.Switch) ||
+      this.accessory.addService(this.hapServ.Switch)
+
+    // Add the set handler to the switch/outlet on/off characteristic
+    this.service.getCharacteristic(this.hapChar.On).onSet(async value => {
+      await this.internalStateUpdate(value)
+    })
+
+    // Output the customised options to the log if in debug mode
+    if (platform.config.debug) {
+      const opts = JSON.stringify({
+        disableDeviceLogging: this.disableDeviceLogging
+      })
+      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
+    }
+  }
+
+  async internalStateUpdate (value) {
+    try {
+      const newValue = value ? 'on' : 'off'
+      if (newValue === this.cacheState) {
+        return
+      }
+      const params = {
+        switches: [{ switch: newValue, outlet: 0 }]
+      }
+      await this.platform.sendDeviceUpdate(this.accessory, params)
+      this.cacheState = newValue
+      if (!this.disableDeviceLogging) {
+        this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
+      }
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, true)
+      setTimeout(() => {
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
+      }, 2000)
+      throw new this.hapErr(-70402)
+    }
+  }
+
+  async externalUpdate (params) {
+    try {
+      if (!params.switches || params.switches[0].switch === this.cacheState) {
+        return
+      }
+      const newStatus = params.switches[0].switch === 'on'
+      this.service.updateCharacteristic(this.hapChar.On, newStatus)
+      this.cacheState = params.switches[0].switch
+      if (params.updateSource && !this.disableDeviceLogging) {
+        this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
+      }
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, false)
+    }
+  }
+
+  currentState () {
+    const toReturn = {}
+    const service = 'switch'
+    toReturn.services = [service]
+    toReturn[service] = {
+      state: this.service.getCharacteristic(this.hapChar.On).value ? 'on' : 'off'
+    }
+    return toReturn
+  }
+}
diff --git a/lib/index.js b/lib/index.js
index eebcfcd8..88877708 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -977,7 +977,10 @@ class eWeLinkPlatform {
         OUTLETS [SINGLE BUT MULTIPLE HARDWARE]
         *************************************/
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require('./device/outlet-scm'))(this, accessory)
+        accessory.control =
+          this.outletDevices[device.deviceid] && this.outletDevices[device.deviceid].showAsSwitch
+            ? new (require('./device/switch-scm'))(this, accessory)
+            : new (require('./device/outlet-scm'))(this, accessory)
         /************************************/
       } else if (this.consts.devices.singleSwitchOutlet.includes(device.productModel)) {
         /******

From 3afd29f1fcd228e31e556854e5feddcea2881a7d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 13 Jun 2021 15:41:25 +0100
Subject: [PATCH 2191/3183] 6.7.2-beta.9

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 6a683311..89587dac 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.7.2-beta.8",
+  "version": "6.7.2-beta.9",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index cd49e015..70134341 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.7.2-beta.8",
+  "version": "6.7.2-beta.9",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From f8471aa3ba8530dc009137bb2b21570971fd7ae3 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 13 Jun 2021 16:34:15 +0100
Subject: [PATCH 2192/3183] use arrow funcs

---
 lib/index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/index.js b/lib/index.js
index 88877708..e51245ab 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -69,8 +69,8 @@ class eWeLinkPlatform {
       this.applyUserConfig(config)
 
       // Set up the Homebridge events
-      this.api.on('didFinishLaunching', this.pluginSetup.bind(this))
-      this.api.on('shutdown', this.pluginShutdown.bind(this))
+      this.api.on('didFinishLaunching', () => this.pluginSetup())
+      this.api.on('shutdown', () => this.pluginShutdown())
     } catch (err) {
       // Catch any errors during initialisation
       const hideErrLines = [

From f00e9db5bf9dbfd2acc36ae3fa7b013a4cb53f20 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 14 Jun 2021 08:06:33 +0100
Subject: [PATCH 2193/3183] remove polling lan mode until can confirm

---
 lib/connection/lan.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/connection/lan.js b/lib/connection/lan.js
index ac1b1a0b..29410848 100644
--- a/lib/connection/lan.js
+++ b/lib/connection/lan.js
@@ -186,8 +186,9 @@ module.exports = class connectionLAN {
         }
         suffix = 'switch'
       } else if (json.params.uiActive) {
-        params.uiActive = json.params.uiActive
-        suffix = 'monitor'
+        // params.uiActive = json.params.uiActive
+        // suffix = 'monitor'
+        throw new Error(this.lang.devNotConfLAN)
       } else if (json.params.cmd) {
         params.cmd = 'transmit'
         params.rfChl = json.params.rfChl

From 690f5db180ed96e3e3bf7e0958019c1cbefed57a Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 14 Jun 2021 08:08:00 +0100
Subject: [PATCH 2194/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 20c46ee6..286c2284 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,10 +13,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
   - Expose a TH10/16 device as a _Humidifier_
   - Expose a TH10/16 device as a _Dehumidfier_
 - **LAN Mode**
-  - Enabled for TH10/16
-    - Requires firmware 3.5.0
-    - Not available when using an accessory simulation
-  - [test] Enabled for polling for POWR2 devices
+  - Enabled for TH10/16 (requires firmware 3.5.0, not available when using an accessory simulation)
 - **Plugin UI**
   - Show MAC address of accessory in plugin-ui
 

From c3f019d9e3a087b670ce16bd83e753bd4229f65b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 14 Jun 2021 08:08:56 +0100
Subject: [PATCH 2195/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 286c2284..8a12a6ed 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 All notable changes to this homebridge-ewelink will be documented in this file.
 
-## BETA
+## 6.8.0 (2021-06-14)
 
 ### Added
 

From ea2ac43adc3c011a51336d4b616ff2cbcf96bd3a Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 14 Jun 2021 08:09:33 +0100
Subject: [PATCH 2196/3183] 6.8.0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 89587dac..9dcbb147 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.7.2-beta.9",
+  "version": "6.8.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 70134341..74009541 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.7.2-beta.9",
+  "version": "6.8.0",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 05868a2ff75c83d51cf16cb1428b18229c497de8 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 14 Jun 2021 08:12:11 +0100
Subject: [PATCH 2197/3183] check for 'switches' first

---
 lib/device/simulation/sensor.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/device/simulation/sensor.js b/lib/device/simulation/sensor.js
index 951d9c1b..9871d01d 100644
--- a/lib/device/simulation/sensor.js
+++ b/lib/device/simulation/sensor.js
@@ -105,16 +105,16 @@ module.exports = class deviceSensor {
 
   async externalUpdate (params) {
     try {
-      if (params.switch) {
-        if (params.switch === this.cacheState) {
-          return
-        }
-        this.cacheState = params.switch
-      } else if (params.switches) {
+      if (params.switches) {
         if (params.switches[0].switch === this.cacheState) {
           return
         }
         this.cacheState = params.switches[0].switch
+      } else if (params.switch) {
+        if (params.switch === this.cacheState) {
+          return
+        }
+        this.cacheState = params.switch
       } else {
         return
       }

From 2a84bb84f5cdace1886419fac2df17985a147aaa Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 14 Jun 2021 09:57:11 +0100
Subject: [PATCH 2198/3183] add option to offset humidity readings

---
 config.schema.json                    | 14 +++++++++
 lib/device/sensor-ambient.js          | 42 +++++++++++++-------------
 lib/device/sensor-temp-humi.js        | 43 ++++++++++++++-------------
 lib/device/simulation/cooler.js       | 42 +++++++++++++-------------
 lib/device/simulation/dehumidifier.js | 39 +++++++++++++-----------
 lib/device/simulation/heater.js       | 42 +++++++++++++-------------
 lib/device/simulation/humidifier.js   | 39 +++++++++++++-----------
 lib/device/zigbee/sensor-ambient.js   | 35 ++++++++++++++--------
 lib/index.js                          | 13 ++++++++
 lib/utils/constants.js                |  3 ++
 10 files changed, 180 insertions(+), 132 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index d26d6aa7..547f9fb6 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -345,6 +345,12 @@
               "description": "You can offset the temperature that the sensor reads. An offset of 2 means 2 degrees will be added to the recorded temperature. Can be positive or negative and can include a decimal point '.'.",
               "placeholder": 0
             },
+            "humidityOffset": {
+              "type": "number",
+              "title": "Humidity Offset",
+              "description": "You can offset the humidity that the sensor reads. An offset of 2 means 2% will be added to the recorded relative humidity. Can be positive or negative.",
+              "placeholder": 0
+            },
             "minTarget": {
               "type": "number",
               "title": "Minimum Target Temperature",
@@ -431,6 +437,12 @@
               "description": "You can offset the temperature that the SNZB-02 sensor reads. An offset of 2 means 2 degrees will be added to the recorded temperature. Can be positive or negative and can include a decimal point '.'.",
               "placeholder": 0
             },
+            "humidityOffset": {
+              "type": "number",
+              "title": "Humidity Offset",
+              "description": "You can offset the humidity that the SNZB-02 sensor reads. An offset of 2 means 2% will be added to the recorded relative humidity. Can be positive or negative.",
+              "placeholder": 0
+            },
             "hideLongDouble": {
               "type": "boolean",
               "title": "Hide Long & Double Press",
@@ -875,6 +887,7 @@
             "thDevices[].label",
             "thDevices[].hideSwitch",
             "thDevices[].offset",
+            "thDevices[].humidityOffset",
             "thDevices[].minTarget",
             "thDevices[].maxTarget",
             "thDevices[].overrideDisabledLogging"
@@ -916,6 +929,7 @@
             "sensorDevices[].label",
             "sensorDevices[].lowBattThreshold",
             "sensorDevices[].offset",
+            "sensorDevices[].humidityOffset",
             "sensorDevices[].hideLongDouble",
             "sensorDevices[].scaleBattery",
             "sensorDevices[].overrideDisabledLogging"
diff --git a/lib/device/sensor-ambient.js b/lib/device/sensor-ambient.js
index a6823654..c212df3b 100644
--- a/lib/device/sensor-ambient.js
+++ b/lib/device/sensor-ambient.js
@@ -22,6 +22,10 @@ module.exports = class deviceSensorAmbient {
     this.hideSwitch = deviceConf && deviceConf.hideSwitch
     this.tempOffset =
       deviceConf && deviceConf.offset ? deviceConf.offset : platform.consts.defaultValues.offset
+    this.humiOffset =
+      deviceConf && deviceConf.humidityOffset
+        ? deviceConf.humidityOffset
+        : platform.consts.defaultValues.humidityOffset
     this.disableDeviceLogging =
       deviceConf && deviceConf.overrideDisabledLogging
         ? false
@@ -97,6 +101,7 @@ module.exports = class deviceSensorAmbient {
       const opts = JSON.stringify({
         disableDeviceLogging: this.disableDeviceLogging,
         hideSwitch: this.hideSwitch,
+        humidityOffset: this.humiOffset,
         offset: this.tempOffset
       })
       this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
@@ -146,34 +151,29 @@ module.exports = class deviceSensorAmbient {
       const eveLog = {}
       if (
         this.funcs.hasProperty(params, 'currentTemperature') &&
-        params.currentTemperature !== 'unavailable'
+        params.currentTemperature !== 'unavailable' &&
+        this.cacheTempRaw !== params.currentTemperature
       ) {
-        const currentTemp = Number(params.currentTemperature) + this.tempOffset
-        eveLog.temp = currentTemp
-        if (this.cacheTemp !== currentTemp) {
-          this.cacheTemp = currentTemp
-          this.tempService.updateCharacteristic(this.hapChar.CurrentTemperature, this.cacheTemp)
-          if (params.updateSource && !this.disableDeviceLogging) {
-            this.log('[%s] %s [%s°C].', this.name, this.lang.curTemp, this.cacheTemp)
-          }
+        this.cacheTempRaw = params.currentTemperature
+        this.cacheTemp = Number(this.cacheTempRaw) + this.tempOffset
+        eveLog.temp = this.cacheTemp
+        this.tempService.updateCharacteristic(this.hapChar.CurrentTemperature, this.cacheTemp)
+        if (params.updateSource && !this.disableDeviceLogging) {
+          this.log('[%s] %s [%s°C].', this.name, this.lang.curTemp, this.cacheTemp)
         }
       }
       if (
         this.funcs.hasProperty(params, 'currentHumidity') &&
         params.currentHumidity !== 'unavailable' &&
-        this.humiService
+        this.humiService &&
+        this.cacheHumiRaw !== params.currentHumidity
       ) {
-        const currentHumi = parseInt(params.currentHumidity)
-        eveLog.humidity = currentHumi
-        if (this.cacheHumi !== currentHumi) {
-          this.cacheHumi = currentHumi
-          this.humiService.updateCharacteristic(
-            this.hapChar.CurrentRelativeHumidity,
-            this.cacheHumi
-          )
-          if (params.updateSource && !this.disableDeviceLogging) {
-            this.log('[%s] %s [%s%].', this.name, this.lang.curHumi, this.cacheHumi)
-          }
+        this.cacheHumiRaw = params.currentHumidity
+        this.cacheHumi = Math.max(Math.Min(parseInt(this.cacheHumiRaw) + this.humiOffset, 100), 0)
+        eveLog.humidity = this.cacheHumi
+        this.humiService.updateCharacteristic(this.hapChar.CurrentRelativeHumidity, this.cacheHumi)
+        if (params.updateSource && !this.disableDeviceLogging) {
+          this.log('[%s] %s [%s%].', this.name, this.lang.curHumi, this.cacheHumi)
         }
       }
       if (this.funcs.hasProperty(eveLog, 'temp') || this.funcs.hasProperty(eveLog, 'humidity')) {
diff --git a/lib/device/sensor-temp-humi.js b/lib/device/sensor-temp-humi.js
index 89a6cca1..b64029c4 100644
--- a/lib/device/sensor-temp-humi.js
+++ b/lib/device/sensor-temp-humi.js
@@ -20,6 +20,10 @@ module.exports = class deviceSensorTempHumi {
     const deviceConf = platform.thDevices[accessory.context.eweDeviceId]
     this.tempOffset =
       deviceConf && deviceConf.offset ? deviceConf.offset : platform.consts.defaultValues.offset
+    this.humiOffset =
+      deviceConf && deviceConf.humidityOffset
+        ? deviceConf.humidityOffset
+        : platform.consts.defaultValues.humidityOffset
     this.disableDeviceLogging =
       deviceConf && deviceConf.overrideDisabledLogging
         ? false
@@ -49,6 +53,7 @@ module.exports = class deviceSensorTempHumi {
     if (platform.config.debug) {
       const opts = JSON.stringify({
         disableDeviceLogging: this.disableDeviceLogging,
+        humidityOffset: this.humiOffset,
         offset: this.tempOffset
       })
       this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
@@ -58,29 +63,25 @@ module.exports = class deviceSensorTempHumi {
   async externalUpdate (params) {
     try {
       const eveLog = {}
-      if (this.funcs.hasProperty(params, 'temperature')) {
-        const currentTemp = Number(params.temperature) + this.tempOffset
-        eveLog.temp = currentTemp
-        if (this.cacheTemp !== currentTemp) {
-          this.cacheTemp = currentTemp
-          this.tempService.updateCharacteristic(this.hapChar.CurrentTemperature, this.cacheTemp)
-          if (params.updateSource && !this.disableDeviceLogging) {
-            this.log('[%s] %s [%s°C].', this.name, this.lang.curTemp, this.cacheTemp)
-          }
+      if (
+        this.funcs.hasProperty(params, 'temperature') &&
+        this.cacheTempRaw !== params.temperature
+      ) {
+        this.cacheTempRaw = params.temperature
+        this.cacheTemp = Number(this.cacheTempRaw) + this.tempOffset
+        eveLog.temp = this.cacheTemp
+        this.tempService.updateCharacteristic(this.hapChar.CurrentTemperature, this.cacheTemp)
+        if (params.updateSource && !this.disableDeviceLogging) {
+          this.log('[%s] %s [%s°C].', this.name, this.lang.curTemp, this.cacheTemp)
         }
       }
-      if (this.funcs.hasProperty(params, 'humidity')) {
-        const currentHumi = parseInt(params.humidity)
-        eveLog.humidity = currentHumi
-        if (this.cacheHumi !== currentHumi) {
-          this.cacheHumi = currentHumi
-          this.humiService.updateCharacteristic(
-            this.hapChar.CurrentRelativeHumidity,
-            this.cacheHumi
-          )
-          if (params.updateSource && !this.disableDeviceLogging) {
-            this.log('[%s] %s [%s%].', this.name, this.lang.curHumi, this.cacheHumi)
-          }
+      if (this.funcs.hasProperty(params, 'humidity') && this.cacheHumiRaw !== params.humidity) {
+        this.cacheHumiRaw = params.humidity
+        this.cacheHumi = Math.max(Math.Min(parseInt(this.cacheHumiRaw) + this.humiOffset, 100), 0)
+        eveLog.humidity = this.cacheHumi
+        this.humiService.updateCharacteristic(this.hapChar.CurrentRelativeHumidity, this.cacheHumi)
+        if (params.updateSource && !this.disableDeviceLogging) {
+          this.log('[%s] %s [%s%].', this.name, this.lang.curHumi, this.cacheHumi)
         }
       }
       if (this.funcs.hasProperty(eveLog, 'temp') || this.funcs.hasProperty(eveLog, 'humidity')) {
diff --git a/lib/device/simulation/cooler.js b/lib/device/simulation/cooler.js
index d988c4c4..70eb8aba 100644
--- a/lib/device/simulation/cooler.js
+++ b/lib/device/simulation/cooler.js
@@ -22,6 +22,10 @@ module.exports = class deviceCooler {
     const deviceConf2 = platform.simulations[accessory.context.eweDeviceId]
     this.tempOffset =
       deviceConf && deviceConf.offset ? deviceConf.offset : platform.consts.defaultValues.offset
+    this.humiOffset =
+      deviceConf && deviceConf.humidityOffset
+        ? deviceConf.humidityOffset
+        : platform.consts.defaultValues.humidityOffset
     this.minTarget =
       deviceConf && deviceConf.minTarget
         ? deviceConf.minTarget
@@ -140,6 +144,7 @@ module.exports = class deviceCooler {
     if (platform.config.debug) {
       const opts = JSON.stringify({
         disableDeviceLogging: this.disableDeviceLogging,
+        humidityOffset: this.humiOffset,
         maxTarget: this.maxTarget,
         minTarget: this.minTarget,
         offset: this.tempOffset,
@@ -255,34 +260,29 @@ module.exports = class deviceCooler {
       }
       if (
         this.funcs.hasProperty(params, 'currentTemperature') &&
-        params.currentTemperature !== 'unavailable'
+        params.currentTemperature !== 'unavailable' &&
+        this.cacheTempRaw !== params.currentTemperature
       ) {
-        if (this.cacheTempRaw !== params.currentTemperature) {
-          this.cacheTempRaw = params.currentTemperature
-          this.cacheTemp = Number(params.currentTemperature) + this.tempOffset
-          this.service.updateCharacteristic(this.hapChar.CurrentTemperature, this.cacheTemp)
-          this.accessory.eveService.addEntry({ temp: this.cacheTemp })
-          if (params.updateSource && !this.disableDeviceLogging) {
-            this.log('[%s] %s [%s°C].', this.name, this.lang.curTemp, this.cacheTemp)
-          }
+        this.cacheTempRaw = params.currentTemperature
+        this.cacheTemp = Number(params.currentTemperature) + this.tempOffset
+        this.service.updateCharacteristic(this.hapChar.CurrentTemperature, this.cacheTemp)
+        this.accessory.eveService.addEntry({ temp: this.cacheTemp })
+        if (params.updateSource && !this.disableDeviceLogging) {
+          this.log('[%s] %s [%s°C].', this.name, this.lang.curTemp, this.cacheTemp)
         }
       }
       if (
         this.funcs.hasProperty(params, 'currentHumidity') &&
         params.currentHumidity !== 'unavailable' &&
-        this.humiService
+        this.humiService &&
+        this.cacheHumiRaw !== params.currentHumidity
       ) {
-        if (this.cacheHumiRaw !== params.currentHumidity) {
-          this.cacheHumiRaw = params.currentHumidity
-          this.cacheHumi = parseInt(params.currentHumidity)
-          this.humiService.updateCharacteristic(
-            this.hapChar.CurrentRelativeHumidity,
-            this.cacheHumi
-          )
-          this.accessory.eveService.addEntry({ humidity: this.cacheHumi })
-          if (params.updateSource && !this.disableDeviceLogging) {
-            this.log('[%s] %s [%s%].', this.name, this.lang.curHumi, this.cacheHumi)
-          }
+        this.cacheHumiRaw = params.currentHumidity
+        this.cacheHumi = Math.max(Math.Min(parseInt(this.cacheHumiRaw) + this.humiOffset, 100), 0)
+        this.humiService.updateCharacteristic(this.hapChar.CurrentRelativeHumidity, this.cacheHumi)
+        this.accessory.eveService.addEntry({ humidity: this.cacheHumi })
+        if (params.updateSource && !this.disableDeviceLogging) {
+          this.log('[%s] %s [%s%].', this.name, this.lang.curHumi, this.cacheHumi)
         }
       }
     } catch (err) {
diff --git a/lib/device/simulation/dehumidifier.js b/lib/device/simulation/dehumidifier.js
index 2ddca85e..f7901fdd 100644
--- a/lib/device/simulation/dehumidifier.js
+++ b/lib/device/simulation/dehumidifier.js
@@ -22,6 +22,10 @@ module.exports = class deviceHumidifier {
     const deviceConf2 = platform.simulations[accessory.context.eweDeviceId]
     this.tempOffset =
       deviceConf && deviceConf.offset ? deviceConf.offset : platform.consts.defaultValues.offset
+    this.humiOffset =
+      deviceConf && deviceConf.humidityOffset
+        ? deviceConf.humidityOffset
+        : platform.consts.defaultValues.humidityOffset
     this.disableDeviceLogging =
       (deviceConf && deviceConf.overrideDisabledLogging) || deviceConf2.overrideDisabledLogging
         ? false
@@ -113,6 +117,7 @@ module.exports = class deviceHumidifier {
     if (platform.config.debug) {
       const opts = JSON.stringify({
         disableDeviceLogging: this.disableDeviceLogging,
+        humidityOffset: this.humiOffset,
         offset: this.tempOffset,
         type: deviceConf2.type
       })
@@ -234,30 +239,28 @@ module.exports = class deviceHumidifier {
       }
       if (
         this.funcs.hasProperty(params, 'currentTemperature') &&
-        params.currentTemperature !== 'unavailable'
+        params.currentTemperature !== 'unavailable' &&
+        this.cacheTempRaw !== params.currentTemperature
       ) {
-        if (this.cacheTempRaw !== params.currentTemperature) {
-          this.cacheTempRaw = params.currentTemperature
-          this.cacheTemp = Number(params.currentTemperature) + this.tempOffset
-          this.tempService.updateCharacteristic(this.hapChar.CurrentTemperature, this.cacheTemp)
-          this.accessory.eveService.addEntry({ temp: this.cacheTemp })
-          if (params.updateSource && !this.disableDeviceLogging) {
-            this.log('[%s] %s [%s°C].', this.name, this.lang.curTemp, this.cacheTemp)
-          }
+        this.cacheTempRaw = params.currentTemperature
+        this.cacheTemp = Number(params.currentTemperature) + this.tempOffset
+        this.tempService.updateCharacteristic(this.hapChar.CurrentTemperature, this.cacheTemp)
+        this.accessory.eveService.addEntry({ temp: this.cacheTemp })
+        if (params.updateSource && !this.disableDeviceLogging) {
+          this.log('[%s] %s [%s°C].', this.name, this.lang.curTemp, this.cacheTemp)
         }
       }
       if (
         this.funcs.hasProperty(params, 'currentHumidity') &&
-        params.currentHumidity !== 'unavailable'
+        params.currentHumidity !== 'unavailable' &&
+        this.cacheHumiRaw !== params.currentHumidity
       ) {
-        if (this.cacheHumiRaw !== params.currentHumidity) {
-          this.cacheHumiRaw = params.currentHumidity
-          this.cacheHumi = parseInt(params.currentHumidity)
-          this.service.updateCharacteristic(this.hapChar.CurrentRelativeHumidity, this.cacheHumi)
-          this.accessory.eveService.addEntry({ humidity: this.cacheHumi })
-          if (params.updateSource && !this.disableDeviceLogging) {
-            this.log('[%s] %s [%s%].', this.name, this.lang.curHumi, this.cacheHumi)
-          }
+        this.cacheHumiRaw = params.currentHumidity
+        this.cacheHumi = Math.max(Math.Min(parseInt(this.cacheHumiRaw) + this.humiOffset, 100), 0)
+        this.service.updateCharacteristic(this.hapChar.CurrentRelativeHumidity, this.cacheHumi)
+        this.accessory.eveService.addEntry({ humidity: this.cacheHumi })
+        if (params.updateSource && !this.disableDeviceLogging) {
+          this.log('[%s] %s [%s%].', this.name, this.lang.curHumi, this.cacheHumi)
         }
       }
     } catch (err) {
diff --git a/lib/device/simulation/heater.js b/lib/device/simulation/heater.js
index 8c7d8037..50a54754 100644
--- a/lib/device/simulation/heater.js
+++ b/lib/device/simulation/heater.js
@@ -22,6 +22,10 @@ module.exports = class deviceHeater {
     const deviceConf2 = platform.simulations[accessory.context.eweDeviceId]
     this.tempOffset =
       deviceConf && deviceConf.offset ? deviceConf.offset : platform.consts.defaultValues.offset
+    this.humiOffset =
+      deviceConf && deviceConf.humidityOffset
+        ? deviceConf.humidityOffset
+        : platform.consts.defaultValues.humidityOffset
     this.minTarget =
       deviceConf && deviceConf.minTarget
         ? deviceConf.minTarget
@@ -140,6 +144,7 @@ module.exports = class deviceHeater {
     if (platform.config.debug) {
       const opts = JSON.stringify({
         disableDeviceLogging: this.disableDeviceLogging,
+        humidityOffset: this.humiOffset,
         maxTarget: this.maxTarget,
         minTarget: this.minTarget,
         offset: this.tempOffset,
@@ -255,34 +260,29 @@ module.exports = class deviceHeater {
       }
       if (
         this.funcs.hasProperty(params, 'currentTemperature') &&
-        params.currentTemperature !== 'unavailable'
+        params.currentTemperature !== 'unavailable' &&
+        this.cacheTempRaw !== params.currentTemperature
       ) {
-        if (this.cacheTempRaw !== params.currentTemperature) {
-          this.cacheTempRaw = params.currentTemperature
-          this.cacheTemp = Number(params.currentTemperature) + this.tempOffset
-          this.service.updateCharacteristic(this.hapChar.CurrentTemperature, this.cacheTemp)
-          this.accessory.eveService.addEntry({ temp: this.cacheTemp })
-          if (params.updateSource && !this.disableDeviceLogging) {
-            this.log('[%s] %s [%s°C].', this.name, this.lang.curTemp, this.cacheTemp)
-          }
+        this.cacheTempRaw = params.currentTemperature
+        this.cacheTemp = Number(params.currentTemperature) + this.tempOffset
+        this.service.updateCharacteristic(this.hapChar.CurrentTemperature, this.cacheTemp)
+        this.accessory.eveService.addEntry({ temp: this.cacheTemp })
+        if (params.updateSource && !this.disableDeviceLogging) {
+          this.log('[%s] %s [%s°C].', this.name, this.lang.curTemp, this.cacheTemp)
         }
       }
       if (
         this.funcs.hasProperty(params, 'currentHumidity') &&
         params.currentHumidity !== 'unavailable' &&
-        this.humiService
+        this.humiService &&
+        this.cacheHumiRaw !== params.currentHumidity
       ) {
-        if (this.cacheHumiRaw !== params.currentHumidity) {
-          this.cacheHumiRaw = params.currentHumidity
-          this.cacheHumi = parseInt(params.currentHumidity)
-          this.humiService.updateCharacteristic(
-            this.hapChar.CurrentRelativeHumidity,
-            this.cacheHumi
-          )
-          this.accessory.eveService.addEntry({ humidity: this.cacheHumi })
-          if (params.updateSource && !this.disableDeviceLogging) {
-            this.log('[%s] %s [%s%].', this.name, this.lang.curHumi, this.cacheHumi)
-          }
+        this.cacheHumiRaw = params.currentHumidity
+        this.cacheHumi = Math.max(Math.Min(parseInt(this.cacheHumiRaw) + this.humiOffset, 100), 0)
+        this.humiService.updateCharacteristic(this.hapChar.CurrentRelativeHumidity, this.cacheHumi)
+        this.accessory.eveService.addEntry({ humidity: this.cacheHumi })
+        if (params.updateSource && !this.disableDeviceLogging) {
+          this.log('[%s] %s [%s%].', this.name, this.lang.curHumi, this.cacheHumi)
         }
       }
     } catch (err) {
diff --git a/lib/device/simulation/humidifier.js b/lib/device/simulation/humidifier.js
index 42c94ea9..ead49bfc 100644
--- a/lib/device/simulation/humidifier.js
+++ b/lib/device/simulation/humidifier.js
@@ -22,6 +22,10 @@ module.exports = class deviceHumidifier {
     const deviceConf2 = platform.simulations[accessory.context.eweDeviceId]
     this.tempOffset =
       deviceConf && deviceConf.offset ? deviceConf.offset : platform.consts.defaultValues.offset
+    this.humiOffset =
+      deviceConf && deviceConf.humidityOffset
+        ? deviceConf.humidityOffset
+        : platform.consts.defaultValues.humidityOffset
     this.disableDeviceLogging =
       (deviceConf && deviceConf.overrideDisabledLogging) || deviceConf2.overrideDisabledLogging
         ? false
@@ -113,6 +117,7 @@ module.exports = class deviceHumidifier {
     if (platform.config.debug) {
       const opts = JSON.stringify({
         disableDeviceLogging: this.disableDeviceLogging,
+        humidityOffset: this.humiOffset,
         offset: this.tempOffset,
         type: deviceConf2.type
       })
@@ -234,30 +239,28 @@ module.exports = class deviceHumidifier {
       }
       if (
         this.funcs.hasProperty(params, 'currentTemperature') &&
-        params.currentTemperature !== 'unavailable'
+        params.currentTemperature !== 'unavailable' &&
+        this.cacheTempRaw !== params.currentTemperature
       ) {
-        if (this.cacheTempRaw !== params.currentTemperature) {
-          this.cacheTempRaw = params.currentTemperature
-          this.cacheTemp = Number(params.currentTemperature) + this.tempOffset
-          this.tempService.updateCharacteristic(this.hapChar.CurrentTemperature, this.cacheTemp)
-          this.accessory.eveService.addEntry({ temp: this.cacheTemp })
-          if (params.updateSource && !this.disableDeviceLogging) {
-            this.log('[%s] %s [%s°C].', this.name, this.lang.curTemp, this.cacheTemp)
-          }
+        this.cacheTempRaw = params.currentTemperature
+        this.cacheTemp = Number(params.currentTemperature) + this.tempOffset
+        this.tempService.updateCharacteristic(this.hapChar.CurrentTemperature, this.cacheTemp)
+        this.accessory.eveService.addEntry({ temp: this.cacheTemp })
+        if (params.updateSource && !this.disableDeviceLogging) {
+          this.log('[%s] %s [%s°C].', this.name, this.lang.curTemp, this.cacheTemp)
         }
       }
       if (
         this.funcs.hasProperty(params, 'currentHumidity') &&
-        params.currentHumidity !== 'unavailable'
+        params.currentHumidity !== 'unavailable' &&
+        this.cacheHumiRaw !== params.currentHumidity
       ) {
-        if (this.cacheHumiRaw !== params.currentHumidity) {
-          this.cacheHumiRaw = params.currentHumidity
-          this.cacheHumi = parseInt(params.currentHumidity)
-          this.service.updateCharacteristic(this.hapChar.CurrentRelativeHumidity, this.cacheHumi)
-          this.accessory.eveService.addEntry({ humidity: this.cacheHumi })
-          if (params.updateSource && !this.disableDeviceLogging) {
-            this.log('[%s] %s [%s%].', this.name, this.lang.curHumi, this.cacheHumi)
-          }
+        this.cacheHumiRaw = params.currentHumidity
+        this.cacheHumi = Math.max(Math.Min(parseInt(this.cacheHumiRaw) + this.humiOffset, 100), 0)
+        this.service.updateCharacteristic(this.hapChar.CurrentRelativeHumidity, this.cacheHumi)
+        this.accessory.eveService.addEntry({ humidity: this.cacheHumi })
+        if (params.updateSource && !this.disableDeviceLogging) {
+          this.log('[%s] %s [%s%].', this.name, this.lang.curHumi, this.cacheHumi)
         }
       }
     } catch (err) {
diff --git a/lib/device/zigbee/sensor-ambient.js b/lib/device/zigbee/sensor-ambient.js
index c1a42ef1..1ed51093 100644
--- a/lib/device/zigbee/sensor-ambient.js
+++ b/lib/device/zigbee/sensor-ambient.js
@@ -24,6 +24,10 @@ module.exports = class deviceZBSensorAmbient {
         : platform.consts.defaultValues.lowBattThreshold
     this.tempOffset =
       deviceConf && deviceConf.offset ? deviceConf.offset : platform.consts.defaultValues.offset
+    this.humiOffset =
+      deviceConf && deviceConf.humidityOffset
+        ? deviceConf.humidityOffset
+        : platform.consts.defaultValues.humidityOffset
     this.disableDeviceLogging =
       deviceConf && deviceConf.overrideDisabledLogging
         ? false
@@ -58,6 +62,7 @@ module.exports = class deviceZBSensorAmbient {
     if (platform.config.debug) {
       const opts = JSON.stringify({
         disableDeviceLogging: this.disableDeviceLogging,
+        humidityOffset: this.humiOffset,
         lowBattThreshold: this.lowBattThreshold,
         offset: this.tempOffset
       })
@@ -80,22 +85,28 @@ module.exports = class deviceZBSensorAmbient {
         }
       }
       const eveLog = {}
-      if (this.funcs.hasProperty(params, 'temperature') && params.temperature !== this.cacheTemp) {
-        this.cacheTemp = params.temperature
-        const currentTemp = parseInt(this.cacheTemp) / 100 + this.tempOffset
-        this.tempService.updateCharacteristic(this.hapChar.CurrentTemperature, currentTemp)
-        eveLog.temp = currentTemp
+      if (
+        this.funcs.hasProperty(params, 'temperature') &&
+        params.temperature !== this.cacheTempRaw
+      ) {
+        this.cacheTempRaw = params.temperature
+        this.cacheTemp = parseInt(this.cacheTemp) / 100 + this.tempOffset
+        this.tempService.updateCharacteristic(this.hapChar.CurrentTemperature, this.cacheTemp)
+        eveLog.temp = this.cacheTemp
         if (params.updateSource && !this.disableDeviceLogging) {
-          this.log('[%s] %s [%s°C].', this.name, this.lang.curTemp, currentTemp)
+          this.log('[%s] %s [%s°C].', this.name, this.lang.curTemp, this.cacheTemp)
         }
       }
-      if (this.funcs.hasProperty(params, 'humidity') && params.humidity !== this.cacheHumi) {
-        this.cacheHumi = params.humidity
-        const currentHumi = parseInt(this.cacheHumi) / 100
-        this.humiService.updateCharacteristic(this.hapChar.CurrentRelativeHumidity, currentHumi)
-        eveLog.humidity = currentHumi
+      if (this.funcs.hasProperty(params, 'humidity') && params.humidity !== this.cacheHumiRaw) {
+        this.cacheHumiRaw = params.humidity
+        this.cacheHumi = Math.max(
+          Math.Min(parseInt(this.cacheHumiRaw) / 100 + this.humiOffset, 100),
+          0
+        )
+        this.humiService.updateCharacteristic(this.hapChar.CurrentRelativeHumidity, this.cacheHumi)
+        eveLog.humidity = this.cacheHumi
         if (params.updateSource && !this.disableDeviceLogging) {
-          this.log('[%s] %s [%s%].', this.name, this.lang.curHumi, currentHumi)
+          this.log('[%s] %s [%s%].', this.name, this.lang.curHumi, this.cacheHumi)
         }
       }
       if (eveLog.temp || eveLog.humidity) {
diff --git a/lib/index.js b/lib/index.js
index e51245ab..8e3d3a6e 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -285,6 +285,19 @@ class eWeLinkPlatform {
                     }
                     this[key][id][k] = v === 'false' ? false : !!v
                     break
+                  case 'humidityOffset': {
+                    if (typeof v === 'string') {
+                      logQuotes(key + '.' + id + '.' + k)
+                    }
+                    const intVal = parseInt(v)
+                    if (isNaN(intVal)) {
+                      logDefault(key + '.' + id + '.' + k, this.consts.defaultValues[k])
+                      this[key][id][k] = this.consts.defaultValues[k]
+                    } else {
+                      this[key][id][k] = intVal
+                    }
+                    break
+                  }
                   case 'ipAddress': {
                     if (typeof v !== 'string' || v === '') {
                       logIgnore(key + '.' + id + '.' + k)
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 16593861..16d76931 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -36,6 +36,7 @@ module.exports = {
     sensorTimeLength: 60,
     sensorTimeDifference: 120,
     offset: 0,
+    humidityOffset: 0,
     minTarget: 10,
     maxTarget: 30,
     operationTime: 100,
@@ -107,6 +108,7 @@ module.exports = {
       'label',
       'hideSwitch',
       'offset',
+      'humidityOffset',
       'minTarget',
       'maxTarget',
       'overrideDisabledLogging'
@@ -116,6 +118,7 @@ module.exports = {
       'deviceId',
       'lowBattThreshold',
       'offset',
+      'humidityOffset',
       'hideLongDouble',
       'scaleBattery',
       'sensorTimeDifference',

From 2457b9d2495897eaa4194dcfb1eae2931c0f8867 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 14 Jun 2021 10:01:15 +0100
Subject: [PATCH 2199/3183] reenable test for lan polling for outlet devices

---
 lib/connection/lan.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/connection/lan.js b/lib/connection/lan.js
index 29410848..ac1b1a0b 100644
--- a/lib/connection/lan.js
+++ b/lib/connection/lan.js
@@ -186,9 +186,8 @@ module.exports = class connectionLAN {
         }
         suffix = 'switch'
       } else if (json.params.uiActive) {
-        // params.uiActive = json.params.uiActive
-        // suffix = 'monitor'
-        throw new Error(this.lang.devNotConfLAN)
+        params.uiActive = json.params.uiActive
+        suffix = 'monitor'
       } else if (json.params.cmd) {
         params.cmd = 'transmit'
         params.rfChl = json.params.rfChl

From 182e0508f9e4860dd136ddc8ea7b84f1f61bacfb Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 14 Jun 2021 10:01:17 +0100
Subject: [PATCH 2200/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8a12a6ed..83014113 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,16 @@
 
 All notable changes to this homebridge-ewelink will be documented in this file.
 
+## BETA
+
+### Added
+
+- Config option to offset the recorded humidity (%RH) for devices that report this
+
+### Changes
+
+- [test] Polling via LAN mode for outlet devices that report power attributes
+
 ## 6.8.0 (2021-06-14)
 
 ### Added

From c43d7e37921af1f131ca5275a7db383cbc824776 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 14 Jun 2021 10:02:03 +0100
Subject: [PATCH 2201/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 83014113..4f6f0f0f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,9 +7,6 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 ### Added
 
 - Config option to offset the recorded humidity (%RH) for devices that report this
-
-### Changes
-
 - [test] Polling via LAN mode for outlet devices that report power attributes
 
 ## 6.8.0 (2021-06-14)

From fef761825a34fc903f6240a2759e201040e139da Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 14 Jun 2021 10:06:08 +0100
Subject: [PATCH 2202/3183] fix math.min capitalisation

---
 lib/device/sensor-ambient.js          | 2 +-
 lib/device/sensor-temp-humi.js        | 2 +-
 lib/device/simulation/cooler.js       | 2 +-
 lib/device/simulation/dehumidifier.js | 2 +-
 lib/device/simulation/heater.js       | 2 +-
 lib/device/simulation/humidifier.js   | 2 +-
 lib/device/zigbee/sensor-ambient.js   | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/device/sensor-ambient.js b/lib/device/sensor-ambient.js
index c212df3b..5ef45d09 100644
--- a/lib/device/sensor-ambient.js
+++ b/lib/device/sensor-ambient.js
@@ -169,7 +169,7 @@ module.exports = class deviceSensorAmbient {
         this.cacheHumiRaw !== params.currentHumidity
       ) {
         this.cacheHumiRaw = params.currentHumidity
-        this.cacheHumi = Math.max(Math.Min(parseInt(this.cacheHumiRaw) + this.humiOffset, 100), 0)
+        this.cacheHumi = Math.max(Math.min(parseInt(this.cacheHumiRaw) + this.humiOffset, 100), 0)
         eveLog.humidity = this.cacheHumi
         this.humiService.updateCharacteristic(this.hapChar.CurrentRelativeHumidity, this.cacheHumi)
         if (params.updateSource && !this.disableDeviceLogging) {
diff --git a/lib/device/sensor-temp-humi.js b/lib/device/sensor-temp-humi.js
index b64029c4..ecb9344d 100644
--- a/lib/device/sensor-temp-humi.js
+++ b/lib/device/sensor-temp-humi.js
@@ -77,7 +77,7 @@ module.exports = class deviceSensorTempHumi {
       }
       if (this.funcs.hasProperty(params, 'humidity') && this.cacheHumiRaw !== params.humidity) {
         this.cacheHumiRaw = params.humidity
-        this.cacheHumi = Math.max(Math.Min(parseInt(this.cacheHumiRaw) + this.humiOffset, 100), 0)
+        this.cacheHumi = Math.max(Math.min(parseInt(this.cacheHumiRaw) + this.humiOffset, 100), 0)
         eveLog.humidity = this.cacheHumi
         this.humiService.updateCharacteristic(this.hapChar.CurrentRelativeHumidity, this.cacheHumi)
         if (params.updateSource && !this.disableDeviceLogging) {
diff --git a/lib/device/simulation/cooler.js b/lib/device/simulation/cooler.js
index 70eb8aba..8e8675c4 100644
--- a/lib/device/simulation/cooler.js
+++ b/lib/device/simulation/cooler.js
@@ -278,7 +278,7 @@ module.exports = class deviceCooler {
         this.cacheHumiRaw !== params.currentHumidity
       ) {
         this.cacheHumiRaw = params.currentHumidity
-        this.cacheHumi = Math.max(Math.Min(parseInt(this.cacheHumiRaw) + this.humiOffset, 100), 0)
+        this.cacheHumi = Math.max(Math.min(parseInt(this.cacheHumiRaw) + this.humiOffset, 100), 0)
         this.humiService.updateCharacteristic(this.hapChar.CurrentRelativeHumidity, this.cacheHumi)
         this.accessory.eveService.addEntry({ humidity: this.cacheHumi })
         if (params.updateSource && !this.disableDeviceLogging) {
diff --git a/lib/device/simulation/dehumidifier.js b/lib/device/simulation/dehumidifier.js
index f7901fdd..2b51cbe3 100644
--- a/lib/device/simulation/dehumidifier.js
+++ b/lib/device/simulation/dehumidifier.js
@@ -256,7 +256,7 @@ module.exports = class deviceHumidifier {
         this.cacheHumiRaw !== params.currentHumidity
       ) {
         this.cacheHumiRaw = params.currentHumidity
-        this.cacheHumi = Math.max(Math.Min(parseInt(this.cacheHumiRaw) + this.humiOffset, 100), 0)
+        this.cacheHumi = Math.max(Math.min(parseInt(this.cacheHumiRaw) + this.humiOffset, 100), 0)
         this.service.updateCharacteristic(this.hapChar.CurrentRelativeHumidity, this.cacheHumi)
         this.accessory.eveService.addEntry({ humidity: this.cacheHumi })
         if (params.updateSource && !this.disableDeviceLogging) {
diff --git a/lib/device/simulation/heater.js b/lib/device/simulation/heater.js
index 50a54754..87f514e1 100644
--- a/lib/device/simulation/heater.js
+++ b/lib/device/simulation/heater.js
@@ -278,7 +278,7 @@ module.exports = class deviceHeater {
         this.cacheHumiRaw !== params.currentHumidity
       ) {
         this.cacheHumiRaw = params.currentHumidity
-        this.cacheHumi = Math.max(Math.Min(parseInt(this.cacheHumiRaw) + this.humiOffset, 100), 0)
+        this.cacheHumi = Math.max(Math.min(parseInt(this.cacheHumiRaw) + this.humiOffset, 100), 0)
         this.humiService.updateCharacteristic(this.hapChar.CurrentRelativeHumidity, this.cacheHumi)
         this.accessory.eveService.addEntry({ humidity: this.cacheHumi })
         if (params.updateSource && !this.disableDeviceLogging) {
diff --git a/lib/device/simulation/humidifier.js b/lib/device/simulation/humidifier.js
index ead49bfc..6af4f95d 100644
--- a/lib/device/simulation/humidifier.js
+++ b/lib/device/simulation/humidifier.js
@@ -256,7 +256,7 @@ module.exports = class deviceHumidifier {
         this.cacheHumiRaw !== params.currentHumidity
       ) {
         this.cacheHumiRaw = params.currentHumidity
-        this.cacheHumi = Math.max(Math.Min(parseInt(this.cacheHumiRaw) + this.humiOffset, 100), 0)
+        this.cacheHumi = Math.max(Math.min(parseInt(this.cacheHumiRaw) + this.humiOffset, 100), 0)
         this.service.updateCharacteristic(this.hapChar.CurrentRelativeHumidity, this.cacheHumi)
         this.accessory.eveService.addEntry({ humidity: this.cacheHumi })
         if (params.updateSource && !this.disableDeviceLogging) {
diff --git a/lib/device/zigbee/sensor-ambient.js b/lib/device/zigbee/sensor-ambient.js
index 1ed51093..447dd417 100644
--- a/lib/device/zigbee/sensor-ambient.js
+++ b/lib/device/zigbee/sensor-ambient.js
@@ -100,7 +100,7 @@ module.exports = class deviceZBSensorAmbient {
       if (this.funcs.hasProperty(params, 'humidity') && params.humidity !== this.cacheHumiRaw) {
         this.cacheHumiRaw = params.humidity
         this.cacheHumi = Math.max(
-          Math.Min(parseInt(this.cacheHumiRaw) / 100 + this.humiOffset, 100),
+          Math.min(parseInt(this.cacheHumiRaw) / 100 + this.humiOffset, 100),
           0
         )
         this.humiService.updateCharacteristic(this.hapChar.CurrentRelativeHumidity, this.cacheHumi)

From 2cd6ef7fb5917d99e74cc28100a5bb6885f87a4a Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 14 Jun 2021 10:06:46 +0100
Subject: [PATCH 2203/3183] 6.8.1-beta.0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 9dcbb147..59f3df9a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.8.0",
+  "version": "6.8.1-beta.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 74009541..84b2ff68 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.8.0",
+  "version": "6.8.1-beta.0",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 5183b1f575221ef56848206fc58142ba103e9b86 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 15 Jun 2021 08:09:14 +0100
Subject: [PATCH 2204/3183] ensure cloud access when using TH simulation

---
 lib/index.js | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/lib/index.js b/lib/index.js
index 8e3d3a6e..d780da45 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -907,7 +907,8 @@ class eWeLinkPlatform {
       } else if (
         this.simulations[device.deviceid] &&
         this.simulations[device.deviceid].type === 'thermostat' &&
-        this.consts.devices.sensorAmbient.includes(uiid)
+        this.consts.devices.sensorAmbient.includes(uiid) &&
+        this.config.mode !== 'lan'
       ) {
         /*************************************
         HEATERS [TH10/16 ACCESSORY SIMULATION]
@@ -919,7 +920,8 @@ class eWeLinkPlatform {
       } else if (
         this.simulations[device.deviceid] &&
         this.simulations[device.deviceid].type === 'cooler' &&
-        this.consts.devices.sensorAmbient.includes(uiid)
+        this.consts.devices.sensorAmbient.includes(uiid) &&
+        this.config.mode !== 'lan'
       ) {
         /*************************************
         COOLERS [TH10/16 ACCESSORY SIMULATION]
@@ -931,7 +933,8 @@ class eWeLinkPlatform {
       } else if (
         this.simulations[device.deviceid] &&
         this.simulations[device.deviceid].type === 'humidifier' &&
-        this.consts.devices.sensorAmbient.includes(uiid)
+        this.consts.devices.sensorAmbient.includes(uiid) &&
+        this.config.mode !== 'lan'
       ) {
         /*****************************************
         HUMIDIFIERS [TH10/16 ACCESSORY SIMULATION]
@@ -947,7 +950,8 @@ class eWeLinkPlatform {
       } else if (
         this.simulations[device.deviceid] &&
         this.simulations[device.deviceid].type === 'dehumidifier' &&
-        this.consts.devices.sensorAmbient.includes(uiid)
+        this.consts.devices.sensorAmbient.includes(uiid) &&
+        this.config.mode !== 'lan'
       ) {
         /*******************************************
         DEHUMIDIFIERS [TH10/16 ACCESSORY SIMULATION]

From 9b4d03879de56ee839de52bfc2bd5037c255e5a3 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 15 Jun 2021 08:33:54 +0100
Subject: [PATCH 2205/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4f6f0f0f..1dbc5074 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,10 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 - Config option to offset the recorded humidity (%RH) for devices that report this
 - [test] Polling via LAN mode for outlet devices that report power attributes
 
+### Changes
+
+- If `mode` is `lan` then the plugin will not use accessory simulations for TH10/16 devices
+
 ## 6.8.0 (2021-06-14)
 
 ### Added

From 12e45f92341944ab181562f2f5d6544d37f11f7e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 15 Jun 2021 09:16:34 +0100
Subject: [PATCH 2206/3183] add parameter for logging sending updates

---
 lib/index.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/index.js b/lib/index.js
index d780da45..821a6286 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1504,11 +1504,11 @@ class eWeLinkPlatform {
     }
   }
 
-  async sendDeviceUpdate (accessory, params) {
+  async sendDeviceUpdate (accessory, params, log = true) {
     // Add to a queue so multiple updates are at least 500ms apart
     return await queue.add(async () => {
       // Log the update being sent
-      if (this.config.debug) {
+      if (this.config.debug && log) {
         this.log('[%s] %s %s.', accessory.displayName, this.lang.updSend, JSON.stringify(params))
       }
 
@@ -1531,7 +1531,7 @@ class eWeLinkPlatform {
         // Check to see if the device is online
         if (wsClient) {
           // Log the revert if appropriate
-          if (this.config.debug) {
+          if (this.config.debug && log) {
             this.log('[%s] %s %s.', accessory.displayName, this.lang.revertWS, res)
           }
 

From 96b8f38a7bfcbae93b5cd0ff4e4c2968010f2289 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 15 Jun 2021 09:16:57 +0100
Subject: [PATCH 2207/3183] add polling for TH devices

---
 lib/device/sensor-ambient.js          | 22 ++++++++++++++++++++++
 lib/device/simulation/cooler.js       | 20 ++++++++++++++++++++
 lib/device/simulation/dehumidifier.js | 20 ++++++++++++++++++++
 lib/device/simulation/heater.js       | 20 ++++++++++++++++++++
 lib/device/simulation/humidifier.js   | 20 ++++++++++++++++++++
 5 files changed, 102 insertions(+)

diff --git a/lib/device/sensor-ambient.js b/lib/device/sensor-ambient.js
index 5ef45d09..d958bcca 100644
--- a/lib/device/sensor-ambient.js
+++ b/lib/device/sensor-ambient.js
@@ -96,6 +96,19 @@ module.exports = class deviceSensorAmbient {
       log: platform.config.debugFakegato ? this.log : () => {}
     })
 
+    // Set up an interval to get eWeLink to send regular temperature/humidity updates
+    if (platform.config.mode !== 'lan') {
+      setTimeout(() => {
+        this.internalUIUpdate()
+        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
+      }, 5000)
+
+      // Stop the intervals on Homebridge shutdown
+      platform.api.on('shutdown', () => {
+        clearInterval(this.intervalPoll)
+      })
+    }
+
     // Output the customised options to the log if in debug mode
     if (platform.config.debug) {
       const opts = JSON.stringify({
@@ -133,6 +146,15 @@ module.exports = class deviceSensorAmbient {
     }
   }
 
+  async internalUIUpdate () {
+    try {
+      const params = { uiActive: 120 }
+      await this.platform.sendDeviceUpdate(this.accessory, params, false)
+    } catch (err) {
+      // Suppress errors here
+    }
+  }
+
   async externalUpdate (params) {
     try {
       if (!this.hideSwitch && params.switch) {
diff --git a/lib/device/simulation/cooler.js b/lib/device/simulation/cooler.js
index 8e8675c4..bdc2c28a 100644
--- a/lib/device/simulation/cooler.js
+++ b/lib/device/simulation/cooler.js
@@ -138,8 +138,19 @@ module.exports = class deviceCooler {
         this.hapChar.CoolingThresholdTemperature,
         this.accessory.context.cacheTarget
       )
+    }, 3000)
+
+    // Set up an interval to get eWeLink to send regular temperature/humidity updates
+    setTimeout(() => {
+      this.internalUIUpdate()
+      this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
     }, 5000)
 
+    // Stop the intervals on Homebridge shutdown
+    platform.api.on('shutdown', () => {
+      clearInterval(this.intervalPoll)
+    })
+
     // Output the customised options to the log if in debug mode
     if (platform.config.debug) {
       const opts = JSON.stringify({
@@ -230,6 +241,15 @@ module.exports = class deviceCooler {
     }
   }
 
+  async internalUIUpdate () {
+    try {
+      const params = { uiActive: 120 }
+      await this.platform.sendDeviceUpdate(this.accessory, params, false)
+    } catch (err) {
+      // Suppress errors here
+    }
+  }
+
   async externalUpdate (params) {
     try {
       if (params.mainSwitch) {
diff --git a/lib/device/simulation/dehumidifier.js b/lib/device/simulation/dehumidifier.js
index 2b51cbe3..52666777 100644
--- a/lib/device/simulation/dehumidifier.js
+++ b/lib/device/simulation/dehumidifier.js
@@ -111,8 +111,19 @@ module.exports = class deviceHumidifier {
         this.hapChar.RelativeHumidityDehumidifierThreshold,
         this.accessory.context.cacheTarget
       )
+    }, 3000)
+
+    // Set up an interval to get eWeLink to send regular temperature/humidity updates
+    setTimeout(() => {
+      this.internalUIUpdate()
+      this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
     }, 5000)
 
+    // Stop the intervals on Homebridge shutdown
+    platform.api.on('shutdown', () => {
+      clearInterval(this.intervalPoll)
+    })
+
     // Output the customised options to the log if in debug mode
     if (platform.config.debug) {
       const opts = JSON.stringify({
@@ -209,6 +220,15 @@ module.exports = class deviceHumidifier {
     }
   }
 
+  async internalUIUpdate () {
+    try {
+      const params = { uiActive: 120 }
+      await this.platform.sendDeviceUpdate(this.accessory, params, false)
+    } catch (err) {
+      // Suppress errors here
+    }
+  }
+
   async externalUpdate (params) {
     try {
       if (params.mainSwitch) {
diff --git a/lib/device/simulation/heater.js b/lib/device/simulation/heater.js
index 87f514e1..8efb46c6 100644
--- a/lib/device/simulation/heater.js
+++ b/lib/device/simulation/heater.js
@@ -138,8 +138,19 @@ module.exports = class deviceHeater {
         this.hapChar.HeatingThresholdTemperature,
         this.accessory.context.cacheTarget
       )
+    }, 3000)
+
+    // Set up an interval to get eWeLink to send regular temperature/humidity updates
+    setTimeout(() => {
+      this.internalUIUpdate()
+      this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
     }, 5000)
 
+    // Stop the intervals on Homebridge shutdown
+    platform.api.on('shutdown', () => {
+      clearInterval(this.intervalPoll)
+    })
+
     // Output the customised options to the log if in debug mode
     if (platform.config.debug) {
       const opts = JSON.stringify({
@@ -230,6 +241,15 @@ module.exports = class deviceHeater {
     }
   }
 
+  async internalUIUpdate () {
+    try {
+      const params = { uiActive: 120 }
+      await this.platform.sendDeviceUpdate(this.accessory, params, false)
+    } catch (err) {
+      // Suppress errors here
+    }
+  }
+
   async externalUpdate (params) {
     try {
       if (params.mainSwitch) {
diff --git a/lib/device/simulation/humidifier.js b/lib/device/simulation/humidifier.js
index 6af4f95d..2361c044 100644
--- a/lib/device/simulation/humidifier.js
+++ b/lib/device/simulation/humidifier.js
@@ -111,8 +111,19 @@ module.exports = class deviceHumidifier {
         this.hapChar.RelativeHumidityHumidifierThreshold,
         this.accessory.context.cacheTarget
       )
+    }, 3000)
+
+    // Set up an interval to get eWeLink to send regular temperature/humidity updates
+    setTimeout(() => {
+      this.internalUIUpdate()
+      this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
     }, 5000)
 
+    // Stop the intervals on Homebridge shutdown
+    platform.api.on('shutdown', () => {
+      clearInterval(this.intervalPoll)
+    })
+
     // Output the customised options to the log if in debug mode
     if (platform.config.debug) {
       const opts = JSON.stringify({
@@ -209,6 +220,15 @@ module.exports = class deviceHumidifier {
     }
   }
 
+  async internalUIUpdate () {
+    try {
+      const params = { uiActive: 120 }
+      await this.platform.sendDeviceUpdate(this.accessory, params, false)
+    } catch (err) {
+      // Suppress errors here
+    }
+  }
+
   async externalUpdate (params) {
     try {
       if (params.mainSwitch) {

From d70f69faf336f25199c0fa17bd5ddc5becd462f1 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 15 Jun 2021 09:17:44 +0100
Subject: [PATCH 2208/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1dbc5074..a303d27f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 ### Added
 
 - Config option to offset the recorded humidity (%RH) for devices that report this
+- Polling for TH10/16 devices as they do not seem to send regular updates from firmware 3.5.0
 - [test] Polling via LAN mode for outlet devices that report power attributes
 
 ### Changes

From e2a1d27084b5f587aad802a5028b63b1b641676d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 15 Jun 2021 09:19:11 +0100
Subject: [PATCH 2209/3183] amend polling for powr2 and dualr3

---
 lib/device/outlet-double.js | 8 ++++----
 lib/device/outlet-power.js  | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/device/outlet-double.js b/lib/device/outlet-double.js
index 60d30af4..4081b0d4 100644
--- a/lib/device/outlet-double.js
+++ b/lib/device/outlet-double.js
@@ -60,7 +60,7 @@ module.exports = class deviceOutletDouble {
 
     setTimeout(() => {
       this.internalUIUpdate()
-      this.intervalPoll = setInterval(() => this.internalUIUpdate(), 60000)
+      this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
     }, 5000)
 
     // Stop the intervals on Homebridge shutdown
@@ -200,10 +200,10 @@ module.exports = class deviceOutletDouble {
 
   async internalUIUpdate () {
     try {
-      const params = { uiActive: 60 }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
+      const params = { uiActive: 120 }
+      await this.platform.sendDeviceUpdate(this.accessory, params, false)
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
+      // Suppress errors here
     }
   }
 
diff --git a/lib/device/outlet-power.js b/lib/device/outlet-power.js
index bc2d3086..7c78f67e 100644
--- a/lib/device/outlet-power.js
+++ b/lib/device/outlet-power.js
@@ -105,7 +105,7 @@ module.exports = class deviceOutletPower {
     // Set up an interval to get eWeLink to send power updates
     setTimeout(() => {
       this.internalUIUpdate()
-      this.intervalPoll = setInterval(() => this.internalUIUpdate(), 60000)
+      this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
     }, 5000)
 
     // Stop the intervals on Homebridge shutdown
@@ -154,10 +154,10 @@ module.exports = class deviceOutletPower {
 
   async internalUIUpdate () {
     try {
-      const params = { uiActive: 60 }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
+      const params = { uiActive: 120 }
+      await this.platform.sendDeviceUpdate(this.accessory, params, false)
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
+      // Suppress errors here
     }
   }
 

From 654724f1aed3532239d9484e21d3aa243799c053 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 15 Jun 2021 09:20:20 +0100
Subject: [PATCH 2210/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a303d27f..4e3b8c8a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,8 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 ### Changes
 
 - If `mode` is `lan` then the plugin will not use accessory simulations for TH10/16 devices
+- Power reading polling for POWR2 and DUALR3 increased to two minutes
+- Device polling (for power, temperature and humidity) will no longer log when sending updates
 
 ## 6.8.0 (2021-06-14)
 

From 0b0ad32c1377bfdbd41f7276f1093b09288aba9c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 15 Jun 2021 10:38:17 +0100
Subject: [PATCH 2211/3183] th10/16 doesnt support local uiActive polling

---
 lib/connection/lan.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/connection/lan.js b/lib/connection/lan.js
index ac1b1a0b..56008612 100644
--- a/lib/connection/lan.js
+++ b/lib/connection/lan.js
@@ -185,7 +185,8 @@ module.exports = class connectionLAN {
           }
         }
         suffix = 'switch'
-      } else if (json.params.uiActive) {
+      } else if (json.params.uiActive && uiid !== 15) {
+        // Not supported at least for TH10/16
         params.uiActive = json.params.uiActive
         suffix = 'monitor'
       } else if (json.params.cmd) {

From 14a2bffb808bb792ecbf9a84c199d2e94c44cd8d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 15 Jun 2021 13:59:06 +0100
Subject: [PATCH 2212/3183] remove unneeded TH10/16 info from logs

---
 lib/utils/constants.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 16d76931..777c2905 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -202,7 +202,6 @@ module.exports = {
     'currentHumidity',
     'currentTemperature',
     'currLocation',
-    'deviceType',
     'humidity',
     'key',
     'lightbright',
@@ -221,7 +220,6 @@ module.exports = {
     'rfChl',
     'rfList',
     'rfTrig',
-    'sensorType',
     'setclose',
     'state',
     'switch',

From 780f2967b8281e8c0f560f3c5088045f5dd25d50 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 15 Jun 2021 13:59:15 +0100
Subject: [PATCH 2213/3183] remove ip from log if unchanged

---
 lib/connection/lan.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/connection/lan.js b/lib/connection/lan.js
index 56008612..8c52fcf5 100644
--- a/lib/connection/lan.js
+++ b/lib/connection/lan.js
@@ -132,9 +132,11 @@ module.exports = class connectionLAN {
 
             // If any params are left then generate the template to be emitted
             if (Object.keys(params).length > 0) {
+              if (packet.address !== deviceInfo.ip) {
+                params.ip = packet.address
+              }
               params.online = true
               params.updateSource = 'LAN'
-              params.ip = packet.address
               const returnTemplate = {
                 deviceid: rdata.id,
                 params

From f94b726cfaae74b59e6d588e086ac582fb50b2bd Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 15 Jun 2021 14:00:58 +0100
Subject: [PATCH 2214/3183] 6.8.1-beta.1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 59f3df9a..f5941cc4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.8.1-beta.0",
+  "version": "6.8.1-beta.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 84b2ff68..45b50b6c 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.8.1-beta.0",
+  "version": "6.8.1-beta.1",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 38434f5374fefad3e5d74e1b95b14a9362dc50b9 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 15 Jun 2021 15:41:40 +0100
Subject: [PATCH 2215/3183] bump node 14.17.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 45b50b6c..32d215fe 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
   "main": "lib/index.js",
   "engines": {
     "homebridge": "^1.3.3",
-    "node": "^14.17.0"
+    "node": "^14.17.1"
   },
   "repository": {
     "type": "git",

From c28fa9ee0d31a890af50661a7f3ed6e47ca7a2e1 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 15 Jun 2021 15:41:42 +0100
Subject: [PATCH 2216/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4e3b8c8a..589077b7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 - If `mode` is `lan` then the plugin will not use accessory simulations for TH10/16 devices
 - Power reading polling for POWR2 and DUALR3 increased to two minutes
 - Device polling (for power, temperature and humidity) will no longer log when sending updates
+- Recommended node version bump to v14.17.1
 
 ## 6.8.0 (2021-06-14)
 

From 3ff6c6ecace40e7f4db6d3d17a858b612c24c26d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 15 Jun 2021 15:53:29 +0100
Subject: [PATCH 2217/3183] ignore node 16 warning

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 32d215fe..a7f79102 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
   "main": "lib/index.js",
   "engines": {
     "homebridge": "^1.3.3",
-    "node": "^14.17.1"
+    "node": "^14.17.1 || ^16.3.0"
   },
   "repository": {
     "type": "git",

From 902ad6fd83c7bae5f4190cb5173b767eee430ae4 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 15 Jun 2021 16:03:13 +0100
Subject: [PATCH 2218/3183] 6.8.1-beta.2

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index f5941cc4..645e5886 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.8.1-beta.1",
+  "version": "6.8.1-beta.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index a7f79102..463873c1 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.8.1-beta.1",
+  "version": "6.8.1-beta.2",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 11a920cec6a12bad53d79a8eeaccd9a1c25eb5f2 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 16 Jun 2021 11:28:10 +0100
Subject: [PATCH 2219/3183] feat: lan only mode (with no ewelink creds)

---
 lib/connection/lan.js |  91 ++++++++++++++------------------
 lib/index.js          | 119 +++++++++++++++++++++++++++---------------
 lib/utils/lang-en.js  |   9 ++--
 3 files changed, 121 insertions(+), 98 deletions(-)

diff --git a/lib/connection/lan.js b/lib/connection/lan.js
index 8c52fcf5..fff23347 100644
--- a/lib/connection/lan.js
+++ b/lib/connection/lan.js
@@ -8,7 +8,7 @@ const dnsSd = require('node-dns-sd')
 const emitter = new (require('events'))()
 
 module.exports = class connectionLAN {
-  constructor (platform, devices) {
+  constructor (platform) {
     // Set up variables from the platform
     this.consts = platform.consts
     this.debug = platform.config.debug
@@ -20,23 +20,15 @@ module.exports = class connectionLAN {
 
     // Set up other variables and libraries needed by this class
     this.deviceMap = new Map()
-
-    // Create a template map with our device list from the HTTP client
-    devices.forEach(device => {
-      // Don't continue if the device doesn't support LAN mode
-      if (!this.consts.devices.lanIn.includes(device.extra.uiid)) {
-        return
-      }
-
-      // Add this device into the map with it's key and user configured IP
-      this.deviceMap.set(device.deviceid, {
-        apiKey: device.devicekey,
-        ip: this.ipOverride[device.deviceid]
-      })
-    })
   }
 
   async getHosts () {
+    // Create a template map with our device list from the HTTP client
+    for (const [deviceId, ip] of Object.entries(this.ipOverride)) {
+      // Add this device into the map with it's user configured IP
+      this.deviceMap.set(deviceId, { ip })
+    }
+
     // Perform an initial discovery of devices on the local network
     if (this.debug) {
       this.log('%s.', this.lang.lanStarting)
@@ -50,15 +42,7 @@ module.exports = class connectionLAN {
     res.forEach(device => {
       // Obtain the ewelink deviceId and check to see it is in our map
       const deviceId = device.fqdn.replace('._ewelink._tcp.local', '').replace('eWeLink_', '')
-      let d
-      if ((d = this.deviceMap.get(deviceId)) && !d.ip) {
-        // Update the map with the found IP address
-        this.deviceMap.set(deviceId, {
-          apiKey: d.apiKey,
-          ip: device.address,
-          lastIV: null
-        })
-      }
+      this.deviceMap.set(deviceId, { ip: device.address })
     })
     return this.deviceMap
   }
@@ -74,6 +58,7 @@ module.exports = class connectionLAN {
           .filter(value => value.name.includes('_ewelink._tcp.local'))
           .filter(value => value.type === 'TXT')
           .filter(value => this.deviceMap.has(value.rdata.id))
+          .filter(value => this.deviceMap.get(value.rdata.id).lanKey)
           .forEach(value => {
             const rdata = value.rdata
 
@@ -91,7 +76,7 @@ module.exports = class connectionLAN {
               rdata.data1 + (rdata.data2 || '') + (rdata.data3 || '') + (rdata.data4 || '')
             const key = crypto
               .createHash('md5')
-              .update(Buffer.from(deviceInfo.apiKey, 'utf8'))
+              .update(Buffer.from(deviceInfo.lanKey, 'utf8'))
               .digest()
             const dText = crypto.createDecipheriv(
               'aes-128-cbc',
@@ -104,14 +89,12 @@ module.exports = class connectionLAN {
             ]).toString('utf8')
 
             // Check to see if the IP address of the device has changed
-            if (packet.address !== deviceInfo.ip && !this.ipOverride[rdata.id]) {
-              this.deviceMap.set(rdata.id, {
-                apiKey: deviceInfo.apiKey,
-                ip: packet.address,
-                lastIV: rdata.iv
-              })
+            if (packet.address !== deviceInfo.ip) {
+              deviceInfo.ip = packet.address
             }
 
+            this.deviceMap.set(rdata.id, deviceInfo)
+
             // Parse the deconstructed information from the packet
             let params
             try {
@@ -155,15 +138,27 @@ module.exports = class connectionLAN {
     this.log('%s.', this.lang.lanMonitor)
   }
 
-  async sendUpdate (json, uiid) {
+  async sendUpdate (json, context) {
     try {
+      // Check this device exists in the map
+      if (!this.deviceMap.has(json.deviceid)) {
+        throw new Error(this.lang.devNotReachLAN)
+      }
+
+      const deviceInfo = this.deviceMap.get(json.deviceid)
+
       // Check we have an IP address for the device
-      if (!this.deviceMap.get(json.deviceid).ip) {
+      if (!deviceInfo.ip) {
         throw new Error(this.lang.devNotReachLAN)
       }
-      let apiKey
-      let suffix
+
+      // Check we have the device lan key
+      if (!deviceInfo.lanKey) {
+        throw new Error(this.lang.devNoAPIKey)
+      }
+
       const params = {}
+      let suffix
 
       // /dimmable for D1, /transmit for RF Bridge and /switch /switches are supported
       if (json.params.brightness) {
@@ -176,7 +171,7 @@ module.exports = class connectionLAN {
         suffix = 'switches'
       } else if (json.params.switch) {
         params.switch = json.params.switch
-        if (uiid === 15) {
+        if (context.uiid === 15) {
           // TH10/16 only supports LAN in normal mode
           if (json.params.deviceType === 'normal') {
             // Extra params for the TH10/16
@@ -187,7 +182,7 @@ module.exports = class connectionLAN {
           }
         }
         suffix = 'switch'
-      } else if (json.params.uiActive && uiid !== 15) {
+      } else if (json.params.uiActive && context.uiid !== 15) {
         // Not supported at least for TH10/16
         params.uiActive = json.params.uiActive
         suffix = 'monitor'
@@ -199,15 +194,10 @@ module.exports = class connectionLAN {
         throw new Error(this.lang.devNotConfLAN)
       }
 
-      // Check we have the device API key
-      if (!(apiKey = this.deviceMap.get(json.deviceid).apiKey)) {
-        throw new Error(this.lang.devNoAPIKey)
-      }
-
       // Generate the HTTP request
       const key = crypto
         .createHash('md5')
-        .update(Buffer.from(apiKey, 'utf8'))
+        .update(Buffer.from(deviceInfo.lanKey, 'utf8'))
         .digest()
       const iv = crypto.randomBytes(16)
       const enc = crypto.createCipheriv('aes-128-cbc', key, iv)
@@ -221,10 +211,9 @@ module.exports = class connectionLAN {
       }
 
       // Send the HTTP request
-      const ip = this.deviceMap.get(json.deviceid).ip
       const res = await axios({
         method: 'post',
-        url: 'http://' + ip + ':8081/zeroconf/' + suffix,
+        url: 'http://' + deviceInfo.ip + ':8081/zeroconf/' + suffix,
         headers: {
           Accept: 'application/json',
           'Content-Type': 'application/json'
@@ -250,13 +239,11 @@ module.exports = class connectionLAN {
     emitter.addListener('update', f)
   }
 
-  addDeviceToMap (device) {
-    // Adds a device to the map if it is discovered by the plugin
-    this.deviceMap.set(device.deviceid, {
-      apiKey: device.devicekey,
-      ip: this.ipOverride[device.deviceid],
-      lastIV: null
-    })
+  addDeviceDetailsToMap (deviceId, context) {
+    const entry = this.deviceMap.get(deviceId) || { ip: this.ipOverride[deviceId] }
+    entry.lanKey = context.lanKey
+    entry.uiid = context.eweUIID
+    this.deviceMap.set(deviceId, entry)
   }
 
   async closeConnection () {
diff --git a/lib/index.js b/lib/index.js
index 821a6286..35dcb626 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -60,10 +60,19 @@ class eWeLinkPlatform {
       }
 
       // Check the user has configured the plugin
-      if (!config || !config.username || !config.password) {
-        throw new Error(this.lang.missingCreds)
+      if (!config) {
+        throw new Error(this.lang.pluginNotConf)
       }
 
+      this.log(
+        ' v%s | Node %s | HB v%s%s...',
+        this.lang.initialising,
+        plugin.version,
+        process.version,
+        api.serverVersion,
+        config.plugin_map ? ' | HOOBS' : ''
+      )
+
       // Apply the user's configuration
       this.config = this.consts.defaultConfig
       this.applyUserConfig(config)
@@ -73,14 +82,9 @@ class eWeLinkPlatform {
       this.api.on('shutdown', () => this.pluginShutdown())
     } catch (err) {
       // Catch any errors during initialisation
-      const hideErrLines = [
-        this.lang.hbVersionFail,
-        this.lang.missingCreds,
-        this.lang.missingPW,
-        this.lang.missingUN
-      ]
+      const hideErrLines = [this.lang.hbVersionFail, this.lang.pluginNotConf]
       const eText = hideErrLines.includes(err.message) ? err.message : this.funcs.parseError(err)
-      log.warn('***** %s [v%s]. *****', this.lang.disabling, plugin.version)
+      log.warn('***** %s. *****', this.lang.disabling)
       log.warn('***** %s. *****', eText)
     }
   }
@@ -462,16 +466,18 @@ class eWeLinkPlatform {
         case 'plugin_map':
           break
         case 'password':
-          if (typeof val !== 'string' || val === '') {
-            throw new Error(this.lang.missingPW)
+          if (typeof val !== 'string') {
+            logIgnore(key)
+          } else {
+            this.config.password = val
           }
-          this.config.password = val
           break
         case 'username':
-          if (typeof val !== 'string' || val === '') {
-            throw new Error(this.lang.missingUN)
+          if (typeof val !== 'string') {
+            logIgnore(key)
+          } else {
+            this.config.username = val.replace(/[\s]+/g, '')
           }
-          this.config.username = val.replace(/[\s]+/g, '')
           break
         default:
           logRemove(key)
@@ -483,45 +489,71 @@ class eWeLinkPlatform {
   async pluginSetup () {
     // Plugin has finished initialising so now onto setup
     try {
+      // Log that the plugin initialisation has been successful
+      this.log('%s.', this.lang.initialised)
+
       // If the user has disabled the plugin then remove all accessories
       if (this.config.disablePlugin) {
         devicesInHB.forEach(accessory => this.removeAccessory(accessory))
         throw new Error(this.lang.disabled)
       }
 
-      // Log that the plugin initialisation has been successful
-      this.log('[v%s] %s.', plugin.version, this.lang.initialised)
-
       // Require any libraries that the accessory instances use
       this.colourUtils = require('./utils/colour-utils')
       this.eveService = require('./fakegato/fakegato-history')(this.api)
       this.eveChar = new (require('./utils/eve-chars'))(this.api)
 
-      // Set up the HTTP client, get the user HTTP host, and login
-      httpClient = new (require('./connection/http'))(this)
-      const authData = await httpClient.login()
-      this.config.password = authData.password
+      const deviceList = []
+
+      // Username and password are now optional
+      if (this.config.username && this.config.password) {
+        // Set up the HTTP client, get the user HTTP host, and login
+        try {
+          httpClient = new (require('./connection/http'))(this)
+          const authData = await httpClient.login()
+          this.config.password = authData.password
 
-      // Get a device list via HTTP request
-      const deviceList = await httpClient.getDevices()
+          // Get a device list via HTTP request
+          const httpDeviceList = await httpClient.getDevices()
+          httpDeviceList.forEach(device => deviceList.push(device))
 
-      // Set up the WS client, get the user WS host, and login
-      if (this.config.mode !== 'lan') {
-        wsClient = new (require('./connection/ws'))(this, authData)
-        await wsClient.login()
+          // Set up the WS client, get the user WS host, and login
+          if (this.config.mode !== 'lan') {
+            wsClient = new (require('./connection/ws'))(this, authData)
+            await wsClient.login()
+          }
+        } catch (err) {
+          const eText = this.funcs.parseError(err)
+          this.log.warn('%s %s.', this.lang.httpDisabled, eText)
+        }
+      } else {
+        this.log.warn('%s %s.', this.lang.httpDisabled, this.lang.missingCreds)
       }
 
       // Set up the LAN client, scan for devices and start monitoring
       if (this.config.mode !== 'wan') {
-        lanClient = new (require('./connection/lan'))(this, deviceList)
+        lanClient = new (require('./connection/lan'))(this)
         lanDevices = await lanClient.getHosts()
         await lanClient.startMonitor()
       }
 
-      // Remove HB accessories that are no longer in eWeLink account
+      // Check for redundant accessories (in HB but not eWeLink)
       devicesInHB.forEach(accessory => {
         if (!deviceList.some(el => el.deviceid === accessory.context.eweDeviceId)) {
-          this.removeAccessory(accessory)
+          // Keep compatible LAN devices that aren't ignored (for LAN-only mode)
+          if (
+            this.config.mode === 'lan' &&
+            this.consts.devices.lanOut.includes(accessory.context.eweUIID) &&
+            !this.config.ignoredDevices.includes(accessory.context.eweDeviceId)
+          ) {
+            // We only want to initialise the primary accessory for each device
+            if (['X', '0'].includes(accessory.context.switchNumber)) {
+              this.initialiseDevice(accessory.context.fullInfo)
+            }
+          } else {
+            // Remove the accessory from Homebridge
+            this.removeAccessory(accessory)
+          }
         }
       })
 
@@ -552,7 +584,7 @@ class eWeLinkPlatform {
       }
 
       // Set up the listener server for the API if the user has this enabled
-      if (this.config.apiPort !== 0) {
+      if (this.config.apiPort !== 0 && this.config.password) {
         apiClient = new (require('./connection/api'))(this, devicesInHB)
         apiServer = http.createServer(async (req, res) => {
           // The 'homepage' shows an html document with info about the API
@@ -600,7 +632,7 @@ class eWeLinkPlatform {
           : this.config.debug
           ? err
           : this.funcs.parseError(err)
-      this.log.warn('***** %s [v%s]. *****', this.lang.disabling, plugin.version)
+      this.log.warn('***** %s. *****', this.lang.disabling)
       this.log.warn('***** %s. *****', eText)
       this.pluginShutdown()
     }
@@ -1100,6 +1132,7 @@ class eWeLinkPlatform {
               : false
           subAccessory.context.macAddress =
             device.extra && device.extra.staMac ? device.extra.staMac : false
+          subAccessory.context.lanKey = device.devicekey
           subAccessory.control = this.consts.devices.doubleSwitch.includes(uiid)
             ? this.multiDevices[device.deviceid] && this.multiDevices[device.deviceid].showAsOutlet
               ? new (require('./device/outlet-double'))(this, subAccessory, devicesInHB)
@@ -1232,6 +1265,7 @@ class eWeLinkPlatform {
               : false
           subAccessory.context.macAddress =
             device.extra && device.extra.staMac ? device.extra.staMac : false
+          subAccessory.context.lanKey = device.devicekey
 
           // Update any changes to the sub accessory to the platform
           this.api.updatePlatformAccessories(plugin.name, plugin.alias, [subAccessory])
@@ -1336,6 +1370,12 @@ class eWeLinkPlatform {
         lanClient && accessory.context.reachableLAN ? lanDevices.get(device.deviceid).ip : false
       accessory.context.macAddress =
         device.extra && device.extra.staMac ? device.extra.staMac : false
+      accessory.context.lanKey = device.devicekey
+      accessory.context.fullInfo = device
+
+      if (lanClient) {
+        lanClient.addDeviceDetailsToMap(device.deviceid, accessory.context)
+      }
 
       // Helpful logging for each device
       const str = accessory.context.reachableLAN
@@ -1494,8 +1534,8 @@ class eWeLinkPlatform {
   removeAccessory (accessory) {
     try {
       // Remove an accessory from Homebridge
-      this.api.unregisterPlatformAccessories(plugin.name, plugin.alias, [accessory])
-      devicesInHB.delete(accessory.UUID)
+      // this.api.unregisterPlatformAccessories(plugin.name, plugin.alias, [accessory])
+      // devicesInHB.delete(accessory.UUID)
       this.log('[%s] %s.', accessory.displayName, this.lang.devRemove)
     } catch (err) {
       // Catch any errors during remove
@@ -1524,7 +1564,7 @@ class eWeLinkPlatform {
         ? this.lang.lanDisabled
         : !this.consts.devices.lanOut.includes(accessory.context.eweUIID)
         ? this.lang.lanNotSup
-        : await lanClient.sendUpdate(payload, accessory.context.eweUIID)
+        : await lanClient.sendUpdate(payload, accessory.context)
 
       // Revert to WS if LAN mode not possible for whatever reason
       if (res !== 'ok') {
@@ -1675,7 +1715,7 @@ class eWeLinkPlatform {
       // The device does not exist in HB so let's try to add it
       try {
         // Don't continue if the user has hidden this device
-        if (this.config.ignoredDevices.includes(deviceId)) {
+        if (this.config.ignoredDevices.includes(deviceId) || !httpClient) {
           return
         }
 
@@ -1689,11 +1729,6 @@ class eWeLinkPlatform {
 
         // Initialise the device in HB
         this.initialiseDevice(newDevice)
-
-        // Add the device to the LAN client map
-        if (lanClient && this.consts.devices.lanIn.includes(newDevice.extra.uiid)) {
-          lanClient.addDeviceToMap(newDevice)
-        }
       } catch (err) {
         // Automatically adding the new device failed for some reason
         const eText = this.funcs.parseError(err)
diff --git a/lib/utils/lang-en.js b/lib/utils/lang-en.js
index 6832d429..f0dbc6b4 100644
--- a/lib/utils/lang-en.js
+++ b/lib/utils/lang-en.js
@@ -72,9 +72,11 @@ module.exports = {
   eweError: 'An eWeLink error [500] occured, retrying in 30 seconds',
   foundWithIP: 'found locally with IP',
   hbVersionFail: 'Your version of Homebridge is too low - please update to v1.3',
+  httpDisabled: 'HTTP/WS clients disabled as',
   httpRetry: 'Unable to reach eWeLink, retrying in 30 seconds',
   identify: 'identify button pressed',
-  initialised: 'initialised. Syncing with eWeLink',
+  initialised: 'Plugin initialised. Setting up accessories...',
+  initialising: 'Initialising plugin',
   invalidConfig: 'invalid config',
   lanDisabled: 'LAN mode is disabled',
   lanErr: 'unknown LAN error',
@@ -88,9 +90,7 @@ module.exports = {
   leakYes: 'leak detected',
   lockLocked: 'locked',
   lockUnlocked: 'unlocked',
-  missingCreds: 'eWeLink credentials missing from configuration',
-  missingPW: 'eWeLink password missing from configuration',
-  missingUN: 'eWeLink username missing from configuration',
+  missingCreds: 'eWeLink credentials not configured',
   motionNo: 'motion not detected',
   motionYes: 'motion detected',
   newRegionRec: 'New HTTP API host received',
@@ -98,6 +98,7 @@ module.exports = {
   noGarageForOD: 'No corresponding garage door accessory found',
   noRegionRec: 'No valid region received',
   noWSHost: 'Server did not respond with a web socket host',
+  pluginNotConf: 'Plugin has not been configured',
   recNew: 'receiving update for new device',
   repOffline: 'reported [offline]',
   repOnline: 'reported [online]',

From 7643c6b3a8437dfb864cce27720c0fbcfda7b171 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 16 Jun 2021 11:28:42 +0100
Subject: [PATCH 2220/3183] 6.8.1-beta.3

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 645e5886..1f99a455 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.8.1-beta.2",
+  "version": "6.8.1-beta.3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 463873c1..0bb05ddb 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.8.1-beta.2",
+  "version": "6.8.1-beta.3",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 74edbe56c19d15594ee63e9e8a45bc41d4ee862e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 16 Jun 2021 11:30:49 +0100
Subject: [PATCH 2221/3183] Update switch-stateless.js

---
 lib/device/zigbee/switch-stateless.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/device/zigbee/switch-stateless.js b/lib/device/zigbee/switch-stateless.js
index 8dda5a63..56a0f778 100644
--- a/lib/device/zigbee/switch-stateless.js
+++ b/lib/device/zigbee/switch-stateless.js
@@ -70,9 +70,13 @@ module.exports = class deviceZBSwitchStateless {
           this.log('[%s] %s [%s%].', this.name, this.lang.curBatt, this.cacheBattScaled)
         }
       }
-      if (this.funcs.hasProperty(params, 'key') && [0, 1, 2].includes(params.key)) {
+      if (
+        params.updateSource &&
+        this.funcs.hasProperty(params, 'key') &&
+        [0, 1, 2].includes(params.key)
+      ) {
         this.service.updateCharacteristic(this.hapChar.ProgrammableSwitchEvent, params.key)
-        if (params.updateSource && !this.disableDeviceLogging) {
+        if (!this.disableDeviceLogging) {
           const textLabel =
             params.key === 0
               ? this.lang.buttonSingle

From 1fc9f7bc781e95e5c672af25cd602af2eed4e242 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 16 Jun 2021 11:31:23 +0100
Subject: [PATCH 2222/3183] 6.8.1-beta.4

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 1f99a455..c9697b44 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.8.1-beta.3",
+  "version": "6.8.1-beta.4",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 0bb05ddb..63460da5 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.8.1-beta.3",
+  "version": "6.8.1-beta.4",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 5a567809b7b144238e0c4dd42a0706a9c2abf1ea Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 16 Jun 2021 11:48:37 +0100
Subject: [PATCH 2223/3183] Update switch-stateless.js

---
 lib/device/zigbee/switch-stateless.js | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/lib/device/zigbee/switch-stateless.js b/lib/device/zigbee/switch-stateless.js
index 56a0f778..5df7fa15 100644
--- a/lib/device/zigbee/switch-stateless.js
+++ b/lib/device/zigbee/switch-stateless.js
@@ -70,20 +70,19 @@ module.exports = class deviceZBSwitchStateless {
           this.log('[%s] %s [%s%].', this.name, this.lang.curBatt, this.cacheBattScaled)
         }
       }
-      if (
-        params.updateSource &&
-        this.funcs.hasProperty(params, 'key') &&
-        [0, 1, 2].includes(params.key)
-      ) {
-        this.service.updateCharacteristic(this.hapChar.ProgrammableSwitchEvent, params.key)
-        if (!this.disableDeviceLogging) {
-          const textLabel =
-            params.key === 0
-              ? this.lang.buttonSingle
-              : params.key === 1
-              ? this.lang.buttonDouble
-              : this.lang.buttonLong
-          this.log('[%s] %s [%s].', this.name, this.lang.curState, textLabel)
+      if (this.funcs.hasProperty(params, 'key') && [0, 1, 2].includes(params.key)) {
+        const timeDiff = ((new Date()).getTime() - params.trigTime) / 1000
+        if (timeDiff < 30) {
+          this.service.updateCharacteristic(this.hapChar.ProgrammableSwitchEvent, params.key)
+          if (params.updateSource && !this.disableDeviceLogging) {
+            const textLabel =
+              params.key === 0
+                ? this.lang.buttonSingle
+                : params.key === 1
+                ? this.lang.buttonDouble
+                : this.lang.buttonLong
+            this.log('[%s] %s [%s].', this.name, this.lang.curState, textLabel)
+          }
         }
       }
     } catch (err) {

From 9689712ecde11f586722c8ce6c586c91c0dc99c3 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 16 Jun 2021 11:50:05 +0100
Subject: [PATCH 2224/3183] Update switch-stateless.js

---
 lib/device/zigbee/switch-stateless.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/device/zigbee/switch-stateless.js b/lib/device/zigbee/switch-stateless.js
index 5df7fa15..1935259c 100644
--- a/lib/device/zigbee/switch-stateless.js
+++ b/lib/device/zigbee/switch-stateless.js
@@ -70,7 +70,11 @@ module.exports = class deviceZBSwitchStateless {
           this.log('[%s] %s [%s%].', this.name, this.lang.curBatt, this.cacheBattScaled)
         }
       }
-      if (this.funcs.hasProperty(params, 'key') && [0, 1, 2].includes(params.key)) {
+      if (
+        this.funcs.hasProperty(params, 'key') &&
+        [0, 1, 2].includes(params.key) &&
+        params.trigTime
+      ) {
         const timeDiff = ((new Date()).getTime() - params.trigTime) / 1000
         if (timeDiff < 30) {
           this.service.updateCharacteristic(this.hapChar.ProgrammableSwitchEvent, params.key)

From dd11b7ef9b3c27f359478b204dffa5911e6cb5d6 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 16 Jun 2021 11:51:03 +0100
Subject: [PATCH 2225/3183] 6.8.1-beta.5

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c9697b44..54f0adcb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.8.1-beta.4",
+  "version": "6.8.1-beta.5",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 63460da5..c26d24b7 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.8.1-beta.4",
+  "version": "6.8.1-beta.5",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 4f2eefe577138db36451700128e86e4268d3514b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 16 Jun 2021 12:13:42 +0100
Subject: [PATCH 2226/3183] sensorTimeDifference

---
 config.schema.json                    | 9 +++++----
 lib/device/zigbee/sensor-motion.js    | 5 ++---
 lib/device/zigbee/switch-stateless.js | 9 +++++++--
 lib/utils/constants.js                | 2 +-
 4 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 547f9fb6..3cb69a6e 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -456,9 +456,9 @@
             "sensorTimeDifference": {
               "type": "number",
               "title": "Sensor Lag",
-              "description": "An offset in seconds to ignore any notifications if they is a delay between this Zigbee Motion Sensor detecting something and the plugin receiving the notification. Must be 10 or more.",
+              "description": "An offset in seconds to ignore any notifications if they is a delay between this Zigbee Motion Sensor detecting something or a Zigbee Button press and the plugin receiving the notification. Must be 5 or more.",
               "placeholder": 120,
-              "minimum": 10
+              "minimum": 5
             },
             "overrideDisabledLogging": {
               "type": "boolean",
@@ -533,9 +533,9 @@
             "sensorTimeDifference": {
               "type": "number",
               "title": "Sensor Lag",
-              "description": "An offset in seconds to ignore any notifications if they is a delay between a sensor detecting something and the plugin receiving the notification. Must be 10 or more.",
+              "description": "An offset in seconds to ignore any notifications if they is a delay between a sensor detecting something and the plugin receiving the notification. Must be 5 or more.",
               "placeholder": 120,
-              "minimum": 10
+              "minimum": 5
             },
             "overrideDisabledLogging": {
               "type": "boolean",
@@ -932,6 +932,7 @@
             "sensorDevices[].humidityOffset",
             "sensorDevices[].hideLongDouble",
             "sensorDevices[].scaleBattery",
+            "sensorDevices[].sensorTimeDifference",
             "sensorDevices[].overrideDisabledLogging"
           ]
         }
diff --git a/lib/device/zigbee/sensor-motion.js b/lib/device/zigbee/sensor-motion.js
index 119f2ec4..9411603f 100644
--- a/lib/device/zigbee/sensor-motion.js
+++ b/lib/device/zigbee/sensor-motion.js
@@ -74,12 +74,11 @@ module.exports = class deviceZBSensorMotion {
         }
       }
       if (this.funcs.hasProperty(params, 'motion') && this.funcs.hasProperty(params, 'trigTime')) {
-        const timeNow = new Date()
-        const diff = (timeNow.getTime() - params.trigTime) / 1000
+        const timeDiff = ((new Date()).getTime() - params.trigTime) / 1000
         const motionDetected = !!(
           params.updateSource &&
           params.motion === 1 &&
-          diff < this.sensorTimeDifference
+          timeDiff < this.sensorTimeDifference
         )
         this.service.updateCharacteristic(this.hapChar.MotionDetected, motionDetected)
         if (motionDetected) {
diff --git a/lib/device/zigbee/switch-stateless.js b/lib/device/zigbee/switch-stateless.js
index 1935259c..d4d1e36c 100644
--- a/lib/device/zigbee/switch-stateless.js
+++ b/lib/device/zigbee/switch-stateless.js
@@ -23,6 +23,10 @@ module.exports = class deviceZBSwitchStateless {
       deviceConf && deviceConf.lowBattThreshold
         ? Math.min(deviceConf.lowBattThreshold, 100)
         : platform.consts.defaultValues.lowBattThreshold
+    this.sensorTimeDifference =
+      deviceConf && deviceConf.sensorTimeDifference
+        ? deviceConf.sensorTimeDifference
+        : platform.consts.defaultValues.sensorTimeDifference
     this.disableDeviceLogging =
       deviceConf && deviceConf.overrideDisabledLogging
         ? false
@@ -50,7 +54,8 @@ module.exports = class deviceZBSwitchStateless {
       const opts = JSON.stringify({
         disableDeviceLogging: this.disableDeviceLogging,
         hideLongDouble: this.hideLongDouble,
-        lowBattThreshold: this.lowBattThreshold
+        lowBattThreshold: this.lowBattThreshold,
+        sensorTimeDifference: this.sensorTimeDifference
       })
       this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
     }
@@ -76,7 +81,7 @@ module.exports = class deviceZBSwitchStateless {
         params.trigTime
       ) {
         const timeDiff = ((new Date()).getTime() - params.trigTime) / 1000
-        if (timeDiff < 30) {
+        if (timeDiff < this.sensorTimeDifference) {
           this.service.updateCharacteristic(this.hapChar.ProgrammableSwitchEvent, params.key)
           if (params.updateSource && !this.disableDeviceLogging) {
             const textLabel =
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 777c2905..6286c8e3 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -52,7 +52,7 @@ module.exports = {
     inUsePowerThreshold: 0,
     lowBattThreshold: 5,
     sensorTimeLength: 1,
-    sensorTimeDifference: 10,
+    sensorTimeDifference: 5,
     minTarget: 0,
     maxTarget: 1,
     operationTime: 20,

From d8adc1659c97bed9ff3100855759fadff4e3ff53 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 16 Jun 2021 12:17:49 +0100
Subject: [PATCH 2227/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 589077b7..97779c08 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,8 +6,10 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 ### Added
 
+- Plugin LAN-only mode without need for eWeLink credentials (read more)
 - Config option to offset the recorded humidity (%RH) for devices that report this
 - Polling for TH10/16 devices as they do not seem to send regular updates from firmware 3.5.0
+- Zigbee Button now compares incoming notification against last trigger time
 - [test] Polling via LAN mode for outlet devices that report power attributes
 
 ### Changes
@@ -15,6 +17,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 - If `mode` is `lan` then the plugin will not use accessory simulations for TH10/16 devices
 - Power reading polling for POWR2 and DUALR3 increased to two minutes
 - Device polling (for power, temperature and humidity) will no longer log when sending updates
+- `sensorTimeDifference` minimum value reduced to 5 seconds
 - Recommended node version bump to v14.17.1
 
 ## 6.8.0 (2021-06-14)

From e74c7f8b0a2f2570af49432e9f3e316dbc387772 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 16 Jun 2021 12:19:33 +0100
Subject: [PATCH 2228/3183] reduce sensorTimeDifference default to 60 secs

---
 config.schema.json     | 4 ++--
 lib/utils/constants.js | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 3cb69a6e..31644237 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -457,7 +457,7 @@
               "type": "number",
               "title": "Sensor Lag",
               "description": "An offset in seconds to ignore any notifications if they is a delay between this Zigbee Motion Sensor detecting something or a Zigbee Button press and the plugin receiving the notification. Must be 5 or more.",
-              "placeholder": 120,
+              "placeholder": 60,
               "minimum": 5
             },
             "overrideDisabledLogging": {
@@ -534,7 +534,7 @@
               "type": "number",
               "title": "Sensor Lag",
               "description": "An offset in seconds to ignore any notifications if they is a delay between a sensor detecting something and the plugin receiving the notification. Must be 5 or more.",
-              "placeholder": 120,
+              "placeholder": 60,
               "minimum": 5
             },
             "overrideDisabledLogging": {
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 6286c8e3..6dc008d1 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -34,7 +34,7 @@ module.exports = {
     inUsePowerThreshold: 0,
     lowBattThreshold: 25,
     sensorTimeLength: 60,
-    sensorTimeDifference: 120,
+    sensorTimeDifference: 60,
     offset: 0,
     humidityOffset: 0,
     minTarget: 10,

From 96aa0b11e8d7cb3bbc295cc3917b3e205ada0fae Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 16 Jun 2021 12:20:02 +0100
Subject: [PATCH 2229/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 97779c08..837610ad 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,7 +17,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 - If `mode` is `lan` then the plugin will not use accessory simulations for TH10/16 devices
 - Power reading polling for POWR2 and DUALR3 increased to two minutes
 - Device polling (for power, temperature and humidity) will no longer log when sending updates
-- `sensorTimeDifference` minimum value reduced to 5 seconds
+- `sensorTimeDifference` minimum reduced to 5 seconds and default reduced to 60 seconds
 - Recommended node version bump to v14.17.1
 
 ## 6.8.0 (2021-06-14)

From 90e8fde6959408bb72c531ae9cb0f700d72cc55f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 16 Jun 2021 12:24:50 +0100
Subject: [PATCH 2230/3183] syntax?

---
 lib/device/zigbee/sensor-motion.js    | 2 +-
 lib/device/zigbee/switch-stateless.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/device/zigbee/sensor-motion.js b/lib/device/zigbee/sensor-motion.js
index 9411603f..37400f67 100644
--- a/lib/device/zigbee/sensor-motion.js
+++ b/lib/device/zigbee/sensor-motion.js
@@ -74,7 +74,7 @@ module.exports = class deviceZBSensorMotion {
         }
       }
       if (this.funcs.hasProperty(params, 'motion') && this.funcs.hasProperty(params, 'trigTime')) {
-        const timeDiff = ((new Date()).getTime() - params.trigTime) / 1000
+        const timeDiff = (new Date().getTime() - params.trigTime) / 1000
         const motionDetected = !!(
           params.updateSource &&
           params.motion === 1 &&
diff --git a/lib/device/zigbee/switch-stateless.js b/lib/device/zigbee/switch-stateless.js
index d4d1e36c..086f7924 100644
--- a/lib/device/zigbee/switch-stateless.js
+++ b/lib/device/zigbee/switch-stateless.js
@@ -80,7 +80,7 @@ module.exports = class deviceZBSwitchStateless {
         [0, 1, 2].includes(params.key) &&
         params.trigTime
       ) {
-        const timeDiff = ((new Date()).getTime() - params.trigTime) / 1000
+        const timeDiff = (new Date().getTime() - params.trigTime) / 1000
         if (timeDiff < this.sensorTimeDifference) {
           this.service.updateCharacteristic(this.hapChar.ProgrammableSwitchEvent, params.key)
           if (params.updateSource && !this.disableDeviceLogging) {

From 8042a4773152ca78992124c9c2e158c04fb44861 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 16 Jun 2021 12:25:19 +0100
Subject: [PATCH 2231/3183] 6.8.1-beta.6

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 54f0adcb..772a1f71 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.8.1-beta.5",
+  "version": "6.8.1-beta.6",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index c26d24b7..aeaecb3d 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.8.1-beta.5",
+  "version": "6.8.1-beta.6",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From a65022201317dbcead75371f111abd9f41e2d617 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 16 Jun 2021 12:51:35 +0100
Subject: [PATCH 2232/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 837610ad..ead79b2c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,7 +6,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 ### Added
 
-- Plugin LAN-only mode without need for eWeLink credentials (read more)
+- Plugin LAN-only mode without need for eWeLink credentials ([read more](https://github.com/bwp91/homebridge-ewelink/wiki/Connection-Methods#lan-mode-without-ewelink-credentials))
 - Config option to offset the recorded humidity (%RH) for devices that report this
 - Polling for TH10/16 devices as they do not seem to send regular updates from firmware 3.5.0
 - Zigbee Button now compares incoming notification against last trigger time

From b0a8041cf1a1c7fe32b51e542adf702c10bf1db3 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 16 Jun 2021 14:38:23 +0100
Subject: [PATCH 2233/3183] bump ws to 7.5.0

---
 package-lock.json | 6 +++---
 package.json      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 772a1f71..3386559d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -291,9 +291,9 @@
       }
     },
     "ws": {
-      "version": "7.4.6",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.6.tgz",
-      "integrity": "sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A=="
+      "version": "7.5.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.0.tgz",
+      "integrity": "sha512-6ezXvzOZupqKj4jUqbQ9tXuJNo+BR2gU8fFRk3XCP3e0G6WT414u5ELe6Y0vtp7kmSJ3F7YWObSNr1ESsgi4vw=="
     }
   }
 }
diff --git a/package.json b/package.json
index aeaecb3d..b8b20752 100644
--- a/package.json
+++ b/package.json
@@ -53,7 +53,7 @@
     "node-dns-sd": "^0.4.2",
     "p-queue": "^6.6.2",
     "websocket-as-promised": "^2.0.1",
-    "ws": "^7.4.6"
+    "ws": "^7.5.0"
   },
   "prettier": {
     "printWidth": 100

From 09854e0a54fa991f6e74038ac98a6d9e794fd95b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 16 Jun 2021 14:39:06 +0100
Subject: [PATCH 2234/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ead79b2c..8886cc17 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 - Device polling (for power, temperature and humidity) will no longer log when sending updates
 - `sensorTimeDifference` minimum reduced to 5 seconds and default reduced to 60 seconds
 - Recommended node version bump to v14.17.1
+- Bump `ws` dependency to v7.5.0
 
 ## 6.8.0 (2021-06-14)
 

From 24016bd59d1299bde827f17dbc704f49a07723a6 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 16 Jun 2021 17:24:14 +0100
Subject: [PATCH 2235/3183] use node-persist to store device data

---
 config.schema.json     |   4 ++
 lib/connection/http.js |   8 +++
 lib/index.js           | 143 +++++++++++++++++++++++++----------------
 package-lock.json      |   5 ++
 package.json           |   1 +
 5 files changed, 106 insertions(+), 55 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 31644237..d48147b7 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -779,6 +779,10 @@
       "expandable": true,
       "items": [
         "mode",
+        {
+          "type": "help",
+          "helpvalue": "<label class=\"control-label text-warning\">⚠ Using LAN mode will remove any unsupported accessories from Homebridge.</label>"
+        },
         "countryCode",
         "httpHost",
         "apiPort",
diff --git a/lib/connection/http.js b/lib/connection/http.js
index 6d724e6c..d4f50d53 100644
--- a/lib/connection/http.js
+++ b/lib/connection/http.js
@@ -16,6 +16,7 @@ module.exports = class connectionHTTP {
     this.ignoredDevices = platform.config.ignoredDevices
     this.lang = platform.lang
     this.log = platform.log
+    this.mode = platform.config.mode
     this.obstructSwitches = platform.obstructSwitches
     this.password = platform.config.password
     this.triedBase64 = false
@@ -170,6 +171,13 @@ module.exports = class connectionHTTP {
             d.itemData.extra.uiid &&
             !this.ignoredDevices.includes(d.itemData.deviceid)
           ) {
+            // If in LAN mode then don't add to device list
+            if (
+              this.mode === 'lan' &&
+              !this.consts.devices.lanOut.includes(d.itemData.extra.uiid)
+            ) {
+              return
+            }
             // Separate the sensors as these need to be set up last
             const isObstructSwitch = this.obstructSwitches[d.itemData.deviceid]
             if (
diff --git a/lib/index.js b/lib/index.js
index 35dcb626..12871e90 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -12,6 +12,7 @@ const queue = new PQueue({
   intervalCap: 1,
   timeout: 10000
 })
+const storage = require('node-persist')
 
 // Variables for this class to use later
 let apiClient
@@ -19,6 +20,7 @@ let apiServer
 let httpClient
 let lanClient
 let lanDevices
+let storageClient
 let wsClient
 
 // Create the platform class
@@ -65,7 +67,7 @@ class eWeLinkPlatform {
       }
 
       this.log(
-        ' v%s | Node %s | HB v%s%s...',
+        '%s v%s | Node %s | HB v%s%s...',
         this.lang.initialising,
         plugin.version,
         process.version,
@@ -498,11 +500,31 @@ class eWeLinkPlatform {
         throw new Error(this.lang.disabled)
       }
 
+      // Check the eWeLink credentials are configured (except lan mode)
+      if (this.config.mode !== 'lan' && (!this.config.username || !this.config.password)) {
+        devicesInHB.forEach(accessory => this.removeAccessory(accessory))
+        throw new Error(this.lang.missingCreds)
+      }
+
       // Require any libraries that the accessory instances use
       this.colourUtils = require('./utils/colour-utils')
       this.eveService = require('./fakegato/fakegato-history')(this.api)
       this.eveChar = new (require('./utils/eve-chars'))(this.api)
 
+      // Persist files are used to store device info that could be used for LAN only mode
+      try {
+        await storage.init({
+          dir: require('path').join(this.api.user.persistPath(), '/../homebridge-ewelink'),
+          forgiveParseErrors: true
+        })
+        storageClient = true
+      } catch (err) {
+        if (this.config.debug) {
+          const eText = this.funcs.parseError(err)
+          this.log.warn('Could not setup storage client as %s.', eText)
+        }
+      }
+
       const deviceList = []
 
       // Username and password are now optional
@@ -517,72 +539,78 @@ class eWeLinkPlatform {
           const httpDeviceList = await httpClient.getDevices()
           httpDeviceList.forEach(device => deviceList.push(device))
 
-          // Set up the WS client, get the user WS host, and login
+          // Set up the WS client, get the user WS host, login, and setup the listener
           if (this.config.mode !== 'lan') {
             wsClient = new (require('./connection/ws'))(this, authData)
             await wsClient.login()
+            wsClient.receiveUpdate(device => this.receiveDeviceUpdate(device))
+
+            // Refresh the WS connection every 60 minutes
+            this.wsRefresh = setInterval(async () => {
+              try {
+                if (this.config.debug) {
+                  this.log('%s.', this.lang.wsRef)
+                }
+                await wsClient.login()
+              } catch (e) {
+                const eText = this.funcs.parseError(e)
+                this.log.warn('%s %s.', this.lang.wsRefFail, eText)
+              }
+            }, 3600000)
           }
         } catch (err) {
           const eText = this.funcs.parseError(err)
           this.log.warn('%s %s.', this.lang.httpDisabled, eText)
         }
+
+        // Clear the storage folder and start again when we have access to http devices
+        if (storageClient) {
+          try {
+            await storage.clear()
+          } catch (err) {
+            if (this.config.debug) {
+              const eText = this.funcs.parseError(err)
+              this.log.warn('Could not clear storage folder as %s.', eText)
+            }
+          }
+        }
       } else {
+        // Warn that HTTP and WS are disabled
         this.log.warn('%s %s.', this.lang.httpDisabled, this.lang.missingCreds)
-      }
 
-      // Set up the LAN client, scan for devices and start monitoring
+        // Get the persist device data if we are in lan only mode
+        if (this.config.mode === 'lan' && storageClient) {
+          try {
+            this.log('Obtaining device list from storage.')
+            const persistDeviceList = await storage.values()
+            persistDeviceList.forEach(device => deviceList.push(device))
+          } catch (err) {
+            if (this.config.debug) {
+              const eText = this.funcs.parseError(err)
+              this.log.warn('Could not read persist folder as %s.', eText)
+            }
+          }
+        }
+      }
+      
+      // Set up the LAN client, scan for device, start monitoring and setup the listener
       if (this.config.mode !== 'wan') {
         lanClient = new (require('./connection/lan'))(this)
         lanDevices = await lanClient.getHosts()
         await lanClient.startMonitor()
+        lanClient.receiveUpdate(device => this.receiveDeviceUpdate(device))
       }
 
+      // Initialise each device into HB
+      deviceList.forEach(device => this.initialiseDevice(device))
+
       // Check for redundant accessories (in HB but not eWeLink)
-      devicesInHB.forEach(accessory => {
+      devicesInHB.forEach(async accessory => {
         if (!deviceList.some(el => el.deviceid === accessory.context.eweDeviceId)) {
-          // Keep compatible LAN devices that aren't ignored (for LAN-only mode)
-          if (
-            this.config.mode === 'lan' &&
-            this.consts.devices.lanOut.includes(accessory.context.eweUIID) &&
-            !this.config.ignoredDevices.includes(accessory.context.eweDeviceId)
-          ) {
-            // We only want to initialise the primary accessory for each device
-            if (['X', '0'].includes(accessory.context.switchNumber)) {
-              this.initialiseDevice(accessory.context.fullInfo)
-            }
-          } else {
-            // Remove the accessory from Homebridge
-            this.removeAccessory(accessory)
-          }
+          this.removeAccessory(accessory)
         }
       })
 
-      // Initialise each device into HB
-      deviceList.forEach(device => this.initialiseDevice(device))
-
-      // Set up the WS and LAN listener for device updates
-      if (wsClient) {
-        wsClient.receiveUpdate(device => this.receiveDeviceUpdate(device))
-      }
-      if (lanClient) {
-        lanClient.receiveUpdate(device => this.receiveDeviceUpdate(device))
-      }
-
-      // Refresh the WS connection every 60 minutes
-      if (wsClient) {
-        this.wsRefresh = setInterval(async () => {
-          try {
-            if (this.config.debug) {
-              this.log('%s.', this.lang.wsRef)
-            }
-            await wsClient.login()
-          } catch (e) {
-            const eText = this.funcs.parseError(e)
-            this.log.warn('%s %s.', this.lang.wsRefFail, eText)
-          }
-        }, 3600000)
-      }
-
       // Set up the listener server for the API if the user has this enabled
       if (this.config.apiPort !== 0 && this.config.password) {
         apiClient = new (require('./connection/api'))(this, devicesInHB)
@@ -626,12 +654,11 @@ class eWeLinkPlatform {
       }, 2000)
     } catch (err) {
       // Catch any errors during setup
-      const eText =
-        err.message === this.lang.disabled
-          ? err.message
-          : this.config.debug
-          ? err
-          : this.funcs.parseError(err)
+      const eText = [this.lang.disabled, this.lang.missingCreds].includes(err.message)
+        ? err.message
+        : this.config.debug
+        ? err
+        : this.funcs.parseError(err)
       this.log.warn('***** %s. *****', this.lang.disabling)
       this.log.warn('***** %s. *****', eText)
       this.pluginShutdown()
@@ -665,7 +692,7 @@ class eWeLinkPlatform {
     }
   }
 
-  initialiseDevice (device) {
+  async initialiseDevice (device) {
     try {
       let accessory
       const uiid = device.extra && device.extra.uiid ? device.extra.uiid : 0
@@ -1371,8 +1398,8 @@ class eWeLinkPlatform {
       accessory.context.macAddress =
         device.extra && device.extra.staMac ? device.extra.staMac : false
       accessory.context.lanKey = device.devicekey
-      accessory.context.fullInfo = device
 
+      // Add the uuid and lanKey to the lanClient map
       if (lanClient) {
         lanClient.addDeviceDetailsToMap(device.deviceid, accessory.context)
       }
@@ -1398,8 +1425,14 @@ class eWeLinkPlatform {
       this.api.updatePlatformAccessories(plugin.name, plugin.alias, [accessory])
       devicesInHB.set(accessory.UUID, accessory)
       this.log('[%s] %s %s.', accessory.displayName, this.lang.devInit, str)
-      if (this.config.mode === 'lan' && !this.consts.devices.lanOut.includes(uiid)) {
-        this.log.warn('[%s] %s.', accessory.displayName, this.lang.devNoControl)
+
+      // Store the device in the persist file
+      if (storageClient && this.consts.devices.lanOut.includes(uiid)) {
+        try {
+          await storage.setItem(device.deviceid, device)
+        } catch (err) {
+          this.log.error(err)
+        }
       }
     } catch (err) {
       // Catch any errors during initialisation
diff --git a/package-lock.json b/package-lock.json
index 3386559d..b42a1d28 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -175,6 +175,11 @@
       "resolved": "https://registry.npmjs.org/node-dns-sd/-/node-dns-sd-0.4.2.tgz",
       "integrity": "sha512-fZvDqy19zyaiSXajmRjwue1VWLrJcy8bTV/LJVtAx8DeEFVlXRBMyZknW+q6CEfiW8Y4MQDDKh9x5wF32BHAHQ=="
     },
+    "node-persist": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/node-persist/-/node-persist-3.1.0.tgz",
+      "integrity": "sha512-/j+fd/u71wNgKf3V2bx4tnDm+3GvLnlCuvf2MXbJ3wern+67IAb6zN9Leu1tCWPlPNZ+v1hLSibVukkPK2HqJw=="
+    },
     "object-inspect": {
       "version": "1.10.3",
       "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.10.3.tgz",
diff --git a/package.json b/package.json
index b8b20752..ceb39441 100644
--- a/package.json
+++ b/package.json
@@ -51,6 +51,7 @@
     "@homebridge/plugin-ui-utils": "^0.0.19",
     "axios": "^0.21.1",
     "node-dns-sd": "^0.4.2",
+    "node-persist": "^3.1.0",
     "p-queue": "^6.6.2",
     "websocket-as-promised": "^2.0.1",
     "ws": "^7.5.0"

From ee657ce1599bc4da31a337419744033e89004516 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 16 Jun 2021 17:24:43 +0100
Subject: [PATCH 2236/3183] 6.8.1-beta.7

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b42a1d28..53a04f54 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.8.1-beta.6",
+  "version": "6.8.1-beta.7",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index ceb39441..f5a32a74 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.8.1-beta.6",
+  "version": "6.8.1-beta.7",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From b0361d16654dddf7cd4e7568fae2cefe0656b969 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 16 Jun 2021 17:59:55 +0100
Subject: [PATCH 2237/3183] [test] start of iFan lan control

---
 lib/utils/constants.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 6dc008d1..43c77c65 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -153,8 +153,8 @@ module.exports = {
   },
 
   devices: {
-    lanIn: [1, 2, 3, 4, 5, 6, 7, 8, 9, 14, 15, 28, 32, 44, 77, 78, 103, 104, 126],
-    lanOut: [1, 2, 3, 4, 5, 6, 7, 8, 9, 14, 15, 28, 32, 44, 77, 78, 126],
+    lanIn: [1, 2, 3, 4, 5, 6, 7, 8, 9, 14, 15, 28, 32, 34, 44, 77, 78, 103, 104, 126],
+    lanOut: [1, 2, 3, 4, 5, 6, 7, 8, 9, 14, 15, 28, 32, 34, 44, 77, 78, 126],
     singleSwitch: [1, 5, 6, 14, 24, 27, 112],
     doubleSwitch: [126],
     multiSwitch: [2, 3, 4, 7, 8, 9, 29, 30, 31, 41, 82, 83, 84, 113, 114],
@@ -202,8 +202,10 @@ module.exports = {
     'currentHumidity',
     'currentTemperature',
     'currLocation',
+    'fan',
     'humidity',
     'key',
+    'light',
     'lightbright',
     'lightswitch',
     'lightRcolor',
@@ -221,6 +223,7 @@ module.exports = {
     'rfList',
     'rfTrig',
     'setclose',
+    'speed',
     'state',
     'switch',
     'switches',

From aa4c8883336a8d72507afba563e7d5341d34dcf8 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 16 Jun 2021 18:00:36 +0100
Subject: [PATCH 2238/3183] 6.8.1-beta.8

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 53a04f54..420e53eb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.8.1-beta.7",
+  "version": "6.8.1-beta.8",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index f5a32a74..f3b38a29 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.8.1-beta.7",
+  "version": "6.8.1-beta.8",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 8b883118abdc8002d1c0f2a3b58d1e2dcc432934 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 16 Jun 2021 18:48:58 +0100
Subject: [PATCH 2239/3183] [test] start of iFan lan control 2

---
 lib/connection/lan.js | 23 ++++++++++++++++++++++-
 lib/device/fan.js     | 22 ++++++++++++++++++++++
 lib/index.js          |  2 +-
 3 files changed, 45 insertions(+), 2 deletions(-)

diff --git a/lib/connection/lan.js b/lib/connection/lan.js
index fff23347..45f6e531 100644
--- a/lib/connection/lan.js
+++ b/lib/connection/lan.js
@@ -167,7 +167,28 @@ module.exports = class connectionLAN {
         params.mode = 0
         suffix = 'dimmable'
       } else if (json.params.switches) {
-        params.switches = json.params.switches
+        // iFan02 product model = iFan02
+        // iFan03 product model = iFan or iFan03
+        // both have uiid 34
+        // iFan02 uses 'switches'
+        // iFan03 uses fan, light, speed
+        // model obtained here with context.eweModel
+        if (context.eweModel === 'iFan03') {
+          params.light = json.params.switches[0].switch
+          params.fan = json.params.switches[1].switch
+          switch (json.params.switches[2].switch + json.params.switches[3].switch) {
+            case 'offoff':
+              params.speed = 1
+              break
+            case 'onoff':
+              params.speed = 2
+              break
+            case 'offon':
+              params.speed = 3
+          }
+        } else {
+          params.switches = json.params.switches
+        }
         suffix = 'switches'
       } else if (json.params.switch) {
         params.switch = json.params.switch
diff --git a/lib/device/fan.js b/lib/device/fan.js
index 5d210e4b..ddd625de 100644
--- a/lib/device/fan.js
+++ b/lib/device/fan.js
@@ -176,6 +176,28 @@ module.exports = class deviceFan {
 
   async externalUpdate (params) {
     try {
+      if (params.light && params.fan && params.speed) {
+        // update from ifan03 LAN
+        params.switches = {}
+        params.switches[0] = { switch: params.light }
+        params.switches[1] = { switch: params.fan }
+        switch (params.speed) {
+          case 1:
+            params.switches[2] = { switch: 'off' }
+            params.switches[3] = { switch: 'off' }
+            break
+          case 2:
+            params.switches[2] = { switch: 'on' }
+            params.switches[3] = { switch: 'off' }
+            break
+          case 3:
+            params.switches[2] = { switch: 'off' }
+            params.switches[3] = { switch: 'on' }
+            break
+          default:
+            return
+        }
+      }
       if (!params.switches) {
         return
       }
diff --git a/lib/index.js b/lib/index.js
index 12871e90..637b8d98 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -592,7 +592,7 @@ class eWeLinkPlatform {
           }
         }
       }
-      
+
       // Set up the LAN client, scan for device, start monitoring and setup the listener
       if (this.config.mode !== 'wan') {
         lanClient = new (require('./connection/lan'))(this)

From 8136a422ba0a9564b605d205b67ccbe245eaa098 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 16 Jun 2021 18:50:30 +0100
Subject: [PATCH 2240/3183] 6.8.1-beta.9

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 420e53eb..0a96b153 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.8.1-beta.8",
+  "version": "6.8.1-beta.9",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index f3b38a29..4d08a65e 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.8.1-beta.8",
+  "version": "6.8.1-beta.9",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 8dbad8aa7bee8661e951ecbb174988814060cdb1 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 16 Jun 2021 19:09:06 +0100
Subject: [PATCH 2241/3183] update lan commands for iFan

---
 lib/connection/lan.js | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/lib/connection/lan.js b/lib/connection/lan.js
index 45f6e531..dcbb0f92 100644
--- a/lib/connection/lan.js
+++ b/lib/connection/lan.js
@@ -167,13 +167,8 @@ module.exports = class connectionLAN {
         params.mode = 0
         suffix = 'dimmable'
       } else if (json.params.switches) {
-        // iFan02 product model = iFan02
-        // iFan03 product model = iFan or iFan03
-        // both have uiid 34
-        // iFan02 uses 'switches'
-        // iFan03 uses fan, light, speed
-        // model obtained here with context.eweModel
-        if (context.eweModel === 'iFan03') {
+        if (context.uiid === 34 && ['iFan03', 'iFan'].includes(context.eweModel)) {
+          // Special format for some iFan models
           params.light = json.params.switches[0].switch
           params.fan = json.params.switches[1].switch
           switch (json.params.switches[2].switch + json.params.switches[3].switch) {
@@ -185,6 +180,8 @@ module.exports = class connectionLAN {
               break
             case 'offon':
               params.speed = 3
+            default:
+              throw new Error(this.lang.devNotConfLAN)
           }
         } else {
           params.switches = json.params.switches

From 6895024525bbb58e7b3513cc14da340a2d49baac Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 16 Jun 2021 19:10:40 +0100
Subject: [PATCH 2242/3183] add missed break

---
 lib/connection/lan.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/connection/lan.js b/lib/connection/lan.js
index dcbb0f92..408f0eeb 100644
--- a/lib/connection/lan.js
+++ b/lib/connection/lan.js
@@ -180,6 +180,7 @@ module.exports = class connectionLAN {
               break
             case 'offon':
               params.speed = 3
+              break
             default:
               throw new Error(this.lang.devNotConfLAN)
           }

From 0d5471ddf695cb3498edc5201d42542dc80d6dad Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 16 Jun 2021 19:11:10 +0100
Subject: [PATCH 2243/3183] 6.8.1-beta.10

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 0a96b153..714dff78 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.8.1-beta.9",
+  "version": "6.8.1-beta.10",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 4d08a65e..c23ef2a6 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.8.1-beta.9",
+  "version": "6.8.1-beta.10",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 7bec33e8a6f839655bf04acf41933973a3eb9fb1 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 16 Jun 2021 19:51:55 +0100
Subject: [PATCH 2244/3183] retry ifan lan control

---
 lib/connection/lan.js | 40 +++++++++++++++++++++++++---------------
 1 file changed, 25 insertions(+), 15 deletions(-)

diff --git a/lib/connection/lan.js b/lib/connection/lan.js
index 408f0eeb..bb9fdb7d 100644
--- a/lib/connection/lan.js
+++ b/lib/connection/lan.js
@@ -169,25 +169,35 @@ module.exports = class connectionLAN {
       } else if (json.params.switches) {
         if (context.uiid === 34 && ['iFan03', 'iFan'].includes(context.eweModel)) {
           // Special format for some iFan models
-          params.light = json.params.switches[0].switch
-          params.fan = json.params.switches[1].switch
-          switch (json.params.switches[2].switch + json.params.switches[3].switch) {
-            case 'offoff':
-              params.speed = 1
-              break
-            case 'onoff':
-              params.speed = 2
-              break
-            case 'offon':
-              params.speed = 3
-              break
-            default:
-              throw new Error(this.lang.devNotConfLAN)
+          if (json.params.switches[0].outlet === 0) {
+            // Change the light switch
+            params.light = json.params.switches[0].switch
+            suffix = 'light'
+          } else {
+            // change on/off or speed
+            if (json.params.switches[0].switch === 'off') {
+              // turn the device off
+              params.fan = 'off'
+            } else {
+              params.fan = 'on'
+              switch (json.params.switches[1].switch + json.params.switches[2].switch) {
+                case 'onoff':
+                  params.speed = 2
+                  break
+                case 'offon':
+                  params.speed = 3
+                  break
+                default:
+                  params.speed = 1
+                  break
+              }
+            }
+            suffix = 'fan'
           }
         } else {
           params.switches = json.params.switches
+          suffix = 'switches'
         }
-        suffix = 'switches'
       } else if (json.params.switch) {
         params.switch = json.params.switch
         if (context.uiid === 15) {

From 0203ea5ea41a11295d26da5d75203f911fd8f405 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 16 Jun 2021 19:52:44 +0100
Subject: [PATCH 2245/3183] 6.8.1-beta.11

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 714dff78..b1747363 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.8.1-beta.10",
+  "version": "6.8.1-beta.11",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index c23ef2a6..da6db585 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.8.1-beta.10",
+  "version": "6.8.1-beta.11",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 5465acfd8c489bc140621004db3acfe63d79c707 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 16 Jun 2021 20:00:19 +0100
Subject: [PATCH 2246/3183] logging

---
 lib/connection/lan.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/connection/lan.js b/lib/connection/lan.js
index bb9fdb7d..8e6707d6 100644
--- a/lib/connection/lan.js
+++ b/lib/connection/lan.js
@@ -222,6 +222,9 @@ module.exports = class connectionLAN {
       } else {
         throw new Error(this.lang.devNotConfLAN)
       }
+      
+      this.log.error(params)
+      this.log.error(suffix)
 
       // Generate the HTTP request
       const key = crypto

From ce4ed0de32ea3231b2f8fcf4c4f7862a87476a94 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 16 Jun 2021 20:00:49 +0100
Subject: [PATCH 2247/3183] 6.8.1-beta.12

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b1747363..31dc9f3d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.8.1-beta.11",
+  "version": "6.8.1-beta.12",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index da6db585..bf9cff9b 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.8.1-beta.11",
+  "version": "6.8.1-beta.12",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 63f6dcbec0a405bbf4f5f3532cbb8f7e5262e74f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 16 Jun 2021 20:10:30 +0100
Subject: [PATCH 2248/3183] Update lan.js

---
 lib/connection/lan.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/connection/lan.js b/lib/connection/lan.js
index 8e6707d6..529253b8 100644
--- a/lib/connection/lan.js
+++ b/lib/connection/lan.js
@@ -167,6 +167,7 @@ module.exports = class connectionLAN {
         params.mode = 0
         suffix = 'dimmable'
       } else if (json.params.switches) {
+        this.log.warn(context)
         if (context.uiid === 34 && ['iFan03', 'iFan'].includes(context.eweModel)) {
           // Special format for some iFan models
           if (json.params.switches[0].outlet === 0) {

From a45aebdab6a5a7435ae0d3fdcbf8384fa7b50393 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 16 Jun 2021 20:10:56 +0100
Subject: [PATCH 2249/3183] 6.8.1-beta.13

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 31dc9f3d..fe25dc59 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.8.1-beta.12",
+  "version": "6.8.1-beta.13",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index bf9cff9b..67055b13 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.8.1-beta.12",
+  "version": "6.8.1-beta.13",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 768dd993912d8c7f72982b22265e89b5b18cb0f0 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 16 Jun 2021 20:13:41 +0100
Subject: [PATCH 2250/3183] Update lan.js

---
 lib/connection/lan.js | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/lib/connection/lan.js b/lib/connection/lan.js
index 529253b8..8b871da2 100644
--- a/lib/connection/lan.js
+++ b/lib/connection/lan.js
@@ -167,8 +167,7 @@ module.exports = class connectionLAN {
         params.mode = 0
         suffix = 'dimmable'
       } else if (json.params.switches) {
-        this.log.warn(context)
-        if (context.uiid === 34 && ['iFan03', 'iFan'].includes(context.eweModel)) {
+        if (context.eweUIID === 34 && ['iFan03', 'iFan'].includes(context.eweModel)) {
           // Special format for some iFan models
           if (json.params.switches[0].outlet === 0) {
             // Change the light switch
@@ -201,7 +200,7 @@ module.exports = class connectionLAN {
         }
       } else if (json.params.switch) {
         params.switch = json.params.switch
-        if (context.uiid === 15) {
+        if (context.eweUIID === 15) {
           // TH10/16 only supports LAN in normal mode
           if (json.params.deviceType === 'normal') {
             // Extra params for the TH10/16
@@ -212,7 +211,7 @@ module.exports = class connectionLAN {
           }
         }
         suffix = 'switch'
-      } else if (json.params.uiActive && context.uiid !== 15) {
+      } else if (json.params.uiActive && context.eweUIID !== 15) {
         // Not supported at least for TH10/16
         params.uiActive = json.params.uiActive
         suffix = 'monitor'
@@ -275,7 +274,6 @@ module.exports = class connectionLAN {
   addDeviceDetailsToMap (deviceId, context) {
     const entry = this.deviceMap.get(deviceId) || { ip: this.ipOverride[deviceId] }
     entry.lanKey = context.lanKey
-    entry.uiid = context.eweUIID
     this.deviceMap.set(deviceId, entry)
   }
 

From 49636e948d5605064bf5d77426dd5bb297c67a7e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 16 Jun 2021 20:14:07 +0100
Subject: [PATCH 2251/3183] 6.8.1-beta.14

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index fe25dc59..f78c4806 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.8.1-beta.13",
+  "version": "6.8.1-beta.14",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 67055b13..ee1a3eb8 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.8.1-beta.13",
+  "version": "6.8.1-beta.14",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 28759aa6c324c994e636a4f6e83ab955bbb17382 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 16 Jun 2021 20:43:13 +0100
Subject: [PATCH 2252/3183] ifan tile improv

---
 lib/connection/lan.js | 20 ++++++++++----------
 lib/device/fan.js     | 28 ++++++++++++++++++++++++----
 2 files changed, 34 insertions(+), 14 deletions(-)

diff --git a/lib/connection/lan.js b/lib/connection/lan.js
index 8b871da2..2e3e4813 100644
--- a/lib/connection/lan.js
+++ b/lib/connection/lan.js
@@ -180,16 +180,16 @@ module.exports = class connectionLAN {
               params.fan = 'off'
             } else {
               params.fan = 'on'
-              switch (json.params.switches[1].switch + json.params.switches[2].switch) {
-                case 'onoff':
-                  params.speed = 2
-                  break
-                case 'offon':
-                  params.speed = 3
-                  break
-                default:
-                  params.speed = 1
-                  break
+              params.speed = 3
+              if (json.params.switches[1] && json.params.switches[2]) {
+                switch (json.params.switches[1].switch + json.params.switches[2].switch) {
+                  case 'offoff':
+                    params.speed = 1
+                    break
+                  case 'onoff':
+                    params.speed = 2
+                    break
+                }
               }
             }
             suffix = 'fan'
diff --git a/lib/device/fan.js b/lib/device/fan.js
index ddd625de..8b6124f5 100644
--- a/lib/device/fan.js
+++ b/lib/device/fan.js
@@ -78,9 +78,29 @@ module.exports = class deviceFan {
   }
 
   async internalStateUpdate (value) {
-    if (!value) {
-      this.service.updateCharacteristic(this.hapChar.RotationSpeed, 0)
-      await this.internalSpeedUpdate(0)
+    try {
+      const params = {
+        switches: []
+      }
+      const newState = value ? 'on' : 'off'
+      if (newState === this.cacheState) {
+        return
+      }
+      params.switches.push({
+        switch: newState,
+        outlet: 1
+      })
+      await this.platform.sendDeviceUpdate(this.accessory, params)
+      this.cacheState = newState
+      if (!this.disableDeviceLogging) {
+        this.log('[%s] %s [%s].', this.name, this.lang.curState, newState)
+      }
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, true)
+      setTimeout(() => {
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheState)
+      }, 2000)
+      throw new this.hapErr(-70402)
     }
   }
 
@@ -219,7 +239,7 @@ module.exports = class deviceFan {
         case 'offon':
           speed = 99
       }
-      if (speed !== this.cacheSpeed) {
+      if (speed !== this.cacheSpeed && this.cacheState === 'on') {
         this.cacheSpeed = speed
         this.service.updateCharacteristic(this.hapChar.RotationSpeed, this.cacheSpeed)
         if (params.updateSource && !this.disableDeviceLogging && this.cacheSpeed > 0) {

From f836b091272323342f053aaa9398dd451b4fde46 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 16 Jun 2021 20:44:09 +0100
Subject: [PATCH 2253/3183] 6.8.1-beta.15

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index f78c4806..ebcce34c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.8.1-beta.14",
+  "version": "6.8.1-beta.15",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index ee1a3eb8..2b339f34 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.8.1-beta.14",
+  "version": "6.8.1-beta.15",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 33528e3517219dda509a2fdb6f0774c170b2759b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 16 Jun 2021 22:31:42 +0100
Subject: [PATCH 2254/3183] housekeeping comments

---
 lib/connection/lan.js | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/lib/connection/lan.js b/lib/connection/lan.js
index 2e3e4813..ef607248 100644
--- a/lib/connection/lan.js
+++ b/lib/connection/lan.js
@@ -160,7 +160,7 @@ module.exports = class connectionLAN {
       const params = {}
       let suffix
 
-      // /dimmable for D1, /transmit for RF Bridge and /switch /switches are supported
+      // Check the params to see which suffix and params we need
       if (json.params.brightness) {
         params.switch = 'on'
         params.brightness = json.params.brightness
@@ -170,13 +170,12 @@ module.exports = class connectionLAN {
         if (context.eweUIID === 34 && ['iFan03', 'iFan'].includes(context.eweModel)) {
           // Special format for some iFan models
           if (json.params.switches[0].outlet === 0) {
-            // Change the light switch
+            // Turn on/off the light for the iFan
             params.light = json.params.switches[0].switch
             suffix = 'light'
           } else {
-            // change on/off or speed
+            // Change the state or speed of the iFan
             if (json.params.switches[0].switch === 'off') {
-              // turn the device off
               params.fan = 'off'
             } else {
               params.fan = 'on'
@@ -222,9 +221,6 @@ module.exports = class connectionLAN {
       } else {
         throw new Error(this.lang.devNotConfLAN)
       }
-      
-      this.log.error(params)
-      this.log.error(suffix)
 
       // Generate the HTTP request
       const key = crypto

From 8615eacde4d041b771c73c90ebf6abe56fb88db0 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 16 Jun 2021 22:32:23 +0100
Subject: [PATCH 2255/3183] never set rotationspeed to 0

---
 lib/device/fan.js | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/lib/device/fan.js b/lib/device/fan.js
index 8b6124f5..7d075678 100644
--- a/lib/device/fan.js
+++ b/lib/device/fan.js
@@ -151,10 +151,14 @@ module.exports = class deviceFan {
           this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
         }
       }
-      this.cacheSpeed = newSpeed
-      if (this.cacheSpeed === 0) {
+      if (newSpeed === 0) {
+        // Update the rotation speed back to the previous value (with the fan still off)
+        setTimeout(() => {
+          this.service.updateCharacteristic(this.hapChar.RotationSpeed, this.cacheSpeed)
+        }, 2000)
         return
       }
+      this.cacheSpeed = newSpeed
       if (!this.disableDeviceLogging) {
         this.log('[%s] %s [%s].', this.name, this.lang.curSpeed, this.speed2label[this.cacheSpeed])
       }
@@ -197,7 +201,7 @@ module.exports = class deviceFan {
   async externalUpdate (params) {
     try {
       if (params.light && params.fan && params.speed) {
-        // update from ifan03 LAN
+        // LAN update from iFan03
         params.switches = {}
         params.switches[0] = { switch: params.light }
         params.switches[1] = { switch: params.fan }
@@ -228,21 +232,22 @@ module.exports = class deviceFan {
           this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
         }
       }
-      let speed = 0
+      let speed
       switch (params.switches[2].switch + params.switches[3].switch) {
-        case 'offoff':
-          speed = 33
-          break
         case 'onoff':
           speed = 66
           break
         case 'offon':
           speed = 99
+          break
+        default:
+          speed = 33
+          break
       }
       if (speed !== this.cacheSpeed && this.cacheState === 'on') {
         this.cacheSpeed = speed
         this.service.updateCharacteristic(this.hapChar.RotationSpeed, this.cacheSpeed)
-        if (params.updateSource && !this.disableDeviceLogging && this.cacheSpeed > 0) {
+        if (params.updateSource && !this.disableDeviceLogging) {
           this.log(
             '[%s] %s [%s].',
             this.name,

From 2806229475e2bd173fb5f012e8907e708d4f30cc Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 16 Jun 2021 22:33:11 +0100
Subject: [PATCH 2256/3183] 6.8.1-beta.16

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ebcce34c..25359474 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.8.1-beta.15",
+  "version": "6.8.1-beta.16",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 2b339f34..db56dca2 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.8.1-beta.15",
+  "version": "6.8.1-beta.16",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 91aef9937702dd821653a27b4f3f9405917363e4 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 16 Jun 2021 22:37:25 +0100
Subject: [PATCH 2257/3183] send fan speed when turning on

---
 lib/connection/lan.js | 20 ++++++++++----------
 lib/device/fan.js     | 10 ++++++++++
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/lib/connection/lan.js b/lib/connection/lan.js
index ef607248..68ffebb7 100644
--- a/lib/connection/lan.js
+++ b/lib/connection/lan.js
@@ -179,16 +179,16 @@ module.exports = class connectionLAN {
               params.fan = 'off'
             } else {
               params.fan = 'on'
-              params.speed = 3
-              if (json.params.switches[1] && json.params.switches[2]) {
-                switch (json.params.switches[1].switch + json.params.switches[2].switch) {
-                  case 'offoff':
-                    params.speed = 1
-                    break
-                  case 'onoff':
-                    params.speed = 2
-                    break
-                }
+              switch (json.params.switches[1].switch + json.params.switches[2].switch) {
+                case 'offoff':
+                  params.speed = 1
+                  break
+                case 'onoff':
+                  params.speed = 2
+                  break
+                case 'offon':
+                  params.speed = 3
+                  break
               }
             }
             suffix = 'fan'
diff --git a/lib/device/fan.js b/lib/device/fan.js
index 7d075678..4cdb55f4 100644
--- a/lib/device/fan.js
+++ b/lib/device/fan.js
@@ -90,6 +90,16 @@ module.exports = class deviceFan {
         switch: newState,
         outlet: 1
       })
+      if (newState === 'on') {
+        params.switches.push({
+          switch: this.cacheSpeed === 66 ? 'on' : 'off',
+          outlet: 2
+        })
+        params.switches.push({
+          switch: this.cacheSpeed === 99 ? 'on' : 'off',
+          outlet: 3
+        })
+      }
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.cacheState = newState
       if (!this.disableDeviceLogging) {

From be57a765ce605ebde417d5882e83defb8f68d251 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 16 Jun 2021 22:37:54 +0100
Subject: [PATCH 2258/3183] 6.8.1-beta.17

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 25359474..b7f1ec21 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.8.1-beta.16",
+  "version": "6.8.1-beta.17",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index db56dca2..de787c32 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.8.1-beta.16",
+  "version": "6.8.1-beta.17",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 1156c3e08ec71b5b4add9a3e78932148ce49febe Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 16 Jun 2021 22:56:11 +0100
Subject: [PATCH 2259/3183] improve sensorTimeDiff explanation

---
 config.schema.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index d48147b7..59b5c976 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -456,7 +456,7 @@
             "sensorTimeDifference": {
               "type": "number",
               "title": "Sensor Lag",
-              "description": "An offset in seconds to ignore any notifications if they is a delay between this Zigbee Motion Sensor detecting something or a Zigbee Button press and the plugin receiving the notification. Must be 5 or more.",
+              "description": "An offset in seconds to ignore notifications if the delay between this Zigbee Motion activating or Zigbee Button press and the plugin receiving the notification is greater than this number. Must be 5 or more.",
               "placeholder": 60,
               "minimum": 5
             },
@@ -533,7 +533,7 @@
             "sensorTimeDifference": {
               "type": "number",
               "title": "Sensor Lag",
-              "description": "An offset in seconds to ignore any notifications if they is a delay between a sensor detecting something and the plugin receiving the notification. Must be 5 or more.",
+              "description": "An offset in seconds to ignore notifications if the delay between this sensor activating and the plugin receiving the notification is greater than this number. Must be 5 or more.",
               "placeholder": 60,
               "minimum": 5
             },

From 70b249cefff22a168664b1cf7c3f4f2d9e26ef13 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 16 Jun 2021 22:56:14 +0100
Subject: [PATCH 2260/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8886cc17..4ffcee9a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,8 +7,9 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 ### Added
 
 - Plugin LAN-only mode without need for eWeLink credentials ([read more](https://github.com/bwp91/homebridge-ewelink/wiki/Connection-Methods#lan-mode-without-ewelink-credentials))
-- Config option to offset the recorded humidity (%RH) for devices that report this
+- LAN mode for iFan devices
 - Polling for TH10/16 devices as they do not seem to send regular updates from firmware 3.5.0
+- Config option to offset the recorded humidity (%RH) for devices that report this
 - Zigbee Button now compares incoming notification against last trigger time
 - [test] Polling via LAN mode for outlet devices that report power attributes
 

From 2dd0d5771a1cae9799cd01700066b88bc986c38f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 16 Jun 2021 23:08:13 +0100
Subject: [PATCH 2261/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4ffcee9a..f5590509 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 ## BETA
 
+### ⚠️ Important
+
+- If you have the plugin in `lan`-only mode then the plugin will remove any accessories that do not support LAN mode
+
 ### Added
 
 - Plugin LAN-only mode without need for eWeLink credentials ([read more](https://github.com/bwp91/homebridge-ewelink/wiki/Connection-Methods#lan-mode-without-ewelink-credentials))

From a6ee98c52f908c47549b291b30c612a2609ad801 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 16 Jun 2021 23:10:13 +0100
Subject: [PATCH 2262/3183] merge lanIn and lanOut consts

---
 lib/connection/http.js | 5 +----
 lib/index.js           | 6 +++---
 lib/utils/constants.js | 3 +--
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/lib/connection/http.js b/lib/connection/http.js
index d4f50d53..0e168113 100644
--- a/lib/connection/http.js
+++ b/lib/connection/http.js
@@ -172,10 +172,7 @@ module.exports = class connectionHTTP {
             !this.ignoredDevices.includes(d.itemData.deviceid)
           ) {
             // If in LAN mode then don't add to device list
-            if (
-              this.mode === 'lan' &&
-              !this.consts.devices.lanOut.includes(d.itemData.extra.uiid)
-            ) {
+            if (this.mode === 'lan' && !this.consts.devices.lan.includes(d.itemData.extra.uiid)) {
               return
             }
             // Separate the sensors as these need to be set up last
diff --git a/lib/index.js b/lib/index.js
index 637b8d98..5ad517f5 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1407,7 +1407,7 @@ class eWeLinkPlatform {
       // Helpful logging for each device
       const str = accessory.context.reachableLAN
         ? this.lang.foundWithIP + ' [' + lanDevices.get(device.deviceid).ip + ']'
-        : this.consts.devices.lanIn.includes(uiid)
+        : this.consts.devices.lan.includes(uiid)
         ? this.lang.lanUnreachable
         : this.lang.lanUnsupported
 
@@ -1427,7 +1427,7 @@ class eWeLinkPlatform {
       this.log('[%s] %s %s.', accessory.displayName, this.lang.devInit, str)
 
       // Store the device in the persist file
-      if (storageClient && this.consts.devices.lanOut.includes(uiid)) {
+      if (storageClient && this.consts.devices.lan.includes(uiid)) {
         try {
           await storage.setItem(device.deviceid, device)
         } catch (err) {
@@ -1595,7 +1595,7 @@ class eWeLinkPlatform {
       // Check if we can send via LAN otherwise send via WS
       const res = !lanClient
         ? this.lang.lanDisabled
-        : !this.consts.devices.lanOut.includes(accessory.context.eweUIID)
+        : !this.consts.devices.lan.includes(accessory.context.eweUIID)
         ? this.lang.lanNotSup
         : await lanClient.sendUpdate(payload, accessory.context)
 
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 43c77c65..cd15477d 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -153,8 +153,7 @@ module.exports = {
   },
 
   devices: {
-    lanIn: [1, 2, 3, 4, 5, 6, 7, 8, 9, 14, 15, 28, 32, 34, 44, 77, 78, 103, 104, 126],
-    lanOut: [1, 2, 3, 4, 5, 6, 7, 8, 9, 14, 15, 28, 32, 34, 44, 77, 78, 126],
+    lan: [1, 2, 3, 4, 5, 6, 7, 8, 9, 14, 15, 28, 32, 34, 44, 77, 78, 126],
     singleSwitch: [1, 5, 6, 14, 24, 27, 112],
     doubleSwitch: [126],
     multiSwitch: [2, 3, 4, 7, 8, 9, 29, 30, 31, 41, 82, 83, 84, 113, 114],

From 49e8bc8e3403250ebc60f4f5f1ae2030fe68dd9d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 16 Jun 2021 23:14:02 +0100
Subject: [PATCH 2263/3183] 6.8.1-beta.18

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b7f1ec21..a4b1c4c1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.8.1-beta.17",
+  "version": "6.8.1-beta.18",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index de787c32..0470eb29 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.8.1-beta.17",
+  "version": "6.8.1-beta.18",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From a4097afddd0563d9fee2b071639e0567e5bdc093 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 16 Jun 2021 23:25:11 +0100
Subject: [PATCH 2264/3183] remove accessory for real!

---
 lib/index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/index.js b/lib/index.js
index 5ad517f5..1ade400f 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1567,8 +1567,8 @@ class eWeLinkPlatform {
   removeAccessory (accessory) {
     try {
       // Remove an accessory from Homebridge
-      // this.api.unregisterPlatformAccessories(plugin.name, plugin.alias, [accessory])
-      // devicesInHB.delete(accessory.UUID)
+      this.api.unregisterPlatformAccessories(plugin.name, plugin.alias, [accessory])
+      devicesInHB.delete(accessory.UUID)
       this.log('[%s] %s.', accessory.displayName, this.lang.devRemove)
     } catch (err) {
       // Catch any errors during remove

From f9aa74ace777ef169062d6148d4b18182e1e174f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 16 Jun 2021 23:25:52 +0100
Subject: [PATCH 2265/3183] 6.8.1-beta.19

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index a4b1c4c1..823f097a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.8.1-beta.18",
+  "version": "6.8.1-beta.19",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 0470eb29..ef86e37b 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.8.1-beta.18",
+  "version": "6.8.1-beta.19",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 977965a61201eca6a76f638c1adb90769f87c85d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 17 Jun 2021 08:10:21 +0100
Subject: [PATCH 2266/3183] more fan amendments

---
 lib/device/fan.js | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/lib/device/fan.js b/lib/device/fan.js
index 4cdb55f4..fe72ee6c 100644
--- a/lib/device/fan.js
+++ b/lib/device/fan.js
@@ -60,6 +60,9 @@ module.exports = class deviceFan {
       })
     }
 
+    // Set the fan service to the primary service
+    this.service.setPrimaryService()
+
     // Conversion object eWeLink mode to text label
     this.speed2label = {
       33: 'low',
@@ -79,13 +82,13 @@ module.exports = class deviceFan {
 
   async internalStateUpdate (value) {
     try {
-      const params = {
-        switches: []
-      }
       const newState = value ? 'on' : 'off'
       if (newState === this.cacheState) {
         return
       }
+      const params = {
+        switches: []
+      }
       params.switches.push({
         switch: newState,
         outlet: 1
@@ -108,7 +111,7 @@ module.exports = class deviceFan {
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
-        this.service.updateCharacteristic(this.hapChar.On, this.cacheState)
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
       }, 2000)
       throw new this.hapErr(-70402)
     }

From 1fe2f9527a3dd072b2fdc73ee5973591fd9059f3 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 17 Jun 2021 08:10:33 +0100
Subject: [PATCH 2267/3183] port fan fix to humidifier fan service

---
 lib/device/humidifier.js | 52 +++++++++++++++++++++++++++++-----------
 1 file changed, 38 insertions(+), 14 deletions(-)

diff --git a/lib/device/humidifier.js b/lib/device/humidifier.js
index 3695e382..e5f355c7 100644
--- a/lib/device/humidifier.js
+++ b/lib/device/humidifier.js
@@ -36,9 +36,7 @@ module.exports = class deviceHumidifier {
 
     // Add the set handler to the fan on/off characteristic
     this.service.getCharacteristic(this.hapChar.On).onSet(async value => {
-      if (!value) {
-        await this.internalModeUpdate(0)
-      }
+      await this.internalStateUpdate(value)
     })
 
     // Add the set handler to the fan rotation speed characteristic
@@ -65,6 +63,30 @@ module.exports = class deviceHumidifier {
     }
   }
 
+  async internalStateUpdate (value) {
+    try {
+      const newState = value ? 'on' : 'off'
+      if (newState === this.cacheState) {
+        return
+      }
+      const params = { switch: newState }
+      if (newState === 'on') {
+        params.state = this.cacheMode
+      }
+      await this.platform.sendDeviceUpdate(this.accessory, params)
+      this.cacheState = newState
+      if (!this.disableDeviceLogging) {
+        this.log('[%s] %s [%s].', this.name, this.lang.curState, newState)
+      }
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, true)
+      setTimeout(() => {
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
+      }, 2000)
+      throw new this.hapErr(-70402)
+    }
+  }
+
   async internalModeUpdate (value) {
     try {
       const updateKey = Math.random()
@@ -76,13 +98,10 @@ module.exports = class deviceHumidifier {
         return
       }
       const params = {}
+      const newState = value >= 1 ? 'on' : 'off'
+      params.switch = newState
       let newMode
-      if (value === 0) {
-        if (this.cacheState === 'off') {
-          return
-        }
-        params.switch = 'off'
-      } else {
+      if (value > 0) {
         if (value <= 33) {
           newMode = 1
         } else if (value <= 66) {
@@ -93,17 +112,22 @@ module.exports = class deviceHumidifier {
         if (this.cacheMode === newMode) {
           return
         }
-        params.switch = 'on'
         params.state = newMode
       }
       await this.platform.sendDeviceUpdate(this.accessory, params)
-      if (value === 0) {
-        this.cacheState = 'off'
+      if (newState !== this.cacheState) {
+        this.cacheState = newState
         if (!this.disableDeviceLogging) {
-          this.log('[%s] %s [off].', this.name, this.lang.curState)
+          this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
         }
+      }
+      if (value === 0) {
+        // Update the rotation speed back to the previous value (with the fan still off)
+        setTimeout(() => {
+          this.service.updateCharacteristic(this.hapChar.RotationSpeed, this.cacheMode * 33)
+        }, 2000)
+        return
       } else {
-        this.cacheState = 'on'
         this.cacheMode = newMode
         if (!this.disableDeviceLogging) {
           this.log('[%s] %s [%s].', this.name, this.lang.curMode, this.mode2label[this.cacheMode])

From 5ff51b4ddbcd525f770a9e9cdb14f58603cdb828 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 17 Jun 2021 08:42:10 +0100
Subject: [PATCH 2268/3183] use other data entry for lan updates

---
 lib/connection/lan.js | 12 +++++++-----
 lib/index.js          |  2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/lib/connection/lan.js b/lib/connection/lan.js
index 68ffebb7..5c89ea20 100644
--- a/lib/connection/lan.js
+++ b/lib/connection/lan.js
@@ -138,7 +138,7 @@ module.exports = class connectionLAN {
     this.log('%s.', this.lang.lanMonitor)
   }
 
-  async sendUpdate (json, context) {
+  async sendUpdate (json) {
     try {
       // Check this device exists in the map
       if (!this.deviceMap.has(json.deviceid)) {
@@ -153,7 +153,7 @@ module.exports = class connectionLAN {
       }
 
       // Check we have the device lan key
-      if (!deviceInfo.lanKey) {
+      if (!deviceInfo.lanKey || !deviceInfo.uiid || !deviceInfo.productModel) {
         throw new Error(this.lang.devNoAPIKey)
       }
 
@@ -167,7 +167,7 @@ module.exports = class connectionLAN {
         params.mode = 0
         suffix = 'dimmable'
       } else if (json.params.switches) {
-        if (context.eweUIID === 34 && ['iFan03', 'iFan'].includes(context.eweModel)) {
+        if (deviceInfo.uiid === 34 && ['iFan03', 'iFan'].includes(deviceInfo.productModel)) {
           // Special format for some iFan models
           if (json.params.switches[0].outlet === 0) {
             // Turn on/off the light for the iFan
@@ -199,7 +199,7 @@ module.exports = class connectionLAN {
         }
       } else if (json.params.switch) {
         params.switch = json.params.switch
-        if (context.eweUIID === 15) {
+        if (deviceInfo.uiid === 15) {
           // TH10/16 only supports LAN in normal mode
           if (json.params.deviceType === 'normal') {
             // Extra params for the TH10/16
@@ -210,7 +210,7 @@ module.exports = class connectionLAN {
           }
         }
         suffix = 'switch'
-      } else if (json.params.uiActive && context.eweUIID !== 15) {
+      } else if (json.params.uiActive && deviceInfo.uiid !== 15) {
         // Not supported at least for TH10/16
         params.uiActive = json.params.uiActive
         suffix = 'monitor'
@@ -270,6 +270,8 @@ module.exports = class connectionLAN {
   addDeviceDetailsToMap (deviceId, context) {
     const entry = this.deviceMap.get(deviceId) || { ip: this.ipOverride[deviceId] }
     entry.lanKey = context.lanKey
+    entry.uiid = context.eweUIID
+    entry.productModel = context.eweModel
     this.deviceMap.set(deviceId, entry)
   }
 
diff --git a/lib/index.js b/lib/index.js
index 1ade400f..5ae52740 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1597,7 +1597,7 @@ class eWeLinkPlatform {
         ? this.lang.lanDisabled
         : !this.consts.devices.lan.includes(accessory.context.eweUIID)
         ? this.lang.lanNotSup
-        : await lanClient.sendUpdate(payload, accessory.context)
+        : await lanClient.sendUpdate(payload)
 
       // Revert to WS if LAN mode not possible for whatever reason
       if (res !== 'ok') {

From e599326b070b437a9a0048db91c90e07d0006a73 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 17 Jun 2021 11:15:54 +0100
Subject: [PATCH 2269/3183] setup listeners once devices have initd

---
 lib/index.js | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/lib/index.js b/lib/index.js
index 5ae52740..3bf2d23b 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -539,11 +539,10 @@ class eWeLinkPlatform {
           const httpDeviceList = await httpClient.getDevices()
           httpDeviceList.forEach(device => deviceList.push(device))
 
-          // Set up the WS client, get the user WS host, login, and setup the listener
+          // Set up the WS client, get the user WS host and login
           if (this.config.mode !== 'lan') {
             wsClient = new (require('./connection/ws'))(this, authData)
             await wsClient.login()
-            wsClient.receiveUpdate(device => this.receiveDeviceUpdate(device))
 
             // Refresh the WS connection every 60 minutes
             this.wsRefresh = setInterval(async () => {
@@ -593,12 +592,11 @@ class eWeLinkPlatform {
         }
       }
 
-      // Set up the LAN client, scan for device, start monitoring and setup the listener
+      // Set up the LAN client, scan for device and start monitoring
       if (this.config.mode !== 'wan') {
         lanClient = new (require('./connection/lan'))(this)
         lanDevices = await lanClient.getHosts()
         await lanClient.startMonitor()
-        lanClient.receiveUpdate(device => this.receiveDeviceUpdate(device))
       }
 
       // Initialise each device into HB
@@ -611,6 +609,16 @@ class eWeLinkPlatform {
         }
       })
 
+      // Setup the LAN listener for device notifications
+      if (lanClient) {
+        lanClient.receiveUpdate(device => this.receiveDeviceUpdate(device))
+      }
+
+      // Setup the WS listener for device notifications
+      if (wsClient) {
+        wsClient.receiveUpdate(device => this.receiveDeviceUpdate(device))
+      }
+
       // Set up the listener server for the API if the user has this enabled
       if (this.config.apiPort !== 0 && this.config.password) {
         apiClient = new (require('./connection/api'))(this, devicesInHB)

From e6f6b2e2403e7f67a0ec9ff9c3bdc8deeefd94bc Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 17 Jun 2021 11:56:04 +0100
Subject: [PATCH 2270/3183] use normal mode for TH10/16 simulations, allowing
 lan mode

---
 lib/device/simulation/cooler.js       | 186 +++++++++++++++----------
 lib/device/simulation/dehumidifier.js | 193 +++++++++++++++-----------
 lib/device/simulation/heater.js       | 176 +++++++++++++----------
 lib/device/simulation/humidifier.js   | 191 ++++++++++++++-----------
 lib/index.js                          |  12 +-
 5 files changed, 446 insertions(+), 312 deletions(-)

diff --git a/lib/device/simulation/cooler.js b/lib/device/simulation/cooler.js
index bdc2c28a..905f0360 100644
--- a/lib/device/simulation/cooler.js
+++ b/lib/device/simulation/cooler.js
@@ -2,7 +2,7 @@
 /* eslint-disable new-cap */
 'use strict'
 
-module.exports = class deviceCooler {
+module.exports = class deviceHeater {
   constructor (platform, accessory) {
     // Set up variables from the platform
     this.funcs = platform.funcs
@@ -61,6 +61,7 @@ module.exports = class deviceCooler {
         this.accessory.removeService(this.accessory.getService(this.hapServ.HeaterCooler))
       }
       this.accessory.context.cacheType = 'cooler'
+      this.accessory.context.cacheTarget = 20
     }
 
     // If the accessory has a thermostat service then remove it
@@ -95,7 +96,7 @@ module.exports = class deviceCooler {
         this.accessory.addService(this.hapServ.HumiditySensor)
     }
 
-    // Set the cooler as the primary service
+    // Set the heater as the primary service
     this.service.setPrimaryService()
 
     // Set custom properties of the current temperature characteristic
@@ -103,12 +104,12 @@ module.exports = class deviceCooler {
       minStep: 0.1
     })
 
-    // Add the set handler to the cooler active characteristic
+    // Add the set handler to the heater active characteristic
     this.service.getCharacteristic(this.hapChar.Active).onSet(async value => {
       await this.internalStateUpdate(value)
     })
 
-    // Add the set handler to the target state characteristic
+    // Add options to the target state characteristic
     this.service.getCharacteristic(this.hapChar.TargetHeaterCoolerState).setProps({
       minValue: 0,
       maxValue: 0,
@@ -118,6 +119,7 @@ module.exports = class deviceCooler {
     // Add the set handler to the target temperature characteristic
     this.service
       .getCharacteristic(this.hapChar.CoolingThresholdTemperature)
+      .updateValue(this.accessory.context.cacheTarget)
       .setProps({
         minValue: this.minTarget,
         maxValue: this.maxTarget,
@@ -127,19 +129,19 @@ module.exports = class deviceCooler {
         await this.internalTargetTempUpdate(value)
       })
 
+    // Initialise these caches now since they aren't determined by the initial externalUpdate()
+    this.cacheState = this.service.getCharacteristic(this.hapChar.Active).value === 1 ? 'on' : 'off'
+    this.cacheCool =
+      this.cacheState === 'on' &&
+      this.service.getCharacteristic(this.hapChar.TargetHeaterCoolerState).value === 3
+        ? 'on'
+        : 'off'
+
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new platform.eveService('custom', this.accessory, {
       log: platform.config.debugFakegato ? this.log : () => {}
     })
 
-    // Setting this now makes the plugin send the payload to setup as a cooler
-    setTimeout(() => {
-      this.service.setCharacteristic(
-        this.hapChar.CoolingThresholdTemperature,
-        this.accessory.context.cacheTarget
-      )
-    }, 3000)
-
     // Set up an interval to get eWeLink to send regular temperature/humidity updates
     setTimeout(() => {
       this.internalUIUpdate()
@@ -167,30 +169,50 @@ module.exports = class deviceCooler {
 
   async internalStateUpdate (value) {
     try {
-      const params = { deviceType: 'temperature' }
+      const params = { deviceType: 'normal' }
+      let newState
+      let newCool
       if (value === 0) {
         params.mainSwitch = 'off'
         params.switch = 'off'
+        newState = 'off'
+        newCool = 'off'
       } else {
-        params.mainSwitch = 'on'
-        this.cacheCool = this.cacheTemp > this.accessory.context.cacheTarget ? 'on' : 'off'
-        params.switch = this.cacheCool
+        if (this.cacheTemp > this.accessory.context.cacheTarget) {
+          params.mainSwitch = 'on'
+          params.switch = 'on'
+          newState = 'on'
+          newCool = 'on'
+        } else {
+          params.mainSwitch = 'off'
+          params.switch = 'off'
+          newState = 'on'
+          newCool = 'off'
+        }
       }
-      const newValue = value === 0 ? 'off' : 'on'
-      await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.cacheState = newValue
-      if (!this.disableDeviceLogging) {
-        this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
-        if (value === 1) {
-          this.service.updateCharacteristic(
-            this.hapChar.CurrentHeaterCoolerState,
-            this.cacheCool === 'on' ? 3 : 1
-          )
+
+      // Only send the update if either:
+      // * The new value (state) is OFF and the cacheCool was ON
+      // * The new value (state) is ON and newCool is 'on'
+      if ((value === 0 && this.cacheCool === 'on') || (value === 1 && newCool === 'on')) {
+        await this.platform.sendDeviceUpdate(this.accessory, params)
+      }
+      if (newState !== this.cacheState) {
+        this.cacheState = newState
+        if (!this.disableDeviceLogging) {
+          this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
+        }
+      }
+      if (newCool !== this.cacheCool) {
+        this.cacheCool = newCool
+        if (!this.disableDeviceLogging) {
           this.log('[%s] %s [%s].', this.name, this.lang.curCool, this.cacheCool)
-        } else {
-          this.service.updateCharacteristic(this.hapChar.CurrentHeaterCoolerState, 0)
         }
       }
+      this.service.updateCharacteristic(
+        this.hapChar.CurrentHeaterCoolerState,
+        value === 1 ? (this.cacheCool === 'on' ? 3 : 1) : 0
+      )
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
@@ -205,35 +227,41 @@ module.exports = class deviceCooler {
       if (value === this.accessory.context.cacheTarget) {
         return
       }
-      const params = {
-        deviceType: 'temperature',
-        mainSwitch: 'on',
-        targets: [
-          {
-            targetHigh: value.toFixed(1),
-            reaction: {
-              switch: 'on'
-            }
-          },
-          {
-            targetLow: value.toFixed(1),
-            reaction: {
-              switch: 'off'
-            }
-          }
-        ]
-      }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
       this.accessory.context.cacheTarget = value
-      this.cacheState = 'on'
       if (!this.disableDeviceLogging) {
         this.log('[%s] %s [%s°C].', this.name, this.lang.curTarg, value)
       }
+      if (this.cacheState === 'off') {
+        return
+      }
+      const params = { deviceType: 'normal' }
+      let newCool
+      if (this.cacheTemp > value) {
+        params.mainSwitch = 'on'
+        params.switch = 'on'
+        newCool = 'on'
+      } else {
+        params.mainSwitch = 'off'
+        params.switch = 'off'
+        newCool = 'off'
+      }
+      if (newCool === this.cacheCool) {
+        return
+      }
+      await this.platform.sendDeviceUpdate(this.accessory, params)
+      this.cacheCool = newCool
+      if (!this.disableDeviceLogging) {
+        this.log('[%s] %s [%s].', this.name, this.lang.curCool, this.cacheCool)
+      }
+      this.service.updateCharacteristic(
+        this.hapChar.CurrentHeaterCoolerState,
+        this.cacheCool === 'on' ? 3 : 1
+      )
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
         this.service.updateCharacteristic(
-          this.hapChar.CoolingThresholdTemperature,
+          this.hapChar.HeatingThresholdTemperature,
           this.accessory.context.cacheTarget
         )
       }, 2000)
@@ -241,6 +269,39 @@ module.exports = class deviceCooler {
     }
   }
 
+  async internalCurrentTempUpdate () {
+    try {
+      if (this.cacheState === 'off') {
+        return
+      }
+      const params = { deviceType: 'normal' }
+      let newCool
+      if (this.cacheTemp > this.accessory.context.cacheTarget) {
+        params.mainSwitch = 'on'
+        params.switch = 'on'
+        newCool = 'on'
+      } else {
+        params.mainSwitch = 'off'
+        params.switch = 'off'
+        newCool = 'off'
+      }
+      if (newCool === this.cacheCool) {
+        return
+      }
+      await this.platform.sendDeviceUpdate(this.accessory, params)
+      this.cacheCool = newCool
+      if (!this.disableDeviceLogging) {
+        this.log('[%s] %s [%s].', this.name, this.lang.curCool, this.cacheCool)
+      }
+      this.service.updateCharacteristic(
+        this.hapChar.CurrentHeaterCoolerState,
+        this.cacheCool === 'on' ? 3 : 1
+      )
+    } catch (err) {
+      // Suppress errors here
+    }
+  }
+
   async internalUIUpdate () {
     try {
       const params = { uiActive: 120 }
@@ -252,32 +313,6 @@ module.exports = class deviceCooler {
 
   async externalUpdate (params) {
     try {
-      if (params.mainSwitch) {
-        const newState = params.mainSwitch
-        if (this.cacheState !== newState) {
-          this.cacheState = newState
-          this.service.updateCharacteristic(this.hapChar.Active, this.cacheState === 'on' ? 1 : 0)
-          this.accessory.eveService.addEntry({
-            status: this.cacheState === 'on' ? 1 : 0
-          })
-          if (this.cacheState === 'off') {
-            this.cacheCool = 'off'
-          }
-          if (params.updateSource && !this.disableDeviceLogging && !params.switch) {
-            this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
-          }
-        }
-      }
-      if (params.switch && params.switch !== this.cacheCool) {
-        this.cacheCool = params.switch
-        this.service.updateCharacteristic(
-          this.hapChar.CurrentHeaterCoolerState,
-          this.cacheCool === 'on' ? 3 : this.cacheState === 'on' ? 1 : 0
-        )
-        if (params.updateSource && !this.disableDeviceLogging) {
-          this.log('[%s] %s [%s].', this.name, this.lang.curCool, this.cacheCool)
-        }
-      }
       if (
         this.funcs.hasProperty(params, 'currentTemperature') &&
         params.currentTemperature !== 'unavailable' &&
@@ -290,6 +325,7 @@ module.exports = class deviceCooler {
         if (params.updateSource && !this.disableDeviceLogging) {
           this.log('[%s] %s [%s°C].', this.name, this.lang.curTemp, this.cacheTemp)
         }
+        await this.internalCurrentTempUpdate()
       }
       if (
         this.funcs.hasProperty(params, 'currentHumidity') &&
diff --git a/lib/device/simulation/dehumidifier.js b/lib/device/simulation/dehumidifier.js
index 52666777..93ab8bf9 100644
--- a/lib/device/simulation/dehumidifier.js
+++ b/lib/device/simulation/dehumidifier.js
@@ -2,7 +2,7 @@
 /* eslint-disable new-cap */
 'use strict'
 
-module.exports = class deviceHumidifier {
+module.exports = class deviceHeater {
   constructor (platform, accessory) {
     // Set up variables from the platform
     this.funcs = platform.funcs
@@ -36,6 +36,11 @@ module.exports = class deviceHumidifier {
       this.accessory.removeService(this.accessory.getService(this.hapServ.Switch))
     }
 
+    // If the accessory has a temperature sensor service then remove it
+    if (this.accessory.getService(this.hapServ.TemperatureSensor)) {
+      this.accessory.removeService(this.accessory.getService(this.hapServ.TemperatureSensor))
+    }
+
     // Set up the accessory with default target relative humidity when added the first time
     if (!this.funcs.hasProperty(this.accessory.context, 'cacheTarget')) {
       this.accessory.context.cacheTarget = 50
@@ -48,6 +53,7 @@ module.exports = class deviceHumidifier {
         this.accessory.removeService(this.accessory.getService(this.hapServ.HumidifierDehumidifier))
       }
       this.accessory.context.cacheType = 'dehumidifier'
+      this.accessory.context.cacheTarget = 50
     }
 
     // If the accessory has a thermostat service then remove it
@@ -78,7 +84,7 @@ module.exports = class deviceHumidifier {
     // Set the dehumidifier as the primary service
     this.service.setPrimaryService()
 
-    // Add the set handler to the dehumidifier active characteristic
+    // Add the set handler to the humidifier active characteristic
     this.service.getCharacteristic(this.hapChar.Active).onSet(async value => {
       await this.internalStateUpdate(value)
     })
@@ -86,33 +92,34 @@ module.exports = class deviceHumidifier {
     // Add options to the target state characteristic
     this.service
       .getCharacteristic(this.hapChar.TargetHumidifierDehumidifierState)
+      .updateValue(2)
       .setProps({
         minValue: 2,
         maxValue: 2,
         validValues: [2]
       })
-      .updateValue(2)
 
     // Add the set handler to the target relative humidity characteristic
     this.service
       .getCharacteristic(this.hapChar.RelativeHumidityDehumidifierThreshold)
+      .updateValue(this.accessory.context.cacheTarget)
       .onSet(async value => {
         await this.internalTargetHumidityUpdate(value)
       })
 
+    // Initialise these caches now since they aren't determined by the initial externalUpdate()
+    this.cacheState = this.service.getCharacteristic(this.hapChar.Active).value === 1 ? 'on' : 'off'
+    this.cacheHumid =
+      this.cacheState === 'on' &&
+      this.service.getCharacteristic(this.hapChar.TargetHumidifierDehumidifierState).value === 3
+        ? 'on'
+        : 'off'
+
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new platform.eveService('custom', this.accessory, {
       log: platform.config.debugFakegato ? this.log : () => {}
     })
 
-    // Setting this now makes the plugin send the payload to setup as a dehumidifier
-    setTimeout(() => {
-      this.service.setCharacteristic(
-        this.hapChar.RelativeHumidityDehumidifierThreshold,
-        this.accessory.context.cacheTarget
-      )
-    }, 3000)
-
     // Set up an interval to get eWeLink to send regular temperature/humidity updates
     setTimeout(() => {
       this.internalUIUpdate()
@@ -138,30 +145,50 @@ module.exports = class deviceHumidifier {
 
   async internalStateUpdate (value) {
     try {
-      const params = { deviceType: 'humidity' }
+      const params = { deviceType: 'normal' }
+      let newState
+      let newHumid
       if (value === 0) {
         params.mainSwitch = 'off'
         params.switch = 'off'
+        newState = 'off'
+        newHumid = 'off'
       } else {
-        params.mainSwitch = 'on'
-        this.cacheHumid = this.cacheHumi > this.accessory.context.cacheTarget ? 'on' : 'off'
-        params.switch = this.cacheHumid
+        if (this.cacheHumi > this.accessory.context.cacheTarget) {
+          params.mainSwitch = 'on'
+          params.switch = 'on'
+          newState = 'on'
+          newHumid = 'on'
+        } else {
+          params.mainSwitch = 'off'
+          params.switch = 'off'
+          newState = 'on'
+          newHumid = 'off'
+        }
       }
-      const newValue = value === 0 ? 'off' : 'on'
-      await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.cacheState = newValue
-      if (!this.disableDeviceLogging) {
-        this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
-        if (value === 1) {
-          this.service.updateCharacteristic(
-            this.hapChar.CurrentHumidifierDehumidifierState,
-            this.cacheHumid === 'on' ? 3 : 1
-          )
+
+      // Only send the update if either:
+      // * The new value (state) is OFF and the cacheHumid was ON
+      // * The new value (state) is ON and newHumid is 'on'
+      if ((value === 0 && this.cacheHumid === 'on') || (value === 1 && newHumid === 'on')) {
+        await this.platform.sendDeviceUpdate(this.accessory, params)
+      }
+      if (newState !== this.cacheState) {
+        this.cacheState = newState
+        if (!this.disableDeviceLogging) {
+          this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
+        }
+      }
+      if (newHumid !== this.cacheHumid) {
+        this.cacheHumid = newHumid
+        if (!this.disableDeviceLogging) {
           this.log('[%s] %s [%s].', this.name, this.lang.curDehumid, this.cacheHumid)
-        } else {
-          this.service.updateCharacteristic(this.hapChar.CurrentHumidifierDehumidifierState, 0)
         }
       }
+      this.service.updateCharacteristic(
+        this.hapChar.CurrentHumidifierDehumidifierState,
+        value === 1 ? (this.cacheHumid === 'on' ? 3 : 1) : 0
+      )
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
@@ -176,38 +203,36 @@ module.exports = class deviceHumidifier {
       if (value === this.accessory.context.cacheTarget) {
         return
       }
-      const updateKey = Math.random()
-        .toString(36)
-        .substr(2, 8)
-      this.updateKey = updateKey
-      await this.funcs.sleep(500)
-      if (updateKey !== this.updateKey) {
+      this.accessory.context.cacheTarget = value
+      if (!this.disableDeviceLogging) {
+        this.log('[%s] %s [%s%].', this.name, this.lang.curTarg, value)
+      }
+      if (this.cacheState === 'off') {
         return
       }
-      const params = {
-        deviceType: 'humidity',
-        mainSwitch: 'on',
-        targets: [
-          {
-            targetHigh: value.toString(),
-            reaction: {
-              switch: 'on'
-            }
-          },
-          {
-            targetLow: value.toString(),
-            reaction: {
-              switch: 'off'
-            }
-          }
-        ]
+      const params = { deviceType: 'normal' }
+      let newHumid
+      if (this.cacheHumi > value) {
+        params.mainSwitch = 'on'
+        params.switch = 'on'
+        newHumid = 'on'
+      } else {
+        params.mainSwitch = 'off'
+        params.switch = 'off'
+        newHumid = 'off'
+      }
+      if (newHumid === this.cacheHumid) {
+        return
       }
       await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.accessory.context.cacheTarget = value
-      this.cacheState = 'on'
+      this.cacheHumid = newHumid
       if (!this.disableDeviceLogging) {
-        this.log('[%s] %s [%s%].', this.name, this.lang.curTarg, value)
+        this.log('[%s] %s [%s].', this.name, this.lang.curDehumid, this.cacheHumid)
       }
+      this.service.updateCharacteristic(
+        this.hapChar.CurrentHumidifierDehumidifierState,
+        this.cacheHumid === 'on' ? 3 : 1
+      )
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
@@ -220,6 +245,39 @@ module.exports = class deviceHumidifier {
     }
   }
 
+  async internalCurrentHumidityUpdate () {
+    try {
+      if (this.cacheState === 'off') {
+        return
+      }
+      const params = { deviceType: 'normal' }
+      let newHumid
+      if (this.cacheHumi > this.accessory.context.cacheTarget) {
+        params.mainSwitch = 'on'
+        params.switch = 'on'
+        newHumid = 'on'
+      } else {
+        params.mainSwitch = 'off'
+        params.switch = 'off'
+        newHumid = 'off'
+      }
+      if (newHumid === this.cacheHumid) {
+        return
+      }
+      await this.platform.sendDeviceUpdate(this.accessory, params)
+      this.cacheHumid = newHumid
+      if (!this.disableDeviceLogging) {
+        this.log('[%s] %s [%s].', this.name, this.lang.curDehumid, this.cacheHumid)
+      }
+      this.service.updateCharacteristic(
+        this.hapChar.CurrentHumidifierDehumidifierState,
+        this.cacheHumid === 'on' ? 3 : 1
+      )
+    } catch (err) {
+      // Suppress errors here
+    }
+  }
+
   async internalUIUpdate () {
     try {
       const params = { uiActive: 120 }
@@ -231,32 +289,6 @@ module.exports = class deviceHumidifier {
 
   async externalUpdate (params) {
     try {
-      if (params.mainSwitch) {
-        const newState = params.mainSwitch
-        if (this.cacheState !== newState) {
-          this.cacheState = newState
-          this.service.updateCharacteristic(this.hapChar.Active, this.cacheState === 'on' ? 1 : 0)
-          this.accessory.eveService.addEntry({
-            status: this.cacheState === 'on' ? 1 : 0
-          })
-          if (this.cacheState === 'off') {
-            this.cacheHumid = 'off'
-          }
-          if (params.updateSource && !this.disableDeviceLogging && !params.switch) {
-            this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
-          }
-        }
-      }
-      if (params.switch && params.switch !== this.cacheHumid) {
-        this.cacheHumid = params.switch
-        this.service.updateCharacteristic(
-          this.hapChar.CurrentHumidifierDehumidifierState,
-          this.cacheHumid === 'on' ? 3 : this.cacheState === 'on' ? 1 : 0
-        )
-        if (params.updateSource && !this.disableDeviceLogging) {
-          this.log('[%s] %s [%s].', this.name, this.lang.curDehumid, this.cacheHumid)
-        }
-      }
       if (
         this.funcs.hasProperty(params, 'currentTemperature') &&
         params.currentTemperature !== 'unavailable' &&
@@ -267,7 +299,7 @@ module.exports = class deviceHumidifier {
         this.tempService.updateCharacteristic(this.hapChar.CurrentTemperature, this.cacheTemp)
         this.accessory.eveService.addEntry({ temp: this.cacheTemp })
         if (params.updateSource && !this.disableDeviceLogging) {
-          this.log('[%s] %s [%s°C].', this.name, this.lang.curTemp, this.cacheTemp)
+          this.log('[%s] %s [%s%].', this.name, this.lang.curTemp, this.cacheTemp)
         }
       }
       if (
@@ -282,6 +314,7 @@ module.exports = class deviceHumidifier {
         if (params.updateSource && !this.disableDeviceLogging) {
           this.log('[%s] %s [%s%].', this.name, this.lang.curHumi, this.cacheHumi)
         }
+        await this.internalCurrentHumidityUpdate()
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
diff --git a/lib/device/simulation/heater.js b/lib/device/simulation/heater.js
index 8efb46c6..855d74c6 100644
--- a/lib/device/simulation/heater.js
+++ b/lib/device/simulation/heater.js
@@ -61,6 +61,7 @@ module.exports = class deviceHeater {
         this.accessory.removeService(this.accessory.getService(this.hapServ.HeaterCooler))
       }
       this.accessory.context.cacheType = 'heater'
+      this.accessory.context.cacheTarget = 20
     }
 
     // If the accessory has a thermostat service then remove it
@@ -118,6 +119,7 @@ module.exports = class deviceHeater {
     // Add the set handler to the target temperature characteristic
     this.service
       .getCharacteristic(this.hapChar.HeatingThresholdTemperature)
+      .updateValue(this.accessory.context.cacheTarget)
       .setProps({
         minValue: this.minTarget,
         maxValue: this.maxTarget,
@@ -127,19 +129,19 @@ module.exports = class deviceHeater {
         await this.internalTargetTempUpdate(value)
       })
 
+    // Initialise these caches now since they aren't determined by the initial externalUpdate()
+    this.cacheState = this.service.getCharacteristic(this.hapChar.Active).value === 1 ? 'on' : 'off'
+    this.cacheHeat =
+      this.cacheState === 'on' &&
+      this.service.getCharacteristic(this.hapChar.TargetHeaterCoolerState).value === 2
+        ? 'on'
+        : 'off'
+
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new platform.eveService('custom', this.accessory, {
       log: platform.config.debugFakegato ? this.log : () => {}
     })
 
-    // Setting this now makes the plugin send the payload to setup as a heater
-    setTimeout(() => {
-      this.service.setCharacteristic(
-        this.hapChar.HeatingThresholdTemperature,
-        this.accessory.context.cacheTarget
-      )
-    }, 3000)
-
     // Set up an interval to get eWeLink to send regular temperature/humidity updates
     setTimeout(() => {
       this.internalUIUpdate()
@@ -167,30 +169,50 @@ module.exports = class deviceHeater {
 
   async internalStateUpdate (value) {
     try {
-      const params = { deviceType: 'temperature' }
+      const params = { deviceType: 'normal' }
+      let newState
+      let newHeat
       if (value === 0) {
         params.mainSwitch = 'off'
         params.switch = 'off'
+        newState = 'off'
+        newHeat = 'off'
       } else {
-        params.mainSwitch = 'on'
-        this.cacheHeat = this.cacheTemp < this.accessory.context.cacheTarget ? 'on' : 'off'
-        params.switch = this.cacheHeat
+        if (this.cacheTemp < this.accessory.context.cacheTarget) {
+          params.mainSwitch = 'on'
+          params.switch = 'on'
+          newState = 'on'
+          newHeat = 'on'
+        } else {
+          params.mainSwitch = 'off'
+          params.switch = 'off'
+          newState = 'on'
+          newHeat = 'off'
+        }
       }
-      const newValue = value === 0 ? 'off' : 'on'
-      await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.cacheState = newValue
-      if (!this.disableDeviceLogging) {
-        this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
-        if (value === 1) {
-          this.service.updateCharacteristic(
-            this.hapChar.CurrentHeaterCoolerState,
-            this.cacheHeat === 'on' ? 2 : 1
-          )
+
+      // Only send the update if either:
+      // * The new value (state) is OFF and the cacheHeat was ON
+      // * The new value (state) is ON and newHeat is 'on'
+      if ((value === 0 && this.cacheHeat === 'on') || (value === 1 && newHeat === 'on')) {
+        await this.platform.sendDeviceUpdate(this.accessory, params)
+      }
+      if (newState !== this.cacheState) {
+        this.cacheState = newState
+        if (!this.disableDeviceLogging) {
+          this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
+        }
+      }
+      if (newHeat !== this.cacheHeat) {
+        this.cacheHeat = newHeat
+        if (!this.disableDeviceLogging) {
           this.log('[%s] %s [%s].', this.name, this.lang.curHeat, this.cacheHeat)
-        } else {
-          this.service.updateCharacteristic(this.hapChar.CurrentHeaterCoolerState, 0)
         }
       }
+      this.service.updateCharacteristic(
+        this.hapChar.CurrentHeaterCoolerState,
+        value === 1 ? (this.cacheHeat === 'on' ? 2 : 1) : 0
+      )
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
@@ -205,30 +227,36 @@ module.exports = class deviceHeater {
       if (value === this.accessory.context.cacheTarget) {
         return
       }
-      const params = {
-        deviceType: 'temperature',
-        mainSwitch: 'on',
-        targets: [
-          {
-            targetHigh: value.toFixed(1),
-            reaction: {
-              switch: 'off'
-            }
-          },
-          {
-            targetLow: value.toFixed(1),
-            reaction: {
-              switch: 'on'
-            }
-          }
-        ]
-      }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
       this.accessory.context.cacheTarget = value
-      this.cacheState = 'on'
       if (!this.disableDeviceLogging) {
         this.log('[%s] %s [%s°C].', this.name, this.lang.curTarg, value)
       }
+      if (this.cacheState === 'off') {
+        return
+      }
+      const params = { deviceType: 'normal' }
+      let newHeat
+      if (this.cacheTemp < value) {
+        params.mainSwitch = 'on'
+        params.switch = 'on'
+        newHeat = 'on'
+      } else {
+        params.mainSwitch = 'off'
+        params.switch = 'off'
+        newHeat = 'off'
+      }
+      if (newHeat === this.cacheHeat) {
+        return
+      }
+      await this.platform.sendDeviceUpdate(this.accessory, params)
+      this.cacheHeat = newHeat
+      if (!this.disableDeviceLogging) {
+        this.log('[%s] %s [%s].', this.name, this.lang.curHeat, this.cacheHeat)
+      }
+      this.service.updateCharacteristic(
+        this.hapChar.CurrentHeaterCoolerState,
+        this.cacheHeat === 'on' ? 2 : 1
+      )
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
@@ -241,6 +269,39 @@ module.exports = class deviceHeater {
     }
   }
 
+  async internalCurrentTempUpdate () {
+    try {
+      if (this.cacheState === 'off') {
+        return
+      }
+      const params = { deviceType: 'normal' }
+      let newHeat
+      if (this.cacheTemp < this.accessory.context.cacheTarget) {
+        params.mainSwitch = 'on'
+        params.switch = 'on'
+        newHeat = 'on'
+      } else {
+        params.mainSwitch = 'off'
+        params.switch = 'off'
+        newHeat = 'off'
+      }
+      if (newHeat === this.cacheHeat) {
+        return
+      }
+      await this.platform.sendDeviceUpdate(this.accessory, params)
+      this.cacheHeat = newHeat
+      if (!this.disableDeviceLogging) {
+        this.log('[%s] %s [%s].', this.name, this.lang.curHeat, this.cacheHeat)
+      }
+      this.service.updateCharacteristic(
+        this.hapChar.CurrentHeaterCoolerState,
+        this.cacheHeat === 'on' ? 2 : 1
+      )
+    } catch (err) {
+      // Suppress errors here
+    }
+  }
+
   async internalUIUpdate () {
     try {
       const params = { uiActive: 120 }
@@ -252,32 +313,6 @@ module.exports = class deviceHeater {
 
   async externalUpdate (params) {
     try {
-      if (params.mainSwitch) {
-        const newState = params.mainSwitch
-        if (this.cacheState !== newState) {
-          this.cacheState = newState
-          this.service.updateCharacteristic(this.hapChar.Active, this.cacheState === 'on' ? 1 : 0)
-          this.accessory.eveService.addEntry({
-            status: this.cacheState === 'on' ? 1 : 0
-          })
-          if (this.cacheState === 'off') {
-            this.cacheHeat = 'off'
-          }
-          if (params.updateSource && !this.disableDeviceLogging && !params.switch) {
-            this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
-          }
-        }
-      }
-      if (params.switch && params.switch !== this.cacheHeat) {
-        this.cacheHeat = params.switch
-        this.service.updateCharacteristic(
-          this.hapChar.CurrentHeaterCoolerState,
-          this.cacheHeat === 'on' ? 2 : this.cacheState === 'on' ? 1 : 0
-        )
-        if (params.updateSource && !this.disableDeviceLogging) {
-          this.log('[%s] %s [%s].', this.name, this.lang.curHeat, this.cacheHeat)
-        }
-      }
       if (
         this.funcs.hasProperty(params, 'currentTemperature') &&
         params.currentTemperature !== 'unavailable' &&
@@ -290,6 +325,7 @@ module.exports = class deviceHeater {
         if (params.updateSource && !this.disableDeviceLogging) {
           this.log('[%s] %s [%s°C].', this.name, this.lang.curTemp, this.cacheTemp)
         }
+        await this.internalCurrentTempUpdate()
       }
       if (
         this.funcs.hasProperty(params, 'currentHumidity') &&
diff --git a/lib/device/simulation/humidifier.js b/lib/device/simulation/humidifier.js
index 2361c044..ad2987d3 100644
--- a/lib/device/simulation/humidifier.js
+++ b/lib/device/simulation/humidifier.js
@@ -2,7 +2,7 @@
 /* eslint-disable new-cap */
 'use strict'
 
-module.exports = class deviceHumidifier {
+module.exports = class deviceHeater {
   constructor (platform, accessory) {
     // Set up variables from the platform
     this.funcs = platform.funcs
@@ -36,6 +36,11 @@ module.exports = class deviceHumidifier {
       this.accessory.removeService(this.accessory.getService(this.hapServ.Switch))
     }
 
+    // If the accessory has a temperature sensor service then remove it
+    if (this.accessory.getService(this.hapServ.TemperatureSensor)) {
+      this.accessory.removeService(this.accessory.getService(this.hapServ.TemperatureSensor))
+    }
+
     // Set up the accessory with default target relative humidity when added the first time
     if (!this.funcs.hasProperty(this.accessory.context, 'cacheTarget')) {
       this.accessory.context.cacheTarget = 50
@@ -48,6 +53,7 @@ module.exports = class deviceHumidifier {
         this.accessory.removeService(this.accessory.getService(this.hapServ.HumidifierDehumidifier))
       }
       this.accessory.context.cacheType = 'humidifier'
+      this.accessory.context.cacheTarget = 50
     }
 
     // If the accessory has a thermostat service then remove it
@@ -86,33 +92,34 @@ module.exports = class deviceHumidifier {
     // Add options to the target state characteristic
     this.service
       .getCharacteristic(this.hapChar.TargetHumidifierDehumidifierState)
+      .updateValue(1)
       .setProps({
         minValue: 1,
         maxValue: 1,
         validValues: [1]
       })
-      .updateValue(1)
 
     // Add the set handler to the target relative humidity characteristic
     this.service
       .getCharacteristic(this.hapChar.RelativeHumidityHumidifierThreshold)
+      .updateValue(this.accessory.context.cacheTarget)
       .onSet(async value => {
         await this.internalTargetHumidityUpdate(value)
       })
 
+    // Initialise these caches now since they aren't determined by the initial externalUpdate()
+    this.cacheState = this.service.getCharacteristic(this.hapChar.Active).value === 1 ? 'on' : 'off'
+    this.cacheHumid =
+      this.cacheState === 'on' &&
+      this.service.getCharacteristic(this.hapChar.TargetHumidifierDehumidifierState).value === 2
+        ? 'on'
+        : 'off'
+
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new platform.eveService('custom', this.accessory, {
       log: platform.config.debugFakegato ? this.log : () => {}
     })
 
-    // Setting this now makes the plugin send the payload to setup as a humidifier
-    setTimeout(() => {
-      this.service.setCharacteristic(
-        this.hapChar.RelativeHumidityHumidifierThreshold,
-        this.accessory.context.cacheTarget
-      )
-    }, 3000)
-
     // Set up an interval to get eWeLink to send regular temperature/humidity updates
     setTimeout(() => {
       this.internalUIUpdate()
@@ -138,30 +145,50 @@ module.exports = class deviceHumidifier {
 
   async internalStateUpdate (value) {
     try {
-      const params = { deviceType: 'humidity' }
+      const params = { deviceType: 'normal' }
+      let newState
+      let newHumid
       if (value === 0) {
         params.mainSwitch = 'off'
         params.switch = 'off'
+        newState = 'off'
+        newHumid = 'off'
       } else {
-        params.mainSwitch = 'on'
-        this.cacheHumid = this.cacheHumi < this.accessory.context.cacheTarget ? 'on' : 'off'
-        params.switch = this.cacheHumid
+        if (this.cacheHumi < this.accessory.context.cacheTarget) {
+          params.mainSwitch = 'on'
+          params.switch = 'on'
+          newState = 'on'
+          newHumid = 'on'
+        } else {
+          params.mainSwitch = 'off'
+          params.switch = 'off'
+          newState = 'on'
+          newHumid = 'off'
+        }
       }
-      const newValue = value === 0 ? 'off' : 'on'
-      await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.cacheState = newValue
-      if (!this.disableDeviceLogging) {
-        this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
-        if (value === 1) {
-          this.service.updateCharacteristic(
-            this.hapChar.CurrentHumidifierDehumidifierState,
-            this.cacheHumid === 'on' ? 2 : 1
-          )
+
+      // Only send the update if either:
+      // * The new value (state) is OFF and the cacheHumid was ON
+      // * The new value (state) is ON and newHumid is 'on'
+      if ((value === 0 && this.cacheHumid === 'on') || (value === 1 && newHumid === 'on')) {
+        await this.platform.sendDeviceUpdate(this.accessory, params)
+      }
+      if (newState !== this.cacheState) {
+        this.cacheState = newState
+        if (!this.disableDeviceLogging) {
+          this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
+        }
+      }
+      if (newHumid !== this.cacheHumid) {
+        this.cacheHumid = newHumid
+        if (!this.disableDeviceLogging) {
           this.log('[%s] %s [%s].', this.name, this.lang.curHumid, this.cacheHumid)
-        } else {
-          this.service.updateCharacteristic(this.hapChar.CurrentHumidifierDehumidifierState, 0)
         }
       }
+      this.service.updateCharacteristic(
+        this.hapChar.CurrentHumidifierDehumidifierState,
+        value === 1 ? (this.cacheHumid === 'on' ? 2 : 1) : 0
+      )
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
@@ -176,38 +203,36 @@ module.exports = class deviceHumidifier {
       if (value === this.accessory.context.cacheTarget) {
         return
       }
-      const updateKey = Math.random()
-        .toString(36)
-        .substr(2, 8)
-      this.updateKey = updateKey
-      await this.funcs.sleep(500)
-      if (updateKey !== this.updateKey) {
+      this.accessory.context.cacheTarget = value
+      if (!this.disableDeviceLogging) {
+        this.log('[%s] %s [%s%].', this.name, this.lang.curTarg, value)
+      }
+      if (this.cacheState === 'off') {
         return
       }
-      const params = {
-        deviceType: 'humidity',
-        mainSwitch: 'on',
-        targets: [
-          {
-            targetHigh: value.toString(),
-            reaction: {
-              switch: 'off'
-            }
-          },
-          {
-            targetLow: value.toString(),
-            reaction: {
-              switch: 'on'
-            }
-          }
-        ]
+      const params = { deviceType: 'normal' }
+      let newHumid
+      if (this.cacheHumi < value) {
+        params.mainSwitch = 'on'
+        params.switch = 'on'
+        newHumid = 'on'
+      } else {
+        params.mainSwitch = 'off'
+        params.switch = 'off'
+        newHumid = 'off'
+      }
+      if (newHumid === this.cacheHumid) {
+        return
       }
       await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.accessory.context.cacheTarget = value
-      this.cacheState = 'on'
+      this.cacheHumid = newHumid
       if (!this.disableDeviceLogging) {
-        this.log('[%s] %s [%s%].', this.name, this.lang.curTarg, value)
+        this.log('[%s] %s [%s].', this.name, this.lang.curHumid, this.cacheHumid)
       }
+      this.service.updateCharacteristic(
+        this.hapChar.CurrentHumidifierDehumidifierState,
+        this.cacheHumid === 'on' ? 2 : 1
+      )
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
@@ -220,6 +245,39 @@ module.exports = class deviceHumidifier {
     }
   }
 
+  async internalCurrentHumidityUpdate () {
+    try {
+      if (this.cacheState === 'off') {
+        return
+      }
+      const params = { deviceType: 'normal' }
+      let newHumid
+      if (this.cacheHumi < this.accessory.context.cacheTarget) {
+        params.mainSwitch = 'on'
+        params.switch = 'on'
+        newHumid = 'on'
+      } else {
+        params.mainSwitch = 'off'
+        params.switch = 'off'
+        newHumid = 'off'
+      }
+      if (newHumid === this.cacheHumid) {
+        return
+      }
+      await this.platform.sendDeviceUpdate(this.accessory, params)
+      this.cacheHumid = newHumid
+      if (!this.disableDeviceLogging) {
+        this.log('[%s] %s [%s].', this.name, this.lang.curHumid, this.cacheHumid)
+      }
+      this.service.updateCharacteristic(
+        this.hapChar.CurrentHumidifierDehumidifierState,
+        this.cacheHumid === 'on' ? 2 : 1
+      )
+    } catch (err) {
+      // Suppress errors here
+    }
+  }
+
   async internalUIUpdate () {
     try {
       const params = { uiActive: 120 }
@@ -231,32 +289,6 @@ module.exports = class deviceHumidifier {
 
   async externalUpdate (params) {
     try {
-      if (params.mainSwitch) {
-        const newState = params.mainSwitch
-        if (this.cacheState !== newState) {
-          this.cacheState = newState
-          this.service.updateCharacteristic(this.hapChar.Active, this.cacheState === 'on' ? 1 : 0)
-          this.accessory.eveService.addEntry({
-            status: this.cacheState === 'on' ? 1 : 0
-          })
-          if (this.cacheState === 'off') {
-            this.cacheHumid = 'off'
-          }
-          if (params.updateSource && !this.disableDeviceLogging && !params.switch) {
-            this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
-          }
-        }
-      }
-      if (params.switch && params.switch !== this.cacheHumid) {
-        this.cacheHumid = params.switch
-        this.service.updateCharacteristic(
-          this.hapChar.CurrentHumidifierDehumidifierState,
-          this.cacheHumid === 'on' ? 2 : this.cacheState === 'on' ? 1 : 0
-        )
-        if (params.updateSource && !this.disableDeviceLogging) {
-          this.log('[%s] %s [%s].', this.name, this.lang.curHumid, this.cacheHumid)
-        }
-      }
       if (
         this.funcs.hasProperty(params, 'currentTemperature') &&
         params.currentTemperature !== 'unavailable' &&
@@ -267,7 +299,7 @@ module.exports = class deviceHumidifier {
         this.tempService.updateCharacteristic(this.hapChar.CurrentTemperature, this.cacheTemp)
         this.accessory.eveService.addEntry({ temp: this.cacheTemp })
         if (params.updateSource && !this.disableDeviceLogging) {
-          this.log('[%s] %s [%s°C].', this.name, this.lang.curTemp, this.cacheTemp)
+          this.log('[%s] %s [%s%].', this.name, this.lang.curTemp, this.cacheTemp)
         }
       }
       if (
@@ -282,6 +314,7 @@ module.exports = class deviceHumidifier {
         if (params.updateSource && !this.disableDeviceLogging) {
           this.log('[%s] %s [%s%].', this.name, this.lang.curHumi, this.cacheHumi)
         }
+        await this.internalCurrentHumidityUpdate()
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
diff --git a/lib/index.js b/lib/index.js
index 3bf2d23b..38800d21 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -974,8 +974,7 @@ class eWeLinkPlatform {
       } else if (
         this.simulations[device.deviceid] &&
         this.simulations[device.deviceid].type === 'thermostat' &&
-        this.consts.devices.sensorAmbient.includes(uiid) &&
-        this.config.mode !== 'lan'
+        this.consts.devices.sensorAmbient.includes(uiid)
       ) {
         /*************************************
         HEATERS [TH10/16 ACCESSORY SIMULATION]
@@ -987,8 +986,7 @@ class eWeLinkPlatform {
       } else if (
         this.simulations[device.deviceid] &&
         this.simulations[device.deviceid].type === 'cooler' &&
-        this.consts.devices.sensorAmbient.includes(uiid) &&
-        this.config.mode !== 'lan'
+        this.consts.devices.sensorAmbient.includes(uiid)
       ) {
         /*************************************
         COOLERS [TH10/16 ACCESSORY SIMULATION]
@@ -1000,8 +998,7 @@ class eWeLinkPlatform {
       } else if (
         this.simulations[device.deviceid] &&
         this.simulations[device.deviceid].type === 'humidifier' &&
-        this.consts.devices.sensorAmbient.includes(uiid) &&
-        this.config.mode !== 'lan'
+        this.consts.devices.sensorAmbient.includes(uiid)
       ) {
         /*****************************************
         HUMIDIFIERS [TH10/16 ACCESSORY SIMULATION]
@@ -1017,8 +1014,7 @@ class eWeLinkPlatform {
       } else if (
         this.simulations[device.deviceid] &&
         this.simulations[device.deviceid].type === 'dehumidifier' &&
-        this.consts.devices.sensorAmbient.includes(uiid) &&
-        this.config.mode !== 'lan'
+        this.consts.devices.sensorAmbient.includes(uiid)
       ) {
         /*******************************************
         DEHUMIDIFIERS [TH10/16 ACCESSORY SIMULATION]

From e8e2093e9e90657d67b5f7dd24f3180b884bd007 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 17 Jun 2021 11:57:08 +0100
Subject: [PATCH 2271/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f5590509..23d6208e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,7 +19,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 ### Changes
 
-- If `mode` is `lan` then the plugin will not use accessory simulations for TH10/16 devices
+- Accessory simulations for TH10/16 devices no longer use eWeLink auto mode, allowing for LAN control
 - Power reading polling for POWR2 and DUALR3 increased to two minutes
 - Device polling (for power, temperature and humidity) will no longer log when sending updates
 - `sensorTimeDifference` minimum reduced to 5 seconds and default reduced to 60 seconds

From 27f12604abb357c8d6e7f40a100cf175bb273a96 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 17 Jun 2021 11:58:03 +0100
Subject: [PATCH 2272/3183] 6.8.1-beta.20

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 823f097a..7c1a6d00 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.8.1-beta.19",
+  "version": "6.8.1-beta.20",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index ef86e37b..309838e5 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.8.1-beta.19",
+  "version": "6.8.1-beta.20",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 30c31312ee616e2096e193891a4ddd00de4b4ae9 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 17 Jun 2021 14:03:32 +0100
Subject: [PATCH 2273/3183] add comment about log

---
 lib/index.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/index.js b/lib/index.js
index 38800d21..17e0f912 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -66,6 +66,7 @@ class eWeLinkPlatform {
         throw new Error(this.lang.pluginNotConf)
       }
 
+      // Log some environment info for debugging
       this.log(
         '%s v%s | Node %s | HB v%s%s...',
         this.lang.initialising,

From 1a99c6c23173e97ae1b43f26505198553d02eddf Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 17 Jun 2021 14:07:20 +0100
Subject: [PATCH 2274/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 23d6208e..9af4a104 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 - Power reading polling for POWR2 and DUALR3 increased to two minutes
 - Device polling (for power, temperature and humidity) will no longer log when sending updates
 - `sensorTimeDifference` minimum reduced to 5 seconds and default reduced to 60 seconds
+- Small changes to the startup logging
 - Recommended node version bump to v14.17.1
 - Bump `ws` dependency to v7.5.0
 

From b07ca440c0f5362ec36ef5ab3d45301628e70b90 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 17 Jun 2021 14:49:29 +0100
Subject: [PATCH 2275/3183] new err strings to lang file

---
 lib/index.js         | 11 +++++++----
 lib/utils/lang-en.js |  4 ++++
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/lib/index.js b/lib/index.js
index 17e0f912..59536927 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -522,7 +522,7 @@ class eWeLinkPlatform {
       } catch (err) {
         if (this.config.debug) {
           const eText = this.funcs.parseError(err)
-          this.log.warn('Could not setup storage client as %s.', eText)
+          this.log.warn('%s %s.', this.lang.storageSetupErr, eText)
         }
       }
 
@@ -570,7 +570,7 @@ class eWeLinkPlatform {
           } catch (err) {
             if (this.config.debug) {
               const eText = this.funcs.parseError(err)
-              this.log.warn('Could not clear storage folder as %s.', eText)
+              this.log.warn('%s %s.', this.lang.storageClearErr, eText)
             }
           }
         }
@@ -587,7 +587,7 @@ class eWeLinkPlatform {
           } catch (err) {
             if (this.config.debug) {
               const eText = this.funcs.parseError(err)
-              this.log.warn('Could not read persist folder as %s.', eText)
+              this.log.warn('%s %s.', this.lang.storageReadErr, eText)
             }
           }
         }
@@ -1436,7 +1436,10 @@ class eWeLinkPlatform {
         try {
           await storage.setItem(device.deviceid, device)
         } catch (err) {
-          this.log.error(err)
+          if (this.config.debug) {
+            const eText = this.funcs.parseError(err)
+            this.log.warn('[%s] %s %s.', accessory.displayName, this.lang.storageWriteErr, eText)
+          }
         }
       }
     } catch (err) {
diff --git a/lib/utils/lang-en.js b/lib/utils/lang-en.js
index f0dbc6b4..c52bbf1b 100644
--- a/lib/utils/lang-en.js
+++ b/lib/utils/lang-en.js
@@ -113,6 +113,10 @@ module.exports = {
   sonoffCamera: 'see the homebridge-ewelink wiki for details to enable the camera',
   stoppedLAN: 'LAN monitoring gracefully stopped',
   stoppedWS: 'Web socket gracefully closed',
+  storageClearErr: 'Could not clear storage folder as',
+  storageReadErr: 'Could not read persist folder as',
+  storageSetupErr: 'Could not setup storage client as',
+  storageWriteErr: 'could not save accessory to file as',
   unreachable: 'it is unreachable',
   updRec: 'receiving update',
   updReq: 'requesting current status',

From 958155848a492f233d0800e05d792403f5ffb1af Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 17 Jun 2021 14:50:02 +0100
Subject: [PATCH 2276/3183] 6.8.1-beta.21

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 7c1a6d00..757ad384 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.8.1-beta.20",
+  "version": "6.8.1-beta.21",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 309838e5..f7934edb 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.8.1-beta.20",
+  "version": "6.8.1-beta.21",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 6c64ed72efd344d75ebb6d59807a7e22a9a2af53 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 18 Jun 2021 07:35:03 +0100
Subject: [PATCH 2277/3183] skip on-online device update req for zb contact

---
 lib/connection/ws.js   | 5 +++++
 lib/utils/constants.js | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/connection/ws.js b/lib/connection/ws.js
index a9434e09..d1228506 100644
--- a/lib/connection/ws.js
+++ b/lib/connection/ws.js
@@ -349,6 +349,11 @@ module.exports = class connectionWS {
   }
 
   async requestUpdate (accessory) {
+    // Don't continue if disabled for any eWeLink UIID
+    if (this.consts.devices.skipUpdateRequest.includes(accessory.context.eweUIID)) {
+      return
+    }
+
     // Generate the payload to send
     const json = {
       action: 'query',
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index cd15477d..b60a5c53 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -183,7 +183,8 @@ module.exports = {
     zbSensorMotion: [2026],
     zbSensorContact: [3026],
     cannotSupport: [0, 65, 118, 119, 120, 121],
-    garageSensors: [102, 3026]
+    garageSensors: [102, 3026],
+    skipUpdateRequest: [1000]
   },
 
   paramsToKeep: [

From dd0f581e4fdf7a63abb78c948cf7f5d7ae51aca8 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 18 Jun 2021 07:35:50 +0100
Subject: [PATCH 2278/3183] 6.8.1-beta.22

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 757ad384..3f9c3bf1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.8.1-beta.21",
+  "version": "6.8.1-beta.22",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index f7934edb..0f360013 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.8.1-beta.21",
+  "version": "6.8.1-beta.22",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From f6f065723784048a42df853020deebf6c474ed8d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 18 Jun 2021 08:00:34 +0100
Subject: [PATCH 2279/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 43 +++++++++++++++++++++++++++----------------
 1 file changed, 27 insertions(+), 16 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9af4a104..630c03d8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,22 +10,33 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 ### Added
 
-- Plugin LAN-only mode without need for eWeLink credentials ([read more](https://github.com/bwp91/homebridge-ewelink/wiki/Connection-Methods#lan-mode-without-ewelink-credentials))
-- LAN mode for iFan devices
-- Polling for TH10/16 devices as they do not seem to send regular updates from firmware 3.5.0
-- Config option to offset the recorded humidity (%RH) for devices that report this
-- Zigbee Button now compares incoming notification against last trigger time
-- [test] Polling via LAN mode for outlet devices that report power attributes
-
-### Changes
-
-- Accessory simulations for TH10/16 devices no longer use eWeLink auto mode, allowing for LAN control
-- Power reading polling for POWR2 and DUALR3 increased to two minutes
-- Device polling (for power, temperature and humidity) will no longer log when sending updates
-- `sensorTimeDifference` minimum reduced to 5 seconds and default reduced to 60 seconds
-- Small changes to the startup logging
-- Recommended node version bump to v14.17.1
-- Bump `ws` dependency to v7.5.0
+- **LAN Mode (without eWeLink credentials)**
+  - The plugin now supports removing eWeLink credentials from the config when in LAN mode
+  - It is important to read about this feature before enabling it - [read more](https://github.com/bwp91/homebridge-ewelink/wiki/Connection-Methods#lan-mode-without-ewelink-credentials)
+- **iFan Devices**
+  - LAN mode control enabled
+- **TH10/16 Devices**
+  - Implemented polling as firmware 3.5.0 does not seem to send regular temperature updates
+  - Implemented LAN mode for Accessory Simulations (eWeLink 'auto' mode is no longer used)
+- **Humidity Sensor Devices**
+  - Config option to offset the recorded humidity (%RH) for devices that report this
+- **POWR2/DUALR3 Devices**
+- [test] Polling via LAN mode to enable constant power attribute updates
+- **Zigbee Button Device**
+  - Comparison of trigger time against notification time to reduce duplicate accessory updates
+  - Will no longer request current state when coming back online to reduce duplicate accessory updates
+
+### Changes
+
+- **Polling/Logging**
+  - Device polling (for power, temperature and humidity) will no longer log when sending updates
+  - Power reading polling for POWR2/DUALR3 increased to two minutes
+  - Small changes to the startup logging
+- **Configuration**
+ - `sensorTimeDifference` minimum reduced to 5 seconds and default reduced to 60 seconds
+- **Dependencies**
+  - Recommended node version bump to v14.17.1
+  - Bump `ws` dependency to v7.5.0
 
 ## 6.8.0 (2021-06-14)
 

From ac5056abece90597fe49ba78e0ee1669aa768536 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 18 Jun 2021 08:01:33 +0100
Subject: [PATCH 2280/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 630c03d8..46ea783a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,7 +21,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 - **Humidity Sensor Devices**
   - Config option to offset the recorded humidity (%RH) for devices that report this
 - **POWR2/DUALR3 Devices**
-- [test] Polling via LAN mode to enable constant power attribute updates
+  - [test] Polling via LAN mode to enable constant power attribute updates
 - **Zigbee Button Device**
   - Comparison of trigger time against notification time to reduce duplicate accessory updates
   - Will no longer request current state when coming back online to reduce duplicate accessory updates

From 27fee2172a037b85be58d660f091f52e48664431 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 18 Jun 2021 08:01:55 +0100
Subject: [PATCH 2281/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 46ea783a..273421fc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -33,7 +33,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
   - Power reading polling for POWR2/DUALR3 increased to two minutes
   - Small changes to the startup logging
 - **Configuration**
- - `sensorTimeDifference` minimum reduced to 5 seconds and default reduced to 60 seconds
+  - `sensorTimeDifference` minimum reduced to 5 seconds and default reduced to 60 seconds
 - **Dependencies**
   - Recommended node version bump to v14.17.1
   - Bump `ws` dependency to v7.5.0

From afae1def9e22253d8bb399164aa55457798fa963 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 18 Jun 2021 08:03:37 +0100
Subject: [PATCH 2282/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 273421fc..a77f10eb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
   - It is important to read about this feature before enabling it - [read more](https://github.com/bwp91/homebridge-ewelink/wiki/Connection-Methods#lan-mode-without-ewelink-credentials)
 - **iFan Devices**
   - LAN mode control enabled
+  - Previous fan speed will be used again after turning off and on
 - **TH10/16 Devices**
   - Implemented polling as firmware 3.5.0 does not seem to send regular temperature updates
   - Implemented LAN mode for Accessory Simulations (eWeLink 'auto' mode is no longer used)

From a657e1f2ba46283f42e96f5fd5dc54b2aa4f4907 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 18 Jun 2021 11:00:01 +0100
Subject: [PATCH 2283/3183] shorten plugin-ui acc info lines

---
 lib/homebridge-ui/public/index.html | 37 +++++++++++++----------------
 1 file changed, 16 insertions(+), 21 deletions(-)

diff --git a/lib/homebridge-ui/public/index.html b/lib/homebridge-ui/public/index.html
index ecb677d0..301f4e09 100644
--- a/lib/homebridge-ui/public/index.html
+++ b/lib/homebridge-ui/public/index.html
@@ -284,33 +284,28 @@ <h4>Disclaimer</h4>
         })
         showDeviceInfo = async hbDeviceId => {
           homebridge.showSpinner()
-          const selectedAccessory = cachedAccessories.find(x => x.context.hbDeviceId === hbDeviceId)
-
-          console.log(selectedAccessory)
-          document.getElementById('displayName').innerHTML = selectedAccessory.displayName
-          document.getElementById('reachableWAN').innerHTML = selectedAccessory.context.reachableWAN
+          const thisAcc = cachedAccessories.find(x => x.context.hbDeviceId === hbDeviceId)
+          const context = thisAcc.context
+          document.getElementById('displayName').innerHTML = thisAcc.displayName
+          document.getElementById('reachableWAN').innerHTML = context.reachableWAN
             ? '<i class="fas fa-circle mr-1 green-text"></i> Online'
             : '<i class="fas fa-circle mr-1 red-text"></i> Offline'
-          document.getElementById('reachableLAN').innerHTML = selectedAccessory.context.reachableLAN
+          document.getElementById('reachableLAN').innerHTML = context.reachableLAN
             ? '<i class="fas fa-circle mr-1 green-text"></i> Online'
             : '<i class="fas fa-circle mr-1 red-text"></i> Offline'
-          document.getElementById('lanIP').innerHTML = selectedAccessory.context.ip
-            ? selectedAccessory.context.ip
-            : 'N/A'
-          document.getElementById('hbDeviceId').innerHTML = selectedAccessory.context.hbDeviceId
-          document.getElementById('eweDeviceId').innerHTML = selectedAccessory.context.eweDeviceId
-          document.getElementById('eweBrandName').innerHTML = selectedAccessory.context.eweBrandName
-          document.getElementById('eweFirmware').innerHTML = selectedAccessory.context.firmware
-          document.getElementById('eweMacAddress').innerHTML = selectedAccessory.context.macAddress
-            ? selectedAccessory.context.macAddress
-            : 'N/A'
+          document.getElementById('lanIP').innerHTML = context.ip || 'N/A'
+          document.getElementById('hbDeviceId').innerHTML = context.hbDeviceId || 'N/A'
+          document.getElementById('eweDeviceId').innerHTML = context.eweDeviceId || 'N/A'
+          document.getElementById('eweBrandName').innerHTML = context.eweBrandName || 'N/A'
+          document.getElementById('eweFirmware').innerHTML = context.firmware || 'N/A'
+          document.getElementById('eweMacAddress').innerHTML = context.macAddress || 'N/A'
           document.getElementById('eweModel').innerHTML =
-            selectedAccessory.context.eweModel + ' (' + selectedAccessory.context.eweUIID + ')'
-          document.getElementById('eweShared').innerHTML = selectedAccessory.context.eweShared
-            ? 'Yes (by ' + selectedAccessory.context.eweShared + ')'
+            (context.eweModel || 'N/A') + ' (' + (context.eweUIID || 'N/A') + ')'
+          document.getElementById('eweShared').innerHTML = context.eweShared
+            ? 'Yes (by ' + context.eweShared + ')'
             : 'No'
-          document.getElementById('imgIcon').innerHTML = selectedAccessory.context.eweBrandLogo
-            ? '<img src="' + selectedAccessory.context.eweBrandLogo + '" style="width: 150px;">'
+          document.getElementById('imgIcon').innerHTML = context.eweBrandLogo
+            ? '<img src="' + context.eweBrandLogo + '" style="width: 150px;">'
             : ''
           document.getElementById('deviceTable').style.display = 'inline-table'
           homebridge.hideSpinner()

From 4ad189294f6ce3782c6841196d608dd64ad2ee7f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 18 Jun 2021 18:42:35 +0100
Subject: [PATCH 2284/3183] logging + rf bridge improvements

---
 config.schema.json                      | 279 ++++++++++++++++++------
 lib/connection/ws.js                    |  10 +-
 lib/device/curtain.js                   |  40 ++--
 lib/device/diffuser.js                  |  56 +++--
 lib/device/fan.js                       |  52 +++--
 lib/device/humidifier.js                |  46 ++--
 lib/device/light-cct.js                 |  56 +++--
 lib/device/light-dimmer.js              |  52 +++--
 lib/device/light-rgb-cct.js             |  68 +++---
 lib/device/light-rgb.js                 |  44 ++--
 lib/device/motor.js                     |  40 ++--
 lib/device/outlet-double.js             |  42 ++--
 lib/device/outlet-multi.js              |  38 +++-
 lib/device/outlet-power.js              |  46 ++--
 lib/device/outlet-scm.js                |  40 ++--
 lib/device/outlet-single.js             |  40 ++--
 lib/device/rf-bridge.js                 | 174 +++++----------
 lib/device/rf-button.js                 |  96 ++++++++
 lib/device/rf-sensor.js                 | 152 +++++++++++++
 lib/device/sensor-ambient.js            |  52 +++--
 lib/device/sensor-contact.js            |  42 ++--
 lib/device/sensor-temp-humi.js          |  44 ++--
 lib/device/simulation/blind.js          |  44 ++--
 lib/device/simulation/cooler.js         |  62 ++++--
 lib/device/simulation/dehumidifier.js   |  58 +++--
 lib/device/simulation/door.js           |  44 ++--
 lib/device/simulation/garage-eachen.js  |  43 ++--
 lib/device/simulation/garage-four.js    |  43 ++--
 lib/device/simulation/garage-one.js     |  45 ++--
 lib/device/simulation/garage-two.js     |  49 +++--
 lib/device/simulation/heater.js         |  62 ++++--
 lib/device/simulation/humidifier.js     |  57 +++--
 lib/device/simulation/lock-one.js       |  47 ++--
 lib/device/simulation/purifier.js       |  38 +++-
 lib/device/simulation/sensor-hidden.js  |  19 +-
 lib/device/simulation/sensor-leak.js    |  44 ++--
 lib/device/simulation/sensor-visible.js |  63 ++++--
 lib/device/simulation/sensor.js         |  39 +++-
 lib/device/simulation/switch-valve.js   |  47 ++--
 lib/device/simulation/tap-one.js        |  41 ++--
 lib/device/simulation/tap-two.js        |  41 ++--
 lib/device/simulation/valve-four.js     |  43 ++--
 lib/device/simulation/valve-one.js      |  43 ++--
 lib/device/simulation/valve-two.js      |  43 ++--
 lib/device/simulation/window.js         |  44 ++--
 lib/device/switch-double.js             |  38 +++-
 lib/device/switch-multi.js              |  38 +++-
 lib/device/switch-scm.js                |  39 ++--
 lib/device/switch-single.js             |  40 ++--
 lib/device/thermostat.js                |  50 +++--
 lib/device/zigbee/light-cct.js          |  54 +++--
 lib/device/zigbee/light-dimmer.js       |  46 ++--
 lib/device/zigbee/sensor-ambient.js     |  48 ++--
 lib/device/zigbee/sensor-contact.js     |  44 ++--
 lib/device/zigbee/sensor-motion.js      |  44 ++--
 lib/device/zigbee/switch-single.js      |  40 ++--
 lib/device/zigbee/switch-stateless.js   |  46 ++--
 lib/index.js                            | 109 ++++-----
 lib/utils/constants.js                  |  18 +-
 59 files changed, 2137 insertions(+), 1085 deletions(-)
 create mode 100644 lib/device/rf-button.js
 create mode 100644 lib/device/rf-sensor.js

diff --git a/config.schema.json b/config.schema.json
index 59b5c976..a35c6368 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -134,13 +134,28 @@
                 "functionBody": "return model.mode !== 'wan';"
               }
             },
-            "overrideDisabledLogging": {
-              "type": "boolean",
-              "title": "Override Disabled Logging",
-              "description": "If true, updates for this device will be added to the log, even if the general 'Disable Device Logging' setting is true.",
-              "condition": {
-                "functionBody": "return model.disableDeviceLogging;"
-              }
+            "overrideLogging": {
+              "type": "string",
+              "title": "Override Logging Setting",
+              "description": "Override global logging setting for this device.",
+              "oneOf": [
+                {
+                  "title": "Default (Use Global Setting)",
+                  "enum": ["default"]
+                },
+                {
+                  "title": "Enable Standard Logging",
+                  "enum": ["standard"]
+                },
+                {
+                  "title": "Enable Debug Logging",
+                  "enum": ["debug"]
+                },
+                {
+                  "title": "Disable All Logging",
+                  "enum": ["disable"]
+                }
+              ]
             }
           }
         }
@@ -189,13 +204,28 @@
                 "functionBody": "return model.mode !== 'wan';"
               }
             },
-            "overrideDisabledLogging": {
-              "type": "boolean",
-              "title": "Override Disabled Logging",
-              "description": "If true, updates for this device will be added to the log, even if the general 'Disable Device Logging' setting is true.",
-              "condition": {
-                "functionBody": "return model.disableDeviceLogging;"
-              }
+            "overrideLogging": {
+              "type": "string",
+              "title": "Override Logging Setting",
+              "description": "Override global logging setting for this device.",
+              "oneOf": [
+                {
+                  "title": "Default (Use Global Setting)",
+                  "enum": ["default"]
+                },
+                {
+                  "title": "Enable Standard Logging",
+                  "enum": ["standard"]
+                },
+                {
+                  "title": "Enable Debug Logging",
+                  "enum": ["debug"]
+                },
+                {
+                  "title": "Disable All Logging",
+                  "enum": ["disable"]
+                }
+              ]
             }
           }
         }
@@ -239,13 +269,28 @@
                 "functionBody": "return model.mode !== 'wan';"
               }
             },
-            "overrideDisabledLogging": {
-              "type": "boolean",
-              "title": "Override Disabled Logging",
-              "description": "If true, updates for this device will be added to the log, even if the general 'Disable Device Logging' setting is true.",
-              "condition": {
-                "functionBody": "return model.disableDeviceLogging;"
-              }
+            "overrideLogging": {
+              "type": "string",
+              "title": "Override Logging Setting",
+              "description": "Override global logging setting for this device.",
+              "oneOf": [
+                {
+                  "title": "Default (Use Global Setting)",
+                  "enum": ["default"]
+                },
+                {
+                  "title": "Enable Standard Logging",
+                  "enum": ["standard"]
+                },
+                {
+                  "title": "Enable Debug Logging",
+                  "enum": ["debug"]
+                },
+                {
+                  "title": "Disable All Logging",
+                  "enum": ["disable"]
+                }
+              ]
             }
           }
         }
@@ -307,13 +352,28 @@
                 "functionBody": "return model.mode !== 'wan';"
               }
             },
-            "overrideDisabledLogging": {
-              "type": "boolean",
-              "title": "Override Disabled Logging",
-              "description": "If true, updates for this device will be added to the log, even if the general 'Disable Device Logging' setting is true.",
-              "condition": {
-                "functionBody": "return model.disableDeviceLogging;"
-              }
+            "overrideLogging": {
+              "type": "string",
+              "title": "Override Logging Setting",
+              "description": "Override global logging setting for this device.",
+              "oneOf": [
+                {
+                  "title": "Default (Use Global Setting)",
+                  "enum": ["default"]
+                },
+                {
+                  "title": "Enable Standard Logging",
+                  "enum": ["standard"]
+                },
+                {
+                  "title": "Enable Debug Logging",
+                  "enum": ["debug"]
+                },
+                {
+                  "title": "Disable All Logging",
+                  "enum": ["disable"]
+                }
+              ]
             }
           }
         }
@@ -365,13 +425,28 @@
               "placeholder": 30,
               "minimum": 1
             },
-            "overrideDisabledLogging": {
-              "type": "boolean",
-              "title": "Override Disabled Logging",
-              "description": "If true, updates for this device will be added to the log, even if the general 'Disable Device Logging' setting is true.",
-              "condition": {
-                "functionBody": "return model.disableDeviceLogging;"
-              }
+            "overrideLogging": {
+              "type": "string",
+              "title": "Override Logging Setting",
+              "description": "Override global logging setting for this device.",
+              "oneOf": [
+                {
+                  "title": "Default (Use Global Setting)",
+                  "enum": ["default"]
+                },
+                {
+                  "title": "Enable Standard Logging",
+                  "enum": ["standard"]
+                },
+                {
+                  "title": "Enable Debug Logging",
+                  "enum": ["debug"]
+                },
+                {
+                  "title": "Disable All Logging",
+                  "enum": ["disable"]
+                }
+              ]
             }
           }
         }
@@ -397,13 +472,28 @@
               "title": "Hide Light Switch",
               "description": "If true, the light switch will be hidden from HomeKit."
             },
-            "overrideDisabledLogging": {
-              "type": "boolean",
-              "title": "Override Disabled Logging",
-              "description": "If true, updates for this device will be added to the log, even if the general 'Disable Device Logging' setting is true.",
-              "condition": {
-                "functionBody": "return model.disableDeviceLogging;"
-              }
+            "overrideLogging": {
+              "type": "string",
+              "title": "Override Logging Setting",
+              "description": "Override global logging setting for this device.",
+              "oneOf": [
+                {
+                  "title": "Default (Use Global Setting)",
+                  "enum": ["default"]
+                },
+                {
+                  "title": "Enable Standard Logging",
+                  "enum": ["standard"]
+                },
+                {
+                  "title": "Enable Debug Logging",
+                  "enum": ["debug"]
+                },
+                {
+                  "title": "Disable All Logging",
+                  "enum": ["disable"]
+                }
+              ]
             }
           }
         }
@@ -460,13 +550,28 @@
               "placeholder": 60,
               "minimum": 5
             },
-            "overrideDisabledLogging": {
-              "type": "boolean",
-              "title": "Override Disabled Logging",
-              "description": "If true, updates for this device will be added to the log, even if the general 'Disable Device Logging' setting is true.",
-              "condition": {
-                "functionBody": "return model.disableDeviceLogging;"
-              }
+            "overrideLogging": {
+              "type": "string",
+              "title": "Override Logging Setting",
+              "description": "Override global logging setting for this device.",
+              "oneOf": [
+                {
+                  "title": "Default (Use Global Setting)",
+                  "enum": ["default"]
+                },
+                {
+                  "title": "Enable Standard Logging",
+                  "enum": ["standard"]
+                },
+                {
+                  "title": "Enable Debug Logging",
+                  "enum": ["debug"]
+                },
+                {
+                  "title": "Disable All Logging",
+                  "enum": ["disable"]
+                }
+              ]
             }
           }
         }
@@ -537,13 +642,28 @@
               "placeholder": 60,
               "minimum": 5
             },
-            "overrideDisabledLogging": {
-              "type": "boolean",
-              "title": "Override Disabled Logging",
-              "description": "If true, updates for this device will be added to the log, even if the general 'Disable Device Logging' setting is true.",
-              "condition": {
-                "functionBody": "return model.disableDeviceLogging;"
-              }
+            "overrideLogging": {
+              "type": "string",
+              "title": "Override Logging Setting",
+              "description": "Override global logging setting for this device.",
+              "oneOf": [
+                {
+                  "title": "Default (Use Global Setting)",
+                  "enum": ["default"]
+                },
+                {
+                  "title": "Enable Standard Logging",
+                  "enum": ["standard"]
+                },
+                {
+                  "title": "Enable Debug Logging",
+                  "enum": ["debug"]
+                },
+                {
+                  "title": "Disable All Logging",
+                  "enum": ["disable"]
+                }
+              ]
             }
           }
         }
@@ -745,13 +865,28 @@
                 "functionBody": "return (model.mode !== 'wan' && model.groups[arrayIndices] && !['thermostat', 'cooler', 'humidifier', 'dehumidifier', 'sensor_leak'].includes(model.groups[arrayIndices].type));"
               }
             },
-            "overrideDisabledLogging": {
-              "type": "boolean",
-              "title": "Override Disabled Logging",
-              "description": "If true, updates for this device will be added to the log, even if the general 'Disable Device Logging' setting is true.",
-              "condition": {
-                "functionBody": "return model.disableDeviceLogging;"
-              }
+            "overrideLogging": {
+              "type": "string",
+              "title": "Override Logging Setting",
+              "description": "Override global logging setting for this device.",
+              "oneOf": [
+                {
+                  "title": "Default (Use Global Setting)",
+                  "enum": ["default"]
+                },
+                {
+                  "title": "Enable Standard Logging",
+                  "enum": ["standard"]
+                },
+                {
+                  "title": "Enable Debug Logging",
+                  "enum": ["debug"]
+                },
+                {
+                  "title": "Disable All Logging",
+                  "enum": ["disable"]
+                }
+              ]
             }
           }
         }
@@ -806,7 +941,7 @@
             "singleDevices[].label",
             "singleDevices[].showAsOutlet",
             "singleDevices[].ipAddress",
-            "singleDevices[].overrideDisabledLogging"
+            "singleDevices[].overrideLogging"
           ]
         }
       ]
@@ -828,7 +963,7 @@
             "multiDevices[].inUsePowerThreshold",
             "multiDevices[].hideChannels",
             "multiDevices[].ipAddress",
-            "multiDevices[].overrideDisabledLogging"
+            "multiDevices[].overrideLogging"
           ]
         }
       ]
@@ -849,7 +984,7 @@
             "outletDevices[].showAsSwitch",
             "outletDevices[].inUsePowerThreshold",
             "outletDevices[].ipAddress",
-            "outletDevices[].overrideDisabledLogging"
+            "outletDevices[].overrideLogging"
           ]
         }
       ]
@@ -871,7 +1006,7 @@
             "lightDevices[].brightnessStep",
             "lightDevices[].adaptiveLightingShift",
             "lightDevices[].ipAddress",
-            "lightDevices[].overrideDisabledLogging"
+            "lightDevices[].overrideLogging"
           ]
         }
       ]
@@ -894,7 +1029,7 @@
             "thDevices[].humidityOffset",
             "thDevices[].minTarget",
             "thDevices[].maxTarget",
-            "thDevices[].overrideDisabledLogging"
+            "thDevices[].overrideLogging"
           ]
         }
       ]
@@ -913,7 +1048,7 @@
             "fanDevices[].deviceId",
             "fanDevices[].label",
             "fanDevices[].hideLight",
-            "fanDevices[].overrideDisabledLogging"
+            "fanDevices[].overrideLogging"
           ]
         }
       ]
@@ -937,7 +1072,7 @@
             "sensorDevices[].hideLongDouble",
             "sensorDevices[].scaleBattery",
             "sensorDevices[].sensorTimeDifference",
-            "sensorDevices[].overrideDisabledLogging"
+            "sensorDevices[].overrideLogging"
           ]
         }
       ]
@@ -958,7 +1093,7 @@
             "bridgeSensors[].type",
             "bridgeSensors[].sensorTimeLength",
             "bridgeSensors[].sensorTimeDifference",
-            "bridgeSensors[].overrideDisabledLogging",
+            "bridgeSensors[].overrideLogging",
             {
               "type": "help",
               "helpvalue": "<label class=\"control-label text-warning\">⚠ Any changes you make to a sensor will reset its connected RF Bridge, resetting all its devices' HomeKit names, room associations and automations.</label>"
@@ -988,7 +1123,7 @@
             "groups[].hideSensor",
             "groups[].obstructId",
             "groups[].ipAddress",
-            "groups[].overrideDisabledLogging",
+            "groups[].overrideLogging",
             {
               "type": "help",
               "helpvalue": "<label class=\"control-label text-warning\">⚠ If you find this accessory hasn't set up properly after restarting, then try removing it from the cache so it is re-added.</label>"
diff --git a/lib/connection/ws.js b/lib/connection/ws.js
index d1228506..b93b6361 100644
--- a/lib/connection/ws.js
+++ b/lib/connection/ws.js
@@ -354,6 +354,11 @@ module.exports = class connectionWS {
       return
     }
 
+    // Log the action if appropriate
+    if (accessory.control.enableDebugLogging) {
+      this.log('[%s] %s.', accessory.displayName, this.lang.updReq)
+    }
+
     // Generate the payload to send
     const json = {
       action: 'query',
@@ -365,11 +370,6 @@ module.exports = class connectionWS {
       userAgent: 'app'
     }
 
-    // Log the action if appropriate
-    if (this.debug) {
-      this.log('[%s] %s.', accessory.displayName, this.lang.updReq)
-    }
-
     // Check the web socket is open
     if (this.wsClient && this.wsIsConnected) {
       // Send the request
diff --git a/lib/device/curtain.js b/lib/device/curtain.js
index 864495bd..641cca19 100644
--- a/lib/device/curtain.js
+++ b/lib/device/curtain.js
@@ -25,10 +25,26 @@ module.exports = class deviceCurtain {
 
     // Set up custom variables for this device type
     const deviceConf = platform.singleDevices[accessory.context.eweDeviceId]
-    this.disableDeviceLogging =
-      deviceConf && deviceConf.overrideDisabledLogging
-        ? false
-        : platform.config.disableDeviceLogging
+
+    // Set the correct logging variables for this accessory
+    this.enableLogging = !platform.config.disableDeviceLogging
+    this.enableDebugLogging = platform.config.debug
+    if (deviceConf && deviceConf.overrideLogging) {
+      switch (deviceConf.overrideLogging) {
+        case 'standard':
+          this.enableLogging = true
+          this.enableDebugLogging = false
+          break
+        case 'debug':
+          this.enableLogging = true
+          this.enableDebugLogging = true
+          break
+        case 'disable':
+          this.enableLogging = false
+          this.enableDebugLogging = false
+          break
+      }
+    }
 
     // Add the window covering service if it doesn't already exist
     this.service =
@@ -40,13 +56,11 @@ module.exports = class deviceCurtain {
       await this.internalPositionUpdate(value)
     })
 
-    // Output the customised options to the log if in debug mode
-    if (platform.config.debug) {
-      const opts = JSON.stringify({
-        disableDeviceLogging: this.disableDeviceLogging
-      })
-      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
-    }
+    // Output the customised options to the log
+    const opts = JSON.stringify({
+      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable'
+    })
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
 
   async internalPositionUpdate (value) {
@@ -80,7 +94,7 @@ module.exports = class deviceCurtain {
       this.cachePos = value
 
       // Log the update if appropriate
-      if (!this.disableDeviceLogging) {
+      if (this.enableLogging) {
         this.log('[%s] %s [%s%].', this.name, this.lang.curPos, this.cachePos)
       }
     } catch (err) {
@@ -111,7 +125,7 @@ module.exports = class deviceCurtain {
       // Only update the cache and log if the provided value has changed
       if (params.updateSource && this.cachePos !== newPos) {
         this.cachePos = newPos
-        if (!this.disableDeviceLogging) {
+        if (this.enableLogging) {
           this.log('[%s] %s [%s%].', this.name, this.lang.curPos, this.cachePos)
         }
       }
diff --git a/lib/device/diffuser.js b/lib/device/diffuser.js
index 001e3158..707c2d0b 100644
--- a/lib/device/diffuser.js
+++ b/lib/device/diffuser.js
@@ -20,10 +20,26 @@ module.exports = class deviceDiffuser {
 
     // Set up custom variables for this device type
     const deviceConf = platform.singleDevices[accessory.context.eweDeviceId]
-    this.disableDeviceLogging =
-      deviceConf && deviceConf.overrideDisabledLogging
-        ? false
-        : platform.config.disableDeviceLogging
+
+    // Set the correct logging variables for this accessory
+    this.enableLogging = !platform.config.disableDeviceLogging
+    this.enableDebugLogging = platform.config.debug
+    if (deviceConf && deviceConf.overrideLogging) {
+      switch (deviceConf.overrideLogging) {
+        case 'standard':
+          this.enableLogging = true
+          this.enableDebugLogging = false
+          break
+        case 'debug':
+          this.enableLogging = true
+          this.enableDebugLogging = true
+          break
+        case 'disable':
+          this.enableLogging = false
+          this.enableDebugLogging = false
+          break
+      }
+    }
 
     // Add the fan service if it doesn't already exist
     this.fanService =
@@ -63,13 +79,11 @@ module.exports = class deviceDiffuser {
       await this.internalLightColourUpdate(value)
     })
 
-    // Output the customised options to the log if in debug mode
-    if (platform.config.debug) {
-      const opts = JSON.stringify({
-        disableDeviceLogging: this.disableDeviceLogging
-      })
-      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
-    }
+    // Output the customised options to the log
+    const opts = JSON.stringify({
+      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable'
+    })
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
 
   async internalDiffuserOnOffUpdate (value) {
@@ -101,7 +115,7 @@ module.exports = class deviceDiffuser {
       this.cacheState = newValue
 
       // Log the update if appropriate
-      if (!this.disableDeviceLogging) {
+      if (this.enableLogging) {
         this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
       }
     } catch (err) {
@@ -157,7 +171,7 @@ module.exports = class deviceDiffuser {
       this.cacheSpeed = newValue
 
       // Log the update if appropriate
-      if (!this.disableDeviceLogging) {
+      if (this.enableLogging) {
         this.log('[%s] %s [%s%].', this.name, this.lang.curSpeed, this.cacheSpeed)
       }
     } catch (err) {
@@ -199,7 +213,7 @@ module.exports = class deviceDiffuser {
       this.cacheLight = newValue
 
       // Log the update if appropriate
-      if (!this.disableDeviceLogging) {
+      if (this.enableLogging) {
         this.log('[%s] %s [%s%].', this.name, this.lang.curLight, value === 1 ? 'on' : 'off')
       }
     } catch (err) {
@@ -247,7 +261,7 @@ module.exports = class deviceDiffuser {
       this.cacheBright = value
 
       // Log the update if appropriate
-      if (!this.disableDeviceLogging) {
+      if (this.enableLogging) {
         this.log('[%s] %s [%s%].', this.name, this.lang.curBright, this.cacheBright)
       }
     } catch (err) {
@@ -304,7 +318,7 @@ module.exports = class deviceDiffuser {
       this.cacheB = newRGB[0]
 
       // Log the update if appropriate
-      if (!this.disableDeviceLogging) {
+      if (this.enableLogging) {
         this.log(
           '[%s] %s [rgb %s].',
           this.name,
@@ -343,7 +357,7 @@ module.exports = class deviceDiffuser {
         }
 
         // Log if appropriate
-        if (params.updateSource && !this.disableDeviceLogging) {
+        if (params.updateSource && this.enableLogging) {
           this.log('[%s] %s [%s%].', this.name, this.lang.curState, this.cacheState)
         }
       }
@@ -357,7 +371,7 @@ module.exports = class deviceDiffuser {
         this.fanService.updateCharacteristic(this.hapChar.RotationSpeed, this.cacheSpeed)
 
         // Log if appropriate
-        if (params.updateSource && !this.disableDeviceLogging) {
+        if (params.updateSource && this.enableLogging) {
           this.log('[%s] %s [%s%].', this.name, this.lang.curSpeed, this.cacheSpeed)
         }
       }
@@ -371,7 +385,7 @@ module.exports = class deviceDiffuser {
         this.lightService.updateCharacteristic(this.hapChar.On, params.lightswitch === 1)
 
         // Log if appropriate
-        if (params.updateSource && !this.disableDeviceLogging) {
+        if (params.updateSource && this.enableLogging) {
           this.log(
             '[%s] %s [%s%].',
             this.name,
@@ -393,7 +407,7 @@ module.exports = class deviceDiffuser {
         this.lightService.updateCharacteristic(this.hapChar.Brightness, params.lightbright)
 
         // Log if appropriate
-        if (params.updateSource && !this.disableDeviceLogging) {
+        if (params.updateSource && this.enableLogging) {
           this.log('[%s] %s [%s%].', this.name, this.lang.curBright, this.cacheBright)
         }
       }
@@ -419,7 +433,7 @@ module.exports = class deviceDiffuser {
         this.lightService.updateCharacteristic(this.hapChar.Saturation, 100)
 
         // Log if appropriate
-        if (params.updateSource && !this.disableDeviceLogging) {
+        if (params.updateSource && this.enableLogging) {
           this.log(
             '[%s] %s [rgb %s].',
             this.name,
diff --git a/lib/device/fan.js b/lib/device/fan.js
index fe72ee6c..90db715d 100644
--- a/lib/device/fan.js
+++ b/lib/device/fan.js
@@ -20,10 +20,26 @@ module.exports = class deviceFan {
     // Set up custom variables for this device type
     const deviceConf = platform.fanDevices[accessory.context.eweDeviceId]
     this.hideLight = deviceConf && deviceConf.hideLight
-    this.disableDeviceLogging =
-      deviceConf && deviceConf.overrideDisabledLogging
-        ? false
-        : platform.config.disableDeviceLogging
+
+    // Set the correct logging variables for this accessory
+    this.enableLogging = !platform.config.disableDeviceLogging
+    this.enableDebugLogging = platform.config.debug
+    if (deviceConf && deviceConf.overrideLogging) {
+      switch (deviceConf.overrideLogging) {
+        case 'standard':
+          this.enableLogging = true
+          this.enableDebugLogging = false
+          break
+        case 'debug':
+          this.enableLogging = true
+          this.enableDebugLogging = true
+          break
+        case 'disable':
+          this.enableLogging = false
+          this.enableDebugLogging = false
+          break
+      }
+    }
 
     // Add the fan service if it doesn't already exist
     this.service =
@@ -70,14 +86,12 @@ module.exports = class deviceFan {
       99: 'high'
     }
 
-    // Output the customised options to the log if in debug mode
-    if (platform.config.debug) {
-      const opts = JSON.stringify({
-        disableDeviceLogging: this.disableDeviceLogging,
-        hideLight: this.hideLight
-      })
-      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
-    }
+    // Output the customised options to the log
+    const opts = JSON.stringify({
+      hideLight: this.hideLight,
+      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable'
+    })
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
 
   async internalStateUpdate (value) {
@@ -105,7 +119,7 @@ module.exports = class deviceFan {
       }
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.cacheState = newState
-      if (!this.disableDeviceLogging) {
+      if (this.enableLogging) {
         this.log('[%s] %s [%s].', this.name, this.lang.curState, newState)
       }
     } catch (err) {
@@ -160,7 +174,7 @@ module.exports = class deviceFan {
       await this.platform.sendDeviceUpdate(this.accessory, params)
       if (newState !== this.cacheState) {
         this.cacheState = newState
-        if (!this.disableDeviceLogging) {
+        if (this.enableLogging) {
           this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
         }
       }
@@ -172,7 +186,7 @@ module.exports = class deviceFan {
         return
       }
       this.cacheSpeed = newSpeed
-      if (!this.disableDeviceLogging) {
+      if (this.enableLogging) {
         this.log('[%s] %s [%s].', this.name, this.lang.curSpeed, this.speed2label[this.cacheSpeed])
       }
     } catch (err) {
@@ -199,7 +213,7 @@ module.exports = class deviceFan {
       })
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.cacheLight = newLight
-      if (!this.disableDeviceLogging) {
+      if (this.enableLogging) {
         this.log('[%s] %s [%s].', this.name, this.lang.curLight, this.cacheLight)
       }
     } catch (err) {
@@ -241,7 +255,7 @@ module.exports = class deviceFan {
       if (params.switches[1].switch !== this.cacheState) {
         this.cacheState = params.switches[1].switch
         this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
-        if (params.updateSource && !this.disableDeviceLogging) {
+        if (params.updateSource && this.enableLogging) {
           this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
         }
       }
@@ -260,7 +274,7 @@ module.exports = class deviceFan {
       if (speed !== this.cacheSpeed && this.cacheState === 'on') {
         this.cacheSpeed = speed
         this.service.updateCharacteristic(this.hapChar.RotationSpeed, this.cacheSpeed)
-        if (params.updateSource && !this.disableDeviceLogging) {
+        if (params.updateSource && this.enableLogging) {
           this.log(
             '[%s] %s [%s].',
             this.name,
@@ -272,7 +286,7 @@ module.exports = class deviceFan {
       if (this.lightService && params.switches[0].switch !== this.cacheLight) {
         this.cacheLight = params.switches[0].switch
         this.lightService.updateCharacteristic(this.hapChar.On, this.cacheLight === 'on')
-        if (params.updateSource && !this.disableDeviceLogging) {
+        if (params.updateSource && this.enableLogging) {
           this.log('[%s] %s [%s].', this.name, this.lang.curLight, this.cacheLight)
         }
       }
diff --git a/lib/device/humidifier.js b/lib/device/humidifier.js
index e5f355c7..90b5c349 100644
--- a/lib/device/humidifier.js
+++ b/lib/device/humidifier.js
@@ -19,10 +19,26 @@ module.exports = class deviceHumidifier {
 
     // Set up custom variables for this device type
     const deviceConf = platform.singleDevices[accessory.context.eweDeviceId]
-    this.disableDeviceLogging =
-      deviceConf && deviceConf.overrideDisabledLogging
-        ? false
-        : platform.config.disableDeviceLogging
+
+    // Set the correct logging variables for this accessory
+    this.enableLogging = !platform.config.disableDeviceLogging
+    this.enableDebugLogging = platform.config.debug
+    if (deviceConf && deviceConf.overrideLogging) {
+      switch (deviceConf.overrideLogging) {
+        case 'standard':
+          this.enableLogging = true
+          this.enableDebugLogging = false
+          break
+        case 'debug':
+          this.enableLogging = true
+          this.enableDebugLogging = true
+          break
+        case 'disable':
+          this.enableLogging = false
+          this.enableDebugLogging = false
+          break
+      }
+    }
 
     /*
       The device does not provide a current humidity reading so
@@ -54,13 +70,11 @@ module.exports = class deviceHumidifier {
       3: 'high'
     }
 
-    // Output the customised options to the log if in debug mode
-    if (platform.config.debug) {
-      const opts = JSON.stringify({
-        disableDeviceLogging: this.disableDeviceLogging
-      })
-      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
-    }
+    // Output the customised options to the log
+    const opts = JSON.stringify({
+      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable'
+    })
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
 
   async internalStateUpdate (value) {
@@ -75,7 +89,7 @@ module.exports = class deviceHumidifier {
       }
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.cacheState = newState
-      if (!this.disableDeviceLogging) {
+      if (this.enableLogging) {
         this.log('[%s] %s [%s].', this.name, this.lang.curState, newState)
       }
     } catch (err) {
@@ -117,7 +131,7 @@ module.exports = class deviceHumidifier {
       await this.platform.sendDeviceUpdate(this.accessory, params)
       if (newState !== this.cacheState) {
         this.cacheState = newState
-        if (!this.disableDeviceLogging) {
+        if (this.enableLogging) {
           this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
         }
       }
@@ -129,7 +143,7 @@ module.exports = class deviceHumidifier {
         return
       } else {
         this.cacheMode = newMode
-        if (!this.disableDeviceLogging) {
+        if (this.enableLogging) {
           this.log('[%s] %s [%s].', this.name, this.lang.curMode, this.mode2label[this.cacheMode])
         }
       }
@@ -146,7 +160,7 @@ module.exports = class deviceHumidifier {
     try {
       if (params.switch && params.switch !== this.cacheState) {
         this.cacheState = params.switch
-        if (params.updateSource && !this.disableDeviceLogging) {
+        if (params.updateSource && this.enableLogging) {
           this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
         }
         this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
@@ -157,7 +171,7 @@ module.exports = class deviceHumidifier {
       if (params.state && params.state !== this.cacheMode) {
         this.cacheMode = params.state
         if (this.cacheState === 'on') {
-          if (params.updateSource && !this.disableDeviceLogging) {
+          if (params.updateSource && this.enableLogging) {
             this.log('[%s] %s [%s].', this.name, this.lang.curMode, this.mode2label[this.cacheMode])
           }
           this.service.updateCharacteristic(this.hapChar.RotationSpeed, this.cacheMode * 33)
diff --git a/lib/device/light-cct.js b/lib/device/light-cct.js
index bc25f773..cef09557 100644
--- a/lib/device/light-cct.js
+++ b/lib/device/light-cct.js
@@ -31,10 +31,26 @@ module.exports = class deviceLightCCT {
       deviceConf && deviceConf.brightnessStep
         ? Math.min(deviceConf.brightnessStep, 100)
         : platform.consts.defaultValues.brightnessStep
-    this.disableDeviceLogging =
-      deviceConf && deviceConf.overrideDisabledLogging
-        ? false
-        : platform.config.disableDeviceLogging
+
+    // Set the correct logging variables for this accessory
+    this.enableLogging = !platform.config.disableDeviceLogging
+    this.enableDebugLogging = platform.config.debug
+    if (deviceConf && deviceConf.overrideLogging) {
+      switch (deviceConf.overrideLogging) {
+        case 'standard':
+          this.enableLogging = true
+          this.enableDebugLogging = false
+          break
+        case 'debug':
+          this.enableLogging = true
+          this.enableDebugLogging = true
+          break
+        case 'disable':
+          this.enableLogging = false
+          this.enableDebugLogging = false
+          break
+      }
+    }
 
     // Different bulbs have different colour temperature ranges
     switch (this.bulbModel) {
@@ -84,16 +100,14 @@ module.exports = class deviceLightCCT {
     })
     this.accessory.configureController(this.accessory.alController)
 
-    // Output the customised options to the log if in debug mode
-    if (platform.config.debug) {
-      const opts = JSON.stringify({
-        adaptiveLightingShift: this.alShift,
-        brightnessStep: this.brightStep,
-        disableDeviceLogging: this.disableDeviceLogging,
-        bulbModel: this.bulbModel
-      })
-      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
-    }
+    // Output the customised options to the log
+    const opts = JSON.stringify({
+      adaptiveLightingShift: this.alShift,
+      brightnessStep: this.brightStep,
+      bulbModel: this.bulbModel,
+      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable'
+    })
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
 
   async internalStateUpdate (value) {
@@ -115,7 +129,7 @@ module.exports = class deviceLightCCT {
         switch: newValue
       })
       this.cacheState = newValue
-      if (!this.disableDeviceLogging) {
+      if (this.enableLogging) {
         this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
       }
     } catch (err) {
@@ -154,7 +168,7 @@ module.exports = class deviceLightCCT {
       }
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.cacheBright = value
-      if (!this.disableDeviceLogging) {
+      if (this.enableLogging) {
         this.log('[%s] %s [%s%].', this.name, this.lang.curBright, this.cacheBright)
       }
     } catch (err) {
@@ -200,7 +214,7 @@ module.exports = class deviceLightCCT {
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.cacheMired = value
       this.cacheCT = scaledCT
-      if (!this.disableDeviceLogging) {
+      if (this.enableLogging) {
         if (this.accessory.alController && this.accessory.alController.isAdaptiveLightingActive()) {
           this.log('[%s] %s [%sK] %s.', this.name, this.lang.curColour, scaledK, this.lang.viaAL)
         } else {
@@ -224,7 +238,7 @@ module.exports = class deviceLightCCT {
       if (params.switch && params.switch !== this.cacheState) {
         this.cacheState = params.switch
         this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
-        if (params.updateSource && !this.disableDeviceLogging) {
+        if (params.updateSource && this.enableLogging) {
           this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
         }
       }
@@ -232,7 +246,7 @@ module.exports = class deviceLightCCT {
         if (this.funcs.hasProperty(params.white, 'br') && this.cacheBright !== params.white.br) {
           this.cacheBright = params.white.br
           this.service.updateCharacteristic(this.hapChar.Brightness, this.cacheBright)
-          if (params.updateSource && !this.disableDeviceLogging) {
+          if (params.updateSource && this.enableLogging) {
             this.log('[%s] %s [%s%].', this.name, this.lang.curBright, this.cacheBright)
           }
         }
@@ -244,13 +258,13 @@ module.exports = class deviceLightCCT {
           this.cacheMired = Math.min(Math.max(Math.round(1000000 / scaledK), 140), 500)
           this.service.updateCharacteristic(this.hapChar.ColorTemperature, this.cacheMired)
           if (params.updateSource) {
-            if (!this.disableDeviceLogging) {
+            if (this.enableLogging) {
               this.log('[%s] %s [%sK].', this.name, this.lang.curColour, scaledK)
             }
             if (this.accessory.alController.isAdaptiveLightingActive() && ctDiff > 20) {
               // Look for a variation greater than twenty
               this.accessory.alController.disableAdaptiveLighting()
-              if (!this.disableDeviceLogging) {
+              if (this.enableLogging) {
                 this.log('[%s] %s.', this.name, this.lang.disabledAL)
               }
             }
diff --git a/lib/device/light-dimmer.js b/lib/device/light-dimmer.js
index ddb52ea2..561ff0a4 100644
--- a/lib/device/light-dimmer.js
+++ b/lib/device/light-dimmer.js
@@ -23,10 +23,26 @@ module.exports = class deviceLightDimmer {
       deviceConf && deviceConf.brightnessStep
         ? Math.min(deviceConf.brightnessStep, 100)
         : platform.consts.defaultValues.brightnessStep
-    this.disableDeviceLogging =
-      deviceConf && deviceConf.overrideDisabledLogging
-        ? false
-        : platform.config.disableDeviceLogging
+
+    // Set the correct logging variables for this accessory
+    this.enableLogging = !platform.config.disableDeviceLogging
+    this.enableDebugLogging = platform.config.debug
+    if (deviceConf && deviceConf.overrideLogging) {
+      switch (deviceConf.overrideLogging) {
+        case 'standard':
+          this.enableLogging = true
+          this.enableDebugLogging = false
+          break
+        case 'debug':
+          this.enableLogging = true
+          this.enableDebugLogging = true
+          break
+        case 'disable':
+          this.enableLogging = false
+          this.enableDebugLogging = false
+          break
+      }
+    }
 
     // Add the lightbulb service if it doesn't already exist
     this.service =
@@ -46,14 +62,12 @@ module.exports = class deviceLightDimmer {
         await this.internalBrightnessUpdate(value)
       })
 
-    // Output the customised options to the log if in debug mode
-    if (platform.config.debug) {
-      const opts = JSON.stringify({
-        brightnessStep: this.brightStep,
-        disableDeviceLogging: this.disableDeviceLogging
-      })
-      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
-    }
+    // Output the customised options to the log
+    const opts = JSON.stringify({
+      brightnessStep: this.brightStep,
+      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable'
+    })
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
 
   async internalStateUpdate (value) {
@@ -75,7 +89,7 @@ module.exports = class deviceLightDimmer {
       }
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.cacheState = newValue
-      if (!this.disableDeviceLogging) {
+      if (this.enableLogging) {
         this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
       }
     } catch (err) {
@@ -118,7 +132,7 @@ module.exports = class deviceLightDimmer {
       }
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.cacheBright = value
-      if (!this.disableDeviceLogging) {
+      if (this.enableLogging) {
         this.log('[%s] %s [%s%].', this.name, this.lang.curBright, this.cacheBright)
       }
     } catch (err) {
@@ -136,7 +150,7 @@ module.exports = class deviceLightDimmer {
         if (params.state && params.state !== this.cacheState) {
           this.service.updateCharacteristic(this.hapChar.On, params.state === 'on')
           this.cacheState = params.state
-          if (params.updateSource && !this.disableDeviceLogging) {
+          if (params.updateSource && this.enableLogging) {
             this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
           }
         }
@@ -144,7 +158,7 @@ module.exports = class deviceLightDimmer {
         if (params.switch && params.switch !== this.cacheState) {
           this.service.updateCharacteristic(this.hapChar.On, params.switch === 'on')
           this.cacheState = params.switch
-          if (params.updateSource && !this.disableDeviceLogging) {
+          if (params.updateSource && this.enableLogging) {
             this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
           }
         }
@@ -158,7 +172,7 @@ module.exports = class deviceLightDimmer {
             if (nb !== this.cacheBright) {
               this.service.updateCharacteristic(this.hapChar.Brightness, nb)
               this.cacheBright = nb
-              if (params.updateSource && !this.disableDeviceLogging) {
+              if (params.updateSource && this.enableLogging) {
                 this.log('[%s] %s [%s%].', this.name, this.lang.curBright, nb)
               }
             }
@@ -171,7 +185,7 @@ module.exports = class deviceLightDimmer {
             if (nb !== this.cacheBright) {
               this.service.updateCharacteristic(this.hapChar.Brightness, nb)
               this.cacheBright = nb
-              if (params.updateSource && !this.disableDeviceLogging) {
+              if (params.updateSource && this.enableLogging) {
                 this.log('[%s] %s [%s%].', this.name, this.lang.curBright, nb)
               }
             }
@@ -184,7 +198,7 @@ module.exports = class deviceLightDimmer {
             if (nb !== this.cacheBright) {
               this.service.updateCharacteristic(this.hapChar.Brightness, nb)
               this.cacheBright = nb
-              if (params.updateSource && !this.disableDeviceLogging) {
+              if (params.updateSource && this.enableLogging) {
                 this.log('[%s] %s [%s%].', this.name, this.lang.curBright, nb)
               }
             }
diff --git a/lib/device/light-rgb-cct.js b/lib/device/light-rgb-cct.js
index 22eb7e82..bee005b7 100644
--- a/lib/device/light-rgb-cct.js
+++ b/lib/device/light-rgb-cct.js
@@ -28,10 +28,26 @@ module.exports = class deviceLightRGBCCT {
       deviceConf && deviceConf.brightnessStep
         ? Math.min(deviceConf.brightnessStep, 100)
         : platform.consts.defaultValues.brightnessStep
-    this.disableDeviceLogging =
-      deviceConf && deviceConf.overrideDisabledLogging
-        ? false
-        : platform.config.disableDeviceLogging
+
+    // Set the correct logging variables for this accessory
+    this.enableLogging = !platform.config.disableDeviceLogging
+    this.enableDebugLogging = platform.config.debug
+    if (deviceConf && deviceConf.overrideLogging) {
+      switch (deviceConf.overrideLogging) {
+        case 'standard':
+          this.enableLogging = true
+          this.enableDebugLogging = false
+          break
+        case 'debug':
+          this.enableLogging = true
+          this.enableDebugLogging = true
+          break
+        case 'disable':
+          this.enableLogging = false
+          this.enableDebugLogging = false
+          break
+      }
+    }
 
     // If the accessory has a outlet service then remove it (remedies bug int in v5)
     if (this.accessory.getService(this.hapServ.Switch)) {
@@ -75,15 +91,13 @@ module.exports = class deviceLightRGBCCT {
     })
     this.accessory.configureController(this.accessory.alController)
 
-    // Output the customised options to the log if in debug mode
-    if (platform.config.debug) {
-      const opts = JSON.stringify({
-        adaptiveLightingShift: this.alShift,
-        brightnessStep: this.brightStep,
-        disableDeviceLogging: this.disableDeviceLogging
-      })
-      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
-    }
+    // Output the customised options to the log
+    const opts = JSON.stringify({
+      adaptiveLightingShift: this.alShift,
+      brightnessStep: this.brightStep,
+      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable'
+    })
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
 
   async internalStateUpdate (value) {
@@ -104,7 +118,7 @@ module.exports = class deviceLightRGBCCT {
       const params = { switch: newValue }
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.cacheState = newValue
-      if (!this.disableDeviceLogging) {
+      if (this.enableLogging) {
         this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
       }
     } catch (err) {
@@ -167,7 +181,7 @@ module.exports = class deviceLightRGBCCT {
       }
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.cacheBright = value
-      if (!this.disableDeviceLogging) {
+      if (this.enableLogging) {
         this.log('[%s] %s [%s%].', this.name, this.lang.curBright, this.cacheBright)
       }
     } catch (err) {
@@ -235,7 +249,7 @@ module.exports = class deviceLightRGBCCT {
       if (this.accessory.context.eweUIID === 104) {
         this.cacheMode = 'color'
       }
-      if (!this.disableDeviceLogging) {
+      if (this.enableLogging) {
         this.log(
           '[%s] %s [rgb %s].',
           this.name,
@@ -321,7 +335,7 @@ module.exports = class deviceLightRGBCCT {
           this.cacheMode = 'white'
           break
       }
-      if (!this.disableDeviceLogging) {
+      if (this.enableLogging) {
         if (this.accessory.alController.isAdaptiveLightingActive()) {
           this.log('[%s] %s [%sK] %s.', this.name, this.lang.curColour, mToK, this.lang.viaAL)
         } else {
@@ -345,7 +359,7 @@ module.exports = class deviceLightRGBCCT {
       if (params.switch && params.switch !== this.cacheState) {
         this.cacheState = params.switch
         this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
-        if (params.updateSource && !this.disableDeviceLogging) {
+        if (params.updateSource && this.enableLogging) {
           this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
         }
       }
@@ -357,7 +371,7 @@ module.exports = class deviceLightRGBCCT {
             if (params.bright !== this.cacheBright) {
               this.cacheBright = params.bright
               this.service.updateCharacteristic(this.hapChar.Brightness, this.cacheBright)
-              if (params.updateSource && !this.disableDeviceLogging) {
+              if (params.updateSource && this.enableLogging) {
                 this.log('[%s] %s [%s%].', this.name, this.lang.curBright, this.cacheBright)
               }
             }
@@ -381,7 +395,7 @@ module.exports = class deviceLightRGBCCT {
               this.service.updateCharacteristic(this.hapChar.Hue, this.cacheHue)
               this.service.updateCharacteristic(this.hapChar.Saturation, hs[1])
               if (params.updateSource) {
-                if (!this.disableDeviceLogging) {
+                if (this.enableLogging) {
                   this.log(
                     '[%s] %s [rgb %s].',
                     this.name,
@@ -391,7 +405,7 @@ module.exports = class deviceLightRGBCCT {
                 }
                 if (this.accessory.alController.isAdaptiveLightingActive() && rgbDiff > 50) {
                   this.accessory.alController.disableAdaptiveLighting()
-                  if (!this.disableDeviceLogging) {
+                  if (this.enableLogging) {
                     this.log('[%s] %s.', this.name, this.lang.disabledAL)
                   }
                 }
@@ -406,7 +420,7 @@ module.exports = class deviceLightRGBCCT {
               if (params.color.br !== this.cacheBright) {
                 this.cacheBright = params.color.br
                 this.service.updateCharacteristic(this.hapChar.Brightness, this.cacheBright)
-                if (params.updateSource && !this.disableDeviceLogging) {
+                if (params.updateSource && this.enableLogging) {
                   this.log('[%s] %s [%s%].', this.name, this.lang.curBright, this.cacheBright)
                 }
               }
@@ -428,7 +442,7 @@ module.exports = class deviceLightRGBCCT {
                 this.service.updateCharacteristic(this.hapChar.ColorTemperature, 140)
                 this.service.updateCharacteristic(this.hapChar.Hue, this.cacheHue)
                 this.service.updateCharacteristic(this.hapChar.Saturation, 100)
-                if (params.updateSource && !this.disableDeviceLogging) {
+                if (params.updateSource && this.enableLogging) {
                   this.log(
                     '[%s] %s [rgb %s].',
                     this.name,
@@ -440,7 +454,7 @@ module.exports = class deviceLightRGBCCT {
             }
             if (params.updateSource && this.accessory.alController.isAdaptiveLightingActive()) {
               this.accessory.alController.disableAdaptiveLighting()
-              if (!this.disableDeviceLogging) {
+              if (this.enableLogging) {
                 this.log('[%s] %s.', this.name, this.lang.disabledAL)
               }
             }
@@ -450,7 +464,7 @@ module.exports = class deviceLightRGBCCT {
               if (params.white.br !== this.cacheBright || this.cacheMode !== 'white') {
                 this.cacheBright = params.white.br
                 this.service.updateCharacteristic(this.hapChar.Brightness, this.cacheBright)
-                if (params.updateSource && !this.disableDeviceLogging) {
+                if (params.updateSource && this.enableLogging) {
                   this.log('[%s] %s [%s%].', this.name, this.lang.curBright, this.cacheBright)
                 }
               }
@@ -467,13 +481,13 @@ module.exports = class deviceLightRGBCCT {
               this.service.updateCharacteristic(this.hapChar.Saturation, hs[1])
               this.service.updateCharacteristic(this.hapChar.ColorTemperature, this.cacheMired)
               if (params.updateSource) {
-                if (!this.disableDeviceLogging) {
+                if (this.enableLogging) {
                   this.log('[%s] %s [%sK].', this.name, this.lang.curColour, ctToK)
                 }
                 if (this.accessory.alController.isAdaptiveLightingActive() && ctDiff > 20) {
                   // Look for a variation greater than twenty
                   this.accessory.alController.disableAdaptiveLighting()
-                  if (!this.disableDeviceLogging) {
+                  if (this.enableLogging) {
                     this.log('[%s] %s.', this.name, this.lang.disabledAL)
                   }
                 }
diff --git a/lib/device/light-rgb.js b/lib/device/light-rgb.js
index cd0d73b0..bb201dfb 100644
--- a/lib/device/light-rgb.js
+++ b/lib/device/light-rgb.js
@@ -28,10 +28,26 @@ module.exports = class deviceLightRGB {
       deviceConf && deviceConf.brightnessStep
         ? Math.min(deviceConf.brightnessStep, 100)
         : platform.consts.defaultValues.brightnessStep
-    this.disableDeviceLogging =
-      deviceConf && deviceConf.overrideDisabledLogging
-        ? false
-        : platform.config.disableDeviceLogging
+
+    // Set the correct logging variables for this accessory
+    this.enableLogging = !platform.config.disableDeviceLogging
+    this.enableDebugLogging = platform.config.debug
+    if (deviceConf && deviceConf.overrideLogging) {
+      switch (deviceConf.overrideLogging) {
+        case 'standard':
+          this.enableLogging = true
+          this.enableDebugLogging = false
+          break
+        case 'debug':
+          this.enableLogging = true
+          this.enableDebugLogging = true
+          break
+        case 'disable':
+          this.enableLogging = false
+          this.enableDebugLogging = false
+          break
+      }
+    }
 
     // Add the lightbulb service if it doesn't already exist
     this.service =
@@ -56,13 +72,11 @@ module.exports = class deviceLightRGB {
       await this.internalColourUpdate(value)
     })
 
-    // Output the customised options to the log if in debug mode
-    if (platform.config.debug) {
-      const opts = JSON.stringify({
-        disableDeviceLogging: this.disableDeviceLogging
-      })
-      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
-    }
+    // Output the customised options to the log
+    const opts = JSON.stringify({
+      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable'
+    })
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
 
   async internalStateUpdate (value) {
@@ -84,7 +98,7 @@ module.exports = class deviceLightRGB {
       }, 5000)
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.cacheState = newValue
-      if (!this.disableDeviceLogging) {
+      if (this.enableLogging) {
         this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
       }
     } catch (err) {
@@ -144,7 +158,7 @@ module.exports = class deviceLightRGB {
       this.cacheR = newRGB[0]
       this.cacheG = newRGB[1]
       this.cacheB = newRGB[2]
-      if (!this.disableDeviceLogging) {
+      if (this.enableLogging) {
         this.log(
           '[%s] %s [rgb %s].',
           this.name,
@@ -173,7 +187,7 @@ module.exports = class deviceLightRGB {
           this.hapChar.Brightness,
           this.cacheState === 'on' ? 100 : 0
         )
-        if (params.updateSource && !this.disableDeviceLogging) {
+        if (params.updateSource && this.enableLogging) {
           this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
         }
       }
@@ -204,7 +218,7 @@ module.exports = class deviceLightRGB {
             this.service.updateCharacteristic(this.hapChar.Hue, this.cacheHue)
             this.service.updateCharacteristic(this.hapChar.Saturation, 100)
             this.service.updateCharacteristic(this.hapChar.Brightness, 100)
-            if (params.updateSource && !this.disableDeviceLogging) {
+            if (params.updateSource && this.enableLogging) {
               this.log(
                 '[%s] %s [rgb %s].',
                 this.name,
diff --git a/lib/device/motor.js b/lib/device/motor.js
index 36940590..03016b90 100644
--- a/lib/device/motor.js
+++ b/lib/device/motor.js
@@ -27,10 +27,26 @@ module.exports = class deviceMotor {
 
     // Set up custom variables for this device type
     const deviceConf = platform.multiDevices[accessory.context.eweDeviceId]
-    this.disableDeviceLogging =
-      deviceConf && deviceConf.overrideDisabledLogging
-        ? false
-        : platform.config.disableDeviceLogging
+
+    // Set the correct logging variables for this accessory
+    this.enableLogging = !platform.config.disableDeviceLogging
+    this.enableDebugLogging = platform.config.debug
+    if (deviceConf && deviceConf.overrideLogging) {
+      switch (deviceConf.overrideLogging) {
+        case 'standard':
+          this.enableLogging = true
+          this.enableDebugLogging = false
+          break
+        case 'debug':
+          this.enableLogging = true
+          this.enableDebugLogging = true
+          break
+        case 'disable':
+          this.enableLogging = false
+          this.enableDebugLogging = false
+          break
+      }
+    }
 
     // Add the window covering service if it doesn't already exist
     this.service =
@@ -42,13 +58,11 @@ module.exports = class deviceMotor {
       await this.internalPositionUpdate(value)
     })
 
-    // Output the customised options to the log if in debug mode
-    if (platform.config.debug) {
-      const opts = JSON.stringify({
-        disableDeviceLogging: this.disableDeviceLogging
-      })
-      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
-    }
+    // Output the customised options to the log
+    const opts = JSON.stringify({
+      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable'
+    })
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
 
   async internalPositionUpdate (value) {
@@ -67,7 +81,7 @@ module.exports = class deviceMotor {
       const params = { location: value }
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.cachePos = value
-      if (!this.disableDeviceLogging) {
+      if (this.enableLogging) {
         this.log('[%s] %s [%s%].', this.name, this.lang.curPos, this.cachePos)
       }
     } catch (err) {
@@ -92,7 +106,7 @@ module.exports = class deviceMotor {
           this.service.updateCharacteristic(this.hapChar.TargetPosition, this.cachePos)
           this.service.updateCharacteristic(this.hapChar.CurrentPosition, this.cachePos)
           this.service.updateCharacteristic(this.hapChar.PositionState, 2)
-          if (!this.disableDeviceLogging) {
+          if (this.enableLogging) {
             this.log('[%s] %s [%s%].', this.name, this.lang.curPos, this.cachePos)
           }
         }
diff --git a/lib/device/outlet-double.js b/lib/device/outlet-double.js
index 4081b0d4..49d54627 100644
--- a/lib/device/outlet-double.js
+++ b/lib/device/outlet-double.js
@@ -27,10 +27,26 @@ module.exports = class deviceOutletDouble {
       deviceConf && deviceConf.inUsePowerThreshold
         ? deviceConf.inUsePowerThreshold
         : platform.consts.defaultValues.inUsePowerThreshold
-    this.disableDeviceLogging =
-      deviceConf && deviceConf.overrideDisabledLogging
-        ? false
-        : platform.config.disableDeviceLogging
+
+    // Set the correct logging variables for this accessory
+    this.enableLogging = !platform.config.disableDeviceLogging
+    this.enableDebugLogging = platform.config.debug
+    if (deviceConf && deviceConf.overrideLogging) {
+      switch (deviceConf.overrideLogging) {
+        case 'standard':
+          this.enableLogging = true
+          this.enableDebugLogging = false
+          break
+        case 'debug':
+          this.enableLogging = true
+          this.enableDebugLogging = true
+          break
+        case 'disable':
+          this.enableLogging = false
+          this.enableDebugLogging = false
+          break
+      }
+    }
 
     // If the accessory has a switch service then remove it
     if (this.accessory.getService(this.hapServ.Switch)) {
@@ -86,12 +102,12 @@ module.exports = class deviceOutletDouble {
       }
     }
 
-    // Output the customised options to the log if in debug mode
-    if (platform.config.debug) {
+    // Output the customised options to the log
+    if (accessory.context.switchNumber === '0') {
       const opts = JSON.stringify({
-        disableDeviceLogging: this.disableDeviceLogging,
         hideChannels: this.hideChannels,
-        inUsePowerThreshold: this.inUsePowerThreshold
+        inUsePowerThreshold: this.inUsePowerThreshold,
+        logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable'
       })
       this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
     }
@@ -133,7 +149,7 @@ module.exports = class deviceOutletDouble {
                   service.updateCharacteristic(this.eveChar.CurrentConsumption, 0)
                   subAccessory.eveService.addEntry({ power: 0 })
                 }
-                if (!this.disableDeviceLogging) {
+                if (this.enableLogging) {
                   this.log(
                     '[%s] %s [%s].',
                     subAccessory.displayName,
@@ -163,7 +179,7 @@ module.exports = class deviceOutletDouble {
                     service.updateCharacteristic(this.eveChar.CurrentConsumption, 0)
                     subAccessory.eveService.addEntry({ power: 0 })
                   }
-                  if (!this.disableDeviceLogging) {
+                  if (this.enableLogging) {
                     this.log(
                       '[%s] %s [%s].',
                       subAccessory.displayName,
@@ -201,7 +217,7 @@ module.exports = class deviceOutletDouble {
   async internalUIUpdate () {
     try {
       const params = { uiActive: 120 }
-      await this.platform.sendDeviceUpdate(this.accessory, params, false)
+      await this.platform.sendDeviceUpdate(this.accessory, params)
     } catch (err) {
       // Suppress errors here
     }
@@ -228,7 +244,7 @@ module.exports = class deviceOutletDouble {
                 service.updateCharacteristic(this.eveChar.CurrentConsumption, 0)
                 subAccessory.eveService.addEntry({ power: 0 })
               }
-              if (params.updateSource && !this.disableDeviceLogging) {
+              if (params.updateSource && this.enableLogging) {
                 this.log(
                   '[%s] %s [%s].',
                   subAccessory.displayName,
@@ -266,7 +282,7 @@ module.exports = class deviceOutletDouble {
             this.service.updateCharacteristic(this.eveChar.ElectricCurrent, current)
             logger = true
           }
-          if (params.updateSource && logger && !this.disableDeviceLogging) {
+          if (params.updateSource && logger && this.enableLogging) {
             this.log(
               '[%s] %s%s%s.',
               this.name,
diff --git a/lib/device/outlet-multi.js b/lib/device/outlet-multi.js
index 6a286bcb..d02fc818 100644
--- a/lib/device/outlet-multi.js
+++ b/lib/device/outlet-multi.js
@@ -22,10 +22,26 @@ module.exports = class deviceOutletMulti {
     // Set up custom variables for this device type
     const deviceConf = platform.multiDevices[accessory.context.eweDeviceId]
     this.hideChannels = deviceConf && deviceConf.hideChannels ? deviceConf.hideChannels : undefined
-    this.disableDeviceLogging =
-      deviceConf && deviceConf.overrideDisabledLogging
-        ? false
-        : platform.config.disableDeviceLogging
+
+    // Set the correct logging variables for this accessory
+    this.enableLogging = !platform.config.disableDeviceLogging
+    this.enableDebugLogging = platform.config.debug
+    if (deviceConf && deviceConf.overrideLogging) {
+      switch (deviceConf.overrideLogging) {
+        case 'standard':
+          this.enableLogging = true
+          this.enableDebugLogging = false
+          break
+        case 'debug':
+          this.enableLogging = true
+          this.enableDebugLogging = true
+          break
+        case 'disable':
+          this.enableLogging = false
+          this.enableDebugLogging = false
+          break
+      }
+    }
 
     // If the accessory has a switch service then remove it
     if (this.accessory.getService(this.hapServ.Switch)) {
@@ -47,11 +63,11 @@ module.exports = class deviceOutletMulti {
       this.service.removeCharacteristic(this.service.getCharacteristic(this.hapChar.OutletInUse))
     }
 
-    // Output the customised options to the log if in debug mode
-    if (platform.config.debug) {
+    // Output the customised options to the log
+    if (accessory.context.switchNumber === '0') {
       const opts = JSON.stringify({
-        disableDeviceLogging: this.disableDeviceLogging,
-        hideChannels: this.hideChannels
+        hideChannels: this.hideChannels,
+        logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable'
       })
       this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
     }
@@ -92,7 +108,7 @@ module.exports = class deviceOutletMulti {
               subAccessory
                 .getService(this.hapServ.Outlet)
                 .updateCharacteristic(this.hapChar.On, value)
-              if (i > 0 && !this.disableDeviceLogging) {
+              if (i > 0 && this.enableLogging) {
                 this.log(
                   '[%s] %s [%s].',
                   subAccessory.displayName,
@@ -116,7 +132,7 @@ module.exports = class deviceOutletMulti {
                 if (value) {
                   primaryState = true
                 }
-                if (i > 0 && !this.disableDeviceLogging) {
+                if (i > 0 && this.enableLogging) {
                   this.log(
                     '[%s] %s [%s].',
                     subAccessory.displayName,
@@ -173,7 +189,7 @@ module.exports = class deviceOutletMulti {
             continue
           }
           service.updateCharacteristic(this.hapChar.On, params.switches[i - 1].switch === 'on')
-          if (params.updateSource && !this.disableDeviceLogging) {
+          if (params.updateSource && this.enableLogging) {
             this.log(
               '[%s] %s [%s].',
               subAccessory.displayName,
diff --git a/lib/device/outlet-power.js b/lib/device/outlet-power.js
index 7c78f67e..19108490 100644
--- a/lib/device/outlet-power.js
+++ b/lib/device/outlet-power.js
@@ -24,10 +24,26 @@ module.exports = class deviceOutletPower {
       deviceConf && deviceConf.inUsePowerThreshold
         ? deviceConf.inUsePowerThreshold
         : platform.consts.defaultValues.inUsePowerThreshold
-    this.disableDeviceLogging =
-      deviceConf && deviceConf.overrideDisabledLogging
-        ? false
-        : platform.config.disableDeviceLogging
+
+    // Set the correct logging variables for this accessory
+    this.enableLogging = !platform.config.disableDeviceLogging
+    this.enableDebugLogging = platform.config.debug
+    if (deviceConf && deviceConf.overrideLogging) {
+      switch (deviceConf.overrideLogging) {
+        case 'standard':
+          this.enableLogging = true
+          this.enableDebugLogging = false
+          break
+        case 'debug':
+          this.enableLogging = true
+          this.enableDebugLogging = true
+          break
+        case 'disable':
+          this.enableLogging = false
+          this.enableDebugLogging = false
+          break
+      }
+    }
 
     // If the accessory has a switch service then remove it
     if (this.accessory.getService(this.hapServ.Switch)) {
@@ -114,14 +130,12 @@ module.exports = class deviceOutletPower {
       clearInterval(this.intervalPower)
     })
 
-    // Output the customised options to the log if in debug mode
-    if (platform.config.debug) {
-      const opts = JSON.stringify({
-        disableDeviceLogging: this.disableDeviceLogging,
-        inUsePowerThreshold: this.inUsePowerThreshold
-      })
-      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
-    }
+    // Output the customised options to the log
+    const opts = JSON.stringify({
+      inUsePowerThreshold: this.inUsePowerThreshold,
+      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable'
+    })
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
 
   async internalStateUpdate (value) {
@@ -140,7 +154,7 @@ module.exports = class deviceOutletPower {
         this.accessory.eveService.addEntry({ power: 0 })
         this.accessory.context.energyReadings.push(0)
       }
-      if (!this.disableDeviceLogging) {
+      if (this.enableLogging) {
         this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
       }
     } catch (err) {
@@ -155,7 +169,7 @@ module.exports = class deviceOutletPower {
   async internalUIUpdate () {
     try {
       const params = { uiActive: 120 }
-      await this.platform.sendDeviceUpdate(this.accessory, params, false)
+      await this.platform.sendDeviceUpdate(this.accessory, params)
     } catch (err) {
       // Suppress errors here
     }
@@ -172,7 +186,7 @@ module.exports = class deviceOutletPower {
           this.accessory.eveService.addEntry({ power: 0 })
           this.accessory.context.energyReadings.push(0)
         }
-        if (params.updateSource && !this.disableDeviceLogging) {
+        if (params.updateSource && this.enableLogging) {
           this.log('[%s] %s [%s].', this.name, this.lang.curState, params.switch)
         }
       }
@@ -198,7 +212,7 @@ module.exports = class deviceOutletPower {
         this.service.updateCharacteristic(this.eveChar.ElectricCurrent, parseFloat(params.current))
         logger = true
       }
-      if (params.updateSource && logger && !this.disableDeviceLogging) {
+      if (params.updateSource && logger && this.enableLogging) {
         this.log(
           '[%s] %s%s%s.',
           this.name,
diff --git a/lib/device/outlet-scm.js b/lib/device/outlet-scm.js
index ffbf605e..1533fe47 100644
--- a/lib/device/outlet-scm.js
+++ b/lib/device/outlet-scm.js
@@ -18,10 +18,26 @@ module.exports = class deviceOutletSCM {
 
     // Set up custom variables for this device type
     const deviceConf = platform.outletDevices[accessory.context.eweDeviceId]
-    this.disableDeviceLogging =
-      deviceConf && deviceConf.overrideDisabledLogging
-        ? false
-        : platform.config.disableDeviceLogging
+
+    // Set the correct logging variables for this accessory
+    this.enableLogging = !platform.config.disableDeviceLogging
+    this.enableDebugLogging = platform.config.debug
+    if (deviceConf && deviceConf.overrideLogging) {
+      switch (deviceConf.overrideLogging) {
+        case 'standard':
+          this.enableLogging = true
+          this.enableDebugLogging = false
+          break
+        case 'debug':
+          this.enableLogging = true
+          this.enableDebugLogging = true
+          break
+        case 'disable':
+          this.enableLogging = false
+          this.enableDebugLogging = false
+          break
+      }
+    }
 
     // The default is an outlet so if the accessory has an switch service then remove it
     if (this.accessory.getService(this.hapServ.Switch)) {
@@ -38,13 +54,11 @@ module.exports = class deviceOutletSCM {
       await this.internalStateUpdate(value)
     })
 
-    // Output the customised options to the log if in debug mode
-    if (platform.config.debug) {
-      const opts = JSON.stringify({
-        disableDeviceLogging: this.disableDeviceLogging
-      })
-      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
-    }
+    // Output the customised options to the log
+    const opts = JSON.stringify({
+      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable'
+    })
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
 
   async internalStateUpdate (value) {
@@ -58,7 +72,7 @@ module.exports = class deviceOutletSCM {
       }
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.cacheState = newValue
-      if (!this.disableDeviceLogging) {
+      if (this.enableLogging) {
         this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
       }
     } catch (err) {
@@ -78,7 +92,7 @@ module.exports = class deviceOutletSCM {
       const newStatus = params.switches[0].switch === 'on'
       this.service.updateCharacteristic(this.hapChar.On, newStatus)
       this.cacheState = params.switches[0].switch
-      if (params.updateSource && !this.disableDeviceLogging) {
+      if (params.updateSource && this.enableLogging) {
         this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
       }
     } catch (err) {
diff --git a/lib/device/outlet-single.js b/lib/device/outlet-single.js
index 40955a43..a75743c1 100644
--- a/lib/device/outlet-single.js
+++ b/lib/device/outlet-single.js
@@ -20,10 +20,26 @@ module.exports = class deviceOutletSingle {
 
     // Set up custom variables for this device type
     const deviceConf = platform.outletDevices[accessory.context.eweDeviceId]
-    this.disableDeviceLogging =
-      deviceConf && deviceConf.overrideDisabledLogging
-        ? false
-        : platform.config.disableDeviceLogging
+
+    // Set the correct logging variables for this accessory
+    this.enableLogging = !platform.config.disableDeviceLogging
+    this.enableDebugLogging = platform.config.debug
+    if (deviceConf && deviceConf.overrideLogging) {
+      switch (deviceConf.overrideLogging) {
+        case 'standard':
+          this.enableLogging = true
+          this.enableDebugLogging = false
+          break
+        case 'debug':
+          this.enableLogging = true
+          this.enableDebugLogging = true
+          break
+        case 'disable':
+          this.enableLogging = false
+          this.enableDebugLogging = false
+          break
+      }
+    }
 
     // If the accessory has a switch service then remove it
     if (this.accessory.getService(this.hapServ.Switch)) {
@@ -61,13 +77,11 @@ module.exports = class deviceOutletSingle {
       this.service.removeCharacteristic(this.service.getCharacteristic(this.hapChar.OutletInUse))
     }
 
-    // Output the customised options to the log if in debug mode
-    if (platform.config.debug) {
-      const opts = JSON.stringify({
-        disableDeviceLogging: this.disableDeviceLogging
-      })
-      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
-    }
+    // Output the customised options to the log
+    const opts = JSON.stringify({
+      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable'
+    })
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
 
   async internalStateUpdate (value) {
@@ -80,7 +94,7 @@ module.exports = class deviceOutletSingle {
         switch: newValue
       })
       this.cacheState = newValue
-      if (!this.disableDeviceLogging) {
+      if (this.enableLogging) {
         this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
       }
     } catch (err) {
@@ -97,7 +111,7 @@ module.exports = class deviceOutletSingle {
       if (params.switch && params.switch !== this.cacheState) {
         this.service.updateCharacteristic(this.hapChar.On, params.switch === 'on')
         this.cacheState = params.switch
-        if (params.updateSource && !this.disableDeviceLogging) {
+        if (params.updateSource && this.enableLogging) {
           this.log('[%s] %s [%s].', this.name, this.lang.curState, params.switch)
         }
       }
diff --git a/lib/device/rf-bridge.js b/lib/device/rf-bridge.js
index f4e1d95e..a1968b6f 100644
--- a/lib/device/rf-bridge.js
+++ b/lib/device/rf-bridge.js
@@ -5,7 +5,9 @@
 module.exports = class deviceRFBridge {
   constructor (platform, accessory, devicesInHB) {
     // Set up variables from the platform
+    this.consts = platform.consts
     this.devicesInHB = devicesInHB
+    this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.eveChar = platform.eveChar
     this.funcs = platform.funcs
     this.hapChar = platform.api.hap.Characteristic
@@ -19,117 +21,9 @@ module.exports = class deviceRFBridge {
     this.name = accessory.displayName
     this.accessory = accessory
 
-    // There are two types of RF sub types [curtains, buttons] and [sensors]
-    if (['curtain', 'button'].includes(this.accessory.context.subType)) {
-      // This instance is a remote control with buttons or curtain control
-      Object.entries(this.accessory.context.buttons).forEach(([chan, name]) => {
-        // For each curtain/button we create a separate switch service
-
-        // Add the switch service if it doesn't already exist
-        if (!this.accessory.getService(name)) {
-          this.accessory.addService(this.hapServ.Switch, name, 'switch' + chan)
-        }
-
-        // Always start with the buttons off (useful when restarting Homebridge)
-        this.accessory.getService(name).updateCharacteristic(this.hapChar.On, false)
-
-        // Add the set handler to the switch on/off characteristic
-        this.accessory
-          .getService(name)
-          .getCharacteristic(this.hapChar.On)
-          .onSet(async value => {
-            await this.internalPressUpdate(chan, name, value)
-          })
-      })
-    } else {
-      // This instance is a sensor which the user can define as different types
-      let serv
-      let char
-      let eveType
-      let addLACharacteristic = false
-
-      // Check which type this sensor is and get the correct service/characteristic
-      switch (this.accessory.context.subType) {
-        case 'water':
-          serv = this.hapServ.LeakSensor
-          char = this.hapChar.LeakDetected
-          eveType = 'motion'
-          break
-        case 'fire':
-        case 'smoke':
-          serv = this.hapServ.SmokeSensor
-          char = this.hapChar.SmokeDetected
-          eveType = 'motion'
-          break
-        case 'co':
-          serv = this.hapServ.CarbonMonoxideSensor
-          char = this.hapChar.CarbonMonoxideDetected
-          eveType = 'motion'
-          break
-        case 'co2':
-          serv = this.hapServ.CarbonDioxideSensor
-          char = this.hapChar.CarbonDioxideDetected
-          eveType = 'motion'
-          break
-        case 'contact':
-          serv = this.hapServ.ContactSensor
-          char = this.hapChar.ContactSensorState
-          eveType = 'door'
-          addLACharacteristic = true
-          break
-        case 'occupancy':
-          serv = this.hapServ.OccupancySensor
-          char = this.hapChar.OccupancyDetected
-          eveType = 'motion'
-          break
-        default:
-          serv = this.hapServ.MotionSensor
-          char = this.hapChar.MotionDetected
-          eveType = 'motion'
-          addLACharacteristic = true
-          break
-      }
-
-      // Add the sensor if it doesn't already exist
-      let service
-      if (!(service = this.accessory.getService(serv))) {
-        service = this.accessory.addService(serv)
-        if (addLACharacteristic) {
-          service.addCharacteristic(this.eveChar.LastActivation)
-        }
-      }
-
-      // Always start with the sensor off (useful when restarting Homebridge)
-      service.updateCharacteristic(char, 0)
-
-      // Pass the accessory to Fakegato to set up with Eve
-      this.accessory.eveService = new platform.eveService(eveType, this.accessory, {
-        log: platform.config.debugFakegato ? this.log : () => {}
-      })
-    }
-  }
-
-  async internalPressUpdate (rfChl, service, value) {
-    try {
-      if (!value) {
-        return
-      }
-      const params = {
-        cmd: 'transmit',
-        rfChl: parseInt(rfChl)
-      }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.log('[%s] %s [%s].', this.name, this.lang.curState, this.lang.buttonTrig)
-      setTimeout(() => {
-        this.accessory.getService(service).updateCharacteristic(this.hapChar.On, false)
-      }, 1000)
-    } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
-      setTimeout(() => {
-        this.accessory.getService(service).updateCharacteristic(this.hapChar.On, false)
-      }, 2000)
-      throw new this.hapErr(-70402)
-    }
+    // Set the correct logging variables for this accessory
+    this.enableLogging = !platform.config.disableDeviceLogging
+    this.enableDebugLogging = platform.config.debug
   }
 
   async externalUpdate (params) {
@@ -145,6 +39,7 @@ module.exports = class deviceRFBridge {
         params.cmd === 'transmit' &&
         this.funcs.hasProperty(params, 'rfChl')
       ) {
+        // RF Button
         this.devicesInHB.forEach(acc => {
           if (
             acc.context.eweDeviceId === this.accessory.context.eweDeviceId &&
@@ -155,9 +50,22 @@ module.exports = class deviceRFBridge {
           }
         })
         if (subAccessory) {
+          const deviceConf = this.platform.rfDevices[subAccessory.context.hbDeviceId]
+          let enableLogging = !this.disableDeviceLogging
+          if (deviceConf && deviceConf.overrideLogging) {
+            switch (deviceConf.overrideLogging) {
+              case 'standard':
+              case 'debug':
+                enableLogging = true
+                break
+              case 'disable':
+                enableLogging = false
+                break
+            }
+          }
           const service = subAccessory.context.buttons[params.rfChl]
           subAccessory.getService(service).updateCharacteristic(this.hapChar.On, true)
-          if (params.updateSource && !subAccessory.context.disableDeviceLogging) {
+          if (params.updateSource && enableLogging) {
             this.log(
               '[%s] %s [%s].',
               subAccessory.displayName,
@@ -174,7 +82,7 @@ module.exports = class deviceRFBridge {
         (this.funcs.hasProperty(params, 'cmd') && params.cmd === 'trigger') ||
         params.updateSource === 'LAN'
       ) {
-        //* ** RF Sensor ***\\
+        // RF Sensor
         Object.keys(params)
           .filter(name => /rfTrig/.test(name))
           .forEach(async chan => {
@@ -193,17 +101,41 @@ module.exports = class deviceRFBridge {
               if (params[chan] === subAccessory.context.cacheLastAct) {
                 return
               }
+              const deviceConf = this.platform.rfDevices[subAccessory.context.hbDeviceId]
+              let enableLogging = !this.disableDeviceLogging
+              if (deviceConf && deviceConf.overrideLogging) {
+                switch (deviceConf.overrideLogging) {
+                  case 'standard':
+                  case 'debug':
+                    enableLogging = true
+                    break
+                  case 'disable':
+                    enableLogging = false
+                    break
+                }
+              }
+              const sensorTimeLength =
+                deviceConf && deviceConf.sensorTimeLength
+                  ? deviceConf.sensorTimeLength
+                  : this.consts.defaultValues.sensorTimeLength
+              const sensorTimeDifference =
+                deviceConf && deviceConf.sensorTimeDifference
+                  ? deviceConf.sensorTimeDifference
+                  : this.consts.defaultValues.sensorTimeDifference
+              let sensorType
+              if (['button', 'curtain'].includes(subAccessory.context.subType)) {
+                sensorType = subAccessory.context.subType
+              } else {
+                sensorType = deviceConf && deviceConf.type ? deviceConf.type : 'motion'
+              }
 
               subAccessory.context.cacheLastAct = params[chan]
               const timeOfMotion = new Date(params[chan])
               const diff = (timeNow.getTime() - timeOfMotion.getTime()) / 1000
               let serv
               let char
-              if (
-                diff < subAccessory.context.sensorTimeDiff ||
-                ['button', 'curtain'].includes(subAccessory.context.subType)
-              ) {
-                switch (subAccessory.context.subType) {
+              if (diff < sensorTimeDifference || ['button', 'curtain'].sensorType) {
+                switch (sensorType) {
                   case 'button':
                   case 'curtain': {
                     const service = subAccessory.context.buttons[channel]
@@ -266,7 +198,7 @@ module.exports = class deviceRFBridge {
                 }
                 subAccessory.getService(serv).updateCharacteristic(char, 1)
                 subAccessory.eveService.addEntry({ status: 1 })
-                if (params.updateSource && !subAccessory.context.disableDeviceLogging) {
+                if (params.updateSource && enableLogging) {
                   this.log(
                     '[%s] %s [%s].',
                     subAccessory.displayName,
@@ -278,13 +210,13 @@ module.exports = class deviceRFBridge {
                   .toString(36)
                   .substr(2, 8)
                 subAccessory.context.updateKey = updateKey
-                await this.funcs.sleep(subAccessory.context.sensorTimeLength * 1000)
+                await this.funcs.sleep(sensorTimeLength * 1000)
                 if (updateKey !== subAccessory.context.updateKey) {
                   return
                 }
                 subAccessory.getService(serv).updateCharacteristic(char, 0)
                 subAccessory.eveService.addEntry({ status: 0 })
-                if (params.updateSource && !subAccessory.context.disableDeviceLogging) {
+                if (params.updateSource && enableLogging) {
                   this.log(
                     '[%s] %s [%s].',
                     subAccessory.displayName,
diff --git a/lib/device/rf-button.js b/lib/device/rf-button.js
new file mode 100644
index 00000000..fe001d9d
--- /dev/null
+++ b/lib/device/rf-button.js
@@ -0,0 +1,96 @@
+/* jshint -W014, -W033, esversion: 9 */
+/* eslint-disable new-cap */
+'use strict'
+
+module.exports = class deviceRFButton {
+  constructor (platform, accessory) {
+    // Set up variables from the platform
+    this.eveChar = platform.eveChar
+    this.funcs = platform.funcs
+    this.hapChar = platform.api.hap.Characteristic
+    this.hapErr = platform.api.hap.HapStatusError
+    this.hapServ = platform.api.hap.Service
+    this.lang = platform.lang
+    this.log = platform.log
+    this.platform = platform
+
+    // Set up variables from the accessory
+    this.name = accessory.displayName
+    this.accessory = accessory
+
+    // Set up custom variables for this device type
+    const deviceConf = platform.rfDevices[accessory.context.hbDeviceId]
+
+    // Set the correct logging variables for this accessory
+    this.enableLogging = !platform.config.disableDeviceLogging
+    this.enableDebugLogging = platform.config.debug
+    if (deviceConf && deviceConf.overrideLogging) {
+      switch (deviceConf.overrideLogging) {
+        case 'standard':
+          this.enableLogging = true
+          this.enableDebugLogging = false
+          break
+        case 'debug':
+          this.enableLogging = true
+          this.enableDebugLogging = true
+          break
+        case 'disable':
+          this.enableLogging = false
+          this.enableDebugLogging = false
+          break
+      }
+    }
+
+    // This instance is a remote control with buttons or curtain control
+    Object.entries(this.accessory.context.buttons).forEach(([chan, name]) => {
+      // For each curtain/button we create a separate switch service
+
+      // Add the switch service if it doesn't already exist
+      if (!this.accessory.getService(name)) {
+        this.accessory.addService(this.hapServ.Switch, name, 'switch' + chan)
+      }
+
+      // Always start with the buttons off (useful when restarting Homebridge)
+      this.accessory.getService(name).updateCharacteristic(this.hapChar.On, false)
+
+      // Add the set handler to the switch on/off characteristic
+      this.accessory
+        .getService(name)
+        .getCharacteristic(this.hapChar.On)
+        .onSet(async value => {
+          await this.internalPressUpdate(chan, name, value)
+        })
+    })
+
+    // Output the customised options to the log
+    const opts = JSON.stringify({
+      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable'
+    })
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
+  }
+
+  async internalPressUpdate (rfChl, service, value) {
+    try {
+      if (!value) {
+        return
+      }
+      const params = {
+        cmd: 'transmit',
+        rfChl: parseInt(rfChl)
+      }
+      await this.platform.sendDeviceUpdate(this.accessory, params)
+      if (this.enableLogging) {
+        this.log('[%s] %s [%s].', this.name, this.lang.curState, this.lang.buttonTrig)
+      }
+      setTimeout(() => {
+        this.accessory.getService(service).updateCharacteristic(this.hapChar.On, false)
+      }, 1000)
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, true)
+      setTimeout(() => {
+        this.accessory.getService(service).updateCharacteristic(this.hapChar.On, false)
+      }, 2000)
+      throw new this.hapErr(-70402)
+    }
+  }
+}
diff --git a/lib/device/rf-sensor.js b/lib/device/rf-sensor.js
new file mode 100644
index 00000000..ca106b4f
--- /dev/null
+++ b/lib/device/rf-sensor.js
@@ -0,0 +1,152 @@
+/* jshint -W014, -W033, esversion: 9 */
+/* eslint-disable new-cap */
+'use strict'
+
+module.exports = class deviceRFSensor {
+  constructor (platform, accessory) {
+    // Set up variables from the platform
+    this.eveChar = platform.eveChar
+    this.funcs = platform.funcs
+    this.hapChar = platform.api.hap.Characteristic
+    this.hapErr = platform.api.hap.HapStatusError
+    this.hapServ = platform.api.hap.Service
+    this.lang = platform.lang
+    this.log = platform.log
+    this.platform = platform
+
+    // Set up custom variables for this device type
+    const deviceConf = platform.rfDevices[accessory.context.hbDeviceId]
+    this.sensorTimeLength =
+      deviceConf && deviceConf.sensorTimeLength
+        ? deviceConf.sensorTimeLength
+        : platform.consts.defaultValues.sensorTimeLength
+    this.sensorTimeDifference =
+      deviceConf && deviceConf.sensorTimeDifference
+        ? deviceConf.sensorTimeDifference
+        : platform.consts.defaultValues.sensorTimeDifference
+    this.sensorType = deviceConf && deviceConf.type ? deviceConf.type : 'motion'
+
+    // Set the correct logging variables for this accessory
+    this.enableLogging = !platform.config.disableDeviceLogging
+    this.enableDebugLogging = platform.config.debug
+    if (deviceConf && deviceConf.overrideLogging) {
+      switch (deviceConf.overrideLogging) {
+        case 'standard':
+          this.enableLogging = true
+          this.enableDebugLogging = false
+          break
+        case 'debug':
+          this.enableLogging = true
+          this.enableDebugLogging = true
+          break
+        case 'disable':
+          this.enableLogging = false
+          this.enableDebugLogging = false
+          break
+      }
+    }
+
+    // This instance is a sensor which the user can define as different types
+    let serv
+    let char
+    let eveType
+    let addLACharacteristic = false
+
+    // Create an array of hap sensor services to for later to check sensor type hasn't changed
+    let hapServList = [
+      this.hapServ.LeakSensor,
+      this.hapServ.SmokeSensor,
+      this.hapServ.CarbonMonoxideSensor,
+      this.hapServ.CarbonDioxideSensor,
+      this.hapServ.ContactSensor,
+      this.hapServ.OccupancySensor,
+      this.hapServ.MotionSensor
+    ]
+
+    // Check which type this sensor is and get the correct service/characteristic
+    switch (this.sensorType) {
+      case 'water':
+        serv = this.hapServ.LeakSensor
+        char = this.hapChar.LeakDetected
+        eveType = 'motion'
+        break
+      case 'fire':
+      case 'smoke':
+        serv = this.hapServ.SmokeSensor
+        char = this.hapChar.SmokeDetected
+        eveType = 'motion'
+        break
+      case 'co':
+        serv = this.hapServ.CarbonMonoxideSensor
+        char = this.hapChar.CarbonMonoxideDetected
+        eveType = 'motion'
+        break
+      case 'co2':
+        serv = this.hapServ.CarbonDioxideSensor
+        char = this.hapChar.CarbonDioxideDetected
+        eveType = 'motion'
+        break
+      case 'contact':
+        serv = this.hapServ.ContactSensor
+        char = this.hapChar.ContactSensorState
+        eveType = 'door'
+        addLACharacteristic = true
+        break
+      case 'occupancy':
+        serv = this.hapServ.OccupancySensor
+        char = this.hapChar.OccupancyDetected
+        eveType = 'motion'
+        break
+      default:
+        serv = this.hapServ.MotionSensor
+        char = this.hapChar.MotionDetected
+        eveType = 'motion'
+        addLACharacteristic = true
+        break
+    }
+
+    // Remove wanted sensor from hap sensor type list
+    hapServList = hapServList.filter(el => el !== serv)
+
+    // Check and remove and redundant hap sensor types
+    hapServList.forEach(hapSensor => {
+      if (accessory.getService(hapSensor)) {
+        accessory.removeService(accessory.getService(hapSensor))
+      }
+    })
+
+    // Add the sensor if it doesn't already exist
+    let service
+    if (!(service = accessory.getService(serv))) {
+      service = accessory.addService(serv)
+    }
+
+    // See if we need to add or remove the Last Activation characteristic
+    if (addLACharacteristic) {
+      if (!service.testCharacteristic(this.eveChar.LastActivation)) {
+        service.addCharacteristic(this.eveChar.LastActivation)
+      }
+    } else {
+      if (service.testCharacteristic(this.eveChar.LastActivation)) {
+        service.removeCharacteristic(this.eveChar.LastActivation)
+      }
+    }
+
+    // Always start with the sensor off (useful when restarting Homebridge)
+    service.updateCharacteristic(char, 0)
+
+    // Pass the accessory to Fakegato to set up with Eve
+    accessory.eveService = new platform.eveService(eveType, accessory, {
+      log: platform.config.debugFakegato ? this.log : () => {}
+    })
+
+    // Output the customised options to the log
+    const opts = JSON.stringify({
+      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
+      sensorTimeDifference: this.sensorTimeDifference,
+      sensorTimeLength: this.sensorTimeLength,
+      type: this.sensorType
+    })
+    this.log('[%s] %s %s.', accessory.displayName, this.lang.devInitOpts, opts)
+  }
+}
diff --git a/lib/device/sensor-ambient.js b/lib/device/sensor-ambient.js
index d958bcca..1c6de3a6 100644
--- a/lib/device/sensor-ambient.js
+++ b/lib/device/sensor-ambient.js
@@ -26,10 +26,26 @@ module.exports = class deviceSensorAmbient {
       deviceConf && deviceConf.humidityOffset
         ? deviceConf.humidityOffset
         : platform.consts.defaultValues.humidityOffset
-    this.disableDeviceLogging =
-      deviceConf && deviceConf.overrideDisabledLogging
-        ? false
-        : platform.config.disableDeviceLogging
+
+    // Set the correct logging variables for this accessory
+    this.enableLogging = !platform.config.disableDeviceLogging
+    this.enableDebugLogging = platform.config.debug
+    if (deviceConf && deviceConf.overrideLogging) {
+      switch (deviceConf.overrideLogging) {
+        case 'standard':
+          this.enableLogging = true
+          this.enableDebugLogging = false
+          break
+        case 'debug':
+          this.enableLogging = true
+          this.enableDebugLogging = true
+          break
+        case 'disable':
+          this.enableLogging = false
+          this.enableDebugLogging = false
+          break
+      }
+    }
 
     // If the accessory has a thermostat service then remove it
     if (this.accessory.getService(this.hapServ.Thermostat)) {
@@ -109,16 +125,14 @@ module.exports = class deviceSensorAmbient {
       })
     }
 
-    // Output the customised options to the log if in debug mode
-    if (platform.config.debug) {
-      const opts = JSON.stringify({
-        disableDeviceLogging: this.disableDeviceLogging,
-        hideSwitch: this.hideSwitch,
-        humidityOffset: this.humiOffset,
-        offset: this.tempOffset
-      })
-      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
-    }
+    // Output the customised options to the log
+    const opts = JSON.stringify({
+      hideSwitch: this.hideSwitch,
+      humidityOffset: this.humiOffset,
+      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
+      offset: this.tempOffset
+    })
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
 
   async internalStateUpdate (value) {
@@ -134,7 +148,7 @@ module.exports = class deviceSensorAmbient {
       }
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.cacheState = newValue
-      if (!this.disableDeviceLogging) {
+      if (this.enableLogging) {
         this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
       }
     } catch (err) {
@@ -149,7 +163,7 @@ module.exports = class deviceSensorAmbient {
   async internalUIUpdate () {
     try {
       const params = { uiActive: 120 }
-      await this.platform.sendDeviceUpdate(this.accessory, params, false)
+      await this.platform.sendDeviceUpdate(this.accessory, params)
     } catch (err) {
       // Suppress errors here
     }
@@ -165,7 +179,7 @@ module.exports = class deviceSensorAmbient {
           this.accessory.eveService.addEntry({
             status: this.cacheState === 'on' ? 1 : 0
           })
-          if (params.updateSource && !this.disableDeviceLogging) {
+          if (params.updateSource && this.enableLogging) {
             this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
           }
         }
@@ -180,7 +194,7 @@ module.exports = class deviceSensorAmbient {
         this.cacheTemp = Number(this.cacheTempRaw) + this.tempOffset
         eveLog.temp = this.cacheTemp
         this.tempService.updateCharacteristic(this.hapChar.CurrentTemperature, this.cacheTemp)
-        if (params.updateSource && !this.disableDeviceLogging) {
+        if (params.updateSource && this.enableLogging) {
           this.log('[%s] %s [%s°C].', this.name, this.lang.curTemp, this.cacheTemp)
         }
       }
@@ -194,7 +208,7 @@ module.exports = class deviceSensorAmbient {
         this.cacheHumi = Math.max(Math.min(parseInt(this.cacheHumiRaw) + this.humiOffset, 100), 0)
         eveLog.humidity = this.cacheHumi
         this.humiService.updateCharacteristic(this.hapChar.CurrentRelativeHumidity, this.cacheHumi)
-        if (params.updateSource && !this.disableDeviceLogging) {
+        if (params.updateSource && this.enableLogging) {
           this.log('[%s] %s [%s%].', this.name, this.lang.curHumi, this.cacheHumi)
         }
       }
diff --git a/lib/device/sensor-contact.js b/lib/device/sensor-contact.js
index 5af5e86d..ecf51694 100644
--- a/lib/device/sensor-contact.js
+++ b/lib/device/sensor-contact.js
@@ -24,10 +24,26 @@ module.exports = class deviceSensorContact {
       deviceConf && deviceConf.lowBattThreshold
         ? Math.min(deviceConf.lowBattThreshold, 100)
         : platform.consts.defaultValues.lowBattThreshold
-    this.disableDeviceLogging =
-      deviceConf && deviceConf.overrideDisabledLogging
-        ? false
-        : platform.config.disableDeviceLogging
+
+    // Set the correct logging variables for this accessory
+    this.enableLogging = !platform.config.disableDeviceLogging
+    this.enableDebugLogging = platform.config.debug
+    if (deviceConf && deviceConf.overrideLogging) {
+      switch (deviceConf.overrideLogging) {
+        case 'standard':
+          this.enableLogging = true
+          this.enableDebugLogging = false
+          break
+        case 'debug':
+          this.enableLogging = true
+          this.enableDebugLogging = true
+          break
+        case 'disable':
+          this.enableLogging = false
+          this.enableDebugLogging = false
+          break
+      }
+    }
 
     // If the accessory has a leak sensor service then remove it
     if (this.accessory.getService(this.hapServ.LeakSensor)) {
@@ -63,14 +79,12 @@ module.exports = class deviceSensorContact {
       log: platform.config.debugFakegato ? this.log : () => {}
     })
 
-    // Output the customised options to the log if in debug mode
-    if (platform.config.debug) {
-      const opts = JSON.stringify({
-        disableDeviceLogging: this.disableDeviceLogging,
-        lowBattThreshold: this.lowBattThreshold
-      })
-      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
-    }
+    // Output the customised options to the log
+    const opts = JSON.stringify({
+      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
+      lowBattThreshold: this.lowBattThreshold
+    })
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
 
   async externalUpdate (params) {
@@ -84,7 +98,7 @@ module.exports = class deviceSensorContact {
           this.hapChar.StatusLowBattery,
           this.cacheBattScaled < this.lowBattThreshold
         )
-        if (params.updateSource && !this.disableDeviceLogging) {
+        if (params.updateSource && this.enableLogging) {
           this.log('[%s] %s [%s%].', this.name, this.lang.curBatt, this.cacheBattScaled)
         }
       }
@@ -107,7 +121,7 @@ module.exports = class deviceSensorContact {
         this.service.updateCharacteristic(this.hapChar.ContactSensorState, 0)
         this.accessory.eveService.addEntry({ status: 0 })
       }
-      if (params.updateSource && !this.disableDeviceLogging) {
+      if (params.updateSource && this.enableLogging) {
         this.log(
           '[%s] %s [%s].',
           this.name,
diff --git a/lib/device/sensor-temp-humi.js b/lib/device/sensor-temp-humi.js
index ecb9344d..1e6f527b 100644
--- a/lib/device/sensor-temp-humi.js
+++ b/lib/device/sensor-temp-humi.js
@@ -24,10 +24,26 @@ module.exports = class deviceSensorTempHumi {
       deviceConf && deviceConf.humidityOffset
         ? deviceConf.humidityOffset
         : platform.consts.defaultValues.humidityOffset
-    this.disableDeviceLogging =
-      deviceConf && deviceConf.overrideDisabledLogging
-        ? false
-        : platform.config.disableDeviceLogging
+
+    // Set the correct logging variables for this accessory
+    this.enableLogging = !platform.config.disableDeviceLogging
+    this.enableDebugLogging = platform.config.debug
+    if (deviceConf && deviceConf.overrideLogging) {
+      switch (deviceConf.overrideLogging) {
+        case 'standard':
+          this.enableLogging = true
+          this.enableDebugLogging = false
+          break
+        case 'debug':
+          this.enableLogging = true
+          this.enableDebugLogging = true
+          break
+        case 'disable':
+          this.enableLogging = false
+          this.enableDebugLogging = false
+          break
+      }
+    }
 
     // Add the temperature sensor service if it doesn't already exist
     this.tempService =
@@ -49,15 +65,13 @@ module.exports = class deviceSensorTempHumi {
       log: platform.config.debugFakegato ? this.log : () => {}
     })
 
-    // Output the customised options to the log if in debug mode
-    if (platform.config.debug) {
-      const opts = JSON.stringify({
-        disableDeviceLogging: this.disableDeviceLogging,
-        humidityOffset: this.humiOffset,
-        offset: this.tempOffset
-      })
-      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
-    }
+    // Output the customised options to the log
+    const opts = JSON.stringify({
+      humidityOffset: this.humiOffset,
+      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
+      offset: this.tempOffset
+    })
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
 
   async externalUpdate (params) {
@@ -71,7 +85,7 @@ module.exports = class deviceSensorTempHumi {
         this.cacheTemp = Number(this.cacheTempRaw) + this.tempOffset
         eveLog.temp = this.cacheTemp
         this.tempService.updateCharacteristic(this.hapChar.CurrentTemperature, this.cacheTemp)
-        if (params.updateSource && !this.disableDeviceLogging) {
+        if (params.updateSource && this.enableLogging) {
           this.log('[%s] %s [%s°C].', this.name, this.lang.curTemp, this.cacheTemp)
         }
       }
@@ -80,7 +94,7 @@ module.exports = class deviceSensorTempHumi {
         this.cacheHumi = Math.max(Math.min(parseInt(this.cacheHumiRaw) + this.humiOffset, 100), 0)
         eveLog.humidity = this.cacheHumi
         this.humiService.updateCharacteristic(this.hapChar.CurrentRelativeHumidity, this.cacheHumi)
-        if (params.updateSource && !this.disableDeviceLogging) {
+        if (params.updateSource && this.enableLogging) {
           this.log('[%s] %s [%s%].', this.name, this.lang.curHumi, this.cacheHumi)
         }
       }
diff --git a/lib/device/simulation/blind.js b/lib/device/simulation/blind.js
index 5101b2ba..6aebf234 100644
--- a/lib/device/simulation/blind.js
+++ b/lib/device/simulation/blind.js
@@ -21,10 +21,26 @@ module.exports = class deviceBlind {
     const deviceConf = platform.simulations[accessory.context.eweDeviceId]
     this.operationTimeUp = deviceConf.operationTime || platform.consts.defaultValues.operationTime
     this.operationTimeDown = deviceConf.operationTimeDown || this.operationTimeUp
-    this.disableDeviceLogging =
-      deviceConf && deviceConf.overrideDisabledLogging
-        ? false
-        : platform.config.disableDeviceLogging
+
+    // Set the correct logging variables for this accessory
+    this.enableLogging = !platform.config.disableDeviceLogging
+    this.enableDebugLogging = platform.config.debug
+    if (deviceConf && deviceConf.overrideLogging) {
+      switch (deviceConf.overrideLogging) {
+        case 'standard':
+          this.enableLogging = true
+          this.enableDebugLogging = false
+          break
+        case 'debug':
+          this.enableLogging = true
+          this.enableDebugLogging = true
+          break
+        case 'disable':
+          this.enableLogging = false
+          this.enableDebugLogging = false
+          break
+      }
+    }
 
     // Set up the accessory with default positions when added the first time
     if (!this.funcs.hasProperty(this.accessory.context, 'cacheCurrentPosition')) {
@@ -47,16 +63,14 @@ module.exports = class deviceBlind {
       this.internalPositionUpdate(value)
     })
 
-    // Output the customised options to the log if in debug mode
-    if (platform.config.debug) {
-      const opts = JSON.stringify({
-        disableDeviceLogging: this.disableDeviceLogging,
-        operationTimeDown: this.operationTimeDown,
-        operationTimeUp: this.operationTimeUp,
-        type: deviceConf.type
-      })
-      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
-    }
+    // Output the customised options to the log
+    const opts = JSON.stringify({
+      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
+      operationTimeDown: this.operationTimeDown,
+      operationTimeUp: this.operationTimeUp,
+      type: deviceConf.type
+    })
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
 
   async internalPositionUpdate (value) {
@@ -123,7 +137,7 @@ module.exports = class deviceBlind {
       this.service.updateCharacteristic(this.hapChar.CurrentPosition, value)
       this.accessory.context.cachePositionState = 2
       this.accessory.context.cacheCurrentPosition = value
-      if (!this.disableDeviceLogging) {
+      if (this.enableLogging) {
         this.log('[%s] %s [%s%]', this.name, this.lang.curPos, value)
       }
     } catch (err) {
diff --git a/lib/device/simulation/cooler.js b/lib/device/simulation/cooler.js
index 905f0360..22d5b86d 100644
--- a/lib/device/simulation/cooler.js
+++ b/lib/device/simulation/cooler.js
@@ -34,10 +34,26 @@ module.exports = class deviceHeater {
       deviceConf && deviceConf.maxTarget
         ? Math.max(deviceConf.maxTarget, this.minTarget + 1)
         : platform.consts.defaultValues.maxTarget
-    this.disableDeviceLogging =
-      (deviceConf && deviceConf.overrideDisabledLogging) || deviceConf2.overrideDisabledLogging
-        ? false
-        : platform.config.disableDeviceLogging
+
+    // Set the correct logging variables for this accessory
+    this.enableLogging = !platform.config.disableDeviceLogging
+    this.enableDebugLogging = platform.config.debug
+    if (deviceConf2 && deviceConf2.overrideLogging) {
+      switch (deviceConf2.overrideLogging) {
+        case 'standard':
+          this.enableLogging = true
+          this.enableDebugLogging = false
+          break
+        case 'debug':
+          this.enableLogging = true
+          this.enableDebugLogging = true
+          break
+        case 'disable':
+          this.enableLogging = false
+          this.enableDebugLogging = false
+          break
+      }
+    }
 
     // If the accessory has a switch service then remove it
     if (this.accessory.getService(this.hapServ.Switch)) {
@@ -153,18 +169,16 @@ module.exports = class deviceHeater {
       clearInterval(this.intervalPoll)
     })
 
-    // Output the customised options to the log if in debug mode
-    if (platform.config.debug) {
-      const opts = JSON.stringify({
-        disableDeviceLogging: this.disableDeviceLogging,
-        humidityOffset: this.humiOffset,
-        maxTarget: this.maxTarget,
-        minTarget: this.minTarget,
-        offset: this.tempOffset,
-        type: deviceConf2.type
-      })
-      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
-    }
+    // Output the customised options to the log
+    const opts = JSON.stringify({
+      humidityOffset: this.humiOffset,
+      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
+      maxTarget: this.maxTarget,
+      minTarget: this.minTarget,
+      offset: this.tempOffset,
+      type: deviceConf2.type
+    })
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
 
   async internalStateUpdate (value) {
@@ -199,13 +213,13 @@ module.exports = class deviceHeater {
       }
       if (newState !== this.cacheState) {
         this.cacheState = newState
-        if (!this.disableDeviceLogging) {
+        if (this.enableLogging) {
           this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
         }
       }
       if (newCool !== this.cacheCool) {
         this.cacheCool = newCool
-        if (!this.disableDeviceLogging) {
+        if (this.enableLogging) {
           this.log('[%s] %s [%s].', this.name, this.lang.curCool, this.cacheCool)
         }
       }
@@ -228,7 +242,7 @@ module.exports = class deviceHeater {
         return
       }
       this.accessory.context.cacheTarget = value
-      if (!this.disableDeviceLogging) {
+      if (this.enableLogging) {
         this.log('[%s] %s [%s°C].', this.name, this.lang.curTarg, value)
       }
       if (this.cacheState === 'off') {
@@ -250,7 +264,7 @@ module.exports = class deviceHeater {
       }
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.cacheCool = newCool
-      if (!this.disableDeviceLogging) {
+      if (this.enableLogging) {
         this.log('[%s] %s [%s].', this.name, this.lang.curCool, this.cacheCool)
       }
       this.service.updateCharacteristic(
@@ -290,7 +304,7 @@ module.exports = class deviceHeater {
       }
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.cacheCool = newCool
-      if (!this.disableDeviceLogging) {
+      if (this.enableLogging) {
         this.log('[%s] %s [%s].', this.name, this.lang.curCool, this.cacheCool)
       }
       this.service.updateCharacteristic(
@@ -305,7 +319,7 @@ module.exports = class deviceHeater {
   async internalUIUpdate () {
     try {
       const params = { uiActive: 120 }
-      await this.platform.sendDeviceUpdate(this.accessory, params, false)
+      await this.platform.sendDeviceUpdate(this.accessory, params)
     } catch (err) {
       // Suppress errors here
     }
@@ -322,7 +336,7 @@ module.exports = class deviceHeater {
         this.cacheTemp = Number(params.currentTemperature) + this.tempOffset
         this.service.updateCharacteristic(this.hapChar.CurrentTemperature, this.cacheTemp)
         this.accessory.eveService.addEntry({ temp: this.cacheTemp })
-        if (params.updateSource && !this.disableDeviceLogging) {
+        if (params.updateSource && this.enableLogging) {
           this.log('[%s] %s [%s°C].', this.name, this.lang.curTemp, this.cacheTemp)
         }
         await this.internalCurrentTempUpdate()
@@ -337,7 +351,7 @@ module.exports = class deviceHeater {
         this.cacheHumi = Math.max(Math.min(parseInt(this.cacheHumiRaw) + this.humiOffset, 100), 0)
         this.humiService.updateCharacteristic(this.hapChar.CurrentRelativeHumidity, this.cacheHumi)
         this.accessory.eveService.addEntry({ humidity: this.cacheHumi })
-        if (params.updateSource && !this.disableDeviceLogging) {
+        if (params.updateSource && this.enableLogging) {
           this.log('[%s] %s [%s%].', this.name, this.lang.curHumi, this.cacheHumi)
         }
       }
diff --git a/lib/device/simulation/dehumidifier.js b/lib/device/simulation/dehumidifier.js
index 93ab8bf9..7a8248f8 100644
--- a/lib/device/simulation/dehumidifier.js
+++ b/lib/device/simulation/dehumidifier.js
@@ -26,10 +26,26 @@ module.exports = class deviceHeater {
       deviceConf && deviceConf.humidityOffset
         ? deviceConf.humidityOffset
         : platform.consts.defaultValues.humidityOffset
-    this.disableDeviceLogging =
-      (deviceConf && deviceConf.overrideDisabledLogging) || deviceConf2.overrideDisabledLogging
-        ? false
-        : platform.config.disableDeviceLogging
+
+    // Set the correct logging variables for this accessory
+    this.enableLogging = !platform.config.disableDeviceLogging
+    this.enableDebugLogging = platform.config.debug
+    if (deviceConf2 && deviceConf2.overrideLogging) {
+      switch (deviceConf2.overrideLogging) {
+        case 'standard':
+          this.enableLogging = true
+          this.enableDebugLogging = false
+          break
+        case 'debug':
+          this.enableLogging = true
+          this.enableDebugLogging = true
+          break
+        case 'disable':
+          this.enableLogging = false
+          this.enableDebugLogging = false
+          break
+      }
+    }
 
     // If the accessory has a switch service then remove it
     if (this.accessory.getService(this.hapServ.Switch)) {
@@ -131,16 +147,14 @@ module.exports = class deviceHeater {
       clearInterval(this.intervalPoll)
     })
 
-    // Output the customised options to the log if in debug mode
-    if (platform.config.debug) {
-      const opts = JSON.stringify({
-        disableDeviceLogging: this.disableDeviceLogging,
-        humidityOffset: this.humiOffset,
-        offset: this.tempOffset,
-        type: deviceConf2.type
-      })
-      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
-    }
+    // Output the customised options to the log
+    const opts = JSON.stringify({
+      humidityOffset: this.humiOffset,
+      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
+      offset: this.tempOffset,
+      type: deviceConf2.type
+    })
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
 
   async internalStateUpdate (value) {
@@ -175,13 +189,13 @@ module.exports = class deviceHeater {
       }
       if (newState !== this.cacheState) {
         this.cacheState = newState
-        if (!this.disableDeviceLogging) {
+        if (this.enableLogging) {
           this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
         }
       }
       if (newHumid !== this.cacheHumid) {
         this.cacheHumid = newHumid
-        if (!this.disableDeviceLogging) {
+        if (this.enableLogging) {
           this.log('[%s] %s [%s].', this.name, this.lang.curDehumid, this.cacheHumid)
         }
       }
@@ -204,7 +218,7 @@ module.exports = class deviceHeater {
         return
       }
       this.accessory.context.cacheTarget = value
-      if (!this.disableDeviceLogging) {
+      if (this.enableLogging) {
         this.log('[%s] %s [%s%].', this.name, this.lang.curTarg, value)
       }
       if (this.cacheState === 'off') {
@@ -226,7 +240,7 @@ module.exports = class deviceHeater {
       }
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.cacheHumid = newHumid
-      if (!this.disableDeviceLogging) {
+      if (this.enableLogging) {
         this.log('[%s] %s [%s].', this.name, this.lang.curDehumid, this.cacheHumid)
       }
       this.service.updateCharacteristic(
@@ -266,7 +280,7 @@ module.exports = class deviceHeater {
       }
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.cacheHumid = newHumid
-      if (!this.disableDeviceLogging) {
+      if (this.enableLogging) {
         this.log('[%s] %s [%s].', this.name, this.lang.curDehumid, this.cacheHumid)
       }
       this.service.updateCharacteristic(
@@ -281,7 +295,7 @@ module.exports = class deviceHeater {
   async internalUIUpdate () {
     try {
       const params = { uiActive: 120 }
-      await this.platform.sendDeviceUpdate(this.accessory, params, false)
+      await this.platform.sendDeviceUpdate(this.accessory, params)
     } catch (err) {
       // Suppress errors here
     }
@@ -298,7 +312,7 @@ module.exports = class deviceHeater {
         this.cacheTemp = Number(params.currentTemperature) + this.tempOffset
         this.tempService.updateCharacteristic(this.hapChar.CurrentTemperature, this.cacheTemp)
         this.accessory.eveService.addEntry({ temp: this.cacheTemp })
-        if (params.updateSource && !this.disableDeviceLogging) {
+        if (params.updateSource && this.enableLogging) {
           this.log('[%s] %s [%s%].', this.name, this.lang.curTemp, this.cacheTemp)
         }
       }
@@ -311,7 +325,7 @@ module.exports = class deviceHeater {
         this.cacheHumi = Math.max(Math.min(parseInt(this.cacheHumiRaw) + this.humiOffset, 100), 0)
         this.service.updateCharacteristic(this.hapChar.CurrentRelativeHumidity, this.cacheHumi)
         this.accessory.eveService.addEntry({ humidity: this.cacheHumi })
-        if (params.updateSource && !this.disableDeviceLogging) {
+        if (params.updateSource && this.enableLogging) {
           this.log('[%s] %s [%s%].', this.name, this.lang.curHumi, this.cacheHumi)
         }
         await this.internalCurrentHumidityUpdate()
diff --git a/lib/device/simulation/door.js b/lib/device/simulation/door.js
index 634dbb0e..3875990c 100644
--- a/lib/device/simulation/door.js
+++ b/lib/device/simulation/door.js
@@ -21,10 +21,26 @@ module.exports = class deviceDoor {
     const deviceConf = platform.simulations[accessory.context.eweDeviceId]
     this.operationTimeUp = deviceConf.operationTime || platform.consts.defaultValues.operationTime
     this.operationTimeDown = deviceConf.operationTimeDown || this.operationTimeUp
-    this.disableDeviceLogging =
-      deviceConf && deviceConf.overrideDisabledLogging
-        ? false
-        : platform.config.disableDeviceLogging
+
+    // Set the correct logging variables for this accessory
+    this.enableLogging = !platform.config.disableDeviceLogging
+    this.enableDebugLogging = platform.config.debug
+    if (deviceConf && deviceConf.overrideLogging) {
+      switch (deviceConf.overrideLogging) {
+        case 'standard':
+          this.enableLogging = true
+          this.enableDebugLogging = false
+          break
+        case 'debug':
+          this.enableLogging = true
+          this.enableDebugLogging = true
+          break
+        case 'disable':
+          this.enableLogging = false
+          this.enableDebugLogging = false
+          break
+      }
+    }
 
     // Set up the accessory with default positions when added the first time
     if (!this.funcs.hasProperty(this.accessory.context, 'cacheCurrentPosition')) {
@@ -47,16 +63,14 @@ module.exports = class deviceDoor {
       this.internalPositionUpdate(value)
     })
 
-    // Output the customised options to the log if in debug mode
-    if (platform.config.debug) {
-      const opts = JSON.stringify({
-        disableDeviceLogging: this.disableDeviceLogging,
-        operationTimeDown: this.operationTimeDown,
-        operationTimeUp: this.operationTimeUp,
-        type: deviceConf.type
-      })
-      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
-    }
+    // Output the customised options to the log
+    const opts = JSON.stringify({
+      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
+      operationTimeDown: this.operationTimeDown,
+      operationTimeUp: this.operationTimeUp,
+      type: deviceConf.type
+    })
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
 
   async internalPositionUpdate (value) {
@@ -123,7 +137,7 @@ module.exports = class deviceDoor {
       this.service.updateCharacteristic(this.hapChar.CurrentPosition, value)
       this.accessory.context.cachePositionState = 2
       this.accessory.context.cacheCurrentPosition = value
-      if (!this.disableDeviceLogging) {
+      if (this.enableLogging) {
         this.log('[%s] %s [%s%]', this.name, this.lang.curPos, value)
       }
     } catch (err) {
diff --git a/lib/device/simulation/garage-eachen.js b/lib/device/simulation/garage-eachen.js
index 719889ae..b4f1fdc8 100644
--- a/lib/device/simulation/garage-eachen.js
+++ b/lib/device/simulation/garage-eachen.js
@@ -21,9 +21,26 @@ module.exports = class deviceGarageEachen {
     // Set up custom variables for this device type
     const deviceConf = platform.simulations[accessory.context.eweDeviceId]
     this.operationTime = deviceConf.operationTime || platform.consts.defaultValues.operationTime
-    this.disableDeviceLogging = deviceConf.overrideDisabledLogging
-      ? false
-      : platform.config.disableDeviceLogging
+
+    // Set the correct logging variables for this accessory
+    this.enableLogging = !platform.config.disableDeviceLogging
+    this.enableDebugLogging = platform.config.debug
+    if (deviceConf && deviceConf.overrideLogging) {
+      switch (deviceConf.overrideLogging) {
+        case 'standard':
+          this.enableLogging = true
+          this.enableDebugLogging = false
+          break
+        case 'debug':
+          this.enableLogging = true
+          this.enableDebugLogging = true
+          break
+        case 'disable':
+          this.enableLogging = false
+          this.enableDebugLogging = false
+          break
+      }
+    }
 
     // If the accessory has a switch service then remove it
     if (this.accessory.getService(this.hapServ.Switch)) {
@@ -72,15 +89,13 @@ module.exports = class deviceGarageEachen {
       log: platform.config.debugFakegato ? this.log : () => {}
     })
 
-    // Output the customised options to the log if in debug mode
-    if (platform.config.debug) {
-      const opts = JSON.stringify({
-        disableDeviceLogging: this.disableDeviceLogging,
-        operationTime: this.operationTime,
-        type: deviceConf.type
-      })
-      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
-    }
+    // Output the customised options to the log
+    const opts = JSON.stringify({
+      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
+      operationTime: this.operationTime,
+      type: deviceConf.type
+    })
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
 
   async internalStateUpdate (value) {
@@ -108,7 +123,7 @@ module.exports = class deviceGarageEachen {
         this.service.updateCharacteristic(this.eveChar.TimesOpened, this.timesOpened)
         await this.funcs.sleep(Math.max((this.operationTime - 20) * 100, 0))
         this.service.updateCharacteristic(this.hapChar.CurrentDoorState, 0)
-        if (!this.disableDeviceLogging) {
+        if (this.enableLogging) {
           this.log('[%s] %s [%s].', this.name, this.lang.curState, this.lang.doorOpen)
         }
       }
@@ -152,7 +167,7 @@ module.exports = class deviceGarageEachen {
         this.service.updateCharacteristic(this.hapChar.ContactSensorState, 0)
         this.accessory.eveService.addEntry({ status: 1 }) // swapped
       }
-      if (params.updateSource && !this.disableDeviceLogging) {
+      if (params.updateSource && this.enableLogging) {
         this.log(
           '[%s] %s [%s].',
           this.name,
diff --git a/lib/device/simulation/garage-four.js b/lib/device/simulation/garage-four.js
index 8be00288..3037353c 100644
--- a/lib/device/simulation/garage-four.js
+++ b/lib/device/simulation/garage-four.js
@@ -21,9 +21,26 @@ module.exports = class deviceGarageFour {
     const deviceConf = platform.simulations[accessory.context.eweDeviceId]
     this.operationTimeUp = deviceConf.operationTime || platform.consts.defaultValues.operationTime
     this.operationTimeDown = deviceConf.operationTimeDown || this.operationTimeUp
-    this.disableDeviceLogging = deviceConf.overrideDisabledLogging
-      ? false
-      : platform.config.disableDeviceLogging
+
+    // Set the correct logging variables for this accessory
+    this.enableLogging = !platform.config.disableDeviceLogging
+    this.enableDebugLogging = platform.config.debug
+    if (deviceConf && deviceConf.overrideLogging) {
+      switch (deviceConf.overrideLogging) {
+        case 'standard':
+          this.enableLogging = true
+          this.enableDebugLogging = false
+          break
+        case 'debug':
+          this.enableLogging = true
+          this.enableDebugLogging = true
+          break
+        case 'disable':
+          this.enableLogging = false
+          this.enableDebugLogging = false
+          break
+      }
+    }
 
     // Set up the accessory with default positions when added the first time
     if (!this.funcs.hasProperty(this.accessory.context, 'cacheStates')) {
@@ -57,16 +74,14 @@ module.exports = class deviceGarageFour {
       })
     })
 
-    // Output the customised options to the log if in debug mode
-    if (platform.config.debug) {
-      const opts = JSON.stringify({
-        disableDeviceLogging: this.disableDeviceLogging,
-        operationTimeDown: this.operationTimeDown,
-        operationTimeUp: this.operationTimeUp,
-        type: deviceConf.type
-      })
-      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
-    }
+    // Output the customised options to the log
+    const opts = JSON.stringify({
+      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
+      operationTimeDown: this.operationTimeDown,
+      operationTimeUp: this.operationTimeUp,
+      type: deviceConf.type
+    })
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
 
   async internalStateUpdate (garage, value) {
@@ -118,7 +133,7 @@ module.exports = class deviceGarageFour {
       }
       gdService.updateCharacteristic(this.hapChar.CurrentDoorState, value)
       this.accessory.context.cacheStates[garageChannel].cacheCurrentDoorState = value
-      if (!this.disableDeviceLogging) {
+      if (this.enableLogging) {
         this.log(
           '[%s] %s [garage %s %s].',
           this.name,
diff --git a/lib/device/simulation/garage-one.js b/lib/device/simulation/garage-one.js
index f7374aaa..f77804fc 100644
--- a/lib/device/simulation/garage-one.js
+++ b/lib/device/simulation/garage-one.js
@@ -23,9 +23,26 @@ module.exports = class deviceGarageOne {
     const deviceConf = platform.simulations[accessory.context.eweDeviceId]
     this.operationTimeUp = deviceConf.operationTime || platform.consts.defaultValues.operationTime
     this.operationTimeDown = deviceConf.operationTimeDown || this.operationTimeUp
-    this.disableDeviceLogging = deviceConf.overrideDisabledLogging
-      ? false
-      : platform.config.disableDeviceLogging
+
+    // Set the correct logging variables for this accessory
+    this.enableLogging = !platform.config.disableDeviceLogging
+    this.enableDebugLogging = platform.config.debug
+    if (deviceConf && deviceConf.overrideLogging) {
+      switch (deviceConf.overrideLogging) {
+        case 'standard':
+          this.enableLogging = true
+          this.enableDebugLogging = false
+          break
+        case 'debug':
+          this.enableLogging = true
+          this.enableDebugLogging = true
+          break
+        case 'disable':
+          this.enableLogging = false
+          this.enableDebugLogging = false
+          break
+      }
+    }
 
     // Check the sensor is valid if defined by the user
     if (deviceConf.sensorId) {
@@ -76,16 +93,14 @@ module.exports = class deviceGarageOne {
       log: platform.config.debugFakegato ? this.log : () => {}
     })
 
-    // Output the customised options to the log if in debug mode
-    if (platform.config.debug) {
-      const opts = JSON.stringify({
-        disableDeviceLogging: this.disableDeviceLogging,
-        operationTimeDown: this.operationTimeDown,
-        operationTimeUp: this.operationTimeUp,
-        type: deviceConf.type
-      })
-      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
-    }
+    // Output the customised options to the log
+    const opts = JSON.stringify({
+      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
+      operationTimeDown: this.operationTimeDown,
+      operationTimeUp: this.operationTimeUp,
+      type: deviceConf.type
+    })
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
 
   async internalUpdate (value) {
@@ -135,7 +150,7 @@ module.exports = class deviceGarageOne {
       await this.funcs.sleep(Math.max((operationTime - 20) * 100, 0))
       if (!this.definedSensor) {
         this.service.updateCharacteristic(this.hapChar.CurrentDoorState, newPos)
-        if (!this.disableDeviceLogging) {
+        if (this.enableLogging) {
           this.log(
             '[%s] %s [%s].',
             this.name,
@@ -192,7 +207,7 @@ module.exports = class deviceGarageOne {
       const operationTime = newPos === 2 ? this.operationTimeUp : this.operationTimeDown
       await this.funcs.sleep(Math.max((operationTime - 20) * 100, 0))
       this.service.updateCharacteristic(this.hapChar.CurrentDoorState, newPos - 2)
-      if (!this.disableDeviceLogging) {
+      if (this.enableLogging) {
         this.log(
           '[%s] %s [%s].',
           this.name,
diff --git a/lib/device/simulation/garage-two.js b/lib/device/simulation/garage-two.js
index 4b4eafb0..ef29a5c2 100644
--- a/lib/device/simulation/garage-two.js
+++ b/lib/device/simulation/garage-two.js
@@ -21,9 +21,26 @@ module.exports = class deviceGarageTwo {
     const deviceConf = platform.simulations[accessory.context.eweDeviceId]
     this.operationTimeUp = deviceConf.operationTime || platform.consts.defaultValues.operationTime
     this.operationTimeDown = deviceConf.operationTimeDown || this.operationTimeUp
-    this.disableDeviceLogging = deviceConf.overrideDisabledLogging
-      ? false
-      : platform.config.disableDeviceLogging
+
+    // Set the correct logging variables for this accessory
+    this.enableLogging = !platform.config.disableDeviceLogging
+    this.enableDebugLogging = platform.config.debug
+    if (deviceConf && deviceConf.overrideLogging) {
+      switch (deviceConf.overrideLogging) {
+        case 'standard':
+          this.enableLogging = true
+          this.enableDebugLogging = false
+          break
+        case 'debug':
+          this.enableLogging = true
+          this.enableDebugLogging = true
+          break
+        case 'disable':
+          this.enableLogging = false
+          this.enableDebugLogging = false
+          break
+      }
+    }
 
     // Set up the accessory with default positions when added the first time
     if (!this.funcs.hasProperty(this.accessory.context, 'cacheCurrentDoorState')) {
@@ -55,16 +72,14 @@ module.exports = class deviceGarageTwo {
       })
     })
 
-    // Output the customised options to the log if in debug mode
-    if (platform.config.debug) {
-      const opts = JSON.stringify({
-        disableDeviceLogging: this.disableDeviceLogging,
-        operationTimeDown: this.operationTimeDown,
-        operationTimeUp: this.operationTimeUp,
-        type: deviceConf.type
-      })
-      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
-    }
+    // Output the customised options to the log
+    const opts = JSON.stringify({
+      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
+      operationTimeDown: this.operationTimeDown,
+      operationTimeUp: this.operationTimeUp,
+      type: deviceConf.type
+    })
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
 
   async internalUpdate (garage, value) {
@@ -121,7 +136,7 @@ module.exports = class deviceGarageTwo {
       switch (garage) {
         case 'Garage 1': {
           this.accessory.context.cacheOneCurrentDoorState = newPos
-          if (!this.disableDeviceLogging) {
+          if (this.enableLogging) {
             this.log(
               '[%s] %s [garage 1 %s].',
               this.name,
@@ -133,7 +148,7 @@ module.exports = class deviceGarageTwo {
         }
         case 'Garage 2': {
           this.accessory.context.cacheTwoCurrentDoorState = newPos
-          if (!this.disableDeviceLogging) {
+          if (this.enableLogging) {
             this.log(
               '[%s] %s [garage 2 %s].',
               this.name,
@@ -209,7 +224,7 @@ module.exports = class deviceGarageTwo {
         switch (v) {
           case '1':
             this.accessory.context.cacheOneCurrentDoorState = newPos - 2
-            if (params.updateSource && !this.disableDeviceLogging) {
+            if (params.updateSource && this.enableLogging) {
               this.log(
                 '[%s] %s [garage 1 %s].',
                 this.name,
@@ -220,7 +235,7 @@ module.exports = class deviceGarageTwo {
             break
           case '2':
             this.accessory.context.cacheTwoCurrentDoorState = newPos - 2
-            if (params.updateSource && !this.disableDeviceLogging) {
+            if (params.updateSource && this.enableLogging) {
               this.log(
                 '[%s] %s [garage 2 %s].',
                 this.name,
diff --git a/lib/device/simulation/heater.js b/lib/device/simulation/heater.js
index 855d74c6..3589bc84 100644
--- a/lib/device/simulation/heater.js
+++ b/lib/device/simulation/heater.js
@@ -34,10 +34,26 @@ module.exports = class deviceHeater {
       deviceConf && deviceConf.maxTarget
         ? Math.max(deviceConf.maxTarget, this.minTarget + 1)
         : platform.consts.defaultValues.maxTarget
-    this.disableDeviceLogging =
-      (deviceConf && deviceConf.overrideDisabledLogging) || deviceConf2.overrideDisabledLogging
-        ? false
-        : platform.config.disableDeviceLogging
+
+    // Set the correct logging variables for this accessory
+    this.enableLogging = !platform.config.disableDeviceLogging
+    this.enableDebugLogging = platform.config.debug
+    if (deviceConf2 && deviceConf2.overrideLogging) {
+      switch (deviceConf2.overrideLogging) {
+        case 'standard':
+          this.enableLogging = true
+          this.enableDebugLogging = false
+          break
+        case 'debug':
+          this.enableLogging = true
+          this.enableDebugLogging = true
+          break
+        case 'disable':
+          this.enableLogging = false
+          this.enableDebugLogging = false
+          break
+      }
+    }
 
     // If the accessory has a switch service then remove it
     if (this.accessory.getService(this.hapServ.Switch)) {
@@ -153,18 +169,16 @@ module.exports = class deviceHeater {
       clearInterval(this.intervalPoll)
     })
 
-    // Output the customised options to the log if in debug mode
-    if (platform.config.debug) {
-      const opts = JSON.stringify({
-        disableDeviceLogging: this.disableDeviceLogging,
-        humidityOffset: this.humiOffset,
-        maxTarget: this.maxTarget,
-        minTarget: this.minTarget,
-        offset: this.tempOffset,
-        type: deviceConf2.type
-      })
-      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
-    }
+    // Output the customised options to the log
+    const opts = JSON.stringify({
+      humidityOffset: this.humiOffset,
+      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
+      maxTarget: this.maxTarget,
+      minTarget: this.minTarget,
+      offset: this.tempOffset,
+      type: deviceConf2.type
+    })
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
 
   async internalStateUpdate (value) {
@@ -199,13 +213,13 @@ module.exports = class deviceHeater {
       }
       if (newState !== this.cacheState) {
         this.cacheState = newState
-        if (!this.disableDeviceLogging) {
+        if (this.enableLogging) {
           this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
         }
       }
       if (newHeat !== this.cacheHeat) {
         this.cacheHeat = newHeat
-        if (!this.disableDeviceLogging) {
+        if (this.enableLogging) {
           this.log('[%s] %s [%s].', this.name, this.lang.curHeat, this.cacheHeat)
         }
       }
@@ -228,7 +242,7 @@ module.exports = class deviceHeater {
         return
       }
       this.accessory.context.cacheTarget = value
-      if (!this.disableDeviceLogging) {
+      if (this.enableLogging) {
         this.log('[%s] %s [%s°C].', this.name, this.lang.curTarg, value)
       }
       if (this.cacheState === 'off') {
@@ -250,7 +264,7 @@ module.exports = class deviceHeater {
       }
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.cacheHeat = newHeat
-      if (!this.disableDeviceLogging) {
+      if (this.enableLogging) {
         this.log('[%s] %s [%s].', this.name, this.lang.curHeat, this.cacheHeat)
       }
       this.service.updateCharacteristic(
@@ -290,7 +304,7 @@ module.exports = class deviceHeater {
       }
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.cacheHeat = newHeat
-      if (!this.disableDeviceLogging) {
+      if (this.enableLogging) {
         this.log('[%s] %s [%s].', this.name, this.lang.curHeat, this.cacheHeat)
       }
       this.service.updateCharacteristic(
@@ -305,7 +319,7 @@ module.exports = class deviceHeater {
   async internalUIUpdate () {
     try {
       const params = { uiActive: 120 }
-      await this.platform.sendDeviceUpdate(this.accessory, params, false)
+      await this.platform.sendDeviceUpdate(this.accessory, params)
     } catch (err) {
       // Suppress errors here
     }
@@ -322,7 +336,7 @@ module.exports = class deviceHeater {
         this.cacheTemp = Number(params.currentTemperature) + this.tempOffset
         this.service.updateCharacteristic(this.hapChar.CurrentTemperature, this.cacheTemp)
         this.accessory.eveService.addEntry({ temp: this.cacheTemp })
-        if (params.updateSource && !this.disableDeviceLogging) {
+        if (params.updateSource && this.enableLogging) {
           this.log('[%s] %s [%s°C].', this.name, this.lang.curTemp, this.cacheTemp)
         }
         await this.internalCurrentTempUpdate()
@@ -337,7 +351,7 @@ module.exports = class deviceHeater {
         this.cacheHumi = Math.max(Math.min(parseInt(this.cacheHumiRaw) + this.humiOffset, 100), 0)
         this.humiService.updateCharacteristic(this.hapChar.CurrentRelativeHumidity, this.cacheHumi)
         this.accessory.eveService.addEntry({ humidity: this.cacheHumi })
-        if (params.updateSource && !this.disableDeviceLogging) {
+        if (params.updateSource && this.enableLogging) {
           this.log('[%s] %s [%s%].', this.name, this.lang.curHumi, this.cacheHumi)
         }
       }
diff --git a/lib/device/simulation/humidifier.js b/lib/device/simulation/humidifier.js
index ad2987d3..f4a6c318 100644
--- a/lib/device/simulation/humidifier.js
+++ b/lib/device/simulation/humidifier.js
@@ -26,10 +26,25 @@ module.exports = class deviceHeater {
       deviceConf && deviceConf.humidityOffset
         ? deviceConf.humidityOffset
         : platform.consts.defaultValues.humidityOffset
-    this.disableDeviceLogging =
-      (deviceConf && deviceConf.overrideDisabledLogging) || deviceConf2.overrideDisabledLogging
-        ? false
-        : platform.config.disableDeviceLogging
+    // Set the correct logging variables for this accessory
+    this.enableLogging = !platform.config.disableDeviceLogging
+    this.enableDebugLogging = platform.config.debug
+    if (deviceConf2 && deviceConf2.overrideLogging) {
+      switch (deviceConf2.overrideLogging) {
+        case 'standard':
+          this.enableLogging = true
+          this.enableDebugLogging = false
+          break
+        case 'debug':
+          this.enableLogging = true
+          this.enableDebugLogging = true
+          break
+        case 'disable':
+          this.enableLogging = false
+          this.enableDebugLogging = false
+          break
+      }
+    }
 
     // If the accessory has a switch service then remove it
     if (this.accessory.getService(this.hapServ.Switch)) {
@@ -131,16 +146,14 @@ module.exports = class deviceHeater {
       clearInterval(this.intervalPoll)
     })
 
-    // Output the customised options to the log if in debug mode
-    if (platform.config.debug) {
-      const opts = JSON.stringify({
-        disableDeviceLogging: this.disableDeviceLogging,
-        humidityOffset: this.humiOffset,
-        offset: this.tempOffset,
-        type: deviceConf2.type
-      })
-      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
-    }
+    // Output the customised options to the log
+    const opts = JSON.stringify({
+      humidityOffset: this.humiOffset,
+      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
+      offset: this.tempOffset,
+      type: deviceConf2.type
+    })
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
 
   async internalStateUpdate (value) {
@@ -175,13 +188,13 @@ module.exports = class deviceHeater {
       }
       if (newState !== this.cacheState) {
         this.cacheState = newState
-        if (!this.disableDeviceLogging) {
+        if (this.enableLogging) {
           this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
         }
       }
       if (newHumid !== this.cacheHumid) {
         this.cacheHumid = newHumid
-        if (!this.disableDeviceLogging) {
+        if (this.enableLogging) {
           this.log('[%s] %s [%s].', this.name, this.lang.curHumid, this.cacheHumid)
         }
       }
@@ -204,7 +217,7 @@ module.exports = class deviceHeater {
         return
       }
       this.accessory.context.cacheTarget = value
-      if (!this.disableDeviceLogging) {
+      if (this.enableLogging) {
         this.log('[%s] %s [%s%].', this.name, this.lang.curTarg, value)
       }
       if (this.cacheState === 'off') {
@@ -226,7 +239,7 @@ module.exports = class deviceHeater {
       }
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.cacheHumid = newHumid
-      if (!this.disableDeviceLogging) {
+      if (this.enableLogging) {
         this.log('[%s] %s [%s].', this.name, this.lang.curHumid, this.cacheHumid)
       }
       this.service.updateCharacteristic(
@@ -266,7 +279,7 @@ module.exports = class deviceHeater {
       }
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.cacheHumid = newHumid
-      if (!this.disableDeviceLogging) {
+      if (this.enableLogging) {
         this.log('[%s] %s [%s].', this.name, this.lang.curHumid, this.cacheHumid)
       }
       this.service.updateCharacteristic(
@@ -281,7 +294,7 @@ module.exports = class deviceHeater {
   async internalUIUpdate () {
     try {
       const params = { uiActive: 120 }
-      await this.platform.sendDeviceUpdate(this.accessory, params, false)
+      await this.platform.sendDeviceUpdate(this.accessory, params)
     } catch (err) {
       // Suppress errors here
     }
@@ -298,7 +311,7 @@ module.exports = class deviceHeater {
         this.cacheTemp = Number(params.currentTemperature) + this.tempOffset
         this.tempService.updateCharacteristic(this.hapChar.CurrentTemperature, this.cacheTemp)
         this.accessory.eveService.addEntry({ temp: this.cacheTemp })
-        if (params.updateSource && !this.disableDeviceLogging) {
+        if (params.updateSource && this.enableLogging) {
           this.log('[%s] %s [%s%].', this.name, this.lang.curTemp, this.cacheTemp)
         }
       }
@@ -311,7 +324,7 @@ module.exports = class deviceHeater {
         this.cacheHumi = Math.max(Math.min(parseInt(this.cacheHumiRaw) + this.humiOffset, 100), 0)
         this.service.updateCharacteristic(this.hapChar.CurrentRelativeHumidity, this.cacheHumi)
         this.accessory.eveService.addEntry({ humidity: this.cacheHumi })
-        if (params.updateSource && !this.disableDeviceLogging) {
+        if (params.updateSource && this.enableLogging) {
           this.log('[%s] %s [%s%].', this.name, this.lang.curHumi, this.cacheHumi)
         }
         await this.internalCurrentHumidityUpdate()
diff --git a/lib/device/simulation/lock-one.js b/lib/device/simulation/lock-one.js
index 0c0c8e43..58d312f9 100644
--- a/lib/device/simulation/lock-one.js
+++ b/lib/device/simulation/lock-one.js
@@ -20,9 +20,26 @@ module.exports = class deviceLockOne {
     // Set up custom variables for this device type
     const deviceConf = platform.simulations[accessory.context.eweDeviceId]
     this.operationTime = deviceConf.operationTime || platform.consts.defaultValues.operationTime
-    this.disableDeviceLogging = deviceConf.overrideDisabledLogging
-      ? false
-      : platform.config.disableDeviceLogging
+
+    // Set the correct logging variables for this accessory
+    this.enableLogging = !platform.config.disableDeviceLogging
+    this.enableDebugLogging = platform.config.debug
+    if (deviceConf && deviceConf.overrideLogging) {
+      switch (deviceConf.overrideLogging) {
+        case 'standard':
+          this.enableLogging = true
+          this.enableDebugLogging = false
+          break
+        case 'debug':
+          this.enableLogging = true
+          this.enableDebugLogging = true
+          break
+        case 'disable':
+          this.enableLogging = false
+          this.enableDebugLogging = false
+          break
+      }
+    }
 
     // If the accessory has a switch service then remove it
     if (this.accessory.getService(this.hapServ.Switch)) {
@@ -45,15 +62,13 @@ module.exports = class deviceLockOne {
       .updateCharacteristic(this.hapChar.LockCurrentState, 1)
       .updateCharacteristic(this.hapChar.LockTargetState, 1)
 
-    // Output the customised options to the log if in debug mode
-    if (platform.config.debug) {
-      const opts = JSON.stringify({
-        disableDeviceLogging: this.disableDeviceLogging,
-        operationTime: this.operationTime,
-        type: deviceConf.type
-      })
-      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
-    }
+    // Output the customised options to the log
+    const opts = JSON.stringify({
+      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
+      operationTime: this.operationTime,
+      type: deviceConf.type
+    })
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
 
   async internalUpdate (value) {
@@ -77,14 +92,14 @@ module.exports = class deviceLockOne {
       this.inUse = true
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.service.setCharacteristic(this.hapChar.LockCurrentState, 0)
-      if (!this.disableDeviceLogging) {
+      if (this.enableLogging) {
         this.log('[%s] %s [%s].', this.name, this.lang.curState, this.lang.lockUnlocked)
       }
       await this.funcs.sleep(Math.max(this.operationTime * 100, 1000))
       this.service.updateCharacteristic(this.hapChar.LockTargetState, 1)
       this.service.setCharacteristic(this.hapChar.LockCurrentState, 1)
       this.inUse = false
-      if (!this.disableDeviceLogging) {
+      if (this.enableLogging) {
         this.log('[%s] %s [%s].', this.name, this.lang.curState, this.lang.lockLocked)
       }
     } catch (err) {
@@ -122,7 +137,7 @@ module.exports = class deviceLockOne {
       this.inUse = true
       this.service.updateCharacteristic(this.hapChar.LockCurrentState, 0)
       this.service.updateCharacteristic(this.hapChar.LockTargetState, 0)
-      if (params.updateSource && !this.disableDeviceLogging) {
+      if (params.updateSource && this.enableLogging) {
         this.log('[%s] %s [%s].', this.name, this.lang.curState, this.lang.lockUnlocked)
       }
       await this.funcs.sleep(Math.max(this.operationTime * 100, 1000))
@@ -130,7 +145,7 @@ module.exports = class deviceLockOne {
         .updateCharacteristic(this.hapChar.LockCurrentState, 1)
         .updateCharacteristic(this.hapChar.LockTargetState, 1)
       this.inUse = false
-      if (params.updateSource && !this.disableDeviceLogging) {
+      if (params.updateSource && this.enableLogging) {
         this.log('[%s] %s [%s].', this.name, this.lang.curState, this.lang.lockLocked)
       }
     } catch (err) {
diff --git a/lib/device/simulation/purifier.js b/lib/device/simulation/purifier.js
index d420f169..00749f5c 100644
--- a/lib/device/simulation/purifier.js
+++ b/lib/device/simulation/purifier.js
@@ -19,9 +19,25 @@ module.exports = class devicePurifier {
 
     // Set up custom variables for this device type
     const deviceConf = platform.simulations[accessory.context.eweDeviceId]
-    this.disableDeviceLogging = deviceConf.overrideDisabledLogging
-      ? false
-      : platform.config.disableDeviceLogging
+    // Set the correct logging variables for this accessory
+    this.enableLogging = !platform.config.disableDeviceLogging
+    this.enableDebugLogging = platform.config.debug
+    if (deviceConf && deviceConf.overrideLogging) {
+      switch (deviceConf.overrideLogging) {
+        case 'standard':
+          this.enableLogging = true
+          this.enableDebugLogging = false
+          break
+        case 'debug':
+          this.enableLogging = true
+          this.enableDebugLogging = true
+          break
+        case 'disable':
+          this.enableLogging = false
+          this.enableDebugLogging = false
+          break
+      }
+    }
 
     // If the accessory has a switch service then remove it
     if (this.accessory.getService(this.hapServ.Switch)) {
@@ -53,13 +69,11 @@ module.exports = class devicePurifier {
       })
       .updateValue(1)
 
-    // Output the customised options to the log if in debug mode
-    if (platform.config.debug) {
-      const opts = JSON.stringify({
-        disableDeviceLogging: this.disableDeviceLogging
-      })
-      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
-    }
+    // Output the customised options to the log
+    const opts = JSON.stringify({
+      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable'
+    })
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
 
   async internalStateUpdate (value) {
@@ -83,7 +97,7 @@ module.exports = class devicePurifier {
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.cacheState = value === 1 ? 'on' : 'off'
       this.service.updateCharacteristic(this.hapChar.CurrentAirPurifierState, value === 1 ? 2 : 0)
-      if (!this.disableDeviceLogging) {
+      if (this.enableLogging) {
         this.log('[%s] %s [%s].', this.name, this.lang.curPur, this.cacheState)
       }
     } catch (err) {
@@ -121,7 +135,7 @@ module.exports = class devicePurifier {
         this.hapChar.CurrentAirPurifierState,
         this.cacheState === 'on' ? 2 : 0
       )
-      if (params.updateSource && !this.disableDeviceLogging) {
+      if (params.updateSource && this.enableLogging) {
         this.log('[%s] %s [%s].', this.name, this.lang.curPur, this.cacheState)
       }
     } catch (err) {
diff --git a/lib/device/simulation/sensor-hidden.js b/lib/device/simulation/sensor-hidden.js
index 6dcb5d97..8e9a90d4 100644
--- a/lib/device/simulation/sensor-hidden.js
+++ b/lib/device/simulation/sensor-hidden.js
@@ -6,6 +6,7 @@ module.exports = class deviceSensorHidden {
   constructor (platform, accessory, devicesInHB) {
     // Set up variables from the platform
     this.devicesInHB = devicesInHB
+    this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.funcs = platform.funcs
     this.hapChar = platform.api.hap.Characteristic
     this.hapServ = platform.api.hap.Service
@@ -38,13 +39,27 @@ module.exports = class deviceSensorHidden {
           const uuid = this.hapUUIDGen(deviceId + 'SWX')
           if (this.devicesInHB.has(uuid)) {
             const subAccessory = this.devicesInHB.get(uuid)
+
+            // Set the correct logging variables for this accessory
+            let enableLogging = !this.disableDeviceLogging
+            if (group.overrideLogging) {
+              switch (group.overrideLogging) {
+                case 'standard':
+                case 'debug':
+                  enableLogging = true
+                  break
+                case 'disable':
+                  enableLogging = false
+                  break
+              }
+            }
             const gdService = subAccessory.getService(this.hapServ.GarageDoorOpener)
             const name = subAccessory.displayName
             switch (newState) {
               case 0:
                 gdService.updateCharacteristic(this.hapChar.TargetDoorState, 1)
                 gdService.updateCharacteristic(this.hapChar.CurrentDoorState, 1)
-                if (params.updateSource && !this.disableDeviceLogging) {
+                if (params.updateSource && enableLogging) {
                   this.log('[%s] %s [%s].', name, this.lang.curState, this.lang.doorClosed)
                 }
                 break
@@ -52,7 +67,7 @@ module.exports = class deviceSensorHidden {
                 await this.funcs.sleep(Math.max(group.operationTime * 100, 2000))
                 gdService.updateCharacteristic(this.hapChar.TargetDoorState, 0)
                 gdService.updateCharacteristic(this.hapChar.CurrentDoorState, 0)
-                if (params.updateSource && !this.disableDeviceLogging) {
+                if (params.updateSource && enableLogging) {
                   this.log('[%s] %s [%s].', name, this.lang.curState, this.lang.doorOpen)
                 }
                 break
diff --git a/lib/device/simulation/sensor-leak.js b/lib/device/simulation/sensor-leak.js
index 1ad72855..3a25113b 100644
--- a/lib/device/simulation/sensor-leak.js
+++ b/lib/device/simulation/sensor-leak.js
@@ -24,10 +24,26 @@ module.exports = class deviceSensorLeak {
       deviceConf && deviceConf.lowBattThreshold
         ? Math.min(deviceConf.lowBattThreshold, 100)
         : platform.consts.defaultValues.lowBattThreshold
-    this.disableDeviceLogging =
-      (deviceConf && deviceConf.overrideDisabledLogging) || deviceConf2.overrideDisabledLogging
-        ? false
-        : platform.config.disableDeviceLogging
+
+    // Set the correct logging variables for this accessory
+    this.enableLogging = !platform.config.disableDeviceLogging
+    this.enableDebugLogging = platform.config.debug
+    if (deviceConf2 && deviceConf2.overrideLogging) {
+      switch (deviceConf2.overrideLogging) {
+        case 'standard':
+          this.enableLogging = true
+          this.enableDebugLogging = false
+          break
+        case 'debug':
+          this.enableLogging = true
+          this.enableDebugLogging = true
+          break
+        case 'disable':
+          this.enableLogging = false
+          this.enableDebugLogging = false
+          break
+      }
+    }
 
     // If the accessory has a contact sensor service then remove it
     if (this.accessory.getService(this.hapServ.ContactSensor)) {
@@ -50,15 +66,13 @@ module.exports = class deviceSensorLeak {
       log: platform.config.debugFakegato ? this.log : () => {}
     })
 
-    // Output the customised options to the log if in debug mode
-    if (platform.config.debug) {
-      const opts = JSON.stringify({
-        disableDeviceLogging: this.disableDeviceLogging,
-        lowBattThreshold: this.lowBattThreshold,
-        type: deviceConf.type
-      })
-      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
-    }
+    // Output the customised options to the log
+    const opts = JSON.stringify({
+      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
+      lowBattThreshold: this.lowBattThreshold,
+      type: deviceConf.type
+    })
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
 
   async externalUpdate (params) {
@@ -72,7 +86,7 @@ module.exports = class deviceSensorLeak {
           this.hapChar.StatusLowBattery,
           this.cacheBattScaled < this.lowBattThreshold
         )
-        if (params.updateSource && !this.disableDeviceLogging) {
+        if (params.updateSource && this.enableLogging) {
           this.log('[%s] %s [%s%].', this.name, this.lang.curBatt, this.cacheBattScaled)
         }
       }
@@ -90,7 +104,7 @@ module.exports = class deviceSensorLeak {
           Math.round(new Date().valueOf() / 1000) - initialTime
         )
       }
-      if (params.updateSource && !this.disableDeviceLogging) {
+      if (params.updateSource && this.enableLogging) {
         this.log(
           '[%s] %s [%s].',
           this.name,
diff --git a/lib/device/simulation/sensor-visible.js b/lib/device/simulation/sensor-visible.js
index 35292e60..81013268 100644
--- a/lib/device/simulation/sensor-visible.js
+++ b/lib/device/simulation/sensor-visible.js
@@ -6,6 +6,7 @@ module.exports = class deviceSensorVisible {
   constructor (platform, accessory, devicesInHB) {
     // Set up variables from the platform
     this.devicesInHB = devicesInHB
+    this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.eveChar = platform.eveChar
     this.funcs = platform.funcs
     this.hapChar = platform.api.hap.Characteristic
@@ -27,10 +28,26 @@ module.exports = class deviceSensorVisible {
       deviceConf && deviceConf.lowBattThreshold
         ? Math.min(deviceConf.lowBattThreshold, 100)
         : platform.consts.defaultValues.lowBattThreshold
-    this.disableDeviceLogging =
-      deviceConf && deviceConf.overrideDisabledLogging
-        ? false
-        : platform.config.disableDeviceLogging
+
+    // Set the correct logging variables for this accessory
+    this.enableLogging = !platform.config.disableDeviceLogging
+    this.enableDebugLogging = platform.config.debug
+    if (deviceConf && deviceConf.overrideLogging) {
+      switch (deviceConf.overrideLogging) {
+        case 'standard':
+          this.enableLogging = true
+          this.enableDebugLogging = false
+          break
+        case 'debug':
+          this.enableLogging = true
+          this.enableDebugLogging = true
+          break
+        case 'disable':
+          this.enableLogging = false
+          this.enableDebugLogging = false
+          break
+      }
+    }
 
     // If the accessory has a leak sensor service then remove it
     if (this.accessory.getService(this.hapServ.LeakSensor)) {
@@ -66,15 +83,13 @@ module.exports = class deviceSensorVisible {
       log: platform.config.debugFakegato ? this.log : () => {}
     })
 
-    // Output the customised options to the log if in debug mode
-    if (platform.config.debug) {
-      const opts = JSON.stringify({
-        disableDeviceLogging: this.disableDeviceLogging,
-        lowBattThreshold: this.lowBattThreshold,
-        scaleBattery: this.scaleBattery
-      })
-      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
-    }
+    // Output the customised options to the log
+    const opts = JSON.stringify({
+      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
+      lowBattThreshold: this.lowBattThreshold,
+      scaleBattery: this.scaleBattery
+    })
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
 
   async externalUpdate (params) {
@@ -92,7 +107,7 @@ module.exports = class deviceSensorVisible {
           this.hapChar.StatusLowBattery,
           this.cacheBattScaled < this.lowBattThreshold
         )
-        if (params.updateSource && !this.disableDeviceLogging) {
+        if (params.updateSource && this.enableLogging) {
           this.log('[%s] %s [%s%].', this.name, this.lang.curBatt, this.cacheBattScaled)
         }
       }
@@ -123,7 +138,7 @@ module.exports = class deviceSensorVisible {
         this.service.updateCharacteristic(this.hapChar.ContactSensorState, 0)
         this.accessory.eveService.addEntry({ status: 0 })
       }
-      if (params.updateSource && !this.disableDeviceLogging) {
+      if (params.updateSource && this.enableLogging) {
         this.log(
           '[%s] %s [%s].',
           this.name,
@@ -136,13 +151,27 @@ module.exports = class deviceSensorVisible {
           const uuid = this.hapUUIDGen(deviceId + 'SWX')
           if (this.devicesInHB.has(uuid)) {
             const subAccessory = this.devicesInHB.get(uuid)
+
+            // Set the correct logging variables for this accessory
+            let enableLogging = !this.disableDeviceLogging
+            if (group.overrideLogging) {
+              switch (group.overrideLogging) {
+                case 'standard':
+                case 'debug':
+                  enableLogging = true
+                  break
+                case 'disable':
+                  enableLogging = false
+                  break
+              }
+            }
             const gdService = subAccessory.getService(this.hapServ.GarageDoorOpener)
             const name = subAccessory.displayName
             switch (newState) {
               case 0:
                 gdService.updateCharacteristic(this.hapChar.TargetDoorState, 1)
                 gdService.updateCharacteristic(this.hapChar.CurrentDoorState, 1)
-                if (params.updateSource && !this.disableDeviceLogging) {
+                if (params.updateSource && enableLogging) {
                   this.log('[%s] %s [%s].', name, this.lang.curState, this.lang.doorClosed)
                 }
                 break
@@ -150,7 +179,7 @@ module.exports = class deviceSensorVisible {
                 await this.funcs.sleep(Math.max(group.operationTime * 100, 2000))
                 gdService.updateCharacteristic(this.hapChar.TargetDoorState, 0)
                 gdService.updateCharacteristic(this.hapChar.CurrentDoorState, 0)
-                if (params.updateSource && !this.disableDeviceLogging) {
+                if (params.updateSource && enableLogging) {
                   this.log('[%s] %s [%s].', name, this.lang.curState, this.lang.doorOpen)
                 }
                 break
diff --git a/lib/device/simulation/sensor.js b/lib/device/simulation/sensor.js
index 9871d01d..5dfa5154 100644
--- a/lib/device/simulation/sensor.js
+++ b/lib/device/simulation/sensor.js
@@ -20,9 +20,26 @@ module.exports = class deviceSensor {
     // Set up custom variables for this device type
     const deviceConf = platform.simulations[accessory.context.eweDeviceId]
     this.sensorType = deviceConf.sensorType || 'motion'
-    this.disableDeviceLogging = deviceConf.overrideDisabledLogging
-      ? false
-      : platform.config.disableDeviceLogging
+
+    // Set the correct logging variables for this accessory
+    this.enableLogging = !platform.config.disableDeviceLogging
+    this.enableDebugLogging = platform.config.debug
+    if (deviceConf && deviceConf.overrideLogging) {
+      switch (deviceConf.overrideLogging) {
+        case 'standard':
+          this.enableLogging = true
+          this.enableDebugLogging = false
+          break
+        case 'debug':
+          this.enableLogging = true
+          this.enableDebugLogging = true
+          break
+        case 'disable':
+          this.enableLogging = false
+          this.enableDebugLogging = false
+          break
+      }
+    }
 
     // If the accessory has a switch service then remove it
     if (this.accessory.getService(this.hapServ.Switch)) {
@@ -93,14 +110,12 @@ module.exports = class deviceSensor {
       log: platform.config.debugFakegato ? this.log : () => {}
     })
 
-    // Output the customised options to the log if in debug mode
-    if (platform.config.debug) {
-      const opts = JSON.stringify({
-        sensorType: this.sensorType,
-        disableDeviceLogging: this.disableDeviceLogging
-      })
-      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
-    }
+    // Output the customised options to the log
+    const opts = JSON.stringify({
+      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
+      sensorType: this.sensorType
+    })
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
 
   async externalUpdate (params) {
@@ -132,7 +147,7 @@ module.exports = class deviceSensor {
         this.service.updateCharacteristic(this.char, 0)
         this.accessory.eveService.addEntry({ status: 0 })
       }
-      if (params.updateSource && !this.disableDeviceLogging) {
+      if (params.updateSource && this.enableLogging) {
         this.log(
           '[%s] %s [%s].',
           this.name,
diff --git a/lib/device/simulation/switch-valve.js b/lib/device/simulation/switch-valve.js
index 8547dd8e..54245d5d 100644
--- a/lib/device/simulation/switch-valve.js
+++ b/lib/device/simulation/switch-valve.js
@@ -18,9 +18,26 @@ module.exports = class deviceSwitchValve {
 
     // Set up custom variables for this device type
     const deviceConf = platform.simulations[accessory.context.eweDeviceId]
-    this.disableDeviceLogging = deviceConf.overrideDisabledLogging
-      ? false
-      : platform.config.disableDeviceLogging
+
+    // Set the correct logging variables for this accessory
+    this.enableLogging = !platform.config.disableDeviceLogging
+    this.enableDebugLogging = platform.config.debug
+    if (deviceConf && deviceConf.overrideLogging) {
+      switch (deviceConf.overrideLogging) {
+        case 'standard':
+          this.enableLogging = true
+          this.enableDebugLogging = false
+          break
+        case 'debug':
+          this.enableLogging = true
+          this.enableDebugLogging = true
+          break
+        case 'disable':
+          this.enableLogging = false
+          this.enableDebugLogging = false
+          break
+      }
+    }
 
     // Add the switch service if it doesn't already exist
     this.sService =
@@ -70,14 +87,12 @@ module.exports = class deviceSwitchValve {
       log: platform.config.debugFakegato ? this.log : () => {}
     })
 
-    // Output the customised options to the log if in debug mode
-    if (platform.config.debug) {
-      const opts = JSON.stringify({
-        disableDeviceLogging: this.disableDeviceLogging,
-        type: deviceConf.type
-      })
-      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
-    }
+    // Output the customised options to the log
+    const opts = JSON.stringify({
+      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
+      type: deviceConf.type
+    })
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
 
   async internalSwitchUpdate (value) {
@@ -93,7 +108,7 @@ module.exports = class deviceSwitchValve {
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.cacheState = value ? 'on' : 'off'
       this.accessory.eveService.addEntry({ status: value ? 1 : 0 })
-      if (!this.disableDeviceLogging) {
+      if (this.enableLogging) {
         this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
       }
     } catch (err) {
@@ -120,14 +135,14 @@ module.exports = class deviceSwitchValve {
         case 0:
           this.vService.updateCharacteristic(this.hapChar.RemainingDuration, 0)
           clearTimeout(this.timer)
-          if (!this.disableDeviceLogging) {
+          if (this.enableLogging) {
             this.log('[%s] %s [%s].', this.name, this.lang.curState, this.lang.valveNo)
           }
           break
         case 1: {
           const timer = this.vService.getCharacteristic(this.hapChar.SetDuration).value
           this.vService.updateCharacteristic(this.hapChar.RemainingDuration, timer)
-          if (!this.disableDeviceLogging) {
+          if (this.enableLogging) {
             this.log('[%s] %s [%s].', this.name, this.lang.curState, this.lang.valveYes)
           }
           this.timer = setTimeout(() => {
@@ -156,7 +171,7 @@ module.exports = class deviceSwitchValve {
         this.cacheState = params.switches[0].switch
         this.sService.updateCharacteristic(this.hapChar.On, newStatus)
         this.accessory.eveService.addEntry({ status: newStatus ? 1 : 0 })
-        if (params.updateSource && !this.disableDeviceLogging) {
+        if (params.updateSource && this.enableLogging) {
           this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
         }
       }
@@ -166,7 +181,7 @@ module.exports = class deviceSwitchValve {
           this.vService.updateCharacteristic(this.hapChar.Active, 1)
           this.vService.updateCharacteristic(this.hapChar.InUse, 1)
           this.vService.updateCharacteristic(this.hapChar.RemainingDuration, timer)
-          if (params.updateSource && !this.disableDeviceLogging) {
+          if (params.updateSource && this.enableLogging) {
             this.log('[%s] %s [%s].', this.name, this.lang.curState, this.lang.valveYes)
           }
           this.timer = setTimeout(() => {
diff --git a/lib/device/simulation/tap-one.js b/lib/device/simulation/tap-one.js
index 4dc851ae..3dc8cb90 100644
--- a/lib/device/simulation/tap-one.js
+++ b/lib/device/simulation/tap-one.js
@@ -18,9 +18,26 @@ module.exports = class deviceTapOne {
 
     // Set up custom variables for this device type
     const deviceConf = platform.simulations[accessory.context.eweDeviceId]
-    this.disableDeviceLogging = deviceConf.overrideDisabledLogging
-      ? false
-      : platform.config.disableDeviceLogging
+
+    // Set the correct logging variables for this accessory
+    this.enableLogging = !platform.config.disableDeviceLogging
+    this.enableDebugLogging = platform.config.debug
+    if (deviceConf && deviceConf.overrideLogging) {
+      switch (deviceConf.overrideLogging) {
+        case 'standard':
+          this.enableLogging = true
+          this.enableDebugLogging = false
+          break
+        case 'debug':
+          this.enableLogging = true
+          this.enableDebugLogging = true
+          break
+        case 'disable':
+          this.enableLogging = false
+          this.enableDebugLogging = false
+          break
+      }
+    }
 
     // If the accessory has a switch service then remove it
     if (this.accessory.getService(this.hapServ.Switch)) {
@@ -40,14 +57,12 @@ module.exports = class deviceTapOne {
       await this.internalUpdate(value)
     })
 
-    // Output the customised options to the log if in debug mode
-    if (platform.config.debug) {
-      const opts = JSON.stringify({
-        disableDeviceLogging: this.disableDeviceLogging,
-        type: deviceConf.type
-      })
-      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
-    }
+    // Output the customised options to the log
+    const opts = JSON.stringify({
+      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
+      type: deviceConf.type
+    })
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
 
   async internalUpdate (value) {
@@ -71,7 +86,7 @@ module.exports = class deviceTapOne {
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.cacheState = value ? 'on' : 'off'
       this.service.updateCharacteristic(this.hapChar.InUse, value)
-      if (!this.disableDeviceLogging) {
+      if (this.enableLogging) {
         this.log(
           '[%s] %s [%s].',
           this.name,
@@ -111,7 +126,7 @@ module.exports = class deviceTapOne {
       }
       this.service.updateCharacteristic(this.hapChar.Active, this.cacheState === 'on' ? 1 : 0)
       this.service.updateCharacteristic(this.hapChar.InUse, this.cacheState === 'on' ? 1 : 0)
-      if (params.updateSource && !this.disableDeviceLogging) {
+      if (params.updateSource && this.enableLogging) {
         this.log(
           '[%s] %s [%s].',
           this.name,
diff --git a/lib/device/simulation/tap-two.js b/lib/device/simulation/tap-two.js
index 89ab5e61..5574d55b 100644
--- a/lib/device/simulation/tap-two.js
+++ b/lib/device/simulation/tap-two.js
@@ -18,9 +18,26 @@ module.exports = class deviceTapTwo {
 
     // Set up custom variables for this device type
     const deviceConf = platform.simulations[accessory.context.eweDeviceId]
-    this.disableDeviceLogging = deviceConf.overrideDisabledLogging
-      ? false
-      : platform.config.disableDeviceLogging
+
+    // Set the correct logging variables for this accessory
+    this.enableLogging = !platform.config.disableDeviceLogging
+    this.enableDebugLogging = platform.config.debug
+    if (deviceConf && deviceConf.overrideLogging) {
+      switch (deviceConf.overrideLogging) {
+        case 'standard':
+          this.enableLogging = true
+          this.enableDebugLogging = false
+          break
+        case 'debug':
+          this.enableLogging = true
+          this.enableDebugLogging = true
+          break
+        case 'disable':
+          this.enableLogging = false
+          this.enableDebugLogging = false
+          break
+      }
+    }
 
     // We want two tap services for this accessory
     ;['A', 'B'].forEach(v => {
@@ -39,14 +56,12 @@ module.exports = class deviceTapTwo {
       })
     })
 
-    // Output the customised options to the log if in debug mode
-    if (platform.config.debug) {
-      const opts = JSON.stringify({
-        disableDeviceLogging: this.disableDeviceLogging,
-        type: deviceConf.type
-      })
-      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
-    }
+    // Output the customised options to the log
+    const opts = JSON.stringify({
+      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
+      type: deviceConf.type
+    })
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
 
   async internalUpdate (tap, value) {
@@ -64,7 +79,7 @@ module.exports = class deviceTapTwo {
           break
       }
       tapService.updateCharacteristic(this.hapChar.InUse, value)
-      if (!this.disableDeviceLogging) {
+      if (this.enableLogging) {
         this.log(
           '[%s] %s [%s %s].',
           this.name,
@@ -99,7 +114,7 @@ module.exports = class deviceTapTwo {
           this.hapChar.InUse,
           params.switches[k].switch === 'on' ? 1 : 0
         )
-        if (params.updateSource && !this.disableDeviceLogging) {
+        if (params.updateSource && this.enableLogging) {
           this.log(
             '[%s] %s [Tap %s %s].',
             this.name,
diff --git a/lib/device/simulation/valve-four.js b/lib/device/simulation/valve-four.js
index 319df775..91c11243 100644
--- a/lib/device/simulation/valve-four.js
+++ b/lib/device/simulation/valve-four.js
@@ -18,9 +18,26 @@ module.exports = class deviceValveFour {
 
     // Set up custom variables for this device type
     const deviceConf = platform.simulations[accessory.context.eweDeviceId]
-    this.disableDeviceLogging = deviceConf.overrideDisabledLogging
-      ? false
-      : platform.config.disableDeviceLogging
+
+    // Set the correct logging variables for this accessory
+    this.enableLogging = !platform.config.disableDeviceLogging
+    this.enableDebugLogging = platform.config.debug
+    if (deviceConf && deviceConf.overrideLogging) {
+      switch (deviceConf.overrideLogging) {
+        case 'standard':
+          this.enableLogging = true
+          this.enableDebugLogging = false
+          break
+        case 'debug':
+          this.enableLogging = true
+          this.enableDebugLogging = true
+          break
+        case 'disable':
+          this.enableLogging = false
+          this.enableDebugLogging = false
+          break
+      }
+    }
 
     // We want four valve services for this accessory
     ;['A', 'B', 'C', 'D'].forEach(v => {
@@ -63,14 +80,12 @@ module.exports = class deviceValveFour {
       })
     })
 
-    // Output the customised options to the log if in debug mode
-    if (platform.config.debug) {
-      const opts = JSON.stringify({
-        disableDeviceLogging: this.disableDeviceLogging,
-        type: deviceConf.type
-      })
-      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
-    }
+    // Output the customised options to the log
+    const opts = JSON.stringify({
+      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
+      type: deviceConf.type
+    })
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
 
   async internalUpdate (valve, value) {
@@ -98,14 +113,14 @@ module.exports = class deviceValveFour {
         case 0:
           valveService.updateCharacteristic(this.hapChar.RemainingDuration, 0)
           clearTimeout(this.accessory.getService(valve).timer)
-          if (!this.disableDeviceLogging) {
+          if (this.enableLogging) {
             this.log('[%s] %s [%s %s].', this.name, this.lang.curState, valve, this.lang.valveNo)
           }
           break
         case 1: {
           const timer = valveService.getCharacteristic(this.hapChar.SetDuration).value
           valveService.updateCharacteristic(this.hapChar.RemainingDuration, timer)
-          if (!this.disableDeviceLogging) {
+          if (this.enableLogging) {
             this.log('[%s] %s [%s %s].', this.name, this.lang.curState, valve, this.lang.valveYes)
           }
           valveService.timer = setTimeout(() => {
@@ -138,7 +153,7 @@ module.exports = class deviceValveFour {
             valveService.updateCharacteristic(this.hapChar.Active, 1)
             valveService.updateCharacteristic(this.hapChar.InUse, 1)
             valveService.updateCharacteristic(this.hapChar.RemainingDuration, timer)
-            if (params.updateSource && !this.disableDeviceLogging) {
+            if (params.updateSource && this.enableLogging) {
               this.log(
                 '[%s] %s [Valve %s %s].',
                 this.name,
diff --git a/lib/device/simulation/valve-one.js b/lib/device/simulation/valve-one.js
index 72e0194a..45a5671e 100644
--- a/lib/device/simulation/valve-one.js
+++ b/lib/device/simulation/valve-one.js
@@ -18,9 +18,26 @@ module.exports = class deviceValveOne {
 
     // Set up custom variables for this device type
     const deviceConf = platform.simulations[accessory.context.eweDeviceId]
-    this.disableDeviceLogging = deviceConf.overrideDisabledLogging
-      ? false
-      : platform.config.disableDeviceLogging
+
+    // Set the correct logging variables for this accessory
+    this.enableLogging = !platform.config.disableDeviceLogging
+    this.enableDebugLogging = platform.config.debug
+    if (deviceConf && deviceConf.overrideLogging) {
+      switch (deviceConf.overrideLogging) {
+        case 'standard':
+          this.enableLogging = true
+          this.enableDebugLogging = false
+          break
+        case 'debug':
+          this.enableLogging = true
+          this.enableDebugLogging = true
+          break
+        case 'disable':
+          this.enableLogging = false
+          this.enableDebugLogging = false
+          break
+      }
+    }
 
     // If the accessory has a switch service then remove it
     if (this.accessory.getService(this.hapServ.Switch)) {
@@ -60,14 +77,12 @@ module.exports = class deviceValveOne {
       }
     })
 
-    // Output the customised options to the log if in debug mode
-    if (platform.config.debug) {
-      const opts = JSON.stringify({
-        disableDeviceLogging: this.disableDeviceLogging,
-        type: deviceConf.type
-      })
-      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
-    }
+    // Output the customised options to the log
+    const opts = JSON.stringify({
+      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
+      type: deviceConf.type
+    })
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
 
   async internalUpdate (value) {
@@ -94,14 +109,14 @@ module.exports = class deviceValveOne {
         case 0:
           this.service.updateCharacteristic(this.hapChar.RemainingDuration, 0)
           clearTimeout(this.timer)
-          if (!this.disableDeviceLogging) {
+          if (this.enableLogging) {
             this.log('[%s] %s [%s].', this.name, this.lang.curState, this.lang.valveNo)
           }
           break
         case 1: {
           const timer = this.service.getCharacteristic(this.hapChar.SetDuration).value
           this.service.updateCharacteristic(this.hapChar.RemainingDuration, timer)
-          if (!this.disableDeviceLogging) {
+          if (this.enableLogging) {
             this.log('[%s] %s [%s].', this.name, this.lang.curState, this.lang.valveYes)
           }
           this.timer = setTimeout(() => {
@@ -147,7 +162,7 @@ module.exports = class deviceValveOne {
             .updateCharacteristic(this.hapChar.Active, 1)
             .updateCharacteristic(this.hapChar.InUse, 1)
             .updateCharacteristic(this.hapChar.RemainingDuration, timer)
-          if (params.updateSource && !this.disableDeviceLogging) {
+          if (params.updateSource && this.enableLogging) {
             this.log('[%s] %s [%s].', this.name, this.lang.curState, this.lang.valveYes)
           }
           this.timer = setTimeout(() => {
diff --git a/lib/device/simulation/valve-two.js b/lib/device/simulation/valve-two.js
index ff4188e9..02655da4 100644
--- a/lib/device/simulation/valve-two.js
+++ b/lib/device/simulation/valve-two.js
@@ -18,9 +18,26 @@ module.exports = class deviceValveTwo {
 
     // Set up custom variables for this device type
     const deviceConf = platform.simulations[accessory.context.eweDeviceId]
-    this.disableDeviceLogging = deviceConf.overrideDisabledLogging
-      ? false
-      : platform.config.disableDeviceLogging
+
+    // Set the correct logging variables for this accessory
+    this.enableLogging = !platform.config.disableDeviceLogging
+    this.enableDebugLogging = platform.config.debug
+    if (deviceConf && deviceConf.overrideLogging) {
+      switch (deviceConf.overrideLogging) {
+        case 'standard':
+          this.enableLogging = true
+          this.enableDebugLogging = false
+          break
+        case 'debug':
+          this.enableLogging = true
+          this.enableDebugLogging = true
+          break
+        case 'disable':
+          this.enableLogging = false
+          this.enableDebugLogging = false
+          break
+      }
+    }
 
     // We want two valve services for this accessory
     ;['A', 'B'].forEach(v => {
@@ -63,14 +80,12 @@ module.exports = class deviceValveTwo {
       })
     })
 
-    // Output the customised options to the log if in debug mode
-    if (platform.config.debug) {
-      const opts = JSON.stringify({
-        disableDeviceLogging: this.disableDeviceLogging,
-        type: deviceConf.type
-      })
-      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
-    }
+    // Output the customised options to the log
+    const opts = JSON.stringify({
+      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
+      type: deviceConf.type
+    })
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
 
   async internalUpdate (valve, value) {
@@ -92,14 +107,14 @@ module.exports = class deviceValveTwo {
         case 0:
           valveService.updateCharacteristic(this.hapChar.RemainingDuration, 0)
           clearTimeout(this.accessory.getService(valve).timer)
-          if (!this.disableDeviceLogging) {
+          if (this.enableLogging) {
             this.log('[%s] %s [%s %s].', this.name, this.lang.curState, valve, this.lang.valveNo)
           }
           break
         case 1: {
           const timer = valveService.getCharacteristic(this.hapChar.SetDuration).value
           valveService.updateCharacteristic(this.hapChar.RemainingDuration, timer)
-          if (!this.disableDeviceLogging) {
+          if (this.enableLogging) {
             this.log('[%s] %s [%s %s].', this.name, this.lang.curState, valve, this.lang.valveYes)
           }
           valveService.timer = setTimeout(() => {
@@ -132,7 +147,7 @@ module.exports = class deviceValveTwo {
             valveService.updateCharacteristic(this.hapChar.Active, 1)
             valveService.updateCharacteristic(this.hapChar.InUse, 1)
             valveService.updateCharacteristic(this.hapChar.RemainingDuration, timer)
-            if (params.updateSource && !this.disableDeviceLogging) {
+            if (params.updateSource && this.enableLogging) {
               this.log(
                 '[%s] %s [Valve %s %s].',
                 this.name,
diff --git a/lib/device/simulation/window.js b/lib/device/simulation/window.js
index 938f90b5..232d01d2 100644
--- a/lib/device/simulation/window.js
+++ b/lib/device/simulation/window.js
@@ -21,10 +21,26 @@ module.exports = class deviceWindow {
     const deviceConf = platform.simulations[accessory.context.eweDeviceId]
     this.operationTimeUp = deviceConf.operationTime || platform.consts.defaultValues.operationTime
     this.operationTimeDown = deviceConf.operationTimeDown || this.operationTimeUp
-    this.disableDeviceLogging =
-      deviceConf && deviceConf.overrideDisabledLogging
-        ? false
-        : platform.config.disableDeviceLogging
+
+    // Set the correct logging variables for this accessory
+    this.enableLogging = !platform.config.disableDeviceLogging
+    this.enableDebugLogging = platform.config.debug
+    if (deviceConf && deviceConf.overrideLogging) {
+      switch (deviceConf.overrideLogging) {
+        case 'standard':
+          this.enableLogging = true
+          this.enableDebugLogging = false
+          break
+        case 'debug':
+          this.enableLogging = true
+          this.enableDebugLogging = true
+          break
+        case 'disable':
+          this.enableLogging = false
+          this.enableDebugLogging = false
+          break
+      }
+    }
 
     // Set up the accessory with default positions when added the first time
     if (!this.funcs.hasProperty(this.accessory.context, 'cacheCurrentPosition')) {
@@ -47,16 +63,14 @@ module.exports = class deviceWindow {
       this.internalPositionUpdate(value)
     })
 
-    // Output the customised options to the log if in debug mode
-    if (platform.config.debug) {
-      const opts = JSON.stringify({
-        disableDeviceLogging: this.disableDeviceLogging,
-        operationTimeDown: this.operationTimeDown,
-        operationTimeUp: this.operationTimeUp,
-        type: deviceConf.type
-      })
-      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
-    }
+    // Output the customised options to the log
+    const opts = JSON.stringify({
+      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
+      operationTimeDown: this.operationTimeDown,
+      operationTimeUp: this.operationTimeUp,
+      type: deviceConf.type
+    })
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
 
   async internalPositionUpdate (value) {
@@ -123,7 +137,7 @@ module.exports = class deviceWindow {
       this.service.updateCharacteristic(this.hapChar.CurrentPosition, value)
       this.accessory.context.cachePositionState = 2
       this.accessory.context.cacheCurrentPosition = value
-      if (!this.disableDeviceLogging) {
+      if (this.enableLogging) {
         this.log('[%s] %s [%s%]', this.name, this.lang.curPos, value)
       }
     } catch (err) {
diff --git a/lib/device/switch-double.js b/lib/device/switch-double.js
index 382cd581..9a2566de 100644
--- a/lib/device/switch-double.js
+++ b/lib/device/switch-double.js
@@ -22,10 +22,26 @@ module.exports = class deviceSwitchDouble {
     // Set up custom variables for this device type
     const deviceConf = platform.multiDevices[accessory.context.eweDeviceId]
     this.hideChannels = deviceConf && deviceConf.hideChannels ? deviceConf.hideChannels : undefined
-    this.disableDeviceLogging =
-      deviceConf && deviceConf.overrideDisabledLogging
-        ? false
-        : platform.config.disableDeviceLogging
+
+    // Set the correct logging variables for this accessory
+    this.enableLogging = !platform.config.disableDeviceLogging
+    this.enableDebugLogging = platform.config.debug
+    if (deviceConf && deviceConf.overrideLogging) {
+      switch (deviceConf.overrideLogging) {
+        case 'standard':
+          this.enableLogging = true
+          this.enableDebugLogging = false
+          break
+        case 'debug':
+          this.enableLogging = true
+          this.enableDebugLogging = true
+          break
+        case 'disable':
+          this.enableLogging = false
+          this.enableDebugLogging = false
+          break
+      }
+    }
 
     // If the accessory has an outlet service then remove it
     if (this.accessory.getService(this.hapServ.Outlet)) {
@@ -47,11 +63,11 @@ module.exports = class deviceSwitchDouble {
       log: platform.config.debugFakegato ? this.log : () => {}
     })
 
-    // Output the customised options to the log if in debug mode
-    if (platform.config.debug) {
+    // Output the customised options to the log
+    if (accessory.context.switchNumber === '0') {
       const opts = JSON.stringify({
-        disableDeviceLogging: this.disableDeviceLogging,
-        hideChannels: this.hideChannels
+        hideChannels: this.hideChannels,
+        logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable'
       })
       this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
     }
@@ -89,7 +105,7 @@ module.exports = class deviceSwitchDouble {
                 .getService(this.hapServ.Switch)
                 .updateCharacteristic(this.hapChar.On, value)
               subAccessory.eveService.addEntry({ status: value ? 1 : 0 })
-              if (i > 0 && !this.disableDeviceLogging) {
+              if (i > 0 && this.enableLogging) {
                 this.log(
                   '[%s] %s [%s].',
                   subAccessory.displayName,
@@ -112,7 +128,7 @@ module.exports = class deviceSwitchDouble {
                   primaryState = true
                 }
                 subAccessory.eveService.addEntry({ status: value ? 1 : 0 })
-                if (i > 0 && !this.disableDeviceLogging) {
+                if (i > 0 && this.enableLogging) {
                   this.log(
                     '[%s] %s [%s].',
                     subAccessory.displayName,
@@ -173,7 +189,7 @@ module.exports = class deviceSwitchDouble {
           subAccessory.eveService.addEntry({
             status: params.switches[i - 1].switch === 'on' ? 1 : 0
           })
-          if (params.updateSource && !this.disableDeviceLogging) {
+          if (params.updateSource && this.enableLogging) {
             this.log(
               '[%s] %s [%s].',
               subAccessory.displayName,
diff --git a/lib/device/switch-multi.js b/lib/device/switch-multi.js
index 35f9a468..59c2ebee 100644
--- a/lib/device/switch-multi.js
+++ b/lib/device/switch-multi.js
@@ -21,10 +21,26 @@ module.exports = class deviceSwitchMulti {
     // Set up custom variables for this device type
     const deviceConf = platform.multiDevices[accessory.context.eweDeviceId]
     this.hideChannels = deviceConf && deviceConf.hideChannels ? deviceConf.hideChannels : undefined
-    this.disableDeviceLogging =
-      deviceConf && deviceConf.overrideDisabledLogging
-        ? false
-        : platform.config.disableDeviceLogging
+
+    // Set the correct logging variables for this accessory
+    this.enableLogging = !platform.config.disableDeviceLogging
+    this.enableDebugLogging = platform.config.debug
+    if (deviceConf && deviceConf.overrideLogging) {
+      switch (deviceConf.overrideLogging) {
+        case 'standard':
+          this.enableLogging = true
+          this.enableDebugLogging = false
+          break
+        case 'debug':
+          this.enableLogging = true
+          this.enableDebugLogging = true
+          break
+        case 'disable':
+          this.enableLogging = false
+          this.enableDebugLogging = false
+          break
+      }
+    }
 
     // If the accessory has an outlet service then remove it
     if (this.accessory.getService(this.hapServ.Outlet)) {
@@ -46,11 +62,11 @@ module.exports = class deviceSwitchMulti {
       log: platform.config.debugFakegato ? this.log : () => {}
     })
 
-    // Output the customised options to the log if in debug mode
-    if (platform.config.debug) {
+    // Output the customised options to the log
+    if (accessory.context.switchNumber === '0') {
       const opts = JSON.stringify({
-        disableDeviceLogging: this.disableDeviceLogging,
-        hideChannels: this.hideChannels
+        hideChannels: this.hideChannels,
+        logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable'
       })
       this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
     }
@@ -92,7 +108,7 @@ module.exports = class deviceSwitchMulti {
                 .getService(this.hapServ.Switch)
                 .updateCharacteristic(this.hapChar.On, value)
               subAccessory.eveService.addEntry({ status: value ? 1 : 0 })
-              if (i > 0 && !this.disableDeviceLogging) {
+              if (i > 0 && this.enableLogging) {
                 this.log(
                   '[%s] %s [%s].',
                   subAccessory.displayName,
@@ -117,7 +133,7 @@ module.exports = class deviceSwitchMulti {
                   primaryState = true
                 }
                 subAccessory.eveService.addEntry({ status: value ? 1 : 0 })
-                if (i > 0 && !this.disableDeviceLogging) {
+                if (i > 0 && this.enableLogging) {
                   this.log(
                     '[%s] %s [%s].',
                     subAccessory.displayName,
@@ -178,7 +194,7 @@ module.exports = class deviceSwitchMulti {
           subAccessory.eveService.addEntry({
             status: params.switches[i - 1].switch === 'on' ? 1 : 0
           })
-          if (params.updateSource && !this.disableDeviceLogging) {
+          if (params.updateSource && this.enableLogging) {
             this.log(
               '[%s] %s [%s].',
               subAccessory.displayName,
diff --git a/lib/device/switch-scm.js b/lib/device/switch-scm.js
index 80b77437..6b029355 100644
--- a/lib/device/switch-scm.js
+++ b/lib/device/switch-scm.js
@@ -18,10 +18,25 @@ module.exports = class deviceSwitchSCM {
 
     // Set up custom variables for this device type
     const deviceConf = platform.outletDevices[accessory.context.eweDeviceId]
-    this.disableDeviceLogging =
-      deviceConf && deviceConf.overrideDisabledLogging
-        ? false
-        : platform.config.disableDeviceLogging
+    // Set the correct logging variables for this accessory
+    this.enableLogging = !platform.config.disableDeviceLogging
+    this.enableDebugLogging = platform.config.debug
+    if (deviceConf && deviceConf.overrideLogging) {
+      switch (deviceConf.overrideLogging) {
+        case 'standard':
+          this.enableLogging = true
+          this.enableDebugLogging = false
+          break
+        case 'debug':
+          this.enableLogging = true
+          this.enableDebugLogging = true
+          break
+        case 'disable':
+          this.enableLogging = false
+          this.enableDebugLogging = false
+          break
+      }
+    }
 
     // User has chosen switch so if the accessory has an outlet service then remove it
     if (this.accessory.getService(this.hapServ.Outlet)) {
@@ -38,13 +53,11 @@ module.exports = class deviceSwitchSCM {
       await this.internalStateUpdate(value)
     })
 
-    // Output the customised options to the log if in debug mode
-    if (platform.config.debug) {
-      const opts = JSON.stringify({
-        disableDeviceLogging: this.disableDeviceLogging
-      })
-      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
-    }
+    // Output the customised options to the log
+    const opts = JSON.stringify({
+      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable'
+    })
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
 
   async internalStateUpdate (value) {
@@ -58,7 +71,7 @@ module.exports = class deviceSwitchSCM {
       }
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.cacheState = newValue
-      if (!this.disableDeviceLogging) {
+      if (this.enableLogging) {
         this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
       }
     } catch (err) {
@@ -78,7 +91,7 @@ module.exports = class deviceSwitchSCM {
       const newStatus = params.switches[0].switch === 'on'
       this.service.updateCharacteristic(this.hapChar.On, newStatus)
       this.cacheState = params.switches[0].switch
-      if (params.updateSource && !this.disableDeviceLogging) {
+      if (params.updateSource && this.enableLogging) {
         this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
       }
     } catch (err) {
diff --git a/lib/device/switch-single.js b/lib/device/switch-single.js
index 88015215..36f5d1d1 100644
--- a/lib/device/switch-single.js
+++ b/lib/device/switch-single.js
@@ -18,10 +18,26 @@ module.exports = class deviceSwitchSingle {
 
     // Set up custom variables for this device type
     const deviceConf = platform.singleDevices[accessory.context.eweDeviceId]
-    this.disableDeviceLogging =
-      deviceConf && deviceConf.overrideDisabledLogging
-        ? false
-        : platform.config.disableDeviceLogging
+
+    // Set the correct logging variables for this accessory
+    this.enableLogging = !platform.config.disableDeviceLogging
+    this.enableDebugLogging = platform.config.debug
+    if (deviceConf && deviceConf.overrideLogging) {
+      switch (deviceConf.overrideLogging) {
+        case 'standard':
+          this.enableLogging = true
+          this.enableDebugLogging = false
+          break
+        case 'debug':
+          this.enableLogging = true
+          this.enableDebugLogging = true
+          break
+        case 'disable':
+          this.enableLogging = false
+          this.enableDebugLogging = false
+          break
+      }
+    }
 
     // If the accessory has a outlet service then remove it
     if (this.accessory.getService(this.hapServ.Outlet)) {
@@ -43,13 +59,11 @@ module.exports = class deviceSwitchSingle {
       log: platform.config.debugFakegato ? this.log : () => {}
     })
 
-    // Output the customised options to the log if in debug mode
-    if (platform.config.debug) {
-      const opts = JSON.stringify({
-        disableDeviceLogging: this.disableDeviceLogging
-      })
-      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
-    }
+    // Output the customised options to the log
+    const opts = JSON.stringify({
+      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable'
+    })
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
 
   async internalStateUpdate (value) {
@@ -63,7 +77,7 @@ module.exports = class deviceSwitchSingle {
       })
       this.cacheState = newValue
       this.accessory.eveService.addEntry({ status: value ? 1 : 0 })
-      if (!this.disableDeviceLogging) {
+      if (this.enableLogging) {
         this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
       }
     } catch (err) {
@@ -84,7 +98,7 @@ module.exports = class deviceSwitchSingle {
       this.service.updateCharacteristic(this.hapChar.On, newStatus)
       this.cacheState = params.switch
       this.accessory.eveService.addEntry({ status: newStatus ? 1 : 0 })
-      if (params.updateSource && !this.disableDeviceLogging) {
+      if (params.updateSource && this.enableLogging) {
         this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
       }
     } catch (err) {
diff --git a/lib/device/thermostat.js b/lib/device/thermostat.js
index c5b6a305..88c11321 100644
--- a/lib/device/thermostat.js
+++ b/lib/device/thermostat.js
@@ -21,10 +21,26 @@ module.exports = class deviceThermostat {
     const deviceConf = platform.thDevices[accessory.context.eweDeviceId]
     this.tempOffset =
       deviceConf && deviceConf.offset ? deviceConf.offset : platform.consts.defaultValues.offset
-    this.disableDeviceLogging =
-      deviceConf && deviceConf.overrideDisabledLogging
-        ? false
-        : platform.config.disableDeviceLogging
+
+    // Set the correct logging variables for this accessory
+    this.enableLogging = !platform.config.disableDeviceLogging
+    this.enableDebugLogging = platform.config.debug
+    if (deviceConf && deviceConf.overrideLogging) {
+      switch (deviceConf.overrideLogging) {
+        case 'standard':
+          this.enableLogging = true
+          this.enableDebugLogging = false
+          break
+        case 'debug':
+          this.enableLogging = true
+          this.enableDebugLogging = true
+          break
+        case 'disable':
+          this.enableLogging = false
+          this.enableDebugLogging = false
+          break
+      }
+    }
 
     /*
       **************
@@ -87,14 +103,12 @@ module.exports = class deviceThermostat {
       log: platform.config.debugFakegato ? this.log : () => {}
     })
 
-    // Output the customised options to the log if in debug mode
-    if (platform.config.debug) {
-      const opts = JSON.stringify({
-        disableDeviceLogging: this.disableDeviceLogging,
-        offset: this.tempOffset
-      })
-      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
-    }
+    // Output the customised options to the log
+    const opts = JSON.stringify({
+      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
+      offset: this.tempOffset
+    })
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
 
   async internalStateUpdate (value) {
@@ -108,7 +122,7 @@ module.exports = class deviceThermostat {
         this.service.updateCharacteristic(this.hapChar.CurrentHeatingCoolingState, 0)
       }
       this.cacheState = newValue
-      if (!this.disableDeviceLogging) {
+      if (this.enableLogging) {
         this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
       }
     } catch (err) {
@@ -132,7 +146,7 @@ module.exports = class deviceThermostat {
       }
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.cacheTarg = value
-      if (!this.disableDeviceLogging) {
+      if (this.enableLogging) {
         this.log('[%s] %s [%s°C].', this.name, this.lang.curTarg, this.cacheTarg)
       }
     } catch (err) {
@@ -155,7 +169,7 @@ module.exports = class deviceThermostat {
           this.hapChar.TargetHeatingCoolingState,
           this.cacheState === 'on' ? 1 : 0
         )
-        if (params.updateSource && !this.disableDeviceLogging) {
+        if (params.updateSource && this.enableLogging) {
           this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
         }
       }
@@ -168,7 +182,7 @@ module.exports = class deviceThermostat {
             this.hapChar.CurrentHeatingCoolingState,
             this.cacheHeat === 'on' ? 1 : 0
           )
-          if (params.updateSource && !this.disableDeviceLogging) {
+          if (params.updateSource && this.enableLogging) {
             this.log('[%s] %s [%s].', this.name, this.lang.curHeat, this.cacheHeat)
           }
         }
@@ -179,7 +193,7 @@ module.exports = class deviceThermostat {
         if (this.cacheTarg !== targetTemp) {
           this.cacheTarg = targetTemp
           this.service.updateCharacteristic(this.hapChar.TargetTemperature, this.cacheTarg)
-          if (params.updateSource && !this.disableDeviceLogging) {
+          if (params.updateSource && this.enableLogging) {
             this.log('[%s] %s [%s°C].', this.name, this.lang.curTarg, this.cacheTarg)
           }
         }
@@ -200,7 +214,7 @@ module.exports = class deviceThermostat {
         if (this.cacheTemp !== currentTemp) {
           this.cacheTemp = currentTemp
           this.service.updateCharacteristic(this.hapChar.CurrentTemperature, this.cacheTemp)
-          if (params.updateSource && !this.disableDeviceLogging) {
+          if (params.updateSource && this.enableLogging) {
             this.log('[%s] %s [%s°C].', this.name, this.lang.curTemp, this.cacheTemp)
           }
         }
diff --git a/lib/device/zigbee/light-cct.js b/lib/device/zigbee/light-cct.js
index e4d7c23b..c0f5dc18 100644
--- a/lib/device/zigbee/light-cct.js
+++ b/lib/device/zigbee/light-cct.js
@@ -27,10 +27,26 @@ module.exports = class deviceZBLightCCT {
       deviceConf && deviceConf.adaptiveLightingShift
         ? deviceConf.adaptiveLightingShift
         : platform.consts.defaultValues.adaptiveLightingShift
-    this.disableDeviceLogging =
-      deviceConf && deviceConf.overrideDisabledLogging
-        ? false
-        : platform.config.disableDeviceLogging
+
+    // Set the correct logging variables for this accessory
+    this.enableLogging = !platform.config.disableDeviceLogging
+    this.enableDebugLogging = platform.config.debug
+    if (deviceConf && deviceConf.overrideLogging) {
+      switch (deviceConf.overrideLogging) {
+        case 'standard':
+          this.enableLogging = true
+          this.enableDebugLogging = false
+          break
+        case 'debug':
+          this.enableLogging = true
+          this.enableDebugLogging = true
+          break
+        case 'disable':
+          this.enableLogging = false
+          this.enableDebugLogging = false
+          break
+      }
+    }
 
     // Different bulbs have different colour temperature ranges
     this.minK = 2200
@@ -77,15 +93,13 @@ module.exports = class deviceZBLightCCT {
     })
     this.accessory.configureController(this.accessory.alController)
 
-    // Output the customised options to the log if in debug mode
-    if (platform.config.debug) {
-      const opts = JSON.stringify({
-        adaptiveLightingShift: this.alShift,
-        brightnessStep: this.brightStep,
-        disableDeviceLogging: this.disableDeviceLogging
-      })
-      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
-    }
+    // Output the customised options to the log
+    const opts = JSON.stringify({
+      adaptiveLightingShift: this.alShift,
+      brightnessStep: this.brightStep,
+      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable'
+    })
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
 
   async internalStateUpdate (value) {
@@ -95,7 +109,7 @@ module.exports = class deviceZBLightCCT {
         switch: newValue
       })
       this.cacheState = newValue
-      if (!this.disableDeviceLogging) {
+      if (this.enableLogging) {
         this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
       }
     } catch (err) {
@@ -126,7 +140,7 @@ module.exports = class deviceZBLightCCT {
       }
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.cacheBright = value
-      if (!this.disableDeviceLogging) {
+      if (this.enableLogging) {
         this.log('[%s] %s [%s%].', this.name, this.lang.curBright, this.cacheBright)
       }
     } catch (err) {
@@ -164,7 +178,7 @@ module.exports = class deviceZBLightCCT {
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.cacheMired = value
       this.cacheCT = scaledCT
-      if (!this.disableDeviceLogging) {
+      if (this.enableLogging) {
         if (this.accessory.alController.isAdaptiveLightingActive()) {
           this.log('[%s] %s [%sK] %s.', this.name, this.lang.curColour, scaledK, this.lang.viaAL)
         } else {
@@ -185,7 +199,7 @@ module.exports = class deviceZBLightCCT {
       if (params.switch && params.switch !== this.cacheState) {
         this.cacheState = params.switch
         this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
-        if (params.updateSource && !this.disableDeviceLogging) {
+        if (params.updateSource && this.enableLogging) {
           this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
         }
       }
@@ -193,7 +207,7 @@ module.exports = class deviceZBLightCCT {
         if (params.brightness !== this.cacheBright) {
           this.cacheBright = params.brightness
           this.service.updateCharacteristic(this.hapChar.Brightness, this.cacheBright)
-          if (params.updateSource && !this.disableDeviceLogging) {
+          if (params.updateSource && this.enableLogging) {
             this.log('[%s] %s [%s%].', this.name, this.lang.curBright, this.cacheBright)
           }
         }
@@ -207,13 +221,13 @@ module.exports = class deviceZBLightCCT {
           this.cacheMired = Math.min(Math.max(Math.round(1000000 / scaledK), 140), 500)
           this.service.updateCharacteristic(this.hapChar.ColorTemperature, this.cacheMired)
           if (params.updateSource) {
-            if (!this.disableDeviceLogging) {
+            if (this.enableLogging) {
               this.log('[%s] %s [%sK].', this.name, this.lang.curColour, scaledK)
             }
             if (this.accessory.alController.isAdaptiveLightingActive() && ctDiff > 20) {
               // Look for a variation greater than twenty
               this.accessory.alController.disableAdaptiveLighting()
-              if (!this.disableDeviceLogging) {
+              if (this.enableLogging) {
                 this.log('[%s] %s.', this.name, this.lang.disabledAL)
               }
             }
diff --git a/lib/device/zigbee/light-dimmer.js b/lib/device/zigbee/light-dimmer.js
index 9d431110..aca7d981 100644
--- a/lib/device/zigbee/light-dimmer.js
+++ b/lib/device/zigbee/light-dimmer.js
@@ -23,10 +23,26 @@ module.exports = class deviceZBLightDimmer {
       deviceConf && deviceConf.brightnessStep
         ? Math.min(deviceConf.brightnessStep, 100)
         : platform.consts.defaultValues.brightnessStep
-    this.disableDeviceLogging =
-      deviceConf && deviceConf.overrideDisabledLogging
-        ? false
-        : platform.config.disableDeviceLogging
+
+    // Set the correct logging variables for this accessory
+    this.enableLogging = !platform.config.disableDeviceLogging
+    this.enableDebugLogging = platform.config.debug
+    if (deviceConf && deviceConf.overrideLogging) {
+      switch (deviceConf.overrideLogging) {
+        case 'standard':
+          this.enableLogging = true
+          this.enableDebugLogging = false
+          break
+        case 'debug':
+          this.enableLogging = true
+          this.enableDebugLogging = true
+          break
+        case 'disable':
+          this.enableLogging = false
+          this.enableDebugLogging = false
+          break
+      }
+    }
 
     // Add the lightbulb service if it doesn't already exist
     this.service =
@@ -55,14 +71,12 @@ module.exports = class deviceZBLightDimmer {
         await this.internalBrightnessUpdate(value)
       })
 
-    // Output the customised options to the log if in debug mode
-    if (platform.config.debug) {
-      const opts = JSON.stringify({
-        brightnessStep: this.brightStep,
-        disableDeviceLogging: this.disableDeviceLogging
-      })
-      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
-    }
+    // Output the customised options to the log
+    const opts = JSON.stringify({
+      brightnessStep: this.brightStep,
+      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable'
+    })
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
 
   async internalStateUpdate (value) {
@@ -72,7 +86,7 @@ module.exports = class deviceZBLightDimmer {
         switch: newValue
       })
       this.cacheState = newValue
-      if (!this.disableDeviceLogging) {
+      if (this.enableLogging) {
         this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
       }
     } catch (err) {
@@ -103,7 +117,7 @@ module.exports = class deviceZBLightDimmer {
       }
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.cacheBright = value
-      if (!this.disableDeviceLogging) {
+      if (this.enableLogging) {
         this.log('[%s] %s [%s%].', this.name, this.lang.curBright, this.cacheBright)
       }
     } catch (err) {
@@ -120,7 +134,7 @@ module.exports = class deviceZBLightDimmer {
       if (params.switch && params.switch !== this.cacheState) {
         this.cacheState = params.switch
         this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
-        if (params.updateSource && !this.disableDeviceLogging) {
+        if (params.updateSource && this.enableLogging) {
           this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
         }
       }
@@ -128,7 +142,7 @@ module.exports = class deviceZBLightDimmer {
         if (params.brightness !== this.cacheBright) {
           this.cacheBright = params.brightness
           this.service.updateCharacteristic(this.hapChar.Brightness, this.cacheBright)
-          if (params.updateSource && !this.disableDeviceLogging) {
+          if (params.updateSource && this.enableLogging) {
             this.log('[%s] %s [%s%].', this.name, this.lang.curBright, this.cacheBright)
           }
         }
diff --git a/lib/device/zigbee/sensor-ambient.js b/lib/device/zigbee/sensor-ambient.js
index 447dd417..824077e3 100644
--- a/lib/device/zigbee/sensor-ambient.js
+++ b/lib/device/zigbee/sensor-ambient.js
@@ -28,10 +28,26 @@ module.exports = class deviceZBSensorAmbient {
       deviceConf && deviceConf.humidityOffset
         ? deviceConf.humidityOffset
         : platform.consts.defaultValues.humidityOffset
-    this.disableDeviceLogging =
-      deviceConf && deviceConf.overrideDisabledLogging
-        ? false
-        : platform.config.disableDeviceLogging
+
+    // Set the correct logging variables for this accessory
+    this.enableLogging = !platform.config.disableDeviceLogging
+    this.enableDebugLogging = platform.config.debug
+    if (deviceConf && deviceConf.overrideLogging) {
+      switch (deviceConf.overrideLogging) {
+        case 'standard':
+          this.enableLogging = true
+          this.enableDebugLogging = false
+          break
+        case 'debug':
+          this.enableLogging = true
+          this.enableDebugLogging = true
+          break
+        case 'disable':
+          this.enableLogging = false
+          this.enableDebugLogging = false
+          break
+      }
+    }
 
     // Add the temperature sensor service if it doesn't already exist
     this.tempService =
@@ -58,16 +74,14 @@ module.exports = class deviceZBSensorAmbient {
       log: platform.config.debugFakegato ? this.log : () => {}
     })
 
-    // Output the customised options to the log if in debug mode
-    if (platform.config.debug) {
-      const opts = JSON.stringify({
-        disableDeviceLogging: this.disableDeviceLogging,
-        humidityOffset: this.humiOffset,
-        lowBattThreshold: this.lowBattThreshold,
-        offset: this.tempOffset
-      })
-      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
-    }
+    // Output the customised options to the log
+    const opts = JSON.stringify({
+      humidityOffset: this.humiOffset,
+      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
+      lowBattThreshold: this.lowBattThreshold,
+      offset: this.tempOffset
+    })
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
 
   async externalUpdate (params) {
@@ -80,7 +94,7 @@ module.exports = class deviceZBSensorAmbient {
           this.hapChar.StatusLowBattery,
           this.cacheBattScaled < this.lowBattThreshold
         )
-        if (params.updateSource && !this.disableDeviceLogging) {
+        if (params.updateSource && this.enableLogging) {
           this.log('[%s] %s [%s%].', this.name, this.lang.curBatt, this.cacheBattScaled)
         }
       }
@@ -93,7 +107,7 @@ module.exports = class deviceZBSensorAmbient {
         this.cacheTemp = parseInt(this.cacheTemp) / 100 + this.tempOffset
         this.tempService.updateCharacteristic(this.hapChar.CurrentTemperature, this.cacheTemp)
         eveLog.temp = this.cacheTemp
-        if (params.updateSource && !this.disableDeviceLogging) {
+        if (params.updateSource && this.enableLogging) {
           this.log('[%s] %s [%s°C].', this.name, this.lang.curTemp, this.cacheTemp)
         }
       }
@@ -105,7 +119,7 @@ module.exports = class deviceZBSensorAmbient {
         )
         this.humiService.updateCharacteristic(this.hapChar.CurrentRelativeHumidity, this.cacheHumi)
         eveLog.humidity = this.cacheHumi
-        if (params.updateSource && !this.disableDeviceLogging) {
+        if (params.updateSource && this.enableLogging) {
           this.log('[%s] %s [%s%].', this.name, this.lang.curHumi, this.cacheHumi)
         }
       }
diff --git a/lib/device/zigbee/sensor-contact.js b/lib/device/zigbee/sensor-contact.js
index 257383e1..69a30f57 100644
--- a/lib/device/zigbee/sensor-contact.js
+++ b/lib/device/zigbee/sensor-contact.js
@@ -25,10 +25,26 @@ module.exports = class deviceZBSensorContact {
       deviceConf && deviceConf.lowBattThreshold
         ? Math.min(deviceConf.lowBattThreshold, 100)
         : platform.consts.defaultValues.lowBattThreshold
-    this.disableDeviceLogging =
-      deviceConf && deviceConf.overrideDisabledLogging
-        ? false
-        : platform.config.disableDeviceLogging
+
+    // Set the correct logging variables for this accessory
+    this.enableLogging = !platform.config.disableDeviceLogging
+    this.enableDebugLogging = platform.config.debug
+    if (deviceConf && deviceConf.overrideLogging) {
+      switch (deviceConf.overrideLogging) {
+        case 'standard':
+          this.enableLogging = true
+          this.enableDebugLogging = false
+          break
+        case 'debug':
+          this.enableLogging = true
+          this.enableDebugLogging = true
+          break
+        case 'disable':
+          this.enableLogging = false
+          this.enableDebugLogging = false
+          break
+      }
+    }
 
     // Add the contact sensor service if it doesn't already exist
     if (!(this.service = this.accessory.getService(this.hapServ.ContactSensor))) {
@@ -59,15 +75,13 @@ module.exports = class deviceZBSensorContact {
       log: platform.config.debugFakegato ? this.log : () => {}
     })
 
-    // Output the customised options to the log if in debug mode
-    if (platform.config.debug) {
-      const opts = JSON.stringify({
-        disableDeviceLogging: this.disableDeviceLogging,
-        lowBattThreshold: this.lowBattThreshold,
-        scaleBattery: this.scaleBattery
-      })
-      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
-    }
+    // Output the customised options to the log
+    const opts = JSON.stringify({
+      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
+      lowBattThreshold: this.lowBattThreshold,
+      scaleBattery: this.scaleBattery
+    })
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
 
   async externalUpdate (params) {
@@ -81,7 +95,7 @@ module.exports = class deviceZBSensorContact {
           this.hapChar.StatusLowBattery,
           this.cacheBattScaled < this.lowBattThreshold
         )
-        if (params.updateSource && !this.disableDeviceLogging) {
+        if (params.updateSource && this.enableLogging) {
           this.log('[%s] %s [%s%].', this.name, this.lang.curBatt, this.cacheBattScaled)
         }
       }
@@ -100,7 +114,7 @@ module.exports = class deviceZBSensorContact {
           this.service.updateCharacteristic(this.hapChar.ContactSensorState, 0)
           this.accessory.eveService.addEntry({ status: 0 })
         }
-        if (params.updateSource && !this.disableDeviceLogging) {
+        if (params.updateSource && this.enableLogging) {
           this.log(
             '[%s] %s [%s].',
             this.name,
diff --git a/lib/device/zigbee/sensor-motion.js b/lib/device/zigbee/sensor-motion.js
index 37400f67..96ec9c5d 100644
--- a/lib/device/zigbee/sensor-motion.js
+++ b/lib/device/zigbee/sensor-motion.js
@@ -27,10 +27,26 @@ module.exports = class deviceZBSensorMotion {
       deviceConf && deviceConf.sensorTimeDifference
         ? deviceConf.sensorTimeDifference
         : platform.consts.defaultValues.sensorTimeDifference
-    this.disableDeviceLogging =
-      deviceConf && deviceConf.overrideDisabledLogging
-        ? false
-        : platform.config.disableDeviceLogging
+
+    // Set the correct logging variables for this accessory
+    this.enableLogging = !platform.config.disableDeviceLogging
+    this.enableDebugLogging = platform.config.debug
+    if (deviceConf && deviceConf.overrideLogging) {
+      switch (deviceConf.overrideLogging) {
+        case 'standard':
+          this.enableLogging = true
+          this.enableDebugLogging = false
+          break
+        case 'debug':
+          this.enableLogging = true
+          this.enableDebugLogging = true
+          break
+        case 'disable':
+          this.enableLogging = false
+          this.enableDebugLogging = false
+          break
+      }
+    }
 
     // Add the motion sensor service if it doesn't already exist
     if (!(this.service = this.accessory.getService(this.hapServ.MotionSensor))) {
@@ -48,15 +64,13 @@ module.exports = class deviceZBSensorMotion {
       log: platform.config.debugFakegato ? this.log : () => {}
     })
 
-    // Output the customised options to the log if in debug mode
-    if (platform.config.debug) {
-      const opts = JSON.stringify({
-        disableDeviceLogging: this.disableDeviceLogging,
-        lowBattThreshold: this.lowBattThreshold,
-        sensorTimeDifference: this.sensorTimeDifference
-      })
-      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
-    }
+    // Output the customised options to the log
+    const opts = JSON.stringify({
+      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
+      lowBattThreshold: this.lowBattThreshold,
+      sensorTimeDifference: this.sensorTimeDifference
+    })
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
 
   async externalUpdate (params) {
@@ -69,7 +83,7 @@ module.exports = class deviceZBSensorMotion {
           this.hapChar.StatusLowBattery,
           this.cacheBattScaled < this.lowBattThreshold
         )
-        if (params.updateSource && !this.disableDeviceLogging) {
+        if (params.updateSource && this.enableLogging) {
           this.log('[%s] %s [%s%].', this.name, this.lang.curBatt, this.cacheBattScaled)
         }
       }
@@ -89,7 +103,7 @@ module.exports = class deviceZBSensorMotion {
           )
         }
         this.accessory.eveService.addEntry({ status: motionDetected ? 1 : 0 })
-        if (params.updateSource && !this.disableDeviceLogging) {
+        if (params.updateSource && this.enableLogging) {
           this.log(
             '[%s] %s [%s].',
             this.name,
diff --git a/lib/device/zigbee/switch-single.js b/lib/device/zigbee/switch-single.js
index dcf57f8f..757944c5 100644
--- a/lib/device/zigbee/switch-single.js
+++ b/lib/device/zigbee/switch-single.js
@@ -18,10 +18,26 @@ module.exports = class deviceZBSwitchSingle {
 
     // Set up custom variables for this device type
     const deviceConf = platform.singleDevices[accessory.context.eweDeviceId]
-    this.disableDeviceLogging =
-      deviceConf && deviceConf.overrideDisabledLogging
-        ? false
-        : platform.config.disableDeviceLogging
+
+    // Set the correct logging variables for this accessory
+    this.enableLogging = !platform.config.disableDeviceLogging
+    this.enableDebugLogging = platform.config.debug
+    if (deviceConf && deviceConf.overrideLogging) {
+      switch (deviceConf.overrideLogging) {
+        case 'standard':
+          this.enableLogging = true
+          this.enableDebugLogging = false
+          break
+        case 'debug':
+          this.enableLogging = true
+          this.enableDebugLogging = true
+          break
+        case 'disable':
+          this.enableLogging = false
+          this.enableDebugLogging = false
+          break
+      }
+    }
 
     // Add the switch service if it doesn't already exist
     this.service =
@@ -47,13 +63,11 @@ module.exports = class deviceZBSwitchSingle {
       log: platform.config.debugFakegato ? this.log : () => {}
     })
 
-    // Output the customised options to the log if in debug mode
-    if (platform.config.debug) {
-      const opts = JSON.stringify({
-        disableDeviceLogging: this.disableDeviceLogging
-      })
-      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
-    }
+    // Output the customised options to the log
+    const opts = JSON.stringify({
+      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable'
+    })
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
 
   async internalStateUpdate (value) {
@@ -67,7 +81,7 @@ module.exports = class deviceZBSwitchSingle {
       })
       this.cacheState = newValue
       this.accessory.eveService.addEntry({ status: value ? 1 : 0 })
-      if (!this.disableDeviceLogging) {
+      if (this.enableLogging) {
         this.log('[%s] %s [%s].', this.name, this.lang.curState, newValue)
       }
     } catch (err) {
@@ -89,7 +103,7 @@ module.exports = class deviceZBSwitchSingle {
       this.accessory.eveService.addEntry({
         status: this.cacheState === 'on' ? 1 : 0
       })
-      if (params.updateSource && !this.disableDeviceLogging) {
+      if (params.updateSource && this.enableLogging) {
         this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
       }
     } catch (err) {
diff --git a/lib/device/zigbee/switch-stateless.js b/lib/device/zigbee/switch-stateless.js
index 086f7924..93031e61 100644
--- a/lib/device/zigbee/switch-stateless.js
+++ b/lib/device/zigbee/switch-stateless.js
@@ -27,10 +27,26 @@ module.exports = class deviceZBSwitchStateless {
       deviceConf && deviceConf.sensorTimeDifference
         ? deviceConf.sensorTimeDifference
         : platform.consts.defaultValues.sensorTimeDifference
-    this.disableDeviceLogging =
-      deviceConf && deviceConf.overrideDisabledLogging
-        ? false
-        : platform.config.disableDeviceLogging
+
+    // Set the correct logging variables for this accessory
+    this.enableLogging = !platform.config.disableDeviceLogging
+    this.enableDebugLogging = platform.config.debug
+    if (deviceConf && deviceConf.overrideLogging) {
+      switch (deviceConf.overrideLogging) {
+        case 'standard':
+          this.enableLogging = true
+          this.enableDebugLogging = false
+          break
+        case 'debug':
+          this.enableLogging = true
+          this.enableDebugLogging = true
+          break
+        case 'disable':
+          this.enableLogging = false
+          this.enableDebugLogging = false
+          break
+      }
+    }
 
     // Add the stateless switch service if it doesn't already exist
     this.service =
@@ -49,16 +65,14 @@ module.exports = class deviceZBSwitchStateless {
       this.accessory.getService(this.hapServ.BatteryService) ||
       this.accessory.addService(this.hapServ.BatteryService)
 
-    // Output the customised options to the log if in debug mode
-    if (platform.config.debug) {
-      const opts = JSON.stringify({
-        disableDeviceLogging: this.disableDeviceLogging,
-        hideLongDouble: this.hideLongDouble,
-        lowBattThreshold: this.lowBattThreshold,
-        sensorTimeDifference: this.sensorTimeDifference
-      })
-      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
-    }
+    // Output the customised options to the log
+    const opts = JSON.stringify({
+      hideLongDouble: this.hideLongDouble,
+      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
+      lowBattThreshold: this.lowBattThreshold,
+      sensorTimeDifference: this.sensorTimeDifference
+    })
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
 
   async externalUpdate (params) {
@@ -71,7 +85,7 @@ module.exports = class deviceZBSwitchStateless {
           this.hapChar.StatusLowBattery,
           this.cacheBattScaled < this.lowBattThreshold
         )
-        if (params.updateSource && !this.disableDeviceLogging) {
+        if (params.updateSource && this.enableLogging) {
           this.log('[%s] %s [%s%].', this.name, this.lang.curBatt, this.cacheBattScaled)
         }
       }
@@ -83,7 +97,7 @@ module.exports = class deviceZBSwitchStateless {
         const timeDiff = (new Date().getTime() - params.trigTime) / 1000
         if (timeDiff < this.sensorTimeDifference) {
           this.service.updateCharacteristic(this.hapChar.ProgrammableSwitchEvent, params.key)
-          if (params.updateSource && !this.disableDeviceLogging) {
+          if (params.updateSource && this.enableLogging) {
             const textLabel =
               params.key === 0
                 ? this.lang.buttonSingle
diff --git a/lib/index.js b/lib/index.js
index 59536927..519972dc 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -151,12 +151,17 @@ class eWeLinkPlatform {
                   case 'fullDeviceId':
                   case 'label':
                     break
-                  case 'overrideDisabledLogging':
-                    if (typeof v === 'string') {
-                      logQuotes(key + '.' + id + '.' + k)
+                  case 'overrideLogging':
+                  case 'type': {
+                    const index = k === 'type' ? 'sensors' : k
+                    const inSet = this.consts.allowed[index].includes(v)
+                    if (typeof v !== 'string' || !inSet) {
+                      logIgnore(key + '.' + id + '.' + k)
+                    } else {
+                      this.rfDevices[id][k] = inSet ? v : this.consts.defaultValues[k]
                     }
-                    this.rfDevices[id][k] = v === 'false' ? false : !!v
                     break
+                  }
                   case 'sensorTimeDifference':
                   case 'sensorTimeLength': {
                     if (typeof v === 'string') {
@@ -174,15 +179,6 @@ class eWeLinkPlatform {
                     }
                     break
                   }
-                  case 'type':
-                    if (typeof v !== 'string' || v === '') {
-                      logIgnore(key + '.' + id + '.' + k)
-                    } else if (!this.consts.allowed.sensors.includes(v)) {
-                      logIgnore(key + '.' + id + '.' + k)
-                    } else {
-                      this.rfDevices[id][k] = v
-                    }
-                    break
                   default:
                     logRemove(key + '.' + id + '.' + k)
                     break
@@ -257,7 +253,8 @@ class eWeLinkPlatform {
                     }
                     break
                   }
-                  case 'bulbModel': {
+                  case 'bulbModel':
+                  case 'overrideLogging': {
                     const inSet = this.consts.allowed[k].includes(v)
                     if (typeof v !== 'string' || !inSet) {
                       logIgnore(key + '.' + id + '.' + k)
@@ -276,6 +273,7 @@ class eWeLinkPlatform {
                       const channels = v.split(',')
                       channels.forEach(channel => {
                         this.hideChannels.push(id + 'SW' + channel.replace(/[^0-9]+/g, ''))
+                        this[key][id][k] = v
                       })
                     }
                     break
@@ -283,7 +281,6 @@ class eWeLinkPlatform {
                   case 'hideLight':
                   case 'hideLongDouble':
                   case 'hideSwitch':
-                  case 'overrideDisabledLogging':
                   case 'scaleBattery':
                   case 'showAsOutlet':
                   case 'showAsSwitch':
@@ -360,7 +357,6 @@ class eWeLinkPlatform {
                     break
                   }
                   case 'hideSensor':
-                  case 'overrideDisabledLogging':
                     if (typeof v === 'string') {
                       logQuotes(key + '.' + id + '.' + k)
                     }
@@ -394,30 +390,24 @@ class eWeLinkPlatform {
                     }
                     break
                   }
-                  case 'sensorId':
-                    if (typeof v !== 'string' || v === '') {
-                      logIgnore(key + '.' + id + '.' + k)
-                    } else {
-                      const parsed = this.funcs.parseDeviceId(v)
-                      this.simulations[id].sensorId = parsed
-                    }
-                    break
+                  case 'overrideLogging':
                   case 'sensorType':
-                    if (typeof v !== 'string' || v === '') {
-                      logIgnore(key + '.' + id + '.' + k)
-                    } else if (!this.consts.allowed.sensors.includes(v)) {
+                  case 'type': {
+                    const index = k === 'sensorType' ? 'sensors' : k === 'type' ? 'groupTypes' : k
+                    const inSet = this.consts.allowed[index].includes(v)
+                    if (typeof v !== 'string' || !inSet) {
                       logIgnore(key + '.' + id + '.' + k)
                     } else {
                       this.simulations[id][k] = v
                     }
                     break
-                  case 'type':
+                  }
+                  case 'sensorId':
                     if (typeof v !== 'string' || v === '') {
                       logIgnore(key + '.' + id + '.' + k)
-                    } else if (!this.consts.allowed.groupTypes.includes(x.type)) {
-                      logIgnore(key + '.' + id + '.' + k)
                     } else {
-                      this.simulations[id][k] = v
+                      const parsed = this.funcs.parseDeviceId(v)
+                      this.simulations[id].sensorId = parsed
                     }
                     break
                   default:
@@ -1202,7 +1192,7 @@ class eWeLinkPlatform {
         const instance = './device/rf-bridge'
         accessory.control = new (require(instance))(this, accessory, devicesInHB)
 
-        // We don't want to add the main bridge as an accessory in Homebridge
+        // We don't want to add the main bridge as a visible accessory in Homebridge
         this.hideMasters.push(device.deviceid)
 
         // Loop through each sub device connected to the RF Bridge
@@ -1210,38 +1200,27 @@ class eWeLinkPlatform {
           const swNumber = rfChlCounter + 1
           let subAccessory
           let subType
-          let sensorTimeLength
-          let sensorTimeDiff
-          let subExtraContext = {}
           const fullDeviceId = device.deviceid + 'SW' + swNumber
           const uuidsub = this.api.hap.uuid.generate(fullDeviceId)
-          const disableDeviceLogging =
-            this.rfDevices[fullDeviceId] && this.rfDevices[fullDeviceId].overrideDisabledLogging
-              ? false
-              : this.config.disableDeviceLogging
 
           // Check which eWeLink type the connected sub device is
+          let instance
           switch (subDevice.type) {
             case '1':
             case '2':
             case '3':
             case '4':
               subType = 'button'
+              instance = 'rf-button'
               break
             case '5':
               subType = 'curtain'
+              instance = 'rf-button'
               break
             case '6':
             case '7':
-              subType = this.rfDevices[fullDeviceId] ? this.rfDevices[fullDeviceId].type : 'motion'
-              sensorTimeLength =
-                this.rfDevices[fullDeviceId] && this.rfDevices[fullDeviceId].sensorTimeLength
-                  ? this.rfDevices[fullDeviceId].sensorTimeLength
-                  : this.consts.defaultValues.sensorTimeLength
-              sensorTimeDiff =
-                this.rfDevices[fullDeviceId] && this.rfDevices[fullDeviceId].sensorTimeDifference
-                  ? this.rfDevices[fullDeviceId].sensorTimeDifference
-                  : this.consts.defaultValues.sensorTimeDifference
+              subType = 'sensor'
+              instance = 'rf-sensor'
               break
             default: {
               this.log.warn('[%s] %s:', device.name, this.lang.devNotSupYet)
@@ -1252,26 +1231,17 @@ class eWeLinkPlatform {
           }
 
           // Create an object to save to the sub accessory context
-          subExtraContext = {
+          const subExtraContext = {
             buttons: subDevice.buttons,
             subType,
             swNumber,
-            sensorTimeLength,
-            sensorTimeDiff,
-            disableDeviceLogging,
             name: subDevice.name
           }
 
           // Check if the sub accessory already exists in Homebridge
           if ((subAccessory = devicesInHB.get(uuidsub))) {
-            // Check for any changes to user config or types
-            if (
-              subAccessory.context.subType !== subType ||
-              subAccessory.context.sensorTimeLength !== sensorTimeLength ||
-              subAccessory.context.sensorTimeDiff !== sensorTimeDiff ||
-              subAccessory.context.disableDeviceLogging !== disableDeviceLogging ||
-              subAccessory.context.swNumber !== swNumber
-            ) {
+            // Check for any changes given RF structure (ie added/deleted RF subdevices)
+            if (subAccessory.context.swNumber !== swNumber) {
               // Remove the existing sub accessory if any changes are found
               this.removeAccessory(subAccessory)
             }
@@ -1302,8 +1272,7 @@ class eWeLinkPlatform {
           // Update any changes to the sub accessory to the platform
           this.api.updatePlatformAccessories(plugin.name, plugin.alias, [subAccessory])
           devicesInHB.set(subAccessory.UUID, subAccessory)
-          const instance = './device/rf-bridge'
-          subAccessory.control = new (require(instance))(this, subAccessory, devicesInHB)
+          subAccessory.control = new (require('./device/' + instance))(this, subAccessory)
           rfChlCounter += Object.keys(subDevice.buttons || {}).length
         })
 
@@ -1585,11 +1554,11 @@ class eWeLinkPlatform {
     }
   }
 
-  async sendDeviceUpdate (accessory, params, log = true) {
+  async sendDeviceUpdate (accessory, params) {
     // Add to a queue so multiple updates are at least 500ms apart
     return await queue.add(async () => {
       // Log the update being sent
-      if (this.config.debug && log) {
+      if (accessory.control.enableDebugLogging) {
         this.log('[%s] %s %s.', accessory.displayName, this.lang.updSend, JSON.stringify(params))
       }
 
@@ -1612,7 +1581,7 @@ class eWeLinkPlatform {
         // Check to see if the device is online
         if (wsClient) {
           // Log the revert if appropriate
-          if (this.config.debug && log) {
+          if (accessory.control.enableDebugLogging) {
             this.log('[%s] %s %s.', accessory.displayName, this.lang.revertWS, res)
           }
 
@@ -1644,7 +1613,7 @@ class eWeLinkPlatform {
     const uuid1 = this.api.hap.uuid.generate(deviceId + 'SWX')
     const uuid2 = this.api.hap.uuid.generate(deviceId + 'SW0')
     if ((accessory = devicesInHB.get(uuid1) || devicesInHB.get(uuid2))) {
-      if (this.config.debug) {
+      if (accessory.control.enableDebugLogging) {
         this.log(
           '[%s] %s %s.',
           accessory.displayName,
@@ -1664,7 +1633,9 @@ class eWeLinkPlatform {
 
           // Log the new reachability of the device
           const status = accessory.context.reachableWAN ? this.lang.repOnline : this.lang.repOffline
-          this.log('[%s] %s %s.', accessory.displayName, status, this.lang.viaWS)
+          if (accessory.control.enableLogging) {
+            this.log('[%s] %s %s.', accessory.displayName, status, this.lang.viaWS)
+          }
 
           // Mark the online/offline status of certain devices
           if (accessory.control.markStatus) {
@@ -1706,7 +1677,9 @@ class eWeLinkPlatform {
           reachableChange = true
 
           // Log the new reachability of the device
-          this.log('[%s] %s %s.', accessory.displayName, this.lang.repOnline, this.lang.viaLAN)
+          if (accessory.control.enableLogging) {
+            this.log('[%s] %s %s.', accessory.displayName, this.lang.repOnline, this.lang.viaLAN)
+          }
 
           // Try and request an update through WS if the device has come back online
           if (accessory.context.reachableWAN && wsClient) {
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index b60a5c53..2c76a5fe 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -44,7 +44,8 @@ module.exports = {
     mode: 'auto',
     bulbModel: 'bulbB02FA60',
     brightnessStep: 1,
-    adaptiveLightingShift: 0
+    adaptiveLightingShift: 0,
+    overrideLogging: 'default'
   },
 
   minValues: {
@@ -76,7 +77,7 @@ module.exports = {
       'cn-apia.coolkit.cn'
     ],
     modes: ['auto', 'wan', 'lan'],
-    singleDevices: ['deviceId', 'label', 'showAsOutlet', 'ipAddress', 'overrideDisabledLogging'],
+    singleDevices: ['deviceId', 'label', 'showAsOutlet', 'ipAddress', 'overrideLogging'],
     multiDevices: [
       'deviceId',
       'label',
@@ -84,7 +85,7 @@ module.exports = {
       'inUsePowerThreshold',
       'hideChannels',
       'ipAddress',
-      'overrideDisabledLogging'
+      'overrideLogging'
     ],
     outletDevices: [
       'deviceId',
@@ -92,7 +93,7 @@ module.exports = {
       'showAsSwitch',
       'inUsePowerThreshold',
       'ipAddress',
-      'overrideDisabledLogging'
+      'overrideLogging'
     ],
     lightDevices: [
       'deviceId',
@@ -101,7 +102,7 @@ module.exports = {
       'brightnessStep',
       'adaptiveLightingShift',
       'ipAddress',
-      'overrideDisabledLogging'
+      'overrideLogging'
     ],
     thDevices: [
       'deviceId',
@@ -111,9 +112,9 @@ module.exports = {
       'humidityOffset',
       'minTarget',
       'maxTarget',
-      'overrideDisabledLogging'
+      'overrideLogging'
     ],
-    fanDevices: ['deviceId', 'label', 'hideLight', 'overrideDisabledLogging'],
+    fanDevices: ['deviceId', 'label', 'hideLight', 'overrideLogging'],
     sensorDevices: [
       'deviceId',
       'lowBattThreshold',
@@ -122,7 +123,7 @@ module.exports = {
       'hideLongDouble',
       'scaleBattery',
       'sensorTimeDifference',
-      'overrideDisabledLogging'
+      'overrideLogging'
     ],
     groupTypes: [
       'blind',
@@ -147,6 +148,7 @@ module.exports = {
       'valve_four',
       'window'
     ],
+    overrideLogging: ['default', 'standard', 'debug', 'disable'],
     obstructs: ['garage', 'garage_eachen'],
     sensors: ['water', 'smoke', 'co', 'co2', 'contact', 'occupancy', 'motion'],
     bulbModel: ['bulbB02BA60', 'bulbB02FA60', 'bulbB02FST64']

From 9c6643bab454a235d863ce2478b101a6d09f5ac2 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 18 Jun 2021 18:43:27 +0100
Subject: [PATCH 2285/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a77f10eb..f3c84478 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -30,7 +30,6 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 ### Changes
 
 - **Polling/Logging**
-  - Device polling (for power, temperature and humidity) will no longer log when sending updates
   - Power reading polling for POWR2/DUALR3 increased to two minutes
   - Small changes to the startup logging
 - **Configuration**

From 91340e11dc4135ec9679574c7ac62b3381050171 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 18 Jun 2021 19:00:32 +0100
Subject: [PATCH 2286/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f3c84478..3f09ccdb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,34 +4,40 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 ## BETA
 
-### ⚠️ Important
+### ⚠️ Breaking Changes
 
 - If you have the plugin in `lan`-only mode then the plugin will remove any accessories that do not support LAN mode
+- `overrideDisabledLogging` config option for each accessory type has been removed in favour of a new setting `overrideLogging`
 
 ### Added
 
 - **LAN Mode (without eWeLink credentials)**
   - The plugin now supports removing eWeLink credentials from the config when in LAN mode
   - It is important to read about this feature before enabling it - [read more](https://github.com/bwp91/homebridge-ewelink/wiki/Connection-Methods#lan-mode-without-ewelink-credentials)
+  - If you have the plugin in `lan`-only mode then the plugin will remove any accessories that do not support LAN mode
+- **Accessory Logging**
+  - `overrideDisabledLogging` option for each accessory type has been removed in favour of a new setting
 - **iFan Devices**
   - LAN mode control enabled
   - Previous fan speed will be used again after turning off and on
 - **TH10/16 Devices**
   - Implemented polling as firmware 3.5.0 does not seem to send regular temperature updates
   - Implemented LAN mode for Accessory Simulations (eWeLink 'auto' mode is no longer used)
-- **Humidity Sensor Devices**
-  - Config option to offset the recorded humidity (%RH) for devices that report this
 - **POWR2/DUALR3 Devices**
   - [test] Polling via LAN mode to enable constant power attribute updates
+- **RF Bridge Devices**
+  - Ability to change sensor type and other confiurable options without the need to re-add the accessory
 - **Zigbee Button Device**
   - Comparison of trigger time against notification time to reduce duplicate accessory updates
   - Will no longer request current state when coming back online to reduce duplicate accessory updates
+- **Humidity Sensor Devices**
+  - Config option to offset the recorded humidity (%RH) for devices that report this
 
 ### Changes
 
 - **Polling/Logging**
   - Power reading polling for POWR2/DUALR3 increased to two minutes
-  - Small changes to the startup logging
+  - Changes to the startup logging including always logging accessory configuration options
 - **Configuration**
   - `sensorTimeDifference` minimum reduced to 5 seconds and default reduced to 60 seconds
 - **Dependencies**

From a1ab2c2594a182bb2aaa3f0c3beae3e508613ef6 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 18 Jun 2021 19:00:55 +0100
Subject: [PATCH 2287/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3f09ccdb..dcbdcd07 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,7 +16,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
   - It is important to read about this feature before enabling it - [read more](https://github.com/bwp91/homebridge-ewelink/wiki/Connection-Methods#lan-mode-without-ewelink-credentials)
   - If you have the plugin in `lan`-only mode then the plugin will remove any accessories that do not support LAN mode
 - **Accessory Logging**
-  - `overrideDisabledLogging` option for each accessory type has been removed in favour of a new setting
+  - `overrideDisabledLogging` option for each accessory type has been removed in favour of a new setting `overrideLogging`
 - **iFan Devices**
   - LAN mode control enabled
   - Previous fan speed will be used again after turning off and on

From 20a53ab5c56c9baa68050afc5b39dd8b35dc8910 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 18 Jun 2021 19:28:18 +0100
Subject: [PATCH 2288/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dcbdcd07..d71452c8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,12 @@ All notable changes to this homebridge-ewelink will be documented in this file.
   - If you have the plugin in `lan`-only mode then the plugin will remove any accessories that do not support LAN mode
 - **Accessory Logging**
   - `overrideDisabledLogging` option for each accessory type has been removed in favour of a new setting `overrideLogging`
+  - `overrideLogging` can be set to (and will override the global device logging and debug logging settings):
+    - `"default"` to follow the global device update and debug logging setting for this accessory (default if setting not set)
+    - `"standard"` to enable device update logging but disable debug logging for this accessory
+    - `"debug"` to enable device update and debug logging for this accessory
+    - `"disable"` to disable device update and debug logging for this accessory
+  - The easiest way to manage these settings is through the Homebridge UI or the HOOBS UI
 - **iFan Devices**
   - LAN mode control enabled
   - Previous fan speed will be used again after turning off and on

From f34a214e5f3a4744ad62f91a665b6716ffe6b567 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 18 Jun 2021 19:28:58 +0100
Subject: [PATCH 2289/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d71452c8..c84501fa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -32,7 +32,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 - **POWR2/DUALR3 Devices**
   - [test] Polling via LAN mode to enable constant power attribute updates
 - **RF Bridge Devices**
-  - Ability to change sensor type and other confiurable options without the need to re-add the accessory
+  - Ability to change sensor type and other configurable options without the need to re-add the accessory
 - **Zigbee Button Device**
   - Comparison of trigger time against notification time to reduce duplicate accessory updates
   - Will no longer request current state when coming back online to reduce duplicate accessory updates

From 86aad87d5302b4eaf91a321c006af957aaadc262 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 19 Jun 2021 09:25:52 +0100
Subject: [PATCH 2290/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c84501fa..32a7069d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
     - `"debug"` to enable device update and debug logging for this accessory
     - `"disable"` to disable device update and debug logging for this accessory
   - The easiest way to manage these settings is through the Homebridge UI or the HOOBS UI
+  - This can be used for example to set TH10/16 or POWR2 device to `standard` when in global `debug` logging mode to stop the polling from flooding the logs
 - **iFan Devices**
   - LAN mode control enabled
   - Previous fan speed will be used again after turning off and on

From 6893bb6b9c591a77ed26af57fabe1dbe587a4067 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 20 Jun 2021 22:30:26 +0100
Subject: [PATCH 2291/3183] [test] lan mode for dualr3 in motor mode

---
 lib/connection/lan.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/connection/lan.js b/lib/connection/lan.js
index 5c89ea20..ce980b91 100644
--- a/lib/connection/lan.js
+++ b/lib/connection/lan.js
@@ -210,6 +210,10 @@ module.exports = class connectionLAN {
           }
         }
         suffix = 'switch'
+      } else if (deviceInfo.uiid === 126 && this.funcs.hasProperty(json.params, 'location')) {
+        // Use hasProperty has location can be INT 0
+        params.location = json.params.location
+        suffix = 'location'
       } else if (json.params.uiActive && deviceInfo.uiid !== 15) {
         // Not supported at least for TH10/16
         params.uiActive = json.params.uiActive

From 5d23d497e59df7444ae846790a3dc4c94975d519 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 20 Jun 2021 22:31:02 +0100
Subject: [PATCH 2292/3183] 6.8.1-beta.23

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 3f9c3bf1..6869c0a6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.8.1-beta.22",
+  "version": "6.8.1-beta.23",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 0f360013..7e826b6a 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.8.1-beta.22",
+  "version": "6.8.1-beta.23",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From d6409c0568adc77313fbe4b308a24ace4afc64f9 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 21 Jun 2021 11:29:12 +0100
Subject: [PATCH 2293/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 32a7069d..f08e2cd8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,12 +25,13 @@ All notable changes to this homebridge-ewelink will be documented in this file.
   - The easiest way to manage these settings is through the Homebridge UI or the HOOBS UI
   - This can be used for example to set TH10/16 or POWR2 device to `standard` when in global `debug` logging mode to stop the polling from flooding the logs
 - **iFan Devices**
-  - LAN mode control enabled
+  - Support for LAN mode control
   - Previous fan speed will be used again after turning off and on
 - **TH10/16 Devices**
   - Implemented polling as firmware 3.5.0 does not seem to send regular temperature updates
   - Implemented LAN mode for Accessory Simulations (eWeLink 'auto' mode is no longer used)
 - **POWR2/DUALR3 Devices**
+  - Support for LAN mode control for DUALR3 in motor mode
   - [test] Polling via LAN mode to enable constant power attribute updates
 - **RF Bridge Devices**
   - Ability to change sensor type and other configurable options without the need to re-add the accessory

From 63448178fec928c27850c0cf15c2fa7a9f65c45f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 22 Jun 2021 06:28:07 +0100
Subject: [PATCH 2294/3183] fix zigbee temp reading

---
 lib/device/zigbee/sensor-ambient.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/device/zigbee/sensor-ambient.js b/lib/device/zigbee/sensor-ambient.js
index 824077e3..6774f224 100644
--- a/lib/device/zigbee/sensor-ambient.js
+++ b/lib/device/zigbee/sensor-ambient.js
@@ -104,7 +104,7 @@ module.exports = class deviceZBSensorAmbient {
         params.temperature !== this.cacheTempRaw
       ) {
         this.cacheTempRaw = params.temperature
-        this.cacheTemp = parseInt(this.cacheTemp) / 100 + this.tempOffset
+        this.cacheTemp = parseInt(this.cacheTempRaw) / 100 + this.tempOffset
         this.tempService.updateCharacteristic(this.hapChar.CurrentTemperature, this.cacheTemp)
         eveLog.temp = this.cacheTemp
         if (params.updateSource && this.enableLogging) {

From 02a380ef01d9b1f660c03c4e109c57b45e87c068 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 22 Jun 2021 06:28:42 +0100
Subject: [PATCH 2295/3183] 6.8.1-beta.24

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 6869c0a6..d43b2883 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.8.1-beta.23",
+  "version": "6.8.1-beta.24",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 7e826b6a..e8db65a4 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.8.1-beta.23",
+  "version": "6.8.1-beta.24",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 118044936dec54c2fdace99dbc242d506f2e4252 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 22 Jun 2021 08:33:49 +0100
Subject: [PATCH 2296/3183] add eve char funcs to garage-one simulation

---
 lib/device/sensor-contact.js            |  8 ++----
 lib/device/simulation/garage-eachen.js  | 12 +++------
 lib/device/simulation/garage-one.js     | 36 +++++++++++++++++++++----
 lib/device/simulation/sensor-hidden.js  | 15 ++++++++++-
 lib/device/simulation/sensor-visible.js | 22 ++++++++++-----
 lib/device/zigbee/sensor-contact.js     |  8 ++----
 6 files changed, 68 insertions(+), 33 deletions(-)

diff --git a/lib/device/sensor-contact.js b/lib/device/sensor-contact.js
index ecf51694..d7398405 100644
--- a/lib/device/sensor-contact.js
+++ b/lib/device/sensor-contact.js
@@ -60,12 +60,8 @@ module.exports = class deviceSensorContact {
       this.service.addCharacteristic(this.eveChar.TimesOpened)
     }
 
-    // Obtain the current times opened value
-    this.timesOpened = this.service.getCharacteristic(this.eveChar.TimesOpened).value
-
     // Add the set handler to the contact sensor reset total characteristic
     this.service.getCharacteristic(this.eveChar.ResetTotal).onSet(value => {
-      this.timesOpened = 0
       this.service.updateCharacteristic(this.eveChar.TimesOpened, 0)
     })
 
@@ -115,8 +111,8 @@ module.exports = class deviceSensorContact {
           this.eveChar.LastActivation,
           Math.round(new Date().valueOf() / 1000) - initialTime
         )
-        this.timesOpened++
-        this.service.updateCharacteristic(this.eveChar.TimesOpened, this.timesOpened)
+        const newTO = this.service.getCharacteristic(this.eveChar.TimesOpened).value + 1
+        this.service.updateCharacteristic(this.eveChar.TimesOpened, newTO)
       } else {
         this.service.updateCharacteristic(this.hapChar.ContactSensorState, 0)
         this.accessory.eveService.addEntry({ status: 0 })
diff --git a/lib/device/simulation/garage-eachen.js b/lib/device/simulation/garage-eachen.js
index b4f1fdc8..38f5eeec 100644
--- a/lib/device/simulation/garage-eachen.js
+++ b/lib/device/simulation/garage-eachen.js
@@ -66,12 +66,8 @@ module.exports = class deviceGarageEachen {
       this.service.addCharacteristic(this.eveChar.TimesOpened)
     }
 
-    // Obtain the current times opened value
-    this.timesOpened = this.service.getCharacteristic(this.eveChar.TimesOpened).value
-
     // Add the set handler to the garage door reset total characteristic
     this.service.getCharacteristic(this.eveChar.ResetTotal).onSet(value => {
-      this.timesOpened = 0
       this.service.updateCharacteristic(this.eveChar.TimesOpened, 0)
     })
 
@@ -119,8 +115,8 @@ module.exports = class deviceGarageEachen {
           this.eveChar.LastActivation,
           Math.round(new Date().valueOf() / 1000) - initialTime
         )
-        this.timesOpened++
-        this.service.updateCharacteristic(this.eveChar.TimesOpened, this.timesOpened)
+        const newTO = this.service.getCharacteristic(this.eveChar.TimesOpened).value + 1
+        this.service.updateCharacteristic(this.eveChar.TimesOpened, newTO)
         await this.funcs.sleep(Math.max((this.operationTime - 20) * 100, 0))
         this.service.updateCharacteristic(this.hapChar.CurrentDoorState, 0)
         if (this.enableLogging) {
@@ -161,8 +157,8 @@ module.exports = class deviceGarageEachen {
           this.eveChar.LastActivation,
           Math.round(new Date().valueOf() / 1000) - initialTime
         )
-        this.timesOpened++
-        this.service.updateCharacteristic(this.eveChar.TimesOpened, this.timesOpened)
+        const newTO = this.service.getCharacteristic(this.eveChar.TimesOpened).value + 1
+        this.service.updateCharacteristic(this.eveChar.TimesOpened, newTO)
       } else {
         this.service.updateCharacteristic(this.hapChar.ContactSensorState, 0)
         this.accessory.eveService.addEntry({ status: 1 }) // swapped
diff --git a/lib/device/simulation/garage-one.js b/lib/device/simulation/garage-one.js
index f77804fc..fb71a5e3 100644
--- a/lib/device/simulation/garage-one.js
+++ b/lib/device/simulation/garage-one.js
@@ -73,12 +73,8 @@ module.exports = class deviceGarageOne {
       this.service.addCharacteristic(this.eveChar.TimesOpened)
     }
 
-    // Obtain the current times opened value
-    this.timesOpened = this.service.getCharacteristic(this.eveChar.TimesOpened).value
-
     // Add the set handler to the garage door reset total characteristic
     this.service.getCharacteristic(this.eveChar.ResetTotal).onSet(value => {
-      this.timesOpened = 0
       this.service.updateCharacteristic(this.eveChar.TimesOpened, 0)
     })
 
@@ -146,10 +142,25 @@ module.exports = class deviceGarageOne {
       await this.platform.sendDeviceUpdate(this.accessory, params)
       await this.funcs.sleep(2000)
       this.inUse = false
+      if (!this.definedSensor && newPos === 0) {
+        this.service.updateCharacteristic(this.hapChar.ContactSensorState, 1)
+        this.accessory.eveService.addEntry({ status: 0 })
+        const initialTime = this.accessory.eveService.getInitialTime()
+        this.service.updateCharacteristic(
+          this.eveChar.LastActivation,
+          Math.round(new Date().valueOf() / 1000) - initialTime
+        )
+        const newTO = this.service.getCharacteristic(this.eveChar.TimesOpened).value + 1
+        this.service.updateCharacteristic(this.eveChar.TimesOpened, newTO)
+      }
       const operationTime = newPos === 0 ? this.operationTimeUp : this.operationTimeDown
       await this.funcs.sleep(Math.max((operationTime - 20) * 100, 0))
       if (!this.definedSensor) {
         this.service.updateCharacteristic(this.hapChar.CurrentDoorState, newPos)
+        if (newPos === 1) {
+          this.service.updateCharacteristic(this.hapChar.ContactSensorState, 0)
+          this.accessory.eveService.addEntry({ status: 1 })
+        }
         if (this.enableLogging) {
           this.log(
             '[%s] %s [%s].',
@@ -204,14 +215,29 @@ module.exports = class deviceGarageOne {
       this.service.updateCharacteristic(this.hapChar.CurrentDoorState, newPos)
       await this.funcs.sleep(2000)
       this.inUse = false
+      if (!this.definedSensor && newPos === 2) {
+        this.service.updateCharacteristic(this.hapChar.ContactSensorState, 1)
+        this.accessory.eveService.addEntry({ status: 0 })
+        const initialTime = this.accessory.eveService.getInitialTime()
+        this.service.updateCharacteristic(
+          this.eveChar.LastActivation,
+          Math.round(new Date().valueOf() / 1000) - initialTime
+        )
+        const newTO = this.service.getCharacteristic(this.eveChar.TimesOpened).value + 1
+        this.service.updateCharacteristic(this.eveChar.TimesOpened, newTO)
+      }
       const operationTime = newPos === 2 ? this.operationTimeUp : this.operationTimeDown
       await this.funcs.sleep(Math.max((operationTime - 20) * 100, 0))
       this.service.updateCharacteristic(this.hapChar.CurrentDoorState, newPos - 2)
+      if (!this.definedSensor && newPos === 3) {
+        this.service.updateCharacteristic(this.hapChar.ContactSensorState, 0)
+        this.accessory.eveService.addEntry({ status: 1 })
+      }
       if (this.enableLogging) {
         this.log(
           '[%s] %s [%s].',
           this.name,
-          this.messages.curState,
+          this.lang.curState,
           newPos === 2 ? this.lang.doorOpen : this.lang.doorClosed
         )
       }
diff --git a/lib/device/simulation/sensor-hidden.js b/lib/device/simulation/sensor-hidden.js
index 8e9a90d4..bba20d61 100644
--- a/lib/device/simulation/sensor-hidden.js
+++ b/lib/device/simulation/sensor-hidden.js
@@ -7,6 +7,7 @@ module.exports = class deviceSensorHidden {
     // Set up variables from the platform
     this.devicesInHB = devicesInHB
     this.disableDeviceLogging = platform.config.disableDeviceLogging
+    this.eveChar = platform.eveChar
     this.funcs = platform.funcs
     this.hapChar = platform.api.hap.Characteristic
     this.hapServ = platform.api.hap.Service
@@ -59,18 +60,30 @@ module.exports = class deviceSensorHidden {
               case 0:
                 gdService.updateCharacteristic(this.hapChar.TargetDoorState, 1)
                 gdService.updateCharacteristic(this.hapChar.CurrentDoorState, 1)
+                gdService.updateCharacteristic(this.hapChar.ContactSensorState, 0)
+                subAccessory.eveService.addEntry({ status: 1 }) // swapped
                 if (params.updateSource && enableLogging) {
                   this.log('[%s] %s [%s].', name, this.lang.curState, this.lang.doorClosed)
                 }
                 break
-              case 1:
+              case 1: {
                 await this.funcs.sleep(Math.max(group.operationTime * 100, 2000))
                 gdService.updateCharacteristic(this.hapChar.TargetDoorState, 0)
                 gdService.updateCharacteristic(this.hapChar.CurrentDoorState, 0)
+                gdService.updateCharacteristic(this.hapChar.ContactSensorState, 1)
+                subAccessory.eveService.addEntry({ status: 0 })
+                const initialTime = subAccessory.eveService.getInitialTime()
+                gdService.updateCharacteristic(
+                  this.eveChar.LastActivation,
+                  Math.round(new Date().valueOf() / 1000) - initialTime
+                )
+                const newTO = gdService.getCharacteristic(this.eveChar.TimesOpened).value + 1
+                gdService.updateCharacteristic(this.eveChar.TimesOpened, newTO)
                 if (params.updateSource && enableLogging) {
                   this.log('[%s] %s [%s].', name, this.lang.curState, this.lang.doorOpen)
                 }
                 break
+              }
             }
           }
         }
diff --git a/lib/device/simulation/sensor-visible.js b/lib/device/simulation/sensor-visible.js
index 81013268..8539db0e 100644
--- a/lib/device/simulation/sensor-visible.js
+++ b/lib/device/simulation/sensor-visible.js
@@ -64,12 +64,8 @@ module.exports = class deviceSensorVisible {
       this.service.addCharacteristic(this.eveChar.TimesOpened)
     }
 
-    // Obtain the current times opened value
-    this.timesOpened = this.service.getCharacteristic(this.eveChar.TimesOpened).value
-
     // Add the set handler to the contact sensor reset total characteristic
     this.service.getCharacteristic(this.eveChar.ResetTotal).onSet(value => {
-      this.timesOpened = 0
       this.service.updateCharacteristic(this.eveChar.TimesOpened, 0)
     })
 
@@ -132,8 +128,8 @@ module.exports = class deviceSensorVisible {
           this.eveChar.LastActivation,
           Math.round(new Date().valueOf() / 1000) - initialTime
         )
-        this.timesOpened++
-        this.service.updateCharacteristic(this.eveChar.TimesOpened, this.timesOpened)
+        const newTO = this.service.getCharacteristic(this.eveChar.TimesOpened).value + 1
+        this.service.updateCharacteristic(this.eveChar.TimesOpened, newTO)
       } else {
         this.service.updateCharacteristic(this.hapChar.ContactSensorState, 0)
         this.accessory.eveService.addEntry({ status: 0 })
@@ -171,18 +167,30 @@ module.exports = class deviceSensorVisible {
               case 0:
                 gdService.updateCharacteristic(this.hapChar.TargetDoorState, 1)
                 gdService.updateCharacteristic(this.hapChar.CurrentDoorState, 1)
+                gdService.updateCharacteristic(this.hapChar.ContactSensorState, 0)
+                subAccessory.eveService.addEntry({ status: 1 }) // swapped
                 if (params.updateSource && enableLogging) {
                   this.log('[%s] %s [%s].', name, this.lang.curState, this.lang.doorClosed)
                 }
                 break
-              case 1:
+              case 1: {
                 await this.funcs.sleep(Math.max(group.operationTime * 100, 2000))
                 gdService.updateCharacteristic(this.hapChar.TargetDoorState, 0)
                 gdService.updateCharacteristic(this.hapChar.CurrentDoorState, 0)
+                gdService.updateCharacteristic(this.hapChar.ContactSensorState, 1)
+                subAccessory.eveService.addEntry({ status: 0 })
+                const initialTime = subAccessory.eveService.getInitialTime()
+                gdService.updateCharacteristic(
+                  this.eveChar.LastActivation,
+                  Math.round(new Date().valueOf() / 1000) - initialTime
+                )
+                const newTO = gdService.getCharacteristic(this.eveChar.TimesOpened).value + 1
+                gdService.updateCharacteristic(this.eveChar.TimesOpened, newTO)
                 if (params.updateSource && enableLogging) {
                   this.log('[%s] %s [%s].', name, this.lang.curState, this.lang.doorOpen)
                 }
                 break
+              }
             }
           }
         }
diff --git a/lib/device/zigbee/sensor-contact.js b/lib/device/zigbee/sensor-contact.js
index 69a30f57..ee4ad6a8 100644
--- a/lib/device/zigbee/sensor-contact.js
+++ b/lib/device/zigbee/sensor-contact.js
@@ -56,12 +56,8 @@ module.exports = class deviceZBSensorContact {
       this.service.addCharacteristic(this.eveChar.TimesOpened)
     }
 
-    // Obtain the current times opened value
-    this.timesOpened = this.service.getCharacteristic(this.eveChar.TimesOpened).value
-
     // Add the set handler to the contact sensor reset total characteristic
     this.service.getCharacteristic(this.eveChar.ResetTotal).onSet(value => {
-      this.timesOpened = 0
       this.service.updateCharacteristic(this.eveChar.TimesOpened, 0)
     })
 
@@ -108,8 +104,8 @@ module.exports = class deviceZBSensorContact {
             this.eveChar.LastActivation,
             Math.round(new Date().valueOf() / 1000) - initialTime
           )
-          this.timesOpened++
-          this.service.updateCharacteristic(this.eveChar.TimesOpened, this.timesOpened)
+          const newTO = this.service.getCharacteristic(this.eveChar.TimesOpened).value + 1
+          this.service.updateCharacteristic(this.eveChar.TimesOpened, newTO)
         } else {
           this.service.updateCharacteristic(this.hapChar.ContactSensorState, 0)
           this.accessory.eveService.addEntry({ status: 0 })

From 074dd4776c7a992cb56ed13ba420808d6b4de575 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 22 Jun 2021 08:35:42 +0100
Subject: [PATCH 2297/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f08e2cd8..fa7979e3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -40,7 +40,9 @@ All notable changes to this homebridge-ewelink will be documented in this file.
   - Will no longer request current state when coming back online to reduce duplicate accessory updates
 - **Humidity Sensor Devices**
   - Config option to offset the recorded humidity (%RH) for devices that report this
-
+- **Garage Simulations**
+  - Added `TimesOpened` Eve characteristic functionality to single garage door simulation
+  
 ### Changes
 
 - **Polling/Logging**

From 7f22be57aed6a081cdd19e1f18b82932ed8b9905 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 22 Jun 2021 08:36:15 +0100
Subject: [PATCH 2298/3183] 6.8.1-beta.25

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d43b2883..2a92223c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.8.1-beta.24",
+  "version": "6.8.1-beta.25",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index e8db65a4..06f6982b 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.8.1-beta.24",
+  "version": "6.8.1-beta.25",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 7b92f517e8a116dbf9faf8440d880cf49fee9f94 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 22 Jun 2021 09:42:27 +0100
Subject: [PATCH 2299/3183] TH10/16 only poll if mode not lan

---
 lib/device/simulation/cooler.js       | 18 ++++++++++--------
 lib/device/simulation/dehumidifier.js | 18 ++++++++++--------
 lib/device/simulation/heater.js       | 18 ++++++++++--------
 lib/device/simulation/humidifier.js   | 18 ++++++++++--------
 4 files changed, 40 insertions(+), 32 deletions(-)

diff --git a/lib/device/simulation/cooler.js b/lib/device/simulation/cooler.js
index 22d5b86d..5e80a992 100644
--- a/lib/device/simulation/cooler.js
+++ b/lib/device/simulation/cooler.js
@@ -159,15 +159,17 @@ module.exports = class deviceHeater {
     })
 
     // Set up an interval to get eWeLink to send regular temperature/humidity updates
-    setTimeout(() => {
-      this.internalUIUpdate()
-      this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
-    }, 5000)
+    if (platform.config.mode !== 'lan') {
+      setTimeout(() => {
+        this.internalUIUpdate()
+        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
+      }, 5000)
 
-    // Stop the intervals on Homebridge shutdown
-    platform.api.on('shutdown', () => {
-      clearInterval(this.intervalPoll)
-    })
+      // Stop the intervals on Homebridge shutdown
+      platform.api.on('shutdown', () => {
+        clearInterval(this.intervalPoll)
+      })
+    }
 
     // Output the customised options to the log
     const opts = JSON.stringify({
diff --git a/lib/device/simulation/dehumidifier.js b/lib/device/simulation/dehumidifier.js
index 7a8248f8..d27cb647 100644
--- a/lib/device/simulation/dehumidifier.js
+++ b/lib/device/simulation/dehumidifier.js
@@ -137,15 +137,17 @@ module.exports = class deviceHeater {
     })
 
     // Set up an interval to get eWeLink to send regular temperature/humidity updates
-    setTimeout(() => {
-      this.internalUIUpdate()
-      this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
-    }, 5000)
+    if (platform.config.mode !== 'lan') {
+      setTimeout(() => {
+        this.internalUIUpdate()
+        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
+      }, 5000)
 
-    // Stop the intervals on Homebridge shutdown
-    platform.api.on('shutdown', () => {
-      clearInterval(this.intervalPoll)
-    })
+      // Stop the intervals on Homebridge shutdown
+      platform.api.on('shutdown', () => {
+        clearInterval(this.intervalPoll)
+      })
+    }
 
     // Output the customised options to the log
     const opts = JSON.stringify({
diff --git a/lib/device/simulation/heater.js b/lib/device/simulation/heater.js
index 3589bc84..b0aa51c8 100644
--- a/lib/device/simulation/heater.js
+++ b/lib/device/simulation/heater.js
@@ -159,15 +159,17 @@ module.exports = class deviceHeater {
     })
 
     // Set up an interval to get eWeLink to send regular temperature/humidity updates
-    setTimeout(() => {
-      this.internalUIUpdate()
-      this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
-    }, 5000)
+    if (platform.config.mode !== 'lan') {
+      setTimeout(() => {
+        this.internalUIUpdate()
+        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
+      }, 5000)
 
-    // Stop the intervals on Homebridge shutdown
-    platform.api.on('shutdown', () => {
-      clearInterval(this.intervalPoll)
-    })
+      // Stop the intervals on Homebridge shutdown
+      platform.api.on('shutdown', () => {
+        clearInterval(this.intervalPoll)
+      })
+    }
 
     // Output the customised options to the log
     const opts = JSON.stringify({
diff --git a/lib/device/simulation/humidifier.js b/lib/device/simulation/humidifier.js
index f4a6c318..61f9c6b3 100644
--- a/lib/device/simulation/humidifier.js
+++ b/lib/device/simulation/humidifier.js
@@ -136,15 +136,17 @@ module.exports = class deviceHeater {
     })
 
     // Set up an interval to get eWeLink to send regular temperature/humidity updates
-    setTimeout(() => {
-      this.internalUIUpdate()
-      this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
-    }, 5000)
+    if (platform.config.mode !== 'lan') {
+      setTimeout(() => {
+        this.internalUIUpdate()
+        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
+      }, 5000)
 
-    // Stop the intervals on Homebridge shutdown
-    platform.api.on('shutdown', () => {
-      clearInterval(this.intervalPoll)
-    })
+      // Stop the intervals on Homebridge shutdown
+      platform.api.on('shutdown', () => {
+        clearInterval(this.intervalPoll)
+      })
+    }
 
     // Output the customised options to the log
     const opts = JSON.stringify({

From f1a7ef917e64a7d7ff399a744f4b550c31751f51 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 22 Jun 2021 09:42:30 +0100
Subject: [PATCH 2300/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fa7979e3..7b478b39 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -42,7 +42,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
   - Config option to offset the recorded humidity (%RH) for devices that report this
 - **Garage Simulations**
   - Added `TimesOpened` Eve characteristic functionality to single garage door simulation
-  
+
 ### Changes
 
 - **Polling/Logging**

From 9cda02a124b43a25a0a3ce0cdea650ec6911bec7 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 22 Jun 2021 09:45:22 +0100
Subject: [PATCH 2301/3183] DUALR3 only poll if mode not lan

---
 lib/device/outlet-double.js | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/lib/device/outlet-double.js b/lib/device/outlet-double.js
index 49d54627..5c2e20dd 100644
--- a/lib/device/outlet-double.js
+++ b/lib/device/outlet-double.js
@@ -74,15 +74,18 @@ module.exports = class deviceOutletDouble {
       log: platform.config.debugFakegato ? this.log : () => {}
     })
 
-    setTimeout(() => {
-      this.internalUIUpdate()
-      this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
-    }, 5000)
-
-    // Stop the intervals on Homebridge shutdown
-    platform.api.on('shutdown', () => {
-      clearInterval(this.intervalPoll)
-    })
+    // Set up an interval to get eWeLink to send regular power info updates
+    if (platform.config.mode !== 'lan') {
+      setTimeout(() => {
+        this.internalUIUpdate()
+        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
+      }, 5000)
+  
+      // Stop the intervals on Homebridge shutdown
+      platform.api.on('shutdown', () => {
+        clearInterval(this.intervalPoll)
+      })
+    }
 
     if (accessory.context.switchNumber === '0') {
       if (this.service.testCharacteristic(this.hapChar.OutletInUse)) {

From 398bd9922ca47489179f4660fe53ea3138c9a2d0 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 22 Jun 2021 11:14:31 +0100
Subject: [PATCH 2302/3183] allow manual IP for TH10/16

---
 config.schema.json     | 11 ++++++++++-
 lib/utils/constants.js |  1 +
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/config.schema.json b/config.schema.json
index a35c6368..8bc3d9f4 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -347,7 +347,7 @@
             "ipAddress": {
               "type": "string",
               "title": "IP Address",
-              "description": "You can manually set the IP address for this device if it cannot be discovered by the plugin. Only applicable to Sonoff D1.",
+              "description": "You can manually set the IP address for this Sonoff D1 if it cannot be discovered by the plugin.",
               "condition": {
                 "functionBody": "return model.mode !== 'wan';"
               }
@@ -425,6 +425,14 @@
               "placeholder": 30,
               "minimum": 1
             },
+            "ipAddress": {
+              "type": "string",
+              "title": "IP Address",
+              "description": "You can manually set the IP address for this Sonoff TH10/16 if it cannot be discovered by the plugin.",
+              "condition": {
+                "functionBody": "return model.mode !== 'wan';"
+              }
+            },
             "overrideLogging": {
               "type": "string",
               "title": "Override Logging Setting",
@@ -1029,6 +1037,7 @@
             "thDevices[].humidityOffset",
             "thDevices[].minTarget",
             "thDevices[].maxTarget",
+            "thDevices[].ipAddress",
             "thDevices[].overrideLogging"
           ]
         }
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 2c76a5fe..391e2455 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -112,6 +112,7 @@ module.exports = {
       'humidityOffset',
       'minTarget',
       'maxTarget',
+      'ipAddress',
       'overrideLogging'
     ],
     fanDevices: ['deviceId', 'label', 'hideLight', 'overrideLogging'],

From 7e09761c8e3925b5652b50e15070445a62ace126 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 22 Jun 2021 11:14:48 +0100
Subject: [PATCH 2303/3183] log as manual IP on plugin init

---
 lib/index.js         | 13 ++++++++-----
 lib/utils/lang-en.js |  1 +
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/lib/index.js b/lib/index.js
index 519972dc..0cf3688f 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1379,11 +1379,14 @@ class eWeLinkPlatform {
       }
 
       // Helpful logging for each device
-      const str = accessory.context.reachableLAN
-        ? this.lang.foundWithIP + ' [' + lanDevices.get(device.deviceid).ip + ']'
-        : this.consts.devices.lan.includes(uiid)
-        ? this.lang.lanUnreachable
-        : this.lang.lanUnsupported
+      const str =
+        accessory.context.reachableLAN && this.consts.devices.lan.includes(uiid)
+          ? this.ipOverride[device.deviceid]
+            ? this.lang.foundWithManIP + ' [' + this.ipOverride[device.deviceid] + ']'
+            : this.lang.foundWithIP + ' [' + lanDevices.get(device.deviceid).ip + ']'
+          : this.consts.devices.lan.includes(uiid)
+          ? this.lang.lanUnreachable
+          : this.lang.lanUnsupported
 
       // Update accessory characteristics with latest values
       if (wsClient && accessory.control && accessory.control.externalUpdate) {
diff --git a/lib/utils/lang-en.js b/lib/utils/lang-en.js
index c52bbf1b..1f75b60b 100644
--- a/lib/utils/lang-en.js
+++ b/lib/utils/lang-en.js
@@ -71,6 +71,7 @@ module.exports = {
   errLogin: 'An error occurred during http login()',
   eweError: 'An eWeLink error [500] occured, retrying in 30 seconds',
   foundWithIP: 'found locally with IP',
+  foundWithManIP: 'using manual IP',
   hbVersionFail: 'Your version of Homebridge is too low - please update to v1.3',
   httpDisabled: 'HTTP/WS clients disabled as',
   httpRetry: 'Unable to reach eWeLink, retrying in 30 seconds',

From 44f175117cb388b020e92b628655e96314432bfe Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 22 Jun 2021 11:14:53 +0100
Subject: [PATCH 2304/3183] formatting

---
 lib/device/outlet-double.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/device/outlet-double.js b/lib/device/outlet-double.js
index 5c2e20dd..3c312217 100644
--- a/lib/device/outlet-double.js
+++ b/lib/device/outlet-double.js
@@ -80,7 +80,7 @@ module.exports = class deviceOutletDouble {
         this.internalUIUpdate()
         this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
       }, 5000)
-  
+
       // Stop the intervals on Homebridge shutdown
       platform.api.on('shutdown', () => {
         clearInterval(this.intervalPoll)

From 89df8a57ae1dfdc1a3d872413359223f8c9c892b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 22 Jun 2021 11:15:22 +0100
Subject: [PATCH 2305/3183] 6.8.1-beta.26

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 2a92223c..5fcdd384 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.8.1-beta.25",
+  "version": "6.8.1-beta.26",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 06f6982b..83326e86 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.8.1-beta.25",
+  "version": "6.8.1-beta.26",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 5b297c9353fb9fd874f073729116bc44f74252af Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 22 Jun 2021 11:19:20 +0100
Subject: [PATCH 2306/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7b478b39..b19155cb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -30,6 +30,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 - **TH10/16 Devices**
   - Implemented polling as firmware 3.5.0 does not seem to send regular temperature updates
   - Implemented LAN mode for Accessory Simulations (eWeLink 'auto' mode is no longer used)
+  - Added option to specify a manual IP for a TH10/16
 - **POWR2/DUALR3 Devices**
   - Support for LAN mode control for DUALR3 in motor mode
   - [test] Polling via LAN mode to enable constant power attribute updates

From 10435db295940ccebbbd351231d6d0c6a32c7d0c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 22 Jun 2021 11:22:29 +0100
Subject: [PATCH 2307/3183] allow manual IP for iFan

---
 config.schema.json     | 9 +++++++++
 lib/utils/constants.js | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/config.schema.json b/config.schema.json
index 8bc3d9f4..8fa10b33 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -480,6 +480,14 @@
               "title": "Hide Light Switch",
               "description": "If true, the light switch will be hidden from HomeKit."
             },
+            "ipAddress": {
+              "type": "string",
+              "title": "IP Address",
+              "description": "You can manually set the IP address for this device if it cannot be discovered by the plugin.",
+              "condition": {
+                "functionBody": "return model.mode !== 'wan';"
+              }
+            },
             "overrideLogging": {
               "type": "string",
               "title": "Override Logging Setting",
@@ -1057,6 +1065,7 @@
             "fanDevices[].deviceId",
             "fanDevices[].label",
             "fanDevices[].hideLight",
+            "fanDevices[].ipAddress",
             "fanDevices[].overrideLogging"
           ]
         }
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 391e2455..af0bf82a 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -115,7 +115,7 @@ module.exports = {
       'ipAddress',
       'overrideLogging'
     ],
-    fanDevices: ['deviceId', 'label', 'hideLight', 'overrideLogging'],
+    fanDevices: ['deviceId', 'label', 'hideLight', 'ipAddress', 'overrideLogging'],
     sensorDevices: [
       'deviceId',
       'lowBattThreshold',

From a74b7f947ea4112d486abed7a0682b881e7b5e03 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 22 Jun 2021 11:22:31 +0100
Subject: [PATCH 2308/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b19155cb..276112e1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,10 +27,11 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 - **iFan Devices**
   - Support for LAN mode control
   - Previous fan speed will be used again after turning off and on
+  - Added option to specify a manual IP
 - **TH10/16 Devices**
   - Implemented polling as firmware 3.5.0 does not seem to send regular temperature updates
   - Implemented LAN mode for Accessory Simulations (eWeLink 'auto' mode is no longer used)
-  - Added option to specify a manual IP for a TH10/16
+  - Added option to specify a manual IP
 - **POWR2/DUALR3 Devices**
   - Support for LAN mode control for DUALR3 in motor mode
   - [test] Polling via LAN mode to enable constant power attribute updates

From 39d08dc1f57bb82bf5d4e8f41bc535243024c6e2 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 22 Jun 2021 11:45:04 +0100
Subject: [PATCH 2309/3183] new config section for rf bridges

---
 config.schema.json      | 47 ++++++++++++++++++++++++++++++++++++++---
 lib/device/rf-bridge.js |  4 ++--
 lib/device/rf-button.js |  2 +-
 lib/device/rf-sensor.js |  2 +-
 lib/index.js            | 12 ++++++-----
 lib/utils/constants.js  |  1 +
 6 files changed, 56 insertions(+), 12 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 8fa10b33..0771e9d9 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -592,9 +592,36 @@
           }
         }
       },
+      "rfDevices": {
+        "title": "RF Devices",
+        "description": "Applies to RF Bridge devices.",
+        "type": "array",
+        "items": {
+          "type": "object",
+          "properties": {
+            "deviceId": {
+              "type": "string",
+              "title": "Device ID"
+            },
+            "label": {
+              "title": "Label",
+              "type": "string",
+              "description": "This setting has no effect except to be a helpful label for identifying which device this is when editing the configuration."
+            },
+            "ipAddress": {
+              "type": "string",
+              "title": "IP Address",
+              "description": "You can manually set the IP address for this device if it cannot be discovered by the plugin.",
+              "condition": {
+                "functionBody": "return model.mode !== 'wan';"
+              }
+            }
+          }
+        }
+      },
       "bridgeSensors": {
         "title": "RF Sensor Devices",
-        "description": "Applies to RF Bridge sensors to expose different sensor types (<a href=\"https://github.com/bwp91/homebridge-ewelink/wiki/RF-Bridge-Sensors\" target=\"_blank\">more info</a>).",
+        "description": "Applies to RF Bridge subdevices to expose different sensor types (<a href=\"https://github.com/bwp91/homebridge-ewelink/wiki/RF-Bridge-Sensors\" target=\"_blank\">more info</a>).",
         "type": "array",
         "items": {
           "type": "object",
@@ -1095,10 +1122,24 @@
         }
       ]
     },
+    {
+      "key": "rfDevices",
+      "title": "RF Bridge Devices",
+      "description": "Applies to RF Bridge devices.",
+      "expandable": true,
+      "add": "Add Another Device",
+      "type": "array",
+      "items": [
+        {
+          "type": "fieldset",
+          "items": ["rfDevices[].deviceId", "rfDevices[].label", "rfDevices[].ipAddress"]
+        }
+      ]
+    },
     {
       "key": "bridgeSensors",
-      "title": "RF Sensor Devices",
-      "description": "Applies to RF Bridge sensors to expose different sensor types (<a href=\"https://github.com/bwp91/homebridge-ewelink/wiki/RF-Bridge-Sensors\" target=\"_blank\">more info</a>).",
+      "title": "RF Subdevices",
+      "description": "Applies to RF Bridge subdevices to expose different sensor types (<a href=\"https://github.com/bwp91/homebridge-ewelink/wiki/RF-Bridge-Sensors\" target=\"_blank\">more info</a>).",
       "expandable": true,
       "add": "Add Another Sensor",
       "type": "array",
diff --git a/lib/device/rf-bridge.js b/lib/device/rf-bridge.js
index a1968b6f..12343463 100644
--- a/lib/device/rf-bridge.js
+++ b/lib/device/rf-bridge.js
@@ -50,7 +50,7 @@ module.exports = class deviceRFBridge {
           }
         })
         if (subAccessory) {
-          const deviceConf = this.platform.rfDevices[subAccessory.context.hbDeviceId]
+          const deviceConf = this.platform.rfSubdevices[subAccessory.context.hbDeviceId]
           let enableLogging = !this.disableDeviceLogging
           if (deviceConf && deviceConf.overrideLogging) {
             switch (deviceConf.overrideLogging) {
@@ -101,7 +101,7 @@ module.exports = class deviceRFBridge {
               if (params[chan] === subAccessory.context.cacheLastAct) {
                 return
               }
-              const deviceConf = this.platform.rfDevices[subAccessory.context.hbDeviceId]
+              const deviceConf = this.platform.rfSubdevices[subAccessory.context.hbDeviceId]
               let enableLogging = !this.disableDeviceLogging
               if (deviceConf && deviceConf.overrideLogging) {
                 switch (deviceConf.overrideLogging) {
diff --git a/lib/device/rf-button.js b/lib/device/rf-button.js
index fe001d9d..f6064420 100644
--- a/lib/device/rf-button.js
+++ b/lib/device/rf-button.js
@@ -19,7 +19,7 @@ module.exports = class deviceRFButton {
     this.accessory = accessory
 
     // Set up custom variables for this device type
-    const deviceConf = platform.rfDevices[accessory.context.hbDeviceId]
+    const deviceConf = platform.rfSubdevices[accessory.context.hbDeviceId]
 
     // Set the correct logging variables for this accessory
     this.enableLogging = !platform.config.disableDeviceLogging
diff --git a/lib/device/rf-sensor.js b/lib/device/rf-sensor.js
index ca106b4f..8bad786b 100644
--- a/lib/device/rf-sensor.js
+++ b/lib/device/rf-sensor.js
@@ -15,7 +15,7 @@ module.exports = class deviceRFSensor {
     this.platform = platform
 
     // Set up custom variables for this device type
-    const deviceConf = platform.rfDevices[accessory.context.hbDeviceId]
+    const deviceConf = platform.rfSubdevices[accessory.context.hbDeviceId]
     this.sensorTimeLength =
       deviceConf && deviceConf.sensorTimeLength
         ? deviceConf.sensorTimeLength
diff --git a/lib/index.js b/lib/index.js
index 0cf3688f..448cd8fa 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -47,6 +47,7 @@ class eWeLinkPlatform {
       this.singleDevices = {}
       this.thDevices = {}
       this.rfDevices = {}
+      this.rfSubdevices = {}
       this.simulations = {}
       this.hideChannels = []
       this.hideMasters = []
@@ -145,7 +146,7 @@ class eWeLinkPlatform {
                 logRemove(key + '.' + id)
                 return
               }
-              this.rfDevices[id] = {}
+              this.rfSubdevices[id] = {}
               for (const [k, v] of entries) {
                 switch (k) {
                   case 'fullDeviceId':
@@ -158,7 +159,7 @@ class eWeLinkPlatform {
                     if (typeof v !== 'string' || !inSet) {
                       logIgnore(key + '.' + id + '.' + k)
                     } else {
-                      this.rfDevices[id][k] = inSet ? v : this.consts.defaultValues[k]
+                      this.rfSubdevices[id][k] = inSet ? v : this.consts.defaultValues[k]
                     }
                     break
                   }
@@ -170,12 +171,12 @@ class eWeLinkPlatform {
                     const intVal = parseInt(v)
                     if (isNaN(intVal)) {
                       logDefault(key + '.' + id + '.' + k, this.consts.defaultValues[k])
-                      this.rfDevices[id][k] = this.consts.defaultValues[k]
+                      this.rfSubdevices[id][k] = this.consts.defaultValues[k]
                     } else if (intVal < this.consts.minValues[k]) {
                       logIncrease(key + '.' + id + '.' + k, this.consts.minValues[k])
-                      this.rfDevices[id][k] = this.consts.minValues[k]
+                      this.rfSubdevices[id][k] = this.consts.minValues[k]
                     } else {
-                      this.rfDevices[id][k] = intVal
+                      this.rfSubdevices[id][k] = intVal
                     }
                     break
                   }
@@ -209,6 +210,7 @@ class eWeLinkPlatform {
         case 'lightDevices':
         case 'multiDevices':
         case 'outletDevices':
+        case 'rfDevices':
         case 'sensorDevices':
         case 'singleDevices':
         case 'thDevices':
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index af0bf82a..7db04458 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -126,6 +126,7 @@ module.exports = {
       'sensorTimeDifference',
       'overrideLogging'
     ],
+    rfDevices: ['deviceId', 'label', 'ipAddress'],
     groupTypes: [
       'blind',
       'cooler',

From 48df41342546a3e447d1a12f1c83f7f5b6c9696b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 22 Jun 2021 11:45:29 +0100
Subject: [PATCH 2310/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 276112e1..dc2beb0a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -37,6 +37,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
   - [test] Polling via LAN mode to enable constant power attribute updates
 - **RF Bridge Devices**
   - Ability to change sensor type and other configurable options without the need to re-add the accessory
+  - Added option to specify a manual IP for an RF Bridge
 - **Zigbee Button Device**
   - Comparison of trigger time against notification time to reduce duplicate accessory updates
   - Will no longer request current state when coming back online to reduce duplicate accessory updates

From 94ace1f3786252283ac07a369b3032f90571d000 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 22 Jun 2021 11:46:14 +0100
Subject: [PATCH 2311/3183] 6.8.1-beta.27

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 5fcdd384..d48b708c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.8.1-beta.26",
+  "version": "6.8.1-beta.27",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 83326e86..a88ca346 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.8.1-beta.26",
+  "version": "6.8.1-beta.27",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From d4cfbd851d59693de03293ef451dfefe9fc7a5db Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 22 Jun 2021 11:49:06 +0100
Subject: [PATCH 2312/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dc2beb0a..2d758baa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -68,7 +68,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
   - Expose a TH10/16 device as a _Humidifier_
   - Expose a TH10/16 device as a _Dehumidfier_
 - **LAN Mode**
-  - Enabled for TH10/16 (requires firmware 3.5.0, not available when using an accessory simulation)
+  - Enabled for TH10/16 (requires firmware 3.5.0)
 - **Plugin UI**
   - Show MAC address of accessory in plugin-ui
 

From dbed210d4900d3cc922676f00c9257e46766f380 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 22 Jun 2021 11:59:45 +0100
Subject: [PATCH 2313/3183] overrideLogging for main rf devices

---
 config.schema.json      | 30 +++++++++++++++++++++++++++++-
 lib/device/rf-bridge.js | 25 +++++++++++++++++++++++++
 lib/utils/constants.js  |  2 +-
 3 files changed, 55 insertions(+), 2 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 0771e9d9..c74b4f6f 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -615,6 +615,29 @@
               "condition": {
                 "functionBody": "return model.mode !== 'wan';"
               }
+            },
+            "overrideLogging": {
+              "type": "string",
+              "title": "Override Logging Setting",
+              "description": "Override global logging setting for this device.",
+              "oneOf": [
+                {
+                  "title": "Default (Use Global Setting)",
+                  "enum": ["default"]
+                },
+                {
+                  "title": "Enable Standard Logging",
+                  "enum": ["standard"]
+                },
+                {
+                  "title": "Enable Debug Logging",
+                  "enum": ["debug"]
+                },
+                {
+                  "title": "Disable All Logging",
+                  "enum": ["disable"]
+                }
+              ]
             }
           }
         }
@@ -1132,7 +1155,12 @@
       "items": [
         {
           "type": "fieldset",
-          "items": ["rfDevices[].deviceId", "rfDevices[].label", "rfDevices[].ipAddress"]
+          "items": [
+            "rfDevices[].deviceId",
+            "rfDevices[].label",
+            "rfDevices[].ipAddress",
+            "rfDevices[].overrideLogging"
+          ]
         }
       ]
     },
diff --git a/lib/device/rf-bridge.js b/lib/device/rf-bridge.js
index 12343463..98aeaa0a 100644
--- a/lib/device/rf-bridge.js
+++ b/lib/device/rf-bridge.js
@@ -21,9 +21,34 @@ module.exports = class deviceRFBridge {
     this.name = accessory.displayName
     this.accessory = accessory
 
+    // Set up custom variables for this device type
+    const deviceConf = platform.rfDevices[accessory.context.eweDeviceId]
+
     // Set the correct logging variables for this accessory
     this.enableLogging = !platform.config.disableDeviceLogging
     this.enableDebugLogging = platform.config.debug
+    if (deviceConf && deviceConf.overrideLogging) {
+      switch (deviceConf.overrideLogging) {
+        case 'standard':
+          this.enableLogging = true
+          this.enableDebugLogging = false
+          break
+        case 'debug':
+          this.enableLogging = true
+          this.enableDebugLogging = true
+          break
+        case 'disable':
+          this.enableLogging = false
+          this.enableDebugLogging = false
+          break
+      }
+    }
+
+    // Output the customised options to the log
+    const opts = JSON.stringify({
+      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable'
+    })
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
 
   async externalUpdate (params) {
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 7db04458..1d9f7c0e 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -126,7 +126,7 @@ module.exports = {
       'sensorTimeDifference',
       'overrideLogging'
     ],
-    rfDevices: ['deviceId', 'label', 'ipAddress'],
+    rfDevices: ['deviceId', 'label', 'ipAddress', 'overrideLogging'],
     groupTypes: [
       'blind',
       'cooler',

From b24056191467303155a067f9348b9ff364286777 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 22 Jun 2021 12:00:38 +0100
Subject: [PATCH 2314/3183] 6.8.1-beta.28

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d48b708c..9768379a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.8.1-beta.27",
+  "version": "6.8.1-beta.28",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index a88ca346..3f73dbf2 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.8.1-beta.27",
+  "version": "6.8.1-beta.28",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 1e234ad0dfe4a30b6cc838a9e999c29c1324ca63 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 22 Jun 2021 12:30:53 +0100
Subject: [PATCH 2315/3183] resetOnStartup option for rfBridge

---
 config.schema.json     |  6 ++++++
 lib/index.js           | 15 ++++++++-------
 lib/utils/constants.js |  2 +-
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index c74b4f6f..b73af2d7 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -608,6 +608,11 @@
               "type": "string",
               "description": "This setting has no effect except to be a helpful label for identifying which device this is when editing the configuration."
             },
+            "resetOnStartup": {
+              "title": "Reset Subdevices",
+              "type": "boolean",
+              "description": "If true, the plugin will remove and re-add all subdevices when the plugin initialises. Useful if adding or removing subdevices via the eWeLink app."
+            },
             "ipAddress": {
               "type": "string",
               "title": "IP Address",
@@ -1158,6 +1163,7 @@
           "items": [
             "rfDevices[].deviceId",
             "rfDevices[].label",
+            "rfDevices[].resetOnStartup",
             "rfDevices[].ipAddress",
             "rfDevices[].overrideLogging"
           ]
diff --git a/lib/index.js b/lib/index.js
index 448cd8fa..2ff47216 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -283,6 +283,7 @@ class eWeLinkPlatform {
                   case 'hideLight':
                   case 'hideLongDouble':
                   case 'hideSwitch':
+                  case 'resetOnStartup':
                   case 'scaleBattery':
                   case 'showAsOutlet':
                   case 'showAsSwitch':
@@ -1197,6 +1198,10 @@ class eWeLinkPlatform {
         // We don't want to add the main bridge as a visible accessory in Homebridge
         this.hideMasters.push(device.deviceid)
 
+        // Flag used for later to remove and re-add the subdevices if user configured
+        const resetRF =
+          this.rfDevices[device.deviceid] && this.rfDevices[device.deviceid].resetOnStartup
+
         // Loop through each sub device connected to the RF Bridge
         rfMap.forEach(subDevice => {
           const swNumber = rfChlCounter + 1
@@ -1240,13 +1245,9 @@ class eWeLinkPlatform {
             name: subDevice.name
           }
 
-          // Check if the sub accessory already exists in Homebridge
-          if ((subAccessory = devicesInHB.get(uuidsub))) {
-            // Check for any changes given RF structure (ie added/deleted RF subdevices)
-            if (subAccessory.context.swNumber !== swNumber) {
-              // Remove the existing sub accessory if any changes are found
-              this.removeAccessory(subAccessory)
-            }
+          // Check if we need to reset the RF devices
+          if (resetRF && (subAccessory = devicesInHB.get(uuidsub))) {
+            this.removeAccessory(subAccessory)
           }
 
           // Get the sub accessory if it's new or hasn't been removed above
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 1d9f7c0e..8da0dcb6 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -126,7 +126,7 @@ module.exports = {
       'sensorTimeDifference',
       'overrideLogging'
     ],
-    rfDevices: ['deviceId', 'label', 'ipAddress', 'overrideLogging'],
+    rfDevices: ['deviceId', 'label', 'resetOnStartup', 'ipAddress', 'overrideLogging'],
     groupTypes: [
       'blind',
       'cooler',

From 2f43677cc9265bd52a4729dec5b8a90e47203d71 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 22 Jun 2021 12:33:06 +0100
Subject: [PATCH 2316/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2d758baa..b16b7e3a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -37,6 +37,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
   - [test] Polling via LAN mode to enable constant power attribute updates
 - **RF Bridge Devices**
   - Ability to change sensor type and other configurable options without the need to re-add the accessory
+  - Configuration option `resetOnStartup` to reset the subdevices, useful when adding/removing subdevices to the bridge
   - Added option to specify a manual IP for an RF Bridge
 - **Zigbee Button Device**
   - Comparison of trigger time against notification time to reduce duplicate accessory updates

From 64cd48a01b420735b2c66fbb43ed0730438a0bc2 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 22 Jun 2021 12:33:37 +0100
Subject: [PATCH 2317/3183] 6.8.1-beta.29

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 9768379a..3036dd92 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.8.1-beta.28",
+  "version": "6.8.1-beta.29",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 3f73dbf2..f88cefae 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.8.1-beta.28",
+  "version": "6.8.1-beta.29",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 0324a875e4416abb9a94550e06afbc9cb74cc4fd Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 22 Jun 2021 12:35:38 +0100
Subject: [PATCH 2318/3183] show resetOnStartup opt on device init

---
 lib/device/rf-bridge.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/device/rf-bridge.js b/lib/device/rf-bridge.js
index 98aeaa0a..4b654f31 100644
--- a/lib/device/rf-bridge.js
+++ b/lib/device/rf-bridge.js
@@ -23,6 +23,7 @@ module.exports = class deviceRFBridge {
 
     // Set up custom variables for this device type
     const deviceConf = platform.rfDevices[accessory.context.eweDeviceId]
+    const resetOnStartup = deviceConf && deviceConf.resetOnStartup
 
     // Set the correct logging variables for this accessory
     this.enableLogging = !platform.config.disableDeviceLogging
@@ -46,7 +47,8 @@ module.exports = class deviceRFBridge {
 
     // Output the customised options to the log
     const opts = JSON.stringify({
-      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable'
+      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
+      resetOnStartup
     })
     this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }

From 4359abf016997b5822fa7ca7b38266589a8dbc41 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 22 Jun 2021 13:27:24 +0100
Subject: [PATCH 2319/3183] log on init if discovered ip is different to manual
 ip

---
 lib/index.js         | 71 +++++++++++++++++++++++++++-----------------
 lib/utils/lang-en.js |  5 ++--
 2 files changed, 47 insertions(+), 29 deletions(-)

diff --git a/lib/index.js b/lib/index.js
index 2ff47216..8f46ac8f 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1365,7 +1365,10 @@ class eWeLinkPlatform {
       accessory.context.firmware = device.params.fwVersion || plugin.version
       accessory.context.reachableWAN = wsClient && device.online
       accessory.context.reachableLAN =
-        lanClient && lanDevices.has(device.deviceid) && lanDevices.get(device.deviceid).ip
+        this.consts.devices.lan.includes(uiid) &&
+        lanClient &&
+        lanDevices.has(device.deviceid) &&
+        lanDevices.get(device.deviceid).ip
       accessory.context.eweBrandName = device.brandName
       accessory.context.eweBrandLogo = device.brandLogo
       accessory.context.eweShared =
@@ -1382,14 +1385,23 @@ class eWeLinkPlatform {
       }
 
       // Helpful logging for each device
-      const str =
-        accessory.context.reachableLAN && this.consts.devices.lan.includes(uiid)
-          ? this.ipOverride[device.deviceid]
-            ? this.lang.foundWithManIP + ' [' + this.ipOverride[device.deviceid] + ']'
-            : this.lang.foundWithIP + ' [' + lanDevices.get(device.deviceid).ip + ']'
-          : this.consts.devices.lan.includes(uiid)
-          ? this.lang.lanUnreachable
-          : this.lang.lanUnsupported
+      const str = accessory.context.reachableLAN
+        ? this.lang.foundWithIP + ' [' + lanDevices.get(device.deviceid).ip + ']'
+        : this.lang.lanUnsupported
+
+      // Check to see if the discovered IP is different from any manually configured IP
+      if (
+        accessory.context.reachableLAN &&
+        this.ipOverride[device.deviceid] &&
+        this.ipOverride[device.deviceid] !== lanDevices.get(device.deviceid).ip
+      ) {
+        this.log.warn(
+          '[%s] %s [%s].',
+          accessory.displayName,
+          this.lang.lanIPDifferent,
+          lanDevices.get(device.deviceid).ip
+        )
+      }
 
       // Update accessory characteristics with latest values
       if (wsClient && accessory.control && accessory.control.externalUpdate) {
@@ -1659,25 +1671,9 @@ class eWeLinkPlatform {
         }
       }
       if (device.params.updateSource === 'LAN') {
-        // Check to see if the IP of the device has changed
-        if (
-          accessory.context.reachableLAN &&
-          device.params.ip &&
-          device.params.ip !== accessory.context.ip
-        ) {
-          accessory.context.ip = device.params.ip
-          this.api.updatePlatformAccessories(plugin.name, plugin.alias, [accessory])
-          devicesInHB.set(accessory.UUID, accessory)
-
-          // Flag this true to update the sub accessories later
-          reachableChange = true
-        }
+        // The update is from LAN so it must be online
         if (!accessory.context.reachableLAN) {
-          // The update is from LAN so it must be online
           accessory.context.reachableLAN = true
-          accessory.context.ip = device.params.ip
-          this.api.updatePlatformAccessories(plugin.name, plugin.alias, [accessory])
-          devicesInHB.set(accessory.UUID, accessory)
 
           // Flag this true to update the sub accessories later
           reachableChange = true
@@ -1696,6 +1692,25 @@ class eWeLinkPlatform {
             }
           }
         }
+
+        // Check to see if the IP of the device has changed
+        if (device.params.ip && device.params.ip !== accessory.context.ip) {
+          accessory.context.ip = device.params.ip
+
+          // Flag this true to update the sub accessories later
+          reachableChange = true
+
+          // Log the new ip of the device
+          if (accessory.control.enableLogging) {
+            this.log('[%s] %s [%s].', accessory.displayName, this.lang.newIP, device.params.ip)
+          }
+        }
+
+        // Update the accessory context if the device is back online or the IP changed
+        if (reachableChange) {
+          this.api.updatePlatformAccessories(plugin.name, plugin.alias, [accessory])
+          devicesInHB.set(accessory.UUID, accessory)
+        }
       }
 
       // Update this new online/offline status for all switches of multi channel devices
@@ -1713,7 +1728,9 @@ class eWeLinkPlatform {
             // Update the LAN status
             if (device.params.updateSource === 'LAN') {
               subAccessory.context.reachableLAN = true
-              subAccessory.context.ip = device.params.ip
+              if (device.params.ip) {
+                subAccessory.context.ip = device.params.ip
+              }
             }
 
             // Save the sub accessory updates to the platform
diff --git a/lib/utils/lang-en.js b/lib/utils/lang-en.js
index 1f75b60b..033bfc83 100644
--- a/lib/utils/lang-en.js
+++ b/lib/utils/lang-en.js
@@ -81,12 +81,12 @@ module.exports = {
   invalidConfig: 'invalid config',
   lanDisabled: 'LAN mode is disabled',
   lanErr: 'unknown LAN error',
+  lanIPDifferent: 'ignoring manual IP since discovered with different IP',
   lanMonitor: 'LAN monitoring started',
   lanNotSup: 'LAN mode is not supported for sending updates to this device',
   lanStarted: 'LAN discovery complete',
   lanStarting: 'LAN discovery starting',
-  lanUnreachable: 'LAN mode unavailable as unreachable',
-  lanUnsupported: 'LAN mode unavailable as not supported',
+  lanUnsupported: 'LAN mode unavailable as not discovered/supported',
   leakNo: 'leak not detected',
   leakYes: 'leak detected',
   lockLocked: 'locked',
@@ -94,6 +94,7 @@ module.exports = {
   missingCreds: 'eWeLink credentials not configured',
   motionNo: 'motion not detected',
   motionYes: 'motion detected',
+  newIP: 'changed IP address to',
   newRegionRec: 'New HTTP API host received',
   noAuthRec: 'No auth token received',
   noGarageForOD: 'No corresponding garage door accessory found',

From 8b3888d5c638340c1148e6393372c273c2ad3928 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 22 Jun 2021 13:29:25 +0100
Subject: [PATCH 2320/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b16b7e3a..0346fcb8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -51,7 +51,9 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 - **Polling/Logging**
   - Power reading polling for POWR2/DUALR3 increased to two minutes
-  - Changes to the startup logging including always logging accessory configuration options
+  - Changes to the startup logging:
+    - Accessory configuration options will always be logged on plugin startup
+    - Warning alerts if a device's discovered IP is different to any manually configured IP
 - **Configuration**
   - `sensorTimeDifference` minimum reduced to 5 seconds and default reduced to 60 seconds
 - **Dependencies**

From ca78cafa1b09875db263ce418cd3c105199c8fa6 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 22 Jun 2021 13:30:36 +0100
Subject: [PATCH 2321/3183] 6.8.1-beta.30

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 3036dd92..f64bb6cf 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.8.1-beta.29",
+  "version": "6.8.1-beta.30",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index f88cefae..12343afc 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.8.1-beta.29",
+  "version": "6.8.1-beta.30",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From c4c19209abf2b2f431dfef74404eab8f8f49b2cb Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 22 Jun 2021 15:25:20 +0100
Subject: [PATCH 2322/3183] update descriptions for logging settings

---
 config.schema.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index b73af2d7..da12479b 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -88,12 +88,12 @@
       "disableDeviceLogging": {
         "type": "boolean",
         "title": "Disable Device Logging",
-        "description": "If true, updates for all devices will not be added to the log when they are controlled."
+        "description": "Global logging setting for accessory status changes. If true then accessory status changes will not be logged. This can also be set per accessory later in the config."
       },
       "debug": {
         "title": "Debug Logging",
         "type": "boolean",
-        "description": "If true, debug information will be added to the log."
+        "description": "Global logging setting for the plugin. If true then debug information will be added to the log. This can also be set per accessory later in the config.."
       },
       "debugFakegato": {
         "title": "Debug Fakegato",

From 059f6b9d2bcd75867c8890e7e2c0121721dab4f8 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 22 Jun 2021 15:35:49 +0100
Subject: [PATCH 2323/3183] typo in desc

---
 config.schema.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config.schema.json b/config.schema.json
index da12479b..35f416e0 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -93,7 +93,7 @@
       "debug": {
         "title": "Debug Logging",
         "type": "boolean",
-        "description": "Global logging setting for the plugin. If true then debug information will be added to the log. This can also be set per accessory later in the config.."
+        "description": "Global logging setting for the plugin. If true then debug information will be added to the log. This can also be set per accessory later in the config."
       },
       "debugFakegato": {
         "title": "Debug Fakegato",

From 651e677aad18f4a101ad15bc931ccbe701998163 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 22 Jun 2021 17:54:11 +0100
Subject: [PATCH 2324/3183] [test] DUALR3 LAN polling for updates

---
 lib/device/outlet-double.js | 4 ++--
 lib/device/outlet-power.js  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/device/outlet-double.js b/lib/device/outlet-double.js
index 3c312217..7d59aca4 100644
--- a/lib/device/outlet-double.js
+++ b/lib/device/outlet-double.js
@@ -75,7 +75,7 @@ module.exports = class deviceOutletDouble {
     })
 
     // Set up an interval to get eWeLink to send regular power info updates
-    if (platform.config.mode !== 'lan') {
+    // if (platform.config.mode !== 'lan') {
       setTimeout(() => {
         this.internalUIUpdate()
         this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
@@ -85,7 +85,7 @@ module.exports = class deviceOutletDouble {
       platform.api.on('shutdown', () => {
         clearInterval(this.intervalPoll)
       })
-    }
+    // }
 
     if (accessory.context.switchNumber === '0') {
       if (this.service.testCharacteristic(this.hapChar.OutletInUse)) {
diff --git a/lib/device/outlet-power.js b/lib/device/outlet-power.js
index 19108490..85412bed 100644
--- a/lib/device/outlet-power.js
+++ b/lib/device/outlet-power.js
@@ -217,7 +217,7 @@ module.exports = class deviceOutletPower {
           '[%s] %s%s%s.',
           this.name,
           this.funcs.hasProperty(params, 'power')
-            ? ' ' + this.lang.curPower + ' [' + params.power + 'W]'
+            ? this.lang.curPower + ' [' + params.power + 'W]'
             : '',
           this.funcs.hasProperty(params, 'voltage')
             ? ' ' + this.lang.curVolt + ' [' + params.voltage + 'V]'

From d43186b276c9c8c12067111632c04851089eca1e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 22 Jun 2021 17:57:17 +0100
Subject: [PATCH 2325/3183] 6.8.1-beta.31

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index f64bb6cf..fc5331ec 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.8.1-beta.30",
+  "version": "6.8.1-beta.31",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 12343afc..7b699d95 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.8.1-beta.30",
+  "version": "6.8.1-beta.31",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 11726c6ce828cee75945fd75c00aa8a0145984c7 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 22 Jun 2021 19:03:56 +0100
Subject: [PATCH 2326/3183] [test] polling for dualr3

---
 lib/connection/lan.js       |  2 +-
 lib/device/outlet-double.js | 20 +++++++++++---------
 lib/utils/constants.js      |  3 +++
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/lib/connection/lan.js b/lib/connection/lan.js
index ce980b91..f8dc0bab 100644
--- a/lib/connection/lan.js
+++ b/lib/connection/lan.js
@@ -214,7 +214,7 @@ module.exports = class connectionLAN {
         // Use hasProperty has location can be INT 0
         params.location = json.params.location
         suffix = 'location'
-      } else if (json.params.uiActive && deviceInfo.uiid !== 15) {
+      } else if (json.params.uiActive && deviceInfo.uiid !== 15 && deviceInfo.uiid !== 126) {
         // Not supported at least for TH10/16
         params.uiActive = json.params.uiActive
         suffix = 'monitor'
diff --git a/lib/device/outlet-double.js b/lib/device/outlet-double.js
index 7d59aca4..28ea5681 100644
--- a/lib/device/outlet-double.js
+++ b/lib/device/outlet-double.js
@@ -74,20 +74,20 @@ module.exports = class deviceOutletDouble {
       log: platform.config.debugFakegato ? this.log : () => {}
     })
 
-    // Set up an interval to get eWeLink to send regular power info updates
-    // if (platform.config.mode !== 'lan') {
+    if (accessory.context.switchNumber === '0') {
+      // Set up an interval to get eWeLink to send regular power info updates
+      // if (platform.config.mode !== 'lan') {
       setTimeout(() => {
         this.internalUIUpdate()
-        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
+        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 60000)
       }, 5000)
 
       // Stop the intervals on Homebridge shutdown
       platform.api.on('shutdown', () => {
         clearInterval(this.intervalPoll)
       })
-    // }
+      // }
 
-    if (accessory.context.switchNumber === '0') {
       if (this.service.testCharacteristic(this.hapChar.OutletInUse)) {
         this.service.removeCharacteristic(this.service.getCharacteristic(this.hapChar.OutletInUse))
       }
@@ -219,15 +219,17 @@ module.exports = class deviceOutletDouble {
 
   async internalUIUpdate () {
     try {
-      const params = { uiActive: 120 }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
+      await this.platform.sendDeviceUpdate(this.accessory, { uiActive: { outlet: 0, time: 60 } })
+      await this.funcs.sleep(2000)
+      await this.platform.sendDeviceUpdate(this.accessory, { uiActive: { outlet: 1, time: 60 } })
     } catch (err) {
-      // Suppress errors here
+      this.log.error(err)
     }
   }
 
   async externalUpdate (params) {
     try {
+      this.log.warn(params)
       const idToCheck = this.accessory.context.eweDeviceId + 'SW'
       let primaryState = false
       for (let i = 1; i <= 2; i++) {
@@ -289,7 +291,7 @@ module.exports = class deviceOutletDouble {
             this.log(
               '[%s] %s%s%s.',
               this.name,
-              power !== undefined ? ' ' + this.lang.curPower + ' [' + power + 'W]' : '',
+              power !== undefined ? this.lang.curPower + ' [' + power + 'W]' : '',
               voltage !== undefined ? ' ' + this.lang.curVolt + ' [' + voltage + 'V]' : '',
               current !== undefined ? ' ' + this.lang.curCurr + ' [' + current + 'A]' : ''
             )
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 8da0dcb6..0f1c1bfb 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -192,6 +192,7 @@ module.exports = {
   },
 
   paramsToKeep: [
+    'actPow_',
     'battery',
     'bright',
     'brightness',
@@ -205,6 +206,7 @@ module.exports = {
     'current',
     'currentHumidity',
     'currentTemperature',
+    'current_',
     'currLocation',
     'fan',
     'humidity',
@@ -237,6 +239,7 @@ module.exports = {
     'trigTime',
     'type',
     'voltage',
+    'voltage_',
     'white',
     'workMode',
     'workState',

From 104d47ac05ac5f48511197996d6f9a295c378e6d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 22 Jun 2021 19:04:46 +0100
Subject: [PATCH 2327/3183] 6.8.1-beta.32

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index fc5331ec..017169ad 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.8.1-beta.31",
+  "version": "6.8.1-beta.32",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 7b699d95..c64e1194 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.8.1-beta.31",
+  "version": "6.8.1-beta.32",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From d18ffaa3ae6b39ea823c45bf33260c3104074d8e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 22 Jun 2021 19:16:13 +0100
Subject: [PATCH 2328/3183] housekeeping dualr3 as outlet

---
 lib/device/outlet-double.js | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/lib/device/outlet-double.js b/lib/device/outlet-double.js
index 28ea5681..a4aae875 100644
--- a/lib/device/outlet-double.js
+++ b/lib/device/outlet-double.js
@@ -76,17 +76,17 @@ module.exports = class deviceOutletDouble {
 
     if (accessory.context.switchNumber === '0') {
       // Set up an interval to get eWeLink to send regular power info updates
-      // if (platform.config.mode !== 'lan') {
-      setTimeout(() => {
-        this.internalUIUpdate()
-        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 60000)
-      }, 5000)
-
-      // Stop the intervals on Homebridge shutdown
-      platform.api.on('shutdown', () => {
-        clearInterval(this.intervalPoll)
-      })
-      // }
+      if (platform.config.mode !== 'lan') {
+        setTimeout(() => {
+          this.internalUIUpdate()
+          this.intervalPoll = setInterval(() => this.internalUIUpdate(), 60000)
+        }, 5000)
+  
+        // Stop the intervals on Homebridge shutdown
+        platform.api.on('shutdown', () => {
+          clearInterval(this.intervalPoll)
+        })
+      }
 
       if (this.service.testCharacteristic(this.hapChar.OutletInUse)) {
         this.service.removeCharacteristic(this.service.getCharacteristic(this.hapChar.OutletInUse))
@@ -223,13 +223,12 @@ module.exports = class deviceOutletDouble {
       await this.funcs.sleep(2000)
       await this.platform.sendDeviceUpdate(this.accessory, { uiActive: { outlet: 1, time: 60 } })
     } catch (err) {
-      this.log.error(err)
+      // Suppress errors here
     }
   }
 
   async externalUpdate (params) {
     try {
-      this.log.warn(params)
       const idToCheck = this.accessory.context.eweDeviceId + 'SW'
       let primaryState = false
       for (let i = 1; i <= 2; i++) {
@@ -284,13 +283,13 @@ module.exports = class deviceOutletDouble {
           }
           if (this.funcs.hasProperty(params, 'current_0' + (i - 1))) {
             current = parseInt(params['current_0' + (i - 1)]) / 100
-            this.service.updateCharacteristic(this.eveChar.ElectricCurrent, current)
+            service.updateCharacteristic(this.eveChar.ElectricCurrent, current)
             logger = true
           }
           if (params.updateSource && logger && this.enableLogging) {
             this.log(
               '[%s] %s%s%s.',
-              this.name,
+              subAccessory.displayName,
               power !== undefined ? this.lang.curPower + ' [' + power + 'W]' : '',
               voltage !== undefined ? ' ' + this.lang.curVolt + ' [' + voltage + 'V]' : '',
               current !== undefined ? ' ' + this.lang.curCurr + ' [' + current + 'A]' : ''

From 13143ee5ddb2a580084a983f2d4425ceda2b00c9 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 22 Jun 2021 19:17:11 +0100
Subject: [PATCH 2329/3183] Update outlet-double.js

---
 lib/device/outlet-double.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/device/outlet-double.js b/lib/device/outlet-double.js
index a4aae875..09c02837 100644
--- a/lib/device/outlet-double.js
+++ b/lib/device/outlet-double.js
@@ -79,7 +79,7 @@ module.exports = class deviceOutletDouble {
       if (platform.config.mode !== 'lan') {
         setTimeout(() => {
           this.internalUIUpdate()
-          this.intervalPoll = setInterval(() => this.internalUIUpdate(), 60000)
+          this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
         }, 5000)
   
         // Stop the intervals on Homebridge shutdown
@@ -219,9 +219,9 @@ module.exports = class deviceOutletDouble {
 
   async internalUIUpdate () {
     try {
-      await this.platform.sendDeviceUpdate(this.accessory, { uiActive: { outlet: 0, time: 60 } })
+      await this.platform.sendDeviceUpdate(this.accessory, { uiActive: { outlet: 0, time: 120 } })
       await this.funcs.sleep(2000)
-      await this.platform.sendDeviceUpdate(this.accessory, { uiActive: { outlet: 1, time: 60 } })
+      await this.platform.sendDeviceUpdate(this.accessory, { uiActive: { outlet: 1, time: 120 } })
     } catch (err) {
       // Suppress errors here
     }

From 2869a1166daf90c1d701ca12609be9d7b337489a Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 22 Jun 2021 19:17:48 +0100
Subject: [PATCH 2330/3183] 6.8.1-beta.33

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 017169ad..73bf7bd0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.8.1-beta.32",
+  "version": "6.8.1-beta.33",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index c64e1194..cacd6320 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.8.1-beta.32",
+  "version": "6.8.1-beta.33",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From e0450ad387eb8dd7bf62bb0e961c48cc245d335b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 22 Jun 2021 19:32:07 +0100
Subject: [PATCH 2331/3183] Update constants.js

---
 lib/utils/constants.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 0f1c1bfb..12d29b76 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -197,7 +197,6 @@ module.exports = {
     'bright',
     'brightness',
     'channel',
-    'channel0',
     'cmd',
     'color',
     'colorB',

From bcaefe3eb6e0d56ae559110d80e729a650d827ad Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 22 Jun 2021 19:32:11 +0100
Subject: [PATCH 2332/3183] Update outlet-double.js

---
 lib/device/outlet-double.js | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/lib/device/outlet-double.js b/lib/device/outlet-double.js
index 09c02837..e54e4a64 100644
--- a/lib/device/outlet-double.js
+++ b/lib/device/outlet-double.js
@@ -89,24 +89,32 @@ module.exports = class deviceOutletDouble {
       }
 
       if (this.service.testCharacteristic(this.hapChar.OutletInUse)) {
-        this.service.removeCharacteristic(this.service.getCharacteristic(this.hapChar.OutletInUse))
+        this.service.removeCharacteristic(
+          this.service.getCharacteristic(this.hapChar.OutletInUse)
+        )
       }
       if (this.service.testCharacteristic(this.eveChar.Voltage)) {
-        this.service.removeCharacteristic(this.service.getCharacteristic(this.eveChar.Voltage))
+        this.service.removeCharacteristic(this.service.getCharacteristic(
+          this.eveChar.Voltage)
+        )
+      }
+      if (this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
         this.service.removeCharacteristic(
           this.service.getCharacteristic(this.eveChar.CurrentConsumption)
         )
+      }
+      if (this.service.testCharacteristic(this.eveChar.ElectricCurrent)) {
         this.service.removeCharacteristic(
           this.service.getCharacteristic(this.eveChar.ElectricCurrent)
         )
+      }
+      if (this.service.testCharacteristic(this.eveChar.TotalConsumption)) {
         this.service.removeCharacteristic(
           this.service.getCharacteristic(this.eveChar.TotalConsumption)
         )
       }
-    }
-
-    // Output the customised options to the log
-    if (accessory.context.switchNumber === '0') {
+      
+      // Output the customised options to the log
       const opts = JSON.stringify({
         hideChannels: this.hideChannels,
         inUsePowerThreshold: this.inUsePowerThreshold,

From 4a68a810969eec0d9865390576f76a5e7e6cc277 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 22 Jun 2021 19:35:16 +0100
Subject: [PATCH 2333/3183] Update outlet-double.js

---
 lib/device/outlet-double.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/device/outlet-double.js b/lib/device/outlet-double.js
index e54e4a64..7bde0c83 100644
--- a/lib/device/outlet-double.js
+++ b/lib/device/outlet-double.js
@@ -60,7 +60,6 @@ module.exports = class deviceOutletDouble {
         this.service.addCharacteristic(this.eveChar.Voltage)
         this.service.addCharacteristic(this.eveChar.CurrentConsumption)
         this.service.addCharacteristic(this.eveChar.ElectricCurrent)
-        this.service.addCharacteristic(this.eveChar.TotalConsumption)
       }
     }
 
@@ -122,6 +121,12 @@ module.exports = class deviceOutletDouble {
       })
       this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
     }
+    
+    if (this.service.testCharacteristic(this.eveChar.TotalConsumption)) {
+      this.service.removeCharacteristic(
+        this.service.getCharacteristic(this.eveChar.TotalConsumption)
+      )
+    }
   }
 
   async internalStateUpdate (value) {

From a367223ce9b6a9bf8a499215d92b53d19ca3014b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 22 Jun 2021 19:35:48 +0100
Subject: [PATCH 2334/3183] 6.8.1-beta.34

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 73bf7bd0..9d50e609 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.8.1-beta.33",
+  "version": "6.8.1-beta.34",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index cacd6320..10ef7eab 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.8.1-beta.33",
+  "version": "6.8.1-beta.34",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 66089baa49065c3dc6876a9e3a398a098264b803 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 22 Jun 2021 19:43:17 +0100
Subject: [PATCH 2335/3183] Update lan.js

---
 lib/connection/lan.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/connection/lan.js b/lib/connection/lan.js
index f8dc0bab..86ec1d61 100644
--- a/lib/connection/lan.js
+++ b/lib/connection/lan.js
@@ -210,12 +210,12 @@ module.exports = class connectionLAN {
           }
         }
         suffix = 'switch'
-      } else if (deviceInfo.uiid === 126 && this.funcs.hasProperty(json.params, 'location')) {
+      } else if (this.funcs.hasProperty(json.params, 'location') && deviceInfo.uiid === 126) {
         // Use hasProperty has location can be INT 0
         params.location = json.params.location
         suffix = 'location'
-      } else if (json.params.uiActive && deviceInfo.uiid !== 15 && deviceInfo.uiid !== 126) {
-        // Not supported at least for TH10/16
+      } else if (json.params.uiActive && deviceInfo.uiid === 32) {
+        // Only supported by outlet uiid 32 maybe?
         params.uiActive = json.params.uiActive
         suffix = 'monitor'
       } else if (json.params.cmd) {

From 82bc1efa862876441087e7dfea5c38aeba41d2d8 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 22 Jun 2021 19:44:26 +0100
Subject: [PATCH 2336/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0346fcb8..9ecd1572 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -34,7 +34,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
   - Added option to specify a manual IP
 - **POWR2/DUALR3 Devices**
   - Support for LAN mode control for DUALR3 in motor mode
-  - [test] Polling via LAN mode to enable constant power attribute updates
+  - [test] Polling via LAN mode to enable constant power attribute updates for POWR2 devices
 - **RF Bridge Devices**
   - Ability to change sensor type and other configurable options without the need to re-add the accessory
   - Configuration option `resetOnStartup` to reset the subdevices, useful when adding/removing subdevices to the bridge

From 35de69c27ee304f0f396c00c66572404c8c7d583 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 22 Jun 2021 19:49:29 +0100
Subject: [PATCH 2337/3183] 6.8.1-beta.35

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 9d50e609..6ad9f1ae 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.8.1-beta.34",
+  "version": "6.8.1-beta.35",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 10ef7eab..4208c2e5 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.8.1-beta.34",
+  "version": "6.8.1-beta.35",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From f8014edc75faa596890136a9f25bafee636d040d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 22 Jun 2021 20:48:53 +0100
Subject: [PATCH 2338/3183] remove unneeded garage simulation chars

---
 lib/device/outlet-double.js             | 14 +++++---------
 lib/device/rf-sensor.js                 |  2 +-
 lib/device/simulation/garage-eachen.js  | 21 ++++++++++++++-------
 lib/device/simulation/garage-one.js     | 20 +++++++++++++-------
 lib/device/simulation/sensor-hidden.js  |  4 +---
 lib/device/simulation/sensor-visible.js |  4 +---
 6 files changed, 35 insertions(+), 30 deletions(-)

diff --git a/lib/device/outlet-double.js b/lib/device/outlet-double.js
index 7bde0c83..abaa720e 100644
--- a/lib/device/outlet-double.js
+++ b/lib/device/outlet-double.js
@@ -80,7 +80,7 @@ module.exports = class deviceOutletDouble {
           this.internalUIUpdate()
           this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
         }, 5000)
-  
+
         // Stop the intervals on Homebridge shutdown
         platform.api.on('shutdown', () => {
           clearInterval(this.intervalPoll)
@@ -88,14 +88,10 @@ module.exports = class deviceOutletDouble {
       }
 
       if (this.service.testCharacteristic(this.hapChar.OutletInUse)) {
-        this.service.removeCharacteristic(
-          this.service.getCharacteristic(this.hapChar.OutletInUse)
-        )
+        this.service.removeCharacteristic(this.service.getCharacteristic(this.hapChar.OutletInUse))
       }
       if (this.service.testCharacteristic(this.eveChar.Voltage)) {
-        this.service.removeCharacteristic(this.service.getCharacteristic(
-          this.eveChar.Voltage)
-        )
+        this.service.removeCharacteristic(this.service.getCharacteristic(this.eveChar.Voltage))
       }
       if (this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
         this.service.removeCharacteristic(
@@ -112,7 +108,7 @@ module.exports = class deviceOutletDouble {
           this.service.getCharacteristic(this.eveChar.TotalConsumption)
         )
       }
-      
+
       // Output the customised options to the log
       const opts = JSON.stringify({
         hideChannels: this.hideChannels,
@@ -121,7 +117,7 @@ module.exports = class deviceOutletDouble {
       })
       this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
     }
-    
+
     if (this.service.testCharacteristic(this.eveChar.TotalConsumption)) {
       this.service.removeCharacteristic(
         this.service.getCharacteristic(this.eveChar.TotalConsumption)
diff --git a/lib/device/rf-sensor.js b/lib/device/rf-sensor.js
index 8bad786b..895b6cc9 100644
--- a/lib/device/rf-sensor.js
+++ b/lib/device/rf-sensor.js
@@ -128,7 +128,7 @@ module.exports = class deviceRFSensor {
       }
     } else {
       if (service.testCharacteristic(this.eveChar.LastActivation)) {
-        service.removeCharacteristic(this.eveChar.LastActivation)
+        service.removeCharacteristic(service.getCharacteristic(this.eveChar.LastActivation))
       }
     }
 
diff --git a/lib/device/simulation/garage-eachen.js b/lib/device/simulation/garage-eachen.js
index 38f5eeec..ab9f1d84 100644
--- a/lib/device/simulation/garage-eachen.js
+++ b/lib/device/simulation/garage-eachen.js
@@ -58,14 +58,24 @@ module.exports = class deviceGarageEachen {
       this.service.setCharacteristic(this.hapChar.CurrentDoorState, 1)
       this.service.setCharacteristic(this.hapChar.TargetDoorState, 1)
       this.service.setCharacteristic(this.hapChar.ObstructionDetected, false)
-      this.service.addCharacteristic(this.hapChar.ContactSensorState)
       this.service.addCharacteristic(this.eveChar.LastActivation)
       this.service.addCharacteristic(this.eveChar.ResetTotal)
-      this.service.addCharacteristic(this.eveChar.OpenDuration)
-      this.service.addCharacteristic(this.eveChar.ClosedDuration)
       this.service.addCharacteristic(this.eveChar.TimesOpened)
     }
 
+    // Remove unneeded characteristics
+    if (this.service.testCharacteristic(this.hapChar.ContactSensorState)) {
+      this.service.removeCharacteristic(
+        this.service.getCharacteristic(this.hapChar.ContactSensorState)
+      )
+    }
+    if (this.service.testCharacteristic(this.hapChar.OpenDuration)) {
+      this.service.removeCharacteristic(this.service.getCharacteristic(this.hapChar.OpenDuration))
+    }
+    if (this.service.testCharacteristic(this.hapChar.ClosedDuration)) {
+      this.service.removeCharacteristic(this.service.getCharacteristic(this.hapChar.ClosedDuration))
+    }
+
     // Add the set handler to the garage door reset total characteristic
     this.service.getCharacteristic(this.eveChar.ResetTotal).onSet(value => {
       this.service.updateCharacteristic(this.eveChar.TimesOpened, 0)
@@ -108,7 +118,6 @@ module.exports = class deviceGarageEachen {
       await this.funcs.sleep(2000)
       this.inUse = false
       if (value === 0) {
-        this.service.updateCharacteristic(this.hapChar.ContactSensorState, 1)
         this.accessory.eveService.addEntry({ status: 0 })
         const initialTime = this.accessory.eveService.getInitialTime()
         this.service.updateCharacteristic(
@@ -150,7 +159,6 @@ module.exports = class deviceGarageEachen {
         params.switch === 'on' ? 0 : 1
       )
       if (params.switch === 'on') {
-        this.service.updateCharacteristic(this.hapChar.ContactSensorState, 1)
         this.accessory.eveService.addEntry({ status: 0 })
         const initialTime = this.accessory.eveService.getInitialTime()
         this.service.updateCharacteristic(
@@ -160,8 +168,7 @@ module.exports = class deviceGarageEachen {
         const newTO = this.service.getCharacteristic(this.eveChar.TimesOpened).value + 1
         this.service.updateCharacteristic(this.eveChar.TimesOpened, newTO)
       } else {
-        this.service.updateCharacteristic(this.hapChar.ContactSensorState, 0)
-        this.accessory.eveService.addEntry({ status: 1 }) // swapped
+        this.accessory.eveService.addEntry({ status: 1 })
       }
       if (params.updateSource && this.enableLogging) {
         this.log(
diff --git a/lib/device/simulation/garage-one.js b/lib/device/simulation/garage-one.js
index fb71a5e3..c7c95298 100644
--- a/lib/device/simulation/garage-one.js
+++ b/lib/device/simulation/garage-one.js
@@ -65,14 +65,24 @@ module.exports = class deviceGarageOne {
       this.service.setCharacteristic(this.hapChar.CurrentDoorState, 1)
       this.service.setCharacteristic(this.hapChar.TargetDoorState, 1)
       this.service.setCharacteristic(this.hapChar.ObstructionDetected, false)
-      this.service.addCharacteristic(this.hapChar.ContactSensorState)
       this.service.addCharacteristic(this.eveChar.LastActivation)
       this.service.addCharacteristic(this.eveChar.ResetTotal)
-      this.service.addCharacteristic(this.eveChar.OpenDuration)
-      this.service.addCharacteristic(this.eveChar.ClosedDuration)
       this.service.addCharacteristic(this.eveChar.TimesOpened)
     }
 
+    // Remove unneeded characteristics
+    if (this.service.testCharacteristic(this.hapChar.ContactSensorState)) {
+      this.service.removeCharacteristic(
+        this.service.getCharacteristic(this.hapChar.ContactSensorState)
+      )
+    }
+    if (this.service.testCharacteristic(this.hapChar.OpenDuration)) {
+      this.service.removeCharacteristic(this.service.getCharacteristic(this.hapChar.OpenDuration))
+    }
+    if (this.service.testCharacteristic(this.hapChar.ClosedDuration)) {
+      this.service.removeCharacteristic(this.service.getCharacteristic(this.hapChar.ClosedDuration))
+    }
+
     // Add the set handler to the garage door reset total characteristic
     this.service.getCharacteristic(this.eveChar.ResetTotal).onSet(value => {
       this.service.updateCharacteristic(this.eveChar.TimesOpened, 0)
@@ -143,7 +153,6 @@ module.exports = class deviceGarageOne {
       await this.funcs.sleep(2000)
       this.inUse = false
       if (!this.definedSensor && newPos === 0) {
-        this.service.updateCharacteristic(this.hapChar.ContactSensorState, 1)
         this.accessory.eveService.addEntry({ status: 0 })
         const initialTime = this.accessory.eveService.getInitialTime()
         this.service.updateCharacteristic(
@@ -158,7 +167,6 @@ module.exports = class deviceGarageOne {
       if (!this.definedSensor) {
         this.service.updateCharacteristic(this.hapChar.CurrentDoorState, newPos)
         if (newPos === 1) {
-          this.service.updateCharacteristic(this.hapChar.ContactSensorState, 0)
           this.accessory.eveService.addEntry({ status: 1 })
         }
         if (this.enableLogging) {
@@ -216,7 +224,6 @@ module.exports = class deviceGarageOne {
       await this.funcs.sleep(2000)
       this.inUse = false
       if (!this.definedSensor && newPos === 2) {
-        this.service.updateCharacteristic(this.hapChar.ContactSensorState, 1)
         this.accessory.eveService.addEntry({ status: 0 })
         const initialTime = this.accessory.eveService.getInitialTime()
         this.service.updateCharacteristic(
@@ -230,7 +237,6 @@ module.exports = class deviceGarageOne {
       await this.funcs.sleep(Math.max((operationTime - 20) * 100, 0))
       this.service.updateCharacteristic(this.hapChar.CurrentDoorState, newPos - 2)
       if (!this.definedSensor && newPos === 3) {
-        this.service.updateCharacteristic(this.hapChar.ContactSensorState, 0)
         this.accessory.eveService.addEntry({ status: 1 })
       }
       if (this.enableLogging) {
diff --git a/lib/device/simulation/sensor-hidden.js b/lib/device/simulation/sensor-hidden.js
index bba20d61..0d0b70fe 100644
--- a/lib/device/simulation/sensor-hidden.js
+++ b/lib/device/simulation/sensor-hidden.js
@@ -60,8 +60,7 @@ module.exports = class deviceSensorHidden {
               case 0:
                 gdService.updateCharacteristic(this.hapChar.TargetDoorState, 1)
                 gdService.updateCharacteristic(this.hapChar.CurrentDoorState, 1)
-                gdService.updateCharacteristic(this.hapChar.ContactSensorState, 0)
-                subAccessory.eveService.addEntry({ status: 1 }) // swapped
+                subAccessory.eveService.addEntry({ status: 1 })
                 if (params.updateSource && enableLogging) {
                   this.log('[%s] %s [%s].', name, this.lang.curState, this.lang.doorClosed)
                 }
@@ -70,7 +69,6 @@ module.exports = class deviceSensorHidden {
                 await this.funcs.sleep(Math.max(group.operationTime * 100, 2000))
                 gdService.updateCharacteristic(this.hapChar.TargetDoorState, 0)
                 gdService.updateCharacteristic(this.hapChar.CurrentDoorState, 0)
-                gdService.updateCharacteristic(this.hapChar.ContactSensorState, 1)
                 subAccessory.eveService.addEntry({ status: 0 })
                 const initialTime = subAccessory.eveService.getInitialTime()
                 gdService.updateCharacteristic(
diff --git a/lib/device/simulation/sensor-visible.js b/lib/device/simulation/sensor-visible.js
index 8539db0e..e2987248 100644
--- a/lib/device/simulation/sensor-visible.js
+++ b/lib/device/simulation/sensor-visible.js
@@ -167,8 +167,7 @@ module.exports = class deviceSensorVisible {
               case 0:
                 gdService.updateCharacteristic(this.hapChar.TargetDoorState, 1)
                 gdService.updateCharacteristic(this.hapChar.CurrentDoorState, 1)
-                gdService.updateCharacteristic(this.hapChar.ContactSensorState, 0)
-                subAccessory.eveService.addEntry({ status: 1 }) // swapped
+                subAccessory.eveService.addEntry({ status: 1 })
                 if (params.updateSource && enableLogging) {
                   this.log('[%s] %s [%s].', name, this.lang.curState, this.lang.doorClosed)
                 }
@@ -177,7 +176,6 @@ module.exports = class deviceSensorVisible {
                 await this.funcs.sleep(Math.max(group.operationTime * 100, 2000))
                 gdService.updateCharacteristic(this.hapChar.TargetDoorState, 0)
                 gdService.updateCharacteristic(this.hapChar.CurrentDoorState, 0)
-                gdService.updateCharacteristic(this.hapChar.ContactSensorState, 1)
                 subAccessory.eveService.addEntry({ status: 0 })
                 const initialTime = subAccessory.eveService.getInitialTime()
                 gdService.updateCharacteristic(

From b312adcec24de5c87154b60cf53d558e112397e6 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 22 Jun 2021 20:48:56 +0100
Subject: [PATCH 2339/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9ecd1572..54f7293d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -54,6 +54,8 @@ All notable changes to this homebridge-ewelink will be documented in this file.
   - Changes to the startup logging:
     - Accessory configuration options will always be logged on plugin startup
     - Warning alerts if a device's discovered IP is different to any manually configured IP
+- **Garage Simulations**
+  - Removed `ContactSensorState` and other unneeded characteristics from the garage service
 - **Configuration**
   - `sensorTimeDifference` minimum reduced to 5 seconds and default reduced to 60 seconds
 - **Dependencies**

From 8885b807dd6a502d24dd9b433e7edc3108f12f09 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 22 Jun 2021 20:49:26 +0100
Subject: [PATCH 2340/3183] 6.8.1-beta.36

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 6ad9f1ae..4ed38f55 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.8.1-beta.35",
+  "version": "6.8.1-beta.36",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 4208c2e5..1db41069 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.8.1-beta.35",
+  "version": "6.8.1-beta.36",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From f5a96d39d20a1075b1485473802340955bd89e87 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 22 Jun 2021 21:14:30 +0100
Subject: [PATCH 2341/3183] remove totalconsumption and resettotal chars from
 power outlet

---
 lib/device/outlet-double.js | 11 ++++---
 lib/device/outlet-power.js  | 66 +++++++------------------------------
 2 files changed, 18 insertions(+), 59 deletions(-)

diff --git a/lib/device/outlet-double.js b/lib/device/outlet-double.js
index abaa720e..2064a988 100644
--- a/lib/device/outlet-double.js
+++ b/lib/device/outlet-double.js
@@ -103,11 +103,6 @@ module.exports = class deviceOutletDouble {
           this.service.getCharacteristic(this.eveChar.ElectricCurrent)
         )
       }
-      if (this.service.testCharacteristic(this.eveChar.TotalConsumption)) {
-        this.service.removeCharacteristic(
-          this.service.getCharacteristic(this.eveChar.TotalConsumption)
-        )
-      }
 
       // Output the customised options to the log
       const opts = JSON.stringify({
@@ -118,11 +113,17 @@ module.exports = class deviceOutletDouble {
       this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
     }
 
+    // Remove unneeded characteristics
     if (this.service.testCharacteristic(this.eveChar.TotalConsumption)) {
       this.service.removeCharacteristic(
         this.service.getCharacteristic(this.eveChar.TotalConsumption)
       )
     }
+    if (this.service.testCharacteristic(this.eveChar.ResetTotal)) {
+      this.service.removeCharacteristic(
+        this.service.getCharacteristic(this.eveChar.ResetTotal)
+      )
+    }
   }
 
   async internalStateUpdate (value) {
diff --git a/lib/device/outlet-power.js b/lib/device/outlet-power.js
index 85412bed..526e0b3c 100644
--- a/lib/device/outlet-power.js
+++ b/lib/device/outlet-power.js
@@ -56,8 +56,6 @@ module.exports = class deviceOutletPower {
       this.service.addCharacteristic(this.eveChar.Voltage)
       this.service.addCharacteristic(this.eveChar.CurrentConsumption)
       this.service.addCharacteristic(this.eveChar.ElectricCurrent)
-      this.service.addCharacteristic(this.eveChar.TotalConsumption)
-      this.service.addCharacteristic(this.eveChar.ResetTotal)
     }
 
     // Add the set handler to the outlet on/off characteristic
@@ -70,54 +68,6 @@ module.exports = class deviceOutletPower {
       log: platform.config.debugFakegato ? this.log : () => {}
     })
 
-    // TotalConsumption is calculated by the plugin with these context readings
-    if (!this.funcs.hasProperty(this.accessory.context, 'energyReadings')) {
-      this.accessory.context.energyReadings = []
-    }
-    if (!this.funcs.hasProperty(this.accessory.context, 'energyReadingTotal')) {
-      this.accessory.context.energyReadingTotal = 0
-    }
-
-    // Add the set handler to the outlet eve reset total energy characteristic
-    this.service.getCharacteristic(this.eveChar.ResetTotal).onSet(value => {
-      this.accessory.context.energyReadings = []
-      this.accessory.context.energyReadingTotal = 0
-      this.service.updateCharacteristic(this.eveChar.TotalConsumption, 0)
-    })
-
-    // Set up an interval for the plugin to calculate an approx total consumption
-    this.intervalPower = setInterval(() => {
-      // Every 30 seconds start with a zero reading
-      let total = 0
-
-      // Check we have had readings within the previous 30 seconds
-      if (this.accessory.context.energyReadings.length > 0) {
-        // Accumulate the total from the energy readings
-        this.accessory.context.energyReadings.forEach(x => {
-          total += x
-        })
-
-        // Divide this by the number of entries to get an average W5m
-        total /= this.accessory.context.energyReadings.length
-
-        // Convert this to Wh then kWh
-        total /= 12
-        total /= 1000
-
-        // Accumulate the grand total that Eve reads as the total consumption
-        this.accessory.context.energyReadingTotal += total
-      }
-
-      // Reset the array for each 30 second readings
-      this.accessory.context.energyReadings = []
-
-      // Update Eve with the new grand total
-      this.service.updateCharacteristic(
-        this.eveChar.TotalConsumption,
-        this.accessory.context.energyReadingTotal
-      )
-    }, 30000)
-
     // Set up an interval to get eWeLink to send power updates
     setTimeout(() => {
       this.internalUIUpdate()
@@ -127,8 +77,19 @@ module.exports = class deviceOutletPower {
     // Stop the intervals on Homebridge shutdown
     platform.api.on('shutdown', () => {
       clearInterval(this.intervalPoll)
-      clearInterval(this.intervalPower)
     })
+    
+    // Remove unneeded characteristics
+    if (this.service.testCharacteristic(this.eveChar.TotalConsumption)) {
+      this.service.removeCharacteristic(
+        this.service.getCharacteristic(this.eveChar.TotalConsumption)
+      )
+    }
+    if (this.service.testCharacteristic(this.eveChar.ResetTotal)) {
+      this.service.removeCharacteristic(
+        this.service.getCharacteristic(this.eveChar.ResetTotal)
+      )
+    }
 
     // Output the customised options to the log
     const opts = JSON.stringify({
@@ -152,7 +113,6 @@ module.exports = class deviceOutletPower {
         this.service.updateCharacteristic(this.hapChar.OutletInUse, false)
         this.service.updateCharacteristic(this.eveChar.CurrentConsumption, 0)
         this.accessory.eveService.addEntry({ power: 0 })
-        this.accessory.context.energyReadings.push(0)
       }
       if (this.enableLogging) {
         this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
@@ -184,7 +144,6 @@ module.exports = class deviceOutletPower {
           this.service.updateCharacteristic(this.hapChar.OutletInUse, false)
           this.service.updateCharacteristic(this.eveChar.CurrentConsumption, 0)
           this.accessory.eveService.addEntry({ power: 0 })
-          this.accessory.context.energyReadings.push(0)
         }
         if (params.updateSource && this.enableLogging) {
           this.log('[%s] %s [%s].', this.name, this.lang.curState, params.switch)
@@ -201,7 +160,6 @@ module.exports = class deviceOutletPower {
         this.accessory.eveService.addEntry({
           power: this.cacheState === 'on' ? power : 0
         })
-        this.accessory.context.energyReadings.push(power)
         logger = true
       }
       if (this.funcs.hasProperty(params, 'voltage')) {

From 3890ff31e6fa7987313bccaad1c9e25452814401 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 22 Jun 2021 21:22:17 +0100
Subject: [PATCH 2342/3183] Revert "remove totalconsumption and resettotal
 chars from power outlet"

This reverts commit f5a96d39d20a1075b1485473802340955bd89e87.
---
 lib/device/outlet-double.js | 11 +++----
 lib/device/outlet-power.js  | 66 ++++++++++++++++++++++++++++++-------
 2 files changed, 59 insertions(+), 18 deletions(-)

diff --git a/lib/device/outlet-double.js b/lib/device/outlet-double.js
index 2064a988..abaa720e 100644
--- a/lib/device/outlet-double.js
+++ b/lib/device/outlet-double.js
@@ -103,6 +103,11 @@ module.exports = class deviceOutletDouble {
           this.service.getCharacteristic(this.eveChar.ElectricCurrent)
         )
       }
+      if (this.service.testCharacteristic(this.eveChar.TotalConsumption)) {
+        this.service.removeCharacteristic(
+          this.service.getCharacteristic(this.eveChar.TotalConsumption)
+        )
+      }
 
       // Output the customised options to the log
       const opts = JSON.stringify({
@@ -113,17 +118,11 @@ module.exports = class deviceOutletDouble {
       this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
     }
 
-    // Remove unneeded characteristics
     if (this.service.testCharacteristic(this.eveChar.TotalConsumption)) {
       this.service.removeCharacteristic(
         this.service.getCharacteristic(this.eveChar.TotalConsumption)
       )
     }
-    if (this.service.testCharacteristic(this.eveChar.ResetTotal)) {
-      this.service.removeCharacteristic(
-        this.service.getCharacteristic(this.eveChar.ResetTotal)
-      )
-    }
   }
 
   async internalStateUpdate (value) {
diff --git a/lib/device/outlet-power.js b/lib/device/outlet-power.js
index 526e0b3c..85412bed 100644
--- a/lib/device/outlet-power.js
+++ b/lib/device/outlet-power.js
@@ -56,6 +56,8 @@ module.exports = class deviceOutletPower {
       this.service.addCharacteristic(this.eveChar.Voltage)
       this.service.addCharacteristic(this.eveChar.CurrentConsumption)
       this.service.addCharacteristic(this.eveChar.ElectricCurrent)
+      this.service.addCharacteristic(this.eveChar.TotalConsumption)
+      this.service.addCharacteristic(this.eveChar.ResetTotal)
     }
 
     // Add the set handler to the outlet on/off characteristic
@@ -68,6 +70,54 @@ module.exports = class deviceOutletPower {
       log: platform.config.debugFakegato ? this.log : () => {}
     })
 
+    // TotalConsumption is calculated by the plugin with these context readings
+    if (!this.funcs.hasProperty(this.accessory.context, 'energyReadings')) {
+      this.accessory.context.energyReadings = []
+    }
+    if (!this.funcs.hasProperty(this.accessory.context, 'energyReadingTotal')) {
+      this.accessory.context.energyReadingTotal = 0
+    }
+
+    // Add the set handler to the outlet eve reset total energy characteristic
+    this.service.getCharacteristic(this.eveChar.ResetTotal).onSet(value => {
+      this.accessory.context.energyReadings = []
+      this.accessory.context.energyReadingTotal = 0
+      this.service.updateCharacteristic(this.eveChar.TotalConsumption, 0)
+    })
+
+    // Set up an interval for the plugin to calculate an approx total consumption
+    this.intervalPower = setInterval(() => {
+      // Every 30 seconds start with a zero reading
+      let total = 0
+
+      // Check we have had readings within the previous 30 seconds
+      if (this.accessory.context.energyReadings.length > 0) {
+        // Accumulate the total from the energy readings
+        this.accessory.context.energyReadings.forEach(x => {
+          total += x
+        })
+
+        // Divide this by the number of entries to get an average W5m
+        total /= this.accessory.context.energyReadings.length
+
+        // Convert this to Wh then kWh
+        total /= 12
+        total /= 1000
+
+        // Accumulate the grand total that Eve reads as the total consumption
+        this.accessory.context.energyReadingTotal += total
+      }
+
+      // Reset the array for each 30 second readings
+      this.accessory.context.energyReadings = []
+
+      // Update Eve with the new grand total
+      this.service.updateCharacteristic(
+        this.eveChar.TotalConsumption,
+        this.accessory.context.energyReadingTotal
+      )
+    }, 30000)
+
     // Set up an interval to get eWeLink to send power updates
     setTimeout(() => {
       this.internalUIUpdate()
@@ -77,19 +127,8 @@ module.exports = class deviceOutletPower {
     // Stop the intervals on Homebridge shutdown
     platform.api.on('shutdown', () => {
       clearInterval(this.intervalPoll)
+      clearInterval(this.intervalPower)
     })
-    
-    // Remove unneeded characteristics
-    if (this.service.testCharacteristic(this.eveChar.TotalConsumption)) {
-      this.service.removeCharacteristic(
-        this.service.getCharacteristic(this.eveChar.TotalConsumption)
-      )
-    }
-    if (this.service.testCharacteristic(this.eveChar.ResetTotal)) {
-      this.service.removeCharacteristic(
-        this.service.getCharacteristic(this.eveChar.ResetTotal)
-      )
-    }
 
     // Output the customised options to the log
     const opts = JSON.stringify({
@@ -113,6 +152,7 @@ module.exports = class deviceOutletPower {
         this.service.updateCharacteristic(this.hapChar.OutletInUse, false)
         this.service.updateCharacteristic(this.eveChar.CurrentConsumption, 0)
         this.accessory.eveService.addEntry({ power: 0 })
+        this.accessory.context.energyReadings.push(0)
       }
       if (this.enableLogging) {
         this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
@@ -144,6 +184,7 @@ module.exports = class deviceOutletPower {
           this.service.updateCharacteristic(this.hapChar.OutletInUse, false)
           this.service.updateCharacteristic(this.eveChar.CurrentConsumption, 0)
           this.accessory.eveService.addEntry({ power: 0 })
+          this.accessory.context.energyReadings.push(0)
         }
         if (params.updateSource && this.enableLogging) {
           this.log('[%s] %s [%s].', this.name, this.lang.curState, params.switch)
@@ -160,6 +201,7 @@ module.exports = class deviceOutletPower {
         this.accessory.eveService.addEntry({
           power: this.cacheState === 'on' ? power : 0
         })
+        this.accessory.context.energyReadings.push(power)
         logger = true
       }
       if (this.funcs.hasProperty(params, 'voltage')) {

From 83a501c945761bf68674000587b141cdbaa7d000 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 22 Jun 2021 21:23:23 +0100
Subject: [PATCH 2343/3183] Update outlet-double.js

---
 lib/device/outlet-double.js | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/lib/device/outlet-double.js b/lib/device/outlet-double.js
index abaa720e..1685680e 100644
--- a/lib/device/outlet-double.js
+++ b/lib/device/outlet-double.js
@@ -62,6 +62,18 @@ module.exports = class deviceOutletDouble {
         this.service.addCharacteristic(this.eveChar.ElectricCurrent)
       }
     }
+    
+    // Remove unneeded characteristics
+    if (this.service.testCharacteristic(this.eveChar.TotalConsumption)) {
+      this.service.removeCharacteristic(
+        this.service.getCharacteristic(this.eveChar.TotalConsumption)
+      )
+    }
+    if (this.service.testCharacteristic(this.eveChar.ResetTotal)) {
+      this.service.removeCharacteristic(
+        this.service.getCharacteristic(this.eveChar.ResetTotal)
+      )
+    }
 
     // Add the set handler to the switch/outlet on/off characteristic
     this.service.getCharacteristic(this.hapChar.On).onSet(async value => {
@@ -87,6 +99,7 @@ module.exports = class deviceOutletDouble {
         })
       }
 
+      // Remove power characteristics from the main accessory
       if (this.service.testCharacteristic(this.hapChar.OutletInUse)) {
         this.service.removeCharacteristic(this.service.getCharacteristic(this.hapChar.OutletInUse))
       }
@@ -103,11 +116,6 @@ module.exports = class deviceOutletDouble {
           this.service.getCharacteristic(this.eveChar.ElectricCurrent)
         )
       }
-      if (this.service.testCharacteristic(this.eveChar.TotalConsumption)) {
-        this.service.removeCharacteristic(
-          this.service.getCharacteristic(this.eveChar.TotalConsumption)
-        )
-      }
 
       // Output the customised options to the log
       const opts = JSON.stringify({
@@ -117,12 +125,6 @@ module.exports = class deviceOutletDouble {
       })
       this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
     }
-
-    if (this.service.testCharacteristic(this.eveChar.TotalConsumption)) {
-      this.service.removeCharacteristic(
-        this.service.getCharacteristic(this.eveChar.TotalConsumption)
-      )
-    }
   }
 
   async internalStateUpdate (value) {

From 95d9b62b757b7e9dc75c6fe4e38c442590486df4 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 23 Jun 2021 08:53:30 +0100
Subject: [PATCH 2344/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 241 ++++++++++++++++++++++++++++++---------------------
 1 file changed, 141 insertions(+), 100 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 54f7293d..c4facc3d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,29 +4,19 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 ## BETA
 
-### ⚠️ Breaking Changes
-
-- If you have the plugin in `lan`-only mode then the plugin will remove any accessories that do not support LAN mode
-- `overrideDisabledLogging` config option for each accessory type has been removed in favour of a new setting `overrideLogging`
-
 ### Added
 
 - **LAN Mode (without eWeLink credentials)**
   - The plugin now supports removing eWeLink credentials from the config when in LAN mode
   - It is important to read about this feature before enabling it - [read more](https://github.com/bwp91/homebridge-ewelink/wiki/Connection-Methods#lan-mode-without-ewelink-credentials)
-  - If you have the plugin in `lan`-only mode then the plugin will remove any accessories that do not support LAN mode
 - **Accessory Logging**
-  - `overrideDisabledLogging` option for each accessory type has been removed in favour of a new setting `overrideLogging`
-  - `overrideLogging` can be set to (and will override the global device logging and debug logging settings):
+  - `overrideLogging` setting per device type (to replace the removed `overrideDisabledLogging`), which can be set to (and will override the global device logging and debug logging settings):
     - `"default"` to follow the global device update and debug logging setting for this accessory (default if setting not set)
     - `"standard"` to enable device update logging but disable debug logging for this accessory
     - `"debug"` to enable device update and debug logging for this accessory
     - `"disable"` to disable device update and debug logging for this accessory
-  - The easiest way to manage these settings is through the Homebridge UI or the HOOBS UI
-  - This can be used for example to set TH10/16 or POWR2 device to `standard` when in global `debug` logging mode to stop the polling from flooding the logs
 - **iFan Devices**
   - Support for LAN mode control
-  - Previous fan speed will be used again after turning off and on
   - Added option to specify a manual IP
 - **TH10/16 Devices**
   - Implemented polling as firmware 3.5.0 does not seem to send regular temperature updates
@@ -47,21 +37,29 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 - **Garage Simulations**
   - Added `TimesOpened` Eve characteristic functionality to single garage door simulation
 
-### Changes
+### Changed
 
+- **LAN Mode**
+  - ⚠️ If you have the plugin in `lan`-only mode then the plugin will remove any accessories that do not support LAN mode
+- **iFan Devices**
+  - Previous fan speed will be used again after turning off and on
 - **Polling/Logging**
   - Power reading polling for POWR2/DUALR3 increased to two minutes
   - Changes to the startup logging:
     - Accessory configuration options will always be logged on plugin startup
     - Warning alerts if a device's discovered IP is different to any manually configured IP
-- **Garage Simulations**
-  - Removed `ContactSensorState` and other unneeded characteristics from the garage service
 - **Configuration**
   - `sensorTimeDifference` minimum reduced to 5 seconds and default reduced to 60 seconds
 - **Dependencies**
+
   - Recommended node version bump to v14.17.1
   - Bump `ws` dependency to v7.5.0
 
+### Removed
+
+- `overrideDisabledLogging` setting for each accessory type
+- `ContactSensorState` and other unneeded characteristics from garage (simulation) services
+
 ## 6.8.0 (2021-06-14)
 
 ### Added
@@ -77,15 +75,21 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 - **Plugin UI**
   - Show MAC address of accessory in plugin-ui
 
-### Changes
+### Changed
 
 - TH10/16 simulation accessory type change from _Thermostat_ to _Heater_
+
+### Removed
+
 - Remove `setup` config option for simulations as device type is now automatically determined
+
+### Fixed
+
 - Fix a logging issue for the zigbee contact sensor
 
 ## 6.7.1 (2021-05-27)
 
-### Changes
+### Fixed
 
 - Fixes an issue with sensors with a garage simulation
 - Fixes an issue with TH10/16 devices with web socket timeouts
@@ -97,16 +101,19 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 - Hide a contact sensor from HomeKit when used with a garage door simulation
 - Support devices with eWeLink UIID 112, 113, 114
 
-### Changes
+### Changed
 
 - Avoid repeated battery logging for the Sonoff DW2
 - iFan logging modifications
-- Fix internal API auth issue when using a base64 encoded password
 - Throw an error when controlling a device when the web socket is closed (avoid queuing updates)
 - Recommended node version bump to v14.17.0
 - Bump `ws` dependency to v7.4.6
 - Use `standard-prettier` code formatting
 
+### Fixed
+
+- Fix internal API auth issue when using a base64 encoded password
+
 ## 6.6.0 (2021-05-10)
 
 ### Added
@@ -114,26 +121,35 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 - Log internal API requests when in debug mode
 - Support querying temperature and humidity values via the internal API
 
-### Changes
+### Changed
 
-- Removed `encodedPassword` and `language` config options
-  - The plugin will now initially try the supplied password and if incorrect will attempt another login with a base64 decoded version
-  - Language option unnecessary until if and when other languages are available
 - Display temperature and humidity units for the zigbee temperature/humidity sensor in the logs
-- Fixes an issue where the web socket would not close on plugin shutdown
 - Reduce the 'No Response' timeout to 2 seconds
 - Update the correct corresponding characteristic after the 'No Response' timeout
 - Ensure user is using at least Homebridge v1.3.0
 - Update homebridge-ui wiki links to match github readme file
 
+### Removed
+
+- Removed `encodedPassword` and `language` config options
+  - The plugin will now initially try the supplied password and if incorrect will attempt another login with a base64 decoded version
+- Language option unnecessary until if and when other languages are available
+
+### Fixed
+
+- Fixes an issue where the web socket would not close on plugin shutdown
+
 ## 6.5.1 (2021-05-07)
 
-### Changes
+### Changed
 
-- Fixes an initialisation issue with the 'garage' and 'obstruction detection' switch simulations
 - Amendments to internal API endpoints
 - Device IP changes will now reflect correctly
 
+### Fixed
+
+- Fixes an initialisation issue with the 'garage' and 'obstruction detection' switch simulations
+
 ## 6.5.0 (2021-05-06)
 
 ### Added
@@ -155,7 +171,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 - Set a temperature offset for the Zigbee temperature/humidity sensor
 - Configuration options to manually set account http host and country code [#249](https://github.com/bwp91/homebridge-ewelink/pull/249)
 
-### Changes
+### Changed
 
 - Change Sonoff POWR2/S31 polling interval to a fixed 60 seconds
 - iFan speed will now log as {low, medium, high}
@@ -171,7 +187,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 - Support DUALR3 motor mode (as a _WindowCovering_ service)
 
-### Changes
+### Changed
 
 - Remove old _Switch_ services from DUALR3 when in motor mode
 - iFan devices now use caching to avoid unnecessary duplicate updates
@@ -180,7 +196,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 ## 6.2.2 (2021-04-27)
 
-### Changes
+### Changed
 
 - Adjust iFan speed thresholds (now 0% is off, 1-33% is low, 34-66% is medium and 67-100% is high)
 - Changed commands for multi-channel devices to only update desired channel (not all channels)
@@ -190,7 +206,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 ## 6.2.1 (2021-04-18)
 
-### Changes
+### Changed
 
 - Trim new lines and spaces from password when decoded from base64
 - Updated dependencies (`ws`)
@@ -201,24 +217,30 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 - LAN mode for Sonoff RF Bridge
 
-### Changes
+### Changed
 
-- Fix characteristic NaN warning for `LastActivation`
 - More compact logging for eWeLink 504 error
-- Remove online/offline status for Zigbee sensor devices
 - Recover accessories from the cache using the UUID
 - Reduce WS timeout to 5 seconds to reduce cases of `was slow to respond` HB warning
 - Update wiki links in the Homebridge plugin-ui
 
+### Removed
+
+- Remove online/offline status for Zigbee sensor devices
+
+### Fixed
+
+- Fix characteristic NaN warning for `LastActivation`
+
 ## 6.1.2 (2021-04-14)
 
-### Changes
+### Fixed
 
 - Remove any existing humidity sensor for TH10/16 if DS18B20 sensor is used
 
 ## 6.1.1 (2021-04-13)
 
-### Changes
+### Fixed
 
 - Fixed an unhandled rejection error when controlling certain CCT bulbs
 
@@ -229,22 +251,22 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 - Support for doorbell model SA-026 (can be exposed as any sensor type as per other RF sensors)
 - Updated plugin-ui 'Support' page links to match GitHub readme file
 
-### Changes
+### Changed
 
 - Improvements to RF Bridge:
   - No more characteristic warnings for `LastActivation` for motion and contact sensors
   - Removed logs for 'not triggered' if device has since been triggered again
-- Fixed the interval time length for calculating total energy consumption for relevant devices
 
 ## 6.0.3 (2021-04-08)
 
-### Changes
+### Fixed
 
-- [fix] Revert 'No Response' messages for **DW2** devices as they go on and offline
+- Revert 'No Response' messages for **DW2** devices as they go on and offline
+- Fixed the interval time length for calculating total energy consumption for relevant devices
 
 ## 6.0.2 (2021-04-07)
 
-### Changes
+### Changed
 
 - Revert 'No Response' messages for **DW2** devices as they go on and offline
 
@@ -259,15 +281,18 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 - **HOOBS Users**
   - This plugin has a minimum requirement of HOOBS v3.3.4
 
-### Changes
+### Changed
 
 - 'No Response' messages for **Zigbee and DW2** devices as they go on and offline
 - 'No Response' messages for **all devices** if controlled and unsuccessful (and this status will be reverted after 5 seconds)
 - Use the new `.onGet`/`.onSet` methods available in Homebridge v1.3
-- Fixes a caching issue with the iFan accessory
 - Updated README to reflect minimum supported Homebridge/HOOBS and Node versions
 - Updated recommended Node to v14.16.1
 
+### Fixed
+
+- Fixes a caching issue with the iFan accessory
+
 ## 5.6.0 (2021-03-25)
 
 ### Added
@@ -276,7 +301,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 - Support for zigbee colour temperature lights (ewelink uiid 1258) ([#222](https://github.com/bwp91/homebridge-ewelink/issues/222)), including:
   - Ikea Tradfri E14 600 lumen
 
-### Changes
+### Changed
 
 - Improvements to web socket connection: ([#224](https://github.com/bwp91/homebridge-ewelink/issues/224))
   - On startup, the plugin will wait to connect to the web socket before initialising devices
@@ -285,7 +310,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 ## 5.5.1 (2021-03-21)
 
-### Changes
+### Changed
 
 - Remove the custom `minValue` for `CurrentTemperature` characteristic
 - More welcome messages
@@ -300,7 +325,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 - Log entries to highlight unnecessary top-level configuration options you may have set
 - Added a note in the plugin settings about changing RF bridge sensors and its consequences
 
-### Changes
+### Changed
 
 - Remove country code configuration option as the plugin can determine your region automatically
 - Modified config schema to show titles/descriptions for non Homebridge UI users
@@ -316,7 +341,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
   - TH10/16
   - B02 and B05 bulbs
 
-### Changes
+### Fixed
 
 - Attempt to fix outlet polling updates so the device reports updated info rather than the previous info.
 
@@ -326,7 +351,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 - Set up a polling interval for outlet devices to obtain power information on a regular basis (useful when the device doesn't automatically send frequent updates)
 
-### Changes
+### Changed
 
 - Adaptive Lighting now requires Homebridge 1.3 release
 - Garages no longer need 'dummy' contact sensor to view Eve history
@@ -341,16 +366,19 @@ All notable changes to this homebridge-ewelink will be documented in this file.
   - Expose an optional contact sensor for Eachen garage devices for historical data in the Eve app
   - Set custom minimum/maximum target temperatures for the TH10/16 thermostat simulation
 
-### Changes
+### Changed
 
 - Specify a custom IP for the Sonoff D1
 - Show full error stack on plugin disable in debug mode
-- Fixes a `multiple callback` error with CCT bulb accessories
 - Updated dependencies
 
+### Fixed
+
+- Fixes a `multiple callback` error with CCT bulb accessories
+
 ## 5.1.1 (2021-03-02)
 
-### Changes
+### Fixed
 
 - Fixes an issue sending LAN updates to multi-channel devices
 
@@ -368,46 +396,46 @@ All notable changes to this homebridge-ewelink will be documented in this file.
   - Support for Sonoff SC (Sensor Centre)
   - [experimental] Support for Sonoff D1 LAN control
 
-### Changes
+### Changed
 
 - Less strict threshold for determining a 'significant' colour change for disabling Adaptive Lighting
 
 ## 5.0.6 (2021-02-26)
 
-### Changes
+### Fixed
 
 - Removes the extra _Switch_ service that was accidentally added to certain bulbs
 
 ## 5.0.5 (2021-02-25)
 
-### Changes
+### Changed
 
 - Reverse the polarity of the leak sensor simulation
   - You can expose a DW2 sensor as a leak sensor using [this guide](https://www.youtube.com/watch?v=YFu2LZfrrqs) as an Accessory Simulation
 
 ## 5.0.4 (2021-02-24)
 
-### Changes
+### Changed
 
 - Plugin will check that certain Accessory Simulations have been setup with the device type
 - Hide IP address field in plugin settings if plugin `mode` is set to `wan`
 
 ## 5.0.3 (2021-02-24)
 
-### Changes
+### Changed
 
 - Remove old _Switch_ services when setting up Accessory Simulations
 - Add the type of Accessory Simulation to the logged options on restart
 
 ## 5.0.2 (2021-02-24)
 
-### Changes
+### Fixed
 
 - Fixes an issue initialising Accessory Simulation Lock devices
 
 ## 5.0.1 (2021-02-24)
 
-### Changes
+### Fixed
 
 - Fixes an issue initialising Contact Sensor devices
 
@@ -441,35 +469,38 @@ All notable changes to this homebridge-ewelink will be documented in this file.
   - Support for eWeLink switch uiid 81, 82, 83, 84 and 107 device types
   - Support for the 'Sonoff Hum' humidifier device (on/off and mode)
 
-### Changes
+### Changed
 
 - New plugin configuration format - [more info](https://gist.github.com/bwp91/e87d9d3eb0e5dbc08e9ae7b31e33366e)
 - Device firmware version will now show correctly in HomeKit apps
-- Fixes a characteristic warning for _MotionDetected_ for Zigbee Motion Sensors
 - Information about error 406 added to the logs in the form of a link (shown when error is received)
 - Updated minimum Node to v14.16.0
 
+### Fixed
+
+- Fixes a characteristic warning for _MotionDetected_ for Zigbee Motion Sensors
+
 ## 4.7.6 (2021-02-17)
 
-### Changes
+### Fixed
 
 - Fixes an issue with the DW2 detecting garage door states
 
 ## 4.7.5 (2021-02-15)
 
-### Changes
+### Changed
 
 - Fixes an issue with the DW2 detecting garage door states
 
 ## 4.7.4 (2021-02-15)
 
-### Changes
+### Fixed
 
 - Fixes an issue when using custom RF sensors
 
 ## 4.7.3 (2021-02-13)
 
-### Changes
+### Changed
 
 - Hide WS messages that have no useful information about a device
 - Thermostat accessory simulation will now setup after a small delay to let the accessory initialise first
@@ -480,22 +511,25 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 ## 4.7.2 (2021-02-12)
 
-### Changes
+### Fixed
 
 - Fixes a bug where config items separated by a comma weren't adhered to properly
 - Stop subsequent warning messages if a device fails to initialise
 
 ## 4.7.1 (2021-02-11)
 
-### Changes
+### Changed
 
 - The 'auto' and 'cool' modes will now be hidden for thermostat devices in the Eve app
-- Fixed a bug when initialising lock accessory simulations
 - Added a 10 second timeout when sending web socket messages
 - Updated dependencies:
   - `websocket-as-promised` to v2.0.1
 - Fakegato library formatting and simplification
 
+### Fixed
+
+- Fixed a bug when initialising lock accessory simulations
+
 ## 4.7.0 (2021-02-10)
 
 ### Added
@@ -507,15 +541,11 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 - Added a note in the plugin UI when adding an Accessory Simulation that the accessory will need to be removed from the cache
 - Links to 'Configuration' and 'Uninstall' wiki pages in the plugin-ui
 
-### Changes
+### Changed
 
 - ⚠️ `ignoredDevices` configuration option is now an array not a string - [see details](https://gist.github.com/bwp91/90db67d578a8206c5a98a3447839f9e5)
-- ⚠️ Removed `nameOverride` configuration option - the plugin can now obtain channel names from eWeLink
-- ⚠️ Removed `resetRFBridge` option - the same usage can be achieved with `ignoredDevices`
 - Reinstated `ipOverride` into the Homebridge plugin UI screen
 - Improved colour temperature conversion for L1 and L1 Lite devices
-- Fixed a bug where Adaptive Lighting would not be disabled if the colour was changed from the eWeLink app
-- Fixed an issue with the 'Lock' Accessory Simulation where the status would never update as 'Unlocked'
 - HTTP error codes will be displayed in the logs if and when the plugin re-attempts the connection
 - Error messages refactored to show the most useful information
 - [Backend] Major code refactoring
@@ -524,21 +554,31 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 - Updated minimum Homebridge to v1.1.7
 - Updated dependencies
 
+### Removed
+
+- Removed `nameOverride` configuration option - the plugin can now obtain channel names from eWeLink
+- Removed `resetRFBridge` option - the same usage can be achieved with `ignoredDevices`
+
+### Fixed
+
+- Fixed a bug where Adaptive Lighting would not be disabled if the colour was changed from the eWeLink app
+- Fixed an issue with the 'Lock' Accessory Simulation where the status would never update as 'Unlocked'
+
 ## 4.6.1 (2021-02-02)
 
-### Changes
+### Changed
 
 - Extra debug logging for WS reconnection status
 - Updated `ws` dependency to v7.4.3
 
 ## 4.6.0 (2021-01-30)
 
-### New
+### Added
 
 - **[Experimental]** Use a TH10/16 device as a thermostat using an Accessory Simulation [more info](https://github.com/bwp91/homebridge-ewelink/issues/161#issuecomment-770230157)
 - Support for the Zigbee type white bulb
 
-### Changes
+### Changed
 
 - Updated plugin-ui-utils dep and use new method to get cached accessories
 - Increase the timeout for LAN control to 10 seconds for LAN only settings
@@ -546,92 +586,93 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 ## 4.5.1 (2021-01-28)
 
-### Changes
+### Changed
 
 - Set the switch as the primary service of a TH10/16 device
 - Only show the line in error logs if it exists (no more `[line undefined]`)
+
+### Fixed
+
 - Fixes an issue where RF sensors would not use a custom defined type (again!)
 
 ## 4.5.0 (2021-01-28)
 
-### New
+### Added
 
 - Use a switch to control the `Obstruction Detected` feature of a garage door
 
-### Changes
+### Changed
+
+- More consistent and clearer error logging
+
+### Fixed
 
 - Fix for TH10/16 devices when the HomeKit switch would show the state of 'auto' mode
 - Fix for TH10/16 devices (shown as thermostat) where the plugin would not show the current state of the device
 - Fix for the display of watts/amps/volts for outlets that support this
-- More consistent and clearer error logging
 
 ## 4.4.5 (2021-01-24)
 
-### Changes
+### Fixed
 
 - Fix where the battery for DW2 device would not update
 
 ## 4.4.4 (2021-01-24)
 
-### Changes
+### Changed
 
 - Backend - better handling of errors
 
 ## 4.4.3 (2021-01-20)
 
-### Changes
+### Fixed
 
 - Fixes an issue where RF sensors would not use a custom defined type
 
 ## 4.4.2 (2021-01-20)
 
-### Changes
+### Changed
 
-- Fixes an issue when adding new RF bridge devices
 - Minimum Homebridge beta needed for Adaptive Lighting bumped to beta-46
 
+### Fixed
+
+- Fixes an issue when adding new RF bridge devices
+
 ## 4.4.1 (2021-01-20)
 
-### Changes
+### Changed
 
 - Fakegato logging disabled in Homebridge `debug` mode, can be explicitly enabled with `debugFakegato`
 
 ## 4.4.0 (2021-01-14)
 
-### ⚠️ Breaking Changes
-
-- **Accessory Simulations** - if use the following:
-  - 1 Lock
-  - 1 Tap/Faucet
-  - 1 Valve
-- you will need to update your configuration with the Device Setup field (via Homebridge UI) or adding the line `"setup": "oneSwitch"` directly to your configuration file in the groups section
-
-### New
+### Added
 
 - Single Accessory Simulations for multi-channel devices (e.g. 1 valve using a Sonoff 4CH)
 - `operationTime` for Accessory Simulations will now be validated and increased to 20 if less than 20 or an invalid number
 
-### Changes
+### Changed
 
+- ⚠️ **Accessory Simulations** - if use '1 Lock', '1 Tap/Faucet' or '1 Valve' you will need to update your configuration with the Device Setup field (via Homebridge UI) or adding the line `"setup": "oneSwitch"` directly to your configuration file in the groups section
 - Changes to plugin now in CHANGELOG.md
-- Removed `Obstruction Detected` tests
 
-## 4.3.0 (2021-01-12)
+### Removed
 
-### ⚠️ Breaking Changes
+- Removed `Obstruction Detected` tests
 
-- `hideDevFromHB` config option renamed to `ignoredDevices`
-  - After installing this update any hidden devices may reappear in Homebridge. Please edit your configuration directly, changing `hideDevFromHB` to `ignoredDevices`. The devices will be removed upon Homebridge restart.
+## 4.3.0 (2021-01-12)
 
-### New
+### Added
 
 - New Accessory Simulations:
   - 2 Taps/Faucets using a multi-channel device
   - 4 Irrigation Valves using a multi-channel device #182
 - New `disableDeviceLogging` config option to hide device state logging #183
 
-### Changes
+### Changed
 
+- `hideDevFromHB` config option renamed to `ignoredDevices`
 - Minimum `operationTime` for associated Accessory Simulations increased to 20 (2 seconds)
 - Removal of maximum values on plugin settings screen for all `number` types
 - Changes to startup log messages

From 6468b004a016b28217ecaba5d7cfffb71a6cccc3 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 23 Jun 2021 08:53:32 +0100
Subject: [PATCH 2345/3183] Update outlet-double.js

---
 lib/device/outlet-double.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/lib/device/outlet-double.js b/lib/device/outlet-double.js
index 1685680e..b304f8ab 100644
--- a/lib/device/outlet-double.js
+++ b/lib/device/outlet-double.js
@@ -62,7 +62,7 @@ module.exports = class deviceOutletDouble {
         this.service.addCharacteristic(this.eveChar.ElectricCurrent)
       }
     }
-    
+
     // Remove unneeded characteristics
     if (this.service.testCharacteristic(this.eveChar.TotalConsumption)) {
       this.service.removeCharacteristic(
@@ -70,9 +70,7 @@ module.exports = class deviceOutletDouble {
       )
     }
     if (this.service.testCharacteristic(this.eveChar.ResetTotal)) {
-      this.service.removeCharacteristic(
-        this.service.getCharacteristic(this.eveChar.ResetTotal)
-      )
+      this.service.removeCharacteristic(this.service.getCharacteristic(this.eveChar.ResetTotal))
     }
 
     // Add the set handler to the switch/outlet on/off characteristic

From 85640dbc759fe72d876cc03e755427cd2e7023e8 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 23 Jun 2021 09:09:32 +0100
Subject: [PATCH 2346/3183] add warning for shared device with wan

---
 lib/index.js         | 5 +++++
 lib/utils/lang-en.js | 1 +
 2 files changed, 6 insertions(+)

diff --git a/lib/index.js b/lib/index.js
index 8f46ac8f..88425be4 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1403,6 +1403,11 @@ class eWeLinkPlatform {
         )
       }
 
+      // Check to see if it's a shared device being used with the cloud
+      if (!accessory.context.reachableLAN && accessory.context.eweShared) {
+        this.log.warn('[%s] %s.', accessory.displayName, this.lang.shareWarn)
+      }
+
       // Update accessory characteristics with latest values
       if (wsClient && accessory.control && accessory.control.externalUpdate) {
         accessory.control.externalUpdate(device.params)
diff --git a/lib/utils/lang-en.js b/lib/utils/lang-en.js
index 033bfc83..6a44c40b 100644
--- a/lib/utils/lang-en.js
+++ b/lib/utils/lang-en.js
@@ -112,6 +112,7 @@ module.exports = {
   sensorErr: 'unsupported as de/humidifier since device does not have supported sensor',
   sensorNo: 'deactivated',
   sensorYes: 'activated',
+  shareWarn: 'using a shared device with the cloud may cause errors, use your main eWeLink account',
   sonoffCamera: 'see the homebridge-ewelink wiki for details to enable the camera',
   stoppedLAN: 'LAN monitoring gracefully stopped',
   stoppedWS: 'Web socket gracefully closed',

From 8359c35c9c1189d6bce32b09d236cd358a8be15c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 23 Jun 2021 09:09:34 +0100
Subject: [PATCH 2347/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c4facc3d..200127ac 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,9 @@ All notable changes to this homebridge-ewelink will be documented in this file.
     - `"standard"` to enable device update logging but disable debug logging for this accessory
     - `"debug"` to enable device update and debug logging for this accessory
     - `"disable"` to disable device update and debug logging for this accessory
+- **Startup Logging**
+  - An accessory warning if a manually configured IP is different from the discovered IP
+  - An accessory warning if a shared device is used over the cloud
 - **iFan Devices**
   - Support for LAN mode control
   - Added option to specify a manual IP
@@ -41,17 +44,15 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 - **LAN Mode**
   - ⚠️ If you have the plugin in `lan`-only mode then the plugin will remove any accessories that do not support LAN mode
+- **Startup Logging**
+  - Accessory configuration options will be logged regardless of logging level
 - **iFan Devices**
   - Previous fan speed will be used again after turning off and on
-- **Polling/Logging**
-  - Power reading polling for POWR2/DUALR3 increased to two minutes
-  - Changes to the startup logging:
-    - Accessory configuration options will always be logged on plugin startup
-    - Warning alerts if a device's discovered IP is different to any manually configured IP
+- **POWR2/DUALR3 Devices**
+  - Polling for power/temperature/humidity readings increased to two minutes
 - **Configuration**
   - `sensorTimeDifference` minimum reduced to 5 seconds and default reduced to 60 seconds
 - **Dependencies**
-
   - Recommended node version bump to v14.17.1
   - Bump `ws` dependency to v7.5.0
 

From 335f35eb70944e3f1010d72de54e1f6a885b8451 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 23 Jun 2021 09:10:49 +0100
Subject: [PATCH 2348/3183] 6.8.1-beta.37

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 4ed38f55..7c15af9c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.8.1-beta.36",
+  "version": "6.8.1-beta.37",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 1db41069..b963de38 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.8.1-beta.36",
+  "version": "6.8.1-beta.37",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From a12d4f93f82030b564aa5779941fab5ed4935d24 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 23 Jun 2021 14:36:28 +0100
Subject: [PATCH 2349/3183] [feat] option to mark cloud-offline devices as no
 response

---
 config.schema.json                     |  6 +++
 lib/device/curtain.js                  | 19 +++++--
 lib/device/diffuser.js                 | 63 +++++++++++++++++-----
 lib/device/fan.js                      | 39 +++++++++++---
 lib/device/humidifier.js               | 27 ++++++++--
 lib/device/light-cct.js                | 35 +++++++++---
 lib/device/light-dimmer.js             | 27 ++++++++--
 lib/device/light-rgb-cct.js            | 47 +++++++++++++----
 lib/device/light-rgb.js                | 39 +++++++++++---
 lib/device/motor.js                    | 27 ++++++++--
 lib/device/outlet-double.js            | 19 +++++--
 lib/device/outlet-multi.js             | 19 +++++--
 lib/device/outlet-power.js             | 19 +++++--
 lib/device/outlet-scm.js               | 20 +++++--
 lib/device/outlet-single.js            | 20 +++++--
 lib/device/rf-bridge.js                |  7 +++
 lib/device/rf-button.js                | 15 +++++-
 lib/device/rf-sensor.js                | 15 ++++++
 lib/device/sensor-ambient.js           | 41 ++++++++++++---
 lib/device/sensor-temp-humi.js         | 28 ++++++++--
 lib/device/simulation/blind.js         | 31 +++++++++--
 lib/device/simulation/cooler.js        | 73 +++++++++++++++++++++-----
 lib/device/simulation/dehumidifier.js  | 56 ++++++++++++++++++--
 lib/device/simulation/door.js          | 31 +++++++++--
 lib/device/simulation/garage-eachen.js | 31 +++++++++--
 lib/device/simulation/garage-four.js   | 31 +++++++++--
 lib/device/simulation/garage-one.js    | 31 +++++++++--
 lib/device/simulation/garage-two.js    | 31 +++++++++--
 lib/device/simulation/heater.js        | 73 +++++++++++++++++++++-----
 lib/device/simulation/humidifier.js    | 56 ++++++++++++++++++--
 lib/device/simulation/lock-one.js      | 31 +++++++++--
 lib/device/simulation/purifier.js      | 33 ++++++++++--
 lib/device/simulation/sensor.js        | 14 +++++
 lib/device/simulation/switch-valve.js  | 31 ++++++++---
 lib/device/simulation/tap-one.js       | 21 ++++++--
 lib/device/simulation/tap-two.js       | 19 +++++--
 lib/device/simulation/valve-four.js    | 19 +++++--
 lib/device/simulation/valve-one.js     | 19 +++++--
 lib/device/simulation/valve-two.js     | 21 ++++++--
 lib/device/simulation/window.js        | 31 +++++++++--
 lib/device/switch-double.js            | 19 +++++--
 lib/device/switch-multi.js             | 19 +++++--
 lib/device/switch-scm.js               | 19 +++++--
 lib/device/switch-single.js            | 19 +++++--
 lib/device/thermostat.js               | 39 +++++++++++++-
 lib/index.js                           |  4 ++
 lib/utils/constants.js                 |  1 +
 47 files changed, 1140 insertions(+), 195 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 35f416e0..2b73663d 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -46,6 +46,11 @@
           }
         ]
       },
+      "offlineAsNoResponse": {
+        "type": "boolean",
+        "title": "Offline Accessories",
+        "description": "Whether to mark cloud-offline accessories as 'No Response' in HomeKit. This setting has no effect if the plugin is in LAN mode and does not apply to Zigbee devices nor the DW2 sensor."
+      },
       "countryCode": {
         "title": "Country Code",
         "type": "string",
@@ -989,6 +994,7 @@
           "type": "help",
           "helpvalue": "<label class=\"control-label text-warning\">⚠ Using LAN mode will remove any unsupported accessories from Homebridge.</label>"
         },
+        "offlineAsNoResponse",
         "countryCode",
         "httpHost",
         "apiPort",
diff --git a/lib/device/curtain.js b/lib/device/curtain.js
index 641cca19..667afeba 100644
--- a/lib/device/curtain.js
+++ b/lib/device/curtain.js
@@ -17,6 +17,9 @@ module.exports = class deviceCurtain {
     this.name = accessory.displayName
     this.accessory = accessory
 
+    // Initially set the online flag as true (to be then updated as false if necessary)
+    this.isOnline = true
+
     /*
       This device's parameters are:
       switch: str{'on'=OPEN, 'off'=CLOSED}
@@ -52,9 +55,15 @@ module.exports = class deviceCurtain {
       this.accessory.addService(this.hapServ.WindowCovering)
 
     // Add the set handler to the target position characteristic
-    this.service.getCharacteristic(this.hapChar.TargetPosition).onSet(async value => {
-      await this.internalPositionUpdate(value)
-    })
+    this.service
+      .getCharacteristic(this.hapChar.TargetPosition)
+      .onGet(() => {
+        if (!this.isOnline && platform.config.offlineAsNoResponse) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.TargetPosition).value
+      })
+      .onSet(async value => await this.internalPositionUpdate(value))
 
     // Output the customised options to the log
     const opts = JSON.stringify({
@@ -134,4 +143,8 @@ module.exports = class deviceCurtain {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
+
+  markStatus (isOnline) {
+    this.isOnline = isOnline
+  }
 }
diff --git a/lib/device/diffuser.js b/lib/device/diffuser.js
index 707c2d0b..6cebeeb2 100644
--- a/lib/device/diffuser.js
+++ b/lib/device/diffuser.js
@@ -18,6 +18,9 @@ module.exports = class deviceDiffuser {
     this.name = accessory.displayName
     this.accessory = accessory
 
+    // Initially set the online flag as true (to be then updated as false if necessary)
+    this.isOnline = true
+
     // Set up custom variables for this device type
     const deviceConf = platform.singleDevices[accessory.context.eweDeviceId]
 
@@ -52,32 +55,60 @@ module.exports = class deviceDiffuser {
       this.accessory.addService(this.hapServ.Lightbulb, 'Light', 'light')
 
     // Add the set handler to the fan on/off characteristic
-    this.fanService.getCharacteristic(this.hapChar.On).onSet(async value => {
-      await this.internalDiffuserOnOffUpdate(value)
-    })
+    this.fanService
+      .getCharacteristic(this.hapChar.On)
+      .onGet(() => {
+        if (!this.isOnline && platform.config.offlineAsNoResponse) {
+          throw new this.hapErr(-70402)
+        }
+        return this.fanService.getCharacteristic(this.hapChar.On).value
+      })
+      .onSet(async value => await this.internalDiffuserOnOffUpdate(value))
 
     // Add the set handler to the fan rotation characteristic
     this.fanService
       .getCharacteristic(this.hapChar.RotationSpeed)
       .setProps({ minStep: 50 })
-      .onSet(async value => {
-        await this.internalDiffuserSpeedUpdate(value)
+      .onGet(() => {
+        if (!this.isOnline && platform.config.offlineAsNoResponse) {
+          throw new this.hapErr(-70402)
+        }
+        return this.fanService.getCharacteristic(this.hapChar.RotationSpeed).value
       })
+      .onSet(async value => await this.internalDiffuserSpeedUpdate(value))
 
     // Add the set handler to the lightbulb on/off characteristic
-    this.lightService.getCharacteristic(this.hapChar.On).onSet(async value => {
-      await this.internalLightStateUpdate(value)
-    })
+    this.lightService
+      .getCharacteristic(this.hapChar.On)
+      .onGet(() => {
+        if (!this.isOnline && platform.config.offlineAsNoResponse) {
+          throw new this.hapErr(-70402)
+        }
+        return this.lightService.getCharacteristic(this.hapChar.On).value
+      })
+      .onSet(async value => await this.internalLightStateUpdate(value))
 
     // Add the set handler to the lightbulb brightness characteristic
-    this.lightService.getCharacteristic(this.hapChar.Brightness).onSet(async value => {
-      await this.internalLightBrightnessUpdate(value)
-    })
+    this.lightService
+      .getCharacteristic(this.hapChar.Brightness)
+      .onGet(() => {
+        if (!this.isOnline && platform.config.offlineAsNoResponse) {
+          throw new this.hapErr(-70402)
+        }
+        return this.lightService.getCharacteristic(this.hapChar.Brightness).value
+      })
+      .onSet(async value => await this.internalLightBrightnessUpdate(value))
 
     // Add the set handler to the lightbulb hue characteristic
-    this.lightService.getCharacteristic(this.hapChar.Hue).onSet(async value => {
-      await this.internalLightColourUpdate(value)
-    })
+    this.lightService
+      .getCharacteristic(this.hapChar.Hue)
+      .onGet(() => {
+        if (!this.isOnline && platform.config.offlineAsNoResponse) {
+          throw new this.hapErr(-70402)
+        }
+        return this.lightService.getCharacteristic(this.hapChar.Hue).value
+      })
+      .onSet(async value => await this.internalLightColourUpdate(value))
 
     // Output the customised options to the log
     const opts = JSON.stringify({
@@ -447,4 +478,8 @@ module.exports = class deviceDiffuser {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
+
+  markStatus (isOnline) {
+    this.isOnline = isOnline
+  }
 }
diff --git a/lib/device/fan.js b/lib/device/fan.js
index 90db715d..b895050d 100644
--- a/lib/device/fan.js
+++ b/lib/device/fan.js
@@ -17,6 +17,9 @@ module.exports = class deviceFan {
     this.name = accessory.displayName
     this.accessory = accessory
 
+    // Initially set the online flag as true (to be then updated as false if necessary)
+    this.isOnline = true
+
     // Set up custom variables for this device type
     const deviceConf = platform.fanDevices[accessory.context.eweDeviceId]
     this.hideLight = deviceConf && deviceConf.hideLight
@@ -46,17 +49,27 @@ module.exports = class deviceFan {
       this.accessory.getService(this.hapServ.Fan) || this.accessory.addService(this.hapServ.Fan)
 
     // Add the set handler to the fan on/off characteristic
-    this.service.getCharacteristic(this.hapChar.On).onSet(async value => {
-      await this.internalStateUpdate(value)
-    })
+    this.service
+      .getCharacteristic(this.hapChar.On)
+      .onGet(() => {
+        if (!this.isOnline && platform.config.offlineAsNoResponse) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.On).value
+      })
+      .onSet(async value => await this.internalStateUpdate(value))
 
     // Add the set handler to the fan rotation speed characteristic
     this.service
       .getCharacteristic(this.hapChar.RotationSpeed)
       .setProps({ minStep: 33 })
-      .onSet(async value => {
-        await this.internalSpeedUpdate(value)
+      .onGet(() => {
+        if (!this.isOnline && platform.config.offlineAsNoResponse) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.RotationSpeed).value
       })
+      .onSet(async value => await this.internalSpeedUpdate(value))
 
     // Check to see if the user has hidden the light channel
     if (this.hideLight) {
@@ -71,9 +84,15 @@ module.exports = class deviceFan {
         this.accessory.addService(this.hapServ.Lightbulb)
 
       // Add the set handler to the lightbulb on/off characteristic
-      this.lightService.getCharacteristic(this.hapChar.On).onSet(async value => {
-        await this.internalLightUpdate(value)
-      })
+      this.lightService
+        .getCharacteristic(this.hapChar.On)
+        .onGet(() => {
+          if (!this.isOnline && platform.config.offlineAsNoResponse) {
+            throw new this.hapErr(-70402)
+          }
+          return this.lightService.getCharacteristic(this.hapChar.On).value
+        })
+        .onSet(async value => await this.internalLightUpdate(value))
     }
 
     // Set the fan service to the primary service
@@ -321,4 +340,8 @@ module.exports = class deviceFan {
     }
     return toReturn
   }
+
+  markStatus (isOnline) {
+    this.isOnline = isOnline
+  }
 }
diff --git a/lib/device/humidifier.js b/lib/device/humidifier.js
index 90b5c349..b80ae3a0 100644
--- a/lib/device/humidifier.js
+++ b/lib/device/humidifier.js
@@ -17,6 +17,9 @@ module.exports = class deviceHumidifier {
     this.name = accessory.displayName
     this.accessory = accessory
 
+    // Initially set the online flag as true (to be then updated as false if necessary)
+    this.isOnline = true
+
     // Set up custom variables for this device type
     const deviceConf = platform.singleDevices[accessory.context.eweDeviceId]
 
@@ -51,17 +54,27 @@ module.exports = class deviceHumidifier {
       this.accessory.getService(this.hapServ.Fan) || this.accessory.addService(this.hapServ.Fan)
 
     // Add the set handler to the fan on/off characteristic
-    this.service.getCharacteristic(this.hapChar.On).onSet(async value => {
-      await this.internalStateUpdate(value)
-    })
+    this.service
+      .getCharacteristic(this.hapChar.On)
+      .onGet(() => {
+        if (!this.isOnline && platform.config.offlineAsNoResponse) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.On).value
+      })
+      .onSet(async value => await this.internalStateUpdate(value))
 
     // Add the set handler to the fan rotation speed characteristic
     this.service
       .getCharacteristic(this.hapChar.RotationSpeed)
       .setProps({ minStep: 33 })
-      .onSet(async value => {
-        await this.internalModeUpdate(value)
+      .onGet(() => {
+        if (!this.isOnline && platform.config.offlineAsNoResponse) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.RotationSpeed).value
       })
+      .onSet(async value => await this.internalModeUpdate(value))
 
     // Conversion object eWeLink mode to text label
     this.mode2label = {
@@ -181,4 +194,8 @@ module.exports = class deviceHumidifier {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
+
+  markStatus (isOnline) {
+    this.isOnline = isOnline
+  }
 }
diff --git a/lib/device/light-cct.js b/lib/device/light-cct.js
index cef09557..d3ddb8c6 100644
--- a/lib/device/light-cct.js
+++ b/lib/device/light-cct.js
@@ -17,6 +17,9 @@ module.exports = class deviceLightCCT {
     this.name = accessory.displayName
     this.accessory = accessory
 
+    // Initially set the online flag as true (to be then updated as false if necessary)
+    this.isOnline = true
+
     // Set up custom variables for this device type
     const deviceConf = platform.lightDevices[accessory.context.eweDeviceId]
     this.bulbModel =
@@ -74,22 +77,38 @@ module.exports = class deviceLightCCT {
       this.accessory.addService(this.hapServ.Lightbulb)
 
     // Add the set handler to the lightbulb on/off characteristic
-    this.service.getCharacteristic(this.hapChar.On).onSet(async value => {
-      await this.internalStateUpdate(value)
-    })
+    this.service
+      .getCharacteristic(this.hapChar.On)
+      .onGet(() => {
+        if (!this.isOnline && platform.config.offlineAsNoResponse) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.On).value
+      })
+      .onSet(async value => await this.internalStateUpdate(value))
 
     // Add the set handler to the lightbulb brightness characteristic
     this.service
       .getCharacteristic(this.hapChar.Brightness)
       .setProps({ minStep: this.brightStep })
-      .onSet(async value => {
-        await this.internalBrightnessUpdate(value)
+      .onGet(() => {
+        if (!this.isOnline && platform.config.offlineAsNoResponse) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.Brightness).value
       })
+      .onSet(async value => await this.internalBrightnessUpdate(value))
 
     // Add the set handler to the lightbulb colour temperature characteristic
-    this.service.getCharacteristic(this.hapChar.ColorTemperature).onSet(async value => {
-      await this.internalCTUpdate(value)
-    })
+    this.service
+      .getCharacteristic(this.hapChar.ColorTemperature)
+      .onGet(() => {
+        if (!this.isOnline && platform.config.offlineAsNoResponse) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.ColorTemperature).value
+      })
+      .onSet(async value => await this.internalCTUpdate(value))
 
     // This is needed as sometimes we need to send the brightness with a cct update
     this.cacheBright = this.service.getCharacteristic(this.hapChar.Brightness).value
diff --git a/lib/device/light-dimmer.js b/lib/device/light-dimmer.js
index 561ff0a4..ae3bb4f3 100644
--- a/lib/device/light-dimmer.js
+++ b/lib/device/light-dimmer.js
@@ -17,6 +17,9 @@ module.exports = class deviceLightDimmer {
     this.name = accessory.displayName
     this.accessory = accessory
 
+    // Initially set the online flag as true (to be then updated as false if necessary)
+    this.isOnline = true
+
     // Set up custom variables for this device type
     const deviceConf = platform.lightDevices[accessory.context.eweDeviceId]
     this.brightStep =
@@ -50,17 +53,27 @@ module.exports = class deviceLightDimmer {
       this.accessory.addService(this.hapServ.Lightbulb)
 
     // Add the set handler to the lightbulb on/off characteristic
-    this.service.getCharacteristic(this.hapChar.On).onSet(async value => {
-      await this.internalStateUpdate(value)
-    })
+    this.service
+      .getCharacteristic(this.hapChar.On)
+      .onGet(() => {
+        if (!this.isOnline && platform.config.offlineAsNoResponse) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.On).value
+      })
+      .onSet(async value => await this.internalStateUpdate(value))
 
     // Add the set handler to the lightbulb brightness characteristic
     this.service
       .getCharacteristic(this.hapChar.Brightness)
       .setProps({ minStep: this.brightStep })
-      .onSet(async value => {
-        await this.internalBrightnessUpdate(value)
+      .onGet(() => {
+        if (!this.isOnline && platform.config.offlineAsNoResponse) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.Brightness).value
       })
+      .onSet(async value => await this.internalBrightnessUpdate(value))
 
     // Output the customised options to the log
     const opts = JSON.stringify({
@@ -210,6 +223,10 @@ module.exports = class deviceLightDimmer {
     }
   }
 
+  markStatus (isOnline) {
+    this.isOnline = isOnline
+  }
+
   currentState () {
     const toReturn = {}
     toReturn.services = ['light']
diff --git a/lib/device/light-rgb-cct.js b/lib/device/light-rgb-cct.js
index bee005b7..52ad98b5 100644
--- a/lib/device/light-rgb-cct.js
+++ b/lib/device/light-rgb-cct.js
@@ -18,6 +18,9 @@ module.exports = class deviceLightRGBCCT {
     this.name = accessory.displayName
     this.accessory = accessory
 
+    // Initially set the online flag as true (to be then updated as false if necessary)
+    this.isOnline = true
+
     // Set up custom variables for this device type
     const deviceConf = platform.lightDevices[accessory.context.eweDeviceId]
     this.alShift =
@@ -60,27 +63,49 @@ module.exports = class deviceLightRGBCCT {
       this.accessory.addService(this.hapServ.Lightbulb)
 
     // Add the set handler to the lightbulb on/off characteristic
-    this.service.getCharacteristic(this.hapChar.On).onSet(async value => {
-      await this.internalStateUpdate(value)
-    })
+    this.service
+      .getCharacteristic(this.hapChar.On)
+      .onGet(() => {
+        if (!this.isOnline && platform.config.offlineAsNoResponse) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.On).value
+      })
+      .onSet(async value => await this.internalStateUpdate(value))
 
     // Add the set handler to the lightbulb brightness characteristic
     this.service
       .getCharacteristic(this.hapChar.Brightness)
       .setProps({ minStep: this.brightStep })
-      .onSet(async value => {
-        await this.internalBrightnessUpdate(value)
+      .onGet(() => {
+        if (!this.isOnline && platform.config.offlineAsNoResponse) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.Brightness).value
       })
+      .onSet(async value => await this.internalBrightnessUpdate(value))
 
     // Add the set handler to the lightbulb hue characteristic
-    this.service.getCharacteristic(this.hapChar.Hue).onSet(async value => {
-      await this.internalColourUpdate(value)
-    })
+    this.service
+      .getCharacteristic(this.hapChar.Hue)
+      .onGet(() => {
+        if (!this.isOnline && platform.config.offlineAsNoResponse) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.Hue).value
+      })
+      .onSet(async value => await this.internalColourUpdate(value))
 
     // Add the set handler to the lightbulb colour temperature characteristic
-    this.service.getCharacteristic(this.hapChar.ColorTemperature).onSet(async value => {
-      await this.internalCTUpdate(value)
-    })
+    this.service
+      .getCharacteristic(this.hapChar.ColorTemperature)
+      .onGet(() => {
+        if (!this.isOnline && platform.config.offlineAsNoResponse) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.ColorTemperature).value
+      })
+      .onSet(async value => await this.internalCTUpdate(value))
 
     // This is needed as sometimes we need to send the brightness with a cct update
     this.cacheBright = this.service.getCharacteristic(this.hapChar.Brightness).value
diff --git a/lib/device/light-rgb.js b/lib/device/light-rgb.js
index bb201dfb..edb9334e 100644
--- a/lib/device/light-rgb.js
+++ b/lib/device/light-rgb.js
@@ -18,6 +18,9 @@ module.exports = class deviceLightRGB {
     this.name = accessory.displayName
     this.accessory = accessory
 
+    // Initially set the online flag as true (to be then updated as false if necessary)
+    this.isOnline = true
+
     // Set up custom variables for this device type
     const deviceConf = platform.lightDevices[accessory.context.eweDeviceId]
     this.alShift =
@@ -55,22 +58,38 @@ module.exports = class deviceLightRGB {
       this.accessory.addService(this.hapServ.Lightbulb)
 
     // Add the set handler to the lightbulb on/off characteristic
-    this.service.getCharacteristic(this.hapChar.On).onSet(async value => {
-      await this.internalStateUpdate(value)
-    })
+    this.service
+      .getCharacteristic(this.hapChar.On)
+      .onGet(() => {
+        if (!this.isOnline && platform.config.offlineAsNoResponse) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.On).value
+      })
+      .onSet(async value => await this.internalStateUpdate(value))
 
     // Add the set handler to the lightbulb brightness characteristic
     this.service
       .getCharacteristic(this.hapChar.Brightness)
       .setProps({ minStep: 100 })
-      .onSet(async value => {
-        await this.internalBrightnessUpdate(value)
+      .onGet(() => {
+        if (!this.isOnline && platform.config.offlineAsNoResponse) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.Brightness).value
       })
+      .onSet(async value => await this.internalBrightnessUpdate(value))
 
     // Add the set handler to the lightbulb hue characteristic
-    this.service.getCharacteristic(this.hapChar.Hue).onSet(async value => {
-      await this.internalColourUpdate(value)
-    })
+    this.service
+      .getCharacteristic(this.hapChar.Hue)
+      .onGet(() => {
+        if (!this.isOnline && platform.config.offlineAsNoResponse) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.Hue).value
+      })
+      .onSet(async value => await this.internalColourUpdate(value))
 
     // Output the customised options to the log
     const opts = JSON.stringify({
@@ -234,6 +253,10 @@ module.exports = class deviceLightRGB {
     }
   }
 
+  markStatus (isOnline) {
+    this.isOnline = isOnline
+  }
+
   currentState () {
     const toReturn = {}
     toReturn.services = ['light']
diff --git a/lib/device/motor.js b/lib/device/motor.js
index 03016b90..827200ac 100644
--- a/lib/device/motor.js
+++ b/lib/device/motor.js
@@ -17,6 +17,9 @@ module.exports = class deviceMotor {
     this.name = accessory.displayName
     this.accessory = accessory
 
+    // Initially set the online flag as true (to be then updated as false if necessary)
+    this.isOnline = true
+
     /*
       This is for the DUALR3 using motor mode
       This device's parameters are:
@@ -53,11 +56,25 @@ module.exports = class deviceMotor {
       this.accessory.getService(this.hapServ.WindowCovering) ||
       this.accessory.addService(this.hapServ.WindowCovering)
 
-    // Add the set handler to the target position characteristic
-    this.service.getCharacteristic(this.hapChar.TargetPosition).onSet(async value => {
-      await this.internalPositionUpdate(value)
+    // Add the get handler to the current position characteristic
+    this.service.getCharacteristic(this.hapChar.CurrentPosition).onGet(() => {
+      if (!this.isOnline && platform.config.offlineAsNoResponse) {
+        throw new this.hapErr(-70402)
+      }
+      return this.service.getCharacteristic(this.hapChar.CurrentPosition).value
     })
 
+    // Add the set handler to the target position characteristic
+    this.service
+      .getCharacteristic(this.hapChar.TargetPosition)
+      .onGet(() => {
+        if (!this.isOnline && platform.config.offlineAsNoResponse) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.TargetPosition).value
+      })
+      .onSet(async value => await this.internalPositionUpdate(value))
+
     // Output the customised options to the log
     const opts = JSON.stringify({
       logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable'
@@ -116,4 +133,8 @@ module.exports = class deviceMotor {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
+
+  markStatus (isOnline) {
+    this.isOnline = isOnline
+  }
 }
diff --git a/lib/device/outlet-double.js b/lib/device/outlet-double.js
index b304f8ab..17ccf906 100644
--- a/lib/device/outlet-double.js
+++ b/lib/device/outlet-double.js
@@ -20,6 +20,9 @@ module.exports = class deviceOutletDouble {
     this.name = accessory.displayName
     this.accessory = accessory
 
+    // Initially set the online flag as true (to be then updated as false if necessary)
+    this.isOnline = true
+
     // Set up custom variables for this device type
     const deviceConf = platform.multiDevices[accessory.context.eweDeviceId]
     this.hideChannels = deviceConf && deviceConf.hideChannels ? deviceConf.hideChannels : undefined
@@ -74,9 +77,15 @@ module.exports = class deviceOutletDouble {
     }
 
     // Add the set handler to the switch/outlet on/off characteristic
-    this.service.getCharacteristic(this.hapChar.On).onSet(async value => {
-      await this.internalStateUpdate(value)
-    })
+    this.service
+      .getCharacteristic(this.hapChar.On)
+      .onGet(() => {
+        if (!this.isOnline && platform.config.offlineAsNoResponse) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.On).value
+      })
+      .onSet(async value => await this.internalStateUpdate(value))
 
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new platform.eveService('energy', this.accessory, {
@@ -317,6 +326,10 @@ module.exports = class deviceOutletDouble {
     }
   }
 
+  markStatus (isOnline) {
+    this.isOnline = isOnline
+  }
+
   currentState () {
     const toReturn = {}
     toReturn.services = ['outlet']
diff --git a/lib/device/outlet-multi.js b/lib/device/outlet-multi.js
index d02fc818..f6a343f6 100644
--- a/lib/device/outlet-multi.js
+++ b/lib/device/outlet-multi.js
@@ -19,6 +19,9 @@ module.exports = class deviceOutletMulti {
     this.name = accessory.displayName
     this.accessory = accessory
 
+    // Initially set the online flag as true (to be then updated as false if necessary)
+    this.isOnline = true
+
     // Set up custom variables for this device type
     const deviceConf = platform.multiDevices[accessory.context.eweDeviceId]
     this.hideChannels = deviceConf && deviceConf.hideChannels ? deviceConf.hideChannels : undefined
@@ -54,9 +57,15 @@ module.exports = class deviceOutletMulti {
       this.accessory.addService(this.hapServ.Outlet)
 
     // Add the set handler to the switch/outlet on/off characteristic
-    this.service.getCharacteristic(this.hapChar.On).onSet(async value => {
-      await this.internalStateUpdate(value)
-    })
+    this.service
+      .getCharacteristic(this.hapChar.On)
+      .onGet(() => {
+        if (!this.isOnline && platform.config.offlineAsNoResponse) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.On).value
+      })
+      .onSet(async value => await this.internalStateUpdate(value))
 
     // Remove any OutletInUse characteristics from previous plugin versions
     if (this.service.testCharacteristic(this.hapChar.OutletInUse)) {
@@ -207,6 +216,10 @@ module.exports = class deviceOutletMulti {
     }
   }
 
+  markStatus (isOnline) {
+    this.isOnline = isOnline
+  }
+
   currentState () {
     const toReturn = {}
     toReturn.services = ['outlet']
diff --git a/lib/device/outlet-power.js b/lib/device/outlet-power.js
index 85412bed..fe08f8a6 100644
--- a/lib/device/outlet-power.js
+++ b/lib/device/outlet-power.js
@@ -18,6 +18,9 @@ module.exports = class deviceOutletPower {
     this.name = accessory.displayName
     this.accessory = accessory
 
+    // Initially set the online flag as true (to be then updated as false if necessary)
+    this.isOnline = true
+
     // Set up custom variables for this device type
     const deviceConf = platform.outletDevices[accessory.context.eweDeviceId]
     this.inUsePowerThreshold =
@@ -61,9 +64,15 @@ module.exports = class deviceOutletPower {
     }
 
     // Add the set handler to the outlet on/off characteristic
-    this.service.getCharacteristic(this.hapChar.On).onSet(async value => {
-      await this.internalStateUpdate(value)
-    })
+    this.service
+      .getCharacteristic(this.hapChar.On)
+      .onGet(() => {
+        if (!this.isOnline && platform.config.offlineAsNoResponse) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.On).value
+      })
+      .onSet(async value => await this.internalStateUpdate(value))
 
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new platform.eveService('energy', this.accessory, {
@@ -232,6 +241,10 @@ module.exports = class deviceOutletPower {
     }
   }
 
+  markStatus (isOnline) {
+    this.isOnline = isOnline
+  }
+
   currentState () {
     const toReturn = {}
     toReturn.services = ['outlet']
diff --git a/lib/device/outlet-scm.js b/lib/device/outlet-scm.js
index 1533fe47..a3c3da4b 100644
--- a/lib/device/outlet-scm.js
+++ b/lib/device/outlet-scm.js
@@ -16,6 +16,9 @@ module.exports = class deviceOutletSCM {
     this.name = accessory.displayName
     this.accessory = accessory
 
+    // Initially set the online flag as true (to be then updated as false if necessary)
+    this.isOnline = true
+
     // Set up custom variables for this device type
     const deviceConf = platform.outletDevices[accessory.context.eweDeviceId]
 
@@ -49,10 +52,15 @@ module.exports = class deviceOutletSCM {
       this.accessory.getService(this.hapServ.Outlet) ||
       this.accessory.addService(this.hapServ.Outlet)
 
-    // Add the set handler to the switch/outlet on/off characteristic
-    this.service.getCharacteristic(this.hapChar.On).onSet(async value => {
-      await this.internalStateUpdate(value)
-    })
+    this.service
+      .getCharacteristic(this.hapChar.On)
+      .onGet(() => {
+        if (!this.isOnline && platform.config.offlineAsNoResponse) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.On).value
+      })
+      .onSet(async value => await this.internalStateUpdate(value))
 
     // Output the customised options to the log
     const opts = JSON.stringify({
@@ -100,6 +108,10 @@ module.exports = class deviceOutletSCM {
     }
   }
 
+  markStatus (isOnline) {
+    this.isOnline = isOnline
+  }
+
   currentState () {
     const toReturn = {}
     const service = 'outlet'
diff --git a/lib/device/outlet-single.js b/lib/device/outlet-single.js
index a75743c1..43e364ba 100644
--- a/lib/device/outlet-single.js
+++ b/lib/device/outlet-single.js
@@ -18,6 +18,9 @@ module.exports = class deviceOutletSingle {
     this.name = accessory.displayName
     this.accessory = accessory
 
+    // Initially set the online flag as true (to be then updated as false if necessary)
+    this.isOnline = true
+
     // Set up custom variables for this device type
     const deviceConf = platform.outletDevices[accessory.context.eweDeviceId]
 
@@ -51,10 +54,15 @@ module.exports = class deviceOutletSingle {
       this.accessory.getService(this.hapServ.Outlet) ||
       this.accessory.addService(this.hapServ.Outlet)
 
-    // Add the set handler to the outlet on/off characteristic
-    this.service.getCharacteristic(this.hapChar.On).onSet(async value => {
-      await this.internalStateUpdate(value)
-    })
+    this.service
+      .getCharacteristic(this.hapChar.On)
+      .onGet(() => {
+        if (!this.isOnline && platform.config.offlineAsNoResponse) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.On).value
+      })
+      .onSet(async value => await this.internalStateUpdate(value))
 
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new platform.eveService('energy', this.accessory, {
@@ -120,6 +128,10 @@ module.exports = class deviceOutletSingle {
     }
   }
 
+  markStatus (isOnline) {
+    this.isOnline = isOnline
+  }
+
   currentState () {
     const toReturn = {}
     toReturn.services = ['outlet']
diff --git a/lib/device/rf-bridge.js b/lib/device/rf-bridge.js
index 4b654f31..13f19d89 100644
--- a/lib/device/rf-bridge.js
+++ b/lib/device/rf-bridge.js
@@ -21,6 +21,9 @@ module.exports = class deviceRFBridge {
     this.name = accessory.displayName
     this.accessory = accessory
 
+    // Initially set the online flag as true (to be then updated as false if necessary)
+    this.isOnline = true
+
     // Set up custom variables for this device type
     const deviceConf = platform.rfDevices[accessory.context.eweDeviceId]
     const resetOnStartup = deviceConf && deviceConf.resetOnStartup
@@ -261,4 +264,8 @@ module.exports = class deviceRFBridge {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
+
+  markStatus (isOnline) {
+    this.isOnline = isOnline
+  }
 }
diff --git a/lib/device/rf-button.js b/lib/device/rf-button.js
index f6064420..30869d09 100644
--- a/lib/device/rf-button.js
+++ b/lib/device/rf-button.js
@@ -18,6 +18,9 @@ module.exports = class deviceRFButton {
     this.name = accessory.displayName
     this.accessory = accessory
 
+    // Initially set the online flag as true (to be then updated as false if necessary)
+    this.isOnline = true
+
     // Set up custom variables for this device type
     const deviceConf = platform.rfSubdevices[accessory.context.hbDeviceId]
 
@@ -57,9 +60,13 @@ module.exports = class deviceRFButton {
       this.accessory
         .getService(name)
         .getCharacteristic(this.hapChar.On)
-        .onSet(async value => {
-          await this.internalPressUpdate(chan, name, value)
+        .onGet(() => {
+          if (!this.isOnline && platform.config.offlineAsNoResponse) {
+            throw new this.hapErr(-70402)
+          }
+          return this.accessory.getService(name).getCharacteristic(this.hapChar.On).value
         })
+        .onSet(async value => await this.internalPressUpdate(chan, name, value))
     })
 
     // Output the customised options to the log
@@ -93,4 +100,8 @@ module.exports = class deviceRFButton {
       throw new this.hapErr(-70402)
     }
   }
+
+  markStatus (isOnline) {
+    this.isOnline = isOnline
+  }
 }
diff --git a/lib/device/rf-sensor.js b/lib/device/rf-sensor.js
index 895b6cc9..8cf8508c 100644
--- a/lib/device/rf-sensor.js
+++ b/lib/device/rf-sensor.js
@@ -14,6 +14,9 @@ module.exports = class deviceRFSensor {
     this.log = platform.log
     this.platform = platform
 
+    // Initially set the online flag as true (to be then updated as false if necessary)
+    this.isOnline = true
+
     // Set up custom variables for this device type
     const deviceConf = platform.rfSubdevices[accessory.context.hbDeviceId]
     this.sensorTimeLength =
@@ -135,6 +138,14 @@ module.exports = class deviceRFSensor {
     // Always start with the sensor off (useful when restarting Homebridge)
     service.updateCharacteristic(char, 0)
 
+    // Add a get handler to mark as no response if device is offline
+    service.getCharacteristic(char).onGet(() => {
+      if (!this.isOnline && platform.config.offlineAsNoResponse) {
+        throw new this.hapErr(-70402)
+      }
+      return service.getCharacteristic(char).value
+    })
+
     // Pass the accessory to Fakegato to set up with Eve
     accessory.eveService = new platform.eveService(eveType, accessory, {
       log: platform.config.debugFakegato ? this.log : () => {}
@@ -149,4 +160,8 @@ module.exports = class deviceRFSensor {
     })
     this.log('[%s] %s %s.', accessory.displayName, this.lang.devInitOpts, opts)
   }
+
+  markStatus (isOnline) {
+    this.isOnline = isOnline
+  }
 }
diff --git a/lib/device/sensor-ambient.js b/lib/device/sensor-ambient.js
index 1c6de3a6..d3c85eb2 100644
--- a/lib/device/sensor-ambient.js
+++ b/lib/device/sensor-ambient.js
@@ -17,6 +17,9 @@ module.exports = class deviceSensorAmbient {
     this.name = accessory.displayName
     this.accessory = accessory
 
+    // Initially set the online flag as true (to be then updated as false if necessary)
+    this.isOnline = true
+
     // Set up custom variables for this device type
     const deviceConf = platform.thDevices[accessory.context.eweDeviceId]
     this.hideSwitch = deviceConf && deviceConf.hideSwitch
@@ -75,9 +78,15 @@ module.exports = class deviceSensorAmbient {
         this.accessory.addService(this.hapServ.Switch)
 
       // Add the set handler to the switch on/off characteristic
-      this.switchService.getCharacteristic(this.hapChar.On).onSet(async value => {
-        await this.internalStateUpdate(value)
-      })
+      this.switchService
+        .getCharacteristic(this.hapChar.On)
+        .onGet(() => {
+          if (!this.isOnline && platform.config.offlineAsNoResponse) {
+            throw new this.hapErr(-70402)
+          }
+          return this.switchService.getCharacteristic(this.hapChar.On).value
+        })
+        .onSet(async value => await this.internalStateUpdate(value))
     }
 
     // Add the temperature sensor service if it doesn't already exist
@@ -86,9 +95,17 @@ module.exports = class deviceSensorAmbient {
       this.accessory.addService(this.hapServ.TemperatureSensor)
 
     // Set custom properties of the current temperature characteristic
-    this.tempService.getCharacteristic(this.hapChar.CurrentTemperature).setProps({
-      minStep: 0.1
-    })
+    this.tempService
+      .getCharacteristic(this.hapChar.CurrentTemperature)
+      .setProps({
+        minStep: 0.1
+      })
+      .onGet(() => {
+        if (!this.isOnline && platform.config.offlineAsNoResponse) {
+          throw new this.hapErr(-70402)
+        }
+        return this.tempService.getCharacteristic(this.hapChar.CurrentTemperature).value
+      })
 
     // The DS18B20 sensor does not provide humidity readings
     if (this.accessory.context.sensorType === 'DS18B20') {
@@ -100,6 +117,14 @@ module.exports = class deviceSensorAmbient {
       this.humiService =
         this.accessory.getService(this.hapServ.HumiditySensor) ||
         this.accessory.addService(this.hapServ.HumiditySensor)
+
+      // Add a get handler to the current relative humidity characteristic
+      this.humiService.getCharacteristic(this.hapChar.CurrentRelativeHumidity).onGet(() => {
+        if (!this.isOnline && platform.config.offlineAsNoResponse) {
+          throw new this.hapErr(-70402)
+        }
+        return this.humiService.getCharacteristic(this.hapChar.CurrentRelativeHumidity).value
+      })
     }
 
     // The switch as the primary service ensures the status is reflected in the Home icon
@@ -234,4 +259,8 @@ module.exports = class deviceSensorAmbient {
     }
     return toReturn
   }
+
+  markStatus (isOnline) {
+    this.isOnline = isOnline
+  }
 }
diff --git a/lib/device/sensor-temp-humi.js b/lib/device/sensor-temp-humi.js
index 1e6f527b..17e52520 100644
--- a/lib/device/sensor-temp-humi.js
+++ b/lib/device/sensor-temp-humi.js
@@ -16,6 +16,9 @@ module.exports = class deviceSensorTempHumi {
     this.name = accessory.displayName
     this.accessory = accessory
 
+    // Initially set the online flag as true (to be then updated as false if necessary)
+    this.isOnline = true
+
     // Set up custom variables for this device type
     const deviceConf = platform.thDevices[accessory.context.eweDeviceId]
     this.tempOffset =
@@ -51,15 +54,30 @@ module.exports = class deviceSensorTempHumi {
       this.accessory.addService(this.hapServ.TemperatureSensor)
 
     // Set custom properties of the current temperature characteristic
-    this.tempService.getCharacteristic(this.hapChar.CurrentTemperature).setProps({
-      minStep: 0.1
-    })
+    this.tempService
+      .getCharacteristic(this.hapChar.CurrentTemperature)
+      .setProps({
+        minStep: 0.1
+      })
+      .onGet(() => {
+        if (!this.isOnline && platform.config.offlineAsNoResponse) {
+          throw new this.hapErr(-70402)
+        }
+        return this.tempService.getCharacteristic(this.hapChar.CurrentTemperature).value
+      })
 
     // Add the humidity sensor service if it doesn't already exist
     this.humiService =
       this.accessory.getService(this.hapServ.HumiditySensor) ||
       this.accessory.addService(this.hapServ.HumiditySensor)
 
+    this.humiService.getCharacteristic(this.hapChar.CurrentRelativeHumidity).onGet(() => {
+      if (!this.isOnline && platform.config.offlineAsNoResponse) {
+        throw new this.hapErr(-70402)
+      }
+      return this.humiService.getCharacteristic(this.hapChar.CurrentRelativeHumidity).value
+    })
+
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new platform.eveService('custom', this.accessory, {
       log: platform.config.debugFakegato ? this.log : () => {}
@@ -117,4 +135,8 @@ module.exports = class deviceSensorTempHumi {
     }
     return toReturn
   }
+
+  markStatus (isOnline) {
+    this.isOnline = isOnline
+  }
 }
diff --git a/lib/device/simulation/blind.js b/lib/device/simulation/blind.js
index 6aebf234..8046a762 100644
--- a/lib/device/simulation/blind.js
+++ b/lib/device/simulation/blind.js
@@ -17,6 +17,9 @@ module.exports = class deviceBlind {
     this.name = accessory.displayName
     this.accessory = accessory
 
+    // Initially set the online flag as true (to be then updated as false if necessary)
+    this.isOnline = true
+
     // Set up custom variables for this device type
     const deviceConf = platform.simulations[accessory.context.eweDeviceId]
     this.operationTimeUp = deviceConf.operationTime || platform.consts.defaultValues.operationTime
@@ -57,12 +60,28 @@ module.exports = class deviceBlind {
       this.service.setCharacteristic(this.hapChar.PositionState, 2)
     }
 
-    // Add the set handler to the target position characteristic
-    this.service.getCharacteristic(this.hapChar.TargetPosition).onSet(value => {
-      // We don't use await as we want the callback to be run straight away
-      this.internalPositionUpdate(value)
+    // Add the get handler to the current position characteristic
+    this.service.getCharacteristic(this.hapChar.CurrentPosition).onGet(() => {
+      if (!this.isOnline && platform.config.offlineAsNoResponse) {
+        throw new this.hapErr(-70402)
+      }
+      return this.service.getCharacteristic(this.hapChar.CurrentPosition).value
     })
 
+    // Add the set handler to the target position characteristic
+    this.service
+      .getCharacteristic(this.hapChar.TargetPosition)
+      .onGet(() => {
+        if (!this.isOnline && platform.config.offlineAsNoResponse) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.TargetPosition).value
+      })
+      .onSet(value => {
+        // We don't use await as we want the callback to be run straight away
+        this.internalPositionUpdate(value)
+      })
+
     // Output the customised options to the log
     const opts = JSON.stringify({
       logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
@@ -153,4 +172,8 @@ module.exports = class deviceBlind {
   }
 
   async externalUpdate (params) {}
+
+  markStatus (isOnline) {
+    this.isOnline = isOnline
+  }
 }
diff --git a/lib/device/simulation/cooler.js b/lib/device/simulation/cooler.js
index 5e80a992..fc94259c 100644
--- a/lib/device/simulation/cooler.js
+++ b/lib/device/simulation/cooler.js
@@ -17,6 +17,9 @@ module.exports = class deviceHeater {
     this.name = accessory.displayName
     this.accessory = accessory
 
+    // Initially set the online flag as true (to be then updated as false if necessary)
+    this.isOnline = true
+
     // Set up custom variables for this device type
     const deviceConf = platform.thDevices[accessory.context.eweDeviceId]
     const deviceConf2 = platform.simulations[accessory.context.eweDeviceId]
@@ -110,26 +113,64 @@ module.exports = class deviceHeater {
       this.humiService =
         this.accessory.getService(this.hapServ.HumiditySensor) ||
         this.accessory.addService(this.hapServ.HumiditySensor)
+
+      // Add a get handler to the current relative humidity characteristic
+      this.humiService.getCharacteristic(this.hapChar.CurrentRelativeHumidity).onGet(() => {
+        if (!this.isOnline && platform.config.offlineAsNoResponse) {
+          throw new this.hapErr(-70402)
+        }
+        return this.humiService.getCharacteristic(this.hapChar.CurrentRelativeHumidity).value
+      })
     }
 
     // Set the heater as the primary service
     this.service.setPrimaryService()
 
     // Set custom properties of the current temperature characteristic
-    this.service.getCharacteristic(this.hapChar.CurrentTemperature).setProps({
-      minStep: 0.1
-    })
+    this.service
+      .getCharacteristic(this.hapChar.CurrentTemperature)
+      .setProps({
+        minStep: 0.1
+      })
+      .onGet(() => {
+        if (!this.isOnline && platform.config.offlineAsNoResponse) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.CurrentTemperature).value
+      })
 
     // Add the set handler to the heater active characteristic
-    this.service.getCharacteristic(this.hapChar.Active).onSet(async value => {
-      await this.internalStateUpdate(value)
-    })
+    this.service
+      .getCharacteristic(this.hapChar.Active)
+      .onGet(() => {
+        if (!this.isOnline && platform.config.offlineAsNoResponse) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.Active).value
+      })
+      .onSet(async value => await this.internalStateUpdate(value))
 
     // Add options to the target state characteristic
-    this.service.getCharacteristic(this.hapChar.TargetHeaterCoolerState).setProps({
-      minValue: 0,
-      maxValue: 0,
-      validValues: [0]
+    this.service
+      .getCharacteristic(this.hapChar.TargetHeaterCoolerState)
+      .setProps({
+        minValue: 0,
+        maxValue: 0,
+        validValues: [0]
+      })
+      .onGet(() => {
+        if (!this.isOnline && platform.config.offlineAsNoResponse) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.TargetHeaterCoolerState).value
+      })
+
+    // Add a get handler to the current state characteristics
+    this.service.getCharacteristic(this.hapChar.CurrentHeaterCoolerState).onGet(() => {
+      if (!this.isOnline && platform.config.offlineAsNoResponse) {
+        throw new this.hapErr(-70402)
+      }
+      return this.service.getCharacteristic(this.hapChar.CurrentHeaterCoolerState).value
     })
 
     // Add the set handler to the target temperature characteristic
@@ -141,9 +182,13 @@ module.exports = class deviceHeater {
         maxValue: this.maxTarget,
         minStep: 0.5
       })
-      .onSet(async value => {
-        await this.internalTargetTempUpdate(value)
+      .onGet(() => {
+        if (!this.isOnline && platform.config.offlineAsNoResponse) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.CoolingThresholdTemperature).value
       })
+      .onSet(async value => await this.internalTargetTempUpdate(value))
 
     // Initialise these caches now since they aren't determined by the initial externalUpdate()
     this.cacheState = this.service.getCharacteristic(this.hapChar.Active).value === 1 ? 'on' : 'off'
@@ -361,4 +406,8 @@ module.exports = class deviceHeater {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
+
+  markStatus (isOnline) {
+    this.isOnline = isOnline
+  }
 }
diff --git a/lib/device/simulation/dehumidifier.js b/lib/device/simulation/dehumidifier.js
index d27cb647..74fb5627 100644
--- a/lib/device/simulation/dehumidifier.js
+++ b/lib/device/simulation/dehumidifier.js
@@ -17,6 +17,9 @@ module.exports = class deviceHeater {
     this.name = accessory.displayName
     this.accessory = accessory
 
+    // Initially set the online flag as true (to be then updated as false if necessary)
+    this.isOnline = true
+
     // Set up custom variables for this device type
     const deviceConf = platform.thDevices[accessory.context.eweDeviceId]
     const deviceConf2 = platform.simulations[accessory.context.eweDeviceId]
@@ -100,9 +103,31 @@ module.exports = class deviceHeater {
     // Set the dehumidifier as the primary service
     this.service.setPrimaryService()
 
+    // Add a get handler to the current temperature characteristic
+    this.tempService.getCharacteristic(this.hapChar.CurrentTemperature).onGet(() => {
+      if (!this.isOnline && platform.config.offlineAsNoResponse) {
+        throw new this.hapErr(-70402)
+      }
+      return this.tempService.getCharacteristic(this.hapChar.CurrentTemperature).value
+    })
+
     // Add the set handler to the humidifier active characteristic
-    this.service.getCharacteristic(this.hapChar.Active).onSet(async value => {
-      await this.internalStateUpdate(value)
+    this.service
+      .getCharacteristic(this.hapChar.Active)
+      .onGet(() => {
+        if (!this.isOnline && platform.config.offlineAsNoResponse) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.Active).value
+      })
+      .onSet(async value => await this.internalStateUpdate(value))
+
+    // Add a get handler to the current state characteristic
+    this.service.getCharacteristic(this.hapChar.CurrentHumidifierDehumidifierState).onGet(() => {
+      if (!this.isOnline && platform.config.offlineAsNoResponse) {
+        throw new this.hapErr(-70402)
+      }
+      return this.service.getCharacteristic(this.hapChar.CurrentHumidifierDehumidifierState).value
     })
 
     // Add options to the target state characteristic
@@ -114,14 +139,33 @@ module.exports = class deviceHeater {
         maxValue: 2,
         validValues: [2]
       })
+      .onGet(() => {
+        if (!this.isOnline && platform.config.offlineAsNoResponse) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.TargetHumidifierDehumidifierState).value
+      })
+
+    // Add a get handler to the current relative humidity characteristic
+    this.service.getCharacteristic(this.hapChar.CurrentRelativeHumidity).onGet(() => {
+      if (!this.isOnline && platform.config.offlineAsNoResponse) {
+        throw new this.hapErr(-70402)
+      }
+      return this.service.getCharacteristic(this.hapChar.CurrentRelativeHumidity).value
+    })
 
     // Add the set handler to the target relative humidity characteristic
     this.service
       .getCharacteristic(this.hapChar.RelativeHumidityDehumidifierThreshold)
       .updateValue(this.accessory.context.cacheTarget)
-      .onSet(async value => {
-        await this.internalTargetHumidityUpdate(value)
+      .onGet(() => {
+        if (!this.isOnline && platform.config.offlineAsNoResponse) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.RelativeHumidityDehumidifierThreshold)
+          .value
       })
+      .onSet(async value => await this.internalTargetHumidityUpdate(value))
 
     // Initialise these caches now since they aren't determined by the initial externalUpdate()
     this.cacheState = this.service.getCharacteristic(this.hapChar.Active).value === 1 ? 'on' : 'off'
@@ -336,4 +380,8 @@ module.exports = class deviceHeater {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
+
+  markStatus (isOnline) {
+    this.isOnline = isOnline
+  }
 }
diff --git a/lib/device/simulation/door.js b/lib/device/simulation/door.js
index 3875990c..793a8fde 100644
--- a/lib/device/simulation/door.js
+++ b/lib/device/simulation/door.js
@@ -17,6 +17,9 @@ module.exports = class deviceDoor {
     this.name = accessory.displayName
     this.accessory = accessory
 
+    // Initially set the online flag as true (to be then updated as false if necessary)
+    this.isOnline = true
+
     // Set up custom variables for this device type
     const deviceConf = platform.simulations[accessory.context.eweDeviceId]
     this.operationTimeUp = deviceConf.operationTime || platform.consts.defaultValues.operationTime
@@ -57,12 +60,28 @@ module.exports = class deviceDoor {
       this.service.setCharacteristic(this.hapChar.PositionState, 2)
     }
 
-    // Add the set handler to the target position characteristic
-    this.service.getCharacteristic(this.hapChar.TargetPosition).onSet(value => {
-      // We don't use await as we want the callback to be run straight away
-      this.internalPositionUpdate(value)
+    // Add the get handler to the current position characteristic
+    this.service.getCharacteristic(this.hapChar.CurrentPosition).onGet(() => {
+      if (!this.isOnline && platform.config.offlineAsNoResponse) {
+        throw new this.hapErr(-70402)
+      }
+      return this.service.getCharacteristic(this.hapChar.CurrentPosition).value
     })
 
+    // Add the set handler to the target position characteristic
+    this.service
+      .getCharacteristic(this.hapChar.TargetPosition)
+      .onGet(() => {
+        if (!this.isOnline && platform.config.offlineAsNoResponse) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.TargetPosition).value
+      })
+      .onSet(value => {
+        // We don't use await as we want the callback to be run straight away
+        this.internalPositionUpdate(value)
+      })
+
     // Output the customised options to the log
     const opts = JSON.stringify({
       logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
@@ -153,4 +172,8 @@ module.exports = class deviceDoor {
   }
 
   async externalUpdate (params) {}
+
+  markStatus (isOnline) {
+    this.isOnline = isOnline
+  }
 }
diff --git a/lib/device/simulation/garage-eachen.js b/lib/device/simulation/garage-eachen.js
index ab9f1d84..0a04d434 100644
--- a/lib/device/simulation/garage-eachen.js
+++ b/lib/device/simulation/garage-eachen.js
@@ -18,6 +18,9 @@ module.exports = class deviceGarageEachen {
     this.name = accessory.displayName
     this.accessory = accessory
 
+    // Initially set the online flag as true (to be then updated as false if necessary)
+    this.isOnline = true
+
     // Set up custom variables for this device type
     const deviceConf = platform.simulations[accessory.context.eweDeviceId]
     this.operationTime = deviceConf.operationTime || platform.consts.defaultValues.operationTime
@@ -81,12 +84,28 @@ module.exports = class deviceGarageEachen {
       this.service.updateCharacteristic(this.eveChar.TimesOpened, 0)
     })
 
-    // Add the set handler to the target position characteristic
-    this.service.getCharacteristic(this.hapChar.TargetDoorState).onSet(value => {
-      // We don't use await as we want the callback to be run straight away
-      this.internalStateUpdate(value)
+    // Add the get handler to the current position characteristic
+    this.service.getCharacteristic(this.hapChar.CurrentPosition).onGet(() => {
+      if (!this.isOnline && platform.config.offlineAsNoResponse) {
+        throw new this.hapErr(-70402)
+      }
+      return this.service.getCharacteristic(this.hapChar.CurrentPosition).value
     })
 
+    // Add the set handler to the target position characteristic
+    this.service
+      .getCharacteristic(this.hapChar.TargetDoorState)
+      .onGet(() => {
+        if (!this.isOnline && platform.config.offlineAsNoResponse) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.TargetPosition).value
+      })
+      .onSet(value => {
+        // We don't use await as we want the callback to be run straight away
+        this.internalStateUpdate(value)
+      })
+
     // Update the obstruction detected to false on Homebridge restart
     this.service.updateCharacteristic(this.hapChar.ObstructionDetected, false)
 
@@ -182,4 +201,8 @@ module.exports = class deviceGarageEachen {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
+
+  markStatus (isOnline) {
+    this.isOnline = isOnline
+  }
 }
diff --git a/lib/device/simulation/garage-four.js b/lib/device/simulation/garage-four.js
index 3037353c..1cfbaf7b 100644
--- a/lib/device/simulation/garage-four.js
+++ b/lib/device/simulation/garage-four.js
@@ -17,6 +17,9 @@ module.exports = class deviceGarageFour {
     this.name = accessory.displayName
     this.accessory = accessory
 
+    // Initially set the online flag as true (to be then updated as false if necessary)
+    this.isOnline = true
+
     // Set up custom variables for this device type
     const deviceConf = platform.simulations[accessory.context.eweDeviceId]
     this.operationTimeUp = deviceConf.operationTime || platform.consts.defaultValues.operationTime
@@ -67,11 +70,27 @@ module.exports = class deviceGarageFour {
         gdService.setCharacteristic(this.hapChar.ObstructionDetected, false)
       }
 
-      // Add the set handler to the target position characteristic
-      gdService.getCharacteristic(this.hapChar.TargetDoorState).onSet(value => {
-        // We don't use await as we want the callback to be run straight away
-        this.internalStateUpdate(v, value)
+      // Add the get handler to the current position characteristic
+      gdService.getCharacteristic(this.hapChar.CurrentPosition).onGet(() => {
+        if (!this.isOnline && platform.config.offlineAsNoResponse) {
+          throw new this.hapErr(-70402)
+        }
+        return gdService.getCharacteristic(this.hapChar.CurrentPosition).value
       })
+
+      // Add the set handler to the target position characteristic
+      gdService
+        .getCharacteristic(this.hapChar.TargetDoorState)
+        .onGet(() => {
+          if (!this.isOnline && platform.config.offlineAsNoResponse) {
+            throw new this.hapErr(-70402)
+          }
+          return gdService.getCharacteristic(this.hapChar.TargetPosition).value
+        })
+        .onSet(value => {
+          // We don't use await as we want the callback to be run straight away
+          this.internalStateUpdate(v, value)
+        })
     })
 
     // Output the customised options to the log
@@ -157,4 +176,8 @@ module.exports = class deviceGarageFour {
   }
 
   async externalUpdate (params) {}
+
+  markStatus (isOnline) {
+    this.isOnline = isOnline
+  }
 }
diff --git a/lib/device/simulation/garage-one.js b/lib/device/simulation/garage-one.js
index c7c95298..e004fbb5 100644
--- a/lib/device/simulation/garage-one.js
+++ b/lib/device/simulation/garage-one.js
@@ -19,6 +19,9 @@ module.exports = class deviceGarageOne {
     this.name = accessory.displayName
     this.accessory = accessory
 
+    // Initially set the online flag as true (to be then updated as false if necessary)
+    this.isOnline = true
+
     // Set up custom variables for this device type
     const deviceConf = platform.simulations[accessory.context.eweDeviceId]
     this.operationTimeUp = deviceConf.operationTime || platform.consts.defaultValues.operationTime
@@ -88,12 +91,28 @@ module.exports = class deviceGarageOne {
       this.service.updateCharacteristic(this.eveChar.TimesOpened, 0)
     })
 
-    // Add the set handler to the target position characteristic
-    this.service.getCharacteristic(this.hapChar.TargetDoorState).onSet(value => {
-      // We don't use await as we want the callback to be run straight away
-      this.internalUpdate(value)
+    // Add the get handler to the current position characteristic
+    this.service.getCharacteristic(this.hapChar.CurrentPosition).onGet(() => {
+      if (!this.isOnline && platform.config.offlineAsNoResponse) {
+        throw new this.hapErr(-70402)
+      }
+      return this.service.getCharacteristic(this.hapChar.CurrentPosition).value
     })
 
+    // Add the set handler to the target position characteristic
+    this.service
+      .getCharacteristic(this.hapChar.TargetDoorState)
+      .onGet(() => {
+        if (!this.isOnline && platform.config.offlineAsNoResponse) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.TargetPosition).value
+      })
+      .onSet(value => {
+        // We don't use await as we want the callback to be run straight away
+        this.internalUpdate(value)
+      })
+
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new platform.eveService('door', this.accessory, {
       log: platform.config.debugFakegato ? this.log : () => {}
@@ -252,4 +271,8 @@ module.exports = class deviceGarageOne {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
+
+  markStatus (isOnline) {
+    this.isOnline = isOnline
+  }
 }
diff --git a/lib/device/simulation/garage-two.js b/lib/device/simulation/garage-two.js
index ef29a5c2..9e5d785b 100644
--- a/lib/device/simulation/garage-two.js
+++ b/lib/device/simulation/garage-two.js
@@ -17,6 +17,9 @@ module.exports = class deviceGarageTwo {
     this.name = accessory.displayName
     this.accessory = accessory
 
+    // Initially set the online flag as true (to be then updated as false if necessary)
+    this.isOnline = true
+
     // Set up custom variables for this device type
     const deviceConf = platform.simulations[accessory.context.eweDeviceId]
     this.operationTimeUp = deviceConf.operationTime || platform.consts.defaultValues.operationTime
@@ -65,11 +68,27 @@ module.exports = class deviceGarageTwo {
         gdService.setCharacteristic(this.hapChar.ObstructionDetected, false)
       }
 
-      // Add the set handler to the target position characteristic
-      gdService.getCharacteristic(this.hapChar.TargetDoorState).onSet(value => {
-        // We don't use await as we want the callback to be run straight away
-        this.internalUpdate('Garage' + v, value)
+      // Add the get handler to the current position characteristic
+      gdService.getCharacteristic(this.hapChar.CurrentPosition).onGet(() => {
+        if (!this.isOnline && platform.config.offlineAsNoResponse) {
+          throw new this.hapErr(-70402)
+        }
+        return gdService.getCharacteristic(this.hapChar.CurrentPosition).value
       })
+
+      // Add the set handler to the target position characteristic
+      gdService
+        .getCharacteristic(this.hapChar.TargetDoorState)
+        .onGet(() => {
+          if (!this.isOnline && platform.config.offlineAsNoResponse) {
+            throw new this.hapErr(-70402)
+          }
+          return gdService.getCharacteristic(this.hapChar.TargetPosition).value
+        })
+        .onSet(value => {
+          // We don't use await as we want the callback to be run straight away
+          this.internalUpdate('Garage' + v, value)
+        })
     })
 
     // Output the customised options to the log
@@ -251,4 +270,8 @@ module.exports = class deviceGarageTwo {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
+
+  markStatus (isOnline) {
+    this.isOnline = isOnline
+  }
 }
diff --git a/lib/device/simulation/heater.js b/lib/device/simulation/heater.js
index b0aa51c8..818c0f23 100644
--- a/lib/device/simulation/heater.js
+++ b/lib/device/simulation/heater.js
@@ -17,6 +17,9 @@ module.exports = class deviceHeater {
     this.name = accessory.displayName
     this.accessory = accessory
 
+    // Initially set the online flag as true (to be then updated as false if necessary)
+    this.isOnline = true
+
     // Set up custom variables for this device type
     const deviceConf = platform.thDevices[accessory.context.eweDeviceId]
     const deviceConf2 = platform.simulations[accessory.context.eweDeviceId]
@@ -110,26 +113,64 @@ module.exports = class deviceHeater {
       this.humiService =
         this.accessory.getService(this.hapServ.HumiditySensor) ||
         this.accessory.addService(this.hapServ.HumiditySensor)
+
+      // Add a get handler to the current relative humidity characteristic
+      this.humiService.getCharacteristic(this.hapChar.CurrentRelativeHumidity).onGet(() => {
+        if (!this.isOnline && platform.config.offlineAsNoResponse) {
+          throw new this.hapErr(-70402)
+        }
+        return this.humiService.getCharacteristic(this.hapChar.CurrentRelativeHumidity).value
+      })
     }
 
     // Set the heater as the primary service
     this.service.setPrimaryService()
 
     // Set custom properties of the current temperature characteristic
-    this.service.getCharacteristic(this.hapChar.CurrentTemperature).setProps({
-      minStep: 0.1
-    })
+    this.service
+      .getCharacteristic(this.hapChar.CurrentTemperature)
+      .setProps({
+        minStep: 0.1
+      })
+      .onGet(() => {
+        if (!this.isOnline && platform.config.offlineAsNoResponse) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.CurrentTemperature).value
+      })
 
     // Add the set handler to the heater active characteristic
-    this.service.getCharacteristic(this.hapChar.Active).onSet(async value => {
-      await this.internalStateUpdate(value)
-    })
+    this.service
+      .getCharacteristic(this.hapChar.Active)
+      .onGet(() => {
+        if (!this.isOnline && platform.config.offlineAsNoResponse) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.Active).value
+      })
+      .onSet(async value => await this.internalStateUpdate(value))
 
     // Add options to the target state characteristic
-    this.service.getCharacteristic(this.hapChar.TargetHeaterCoolerState).setProps({
-      minValue: 0,
-      maxValue: 0,
-      validValues: [0]
+    this.service
+      .getCharacteristic(this.hapChar.TargetHeaterCoolerState)
+      .setProps({
+        minValue: 0,
+        maxValue: 0,
+        validValues: [0]
+      })
+      .onGet(() => {
+        if (!this.isOnline && platform.config.offlineAsNoResponse) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.TargetHeaterCoolerState).value
+      })
+
+    // Add a get handler to the current state characteristics
+    this.service.getCharacteristic(this.hapChar.CurrentHeaterCoolerState).onGet(() => {
+      if (!this.isOnline && platform.config.offlineAsNoResponse) {
+        throw new this.hapErr(-70402)
+      }
+      return this.service.getCharacteristic(this.hapChar.CurrentHeaterCoolerState).value
     })
 
     // Add the set handler to the target temperature characteristic
@@ -141,9 +182,13 @@ module.exports = class deviceHeater {
         maxValue: this.maxTarget,
         minStep: 0.5
       })
-      .onSet(async value => {
-        await this.internalTargetTempUpdate(value)
+      .onGet(() => {
+        if (!this.isOnline && platform.config.offlineAsNoResponse) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.CoolingThresholdTemperature).value
       })
+      .onSet(async value => await this.internalTargetTempUpdate(value))
 
     // Initialise these caches now since they aren't determined by the initial externalUpdate()
     this.cacheState = this.service.getCharacteristic(this.hapChar.Active).value === 1 ? 'on' : 'off'
@@ -361,4 +406,8 @@ module.exports = class deviceHeater {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
+
+  markStatus (isOnline) {
+    this.isOnline = isOnline
+  }
 }
diff --git a/lib/device/simulation/humidifier.js b/lib/device/simulation/humidifier.js
index 61f9c6b3..eecfa259 100644
--- a/lib/device/simulation/humidifier.js
+++ b/lib/device/simulation/humidifier.js
@@ -17,6 +17,9 @@ module.exports = class deviceHeater {
     this.name = accessory.displayName
     this.accessory = accessory
 
+    // Initially set the online flag as true (to be then updated as false if necessary)
+    this.isOnline = true
+
     // Set up custom variables for this device type
     const deviceConf = platform.thDevices[accessory.context.eweDeviceId]
     const deviceConf2 = platform.simulations[accessory.context.eweDeviceId]
@@ -99,9 +102,31 @@ module.exports = class deviceHeater {
     // Set the humidifier as the primary service
     this.service.setPrimaryService()
 
+    // Add a get handler to the current temperature characteristic
+    this.tempService.getCharacteristic(this.hapChar.CurrentTemperature).onGet(() => {
+      if (!this.isOnline && platform.config.offlineAsNoResponse) {
+        throw new this.hapErr(-70402)
+      }
+      return this.tempService.getCharacteristic(this.hapChar.CurrentTemperature).value
+    })
+
     // Add the set handler to the humidifier active characteristic
-    this.service.getCharacteristic(this.hapChar.Active).onSet(async value => {
-      await this.internalStateUpdate(value)
+    this.service
+      .getCharacteristic(this.hapChar.Active)
+      .onGet(() => {
+        if (!this.isOnline && platform.config.offlineAsNoResponse) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.Active).value
+      })
+      .onSet(async value => await this.internalStateUpdate(value))
+
+    // Add a get handler to the current state characteristic
+    this.service.getCharacteristic(this.hapChar.CurrentHumidifierDehumidifierState).onGet(() => {
+      if (!this.isOnline && platform.config.offlineAsNoResponse) {
+        throw new this.hapErr(-70402)
+      }
+      return this.service.getCharacteristic(this.hapChar.CurrentHumidifierDehumidifierState).value
     })
 
     // Add options to the target state characteristic
@@ -113,14 +138,33 @@ module.exports = class deviceHeater {
         maxValue: 1,
         validValues: [1]
       })
+      .onGet(() => {
+        if (!this.isOnline && platform.config.offlineAsNoResponse) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.TargetHumidifierDehumidifierState).value
+      })
+
+    // Add a get handler to the current relative humidity characteristic
+    this.service.getCharacteristic(this.hapChar.CurrentRelativeHumidity).onGet(() => {
+      if (!this.isOnline && platform.config.offlineAsNoResponse) {
+        throw new this.hapErr(-70402)
+      }
+      return this.service.getCharacteristic(this.hapChar.CurrentRelativeHumidity).value
+    })
 
     // Add the set handler to the target relative humidity characteristic
     this.service
       .getCharacteristic(this.hapChar.RelativeHumidityHumidifierThreshold)
       .updateValue(this.accessory.context.cacheTarget)
-      .onSet(async value => {
-        await this.internalTargetHumidityUpdate(value)
+      .onGet(() => {
+        if (!this.isOnline && platform.config.offlineAsNoResponse) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.RelativeHumidityHumidifierThreshold)
+          .value
       })
+      .onSet(async value => await this.internalTargetHumidityUpdate(value))
 
     // Initialise these caches now since they aren't determined by the initial externalUpdate()
     this.cacheState = this.service.getCharacteristic(this.hapChar.Active).value === 1 ? 'on' : 'off'
@@ -335,4 +379,8 @@ module.exports = class deviceHeater {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
+
+  markStatus (isOnline) {
+    this.isOnline = isOnline
+  }
 }
diff --git a/lib/device/simulation/lock-one.js b/lib/device/simulation/lock-one.js
index 58d312f9..5d81bd5f 100644
--- a/lib/device/simulation/lock-one.js
+++ b/lib/device/simulation/lock-one.js
@@ -17,6 +17,9 @@ module.exports = class deviceLockOne {
     this.name = accessory.displayName
     this.accessory = accessory
 
+    // Initially set the online flag as true (to be then updated as false if necessary)
+    this.isOnline = true
+
     // Set up custom variables for this device type
     const deviceConf = platform.simulations[accessory.context.eweDeviceId]
     this.operationTime = deviceConf.operationTime || platform.consts.defaultValues.operationTime
@@ -51,12 +54,28 @@ module.exports = class deviceLockOne {
       this.accessory.getService(this.hapServ.LockMechanism) ||
       this.accessory.addService(this.hapServ.LockMechanism)
 
-    // Add the set handler to the lock target state characteristic
-    this.service.getCharacteristic(this.hapChar.LockTargetState).onSet(value => {
-      // We don't use await as we want the callback to be run straight away
-      this.internalUpdate(value)
+    // Add the get handler to the current lock state characteristic
+    this.service.getCharacteristic(this.hapChar.LockCurrentState).onGet(() => {
+      if (!this.isOnline && platform.config.offlineAsNoResponse) {
+        throw new this.hapErr(-70402)
+      }
+      return this.service.getCharacteristic(this.hapChar.LockCurrentState).value
     })
 
+    // Add the set handler to the lock target state characteristic
+    this.service
+      .getCharacteristic(this.hapChar.LockTargetState)
+      .onGet(() => {
+        if (!this.isOnline && platform.config.offlineAsNoResponse) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.LockTargetState).value
+      })
+      .onSet(value => {
+        // We don't use await as we want the callback to be run straight away
+        this.internalUpdate(value)
+      })
+
     // Always show the accessory as locked on Homebridge restart
     this.service
       .updateCharacteristic(this.hapChar.LockCurrentState, 1)
@@ -153,4 +172,8 @@ module.exports = class deviceLockOne {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
+
+  markStatus (isOnline) {
+    this.isOnline = isOnline
+  }
 }
diff --git a/lib/device/simulation/purifier.js b/lib/device/simulation/purifier.js
index 00749f5c..1fff5584 100644
--- a/lib/device/simulation/purifier.js
+++ b/lib/device/simulation/purifier.js
@@ -17,6 +17,9 @@ module.exports = class devicePurifier {
     this.name = accessory.displayName
     this.accessory = accessory
 
+    // Initially set the online flag as true (to be then updated as false if necessary)
+    this.isOnline = true
+
     // Set up custom variables for this device type
     const deviceConf = platform.simulations[accessory.context.eweDeviceId]
     // Set the correct logging variables for this accessory
@@ -54,9 +57,23 @@ module.exports = class devicePurifier {
       this.accessory.getService(this.hapServ.AirPurifier) ||
       this.accessory.addService(this.hapServ.AirPurifier)
 
-    // Add the set handler to the heater active characteristic
-    this.service.getCharacteristic(this.hapChar.Active).onSet(async value => {
-      await this.internalStateUpdate(value)
+    // Add the set handler to the purifier active characteristic
+    this.service
+      .getCharacteristic(this.hapChar.Active)
+      .onGet(() => {
+        if (!this.isOnline && platform.config.offlineAsNoResponse) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.Active).value
+      })
+      .onSet(async value => await this.internalStateUpdate(value))
+
+    // Add the get handler to the current purifying state characteristic
+    this.service.getCharacteristic(this.hapChar.CurrentAirPurifierState).onGet(() => {
+      if (!this.isOnline && platform.config.offlineAsNoResponse) {
+        throw new this.hapErr(-70402)
+      }
+      return this.service.getCharacteristic(this.hapChar.CurrentAirPurifierState).value
     })
 
     // Add options to the purifier target state characteristic
@@ -68,6 +85,12 @@ module.exports = class devicePurifier {
         validValues: [1]
       })
       .updateValue(1)
+      .onGet(() => {
+        if (!this.isOnline && platform.config.offlineAsNoResponse) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.TargetAirPurifierState).value
+      })
 
     // Output the customised options to the log
     const opts = JSON.stringify({
@@ -142,4 +165,8 @@ module.exports = class devicePurifier {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
+
+  markStatus (isOnline) {
+    this.isOnline = isOnline
+  }
 }
diff --git a/lib/device/simulation/sensor.js b/lib/device/simulation/sensor.js
index 5dfa5154..278a0f86 100644
--- a/lib/device/simulation/sensor.js
+++ b/lib/device/simulation/sensor.js
@@ -17,6 +17,9 @@ module.exports = class deviceSensor {
     this.name = accessory.displayName
     this.accessory = accessory
 
+    // Initially set the online flag as true (to be then updated as false if necessary)
+    this.isOnline = true
+
     // Set up custom variables for this device type
     const deviceConf = platform.simulations[accessory.context.eweDeviceId]
     this.sensorType = deviceConf.sensorType || 'motion'
@@ -105,6 +108,13 @@ module.exports = class deviceSensor {
       }
     }
 
+    this.service.getCharacteristic(this.char).onGet(() => {
+      if (!this.isOnline && platform.config.offlineAsNoResponse) {
+        throw new this.hapErr(-70402)
+      }
+      return this.service.getCharacteristic(this.char).value
+    })
+
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new platform.eveService(eveType, this.accessory, {
       log: platform.config.debugFakegato ? this.log : () => {}
@@ -159,4 +169,8 @@ module.exports = class deviceSensor {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
+
+  markStatus (isOnline) {
+    this.isOnline = isOnline
+  }
 }
diff --git a/lib/device/simulation/switch-valve.js b/lib/device/simulation/switch-valve.js
index 54245d5d..8ffb3db4 100644
--- a/lib/device/simulation/switch-valve.js
+++ b/lib/device/simulation/switch-valve.js
@@ -16,6 +16,9 @@ module.exports = class deviceSwitchValve {
     this.name = accessory.displayName
     this.accessory = accessory
 
+    // Initially set the online flag as true (to be then updated as false if necessary)
+    this.isOnline = true
+
     // Set up custom variables for this device type
     const deviceConf = platform.simulations[accessory.context.eweDeviceId]
 
@@ -55,14 +58,26 @@ module.exports = class deviceSwitchValve {
     }
 
     // Add the set handler to the switch on/off characteristic
-    this.sService.getCharacteristic(this.hapChar.On).onSet(async value => {
-      await this.internalSwitchUpdate(value)
-    })
+    this.sService
+      .getCharacteristic(this.hapChar.On)
+      .onGet(() => {
+        if (!this.isOnline && platform.config.offlineAsNoResponse) {
+          throw new this.hapErr(-70402)
+        }
+        return this.sService.getCharacteristic(this.hapChar.On).value
+      })
+      .onSet(async value => await this.internalSwitchUpdate(value))
 
     // Add the set handler to the valve active characteristic
-    this.vService.getCharacteristic(this.hapChar.Active).onSet(async value => {
-      await this.internalValveUpdate(value)
-    })
+    this.vService
+      .getCharacteristic(this.hapChar.Active)
+      .onGet(() => {
+        if (!this.isOnline && platform.config.offlineAsNoResponse) {
+          throw new this.hapErr(-70402)
+        }
+        return this.vService.getCharacteristic(this.hapChar.Active).value
+      })
+      .onSet(async value => await this.internalValveUpdate(value))
 
     // Add the set handler to the valve set duration characteristic
     this.vService.getCharacteristic(this.hapChar.SetDuration).onSet(value => {
@@ -198,4 +213,8 @@ module.exports = class deviceSwitchValve {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
+
+  markStatus (isOnline) {
+    this.isOnline = isOnline
+  }
 }
diff --git a/lib/device/simulation/tap-one.js b/lib/device/simulation/tap-one.js
index 3dc8cb90..c7ae1006 100644
--- a/lib/device/simulation/tap-one.js
+++ b/lib/device/simulation/tap-one.js
@@ -16,6 +16,9 @@ module.exports = class deviceTapOne {
     this.name = accessory.displayName
     this.accessory = accessory
 
+    // Initially set the online flag as true (to be then updated as false if necessary)
+    this.isOnline = true
+
     // Set up custom variables for this device type
     const deviceConf = platform.simulations[accessory.context.eweDeviceId]
 
@@ -53,9 +56,17 @@ module.exports = class deviceTapOne {
     }
 
     // Add the set handler to the tap active characteristic
-    this.service.getCharacteristic(this.hapChar.Active).onSet(async value => {
-      await this.internalUpdate(value)
-    })
+    this.service
+      .getCharacteristic(this.hapChar.Active)
+      .onGet(() => {
+        if (!this.isOnline && platform.config.offlineAsNoResponse) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.Active).value
+      })
+      .onSet(async value => {
+        await this.internalUpdate(value)
+      })
 
     // Output the customised options to the log
     const opts = JSON.stringify({
@@ -138,4 +149,8 @@ module.exports = class deviceTapOne {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
+
+  markStatus (isOnline) {
+    this.isOnline = isOnline
+  }
 }
diff --git a/lib/device/simulation/tap-two.js b/lib/device/simulation/tap-two.js
index 5574d55b..9e18374e 100644
--- a/lib/device/simulation/tap-two.js
+++ b/lib/device/simulation/tap-two.js
@@ -16,6 +16,9 @@ module.exports = class deviceTapTwo {
     this.name = accessory.displayName
     this.accessory = accessory
 
+    // Initially set the online flag as true (to be then updated as false if necessary)
+    this.isOnline = true
+
     // Set up custom variables for this device type
     const deviceConf = platform.simulations[accessory.context.eweDeviceId]
 
@@ -51,9 +54,15 @@ module.exports = class deviceTapTwo {
       }
 
       // Add the set handler to the tap active characteristic
-      tapService.getCharacteristic(this.hapChar.Active).onSet(async value => {
-        await this.internalUpdate('Tap ' + v, value)
-      })
+      tapService
+        .getCharacteristic(this.hapChar.Active)
+        .onGet(() => {
+          if (!this.isOnline && platform.config.offlineAsNoResponse) {
+            throw new this.hapErr(-70402)
+          }
+          return tapService.getCharacteristic(this.hapChar.Active).value
+        })
+        .onSet(async value => await this.internalUpdate('Tap ' + v, value))
     })
 
     // Output the customised options to the log
@@ -128,4 +137,8 @@ module.exports = class deviceTapTwo {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
+
+  markStatus (isOnline) {
+    this.isOnline = isOnline
+  }
 }
diff --git a/lib/device/simulation/valve-four.js b/lib/device/simulation/valve-four.js
index 91c11243..6a0334c3 100644
--- a/lib/device/simulation/valve-four.js
+++ b/lib/device/simulation/valve-four.js
@@ -16,6 +16,9 @@ module.exports = class deviceValveFour {
     this.name = accessory.displayName
     this.accessory = accessory
 
+    // Initially set the online flag as true (to be then updated as false if necessary)
+    this.isOnline = true
+
     // Set up custom variables for this device type
     const deviceConf = platform.simulations[accessory.context.eweDeviceId]
 
@@ -57,9 +60,15 @@ module.exports = class deviceValveFour {
       }
 
       // Add the set handler to the valve active characteristic
-      valveService.getCharacteristic(this.hapChar.Active).onSet(async value => {
-        await this.internalUpdate('Valve ' + v, value)
-      })
+      valveService
+        .getCharacteristic(this.hapChar.Active)
+        .onGet(() => {
+          if (!this.isOnline && platform.config.offlineAsNoResponse) {
+            throw new this.hapErr(-70402)
+          }
+          return valveService.getCharacteristic(this.hapChar.Active).value
+        })
+        .onSet(async value => await this.internalUpdate('Valve ' + v, value))
 
       // Add the set handler to the valve set duration characteristic
       valveService.getCharacteristic(this.hapChar.SetDuration).onSet(value => {
@@ -177,4 +186,8 @@ module.exports = class deviceValveFour {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
+
+  markStatus (isOnline) {
+    this.isOnline = isOnline
+  }
 }
diff --git a/lib/device/simulation/valve-one.js b/lib/device/simulation/valve-one.js
index 45a5671e..b291aec8 100644
--- a/lib/device/simulation/valve-one.js
+++ b/lib/device/simulation/valve-one.js
@@ -16,6 +16,9 @@ module.exports = class deviceValveOne {
     this.name = accessory.displayName
     this.accessory = accessory
 
+    // Initially set the online flag as true (to be then updated as false if necessary)
+    this.isOnline = true
+
     // Set up custom variables for this device type
     const deviceConf = platform.simulations[accessory.context.eweDeviceId]
 
@@ -55,9 +58,15 @@ module.exports = class deviceValveOne {
     }
 
     // Add the set handler to the valve active characteristic
-    this.service.getCharacteristic(this.hapChar.Active).onSet(async value => {
-      await this.internalUpdate(value)
-    })
+    this.service
+      .getCharacteristic(this.hapChar.Active)
+      .onGet(() => {
+        if (!this.isOnline && platform.config.offlineAsNoResponse) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.Active).value
+      })
+      .onSet(async value => await this.internalUpdate(value))
 
     // Add the set handler to the valve set duration characteristic
     this.service.getCharacteristic(this.hapChar.SetDuration).onSet(value => {
@@ -180,4 +189,8 @@ module.exports = class deviceValveOne {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
+
+  markStatus (isOnline) {
+    this.isOnline = isOnline
+  }
 }
diff --git a/lib/device/simulation/valve-two.js b/lib/device/simulation/valve-two.js
index 02655da4..8c8ebb8d 100644
--- a/lib/device/simulation/valve-two.js
+++ b/lib/device/simulation/valve-two.js
@@ -16,6 +16,9 @@ module.exports = class deviceValveTwo {
     this.name = accessory.displayName
     this.accessory = accessory
 
+    // Initially set the online flag as true (to be then updated as false if necessary)
+    this.isOnline = true
+
     // Set up custom variables for this device type
     const deviceConf = platform.simulations[accessory.context.eweDeviceId]
 
@@ -57,9 +60,17 @@ module.exports = class deviceValveTwo {
       }
 
       // Add the set handler to the valve active characteristic
-      valveService.getCharacteristic(this.hapChar.Active).onSet(async value => {
-        await this.internalUpdate('Valve ' + v, value)
-      })
+      valveService
+        .getCharacteristic(this.hapChar.Active)
+        .onGet(() => {
+          if (!this.isOnline && platform.config.offlineAsNoResponse) {
+            throw new this.hapErr(-70402)
+          }
+          return valveService.getCharacteristic(this.hapChar.Active).value
+        })
+        .onSet(async value => {
+          await this.internalUpdate('Valve ' + v, value)
+        })
 
       // Add the set handler to the valve set duration characteristic
       valveService.getCharacteristic(this.hapChar.SetDuration).onSet(value => {
@@ -171,4 +182,8 @@ module.exports = class deviceValveTwo {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
+
+  markStatus (isOnline) {
+    this.isOnline = isOnline
+  }
 }
diff --git a/lib/device/simulation/window.js b/lib/device/simulation/window.js
index 232d01d2..eac0b395 100644
--- a/lib/device/simulation/window.js
+++ b/lib/device/simulation/window.js
@@ -17,6 +17,9 @@ module.exports = class deviceWindow {
     this.name = accessory.displayName
     this.accessory = accessory
 
+    // Initially set the online flag as true (to be then updated as false if necessary)
+    this.isOnline = true
+
     // Set up custom variables for this device type
     const deviceConf = platform.simulations[accessory.context.eweDeviceId]
     this.operationTimeUp = deviceConf.operationTime || platform.consts.defaultValues.operationTime
@@ -57,12 +60,28 @@ module.exports = class deviceWindow {
       this.service.setCharacteristic(this.hapChar.PositionState, 2)
     }
 
-    // Add the set handler to the target position characteristic
-    this.service.getCharacteristic(this.hapChar.TargetPosition).onSet(value => {
-      // We don't use await as we want the callback to be run straight away
-      this.internalPositionUpdate(value)
+    // Add the get handler to the current position characteristic
+    this.service.getCharacteristic(this.hapChar.CurrentPosition).onGet(() => {
+      if (!this.isOnline && platform.config.offlineAsNoResponse) {
+        throw new this.hapErr(-70402)
+      }
+      return this.service.getCharacteristic(this.hapChar.CurrentPosition).value
     })
 
+    // Add the set handler to the target position characteristic
+    this.service
+      .getCharacteristic(this.hapChar.TargetPosition)
+      .onGet(() => {
+        if (!this.isOnline && platform.config.offlineAsNoResponse) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.TargetPosition).value
+      })
+      .onSet(value => {
+        // We don't use await as we want the callback to be run straight away
+        this.internalPositionUpdate(value)
+      })
+
     // Output the customised options to the log
     const opts = JSON.stringify({
       logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
@@ -153,4 +172,8 @@ module.exports = class deviceWindow {
   }
 
   async externalUpdate (params) {}
+
+  markStatus (isOnline) {
+    this.isOnline = isOnline
+  }
 }
diff --git a/lib/device/switch-double.js b/lib/device/switch-double.js
index 9a2566de..fa9ac7be 100644
--- a/lib/device/switch-double.js
+++ b/lib/device/switch-double.js
@@ -19,6 +19,9 @@ module.exports = class deviceSwitchDouble {
     this.name = accessory.displayName
     this.accessory = accessory
 
+    // Initially set the online flag as true (to be then updated as false if necessary)
+    this.isOnline = true
+
     // Set up custom variables for this device type
     const deviceConf = platform.multiDevices[accessory.context.eweDeviceId]
     this.hideChannels = deviceConf && deviceConf.hideChannels ? deviceConf.hideChannels : undefined
@@ -54,9 +57,15 @@ module.exports = class deviceSwitchDouble {
       this.accessory.addService(this.hapServ.Switch)
 
     // Add the set handler to the switch/outlet on/off characteristic
-    this.service.getCharacteristic(this.hapChar.On).onSet(async value => {
-      await this.internalStateUpdate(value)
-    })
+    this.service
+      .getCharacteristic(this.hapChar.On)
+      .onGet(() => {
+        if (!this.isOnline && platform.config.offlineAsNoResponse) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.On).value
+      })
+      .onSet(async value => await this.internalStateUpdate(value))
 
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new platform.eveService('switch', this.accessory, {
@@ -208,6 +217,10 @@ module.exports = class deviceSwitchDouble {
     }
   }
 
+  markStatus (isOnline) {
+    this.isOnline = isOnline
+  }
+
   currentState () {
     const toReturn = {}
     toReturn.services = ['switch']
diff --git a/lib/device/switch-multi.js b/lib/device/switch-multi.js
index 59c2ebee..eb9af881 100644
--- a/lib/device/switch-multi.js
+++ b/lib/device/switch-multi.js
@@ -18,6 +18,9 @@ module.exports = class deviceSwitchMulti {
     this.name = accessory.displayName
     this.accessory = accessory
 
+    // Initially set the online flag as true (to be then updated as false if necessary)
+    this.isOnline = true
+
     // Set up custom variables for this device type
     const deviceConf = platform.multiDevices[accessory.context.eweDeviceId]
     this.hideChannels = deviceConf && deviceConf.hideChannels ? deviceConf.hideChannels : undefined
@@ -53,9 +56,15 @@ module.exports = class deviceSwitchMulti {
       this.accessory.addService(this.hapServ.Switch)
 
     // Add the set handler to the switch/outlet on/off characteristic
-    this.service.getCharacteristic(this.hapChar.On).onSet(async value => {
-      await this.internalStateUpdate(value)
-    })
+    this.service
+      .getCharacteristic(this.hapChar.On)
+      .onGet(() => {
+        if (!this.isOnline && platform.config.offlineAsNoResponse) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.On).value
+      })
+      .onSet(async value => await this.internalStateUpdate(value))
 
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new platform.eveService('switch', this.accessory, {
@@ -213,6 +222,10 @@ module.exports = class deviceSwitchMulti {
     }
   }
 
+  markStatus (isOnline) {
+    this.isOnline = isOnline
+  }
+
   currentState () {
     const toReturn = {}
     toReturn.services = ['switch']
diff --git a/lib/device/switch-scm.js b/lib/device/switch-scm.js
index 6b029355..75301d6d 100644
--- a/lib/device/switch-scm.js
+++ b/lib/device/switch-scm.js
@@ -16,6 +16,9 @@ module.exports = class deviceSwitchSCM {
     this.name = accessory.displayName
     this.accessory = accessory
 
+    // Initially set the online flag as true (to be then updated as false if necessary)
+    this.isOnline = true
+
     // Set up custom variables for this device type
     const deviceConf = platform.outletDevices[accessory.context.eweDeviceId]
     // Set the correct logging variables for this accessory
@@ -49,9 +52,15 @@ module.exports = class deviceSwitchSCM {
       this.accessory.addService(this.hapServ.Switch)
 
     // Add the set handler to the switch/outlet on/off characteristic
-    this.service.getCharacteristic(this.hapChar.On).onSet(async value => {
-      await this.internalStateUpdate(value)
-    })
+    this.service
+      .getCharacteristic(this.hapChar.On)
+      .onGet(() => {
+        if (!this.isOnline && platform.config.offlineAsNoResponse) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.On).value
+      })
+      .onSet(async value => await this.internalStateUpdate(value))
 
     // Output the customised options to the log
     const opts = JSON.stringify({
@@ -99,6 +108,10 @@ module.exports = class deviceSwitchSCM {
     }
   }
 
+  markStatus (isOnline) {
+    this.isOnline = isOnline
+  }
+
   currentState () {
     const toReturn = {}
     const service = 'switch'
diff --git a/lib/device/switch-single.js b/lib/device/switch-single.js
index 36f5d1d1..159a1202 100644
--- a/lib/device/switch-single.js
+++ b/lib/device/switch-single.js
@@ -16,6 +16,9 @@ module.exports = class deviceSwitchSingle {
     this.name = accessory.displayName
     this.accessory = accessory
 
+    // Initially set the online flag as true (to be then updated as false if necessary)
+    this.isOnline = true
+
     // Set up custom variables for this device type
     const deviceConf = platform.singleDevices[accessory.context.eweDeviceId]
 
@@ -50,9 +53,15 @@ module.exports = class deviceSwitchSingle {
       this.accessory.addService(this.hapServ.Switch)
 
     // Add the set handler to the switch on/off characteristic
-    this.service.getCharacteristic(this.hapChar.On).onSet(async value => {
-      await this.internalStateUpdate(value)
-    })
+    this.service
+      .getCharacteristic(this.hapChar.On)
+      .onGet(() => {
+        if (!this.isOnline && platform.config.offlineAsNoResponse) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.On).value
+      })
+      .onSet(async value => await this.internalStateUpdate(value))
 
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new platform.eveService('switch', this.accessory, {
@@ -106,6 +115,10 @@ module.exports = class deviceSwitchSingle {
     }
   }
 
+  markStatus (isOnline) {
+    this.isOnline = isOnline
+  }
+
   currentState () {
     const toReturn = {}
     toReturn.services = ['switch']
diff --git a/lib/device/thermostat.js b/lib/device/thermostat.js
index 88c11321..3c7f2797 100644
--- a/lib/device/thermostat.js
+++ b/lib/device/thermostat.js
@@ -17,6 +17,9 @@ module.exports = class deviceThermostat {
     this.name = accessory.displayName
     this.accessory = accessory
 
+    // Initially set the online flag as true (to be then updated as false if necessary)
+    this.isOnline = true
+
     // Set up custom variables for this device type
     const deviceConf = platform.thDevices[accessory.context.eweDeviceId]
     this.tempOffset =
@@ -70,8 +73,24 @@ module.exports = class deviceThermostat {
       this.accessory.addService(this.hapServ.Thermostat)
 
     // Set custom properties of the current temperature characteristic
-    this.service.getCharacteristic(this.hapChar.CurrentTemperature).setProps({
-      minStep: 0.1
+    this.service
+      .getCharacteristic(this.hapChar.CurrentTemperature)
+      .setProps({
+        minStep: 0.1
+      })
+      .onGet(() => {
+        if (!this.isOnline && platform.config.offlineAsNoResponse) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.CurrentTemperature).value
+      })
+
+    // Add the get handler to the current state characteristic
+    this.service.getCharacteristic(this.hapChar.CurrentHeatingCoolingState).onGet(() => {
+      if (!this.isOnline && platform.config.offlineAsNoResponse) {
+        throw new this.hapErr(-70402)
+      }
+      return this.service.getCharacteristic(this.hapChar.CurrentHeatingCoolingState).value
     })
 
     // Add the set handler to the target state characteristic
@@ -82,6 +101,12 @@ module.exports = class deviceThermostat {
         maxValue: 1,
         validValues: [0, 1]
       })
+      .onGet(() => {
+        if (!this.isOnline && platform.config.offlineAsNoResponse) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.TargetHeatingCoolingState).value
+      })
       .onSet(async value => {
         await this.internalStateUpdate(value)
       })
@@ -94,6 +119,12 @@ module.exports = class deviceThermostat {
         maxValue: 45,
         minStep: 0.5
       })
+      .onGet(() => {
+        if (!this.isOnline && platform.config.offlineAsNoResponse) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.TargetTemperature).value
+      })
       .onSet(async value => {
         await this.internalTargetUpdate(value)
       })
@@ -224,4 +255,8 @@ module.exports = class deviceThermostat {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
+
+  markStatus (isOnline) {
+    this.isOnline = isOnline
+  }
 }
diff --git a/lib/index.js b/lib/index.js
index 88425be4..fa69050b 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -201,6 +201,7 @@ class eWeLinkPlatform {
         case 'debugFakegato':
         case 'disableDeviceLogging':
         case 'disablePlugin':
+        case 'offlineAsNoResponse':
           if (typeof val === 'string') {
             logQuotes(key)
           }
@@ -1729,6 +1730,9 @@ class eWeLinkPlatform {
 
             // Update the WAN status
             subAccessory.context.reachableWAN = device.params.online
+            if (device.params.updateSource === 'WS' && subAccessory.control.markStatus) {
+              subAccessory.control.markStatus(device.params.online)
+            }
 
             // Update the LAN status
             if (device.params.updateSource === 'LAN') {
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 12d29b76..746f18dd 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -8,6 +8,7 @@ module.exports = {
     username: '',
     password: '',
     mode: 'auto',
+    offlineAsNoResponse: false,
     countryCode: '+44',
     httpHost: 'eu-apia.coolkit.cc',
     apiPort: 0,

From 0824aa93f036fa08615a169951116775a1b76d54 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 23 Jun 2021 14:38:05 +0100
Subject: [PATCH 2350/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 200127ac..4e98b96f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,8 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 - **Startup Logging**
   - An accessory warning if a manually configured IP is different from the discovered IP
   - An accessory warning if a shared device is used over the cloud
+- **No Response Status**
+  - Added a global setting `offlineAsNoResponse` to mark cloud-offline accessories as 'No Response' in HomeKit
 - **iFan Devices**
   - Support for LAN mode control
   - Added option to specify a manual IP

From dedc68ffec19065c711e7fed3bde6afcbc6eddeb Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 23 Jun 2021 14:38:45 +0100
Subject: [PATCH 2351/3183] 6.8.1-beta.38

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 7c15af9c..27929e54 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.8.1-beta.37",
+  "version": "6.8.1-beta.38",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index b963de38..4e4628a0 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.8.1-beta.37",
+  "version": "6.8.1-beta.38",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 84eff8d789cfc600ede869c5ce6b84ed02d3a133 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 23 Jun 2021 14:45:32 +0100
Subject: [PATCH 2352/3183] mark subaccessories on hb load

---
 lib/index.js | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/lib/index.js b/lib/index.js
index fa69050b..b36856e4 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1167,6 +1167,11 @@ class eWeLinkPlatform {
             ? new (require('./device/outlet-multi'))(this, subAccessory, devicesInHB)
             : new (require('./device/switch-multi'))(this, subAccessory, devicesInHB)
 
+          // Mark the online/offline status of certain devices
+          if (wsClient && subAccessory.control && subAccessory.control.markStatus) {
+            subAccessory.control.markStatus(device.online)
+          }
+
           // Update any changes to the sub accessory to the platform
           this.api.updatePlatformAccessories(plugin.name, plugin.alias, [subAccessory])
           devicesInHB.set(subAccessory.UUID, subAccessory)
@@ -1273,10 +1278,19 @@ class eWeLinkPlatform {
             device.extra && device.extra.staMac ? device.extra.staMac : false
           subAccessory.context.lanKey = device.devicekey
 
+          // Get the instance for this RF device
+          subAccessory.control = new (require('./device/' + instance))(this, subAccessory)
+
+          // Mark the online/offline status of certain devices
+          if (wsClient && subAccessory.control && subAccessory.control.markStatus) {
+            subAccessory.control.markStatus(device.online)
+          }
+
           // Update any changes to the sub accessory to the platform
           this.api.updatePlatformAccessories(plugin.name, plugin.alias, [subAccessory])
           devicesInHB.set(subAccessory.UUID, subAccessory)
-          subAccessory.control = new (require('./device/' + instance))(this, subAccessory)
+
+          // Increment the counter
           rfChlCounter += Object.keys(subDevice.buttons || {}).length
         })
 

From e66bf39709b5cf44677fe7c479ecc40ff6b6757e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 23 Jun 2021 14:46:02 +0100
Subject: [PATCH 2353/3183] 6.8.1-beta.39

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 27929e54..47d69ac3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.8.1-beta.38",
+  "version": "6.8.1-beta.39",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 4e4628a0..a3fadddf 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.8.1-beta.38",
+  "version": "6.8.1-beta.39",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From b25f1f634d97809da995a04f1892178e990b2f0f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 23 Jun 2021 16:18:17 +0100
Subject: [PATCH 2354/3183] only add get handlers if offline mode is on

---
 lib/device/curtain.js                  |  10 ++-
 lib/device/diffuser.js                 |  58 +++++++-------
 lib/device/fan.js                      |  42 +++++-----
 lib/device/humidifier.js               |  28 ++++---
 lib/device/light-cct.js                |  40 +++++-----
 lib/device/light-dimmer.js             |  22 +++---
 lib/device/light-rgb-cct.js            |  52 +++++++------
 lib/device/light-rgb.js                |  37 +++++----
 lib/device/motor.js                    |  24 +++---
 lib/device/outlet-double.js            |  10 ++-
 lib/device/outlet-multi.js             |  18 +++--
 lib/device/outlet-power.js             |  10 ++-
 lib/device/outlet-scm.js               |  11 ++-
 lib/device/outlet-single.js            |  35 +++++----
 lib/device/rf-button.js                |  19 +++--
 lib/device/rf-sensor.js                |  16 ++--
 lib/device/sensor-ambient.js           |  46 ++++++-----
 lib/device/sensor-temp-humi.js         |  40 ++++++----
 lib/device/simulation/blind.js         |  30 +++----
 lib/device/simulation/cooler.js        |  84 ++++++++++----------
 lib/device/simulation/dehumidifier.js  |  83 ++++++++++----------
 lib/device/simulation/door.js          |  30 +++----
 lib/device/simulation/garage-eachen.js |  30 +++----
 lib/device/simulation/garage-four.js   |  30 +++----
 lib/device/simulation/garage-one.js    |  30 +++----
 lib/device/simulation/garage-two.js    |  30 +++----
 lib/device/simulation/heater.js        | 104 +++++++++++++------------
 lib/device/simulation/humidifier.js    |  83 ++++++++++----------
 lib/device/simulation/lock-one.js      |  30 +++----
 lib/device/simulation/purifier.js      |  34 ++++----
 lib/device/simulation/sensor.js        |  15 ++--
 lib/device/simulation/switch-valve.js  |  22 +++---
 lib/device/simulation/tap-one.js       |  16 ++--
 lib/device/simulation/tap-two.js       |  10 ++-
 lib/device/simulation/valve-four.js    |  10 ++-
 lib/device/simulation/valve-one.js     |  10 ++-
 lib/device/simulation/valve-two.js     |  16 ++--
 lib/device/simulation/window.js        |  30 +++----
 lib/device/switch-double.js            |  10 ++-
 lib/device/switch-multi.js             |  10 ++-
 lib/device/switch-scm.js               |  10 ++-
 lib/device/switch-single.js            |  10 ++-
 lib/device/thermostat.js               |  58 +++++++-------
 43 files changed, 736 insertions(+), 607 deletions(-)

diff --git a/lib/device/curtain.js b/lib/device/curtain.js
index 667afeba..1ed319dc 100644
--- a/lib/device/curtain.js
+++ b/lib/device/curtain.js
@@ -57,13 +57,17 @@ module.exports = class deviceCurtain {
     // Add the set handler to the target position characteristic
     this.service
       .getCharacteristic(this.hapChar.TargetPosition)
-      .onGet(() => {
-        if (!this.isOnline && platform.config.offlineAsNoResponse) {
+      .onSet(async value => await this.internalPositionUpdate(value))
+
+    // Add the get handlers only if the user has configured the offlineAsNoResponse setting
+    if (platform.config.offlineAsNoResponse) {
+      this.service.getCharacteristic(this.hapChar.TargetPosition).onGet(() => {
+        if (!this.isOnline) {
           throw new this.hapErr(-70402)
         }
         return this.service.getCharacteristic(this.hapChar.TargetPosition).value
       })
-      .onSet(async value => await this.internalPositionUpdate(value))
+    }
 
     // Output the customised options to the log
     const opts = JSON.stringify({
diff --git a/lib/device/diffuser.js b/lib/device/diffuser.js
index 6cebeeb2..e1c5e36c 100644
--- a/lib/device/diffuser.js
+++ b/lib/device/diffuser.js
@@ -57,58 +57,62 @@ module.exports = class deviceDiffuser {
     // Add the set handler to the fan on/off characteristic
     this.fanService
       .getCharacteristic(this.hapChar.On)
-      .onGet(() => {
-        if (!this.isOnline && platform.config.offlineAsNoResponse) {
-          throw new this.hapErr(-70402)
-        }
-        return this.fanService.getCharacteristic(this.hapChar.On).value
-      })
       .onSet(async value => await this.internalDiffuserOnOffUpdate(value))
 
     // Add the set handler to the fan rotation characteristic
     this.fanService
       .getCharacteristic(this.hapChar.RotationSpeed)
       .setProps({ minStep: 50 })
-      .onGet(() => {
-        if (!this.isOnline && platform.config.offlineAsNoResponse) {
-          throw new this.hapErr(-70402)
-        }
-        return this.fanService.getCharacteristic(this.hapChar.RotationSpeed).value
-      })
       .onSet(async value => await this.internalDiffuserSpeedUpdate(value))
 
     // Add the set handler to the lightbulb on/off characteristic
     this.lightService
       .getCharacteristic(this.hapChar.On)
-      .onGet(() => {
-        if (!this.isOnline && platform.config.offlineAsNoResponse) {
-          throw new this.hapErr(-70402)
-        }
-        return this.lightService.getCharacteristic(this.hapChar.On).value
-      })
       .onSet(async value => await this.internalLightStateUpdate(value))
 
     // Add the set handler to the lightbulb brightness characteristic
     this.lightService
       .getCharacteristic(this.hapChar.Brightness)
-      .onGet(() => {
-        if (!this.isOnline && platform.config.offlineAsNoResponse) {
-          throw new this.hapErr(-70402)
-        }
-        return this.lightService.getCharacteristic(this.hapChar.Brightness).value
-      })
       .onSet(async value => await this.internalLightBrightnessUpdate(value))
 
     // Add the set handler to the lightbulb hue characteristic
     this.lightService
       .getCharacteristic(this.hapChar.Hue)
-      .onGet(() => {
-        if (!this.isOnline && platform.config.offlineAsNoResponse) {
+      .onSet(async value => await this.internalLightColourUpdate(value))
+
+    // Add the get handlers only if the user has configured the offlineAsNoResponse setting
+    if (platform.config.offlineAsNoResponse) {
+      this.fanService.getCharacteristic(this.hapChar.On).onGet(() => {
+        if (!this.isOnline) {
+          throw new this.hapErr(-70402)
+        }
+        return this.fanService.getCharacteristic(this.hapChar.On).value
+      })
+      this.fanService.getCharacteristic(this.hapChar.RotationSpeed).onGet(() => {
+        if (!this.isOnline) {
+          throw new this.hapErr(-70402)
+        }
+        return this.fanService.getCharacteristic(this.hapChar.RotationSpeed).value
+      })
+      this.lightService.getCharacteristic(this.hapChar.On).onGet(() => {
+        if (!this.isOnline) {
+          throw new this.hapErr(-70402)
+        }
+        return this.lightService.getCharacteristic(this.hapChar.On).value
+      })
+      this.lightService.getCharacteristic(this.hapChar.Brightness).onGet(() => {
+        if (!this.isOnline) {
+          throw new this.hapErr(-70402)
+        }
+        return this.lightService.getCharacteristic(this.hapChar.Brightness).value
+      })
+      this.lightService.getCharacteristic(this.hapChar.Hue).onGet(() => {
+        if (!this.isOnline) {
           throw new this.hapErr(-70402)
         }
         return this.lightService.getCharacteristic(this.hapChar.Hue).value
       })
-      .onSet(async value => await this.internalLightColourUpdate(value))
+    }
 
     // Output the customised options to the log
     const opts = JSON.stringify({
diff --git a/lib/device/fan.js b/lib/device/fan.js
index b895050d..7cc3f229 100644
--- a/lib/device/fan.js
+++ b/lib/device/fan.js
@@ -51,24 +51,12 @@ module.exports = class deviceFan {
     // Add the set handler to the fan on/off characteristic
     this.service
       .getCharacteristic(this.hapChar.On)
-      .onGet(() => {
-        if (!this.isOnline && platform.config.offlineAsNoResponse) {
-          throw new this.hapErr(-70402)
-        }
-        return this.service.getCharacteristic(this.hapChar.On).value
-      })
       .onSet(async value => await this.internalStateUpdate(value))
 
     // Add the set handler to the fan rotation speed characteristic
     this.service
       .getCharacteristic(this.hapChar.RotationSpeed)
       .setProps({ minStep: 33 })
-      .onGet(() => {
-        if (!this.isOnline && platform.config.offlineAsNoResponse) {
-          throw new this.hapErr(-70402)
-        }
-        return this.service.getCharacteristic(this.hapChar.RotationSpeed).value
-      })
       .onSet(async value => await this.internalSpeedUpdate(value))
 
     // Check to see if the user has hidden the light channel
@@ -86,12 +74,6 @@ module.exports = class deviceFan {
       // Add the set handler to the lightbulb on/off characteristic
       this.lightService
         .getCharacteristic(this.hapChar.On)
-        .onGet(() => {
-          if (!this.isOnline && platform.config.offlineAsNoResponse) {
-            throw new this.hapErr(-70402)
-          }
-          return this.lightService.getCharacteristic(this.hapChar.On).value
-        })
         .onSet(async value => await this.internalLightUpdate(value))
     }
 
@@ -105,6 +87,30 @@ module.exports = class deviceFan {
       99: 'high'
     }
 
+    // Add the get handlers only if the user has configured the offlineAsNoResponse setting
+    if (platform.config.offlineAsNoResponse) {
+      this.service.getCharacteristic(this.hapChar.On).onGet(() => {
+        if (!this.isOnline) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.On).value
+      })
+      this.service.getCharacteristic(this.hapChar.RotationSpeed).onGet(() => {
+        if (!this.isOnline) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.RotationSpeed).value
+      })
+      if (this.lightService) {
+        this.lightService.getCharacteristic(this.hapChar.On).onGet(() => {
+          if (!this.isOnline) {
+            throw new this.hapErr(-70402)
+          }
+          return this.lightService.getCharacteristic(this.hapChar.On).value
+        })
+      }
+    }
+
     // Output the customised options to the log
     const opts = JSON.stringify({
       hideLight: this.hideLight,
diff --git a/lib/device/humidifier.js b/lib/device/humidifier.js
index b80ae3a0..4b5b9746 100644
--- a/lib/device/humidifier.js
+++ b/lib/device/humidifier.js
@@ -56,24 +56,12 @@ module.exports = class deviceHumidifier {
     // Add the set handler to the fan on/off characteristic
     this.service
       .getCharacteristic(this.hapChar.On)
-      .onGet(() => {
-        if (!this.isOnline && platform.config.offlineAsNoResponse) {
-          throw new this.hapErr(-70402)
-        }
-        return this.service.getCharacteristic(this.hapChar.On).value
-      })
       .onSet(async value => await this.internalStateUpdate(value))
 
     // Add the set handler to the fan rotation speed characteristic
     this.service
       .getCharacteristic(this.hapChar.RotationSpeed)
       .setProps({ minStep: 33 })
-      .onGet(() => {
-        if (!this.isOnline && platform.config.offlineAsNoResponse) {
-          throw new this.hapErr(-70402)
-        }
-        return this.service.getCharacteristic(this.hapChar.RotationSpeed).value
-      })
       .onSet(async value => await this.internalModeUpdate(value))
 
     // Conversion object eWeLink mode to text label
@@ -83,6 +71,22 @@ module.exports = class deviceHumidifier {
       3: 'high'
     }
 
+    // Add the get handlers only if the user has configured the offlineAsNoResponse setting
+    if (platform.config.offlineAsNoResponse) {
+      this.service.getCharacteristic(this.hapChar.On).onGet(() => {
+        if (!this.isOnline) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.On).value
+      })
+      this.service.getCharacteristic(this.hapChar.RotationSpeed).onGet(() => {
+        if (!this.isOnline) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.RotationSpeed).value
+      })
+    }
+
     // Output the customised options to the log
     const opts = JSON.stringify({
       logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable'
diff --git a/lib/device/light-cct.js b/lib/device/light-cct.js
index d3ddb8c6..19f80be2 100644
--- a/lib/device/light-cct.js
+++ b/lib/device/light-cct.js
@@ -79,35 +79,17 @@ module.exports = class deviceLightCCT {
     // Add the set handler to the lightbulb on/off characteristic
     this.service
       .getCharacteristic(this.hapChar.On)
-      .onGet(() => {
-        if (!this.isOnline && platform.config.offlineAsNoResponse) {
-          throw new this.hapErr(-70402)
-        }
-        return this.service.getCharacteristic(this.hapChar.On).value
-      })
       .onSet(async value => await this.internalStateUpdate(value))
 
     // Add the set handler to the lightbulb brightness characteristic
     this.service
       .getCharacteristic(this.hapChar.Brightness)
       .setProps({ minStep: this.brightStep })
-      .onGet(() => {
-        if (!this.isOnline && platform.config.offlineAsNoResponse) {
-          throw new this.hapErr(-70402)
-        }
-        return this.service.getCharacteristic(this.hapChar.Brightness).value
-      })
       .onSet(async value => await this.internalBrightnessUpdate(value))
 
     // Add the set handler to the lightbulb colour temperature characteristic
     this.service
       .getCharacteristic(this.hapChar.ColorTemperature)
-      .onGet(() => {
-        if (!this.isOnline && platform.config.offlineAsNoResponse) {
-          throw new this.hapErr(-70402)
-        }
-        return this.service.getCharacteristic(this.hapChar.ColorTemperature).value
-      })
       .onSet(async value => await this.internalCTUpdate(value))
 
     // This is needed as sometimes we need to send the brightness with a cct update
@@ -119,6 +101,28 @@ module.exports = class deviceLightCCT {
     })
     this.accessory.configureController(this.accessory.alController)
 
+    // Add the get handlers only if the user has configured the offlineAsNoResponse setting
+    if (platform.config.offlineAsNoResponse) {
+      this.service.getCharacteristic(this.hapChar.On).onGet(() => {
+        if (!this.isOnline) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.On).value
+      })
+      this.service.getCharacteristic(this.hapChar.Brightness).onGet(() => {
+        if (!this.isOnline) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.Brightness).value
+      })
+      this.service.getCharacteristic(this.hapChar.ColorTemperature).onGet(() => {
+        if (!this.isOnline) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.ColorTemperature).value
+      })
+    }
+
     // Output the customised options to the log
     const opts = JSON.stringify({
       adaptiveLightingShift: this.alShift,
diff --git a/lib/device/light-dimmer.js b/lib/device/light-dimmer.js
index ae3bb4f3..4025ca18 100644
--- a/lib/device/light-dimmer.js
+++ b/lib/device/light-dimmer.js
@@ -55,25 +55,29 @@ module.exports = class deviceLightDimmer {
     // Add the set handler to the lightbulb on/off characteristic
     this.service
       .getCharacteristic(this.hapChar.On)
-      .onGet(() => {
-        if (!this.isOnline && platform.config.offlineAsNoResponse) {
-          throw new this.hapErr(-70402)
-        }
-        return this.service.getCharacteristic(this.hapChar.On).value
-      })
       .onSet(async value => await this.internalStateUpdate(value))
 
     // Add the set handler to the lightbulb brightness characteristic
     this.service
       .getCharacteristic(this.hapChar.Brightness)
       .setProps({ minStep: this.brightStep })
-      .onGet(() => {
-        if (!this.isOnline && platform.config.offlineAsNoResponse) {
+      .onSet(async value => await this.internalBrightnessUpdate(value))
+
+    // Add the get handlers only if the user has configured the offlineAsNoResponse setting
+    if (platform.config.offlineAsNoResponse) {
+      this.service.getCharacteristic(this.hapChar.On).onGet(() => {
+        if (!this.isOnline) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.On).value
+      })
+      this.service.getCharacteristic(this.hapChar.Brightness).onGet(() => {
+        if (!this.isOnline) {
           throw new this.hapErr(-70402)
         }
         return this.service.getCharacteristic(this.hapChar.Brightness).value
       })
-      .onSet(async value => await this.internalBrightnessUpdate(value))
+    }
 
     // Output the customised options to the log
     const opts = JSON.stringify({
diff --git a/lib/device/light-rgb-cct.js b/lib/device/light-rgb-cct.js
index 52ad98b5..88ab65fe 100644
--- a/lib/device/light-rgb-cct.js
+++ b/lib/device/light-rgb-cct.js
@@ -65,46 +65,22 @@ module.exports = class deviceLightRGBCCT {
     // Add the set handler to the lightbulb on/off characteristic
     this.service
       .getCharacteristic(this.hapChar.On)
-      .onGet(() => {
-        if (!this.isOnline && platform.config.offlineAsNoResponse) {
-          throw new this.hapErr(-70402)
-        }
-        return this.service.getCharacteristic(this.hapChar.On).value
-      })
       .onSet(async value => await this.internalStateUpdate(value))
 
     // Add the set handler to the lightbulb brightness characteristic
     this.service
       .getCharacteristic(this.hapChar.Brightness)
       .setProps({ minStep: this.brightStep })
-      .onGet(() => {
-        if (!this.isOnline && platform.config.offlineAsNoResponse) {
-          throw new this.hapErr(-70402)
-        }
-        return this.service.getCharacteristic(this.hapChar.Brightness).value
-      })
       .onSet(async value => await this.internalBrightnessUpdate(value))
 
     // Add the set handler to the lightbulb hue characteristic
     this.service
       .getCharacteristic(this.hapChar.Hue)
-      .onGet(() => {
-        if (!this.isOnline && platform.config.offlineAsNoResponse) {
-          throw new this.hapErr(-70402)
-        }
-        return this.service.getCharacteristic(this.hapChar.Hue).value
-      })
       .onSet(async value => await this.internalColourUpdate(value))
 
     // Add the set handler to the lightbulb colour temperature characteristic
     this.service
       .getCharacteristic(this.hapChar.ColorTemperature)
-      .onGet(() => {
-        if (!this.isOnline && platform.config.offlineAsNoResponse) {
-          throw new this.hapErr(-70402)
-        }
-        return this.service.getCharacteristic(this.hapChar.ColorTemperature).value
-      })
       .onSet(async value => await this.internalCTUpdate(value))
 
     // This is needed as sometimes we need to send the brightness with a cct update
@@ -116,6 +92,34 @@ module.exports = class deviceLightRGBCCT {
     })
     this.accessory.configureController(this.accessory.alController)
 
+    // Add the get handlers only if the user has configured the offlineAsNoResponse setting
+    if (platform.config.offlineAsNoResponse) {
+      this.service.getCharacteristic(this.hapChar.On).onGet(() => {
+        if (!this.isOnline) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.On).value
+      })
+      this.service.getCharacteristic(this.hapChar.Brightness).onGet(() => {
+        if (!this.isOnline) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.Brightness).value
+      })
+      this.service.getCharacteristic(this.hapChar.Hue).onGet(() => {
+        if (!this.isOnline) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.Hue).value
+      })
+      this.service.getCharacteristic(this.hapChar.ColorTemperature).onGet(() => {
+        if (!this.isOnline) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.ColorTemperature).value
+      })
+    }
+
     // Output the customised options to the log
     const opts = JSON.stringify({
       adaptiveLightingShift: this.alShift,
diff --git a/lib/device/light-rgb.js b/lib/device/light-rgb.js
index edb9334e..ff912f10 100644
--- a/lib/device/light-rgb.js
+++ b/lib/device/light-rgb.js
@@ -60,36 +60,43 @@ module.exports = class deviceLightRGB {
     // Add the set handler to the lightbulb on/off characteristic
     this.service
       .getCharacteristic(this.hapChar.On)
-      .onGet(() => {
-        if (!this.isOnline && platform.config.offlineAsNoResponse) {
-          throw new this.hapErr(-70402)
-        }
-        return this.service.getCharacteristic(this.hapChar.On).value
-      })
       .onSet(async value => await this.internalStateUpdate(value))
 
     // Add the set handler to the lightbulb brightness characteristic
     this.service
       .getCharacteristic(this.hapChar.Brightness)
       .setProps({ minStep: 100 })
-      .onGet(() => {
-        if (!this.isOnline && platform.config.offlineAsNoResponse) {
-          throw new this.hapErr(-70402)
-        }
-        return this.service.getCharacteristic(this.hapChar.Brightness).value
-      })
       .onSet(async value => await this.internalBrightnessUpdate(value))
 
     // Add the set handler to the lightbulb hue characteristic
     this.service
       .getCharacteristic(this.hapChar.Hue)
-      .onGet(() => {
-        if (!this.isOnline && platform.config.offlineAsNoResponse) {
+      .onSet(async value => await this.internalColourUpdate(value))
+
+    // Add the get handlers only if the user has configured the offlineAsNoResponse setting
+    if (platform.config.offlineAsNoResponse) {
+      this.service.getCharacteristic(this.hapChar.On).onGet(() => {
+        if (!this.isOnline) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.On).value
+      })
+      this.service
+        .getCharacteristic(this.hapChar.Brightness)
+        .setProps({ minStep: 100 })
+        .onGet(() => {
+          if (!this.isOnline) {
+            throw new this.hapErr(-70402)
+          }
+          return this.service.getCharacteristic(this.hapChar.Brightness).value
+        })
+      this.service.getCharacteristic(this.hapChar.Hue).onGet(() => {
+        if (!this.isOnline) {
           throw new this.hapErr(-70402)
         }
         return this.service.getCharacteristic(this.hapChar.Hue).value
       })
-      .onSet(async value => await this.internalColourUpdate(value))
+    }
 
     // Output the customised options to the log
     const opts = JSON.stringify({
diff --git a/lib/device/motor.js b/lib/device/motor.js
index 827200ac..2f9333e0 100644
--- a/lib/device/motor.js
+++ b/lib/device/motor.js
@@ -56,24 +56,26 @@ module.exports = class deviceMotor {
       this.accessory.getService(this.hapServ.WindowCovering) ||
       this.accessory.addService(this.hapServ.WindowCovering)
 
-    // Add the get handler to the current position characteristic
-    this.service.getCharacteristic(this.hapChar.CurrentPosition).onGet(() => {
-      if (!this.isOnline && platform.config.offlineAsNoResponse) {
-        throw new this.hapErr(-70402)
-      }
-      return this.service.getCharacteristic(this.hapChar.CurrentPosition).value
-    })
-
     // Add the set handler to the target position characteristic
     this.service
       .getCharacteristic(this.hapChar.TargetPosition)
-      .onGet(() => {
-        if (!this.isOnline && platform.config.offlineAsNoResponse) {
+      .onSet(async value => await this.internalPositionUpdate(value))
+
+    // Add the get handlers only if the user has configured the offlineAsNoResponse setting
+    if (platform.config.offlineAsNoResponse) {
+      this.service.getCharacteristic(this.hapChar.CurrentPosition).onGet(() => {
+        if (!this.isOnline) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.CurrentPosition).value
+      })
+      this.service.getCharacteristic(this.hapChar.TargetPosition).onGet(() => {
+        if (!this.isOnline) {
           throw new this.hapErr(-70402)
         }
         return this.service.getCharacteristic(this.hapChar.TargetPosition).value
       })
-      .onSet(async value => await this.internalPositionUpdate(value))
+    }
 
     // Output the customised options to the log
     const opts = JSON.stringify({
diff --git a/lib/device/outlet-double.js b/lib/device/outlet-double.js
index 17ccf906..0dbd5cd8 100644
--- a/lib/device/outlet-double.js
+++ b/lib/device/outlet-double.js
@@ -79,13 +79,17 @@ module.exports = class deviceOutletDouble {
     // Add the set handler to the switch/outlet on/off characteristic
     this.service
       .getCharacteristic(this.hapChar.On)
-      .onGet(() => {
-        if (!this.isOnline && platform.config.offlineAsNoResponse) {
+      .onSet(async value => await this.internalStateUpdate(value))
+
+    // Add the get handlers only if the user has configured the offlineAsNoResponse setting
+    if (platform.config.offlineAsNoResponse) {
+      this.service.getCharacteristic(this.hapChar.On).onGet(() => {
+        if (!this.isOnline) {
           throw new this.hapErr(-70402)
         }
         return this.service.getCharacteristic(this.hapChar.On).value
       })
-      .onSet(async value => await this.internalStateUpdate(value))
+    }
 
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new platform.eveService('energy', this.accessory, {
diff --git a/lib/device/outlet-multi.js b/lib/device/outlet-multi.js
index f6a343f6..a87d87ea 100644
--- a/lib/device/outlet-multi.js
+++ b/lib/device/outlet-multi.js
@@ -56,20 +56,24 @@ module.exports = class deviceOutletMulti {
       this.accessory.getService(this.hapServ.Outlet) ||
       this.accessory.addService(this.hapServ.Outlet)
 
+    // Remove any OutletInUse characteristics from previous plugin versions
+    if (this.service.testCharacteristic(this.hapChar.OutletInUse)) {
+      this.service.removeCharacteristic(this.service.getCharacteristic(this.hapChar.OutletInUse))
+    }
+
     // Add the set handler to the switch/outlet on/off characteristic
     this.service
       .getCharacteristic(this.hapChar.On)
-      .onGet(() => {
-        if (!this.isOnline && platform.config.offlineAsNoResponse) {
+      .onSet(async value => await this.internalStateUpdate(value))
+
+    // Add the get handlers only if the user has configured the offlineAsNoResponse setting
+    if (platform.config.offlineAsNoResponse) {
+      this.service.getCharacteristic(this.hapChar.On).onGet(() => {
+        if (!this.isOnline) {
           throw new this.hapErr(-70402)
         }
         return this.service.getCharacteristic(this.hapChar.On).value
       })
-      .onSet(async value => await this.internalStateUpdate(value))
-
-    // Remove any OutletInUse characteristics from previous plugin versions
-    if (this.service.testCharacteristic(this.hapChar.OutletInUse)) {
-      this.service.removeCharacteristic(this.service.getCharacteristic(this.hapChar.OutletInUse))
     }
 
     // Output the customised options to the log
diff --git a/lib/device/outlet-power.js b/lib/device/outlet-power.js
index fe08f8a6..15cc2203 100644
--- a/lib/device/outlet-power.js
+++ b/lib/device/outlet-power.js
@@ -66,13 +66,17 @@ module.exports = class deviceOutletPower {
     // Add the set handler to the outlet on/off characteristic
     this.service
       .getCharacteristic(this.hapChar.On)
-      .onGet(() => {
-        if (!this.isOnline && platform.config.offlineAsNoResponse) {
+      .onSet(async value => await this.internalStateUpdate(value))
+
+    // Add the get handlers only if the user has configured the offlineAsNoResponse setting
+    if (platform.config.offlineAsNoResponse) {
+      this.service.getCharacteristic(this.hapChar.On).onGet(() => {
+        if (!this.isOnline) {
           throw new this.hapErr(-70402)
         }
         return this.service.getCharacteristic(this.hapChar.On).value
       })
-      .onSet(async value => await this.internalStateUpdate(value))
+    }
 
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new platform.eveService('energy', this.accessory, {
diff --git a/lib/device/outlet-scm.js b/lib/device/outlet-scm.js
index a3c3da4b..dcb86ab7 100644
--- a/lib/device/outlet-scm.js
+++ b/lib/device/outlet-scm.js
@@ -52,15 +52,20 @@ module.exports = class deviceOutletSCM {
       this.accessory.getService(this.hapServ.Outlet) ||
       this.accessory.addService(this.hapServ.Outlet)
 
+    // Add the set handler to the outlet on/off characteristic
     this.service
       .getCharacteristic(this.hapChar.On)
-      .onGet(() => {
-        if (!this.isOnline && platform.config.offlineAsNoResponse) {
+      .onSet(async value => await this.internalStateUpdate(value))
+
+    // Add the get handlers only if the user has configured the offlineAsNoResponse setting
+    if (platform.config.offlineAsNoResponse) {
+      this.service.getCharacteristic(this.hapChar.On).onGet(() => {
+        if (!this.isOnline) {
           throw new this.hapErr(-70402)
         }
         return this.service.getCharacteristic(this.hapChar.On).value
       })
-      .onSet(async value => await this.internalStateUpdate(value))
+    }
 
     // Output the customised options to the log
     const opts = JSON.stringify({
diff --git a/lib/device/outlet-single.js b/lib/device/outlet-single.js
index 43e364ba..d14f5f71 100644
--- a/lib/device/outlet-single.js
+++ b/lib/device/outlet-single.js
@@ -54,21 +54,6 @@ module.exports = class deviceOutletSingle {
       this.accessory.getService(this.hapServ.Outlet) ||
       this.accessory.addService(this.hapServ.Outlet)
 
-    this.service
-      .getCharacteristic(this.hapChar.On)
-      .onGet(() => {
-        if (!this.isOnline && platform.config.offlineAsNoResponse) {
-          throw new this.hapErr(-70402)
-        }
-        return this.service.getCharacteristic(this.hapChar.On).value
-      })
-      .onSet(async value => await this.internalStateUpdate(value))
-
-    // Pass the accessory to Fakegato to set up with Eve
-    this.accessory.eveService = new platform.eveService('energy', this.accessory, {
-      log: platform.config.debugFakegato ? this.log : () => {}
-    })
-
     // Just a simple outlet model so remove any existing power characteristics
     if (this.service.testCharacteristic(this.eveChar.Voltage)) {
       this.service.removeCharacteristic(this.service.getCharacteristic(this.eveChar.Voltage))
@@ -85,6 +70,26 @@ module.exports = class deviceOutletSingle {
       this.service.removeCharacteristic(this.service.getCharacteristic(this.hapChar.OutletInUse))
     }
 
+    // Add the set handler to the outlet on/off characteristic
+    this.service
+      .getCharacteristic(this.hapChar.On)
+      .onSet(async value => await this.internalStateUpdate(value))
+
+    // Add the get handlers only if the user has configured the offlineAsNoResponse setting
+    if (platform.config.offlineAsNoResponse) {
+      this.service.getCharacteristic(this.hapChar.On).onGet(() => {
+        if (!this.isOnline) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.On).value
+      })
+    }
+
+    // Pass the accessory to Fakegato to set up with Eve
+    this.accessory.eveService = new platform.eveService('energy', this.accessory, {
+      log: platform.config.debugFakegato ? this.log : () => {}
+    })
+
     // Output the customised options to the log
     const opts = JSON.stringify({
       logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable'
diff --git a/lib/device/rf-button.js b/lib/device/rf-button.js
index 30869d09..3f25ba55 100644
--- a/lib/device/rf-button.js
+++ b/lib/device/rf-button.js
@@ -60,13 +60,20 @@ module.exports = class deviceRFButton {
       this.accessory
         .getService(name)
         .getCharacteristic(this.hapChar.On)
-        .onGet(() => {
-          if (!this.isOnline && platform.config.offlineAsNoResponse) {
-            throw new this.hapErr(-70402)
-          }
-          return this.accessory.getService(name).getCharacteristic(this.hapChar.On).value
-        })
         .onSet(async value => await this.internalPressUpdate(chan, name, value))
+
+      // Add the get handlers only if the user has configured the offlineAsNoResponse setting
+      if (platform.config.offlineAsNoResponse) {
+        this.accessory
+          .getService(name)
+          .getCharacteristic(this.hapChar.On)
+          .onGet(() => {
+            if (!this.isOnline) {
+              throw new this.hapErr(-70402)
+            }
+            return this.accessory.getService(name).getCharacteristic(this.hapChar.On).value
+          })
+      }
     })
 
     // Output the customised options to the log
diff --git a/lib/device/rf-sensor.js b/lib/device/rf-sensor.js
index 8cf8508c..b45a0390 100644
--- a/lib/device/rf-sensor.js
+++ b/lib/device/rf-sensor.js
@@ -138,13 +138,15 @@ module.exports = class deviceRFSensor {
     // Always start with the sensor off (useful when restarting Homebridge)
     service.updateCharacteristic(char, 0)
 
-    // Add a get handler to mark as no response if device is offline
-    service.getCharacteristic(char).onGet(() => {
-      if (!this.isOnline && platform.config.offlineAsNoResponse) {
-        throw new this.hapErr(-70402)
-      }
-      return service.getCharacteristic(char).value
-    })
+    // Add the get handlers only if the user has configured the offlineAsNoResponse setting
+    if (platform.config.offlineAsNoResponse) {
+      service.getCharacteristic(char).onGet(() => {
+        if (!this.isOnline) {
+          throw new this.hapErr(-70402)
+        }
+        return service.getCharacteristic(char).value
+      })
+    }
 
     // Pass the accessory to Fakegato to set up with Eve
     accessory.eveService = new platform.eveService(eveType, accessory, {
diff --git a/lib/device/sensor-ambient.js b/lib/device/sensor-ambient.js
index d3c85eb2..0a6dd3f5 100644
--- a/lib/device/sensor-ambient.js
+++ b/lib/device/sensor-ambient.js
@@ -80,12 +80,6 @@ module.exports = class deviceSensorAmbient {
       // Add the set handler to the switch on/off characteristic
       this.switchService
         .getCharacteristic(this.hapChar.On)
-        .onGet(() => {
-          if (!this.isOnline && platform.config.offlineAsNoResponse) {
-            throw new this.hapErr(-70402)
-          }
-          return this.switchService.getCharacteristic(this.hapChar.On).value
-        })
         .onSet(async value => await this.internalStateUpdate(value))
     }
 
@@ -95,17 +89,9 @@ module.exports = class deviceSensorAmbient {
       this.accessory.addService(this.hapServ.TemperatureSensor)
 
     // Set custom properties of the current temperature characteristic
-    this.tempService
-      .getCharacteristic(this.hapChar.CurrentTemperature)
-      .setProps({
-        minStep: 0.1
-      })
-      .onGet(() => {
-        if (!this.isOnline && platform.config.offlineAsNoResponse) {
-          throw new this.hapErr(-70402)
-        }
-        return this.tempService.getCharacteristic(this.hapChar.CurrentTemperature).value
-      })
+    this.tempService.getCharacteristic(this.hapChar.CurrentTemperature).setProps({
+      minStep: 0.1
+    })
 
     // The DS18B20 sensor does not provide humidity readings
     if (this.accessory.context.sensorType === 'DS18B20') {
@@ -117,14 +103,32 @@ module.exports = class deviceSensorAmbient {
       this.humiService =
         this.accessory.getService(this.hapServ.HumiditySensor) ||
         this.accessory.addService(this.hapServ.HumiditySensor)
+    }
 
-      // Add a get handler to the current relative humidity characteristic
-      this.humiService.getCharacteristic(this.hapChar.CurrentRelativeHumidity).onGet(() => {
-        if (!this.isOnline && platform.config.offlineAsNoResponse) {
+    // Add the get handlers only if the user has configured the offlineAsNoResponse setting
+    if (platform.config.offlineAsNoResponse) {
+      if (this.switchService) {
+        this.switchService.getCharacteristic(this.hapChar.On).onGet(() => {
+          if (!this.isOnline) {
+            throw new this.hapErr(-70402)
+          }
+          return this.switchService.getCharacteristic(this.hapChar.On).value
+        })
+      }
+      this.tempService.getCharacteristic(this.hapChar.CurrentTemperature).onGet(() => {
+        if (!this.isOnline) {
           throw new this.hapErr(-70402)
         }
-        return this.humiService.getCharacteristic(this.hapChar.CurrentRelativeHumidity).value
+        return this.tempService.getCharacteristic(this.hapChar.CurrentTemperature).value
       })
+      if (this.humiService) {
+        this.humiService.getCharacteristic(this.hapChar.CurrentRelativeHumidity).onGet(() => {
+          if (!this.isOnline) {
+            throw new this.hapErr(-70402)
+          }
+          return this.humiService.getCharacteristic(this.hapChar.CurrentRelativeHumidity).value
+        })
+      }
     }
 
     // The switch as the primary service ensures the status is reflected in the Home icon
diff --git a/lib/device/sensor-temp-humi.js b/lib/device/sensor-temp-humi.js
index 17e52520..93142a62 100644
--- a/lib/device/sensor-temp-humi.js
+++ b/lib/device/sensor-temp-humi.js
@@ -54,29 +54,35 @@ module.exports = class deviceSensorTempHumi {
       this.accessory.addService(this.hapServ.TemperatureSensor)
 
     // Set custom properties of the current temperature characteristic
-    this.tempService
-      .getCharacteristic(this.hapChar.CurrentTemperature)
-      .setProps({
-        minStep: 0.1
-      })
-      .onGet(() => {
-        if (!this.isOnline && platform.config.offlineAsNoResponse) {
-          throw new this.hapErr(-70402)
-        }
-        return this.tempService.getCharacteristic(this.hapChar.CurrentTemperature).value
-      })
+    this.tempService.getCharacteristic(this.hapChar.CurrentTemperature).setProps({
+      minStep: 0.1
+    })
 
     // Add the humidity sensor service if it doesn't already exist
     this.humiService =
       this.accessory.getService(this.hapServ.HumiditySensor) ||
       this.accessory.addService(this.hapServ.HumiditySensor)
 
-    this.humiService.getCharacteristic(this.hapChar.CurrentRelativeHumidity).onGet(() => {
-      if (!this.isOnline && platform.config.offlineAsNoResponse) {
-        throw new this.hapErr(-70402)
-      }
-      return this.humiService.getCharacteristic(this.hapChar.CurrentRelativeHumidity).value
-    })
+    // Add the get handlers only if the user has configured the offlineAsNoResponse setting
+    if (platform.config.offlineAsNoResponse) {
+      this.tempService
+        .getCharacteristic(this.hapChar.CurrentTemperature)
+        .setProps({
+          minStep: 0.1
+        })
+        .onGet(() => {
+          if (!this.isOnline) {
+            throw new this.hapErr(-70402)
+          }
+          return this.tempService.getCharacteristic(this.hapChar.CurrentTemperature).value
+        })
+      this.humiService.getCharacteristic(this.hapChar.CurrentRelativeHumidity).onGet(() => {
+        if (!this.isOnline) {
+          throw new this.hapErr(-70402)
+        }
+        return this.humiService.getCharacteristic(this.hapChar.CurrentRelativeHumidity).value
+      })
+    }
 
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new platform.eveService('custom', this.accessory, {
diff --git a/lib/device/simulation/blind.js b/lib/device/simulation/blind.js
index 8046a762..b9cae7aa 100644
--- a/lib/device/simulation/blind.js
+++ b/lib/device/simulation/blind.js
@@ -60,27 +60,27 @@ module.exports = class deviceBlind {
       this.service.setCharacteristic(this.hapChar.PositionState, 2)
     }
 
-    // Add the get handler to the current position characteristic
-    this.service.getCharacteristic(this.hapChar.CurrentPosition).onGet(() => {
-      if (!this.isOnline && platform.config.offlineAsNoResponse) {
-        throw new this.hapErr(-70402)
-      }
-      return this.service.getCharacteristic(this.hapChar.CurrentPosition).value
+    // Add the set handler to the target position characteristic
+    this.service.getCharacteristic(this.hapChar.TargetPosition).onSet(value => {
+      // We don't use await as we want the callback to be run straight away
+      this.internalPositionUpdate(value)
     })
 
-    // Add the set handler to the target position characteristic
-    this.service
-      .getCharacteristic(this.hapChar.TargetPosition)
-      .onGet(() => {
-        if (!this.isOnline && platform.config.offlineAsNoResponse) {
+    // Add the get handlers only if the user has configured the offlineAsNoResponse setting
+    if (platform.config.offlineAsNoResponse) {
+      this.service.getCharacteristic(this.hapChar.CurrentPosition).onGet(() => {
+        if (!this.isOnline) {
           throw new this.hapErr(-70402)
         }
-        return this.service.getCharacteristic(this.hapChar.TargetPosition).value
+        return this.service.getCharacteristic(this.hapChar.CurrentPosition).value
       })
-      .onSet(value => {
-        // We don't use await as we want the callback to be run straight away
-        this.internalPositionUpdate(value)
+      this.service.getCharacteristic(this.hapChar.TargetPosition).onGet(() => {
+        if (!this.isOnline) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.TargetPosition).value
       })
+    }
 
     // Output the customised options to the log
     const opts = JSON.stringify({
diff --git a/lib/device/simulation/cooler.js b/lib/device/simulation/cooler.js
index fc94259c..bd6f9f5b 100644
--- a/lib/device/simulation/cooler.js
+++ b/lib/device/simulation/cooler.js
@@ -113,61 +113,31 @@ module.exports = class deviceHeater {
       this.humiService =
         this.accessory.getService(this.hapServ.HumiditySensor) ||
         this.accessory.addService(this.hapServ.HumiditySensor)
-
-      // Add a get handler to the current relative humidity characteristic
-      this.humiService.getCharacteristic(this.hapChar.CurrentRelativeHumidity).onGet(() => {
-        if (!this.isOnline && platform.config.offlineAsNoResponse) {
-          throw new this.hapErr(-70402)
-        }
-        return this.humiService.getCharacteristic(this.hapChar.CurrentRelativeHumidity).value
-      })
     }
 
     // Set the heater as the primary service
     this.service.setPrimaryService()
 
     // Set custom properties of the current temperature characteristic
-    this.service
-      .getCharacteristic(this.hapChar.CurrentTemperature)
-      .setProps({
-        minStep: 0.1
-      })
-      .onGet(() => {
-        if (!this.isOnline && platform.config.offlineAsNoResponse) {
-          throw new this.hapErr(-70402)
-        }
-        return this.service.getCharacteristic(this.hapChar.CurrentTemperature).value
-      })
+    this.service.getCharacteristic(this.hapChar.CurrentTemperature).setProps({
+      minStep: 0.1
+    })
 
     // Add the set handler to the heater active characteristic
     this.service
       .getCharacteristic(this.hapChar.Active)
-      .onGet(() => {
-        if (!this.isOnline && platform.config.offlineAsNoResponse) {
-          throw new this.hapErr(-70402)
-        }
-        return this.service.getCharacteristic(this.hapChar.Active).value
-      })
       .onSet(async value => await this.internalStateUpdate(value))
 
     // Add options to the target state characteristic
-    this.service
-      .getCharacteristic(this.hapChar.TargetHeaterCoolerState)
-      .setProps({
-        minValue: 0,
-        maxValue: 0,
-        validValues: [0]
-      })
-      .onGet(() => {
-        if (!this.isOnline && platform.config.offlineAsNoResponse) {
-          throw new this.hapErr(-70402)
-        }
-        return this.service.getCharacteristic(this.hapChar.TargetHeaterCoolerState).value
-      })
+    this.service.getCharacteristic(this.hapChar.TargetHeaterCoolerState).setProps({
+      minValue: 0,
+      maxValue: 0,
+      validValues: [0]
+    })
 
     // Add a get handler to the current state characteristics
     this.service.getCharacteristic(this.hapChar.CurrentHeaterCoolerState).onGet(() => {
-      if (!this.isOnline && platform.config.offlineAsNoResponse) {
+      if (!this.isOnline) {
         throw new this.hapErr(-70402)
       }
       return this.service.getCharacteristic(this.hapChar.CurrentHeaterCoolerState).value
@@ -182,13 +152,43 @@ module.exports = class deviceHeater {
         maxValue: this.maxTarget,
         minStep: 0.5
       })
-      .onGet(() => {
-        if (!this.isOnline && platform.config.offlineAsNoResponse) {
+      .onSet(async value => await this.internalTargetTempUpdate(value))
+
+    // Add the get handlers only if the user has configured the offlineAsNoResponse setting
+    if (platform.config.offlineAsNoResponse) {
+      if (this.humiService) {
+        this.humiService.getCharacteristic(this.hapChar.CurrentRelativeHumidity).onGet(() => {
+          if (!this.isOnline) {
+            throw new this.hapErr(-70402)
+          }
+          return this.humiService.getCharacteristic(this.hapChar.CurrentRelativeHumidity).value
+        })
+      }
+      this.service.getCharacteristic(this.hapChar.CurrentTemperature).onGet(() => {
+        if (!this.isOnline) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.CurrentTemperature).value
+      })
+      this.service.getCharacteristic(this.hapChar.Active).onGet(() => {
+        if (!this.isOnline) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.Active).value
+      })
+      this.service.getCharacteristic(this.hapChar.TargetHeaterCoolerState).onGet(() => {
+        if (!this.isOnline) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.TargetHeaterCoolerState).value
+      })
+      this.service.getCharacteristic(this.hapChar.CoolingThresholdTemperature).onGet(() => {
+        if (!this.isOnline) {
           throw new this.hapErr(-70402)
         }
         return this.service.getCharacteristic(this.hapChar.CoolingThresholdTemperature).value
       })
-      .onSet(async value => await this.internalTargetTempUpdate(value))
+    }
 
     // Initialise these caches now since they aren't determined by the initial externalUpdate()
     this.cacheState = this.service.getCharacteristic(this.hapChar.Active).value === 1 ? 'on' : 'off'
diff --git a/lib/device/simulation/dehumidifier.js b/lib/device/simulation/dehumidifier.js
index 74fb5627..7c39b3ab 100644
--- a/lib/device/simulation/dehumidifier.js
+++ b/lib/device/simulation/dehumidifier.js
@@ -103,33 +103,11 @@ module.exports = class deviceHeater {
     // Set the dehumidifier as the primary service
     this.service.setPrimaryService()
 
-    // Add a get handler to the current temperature characteristic
-    this.tempService.getCharacteristic(this.hapChar.CurrentTemperature).onGet(() => {
-      if (!this.isOnline && platform.config.offlineAsNoResponse) {
-        throw new this.hapErr(-70402)
-      }
-      return this.tempService.getCharacteristic(this.hapChar.CurrentTemperature).value
-    })
-
     // Add the set handler to the humidifier active characteristic
     this.service
       .getCharacteristic(this.hapChar.Active)
-      .onGet(() => {
-        if (!this.isOnline && platform.config.offlineAsNoResponse) {
-          throw new this.hapErr(-70402)
-        }
-        return this.service.getCharacteristic(this.hapChar.Active).value
-      })
       .onSet(async value => await this.internalStateUpdate(value))
 
-    // Add a get handler to the current state characteristic
-    this.service.getCharacteristic(this.hapChar.CurrentHumidifierDehumidifierState).onGet(() => {
-      if (!this.isOnline && platform.config.offlineAsNoResponse) {
-        throw new this.hapErr(-70402)
-      }
-      return this.service.getCharacteristic(this.hapChar.CurrentHumidifierDehumidifierState).value
-    })
-
     // Add options to the target state characteristic
     this.service
       .getCharacteristic(this.hapChar.TargetHumidifierDehumidifierState)
@@ -139,33 +117,56 @@ module.exports = class deviceHeater {
         maxValue: 2,
         validValues: [2]
       })
-      .onGet(() => {
-        if (!this.isOnline && platform.config.offlineAsNoResponse) {
-          throw new this.hapErr(-70402)
-        }
-        return this.service.getCharacteristic(this.hapChar.TargetHumidifierDehumidifierState).value
-      })
-
-    // Add a get handler to the current relative humidity characteristic
-    this.service.getCharacteristic(this.hapChar.CurrentRelativeHumidity).onGet(() => {
-      if (!this.isOnline && platform.config.offlineAsNoResponse) {
-        throw new this.hapErr(-70402)
-      }
-      return this.service.getCharacteristic(this.hapChar.CurrentRelativeHumidity).value
-    })
 
     // Add the set handler to the target relative humidity characteristic
     this.service
       .getCharacteristic(this.hapChar.RelativeHumidityDehumidifierThreshold)
       .updateValue(this.accessory.context.cacheTarget)
-      .onGet(() => {
-        if (!this.isOnline && platform.config.offlineAsNoResponse) {
+      .onSet(async value => await this.internalTargetHumidityUpdate(value))
+
+    // Add the get handlers only if the user has configured the offlineAsNoResponse setting
+    if (platform.config.offlineAsNoResponse) {
+      this.tempService.getCharacteristic(this.hapChar.CurrentTemperature).onGet(() => {
+        if (!this.isOnline) {
           throw new this.hapErr(-70402)
         }
-        return this.service.getCharacteristic(this.hapChar.RelativeHumidityDehumidifierThreshold)
-          .value
+        return this.tempService.getCharacteristic(this.hapChar.CurrentTemperature).value
       })
-      .onSet(async value => await this.internalTargetHumidityUpdate(value))
+      this.service.getCharacteristic(this.hapChar.Active).onGet(() => {
+        if (!this.isOnline) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.Active).value
+      })
+      this.service.getCharacteristic(this.hapChar.CurrentHumidifierDehumidifierState).onGet(() => {
+        if (!this.isOnline) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.CurrentHumidifierDehumidifierState).value
+      })
+      this.service.getCharacteristic(this.hapChar.TargetHumidifierDehumidifierState).onGet(() => {
+        if (!this.isOnline) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.TargetHumidifierDehumidifierState).value
+      })
+      this.service.getCharacteristic(this.hapChar.CurrentRelativeHumidity).onGet(() => {
+        if (!this.isOnline) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.CurrentRelativeHumidity).value
+      })
+      this.service
+        .getCharacteristic(this.hapChar.RelativeHumidityDehumidifierThreshold)
+        .updateValue(this.accessory.context.cacheTarget)
+        .onGet(() => {
+          if (!this.isOnline) {
+            throw new this.hapErr(-70402)
+          }
+          return this.service.getCharacteristic(this.hapChar.RelativeHumidityDehumidifierThreshold)
+            .value
+        })
+    }
 
     // Initialise these caches now since they aren't determined by the initial externalUpdate()
     this.cacheState = this.service.getCharacteristic(this.hapChar.Active).value === 1 ? 'on' : 'off'
diff --git a/lib/device/simulation/door.js b/lib/device/simulation/door.js
index 793a8fde..02ffd588 100644
--- a/lib/device/simulation/door.js
+++ b/lib/device/simulation/door.js
@@ -60,27 +60,27 @@ module.exports = class deviceDoor {
       this.service.setCharacteristic(this.hapChar.PositionState, 2)
     }
 
-    // Add the get handler to the current position characteristic
-    this.service.getCharacteristic(this.hapChar.CurrentPosition).onGet(() => {
-      if (!this.isOnline && platform.config.offlineAsNoResponse) {
-        throw new this.hapErr(-70402)
-      }
-      return this.service.getCharacteristic(this.hapChar.CurrentPosition).value
+    // Add the set handler to the target position characteristic
+    this.service.getCharacteristic(this.hapChar.TargetPosition).onSet(value => {
+      // We don't use await as we want the callback to be run straight away
+      this.internalPositionUpdate(value)
     })
 
-    // Add the set handler to the target position characteristic
-    this.service
-      .getCharacteristic(this.hapChar.TargetPosition)
-      .onGet(() => {
-        if (!this.isOnline && platform.config.offlineAsNoResponse) {
+    // Add the get handlers only if the user has configured the offlineAsNoResponse setting
+    if (platform.config.offlineAsNoResponse) {
+      this.service.getCharacteristic(this.hapChar.CurrentPosition).onGet(() => {
+        if (!this.isOnline) {
           throw new this.hapErr(-70402)
         }
-        return this.service.getCharacteristic(this.hapChar.TargetPosition).value
+        return this.service.getCharacteristic(this.hapChar.CurrentPosition).value
       })
-      .onSet(value => {
-        // We don't use await as we want the callback to be run straight away
-        this.internalPositionUpdate(value)
+      this.service.getCharacteristic(this.hapChar.TargetPosition).onGet(() => {
+        if (!this.isOnline) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.TargetPosition).value
       })
+    }
 
     // Output the customised options to the log
     const opts = JSON.stringify({
diff --git a/lib/device/simulation/garage-eachen.js b/lib/device/simulation/garage-eachen.js
index 0a04d434..6ca90b8b 100644
--- a/lib/device/simulation/garage-eachen.js
+++ b/lib/device/simulation/garage-eachen.js
@@ -84,27 +84,27 @@ module.exports = class deviceGarageEachen {
       this.service.updateCharacteristic(this.eveChar.TimesOpened, 0)
     })
 
-    // Add the get handler to the current position characteristic
-    this.service.getCharacteristic(this.hapChar.CurrentPosition).onGet(() => {
-      if (!this.isOnline && platform.config.offlineAsNoResponse) {
-        throw new this.hapErr(-70402)
-      }
-      return this.service.getCharacteristic(this.hapChar.CurrentPosition).value
+    // Add the set handler to the target position characteristic
+    this.service.getCharacteristic(this.hapChar.TargetDoorState).onSet(value => {
+      // We don't use await as we want the callback to be run straight away
+      this.internalStateUpdate(value)
     })
 
-    // Add the set handler to the target position characteristic
-    this.service
-      .getCharacteristic(this.hapChar.TargetDoorState)
-      .onGet(() => {
-        if (!this.isOnline && platform.config.offlineAsNoResponse) {
+    // Add the get handlers only if the user has configured the offlineAsNoResponse setting
+    if (platform.config.offlineAsNoResponse) {
+      this.service.getCharacteristic(this.hapChar.CurrentPosition).onGet(() => {
+        if (!this.isOnline) {
           throw new this.hapErr(-70402)
         }
-        return this.service.getCharacteristic(this.hapChar.TargetPosition).value
+        return this.service.getCharacteristic(this.hapChar.CurrentPosition).value
       })
-      .onSet(value => {
-        // We don't use await as we want the callback to be run straight away
-        this.internalStateUpdate(value)
+      this.service.getCharacteristic(this.hapChar.TargetDoorState).onGet(() => {
+        if (!this.isOnline) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.TargetPosition).value
       })
+    }
 
     // Update the obstruction detected to false on Homebridge restart
     this.service.updateCharacteristic(this.hapChar.ObstructionDetected, false)
diff --git a/lib/device/simulation/garage-four.js b/lib/device/simulation/garage-four.js
index 1cfbaf7b..dcdcc5a8 100644
--- a/lib/device/simulation/garage-four.js
+++ b/lib/device/simulation/garage-four.js
@@ -70,27 +70,27 @@ module.exports = class deviceGarageFour {
         gdService.setCharacteristic(this.hapChar.ObstructionDetected, false)
       }
 
-      // Add the get handler to the current position characteristic
-      gdService.getCharacteristic(this.hapChar.CurrentPosition).onGet(() => {
-        if (!this.isOnline && platform.config.offlineAsNoResponse) {
-          throw new this.hapErr(-70402)
-        }
-        return gdService.getCharacteristic(this.hapChar.CurrentPosition).value
+      // Add the set handler to the target position characteristic
+      gdService.getCharacteristic(this.hapChar.TargetDoorState).onSet(value => {
+        // We don't use await as we want the callback to be run straight away
+        this.internalStateUpdate(v, value)
       })
 
-      // Add the set handler to the target position characteristic
-      gdService
-        .getCharacteristic(this.hapChar.TargetDoorState)
-        .onGet(() => {
-          if (!this.isOnline && platform.config.offlineAsNoResponse) {
+      // Add the get handlers only if the user has configured the offlineAsNoResponse setting
+      if (platform.config.offlineAsNoResponse) {
+        gdService.getCharacteristic(this.hapChar.CurrentPosition).onGet(() => {
+          if (!this.isOnline) {
             throw new this.hapErr(-70402)
           }
-          return gdService.getCharacteristic(this.hapChar.TargetPosition).value
+          return gdService.getCharacteristic(this.hapChar.CurrentPosition).value
         })
-        .onSet(value => {
-          // We don't use await as we want the callback to be run straight away
-          this.internalStateUpdate(v, value)
+        gdService.getCharacteristic(this.hapChar.TargetDoorState).onGet(() => {
+          if (!this.isOnline) {
+            throw new this.hapErr(-70402)
+          }
+          return gdService.getCharacteristic(this.hapChar.TargetPosition).value
         })
+      }
     })
 
     // Output the customised options to the log
diff --git a/lib/device/simulation/garage-one.js b/lib/device/simulation/garage-one.js
index e004fbb5..38642949 100644
--- a/lib/device/simulation/garage-one.js
+++ b/lib/device/simulation/garage-one.js
@@ -91,27 +91,27 @@ module.exports = class deviceGarageOne {
       this.service.updateCharacteristic(this.eveChar.TimesOpened, 0)
     })
 
-    // Add the get handler to the current position characteristic
-    this.service.getCharacteristic(this.hapChar.CurrentPosition).onGet(() => {
-      if (!this.isOnline && platform.config.offlineAsNoResponse) {
-        throw new this.hapErr(-70402)
-      }
-      return this.service.getCharacteristic(this.hapChar.CurrentPosition).value
+    // Add the set handler to the target position characteristic
+    this.service.getCharacteristic(this.hapChar.TargetDoorState).onSet(value => {
+      // We don't use await as we want the callback to be run straight away
+      this.internalUpdate(value)
     })
 
-    // Add the set handler to the target position characteristic
-    this.service
-      .getCharacteristic(this.hapChar.TargetDoorState)
-      .onGet(() => {
-        if (!this.isOnline && platform.config.offlineAsNoResponse) {
+    // Add the get handlers only if the user has configured the offlineAsNoResponse setting
+    if (platform.config.offlineAsNoResponse) {
+      this.service.getCharacteristic(this.hapChar.CurrentPosition).onGet(() => {
+        if (!this.isOnline) {
           throw new this.hapErr(-70402)
         }
-        return this.service.getCharacteristic(this.hapChar.TargetPosition).value
+        return this.service.getCharacteristic(this.hapChar.CurrentPosition).value
       })
-      .onSet(value => {
-        // We don't use await as we want the callback to be run straight away
-        this.internalUpdate(value)
+      this.service.getCharacteristic(this.hapChar.TargetDoorState).onGet(() => {
+        if (!this.isOnline) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.TargetPosition).value
       })
+    }
 
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new platform.eveService('door', this.accessory, {
diff --git a/lib/device/simulation/garage-two.js b/lib/device/simulation/garage-two.js
index 9e5d785b..141497cd 100644
--- a/lib/device/simulation/garage-two.js
+++ b/lib/device/simulation/garage-two.js
@@ -68,27 +68,27 @@ module.exports = class deviceGarageTwo {
         gdService.setCharacteristic(this.hapChar.ObstructionDetected, false)
       }
 
-      // Add the get handler to the current position characteristic
-      gdService.getCharacteristic(this.hapChar.CurrentPosition).onGet(() => {
-        if (!this.isOnline && platform.config.offlineAsNoResponse) {
-          throw new this.hapErr(-70402)
-        }
-        return gdService.getCharacteristic(this.hapChar.CurrentPosition).value
+      // Add the set handler to the target position characteristic
+      gdService.getCharacteristic(this.hapChar.TargetDoorState).onSet(value => {
+        // We don't use await as we want the callback to be run straight away
+        this.internalUpdate('Garage' + v, value)
       })
 
-      // Add the set handler to the target position characteristic
-      gdService
-        .getCharacteristic(this.hapChar.TargetDoorState)
-        .onGet(() => {
-          if (!this.isOnline && platform.config.offlineAsNoResponse) {
+      // Add the get handlers only if the user has configured the offlineAsNoResponse setting
+      if (platform.config.offlineAsNoResponse) {
+        gdService.getCharacteristic(this.hapChar.CurrentPosition).onGet(() => {
+          if (!this.isOnline) {
             throw new this.hapErr(-70402)
           }
-          return gdService.getCharacteristic(this.hapChar.TargetPosition).value
+          return gdService.getCharacteristic(this.hapChar.CurrentPosition).value
         })
-        .onSet(value => {
-          // We don't use await as we want the callback to be run straight away
-          this.internalUpdate('Garage' + v, value)
+        gdService.getCharacteristic(this.hapChar.TargetDoorState).onGet(() => {
+          if (!this.isOnline) {
+            throw new this.hapErr(-70402)
+          }
+          return gdService.getCharacteristic(this.hapChar.TargetPosition).value
         })
+      }
     })
 
     // Output the customised options to the log
diff --git a/lib/device/simulation/heater.js b/lib/device/simulation/heater.js
index 818c0f23..a4909682 100644
--- a/lib/device/simulation/heater.js
+++ b/lib/device/simulation/heater.js
@@ -113,64 +113,26 @@ module.exports = class deviceHeater {
       this.humiService =
         this.accessory.getService(this.hapServ.HumiditySensor) ||
         this.accessory.addService(this.hapServ.HumiditySensor)
-
-      // Add a get handler to the current relative humidity characteristic
-      this.humiService.getCharacteristic(this.hapChar.CurrentRelativeHumidity).onGet(() => {
-        if (!this.isOnline && platform.config.offlineAsNoResponse) {
-          throw new this.hapErr(-70402)
-        }
-        return this.humiService.getCharacteristic(this.hapChar.CurrentRelativeHumidity).value
-      })
     }
 
     // Set the heater as the primary service
     this.service.setPrimaryService()
 
     // Set custom properties of the current temperature characteristic
-    this.service
-      .getCharacteristic(this.hapChar.CurrentTemperature)
-      .setProps({
-        minStep: 0.1
-      })
-      .onGet(() => {
-        if (!this.isOnline && platform.config.offlineAsNoResponse) {
-          throw new this.hapErr(-70402)
-        }
-        return this.service.getCharacteristic(this.hapChar.CurrentTemperature).value
-      })
+    this.service.getCharacteristic(this.hapChar.CurrentTemperature).setProps({
+      minStep: 0.1
+    })
 
     // Add the set handler to the heater active characteristic
     this.service
       .getCharacteristic(this.hapChar.Active)
-      .onGet(() => {
-        if (!this.isOnline && platform.config.offlineAsNoResponse) {
-          throw new this.hapErr(-70402)
-        }
-        return this.service.getCharacteristic(this.hapChar.Active).value
-      })
       .onSet(async value => await this.internalStateUpdate(value))
 
     // Add options to the target state characteristic
-    this.service
-      .getCharacteristic(this.hapChar.TargetHeaterCoolerState)
-      .setProps({
-        minValue: 0,
-        maxValue: 0,
-        validValues: [0]
-      })
-      .onGet(() => {
-        if (!this.isOnline && platform.config.offlineAsNoResponse) {
-          throw new this.hapErr(-70402)
-        }
-        return this.service.getCharacteristic(this.hapChar.TargetHeaterCoolerState).value
-      })
-
-    // Add a get handler to the current state characteristics
-    this.service.getCharacteristic(this.hapChar.CurrentHeaterCoolerState).onGet(() => {
-      if (!this.isOnline && platform.config.offlineAsNoResponse) {
-        throw new this.hapErr(-70402)
-      }
-      return this.service.getCharacteristic(this.hapChar.CurrentHeaterCoolerState).value
+    this.service.getCharacteristic(this.hapChar.TargetHeaterCoolerState).setProps({
+      minValue: 0,
+      maxValue: 0,
+      validValues: [0]
     })
 
     // Add the set handler to the target temperature characteristic
@@ -182,13 +144,57 @@ module.exports = class deviceHeater {
         maxValue: this.maxTarget,
         minStep: 0.5
       })
-      .onGet(() => {
-        if (!this.isOnline && platform.config.offlineAsNoResponse) {
+      .onSet(async value => await this.internalTargetTempUpdate(value))
+
+    // Add the get handlers only if the user has configured the offlineAsNoResponse setting
+    if (platform.config.offlineAsNoResponse) {
+      if (this.humiService) {
+        this.humiService.getCharacteristic(this.hapChar.CurrentRelativeHumidity).onGet(() => {
+          if (!this.isOnline) {
+            throw new this.hapErr(-70402)
+          }
+          return this.humiService.getCharacteristic(this.hapChar.CurrentRelativeHumidity).value
+        })
+      }
+      this.service.getCharacteristic(this.hapChar.CurrentTemperature).onGet(() => {
+        if (!this.isOnline) {
           throw new this.hapErr(-70402)
         }
-        return this.service.getCharacteristic(this.hapChar.CoolingThresholdTemperature).value
+        return this.service.getCharacteristic(this.hapChar.CurrentTemperature).value
       })
-      .onSet(async value => await this.internalTargetTempUpdate(value))
+      this.service.getCharacteristic(this.hapChar.Active).onGet(() => {
+        if (!this.isOnline) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.Active).value
+      })
+      this.service.getCharacteristic(this.hapChar.TargetHeaterCoolerState).onGet(() => {
+        if (!this.isOnline) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.TargetHeaterCoolerState).value
+      })
+      this.service.getCharacteristic(this.hapChar.CurrentHeaterCoolerState).onGet(() => {
+        if (!this.isOnline) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.CurrentHeaterCoolerState).value
+      })
+      this.service
+        .getCharacteristic(this.hapChar.HeatingThresholdTemperature)
+        .updateValue(this.accessory.context.cacheTarget)
+        .setProps({
+          minValue: this.minTarget,
+          maxValue: this.maxTarget,
+          minStep: 0.5
+        })
+        .onGet(() => {
+          if (!this.isOnline) {
+            throw new this.hapErr(-70402)
+          }
+          return this.service.getCharacteristic(this.hapChar.CoolingThresholdTemperature).value
+        })
+    }
 
     // Initialise these caches now since they aren't determined by the initial externalUpdate()
     this.cacheState = this.service.getCharacteristic(this.hapChar.Active).value === 1 ? 'on' : 'off'
diff --git a/lib/device/simulation/humidifier.js b/lib/device/simulation/humidifier.js
index eecfa259..0ffa9615 100644
--- a/lib/device/simulation/humidifier.js
+++ b/lib/device/simulation/humidifier.js
@@ -102,33 +102,11 @@ module.exports = class deviceHeater {
     // Set the humidifier as the primary service
     this.service.setPrimaryService()
 
-    // Add a get handler to the current temperature characteristic
-    this.tempService.getCharacteristic(this.hapChar.CurrentTemperature).onGet(() => {
-      if (!this.isOnline && platform.config.offlineAsNoResponse) {
-        throw new this.hapErr(-70402)
-      }
-      return this.tempService.getCharacteristic(this.hapChar.CurrentTemperature).value
-    })
-
     // Add the set handler to the humidifier active characteristic
     this.service
       .getCharacteristic(this.hapChar.Active)
-      .onGet(() => {
-        if (!this.isOnline && platform.config.offlineAsNoResponse) {
-          throw new this.hapErr(-70402)
-        }
-        return this.service.getCharacteristic(this.hapChar.Active).value
-      })
       .onSet(async value => await this.internalStateUpdate(value))
 
-    // Add a get handler to the current state characteristic
-    this.service.getCharacteristic(this.hapChar.CurrentHumidifierDehumidifierState).onGet(() => {
-      if (!this.isOnline && platform.config.offlineAsNoResponse) {
-        throw new this.hapErr(-70402)
-      }
-      return this.service.getCharacteristic(this.hapChar.CurrentHumidifierDehumidifierState).value
-    })
-
     // Add options to the target state characteristic
     this.service
       .getCharacteristic(this.hapChar.TargetHumidifierDehumidifierState)
@@ -138,33 +116,56 @@ module.exports = class deviceHeater {
         maxValue: 1,
         validValues: [1]
       })
-      .onGet(() => {
-        if (!this.isOnline && platform.config.offlineAsNoResponse) {
-          throw new this.hapErr(-70402)
-        }
-        return this.service.getCharacteristic(this.hapChar.TargetHumidifierDehumidifierState).value
-      })
-
-    // Add a get handler to the current relative humidity characteristic
-    this.service.getCharacteristic(this.hapChar.CurrentRelativeHumidity).onGet(() => {
-      if (!this.isOnline && platform.config.offlineAsNoResponse) {
-        throw new this.hapErr(-70402)
-      }
-      return this.service.getCharacteristic(this.hapChar.CurrentRelativeHumidity).value
-    })
 
     // Add the set handler to the target relative humidity characteristic
     this.service
       .getCharacteristic(this.hapChar.RelativeHumidityHumidifierThreshold)
       .updateValue(this.accessory.context.cacheTarget)
-      .onGet(() => {
-        if (!this.isOnline && platform.config.offlineAsNoResponse) {
+      .onSet(async value => await this.internalTargetHumidityUpdate(value))
+
+    // Add the get handlers only if the user has configured the offlineAsNoResponse setting
+    if (platform.config.offlineAsNoResponse) {
+      this.tempService.getCharacteristic(this.hapChar.CurrentTemperature).onGet(() => {
+        if (!this.isOnline) {
           throw new this.hapErr(-70402)
         }
-        return this.service.getCharacteristic(this.hapChar.RelativeHumidityHumidifierThreshold)
-          .value
+        return this.tempService.getCharacteristic(this.hapChar.CurrentTemperature).value
       })
-      .onSet(async value => await this.internalTargetHumidityUpdate(value))
+      this.service.getCharacteristic(this.hapChar.Active).onGet(() => {
+        if (!this.isOnline) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.Active).value
+      })
+      this.service.getCharacteristic(this.hapChar.CurrentHumidifierDehumidifierState).onGet(() => {
+        if (!this.isOnline) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.CurrentHumidifierDehumidifierState).value
+      })
+      this.service.getCharacteristic(this.hapChar.TargetHumidifierDehumidifierState).onGet(() => {
+        if (!this.isOnline) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.TargetHumidifierDehumidifierState).value
+      })
+      this.service.getCharacteristic(this.hapChar.CurrentRelativeHumidity).onGet(() => {
+        if (!this.isOnline) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.CurrentRelativeHumidity).value
+      })
+      this.service
+        .getCharacteristic(this.hapChar.RelativeHumidityHumidifierThreshold)
+        .updateValue(this.accessory.context.cacheTarget)
+        .onGet(() => {
+          if (!this.isOnline) {
+            throw new this.hapErr(-70402)
+          }
+          return this.service.getCharacteristic(this.hapChar.RelativeHumidityHumidifierThreshold)
+            .value
+        })
+    }
 
     // Initialise these caches now since they aren't determined by the initial externalUpdate()
     this.cacheState = this.service.getCharacteristic(this.hapChar.Active).value === 1 ? 'on' : 'off'
diff --git a/lib/device/simulation/lock-one.js b/lib/device/simulation/lock-one.js
index 5d81bd5f..4504f992 100644
--- a/lib/device/simulation/lock-one.js
+++ b/lib/device/simulation/lock-one.js
@@ -54,27 +54,27 @@ module.exports = class deviceLockOne {
       this.accessory.getService(this.hapServ.LockMechanism) ||
       this.accessory.addService(this.hapServ.LockMechanism)
 
-    // Add the get handler to the current lock state characteristic
-    this.service.getCharacteristic(this.hapChar.LockCurrentState).onGet(() => {
-      if (!this.isOnline && platform.config.offlineAsNoResponse) {
-        throw new this.hapErr(-70402)
-      }
-      return this.service.getCharacteristic(this.hapChar.LockCurrentState).value
+    // Add the set handler to the lock target state characteristic
+    this.service.getCharacteristic(this.hapChar.LockTargetState).onSet(value => {
+      // We don't use await as we want the callback to be run straight away
+      this.internalUpdate(value)
     })
 
-    // Add the set handler to the lock target state characteristic
-    this.service
-      .getCharacteristic(this.hapChar.LockTargetState)
-      .onGet(() => {
-        if (!this.isOnline && platform.config.offlineAsNoResponse) {
+    // Add the get handlers only if the user has configured the offlineAsNoResponse setting
+    if (platform.config.offlineAsNoResponse) {
+      this.service.getCharacteristic(this.hapChar.LockCurrentState).onGet(() => {
+        if (!this.isOnline) {
           throw new this.hapErr(-70402)
         }
-        return this.service.getCharacteristic(this.hapChar.LockTargetState).value
+        return this.service.getCharacteristic(this.hapChar.LockCurrentState).value
       })
-      .onSet(value => {
-        // We don't use await as we want the callback to be run straight away
-        this.internalUpdate(value)
+      this.service.getCharacteristic(this.hapChar.LockTargetState).onGet(() => {
+        if (!this.isOnline) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.LockTargetState).value
       })
+    }
 
     // Always show the accessory as locked on Homebridge restart
     this.service
diff --git a/lib/device/simulation/purifier.js b/lib/device/simulation/purifier.js
index 1fff5584..badea660 100644
--- a/lib/device/simulation/purifier.js
+++ b/lib/device/simulation/purifier.js
@@ -60,22 +60,8 @@ module.exports = class devicePurifier {
     // Add the set handler to the purifier active characteristic
     this.service
       .getCharacteristic(this.hapChar.Active)
-      .onGet(() => {
-        if (!this.isOnline && platform.config.offlineAsNoResponse) {
-          throw new this.hapErr(-70402)
-        }
-        return this.service.getCharacteristic(this.hapChar.Active).value
-      })
       .onSet(async value => await this.internalStateUpdate(value))
 
-    // Add the get handler to the current purifying state characteristic
-    this.service.getCharacteristic(this.hapChar.CurrentAirPurifierState).onGet(() => {
-      if (!this.isOnline && platform.config.offlineAsNoResponse) {
-        throw new this.hapErr(-70402)
-      }
-      return this.service.getCharacteristic(this.hapChar.CurrentAirPurifierState).value
-    })
-
     // Add options to the purifier target state characteristic
     this.service
       .getCharacteristic(this.hapChar.TargetAirPurifierState)
@@ -85,12 +71,28 @@ module.exports = class devicePurifier {
         validValues: [1]
       })
       .updateValue(1)
-      .onGet(() => {
-        if (!this.isOnline && platform.config.offlineAsNoResponse) {
+
+    // Add the get handlers only if the user has configured the offlineAsNoResponse setting
+    if (platform.config.offlineAsNoResponse) {
+      this.service.getCharacteristic(this.hapChar.Active).onGet(() => {
+        if (!this.isOnline) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.Active).value
+      })
+      this.service.getCharacteristic(this.hapChar.CurrentAirPurifierState).onGet(() => {
+        if (!this.isOnline) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.CurrentAirPurifierState).value
+      })
+      this.service.getCharacteristic(this.hapChar.TargetAirPurifierState).onGet(() => {
+        if (!this.isOnline) {
           throw new this.hapErr(-70402)
         }
         return this.service.getCharacteristic(this.hapChar.TargetAirPurifierState).value
       })
+    }
 
     // Output the customised options to the log
     const opts = JSON.stringify({
diff --git a/lib/device/simulation/sensor.js b/lib/device/simulation/sensor.js
index 278a0f86..de202114 100644
--- a/lib/device/simulation/sensor.js
+++ b/lib/device/simulation/sensor.js
@@ -108,12 +108,15 @@ module.exports = class deviceSensor {
       }
     }
 
-    this.service.getCharacteristic(this.char).onGet(() => {
-      if (!this.isOnline && platform.config.offlineAsNoResponse) {
-        throw new this.hapErr(-70402)
-      }
-      return this.service.getCharacteristic(this.char).value
-    })
+    // Add the get handlers only if the user has configured the offlineAsNoResponse setting
+    if (platform.config.offlineAsNoResponse) {
+      this.service.getCharacteristic(this.char).onGet(() => {
+        if (!this.isOnline) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.char).value
+      })
+    }
 
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new platform.eveService(eveType, this.accessory, {
diff --git a/lib/device/simulation/switch-valve.js b/lib/device/simulation/switch-valve.js
index 8ffb3db4..21df7c13 100644
--- a/lib/device/simulation/switch-valve.js
+++ b/lib/device/simulation/switch-valve.js
@@ -60,24 +60,28 @@ module.exports = class deviceSwitchValve {
     // Add the set handler to the switch on/off characteristic
     this.sService
       .getCharacteristic(this.hapChar.On)
-      .onGet(() => {
-        if (!this.isOnline && platform.config.offlineAsNoResponse) {
-          throw new this.hapErr(-70402)
-        }
-        return this.sService.getCharacteristic(this.hapChar.On).value
-      })
       .onSet(async value => await this.internalSwitchUpdate(value))
 
     // Add the set handler to the valve active characteristic
     this.vService
       .getCharacteristic(this.hapChar.Active)
-      .onGet(() => {
-        if (!this.isOnline && platform.config.offlineAsNoResponse) {
+      .onSet(async value => await this.internalValveUpdate(value))
+
+    // Add the get handlers only if the user has configured the offlineAsNoResponse setting
+    if (platform.config.offlineAsNoResponse) {
+      this.sService.getCharacteristic(this.hapChar.On).onGet(() => {
+        if (!this.isOnline) {
+          throw new this.hapErr(-70402)
+        }
+        return this.sService.getCharacteristic(this.hapChar.On).value
+      })
+      this.vService.getCharacteristic(this.hapChar.Active).onGet(() => {
+        if (!this.isOnline) {
           throw new this.hapErr(-70402)
         }
         return this.vService.getCharacteristic(this.hapChar.Active).value
       })
-      .onSet(async value => await this.internalValveUpdate(value))
+    }
 
     // Add the set handler to the valve set duration characteristic
     this.vService.getCharacteristic(this.hapChar.SetDuration).onSet(value => {
diff --git a/lib/device/simulation/tap-one.js b/lib/device/simulation/tap-one.js
index c7ae1006..934cdd95 100644
--- a/lib/device/simulation/tap-one.js
+++ b/lib/device/simulation/tap-one.js
@@ -56,17 +56,19 @@ module.exports = class deviceTapOne {
     }
 
     // Add the set handler to the tap active characteristic
-    this.service
-      .getCharacteristic(this.hapChar.Active)
-      .onGet(() => {
-        if (!this.isOnline && platform.config.offlineAsNoResponse) {
+    this.service.getCharacteristic(this.hapChar.Active).onSet(async value => {
+      await this.internalUpdate(value)
+    })
+
+    // Add the get handlers only if the user has configured the offlineAsNoResponse setting
+    if (platform.config.offlineAsNoResponse) {
+      this.service.getCharacteristic(this.hapChar.Active).onGet(() => {
+        if (!this.isOnline) {
           throw new this.hapErr(-70402)
         }
         return this.service.getCharacteristic(this.hapChar.Active).value
       })
-      .onSet(async value => {
-        await this.internalUpdate(value)
-      })
+    }
 
     // Output the customised options to the log
     const opts = JSON.stringify({
diff --git a/lib/device/simulation/tap-two.js b/lib/device/simulation/tap-two.js
index 9e18374e..1a32f77b 100644
--- a/lib/device/simulation/tap-two.js
+++ b/lib/device/simulation/tap-two.js
@@ -56,13 +56,17 @@ module.exports = class deviceTapTwo {
       // Add the set handler to the tap active characteristic
       tapService
         .getCharacteristic(this.hapChar.Active)
-        .onGet(() => {
-          if (!this.isOnline && platform.config.offlineAsNoResponse) {
+        .onSet(async value => await this.internalUpdate('Tap ' + v, value))
+
+      // Add the get handlers only if the user has configured the offlineAsNoResponse setting
+      if (platform.config.offlineAsNoResponse) {
+        tapService.getCharacteristic(this.hapChar.Active).onGet(() => {
+          if (!this.isOnline) {
             throw new this.hapErr(-70402)
           }
           return tapService.getCharacteristic(this.hapChar.Active).value
         })
-        .onSet(async value => await this.internalUpdate('Tap ' + v, value))
+      }
     })
 
     // Output the customised options to the log
diff --git a/lib/device/simulation/valve-four.js b/lib/device/simulation/valve-four.js
index 6a0334c3..ce1dfc19 100644
--- a/lib/device/simulation/valve-four.js
+++ b/lib/device/simulation/valve-four.js
@@ -62,13 +62,17 @@ module.exports = class deviceValveFour {
       // Add the set handler to the valve active characteristic
       valveService
         .getCharacteristic(this.hapChar.Active)
-        .onGet(() => {
-          if (!this.isOnline && platform.config.offlineAsNoResponse) {
+        .onSet(async value => await this.internalUpdate('Valve ' + v, value))
+
+      // Add the get handlers only if the user has configured the offlineAsNoResponse setting
+      if (platform.config.offlineAsNoResponse) {
+        valveService.getCharacteristic(this.hapChar.Active).onGet(() => {
+          if (!this.isOnline) {
             throw new this.hapErr(-70402)
           }
           return valveService.getCharacteristic(this.hapChar.Active).value
         })
-        .onSet(async value => await this.internalUpdate('Valve ' + v, value))
+      }
 
       // Add the set handler to the valve set duration characteristic
       valveService.getCharacteristic(this.hapChar.SetDuration).onSet(value => {
diff --git a/lib/device/simulation/valve-one.js b/lib/device/simulation/valve-one.js
index b291aec8..22775a08 100644
--- a/lib/device/simulation/valve-one.js
+++ b/lib/device/simulation/valve-one.js
@@ -60,13 +60,17 @@ module.exports = class deviceValveOne {
     // Add the set handler to the valve active characteristic
     this.service
       .getCharacteristic(this.hapChar.Active)
-      .onGet(() => {
-        if (!this.isOnline && platform.config.offlineAsNoResponse) {
+      .onSet(async value => await this.internalUpdate(value))
+
+    // Add the get handlers only if the user has configured the offlineAsNoResponse setting
+    if (platform.config.offlineAsNoResponse) {
+      this.service.getCharacteristic(this.hapChar.Active).onGet(() => {
+        if (!this.isOnline) {
           throw new this.hapErr(-70402)
         }
         return this.service.getCharacteristic(this.hapChar.Active).value
       })
-      .onSet(async value => await this.internalUpdate(value))
+    }
 
     // Add the set handler to the valve set duration characteristic
     this.service.getCharacteristic(this.hapChar.SetDuration).onSet(value => {
diff --git a/lib/device/simulation/valve-two.js b/lib/device/simulation/valve-two.js
index 8c8ebb8d..a1299c7e 100644
--- a/lib/device/simulation/valve-two.js
+++ b/lib/device/simulation/valve-two.js
@@ -60,17 +60,19 @@ module.exports = class deviceValveTwo {
       }
 
       // Add the set handler to the valve active characteristic
-      valveService
-        .getCharacteristic(this.hapChar.Active)
-        .onGet(() => {
-          if (!this.isOnline && platform.config.offlineAsNoResponse) {
+      valveService.getCharacteristic(this.hapChar.Active).onSet(async value => {
+        await this.internalUpdate('Valve ' + v, value)
+      })
+
+      // Add the get handlers only if the user has configured the offlineAsNoResponse setting
+      if (platform.config.offlineAsNoResponse) {
+        valveService.getCharacteristic(this.hapChar.Active).onGet(() => {
+          if (!this.isOnline) {
             throw new this.hapErr(-70402)
           }
           return valveService.getCharacteristic(this.hapChar.Active).value
         })
-        .onSet(async value => {
-          await this.internalUpdate('Valve ' + v, value)
-        })
+      }
 
       // Add the set handler to the valve set duration characteristic
       valveService.getCharacteristic(this.hapChar.SetDuration).onSet(value => {
diff --git a/lib/device/simulation/window.js b/lib/device/simulation/window.js
index eac0b395..31217b2b 100644
--- a/lib/device/simulation/window.js
+++ b/lib/device/simulation/window.js
@@ -60,27 +60,27 @@ module.exports = class deviceWindow {
       this.service.setCharacteristic(this.hapChar.PositionState, 2)
     }
 
-    // Add the get handler to the current position characteristic
-    this.service.getCharacteristic(this.hapChar.CurrentPosition).onGet(() => {
-      if (!this.isOnline && platform.config.offlineAsNoResponse) {
-        throw new this.hapErr(-70402)
-      }
-      return this.service.getCharacteristic(this.hapChar.CurrentPosition).value
+    // Add the set handler to the target position characteristic
+    this.service.getCharacteristic(this.hapChar.TargetPosition).onSet(value => {
+      // We don't use await as we want the callback to be run straight away
+      this.internalPositionUpdate(value)
     })
 
-    // Add the set handler to the target position characteristic
-    this.service
-      .getCharacteristic(this.hapChar.TargetPosition)
-      .onGet(() => {
-        if (!this.isOnline && platform.config.offlineAsNoResponse) {
+    // Add the get handlers only if the user has configured the offlineAsNoResponse setting
+    if (platform.config.offlineAsNoResponse) {
+      this.service.getCharacteristic(this.hapChar.CurrentPosition).onGet(() => {
+        if (!this.isOnline) {
           throw new this.hapErr(-70402)
         }
-        return this.service.getCharacteristic(this.hapChar.TargetPosition).value
+        return this.service.getCharacteristic(this.hapChar.CurrentPosition).value
       })
-      .onSet(value => {
-        // We don't use await as we want the callback to be run straight away
-        this.internalPositionUpdate(value)
+      this.service.getCharacteristic(this.hapChar.TargetPosition).onGet(() => {
+        if (!this.isOnline) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.TargetPosition).value
       })
+    }
 
     // Output the customised options to the log
     const opts = JSON.stringify({
diff --git a/lib/device/switch-double.js b/lib/device/switch-double.js
index fa9ac7be..8e05b12d 100644
--- a/lib/device/switch-double.js
+++ b/lib/device/switch-double.js
@@ -59,13 +59,17 @@ module.exports = class deviceSwitchDouble {
     // Add the set handler to the switch/outlet on/off characteristic
     this.service
       .getCharacteristic(this.hapChar.On)
-      .onGet(() => {
-        if (!this.isOnline && platform.config.offlineAsNoResponse) {
+      .onSet(async value => await this.internalStateUpdate(value))
+
+    // Add the get handlers only if the user has configured the offlineAsNoResponse setting
+    if (platform.config.offlineAsNoResponse) {
+      this.service.getCharacteristic(this.hapChar.On).onGet(() => {
+        if (!this.isOnline) {
           throw new this.hapErr(-70402)
         }
         return this.service.getCharacteristic(this.hapChar.On).value
       })
-      .onSet(async value => await this.internalStateUpdate(value))
+    }
 
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new platform.eveService('switch', this.accessory, {
diff --git a/lib/device/switch-multi.js b/lib/device/switch-multi.js
index eb9af881..ed707c81 100644
--- a/lib/device/switch-multi.js
+++ b/lib/device/switch-multi.js
@@ -58,13 +58,17 @@ module.exports = class deviceSwitchMulti {
     // Add the set handler to the switch/outlet on/off characteristic
     this.service
       .getCharacteristic(this.hapChar.On)
-      .onGet(() => {
-        if (!this.isOnline && platform.config.offlineAsNoResponse) {
+      .onSet(async value => await this.internalStateUpdate(value))
+
+    // Add the get handlers only if the user has configured the offlineAsNoResponse setting
+    if (platform.config.offlineAsNoResponse) {
+      this.service.getCharacteristic(this.hapChar.On).onGet(() => {
+        if (!this.isOnline) {
           throw new this.hapErr(-70402)
         }
         return this.service.getCharacteristic(this.hapChar.On).value
       })
-      .onSet(async value => await this.internalStateUpdate(value))
+    }
 
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new platform.eveService('switch', this.accessory, {
diff --git a/lib/device/switch-scm.js b/lib/device/switch-scm.js
index 75301d6d..52188e44 100644
--- a/lib/device/switch-scm.js
+++ b/lib/device/switch-scm.js
@@ -54,13 +54,17 @@ module.exports = class deviceSwitchSCM {
     // Add the set handler to the switch/outlet on/off characteristic
     this.service
       .getCharacteristic(this.hapChar.On)
-      .onGet(() => {
-        if (!this.isOnline && platform.config.offlineAsNoResponse) {
+      .onSet(async value => await this.internalStateUpdate(value))
+
+    // Add the get handlers only if the user has configured the offlineAsNoResponse setting
+    if (platform.config.offlineAsNoResponse) {
+      this.service.getCharacteristic(this.hapChar.On).onGet(() => {
+        if (!this.isOnline) {
           throw new this.hapErr(-70402)
         }
         return this.service.getCharacteristic(this.hapChar.On).value
       })
-      .onSet(async value => await this.internalStateUpdate(value))
+    }
 
     // Output the customised options to the log
     const opts = JSON.stringify({
diff --git a/lib/device/switch-single.js b/lib/device/switch-single.js
index 159a1202..038b71ad 100644
--- a/lib/device/switch-single.js
+++ b/lib/device/switch-single.js
@@ -55,13 +55,17 @@ module.exports = class deviceSwitchSingle {
     // Add the set handler to the switch on/off characteristic
     this.service
       .getCharacteristic(this.hapChar.On)
-      .onGet(() => {
-        if (!this.isOnline && platform.config.offlineAsNoResponse) {
+      .onSet(async value => await this.internalStateUpdate(value))
+
+    // Add the get handlers only if the user has configured the offlineAsNoResponse setting
+    if (platform.config.offlineAsNoResponse) {
+      this.service.getCharacteristic(this.hapChar.On).onGet(() => {
+        if (!this.isOnline) {
           throw new this.hapErr(-70402)
         }
         return this.service.getCharacteristic(this.hapChar.On).value
       })
-      .onSet(async value => await this.internalStateUpdate(value))
+    }
 
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new platform.eveService('switch', this.accessory, {
diff --git a/lib/device/thermostat.js b/lib/device/thermostat.js
index 3c7f2797..c59ab730 100644
--- a/lib/device/thermostat.js
+++ b/lib/device/thermostat.js
@@ -73,24 +73,8 @@ module.exports = class deviceThermostat {
       this.accessory.addService(this.hapServ.Thermostat)
 
     // Set custom properties of the current temperature characteristic
-    this.service
-      .getCharacteristic(this.hapChar.CurrentTemperature)
-      .setProps({
-        minStep: 0.1
-      })
-      .onGet(() => {
-        if (!this.isOnline && platform.config.offlineAsNoResponse) {
-          throw new this.hapErr(-70402)
-        }
-        return this.service.getCharacteristic(this.hapChar.CurrentTemperature).value
-      })
-
-    // Add the get handler to the current state characteristic
-    this.service.getCharacteristic(this.hapChar.CurrentHeatingCoolingState).onGet(() => {
-      if (!this.isOnline && platform.config.offlineAsNoResponse) {
-        throw new this.hapErr(-70402)
-      }
-      return this.service.getCharacteristic(this.hapChar.CurrentHeatingCoolingState).value
+    this.service.getCharacteristic(this.hapChar.CurrentTemperature).setProps({
+      minStep: 0.1
     })
 
     // Add the set handler to the target state characteristic
@@ -101,12 +85,6 @@ module.exports = class deviceThermostat {
         maxValue: 1,
         validValues: [0, 1]
       })
-      .onGet(() => {
-        if (!this.isOnline && platform.config.offlineAsNoResponse) {
-          throw new this.hapErr(-70402)
-        }
-        return this.service.getCharacteristic(this.hapChar.TargetHeatingCoolingState).value
-      })
       .onSet(async value => {
         await this.internalStateUpdate(value)
       })
@@ -119,15 +97,37 @@ module.exports = class deviceThermostat {
         maxValue: 45,
         minStep: 0.5
       })
-      .onGet(() => {
-        if (!this.isOnline && platform.config.offlineAsNoResponse) {
+      .onSet(async value => {
+        await this.internalTargetUpdate(value)
+      })
+
+    // Add the get handlers only if the user has configured the offlineAsNoResponse setting
+    if (platform.config.offlineAsNoResponse) {
+      this.service.getCharacteristic(this.hapChar.CurrentTemperature).onGet(() => {
+        if (!this.isOnline) {
           throw new this.hapErr(-70402)
         }
-        return this.service.getCharacteristic(this.hapChar.TargetTemperature).value
+        return this.service.getCharacteristic(this.hapChar.CurrentTemperature).value
       })
-      .onSet(async value => {
-        await this.internalTargetUpdate(value)
+      this.service.getCharacteristic(this.hapChar.CurrentHeatingCoolingState).onGet(() => {
+        if (!this.isOnline) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.CurrentHeatingCoolingState).value
+      })
+      this.service.getCharacteristic(this.hapChar.TargetHeatingCoolingState).onGet(() => {
+        if (!this.isOnline) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.TargetHeatingCoolingState).value
+      })
+      this.service.getCharacteristic(this.hapChar.TargetTemperature).onGet(() => {
+        if (!this.isOnline) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.TargetTemperature).value
       })
+    }
 
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new platform.eveService('custom', this.accessory, {

From 6b6e2f07a5cee634cb8487d95fa5dc694faaf953 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 23 Jun 2021 16:18:48 +0100
Subject: [PATCH 2355/3183] 6.8.1-beta.40

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 47d69ac3..ae3644d1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.8.1-beta.39",
+  "version": "6.8.1-beta.40",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index a3fadddf..53fb83b3 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.8.1-beta.39",
+  "version": "6.8.1-beta.40",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From f123ca12689ecd78f101645b4a8f15a38301a50c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 23 Jun 2021 16:57:42 +0100
Subject: [PATCH 2356/3183] add init log warning if device reported offline

---
 lib/index.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/index.js b/lib/index.js
index b36856e4..1b5eaae1 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1423,6 +1423,11 @@ class eWeLinkPlatform {
         this.log.warn('[%s] %s.', accessory.displayName, this.lang.shareWarn)
       }
 
+      // Check to see if the device has initially been reported offline
+      if (wsClient && !accessory.context.reachableWAN && !accessory.context.reachableLAN) {
+        this.log.warn('[%s] %s %s.', accessory.displayName, this.lang.repOffline, this.lang.viaWS)
+      }
+
       // Update accessory characteristics with latest values
       if (wsClient && accessory.control && accessory.control.externalUpdate) {
         accessory.control.externalUpdate(device.params)
@@ -1672,7 +1677,7 @@ class eWeLinkPlatform {
           // Log the new reachability of the device
           const status = accessory.context.reachableWAN ? this.lang.repOnline : this.lang.repOffline
           if (accessory.control.enableLogging) {
-            this.log('[%s] %s %s.', accessory.displayName, status, this.lang.viaWS)
+            this.log.warn('[%s] %s %s.', accessory.displayName, status, this.lang.viaWS)
           }
 
           // Mark the online/offline status of certain devices

From 6491907222cbd9dced48d14f598d3e49fd6bb80e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 23 Jun 2021 16:58:17 +0100
Subject: [PATCH 2357/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4e98b96f..4106d943 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 - **Startup Logging**
   - An accessory warning if a manually configured IP is different from the discovered IP
   - An accessory warning if a shared device is used over the cloud
+  - An accessory warning if a cloud-device is reported offline
 - **No Response Status**
   - Added a global setting `offlineAsNoResponse` to mark cloud-offline accessories as 'No Response' in HomeKit
 - **iFan Devices**

From e395ff74f55b7ced879f954f1b45c94449419c9a Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 23 Jun 2021 16:58:45 +0100
Subject: [PATCH 2358/3183] 6.8.1-beta.41

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ae3644d1..a2971980 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.8.1-beta.40",
+  "version": "6.8.1-beta.41",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 53fb83b3..7572c5e7 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.8.1-beta.40",
+  "version": "6.8.1-beta.41",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 6bcace19bfc4406b2e908fa55d837c3f330e9993 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 23 Jun 2021 17:07:30 +0100
Subject: [PATCH 2359/3183] only log warn when offline

---
 lib/index.js | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/lib/index.js b/lib/index.js
index 1b5eaae1..3945e115 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1675,9 +1675,17 @@ class eWeLinkPlatform {
           reachableChange = true
 
           // Log the new reachability of the device
-          const status = accessory.context.reachableWAN ? this.lang.repOnline : this.lang.repOffline
           if (accessory.control.enableLogging) {
-            this.log.warn('[%s] %s %s.', accessory.displayName, status, this.lang.viaWS)
+            if (accessory.context.reachableWAN) {
+              this.log('[%s] %s %s.', accessory.displayName, this.lang.repOnline, this.lang.viaWS)
+            } else {
+              this.log.warn(
+                '[%s] %s %s.',
+                accessory.displayName,
+                this.lang.repOffline,
+                this.lang.viaWS
+              )
+            }
           }
 
           // Mark the online/offline status of certain devices

From 9337a5b7485e45921b0e5da30a9810237ab5db08 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 24 Jun 2021 07:33:38 +0100
Subject: [PATCH 2360/3183] change log format for new devices

---
 lib/index.js | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/lib/index.js b/lib/index.js
index 3945e115..44f90904 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1236,9 +1236,14 @@ class eWeLinkPlatform {
               instance = 'rf-sensor'
               break
             default: {
-              this.log.warn('[%s] %s:', device.name, this.lang.devNotSupYet)
-              const data = JSON.stringify(device.params)
-              this.log.warn('[%s-%s] %s', uiid, subDevice.type || '?', data)
+              this.log.warn(
+                '[%s] %s:\n[%s-%s] %s.',
+                device.name,
+                this.lang.devNotSupYet,
+                uiid,
+                subDevice.type || '?',
+                JSON.stringify(device.params)
+              )
               return
             }
           }
@@ -1370,8 +1375,12 @@ class eWeLinkPlatform {
         /**********************
         DEVICES PENDING SUPPORT
         **********************/
-        this.log.warn('[%s] %s:', device.name, this.lang.devNotSupYet)
-        this.log.warn('[%s] %s', uiid || '?', JSON.stringify(device.params))
+        this.log.warn(
+          '[%s] %s:\n[%s] %s.',
+          device.name,
+          this.lang.devNotSupYetuiid,
+          JSON.stringify(device.params)
+        )
         return
         /*********************/
       }

From a070f0a2138bff9377a54e1a33f876c9f6d23ee0 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 24 Jun 2021 07:47:05 +0100
Subject: [PATCH 2361/3183] properly format mac address for models that don't
 show colons

---
 lib/index.js | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/lib/index.js b/lib/index.js
index 44f90904..2abb8e3b 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1157,7 +1157,9 @@ class eWeLinkPlatform {
               ? lanDevices.get(device.deviceid).ip
               : false
           subAccessory.context.macAddress =
-            device.extra && device.extra.staMac ? device.extra.staMac : false
+            device.extra && device.extra.staMac
+              ? device.extra.staMac.replace(/[:]+/g, '').replace(/..\B/g, '$&:')
+              : false
           subAccessory.context.lanKey = device.devicekey
           subAccessory.control = this.consts.devices.doubleSwitch.includes(uiid)
             ? this.multiDevices[device.deviceid] && this.multiDevices[device.deviceid].showAsOutlet
@@ -1280,7 +1282,9 @@ class eWeLinkPlatform {
               ? lanDevices.get(device.deviceid).ip
               : false
           subAccessory.context.macAddress =
-            device.extra && device.extra.staMac ? device.extra.staMac : false
+            device.extra && device.extra.staMac
+              ? device.extra.staMac.replace(/[:]+/g, '').replace(/..\B/g, '$&:')
+              : false
           subAccessory.context.lanKey = device.devicekey
 
           // Get the instance for this RF device
@@ -1400,7 +1404,9 @@ class eWeLinkPlatform {
       accessory.context.ip =
         lanClient && accessory.context.reachableLAN ? lanDevices.get(device.deviceid).ip : false
       accessory.context.macAddress =
-        device.extra && device.extra.staMac ? device.extra.staMac : false
+        device.extra && device.extra.staMac
+          ? device.extra.staMac.replace(/[:]+/g, '').replace(/..\B/g, '$&:')
+          : false
       accessory.context.lanKey = device.devicekey
 
       // Add the uuid and lanKey to the lanClient map

From 235b524b9c737caaf6acd5ca21b51605ca9d0c2d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 24 Jun 2021 08:03:44 +0100
Subject: [PATCH 2362/3183] skip polling if device is marked offline

---
 lib/device/outlet-double.js           | 6 ++++++
 lib/device/outlet-power.js            | 6 ++++++
 lib/device/sensor-ambient.js          | 6 ++++++
 lib/device/simulation/cooler.js       | 6 ++++++
 lib/device/simulation/dehumidifier.js | 6 ++++++
 lib/device/simulation/heater.js       | 6 ++++++
 lib/device/simulation/humidifier.js   | 6 ++++++
 7 files changed, 42 insertions(+)

diff --git a/lib/device/outlet-double.js b/lib/device/outlet-double.js
index 0dbd5cd8..8be26071 100644
--- a/lib/device/outlet-double.js
+++ b/lib/device/outlet-double.js
@@ -241,6 +241,12 @@ module.exports = class deviceOutletDouble {
 
   async internalUIUpdate () {
     try {
+      // Skip polling if device isn't online
+      if (!this.isOnline) {
+        return
+      }
+
+      // Send the params to request the updates
       await this.platform.sendDeviceUpdate(this.accessory, { uiActive: { outlet: 0, time: 120 } })
       await this.funcs.sleep(2000)
       await this.platform.sendDeviceUpdate(this.accessory, { uiActive: { outlet: 1, time: 120 } })
diff --git a/lib/device/outlet-power.js b/lib/device/outlet-power.js
index 15cc2203..5c918113 100644
--- a/lib/device/outlet-power.js
+++ b/lib/device/outlet-power.js
@@ -181,6 +181,12 @@ module.exports = class deviceOutletPower {
 
   async internalUIUpdate () {
     try {
+      // Skip polling if device isn't online
+      if (!this.isOnline) {
+        return
+      }
+
+      // Send the params to request the updates
       const params = { uiActive: 120 }
       await this.platform.sendDeviceUpdate(this.accessory, params)
     } catch (err) {
diff --git a/lib/device/sensor-ambient.js b/lib/device/sensor-ambient.js
index 0a6dd3f5..8cafb0a3 100644
--- a/lib/device/sensor-ambient.js
+++ b/lib/device/sensor-ambient.js
@@ -191,6 +191,12 @@ module.exports = class deviceSensorAmbient {
 
   async internalUIUpdate () {
     try {
+      // Skip polling if device isn't online
+      if (!this.isOnline) {
+        return
+      }
+
+      // Send the params to request the updates
       const params = { uiActive: 120 }
       await this.platform.sendDeviceUpdate(this.accessory, params)
     } catch (err) {
diff --git a/lib/device/simulation/cooler.js b/lib/device/simulation/cooler.js
index bd6f9f5b..25537651 100644
--- a/lib/device/simulation/cooler.js
+++ b/lib/device/simulation/cooler.js
@@ -365,6 +365,12 @@ module.exports = class deviceHeater {
 
   async internalUIUpdate () {
     try {
+      // Skip polling if device isn't online
+      if (!this.isOnline) {
+        return
+      }
+
+      // Send the params to request the updates
       const params = { uiActive: 120 }
       await this.platform.sendDeviceUpdate(this.accessory, params)
     } catch (err) {
diff --git a/lib/device/simulation/dehumidifier.js b/lib/device/simulation/dehumidifier.js
index 7c39b3ab..8002ddad 100644
--- a/lib/device/simulation/dehumidifier.js
+++ b/lib/device/simulation/dehumidifier.js
@@ -341,6 +341,12 @@ module.exports = class deviceHeater {
 
   async internalUIUpdate () {
     try {
+      // Skip polling if device isn't online
+      if (!this.isOnline) {
+        return
+      }
+
+      // Send the params to request the updates
       const params = { uiActive: 120 }
       await this.platform.sendDeviceUpdate(this.accessory, params)
     } catch (err) {
diff --git a/lib/device/simulation/heater.js b/lib/device/simulation/heater.js
index a4909682..7e489f27 100644
--- a/lib/device/simulation/heater.js
+++ b/lib/device/simulation/heater.js
@@ -371,6 +371,12 @@ module.exports = class deviceHeater {
 
   async internalUIUpdate () {
     try {
+      // Skip polling if device isn't online
+      if (!this.isOnline) {
+        return
+      }
+
+      // Send the params to request the updates
       const params = { uiActive: 120 }
       await this.platform.sendDeviceUpdate(this.accessory, params)
     } catch (err) {
diff --git a/lib/device/simulation/humidifier.js b/lib/device/simulation/humidifier.js
index 0ffa9615..8250e5c5 100644
--- a/lib/device/simulation/humidifier.js
+++ b/lib/device/simulation/humidifier.js
@@ -340,6 +340,12 @@ module.exports = class deviceHeater {
 
   async internalUIUpdate () {
     try {
+      // Skip polling if device isn't online
+      if (!this.isOnline) {
+        return
+      }
+
+      // Send the params to request the updates
       const params = { uiActive: 120 }
       await this.platform.sendDeviceUpdate(this.accessory, params)
     } catch (err) {

From c4e8d487af11199e486036134f546b8e318038b9 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 24 Jun 2021 08:04:58 +0100
Subject: [PATCH 2363/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4106d943..1a1038fa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -53,6 +53,9 @@ All notable changes to this homebridge-ewelink will be documented in this file.
   - Previous fan speed will be used again after turning off and on
 - **POWR2/DUALR3 Devices**
   - Polling for power/temperature/humidity readings increased to two minutes
+  - Polling for data will be skipped if device is marked as offline
+- **TH10/16 Devices**
+  - Polling for data will be skipped if device is marked as offline
 - **Configuration**
   - `sensorTimeDifference` minimum reduced to 5 seconds and default reduced to 60 seconds
 - **Dependencies**

From a4f47677a86999c29d9bbb5630ca883c767a18a4 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 24 Jun 2021 08:52:00 +0100
Subject: [PATCH 2364/3183] Heating/Cooling char fixes

---
 lib/device/simulation/cooler.js | 2 +-
 lib/device/simulation/heater.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/device/simulation/cooler.js b/lib/device/simulation/cooler.js
index 25537651..bf7d48d1 100644
--- a/lib/device/simulation/cooler.js
+++ b/lib/device/simulation/cooler.js
@@ -322,7 +322,7 @@ module.exports = class deviceHeater {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
         this.service.updateCharacteristic(
-          this.hapChar.HeatingThresholdTemperature,
+          this.hapChar.CoolingThresholdTemperature,
           this.accessory.context.cacheTarget
         )
       }, 2000)
diff --git a/lib/device/simulation/heater.js b/lib/device/simulation/heater.js
index 7e489f27..2eb0989c 100644
--- a/lib/device/simulation/heater.js
+++ b/lib/device/simulation/heater.js
@@ -192,7 +192,7 @@ module.exports = class deviceHeater {
           if (!this.isOnline) {
             throw new this.hapErr(-70402)
           }
-          return this.service.getCharacteristic(this.hapChar.CoolingThresholdTemperature).value
+          return this.service.getCharacteristic(this.hapChar.HeatingThresholdTemperature).value
         })
     }
 

From 143c67614f8e1880c58fb866a68fb01c803c3eca Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 24 Jun 2021 08:59:35 +0100
Subject: [PATCH 2365/3183] 6.8.1-beta.42

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index a2971980..82331e69 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.8.1-beta.41",
+  "version": "6.8.1-beta.42",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 7572c5e7..3f519996 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.8.1-beta.41",
+  "version": "6.8.1-beta.42",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From dbeb77c86091e7bdcab58bc3148299f58cfa940b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 24 Jun 2021 11:39:49 +0100
Subject: [PATCH 2366/3183] enable power readings for sonoff pow (r1)

---
 lib/utils/constants.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 746f18dd..d276b67b 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -159,10 +159,10 @@ module.exports = {
 
   devices: {
     lan: [1, 2, 3, 4, 5, 6, 7, 8, 9, 14, 15, 28, 32, 34, 44, 77, 78, 126],
-    singleSwitch: [1, 5, 6, 14, 24, 27, 112],
+    singleSwitch: [1, 6, 14, 24, 27, 112],
     doubleSwitch: [126],
     multiSwitch: [2, 3, 4, 7, 8, 9, 29, 30, 31, 41, 82, 83, 84, 113, 114],
-    singleSwitchOutlet: ['Sonoff Pow', 'S20', 'S26', 'S26R1', 'S55', 'S55R1'],
+    singleSwitchOutlet: ['S20', 'S26', 'S26R1', 'S55', 'S55R1'],
     lightDimmer: [36, 44, 57],
     lightRGB: [22],
     lightCCT: [103],
@@ -175,7 +175,7 @@ module.exports = {
     fan: [34],
     humidifier: [19],
     diffuser: [25],
-    outlet: [32],
+    outlet: [5, 32],
     outletSCM: [77, 78, 81, 107],
     camera: [87],
     rfBridge: [28, 98],

From a4330639660c5f5e79b6875a92c1ee9b248be97d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 24 Jun 2021 11:41:40 +0100
Subject: [PATCH 2367/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1a1038fa..bbf4677c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -28,9 +28,10 @@ All notable changes to this homebridge-ewelink will be documented in this file.
   - Implemented polling as firmware 3.5.0 does not seem to send regular temperature updates
   - Implemented LAN mode for Accessory Simulations (eWeLink 'auto' mode is no longer used)
   - Added option to specify a manual IP
-- **POWR2/DUALR3 Devices**
+- **POW/DUAL Devices**
   - Support for LAN mode control for DUALR3 in motor mode
-  - [test] Polling via LAN mode to enable constant power attribute updates for POWR2 devices
+  - Polling via LAN mode to enable constant power attribute updates for POWR2 devices
+  - Reinstate power readings in the Eve app for Sonoff POW(R1) devices
 - **RF Bridge Devices**
   - Ability to change sensor type and other configurable options without the need to re-add the accessory
   - Configuration option `resetOnStartup` to reset the subdevices, useful when adding/removing subdevices to the bridge

From 31e3c0f6ceca410fe4e4481fc5771c2892521698 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 24 Jun 2021 11:43:29 +0100
Subject: [PATCH 2368/3183] Update lan.js

---
 lib/connection/lan.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/connection/lan.js b/lib/connection/lan.js
index 86ec1d61..1c3b47c9 100644
--- a/lib/connection/lan.js
+++ b/lib/connection/lan.js
@@ -215,7 +215,7 @@ module.exports = class connectionLAN {
         params.location = json.params.location
         suffix = 'location'
       } else if (json.params.uiActive && deviceInfo.uiid === 32) {
-        // Only supported by outlet uiid 32 maybe?
+        // Not sure if this works with POWR1 (uiid 5) and need check working with DUALR3 (uiid 126)
         params.uiActive = json.params.uiActive
         suffix = 'monitor'
       } else if (json.params.cmd) {

From 900db85670d260fa76e8bc4b75c507af47f869e4 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 25 Jun 2021 11:44:26 +0100
Subject: [PATCH 2369/3183] support rolling door uiid 67

---
 lib/device/curtain.js  | 65 +++++++++++++++++++++++++++++++-----------
 lib/index.js           |  8 +++---
 lib/utils/constants.js |  4 +--
 3 files changed, 54 insertions(+), 23 deletions(-)

diff --git a/lib/device/curtain.js b/lib/device/curtain.js
index 1ed319dc..92c09253 100644
--- a/lib/device/curtain.js
+++ b/lib/device/curtain.js
@@ -20,12 +20,6 @@ module.exports = class deviceCurtain {
     // Initially set the online flag as true (to be then updated as false if necessary)
     this.isOnline = true
 
-    /*
-      This device's parameters are:
-      switch: str{'on'=OPEN, 'off'=CLOSED}
-      setclose: int[0=OPEN, 100=CLOSED]
-    */
-
     // Set up custom variables for this device type
     const deviceConf = platform.singleDevices[accessory.context.eweDeviceId]
 
@@ -61,6 +55,12 @@ module.exports = class deviceCurtain {
 
     // Add the get handlers only if the user has configured the offlineAsNoResponse setting
     if (platform.config.offlineAsNoResponse) {
+      this.service.getCharacteristic(this.hapChar.CurrentPosition).onGet(() => {
+        if (!this.isOnline) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.CurrentPosition).value
+      })
       this.service.getCharacteristic(this.hapChar.TargetPosition).onGet(() => {
         if (!this.isOnline) {
           throw new this.hapErr(-70402)
@@ -91,13 +91,21 @@ module.exports = class deviceCurtain {
       // Create the params object to send
       const params = {}
 
-      // If we are to fully open/close the curtain we can use the switch param
-      if ([0, 100].includes(value)) {
-        // 'on' for fully open and 'off' for fully close
-        params.switch = value === 100 ? 'on' : 'off'
-      } else {
-        // Otherwise for a %-point we can use the setclose param
-        params.setclose = Math.abs(100 - value)
+      switch (this.accessory.context.eweUIID) {
+        case 11:
+          // If we are to fully open/close the curtain we can use the switch param
+          if ([0, 100].includes(value)) {
+            // 'on' for fully open and 'off' for fully close
+            params.switch = value === 100 ? 'on' : 'off'
+          } else {
+            // Otherwise for a %-point we can use the 'setclose' param
+            params.setclose = Math.abs(100 - value)
+          }
+          break
+        case 67:
+          // For a %-point we can use the 'per' param int[0=CLOSED, 100=OPEN]
+          params.per = value
+          break
       }
 
       // Send the device update
@@ -123,12 +131,35 @@ module.exports = class deviceCurtain {
   async externalUpdate (params) {
     try {
       // Don't continue if there are no useful parameters
-      if (!params.switch && !this.funcs.hasProperty(params, 'setclose')) {
+      if (
+        !params.switch &&
+        !this.funcs.hasProperty(params, 'setclose') &&
+        !this.funcs.hasProperty(params, 'per')
+      ) {
         return
       }
-
-      // setclose is 0=OPEN 100=CLOSED whereas HomeKit is 0=CLOSED 100=OPEN
-      const newPos = Math.abs(100 - parseInt(params.setclose))
+      let newPos
+      switch (this.accessory.context.eweUIID) {
+        case 11:
+          // 'setclose' is 0=OPEN 100=CLOSED whereas HomeKit is 0=CLOSED 100=OPEN
+          // 'switch' is 'on' for fully open and 'off' for fully close
+          if (this.funcs.hasProperty(params, 'setclose')) {
+            newPos = Math.abs(100 - params.setclose)
+          } else if (params.switch) {
+            newPos = params.switch === 'on' ? 100 : 0
+          } else {
+            return
+          }
+          break
+        case 67:
+          // 'per' matches HomeKit status 0=CLOSED 100=OPEN
+          if (this.funcs.hasProperty(params, 'per')) {
+            newPos = params.per
+          } else {
+            return
+          }
+          break
+      }
 
       // Update HomeKit with the provided value
       this.service.updateCharacteristic(this.hapChar.TargetPosition, newPos)
diff --git a/lib/index.js b/lib/index.js
index 2abb8e3b..6ffa3196 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -716,12 +716,12 @@ class eWeLinkPlatform {
 
       // Set up the correct instance for this particular device
       if (this.consts.devices.curtain.includes(uiid)) {
-        /***********************
-        BLINDS [EWELINK UIID 11]
-        ***********************/
+        /****************************
+        BLINDS [EWELINK UIID 11 & 67]
+        ****************************/
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/curtain'))(this, accessory)
-        /**********************/
+        /***************************/
       } else if (this.consts.devices.doubleSwitch.includes(uiid) && device.params.workMode === 2) {
         /*************************
         BLINDS [DUALR3 MOTOR MODE]
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index d276b67b..a8731482 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -167,7 +167,7 @@ module.exports = {
     lightRGB: [22],
     lightCCT: [103],
     lightRGBCCT: [59, 104],
-    curtain: [11],
+    curtain: [11, 67],
     sensorContact: [102],
     sensorAmbient: [15],
     sensorTempHumi: [18],
@@ -277,6 +277,7 @@ module.exports = {
     57: 1, // "MONOCHROMATIC_BALL_LIGHT" (mosquito killer)
     59: 1, // "MUSIC_LIGHT_BELT" (L1)
     66: 1, // "ZIGBEE_MAIN_DEVICE"
+    67: 1, // "RollingDoor"
     77: 4, // "SINGLE_SOCKET_MULTIPLE" (1 socket device using data structure of four)
     78: 4, // "SINGLE_SWITCH_MULTIPLE" (1 switch device using data structure of four
     81: 1, // "GSM_SOCKET_NO_FLOW" (1 socket device using data structure of four)
@@ -339,7 +340,6 @@ module.exports = {
     61: 0, // "KAI_WEI_ROUTER"
     62: 0, // "MEARICAMERA"
     64: 0, // "HeatingTable"
-    67: 0, // "RollingDoor"
     68: 0, // "KOOCHUWAH"
     69: 0, // "ATMOSPHERE_LAMP"
     76: 0, // "YI_GE_ER_LAMP"

From 0b6546de4bf6b71d784087b3a7484eb393fcde35 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 25 Jun 2021 11:46:01 +0100
Subject: [PATCH 2370/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bbf4677c..9caacfba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -43,6 +43,8 @@ All notable changes to this homebridge-ewelink will be documented in this file.
   - Config option to offset the recorded humidity (%RH) for devices that report this
 - **Garage Simulations**
   - Added `TimesOpened` Eve characteristic functionality to single garage door simulation
+- **New Devices**
+  - Support for device with eWeLink UIID 67 *RollingDoor*
 
 ### Changed
 

From 75cbbdc7279fdd998346f8c23c7777a8c97c2707 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 25 Jun 2021 11:46:38 +0100
Subject: [PATCH 2371/3183] 6.8.1-beta.43

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 82331e69..7cf0e69f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.8.1-beta.42",
+  "version": "6.8.1-beta.43",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 3f519996..1d55abfd 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.8.1-beta.42",
+  "version": "6.8.1-beta.43",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 81579fca8d3dc6f5949df257249fc373b66868a5 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 26 Jun 2021 09:59:04 +0100
Subject: [PATCH 2372/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9caacfba..9b2777e2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -44,7 +44,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 - **Garage Simulations**
   - Added `TimesOpened` Eve characteristic functionality to single garage door simulation
 - **New Devices**
-  - Support for device with eWeLink UIID 67 *RollingDoor*
+  - Support for device with eWeLink UIID 67 _RollingDoor_
 
 ### Changed
 

From a8fc2908def03cccacdd59519b7fceb278073345 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 26 Jun 2021 09:59:49 +0100
Subject: [PATCH 2373/3183] simplify generic single channel device types

---
 lib/device/outlet-double.js |   9 +-
 lib/device/outlet-power.js  | 266 ------------------------------------
 lib/device/outlet-scm.js    | 129 -----------------
 lib/device/outlet-single.js | 233 ++++++++++++++++++++++++++++---
 lib/device/switch-scm.js    | 128 -----------------
 lib/device/switch-single.js | 109 +++++++++++++--
 lib/index.js                |  44 ++----
 7 files changed, 332 insertions(+), 586 deletions(-)
 delete mode 100644 lib/device/outlet-power.js
 delete mode 100644 lib/device/outlet-scm.js
 delete mode 100644 lib/device/switch-scm.js

diff --git a/lib/device/outlet-double.js b/lib/device/outlet-double.js
index 8be26071..944f881d 100644
--- a/lib/device/outlet-double.js
+++ b/lib/device/outlet-double.js
@@ -92,7 +92,7 @@ module.exports = class deviceOutletDouble {
     }
 
     // Pass the accessory to Fakegato to set up with Eve
-    this.accessory.eveService = new platform.eveService('energy', this.accessory, {
+    this.accessory.eveService = new platform.eveService('custom', this.accessory, {
       log: platform.config.debugFakegato ? this.log : () => {}
     })
 
@@ -168,6 +168,7 @@ module.exports = class deviceOutletDouble {
               const subAccessory = this.devicesInHB.get(uuid)
               const service = subAccessory.getService(this.hapServ.Outlet)
               service.updateCharacteristic(this.hapChar.On, value)
+              subAccessory.eveService.addEntry({ status: value ? 1 : 0 })
               if (i > 0) {
                 if (!value) {
                   service.updateCharacteristic(this.hapChar.OutletInUse, false)
@@ -198,6 +199,7 @@ module.exports = class deviceOutletDouble {
                 if (value) {
                   primaryState = true
                 }
+                subAccessory.eveService.addEntry({ status: value ? 1 : 0 })
                 if (i > 0) {
                   if (!value) {
                     service.updateCharacteristic(this.hapChar.OutletInUse, false)
@@ -227,6 +229,7 @@ module.exports = class deviceOutletDouble {
             priAccessory
               .getService(this.hapServ.Outlet)
               .updateCharacteristic(this.hapChar.On, primaryState)
+            priAccessory.eveService.addEntry({ status: primaryState ? 1 : 0 })
           }
           break
       }
@@ -271,6 +274,9 @@ module.exports = class deviceOutletDouble {
             const currentState = service.getCharacteristic(this.hapChar.On).value ? 'on' : 'off'
             if (!params.updateSource || params.switches[i - 1].switch !== currentState) {
               service.updateCharacteristic(this.hapChar.On, params.switches[i - 1].switch === 'on')
+              subAccessory.eveService.addEntry({
+                status: params.switches[i - 1].switch === 'on' ? 1 : 0
+              })
               if (params.switches[i - 1].switch === 'off') {
                 service.updateCharacteristic(this.hapChar.OutletInUse, false)
                 service.updateCharacteristic(this.eveChar.CurrentConsumption, 0)
@@ -330,6 +336,7 @@ module.exports = class deviceOutletDouble {
         params.switches
       ) {
         this.service.updateCharacteristic(this.hapChar.On, primaryState)
+        this.accessory.eveService.addEntry({ status: primaryState ? 1 : 0 })
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
diff --git a/lib/device/outlet-power.js b/lib/device/outlet-power.js
deleted file mode 100644
index 5c918113..00000000
--- a/lib/device/outlet-power.js
+++ /dev/null
@@ -1,266 +0,0 @@
-/* jshint -W014, -W033, esversion: 9 */
-/* eslint-disable new-cap */
-'use strict'
-
-module.exports = class deviceOutletPower {
-  constructor (platform, accessory) {
-    // Set up variables from the platform
-    this.eveChar = platform.eveChar
-    this.funcs = platform.funcs
-    this.hapChar = platform.api.hap.Characteristic
-    this.hapErr = platform.api.hap.HapStatusError
-    this.hapServ = platform.api.hap.Service
-    this.lang = platform.lang
-    this.log = platform.log
-    this.platform = platform
-
-    // Set up variables from the accessory
-    this.name = accessory.displayName
-    this.accessory = accessory
-
-    // Initially set the online flag as true (to be then updated as false if necessary)
-    this.isOnline = true
-
-    // Set up custom variables for this device type
-    const deviceConf = platform.outletDevices[accessory.context.eweDeviceId]
-    this.inUsePowerThreshold =
-      deviceConf && deviceConf.inUsePowerThreshold
-        ? deviceConf.inUsePowerThreshold
-        : platform.consts.defaultValues.inUsePowerThreshold
-
-    // Set the correct logging variables for this accessory
-    this.enableLogging = !platform.config.disableDeviceLogging
-    this.enableDebugLogging = platform.config.debug
-    if (deviceConf && deviceConf.overrideLogging) {
-      switch (deviceConf.overrideLogging) {
-        case 'standard':
-          this.enableLogging = true
-          this.enableDebugLogging = false
-          break
-        case 'debug':
-          this.enableLogging = true
-          this.enableDebugLogging = true
-          break
-        case 'disable':
-          this.enableLogging = false
-          this.enableDebugLogging = false
-          break
-      }
-    }
-
-    // If the accessory has a switch service then remove it
-    if (this.accessory.getService(this.hapServ.Switch)) {
-      this.accessory.removeService(this.accessory.getService(this.hapServ.Switch))
-    }
-
-    // Add the outlet service if it doesn't already exist
-    if (!(this.service = this.accessory.getService(this.hapServ.Outlet))) {
-      this.service = this.accessory.addService(this.hapServ.Outlet)
-      this.service.addCharacteristic(this.eveChar.Voltage)
-      this.service.addCharacteristic(this.eveChar.CurrentConsumption)
-      this.service.addCharacteristic(this.eveChar.ElectricCurrent)
-      this.service.addCharacteristic(this.eveChar.TotalConsumption)
-      this.service.addCharacteristic(this.eveChar.ResetTotal)
-    }
-
-    // Add the set handler to the outlet on/off characteristic
-    this.service
-      .getCharacteristic(this.hapChar.On)
-      .onSet(async value => await this.internalStateUpdate(value))
-
-    // Add the get handlers only if the user has configured the offlineAsNoResponse setting
-    if (platform.config.offlineAsNoResponse) {
-      this.service.getCharacteristic(this.hapChar.On).onGet(() => {
-        if (!this.isOnline) {
-          throw new this.hapErr(-70402)
-        }
-        return this.service.getCharacteristic(this.hapChar.On).value
-      })
-    }
-
-    // Pass the accessory to Fakegato to set up with Eve
-    this.accessory.eveService = new platform.eveService('energy', this.accessory, {
-      log: platform.config.debugFakegato ? this.log : () => {}
-    })
-
-    // TotalConsumption is calculated by the plugin with these context readings
-    if (!this.funcs.hasProperty(this.accessory.context, 'energyReadings')) {
-      this.accessory.context.energyReadings = []
-    }
-    if (!this.funcs.hasProperty(this.accessory.context, 'energyReadingTotal')) {
-      this.accessory.context.energyReadingTotal = 0
-    }
-
-    // Add the set handler to the outlet eve reset total energy characteristic
-    this.service.getCharacteristic(this.eveChar.ResetTotal).onSet(value => {
-      this.accessory.context.energyReadings = []
-      this.accessory.context.energyReadingTotal = 0
-      this.service.updateCharacteristic(this.eveChar.TotalConsumption, 0)
-    })
-
-    // Set up an interval for the plugin to calculate an approx total consumption
-    this.intervalPower = setInterval(() => {
-      // Every 30 seconds start with a zero reading
-      let total = 0
-
-      // Check we have had readings within the previous 30 seconds
-      if (this.accessory.context.energyReadings.length > 0) {
-        // Accumulate the total from the energy readings
-        this.accessory.context.energyReadings.forEach(x => {
-          total += x
-        })
-
-        // Divide this by the number of entries to get an average W5m
-        total /= this.accessory.context.energyReadings.length
-
-        // Convert this to Wh then kWh
-        total /= 12
-        total /= 1000
-
-        // Accumulate the grand total that Eve reads as the total consumption
-        this.accessory.context.energyReadingTotal += total
-      }
-
-      // Reset the array for each 30 second readings
-      this.accessory.context.energyReadings = []
-
-      // Update Eve with the new grand total
-      this.service.updateCharacteristic(
-        this.eveChar.TotalConsumption,
-        this.accessory.context.energyReadingTotal
-      )
-    }, 30000)
-
-    // Set up an interval to get eWeLink to send power updates
-    setTimeout(() => {
-      this.internalUIUpdate()
-      this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
-    }, 5000)
-
-    // Stop the intervals on Homebridge shutdown
-    platform.api.on('shutdown', () => {
-      clearInterval(this.intervalPoll)
-      clearInterval(this.intervalPower)
-    })
-
-    // Output the customised options to the log
-    const opts = JSON.stringify({
-      inUsePowerThreshold: this.inUsePowerThreshold,
-      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable'
-    })
-    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
-  }
-
-  async internalStateUpdate (value) {
-    try {
-      const newValue = value ? 'on' : 'off'
-      if (newValue === this.cacheState) {
-        return
-      }
-      await this.platform.sendDeviceUpdate(this.accessory, {
-        switch: newValue
-      })
-      this.cacheState = newValue
-      if (!value) {
-        this.service.updateCharacteristic(this.hapChar.OutletInUse, false)
-        this.service.updateCharacteristic(this.eveChar.CurrentConsumption, 0)
-        this.accessory.eveService.addEntry({ power: 0 })
-        this.accessory.context.energyReadings.push(0)
-      }
-      if (this.enableLogging) {
-        this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
-      }
-    } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
-      setTimeout(() => {
-        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
-      }, 2000)
-      throw new this.hapErr(-70402)
-    }
-  }
-
-  async internalUIUpdate () {
-    try {
-      // Skip polling if device isn't online
-      if (!this.isOnline) {
-        return
-      }
-
-      // Send the params to request the updates
-      const params = { uiActive: 120 }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
-    } catch (err) {
-      // Suppress errors here
-    }
-  }
-
-  async externalUpdate (params) {
-    try {
-      if (params.switch && params.switch !== this.cacheState) {
-        this.service.updateCharacteristic(this.hapChar.On, params.switch === 'on')
-        this.cacheState = params.switch
-        if (this.cacheState === 'off') {
-          this.service.updateCharacteristic(this.hapChar.OutletInUse, false)
-          this.service.updateCharacteristic(this.eveChar.CurrentConsumption, 0)
-          this.accessory.eveService.addEntry({ power: 0 })
-          this.accessory.context.energyReadings.push(0)
-        }
-        if (params.updateSource && this.enableLogging) {
-          this.log('[%s] %s [%s].', this.name, this.lang.curState, params.switch)
-        }
-      }
-      let logger = false
-      if (this.funcs.hasProperty(params, 'power')) {
-        const power = parseFloat(params.power)
-        this.service.updateCharacteristic(
-          this.hapChar.OutletInUse,
-          this.cacheState === 'on' && power > this.inUsePowerThreshold
-        )
-        this.service.updateCharacteristic(this.eveChar.CurrentConsumption, power)
-        this.accessory.eveService.addEntry({
-          power: this.cacheState === 'on' ? power : 0
-        })
-        this.accessory.context.energyReadings.push(power)
-        logger = true
-      }
-      if (this.funcs.hasProperty(params, 'voltage')) {
-        this.service.updateCharacteristic(this.eveChar.Voltage, parseFloat(params.voltage))
-        logger = true
-      }
-      if (this.funcs.hasProperty(params, 'current')) {
-        this.service.updateCharacteristic(this.eveChar.ElectricCurrent, parseFloat(params.current))
-        logger = true
-      }
-      if (params.updateSource && logger && this.enableLogging) {
-        this.log(
-          '[%s] %s%s%s.',
-          this.name,
-          this.funcs.hasProperty(params, 'power')
-            ? this.lang.curPower + ' [' + params.power + 'W]'
-            : '',
-          this.funcs.hasProperty(params, 'voltage')
-            ? ' ' + this.lang.curVolt + ' [' + params.voltage + 'V]'
-            : '',
-          this.funcs.hasProperty(params, 'current')
-            ? ' ' + this.lang.curCurr + ' [' + params.current + 'A]'
-            : ''
-        )
-      }
-    } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, false)
-    }
-  }
-
-  markStatus (isOnline) {
-    this.isOnline = isOnline
-  }
-
-  currentState () {
-    const toReturn = {}
-    toReturn.services = ['outlet']
-    toReturn.outlet = {
-      state: this.service.getCharacteristic(this.hapChar.On).value ? 'on' : 'off'
-    }
-    return toReturn
-  }
-}
diff --git a/lib/device/outlet-scm.js b/lib/device/outlet-scm.js
deleted file mode 100644
index dcb86ab7..00000000
--- a/lib/device/outlet-scm.js
+++ /dev/null
@@ -1,129 +0,0 @@
-/* jshint -W014, -W033, esversion: 9 */
-/* eslint-disable new-cap */
-'use strict'
-
-module.exports = class deviceOutletSCM {
-  constructor (platform, accessory) {
-    // Set up variables from the platform
-    this.hapChar = platform.api.hap.Characteristic
-    this.hapErr = platform.api.hap.HapStatusError
-    this.hapServ = platform.api.hap.Service
-    this.lang = platform.lang
-    this.log = platform.log
-    this.platform = platform
-
-    // Set up variables from the accessory
-    this.name = accessory.displayName
-    this.accessory = accessory
-
-    // Initially set the online flag as true (to be then updated as false if necessary)
-    this.isOnline = true
-
-    // Set up custom variables for this device type
-    const deviceConf = platform.outletDevices[accessory.context.eweDeviceId]
-
-    // Set the correct logging variables for this accessory
-    this.enableLogging = !platform.config.disableDeviceLogging
-    this.enableDebugLogging = platform.config.debug
-    if (deviceConf && deviceConf.overrideLogging) {
-      switch (deviceConf.overrideLogging) {
-        case 'standard':
-          this.enableLogging = true
-          this.enableDebugLogging = false
-          break
-        case 'debug':
-          this.enableLogging = true
-          this.enableDebugLogging = true
-          break
-        case 'disable':
-          this.enableLogging = false
-          this.enableDebugLogging = false
-          break
-      }
-    }
-
-    // The default is an outlet so if the accessory has an switch service then remove it
-    if (this.accessory.getService(this.hapServ.Switch)) {
-      this.accessory.removeService(this.accessory.getService(this.hapServ.Switch))
-    }
-
-    // Add the outlet service if it doesn't already exist
-    this.service =
-      this.accessory.getService(this.hapServ.Outlet) ||
-      this.accessory.addService(this.hapServ.Outlet)
-
-    // Add the set handler to the outlet on/off characteristic
-    this.service
-      .getCharacteristic(this.hapChar.On)
-      .onSet(async value => await this.internalStateUpdate(value))
-
-    // Add the get handlers only if the user has configured the offlineAsNoResponse setting
-    if (platform.config.offlineAsNoResponse) {
-      this.service.getCharacteristic(this.hapChar.On).onGet(() => {
-        if (!this.isOnline) {
-          throw new this.hapErr(-70402)
-        }
-        return this.service.getCharacteristic(this.hapChar.On).value
-      })
-    }
-
-    // Output the customised options to the log
-    const opts = JSON.stringify({
-      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable'
-    })
-    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
-  }
-
-  async internalStateUpdate (value) {
-    try {
-      const newValue = value ? 'on' : 'off'
-      if (newValue === this.cacheState) {
-        return
-      }
-      const params = {
-        switches: [{ switch: newValue, outlet: 0 }]
-      }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.cacheState = newValue
-      if (this.enableLogging) {
-        this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
-      }
-    } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
-      setTimeout(() => {
-        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
-      }, 2000)
-      throw new this.hapErr(-70402)
-    }
-  }
-
-  async externalUpdate (params) {
-    try {
-      if (!params.switches || params.switches[0].switch === this.cacheState) {
-        return
-      }
-      const newStatus = params.switches[0].switch === 'on'
-      this.service.updateCharacteristic(this.hapChar.On, newStatus)
-      this.cacheState = params.switches[0].switch
-      if (params.updateSource && this.enableLogging) {
-        this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
-      }
-    } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, false)
-    }
-  }
-
-  markStatus (isOnline) {
-    this.isOnline = isOnline
-  }
-
-  currentState () {
-    const toReturn = {}
-    const service = 'outlet'
-    toReturn.services = [service]
-    toReturn[service] = {
-      state: this.service.getCharacteristic(this.hapChar.On).value ? 'on' : 'off'
-    }
-    return toReturn
-  }
-}
diff --git a/lib/device/outlet-single.js b/lib/device/outlet-single.js
index d14f5f71..c7119d49 100644
--- a/lib/device/outlet-single.js
+++ b/lib/device/outlet-single.js
@@ -21,8 +21,20 @@ module.exports = class deviceOutletSingle {
     // Initially set the online flag as true (to be then updated as false if necessary)
     this.isOnline = true
 
+    /*
+    UIID 1: single switch, no power readings
+    UIID 5: single switch, with wattage readings
+    UIID 32: single switch, with wattage, voltage and amp readings
+    UIID 77/78/81/107: single switch but firmware uses multiple channels (only need CH0)
+    */
+
     // Set up custom variables for this device type
-    const deviceConf = platform.outletDevices[accessory.context.eweDeviceId]
+    let deviceConf
+    if (platform.outletDevices[accessory.context.eweDeviceId]) {
+      deviceConf = platform.outletDevices[accessory.context.eweDeviceId]
+    } else if (platform.singleDevices[accessory.context.eweDeviceId]) {
+      deviceConf = platform.singleDevices[accessory.context.eweDeviceId]
+    }
 
     // Set the correct logging variables for this accessory
     this.enableLogging = !platform.config.disableDeviceLogging
@@ -54,20 +66,51 @@ module.exports = class deviceOutletSingle {
       this.accessory.getService(this.hapServ.Outlet) ||
       this.accessory.addService(this.hapServ.Outlet)
 
-    // Just a simple outlet model so remove any existing power characteristics
-    if (this.service.testCharacteristic(this.eveChar.Voltage)) {
-      this.service.removeCharacteristic(this.service.getCharacteristic(this.eveChar.Voltage))
-      this.service.removeCharacteristic(
-        this.service.getCharacteristic(this.eveChar.CurrentConsumption)
-      )
-      this.service.removeCharacteristic(
-        this.service.getCharacteristic(this.eveChar.ElectricCurrent)
-      )
-      this.service.removeCharacteristic(
-        this.service.getCharacteristic(this.eveChar.TotalConsumption)
-      )
-      this.service.removeCharacteristic(this.service.getCharacteristic(this.eveChar.ResetTotal))
-      this.service.removeCharacteristic(this.service.getCharacteristic(this.hapChar.OutletInUse))
+    switch (this.accessory.context.eweUIID) {
+      case 5:
+        // Add Eve power characteristic
+        this.powerReadings = true
+        if (!this.service.testCharacteristic(this.hapChar.OutletInUse)) {
+          this.service.addCharacteristic(this.hapChar.OutletInUse)
+        }
+        if (!this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
+          this.service.addCharacteristic(this.eveChar.CurrentConsumption)
+        }
+        if (!this.service.testCharacteristic(this.eveChar.TotalConsumption)) {
+          this.service.addCharacteristic(this.eveChar.TotalConsumption)
+        }
+        if (!this.service.testCharacteristic(this.eveChar.ResetTotal)) {
+          this.service.addCharacteristic(this.eveChar.ResetTotal)
+        }
+        break
+      case 32:
+        // Add Eve power characteristics
+        this.powerReadings = true
+        if (!this.service.testCharacteristic(this.hapChar.OutletInUse)) {
+          this.service.addCharacteristic(this.hapChar.OutletInUse)
+        }
+        if (!this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
+          this.service.addCharacteristic(this.eveChar.CurrentConsumption)
+        }
+        if (!this.service.testCharacteristic(this.eveChar.ElectricCurrent)) {
+          this.service.addCharacteristic(this.eveChar.ElectricCurrent)
+        }
+        if (!this.service.testCharacteristic(this.eveChar.Voltage)) {
+          this.service.addCharacteristic(this.eveChar.Voltage)
+        }
+        if (!this.service.testCharacteristic(this.eveChar.TotalConsumption)) {
+          this.service.addCharacteristic(this.eveChar.TotalConsumption)
+        }
+        if (!this.service.testCharacteristic(this.eveChar.ResetTotal)) {
+          this.service.addCharacteristic(this.eveChar.ResetTotal)
+        }
+        break
+      case 77:
+      case 78:
+      case 81:
+      case 107:
+        this.isSCM = true
+        break
     }
 
     // Add the set handler to the outlet on/off characteristic
@@ -90,8 +133,78 @@ module.exports = class deviceOutletSingle {
       log: platform.config.debugFakegato ? this.log : () => {}
     })
 
+    // Set up extra features for outlets that provide power readings
+    if (this.powerReadings) {
+      // Get the in-use threshold from the device config
+      this.inUsePowerThreshold =
+        deviceConf && deviceConf.inUsePowerThreshold
+          ? deviceConf.inUsePowerThreshold
+          : platform.consts.defaultValues.inUsePowerThreshold
+
+      // TotalConsumption is calculated by the plugin with these context readings
+      if (!this.funcs.hasProperty(this.accessory.context, 'energyReadings')) {
+        this.accessory.context.energyReadings = []
+      }
+      if (!this.funcs.hasProperty(this.accessory.context, 'energyReadingTotal')) {
+        this.accessory.context.energyReadingTotal = 0
+      }
+
+      // Add the set handler to the outlet eve reset total energy characteristic
+      this.service.getCharacteristic(this.eveChar.ResetTotal).onSet(value => {
+        this.accessory.context.energyReadings = []
+        this.accessory.context.energyReadingTotal = 0
+        this.service.updateCharacteristic(this.eveChar.TotalConsumption, 0)
+      })
+
+      // Set up an interval for the plugin to calculate an approx total consumption
+      this.intervalPower = setInterval(() => {
+        // Every 30 seconds start with a zero reading
+        let total = 0
+
+        // Check we have had readings within the previous 30 seconds
+        if (this.accessory.context.energyReadings.length > 0) {
+          // Accumulate the total from the energy readings
+          this.accessory.context.energyReadings.forEach(x => {
+            total += x
+          })
+
+          // Divide this by the number of entries to get an average W5m
+          total /= this.accessory.context.energyReadings.length
+
+          // Convert this to Wh then kWh
+          total /= 12
+          total /= 1000
+
+          // Accumulate the grand total that Eve reads as the total consumption
+          this.accessory.context.energyReadingTotal += total
+        }
+
+        // Reset the array for each 30 second readings
+        this.accessory.context.energyReadings = []
+
+        // Update Eve with the new grand total
+        this.service.updateCharacteristic(
+          this.eveChar.TotalConsumption,
+          this.accessory.context.energyReadingTotal
+        )
+      }, 30000)
+
+      // Set up an interval to get eWeLink to send power updates
+      setTimeout(() => {
+        this.internalUIUpdate()
+        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
+      }, 5000)
+
+      // Stop the intervals on Homebridge shutdown
+      platform.api.on('shutdown', () => {
+        clearInterval(this.intervalPoll)
+        clearInterval(this.intervalPower)
+      })
+    }
+
     // Output the customised options to the log
     const opts = JSON.stringify({
+      inUsePowerThreshold: this.inUsePowerThreshold,
       logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable'
     })
     this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
@@ -103,10 +216,20 @@ module.exports = class deviceOutletSingle {
       if (newValue === this.cacheState) {
         return
       }
-      await this.platform.sendDeviceUpdate(this.accessory, {
-        switch: newValue
-      })
+      const params = {}
+      if (this.isSCM) {
+        params.switches = [{ switch: newValue, outlet: 0 }]
+      } else {
+        params.switch = newValue
+      }
+      await this.platform.sendDeviceUpdate(this.accessory, params)
       this.cacheState = newValue
+      if (this.powerReadings && !value) {
+        this.service.updateCharacteristic(this.hapChar.OutletInUse, false)
+        this.service.updateCharacteristic(this.eveChar.CurrentConsumption, 0)
+        this.accessory.eveService.addEntry({ power: 0 })
+        this.accessory.context.energyReadings.push(0)
+      }
       if (this.enableLogging) {
         this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
       }
@@ -119,15 +242,83 @@ module.exports = class deviceOutletSingle {
     }
   }
 
+  async internalUIUpdate () {
+    try {
+      // Skip polling if device isn't online
+      if (!this.isOnline) {
+        return
+      }
+
+      // Send the params to request the updates
+      const params = { uiActive: 120 }
+      await this.platform.sendDeviceUpdate(this.accessory, params)
+    } catch (err) {
+      // Suppress errors here
+    }
+  }
+
   async externalUpdate (params) {
     try {
-      if (params.switch && params.switch !== this.cacheState) {
-        this.service.updateCharacteristic(this.hapChar.On, params.switch === 'on')
+      if (!this.isSCM && params.switch && params.switch !== this.cacheState) {
         this.cacheState = params.switch
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
+        if (this.powerReadings && this.cacheState === 'off') {
+          this.service.updateCharacteristic(this.hapChar.OutletInUse, false)
+          this.service.updateCharacteristic(this.eveChar.CurrentConsumption, 0)
+          this.accessory.eveService.addEntry({ power: 0 })
+          this.accessory.context.energyReadings.push(0)
+        }
+        if (params.updateSource && this.enableLogging) {
+          this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
+        }
+      }
+      if (this.isSCM && params.switches && params.switches[0].switch !== this.cacheState) {
+        this.cacheState = params.switches[0].switch
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
         if (params.updateSource && this.enableLogging) {
-          this.log('[%s] %s [%s].', this.name, this.lang.curState, params.switch)
+          this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
         }
       }
+      if (!this.powerReadings) {
+        return
+      }
+      let logger = false
+      if (this.funcs.hasProperty(params, 'power')) {
+        const power = parseFloat(params.power)
+        this.service.updateCharacteristic(
+          this.hapChar.OutletInUse,
+          this.cacheState === 'on' && power > this.inUsePowerThreshold
+        )
+        this.service.updateCharacteristic(this.eveChar.CurrentConsumption, power)
+        this.accessory.eveService.addEntry({
+          power: this.cacheState === 'on' ? power : 0
+        })
+        this.accessory.context.energyReadings.push(power)
+        logger = true
+      }
+      if (this.funcs.hasProperty(params, 'voltage')) {
+        this.service.updateCharacteristic(this.eveChar.Voltage, parseFloat(params.voltage))
+        logger = true
+      }
+      if (this.funcs.hasProperty(params, 'current')) {
+        this.service.updateCharacteristic(this.eveChar.ElectricCurrent, parseFloat(params.current))
+        logger = true
+      }
+      if (params.updateSource && logger && this.enableLogging) {
+        this.log(
+          '[%s] %s%s%s.',
+          this.name,
+          this.funcs.hasProperty(params, 'power')
+            ? this.lang.curPower + ' [' + params.power + 'W]'
+            : '',
+          this.funcs.hasProperty(params, 'voltage')
+            ? ' ' + this.lang.curVolt + ' [' + params.voltage + 'V]'
+            : '',
+          this.funcs.hasProperty(params, 'current')
+            ? ' ' + this.lang.curCurr + ' [' + params.current + 'A]'
+            : ''
+        )
+      }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
diff --git a/lib/device/switch-scm.js b/lib/device/switch-scm.js
deleted file mode 100644
index 52188e44..00000000
--- a/lib/device/switch-scm.js
+++ /dev/null
@@ -1,128 +0,0 @@
-/* jshint -W014, -W033, esversion: 9 */
-/* eslint-disable new-cap */
-'use strict'
-
-module.exports = class deviceSwitchSCM {
-  constructor (platform, accessory) {
-    // Set up variables from the platform
-    this.hapChar = platform.api.hap.Characteristic
-    this.hapErr = platform.api.hap.HapStatusError
-    this.hapServ = platform.api.hap.Service
-    this.lang = platform.lang
-    this.log = platform.log
-    this.platform = platform
-
-    // Set up variables from the accessory
-    this.name = accessory.displayName
-    this.accessory = accessory
-
-    // Initially set the online flag as true (to be then updated as false if necessary)
-    this.isOnline = true
-
-    // Set up custom variables for this device type
-    const deviceConf = platform.outletDevices[accessory.context.eweDeviceId]
-    // Set the correct logging variables for this accessory
-    this.enableLogging = !platform.config.disableDeviceLogging
-    this.enableDebugLogging = platform.config.debug
-    if (deviceConf && deviceConf.overrideLogging) {
-      switch (deviceConf.overrideLogging) {
-        case 'standard':
-          this.enableLogging = true
-          this.enableDebugLogging = false
-          break
-        case 'debug':
-          this.enableLogging = true
-          this.enableDebugLogging = true
-          break
-        case 'disable':
-          this.enableLogging = false
-          this.enableDebugLogging = false
-          break
-      }
-    }
-
-    // User has chosen switch so if the accessory has an outlet service then remove it
-    if (this.accessory.getService(this.hapServ.Outlet)) {
-      this.accessory.removeService(this.accessory.getService(this.hapServ.Outlet))
-    }
-
-    // Add the switch service if it doesn't already exist
-    this.service =
-      this.accessory.getService(this.hapServ.Switch) ||
-      this.accessory.addService(this.hapServ.Switch)
-
-    // Add the set handler to the switch/outlet on/off characteristic
-    this.service
-      .getCharacteristic(this.hapChar.On)
-      .onSet(async value => await this.internalStateUpdate(value))
-
-    // Add the get handlers only if the user has configured the offlineAsNoResponse setting
-    if (platform.config.offlineAsNoResponse) {
-      this.service.getCharacteristic(this.hapChar.On).onGet(() => {
-        if (!this.isOnline) {
-          throw new this.hapErr(-70402)
-        }
-        return this.service.getCharacteristic(this.hapChar.On).value
-      })
-    }
-
-    // Output the customised options to the log
-    const opts = JSON.stringify({
-      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable'
-    })
-    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
-  }
-
-  async internalStateUpdate (value) {
-    try {
-      const newValue = value ? 'on' : 'off'
-      if (newValue === this.cacheState) {
-        return
-      }
-      const params = {
-        switches: [{ switch: newValue, outlet: 0 }]
-      }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.cacheState = newValue
-      if (this.enableLogging) {
-        this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
-      }
-    } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
-      setTimeout(() => {
-        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
-      }, 2000)
-      throw new this.hapErr(-70402)
-    }
-  }
-
-  async externalUpdate (params) {
-    try {
-      if (!params.switches || params.switches[0].switch === this.cacheState) {
-        return
-      }
-      const newStatus = params.switches[0].switch === 'on'
-      this.service.updateCharacteristic(this.hapChar.On, newStatus)
-      this.cacheState = params.switches[0].switch
-      if (params.updateSource && this.enableLogging) {
-        this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
-      }
-    } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, false)
-    }
-  }
-
-  markStatus (isOnline) {
-    this.isOnline = isOnline
-  }
-
-  currentState () {
-    const toReturn = {}
-    const service = 'switch'
-    toReturn.services = [service]
-    toReturn[service] = {
-      state: this.service.getCharacteristic(this.hapChar.On).value ? 'on' : 'off'
-    }
-    return toReturn
-  }
-}
diff --git a/lib/device/switch-single.js b/lib/device/switch-single.js
index 038b71ad..4abc6d7e 100644
--- a/lib/device/switch-single.js
+++ b/lib/device/switch-single.js
@@ -5,6 +5,8 @@
 module.exports = class deviceSwitchSingle {
   constructor (platform, accessory) {
     // Set up variables from the platform
+    this.eveChar = platform.eveChar
+    this.funcs = platform.funcs
     this.hapChar = platform.api.hap.Characteristic
     this.hapErr = platform.api.hap.HapStatusError
     this.hapServ = platform.api.hap.Service
@@ -19,8 +21,20 @@ module.exports = class deviceSwitchSingle {
     // Initially set the online flag as true (to be then updated as false if necessary)
     this.isOnline = true
 
+    /*
+    UIID 1: single switch, no power readings
+    UIID 5: single switch, with wattage readings
+    UIID 32: single switch, with wattage, voltage and amp readings
+    UIID 77/78/81/107: single switch but firmware uses multiple channels (only need CH0)
+    */
+
     // Set up custom variables for this device type
-    const deviceConf = platform.singleDevices[accessory.context.eweDeviceId]
+    let deviceConf
+    if (platform.singleDevices[accessory.context.eweDeviceId]) {
+      deviceConf = platform.singleDevices[accessory.context.eweDeviceId]
+    } else if (platform.outletDevices[accessory.context.eweDeviceId]) {
+      deviceConf = platform.outletDevices[accessory.context.eweDeviceId]
+    }
 
     // Set the correct logging variables for this accessory
     this.enableLogging = !platform.config.disableDeviceLogging
@@ -52,6 +66,35 @@ module.exports = class deviceSwitchSingle {
       this.accessory.getService(this.hapServ.Switch) ||
       this.accessory.addService(this.hapServ.Switch)
 
+    switch (this.accessory.context.eweUIID) {
+      case 5:
+        // Add Eve power characteristic
+        this.powerReadings = true
+        if (!this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
+          this.service.addCharacteristic(this.eveChar.CurrentConsumption)
+        }
+        break
+      case 32:
+        // Add Eve power characteristic
+        this.powerReadings = true
+        if (!this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
+          this.service.addCharacteristic(this.eveChar.CurrentConsumption)
+        }
+        if (!this.service.testCharacteristic(this.eveChar.ElectricCurrent)) {
+          this.service.addCharacteristic(this.eveChar.ElectricCurrent)
+        }
+        if (!this.service.testCharacteristic(this.eveChar.Voltage)) {
+          this.service.addCharacteristic(this.eveChar.Voltage)
+        }
+        break
+      case 77:
+      case 78:
+      case 81:
+      case 107:
+        this.isSCM = true
+        break
+    }
+
     // Add the set handler to the switch on/off characteristic
     this.service
       .getCharacteristic(this.hapChar.On)
@@ -85,10 +128,17 @@ module.exports = class deviceSwitchSingle {
       if (newValue === this.cacheState) {
         return
       }
-      await this.platform.sendDeviceUpdate(this.accessory, {
-        switch: newValue
-      })
+      const params = {}
+      if (this.isSCM) {
+        params.switches = [{ switch: newValue, outlet: 0 }]
+      } else {
+        params.switch = newValue
+      }
+      await this.platform.sendDeviceUpdate(this.accessory, params)
       this.cacheState = newValue
+      if (!value && this.powerReadings) {
+        this.service.updateCharacteristic(this.eveChar.CurrentConsumption, 0)
+      }
       this.accessory.eveService.addEntry({ status: value ? 1 : 0 })
       if (this.enableLogging) {
         this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
@@ -104,15 +154,52 @@ module.exports = class deviceSwitchSingle {
 
   async externalUpdate (params) {
     try {
-      if (!params.switch || params.switch === this.cacheState) {
+      if (!this.isSCM && params.switch && params.switch !== this.cacheState) {
+        this.cacheState = params.switch
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
+        this.accessory.eveService.addEntry({ status: this.cacheState === 'on' ? 1 : 0 })
+        if (params.updateSource && this.enableLogging) {
+          this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
+        }
+      }
+      if (this.isSCM && params.switches && params.switches[0].switch !== this.cacheState) {
+        this.cacheState = params.switches[0].switch
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
+        this.accessory.eveService.addEntry({ status: this.cacheState === 'on' ? 1 : 0 })
+        if (params.updateSource && this.enableLogging) {
+          this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
+        }
+      }
+      if (!this.powerReadings) {
         return
       }
-      const newStatus = params.switch === 'on'
-      this.service.updateCharacteristic(this.hapChar.On, newStatus)
-      this.cacheState = params.switch
-      this.accessory.eveService.addEntry({ status: newStatus ? 1 : 0 })
-      if (params.updateSource && this.enableLogging) {
-        this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
+      let logger = false
+      if (this.funcs.hasProperty(params, 'power')) {
+        this.service.updateCharacteristic(this.eveChar.CurrentConsumption, parseFloat(params.power))
+        logger = true
+      }
+      if (this.funcs.hasProperty(params, 'voltage')) {
+        this.service.updateCharacteristic(this.eveChar.Voltage, parseFloat(params.voltage))
+        logger = true
+      }
+      if (this.funcs.hasProperty(params, 'current')) {
+        this.service.updateCharacteristic(this.eveChar.ElectricCurrent, parseFloat(params.current))
+        logger = true
+      }
+      if (params.updateSource && logger && this.enableLogging) {
+        this.log(
+          '[%s] %s%s%s.',
+          this.name,
+          this.funcs.hasProperty(params, 'power')
+            ? this.lang.curPower + ' [' + params.power + 'W]'
+            : '',
+          this.funcs.hasProperty(params, 'voltage')
+            ? ' ' + this.lang.curVolt + ' [' + params.voltage + 'V]'
+            : '',
+          this.funcs.hasProperty(params, 'current')
+            ? ' ' + this.lang.curCurr + ' [' + params.current + 'A]'
+            : ''
+        )
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
diff --git a/lib/index.js b/lib/index.js
index 6ffa3196..d1b1cd78 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1037,36 +1037,6 @@ class eWeLinkPlatform {
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/sensor-temp-humi'))(this, accessory)
         /************************/
-      } else if (this.consts.devices.outlet.includes(uiid)) {
-        /****************************
-        OUTLETS [WITH POWER READINGS]
-        ****************************/
-        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control =
-          this.outletDevices[device.deviceid] && this.outletDevices[device.deviceid].showAsSwitch
-            ? new (require('./device/switch-single'))(this, accessory)
-            : new (require('./device/outlet-power'))(this, accessory)
-        /***************************/
-      } else if (this.consts.devices.outletSCM.includes(uiid)) {
-        /*************************************
-        OUTLETS [SINGLE BUT MULTIPLE HARDWARE]
-        *************************************/
-        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control =
-          this.outletDevices[device.deviceid] && this.outletDevices[device.deviceid].showAsSwitch
-            ? new (require('./device/switch-scm'))(this, accessory)
-            : new (require('./device/outlet-scm'))(this, accessory)
-        /************************************/
-      } else if (this.consts.devices.singleSwitchOutlet.includes(device.productModel)) {
-        /******
-        OUTLETS
-        ******/
-        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control =
-          this.outletDevices[device.deviceid] && this.outletDevices[device.deviceid].showAsSwitch
-            ? new (require('./device/switch-single'))(this, accessory)
-            : new (require('./device/outlet-single'))(this, accessory)
-        /*****/
       } else if (this.consts.devices.lightRGB.includes(uiid)) {
         /***********
         LIGHTS [RGB]
@@ -1095,6 +1065,20 @@ class eWeLinkPlatform {
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/light-dimmer'))(this, accessory)
         /*************/
+      } else if (
+        this.consts.devices.outlet.includes(uiid) ||
+        this.consts.devices.outletSCM.includes(uiid) ||
+        this.consts.devices.singleSwitchOutlet.includes(device.productModel)
+      ) {
+        /***********************
+        OUTLETS [SINGLE CHANNEL]
+        ***********************/
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
+        accessory.control =
+          this.outletDevices[device.deviceid] && this.outletDevices[device.deviceid].showAsSwitch
+            ? new (require('./device/switch-single'))(this, accessory)
+            : new (require('./device/outlet-single'))(this, accessory)
+        /**********************/
       } else if (this.consts.devices.singleSwitch.includes(uiid)) {
         /************************
         SWITCHES [SINGLE CHANNEL]

From 86c2561fd8393fdc4814a2db3f241626a49b6535 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 26 Jun 2021 10:04:18 +0100
Subject: [PATCH 2374/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9b2777e2..fbfdbf64 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,10 @@ All notable changes to this homebridge-ewelink will be documented in this file.
   - An accessory warning if a cloud-device is reported offline
 - **No Response Status**
   - Added a global setting `offlineAsNoResponse` to mark cloud-offline accessories as 'No Response' in HomeKit
+- **Single/Multi-Channel Devices**
+  - Wattage/Voltage/Amp readings (via Eve app) now visible for outlets in Eve app when exposed as `Switch`
+  - Support for LAN mode control for DUALR3 in motor mode
+  - Polling via LAN mode to enable constant power attribute updates for POWR2 devices
 - **iFan Devices**
   - Support for LAN mode control
   - Added option to specify a manual IP
@@ -28,10 +32,6 @@ All notable changes to this homebridge-ewelink will be documented in this file.
   - Implemented polling as firmware 3.5.0 does not seem to send regular temperature updates
   - Implemented LAN mode for Accessory Simulations (eWeLink 'auto' mode is no longer used)
   - Added option to specify a manual IP
-- **POW/DUAL Devices**
-  - Support for LAN mode control for DUALR3 in motor mode
-  - Polling via LAN mode to enable constant power attribute updates for POWR2 devices
-  - Reinstate power readings in the Eve app for Sonoff POW(R1) devices
 - **RF Bridge Devices**
   - Ability to change sensor type and other configurable options without the need to re-add the accessory
   - Configuration option `resetOnStartup` to reset the subdevices, useful when adding/removing subdevices to the bridge

From 8acf6587ba6ea48d99bd8814061d8462e3939c58 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 26 Jun 2021 10:30:54 +0100
Subject: [PATCH 2375/3183] polling for switch-single if give power readings

---
 lib/device/outlet-single.js |  2 +-
 lib/device/switch-single.js | 32 +++++++++++++++++++++++++++++++-
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/lib/device/outlet-single.js b/lib/device/outlet-single.js
index c7119d49..82f2c0ee 100644
--- a/lib/device/outlet-single.js
+++ b/lib/device/outlet-single.js
@@ -22,7 +22,7 @@ module.exports = class deviceOutletSingle {
     this.isOnline = true
 
     /*
-    UIID 1: single switch, no power readings
+    UIID 1/6/14/24/27/112: single switch, no power readings
     UIID 5: single switch, with wattage readings
     UIID 32: single switch, with wattage, voltage and amp readings
     UIID 77/78/81/107: single switch but firmware uses multiple channels (only need CH0)
diff --git a/lib/device/switch-single.js b/lib/device/switch-single.js
index 4abc6d7e..1d871726 100644
--- a/lib/device/switch-single.js
+++ b/lib/device/switch-single.js
@@ -22,7 +22,7 @@ module.exports = class deviceSwitchSingle {
     this.isOnline = true
 
     /*
-    UIID 1: single switch, no power readings
+    UIID 1/6/14/24/27/112: single switch, no power readings
     UIID 5: single switch, with wattage readings
     UIID 32: single switch, with wattage, voltage and amp readings
     UIID 77/78/81/107: single switch but firmware uses multiple channels (only need CH0)
@@ -115,6 +115,21 @@ module.exports = class deviceSwitchSingle {
       log: platform.config.debugFakegato ? this.log : () => {}
     })
 
+    // Set up extra features for outlets that provide power readings
+    if (this.powerReadings) {
+      // Set up an interval to get eWeLink to send power updates
+      setTimeout(() => {
+        this.internalUIUpdate()
+        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
+      }, 5000)
+
+      // Stop the intervals on Homebridge shutdown
+      platform.api.on('shutdown', () => {
+        clearInterval(this.intervalPoll)
+        clearInterval(this.intervalPower)
+      })
+    }
+
     // Output the customised options to the log
     const opts = JSON.stringify({
       logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable'
@@ -152,6 +167,21 @@ module.exports = class deviceSwitchSingle {
     }
   }
 
+  async internalUIUpdate () {
+    try {
+      // Skip polling if device isn't online
+      if (!this.isOnline) {
+        return
+      }
+
+      // Send the params to request the updates
+      const params = { uiActive: 120 }
+      await this.platform.sendDeviceUpdate(this.accessory, params)
+    } catch (err) {
+      // Suppress errors here
+    }
+  }
+
   async externalUpdate (params) {
     try {
       if (!this.isSCM && params.switch && params.switch !== this.cacheState) {

From 709ba1cb2998d7b4fce528a9141e4c827dd99f8a Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 26 Jun 2021 11:05:34 +0100
Subject: [PATCH 2376/3183] simplify generic multi channel device types

---
 lib/device/outlet-double.js | 358 ------------------------------------
 lib/device/outlet-multi.js  | 210 ++++++++++++++++-----
 lib/device/outlet-single.js |   6 +-
 lib/device/switch-double.js | 236 ------------------------
 lib/device/switch-multi.js  | 138 +++++++++++---
 lib/device/switch-single.js |   3 +-
 lib/index.js                |  23 +--
 lib/utils/constants.js      |   3 +-
 8 files changed, 300 insertions(+), 677 deletions(-)
 delete mode 100644 lib/device/outlet-double.js
 delete mode 100644 lib/device/switch-double.js

diff --git a/lib/device/outlet-double.js b/lib/device/outlet-double.js
deleted file mode 100644
index 944f881d..00000000
--- a/lib/device/outlet-double.js
+++ /dev/null
@@ -1,358 +0,0 @@
-/* jshint -W014, -W033, esversion: 9 */
-/* eslint-disable new-cap */
-'use strict'
-
-module.exports = class deviceOutletDouble {
-  constructor (platform, accessory, devicesInHB) {
-    // Set up variables from the platform
-    this.devicesInHB = devicesInHB
-    this.eveChar = platform.eveChar
-    this.funcs = platform.funcs
-    this.hapChar = platform.api.hap.Characteristic
-    this.hapErr = platform.api.hap.HapStatusError
-    this.hapServ = platform.api.hap.Service
-    this.hapUUIDGen = platform.api.hap.uuid.generate
-    this.lang = platform.lang
-    this.log = platform.log
-    this.platform = platform
-
-    // Set up variables from the accessory
-    this.name = accessory.displayName
-    this.accessory = accessory
-
-    // Initially set the online flag as true (to be then updated as false if necessary)
-    this.isOnline = true
-
-    // Set up custom variables for this device type
-    const deviceConf = platform.multiDevices[accessory.context.eweDeviceId]
-    this.hideChannels = deviceConf && deviceConf.hideChannels ? deviceConf.hideChannels : undefined
-    this.inUsePowerThreshold =
-      deviceConf && deviceConf.inUsePowerThreshold
-        ? deviceConf.inUsePowerThreshold
-        : platform.consts.defaultValues.inUsePowerThreshold
-
-    // Set the correct logging variables for this accessory
-    this.enableLogging = !platform.config.disableDeviceLogging
-    this.enableDebugLogging = platform.config.debug
-    if (deviceConf && deviceConf.overrideLogging) {
-      switch (deviceConf.overrideLogging) {
-        case 'standard':
-          this.enableLogging = true
-          this.enableDebugLogging = false
-          break
-        case 'debug':
-          this.enableLogging = true
-          this.enableDebugLogging = true
-          break
-        case 'disable':
-          this.enableLogging = false
-          this.enableDebugLogging = false
-          break
-      }
-    }
-
-    // If the accessory has a switch service then remove it
-    if (this.accessory.getService(this.hapServ.Switch)) {
-      this.accessory.removeService(this.accessory.getService(this.hapServ.Switch))
-    }
-
-    // Add the outlet service if it doesn't already exist
-    if (!(this.service = this.accessory.getService(this.hapServ.Outlet))) {
-      this.service = this.accessory.addService(this.hapServ.Outlet)
-      if (accessory.context.switchNumber !== '0') {
-        this.service.addCharacteristic(this.eveChar.Voltage)
-        this.service.addCharacteristic(this.eveChar.CurrentConsumption)
-        this.service.addCharacteristic(this.eveChar.ElectricCurrent)
-      }
-    }
-
-    // Remove unneeded characteristics
-    if (this.service.testCharacteristic(this.eveChar.TotalConsumption)) {
-      this.service.removeCharacteristic(
-        this.service.getCharacteristic(this.eveChar.TotalConsumption)
-      )
-    }
-    if (this.service.testCharacteristic(this.eveChar.ResetTotal)) {
-      this.service.removeCharacteristic(this.service.getCharacteristic(this.eveChar.ResetTotal))
-    }
-
-    // Add the set handler to the switch/outlet on/off characteristic
-    this.service
-      .getCharacteristic(this.hapChar.On)
-      .onSet(async value => await this.internalStateUpdate(value))
-
-    // Add the get handlers only if the user has configured the offlineAsNoResponse setting
-    if (platform.config.offlineAsNoResponse) {
-      this.service.getCharacteristic(this.hapChar.On).onGet(() => {
-        if (!this.isOnline) {
-          throw new this.hapErr(-70402)
-        }
-        return this.service.getCharacteristic(this.hapChar.On).value
-      })
-    }
-
-    // Pass the accessory to Fakegato to set up with Eve
-    this.accessory.eveService = new platform.eveService('custom', this.accessory, {
-      log: platform.config.debugFakegato ? this.log : () => {}
-    })
-
-    if (accessory.context.switchNumber === '0') {
-      // Set up an interval to get eWeLink to send regular power info updates
-      if (platform.config.mode !== 'lan') {
-        setTimeout(() => {
-          this.internalUIUpdate()
-          this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
-        }, 5000)
-
-        // Stop the intervals on Homebridge shutdown
-        platform.api.on('shutdown', () => {
-          clearInterval(this.intervalPoll)
-        })
-      }
-
-      // Remove power characteristics from the main accessory
-      if (this.service.testCharacteristic(this.hapChar.OutletInUse)) {
-        this.service.removeCharacteristic(this.service.getCharacteristic(this.hapChar.OutletInUse))
-      }
-      if (this.service.testCharacteristic(this.eveChar.Voltage)) {
-        this.service.removeCharacteristic(this.service.getCharacteristic(this.eveChar.Voltage))
-      }
-      if (this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
-        this.service.removeCharacteristic(
-          this.service.getCharacteristic(this.eveChar.CurrentConsumption)
-        )
-      }
-      if (this.service.testCharacteristic(this.eveChar.ElectricCurrent)) {
-        this.service.removeCharacteristic(
-          this.service.getCharacteristic(this.eveChar.ElectricCurrent)
-        )
-      }
-
-      // Output the customised options to the log
-      const opts = JSON.stringify({
-        hideChannels: this.hideChannels,
-        inUsePowerThreshold: this.inUsePowerThreshold,
-        logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable'
-      })
-      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
-    }
-  }
-
-  async internalStateUpdate (value) {
-    try {
-      let primaryState = false
-      const params = {
-        switches: []
-      }
-      const switchNumber = this.accessory.context.switchNumber
-      switch (switchNumber) {
-        case '0':
-          params.switches.push({ switch: value ? 'on' : 'off', outlet: 0 })
-          params.switches.push({ switch: value ? 'on' : 'off', outlet: 1 })
-          break
-        case '1':
-        case '2':
-          params.switches.push({
-            switch: value ? 'on' : 'off',
-            outlet: switchNumber - 1
-          })
-          break
-      }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
-      switch (switchNumber) {
-        case '0':
-          for (let i = 0; i <= 2; i++) {
-            const idToCheck = this.accessory.context.eweDeviceId + 'SW' + i
-            const uuid = this.hapUUIDGen(idToCheck)
-            if (this.devicesInHB.has(uuid)) {
-              const subAccessory = this.devicesInHB.get(uuid)
-              const service = subAccessory.getService(this.hapServ.Outlet)
-              service.updateCharacteristic(this.hapChar.On, value)
-              subAccessory.eveService.addEntry({ status: value ? 1 : 0 })
-              if (i > 0) {
-                if (!value) {
-                  service.updateCharacteristic(this.hapChar.OutletInUse, false)
-                  service.updateCharacteristic(this.eveChar.CurrentConsumption, 0)
-                  subAccessory.eveService.addEntry({ power: 0 })
-                }
-                if (this.enableLogging) {
-                  this.log(
-                    '[%s] %s [%s].',
-                    subAccessory.displayName,
-                    this.lang.curState,
-                    value ? 'on' : 'off'
-                  )
-                }
-              }
-            }
-          }
-          break
-        case '1':
-        case '2':
-          for (let i = 1; i <= 2; i++) {
-            const idToCheck = this.accessory.context.eweDeviceId + 'SW' + i
-            const uuid = this.hapUUIDGen(idToCheck)
-            if (this.devicesInHB.has(uuid)) {
-              const subAccessory = this.devicesInHB.get(uuid)
-              const service = subAccessory.getService(this.hapServ.Outlet)
-              if (i === parseInt(switchNumber)) {
-                if (value) {
-                  primaryState = true
-                }
-                subAccessory.eveService.addEntry({ status: value ? 1 : 0 })
-                if (i > 0) {
-                  if (!value) {
-                    service.updateCharacteristic(this.hapChar.OutletInUse, false)
-                    service.updateCharacteristic(this.eveChar.CurrentConsumption, 0)
-                    subAccessory.eveService.addEntry({ power: 0 })
-                  }
-                  if (this.enableLogging) {
-                    this.log(
-                      '[%s] %s [%s].',
-                      subAccessory.displayName,
-                      this.lang.curState,
-                      value ? 'on' : 'off'
-                    )
-                  }
-                }
-              } else {
-                if (service.getCharacteristic(this.hapChar.On).value) {
-                  primaryState = true
-                }
-              }
-            }
-          }
-          if (!this.platform.hideMasters.includes(this.accessory.context.eweDeviceId)) {
-            const idToCheck = this.accessory.context.eweDeviceId + 'SW0'
-            const uuid = this.hapUUIDGen(idToCheck)
-            const priAccessory = this.devicesInHB.get(uuid)
-            priAccessory
-              .getService(this.hapServ.Outlet)
-              .updateCharacteristic(this.hapChar.On, primaryState)
-            priAccessory.eveService.addEntry({ status: primaryState ? 1 : 0 })
-          }
-          break
-      }
-    } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
-      setTimeout(() => {
-        this.service.updateCharacteristic(this.hapChar.On, !value)
-      }, 2000)
-      throw new this.hapErr(-70402)
-    }
-  }
-
-  async internalUIUpdate () {
-    try {
-      // Skip polling if device isn't online
-      if (!this.isOnline) {
-        return
-      }
-
-      // Send the params to request the updates
-      await this.platform.sendDeviceUpdate(this.accessory, { uiActive: { outlet: 0, time: 120 } })
-      await this.funcs.sleep(2000)
-      await this.platform.sendDeviceUpdate(this.accessory, { uiActive: { outlet: 1, time: 120 } })
-    } catch (err) {
-      // Suppress errors here
-    }
-  }
-
-  async externalUpdate (params) {
-    try {
-      const idToCheck = this.accessory.context.eweDeviceId + 'SW'
-      let primaryState = false
-      for (let i = 1; i <= 2; i++) {
-        const uuid = this.hapUUIDGen(idToCheck + i)
-        if (this.devicesInHB.has(uuid)) {
-          const subAccessory = this.devicesInHB.get(uuid)
-          const service = subAccessory.getService(this.hapServ.Outlet)
-          if (params.switches) {
-            if (params.switches[i - 1].switch === 'on') {
-              primaryState = true
-            }
-            const currentState = service.getCharacteristic(this.hapChar.On).value ? 'on' : 'off'
-            if (!params.updateSource || params.switches[i - 1].switch !== currentState) {
-              service.updateCharacteristic(this.hapChar.On, params.switches[i - 1].switch === 'on')
-              subAccessory.eveService.addEntry({
-                status: params.switches[i - 1].switch === 'on' ? 1 : 0
-              })
-              if (params.switches[i - 1].switch === 'off') {
-                service.updateCharacteristic(this.hapChar.OutletInUse, false)
-                service.updateCharacteristic(this.eveChar.CurrentConsumption, 0)
-                subAccessory.eveService.addEntry({ power: 0 })
-              }
-              if (params.updateSource && this.enableLogging) {
-                this.log(
-                  '[%s] %s [%s].',
-                  subAccessory.displayName,
-                  this.lang.curState,
-                  params.switches[i - 1].switch
-                )
-              }
-            }
-          }
-          let logger = false
-          let power
-          let voltage
-          let current
-          if (this.funcs.hasProperty(params, 'actPow_0' + (i - 1))) {
-            const isOn = service.getCharacteristic(this.hapChar.On).value
-            power = parseInt(params['actPow_0' + (i - 1)]) / 100
-            service.updateCharacteristic(
-              this.hapChar.OutletInUse,
-              isOn && power > this.inUsePowerThreshold
-            )
-            if (!primaryState && power > this.inUsePowerThreshold) {
-              primaryState = true
-            }
-            service.updateCharacteristic(this.eveChar.CurrentConsumption, power)
-            subAccessory.eveService.addEntry({ power: isOn ? power : 0 })
-            logger = true
-          }
-          if (this.funcs.hasProperty(params, 'voltage_0' + (i - 1))) {
-            voltage = parseInt(params['voltage_0' + (i - 1)]) / 100
-            service.updateCharacteristic(this.eveChar.Voltage, voltage)
-            logger = true
-          }
-          if (this.funcs.hasProperty(params, 'current_0' + (i - 1))) {
-            current = parseInt(params['current_0' + (i - 1)]) / 100
-            service.updateCharacteristic(this.eveChar.ElectricCurrent, current)
-            logger = true
-          }
-          if (params.updateSource && logger && this.enableLogging) {
-            this.log(
-              '[%s] %s%s%s.',
-              subAccessory.displayName,
-              power !== undefined ? this.lang.curPower + ' [' + power + 'W]' : '',
-              voltage !== undefined ? ' ' + this.lang.curVolt + ' [' + voltage + 'V]' : '',
-              current !== undefined ? ' ' + this.lang.curCurr + ' [' + current + 'A]' : ''
-            )
-          }
-        }
-      }
-      if (
-        !this.platform.hideMasters.includes(this.accessory.context.eweDeviceId) &&
-        params.switches
-      ) {
-        this.service.updateCharacteristic(this.hapChar.On, primaryState)
-        this.accessory.eveService.addEntry({ status: primaryState ? 1 : 0 })
-      }
-    } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, false)
-    }
-  }
-
-  markStatus (isOnline) {
-    this.isOnline = isOnline
-  }
-
-  currentState () {
-    const toReturn = {}
-    toReturn.services = ['outlet']
-    toReturn.outlet = {
-      state: this.service.getCharacteristic(this.hapChar.On).value ? 'on' : 'off'
-    }
-    return toReturn
-  }
-}
diff --git a/lib/device/outlet-multi.js b/lib/device/outlet-multi.js
index a87d87ea..7a37eb11 100644
--- a/lib/device/outlet-multi.js
+++ b/lib/device/outlet-multi.js
@@ -2,10 +2,11 @@
 /* eslint-disable new-cap */
 'use strict'
 
-module.exports = class deviceOutletMulti {
+module.exports = class deviceOutletDouble {
   constructor (platform, accessory, devicesInHB) {
     // Set up variables from the platform
     this.devicesInHB = devicesInHB
+    this.eveChar = platform.eveChar
     this.funcs = platform.funcs
     this.hapChar = platform.api.hap.Characteristic
     this.hapErr = platform.api.hap.HapStatusError
@@ -22,6 +23,11 @@ module.exports = class deviceOutletMulti {
     // Initially set the online flag as true (to be then updated as false if necessary)
     this.isOnline = true
 
+    /*
+    UIID 2/3/4/7/8/9/29/30/31/41/82/83/84/113/114: multi switch, no power readings
+    UIID 126: multi switch, with wattage, voltage and amp readings (DUALR3)
+    */
+
     // Set up custom variables for this device type
     const deviceConf = platform.multiDevices[accessory.context.eweDeviceId]
     this.hideChannels = deviceConf && deviceConf.hideChannels ? deviceConf.hideChannels : undefined
@@ -56,12 +62,29 @@ module.exports = class deviceOutletMulti {
       this.accessory.getService(this.hapServ.Outlet) ||
       this.accessory.addService(this.hapServ.Outlet)
 
-    // Remove any OutletInUse characteristics from previous plugin versions
-    if (this.service.testCharacteristic(this.hapChar.OutletInUse)) {
-      this.service.removeCharacteristic(this.service.getCharacteristic(this.hapChar.OutletInUse))
+    switch (this.accessory.context.eweUIID) {
+      case 126:
+        // Add Eve power characteristic
+        this.powerReadings = true
+        this.isDual = true
+        if (accessory.context.switchNumber !== '0') {
+          if (!this.service.testCharacteristic(this.hapChar.OutletInUse)) {
+            this.service.addCharacteristic(this.hapChar.OutletInUse)
+          }
+          if (!this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
+            this.service.addCharacteristic(this.eveChar.CurrentConsumption)
+          }
+          if (!this.service.testCharacteristic(this.eveChar.ElectricCurrent)) {
+            this.service.addCharacteristic(this.eveChar.ElectricCurrent)
+          }
+          if (!this.service.testCharacteristic(this.eveChar.Voltage)) {
+            this.service.addCharacteristic(this.eveChar.Voltage)
+          }
+        }
+        break
     }
 
-    // Add the set handler to the switch/outlet on/off characteristic
+    // Add the set handler to the outlet on/off characteristic
     this.service
       .getCharacteristic(this.hapChar.On)
       .onSet(async value => await this.internalStateUpdate(value))
@@ -76,11 +99,34 @@ module.exports = class deviceOutletMulti {
       })
     }
 
+    // Pass the accessory to Fakegato to set up with Eve
+    this.accessory.eveService = new platform.eveService('energy', this.accessory, {
+      log: platform.config.debugFakegato ? this.log : () => {}
+    })
+
+    // Set up extra features for outlets that provide power readings
+    if (this.powerReadings && accessory.context.switchNumber === '0') {
+      // Set up an interval to get eWeLink to send power updates
+      if (platform.config.mode !== 'lan') {
+        setTimeout(() => {
+          this.internalUIUpdate()
+          this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
+        }, 5000)
+
+        // Stop the intervals on Homebridge shutdown
+        platform.api.on('shutdown', () => {
+          clearInterval(this.intervalPoll)
+        })
+      }
+    }
+
     // Output the customised options to the log
     if (accessory.context.switchNumber === '0') {
       const opts = JSON.stringify({
         hideChannels: this.hideChannels,
-        logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable'
+        inUsePowerThreshold: this.inUsePowerThreshold,
+        logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
+        showAsType: 'outlet'
       })
       this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
     }
@@ -97,8 +143,10 @@ module.exports = class deviceOutletMulti {
         case '0':
           params.switches.push({ switch: value ? 'on' : 'off', outlet: 0 })
           params.switches.push({ switch: value ? 'on' : 'off', outlet: 1 })
-          params.switches.push({ switch: value ? 'on' : 'off', outlet: 2 })
-          params.switches.push({ switch: value ? 'on' : 'off', outlet: 3 })
+          if (!this.isDual) {
+            params.switches.push({ switch: value ? 'on' : 'off', outlet: 2 })
+            params.switches.push({ switch: value ? 'on' : 'off', outlet: 3 })
+          }
           break
         case '1':
         case '2':
@@ -118,16 +166,23 @@ module.exports = class deviceOutletMulti {
             const uuid = this.hapUUIDGen(idToCheck)
             if (this.devicesInHB.has(uuid)) {
               const subAccessory = this.devicesInHB.get(uuid)
-              subAccessory
-                .getService(this.hapServ.Outlet)
-                .updateCharacteristic(this.hapChar.On, value)
-              if (i > 0 && this.enableLogging) {
-                this.log(
-                  '[%s] %s [%s].',
-                  subAccessory.displayName,
-                  this.lang.curState,
-                  value ? 'on' : 'off'
-                )
+              const service = subAccessory.getService(this.hapServ.Outlet)
+              service.updateCharacteristic(this.hapChar.On, value)
+              subAccessory.eveService.addEntry({ status: value ? 1 : 0 })
+              if (i > 0) {
+                if (this.powerReadings && !value) {
+                  service.updateCharacteristic(this.hapChar.OutletInUse, false)
+                  service.updateCharacteristic(this.eveChar.CurrentConsumption, 0)
+                  subAccessory.eveService.addEntry({ power: 0 })
+                }
+                if (this.enableLogging) {
+                  this.log(
+                    '[%s] %s [%s].',
+                    subAccessory.displayName,
+                    this.lang.curState,
+                    value ? 'on' : 'off'
+                  )
+                }
               }
             }
           }
@@ -141,23 +196,29 @@ module.exports = class deviceOutletMulti {
             const uuid = this.hapUUIDGen(idToCheck)
             if (this.devicesInHB.has(uuid)) {
               const subAccessory = this.devicesInHB.get(uuid)
+              const service = subAccessory.getService(this.hapServ.Outlet)
               if (i === parseInt(switchNumber)) {
                 if (value) {
                   primaryState = true
                 }
-                if (i > 0 && this.enableLogging) {
-                  this.log(
-                    '[%s] %s [%s].',
-                    subAccessory.displayName,
-                    this.lang.curState,
-                    value ? 'on' : 'off'
-                  )
+                subAccessory.eveService.addEntry({ status: value ? 1 : 0 })
+                if (i > 0) {
+                  if (this.powerReadings && !value) {
+                    service.updateCharacteristic(this.hapChar.OutletInUse, false)
+                    service.updateCharacteristic(this.eveChar.CurrentConsumption, 0)
+                    subAccessory.eveService.addEntry({ power: 0 })
+                  }
+                  if (this.enableLogging) {
+                    this.log(
+                      '[%s] %s [%s].',
+                      subAccessory.displayName,
+                      this.lang.curState,
+                      value ? 'on' : 'off'
+                    )
+                  }
                 }
               } else {
-                if (
-                  subAccessory.getService(this.hapServ.Outlet).getCharacteristic(this.hapChar.On)
-                    .value
-                ) {
+                if (service.getCharacteristic(this.hapChar.On).value) {
                   primaryState = true
                 }
               }
@@ -170,6 +231,7 @@ module.exports = class deviceOutletMulti {
             priAccessory
               .getService(this.hapServ.Outlet)
               .updateCharacteristic(this.hapChar.On, primaryState)
+            priAccessory.eveService.addEntry({ status: primaryState ? 1 : 0 })
           }
           break
       }
@@ -182,38 +244,102 @@ module.exports = class deviceOutletMulti {
     }
   }
 
-  async externalUpdate (params) {
+  async internalUIUpdate () {
     try {
-      if (!params.switches) {
+      // Skip polling if device isn't online
+      if (!this.isOnline) {
         return
       }
+
+      // Send the params to request the updates
+      await this.platform.sendDeviceUpdate(this.accessory, { uiActive: { outlet: 0, time: 120 } })
+      await this.funcs.sleep(2000)
+      await this.platform.sendDeviceUpdate(this.accessory, { uiActive: { outlet: 1, time: 120 } })
+    } catch (err) {
+      // Suppress errors here
+    }
+  }
+
+  async externalUpdate (params) {
+    try {
       const idToCheck = this.accessory.context.eweDeviceId + 'SW'
       let primaryState = false
       for (let i = 1; i <= this.accessory.context.channelCount; i++) {
         const uuid = this.hapUUIDGen(idToCheck + i)
         if (this.devicesInHB.has(uuid)) {
-          if (params.switches[i - 1].switch === 'on') {
-            primaryState = true
-          }
           const subAccessory = this.devicesInHB.get(uuid)
           const service = subAccessory.getService(this.hapServ.Outlet)
-          const currentState = service.getCharacteristic(this.hapChar.On).value ? 'on' : 'off'
-          if (params.updateSource && params.switches[i - 1].switch === currentState) {
+          if (params.switches) {
+            if (params.switches[i - 1].switch === 'on') {
+              primaryState = true
+            }
+            const currentState = service.getCharacteristic(this.hapChar.On).value ? 'on' : 'off'
+            if (!params.updateSource || params.switches[i - 1].switch !== currentState) {
+              service.updateCharacteristic(this.hapChar.On, params.switches[i - 1].switch === 'on')
+              subAccessory.eveService.addEntry({
+                status: params.switches[i - 1].switch === 'on' ? 1 : 0
+              })
+              if (this.powerReadings && params.switches[i - 1].switch === 'off') {
+                service.updateCharacteristic(this.hapChar.OutletInUse, false)
+                service.updateCharacteristic(this.eveChar.CurrentConsumption, 0)
+                subAccessory.eveService.addEntry({ power: 0 })
+              }
+              if (params.updateSource && this.enableLogging) {
+                this.log(
+                  '[%s] %s [%s].',
+                  subAccessory.displayName,
+                  this.lang.curState,
+                  params.switches[i - 1].switch
+                )
+              }
+            }
+          }
+          if (!this.powerReadings) {
             continue
           }
-          service.updateCharacteristic(this.hapChar.On, params.switches[i - 1].switch === 'on')
-          if (params.updateSource && this.enableLogging) {
+          let logger = false
+          let power
+          let voltage
+          let current
+          if (this.funcs.hasProperty(params, 'actPow_0' + (i - 1))) {
+            power = parseInt(params['actPow_0' + (i - 1)]) / 100
+            service.updateCharacteristic(
+              this.hapChar.OutletInUse,
+              service.getCharacteristic(this.hapChar.On).value && power > this.inUsePowerThreshold
+            )
+            service.updateCharacteristic(this.eveChar.CurrentConsumption, power)
+            subAccessory.eveService.addEntry({
+              power: service.getCharacteristic(this.hapChar.On).value ? power : 0
+            })
+            logger = true
+          }
+          if (this.funcs.hasProperty(params, 'voltage_0' + (i - 1))) {
+            voltage = parseInt(params['voltage_0' + (i - 1)]) / 100
+            service.updateCharacteristic(this.eveChar.Voltage, voltage)
+            logger = true
+          }
+          if (this.funcs.hasProperty(params, 'current_0' + (i - 1))) {
+            current = parseInt(params['current_0' + (i - 1)]) / 100
+            service.updateCharacteristic(this.eveChar.ElectricCurrent, current)
+            logger = true
+          }
+          if (params.updateSource && logger && this.enableLogging) {
             this.log(
-              '[%s] %s [%s].',
+              '[%s] %s%s%s.',
               subAccessory.displayName,
-              this.lang.curState,
-              params.switches[i - 1].switch
+              power !== undefined ? this.lang.curPower + ' [' + power + 'W]' : '',
+              voltage !== undefined ? ' ' + this.lang.curVolt + ' [' + voltage + 'V]' : '',
+              current !== undefined ? ' ' + this.lang.curCurr + ' [' + current + 'A]' : ''
             )
           }
         }
       }
-      if (!this.platform.hideMasters.includes(this.accessory.context.eweDeviceId)) {
+      if (
+        !this.platform.hideMasters.includes(this.accessory.context.eweDeviceId) &&
+        params.switches
+      ) {
         this.service.updateCharacteristic(this.hapChar.On, primaryState)
+        this.accessory.eveService.addEntry({ status: primaryState ? 1 : 0 })
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
diff --git a/lib/device/outlet-single.js b/lib/device/outlet-single.js
index 82f2c0ee..91117b67 100644
--- a/lib/device/outlet-single.js
+++ b/lib/device/outlet-single.js
@@ -205,7 +205,8 @@ module.exports = class deviceOutletSingle {
     // Output the customised options to the log
     const opts = JSON.stringify({
       inUsePowerThreshold: this.inUsePowerThreshold,
-      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable'
+      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
+      showAsType: 'outlet'
     })
     this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
@@ -230,6 +231,7 @@ module.exports = class deviceOutletSingle {
         this.accessory.eveService.addEntry({ power: 0 })
         this.accessory.context.energyReadings.push(0)
       }
+      this.accessory.eveService.addEntry({ status: value ? 1 : 0 })
       if (this.enableLogging) {
         this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
       }
@@ -262,6 +264,7 @@ module.exports = class deviceOutletSingle {
       if (!this.isSCM && params.switch && params.switch !== this.cacheState) {
         this.cacheState = params.switch
         this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
+        this.accessory.eveService.addEntry({ status: this.cacheState === 'on' ? 1 : 0 })
         if (this.powerReadings && this.cacheState === 'off') {
           this.service.updateCharacteristic(this.hapChar.OutletInUse, false)
           this.service.updateCharacteristic(this.eveChar.CurrentConsumption, 0)
@@ -275,6 +278,7 @@ module.exports = class deviceOutletSingle {
       if (this.isSCM && params.switches && params.switches[0].switch !== this.cacheState) {
         this.cacheState = params.switches[0].switch
         this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
+        this.accessory.eveService.addEntry({ status: this.cacheState === 'on' ? 1 : 0 })
         if (params.updateSource && this.enableLogging) {
           this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
         }
diff --git a/lib/device/switch-double.js b/lib/device/switch-double.js
deleted file mode 100644
index 8e05b12d..00000000
--- a/lib/device/switch-double.js
+++ /dev/null
@@ -1,236 +0,0 @@
-/* jshint -W014, -W033, esversion: 9 */
-/* eslint-disable new-cap */
-'use strict'
-
-module.exports = class deviceSwitchDouble {
-  constructor (platform, accessory, devicesInHB) {
-    // Set up variables from the platform
-    this.devicesInHB = devicesInHB
-    this.funcs = platform.funcs
-    this.hapChar = platform.api.hap.Characteristic
-    this.hapErr = platform.api.hap.HapStatusError
-    this.hapServ = platform.api.hap.Service
-    this.hapUUIDGen = platform.api.hap.uuid.generate
-    this.lang = platform.lang
-    this.log = platform.log
-    this.platform = platform
-
-    // Set up variables from the accessory
-    this.name = accessory.displayName
-    this.accessory = accessory
-
-    // Initially set the online flag as true (to be then updated as false if necessary)
-    this.isOnline = true
-
-    // Set up custom variables for this device type
-    const deviceConf = platform.multiDevices[accessory.context.eweDeviceId]
-    this.hideChannels = deviceConf && deviceConf.hideChannels ? deviceConf.hideChannels : undefined
-
-    // Set the correct logging variables for this accessory
-    this.enableLogging = !platform.config.disableDeviceLogging
-    this.enableDebugLogging = platform.config.debug
-    if (deviceConf && deviceConf.overrideLogging) {
-      switch (deviceConf.overrideLogging) {
-        case 'standard':
-          this.enableLogging = true
-          this.enableDebugLogging = false
-          break
-        case 'debug':
-          this.enableLogging = true
-          this.enableDebugLogging = true
-          break
-        case 'disable':
-          this.enableLogging = false
-          this.enableDebugLogging = false
-          break
-      }
-    }
-
-    // If the accessory has an outlet service then remove it
-    if (this.accessory.getService(this.hapServ.Outlet)) {
-      this.accessory.removeService(this.accessory.getService(this.hapServ.Outlet))
-    }
-
-    // Add the switch service if it doesn't already exist
-    this.service =
-      this.accessory.getService(this.hapServ.Switch) ||
-      this.accessory.addService(this.hapServ.Switch)
-
-    // Add the set handler to the switch/outlet on/off characteristic
-    this.service
-      .getCharacteristic(this.hapChar.On)
-      .onSet(async value => await this.internalStateUpdate(value))
-
-    // Add the get handlers only if the user has configured the offlineAsNoResponse setting
-    if (platform.config.offlineAsNoResponse) {
-      this.service.getCharacteristic(this.hapChar.On).onGet(() => {
-        if (!this.isOnline) {
-          throw new this.hapErr(-70402)
-        }
-        return this.service.getCharacteristic(this.hapChar.On).value
-      })
-    }
-
-    // Pass the accessory to Fakegato to set up with Eve
-    this.accessory.eveService = new platform.eveService('switch', this.accessory, {
-      log: platform.config.debugFakegato ? this.log : () => {}
-    })
-
-    // Output the customised options to the log
-    if (accessory.context.switchNumber === '0') {
-      const opts = JSON.stringify({
-        hideChannels: this.hideChannels,
-        logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable'
-      })
-      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
-    }
-  }
-
-  async internalStateUpdate (value) {
-    try {
-      let primaryState = false
-      const params = {
-        switches: []
-      }
-      const switchNumber = this.accessory.context.switchNumber
-      switch (switchNumber) {
-        case '0':
-          params.switches.push({ switch: value ? 'on' : 'off', outlet: 0 })
-          params.switches.push({ switch: value ? 'on' : 'off', outlet: 1 })
-          break
-        case '1':
-        case '2':
-          params.switches.push({
-            switch: value ? 'on' : 'off',
-            outlet: switchNumber - 1
-          })
-          break
-      }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
-      switch (switchNumber) {
-        case '0':
-          for (let i = 0; i <= 2; i++) {
-            const idToCheck = this.accessory.context.eweDeviceId + 'SW' + i
-            const uuid = this.hapUUIDGen(idToCheck)
-            if (this.devicesInHB.has(uuid)) {
-              const subAccessory = this.devicesInHB.get(uuid)
-              subAccessory
-                .getService(this.hapServ.Switch)
-                .updateCharacteristic(this.hapChar.On, value)
-              subAccessory.eveService.addEntry({ status: value ? 1 : 0 })
-              if (i > 0 && this.enableLogging) {
-                this.log(
-                  '[%s] %s [%s].',
-                  subAccessory.displayName,
-                  this.lang.curState,
-                  value ? 'on' : 'off'
-                )
-              }
-            }
-          }
-          break
-        case '1':
-        case '2':
-          for (let i = 1; i <= 2; i++) {
-            const idToCheck = this.accessory.context.eweDeviceId + 'SW' + i
-            const uuid = this.hapUUIDGen(idToCheck)
-            if (this.devicesInHB.has(uuid)) {
-              const subAccessory = this.devicesInHB.get(uuid)
-              if (i === parseInt(switchNumber)) {
-                if (value) {
-                  primaryState = true
-                }
-                subAccessory.eveService.addEntry({ status: value ? 1 : 0 })
-                if (i > 0 && this.enableLogging) {
-                  this.log(
-                    '[%s] %s [%s].',
-                    subAccessory.displayName,
-                    this.lang.curState,
-                    value ? 'on' : 'off'
-                  )
-                }
-              } else {
-                if (
-                  subAccessory.getService(this.hapServ.Switch).getCharacteristic(this.hapChar.On)
-                    .value
-                ) {
-                  primaryState = true
-                }
-              }
-            }
-          }
-          if (!this.platform.hideMasters.includes(this.accessory.context.eweDeviceId)) {
-            const idToCheck = this.accessory.context.eweDeviceId + 'SW0'
-            const uuid = this.hapUUIDGen(idToCheck)
-            const priAccessory = this.devicesInHB.get(uuid)
-            priAccessory
-              .getService(this.hapServ.Switch)
-              .updateCharacteristic(this.hapChar.On, primaryState)
-            priAccessory.eveService.addEntry({ status: primaryState ? 1 : 0 })
-          }
-          break
-      }
-    } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
-      setTimeout(() => {
-        this.service.updateCharacteristic(this.hapChar.On, !value)
-      }, 2000)
-      throw new this.hapErr(-70402)
-    }
-  }
-
-  async externalUpdate (params) {
-    try {
-      if (!params.switches) {
-        return
-      }
-      const idToCheck = this.accessory.context.eweDeviceId + 'SW'
-      let primaryState = false
-      for (let i = 1; i <= 2; i++) {
-        const uuid = this.hapUUIDGen(idToCheck + i)
-        if (this.devicesInHB.has(uuid)) {
-          if (params.switches[i - 1].switch === 'on') {
-            primaryState = true
-          }
-          const subAccessory = this.devicesInHB.get(uuid)
-          const service = subAccessory.getService(this.hapServ.Switch)
-          const currentState = service.getCharacteristic(this.hapChar.On).value ? 'on' : 'off'
-          if (params.updateSource && params.switches[i - 1].switch === currentState) {
-            continue
-          }
-          service.updateCharacteristic(this.hapChar.On, params.switches[i - 1].switch === 'on')
-          subAccessory.eveService.addEntry({
-            status: params.switches[i - 1].switch === 'on' ? 1 : 0
-          })
-          if (params.updateSource && this.enableLogging) {
-            this.log(
-              '[%s] %s [%s].',
-              subAccessory.displayName,
-              this.lang.curState,
-              params.switches[i - 1].switch
-            )
-          }
-        }
-      }
-      if (!this.platform.hideMasters.includes(this.accessory.context.eweDeviceId)) {
-        this.service.updateCharacteristic(this.hapChar.On, primaryState)
-        this.accessory.eveService.addEntry({ status: primaryState ? 1 : 0 })
-      }
-    } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, false)
-    }
-  }
-
-  markStatus (isOnline) {
-    this.isOnline = isOnline
-  }
-
-  currentState () {
-    const toReturn = {}
-    toReturn.services = ['switch']
-    toReturn.switch = {
-      state: this.service.getCharacteristic(this.hapChar.On).value ? 'on' : 'off'
-    }
-    return toReturn
-  }
-}
diff --git a/lib/device/switch-multi.js b/lib/device/switch-multi.js
index ed707c81..0f2c8f2d 100644
--- a/lib/device/switch-multi.js
+++ b/lib/device/switch-multi.js
@@ -2,10 +2,12 @@
 /* eslint-disable new-cap */
 'use strict'
 
-module.exports = class deviceSwitchMulti {
+module.exports = class deviceSwitchDouble {
   constructor (platform, accessory, devicesInHB) {
     // Set up variables from the platform
     this.devicesInHB = devicesInHB
+    this.eveChar = platform.eveChar
+    this.funcs = platform.funcs
     this.hapChar = platform.api.hap.Characteristic
     this.hapErr = platform.api.hap.HapStatusError
     this.hapServ = platform.api.hap.Service
@@ -21,6 +23,11 @@ module.exports = class deviceSwitchMulti {
     // Initially set the online flag as true (to be then updated as false if necessary)
     this.isOnline = true
 
+    /*
+    UIID 2/3/4/7/8/9/29/30/31/41/82/83/84/113/114: multi switch, no power readings
+    UIID 126: multi switch, with wattage, voltage and amp readings (DUALR3)
+    */
+
     // Set up custom variables for this device type
     const deviceConf = platform.multiDevices[accessory.context.eweDeviceId]
     this.hideChannels = deviceConf && deviceConf.hideChannels ? deviceConf.hideChannels : undefined
@@ -55,7 +62,26 @@ module.exports = class deviceSwitchMulti {
       this.accessory.getService(this.hapServ.Switch) ||
       this.accessory.addService(this.hapServ.Switch)
 
-    // Add the set handler to the switch/outlet on/off characteristic
+    switch (this.accessory.context.eweUIID) {
+      case 126:
+        // Add Eve power characteristic
+        this.powerReadings = true
+        this.isDual = true
+        if (accessory.context.switchNumber !== '0') {
+          if (!this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
+            this.service.addCharacteristic(this.eveChar.CurrentConsumption)
+          }
+          if (!this.service.testCharacteristic(this.eveChar.ElectricCurrent)) {
+            this.service.addCharacteristic(this.eveChar.ElectricCurrent)
+          }
+          if (!this.service.testCharacteristic(this.eveChar.Voltage)) {
+            this.service.addCharacteristic(this.eveChar.Voltage)
+          }
+        }
+        break
+    }
+
+    // Add the set handler to the switch on/off characteristic
     this.service
       .getCharacteristic(this.hapChar.On)
       .onSet(async value => await this.internalStateUpdate(value))
@@ -75,11 +101,28 @@ module.exports = class deviceSwitchMulti {
       log: platform.config.debugFakegato ? this.log : () => {}
     })
 
+    // Set up extra features for outlets that provide power readings
+    if (this.powerReadings && accessory.context.switchNumber === '0') {
+      // Set up an interval to get eWeLink to send power updates
+      if (platform.config.mode !== 'lan') {
+        setTimeout(() => {
+          this.internalUIUpdate()
+          this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
+        }, 5000)
+
+        // Stop the intervals on Homebridge shutdown
+        platform.api.on('shutdown', () => {
+          clearInterval(this.intervalPoll)
+        })
+      }
+    }
+
     // Output the customised options to the log
     if (accessory.context.switchNumber === '0') {
       const opts = JSON.stringify({
         hideChannels: this.hideChannels,
-        logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable'
+        logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
+        showAsType: 'switch'
       })
       this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
     }
@@ -96,8 +139,10 @@ module.exports = class deviceSwitchMulti {
         case '0':
           params.switches.push({ switch: value ? 'on' : 'off', outlet: 0 })
           params.switches.push({ switch: value ? 'on' : 'off', outlet: 1 })
-          params.switches.push({ switch: value ? 'on' : 'off', outlet: 2 })
-          params.switches.push({ switch: value ? 'on' : 'off', outlet: 3 })
+          if (!this.isDual) {
+            params.switches.push({ switch: value ? 'on' : 'off', outlet: 2 })
+            params.switches.push({ switch: value ? 'on' : 'off', outlet: 3 })
+          }
           break
         case '1':
         case '2':
@@ -184,40 +229,91 @@ module.exports = class deviceSwitchMulti {
     }
   }
 
-  async externalUpdate (params) {
+  async internalUIUpdate () {
     try {
-      if (!params.switches) {
+      // Skip polling if device isn't online
+      if (!this.isOnline) {
         return
       }
+
+      // Send the params to request the updates
+      await this.platform.sendDeviceUpdate(this.accessory, { uiActive: { outlet: 0, time: 120 } })
+      await this.funcs.sleep(2000)
+      await this.platform.sendDeviceUpdate(this.accessory, { uiActive: { outlet: 1, time: 120 } })
+    } catch (err) {
+      // Suppress errors here
+    }
+  }
+
+  async externalUpdate (params) {
+    try {
       const idToCheck = this.accessory.context.eweDeviceId + 'SW'
       let primaryState = false
       for (let i = 1; i <= this.accessory.context.channelCount; i++) {
         const uuid = this.hapUUIDGen(idToCheck + i)
         if (this.devicesInHB.has(uuid)) {
-          if (params.switches[i - 1].switch === 'on') {
-            primaryState = true
-          }
           const subAccessory = this.devicesInHB.get(uuid)
           const service = subAccessory.getService(this.hapServ.Switch)
-          const currentState = service.getCharacteristic(this.hapChar.On).value ? 'on' : 'off'
-          if (params.updateSource && params.switches[i - 1].switch === currentState) {
+          if (params.switches) {
+            if (params.switches[i - 1].switch === 'on') {
+              primaryState = true
+            }
+            const currentState = service.getCharacteristic(this.hapChar.On).value ? 'on' : 'off'
+            if (!params.updateSource || params.switches[i - 1].switch !== currentState) {
+              service.updateCharacteristic(this.hapChar.On, params.switches[i - 1].switch === 'on')
+              subAccessory.eveService.addEntry({
+                status: params.switches[i - 1].switch === 'on' ? 1 : 0
+              })
+              if (this.powerReadings && params.switches[i - 1].switch === 'off') {
+                service.updateCharacteristic(this.eveChar.CurrentConsumption, 0)
+              }
+              if (params.updateSource && this.enableLogging) {
+                this.log(
+                  '[%s] %s [%s].',
+                  subAccessory.displayName,
+                  this.lang.curState,
+                  params.switches[i - 1].switch
+                )
+              }
+            }
+          }
+          if (!this.powerReadings) {
             continue
           }
-          service.updateCharacteristic(this.hapChar.On, params.switches[i - 1].switch === 'on')
-          subAccessory.eveService.addEntry({
-            status: params.switches[i - 1].switch === 'on' ? 1 : 0
-          })
-          if (params.updateSource && this.enableLogging) {
+          let logger = false
+          let power
+          let voltage
+          let current
+          if (this.funcs.hasProperty(params, 'actPow_0' + (i - 1))) {
+            const power = parseInt(params['actPow_0' + (i - 1)]) / 100
+            service.updateCharacteristic(this.eveChar.CurrentConsumption, power)
+            logger = true
+          }
+          if (this.funcs.hasProperty(params, 'voltage_0' + (i - 1))) {
+            voltage = parseInt(params['voltage_0' + (i - 1)]) / 100
+            service.updateCharacteristic(this.eveChar.Voltage, voltage)
+            logger = true
+          }
+          if (this.funcs.hasProperty(params, 'current_0' + (i - 1))) {
+            current = parseInt(params['current_0' + (i - 1)]) / 100
+            service.updateCharacteristic(this.eveChar.ElectricCurrent, current)
+            logger = true
+          }
+          if (params.updateSource && logger && this.enableLogging) {
             this.log(
-              '[%s] %s [%s].',
+              '[%s] %s%s%s.',
               subAccessory.displayName,
-              this.lang.curState,
-              params.switches[i - 1].switch
+              power !== undefined ? this.lang.curPower + ' [' + power + 'W]' : '',
+              voltage !== undefined ? ' ' + this.lang.curVolt + ' [' + voltage + 'V]' : '',
+              current !== undefined ? ' ' + this.lang.curCurr + ' [' + current + 'A]' : ''
             )
           }
         }
       }
-      if (!this.platform.hideMasters.includes(this.accessory.context.eweDeviceId)) {
+      if (
+        !this.platform.hideMasters.includes(this.accessory.context.eweDeviceId) &&
+        params.switches
+      ) {
         this.service.updateCharacteristic(this.hapChar.On, primaryState)
         this.accessory.eveService.addEntry({ status: primaryState ? 1 : 0 })
       }
diff --git a/lib/device/switch-single.js b/lib/device/switch-single.js
index 1d871726..702220c2 100644
--- a/lib/device/switch-single.js
+++ b/lib/device/switch-single.js
@@ -132,7 +132,8 @@ module.exports = class deviceSwitchSingle {
 
     // Output the customised options to the log
     const opts = JSON.stringify({
-      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable'
+      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
+      showAsType: 'switch'
     })
     this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
diff --git a/lib/index.js b/lib/index.js
index d1b1cd78..8cf6fda4 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -702,10 +702,7 @@ class eWeLinkPlatform {
       const uuid = this.api.hap.uuid.generate(device.deviceid + 'SWX')
 
       // Remove old sub accessories for Accessory Simulations and DUALR3 in motor mode
-      if (
-        this.simulations[device.deviceid] ||
-        (this.consts.devices.doubleSwitch.includes(uiid) && device.params.workMode === 2)
-      ) {
+      if (this.simulations[device.deviceid] || (uiid === 126 && device.params.workMode === 2)) {
         for (let i = 0; i <= 4; i++) {
           const uuidsub = this.api.hap.uuid.generate(device.deviceid + 'SW' + i)
           if (devicesInHB.has(uuidsub)) {
@@ -722,7 +719,7 @@ class eWeLinkPlatform {
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/curtain'))(this, accessory)
         /***************************/
-      } else if (this.consts.devices.doubleSwitch.includes(uiid) && device.params.workMode === 2) {
+      } else if (uiid === 126 && device.params.workMode === 2) {
         /*************************
         BLINDS [DUALR3 MOTOR MODE]
         *************************/
@@ -1089,10 +1086,7 @@ class eWeLinkPlatform {
             ? new (require('./device/outlet-single'))(this, accessory)
             : new (require('./device/switch-single'))(this, accessory)
         /***********************/
-      } else if (
-        this.consts.devices.doubleSwitch.includes(uiid) ||
-        this.consts.devices.multiSwitch.includes(uiid)
-      ) {
+      } else if (this.consts.devices.multiSwitch.includes(uiid)) {
         /***********************
         SWITCHES [MULTI CHANNEL]
         ***********************/
@@ -1145,13 +1139,10 @@ class eWeLinkPlatform {
               ? device.extra.staMac.replace(/[:]+/g, '').replace(/..\B/g, '$&:')
               : false
           subAccessory.context.lanKey = device.devicekey
-          subAccessory.control = this.consts.devices.doubleSwitch.includes(uiid)
-            ? this.multiDevices[device.deviceid] && this.multiDevices[device.deviceid].showAsOutlet
-              ? new (require('./device/outlet-double'))(this, subAccessory, devicesInHB)
-              : new (require('./device/switch-double'))(this, subAccessory, devicesInHB)
-            : this.multiDevices[device.deviceid] && this.multiDevices[device.deviceid].showAsOutlet
-            ? new (require('./device/outlet-multi'))(this, subAccessory, devicesInHB)
-            : new (require('./device/switch-multi'))(this, subAccessory, devicesInHB)
+          subAccessory.control =
+            this.multiDevices[device.deviceid] && this.multiDevices[device.deviceid].showAsOutlet
+              ? new (require('./device/outlet-multi'))(this, subAccessory, devicesInHB)
+              : new (require('./device/switch-multi'))(this, subAccessory, devicesInHB)
 
           // Mark the online/offline status of certain devices
           if (wsClient && subAccessory.control && subAccessory.control.markStatus) {
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index a8731482..2d502d47 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -160,8 +160,7 @@ module.exports = {
   devices: {
     lan: [1, 2, 3, 4, 5, 6, 7, 8, 9, 14, 15, 28, 32, 34, 44, 77, 78, 126],
     singleSwitch: [1, 6, 14, 24, 27, 112],
-    doubleSwitch: [126],
-    multiSwitch: [2, 3, 4, 7, 8, 9, 29, 30, 31, 41, 82, 83, 84, 113, 114],
+    multiSwitch: [2, 3, 4, 7, 8, 9, 29, 30, 31, 41, 82, 83, 84, 113, 114, 126],
     singleSwitchOutlet: ['S20', 'S26', 'S26R1', 'S55', 'S55R1'],
     lightDimmer: [36, 44, 57],
     lightRGB: [22],

From e28813b54b16f96251c6c88aae6c897cbc7ad030 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 26 Jun 2021 12:55:04 +0100
Subject: [PATCH 2377/3183] remove unused chars

---
 lib/device/outlet-multi.js  | 23 ++++++++++++-
 lib/device/outlet-single.js | 68 ++++++++++++++++++++++++++++++++++++-
 lib/device/switch-multi.js  | 18 +++++++++-
 lib/device/switch-single.js | 45 ++++++++++++++++++++++--
 4 files changed, 149 insertions(+), 5 deletions(-)

diff --git a/lib/device/outlet-multi.js b/lib/device/outlet-multi.js
index 7a37eb11..4653ef1e 100644
--- a/lib/device/outlet-multi.js
+++ b/lib/device/outlet-multi.js
@@ -64,7 +64,7 @@ module.exports = class deviceOutletDouble {
 
     switch (this.accessory.context.eweUIID) {
       case 126:
-        // Add Eve power characteristic
+        // Add Eve power characteristics
         this.powerReadings = true
         this.isDual = true
         if (accessory.context.switchNumber !== '0') {
@@ -82,6 +82,27 @@ module.exports = class deviceOutletDouble {
           }
         }
         break
+      default:
+        // Remove unused Eve characteristics
+        if (this.service.testCharacteristic(this.hapChar.OutletInUse)) {
+          this.service.removeCharacteristic(
+            this.service.getCharacteristic(this.eveChar.OutletInUse)
+          )
+        }
+        if (this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
+          this.service.removeCharacteristic(
+            this.service.getCharacteristic(this.eveChar.CurrentConsumption)
+          )
+        }
+        if (this.service.testCharacteristic(this.eveChar.ElectricCurrent)) {
+          this.service.removeCharacteristic(
+            this.service.getCharacteristic(this.eveChar.ElectricCurrent)
+          )
+        }
+        if (this.service.testCharacteristic(this.eveChar.Voltage)) {
+          this.service.removeCharacteristic(this.service.getCharacteristic(this.eveChar.Voltage))
+        }
+        break
     }
 
     // Add the set handler to the outlet on/off characteristic
diff --git a/lib/device/outlet-single.js b/lib/device/outlet-single.js
index 91117b67..c7d00ad5 100644
--- a/lib/device/outlet-single.js
+++ b/lib/device/outlet-single.js
@@ -68,7 +68,7 @@ module.exports = class deviceOutletSingle {
 
     switch (this.accessory.context.eweUIID) {
       case 5:
-        // Add Eve power characteristic
+        // Add Eve power characteristics
         this.powerReadings = true
         if (!this.service.testCharacteristic(this.hapChar.OutletInUse)) {
           this.service.addCharacteristic(this.hapChar.OutletInUse)
@@ -82,6 +82,16 @@ module.exports = class deviceOutletSingle {
         if (!this.service.testCharacteristic(this.eveChar.ResetTotal)) {
           this.service.addCharacteristic(this.eveChar.ResetTotal)
         }
+
+        // Remove unused Eve characteristics
+        if (this.service.testCharacteristic(this.eveChar.ElectricCurrent)) {
+          this.service.removeCharacteristic(
+            this.service.getCharacteristic(this.eveChar.ElectricCurrent)
+          )
+        }
+        if (this.service.testCharacteristic(this.eveChar.Voltage)) {
+          this.service.removeCharacteristic(this.service.getCharacteristic(this.eveChar.Voltage))
+        }
         break
       case 32:
         // Add Eve power characteristics
@@ -110,6 +120,62 @@ module.exports = class deviceOutletSingle {
       case 81:
       case 107:
         this.isSCM = true
+        // Remove unused Eve characteristics
+        if (this.service.testCharacteristic(this.hapChar.OutletInUse)) {
+          this.service.removeCharacteristic(
+            this.service.getCharacteristic(this.eveChar.OutletInUse)
+          )
+        }
+        if (this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
+          this.service.removeCharacteristic(
+            this.service.getCharacteristic(this.eveChar.CurrentConsumption)
+          )
+        }
+        if (this.service.testCharacteristic(this.eveChar.ElectricCurrent)) {
+          this.service.removeCharacteristic(
+            this.service.getCharacteristic(this.eveChar.ElectricCurrent)
+          )
+        }
+        if (this.service.testCharacteristic(this.eveChar.Voltage)) {
+          this.service.removeCharacteristic(this.service.getCharacteristic(this.eveChar.Voltage))
+        }
+        if (this.service.testCharacteristic(this.eveChar.TotalConsumption)) {
+          this.service.removeCharacteristic(
+            this.service.getCharacteristic(this.eveChar.TotalConsumption)
+          )
+        }
+        if (this.service.testCharacteristic(this.eveChar.ResetTotal)) {
+          this.service.removeCharacteristic(this.service.getCharacteristic(this.eveChar.ResetTotal))
+        }
+        break
+      default:
+        // Remove unused Eve characteristics
+        if (this.service.testCharacteristic(this.hapChar.OutletInUse)) {
+          this.service.removeCharacteristic(
+            this.service.getCharacteristic(this.eveChar.OutletInUse)
+          )
+        }
+        if (this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
+          this.service.removeCharacteristic(
+            this.service.getCharacteristic(this.eveChar.CurrentConsumption)
+          )
+        }
+        if (this.service.testCharacteristic(this.eveChar.ElectricCurrent)) {
+          this.service.removeCharacteristic(
+            this.service.getCharacteristic(this.eveChar.ElectricCurrent)
+          )
+        }
+        if (this.service.testCharacteristic(this.eveChar.Voltage)) {
+          this.service.removeCharacteristic(this.service.getCharacteristic(this.eveChar.Voltage))
+        }
+        if (this.service.testCharacteristic(this.eveChar.TotalConsumption)) {
+          this.service.removeCharacteristic(
+            this.service.getCharacteristic(this.eveChar.TotalConsumption)
+          )
+        }
+        if (this.service.testCharacteristic(this.eveChar.ResetTotal)) {
+          this.service.removeCharacteristic(this.service.getCharacteristic(this.eveChar.ResetTotal))
+        }
         break
     }
 
diff --git a/lib/device/switch-multi.js b/lib/device/switch-multi.js
index 0f2c8f2d..1a15714d 100644
--- a/lib/device/switch-multi.js
+++ b/lib/device/switch-multi.js
@@ -64,7 +64,7 @@ module.exports = class deviceSwitchDouble {
 
     switch (this.accessory.context.eweUIID) {
       case 126:
-        // Add Eve power characteristic
+        // Add Eve power characteristics
         this.powerReadings = true
         this.isDual = true
         if (accessory.context.switchNumber !== '0') {
@@ -79,6 +79,22 @@ module.exports = class deviceSwitchDouble {
           }
         }
         break
+      default:
+        // Remove unused Eve characteristics
+        if (this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
+          this.service.removeCharacteristic(
+            this.service.getCharacteristic(this.eveChar.CurrentConsumption)
+          )
+        }
+        if (this.service.testCharacteristic(this.eveChar.ElectricCurrent)) {
+          this.service.removeCharacteristic(
+            this.service.getCharacteristic(this.eveChar.ElectricCurrent)
+          )
+        }
+        if (this.service.testCharacteristic(this.eveChar.Voltage)) {
+          this.service.removeCharacteristic(this.service.getCharacteristic(this.eveChar.Voltage))
+        }
+        break
     }
 
     // Add the set handler to the switch on/off characteristic
diff --git a/lib/device/switch-single.js b/lib/device/switch-single.js
index 702220c2..c5a18336 100644
--- a/lib/device/switch-single.js
+++ b/lib/device/switch-single.js
@@ -68,14 +68,24 @@ module.exports = class deviceSwitchSingle {
 
     switch (this.accessory.context.eweUIID) {
       case 5:
-        // Add Eve power characteristic
+        // Add Eve power characteristics
         this.powerReadings = true
         if (!this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
           this.service.addCharacteristic(this.eveChar.CurrentConsumption)
         }
+
+        // Remove unused Eve characteristics
+        if (this.service.testCharacteristic(this.eveChar.ElectricCurrent)) {
+          this.service.removeCharacteristic(
+            this.service.getCharacteristic(this.eveChar.ElectricCurrent)
+          )
+        }
+        if (this.service.testCharacteristic(this.eveChar.Voltage)) {
+          this.service.removeCharacteristic(this.service.getCharacteristic(this.eveChar.Voltage))
+        }
         break
       case 32:
-        // Add Eve power characteristic
+        // Add Eve power characteristics
         this.powerReadings = true
         if (!this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
           this.service.addCharacteristic(this.eveChar.CurrentConsumption)
@@ -92,6 +102,37 @@ module.exports = class deviceSwitchSingle {
       case 81:
       case 107:
         this.isSCM = true
+
+        // Remove unused Eve characteristics
+        if (this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
+          this.service.removeCharacteristic(
+            this.service.getCharacteristic(this.eveChar.CurrentConsumption)
+          )
+        }
+        if (this.service.testCharacteristic(this.eveChar.ElectricCurrent)) {
+          this.service.removeCharacteristic(
+            this.service.getCharacteristic(this.eveChar.ElectricCurrent)
+          )
+        }
+        if (this.service.testCharacteristic(this.eveChar.Voltage)) {
+          this.service.removeCharacteristic(this.service.getCharacteristic(this.eveChar.Voltage))
+        }
+        break
+      default:
+        // Remove unused Eve characteristics
+        if (this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
+          this.service.removeCharacteristic(
+            this.service.getCharacteristic(this.eveChar.CurrentConsumption)
+          )
+        }
+        if (this.service.testCharacteristic(this.eveChar.ElectricCurrent)) {
+          this.service.removeCharacteristic(
+            this.service.getCharacteristic(this.eveChar.ElectricCurrent)
+          )
+        }
+        if (this.service.testCharacteristic(this.eveChar.Voltage)) {
+          this.service.removeCharacteristic(this.service.getCharacteristic(this.eveChar.Voltage))
+        }
         break
     }
 

From c7fdcf830ca531301744ebced42e1d3f57df34f4 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 26 Jun 2021 13:14:41 +0100
Subject: [PATCH 2378/3183] avoid repeated code in this case

---
 lib/device/outlet-single.js | 38 +++++--------------------------------
 lib/device/switch-single.js | 26 +++++--------------------
 2 files changed, 10 insertions(+), 54 deletions(-)

diff --git a/lib/device/outlet-single.js b/lib/device/outlet-single.js
index c7d00ad5..37db41e2 100644
--- a/lib/device/outlet-single.js
+++ b/lib/device/outlet-single.js
@@ -115,40 +115,12 @@ module.exports = class deviceOutletSingle {
           this.service.addCharacteristic(this.eveChar.ResetTotal)
         }
         break
-      case 77:
-      case 78:
-      case 81:
-      case 107:
-        this.isSCM = true
-        // Remove unused Eve characteristics
-        if (this.service.testCharacteristic(this.hapChar.OutletInUse)) {
-          this.service.removeCharacteristic(
-            this.service.getCharacteristic(this.eveChar.OutletInUse)
-          )
-        }
-        if (this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
-          this.service.removeCharacteristic(
-            this.service.getCharacteristic(this.eveChar.CurrentConsumption)
-          )
-        }
-        if (this.service.testCharacteristic(this.eveChar.ElectricCurrent)) {
-          this.service.removeCharacteristic(
-            this.service.getCharacteristic(this.eveChar.ElectricCurrent)
-          )
-        }
-        if (this.service.testCharacteristic(this.eveChar.Voltage)) {
-          this.service.removeCharacteristic(this.service.getCharacteristic(this.eveChar.Voltage))
-        }
-        if (this.service.testCharacteristic(this.eveChar.TotalConsumption)) {
-          this.service.removeCharacteristic(
-            this.service.getCharacteristic(this.eveChar.TotalConsumption)
-          )
-        }
-        if (this.service.testCharacteristic(this.eveChar.ResetTotal)) {
-          this.service.removeCharacteristic(this.service.getCharacteristic(this.eveChar.ResetTotal))
-        }
-        break
       default:
+        // Set a flag for devices with hardware that use multi-channel format
+        if (platform.consts.devices.outletSCM.includes(this.accessory.context.eweUIID)) {
+          this.isSCM = true
+        }
+        
         // Remove unused Eve characteristics
         if (this.service.testCharacteristic(this.hapChar.OutletInUse)) {
           this.service.removeCharacteristic(
diff --git a/lib/device/switch-single.js b/lib/device/switch-single.js
index c5a18336..81e96d46 100644
--- a/lib/device/switch-single.js
+++ b/lib/device/switch-single.js
@@ -97,28 +97,12 @@ module.exports = class deviceSwitchSingle {
           this.service.addCharacteristic(this.eveChar.Voltage)
         }
         break
-      case 77:
-      case 78:
-      case 81:
-      case 107:
-        this.isSCM = true
-
-        // Remove unused Eve characteristics
-        if (this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
-          this.service.removeCharacteristic(
-            this.service.getCharacteristic(this.eveChar.CurrentConsumption)
-          )
-        }
-        if (this.service.testCharacteristic(this.eveChar.ElectricCurrent)) {
-          this.service.removeCharacteristic(
-            this.service.getCharacteristic(this.eveChar.ElectricCurrent)
-          )
-        }
-        if (this.service.testCharacteristic(this.eveChar.Voltage)) {
-          this.service.removeCharacteristic(this.service.getCharacteristic(this.eveChar.Voltage))
-        }
-        break
       default:
+        // Set a flag for devices with hardware that use multi-channel format
+        if (platform.consts.devices.outletSCM.includes(this.accessory.context.eweUIID)) {
+          this.isSCM = true
+        }
+          
         // Remove unused Eve characteristics
         if (this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
           this.service.removeCharacteristic(

From 15a392fe0f8c3649ed0379acc1900d2eaf0fc65c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 26 Jun 2021 13:15:16 +0100
Subject: [PATCH 2379/3183] formatting

---
 lib/device/outlet-single.js | 2 +-
 lib/device/switch-single.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/device/outlet-single.js b/lib/device/outlet-single.js
index 37db41e2..b368b871 100644
--- a/lib/device/outlet-single.js
+++ b/lib/device/outlet-single.js
@@ -120,7 +120,7 @@ module.exports = class deviceOutletSingle {
         if (platform.consts.devices.outletSCM.includes(this.accessory.context.eweUIID)) {
           this.isSCM = true
         }
-        
+
         // Remove unused Eve characteristics
         if (this.service.testCharacteristic(this.hapChar.OutletInUse)) {
           this.service.removeCharacteristic(
diff --git a/lib/device/switch-single.js b/lib/device/switch-single.js
index 81e96d46..69a804a8 100644
--- a/lib/device/switch-single.js
+++ b/lib/device/switch-single.js
@@ -102,7 +102,7 @@ module.exports = class deviceSwitchSingle {
         if (platform.consts.devices.outletSCM.includes(this.accessory.context.eweUIID)) {
           this.isSCM = true
         }
-          
+
         // Remove unused Eve characteristics
         if (this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
           this.service.removeCharacteristic(

From 0d10ef13d1d3cdf8069fc0bc2a45e57f9c6da3ba Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 26 Jun 2021 13:41:39 +0100
Subject: [PATCH 2380/3183] initialise this.setup before anything else

---
 lib/device/simulation/garage-one.js | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/lib/device/simulation/garage-one.js b/lib/device/simulation/garage-one.js
index 38642949..a3b68081 100644
--- a/lib/device/simulation/garage-one.js
+++ b/lib/device/simulation/garage-one.js
@@ -212,15 +212,21 @@ module.exports = class deviceGarageOne {
 
   async externalUpdate (params) {
     try {
+      if (!this.setup) {
+        if (params.switches) {
+          this.setup = 'twoSwitch'
+        } else if (params.switch) {
+          this.setup = 'oneSwitch'
+        } else {
+          return
+        }
+      }
       if (this.inUse || this.definedSensor) {
         return
       }
       const prevState = this.service.getCharacteristic(this.hapChar.CurrentDoorState).value
       const newPos = [0, 2].includes(prevState) ? 3 : 2
       if (params.switches) {
-        if (!this.setup) {
-          this.setup = 'twoSwitch'
-        }
         if (
           params.switches[0].switch === params.switches[1].switch ||
           params.switches[prevState % 2].switch === 'on'
@@ -228,9 +234,6 @@ module.exports = class deviceGarageOne {
           return
         }
       } else if (params.switch) {
-        if (!this.setup) {
-          this.setup = 'oneSwitch'
-        }
         if (params.switch === 'off') {
           return
         }

From 3db12b7b06b0e0104d46daff580223b42777314d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 26 Jun 2021 13:42:06 +0100
Subject: [PATCH 2381/3183] 6.8.1-beta.44

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 7cf0e69f..fb0c87c4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.8.1-beta.43",
+  "version": "6.8.1-beta.44",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 1d55abfd..b6258082 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.8.1-beta.43",
+  "version": "6.8.1-beta.44",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From a5dbef445ca6bf68419df151ff42f2de2c0e1350 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 26 Jun 2021 13:58:51 +0100
Subject: [PATCH 2382/3183] remove redundant check

---
 lib/device/simulation/garage-one.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/device/simulation/garage-one.js b/lib/device/simulation/garage-one.js
index a3b68081..c4f0c279 100644
--- a/lib/device/simulation/garage-one.js
+++ b/lib/device/simulation/garage-one.js
@@ -245,7 +245,7 @@ module.exports = class deviceGarageOne {
       this.service.updateCharacteristic(this.hapChar.CurrentDoorState, newPos)
       await this.funcs.sleep(2000)
       this.inUse = false
-      if (!this.definedSensor && newPos === 2) {
+      if (newPos === 2) {
         this.accessory.eveService.addEntry({ status: 0 })
         const initialTime = this.accessory.eveService.getInitialTime()
         this.service.updateCharacteristic(
@@ -258,7 +258,7 @@ module.exports = class deviceGarageOne {
       const operationTime = newPos === 2 ? this.operationTimeUp : this.operationTimeDown
       await this.funcs.sleep(Math.max((operationTime - 20) * 100, 0))
       this.service.updateCharacteristic(this.hapChar.CurrentDoorState, newPos - 2)
-      if (!this.definedSensor && newPos === 3) {
+      if (newPos === 3) {
         this.accessory.eveService.addEntry({ status: 1 })
       }
       if (this.enableLogging) {

From 871a41a15d55a14ae94b9cf32f12414d703c3268 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 26 Jun 2021 15:49:12 +0100
Subject: [PATCH 2383/3183] eve power chars for dualr3 motor mode

---
 lib/device/motor.js | 68 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 68 insertions(+)

diff --git a/lib/device/motor.js b/lib/device/motor.js
index 2f9333e0..0673a5a9 100644
--- a/lib/device/motor.js
+++ b/lib/device/motor.js
@@ -5,6 +5,7 @@
 module.exports = class deviceMotor {
   constructor (platform, accessory) {
     // Set up variables from the platform
+    this.eveChar = platform.eveChar
     this.funcs = platform.funcs
     this.hapChar = platform.api.hap.Characteristic
     this.hapErr = platform.api.hap.HapStatusError
@@ -56,6 +57,17 @@ module.exports = class deviceMotor {
       this.accessory.getService(this.hapServ.WindowCovering) ||
       this.accessory.addService(this.hapServ.WindowCovering)
 
+    // Add Eve power characteristics
+    if (!this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
+      this.service.addCharacteristic(this.eveChar.CurrentConsumption)
+    }
+    if (!this.service.testCharacteristic(this.eveChar.ElectricCurrent)) {
+      this.service.addCharacteristic(this.eveChar.ElectricCurrent)
+    }
+    if (!this.service.testCharacteristic(this.eveChar.Voltage)) {
+      this.service.addCharacteristic(this.eveChar.Voltage)
+    }
+
     // Add the set handler to the target position characteristic
     this.service
       .getCharacteristic(this.hapChar.TargetPosition)
@@ -77,6 +89,19 @@ module.exports = class deviceMotor {
       })
     }
 
+    // Set up an interval to get eWeLink to send power updates
+    if (platform.config.mode !== 'lan') {
+      setTimeout(() => {
+        this.internalUIUpdate()
+        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
+      }, 5000)
+
+      // Stop the intervals on Homebridge shutdown
+      platform.api.on('shutdown', () => {
+        clearInterval(this.intervalPoll)
+      })
+    }
+
     // Output the customised options to the log
     const opts = JSON.stringify({
       logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable'
@@ -113,8 +138,23 @@ module.exports = class deviceMotor {
     }
   }
 
+  async internalUIUpdate () {
+    try {
+      // Skip polling if device isn't online
+      if (!this.isOnline) {
+        return
+      }
+
+      // Send the params to request the updates
+      await this.platform.sendDeviceUpdate(this.accessory, { uiActive: { outlet: 0, time: 120 } })
+    } catch (err) {
+      // Suppress errors here
+    }
+  }
+
   async externalUpdate (params) {
     try {
+      this.log(params)
       if (
         this.funcs.hasProperty(params, 'location') &&
         this.funcs.hasProperty(params, 'currLocation') &&
@@ -130,6 +170,34 @@ module.exports = class deviceMotor {
           }
         }
       }
+      let logger = false
+      let power
+      let voltage
+      let current
+      if (this.funcs.hasProperty(params, 'actPow_00')) {
+        power = parseInt(params.actPow_00) / 100
+        this.service.updateCharacteristic(this.eveChar.CurrentConsumption, power)
+        logger = true
+      }
+      if (this.funcs.hasProperty(params, 'voltage_00')) {
+        voltage = parseInt(params.voltage_00) / 100
+        this.service.updateCharacteristic(this.eveChar.Voltage, voltage)
+        logger = true
+      }
+      if (this.funcs.hasProperty(params, 'current_00')) {
+        current = parseInt(params.current_00) / 100
+        this.service.updateCharacteristic(this.eveChar.ElectricCurrent, current)
+        logger = true
+      }
+      if (params.updateSource && logger && this.enableLogging) {
+        this.log(
+          '[%s] %s%s%s.',
+          this.name,
+          power !== undefined ? this.lang.curPower + ' [' + power + 'W]' : '',
+          voltage !== undefined ? ' ' + this.lang.curVolt + ' [' + voltage + 'V]' : '',
+          current !== undefined ? ' ' + this.lang.curCurr + ' [' + current + 'A]' : ''
+        )
+      }
     } catch (err) {
       // Catch any errors and let the platform display them
       this.platform.deviceUpdateError(this.accessory, err, false)

From bf29962f9a5b0c88b22746fce74529d88fc2e70b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 26 Jun 2021 15:49:14 +0100
Subject: [PATCH 2384/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fbfdbf64..33d6396b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
   - Added a global setting `offlineAsNoResponse` to mark cloud-offline accessories as 'No Response' in HomeKit
 - **Single/Multi-Channel Devices**
   - Wattage/Voltage/Amp readings (via Eve app) now visible for outlets in Eve app when exposed as `Switch`
+  - Wattage/Voltage/Amp readings (via Eve app) now visible for DUALR3 when in motor mode
   - Support for LAN mode control for DUALR3 in motor mode
   - Polling via LAN mode to enable constant power attribute updates for POWR2 devices
 - **iFan Devices**
@@ -65,6 +66,10 @@ All notable changes to this homebridge-ewelink will be documented in this file.
   - Recommended node version bump to v14.17.1
   - Bump `ws` dependency to v7.5.0
 
+### Fixed
+
+- An issue preventing controlling a garage door simulation when using a sensor
+
 ### Removed
 
 - `overrideDisabledLogging` setting for each accessory type

From c73c061d2d4054489ad5c85229490aca7ee7bd86 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 26 Jun 2021 15:50:30 +0100
Subject: [PATCH 2385/3183] 6.8.1-beta.45

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index fb0c87c4..3231f875 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.8.1-beta.44",
+  "version": "6.8.1-beta.45",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index b6258082..f2aa6628 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.8.1-beta.44",
+  "version": "6.8.1-beta.45",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 4aab7a3d0db5374c84513fa34201d3168be400d1 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 26 Jun 2021 16:23:03 +0100
Subject: [PATCH 2386/3183] [test] lan mode power polling for dualr3

---
 lib/connection/lan.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/connection/lan.js b/lib/connection/lan.js
index 1c3b47c9..bfd94eab 100644
--- a/lib/connection/lan.js
+++ b/lib/connection/lan.js
@@ -214,7 +214,7 @@ module.exports = class connectionLAN {
         // Use hasProperty has location can be INT 0
         params.location = json.params.location
         suffix = 'location'
-      } else if (json.params.uiActive && deviceInfo.uiid === 32) {
+      } else if (json.params.uiActive && [32, 126].includes(deviceInfo.uiid)) {
         // Not sure if this works with POWR1 (uiid 5) and need check working with DUALR3 (uiid 126)
         params.uiActive = json.params.uiActive
         suffix = 'monitor'

From 93c5abd4c77ff6fa0db69ff954d021ccfab9b959 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 26 Jun 2021 16:23:26 +0100
Subject: [PATCH 2387/3183] Update motor.js

---
 lib/device/motor.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/device/motor.js b/lib/device/motor.js
index 0673a5a9..2655ac53 100644
--- a/lib/device/motor.js
+++ b/lib/device/motor.js
@@ -148,7 +148,7 @@ module.exports = class deviceMotor {
       // Send the params to request the updates
       await this.platform.sendDeviceUpdate(this.accessory, { uiActive: { outlet: 0, time: 120 } })
     } catch (err) {
-      // Suppress errors here
+      this.log.error(err)
     }
   }
 

From 6617cc853861feaddf57b412be4f0f87fc4f9018 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 26 Jun 2021 16:23:58 +0100
Subject: [PATCH 2388/3183] 6.8.1-beta.46

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 3231f875..dd4fd3ed 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.8.1-beta.45",
+  "version": "6.8.1-beta.46",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index f2aa6628..572804ba 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.8.1-beta.45",
+  "version": "6.8.1-beta.46",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From a3116fa57420116fa98862503105a466ba56b73a Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 27 Jun 2021 11:30:47 +0100
Subject: [PATCH 2389/3183] no need for const

---
 lib/device/outlet-single.js           | 3 +--
 lib/device/sensor-ambient.js          | 3 +--
 lib/device/simulation/cooler.js       | 3 +--
 lib/device/simulation/dehumidifier.js | 3 +--
 lib/device/simulation/heater.js       | 3 +--
 lib/device/simulation/humidifier.js   | 3 +--
 lib/device/switch-single.js           | 3 +--
 7 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/lib/device/outlet-single.js b/lib/device/outlet-single.js
index b368b871..185c0ed3 100644
--- a/lib/device/outlet-single.js
+++ b/lib/device/outlet-single.js
@@ -290,8 +290,7 @@ module.exports = class deviceOutletSingle {
       }
 
       // Send the params to request the updates
-      const params = { uiActive: 120 }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
+      await this.platform.sendDeviceUpdate(this.accessory, { uiActive: 120 })
     } catch (err) {
       // Suppress errors here
     }
diff --git a/lib/device/sensor-ambient.js b/lib/device/sensor-ambient.js
index 8cafb0a3..757609e6 100644
--- a/lib/device/sensor-ambient.js
+++ b/lib/device/sensor-ambient.js
@@ -197,8 +197,7 @@ module.exports = class deviceSensorAmbient {
       }
 
       // Send the params to request the updates
-      const params = { uiActive: 120 }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
+      await this.platform.sendDeviceUpdate(this.accessory, { uiActive: 120 })
     } catch (err) {
       // Suppress errors here
     }
diff --git a/lib/device/simulation/cooler.js b/lib/device/simulation/cooler.js
index bf7d48d1..4fadd544 100644
--- a/lib/device/simulation/cooler.js
+++ b/lib/device/simulation/cooler.js
@@ -371,8 +371,7 @@ module.exports = class deviceHeater {
       }
 
       // Send the params to request the updates
-      const params = { uiActive: 120 }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
+      await this.platform.sendDeviceUpdate(this.accessory, { uiActive: 120 })
     } catch (err) {
       // Suppress errors here
     }
diff --git a/lib/device/simulation/dehumidifier.js b/lib/device/simulation/dehumidifier.js
index 8002ddad..a53ea16e 100644
--- a/lib/device/simulation/dehumidifier.js
+++ b/lib/device/simulation/dehumidifier.js
@@ -347,8 +347,7 @@ module.exports = class deviceHeater {
       }
 
       // Send the params to request the updates
-      const params = { uiActive: 120 }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
+      await this.platform.sendDeviceUpdate(this.accessory, { uiActive: 120 })
     } catch (err) {
       // Suppress errors here
     }
diff --git a/lib/device/simulation/heater.js b/lib/device/simulation/heater.js
index 2eb0989c..b99085cb 100644
--- a/lib/device/simulation/heater.js
+++ b/lib/device/simulation/heater.js
@@ -377,8 +377,7 @@ module.exports = class deviceHeater {
       }
 
       // Send the params to request the updates
-      const params = { uiActive: 120 }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
+      await this.platform.sendDeviceUpdate(this.accessory, { uiActive: 120 })
     } catch (err) {
       // Suppress errors here
     }
diff --git a/lib/device/simulation/humidifier.js b/lib/device/simulation/humidifier.js
index 8250e5c5..b27dbc6b 100644
--- a/lib/device/simulation/humidifier.js
+++ b/lib/device/simulation/humidifier.js
@@ -346,8 +346,7 @@ module.exports = class deviceHeater {
       }
 
       // Send the params to request the updates
-      const params = { uiActive: 120 }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
+      await this.platform.sendDeviceUpdate(this.accessory, { uiActive: 120 })
     } catch (err) {
       // Suppress errors here
     }
diff --git a/lib/device/switch-single.js b/lib/device/switch-single.js
index 69a804a8..4c6b5ae2 100644
--- a/lib/device/switch-single.js
+++ b/lib/device/switch-single.js
@@ -201,8 +201,7 @@ module.exports = class deviceSwitchSingle {
       }
 
       // Send the params to request the updates
-      const params = { uiActive: 120 }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
+      await this.platform.sendDeviceUpdate(this.accessory, { uiActive: 120 })
     } catch (err) {
       // Suppress errors here
     }

From ce0306d7b66771e20ff90301112e93eb88357c8e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 27 Jun 2021 14:04:34 +0100
Subject: [PATCH 2390/3183] remove test logging

---
 lib/device/motor.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/device/motor.js b/lib/device/motor.js
index 2655ac53..fa82ffa5 100644
--- a/lib/device/motor.js
+++ b/lib/device/motor.js
@@ -154,7 +154,6 @@ module.exports = class deviceMotor {
 
   async externalUpdate (params) {
     try {
-      this.log(params)
       if (
         this.funcs.hasProperty(params, 'location') &&
         this.funcs.hasProperty(params, 'currLocation') &&

From 40130e82d8ed4f12e18fce6564e9020a1517ad59 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 27 Jun 2021 14:05:52 +0100
Subject: [PATCH 2391/3183] lan polling dualr3

---
 lib/connection/lan.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/connection/lan.js b/lib/connection/lan.js
index bfd94eab..39998c39 100644
--- a/lib/connection/lan.js
+++ b/lib/connection/lan.js
@@ -215,7 +215,7 @@ module.exports = class connectionLAN {
         params.location = json.params.location
         suffix = 'location'
       } else if (json.params.uiActive && [32, 126].includes(deviceInfo.uiid)) {
-        // Not sure if this works with POWR1 (uiid 5) and need check working with DUALR3 (uiid 126)
+        // Not sure if this works with POWR1 (uiid 5)
         params.uiActive = json.params.uiActive
         suffix = 'monitor'
       } else if (json.params.cmd) {

From b4fd12a8299fbb6cb54010381c7e83afaf81b086 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 27 Jun 2021 14:27:43 +0100
Subject: [PATCH 2392/3183] lan polling for dualr3

---
 lib/device/motor.js        | 20 +++++++++-----------
 lib/device/outlet-multi.js | 18 ++++++++----------
 lib/device/switch-multi.js | 18 ++++++++----------
 3 files changed, 25 insertions(+), 31 deletions(-)

diff --git a/lib/device/motor.js b/lib/device/motor.js
index fa82ffa5..b71e41a3 100644
--- a/lib/device/motor.js
+++ b/lib/device/motor.js
@@ -90,17 +90,15 @@ module.exports = class deviceMotor {
     }
 
     // Set up an interval to get eWeLink to send power updates
-    if (platform.config.mode !== 'lan') {
-      setTimeout(() => {
-        this.internalUIUpdate()
-        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
-      }, 5000)
-
-      // Stop the intervals on Homebridge shutdown
-      platform.api.on('shutdown', () => {
-        clearInterval(this.intervalPoll)
-      })
-    }
+    setTimeout(() => {
+      this.internalUIUpdate()
+      this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
+    }, 5000)
+
+    // Stop the intervals on Homebridge shutdown
+    platform.api.on('shutdown', () => {
+      clearInterval(this.intervalPoll)
+    })
 
     // Output the customised options to the log
     const opts = JSON.stringify({
diff --git a/lib/device/outlet-multi.js b/lib/device/outlet-multi.js
index 4653ef1e..034047f0 100644
--- a/lib/device/outlet-multi.js
+++ b/lib/device/outlet-multi.js
@@ -128,17 +128,15 @@ module.exports = class deviceOutletDouble {
     // Set up extra features for outlets that provide power readings
     if (this.powerReadings && accessory.context.switchNumber === '0') {
       // Set up an interval to get eWeLink to send power updates
-      if (platform.config.mode !== 'lan') {
-        setTimeout(() => {
-          this.internalUIUpdate()
-          this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
-        }, 5000)
+      setTimeout(() => {
+        this.internalUIUpdate()
+        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
+      }, 5000)
 
-        // Stop the intervals on Homebridge shutdown
-        platform.api.on('shutdown', () => {
-          clearInterval(this.intervalPoll)
-        })
-      }
+      // Stop the intervals on Homebridge shutdown
+      platform.api.on('shutdown', () => {
+        clearInterval(this.intervalPoll)
+      })
     }
 
     // Output the customised options to the log
diff --git a/lib/device/switch-multi.js b/lib/device/switch-multi.js
index 1a15714d..a639310e 100644
--- a/lib/device/switch-multi.js
+++ b/lib/device/switch-multi.js
@@ -120,17 +120,15 @@ module.exports = class deviceSwitchDouble {
     // Set up extra features for outlets that provide power readings
     if (this.powerReadings && accessory.context.switchNumber === '0') {
       // Set up an interval to get eWeLink to send power updates
-      if (platform.config.mode !== 'lan') {
-        setTimeout(() => {
-          this.internalUIUpdate()
-          this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
-        }, 5000)
+      setTimeout(() => {
+        this.internalUIUpdate()
+        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
+      }, 5000)
 
-        // Stop the intervals on Homebridge shutdown
-        platform.api.on('shutdown', () => {
-          clearInterval(this.intervalPoll)
-        })
-      }
+      // Stop the intervals on Homebridge shutdown
+      platform.api.on('shutdown', () => {
+        clearInterval(this.intervalPoll)
+      })
     }
 
     // Output the customised options to the log

From 7bb9ba5f2b7d2551ab40d9bf8a1eb55e383d318f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 27 Jun 2021 14:31:44 +0100
Subject: [PATCH 2393/3183] power readings for blind simulations

---
 lib/device/simulation/blind.js | 98 +++++++++++++++++++++++++++++++++-
 1 file changed, 97 insertions(+), 1 deletion(-)

diff --git a/lib/device/simulation/blind.js b/lib/device/simulation/blind.js
index b9cae7aa..29f2c435 100644
--- a/lib/device/simulation/blind.js
+++ b/lib/device/simulation/blind.js
@@ -5,6 +5,7 @@
 module.exports = class deviceBlind {
   constructor (platform, accessory) {
     // Set up variables from the platform
+    this.eveChar = platform.eveChar
     this.funcs = platform.funcs
     this.hapChar = platform.api.hap.Characteristic
     this.hapErr = platform.api.hap.HapStatusError
@@ -60,6 +61,26 @@ module.exports = class deviceBlind {
       this.service.setCharacteristic(this.hapChar.PositionState, 2)
     }
 
+    // Certain devices give power readings
+    if ([5, 32, 126].includes(this.accessory.context.eweUIID)) {
+      // Add Eve power characteristics
+      this.powerReadings = true
+      if (!this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
+        this.service.addCharacteristic(this.eveChar.CurrentConsumption)
+      }
+      if (!this.service.testCharacteristic(this.eveChar.ElectricCurrent)) {
+        this.service.addCharacteristic(this.eveChar.ElectricCurrent)
+      }
+      if (!this.service.testCharacteristic(this.eveChar.Voltage)) {
+        this.service.addCharacteristic(this.eveChar.Voltage)
+      }
+
+      // Add a flag for the DUALR3 model which uses different polling params
+      if (this.accessory.context.eweUIID === 126) {
+        this.isDualR3 = true
+      }
+    }
+
     // Add the set handler to the target position characteristic
     this.service.getCharacteristic(this.hapChar.TargetPosition).onSet(value => {
       // We don't use await as we want the callback to be run straight away
@@ -82,6 +103,19 @@ module.exports = class deviceBlind {
       })
     }
 
+    if (this.powerReadings) {
+      // Set up an interval to get eWeLink to send power updates
+      setTimeout(() => {
+        this.internalUIUpdate()
+        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
+      }, 5000)
+
+      // Stop the intervals on Homebridge shutdown
+      platform.api.on('shutdown', () => {
+        clearInterval(this.intervalPoll)
+      })
+    }
+
     // Output the customised options to the log
     const opts = JSON.stringify({
       logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
@@ -171,7 +205,69 @@ module.exports = class deviceBlind {
     }
   }
 
-  async externalUpdate (params) {}
+  async internalUIUpdate () {
+    try {
+      // Skip polling if device isn't online
+      if (!this.isOnline) {
+        return
+      }
+
+      // Send the params to request the updates
+      if (this.isDualR3) {
+        await this.platform.sendDeviceUpdate(this.accessory, { uiActive: { outlet: 0, time: 120 } })
+      } else {
+        await this.platform.sendDeviceUpdate(this.accessory, { uiActive: 120 })
+      }
+    } catch (err) {
+      // Suppress errors here
+    }
+  }
+
+  async externalUpdate (params) {
+    if (!this.powerReadings) {
+      return
+    }
+    let logger = false
+    let power
+    let voltage
+    let current
+    if (this.funcs.hasProperty(params, 'actPow_00')) {
+      power = parseInt(params.actPow_00) / 100
+      this.service.updateCharacteristic(this.eveChar.CurrentConsumption, power)
+      logger = true
+    } else if (this.funcs.hasProperty(params, 'power')) {
+      power = parseFloat(params.power)
+      this.service.updateCharacteristic(this.eveChar.CurrentConsumption, power)
+      logger = true
+    }
+    if (this.funcs.hasProperty(params, 'voltage_00')) {
+      voltage = parseInt(params.voltage_00) / 100
+      this.service.updateCharacteristic(this.eveChar.Voltage, voltage)
+      logger = true
+    } else if (this.funcs.hasProperty(params, 'voltage')) {
+      voltage = parseFloat(params.voltage)
+      this.service.updateCharacteristic(this.eveChar.Voltage, voltage)
+      logger = true
+    }
+    if (this.funcs.hasProperty(params, 'current_00')) {
+      current = parseInt(params.current_00) / 100
+      this.service.updateCharacteristic(this.eveChar.ElectricCurrent, current)
+      logger = true
+    } else if (this.funcs.hasProperty(params, 'current')) {
+      current = parseFloat(params.current)
+      this.service.updateCharacteristic(this.eveChar.ElectricCurrent, current)
+      logger = true
+    }
+    if (params.updateSource && logger && this.enableLogging) {
+      this.log(
+        '[%s] %s%s%s.',
+        this.name,
+        power !== undefined ? this.lang.curPower + ' [' + power + 'W]' : '',
+        voltage !== undefined ? ' ' + this.lang.curVolt + ' [' + voltage + 'V]' : '',
+        current !== undefined ? ' ' + this.lang.curCurr + ' [' + current + 'A]' : ''
+      )
+    }
+  }
 
   markStatus (isOnline) {
     this.isOnline = isOnline

From c4124f7bb294e485cc5aa6c76c51c54d727c847f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 27 Jun 2021 14:32:17 +0100
Subject: [PATCH 2394/3183] 6.8.1-beta.47

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index dd4fd3ed..f2bf5b33 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.8.1-beta.46",
+  "version": "6.8.1-beta.47",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 572804ba..003dd209 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.8.1-beta.46",
+  "version": "6.8.1-beta.47",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 3d1de7c5158ed7a32b0c1a0573950cbdc8724502 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 27 Jun 2021 17:01:59 +0100
Subject: [PATCH 2395/3183] Revert "lan polling for dualr3"

This reverts commit b4fd12a8299fbb6cb54010381c7e83afaf81b086.
---
 lib/device/motor.js        | 20 +++++++++++---------
 lib/device/outlet-multi.js | 18 ++++++++++--------
 lib/device/switch-multi.js | 18 ++++++++++--------
 3 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/lib/device/motor.js b/lib/device/motor.js
index b71e41a3..fa82ffa5 100644
--- a/lib/device/motor.js
+++ b/lib/device/motor.js
@@ -90,15 +90,17 @@ module.exports = class deviceMotor {
     }
 
     // Set up an interval to get eWeLink to send power updates
-    setTimeout(() => {
-      this.internalUIUpdate()
-      this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
-    }, 5000)
-
-    // Stop the intervals on Homebridge shutdown
-    platform.api.on('shutdown', () => {
-      clearInterval(this.intervalPoll)
-    })
+    if (platform.config.mode !== 'lan') {
+      setTimeout(() => {
+        this.internalUIUpdate()
+        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
+      }, 5000)
+
+      // Stop the intervals on Homebridge shutdown
+      platform.api.on('shutdown', () => {
+        clearInterval(this.intervalPoll)
+      })
+    }
 
     // Output the customised options to the log
     const opts = JSON.stringify({
diff --git a/lib/device/outlet-multi.js b/lib/device/outlet-multi.js
index 034047f0..4653ef1e 100644
--- a/lib/device/outlet-multi.js
+++ b/lib/device/outlet-multi.js
@@ -128,15 +128,17 @@ module.exports = class deviceOutletDouble {
     // Set up extra features for outlets that provide power readings
     if (this.powerReadings && accessory.context.switchNumber === '0') {
       // Set up an interval to get eWeLink to send power updates
-      setTimeout(() => {
-        this.internalUIUpdate()
-        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
-      }, 5000)
+      if (platform.config.mode !== 'lan') {
+        setTimeout(() => {
+          this.internalUIUpdate()
+          this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
+        }, 5000)
 
-      // Stop the intervals on Homebridge shutdown
-      platform.api.on('shutdown', () => {
-        clearInterval(this.intervalPoll)
-      })
+        // Stop the intervals on Homebridge shutdown
+        platform.api.on('shutdown', () => {
+          clearInterval(this.intervalPoll)
+        })
+      }
     }
 
     // Output the customised options to the log
diff --git a/lib/device/switch-multi.js b/lib/device/switch-multi.js
index a639310e..1a15714d 100644
--- a/lib/device/switch-multi.js
+++ b/lib/device/switch-multi.js
@@ -120,15 +120,17 @@ module.exports = class deviceSwitchDouble {
     // Set up extra features for outlets that provide power readings
     if (this.powerReadings && accessory.context.switchNumber === '0') {
       // Set up an interval to get eWeLink to send power updates
-      setTimeout(() => {
-        this.internalUIUpdate()
-        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
-      }, 5000)
+      if (platform.config.mode !== 'lan') {
+        setTimeout(() => {
+          this.internalUIUpdate()
+          this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
+        }, 5000)
 
-      // Stop the intervals on Homebridge shutdown
-      platform.api.on('shutdown', () => {
-        clearInterval(this.intervalPoll)
-      })
+        // Stop the intervals on Homebridge shutdown
+        platform.api.on('shutdown', () => {
+          clearInterval(this.intervalPoll)
+        })
+      }
     }
 
     // Output the customised options to the log

From 6bd5c319560f40eafcd106e7e6add34d9654615a Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 27 Jun 2021 17:02:33 +0100
Subject: [PATCH 2396/3183] 6.8.1-beta.48

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index f2bf5b33..8b070696 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.8.1-beta.47",
+  "version": "6.8.1-beta.48",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 003dd209..31c47b08 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.8.1-beta.47",
+  "version": "6.8.1-beta.48",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 2710e87f78755725302b3864d4403a684513959a Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 28 Jun 2021 15:31:17 +0100
Subject: [PATCH 2397/3183] use sensor for lock simulation

---
 lib/device/simulation/lock-one.js       | 26 ++++++++---
 lib/device/simulation/sensor-hidden.js  | 62 +++++++++++++++++--------
 lib/device/simulation/sensor-visible.js | 62 +++++++++++++++++--------
 3 files changed, 103 insertions(+), 47 deletions(-)

diff --git a/lib/device/simulation/lock-one.js b/lib/device/simulation/lock-one.js
index 4504f992..d0fc71a2 100644
--- a/lib/device/simulation/lock-one.js
+++ b/lib/device/simulation/lock-one.js
@@ -44,6 +44,11 @@ module.exports = class deviceLockOne {
       }
     }
 
+    // Check the sensor is valid if defined by the user
+    if (deviceConf.sensorId) {
+      this.definedSensor = true
+    }
+
     // If the accessory has a switch service then remove it
     if (this.accessory.getService(this.hapServ.Switch)) {
       this.accessory.removeService(this.accessory.getService(this.hapServ.Switch))
@@ -111,6 +116,10 @@ module.exports = class deviceLockOne {
       this.inUse = true
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.service.setCharacteristic(this.hapChar.LockCurrentState, 0)
+      if (this.definedSensor) {
+        this.inUse = false
+        return
+      }
       if (this.enableLogging) {
         this.log('[%s] %s [%s].', this.name, this.lang.curState, this.lang.lockUnlocked)
       }
@@ -133,20 +142,23 @@ module.exports = class deviceLockOne {
 
   async externalUpdate (params) {
     try {
-      if (this.inUse) {
+      if (!this.setup) {
+        if (params.switches) {
+          this.setup = 'twoSwitch'
+        } else if (params.switch) {
+          this.setup = 'oneSwitch'
+        } else {
+          return
+        }
+      }
+      if (this.inUse || this.definedSensor) {
         return
       }
       if (params.switches) {
-        if (!this.setup) {
-          this.setup = 'twoSwitch'
-        }
         if (params.switches[0].switch === 'off') {
           return
         }
       } else if (params.switch) {
-        if (!this.setup) {
-          this.setup = 'oneSwitch'
-        }
         if (params.switch === 'off') {
           return
         }
diff --git a/lib/device/simulation/sensor-hidden.js b/lib/device/simulation/sensor-hidden.js
index 0d0b70fe..fdaf1340 100644
--- a/lib/device/simulation/sensor-hidden.js
+++ b/lib/device/simulation/sensor-hidden.js
@@ -36,7 +36,10 @@ module.exports = class deviceSensorHidden {
       }
       this.cacheState = newState
       for (const [deviceId, group] of Object.entries(this.platform.simulations)) {
-        if (group.sensorId === this.accessory.context.eweDeviceId && group.type === 'garage') {
+        if (
+          group.sensorId === this.accessory.context.eweDeviceId &&
+          ['garage', 'lock'].includes(group.type)
+        ) {
           const uuid = this.hapUUIDGen(deviceId + 'SWX')
           if (this.devicesInHB.has(uuid)) {
             const subAccessory = this.devicesInHB.get(uuid)
@@ -54,31 +57,50 @@ module.exports = class deviceSensorHidden {
                   break
               }
             }
-            const gdService = subAccessory.getService(this.hapServ.GarageDoorOpener)
+            const isGarage = group.type === 'garage'
+            const subService = subAccessory.getService(
+              isGarage ? this.hapServ.GarageDoorOpener : this.hapServ.LockMechanism
+            )
             const name = subAccessory.displayName
             switch (newState) {
               case 0:
-                gdService.updateCharacteristic(this.hapChar.TargetDoorState, 1)
-                gdService.updateCharacteristic(this.hapChar.CurrentDoorState, 1)
-                subAccessory.eveService.addEntry({ status: 1 })
-                if (params.updateSource && enableLogging) {
-                  this.log('[%s] %s [%s].', name, this.lang.curState, this.lang.doorClosed)
+                if (isGarage) {
+                  subService.updateCharacteristic(this.hapChar.TargetDoorState, 1)
+                  subService.updateCharacteristic(this.hapChar.CurrentDoorState, 1)
+                  subAccessory.eveService.addEntry({ status: 1 })
+                  if (params.updateSource && enableLogging) {
+                    this.log('[%s] %s [%s].', name, this.lang.curState, this.lang.doorClosed)
+                  }
+                } else {
+                  subService.updateCharacteristic(this.hapChar.LockTargetState, 1)
+                  subService.setCharacteristic(this.hapChar.LockCurrentState, 1)
+                  if (params.updateSource && enableLogging) {
+                    this.log('[%s] %s [%s].', name, this.lang.curState, this.lang.lockLocked)
+                  }
                 }
                 break
               case 1: {
-                await this.funcs.sleep(Math.max(group.operationTime * 100, 2000))
-                gdService.updateCharacteristic(this.hapChar.TargetDoorState, 0)
-                gdService.updateCharacteristic(this.hapChar.CurrentDoorState, 0)
-                subAccessory.eveService.addEntry({ status: 0 })
-                const initialTime = subAccessory.eveService.getInitialTime()
-                gdService.updateCharacteristic(
-                  this.eveChar.LastActivation,
-                  Math.round(new Date().valueOf() / 1000) - initialTime
-                )
-                const newTO = gdService.getCharacteristic(this.eveChar.TimesOpened).value + 1
-                gdService.updateCharacteristic(this.eveChar.TimesOpened, newTO)
-                if (params.updateSource && enableLogging) {
-                  this.log('[%s] %s [%s].', name, this.lang.curState, this.lang.doorOpen)
+                if (isGarage) {
+                  await this.funcs.sleep(Math.max(group.operationTime * 100, 2000))
+                  subService.updateCharacteristic(this.hapChar.TargetDoorState, 0)
+                  subService.updateCharacteristic(this.hapChar.CurrentDoorState, 0)
+                  subAccessory.eveService.addEntry({ status: 0 })
+                  const initialTime = subAccessory.eveService.getInitialTime()
+                  subService.updateCharacteristic(
+                    this.eveChar.LastActivation,
+                    Math.round(new Date().valueOf() / 1000) - initialTime
+                  )
+                  const newTO = subService.getCharacteristic(this.eveChar.TimesOpened).value + 1
+                  subService.updateCharacteristic(this.eveChar.TimesOpened, newTO)
+                  if (params.updateSource && enableLogging) {
+                    this.log('[%s] %s [%s].', name, this.lang.curState, this.lang.doorOpen)
+                  }
+                } else {
+                  subService.updateCharacteristic(this.hapChar.LockTargetState, 0)
+                  subService.setCharacteristic(this.hapChar.LockCurrentState, 0)
+                  if (params.updateSource && enableLogging) {
+                    this.log('[%s] %s [%s].', name, this.lang.curState, this.lang.lockUnlocked)
+                  }
                 }
                 break
               }
diff --git a/lib/device/simulation/sensor-visible.js b/lib/device/simulation/sensor-visible.js
index e2987248..45a80f56 100644
--- a/lib/device/simulation/sensor-visible.js
+++ b/lib/device/simulation/sensor-visible.js
@@ -143,7 +143,10 @@ module.exports = class deviceSensorVisible {
         )
       }
       for (const [deviceId, group] of Object.entries(this.platform.simulations)) {
-        if (group.sensorId === this.accessory.context.eweDeviceId && group.type === 'garage') {
+        if (
+          group.sensorId === this.accessory.context.eweDeviceId &&
+          ['garage', 'lock'].includes(group.type)
+        ) {
           const uuid = this.hapUUIDGen(deviceId + 'SWX')
           if (this.devicesInHB.has(uuid)) {
             const subAccessory = this.devicesInHB.get(uuid)
@@ -161,31 +164,50 @@ module.exports = class deviceSensorVisible {
                   break
               }
             }
-            const gdService = subAccessory.getService(this.hapServ.GarageDoorOpener)
+            const isGarage = group.type === 'garage'
+            const subService = subAccessory.getService(
+              group.type === 'garage' ? this.hapServ.GarageDoorOpener : this.hapServ.LockMechanism
+            )
             const name = subAccessory.displayName
             switch (newState) {
               case 0:
-                gdService.updateCharacteristic(this.hapChar.TargetDoorState, 1)
-                gdService.updateCharacteristic(this.hapChar.CurrentDoorState, 1)
-                subAccessory.eveService.addEntry({ status: 1 })
-                if (params.updateSource && enableLogging) {
-                  this.log('[%s] %s [%s].', name, this.lang.curState, this.lang.doorClosed)
+                if (isGarage) {
+                  subService.updateCharacteristic(this.hapChar.TargetDoorState, 1)
+                  subService.updateCharacteristic(this.hapChar.CurrentDoorState, 1)
+                  subAccessory.eveService.addEntry({ status: 1 })
+                  if (params.updateSource && enableLogging) {
+                    this.log('[%s] %s [%s].', name, this.lang.curState, this.lang.doorClosed)
+                  }
+                } else {
+                  subService.updateCharacteristic(this.hapChar.LockTargetState, 1)
+                  subService.setCharacteristic(this.hapChar.LockCurrentState, 1)
+                  if (params.updateSource && enableLogging) {
+                    this.log('[%s] %s [%s].', name, this.lang.curState, this.lang.lockLocked)
+                  }
                 }
                 break
               case 1: {
-                await this.funcs.sleep(Math.max(group.operationTime * 100, 2000))
-                gdService.updateCharacteristic(this.hapChar.TargetDoorState, 0)
-                gdService.updateCharacteristic(this.hapChar.CurrentDoorState, 0)
-                subAccessory.eveService.addEntry({ status: 0 })
-                const initialTime = subAccessory.eveService.getInitialTime()
-                gdService.updateCharacteristic(
-                  this.eveChar.LastActivation,
-                  Math.round(new Date().valueOf() / 1000) - initialTime
-                )
-                const newTO = gdService.getCharacteristic(this.eveChar.TimesOpened).value + 1
-                gdService.updateCharacteristic(this.eveChar.TimesOpened, newTO)
-                if (params.updateSource && enableLogging) {
-                  this.log('[%s] %s [%s].', name, this.lang.curState, this.lang.doorOpen)
+                if (isGarage) {
+                  await this.funcs.sleep(Math.max(group.operationTime * 100, 2000))
+                  subService.updateCharacteristic(this.hapChar.TargetDoorState, 0)
+                  subService.updateCharacteristic(this.hapChar.CurrentDoorState, 0)
+                  subAccessory.eveService.addEntry({ status: 0 })
+                  const initialTime = subAccessory.eveService.getInitialTime()
+                  subService.updateCharacteristic(
+                    this.eveChar.LastActivation,
+                    Math.round(new Date().valueOf() / 1000) - initialTime
+                  )
+                  const newTO = subService.getCharacteristic(this.eveChar.TimesOpened).value + 1
+                  subService.updateCharacteristic(this.eveChar.TimesOpened, newTO)
+                  if (params.updateSource && enableLogging) {
+                    this.log('[%s] %s [%s].', name, this.lang.curState, this.lang.doorOpen)
+                  }
+                } else {
+                  subService.updateCharacteristic(this.hapChar.LockTargetState, 0)
+                  subService.setCharacteristic(this.hapChar.LockCurrentState, 0)
+                  if (params.updateSource && enableLogging) {
+                    this.log('[%s] %s [%s].', name, this.lang.curState, this.lang.lockUnlocked)
+                  }
                 }
                 break
               }

From 5e65be280543b1e1f55ead06411e3b71b751e31f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 28 Jun 2021 15:32:15 +0100
Subject: [PATCH 2398/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 33d6396b..68a47b25 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -44,6 +44,8 @@ All notable changes to this homebridge-ewelink will be documented in this file.
   - Config option to offset the recorded humidity (%RH) for devices that report this
 - **Garage Simulations**
   - Added `TimesOpened` Eve characteristic functionality to single garage door simulation
+- **Lock Simulations**
+  - Added the option of using a DW2 or Zigbee contact sensor to determine *Locked* and *Unlocked* state
 - **New Devices**
   - Support for device with eWeLink UIID 67 _RollingDoor_
 

From 2207f6dd1b01648bac05c56bbe948e936d21f31d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 28 Jun 2021 17:04:19 +0100
Subject: [PATCH 2399/3183] Update package.json

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 31c47b08..c27c4f20 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
   "main": "lib/index.js",
   "engines": {
     "homebridge": "^1.3.3",
-    "node": "^14.17.1 || ^16.3.0"
+    "node": "^14.17.1 || ^16.4.0"
   },
   "repository": {
     "type": "git",

From f5503521f870d9fd272766fcc86ad3ab500cfb4f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 29 Jun 2021 06:52:04 +0100
Subject: [PATCH 2400/3183] bump ws to 7.5.1

---
 package-lock.json | 6 +++---
 package.json      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 8b070696..0be6ba19 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -296,9 +296,9 @@
       }
     },
     "ws": {
-      "version": "7.5.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.0.tgz",
-      "integrity": "sha512-6ezXvzOZupqKj4jUqbQ9tXuJNo+BR2gU8fFRk3XCP3e0G6WT414u5ELe6Y0vtp7kmSJ3F7YWObSNr1ESsgi4vw=="
+      "version": "7.5.1",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.1.tgz",
+      "integrity": "sha512-2c6faOUH/nhoQN6abwMloF7Iyl0ZS2E9HGtsiLrWn0zOOMWlhtDmdf/uihDt6jnuCxgtwGBNy6Onsoy2s2O2Ow=="
     }
   }
 }
diff --git a/package.json b/package.json
index c27c4f20..3ba3874f 100644
--- a/package.json
+++ b/package.json
@@ -54,7 +54,7 @@
     "node-persist": "^3.1.0",
     "p-queue": "^6.6.2",
     "websocket-as-promised": "^2.0.1",
-    "ws": "^7.5.0"
+    "ws": "^7.5.1"
   },
   "prettier": {
     "printWidth": 100

From 5562275f5f40c1b6d1dfefed8c4fa2d201ebe512 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 29 Jun 2021 06:52:08 +0100
Subject: [PATCH 2401/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 68a47b25..c9a5681d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -45,7 +45,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 - **Garage Simulations**
   - Added `TimesOpened` Eve characteristic functionality to single garage door simulation
 - **Lock Simulations**
-  - Added the option of using a DW2 or Zigbee contact sensor to determine *Locked* and *Unlocked* state
+  - Added the option of using a DW2 or Zigbee contact sensor to determine _Locked_ and _Unlocked_ state
 - **New Devices**
   - Support for device with eWeLink UIID 67 _RollingDoor_
 
@@ -66,7 +66,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
   - `sensorTimeDifference` minimum reduced to 5 seconds and default reduced to 60 seconds
 - **Dependencies**
   - Recommended node version bump to v14.17.1
-  - Bump `ws` dependency to v7.5.0
+  - Bump `ws` dependency to v7.5.1
 
 ### Fixed
 

From c6955b5a7d228fa2854568f18ba5fc889148d5bd Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 29 Jun 2021 08:05:38 +0100
Subject: [PATCH 2402/3183] lan polling dualr3

---
 lib/device/motor.js               |  20 ++--
 lib/device/outlet-multi.js        |  18 ++--
 lib/device/simulation/purifier.js | 159 +++++++++++++++++++++++++-----
 lib/device/switch-multi.js        |  18 ++--
 4 files changed, 160 insertions(+), 55 deletions(-)

diff --git a/lib/device/motor.js b/lib/device/motor.js
index fa82ffa5..b71e41a3 100644
--- a/lib/device/motor.js
+++ b/lib/device/motor.js
@@ -90,17 +90,15 @@ module.exports = class deviceMotor {
     }
 
     // Set up an interval to get eWeLink to send power updates
-    if (platform.config.mode !== 'lan') {
-      setTimeout(() => {
-        this.internalUIUpdate()
-        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
-      }, 5000)
-
-      // Stop the intervals on Homebridge shutdown
-      platform.api.on('shutdown', () => {
-        clearInterval(this.intervalPoll)
-      })
-    }
+    setTimeout(() => {
+      this.internalUIUpdate()
+      this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
+    }, 5000)
+
+    // Stop the intervals on Homebridge shutdown
+    platform.api.on('shutdown', () => {
+      clearInterval(this.intervalPoll)
+    })
 
     // Output the customised options to the log
     const opts = JSON.stringify({
diff --git a/lib/device/outlet-multi.js b/lib/device/outlet-multi.js
index 4653ef1e..034047f0 100644
--- a/lib/device/outlet-multi.js
+++ b/lib/device/outlet-multi.js
@@ -128,17 +128,15 @@ module.exports = class deviceOutletDouble {
     // Set up extra features for outlets that provide power readings
     if (this.powerReadings && accessory.context.switchNumber === '0') {
       // Set up an interval to get eWeLink to send power updates
-      if (platform.config.mode !== 'lan') {
-        setTimeout(() => {
-          this.internalUIUpdate()
-          this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
-        }, 5000)
+      setTimeout(() => {
+        this.internalUIUpdate()
+        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
+      }, 5000)
 
-        // Stop the intervals on Homebridge shutdown
-        platform.api.on('shutdown', () => {
-          clearInterval(this.intervalPoll)
-        })
-      }
+      // Stop the intervals on Homebridge shutdown
+      platform.api.on('shutdown', () => {
+        clearInterval(this.intervalPoll)
+      })
     }
 
     // Output the customised options to the log
diff --git a/lib/device/simulation/purifier.js b/lib/device/simulation/purifier.js
index badea660..80e4ddad 100644
--- a/lib/device/simulation/purifier.js
+++ b/lib/device/simulation/purifier.js
@@ -57,6 +57,46 @@ module.exports = class devicePurifier {
       this.accessory.getService(this.hapServ.AirPurifier) ||
       this.accessory.addService(this.hapServ.AirPurifier)
 
+    if (platform.consts.devices.singleSwitch.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'singleSwitch'
+    } else if (platform.consts.devices.outlet.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'singleSwitch'
+
+      // Add Eve power characteristics
+      this.powerReadings = true
+      if (!this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
+        this.service.addCharacteristic(this.eveChar.CurrentConsumption)
+      }
+      if (this.accessory.context.eweUIID === 32) {
+        if (!this.service.testCharacteristic(this.eveChar.ElectricCurrent)) {
+          this.service.addCharacteristic(this.eveChar.ElectricCurrent)
+        }
+        if (!this.service.testCharacteristic(this.eveChar.Voltage)) {
+          this.service.addCharacteristic(this.eveChar.Voltage)
+        }
+      }
+    } else if (platform.consts.devices.multiSwitch.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'multiSwitch'
+      if (this.accessory.context.eweUIID === 126) {
+        // Add Eve power characteristics
+        this.powerReadings = true
+        if (!this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
+          this.service.addCharacteristic(this.eveChar.CurrentConsumption)
+        }
+        if (this.accessory.context.eweUIID === 32) {
+          if (!this.service.testCharacteristic(this.eveChar.ElectricCurrent)) {
+            this.service.addCharacteristic(this.eveChar.ElectricCurrent)
+          }
+          if (!this.service.testCharacteristic(this.eveChar.Voltage)) {
+            this.service.addCharacteristic(this.eveChar.Voltage)
+          }
+        }
+        this.isDualR3 = true
+      }
+    } else if (platform.consts.devices.outletSCM.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'multiSwitch'
+    }
+
     // Add the set handler to the purifier active characteristic
     this.service
       .getCharacteristic(this.hapChar.Active)
@@ -94,6 +134,19 @@ module.exports = class devicePurifier {
       })
     }
 
+    if (this.powerReadings) {
+      // Set up an interval to get eWeLink to send power updates
+      setTimeout(() => {
+        this.internalUIUpdate()
+        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
+      }, 5000)
+
+      // Stop the intervals on Homebridge shutdown
+      platform.api.on('shutdown', () => {
+        clearInterval(this.intervalPoll)
+      })
+    }
+
     // Output the customised options to the log
     const opts = JSON.stringify({
       logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable'
@@ -105,10 +158,10 @@ module.exports = class devicePurifier {
     try {
       const params = {}
       switch (this.setup) {
-        case 'oneSwitch':
+        case 'singleSwitch':
           params.switch = value === 1 ? 'on' : 'off'
           break
-        case 'twoSwitch':
+        case 'multiSwitch':
           params.switches = [
             {
               switch: value === 1 ? 'on' : 'off',
@@ -134,34 +187,92 @@ module.exports = class devicePurifier {
     }
   }
 
+  async internalUIUpdate () {
+    try {
+      // Skip polling if device isn't online
+      if (!this.isOnline) {
+        return
+      }
+
+      // Send the params to request the updates
+      if (this.isDualR3) {
+        await this.platform.sendDeviceUpdate(this.accessory, { uiActive: { outlet: 0, time: 120 } })
+      } else {
+        await this.platform.sendDeviceUpdate(this.accessory, { uiActive: 120 })
+      }
+    } catch (err) {
+      // Suppress errors here
+    }
+  }
+
   async externalUpdate (params) {
     try {
-      if (params.switches) {
-        if (!this.setup) {
-          this.setup = 'twoSwitch'
-        }
-        if (params.switches[0].switch === this.cacheState) {
-          return
+      if (
+        (this.setup === 'multiSwitch' && params.switches) ||
+        (this.setup === 'singleSwitch' && params.switch)
+      ) {
+        let newState
+        if (this.setup === 'multiSwitch' && params.switches) {
+          newState = params.switches[0].switch
+        } else if (this.setup === 'singleSwitch' && params.switch) {
+          newState = params.switch
         }
-        this.cacheState = params.switches[0].switch
-      } else if (params.switch) {
-        if (!this.setup) {
-          this.setup = 'oneSwitch'
+        if (newState && newState !== this.cacheState) {
+          this.cacheState = newState
+          this.service.updateCharacteristic(this.hapChar.Active, this.cacheState === 'on' ? 1 : 0)
+          this.service.updateCharacteristic(
+            this.hapChar.CurrentAirPurifierState,
+            this.cacheState === 'on' ? 2 : 0
+          )
+          if (params.updateSource && this.enableLogging) {
+            this.log('[%s] %s [%s].', this.name, this.lang.curPur, this.cacheState)
+          }
         }
-        if (params.switch === this.cacheState) {
-          return
-        }
-        this.cacheState = params.switch
-      } else {
+      }
+
+      // Get the power readings given by certain devices
+      if (!this.powerReadings) {
         return
       }
-      this.service.updateCharacteristic(this.hapChar.Active, this.cacheState === 'on' ? 1 : 0)
-      this.service.updateCharacteristic(
-        this.hapChar.CurrentAirPurifierState,
-        this.cacheState === 'on' ? 2 : 0
-      )
-      if (params.updateSource && this.enableLogging) {
-        this.log('[%s] %s [%s].', this.name, this.lang.curPur, this.cacheState)
+      let logger = false
+      let power
+      let voltage
+      let current
+      if (this.funcs.hasProperty(params, 'actPow_00')) {
+        power = parseInt(params.actPow_00) / 100
+        this.service.updateCharacteristic(this.eveChar.CurrentConsumption, power)
+        logger = true
+      } else if (this.funcs.hasProperty(params, 'power')) {
+        power = parseFloat(params.power)
+        this.service.updateCharacteristic(this.eveChar.CurrentConsumption, power)
+        logger = true
+      }
+      if (this.funcs.hasProperty(params, 'voltage_00')) {
+        voltage = parseInt(params.voltage_00) / 100
+        this.service.updateCharacteristic(this.eveChar.Voltage, voltage)
+        logger = true
+      } else if (this.funcs.hasProperty(params, 'voltage')) {
+        voltage = parseFloat(params.voltage)
+        this.service.updateCharacteristic(this.eveChar.Voltage, voltage)
+        logger = true
+      }
+      if (this.funcs.hasProperty(params, 'current_00')) {
+        current = parseInt(params.current_00) / 100
+        this.service.updateCharacteristic(this.eveChar.ElectricCurrent, current)
+        logger = true
+      } else if (this.funcs.hasProperty(params, 'current')) {
+        current = parseFloat(params.current)
+        this.service.updateCharacteristic(this.eveChar.ElectricCurrent, current)
+        logger = true
+      }
+      if (params.updateSource && logger && this.enableLogging) {
+        this.log(
+          '[%s] %s%s%s.',
+          this.name,
+          power !== undefined ? this.lang.curPower + ' [' + power + 'W]' : '',
+          voltage !== undefined ? ' ' + this.lang.curVolt + ' [' + voltage + 'V]' : '',
+          current !== undefined ? ' ' + this.lang.curCurr + ' [' + current + 'A]' : ''
+        )
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
diff --git a/lib/device/switch-multi.js b/lib/device/switch-multi.js
index 1a15714d..a639310e 100644
--- a/lib/device/switch-multi.js
+++ b/lib/device/switch-multi.js
@@ -120,17 +120,15 @@ module.exports = class deviceSwitchDouble {
     // Set up extra features for outlets that provide power readings
     if (this.powerReadings && accessory.context.switchNumber === '0') {
       // Set up an interval to get eWeLink to send power updates
-      if (platform.config.mode !== 'lan') {
-        setTimeout(() => {
-          this.internalUIUpdate()
-          this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
-        }, 5000)
+      setTimeout(() => {
+        this.internalUIUpdate()
+        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
+      }, 5000)
 
-        // Stop the intervals on Homebridge shutdown
-        platform.api.on('shutdown', () => {
-          clearInterval(this.intervalPoll)
-        })
-      }
+      // Stop the intervals on Homebridge shutdown
+      platform.api.on('shutdown', () => {
+        clearInterval(this.intervalPoll)
+      })
     }
 
     // Output the customised options to the log

From b5170f05e4b95d48414de19d4c6eed1d8b69d776 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 29 Jun 2021 08:05:40 +0100
Subject: [PATCH 2403/3183] Update index.js

---
 lib/index.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/lib/index.js b/lib/index.js
index 8cf6fda4..2f0b7e1e 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1368,10 +1368,7 @@ class eWeLinkPlatform {
       accessory.context.firmware = device.params.fwVersion || plugin.version
       accessory.context.reachableWAN = wsClient && device.online
       accessory.context.reachableLAN =
-        this.consts.devices.lan.includes(uiid) &&
-        lanClient &&
-        lanDevices.has(device.deviceid) &&
-        lanDevices.get(device.deviceid).ip
+        lanClient && lanDevices.has(device.deviceid) && lanDevices.get(device.deviceid).ip
       accessory.context.eweBrandName = device.brandName
       accessory.context.eweBrandLogo = device.brandLogo
       accessory.context.eweShared =

From 31cc51734c9798b81ed386b4417a04ec38a4eae7 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 29 Jun 2021 08:14:36 +0100
Subject: [PATCH 2404/3183] power readings for some simulations

---
 lib/device/outlet-multi.js        |  2 +-
 lib/device/simulation/blind.js    | 89 +++++++++++++------------------
 lib/device/simulation/door.js     | 81 +++++++++++++++++++++++++++-
 lib/device/simulation/purifier.js |  1 +
 lib/device/simulation/window.js   | 81 +++++++++++++++++++++++++++-
 lib/device/switch-multi.js        |  2 +-
 6 files changed, 199 insertions(+), 57 deletions(-)

diff --git a/lib/device/outlet-multi.js b/lib/device/outlet-multi.js
index 034047f0..576f964f 100644
--- a/lib/device/outlet-multi.js
+++ b/lib/device/outlet-multi.js
@@ -2,7 +2,7 @@
 /* eslint-disable new-cap */
 'use strict'
 
-module.exports = class deviceOutletDouble {
+module.exports = class deviceOutletMulti {
   constructor (platform, accessory, devicesInHB) {
     // Set up variables from the platform
     this.devicesInHB = devicesInHB
diff --git a/lib/device/simulation/blind.js b/lib/device/simulation/blind.js
index 29f2c435..2013f095 100644
--- a/lib/device/simulation/blind.js
+++ b/lib/device/simulation/blind.js
@@ -62,7 +62,7 @@ module.exports = class deviceBlind {
     }
 
     // Certain devices give power readings
-    if ([5, 32, 126].includes(this.accessory.context.eweUIID)) {
+    if (this.accessory.context.eweUIID === 126) {
       // Add Eve power characteristics
       this.powerReadings = true
       if (!this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
@@ -74,11 +74,6 @@ module.exports = class deviceBlind {
       if (!this.service.testCharacteristic(this.eveChar.Voltage)) {
         this.service.addCharacteristic(this.eveChar.Voltage)
       }
-
-      // Add a flag for the DUALR3 model which uses different polling params
-      if (this.accessory.context.eweUIID === 126) {
-        this.isDualR3 = true
-      }
     }
 
     // Add the set handler to the target position characteristic
@@ -213,59 +208,47 @@ module.exports = class deviceBlind {
       }
 
       // Send the params to request the updates
-      if (this.isDualR3) {
-        await this.platform.sendDeviceUpdate(this.accessory, { uiActive: { outlet: 0, time: 120 } })
-      } else {
-        await this.platform.sendDeviceUpdate(this.accessory, { uiActive: 120 })
-      }
+      await this.platform.sendDeviceUpdate(this.accessory, { uiActive: { outlet: 0, time: 120 } })
     } catch (err) {
       // Suppress errors here
     }
   }
 
   async externalUpdate (params) {
-    if (!this.powerReadings) {
-      return
-    }
-    let logger = false
-    let power
-    let voltage
-    let current
-    if (this.funcs.hasProperty(params, 'actPow_00')) {
-      power = parseInt(params.actPow_00) / 100
-      this.service.updateCharacteristic(this.eveChar.CurrentConsumption, power)
-      logger = true
-    } else if (this.funcs.hasProperty(params, 'power')) {
-      power = parseFloat(params.power)
-      this.service.updateCharacteristic(this.eveChar.CurrentConsumption, power)
-      logger = true
-    }
-    if (this.funcs.hasProperty(params, 'voltage_00')) {
-      voltage = parseInt(params.voltage_00) / 100
-      this.service.updateCharacteristic(this.eveChar.Voltage, voltage)
-      logger = true
-    } else if (this.funcs.hasProperty(params, 'voltage')) {
-      voltage = parseFloat(params.voltage)
-      this.service.updateCharacteristic(this.eveChar.Voltage, voltage)
-      logger = true
-    }
-    if (this.funcs.hasProperty(params, 'current_00')) {
-      current = parseInt(params.current_00) / 100
-      this.service.updateCharacteristic(this.eveChar.ElectricCurrent, current)
-      logger = true
-    } else if (this.funcs.hasProperty(params, 'current')) {
-      current = parseFloat(params.current)
-      this.service.updateCharacteristic(this.eveChar.ElectricCurrent, current)
-      logger = true
-    }
-    if (params.updateSource && logger && this.enableLogging) {
-      this.log(
-        '[%s] %s%s%s.',
-        this.name,
-        power !== undefined ? this.lang.curPower + ' [' + power + 'W]' : '',
-        voltage !== undefined ? ' ' + this.lang.curVolt + ' [' + voltage + 'V]' : '',
-        current !== undefined ? ' ' + this.lang.curCurr + ' [' + current + 'A]' : ''
-      )
+    try {
+      if (!this.powerReadings) {
+        return
+      }
+      let logger = false
+      let power
+      let voltage
+      let current
+      if (this.funcs.hasProperty(params, 'actPow_00')) {
+        power = parseInt(params.actPow_00) / 100
+        this.service.updateCharacteristic(this.eveChar.CurrentConsumption, power)
+        logger = true
+      }
+      if (this.funcs.hasProperty(params, 'voltage_00')) {
+        voltage = parseInt(params.voltage_00) / 100
+        this.service.updateCharacteristic(this.eveChar.Voltage, voltage)
+        logger = true
+      }
+      if (this.funcs.hasProperty(params, 'current_00')) {
+        current = parseInt(params.current_00) / 100
+        this.service.updateCharacteristic(this.eveChar.ElectricCurrent, current)
+        logger = true
+      }
+      if (params.updateSource && logger && this.enableLogging) {
+        this.log(
+          '[%s] %s%s%s.',
+          this.name,
+          power !== undefined ? this.lang.curPower + ' [' + power + 'W]' : '',
+          voltage !== undefined ? ' ' + this.lang.curVolt + ' [' + voltage + 'V]' : '',
+          current !== undefined ? ' ' + this.lang.curCurr + ' [' + current + 'A]' : ''
+        )
+      }
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
 
diff --git a/lib/device/simulation/door.js b/lib/device/simulation/door.js
index 02ffd588..3f9e346c 100644
--- a/lib/device/simulation/door.js
+++ b/lib/device/simulation/door.js
@@ -5,6 +5,7 @@
 module.exports = class deviceDoor {
   constructor (platform, accessory) {
     // Set up variables from the platform
+    this.eveChar = platform.eveChar
     this.funcs = platform.funcs
     this.hapChar = platform.api.hap.Characteristic
     this.hapErr = platform.api.hap.HapStatusError
@@ -60,6 +61,21 @@ module.exports = class deviceDoor {
       this.service.setCharacteristic(this.hapChar.PositionState, 2)
     }
 
+    // Certain devices give power readings
+    if (this.accessory.context.eweUIID === 126) {
+      // Add Eve power characteristics
+      this.powerReadings = true
+      if (!this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
+        this.service.addCharacteristic(this.eveChar.CurrentConsumption)
+      }
+      if (!this.service.testCharacteristic(this.eveChar.ElectricCurrent)) {
+        this.service.addCharacteristic(this.eveChar.ElectricCurrent)
+      }
+      if (!this.service.testCharacteristic(this.eveChar.Voltage)) {
+        this.service.addCharacteristic(this.eveChar.Voltage)
+      }
+    }
+
     // Add the set handler to the target position characteristic
     this.service.getCharacteristic(this.hapChar.TargetPosition).onSet(value => {
       // We don't use await as we want the callback to be run straight away
@@ -82,6 +98,19 @@ module.exports = class deviceDoor {
       })
     }
 
+    if (this.powerReadings) {
+      // Set up an interval to get eWeLink to send power updates
+      setTimeout(() => {
+        this.internalUIUpdate()
+        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
+      }, 5000)
+
+      // Stop the intervals on Homebridge shutdown
+      platform.api.on('shutdown', () => {
+        clearInterval(this.intervalPoll)
+      })
+    }
+
     // Output the customised options to the log
     const opts = JSON.stringify({
       logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
@@ -171,7 +200,57 @@ module.exports = class deviceDoor {
     }
   }
 
-  async externalUpdate (params) {}
+  async internalUIUpdate () {
+    try {
+      // Skip polling if device isn't online
+      if (!this.isOnline) {
+        return
+      }
+
+      // Send the params to request the updates
+      await this.platform.sendDeviceUpdate(this.accessory, { uiActive: { outlet: 0, time: 120 } })
+    } catch (err) {
+      // Suppress errors here
+    }
+  }
+
+  async externalUpdate (params) {
+    try {
+      if (!this.powerReadings) {
+        return
+      }
+      let logger = false
+      let power
+      let voltage
+      let current
+      if (this.funcs.hasProperty(params, 'actPow_00')) {
+        power = parseInt(params.actPow_00) / 100
+        this.service.updateCharacteristic(this.eveChar.CurrentConsumption, power)
+        logger = true
+      }
+      if (this.funcs.hasProperty(params, 'voltage_00')) {
+        voltage = parseInt(params.voltage_00) / 100
+        this.service.updateCharacteristic(this.eveChar.Voltage, voltage)
+        logger = true
+      }
+      if (this.funcs.hasProperty(params, 'current_00')) {
+        current = parseInt(params.current_00) / 100
+        this.service.updateCharacteristic(this.eveChar.ElectricCurrent, current)
+        logger = true
+      }
+      if (params.updateSource && logger && this.enableLogging) {
+        this.log(
+          '[%s] %s%s%s.',
+          this.name,
+          power !== undefined ? this.lang.curPower + ' [' + power + 'W]' : '',
+          voltage !== undefined ? ' ' + this.lang.curVolt + ' [' + voltage + 'V]' : '',
+          current !== undefined ? ' ' + this.lang.curCurr + ' [' + current + 'A]' : ''
+        )
+      }
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, false)
+    }
+  }
 
   markStatus (isOnline) {
     this.isOnline = isOnline
diff --git a/lib/device/simulation/purifier.js b/lib/device/simulation/purifier.js
index 80e4ddad..b459cec1 100644
--- a/lib/device/simulation/purifier.js
+++ b/lib/device/simulation/purifier.js
@@ -5,6 +5,7 @@
 module.exports = class devicePurifier {
   constructor (platform, accessory) {
     // Set up variables from the platform
+    this.eveChar = platform.eveChar
     this.funcs = platform.funcs
     this.hapChar = platform.api.hap.Characteristic
     this.hapErr = platform.api.hap.HapStatusError
diff --git a/lib/device/simulation/window.js b/lib/device/simulation/window.js
index 31217b2b..20a96c2a 100644
--- a/lib/device/simulation/window.js
+++ b/lib/device/simulation/window.js
@@ -5,6 +5,7 @@
 module.exports = class deviceWindow {
   constructor (platform, accessory) {
     // Set up variables from the platform
+    this.eveChar = platform.eveChar
     this.funcs = platform.funcs
     this.hapChar = platform.api.hap.Characteristic
     this.hapErr = platform.api.hap.HapStatusError
@@ -60,6 +61,21 @@ module.exports = class deviceWindow {
       this.service.setCharacteristic(this.hapChar.PositionState, 2)
     }
 
+    // Certain devices give power readings
+    if (this.accessory.context.eweUIID === 126) {
+      // Add Eve power characteristics
+      this.powerReadings = true
+      if (!this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
+        this.service.addCharacteristic(this.eveChar.CurrentConsumption)
+      }
+      if (!this.service.testCharacteristic(this.eveChar.ElectricCurrent)) {
+        this.service.addCharacteristic(this.eveChar.ElectricCurrent)
+      }
+      if (!this.service.testCharacteristic(this.eveChar.Voltage)) {
+        this.service.addCharacteristic(this.eveChar.Voltage)
+      }
+    }
+
     // Add the set handler to the target position characteristic
     this.service.getCharacteristic(this.hapChar.TargetPosition).onSet(value => {
       // We don't use await as we want the callback to be run straight away
@@ -82,6 +98,19 @@ module.exports = class deviceWindow {
       })
     }
 
+    if (this.powerReadings) {
+      // Set up an interval to get eWeLink to send power updates
+      setTimeout(() => {
+        this.internalUIUpdate()
+        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
+      }, 5000)
+
+      // Stop the intervals on Homebridge shutdown
+      platform.api.on('shutdown', () => {
+        clearInterval(this.intervalPoll)
+      })
+    }
+
     // Output the customised options to the log
     const opts = JSON.stringify({
       logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
@@ -171,7 +200,57 @@ module.exports = class deviceWindow {
     }
   }
 
-  async externalUpdate (params) {}
+  async internalUIUpdate () {
+    try {
+      // Skip polling if device isn't online
+      if (!this.isOnline) {
+        return
+      }
+
+      // Send the params to request the updates
+      await this.platform.sendDeviceUpdate(this.accessory, { uiActive: { outlet: 0, time: 120 } })
+    } catch (err) {
+      // Suppress errors here
+    }
+  }
+
+  async externalUpdate (params) {
+    try {
+      if (!this.powerReadings) {
+        return
+      }
+      let logger = false
+      let power
+      let voltage
+      let current
+      if (this.funcs.hasProperty(params, 'actPow_00')) {
+        power = parseInt(params.actPow_00) / 100
+        this.service.updateCharacteristic(this.eveChar.CurrentConsumption, power)
+        logger = true
+      }
+      if (this.funcs.hasProperty(params, 'voltage_00')) {
+        voltage = parseInt(params.voltage_00) / 100
+        this.service.updateCharacteristic(this.eveChar.Voltage, voltage)
+        logger = true
+      }
+      if (this.funcs.hasProperty(params, 'current_00')) {
+        current = parseInt(params.current_00) / 100
+        this.service.updateCharacteristic(this.eveChar.ElectricCurrent, current)
+        logger = true
+      }
+      if (params.updateSource && logger && this.enableLogging) {
+        this.log(
+          '[%s] %s%s%s.',
+          this.name,
+          power !== undefined ? this.lang.curPower + ' [' + power + 'W]' : '',
+          voltage !== undefined ? ' ' + this.lang.curVolt + ' [' + voltage + 'V]' : '',
+          current !== undefined ? ' ' + this.lang.curCurr + ' [' + current + 'A]' : ''
+        )
+      }
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, false)
+    }
+  }
 
   markStatus (isOnline) {
     this.isOnline = isOnline
diff --git a/lib/device/switch-multi.js b/lib/device/switch-multi.js
index a639310e..f0ff2753 100644
--- a/lib/device/switch-multi.js
+++ b/lib/device/switch-multi.js
@@ -2,7 +2,7 @@
 /* eslint-disable new-cap */
 'use strict'
 
-module.exports = class deviceSwitchDouble {
+module.exports = class deviceSwitchMulti {
   constructor (platform, accessory, devicesInHB) {
     // Set up variables from the platform
     this.devicesInHB = devicesInHB

From 3cd0d7920fd5be7c5513d4fc9776b3ceec410f6d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 29 Jun 2021 08:38:29 +0100
Subject: [PATCH 2405/3183] power readings for some more simulations

---
 lib/device/simulation/blind.js     |   2 +-
 lib/device/simulation/door.js      |   2 +-
 lib/device/simulation/lock-one.js  | 165 +++++++++++++++++++++-----
 lib/device/simulation/purifier.js  |   3 +-
 lib/device/simulation/tap-one.js   | 159 +++++++++++++++++++++----
 lib/device/simulation/valve-one.js | 184 +++++++++++++++++++++++------
 lib/device/simulation/window.js    |   2 +-
 7 files changed, 419 insertions(+), 98 deletions(-)

diff --git a/lib/device/simulation/blind.js b/lib/device/simulation/blind.js
index 2013f095..b9f74e7c 100644
--- a/lib/device/simulation/blind.js
+++ b/lib/device/simulation/blind.js
@@ -98,8 +98,8 @@ module.exports = class deviceBlind {
       })
     }
 
+    // Set up an interval to get eWeLink to send power updates
     if (this.powerReadings) {
-      // Set up an interval to get eWeLink to send power updates
       setTimeout(() => {
         this.internalUIUpdate()
         this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
diff --git a/lib/device/simulation/door.js b/lib/device/simulation/door.js
index 3f9e346c..2aacbe44 100644
--- a/lib/device/simulation/door.js
+++ b/lib/device/simulation/door.js
@@ -98,8 +98,8 @@ module.exports = class deviceDoor {
       })
     }
 
+    // Set up an interval to get eWeLink to send power updates
     if (this.powerReadings) {
-      // Set up an interval to get eWeLink to send power updates
       setTimeout(() => {
         this.internalUIUpdate()
         this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
diff --git a/lib/device/simulation/lock-one.js b/lib/device/simulation/lock-one.js
index d0fc71a2..989c771b 100644
--- a/lib/device/simulation/lock-one.js
+++ b/lib/device/simulation/lock-one.js
@@ -5,6 +5,7 @@
 module.exports = class deviceLockOne {
   constructor (platform, accessory) {
     // Set up variables from the platform
+    this.eveChar = platform.eveChar
     this.funcs = platform.funcs
     this.hapChar = platform.api.hap.Characteristic
     this.hapErr = platform.api.hap.HapStatusError
@@ -59,6 +60,47 @@ module.exports = class deviceLockOne {
       this.accessory.getService(this.hapServ.LockMechanism) ||
       this.accessory.addService(this.hapServ.LockMechanism)
 
+    // Set up the device type and power readings if necessary
+    if (platform.consts.devices.singleSwitch.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'singleSwitch'
+    } else if (platform.consts.devices.outlet.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'singleSwitch'
+
+      // Add Eve power characteristics
+      this.powerReadings = true
+      if (!this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
+        this.service.addCharacteristic(this.eveChar.CurrentConsumption)
+      }
+      if (this.accessory.context.eweUIID === 32) {
+        if (!this.service.testCharacteristic(this.eveChar.ElectricCurrent)) {
+          this.service.addCharacteristic(this.eveChar.ElectricCurrent)
+        }
+        if (!this.service.testCharacteristic(this.eveChar.Voltage)) {
+          this.service.addCharacteristic(this.eveChar.Voltage)
+        }
+      }
+    } else if (platform.consts.devices.multiSwitch.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'multiSwitch'
+      if (this.accessory.context.eweUIID === 126) {
+        // Add Eve power characteristics
+        this.powerReadings = true
+        if (!this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
+          this.service.addCharacteristic(this.eveChar.CurrentConsumption)
+        }
+        if (this.accessory.context.eweUIID === 32) {
+          if (!this.service.testCharacteristic(this.eveChar.ElectricCurrent)) {
+            this.service.addCharacteristic(this.eveChar.ElectricCurrent)
+          }
+          if (!this.service.testCharacteristic(this.eveChar.Voltage)) {
+            this.service.addCharacteristic(this.eveChar.Voltage)
+          }
+        }
+        this.isDualR3 = true
+      }
+    } else if (platform.consts.devices.outletSCM.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'multiSwitch'
+    }
+
     // Add the set handler to the lock target state characteristic
     this.service.getCharacteristic(this.hapChar.LockTargetState).onSet(value => {
       // We don't use await as we want the callback to be run straight away
@@ -86,6 +128,19 @@ module.exports = class deviceLockOne {
       .updateCharacteristic(this.hapChar.LockCurrentState, 1)
       .updateCharacteristic(this.hapChar.LockTargetState, 1)
 
+    // Set up an interval to get eWeLink to send power updates
+    if (this.powerReadings) {
+      setTimeout(() => {
+        this.internalUIUpdate()
+        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
+      }, 5000)
+
+      // Stop the intervals on Homebridge shutdown
+      platform.api.on('shutdown', () => {
+        clearInterval(this.intervalPoll)
+      })
+    }
+
     // Output the customised options to the log
     const opts = JSON.stringify({
       logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
@@ -99,10 +154,10 @@ module.exports = class deviceLockOne {
     try {
       const params = {}
       switch (this.setup) {
-        case 'oneSwitch':
+        case 'singleSwitch':
           params.switch = 'on'
           break
-        case 'twoSwitch':
+        case 'multiSwitch':
           params.switches = [
             {
               switch: 'on',
@@ -140,44 +195,90 @@ module.exports = class deviceLockOne {
     }
   }
 
+  async internalUIUpdate () {
+    try {
+      // Skip polling if device isn't online
+      if (!this.isOnline) {
+        return
+      }
+
+      // Send the params to request the updates
+      if (this.isDualR3) {
+        await this.platform.sendDeviceUpdate(this.accessory, { uiActive: { outlet: 0, time: 120 } })
+      } else {
+        await this.platform.sendDeviceUpdate(this.accessory, { uiActive: 120 })
+      }
+    } catch (err) {
+      // Suppress errors here
+    }
+  }
+
   async externalUpdate (params) {
     try {
-      if (!this.setup) {
-        if (params.switches) {
-          this.setup = 'twoSwitch'
-        } else if (params.switch) {
-          this.setup = 'oneSwitch'
-        } else {
-          return
+      if (!this.inUse && !this.definedSensor) {
+        if (
+          (this.setup === 'multiSwitch' && params.switches && params.switches[0].switch === 'on') ||
+          (this.setup === 'singleSwitch' && params.switch && params.switch === 'on')
+        ) {
+          this.inUse = true
+          this.service.updateCharacteristic(this.hapChar.LockCurrentState, 0)
+          this.service.updateCharacteristic(this.hapChar.LockTargetState, 0)
+          if (params.updateSource && this.enableLogging) {
+            this.log('[%s] %s [%s].', this.name, this.lang.curState, this.lang.lockUnlocked)
+          }
+          await this.funcs.sleep(Math.max(this.operationTime * 100, 1000))
+          this.service.updateCharacteristic(this.hapChar.LockCurrentState, 1)
+          this.service.updateCharacteristic(this.hapChar.LockTargetState, 1)
+          this.inUse = false
+          if (params.updateSource && this.enableLogging) {
+            this.log('[%s] %s [%s].', this.name, this.lang.curState, this.lang.lockLocked)
+          }
         }
       }
-      if (this.inUse || this.definedSensor) {
+
+      // Get the power readings given by certain devices
+      if (!this.powerReadings) {
         return
       }
-      if (params.switches) {
-        if (params.switches[0].switch === 'off') {
-          return
-        }
-      } else if (params.switch) {
-        if (params.switch === 'off') {
-          return
-        }
-      } else {
-        return
+      let logger = false
+      let power
+      let voltage
+      let current
+      if (this.funcs.hasProperty(params, 'actPow_00')) {
+        power = parseInt(params.actPow_00) / 100
+        this.service.updateCharacteristic(this.eveChar.CurrentConsumption, power)
+        logger = true
+      } else if (this.funcs.hasProperty(params, 'power')) {
+        power = parseFloat(params.power)
+        this.service.updateCharacteristic(this.eveChar.CurrentConsumption, power)
+        logger = true
       }
-      this.inUse = true
-      this.service.updateCharacteristic(this.hapChar.LockCurrentState, 0)
-      this.service.updateCharacteristic(this.hapChar.LockTargetState, 0)
-      if (params.updateSource && this.enableLogging) {
-        this.log('[%s] %s [%s].', this.name, this.lang.curState, this.lang.lockUnlocked)
+      if (this.funcs.hasProperty(params, 'voltage_00')) {
+        voltage = parseInt(params.voltage_00) / 100
+        this.service.updateCharacteristic(this.eveChar.Voltage, voltage)
+        logger = true
+      } else if (this.funcs.hasProperty(params, 'voltage')) {
+        voltage = parseFloat(params.voltage)
+        this.service.updateCharacteristic(this.eveChar.Voltage, voltage)
+        logger = true
       }
-      await this.funcs.sleep(Math.max(this.operationTime * 100, 1000))
-      this.service
-        .updateCharacteristic(this.hapChar.LockCurrentState, 1)
-        .updateCharacteristic(this.hapChar.LockTargetState, 1)
-      this.inUse = false
-      if (params.updateSource && this.enableLogging) {
-        this.log('[%s] %s [%s].', this.name, this.lang.curState, this.lang.lockLocked)
+      if (this.funcs.hasProperty(params, 'current_00')) {
+        current = parseInt(params.current_00) / 100
+        this.service.updateCharacteristic(this.eveChar.ElectricCurrent, current)
+        logger = true
+      } else if (this.funcs.hasProperty(params, 'current')) {
+        current = parseFloat(params.current)
+        this.service.updateCharacteristic(this.eveChar.ElectricCurrent, current)
+        logger = true
+      }
+      if (params.updateSource && logger && this.enableLogging) {
+        this.log(
+          '[%s] %s%s%s.',
+          this.name,
+          power !== undefined ? this.lang.curPower + ' [' + power + 'W]' : '',
+          voltage !== undefined ? ' ' + this.lang.curVolt + ' [' + voltage + 'V]' : '',
+          current !== undefined ? ' ' + this.lang.curCurr + ' [' + current + 'A]' : ''
+        )
       }
     } catch (err) {
       this.inUse = false
diff --git a/lib/device/simulation/purifier.js b/lib/device/simulation/purifier.js
index b459cec1..3953c5f9 100644
--- a/lib/device/simulation/purifier.js
+++ b/lib/device/simulation/purifier.js
@@ -58,6 +58,7 @@ module.exports = class devicePurifier {
       this.accessory.getService(this.hapServ.AirPurifier) ||
       this.accessory.addService(this.hapServ.AirPurifier)
 
+    // Set up the device type and power readings if necessary
     if (platform.consts.devices.singleSwitch.includes(this.accessory.context.eweUIID)) {
       this.setup = 'singleSwitch'
     } else if (platform.consts.devices.outlet.includes(this.accessory.context.eweUIID)) {
@@ -135,8 +136,8 @@ module.exports = class devicePurifier {
       })
     }
 
+    // Set up an interval to get eWeLink to send power updates
     if (this.powerReadings) {
-      // Set up an interval to get eWeLink to send power updates
       setTimeout(() => {
         this.internalUIUpdate()
         this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
diff --git a/lib/device/simulation/tap-one.js b/lib/device/simulation/tap-one.js
index 934cdd95..dc4316b7 100644
--- a/lib/device/simulation/tap-one.js
+++ b/lib/device/simulation/tap-one.js
@@ -5,6 +5,7 @@
 module.exports = class deviceTapOne {
   constructor (platform, accessory) {
     // Set up variables from the platform
+    this.eveChar = platform.eveChar
     this.hapChar = platform.api.hap.Characteristic
     this.hapErr = platform.api.hap.HapStatusError
     this.hapServ = platform.api.hap.Service
@@ -55,6 +56,47 @@ module.exports = class deviceTapOne {
       this.service.setCharacteristic(this.hapChar.ValveType, 3)
     }
 
+    // Set up the device type and power readings if necessary
+    if (platform.consts.devices.singleSwitch.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'singleSwitch'
+    } else if (platform.consts.devices.outlet.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'singleSwitch'
+
+      // Add Eve power characteristics
+      this.powerReadings = true
+      if (!this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
+        this.service.addCharacteristic(this.eveChar.CurrentConsumption)
+      }
+      if (this.accessory.context.eweUIID === 32) {
+        if (!this.service.testCharacteristic(this.eveChar.ElectricCurrent)) {
+          this.service.addCharacteristic(this.eveChar.ElectricCurrent)
+        }
+        if (!this.service.testCharacteristic(this.eveChar.Voltage)) {
+          this.service.addCharacteristic(this.eveChar.Voltage)
+        }
+      }
+    } else if (platform.consts.devices.multiSwitch.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'multiSwitch'
+      if (this.accessory.context.eweUIID === 126) {
+        // Add Eve power characteristics
+        this.powerReadings = true
+        if (!this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
+          this.service.addCharacteristic(this.eveChar.CurrentConsumption)
+        }
+        if (this.accessory.context.eweUIID === 32) {
+          if (!this.service.testCharacteristic(this.eveChar.ElectricCurrent)) {
+            this.service.addCharacteristic(this.eveChar.ElectricCurrent)
+          }
+          if (!this.service.testCharacteristic(this.eveChar.Voltage)) {
+            this.service.addCharacteristic(this.eveChar.Voltage)
+          }
+        }
+        this.isDualR3 = true
+      }
+    } else if (platform.consts.devices.outletSCM.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'multiSwitch'
+    }
+
     // Add the set handler to the tap active characteristic
     this.service.getCharacteristic(this.hapChar.Active).onSet(async value => {
       await this.internalUpdate(value)
@@ -70,6 +112,19 @@ module.exports = class deviceTapOne {
       })
     }
 
+    // Set up an interval to get eWeLink to send power updates
+    if (this.powerReadings) {
+      setTimeout(() => {
+        this.internalUIUpdate()
+        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
+      }, 5000)
+
+      // Stop the intervals on Homebridge shutdown
+      platform.api.on('shutdown', () => {
+        clearInterval(this.intervalPoll)
+      })
+    }
+
     // Output the customised options to the log
     const opts = JSON.stringify({
       logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
@@ -82,10 +137,10 @@ module.exports = class deviceTapOne {
     try {
       const params = {}
       switch (this.setup) {
-        case 'oneSwitch':
+        case 'singleSwitch':
           params.switch = value ? 'on' : 'off'
           break
-        case 'twoSwitch':
+        case 'multiSwitch':
           params.switches = [
             {
               switch: value ? 'on' : 'off',
@@ -116,35 +171,93 @@ module.exports = class deviceTapOne {
     }
   }
 
+  async internalUIUpdate () {
+    try {
+      // Skip polling if device isn't online
+      if (!this.isOnline) {
+        return
+      }
+
+      // Send the params to request the updates
+      if (this.isDualR3) {
+        await this.platform.sendDeviceUpdate(this.accessory, { uiActive: { outlet: 0, time: 120 } })
+      } else {
+        await this.platform.sendDeviceUpdate(this.accessory, { uiActive: 120 })
+      }
+    } catch (err) {
+      // Suppress errors here
+    }
+  }
+
   async externalUpdate (params) {
     try {
-      if (params.switches) {
-        if (!this.setup) {
-          this.setup = 'twoSwitch'
-        }
-        if (params.switches[0].switch === this.cacheState) {
-          return
-        }
-        this.cacheState = params.switches[0].switch
-      } else if (params.switch) {
-        if (!this.setup) {
-          this.setup = 'oneSwitch'
+      if (
+        (this.setup === 'multiSwitch' && params.switches) ||
+        (this.setup === 'singleSwitch' && params.switch)
+      ) {
+        let newState
+        if (this.setup === 'multiSwitch' && params.switches) {
+          newState = params.switches[0].switch
+        } else if (this.setup === 'singleSwitch' && params.switch) {
+          newState = params.switch
         }
-        if (params.switch === this.cacheState) {
-          return
+        if (newState && newState !== this.cacheState) {
+          this.cacheState = newState
+          this.service.updateCharacteristic(this.hapChar.Active, this.cacheState === 'on' ? 1 : 0)
+          this.service.updateCharacteristic(this.hapChar.InUse, this.cacheState === 'on' ? 1 : 0)
+          if (params.updateSource && this.enableLogging) {
+            this.log(
+              '[%s] %s [%s].',
+              this.name,
+              this.lang.curState,
+              this.cacheState === 'on' ? this.lang.valveYes : this.lang.valveNo
+            )
+          }
         }
-        this.cacheState = params.switch
-      } else {
+      }
+
+      // Get the power readings given by certain devices
+      if (!this.powerReadings) {
         return
       }
-      this.service.updateCharacteristic(this.hapChar.Active, this.cacheState === 'on' ? 1 : 0)
-      this.service.updateCharacteristic(this.hapChar.InUse, this.cacheState === 'on' ? 1 : 0)
-      if (params.updateSource && this.enableLogging) {
+      let logger = false
+      let power
+      let voltage
+      let current
+      if (this.funcs.hasProperty(params, 'actPow_00')) {
+        power = parseInt(params.actPow_00) / 100
+        this.service.updateCharacteristic(this.eveChar.CurrentConsumption, power)
+        logger = true
+      } else if (this.funcs.hasProperty(params, 'power')) {
+        power = parseFloat(params.power)
+        this.service.updateCharacteristic(this.eveChar.CurrentConsumption, power)
+        logger = true
+      }
+      if (this.funcs.hasProperty(params, 'voltage_00')) {
+        voltage = parseInt(params.voltage_00) / 100
+        this.service.updateCharacteristic(this.eveChar.Voltage, voltage)
+        logger = true
+      } else if (this.funcs.hasProperty(params, 'voltage')) {
+        voltage = parseFloat(params.voltage)
+        this.service.updateCharacteristic(this.eveChar.Voltage, voltage)
+        logger = true
+      }
+      if (this.funcs.hasProperty(params, 'current_00')) {
+        current = parseInt(params.current_00) / 100
+        this.service.updateCharacteristic(this.eveChar.ElectricCurrent, current)
+        logger = true
+      } else if (this.funcs.hasProperty(params, 'current')) {
+        current = parseFloat(params.current)
+        this.service.updateCharacteristic(this.eveChar.ElectricCurrent, current)
+        logger = true
+      }
+      if (params.updateSource && logger && this.enableLogging) {
         this.log(
-          '[%s] %s [%s].',
+          '[%s] %s%s%s.',
           this.name,
-          this.lang.curState,
-          this.cacheState === 'on' ? this.lang.valveYes : this.lang.valveNo
+          power !== undefined ? this.lang.curPower + ' [' + power + 'W]' : '',
+          voltage !== undefined ? ' ' + this.lang.curVolt + ' [' + voltage + 'V]' : '',
+          current !== undefined ? ' ' + this.lang.curCurr + ' [' + current + 'A]' : ''
         )
       }
     } catch (err) {
diff --git a/lib/device/simulation/valve-one.js b/lib/device/simulation/valve-one.js
index 22775a08..3e57a0b6 100644
--- a/lib/device/simulation/valve-one.js
+++ b/lib/device/simulation/valve-one.js
@@ -5,6 +5,7 @@
 module.exports = class deviceValveOne {
   constructor (platform, accessory) {
     // Set up variables from the platform
+    this.eveChar = platform.eveChar
     this.hapChar = platform.api.hap.Characteristic
     this.hapErr = platform.api.hap.HapStatusError
     this.hapServ = platform.api.hap.Service
@@ -57,6 +58,47 @@ module.exports = class deviceValveOne {
       this.service.addCharacteristic(this.hapChar.RemainingDuration)
     }
 
+    // Set up the device type and power readings if necessary
+    if (platform.consts.devices.singleSwitch.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'singleSwitch'
+    } else if (platform.consts.devices.outlet.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'singleSwitch'
+
+      // Add Eve power characteristics
+      this.powerReadings = true
+      if (!this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
+        this.service.addCharacteristic(this.eveChar.CurrentConsumption)
+      }
+      if (this.accessory.context.eweUIID === 32) {
+        if (!this.service.testCharacteristic(this.eveChar.ElectricCurrent)) {
+          this.service.addCharacteristic(this.eveChar.ElectricCurrent)
+        }
+        if (!this.service.testCharacteristic(this.eveChar.Voltage)) {
+          this.service.addCharacteristic(this.eveChar.Voltage)
+        }
+      }
+    } else if (platform.consts.devices.multiSwitch.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'multiSwitch'
+      if (this.accessory.context.eweUIID === 126) {
+        // Add Eve power characteristics
+        this.powerReadings = true
+        if (!this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
+          this.service.addCharacteristic(this.eveChar.CurrentConsumption)
+        }
+        if (this.accessory.context.eweUIID === 32) {
+          if (!this.service.testCharacteristic(this.eveChar.ElectricCurrent)) {
+            this.service.addCharacteristic(this.eveChar.ElectricCurrent)
+          }
+          if (!this.service.testCharacteristic(this.eveChar.Voltage)) {
+            this.service.addCharacteristic(this.eveChar.Voltage)
+          }
+        }
+        this.isDualR3 = true
+      }
+    } else if (platform.consts.devices.outletSCM.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'multiSwitch'
+    }
+
     // Add the set handler to the valve active characteristic
     this.service
       .getCharacteristic(this.hapChar.Active)
@@ -90,6 +132,19 @@ module.exports = class deviceValveOne {
       }
     })
 
+    // Set up an interval to get eWeLink to send power updates
+    if (this.powerReadings) {
+      setTimeout(() => {
+        this.internalUIUpdate()
+        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
+      }, 5000)
+
+      // Stop the intervals on Homebridge shutdown
+      platform.api.on('shutdown', () => {
+        clearInterval(this.intervalPoll)
+      })
+    }
+
     // Output the customised options to the log
     const opts = JSON.stringify({
       logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
@@ -100,15 +155,12 @@ module.exports = class deviceValveOne {
 
   async internalUpdate (value) {
     try {
-      if (this.error) {
-        throw new Error(this.lang.invalidConfig + ' - ' + this.error)
-      }
       const params = {}
       switch (this.setup) {
-        case 'oneSwitch':
+        case 'singleSwitch':
           params.switch = value ? 'on' : 'off'
           break
-        case 'twoSwitch':
+        case 'multiSwitch':
           params.switches = [
             {
               switch: value ? 'on' : 'off',
@@ -148,47 +200,101 @@ module.exports = class deviceValveOne {
     }
   }
 
-  async externalUpdate (params) {
+  async internalUIUpdate () {
     try {
-      if (this.error) {
-        throw new Error(this.lang.invalidConfig + ' - ' + this.error)
+      // Skip polling if device isn't online
+      if (!this.isOnline) {
+        return
       }
-      let isOn = false
-      switch (this.setup) {
-        case 'oneSwitch':
-          if (!params.switch) {
-            return
-          }
-          isOn = params.switch === 'on'
-          break
-        case 'twoSwitch':
-          if (!params.switches) {
-            return
-          }
-          isOn = params.switches[0].switch === 'on'
-          break
+
+      // Send the params to request the updates
+      if (this.isDualR3) {
+        await this.platform.sendDeviceUpdate(this.accessory, { uiActive: { outlet: 0, time: 120 } })
+      } else {
+        await this.platform.sendDeviceUpdate(this.accessory, { uiActive: 120 })
       }
-      if (isOn) {
-        if (this.service.getCharacteristic(this.hapChar.Active).value === 0) {
-          const timer = this.service.getCharacteristic(this.hapChar.SetDuration).value
-          this.service
-            .updateCharacteristic(this.hapChar.Active, 1)
-            .updateCharacteristic(this.hapChar.InUse, 1)
-            .updateCharacteristic(this.hapChar.RemainingDuration, timer)
-          if (params.updateSource && this.enableLogging) {
-            this.log('[%s] %s [%s].', this.name, this.lang.curState, this.lang.valveYes)
+    } catch (err) {
+      // Suppress errors here
+    }
+  }
+
+  async externalUpdate (params) {
+    try {
+      if (
+        (this.setup === 'multiSwitch' && params.switches) ||
+        (this.setup === 'singleSwitch' && params.switch)
+      ) {
+        let newState
+        if (this.setup === 'multiSwitch' && params.switches) {
+          newState = params.switches[0].switch
+        } else if (this.setup === 'singleSwitch' && params.switch) {
+          newState = params.switch
+        }
+        if (newState === 'on') {
+          if (this.service.getCharacteristic(this.hapChar.Active).value === 0) {
+            const timer = this.service.getCharacteristic(this.hapChar.SetDuration).value
+            this.service.updateCharacteristic(this.hapChar.Active, 1)
+            this.service.updateCharacteristic(this.hapChar.InUse, 1)
+            this.service.updateCharacteristic(this.hapChar.RemainingDuration, timer)
+            if (params.updateSource && this.enableLogging) {
+              this.log('[%s] %s [%s].', this.name, this.lang.curState, this.lang.valveYes)
+            }
+            this.timer = setTimeout(() => {
+              this.service.setCharacteristic(this.hapChar.Active, 0)
+            }, timer * 1000)
           }
-          this.timer = setTimeout(() => {
-            this.service.setCharacteristic(this.hapChar.Active, 0)
-          }, timer * 1000)
+        } else {
+          this.service.updateCharacteristic(this.hapChar.Active, 0)
+          this.service.updateCharacteristic(this.hapChar.InUse, 0)
+          this.service.updateCharacteristic(this.hapChar.RemainingDuration, 0)
+          clearTimeout(this.timer)
         }
+      }
+
+      // Get the power readings given by certain devices
+      if (!this.powerReadings) {
         return
       }
-      this.service
-        .updateCharacteristic(this.hapChar.Active, 0)
-        .updateCharacteristic(this.hapChar.InUse, 0)
-        .updateCharacteristic(this.hapChar.RemainingDuration, 0)
-      clearTimeout(this.timer)
+      let logger = false
+      let power
+      let voltage
+      let current
+      if (this.funcs.hasProperty(params, 'actPow_00')) {
+        power = parseInt(params.actPow_00) / 100
+        this.service.updateCharacteristic(this.eveChar.CurrentConsumption, power)
+        logger = true
+      } else if (this.funcs.hasProperty(params, 'power')) {
+        power = parseFloat(params.power)
+        this.service.updateCharacteristic(this.eveChar.CurrentConsumption, power)
+        logger = true
+      }
+      if (this.funcs.hasProperty(params, 'voltage_00')) {
+        voltage = parseInt(params.voltage_00) / 100
+        this.service.updateCharacteristic(this.eveChar.Voltage, voltage)
+        logger = true
+      } else if (this.funcs.hasProperty(params, 'voltage')) {
+        voltage = parseFloat(params.voltage)
+        this.service.updateCharacteristic(this.eveChar.Voltage, voltage)
+        logger = true
+      }
+      if (this.funcs.hasProperty(params, 'current_00')) {
+        current = parseInt(params.current_00) / 100
+        this.service.updateCharacteristic(this.eveChar.ElectricCurrent, current)
+        logger = true
+      } else if (this.funcs.hasProperty(params, 'current')) {
+        current = parseFloat(params.current)
+        this.service.updateCharacteristic(this.eveChar.ElectricCurrent, current)
+        logger = true
+      }
+      if (params.updateSource && logger && this.enableLogging) {
+        this.log(
+          '[%s] %s%s%s.',
+          this.name,
+          power !== undefined ? this.lang.curPower + ' [' + power + 'W]' : '',
+          voltage !== undefined ? ' ' + this.lang.curVolt + ' [' + voltage + 'V]' : '',
+          current !== undefined ? ' ' + this.lang.curCurr + ' [' + current + 'A]' : ''
+        )
+      }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
diff --git a/lib/device/simulation/window.js b/lib/device/simulation/window.js
index 20a96c2a..68770e87 100644
--- a/lib/device/simulation/window.js
+++ b/lib/device/simulation/window.js
@@ -98,8 +98,8 @@ module.exports = class deviceWindow {
       })
     }
 
+    // Set up an interval to get eWeLink to send power updates
     if (this.powerReadings) {
-      // Set up an interval to get eWeLink to send power updates
       setTimeout(() => {
         this.internalUIUpdate()
         this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)

From 4608ec709c138f857209dac40188c586ed35996f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 29 Jun 2021 08:40:58 +0100
Subject: [PATCH 2406/3183] fix dualr3 checking

---
 lib/device/simulation/lock-one.js  | 12 +++++-------
 lib/device/simulation/purifier.js  | 12 +++++-------
 lib/device/simulation/tap-one.js   | 12 +++++-------
 lib/device/simulation/valve-one.js | 12 +++++-------
 4 files changed, 20 insertions(+), 28 deletions(-)

diff --git a/lib/device/simulation/lock-one.js b/lib/device/simulation/lock-one.js
index 989c771b..282eea47 100644
--- a/lib/device/simulation/lock-one.js
+++ b/lib/device/simulation/lock-one.js
@@ -87,13 +87,11 @@ module.exports = class deviceLockOne {
         if (!this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
           this.service.addCharacteristic(this.eveChar.CurrentConsumption)
         }
-        if (this.accessory.context.eweUIID === 32) {
-          if (!this.service.testCharacteristic(this.eveChar.ElectricCurrent)) {
-            this.service.addCharacteristic(this.eveChar.ElectricCurrent)
-          }
-          if (!this.service.testCharacteristic(this.eveChar.Voltage)) {
-            this.service.addCharacteristic(this.eveChar.Voltage)
-          }
+        if (!this.service.testCharacteristic(this.eveChar.ElectricCurrent)) {
+          this.service.addCharacteristic(this.eveChar.ElectricCurrent)
+        }
+        if (!this.service.testCharacteristic(this.eveChar.Voltage)) {
+          this.service.addCharacteristic(this.eveChar.Voltage)
         }
         this.isDualR3 = true
       }
diff --git a/lib/device/simulation/purifier.js b/lib/device/simulation/purifier.js
index 3953c5f9..9724c52b 100644
--- a/lib/device/simulation/purifier.js
+++ b/lib/device/simulation/purifier.js
@@ -85,13 +85,11 @@ module.exports = class devicePurifier {
         if (!this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
           this.service.addCharacteristic(this.eveChar.CurrentConsumption)
         }
-        if (this.accessory.context.eweUIID === 32) {
-          if (!this.service.testCharacteristic(this.eveChar.ElectricCurrent)) {
-            this.service.addCharacteristic(this.eveChar.ElectricCurrent)
-          }
-          if (!this.service.testCharacteristic(this.eveChar.Voltage)) {
-            this.service.addCharacteristic(this.eveChar.Voltage)
-          }
+        if (!this.service.testCharacteristic(this.eveChar.ElectricCurrent)) {
+          this.service.addCharacteristic(this.eveChar.ElectricCurrent)
+        }
+        if (!this.service.testCharacteristic(this.eveChar.Voltage)) {
+          this.service.addCharacteristic(this.eveChar.Voltage)
         }
         this.isDualR3 = true
       }
diff --git a/lib/device/simulation/tap-one.js b/lib/device/simulation/tap-one.js
index dc4316b7..6e7f6ca1 100644
--- a/lib/device/simulation/tap-one.js
+++ b/lib/device/simulation/tap-one.js
@@ -83,13 +83,11 @@ module.exports = class deviceTapOne {
         if (!this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
           this.service.addCharacteristic(this.eveChar.CurrentConsumption)
         }
-        if (this.accessory.context.eweUIID === 32) {
-          if (!this.service.testCharacteristic(this.eveChar.ElectricCurrent)) {
-            this.service.addCharacteristic(this.eveChar.ElectricCurrent)
-          }
-          if (!this.service.testCharacteristic(this.eveChar.Voltage)) {
-            this.service.addCharacteristic(this.eveChar.Voltage)
-          }
+        if (!this.service.testCharacteristic(this.eveChar.ElectricCurrent)) {
+          this.service.addCharacteristic(this.eveChar.ElectricCurrent)
+        }
+        if (!this.service.testCharacteristic(this.eveChar.Voltage)) {
+          this.service.addCharacteristic(this.eveChar.Voltage)
         }
         this.isDualR3 = true
       }
diff --git a/lib/device/simulation/valve-one.js b/lib/device/simulation/valve-one.js
index 3e57a0b6..ea2fa42b 100644
--- a/lib/device/simulation/valve-one.js
+++ b/lib/device/simulation/valve-one.js
@@ -85,13 +85,11 @@ module.exports = class deviceValveOne {
         if (!this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
           this.service.addCharacteristic(this.eveChar.CurrentConsumption)
         }
-        if (this.accessory.context.eweUIID === 32) {
-          if (!this.service.testCharacteristic(this.eveChar.ElectricCurrent)) {
-            this.service.addCharacteristic(this.eveChar.ElectricCurrent)
-          }
-          if (!this.service.testCharacteristic(this.eveChar.Voltage)) {
-            this.service.addCharacteristic(this.eveChar.Voltage)
-          }
+        if (!this.service.testCharacteristic(this.eveChar.ElectricCurrent)) {
+          this.service.addCharacteristic(this.eveChar.ElectricCurrent)
+        }
+        if (!this.service.testCharacteristic(this.eveChar.Voltage)) {
+          this.service.addCharacteristic(this.eveChar.Voltage)
         }
         this.isDualR3 = true
       }

From 9733c1069a5e7962b37a0c0d326e3525879407e9 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 29 Jun 2021 09:19:13 +0100
Subject: [PATCH 2407/3183] new device zigbee water sensor

---
 lib/device/zigbee/sensor-leak.js | 119 +++++++++++++++++++++++++++++++
 lib/index.js                     |   7 ++
 lib/utils/constants.js           |   6 +-
 3 files changed, 130 insertions(+), 2 deletions(-)
 create mode 100644 lib/device/zigbee/sensor-leak.js

diff --git a/lib/device/zigbee/sensor-leak.js b/lib/device/zigbee/sensor-leak.js
new file mode 100644
index 00000000..240451af
--- /dev/null
+++ b/lib/device/zigbee/sensor-leak.js
@@ -0,0 +1,119 @@
+/* jshint -W014, -W033, esversion: 9 */
+/* eslint-disable new-cap */
+'use strict'
+
+module.exports = class deviceZBSensorLeak {
+  constructor (platform, accessory) {
+    // Set up variables from the platform
+    this.eveChar = platform.eveChar
+    this.funcs = platform.funcs
+    this.hapChar = platform.api.hap.Characteristic
+    this.hapServ = platform.api.hap.Service
+    this.lang = platform.lang
+    this.log = platform.log
+    this.platform = platform
+
+    // Set up variables from the accessory
+    this.name = accessory.displayName
+    this.accessory = accessory
+
+    // Set up custom variables for this device type
+    const deviceConf = platform.sensorDevices[accessory.context.eweDeviceId]
+    this.lowBattThreshold =
+      deviceConf && deviceConf.lowBattThreshold
+        ? Math.min(deviceConf.lowBattThreshold, 100)
+        : platform.consts.defaultValues.lowBattThreshold
+    this.sensorTimeDifference =
+      deviceConf && deviceConf.sensorTimeDifference
+        ? deviceConf.sensorTimeDifference
+        : platform.consts.defaultValues.sensorTimeDifference
+
+    // Set the correct logging variables for this accessory
+    this.enableLogging = !platform.config.disableDeviceLogging
+    this.enableDebugLogging = platform.config.debug
+    if (deviceConf && deviceConf.overrideLogging) {
+      switch (deviceConf.overrideLogging) {
+        case 'standard':
+          this.enableLogging = true
+          this.enableDebugLogging = false
+          break
+        case 'debug':
+          this.enableLogging = true
+          this.enableDebugLogging = true
+          break
+        case 'disable':
+          this.enableLogging = false
+          this.enableDebugLogging = false
+          break
+      }
+    }
+
+    // Add the leak sensor service if it doesn't already exist
+    if (!(this.service = this.accessory.getService(this.hapServ.LeakSensor))) {
+      this.service = this.accessory.addService(this.hapServ.LeakSensor)
+      this.service.addCharacteristic(this.eveChar.LastActivation)
+    }
+
+    // Add the battery service if it doesn't already exist
+    this.battService =
+      this.accessory.getService(this.hapServ.BatteryService) ||
+      this.accessory.addService(this.hapServ.BatteryService)
+
+    // Pass the accessory to Fakegato to set up with Eve
+    this.accessory.eveService = new platform.eveService('motion', this.accessory, {
+      log: platform.config.debugFakegato ? this.log : () => {}
+    })
+
+    // Output the customised options to the log
+    const opts = JSON.stringify({
+      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
+      lowBattThreshold: this.lowBattThreshold,
+      sensorTimeDifference: this.sensorTimeDifference
+    })
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
+  }
+
+  async externalUpdate (params) {
+    try {
+      if (this.funcs.hasProperty(params, 'battery') && params.battery !== this.cacheBatt) {
+        this.cacheBatt = params.battery
+        this.cacheBattScaled = Math.max(Math.min(this.cacheBatt, 100), 0)
+        this.battService.updateCharacteristic(this.hapChar.BatteryLevel, this.cacheBattScaled)
+        this.battService.updateCharacteristic(
+          this.hapChar.StatusLowBattery,
+          this.cacheBattScaled < this.lowBattThreshold
+        )
+        if (params.updateSource && this.enableLogging) {
+          this.log('[%s] %s [%s%].', this.name, this.lang.curBatt, this.cacheBattScaled)
+        }
+      }
+      if (this.funcs.hasProperty(params, 'water') && this.funcs.hasProperty(params, 'trigTime')) {
+        const timeDiff = (new Date().getTime() - params.trigTime) / 1000
+        const leakDetected = !!(
+          params.updateSource &&
+          params.water === 1 &&
+          timeDiff < this.sensorTimeDifference
+        )
+        this.service.updateCharacteristic(this.hapChar.LeakDetected, leakDetected ? 1 : 0)
+        if (leakDetected) {
+          const initialTime = this.accessory.eveService.getInitialTime()
+          this.service.updateCharacteristic(
+            this.eveChar.LastActivation,
+            Math.round(new Date().valueOf() / 1000) - initialTime
+          )
+        }
+        this.accessory.eveService.addEntry({ status: leakDetected ? 1 : 0 })
+        if (params.updateSource && this.enableLogging) {
+          this.log(
+            '[%s] %s [%s].',
+            this.name,
+            this.lang.curState,
+            leakDetected ? this.lang.leakYes : this.lang.leakNo
+          )
+        }
+      }
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, false)
+    }
+  }
+}
diff --git a/lib/index.js b/lib/index.js
index 2f0b7e1e..63da4aaa 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1336,6 +1336,13 @@ class eWeLinkPlatform {
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/zigbee/sensor-contact'))(this, accessory)
         /*****************/
+      } else if (this.consts.devices.zbSensorWater.includes(uiid)) {
+        /***************
+        ZB SENSOR [LEAK]
+        ***************/
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
+        accessory.control = new (require('./device/zigbee/sensor-leak'))(this, accessory)
+        /**************/
       } else if (this.consts.devices.camera.includes(uiid)) {
         /*************
         SONOFF CAMERAS
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 2d502d47..02e824e5 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -186,6 +186,7 @@ module.exports = {
     zbSensorAmbient: [1770],
     zbSensorMotion: [2026],
     zbSensorContact: [3026],
+    zbSensorWater: [4026],
     cannotSupport: [0, 65, 118, 119, 120, 121],
     garageSensors: [102, 3026],
     skipUpdateRequest: [1000]
@@ -239,6 +240,7 @@ module.exports = {
     'type',
     'voltage',
     'voltage_',
+    'water',
     'white',
     'workMode',
     'workState',
@@ -301,7 +303,8 @@ module.exports = {
     1258: 1,
     1770: 1, // "ZIGBEE_TEMPERATURE_SENSOR"
     2026: 1, // "ZIGBEE_MOBILE_SENSOR"
-    3026: 1 // "ZIGBEE_DOOR_AND_WINDOW_SENSOR"
+    3026: 1, // "ZIGBEE_DOOR_AND_WINDOW_SENSOR"
+    4026: 1 // "ZIGBEE_WATER_SENSOR"
   },
 
   cannotSupportDevices: {
@@ -357,7 +360,6 @@ module.exports = {
     1003: 0, // "WARM_AIR_BLOWER"
     2256: 2, // "ZIGBEE_SWITCH_2"
     3256: 3, // "ZIGBEE_SWITCH_3"
-    4026: 1, // "ZIGBEE_WATER_SENSOR"
     4256: 4 // "ZIGBEE_SWITCH_4"
   }
 }

From 1e570bda3c8077899f8457585661322a177093e8 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 29 Jun 2021 09:21:20 +0100
Subject: [PATCH 2408/3183] no need for eve service with leak sensors

---
 lib/device/simulation/sensor-leak.js | 6 ------
 lib/device/zigbee/sensor-leak.js     | 6 ------
 2 files changed, 12 deletions(-)

diff --git a/lib/device/simulation/sensor-leak.js b/lib/device/simulation/sensor-leak.js
index 3a25113b..753febb4 100644
--- a/lib/device/simulation/sensor-leak.js
+++ b/lib/device/simulation/sensor-leak.js
@@ -61,11 +61,6 @@ module.exports = class deviceSensorLeak {
       this.accessory.getService(this.hapServ.BatteryService) ||
       this.accessory.addService(this.hapServ.BatteryService)
 
-    // Pass the accessory to Fakegato to set up with Eve
-    this.accessory.eveService = new platform.eveService('door', this.accessory, {
-      log: platform.config.debugFakegato ? this.log : () => {}
-    })
-
     // Output the customised options to the log
     const opts = JSON.stringify({
       logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
@@ -96,7 +91,6 @@ module.exports = class deviceSensorLeak {
       this.cacheOnOff = params.switch
       const newState = params.switch === 'on' ? 0 : 1
       this.service.updateCharacteristic(this.hapChar.LeakDetected, newState)
-      this.accessory.eveService.addEntry({ status: newState })
       if (newState === 1) {
         const initialTime = this.accessory.eveService.getInitialTime()
         this.service.updateCharacteristic(
diff --git a/lib/device/zigbee/sensor-leak.js b/lib/device/zigbee/sensor-leak.js
index 240451af..91fb69a0 100644
--- a/lib/device/zigbee/sensor-leak.js
+++ b/lib/device/zigbee/sensor-leak.js
@@ -59,11 +59,6 @@ module.exports = class deviceZBSensorLeak {
       this.accessory.getService(this.hapServ.BatteryService) ||
       this.accessory.addService(this.hapServ.BatteryService)
 
-    // Pass the accessory to Fakegato to set up with Eve
-    this.accessory.eveService = new platform.eveService('motion', this.accessory, {
-      log: platform.config.debugFakegato ? this.log : () => {}
-    })
-
     // Output the customised options to the log
     const opts = JSON.stringify({
       logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
@@ -102,7 +97,6 @@ module.exports = class deviceZBSensorLeak {
             Math.round(new Date().valueOf() / 1000) - initialTime
           )
         }
-        this.accessory.eveService.addEntry({ status: leakDetected ? 1 : 0 })
         if (params.updateSource && this.enableLogging) {
           this.log(
             '[%s] %s [%s].',

From cc8365bcc53e53d0dd28a404c3c3176e3d704e2d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 29 Jun 2021 09:21:26 +0100
Subject: [PATCH 2409/3183] fix new device logging

---
 lib/index.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/index.js b/lib/index.js
index 63da4aaa..5c132151 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1364,7 +1364,8 @@ class eWeLinkPlatform {
         this.log.warn(
           '[%s] %s:\n[%s] %s.',
           device.name,
-          this.lang.devNotSupYetuiid,
+          this.lang.devNotSupYet,
+          uiid,
           JSON.stringify(device.params)
         )
         return

From 06ef8fd4395855601e25be1ce29ba9da3dfad496 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 29 Jun 2021 09:24:39 +0100
Subject: [PATCH 2410/3183] Revert "no need for eve service with leak sensors"

This reverts commit 1e570bda3c8077899f8457585661322a177093e8.
---
 lib/device/simulation/sensor-leak.js | 6 ++++++
 lib/device/zigbee/sensor-leak.js     | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/lib/device/simulation/sensor-leak.js b/lib/device/simulation/sensor-leak.js
index 753febb4..3a25113b 100644
--- a/lib/device/simulation/sensor-leak.js
+++ b/lib/device/simulation/sensor-leak.js
@@ -61,6 +61,11 @@ module.exports = class deviceSensorLeak {
       this.accessory.getService(this.hapServ.BatteryService) ||
       this.accessory.addService(this.hapServ.BatteryService)
 
+    // Pass the accessory to Fakegato to set up with Eve
+    this.accessory.eveService = new platform.eveService('door', this.accessory, {
+      log: platform.config.debugFakegato ? this.log : () => {}
+    })
+
     // Output the customised options to the log
     const opts = JSON.stringify({
       logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
@@ -91,6 +96,7 @@ module.exports = class deviceSensorLeak {
       this.cacheOnOff = params.switch
       const newState = params.switch === 'on' ? 0 : 1
       this.service.updateCharacteristic(this.hapChar.LeakDetected, newState)
+      this.accessory.eveService.addEntry({ status: newState })
       if (newState === 1) {
         const initialTime = this.accessory.eveService.getInitialTime()
         this.service.updateCharacteristic(
diff --git a/lib/device/zigbee/sensor-leak.js b/lib/device/zigbee/sensor-leak.js
index 91fb69a0..240451af 100644
--- a/lib/device/zigbee/sensor-leak.js
+++ b/lib/device/zigbee/sensor-leak.js
@@ -59,6 +59,11 @@ module.exports = class deviceZBSensorLeak {
       this.accessory.getService(this.hapServ.BatteryService) ||
       this.accessory.addService(this.hapServ.BatteryService)
 
+    // Pass the accessory to Fakegato to set up with Eve
+    this.accessory.eveService = new platform.eveService('motion', this.accessory, {
+      log: platform.config.debugFakegato ? this.log : () => {}
+    })
+
     // Output the customised options to the log
     const opts = JSON.stringify({
       logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
@@ -97,6 +102,7 @@ module.exports = class deviceZBSensorLeak {
             Math.round(new Date().valueOf() / 1000) - initialTime
           )
         }
+        this.accessory.eveService.addEntry({ status: leakDetected ? 1 : 0 })
         if (params.updateSource && this.enableLogging) {
           this.log(
             '[%s] %s [%s].',

From feee1f553acbe17aa7195ce2bdec9c037e4fdf68 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 29 Jun 2021 09:24:56 +0100
Subject: [PATCH 2411/3183] Update sensor-leak.js

---
 lib/device/simulation/sensor-leak.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/device/simulation/sensor-leak.js b/lib/device/simulation/sensor-leak.js
index 3a25113b..df91d4ec 100644
--- a/lib/device/simulation/sensor-leak.js
+++ b/lib/device/simulation/sensor-leak.js
@@ -62,7 +62,7 @@ module.exports = class deviceSensorLeak {
       this.accessory.addService(this.hapServ.BatteryService)
 
     // Pass the accessory to Fakegato to set up with Eve
-    this.accessory.eveService = new platform.eveService('door', this.accessory, {
+    this.accessory.eveService = new platform.eveService('motion', this.accessory, {
       log: platform.config.debugFakegato ? this.log : () => {}
     })
 

From d7e8fd90cef963236d5c0e53018fd8ba887b7f0a Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 29 Jun 2021 09:47:25 +0100
Subject: [PATCH 2412/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c9a5681d..a894a1b3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -47,6 +47,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 - **Lock Simulations**
   - Added the option of using a DW2 or Zigbee contact sensor to determine _Locked_ and _Unlocked_ state
 - **New Devices**
+  - Support for Zigbee leak sensors
   - Support for device with eWeLink UIID 67 _RollingDoor_
 
 ### Changed

From 5c10e37e5ea867813b5cacd3a18116e34c92b010 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 29 Jun 2021 17:01:48 +0100
Subject: [PATCH 2413/3183] use more caching with sensors

---
 lib/device/simulation/sensor-leak.js | 4 ++--
 lib/device/zigbee/sensor-contact.js  | 7 ++++++-
 lib/device/zigbee/sensor-leak.js     | 7 ++++++-
 lib/device/zigbee/sensor-motion.js   | 7 ++++++-
 4 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/lib/device/simulation/sensor-leak.js b/lib/device/simulation/sensor-leak.js
index df91d4ec..4b8c0637 100644
--- a/lib/device/simulation/sensor-leak.js
+++ b/lib/device/simulation/sensor-leak.js
@@ -90,10 +90,10 @@ module.exports = class deviceSensorLeak {
           this.log('[%s] %s [%s%].', this.name, this.lang.curBatt, this.cacheBattScaled)
         }
       }
-      if (!params.switch || params.switch === this.cacheOnOff) {
+      if (!params.switch || params.switch === this.cacheState) {
         return
       }
-      this.cacheOnOff = params.switch
+      this.cacheState = params.switch
       const newState = params.switch === 'on' ? 0 : 1
       this.service.updateCharacteristic(this.hapChar.LeakDetected, newState)
       this.accessory.eveService.addEntry({ status: newState })
diff --git a/lib/device/zigbee/sensor-contact.js b/lib/device/zigbee/sensor-contact.js
index ee4ad6a8..5c3af731 100644
--- a/lib/device/zigbee/sensor-contact.js
+++ b/lib/device/zigbee/sensor-contact.js
@@ -95,7 +95,12 @@ module.exports = class deviceZBSensorContact {
           this.log('[%s] %s [%s%].', this.name, this.lang.curBatt, this.cacheBattScaled)
         }
       }
-      if (this.funcs.hasProperty(params, 'lock') && [0, 1].includes(params.lock)) {
+      if (
+        this.funcs.hasProperty(params, 'lock') &&
+        [0, 1].includes(params.lock) &&
+        params.lock !== this.cacheState
+      ) {
+        this.cacheState = params.lock
         if (params.lock === 1) {
           this.service.updateCharacteristic(this.hapChar.ContactSensorState, 1)
           this.accessory.eveService.addEntry({ status: 1 })
diff --git a/lib/device/zigbee/sensor-leak.js b/lib/device/zigbee/sensor-leak.js
index 240451af..c5f313d9 100644
--- a/lib/device/zigbee/sensor-leak.js
+++ b/lib/device/zigbee/sensor-leak.js
@@ -87,7 +87,12 @@ module.exports = class deviceZBSensorLeak {
           this.log('[%s] %s [%s%].', this.name, this.lang.curBatt, this.cacheBattScaled)
         }
       }
-      if (this.funcs.hasProperty(params, 'water') && this.funcs.hasProperty(params, 'trigTime')) {
+      if (
+        this.funcs.hasProperty(params, 'water') &&
+        this.funcs.hasProperty(params, 'trigTime') &&
+        this.cacheState !== params.water
+      ) {
+        this.cacheState = params.water
         const timeDiff = (new Date().getTime() - params.trigTime) / 1000
         const leakDetected = !!(
           params.updateSource &&
diff --git a/lib/device/zigbee/sensor-motion.js b/lib/device/zigbee/sensor-motion.js
index 96ec9c5d..8cd60ee9 100644
--- a/lib/device/zigbee/sensor-motion.js
+++ b/lib/device/zigbee/sensor-motion.js
@@ -87,7 +87,12 @@ module.exports = class deviceZBSensorMotion {
           this.log('[%s] %s [%s%].', this.name, this.lang.curBatt, this.cacheBattScaled)
         }
       }
-      if (this.funcs.hasProperty(params, 'motion') && this.funcs.hasProperty(params, 'trigTime')) {
+      if (
+        this.funcs.hasProperty(params, 'motion') &&
+        this.funcs.hasProperty(params, 'trigTime') &&
+        params.motion !== this.cacheState
+      ) {
+        this.cacheState = params.motion
         const timeDiff = (new Date().getTime() - params.trigTime) / 1000
         const motionDetected = !!(
           params.updateSource &&

From 48e34c9f1eea187b7016c8591ed83917e43c5b07 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 29 Jun 2021 17:02:01 +0100
Subject: [PATCH 2414/3183] add eve readings to sensor simulation

---
 lib/device/simulation/sensor.js | 168 +++++++++++++++++++++++++++-----
 1 file changed, 142 insertions(+), 26 deletions(-)

diff --git a/lib/device/simulation/sensor.js b/lib/device/simulation/sensor.js
index de202114..0535d96d 100644
--- a/lib/device/simulation/sensor.js
+++ b/lib/device/simulation/sensor.js
@@ -108,6 +108,45 @@ module.exports = class deviceSensor {
       }
     }
 
+    // Set up the device type and power readings if necessary
+    if (platform.consts.devices.singleSwitch.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'singleSwitch'
+    } else if (platform.consts.devices.outlet.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'singleSwitch'
+
+      // Add Eve power characteristics
+      this.powerReadings = true
+      if (!this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
+        this.service.addCharacteristic(this.eveChar.CurrentConsumption)
+      }
+      if (this.accessory.context.eweUIID === 32) {
+        if (!this.service.testCharacteristic(this.eveChar.ElectricCurrent)) {
+          this.service.addCharacteristic(this.eveChar.ElectricCurrent)
+        }
+        if (!this.service.testCharacteristic(this.eveChar.Voltage)) {
+          this.service.addCharacteristic(this.eveChar.Voltage)
+        }
+      }
+    } else if (platform.consts.devices.multiSwitch.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'multiSwitch'
+      if (this.accessory.context.eweUIID === 126) {
+        // Add Eve power characteristics
+        this.powerReadings = true
+        if (!this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
+          this.service.addCharacteristic(this.eveChar.CurrentConsumption)
+        }
+        if (!this.service.testCharacteristic(this.eveChar.ElectricCurrent)) {
+          this.service.addCharacteristic(this.eveChar.ElectricCurrent)
+        }
+        if (!this.service.testCharacteristic(this.eveChar.Voltage)) {
+          this.service.addCharacteristic(this.eveChar.Voltage)
+        }
+        this.isDualR3 = true
+      }
+    } else if (platform.consts.devices.outletSCM.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'multiSwitch'
+    }
+
     // Add the get handlers only if the user has configured the offlineAsNoResponse setting
     if (platform.config.offlineAsNoResponse) {
       this.service.getCharacteristic(this.char).onGet(() => {
@@ -123,6 +162,19 @@ module.exports = class deviceSensor {
       log: platform.config.debugFakegato ? this.log : () => {}
     })
 
+    // Set up an interval to get eWeLink to send power updates
+    if (this.powerReadings) {
+      setTimeout(() => {
+        this.internalUIUpdate()
+        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
+      }, 5000)
+
+      // Stop the intervals on Homebridge shutdown
+      platform.api.on('shutdown', () => {
+        clearInterval(this.intervalPoll)
+      })
+    }
+
     // Output the customised options to the log
     const opts = JSON.stringify({
       logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
@@ -131,41 +183,105 @@ module.exports = class deviceSensor {
     this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
 
+  async internalUIUpdate () {
+    try {
+      // Skip polling if device isn't online
+      if (!this.isOnline) {
+        return
+      }
+
+      // Send the params to request the updates
+      if (this.isDualR3) {
+        await this.platform.sendDeviceUpdate(this.accessory, { uiActive: { outlet: 0, time: 120 } })
+      } else {
+        await this.platform.sendDeviceUpdate(this.accessory, { uiActive: 120 })
+      }
+    } catch (err) {
+      // Suppress errors here
+    }
+  }
+
   async externalUpdate (params) {
     try {
-      if (params.switches) {
-        if (params.switches[0].switch === this.cacheState) {
-          return
+      if (
+        (this.setup === 'multiSwitch' && params.switches) ||
+        (this.setup === 'singleSwitch' && params.switch)
+      ) {
+        let newState
+        if (this.setup === 'multiSwitch' && params.switches) {
+          newState = params.switches[0].switch
+        } else if (this.setup === 'singleSwitch' && params.switch) {
+          newState = params.switch
         }
-        this.cacheState = params.switches[0].switch
-      } else if (params.switch) {
-        if (params.switch === this.cacheState) {
-          return
+        if (newState && newState !== this.cacheState) {
+          this.cacheState = newState
+          if (this.cacheState === 'on') {
+            this.service.updateCharacteristic(this.char, 1)
+            this.accessory.eveService.addEntry({ status: 1 })
+            if (this.useLastActivation) {
+              const initialTime = this.accessory.eveService.getInitialTime()
+              this.service.updateCharacteristic(
+                this.eveChar.LastActivation,
+                Math.round(new Date().valueOf() / 1000) - initialTime
+              )
+            }
+          } else {
+            this.service.updateCharacteristic(this.char, 0)
+            this.accessory.eveService.addEntry({ status: 0 })
+          }
+          if (params.updateSource && this.enableLogging) {
+            this.log(
+              '[%s] %s [%s].',
+              this.name,
+              this.lang.curState,
+              this.cacheState === 'on' ? this.lang.sensorYes : this.lang.sensorNo
+            )
+          }
         }
-        this.cacheState = params.switch
-      } else {
+      }
+
+      // Get the power readings given by certain devices
+      if (!this.powerReadings) {
         return
       }
-      if (this.cacheState === 'on') {
-        this.service.updateCharacteristic(this.char, 1)
-        this.accessory.eveService.addEntry({ status: 1 })
-        if (this.useLastActivation) {
-          const initialTime = this.accessory.eveService.getInitialTime()
-          this.service.updateCharacteristic(
-            this.eveChar.LastActivation,
-            Math.round(new Date().valueOf() / 1000) - initialTime
-          )
-        }
-      } else {
-        this.service.updateCharacteristic(this.char, 0)
-        this.accessory.eveService.addEntry({ status: 0 })
+      let logger = false
+      let power
+      let voltage
+      let current
+      if (this.funcs.hasProperty(params, 'actPow_00')) {
+        power = parseInt(params.actPow_00) / 100
+        this.service.updateCharacteristic(this.eveChar.CurrentConsumption, power)
+        logger = true
+      } else if (this.funcs.hasProperty(params, 'power')) {
+        power = parseFloat(params.power)
+        this.service.updateCharacteristic(this.eveChar.CurrentConsumption, power)
+        logger = true
+      }
+      if (this.funcs.hasProperty(params, 'voltage_00')) {
+        voltage = parseInt(params.voltage_00) / 100
+        this.service.updateCharacteristic(this.eveChar.Voltage, voltage)
+        logger = true
+      } else if (this.funcs.hasProperty(params, 'voltage')) {
+        voltage = parseFloat(params.voltage)
+        this.service.updateCharacteristic(this.eveChar.Voltage, voltage)
+        logger = true
+      }
+      if (this.funcs.hasProperty(params, 'current_00')) {
+        current = parseInt(params.current_00) / 100
+        this.service.updateCharacteristic(this.eveChar.ElectricCurrent, current)
+        logger = true
+      } else if (this.funcs.hasProperty(params, 'current')) {
+        current = parseFloat(params.current)
+        this.service.updateCharacteristic(this.eveChar.ElectricCurrent, current)
+        logger = true
       }
-      if (params.updateSource && this.enableLogging) {
+      if (params.updateSource && logger && this.enableLogging) {
         this.log(
-          '[%s] %s [%s].',
+          '[%s] %s%s%s.',
           this.name,
-          this.lang.curState,
-          this.cacheState === 'on' ? this.lang.sensorYes : this.lang.sensorNo
+          power !== undefined ? this.lang.curPower + ' [' + power + 'W]' : '',
+          voltage !== undefined ? ' ' + this.lang.curVolt + ' [' + voltage + 'V]' : '',
+          current !== undefined ? ' ' + this.lang.curCurr + ' [' + current + 'A]' : ''
         )
       }
     } catch (err) {

From d13a9334ec6870b9fd3295096211191c889e6571 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 29 Jun 2021 22:07:22 +0100
Subject: [PATCH 2415/3183] ignore unknown zb device ws messages

---
 lib/connection/ws.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/connection/ws.js b/lib/connection/ws.js
index b93b6361..79ed0c9c 100644
--- a/lib/connection/ws.js
+++ b/lib/connection/ws.js
@@ -233,6 +233,7 @@ module.exports = class connectionWS {
               break
             }
             case 'reportSubDevice':
+            case 'subDevice':
               // We don't need to do anything with this action
               return
             default: {

From 64840bc712aab40efa4c5c1fb9012a89ea981ee7 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 30 Jun 2021 09:06:41 +0100
Subject: [PATCH 2416/3183] add funcs

---
 lib/device/simulation/tap-one.js   | 1 +
 lib/device/simulation/valve-one.js | 1 +
 2 files changed, 2 insertions(+)

diff --git a/lib/device/simulation/tap-one.js b/lib/device/simulation/tap-one.js
index 6e7f6ca1..adc34cca 100644
--- a/lib/device/simulation/tap-one.js
+++ b/lib/device/simulation/tap-one.js
@@ -6,6 +6,7 @@ module.exports = class deviceTapOne {
   constructor (platform, accessory) {
     // Set up variables from the platform
     this.eveChar = platform.eveChar
+    this.funcs = platform.funcs
     this.hapChar = platform.api.hap.Characteristic
     this.hapErr = platform.api.hap.HapStatusError
     this.hapServ = platform.api.hap.Service
diff --git a/lib/device/simulation/valve-one.js b/lib/device/simulation/valve-one.js
index ea2fa42b..7bb5a811 100644
--- a/lib/device/simulation/valve-one.js
+++ b/lib/device/simulation/valve-one.js
@@ -6,6 +6,7 @@ module.exports = class deviceValveOne {
   constructor (platform, accessory) {
     // Set up variables from the platform
     this.eveChar = platform.eveChar
+    this.funcs = platform.funcs
     this.hapChar = platform.api.hap.Characteristic
     this.hapErr = platform.api.hap.HapStatusError
     this.hapServ = platform.api.hap.Service

From bb2264e3ad17f63b16f81b93a94a7c7bb1cfe484 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 30 Jun 2021 10:24:38 +0100
Subject: [PATCH 2417/3183] finish eve readings for simulations and standardise
 logging

---
 lib/device/simulation/garage-two.js   | 131 +++++++++++++++++++-
 lib/device/simulation/switch-valve.js | 172 +++++++++++++++++++++-----
 lib/device/simulation/tap-two.js      | 146 ++++++++++++++++++++--
 lib/device/simulation/valve-four.js   |   8 +-
 lib/device/simulation/valve-two.js    | 152 ++++++++++++++++++++---
 5 files changed, 540 insertions(+), 69 deletions(-)

diff --git a/lib/device/simulation/garage-two.js b/lib/device/simulation/garage-two.js
index 141497cd..b825818d 100644
--- a/lib/device/simulation/garage-two.js
+++ b/lib/device/simulation/garage-two.js
@@ -5,6 +5,7 @@
 module.exports = class deviceGarageTwo {
   constructor (platform, accessory) {
     // Set up variables from the platform
+    this.eveChar = platform.eveChar
     this.funcs = platform.funcs
     this.hapChar = platform.api.hap.Characteristic
     this.hapErr = platform.api.hap.HapStatusError
@@ -53,6 +54,11 @@ module.exports = class deviceGarageTwo {
       this.accessory.context.cacheTwoTargetDoorState = 1
     }
 
+    // Certain devices give power readings
+    if (this.accessory.context.eweUIID === 126) {
+      this.powerReadings = true
+    }
+
     // We want two garage door services for this accessory
     ;['1', '2'].forEach(v => {
       // Add the garage door service if it doesn't already exist
@@ -68,6 +74,19 @@ module.exports = class deviceGarageTwo {
         gdService.setCharacteristic(this.hapChar.ObstructionDetected, false)
       }
 
+      // Add Eve power characteristics
+      if (this.powerReadings) {
+        if (!gdService.testCharacteristic(this.eveChar.CurrentConsumption)) {
+          gdService.addCharacteristic(this.eveChar.CurrentConsumption)
+        }
+        if (!gdService.testCharacteristic(this.eveChar.ElectricCurrent)) {
+          gdService.addCharacteristic(this.eveChar.ElectricCurrent)
+        }
+        if (!gdService.testCharacteristic(this.eveChar.Voltage)) {
+          gdService.addCharacteristic(this.eveChar.Voltage)
+        }
+      }
+
       // Add the set handler to the target position characteristic
       gdService.getCharacteristic(this.hapChar.TargetDoorState).onSet(value => {
         // We don't use await as we want the callback to be run straight away
@@ -91,6 +110,19 @@ module.exports = class deviceGarageTwo {
       }
     })
 
+    // Set up an interval to get eWeLink to send power updates
+    if (this.powerReadings) {
+      setTimeout(() => {
+        this.internalUIUpdate()
+        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
+      }, 5000)
+
+      // Stop the intervals on Homebridge shutdown
+      platform.api.on('shutdown', () => {
+        clearInterval(this.intervalPoll)
+      })
+    }
+
     // Output the customised options to the log
     const opts = JSON.stringify({
       logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
@@ -157,7 +189,7 @@ module.exports = class deviceGarageTwo {
           this.accessory.context.cacheOneCurrentDoorState = newPos
           if (this.enableLogging) {
             this.log(
-              '[%s] %s [garage 1 %s].',
+              '[%s] [garage 1] %s [%s].',
               this.name,
               this.lang.curState,
               newPos === 0 ? this.lang.doorOpen : this.lang.doorClosed
@@ -169,7 +201,7 @@ module.exports = class deviceGarageTwo {
           this.accessory.context.cacheTwoCurrentDoorState = newPos
           if (this.enableLogging) {
             this.log(
-              '[%s] %s [garage 2 %s].',
+              '[%s] [garage 2] %s [%s].',
               this.name,
               this.lang.curState,
               newPos === 0 ? this.lang.doorOpen : this.lang.doorClosed
@@ -192,12 +224,28 @@ module.exports = class deviceGarageTwo {
     }
   }
 
-  externalUpdate (params) {
+  async internalUIUpdate () {
     try {
-      if (!params.switches || this.inUse) {
+      // Skip polling if device isn't online
+      if (!this.isOnline) {
         return
       }
+
+      // Send the params to request the updates
+      await this.platform.sendDeviceUpdate(this.accessory, { uiActive: { outlet: 0, time: 120 } })
+      await this.funcs.sleep(2000)
+      await this.platform.sendDeviceUpdate(this.accessory, { uiActive: { outlet: 1, time: 120 } })
+    } catch (err) {
+      // Suppress errors here
+    }
+  }
+
+  externalUpdate (params) {
+    try {
       ;['1', '2'].forEach(async v => {
+        if (!params.switches || this.inUse) {
+          return
+        }
         const gcService = this.accessory.getService('Garage ' + v)
         const prevState =
           v === '1'
@@ -245,7 +293,7 @@ module.exports = class deviceGarageTwo {
             this.accessory.context.cacheOneCurrentDoorState = newPos - 2
             if (params.updateSource && this.enableLogging) {
               this.log(
-                '[%s] %s [garage 1 %s].',
+                '[%s] [garage 1] %s [%s].',
                 this.name,
                 this.lang.curState,
                 newPos === 2 ? this.lang.doorOpen : this.lang.doorClosed
@@ -256,7 +304,7 @@ module.exports = class deviceGarageTwo {
             this.accessory.context.cacheTwoCurrentDoorState = newPos - 2
             if (params.updateSource && this.enableLogging) {
               this.log(
-                '[%s] %s [garage 2 %s].',
+                '[%s] [garage 2] %s [%s].',
                 this.name,
                 this.lang.curState,
                 newPos === 2 ? this.lang.doorOpen : this.lang.doorClosed
@@ -265,6 +313,77 @@ module.exports = class deviceGarageTwo {
             break
         }
       })
+
+      // Get the power readings given by certain devices
+      if (!this.powerReadings) {
+        return
+      }
+      let logger0 = false
+      let logger1 = false
+      let power0
+      let power1
+      let voltage0
+      let voltage1
+      let current0
+      let current1
+      if (this.funcs.hasProperty(params, 'actPow_00')) {
+        power0 = parseInt(params.actPow_00) / 100
+        this.accessory
+          .getService('Garage 1')
+          .updateCharacteristic(this.eveChar.CurrentConsumption, power0)
+        logger0 = true
+      }
+      if (this.funcs.hasProperty(params, 'actPow_01')) {
+        power1 = parseInt(params.actPow_01) / 100
+        this.accessory
+          .getService('Garage 2')
+          .updateCharacteristic(this.eveChar.CurrentConsumption, power1)
+        logger1 = true
+      }
+      if (this.funcs.hasProperty(params, 'voltage_00')) {
+        voltage0 = parseInt(params.voltage_00) / 100
+        this.accessory.getService('Garage 1').updateCharacteristic(this.eveChar.Voltage, voltage0)
+        logger0 = true
+      }
+      if (this.funcs.hasProperty(params, 'voltage_01')) {
+        voltage1 = parseInt(params.voltage_01) / 100
+        this.accessory.getService('Garage 2').updateCharacteristic(this.eveChar.Voltage, voltage1)
+        logger1 = true
+      }
+      if (this.funcs.hasProperty(params, 'current_00')) {
+        current0 = parseInt(params.current_00) / 100
+        this.accessory
+          .getService('Garage 1')
+          .updateCharacteristic(this.eveChar.ElectricCurrent, current0)
+        logger0 = true
+      }
+      if (this.funcs.hasProperty(params, 'current_01')) {
+        current1 = parseInt(params.current_01) / 100
+        this.accessory
+          .getService('Garage 2')
+          .updateCharacteristic(this.eveChar.ElectricCurrent, current1)
+        logger1 = true
+      }
+      if (params.updateSource && this.enableLogging) {
+        if (logger0) {
+          this.log(
+            '[%s] [garage 1] %s%s%s.',
+            this.name,
+            power0 !== undefined ? this.lang.curPower + ' [' + power0 + 'W]' : '',
+            voltage0 !== undefined ? ' ' + this.lang.curVolt + ' [' + voltage0 + 'V]' : '',
+            current0 !== undefined ? ' ' + this.lang.curCurr + ' [' + current0 + 'A]' : ''
+          )
+        }
+        if (logger1) {
+          this.log(
+            '[%s] [garage 2] %s%s%s.',
+            this.name,
+            power1 !== undefined ? this.lang.curPower + ' [' + power1 + 'W]' : '',
+            voltage1 !== undefined ? ' ' + this.lang.curVolt + ' [' + voltage1 + 'V]' : '',
+            current1 !== undefined ? ' ' + this.lang.curCurr + ' [' + current1 + 'A]' : ''
+          )
+        }
+      }
     } catch (err) {
       this.inUse = false
       this.platform.deviceUpdateError(this.accessory, err, false)
diff --git a/lib/device/simulation/switch-valve.js b/lib/device/simulation/switch-valve.js
index 21df7c13..043ebca7 100644
--- a/lib/device/simulation/switch-valve.js
+++ b/lib/device/simulation/switch-valve.js
@@ -5,6 +5,8 @@
 module.exports = class deviceSwitchValve {
   constructor (platform, accessory) {
     // Set up variables from the platform
+    this.eveChar = platform.eveChar
+    this.funcs = platform.funcs
     this.hapChar = platform.api.hap.Characteristic
     this.hapErr = platform.api.hap.HapStatusError
     this.hapServ = platform.api.hap.Service
@@ -57,6 +59,30 @@ module.exports = class deviceSwitchValve {
       this.vService.addCharacteristic(this.hapChar.RemainingDuration)
     }
 
+    // Certain devices give power readings
+    if (this.accessory.context.eweUIID === 126) {
+      // Add Eve power characteristics
+      this.powerReadings = true
+      if (!this.sService.testCharacteristic(this.eveChar.CurrentConsumption)) {
+        this.sService.addCharacteristic(this.eveChar.CurrentConsumption)
+      }
+      if (!this.vService.testCharacteristic(this.eveChar.CurrentConsumption)) {
+        this.vService.addCharacteristic(this.eveChar.CurrentConsumption)
+      }
+      if (!this.sService.testCharacteristic(this.eveChar.ElectricCurrent)) {
+        this.sService.addCharacteristic(this.eveChar.ElectricCurrent)
+      }
+      if (!this.vService.testCharacteristic(this.eveChar.ElectricCurrent)) {
+        this.vService.addCharacteristic(this.eveChar.ElectricCurrent)
+      }
+      if (!this.sService.testCharacteristic(this.eveChar.Voltage)) {
+        this.sService.addCharacteristic(this.eveChar.Voltage)
+      }
+      if (!this.vService.testCharacteristic(this.eveChar.Voltage)) {
+        this.vService.addCharacteristic(this.eveChar.Voltage)
+      }
+    }
+
     // Add the set handler to the switch on/off characteristic
     this.sService
       .getCharacteristic(this.hapChar.On)
@@ -106,6 +132,19 @@ module.exports = class deviceSwitchValve {
       log: platform.config.debugFakegato ? this.log : () => {}
     })
 
+    // Set up an interval to get eWeLink to send power updates
+    if (this.powerReadings) {
+      setTimeout(() => {
+        this.internalUIUpdate()
+        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
+      }, 5000)
+
+      // Stop the intervals on Homebridge shutdown
+      platform.api.on('shutdown', () => {
+        clearInterval(this.intervalPoll)
+      })
+    }
+
     // Output the customised options to the log
     const opts = JSON.stringify({
       logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
@@ -128,7 +167,7 @@ module.exports = class deviceSwitchValve {
       this.cacheState = value ? 'on' : 'off'
       this.accessory.eveService.addEntry({ status: value ? 1 : 0 })
       if (this.enableLogging) {
-        this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
+        this.log('[%s] [switch] %s [%s].', this.name, this.lang.curState, this.cacheState)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
@@ -155,14 +194,14 @@ module.exports = class deviceSwitchValve {
           this.vService.updateCharacteristic(this.hapChar.RemainingDuration, 0)
           clearTimeout(this.timer)
           if (this.enableLogging) {
-            this.log('[%s] %s [%s].', this.name, this.lang.curState, this.lang.valveNo)
+            this.log('[%s] [valve] %s [%s].', this.name, this.lang.curState, this.lang.valveNo)
           }
           break
         case 1: {
           const timer = this.vService.getCharacteristic(this.hapChar.SetDuration).value
           this.vService.updateCharacteristic(this.hapChar.RemainingDuration, timer)
           if (this.enableLogging) {
-            this.log('[%s] %s [%s].', this.name, this.lang.curState, this.lang.valveYes)
+            this.log('[%s] [valve] %s [%s].', this.name, this.lang.curState, this.lang.valveYes)
           }
           this.timer = setTimeout(() => {
             this.vService.setCharacteristic(this.hapChar.Active, 0)
@@ -180,39 +219,116 @@ module.exports = class deviceSwitchValve {
     }
   }
 
-  async externalUpdate (params) {
+  async internalUIUpdate () {
     try {
-      if (!params.switches) {
+      // Skip polling if device isn't online
+      if (!this.isOnline) {
         return
       }
-      if (this.cacheState !== (params.switches[0].switch === 'on')) {
-        const newStatus = params.switches[0].switch === 'on'
-        this.cacheState = params.switches[0].switch
-        this.sService.updateCharacteristic(this.hapChar.On, newStatus)
-        this.accessory.eveService.addEntry({ status: newStatus ? 1 : 0 })
-        if (params.updateSource && this.enableLogging) {
-          this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
-        }
-      }
-      if (params.switches[1].switch === 'on') {
-        if (this.vService.getCharacteristic(this.hapChar.Active).value === 0) {
-          const timer = this.vService.getCharacteristic(this.hapChar.SetDuration).value
-          this.vService.updateCharacteristic(this.hapChar.Active, 1)
-          this.vService.updateCharacteristic(this.hapChar.InUse, 1)
-          this.vService.updateCharacteristic(this.hapChar.RemainingDuration, timer)
+
+      // Send the params to request the updates
+      await this.platform.sendDeviceUpdate(this.accessory, { uiActive: { outlet: 0, time: 120 } })
+      await this.funcs.sleep(2000)
+      await this.platform.sendDeviceUpdate(this.accessory, { uiActive: { outlet: 1, time: 120 } })
+    } catch (err) {
+      // Suppress errors here
+    }
+  }
+
+  async externalUpdate (params) {
+    try {
+      if (params.switches) {
+        if (this.cacheState !== params.switches[0].switch) {
+          this.cacheState = params.switches[0].switch
+          this.sService.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
+          this.accessory.eveService.addEntry({ status: this.cacheState === 'on' ? 1 : 0 })
           if (params.updateSource && this.enableLogging) {
-            this.log('[%s] %s [%s].', this.name, this.lang.curState, this.lang.valveYes)
+            this.log('[%s] [switch] %s [%s].', this.name, this.lang.curState, this.cacheState)
           }
-          this.timer = setTimeout(() => {
-            this.vService.setCharacteristic(this.hapChar.Active, 0)
-          }, timer * 1000)
         }
+        if (params.switches[1].switch === 'on') {
+          if (this.vService.getCharacteristic(this.hapChar.Active).value === 0) {
+            const timer = this.vService.getCharacteristic(this.hapChar.SetDuration).value
+            this.vService.updateCharacteristic(this.hapChar.Active, 1)
+            this.vService.updateCharacteristic(this.hapChar.InUse, 1)
+            this.vService.updateCharacteristic(this.hapChar.RemainingDuration, timer)
+            if (params.updateSource && this.enableLogging) {
+              this.log('[%s] [valve] %s [%s].', this.name, this.lang.curState, this.lang.valveYes)
+            }
+            this.timer = setTimeout(() => {
+              this.vService.setCharacteristic(this.hapChar.Active, 0)
+            }, timer * 1000)
+          }
+        } else {
+          this.vService.updateCharacteristic(this.hapChar.Active, 0)
+          this.vService.updateCharacteristic(this.hapChar.InUse, 0)
+          this.vService.updateCharacteristic(this.hapChar.RemainingDuration, 0)
+          clearTimeout(this.timer)
+        }
+      }
+
+      // Get the power readings given by certain devices
+      if (!this.powerReadings) {
         return
       }
-      this.vService.updateCharacteristic(this.hapChar.Active, 0)
-      this.vService.updateCharacteristic(this.hapChar.InUse, 0)
-      this.vService.updateCharacteristic(this.hapChar.RemainingDuration, 0)
-      clearTimeout(this.timer)
+      let logger0 = false
+      let logger1 = false
+      let power0
+      let power1
+      let voltage0
+      let voltage1
+      let current0
+      let current1
+      if (this.funcs.hasProperty(params, 'actPow_00')) {
+        power0 = parseInt(params.actPow_00) / 100
+        this.sService.updateCharacteristic(this.eveChar.CurrentConsumption, power0)
+        logger0 = true
+      }
+      if (this.funcs.hasProperty(params, 'actPow_01')) {
+        power1 = parseInt(params.actPow_01) / 100
+        this.vService.updateCharacteristic(this.eveChar.CurrentConsumption, power1)
+        logger1 = true
+      }
+      if (this.funcs.hasProperty(params, 'voltage_00')) {
+        voltage0 = parseInt(params.voltage_00) / 100
+        this.sService.updateCharacteristic(this.eveChar.Voltage, voltage0)
+        logger0 = true
+      }
+      if (this.funcs.hasProperty(params, 'voltage_01')) {
+        voltage1 = parseInt(params.voltage_01) / 100
+        this.vService.updateCharacteristic(this.eveChar.Voltage, voltage1)
+        logger1 = true
+      }
+      if (this.funcs.hasProperty(params, 'current_00')) {
+        current0 = parseInt(params.current_00) / 100
+        this.sService.updateCharacteristic(this.eveChar.ElectricCurrent, current0)
+        logger0 = true
+      }
+      if (this.funcs.hasProperty(params, 'current_01')) {
+        current1 = parseInt(params.current_01) / 100
+        this.vService.updateCharacteristic(this.eveChar.ElectricCurrent, current1)
+        logger1 = true
+      }
+      if (params.updateSource && this.enableLogging) {
+        if (logger0) {
+          this.log(
+            '[%s] [switch] %s%s%s.',
+            this.name,
+            power0 !== undefined ? this.lang.curPower + ' [' + power0 + 'W]' : '',
+            voltage0 !== undefined ? ' ' + this.lang.curVolt + ' [' + voltage0 + 'V]' : '',
+            current0 !== undefined ? ' ' + this.lang.curCurr + ' [' + current0 + 'A]' : ''
+          )
+        }
+        if (logger1) {
+          this.log(
+            '[%s] [valve] %s%s%s.',
+            this.name,
+            power1 !== undefined ? this.lang.curPower + ' [' + power1 + 'W]' : '',
+            voltage1 !== undefined ? ' ' + this.lang.curVolt + ' [' + voltage1 + 'V]' : '',
+            current1 !== undefined ? ' ' + this.lang.curCurr + ' [' + current1 + 'A]' : ''
+          )
+        }
+      }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
diff --git a/lib/device/simulation/tap-two.js b/lib/device/simulation/tap-two.js
index 1a32f77b..ec56c0e8 100644
--- a/lib/device/simulation/tap-two.js
+++ b/lib/device/simulation/tap-two.js
@@ -5,6 +5,8 @@
 module.exports = class deviceTapTwo {
   constructor (platform, accessory) {
     // Set up variables from the platform
+    this.eveChar = platform.eveChar
+    this.funcs = platform.funcs
     this.hapChar = platform.api.hap.Characteristic
     this.hapErr = platform.api.hap.HapStatusError
     this.hapServ = platform.api.hap.Service
@@ -42,17 +44,35 @@ module.exports = class deviceTapTwo {
       }
     }
 
+    // Certain devices give power readings
+    if (this.accessory.context.eweUIID === 126) {
+      this.powerReadings = true
+    }
+
     // We want two tap services for this accessory
-    ;['A', 'B'].forEach(v => {
+    ;['1', '2'].forEach(v => {
       // Add the tap service if it doesn't already exist
       let tapService
-      if (!(tapService = this.accessory.getService(this.hapServ.Valve))) {
-        tapService = this.accessory.addService(this.hapServ.Valve)
+      if (!(tapService = this.accessory.getService('Tap ' + v))) {
+        tapService = this.accessory.addService(this.hapServ.Valve, 'Tap ' + v, 'tap' + v)
         tapService.setCharacteristic(this.hapChar.Active, 0)
         tapService.setCharacteristic(this.hapChar.InUse, 0)
         tapService.setCharacteristic(this.hapChar.ValveType, 3)
       }
 
+      // Add Eve power characteristics
+      if (this.powerReadings) {
+        if (!tapService.testCharacteristic(this.eveChar.CurrentConsumption)) {
+          tapService.addCharacteristic(this.eveChar.CurrentConsumption)
+        }
+        if (!tapService.testCharacteristic(this.eveChar.ElectricCurrent)) {
+          tapService.addCharacteristic(this.eveChar.ElectricCurrent)
+        }
+        if (!tapService.testCharacteristic(this.eveChar.Voltage)) {
+          tapService.addCharacteristic(this.eveChar.Voltage)
+        }
+      }
+
       // Add the set handler to the tap active characteristic
       tapService
         .getCharacteristic(this.hapChar.Active)
@@ -69,6 +89,19 @@ module.exports = class deviceTapTwo {
       }
     })
 
+    // Set up an interval to get eWeLink to send power updates
+    if (this.powerReadings) {
+      setTimeout(() => {
+        this.internalUIUpdate()
+        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
+      }, 5000)
+
+      // Stop the intervals on Homebridge shutdown
+      platform.api.on('shutdown', () => {
+        clearInterval(this.intervalPoll)
+      })
+    }
+
     // Output the customised options to the log
     const opts = JSON.stringify({
       logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
@@ -84,20 +117,20 @@ module.exports = class deviceTapTwo {
       }
       const tapService = this.accessory.getService(tap)
       switch (tap) {
-        case 'Tap A':
+        case 'Tap 1':
           params.switches.push({ switch: value ? 'on' : 'off', outlet: 0 })
           break
-        case 'Tap B':
+        case 'Tap 2':
           params.switches.push({ switch: value ? 'on' : 'off', outlet: 1 })
           break
       }
       tapService.updateCharacteristic(this.hapChar.InUse, value)
       if (this.enableLogging) {
         this.log(
-          '[%s] %s [%s %s].',
+          '[%s] [%s] %s [%s].',
           this.name,
-          this.lang.curState,
           tap,
+          this.lang.curState,
           value === 1 ? this.lang.valveYes : this.lang.valveNo
         )
       }
@@ -112,13 +145,29 @@ module.exports = class deviceTapTwo {
     }
   }
 
-  async externalUpdate (params) {
+  async internalUIUpdate () {
     try {
-      if (!params.switches) {
+      // Skip polling if device isn't online
+      if (!this.isOnline) {
         return
       }
-      ;['A', 'B'].forEach((v, k) => {
-        const tapService = this.accessory.getService('Valve ' + v)
+
+      // Send the params to request the updates
+      await this.platform.sendDeviceUpdate(this.accessory, { uiActive: { outlet: 0, time: 120 } })
+      await this.funcs.sleep(2000)
+      await this.platform.sendDeviceUpdate(this.accessory, { uiActive: { outlet: 1, time: 120 } })
+    } catch (err) {
+      // Suppress errors here
+    }
+  }
+
+  async externalUpdate (params) {
+    try {
+      ;['1', '2'].forEach((v, k) => {
+        if (!params.switches) {
+          return
+        }
+        const tapService = this.accessory.getService('Tap ' + v)
         tapService.updateCharacteristic(
           this.hapChar.Active,
           params.switches[k].switch === 'on' ? 1 : 0
@@ -129,14 +178,85 @@ module.exports = class deviceTapTwo {
         )
         if (params.updateSource && this.enableLogging) {
           this.log(
-            '[%s] %s [Tap %s %s].',
+            '[%s] [Tap %s] %s [%s].',
             this.name,
-            this.lang.curState,
             v,
+            this.lang.curState,
             params.switches[k].switch === 'on' ? this.lang.valveYes : this.lang.valveNo
           )
         }
       })
+
+      // Get the power readings given by certain devices
+      if (!this.powerReadings) {
+        return
+      }
+      let logger0 = false
+      let logger1 = false
+      let power0
+      let power1
+      let voltage0
+      let voltage1
+      let current0
+      let current1
+      if (this.funcs.hasProperty(params, 'actPow_00')) {
+        power0 = parseInt(params.actPow_00) / 100
+        this.accessory
+          .getService('Tap 1')
+          .updateCharacteristic(this.eveChar.CurrentConsumption, power0)
+        logger0 = true
+      }
+      if (this.funcs.hasProperty(params, 'actPow_01')) {
+        power1 = parseInt(params.actPow_01) / 100
+        this.accessory
+          .getService('Tap 2')
+          .updateCharacteristic(this.eveChar.CurrentConsumption, power1)
+        logger1 = true
+      }
+      if (this.funcs.hasProperty(params, 'voltage_00')) {
+        voltage0 = parseInt(params.voltage_00) / 100
+        this.accessory.getService('Tap 1').updateCharacteristic(this.eveChar.Voltage, voltage0)
+        logger0 = true
+      }
+      if (this.funcs.hasProperty(params, 'voltage_01')) {
+        voltage1 = parseInt(params.voltage_01) / 100
+        this.accessory.getService('Tap 2').updateCharacteristic(this.eveChar.Voltage, voltage1)
+        logger1 = true
+      }
+      if (this.funcs.hasProperty(params, 'current_00')) {
+        current0 = parseInt(params.current_00) / 100
+        this.accessory
+          .getService('Tap 1')
+          .updateCharacteristic(this.eveChar.ElectricCurrent, current0)
+        logger0 = true
+      }
+      if (this.funcs.hasProperty(params, 'current_01')) {
+        current1 = parseInt(params.current_01) / 100
+        this.accessory
+          .getService('Tap 2')
+          .updateCharacteristic(this.eveChar.ElectricCurrent, current1)
+        logger1 = true
+      }
+      if (params.updateSource && this.enableLogging) {
+        if (logger0) {
+          this.log(
+            '[%s] [Tap 1] %s%s%s.',
+            this.name,
+            power0 !== undefined ? this.lang.curPower + ' [' + power0 + 'W]' : '',
+            voltage0 !== undefined ? ' ' + this.lang.curVolt + ' [' + voltage0 + 'V]' : '',
+            current0 !== undefined ? ' ' + this.lang.curCurr + ' [' + current0 + 'A]' : ''
+          )
+        }
+        if (logger1) {
+          this.log(
+            '[%s] [Tap 2] %s%s%s.',
+            this.name,
+            power1 !== undefined ? this.lang.curPower + ' [' + power1 + 'W]' : '',
+            voltage1 !== undefined ? ' ' + this.lang.curVolt + ' [' + voltage1 + 'V]' : '',
+            current1 !== undefined ? ' ' + this.lang.curCurr + ' [' + current1 + 'A]' : ''
+          )
+        }
+      }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
diff --git a/lib/device/simulation/valve-four.js b/lib/device/simulation/valve-four.js
index ce1dfc19..d605c7b4 100644
--- a/lib/device/simulation/valve-four.js
+++ b/lib/device/simulation/valve-four.js
@@ -127,14 +127,14 @@ module.exports = class deviceValveFour {
           valveService.updateCharacteristic(this.hapChar.RemainingDuration, 0)
           clearTimeout(this.accessory.getService(valve).timer)
           if (this.enableLogging) {
-            this.log('[%s] %s [%s %s].', this.name, this.lang.curState, valve, this.lang.valveNo)
+            this.log('[%s] [%s] %s [%s].', this.name, valve, this.lang.curState, this.lang.valveNo)
           }
           break
         case 1: {
           const timer = valveService.getCharacteristic(this.hapChar.SetDuration).value
           valveService.updateCharacteristic(this.hapChar.RemainingDuration, timer)
           if (this.enableLogging) {
-            this.log('[%s] %s [%s %s].', this.name, this.lang.curState, valve, this.lang.valveYes)
+            this.log('[%s] [%s] %s [%s].', this.name, valve, this.lang.curState, this.lang.valveYes)
           }
           valveService.timer = setTimeout(() => {
             valveService.setCharacteristic(this.hapChar.Active, 0)
@@ -168,10 +168,10 @@ module.exports = class deviceValveFour {
             valveService.updateCharacteristic(this.hapChar.RemainingDuration, timer)
             if (params.updateSource && this.enableLogging) {
               this.log(
-                '[%s] %s [Valve %s %s].',
+                '[%s] [Valve %s] %s [%s].',
                 this.name,
-                this.lang.curState,
                 v,
+                this.lang.curState,
                 this.lang.valveYes
               )
             }
diff --git a/lib/device/simulation/valve-two.js b/lib/device/simulation/valve-two.js
index a1299c7e..62165579 100644
--- a/lib/device/simulation/valve-two.js
+++ b/lib/device/simulation/valve-two.js
@@ -5,6 +5,8 @@
 module.exports = class deviceValveTwo {
   constructor (platform, accessory) {
     // Set up variables from the platform
+    this.eveChar = platform.eveChar
+    this.funcs = platform.funcs
     this.hapChar = platform.api.hap.Characteristic
     this.hapErr = platform.api.hap.HapStatusError
     this.hapServ = platform.api.hap.Service
@@ -42,16 +44,17 @@ module.exports = class deviceValveTwo {
       }
     }
 
+    // Certain devices give power readings
+    if (this.accessory.context.eweUIID === 126) {
+      this.powerReadings = true
+    }
+
     // We want two valve services for this accessory
-    ;['A', 'B'].forEach(v => {
+    ;['1', '2'].forEach(v => {
       // Add the valve service if it doesn't already exist
       let valveService
       if (!(valveService = this.accessory.getService('Valve ' + v))) {
-        valveService = this.accessory.addService(
-          this.hapServ.Valve,
-          'Valve ' + v,
-          'valve' + v.toLowerCase()
-        )
+        valveService = this.accessory.addService(this.hapServ.Valve, 'Valve ' + v, 'valve' + v)
         valveService.setCharacteristic(this.hapChar.Active, 0)
         valveService.setCharacteristic(this.hapChar.InUse, 0)
         valveService.setCharacteristic(this.hapChar.ValveType, 1)
@@ -59,10 +62,23 @@ module.exports = class deviceValveTwo {
         valveService.addCharacteristic(this.hapChar.RemainingDuration)
       }
 
+      // Add Eve power characteristics
+      if (this.powerReadings) {
+        if (!valveService.testCharacteristic(this.eveChar.CurrentConsumption)) {
+          valveService.addCharacteristic(this.eveChar.CurrentConsumption)
+        }
+        if (!valveService.testCharacteristic(this.eveChar.ElectricCurrent)) {
+          valveService.addCharacteristic(this.eveChar.ElectricCurrent)
+        }
+        if (!valveService.testCharacteristic(this.eveChar.Voltage)) {
+          valveService.addCharacteristic(this.eveChar.Voltage)
+        }
+      }
+
       // Add the set handler to the valve active characteristic
-      valveService.getCharacteristic(this.hapChar.Active).onSet(async value => {
-        await this.internalUpdate('Valve ' + v, value)
-      })
+      valveService
+        .getCharacteristic(this.hapChar.Active)
+        .onSet(async value => await this.internalUpdate('Valve ' + v, value))
 
       // Add the get handlers only if the user has configured the offlineAsNoResponse setting
       if (platform.config.offlineAsNoResponse) {
@@ -93,6 +109,19 @@ module.exports = class deviceValveTwo {
       })
     })
 
+    // Set up an interval to get eWeLink to send power updates
+    if (this.powerReadings) {
+      setTimeout(() => {
+        this.internalUIUpdate()
+        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
+      }, 5000)
+
+      // Stop the intervals on Homebridge shutdown
+      platform.api.on('shutdown', () => {
+        clearInterval(this.intervalPoll)
+      })
+    }
+
     // Output the customised options to the log
     const opts = JSON.stringify({
       logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
@@ -108,10 +137,10 @@ module.exports = class deviceValveTwo {
       }
       const valveService = this.accessory.getService(valve)
       switch (valve) {
-        case 'Valve A':
+        case 'Valve 1':
           params.switches.push({ switch: value ? 'on' : 'off', outlet: 0 })
           break
-        case 'Valve B':
+        case 'Valve 2':
           params.switches.push({ switch: value ? 'on' : 'off', outlet: 1 })
           break
       }
@@ -121,14 +150,14 @@ module.exports = class deviceValveTwo {
           valveService.updateCharacteristic(this.hapChar.RemainingDuration, 0)
           clearTimeout(this.accessory.getService(valve).timer)
           if (this.enableLogging) {
-            this.log('[%s] %s [%s %s].', this.name, this.lang.curState, valve, this.lang.valveNo)
+            this.log('[%s] [%s] %s [%s].', this.name, valve, this.lang.curState, this.lang.valveNo)
           }
           break
         case 1: {
           const timer = valveService.getCharacteristic(this.hapChar.SetDuration).value
           valveService.updateCharacteristic(this.hapChar.RemainingDuration, timer)
           if (this.enableLogging) {
-            this.log('[%s] %s [%s %s].', this.name, this.lang.curState, valve, this.lang.valveYes)
+            this.log('[%s] [%s] %s [%s].', this.name, valve, this.lang.curState, this.lang.valveYes)
           }
           valveService.timer = setTimeout(() => {
             valveService.setCharacteristic(this.hapChar.Active, 0)
@@ -147,12 +176,28 @@ module.exports = class deviceValveTwo {
     }
   }
 
-  async externalUpdate (params) {
+  async internalUIUpdate () {
     try {
-      if (!params.switches) {
+      // Skip polling if device isn't online
+      if (!this.isOnline) {
         return
       }
-      ;['A', 'B'].forEach((v, k) => {
+
+      // Send the params to request the updates
+      await this.platform.sendDeviceUpdate(this.accessory, { uiActive: { outlet: 0, time: 120 } })
+      await this.funcs.sleep(2000)
+      await this.platform.sendDeviceUpdate(this.accessory, { uiActive: { outlet: 1, time: 120 } })
+    } catch (err) {
+      // Suppress errors here
+    }
+  }
+
+  async externalUpdate (params) {
+    try {
+      ;['1', '2'].forEach((v, k) => {
+        if (!params.switches) {
+          return
+        }
         const valveService = this.accessory.getService('Valve ' + v)
         if (params.switches[k].switch === 'on') {
           if (valveService.getCharacteristic(this.hapChar.Active).value === 0) {
@@ -162,10 +207,10 @@ module.exports = class deviceValveTwo {
             valveService.updateCharacteristic(this.hapChar.RemainingDuration, timer)
             if (params.updateSource && this.enableLogging) {
               this.log(
-                '[%s] %s [Valve %s %s].',
+                '[%s] [Valve %s] %s [%s].',
                 this.name,
-                this.lang.curState,
                 v,
+                this.lang.curState,
                 this.lang.valveYes
               )
             }
@@ -180,6 +225,77 @@ module.exports = class deviceValveTwo {
         valveService.updateCharacteristic(this.hapChar.RemainingDuration, 0)
         clearTimeout(valveService.timer)
       })
+
+      // Get the power readings given by certain devices
+      if (!this.powerReadings) {
+        return
+      }
+      let logger0 = false
+      let logger1 = false
+      let power0
+      let power1
+      let voltage0
+      let voltage1
+      let current0
+      let current1
+      if (this.funcs.hasProperty(params, 'actPow_00')) {
+        power0 = parseInt(params.actPow_00) / 100
+        this.accessory
+          .getService('Valve 1')
+          .updateCharacteristic(this.eveChar.CurrentConsumption, power0)
+        logger0 = true
+      }
+      if (this.funcs.hasProperty(params, 'actPow_01')) {
+        power1 = parseInt(params.actPow_01) / 100
+        this.accessory
+          .getService('Valve 2')
+          .updateCharacteristic(this.eveChar.CurrentConsumption, power1)
+        logger1 = true
+      }
+      if (this.funcs.hasProperty(params, 'voltage_00')) {
+        voltage0 = parseInt(params.voltage_00) / 100
+        this.accessory.getService('Valve 1').updateCharacteristic(this.eveChar.Voltage, voltage0)
+        logger0 = true
+      }
+      if (this.funcs.hasProperty(params, 'voltage_01')) {
+        voltage1 = parseInt(params.voltage_01) / 100
+        this.accessory.getService('Valve 2').updateCharacteristic(this.eveChar.Voltage, voltage1)
+        logger1 = true
+      }
+      if (this.funcs.hasProperty(params, 'current_00')) {
+        current0 = parseInt(params.current_00) / 100
+        this.accessory
+          .getService('Valve 1')
+          .updateCharacteristic(this.eveChar.ElectricCurrent, current0)
+        logger0 = true
+      }
+      if (this.funcs.hasProperty(params, 'current_01')) {
+        current1 = parseInt(params.current_01) / 100
+        this.accessory
+          .getService('Valve 2')
+          .updateCharacteristic(this.eveChar.ElectricCurrent, current1)
+        logger1 = true
+      }
+      if (params.updateSource && this.enableLogging) {
+        if (logger0) {
+          this.log(
+            '[%s] [Valve 1] %s%s%s.',
+            this.name,
+            power0 !== undefined ? this.lang.curPower + ' [' + power0 + 'W]' : '',
+            voltage0 !== undefined ? ' ' + this.lang.curVolt + ' [' + voltage0 + 'V]' : '',
+            current0 !== undefined ? ' ' + this.lang.curCurr + ' [' + current0 + 'A]' : ''
+          )
+        }
+        if (logger1) {
+          this.log(
+            '[%s] [Valve 2] %s%s%s.',
+            this.name,
+            power1 !== undefined ? this.lang.curPower + ' [' + power1 + 'W]' : '',
+            voltage1 !== undefined ? ' ' + this.lang.curVolt + ' [' + voltage1 + 'V]' : '',
+            current1 !== undefined ? ' ' + this.lang.curCurr + ' [' + current1 + 'A]' : ''
+          )
+        }
+      }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }

From 907da40f9fc317644c1610ca9c0fc340047e3904 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 30 Jun 2021 10:35:17 +0100
Subject: [PATCH 2418/3183] change logic

---
 lib/device/simulation/garage-two.js | 141 ++++++++++++++--------------
 lib/device/simulation/tap-two.js    |  43 +++++----
 lib/device/simulation/valve-two.js  |  57 ++++++-----
 3 files changed, 119 insertions(+), 122 deletions(-)

diff --git a/lib/device/simulation/garage-two.js b/lib/device/simulation/garage-two.js
index b825818d..1abce6e5 100644
--- a/lib/device/simulation/garage-two.js
+++ b/lib/device/simulation/garage-two.js
@@ -242,77 +242,76 @@ module.exports = class deviceGarageTwo {
 
   externalUpdate (params) {
     try {
-      ;['1', '2'].forEach(async v => {
-        if (!params.switches || this.inUse) {
-          return
-        }
-        const gcService = this.accessory.getService('Garage ' + v)
-        const prevState =
-          v === '1'
-            ? this.accessory.context.cacheOneCurrentDoorState
-            : this.accessory.context.cacheTwoCurrentDoorState
-        const newPos = [0, 2].includes(prevState) ? 3 : 2
-        switch (v) {
-          case '1':
-            if (
-              params.switches[0].switch === params.switches[1].switch ||
-              params.switches[prevState % 2].switch === 'on'
-            ) {
-              return
-            }
-            break
-          case '2':
-            if (
-              params.switches[2].switch === params.switches[3].switch ||
-              params.switches[(prevState % 2) + 2].switch === 'on'
-            ) {
-              return
-            }
-            break
-        }
-        this.inUse = true
-        gcService.updateCharacteristic(this.hapChar.TargetDoorState, newPos - 2)
-        gcService.updateCharacteristic(this.hapChar.CurrentDoorState, newPos)
-        switch (v) {
-          case '1':
-            this.accessory.context.cacheOneCurrentDoorState = newPos
-            this.accessory.context.cacheTwoTargetDoorState = newPos - 2
-            break
-          case '2':
-            this.accessory.context.cacheTwoCurrentDoorState = newPos
-            this.accessory.context.cacheTwoTargetDoorState = newPos - 2
-            break
-        }
-        await this.funcs.sleep(2000)
-        this.inUse = false
-        const operationTime = newPos === 2 ? this.operationTimeUp : this.operationTimeDown
-        await this.funcs.sleep(Math.max((operationTime - 20) * 100, 0))
-        gcService.updateCharacteristic(this.hapChar.CurrentDoorState, newPos - 2)
-        switch (v) {
-          case '1':
-            this.accessory.context.cacheOneCurrentDoorState = newPos - 2
-            if (params.updateSource && this.enableLogging) {
-              this.log(
-                '[%s] [garage 1] %s [%s].',
-                this.name,
-                this.lang.curState,
-                newPos === 2 ? this.lang.doorOpen : this.lang.doorClosed
-              )
-            }
-            break
-          case '2':
-            this.accessory.context.cacheTwoCurrentDoorState = newPos - 2
-            if (params.updateSource && this.enableLogging) {
-              this.log(
-                '[%s] [garage 2] %s [%s].',
-                this.name,
-                this.lang.curState,
-                newPos === 2 ? this.lang.doorOpen : this.lang.doorClosed
-              )
-            }
-            break
-        }
-      })
+      if (params.switches && !this.inUse) {
+        ;['1', '2'].forEach(async v => {
+          const gcService = this.accessory.getService('Garage ' + v)
+          const prevState =
+            v === '1'
+              ? this.accessory.context.cacheOneCurrentDoorState
+              : this.accessory.context.cacheTwoCurrentDoorState
+          const newPos = [0, 2].includes(prevState) ? 3 : 2
+          switch (v) {
+            case '1':
+              if (
+                params.switches[0].switch === params.switches[1].switch ||
+                params.switches[prevState % 2].switch === 'on'
+              ) {
+                return
+              }
+              break
+            case '2':
+              if (
+                params.switches[2].switch === params.switches[3].switch ||
+                params.switches[(prevState % 2) + 2].switch === 'on'
+              ) {
+                return
+              }
+              break
+          }
+          this.inUse = true
+          gcService.updateCharacteristic(this.hapChar.TargetDoorState, newPos - 2)
+          gcService.updateCharacteristic(this.hapChar.CurrentDoorState, newPos)
+          switch (v) {
+            case '1':
+              this.accessory.context.cacheOneCurrentDoorState = newPos
+              this.accessory.context.cacheTwoTargetDoorState = newPos - 2
+              break
+            case '2':
+              this.accessory.context.cacheTwoCurrentDoorState = newPos
+              this.accessory.context.cacheTwoTargetDoorState = newPos - 2
+              break
+          }
+          await this.funcs.sleep(2000)
+          this.inUse = false
+          const operationTime = newPos === 2 ? this.operationTimeUp : this.operationTimeDown
+          await this.funcs.sleep(Math.max((operationTime - 20) * 100, 0))
+          gcService.updateCharacteristic(this.hapChar.CurrentDoorState, newPos - 2)
+          switch (v) {
+            case '1':
+              this.accessory.context.cacheOneCurrentDoorState = newPos - 2
+              if (params.updateSource && this.enableLogging) {
+                this.log(
+                  '[%s] [garage 1] %s [%s].',
+                  this.name,
+                  this.lang.curState,
+                  newPos === 2 ? this.lang.doorOpen : this.lang.doorClosed
+                )
+              }
+              break
+            case '2':
+              this.accessory.context.cacheTwoCurrentDoorState = newPos - 2
+              if (params.updateSource && this.enableLogging) {
+                this.log(
+                  '[%s] [garage 2] %s [%s].',
+                  this.name,
+                  this.lang.curState,
+                  newPos === 2 ? this.lang.doorOpen : this.lang.doorClosed
+                )
+              }
+              break
+          }
+        })
+      }
 
       // Get the power readings given by certain devices
       if (!this.powerReadings) {
diff --git a/lib/device/simulation/tap-two.js b/lib/device/simulation/tap-two.js
index ec56c0e8..25f751e7 100644
--- a/lib/device/simulation/tap-two.js
+++ b/lib/device/simulation/tap-two.js
@@ -163,29 +163,28 @@ module.exports = class deviceTapTwo {
 
   async externalUpdate (params) {
     try {
-      ;['1', '2'].forEach((v, k) => {
-        if (!params.switches) {
-          return
-        }
-        const tapService = this.accessory.getService('Tap ' + v)
-        tapService.updateCharacteristic(
-          this.hapChar.Active,
-          params.switches[k].switch === 'on' ? 1 : 0
-        )
-        tapService.updateCharacteristic(
-          this.hapChar.InUse,
-          params.switches[k].switch === 'on' ? 1 : 0
-        )
-        if (params.updateSource && this.enableLogging) {
-          this.log(
-            '[%s] [Tap %s] %s [%s].',
-            this.name,
-            v,
-            this.lang.curState,
-            params.switches[k].switch === 'on' ? this.lang.valveYes : this.lang.valveNo
+      if (params.switches) {
+        ;['1', '2'].forEach((v, k) => {
+          const tapService = this.accessory.getService('Tap ' + v)
+          tapService.updateCharacteristic(
+            this.hapChar.Active,
+            params.switches[k].switch === 'on' ? 1 : 0
           )
-        }
-      })
+          tapService.updateCharacteristic(
+            this.hapChar.InUse,
+            params.switches[k].switch === 'on' ? 1 : 0
+          )
+          if (params.updateSource && this.enableLogging) {
+            this.log(
+              '[%s] [Tap %s] %s [%s].',
+              this.name,
+              v,
+              this.lang.curState,
+              params.switches[k].switch === 'on' ? this.lang.valveYes : this.lang.valveNo
+            )
+          }
+        })
+      }
 
       // Get the power readings given by certain devices
       if (!this.powerReadings) {
diff --git a/lib/device/simulation/valve-two.js b/lib/device/simulation/valve-two.js
index 62165579..22e18dbc 100644
--- a/lib/device/simulation/valve-two.js
+++ b/lib/device/simulation/valve-two.js
@@ -194,37 +194,36 @@ module.exports = class deviceValveTwo {
 
   async externalUpdate (params) {
     try {
-      ;['1', '2'].forEach((v, k) => {
-        if (!params.switches) {
-          return
-        }
-        const valveService = this.accessory.getService('Valve ' + v)
-        if (params.switches[k].switch === 'on') {
-          if (valveService.getCharacteristic(this.hapChar.Active).value === 0) {
-            const timer = valveService.getCharacteristic(this.hapChar.SetDuration).value
-            valveService.updateCharacteristic(this.hapChar.Active, 1)
-            valveService.updateCharacteristic(this.hapChar.InUse, 1)
-            valveService.updateCharacteristic(this.hapChar.RemainingDuration, timer)
-            if (params.updateSource && this.enableLogging) {
-              this.log(
-                '[%s] [Valve %s] %s [%s].',
-                this.name,
-                v,
-                this.lang.curState,
-                this.lang.valveYes
-              )
+      if (params.switches) {
+        ;['1', '2'].forEach((v, k) => {
+          const valveService = this.accessory.getService('Valve ' + v)
+          if (params.switches[k].switch === 'on') {
+            if (valveService.getCharacteristic(this.hapChar.Active).value === 0) {
+              const timer = valveService.getCharacteristic(this.hapChar.SetDuration).value
+              valveService.updateCharacteristic(this.hapChar.Active, 1)
+              valveService.updateCharacteristic(this.hapChar.InUse, 1)
+              valveService.updateCharacteristic(this.hapChar.RemainingDuration, timer)
+              if (params.updateSource && this.enableLogging) {
+                this.log(
+                  '[%s] [Valve %s] %s [%s].',
+                  this.name,
+                  v,
+                  this.lang.curState,
+                  this.lang.valveYes
+                )
+              }
+              valveService.timer = setTimeout(() => {
+                valveService.setCharacteristic(this.hapChar.Active, 0)
+              }, timer * 1000)
             }
-            valveService.timer = setTimeout(() => {
-              valveService.setCharacteristic(this.hapChar.Active, 0)
-            }, timer * 1000)
+            return
           }
-          return
-        }
-        valveService.updateCharacteristic(this.hapChar.Active, 0)
-        valveService.updateCharacteristic(this.hapChar.InUse, 0)
-        valveService.updateCharacteristic(this.hapChar.RemainingDuration, 0)
-        clearTimeout(valveService.timer)
-      })
+          valveService.updateCharacteristic(this.hapChar.Active, 0)
+          valveService.updateCharacteristic(this.hapChar.InUse, 0)
+          valveService.updateCharacteristic(this.hapChar.RemainingDuration, 0)
+          clearTimeout(valveService.timer)
+        })
+      }
 
       // Get the power readings given by certain devices
       if (!this.powerReadings) {

From abeaf27f069b2785934140191980b0561e77c433 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 30 Jun 2021 10:58:06 +0100
Subject: [PATCH 2419/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a894a1b3..0899fde9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,7 +25,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
   - Wattage/Voltage/Amp readings (via Eve app) now visible for outlets in Eve app when exposed as `Switch`
   - Wattage/Voltage/Amp readings (via Eve app) now visible for DUALR3 when in motor mode
   - Support for LAN mode control for DUALR3 in motor mode
-  - Polling via LAN mode to enable constant power attribute updates for POWR2 devices
+  - Polling via LAN mode to enable constant power attribute updates for POWR2/DUALR3 devices
 - **iFan Devices**
   - Support for LAN mode control
   - Added option to specify a manual IP
@@ -42,10 +42,10 @@ All notable changes to this homebridge-ewelink will be documented in this file.
   - Will no longer request current state when coming back online to reduce duplicate accessory updates
 - **Humidity Sensor Devices**
   - Config option to offset the recorded humidity (%RH) for devices that report this
-- **Garage Simulations**
+- **Accessory Simulations**
   - Added `TimesOpened` Eve characteristic functionality to single garage door simulation
-- **Lock Simulations**
-  - Added the option of using a DW2 or Zigbee contact sensor to determine _Locked_ and _Unlocked_ state
+  - Added the option of using a DW2 or Zigbee contact sensor to determine _Locked_ and _Unlocked_ state for lock simulation
+  - Wattage/Voltage/Amp readings (via Eve app) visible for simulations when using a DUALR3 device
 - **New Devices**
   - Support for Zigbee leak sensors
   - Support for device with eWeLink UIID 67 _RollingDoor_

From 487fa71c233dc033c9a6da04c9b99925d99fdb48 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 30 Jun 2021 18:44:05 +0100
Subject: [PATCH 2420/3183] no need for lan polling dualr3 for power updates

---
 lib/connection/lan.js                 |  2 +-
 lib/device/motor.js                   | 22 ++++++++++++----------
 lib/device/outlet-multi.js            |  6 +++++-
 lib/device/simulation/blind.js        |  2 +-
 lib/device/simulation/door.js         |  2 +-
 lib/device/simulation/garage-two.js   |  2 +-
 lib/device/simulation/lock-one.js     |  5 ++++-
 lib/device/simulation/purifier.js     |  5 ++++-
 lib/device/simulation/sensor.js       |  5 ++++-
 lib/device/simulation/switch-valve.js |  2 +-
 lib/device/simulation/tap-one.js      |  5 ++++-
 lib/device/simulation/tap-two.js      |  2 +-
 lib/device/simulation/valve-one.js    |  5 ++++-
 lib/device/simulation/valve-two.js    |  2 +-
 lib/device/simulation/window.js       |  2 +-
 lib/device/switch-multi.js            |  8 ++++++--
 16 files changed, 51 insertions(+), 26 deletions(-)

diff --git a/lib/connection/lan.js b/lib/connection/lan.js
index 39998c39..2d624e04 100644
--- a/lib/connection/lan.js
+++ b/lib/connection/lan.js
@@ -214,7 +214,7 @@ module.exports = class connectionLAN {
         // Use hasProperty has location can be INT 0
         params.location = json.params.location
         suffix = 'location'
-      } else if (json.params.uiActive && [32, 126].includes(deviceInfo.uiid)) {
+      } else if (json.params.uiActive && [5, 32].includes(deviceInfo.uiid)) {
         // Not sure if this works with POWR1 (uiid 5)
         params.uiActive = json.params.uiActive
         suffix = 'monitor'
diff --git a/lib/device/motor.js b/lib/device/motor.js
index b71e41a3..63b8f64e 100644
--- a/lib/device/motor.js
+++ b/lib/device/motor.js
@@ -89,16 +89,18 @@ module.exports = class deviceMotor {
       })
     }
 
-    // Set up an interval to get eWeLink to send power updates
-    setTimeout(() => {
-      this.internalUIUpdate()
-      this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
-    }, 5000)
-
-    // Stop the intervals on Homebridge shutdown
-    platform.api.on('shutdown', () => {
-      clearInterval(this.intervalPoll)
-    })
+    if (platform.config.mode === 'wan') {
+      // Set up an interval to get eWeLink to send power updates
+      setTimeout(() => {
+        this.internalUIUpdate()
+        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
+      }, 5000)
+
+      // Stop the intervals on Homebridge shutdown
+      platform.api.on('shutdown', () => {
+        clearInterval(this.intervalPoll)
+      })
+    }
 
     // Output the customised options to the log
     const opts = JSON.stringify({
diff --git a/lib/device/outlet-multi.js b/lib/device/outlet-multi.js
index 576f964f..8726f2a1 100644
--- a/lib/device/outlet-multi.js
+++ b/lib/device/outlet-multi.js
@@ -126,7 +126,11 @@ module.exports = class deviceOutletMulti {
     })
 
     // Set up extra features for outlets that provide power readings
-    if (this.powerReadings && accessory.context.switchNumber === '0') {
+    if (
+      this.powerReadings &&
+      accessory.context.switchNumber === '0' &&
+      platform.config.mode === 'wan'
+    ) {
       // Set up an interval to get eWeLink to send power updates
       setTimeout(() => {
         this.internalUIUpdate()
diff --git a/lib/device/simulation/blind.js b/lib/device/simulation/blind.js
index b9f74e7c..a800519f 100644
--- a/lib/device/simulation/blind.js
+++ b/lib/device/simulation/blind.js
@@ -99,7 +99,7 @@ module.exports = class deviceBlind {
     }
 
     // Set up an interval to get eWeLink to send power updates
-    if (this.powerReadings) {
+    if (this.powerReadings && platform.config.mode === 'wan') {
       setTimeout(() => {
         this.internalUIUpdate()
         this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
diff --git a/lib/device/simulation/door.js b/lib/device/simulation/door.js
index 2aacbe44..522353a3 100644
--- a/lib/device/simulation/door.js
+++ b/lib/device/simulation/door.js
@@ -99,7 +99,7 @@ module.exports = class deviceDoor {
     }
 
     // Set up an interval to get eWeLink to send power updates
-    if (this.powerReadings) {
+    if (this.powerReadings && platform.config.mode === 'wan') {
       setTimeout(() => {
         this.internalUIUpdate()
         this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
diff --git a/lib/device/simulation/garage-two.js b/lib/device/simulation/garage-two.js
index 1abce6e5..06587e7e 100644
--- a/lib/device/simulation/garage-two.js
+++ b/lib/device/simulation/garage-two.js
@@ -111,7 +111,7 @@ module.exports = class deviceGarageTwo {
     })
 
     // Set up an interval to get eWeLink to send power updates
-    if (this.powerReadings) {
+    if (this.powerReadings && platform.config.mode === 'wan') {
       setTimeout(() => {
         this.internalUIUpdate()
         this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
diff --git a/lib/device/simulation/lock-one.js b/lib/device/simulation/lock-one.js
index 282eea47..34fe2200 100644
--- a/lib/device/simulation/lock-one.js
+++ b/lib/device/simulation/lock-one.js
@@ -127,7 +127,10 @@ module.exports = class deviceLockOne {
       .updateCharacteristic(this.hapChar.LockTargetState, 1)
 
     // Set up an interval to get eWeLink to send power updates
-    if (this.powerReadings) {
+    if (
+      this.powerReadings &&
+      (!this.isDualR3 || (this.isDualR3 && platform.config.mode === 'wan'))
+    ) {
       setTimeout(() => {
         this.internalUIUpdate()
         this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
diff --git a/lib/device/simulation/purifier.js b/lib/device/simulation/purifier.js
index 9724c52b..7239b99f 100644
--- a/lib/device/simulation/purifier.js
+++ b/lib/device/simulation/purifier.js
@@ -135,7 +135,10 @@ module.exports = class devicePurifier {
     }
 
     // Set up an interval to get eWeLink to send power updates
-    if (this.powerReadings) {
+    if (
+      this.powerReadings &&
+      (!this.isDualR3 || (this.isDualR3 && platform.config.mode === 'wan'))
+    ) {
       setTimeout(() => {
         this.internalUIUpdate()
         this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
diff --git a/lib/device/simulation/sensor.js b/lib/device/simulation/sensor.js
index 0535d96d..8f04481a 100644
--- a/lib/device/simulation/sensor.js
+++ b/lib/device/simulation/sensor.js
@@ -163,7 +163,10 @@ module.exports = class deviceSensor {
     })
 
     // Set up an interval to get eWeLink to send power updates
-    if (this.powerReadings) {
+    if (
+      this.powerReadings &&
+      (!this.isDualR3 || (this.isDualR3 && platform.config.mode === 'wan'))
+    ) {
       setTimeout(() => {
         this.internalUIUpdate()
         this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
diff --git a/lib/device/simulation/switch-valve.js b/lib/device/simulation/switch-valve.js
index 043ebca7..def0dd69 100644
--- a/lib/device/simulation/switch-valve.js
+++ b/lib/device/simulation/switch-valve.js
@@ -133,7 +133,7 @@ module.exports = class deviceSwitchValve {
     })
 
     // Set up an interval to get eWeLink to send power updates
-    if (this.powerReadings) {
+    if (this.powerReadings && platform.config.mode === 'wan') {
       setTimeout(() => {
         this.internalUIUpdate()
         this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
diff --git a/lib/device/simulation/tap-one.js b/lib/device/simulation/tap-one.js
index adc34cca..824ff05d 100644
--- a/lib/device/simulation/tap-one.js
+++ b/lib/device/simulation/tap-one.js
@@ -112,7 +112,10 @@ module.exports = class deviceTapOne {
     }
 
     // Set up an interval to get eWeLink to send power updates
-    if (this.powerReadings) {
+    if (
+      this.powerReadings &&
+      (!this.isDualR3 || (this.isDualR3 && platform.config.mode === 'wan'))
+    ) {
       setTimeout(() => {
         this.internalUIUpdate()
         this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
diff --git a/lib/device/simulation/tap-two.js b/lib/device/simulation/tap-two.js
index 25f751e7..5ca2190a 100644
--- a/lib/device/simulation/tap-two.js
+++ b/lib/device/simulation/tap-two.js
@@ -90,7 +90,7 @@ module.exports = class deviceTapTwo {
     })
 
     // Set up an interval to get eWeLink to send power updates
-    if (this.powerReadings) {
+    if (this.powerReadings && platform.config.mode === 'wan') {
       setTimeout(() => {
         this.internalUIUpdate()
         this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
diff --git a/lib/device/simulation/valve-one.js b/lib/device/simulation/valve-one.js
index 7bb5a811..827b3c1a 100644
--- a/lib/device/simulation/valve-one.js
+++ b/lib/device/simulation/valve-one.js
@@ -132,7 +132,10 @@ module.exports = class deviceValveOne {
     })
 
     // Set up an interval to get eWeLink to send power updates
-    if (this.powerReadings) {
+    if (
+      this.powerReadings &&
+      (!this.isDualR3 || (this.isDualR3 && platform.config.mode === 'wan'))
+    ) {
       setTimeout(() => {
         this.internalUIUpdate()
         this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
diff --git a/lib/device/simulation/valve-two.js b/lib/device/simulation/valve-two.js
index 22e18dbc..95d72afd 100644
--- a/lib/device/simulation/valve-two.js
+++ b/lib/device/simulation/valve-two.js
@@ -110,7 +110,7 @@ module.exports = class deviceValveTwo {
     })
 
     // Set up an interval to get eWeLink to send power updates
-    if (this.powerReadings) {
+    if (this.powerReadings && platform.config.mode === 'wan') {
       setTimeout(() => {
         this.internalUIUpdate()
         this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
diff --git a/lib/device/simulation/window.js b/lib/device/simulation/window.js
index 68770e87..4e959056 100644
--- a/lib/device/simulation/window.js
+++ b/lib/device/simulation/window.js
@@ -99,7 +99,7 @@ module.exports = class deviceWindow {
     }
 
     // Set up an interval to get eWeLink to send power updates
-    if (this.powerReadings) {
+    if (this.powerReadings && platform.config.mode === 'wan') {
       setTimeout(() => {
         this.internalUIUpdate()
         this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
diff --git a/lib/device/switch-multi.js b/lib/device/switch-multi.js
index f0ff2753..c80f90f6 100644
--- a/lib/device/switch-multi.js
+++ b/lib/device/switch-multi.js
@@ -118,7 +118,11 @@ module.exports = class deviceSwitchMulti {
     })
 
     // Set up extra features for outlets that provide power readings
-    if (this.powerReadings && accessory.context.switchNumber === '0') {
+    if (
+      this.powerReadings &&
+      accessory.context.switchNumber === '0' &&
+      platform.config.mode === 'wan'
+    ) {
       // Set up an interval to get eWeLink to send power updates
       setTimeout(() => {
         this.internalUIUpdate()
@@ -299,7 +303,7 @@ module.exports = class deviceSwitchMulti {
           let voltage
           let current
           if (this.funcs.hasProperty(params, 'actPow_0' + (i - 1))) {
-            const power = parseInt(params['actPow_0' + (i - 1)]) / 100
+            power = parseInt(params['actPow_0' + (i - 1)]) / 100
             service.updateCharacteristic(this.eveChar.CurrentConsumption, power)
             logger = true
           }

From 1fb7a83c832d4f72613738c2708edeead6d72d08 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 30 Jun 2021 18:46:32 +0100
Subject: [PATCH 2421/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0899fde9..4c244cfa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,7 +25,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
   - Wattage/Voltage/Amp readings (via Eve app) now visible for outlets in Eve app when exposed as `Switch`
   - Wattage/Voltage/Amp readings (via Eve app) now visible for DUALR3 when in motor mode
   - Support for LAN mode control for DUALR3 in motor mode
-  - Polling via LAN mode to enable constant power attribute updates for POWR2/DUALR3 devices
+  - Polling via LAN mode to enable constant power attribute updates for POW/R2 devices
 - **iFan Devices**
   - Support for LAN mode control
   - Added option to specify a manual IP

From 08713a1287604b85f08d1a288cd4720d12f940c9 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 30 Jun 2021 20:04:04 +0100
Subject: [PATCH 2422/3183] correct char names for garages

---
 lib/device/simulation/garage-four.js | 6 +++---
 lib/device/simulation/garage-one.js  | 6 +++---
 lib/device/simulation/garage-two.js  | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/lib/device/simulation/garage-four.js b/lib/device/simulation/garage-four.js
index dcdcc5a8..fd74ff5c 100644
--- a/lib/device/simulation/garage-four.js
+++ b/lib/device/simulation/garage-four.js
@@ -78,17 +78,17 @@ module.exports = class deviceGarageFour {
 
       // Add the get handlers only if the user has configured the offlineAsNoResponse setting
       if (platform.config.offlineAsNoResponse) {
-        gdService.getCharacteristic(this.hapChar.CurrentPosition).onGet(() => {
+        gdService.getCharacteristic(this.hapChar.CurrentDoorState).onGet(() => {
           if (!this.isOnline) {
             throw new this.hapErr(-70402)
           }
-          return gdService.getCharacteristic(this.hapChar.CurrentPosition).value
+          return gdService.getCharacteristic(this.hapChar.CurrentDoorState).value
         })
         gdService.getCharacteristic(this.hapChar.TargetDoorState).onGet(() => {
           if (!this.isOnline) {
             throw new this.hapErr(-70402)
           }
-          return gdService.getCharacteristic(this.hapChar.TargetPosition).value
+          return gdService.getCharacteristic(this.hapChar.TargetDoorState).value
         })
       }
     })
diff --git a/lib/device/simulation/garage-one.js b/lib/device/simulation/garage-one.js
index c4f0c279..ebef73fc 100644
--- a/lib/device/simulation/garage-one.js
+++ b/lib/device/simulation/garage-one.js
@@ -99,17 +99,17 @@ module.exports = class deviceGarageOne {
 
     // Add the get handlers only if the user has configured the offlineAsNoResponse setting
     if (platform.config.offlineAsNoResponse) {
-      this.service.getCharacteristic(this.hapChar.CurrentPosition).onGet(() => {
+      this.service.getCharacteristic(this.hapChar.CurrentDoorState).onGet(() => {
         if (!this.isOnline) {
           throw new this.hapErr(-70402)
         }
-        return this.service.getCharacteristic(this.hapChar.CurrentPosition).value
+        return this.service.getCharacteristic(this.hapChar.CurrentDoorState).value
       })
       this.service.getCharacteristic(this.hapChar.TargetDoorState).onGet(() => {
         if (!this.isOnline) {
           throw new this.hapErr(-70402)
         }
-        return this.service.getCharacteristic(this.hapChar.TargetPosition).value
+        return this.service.getCharacteristic(this.hapChar.TargetDoorState).value
       })
     }
 
diff --git a/lib/device/simulation/garage-two.js b/lib/device/simulation/garage-two.js
index 06587e7e..6ef94d3e 100644
--- a/lib/device/simulation/garage-two.js
+++ b/lib/device/simulation/garage-two.js
@@ -95,17 +95,17 @@ module.exports = class deviceGarageTwo {
 
       // Add the get handlers only if the user has configured the offlineAsNoResponse setting
       if (platform.config.offlineAsNoResponse) {
-        gdService.getCharacteristic(this.hapChar.CurrentPosition).onGet(() => {
+        gdService.getCharacteristic(this.hapChar.CurrentDoorState).onGet(() => {
           if (!this.isOnline) {
             throw new this.hapErr(-70402)
           }
-          return gdService.getCharacteristic(this.hapChar.CurrentPosition).value
+          return gdService.getCharacteristic(this.hapChar.CurrentDoorState).value
         })
         gdService.getCharacteristic(this.hapChar.TargetDoorState).onGet(() => {
           if (!this.isOnline) {
             throw new this.hapErr(-70402)
           }
-          return gdService.getCharacteristic(this.hapChar.TargetPosition).value
+          return gdService.getCharacteristic(this.hapChar.TargetDoorState).value
         })
       }
     })

From 9dcd655b72b20912f2d8e0f2e94bc0683497735f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 30 Jun 2021 20:23:43 +0100
Subject: [PATCH 2423/3183] final amendments for dualr3 power readings

---
 lib/device/motor.js                   |   2 +-
 lib/device/outlet-multi.js            |   2 +-
 lib/device/simulation/blind.js        |   2 +-
 lib/device/simulation/door.js         |   2 +-
 lib/device/simulation/garage-one.js   | 210 +++++++++++++++++++-------
 lib/device/simulation/garage-two.js   |   2 +-
 lib/device/simulation/lock-one.js     |   2 +-
 lib/device/simulation/purifier.js     |   2 +-
 lib/device/simulation/sensor.js       |   2 +-
 lib/device/simulation/switch-valve.js |   2 +-
 lib/device/simulation/tap-one.js      |   2 +-
 lib/device/simulation/tap-two.js      |   2 +-
 lib/device/simulation/valve-one.js    |   2 +-
 lib/device/simulation/valve-two.js    |   2 +-
 lib/device/simulation/window.js       |   2 +-
 lib/device/switch-multi.js            |   2 +-
 16 files changed, 173 insertions(+), 67 deletions(-)

diff --git a/lib/device/motor.js b/lib/device/motor.js
index 63b8f64e..72e639ef 100644
--- a/lib/device/motor.js
+++ b/lib/device/motor.js
@@ -89,7 +89,7 @@ module.exports = class deviceMotor {
       })
     }
 
-    if (platform.config.mode === 'wan') {
+    if (platform.config.mode !== 'lan') {
       // Set up an interval to get eWeLink to send power updates
       setTimeout(() => {
         this.internalUIUpdate()
diff --git a/lib/device/outlet-multi.js b/lib/device/outlet-multi.js
index 8726f2a1..eab0d014 100644
--- a/lib/device/outlet-multi.js
+++ b/lib/device/outlet-multi.js
@@ -129,7 +129,7 @@ module.exports = class deviceOutletMulti {
     if (
       this.powerReadings &&
       accessory.context.switchNumber === '0' &&
-      platform.config.mode === 'wan'
+      platform.config.mode !== 'lan'
     ) {
       // Set up an interval to get eWeLink to send power updates
       setTimeout(() => {
diff --git a/lib/device/simulation/blind.js b/lib/device/simulation/blind.js
index a800519f..4e0518d0 100644
--- a/lib/device/simulation/blind.js
+++ b/lib/device/simulation/blind.js
@@ -99,7 +99,7 @@ module.exports = class deviceBlind {
     }
 
     // Set up an interval to get eWeLink to send power updates
-    if (this.powerReadings && platform.config.mode === 'wan') {
+    if (this.powerReadings && platform.config.mode !== 'lan') {
       setTimeout(() => {
         this.internalUIUpdate()
         this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
diff --git a/lib/device/simulation/door.js b/lib/device/simulation/door.js
index 522353a3..5103a71d 100644
--- a/lib/device/simulation/door.js
+++ b/lib/device/simulation/door.js
@@ -99,7 +99,7 @@ module.exports = class deviceDoor {
     }
 
     // Set up an interval to get eWeLink to send power updates
-    if (this.powerReadings && platform.config.mode === 'wan') {
+    if (this.powerReadings && platform.config.mode !== 'lan') {
       setTimeout(() => {
         this.internalUIUpdate()
         this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
diff --git a/lib/device/simulation/garage-one.js b/lib/device/simulation/garage-one.js
index ebef73fc..58aa55e9 100644
--- a/lib/device/simulation/garage-one.js
+++ b/lib/device/simulation/garage-one.js
@@ -86,6 +86,45 @@ module.exports = class deviceGarageOne {
       this.service.removeCharacteristic(this.service.getCharacteristic(this.hapChar.ClosedDuration))
     }
 
+    // Set up the device type and power readings if necessary
+    if (platform.consts.devices.singleSwitch.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'singleSwitch'
+    } else if (platform.consts.devices.outlet.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'singleSwitch'
+
+      // Add Eve power characteristics
+      this.powerReadings = true
+      if (!this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
+        this.service.addCharacteristic(this.eveChar.CurrentConsumption)
+      }
+      if (this.accessory.context.eweUIID === 32) {
+        if (!this.service.testCharacteristic(this.eveChar.ElectricCurrent)) {
+          this.service.addCharacteristic(this.eveChar.ElectricCurrent)
+        }
+        if (!this.service.testCharacteristic(this.eveChar.Voltage)) {
+          this.service.addCharacteristic(this.eveChar.Voltage)
+        }
+      }
+    } else if (platform.consts.devices.multiSwitch.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'multiSwitch'
+      if (this.accessory.context.eweUIID === 126) {
+        // Add Eve power characteristics
+        this.powerReadings = true
+        if (!this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
+          this.service.addCharacteristic(this.eveChar.CurrentConsumption)
+        }
+        if (!this.service.testCharacteristic(this.eveChar.ElectricCurrent)) {
+          this.service.addCharacteristic(this.eveChar.ElectricCurrent)
+        }
+        if (!this.service.testCharacteristic(this.eveChar.Voltage)) {
+          this.service.addCharacteristic(this.eveChar.Voltage)
+        }
+        this.isDualR3 = true
+      }
+    } else if (platform.consts.devices.outletSCM.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'multiSwitch'
+    }
+
     // Add the set handler to the garage door reset total characteristic
     this.service.getCharacteristic(this.eveChar.ResetTotal).onSet(value => {
       this.service.updateCharacteristic(this.eveChar.TimesOpened, 0)
@@ -118,6 +157,22 @@ module.exports = class deviceGarageOne {
       log: platform.config.debugFakegato ? this.log : () => {}
     })
 
+    // Set up an interval to get eWeLink to send power updates
+    if (
+      this.powerReadings &&
+      (!this.isDualR3 || (this.isDualR3 && platform.config.mode !== 'lan'))
+    ) {
+      setTimeout(() => {
+        this.internalUIUpdate()
+        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
+      }, 5000)
+
+      // Stop the intervals on Homebridge shutdown
+      platform.api.on('shutdown', () => {
+        clearInterval(this.intervalPoll)
+      })
+    }
+
     // Output the customised options to the log
     const opts = JSON.stringify({
       logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
@@ -139,7 +194,7 @@ module.exports = class deviceGarageOne {
       }
       this.inUse = true
       this.cacheState = value
-      if (this.setup === 'oneSwitch' && [2, 3].includes(prevState)) {
+      if (this.setup === 'singleSwitch' && [2, 3].includes(prevState)) {
         this.service.updateCharacteristic(this.hapChar.CurrentDoorState, ((prevState * 2) % 3) + 2)
         delay = 1500
       }
@@ -150,10 +205,10 @@ module.exports = class deviceGarageOne {
       this.service.updateCharacteristic(this.hapChar.TargetDoorState, newPos)
       this.service.updateCharacteristic(this.hapChar.CurrentDoorState, newPos + 2)
       switch (this.setup) {
-        case 'oneSwitch':
+        case 'singleSwitch':
           params.switch = 'on'
           break
-        case 'twoSwitch':
+        case 'multiSwitch':
           params.switches = [
             {
               switch: newPos === 0 ? 'on' : 'off',
@@ -210,64 +265,115 @@ module.exports = class deviceGarageOne {
     }
   }
 
+  async internalUIUpdate () {
+    try {
+      // Skip polling if device isn't online
+      if (!this.isOnline) {
+        return
+      }
+
+      // Send the params to request the updates
+      if (this.isDualR3) {
+        await this.platform.sendDeviceUpdate(this.accessory, { uiActive: { outlet: 0, time: 120 } })
+      } else {
+        await this.platform.sendDeviceUpdate(this.accessory, { uiActive: 120 })
+      }
+    } catch (err) {
+      // Suppress errors here
+    }
+  }
+
   async externalUpdate (params) {
     try {
-      if (!this.setup) {
+      if (this.powerReadings) {
+        let logger = false
+        let power
+        let voltage
+        let current
+        if (this.funcs.hasProperty(params, 'actPow_00')) {
+          power = parseInt(params.actPow_00) / 100
+          this.service.updateCharacteristic(this.eveChar.CurrentConsumption, power)
+          logger = true
+        } else if (this.funcs.hasProperty(params, 'power')) {
+          power = parseFloat(params.power)
+          this.service.updateCharacteristic(this.eveChar.CurrentConsumption, power)
+          logger = true
+        }
+        if (this.funcs.hasProperty(params, 'voltage_00')) {
+          voltage = parseInt(params.voltage_00) / 100
+          this.service.updateCharacteristic(this.eveChar.Voltage, voltage)
+          logger = true
+        } else if (this.funcs.hasProperty(params, 'voltage')) {
+          voltage = parseFloat(params.voltage)
+          this.service.updateCharacteristic(this.eveChar.Voltage, voltage)
+          logger = true
+        }
+        if (this.funcs.hasProperty(params, 'current_00')) {
+          current = parseInt(params.current_00) / 100
+          this.service.updateCharacteristic(this.eveChar.ElectricCurrent, current)
+          logger = true
+        } else if (this.funcs.hasProperty(params, 'current')) {
+          current = parseFloat(params.current)
+          this.service.updateCharacteristic(this.eveChar.ElectricCurrent, current)
+          logger = true
+        }
+        if (params.updateSource && logger && this.enableLogging) {
+          this.log(
+            '[%s] %s%s%s.',
+            this.name,
+            power !== undefined ? this.lang.curPower + ' [' + power + 'W]' : '',
+            voltage !== undefined ? ' ' + this.lang.curVolt + ' [' + voltage + 'V]' : '',
+            current !== undefined ? ' ' + this.lang.curCurr + ' [' + current + 'A]' : ''
+          )
+        }
+      }
+
+      if (!this.inUse && !this.definedSensor) {
+        const prevState = this.service.getCharacteristic(this.hapChar.CurrentDoorState).value
+        const newPos = [0, 2].includes(prevState) ? 3 : 2
         if (params.switches) {
-          this.setup = 'twoSwitch'
+          if (
+            params.switches[0].switch === params.switches[1].switch ||
+            params.switches[prevState % 2].switch === 'on'
+          ) {
+            return
+          }
         } else if (params.switch) {
-          this.setup = 'oneSwitch'
+          if (params.switch === 'off') {
+            return
+          }
         } else {
           return
         }
-      }
-      if (this.inUse || this.definedSensor) {
-        return
-      }
-      const prevState = this.service.getCharacteristic(this.hapChar.CurrentDoorState).value
-      const newPos = [0, 2].includes(prevState) ? 3 : 2
-      if (params.switches) {
-        if (
-          params.switches[0].switch === params.switches[1].switch ||
-          params.switches[prevState % 2].switch === 'on'
-        ) {
-          return
+        this.inUse = true
+        this.service.updateCharacteristic(this.hapChar.TargetDoorState, newPos - 2)
+        this.service.updateCharacteristic(this.hapChar.CurrentDoorState, newPos)
+        await this.funcs.sleep(2000)
+        this.inUse = false
+        if (newPos === 2) {
+          this.accessory.eveService.addEntry({ status: 0 })
+          const initialTime = this.accessory.eveService.getInitialTime()
+          this.service.updateCharacteristic(
+            this.eveChar.LastActivation,
+            Math.round(new Date().valueOf() / 1000) - initialTime
+          )
+          const newTO = this.service.getCharacteristic(this.eveChar.TimesOpened).value + 1
+          this.service.updateCharacteristic(this.eveChar.TimesOpened, newTO)
         }
-      } else if (params.switch) {
-        if (params.switch === 'off') {
-          return
+        const operationTime = newPos === 2 ? this.operationTimeUp : this.operationTimeDown
+        await this.funcs.sleep(Math.max((operationTime - 20) * 100, 0))
+        this.service.updateCharacteristic(this.hapChar.CurrentDoorState, newPos - 2)
+        if (newPos === 3) {
+          this.accessory.eveService.addEntry({ status: 1 })
+        }
+        if (this.enableLogging) {
+          this.log(
+            '[%s] %s [%s].',
+            this.name,
+            this.lang.curState,
+            newPos === 2 ? this.lang.doorOpen : this.lang.doorClosed
+          )
         }
-      } else {
-        return
-      }
-      this.inUse = true
-      this.service.updateCharacteristic(this.hapChar.TargetDoorState, newPos - 2)
-      this.service.updateCharacteristic(this.hapChar.CurrentDoorState, newPos)
-      await this.funcs.sleep(2000)
-      this.inUse = false
-      if (newPos === 2) {
-        this.accessory.eveService.addEntry({ status: 0 })
-        const initialTime = this.accessory.eveService.getInitialTime()
-        this.service.updateCharacteristic(
-          this.eveChar.LastActivation,
-          Math.round(new Date().valueOf() / 1000) - initialTime
-        )
-        const newTO = this.service.getCharacteristic(this.eveChar.TimesOpened).value + 1
-        this.service.updateCharacteristic(this.eveChar.TimesOpened, newTO)
-      }
-      const operationTime = newPos === 2 ? this.operationTimeUp : this.operationTimeDown
-      await this.funcs.sleep(Math.max((operationTime - 20) * 100, 0))
-      this.service.updateCharacteristic(this.hapChar.CurrentDoorState, newPos - 2)
-      if (newPos === 3) {
-        this.accessory.eveService.addEntry({ status: 1 })
-      }
-      if (this.enableLogging) {
-        this.log(
-          '[%s] %s [%s].',
-          this.name,
-          this.lang.curState,
-          newPos === 2 ? this.lang.doorOpen : this.lang.doorClosed
-        )
       }
     } catch (err) {
       this.inUse = false
diff --git a/lib/device/simulation/garage-two.js b/lib/device/simulation/garage-two.js
index 6ef94d3e..3cf58b07 100644
--- a/lib/device/simulation/garage-two.js
+++ b/lib/device/simulation/garage-two.js
@@ -111,7 +111,7 @@ module.exports = class deviceGarageTwo {
     })
 
     // Set up an interval to get eWeLink to send power updates
-    if (this.powerReadings && platform.config.mode === 'wan') {
+    if (this.powerReadings && platform.config.mode !== 'lan') {
       setTimeout(() => {
         this.internalUIUpdate()
         this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
diff --git a/lib/device/simulation/lock-one.js b/lib/device/simulation/lock-one.js
index 34fe2200..a46890b8 100644
--- a/lib/device/simulation/lock-one.js
+++ b/lib/device/simulation/lock-one.js
@@ -129,7 +129,7 @@ module.exports = class deviceLockOne {
     // Set up an interval to get eWeLink to send power updates
     if (
       this.powerReadings &&
-      (!this.isDualR3 || (this.isDualR3 && platform.config.mode === 'wan'))
+      (!this.isDualR3 || (this.isDualR3 && platform.config.mode !== 'lan'))
     ) {
       setTimeout(() => {
         this.internalUIUpdate()
diff --git a/lib/device/simulation/purifier.js b/lib/device/simulation/purifier.js
index 7239b99f..ee2c0973 100644
--- a/lib/device/simulation/purifier.js
+++ b/lib/device/simulation/purifier.js
@@ -137,7 +137,7 @@ module.exports = class devicePurifier {
     // Set up an interval to get eWeLink to send power updates
     if (
       this.powerReadings &&
-      (!this.isDualR3 || (this.isDualR3 && platform.config.mode === 'wan'))
+      (!this.isDualR3 || (this.isDualR3 && platform.config.mode !== 'lan'))
     ) {
       setTimeout(() => {
         this.internalUIUpdate()
diff --git a/lib/device/simulation/sensor.js b/lib/device/simulation/sensor.js
index 8f04481a..b23ca423 100644
--- a/lib/device/simulation/sensor.js
+++ b/lib/device/simulation/sensor.js
@@ -165,7 +165,7 @@ module.exports = class deviceSensor {
     // Set up an interval to get eWeLink to send power updates
     if (
       this.powerReadings &&
-      (!this.isDualR3 || (this.isDualR3 && platform.config.mode === 'wan'))
+      (!this.isDualR3 || (this.isDualR3 && platform.config.mode !== 'lan'))
     ) {
       setTimeout(() => {
         this.internalUIUpdate()
diff --git a/lib/device/simulation/switch-valve.js b/lib/device/simulation/switch-valve.js
index def0dd69..d52b1b73 100644
--- a/lib/device/simulation/switch-valve.js
+++ b/lib/device/simulation/switch-valve.js
@@ -133,7 +133,7 @@ module.exports = class deviceSwitchValve {
     })
 
     // Set up an interval to get eWeLink to send power updates
-    if (this.powerReadings && platform.config.mode === 'wan') {
+    if (this.powerReadings && platform.config.mode !== 'lan') {
       setTimeout(() => {
         this.internalUIUpdate()
         this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
diff --git a/lib/device/simulation/tap-one.js b/lib/device/simulation/tap-one.js
index 824ff05d..0dbcb505 100644
--- a/lib/device/simulation/tap-one.js
+++ b/lib/device/simulation/tap-one.js
@@ -114,7 +114,7 @@ module.exports = class deviceTapOne {
     // Set up an interval to get eWeLink to send power updates
     if (
       this.powerReadings &&
-      (!this.isDualR3 || (this.isDualR3 && platform.config.mode === 'wan'))
+      (!this.isDualR3 || (this.isDualR3 && platform.config.mode !== 'lan'))
     ) {
       setTimeout(() => {
         this.internalUIUpdate()
diff --git a/lib/device/simulation/tap-two.js b/lib/device/simulation/tap-two.js
index 5ca2190a..99100d29 100644
--- a/lib/device/simulation/tap-two.js
+++ b/lib/device/simulation/tap-two.js
@@ -90,7 +90,7 @@ module.exports = class deviceTapTwo {
     })
 
     // Set up an interval to get eWeLink to send power updates
-    if (this.powerReadings && platform.config.mode === 'wan') {
+    if (this.powerReadings && platform.config.mode !== 'lan') {
       setTimeout(() => {
         this.internalUIUpdate()
         this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
diff --git a/lib/device/simulation/valve-one.js b/lib/device/simulation/valve-one.js
index 827b3c1a..cb8c23d8 100644
--- a/lib/device/simulation/valve-one.js
+++ b/lib/device/simulation/valve-one.js
@@ -134,7 +134,7 @@ module.exports = class deviceValveOne {
     // Set up an interval to get eWeLink to send power updates
     if (
       this.powerReadings &&
-      (!this.isDualR3 || (this.isDualR3 && platform.config.mode === 'wan'))
+      (!this.isDualR3 || (this.isDualR3 && platform.config.mode !== 'lan'))
     ) {
       setTimeout(() => {
         this.internalUIUpdate()
diff --git a/lib/device/simulation/valve-two.js b/lib/device/simulation/valve-two.js
index 95d72afd..0e8fa950 100644
--- a/lib/device/simulation/valve-two.js
+++ b/lib/device/simulation/valve-two.js
@@ -110,7 +110,7 @@ module.exports = class deviceValveTwo {
     })
 
     // Set up an interval to get eWeLink to send power updates
-    if (this.powerReadings && platform.config.mode === 'wan') {
+    if (this.powerReadings && platform.config.mode !== 'lan') {
       setTimeout(() => {
         this.internalUIUpdate()
         this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
diff --git a/lib/device/simulation/window.js b/lib/device/simulation/window.js
index 4e959056..f9ee4d4d 100644
--- a/lib/device/simulation/window.js
+++ b/lib/device/simulation/window.js
@@ -99,7 +99,7 @@ module.exports = class deviceWindow {
     }
 
     // Set up an interval to get eWeLink to send power updates
-    if (this.powerReadings && platform.config.mode === 'wan') {
+    if (this.powerReadings && platform.config.mode !== 'lan') {
       setTimeout(() => {
         this.internalUIUpdate()
         this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
diff --git a/lib/device/switch-multi.js b/lib/device/switch-multi.js
index c80f90f6..81908945 100644
--- a/lib/device/switch-multi.js
+++ b/lib/device/switch-multi.js
@@ -121,7 +121,7 @@ module.exports = class deviceSwitchMulti {
     if (
       this.powerReadings &&
       accessory.context.switchNumber === '0' &&
-      platform.config.mode === 'wan'
+      platform.config.mode !== 'lan'
     ) {
       // Set up an interval to get eWeLink to send power updates
       setTimeout(() => {

From aa916b5391f54d83baddafceff2c640ee9caf4ff Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 30 Jun 2021 20:28:30 +0100
Subject: [PATCH 2424/3183] 7.0.0-beta.0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 0be6ba19..d7598095 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "6.8.1-beta.48",
+  "version": "7.0.0-beta.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 3ba3874f..a03f0274 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "6.8.1-beta.48",
+  "version": "7.0.0-beta.0",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 7067ddb0175a0749afc33fa85f0322c47fc9363d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 30 Jun 2021 20:51:44 +0100
Subject: [PATCH 2425/3183] check for garage type on external update

---
 lib/device/simulation/garage-one.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/device/simulation/garage-one.js b/lib/device/simulation/garage-one.js
index 58aa55e9..523933de 100644
--- a/lib/device/simulation/garage-one.js
+++ b/lib/device/simulation/garage-one.js
@@ -331,14 +331,14 @@ module.exports = class deviceGarageOne {
       if (!this.inUse && !this.definedSensor) {
         const prevState = this.service.getCharacteristic(this.hapChar.CurrentDoorState).value
         const newPos = [0, 2].includes(prevState) ? 3 : 2
-        if (params.switches) {
+        if (this.setup === 'multiSwitch' && params.switches) {
           if (
             params.switches[0].switch === params.switches[1].switch ||
             params.switches[prevState % 2].switch === 'on'
           ) {
             return
           }
-        } else if (params.switch) {
+        } else if (this.setup === 'singleSwitch' && params.switch) {
           if (params.switch === 'off') {
             return
           }

From e19c20363d10a3e5018229e0f54487576c7decdb Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 1 Jul 2021 11:35:22 +0100
Subject: [PATCH 2426/3183] hide operationTimeDown for garage_eachen and lock

---
 config.schema.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config.schema.json b/config.schema.json
index 2b73663d..4acf0840 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -904,7 +904,7 @@
               "title": "Operation Time Down (Deciseconds)",
               "description": "If your garage door or blind has a different operation time for up and down, use this setting to specify the operation time DOWN (in deciseconds) and the other setting to specify the operation time UP. Otherwise leave blank. Must be 20 or more.",
               "condition": {
-                "functionBody": "return (model.groups[arrayIndices] && ['garage', 'garage_two', 'garage_four', 'garage_eachen', 'blind', 'door', 'window', 'lock'].includes(model.groups[arrayIndices].type));"
+                "functionBody": "return (model.groups[arrayIndices] && ['garage', 'garage_two', 'garage_four', 'blind', 'door', 'window'].includes(model.groups[arrayIndices].type));"
               },
               "placeholder": 100,
               "minimum": 20

From e5b3df704cb8705acc8ae035bba3c11f11f6b312 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 1 Jul 2021 11:47:14 +0100
Subject: [PATCH 2427/3183] correct garage eachen get characteristics

---
 lib/device/simulation/garage-eachen.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/device/simulation/garage-eachen.js b/lib/device/simulation/garage-eachen.js
index 6ca90b8b..e7dba568 100644
--- a/lib/device/simulation/garage-eachen.js
+++ b/lib/device/simulation/garage-eachen.js
@@ -92,17 +92,17 @@ module.exports = class deviceGarageEachen {
 
     // Add the get handlers only if the user has configured the offlineAsNoResponse setting
     if (platform.config.offlineAsNoResponse) {
-      this.service.getCharacteristic(this.hapChar.CurrentPosition).onGet(() => {
+      this.service.getCharacteristic(this.hapChar.CurrentDoorState).onGet(() => {
         if (!this.isOnline) {
           throw new this.hapErr(-70402)
         }
-        return this.service.getCharacteristic(this.hapChar.CurrentPosition).value
+        return this.service.getCharacteristic(this.hapChar.CurrentDoorState).value
       })
       this.service.getCharacteristic(this.hapChar.TargetDoorState).onGet(() => {
         if (!this.isOnline) {
           throw new this.hapErr(-70402)
         }
-        return this.service.getCharacteristic(this.hapChar.TargetPosition).value
+        return this.service.getCharacteristic(this.hapChar.TargetDoorState).value
       })
     }
 

From e3cdf236c9071807683c4ce2d804da83ef26b817 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 1 Jul 2021 13:14:56 +0100
Subject: [PATCH 2428/3183] [test] avoid multiple notifications with eachen
 device

---
 lib/device/simulation/garage-eachen.js | 55 +++++++++++++++-----------
 1 file changed, 33 insertions(+), 22 deletions(-)

diff --git a/lib/device/simulation/garage-eachen.js b/lib/device/simulation/garage-eachen.js
index e7dba568..0c4cc3a7 100644
--- a/lib/device/simulation/garage-eachen.js
+++ b/lib/device/simulation/garage-eachen.js
@@ -134,18 +134,19 @@ module.exports = class deviceGarageEachen {
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.service.updateCharacteristic(this.hapChar.TargetDoorState, value)
       this.service.updateCharacteristic(this.hapChar.CurrentDoorState, value + 2)
-      await this.funcs.sleep(2000)
+      await this.funcs.sleep(3000)
       this.inUse = false
       if (value === 0) {
         this.accessory.eveService.addEntry({ status: 0 })
-        const initialTime = this.accessory.eveService.getInitialTime()
         this.service.updateCharacteristic(
           this.eveChar.LastActivation,
-          Math.round(new Date().valueOf() / 1000) - initialTime
+          Math.round(new Date().valueOf() / 1000) - this.accessory.eveService.getInitialTime()
         )
-        const newTO = this.service.getCharacteristic(this.eveChar.TimesOpened).value + 1
-        this.service.updateCharacteristic(this.eveChar.TimesOpened, newTO)
-        await this.funcs.sleep(Math.max((this.operationTime - 20) * 100, 0))
+        this.service.updateCharacteristic(
+          this.eveChar.TimesOpened,
+          this.service.getCharacteristic(this.eveChar.TimesOpened).value + 1
+        )
+        await this.funcs.sleep(Math.max((this.operationTime - 30) * 100, 0))
         this.service.updateCharacteristic(this.hapChar.CurrentDoorState, 0)
         if (this.enableLogging) {
           this.log('[%s] %s [%s].', this.name, this.lang.curState, this.lang.doorOpen)
@@ -169,25 +170,35 @@ module.exports = class deviceGarageEachen {
       if (!params.switch || this.inUse) {
         return
       }
-      this.service.updateCharacteristic(
-        this.hapChar.TargetDoorState,
-        params.switch === 'on' ? 0 : 1
-      )
-      this.service.updateCharacteristic(
-        this.hapChar.CurrentDoorState,
-        params.switch === 'on' ? 0 : 1
-      )
-      if (params.switch === 'on') {
-        this.accessory.eveService.addEntry({ status: 0 })
-        const initialTime = this.accessory.eveService.getInitialTime()
+
+      // In a period of three seconds we want to only use the 'last' update
+      const updateKey = Math.random()
+        .toString(36)
+        .substr(2, 8)
+      this.updateKey = updateKey
+      await this.funcs.sleep(3000)
+      if (this.updateKey !== updateKey) {
+        return
+      }
+
+      // Update the characteristics
+      const newValue = params.switch === 'on' ? 0 : 1
+      if (this.service.getCharacteristic(this.hapChar.TargetDoorState).value !== newValue) {
+        this.service.updateCharacteristic(this.hapChar.TargetDoorState, newValue)
+      }
+      if (this.service.getCharacteristic(this.hapChar.CurrentDoorState).value !== newValue) {
+        this.service.updateCharacteristic(this.hapChar.CurrentDoorState, newValue)
+      }
+      this.accessory.eveService.addEntry({ status: newValue })
+      if (newValue === 0) {
         this.service.updateCharacteristic(
           this.eveChar.LastActivation,
-          Math.round(new Date().valueOf() / 1000) - initialTime
+          Math.round(new Date().valueOf() / 1000) - this.accessory.eveService.getInitialTime()
+        )
+        this.service.updateCharacteristic(
+          this.eveChar.TimesOpened,
+          this.service.getCharacteristic(this.eveChar.TimesOpened).value + 1
         )
-        const newTO = this.service.getCharacteristic(this.eveChar.TimesOpened).value + 1
-        this.service.updateCharacteristic(this.eveChar.TimesOpened, newTO)
-      } else {
-        this.accessory.eveService.addEntry({ status: 1 })
       }
       if (params.updateSource && this.enableLogging) {
         this.log(

From 890b8a3bce06dced2472e44ff7a64626d928c73d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 1 Jul 2021 13:15:23 +0100
Subject: [PATCH 2429/3183] 7.0.0-beta.1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d7598095..5bbc5787 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "7.0.0-beta.0",
+  "version": "7.0.0-beta.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index a03f0274..cba0dd8d 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "7.0.0-beta.0",
+  "version": "7.0.0-beta.1",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 65445efd04e2d29cac65572f9e27f830fca847bc Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 1 Jul 2021 13:27:48 +0100
Subject: [PATCH 2430/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4c244cfa..3397db00 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -72,6 +72,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 ### Fixed
 
 - An issue preventing controlling a garage door simulation when using a sensor
+- Fixed the multiple notifications when closing an eachen device garage door
 
 ### Removed
 

From 61f626d9eecad6bac35209fa7930b83de8c0d26c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 1 Jul 2021 13:50:43 +0100
Subject: [PATCH 2431/3183] don't support dualr3 in meter mode

---
 lib/index.js         | 32 ++++++++++++++++++++++----------
 lib/utils/lang-en.js |  1 +
 2 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/lib/index.js b/lib/index.js
index 5c132151..033a1f0e 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -701,8 +701,11 @@ class eWeLinkPlatform {
       const uiid = device.extra && device.extra.uiid ? device.extra.uiid : 0
       const uuid = this.api.hap.uuid.generate(device.deviceid + 'SWX')
 
-      // Remove old sub accessories for Accessory Simulations and DUALR3 in motor mode
-      if (this.simulations[device.deviceid] || (uiid === 126 && device.params.workMode === 2)) {
+      // Remove old sub accessories for Accessory Simulations and DUALR3 in motor/meter mode
+      if (
+        this.simulations[device.deviceid] ||
+        (uiid === 126 && [2, 3].includes(device.params.workMode))
+      ) {
         for (let i = 0; i <= 4; i++) {
           const uuidsub = this.api.hap.uuid.generate(device.deviceid + 'SW' + i)
           if (devicesInHB.has(uuidsub)) {
@@ -712,20 +715,29 @@ class eWeLinkPlatform {
       }
 
       // Set up the correct instance for this particular device
-      if (this.consts.devices.curtain.includes(uiid)) {
-        /****************************
-        BLINDS [EWELINK UIID 11 & 67]
-        ****************************/
-        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require('./device/curtain'))(this, accessory)
-        /***************************/
-      } else if (uiid === 126 && device.params.workMode === 2) {
+      if (uiid === 126 && device.params.workMode === 2) {
         /*************************
         BLINDS [DUALR3 MOTOR MODE]
         *************************/
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/motor'))(this, accessory)
         /************************/
+      } else if (uiid === 126 && device.params.workMode === 3) {
+        /*************************
+        BLINDS [DUALR3 METER MODE]
+        *************************/
+        if (devicesInHB.has(uuid)) {
+          this.removeAccessory(devicesInHB.get(uuid))
+        }
+        this.log.warn('[%s] %s.', device.name, this.lang.noDualMeter)
+        return
+      } else if (this.consts.devices.curtain.includes(uiid)) {
+        /****************************
+        BLINDS [EWELINK UIID 11 & 67]
+        ****************************/
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
+        accessory.control = new (require('./device/curtain'))(this, accessory)
+        /***************************/
       } else if (
         this.simulations[device.deviceid] &&
         this.simulations[device.deviceid].type === 'blind'
diff --git a/lib/utils/lang-en.js b/lib/utils/lang-en.js
index 6a44c40b..23a57d6a 100644
--- a/lib/utils/lang-en.js
+++ b/lib/utils/lang-en.js
@@ -97,6 +97,7 @@ module.exports = {
   newIP: 'changed IP address to',
   newRegionRec: 'New HTTP API host received',
   noAuthRec: 'No auth token received',
+  noDualMeter: 'is not supported in meter mode',
   noGarageForOD: 'No corresponding garage door accessory found',
   noRegionRec: 'No valid region received',
   noWSHost: 'Server did not respond with a web socket host',

From 525421cee85e02d06614e5e8e2af5fdb85965692 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 1 Jul 2021 17:01:08 +0100
Subject: [PATCH 2432/3183] expose zigbee switch as outlet

---
 lib/device/zigbee/switch-single.js | 29 ++++++++++++++++++++++++-----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/lib/device/zigbee/switch-single.js b/lib/device/zigbee/switch-single.js
index 757944c5..7f262a78 100644
--- a/lib/device/zigbee/switch-single.js
+++ b/lib/device/zigbee/switch-single.js
@@ -20,6 +20,7 @@ module.exports = class deviceZBSwitchSingle {
     const deviceConf = platform.singleDevices[accessory.context.eweDeviceId]
 
     // Set the correct logging variables for this accessory
+    this.showAsOutlet = deviceConf && deviceConf.showAsOutlet
     this.enableLogging = !platform.config.disableDeviceLogging
     this.enableDebugLogging = platform.config.debug
     if (deviceConf && deviceConf.overrideLogging) {
@@ -39,10 +40,27 @@ module.exports = class deviceZBSwitchSingle {
       }
     }
 
-    // Add the switch service if it doesn't already exist
-    this.service =
-      this.accessory.getService(this.hapServ.Switch) ||
-      this.accessory.addService(this.hapServ.Switch)
+    if (this.showAsOutlet) {
+      // If the accessory has a switch service then remove it
+      if (this.accessory.getService(this.hapServ.Switch)) {
+        this.accessory.removeService(this.accessory.getService(this.hapServ.Switch))
+      }
+
+      // Add the outlet service if it doesn't already exist
+      this.service =
+        this.accessory.getService(this.hapServ.Outlet) ||
+        this.accessory.addService(this.hapServ.Outlet)
+    } else {
+      // If the accessory has a outlet service then remove it
+      if (this.accessory.getService(this.hapServ.Outlet)) {
+        this.accessory.removeService(this.accessory.getService(this.hapServ.Outlet))
+      }
+
+      // Add the switch service if it doesn't already exist
+      this.service =
+        this.accessory.getService(this.hapServ.Switch) ||
+        this.accessory.addService(this.hapServ.Switch)
+    }
 
     // Add the get/set handler to the switch on/off characteristic
     this.service
@@ -65,7 +83,8 @@ module.exports = class deviceZBSwitchSingle {
 
     // Output the customised options to the log
     const opts = JSON.stringify({
-      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable'
+      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
+      showAsType: this.showAsOutlet ? 'outlet' : 'switch'
     })
     this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }

From 8a39c4de0b04781b798855ae26022f12d7e4c1fd Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 1 Jul 2021 17:01:10 +0100
Subject: [PATCH 2433/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3397db00..1af52a46 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -37,9 +37,11 @@ All notable changes to this homebridge-ewelink will be documented in this file.
   - Ability to change sensor type and other configurable options without the need to re-add the accessory
   - Configuration option `resetOnStartup` to reset the subdevices, useful when adding/removing subdevices to the bridge
   - Added option to specify a manual IP for an RF Bridge
-- **Zigbee Button Device**
+- **Zigbee Button Devices**
   - Comparison of trigger time against notification time to reduce duplicate accessory updates
   - Will no longer request current state when coming back online to reduce duplicate accessory updates
+- **Zigbee Switch Devices**
+  - Option to expose as an `Outlet`
 - **Humidity Sensor Devices**
   - Config option to offset the recorded humidity (%RH) for devices that report this
 - **Accessory Simulations**

From e72cd57487cb7340d7040bbdba451e90ff672905 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 1 Jul 2021 18:44:16 +0100
Subject: [PATCH 2434/3183] bump node 14.17.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index cba0dd8d..e1e540e1 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
   "main": "lib/index.js",
   "engines": {
     "homebridge": "^1.3.3",
-    "node": "^14.17.1 || ^16.4.0"
+    "node": "^14.17.2 || ^16.4.1"
   },
   "repository": {
     "type": "git",

From 098435179108e94a1b36a204da1f3d7905bd9ee8 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 1 Jul 2021 18:44:18 +0100
Subject: [PATCH 2435/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1af52a46..99e3ace1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -68,7 +68,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 - **Configuration**
   - `sensorTimeDifference` minimum reduced to 5 seconds and default reduced to 60 seconds
 - **Dependencies**
-  - Recommended node version bump to v14.17.1
+  - Recommended node version bump to v14.17.2
   - Bump `ws` dependency to v7.5.1
 
 ### Fixed

From a90abe77e42a86c535ce2efbac97fd60112056cb Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 2 Jul 2021 08:10:27 +0100
Subject: [PATCH 2436/3183] remove adaptive lighting feature option

---
 config.schema.json             |  4 +--
 lib/device/light-cct.js        | 36 ++++++++++++++++++------
 lib/device/light-rgb-cct.js    | 50 ++++++++++++++++++++++++++--------
 lib/device/zigbee/light-cct.js | 33 ++++++++++++++++------
 lib/utils/constants.js         |  2 +-
 5 files changed, 95 insertions(+), 30 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 4acf0840..a7095c19 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -345,9 +345,9 @@
             "adaptiveLightingShift": {
               "title": "Adaptive Lighting Shift",
               "type": "number",
-              "description": "An adjustment factor for Adaptive Lighting. The mired value for each update will be increased by this setting, making the light appear warmer. A value in the range 50-200 should be appropriate. Must be 0 or more.",
+              "description": "The mired for each Adaptive Lighting update will be increased by this value, making the light appear warmer. Set to -1 to remove Adaptive Lighting feature. Must be -1 or more.",
               "placeholder": 0,
-              "minimum": 0
+              "minimum": -1
             },
             "ipAddress": {
               "type": "string",
diff --git a/lib/device/light-cct.js b/lib/device/light-cct.js
index 19f80be2..89dfca39 100644
--- a/lib/device/light-cct.js
+++ b/lib/device/light-cct.js
@@ -76,6 +76,13 @@ module.exports = class deviceLightCCT {
       this.accessory.getService(this.hapServ.Lightbulb) ||
       this.accessory.addService(this.hapServ.Lightbulb)
 
+    // If adaptive lighting has just been disabled then remove and re-add service to hide AL icon
+    if (this.alShift === -1 && this.accessory.context.adaptiveLighting) {
+      this.accessory.removeService(this.service)
+      this.service = this.accessory.addService(this.hapServ.Lightbulb)
+      this.accessory.context.adaptiveLighting = false
+    }
+
     // Add the set handler to the lightbulb on/off characteristic
     this.service
       .getCharacteristic(this.hapChar.On)
@@ -95,11 +102,13 @@ module.exports = class deviceLightCCT {
     // This is needed as sometimes we need to send the brightness with a cct update
     this.cacheBright = this.service.getCharacteristic(this.hapChar.Brightness).value
 
-    // Set up the adaptive lighting controller
-    this.accessory.alController = new platform.api.hap.AdaptiveLightingController(this.service, {
-      customTemperatureAdjustment: this.alShift
-    })
-    this.accessory.configureController(this.accessory.alController)
+    // Set up the adaptive lighting controller if not disabled by user
+    if (this.alShift !== -1) {
+      this.accessory.alController = new platform.api.hap.AdaptiveLightingController(this.service, {
+        customTemperatureAdjustment: this.alShift
+      })
+      this.accessory.configureController(this.accessory.alController)
+    }
 
     // Add the get handlers only if the user has configured the offlineAsNoResponse setting
     if (platform.config.offlineAsNoResponse) {
@@ -208,7 +217,11 @@ module.exports = class deviceLightCCT {
       if (this.cacheMired === value || this.cacheState !== 'on') {
         return
       }
-      if (!this.isOnline && this.accessory.alController.isAdaptiveLightingActive()) {
+      if (
+        !this.isOnline &&
+        this.accessory.alController &&
+        this.accessory.alController.isAdaptiveLightingActive()
+      ) {
         return
       }
       const updateKey = Math.random()
@@ -284,7 +297,11 @@ module.exports = class deviceLightCCT {
             if (this.enableLogging) {
               this.log('[%s] %s [%sK].', this.name, this.lang.curColour, scaledK)
             }
-            if (this.accessory.alController.isAdaptiveLightingActive() && ctDiff > 20) {
+            if (
+              this.accessory.alController &&
+              this.accessory.alController.isAdaptiveLightingActive() &&
+              ctDiff > 20
+            ) {
               // Look for a variation greater than twenty
               this.accessory.alController.disableAdaptiveLighting()
               if (this.enableLogging) {
@@ -310,7 +327,10 @@ module.exports = class deviceLightCCT {
       state: this.service.getCharacteristic(this.hapChar.On).value ? 'on' : 'off',
       brightness: this.service.getCharacteristic(this.hapChar.Brightness).value,
       colourtemperature: this.service.getCharacteristic(this.hapChar.ColorTemperature).value,
-      adaptivelighting: this.accessory.alController.isAdaptiveLightingActive() ? 'on' : 'off'
+      adaptivelighting:
+        this.accessory.alController && this.accessory.alController.isAdaptiveLightingActive()
+          ? 'on'
+          : 'off'
     }
     return toReturn
   }
diff --git a/lib/device/light-rgb-cct.js b/lib/device/light-rgb-cct.js
index 88ab65fe..8f93c8d4 100644
--- a/lib/device/light-rgb-cct.js
+++ b/lib/device/light-rgb-cct.js
@@ -62,6 +62,13 @@ module.exports = class deviceLightRGBCCT {
       this.accessory.getService(this.hapServ.Lightbulb) ||
       this.accessory.addService(this.hapServ.Lightbulb)
 
+    // If adaptive lighting has just been disabled then remove and re-add service to hide AL icon
+    if (this.alShift === -1 && this.accessory.context.adaptiveLighting) {
+      this.accessory.removeService(this.service)
+      this.service = this.accessory.addService(this.hapServ.Lightbulb)
+      this.accessory.context.adaptiveLighting = false
+    }
+
     // Add the set handler to the lightbulb on/off characteristic
     this.service
       .getCharacteristic(this.hapChar.On)
@@ -86,11 +93,13 @@ module.exports = class deviceLightRGBCCT {
     // This is needed as sometimes we need to send the brightness with a cct update
     this.cacheBright = this.service.getCharacteristic(this.hapChar.Brightness).value
 
-    // Set up the adaptive lighting controller
-    this.accessory.alController = new platform.api.hap.AdaptiveLightingController(this.service, {
-      customTemperatureAdjustment: this.alShift
-    })
-    this.accessory.configureController(this.accessory.alController)
+    // Set up the adaptive lighting controller if not disabled by user
+    if (this.alShift !== -1) {
+      this.accessory.alController = new platform.api.hap.AdaptiveLightingController(this.service, {
+        customTemperatureAdjustment: this.alShift
+      })
+      this.accessory.configureController(this.accessory.alController)
+    }
 
     // Add the get handlers only if the user has configured the offlineAsNoResponse setting
     if (platform.config.offlineAsNoResponse) {
@@ -300,7 +309,11 @@ module.exports = class deviceLightRGBCCT {
       if (this.cacheMired === value || this.cacheState !== 'on') {
         return
       }
-      if (!this.isOnline && this.accessory.alController.isAdaptiveLightingActive()) {
+      if (
+        !this.isOnline &&
+        this.accessory.alController &&
+        this.accessory.alController.isAdaptiveLightingActive()
+      ) {
         return
       }
       const updateKey = Math.random()
@@ -365,7 +378,7 @@ module.exports = class deviceLightRGBCCT {
           break
       }
       if (this.enableLogging) {
-        if (this.accessory.alController.isAdaptiveLightingActive()) {
+        if (this.accessory.alController && this.accessory.alController.isAdaptiveLightingActive()) {
           this.log('[%s] %s [%sK] %s.', this.name, this.lang.curColour, mToK, this.lang.viaAL)
         } else {
           this.log('[%s] %s [%sK].', this.name, this.lang.curColour, mToK)
@@ -432,7 +445,11 @@ module.exports = class deviceLightRGBCCT {
                     this.cacheR + ' ' + this.cacheG + ' ' + this.cacheB
                   )
                 }
-                if (this.accessory.alController.isAdaptiveLightingActive() && rgbDiff > 50) {
+                if (
+                  this.accessory.alController &&
+                  this.accessory.alController.isAdaptiveLightingActive() &&
+                  rgbDiff > 50
+                ) {
                   this.accessory.alController.disableAdaptiveLighting()
                   if (this.enableLogging) {
                     this.log('[%s] %s.', this.name, this.lang.disabledAL)
@@ -481,7 +498,11 @@ module.exports = class deviceLightRGBCCT {
                 }
               }
             }
-            if (params.updateSource && this.accessory.alController.isAdaptiveLightingActive()) {
+            if (
+              params.updateSource &&
+              this.accessory.alController &&
+              this.accessory.alController.isAdaptiveLightingActive()
+            ) {
               this.accessory.alController.disableAdaptiveLighting()
               if (this.enableLogging) {
                 this.log('[%s] %s.', this.name, this.lang.disabledAL)
@@ -513,7 +534,11 @@ module.exports = class deviceLightRGBCCT {
                 if (this.enableLogging) {
                   this.log('[%s] %s [%sK].', this.name, this.lang.curColour, ctToK)
                 }
-                if (this.accessory.alController.isAdaptiveLightingActive() && ctDiff > 20) {
+                if (
+                  this.accessory.alController &&
+                  this.accessory.alController.isAdaptiveLightingActive() &&
+                  ctDiff > 20
+                ) {
                   // Look for a variation greater than twenty
                   this.accessory.alController.disableAdaptiveLighting()
                   if (this.enableLogging) {
@@ -544,7 +569,10 @@ module.exports = class deviceLightRGBCCT {
       hue: this.service.getCharacteristic(this.hapChar.Hue).value,
       saturation: this.service.getCharacteristic(this.hapChar.Saturation).value,
       colourtemperature: this.service.getCharacteristic(this.hapChar.ColorTemperature).value,
-      adaptivelighting: this.accessory.alController.isAdaptiveLightingActive() ? 'on' : 'off'
+      adaptivelighting:
+        this.accessory.alController && this.accessory.alController.isAdaptiveLightingActive()
+          ? 'on'
+          : 'off'
     }
     return toReturn
   }
diff --git a/lib/device/zigbee/light-cct.js b/lib/device/zigbee/light-cct.js
index c0f5dc18..30c80c66 100644
--- a/lib/device/zigbee/light-cct.js
+++ b/lib/device/zigbee/light-cct.js
@@ -57,6 +57,13 @@ module.exports = class deviceZBLightCCT {
       this.accessory.getService(this.hapServ.Lightbulb) ||
       this.accessory.addService(this.hapServ.Lightbulb)
 
+    // If adaptive lighting has just been disabled then remove and re-add service to hide AL icon
+    if (this.alShift === -1 && this.accessory.context.adaptiveLighting) {
+      this.accessory.removeService(this.service)
+      this.service = this.accessory.addService(this.hapServ.Lightbulb)
+      this.accessory.context.adaptiveLighting = false
+    }
+
     // Add the get/set handler to the lightbulb on/off characteristic
     this.service
       .getCharacteristic(this.hapChar.On)
@@ -87,11 +94,13 @@ module.exports = class deviceZBLightCCT {
     // This is needed as sometimes we need to send the brightness with a cct update
     this.cacheBright = this.service.getCharacteristic(this.hapChar.Brightness).value
 
-    // Set up the adaptive lighting controller
-    this.accessory.alController = new platform.api.hap.AdaptiveLightingController(this.service, {
-      customTemperatureAdjustment: this.alShift
-    })
-    this.accessory.configureController(this.accessory.alController)
+    // Set up the adaptive lighting controller if not disabled by user
+    if (this.alShift !== -1) {
+      this.accessory.alController = new platform.api.hap.AdaptiveLightingController(this.service, {
+        customTemperatureAdjustment: this.alShift
+      })
+      this.accessory.configureController(this.accessory.alController)
+    }
 
     // Output the customised options to the log
     const opts = JSON.stringify({
@@ -157,7 +166,11 @@ module.exports = class deviceZBLightCCT {
       if (this.cacheMired === value || this.cacheState !== 'on') {
         return
       }
-      if (!this.isOnline && this.accessory.alController.isAdaptiveLightingActive()) {
+      if (
+        !this.isOnline &&
+        this.accessory.alController &&
+        this.accessory.alController.isAdaptiveLightingActive()
+      ) {
         return
       }
       const updateKey = Math.random()
@@ -179,7 +192,7 @@ module.exports = class deviceZBLightCCT {
       this.cacheMired = value
       this.cacheCT = scaledCT
       if (this.enableLogging) {
-        if (this.accessory.alController.isAdaptiveLightingActive()) {
+        if (this.accessory.alController && this.accessory.alController.isAdaptiveLightingActive()) {
           this.log('[%s] %s [%sK] %s.', this.name, this.lang.curColour, scaledK, this.lang.viaAL)
         } else {
           this.log('[%s] %s [%sK].', this.name, this.lang.curColour, scaledK)
@@ -224,7 +237,11 @@ module.exports = class deviceZBLightCCT {
             if (this.enableLogging) {
               this.log('[%s] %s [%sK].', this.name, this.lang.curColour, scaledK)
             }
-            if (this.accessory.alController.isAdaptiveLightingActive() && ctDiff > 20) {
+            if (
+              this.accessory.alController &&
+              this.accessory.alController.isAdaptiveLightingActive() &&
+              ctDiff > 20
+            ) {
               // Look for a variation greater than twenty
               this.accessory.alController.disableAdaptiveLighting()
               if (this.enableLogging) {
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 02e824e5..48932825 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -60,7 +60,7 @@ module.exports = {
     operationTime: 20,
     operationTimeDown: 20,
     brightnessStep: 1,
-    adaptiveLightingShift: 0
+    adaptiveLightingShift: -1
   },
 
   appId: 'oeVkj2lYFGnJu5XUtWisfW4utiN4u9Mq',

From 37eee25ab905dcb0a4f5cceded55f41779e3cce7 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 2 Jul 2021 08:10:30 +0100
Subject: [PATCH 2437/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 99e3ace1..e3468d8d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -37,6 +37,8 @@ All notable changes to this homebridge-ewelink will be documented in this file.
   - Ability to change sensor type and other configurable options without the need to re-add the accessory
   - Configuration option `resetOnStartup` to reset the subdevices, useful when adding/removing subdevices to the bridge
   - Added option to specify a manual IP for an RF Bridge
+- **Light Devices**
+  - Remove Adaptive Lighting feature from a device by setting the `adaptiveLightingShift` to `-1`
 - **Zigbee Button Devices**
   - Comparison of trigger time against notification time to reduce duplicate accessory updates
   - Will no longer request current state when coming back online to reduce duplicate accessory updates

From c34072951fac849b06fb413822f915e13bb7931d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 2 Jul 2021 08:11:49 +0100
Subject: [PATCH 2438/3183] 7.0.0-beta.2

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 5bbc5787..c60c047e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "7.0.0-beta.1",
+  "version": "7.0.0-beta.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index e1e540e1..18e4ab72 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "7.0.0-beta.1",
+  "version": "7.0.0-beta.2",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 3b6115b42c907fd56d5d5ba27548da7c6060e8a6 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 2 Jul 2021 12:34:37 +0100
Subject: [PATCH 2439/3183] small login error refactor

---
 lib/connection/http.js | 10 +++++--
 lib/index.js           | 60 +++++++++++++++++++++---------------------
 lib/utils/lang-en.js   |  1 +
 3 files changed, 39 insertions(+), 32 deletions(-)

diff --git a/lib/connection/http.js b/lib/connection/http.js
index 0e168113..253324e8 100644
--- a/lib/connection/http.js
+++ b/lib/connection/http.js
@@ -115,8 +115,11 @@ module.exports = class connectionHTTP {
             await this.funcs.sleep(30000)
             return await this.login()
           } else {
-            const text = JSON.stringify(body, null, 2)
-            throw new Error(this.lang.noAuthRec + '.\n' + text)
+            if (body.msg) {
+              throw new Error(body.msg + (body.error ? ' [' + body.error + ']' : ''))
+            } else {
+              throw new Error(this.lang.noAuthRec + '.\n' + JSON.stringify(body, null, 2))
+            }
           }
         }
       }
@@ -130,6 +133,9 @@ module.exports = class connectionHTTP {
       } else {
         // It's not a eWeLink problem so report the error back
         this.log.warn('%s.', this.lang.errLogin)
+        if (err.message.includes('10003')) {
+          this.log.warn('%s', this.lang.httpLogin10003)
+        }
         throw err
       }
     }
diff --git a/lib/index.js b/lib/index.js
index 033a1f0e..39b011ad 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -525,36 +525,31 @@ class eWeLinkPlatform {
       // Username and password are now optional
       if (this.config.username && this.config.password) {
         // Set up the HTTP client, get the user HTTP host, and login
-        try {
-          httpClient = new (require('./connection/http'))(this)
-          const authData = await httpClient.login()
-          this.config.password = authData.password
-
-          // Get a device list via HTTP request
-          const httpDeviceList = await httpClient.getDevices()
-          httpDeviceList.forEach(device => deviceList.push(device))
-
-          // Set up the WS client, get the user WS host and login
-          if (this.config.mode !== 'lan') {
-            wsClient = new (require('./connection/ws'))(this, authData)
-            await wsClient.login()
-
-            // Refresh the WS connection every 60 minutes
-            this.wsRefresh = setInterval(async () => {
-              try {
-                if (this.config.debug) {
-                  this.log('%s.', this.lang.wsRef)
-                }
-                await wsClient.login()
-              } catch (e) {
-                const eText = this.funcs.parseError(e)
-                this.log.warn('%s %s.', this.lang.wsRefFail, eText)
+        httpClient = new (require('./connection/http'))(this)
+        const authData = await httpClient.login()
+        this.config.password = authData.password
+
+        // Get a device list via HTTP request
+        const httpDeviceList = await httpClient.getDevices()
+        httpDeviceList.forEach(device => deviceList.push(device))
+
+        // Set up the WS client, get the user WS host and login
+        if (this.config.mode !== 'lan') {
+          wsClient = new (require('./connection/ws'))(this, authData)
+          await wsClient.login()
+
+          // Refresh the WS connection every 60 minutes
+          this.wsRefresh = setInterval(async () => {
+            try {
+              if (this.config.debug) {
+                this.log('%s.', this.lang.wsRef)
               }
-            }, 3600000)
-          }
-        } catch (err) {
-          const eText = this.funcs.parseError(err)
-          this.log.warn('%s %s.', this.lang.httpDisabled, eText)
+              await wsClient.login()
+            } catch (e) {
+              const eText = this.funcs.parseError(e)
+              this.log.warn('%s %s.', this.lang.wsRefFail, eText)
+            }
+          }, 3600000)
         }
 
         // Clear the storage folder and start again when we have access to http devices
@@ -657,7 +652,12 @@ class eWeLinkPlatform {
       }, 2000)
     } catch (err) {
       // Catch any errors during setup
-      const eText = [this.lang.disabled, this.lang.missingCreds].includes(err.message)
+      const eText = [
+        this.lang.disabled,
+        this.lang.missingCreds,
+        'password error! [10001]',
+        'user does not exists [10003]'
+      ].includes(err.message)
         ? err.message
         : this.config.debug
         ? err
diff --git a/lib/utils/lang-en.js b/lib/utils/lang-en.js
index 23a57d6a..e8adc9e4 100644
--- a/lib/utils/lang-en.js
+++ b/lib/utils/lang-en.js
@@ -74,6 +74,7 @@ module.exports = {
   foundWithManIP: 'using manual IP',
   hbVersionFail: 'Your version of Homebridge is too low - please update to v1.3',
   httpDisabled: 'HTTP/WS clients disabled as',
+  httpLogin10003: 'See http://bit.ly/hb-ewelink-errors for more info about login issues',
   httpRetry: 'Unable to reach eWeLink, retrying in 30 seconds',
   identify: 'identify button pressed',
   initialised: 'Plugin initialised. Setting up accessories...',

From 122cd2c0487406f60fd33d81547402f75d1e03bc Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 2 Jul 2021 12:47:58 +0100
Subject: [PATCH 2440/3183] 7.0.0-beta.3

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c60c047e..f90afe05 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "7.0.0-beta.2",
+  "version": "7.0.0-beta.3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 18e4ab72..90e9345a 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "7.0.0-beta.2",
+  "version": "7.0.0-beta.3",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 4f707cc848cea65b71c2ab98c5eb9f2c9193bdc4 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 2 Jul 2021 16:30:05 +0100
Subject: [PATCH 2441/3183] bring in node-dns-sd

---
 .prettierignore                         |   3 +-
 lib/connection/lan.js                   |   2 +-
 lib/node-dns-sd/LICENSE                 |  21 +
 lib/node-dns-sd/README.md               | 614 ++++++++++++++++++++++++
 lib/node-dns-sd/lib/dns-sd-classes.json |   6 +
 lib/node-dns-sd/lib/dns-sd-composer.js  |  73 +++
 lib/node-dns-sd/lib/dns-sd-parser.js    | 347 +++++++++++++
 lib/node-dns-sd/lib/dns-sd-types.json   |  52 ++
 lib/node-dns-sd/lib/dns-sd.js           | 586 ++++++++++++++++++++++
 lib/node-dns-sd/package.json            |  62 +++
 package-lock.json                       |   5 -
 package.json                            |   6 +-
 12 files changed, 1769 insertions(+), 8 deletions(-)
 create mode 100644 lib/node-dns-sd/LICENSE
 create mode 100644 lib/node-dns-sd/README.md
 create mode 100644 lib/node-dns-sd/lib/dns-sd-classes.json
 create mode 100644 lib/node-dns-sd/lib/dns-sd-composer.js
 create mode 100644 lib/node-dns-sd/lib/dns-sd-parser.js
 create mode 100644 lib/node-dns-sd/lib/dns-sd-types.json
 create mode 100644 lib/node-dns-sd/lib/dns-sd.js
 create mode 100644 lib/node-dns-sd/package.json

diff --git a/.prettierignore b/.prettierignore
index 8b42361c..d926ea4b 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -1,2 +1,3 @@
 .github/
-.nova
\ No newline at end of file
+.nova
+lib/node-dns-sd
\ No newline at end of file
diff --git a/lib/connection/lan.js b/lib/connection/lan.js
index 2d624e04..eb1ce973 100644
--- a/lib/connection/lan.js
+++ b/lib/connection/lan.js
@@ -4,7 +4,7 @@
 
 const axios = require('axios')
 const crypto = require('crypto')
-const dnsSd = require('node-dns-sd')
+const dnsSd = require('./../node-dns-sd')
 const emitter = new (require('events'))()
 
 module.exports = class connectionLAN {
diff --git a/lib/node-dns-sd/LICENSE b/lib/node-dns-sd/LICENSE
new file mode 100644
index 00000000..b412ce59
--- /dev/null
+++ b/lib/node-dns-sd/LICENSE
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2018-2020 Futomi Hatano
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
\ No newline at end of file
diff --git a/lib/node-dns-sd/README.md b/lib/node-dns-sd/README.md
new file mode 100644
index 00000000..d532673a
--- /dev/null
+++ b/lib/node-dns-sd/README.md
@@ -0,0 +1,614 @@
+node-dns-sd
+===============
+
+The node-dns-sd is a Node.js module which is a pure javascript implementation of mDNS/DNS-SD (Apple Bonjour) browser and packet parser. It allows you to discover IPv4 addresses in the local network specifying a service name such as `_http._tcp.local`. Besides, it allows you to monitor mDNS/DNS-SD packets.
+
+This module focuses on discovering IPv4 addresses from a service name. It is not a full implementation of mDNS/DNS-SD. If you want to announce services or send custom query packets or discover IPv6 addresses, you should choice another one from [mDNS/DNS-SD nodejs implementations](https://www.npmjs.com/search?q=mDNS&page=1&ranking=optimal).
+
+## Dependencies
+
+* [Node.js](https://nodejs.org/en/) 4 +
+  * Though the node-dns-sd works on Node 4 for now, it is strongly recommended to use Node 6 or newer. The node-dns-sd will not support Node 4 in the future.
+
+## Installation
+
+```
+$ cd ~
+$ npm install node-dns-sd
+```
+
+---------------------------------------
+## Table of Contents
+
+* [Quick Start](#Quick-Start)
+  * [Discover devices](#Quick-Start-1)
+  * [Monitor packets](#Quick-Start-2)
+* [`DnsSd` object](#DnsSd-object)
+  * [discover() method](#DnsSd-discover-method)
+  * [startMonitoring() method](#DnsSd-startMonitoring-method)
+  * [stopMonitoring() method](#DnsSd-stopMonitoring-method)
+  * [`ondata` event handler](#DnsSd-ondata-event-handler)
+* [`DnsSdPacket` object](#DnsSdPacket-object)
+* [Release Note](#Release-Note)
+* [References](#References)
+* [License](#License)
+
+---------------------------------------
+## <a id="Quick-Start">Quick Start</a>
+
+### <a id="Quick-Start-1">Discover devices</a>
+
+The node-dns-sd supports a Promise-based method for discovering devices in the local network. The sample code below shows how to discover devices from a service name. In the sample code, `_googlecast._tcp.local` is specified for a service name.
+
+```JavaScript
+const mDnsSd = require('node-dns-sd');
+
+mDnsSd.discover({
+  name: '_googlecast._tcp.local'
+}).then((device_list) =>{
+  console.log(JSON.stringify(device_list, null, '  '));
+}).catch((error) => {
+  console.error(error);
+});
+```
+
+The sample code above will output the result as follows:
+
+```
+[
+  {
+    "address": "192.168.11.20",
+    "fqdn": "BRAVIA-4K-GB-0000043926ff4f7fed3bf248db400000._googlecast._tcp.local",
+    "modelName": "BRAVIA 4K GB",
+    "familyName": "KJ-43X8300D",
+    "service": {
+      "port": 8009,
+      "protocol": "tcp",
+      "type": "googlecast"
+    },
+    "packet": {...}
+  },
+  {
+    "address": "192.168.11.12",
+    "fqdn": "Google-Home-000001eda257d1f8ea765acd79500000._googlecast._tcp.local",
+    "modelName": "Google Home",
+    "familyName": "Google Home in living room",
+    "service": {
+      "port": 8009,
+      "protocol": "tcp",
+      "type": "googlecast"
+    },
+    "packet": {...}
+  }
+]
+```
+
+As you can see, you can obtain information of devices which support the service specified to the [`discover()`](#DnsSd-discover-method) method.
+
+The value of the `packet` property in the response is a [`DnsSdPacket`](#DnsSdPacket-object) object which represents a DNS-SD response packet. You can find more information in the object.
+
+### <a id="Quick-Start-2">Monitor packets</a>
+
+The node-dns-sd has a mDNS/DNS-SD packet parser. It can watch mDNS/DNS-SD packets in the local network and reports the packets as human-readable information.
+
+```JavaScript
+const mDnsSd = require('node-dns-sd');
+
+mDnsSd.ondata = (packet) => {
+  console.log(JSON.stringify(packet, null, '  '));
+};
+
+mDnsSd.startMonitoring().then(() => {
+  console.log('Started.');
+}).catch((error) => {
+  console.error(error);
+});
+```
+
+The sample code above will output the result as follows:
+
+```
+...
+{
+  "header": {
+    "id": 0,
+    "qr": 0,
+    "op": 0,
+    "aa": 0,
+    "tc": 0,
+    "rd": 0,
+    "ra": 0,
+    "z": 0,
+    "ad": 0,
+    "cd": 0,
+    "rc": 0,
+    "questions": 3,
+    "answers": 2,
+    "authorities": 0,
+    "additionals": 1
+  },
+  "questions": [
+    {
+      "name": "_homekit._tcp.local",
+      "type": "PTR",
+      "class": "IN"
+    },
+    {
+      "name": "A6A1A463-D197-53EA-892B-FFFFFFFFFFFF._homekit._tcp.local",
+      "type": "TXT",
+      "class": "IN"
+    },
+    {
+      "name": "_sleep-proxy._udp.local",
+      "type": "PTR",
+      "class": "IN"
+    }
+  ],
+  "answers": [
+    {
+      "name": "_homekit._tcp.local",
+      "type": "PTR",
+      "class": "IN",
+      "flash": false,
+      "ttl": 4500,
+      "rdata": "A6A1A463-D197-53EA-892B-FFFFFFFFFFFF._homekit._tcp.local"
+    },
+    {
+      "name": "_sleep-proxy._udp.local",
+      "type": "PTR",
+      "class": "IN",
+      "flash": false,
+      "ttl": 4500,
+      "rdata": "70-00-00-00.1 Apple TV._sleep-proxy._udp.local"
+    }
+  ],
+  "authorities": [],
+  "additionals": [
+    {
+      "name": "",
+      "type": "OPT",
+      "class": "",
+      "flash": false,
+      "ttl": 4500,
+      "rdata": "00 04 00 0e 00 24 c2 a5 3e 4c 7c b6 c0 a5 3e 4c 7c b4"
+    }
+  ],
+  "address": "192.168.11.24"
+}
+...
+```
+
+The object above is a [`DnsSdPacket`](#DnsSdPacket-object) object which represents a mDNS/DNS-SD response packet.
+
+
+---------------------------------------
+## <a id="DnsSd-object">`DnsSd` object</a>
+
+In order to use the node-dns-sd, you have to load the node-dns-sd module as follows:
+
+```JavaScript
+const DnsSd = require('node-dns-sd');
+```
+
+In the code snippet above, the variable `DnsSd` is a `DnsSd` object. The `DnsSd` object has methods as described in sections below.
+
+### <a id="DnsSd-discover-method">discover() method</a>
+
+The `discover()` method discovers devices supporting the service specified to this method in the local network. This method returns a `Promise` object.
+
+This method takes a hash object containing the properties as follows:
+
+Property | Type    | Required | Description
+:--------|:--------|:---------|:-------------------------
+`name`   | String  | Required | Service name.(e.g., `"_googlecast._tcp.local"`)
+`type`   | String  | Optional | Query Type (e.g., `"PTR"`). The default value is `"*"`.
+`key`    | String  | Optional | This value must be `"address"` (default) or `"fqdn"`. This property indicates how to fold multiple DNS-SD query responses. See the description below for details.
+`wait`   | Integer | Optional | Duration of monitoring (sec). The default value is 3 sec.
+`quick`  | Boolean | Optional | If `true`, this method returns immediately after a device was found ignoring the value of the `wait`. The default value is `false`.
+`filter` | String  | Optional | If a string is specified to the `filter`, this method discovers only devices which the specified string is found in the `fqdn`, `address`, `modelName` or `familyName`.
+`filter` | Function | Optional | If a function is specified to the `filter`, this method discovers only devices for which the function returns `true`. See the sample code below for details.
+
+If you want to discover all services in the local netowrk, you can set the `name` property to `_services._dns-sd._udp.local'`.
+
+```javascript
+mDnsSd.discover({
+  name: '_services._dns-sd._udp.local',
+  type: 'PTR',
+  key: 'fqdn'
+}).then((device_list) =>{
+  console.log(JSON.stringify(device_list, null, '  '));
+}).catch((error) => {
+  console.error(error);
+});
+```
+
+The `type` property indicates the query type, such as `"PTR"`. This value must be a (Q)TYPE value defined in the [RFC 1035](https://tools.ietf.org/html/rfc1035) and [RFC 2782](https://tools.ietf.org/html/rfc2782). If this property is not specified, the wildcard `"*"` will be applied.
+
+The `key` property indicates how to fold multiple DNS-SD query responses. If the value is set to `"address"` or this property is not specified, the last response form an IP address will be reported. If you want to discover IP addresses rather than services, this mode is appropriate.
+
+If the value of the `key` property is set to `"fqdn"`, responses will be folded by each FQDN. In this mode, multiple responses with the same IP address could be included. If you want to discover services rather than IP address, this mode is appropriate.
+
+Basically you don't need to pass the `wait` property to this method. In most cases, the default value `3` (sec) works well.
+
+The code blow would find Google devices (Google Home, Google TV, etc.):
+
+```JavaScript
+mDnsSd.discover({
+  name: '_googlecast._tcp.local'
+}).then((device_list) =>{
+  console.log(JSON.stringify(device_list, null, '  '));
+}).catch((error) => {
+  console.error(error);
+});
+```
+
+The code above will output the result as follows:
+
+```
+[
+  {
+    "address": "192.168.11.20",
+    "fqdn": "BRAVIA-4K-GB-0000043926ff4f7fed3bf248db400000._googlecast._tcp.local",
+    "modelName": "BRAVIA 4K GB",
+    "familyName": "KJ-43X8300D",
+    "service": {
+      "port": 8009,
+      "protocol": "tcp",
+      "type": "googlecast"
+    },
+    "packet": {...}
+  },
+  {
+    "address": "192.168.11.12",
+    "fqdn": "Google-Home-000001eda257d1f8ea765acd79500000._googlecast._tcp.local",
+    "modelName": "Google Home",
+    "familyName": "Google Home in living room",
+    "service": {
+      "port": 8009,
+      "protocol": "tcp",
+      "type": "googlecast"
+    },
+    "packet": {...}
+  }
+]
+```
+
+A string is set to the `filter` parameter, this method limits to devices whose `fqdn`, `address`, `modelName` or `familyName` includes the string.
+
+```javascript
+mDnsSd.discover({
+  name: '_googlecast._tcp.local',
+  filter: 'Google Home',
+  quick: true
+}).then((device_list) =>{
+  console.log(JSON.stringify(device_list, null, '  '));
+}).catch((error) => {
+  console.error(error);
+});
+```
+
+A function is set to the `filter` parameter, this method limits to devices for which the function returns `true`. The function must return `true` or `false`.
+
+```javascript
+mDnsSd.discover({
+  name: '_googlecast._tcp.local',
+  filter: (devcie) => {
+    return (device['modelName'] === 'Google Home' && /Living room/.test(device['familyName']));
+  },
+  quick: true
+}).then((device_list) =>{
+  console.log(JSON.stringify(device_list, null, '  '));
+}).catch((error) => {
+  console.error(error);
+});
+```
+
+As you can see from the code above, an object representing a found device is passed to the function. You can evaluate the device information and limit to devices you want.
+
+The `discover()` method will pass a information list of the found devices to the callback function. Each device information in the list contains the properties as follows:
+
+Property      | Type    | Description
+:-------------|:--------|:---------------
+`address`     | String  | IPv4 address
+`fqdn`        | String  | Fully Qualified Domain Name
+`modelName`   | String  | Model Name
+`familyName`  | String  | Family Name
+`service`     | Object  |
++`port`       | Integer | Port number (e.g., `8009`)
++`protocol`   | String  | Protocol (e.g., `"tcp"`)
++`type`       | String  | Service type (e.g., "`googlecast`")
+`packet`      | [`DnsSdPacket`](#DnsSdPacket-object) | An object representing the response packet
+
+Note that the values of properties other than the `address` are not necessarily set in this object. If the values are not obtained from the response packet, they will be set to `null`.
+
+Here are some examples:
+
+#### Apple TV
+
+```JavaScript
+mDnsSd.discover({
+  name: '_airplay._tcp.local'
+})
+```
+```
+[
+  {
+    "address": "192.168.11.29",
+    "fqdn": "Apple TV._airplay._tcp.local",
+    "modelName": "Apple TV J42dAP",
+    "familyName": null,
+    "service": {
+      "port": 7000,
+      "protocol": "tcp",
+      "type": "airplay"
+    },
+    "packet": {...}
+  }
+]
+```
+
+#### Canon Network printer
+
+```JavaScript
+mDnsSd.discover({
+  name: '_printer._tcp.local'
+})
+```
+```
+[
+  {
+    "address": "192.168.11.99",
+    "fqdn": "Canon MF720C Series._ipp._tcp.local",
+    "modelName": "Canon MF720C Series",
+    "familyName": null,
+    "service": {
+      "port": 80,
+      "protocol": "tcp",
+      "type": "ipp"
+    },
+    "packet": {...}
+  }
+]
+```
+
+#### Philips Hue Bridge
+
+```JavaScript
+mDnsSd.discover({
+  name: '_hap._tcp.local'
+})
+```
+```
+[
+  {
+    "address": "192.168.11.18",
+    "fqdn": "Philips hue - 123ABC._hap._tcp.local",
+    "modelName": "Philips hue BSB002",
+    "familyName": null,
+    "service": {
+      "port": 8080,
+      "protocol": "tcp",
+      "type": "hap"
+    },
+    "packet": {...}
+  }
+]
+```
+
+#### Raspberry Pi (Raspbian)
+
+```JavaScript
+mDnsSd.discover({
+  name: 'raspberrypi.local'
+})
+```
+```
+[
+  {
+    "address": "192.168.11.34",
+    "fqdn": null,
+    "productName": null,
+    "modelName": null,
+    "familyName": null,
+    "service": null,
+    "packet": {...}
+  }
+]
+```
+
+### <a id="DnsSd-startMonitoring-method">startMonitoring() method</a>
+
+The `startMonitoring()` method starts the monitoring mode and  listens to mDNS/DNS-SD packets. This method returns a `Promise` object.
+
+You can catch incoming packets setting a callback function to the [`ondata`](#DnsSd-ondata-event-handler) event handler.
+
+```JavaScript
+mDnsSd.ondata = (packet) => {
+  console.log(JSON.stringify(packet, null, '  '));
+};
+
+mDnsSd.startMonitoring().then(() => {
+  console.log('Started.');
+}).catch((error) => {
+  console.error(error);
+});
+```
+
+Whenever a mDNS/DNS-SD packet is received, a [`DnsSdPacket`](#DnsSdPacket-object) object will be passed to the callback function. See the section "[`DnsSdPacket`](#DnsSdPacket-object) object" for more details.
+
+### <a id="DnsSd-stopMonitoring-method">stopMonitoring() method</a>
+
+The `stopMonitoring()` method stops the monitoring mode started by the [`startMonitoring()`](#DnsSd-startMonitoring-method) method. This method returns a `Promise` object.
+
+```JavaScript
+mDnsSd.stopMonitoring().then(() => {
+  console.log('Stopped.');
+}).catch((error) => {
+  console.error(error);
+});
+```
+
+### <a id="DnsSd-ondata-event-handler">`ondata` event handler</a>
+
+The `ondata` event handler will be called whenever a mDNS/DNS-SD packet is received. Note that this event handler works only if the monitoring mode is active.
+
+See the section "[`startMonitoring()` method](#DnsSd-startMonitoring-method)" for more details.
+
+---------------------------------------
+## <a id="DnsSdPacket-object">`DnsSdPacket` object</a>
+
+The `DnsSdPacket` object represents a mDNS/DNS-SD packet. It is a hash object containing the properties as follows:
+
+```
+{
+  "header": {
+    "id": 0,
+    "qr": 1,
+    "op": 0,
+    "aa": 1,
+    "tc": 0,
+    "rd": 0,
+    "ra": 0,
+    "z": 0,
+    "ad": 0,
+    "cd": 0,
+    "rc": 0,
+    "questions": 0,
+    "answers": 1,
+    "authorities": 0,
+    "additionals": 3
+  },
+  "questions": [],
+  "answers": [
+    {
+      "name": "_googlecast._tcp.local",
+      "type": "PTR",
+      "class": "IN",
+      "flash": false,
+      "ttl": 120,
+      "rdata": "Google-Home-0ae0c1eda257d1f8ea765acd00000000._googlecast._tcp.local"
+    }
+  ],
+  "authorities": [],
+  "additionals": [
+    {
+      "name": "Google-Home-0ae0c1eda257d1f8ea765acd00000000._googlecast._tcp.local",
+      "type": "TXT",
+      "class": "IN",
+      "flash": true,
+      "ttl": 4500,
+      "rdata": {
+        "id": "0ae0c1eda257d1f8ea765acd00000000",
+        "cd": "A4030CC6FEF4C94DFCD31B0500000000",
+        "rm": "2CE3F99700000000",
+        "ve": "05",
+        "md": "Google Home",
+        "ic": "/setup/icon.png",
+        "fn": "Google Home in living room",
+        "ca": "2052",
+        "st": "0",
+        "bs": "FA8F00000000",
+        "nf": "1",
+        "rs": ""
+      },
+      "rdata_buffer": {
+        "id": {Buffer object},
+        "cd": {Buffer object},
+        "rm": {Buffer object},
+        "ve": {Buffer object},
+        "md": {Buffer object},
+        "ic": {Buffer object},
+        "fn": {Buffer object},
+        "ca": {Buffer object},
+        "st": {Buffer object},
+        "bs": {Buffer object},
+        "nf": {Buffer object},
+        "rs": {Buffer object}
+      }
+    },
+    {
+      "name": "Google-Home-0ae0c1eda257d1f8ea765acd00000000._googlecast._tcp.local",
+      "type": "SRV",
+      "class": "IN",
+      "flash": true,
+      "ttl": 120,
+      "rdata": {
+        "priority": 0,
+        "weight": 0,
+        "port": 8009,
+        "target": "0ae0c1ed-a257-d1f8-ea76-000000000000.local"
+      }
+    },
+    {
+      "name": "0ae0c1ed-a257-d1f8-ea76-000000000000.local",
+      "type": "A",
+      "class": "IN",
+      "flash": true,
+      "ttl": 120,
+      "rdata": "192.168.11.12"
+    }
+  ],
+  "address": "192.168.11.12"
+}
+```
+
+Note that the `rdata_buffer` property is added only if the type is `"TXT"`. Each value in the `rdata_buffer` is a `Buffer` object. Some devices set a binary data to each value. You can parse the binary data using this property.
+
+See the section "[References](#References)" for more details.
+
+---------------------------------------
+## <a id="Release-Note">Release Note</a>
+
+* v0.4.2 (2020-09-30)
+  * Catch dropMembership error (thanks to [@bwp91](https://github.com/futomi/node-dns-sd/pull/6))
+* v0.4.1 (2020-04-09)
+  * Fix of address already in use on udp.addMembership method (thanks to [@SlyAndrew](https://github.com/futomi/node-dns-sd/pull/5))
+* v0.4.0 (2019-02-24)
+  * Added the `rdata_buffer` property in the [`DnsSdPacket`](#DnsSdPacket-object) object.
+* v0.3.0 (2018-10-25)
+  * Added the `key` and `type` parameters to the [`discover()`](#DnsSd-discover-method) method.
+* v0.2.1 (2018-10-24)
+  * Improved the device discovery. In this version, all available IPv4 network interfaces are joined to a multicast group, so that all devices in the local network are sure to be discovered.
+  * Fixed a bug that some event listeners did not be removed when the discovery process is finished.
+* v0.2.0 (2018-08-02)
+  * Supported a function-based filtering mechanism in the [`discover()`](#DnsSd-discover-method) method. Now you can specify your custom filter as a function to the `filter` paramter of the `discover()` method. (thanks to [@dayflower](https://github.com/futomi/node-dns-sd/issues/2))
+* v0.1.2 (2018-01-06)
+  * Fixed a bug that an exeption was thrown if the `filter` was specified to the `discover()` method.
+* v0.1.0 (2018-01-06)
+  * Added the parameter `quick` and `filter` to the [`discover()`](#DnsSd-discover-method) method.
+  * Fixed a bug that a UDP socket was not closed properly.
+* v0.0.1 (2018-01-05)
+  * First public release
+
+---------------------------------------
+## <a id="References">References</a>
+
+* [RFC 1035 (DOMAIN NAMES - IMPLEMENTATION AND SPECIFICATION)](https://tools.ietf.org/html/rfc1035)
+* [RFC 6762 (Multicast DNS)](https://tools.ietf.org/html/rfc6762)
+* [RFC 6763 (DNS-Based Service Discovery)](https://tools.ietf.org/html/rfc6763)
+* [RFC 2782 (A DNS RR for specifying the location of services (DNS SRV))](https://tools.ietf.org/html/rfc2782)
+
+---------------------------------------
+## <a id="License">License</a>
+
+The MIT License (MIT)
+
+Copyright (c) 2018-2020 Futomi Hatano
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/lib/node-dns-sd/lib/dns-sd-classes.json b/lib/node-dns-sd/lib/dns-sd-classes.json
new file mode 100644
index 00000000..d9f47867
--- /dev/null
+++ b/lib/node-dns-sd/lib/dns-sd-classes.json
@@ -0,0 +1,6 @@
+{
+	"IN" : 1,
+	"CS" : 2,
+	"CH" : 3,
+	"HS" : 4
+}
\ No newline at end of file
diff --git a/lib/node-dns-sd/lib/dns-sd-composer.js b/lib/node-dns-sd/lib/dns-sd-composer.js
new file mode 100644
index 00000000..4ff70295
--- /dev/null
+++ b/lib/node-dns-sd/lib/dns-sd-composer.js
@@ -0,0 +1,73 @@
+/* ------------------------------------------------------------------
+* node-dns-sd - dns-sd-composer.js
+*
+* Copyright (c) 2017, Futomi Hatano, All rights reserved.
+* Released under the MIT license
+* Date: 2018-10-25
+* ---------------------------------------------------------------- */
+'use strict';
+
+/* ------------------------------------------------------------------
+* Constructor: DnsSdComposer()
+* ---------------------------------------------------------------- */
+const DnsSdComposer = function() {
+	this._CLASSES = require('./dns-sd-classes.json');
+	this._TYPES = require('./dns-sd-types.json');
+};
+
+/* ------------------------------------------------------------------
+* Method: compose(params)
+* - params:
+*   - name    | Array  | Requred  | Servcie name.(e.g., ["_googlecast._tcp.local"])
+*   - type    | String | Optional | Query Type (e.g., "PTR"). The default value is "*"
+* ---------------------------------------------------------------- */
+DnsSdComposer.prototype.compose = function(params) {
+	let name_list = params['name'];
+	let type_name = params['type'];
+	let type_code = 0xff;
+	if(type_name) {
+		if(typeof(type_name) === 'string') {
+			if(this._TYPES[type_name]) {
+				type_code = this._TYPES[type_name];
+			} else {
+				throw new Error('The specified query type name is unknown: ' + type_name);
+			}
+		} else {
+			throw new Error('The specified query type is invalid.');
+		}
+	}
+
+	let hbuf = Buffer.from([ // Header
+		0x00, 0x00, // Transaction ID
+		0x00, 0x00, // Flags
+		0x00, name_list.length, // Questions
+		0x00, 0x00, // Answer PRs
+		0x00, 0x00, // Authority PRs
+		0x00, 0x00 // Additional PRs
+	]);
+
+	let qbuf_list = [];
+	name_list.forEach((name) => {
+		(name.split('.')).forEach((part) => {
+			let part_buf = Buffer.from(part, 'utf8');
+			qbuf_list.push(Buffer.from([part_buf.length]));
+			qbuf_list.push(part_buf);
+		});
+		qbuf_list.push(Buffer.from([0x00])); // Null-terminated string for the domain name
+
+		let type_buf = Buffer.alloc(2);
+		type_buf.writeUInt16BE(type_code, 0);
+		qbuf_list.push(type_buf);
+
+		let class_buf = Buffer.alloc(2);
+		class_buf.writeUInt16BE(this._CLASSES['IN'], 0);
+		qbuf_list.push(class_buf);
+	});
+	let qbuf = Buffer.concat(qbuf_list);
+
+	let buf = Buffer.concat([hbuf, qbuf]);
+	return buf;
+};
+
+module.exports = new DnsSdComposer();
+
diff --git a/lib/node-dns-sd/lib/dns-sd-parser.js b/lib/node-dns-sd/lib/dns-sd-parser.js
new file mode 100644
index 00000000..d07bab46
--- /dev/null
+++ b/lib/node-dns-sd/lib/dns-sd-parser.js
@@ -0,0 +1,347 @@
+/* ------------------------------------------------------------------
+* node-dns-sd - dns-sd-parser.js
+*
+* Copyright (c) 2018-2019, Futomi Hatano, All rights reserved.
+* Released under the MIT license
+* Date: 2018-02-27
+
+* Related specifications:
+* - RFC 1035 (DOMAIN NAMES - IMPLEMENTATION AND SPECIFICATION)
+*     https://tools.ietf.org/html/rfc1035
+* - RFC 6762 (Multicast DNS)
+*     https://tools.ietf.org/html/rfc6762
+* - RFC 6763 (DNS-Based Service Discovery)
+*     https://tools.ietf.org/html/rfc6763
+* - RFC 2782 (A DNS RR for specifying the location of services (DNS SRV))
+*     https://tools.ietf.org/html/rfc2782
+* ---------------------------------------------------------------- */
+'use strict';
+
+/* ------------------------------------------------------------------
+* Constructor: DnsSdParser()
+* ---------------------------------------------------------------- */
+const DnsSdParser = function() {
+	this._CLASSES = require('./dns-sd-classes.json');
+	this._CLASS_MAP = {};
+	Object.keys(this._CLASSES).forEach((k) => {
+		this._CLASS_MAP[this._CLASSES[k]] = k;
+	});
+
+	this._TYPES = require('./dns-sd-types.json');
+	this._TYPE_MAP = {};
+	Object.keys(this._TYPES).forEach((k) => {
+		this._TYPE_MAP[this._TYPES[k]] = k;
+	});
+};
+
+/* ------------------------------------------------------------------
+* Method: parse(buf)
+* ---------------------------------------------------------------- */
+DnsSdParser.prototype.parse = function(buf) {
+	if(buf.length <= 12) {
+		return null;
+	}
+	let header = {
+		id: buf.readUInt16BE(0),
+		qr: buf.readUInt8(2) >> 7, // 0: Query, 1: Response
+		op: (buf.readUInt8(2) & 0b01111000) >> 3, // 0: Normal query, 4: Notify, 5: Update
+		aa: (buf.readUInt8(2) & 0b00000100) >> 2,
+		tc: (buf.readUInt8(2) & 0b00000010) >> 1,
+		rd: (buf.readUInt8(2) & 0b00000001),
+		ra: (buf.readUInt8(3) & 0b10000000) >> 7,
+		z : (buf.readUInt8(3) & 0b01000000) >> 6,
+		ad: (buf.readUInt8(3) & 0b00100000) >> 6,
+		cd: (buf.readUInt8(3) & 0b00010000) >> 5,
+		rc: (buf.readUInt8(3) & 0b00001111),
+		questions  : buf.readUInt16BE(4),
+		answers    : buf.readUInt16BE(6),
+		authorities: buf.readUInt16BE(8),
+		additionals: buf.readUInt16BE(10)
+	};
+	if(header['tc'] !== 0 || header['rd'] !== 0 || header['ra'] !== 0 || header['z'] !== 0 || header['ad'] !== 0 || header['cd'] !== 0 || header['rc'] !== 0) {
+		return null;
+	}
+	if(header['questions'] + header['answers'] + header['authorities'] + header['additionals'] === 0) {
+		return null;
+	}
+	let offset = 12;
+	let records = {
+		header: header,
+		questions: [],
+		answers: [],
+		authorities: [],
+		additionals: []
+	};
+	let record_count_list = [];
+	['questions', 'answers', 'authorities', 'additionals'].forEach((k) => {
+		let cnt = header[k];
+		if(cnt > 0) {
+			record_count_list.push({name: k, count: cnt});
+		}
+	});
+	let invalid = false;
+	while(true) {
+		let domain_name_parts = [];
+		let parsed = this._parseLabel(buf, offset);
+		let domain_name = '';
+		if(parsed) {
+			offset += parsed['length'];
+			domain_name = parsed['name'];
+		} else {
+			invalid = true;
+			break;
+		}
+
+		let record_key = record_count_list[0]['name'];
+		if(record_key === 'questions') {
+			if(offset + 4 > buf.length) {
+				invalid = true;
+				break;
+			}
+			let type_value = buf.readUInt16BE(offset);
+			let type = this._TYPE_MAP[type_value];
+			offset += 2;
+			let cls_value = buf.readUInt16BE(offset);
+			let cls = this._CLASS_MAP[cls_value];
+			offset += 2;
+			records[record_key].push({
+				name  : domain_name,
+				type  : type || '',
+				class : cls || ''
+			});
+		} else {
+			if(offset + 10 > buf.length) {
+				invalid = true;
+				break;
+			}
+			let type_value = buf.readUInt16BE(offset);
+			let type = this._TYPE_MAP[type_value] || '';
+			offset += 2;
+			let cls_value = buf.readUInt16BE(offset);
+			let cls = this._CLASS_MAP[cls_value & 0b0111111111111111];
+			let flash = (cls_value & 0b1000000000000000) ? true : false;
+			offset += 2;
+			let ttl = buf.readUInt32BE(offset);
+			offset += 4;
+			let rdlen = buf.readUInt16BE(offset);
+			offset += 2;
+			if(offset + rdlen > buf.length) {
+				invalid = true;
+				break;
+			}
+			let rdata = '';
+			let rdbuf = buf.slice(offset, offset + rdlen);
+			let rdata_txt_buffer = null;
+			if(type === 'A') {
+				rdata = this._parseRdataA(buf, offset, rdlen);
+			} else if(type === 'AAAA') {
+				rdata = this._parseRdataAAAA(buf, offset, rdlen);
+			} else if(type === 'PTR') {
+				rdata = this._parseRdataPtr(buf, offset, rdlen);
+			} else if(type === 'TXT') {
+				rdata = this._parseRdataTxt(buf, offset, rdlen);
+				rdata_txt_buffer = this._parseRdataTxt(buf, offset, rdlen, true);
+			} else if(type === 'SRV') {
+				rdata = this._parseRdataSrv(buf, offset, rdlen);
+			} else if(type === 'HINFO') {
+				rdata = this._parseRdataHinfo(buf, offset, rdlen);
+			} else {
+				rdata = this._parseRdataOther(buf, offset, rdlen);
+			}
+			offset += rdlen;
+
+			if(!rdata) {
+				invalid = true;
+				break;
+			}
+
+			let d = {	
+				name  : domain_name,
+				type  : type || '',
+				class : cls || '',
+				flash : flash,
+				ttl   : ttl,
+				rdata : rdata
+			};
+			if(rdata_txt_buffer) {
+				d['rdata_buffer'] = rdata_txt_buffer;
+			}
+			records[record_key].push(d);
+		}
+
+		if(offset >= buf.length) {
+			break;
+		}
+		record_count_list[0]['count'] --;
+		if(record_count_list[0]['count'] <= 0) {
+			record_count_list.shift();
+		}
+		if(record_count_list.length === 0) {
+			break;
+		}
+	}
+	if(invalid === true) {
+		return null;
+	} else {
+		return records;
+	};
+};
+
+DnsSdParser.prototype._parseLabel = function(buf, offset) {
+	try {
+		let labels = [];
+		let length = 0;
+		let invalid = false;
+		while(true) {
+			let label_len = buf.readUInt8(offset + length);
+			if((label_len & 0b11000000) === 0b11000000) {
+				let i = buf.readUInt16BE(offset + length) & 0b0011111111111111;
+				let parsed = this._parseLabel(buf, i);
+				if(parsed) { 
+					labels.push(parsed['name']);
+					length += 2;
+					break;
+				} else {
+					invalid = true;
+					break;
+				}
+			} else if((label_len & 0b11000000) === 0b00000000) {
+				length += 1;
+				if(label_len === 0x00) {
+					break;
+				} else if(offset + length + label_len <= buf.length) {
+					let label = buf.slice(offset + length, offset + length + label_len).toString('utf8');
+					labels.push(label);
+					length += label_len;
+				} else {
+					invalid = true;
+					break;
+				}
+			} else {
+				invalid = true;
+				break;
+			}
+		}
+		if(invalid === true) {
+			return null;
+		} else {
+			return {
+				name   : labels.join('.'),
+				length : length
+			};
+		}
+	} catch (err) {
+		return null;
+	}
+};
+
+DnsSdParser.prototype._parseRdataA = function(buf, offset, len) {
+	let addr_parts = [];
+	for(let i=0; i<len; i++) {
+		addr_parts.push(buf.readUInt8(offset + i));
+	}
+	let addr = addr_parts.join('.');
+	return addr;
+};
+
+DnsSdParser.prototype._parseRdataAAAA = function(buf, offset, len) {
+	let addr_parts = [];
+	for(let i=0; i<len; i+=2) {
+		addr_parts.push(buf.slice(offset + i, offset + i + 2).toString('hex'));
+	}
+	let addr = addr_parts.join(':');
+	return addr;
+};
+
+DnsSdParser.prototype._parseRdataPtr = function(buf, offset, len) {
+	let parsed = this._parseLabel(buf, offset);
+	if(parsed) {
+		return parsed['name'];
+	} else {
+		return null;
+	}
+};
+
+DnsSdParser.prototype._parseRdataTxt = function(buf, offset, len, buf_flag) {
+	let labels = {};
+	let i = 0;
+	while(true) {
+		if(i >= len) {
+			break;
+		}
+		let blen = buf.readUInt8(offset + i);
+		i += 1;
+		if(i + blen <= len) {
+			let pair = buf.slice(offset + i, offset + i + blen).toString('utf8');
+			let m = pair.match(/^([^\=]+)\=(.*)/);
+			if(m) {
+				labels[m[1]] = m[2];
+				if(buf_flag) {
+					let s = offset + i + m[1].length + 1;
+					let e = offset + i + blen;
+					labels[m[1]] = buf.slice(s, e);
+				}
+			}
+			i += blen;
+		} else {
+			break;
+		}
+	}
+	return labels;
+};
+
+DnsSdParser.prototype._parseRdataSrv = function(buf, offset, len) {
+	if(len <= 6) {
+		return null;
+	}
+	let target = null;
+	let parsed = this._parseLabel(buf, offset + 6);
+	if(parsed) {
+		target = parsed['name'];
+	}
+	return {
+		priority : buf.readUInt16BE(offset),
+		weight   : buf.readUInt16BE(offset + 2),
+		port     : buf.readUInt16BE(offset + 4),
+		target   : target
+	};
+};
+
+DnsSdParser.prototype._parseRdataHinfo = function(buf, offset, len) {
+	let txt_list = [];
+	let i = 0;
+	while(true) {
+		if(i >= len) {
+			break;
+		}
+		let blen = buf.readUInt8(offset + i);
+		i += 1;
+		if(i + blen <= len) {
+			let v = buf.slice(offset + i, offset + i + blen).toString('utf8');
+			txt_list.push(v);
+			i += blen;
+		} else {
+			break;
+		}
+	}
+	let info = {};
+	if(txt_list[0]) {
+		info['cpu'] = txt_list[0];
+	}
+	if(txt_list[1]) {
+		info['os'] = txt_list[1];
+	}
+	return info;
+};
+
+DnsSdParser.prototype._parseRdataOther = function(buf, offset, len) {
+	let rdata_parts = [];
+	for(let i=0; i<len; i++) {
+		rdata_parts.push(buf.slice(offset + i, offset + i + 1).toString('hex'));
+	}
+	let rdata = rdata_parts.join(' ');
+	return rdata;
+};
+
+module.exports = new DnsSdParser();
+
diff --git a/lib/node-dns-sd/lib/dns-sd-types.json b/lib/node-dns-sd/lib/dns-sd-types.json
new file mode 100644
index 00000000..430ae5c4
--- /dev/null
+++ b/lib/node-dns-sd/lib/dns-sd-types.json
@@ -0,0 +1,52 @@
+{
+	"A" : 1,
+	"NS" : 2,
+	"MD" : 3,
+	"MF" : 4,
+	"CNAME" : 5,
+	"SOA" : 6,
+	"MB" : 7,
+	"MG" : 8,
+	"MR" : 9,
+	"NULL" : 10,
+	"WKS" : 11,
+	"PTR" : 12,
+	"HINFO" : 13,
+	"MINFO" : 14,
+	"MX" : 15,
+	"TXT" : 16,
+	"AAAA" : 28,
+	"AFSDB" : 18,
+	"APL" : 42,
+	"CAA" : 257,
+	"CDNSKEY" : 60,
+	"CDS" : 59,
+	"CERT" : 37,
+	"DHCID" : 49,
+	"DLV" : 32769,
+	"DNAME" : 39,
+	"DNSKEY" : 48,
+	"DS" : 43,
+	"HIP" : 55,
+	"IPSECKEY" : 45,
+	"KEY" : 25,
+	"KX" : 36,
+	"LOC" : 29,
+	"NAPTR" : 35,
+	"NSEC" : 47,
+	"NSEC3" : 50,
+	"NSEC3PARAM" : 51,
+	"OPENPGPKEY" : 61,
+	"RRSIG" : 46,
+	"RP" : 17,
+	"SIG" : 24,
+	"SRV" : 33,
+	"SSHFP" : 44,
+	"TA" : 32768,
+	"TKEY" : 249,
+	"TLSA" : 52,
+	"TSIG" : 250,
+	"URI" : 256,
+	"OPT": 41,
+	"*": 255
+}
\ No newline at end of file
diff --git a/lib/node-dns-sd/lib/dns-sd.js b/lib/node-dns-sd/lib/dns-sd.js
new file mode 100644
index 00000000..2320cc6f
--- /dev/null
+++ b/lib/node-dns-sd/lib/dns-sd.js
@@ -0,0 +1,586 @@
+/* ------------------------------------------------------------------
+* node-dns-sd - dns-sd.js
+*
+* Copyright (c) 2018 - 2020, Futomi Hatano, All rights reserved.
+* Released under the MIT license
+* Date: 2020-09-30
+* ---------------------------------------------------------------- */
+'use strict';
+const mDgram = require('dgram');
+const mOs = require('os');
+const mDnsSdParser = require('./dns-sd-parser.js');
+const mDnsSdComposer = require('./dns-sd-composer.js');
+
+/* ------------------------------------------------------------------
+* Constructor: DnsSd()
+* ---------------------------------------------------------------- */
+const DnsSd = function () {
+	// Public
+	this.ondata = () => { };
+
+	// Private
+	this._MULTICAST_ADDR = '224.0.0.251';
+	this._UDP_PORT = 5353;
+	this._DISCOVERY_WAIT_DEFAULT = 3; // sec
+
+	this._udp = null;
+	this._source_address_list = [];
+	this._discovered_devices = {};
+	this._is_discovering = false;
+	this._is_monitoring = false;
+	this._is_listening = false;
+	this._onreceive = () => { };
+};
+
+/* ------------------------------------------------------------------
+* Method: discover(params)
+* - params   | Object    | Required |
+*   - name   | String or | Required | Servcie name.(e.g., "_googlecast._tcp.local")
+*            | Array     |          |
+*   - type   | String    | Optional | Query Type (e.g., "PTR"). The default value is "*".
+*   - key    | String    | Optional | "address" (default) or "fqdn".
+*            |           |          | - "address": IP address based discovery
+*            |           |          | - "fqdn": FQDN (service) based discovery
+*   - wait   | Integer   | Optional | Duration of monitoring. The default value is 3 (sec).
+*   - quick  | Boolean   | Optional | If `true`, this method returns immediately after
+*            |           |          | a device was found ignoring the value of the `wait`.
+*            |           |          | The default value is `false`.
+*   - filter | String or | Optional | If specified as a string, this method discovers only
+*            | Function  |          | devices which the string is found in the `fqdn`,
+*            |           |          | `address`, `modelName` or `familyName`.
+*            |           |          | If specified as a function, this method discovers 
+*            |           |          | only devices for which the function returns `true`. 
+* ---------------------------------------------------------------- */
+DnsSd.prototype.discover = function (params) {
+	let promise = new Promise((resolve, reject) => {
+		if (this._is_discovering === true) {
+			reject(new Error('The discovery process is running.'));
+			return;
+		}
+		// Check the parameters
+		let res = this._checkDiscoveryParameters(params);
+		if (res['error']) {
+			reject(res['error']);
+			return;
+		}
+		let device_list = [];
+		this._startListening().then(() => {
+			return this._startDiscovery(res['params']);
+		}).then(() => {
+			for (let addr in this._discovered_devices) {
+				let device = this._discovered_devices[addr];
+				device_list.push(device);
+			}
+			this._stopDiscovery().then(() => {
+				resolve(device_list);
+			});
+		}).catch((error) => {
+			this._stopDiscovery().then(() => {
+				reject(error);
+			});
+		});
+	});
+	return promise;
+};
+
+DnsSd.prototype._createDeviceObject = function (packet) {
+	let o = {};
+
+	let trecs = {};
+	['answers', 'authorities', 'additionals'].forEach((k) => {
+		packet[k].forEach((r) => {
+			let type = r['type'];
+			if (!trecs[type]) {
+				trecs[type] = [];
+			}
+			trecs[type].push(r);
+		});
+	});
+
+	o['address'] = null;
+	if (trecs['A']) {
+		o['address'] = trecs['A'][0]['rdata'];
+	}
+	if (!o['address']) {
+		o['address'] = packet['address'];
+	}
+
+	o['fqdn'] = null;
+	let hostname = null;
+	if (trecs['PTR']) {
+		let rec = trecs['PTR'][0];
+		o['fqdn'] = rec['rdata'];
+	}
+
+	o['modelName'] = null;
+	o['familyName'] = null;
+	if (trecs['TXT'] && trecs['TXT'][0] && trecs['TXT'][0]['rdata']) {
+		let r = trecs['TXT'][0];
+		let d = r['rdata'] || {};
+		let name = r['name'] || '';
+		if (/Apple TV/.test(name)) {
+			o['modelName'] = 'Apple TV';
+			if (trecs['TXT']) {
+				for (let i = 0; i < trecs['TXT'].length; i++) {
+					let r = trecs['TXT'][i];
+					if ((/_device-info/).test(r['name']) && r['rdata'] && r['rdata']['model']) {
+						o['modelName'] = 'Apple TV ' + r['rdata']['model'];
+						break;
+					}
+				}
+			}
+		} else if (/_googlecast/.test(name)) {
+			o['modelName'] = d['md'] || null;
+			o['familyName'] = d['fn'] || null;
+		} else if (/Philips hue/.test(name)) {
+			o['modelName'] = 'Philips hue';
+			if (d['md']) {
+				o['modelName'] += ' ' + d['md'];
+			}
+		} else if (/Canon/.test(name)) {
+			o['modelName'] = d['ty'] || null;
+		}
+	}
+	if (!o['modelName']) {
+		if (trecs['A'] && trecs['A'][0]) {
+			let r = trecs['A'][0];
+			let name = r['name'];
+			if (/Apple\-TV/.test(name)) {
+				o['modelName'] = 'Apple TV';
+			} else if (/iPad/.test(name)) {
+				o['modelName'] = 'iPad';
+			}
+		}
+	}
+
+	if (!o['modelName']) {
+		if (o['fqdn']) {
+			let hostname = (o['fqdn'].split('.')).shift();
+			if (hostname && / /.test(hostname)) {
+				o['modelName'] = hostname;
+			}
+		}
+	}
+
+	o['service'] = null;
+	if (trecs['SRV']) {
+		let rec = trecs['SRV'][0];
+		let name_parts = rec['name'].split('.');
+		name_parts.reverse();
+		o['service'] = {
+			port: rec['rdata']['port'],
+			protocol: name_parts[1].replace(/^_/, ''),
+			type: name_parts[2].replace(/^_/, '')
+		};
+	}
+
+	o['packet'] = packet;
+	return o;
+};
+
+DnsSd.prototype._checkDiscoveryParameters = function (params) {
+	let p = {};
+	if (params) {
+		if (typeof (params) !== 'object') {
+			return { error: new Error('The argument `params` is invalid.') };
+		}
+	} else {
+		return { error: new Error('The argument `params` is required.') };
+	}
+
+	if ('name' in params) {
+		let v = params['name'];
+		if (typeof (v) === 'string') {
+			if (v === '') {
+				return { error: new Error('The `name` must be an non-empty string.') };
+			}
+			p['name'] = [v];
+		} else if (Array.isArray(v)) {
+			if (v.length === 0) {
+				return { error: new Error('The `name` must be a non-empty array.') };
+			} else if (v.length > 255) {
+				return { error: new Error('The `name` can include up to 255 elements.') };
+			}
+			let err = null;
+			let list = [];
+			for (let i = 0; i < v.length; i++) {
+				if (typeof (v[i]) === 'string' && v[i] !== '') {
+					list.push(v[i]);
+				} else {
+					err = new Error('The `name` must be an Array object including non-empty strings.');
+					break;
+				}
+			}
+			if (err) {
+				return { error: err };
+			}
+			p['name'] = list;
+		} else {
+			return { error: new Error('The `name` must be a string or an Array object.') };
+		}
+	} else {
+		return { error: new Error('The `name` is required.') };
+	}
+
+
+	if ('type' in params) {
+		let v = params['type'];
+		if (typeof (v) !== 'string' || !(/^[a-zA-Z0-9]{1,10}$/.test(v) || v === '*')) {
+			return { error: new Error('The `type` is invalid.') };
+		}
+		p['type'] = v.toUpperCase();
+	}
+
+	if ('key' in params) {
+		let v = params['key'];
+		if (typeof (v) !== 'string' || !/^(address|fqdn)$/.test(v)) {
+			return { error: new Error('The `key` is invalid.') };
+		}
+		if (!v) {
+			v = 'address';
+		}
+		p['key'] = v;
+	}
+
+	if ('wait' in params) {
+		let v = params['wait'];
+		if (typeof (v) !== 'number' || v <= 0 || v % 1 !== 0) {
+			return { error: new Error('The `wait` is invalid.') };
+		}
+		p['wait'] = v;
+	}
+
+	if ('quick' in params) {
+		let v = params['quick'];
+		if (typeof (v) !== 'boolean') {
+			return { error: new Error('The `quick` must be a boolean.') };
+		}
+		p['quick'] = v;
+	} else {
+		p['quick'] = false;
+	}
+
+	if (`filter` in params) {
+		let v = params['filter'];
+		if (typeof (v) !== 'string' && typeof (v) !== 'function') {
+			return { error: new Error('The `filter` must be a string.') };
+		}
+		if (v) {
+			p['filter'] = v;
+		}
+	}
+
+	return { params: p };
+};
+
+DnsSd.prototype._startDiscovery = function (params) {
+	let promise = new Promise((resolve, reject) => {
+		this._discovered_devices = {};
+		this._is_discovering = true;
+		let wait = (params && params['wait']) ? params['wait'] : this._DISCOVERY_WAIT_DEFAULT;
+		// Create a request packet
+		let buf = mDnsSdComposer.compose({
+			name: params['name'],
+			type: params['type']
+		});
+
+		// Timer
+		let send_timer = null;
+		let wait_timer = null;
+
+		let clearTimer = () => {
+			if (send_timer) {
+				clearTimeout(send_timer);
+				send_timer = null;
+			}
+			if (wait_timer) {
+				clearTimeout(wait_timer);
+				wait_timer = null;
+			}
+			this._onreceive = () => { };
+		};
+
+		wait_timer = setTimeout(() => {
+			clearTimer();
+			resolve();
+		}, wait * 1000);
+
+		let quick = params['quick'];
+		let key = params['key'];
+		if (!key) {
+			key = 'address';
+		}
+		this._onreceive = (addr, packet) => {
+			if (!this._isTargettedDevice(packet, params['name'])) {
+				return;
+			}
+			let device = this._createDeviceObject(packet);
+			if (!this._evaluateDeviceFilter(device, params['filter'])) {
+				return;
+			}
+			if (key === 'fqdn') {
+				let fqdn = device['fqdn'];
+				this._discovered_devices[fqdn] = device;
+			} else {
+				this._discovered_devices[addr] = device;
+			}
+			if (quick) {
+				clearTimer();
+				resolve();
+			}
+		};
+
+		// Send a packet
+		let send_num = 0;
+		let sendQueryPacket = () => {
+			this._udp.send(buf, 0, buf.length, this._UDP_PORT, this._MULTICAST_ADDR, (error, bytes) => {
+				if (error) {
+					clearTimer();
+					reject(error);
+				} else {
+					send_num++;
+					if (send_num < 3) {
+						send_timer = setTimeout(() => {
+							sendQueryPacket();
+						}, 1000);
+					} else {
+						send_timer = null;
+					}
+				}
+			});
+		};
+		sendQueryPacket();
+	});
+	return promise;
+};
+
+DnsSd.prototype._isTargettedDevice = function (packet, name_list) {
+	let hit = false;
+	packet['answers'].forEach((ans) => {
+		let name = ans['name'];
+		if (name && name_list.indexOf(name) >= 0) {
+			hit = true;
+		}
+	});
+	return hit;
+};
+
+DnsSd.prototype._evaluateDeviceFilter = function (device, filter) {
+	if (filter) {
+		let filter_type = typeof (filter);
+		if (filter_type === 'string') {
+			return this._evaluateDeviceFilterString(device, filter);
+		} else if (filter_type === 'function') {
+			return this._evaluateDeviceFilterFunction(device, filter);
+		} else {
+			return false;
+		}
+	} else {
+		return true;
+	}
+};
+
+DnsSd.prototype._evaluateDeviceFilterString = function (device, filter) {
+	if (device['fqdn'] && device['fqdn'].indexOf(filter) >= 0) {
+		return true;
+	}
+	if (device['address'] && device['address'].indexOf(filter) >= 0) {
+		return true;
+	}
+	if (device['modelName'] && device['modelName'].indexOf(filter) >= 0) {
+		return true;
+	}
+	if (device['familyName'] && device['familyName'].indexOf(filter) >= 0) {
+		return true;
+	}
+	return false;
+};
+
+DnsSd.prototype._evaluateDeviceFilterFunction = function (device, filter) {
+	let res = false;
+	try {
+		res = filter(device);
+	} catch (e) { }
+	res = res ? true : false;
+	return res;
+};
+
+DnsSd.prototype._stopDiscovery = function () {
+	let promise = new Promise((resolve, reject) => {
+		this._discovered_devices = {};
+		this._is_discovering = false;
+		this._stopListening().then(() => {
+			resolve();
+		}).catch((error) => {
+			resolve();
+		});
+	});
+	return promise;
+};
+
+DnsSd.prototype._addMembership = function () {
+	this._source_address_list.forEach((netif) => {
+		try {
+			this._udp.addMembership(this._MULTICAST_ADDR, netif);
+		} catch(e) {
+			console.log(`Catching error on address already in use: ${JSON.stringify(e)}`);
+		}
+	});
+};
+
+DnsSd.prototype._dropMembership = function () {
+	this._source_address_list.forEach((netif) => {
+		try {
+			this._udp.dropMembership(this._MULTICAST_ADDR, netif);
+		} catch(e) {
+			console.log(`Catching error on dropMembership: ${JSON.stringify(e)}`);
+		}
+	});
+};
+
+DnsSd.prototype._getSourceAddressList = function () {
+	let list = [];
+	let netifs = mOs.networkInterfaces();
+	for (let dev in netifs) {
+		netifs[dev].forEach((info) => {
+			if (info.family === 'IPv4' && info.internal === false) {
+				let m = info.address.match(/^(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})/);
+				if (m) {
+					list.push(m[1]);
+				}
+			}
+		});
+	}
+	return list;
+};
+
+/* ------------------------------------------------------------------
+* Method: startMonitoring()
+* ---------------------------------------------------------------- */
+DnsSd.prototype.startMonitoring = function () {
+	let promise = new Promise((resolve, reject) => {
+		if (this._is_monitoring === true) {
+			resolve();
+			return;
+		}
+		this._startListening().then(() => {
+			this._is_monitoring = true;
+			resolve();
+		}).catch((error) => {
+			this._is_monitoring = false;
+			this._stopListening().then(() => {
+				reject(error);
+			});
+		});
+	});
+	return promise;
+};
+
+/* ------------------------------------------------------------------
+* Method: stopMonitoring()
+* ---------------------------------------------------------------- */
+DnsSd.prototype.stopMonitoring = function () {
+	let promise = new Promise((resolve, reject) => {
+		this._is_monitoring = false;
+		this._stopListening().then(() => {
+			resolve();
+		}).catch((error) => {
+			resolve();
+		});
+	});
+	return promise;
+};
+
+DnsSd.prototype._startListening = function () {
+	let promise = new Promise((resolve, reject) => {
+		if (this._is_listening === true) {
+			resolve();
+			return;
+		}
+		// Get the source IP address
+		this._source_address_list = this._getSourceAddressList();
+		// Set up a UDP tranceiver
+		this._udp = mDgram.createSocket({
+			type: 'udp4',
+			reuseAddr: true
+		});
+		this._udp.once('error', (error) => {
+			this._is_listening = false;
+			reject(error);
+			return;
+		});
+		this._udp.once('listening', () => {
+			this._udp.setMulticastLoopback(false);
+			this._addMembership();
+			this._is_listening = true;
+			resolve();
+			return;
+		});
+		this._udp.on('message', (buf, rinfo) => {
+			this._receivePacket(buf, rinfo);
+		});
+		this._udp.bind({ port: this._UDP_PORT }, () => {
+			this._udp.removeAllListeners('error');
+		});
+	});
+	return promise;
+};
+
+DnsSd.prototype._stopListening = function () {
+	let promise = new Promise((resolve, reject) => {
+		this._dropMembership();
+		if (this._is_discovering || this._is_monitoring) {
+			resolve();
+		} else {
+			let cleanObj = () => {
+				if (this._udp) {
+					this._udp.unref();
+					this._udp = null;
+				}
+				this._is_listening = false;
+				resolve();
+			};
+			if (this._udp) {
+				this._udp.removeAllListeners('message');
+				this._udp.removeAllListeners('error');
+				this._udp.removeAllListeners('listening');
+				this._udp.close(() => {
+					cleanObj();
+				});
+			} else {
+				cleanObj();
+			}
+		}
+	});
+	return promise;
+};
+
+DnsSd.prototype._receivePacket = function (buf, rinfo) {
+	let p = mDnsSdParser.parse(buf);
+	if (!p) {
+		return;
+	}
+	p['address'] = rinfo.address;
+	if (this._is_discovering) {
+		if (this._isAnswerPacket(p, rinfo.address)) {
+			this._onreceive(rinfo.address, p);
+		}
+	}
+	if (this._is_monitoring) {
+		if (typeof (this.ondata) === 'function') {
+			this.ondata(p);
+		}
+	}
+};
+
+DnsSd.prototype._isAnswerPacket = function (p, address) {
+	if (this._source_address_list.indexOf(address) >= 0) {
+		return false;
+	}
+	if (!(p['header']['qr'] === 1 && p['header']['op'] === 0)) {
+		return false;
+	}
+	return true;
+};
+
+module.exports = new DnsSd();
diff --git a/lib/node-dns-sd/package.json b/lib/node-dns-sd/package.json
new file mode 100644
index 00000000..54ca2f13
--- /dev/null
+++ b/lib/node-dns-sd/package.json
@@ -0,0 +1,62 @@
+{
+  "_from": "node-dns-sd",
+  "_id": "node-dns-sd@0.4.2",
+  "_inBundle": false,
+  "_integrity": "sha512-fZvDqy19zyaiSXajmRjwue1VWLrJcy8bTV/LJVtAx8DeEFVlXRBMyZknW+q6CEfiW8Y4MQDDKh9x5wF32BHAHQ==",
+  "_location": "/node-dns-sd",
+  "_phantomChildren": {},
+  "_requested": {
+    "type": "tag",
+    "registry": true,
+    "raw": "node-dns-sd",
+    "name": "node-dns-sd",
+    "escapedName": "node-dns-sd",
+    "rawSpec": "",
+    "saveSpec": null,
+    "fetchSpec": "latest"
+  },
+  "_requiredBy": [
+    "#USER",
+    "/"
+  ],
+  "_resolved": "https://registry.npmjs.org/node-dns-sd/-/node-dns-sd-0.4.2.tgz",
+  "_shasum": "b72ec7a7323d0706b09fbfa8a7b90f9f4b66e32e",
+  "_spec": "node-dns-sd",
+  "_where": "/Users/benpotter1991/Packages/homebridge-ewelink",
+  "author": {
+    "name": "Futomi Hatano",
+    "email": "futomi.hatano@gmail.com",
+    "url": "https://github.com/futomi"
+  },
+  "bugs": {
+    "url": "https://github.com/futomi/node-dns-sd/issues"
+  },
+  "bundleDependencies": false,
+  "deprecated": false,
+  "description": "The node-dns-sd is a Node.js module which is a pure javascript implementation of mDNS/DNS-SD (Apple Bonjour) browser and packet parser. It allows you to discover IPv4 addresses in the local network specifying a service name such as `_http._tcp.local`. Besides, it allows you to monitor mDNS/DNS-SD packets.",
+  "directories": {
+    "lib": "./lib"
+  },
+  "files": [
+    "lib"
+  ],
+  "homepage": "https://github.com/futomi",
+  "keywords": [
+    "DNS-SD",
+    "mDNS",
+    "DNS-Based Service Discovery",
+    "Multicast DNS",
+    "Bonjour"
+  ],
+  "license": "MIT",
+  "main": "./lib/dns-sd.js",
+  "name": "node-dns-sd",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/futomi/node-dns-sd.git"
+  },
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "version": "0.4.2"
+}
diff --git a/package-lock.json b/package-lock.json
index f90afe05..05d320e1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -170,11 +170,6 @@
         "has-symbols": "^1.0.2"
       }
     },
-    "node-dns-sd": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/node-dns-sd/-/node-dns-sd-0.4.2.tgz",
-      "integrity": "sha512-fZvDqy19zyaiSXajmRjwue1VWLrJcy8bTV/LJVtAx8DeEFVlXRBMyZknW+q6CEfiW8Y4MQDDKh9x5wF32BHAHQ=="
-    },
     "node-persist": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/node-persist/-/node-persist-3.1.0.tgz",
diff --git a/package.json b/package.json
index 90e9345a..71276070 100644
--- a/package.json
+++ b/package.json
@@ -50,7 +50,6 @@
   "dependencies": {
     "@homebridge/plugin-ui-utils": "^0.0.19",
     "axios": "^0.21.1",
-    "node-dns-sd": "^0.4.2",
     "node-persist": "^3.1.0",
     "p-queue": "^6.6.2",
     "websocket-as-promised": "^2.0.1",
@@ -58,5 +57,10 @@
   },
   "prettier": {
     "printWidth": 100
+  },
+  "standard": {
+    "ignore": [
+      "/lib/node-dns-sd/"
+    ]
   }
 }

From e8cf098dcf2fe1b15efe47aa776bd6c0b60aff29 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 2 Jul 2021 18:35:48 +0100
Subject: [PATCH 2442/3183] 7.0.0-beta.4

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 05d320e1..2ec9cd03 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "7.0.0-beta.3",
+  "version": "7.0.0-beta.4",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 71276070..08e7482e 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "7.0.0-beta.3",
+  "version": "7.0.0-beta.4",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From aa581a71214ae1ff9518d3c3f40f27e64d3d76ee Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 3 Jul 2021 09:42:40 +0100
Subject: [PATCH 2443/3183] don't setup dualr3 motor mode if not calibrated

---
 lib/index.js         | 10 +++++++++-
 lib/utils/lang-en.js |  3 ++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/lib/index.js b/lib/index.js
index 39b011ad..fabcf895 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -719,6 +719,14 @@ class eWeLinkPlatform {
         /*************************
         BLINDS [DUALR3 MOTOR MODE]
         *************************/
+        // Check the device has been calibrated
+        if (device.params.calibState === 0) {
+          if (devicesInHB.has(uuid)) {
+            this.removeAccessory(devicesInHB.get(uuid))
+          }
+          this.log.warn('[%s] %s.', device.name, this.lang.dualr3NoCalib)
+          return
+        }
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/motor'))(this, accessory)
         /************************/
@@ -729,7 +737,7 @@ class eWeLinkPlatform {
         if (devicesInHB.has(uuid)) {
           this.removeAccessory(devicesInHB.get(uuid))
         }
-        this.log.warn('[%s] %s.', device.name, this.lang.noDualMeter)
+        this.log.warn('[%s] %s.', device.name, this.lang.dualr3NoMeter)
         return
       } else if (this.consts.devices.curtain.includes(uiid)) {
         /****************************
diff --git a/lib/utils/lang-en.js b/lib/utils/lang-en.js
index e8adc9e4..ca97d129 100644
--- a/lib/utils/lang-en.js
+++ b/lib/utils/lang-en.js
@@ -65,6 +65,8 @@ module.exports = {
   disabling: 'Disabling plugin',
   doorClosed: 'closed',
   doorOpen: 'open',
+  dualr3NoCalib: 'must be calibrated to work in motor mode',
+  dualr3NoMeter: 'is not supported in meter mode',
   errGetDevice: 'An error occurred during http getDevice()',
   errGetDevices: 'An error occurred during http getDevices()',
   errGetHost: 'An error occurred during ws getHost()',
@@ -98,7 +100,6 @@ module.exports = {
   newIP: 'changed IP address to',
   newRegionRec: 'New HTTP API host received',
   noAuthRec: 'No auth token received',
-  noDualMeter: 'is not supported in meter mode',
   noGarageForOD: 'No corresponding garage door accessory found',
   noRegionRec: 'No valid region received',
   noWSHost: 'Server did not respond with a web socket host',

From 63accd71249443a745ea209a41014ba34de37ea0 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 3 Jul 2021 09:43:55 +0100
Subject: [PATCH 2444/3183] multiDevice device model opt + allow type change
 for dualr3 motor

---
 config.schema.json     | 65 +++++++++++++++++++++++++++++++---
 lib/device/motor.js    | 80 +++++++++++++++++++++++++++++++++---------
 lib/index.js           |  4 ++-
 lib/utils/constants.js |  3 ++
 4 files changed, 131 insertions(+), 21 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index a7095c19..f05e3f0e 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -176,6 +176,33 @@
               "type": "string",
               "title": "Device ID"
             },
+            "deviceModel": {
+              "type": "string",
+              "title": "Device Model",
+              "description": "Setting this hides and shows the applicable options for this device type below.",
+              "oneOf": [
+                {
+                  "title": "Sonoff DUAL/R2",
+                  "enum": ["dual_dualr2"]
+                },
+                {
+                  "title": "Sonoff DUALR3 (Switch Mode)",
+                  "enum": ["dualr3_switch"]
+                },
+                {
+                  "title": "Sonoff DUALR3 (Motor Mode)",
+                  "enum": ["dualr3_motor"]
+                },
+                {
+                  "title": "Sonoff 4CH/PRO/R2/R3",
+                  "enum": ["4ch"]
+                },
+                {
+                  "title": "Sonoff T1/T2/T3/TX-2C/3C/4C",
+                  "enum": ["t1_t2_t3_tx"]
+                }
+              ]
+            },
             "label": {
               "title": "Label",
               "type": "string",
@@ -184,22 +211,50 @@
             "showAsOutlet": {
               "type": "boolean",
               "title": "Show As Outlets",
-              "description": "If true, this accessory will show as outlets in HomeKit instead of switches."
+              "description": "If true, this accessory will show as outlets in HomeKit instead of switches.",
+              "condition": {
+                "functionBody": "return (model.multiDevices[arrayIndices] && ['dual_dualr2', 'dualr3_switch', '4ch', 't1_t2_t3_tx'].includes(model.multiDevices[arrayIndices].deviceModel));"
+              }
+            },
+            "showAsType": {
+              "type": "string",
+              "title": "DUALR3 Accessory Type",
+              "description": "Select the accessory type to show in HomeKit.",
+              "oneOf": [
+                {
+                  "title": "Window Covering (Default)",
+                  "enum": ["blind"]
+                },
+                {
+                  "title": "Door",
+                  "enum": ["door"]
+                },
+                {
+                  "title": "Window",
+                  "enum": ["window"]
+                }
+              ],
+              "condition": {
+                "functionBody": "return (model.multiDevices[arrayIndices] && ['dualr3_motor'].includes(model.multiDevices[arrayIndices].deviceModel));"
+              }
             },
             "inUsePowerThreshold": {
               "type": "number",
               "title": "Outlet 'In Use' Threshold",
-              "description": "Applies to DUALR3 devices. HomeKit will set the 'In Use' status of outlet devices to true when the wattage is above this number. Must be 0 or more.",
+              "description": "HomeKit will set the 'In Use' status of outlet devices to true when the wattage is above this number. Must be 0 or more.",
               "placeholder": 0,
               "minimum": 0,
               "condition": {
-                "functionBody": "return (model.multiDevices[arrayIndices] && model.multiDevices[arrayIndices].showAsOutlet);"
+                "functionBody": "return (model.multiDevices[arrayIndices] && model.multiDevices[arrayIndices].showAsOutlet) && ['dualr3_switch'].includes(model.multiDevices[arrayIndices].deviceModel);"
               }
             },
             "hideChannels": {
               "type": "string",
               "title": "Hide Channels",
-              "description": "A comma separated list of channels to hide for this device. For example '0' or '0,1,2'."
+              "description": "A comma separated list of channels to hide for this device. For example '0' or '0,1,2'.",
+              "condition": {
+                "functionBody": "return (model.multiDevices[arrayIndices] && ['dual_dualr2', 'dualr3_switch', '4ch', 't1_t2_t3_tx'].includes(model.multiDevices[arrayIndices].deviceModel));"
+              }
             },
             "ipAddress": {
               "type": "string",
@@ -1035,8 +1090,10 @@
           "type": "fieldset",
           "items": [
             "multiDevices[].deviceId",
+            "multiDevices[].deviceModel",
             "multiDevices[].label",
             "multiDevices[].showAsOutlet",
+            "multiDevices[].showAsType",
             "multiDevices[].inUsePowerThreshold",
             "multiDevices[].hideChannels",
             "multiDevices[].ipAddress",
diff --git a/lib/device/motor.js b/lib/device/motor.js
index 72e639ef..453e5bba 100644
--- a/lib/device/motor.js
+++ b/lib/device/motor.js
@@ -31,6 +31,11 @@ module.exports = class deviceMotor {
 
     // Set up custom variables for this device type
     const deviceConf = platform.multiDevices[accessory.context.eweDeviceId]
+    const allowed = ['blind', 'door', 'window']
+    const showAsType =
+      deviceConf && deviceConf.showAsType && allowed.includes(deviceConf.showAsType)
+        ? deviceConf.showAsType
+        : 'blind'
 
     // Set the correct logging variables for this accessory
     this.enableLogging = !platform.config.disableDeviceLogging
@@ -53,9 +58,37 @@ module.exports = class deviceMotor {
     }
 
     // Add the window covering service if it doesn't already exist
-    this.service =
-      this.accessory.getService(this.hapServ.WindowCovering) ||
-      this.accessory.addService(this.hapServ.WindowCovering)
+    let service
+    switch (showAsType) {
+      case 'door':
+        service = this.hapServ.Door
+        if (this.accessory.getService(this.hapServ.Window)) {
+          this.accessory.removeService(this.accessory.getService(this.hapServ.Window))
+        }
+        if (this.accessory.getService(this.hapServ.WindowCovering)) {
+          this.accessory.removeService(this.accessory.getService(this.hapServ.WindowCovering))
+        }
+        break
+      case 'window':
+        service = this.hapServ.Window
+        if (this.accessory.getService(this.hapServ.Door)) {
+          this.accessory.removeService(this.accessory.getService(this.hapServ.Door))
+        }
+        if (this.accessory.getService(this.hapServ.WindowCovering)) {
+          this.accessory.removeService(this.accessory.getService(this.hapServ.WindowCovering))
+        }
+        break
+      default:
+        service = this.hapServ.WindowCovering
+        if (this.accessory.getService(this.hapServ.Door)) {
+          this.accessory.removeService(this.accessory.getService(this.hapServ.Door))
+        }
+        if (this.accessory.getService(this.hapServ.Window)) {
+          this.accessory.removeService(this.accessory.getService(this.hapServ.Window))
+        }
+        break
+    }
+    this.service = this.accessory.getService(service) || this.accessory.addService(service)
 
     // Add Eve power characteristics
     if (!this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
@@ -104,7 +137,8 @@ module.exports = class deviceMotor {
 
     // Output the customised options to the log
     const opts = JSON.stringify({
-      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable'
+      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
+      showAsType: showAsType
     })
     this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
@@ -124,15 +158,15 @@ module.exports = class deviceMotor {
       }
       const params = { location: value }
       await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.cachePos = value
+      this.cacheTarg = value
       if (this.enableLogging) {
-        this.log('[%s] %s [%s%].', this.name, this.lang.curPos, this.cachePos)
+        this.log('[%s] %s [%s%].', this.name, this.lang.curTarg, this.cacheTarg)
       }
     } catch (err) {
       // Catch any errors and let the platform display them
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
-        this.service.updateCharacteristic(this.hapChar.TargetPosition, this.cachePos)
+        this.service.updateCharacteristic(this.hapChar.TargetPosition, this.cacheTarg)
       }, 2000)
       throw new this.hapErr(-70402)
     }
@@ -154,21 +188,35 @@ module.exports = class deviceMotor {
 
   async externalUpdate (params) {
     try {
-      if (
-        this.funcs.hasProperty(params, 'location') &&
-        this.funcs.hasProperty(params, 'currLocation') &&
-        params.location === params.currLocation
-      ) {
-        if (this.cachePos !== params.location) {
-          this.cachePos = params.location
-          this.service.updateCharacteristic(this.hapChar.TargetPosition, this.cachePos)
+      // currLocation is the current position of the motor
+      if (this.funcs.hasProperty(params, 'currLocation')) {
+        if (params.currLocation !== this.cachePos) {
+          this.cachePos = params.currLocation
           this.service.updateCharacteristic(this.hapChar.CurrentPosition, this.cachePos)
-          this.service.updateCharacteristic(this.hapChar.PositionState, 2)
           if (this.enableLogging) {
             this.log('[%s] %s [%s%].', this.name, this.lang.curPos, this.cachePos)
           }
         }
       }
+
+      // location is the target position of the motor
+      if (this.funcs.hasProperty(params, 'location')) {
+        if (params.location !== this.cacheTarg) {
+          this.cacheTarg = params.location
+          this.service.updateCharacteristic(this.hapChar.TargetPosition, this.cacheTarg)
+          if (this.enableLogging) {
+            this.log('[%s] %s [%s%].', this.name, this.lang.curTarg, this.cacheTarg)
+          }
+        }
+      }
+
+      // If the two are equal then the motor must have stopped at this position
+      if (this.cacheTarg === this.cachePos) {
+        // PositionState 2 === STOPPED
+        this.service.updateCharacteristic(this.hapChar.PositionState, 2)
+      }
+
+      // Update power information if given
       let logger = false
       let power
       let voltage
diff --git a/lib/index.js b/lib/index.js
index fabcf895..7ba8a794 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -257,7 +257,8 @@ class eWeLinkPlatform {
                     break
                   }
                   case 'bulbModel':
-                  case 'overrideLogging': {
+                  case 'overrideLogging':
+                  case 'showAsType': {
                     const inSet = this.consts.allowed[k].includes(v)
                     if (typeof v !== 'string' || !inSet) {
                       logIgnore(key + '.' + id + '.' + k)
@@ -267,6 +268,7 @@ class eWeLinkPlatform {
                     break
                   }
                   case 'deviceId':
+                  case 'deviceModel':
                   case 'label':
                     break
                   case 'hideChannels': {
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 48932825..d5814b8f 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -81,8 +81,10 @@ module.exports = {
     singleDevices: ['deviceId', 'label', 'showAsOutlet', 'ipAddress', 'overrideLogging'],
     multiDevices: [
       'deviceId',
+      'deviceModel',
       'label',
       'showAsOutlet',
+      'showAsType',
       'inUsePowerThreshold',
       'hideChannels',
       'ipAddress',
@@ -154,6 +156,7 @@ module.exports = {
     overrideLogging: ['default', 'standard', 'debug', 'disable'],
     obstructs: ['garage', 'garage_eachen'],
     sensors: ['water', 'smoke', 'co', 'co2', 'contact', 'occupancy', 'motion'],
+    showAsType: ['blind', 'door', 'window'],
     bulbModel: ['bulbB02BA60', 'bulbB02FA60', 'bulbB02FST64']
   },
 

From 2cb99c0f2eac49ff0a22ce30e88d1bcd3c751dc7 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 3 Jul 2021 09:45:58 +0100
Subject: [PATCH 2445/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e3468d8d..f6172512 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,11 +21,13 @@ All notable changes to this homebridge-ewelink will be documented in this file.
   - An accessory warning if a cloud-device is reported offline
 - **No Response Status**
   - Added a global setting `offlineAsNoResponse` to mark cloud-offline accessories as 'No Response' in HomeKit
-- **Single/Multi-Channel Devices**
+- **Single-Channel Devices**
   - Wattage/Voltage/Amp readings (via Eve app) now visible for outlets in Eve app when exposed as `Switch`
+  - Polling via LAN mode to enable constant power attribute updates for POW/R2 devices
+- **Multi-Channel Devices**
   - Wattage/Voltage/Amp readings (via Eve app) now visible for DUALR3 when in motor mode
   - Support for LAN mode control for DUALR3 in motor mode
-  - Polling via LAN mode to enable constant power attribute updates for POW/R2 devices
+  - Option to expose a DUALR3 in motor mode as a `WindowCovering`, `Window` or `Door` accessory type
 - **iFan Devices**
   - Support for LAN mode control
   - Added option to specify a manual IP

From e57392adaa0ca559a14365cc193db10eb395af3d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 3 Jul 2021 09:51:16 +0100
Subject: [PATCH 2446/3183] add discarded devices to ignore if not setup
 properly

---
 lib/index.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/index.js b/lib/index.js
index 7ba8a794..c2a31e81 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -727,6 +727,7 @@ class eWeLinkPlatform {
             this.removeAccessory(devicesInHB.get(uuid))
           }
           this.log.warn('[%s] %s.', device.name, this.lang.dualr3NoCalib)
+          this.config.ignoredDevices.push(device.deviceid)
           return
         }
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
@@ -740,6 +741,7 @@ class eWeLinkPlatform {
           this.removeAccessory(devicesInHB.get(uuid))
         }
         this.log.warn('[%s] %s.', device.name, this.lang.dualr3NoMeter)
+        this.config.ignoredDevices.push(device.deviceid)
         return
       } else if (this.consts.devices.curtain.includes(uiid)) {
         /****************************
@@ -1307,6 +1309,7 @@ class eWeLinkPlatform {
         /************
         ZIGBEE BRIDGE
         ************/
+        this.config.ignoredDevices.push(device.deviceid)
         return
         /***********/
       } else if (this.consts.devices.zbSwitchStateless.includes(uiid)) {

From 0affe6d2c030d696c06fb33792b45799d1c1a0e9 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 3 Jul 2021 11:05:31 +0100
Subject: [PATCH 2447/3183] update moving state if controlled externally

---
 lib/device/motor.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/device/motor.js b/lib/device/motor.js
index 453e5bba..60fb0f55 100644
--- a/lib/device/motor.js
+++ b/lib/device/motor.js
@@ -214,6 +214,12 @@ module.exports = class deviceMotor {
       if (this.cacheTarg === this.cachePos) {
         // PositionState 2 === STOPPED
         this.service.updateCharacteristic(this.hapChar.PositionState, 2)
+      } else if (this.cacheTarg > this.cachePos) {
+        // PositionState 1 === INCREASING
+        this.service.updateCharacteristic(this.hapChar.PositionState, 1)
+      } else {
+        // PositionState 0 === DECREASING
+        this.service.updateCharacteristic(this.hapChar.PositionState, 0)
       }
 
       // Update power information if given

From a2392d9ad5c593ae2167b60345b5d37858be12ab Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 3 Jul 2021 11:06:06 +0100
Subject: [PATCH 2448/3183] 7.0.0-beta.5

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 2ec9cd03..3cca8080 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "7.0.0-beta.4",
+  "version": "7.0.0-beta.5",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 08e7482e..f1dd7017 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "7.0.0-beta.4",
+  "version": "7.0.0-beta.5",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 40dc6bda8a24cbc45f12e66be5efd6cf6d748245 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 3 Jul 2021 12:20:51 +0100
Subject: [PATCH 2449/3183] condense config schema to show opts based on model

---
 config.schema.json      | 206 ++++++++++++++++++++++++++++++++++------
 lib/device/light-cct.js |   9 +-
 lib/index.js            |   1 -
 lib/utils/constants.js  |  11 ++-
 4 files changed, 186 insertions(+), 41 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index f05e3f0e..7facd56e 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -199,7 +199,7 @@
                 },
                 {
                   "title": "Sonoff T1/T2/T3/TX-2C/3C/4C",
-                  "enum": ["t1_t2_t3_tx"]
+                  "enum": ["t"]
                 }
               ]
             },
@@ -213,7 +213,7 @@
               "title": "Show As Outlets",
               "description": "If true, this accessory will show as outlets in HomeKit instead of switches.",
               "condition": {
-                "functionBody": "return (model.multiDevices[arrayIndices] && ['dual_dualr2', 'dualr3_switch', '4ch', 't1_t2_t3_tx'].includes(model.multiDevices[arrayIndices].deviceModel));"
+                "functionBody": "return (model.multiDevices[arrayIndices] && ['dual_dualr2', 'dualr3_switch', '4ch', 't'].includes(model.multiDevices[arrayIndices].deviceModel));"
               }
             },
             "showAsType": {
@@ -245,7 +245,7 @@
               "placeholder": 0,
               "minimum": 0,
               "condition": {
-                "functionBody": "return (model.multiDevices[arrayIndices] && model.multiDevices[arrayIndices].showAsOutlet) && ['dualr3_switch'].includes(model.multiDevices[arrayIndices].deviceModel);"
+                "functionBody": "return (model.multiDevices[arrayIndices] && model.multiDevices[arrayIndices].showAsOutlet && ['dualr3_switch'].includes(model.multiDevices[arrayIndices].deviceModel));"
               }
             },
             "hideChannels": {
@@ -253,7 +253,7 @@
               "title": "Hide Channels",
               "description": "A comma separated list of channels to hide for this device. For example '0' or '0,1,2'.",
               "condition": {
-                "functionBody": "return (model.multiDevices[arrayIndices] && ['dual_dualr2', 'dualr3_switch', '4ch', 't1_t2_t3_tx'].includes(model.multiDevices[arrayIndices].deviceModel));"
+                "functionBody": "return (model.multiDevices[arrayIndices] && ['dual_dualr2', 'dualr3_switch', '4ch', 't'].includes(model.multiDevices[arrayIndices].deviceModel));"
               }
             },
             "ipAddress": {
@@ -292,7 +292,7 @@
       },
       "outletDevices": {
         "title": "Outlet Devices",
-        "description": "Applies to outlet devices.",
+        "description": "Applies to single-channel outlet devices.",
         "type": "array",
         "items": {
           "type": "object",
@@ -301,6 +301,29 @@
               "type": "string",
               "title": "Device ID"
             },
+            "deviceModel": {
+              "type": "string",
+              "title": "Device Model",
+              "description": "Setting this hides and shows the applicable options for this device type below.",
+              "oneOf": [
+                {
+                  "title": "Sonoff POW/R2",
+                  "enum": ["pow"]
+                },
+                {
+                  "title": "Sonoff IW100/IW101",
+                  "enum": ["iw"]
+                },
+                {
+                  "title": "Sonoff S20/S26/S31/S55",
+                  "enum": ["s"]
+                },
+                {
+                  "title": "Sonoff Micro",
+                  "enum": ["micro"]
+                }
+              ]
+            },
             "label": {
               "title": "Label",
               "type": "string",
@@ -318,7 +341,7 @@
               "placeholder": 0,
               "minimum": 0,
               "condition": {
-                "functionBody": "return (model.outletDevices[arrayIndices] && !model.outletDevices[arrayIndices].showAsSwitch);"
+                "functionBody": "return (model.outletDevices[arrayIndices] && !model.outletDevices[arrayIndices].showAsSwitch  && ['pow'].includes(model.outletDevices[arrayIndices].deviceModel));"
               }
             },
             "ipAddress": {
@@ -371,22 +394,50 @@
               "type": "string",
               "description": "This setting has no effect except to be a helpful label for identifying which device this is when editing the configuration."
             },
-            "bulbModel": {
+            "deviceModel": {
               "type": "string",
               "title": "Device Model",
-              "description": "If your model is not listed then you do not need to set this.",
+              "description": "Setting this hides and shows the applicable options for this device type below.",
               "oneOf": [
                 {
-                  "title": "B02-B-A60",
+                  "title": "Sonoff D1/R2",
+                  "enum": ["d1"]
+                },
+                {
+                  "title": "Sonoff B1/R2",
+                  "enum": ["b1"]
+                },
+                {
+                  "title": "Sonoff L1/Lite",
+                  "enum": ["l1"]
+                },
+                {
+                  "title": "Sonoff B02-B-A60",
                   "enum": ["bulbB02BA60"]
                 },
                 {
-                  "title": "B02-F-A60",
+                  "title": "Sonoff B05-B-A60",
+                  "enum": ["bulbB05BA60"]
+                },
+                {
+                  "title": "Sonoff B02-F-A60",
                   "enum": ["bulbB02FA60"]
                 },
                 {
-                  "title": "B02-F-ST64",
+                  "title": "Sonoff B02-F-ST64",
                   "enum": ["bulbB02FST64"]
+                },
+                {
+                  "title": "KingArt KING-M4",
+                  "enum": ["king"]
+                },
+                {
+                  "title": "Zigbee Light (Dimmer)",
+                  "enum": ["zl_d"]
+                },
+                {
+                  "title": "Zigbee Light (Dimmer + CCT)",
+                  "enum": ["zl_dc"]
                 }
               ]
             },
@@ -395,21 +446,27 @@
               "type": "number",
               "description": "A minimum step for the brightness slider in the Home app. Must be 1 or more.",
               "placeholder": 1,
-              "minimum": 1
+              "minimum": 1,
+              "condition": {
+                "functionBody": "return (model.lightDevices[arrayIndices] && ['d1', 'l1', 'bulbB02BA60', 'bulbB05BA60', 'bulbB02FA60', 'bulbB02FA60', 'bulbB02FST64', 'king', 'zl_d', 'zl_dc'].includes(model.lightDevices[arrayIndices].deviceModel));"
+              }
             },
             "adaptiveLightingShift": {
               "title": "Adaptive Lighting Shift",
               "type": "number",
               "description": "The mired for each Adaptive Lighting update will be increased by this value, making the light appear warmer. Set to -1 to remove Adaptive Lighting feature. Must be -1 or more.",
               "placeholder": 0,
-              "minimum": -1
+              "minimum": -1,
+              "condition": {
+                "functionBody": "return (model.lightDevices[arrayIndices] && ['l1', 'bulbB02BA60', 'bulbB05BA60', 'bulbB02FA60', 'bulbB02FA60', 'bulbB02FST64', 'zl_dc'].includes(model.lightDevices[arrayIndices].deviceModel));"
+              }
             },
             "ipAddress": {
               "type": "string",
               "title": "IP Address",
               "description": "You can manually set the IP address for this Sonoff D1 if it cannot be discovered by the plugin.",
               "condition": {
-                "functionBody": "return model.mode !== 'wan';"
+                "functionBody": "return (model.mode !== 'wan' && model.lightDevices[arrayIndices] && ['d1'].includes(model.lightDevices[arrayIndices].deviceModel));"
               }
             },
             "overrideLogging": {
@@ -449,6 +506,25 @@
               "type": "string",
               "title": "Device ID"
             },
+            "deviceModel": {
+              "type": "string",
+              "title": "Device Model",
+              "description": "Setting this hides and shows the applicable options for this device type below.",
+              "oneOf": [
+                {
+                  "title": "Sonoff TH10/16",
+                  "enum": ["th"]
+                },
+                {
+                  "title": "Sonoff SC",
+                  "enum": ["sc"]
+                },
+                {
+                  "title": "KKMOON HC-T010-EWF",
+                  "enum": ["hc"]
+                }
+              ]
+            },
             "label": {
               "title": "Label",
               "type": "string",
@@ -457,7 +533,10 @@
             "hideSwitch": {
               "type": "boolean",
               "title": "Hide Switch",
-              "description": "If true, this accessory will hide the TH10/16 switch from HomeKit."
+              "description": "If true, this accessory will hide the TH10/16 switch from HomeKit.",
+              "condition": {
+                "functionBody": "return (model.thDevices[arrayIndices] && ['th'].includes(model.thDevices[arrayIndices].deviceModel));"
+              }
             },
             "offset": {
               "type": "number",
@@ -476,21 +555,27 @@
               "title": "Minimum Target Temperature",
               "description": "Minimum target temperature for TH10/16 heater/cooler simulation to show in HomeKit apps. Must be 0 or more.",
               "placeholder": 10,
-              "minimum": 0
+              "minimum": 0,
+              "condition": {
+                "functionBody": "return (model.thDevices[arrayIndices] && ['th'].includes(model.thDevices[arrayIndices].deviceModel));"
+              }
             },
             "maxTarget": {
               "type": "number",
               "title": "Maximum Target Temperature",
               "description": "Maximum target temperature for TH10/16 heater/cooler simulation to show in HomeKit apps. Must be 1 or more, and greater than the minimum value set above.",
               "placeholder": 30,
-              "minimum": 1
+              "minimum": 1,
+              "condition": {
+                "functionBody": "return (model.thDevices[arrayIndices] && ['th'].includes(model.thDevices[arrayIndices].deviceModel));"
+              }
             },
             "ipAddress": {
               "type": "string",
               "title": "IP Address",
               "description": "You can manually set the IP address for this Sonoff TH10/16 if it cannot be discovered by the plugin.",
               "condition": {
-                "functionBody": "return model.mode !== 'wan';"
+                "functionBody": "return (model.mode !== 'wan' && model.thDevices[arrayIndices] && ['th'].includes(model.thDevices[arrayIndices].deviceModel));"
               }
             },
             "overrideLogging": {
@@ -530,6 +615,17 @@
               "type": "string",
               "title": "Device ID"
             },
+            "deviceModel": {
+              "type": "string",
+              "title": "Device Model",
+              "description": "Setting this hides and shows the applicable options for this device type below.",
+              "oneOf": [
+                {
+                  "title": "Sonoff iFan/02/03",
+                  "enum": ["ifan"]
+                }
+              ]
+            },
             "label": {
               "title": "Label",
               "type": "string",
@@ -538,14 +634,17 @@
             "hideLight": {
               "type": "boolean",
               "title": "Hide Light Switch",
-              "description": "If true, the light switch will be hidden from HomeKit."
+              "description": "If true, the light switch will be hidden from HomeKit.",
+              "condition": {
+                "functionBody": "return (model.fanDevices[arrayIndices] && ['ifan'].includes(model.fanDevices[arrayIndices].deviceModel));"
+              }
             },
             "ipAddress": {
               "type": "string",
               "title": "IP Address",
               "description": "You can manually set the IP address for this device if it cannot be discovered by the plugin.",
               "condition": {
-                "functionBody": "return model.mode !== 'wan';"
+                "functionBody": "return (model.mode !== 'wan' && model.fanDevices[arrayIndices] && ['ifan'].includes(model.fanDevices[arrayIndices].deviceModel));"
               }
             },
             "overrideLogging": {
@@ -585,6 +684,33 @@
               "type": "string",
               "title": "Device ID"
             },
+            "deviceModel": {
+              "type": "string",
+              "title": "Device Model",
+              "description": "Setting this hides and shows the applicable options for this device type below.",
+              "oneOf": [
+                {
+                  "title": "Sonoff DW2-Wifi",
+                  "enum": ["dw"]
+                },
+                {
+                  "title": "Sonoff SNZB-01 Button",
+                  "enum": ["snzb01"]
+                },
+                {
+                  "title": "Sonoff SNZB-02 Temp/Humidity",
+                  "enum": ["snzb02"]
+                },
+                {
+                  "title": "Sonoff SNZB-03 Motion",
+                  "enum": ["snzb03"]
+                },
+                {
+                  "title": "Sonoff SNZB-04 Door/Window",
+                  "enum": ["snzb04"]
+                }
+              ]
+            },
             "label": {
               "title": "Label",
               "type": "string",
@@ -595,36 +721,54 @@
               "title": "Low Battery Threshold",
               "description": "HomeKit will set the low battery status for this device when the battery (if it has one) reaches this percentage level. Must be 5 or more.",
               "placeholder": 25,
-              "minimum": 5
+              "minimum": 5,
+              "condition": {
+                "functionBody": "return (model.sensorDevices[arrayIndices] && ['dw', 'snzb01', 'snzb02', 'snzb03', 'snzb04'].includes(model.sensorDevices[arrayIndices].deviceModel));"
+              }
             },
             "offset": {
               "type": "number",
               "title": "Temperature Offset",
               "description": "You can offset the temperature that the SNZB-02 sensor reads. An offset of 2 means 2 degrees will be added to the recorded temperature. Can be positive or negative and can include a decimal point '.'.",
-              "placeholder": 0
+              "placeholder": 0,
+              "condition": {
+                "functionBody": "return (model.sensorDevices[arrayIndices] && ['snzb02'].includes(model.sensorDevices[arrayIndices].deviceModel));"
+              }
             },
             "humidityOffset": {
               "type": "number",
               "title": "Humidity Offset",
               "description": "You can offset the humidity that the SNZB-02 sensor reads. An offset of 2 means 2% will be added to the recorded relative humidity. Can be positive or negative.",
-              "placeholder": 0
+              "placeholder": 0,
+              "condition": {
+                "functionBody": "return (model.sensorDevices[arrayIndices] && ['snzb02'].includes(model.sensorDevices[arrayIndices].deviceModel));"
+              }
             },
             "hideLongDouble": {
               "type": "boolean",
               "title": "Hide Long & Double Press",
-              "description": "If true, double and long press options will be hidden for this Zigbee Button."
+              "description": "If true, double and long press options will be hidden for this Zigbee Button.",
+              "condition": {
+                "functionBody": "return (model.sensorDevices[arrayIndices] && ['snzb01'].includes(model.sensorDevices[arrayIndices].deviceModel));"
+              }
             },
             "scaleBattery": {
               "type": "boolean",
               "title": "Scale Battery",
-              "description": "If true, the battery reading for this Zigbee Contact Sensor will be multiplied by 10."
+              "description": "If true, the battery reading for this Zigbee Contact Sensor will be multiplied by 10.",
+              "condition": {
+                "functionBody": "return (model.sensorDevices[arrayIndices] && ['snzb04'].includes(model.sensorDevices[arrayIndices].deviceModel));"
+              }
             },
             "sensorTimeDifference": {
               "type": "number",
               "title": "Sensor Lag",
               "description": "An offset in seconds to ignore notifications if the delay between this Zigbee Motion activating or Zigbee Button press and the plugin receiving the notification is greater than this number. Must be 5 or more.",
               "placeholder": 60,
-              "minimum": 5
+              "minimum": 5,
+              "condition": {
+                "functionBody": "return (model.sensorDevices[arrayIndices] && ['snzb01', 'snzb03'].includes(model.sensorDevices[arrayIndices].deviceModel));"
+              }
             },
             "overrideLogging": {
               "type": "string",
@@ -993,7 +1137,7 @@
               "title": "IP Address",
               "description": "You can manually set the IP address for this device if it cannot be discovered by the plugin.",
               "condition": {
-                "functionBody": "return (model.mode !== 'wan' && model.groups[arrayIndices] && !['thermostat', 'cooler', 'humidifier', 'dehumidifier', 'sensor_leak'].includes(model.groups[arrayIndices].type));"
+                "functionBody": "return (model.mode !== 'wan' && model.groups[arrayIndices] && ['blind', 'door', 'garage', 'garage_two', 'garage_four', 'garage_eachen', 'lock', 'purifier', 'sensor', 'switch_valve', 'tap', 'tap_two', 'valve', 'valve_two', 'valve_four', 'window'].includes(model.groups[arrayIndices].type));"
               }
             },
             "overrideLogging": {
@@ -1105,7 +1249,7 @@
     {
       "key": "outletDevices",
       "title": "Outlet Devices",
-      "description": "Applies to outlet devices.",
+      "description": "Applies to single-channel outlet devices.",
       "expandable": true,
       "add": "Add Another Device",
       "type": "array",
@@ -1114,6 +1258,7 @@
           "type": "fieldset",
           "items": [
             "outletDevices[].deviceId",
+            "outletDevices[].deviceModel",
             "outletDevices[].label",
             "outletDevices[].showAsSwitch",
             "outletDevices[].inUsePowerThreshold",
@@ -1135,8 +1280,8 @@
           "type": "fieldset",
           "items": [
             "lightDevices[].deviceId",
+            "lightDevices[].deviceModel",
             "lightDevices[].label",
-            "lightDevices[].bulbModel",
             "lightDevices[].brightnessStep",
             "lightDevices[].adaptiveLightingShift",
             "lightDevices[].ipAddress",
@@ -1157,6 +1302,7 @@
           "type": "fieldset",
           "items": [
             "thDevices[].deviceId",
+            "thDevices[].deviceModel",
             "thDevices[].label",
             "thDevices[].hideSwitch",
             "thDevices[].offset",
@@ -1181,6 +1327,7 @@
           "type": "fieldset",
           "items": [
             "fanDevices[].deviceId",
+            "fanDevices[].deviceModel",
             "fanDevices[].label",
             "fanDevices[].hideLight",
             "fanDevices[].ipAddress",
@@ -1201,6 +1348,7 @@
           "type": "fieldset",
           "items": [
             "sensorDevices[].deviceId",
+            "sensorDevices[].deviceModel",
             "sensorDevices[].label",
             "sensorDevices[].lowBattThreshold",
             "sensorDevices[].offset",
diff --git a/lib/device/light-cct.js b/lib/device/light-cct.js
index 89dfca39..bd497e4a 100644
--- a/lib/device/light-cct.js
+++ b/lib/device/light-cct.js
@@ -22,10 +22,7 @@ module.exports = class deviceLightCCT {
 
     // Set up custom variables for this device type
     const deviceConf = platform.lightDevices[accessory.context.eweDeviceId]
-    this.bulbModel =
-      deviceConf && deviceConf.bulbModel
-        ? deviceConf.bulbModel
-        : platform.consts.defaultValues.bulbModel
+    this.deviceModel = deviceConf && deviceConf.deviceModel ? deviceConf.deviceModel : 'bulbB02FA60'
     this.alShift =
       deviceConf && deviceConf.adaptiveLightingShift
         ? deviceConf.adaptiveLightingShift
@@ -56,7 +53,7 @@ module.exports = class deviceLightCCT {
     }
 
     // Different bulbs have different colour temperature ranges
-    switch (this.bulbModel) {
+    switch (this.deviceModel) {
       case 'bulbB02FST64':
         this.minK = 1800
         this.maxK = 5000
@@ -136,7 +133,7 @@ module.exports = class deviceLightCCT {
     const opts = JSON.stringify({
       adaptiveLightingShift: this.alShift,
       brightnessStep: this.brightStep,
-      bulbModel: this.bulbModel,
+      deviceModel: this.deviceModel,
       logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable'
     })
     this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
diff --git a/lib/index.js b/lib/index.js
index c2a31e81..7a9bca69 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -256,7 +256,6 @@ class eWeLinkPlatform {
                     }
                     break
                   }
-                  case 'bulbModel':
                   case 'overrideLogging':
                   case 'showAsType': {
                     const inSet = this.consts.allowed[k].includes(v)
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index d5814b8f..4d961f38 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -43,7 +43,6 @@ module.exports = {
     operationTime: 100,
     operationTimeDown: 100,
     mode: 'auto',
-    bulbModel: 'bulbB02FA60',
     brightnessStep: 1,
     adaptiveLightingShift: 0,
     overrideLogging: 'default'
@@ -92,6 +91,7 @@ module.exports = {
     ],
     outletDevices: [
       'deviceId',
+      'deviceModel',
       'label',
       'showAsSwitch',
       'inUsePowerThreshold',
@@ -100,8 +100,8 @@ module.exports = {
     ],
     lightDevices: [
       'deviceId',
+      'deviceModel',
       'label',
-      'bulbModel',
       'brightnessStep',
       'adaptiveLightingShift',
       'ipAddress',
@@ -109,6 +109,7 @@ module.exports = {
     ],
     thDevices: [
       'deviceId',
+      'deviceModel',
       'label',
       'hideSwitch',
       'offset',
@@ -118,9 +119,10 @@ module.exports = {
       'ipAddress',
       'overrideLogging'
     ],
-    fanDevices: ['deviceId', 'label', 'hideLight', 'ipAddress', 'overrideLogging'],
+    fanDevices: ['deviceId', 'deviceModel', 'label', 'hideLight', 'ipAddress', 'overrideLogging'],
     sensorDevices: [
       'deviceId',
+      'deviceModel',
       'lowBattThreshold',
       'offset',
       'humidityOffset',
@@ -156,8 +158,7 @@ module.exports = {
     overrideLogging: ['default', 'standard', 'debug', 'disable'],
     obstructs: ['garage', 'garage_eachen'],
     sensors: ['water', 'smoke', 'co', 'co2', 'contact', 'occupancy', 'motion'],
-    showAsType: ['blind', 'door', 'window'],
-    bulbModel: ['bulbB02BA60', 'bulbB02FA60', 'bulbB02FST64']
+    showAsType: ['blind', 'door', 'window']
   },
 
   devices: {

From bfe4a40965a353e055f55c382341672e223fc4d2 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 3 Jul 2021 12:22:03 +0100
Subject: [PATCH 2450/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f6172512..7a75e70e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -60,6 +60,8 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 - **LAN Mode**
   - ⚠️ If you have the plugin in `lan`-only mode then the plugin will remove any accessories that do not support LAN mode
+- **Homebridge UI**
+  - Device configuration options will now hide/show based on the `deviceModel` field
 - **Startup Logging**
   - Accessory configuration options will be logged regardless of logging level
 - **iFan Devices**

From 6d1220a5d69c7ed46d539d46967393243ef460e8 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 3 Jul 2021 12:24:55 +0100
Subject: [PATCH 2451/3183] add leak to config schema

---
 config.schema.json | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 7facd56e..5b177da0 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -708,6 +708,10 @@
                 {
                   "title": "Sonoff SNZB-04 Door/Window",
                   "enum": ["snzb04"]
+                },
+                {
+                  "title": "Zigbee Leak Sensor",
+                  "enum": ["leak"]
                 }
               ]
             },
@@ -723,7 +727,7 @@
               "placeholder": 25,
               "minimum": 5,
               "condition": {
-                "functionBody": "return (model.sensorDevices[arrayIndices] && ['dw', 'snzb01', 'snzb02', 'snzb03', 'snzb04'].includes(model.sensorDevices[arrayIndices].deviceModel));"
+                "functionBody": "return (model.sensorDevices[arrayIndices] && ['dw', 'snzb01', 'snzb02', 'snzb03', 'snzb04', 'leak'].includes(model.sensorDevices[arrayIndices].deviceModel));"
               }
             },
             "offset": {
@@ -763,11 +767,11 @@
             "sensorTimeDifference": {
               "type": "number",
               "title": "Sensor Lag",
-              "description": "An offset in seconds to ignore notifications if the delay between this Zigbee Motion activating or Zigbee Button press and the plugin receiving the notification is greater than this number. Must be 5 or more.",
+              "description": "An offset in seconds to ignore notifications if the delay between this Zigbee Motion/Leak activating or Zigbee Button press and the plugin receiving the notification is greater than this number. Must be 5 or more.",
               "placeholder": 60,
               "minimum": 5,
               "condition": {
-                "functionBody": "return (model.sensorDevices[arrayIndices] && ['snzb01', 'snzb03'].includes(model.sensorDevices[arrayIndices].deviceModel));"
+                "functionBody": "return (model.sensorDevices[arrayIndices] && ['snzb01', 'snzb03', 'leak'].includes(model.sensorDevices[arrayIndices].deviceModel));"
               }
             },
             "overrideLogging": {

From b6a42a055914c49e6808ca93fa5433c6c15beb36 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 3 Jul 2021 12:25:21 +0100
Subject: [PATCH 2452/3183] 7.0.0-beta.6

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 3cca8080..b02da3f1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "7.0.0-beta.5",
+  "version": "7.0.0-beta.6",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index f1dd7017..452544e3 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "7.0.0-beta.5",
+  "version": "7.0.0-beta.6",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From dee116b1cf4581d895401cc75d228c9f3a1aa0cf Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 3 Jul 2021 13:49:03 +0100
Subject: [PATCH 2453/3183] fix schema condition warnings + make more
 interactive

---
 config.schema.json | 308 +++++++++++++++++++++++++++++++--------------
 1 file changed, 211 insertions(+), 97 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 5b177da0..f77614d1 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -119,24 +119,31 @@
           "properties": {
             "deviceId": {
               "type": "string",
-              "title": "Device ID"
+              "title": "Device ID",
+              "description": "Enter the 10 digit eWeLink Device ID to begin."
             },
             "label": {
               "title": "Label",
               "type": "string",
-              "description": "This setting has no effect except to be a helpful label for identifying which device this is when editing the configuration."
+              "description": "This setting has no effect except to be a helpful label for identifying which device this is when editing the configuration.",
+              "condition": {
+                "functionBody": "return (model.singleDevices && model.singleDevices[arrayIndices] && model.singleDevices[arrayIndices].deviceId && model.singleDevices[arrayIndices].deviceId.length === 10);"
+              }
             },
             "showAsOutlet": {
               "type": "boolean",
               "title": "Show As Outlet",
-              "description": "If true, this accessory will show as an outlet in HomeKit instead of a switch."
+              "description": "If true, this accessory will show as an outlet in HomeKit instead of a switch.",
+              "condition": {
+                "functionBody": "return (model.singleDevices && model.singleDevices[arrayIndices] && model.singleDevices[arrayIndices].deviceId && model.singleDevices[arrayIndices].deviceId.length === 10);"
+              }
             },
             "ipAddress": {
               "type": "string",
               "title": "IP Address",
               "description": "You can manually set the IP address for this device if it cannot be discovered by the plugin.",
               "condition": {
-                "functionBody": "return model.mode !== 'wan';"
+                "functionBody": "return (model.mode !== 'wan' && model.singleDevices && model.singleDevices[arrayIndices] && model.singleDevices[arrayIndices].deviceId && model.singleDevices[arrayIndices].deviceId.length === 10);"
               }
             },
             "overrideLogging": {
@@ -160,7 +167,10 @@
                   "title": "Disable All Logging",
                   "enum": ["disable"]
                 }
-              ]
+              ],
+              "condition": {
+                "functionBody": "return (model.singleDevices && model.singleDevices[arrayIndices] && model.singleDevices[arrayIndices].deviceId && model.singleDevices[arrayIndices].deviceId.length === 10);"
+              }
             }
           }
         }
@@ -174,12 +184,13 @@
           "properties": {
             "deviceId": {
               "type": "string",
-              "title": "Device ID"
+              "title": "Device ID",
+              "description": "Enter the 10 digit eWeLink Device ID to begin."
             },
             "deviceModel": {
               "type": "string",
               "title": "Device Model",
-              "description": "Setting this hides and shows the applicable options for this device type below.",
+              "description": "This setting has no effect except showing the relevant options for this model below.",
               "oneOf": [
                 {
                   "title": "Sonoff DUAL/R2",
@@ -201,19 +212,25 @@
                   "title": "Sonoff T1/T2/T3/TX-2C/3C/4C",
                   "enum": ["t"]
                 }
-              ]
+              ],
+              "condition": {
+                "functionBody": "return (model.multiDevices && model.multiDevices[arrayIndices] && model.multiDevices[arrayIndices].deviceId && model.multiDevices[arrayIndices].deviceId.length === 10);"
+              }
             },
             "label": {
               "title": "Label",
               "type": "string",
-              "description": "This setting has no effect except to be a helpful label for identifying which device this is when editing the configuration."
+              "description": "This setting has no effect except to be a helpful label for identifying which device this is when editing the configuration.",
+              "condition": {
+                "functionBody": "return (model.multiDevices && model.multiDevices[arrayIndices] && model.multiDevices[arrayIndices].deviceId && model.multiDevices[arrayIndices].deviceId.length === 10);"
+              }
             },
             "showAsOutlet": {
               "type": "boolean",
               "title": "Show As Outlets",
               "description": "If true, this accessory will show as outlets in HomeKit instead of switches.",
               "condition": {
-                "functionBody": "return (model.multiDevices[arrayIndices] && ['dual_dualr2', 'dualr3_switch', '4ch', 't'].includes(model.multiDevices[arrayIndices].deviceModel));"
+                "functionBody": "return (model.multiDevices && model.multiDevices[arrayIndices] && model.multiDevices[arrayIndices].deviceId && ['dual_dualr2', 'dualr3_switch', '4ch', 't'].includes(model.multiDevices[arrayIndices].deviceModel));"
               }
             },
             "showAsType": {
@@ -235,7 +252,7 @@
                 }
               ],
               "condition": {
-                "functionBody": "return (model.multiDevices[arrayIndices] && ['dualr3_motor'].includes(model.multiDevices[arrayIndices].deviceModel));"
+                "functionBody": "return (model.multiDevices && model.multiDevices[arrayIndices] && model.multiDevices[arrayIndices].deviceId && ['dualr3_motor'].includes(model.multiDevices[arrayIndices].deviceModel));"
               }
             },
             "inUsePowerThreshold": {
@@ -245,7 +262,7 @@
               "placeholder": 0,
               "minimum": 0,
               "condition": {
-                "functionBody": "return (model.multiDevices[arrayIndices] && model.multiDevices[arrayIndices].showAsOutlet && ['dualr3_switch'].includes(model.multiDevices[arrayIndices].deviceModel));"
+                "functionBody": "return (model.multiDevices && model.multiDevices[arrayIndices] && model.multiDevices[arrayIndices].deviceId && model.multiDevices[arrayIndices].showAsOutlet && ['dualr3_switch'].includes(model.multiDevices[arrayIndices].deviceModel));"
               }
             },
             "hideChannels": {
@@ -253,7 +270,7 @@
               "title": "Hide Channels",
               "description": "A comma separated list of channels to hide for this device. For example '0' or '0,1,2'.",
               "condition": {
-                "functionBody": "return (model.multiDevices[arrayIndices] && ['dual_dualr2', 'dualr3_switch', '4ch', 't'].includes(model.multiDevices[arrayIndices].deviceModel));"
+                "functionBody": "return (model.multiDevices && model.multiDevices[arrayIndices] && model.multiDevices[arrayIndices].deviceId && ['dual_dualr2', 'dualr3_switch', '4ch', 't'].includes(model.multiDevices[arrayIndices].deviceModel));"
               }
             },
             "ipAddress": {
@@ -261,7 +278,7 @@
               "title": "IP Address",
               "description": "You can manually set the IP address for this device if it cannot be discovered by the plugin.",
               "condition": {
-                "functionBody": "return model.mode !== 'wan';"
+                "functionBody": "return (model.mode !== 'wan' && model.multiDevices && model.multiDevices[arrayIndices] && model.multiDevices[arrayIndices].deviceId && ['dual_dualr2', 'dualr3_switch', 'dualr3_motor', '4ch', 't'].includes(model.multiDevices[arrayIndices].deviceModel));"
               }
             },
             "overrideLogging": {
@@ -285,7 +302,10 @@
                   "title": "Disable All Logging",
                   "enum": ["disable"]
                 }
-              ]
+              ],
+              "condition": {
+                "functionBody": "return (model.multiDevices && model.multiDevices[arrayIndices] && model.multiDevices[arrayIndices].deviceId && ['dual_dualr2', 'dualr3_switch', 'dualr3_motor', '4ch', 't'].includes(model.multiDevices[arrayIndices].deviceModel));"
+              }
             }
           }
         }
@@ -299,12 +319,13 @@
           "properties": {
             "deviceId": {
               "type": "string",
-              "title": "Device ID"
+              "title": "Device ID",
+              "description": "Enter the 10 digit eWeLink Device ID to begin."
             },
             "deviceModel": {
               "type": "string",
               "title": "Device Model",
-              "description": "Setting this hides and shows the applicable options for this device type below.",
+              "description": "This setting has no effect except showing the relevant options for this model below.",
               "oneOf": [
                 {
                   "title": "Sonoff POW/R2",
@@ -322,17 +343,26 @@
                   "title": "Sonoff Micro",
                   "enum": ["micro"]
                 }
-              ]
+              ],
+              "condition": {
+                "functionBody": "return (model.outletDevices && model.outletDevices[arrayIndices] && model.outletDevices[arrayIndices].deviceId && model.outletDevices[arrayIndices].deviceId.length === 10);"
+              }
             },
             "label": {
               "title": "Label",
               "type": "string",
-              "description": "This setting has no effect except to be a helpful label for identifying which device this is when editing the configuration."
+              "description": "This setting has no effect except to be a helpful label for identifying which device this is when editing the configuration.",
+              "condition": {
+                "functionBody": "return (model.outletDevices && model.outletDevices[arrayIndices] && model.outletDevices[arrayIndices].deviceId && model.outletDevices[arrayIndices].deviceId.length === 10);"
+              }
             },
             "showAsSwitch": {
               "type": "boolean",
               "title": "Show As Switch",
-              "description": "If true, this accessory will show as a switch in HomeKit instead of an outlet."
+              "description": "If true, this accessory will show as a switch in HomeKit instead of an outlet.",
+              "condition": {
+                "functionBody": "return (model.outletDevices && model.outletDevices[arrayIndices] && !model.outletDevices[arrayIndices].showAsSwitch && ['pow', 'iw', 's', 'micro'].includes(model.outletDevices[arrayIndices].deviceModel));"
+              }
             },
             "inUsePowerThreshold": {
               "type": "number",
@@ -341,7 +371,7 @@
               "placeholder": 0,
               "minimum": 0,
               "condition": {
-                "functionBody": "return (model.outletDevices[arrayIndices] && !model.outletDevices[arrayIndices].showAsSwitch  && ['pow'].includes(model.outletDevices[arrayIndices].deviceModel));"
+                "functionBody": "return (model.outletDevices && model.outletDevices[arrayIndices] && !model.outletDevices[arrayIndices].showAsSwitch && ['pow'].includes(model.outletDevices[arrayIndices].deviceModel));"
               }
             },
             "ipAddress": {
@@ -349,7 +379,7 @@
               "title": "IP Address",
               "description": "You can manually set the IP address for this device if it cannot be discovered by the plugin.",
               "condition": {
-                "functionBody": "return model.mode !== 'wan';"
+                "functionBody": "return (model.mode !== 'wan' && model.outletDevices && model.outletDevices[arrayIndices] && !model.outletDevices[arrayIndices].showAsSwitch && ['pow', 'iw', 's', 'micro'].includes(model.outletDevices[arrayIndices].deviceModel));"
               }
             },
             "overrideLogging": {
@@ -373,7 +403,10 @@
                   "title": "Disable All Logging",
                   "enum": ["disable"]
                 }
-              ]
+              ],
+              "condition": {
+                "functionBody": "return (model.outletDevices && model.outletDevices[arrayIndices] && !model.outletDevices[arrayIndices].showAsSwitch && ['pow', 'iw', 's', 'micro'].includes(model.outletDevices[arrayIndices].deviceModel));"
+              }
             }
           }
         }
@@ -387,17 +420,13 @@
           "properties": {
             "deviceId": {
               "type": "string",
-              "title": "Device ID"
-            },
-            "label": {
-              "title": "Label",
-              "type": "string",
-              "description": "This setting has no effect except to be a helpful label for identifying which device this is when editing the configuration."
+              "title": "Device ID",
+              "description": "Enter the 10 digit eWeLink Device ID to begin."
             },
             "deviceModel": {
               "type": "string",
               "title": "Device Model",
-              "description": "Setting this hides and shows the applicable options for this device type below.",
+              "description": "This setting has no effect except showing the relevant options for this model below.",
               "oneOf": [
                 {
                   "title": "Sonoff D1/R2",
@@ -439,7 +468,18 @@
                   "title": "Zigbee Light (Dimmer + CCT)",
                   "enum": ["zl_dc"]
                 }
-              ]
+              ],
+              "condition": {
+                "functionBody": "return (model.lightDevices && model.lightDevices[arrayIndices] && model.lightDevices[arrayIndices].deviceId && model.lightDevices[arrayIndices].deviceId.length === 10);"
+              }
+            },
+            "label": {
+              "title": "Label",
+              "type": "string",
+              "description": "This setting has no effect except to be a helpful label for identifying which device this is when editing the configuration.",
+              "condition": {
+                "functionBody": "return (model.lightDevices && model.lightDevices[arrayIndices] && model.lightDevices[arrayIndices].deviceId && model.lightDevices[arrayIndices].deviceId.length === 10);"
+              }
             },
             "brightnessStep": {
               "title": "Brightness Step",
@@ -448,7 +488,7 @@
               "placeholder": 1,
               "minimum": 1,
               "condition": {
-                "functionBody": "return (model.lightDevices[arrayIndices] && ['d1', 'l1', 'bulbB02BA60', 'bulbB05BA60', 'bulbB02FA60', 'bulbB02FA60', 'bulbB02FST64', 'king', 'zl_d', 'zl_dc'].includes(model.lightDevices[arrayIndices].deviceModel));"
+                "functionBody": "return (model.lightDevices && model.lightDevices[arrayIndices] && ['d1', 'l1', 'bulbB02BA60', 'bulbB05BA60', 'bulbB02FA60', 'bulbB02FST64', 'king', 'zl_d', 'zl_dc'].includes(model.lightDevices[arrayIndices].deviceModel));"
               }
             },
             "adaptiveLightingShift": {
@@ -458,7 +498,7 @@
               "placeholder": 0,
               "minimum": -1,
               "condition": {
-                "functionBody": "return (model.lightDevices[arrayIndices] && ['l1', 'bulbB02BA60', 'bulbB05BA60', 'bulbB02FA60', 'bulbB02FA60', 'bulbB02FST64', 'zl_dc'].includes(model.lightDevices[arrayIndices].deviceModel));"
+                "functionBody": "return (model.lightDevices && model.lightDevices[arrayIndices] && ['l1', 'bulbB02BA60', 'bulbB05BA60', 'bulbB02FA60', 'bulbB02FST64', 'zl_dc'].includes(model.lightDevices[arrayIndices].deviceModel));"
               }
             },
             "ipAddress": {
@@ -466,7 +506,7 @@
               "title": "IP Address",
               "description": "You can manually set the IP address for this Sonoff D1 if it cannot be discovered by the plugin.",
               "condition": {
-                "functionBody": "return (model.mode !== 'wan' && model.lightDevices[arrayIndices] && ['d1'].includes(model.lightDevices[arrayIndices].deviceModel));"
+                "functionBody": "return (model.mode !== 'wan' && model.lightDevices && model.lightDevices[arrayIndices] && ['d1'].includes(model.lightDevices[arrayIndices].deviceModel));"
               }
             },
             "overrideLogging": {
@@ -490,7 +530,10 @@
                   "title": "Disable All Logging",
                   "enum": ["disable"]
                 }
-              ]
+              ],
+              "condition": {
+                "functionBody": "return (model.lightDevices && model.lightDevices[arrayIndices] && ['d1', 'b1', 'l1', 'bulbB02BA60', 'bulbB05BA60', 'bulbB02FA60', 'bulbB02FST64', 'king', 'zl_d', 'zl_dc'].includes(model.lightDevices[arrayIndices].deviceModel));"
+              }
             }
           }
         }
@@ -504,12 +547,13 @@
           "properties": {
             "deviceId": {
               "type": "string",
-              "title": "Device ID"
+              "title": "Device ID",
+              "description": "Enter the 10 digit eWeLink Device ID to begin."
             },
             "deviceModel": {
               "type": "string",
               "title": "Device Model",
-              "description": "Setting this hides and shows the applicable options for this device type below.",
+              "description": "This setting has no effect except showing the relevant options for this model below.",
               "oneOf": [
                 {
                   "title": "Sonoff TH10/16",
@@ -523,32 +567,44 @@
                   "title": "KKMOON HC-T010-EWF",
                   "enum": ["hc"]
                 }
-              ]
+              ],
+              "condition": {
+                "functionBody": "return (model.thDevices && model.thDevices[arrayIndices] && model.thDevices[arrayIndices].deviceId && model.thDevices[arrayIndices].deviceId.length === 10);"
+              }
             },
             "label": {
               "title": "Label",
               "type": "string",
-              "description": "This setting has no effect except to be a helpful label for identifying which device this is when editing the configuration."
+              "description": "This setting has no effect except to be a helpful label for identifying which device this is when editing the configuration.",
+              "condition": {
+                "functionBody": "return (model.thDevices && model.thDevices[arrayIndices] && model.thDevices[arrayIndices].deviceId && model.thDevices[arrayIndices].deviceId.length === 10);"
+              }
             },
             "hideSwitch": {
               "type": "boolean",
               "title": "Hide Switch",
               "description": "If true, this accessory will hide the TH10/16 switch from HomeKit.",
               "condition": {
-                "functionBody": "return (model.thDevices[arrayIndices] && ['th'].includes(model.thDevices[arrayIndices].deviceModel));"
+                "functionBody": "return (model.thDevices && model.thDevices[arrayIndices] && ['th'].includes(model.thDevices[arrayIndices].deviceModel));"
               }
             },
             "offset": {
               "type": "number",
               "title": "Temperature Offset",
               "description": "You can offset the temperature that the sensor reads. An offset of 2 means 2 degrees will be added to the recorded temperature. Can be positive or negative and can include a decimal point '.'.",
-              "placeholder": 0
+              "placeholder": 0,
+              "condition": {
+                "functionBody": "return (model.thDevices && model.thDevices[arrayIndices] && ['th', 'sc', 'hc'].includes(model.thDevices[arrayIndices].deviceModel));"
+              }
             },
             "humidityOffset": {
               "type": "number",
               "title": "Humidity Offset",
               "description": "You can offset the humidity that the sensor reads. An offset of 2 means 2% will be added to the recorded relative humidity. Can be positive or negative.",
-              "placeholder": 0
+              "placeholder": 0,
+              "condition": {
+                "functionBody": "return (model.thDevices && model.thDevices[arrayIndices] && ['th', 'sc', 'hc'].includes(model.thDevices[arrayIndices].deviceModel));"
+              }
             },
             "minTarget": {
               "type": "number",
@@ -557,7 +613,7 @@
               "placeholder": 10,
               "minimum": 0,
               "condition": {
-                "functionBody": "return (model.thDevices[arrayIndices] && ['th'].includes(model.thDevices[arrayIndices].deviceModel));"
+                "functionBody": "return (model.thDevices && model.thDevices[arrayIndices] && ['th'].includes(model.thDevices[arrayIndices].deviceModel));"
               }
             },
             "maxTarget": {
@@ -567,7 +623,7 @@
               "placeholder": 30,
               "minimum": 1,
               "condition": {
-                "functionBody": "return (model.thDevices[arrayIndices] && ['th'].includes(model.thDevices[arrayIndices].deviceModel));"
+                "functionBody": "return (model.thDevices && model.thDevices[arrayIndices] && ['th'].includes(model.thDevices[arrayIndices].deviceModel));"
               }
             },
             "ipAddress": {
@@ -575,7 +631,7 @@
               "title": "IP Address",
               "description": "You can manually set the IP address for this Sonoff TH10/16 if it cannot be discovered by the plugin.",
               "condition": {
-                "functionBody": "return (model.mode !== 'wan' && model.thDevices[arrayIndices] && ['th'].includes(model.thDevices[arrayIndices].deviceModel));"
+                "functionBody": "return (model.mode !== 'wan' && model.thDevices && model.thDevices[arrayIndices] && ['th'].includes(model.thDevices[arrayIndices].deviceModel));"
               }
             },
             "overrideLogging": {
@@ -599,7 +655,10 @@
                   "title": "Disable All Logging",
                   "enum": ["disable"]
                 }
-              ]
+              ],
+              "condition": {
+                "functionBody": "return (model.thDevices && model.thDevices[arrayIndices] && ['th', 'sc', 'hc'].includes(model.thDevices[arrayIndices].deviceModel));"
+              }
             }
           }
         }
@@ -613,30 +672,37 @@
           "properties": {
             "deviceId": {
               "type": "string",
-              "title": "Device ID"
+              "title": "Device ID",
+              "description": "Enter the 10 digit eWeLink Device ID to begin."
             },
             "deviceModel": {
               "type": "string",
               "title": "Device Model",
-              "description": "Setting this hides and shows the applicable options for this device type below.",
+              "description": "This setting has no effect except showing the relevant options for this model below.",
               "oneOf": [
                 {
                   "title": "Sonoff iFan/02/03",
                   "enum": ["ifan"]
                 }
-              ]
+              ],
+              "condition": {
+                "functionBody": "return (model.fanDevices && model.fanDevices[arrayIndices] && model.fanDevices[arrayIndices].deviceId && model.fanDevices[arrayIndices].deviceId.length === 10);"
+              }
             },
             "label": {
               "title": "Label",
               "type": "string",
-              "description": "This setting has no effect except to be a helpful label for identifying which device this is when editing the configuration."
+              "description": "This setting has no effect except to be a helpful label for identifying which device this is when editing the configuration.",
+              "condition": {
+                "functionBody": "return (model.fanDevices && model.fanDevices[arrayIndices] && model.fanDevices[arrayIndices].deviceId && model.fanDevices[arrayIndices].deviceId.length === 10);"
+              }
             },
             "hideLight": {
               "type": "boolean",
               "title": "Hide Light Switch",
               "description": "If true, the light switch will be hidden from HomeKit.",
               "condition": {
-                "functionBody": "return (model.fanDevices[arrayIndices] && ['ifan'].includes(model.fanDevices[arrayIndices].deviceModel));"
+                "functionBody": "return (model.fanDevices && model.fanDevices[arrayIndices] && ['ifan'].includes(model.fanDevices[arrayIndices].deviceModel));"
               }
             },
             "ipAddress": {
@@ -644,7 +710,7 @@
               "title": "IP Address",
               "description": "You can manually set the IP address for this device if it cannot be discovered by the plugin.",
               "condition": {
-                "functionBody": "return (model.mode !== 'wan' && model.fanDevices[arrayIndices] && ['ifan'].includes(model.fanDevices[arrayIndices].deviceModel));"
+                "functionBody": "return (model.mode !== 'wan' && model.fanDevices && model.fanDevices[arrayIndices] && ['ifan'].includes(model.fanDevices[arrayIndices].deviceModel));"
               }
             },
             "overrideLogging": {
@@ -668,7 +734,10 @@
                   "title": "Disable All Logging",
                   "enum": ["disable"]
                 }
-              ]
+              ],
+              "condition": {
+                "functionBody": "return (model.mode !== 'wan' && model.fanDevices && model.fanDevices[arrayIndices] && ['ifan'].includes(model.fanDevices[arrayIndices].deviceModel));"
+              }
             }
           }
         }
@@ -682,12 +751,13 @@
           "properties": {
             "deviceId": {
               "type": "string",
-              "title": "Device ID"
+              "title": "Device ID",
+              "description": "Enter the 10 digit eWeLink Device ID to begin."
             },
             "deviceModel": {
               "type": "string",
               "title": "Device Model",
-              "description": "Setting this hides and shows the applicable options for this device type below.",
+              "description": "This setting has no effect except showing the relevant options for this model below.",
               "oneOf": [
                 {
                   "title": "Sonoff DW2-Wifi",
@@ -713,12 +783,18 @@
                   "title": "Zigbee Leak Sensor",
                   "enum": ["leak"]
                 }
-              ]
+              ],
+              "condition": {
+                "functionBody": "return (model.sensorDevices && model.sensorDevices[arrayIndices] && model.sensorDevices[arrayIndices].deviceId && model.sensorDevices[arrayIndices].deviceId.length === 10);"
+              }
             },
             "label": {
               "title": "Label",
               "type": "string",
-              "description": "This setting has no effect except to be a helpful label for identifying which device this is when editing the configuration."
+              "description": "This setting has no effect except to be a helpful label for identifying which device this is when editing the configuration.",
+              "condition": {
+                "functionBody": "return (model.sensorDevices && model.sensorDevices[arrayIndices] && model.sensorDevices[arrayIndices].deviceId && model.sensorDevices[arrayIndices].deviceId.length === 10);"
+              }
             },
             "lowBattThreshold": {
               "type": "number",
@@ -727,7 +803,7 @@
               "placeholder": 25,
               "minimum": 5,
               "condition": {
-                "functionBody": "return (model.sensorDevices[arrayIndices] && ['dw', 'snzb01', 'snzb02', 'snzb03', 'snzb04', 'leak'].includes(model.sensorDevices[arrayIndices].deviceModel));"
+                "functionBody": "return (model.sensorDevices && model.sensorDevices[arrayIndices] && ['dw', 'snzb01', 'snzb02', 'snzb03', 'snzb04', 'leak'].includes(model.sensorDevices[arrayIndices].deviceModel));"
               }
             },
             "offset": {
@@ -736,7 +812,7 @@
               "description": "You can offset the temperature that the SNZB-02 sensor reads. An offset of 2 means 2 degrees will be added to the recorded temperature. Can be positive or negative and can include a decimal point '.'.",
               "placeholder": 0,
               "condition": {
-                "functionBody": "return (model.sensorDevices[arrayIndices] && ['snzb02'].includes(model.sensorDevices[arrayIndices].deviceModel));"
+                "functionBody": "return (model.sensorDevices && model.sensorDevices[arrayIndices] && ['snzb02'].includes(model.sensorDevices[arrayIndices].deviceModel));"
               }
             },
             "humidityOffset": {
@@ -745,7 +821,7 @@
               "description": "You can offset the humidity that the SNZB-02 sensor reads. An offset of 2 means 2% will be added to the recorded relative humidity. Can be positive or negative.",
               "placeholder": 0,
               "condition": {
-                "functionBody": "return (model.sensorDevices[arrayIndices] && ['snzb02'].includes(model.sensorDevices[arrayIndices].deviceModel));"
+                "functionBody": "return (model.sensorDevices && model.sensorDevices[arrayIndices] && ['snzb02'].includes(model.sensorDevices[arrayIndices].deviceModel));"
               }
             },
             "hideLongDouble": {
@@ -753,7 +829,7 @@
               "title": "Hide Long & Double Press",
               "description": "If true, double and long press options will be hidden for this Zigbee Button.",
               "condition": {
-                "functionBody": "return (model.sensorDevices[arrayIndices] && ['snzb01'].includes(model.sensorDevices[arrayIndices].deviceModel));"
+                "functionBody": "return (model.sensorDevices && model.sensorDevices[arrayIndices] && ['snzb01'].includes(model.sensorDevices[arrayIndices].deviceModel));"
               }
             },
             "scaleBattery": {
@@ -761,7 +837,7 @@
               "title": "Scale Battery",
               "description": "If true, the battery reading for this Zigbee Contact Sensor will be multiplied by 10.",
               "condition": {
-                "functionBody": "return (model.sensorDevices[arrayIndices] && ['snzb04'].includes(model.sensorDevices[arrayIndices].deviceModel));"
+                "functionBody": "return (model.sensorDevices && model.sensorDevices[arrayIndices] && ['snzb04'].includes(model.sensorDevices[arrayIndices].deviceModel));"
               }
             },
             "sensorTimeDifference": {
@@ -771,7 +847,7 @@
               "placeholder": 60,
               "minimum": 5,
               "condition": {
-                "functionBody": "return (model.sensorDevices[arrayIndices] && ['snzb01', 'snzb03', 'leak'].includes(model.sensorDevices[arrayIndices].deviceModel));"
+                "functionBody": "return (model.sensorDevices && model.sensorDevices[arrayIndices] && ['snzb01', 'snzb03', 'leak'].includes(model.sensorDevices[arrayIndices].deviceModel));"
               }
             },
             "overrideLogging": {
@@ -795,7 +871,10 @@
                   "title": "Disable All Logging",
                   "enum": ["disable"]
                 }
-              ]
+              ],
+              "condition": {
+                "functionBody": "return (model.sensorDevices && model.sensorDevices[arrayIndices] && ['dw', 'snzb01', 'snzb02', 'snzb03', 'snzb04', 'leak'].includes(model.sensorDevices[arrayIndices].deviceModel));"
+              }
             }
           }
         }
@@ -809,24 +888,31 @@
           "properties": {
             "deviceId": {
               "type": "string",
-              "title": "Device ID"
+              "title": "Device ID",
+              "description": "Enter the 10 digit eWeLink Device ID to begin."
             },
             "label": {
               "title": "Label",
               "type": "string",
-              "description": "This setting has no effect except to be a helpful label for identifying which device this is when editing the configuration."
+              "description": "This setting has no effect except to be a helpful label for identifying which device this is when editing the configuration.",
+              "condition": {
+                "functionBody": "return (model.rfDevices && model.rfDevices[arrayIndices] && model.rfDevices[arrayIndices].deviceId && model.rfDevices[arrayIndices].deviceId.length === 10);"
+              }
             },
             "resetOnStartup": {
               "title": "Reset Subdevices",
               "type": "boolean",
-              "description": "If true, the plugin will remove and re-add all subdevices when the plugin initialises. Useful if adding or removing subdevices via the eWeLink app."
+              "description": "If true, the plugin will remove and re-add all subdevices when the plugin initialises. Useful if adding or removing subdevices via the eWeLink app.",
+              "condition": {
+                "functionBody": "return (model.rfDevices && model.rfDevices[arrayIndices] && model.rfDevices[arrayIndices].deviceId && model.rfDevices[arrayIndices].deviceId.length === 10);"
+              }
             },
             "ipAddress": {
               "type": "string",
               "title": "IP Address",
               "description": "You can manually set the IP address for this device if it cannot be discovered by the plugin.",
               "condition": {
-                "functionBody": "return model.mode !== 'wan';"
+                "functionBody": "return (model.mode !== 'wan' && model.rfDevices && model.rfDevices[arrayIndices] && model.rfDevices[arrayIndices].deviceId && model.rfDevices[arrayIndices].deviceId.length === 10);"
               }
             },
             "overrideLogging": {
@@ -850,7 +936,10 @@
                   "title": "Disable All Logging",
                   "enum": ["disable"]
                 }
-              ]
+              ],
+              "condition": {
+                "functionBody": "return (model.rfDevices && model.rfDevices[arrayIndices] && model.rfDevices[arrayIndices].deviceId && model.rfDevices[arrayIndices].deviceId.length === 10);"
+              }
             }
           }
         }
@@ -865,12 +954,15 @@
             "fullDeviceId": {
               "type": "string",
               "title": "Sensor Device ID",
-              "description": "Device ID of the sensor (13 digits normally in the format 1000ab23cdSW2)."
+              "description": "Enter the Device ID of the sensor to begin (13 digits normally in the format 1000ab23cdSW2)."
             },
             "label": {
               "title": "Label",
               "type": "string",
-              "description": "This setting has no effect except to be a helpful label for identifying which device this is when editing the configuration."
+              "description": "This setting has no effect except to be a helpful label for identifying which device this is when editing the configuration.",
+              "condition": {
+                "functionBody": "return (model.bridgeSensors && model.bridgeSensors[arrayIndices] && model.bridgeSensors[arrayIndices].fullDeviceId && model.bridgeSensors[arrayIndices].fullDeviceId.length >= 13);"
+              }
             },
             "type": {
               "type": "string",
@@ -905,21 +997,30 @@
                   "title": "Contact",
                   "enum": ["contact"]
                 }
-              ]
+              ],
+              "condition": {
+                "functionBody": "return (model.bridgeSensors && model.bridgeSensors[arrayIndices] && model.bridgeSensors[arrayIndices].fullDeviceId && model.bridgeSensors[arrayIndices].fullDeviceId.length >= 13);"
+              }
             },
             "sensorTimeLength": {
               "type": "number",
               "title": "Sensor Time Length",
               "description": "The number of seconds which the sensor tile in the Home app will light up for if this sensor is activated. Must be 1 or more.",
               "placeholder": 60,
-              "minimum": 1
+              "minimum": 1,
+              "condition": {
+                "functionBody": "return (model.bridgeSensors && model.bridgeSensors[arrayIndices] && model.bridgeSensors[arrayIndices].fullDeviceId && model.bridgeSensors[arrayIndices].fullDeviceId.length >= 13);"
+              }
             },
             "sensorTimeDifference": {
               "type": "number",
               "title": "Sensor Lag",
               "description": "An offset in seconds to ignore notifications if the delay between this sensor activating and the plugin receiving the notification is greater than this number. Must be 5 or more.",
               "placeholder": 60,
-              "minimum": 5
+              "minimum": 5,
+              "condition": {
+                "functionBody": "return (model.bridgeSensors && model.bridgeSensors[arrayIndices] && model.bridgeSensors[arrayIndices].fullDeviceId && model.bridgeSensors[arrayIndices].fullDeviceId.length >= 13);"
+              }
             },
             "overrideLogging": {
               "type": "string",
@@ -942,7 +1043,10 @@
                   "title": "Disable All Logging",
                   "enum": ["disable"]
                 }
-              ]
+              ],
+              "condition": {
+                "functionBody": "return (model.bridgeSensors && model.bridgeSensors[arrayIndices] && model.bridgeSensors[arrayIndices].fullDeviceId && model.bridgeSensors[arrayIndices].fullDeviceId.length >= 13);"
+              }
             }
           }
         }
@@ -956,12 +1060,16 @@
           "properties": {
             "deviceId": {
               "type": "string",
-              "title": "Device ID"
+              "title": "Device ID",
+              "description": "Enter the 10 digit eWeLink Device ID to begin."
             },
             "label": {
               "title": "Label",
               "type": "string",
-              "description": "This setting has no effect except to be a helpful label for identifying which device this is when editing the configuration."
+              "description": "This setting has no effect except to be a helpful label for identifying which device this is when editing the configuration.",
+              "condition": {
+                "functionBody": "return (model.groups && model.groups[arrayIndices] && model.groups[arrayIndices].deviceId && model.groups[arrayIndices].deviceId.length === 10);"
+              }
             },
             "type": {
               "type": "string",
@@ -1052,15 +1160,15 @@
                   "title": "1 Leak Sensor (with Sonoff DW2)",
                   "enum": ["sensor_leak"]
                 }
-              ]
+              ],
+              "condition": {
+                "functionBody": "return (model.groups && model.groups[arrayIndices] && model.groups[arrayIndices].deviceId && model.groups[arrayIndices].deviceId.length === 10);"
+              }
             },
             "sensorType": {
               "type": "string",
               "title": "Sensor Type",
               "description": "The type of sensor to use.",
-              "condition": {
-                "functionBody": "return (model.groups[arrayIndices] && model.groups[arrayIndices].type === 'sensor');"
-              },
               "oneOf": [
                 {
                   "title": "Motion",
@@ -1090,34 +1198,37 @@
                   "title": "Contact",
                   "enum": ["contact"]
                 }
-              ]
+              ],
+              "condition": {
+                "functionBody": "return (model.groups && model.groups[arrayIndices] && ['sensor'].includes(model.groups[arrayIndices].type));"
+              }
             },
             "operationTime": {
               "type": "number",
               "title": "Operation Time (Deciseconds)",
               "description": "Blinds/garage doors: the time to open/close the device. Locks: the time to show as unlocked. This setting is in deciseconds - count the time in seconds and multiply by 10, for example 75 for 7.5 seconds. Must be 20 or more.",
-              "condition": {
-                "functionBody": "return (model.groups[arrayIndices] && ['garage', 'garage_two', 'garage_four', 'garage_eachen', 'blind', 'door', 'window', 'lock'].includes(model.groups[arrayIndices].type));"
-              },
               "placeholder": 100,
-              "minimum": 20
+              "minimum": 20,
+              "condition": {
+                "functionBody": "return (model.groups && model.groups[arrayIndices] && ['garage', 'garage_two', 'garage_four', 'garage_eachen', 'blind', 'door', 'window', 'lock'].includes(model.groups[arrayIndices].type));"
+              }
             },
             "operationTimeDown": {
               "type": "number",
               "title": "Operation Time Down (Deciseconds)",
               "description": "If your garage door or blind has a different operation time for up and down, use this setting to specify the operation time DOWN (in deciseconds) and the other setting to specify the operation time UP. Otherwise leave blank. Must be 20 or more.",
-              "condition": {
-                "functionBody": "return (model.groups[arrayIndices] && ['garage', 'garage_two', 'garage_four', 'blind', 'door', 'window'].includes(model.groups[arrayIndices].type));"
-              },
               "placeholder": 100,
-              "minimum": 20
+              "minimum": 20,
+              "condition": {
+                "functionBody": "return (model.groups && model.groups[arrayIndices] && ['garage', 'garage_two', 'garage_four', 'blind', 'door', 'window'].includes(model.groups[arrayIndices].type));"
+              }
             },
             "sensorId": {
               "type": "string",
               "title": "Sensor",
-              "description": "A DW2 or Zigbee contact sensor can be used for a single garage door to determine the current state. Enter the 10 digit eWeLink device ID (normally in the format 1000ab23cd). Otherwise leave blank.",
+              "description": "A DW2 or Zigbee contact sensor can be used for a single garage door to determine the current state. Enter the 10 digit eWeLink Device ID (normally in the format 1000ab23cd). Otherwise leave blank.",
               "condition": {
-                "functionBody": "return (model.groups[arrayIndices] && model.groups[arrayIndices].type==='garage');"
+                "functionBody": "return (model.groups && model.groups[arrayIndices] && ['garage'].includes(model.groups[arrayIndices].type));"
               }
             },
             "hideSensor": {
@@ -1125,7 +1236,7 @@
               "title": "Hide Sensor",
               "description": "Hide this contact sensor accessory from HomeKit.",
               "condition": {
-                "functionBody": "return (model.groups[arrayIndices] && model.groups[arrayIndices].sensorId);"
+                "functionBody": "return (model.groups && model.groups[arrayIndices] && model.groups[arrayIndices].sensorId && model.groups[arrayIndices].sensorId.length === 10);"
               }
             },
             "obstructId": {
@@ -1133,7 +1244,7 @@
               "title": "Obstruction Switch",
               "description": "An optional switch that will trigger the Obstruction Detected feature depending on its value. Otherwise leave blank.",
               "condition": {
-                "functionBody": "return (model.groups[arrayIndices] && ['garage', 'garage_eachen'].includes(model.groups[arrayIndices].type));"
+                "functionBody": "return (model.groups && model.groups[arrayIndices] && ['garage', 'garage_eachen'].includes(model.groups[arrayIndices].type));"
               }
             },
             "ipAddress": {
@@ -1141,7 +1252,7 @@
               "title": "IP Address",
               "description": "You can manually set the IP address for this device if it cannot be discovered by the plugin.",
               "condition": {
-                "functionBody": "return (model.mode !== 'wan' && model.groups[arrayIndices] && ['blind', 'door', 'garage', 'garage_two', 'garage_four', 'garage_eachen', 'lock', 'purifier', 'sensor', 'switch_valve', 'tap', 'tap_two', 'valve', 'valve_two', 'valve_four', 'window'].includes(model.groups[arrayIndices].type));"
+                "functionBody": "return (model.mode !== 'wan' && model.groups && model.groups[arrayIndices] && ['blind', 'door', 'garage', 'garage_two', 'garage_four', 'garage_eachen', 'lock', 'purifier', 'sensor', 'switch_valve', 'tap', 'tap_two', 'valve', 'valve_two', 'valve_four', 'window'].includes(model.groups[arrayIndices].type));"
               }
             },
             "overrideLogging": {
@@ -1165,7 +1276,10 @@
                   "title": "Disable All Logging",
                   "enum": ["disable"]
                 }
-              ]
+              ],
+              "condition": {
+                "functionBody": "return (model.mode !== 'wan' && model.groups && model.groups[arrayIndices] && ['blind', 'cooler', 'dehumidifier', 'door', 'garage', 'garage_two', 'garage_four', 'garage_eachen', 'humidifier', 'lock', 'purifier', 'sensor', 'sensor_leak', 'switch_valve', 'tap', 'tap_two', 'thermostat', 'valve', 'valve_two', 'valve_four', 'window'].includes(model.groups[arrayIndices].type));"
+              }
             }
           }
         }
@@ -1176,7 +1290,7 @@
         "items": {
           "type": "string",
           "title": "Device ID",
-          "description": "eWeLink device id of the device to ignore, e.g. 10009553c8."
+          "description": "eWeLink Device ID of the device to ignore, e.g. 10009553c8."
         }
       }
     }

From 4530769592722b05e713c48091587bb96790b213 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 3 Jul 2021 13:49:52 +0100
Subject: [PATCH 2454/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7a75e70e..15c8cb26 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -61,6 +61,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 - **LAN Mode**
   - ⚠️ If you have the plugin in `lan`-only mode then the plugin will remove any accessories that do not support LAN mode
 - **Homebridge UI**
+  - More interactive - device configuration will expand once device ID and model entered
   - Device configuration options will now hide/show based on the `deviceModel` field
 - **Startup Logging**
   - Accessory configuration options will be logged regardless of logging level

From 4187e413a29f0ca81575f355bb289312c82e3038 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 3 Jul 2021 13:50:16 +0100
Subject: [PATCH 2455/3183] 7.0.0-beta.7

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b02da3f1..ad2a781a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "7.0.0-beta.6",
+  "version": "7.0.0-beta.7",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 452544e3..4da50ced 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "7.0.0-beta.6",
+  "version": "7.0.0-beta.7",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 39cab2d64315e1e7c3ca827c71644bf7139a4152 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 3 Jul 2021 16:09:37 +0100
Subject: [PATCH 2456/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 15c8cb26..4d146327 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -81,6 +81,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 ### Fixed
 
 - An issue preventing controlling a garage door simulation when using a sensor
+- An issue with the DUALR3 in motor mode hanging on 'Closing...' or 'Opening...'
 - Fixed the multiple notifications when closing an eachen device garage door
 
 ### Removed

From c22506fb8e6e7dc291f73a36fb8a480f48fae625 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 4 Jul 2021 08:33:46 +0100
Subject: [PATCH 2457/3183] bump ws to v7.5.2

---
 package-lock.json | 6 +++---
 package.json      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ad2a781a..4e29f097 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -291,9 +291,9 @@
       }
     },
     "ws": {
-      "version": "7.5.1",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.1.tgz",
-      "integrity": "sha512-2c6faOUH/nhoQN6abwMloF7Iyl0ZS2E9HGtsiLrWn0zOOMWlhtDmdf/uihDt6jnuCxgtwGBNy6Onsoy2s2O2Ow=="
+      "version": "7.5.2",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.2.tgz",
+      "integrity": "sha512-lkF7AWRicoB9mAgjeKbGqVUekLnSNO4VjKVnuPHpQeOxZOErX6BPXwJk70nFslRCEEA8EVW7ZjKwXaP9N+1sKQ=="
     }
   }
 }
diff --git a/package.json b/package.json
index 4da50ced..24d5d061 100644
--- a/package.json
+++ b/package.json
@@ -53,7 +53,7 @@
     "node-persist": "^3.1.0",
     "p-queue": "^6.6.2",
     "websocket-as-promised": "^2.0.1",
-    "ws": "^7.5.1"
+    "ws": "^7.5.2"
   },
   "prettier": {
     "printWidth": 100

From 1892553c8399dc35b5f1d15da66281c6afc6d8c0 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 4 Jul 2021 08:33:49 +0100
Subject: [PATCH 2458/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4d146327..921fff7b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -76,7 +76,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
   - `sensorTimeDifference` minimum reduced to 5 seconds and default reduced to 60 seconds
 - **Dependencies**
   - Recommended node version bump to v14.17.2
-  - Bump `ws` dependency to v7.5.1
+  - Bump `ws` dependency to v7.5.2
 
 ### Fixed
 

From 0c61f3a9a5a52f331341655fa0fcfd1acedd3f25 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 4 Jul 2021 11:46:16 +0100
Subject: [PATCH 2459/3183] use integer where appropriate and condition length
 of device id

---
 config.schema.json | 75 ++++++++++++++++++++++++++++++----------------
 1 file changed, 49 insertions(+), 26 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index f77614d1..e0dcadaa 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -86,9 +86,10 @@
         ]
       },
       "apiPort": {
-        "type": "number",
+        "type": "integer",
         "title": "Internal API Port",
-        "description": "Port to use for the internal HTTP API. Set to 0 to disable. Set to 1 to choose a randomly available port."
+        "description": "Port to use for the internal HTTP API. Set to 0 to disable. Set to 1 to choose a randomly available port.",
+        "minimum": 1
       },
       "disableDeviceLogging": {
         "type": "boolean",
@@ -120,7 +121,9 @@
             "deviceId": {
               "type": "string",
               "title": "Device ID",
-              "description": "Enter the 10 digit eWeLink Device ID to begin."
+              "description": "Enter the 10 digit eWeLink Device ID to begin.",
+              "minLength": 10,
+              "maxLength": 10
             },
             "label": {
               "title": "Label",
@@ -185,7 +188,9 @@
             "deviceId": {
               "type": "string",
               "title": "Device ID",
-              "description": "Enter the 10 digit eWeLink Device ID to begin."
+              "description": "Enter the 10 digit eWeLink Device ID to begin.",
+              "minLength": 10,
+              "maxLength": 10
             },
             "deviceModel": {
               "type": "string",
@@ -256,7 +261,7 @@
               }
             },
             "inUsePowerThreshold": {
-              "type": "number",
+              "type": "integer",
               "title": "Outlet 'In Use' Threshold",
               "description": "HomeKit will set the 'In Use' status of outlet devices to true when the wattage is above this number. Must be 0 or more.",
               "placeholder": 0,
@@ -320,7 +325,9 @@
             "deviceId": {
               "type": "string",
               "title": "Device ID",
-              "description": "Enter the 10 digit eWeLink Device ID to begin."
+              "description": "Enter the 10 digit eWeLink Device ID to begin.",
+              "minLength": 10,
+              "maxLength": 10
             },
             "deviceModel": {
               "type": "string",
@@ -365,7 +372,7 @@
               }
             },
             "inUsePowerThreshold": {
-              "type": "number",
+              "type": "integer",
               "title": "Outlet 'In Use' Threshold",
               "description": "HomeKit will set the 'In Use' status of outlet devices to true when the wattage is above this number. Must be 0 or more.",
               "placeholder": 0,
@@ -421,7 +428,9 @@
             "deviceId": {
               "type": "string",
               "title": "Device ID",
-              "description": "Enter the 10 digit eWeLink Device ID to begin."
+              "description": "Enter the 10 digit eWeLink Device ID to begin.",
+              "minLength": 10,
+              "maxLength": 10
             },
             "deviceModel": {
               "type": "string",
@@ -483,7 +492,7 @@
             },
             "brightnessStep": {
               "title": "Brightness Step",
-              "type": "number",
+              "type": "integer",
               "description": "A minimum step for the brightness slider in the Home app. Must be 1 or more.",
               "placeholder": 1,
               "minimum": 1,
@@ -493,7 +502,7 @@
             },
             "adaptiveLightingShift": {
               "title": "Adaptive Lighting Shift",
-              "type": "number",
+              "type": "integer",
               "description": "The mired for each Adaptive Lighting update will be increased by this value, making the light appear warmer. Set to -1 to remove Adaptive Lighting feature. Must be -1 or more.",
               "placeholder": 0,
               "minimum": -1,
@@ -548,7 +557,9 @@
             "deviceId": {
               "type": "string",
               "title": "Device ID",
-              "description": "Enter the 10 digit eWeLink Device ID to begin."
+              "description": "Enter the 10 digit eWeLink Device ID to begin.",
+              "minLength": 10,
+              "maxLength": 10
             },
             "deviceModel": {
               "type": "string",
@@ -598,7 +609,7 @@
               }
             },
             "humidityOffset": {
-              "type": "number",
+              "type": "integer",
               "title": "Humidity Offset",
               "description": "You can offset the humidity that the sensor reads. An offset of 2 means 2% will be added to the recorded relative humidity. Can be positive or negative.",
               "placeholder": 0,
@@ -607,7 +618,7 @@
               }
             },
             "minTarget": {
-              "type": "number",
+              "type": "integer",
               "title": "Minimum Target Temperature",
               "description": "Minimum target temperature for TH10/16 heater/cooler simulation to show in HomeKit apps. Must be 0 or more.",
               "placeholder": 10,
@@ -617,7 +628,7 @@
               }
             },
             "maxTarget": {
-              "type": "number",
+              "type": "integer",
               "title": "Maximum Target Temperature",
               "description": "Maximum target temperature for TH10/16 heater/cooler simulation to show in HomeKit apps. Must be 1 or more, and greater than the minimum value set above.",
               "placeholder": 30,
@@ -673,7 +684,9 @@
             "deviceId": {
               "type": "string",
               "title": "Device ID",
-              "description": "Enter the 10 digit eWeLink Device ID to begin."
+              "description": "Enter the 10 digit eWeLink Device ID to begin.",
+              "minLength": 10,
+              "maxLength": 10
             },
             "deviceModel": {
               "type": "string",
@@ -752,7 +765,9 @@
             "deviceId": {
               "type": "string",
               "title": "Device ID",
-              "description": "Enter the 10 digit eWeLink Device ID to begin."
+              "description": "Enter the 10 digit eWeLink Device ID to begin.",
+              "minLength": 10,
+              "maxLength": 10
             },
             "deviceModel": {
               "type": "string",
@@ -797,7 +812,7 @@
               }
             },
             "lowBattThreshold": {
-              "type": "number",
+              "type": "integer",
               "title": "Low Battery Threshold",
               "description": "HomeKit will set the low battery status for this device when the battery (if it has one) reaches this percentage level. Must be 5 or more.",
               "placeholder": 25,
@@ -816,7 +831,7 @@
               }
             },
             "humidityOffset": {
-              "type": "number",
+              "type": "integer",
               "title": "Humidity Offset",
               "description": "You can offset the humidity that the SNZB-02 sensor reads. An offset of 2 means 2% will be added to the recorded relative humidity. Can be positive or negative.",
               "placeholder": 0,
@@ -841,7 +856,7 @@
               }
             },
             "sensorTimeDifference": {
-              "type": "number",
+              "type": "integer",
               "title": "Sensor Lag",
               "description": "An offset in seconds to ignore notifications if the delay between this Zigbee Motion/Leak activating or Zigbee Button press and the plugin receiving the notification is greater than this number. Must be 5 or more.",
               "placeholder": 60,
@@ -889,7 +904,9 @@
             "deviceId": {
               "type": "string",
               "title": "Device ID",
-              "description": "Enter the 10 digit eWeLink Device ID to begin."
+              "description": "Enter the 10 digit eWeLink Device ID to begin.",
+              "minLength": 10,
+              "maxLength": 10
             },
             "label": {
               "title": "Label",
@@ -954,7 +971,9 @@
             "fullDeviceId": {
               "type": "string",
               "title": "Sensor Device ID",
-              "description": "Enter the Device ID of the sensor to begin (13 digits normally in the format 1000ab23cdSW2)."
+              "description": "Enter the Device ID of the sensor to begin (13 digits normally in the format 1000ab23cdSW2).",
+              "minLength": 13,
+              "maxLength": 15
             },
             "label": {
               "title": "Label",
@@ -1003,7 +1022,7 @@
               }
             },
             "sensorTimeLength": {
-              "type": "number",
+              "type": "integer",
               "title": "Sensor Time Length",
               "description": "The number of seconds which the sensor tile in the Home app will light up for if this sensor is activated. Must be 1 or more.",
               "placeholder": 60,
@@ -1013,7 +1032,7 @@
               }
             },
             "sensorTimeDifference": {
-              "type": "number",
+              "type": "integer",
               "title": "Sensor Lag",
               "description": "An offset in seconds to ignore notifications if the delay between this sensor activating and the plugin receiving the notification is greater than this number. Must be 5 or more.",
               "placeholder": 60,
@@ -1061,7 +1080,9 @@
             "deviceId": {
               "type": "string",
               "title": "Device ID",
-              "description": "Enter the 10 digit eWeLink Device ID to begin."
+              "description": "Enter the 10 digit eWeLink Device ID to begin.",
+              "minLength": 10,
+              "maxLength": 10
             },
             "label": {
               "title": "Label",
@@ -1204,7 +1225,7 @@
               }
             },
             "operationTime": {
-              "type": "number",
+              "type": "integer",
               "title": "Operation Time (Deciseconds)",
               "description": "Blinds/garage doors: the time to open/close the device. Locks: the time to show as unlocked. This setting is in deciseconds - count the time in seconds and multiply by 10, for example 75 for 7.5 seconds. Must be 20 or more.",
               "placeholder": 100,
@@ -1214,7 +1235,7 @@
               }
             },
             "operationTimeDown": {
-              "type": "number",
+              "type": "integer",
               "title": "Operation Time Down (Deciseconds)",
               "description": "If your garage door or blind has a different operation time for up and down, use this setting to specify the operation time DOWN (in deciseconds) and the other setting to specify the operation time UP. Otherwise leave blank. Must be 20 or more.",
               "placeholder": 100,
@@ -1227,6 +1248,8 @@
               "type": "string",
               "title": "Sensor",
               "description": "A DW2 or Zigbee contact sensor can be used for a single garage door to determine the current state. Enter the 10 digit eWeLink Device ID (normally in the format 1000ab23cd). Otherwise leave blank.",
+              "minLength": 10,
+              "maxLength": 10,
               "condition": {
                 "functionBody": "return (model.groups && model.groups[arrayIndices] && ['garage'].includes(model.groups[arrayIndices].type));"
               }

From 666576dfb92382ef0e9c8a0c0161ef91b59541d9 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 4 Jul 2021 13:35:33 +0100
Subject: [PATCH 2460/3183] expose rf sensor as doorbell accessory type

---
 config.schema.json      |  4 ++++
 lib/device/rf-bridge.js | 15 ++++++++++++++-
 lib/device/rf-sensor.js | 20 ++++++++++++++++----
 lib/utils/constants.js  |  2 +-
 4 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index e0dcadaa..c671bbc0 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -1015,6 +1015,10 @@
                 {
                   "title": "Contact",
                   "enum": ["contact"]
+                },
+                {
+                  "title": "Doorbell",
+                  "enum": ["doorbell"]
                 }
               ],
               "condition": {
diff --git a/lib/device/rf-bridge.js b/lib/device/rf-bridge.js
index 13f19d89..c0c49487 100644
--- a/lib/device/rf-bridge.js
+++ b/lib/device/rf-bridge.js
@@ -213,6 +213,10 @@ module.exports = class deviceRFBridge {
                     serv = this.hapServ.OccupancySensor
                     char = this.hapChar.OccupancyDetected
                     break
+                  case 'doorbell':
+                    serv = this.hapServ.Doorbell
+                    char = this.hapChar.ProgrammableSwitchEvent
+                    break
                   default: {
                     serv = this.hapServ.MotionSensor
                     char = this.hapChar.MotionDetected
@@ -226,7 +230,13 @@ module.exports = class deviceRFBridge {
                     break
                   }
                 }
-                subAccessory.getService(serv).updateCharacteristic(char, 1)
+
+                // The doorbell is the one service that doesn't follow the pattern of activation
+                if (serv === this.hapServ.Doorbell) {
+                  subAccessory.getService(serv).updateCharacteristic(char, 0)
+                } else {
+                  subAccessory.getService(serv).updateCharacteristic(char, 1)
+                }
                 subAccessory.eveService.addEntry({ status: 1 })
                 if (params.updateSource && enableLogging) {
                   this.log(
@@ -236,6 +246,9 @@ module.exports = class deviceRFBridge {
                     this.lang.rfTrigYes
                   )
                 }
+                if (serv === this.hapServ.Doorbell) {
+                  return
+                }
                 const updateKey = Math.random()
                   .toString(36)
                   .substr(2, 8)
diff --git a/lib/device/rf-sensor.js b/lib/device/rf-sensor.js
index b45a0390..0a8564c1 100644
--- a/lib/device/rf-sensor.js
+++ b/lib/device/rf-sensor.js
@@ -63,7 +63,8 @@ module.exports = class deviceRFSensor {
       this.hapServ.CarbonDioxideSensor,
       this.hapServ.ContactSensor,
       this.hapServ.OccupancySensor,
-      this.hapServ.MotionSensor
+      this.hapServ.MotionSensor,
+      this.hapServ.Doorbell
     ]
 
     // Check which type this sensor is and get the correct service/characteristic
@@ -100,6 +101,10 @@ module.exports = class deviceRFSensor {
         char = this.hapChar.OccupancyDetected
         eveType = 'motion'
         break
+      case 'doorbell':
+        serv = this.hapServ.Doorbell
+        char = this.hapChar.ProgrammableSwitchEvent
+        break
       default:
         serv = this.hapServ.MotionSensor
         char = this.hapChar.MotionDetected
@@ -124,6 +129,16 @@ module.exports = class deviceRFSensor {
       service = accessory.addService(serv)
     }
 
+    // Remove double and long press from Doorbell service
+    if (serv === this.hapServ.Doorbell) {
+      service.getCharacteristic(this.hapChar.ProgrammableSwitchEvent).setProps({
+        validValues: [0]
+      })
+    } else {
+      // Always start with the sensor off (useful when restarting Homebridge, except Doorbell)
+      service.updateCharacteristic(char, 0)
+    }
+
     // See if we need to add or remove the Last Activation characteristic
     if (addLACharacteristic) {
       if (!service.testCharacteristic(this.eveChar.LastActivation)) {
@@ -135,9 +150,6 @@ module.exports = class deviceRFSensor {
       }
     }
 
-    // Always start with the sensor off (useful when restarting Homebridge)
-    service.updateCharacteristic(char, 0)
-
     // Add the get handlers only if the user has configured the offlineAsNoResponse setting
     if (platform.config.offlineAsNoResponse) {
       service.getCharacteristic(char).onGet(() => {
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 4d961f38..f04807b3 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -157,7 +157,7 @@ module.exports = {
     ],
     overrideLogging: ['default', 'standard', 'debug', 'disable'],
     obstructs: ['garage', 'garage_eachen'],
-    sensors: ['water', 'smoke', 'co', 'co2', 'contact', 'occupancy', 'motion'],
+    sensors: ['water', 'smoke', 'co', 'co2', 'contact', 'occupancy', 'motion', 'doorbell'],
     showAsType: ['blind', 'door', 'window']
   },
 

From 86b0ef26fd0832cbc9699abe126ba7515d96abf8 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 4 Jul 2021 13:36:00 +0100
Subject: [PATCH 2461/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 921fff7b..192095d8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -39,6 +39,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
   - Ability to change sensor type and other configurable options without the need to re-add the accessory
   - Configuration option `resetOnStartup` to reset the subdevices, useful when adding/removing subdevices to the bridge
   - Added option to specify a manual IP for an RF Bridge
+  - Added option to expose an RF sensor device as a `Doorbell` accessory type
 - **Light Devices**
   - Remove Adaptive Lighting feature from a device by setting the `adaptiveLightingShift` to `-1`
 - **Zigbee Button Devices**

From d96a88caa882d3bdf479c87014ca9cb45852b92e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 4 Jul 2021 13:36:37 +0100
Subject: [PATCH 2462/3183] 7.0.0-beta.8

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 4e29f097..055b236b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "7.0.0-beta.7",
+  "version": "7.0.0-beta.8",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 24d5d061..81e11e28 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "7.0.0-beta.7",
+  "version": "7.0.0-beta.8",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 875cca46120eaeb022c1e21c1ca35d1a497ce66c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 4 Jul 2021 13:57:09 +0100
Subject: [PATCH 2463/3183] expose rf sensor as programmable switch accessory
 type

---
 config.schema.json      |  4 ++++
 lib/device/rf-bridge.js | 10 +++++++---
 lib/device/rf-sensor.js |  9 +++++++--
 lib/utils/constants.js  | 12 +++++++++++-
 4 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index c671bbc0..12e3f673 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -1016,6 +1016,10 @@
                   "title": "Contact",
                   "enum": ["contact"]
                 },
+                {
+                  "title": "Programmable Button",
+                  "enum": ["p_button"]
+                },
                 {
                   "title": "Doorbell",
                   "enum": ["doorbell"]
diff --git a/lib/device/rf-bridge.js b/lib/device/rf-bridge.js
index c0c49487..5dcd6039 100644
--- a/lib/device/rf-bridge.js
+++ b/lib/device/rf-bridge.js
@@ -213,6 +213,10 @@ module.exports = class deviceRFBridge {
                     serv = this.hapServ.OccupancySensor
                     char = this.hapChar.OccupancyDetected
                     break
+                  case 'p_button':
+                    serv = this.hapServ.StatelessProgrammableSwitch
+                    char = this.hapChar.ProgrammableSwitchEvent
+                    break
                   case 'doorbell':
                     serv = this.hapServ.Doorbell
                     char = this.hapChar.ProgrammableSwitchEvent
@@ -231,8 +235,8 @@ module.exports = class deviceRFBridge {
                   }
                 }
 
-                // The doorbell is the one service that doesn't follow the pattern of activation
-                if (serv === this.hapServ.Doorbell) {
+                // Programmable button and doorbell activate differently
+                if (char === this.hapChar.ProgrammableSwitchEvent) {
                   subAccessory.getService(serv).updateCharacteristic(char, 0)
                 } else {
                   subAccessory.getService(serv).updateCharacteristic(char, 1)
@@ -246,7 +250,7 @@ module.exports = class deviceRFBridge {
                     this.lang.rfTrigYes
                   )
                 }
-                if (serv === this.hapServ.Doorbell) {
+                if (char === this.hapChar.ProgrammableSwitchEvent) {
                   return
                 }
                 const updateKey = Math.random()
diff --git a/lib/device/rf-sensor.js b/lib/device/rf-sensor.js
index 0a8564c1..06efecb0 100644
--- a/lib/device/rf-sensor.js
+++ b/lib/device/rf-sensor.js
@@ -64,6 +64,7 @@ module.exports = class deviceRFSensor {
       this.hapServ.ContactSensor,
       this.hapServ.OccupancySensor,
       this.hapServ.MotionSensor,
+      this.hapServ.StatelessProgrammableSwitch,
       this.hapServ.Doorbell
     ]
 
@@ -101,6 +102,10 @@ module.exports = class deviceRFSensor {
         char = this.hapChar.OccupancyDetected
         eveType = 'motion'
         break
+      case 'p_button':
+        serv = this.hapServ.StatelessProgrammableSwitch
+        char = this.hapChar.ProgrammableSwitchEvent
+        break
       case 'doorbell':
         serv = this.hapServ.Doorbell
         char = this.hapChar.ProgrammableSwitchEvent
@@ -129,8 +134,8 @@ module.exports = class deviceRFSensor {
       service = accessory.addService(serv)
     }
 
-    // Remove double and long press from Doorbell service
-    if (serv === this.hapServ.Doorbell) {
+    // Remove double and long press from Button and Doorbell service
+    if (char === this.hapChar.ProgrammableSwitchEvent) {
       service.getCharacteristic(this.hapChar.ProgrammableSwitchEvent).setProps({
         validValues: [0]
       })
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index f04807b3..1214ed36 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -157,7 +157,17 @@ module.exports = {
     ],
     overrideLogging: ['default', 'standard', 'debug', 'disable'],
     obstructs: ['garage', 'garage_eachen'],
-    sensors: ['water', 'smoke', 'co', 'co2', 'contact', 'occupancy', 'motion', 'doorbell'],
+    sensors: [
+      'water',
+      'smoke',
+      'co',
+      'co2',
+      'contact',
+      'occupancy',
+      'motion',
+      'p_button',
+      'doorbell'
+    ],
     showAsType: ['blind', 'door', 'window']
   },
 

From b0677929eea521c1e7ba7b6cf855d071969cdc7e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 4 Jul 2021 13:57:34 +0100
Subject: [PATCH 2464/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 192095d8..c7c21fa9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -40,6 +40,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
   - Configuration option `resetOnStartup` to reset the subdevices, useful when adding/removing subdevices to the bridge
   - Added option to specify a manual IP for an RF Bridge
   - Added option to expose an RF sensor device as a `Doorbell` accessory type
+  - Added option to expose an RF sensor device as a `StatelessProgrammableSwitch` accessory type
 - **Light Devices**
   - Remove Adaptive Lighting feature from a device by setting the `adaptiveLightingShift` to `-1`
 - **Zigbee Button Devices**

From 1c25bf700a5a90171dd93cc83dfe1fdef7e3c3f3 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 4 Jul 2021 13:58:27 +0100
Subject: [PATCH 2465/3183] 7.0.0-beta.9

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 055b236b..5c456d84 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "7.0.0-beta.8",
+  "version": "7.0.0-beta.9",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 81e11e28..30e4ab51 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "7.0.0-beta.8",
+  "version": "7.0.0-beta.9",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 3e5439c3a70f504da801f335ce0037c19cfdd4cb Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 4 Jul 2021 17:26:09 +0100
Subject: [PATCH 2466/3183] expose generic device as doorbell or programmable
 switch

---
 config.schema.json                |  14 +-
 lib/device/rf-bridge.js           |  30 ++--
 lib/device/simulation/doorbell.js | 191 +++++++++++++++++++++++++
 lib/device/simulation/p-button.js | 225 ++++++++++++++++++++++++++++++
 lib/index.js                      |  20 +++
 lib/utils/constants.js            |   2 +
 6 files changed, 467 insertions(+), 15 deletions(-)
 create mode 100644 lib/device/simulation/doorbell.js
 create mode 100644 lib/device/simulation/p-button.js

diff --git a/config.schema.json b/config.schema.json
index 12e3f673..2f21761f 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -513,7 +513,7 @@
             "ipAddress": {
               "type": "string",
               "title": "IP Address",
-              "description": "You can manually set the IP address for this Sonoff D1 if it cannot be discovered by the plugin.",
+              "description": "You can manually set the IP address for this device if it cannot be discovered by the plugin.",
               "condition": {
                 "functionBody": "return (model.mode !== 'wan' && model.lightDevices && model.lightDevices[arrayIndices] && ['d1'].includes(model.lightDevices[arrayIndices].deviceModel));"
               }
@@ -1165,6 +1165,14 @@
                   "title": "1 Sensor (with single or multi channel device)",
                   "enum": ["sensor"]
                 },
+                {
+                  "title": "1 Programmable Button (with single or multi channel device)",
+                  "enum": ["p_button"]
+                },
+                {
+                  "title": "1 Doorbell (with single or multi channel device)",
+                  "enum": ["doorbell"]
+                },
                 {
                   "title": "1 Air Purifier (with single or multi channel device)",
                   "enum": ["purifier"]
@@ -1283,7 +1291,7 @@
               "title": "IP Address",
               "description": "You can manually set the IP address for this device if it cannot be discovered by the plugin.",
               "condition": {
-                "functionBody": "return (model.mode !== 'wan' && model.groups && model.groups[arrayIndices] && ['blind', 'door', 'garage', 'garage_two', 'garage_four', 'garage_eachen', 'lock', 'purifier', 'sensor', 'switch_valve', 'tap', 'tap_two', 'valve', 'valve_two', 'valve_four', 'window'].includes(model.groups[arrayIndices].type));"
+                "functionBody": "return (model.mode !== 'wan' && model.groups && model.groups[arrayIndices] && ['blind', 'door', 'garage', 'garage_two', 'garage_four', 'garage_eachen', 'lock', 'purifier', 'sensor', 'p_button', 'doorbell', 'switch_valve', 'tap', 'tap_two', 'valve', 'valve_two', 'valve_four', 'window'].includes(model.groups[arrayIndices].type));"
               }
             },
             "overrideLogging": {
@@ -1309,7 +1317,7 @@
                 }
               ],
               "condition": {
-                "functionBody": "return (model.mode !== 'wan' && model.groups && model.groups[arrayIndices] && ['blind', 'cooler', 'dehumidifier', 'door', 'garage', 'garage_two', 'garage_four', 'garage_eachen', 'humidifier', 'lock', 'purifier', 'sensor', 'sensor_leak', 'switch_valve', 'tap', 'tap_two', 'thermostat', 'valve', 'valve_two', 'valve_four', 'window'].includes(model.groups[arrayIndices].type));"
+                "functionBody": "return (model.groups && model.groups[arrayIndices] && ['blind', 'cooler', 'dehumidifier', 'door', 'garage', 'garage_two', 'garage_four', 'garage_eachen', 'humidifier', 'lock', 'purifier', 'sensor', 'p_button', 'doorbell', 'sensor_leak', 'switch_valve', 'tap', 'tap_two', 'thermostat', 'valve', 'valve_two', 'valve_four', 'window'].includes(model.groups[arrayIndices].type));"
               }
             }
           }
diff --git a/lib/device/rf-bridge.js b/lib/device/rf-bridge.js
index 5dcd6039..164b6453 100644
--- a/lib/device/rf-bridge.js
+++ b/lib/device/rf-bridge.js
@@ -238,20 +238,26 @@ module.exports = class deviceRFBridge {
                 // Programmable button and doorbell activate differently
                 if (char === this.hapChar.ProgrammableSwitchEvent) {
                   subAccessory.getService(serv).updateCharacteristic(char, 0)
+                  if (params.updateSource && enableLogging) {
+                    this.log(
+                      '[%s] %s [%s].',
+                      subAccessory.displayName,
+                      this.lang.curState,
+                      this.lang.buttonSingle
+                    )
+                  }
+                  return
                 } else {
                   subAccessory.getService(serv).updateCharacteristic(char, 1)
-                }
-                subAccessory.eveService.addEntry({ status: 1 })
-                if (params.updateSource && enableLogging) {
-                  this.log(
-                    '[%s] %s [%s].',
-                    subAccessory.displayName,
-                    this.lang.curState,
-                    this.lang.rfTrigYes
-                  )
-                }
-                if (char === this.hapChar.ProgrammableSwitchEvent) {
-                  return
+                  subAccessory.eveService.addEntry({ status: 1 })
+                  if (params.updateSource && enableLogging) {
+                    this.log(
+                      '[%s] %s [%s].',
+                      subAccessory.displayName,
+                      this.lang.curState,
+                      this.lang.rfTrigYes
+                    )
+                  }
                 }
                 const updateKey = Math.random()
                   .toString(36)
diff --git a/lib/device/simulation/doorbell.js b/lib/device/simulation/doorbell.js
new file mode 100644
index 00000000..633a1650
--- /dev/null
+++ b/lib/device/simulation/doorbell.js
@@ -0,0 +1,191 @@
+/* jshint -W014, -W033, esversion: 9 */
+/* eslint-disable new-cap */
+'use strict'
+
+module.exports = class deviceDoorbell {
+  constructor (platform, accessory) {
+    // Set up variables from the platform
+    this.eveChar = platform.eveChar
+    this.funcs = platform.funcs
+    this.hapChar = platform.api.hap.Characteristic
+    this.hapErr = platform.api.hap.HapStatusError
+    this.hapServ = platform.api.hap.Service
+    this.lang = platform.lang
+    this.log = platform.log
+    this.platform = platform
+
+    // Set up variables from the accessory
+    this.name = accessory.displayName
+    this.accessory = accessory
+
+    // Initially set the online flag as true (to be then updated as false if necessary)
+    this.isOnline = true
+
+    // Set up custom variables for this device type
+    const deviceConf = platform.simulations[accessory.context.eweDeviceId]
+
+    // Set the correct logging variables for this accessory
+    this.enableLogging = !platform.config.disableDeviceLogging
+    this.enableDebugLogging = platform.config.debug
+    if (deviceConf && deviceConf.overrideLogging) {
+      switch (deviceConf.overrideLogging) {
+        case 'standard':
+          this.enableLogging = true
+          this.enableDebugLogging = false
+          break
+        case 'debug':
+          this.enableLogging = true
+          this.enableDebugLogging = true
+          break
+        case 'disable':
+          this.enableLogging = false
+          this.enableDebugLogging = false
+          break
+      }
+    }
+
+    // If the accessory has a switch service then remove it
+    if (this.accessory.getService(this.hapServ.Switch)) {
+      this.accessory.removeService(this.accessory.getService(this.hapServ.Switch))
+    }
+
+    // Add the doorbell service if it doesn't already exist
+    this.service =
+      this.accessory.getService(this.hapServ.Doorbell) ||
+      this.accessory.addService(this.hapServ.Doorbell)
+
+    // Set up the device type and power readings if necessary
+    if (platform.consts.devices.singleSwitch.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'singleSwitch'
+    } else if (platform.consts.devices.outlet.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'singleSwitch'
+      this.powerReadings = true
+    } else if (platform.consts.devices.multiSwitch.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'multiSwitch'
+      if (this.accessory.context.eweUIID === 126) {
+        // Add Eve power characteristics
+        this.powerReadings = true
+        this.isDualR3 = true
+      }
+    } else if (platform.consts.devices.outletSCM.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'multiSwitch'
+    }
+
+    // Add the get handlers only if the user has configured the offlineAsNoResponse setting
+    if (platform.config.offlineAsNoResponse) {
+      this.service.getCharacteristic(this.hapChar.ProgrammableSwitchEvent).onGet(() => {
+        if (!this.isOnline) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.ProgrammableSwitchEvent).value
+      })
+    }
+
+    // Set up an interval to get eWeLink to send power updates
+    if (
+      this.powerReadings &&
+      (!this.isDualR3 || (this.isDualR3 && platform.config.mode !== 'lan'))
+    ) {
+      setTimeout(() => {
+        this.internalUIUpdate()
+        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
+      }, 5000)
+
+      // Stop the intervals on Homebridge shutdown
+      platform.api.on('shutdown', () => {
+        clearInterval(this.intervalPoll)
+      })
+    }
+
+    // Output the customised options to the log
+    const opts = JSON.stringify({
+      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
+      type: deviceConf.type
+    })
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
+  }
+
+  async internalUIUpdate () {
+    try {
+      // Skip polling if device isn't online
+      if (!this.isOnline) {
+        return
+      }
+
+      // Send the params to request the updates
+      if (this.isDualR3) {
+        await this.platform.sendDeviceUpdate(this.accessory, { uiActive: { outlet: 0, time: 120 } })
+      } else {
+        await this.platform.sendDeviceUpdate(this.accessory, { uiActive: 120 })
+      }
+    } catch (err) {
+      // Suppress errors here
+    }
+  }
+
+  async externalUpdate (params) {
+    try {
+      if (!this.inUse) {
+        if (
+          (this.setup === 'multiSwitch' && params.switches && params.switches[0].switch === 'on') ||
+          (this.setup === 'singleSwitch' && params.switch && params.switch === 'on')
+        ) {
+          this.inUse = true
+          setTimeout(() => {
+            this.inUse = false
+          }, 2000)
+          this.service.updateCharacteristic(this.hapChar.ProgrammableSwitchEvent, 0)
+          if (params.updateSource && this.enableLogging) {
+            this.log('[%s] %s [%s].', this.name, this.lang.curState, this.lang.buttonSingle)
+          }
+        }
+      }
+
+      // Get the power readings given by certain devices
+      if (!this.powerReadings) {
+        return
+      }
+      let logger = false
+      let power
+      let voltage
+      let current
+      if (this.funcs.hasProperty(params, 'actPow_00')) {
+        power = parseInt(params.actPow_00) / 100
+        logger = true
+      } else if (this.funcs.hasProperty(params, 'power')) {
+        power = parseFloat(params.power)
+        logger = true
+      }
+      if (this.funcs.hasProperty(params, 'voltage_00')) {
+        voltage = parseInt(params.voltage_00) / 100
+        logger = true
+      } else if (this.funcs.hasProperty(params, 'voltage')) {
+        voltage = parseFloat(params.voltage)
+        logger = true
+      }
+      if (this.funcs.hasProperty(params, 'current_00')) {
+        current = parseInt(params.current_00) / 100
+        logger = true
+      } else if (this.funcs.hasProperty(params, 'current')) {
+        current = parseFloat(params.current)
+        logger = true
+      }
+      if (params.updateSource && logger && this.enableLogging) {
+        this.log(
+          '[%s] %s%s%s.',
+          this.name,
+          power !== undefined ? this.lang.curPower + ' [' + power + 'W]' : '',
+          voltage !== undefined ? ' ' + this.lang.curVolt + ' [' + voltage + 'V]' : '',
+          current !== undefined ? ' ' + this.lang.curCurr + ' [' + current + 'A]' : ''
+        )
+      }
+    } catch (err) {
+      this.inUse = false
+      this.platform.deviceUpdateError(this.accessory, err, false)
+    }
+  }
+
+  markStatus (isOnline) {
+    this.isOnline = isOnline
+  }
+}
diff --git a/lib/device/simulation/p-button.js b/lib/device/simulation/p-button.js
new file mode 100644
index 00000000..ffa78177
--- /dev/null
+++ b/lib/device/simulation/p-button.js
@@ -0,0 +1,225 @@
+/* jshint -W014, -W033, esversion: 9 */
+/* eslint-disable new-cap */
+'use strict'
+
+module.exports = class devicePButton {
+  constructor (platform, accessory) {
+    // Set up variables from the platform
+    this.eveChar = platform.eveChar
+    this.funcs = platform.funcs
+    this.hapChar = platform.api.hap.Characteristic
+    this.hapErr = platform.api.hap.HapStatusError
+    this.hapServ = platform.api.hap.Service
+    this.lang = platform.lang
+    this.log = platform.log
+    this.platform = platform
+
+    // Set up variables from the accessory
+    this.name = accessory.displayName
+    this.accessory = accessory
+
+    // Initially set the online flag as true (to be then updated as false if necessary)
+    this.isOnline = true
+
+    // Set up custom variables for this device type
+    const deviceConf = platform.simulations[accessory.context.eweDeviceId]
+
+    // Set the correct logging variables for this accessory
+    this.enableLogging = !platform.config.disableDeviceLogging
+    this.enableDebugLogging = platform.config.debug
+    if (deviceConf && deviceConf.overrideLogging) {
+      switch (deviceConf.overrideLogging) {
+        case 'standard':
+          this.enableLogging = true
+          this.enableDebugLogging = false
+          break
+        case 'debug':
+          this.enableLogging = true
+          this.enableDebugLogging = true
+          break
+        case 'disable':
+          this.enableLogging = false
+          this.enableDebugLogging = false
+          break
+      }
+    }
+
+    // If the accessory has a switch service then remove it
+    if (this.accessory.getService(this.hapServ.Switch)) {
+      this.accessory.removeService(this.accessory.getService(this.hapServ.Switch))
+    }
+
+    // Add the stateless programmable switch service if it doesn't already exist
+    this.service =
+      this.accessory.getService(this.hapServ.StatelessProgrammableSwitch) ||
+      this.accessory.addService(this.hapServ.StatelessProgrammableSwitch)
+
+    // Remove the double and long press options
+    this.service.getCharacteristic(this.hapChar.ProgrammableSwitchEvent).setProps({
+      validValues: [0]
+    })
+
+    // Set up the device type and power readings if necessary
+    if (platform.consts.devices.singleSwitch.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'singleSwitch'
+    } else if (platform.consts.devices.outlet.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'singleSwitch'
+
+      // Add Eve power characteristics
+      this.powerReadings = true
+      if (!this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
+        this.service.addCharacteristic(this.eveChar.CurrentConsumption)
+      }
+      if (this.accessory.context.eweUIID === 32) {
+        if (!this.service.testCharacteristic(this.eveChar.ElectricCurrent)) {
+          this.service.addCharacteristic(this.eveChar.ElectricCurrent)
+        }
+        if (!this.service.testCharacteristic(this.eveChar.Voltage)) {
+          this.service.addCharacteristic(this.eveChar.Voltage)
+        }
+      }
+    } else if (platform.consts.devices.multiSwitch.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'multiSwitch'
+      if (this.accessory.context.eweUIID === 126) {
+        // Add Eve power characteristics
+        this.powerReadings = true
+        if (!this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
+          this.service.addCharacteristic(this.eveChar.CurrentConsumption)
+        }
+        if (!this.service.testCharacteristic(this.eveChar.ElectricCurrent)) {
+          this.service.addCharacteristic(this.eveChar.ElectricCurrent)
+        }
+        if (!this.service.testCharacteristic(this.eveChar.Voltage)) {
+          this.service.addCharacteristic(this.eveChar.Voltage)
+        }
+        this.isDualR3 = true
+      }
+    } else if (platform.consts.devices.outletSCM.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'multiSwitch'
+    }
+
+    // Add the get handlers only if the user has configured the offlineAsNoResponse setting
+    if (platform.config.offlineAsNoResponse) {
+      this.service.getCharacteristic(this.hapChar.ProgrammableSwitchEvent).onGet(() => {
+        if (!this.isOnline) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.ProgrammableSwitchEvent).value
+      })
+    }
+
+    // Set up an interval to get eWeLink to send power updates
+    if (
+      this.powerReadings &&
+      (!this.isDualR3 || (this.isDualR3 && platform.config.mode !== 'lan'))
+    ) {
+      setTimeout(() => {
+        this.internalUIUpdate()
+        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
+      }, 5000)
+
+      // Stop the intervals on Homebridge shutdown
+      platform.api.on('shutdown', () => {
+        clearInterval(this.intervalPoll)
+      })
+    }
+
+    // Output the customised options to the log
+    const opts = JSON.stringify({
+      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
+      operationTime: this.operationTime,
+      type: deviceConf.type
+    })
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
+  }
+
+  async internalUIUpdate () {
+    try {
+      // Skip polling if device isn't online
+      if (!this.isOnline) {
+        return
+      }
+
+      // Send the params to request the updates
+      if (this.isDualR3) {
+        await this.platform.sendDeviceUpdate(this.accessory, { uiActive: { outlet: 0, time: 120 } })
+      } else {
+        await this.platform.sendDeviceUpdate(this.accessory, { uiActive: 120 })
+      }
+    } catch (err) {
+      // Suppress errors here
+    }
+  }
+
+  async externalUpdate (params) {
+    try {
+      if (!this.inUse) {
+        if (
+          (this.setup === 'multiSwitch' && params.switches && params.switches[0].switch === 'on') ||
+          (this.setup === 'singleSwitch' && params.switch && params.switch === 'on')
+        ) {
+          this.inUse = true
+          setTimeout(() => {
+            this.inUse = false
+          }, 2000)
+          this.service.updateCharacteristic(this.hapChar.ProgrammableSwitchEvent, 0)
+          if (params.updateSource && this.enableLogging) {
+            this.log('[%s] %s [%s].', this.name, this.lang.curState, this.lang.buttonSingle)
+          }
+        }
+      }
+
+      // Get the power readings given by certain devices
+      if (!this.powerReadings) {
+        return
+      }
+      let logger = false
+      let power
+      let voltage
+      let current
+      if (this.funcs.hasProperty(params, 'actPow_00')) {
+        power = parseInt(params.actPow_00) / 100
+        this.service.updateCharacteristic(this.eveChar.CurrentConsumption, power)
+        logger = true
+      } else if (this.funcs.hasProperty(params, 'power')) {
+        power = parseFloat(params.power)
+        this.service.updateCharacteristic(this.eveChar.CurrentConsumption, power)
+        logger = true
+      }
+      if (this.funcs.hasProperty(params, 'voltage_00')) {
+        voltage = parseInt(params.voltage_00) / 100
+        this.service.updateCharacteristic(this.eveChar.Voltage, voltage)
+        logger = true
+      } else if (this.funcs.hasProperty(params, 'voltage')) {
+        voltage = parseFloat(params.voltage)
+        this.service.updateCharacteristic(this.eveChar.Voltage, voltage)
+        logger = true
+      }
+      if (this.funcs.hasProperty(params, 'current_00')) {
+        current = parseInt(params.current_00) / 100
+        this.service.updateCharacteristic(this.eveChar.ElectricCurrent, current)
+        logger = true
+      } else if (this.funcs.hasProperty(params, 'current')) {
+        current = parseFloat(params.current)
+        this.service.updateCharacteristic(this.eveChar.ElectricCurrent, current)
+        logger = true
+      }
+      if (params.updateSource && logger && this.enableLogging) {
+        this.log(
+          '[%s] %s%s%s.',
+          this.name,
+          power !== undefined ? this.lang.curPower + ' [' + power + 'W]' : '',
+          voltage !== undefined ? ' ' + this.lang.curVolt + ' [' + voltage + 'V]' : '',
+          current !== undefined ? ' ' + this.lang.curCurr + ' [' + current + 'A]' : ''
+        )
+      }
+    } catch (err) {
+      this.inUse = false
+      this.platform.deviceUpdateError(this.accessory, err, false)
+    }
+  }
+
+  markStatus (isOnline) {
+    this.isOnline = isOnline
+  }
+}
diff --git a/lib/index.js b/lib/index.js
index 7a9bca69..14a95431 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -930,6 +930,26 @@ class eWeLinkPlatform {
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/simulation/sensor'))(this, accessory)
         /******************/
+      } else if (
+        this.simulations[device.deviceid] &&
+        this.simulations[device.deviceid].type === 'p_button'
+      ) {
+        /*******************************
+        PROGRAMMABLE BUTTON [SIMULATION]
+        *******************************/
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
+        accessory.control = new (require('./device/simulation/p-button'))(this, accessory)
+        /******************************/
+      } else if (
+        this.simulations[device.deviceid] &&
+        this.simulations[device.deviceid].type === 'doorbell'
+      ) {
+        /********************
+        DOORBELL [SIMULATION]
+        ********************/
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
+        accessory.control = new (require('./device/simulation/doorbell'))(this, accessory)
+        /*******************/
       } else if (
         this.simulations[device.deviceid] &&
         this.simulations[device.deviceid].type === 'purifier'
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 1214ed36..a262f034 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -137,12 +137,14 @@ module.exports = {
       'cooler',
       'dehumidifier',
       'door',
+      'doorbell',
       'garage',
       'garage_two',
       'garage_four',
       'garage_eachen',
       'humidifier',
       'lock',
+      'p_button',
       'purifier',
       'sensor',
       'sensor_leak',

From 8b4a519f4b070f60a7a37cf33d66473e428d8c9b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 4 Jul 2021 17:26:54 +0100
Subject: [PATCH 2467/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c7c21fa9..dbb2da05 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -51,6 +51,8 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 - **Humidity Sensor Devices**
   - Config option to offset the recorded humidity (%RH) for devices that report this
 - **Accessory Simulations**
+  - Expose a generic single/multi-channel device as a `Doorbell` accessory
+  - Expose a generic single/multi-channel device as a `StatelessProgrammableSwitch` accessory
   - Added `TimesOpened` Eve characteristic functionality to single garage door simulation
   - Added the option of using a DW2 or Zigbee contact sensor to determine _Locked_ and _Unlocked_ state for lock simulation
   - Wattage/Voltage/Amp readings (via Eve app) visible for simulations when using a DUALR3 device

From ee78f6bc8ce26b219b6652ec8653f9d0e06f0419 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 4 Jul 2021 17:27:27 +0100
Subject: [PATCH 2468/3183] 7.0.0-beta.10

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 5c456d84..7dd81aa2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "7.0.0-beta.9",
+  "version": "7.0.0-beta.10",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 30e4ab51..c0d24986 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "7.0.0-beta.9",
+  "version": "7.0.0-beta.10",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 7cfa5f385263af775d239296f5e27e988cb011f2 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 4 Jul 2021 20:29:50 +0100
Subject: [PATCH 2469/3183] show sensortimelength and diff when needed

---
 config.schema.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 2f21761f..658c4fcf 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -1036,7 +1036,7 @@
               "placeholder": 60,
               "minimum": 1,
               "condition": {
-                "functionBody": "return (model.bridgeSensors && model.bridgeSensors[arrayIndices] && model.bridgeSensors[arrayIndices].fullDeviceId && model.bridgeSensors[arrayIndices].fullDeviceId.length >= 13);"
+                "functionBody": "return (model.bridgeSensors && model.bridgeSensors[arrayIndices] && model.bridgeSensors[arrayIndices].type && ['motion', 'smoke', 'water', 'co', 'co2', 'occupancy', 'contact'].includes(model.bridgeSensors[arrayIndices].type));"
               }
             },
             "sensorTimeDifference": {
@@ -1046,7 +1046,7 @@
               "placeholder": 60,
               "minimum": 5,
               "condition": {
-                "functionBody": "return (model.bridgeSensors && model.bridgeSensors[arrayIndices] && model.bridgeSensors[arrayIndices].fullDeviceId && model.bridgeSensors[arrayIndices].fullDeviceId.length >= 13);"
+                "functionBody": "return (model.bridgeSensors && model.bridgeSensors[arrayIndices] && model.bridgeSensors[arrayIndices].type && ['motion', 'smoke', 'water', 'co', 'co2', 'occupancy', 'contact'].includes(model.bridgeSensors[arrayIndices].type));"
               }
             },
             "overrideLogging": {

From e18148b61efb99de0afb2c582bdbc4009b91db40 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 5 Jul 2021 14:40:00 +0100
Subject: [PATCH 2470/3183] move TH10/16 simulations to thDevices config

---
 config.schema.json                    | 53 +++++++++-----
 lib/device/sensor-ambient.js          |  3 +-
 lib/device/simulation/cooler.js       |  7 +-
 lib/device/simulation/dehumidifier.js |  7 +-
 lib/device/simulation/heater.js       |  7 +-
 lib/device/simulation/humidifier.js   |  7 +-
 lib/index.js                          | 99 ++++++++++-----------------
 lib/utils/constants.js                | 36 +++++-----
 8 files changed, 104 insertions(+), 115 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 658c4fcf..0426a7a1 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -591,12 +591,42 @@
                 "functionBody": "return (model.thDevices && model.thDevices[arrayIndices] && model.thDevices[arrayIndices].deviceId && model.thDevices[arrayIndices].deviceId.length === 10);"
               }
             },
+            "showAs": {
+              "type": "string",
+              "title": "Show As (Simulation)",
+              "description": "Expose this device as a different HomeKit accessory type.",
+              "oneOf": [
+                {
+                  "title": "1 Switch + Sensors (Default)",
+                  "enum": ["default"]
+                },
+                {
+                  "title": "1 Heater",
+                  "enum": ["heater"]
+                },
+                {
+                  "title": "1 Cooler",
+                  "enum": ["cooler"]
+                },
+                {
+                  "title": "1 Humidifier",
+                  "enum": ["humidifier"]
+                },
+                {
+                  "title": "1 Dehumidifier",
+                  "enum": ["dehumidifier"]
+                }
+              ],
+              "condition": {
+                "functionBody": "return (model.thDevices && model.thDevices[arrayIndices] && ['th'].includes(model.thDevices[arrayIndices].deviceModel));"
+              }
+            },
             "hideSwitch": {
               "type": "boolean",
               "title": "Hide Switch",
               "description": "If true, this accessory will hide the TH10/16 switch from HomeKit.",
               "condition": {
-                "functionBody": "return (model.thDevices && model.thDevices[arrayIndices] && ['th'].includes(model.thDevices[arrayIndices].deviceModel));"
+                "functionBody": "return (model.thDevices && model.thDevices[arrayIndices] && ['th'].includes(model.thDevices[arrayIndices].deviceModel) && !['heater', 'cooler', 'humidifier', 'dehumidifier'].includes(model.thDevices[arrayIndices].showAs));"
               }
             },
             "offset": {
@@ -624,7 +654,7 @@
               "placeholder": 10,
               "minimum": 0,
               "condition": {
-                "functionBody": "return (model.thDevices && model.thDevices[arrayIndices] && ['th'].includes(model.thDevices[arrayIndices].deviceModel));"
+                "functionBody": "return (model.thDevices && model.thDevices[arrayIndices] && ['th'].includes(model.thDevices[arrayIndices].deviceModel) && ['heater', 'cooler'].includes(model.thDevices[arrayIndices].showAs));"
               }
             },
             "maxTarget": {
@@ -634,7 +664,7 @@
               "placeholder": 30,
               "minimum": 1,
               "condition": {
-                "functionBody": "return (model.thDevices && model.thDevices[arrayIndices] && ['th'].includes(model.thDevices[arrayIndices].deviceModel));"
+                "functionBody": "return (model.thDevices && model.thDevices[arrayIndices] && ['th'].includes(model.thDevices[arrayIndices].deviceModel) && ['heater', 'cooler'].includes(model.thDevices[arrayIndices].showAs));"
               }
             },
             "ipAddress": {
@@ -1177,22 +1207,6 @@
                   "title": "1 Air Purifier (with single or multi channel device)",
                   "enum": ["purifier"]
                 },
-                {
-                  "title": "1 Heater (with Sonoff TH10 or TH16)",
-                  "enum": ["thermostat"]
-                },
-                {
-                  "title": "1 Cooler (with Sonoff TH10 or TH16)",
-                  "enum": ["cooler"]
-                },
-                {
-                  "title": "1 Humidifier (with Sonoff TH10 or TH16)",
-                  "enum": ["humidifier"]
-                },
-                {
-                  "title": "1 Dehumidifier (with Sonoff TH10 or TH16)",
-                  "enum": ["dehumidifier"]
-                },
                 {
                   "title": "1 Leak Sensor (with Sonoff DW2)",
                   "enum": ["sensor_leak"]
@@ -1461,6 +1475,7 @@
             "thDevices[].deviceId",
             "thDevices[].deviceModel",
             "thDevices[].label",
+            "thDevices[].showAs",
             "thDevices[].hideSwitch",
             "thDevices[].offset",
             "thDevices[].humidityOffset",
diff --git a/lib/device/sensor-ambient.js b/lib/device/sensor-ambient.js
index 757609e6..1de79ac6 100644
--- a/lib/device/sensor-ambient.js
+++ b/lib/device/sensor-ambient.js
@@ -159,7 +159,8 @@ module.exports = class deviceSensorAmbient {
       hideSwitch: this.hideSwitch,
       humidityOffset: this.humiOffset,
       logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
-      offset: this.tempOffset
+      offset: this.tempOffset,
+      showAs: 'default'
     })
     this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
diff --git a/lib/device/simulation/cooler.js b/lib/device/simulation/cooler.js
index 4fadd544..a5197aec 100644
--- a/lib/device/simulation/cooler.js
+++ b/lib/device/simulation/cooler.js
@@ -22,7 +22,6 @@ module.exports = class deviceHeater {
 
     // Set up custom variables for this device type
     const deviceConf = platform.thDevices[accessory.context.eweDeviceId]
-    const deviceConf2 = platform.simulations[accessory.context.eweDeviceId]
     this.tempOffset =
       deviceConf && deviceConf.offset ? deviceConf.offset : platform.consts.defaultValues.offset
     this.humiOffset =
@@ -41,8 +40,8 @@ module.exports = class deviceHeater {
     // Set the correct logging variables for this accessory
     this.enableLogging = !platform.config.disableDeviceLogging
     this.enableDebugLogging = platform.config.debug
-    if (deviceConf2 && deviceConf2.overrideLogging) {
-      switch (deviceConf2.overrideLogging) {
+    if (deviceConf && deviceConf.overrideLogging) {
+      switch (deviceConf.overrideLogging) {
         case 'standard':
           this.enableLogging = true
           this.enableDebugLogging = false
@@ -223,7 +222,7 @@ module.exports = class deviceHeater {
       maxTarget: this.maxTarget,
       minTarget: this.minTarget,
       offset: this.tempOffset,
-      type: deviceConf2.type
+      showAs: 'cooler'
     })
     this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
diff --git a/lib/device/simulation/dehumidifier.js b/lib/device/simulation/dehumidifier.js
index a53ea16e..ca3e0b1a 100644
--- a/lib/device/simulation/dehumidifier.js
+++ b/lib/device/simulation/dehumidifier.js
@@ -22,7 +22,6 @@ module.exports = class deviceHeater {
 
     // Set up custom variables for this device type
     const deviceConf = platform.thDevices[accessory.context.eweDeviceId]
-    const deviceConf2 = platform.simulations[accessory.context.eweDeviceId]
     this.tempOffset =
       deviceConf && deviceConf.offset ? deviceConf.offset : platform.consts.defaultValues.offset
     this.humiOffset =
@@ -33,8 +32,8 @@ module.exports = class deviceHeater {
     // Set the correct logging variables for this accessory
     this.enableLogging = !platform.config.disableDeviceLogging
     this.enableDebugLogging = platform.config.debug
-    if (deviceConf2 && deviceConf2.overrideLogging) {
-      switch (deviceConf2.overrideLogging) {
+    if (deviceConf && deviceConf.overrideLogging) {
+      switch (deviceConf.overrideLogging) {
         case 'standard':
           this.enableLogging = true
           this.enableDebugLogging = false
@@ -199,7 +198,7 @@ module.exports = class deviceHeater {
       humidityOffset: this.humiOffset,
       logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
       offset: this.tempOffset,
-      type: deviceConf2.type
+      showAs: 'dehumidifier'
     })
     this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
diff --git a/lib/device/simulation/heater.js b/lib/device/simulation/heater.js
index b99085cb..cb1c172a 100644
--- a/lib/device/simulation/heater.js
+++ b/lib/device/simulation/heater.js
@@ -22,7 +22,6 @@ module.exports = class deviceHeater {
 
     // Set up custom variables for this device type
     const deviceConf = platform.thDevices[accessory.context.eweDeviceId]
-    const deviceConf2 = platform.simulations[accessory.context.eweDeviceId]
     this.tempOffset =
       deviceConf && deviceConf.offset ? deviceConf.offset : platform.consts.defaultValues.offset
     this.humiOffset =
@@ -41,8 +40,8 @@ module.exports = class deviceHeater {
     // Set the correct logging variables for this accessory
     this.enableLogging = !platform.config.disableDeviceLogging
     this.enableDebugLogging = platform.config.debug
-    if (deviceConf2 && deviceConf2.overrideLogging) {
-      switch (deviceConf2.overrideLogging) {
+    if (deviceConf && deviceConf.overrideLogging) {
+      switch (deviceConf.overrideLogging) {
         case 'standard':
           this.enableLogging = true
           this.enableDebugLogging = false
@@ -229,7 +228,7 @@ module.exports = class deviceHeater {
       maxTarget: this.maxTarget,
       minTarget: this.minTarget,
       offset: this.tempOffset,
-      type: deviceConf2.type
+      showAs: 'heater'
     })
     this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
diff --git a/lib/device/simulation/humidifier.js b/lib/device/simulation/humidifier.js
index b27dbc6b..47cf437e 100644
--- a/lib/device/simulation/humidifier.js
+++ b/lib/device/simulation/humidifier.js
@@ -22,7 +22,6 @@ module.exports = class deviceHeater {
 
     // Set up custom variables for this device type
     const deviceConf = platform.thDevices[accessory.context.eweDeviceId]
-    const deviceConf2 = platform.simulations[accessory.context.eweDeviceId]
     this.tempOffset =
       deviceConf && deviceConf.offset ? deviceConf.offset : platform.consts.defaultValues.offset
     this.humiOffset =
@@ -32,8 +31,8 @@ module.exports = class deviceHeater {
     // Set the correct logging variables for this accessory
     this.enableLogging = !platform.config.disableDeviceLogging
     this.enableDebugLogging = platform.config.debug
-    if (deviceConf2 && deviceConf2.overrideLogging) {
-      switch (deviceConf2.overrideLogging) {
+    if (deviceConf && deviceConf.overrideLogging) {
+      switch (deviceConf.overrideLogging) {
         case 'standard':
           this.enableLogging = true
           this.enableDebugLogging = false
@@ -198,7 +197,7 @@ module.exports = class deviceHeater {
       humidityOffset: this.humiOffset,
       logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
       offset: this.tempOffset,
-      type: deviceConf2.type
+      showAs: 'humidifier'
     })
     this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
diff --git a/lib/index.js b/lib/index.js
index 14a95431..e6b8b444 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -257,6 +257,7 @@ class eWeLinkPlatform {
                     break
                   }
                   case 'overrideLogging':
+                  case 'showAs':
                   case 'showAsType': {
                     const inSet = this.consts.allowed[k].includes(v)
                     if (typeof v !== 'string' || !inSet) {
@@ -1006,70 +1007,46 @@ class eWeLinkPlatform {
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/thermostat'))(this, accessory)
         /*******/
-      } else if (
-        this.simulations[device.deviceid] &&
-        this.simulations[device.deviceid].type === 'thermostat' &&
-        this.consts.devices.sensorAmbient.includes(uiid)
-      ) {
-        /*************************************
-        HEATERS [TH10/16 ACCESSORY SIMULATION]
-        *************************************/
-        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.context.sensorType = device.params.sensorType
-        accessory.control = new (require('./device/simulation/heater'))(this, accessory)
-        /************************************/
-      } else if (
-        this.simulations[device.deviceid] &&
-        this.simulations[device.deviceid].type === 'cooler' &&
-        this.consts.devices.sensorAmbient.includes(uiid)
-      ) {
-        /*************************************
-        COOLERS [TH10/16 ACCESSORY SIMULATION]
-        *************************************/
-        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.context.sensorType = device.params.sensorType
-        accessory.control = new (require('./device/simulation/cooler'))(this, accessory)
-        /************************************/
-      } else if (
-        this.simulations[device.deviceid] &&
-        this.simulations[device.deviceid].type === 'humidifier' &&
-        this.consts.devices.sensorAmbient.includes(uiid)
-      ) {
-        /*****************************************
-        HUMIDIFIERS [TH10/16 ACCESSORY SIMULATION]
-        *****************************************/
-        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
-        if (device.params.sensorType === 'DS18B20') {
-          this.log.warn('[%s] %s.', accessory.displayName, this.lang.sensorErr)
-          return
-        }
-        accessory.context.sensorType = device.params.sensorType
-        accessory.control = new (require('./device/simulation/humidifier'))(this, accessory)
-        /*****************************************/
-      } else if (
-        this.simulations[device.deviceid] &&
-        this.simulations[device.deviceid].type === 'dehumidifier' &&
-        this.consts.devices.sensorAmbient.includes(uiid)
-      ) {
-        /*******************************************
-        DEHUMIDIFIERS [TH10/16 ACCESSORY SIMULATION]
-        *******************************************/
-        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
-        if (device.params.sensorType === 'DS18B20') {
-          this.log.warn('[%s] %s.', accessory.displayName, this.lang.sensorErr)
-          return
-        }
-        accessory.context.sensorType = device.params.sensorType
-        accessory.control = new (require('./device/simulation/dehumidifier'))(this, accessory)
-        /*******************************************/
       } else if (this.consts.devices.sensorAmbient.includes(uiid)) {
-        /***********************
-        SENSOR [AMBIENT-TH10/16]
-        ***********************/
+        /****************
+        SENSORS [TH10/16]
+        ****************/
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
         accessory.context.sensorType = device.params.sensorType
-        accessory.control = new (require('./device/sensor-ambient'))(this, accessory)
-        /**********************/
+        let instance
+        switch (this.thDevices[device.deviceid] && this.thDevices[device.deviceid].showAs) {
+          case 'cooler':
+            instance = 'simulation/cooler'
+            break
+          case 'dehumidifier':
+            if (device.params.sensorType === 'DS18B20') {
+              if (devicesInHB.has(uuid)) {
+                this.removeAccessory(devicesInHB.get(uuid))
+              }
+              this.log.warn('[%s] %s.', device.name, this.lang.sensorErr)
+              return
+            }
+            instance = 'simulation/dehumidifier'
+            break
+          case 'heater':
+            instance = 'simulation/heater'
+            break
+          case 'humidifier':
+            if (device.params.sensorType === 'DS18B20') {
+              if (devicesInHB.has(uuid)) {
+                this.removeAccessory(devicesInHB.get(uuid))
+              }
+              this.log.warn('[%s] %s.', device.name, this.lang.sensorErr)
+              return
+            }
+            instance = 'simulation/humidifier'
+            break
+          default:
+            instance = 'sensor-ambient'
+            break
+        }
+        accessory.control = new (require('./device/' + instance))(this, accessory)
+        /***************/
       } else if (this.consts.devices.sensorTempHumi.includes(uiid)) {
         /*************************
         SENSOR [AMBIENT-SONOFF SC]
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index a262f034..82e887d4 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -30,36 +30,37 @@ module.exports = {
   },
 
   defaultValues: {
-    httpHost: 'eu-apia.coolkit.cc',
+    adaptiveLightingShift: 0,
     apiPort: 0,
+    brightnessStep: 1,
+    httpHost: 'eu-apia.coolkit.cc',
+    humidityOffset: 0,
     inUsePowerThreshold: 0,
     lowBattThreshold: 25,
-    sensorTimeLength: 60,
-    sensorTimeDifference: 60,
-    offset: 0,
-    humidityOffset: 0,
-    minTarget: 10,
     maxTarget: 30,
+    minTarget: 10,
+    mode: 'auto',
+    offset: 0,
     operationTime: 100,
     operationTimeDown: 100,
-    mode: 'auto',
-    brightnessStep: 1,
-    adaptiveLightingShift: 0,
-    overrideLogging: 'default'
+    overrideLogging: 'default',
+    sensorTimeDifference: 60,
+    sensorTimeLength: 60,
+    showAs: 'default'
   },
 
   minValues: {
+    adaptiveLightingShift: -1,
     apiPort: 0,
+    brightnessStep: 1,
     inUsePowerThreshold: 0,
     lowBattThreshold: 5,
-    sensorTimeLength: 1,
-    sensorTimeDifference: 5,
-    minTarget: 0,
     maxTarget: 1,
+    minTarget: 0,
     operationTime: 20,
     operationTimeDown: 20,
-    brightnessStep: 1,
-    adaptiveLightingShift: -1
+    sensorTimeDifference: 5,
+    sensorTimeLength: 1
   },
 
   appId: 'oeVkj2lYFGnJu5XUtWisfW4utiN4u9Mq',
@@ -111,6 +112,7 @@ module.exports = {
       'deviceId',
       'deviceModel',
       'label',
+      'showAs',
       'hideSwitch',
       'offset',
       'humidityOffset',
@@ -134,15 +136,12 @@ module.exports = {
     rfDevices: ['deviceId', 'label', 'resetOnStartup', 'ipAddress', 'overrideLogging'],
     groupTypes: [
       'blind',
-      'cooler',
-      'dehumidifier',
       'door',
       'doorbell',
       'garage',
       'garage_two',
       'garage_four',
       'garage_eachen',
-      'humidifier',
       'lock',
       'p_button',
       'purifier',
@@ -170,6 +169,7 @@ module.exports = {
       'p_button',
       'doorbell'
     ],
+    showAs: ['cooler', 'dehumidifier', 'heater', 'humidifier'],
     showAsType: ['blind', 'door', 'window']
   },
 

From 91df15f922a854323dd6b44107cea6de14699307 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 5 Jul 2021 15:01:28 +0100
Subject: [PATCH 2471/3183] move DW2 simulations to sensorDevices config

---
 config.schema.json                   | 23 +++++++++++++++++++----
 lib/device/sensor-contact.js         |  3 ++-
 lib/device/simulation/sensor-leak.js |  7 +++----
 lib/index.js                         | 22 ++++++++++------------
 lib/utils/constants.js               |  3 +--
 5 files changed, 35 insertions(+), 23 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 0426a7a1..78f400cf 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -841,6 +841,24 @@
                 "functionBody": "return (model.sensorDevices && model.sensorDevices[arrayIndices] && model.sensorDevices[arrayIndices].deviceId && model.sensorDevices[arrayIndices].deviceId.length === 10);"
               }
             },
+            "showAs": {
+              "type": "string",
+              "title": "Show As (Simulation)",
+              "description": "Expose this device as a different HomeKit accessory type.",
+              "oneOf": [
+                {
+                  "title": "1 Contact Sensor (Default)",
+                  "enum": ["default"]
+                },
+                {
+                  "title": "1 Leak Sensor",
+                  "enum": ["sensor_leak"]
+                }
+              ],
+              "condition": {
+                "functionBody": "return (model.sensorDevices && model.sensorDevices[arrayIndices] && ['dw'].includes(model.sensorDevices[arrayIndices].deviceModel));"
+              }
+            },
             "lowBattThreshold": {
               "type": "integer",
               "title": "Low Battery Threshold",
@@ -1206,10 +1224,6 @@
                 {
                   "title": "1 Air Purifier (with single or multi channel device)",
                   "enum": ["purifier"]
-                },
-                {
-                  "title": "1 Leak Sensor (with Sonoff DW2)",
-                  "enum": ["sensor_leak"]
                 }
               ],
               "condition": {
@@ -1522,6 +1536,7 @@
             "sensorDevices[].deviceId",
             "sensorDevices[].deviceModel",
             "sensorDevices[].label",
+            "sensorDevices[].showAs",
             "sensorDevices[].lowBattThreshold",
             "sensorDevices[].offset",
             "sensorDevices[].humidityOffset",
diff --git a/lib/device/sensor-contact.js b/lib/device/sensor-contact.js
index d7398405..43e60ac3 100644
--- a/lib/device/sensor-contact.js
+++ b/lib/device/sensor-contact.js
@@ -78,7 +78,8 @@ module.exports = class deviceSensorContact {
     // Output the customised options to the log
     const opts = JSON.stringify({
       logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
-      lowBattThreshold: this.lowBattThreshold
+      lowBattThreshold: this.lowBattThreshold,
+      showAs: 'default'
     })
     this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
diff --git a/lib/device/simulation/sensor-leak.js b/lib/device/simulation/sensor-leak.js
index 4b8c0637..cf49e6d9 100644
--- a/lib/device/simulation/sensor-leak.js
+++ b/lib/device/simulation/sensor-leak.js
@@ -19,7 +19,6 @@ module.exports = class deviceSensorLeak {
 
     // Set up custom variables for this device type
     const deviceConf = platform.sensorDevices[accessory.context.eweDeviceId]
-    const deviceConf2 = platform.simulations[accessory.context.eweDeviceId]
     this.lowBattThreshold =
       deviceConf && deviceConf.lowBattThreshold
         ? Math.min(deviceConf.lowBattThreshold, 100)
@@ -28,8 +27,8 @@ module.exports = class deviceSensorLeak {
     // Set the correct logging variables for this accessory
     this.enableLogging = !platform.config.disableDeviceLogging
     this.enableDebugLogging = platform.config.debug
-    if (deviceConf2 && deviceConf2.overrideLogging) {
-      switch (deviceConf2.overrideLogging) {
+    if (deviceConf && deviceConf.overrideLogging) {
+      switch (deviceConf.overrideLogging) {
         case 'standard':
           this.enableLogging = true
           this.enableDebugLogging = false
@@ -70,7 +69,7 @@ module.exports = class deviceSensorLeak {
     const opts = JSON.stringify({
       logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
       lowBattThreshold: this.lowBattThreshold,
-      type: deviceConf.type
+      showAs: 'sensor_leak'
     })
     this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
diff --git a/lib/index.js b/lib/index.js
index e6b8b444..d15bba2b 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -961,23 +961,21 @@ class eWeLinkPlatform {
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/simulation/purifier'))(this, accessory)
         /********************/
-      } else if (
-        this.simulations[device.deviceid] &&
-        this.simulations[device.deviceid].type === 'sensor_leak' &&
-        this.consts.devices.sensorContact.includes(uiid)
-      ) {
-        /**************************************
-        SENSORS [LEAK DW2 ACCESSORY SIMULATION]
-        **************************************/
-        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require('./device/simulation/sensor-leak'))(this, accessory)
-        /*************************************/
       } else if (this.consts.devices.sensorContact.includes(uiid)) {
         /*******************
         SENSORS [SONOFF DW2]
         *******************/
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require('./device/sensor-contact'))(this, accessory)
+        let instance
+        switch (this.sensorDevices[device.deviceid] && this.sensorDevices[device.deviceid].showAs) {
+          case 'sensor_leak':
+            instance = 'simulation/sensor-leak'
+            break
+          default:
+            instance = 'sensor-contact'
+            break
+        }
+        accessory.control = new (require('./device/' + instance))(this, accessory)
         /******************/
       } else if (this.consts.devices.fan.includes(uiid)) {
         /***
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 82e887d4..9d3ec12a 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -146,7 +146,6 @@ module.exports = {
       'p_button',
       'purifier',
       'sensor',
-      'sensor_leak',
       'switch_valve',
       'tap',
       'tap_two',
@@ -169,7 +168,7 @@ module.exports = {
       'p_button',
       'doorbell'
     ],
-    showAs: ['cooler', 'dehumidifier', 'heater', 'humidifier'],
+    showAs: ['cooler', 'dehumidifier', 'heater', 'humidifier', 'sensor_leak'],
     showAsType: ['blind', 'door', 'window']
   },
 

From 77012e7134af57665f674d981bd693485d8a4411 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 5 Jul 2021 15:08:32 +0100
Subject: [PATCH 2472/3183] rename dualr3 showAsType to showAsMotor

---
 config.schema.json     |  4 ++--
 lib/device/motor.js    | 12 +++++-------
 lib/index.js           |  2 +-
 lib/utils/constants.js |  7 ++++---
 4 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 78f400cf..1f27fd62 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -238,7 +238,7 @@
                 "functionBody": "return (model.multiDevices && model.multiDevices[arrayIndices] && model.multiDevices[arrayIndices].deviceId && ['dual_dualr2', 'dualr3_switch', '4ch', 't'].includes(model.multiDevices[arrayIndices].deviceModel));"
               }
             },
-            "showAsType": {
+            "showAsMotor": {
               "type": "string",
               "title": "DUALR3 Accessory Type",
               "description": "Select the accessory type to show in HomeKit.",
@@ -1422,7 +1422,7 @@
             "multiDevices[].deviceModel",
             "multiDevices[].label",
             "multiDevices[].showAsOutlet",
-            "multiDevices[].showAsType",
+            "multiDevices[].showAsMotor",
             "multiDevices[].inUsePowerThreshold",
             "multiDevices[].hideChannels",
             "multiDevices[].ipAddress",
diff --git a/lib/device/motor.js b/lib/device/motor.js
index 60fb0f55..7df3318d 100644
--- a/lib/device/motor.js
+++ b/lib/device/motor.js
@@ -31,11 +31,9 @@ module.exports = class deviceMotor {
 
     // Set up custom variables for this device type
     const deviceConf = platform.multiDevices[accessory.context.eweDeviceId]
-    const allowed = ['blind', 'door', 'window']
-    const showAsType =
-      deviceConf && deviceConf.showAsType && allowed.includes(deviceConf.showAsType)
-        ? deviceConf.showAsType
-        : 'blind'
+    const showAsMotor = deviceConf && deviceConf.showAsMotor
+      ? deviceConf.showAsMotor
+      : platform.consts.defaultValues.showAsMotor
 
     // Set the correct logging variables for this accessory
     this.enableLogging = !platform.config.disableDeviceLogging
@@ -59,7 +57,7 @@ module.exports = class deviceMotor {
 
     // Add the window covering service if it doesn't already exist
     let service
-    switch (showAsType) {
+    switch (showAsMotor) {
       case 'door':
         service = this.hapServ.Door
         if (this.accessory.getService(this.hapServ.Window)) {
@@ -138,7 +136,7 @@ module.exports = class deviceMotor {
     // Output the customised options to the log
     const opts = JSON.stringify({
       logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
-      showAsType: showAsType
+      showAsMotor: showAsMotor
     })
     this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
diff --git a/lib/index.js b/lib/index.js
index d15bba2b..3c53431a 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -258,7 +258,7 @@ class eWeLinkPlatform {
                   }
                   case 'overrideLogging':
                   case 'showAs':
-                  case 'showAsType': {
+                  case 'showAsMotor': {
                     const inSet = this.consts.allowed[k].includes(v)
                     if (typeof v !== 'string' || !inSet) {
                       logIgnore(key + '.' + id + '.' + k)
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 9d3ec12a..69dcfc40 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -46,7 +46,8 @@ module.exports = {
     overrideLogging: 'default',
     sensorTimeDifference: 60,
     sensorTimeLength: 60,
-    showAs: 'default'
+    showAs: 'default',
+    showAsMotor: 'blind'
   },
 
   minValues: {
@@ -84,7 +85,7 @@ module.exports = {
       'deviceModel',
       'label',
       'showAsOutlet',
-      'showAsType',
+      'showAsMotor',
       'inUsePowerThreshold',
       'hideChannels',
       'ipAddress',
@@ -169,7 +170,7 @@ module.exports = {
       'doorbell'
     ],
     showAs: ['cooler', 'dehumidifier', 'heater', 'humidifier', 'sensor_leak'],
-    showAsType: ['blind', 'door', 'window']
+    showAsMotor: ['blind', 'door', 'window']
   },
 
   devices: {

From 0637be37a7d38ca12214ffbdc491201683e4cd0e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 5 Jul 2021 20:59:08 +0100
Subject: [PATCH 2473/3183] transfer groups[] config to device specific
 sections

---
 config.schema.json                      | 390 ++++++++++++------------
 lib/device/curtain.js                   |   2 +-
 lib/device/diffuser.js                  |   2 +-
 lib/device/fan.js                       |   2 +-
 lib/device/humidifier.js                |   2 +-
 lib/device/light-cct.js                 |   2 +-
 lib/device/light-dimmer.js              |   2 +-
 lib/device/light-rgb-cct.js             |   2 +-
 lib/device/light-rgb.js                 |   2 +-
 lib/device/motor.js                     |  13 +-
 lib/device/outlet-multi.js              |   4 +-
 lib/device/outlet-single.js             |  10 +-
 lib/device/rf-bridge.js                 |   2 +-
 lib/device/sensor-ambient.js            |   2 +-
 lib/device/sensor-contact.js            |   2 +-
 lib/device/sensor-temp-humi.js          |   2 +-
 lib/device/simulation/blind.js          |   4 +-
 lib/device/simulation/cooler.js         |   2 +-
 lib/device/simulation/dehumidifier.js   |   2 +-
 lib/device/simulation/door.js           |   4 +-
 lib/device/simulation/doorbell.js       |   4 +-
 lib/device/simulation/garage-eachen.js  |   4 +-
 lib/device/simulation/garage-four.js    |   4 +-
 lib/device/simulation/garage-one.js     |   4 +-
 lib/device/simulation/garage-two.js     |   4 +-
 lib/device/simulation/heater.js         |   2 +-
 lib/device/simulation/humidifier.js     |   2 +-
 lib/device/simulation/lock-one.js       |   4 +-
 lib/device/simulation/p-button.js       |   4 +-
 lib/device/simulation/purifier.js       |   5 +-
 lib/device/simulation/sensor-hidden.js  |   2 +-
 lib/device/simulation/sensor-leak.js    |   2 +-
 lib/device/simulation/sensor-visible.js |   4 +-
 lib/device/simulation/sensor.js         |   2 +-
 lib/device/simulation/switch-valve.js   |   4 +-
 lib/device/simulation/tap-one.js        |   4 +-
 lib/device/simulation/tap-two.js        |   4 +-
 lib/device/simulation/valve-four.js     |   4 +-
 lib/device/simulation/valve-one.js      |   4 +-
 lib/device/simulation/valve-two.js      |   4 +-
 lib/device/simulation/window.js         |   4 +-
 lib/device/switch-multi.js              |   4 +-
 lib/device/switch-single.js             |   9 +-
 lib/device/thermostat.js                |   2 +-
 lib/device/zigbee/light-cct.js          |   2 +-
 lib/device/zigbee/light-dimmer.js       |   2 +-
 lib/device/zigbee/sensor-ambient.js     |   2 +-
 lib/device/zigbee/sensor-contact.js     |   2 +-
 lib/device/zigbee/sensor-leak.js        |   2 +-
 lib/device/zigbee/sensor-motion.js      |   2 +-
 lib/device/zigbee/switch-single.js      |   2 +-
 lib/device/zigbee/switch-stateless.js   |   2 +-
 lib/index.js                            | 332 ++++++++++----------
 lib/utils/constants.js                  |  60 ++--
 54 files changed, 470 insertions(+), 481 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 1f27fd62..1d8651ec 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -113,7 +113,7 @@
       },
       "singleDevices": {
         "title": "Single Channel Devices",
-        "description": "Applies to single-channel switch, light switch and Slampher devices.",
+        "description": "Applies to single-channel switch, outlet and light switch devices.",
         "type": "array",
         "items": {
           "type": "object",
@@ -125,6 +125,52 @@
               "minLength": 10,
               "maxLength": 10
             },
+            "deviceModel": {
+              "type": "string",
+              "title": "Device Model",
+              "description": "This setting has no effect except showing the relevant options for this model below.",
+              "oneOf": [
+                {
+                  "title": "Sonoff BASIC/MINI/RF/SV/RE5V1C",
+                  "enum": ["single"]
+                },
+                {
+                  "title": "Sonoff T1/T2/T3/TX-1C",
+                  "enum": ["t"]
+                },
+                {
+                  "title": "Sonoff POW/R2",
+                  "enum": ["pow"]
+                },
+                {
+                  "title": "Sonoff IW100/IW101",
+                  "enum": ["iw"]
+                },
+                {
+                  "title": "Sonoff S20/S26/S31/S55",
+                  "enum": ["s"]
+                },
+                {
+                  "title": "Sonoff Micro",
+                  "enum": ["micro"]
+                },
+                {
+                  "title": "Sonoff SLAMPHER",
+                  "enum": ["slampher"]
+                },
+                {
+                  "title": "KingArt KING-Q4",
+                  "enum": ["king"]
+                },
+                {
+                  "title": "Zigbee Single Switch (BASICZBR3/ZBMINI/S31ZB)",
+                  "enum": ["zb"]
+                }
+              ],
+              "condition": {
+                "functionBody": "return (model.singleDevices && model.singleDevices[arrayIndices] && model.singleDevices[arrayIndices].deviceId && model.singleDevices[arrayIndices].deviceId.length === 10);"
+              }
+            },
             "label": {
               "title": "Label",
               "type": "string",
@@ -133,12 +179,86 @@
                 "functionBody": "return (model.singleDevices && model.singleDevices[arrayIndices] && model.singleDevices[arrayIndices].deviceId && model.singleDevices[arrayIndices].deviceId.length === 10);"
               }
             },
-            "showAsOutlet": {
-              "type": "boolean",
-              "title": "Show As Outlet",
-              "description": "If true, this accessory will show as an outlet in HomeKit instead of a switch.",
+            "showAs": {
+              "type": "string",
+              "title": "Show As (Simulation)",
+              "description": "Expose this device as a different HomeKit accessory type.",
+              "oneOf": [
+                {
+                  "title": "1 Switch (Default)",
+                  "enum": ["default"]
+                },
+                {
+                  "title": "1 Outlet",
+                  "enum": ["outlet"]
+                },
+                {
+                  "title": "1 Air Purifier",
+                  "enum": ["purifier"]
+                },
+                {
+                  "title": "1 Doorbell",
+                  "enum": ["doorbell"]
+                },
+                {
+                  "title": "1 Programmable Button",
+                  "enum": ["p_button"]
+                },
+                {
+                  "title": "1 Sensor",
+                  "enum": ["sensor"]
+                }
+              ],
               "condition": {
-                "functionBody": "return (model.singleDevices && model.singleDevices[arrayIndices] && model.singleDevices[arrayIndices].deviceId && model.singleDevices[arrayIndices].deviceId.length === 10);"
+                "functionBody": "return (model.singleDevices && model.singleDevices[arrayIndices] && ['single', 't', 'pow', 'iw', 's', 'micro', 'slampher', 'king', 'zb'].includes(model.singleDevices[arrayIndices].deviceModel));"
+              }
+            },
+            "sensorType": {
+              "type": "string",
+              "title": "Sensor Type",
+              "description": "The type of sensor to use.",
+              "oneOf": [
+                {
+                  "title": "Motion",
+                  "enum": ["motion"]
+                },
+                {
+                  "title": "Smoke/Fire",
+                  "enum": ["smoke"]
+                },
+                {
+                  "title": "Water/Leak",
+                  "enum": ["water"]
+                },
+                {
+                  "title": "Carbon Monoxide",
+                  "enum": ["co"]
+                },
+                {
+                  "title": "Carbon Dioxide",
+                  "enum": ["co2"]
+                },
+                {
+                  "title": "Occupancy",
+                  "enum": ["occupancy"]
+                },
+                {
+                  "title": "Contact",
+                  "enum": ["contact"]
+                }
+              ],
+              "condition": {
+                "functionBody": "return (model.singleDevices && model.singleDevices[arrayIndices] && ['sensor'].includes(model.singleDevices[arrayIndices].showAs));"
+              }
+            },
+            "inUsePowerThreshold": {
+              "type": "integer",
+              "title": "Outlet 'In Use' Threshold",
+              "description": "HomeKit will set the 'In Use' status of outlet devices to true when the wattage is above this number. Must be 0 or more.",
+              "placeholder": 0,
+              "minimum": 0,
+              "condition": {
+                "functionBody": "return (model.singleDevices && model.singleDevices[arrayIndices] && ['pow', 'iw'].includes(model.singleDevices[arrayIndices].deviceModel) && ['outlet'].includes(model.singleDevices[arrayIndices].showAs));"
               }
             },
             "ipAddress": {
@@ -146,7 +266,7 @@
               "title": "IP Address",
               "description": "You can manually set the IP address for this device if it cannot be discovered by the plugin.",
               "condition": {
-                "functionBody": "return (model.mode !== 'wan' && model.singleDevices && model.singleDevices[arrayIndices] && model.singleDevices[arrayIndices].deviceId && model.singleDevices[arrayIndices].deviceId.length === 10);"
+                "functionBody": "return (model.singleDevices && model.singleDevices[arrayIndices] && ['single', 't', 'pow', 'iw', 's', 'micro', 'slampher'].includes(model.singleDevices[arrayIndices].deviceModel));"
               }
             },
             "overrideLogging": {
@@ -172,7 +292,7 @@
                 }
               ],
               "condition": {
-                "functionBody": "return (model.singleDevices && model.singleDevices[arrayIndices] && model.singleDevices[arrayIndices].deviceId && model.singleDevices[arrayIndices].deviceId.length === 10);"
+                "functionBody": "return (model.singleDevices && model.singleDevices[arrayIndices] && model.singleDevices[arrayIndices].deviceId && ['single', 't', 'pow', 'iw', 's', 'micro', 'slampher', 'king', 'zb'].includes(model.singleDevices[arrayIndices].deviceModel));"
               }
             }
           }
@@ -180,7 +300,7 @@
       },
       "multiDevices": {
         "title": "Multi Channel Devices",
-        "description": "Applies to multi-channel switch and light switch devices.",
+        "description": "Applies to multi-channel switch, outlet and light switch devices.",
         "type": "array",
         "items": {
           "type": "object",
@@ -230,10 +350,36 @@
                 "functionBody": "return (model.multiDevices && model.multiDevices[arrayIndices] && model.multiDevices[arrayIndices].deviceId && model.multiDevices[arrayIndices].deviceId.length === 10);"
               }
             },
-            "showAsOutlet": {
-              "type": "boolean",
-              "title": "Show As Outlets",
-              "description": "If true, this accessory will show as outlets in HomeKit instead of switches.",
+            "showAs": {
+              "type": "string",
+              "title": "Show As (Simulation)",
+              "description": "Expose this device as a different HomeKit accessory type.",
+              "oneOf": [
+                {
+                  "title": "Switches (Default)",
+                  "enum": ["default"]
+                },
+                {
+                  "title": "Outlets",
+                  "enum": ["outlet"]
+                },
+                {
+                  "title": "1 Air Purifier",
+                  "enum": ["purifier"]
+                },
+                {
+                  "title": "1 Doorbell",
+                  "enum": ["doorbell"]
+                },
+                {
+                  "title": "1 Programmable Button",
+                  "enum": ["p_button"]
+                },
+                {
+                  "title": "1 Sensor",
+                  "enum": ["sensor"]
+                }
+              ],
               "condition": {
                 "functionBody": "return (model.multiDevices && model.multiDevices[arrayIndices] && model.multiDevices[arrayIndices].deviceId && ['dual_dualr2', 'dualr3_switch', '4ch', 't'].includes(model.multiDevices[arrayIndices].deviceModel));"
               }
@@ -260,115 +406,42 @@
                 "functionBody": "return (model.multiDevices && model.multiDevices[arrayIndices] && model.multiDevices[arrayIndices].deviceId && ['dualr3_motor'].includes(model.multiDevices[arrayIndices].deviceModel));"
               }
             },
-            "inUsePowerThreshold": {
-              "type": "integer",
-              "title": "Outlet 'In Use' Threshold",
-              "description": "HomeKit will set the 'In Use' status of outlet devices to true when the wattage is above this number. Must be 0 or more.",
-              "placeholder": 0,
-              "minimum": 0,
-              "condition": {
-                "functionBody": "return (model.multiDevices && model.multiDevices[arrayIndices] && model.multiDevices[arrayIndices].deviceId && model.multiDevices[arrayIndices].showAsOutlet && ['dualr3_switch'].includes(model.multiDevices[arrayIndices].deviceModel));"
-              }
-            },
-            "hideChannels": {
-              "type": "string",
-              "title": "Hide Channels",
-              "description": "A comma separated list of channels to hide for this device. For example '0' or '0,1,2'.",
-              "condition": {
-                "functionBody": "return (model.multiDevices && model.multiDevices[arrayIndices] && model.multiDevices[arrayIndices].deviceId && ['dual_dualr2', 'dualr3_switch', '4ch', 't'].includes(model.multiDevices[arrayIndices].deviceModel));"
-              }
-            },
-            "ipAddress": {
-              "type": "string",
-              "title": "IP Address",
-              "description": "You can manually set the IP address for this device if it cannot be discovered by the plugin.",
-              "condition": {
-                "functionBody": "return (model.mode !== 'wan' && model.multiDevices && model.multiDevices[arrayIndices] && model.multiDevices[arrayIndices].deviceId && ['dual_dualr2', 'dualr3_switch', 'dualr3_motor', '4ch', 't'].includes(model.multiDevices[arrayIndices].deviceModel));"
-              }
-            },
-            "overrideLogging": {
+            "sensorType": {
               "type": "string",
-              "title": "Override Logging Setting",
-              "description": "Override global logging setting for this device.",
+              "title": "Sensor Type",
+              "description": "The type of sensor to use.",
               "oneOf": [
                 {
-                  "title": "Default (Use Global Setting)",
-                  "enum": ["default"]
+                  "title": "Motion",
+                  "enum": ["motion"]
                 },
                 {
-                  "title": "Enable Standard Logging",
-                  "enum": ["standard"]
+                  "title": "Smoke/Fire",
+                  "enum": ["smoke"]
                 },
                 {
-                  "title": "Enable Debug Logging",
-                  "enum": ["debug"]
+                  "title": "Water/Leak",
+                  "enum": ["water"]
                 },
                 {
-                  "title": "Disable All Logging",
-                  "enum": ["disable"]
-                }
-              ],
-              "condition": {
-                "functionBody": "return (model.multiDevices && model.multiDevices[arrayIndices] && model.multiDevices[arrayIndices].deviceId && ['dual_dualr2', 'dualr3_switch', 'dualr3_motor', '4ch', 't'].includes(model.multiDevices[arrayIndices].deviceModel));"
-              }
-            }
-          }
-        }
-      },
-      "outletDevices": {
-        "title": "Outlet Devices",
-        "description": "Applies to single-channel outlet devices.",
-        "type": "array",
-        "items": {
-          "type": "object",
-          "properties": {
-            "deviceId": {
-              "type": "string",
-              "title": "Device ID",
-              "description": "Enter the 10 digit eWeLink Device ID to begin.",
-              "minLength": 10,
-              "maxLength": 10
-            },
-            "deviceModel": {
-              "type": "string",
-              "title": "Device Model",
-              "description": "This setting has no effect except showing the relevant options for this model below.",
-              "oneOf": [
-                {
-                  "title": "Sonoff POW/R2",
-                  "enum": ["pow"]
+                  "title": "Carbon Monoxide",
+                  "enum": ["co"]
                 },
                 {
-                  "title": "Sonoff IW100/IW101",
-                  "enum": ["iw"]
+                  "title": "Carbon Dioxide",
+                  "enum": ["co2"]
                 },
                 {
-                  "title": "Sonoff S20/S26/S31/S55",
-                  "enum": ["s"]
+                  "title": "Occupancy",
+                  "enum": ["occupancy"]
                 },
                 {
-                  "title": "Sonoff Micro",
-                  "enum": ["micro"]
+                  "title": "Contact",
+                  "enum": ["contact"]
                 }
               ],
               "condition": {
-                "functionBody": "return (model.outletDevices && model.outletDevices[arrayIndices] && model.outletDevices[arrayIndices].deviceId && model.outletDevices[arrayIndices].deviceId.length === 10);"
-              }
-            },
-            "label": {
-              "title": "Label",
-              "type": "string",
-              "description": "This setting has no effect except to be a helpful label for identifying which device this is when editing the configuration.",
-              "condition": {
-                "functionBody": "return (model.outletDevices && model.outletDevices[arrayIndices] && model.outletDevices[arrayIndices].deviceId && model.outletDevices[arrayIndices].deviceId.length === 10);"
-              }
-            },
-            "showAsSwitch": {
-              "type": "boolean",
-              "title": "Show As Switch",
-              "description": "If true, this accessory will show as a switch in HomeKit instead of an outlet.",
-              "condition": {
-                "functionBody": "return (model.outletDevices && model.outletDevices[arrayIndices] && !model.outletDevices[arrayIndices].showAsSwitch && ['pow', 'iw', 's', 'micro'].includes(model.outletDevices[arrayIndices].deviceModel));"
+                "functionBody": "return (model.multiDevices && model.multiDevices[arrayIndices] && ['sensor'].includes(model.multiDevices[arrayIndices].showAs));"
               }
             },
             "inUsePowerThreshold": {
@@ -378,7 +451,15 @@
               "placeholder": 0,
               "minimum": 0,
               "condition": {
-                "functionBody": "return (model.outletDevices && model.outletDevices[arrayIndices] && !model.outletDevices[arrayIndices].showAsSwitch && ['pow'].includes(model.outletDevices[arrayIndices].deviceModel));"
+                "functionBody": "return (model.multiDevices && model.multiDevices[arrayIndices] && model.multiDevices[arrayIndices].deviceId && ['outlet'].includes(model.multiDevices[arrayIndices].showAs) && ['dualr3_switch'].includes(model.multiDevices[arrayIndices].deviceModel));"
+              }
+            },
+            "hideChannels": {
+              "type": "string",
+              "title": "Hide Channels",
+              "description": "A comma separated list of channels to hide for this device. For example '0' or '0,1,2'.",
+              "condition": {
+                "functionBody": "return (model.multiDevices && model.multiDevices[arrayIndices] && model.multiDevices[arrayIndices].deviceId && ['dual_dualr2', 'dualr3_switch', '4ch', 't'].includes(model.multiDevices[arrayIndices].deviceModel) && ['default', 'outlet'].includes(model.multiDevices[arrayIndices].showAs));"
               }
             },
             "ipAddress": {
@@ -386,7 +467,7 @@
               "title": "IP Address",
               "description": "You can manually set the IP address for this device if it cannot be discovered by the plugin.",
               "condition": {
-                "functionBody": "return (model.mode !== 'wan' && model.outletDevices && model.outletDevices[arrayIndices] && !model.outletDevices[arrayIndices].showAsSwitch && ['pow', 'iw', 's', 'micro'].includes(model.outletDevices[arrayIndices].deviceModel));"
+                "functionBody": "return (model.mode !== 'wan' && model.multiDevices && model.multiDevices[arrayIndices] && model.multiDevices[arrayIndices].deviceId && ['dual_dualr2', 'dualr3_switch', 'dualr3_motor', '4ch', 't'].includes(model.multiDevices[arrayIndices].deviceModel));"
               }
             },
             "overrideLogging": {
@@ -412,7 +493,7 @@
                 }
               ],
               "condition": {
-                "functionBody": "return (model.outletDevices && model.outletDevices[arrayIndices] && !model.outletDevices[arrayIndices].showAsSwitch && ['pow', 'iw', 's', 'micro'].includes(model.outletDevices[arrayIndices].deviceModel));"
+                "functionBody": "return (model.multiDevices && model.multiDevices[arrayIndices] && model.multiDevices[arrayIndices].deviceId && ['dual_dualr2', 'dualr3_switch', 'dualr3_motor', '4ch', 't'].includes(model.multiDevices[arrayIndices].deviceModel));"
               }
             }
           }
@@ -1208,66 +1289,12 @@
                 {
                   "title": "1 Switch & 1 Valve (with multi channel device)",
                   "enum": ["switch_valve"]
-                },
-                {
-                  "title": "1 Sensor (with single or multi channel device)",
-                  "enum": ["sensor"]
-                },
-                {
-                  "title": "1 Programmable Button (with single or multi channel device)",
-                  "enum": ["p_button"]
-                },
-                {
-                  "title": "1 Doorbell (with single or multi channel device)",
-                  "enum": ["doorbell"]
-                },
-                {
-                  "title": "1 Air Purifier (with single or multi channel device)",
-                  "enum": ["purifier"]
                 }
               ],
               "condition": {
                 "functionBody": "return (model.groups && model.groups[arrayIndices] && model.groups[arrayIndices].deviceId && model.groups[arrayIndices].deviceId.length === 10);"
               }
             },
-            "sensorType": {
-              "type": "string",
-              "title": "Sensor Type",
-              "description": "The type of sensor to use.",
-              "oneOf": [
-                {
-                  "title": "Motion",
-                  "enum": ["motion"]
-                },
-                {
-                  "title": "Smoke/Fire",
-                  "enum": ["smoke"]
-                },
-                {
-                  "title": "Water/Leak",
-                  "enum": ["water"]
-                },
-                {
-                  "title": "Carbon Monoxide",
-                  "enum": ["co"]
-                },
-                {
-                  "title": "Carbon Dioxide",
-                  "enum": ["co2"]
-                },
-                {
-                  "title": "Occupancy",
-                  "enum": ["occupancy"]
-                },
-                {
-                  "title": "Contact",
-                  "enum": ["contact"]
-                }
-              ],
-              "condition": {
-                "functionBody": "return (model.groups && model.groups[arrayIndices] && ['sensor'].includes(model.groups[arrayIndices].type));"
-              }
-            },
             "operationTime": {
               "type": "integer",
               "title": "Operation Time (Deciseconds)",
@@ -1345,7 +1372,7 @@
                 }
               ],
               "condition": {
-                "functionBody": "return (model.groups && model.groups[arrayIndices] && ['blind', 'cooler', 'dehumidifier', 'door', 'garage', 'garage_two', 'garage_four', 'garage_eachen', 'humidifier', 'lock', 'purifier', 'sensor', 'p_button', 'doorbell', 'sensor_leak', 'switch_valve', 'tap', 'tap_two', 'thermostat', 'valve', 'valve_two', 'valve_four', 'window'].includes(model.groups[arrayIndices].type));"
+                "functionBody": "return (model.groups && model.groups[arrayIndices] && ['blind', 'door', 'garage', 'garage_two', 'garage_four', 'garage_eachen', 'lock', 'purifier', 'switch_valve', 'tap', 'tap_two', 'valve', 'valve_two', 'valve_four', 'window'].includes(model.groups[arrayIndices].type));"
               }
             }
           }
@@ -1390,7 +1417,7 @@
     {
       "key": "singleDevices",
       "title": "Single Channel Devices",
-      "description": "Applies to single-channel switch, light switch and Slampher devices.",
+      "description": "Applies to single-channel switch, outlet and light switch devices.",
       "expandable": true,
       "add": "Add Another Device",
       "type": "array",
@@ -1399,8 +1426,11 @@
           "type": "fieldset",
           "items": [
             "singleDevices[].deviceId",
+            "singleDevices[].deviceModel",
             "singleDevices[].label",
-            "singleDevices[].showAsOutlet",
+            "singleDevices[].showAs",
+            "singleDevices[].sensorType",
+            "singleDevices[].inUsePowerThreshold",
             "singleDevices[].ipAddress",
             "singleDevices[].overrideLogging"
           ]
@@ -1410,7 +1440,7 @@
     {
       "key": "multiDevices",
       "title": "Multi Channel Devices",
-      "description": "Applies to multi-channel switch and light switch devices.",
+      "description": "Applies to multi-channel switch, outlet and light switch devices.",
       "expandable": true,
       "add": "Add Another Device",
       "type": "array",
@@ -1421,8 +1451,9 @@
             "multiDevices[].deviceId",
             "multiDevices[].deviceModel",
             "multiDevices[].label",
-            "multiDevices[].showAsOutlet",
+            "multiDevices[].showAs",
             "multiDevices[].showAsMotor",
+            "multiDevices[].sensorType",
             "multiDevices[].inUsePowerThreshold",
             "multiDevices[].hideChannels",
             "multiDevices[].ipAddress",
@@ -1431,28 +1462,6 @@
         }
       ]
     },
-    {
-      "key": "outletDevices",
-      "title": "Outlet Devices",
-      "description": "Applies to single-channel outlet devices.",
-      "expandable": true,
-      "add": "Add Another Device",
-      "type": "array",
-      "items": [
-        {
-          "type": "fieldset",
-          "items": [
-            "outletDevices[].deviceId",
-            "outletDevices[].deviceModel",
-            "outletDevices[].label",
-            "outletDevices[].showAsSwitch",
-            "outletDevices[].inUsePowerThreshold",
-            "outletDevices[].ipAddress",
-            "outletDevices[].overrideLogging"
-          ]
-        }
-      ]
-    },
     {
       "key": "lightDevices",
       "title": "Light Devices",
@@ -1604,10 +1613,13 @@
         {
           "type": "fieldset",
           "items": [
+            {
+              "type": "help",
+              "helpvalue": "<label class=\"control-label text-warning\">⚠ This section will be removed in a future plugin version. Please use the relevant device sections above to set up new simulations and configure your existing simulations.</label>"
+            },
             "groups[].deviceId",
             "groups[].label",
             "groups[].type",
-            "groups[].sensorType",
             "groups[].operationTime",
             "groups[].operationTimeDown",
             "groups[].sensorId",
diff --git a/lib/device/curtain.js b/lib/device/curtain.js
index 92c09253..ade34505 100644
--- a/lib/device/curtain.js
+++ b/lib/device/curtain.js
@@ -21,7 +21,7 @@ module.exports = class deviceCurtain {
     this.isOnline = true
 
     // Set up custom variables for this device type
-    const deviceConf = platform.singleDevices[accessory.context.eweDeviceId]
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
 
     // Set the correct logging variables for this accessory
     this.enableLogging = !platform.config.disableDeviceLogging
diff --git a/lib/device/diffuser.js b/lib/device/diffuser.js
index e1c5e36c..c422f9c3 100644
--- a/lib/device/diffuser.js
+++ b/lib/device/diffuser.js
@@ -22,7 +22,7 @@ module.exports = class deviceDiffuser {
     this.isOnline = true
 
     // Set up custom variables for this device type
-    const deviceConf = platform.singleDevices[accessory.context.eweDeviceId]
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
 
     // Set the correct logging variables for this accessory
     this.enableLogging = !platform.config.disableDeviceLogging
diff --git a/lib/device/fan.js b/lib/device/fan.js
index 7cc3f229..1255f298 100644
--- a/lib/device/fan.js
+++ b/lib/device/fan.js
@@ -21,7 +21,7 @@ module.exports = class deviceFan {
     this.isOnline = true
 
     // Set up custom variables for this device type
-    const deviceConf = platform.fanDevices[accessory.context.eweDeviceId]
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
     this.hideLight = deviceConf && deviceConf.hideLight
 
     // Set the correct logging variables for this accessory
diff --git a/lib/device/humidifier.js b/lib/device/humidifier.js
index 4b5b9746..02970cc9 100644
--- a/lib/device/humidifier.js
+++ b/lib/device/humidifier.js
@@ -21,7 +21,7 @@ module.exports = class deviceHumidifier {
     this.isOnline = true
 
     // Set up custom variables for this device type
-    const deviceConf = platform.singleDevices[accessory.context.eweDeviceId]
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
 
     // Set the correct logging variables for this accessory
     this.enableLogging = !platform.config.disableDeviceLogging
diff --git a/lib/device/light-cct.js b/lib/device/light-cct.js
index bd497e4a..20089d5f 100644
--- a/lib/device/light-cct.js
+++ b/lib/device/light-cct.js
@@ -21,7 +21,7 @@ module.exports = class deviceLightCCT {
     this.isOnline = true
 
     // Set up custom variables for this device type
-    const deviceConf = platform.lightDevices[accessory.context.eweDeviceId]
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
     this.deviceModel = deviceConf && deviceConf.deviceModel ? deviceConf.deviceModel : 'bulbB02FA60'
     this.alShift =
       deviceConf && deviceConf.adaptiveLightingShift
diff --git a/lib/device/light-dimmer.js b/lib/device/light-dimmer.js
index 4025ca18..4abaa2b4 100644
--- a/lib/device/light-dimmer.js
+++ b/lib/device/light-dimmer.js
@@ -21,7 +21,7 @@ module.exports = class deviceLightDimmer {
     this.isOnline = true
 
     // Set up custom variables for this device type
-    const deviceConf = platform.lightDevices[accessory.context.eweDeviceId]
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
     this.brightStep =
       deviceConf && deviceConf.brightnessStep
         ? Math.min(deviceConf.brightnessStep, 100)
diff --git a/lib/device/light-rgb-cct.js b/lib/device/light-rgb-cct.js
index 8f93c8d4..8d17975c 100644
--- a/lib/device/light-rgb-cct.js
+++ b/lib/device/light-rgb-cct.js
@@ -22,7 +22,7 @@ module.exports = class deviceLightRGBCCT {
     this.isOnline = true
 
     // Set up custom variables for this device type
-    const deviceConf = platform.lightDevices[accessory.context.eweDeviceId]
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
     this.alShift =
       deviceConf && deviceConf.adaptiveLightingShift
         ? deviceConf.adaptiveLightingShift
diff --git a/lib/device/light-rgb.js b/lib/device/light-rgb.js
index ff912f10..79f5d08b 100644
--- a/lib/device/light-rgb.js
+++ b/lib/device/light-rgb.js
@@ -22,7 +22,7 @@ module.exports = class deviceLightRGB {
     this.isOnline = true
 
     // Set up custom variables for this device type
-    const deviceConf = platform.lightDevices[accessory.context.eweDeviceId]
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
     this.alShift =
       deviceConf && deviceConf.adaptiveLightingShift
         ? deviceConf.adaptiveLightingShift
diff --git a/lib/device/motor.js b/lib/device/motor.js
index 7df3318d..95d903b8 100644
--- a/lib/device/motor.js
+++ b/lib/device/motor.js
@@ -30,10 +30,11 @@ module.exports = class deviceMotor {
     */
 
     // Set up custom variables for this device type
-    const deviceConf = platform.multiDevices[accessory.context.eweDeviceId]
-    const showAsMotor = deviceConf && deviceConf.showAsMotor
-      ? deviceConf.showAsMotor
-      : platform.consts.defaultValues.showAsMotor
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
+    const showAsMotor =
+      deviceConf && deviceConf.showAsMotor
+        ? deviceConf.showAsMotor
+        : platform.consts.defaultValues.showAsMotor
 
     // Set the correct logging variables for this accessory
     this.enableLogging = !platform.config.disableDeviceLogging
@@ -191,7 +192,7 @@ module.exports = class deviceMotor {
         if (params.currLocation !== this.cachePos) {
           this.cachePos = params.currLocation
           this.service.updateCharacteristic(this.hapChar.CurrentPosition, this.cachePos)
-          if (this.enableLogging) {
+          if (params.updateSource && this.enableLogging) {
             this.log('[%s] %s [%s%].', this.name, this.lang.curPos, this.cachePos)
           }
         }
@@ -202,7 +203,7 @@ module.exports = class deviceMotor {
         if (params.location !== this.cacheTarg) {
           this.cacheTarg = params.location
           this.service.updateCharacteristic(this.hapChar.TargetPosition, this.cacheTarg)
-          if (this.enableLogging) {
+          if (params.updateSource && this.enableLogging) {
             this.log('[%s] %s [%s%].', this.name, this.lang.curTarg, this.cacheTarg)
           }
         }
diff --git a/lib/device/outlet-multi.js b/lib/device/outlet-multi.js
index eab0d014..6b9b6cc2 100644
--- a/lib/device/outlet-multi.js
+++ b/lib/device/outlet-multi.js
@@ -29,7 +29,7 @@ module.exports = class deviceOutletMulti {
     */
 
     // Set up custom variables for this device type
-    const deviceConf = platform.multiDevices[accessory.context.eweDeviceId]
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
     this.hideChannels = deviceConf && deviceConf.hideChannels ? deviceConf.hideChannels : undefined
 
     // Set the correct logging variables for this accessory
@@ -149,7 +149,7 @@ module.exports = class deviceOutletMulti {
         hideChannels: this.hideChannels,
         inUsePowerThreshold: this.inUsePowerThreshold,
         logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
-        showAsType: 'outlet'
+        showAs: 'outlet'
       })
       this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
     }
diff --git a/lib/device/outlet-single.js b/lib/device/outlet-single.js
index 185c0ed3..2a0f9732 100644
--- a/lib/device/outlet-single.js
+++ b/lib/device/outlet-single.js
@@ -29,12 +29,7 @@ module.exports = class deviceOutletSingle {
     */
 
     // Set up custom variables for this device type
-    let deviceConf
-    if (platform.outletDevices[accessory.context.eweDeviceId]) {
-      deviceConf = platform.outletDevices[accessory.context.eweDeviceId]
-    } else if (platform.singleDevices[accessory.context.eweDeviceId]) {
-      deviceConf = platform.singleDevices[accessory.context.eweDeviceId]
-    }
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
 
     // Set the correct logging variables for this accessory
     this.enableLogging = !platform.config.disableDeviceLogging
@@ -168,7 +163,8 @@ module.exports = class deviceOutletSingle {
 
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new platform.eveService('energy', this.accessory, {
-      log: platform.config.debugFakegato ? this.log : () => {}
+      log: platform.config.debugFakegato ? this.log : () => {},
+      showAs: 'outlet'
     })
 
     // Set up extra features for outlets that provide power readings
diff --git a/lib/device/rf-bridge.js b/lib/device/rf-bridge.js
index 164b6453..283ea097 100644
--- a/lib/device/rf-bridge.js
+++ b/lib/device/rf-bridge.js
@@ -25,7 +25,7 @@ module.exports = class deviceRFBridge {
     this.isOnline = true
 
     // Set up custom variables for this device type
-    const deviceConf = platform.rfDevices[accessory.context.eweDeviceId]
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
     const resetOnStartup = deviceConf && deviceConf.resetOnStartup
 
     // Set the correct logging variables for this accessory
diff --git a/lib/device/sensor-ambient.js b/lib/device/sensor-ambient.js
index 1de79ac6..90b7abe8 100644
--- a/lib/device/sensor-ambient.js
+++ b/lib/device/sensor-ambient.js
@@ -21,7 +21,7 @@ module.exports = class deviceSensorAmbient {
     this.isOnline = true
 
     // Set up custom variables for this device type
-    const deviceConf = platform.thDevices[accessory.context.eweDeviceId]
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
     this.hideSwitch = deviceConf && deviceConf.hideSwitch
     this.tempOffset =
       deviceConf && deviceConf.offset ? deviceConf.offset : platform.consts.defaultValues.offset
diff --git a/lib/device/sensor-contact.js b/lib/device/sensor-contact.js
index 43e60ac3..61d2bc1b 100644
--- a/lib/device/sensor-contact.js
+++ b/lib/device/sensor-contact.js
@@ -19,7 +19,7 @@ module.exports = class deviceSensorContact {
     this.accessory = accessory
 
     // Set up custom variables for this device type
-    const deviceConf = platform.sensorDevices[accessory.context.eweDeviceId]
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
     this.lowBattThreshold =
       deviceConf && deviceConf.lowBattThreshold
         ? Math.min(deviceConf.lowBattThreshold, 100)
diff --git a/lib/device/sensor-temp-humi.js b/lib/device/sensor-temp-humi.js
index 93142a62..f2104567 100644
--- a/lib/device/sensor-temp-humi.js
+++ b/lib/device/sensor-temp-humi.js
@@ -20,7 +20,7 @@ module.exports = class deviceSensorTempHumi {
     this.isOnline = true
 
     // Set up custom variables for this device type
-    const deviceConf = platform.thDevices[accessory.context.eweDeviceId]
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
     this.tempOffset =
       deviceConf && deviceConf.offset ? deviceConf.offset : platform.consts.defaultValues.offset
     this.humiOffset =
diff --git a/lib/device/simulation/blind.js b/lib/device/simulation/blind.js
index 4e0518d0..14113324 100644
--- a/lib/device/simulation/blind.js
+++ b/lib/device/simulation/blind.js
@@ -22,7 +22,7 @@ module.exports = class deviceBlind {
     this.isOnline = true
 
     // Set up custom variables for this device type
-    const deviceConf = platform.simulations[accessory.context.eweDeviceId]
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
     this.operationTimeUp = deviceConf.operationTime || platform.consts.defaultValues.operationTime
     this.operationTimeDown = deviceConf.operationTimeDown || this.operationTimeUp
 
@@ -116,7 +116,7 @@ module.exports = class deviceBlind {
       logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
       operationTimeDown: this.operationTimeDown,
       operationTimeUp: this.operationTimeUp,
-      type: deviceConf.type
+      showAs: deviceConf.showAs
     })
     this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
diff --git a/lib/device/simulation/cooler.js b/lib/device/simulation/cooler.js
index a5197aec..372a821f 100644
--- a/lib/device/simulation/cooler.js
+++ b/lib/device/simulation/cooler.js
@@ -21,7 +21,7 @@ module.exports = class deviceHeater {
     this.isOnline = true
 
     // Set up custom variables for this device type
-    const deviceConf = platform.thDevices[accessory.context.eweDeviceId]
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
     this.tempOffset =
       deviceConf && deviceConf.offset ? deviceConf.offset : platform.consts.defaultValues.offset
     this.humiOffset =
diff --git a/lib/device/simulation/dehumidifier.js b/lib/device/simulation/dehumidifier.js
index ca3e0b1a..a427d62d 100644
--- a/lib/device/simulation/dehumidifier.js
+++ b/lib/device/simulation/dehumidifier.js
@@ -21,7 +21,7 @@ module.exports = class deviceHeater {
     this.isOnline = true
 
     // Set up custom variables for this device type
-    const deviceConf = platform.thDevices[accessory.context.eweDeviceId]
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
     this.tempOffset =
       deviceConf && deviceConf.offset ? deviceConf.offset : platform.consts.defaultValues.offset
     this.humiOffset =
diff --git a/lib/device/simulation/door.js b/lib/device/simulation/door.js
index 5103a71d..60c2e356 100644
--- a/lib/device/simulation/door.js
+++ b/lib/device/simulation/door.js
@@ -22,7 +22,7 @@ module.exports = class deviceDoor {
     this.isOnline = true
 
     // Set up custom variables for this device type
-    const deviceConf = platform.simulations[accessory.context.eweDeviceId]
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
     this.operationTimeUp = deviceConf.operationTime || platform.consts.defaultValues.operationTime
     this.operationTimeDown = deviceConf.operationTimeDown || this.operationTimeUp
 
@@ -116,7 +116,7 @@ module.exports = class deviceDoor {
       logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
       operationTimeDown: this.operationTimeDown,
       operationTimeUp: this.operationTimeUp,
-      type: deviceConf.type
+      showAs: deviceConf.showAs
     })
     this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
diff --git a/lib/device/simulation/doorbell.js b/lib/device/simulation/doorbell.js
index 633a1650..35a5e8b3 100644
--- a/lib/device/simulation/doorbell.js
+++ b/lib/device/simulation/doorbell.js
@@ -22,7 +22,7 @@ module.exports = class deviceDoorbell {
     this.isOnline = true
 
     // Set up custom variables for this device type
-    const deviceConf = platform.simulations[accessory.context.eweDeviceId]
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
 
     // Set the correct logging variables for this accessory
     this.enableLogging = !platform.config.disableDeviceLogging
@@ -100,7 +100,7 @@ module.exports = class deviceDoorbell {
     // Output the customised options to the log
     const opts = JSON.stringify({
       logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
-      type: deviceConf.type
+      showAs: deviceConf.showAs
     })
     this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
diff --git a/lib/device/simulation/garage-eachen.js b/lib/device/simulation/garage-eachen.js
index 0c4cc3a7..89968b69 100644
--- a/lib/device/simulation/garage-eachen.js
+++ b/lib/device/simulation/garage-eachen.js
@@ -22,7 +22,7 @@ module.exports = class deviceGarageEachen {
     this.isOnline = true
 
     // Set up custom variables for this device type
-    const deviceConf = platform.simulations[accessory.context.eweDeviceId]
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
     this.operationTime = deviceConf.operationTime || platform.consts.defaultValues.operationTime
 
     // Set the correct logging variables for this accessory
@@ -118,7 +118,7 @@ module.exports = class deviceGarageEachen {
     const opts = JSON.stringify({
       logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
       operationTime: this.operationTime,
-      type: deviceConf.type
+      showAs: deviceConf.showAs
     })
     this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
diff --git a/lib/device/simulation/garage-four.js b/lib/device/simulation/garage-four.js
index fd74ff5c..e6d18b42 100644
--- a/lib/device/simulation/garage-four.js
+++ b/lib/device/simulation/garage-four.js
@@ -21,7 +21,7 @@ module.exports = class deviceGarageFour {
     this.isOnline = true
 
     // Set up custom variables for this device type
-    const deviceConf = platform.simulations[accessory.context.eweDeviceId]
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
     this.operationTimeUp = deviceConf.operationTime || platform.consts.defaultValues.operationTime
     this.operationTimeDown = deviceConf.operationTimeDown || this.operationTimeUp
 
@@ -98,7 +98,7 @@ module.exports = class deviceGarageFour {
       logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
       operationTimeDown: this.operationTimeDown,
       operationTimeUp: this.operationTimeUp,
-      type: deviceConf.type
+      showAs: deviceConf.showAs
     })
     this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
diff --git a/lib/device/simulation/garage-one.js b/lib/device/simulation/garage-one.js
index 523933de..edffe88c 100644
--- a/lib/device/simulation/garage-one.js
+++ b/lib/device/simulation/garage-one.js
@@ -23,7 +23,7 @@ module.exports = class deviceGarageOne {
     this.isOnline = true
 
     // Set up custom variables for this device type
-    const deviceConf = platform.simulations[accessory.context.eweDeviceId]
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
     this.operationTimeUp = deviceConf.operationTime || platform.consts.defaultValues.operationTime
     this.operationTimeDown = deviceConf.operationTimeDown || this.operationTimeUp
 
@@ -178,7 +178,7 @@ module.exports = class deviceGarageOne {
       logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
       operationTimeDown: this.operationTimeDown,
       operationTimeUp: this.operationTimeUp,
-      type: deviceConf.type
+      showAs: deviceConf.showAs
     })
     this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
diff --git a/lib/device/simulation/garage-two.js b/lib/device/simulation/garage-two.js
index 3cf58b07..6f1d4a97 100644
--- a/lib/device/simulation/garage-two.js
+++ b/lib/device/simulation/garage-two.js
@@ -22,7 +22,7 @@ module.exports = class deviceGarageTwo {
     this.isOnline = true
 
     // Set up custom variables for this device type
-    const deviceConf = platform.simulations[accessory.context.eweDeviceId]
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
     this.operationTimeUp = deviceConf.operationTime || platform.consts.defaultValues.operationTime
     this.operationTimeDown = deviceConf.operationTimeDown || this.operationTimeUp
 
@@ -128,7 +128,7 @@ module.exports = class deviceGarageTwo {
       logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
       operationTimeDown: this.operationTimeDown,
       operationTimeUp: this.operationTimeUp,
-      type: deviceConf.type
+      showAs: deviceConf.showAs
     })
     this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
diff --git a/lib/device/simulation/heater.js b/lib/device/simulation/heater.js
index cb1c172a..7fdb21d2 100644
--- a/lib/device/simulation/heater.js
+++ b/lib/device/simulation/heater.js
@@ -21,7 +21,7 @@ module.exports = class deviceHeater {
     this.isOnline = true
 
     // Set up custom variables for this device type
-    const deviceConf = platform.thDevices[accessory.context.eweDeviceId]
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
     this.tempOffset =
       deviceConf && deviceConf.offset ? deviceConf.offset : platform.consts.defaultValues.offset
     this.humiOffset =
diff --git a/lib/device/simulation/humidifier.js b/lib/device/simulation/humidifier.js
index 47cf437e..77eabcba 100644
--- a/lib/device/simulation/humidifier.js
+++ b/lib/device/simulation/humidifier.js
@@ -21,7 +21,7 @@ module.exports = class deviceHeater {
     this.isOnline = true
 
     // Set up custom variables for this device type
-    const deviceConf = platform.thDevices[accessory.context.eweDeviceId]
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
     this.tempOffset =
       deviceConf && deviceConf.offset ? deviceConf.offset : platform.consts.defaultValues.offset
     this.humiOffset =
diff --git a/lib/device/simulation/lock-one.js b/lib/device/simulation/lock-one.js
index a46890b8..f527774a 100644
--- a/lib/device/simulation/lock-one.js
+++ b/lib/device/simulation/lock-one.js
@@ -22,7 +22,7 @@ module.exports = class deviceLockOne {
     this.isOnline = true
 
     // Set up custom variables for this device type
-    const deviceConf = platform.simulations[accessory.context.eweDeviceId]
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
     this.operationTime = deviceConf.operationTime || platform.consts.defaultValues.operationTime
 
     // Set the correct logging variables for this accessory
@@ -146,7 +146,7 @@ module.exports = class deviceLockOne {
     const opts = JSON.stringify({
       logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
       operationTime: this.operationTime,
-      type: deviceConf.type
+      showAs: deviceConf.showAs
     })
     this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
diff --git a/lib/device/simulation/p-button.js b/lib/device/simulation/p-button.js
index ffa78177..a251ccfb 100644
--- a/lib/device/simulation/p-button.js
+++ b/lib/device/simulation/p-button.js
@@ -22,7 +22,7 @@ module.exports = class devicePButton {
     this.isOnline = true
 
     // Set up custom variables for this device type
-    const deviceConf = platform.simulations[accessory.context.eweDeviceId]
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
 
     // Set the correct logging variables for this accessory
     this.enableLogging = !platform.config.disableDeviceLogging
@@ -128,7 +128,7 @@ module.exports = class devicePButton {
     const opts = JSON.stringify({
       logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
       operationTime: this.operationTime,
-      type: deviceConf.type
+      showAs: deviceConf.showAs
     })
     this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
diff --git a/lib/device/simulation/purifier.js b/lib/device/simulation/purifier.js
index ee2c0973..7c46c2c3 100644
--- a/lib/device/simulation/purifier.js
+++ b/lib/device/simulation/purifier.js
@@ -22,7 +22,7 @@ module.exports = class devicePurifier {
     this.isOnline = true
 
     // Set up custom variables for this device type
-    const deviceConf = platform.simulations[accessory.context.eweDeviceId]
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
     // Set the correct logging variables for this accessory
     this.enableLogging = !platform.config.disableDeviceLogging
     this.enableDebugLogging = platform.config.debug
@@ -152,7 +152,8 @@ module.exports = class devicePurifier {
 
     // Output the customised options to the log
     const opts = JSON.stringify({
-      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable'
+      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
+      showAs: 'purifier'
     })
     this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
diff --git a/lib/device/simulation/sensor-hidden.js b/lib/device/simulation/sensor-hidden.js
index fdaf1340..2aa186f7 100644
--- a/lib/device/simulation/sensor-hidden.js
+++ b/lib/device/simulation/sensor-hidden.js
@@ -35,7 +35,7 @@ module.exports = class deviceSensorHidden {
         return
       }
       this.cacheState = newState
-      for (const [deviceId, group] of Object.entries(this.platform.simulations)) {
+      for (const [deviceId, group] of Object.entries(this.platform.deviceConf)) {
         if (
           group.sensorId === this.accessory.context.eweDeviceId &&
           ['garage', 'lock'].includes(group.type)
diff --git a/lib/device/simulation/sensor-leak.js b/lib/device/simulation/sensor-leak.js
index cf49e6d9..f995f22c 100644
--- a/lib/device/simulation/sensor-leak.js
+++ b/lib/device/simulation/sensor-leak.js
@@ -18,7 +18,7 @@ module.exports = class deviceSensorLeak {
     this.accessory = accessory
 
     // Set up custom variables for this device type
-    const deviceConf = platform.sensorDevices[accessory.context.eweDeviceId]
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
     this.lowBattThreshold =
       deviceConf && deviceConf.lowBattThreshold
         ? Math.min(deviceConf.lowBattThreshold, 100)
diff --git a/lib/device/simulation/sensor-visible.js b/lib/device/simulation/sensor-visible.js
index 45a80f56..cc2aaae8 100644
--- a/lib/device/simulation/sensor-visible.js
+++ b/lib/device/simulation/sensor-visible.js
@@ -22,7 +22,7 @@ module.exports = class deviceSensorVisible {
 
     // Set up custom variables for this device type
     this.isDW2 = platform.consts.devices.sensorContact.includes(accessory.context.eweUIID)
-    const deviceConf = platform.sensorDevices[accessory.context.eweDeviceId]
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
     this.scaleBattery = deviceConf && deviceConf.scaleBattery
     this.lowBattThreshold =
       deviceConf && deviceConf.lowBattThreshold
@@ -142,7 +142,7 @@ module.exports = class deviceSensorVisible {
           newState === 0 ? this.lang.contactYes : this.lang.contactNo
         )
       }
-      for (const [deviceId, group] of Object.entries(this.platform.simulations)) {
+      for (const [deviceId, group] of Object.entries(this.platform.deviceConf)) {
         if (
           group.sensorId === this.accessory.context.eweDeviceId &&
           ['garage', 'lock'].includes(group.type)
diff --git a/lib/device/simulation/sensor.js b/lib/device/simulation/sensor.js
index b23ca423..f88e361a 100644
--- a/lib/device/simulation/sensor.js
+++ b/lib/device/simulation/sensor.js
@@ -21,7 +21,7 @@ module.exports = class deviceSensor {
     this.isOnline = true
 
     // Set up custom variables for this device type
-    const deviceConf = platform.simulations[accessory.context.eweDeviceId]
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
     this.sensorType = deviceConf.sensorType || 'motion'
 
     // Set the correct logging variables for this accessory
diff --git a/lib/device/simulation/switch-valve.js b/lib/device/simulation/switch-valve.js
index d52b1b73..b09291e9 100644
--- a/lib/device/simulation/switch-valve.js
+++ b/lib/device/simulation/switch-valve.js
@@ -22,7 +22,7 @@ module.exports = class deviceSwitchValve {
     this.isOnline = true
 
     // Set up custom variables for this device type
-    const deviceConf = platform.simulations[accessory.context.eweDeviceId]
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
 
     // Set the correct logging variables for this accessory
     this.enableLogging = !platform.config.disableDeviceLogging
@@ -148,7 +148,7 @@ module.exports = class deviceSwitchValve {
     // Output the customised options to the log
     const opts = JSON.stringify({
       logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
-      type: deviceConf.type
+      showAs: deviceConf.showAs
     })
     this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
diff --git a/lib/device/simulation/tap-one.js b/lib/device/simulation/tap-one.js
index 0dbcb505..2a8c20ad 100644
--- a/lib/device/simulation/tap-one.js
+++ b/lib/device/simulation/tap-one.js
@@ -22,7 +22,7 @@ module.exports = class deviceTapOne {
     this.isOnline = true
 
     // Set up custom variables for this device type
-    const deviceConf = platform.simulations[accessory.context.eweDeviceId]
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
 
     // Set the correct logging variables for this accessory
     this.enableLogging = !platform.config.disableDeviceLogging
@@ -130,7 +130,7 @@ module.exports = class deviceTapOne {
     // Output the customised options to the log
     const opts = JSON.stringify({
       logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
-      type: deviceConf.type
+      showAs: deviceConf.showAs
     })
     this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
diff --git a/lib/device/simulation/tap-two.js b/lib/device/simulation/tap-two.js
index 99100d29..4e993b27 100644
--- a/lib/device/simulation/tap-two.js
+++ b/lib/device/simulation/tap-two.js
@@ -22,7 +22,7 @@ module.exports = class deviceTapTwo {
     this.isOnline = true
 
     // Set up custom variables for this device type
-    const deviceConf = platform.simulations[accessory.context.eweDeviceId]
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
 
     // Set the correct logging variables for this accessory
     this.enableLogging = !platform.config.disableDeviceLogging
@@ -105,7 +105,7 @@ module.exports = class deviceTapTwo {
     // Output the customised options to the log
     const opts = JSON.stringify({
       logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
-      type: deviceConf.type
+      showAs: deviceConf.showAs
     })
     this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
diff --git a/lib/device/simulation/valve-four.js b/lib/device/simulation/valve-four.js
index d605c7b4..c4bfe79d 100644
--- a/lib/device/simulation/valve-four.js
+++ b/lib/device/simulation/valve-four.js
@@ -20,7 +20,7 @@ module.exports = class deviceValveFour {
     this.isOnline = true
 
     // Set up custom variables for this device type
-    const deviceConf = platform.simulations[accessory.context.eweDeviceId]
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
 
     // Set the correct logging variables for this accessory
     this.enableLogging = !platform.config.disableDeviceLogging
@@ -96,7 +96,7 @@ module.exports = class deviceValveFour {
     // Output the customised options to the log
     const opts = JSON.stringify({
       logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
-      type: deviceConf.type
+      showAs: deviceConf.showAs
     })
     this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
diff --git a/lib/device/simulation/valve-one.js b/lib/device/simulation/valve-one.js
index cb8c23d8..eb822c00 100644
--- a/lib/device/simulation/valve-one.js
+++ b/lib/device/simulation/valve-one.js
@@ -22,7 +22,7 @@ module.exports = class deviceValveOne {
     this.isOnline = true
 
     // Set up custom variables for this device type
-    const deviceConf = platform.simulations[accessory.context.eweDeviceId]
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
 
     // Set the correct logging variables for this accessory
     this.enableLogging = !platform.config.disableDeviceLogging
@@ -150,7 +150,7 @@ module.exports = class deviceValveOne {
     // Output the customised options to the log
     const opts = JSON.stringify({
       logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
-      type: deviceConf.type
+      showAs: deviceConf.showAs
     })
     this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
diff --git a/lib/device/simulation/valve-two.js b/lib/device/simulation/valve-two.js
index 0e8fa950..1e427a69 100644
--- a/lib/device/simulation/valve-two.js
+++ b/lib/device/simulation/valve-two.js
@@ -22,7 +22,7 @@ module.exports = class deviceValveTwo {
     this.isOnline = true
 
     // Set up custom variables for this device type
-    const deviceConf = platform.simulations[accessory.context.eweDeviceId]
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
 
     // Set the correct logging variables for this accessory
     this.enableLogging = !platform.config.disableDeviceLogging
@@ -125,7 +125,7 @@ module.exports = class deviceValveTwo {
     // Output the customised options to the log
     const opts = JSON.stringify({
       logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
-      type: deviceConf.type
+      showAs: deviceConf.showAs
     })
     this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
diff --git a/lib/device/simulation/window.js b/lib/device/simulation/window.js
index f9ee4d4d..0297d191 100644
--- a/lib/device/simulation/window.js
+++ b/lib/device/simulation/window.js
@@ -22,7 +22,7 @@ module.exports = class deviceWindow {
     this.isOnline = true
 
     // Set up custom variables for this device type
-    const deviceConf = platform.simulations[accessory.context.eweDeviceId]
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
     this.operationTimeUp = deviceConf.operationTime || platform.consts.defaultValues.operationTime
     this.operationTimeDown = deviceConf.operationTimeDown || this.operationTimeUp
 
@@ -116,7 +116,7 @@ module.exports = class deviceWindow {
       logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
       operationTimeDown: this.operationTimeDown,
       operationTimeUp: this.operationTimeUp,
-      type: deviceConf.type
+      showAs: deviceConf.showAs
     })
     this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
diff --git a/lib/device/switch-multi.js b/lib/device/switch-multi.js
index 81908945..eb51236f 100644
--- a/lib/device/switch-multi.js
+++ b/lib/device/switch-multi.js
@@ -29,7 +29,7 @@ module.exports = class deviceSwitchMulti {
     */
 
     // Set up custom variables for this device type
-    const deviceConf = platform.multiDevices[accessory.context.eweDeviceId]
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
     this.hideChannels = deviceConf && deviceConf.hideChannels ? deviceConf.hideChannels : undefined
 
     // Set the correct logging variables for this accessory
@@ -140,7 +140,7 @@ module.exports = class deviceSwitchMulti {
       const opts = JSON.stringify({
         hideChannels: this.hideChannels,
         logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
-        showAsType: 'switch'
+        showAs: 'default'
       })
       this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
     }
diff --git a/lib/device/switch-single.js b/lib/device/switch-single.js
index 4c6b5ae2..7b632e10 100644
--- a/lib/device/switch-single.js
+++ b/lib/device/switch-single.js
@@ -29,12 +29,7 @@ module.exports = class deviceSwitchSingle {
     */
 
     // Set up custom variables for this device type
-    let deviceConf
-    if (platform.singleDevices[accessory.context.eweDeviceId]) {
-      deviceConf = platform.singleDevices[accessory.context.eweDeviceId]
-    } else if (platform.outletDevices[accessory.context.eweDeviceId]) {
-      deviceConf = platform.outletDevices[accessory.context.eweDeviceId]
-    }
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
 
     // Set the correct logging variables for this accessory
     this.enableLogging = !platform.config.disableDeviceLogging
@@ -158,7 +153,7 @@ module.exports = class deviceSwitchSingle {
     // Output the customised options to the log
     const opts = JSON.stringify({
       logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
-      showAsType: 'switch'
+      showAs: 'default'
     })
     this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
diff --git a/lib/device/thermostat.js b/lib/device/thermostat.js
index c59ab730..a8cf05d6 100644
--- a/lib/device/thermostat.js
+++ b/lib/device/thermostat.js
@@ -21,7 +21,7 @@ module.exports = class deviceThermostat {
     this.isOnline = true
 
     // Set up custom variables for this device type
-    const deviceConf = platform.thDevices[accessory.context.eweDeviceId]
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
     this.tempOffset =
       deviceConf && deviceConf.offset ? deviceConf.offset : platform.consts.defaultValues.offset
 
diff --git a/lib/device/zigbee/light-cct.js b/lib/device/zigbee/light-cct.js
index 30c80c66..76df2c61 100644
--- a/lib/device/zigbee/light-cct.js
+++ b/lib/device/zigbee/light-cct.js
@@ -18,7 +18,7 @@ module.exports = class deviceZBLightCCT {
     this.accessory = accessory
 
     // Set up custom variables for this device type
-    const deviceConf = platform.lightDevices[accessory.context.eweDeviceId]
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
     this.brightStep =
       deviceConf && deviceConf.brightnessStep
         ? Math.min(deviceConf.brightnessStep, 100)
diff --git a/lib/device/zigbee/light-dimmer.js b/lib/device/zigbee/light-dimmer.js
index aca7d981..438f0090 100644
--- a/lib/device/zigbee/light-dimmer.js
+++ b/lib/device/zigbee/light-dimmer.js
@@ -18,7 +18,7 @@ module.exports = class deviceZBLightDimmer {
     this.accessory = accessory
 
     // Set up custom variables for this device type
-    const deviceConf = platform.lightDevices[accessory.context.eweDeviceId]
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
     this.brightStep =
       deviceConf && deviceConf.brightnessStep
         ? Math.min(deviceConf.brightnessStep, 100)
diff --git a/lib/device/zigbee/sensor-ambient.js b/lib/device/zigbee/sensor-ambient.js
index 6774f224..0a5758e6 100644
--- a/lib/device/zigbee/sensor-ambient.js
+++ b/lib/device/zigbee/sensor-ambient.js
@@ -17,7 +17,7 @@ module.exports = class deviceZBSensorAmbient {
     this.accessory = accessory
 
     // Set up custom variables for this device type
-    const deviceConf = platform.sensorDevices[accessory.context.eweDeviceId]
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
     this.lowBattThreshold =
       deviceConf && deviceConf.lowBattThreshold
         ? Math.min(deviceConf.lowBattThreshold, 100)
diff --git a/lib/device/zigbee/sensor-contact.js b/lib/device/zigbee/sensor-contact.js
index 5c3af731..1fdf9876 100644
--- a/lib/device/zigbee/sensor-contact.js
+++ b/lib/device/zigbee/sensor-contact.js
@@ -19,7 +19,7 @@ module.exports = class deviceZBSensorContact {
     this.accessory = accessory
 
     // Set up custom variables for this device type
-    const deviceConf = platform.sensorDevices[accessory.context.eweDeviceId]
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
     this.scaleBattery = deviceConf && deviceConf.scaleBattery
     this.lowBattThreshold =
       deviceConf && deviceConf.lowBattThreshold
diff --git a/lib/device/zigbee/sensor-leak.js b/lib/device/zigbee/sensor-leak.js
index c5f313d9..d12d379b 100644
--- a/lib/device/zigbee/sensor-leak.js
+++ b/lib/device/zigbee/sensor-leak.js
@@ -18,7 +18,7 @@ module.exports = class deviceZBSensorLeak {
     this.accessory = accessory
 
     // Set up custom variables for this device type
-    const deviceConf = platform.sensorDevices[accessory.context.eweDeviceId]
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
     this.lowBattThreshold =
       deviceConf && deviceConf.lowBattThreshold
         ? Math.min(deviceConf.lowBattThreshold, 100)
diff --git a/lib/device/zigbee/sensor-motion.js b/lib/device/zigbee/sensor-motion.js
index 8cd60ee9..9abb4e7e 100644
--- a/lib/device/zigbee/sensor-motion.js
+++ b/lib/device/zigbee/sensor-motion.js
@@ -18,7 +18,7 @@ module.exports = class deviceZBSensorMotion {
     this.accessory = accessory
 
     // Set up custom variables for this device type
-    const deviceConf = platform.sensorDevices[accessory.context.eweDeviceId]
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
     this.lowBattThreshold =
       deviceConf && deviceConf.lowBattThreshold
         ? Math.min(deviceConf.lowBattThreshold, 100)
diff --git a/lib/device/zigbee/switch-single.js b/lib/device/zigbee/switch-single.js
index 7f262a78..ac406a46 100644
--- a/lib/device/zigbee/switch-single.js
+++ b/lib/device/zigbee/switch-single.js
@@ -17,7 +17,7 @@ module.exports = class deviceZBSwitchSingle {
     this.accessory = accessory
 
     // Set up custom variables for this device type
-    const deviceConf = platform.singleDevices[accessory.context.eweDeviceId]
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
 
     // Set the correct logging variables for this accessory
     this.showAsOutlet = deviceConf && deviceConf.showAsOutlet
diff --git a/lib/device/zigbee/switch-stateless.js b/lib/device/zigbee/switch-stateless.js
index 93031e61..30c2e24f 100644
--- a/lib/device/zigbee/switch-stateless.js
+++ b/lib/device/zigbee/switch-stateless.js
@@ -17,7 +17,7 @@ module.exports = class deviceZBSwitchStateless {
     this.accessory = accessory
 
     // Set up custom variables for this device type
-    const deviceConf = platform.sensorDevices[accessory.context.eweDeviceId]
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
     this.hideLongDouble = deviceConf && deviceConf.hideLongDouble
     this.lowBattThreshold =
       deviceConf && deviceConf.lowBattThreshold
diff --git a/lib/index.js b/lib/index.js
index 3c53431a..da74e1b2 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -39,16 +39,8 @@ class eWeLinkPlatform {
       this.log = log
 
       // Configuration objects for accessories
-      this.fanDevices = {}
-      this.lightDevices = {}
-      this.multiDevices = {}
-      this.outletDevices = {}
-      this.sensorDevices = {}
-      this.singleDevices = {}
-      this.thDevices = {}
-      this.rfDevices = {}
+      this.deviceConf = {}
       this.rfSubdevices = {}
-      this.simulations = {}
       this.hideChannels = []
       this.hideMasters = []
       this.ipOverride = {}
@@ -227,7 +219,7 @@ class eWeLinkPlatform {
                 logRemove(key + '.' + id)
                 return
               }
-              this[key][id] = {}
+              this.deviceConf[id] = {}
               for (const [k, v] of entries) {
                 if (!this.consts.allowed[key].includes(k)) {
                   logRemove(key + '.' + id + '.' + k)
@@ -247,12 +239,12 @@ class eWeLinkPlatform {
                     const intVal = parseInt(v)
                     if (isNaN(intVal)) {
                       logDefault(key + '.' + id + '.' + k, this.consts.defaultValues[k])
-                      this[key][id][k] = this.consts.defaultValues[k]
+                      this.deviceConf[id][k] = this.consts.defaultValues[k]
                     } else if (intVal < this.consts.minValues[k]) {
                       logIncrease(key + '.' + id + '.' + k, this.consts.minValues[k])
-                      this[key][id][k] = this.consts.minValues[k]
+                      this.deviceConf[id][k] = this.consts.minValues[k]
                     } else {
-                      this[key][id][k] = intVal
+                      this.deviceConf[id][k] = intVal
                     }
                     break
                   }
@@ -263,7 +255,7 @@ class eWeLinkPlatform {
                     if (typeof v !== 'string' || !inSet) {
                       logIgnore(key + '.' + id + '.' + k)
                     } else {
-                      this[key][id][k] = inSet ? v : this.consts.defaultValues[k]
+                      this.deviceConf[id][k] = inSet ? v : this.consts.defaultValues[k]
                     }
                     break
                   }
@@ -278,7 +270,7 @@ class eWeLinkPlatform {
                       const channels = v.split(',')
                       channels.forEach(channel => {
                         this.hideChannels.push(id + 'SW' + channel.replace(/[^0-9]+/g, ''))
-                        this[key][id][k] = v
+                        this.deviceConf[id][k] = v
                       })
                     }
                     break
@@ -288,12 +280,10 @@ class eWeLinkPlatform {
                   case 'hideSwitch':
                   case 'resetOnStartup':
                   case 'scaleBattery':
-                  case 'showAsOutlet':
-                  case 'showAsSwitch':
                     if (typeof v === 'string') {
                       logQuotes(key + '.' + id + '.' + k)
                     }
-                    this[key][id][k] = v === 'false' ? false : !!v
+                    this.deviceConf[id][k] = v === 'false' ? false : !!v
                     break
                   case 'humidityOffset': {
                     if (typeof v === 'string') {
@@ -302,9 +292,9 @@ class eWeLinkPlatform {
                     const intVal = parseInt(v)
                     if (isNaN(intVal)) {
                       logDefault(key + '.' + id + '.' + k, this.consts.defaultValues[k])
-                      this[key][id][k] = this.consts.defaultValues[k]
+                      this.deviceConf[id][k] = this.consts.defaultValues[k]
                     } else {
-                      this[key][id][k] = intVal
+                      this.deviceConf[id][k] = intVal
                     }
                     break
                   }
@@ -324,7 +314,7 @@ class eWeLinkPlatform {
                     if (isNaN(numVal)) {
                       logIgnore(key + '.' + id + '.' + k)
                     } else {
-                      this[key][id][k] = numVal
+                      this.deviceConf[id][k] = numVal
                     }
                     break
                   }
@@ -337,6 +327,12 @@ class eWeLinkPlatform {
           break
         case 'groups':
           if (Array.isArray(val) && val.length > 0) {
+            this.log.warn(
+              'The groups[] (Accessory Simulations) config option will be deprecated soon.'
+            )
+            this.log.warn(
+              'Please use the device-specific sections of the config to update your simulations.'
+            )
             val.forEach(x => {
               if (!x.type || !x.deviceId) {
                 logIgnoreItem(key)
@@ -348,7 +344,9 @@ class eWeLinkPlatform {
                 logRemove(key + '.' + id)
                 return
               }
-              this.simulations[id] = {}
+              if (!this.funcs.hasProperty(this.deviceConf, id)) {
+                this.deviceConf[id] = {}
+              }
               for (const [k, v] of entries) {
                 switch (k) {
                   case 'deviceId':
@@ -358,7 +356,9 @@ class eWeLinkPlatform {
                     if (typeof v !== 'string' || v === '') {
                       logIgnore(key + '.' + id + '.' + k)
                     } else {
-                      this.ipOverride[id] = v
+                      if (!this.funcs.hasProperty(this.ipOverride, id)) {
+                        this.ipOverride[id] = v
+                      }
                     }
                     break
                   }
@@ -366,7 +366,9 @@ class eWeLinkPlatform {
                     if (typeof v === 'string') {
                       logQuotes(key + '.' + id + '.' + k)
                     }
-                    this.simulations[id][k] = v === 'false' ? false : !!v
+                    if (!this.funcs.hasProperty(this.deviceConf[id], k)) {
+                      this.deviceConf[id][k] = v === 'false' ? false : !!v
+                    }
                     break
                   case 'obstructId':
                     if (typeof v !== 'string' || v === '') {
@@ -375,7 +377,9 @@ class eWeLinkPlatform {
                       logIgnore(key + '.' + id + '.' + k)
                     } else {
                       const parsed = this.funcs.parseDeviceId(v)
-                      this.simulations[id].obstructId = parsed
+                      if (!this.funcs.hasProperty(this.deviceConf[id], k)) {
+                        this.deviceConf[id][k] = parsed
+                      }
                       this.obstructSwitches[parsed] = id
                     }
                     break
@@ -387,24 +391,33 @@ class eWeLinkPlatform {
                     const intVal = parseInt(v)
                     if (isNaN(intVal)) {
                       logDefault(key + '.' + id + '.' + k, this.consts.defaultValues[k])
-                      this.simulations[id][k] = this.consts.defaultValues[k]
+                      if (!this.funcs.hasProperty(this.deviceConf[id], k)) {
+                        this.deviceConf[id][k] = this.consts.defaultValues[k]
+                      }
                     } else if (intVal < this.consts.minValues[k]) {
                       logIncrease(key + '.' + id + '.' + k, this.consts.minValues[k])
-                      this.simulations[id][k] = this.consts.minValues[k]
+                      if (!this.funcs.hasProperty(this.deviceConf[id], k)) {
+                        this.deviceConf[id][k] = this.consts.minValues[k]
+                      }
                     } else {
-                      this.simulations[id][k] = intVal
+                      if (!this.funcs.hasProperty(this.deviceConf[id], k)) {
+                        this.deviceConf[id][k] = intVal
+                      }
                     }
                     break
                   }
                   case 'overrideLogging':
                   case 'sensorType':
                   case 'type': {
-                    const index = k === 'sensorType' ? 'sensors' : k === 'type' ? 'groupTypes' : k
+                    const k1 = k === 'type' ? 'showAs' : k
+                    const index = k1 === 'sensorType' ? 'sensors' : k1
                     const inSet = this.consts.allowed[index].includes(v)
                     if (typeof v !== 'string' || !inSet) {
-                      logIgnore(key + '.' + id + '.' + k)
+                      logIgnore(key + '.' + id + '.' + k1)
                     } else {
-                      this.simulations[id][k] = v
+                      if (!this.funcs.hasProperty(this.deviceConf[id], k1)) {
+                        this.deviceConf[id][k1] = v
+                      }
                     }
                     break
                   }
@@ -413,7 +426,9 @@ class eWeLinkPlatform {
                       logIgnore(key + '.' + id + '.' + k)
                     } else {
                       const parsed = this.funcs.parseDeviceId(v)
-                      this.simulations[id].sensorId = parsed
+                      if (!this.funcs.hasProperty(this.deviceConf[id], k)) {
+                        this.deviceConf[id].sensorId = parsed
+                      }
                     }
                     break
                   default:
@@ -702,10 +717,14 @@ class eWeLinkPlatform {
       let accessory
       const uiid = device.extra && device.extra.uiid ? device.extra.uiid : 0
       const uuid = this.api.hap.uuid.generate(device.deviceid + 'SWX')
+      const deviceConf = this.deviceConf[device.deviceid] || {}
+      if (!this.funcs.hasProperty(deviceConf, 'showAs')) {
+        deviceConf.showAs = 'default'
+      }
 
       // Remove old sub accessories for Accessory Simulations and DUALR3 in motor/meter mode
       if (
-        this.simulations[device.deviceid] ||
+        deviceConf.showAs !== 'default' ||
         (uiid === 126 && [2, 3].includes(device.params.workMode))
       ) {
         for (let i = 0; i <= 4; i++) {
@@ -750,30 +769,21 @@ class eWeLinkPlatform {
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/curtain'))(this, accessory)
         /***************************/
-      } else if (
-        this.simulations[device.deviceid] &&
-        this.simulations[device.deviceid].type === 'blind'
-      ) {
+      } else if (deviceConf.showAs === 'blind') {
         /****************************
         BLINDS [ACCESSORY SIMULATION]
         ****************************/
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/simulation/blind'))(this, accessory)
         /***************************/
-      } else if (
-        this.simulations[device.deviceid] &&
-        this.simulations[device.deviceid].type === 'door'
-      ) {
+      } else if (deviceConf.showAs === 'door') {
         /***************************
         DOORS [ACCESSORY SIMULATION]
         ***************************/
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/simulation/door'))(this, accessory)
         /**************************/
-      } else if (
-        this.simulations[device.deviceid] &&
-        this.simulations[device.deviceid].type === 'window'
-      ) {
+      } else if (deviceConf.showAs === 'window') {
         /*****************************
         WINDOWS [ACCESSORY SIMULATION]
         *****************************/
@@ -810,10 +820,7 @@ class eWeLinkPlatform {
         }
         accessory.control = new (require(instance))(this, accessory, devicesInHB)
         /******************************************/
-      } else if (
-        this.simulations[device.deviceid] &&
-        this.simulations[device.deviceid].type === 'garage'
-      ) {
+      } else if (deviceConf.showAs === 'garage') {
         /****************************************
         GARAGE DOORS [ONE] [ACCESSORY SIMULATION]
         ****************************************/
@@ -821,162 +828,120 @@ class eWeLinkPlatform {
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require(instance))(this, accessory, devicesInHB)
         /***************************************/
-      } else if (
-        this.simulations[device.deviceid] &&
-        this.simulations[device.deviceid].type === 'garage_two'
-      ) {
+      } else if (deviceConf.showAs === 'garage_two') {
         /****************************************
         GARAGE DOORS [TWO] [ACCESSORY SIMULATION]
         ****************************************/
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/simulation/garage-two'))(this, accessory)
         /***************************************/
-      } else if (
-        this.simulations[device.deviceid] &&
-        this.simulations[device.deviceid].type === 'garage_four'
-      ) {
+      } else if (deviceConf.showAs === 'garage_four') {
         /*****************************************
         GARAGE DOORS [FOUR] [ACCESSORY SIMULATION]
         *****************************************/
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/simulation/garage-four'))(this, accessory)
         /****************************************/
-      } else if (
-        this.simulations[device.deviceid] &&
-        this.simulations[device.deviceid].type === 'garage_eachen'
-      ) {
+      } else if (deviceConf.showAs === 'garage_eachen') {
         /***************************
         GARAGE DOORS [EACHEN GD-DC5]
         ***************************/
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/simulation/garage-eachen'))(this, accessory)
         /**************************/
-      } else if (
-        this.simulations[device.deviceid] &&
-        this.simulations[device.deviceid].type === 'lock'
-      ) {
+      } else if (deviceConf.showAs === 'lock') {
         /***************************
         LOCKS [ACCESSORY SIMULATION]
         ***************************/
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/simulation/lock-one'))(this, accessory)
         /**************************/
-      } else if (
-        this.simulations[device.deviceid] &&
-        this.simulations[device.deviceid].type === 'switch_valve'
-      ) {
+      } else if (deviceConf.showAs === 'switch_valve') {
         /**********************************
         SWITCH-VALVE [ACCESSORY SIMULATION]
         **********************************/
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/simulation/switch-valve'))(this, accessory)
         /*********************************/
-      } else if (
-        this.simulations[device.deviceid] &&
-        this.simulations[device.deviceid].type === 'tap'
-      ) {
+      } else if (deviceConf.showAs === 'tap') {
         /********************************
         TAPS [ONE] [ACCESSORY SIMULATION]
         ********************************/
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/simulation/tap-one'))(this, accessory)
         /*******************************/
-      } else if (
-        this.simulations[device.deviceid] &&
-        this.simulations[device.deviceid].type === 'tap_two'
-      ) {
+      } else if (deviceConf.showAs === 'tap_two') {
         /********************************
         TAPS [TWO] [ACCESSORY SIMULATION]
         ********************************/
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/simulation/tap-two'))(this, accessory)
         /*******************************/
-      } else if (
-        this.simulations[device.deviceid] &&
-        this.simulations[device.deviceid].type === 'valve'
-      ) {
+      } else if (deviceConf.showAs === 'valve') {
         /**********************************
         VALVES [ONE] [ACCESSORY SIMULATION]
         **********************************/
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/simulation/valve-one'))(this, accessory)
         /*********************************/
-      } else if (
-        this.simulations[device.deviceid] &&
-        this.simulations[device.deviceid].type === 'valve_two'
-      ) {
+      } else if (deviceConf.showAs === 'valve_two') {
         /**********************************
         VALVES [TWO] [ACCESSORY SIMULATION]
         **********************************/
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/simulation/valve-two'))(this, accessory)
         /*********************************/
-      } else if (
-        this.simulations[device.deviceid] &&
-        this.simulations[device.deviceid].type === 'valve_four'
-      ) {
+      } else if (deviceConf.showAs === 'valve_four') {
         /***********************************
         VALVES [FOUR] [ACCESSORY SIMULATION]
         ***********************************/
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/simulation/valve-four'))(this, accessory)
         /**********************************/
-      } else if (
-        this.simulations[device.deviceid] &&
-        this.simulations[device.deviceid].type === 'sensor'
-      ) {
+      } else if (deviceConf.showAs === 'sensor') {
         /*******************
         SENSORS [SIMULATION]
         *******************/
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/simulation/sensor'))(this, accessory)
         /******************/
-      } else if (
-        this.simulations[device.deviceid] &&
-        this.simulations[device.deviceid].type === 'p_button'
-      ) {
+      } else if (deviceConf.showAs === 'p_button') {
         /*******************************
         PROGRAMMABLE BUTTON [SIMULATION]
         *******************************/
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/simulation/p-button'))(this, accessory)
         /******************************/
-      } else if (
-        this.simulations[device.deviceid] &&
-        this.simulations[device.deviceid].type === 'doorbell'
-      ) {
+      } else if (deviceConf.showAs === 'doorbell') {
         /********************
         DOORBELL [SIMULATION]
         ********************/
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/simulation/doorbell'))(this, accessory)
         /*******************/
-      } else if (
-        this.simulations[device.deviceid] &&
-        this.simulations[device.deviceid].type === 'purifier'
-      ) {
+      } else if (deviceConf.showAs === 'purifier') {
         /*********************
         PURIFIERS [SIMULATION]
         *********************/
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/simulation/purifier'))(this, accessory)
         /********************/
+      } else if (
+        deviceConf.type === 'sensor_leak' &&
+        this.consts.devices.sensorContact.includes(uiid)
+      ) {
+        /**************************************
+        SENSORS [LEAK DW2 ACCESSORY SIMULATION]
+        **************************************/
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
+        accessory.control = new (require('./device/simulation/sensor-leak'))(this, accessory)
+        /*************************************/
       } else if (this.consts.devices.sensorContact.includes(uiid)) {
         /*******************
         SENSORS [SONOFF DW2]
         *******************/
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
-        let instance
-        switch (this.sensorDevices[device.deviceid] && this.sensorDevices[device.deviceid].showAs) {
-          case 'sensor_leak':
-            instance = 'simulation/sensor-leak'
-            break
-          default:
-            instance = 'sensor-contact'
-            break
-        }
-        accessory.control = new (require('./device/' + instance))(this, accessory)
-        /******************/
+        accessory.control = new (require('./device/sensor-contact'))(this, accessory)
       } else if (this.consts.devices.fan.includes(uiid)) {
         /***
         FANS
@@ -1005,46 +970,70 @@ class eWeLinkPlatform {
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/thermostat'))(this, accessory)
         /*******/
-      } else if (this.consts.devices.sensorAmbient.includes(uiid)) {
-        /****************
-        SENSORS [TH10/16]
-        ****************/
+      } else if (
+        deviceConf.showAs === 'heater' &&
+        this.consts.devices.sensorAmbient.includes(uiid)
+      ) {
+        /*************************************
+        HEATERS [TH10/16 ACCESSORY SIMULATION]
+        *************************************/
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
         accessory.context.sensorType = device.params.sensorType
-        let instance
-        switch (this.thDevices[device.deviceid] && this.thDevices[device.deviceid].showAs) {
-          case 'cooler':
-            instance = 'simulation/cooler'
-            break
-          case 'dehumidifier':
-            if (device.params.sensorType === 'DS18B20') {
-              if (devicesInHB.has(uuid)) {
-                this.removeAccessory(devicesInHB.get(uuid))
-              }
-              this.log.warn('[%s] %s.', device.name, this.lang.sensorErr)
-              return
-            }
-            instance = 'simulation/dehumidifier'
-            break
-          case 'heater':
-            instance = 'simulation/heater'
-            break
-          case 'humidifier':
-            if (device.params.sensorType === 'DS18B20') {
-              if (devicesInHB.has(uuid)) {
-                this.removeAccessory(devicesInHB.get(uuid))
-              }
-              this.log.warn('[%s] %s.', device.name, this.lang.sensorErr)
-              return
-            }
-            instance = 'simulation/humidifier'
-            break
-          default:
-            instance = 'sensor-ambient'
-            break
+        accessory.control = new (require('./device/simulation/heater'))(this, accessory)
+        /************************************/
+      } else if (
+        deviceConf.showAs === 'cooler' &&
+        this.consts.devices.sensorAmbient.includes(uiid)
+      ) {
+        /*************************************
+        COOLERS [TH10/16 ACCESSORY SIMULATION]
+        *************************************/
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
+        accessory.context.sensorType = device.params.sensorType
+        accessory.control = new (require('./device/simulation/cooler'))(this, accessory)
+        /************************************/
+      } else if (
+        deviceConf.showAs === 'humidifier' &&
+        this.consts.devices.sensorAmbient.includes(uiid)
+      ) {
+        /*****************************************
+        HUMIDIFIERS [TH10/16 ACCESSORY SIMULATION]
+        *****************************************/
+        if (device.params.sensorType === 'DS18B20') {
+          if (devicesInHB.has(uuid)) {
+            this.removeAccessory(devicesInHB.get(uuid))
+          }
+          this.log.warn('[%s] %s.', device.name, this.lang.sensorErr)
+          return
+        }
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
+        accessory.context.sensorType = device.params.sensorType
+        accessory.control = new (require('./device/simulation/humidifier'))(this, accessory)
+        /*****************************************/
+      } else if (
+        deviceConf.showAs === 'dehumidifier' &&
+        this.consts.devices.sensorAmbient.includes(uiid)
+      ) {
+        /*******************************************
+        DEHUMIDIFIERS [TH10/16 ACCESSORY SIMULATION]
+        *******************************************/
+        if (device.params.sensorType === 'DS18B20') {
+          this.log.warn('[%s] %s.', device.name, this.lang.sensorErr)
+          return
         }
-        accessory.control = new (require('./device/' + instance))(this, accessory)
-        /***************/
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
+        accessory.context.sensorType = device.params.sensorType
+        accessory.control = new (require('./device/simulation/dehumidifier'))(this, accessory)
+        /*******************************************/
+      } else if (this.consts.devices.sensorAmbient.includes(uiid)) {
+        /***********************
+        SENSOR [AMBIENT-TH10/16]
+        ***********************/
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
+        accessory.context.sensorType = device.params.sensorType
+        accessory.control = new (require('./device/sensor-ambient'))(this, accessory)
+        /**********************/
       } else if (this.consts.devices.sensorTempHumi.includes(uiid)) {
         /*************************
         SENSOR [AMBIENT-SONOFF SC]
@@ -1080,34 +1069,25 @@ class eWeLinkPlatform {
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/light-dimmer'))(this, accessory)
         /*************/
+        /**********************/
       } else if (
+        this.consts.devices.singleSwitch.includes(uiid) ||
         this.consts.devices.outlet.includes(uiid) ||
-        this.consts.devices.outletSCM.includes(uiid) ||
-        this.consts.devices.singleSwitchOutlet.includes(device.productModel)
+        this.consts.devices.outletSCM.includes(uiid)
       ) {
-        /***********************
-        OUTLETS [SINGLE CHANNEL]
-        ***********************/
-        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control =
-          this.outletDevices[device.deviceid] && this.outletDevices[device.deviceid].showAsSwitch
-            ? new (require('./device/switch-single'))(this, accessory)
-            : new (require('./device/outlet-single'))(this, accessory)
-        /**********************/
-      } else if (this.consts.devices.singleSwitch.includes(uiid)) {
-        /************************
-        SWITCHES [SINGLE CHANNEL]
-        ************************/
+        /********************************
+        SWITCHES/OUTLETS [SINGLE CHANNEL]
+        ********************************/
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control =
-          this.singleDevices[device.deviceid] && this.singleDevices[device.deviceid].showAsOutlet
+          deviceConf.showAs === 'outlet'
             ? new (require('./device/outlet-single'))(this, accessory)
             : new (require('./device/switch-single'))(this, accessory)
-        /***********************/
+        /*******************************/
       } else if (this.consts.devices.multiSwitch.includes(uiid)) {
-        /***********************
-        SWITCHES [MULTI CHANNEL]
-        ***********************/
+        /*******************************
+        SWITCHES/OUTLETS [MULTI CHANNEL]
+        *******************************/
 
         // If a single accessory is leftover from a simulation then remove it
         if (devicesInHB.has(uuid)) {
@@ -1158,7 +1138,7 @@ class eWeLinkPlatform {
               : false
           subAccessory.context.lanKey = device.devicekey
           subAccessory.control =
-            this.multiDevices[device.deviceid] && this.multiDevices[device.deviceid].showAsOutlet
+            deviceConf.showAs === 'outlet'
               ? new (require('./device/outlet-multi'))(this, subAccessory, devicesInHB)
               : new (require('./device/switch-multi'))(this, subAccessory, devicesInHB)
 
@@ -1174,7 +1154,7 @@ class eWeLinkPlatform {
             accessory = subAccessory
           }
         }
-        /**********************/
+        /******************************/
       } else if (this.consts.devices.rfBridge.includes(uiid)) {
         /*********************
         RF BRIDGE + SUBDEVICES
@@ -1201,7 +1181,7 @@ class eWeLinkPlatform {
 
         // Flag used for later to remove and re-add the subdevices if user configured
         const resetRF =
-          this.rfDevices[device.deviceid] && this.rfDevices[device.deviceid].resetOnStartup
+          this.deviceConf[device.deviceid] && this.deviceConf[device.deviceid].resetOnStartup
 
         // Loop through each sub device connected to the RF Bridge
         rfMap.forEach(subDevice => {
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 69dcfc40..a3fee6b0 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -18,7 +18,6 @@ module.exports = {
     disablePlugin: false,
     singleDevices: [],
     multiDevices: [],
-    outletDevices: [],
     lightDevices: [],
     thDevices: [],
     fanDevices: [],
@@ -79,24 +78,23 @@ module.exports = {
       'cn-apia.coolkit.cn'
     ],
     modes: ['auto', 'wan', 'lan'],
-    singleDevices: ['deviceId', 'label', 'showAsOutlet', 'ipAddress', 'overrideLogging'],
-    multiDevices: [
+    singleDevices: [
       'deviceId',
       'deviceModel',
       'label',
-      'showAsOutlet',
-      'showAsMotor',
+      'showAs',
       'inUsePowerThreshold',
-      'hideChannels',
       'ipAddress',
       'overrideLogging'
     ],
-    outletDevices: [
+    multiDevices: [
       'deviceId',
       'deviceModel',
       'label',
-      'showAsSwitch',
+      'showAs',
+      'showAsMotor',
       'inUsePowerThreshold',
+      'hideChannels',
       'ipAddress',
       'overrideLogging'
     ],
@@ -126,6 +124,8 @@ module.exports = {
     sensorDevices: [
       'deviceId',
       'deviceModel',
+      'label',
+      'showAs',
       'lowBattThreshold',
       'offset',
       'humidityOffset',
@@ -135,41 +135,46 @@ module.exports = {
       'overrideLogging'
     ],
     rfDevices: ['deviceId', 'label', 'resetOnStartup', 'ipAddress', 'overrideLogging'],
-    groupTypes: [
+    overrideLogging: ['default', 'standard', 'debug', 'disable'],
+    obstructs: ['garage', 'garage_eachen'],
+    sensors: [
+      'water',
+      'smoke',
+      'co',
+      'co2',
+      'contact',
+      'occupancy',
+      'motion',
+      'p_button',
+      'doorbell'
+    ],
+    showAs: [
       'blind',
+      'cooler',
+      'default',
+      'dehumidifier',
       'door',
       'doorbell',
       'garage',
-      'garage_two',
-      'garage_four',
       'garage_eachen',
+      'garage_four',
+      'garage_two',
+      'heater',
+      'humidifier',
       'lock',
-      'p_button',
+      'outlet',
       'purifier',
+      'p_button',
       'sensor',
+      'sensor_leak',
       'switch_valve',
       'tap',
       'tap_two',
-      'thermostat',
       'valve',
       'valve_two',
       'valve_four',
       'window'
     ],
-    overrideLogging: ['default', 'standard', 'debug', 'disable'],
-    obstructs: ['garage', 'garage_eachen'],
-    sensors: [
-      'water',
-      'smoke',
-      'co',
-      'co2',
-      'contact',
-      'occupancy',
-      'motion',
-      'p_button',
-      'doorbell'
-    ],
-    showAs: ['cooler', 'dehumidifier', 'heater', 'humidifier', 'sensor_leak'],
     showAsMotor: ['blind', 'door', 'window']
   },
 
@@ -177,7 +182,6 @@ module.exports = {
     lan: [1, 2, 3, 4, 5, 6, 7, 8, 9, 14, 15, 28, 32, 34, 44, 77, 78, 126],
     singleSwitch: [1, 6, 14, 24, 27, 112],
     multiSwitch: [2, 3, 4, 7, 8, 9, 29, 30, 31, 41, 82, 83, 84, 113, 114, 126],
-    singleSwitchOutlet: ['S20', 'S26', 'S26R1', 'S55', 'S55R1'],
     lightDimmer: [36, 44, 57],
     lightRGB: [22],
     lightCCT: [103],

From c5f490bd8a92f22991284a79710db1a85054b20b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 6 Jul 2021 07:16:59 +0100
Subject: [PATCH 2474/3183] bump node 14.17.3

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index c0d24986..096a72cc 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
   "main": "lib/index.js",
   "engines": {
     "homebridge": "^1.3.3",
-    "node": "^14.17.2 || ^16.4.1"
+    "node": "^14.17.3 || ^16.4.2"
   },
   "repository": {
     "type": "git",

From 2d63737058f895142d01b9c6c6979c4234a3be10 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 6 Jul 2021 07:18:25 +0100
Subject: [PATCH 2475/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dbb2da05..1464650b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -79,7 +79,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 - **Configuration**
   - `sensorTimeDifference` minimum reduced to 5 seconds and default reduced to 60 seconds
 - **Dependencies**
-  - Recommended node version bump to v14.17.2
+  - Recommended node version bump to v14.17.3
   - Bump `ws` dependency to v7.5.2
 
 ### Fixed

From bb721c45f23888a2be110630ee26d681b5c72847 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 6 Jul 2021 07:41:18 +0100
Subject: [PATCH 2476/3183] bring simulations to singleDevices and multiDevices
 config

---
 config.schema.json     | 212 +++++++++++++++++++++++++++++++++++++----
 lib/index.js           |  94 ++++++++++--------
 lib/utils/constants.js |  16 +++-
 3 files changed, 262 insertions(+), 60 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 1d8651ec..2ed6889d 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -200,6 +200,22 @@
                   "title": "1 Doorbell",
                   "enum": ["doorbell"]
                 },
+                {
+                  "title": "1 Garage Door",
+                  "enum": ["garage"]
+                },
+                {
+                  "title": "1 Garage Door (Eachen GDDC5)",
+                  "enum": ["garage_eachen"]
+                },
+                {
+                  "title": "1 Irrigation Valve",
+                  "enum": ["valve"]
+                },
+                {
+                  "title": "1 Lock",
+                  "enum": ["lock"]
+                },
                 {
                   "title": "1 Programmable Button",
                   "enum": ["p_button"]
@@ -207,12 +223,26 @@
                 {
                   "title": "1 Sensor",
                   "enum": ["sensor"]
+                },
+                {
+                  "title": "1 Tap/Faucet",
+                  "enum": ["tap"]
                 }
               ],
               "condition": {
                 "functionBody": "return (model.singleDevices && model.singleDevices[arrayIndices] && ['single', 't', 'pow', 'iw', 's', 'micro', 'slampher', 'king', 'zb'].includes(model.singleDevices[arrayIndices].deviceModel));"
               }
             },
+            "inUsePowerThreshold": {
+              "type": "integer",
+              "title": "Outlet 'In Use' Threshold",
+              "description": "HomeKit will set the 'In Use' status of outlet devices to true when the wattage is above this number. Must be 0 or more.",
+              "placeholder": 0,
+              "minimum": 0,
+              "condition": {
+                "functionBody": "return (model.singleDevices && model.singleDevices[arrayIndices] && ['pow', 'iw'].includes(model.singleDevices[arrayIndices].deviceModel) && ['outlet'].includes(model.singleDevices[arrayIndices].showAs));"
+              }
+            },
             "sensorType": {
               "type": "string",
               "title": "Sensor Type",
@@ -251,14 +281,50 @@
                 "functionBody": "return (model.singleDevices && model.singleDevices[arrayIndices] && ['sensor'].includes(model.singleDevices[arrayIndices].showAs));"
               }
             },
-            "inUsePowerThreshold": {
+            "operationTime": {
               "type": "integer",
-              "title": "Outlet 'In Use' Threshold",
-              "description": "HomeKit will set the 'In Use' status of outlet devices to true when the wattage is above this number. Must be 0 or more.",
-              "placeholder": 0,
-              "minimum": 0,
+              "title": "Operation Time (Deciseconds)",
+              "description": "Garage doors: the time to open/close the device. Locks: the time to show as unlocked. This setting is in deciseconds - count the time in seconds and multiply by 10, for example 75 for 7.5 seconds. Must be 20 or more.",
+              "placeholder": 100,
+              "minimum": 20,
               "condition": {
-                "functionBody": "return (model.singleDevices && model.singleDevices[arrayIndices] && ['pow', 'iw'].includes(model.singleDevices[arrayIndices].deviceModel) && ['outlet'].includes(model.singleDevices[arrayIndices].showAs));"
+                "functionBody": "return (model.singleDevices && model.singleDevices[arrayIndices] && ['garage', 'gargage_eachen', 'lock'].includes(model.singleDevices[arrayIndices].showAs));"
+              }
+            },
+            "operationTimeDown": {
+              "type": "integer",
+              "title": "Operation Time Down (Deciseconds)",
+              "description": "If your garage door has a different operation time for up and down, use this setting to specify the operation time DOWN (in deciseconds) and the other setting to specify the operation time UP. Otherwise leave blank. Must be 20 or more.",
+              "placeholder": 100,
+              "minimum": 20,
+              "condition": {
+                "functionBody": "return (model.singleDevices && model.singleDevices[arrayIndices] && ['garage'].includes(model.singleDevices[arrayIndices].showAs));"
+              }
+            },
+            "sensorId": {
+              "type": "string",
+              "title": "Sensor",
+              "description": "A DW2 or Zigbee contact sensor can be used for a single garage door to determine the current state. Enter the 10 digit eWeLink Device ID (normally in the format 1000ab23cd). Otherwise leave blank.",
+              "minLength": 10,
+              "maxLength": 10,
+              "condition": {
+                "functionBody": "return (model.singleDevices && model.singleDevices[arrayIndices] && ['garage'].includes(model.singleDevices[arrayIndices].showAs));"
+              }
+            },
+            "hideSensor": {
+              "type": "boolean",
+              "title": "Hide Sensor",
+              "description": "Hide this contact sensor accessory from HomeKit.",
+              "condition": {
+                "functionBody": "return (model.singleDevices && model.singleDevices[arrayIndices] && model.singleDevices[arrayIndices].sensorId && model.singleDevices[arrayIndices].sensorId.length === 10);"
+              }
+            },
+            "obstructId": {
+              "type": "string",
+              "title": "Obstruction Switch",
+              "description": "An optional switch that will trigger the Obstruction Detected feature depending on its value. Otherwise leave blank.",
+              "condition": {
+                "functionBody": "return (model.singleDevices && model.singleDevices[arrayIndices] && ['garage', 'garage_eachen'].includes(model.singleDevices[arrayIndices].showAs));"
               }
             },
             "ipAddress": {
@@ -367,10 +433,42 @@
                   "title": "1 Air Purifier",
                   "enum": ["purifier"]
                 },
+                {
+                  "title": "1 Door",
+                  "enum": ["door"]
+                },
                 {
                   "title": "1 Doorbell",
                   "enum": ["doorbell"]
                 },
+                {
+                  "title": "1 Garage Door",
+                  "enum": ["garage"]
+                },
+                {
+                  "title": "2 Garage Doors",
+                  "enum": ["garage_two"]
+                },
+                {
+                  "title": "4 Garage Doors",
+                  "enum": ["garage_four"]
+                },
+                {
+                  "title": "1 Irrigation Valve",
+                  "enum": ["valve"]
+                },
+                {
+                  "title": "2 Irrigation Valves",
+                  "enum": ["valve_two"]
+                },
+                {
+                  "title": "4 Irrigation Valves",
+                  "enum": ["valve_four"]
+                },
+                {
+                  "title": "1 Lock",
+                  "enum": ["lock"]
+                },
                 {
                   "title": "1 Programmable Button",
                   "enum": ["p_button"]
@@ -378,6 +476,26 @@
                 {
                   "title": "1 Sensor",
                   "enum": ["sensor"]
+                },
+                {
+                  "title": "1 Switch & 1 Valve",
+                  "enum": ["switch_valve"]
+                },
+                {
+                  "title": "1 Tap/Faucet",
+                  "enum": ["tap"]
+                },
+                {
+                  "title": "2 Taps/Faucets",
+                  "enum": ["tap_two"]
+                },
+                {
+                  "title": "1 Window",
+                  "enum": ["window"]
+                },
+                {
+                  "title": "1 Window Blind",
+                  "enum": ["blind"]
                 }
               ],
               "condition": {
@@ -406,6 +524,24 @@
                 "functionBody": "return (model.multiDevices && model.multiDevices[arrayIndices] && model.multiDevices[arrayIndices].deviceId && ['dualr3_motor'].includes(model.multiDevices[arrayIndices].deviceModel));"
               }
             },
+            "hideChannels": {
+              "type": "string",
+              "title": "Hide Channels",
+              "description": "A comma separated list of channels to hide for this device. For example '0' or '0,1,2'.",
+              "condition": {
+                "functionBody": "return (model.multiDevices && model.multiDevices[arrayIndices] && model.multiDevices[arrayIndices].deviceId && ['dual_dualr2', 'dualr3_switch', '4ch', 't'].includes(model.multiDevices[arrayIndices].deviceModel) && ['default', 'outlet'].includes(model.multiDevices[arrayIndices].showAs));"
+              }
+            },
+            "inUsePowerThreshold": {
+              "type": "integer",
+              "title": "Outlet 'In Use' Threshold",
+              "description": "HomeKit will set the 'In Use' status of outlet devices to true when the wattage is above this number. Must be 0 or more.",
+              "placeholder": 0,
+              "minimum": 0,
+              "condition": {
+                "functionBody": "return (model.multiDevices && model.multiDevices[arrayIndices] && model.multiDevices[arrayIndices].deviceId && ['outlet'].includes(model.multiDevices[arrayIndices].showAs) && ['dualr3_switch'].includes(model.multiDevices[arrayIndices].deviceModel));"
+              }
+            },
             "sensorType": {
               "type": "string",
               "title": "Sensor Type",
@@ -444,22 +580,50 @@
                 "functionBody": "return (model.multiDevices && model.multiDevices[arrayIndices] && ['sensor'].includes(model.multiDevices[arrayIndices].showAs));"
               }
             },
-            "inUsePowerThreshold": {
+            "operationTime": {
               "type": "integer",
-              "title": "Outlet 'In Use' Threshold",
-              "description": "HomeKit will set the 'In Use' status of outlet devices to true when the wattage is above this number. Must be 0 or more.",
-              "placeholder": 0,
-              "minimum": 0,
+              "title": "Operation Time (Deciseconds)",
+              "description": "Blinds/garage doors: the time to open/close the device. Locks: the time to show as unlocked. This setting is in deciseconds - count the time in seconds and multiply by 10, for example 75 for 7.5 seconds. Must be 20 or more.",
+              "placeholder": 100,
+              "minimum": 20,
               "condition": {
-                "functionBody": "return (model.multiDevices && model.multiDevices[arrayIndices] && model.multiDevices[arrayIndices].deviceId && ['outlet'].includes(model.multiDevices[arrayIndices].showAs) && ['dualr3_switch'].includes(model.multiDevices[arrayIndices].deviceModel));"
+                "functionBody": "return (model.multiDevices && model.multiDevices[arrayIndices] && ['garage', 'garage_two', 'garage_four', 'garage_eachen', 'blind', 'door', 'window', 'lock'].includes(model.multiDevices[arrayIndices].showAs));"
               }
             },
-            "hideChannels": {
+            "operationTimeDown": {
+              "type": "integer",
+              "title": "Operation Time Down (Deciseconds)",
+              "description": "If your garage door or blind has a different operation time for up and down, use this setting to specify the operation time DOWN (in deciseconds) and the other setting to specify the operation time UP. Otherwise leave blank. Must be 20 or more.",
+              "placeholder": 100,
+              "minimum": 20,
+              "condition": {
+                "functionBody": "return (model.multiDevices && model.multiDevices[arrayIndices] && ['garage', 'garage_two', 'garage_four', 'blind', 'door', 'window'].includes(model.multiDevices[arrayIndices].showAs));"
+              }
+            },
+            "sensorId": {
               "type": "string",
-              "title": "Hide Channels",
-              "description": "A comma separated list of channels to hide for this device. For example '0' or '0,1,2'.",
+              "title": "Sensor",
+              "description": "A DW2 or Zigbee contact sensor can be used for a single garage door to determine the current state. Enter the 10 digit eWeLink Device ID (normally in the format 1000ab23cd). Otherwise leave blank.",
+              "minLength": 10,
+              "maxLength": 10,
               "condition": {
-                "functionBody": "return (model.multiDevices && model.multiDevices[arrayIndices] && model.multiDevices[arrayIndices].deviceId && ['dual_dualr2', 'dualr3_switch', '4ch', 't'].includes(model.multiDevices[arrayIndices].deviceModel) && ['default', 'outlet'].includes(model.multiDevices[arrayIndices].showAs));"
+                "functionBody": "return (model.multiDevices && model.multiDevices[arrayIndices] && ['garage'].includes(model.multiDevices[arrayIndices].showAs));"
+              }
+            },
+            "hideSensor": {
+              "type": "boolean",
+              "title": "Hide Sensor",
+              "description": "Hide this contact sensor accessory from HomeKit.",
+              "condition": {
+                "functionBody": "return (model.multiDevices && model.multiDevices[arrayIndices] && model.multiDevices[arrayIndices].sensorId && model.multiDevices[arrayIndices].sensorId.length === 10);"
+              }
+            },
+            "obstructId": {
+              "type": "string",
+              "title": "Obstruction Switch",
+              "description": "An optional switch that will trigger the Obstruction Detected feature depending on its value. Otherwise leave blank.",
+              "condition": {
+                "functionBody": "return (model.multiDevices && model.multiDevices[arrayIndices] && ['garage'].includes(model.multiDevices[arrayIndices].showAs));"
               }
             },
             "ipAddress": {
@@ -1429,8 +1593,13 @@
             "singleDevices[].deviceModel",
             "singleDevices[].label",
             "singleDevices[].showAs",
-            "singleDevices[].sensorType",
             "singleDevices[].inUsePowerThreshold",
+            "singleDevices[].operationTime",
+            "singleDevices[].operationTimeDown",
+            "singleDevices[].sensorId",
+            "singleDevices[].hideSensor",
+            "singleDevices[].obstructId",
+            "singleDevices[].sensorType",
             "singleDevices[].ipAddress",
             "singleDevices[].overrideLogging"
           ]
@@ -1453,9 +1622,14 @@
             "multiDevices[].label",
             "multiDevices[].showAs",
             "multiDevices[].showAsMotor",
-            "multiDevices[].sensorType",
-            "multiDevices[].inUsePowerThreshold",
             "multiDevices[].hideChannels",
+            "multiDevices[].inUsePowerThreshold",
+            "multiDevices[].sensorType",
+            "multiDevices[].operationTime",
+            "multiDevices[].operationTimeDown",
+            "multiDevices[].sensorId",
+            "multiDevices[].hideSensor",
+            "multiDevices[].obstructId",
             "multiDevices[].ipAddress",
             "multiDevices[].overrideLogging"
           ]
diff --git a/lib/index.js b/lib/index.js
index da74e1b2..6ba24885 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -146,7 +146,7 @@ class eWeLinkPlatform {
                     break
                   case 'overrideLogging':
                   case 'type': {
-                    const index = k === 'type' ? 'sensors' : k
+                    const index = k === 'type' ? 'sensorType' : k
                     const inSet = this.consts.allowed[index].includes(v)
                     if (typeof v !== 'string' || !inSet) {
                       logIgnore(key + '.' + id + '.' + k)
@@ -232,6 +232,8 @@ class eWeLinkPlatform {
                   case 'lowBattThreshold':
                   case 'minTarget':
                   case 'maxTarget':
+                  case 'operationTime':
+                  case 'operationTimeDown':
                   case 'sensorTimeDifference': {
                     if (typeof v === 'string') {
                       logQuotes(key + '.' + id + '.' + k)
@@ -248,7 +250,19 @@ class eWeLinkPlatform {
                     }
                     break
                   }
+                  case 'obstructId':
+                    if (typeof v !== 'string' || v === '') {
+                      logIgnore(key + '.' + id + '.' + k)
+                    } else if (!this.consts.allowed.obstructs.includes(x.type)) {
+                      logIgnore(key + '.' + id + '.' + k)
+                    } else {
+                      const parsed = this.funcs.parseDeviceId(v)
+                      this.deviceConf[id][k] = parsed
+                      this.obstructSwitches[parsed] = id
+                    }
+                    break
                   case 'overrideLogging':
+                  case 'sensorType':
                   case 'showAs':
                   case 'showAsMotor': {
                     const inSet = this.consts.allowed[k].includes(v)
@@ -277,6 +291,7 @@ class eWeLinkPlatform {
                   }
                   case 'hideLight':
                   case 'hideLongDouble':
+                  case 'hideSensor':
                   case 'hideSwitch':
                   case 'resetOnStartup':
                   case 'scaleBattery':
@@ -318,6 +333,14 @@ class eWeLinkPlatform {
                     }
                     break
                   }
+                  case 'sensorId':
+                    if (typeof v !== 'string' || v === '') {
+                      logIgnore(key + '.' + id + '.' + k)
+                    } else {
+                      const parsed = this.funcs.parseDeviceId(v)
+                      this.deviceConf[id].sensorId = parsed
+                    }
+                    break
                 }
               }
             })
@@ -410,8 +433,7 @@ class eWeLinkPlatform {
                   case 'sensorType':
                   case 'type': {
                     const k1 = k === 'type' ? 'showAs' : k
-                    const index = k1 === 'sensorType' ? 'sensors' : k1
-                    const inSet = this.consts.allowed[index].includes(v)
+                    const inSet = this.consts.allowed[k1].includes(v)
                     if (typeof v !== 'string' || !inSet) {
                       logIgnore(key + '.' + id + '.' + k1)
                     } else {
@@ -717,14 +739,14 @@ class eWeLinkPlatform {
       let accessory
       const uiid = device.extra && device.extra.uiid ? device.extra.uiid : 0
       const uuid = this.api.hap.uuid.generate(device.deviceid + 'SWX')
-      const deviceConf = this.deviceConf[device.deviceid] || {}
-      if (!this.funcs.hasProperty(deviceConf, 'showAs')) {
-        deviceConf.showAs = 'default'
-      }
+      device.showAs =
+        this.deviceConf[device.deviceid] && this.deviceConf[device.deviceid].showAs
+          ? this.deviceConf[device.deviceid].showAs
+          : 'default'
 
       // Remove old sub accessories for Accessory Simulations and DUALR3 in motor/meter mode
       if (
-        deviceConf.showAs !== 'default' ||
+        device.showAs !== 'default' ||
         (uiid === 126 && [2, 3].includes(device.params.workMode))
       ) {
         for (let i = 0; i <= 4; i++) {
@@ -769,21 +791,21 @@ class eWeLinkPlatform {
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/curtain'))(this, accessory)
         /***************************/
-      } else if (deviceConf.showAs === 'blind') {
+      } else if (device.showAs === 'blind') {
         /****************************
         BLINDS [ACCESSORY SIMULATION]
         ****************************/
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/simulation/blind'))(this, accessory)
         /***************************/
-      } else if (deviceConf.showAs === 'door') {
+      } else if (device.showAs === 'door') {
         /***************************
         DOORS [ACCESSORY SIMULATION]
         ***************************/
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/simulation/door'))(this, accessory)
         /**************************/
-      } else if (deviceConf.showAs === 'window') {
+      } else if (device.showAs === 'window') {
         /*****************************
         WINDOWS [ACCESSORY SIMULATION]
         *****************************/
@@ -820,7 +842,7 @@ class eWeLinkPlatform {
         }
         accessory.control = new (require(instance))(this, accessory, devicesInHB)
         /******************************************/
-      } else if (deviceConf.showAs === 'garage') {
+      } else if (device.showAs === 'garage') {
         /****************************************
         GARAGE DOORS [ONE] [ACCESSORY SIMULATION]
         ****************************************/
@@ -828,98 +850,98 @@ class eWeLinkPlatform {
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require(instance))(this, accessory, devicesInHB)
         /***************************************/
-      } else if (deviceConf.showAs === 'garage_two') {
+      } else if (device.showAs === 'garage_two') {
         /****************************************
         GARAGE DOORS [TWO] [ACCESSORY SIMULATION]
         ****************************************/
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/simulation/garage-two'))(this, accessory)
         /***************************************/
-      } else if (deviceConf.showAs === 'garage_four') {
+      } else if (device.showAs === 'garage_four') {
         /*****************************************
         GARAGE DOORS [FOUR] [ACCESSORY SIMULATION]
         *****************************************/
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/simulation/garage-four'))(this, accessory)
         /****************************************/
-      } else if (deviceConf.showAs === 'garage_eachen') {
+      } else if (device.showAs === 'garage_eachen') {
         /***************************
         GARAGE DOORS [EACHEN GD-DC5]
         ***************************/
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/simulation/garage-eachen'))(this, accessory)
         /**************************/
-      } else if (deviceConf.showAs === 'lock') {
+      } else if (device.showAs === 'lock') {
         /***************************
         LOCKS [ACCESSORY SIMULATION]
         ***************************/
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/simulation/lock-one'))(this, accessory)
         /**************************/
-      } else if (deviceConf.showAs === 'switch_valve') {
+      } else if (device.showAs === 'switch_valve') {
         /**********************************
         SWITCH-VALVE [ACCESSORY SIMULATION]
         **********************************/
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/simulation/switch-valve'))(this, accessory)
         /*********************************/
-      } else if (deviceConf.showAs === 'tap') {
+      } else if (device.showAs === 'tap') {
         /********************************
         TAPS [ONE] [ACCESSORY SIMULATION]
         ********************************/
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/simulation/tap-one'))(this, accessory)
         /*******************************/
-      } else if (deviceConf.showAs === 'tap_two') {
+      } else if (device.showAs === 'tap_two') {
         /********************************
         TAPS [TWO] [ACCESSORY SIMULATION]
         ********************************/
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/simulation/tap-two'))(this, accessory)
         /*******************************/
-      } else if (deviceConf.showAs === 'valve') {
+      } else if (device.showAs === 'valve') {
         /**********************************
         VALVES [ONE] [ACCESSORY SIMULATION]
         **********************************/
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/simulation/valve-one'))(this, accessory)
         /*********************************/
-      } else if (deviceConf.showAs === 'valve_two') {
+      } else if (device.showAs === 'valve_two') {
         /**********************************
         VALVES [TWO] [ACCESSORY SIMULATION]
         **********************************/
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/simulation/valve-two'))(this, accessory)
         /*********************************/
-      } else if (deviceConf.showAs === 'valve_four') {
+      } else if (device.showAs === 'valve_four') {
         /***********************************
         VALVES [FOUR] [ACCESSORY SIMULATION]
         ***********************************/
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/simulation/valve-four'))(this, accessory)
         /**********************************/
-      } else if (deviceConf.showAs === 'sensor') {
+      } else if (device.showAs === 'sensor') {
         /*******************
         SENSORS [SIMULATION]
         *******************/
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/simulation/sensor'))(this, accessory)
         /******************/
-      } else if (deviceConf.showAs === 'p_button') {
+      } else if (device.showAs === 'p_button') {
         /*******************************
         PROGRAMMABLE BUTTON [SIMULATION]
         *******************************/
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/simulation/p-button'))(this, accessory)
         /******************************/
-      } else if (deviceConf.showAs === 'doorbell') {
+      } else if (device.showAs === 'doorbell') {
         /********************
         DOORBELL [SIMULATION]
         ********************/
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/simulation/doorbell'))(this, accessory)
         /*******************/
-      } else if (deviceConf.showAs === 'purifier') {
+      } else if (device.showAs === 'purifier') {
         /*********************
         PURIFIERS [SIMULATION]
         *********************/
@@ -927,7 +949,7 @@ class eWeLinkPlatform {
         accessory.control = new (require('./device/simulation/purifier'))(this, accessory)
         /********************/
       } else if (
-        deviceConf.type === 'sensor_leak' &&
+        device.showAs === 'sensor_leak' &&
         this.consts.devices.sensorContact.includes(uiid)
       ) {
         /**************************************
@@ -970,10 +992,7 @@ class eWeLinkPlatform {
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/thermostat'))(this, accessory)
         /*******/
-      } else if (
-        deviceConf.showAs === 'heater' &&
-        this.consts.devices.sensorAmbient.includes(uiid)
-      ) {
+      } else if (device.showAs === 'heater' && this.consts.devices.sensorAmbient.includes(uiid)) {
         /*************************************
         HEATERS [TH10/16 ACCESSORY SIMULATION]
         *************************************/
@@ -981,10 +1000,7 @@ class eWeLinkPlatform {
         accessory.context.sensorType = device.params.sensorType
         accessory.control = new (require('./device/simulation/heater'))(this, accessory)
         /************************************/
-      } else if (
-        deviceConf.showAs === 'cooler' &&
-        this.consts.devices.sensorAmbient.includes(uiid)
-      ) {
+      } else if (device.showAs === 'cooler' && this.consts.devices.sensorAmbient.includes(uiid)) {
         /*************************************
         COOLERS [TH10/16 ACCESSORY SIMULATION]
         *************************************/
@@ -993,7 +1009,7 @@ class eWeLinkPlatform {
         accessory.control = new (require('./device/simulation/cooler'))(this, accessory)
         /************************************/
       } else if (
-        deviceConf.showAs === 'humidifier' &&
+        device.showAs === 'humidifier' &&
         this.consts.devices.sensorAmbient.includes(uiid)
       ) {
         /*****************************************
@@ -1011,7 +1027,7 @@ class eWeLinkPlatform {
         accessory.control = new (require('./device/simulation/humidifier'))(this, accessory)
         /*****************************************/
       } else if (
-        deviceConf.showAs === 'dehumidifier' &&
+        device.showAs === 'dehumidifier' &&
         this.consts.devices.sensorAmbient.includes(uiid)
       ) {
         /*******************************************
@@ -1080,7 +1096,7 @@ class eWeLinkPlatform {
         ********************************/
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control =
-          deviceConf.showAs === 'outlet'
+          device.showAs === 'outlet'
             ? new (require('./device/outlet-single'))(this, accessory)
             : new (require('./device/switch-single'))(this, accessory)
         /*******************************/
@@ -1138,7 +1154,7 @@ class eWeLinkPlatform {
               : false
           subAccessory.context.lanKey = device.devicekey
           subAccessory.control =
-            deviceConf.showAs === 'outlet'
+            device.showAs === 'outlet'
               ? new (require('./device/outlet-multi'))(this, subAccessory, devicesInHB)
               : new (require('./device/switch-multi'))(this, subAccessory, devicesInHB)
 
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index a3fee6b0..1635e585 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -84,6 +84,12 @@ module.exports = {
       'label',
       'showAs',
       'inUsePowerThreshold',
+      'operationTime',
+      'operationTimeDown',
+      'sensorId',
+      'hideSensor',
+      'obstructId',
+      'sensorType',
       'ipAddress',
       'overrideLogging'
     ],
@@ -93,8 +99,14 @@ module.exports = {
       'label',
       'showAs',
       'showAsMotor',
-      'inUsePowerThreshold',
       'hideChannels',
+      'inUsePowerThreshold',
+      'sensorType',
+      'operationTime',
+      'operationTimeDown',
+      'sensorId',
+      'hideSensor',
+      'obstructId',
       'ipAddress',
       'overrideLogging'
     ],
@@ -137,7 +149,7 @@ module.exports = {
     rfDevices: ['deviceId', 'label', 'resetOnStartup', 'ipAddress', 'overrideLogging'],
     overrideLogging: ['default', 'standard', 'debug', 'disable'],
     obstructs: ['garage', 'garage_eachen'],
-    sensors: [
+    sensorType: [
       'water',
       'smoke',
       'co',

From c6409c10d0b080e1ad5699bbcf53f685d8979e8b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 6 Jul 2021 08:49:30 +0100
Subject: [PATCH 2477/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1464650b..7df50f69 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -87,6 +87,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 - An issue preventing controlling a garage door simulation when using a sensor
 - An issue with the DUALR3 in motor mode hanging on 'Closing...' or 'Opening...'
 - Fixed the multiple notifications when closing an eachen device garage door
+- A `RangeError` error which caused HOOBS bridge to restart
 
 ### Removed
 

From f0f7f72bf8b0528c72a64b1a77daec6295304c1d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 6 Jul 2021 09:05:47 +0100
Subject: [PATCH 2478/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 39 +++++++++++++++++++++------------------
 1 file changed, 21 insertions(+), 18 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7df50f69..00556156 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,8 +7,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 ### Added
 
 - **LAN Mode (without eWeLink credentials)**
-  - The plugin now supports removing eWeLink credentials from the config when in LAN mode
-  - It is important to read about this feature before enabling it - [read more](https://github.com/bwp91/homebridge-ewelink/wiki/Connection-Methods#lan-mode-without-ewelink-credentials)
+  - The plugin now supports removing eWeLink credentials from the config when in LAN mode It is important to read about this feature before enabling it - [read more](https://github.com/bwp91/homebridge-ewelink/wiki/Connection-Methods#lan-mode-without-ewelink-credentials)
 - **Accessory Logging**
   - `overrideLogging` setting per device type (to replace the removed `overrideDisabledLogging`), which can be set to (and will override the global device logging and debug logging settings):
     - `"default"` to follow the global device update and debug logging setting for this accessory (default if setting not set)
@@ -21,20 +20,17 @@ All notable changes to this homebridge-ewelink will be documented in this file.
   - An accessory warning if a cloud-device is reported offline
 - **No Response Status**
   - Added a global setting `offlineAsNoResponse` to mark cloud-offline accessories as 'No Response' in HomeKit
-- **Single-Channel Devices**
-  - Wattage/Voltage/Amp readings (via Eve app) now visible for outlets in Eve app when exposed as `Switch`
+- **Power Readings**
+  - Power readings (via Eve app) now visible for accessories when exposed as `Switch`
   - Polling via LAN mode to enable constant power attribute updates for POW/R2 devices
-- **Multi-Channel Devices**
-  - Wattage/Voltage/Amp readings (via Eve app) now visible for DUALR3 when in motor mode
+- **DUALR3 Devices**
   - Support for LAN mode control for DUALR3 in motor mode
-  - Option to expose a DUALR3 in motor mode as a `WindowCovering`, `Window` or `Door` accessory type
+  - Power readings (via Eve app) available when in motor mode
+  - Option to expose as a `WindowCovering`, `Window` or `Door` accessory type when in motor mode
 - **iFan Devices**
-  - Support for LAN mode control
-  - Added option to specify a manual IP
+  - Support for LAN mode and ability to specify a manual IP
 - **TH10/16 Devices**
-  - Implemented polling as firmware 3.5.0 does not seem to send regular temperature updates
-  - Implemented LAN mode for Accessory Simulations (eWeLink 'auto' mode is no longer used)
-  - Added option to specify a manual IP
+  - Support for LAN mode and ability to specify a manual IP
 - **RF Bridge Devices**
   - Ability to change sensor type and other configurable options without the need to re-add the accessory
   - Configuration option `resetOnStartup` to reset the subdevices, useful when adding/removing subdevices to the bridge
@@ -53,9 +49,8 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 - **Accessory Simulations**
   - Expose a generic single/multi-channel device as a `Doorbell` accessory
   - Expose a generic single/multi-channel device as a `StatelessProgrammableSwitch` accessory
-  - Added `TimesOpened` Eve characteristic functionality to single garage door simulation
   - Added the option of using a DW2 or Zigbee contact sensor to determine _Locked_ and _Unlocked_ state for lock simulation
-  - Wattage/Voltage/Amp readings (via Eve app) visible for simulations when using a DUALR3 device
+  - Power readings (via Eve app) visible for simulations when using a DUALR3 device
 - **New Devices**
   - Support for Zigbee leak sensors
   - Support for device with eWeLink UIID 67 _RollingDoor_
@@ -64,6 +59,14 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 - **LAN Mode**
   - ⚠️ If you have the plugin in `lan`-only mode then the plugin will remove any accessories that do not support LAN mode
+- **Configuration**
+  - ⚠️ The 'Outlet Devices' (`outletDevices[]`) section has been removed from the configuration - you will need to reconfigured these devices within the 'Single Devices' (`singleDevices[]`) section
+- **Accessory Simulations**
+  - ⚠️ The 'Accessory Simulations' (`groups[]`) section will be removed in a future plugin version - you should now setup your simulations from within the appropriate device type section using the 'Show As' setting
+    - Simulations for TH10/16, DW2 and `doorbell`, `p_button` & `sensor` will need to be recreated immediately
+    - Garage door, window blind, door, window, valve, tap, lock and switch-valve simulations will continue to work for now but will need to be recreated at some point in the future
+- **Outlet Devices**
+  - ⚠️ Will now be exposed by default as `Switch`, use the 'Show As' setting to change back to `Outlet` if needed
 - **Homebridge UI**
   - More interactive - device configuration will expand once device ID and model entered
   - Device configuration options will now hide/show based on the `deviceModel` field
@@ -71,11 +74,9 @@ All notable changes to this homebridge-ewelink will be documented in this file.
   - Accessory configuration options will be logged regardless of logging level
 - **iFan Devices**
   - Previous fan speed will be used again after turning off and on
-- **POWR2/DUALR3 Devices**
+- **Polling**
   - Polling for power/temperature/humidity readings increased to two minutes
-  - Polling for data will be skipped if device is marked as offline
-- **TH10/16 Devices**
-  - Polling for data will be skipped if device is marked as offline
+  - Polling for power/temperature/humidity readings will be skipped if device is marked as offline
 - **Configuration**
   - `sensorTimeDifference` minimum reduced to 5 seconds and default reduced to 60 seconds
 - **Dependencies**
@@ -92,6 +93,8 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 ### Removed
 
 - `overrideDisabledLogging` setting for each accessory type
+- `outletDevices[]` configuration section
+- `switchDevices[].showAsOutlet` removed - use `switchDevices[].showAs` instead
 - `ContactSensorState` and other unneeded characteristics from garage (simulation) services
 
 ## 6.8.0 (2021-06-14)

From 8c765caacee4265637953ac4d8fdea2919d0882a Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 6 Jul 2021 09:06:23 +0100
Subject: [PATCH 2479/3183] 7.0.0-beta.11

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 7dd81aa2..9238b318 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "7.0.0-beta.10",
+  "version": "7.0.0-beta.11",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 096a72cc..7ae1fe6d 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "7.0.0-beta.10",
+  "version": "7.0.0-beta.11",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From b20f01d232e4f569dc70a75e0009008fdfbd2108 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 6 Jul 2021 09:18:55 +0100
Subject: [PATCH 2480/3183] shorted label desc

---
 config.schema.json | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 2ed6889d..0035de57 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -174,7 +174,7 @@
             "label": {
               "title": "Label",
               "type": "string",
-              "description": "This setting has no effect except to be a helpful label for identifying which device this is when editing the configuration.",
+              "description": "This setting has no effect except to help identify this device.",
               "condition": {
                 "functionBody": "return (model.singleDevices && model.singleDevices[arrayIndices] && model.singleDevices[arrayIndices].deviceId && model.singleDevices[arrayIndices].deviceId.length === 10);"
               }
@@ -411,7 +411,7 @@
             "label": {
               "title": "Label",
               "type": "string",
-              "description": "This setting has no effect except to be a helpful label for identifying which device this is when editing the configuration.",
+              "description": "This setting has no effect except to help identify this device.",
               "condition": {
                 "functionBody": "return (model.multiDevices && model.multiDevices[arrayIndices] && model.multiDevices[arrayIndices].deviceId && model.multiDevices[arrayIndices].deviceId.length === 10);"
               }
@@ -730,7 +730,7 @@
             "label": {
               "title": "Label",
               "type": "string",
-              "description": "This setting has no effect except to be a helpful label for identifying which device this is when editing the configuration.",
+              "description": "This setting has no effect except to help identify this device.",
               "condition": {
                 "functionBody": "return (model.lightDevices && model.lightDevices[arrayIndices] && model.lightDevices[arrayIndices].deviceId && model.lightDevices[arrayIndices].deviceId.length === 10);"
               }
@@ -831,7 +831,7 @@
             "label": {
               "title": "Label",
               "type": "string",
-              "description": "This setting has no effect except to be a helpful label for identifying which device this is when editing the configuration.",
+              "description": "This setting has no effect except to help identify this device.",
               "condition": {
                 "functionBody": "return (model.thDevices && model.thDevices[arrayIndices] && model.thDevices[arrayIndices].deviceId && model.thDevices[arrayIndices].deviceId.length === 10);"
               }
@@ -980,7 +980,7 @@
             "label": {
               "title": "Label",
               "type": "string",
-              "description": "This setting has no effect except to be a helpful label for identifying which device this is when editing the configuration.",
+              "description": "This setting has no effect except to help identify this device.",
               "condition": {
                 "functionBody": "return (model.fanDevices && model.fanDevices[arrayIndices] && model.fanDevices[arrayIndices].deviceId && model.fanDevices[arrayIndices].deviceId.length === 10);"
               }
@@ -1081,7 +1081,7 @@
             "label": {
               "title": "Label",
               "type": "string",
-              "description": "This setting has no effect except to be a helpful label for identifying which device this is when editing the configuration.",
+              "description": "This setting has no effect except to help identify this device.",
               "condition": {
                 "functionBody": "return (model.sensorDevices && model.sensorDevices[arrayIndices] && model.sensorDevices[arrayIndices].deviceId && model.sensorDevices[arrayIndices].deviceId.length === 10);"
               }
@@ -1204,7 +1204,7 @@
             "label": {
               "title": "Label",
               "type": "string",
-              "description": "This setting has no effect except to be a helpful label for identifying which device this is when editing the configuration.",
+              "description": "This setting has no effect except to help identify this device.",
               "condition": {
                 "functionBody": "return (model.rfDevices && model.rfDevices[arrayIndices] && model.rfDevices[arrayIndices].deviceId && model.rfDevices[arrayIndices].deviceId.length === 10);"
               }
@@ -1271,7 +1271,7 @@
             "label": {
               "title": "Label",
               "type": "string",
-              "description": "This setting has no effect except to be a helpful label for identifying which device this is when editing the configuration.",
+              "description": "This setting has no effect except to help identify this device.",
               "condition": {
                 "functionBody": "return (model.bridgeSensors && model.bridgeSensors[arrayIndices] && model.bridgeSensors[arrayIndices].fullDeviceId && model.bridgeSensors[arrayIndices].fullDeviceId.length >= 13);"
               }
@@ -1388,7 +1388,7 @@
             "label": {
               "title": "Label",
               "type": "string",
-              "description": "This setting has no effect except to be a helpful label for identifying which device this is when editing the configuration.",
+              "description": "This setting has no effect except to help identify this device.",
               "condition": {
                 "functionBody": "return (model.groups && model.groups[arrayIndices] && model.groups[arrayIndices].deviceId && model.groups[arrayIndices].deviceId.length === 10);"
               }

From 2d951abd5add1658506b0d0d1d8ab48dccd0d8b1 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 6 Jul 2021 09:30:31 +0100
Subject: [PATCH 2481/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 00556156..bda5f6a1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,9 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 - **LAN Mode (without eWeLink credentials)**
   - The plugin now supports removing eWeLink credentials from the config when in LAN mode It is important to read about this feature before enabling it - [read more](https://github.com/bwp91/homebridge-ewelink/wiki/Connection-Methods#lan-mode-without-ewelink-credentials)
+- **Homebridge UI**
+  - Device-specific settings will show and hide depending on the new 'Device Model' (`deviceModel`) option
+  - This showing/hiding of options will hopefully be available in the HOOBS UI soon
 - **Accessory Logging**
   - `overrideLogging` setting per device type (to replace the removed `overrideDisabledLogging`), which can be set to (and will override the global device logging and debug logging settings):
     - `"default"` to follow the global device update and debug logging setting for this accessory (default if setting not set)

From 27eddb37f7110d03d0701fe9987c06385d53dff7 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 6 Jul 2021 09:31:42 +0100
Subject: [PATCH 2482/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bda5f6a1..8f2fd750 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -33,7 +33,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 - **iFan Devices**
   - Support for LAN mode and ability to specify a manual IP
 - **TH10/16 Devices**
-  - Support for LAN mode and ability to specify a manual IP
+  - Support for LAN mode for all Accessory Simulations and ability to specify a manual IP
 - **RF Bridge Devices**
   - Ability to change sensor type and other configurable options without the need to re-add the accessory
   - Configuration option `resetOnStartup` to reset the subdevices, useful when adding/removing subdevices to the bridge

From 48c11ae954461c27aaf80a0722ee908e51bf37f0 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 6 Jul 2021 09:35:46 +0100
Subject: [PATCH 2483/3183] warn for accessory simulations in old place

---
 lib/index.js | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/lib/index.js b/lib/index.js
index 6ba24885..c85e6b3f 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -350,12 +350,6 @@ class eWeLinkPlatform {
           break
         case 'groups':
           if (Array.isArray(val) && val.length > 0) {
-            this.log.warn(
-              'The groups[] (Accessory Simulations) config option will be deprecated soon.'
-            )
-            this.log.warn(
-              'Please use the device-specific sections of the config to update your simulations.'
-            )
             val.forEach(x => {
               if (!x.type || !x.deviceId) {
                 logIgnoreItem(key)
@@ -370,6 +364,11 @@ class eWeLinkPlatform {
               if (!this.funcs.hasProperty(this.deviceConf, id)) {
                 this.deviceConf[id] = {}
               }
+              this.log.warn(
+                '[%s - %s] Please recreate this simulation in the Single/Multi Channel Devices section of the configuration and remove this entry from the Accessory Simulations section.',
+                id,
+                x.type
+              )
               for (const [k, v] of entries) {
                 switch (k) {
                   case 'deviceId':

From b2cbb1310146504e3061ac361be1d8a842870f7d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 6 Jul 2021 09:48:58 +0100
Subject: [PATCH 2484/3183] state showAs in logs

---
 lib/device/simulation/blind.js         | 2 +-
 lib/device/simulation/door.js          | 2 +-
 lib/device/simulation/doorbell.js      | 2 +-
 lib/device/simulation/garage-eachen.js | 2 +-
 lib/device/simulation/garage-four.js   | 2 +-
 lib/device/simulation/garage-one.js    | 2 +-
 lib/device/simulation/garage-two.js    | 2 +-
 lib/device/simulation/lock-one.js      | 2 +-
 lib/device/simulation/p-button.js      | 3 +--
 lib/device/simulation/sensor.js        | 3 ++-
 lib/device/simulation/switch-valve.js  | 2 +-
 lib/device/simulation/tap-one.js       | 2 +-
 lib/device/simulation/tap-two.js       | 2 +-
 lib/device/simulation/valve-four.js    | 2 +-
 lib/device/simulation/valve-one.js     | 2 +-
 lib/device/simulation/valve-two.js     | 2 +-
 lib/device/simulation/window.js        | 2 +-
 17 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/lib/device/simulation/blind.js b/lib/device/simulation/blind.js
index 14113324..f39d52ea 100644
--- a/lib/device/simulation/blind.js
+++ b/lib/device/simulation/blind.js
@@ -116,7 +116,7 @@ module.exports = class deviceBlind {
       logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
       operationTimeDown: this.operationTimeDown,
       operationTimeUp: this.operationTimeUp,
-      showAs: deviceConf.showAs
+      showAs: 'blind'
     })
     this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
diff --git a/lib/device/simulation/door.js b/lib/device/simulation/door.js
index 60c2e356..15946260 100644
--- a/lib/device/simulation/door.js
+++ b/lib/device/simulation/door.js
@@ -116,7 +116,7 @@ module.exports = class deviceDoor {
       logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
       operationTimeDown: this.operationTimeDown,
       operationTimeUp: this.operationTimeUp,
-      showAs: deviceConf.showAs
+      showAs: 'door'
     })
     this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
diff --git a/lib/device/simulation/doorbell.js b/lib/device/simulation/doorbell.js
index 35a5e8b3..558e77cd 100644
--- a/lib/device/simulation/doorbell.js
+++ b/lib/device/simulation/doorbell.js
@@ -100,7 +100,7 @@ module.exports = class deviceDoorbell {
     // Output the customised options to the log
     const opts = JSON.stringify({
       logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
-      showAs: deviceConf.showAs
+      showAs: 'doorbell'
     })
     this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
diff --git a/lib/device/simulation/garage-eachen.js b/lib/device/simulation/garage-eachen.js
index 89968b69..4d438c8e 100644
--- a/lib/device/simulation/garage-eachen.js
+++ b/lib/device/simulation/garage-eachen.js
@@ -118,7 +118,7 @@ module.exports = class deviceGarageEachen {
     const opts = JSON.stringify({
       logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
       operationTime: this.operationTime,
-      showAs: deviceConf.showAs
+      showAs: 'garage_eachen'
     })
     this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
diff --git a/lib/device/simulation/garage-four.js b/lib/device/simulation/garage-four.js
index e6d18b42..6b84dc9a 100644
--- a/lib/device/simulation/garage-four.js
+++ b/lib/device/simulation/garage-four.js
@@ -98,7 +98,7 @@ module.exports = class deviceGarageFour {
       logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
       operationTimeDown: this.operationTimeDown,
       operationTimeUp: this.operationTimeUp,
-      showAs: deviceConf.showAs
+      showAs: 'garage_four'
     })
     this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
diff --git a/lib/device/simulation/garage-one.js b/lib/device/simulation/garage-one.js
index edffe88c..2a35dd87 100644
--- a/lib/device/simulation/garage-one.js
+++ b/lib/device/simulation/garage-one.js
@@ -178,7 +178,7 @@ module.exports = class deviceGarageOne {
       logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
       operationTimeDown: this.operationTimeDown,
       operationTimeUp: this.operationTimeUp,
-      showAs: deviceConf.showAs
+      showAs: 'garage'
     })
     this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
diff --git a/lib/device/simulation/garage-two.js b/lib/device/simulation/garage-two.js
index 6f1d4a97..cb604082 100644
--- a/lib/device/simulation/garage-two.js
+++ b/lib/device/simulation/garage-two.js
@@ -128,7 +128,7 @@ module.exports = class deviceGarageTwo {
       logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
       operationTimeDown: this.operationTimeDown,
       operationTimeUp: this.operationTimeUp,
-      showAs: deviceConf.showAs
+      showAs: 'garage_two'
     })
     this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
diff --git a/lib/device/simulation/lock-one.js b/lib/device/simulation/lock-one.js
index f527774a..947ba099 100644
--- a/lib/device/simulation/lock-one.js
+++ b/lib/device/simulation/lock-one.js
@@ -146,7 +146,7 @@ module.exports = class deviceLockOne {
     const opts = JSON.stringify({
       logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
       operationTime: this.operationTime,
-      showAs: deviceConf.showAs
+      showAs: 'lock'
     })
     this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
diff --git a/lib/device/simulation/p-button.js b/lib/device/simulation/p-button.js
index a251ccfb..b162c8aa 100644
--- a/lib/device/simulation/p-button.js
+++ b/lib/device/simulation/p-button.js
@@ -127,8 +127,7 @@ module.exports = class devicePButton {
     // Output the customised options to the log
     const opts = JSON.stringify({
       logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
-      operationTime: this.operationTime,
-      showAs: deviceConf.showAs
+      showAs: 'p_button'
     })
     this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
diff --git a/lib/device/simulation/sensor.js b/lib/device/simulation/sensor.js
index f88e361a..4e244761 100644
--- a/lib/device/simulation/sensor.js
+++ b/lib/device/simulation/sensor.js
@@ -181,7 +181,8 @@ module.exports = class deviceSensor {
     // Output the customised options to the log
     const opts = JSON.stringify({
       logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
-      sensorType: this.sensorType
+      sensorType: this.sensorType,
+      showAs: 'sensor'
     })
     this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
diff --git a/lib/device/simulation/switch-valve.js b/lib/device/simulation/switch-valve.js
index b09291e9..512171a5 100644
--- a/lib/device/simulation/switch-valve.js
+++ b/lib/device/simulation/switch-valve.js
@@ -148,7 +148,7 @@ module.exports = class deviceSwitchValve {
     // Output the customised options to the log
     const opts = JSON.stringify({
       logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
-      showAs: deviceConf.showAs
+      showAs: 'switch_valve'
     })
     this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
diff --git a/lib/device/simulation/tap-one.js b/lib/device/simulation/tap-one.js
index 2a8c20ad..f8d8bc03 100644
--- a/lib/device/simulation/tap-one.js
+++ b/lib/device/simulation/tap-one.js
@@ -130,7 +130,7 @@ module.exports = class deviceTapOne {
     // Output the customised options to the log
     const opts = JSON.stringify({
       logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
-      showAs: deviceConf.showAs
+      showAs: 'tap'
     })
     this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
diff --git a/lib/device/simulation/tap-two.js b/lib/device/simulation/tap-two.js
index 4e993b27..243456e3 100644
--- a/lib/device/simulation/tap-two.js
+++ b/lib/device/simulation/tap-two.js
@@ -105,7 +105,7 @@ module.exports = class deviceTapTwo {
     // Output the customised options to the log
     const opts = JSON.stringify({
       logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
-      showAs: deviceConf.showAs
+      showAs: 'tap_two'
     })
     this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
diff --git a/lib/device/simulation/valve-four.js b/lib/device/simulation/valve-four.js
index c4bfe79d..42bb078e 100644
--- a/lib/device/simulation/valve-four.js
+++ b/lib/device/simulation/valve-four.js
@@ -96,7 +96,7 @@ module.exports = class deviceValveFour {
     // Output the customised options to the log
     const opts = JSON.stringify({
       logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
-      showAs: deviceConf.showAs
+      showAs: 'valve_four'
     })
     this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
diff --git a/lib/device/simulation/valve-one.js b/lib/device/simulation/valve-one.js
index eb822c00..c4615831 100644
--- a/lib/device/simulation/valve-one.js
+++ b/lib/device/simulation/valve-one.js
@@ -150,7 +150,7 @@ module.exports = class deviceValveOne {
     // Output the customised options to the log
     const opts = JSON.stringify({
       logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
-      showAs: deviceConf.showAs
+      showAs: 'valve'
     })
     this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
diff --git a/lib/device/simulation/valve-two.js b/lib/device/simulation/valve-two.js
index 1e427a69..19b79f73 100644
--- a/lib/device/simulation/valve-two.js
+++ b/lib/device/simulation/valve-two.js
@@ -125,7 +125,7 @@ module.exports = class deviceValveTwo {
     // Output the customised options to the log
     const opts = JSON.stringify({
       logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
-      showAs: deviceConf.showAs
+      showAs: 'valve_two'
     })
     this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
diff --git a/lib/device/simulation/window.js b/lib/device/simulation/window.js
index 0297d191..e5304800 100644
--- a/lib/device/simulation/window.js
+++ b/lib/device/simulation/window.js
@@ -116,7 +116,7 @@ module.exports = class deviceWindow {
       logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
       operationTimeDown: this.operationTimeDown,
       operationTimeUp: this.operationTimeUp,
-      showAs: deviceConf.showAs
+      showAs: 'window'
     })
     this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }

From f3ad7b3010b5b1ede74d50890071fd923a505ed9 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 6 Jul 2021 09:59:02 +0100
Subject: [PATCH 2485/3183] show inUsePowerThreshold in startup log

---
 lib/device/outlet-multi.js  |  4 ++++
 lib/device/outlet-single.js | 10 ++++------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/lib/device/outlet-multi.js b/lib/device/outlet-multi.js
index 6b9b6cc2..223c929a 100644
--- a/lib/device/outlet-multi.js
+++ b/lib/device/outlet-multi.js
@@ -31,6 +31,10 @@ module.exports = class deviceOutletMulti {
     // Set up custom variables for this device type
     const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
     this.hideChannels = deviceConf && deviceConf.hideChannels ? deviceConf.hideChannels : undefined
+    this.inUsePowerThreshold =
+    deviceConf && deviceConf.inUsePowerThreshold
+      ? deviceConf.inUsePowerThreshold
+      : platform.consts.defaultValues.inUsePowerThreshold
 
     // Set the correct logging variables for this accessory
     this.enableLogging = !platform.config.disableDeviceLogging
diff --git a/lib/device/outlet-single.js b/lib/device/outlet-single.js
index 2a0f9732..ec63e3eb 100644
--- a/lib/device/outlet-single.js
+++ b/lib/device/outlet-single.js
@@ -30,6 +30,10 @@ module.exports = class deviceOutletSingle {
 
     // Set up custom variables for this device type
     const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
+    this.inUsePowerThreshold =
+      deviceConf && deviceConf.inUsePowerThreshold
+        ? deviceConf.inUsePowerThreshold
+        : platform.consts.defaultValues.inUsePowerThreshold
 
     // Set the correct logging variables for this accessory
     this.enableLogging = !platform.config.disableDeviceLogging
@@ -169,12 +173,6 @@ module.exports = class deviceOutletSingle {
 
     // Set up extra features for outlets that provide power readings
     if (this.powerReadings) {
-      // Get the in-use threshold from the device config
-      this.inUsePowerThreshold =
-        deviceConf && deviceConf.inUsePowerThreshold
-          ? deviceConf.inUsePowerThreshold
-          : platform.consts.defaultValues.inUsePowerThreshold
-
       // TotalConsumption is calculated by the plugin with these context readings
       if (!this.funcs.hasProperty(this.accessory.context, 'energyReadings')) {
         this.accessory.context.energyReadings = []

From 9d3a7b65d7fdcb1b8bf0da1fda39a1ef31764207 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 6 Jul 2021 09:59:12 +0100
Subject: [PATCH 2486/3183] remove lan polling from POWR1 as unsure if works

---
 lib/connection/lan.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/connection/lan.js b/lib/connection/lan.js
index eb1ce973..51139dd8 100644
--- a/lib/connection/lan.js
+++ b/lib/connection/lan.js
@@ -214,8 +214,7 @@ module.exports = class connectionLAN {
         // Use hasProperty has location can be INT 0
         params.location = json.params.location
         suffix = 'location'
-      } else if (json.params.uiActive && [5, 32].includes(deviceInfo.uiid)) {
-        // Not sure if this works with POWR1 (uiid 5)
+      } else if (json.params.uiActive && deviceInfo.uiid === 32) {
         params.uiActive = json.params.uiActive
         suffix = 'monitor'
       } else if (json.params.cmd) {

From 9614b88507c91df21bb9da6cd032f63e07baf4cd Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 6 Jul 2021 09:59:32 +0100
Subject: [PATCH 2487/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8f2fd750..0aa83934 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,7 +25,6 @@ All notable changes to this homebridge-ewelink will be documented in this file.
   - Added a global setting `offlineAsNoResponse` to mark cloud-offline accessories as 'No Response' in HomeKit
 - **Power Readings**
   - Power readings (via Eve app) now visible for accessories when exposed as `Switch`
-  - Polling via LAN mode to enable constant power attribute updates for POW/R2 devices
 - **DUALR3 Devices**
   - Support for LAN mode control for DUALR3 in motor mode
   - Power readings (via Eve app) available when in motor mode

From 2bd9127c26b97000acfb43c40e0204dda0e04a09 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 6 Jul 2021 10:00:19 +0100
Subject: [PATCH 2488/3183] 7.0.0-beta.12

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 9238b318..61087f75 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "7.0.0-beta.11",
+  "version": "7.0.0-beta.12",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 7ae1fe6d..1a88dcf8 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "7.0.0-beta.11",
+  "version": "7.0.0-beta.12",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 7d26592fd1a8968a3644d99cc9984ddac83bb18b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 6 Jul 2021 10:41:51 +0100
Subject: [PATCH 2489/3183] formatting

---
 lib/device/outlet-multi.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/device/outlet-multi.js b/lib/device/outlet-multi.js
index 223c929a..93768857 100644
--- a/lib/device/outlet-multi.js
+++ b/lib/device/outlet-multi.js
@@ -32,9 +32,9 @@ module.exports = class deviceOutletMulti {
     const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
     this.hideChannels = deviceConf && deviceConf.hideChannels ? deviceConf.hideChannels : undefined
     this.inUsePowerThreshold =
-    deviceConf && deviceConf.inUsePowerThreshold
-      ? deviceConf.inUsePowerThreshold
-      : platform.consts.defaultValues.inUsePowerThreshold
+      deviceConf && deviceConf.inUsePowerThreshold
+        ? deviceConf.inUsePowerThreshold
+        : platform.consts.defaultValues.inUsePowerThreshold
 
     // Set the correct logging variables for this accessory
     this.enableLogging = !platform.config.disableDeviceLogging

From 1e5cd52ad4529a99ab563af09ecd669a8d183d88 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 6 Jul 2021 10:42:41 +0100
Subject: [PATCH 2490/3183] use deviceModel to setup garage_eachen sim

---
 config.schema.json | 18 +++++++++---------
 lib/index.js       |  6 +++++-
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 0035de57..80c30fc5 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -158,6 +158,10 @@
                   "title": "Sonoff SLAMPHER",
                   "enum": ["slampher"]
                 },
+                {
+                  "title": "Eachen GD-DC5",
+                  "enum": ["gddc5"]
+                },
                 {
                   "title": "KingArt KING-Q4",
                   "enum": ["king"]
@@ -204,10 +208,6 @@
                   "title": "1 Garage Door",
                   "enum": ["garage"]
                 },
-                {
-                  "title": "1 Garage Door (Eachen GDDC5)",
-                  "enum": ["garage_eachen"]
-                },
                 {
                   "title": "1 Irrigation Valve",
                   "enum": ["valve"]
@@ -288,7 +288,7 @@
               "placeholder": 100,
               "minimum": 20,
               "condition": {
-                "functionBody": "return (model.singleDevices && model.singleDevices[arrayIndices] && ['garage', 'gargage_eachen', 'lock'].includes(model.singleDevices[arrayIndices].showAs));"
+                "functionBody": "return (model.singleDevices && model.singleDevices[arrayIndices] && (model.singleDevices[arrayIndices].deviceModel === 'gddc5' || ['garage', 'lock'].includes(model.singleDevices[arrayIndices].showAs)));"
               }
             },
             "operationTimeDown": {
@@ -324,7 +324,7 @@
               "title": "Obstruction Switch",
               "description": "An optional switch that will trigger the Obstruction Detected feature depending on its value. Otherwise leave blank.",
               "condition": {
-                "functionBody": "return (model.singleDevices && model.singleDevices[arrayIndices] && ['garage', 'garage_eachen'].includes(model.singleDevices[arrayIndices].showAs));"
+                "functionBody": "return (model.singleDevices && model.singleDevices[arrayIndices] && (model.singleDevices[arrayIndices].deviceModel === 'gddc5' || ['garage'].includes(model.singleDevices[arrayIndices].showAs)));"
               }
             },
             "ipAddress": {
@@ -332,7 +332,7 @@
               "title": "IP Address",
               "description": "You can manually set the IP address for this device if it cannot be discovered by the plugin.",
               "condition": {
-                "functionBody": "return (model.singleDevices && model.singleDevices[arrayIndices] && ['single', 't', 'pow', 'iw', 's', 'micro', 'slampher'].includes(model.singleDevices[arrayIndices].deviceModel));"
+                "functionBody": "return (model.singleDevices && model.singleDevices[arrayIndices] && ['single', 't', 'pow', 'iw', 's', 'micro', 'slampher', 'gddc5'].includes(model.singleDevices[arrayIndices].deviceModel));"
               }
             },
             "overrideLogging": {
@@ -358,7 +358,7 @@
                 }
               ],
               "condition": {
-                "functionBody": "return (model.singleDevices && model.singleDevices[arrayIndices] && model.singleDevices[arrayIndices].deviceId && ['single', 't', 'pow', 'iw', 's', 'micro', 'slampher', 'king', 'zb'].includes(model.singleDevices[arrayIndices].deviceModel));"
+                "functionBody": "return (model.singleDevices && model.singleDevices[arrayIndices] && model.singleDevices[arrayIndices].deviceId && ['single', 't', 'pow', 'iw', 's', 'micro', 'slampher', 'gddc5', 'king', 'zb'].includes(model.singleDevices[arrayIndices].deviceModel));"
               }
             }
           }
@@ -587,7 +587,7 @@
               "placeholder": 100,
               "minimum": 20,
               "condition": {
-                "functionBody": "return (model.multiDevices && model.multiDevices[arrayIndices] && ['garage', 'garage_two', 'garage_four', 'garage_eachen', 'blind', 'door', 'window', 'lock'].includes(model.multiDevices[arrayIndices].showAs));"
+                "functionBody": "return (model.multiDevices && model.multiDevices[arrayIndices] && ['garage', 'garage_two', 'garage_four', 'blind', 'door', 'window', 'lock'].includes(model.multiDevices[arrayIndices].showAs));"
               }
             },
             "operationTimeDown": {
diff --git a/lib/index.js b/lib/index.js
index c85e6b3f..5fd19c8b 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -274,9 +274,13 @@ class eWeLinkPlatform {
                     break
                   }
                   case 'deviceId':
-                  case 'deviceModel':
                   case 'label':
                     break
+                  case 'deviceModel':
+                    if (v === 'gddc5') {
+                      this.deviceConf[id].showAs = 'garage_eachen'
+                    }
+                    break
                   case 'hideChannels': {
                     if (typeof v !== 'string' || v === '') {
                       logIgnore(key + '.' + id + '.' + k)

From cdb0cdc649eb154163d764c053d2784e098f125e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 6 Jul 2021 10:45:23 +0100
Subject: [PATCH 2491/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0aa83934..602db273 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -67,6 +67,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
   - ⚠️ The 'Accessory Simulations' (`groups[]`) section will be removed in a future plugin version - you should now setup your simulations from within the appropriate device type section using the 'Show As' setting
     - Simulations for TH10/16, DW2 and `doorbell`, `p_button` & `sensor` will need to be recreated immediately
     - Garage door, window blind, door, window, valve, tap, lock and switch-valve simulations will continue to work for now but will need to be recreated at some point in the future
+  - ⚠️ Eachen GD-DC5 devices no longer need to be setup as a simulation if this deviceModel is chosen in the configuration
 - **Outlet Devices**
   - ⚠️ Will now be exposed by default as `Switch`, use the 'Show As' setting to change back to `Outlet` if needed
 - **Homebridge UI**

From d398def1e15b4dacdba6cbdecbad369b7eba4fcb Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 6 Jul 2021 10:50:19 +0100
Subject: [PATCH 2492/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 602db273..7e83b2b9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,13 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 ## BETA
 
+### Important Notes
+
+- This release includes breaking changes (denoted below with a ⚠️), so take note especially if:
+  - You use the plugin in LAN-only mode,
+  - You have Sonoff devices exposed as Outlet accessories, or
+  - You use Accessory Simulations
+
 ### Added
 
 - **LAN Mode (without eWeLink credentials)**
@@ -90,7 +97,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 - An issue preventing controlling a garage door simulation when using a sensor
 - An issue with the DUALR3 in motor mode hanging on 'Closing...' or 'Opening...'
-- Fixed the multiple notifications when closing an eachen device garage door
+- Fixed the multiple notifications when closing an Eachen device garage door
 - A `RangeError` error which caused HOOBS bridge to restart
 
 ### Removed

From 1ffae9fb9da7a050e0f714e78c3b228f2ded433a Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 6 Jul 2021 10:50:49 +0100
Subject: [PATCH 2493/3183] 7.0.0-beta.13

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 61087f75..103b118c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "7.0.0-beta.12",
+  "version": "7.0.0-beta.13",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 1a88dcf8..b805b8fc 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "7.0.0-beta.12",
+  "version": "7.0.0-beta.13",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 485ba7e0fbfa2852bae0a8aad4d2a56595857d93 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 6 Jul 2021 14:09:40 +0100
Subject: [PATCH 2494/3183] differentiate between hoobs 3 and 4

---
 lib/index.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/index.js b/lib/index.js
index 5fd19c8b..93c56457 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -66,7 +66,13 @@ class eWeLinkPlatform {
         plugin.version,
         process.version,
         api.serverVersion,
-        config.plugin_map ? ' | HOOBS' : ''
+        config.plugin_map
+          ? ' | HOOBS 3'
+          : require('os')
+              .hostname()
+              .includes('hoobs')
+          ? ' | HOOBS 4'
+          : ''
       )
 
       // Apply the user's configuration

From 635110f6fc573076e5d2dcca3b527e9bd30da84f Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Wed, 7 Jul 2021 08:11:41 +0100
Subject: [PATCH 2495/3183] Update new-issue.md

---
 .github/ISSUE_TEMPLATE/new-issue.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/new-issue.md b/.github/ISSUE_TEMPLATE/new-issue.md
index 3decca88..2b4e0f78 100644
--- a/.github/ISSUE_TEMPLATE/new-issue.md
+++ b/.github/ISSUE_TEMPLATE/new-issue.md
@@ -17,7 +17,7 @@ assignees: ''
 
 
 ### Details of your setup.
-* Do you use (1) Homebridge (+ config-ui), (2) Homebridge (CLI) or (3) HOOBS? 
+* Do you use (1) Homebridge UI-X (2) Homebridge CLI or (3) HOOBS? 
 
 
 

From 31c97eb87bafca9ab28977911bcbe6704b99c8f0 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 7 Jul 2021 11:47:16 +0100
Subject: [PATCH 2496/3183] format hoobs version in log

---
 lib/index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/index.js b/lib/index.js
index 93c56457..c14d4a3c 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -67,11 +67,11 @@ class eWeLinkPlatform {
         process.version,
         api.serverVersion,
         config.plugin_map
-          ? ' | HOOBS 3'
+          ? ' | HOOBS v3'
           : require('os')
               .hostname()
               .includes('hoobs')
-          ? ' | HOOBS 4'
+          ? ' | HOOBS v4'
           : ''
       )
 

From 00e3f61734ec48d1ce34071dad2a0dc67def00be Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 7 Jul 2021 12:12:30 +0100
Subject: [PATCH 2497/3183] Update lang-en.js

---
 lib/utils/lang-en.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/utils/lang-en.js b/lib/utils/lang-en.js
index ca97d129..95b406df 100644
--- a/lib/utils/lang-en.js
+++ b/lib/utils/lang-en.js
@@ -105,8 +105,8 @@ module.exports = {
   noWSHost: 'Server did not respond with a web socket host',
   pluginNotConf: 'Plugin has not been configured',
   recNew: 'receiving update for new device',
-  repOffline: 'reported [offline]',
-  repOnline: 'reported [online]',
+  repOffline: 'has been reported [offline]',
+  repOnline: 'has been reported [online]',
   revertWS: 'reverting to web socket as',
   rfNotFound: 'try restarting Homebridge as no accessory found for',
   rfTrigNo: 'not triggered',

From a4419dc43a90e33e8de406c3056ad198151c2d26 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 7 Jul 2021 13:39:21 +0100
Subject: [PATCH 2498/3183] Update index.js

---
 lib/index.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/index.js b/lib/index.js
index c14d4a3c..600bdeb5 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -412,7 +412,9 @@ class eWeLinkPlatform {
                       if (!this.funcs.hasProperty(this.deviceConf[id], k)) {
                         this.deviceConf[id][k] = parsed
                       }
-                      this.obstructSwitches[parsed] = id
+                      if (!this.funcs.hasProperty(this.obstructSwitches, parsed)) {
+                        this.obstructSwitches[parsed] = id
+                      }
                     }
                     break
                   case 'operationTime':

From 6cbb6cb5aa9b97b4e9490f8476ae6bac35929337 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 8 Jul 2021 08:39:17 +0100
Subject: [PATCH 2499/3183] label motion default

---
 config.schema.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 80c30fc5..aebc0118 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -249,7 +249,7 @@
               "description": "The type of sensor to use.",
               "oneOf": [
                 {
-                  "title": "Motion",
+                  "title": "Motion (Default)",
                   "enum": ["motion"]
                 },
                 {
@@ -548,7 +548,7 @@
               "description": "The type of sensor to use.",
               "oneOf": [
                 {
-                  "title": "Motion",
+                  "title": "Motion (Default)",
                   "enum": ["motion"]
                 },
                 {
@@ -1282,7 +1282,7 @@
               "description": "Select the type of sensor you would like to expose this as.",
               "oneOf": [
                 {
-                  "title": "Motion",
+                  "title": "Motion (Default)",
                   "enum": ["motion"]
                 },
                 {

From 8ef94b4c8768d9cde8f7ab7a3b8bd1edb5509d6d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 8 Jul 2021 08:39:29 +0100
Subject: [PATCH 2500/3183] remove obstructs check

---
 lib/index.js           | 6 +-----
 lib/utils/constants.js | 1 -
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/lib/index.js b/lib/index.js
index 600bdeb5..e016d2f9 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -259,8 +259,6 @@ class eWeLinkPlatform {
                   case 'obstructId':
                     if (typeof v !== 'string' || v === '') {
                       logIgnore(key + '.' + id + '.' + k)
-                    } else if (!this.consts.allowed.obstructs.includes(x.type)) {
-                      logIgnore(key + '.' + id + '.' + k)
                     } else {
                       const parsed = this.funcs.parseDeviceId(v)
                       this.deviceConf[id][k] = parsed
@@ -375,7 +373,7 @@ class eWeLinkPlatform {
                 this.deviceConf[id] = {}
               }
               this.log.warn(
-                '[%s - %s] Please recreate this simulation in the Single/Multi Channel Devices section of the configuration and remove this entry from the Accessory Simulations section.',
+                '[%s - %s] Please recreate this simulation in the Single/Multi Channel/TH Devices section of the configuration and remove this entry from the Accessory Simulations section.',
                 id,
                 x.type
               )
@@ -405,8 +403,6 @@ class eWeLinkPlatform {
                   case 'obstructId':
                     if (typeof v !== 'string' || v === '') {
                       logIgnore(key + '.' + id + '.' + k)
-                    } else if (!this.consts.allowed.obstructs.includes(x.type)) {
-                      logIgnore(key + '.' + id + '.' + k)
                     } else {
                       const parsed = this.funcs.parseDeviceId(v)
                       if (!this.funcs.hasProperty(this.deviceConf[id], k)) {
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 1635e585..cbf407c6 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -148,7 +148,6 @@ module.exports = {
     ],
     rfDevices: ['deviceId', 'label', 'resetOnStartup', 'ipAddress', 'overrideLogging'],
     overrideLogging: ['default', 'standard', 'debug', 'disable'],
-    obstructs: ['garage', 'garage_eachen'],
     sensorType: [
       'water',
       'smoke',

From dc4576f425172b54c9edbc028776d80b88192c63 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 8 Jul 2021 08:40:37 +0100
Subject: [PATCH 2501/3183] 7.0.0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 103b118c..9fa2e424 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "7.0.0-beta.13",
+  "version": "7.0.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index b805b8fc..71f7a125 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "7.0.0-beta.13",
+  "version": "7.0.0",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 8fea143dacd14b6ecb6f91373873b4ec548c45ad Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 8 Jul 2021 08:41:20 +0100
Subject: [PATCH 2502/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7e83b2b9..6f69ef21 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 All notable changes to this homebridge-ewelink will be documented in this file.
 
-## BETA
+## 7.0.0 (2021-07-08)
 
 ### Important Notes
 

From 5f878939dd88acc7fed2640bca35be9139b03213 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 8 Jul 2021 08:43:30 +0100
Subject: [PATCH 2503/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6f69ef21..e81d6bc8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,7 +14,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 ### Added
 
 - **LAN Mode (without eWeLink credentials)**
-  - The plugin now supports removing eWeLink credentials from the config when in LAN mode It is important to read about this feature before enabling it - [read more](https://github.com/bwp91/homebridge-ewelink/wiki/Connection-Methods#lan-mode-without-ewelink-credentials)
+  - The plugin now supports removing eWeLink credentials from the config when in LAN mode. It is important to read about this feature before enabling it - [read more](https://github.com/bwp91/homebridge-ewelink/wiki/Connection-Methods#lan-mode-without-ewelink-credentials)
 - **Homebridge UI**
   - Device-specific settings will show and hide depending on the new 'Device Model' (`deviceModel`) option
   - This showing/hiding of options will hopefully be available in the HOOBS UI soon

From 3bd306c12a91a0cd957e1d9277d4c9b949b3c3e9 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Thu, 8 Jul 2021 12:55:27 +0100
Subject: [PATCH 2504/3183] Update README.md

---
 README.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/README.md b/README.md
index 71178f1e..8495ca52 100644
--- a/README.md
+++ b/README.md
@@ -41,8 +41,6 @@ Homebridge plugin to control eWeLink devices
 ### Features
 
 - [Supported Devices](https://github.com/bwp91/homebridge-ewelink/wiki/Supported-Devices)
-- [Multi Channel Devices](https://github.com/bwp91/homebridge-ewelink/wiki/Multi-Channel-Devices)
-- [RF Bridge Sensors](https://github.com/bwp91/homebridge-ewelink/wiki/RF-Bridge-Sensors)
 - [Accessory Simulations](https://github.com/bwp91/homebridge-ewelink/wiki/Accessory-Simulations)
 - [Connection Methods](https://github.com/bwp91/homebridge-ewelink/wiki/Connection-Methods)
 - [Internal API](https://github.com/bwp91/homebridge-ewelink/wiki/Internal-API)

From 94928ac9e7a5902e4bce14e675f0d04b092732d7 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 8 Jul 2021 12:56:20 +0100
Subject: [PATCH 2505/3183] remove links from homebridge-ui

---
 lib/homebridge-ui/public/index.html | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/lib/homebridge-ui/public/index.html b/lib/homebridge-ui/public/index.html
index 301f4e09..e5ec875e 100644
--- a/lib/homebridge-ui/public/index.html
+++ b/lib/homebridge-ui/public/index.html
@@ -142,18 +142,6 @@ <h4>Features</h4>
         >Supported Devices</a
       >
     </li>
-    <li>
-      <a
-        href="https://github.com/bwp91/homebridge-ewelink/wiki/Multi-Channel-Devices"
-        target="_blank"
-        >Multi Channel Devices</a
-      >
-    </li>
-    <li>
-      <a href="https://github.com/bwp91/homebridge-ewelink/wiki/RF-Bridge-Sensors" target="_blank"
-        >RF Bridge Sensors</a
-      >
-    </li>
     <li>
       <a
         href="https://github.com/bwp91/homebridge-ewelink/wiki/Accessory-Simulations"

From 78ea4fe8ea6068ad7805999633e17df03a9681b8 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 8 Jul 2021 13:00:30 +0100
Subject: [PATCH 2506/3183] Update config.schema.json

---
 config.schema.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config.schema.json b/config.schema.json
index aebc0118..e7937db2 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -155,7 +155,7 @@
                   "enum": ["micro"]
                 },
                 {
-                  "title": "Sonoff SLAMPHER",
+                  "title": "Sonoff SLAMPHER/R2",
                   "enum": ["slampher"]
                 },
                 {

From ed2c03b920458c5620d750a4ff2b4814ffa26e49 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 8 Jul 2021 13:32:33 +0100
Subject: [PATCH 2507/3183] Update config.schema.json

---
 config.schema.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index e7937db2..6c0bdb8a 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -494,7 +494,7 @@
                   "enum": ["window"]
                 },
                 {
-                  "title": "1 Window Blind",
+                  "title": "1 Window Blind/Covering",
                   "enum": ["blind"]
                 }
               ],
@@ -508,7 +508,7 @@
               "description": "Select the accessory type to show in HomeKit.",
               "oneOf": [
                 {
-                  "title": "Window Covering (Default)",
+                  "title": "Window Blind/Covering (Default)",
                   "enum": ["blind"]
                 },
                 {

From 28867ed40274c621a33b55ce3783b3f96640f3e1 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 8 Jul 2021 17:01:57 +0100
Subject: [PATCH 2508/3183] no more pleasing!

---
 lib/utils/lang-en.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/utils/lang-en.js b/lib/utils/lang-en.js
index 95b406df..8c1bf78c 100644
--- a/lib/utils/lang-en.js
+++ b/lib/utils/lang-en.js
@@ -8,7 +8,7 @@ module.exports = {
   apiShutdown: 'Internal API gracefully shutdown',
   buttonDouble: 'double press',
   buttonLong: 'long press',
-  buttonNotFound: 'rf button not found (please restart Homebridge)',
+  buttonNotFound: 'rf button not found (restart Homebridge)',
   buttonSingle: 'single press',
   buttonTrig: 'button triggered',
   cantReadPacket: 'LAN message received could not be read as',
@@ -57,7 +57,7 @@ module.exports = {
   devNotRf: 'could not be refreshed as',
   devNotRemove: 'could not be removed from Homebridge as',
   devNotSup: 'has not been added as it cannot be supported',
-  devNotSupYet: 'is not supported, please make a GitHub issue with the following info',
+  devNotSupYet: 'is not supported, do create a GitHub issue with the following info',
   devNotUpd: 'device update failed as',
   devRemove: 'has been removed from Homebridge',
   disabled: 'To change this, set disablePlugin to false',
@@ -74,7 +74,7 @@ module.exports = {
   eweError: 'An eWeLink error [500] occured, retrying in 30 seconds',
   foundWithIP: 'found locally with IP',
   foundWithManIP: 'using manual IP',
-  hbVersionFail: 'Your version of Homebridge is too low - please update to v1.3',
+  hbVersionFail: 'Your version of Homebridge is too low - update to v1.3',
   httpDisabled: 'HTTP/WS clients disabled as',
   httpLogin10003: 'See http://bit.ly/hb-ewelink-errors for more info about login issues',
   httpRetry: 'Unable to reach eWeLink, retrying in 30 seconds',
@@ -138,7 +138,7 @@ module.exports = {
   wsLoginError: 'WS login failed as',
   wsLoginErrRecon: 'WS could not be opened and will try again in 5 seconds',
   wsLoginSuccess: 'WS login successful',
-  wsLogin406: 'WS login failed [406] please see http://bit.ly/hb-ewelink-errors',
+  wsLogin406: 'WS login failed [406] see http://bit.ly/hb-ewelink-errors',
   wsPingError: 'Cound not send WS ping as',
   wsRec: 'WS message received',
   wsReconnectClose: 'WS close event and will try to reconnect in 5 seconds',
@@ -147,7 +147,7 @@ module.exports = {
   wsRefFail: 'Refreshing WS connection failed as',
   wsRequired: 'update must be sent this way',
   wsReqTimeout: 'request timeout',
-  wsResend: 'Web socket is not open - please try again after a few seconds',
+  wsResend: 'Web socket is not open - try again after a few seconds',
   wsUnkAct: 'WS message received has unknown action',
   wsUnkCmd: 'WS unknown command received',
   wsUnkRes: 'unknown WS response',

From 6038f0f0e1a99e739805f38fa406996fcf0cfd40 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 8 Jul 2021 17:02:06 +0100
Subject: [PATCH 2509/3183] verify device model

---
 lib/index.js           | 10 ++++++++--
 lib/utils/constants.js | 20 ++++++++++++++++++++
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/lib/index.js b/lib/index.js
index e016d2f9..b86e8471 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -281,8 +281,14 @@ class eWeLinkPlatform {
                   case 'label':
                     break
                   case 'deviceModel':
-                    if (v === 'gddc5') {
-                      this.deviceConf[id].showAs = 'garage_eachen'
+                    if (typeof v !== 'string' || v === '') {
+                      logIgnore(key + '.' + id + '.' + k)
+                    } else if (!this.consts.allowed.models[key].includes(v)) {
+                      logIgnore(key + '.' + id + '.' + k)
+                    } else {
+                      if (v === 'gddc5' && key === 'singleDevices') {
+                        this.deviceConf[id].showAs = 'garage_eachen'
+                      }
                     }
                     break
                   case 'hideChannels': {
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index cbf407c6..fde47aa4 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -147,6 +147,26 @@ module.exports = {
       'overrideLogging'
     ],
     rfDevices: ['deviceId', 'label', 'resetOnStartup', 'ipAddress', 'overrideLogging'],
+    models: {
+      singleDevices: ['single', 't', 'pow', 'iw', 's', 'micro', 'slampher', 'gddc5', 'king', 'zb'],
+      multiDevices: ['dual_dualr2', 'dualr3_switch', 'dualr3_motor', '4ch', 't'],
+      lightDevices: [
+        'd1',
+        'b1',
+        'l1',
+        'bulbB02BA60',
+        'bulbB05BA60',
+        'bulbB02FA60',
+        'bulbB02FST64',
+        'king',
+        'zl_d',
+        'zl_dc'
+      ],
+      thDevices: ['th', 'sc', 'hc'],
+      fanDevices: ['ifan'],
+      sensorDevices: ['dw', 'snzb01', 'snzb02', 'snzb03', 'snzb04', 'leak'],
+      rfDevices: []
+    },
     overrideLogging: ['default', 'standard', 'debug', 'disable'],
     sensorType: [
       'water',

From 436c2fc6024e5b169d37e60dc35ab96f94513e85 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 8 Jul 2021 17:02:52 +0100
Subject: [PATCH 2510/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e81d6bc8..38f59580 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 All notable changes to this homebridge-ewelink will be documented in this file.
 
+### BETA
+
+### Changes
+
+- Device model in configuration will be validated
+
 ## 7.0.0 (2021-07-08)
 
 ### Important Notes

From 3d537ef4cb9d18dd3575204e5c9e446901a5ebd5 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 8 Jul 2021 18:31:05 +0100
Subject: [PATCH 2511/3183] show sensorId for lock sim

---
 config.schema.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 6c0bdb8a..6e496089 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -308,7 +308,7 @@
               "minLength": 10,
               "maxLength": 10,
               "condition": {
-                "functionBody": "return (model.singleDevices && model.singleDevices[arrayIndices] && ['garage'].includes(model.singleDevices[arrayIndices].showAs));"
+                "functionBody": "return (model.singleDevices && model.singleDevices[arrayIndices] && ['garage', 'lock'].includes(model.singleDevices[arrayIndices].showAs));"
               }
             },
             "hideSensor": {
@@ -607,7 +607,7 @@
               "minLength": 10,
               "maxLength": 10,
               "condition": {
-                "functionBody": "return (model.multiDevices && model.multiDevices[arrayIndices] && ['garage'].includes(model.multiDevices[arrayIndices].showAs));"
+                "functionBody": "return (model.multiDevices && model.multiDevices[arrayIndices] && ['garage', 'lock'].includes(model.multiDevices[arrayIndices].showAs));"
               }
             },
             "hideSensor": {

From a2554f218c117dca1bdd9e6cab26c47d11059a47 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 8 Jul 2021 18:31:43 +0100
Subject: [PATCH 2512/3183] 7.0.1-beta.0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 9fa2e424..fdc9f762 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "7.0.0",
+  "version": "7.0.1-beta.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 71f7a125..97ff5160 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "7.0.0",
+  "version": "7.0.1-beta.0",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From bbf40c7215c705001bbd10b241857f834415a1f2 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 8 Jul 2021 18:33:54 +0100
Subject: [PATCH 2513/3183] update schema desc to add lock + sensor

---
 config.schema.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 6e496089..547c0169 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -304,7 +304,7 @@
             "sensorId": {
               "type": "string",
               "title": "Sensor",
-              "description": "A DW2 or Zigbee contact sensor can be used for a single garage door to determine the current state. Enter the 10 digit eWeLink Device ID (normally in the format 1000ab23cd). Otherwise leave blank.",
+              "description": "A DW2 or Zigbee contact sensor can be used for a single garage door or lock to determine the current state. Enter the 10 digit eWeLink Device ID (normally in the format 1000ab23cd). Otherwise leave blank.",
               "minLength": 10,
               "maxLength": 10,
               "condition": {
@@ -603,7 +603,7 @@
             "sensorId": {
               "type": "string",
               "title": "Sensor",
-              "description": "A DW2 or Zigbee contact sensor can be used for a single garage door to determine the current state. Enter the 10 digit eWeLink Device ID (normally in the format 1000ab23cd). Otherwise leave blank.",
+              "description": "A DW2 or Zigbee contact sensor can be used for a single garage door or lock to determine the current state. Enter the 10 digit eWeLink Device ID (normally in the format 1000ab23cd). Otherwise leave blank.",
               "minLength": 10,
               "maxLength": 10,
               "condition": {
@@ -1482,7 +1482,7 @@
             "sensorId": {
               "type": "string",
               "title": "Sensor",
-              "description": "A DW2 or Zigbee contact sensor can be used for a single garage door to determine the current state. Enter the 10 digit eWeLink Device ID (normally in the format 1000ab23cd). Otherwise leave blank.",
+              "description": "A DW2 or Zigbee contact sensor can be used for a single garage door or lock to determine the current state. Enter the 10 digit eWeLink Device ID (normally in the format 1000ab23cd). Otherwise leave blank.",
               "minLength": 10,
               "maxLength": 10,
               "condition": {

From 54daf477282fee2bb83685295a3855bdd3d72d77 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 8 Jul 2021 18:45:43 +0100
Subject: [PATCH 2514/3183] .type is now .showAs

---
 lib/device/simulation/sensor-hidden.js  | 5 +++--
 lib/device/simulation/sensor-visible.js | 7 ++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/lib/device/simulation/sensor-hidden.js b/lib/device/simulation/sensor-hidden.js
index 2aa186f7..f92506ee 100644
--- a/lib/device/simulation/sensor-hidden.js
+++ b/lib/device/simulation/sensor-hidden.js
@@ -38,7 +38,8 @@ module.exports = class deviceSensorHidden {
       for (const [deviceId, group] of Object.entries(this.platform.deviceConf)) {
         if (
           group.sensorId === this.accessory.context.eweDeviceId &&
-          ['garage', 'lock'].includes(group.type)
+          group.showAs &&
+          ['garage', 'lock'].includes(group.showAs)
         ) {
           const uuid = this.hapUUIDGen(deviceId + 'SWX')
           if (this.devicesInHB.has(uuid)) {
@@ -57,7 +58,7 @@ module.exports = class deviceSensorHidden {
                   break
               }
             }
-            const isGarage = group.type === 'garage'
+            const isGarage = group.showAs === 'garage'
             const subService = subAccessory.getService(
               isGarage ? this.hapServ.GarageDoorOpener : this.hapServ.LockMechanism
             )
diff --git a/lib/device/simulation/sensor-visible.js b/lib/device/simulation/sensor-visible.js
index cc2aaae8..cf46e73f 100644
--- a/lib/device/simulation/sensor-visible.js
+++ b/lib/device/simulation/sensor-visible.js
@@ -145,7 +145,8 @@ module.exports = class deviceSensorVisible {
       for (const [deviceId, group] of Object.entries(this.platform.deviceConf)) {
         if (
           group.sensorId === this.accessory.context.eweDeviceId &&
-          ['garage', 'lock'].includes(group.type)
+          group.showAs &&
+          ['garage', 'lock'].includes(group.showAs)
         ) {
           const uuid = this.hapUUIDGen(deviceId + 'SWX')
           if (this.devicesInHB.has(uuid)) {
@@ -164,9 +165,9 @@ module.exports = class deviceSensorVisible {
                   break
               }
             }
-            const isGarage = group.type === 'garage'
+            const isGarage = group.showAs === 'garage'
             const subService = subAccessory.getService(
-              group.type === 'garage' ? this.hapServ.GarageDoorOpener : this.hapServ.LockMechanism
+              isGarage ? this.hapServ.GarageDoorOpener : this.hapServ.LockMechanism
             )
             const name = subAccessory.displayName
             switch (newState) {

From afb216b359a96e2efa2eaf02d20414ee6f9e75f1 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 8 Jul 2021 18:46:07 +0100
Subject: [PATCH 2515/3183] 7.0.1-beta.1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index fdc9f762..83191745 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "7.0.1-beta.0",
+  "version": "7.0.1-beta.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 97ff5160..e36b2f57 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "7.0.1-beta.0",
+  "version": "7.0.1-beta.1",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 65bc01c7de73fbf8d11f30929ff4738ed5d9a368 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 8 Jul 2021 19:27:39 +0100
Subject: [PATCH 2516/3183] no need for const

---
 lib/device/simulation/sensor-visible.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/device/simulation/sensor-visible.js b/lib/device/simulation/sensor-visible.js
index cf46e73f..f1650828 100644
--- a/lib/device/simulation/sensor-visible.js
+++ b/lib/device/simulation/sensor-visible.js
@@ -198,8 +198,10 @@ module.exports = class deviceSensorVisible {
                     this.eveChar.LastActivation,
                     Math.round(new Date().valueOf() / 1000) - initialTime
                   )
-                  const newTO = subService.getCharacteristic(this.eveChar.TimesOpened).value + 1
-                  subService.updateCharacteristic(this.eveChar.TimesOpened, newTO)
+                  subService.updateCharacteristic(
+                    this.eveChar.TimesOpened,
+                    subService.getCharacteristic(this.eveChar.TimesOpened).value + 1
+                  )
                   if (params.updateSource && enableLogging) {
                     this.log('[%s] %s [%s].', name, this.lang.curState, this.lang.doorOpen)
                   }

From db39cb36f37f0b19294c033e17cd1a17cc913d29 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 8 Jul 2021 19:38:09 +0100
Subject: [PATCH 2517/3183] use updateChar in sensor-lock

---
 lib/device/simulation/sensor-visible.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/device/simulation/sensor-visible.js b/lib/device/simulation/sensor-visible.js
index f1650828..2b821a8f 100644
--- a/lib/device/simulation/sensor-visible.js
+++ b/lib/device/simulation/sensor-visible.js
@@ -181,7 +181,7 @@ module.exports = class deviceSensorVisible {
                   }
                 } else {
                   subService.updateCharacteristic(this.hapChar.LockTargetState, 1)
-                  subService.setCharacteristic(this.hapChar.LockCurrentState, 1)
+                  subService.updateCharacteristic(this.hapChar.LockCurrentState, 1)
                   if (params.updateSource && enableLogging) {
                     this.log('[%s] %s [%s].', name, this.lang.curState, this.lang.lockLocked)
                   }
@@ -207,7 +207,7 @@ module.exports = class deviceSensorVisible {
                   }
                 } else {
                   subService.updateCharacteristic(this.hapChar.LockTargetState, 0)
-                  subService.setCharacteristic(this.hapChar.LockCurrentState, 0)
+                  subService.updateCharacteristic(this.hapChar.LockCurrentState, 0)
                   if (params.updateSource && enableLogging) {
                     this.log('[%s] %s [%s].', name, this.lang.curState, this.lang.lockUnlocked)
                   }

From 9c2c53249dc8d9962e90c45816e7b8e7ea816cca Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 8 Jul 2021 19:38:16 +0100
Subject: [PATCH 2518/3183] fix sim error

---
 lib/index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/index.js b/lib/index.js
index b86e8471..1a002706 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -835,12 +835,12 @@ class eWeLinkPlatform {
         /****************************/
       } else if (
         this.consts.devices.garageSensors.includes(uiid) &&
-        Object.values(this.simulations).some(el => el.sensorId === device.deviceid)
+        Object.values(this.deviceConf).some(el => el.sensorId === device.deviceid)
       ) {
         /************************************
         SENSORS [SONOFF DW2 AS GARAGE SENSOR]
         ************************************/
-        const sim = Object.values(this.simulations).find(el => el.sensorId === device.deviceid)
+        const sim = Object.values(this.deviceConf).find(el => el.sensorId === device.deviceid)
         let instance
         if (sim.hideSensor) {
           // If the sensor exists in Homebridge then remove it as needs to be re-added as hidden

From cfaf7a962dbf74a19cecee1e172f87c2aa1f211d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 8 Jul 2021 19:42:25 +0100
Subject: [PATCH 2519/3183] 7.0.1-beta.2

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 83191745..c7ba0c5f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "7.0.1-beta.1",
+  "version": "7.0.1-beta.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index e36b2f57..181a40a7 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "7.0.1-beta.1",
+  "version": "7.0.1-beta.2",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 6802f992edcfe3ef6903c6eb1ffb8ae4cd885e2e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 8 Jul 2021 20:15:09 +0100
Subject: [PATCH 2520/3183] use updateCharacteristic

---
 lib/device/simulation/blind.js         |  6 +++---
 lib/device/simulation/door.js          |  6 +++---
 lib/device/simulation/garage-eachen.js |  6 +++---
 lib/device/simulation/garage-four.js   |  6 +++---
 lib/device/simulation/garage-one.js    |  6 +++---
 lib/device/simulation/garage-two.js    |  6 +++---
 lib/device/simulation/lock-one.js      |  4 ++--
 lib/device/simulation/sensor-hidden.js |  4 ++--
 lib/device/simulation/switch-valve.js  | 14 +++++++-------
 lib/device/simulation/tap-one.js       |  6 +++---
 lib/device/simulation/tap-two.js       |  6 +++---
 lib/device/simulation/valve-four.js    | 14 +++++++-------
 lib/device/simulation/valve-one.js     | 14 +++++++-------
 lib/device/simulation/valve-two.js     | 14 +++++++-------
 lib/device/simulation/window.js        |  6 +++---
 15 files changed, 59 insertions(+), 59 deletions(-)

diff --git a/lib/device/simulation/blind.js b/lib/device/simulation/blind.js
index f39d52ea..b2c9df2e 100644
--- a/lib/device/simulation/blind.js
+++ b/lib/device/simulation/blind.js
@@ -56,9 +56,9 @@ module.exports = class deviceBlind {
     // Add the window covering service if it doesn't already exist
     if (!(this.service = this.accessory.getService(this.hapServ.WindowCovering))) {
       this.service = this.accessory.addService(this.hapServ.WindowCovering)
-      this.service.setCharacteristic(this.hapChar.CurrentPosition, 0)
-      this.service.setCharacteristic(this.hapChar.TargetPosition, 0)
-      this.service.setCharacteristic(this.hapChar.PositionState, 2)
+      this.service.updateCharacteristic(this.hapChar.CurrentPosition, 0)
+      this.service.updateCharacteristic(this.hapChar.TargetPosition, 0)
+      this.service.updateCharacteristic(this.hapChar.PositionState, 2)
     }
 
     // Certain devices give power readings
diff --git a/lib/device/simulation/door.js b/lib/device/simulation/door.js
index 15946260..5744c056 100644
--- a/lib/device/simulation/door.js
+++ b/lib/device/simulation/door.js
@@ -56,9 +56,9 @@ module.exports = class deviceDoor {
     // Add the door service if it doesn't already exist
     if (!(this.service = this.accessory.getService(this.hapServ.Door))) {
       this.service = this.accessory.addService(this.hapServ.Door)
-      this.service.setCharacteristic(this.hapChar.CurrentPosition, 0)
-      this.service.setCharacteristic(this.hapChar.TargetPosition, 0)
-      this.service.setCharacteristic(this.hapChar.PositionState, 2)
+      this.service.updateCharacteristic(this.hapChar.CurrentPosition, 0)
+      this.service.updateCharacteristic(this.hapChar.TargetPosition, 0)
+      this.service.updateCharacteristic(this.hapChar.PositionState, 2)
     }
 
     // Certain devices give power readings
diff --git a/lib/device/simulation/garage-eachen.js b/lib/device/simulation/garage-eachen.js
index 4d438c8e..7d9aedee 100644
--- a/lib/device/simulation/garage-eachen.js
+++ b/lib/device/simulation/garage-eachen.js
@@ -58,9 +58,9 @@ module.exports = class deviceGarageEachen {
     // Add the garage door service if it doesn't already exist
     if (!(this.service = this.accessory.getService(this.hapServ.GarageDoorOpener))) {
       this.service = this.accessory.addService(this.hapServ.GarageDoorOpener)
-      this.service.setCharacteristic(this.hapChar.CurrentDoorState, 1)
-      this.service.setCharacteristic(this.hapChar.TargetDoorState, 1)
-      this.service.setCharacteristic(this.hapChar.ObstructionDetected, false)
+      this.service.updateCharacteristic(this.hapChar.CurrentDoorState, 1)
+      this.service.updateCharacteristic(this.hapChar.TargetDoorState, 1)
+      this.service.updateCharacteristic(this.hapChar.ObstructionDetected, false)
       this.service.addCharacteristic(this.eveChar.LastActivation)
       this.service.addCharacteristic(this.eveChar.ResetTotal)
       this.service.addCharacteristic(this.eveChar.TimesOpened)
diff --git a/lib/device/simulation/garage-four.js b/lib/device/simulation/garage-four.js
index 6b84dc9a..e509f68f 100644
--- a/lib/device/simulation/garage-four.js
+++ b/lib/device/simulation/garage-four.js
@@ -65,9 +65,9 @@ module.exports = class deviceGarageFour {
           'Garage ' + v,
           'garage' + v
         )
-        gdService.setCharacteristic(this.hapChar.CurrentDoorState, 1)
-        gdService.setCharacteristic(this.hapChar.TargetDoorState, 1)
-        gdService.setCharacteristic(this.hapChar.ObstructionDetected, false)
+        gdService.updateCharacteristic(this.hapChar.CurrentDoorState, 1)
+        gdService.updateCharacteristic(this.hapChar.TargetDoorState, 1)
+        gdService.updateCharacteristic(this.hapChar.ObstructionDetected, false)
       }
 
       // Add the set handler to the target position characteristic
diff --git a/lib/device/simulation/garage-one.js b/lib/device/simulation/garage-one.js
index 2a35dd87..20b59326 100644
--- a/lib/device/simulation/garage-one.js
+++ b/lib/device/simulation/garage-one.js
@@ -65,9 +65,9 @@ module.exports = class deviceGarageOne {
     // Add the garage door service if it doesn't already exist
     if (!(this.service = this.accessory.getService(this.hapServ.GarageDoorOpener))) {
       this.service = this.accessory.addService(this.hapServ.GarageDoorOpener)
-      this.service.setCharacteristic(this.hapChar.CurrentDoorState, 1)
-      this.service.setCharacteristic(this.hapChar.TargetDoorState, 1)
-      this.service.setCharacteristic(this.hapChar.ObstructionDetected, false)
+      this.service.updateCharacteristic(this.hapChar.CurrentDoorState, 1)
+      this.service.updateCharacteristic(this.hapChar.TargetDoorState, 1)
+      this.service.updateCharacteristic(this.hapChar.ObstructionDetected, false)
       this.service.addCharacteristic(this.eveChar.LastActivation)
       this.service.addCharacteristic(this.eveChar.ResetTotal)
       this.service.addCharacteristic(this.eveChar.TimesOpened)
diff --git a/lib/device/simulation/garage-two.js b/lib/device/simulation/garage-two.js
index cb604082..9a605cfc 100644
--- a/lib/device/simulation/garage-two.js
+++ b/lib/device/simulation/garage-two.js
@@ -69,9 +69,9 @@ module.exports = class deviceGarageTwo {
           'Garage ' + v,
           'garage' + v
         )
-        gdService.setCharacteristic(this.hapChar.CurrentDoorState, 1)
-        gdService.setCharacteristic(this.hapChar.TargetDoorState, 1)
-        gdService.setCharacteristic(this.hapChar.ObstructionDetected, false)
+        gdService.updateCharacteristic(this.hapChar.CurrentDoorState, 1)
+        gdService.updateCharacteristic(this.hapChar.TargetDoorState, 1)
+        gdService.updateCharacteristic(this.hapChar.ObstructionDetected, false)
       }
 
       // Add Eve power characteristics
diff --git a/lib/device/simulation/lock-one.js b/lib/device/simulation/lock-one.js
index 947ba099..7dbd3a61 100644
--- a/lib/device/simulation/lock-one.js
+++ b/lib/device/simulation/lock-one.js
@@ -171,7 +171,7 @@ module.exports = class deviceLockOne {
       }
       this.inUse = true
       await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.service.setCharacteristic(this.hapChar.LockCurrentState, 0)
+      this.service.updateCharacteristic(this.hapChar.LockCurrentState, 0)
       if (this.definedSensor) {
         this.inUse = false
         return
@@ -181,7 +181,7 @@ module.exports = class deviceLockOne {
       }
       await this.funcs.sleep(Math.max(this.operationTime * 100, 1000))
       this.service.updateCharacteristic(this.hapChar.LockTargetState, 1)
-      this.service.setCharacteristic(this.hapChar.LockCurrentState, 1)
+      this.service.updateCharacteristic(this.hapChar.LockCurrentState, 1)
       this.inUse = false
       if (this.enableLogging) {
         this.log('[%s] %s [%s].', this.name, this.lang.curState, this.lang.lockLocked)
diff --git a/lib/device/simulation/sensor-hidden.js b/lib/device/simulation/sensor-hidden.js
index f92506ee..c4e9dd7d 100644
--- a/lib/device/simulation/sensor-hidden.js
+++ b/lib/device/simulation/sensor-hidden.js
@@ -74,7 +74,7 @@ module.exports = class deviceSensorHidden {
                   }
                 } else {
                   subService.updateCharacteristic(this.hapChar.LockTargetState, 1)
-                  subService.setCharacteristic(this.hapChar.LockCurrentState, 1)
+                  subService.updateCharacteristic(this.hapChar.LockCurrentState, 1)
                   if (params.updateSource && enableLogging) {
                     this.log('[%s] %s [%s].', name, this.lang.curState, this.lang.lockLocked)
                   }
@@ -98,7 +98,7 @@ module.exports = class deviceSensorHidden {
                   }
                 } else {
                   subService.updateCharacteristic(this.hapChar.LockTargetState, 0)
-                  subService.setCharacteristic(this.hapChar.LockCurrentState, 0)
+                  subService.updateCharacteristic(this.hapChar.LockCurrentState, 0)
                   if (params.updateSource && enableLogging) {
                     this.log('[%s] %s [%s].', name, this.lang.curState, this.lang.lockUnlocked)
                   }
diff --git a/lib/device/simulation/switch-valve.js b/lib/device/simulation/switch-valve.js
index 512171a5..afb42fde 100644
--- a/lib/device/simulation/switch-valve.js
+++ b/lib/device/simulation/switch-valve.js
@@ -52,10 +52,10 @@ module.exports = class deviceSwitchValve {
     // Add the valve service if it doesn't already exist
     if (!(this.vService = this.accessory.getService(this.hapServ.Valve))) {
       this.vService = this.accessory.addService(this.hapServ.Valve)
-      this.vService.setCharacteristic(this.hapChar.Active, 0)
-      this.vService.setCharacteristic(this.hapChar.InUse, 0)
-      this.vService.setCharacteristic(this.hapChar.ValveType, 1)
-      this.vService.setCharacteristic(this.hapChar.SetDuration, 120)
+      this.vService.updateCharacteristic(this.hapChar.Active, 0)
+      this.vService.updateCharacteristic(this.hapChar.InUse, 0)
+      this.vService.updateCharacteristic(this.hapChar.ValveType, 1)
+      this.vService.updateCharacteristic(this.hapChar.SetDuration, 120)
       this.vService.addCharacteristic(this.hapChar.RemainingDuration)
     }
 
@@ -121,7 +121,7 @@ module.exports = class deviceSwitchValve {
 
         // Set a new active timer with the new time amount
         this.timer = setTimeout(
-          () => this.vService.setCharacteristic(this.hapChar.Active, 0),
+          () => this.vService.updateCharacteristic(this.hapChar.Active, 0),
           value * 1000
         )
       }
@@ -204,7 +204,7 @@ module.exports = class deviceSwitchValve {
             this.log('[%s] [valve] %s [%s].', this.name, this.lang.curState, this.lang.valveYes)
           }
           this.timer = setTimeout(() => {
-            this.vService.setCharacteristic(this.hapChar.Active, 0)
+            this.vService.updateCharacteristic(this.hapChar.Active, 0)
           }, timer * 1000)
           break
         }
@@ -256,7 +256,7 @@ module.exports = class deviceSwitchValve {
               this.log('[%s] [valve] %s [%s].', this.name, this.lang.curState, this.lang.valveYes)
             }
             this.timer = setTimeout(() => {
-              this.vService.setCharacteristic(this.hapChar.Active, 0)
+              this.vService.updateCharacteristic(this.hapChar.Active, 0)
             }, timer * 1000)
           }
         } else {
diff --git a/lib/device/simulation/tap-one.js b/lib/device/simulation/tap-one.js
index f8d8bc03..25dd9e53 100644
--- a/lib/device/simulation/tap-one.js
+++ b/lib/device/simulation/tap-one.js
@@ -52,9 +52,9 @@ module.exports = class deviceTapOne {
     // Add the tap service if it doesn't already exist
     if (!(this.service = this.accessory.getService(this.hapServ.Valve))) {
       this.service = this.accessory.addService(this.hapServ.Valve)
-      this.service.setCharacteristic(this.hapChar.Active, 0)
-      this.service.setCharacteristic(this.hapChar.InUse, 0)
-      this.service.setCharacteristic(this.hapChar.ValveType, 3)
+      this.service.updateCharacteristic(this.hapChar.Active, 0)
+      this.service.updateCharacteristic(this.hapChar.InUse, 0)
+      this.service.updateCharacteristic(this.hapChar.ValveType, 3)
     }
 
     // Set up the device type and power readings if necessary
diff --git a/lib/device/simulation/tap-two.js b/lib/device/simulation/tap-two.js
index 243456e3..41263233 100644
--- a/lib/device/simulation/tap-two.js
+++ b/lib/device/simulation/tap-two.js
@@ -55,9 +55,9 @@ module.exports = class deviceTapTwo {
       let tapService
       if (!(tapService = this.accessory.getService('Tap ' + v))) {
         tapService = this.accessory.addService(this.hapServ.Valve, 'Tap ' + v, 'tap' + v)
-        tapService.setCharacteristic(this.hapChar.Active, 0)
-        tapService.setCharacteristic(this.hapChar.InUse, 0)
-        tapService.setCharacteristic(this.hapChar.ValveType, 3)
+        tapService.updateCharacteristic(this.hapChar.Active, 0)
+        tapService.updateCharacteristic(this.hapChar.InUse, 0)
+        tapService.updateCharacteristic(this.hapChar.ValveType, 3)
       }
 
       // Add Eve power characteristics
diff --git a/lib/device/simulation/valve-four.js b/lib/device/simulation/valve-four.js
index 42bb078e..1d0718bf 100644
--- a/lib/device/simulation/valve-four.js
+++ b/lib/device/simulation/valve-four.js
@@ -52,10 +52,10 @@ module.exports = class deviceValveFour {
           'Valve ' + v,
           'valve' + v.toLowerCase()
         )
-        valveService.setCharacteristic(this.hapChar.Active, 0)
-        valveService.setCharacteristic(this.hapChar.InUse, 0)
-        valveService.setCharacteristic(this.hapChar.ValveType, 1)
-        valveService.setCharacteristic(this.hapChar.SetDuration, 120)
+        valveService.updateCharacteristic(this.hapChar.Active, 0)
+        valveService.updateCharacteristic(this.hapChar.InUse, 0)
+        valveService.updateCharacteristic(this.hapChar.ValveType, 1)
+        valveService.updateCharacteristic(this.hapChar.SetDuration, 120)
         valveService.addCharacteristic(this.hapChar.RemainingDuration)
       }
 
@@ -86,7 +86,7 @@ module.exports = class deviceValveFour {
 
           // Set a new active timer with the new time amount
           valveService.timer = setTimeout(
-            () => valveService.setCharacteristic(this.hapChar.Active, 0),
+            () => valveService.updateCharacteristic(this.hapChar.Active, 0),
             value * 1000
           )
         }
@@ -137,7 +137,7 @@ module.exports = class deviceValveFour {
             this.log('[%s] [%s] %s [%s].', this.name, valve, this.lang.curState, this.lang.valveYes)
           }
           valveService.timer = setTimeout(() => {
-            valveService.setCharacteristic(this.hapChar.Active, 0)
+            valveService.updateCharacteristic(this.hapChar.Active, 0)
           }, timer * 1000)
           break
         }
@@ -176,7 +176,7 @@ module.exports = class deviceValveFour {
               )
             }
             valveService.timer = setTimeout(() => {
-              valveService.setCharacteristic(this.hapChar.Active, 0)
+              valveService.updateCharacteristic(this.hapChar.Active, 0)
             }, timer * 1000)
           }
           return
diff --git a/lib/device/simulation/valve-one.js b/lib/device/simulation/valve-one.js
index c4615831..7cbffc96 100644
--- a/lib/device/simulation/valve-one.js
+++ b/lib/device/simulation/valve-one.js
@@ -52,10 +52,10 @@ module.exports = class deviceValveOne {
     // Add the valve service if it doesn't already exist
     if (!(this.service = this.accessory.getService(this.hapServ.Valve))) {
       this.service = this.accessory.addService(this.hapServ.Valve)
-      this.service.setCharacteristic(this.hapChar.Active, 0)
-      this.service.setCharacteristic(this.hapChar.InUse, 0)
-      this.service.setCharacteristic(this.hapChar.ValveType, 1)
-      this.service.setCharacteristic(this.hapChar.SetDuration, 120)
+      this.service.updateCharacteristic(this.hapChar.Active, 0)
+      this.service.updateCharacteristic(this.hapChar.InUse, 0)
+      this.service.updateCharacteristic(this.hapChar.ValveType, 1)
+      this.service.updateCharacteristic(this.hapChar.SetDuration, 120)
       this.service.addCharacteristic(this.hapChar.RemainingDuration)
     }
 
@@ -125,7 +125,7 @@ module.exports = class deviceValveOne {
 
         // Set a new active timer with the new time amount
         this.timer = setTimeout(
-          () => this.service.setCharacteristic(this.hapChar.Active, 0),
+          () => this.service.updateCharacteristic(this.hapChar.Active, 0),
           value * 1000
         )
       }
@@ -187,7 +187,7 @@ module.exports = class deviceValveOne {
             this.log('[%s] %s [%s].', this.name, this.lang.curState, this.lang.valveYes)
           }
           this.timer = setTimeout(() => {
-            this.service.setCharacteristic(this.hapChar.Active, 0)
+            this.service.updateCharacteristic(this.hapChar.Active, 0)
           }, timer * 1000)
           break
         }
@@ -242,7 +242,7 @@ module.exports = class deviceValveOne {
               this.log('[%s] %s [%s].', this.name, this.lang.curState, this.lang.valveYes)
             }
             this.timer = setTimeout(() => {
-              this.service.setCharacteristic(this.hapChar.Active, 0)
+              this.service.updateCharacteristic(this.hapChar.Active, 0)
             }, timer * 1000)
           }
         } else {
diff --git a/lib/device/simulation/valve-two.js b/lib/device/simulation/valve-two.js
index 19b79f73..ae502319 100644
--- a/lib/device/simulation/valve-two.js
+++ b/lib/device/simulation/valve-two.js
@@ -55,10 +55,10 @@ module.exports = class deviceValveTwo {
       let valveService
       if (!(valveService = this.accessory.getService('Valve ' + v))) {
         valveService = this.accessory.addService(this.hapServ.Valve, 'Valve ' + v, 'valve' + v)
-        valveService.setCharacteristic(this.hapChar.Active, 0)
-        valveService.setCharacteristic(this.hapChar.InUse, 0)
-        valveService.setCharacteristic(this.hapChar.ValveType, 1)
-        valveService.setCharacteristic(this.hapChar.SetDuration, 120)
+        valveService.updateCharacteristic(this.hapChar.Active, 0)
+        valveService.updateCharacteristic(this.hapChar.InUse, 0)
+        valveService.updateCharacteristic(this.hapChar.ValveType, 1)
+        valveService.updateCharacteristic(this.hapChar.SetDuration, 120)
         valveService.addCharacteristic(this.hapChar.RemainingDuration)
       }
 
@@ -102,7 +102,7 @@ module.exports = class deviceValveTwo {
 
           // Set a new active timer with the new time amount
           valveService.timer = setTimeout(
-            () => valveService.setCharacteristic(this.hapChar.Active, 0),
+            () => valveService.updateCharacteristic(this.hapChar.Active, 0),
             value * 1000
           )
         }
@@ -160,7 +160,7 @@ module.exports = class deviceValveTwo {
             this.log('[%s] [%s] %s [%s].', this.name, valve, this.lang.curState, this.lang.valveYes)
           }
           valveService.timer = setTimeout(() => {
-            valveService.setCharacteristic(this.hapChar.Active, 0)
+            valveService.updateCharacteristic(this.hapChar.Active, 0)
           }, timer * 1000)
           break
         }
@@ -213,7 +213,7 @@ module.exports = class deviceValveTwo {
                 )
               }
               valveService.timer = setTimeout(() => {
-                valveService.setCharacteristic(this.hapChar.Active, 0)
+                valveService.updateCharacteristic(this.hapChar.Active, 0)
               }, timer * 1000)
             }
             return
diff --git a/lib/device/simulation/window.js b/lib/device/simulation/window.js
index e5304800..c1bc9818 100644
--- a/lib/device/simulation/window.js
+++ b/lib/device/simulation/window.js
@@ -56,9 +56,9 @@ module.exports = class deviceWindow {
     // Add the window service if it doesn't already exist
     if (!(this.service = this.accessory.getService(this.hapServ.Window))) {
       this.service = this.accessory.addService(this.hapServ.Window)
-      this.service.setCharacteristic(this.hapChar.CurrentPosition, 0)
-      this.service.setCharacteristic(this.hapChar.TargetPosition, 0)
-      this.service.setCharacteristic(this.hapChar.PositionState, 2)
+      this.service.updateCharacteristic(this.hapChar.CurrentPosition, 0)
+      this.service.updateCharacteristic(this.hapChar.TargetPosition, 0)
+      this.service.updateCharacteristic(this.hapChar.PositionState, 2)
     }
 
     // Certain devices give power readings

From f2d5e8b3d02d814b48888c19732ecf1f536f23a9 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 8 Jul 2021 20:16:46 +0100
Subject: [PATCH 2521/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 38f59580..0c3deb78 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,12 +2,16 @@
 
 All notable changes to this homebridge-ewelink will be documented in this file.
 
-### BETA
+### 7.0.1 (2021-07-08)
 
 ### Changes
 
 - Device model in configuration will be validated
 
+### Fixed
+
+- An issue preventing garage doors and locks with a defined sensor from initialising
+
 ## 7.0.0 (2021-07-08)
 
 ### Important Notes

From 358531635e334d560bfceeecf02c5a085c548d43 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 8 Jul 2021 20:17:11 +0100
Subject: [PATCH 2522/3183] 7.0.1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c7ba0c5f..e883c243 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "7.0.1-beta.2",
+  "version": "7.0.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 181a40a7..170506a3 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "7.0.1-beta.2",
+  "version": "7.0.1",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 71b2dce22df032787a88c42209adaf94d3839825 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 8 Jul 2021 23:58:23 +0100
Subject: [PATCH 2523/3183] bump node back down

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 170506a3..291ec47b 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
   "main": "lib/index.js",
   "engines": {
     "homebridge": "^1.3.3",
-    "node": "^14.17.3 || ^16.4.2"
+    "node": "^14.17.2 || ^16.4.1"
   },
   "repository": {
     "type": "git",

From cd5ef3cbb217a59c342477c3c52d67fe9795aa11 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 9 Jul 2021 00:03:18 +0100
Subject: [PATCH 2524/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0c3deb78..7a1cbf0d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 All notable changes to this homebridge-ewelink will be documented in this file.
 
+## 7.0.2 (2021-07-08)
+
+### Changes
+
+- Revert node version bump to v14.17.3
+
 ### 7.0.1 (2021-07-08)
 
 ### Changes

From d03e7c5a06763737c7dbd4660cc966e1629c1881 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 9 Jul 2021 00:18:31 +0100
Subject: [PATCH 2525/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7a1cbf0d..1a036085 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,7 +6,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 ### Changes
 
-- Revert node version bump to v14.17.3
+- Revert node version bump to v14.17.3 (back to v14.17.2)
 
 ### 7.0.1 (2021-07-08)
 

From ea6ccf6fa869c17c4c668786b602196676bde2a2 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 9 Jul 2021 00:23:09 +0100
Subject: [PATCH 2526/3183] 7.0.2

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index e883c243..f6941a13 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "7.0.1",
+  "version": "7.0.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 291ec47b..7e890530 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "7.0.1",
+  "version": "7.0.2",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 3f4be5513e80ccf2878657f94fed606c700450dc Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 9 Jul 2021 08:39:16 +0100
Subject: [PATCH 2527/3183] lock+sensor changes

---
 lib/device/simulation/lock-one.js       | 60 ++++++++++++++++++-------
 lib/device/simulation/sensor-visible.js |  2 +
 2 files changed, 45 insertions(+), 17 deletions(-)

diff --git a/lib/device/simulation/lock-one.js b/lib/device/simulation/lock-one.js
index 7dbd3a61..8520b113 100644
--- a/lib/device/simulation/lock-one.js
+++ b/lib/device/simulation/lock-one.js
@@ -125,6 +125,7 @@ module.exports = class deviceLockOne {
     this.service
       .updateCharacteristic(this.hapChar.LockCurrentState, 1)
       .updateCharacteristic(this.hapChar.LockTargetState, 1)
+    this.accessory.context.contactDetected = true
 
     // Set up an interval to get eWeLink to send power updates
     if (
@@ -153,6 +154,11 @@ module.exports = class deviceLockOne {
 
   async internalUpdate (value) {
     try {
+      if (value === 1) {
+        this.service.updateCharacteristic(this.hapChar.LockCurrentState, 1)
+        return
+      }
+
       const params = {}
       switch (this.setup) {
         case 'singleSwitch':
@@ -172,13 +178,13 @@ module.exports = class deviceLockOne {
       this.inUse = true
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.service.updateCharacteristic(this.hapChar.LockCurrentState, 0)
-      if (this.definedSensor) {
-        this.inUse = false
-        return
-      }
       if (this.enableLogging) {
         this.log('[%s] %s [%s].', this.name, this.lang.curState, this.lang.lockUnlocked)
       }
+      if (this.definedSensor) {
+        this.internalSensorCheck()
+        return
+      }
       await this.funcs.sleep(Math.max(this.operationTime * 100, 1000))
       this.service.updateCharacteristic(this.hapChar.LockTargetState, 1)
       this.service.updateCharacteristic(this.hapChar.LockCurrentState, 1)
@@ -214,25 +220,45 @@ module.exports = class deviceLockOne {
     }
   }
 
+  internalSensorCheck () {
+    if (this.timeoutInterval) {
+      clearTimeout(this.timeoutInterval)
+    }
+    this.timeoutInterval = setTimeout(() => {
+      if (this.accessory.context.contactDetected) {
+        this.service.updateCharacteristic(this.hapChar.LockCurrentState, 1)
+        this.service.updateCharacteristic(this.hapChar.LockTargetState, 1)
+        this.inUse = false
+        if (this.enableLogging) {
+          this.log('[%s] %s [%s].', this.name, this.lang.curState, this.lang.lockLocked)
+        }
+      }
+    }, this.operationTime * 100 + 50)
+  }
+
   async externalUpdate (params) {
     try {
-      if (!this.inUse && !this.definedSensor) {
+      if (!this.inUse) {
         if (
           (this.setup === 'multiSwitch' && params.switches && params.switches[0].switch === 'on') ||
           (this.setup === 'singleSwitch' && params.switch && params.switch === 'on')
         ) {
-          this.inUse = true
-          this.service.updateCharacteristic(this.hapChar.LockCurrentState, 0)
-          this.service.updateCharacteristic(this.hapChar.LockTargetState, 0)
-          if (params.updateSource && this.enableLogging) {
-            this.log('[%s] %s [%s].', this.name, this.lang.curState, this.lang.lockUnlocked)
-          }
-          await this.funcs.sleep(Math.max(this.operationTime * 100, 1000))
-          this.service.updateCharacteristic(this.hapChar.LockCurrentState, 1)
-          this.service.updateCharacteristic(this.hapChar.LockTargetState, 1)
-          this.inUse = false
-          if (params.updateSource && this.enableLogging) {
-            this.log('[%s] %s [%s].', this.name, this.lang.curState, this.lang.lockLocked)
+          if (this.definedSensor) {
+            this.internalSensorCheck()
+          } else {
+            this.inUse = true
+            this.service.updateCharacteristic(this.hapChar.LockCurrentState, 0)
+            this.service.updateCharacteristic(this.hapChar.LockTargetState, 0)
+            if (params.updateSource && this.enableLogging) {
+              this.log('[%s] %s [%s].', this.name, this.lang.curState, this.lang.lockUnlocked)
+            }
+            await this.funcs.sleep(Math.max(this.operationTime * 100, 1000))
+            this.service.updateCharacteristic(this.hapChar.LockCurrentState, 1)
+            this.service.updateCharacteristic(this.hapChar.LockTargetState, 1)
+            this.inUse = false
+            if (params.updateSource && this.enableLogging) {
+              this.log('[%s] %s [%s].', this.name, this.lang.curState, this.lang.lockLocked)
+            }
           }
         }
       }
diff --git a/lib/device/simulation/sensor-visible.js b/lib/device/simulation/sensor-visible.js
index 2b821a8f..98f72581 100644
--- a/lib/device/simulation/sensor-visible.js
+++ b/lib/device/simulation/sensor-visible.js
@@ -182,6 +182,7 @@ module.exports = class deviceSensorVisible {
                 } else {
                   subService.updateCharacteristic(this.hapChar.LockTargetState, 1)
                   subService.updateCharacteristic(this.hapChar.LockCurrentState, 1)
+                  subAccessory.context.contactDetected = true
                   if (params.updateSource && enableLogging) {
                     this.log('[%s] %s [%s].', name, this.lang.curState, this.lang.lockLocked)
                   }
@@ -208,6 +209,7 @@ module.exports = class deviceSensorVisible {
                 } else {
                   subService.updateCharacteristic(this.hapChar.LockTargetState, 0)
                   subService.updateCharacteristic(this.hapChar.LockCurrentState, 0)
+                  subAccessory.context.contactDetected = false
                   if (params.updateSource && enableLogging) {
                     this.log('[%s] %s [%s].', name, this.lang.curState, this.lang.lockUnlocked)
                   }

From 6db1b7397ef54ecd10cf6523f55347b3cacb32e4 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 9 Jul 2021 08:39:54 +0100
Subject: [PATCH 2528/3183] 7.0.3-beta.0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index f6941a13..dea9183f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "7.0.2",
+  "version": "7.0.3-beta.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 7e890530..973a1e68 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "7.0.2",
+  "version": "7.0.3-beta.0",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 8315ac1b77ad63e2467cbf3ca160dafaa75ec884 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 9 Jul 2021 11:26:30 +0100
Subject: [PATCH 2529/3183] add support for zigbee multi switch devices

---
 config.schema.json                 |  10 ++-
 lib/device/outlet-single.js        |   2 +-
 lib/device/switch-multi.js         |   2 +-
 lib/device/switch-single.js        |   2 +-
 lib/device/zigbee/switch-single.js | 136 -----------------------------
 lib/index.js                       |   8 +-
 lib/utils/constants.js             |  14 +--
 7 files changed, 18 insertions(+), 156 deletions(-)
 delete mode 100644 lib/device/zigbee/switch-single.js

diff --git a/config.schema.json b/config.schema.json
index 547c0169..cc4265f4 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -402,6 +402,10 @@
                 {
                   "title": "Sonoff T1/T2/T3/TX-2C/3C/4C",
                   "enum": ["t"]
+                },
+                {
+                  "title": "Zigbee Multi Switch",
+                  "enum": ["zb"]
                 }
               ],
               "condition": {
@@ -499,7 +503,7 @@
                 }
               ],
               "condition": {
-                "functionBody": "return (model.multiDevices && model.multiDevices[arrayIndices] && model.multiDevices[arrayIndices].deviceId && ['dual_dualr2', 'dualr3_switch', '4ch', 't'].includes(model.multiDevices[arrayIndices].deviceModel));"
+                "functionBody": "return (model.multiDevices && model.multiDevices[arrayIndices] && model.multiDevices[arrayIndices].deviceId && ['dual_dualr2', 'dualr3_switch', '4ch', 't', 'zb'].includes(model.multiDevices[arrayIndices].deviceModel));"
               }
             },
             "showAsMotor": {
@@ -529,7 +533,7 @@
               "title": "Hide Channels",
               "description": "A comma separated list of channels to hide for this device. For example '0' or '0,1,2'.",
               "condition": {
-                "functionBody": "return (model.multiDevices && model.multiDevices[arrayIndices] && model.multiDevices[arrayIndices].deviceId && ['dual_dualr2', 'dualr3_switch', '4ch', 't'].includes(model.multiDevices[arrayIndices].deviceModel) && ['default', 'outlet'].includes(model.multiDevices[arrayIndices].showAs));"
+                "functionBody": "return (model.multiDevices && model.multiDevices[arrayIndices] && model.multiDevices[arrayIndices].deviceId && ['dual_dualr2', 'dualr3_switch', '4ch', 't', 'zb'].includes(model.multiDevices[arrayIndices].deviceModel) && ['default', 'outlet'].includes(model.multiDevices[arrayIndices].showAs));"
               }
             },
             "inUsePowerThreshold": {
@@ -657,7 +661,7 @@
                 }
               ],
               "condition": {
-                "functionBody": "return (model.multiDevices && model.multiDevices[arrayIndices] && model.multiDevices[arrayIndices].deviceId && ['dual_dualr2', 'dualr3_switch', 'dualr3_motor', '4ch', 't'].includes(model.multiDevices[arrayIndices].deviceModel));"
+                "functionBody": "return (model.multiDevices && model.multiDevices[arrayIndices] && model.multiDevices[arrayIndices].deviceId && ['dual_dualr2', 'dualr3_switch', 'dualr3_motor', '4ch', 't', 'zb'].includes(model.multiDevices[arrayIndices].deviceModel));"
               }
             }
           }
diff --git a/lib/device/outlet-single.js b/lib/device/outlet-single.js
index ec63e3eb..cb941771 100644
--- a/lib/device/outlet-single.js
+++ b/lib/device/outlet-single.js
@@ -22,7 +22,7 @@ module.exports = class deviceOutletSingle {
     this.isOnline = true
 
     /*
-    UIID 1/6/14/24/27/112: single switch, no power readings
+    UIID 1/6/14/24/27/112/1256: single switch, no power readings
     UIID 5: single switch, with wattage readings
     UIID 32: single switch, with wattage, voltage and amp readings
     UIID 77/78/81/107: single switch but firmware uses multiple channels (only need CH0)
diff --git a/lib/device/switch-multi.js b/lib/device/switch-multi.js
index eb51236f..34792c6b 100644
--- a/lib/device/switch-multi.js
+++ b/lib/device/switch-multi.js
@@ -24,7 +24,7 @@ module.exports = class deviceSwitchMulti {
     this.isOnline = true
 
     /*
-    UIID 2/3/4/7/8/9/29/30/31/41/82/83/84/113/114: multi switch, no power readings
+    UIID 2/3/4/7/8/9/29/30/31/41/82/83/84/113/114/2256/3256/4256: multi switch, no power readings
     UIID 126: multi switch, with wattage, voltage and amp readings (DUALR3)
     */
 
diff --git a/lib/device/switch-single.js b/lib/device/switch-single.js
index 7b632e10..084a8b0c 100644
--- a/lib/device/switch-single.js
+++ b/lib/device/switch-single.js
@@ -22,7 +22,7 @@ module.exports = class deviceSwitchSingle {
     this.isOnline = true
 
     /*
-    UIID 1/6/14/24/27/112: single switch, no power readings
+    UIID 1/6/14/24/27/112/1256: single switch, no power readings
     UIID 5: single switch, with wattage readings
     UIID 32: single switch, with wattage, voltage and amp readings
     UIID 77/78/81/107: single switch but firmware uses multiple channels (only need CH0)
diff --git a/lib/device/zigbee/switch-single.js b/lib/device/zigbee/switch-single.js
deleted file mode 100644
index ac406a46..00000000
--- a/lib/device/zigbee/switch-single.js
+++ /dev/null
@@ -1,136 +0,0 @@
-/* jshint -W014, -W033, esversion: 9 */
-/* eslint-disable new-cap */
-'use strict'
-
-module.exports = class deviceZBSwitchSingle {
-  constructor (platform, accessory) {
-    // Set up variables from the platform
-    this.hapChar = platform.api.hap.Characteristic
-    this.hapErr = platform.api.hap.HapStatusError
-    this.hapServ = platform.api.hap.Service
-    this.lang = platform.lang
-    this.log = platform.log
-    this.platform = platform
-
-    // Set up variables from the accessory
-    this.name = accessory.displayName
-    this.accessory = accessory
-
-    // Set up custom variables for this device type
-    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
-
-    // Set the correct logging variables for this accessory
-    this.showAsOutlet = deviceConf && deviceConf.showAsOutlet
-    this.enableLogging = !platform.config.disableDeviceLogging
-    this.enableDebugLogging = platform.config.debug
-    if (deviceConf && deviceConf.overrideLogging) {
-      switch (deviceConf.overrideLogging) {
-        case 'standard':
-          this.enableLogging = true
-          this.enableDebugLogging = false
-          break
-        case 'debug':
-          this.enableLogging = true
-          this.enableDebugLogging = true
-          break
-        case 'disable':
-          this.enableLogging = false
-          this.enableDebugLogging = false
-          break
-      }
-    }
-
-    if (this.showAsOutlet) {
-      // If the accessory has a switch service then remove it
-      if (this.accessory.getService(this.hapServ.Switch)) {
-        this.accessory.removeService(this.accessory.getService(this.hapServ.Switch))
-      }
-
-      // Add the outlet service if it doesn't already exist
-      this.service =
-        this.accessory.getService(this.hapServ.Outlet) ||
-        this.accessory.addService(this.hapServ.Outlet)
-    } else {
-      // If the accessory has a outlet service then remove it
-      if (this.accessory.getService(this.hapServ.Outlet)) {
-        this.accessory.removeService(this.accessory.getService(this.hapServ.Outlet))
-      }
-
-      // Add the switch service if it doesn't already exist
-      this.service =
-        this.accessory.getService(this.hapServ.Switch) ||
-        this.accessory.addService(this.hapServ.Switch)
-    }
-
-    // Add the get/set handler to the switch on/off characteristic
-    this.service
-      .getCharacteristic(this.hapChar.On)
-      .onGet(() => {
-        if (this.isOnline) {
-          return this.service.getCharacteristic(this.hapChar.On).value
-        } else {
-          throw new this.hapErr(-70402)
-        }
-      })
-      .onSet(async value => {
-        await this.internalStateUpdate(value)
-      })
-
-    // Pass the accessory to Fakegato to set up with Eve
-    this.accessory.eveService = new platform.eveService('switch', this.accessory, {
-      log: platform.config.debugFakegato ? this.log : () => {}
-    })
-
-    // Output the customised options to the log
-    const opts = JSON.stringify({
-      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
-      showAsType: this.showAsOutlet ? 'outlet' : 'switch'
-    })
-    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
-  }
-
-  async internalStateUpdate (value) {
-    try {
-      const newValue = value ? 'on' : 'off'
-      if (newValue === this.cacheState) {
-        return
-      }
-      await this.platform.sendDeviceUpdate(this.accessory, {
-        switch: newValue
-      })
-      this.cacheState = newValue
-      this.accessory.eveService.addEntry({ status: value ? 1 : 0 })
-      if (this.enableLogging) {
-        this.log('[%s] %s [%s].', this.name, this.lang.curState, newValue)
-      }
-    } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
-      setTimeout(() => {
-        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
-      }, 2000)
-      throw new this.hapErr(-70402)
-    }
-  }
-
-  async externalUpdate (params) {
-    try {
-      if (!params.switch || params.switch === this.cacheState) {
-        return
-      }
-      this.cacheState = params.switch
-      this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
-      this.accessory.eveService.addEntry({
-        status: this.cacheState === 'on' ? 1 : 0
-      })
-      if (params.updateSource && this.enableLogging) {
-        this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
-      }
-    } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, false)
-    }
-  }
-
-  markStatus (isOnline) {
-    this.isOnline = isOnline
-  }
-}
diff --git a/lib/index.js b/lib/index.js
index 1a002706..2ac4550a 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1322,13 +1322,6 @@ class eWeLinkPlatform {
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/zigbee/switch-stateless'))(this, accessory)
         /*********************/
-      } else if (this.consts.devices.zbSwitchSingle.includes(uiid)) {
-        /***************
-        ZB SINGLE SWITCH
-        ***************/
-        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require('./device/zigbee/switch-single'))(this, accessory)
-        /**************/
       } else if (this.consts.devices.zbLightDimmer.includes(uiid)) {
         /*****************
         ZB LIGHTS [DIMMER]
@@ -1396,6 +1389,7 @@ class eWeLinkPlatform {
           uiid,
           JSON.stringify(device.params)
         )
+        this.log.error(device)
         return
         /*********************/
       }
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index fde47aa4..17257020 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -211,8 +211,8 @@ module.exports = {
 
   devices: {
     lan: [1, 2, 3, 4, 5, 6, 7, 8, 9, 14, 15, 28, 32, 34, 44, 77, 78, 126],
-    singleSwitch: [1, 6, 14, 24, 27, 112],
-    multiSwitch: [2, 3, 4, 7, 8, 9, 29, 30, 31, 41, 82, 83, 84, 113, 114, 126],
+    singleSwitch: [1, 6, 14, 24, 27, 112, 1009, 1256],
+    multiSwitch: [2, 3, 4, 7, 8, 9, 29, 30, 31, 41, 82, 83, 84, 113, 114, 126, 2256, 3256, 4256],
     lightDimmer: [36, 44, 57],
     lightRGB: [22],
     lightCCT: [103],
@@ -354,8 +354,11 @@ module.exports = {
     1258: 1,
     1770: 1, // "ZIGBEE_TEMPERATURE_SENSOR"
     2026: 1, // "ZIGBEE_MOBILE_SENSOR"
+    2256: 2, // "ZIGBEE_SWITCH_2"
     3026: 1, // "ZIGBEE_DOOR_AND_WINDOW_SENSOR"
-    4026: 1 // "ZIGBEE_WATER_SENSOR"
+    3256: 3, // "ZIGBEE_SWITCH_3"
+    4026: 1, // "ZIGBEE_WATER_SENSOR"
+    4256: 4 // "ZIGBEE_SWITCH_4"
   },
 
   cannotSupportDevices: {
@@ -408,9 +411,6 @@ module.exports = {
     109: 0, // "YK_INFRARED_2"
     1001: 0, // "BLADELESS_FAN"
     1002: 0, // "NEW_HUMIDIFIER"
-    1003: 0, // "WARM_AIR_BLOWER"
-    2256: 2, // "ZIGBEE_SWITCH_2"
-    3256: 3, // "ZIGBEE_SWITCH_3"
-    4256: 4 // "ZIGBEE_SWITCH_4"
+    1003: 0 // "WARM_AIR_BLOWER"
   }
 }

From 2fe40a92dcc105d0a32cc7e3d040a78cacf471ee Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 9 Jul 2021 11:27:05 +0100
Subject: [PATCH 2530/3183] remove debug

---
 lib/index.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/index.js b/lib/index.js
index 2ac4550a..d2f7ae9c 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1389,7 +1389,6 @@ class eWeLinkPlatform {
           uiid,
           JSON.stringify(device.params)
         )
-        this.log.error(device)
         return
         /*********************/
       }

From 3849d15d18215edeee15bc0b33b8413a7a52a507 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 9 Jul 2021 11:35:29 +0100
Subject: [PATCH 2531/3183] rename zigbee switch to channel

---
 config.schema.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index cc4265f4..dce44dc5 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -167,7 +167,7 @@
                   "enum": ["king"]
                 },
                 {
-                  "title": "Zigbee Single Switch (BASICZBR3/ZBMINI/S31ZB)",
+                  "title": "Zigbee Single Channel (BASICZBR3/ZBMINI/S31ZB)",
                   "enum": ["zb"]
                 }
               ],
@@ -404,7 +404,7 @@
                   "enum": ["t"]
                 },
                 {
-                  "title": "Zigbee Multi Switch",
+                  "title": "Zigbee Multi Channel",
                   "enum": ["zb"]
                 }
               ],

From 585c5aaab96370d7a14f8448846c8c312be11f99 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 9 Jul 2021 11:35:33 +0100
Subject: [PATCH 2532/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1a036085..135ab33a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 All notable changes to this homebridge-ewelink will be documented in this file.
 
+## BETA
+
+### Added
+
+- Support for Zigbee multi-channel devices
+
 ## 7.0.2 (2021-07-08)
 
 ### Changes

From 3fb5339f8ea27f8bef4bdb281d37c2a01c1cfed2 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 9 Jul 2021 11:38:29 +0100
Subject: [PATCH 2533/3183] 7.1.0-beta.0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index dea9183f..18d74761 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "7.0.3-beta.0",
+  "version": "7.1.0-beta.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 973a1e68..17378ff2 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "7.0.3-beta.0",
+  "version": "7.1.0-beta.0",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From c8a2a465e98836b97b4989786f09a2f1cf461200 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 9 Jul 2021 13:32:08 +0100
Subject: [PATCH 2534/3183] schema: show label first + add option to ignore
 device

---
 config.schema.json     | 283 +++++++++++++++++++++++------------------
 lib/index.js           |  13 +-
 lib/utils/constants.js |  24 +++-
 3 files changed, 195 insertions(+), 125 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index dce44dc5..2480ce8b 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -118,6 +118,11 @@
         "items": {
           "type": "object",
           "properties": {
+            "label": {
+              "title": "Label",
+              "type": "string",
+              "description": "This setting has no effect except to help identify this device."
+            },
             "deviceId": {
               "type": "string",
               "title": "Device ID",
@@ -125,6 +130,14 @@
               "minLength": 10,
               "maxLength": 10
             },
+            "ignoreDevice": {
+              "type": "boolean",
+              "title": "Hide From HomeKit",
+              "description": "If true, this accessory will be removed and ignored from HomeKit.",
+              "condition": {
+                "functionBody": "return (model.singleDevices && model.singleDevices[arrayIndices] && model.singleDevices[arrayIndices].deviceId && model.singleDevices[arrayIndices].deviceId.length === 10);"
+              }
+            },
             "deviceModel": {
               "type": "string",
               "title": "Device Model",
@@ -172,15 +185,7 @@
                 }
               ],
               "condition": {
-                "functionBody": "return (model.singleDevices && model.singleDevices[arrayIndices] && model.singleDevices[arrayIndices].deviceId && model.singleDevices[arrayIndices].deviceId.length === 10);"
-              }
-            },
-            "label": {
-              "title": "Label",
-              "type": "string",
-              "description": "This setting has no effect except to help identify this device.",
-              "condition": {
-                "functionBody": "return (model.singleDevices && model.singleDevices[arrayIndices] && model.singleDevices[arrayIndices].deviceId && model.singleDevices[arrayIndices].deviceId.length === 10);"
+                "functionBody": "return (model.singleDevices && model.singleDevices[arrayIndices] && model.singleDevices[arrayIndices].deviceId && model.singleDevices[arrayIndices].deviceId.length === 10 && !model.singleDevices[arrayIndices].ignoreDevice);"
               }
             },
             "showAs": {
@@ -230,7 +235,7 @@
                 }
               ],
               "condition": {
-                "functionBody": "return (model.singleDevices && model.singleDevices[arrayIndices] && ['single', 't', 'pow', 'iw', 's', 'micro', 'slampher', 'king', 'zb'].includes(model.singleDevices[arrayIndices].deviceModel));"
+                "functionBody": "return (model.singleDevices && model.singleDevices[arrayIndices] && ['single', 't', 'pow', 'iw', 's', 'micro', 'slampher', 'king', 'zb'].includes(model.singleDevices[arrayIndices].deviceModel) && !model.singleDevices[arrayIndices].ignoreDevice);"
               }
             },
             "inUsePowerThreshold": {
@@ -240,7 +245,7 @@
               "placeholder": 0,
               "minimum": 0,
               "condition": {
-                "functionBody": "return (model.singleDevices && model.singleDevices[arrayIndices] && ['pow', 'iw'].includes(model.singleDevices[arrayIndices].deviceModel) && ['outlet'].includes(model.singleDevices[arrayIndices].showAs));"
+                "functionBody": "return (model.singleDevices && model.singleDevices[arrayIndices] && ['pow', 'iw'].includes(model.singleDevices[arrayIndices].deviceModel) && ['outlet'].includes(model.singleDevices[arrayIndices].showAs) && !model.singleDevices[arrayIndices].ignoreDevice);"
               }
             },
             "sensorType": {
@@ -278,7 +283,7 @@
                 }
               ],
               "condition": {
-                "functionBody": "return (model.singleDevices && model.singleDevices[arrayIndices] && ['sensor'].includes(model.singleDevices[arrayIndices].showAs));"
+                "functionBody": "return (model.singleDevices && model.singleDevices[arrayIndices] && ['sensor'].includes(model.singleDevices[arrayIndices].showAs) && !model.singleDevices[arrayIndices].ignoreDevice);"
               }
             },
             "operationTime": {
@@ -288,7 +293,7 @@
               "placeholder": 100,
               "minimum": 20,
               "condition": {
-                "functionBody": "return (model.singleDevices && model.singleDevices[arrayIndices] && (model.singleDevices[arrayIndices].deviceModel === 'gddc5' || ['garage', 'lock'].includes(model.singleDevices[arrayIndices].showAs)));"
+                "functionBody": "return (model.singleDevices && model.singleDevices[arrayIndices] && (model.singleDevices[arrayIndices].deviceModel === 'gddc5' || ['garage', 'lock'].includes(model.singleDevices[arrayIndices].showAs)) && !model.singleDevices[arrayIndices].ignoreDevice);"
               }
             },
             "operationTimeDown": {
@@ -298,7 +303,7 @@
               "placeholder": 100,
               "minimum": 20,
               "condition": {
-                "functionBody": "return (model.singleDevices && model.singleDevices[arrayIndices] && ['garage'].includes(model.singleDevices[arrayIndices].showAs));"
+                "functionBody": "return (model.singleDevices && model.singleDevices[arrayIndices] && ['garage'].includes(model.singleDevices[arrayIndices].showAs) && !model.singleDevices[arrayIndices].ignoreDevice);"
               }
             },
             "sensorId": {
@@ -308,7 +313,7 @@
               "minLength": 10,
               "maxLength": 10,
               "condition": {
-                "functionBody": "return (model.singleDevices && model.singleDevices[arrayIndices] && ['garage', 'lock'].includes(model.singleDevices[arrayIndices].showAs));"
+                "functionBody": "return (model.singleDevices && model.singleDevices[arrayIndices] && ['garage', 'lock'].includes(model.singleDevices[arrayIndices].showAs) && !model.singleDevices[arrayIndices].ignoreDevice);"
               }
             },
             "hideSensor": {
@@ -316,7 +321,7 @@
               "title": "Hide Sensor",
               "description": "Hide this contact sensor accessory from HomeKit.",
               "condition": {
-                "functionBody": "return (model.singleDevices && model.singleDevices[arrayIndices] && model.singleDevices[arrayIndices].sensorId && model.singleDevices[arrayIndices].sensorId.length === 10);"
+                "functionBody": "return (model.singleDevices && model.singleDevices[arrayIndices] && model.singleDevices[arrayIndices].sensorId && model.singleDevices[arrayIndices].sensorId.length === 10 && !model.singleDevices[arrayIndices].ignoreDevice);"
               }
             },
             "obstructId": {
@@ -324,7 +329,7 @@
               "title": "Obstruction Switch",
               "description": "An optional switch that will trigger the Obstruction Detected feature depending on its value. Otherwise leave blank.",
               "condition": {
-                "functionBody": "return (model.singleDevices && model.singleDevices[arrayIndices] && (model.singleDevices[arrayIndices].deviceModel === 'gddc5' || ['garage'].includes(model.singleDevices[arrayIndices].showAs)));"
+                "functionBody": "return (model.singleDevices && model.singleDevices[arrayIndices] && (model.singleDevices[arrayIndices].deviceModel === 'gddc5' || ['garage'].includes(model.singleDevices[arrayIndices].showAs)) && !model.singleDevices[arrayIndices].ignoreDevice);"
               }
             },
             "ipAddress": {
@@ -332,7 +337,7 @@
               "title": "IP Address",
               "description": "You can manually set the IP address for this device if it cannot be discovered by the plugin.",
               "condition": {
-                "functionBody": "return (model.singleDevices && model.singleDevices[arrayIndices] && ['single', 't', 'pow', 'iw', 's', 'micro', 'slampher', 'gddc5'].includes(model.singleDevices[arrayIndices].deviceModel));"
+                "functionBody": "return (model.singleDevices && model.singleDevices[arrayIndices] && ['single', 't', 'pow', 'iw', 's', 'micro', 'slampher', 'gddc5'].includes(model.singleDevices[arrayIndices].deviceModel) && !model.singleDevices[arrayIndices].ignoreDevice);"
               }
             },
             "overrideLogging": {
@@ -358,7 +363,7 @@
                 }
               ],
               "condition": {
-                "functionBody": "return (model.singleDevices && model.singleDevices[arrayIndices] && model.singleDevices[arrayIndices].deviceId && ['single', 't', 'pow', 'iw', 's', 'micro', 'slampher', 'gddc5', 'king', 'zb'].includes(model.singleDevices[arrayIndices].deviceModel));"
+                "functionBody": "return (model.singleDevices && model.singleDevices[arrayIndices] && model.singleDevices[arrayIndices].deviceId && ['single', 't', 'pow', 'iw', 's', 'micro', 'slampher', 'gddc5', 'king', 'zb'].includes(model.singleDevices[arrayIndices].deviceModel) && !model.singleDevices[arrayIndices].ignoreDevice);"
               }
             }
           }
@@ -371,6 +376,11 @@
         "items": {
           "type": "object",
           "properties": {
+            "label": {
+              "title": "Label",
+              "type": "string",
+              "description": "This setting has no effect except to help identify this device."
+            },
             "deviceId": {
               "type": "string",
               "title": "Device ID",
@@ -378,6 +388,14 @@
               "minLength": 10,
               "maxLength": 10
             },
+            "ignoreDevice": {
+              "type": "boolean",
+              "title": "Hide From HomeKit",
+              "description": "If true, this accessory will be removed and ignored from HomeKit.",
+              "condition": {
+                "functionBody": "return (model.multiDevices && model.multiDevices[arrayIndices] && model.multiDevices[arrayIndices].deviceId && model.multiDevices[arrayIndices].deviceId.length === 10);"
+              }
+            },
             "deviceModel": {
               "type": "string",
               "title": "Device Model",
@@ -409,15 +427,7 @@
                 }
               ],
               "condition": {
-                "functionBody": "return (model.multiDevices && model.multiDevices[arrayIndices] && model.multiDevices[arrayIndices].deviceId && model.multiDevices[arrayIndices].deviceId.length === 10);"
-              }
-            },
-            "label": {
-              "title": "Label",
-              "type": "string",
-              "description": "This setting has no effect except to help identify this device.",
-              "condition": {
-                "functionBody": "return (model.multiDevices && model.multiDevices[arrayIndices] && model.multiDevices[arrayIndices].deviceId && model.multiDevices[arrayIndices].deviceId.length === 10);"
+                "functionBody": "return (model.multiDevices && model.multiDevices[arrayIndices] && model.multiDevices[arrayIndices].deviceId && model.multiDevices[arrayIndices].deviceId.length === 10 && !model.multiDevices[arrayIndices].ignoreDevice);"
               }
             },
             "showAs": {
@@ -503,7 +513,7 @@
                 }
               ],
               "condition": {
-                "functionBody": "return (model.multiDevices && model.multiDevices[arrayIndices] && model.multiDevices[arrayIndices].deviceId && ['dual_dualr2', 'dualr3_switch', '4ch', 't', 'zb'].includes(model.multiDevices[arrayIndices].deviceModel));"
+                "functionBody": "return (model.multiDevices && model.multiDevices[arrayIndices] && model.multiDevices[arrayIndices].deviceId && ['dual_dualr2', 'dualr3_switch', '4ch', 't', 'zb'].includes(model.multiDevices[arrayIndices].deviceModel) && !model.multiDevices[arrayIndices].ignoreDevice);"
               }
             },
             "showAsMotor": {
@@ -525,7 +535,7 @@
                 }
               ],
               "condition": {
-                "functionBody": "return (model.multiDevices && model.multiDevices[arrayIndices] && model.multiDevices[arrayIndices].deviceId && ['dualr3_motor'].includes(model.multiDevices[arrayIndices].deviceModel));"
+                "functionBody": "return (model.multiDevices && model.multiDevices[arrayIndices] && model.multiDevices[arrayIndices].deviceId && ['dualr3_motor'].includes(model.multiDevices[arrayIndices].deviceModel) && !model.multiDevices[arrayIndices].ignoreDevice);"
               }
             },
             "hideChannels": {
@@ -533,7 +543,7 @@
               "title": "Hide Channels",
               "description": "A comma separated list of channels to hide for this device. For example '0' or '0,1,2'.",
               "condition": {
-                "functionBody": "return (model.multiDevices && model.multiDevices[arrayIndices] && model.multiDevices[arrayIndices].deviceId && ['dual_dualr2', 'dualr3_switch', '4ch', 't', 'zb'].includes(model.multiDevices[arrayIndices].deviceModel) && ['default', 'outlet'].includes(model.multiDevices[arrayIndices].showAs));"
+                "functionBody": "return (model.multiDevices && model.multiDevices[arrayIndices] && model.multiDevices[arrayIndices].deviceId && ['dual_dualr2', 'dualr3_switch', '4ch', 't', 'zb'].includes(model.multiDevices[arrayIndices].deviceModel) && ['default', 'outlet'].includes(model.multiDevices[arrayIndices].showAs) && !model.multiDevices[arrayIndices].ignoreDevice);"
               }
             },
             "inUsePowerThreshold": {
@@ -543,7 +553,7 @@
               "placeholder": 0,
               "minimum": 0,
               "condition": {
-                "functionBody": "return (model.multiDevices && model.multiDevices[arrayIndices] && model.multiDevices[arrayIndices].deviceId && ['outlet'].includes(model.multiDevices[arrayIndices].showAs) && ['dualr3_switch'].includes(model.multiDevices[arrayIndices].deviceModel));"
+                "functionBody": "return (model.multiDevices && model.multiDevices[arrayIndices] && model.multiDevices[arrayIndices].deviceId && ['outlet'].includes(model.multiDevices[arrayIndices].showAs) && ['dualr3_switch'].includes(model.multiDevices[arrayIndices].deviceModel) && !model.multiDevices[arrayIndices].ignoreDevice);"
               }
             },
             "sensorType": {
@@ -581,7 +591,7 @@
                 }
               ],
               "condition": {
-                "functionBody": "return (model.multiDevices && model.multiDevices[arrayIndices] && ['sensor'].includes(model.multiDevices[arrayIndices].showAs));"
+                "functionBody": "return (model.multiDevices && model.multiDevices[arrayIndices] && ['sensor'].includes(model.multiDevices[arrayIndices].showAs) && !model.multiDevices[arrayIndices].ignoreDevice);"
               }
             },
             "operationTime": {
@@ -591,7 +601,7 @@
               "placeholder": 100,
               "minimum": 20,
               "condition": {
-                "functionBody": "return (model.multiDevices && model.multiDevices[arrayIndices] && ['garage', 'garage_two', 'garage_four', 'blind', 'door', 'window', 'lock'].includes(model.multiDevices[arrayIndices].showAs));"
+                "functionBody": "return (model.multiDevices && model.multiDevices[arrayIndices] && ['garage', 'garage_two', 'garage_four', 'blind', 'door', 'window', 'lock'].includes(model.multiDevices[arrayIndices].showAs) && !model.multiDevices[arrayIndices].ignoreDevice);"
               }
             },
             "operationTimeDown": {
@@ -601,7 +611,7 @@
               "placeholder": 100,
               "minimum": 20,
               "condition": {
-                "functionBody": "return (model.multiDevices && model.multiDevices[arrayIndices] && ['garage', 'garage_two', 'garage_four', 'blind', 'door', 'window'].includes(model.multiDevices[arrayIndices].showAs));"
+                "functionBody": "return (model.multiDevices && model.multiDevices[arrayIndices] && ['garage', 'garage_two', 'garage_four', 'blind', 'door', 'window'].includes(model.multiDevices[arrayIndices].showAs) && !model.multiDevices[arrayIndices].ignoreDevice);"
               }
             },
             "sensorId": {
@@ -611,7 +621,7 @@
               "minLength": 10,
               "maxLength": 10,
               "condition": {
-                "functionBody": "return (model.multiDevices && model.multiDevices[arrayIndices] && ['garage', 'lock'].includes(model.multiDevices[arrayIndices].showAs));"
+                "functionBody": "return (model.multiDevices && model.multiDevices[arrayIndices] && ['garage', 'lock'].includes(model.multiDevices[arrayIndices].showAs) && !model.multiDevices[arrayIndices].ignoreDevice);"
               }
             },
             "hideSensor": {
@@ -619,7 +629,7 @@
               "title": "Hide Sensor",
               "description": "Hide this contact sensor accessory from HomeKit.",
               "condition": {
-                "functionBody": "return (model.multiDevices && model.multiDevices[arrayIndices] && model.multiDevices[arrayIndices].sensorId && model.multiDevices[arrayIndices].sensorId.length === 10);"
+                "functionBody": "return (model.multiDevices && model.multiDevices[arrayIndices] && model.multiDevices[arrayIndices].sensorId && model.multiDevices[arrayIndices].sensorId.length === 10 && !model.multiDevices[arrayIndices].ignoreDevice);"
               }
             },
             "obstructId": {
@@ -627,7 +637,7 @@
               "title": "Obstruction Switch",
               "description": "An optional switch that will trigger the Obstruction Detected feature depending on its value. Otherwise leave blank.",
               "condition": {
-                "functionBody": "return (model.multiDevices && model.multiDevices[arrayIndices] && ['garage'].includes(model.multiDevices[arrayIndices].showAs));"
+                "functionBody": "return (model.multiDevices && model.multiDevices[arrayIndices] && ['garage'].includes(model.multiDevices[arrayIndices].showAs) && !model.multiDevices[arrayIndices].ignoreDevice);"
               }
             },
             "ipAddress": {
@@ -635,7 +645,7 @@
               "title": "IP Address",
               "description": "You can manually set the IP address for this device if it cannot be discovered by the plugin.",
               "condition": {
-                "functionBody": "return (model.mode !== 'wan' && model.multiDevices && model.multiDevices[arrayIndices] && model.multiDevices[arrayIndices].deviceId && ['dual_dualr2', 'dualr3_switch', 'dualr3_motor', '4ch', 't'].includes(model.multiDevices[arrayIndices].deviceModel));"
+                "functionBody": "return (model.mode !== 'wan' && model.multiDevices && model.multiDevices[arrayIndices] && model.multiDevices[arrayIndices].deviceId && ['dual_dualr2', 'dualr3_switch', 'dualr3_motor', '4ch', 't'].includes(model.multiDevices[arrayIndices].deviceModel) && !model.multiDevices[arrayIndices].ignoreDevice);"
               }
             },
             "overrideLogging": {
@@ -661,7 +671,7 @@
                 }
               ],
               "condition": {
-                "functionBody": "return (model.multiDevices && model.multiDevices[arrayIndices] && model.multiDevices[arrayIndices].deviceId && ['dual_dualr2', 'dualr3_switch', 'dualr3_motor', '4ch', 't', 'zb'].includes(model.multiDevices[arrayIndices].deviceModel));"
+                "functionBody": "return (model.multiDevices && model.multiDevices[arrayIndices] && model.multiDevices[arrayIndices].deviceId && ['dual_dualr2', 'dualr3_switch', 'dualr3_motor', '4ch', 't', 'zb'].includes(model.multiDevices[arrayIndices].deviceModel) && !model.multiDevices[arrayIndices].ignoreDevice);"
               }
             }
           }
@@ -674,6 +684,11 @@
         "items": {
           "type": "object",
           "properties": {
+            "label": {
+              "title": "Label",
+              "type": "string",
+              "description": "This setting has no effect except to help identify this device."
+            },
             "deviceId": {
               "type": "string",
               "title": "Device ID",
@@ -681,6 +696,14 @@
               "minLength": 10,
               "maxLength": 10
             },
+            "ignoreDevice": {
+              "type": "boolean",
+              "title": "Hide From HomeKit",
+              "description": "If true, this accessory will be removed and ignored from HomeKit.",
+              "condition": {
+                "functionBody": "return (model.lightDevices && model.lightDevices[arrayIndices] && model.lightDevices[arrayIndices].deviceId && model.lightDevices[arrayIndices].deviceId.length === 10);"
+              }
+            },
             "deviceModel": {
               "type": "string",
               "title": "Device Model",
@@ -728,15 +751,7 @@
                 }
               ],
               "condition": {
-                "functionBody": "return (model.lightDevices && model.lightDevices[arrayIndices] && model.lightDevices[arrayIndices].deviceId && model.lightDevices[arrayIndices].deviceId.length === 10);"
-              }
-            },
-            "label": {
-              "title": "Label",
-              "type": "string",
-              "description": "This setting has no effect except to help identify this device.",
-              "condition": {
-                "functionBody": "return (model.lightDevices && model.lightDevices[arrayIndices] && model.lightDevices[arrayIndices].deviceId && model.lightDevices[arrayIndices].deviceId.length === 10);"
+                "functionBody": "return (model.lightDevices && model.lightDevices[arrayIndices] && model.lightDevices[arrayIndices].deviceId && model.lightDevices[arrayIndices].deviceId.length === 10 && !model.lightDevices[arrayIndices].ignoreDevice);"
               }
             },
             "brightnessStep": {
@@ -746,7 +761,7 @@
               "placeholder": 1,
               "minimum": 1,
               "condition": {
-                "functionBody": "return (model.lightDevices && model.lightDevices[arrayIndices] && ['d1', 'l1', 'bulbB02BA60', 'bulbB05BA60', 'bulbB02FA60', 'bulbB02FST64', 'king', 'zl_d', 'zl_dc'].includes(model.lightDevices[arrayIndices].deviceModel));"
+                "functionBody": "return (model.lightDevices && model.lightDevices[arrayIndices] && ['d1', 'l1', 'bulbB02BA60', 'bulbB05BA60', 'bulbB02FA60', 'bulbB02FST64', 'king', 'zl_d', 'zl_dc'].includes(model.lightDevices[arrayIndices].deviceModel) && !model.lightDevices[arrayIndices].ignoreDevice);"
               }
             },
             "adaptiveLightingShift": {
@@ -756,7 +771,7 @@
               "placeholder": 0,
               "minimum": -1,
               "condition": {
-                "functionBody": "return (model.lightDevices && model.lightDevices[arrayIndices] && ['l1', 'bulbB02BA60', 'bulbB05BA60', 'bulbB02FA60', 'bulbB02FST64', 'zl_dc'].includes(model.lightDevices[arrayIndices].deviceModel));"
+                "functionBody": "return (model.lightDevices && model.lightDevices[arrayIndices] && ['l1', 'bulbB02BA60', 'bulbB05BA60', 'bulbB02FA60', 'bulbB02FST64', 'zl_dc'].includes(model.lightDevices[arrayIndices].deviceModel) && !model.lightDevices[arrayIndices].ignoreDevice);"
               }
             },
             "ipAddress": {
@@ -764,7 +779,7 @@
               "title": "IP Address",
               "description": "You can manually set the IP address for this device if it cannot be discovered by the plugin.",
               "condition": {
-                "functionBody": "return (model.mode !== 'wan' && model.lightDevices && model.lightDevices[arrayIndices] && ['d1'].includes(model.lightDevices[arrayIndices].deviceModel));"
+                "functionBody": "return (model.mode !== 'wan' && model.lightDevices && model.lightDevices[arrayIndices] && ['d1'].includes(model.lightDevices[arrayIndices].deviceModel) && !model.lightDevices[arrayIndices].ignoreDevice);"
               }
             },
             "overrideLogging": {
@@ -790,7 +805,7 @@
                 }
               ],
               "condition": {
-                "functionBody": "return (model.lightDevices && model.lightDevices[arrayIndices] && ['d1', 'b1', 'l1', 'bulbB02BA60', 'bulbB05BA60', 'bulbB02FA60', 'bulbB02FST64', 'king', 'zl_d', 'zl_dc'].includes(model.lightDevices[arrayIndices].deviceModel));"
+                "functionBody": "return (model.lightDevices && model.lightDevices[arrayIndices] && ['d1', 'b1', 'l1', 'bulbB02BA60', 'bulbB05BA60', 'bulbB02FA60', 'bulbB02FST64', 'king', 'zl_d', 'zl_dc'].includes(model.lightDevices[arrayIndices].deviceModel) && !model.lightDevices[arrayIndices].ignoreDevice);"
               }
             }
           }
@@ -803,6 +818,11 @@
         "items": {
           "type": "object",
           "properties": {
+            "label": {
+              "title": "Label",
+              "type": "string",
+              "description": "This setting has no effect except to help identify this device."
+            },
             "deviceId": {
               "type": "string",
               "title": "Device ID",
@@ -810,6 +830,14 @@
               "minLength": 10,
               "maxLength": 10
             },
+            "ignoreDevice": {
+              "type": "boolean",
+              "title": "Hide From HomeKit",
+              "description": "If true, this accessory will be removed and ignored from HomeKit.",
+              "condition": {
+                "functionBody": "return (model.thDevices && model.thDevices[arrayIndices] && model.thDevices[arrayIndices].deviceId && model.thDevices[arrayIndices].deviceId.length === 10);"
+              }
+            },
             "deviceModel": {
               "type": "string",
               "title": "Device Model",
@@ -829,15 +857,7 @@
                 }
               ],
               "condition": {
-                "functionBody": "return (model.thDevices && model.thDevices[arrayIndices] && model.thDevices[arrayIndices].deviceId && model.thDevices[arrayIndices].deviceId.length === 10);"
-              }
-            },
-            "label": {
-              "title": "Label",
-              "type": "string",
-              "description": "This setting has no effect except to help identify this device.",
-              "condition": {
-                "functionBody": "return (model.thDevices && model.thDevices[arrayIndices] && model.thDevices[arrayIndices].deviceId && model.thDevices[arrayIndices].deviceId.length === 10);"
+                "functionBody": "return (model.thDevices && model.thDevices[arrayIndices] && model.thDevices[arrayIndices].deviceId && model.thDevices[arrayIndices].deviceId.length === 10 && !model.thDevices[arrayIndices].ignoreDevice);"
               }
             },
             "showAs": {
@@ -867,7 +887,7 @@
                 }
               ],
               "condition": {
-                "functionBody": "return (model.thDevices && model.thDevices[arrayIndices] && ['th'].includes(model.thDevices[arrayIndices].deviceModel));"
+                "functionBody": "return (model.thDevices && model.thDevices[arrayIndices] && ['th'].includes(model.thDevices[arrayIndices].deviceModel) && !model.thDevices[arrayIndices].ignoreDevice);"
               }
             },
             "hideSwitch": {
@@ -875,7 +895,7 @@
               "title": "Hide Switch",
               "description": "If true, this accessory will hide the TH10/16 switch from HomeKit.",
               "condition": {
-                "functionBody": "return (model.thDevices && model.thDevices[arrayIndices] && ['th'].includes(model.thDevices[arrayIndices].deviceModel) && !['heater', 'cooler', 'humidifier', 'dehumidifier'].includes(model.thDevices[arrayIndices].showAs));"
+                "functionBody": "return (model.thDevices && model.thDevices[arrayIndices] && ['th'].includes(model.thDevices[arrayIndices].deviceModel) && !['heater', 'cooler', 'humidifier', 'dehumidifier'].includes(model.thDevices[arrayIndices].showAs) && !model.thDevices[arrayIndices].ignoreDevice);"
               }
             },
             "offset": {
@@ -884,7 +904,7 @@
               "description": "You can offset the temperature that the sensor reads. An offset of 2 means 2 degrees will be added to the recorded temperature. Can be positive or negative and can include a decimal point '.'.",
               "placeholder": 0,
               "condition": {
-                "functionBody": "return (model.thDevices && model.thDevices[arrayIndices] && ['th', 'sc', 'hc'].includes(model.thDevices[arrayIndices].deviceModel));"
+                "functionBody": "return (model.thDevices && model.thDevices[arrayIndices] && ['th', 'sc', 'hc'].includes(model.thDevices[arrayIndices].deviceModel) && !model.thDevices[arrayIndices].ignoreDevice);"
               }
             },
             "humidityOffset": {
@@ -893,7 +913,7 @@
               "description": "You can offset the humidity that the sensor reads. An offset of 2 means 2% will be added to the recorded relative humidity. Can be positive or negative.",
               "placeholder": 0,
               "condition": {
-                "functionBody": "return (model.thDevices && model.thDevices[arrayIndices] && ['th', 'sc', 'hc'].includes(model.thDevices[arrayIndices].deviceModel));"
+                "functionBody": "return (model.thDevices && model.thDevices[arrayIndices] && ['th', 'sc', 'hc'].includes(model.thDevices[arrayIndices].deviceModel) && !model.thDevices[arrayIndices].ignoreDevice);"
               }
             },
             "minTarget": {
@@ -903,7 +923,7 @@
               "placeholder": 10,
               "minimum": 0,
               "condition": {
-                "functionBody": "return (model.thDevices && model.thDevices[arrayIndices] && ['th'].includes(model.thDevices[arrayIndices].deviceModel) && ['heater', 'cooler'].includes(model.thDevices[arrayIndices].showAs));"
+                "functionBody": "return (model.thDevices && model.thDevices[arrayIndices] && ['th'].includes(model.thDevices[arrayIndices].deviceModel) && ['heater', 'cooler'].includes(model.thDevices[arrayIndices].showAs) && !model.thDevices[arrayIndices].ignoreDevice);"
               }
             },
             "maxTarget": {
@@ -913,7 +933,7 @@
               "placeholder": 30,
               "minimum": 1,
               "condition": {
-                "functionBody": "return (model.thDevices && model.thDevices[arrayIndices] && ['th'].includes(model.thDevices[arrayIndices].deviceModel) && ['heater', 'cooler'].includes(model.thDevices[arrayIndices].showAs));"
+                "functionBody": "return (model.thDevices && model.thDevices[arrayIndices] && ['th'].includes(model.thDevices[arrayIndices].deviceModel) && ['heater', 'cooler'].includes(model.thDevices[arrayIndices].showAs) && !model.thDevices[arrayIndices].ignoreDevice);"
               }
             },
             "ipAddress": {
@@ -921,7 +941,7 @@
               "title": "IP Address",
               "description": "You can manually set the IP address for this Sonoff TH10/16 if it cannot be discovered by the plugin.",
               "condition": {
-                "functionBody": "return (model.mode !== 'wan' && model.thDevices && model.thDevices[arrayIndices] && ['th'].includes(model.thDevices[arrayIndices].deviceModel));"
+                "functionBody": "return (model.mode !== 'wan' && model.thDevices && model.thDevices[arrayIndices] && ['th'].includes(model.thDevices[arrayIndices].deviceModel) && !model.thDevices[arrayIndices].ignoreDevice);"
               }
             },
             "overrideLogging": {
@@ -947,7 +967,7 @@
                 }
               ],
               "condition": {
-                "functionBody": "return (model.thDevices && model.thDevices[arrayIndices] && ['th', 'sc', 'hc'].includes(model.thDevices[arrayIndices].deviceModel));"
+                "functionBody": "return (model.thDevices && model.thDevices[arrayIndices] && ['th', 'sc', 'hc'].includes(model.thDevices[arrayIndices].deviceModel) && !model.thDevices[arrayIndices].ignoreDevice);"
               }
             }
           }
@@ -960,6 +980,11 @@
         "items": {
           "type": "object",
           "properties": {
+            "label": {
+              "title": "Label",
+              "type": "string",
+              "description": "This setting has no effect except to help identify this device."
+            },
             "deviceId": {
               "type": "string",
               "title": "Device ID",
@@ -967,6 +992,14 @@
               "minLength": 10,
               "maxLength": 10
             },
+            "ignoreDevice": {
+              "type": "boolean",
+              "title": "Hide From HomeKit",
+              "description": "If true, this accessory will be removed and ignored from HomeKit.",
+              "condition": {
+                "functionBody": "return (model.fanDevices && model.fanDevices[arrayIndices] && model.fanDevices[arrayIndices].deviceId && model.fanDevices[arrayIndices].deviceId.length === 10);"
+              }
+            },
             "deviceModel": {
               "type": "string",
               "title": "Device Model",
@@ -978,15 +1011,7 @@
                 }
               ],
               "condition": {
-                "functionBody": "return (model.fanDevices && model.fanDevices[arrayIndices] && model.fanDevices[arrayIndices].deviceId && model.fanDevices[arrayIndices].deviceId.length === 10);"
-              }
-            },
-            "label": {
-              "title": "Label",
-              "type": "string",
-              "description": "This setting has no effect except to help identify this device.",
-              "condition": {
-                "functionBody": "return (model.fanDevices && model.fanDevices[arrayIndices] && model.fanDevices[arrayIndices].deviceId && model.fanDevices[arrayIndices].deviceId.length === 10);"
+                "functionBody": "return (model.fanDevices && model.fanDevices[arrayIndices] && model.fanDevices[arrayIndices].deviceId && model.fanDevices[arrayIndices].deviceId.length === 10 && !model.fanDevices[arrayIndices].ignoreDevice);"
               }
             },
             "hideLight": {
@@ -994,7 +1019,7 @@
               "title": "Hide Light Switch",
               "description": "If true, the light switch will be hidden from HomeKit.",
               "condition": {
-                "functionBody": "return (model.fanDevices && model.fanDevices[arrayIndices] && ['ifan'].includes(model.fanDevices[arrayIndices].deviceModel));"
+                "functionBody": "return (model.fanDevices && model.fanDevices[arrayIndices] && ['ifan'].includes(model.fanDevices[arrayIndices].deviceModel) && !model.fanDevices[arrayIndices].ignoreDevice);"
               }
             },
             "ipAddress": {
@@ -1002,7 +1027,7 @@
               "title": "IP Address",
               "description": "You can manually set the IP address for this device if it cannot be discovered by the plugin.",
               "condition": {
-                "functionBody": "return (model.mode !== 'wan' && model.fanDevices && model.fanDevices[arrayIndices] && ['ifan'].includes(model.fanDevices[arrayIndices].deviceModel));"
+                "functionBody": "return (model.mode !== 'wan' && model.fanDevices && model.fanDevices[arrayIndices] && ['ifan'].includes(model.fanDevices[arrayIndices].deviceModel) && !model.fanDevices[arrayIndices].ignoreDevice);"
               }
             },
             "overrideLogging": {
@@ -1028,7 +1053,7 @@
                 }
               ],
               "condition": {
-                "functionBody": "return (model.mode !== 'wan' && model.fanDevices && model.fanDevices[arrayIndices] && ['ifan'].includes(model.fanDevices[arrayIndices].deviceModel));"
+                "functionBody": "return (model.mode !== 'wan' && model.fanDevices && model.fanDevices[arrayIndices] && ['ifan'].includes(model.fanDevices[arrayIndices].deviceModel) && !model.fanDevices[arrayIndices].ignoreDevice);"
               }
             }
           }
@@ -1041,6 +1066,11 @@
         "items": {
           "type": "object",
           "properties": {
+            "label": {
+              "title": "Label",
+              "type": "string",
+              "description": "This setting has no effect except to help identify this device."
+            },
             "deviceId": {
               "type": "string",
               "title": "Device ID",
@@ -1048,6 +1078,14 @@
               "minLength": 10,
               "maxLength": 10
             },
+            "ignoreDevice": {
+              "type": "boolean",
+              "title": "Hide From HomeKit",
+              "description": "If true, this accessory will be removed and ignored from HomeKit.",
+              "condition": {
+                "functionBody": "return (model.sensorDevices && model.sensorDevices[arrayIndices] && model.sensorDevices[arrayIndices].deviceId && model.sensorDevices[arrayIndices].deviceId.length === 10);"
+              }
+            },
             "deviceModel": {
               "type": "string",
               "title": "Device Model",
@@ -1079,15 +1117,7 @@
                 }
               ],
               "condition": {
-                "functionBody": "return (model.sensorDevices && model.sensorDevices[arrayIndices] && model.sensorDevices[arrayIndices].deviceId && model.sensorDevices[arrayIndices].deviceId.length === 10);"
-              }
-            },
-            "label": {
-              "title": "Label",
-              "type": "string",
-              "description": "This setting has no effect except to help identify this device.",
-              "condition": {
-                "functionBody": "return (model.sensorDevices && model.sensorDevices[arrayIndices] && model.sensorDevices[arrayIndices].deviceId && model.sensorDevices[arrayIndices].deviceId.length === 10);"
+                "functionBody": "return (model.sensorDevices && model.sensorDevices[arrayIndices] && model.sensorDevices[arrayIndices].deviceId && model.sensorDevices[arrayIndices].deviceId.length === 10 && !model.sensorDevices[arrayIndices].ignoreDevice);"
               }
             },
             "showAs": {
@@ -1105,7 +1135,7 @@
                 }
               ],
               "condition": {
-                "functionBody": "return (model.sensorDevices && model.sensorDevices[arrayIndices] && ['dw'].includes(model.sensorDevices[arrayIndices].deviceModel));"
+                "functionBody": "return (model.sensorDevices && model.sensorDevices[arrayIndices] && ['dw'].includes(model.sensorDevices[arrayIndices].deviceModel) && !model.sensorDevices[arrayIndices].ignoreDevice);"
               }
             },
             "lowBattThreshold": {
@@ -1115,7 +1145,7 @@
               "placeholder": 25,
               "minimum": 5,
               "condition": {
-                "functionBody": "return (model.sensorDevices && model.sensorDevices[arrayIndices] && ['dw', 'snzb01', 'snzb02', 'snzb03', 'snzb04', 'leak'].includes(model.sensorDevices[arrayIndices].deviceModel));"
+                "functionBody": "return (model.sensorDevices && model.sensorDevices[arrayIndices] && ['dw', 'snzb01', 'snzb02', 'snzb03', 'snzb04', 'leak'].includes(model.sensorDevices[arrayIndices].deviceModel) && !model.sensorDevices[arrayIndices].ignoreDevice);"
               }
             },
             "offset": {
@@ -1124,7 +1154,7 @@
               "description": "You can offset the temperature that the SNZB-02 sensor reads. An offset of 2 means 2 degrees will be added to the recorded temperature. Can be positive or negative and can include a decimal point '.'.",
               "placeholder": 0,
               "condition": {
-                "functionBody": "return (model.sensorDevices && model.sensorDevices[arrayIndices] && ['snzb02'].includes(model.sensorDevices[arrayIndices].deviceModel));"
+                "functionBody": "return (model.sensorDevices && model.sensorDevices[arrayIndices] && ['snzb02'].includes(model.sensorDevices[arrayIndices].deviceModel) && !model.sensorDevices[arrayIndices].ignoreDevice);"
               }
             },
             "humidityOffset": {
@@ -1133,7 +1163,7 @@
               "description": "You can offset the humidity that the SNZB-02 sensor reads. An offset of 2 means 2% will be added to the recorded relative humidity. Can be positive or negative.",
               "placeholder": 0,
               "condition": {
-                "functionBody": "return (model.sensorDevices && model.sensorDevices[arrayIndices] && ['snzb02'].includes(model.sensorDevices[arrayIndices].deviceModel));"
+                "functionBody": "return (model.sensorDevices && model.sensorDevices[arrayIndices] && ['snzb02'].includes(model.sensorDevices[arrayIndices].deviceModel) && !model.sensorDevices[arrayIndices].ignoreDevice);"
               }
             },
             "hideLongDouble": {
@@ -1141,7 +1171,7 @@
               "title": "Hide Long & Double Press",
               "description": "If true, double and long press options will be hidden for this Zigbee Button.",
               "condition": {
-                "functionBody": "return (model.sensorDevices && model.sensorDevices[arrayIndices] && ['snzb01'].includes(model.sensorDevices[arrayIndices].deviceModel));"
+                "functionBody": "return (model.sensorDevices && model.sensorDevices[arrayIndices] && ['snzb01'].includes(model.sensorDevices[arrayIndices].deviceModel) && !model.sensorDevices[arrayIndices].ignoreDevice);"
               }
             },
             "scaleBattery": {
@@ -1149,7 +1179,7 @@
               "title": "Scale Battery",
               "description": "If true, the battery reading for this Zigbee Contact Sensor will be multiplied by 10.",
               "condition": {
-                "functionBody": "return (model.sensorDevices && model.sensorDevices[arrayIndices] && ['snzb04'].includes(model.sensorDevices[arrayIndices].deviceModel));"
+                "functionBody": "return (model.sensorDevices && model.sensorDevices[arrayIndices] && ['snzb04'].includes(model.sensorDevices[arrayIndices].deviceModel) && !model.sensorDevices[arrayIndices].ignoreDevice);"
               }
             },
             "sensorTimeDifference": {
@@ -1159,7 +1189,7 @@
               "placeholder": 60,
               "minimum": 5,
               "condition": {
-                "functionBody": "return (model.sensorDevices && model.sensorDevices[arrayIndices] && ['snzb01', 'snzb03', 'leak'].includes(model.sensorDevices[arrayIndices].deviceModel));"
+                "functionBody": "return (model.sensorDevices && model.sensorDevices[arrayIndices] && ['snzb01', 'snzb03', 'leak'].includes(model.sensorDevices[arrayIndices].deviceModel) && !model.sensorDevices[arrayIndices].ignoreDevice);"
               }
             },
             "overrideLogging": {
@@ -1185,7 +1215,7 @@
                 }
               ],
               "condition": {
-                "functionBody": "return (model.sensorDevices && model.sensorDevices[arrayIndices] && ['dw', 'snzb01', 'snzb02', 'snzb03', 'snzb04', 'leak'].includes(model.sensorDevices[arrayIndices].deviceModel));"
+                "functionBody": "return (model.sensorDevices && model.sensorDevices[arrayIndices] && ['dw', 'snzb01', 'snzb02', 'snzb03', 'snzb04', 'leak'].includes(model.sensorDevices[arrayIndices].deviceModel) && !model.sensorDevices[arrayIndices].ignoreDevice);"
               }
             }
           }
@@ -1198,6 +1228,11 @@
         "items": {
           "type": "object",
           "properties": {
+            "label": {
+              "title": "Label",
+              "type": "string",
+              "description": "This setting has no effect except to help identify this device."
+            },
             "deviceId": {
               "type": "string",
               "title": "Device ID",
@@ -1205,10 +1240,10 @@
               "minLength": 10,
               "maxLength": 10
             },
-            "label": {
-              "title": "Label",
-              "type": "string",
-              "description": "This setting has no effect except to help identify this device.",
+            "ignoreDevice": {
+              "type": "boolean",
+              "title": "Hide From HomeKit",
+              "description": "If true, this accessory will be removed and ignored from HomeKit.",
               "condition": {
                 "functionBody": "return (model.rfDevices && model.rfDevices[arrayIndices] && model.rfDevices[arrayIndices].deviceId && model.rfDevices[arrayIndices].deviceId.length === 10);"
               }
@@ -1218,7 +1253,7 @@
               "type": "boolean",
               "description": "If true, the plugin will remove and re-add all subdevices when the plugin initialises. Useful if adding or removing subdevices via the eWeLink app.",
               "condition": {
-                "functionBody": "return (model.rfDevices && model.rfDevices[arrayIndices] && model.rfDevices[arrayIndices].deviceId && model.rfDevices[arrayIndices].deviceId.length === 10);"
+                "functionBody": "return (model.rfDevices && model.rfDevices[arrayIndices] && model.rfDevices[arrayIndices].deviceId && model.rfDevices[arrayIndices].deviceId.length === 10 && !model.rfDevices[arrayIndices].ignoreDevice);"
               }
             },
             "ipAddress": {
@@ -1226,7 +1261,7 @@
               "title": "IP Address",
               "description": "You can manually set the IP address for this device if it cannot be discovered by the plugin.",
               "condition": {
-                "functionBody": "return (model.mode !== 'wan' && model.rfDevices && model.rfDevices[arrayIndices] && model.rfDevices[arrayIndices].deviceId && model.rfDevices[arrayIndices].deviceId.length === 10);"
+                "functionBody": "return (model.mode !== 'wan' && model.rfDevices && model.rfDevices[arrayIndices] && model.rfDevices[arrayIndices].deviceId && model.rfDevices[arrayIndices].deviceId.length === 10 && !model.rfDevices[arrayIndices].ignoreDevice);"
               }
             },
             "overrideLogging": {
@@ -1252,7 +1287,7 @@
                 }
               ],
               "condition": {
-                "functionBody": "return (model.rfDevices && model.rfDevices[arrayIndices] && model.rfDevices[arrayIndices].deviceId && model.rfDevices[arrayIndices].deviceId.length === 10);"
+                "functionBody": "return (model.rfDevices && model.rfDevices[arrayIndices] && model.rfDevices[arrayIndices].deviceId && model.rfDevices[arrayIndices].deviceId.length === 10 && !model.rfDevices[arrayIndices].ignoreDevice);"
               }
             }
           }
@@ -1265,6 +1300,11 @@
         "items": {
           "type": "object",
           "properties": {
+            "label": {
+              "title": "Label",
+              "type": "string",
+              "description": "This setting has no effect except to help identify this device."
+            },
             "fullDeviceId": {
               "type": "string",
               "title": "Sensor Device ID",
@@ -1272,14 +1312,6 @@
               "minLength": 13,
               "maxLength": 15
             },
-            "label": {
-              "title": "Label",
-              "type": "string",
-              "description": "This setting has no effect except to help identify this device.",
-              "condition": {
-                "functionBody": "return (model.bridgeSensors && model.bridgeSensors[arrayIndices] && model.bridgeSensors[arrayIndices].fullDeviceId && model.bridgeSensors[arrayIndices].fullDeviceId.length >= 13);"
-              }
-            },
             "type": {
               "type": "string",
               "title": "Sensor Type",
@@ -1593,9 +1625,10 @@
         {
           "type": "fieldset",
           "items": [
+            "singleDevices[].label",
             "singleDevices[].deviceId",
+            "singleDevices[].ignoreDevice",
             "singleDevices[].deviceModel",
-            "singleDevices[].label",
             "singleDevices[].showAs",
             "singleDevices[].inUsePowerThreshold",
             "singleDevices[].operationTime",
@@ -1621,9 +1654,10 @@
         {
           "type": "fieldset",
           "items": [
+            "multiDevices[].label",
             "multiDevices[].deviceId",
+            "multiDevices[].ignoreDevice",
             "multiDevices[].deviceModel",
-            "multiDevices[].label",
             "multiDevices[].showAs",
             "multiDevices[].showAsMotor",
             "multiDevices[].hideChannels",
@@ -1651,9 +1685,10 @@
         {
           "type": "fieldset",
           "items": [
+            "lightDevices[].label",
             "lightDevices[].deviceId",
+            "lightDevices[].ignoreDevice",
             "lightDevices[].deviceModel",
-            "lightDevices[].label",
             "lightDevices[].brightnessStep",
             "lightDevices[].adaptiveLightingShift",
             "lightDevices[].ipAddress",
@@ -1673,9 +1708,10 @@
         {
           "type": "fieldset",
           "items": [
+            "thDevices[].label",
             "thDevices[].deviceId",
+            "thDevices[].ignoreDevice",
             "thDevices[].deviceModel",
-            "thDevices[].label",
             "thDevices[].showAs",
             "thDevices[].hideSwitch",
             "thDevices[].offset",
@@ -1699,9 +1735,10 @@
         {
           "type": "fieldset",
           "items": [
+            "fanDevices[].label",
             "fanDevices[].deviceId",
+            "fanDevices[].ignoreDevice",
             "fanDevices[].deviceModel",
-            "fanDevices[].label",
             "fanDevices[].hideLight",
             "fanDevices[].ipAddress",
             "fanDevices[].overrideLogging"
@@ -1720,9 +1757,10 @@
         {
           "type": "fieldset",
           "items": [
+            "sensorDevices[].label",
             "sensorDevices[].deviceId",
+            "sensorDevices[].ignoreDevice",
             "sensorDevices[].deviceModel",
-            "sensorDevices[].label",
             "sensorDevices[].showAs",
             "sensorDevices[].lowBattThreshold",
             "sensorDevices[].offset",
@@ -1746,8 +1784,9 @@
         {
           "type": "fieldset",
           "items": [
-            "rfDevices[].deviceId",
             "rfDevices[].label",
+            "rfDevices[].deviceId",
+            "rfDevices[].ignoreDevice",
             "rfDevices[].resetOnStartup",
             "rfDevices[].ipAddress",
             "rfDevices[].overrideLogging"
@@ -1766,8 +1805,8 @@
         {
           "type": "fieldset",
           "items": [
-            "bridgeSensors[].fullDeviceId",
             "bridgeSensors[].label",
+            "bridgeSensors[].fullDeviceId",
             "bridgeSensors[].type",
             "bridgeSensors[].sensorTimeLength",
             "bridgeSensors[].sensorTimeDifference",
diff --git a/lib/index.js b/lib/index.js
index d2f7ae9c..2a80ca12 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -327,6 +327,14 @@ class eWeLinkPlatform {
                     }
                     break
                   }
+                  case 'ignoreDevice':
+                    if (typeof v === 'string') {
+                      logQuotes(key + '.' + id + '.' + k)
+                    }
+                    if (!!v && v !== 'false' && !this.config.ignoredDevices.includes(id)) {
+                      this.config.ignoredDevices.push(id)
+                    }
+                    break
                   case 'ipAddress': {
                     if (typeof v !== 'string' || v === '') {
                       logIgnore(key + '.' + id + '.' + k)
@@ -492,7 +500,10 @@ class eWeLinkPlatform {
           if (Array.isArray(val)) {
             if (val.length > 0) {
               val.forEach(deviceId => {
-                this.config.ignoredDevices.push(this.funcs.parseDeviceId(deviceId))
+                deviceId = this.funcs.parseDeviceId(deviceId)
+                if (!this.config.ignoredDevices.includes(deviceId)) {
+                  this.config.ignoredDevices.push(deviceId)
+                }
               })
             } else {
               logRemove(key)
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 17257020..c2ca2d76 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -80,6 +80,7 @@ module.exports = {
     modes: ['auto', 'wan', 'lan'],
     singleDevices: [
       'deviceId',
+      'ignoreDevice',
       'deviceModel',
       'label',
       'showAs',
@@ -95,6 +96,7 @@ module.exports = {
     ],
     multiDevices: [
       'deviceId',
+      'ignoreDevice',
       'deviceModel',
       'label',
       'showAs',
@@ -112,6 +114,7 @@ module.exports = {
     ],
     lightDevices: [
       'deviceId',
+      'ignoreDevice',
       'deviceModel',
       'label',
       'brightnessStep',
@@ -121,6 +124,7 @@ module.exports = {
     ],
     thDevices: [
       'deviceId',
+      'ignoreDevice',
       'deviceModel',
       'label',
       'showAs',
@@ -132,9 +136,18 @@ module.exports = {
       'ipAddress',
       'overrideLogging'
     ],
-    fanDevices: ['deviceId', 'deviceModel', 'label', 'hideLight', 'ipAddress', 'overrideLogging'],
+    fanDevices: [
+      'deviceId',
+      'ignoreDevice',
+      'deviceModel',
+      'label',
+      'hideLight',
+      'ipAddress',
+      'overrideLogging'
+    ],
     sensorDevices: [
       'deviceId',
+      'ignoreDevice',
       'deviceModel',
       'label',
       'showAs',
@@ -146,7 +159,14 @@ module.exports = {
       'sensorTimeDifference',
       'overrideLogging'
     ],
-    rfDevices: ['deviceId', 'label', 'resetOnStartup', 'ipAddress', 'overrideLogging'],
+    rfDevices: [
+      'deviceId',
+      'ignoreDevice',
+      'label',
+      'resetOnStartup',
+      'ipAddress',
+      'overrideLogging'
+    ],
     models: {
       singleDevices: ['single', 't', 'pow', 'iw', 's', 'micro', 'slampher', 'gddc5', 'king', 'zb'],
       multiDevices: ['dual_dualr2', 'dualr3_switch', 'dualr3_motor', '4ch', 't'],

From 02ce757ffa0feb743edc59c15e577322a98000a1 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 9 Jul 2021 13:48:38 +0100
Subject: [PATCH 2535/3183] reorder for schema layout

---
 lib/utils/constants.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index c2ca2d76..bc60b342 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -79,10 +79,10 @@ module.exports = {
     ],
     modes: ['auto', 'wan', 'lan'],
     singleDevices: [
+      'label',
       'deviceId',
       'ignoreDevice',
       'deviceModel',
-      'label',
       'showAs',
       'inUsePowerThreshold',
       'operationTime',
@@ -95,10 +95,10 @@ module.exports = {
       'overrideLogging'
     ],
     multiDevices: [
+      'label',
       'deviceId',
       'ignoreDevice',
       'deviceModel',
-      'label',
       'showAs',
       'showAsMotor',
       'hideChannels',
@@ -113,20 +113,20 @@ module.exports = {
       'overrideLogging'
     ],
     lightDevices: [
+      'label',
       'deviceId',
       'ignoreDevice',
       'deviceModel',
-      'label',
       'brightnessStep',
       'adaptiveLightingShift',
       'ipAddress',
       'overrideLogging'
     ],
     thDevices: [
+      'label',
       'deviceId',
       'ignoreDevice',
       'deviceModel',
-      'label',
       'showAs',
       'hideSwitch',
       'offset',
@@ -137,19 +137,19 @@ module.exports = {
       'overrideLogging'
     ],
     fanDevices: [
+      'label',
       'deviceId',
       'ignoreDevice',
       'deviceModel',
-      'label',
       'hideLight',
       'ipAddress',
       'overrideLogging'
     ],
     sensorDevices: [
+      'label',
       'deviceId',
       'ignoreDevice',
       'deviceModel',
-      'label',
       'showAs',
       'lowBattThreshold',
       'offset',
@@ -160,9 +160,9 @@ module.exports = {
       'overrideLogging'
     ],
     rfDevices: [
+      'label',
       'deviceId',
       'ignoreDevice',
-      'label',
       'resetOnStartup',
       'ipAddress',
       'overrideLogging'

From 43e437907565dc9dd3adffbdcb4804fb90ad3145 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 9 Jul 2021 18:01:38 +0100
Subject: [PATCH 2536/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 135ab33a..6d4ce764 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,7 +6,14 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 ### Added
 
-- Support for Zigbee multi-channel devices
+- **New Devices**
+  - Support for Zigbee multi-channel devices
+
+### Changed
+
+- **Homebridge UI**
+  - `label` field now appears first in the device configuration sections
+  - A device can now be ignored/removed from Homebridge by the `ignoreDevice` setting in the device configuration sections
 
 ## 7.0.2 (2021-07-08)
 

From bdaf688584a1fc3cfffef036ac6ed154590ae228 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 9 Jul 2021 18:15:44 +0100
Subject: [PATCH 2537/3183] 7.1.0-beta.1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 18d74761..f541156f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "7.1.0-beta.0",
+  "version": "7.1.0-beta.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 17378ff2..c9b5d8bc 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "7.1.0-beta.0",
+  "version": "7.1.0-beta.1",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From f3e93f60397d221585d1163f82233dbbcc066941 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 10 Jul 2021 10:18:22 +0100
Subject: [PATCH 2538/3183] bump ws to 7.5.3

---
 package-lock.json | 6 +++---
 package.json      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index f541156f..0dad3840 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -291,9 +291,9 @@
       }
     },
     "ws": {
-      "version": "7.5.2",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.2.tgz",
-      "integrity": "sha512-lkF7AWRicoB9mAgjeKbGqVUekLnSNO4VjKVnuPHpQeOxZOErX6BPXwJk70nFslRCEEA8EVW7ZjKwXaP9N+1sKQ=="
+      "version": "7.5.3",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.3.tgz",
+      "integrity": "sha512-kQ/dHIzuLrS6Je9+uv81ueZomEwH0qVYstcAQ4/Z93K8zeko9gtAbttJWzoC5ukqXY1PpoouV3+VSOqEAFt5wg=="
     }
   }
 }
diff --git a/package.json b/package.json
index c9b5d8bc..c4b4a5fe 100644
--- a/package.json
+++ b/package.json
@@ -53,7 +53,7 @@
     "node-persist": "^3.1.0",
     "p-queue": "^6.6.2",
     "websocket-as-promised": "^2.0.1",
-    "ws": "^7.5.2"
+    "ws": "^7.5.3"
   },
   "prettier": {
     "printWidth": 100

From 5176351bb8a418b616cd7ba89fcac3b3f28f41ab Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 10 Jul 2021 10:18:52 +0100
Subject: [PATCH 2539/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6d4ce764..35dc726a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 - **Homebridge UI**
   - `label` field now appears first in the device configuration sections
   - A device can now be ignored/removed from Homebridge by the `ignoreDevice` setting in the device configuration sections
+- Bump `ws` dependency to v7.5.3
 
 ## 7.0.2 (2021-07-08)
 

From 8c764880bd164ecf6c821a0b09b3b5815f5a4ddb Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 10 Jul 2021 10:26:01 +0100
Subject: [PATCH 2540/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 35dc726a..87f5c8d0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 All notable changes to this homebridge-ewelink will be documented in this file.
 
-## BETA
+## 7.1.0 (2021-07-10)
 
 ### Added
 

From 9a46d8ab3584bc0d23ae703453b8eccb7369d3b6 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 10 Jul 2021 10:26:26 +0100
Subject: [PATCH 2541/3183] 7.1.0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 0dad3840..232d6a74 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "7.1.0-beta.1",
+  "version": "7.1.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index c4b4a5fe..0ca4062e 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "7.1.0-beta.1",
+  "version": "7.1.0",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 691ed373ced2902ccc97f13ac48f6f6840c9762d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 10 Jul 2021 10:49:33 +0100
Subject: [PATCH 2542/3183] add zigbee to kw

---
 package.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 0ca4062e..1e171afd 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,8 @@
     "siri",
     "ewelink",
     "sonoff",
-    "eachen"
+    "eachen",
+    "zigbee"
   ],
   "main": "lib/index.js",
   "engines": {

From 7585ddd6dc1c6ca0ccefdc5fa791e3c29bb3e09c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 15 Jul 2021 21:30:59 +0100
Subject: [PATCH 2543/3183] add extra http code to retry codes

---
 lib/utils/constants.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index bc60b342..4b9c87cb 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -67,7 +67,7 @@ module.exports = {
 
   appSecret: '6Nz4n0xA8s8qdxQf2GqurZj2Fs55FUvM',
 
-  httpRetryCodes: ['ENOTFOUND', 'ETIMEDOUT', 'EAI_AGAIN'],
+  httpRetryCodes: ['ENOTFOUND', 'ETIMEDOUT', 'EAI_AGAIN', 'ECONNABORTED'],
 
   allowed: {
     httpHosts: [

From 1ee51aa5414dad777439c60481a92d2c3ad1ae37 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 15 Jul 2021 21:31:03 +0100
Subject: [PATCH 2544/3183] Update package-lock.json

---
 package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 232d6a74..9da90d11 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -176,9 +176,9 @@
       "integrity": "sha512-/j+fd/u71wNgKf3V2bx4tnDm+3GvLnlCuvf2MXbJ3wern+67IAb6zN9Leu1tCWPlPNZ+v1hLSibVukkPK2HqJw=="
     },
     "object-inspect": {
-      "version": "1.10.3",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.10.3.tgz",
-      "integrity": "sha512-e5mCJlSH7poANfC8z8S9s9S2IN5/4Zb3aZ33f5s8YqoazCFzNLloLU8r5VCG+G7WoqLvAAZoVMcy3tp/3X0Plw=="
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.0.tgz",
+      "integrity": "sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg=="
     },
     "object-keys": {
       "version": "1.1.1",

From bde87608b8fb2c9dfed2bd7fff58c01dd8ff1afa Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 15 Jul 2021 21:31:12 +0100
Subject: [PATCH 2545/3183] bump node

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 1e171afd..f7ca04b6 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
   "main": "lib/index.js",
   "engines": {
     "homebridge": "^1.3.3",
-    "node": "^14.17.2 || ^16.4.1"
+    "node": "^14.17.2 || ^16.5.0"
   },
   "repository": {
     "type": "git",

From 93c8863ca0b9ed3ae2e8b0ab4b10a80a17c15ce6 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 16 Jul 2021 20:12:28 +0100
Subject: [PATCH 2546/3183] statusLowBattery char needs INT

---
 lib/device/sensor-contact.js            | 2 +-
 lib/device/simulation/sensor-leak.js    | 2 +-
 lib/device/simulation/sensor-visible.js | 2 +-
 lib/device/zigbee/sensor-ambient.js     | 2 +-
 lib/device/zigbee/sensor-contact.js     | 2 +-
 lib/device/zigbee/sensor-leak.js        | 2 +-
 lib/device/zigbee/sensor-motion.js      | 2 +-
 lib/device/zigbee/switch-stateless.js   | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/device/sensor-contact.js b/lib/device/sensor-contact.js
index 61d2bc1b..7dcf0031 100644
--- a/lib/device/sensor-contact.js
+++ b/lib/device/sensor-contact.js
@@ -93,7 +93,7 @@ module.exports = class deviceSensorContact {
         this.batteryService.updateCharacteristic(this.hapChar.BatteryLevel, this.cacheBattScaled)
         this.batteryService.updateCharacteristic(
           this.hapChar.StatusLowBattery,
-          this.cacheBattScaled < this.lowBattThreshold
+          this.cacheBattScaled < this.lowBattThreshold ? 1 : 0
         )
         if (params.updateSource && this.enableLogging) {
           this.log('[%s] %s [%s%].', this.name, this.lang.curBatt, this.cacheBattScaled)
diff --git a/lib/device/simulation/sensor-leak.js b/lib/device/simulation/sensor-leak.js
index f995f22c..c97370e3 100644
--- a/lib/device/simulation/sensor-leak.js
+++ b/lib/device/simulation/sensor-leak.js
@@ -83,7 +83,7 @@ module.exports = class deviceSensorLeak {
         this.batteryService.updateCharacteristic(this.hapChar.BatteryLevel, this.cacheBattScaled)
         this.batteryService.updateCharacteristic(
           this.hapChar.StatusLowBattery,
-          this.cacheBattScaled < this.lowBattThreshold
+          this.cacheBattScaled < this.lowBattThreshold ? 1 : 0
         )
         if (params.updateSource && this.enableLogging) {
           this.log('[%s] %s [%s%].', this.name, this.lang.curBatt, this.cacheBattScaled)
diff --git a/lib/device/simulation/sensor-visible.js b/lib/device/simulation/sensor-visible.js
index 98f72581..a44e5064 100644
--- a/lib/device/simulation/sensor-visible.js
+++ b/lib/device/simulation/sensor-visible.js
@@ -101,7 +101,7 @@ module.exports = class deviceSensorVisible {
         this.batteryService.updateCharacteristic(this.hapChar.BatteryLevel, this.cacheBattScaled)
         this.batteryService.updateCharacteristic(
           this.hapChar.StatusLowBattery,
-          this.cacheBattScaled < this.lowBattThreshold
+          this.cacheBattScaled < this.lowBattThreshold ? 1 : 0
         )
         if (params.updateSource && this.enableLogging) {
           this.log('[%s] %s [%s%].', this.name, this.lang.curBatt, this.cacheBattScaled)
diff --git a/lib/device/zigbee/sensor-ambient.js b/lib/device/zigbee/sensor-ambient.js
index 0a5758e6..580f5bae 100644
--- a/lib/device/zigbee/sensor-ambient.js
+++ b/lib/device/zigbee/sensor-ambient.js
@@ -92,7 +92,7 @@ module.exports = class deviceZBSensorAmbient {
         this.battService.updateCharacteristic(this.hapChar.BatteryLevel, this.cacheBattScaled)
         this.battService.updateCharacteristic(
           this.hapChar.StatusLowBattery,
-          this.cacheBattScaled < this.lowBattThreshold
+          this.cacheBattScaled < this.lowBattThreshold ? 1 : 0
         )
         if (params.updateSource && this.enableLogging) {
           this.log('[%s] %s [%s%].', this.name, this.lang.curBatt, this.cacheBattScaled)
diff --git a/lib/device/zigbee/sensor-contact.js b/lib/device/zigbee/sensor-contact.js
index 1fdf9876..2accc795 100644
--- a/lib/device/zigbee/sensor-contact.js
+++ b/lib/device/zigbee/sensor-contact.js
@@ -89,7 +89,7 @@ module.exports = class deviceZBSensorContact {
         this.battService.updateCharacteristic(this.hapChar.BatteryLevel, this.cacheBattScaled)
         this.battService.updateCharacteristic(
           this.hapChar.StatusLowBattery,
-          this.cacheBattScaled < this.lowBattThreshold
+          this.cacheBattScaled < this.lowBattThreshold ? 1 : 0
         )
         if (params.updateSource && this.enableLogging) {
           this.log('[%s] %s [%s%].', this.name, this.lang.curBatt, this.cacheBattScaled)
diff --git a/lib/device/zigbee/sensor-leak.js b/lib/device/zigbee/sensor-leak.js
index d12d379b..1bd1090f 100644
--- a/lib/device/zigbee/sensor-leak.js
+++ b/lib/device/zigbee/sensor-leak.js
@@ -81,7 +81,7 @@ module.exports = class deviceZBSensorLeak {
         this.battService.updateCharacteristic(this.hapChar.BatteryLevel, this.cacheBattScaled)
         this.battService.updateCharacteristic(
           this.hapChar.StatusLowBattery,
-          this.cacheBattScaled < this.lowBattThreshold
+          this.cacheBattScaled < this.lowBattThreshold ? 1 : 0
         )
         if (params.updateSource && this.enableLogging) {
           this.log('[%s] %s [%s%].', this.name, this.lang.curBatt, this.cacheBattScaled)
diff --git a/lib/device/zigbee/sensor-motion.js b/lib/device/zigbee/sensor-motion.js
index 9abb4e7e..5ae49b41 100644
--- a/lib/device/zigbee/sensor-motion.js
+++ b/lib/device/zigbee/sensor-motion.js
@@ -81,7 +81,7 @@ module.exports = class deviceZBSensorMotion {
         this.battService.updateCharacteristic(this.hapChar.BatteryLevel, this.cacheBattScaled)
         this.battService.updateCharacteristic(
           this.hapChar.StatusLowBattery,
-          this.cacheBattScaled < this.lowBattThreshold
+          this.cacheBattScaled < this.lowBattThreshold ? 1 : 0
         )
         if (params.updateSource && this.enableLogging) {
           this.log('[%s] %s [%s%].', this.name, this.lang.curBatt, this.cacheBattScaled)
diff --git a/lib/device/zigbee/switch-stateless.js b/lib/device/zigbee/switch-stateless.js
index 30c2e24f..801fc919 100644
--- a/lib/device/zigbee/switch-stateless.js
+++ b/lib/device/zigbee/switch-stateless.js
@@ -83,7 +83,7 @@ module.exports = class deviceZBSwitchStateless {
         this.battService.updateCharacteristic(this.hapChar.BatteryLevel, this.cacheBattScaled)
         this.battService.updateCharacteristic(
           this.hapChar.StatusLowBattery,
-          this.cacheBattScaled < this.lowBattThreshold
+          this.cacheBattScaled < this.lowBattThreshold ? 1 : 0
         )
         if (params.updateSource && this.enableLogging) {
           this.log('[%s] %s [%s%].', this.name, this.lang.curBatt, this.cacheBattScaled)

From 702a5d28dcd99324177382c0fb8275f09d64892c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 16 Jul 2021 20:21:26 +0100
Subject: [PATCH 2547/3183] use Battery in favour of BatteryService

---
 lib/device/sensor-contact.js            | 4 ++--
 lib/device/simulation/sensor-leak.js    | 4 ++--
 lib/device/simulation/sensor-visible.js | 4 ++--
 lib/device/zigbee/sensor-ambient.js     | 4 ++--
 lib/device/zigbee/sensor-contact.js     | 4 ++--
 lib/device/zigbee/sensor-leak.js        | 4 ++--
 lib/device/zigbee/sensor-motion.js      | 4 ++--
 lib/device/zigbee/switch-stateless.js   | 4 ++--
 8 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/lib/device/sensor-contact.js b/lib/device/sensor-contact.js
index 7dcf0031..af28f6fe 100644
--- a/lib/device/sensor-contact.js
+++ b/lib/device/sensor-contact.js
@@ -67,8 +67,8 @@ module.exports = class deviceSensorContact {
 
     // Add the battery service if it doesn't already exist
     this.batteryService =
-      this.accessory.getService(this.hapServ.BatteryService) ||
-      this.accessory.addService(this.hapServ.BatteryService)
+      this.accessory.getService(this.hapServ.Battery) ||
+      this.accessory.addService(this.hapServ.Battery)
 
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new platform.eveService('door', this.accessory, {
diff --git a/lib/device/simulation/sensor-leak.js b/lib/device/simulation/sensor-leak.js
index c97370e3..651a3d4e 100644
--- a/lib/device/simulation/sensor-leak.js
+++ b/lib/device/simulation/sensor-leak.js
@@ -57,8 +57,8 @@ module.exports = class deviceSensorLeak {
 
     // Add the battery service if it doesn't already exist
     this.batteryService =
-      this.accessory.getService(this.hapServ.BatteryService) ||
-      this.accessory.addService(this.hapServ.BatteryService)
+      this.accessory.getService(this.hapServ.Battery) ||
+      this.accessory.addService(this.hapServ.Battery)
 
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new platform.eveService('motion', this.accessory, {
diff --git a/lib/device/simulation/sensor-visible.js b/lib/device/simulation/sensor-visible.js
index a44e5064..787bb5c8 100644
--- a/lib/device/simulation/sensor-visible.js
+++ b/lib/device/simulation/sensor-visible.js
@@ -71,8 +71,8 @@ module.exports = class deviceSensorVisible {
 
     // Add the battery service if it doesn't already exist
     this.batteryService =
-      this.accessory.getService(this.hapServ.BatteryService) ||
-      this.accessory.addService(this.hapServ.BatteryService)
+      this.accessory.getService(this.hapServ.Battery) ||
+      this.accessory.addService(this.hapServ.Battery)
 
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new platform.eveService('door', this.accessory, {
diff --git a/lib/device/zigbee/sensor-ambient.js b/lib/device/zigbee/sensor-ambient.js
index 580f5bae..73c77920 100644
--- a/lib/device/zigbee/sensor-ambient.js
+++ b/lib/device/zigbee/sensor-ambient.js
@@ -66,8 +66,8 @@ module.exports = class deviceZBSensorAmbient {
 
     // Add the battery service if it doesn't already exist
     this.battService =
-      this.accessory.getService(this.hapServ.BatteryService) ||
-      this.accessory.addService(this.hapServ.BatteryService)
+      this.accessory.getService(this.hapServ.Battery) ||
+      this.accessory.addService(this.hapServ.Battery)
 
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new platform.eveService('weather', this.accessory, {
diff --git a/lib/device/zigbee/sensor-contact.js b/lib/device/zigbee/sensor-contact.js
index 2accc795..70e371b0 100644
--- a/lib/device/zigbee/sensor-contact.js
+++ b/lib/device/zigbee/sensor-contact.js
@@ -63,8 +63,8 @@ module.exports = class deviceZBSensorContact {
 
     // Add the battery service if it doesn't already exist
     this.battService =
-      this.accessory.getService(this.hapServ.BatteryService) ||
-      this.accessory.addService(this.hapServ.BatteryService)
+      this.accessory.getService(this.hapServ.Battery) ||
+      this.accessory.addService(this.hapServ.Battery)
 
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new platform.eveService('door', this.accessory, {
diff --git a/lib/device/zigbee/sensor-leak.js b/lib/device/zigbee/sensor-leak.js
index 1bd1090f..0bf8ab23 100644
--- a/lib/device/zigbee/sensor-leak.js
+++ b/lib/device/zigbee/sensor-leak.js
@@ -56,8 +56,8 @@ module.exports = class deviceZBSensorLeak {
 
     // Add the battery service if it doesn't already exist
     this.battService =
-      this.accessory.getService(this.hapServ.BatteryService) ||
-      this.accessory.addService(this.hapServ.BatteryService)
+      this.accessory.getService(this.hapServ.Battery) ||
+      this.accessory.addService(this.hapServ.Battery)
 
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new platform.eveService('motion', this.accessory, {
diff --git a/lib/device/zigbee/sensor-motion.js b/lib/device/zigbee/sensor-motion.js
index 5ae49b41..7d4d9ece 100644
--- a/lib/device/zigbee/sensor-motion.js
+++ b/lib/device/zigbee/sensor-motion.js
@@ -56,8 +56,8 @@ module.exports = class deviceZBSensorMotion {
 
     // Add the battery service if it doesn't already exist
     this.battService =
-      this.accessory.getService(this.hapServ.BatteryService) ||
-      this.accessory.addService(this.hapServ.BatteryService)
+      this.accessory.getService(this.hapServ.Battery) ||
+      this.accessory.addService(this.hapServ.Battery)
 
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new platform.eveService('motion', this.accessory, {
diff --git a/lib/device/zigbee/switch-stateless.js b/lib/device/zigbee/switch-stateless.js
index 801fc919..1b984168 100644
--- a/lib/device/zigbee/switch-stateless.js
+++ b/lib/device/zigbee/switch-stateless.js
@@ -62,8 +62,8 @@ module.exports = class deviceZBSwitchStateless {
 
     // Add the battery service if it doesn't already exist
     this.battService =
-      this.accessory.getService(this.hapServ.BatteryService) ||
-      this.accessory.addService(this.hapServ.BatteryService)
+      this.accessory.getService(this.hapServ.Battery) ||
+      this.accessory.addService(this.hapServ.Battery)
 
     // Output the customised options to the log
     const opts = JSON.stringify({

From 1fca2d3f629648e3a828e6788f6e7b11aca48359 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 17 Jul 2021 07:49:11 +0100
Subject: [PATCH 2548/3183] hide stack for some error messages

---
 lib/connection/lan.js  | 10 ++++++++--
 lib/index.js           | 19 +++++++------------
 lib/utils/functions.js |  4 ++--
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/lib/connection/lan.js b/lib/connection/lan.js
index 51139dd8..297df75d 100644
--- a/lib/connection/lan.js
+++ b/lib/connection/lan.js
@@ -99,8 +99,14 @@ module.exports = class connectionLAN {
             let params
             try {
               params = JSON.parse(pText)
-            } catch (e) {
-              this.log.warn('[%s] %s %s:\n%s', rdata.id, this.lang.cantReadPacket, e.message, pText)
+            } catch (err) {
+              this.log.warn(
+                '[%s] %s %s:\n%s',
+                rdata.id,
+                this.lang.cantReadPacket,
+                err.message,
+                pText
+              )
               return
             }
 
diff --git a/lib/index.js b/lib/index.js
index 2a80ca12..2f7debb9 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -84,8 +84,7 @@ class eWeLinkPlatform {
       this.api.on('shutdown', () => this.pluginShutdown())
     } catch (err) {
       // Catch any errors during initialisation
-      const hideErrLines = [this.lang.hbVersionFail, this.lang.pluginNotConf]
-      const eText = hideErrLines.includes(err.message) ? err.message : this.funcs.parseError(err)
+      const eText = this.funcs.parseError(err, [this.lang.hbVersionFail, this.lang.pluginNotConf])
       log.warn('***** %s. *****', this.lang.disabling)
       log.warn('***** %s. *****', eText)
     }
@@ -608,8 +607,8 @@ class eWeLinkPlatform {
                 this.log('%s.', this.lang.wsRef)
               }
               await wsClient.login()
-            } catch (e) {
-              const eText = this.funcs.parseError(e)
+            } catch (err) {
+              const eText = this.funcs.parseError(err)
               this.log.warn('%s %s.', this.lang.wsRefFail, eText)
             }
           }, 3600000)
@@ -690,9 +689,9 @@ class eWeLinkPlatform {
 
             // Actioning the request was successful so respond with a success
             res.end(JSON.stringify({ success: true, response }))
-          } catch (e) {
+          } catch (err) {
             // An error occurred actioning the request so respond with the error
-            res.end(JSON.stringify({ success: false, error: e.message + '.' }))
+            res.end(JSON.stringify({ success: false, error: err.message + '.' }))
           }
         })
 
@@ -715,16 +714,12 @@ class eWeLinkPlatform {
       }, 2000)
     } catch (err) {
       // Catch any errors during setup
-      const eText = [
+      const eText = this.funcs.parseError(err, [
         this.lang.disabled,
         this.lang.missingCreds,
         'password error! [10001]',
         'user does not exists [10003]'
-      ].includes(err.message)
-        ? err.message
-        : this.config.debug
-        ? err
-        : this.funcs.parseError(err)
+      ])
       this.log.warn('***** %s. *****', this.lang.disabling)
       this.log.warn('***** %s. *****', eText)
       this.pluginShutdown()
diff --git a/lib/utils/functions.js b/lib/utils/functions.js
index 023d0f4b..18ef91e4 100644
--- a/lib/utils/functions.js
+++ b/lib/utils/functions.js
@@ -18,9 +18,9 @@ module.exports = {
       .replace('sw', 'SW')
   },
 
-  parseError: err => {
+  parseError: (err, hideStack = []) => {
     let toReturn = err.message
-    if (err.stack && err.stack.length > 0) {
+    if (err.stack && err.stack.length > 0 && !hideStack.includes(err.message)) {
       const stack = err.stack.split('\n')
       if (stack[1]) {
         toReturn += stack[1].replace('   ', '')

From 61eb3eefcd08fa637662709f025e1e1cf8fc5ba1 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 17 Jul 2021 11:34:48 +0100
Subject: [PATCH 2549/3183] amend humiOffset validating

---
 config.schema.json                    |  4 ++--
 lib/device/sensor-ambient.js          |  2 +-
 lib/device/sensor-temp-humi.js        |  2 +-
 lib/device/simulation/cooler.js       |  2 +-
 lib/device/simulation/dehumidifier.js |  2 +-
 lib/device/simulation/heater.js       |  2 +-
 lib/device/simulation/humidifier.js   |  2 +-
 lib/device/zigbee/sensor-ambient.js   |  2 +-
 lib/index.js                          | 25 +++++++------------------
 9 files changed, 16 insertions(+), 27 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 2480ce8b..2cb651a5 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -908,7 +908,7 @@
               }
             },
             "humidityOffset": {
-              "type": "integer",
+              "type": "number",
               "title": "Humidity Offset",
               "description": "You can offset the humidity that the sensor reads. An offset of 2 means 2% will be added to the recorded relative humidity. Can be positive or negative.",
               "placeholder": 0,
@@ -1158,7 +1158,7 @@
               }
             },
             "humidityOffset": {
-              "type": "integer",
+              "type": "number",
               "title": "Humidity Offset",
               "description": "You can offset the humidity that the SNZB-02 sensor reads. An offset of 2 means 2% will be added to the recorded relative humidity. Can be positive or negative.",
               "placeholder": 0,
diff --git a/lib/device/sensor-ambient.js b/lib/device/sensor-ambient.js
index 90b7abe8..b2a17701 100644
--- a/lib/device/sensor-ambient.js
+++ b/lib/device/sensor-ambient.js
@@ -27,7 +27,7 @@ module.exports = class deviceSensorAmbient {
       deviceConf && deviceConf.offset ? deviceConf.offset : platform.consts.defaultValues.offset
     this.humiOffset =
       deviceConf && deviceConf.humidityOffset
-        ? deviceConf.humidityOffset
+        ? parseInt(deviceConf.humidityOffset)
         : platform.consts.defaultValues.humidityOffset
 
     // Set the correct logging variables for this accessory
diff --git a/lib/device/sensor-temp-humi.js b/lib/device/sensor-temp-humi.js
index f2104567..ef45a6ec 100644
--- a/lib/device/sensor-temp-humi.js
+++ b/lib/device/sensor-temp-humi.js
@@ -25,7 +25,7 @@ module.exports = class deviceSensorTempHumi {
       deviceConf && deviceConf.offset ? deviceConf.offset : platform.consts.defaultValues.offset
     this.humiOffset =
       deviceConf && deviceConf.humidityOffset
-        ? deviceConf.humidityOffset
+        ? parseInt(deviceConf.humidityOffset)
         : platform.consts.defaultValues.humidityOffset
 
     // Set the correct logging variables for this accessory
diff --git a/lib/device/simulation/cooler.js b/lib/device/simulation/cooler.js
index 372a821f..b17e1ad4 100644
--- a/lib/device/simulation/cooler.js
+++ b/lib/device/simulation/cooler.js
@@ -26,7 +26,7 @@ module.exports = class deviceHeater {
       deviceConf && deviceConf.offset ? deviceConf.offset : platform.consts.defaultValues.offset
     this.humiOffset =
       deviceConf && deviceConf.humidityOffset
-        ? deviceConf.humidityOffset
+        ? parseInt(deviceConf.humidityOffset)
         : platform.consts.defaultValues.humidityOffset
     this.minTarget =
       deviceConf && deviceConf.minTarget
diff --git a/lib/device/simulation/dehumidifier.js b/lib/device/simulation/dehumidifier.js
index a427d62d..a51bb86d 100644
--- a/lib/device/simulation/dehumidifier.js
+++ b/lib/device/simulation/dehumidifier.js
@@ -26,7 +26,7 @@ module.exports = class deviceHeater {
       deviceConf && deviceConf.offset ? deviceConf.offset : platform.consts.defaultValues.offset
     this.humiOffset =
       deviceConf && deviceConf.humidityOffset
-        ? deviceConf.humidityOffset
+        ? parseInt(deviceConf.humidityOffset)
         : platform.consts.defaultValues.humidityOffset
 
     // Set the correct logging variables for this accessory
diff --git a/lib/device/simulation/heater.js b/lib/device/simulation/heater.js
index 7fdb21d2..74d8876a 100644
--- a/lib/device/simulation/heater.js
+++ b/lib/device/simulation/heater.js
@@ -26,7 +26,7 @@ module.exports = class deviceHeater {
       deviceConf && deviceConf.offset ? deviceConf.offset : platform.consts.defaultValues.offset
     this.humiOffset =
       deviceConf && deviceConf.humidityOffset
-        ? deviceConf.humidityOffset
+        ? parseInt(deviceConf.humidityOffset)
         : platform.consts.defaultValues.humidityOffset
     this.minTarget =
       deviceConf && deviceConf.minTarget
diff --git a/lib/device/simulation/humidifier.js b/lib/device/simulation/humidifier.js
index 77eabcba..0db3b84c 100644
--- a/lib/device/simulation/humidifier.js
+++ b/lib/device/simulation/humidifier.js
@@ -26,7 +26,7 @@ module.exports = class deviceHeater {
       deviceConf && deviceConf.offset ? deviceConf.offset : platform.consts.defaultValues.offset
     this.humiOffset =
       deviceConf && deviceConf.humidityOffset
-        ? deviceConf.humidityOffset
+        ? parseInt(deviceConf.humidityOffset)
         : platform.consts.defaultValues.humidityOffset
     // Set the correct logging variables for this accessory
     this.enableLogging = !platform.config.disableDeviceLogging
diff --git a/lib/device/zigbee/sensor-ambient.js b/lib/device/zigbee/sensor-ambient.js
index 73c77920..63d7ae91 100644
--- a/lib/device/zigbee/sensor-ambient.js
+++ b/lib/device/zigbee/sensor-ambient.js
@@ -26,7 +26,7 @@ module.exports = class deviceZBSensorAmbient {
       deviceConf && deviceConf.offset ? deviceConf.offset : platform.consts.defaultValues.offset
     this.humiOffset =
       deviceConf && deviceConf.humidityOffset
-        ? deviceConf.humidityOffset
+        ? parseInt(deviceConf.humidityOffset)
         : platform.consts.defaultValues.humidityOffset
 
     // Set the correct logging variables for this accessory
diff --git a/lib/index.js b/lib/index.js
index 2f7debb9..05a24ada 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -313,16 +313,16 @@ class eWeLinkPlatform {
                     }
                     this.deviceConf[id][k] = v === 'false' ? false : !!v
                     break
-                  case 'humidityOffset': {
+                  case 'humidityOffset':
+                  case 'offset': {
                     if (typeof v === 'string') {
                       logQuotes(key + '.' + id + '.' + k)
                     }
-                    const intVal = parseInt(v)
-                    if (isNaN(intVal)) {
-                      logDefault(key + '.' + id + '.' + k, this.consts.defaultValues[k])
-                      this.deviceConf[id][k] = this.consts.defaultValues[k]
+                    const numVal = Number(v)
+                    if (isNaN(numVal)) {
+                      logIgnore(key + '.' + id + '.' + k)
                     } else {
-                      this.deviceConf[id][k] = intVal
+                      this.deviceConf[id][k] = numVal
                     }
                     break
                   }
@@ -342,18 +342,6 @@ class eWeLinkPlatform {
                     }
                     break
                   }
-                  case 'offset': {
-                    if (typeof v === 'string') {
-                      logQuotes(key + '.' + id + '.' + k)
-                    }
-                    const numVal = Number(v)
-                    if (isNaN(numVal)) {
-                      logIgnore(key + '.' + id + '.' + k)
-                    } else {
-                      this.deviceConf[id][k] = numVal
-                    }
-                    break
-                  }
                   case 'sensorId':
                     if (typeof v !== 'string' || v === '') {
                       logIgnore(key + '.' + id + '.' + k)
@@ -567,6 +555,7 @@ class eWeLinkPlatform {
       this.colourUtils = require('./utils/colour-utils')
       this.eveService = require('./fakegato/fakegato-history')(this.api)
       this.eveChar = new (require('./utils/eve-chars'))(this.api)
+      this.eveService = require('./fakegato/fakegato-history')(this.api)
 
       // Persist files are used to store device info that could be used for LAN only mode
       try {

From 633da0fcff8370e455db55da189915b3e3202006 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 18 Jul 2021 10:02:23 +0100
Subject: [PATCH 2550/3183] [test] opts to offset by a factor (not a lineal)

---
 config.schema.json                    | 36 +++++++++++++++
 lib/device/sensor-ambient.js          | 56 +++++++++++++++---------
 lib/device/sensor-temp-humi.js        | 59 +++++++++++++++----------
 lib/device/simulation/cooler.js       | 54 +++++++++++++++--------
 lib/device/simulation/dehumidifier.js | 51 ++++++++++++++--------
 lib/device/simulation/heater.js       | 54 +++++++++++++++--------
 lib/device/simulation/humidifier.js   | 52 ++++++++++++++--------
 lib/device/thermostat.js              | 13 ++++--
 lib/device/zigbee/sensor-ambient.js   | 63 ++++++++++++++++-----------
 lib/index.js                          |  2 +
 lib/utils/constants.js                |  4 ++
 11 files changed, 305 insertions(+), 139 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 2cb651a5..fc20f0be 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -907,6 +907,14 @@
                 "functionBody": "return (model.thDevices && model.thDevices[arrayIndices] && ['th', 'sc', 'hc'].includes(model.thDevices[arrayIndices].deviceModel) && !model.thDevices[arrayIndices].ignoreDevice);"
               }
             },
+            "offsetFactor": {
+              "type": "boolean",
+              "title": "Temperature Offset Factor",
+              "description": "If true then the above value will be used as a factor, i.e. the recorded temperature will be multipled by this number instead.",
+              "condition": {
+                "functionBody": "return (model.thDevices && model.thDevices[arrayIndices] && ['th', 'sc', 'hc'].includes(model.thDevices[arrayIndices].deviceModel) && model.thDevices[arrayIndices].offset && !model.thDevices[arrayIndices].ignoreDevice);"
+              }
+            },
             "humidityOffset": {
               "type": "number",
               "title": "Humidity Offset",
@@ -916,6 +924,14 @@
                 "functionBody": "return (model.thDevices && model.thDevices[arrayIndices] && ['th', 'sc', 'hc'].includes(model.thDevices[arrayIndices].deviceModel) && !model.thDevices[arrayIndices].ignoreDevice);"
               }
             },
+            "humidityOffsetFactor": {
+              "type": "boolean",
+              "title": "Humidity Offset %",
+              "description": "If true then the above value will be used as a factor, i.e. the recorded humidity will be multipled by this number instead.",
+              "condition": {
+                "functionBody": "return (model.thDevices && model.thDevices[arrayIndices] && ['th', 'sc', 'hc'].includes(model.thDevices[arrayIndices].deviceModel) && model.thDevices[arrayIndices].humidityOffset && !model.thDevices[arrayIndices].ignoreDevice);"
+              }
+            },
             "minTarget": {
               "type": "integer",
               "title": "Minimum Target Temperature",
@@ -1157,6 +1173,14 @@
                 "functionBody": "return (model.sensorDevices && model.sensorDevices[arrayIndices] && ['snzb02'].includes(model.sensorDevices[arrayIndices].deviceModel) && !model.sensorDevices[arrayIndices].ignoreDevice);"
               }
             },
+            "offsetFactor": {
+              "type": "boolean",
+              "title": "Temperature Offset Factor",
+              "description": "If true then the above value will be used as a factor, i.e. the recorded temperature will be multipled by this number instead.",
+              "condition": {
+                "functionBody": "return (model.sensorDevices && model.sensorDevices[arrayIndices] && ['snzb02'].includes(model.sensorDevices[arrayIndices].deviceModel) && sensorDevices[arrayIndices].offset && !model.sensorDevices[arrayIndices].ignoreDevice);"
+              }
+            },
             "humidityOffset": {
               "type": "number",
               "title": "Humidity Offset",
@@ -1166,6 +1190,14 @@
                 "functionBody": "return (model.sensorDevices && model.sensorDevices[arrayIndices] && ['snzb02'].includes(model.sensorDevices[arrayIndices].deviceModel) && !model.sensorDevices[arrayIndices].ignoreDevice);"
               }
             },
+            "humidityOffsetFactor": {
+              "type": "boolean",
+              "title": "Humidity Offset %",
+              "description": "If true then the above value will be used as a factor, i.e. the recorded humidity will be multipled by this number instead.",
+              "condition": {
+                "functionBody": "return (model.sensorDevices && model.sensorDevices[arrayIndices] && ['snzb02'].includes(model.sensorDevices[arrayIndices].deviceModel) && sensorDevices[arrayIndices].humidityOffset && !model.sensorDevices[arrayIndices].ignoreDevice);"
+              }
+            },
             "hideLongDouble": {
               "type": "boolean",
               "title": "Hide Long & Double Press",
@@ -1715,7 +1747,9 @@
             "thDevices[].showAs",
             "thDevices[].hideSwitch",
             "thDevices[].offset",
+            "thDevices[].offsetFactor",
             "thDevices[].humidityOffset",
+            "thDevices[].humidityOffsetFactor",
             "thDevices[].minTarget",
             "thDevices[].maxTarget",
             "thDevices[].ipAddress",
@@ -1764,7 +1798,9 @@
             "sensorDevices[].showAs",
             "sensorDevices[].lowBattThreshold",
             "sensorDevices[].offset",
+            "sensorDevices[].offsetFactor",
             "sensorDevices[].humidityOffset",
+            "sensorDevices[].humidityOffsetFactor",
             "sensorDevices[].hideLongDouble",
             "sensorDevices[].scaleBattery",
             "sensorDevices[].sensorTimeDifference",
diff --git a/lib/device/sensor-ambient.js b/lib/device/sensor-ambient.js
index b2a17701..1356eb41 100644
--- a/lib/device/sensor-ambient.js
+++ b/lib/device/sensor-ambient.js
@@ -25,10 +25,12 @@ module.exports = class deviceSensorAmbient {
     this.hideSwitch = deviceConf && deviceConf.hideSwitch
     this.tempOffset =
       deviceConf && deviceConf.offset ? deviceConf.offset : platform.consts.defaultValues.offset
+    this.tempOffsetFactor = deviceConf && deviceConf.offsetFactor
     this.humiOffset =
       deviceConf && deviceConf.humidityOffset
         ? parseInt(deviceConf.humidityOffset)
         : platform.consts.defaultValues.humidityOffset
+    this.humiOffsetFactor = deviceConf && deviceConf.humidityOffsetFactor
 
     // Set the correct logging variables for this accessory
     this.enableLogging = !platform.config.disableDeviceLogging
@@ -158,8 +160,10 @@ module.exports = class deviceSensorAmbient {
     const opts = JSON.stringify({
       hideSwitch: this.hideSwitch,
       humidityOffset: this.humiOffset,
+      humidityOffsetFactor: this.humiOffsetFactor,
       logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
       offset: this.tempOffset,
+      offsetFactor: this.tempOffsetFactor,
       showAs: 'default'
     })
     this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
@@ -219,36 +223,48 @@ module.exports = class deviceSensorAmbient {
           }
         }
       }
-      const eveLog = {}
       if (
         this.funcs.hasProperty(params, 'currentTemperature') &&
-        params.currentTemperature !== 'unavailable' &&
-        this.cacheTempRaw !== params.currentTemperature
+        params.currentTemperature !== 'unavailable'
       ) {
-        this.cacheTempRaw = params.currentTemperature
-        this.cacheTemp = Number(this.cacheTempRaw) + this.tempOffset
-        eveLog.temp = this.cacheTemp
-        this.tempService.updateCharacteristic(this.hapChar.CurrentTemperature, this.cacheTemp)
-        if (params.updateSource && this.enableLogging) {
-          this.log('[%s] %s [%s°C].', this.name, this.lang.curTemp, this.cacheTemp)
+        let newTemp = Number(params.currentTemperature)
+        if (this.tempOffsetFactor) {
+          newTemp *= this.tempOffset
+        } else {
+          newTemp += this.tempOffset
+        }
+        if (newTemp !== this.cacheTemp) {
+          this.cacheTemp = newTemp
+          this.tempService.updateCharacteristic(this.hapChar.CurrentTemperature, this.cacheTemp)
+          this.accessory.eveService.addEntry({ temp: this.cacheTemp })
+          if (params.updateSource && this.enableLogging) {
+            this.log('[%s] %s [%s°C].', this.name, this.lang.curTemp, this.cacheTemp)
+          }
         }
       }
       if (
         this.funcs.hasProperty(params, 'currentHumidity') &&
         params.currentHumidity !== 'unavailable' &&
-        this.humiService &&
-        this.cacheHumiRaw !== params.currentHumidity
+        this.humiService
       ) {
-        this.cacheHumiRaw = params.currentHumidity
-        this.cacheHumi = Math.max(Math.min(parseInt(this.cacheHumiRaw) + this.humiOffset, 100), 0)
-        eveLog.humidity = this.cacheHumi
-        this.humiService.updateCharacteristic(this.hapChar.CurrentRelativeHumidity, this.cacheHumi)
-        if (params.updateSource && this.enableLogging) {
-          this.log('[%s] %s [%s%].', this.name, this.lang.curHumi, this.cacheHumi)
+        let newHumi = parseInt(params.currentHumidity)
+        if (this.humiOffsetFactor) {
+          newHumi *= this.humiOffset
+        } else {
+          newHumi += this.humiOffset
+        }
+        newHumi = Math.max(Math.min(parseInt(newHumi), 100), 0)
+        if (newHumi !== this.cacheHumi) {
+          this.cacheHumi = newHumi
+          this.humiService.updateCharacteristic(
+            this.hapChar.CurrentRelativeHumidity,
+            this.cacheHumi
+          )
+          this.accessory.eveService.addEntry({ humidity: this.cacheHumi })
+          if (params.updateSource && this.enableLogging) {
+            this.log('[%s] %s [%s%].', this.name, this.lang.curHumi, this.cacheHumi)
+          }
         }
-      }
-      if (this.funcs.hasProperty(eveLog, 'temp') || this.funcs.hasProperty(eveLog, 'humidity')) {
-        this.accessory.eveService.addEntry(eveLog)
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
diff --git a/lib/device/sensor-temp-humi.js b/lib/device/sensor-temp-humi.js
index ef45a6ec..815ae35d 100644
--- a/lib/device/sensor-temp-humi.js
+++ b/lib/device/sensor-temp-humi.js
@@ -23,10 +23,12 @@ module.exports = class deviceSensorTempHumi {
     const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
     this.tempOffset =
       deviceConf && deviceConf.offset ? deviceConf.offset : platform.consts.defaultValues.offset
+    this.tempOffsetFactor = deviceConf && deviceConf.offsetFactor
     this.humiOffset =
       deviceConf && deviceConf.humidityOffset
         ? parseInt(deviceConf.humidityOffset)
         : platform.consts.defaultValues.humidityOffset
+    this.humiOffsetFactor = deviceConf && deviceConf.humidityOffsetFactor
 
     // Set the correct logging variables for this accessory
     this.enableLogging = !platform.config.disableDeviceLogging
@@ -92,38 +94,51 @@ module.exports = class deviceSensorTempHumi {
     // Output the customised options to the log
     const opts = JSON.stringify({
       humidityOffset: this.humiOffset,
+      humidityOffsetFactor: this.humiOffsetFactor,
       logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
-      offset: this.tempOffset
+      offset: this.tempOffset,
+      offsetFactor: this.tempOffsetFactor
     })
     this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
 
   async externalUpdate (params) {
     try {
-      const eveLog = {}
-      if (
-        this.funcs.hasProperty(params, 'temperature') &&
-        this.cacheTempRaw !== params.temperature
-      ) {
-        this.cacheTempRaw = params.temperature
-        this.cacheTemp = Number(this.cacheTempRaw) + this.tempOffset
-        eveLog.temp = this.cacheTemp
-        this.tempService.updateCharacteristic(this.hapChar.CurrentTemperature, this.cacheTemp)
-        if (params.updateSource && this.enableLogging) {
-          this.log('[%s] %s [%s°C].', this.name, this.lang.curTemp, this.cacheTemp)
+      if (this.funcs.hasProperty(params, 'temperature')) {
+        let newTemp = Number(params.temperature)
+        if (this.tempOffsetFactor) {
+          newTemp *= this.tempOffset
+        } else {
+          newTemp += this.tempOffset
         }
-      }
-      if (this.funcs.hasProperty(params, 'humidity') && this.cacheHumiRaw !== params.humidity) {
-        this.cacheHumiRaw = params.humidity
-        this.cacheHumi = Math.max(Math.min(parseInt(this.cacheHumiRaw) + this.humiOffset, 100), 0)
-        eveLog.humidity = this.cacheHumi
-        this.humiService.updateCharacteristic(this.hapChar.CurrentRelativeHumidity, this.cacheHumi)
-        if (params.updateSource && this.enableLogging) {
-          this.log('[%s] %s [%s%].', this.name, this.lang.curHumi, this.cacheHumi)
+        if (newTemp !== this.cacheTemp) {
+          this.cacheTemp = newTemp
+          this.tempService.updateCharacteristic(this.hapChar.CurrentTemperature, this.cacheTemp)
+          this.accessory.eveService.addEntry({ temp: this.cacheTemp })
+          if (params.updateSource && this.enableLogging) {
+            this.log('[%s] %s [%s°C].', this.name, this.lang.curTemp, this.cacheTemp)
+          }
         }
       }
-      if (this.funcs.hasProperty(eveLog, 'temp') || this.funcs.hasProperty(eveLog, 'humidity')) {
-        this.accessory.eveService.addEntry(eveLog)
+      if (this.funcs.hasProperty(params, 'humidity')) {
+        let newHumi = parseInt(params.humidity)
+        if (this.humiOffsetFactor) {
+          newHumi *= this.humiOffset
+        } else {
+          newHumi += this.humiOffset
+        }
+        newHumi = Math.max(Math.min(parseInt(newHumi), 100), 0)
+        if (newHumi !== this.cacheHumi) {
+          this.cacheHumi = newHumi
+          this.humiService.updateCharacteristic(
+            this.hapChar.CurrentRelativeHumidity,
+            this.cacheHumi
+          )
+          this.accessory.eveService.addEntry({ humidity: this.cacheHumi })
+          if (params.updateSource && this.enableLogging) {
+            this.log('[%s] %s [%s%].', this.name, this.lang.curHumi, this.cacheHumi)
+          }
+        }
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
diff --git a/lib/device/simulation/cooler.js b/lib/device/simulation/cooler.js
index b17e1ad4..85c63a5c 100644
--- a/lib/device/simulation/cooler.js
+++ b/lib/device/simulation/cooler.js
@@ -24,10 +24,12 @@ module.exports = class deviceHeater {
     const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
     this.tempOffset =
       deviceConf && deviceConf.offset ? deviceConf.offset : platform.consts.defaultValues.offset
+    this.tempOffsetFactor = deviceConf && deviceConf.offsetFactor
     this.humiOffset =
       deviceConf && deviceConf.humidityOffset
         ? parseInt(deviceConf.humidityOffset)
         : platform.consts.defaultValues.humidityOffset
+    this.humiOffsetFactor = deviceConf && deviceConf.humidityOffsetFactor
     this.minTarget =
       deviceConf && deviceConf.minTarget
         ? deviceConf.minTarget
@@ -218,10 +220,12 @@ module.exports = class deviceHeater {
     // Output the customised options to the log
     const opts = JSON.stringify({
       humidityOffset: this.humiOffset,
+      humidityOffsetFactor: this.humiOffsetFactor,
       logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
       maxTarget: this.maxTarget,
       minTarget: this.minTarget,
       offset: this.tempOffset,
+      offsetFactor: this.tempOffsetFactor,
       showAs: 'cooler'
     })
     this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
@@ -380,30 +384,46 @@ module.exports = class deviceHeater {
     try {
       if (
         this.funcs.hasProperty(params, 'currentTemperature') &&
-        params.currentTemperature !== 'unavailable' &&
-        this.cacheTempRaw !== params.currentTemperature
+        params.currentTemperature !== 'unavailable'
       ) {
-        this.cacheTempRaw = params.currentTemperature
-        this.cacheTemp = Number(params.currentTemperature) + this.tempOffset
-        this.service.updateCharacteristic(this.hapChar.CurrentTemperature, this.cacheTemp)
-        this.accessory.eveService.addEntry({ temp: this.cacheTemp })
-        if (params.updateSource && this.enableLogging) {
-          this.log('[%s] %s [%s°C].', this.name, this.lang.curTemp, this.cacheTemp)
+        let newTemp = Number(params.currentTemperature)
+        if (this.tempOffsetFactor) {
+          newTemp *= this.tempOffset
+        } else {
+          newTemp += this.tempOffset
+        }
+        if (newTemp !== this.cacheTemp) {
+          this.cacheTemp = newTemp
+          this.service.updateCharacteristic(this.hapChar.CurrentTemperature, this.cacheTemp)
+          this.accessory.eveService.addEntry({ temp: this.cacheTemp })
+          if (params.updateSource && this.enableLogging) {
+            this.log('[%s] %s [%s°C].', this.name, this.lang.curTemp, this.cacheTemp)
+          }
+          await this.internalCurrentTempUpdate()
         }
-        await this.internalCurrentTempUpdate()
       }
       if (
         this.funcs.hasProperty(params, 'currentHumidity') &&
         params.currentHumidity !== 'unavailable' &&
-        this.humiService &&
-        this.cacheHumiRaw !== params.currentHumidity
+        this.humiService
       ) {
-        this.cacheHumiRaw = params.currentHumidity
-        this.cacheHumi = Math.max(Math.min(parseInt(this.cacheHumiRaw) + this.humiOffset, 100), 0)
-        this.humiService.updateCharacteristic(this.hapChar.CurrentRelativeHumidity, this.cacheHumi)
-        this.accessory.eveService.addEntry({ humidity: this.cacheHumi })
-        if (params.updateSource && this.enableLogging) {
-          this.log('[%s] %s [%s%].', this.name, this.lang.curHumi, this.cacheHumi)
+        let newHumi = parseInt(params.currentHumidity)
+        if (this.humiOffsetFactor) {
+          newHumi *= this.humiOffset
+        } else {
+          newHumi += this.humiOffset
+        }
+        newHumi = Math.max(Math.min(parseInt(newHumi), 100), 0)
+        if (newHumi !== this.cacheHumi) {
+          this.cacheHumi = newHumi
+          this.humiService.updateCharacteristic(
+            this.hapChar.CurrentRelativeHumidity,
+            this.cacheHumi
+          )
+          this.accessory.eveService.addEntry({ humidity: this.cacheHumi })
+          if (params.updateSource && this.enableLogging) {
+            this.log('[%s] %s [%s%].', this.name, this.lang.curHumi, this.cacheHumi)
+          }
         }
       }
     } catch (err) {
diff --git a/lib/device/simulation/dehumidifier.js b/lib/device/simulation/dehumidifier.js
index a51bb86d..a624a9be 100644
--- a/lib/device/simulation/dehumidifier.js
+++ b/lib/device/simulation/dehumidifier.js
@@ -24,10 +24,12 @@ module.exports = class deviceHeater {
     const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
     this.tempOffset =
       deviceConf && deviceConf.offset ? deviceConf.offset : platform.consts.defaultValues.offset
+    this.tempOffsetFactor = deviceConf && deviceConf.offsetFactor
     this.humiOffset =
       deviceConf && deviceConf.humidityOffset
         ? parseInt(deviceConf.humidityOffset)
         : platform.consts.defaultValues.humidityOffset
+    this.humiOffsetFactor = deviceConf && deviceConf.humidityOffsetFactor
 
     // Set the correct logging variables for this accessory
     this.enableLogging = !platform.config.disableDeviceLogging
@@ -196,8 +198,10 @@ module.exports = class deviceHeater {
     // Output the customised options to the log
     const opts = JSON.stringify({
       humidityOffset: this.humiOffset,
+      humidityOffsetFactor: this.humiOffsetFactor,
       logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
       offset: this.tempOffset,
+      offsetFactor: this.tempOffsetFactor,
       showAs: 'dehumidifier'
     })
     this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
@@ -356,30 +360,43 @@ module.exports = class deviceHeater {
     try {
       if (
         this.funcs.hasProperty(params, 'currentTemperature') &&
-        params.currentTemperature !== 'unavailable' &&
-        this.cacheTempRaw !== params.currentTemperature
+        params.currentTemperature !== 'unavailable'
       ) {
-        this.cacheTempRaw = params.currentTemperature
-        this.cacheTemp = Number(params.currentTemperature) + this.tempOffset
-        this.tempService.updateCharacteristic(this.hapChar.CurrentTemperature, this.cacheTemp)
-        this.accessory.eveService.addEntry({ temp: this.cacheTemp })
-        if (params.updateSource && this.enableLogging) {
-          this.log('[%s] %s [%s%].', this.name, this.lang.curTemp, this.cacheTemp)
+        let newTemp = Number(params.currentTemperature)
+        if (this.tempOffsetFactor) {
+          newTemp *= this.tempOffset
+        } else {
+          newTemp += this.tempOffset
+        }
+        if (newTemp !== this.cacheTemp) {
+          this.cacheTemp = newTemp
+          this.tempService.updateCharacteristic(this.hapChar.CurrentTemperature, this.cacheTemp)
+          this.accessory.eveService.addEntry({ temp: this.cacheTemp })
+          if (params.updateSource && this.enableLogging) {
+            this.log('[%s] %s [%s°C].', this.name, this.lang.curTemp, this.cacheTemp)
+          }
         }
       }
       if (
         this.funcs.hasProperty(params, 'currentHumidity') &&
-        params.currentHumidity !== 'unavailable' &&
-        this.cacheHumiRaw !== params.currentHumidity
+        params.currentHumidity !== 'unavailable'
       ) {
-        this.cacheHumiRaw = params.currentHumidity
-        this.cacheHumi = Math.max(Math.min(parseInt(this.cacheHumiRaw) + this.humiOffset, 100), 0)
-        this.service.updateCharacteristic(this.hapChar.CurrentRelativeHumidity, this.cacheHumi)
-        this.accessory.eveService.addEntry({ humidity: this.cacheHumi })
-        if (params.updateSource && this.enableLogging) {
-          this.log('[%s] %s [%s%].', this.name, this.lang.curHumi, this.cacheHumi)
+        let newHumi = parseInt(params.currentHumidity)
+        if (this.humiOffsetFactor) {
+          newHumi *= this.humiOffset
+        } else {
+          newHumi += this.humiOffset
+        }
+        newHumi = Math.max(Math.min(parseInt(newHumi), 100), 0)
+        if (newHumi !== this.cacheHumi) {
+          this.cacheHumi = newHumi
+          this.service.updateCharacteristic(this.hapChar.CurrentRelativeHumidity, this.cacheHumi)
+          this.accessory.eveService.addEntry({ humidity: this.cacheHumi })
+          if (params.updateSource && this.enableLogging) {
+            this.log('[%s] %s [%s%].', this.name, this.lang.curHumi, this.cacheHumi)
+          }
+          await this.internalCurrentHumidityUpdate()
         }
-        await this.internalCurrentHumidityUpdate()
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
diff --git a/lib/device/simulation/heater.js b/lib/device/simulation/heater.js
index 74d8876a..29d50403 100644
--- a/lib/device/simulation/heater.js
+++ b/lib/device/simulation/heater.js
@@ -24,10 +24,12 @@ module.exports = class deviceHeater {
     const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
     this.tempOffset =
       deviceConf && deviceConf.offset ? deviceConf.offset : platform.consts.defaultValues.offset
+    this.tempOffsetFactor = deviceConf && deviceConf.offsetFactor
     this.humiOffset =
       deviceConf && deviceConf.humidityOffset
         ? parseInt(deviceConf.humidityOffset)
         : platform.consts.defaultValues.humidityOffset
+    this.humiOffsetFactor = deviceConf && deviceConf.humidityOffsetFactor
     this.minTarget =
       deviceConf && deviceConf.minTarget
         ? deviceConf.minTarget
@@ -224,10 +226,12 @@ module.exports = class deviceHeater {
     // Output the customised options to the log
     const opts = JSON.stringify({
       humidityOffset: this.humiOffset,
+      humidityOffsetFactor: this.humiOffsetFactor,
       logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
       maxTarget: this.maxTarget,
       minTarget: this.minTarget,
       offset: this.tempOffset,
+      offsetFactor: this.tempOffsetFactor,
       showAs: 'heater'
     })
     this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
@@ -386,30 +390,46 @@ module.exports = class deviceHeater {
     try {
       if (
         this.funcs.hasProperty(params, 'currentTemperature') &&
-        params.currentTemperature !== 'unavailable' &&
-        this.cacheTempRaw !== params.currentTemperature
+        params.currentTemperature !== 'unavailable'
       ) {
-        this.cacheTempRaw = params.currentTemperature
-        this.cacheTemp = Number(params.currentTemperature) + this.tempOffset
-        this.service.updateCharacteristic(this.hapChar.CurrentTemperature, this.cacheTemp)
-        this.accessory.eveService.addEntry({ temp: this.cacheTemp })
-        if (params.updateSource && this.enableLogging) {
-          this.log('[%s] %s [%s°C].', this.name, this.lang.curTemp, this.cacheTemp)
+        let newTemp = Number(params.currentTemperature)
+        if (this.tempOffsetFactor) {
+          newTemp *= this.tempOffset
+        } else {
+          newTemp += this.tempOffset
+        }
+        if (newTemp !== this.cacheTemp) {
+          this.cacheTemp = newTemp
+          this.service.updateCharacteristic(this.hapChar.CurrentTemperature, this.cacheTemp)
+          this.accessory.eveService.addEntry({ temp: this.cacheTemp })
+          if (params.updateSource && this.enableLogging) {
+            this.log('[%s] %s [%s°C].', this.name, this.lang.curTemp, this.cacheTemp)
+          }
+          await this.internalCurrentTempUpdate()
         }
-        await this.internalCurrentTempUpdate()
       }
       if (
         this.funcs.hasProperty(params, 'currentHumidity') &&
         params.currentHumidity !== 'unavailable' &&
-        this.humiService &&
-        this.cacheHumiRaw !== params.currentHumidity
+        this.humiService
       ) {
-        this.cacheHumiRaw = params.currentHumidity
-        this.cacheHumi = Math.max(Math.min(parseInt(this.cacheHumiRaw) + this.humiOffset, 100), 0)
-        this.humiService.updateCharacteristic(this.hapChar.CurrentRelativeHumidity, this.cacheHumi)
-        this.accessory.eveService.addEntry({ humidity: this.cacheHumi })
-        if (params.updateSource && this.enableLogging) {
-          this.log('[%s] %s [%s%].', this.name, this.lang.curHumi, this.cacheHumi)
+        let newHumi = parseInt(params.currentHumidity)
+        if (this.humiOffsetFactor) {
+          newHumi *= this.humiOffset
+        } else {
+          newHumi += this.humiOffset
+        }
+        newHumi = Math.max(Math.min(parseInt(newHumi), 100), 0)
+        if (newHumi !== this.cacheHumi) {
+          this.cacheHumi = newHumi
+          this.humiService.updateCharacteristic(
+            this.hapChar.CurrentRelativeHumidity,
+            this.cacheHumi
+          )
+          this.accessory.eveService.addEntry({ humidity: this.cacheHumi })
+          if (params.updateSource && this.enableLogging) {
+            this.log('[%s] %s [%s%].', this.name, this.lang.curHumi, this.cacheHumi)
+          }
         }
       }
     } catch (err) {
diff --git a/lib/device/simulation/humidifier.js b/lib/device/simulation/humidifier.js
index 0db3b84c..dd2c42dc 100644
--- a/lib/device/simulation/humidifier.js
+++ b/lib/device/simulation/humidifier.js
@@ -24,10 +24,13 @@ module.exports = class deviceHeater {
     const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
     this.tempOffset =
       deviceConf && deviceConf.offset ? deviceConf.offset : platform.consts.defaultValues.offset
+    this.tempOffsetFactor = deviceConf && deviceConf.offsetFactor
     this.humiOffset =
       deviceConf && deviceConf.humidityOffset
         ? parseInt(deviceConf.humidityOffset)
         : platform.consts.defaultValues.humidityOffset
+    this.humiOffsetFactor = deviceConf && deviceConf.humidityOffsetFactor
+
     // Set the correct logging variables for this accessory
     this.enableLogging = !platform.config.disableDeviceLogging
     this.enableDebugLogging = platform.config.debug
@@ -195,8 +198,10 @@ module.exports = class deviceHeater {
     // Output the customised options to the log
     const opts = JSON.stringify({
       humidityOffset: this.humiOffset,
+      humidityOffsetFactor: this.humiOffsetFactor,
       logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
       offset: this.tempOffset,
+      offsetFactor: this.tempOffsetFactor,
       showAs: 'humidifier'
     })
     this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
@@ -355,30 +360,43 @@ module.exports = class deviceHeater {
     try {
       if (
         this.funcs.hasProperty(params, 'currentTemperature') &&
-        params.currentTemperature !== 'unavailable' &&
-        this.cacheTempRaw !== params.currentTemperature
+        params.currentTemperature !== 'unavailable'
       ) {
-        this.cacheTempRaw = params.currentTemperature
-        this.cacheTemp = Number(params.currentTemperature) + this.tempOffset
-        this.tempService.updateCharacteristic(this.hapChar.CurrentTemperature, this.cacheTemp)
-        this.accessory.eveService.addEntry({ temp: this.cacheTemp })
-        if (params.updateSource && this.enableLogging) {
-          this.log('[%s] %s [%s%].', this.name, this.lang.curTemp, this.cacheTemp)
+        let newTemp = Number(params.currentTemperature)
+        if (this.tempOffsetFactor) {
+          newTemp *= this.tempOffset
+        } else {
+          newTemp += this.tempOffset
+        }
+        if (newTemp !== this.cacheTemp) {
+          this.cacheTemp = newTemp
+          this.tempService.updateCharacteristic(this.hapChar.CurrentTemperature, this.cacheTemp)
+          this.accessory.eveService.addEntry({ temp: this.cacheTemp })
+          if (params.updateSource && this.enableLogging) {
+            this.log('[%s] %s [%s°C].', this.name, this.lang.curTemp, this.cacheTemp)
+          }
         }
       }
       if (
         this.funcs.hasProperty(params, 'currentHumidity') &&
-        params.currentHumidity !== 'unavailable' &&
-        this.cacheHumiRaw !== params.currentHumidity
+        params.currentHumidity !== 'unavailable'
       ) {
-        this.cacheHumiRaw = params.currentHumidity
-        this.cacheHumi = Math.max(Math.min(parseInt(this.cacheHumiRaw) + this.humiOffset, 100), 0)
-        this.service.updateCharacteristic(this.hapChar.CurrentRelativeHumidity, this.cacheHumi)
-        this.accessory.eveService.addEntry({ humidity: this.cacheHumi })
-        if (params.updateSource && this.enableLogging) {
-          this.log('[%s] %s [%s%].', this.name, this.lang.curHumi, this.cacheHumi)
+        let newHumi = parseInt(params.currentHumidity)
+        if (this.humiOffsetFactor) {
+          newHumi *= this.humiOffset
+        } else {
+          newHumi += this.humiOffset
+        }
+        newHumi = Math.max(Math.min(parseInt(newHumi), 100), 0)
+        if (newHumi !== this.cacheHumi) {
+          this.cacheHumi = newHumi
+          this.service.updateCharacteristic(this.hapChar.CurrentRelativeHumidity, this.cacheHumi)
+          this.accessory.eveService.addEntry({ humidity: this.cacheHumi })
+          if (params.updateSource && this.enableLogging) {
+            this.log('[%s] %s [%s%].', this.name, this.lang.curHumi, this.cacheHumi)
+          }
+          await this.internalCurrentHumidityUpdate()
         }
-        await this.internalCurrentHumidityUpdate()
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
diff --git a/lib/device/thermostat.js b/lib/device/thermostat.js
index a8cf05d6..d156b8f2 100644
--- a/lib/device/thermostat.js
+++ b/lib/device/thermostat.js
@@ -24,6 +24,7 @@ module.exports = class deviceThermostat {
     const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
     this.tempOffset =
       deviceConf && deviceConf.offset ? deviceConf.offset : platform.consts.defaultValues.offset
+    this.tempOffsetFactor = deviceConf && deviceConf.offsetFactor
 
     // Set the correct logging variables for this accessory
     this.enableLogging = !platform.config.disableDeviceLogging
@@ -137,7 +138,8 @@ module.exports = class deviceThermostat {
     // Output the customised options to the log
     const opts = JSON.stringify({
       logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
-      offset: this.tempOffset
+      offset: this.tempOffset,
+      offsetFactor: this.tempOffsetFactor
     })
     this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
@@ -241,15 +243,20 @@ module.exports = class deviceThermostat {
         } else {
           currentTemp = Number(params.temperature)
         }
-        currentTemp += this.tempOffset
+        if (this.tempOffsetFactor) {
+          currentTemp *= this.tempOffset
+        } else {
+          currentTemp += this.tempOffset
+        }
+
         if (this.cacheTemp !== currentTemp) {
           this.cacheTemp = currentTemp
           this.service.updateCharacteristic(this.hapChar.CurrentTemperature, this.cacheTemp)
+          this.accessory.eveService.addEntry({ temp: this.cacheTemp })
           if (params.updateSource && this.enableLogging) {
             this.log('[%s] %s [%s°C].', this.name, this.lang.curTemp, this.cacheTemp)
           }
         }
-        this.accessory.eveService.addEntry({ temp: currentTemp })
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
diff --git a/lib/device/zigbee/sensor-ambient.js b/lib/device/zigbee/sensor-ambient.js
index 63d7ae91..2c0c1857 100644
--- a/lib/device/zigbee/sensor-ambient.js
+++ b/lib/device/zigbee/sensor-ambient.js
@@ -24,10 +24,12 @@ module.exports = class deviceZBSensorAmbient {
         : platform.consts.defaultValues.lowBattThreshold
     this.tempOffset =
       deviceConf && deviceConf.offset ? deviceConf.offset : platform.consts.defaultValues.offset
+    this.tempOffsetFactor = deviceConf && deviceConf.offsetFactor
     this.humiOffset =
       deviceConf && deviceConf.humidityOffset
         ? parseInt(deviceConf.humidityOffset)
         : platform.consts.defaultValues.humidityOffset
+    this.humiOffsetFactor = deviceConf && deviceConf.humidityOffsetFactor
 
     // Set the correct logging variables for this accessory
     this.enableLogging = !platform.config.disableDeviceLogging
@@ -77,9 +79,11 @@ module.exports = class deviceZBSensorAmbient {
     // Output the customised options to the log
     const opts = JSON.stringify({
       humidityOffset: this.humiOffset,
+      humidityOffsetFactor: this.humiOffsetFactor,
       logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
       lowBattThreshold: this.lowBattThreshold,
-      offset: this.tempOffset
+      offset: this.tempOffset,
+      offsetFactor: this.tempOffsetFactor
     })
     this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
@@ -98,34 +102,41 @@ module.exports = class deviceZBSensorAmbient {
           this.log('[%s] %s [%s%].', this.name, this.lang.curBatt, this.cacheBattScaled)
         }
       }
-      const eveLog = {}
-      if (
-        this.funcs.hasProperty(params, 'temperature') &&
-        params.temperature !== this.cacheTempRaw
-      ) {
-        this.cacheTempRaw = params.temperature
-        this.cacheTemp = parseInt(this.cacheTempRaw) / 100 + this.tempOffset
-        this.tempService.updateCharacteristic(this.hapChar.CurrentTemperature, this.cacheTemp)
-        eveLog.temp = this.cacheTemp
-        if (params.updateSource && this.enableLogging) {
-          this.log('[%s] %s [%s°C].', this.name, this.lang.curTemp, this.cacheTemp)
+      if (this.funcs.hasProperty(params, 'temperature')) {
+        let newTemp = parseInt(params.temperature) / 100
+        if (this.tempOffsetFactor) {
+          newTemp *= this.tempOffset
+        } else {
+          newTemp += this.tempOffset
         }
-      }
-      if (this.funcs.hasProperty(params, 'humidity') && params.humidity !== this.cacheHumiRaw) {
-        this.cacheHumiRaw = params.humidity
-        this.cacheHumi = Math.max(
-          Math.min(parseInt(this.cacheHumiRaw) / 100 + this.humiOffset, 100),
-          0
-        )
-        this.humiService.updateCharacteristic(this.hapChar.CurrentRelativeHumidity, this.cacheHumi)
-        eveLog.humidity = this.cacheHumi
-        if (params.updateSource && this.enableLogging) {
-          this.log('[%s] %s [%s%].', this.name, this.lang.curHumi, this.cacheHumi)
+        if (newTemp !== this.cacheTemp) {
+          this.cacheTemp = newTemp
+          this.tempService.updateCharacteristic(this.hapChar.CurrentTemperature, this.cacheTemp)
+          this.accessory.eveService.addEntry({ temp: this.cacheTemp })
+          if (params.updateSource && this.enableLogging) {
+            this.log('[%s] %s [%s°C].', this.name, this.lang.curTemp, this.cacheTemp)
+          }
         }
       }
-      if (eveLog.temp || eveLog.humidity) {
-        eveLog.time = Math.round(new Date().valueOf() / 1000)
-        this.accessory.eveService.addEntry(eveLog)
+      if (this.funcs.hasProperty(params, 'humidity')) {
+        let newHumi = parseInt(params.humidity) / 100
+        if (this.humiOffsetFactor) {
+          newHumi *= this.humiOffset
+        } else {
+          newHumi += this.humiOffset
+        }
+        newHumi = Math.max(Math.min(parseInt(newHumi), 100), 0)
+        if (newHumi !== this.cacheHumi) {
+          this.cacheHumi = newHumi
+          this.humiService.updateCharacteristic(
+            this.hapChar.CurrentRelativeHumidity,
+            this.cacheHumi
+          )
+          this.accessory.eveService.addEntry({ humidity: this.cacheHumi })
+          if (params.updateSource && this.enableLogging) {
+            this.log('[%s] %s [%s%].', this.name, this.lang.curHumi, this.cacheHumi)
+          }
+        }
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
diff --git a/lib/index.js b/lib/index.js
index 05a24ada..bd0d1cce 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -306,6 +306,8 @@ class eWeLinkPlatform {
                   case 'hideLongDouble':
                   case 'hideSensor':
                   case 'hideSwitch':
+                  case 'humidityOffsetFactor':
+                  case 'offsetFactor':
                   case 'resetOnStartup':
                   case 'scaleBattery':
                     if (typeof v === 'string') {
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 4b9c87cb..a2b4387d 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -130,7 +130,9 @@ module.exports = {
       'showAs',
       'hideSwitch',
       'offset',
+      'offsetFactor',
       'humidityOffset',
+      'humidityOffsetFactor',
       'minTarget',
       'maxTarget',
       'ipAddress',
@@ -153,7 +155,9 @@ module.exports = {
       'showAs',
       'lowBattThreshold',
       'offset',
+      'offsetFactor',
       'humidityOffset',
+      'humidityOffsetFactor',
       'hideLongDouble',
       'scaleBattery',
       'sensorTimeDifference',

From 8547545e79c25cbadeddcc06560c12315f6b55ed Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 18 Jul 2021 10:55:07 +0100
Subject: [PATCH 2551/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 87f5c8d0..0f067b26 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,21 @@
 
 All notable changes to this homebridge-ewelink will be documented in this file.
 
+## BETA
+
+### Added
+
+- Option to offset recorded temperature or humidity by a scale factor
+
+### Changed
+
+- Plugin will now reattempt initial HTTP connection on `ECONNABORTED` error
+- Plugin will now use HomeKit `Battery` service type instead of `BatteryService`
+
+### Fixed
+
+- Plugin will correctly update `StatusLowBattery` characteristic with `INT` instead of type `BOOL`
+
 ## 7.1.0 (2021-07-10)
 
 ### Added

From 322224a80a572471858800b54892dae362c8f35b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 18 Jul 2021 10:58:08 +0100
Subject: [PATCH 2552/3183] 7.1.1-beta.0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 9da90d11..9c60a9fb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "7.1.0",
+  "version": "7.1.1-beta.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index f7ca04b6..8271c2a6 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "7.1.0",
+  "version": "7.1.1-beta.0",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From ccfd1e9908b8b8685f1153eaedc9e5d8c70bb3f5 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 19 Jul 2021 18:52:12 +0100
Subject: [PATCH 2553/3183] jshinting

---
 lib/connection/api.js                     | 2 +-
 lib/connection/http.js                    | 2 +-
 lib/connection/lan.js                     | 2 +-
 lib/connection/ws.js                      | 2 +-
 lib/device/curtain.js                     | 2 +-
 lib/device/diffuser.js                    | 2 +-
 lib/device/fan.js                         | 2 +-
 lib/device/humidifier.js                  | 2 +-
 lib/device/light-cct.js                   | 2 +-
 lib/device/light-dimmer.js                | 2 +-
 lib/device/light-rgb-cct.js               | 2 +-
 lib/device/light-rgb.js                   | 2 +-
 lib/device/motor.js                       | 2 +-
 lib/device/outlet-multi.js                | 2 +-
 lib/device/outlet-single.js               | 2 +-
 lib/device/rf-bridge.js                   | 2 +-
 lib/device/rf-button.js                   | 2 +-
 lib/device/rf-sensor.js                   | 2 +-
 lib/device/sensor-ambient.js              | 2 +-
 lib/device/sensor-contact.js              | 2 +-
 lib/device/sensor-temp-humi.js            | 2 +-
 lib/device/simulation/blind.js            | 2 +-
 lib/device/simulation/cooler.js           | 2 +-
 lib/device/simulation/dehumidifier.js     | 2 +-
 lib/device/simulation/door.js             | 2 +-
 lib/device/simulation/doorbell.js         | 2 +-
 lib/device/simulation/garage-eachen.js    | 2 +-
 lib/device/simulation/garage-four.js      | 2 +-
 lib/device/simulation/garage-od-switch.js | 2 +-
 lib/device/simulation/garage-one.js       | 2 +-
 lib/device/simulation/garage-two.js       | 2 +-
 lib/device/simulation/heater.js           | 2 +-
 lib/device/simulation/humidifier.js       | 2 +-
 lib/device/simulation/lock-one.js         | 2 +-
 lib/device/simulation/p-button.js         | 2 +-
 lib/device/simulation/purifier.js         | 2 +-
 lib/device/simulation/sensor-hidden.js    | 2 +-
 lib/device/simulation/sensor-leak.js      | 2 +-
 lib/device/simulation/sensor-visible.js   | 2 +-
 lib/device/simulation/sensor.js           | 2 +-
 lib/device/simulation/switch-valve.js     | 2 +-
 lib/device/simulation/tap-one.js          | 2 +-
 lib/device/simulation/tap-two.js          | 2 +-
 lib/device/simulation/valve-four.js       | 2 +-
 lib/device/simulation/valve-one.js        | 2 +-
 lib/device/simulation/valve-two.js        | 2 +-
 lib/device/simulation/window.js           | 2 +-
 lib/device/switch-multi.js                | 2 +-
 lib/device/switch-single.js               | 2 +-
 lib/device/thermostat.js                  | 2 +-
 lib/device/zigbee/light-cct.js            | 2 +-
 lib/device/zigbee/light-dimmer.js         | 2 +-
 lib/device/zigbee/sensor-ambient.js       | 2 +-
 lib/device/zigbee/sensor-contact.js       | 2 +-
 lib/device/zigbee/sensor-leak.js          | 2 +-
 lib/device/zigbee/sensor-motion.js        | 2 +-
 lib/device/zigbee/switch-stateless.js     | 2 +-
 lib/fakegato/fakegato-history.js          | 2 +-
 lib/fakegato/fakegato-storage.js          | 2 +-
 lib/fakegato/fakegato-timer.js            | 2 +-
 lib/fakegato/uuid.js                      | 2 +-
 lib/homebridge-ui/server.js               | 2 +-
 lib/index.js                              | 2 +-
 lib/utils/colour-utils.js                 | 2 +-
 lib/utils/constants.js                    | 2 +-
 lib/utils/eve-chars.js                    | 2 +-
 lib/utils/functions.js                    | 2 +-
 lib/utils/lang-en.js                      | 2 +-
 68 files changed, 68 insertions(+), 68 deletions(-)

diff --git a/lib/connection/api.js b/lib/connection/api.js
index 016d37b4..a9cbc23c 100644
--- a/lib/connection/api.js
+++ b/lib/connection/api.js
@@ -1,4 +1,4 @@
-/* jshint -W014, -W033, esversion: 9 */
+/* jshint node: true,esversion: 9, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/connection/http.js b/lib/connection/http.js
index 253324e8..beec4afa 100644
--- a/lib/connection/http.js
+++ b/lib/connection/http.js
@@ -1,4 +1,4 @@
-/* jshint -W014, -W033, esversion: 9 */
+/* jshint node: true,esversion: 9, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/connection/lan.js b/lib/connection/lan.js
index 297df75d..3bd9dbfb 100644
--- a/lib/connection/lan.js
+++ b/lib/connection/lan.js
@@ -1,4 +1,4 @@
-/* jshint -W014, -W033, esversion: 9 */
+/* jshint node: true,esversion: 9, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/connection/ws.js b/lib/connection/ws.js
index 79ed0c9c..85894210 100644
--- a/lib/connection/ws.js
+++ b/lib/connection/ws.js
@@ -1,4 +1,4 @@
-/* jshint -W014, -W033, esversion: 9 */
+/* jshint node: true,esversion: 9, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/curtain.js b/lib/device/curtain.js
index ade34505..9d7c6d39 100644
--- a/lib/device/curtain.js
+++ b/lib/device/curtain.js
@@ -1,4 +1,4 @@
-/* jshint -W014, -W033, esversion: 9 */
+/* jshint node: true,esversion: 9, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/diffuser.js b/lib/device/diffuser.js
index c422f9c3..2a42ff75 100644
--- a/lib/device/diffuser.js
+++ b/lib/device/diffuser.js
@@ -1,4 +1,4 @@
-/* jshint -W014, -W033, esversion: 9 */
+/* jshint node: true,esversion: 9, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/fan.js b/lib/device/fan.js
index 1255f298..f20e3e2c 100644
--- a/lib/device/fan.js
+++ b/lib/device/fan.js
@@ -1,4 +1,4 @@
-/* jshint -W014, -W033, esversion: 9 */
+/* jshint node: true,esversion: 9, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/humidifier.js b/lib/device/humidifier.js
index 02970cc9..730d7321 100644
--- a/lib/device/humidifier.js
+++ b/lib/device/humidifier.js
@@ -1,4 +1,4 @@
-/* jshint -W014, -W033, esversion: 9 */
+/* jshint node: true,esversion: 9, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/light-cct.js b/lib/device/light-cct.js
index 20089d5f..97551be3 100644
--- a/lib/device/light-cct.js
+++ b/lib/device/light-cct.js
@@ -1,4 +1,4 @@
-/* jshint -W014, -W033, esversion: 9 */
+/* jshint node: true,esversion: 9, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/light-dimmer.js b/lib/device/light-dimmer.js
index 4abaa2b4..80bf69a9 100644
--- a/lib/device/light-dimmer.js
+++ b/lib/device/light-dimmer.js
@@ -1,4 +1,4 @@
-/* jshint -W014, -W033, esversion: 9 */
+/* jshint node: true,esversion: 9, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/light-rgb-cct.js b/lib/device/light-rgb-cct.js
index 8d17975c..fcf6ec6f 100644
--- a/lib/device/light-rgb-cct.js
+++ b/lib/device/light-rgb-cct.js
@@ -1,4 +1,4 @@
-/* jshint -W014, -W033, esversion: 9 */
+/* jshint node: true,esversion: 9, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/light-rgb.js b/lib/device/light-rgb.js
index 79f5d08b..ace1b415 100644
--- a/lib/device/light-rgb.js
+++ b/lib/device/light-rgb.js
@@ -1,4 +1,4 @@
-/* jshint -W014, -W033, esversion: 9 */
+/* jshint node: true,esversion: 9, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/motor.js b/lib/device/motor.js
index 95d903b8..067f6320 100644
--- a/lib/device/motor.js
+++ b/lib/device/motor.js
@@ -1,4 +1,4 @@
-/* jshint -W014, -W033, esversion: 9 */
+/* jshint node: true,esversion: 9, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/outlet-multi.js b/lib/device/outlet-multi.js
index 93768857..b45b1b07 100644
--- a/lib/device/outlet-multi.js
+++ b/lib/device/outlet-multi.js
@@ -1,4 +1,4 @@
-/* jshint -W014, -W033, esversion: 9 */
+/* jshint node: true,esversion: 9, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/outlet-single.js b/lib/device/outlet-single.js
index cb941771..68916f5e 100644
--- a/lib/device/outlet-single.js
+++ b/lib/device/outlet-single.js
@@ -1,4 +1,4 @@
-/* jshint -W014, -W033, esversion: 9 */
+/* jshint node: true,esversion: 9, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/rf-bridge.js b/lib/device/rf-bridge.js
index 283ea097..53888438 100644
--- a/lib/device/rf-bridge.js
+++ b/lib/device/rf-bridge.js
@@ -1,4 +1,4 @@
-/* jshint -W014, -W033, esversion: 9 */
+/* jshint node: true,esversion: 9, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/rf-button.js b/lib/device/rf-button.js
index 3f25ba55..7ae3d159 100644
--- a/lib/device/rf-button.js
+++ b/lib/device/rf-button.js
@@ -1,4 +1,4 @@
-/* jshint -W014, -W033, esversion: 9 */
+/* jshint node: true,esversion: 9, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/rf-sensor.js b/lib/device/rf-sensor.js
index 06efecb0..9cf836a1 100644
--- a/lib/device/rf-sensor.js
+++ b/lib/device/rf-sensor.js
@@ -1,4 +1,4 @@
-/* jshint -W014, -W033, esversion: 9 */
+/* jshint node: true,esversion: 9, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/sensor-ambient.js b/lib/device/sensor-ambient.js
index 1356eb41..78850cf8 100644
--- a/lib/device/sensor-ambient.js
+++ b/lib/device/sensor-ambient.js
@@ -1,4 +1,4 @@
-/* jshint -W014, -W033, esversion: 9 */
+/* jshint node: true,esversion: 9, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/sensor-contact.js b/lib/device/sensor-contact.js
index af28f6fe..842e0dea 100644
--- a/lib/device/sensor-contact.js
+++ b/lib/device/sensor-contact.js
@@ -1,4 +1,4 @@
-/* jshint -W014, -W033, esversion: 9 */
+/* jshint node: true,esversion: 9, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/sensor-temp-humi.js b/lib/device/sensor-temp-humi.js
index 815ae35d..35abffb2 100644
--- a/lib/device/sensor-temp-humi.js
+++ b/lib/device/sensor-temp-humi.js
@@ -1,4 +1,4 @@
-/* jshint -W014, -W033, esversion: 9 */
+/* jshint node: true,esversion: 9, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/simulation/blind.js b/lib/device/simulation/blind.js
index b2c9df2e..85269d5f 100644
--- a/lib/device/simulation/blind.js
+++ b/lib/device/simulation/blind.js
@@ -1,4 +1,4 @@
-/* jshint -W014, -W033, esversion: 9 */
+/* jshint node: true,esversion: 9, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/simulation/cooler.js b/lib/device/simulation/cooler.js
index 85c63a5c..cbfea3fc 100644
--- a/lib/device/simulation/cooler.js
+++ b/lib/device/simulation/cooler.js
@@ -1,4 +1,4 @@
-/* jshint -W014, -W033, esversion: 9 */
+/* jshint node: true,esversion: 9, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/simulation/dehumidifier.js b/lib/device/simulation/dehumidifier.js
index a624a9be..19e50beb 100644
--- a/lib/device/simulation/dehumidifier.js
+++ b/lib/device/simulation/dehumidifier.js
@@ -1,4 +1,4 @@
-/* jshint -W014, -W033, esversion: 9 */
+/* jshint node: true,esversion: 9, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/simulation/door.js b/lib/device/simulation/door.js
index 5744c056..c5b01470 100644
--- a/lib/device/simulation/door.js
+++ b/lib/device/simulation/door.js
@@ -1,4 +1,4 @@
-/* jshint -W014, -W033, esversion: 9 */
+/* jshint node: true,esversion: 9, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/simulation/doorbell.js b/lib/device/simulation/doorbell.js
index 558e77cd..6772c70e 100644
--- a/lib/device/simulation/doorbell.js
+++ b/lib/device/simulation/doorbell.js
@@ -1,4 +1,4 @@
-/* jshint -W014, -W033, esversion: 9 */
+/* jshint node: true,esversion: 9, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/simulation/garage-eachen.js b/lib/device/simulation/garage-eachen.js
index 7d9aedee..32d52765 100644
--- a/lib/device/simulation/garage-eachen.js
+++ b/lib/device/simulation/garage-eachen.js
@@ -1,4 +1,4 @@
-/* jshint -W014, -W033, esversion: 9 */
+/* jshint node: true,esversion: 9, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/simulation/garage-four.js b/lib/device/simulation/garage-four.js
index e509f68f..8bcf8a48 100644
--- a/lib/device/simulation/garage-four.js
+++ b/lib/device/simulation/garage-four.js
@@ -1,4 +1,4 @@
-/* jshint -W014, -W033, esversion: 9 */
+/* jshint node: true,esversion: 9, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/simulation/garage-od-switch.js b/lib/device/simulation/garage-od-switch.js
index e360c475..fc316879 100644
--- a/lib/device/simulation/garage-od-switch.js
+++ b/lib/device/simulation/garage-od-switch.js
@@ -1,4 +1,4 @@
-/* jshint -W014, -W033, esversion: 9 */
+/* jshint node: true,esversion: 9, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/simulation/garage-one.js b/lib/device/simulation/garage-one.js
index 20b59326..2314a08e 100644
--- a/lib/device/simulation/garage-one.js
+++ b/lib/device/simulation/garage-one.js
@@ -1,4 +1,4 @@
-/* jshint -W014, -W033, esversion: 9 */
+/* jshint node: true,esversion: 9, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/simulation/garage-two.js b/lib/device/simulation/garage-two.js
index 9a605cfc..9a4aeefb 100644
--- a/lib/device/simulation/garage-two.js
+++ b/lib/device/simulation/garage-two.js
@@ -1,4 +1,4 @@
-/* jshint -W014, -W033, esversion: 9 */
+/* jshint node: true,esversion: 9, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/simulation/heater.js b/lib/device/simulation/heater.js
index 29d50403..aac6291f 100644
--- a/lib/device/simulation/heater.js
+++ b/lib/device/simulation/heater.js
@@ -1,4 +1,4 @@
-/* jshint -W014, -W033, esversion: 9 */
+/* jshint node: true,esversion: 9, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/simulation/humidifier.js b/lib/device/simulation/humidifier.js
index dd2c42dc..e5357212 100644
--- a/lib/device/simulation/humidifier.js
+++ b/lib/device/simulation/humidifier.js
@@ -1,4 +1,4 @@
-/* jshint -W014, -W033, esversion: 9 */
+/* jshint node: true,esversion: 9, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/simulation/lock-one.js b/lib/device/simulation/lock-one.js
index 8520b113..2c4f1d6d 100644
--- a/lib/device/simulation/lock-one.js
+++ b/lib/device/simulation/lock-one.js
@@ -1,4 +1,4 @@
-/* jshint -W014, -W033, esversion: 9 */
+/* jshint node: true,esversion: 9, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/simulation/p-button.js b/lib/device/simulation/p-button.js
index b162c8aa..6ae6a3c4 100644
--- a/lib/device/simulation/p-button.js
+++ b/lib/device/simulation/p-button.js
@@ -1,4 +1,4 @@
-/* jshint -W014, -W033, esversion: 9 */
+/* jshint node: true,esversion: 9, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/simulation/purifier.js b/lib/device/simulation/purifier.js
index 7c46c2c3..ac907754 100644
--- a/lib/device/simulation/purifier.js
+++ b/lib/device/simulation/purifier.js
@@ -1,4 +1,4 @@
-/* jshint -W014, -W033, esversion: 9 */
+/* jshint node: true,esversion: 9, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/simulation/sensor-hidden.js b/lib/device/simulation/sensor-hidden.js
index c4e9dd7d..f21e7399 100644
--- a/lib/device/simulation/sensor-hidden.js
+++ b/lib/device/simulation/sensor-hidden.js
@@ -1,4 +1,4 @@
-/* jshint -W014, -W033, esversion: 9 */
+/* jshint node: true,esversion: 9, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/simulation/sensor-leak.js b/lib/device/simulation/sensor-leak.js
index 651a3d4e..dd2c336a 100644
--- a/lib/device/simulation/sensor-leak.js
+++ b/lib/device/simulation/sensor-leak.js
@@ -1,4 +1,4 @@
-/* jshint -W014, -W033, esversion: 9 */
+/* jshint node: true,esversion: 9, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/simulation/sensor-visible.js b/lib/device/simulation/sensor-visible.js
index 787bb5c8..2b19d4ff 100644
--- a/lib/device/simulation/sensor-visible.js
+++ b/lib/device/simulation/sensor-visible.js
@@ -1,4 +1,4 @@
-/* jshint -W014, -W033, esversion: 9 */
+/* jshint node: true,esversion: 9, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/simulation/sensor.js b/lib/device/simulation/sensor.js
index 4e244761..287aaa5c 100644
--- a/lib/device/simulation/sensor.js
+++ b/lib/device/simulation/sensor.js
@@ -1,4 +1,4 @@
-/* jshint -W014, -W033, esversion: 9 */
+/* jshint node: true,esversion: 9, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/simulation/switch-valve.js b/lib/device/simulation/switch-valve.js
index afb42fde..d6d5016a 100644
--- a/lib/device/simulation/switch-valve.js
+++ b/lib/device/simulation/switch-valve.js
@@ -1,4 +1,4 @@
-/* jshint -W014, -W033, esversion: 9 */
+/* jshint node: true,esversion: 9, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/simulation/tap-one.js b/lib/device/simulation/tap-one.js
index 25dd9e53..759a7f9c 100644
--- a/lib/device/simulation/tap-one.js
+++ b/lib/device/simulation/tap-one.js
@@ -1,4 +1,4 @@
-/* jshint -W014, -W033, esversion: 9 */
+/* jshint node: true,esversion: 9, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/simulation/tap-two.js b/lib/device/simulation/tap-two.js
index 41263233..4c88e14e 100644
--- a/lib/device/simulation/tap-two.js
+++ b/lib/device/simulation/tap-two.js
@@ -1,4 +1,4 @@
-/* jshint -W014, -W033, esversion: 9 */
+/* jshint node: true,esversion: 9, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/simulation/valve-four.js b/lib/device/simulation/valve-four.js
index 1d0718bf..d4865d19 100644
--- a/lib/device/simulation/valve-four.js
+++ b/lib/device/simulation/valve-four.js
@@ -1,4 +1,4 @@
-/* jshint -W014, -W033, esversion: 9 */
+/* jshint node: true,esversion: 9, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/simulation/valve-one.js b/lib/device/simulation/valve-one.js
index 7cbffc96..3935020d 100644
--- a/lib/device/simulation/valve-one.js
+++ b/lib/device/simulation/valve-one.js
@@ -1,4 +1,4 @@
-/* jshint -W014, -W033, esversion: 9 */
+/* jshint node: true,esversion: 9, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/simulation/valve-two.js b/lib/device/simulation/valve-two.js
index ae502319..00d8604c 100644
--- a/lib/device/simulation/valve-two.js
+++ b/lib/device/simulation/valve-two.js
@@ -1,4 +1,4 @@
-/* jshint -W014, -W033, esversion: 9 */
+/* jshint node: true,esversion: 9, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/simulation/window.js b/lib/device/simulation/window.js
index c1bc9818..b352835a 100644
--- a/lib/device/simulation/window.js
+++ b/lib/device/simulation/window.js
@@ -1,4 +1,4 @@
-/* jshint -W014, -W033, esversion: 9 */
+/* jshint node: true,esversion: 9, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/switch-multi.js b/lib/device/switch-multi.js
index 34792c6b..7e6c9373 100644
--- a/lib/device/switch-multi.js
+++ b/lib/device/switch-multi.js
@@ -1,4 +1,4 @@
-/* jshint -W014, -W033, esversion: 9 */
+/* jshint node: true,esversion: 9, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/switch-single.js b/lib/device/switch-single.js
index 084a8b0c..8ad008b0 100644
--- a/lib/device/switch-single.js
+++ b/lib/device/switch-single.js
@@ -1,4 +1,4 @@
-/* jshint -W014, -W033, esversion: 9 */
+/* jshint node: true,esversion: 9, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/thermostat.js b/lib/device/thermostat.js
index d156b8f2..9bea8c19 100644
--- a/lib/device/thermostat.js
+++ b/lib/device/thermostat.js
@@ -1,4 +1,4 @@
-/* jshint -W014, -W033, esversion: 9 */
+/* jshint node: true,esversion: 9, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/zigbee/light-cct.js b/lib/device/zigbee/light-cct.js
index 76df2c61..ba74fb47 100644
--- a/lib/device/zigbee/light-cct.js
+++ b/lib/device/zigbee/light-cct.js
@@ -1,4 +1,4 @@
-/* jshint -W014, -W033, esversion: 9 */
+/* jshint node: true,esversion: 9, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/zigbee/light-dimmer.js b/lib/device/zigbee/light-dimmer.js
index 438f0090..d128f957 100644
--- a/lib/device/zigbee/light-dimmer.js
+++ b/lib/device/zigbee/light-dimmer.js
@@ -1,4 +1,4 @@
-/* jshint -W014, -W033, esversion: 9 */
+/* jshint node: true,esversion: 9, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/zigbee/sensor-ambient.js b/lib/device/zigbee/sensor-ambient.js
index 2c0c1857..b72359ce 100644
--- a/lib/device/zigbee/sensor-ambient.js
+++ b/lib/device/zigbee/sensor-ambient.js
@@ -1,4 +1,4 @@
-/* jshint -W014, -W033, esversion: 9 */
+/* jshint node: true,esversion: 9, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/zigbee/sensor-contact.js b/lib/device/zigbee/sensor-contact.js
index 70e371b0..3fdd6cda 100644
--- a/lib/device/zigbee/sensor-contact.js
+++ b/lib/device/zigbee/sensor-contact.js
@@ -1,4 +1,4 @@
-/* jshint -W014, -W033, esversion: 9 */
+/* jshint node: true,esversion: 9, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/zigbee/sensor-leak.js b/lib/device/zigbee/sensor-leak.js
index 0bf8ab23..2f10e7c5 100644
--- a/lib/device/zigbee/sensor-leak.js
+++ b/lib/device/zigbee/sensor-leak.js
@@ -1,4 +1,4 @@
-/* jshint -W014, -W033, esversion: 9 */
+/* jshint node: true,esversion: 9, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/zigbee/sensor-motion.js b/lib/device/zigbee/sensor-motion.js
index 7d4d9ece..934aa8fd 100644
--- a/lib/device/zigbee/sensor-motion.js
+++ b/lib/device/zigbee/sensor-motion.js
@@ -1,4 +1,4 @@
-/* jshint -W014, -W033, esversion: 9 */
+/* jshint node: true,esversion: 9, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/zigbee/switch-stateless.js b/lib/device/zigbee/switch-stateless.js
index 1b984168..9b8c15c9 100644
--- a/lib/device/zigbee/switch-stateless.js
+++ b/lib/device/zigbee/switch-stateless.js
@@ -1,4 +1,4 @@
-/* jshint -W014, -W033, esversion: 9 */
+/* jshint node: true,esversion: 9, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/fakegato/fakegato-history.js b/lib/fakegato/fakegato-history.js
index 820db050..d6a28668 100644
--- a/lib/fakegato/fakegato-history.js
+++ b/lib/fakegato/fakegato-history.js
@@ -1,4 +1,4 @@
-/* jshint -W014, -W033, esversion: 9 */
+/* jshint node: true,esversion: 9, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/fakegato/fakegato-storage.js b/lib/fakegato/fakegato-storage.js
index 290184b3..d21f546e 100644
--- a/lib/fakegato/fakegato-storage.js
+++ b/lib/fakegato/fakegato-storage.js
@@ -1,4 +1,4 @@
-/* jshint -W014, -W033, esversion: 9 */
+/* jshint node: true,esversion: 9, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/fakegato/fakegato-timer.js b/lib/fakegato/fakegato-timer.js
index 2d0e1119..cec8a866 100644
--- a/lib/fakegato/fakegato-timer.js
+++ b/lib/fakegato/fakegato-timer.js
@@ -1,4 +1,4 @@
-/* jshint -W014, -W033, esversion: 9 */
+/* jshint node: true,esversion: 9, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/fakegato/uuid.js b/lib/fakegato/uuid.js
index f7b8f19c..821e80c2 100644
--- a/lib/fakegato/uuid.js
+++ b/lib/fakegato/uuid.js
@@ -1,4 +1,4 @@
-/* jshint -W014, -W033, esversion: 9 */
+/* jshint node: true,esversion: 9, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/homebridge-ui/server.js b/lib/homebridge-ui/server.js
index e6965ebd..4dd99adf 100644
--- a/lib/homebridge-ui/server.js
+++ b/lib/homebridge-ui/server.js
@@ -1,4 +1,4 @@
-/* jshint -W014, -W033, esversion: 9 */
+/* jshint node: true,esversion: 9, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/index.js b/lib/index.js
index bd0d1cce..0322c458 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1,4 +1,4 @@
-/* jshint -W014, -W033, esversion: 9 */
+/* jshint node: true,esversion: 9, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/utils/colour-utils.js b/lib/utils/colour-utils.js
index 42474d70..785a01e0 100644
--- a/lib/utils/colour-utils.js
+++ b/lib/utils/colour-utils.js
@@ -1,4 +1,4 @@
-/* jshint -W014, -W033, esversion: 9 */
+/* jshint node: true,esversion: 9, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index a2b4387d..f6b5ea31 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -1,4 +1,4 @@
-/* jshint -W014, -W033, esversion: 9 */
+/* jshint node: true,esversion: 9, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/utils/eve-chars.js b/lib/utils/eve-chars.js
index 526e8d67..bb357ca8 100644
--- a/lib/utils/eve-chars.js
+++ b/lib/utils/eve-chars.js
@@ -1,4 +1,4 @@
-/* jshint -W014, -W033, esversion: 9 */
+/* jshint node: true,esversion: 9, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/utils/functions.js b/lib/utils/functions.js
index 18ef91e4..815d15ae 100644
--- a/lib/utils/functions.js
+++ b/lib/utils/functions.js
@@ -1,4 +1,4 @@
-/* jshint -W014, -W033, esversion: 9 */
+/* jshint node: true,esversion: 9, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/utils/lang-en.js b/lib/utils/lang-en.js
index 8c1bf78c..f50e92f0 100644
--- a/lib/utils/lang-en.js
+++ b/lib/utils/lang-en.js
@@ -1,4 +1,4 @@
-/* jshint -W014, -W033, esversion: 9 */
+/* jshint node: true,esversion: 9, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 

From 423593a6784cbbfaa896758e1bac90ccd60f792b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 21 Jul 2021 15:39:07 +0100
Subject: [PATCH 2554/3183] remove outletDevices check (to prevent #277)

---
 lib/index.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/index.js b/lib/index.js
index 0322c458..0bc8db07 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -207,7 +207,6 @@ class eWeLinkPlatform {
         case 'fanDevices':
         case 'lightDevices':
         case 'multiDevices':
-        case 'outletDevices':
         case 'rfDevices':
         case 'sensorDevices':
         case 'singleDevices':

From a0022eb945bcf901b8ba154cb77eb08909e09b5e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 21 Jul 2021 15:40:32 +0100
Subject: [PATCH 2555/3183] add smartwise to keywords

---
 package.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 8271c2a6..3a2d7f6a 100644
--- a/package.json
+++ b/package.json
@@ -13,10 +13,12 @@
     "hoobs-plugin",
     "homekit",
     "siri",
+    "zigbee",
+    "rf",
     "ewelink",
     "sonoff",
     "eachen",
-    "zigbee"
+    "smartwise"
   ],
   "main": "lib/index.js",
   "engines": {

From b704e9fc3855b06d4bb2ee325e2a7cea1633301e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 22 Jul 2021 11:15:42 +0100
Subject: [PATCH 2556/3183] remove groups and ignoredDevices entries

---
 config.schema.json     | 226 -----------------------------------------
 lib/index.js           | 149 ++-------------------------
 lib/utils/constants.js |   2 -
 3 files changed, 9 insertions(+), 368 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index fc20f0be..b1cdc464 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -1438,186 +1438,6 @@
             }
           }
         }
-      },
-      "groups": {
-        "title": "Accessory Simulations",
-        "description": "Set up simulated accessories from generic switch devices (<a href=\"https://github.com/bwp91/homebridge-ewelink/wiki/Accessory-Simulations\" target=\"_blank\">more info</a>).",
-        "type": "array",
-        "items": {
-          "type": "object",
-          "properties": {
-            "deviceId": {
-              "type": "string",
-              "title": "Device ID",
-              "description": "Enter the 10 digit eWeLink Device ID to begin.",
-              "minLength": 10,
-              "maxLength": 10
-            },
-            "label": {
-              "title": "Label",
-              "type": "string",
-              "description": "This setting has no effect except to help identify this device.",
-              "condition": {
-                "functionBody": "return (model.groups && model.groups[arrayIndices] && model.groups[arrayIndices].deviceId && model.groups[arrayIndices].deviceId.length === 10);"
-              }
-            },
-            "type": {
-              "type": "string",
-              "title": "Type",
-              "description": "The new type for this device.",
-              "oneOf": [
-                {
-                  "title": "1 Garage Door (with single or multi channel device)",
-                  "enum": ["garage"]
-                },
-                {
-                  "title": "1 Garage Door (with Eachen GDDC5)",
-                  "enum": ["garage_eachen"]
-                },
-                {
-                  "title": "2 Garage Doors (with multi channel device)",
-                  "enum": ["garage_two"]
-                },
-                {
-                  "title": "4 Garage Doors (with multi channel device)",
-                  "enum": ["garage_four"]
-                },
-                {
-                  "title": "1 Window Blind (with multi channel device)",
-                  "enum": ["blind"]
-                },
-                {
-                  "title": "1 Door (with multi channel device)",
-                  "enum": ["door"]
-                },
-                {
-                  "title": "1 Window (with multi channel device)",
-                  "enum": ["window"]
-                },
-                {
-                  "title": "1 Lock (with single or multi channel device)",
-                  "enum": ["lock"]
-                },
-                {
-                  "title": "1 Tap/Faucet (with single or multi channel device)",
-                  "enum": ["tap"]
-                },
-                {
-                  "title": "2 Taps/Faucets (with multi channel device)",
-                  "enum": ["tap_two"]
-                },
-                {
-                  "title": "1 Irrigation Valve (with single or multi channel device)",
-                  "enum": ["valve"]
-                },
-                {
-                  "title": "2 Irrigation Valves (with multi channel device)",
-                  "enum": ["valve_two"]
-                },
-                {
-                  "title": "4 Irrigation Valves (with multi channel device)",
-                  "enum": ["valve_four"]
-                },
-                {
-                  "title": "1 Switch & 1 Valve (with multi channel device)",
-                  "enum": ["switch_valve"]
-                }
-              ],
-              "condition": {
-                "functionBody": "return (model.groups && model.groups[arrayIndices] && model.groups[arrayIndices].deviceId && model.groups[arrayIndices].deviceId.length === 10);"
-              }
-            },
-            "operationTime": {
-              "type": "integer",
-              "title": "Operation Time (Deciseconds)",
-              "description": "Blinds/garage doors: the time to open/close the device. Locks: the time to show as unlocked. This setting is in deciseconds - count the time in seconds and multiply by 10, for example 75 for 7.5 seconds. Must be 20 or more.",
-              "placeholder": 100,
-              "minimum": 20,
-              "condition": {
-                "functionBody": "return (model.groups && model.groups[arrayIndices] && ['garage', 'garage_two', 'garage_four', 'garage_eachen', 'blind', 'door', 'window', 'lock'].includes(model.groups[arrayIndices].type));"
-              }
-            },
-            "operationTimeDown": {
-              "type": "integer",
-              "title": "Operation Time Down (Deciseconds)",
-              "description": "If your garage door or blind has a different operation time for up and down, use this setting to specify the operation time DOWN (in deciseconds) and the other setting to specify the operation time UP. Otherwise leave blank. Must be 20 or more.",
-              "placeholder": 100,
-              "minimum": 20,
-              "condition": {
-                "functionBody": "return (model.groups && model.groups[arrayIndices] && ['garage', 'garage_two', 'garage_four', 'blind', 'door', 'window'].includes(model.groups[arrayIndices].type));"
-              }
-            },
-            "sensorId": {
-              "type": "string",
-              "title": "Sensor",
-              "description": "A DW2 or Zigbee contact sensor can be used for a single garage door or lock to determine the current state. Enter the 10 digit eWeLink Device ID (normally in the format 1000ab23cd). Otherwise leave blank.",
-              "minLength": 10,
-              "maxLength": 10,
-              "condition": {
-                "functionBody": "return (model.groups && model.groups[arrayIndices] && ['garage'].includes(model.groups[arrayIndices].type));"
-              }
-            },
-            "hideSensor": {
-              "type": "boolean",
-              "title": "Hide Sensor",
-              "description": "Hide this contact sensor accessory from HomeKit.",
-              "condition": {
-                "functionBody": "return (model.groups && model.groups[arrayIndices] && model.groups[arrayIndices].sensorId && model.groups[arrayIndices].sensorId.length === 10);"
-              }
-            },
-            "obstructId": {
-              "type": "string",
-              "title": "Obstruction Switch",
-              "description": "An optional switch that will trigger the Obstruction Detected feature depending on its value. Otherwise leave blank.",
-              "condition": {
-                "functionBody": "return (model.groups && model.groups[arrayIndices] && ['garage', 'garage_eachen'].includes(model.groups[arrayIndices].type));"
-              }
-            },
-            "ipAddress": {
-              "type": "string",
-              "title": "IP Address",
-              "description": "You can manually set the IP address for this device if it cannot be discovered by the plugin.",
-              "condition": {
-                "functionBody": "return (model.mode !== 'wan' && model.groups && model.groups[arrayIndices] && ['blind', 'door', 'garage', 'garage_two', 'garage_four', 'garage_eachen', 'lock', 'purifier', 'sensor', 'p_button', 'doorbell', 'switch_valve', 'tap', 'tap_two', 'valve', 'valve_two', 'valve_four', 'window'].includes(model.groups[arrayIndices].type));"
-              }
-            },
-            "overrideLogging": {
-              "type": "string",
-              "title": "Override Logging Setting",
-              "description": "Override global logging setting for this device.",
-              "oneOf": [
-                {
-                  "title": "Default (Use Global Setting)",
-                  "enum": ["default"]
-                },
-                {
-                  "title": "Enable Standard Logging",
-                  "enum": ["standard"]
-                },
-                {
-                  "title": "Enable Debug Logging",
-                  "enum": ["debug"]
-                },
-                {
-                  "title": "Disable All Logging",
-                  "enum": ["disable"]
-                }
-              ],
-              "condition": {
-                "functionBody": "return (model.groups && model.groups[arrayIndices] && ['blind', 'door', 'garage', 'garage_two', 'garage_four', 'garage_eachen', 'lock', 'purifier', 'switch_valve', 'tap', 'tap_two', 'valve', 'valve_two', 'valve_four', 'window'].includes(model.groups[arrayIndices].type));"
-              }
-            }
-          }
-        }
-      },
-      "ignoredDevices": {
-        "title": "Ignored Devices",
-        "type": "array",
-        "items": {
-          "type": "string",
-          "title": "Device ID",
-          "description": "eWeLink Device ID of the device to ignore, e.g. 10009553c8."
-        }
       }
     }
   },
@@ -1854,52 +1674,6 @@
           ]
         }
       ]
-    },
-    {
-      "key": "groups",
-      "expandable": true,
-      "title": "Accessory Simulations",
-      "description": "Set up simulated accessories from generic switch devices (<a href=\"https://github.com/bwp91/homebridge-ewelink/wiki/Accessory-Simulations\" target=\"_blank\">more info</a>).",
-      "add": "Add Another Type",
-      "type": "array",
-      "items": [
-        {
-          "type": "fieldset",
-          "items": [
-            {
-              "type": "help",
-              "helpvalue": "<label class=\"control-label text-warning\">⚠ This section will be removed in a future plugin version. Please use the relevant device sections above to set up new simulations and configure your existing simulations.</label>"
-            },
-            "groups[].deviceId",
-            "groups[].label",
-            "groups[].type",
-            "groups[].operationTime",
-            "groups[].operationTimeDown",
-            "groups[].sensorId",
-            "groups[].hideSensor",
-            "groups[].obstructId",
-            "groups[].ipAddress",
-            "groups[].overrideLogging",
-            {
-              "type": "help",
-              "helpvalue": "<label class=\"control-label text-warning\">⚠ If you find this accessory hasn't set up properly after restarting, then try removing it from the cache so it is re-added.</label>"
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "key": "ignoredDevices",
-      "expandable": true,
-      "title": "Ignored Devices",
-      "add": "Add Another Device",
-      "type": "array",
-      "items": [
-        {
-          "type": "fieldset",
-          "items": ["ignoredDevices[]"]
-        }
-      ]
     }
   ]
 }
diff --git a/lib/index.js b/lib/index.js
index 0bc8db07..cf5176c8 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -254,27 +254,6 @@ class eWeLinkPlatform {
                     }
                     break
                   }
-                  case 'obstructId':
-                    if (typeof v !== 'string' || v === '') {
-                      logIgnore(key + '.' + id + '.' + k)
-                    } else {
-                      const parsed = this.funcs.parseDeviceId(v)
-                      this.deviceConf[id][k] = parsed
-                      this.obstructSwitches[parsed] = id
-                    }
-                    break
-                  case 'overrideLogging':
-                  case 'sensorType':
-                  case 'showAs':
-                  case 'showAsMotor': {
-                    const inSet = this.consts.allowed[k].includes(v)
-                    if (typeof v !== 'string' || !inSet) {
-                      logIgnore(key + '.' + id + '.' + k)
-                    } else {
-                      this.deviceConf[id][k] = inSet ? v : this.consts.defaultValues[k]
-                    }
-                    break
-                  }
                   case 'deviceId':
                   case 'label':
                     break
@@ -331,7 +310,7 @@ class eWeLinkPlatform {
                     if (typeof v === 'string') {
                       logQuotes(key + '.' + id + '.' + k)
                     }
-                    if (!!v && v !== 'false' && !this.config.ignoredDevices.includes(id)) {
+                    if (!!v && v !== 'false') {
                       this.config.ignoredDevices.push(id)
                     }
                     break
@@ -343,112 +322,24 @@ class eWeLinkPlatform {
                     }
                     break
                   }
-                  case 'sensorId':
-                    if (typeof v !== 'string' || v === '') {
-                      logIgnore(key + '.' + id + '.' + k)
-                    } else {
-                      const parsed = this.funcs.parseDeviceId(v)
-                      this.deviceConf[id].sensorId = parsed
-                    }
-                    break
-                }
-              }
-            })
-          } else {
-            logIgnore(key)
-          }
-          break
-        case 'groups':
-          if (Array.isArray(val) && val.length > 0) {
-            val.forEach(x => {
-              if (!x.type || !x.deviceId) {
-                logIgnoreItem(key)
-                return
-              }
-              const id = this.funcs.parseDeviceId(x.deviceId)
-              const entries = Object.entries(x)
-              if (entries.length === 1) {
-                logRemove(key + '.' + id)
-                return
-              }
-              if (!this.funcs.hasProperty(this.deviceConf, id)) {
-                this.deviceConf[id] = {}
-              }
-              this.log.warn(
-                '[%s - %s] Please recreate this simulation in the Single/Multi Channel/TH Devices section of the configuration and remove this entry from the Accessory Simulations section.',
-                id,
-                x.type
-              )
-              for (const [k, v] of entries) {
-                switch (k) {
-                  case 'deviceId':
-                  case 'label':
-                    break
-                  case 'ipAddress': {
-                    if (typeof v !== 'string' || v === '') {
-                      logIgnore(key + '.' + id + '.' + k)
-                    } else {
-                      if (!this.funcs.hasProperty(this.ipOverride, id)) {
-                        this.ipOverride[id] = v
-                      }
-                    }
-                    break
-                  }
-                  case 'hideSensor':
-                    if (typeof v === 'string') {
-                      logQuotes(key + '.' + id + '.' + k)
-                    }
-                    if (!this.funcs.hasProperty(this.deviceConf[id], k)) {
-                      this.deviceConf[id][k] = v === 'false' ? false : !!v
-                    }
-                    break
                   case 'obstructId':
                     if (typeof v !== 'string' || v === '') {
                       logIgnore(key + '.' + id + '.' + k)
                     } else {
                       const parsed = this.funcs.parseDeviceId(v)
-                      if (!this.funcs.hasProperty(this.deviceConf[id], k)) {
-                        this.deviceConf[id][k] = parsed
-                      }
-                      if (!this.funcs.hasProperty(this.obstructSwitches, parsed)) {
-                        this.obstructSwitches[parsed] = id
-                      }
-                    }
-                    break
-                  case 'operationTime':
-                  case 'operationTimeDown': {
-                    if (typeof v === 'string') {
-                      logQuotes(key + '.' + id + '.' + k)
-                    }
-                    const intVal = parseInt(v)
-                    if (isNaN(intVal)) {
-                      logDefault(key + '.' + id + '.' + k, this.consts.defaultValues[k])
-                      if (!this.funcs.hasProperty(this.deviceConf[id], k)) {
-                        this.deviceConf[id][k] = this.consts.defaultValues[k]
-                      }
-                    } else if (intVal < this.consts.minValues[k]) {
-                      logIncrease(key + '.' + id + '.' + k, this.consts.minValues[k])
-                      if (!this.funcs.hasProperty(this.deviceConf[id], k)) {
-                        this.deviceConf[id][k] = this.consts.minValues[k]
-                      }
-                    } else {
-                      if (!this.funcs.hasProperty(this.deviceConf[id], k)) {
-                        this.deviceConf[id][k] = intVal
-                      }
+                      this.deviceConf[id][k] = parsed
+                      this.obstructSwitches[parsed] = id
                     }
                     break
-                  }
                   case 'overrideLogging':
                   case 'sensorType':
-                  case 'type': {
-                    const k1 = k === 'type' ? 'showAs' : k
-                    const inSet = this.consts.allowed[k1].includes(v)
+                  case 'showAs':
+                  case 'showAsMotor': {
+                    const inSet = this.consts.allowed[k].includes(v)
                     if (typeof v !== 'string' || !inSet) {
-                      logIgnore(key + '.' + id + '.' + k1)
+                      logIgnore(key + '.' + id + '.' + k)
                     } else {
-                      if (!this.funcs.hasProperty(this.deviceConf[id], k1)) {
-                        this.deviceConf[id][k1] = v
-                      }
+                      this.deviceConf[id][k] = inSet ? v : this.consts.defaultValues[k]
                     }
                     break
                   }
@@ -457,14 +348,9 @@ class eWeLinkPlatform {
                       logIgnore(key + '.' + id + '.' + k)
                     } else {
                       const parsed = this.funcs.parseDeviceId(v)
-                      if (!this.funcs.hasProperty(this.deviceConf[id], k)) {
-                        this.deviceConf[id].sensorId = parsed
-                      }
+                      this.deviceConf[id].sensorId = parsed
                     }
                     break
-                  default:
-                    logRemove(key + '.' + id + '.' + k)
-                    break
                 }
               }
             })
@@ -484,23 +370,6 @@ class eWeLinkPlatform {
             : this.consts.defaultValues[key]
           break
         }
-        case 'ignoredDevices': {
-          if (Array.isArray(val)) {
-            if (val.length > 0) {
-              val.forEach(deviceId => {
-                deviceId = this.funcs.parseDeviceId(deviceId)
-                if (!this.config.ignoredDevices.includes(deviceId)) {
-                  this.config.ignoredDevices.push(deviceId)
-                }
-              })
-            } else {
-              logRemove(key)
-            }
-          } else {
-            logIgnore(key)
-          }
-          break
-        }
         case 'mode': {
           const inSet = this.consts.allowed.modes.includes(val)
           if (typeof val !== 'string' || !inSet) {
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index f6b5ea31..0215fdb3 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -22,9 +22,7 @@ module.exports = {
     thDevices: [],
     fanDevices: [],
     sensorDevices: [],
-    groups: [],
     bridgeSensors: [],
-    ignoredDevices: [],
     platform: 'eWeLink'
   },
 

From f3cdb80d83124ae397593e331d1ecdcb95f1b6ea Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 22 Jul 2021 11:17:00 +0100
Subject: [PATCH 2557/3183] make clear the extra config is optional

---
 config.schema.json | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index b1cdc464..6b018701 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -113,7 +113,7 @@
       },
       "singleDevices": {
         "title": "Single Channel Devices",
-        "description": "Applies to single-channel switch, outlet and light switch devices.",
+        "description": "Optional settings for single-channel switch, outlet and light switch devices.",
         "type": "array",
         "items": {
           "type": "object",
@@ -371,7 +371,7 @@
       },
       "multiDevices": {
         "title": "Multi Channel Devices",
-        "description": "Applies to multi-channel switch, outlet and light switch devices.",
+        "description": "Optional settings for multi-channel switch, outlet and light switch devices.",
         "type": "array",
         "items": {
           "type": "object",
@@ -679,7 +679,7 @@
       },
       "lightDevices": {
         "title": "Light Devices",
-        "description": "Applies to dimmer, bulb and LED strip devices.",
+        "description": "Optional settings for dimmer, bulb and LED strip devices.",
         "type": "array",
         "items": {
           "type": "object",
@@ -813,7 +813,7 @@
       },
       "thDevices": {
         "title": "Thermostat Devices",
-        "description": "Applies to thermostat devices and the TH10/16.",
+        "description": "Optional settings for thermostat devices and the TH10/16.",
         "type": "array",
         "items": {
           "type": "object",
@@ -991,7 +991,7 @@
       },
       "fanDevices": {
         "title": "Fan Devices",
-        "description": "Applies to iFan devices.",
+        "description": "Optional settings for iFan devices.",
         "type": "array",
         "items": {
           "type": "object",
@@ -1077,7 +1077,7 @@
       },
       "sensorDevices": {
         "title": "Sensor Devices",
-        "description": "Applies to the DW2 and Zigbee sensor devices.",
+        "description": "Optional settings for the DW2 and Zigbee sensor devices.",
         "type": "array",
         "items": {
           "type": "object",
@@ -1255,7 +1255,7 @@
       },
       "rfDevices": {
         "title": "RF Devices",
-        "description": "Applies to RF Bridge devices.",
+        "description": "Optional settings for RF Bridge devices.",
         "type": "array",
         "items": {
           "type": "object",
@@ -1327,7 +1327,7 @@
       },
       "bridgeSensors": {
         "title": "RF Sensor Devices",
-        "description": "Applies to RF Bridge subdevices to expose different sensor types (<a href=\"https://github.com/bwp91/homebridge-ewelink/wiki/RF-Bridge-Sensors\" target=\"_blank\">more info</a>).",
+        "description": "Optional settings for RF Bridge subdevices to expose different sensor types (<a href=\"https://github.com/bwp91/homebridge-ewelink/wiki/RF-Bridge-Sensors\" target=\"_blank\">more info</a>).",
         "type": "array",
         "items": {
           "type": "object",
@@ -1469,7 +1469,7 @@
     {
       "key": "singleDevices",
       "title": "Single Channel Devices",
-      "description": "Applies to single-channel switch, outlet and light switch devices.",
+      "description": "Optional settings for single-channel switch, outlet and light switch devices.",
       "expandable": true,
       "add": "Add Another Device",
       "type": "array",
@@ -1498,7 +1498,7 @@
     {
       "key": "multiDevices",
       "title": "Multi Channel Devices",
-      "description": "Applies to multi-channel switch, outlet and light switch devices.",
+      "description": "Optional settings for multi-channel switch, outlet and light switch devices.",
       "expandable": true,
       "add": "Add Another Device",
       "type": "array",
@@ -1529,7 +1529,7 @@
     {
       "key": "lightDevices",
       "title": "Light Devices",
-      "description": "Applies to dimmer, bulb and LED strip devices.",
+      "description": "Optional settings for dimmer, bulb and LED strip devices.",
       "expandable": true,
       "add": "Add Another Device",
       "type": "array",
@@ -1552,7 +1552,7 @@
     {
       "key": "thDevices",
       "title": "Thermostat Devices",
-      "description": "Applies to thermostat devices and the TH10/16.",
+      "description": "Optional settings for thermostat devices and the TH10/16.",
       "expandable": true,
       "add": "Add Another Device",
       "type": "array",
@@ -1581,7 +1581,7 @@
     {
       "key": "fanDevices",
       "title": "Fan Devices",
-      "description": "Applies to iFan devices.",
+      "description": "Optional settings for iFan devices.",
       "expandable": true,
       "add": "Add Another Device",
       "type": "array",
@@ -1603,7 +1603,7 @@
     {
       "key": "sensorDevices",
       "title": "Sensor Devices",
-      "description": "Applies to the DW2 and Zigbee sensor devices.",
+      "description": "Optional settings for the DW2 and Zigbee sensor devices.",
       "expandable": true,
       "add": "Add Another Device",
       "type": "array",
@@ -1632,7 +1632,7 @@
     {
       "key": "rfDevices",
       "title": "RF Bridge Devices",
-      "description": "Applies to RF Bridge devices.",
+      "description": "Optional settings for RF Bridge devices.",
       "expandable": true,
       "add": "Add Another Device",
       "type": "array",
@@ -1653,7 +1653,7 @@
     {
       "key": "bridgeSensors",
       "title": "RF Subdevices",
-      "description": "Applies to RF Bridge subdevices to expose different sensor types (<a href=\"https://github.com/bwp91/homebridge-ewelink/wiki/RF-Bridge-Sensors\" target=\"_blank\">more info</a>).",
+      "description": "Optional settings for RF Bridge subdevices to expose different sensor types (<a href=\"https://github.com/bwp91/homebridge-ewelink/wiki/RF-Bridge-Sensors\" target=\"_blank\">more info</a>).",
       "expandable": true,
       "add": "Add Another Sensor",
       "type": "array",

From 03209b80623472d0a7f917dee4cc13e898050d22 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 22 Jul 2021 11:19:43 +0100
Subject: [PATCH 2558/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0f067b26..f3f86567 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,11 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 - Plugin will correctly update `StatusLowBattery` characteristic with `INT` instead of type `BOOL`
 
+### Removed
+
+- `ignoredDevices` configuration setting - now use the `ignoreDevice` option in the device type sections
+- `groups` configuration setting - now use the `showAs` option in the device type sections
+
 ## 7.1.0 (2021-07-10)
 
 ### Added

From d6b0e3c3be189063bdbcd5b5c79d575bcca41f37 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 22 Jul 2021 11:52:55 +0100
Subject: [PATCH 2559/3183] add desc for optional settings section

---
 config.schema.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config.schema.json b/config.schema.json
index 6b018701..1c6fab0a 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -1450,6 +1450,7 @@
     {
       "type": "fieldset",
       "title": "Optional Settings",
+      "description": "Optional settings for the plugin, including account, API and global logging settings.",
       "expandable": true,
       "items": [
         "mode",

From d5e21a57b7bdf2403377b3110d6e6311a898e39a Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 22 Jul 2021 11:53:27 +0100
Subject: [PATCH 2560/3183] make offlineAsNoResponse hard set as true, disable
 using disableNoResponse

---
 config.schema.json                     | 8 ++++----
 lib/device/curtain.js                  | 4 ++--
 lib/device/diffuser.js                 | 4 ++--
 lib/device/fan.js                      | 4 ++--
 lib/device/humidifier.js               | 4 ++--
 lib/device/light-cct.js                | 4 ++--
 lib/device/light-dimmer.js             | 4 ++--
 lib/device/light-rgb-cct.js            | 4 ++--
 lib/device/light-rgb.js                | 4 ++--
 lib/device/motor.js                    | 4 ++--
 lib/device/outlet-multi.js             | 4 ++--
 lib/device/outlet-single.js            | 4 ++--
 lib/device/rf-button.js                | 4 ++--
 lib/device/rf-sensor.js                | 4 ++--
 lib/device/sensor-ambient.js           | 4 ++--
 lib/device/sensor-temp-humi.js         | 4 ++--
 lib/device/simulation/blind.js         | 4 ++--
 lib/device/simulation/cooler.js        | 4 ++--
 lib/device/simulation/dehumidifier.js  | 4 ++--
 lib/device/simulation/door.js          | 4 ++--
 lib/device/simulation/doorbell.js      | 4 ++--
 lib/device/simulation/garage-eachen.js | 4 ++--
 lib/device/simulation/garage-four.js   | 4 ++--
 lib/device/simulation/garage-one.js    | 4 ++--
 lib/device/simulation/garage-two.js    | 4 ++--
 lib/device/simulation/heater.js        | 4 ++--
 lib/device/simulation/humidifier.js    | 4 ++--
 lib/device/simulation/lock-one.js      | 4 ++--
 lib/device/simulation/p-button.js      | 4 ++--
 lib/device/simulation/purifier.js      | 4 ++--
 lib/device/simulation/sensor.js        | 4 ++--
 lib/device/simulation/switch-valve.js  | 4 ++--
 lib/device/simulation/tap-one.js       | 4 ++--
 lib/device/simulation/tap-two.js       | 4 ++--
 lib/device/simulation/valve-four.js    | 4 ++--
 lib/device/simulation/valve-one.js     | 4 ++--
 lib/device/simulation/valve-two.js     | 4 ++--
 lib/device/simulation/window.js        | 4 ++--
 lib/device/switch-multi.js             | 4 ++--
 lib/device/switch-single.js            | 4 ++--
 lib/device/thermostat.js               | 4 ++--
 lib/index.js                           | 2 +-
 lib/utils/constants.js                 | 2 +-
 43 files changed, 86 insertions(+), 86 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 1c6fab0a..8593af5c 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -46,10 +46,10 @@
           }
         ]
       },
-      "offlineAsNoResponse": {
+      "disableNoResponse": {
         "type": "boolean",
-        "title": "Offline Accessories",
-        "description": "Whether to mark cloud-offline accessories as 'No Response' in HomeKit. This setting has no effect if the plugin is in LAN mode and does not apply to Zigbee devices nor the DW2 sensor."
+        "title": "Disable 'No Response'",
+        "description": "If true, devices marked as cloud-offline will not be shown as 'No Response' in HomeKit."
       },
       "countryCode": {
         "title": "Country Code",
@@ -1458,7 +1458,7 @@
           "type": "help",
           "helpvalue": "<label class=\"control-label text-warning\">⚠ Using LAN mode will remove any unsupported accessories from Homebridge.</label>"
         },
-        "offlineAsNoResponse",
+        "disableNoReponse",
         "countryCode",
         "httpHost",
         "apiPort",
diff --git a/lib/device/curtain.js b/lib/device/curtain.js
index 9d7c6d39..8da748a5 100644
--- a/lib/device/curtain.js
+++ b/lib/device/curtain.js
@@ -53,8 +53,8 @@ module.exports = class deviceCurtain {
       .getCharacteristic(this.hapChar.TargetPosition)
       .onSet(async value => await this.internalPositionUpdate(value))
 
-    // Add the get handlers only if the user has configured the offlineAsNoResponse setting
-    if (platform.config.offlineAsNoResponse) {
+    // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
+    if (!platform.config.disableNoResponse) {
       this.service.getCharacteristic(this.hapChar.CurrentPosition).onGet(() => {
         if (!this.isOnline) {
           throw new this.hapErr(-70402)
diff --git a/lib/device/diffuser.js b/lib/device/diffuser.js
index 2a42ff75..02900504 100644
--- a/lib/device/diffuser.js
+++ b/lib/device/diffuser.js
@@ -80,8 +80,8 @@ module.exports = class deviceDiffuser {
       .getCharacteristic(this.hapChar.Hue)
       .onSet(async value => await this.internalLightColourUpdate(value))
 
-    // Add the get handlers only if the user has configured the offlineAsNoResponse setting
-    if (platform.config.offlineAsNoResponse) {
+    // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
+    if (!platform.config.disableNoResponse) {
       this.fanService.getCharacteristic(this.hapChar.On).onGet(() => {
         if (!this.isOnline) {
           throw new this.hapErr(-70402)
diff --git a/lib/device/fan.js b/lib/device/fan.js
index f20e3e2c..975615d2 100644
--- a/lib/device/fan.js
+++ b/lib/device/fan.js
@@ -87,8 +87,8 @@ module.exports = class deviceFan {
       99: 'high'
     }
 
-    // Add the get handlers only if the user has configured the offlineAsNoResponse setting
-    if (platform.config.offlineAsNoResponse) {
+    // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
+    if (!platform.config.disableNoResponse) {
       this.service.getCharacteristic(this.hapChar.On).onGet(() => {
         if (!this.isOnline) {
           throw new this.hapErr(-70402)
diff --git a/lib/device/humidifier.js b/lib/device/humidifier.js
index 730d7321..91acae2d 100644
--- a/lib/device/humidifier.js
+++ b/lib/device/humidifier.js
@@ -71,8 +71,8 @@ module.exports = class deviceHumidifier {
       3: 'high'
     }
 
-    // Add the get handlers only if the user has configured the offlineAsNoResponse setting
-    if (platform.config.offlineAsNoResponse) {
+    // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
+    if (!platform.config.disableNoResponse) {
       this.service.getCharacteristic(this.hapChar.On).onGet(() => {
         if (!this.isOnline) {
           throw new this.hapErr(-70402)
diff --git a/lib/device/light-cct.js b/lib/device/light-cct.js
index 97551be3..7dbb7ae3 100644
--- a/lib/device/light-cct.js
+++ b/lib/device/light-cct.js
@@ -107,8 +107,8 @@ module.exports = class deviceLightCCT {
       this.accessory.configureController(this.accessory.alController)
     }
 
-    // Add the get handlers only if the user has configured the offlineAsNoResponse setting
-    if (platform.config.offlineAsNoResponse) {
+    // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
+    if (!platform.config.disableNoResponse) {
       this.service.getCharacteristic(this.hapChar.On).onGet(() => {
         if (!this.isOnline) {
           throw new this.hapErr(-70402)
diff --git a/lib/device/light-dimmer.js b/lib/device/light-dimmer.js
index 80bf69a9..c5ea3751 100644
--- a/lib/device/light-dimmer.js
+++ b/lib/device/light-dimmer.js
@@ -63,8 +63,8 @@ module.exports = class deviceLightDimmer {
       .setProps({ minStep: this.brightStep })
       .onSet(async value => await this.internalBrightnessUpdate(value))
 
-    // Add the get handlers only if the user has configured the offlineAsNoResponse setting
-    if (platform.config.offlineAsNoResponse) {
+    // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
+    if (!platform.config.disableNoResponse) {
       this.service.getCharacteristic(this.hapChar.On).onGet(() => {
         if (!this.isOnline) {
           throw new this.hapErr(-70402)
diff --git a/lib/device/light-rgb-cct.js b/lib/device/light-rgb-cct.js
index fcf6ec6f..cbe5c999 100644
--- a/lib/device/light-rgb-cct.js
+++ b/lib/device/light-rgb-cct.js
@@ -101,8 +101,8 @@ module.exports = class deviceLightRGBCCT {
       this.accessory.configureController(this.accessory.alController)
     }
 
-    // Add the get handlers only if the user has configured the offlineAsNoResponse setting
-    if (platform.config.offlineAsNoResponse) {
+    // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
+    if (!platform.config.disableNoResponse) {
       this.service.getCharacteristic(this.hapChar.On).onGet(() => {
         if (!this.isOnline) {
           throw new this.hapErr(-70402)
diff --git a/lib/device/light-rgb.js b/lib/device/light-rgb.js
index ace1b415..f5c41d5a 100644
--- a/lib/device/light-rgb.js
+++ b/lib/device/light-rgb.js
@@ -73,8 +73,8 @@ module.exports = class deviceLightRGB {
       .getCharacteristic(this.hapChar.Hue)
       .onSet(async value => await this.internalColourUpdate(value))
 
-    // Add the get handlers only if the user has configured the offlineAsNoResponse setting
-    if (platform.config.offlineAsNoResponse) {
+    // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
+    if (!platform.config.disableNoResponse) {
       this.service.getCharacteristic(this.hapChar.On).onGet(() => {
         if (!this.isOnline) {
           throw new this.hapErr(-70402)
diff --git a/lib/device/motor.js b/lib/device/motor.js
index 067f6320..cc47411d 100644
--- a/lib/device/motor.js
+++ b/lib/device/motor.js
@@ -105,8 +105,8 @@ module.exports = class deviceMotor {
       .getCharacteristic(this.hapChar.TargetPosition)
       .onSet(async value => await this.internalPositionUpdate(value))
 
-    // Add the get handlers only if the user has configured the offlineAsNoResponse setting
-    if (platform.config.offlineAsNoResponse) {
+    // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
+    if (!platform.config.disableNoResponse) {
       this.service.getCharacteristic(this.hapChar.CurrentPosition).onGet(() => {
         if (!this.isOnline) {
           throw new this.hapErr(-70402)
diff --git a/lib/device/outlet-multi.js b/lib/device/outlet-multi.js
index b45b1b07..0a85063e 100644
--- a/lib/device/outlet-multi.js
+++ b/lib/device/outlet-multi.js
@@ -114,8 +114,8 @@ module.exports = class deviceOutletMulti {
       .getCharacteristic(this.hapChar.On)
       .onSet(async value => await this.internalStateUpdate(value))
 
-    // Add the get handlers only if the user has configured the offlineAsNoResponse setting
-    if (platform.config.offlineAsNoResponse) {
+    // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
+    if (!platform.config.disableNoResponse) {
       this.service.getCharacteristic(this.hapChar.On).onGet(() => {
         if (!this.isOnline) {
           throw new this.hapErr(-70402)
diff --git a/lib/device/outlet-single.js b/lib/device/outlet-single.js
index 68916f5e..b85a4727 100644
--- a/lib/device/outlet-single.js
+++ b/lib/device/outlet-single.js
@@ -155,8 +155,8 @@ module.exports = class deviceOutletSingle {
       .getCharacteristic(this.hapChar.On)
       .onSet(async value => await this.internalStateUpdate(value))
 
-    // Add the get handlers only if the user has configured the offlineAsNoResponse setting
-    if (platform.config.offlineAsNoResponse) {
+    // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
+    if (!platform.config.disableNoResponse) {
       this.service.getCharacteristic(this.hapChar.On).onGet(() => {
         if (!this.isOnline) {
           throw new this.hapErr(-70402)
diff --git a/lib/device/rf-button.js b/lib/device/rf-button.js
index 7ae3d159..afab1975 100644
--- a/lib/device/rf-button.js
+++ b/lib/device/rf-button.js
@@ -62,8 +62,8 @@ module.exports = class deviceRFButton {
         .getCharacteristic(this.hapChar.On)
         .onSet(async value => await this.internalPressUpdate(chan, name, value))
 
-      // Add the get handlers only if the user has configured the offlineAsNoResponse setting
-      if (platform.config.offlineAsNoResponse) {
+      // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
+      if (!platform.config.disableNoResponse) {
         this.accessory
           .getService(name)
           .getCharacteristic(this.hapChar.On)
diff --git a/lib/device/rf-sensor.js b/lib/device/rf-sensor.js
index 9cf836a1..89752f08 100644
--- a/lib/device/rf-sensor.js
+++ b/lib/device/rf-sensor.js
@@ -155,8 +155,8 @@ module.exports = class deviceRFSensor {
       }
     }
 
-    // Add the get handlers only if the user has configured the offlineAsNoResponse setting
-    if (platform.config.offlineAsNoResponse) {
+    // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
+    if (!platform.config.disableNoResponse) {
       service.getCharacteristic(char).onGet(() => {
         if (!this.isOnline) {
           throw new this.hapErr(-70402)
diff --git a/lib/device/sensor-ambient.js b/lib/device/sensor-ambient.js
index 78850cf8..3c967baa 100644
--- a/lib/device/sensor-ambient.js
+++ b/lib/device/sensor-ambient.js
@@ -107,8 +107,8 @@ module.exports = class deviceSensorAmbient {
         this.accessory.addService(this.hapServ.HumiditySensor)
     }
 
-    // Add the get handlers only if the user has configured the offlineAsNoResponse setting
-    if (platform.config.offlineAsNoResponse) {
+    // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
+    if (!platform.config.disableNoResponse) {
       if (this.switchService) {
         this.switchService.getCharacteristic(this.hapChar.On).onGet(() => {
           if (!this.isOnline) {
diff --git a/lib/device/sensor-temp-humi.js b/lib/device/sensor-temp-humi.js
index 35abffb2..f8c61f65 100644
--- a/lib/device/sensor-temp-humi.js
+++ b/lib/device/sensor-temp-humi.js
@@ -65,8 +65,8 @@ module.exports = class deviceSensorTempHumi {
       this.accessory.getService(this.hapServ.HumiditySensor) ||
       this.accessory.addService(this.hapServ.HumiditySensor)
 
-    // Add the get handlers only if the user has configured the offlineAsNoResponse setting
-    if (platform.config.offlineAsNoResponse) {
+    // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
+    if (!platform.config.disableNoResponse) {
       this.tempService
         .getCharacteristic(this.hapChar.CurrentTemperature)
         .setProps({
diff --git a/lib/device/simulation/blind.js b/lib/device/simulation/blind.js
index 85269d5f..18bbb71c 100644
--- a/lib/device/simulation/blind.js
+++ b/lib/device/simulation/blind.js
@@ -82,8 +82,8 @@ module.exports = class deviceBlind {
       this.internalPositionUpdate(value)
     })
 
-    // Add the get handlers only if the user has configured the offlineAsNoResponse setting
-    if (platform.config.offlineAsNoResponse) {
+    // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
+    if (!platform.config.disableNoResponse) {
       this.service.getCharacteristic(this.hapChar.CurrentPosition).onGet(() => {
         if (!this.isOnline) {
           throw new this.hapErr(-70402)
diff --git a/lib/device/simulation/cooler.js b/lib/device/simulation/cooler.js
index cbfea3fc..f1a70042 100644
--- a/lib/device/simulation/cooler.js
+++ b/lib/device/simulation/cooler.js
@@ -155,8 +155,8 @@ module.exports = class deviceHeater {
       })
       .onSet(async value => await this.internalTargetTempUpdate(value))
 
-    // Add the get handlers only if the user has configured the offlineAsNoResponse setting
-    if (platform.config.offlineAsNoResponse) {
+    // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
+    if (!platform.config.disableNoResponse) {
       if (this.humiService) {
         this.humiService.getCharacteristic(this.hapChar.CurrentRelativeHumidity).onGet(() => {
           if (!this.isOnline) {
diff --git a/lib/device/simulation/dehumidifier.js b/lib/device/simulation/dehumidifier.js
index 19e50beb..d9bdca0e 100644
--- a/lib/device/simulation/dehumidifier.js
+++ b/lib/device/simulation/dehumidifier.js
@@ -125,8 +125,8 @@ module.exports = class deviceHeater {
       .updateValue(this.accessory.context.cacheTarget)
       .onSet(async value => await this.internalTargetHumidityUpdate(value))
 
-    // Add the get handlers only if the user has configured the offlineAsNoResponse setting
-    if (platform.config.offlineAsNoResponse) {
+    // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
+    if (!platform.config.disableNoResponse) {
       this.tempService.getCharacteristic(this.hapChar.CurrentTemperature).onGet(() => {
         if (!this.isOnline) {
           throw new this.hapErr(-70402)
diff --git a/lib/device/simulation/door.js b/lib/device/simulation/door.js
index c5b01470..7bb8d569 100644
--- a/lib/device/simulation/door.js
+++ b/lib/device/simulation/door.js
@@ -82,8 +82,8 @@ module.exports = class deviceDoor {
       this.internalPositionUpdate(value)
     })
 
-    // Add the get handlers only if the user has configured the offlineAsNoResponse setting
-    if (platform.config.offlineAsNoResponse) {
+    // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
+    if (!platform.config.disableNoResponse) {
       this.service.getCharacteristic(this.hapChar.CurrentPosition).onGet(() => {
         if (!this.isOnline) {
           throw new this.hapErr(-70402)
diff --git a/lib/device/simulation/doorbell.js b/lib/device/simulation/doorbell.js
index 6772c70e..5d05061d 100644
--- a/lib/device/simulation/doorbell.js
+++ b/lib/device/simulation/doorbell.js
@@ -71,8 +71,8 @@ module.exports = class deviceDoorbell {
       this.setup = 'multiSwitch'
     }
 
-    // Add the get handlers only if the user has configured the offlineAsNoResponse setting
-    if (platform.config.offlineAsNoResponse) {
+    // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
+    if (!platform.config.disableNoResponse) {
       this.service.getCharacteristic(this.hapChar.ProgrammableSwitchEvent).onGet(() => {
         if (!this.isOnline) {
           throw new this.hapErr(-70402)
diff --git a/lib/device/simulation/garage-eachen.js b/lib/device/simulation/garage-eachen.js
index 32d52765..52a7d65f 100644
--- a/lib/device/simulation/garage-eachen.js
+++ b/lib/device/simulation/garage-eachen.js
@@ -90,8 +90,8 @@ module.exports = class deviceGarageEachen {
       this.internalStateUpdate(value)
     })
 
-    // Add the get handlers only if the user has configured the offlineAsNoResponse setting
-    if (platform.config.offlineAsNoResponse) {
+    // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
+    if (!platform.config.disableNoResponse) {
       this.service.getCharacteristic(this.hapChar.CurrentDoorState).onGet(() => {
         if (!this.isOnline) {
           throw new this.hapErr(-70402)
diff --git a/lib/device/simulation/garage-four.js b/lib/device/simulation/garage-four.js
index 8bcf8a48..ae4306e7 100644
--- a/lib/device/simulation/garage-four.js
+++ b/lib/device/simulation/garage-four.js
@@ -76,8 +76,8 @@ module.exports = class deviceGarageFour {
         this.internalStateUpdate(v, value)
       })
 
-      // Add the get handlers only if the user has configured the offlineAsNoResponse setting
-      if (platform.config.offlineAsNoResponse) {
+      // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
+      if (!platform.config.disableNoResponse) {
         gdService.getCharacteristic(this.hapChar.CurrentDoorState).onGet(() => {
           if (!this.isOnline) {
             throw new this.hapErr(-70402)
diff --git a/lib/device/simulation/garage-one.js b/lib/device/simulation/garage-one.js
index 2314a08e..178f834e 100644
--- a/lib/device/simulation/garage-one.js
+++ b/lib/device/simulation/garage-one.js
@@ -136,8 +136,8 @@ module.exports = class deviceGarageOne {
       this.internalUpdate(value)
     })
 
-    // Add the get handlers only if the user has configured the offlineAsNoResponse setting
-    if (platform.config.offlineAsNoResponse) {
+    // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
+    if (!platform.config.disableNoResponse) {
       this.service.getCharacteristic(this.hapChar.CurrentDoorState).onGet(() => {
         if (!this.isOnline) {
           throw new this.hapErr(-70402)
diff --git a/lib/device/simulation/garage-two.js b/lib/device/simulation/garage-two.js
index 9a4aeefb..0851df61 100644
--- a/lib/device/simulation/garage-two.js
+++ b/lib/device/simulation/garage-two.js
@@ -93,8 +93,8 @@ module.exports = class deviceGarageTwo {
         this.internalUpdate('Garage' + v, value)
       })
 
-      // Add the get handlers only if the user has configured the offlineAsNoResponse setting
-      if (platform.config.offlineAsNoResponse) {
+      // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
+      if (!platform.config.disableNoResponse) {
         gdService.getCharacteristic(this.hapChar.CurrentDoorState).onGet(() => {
           if (!this.isOnline) {
             throw new this.hapErr(-70402)
diff --git a/lib/device/simulation/heater.js b/lib/device/simulation/heater.js
index aac6291f..b7be1562 100644
--- a/lib/device/simulation/heater.js
+++ b/lib/device/simulation/heater.js
@@ -147,8 +147,8 @@ module.exports = class deviceHeater {
       })
       .onSet(async value => await this.internalTargetTempUpdate(value))
 
-    // Add the get handlers only if the user has configured the offlineAsNoResponse setting
-    if (platform.config.offlineAsNoResponse) {
+    // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
+    if (!platform.config.disableNoResponse) {
       if (this.humiService) {
         this.humiService.getCharacteristic(this.hapChar.CurrentRelativeHumidity).onGet(() => {
           if (!this.isOnline) {
diff --git a/lib/device/simulation/humidifier.js b/lib/device/simulation/humidifier.js
index e5357212..32d808c0 100644
--- a/lib/device/simulation/humidifier.js
+++ b/lib/device/simulation/humidifier.js
@@ -125,8 +125,8 @@ module.exports = class deviceHeater {
       .updateValue(this.accessory.context.cacheTarget)
       .onSet(async value => await this.internalTargetHumidityUpdate(value))
 
-    // Add the get handlers only if the user has configured the offlineAsNoResponse setting
-    if (platform.config.offlineAsNoResponse) {
+    // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
+    if (!platform.config.disableNoResponse) {
       this.tempService.getCharacteristic(this.hapChar.CurrentTemperature).onGet(() => {
         if (!this.isOnline) {
           throw new this.hapErr(-70402)
diff --git a/lib/device/simulation/lock-one.js b/lib/device/simulation/lock-one.js
index 2c4f1d6d..83c87ffe 100644
--- a/lib/device/simulation/lock-one.js
+++ b/lib/device/simulation/lock-one.js
@@ -105,8 +105,8 @@ module.exports = class deviceLockOne {
       this.internalUpdate(value)
     })
 
-    // Add the get handlers only if the user has configured the offlineAsNoResponse setting
-    if (platform.config.offlineAsNoResponse) {
+    // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
+    if (!platform.config.disableNoResponse) {
       this.service.getCharacteristic(this.hapChar.LockCurrentState).onGet(() => {
         if (!this.isOnline) {
           throw new this.hapErr(-70402)
diff --git a/lib/device/simulation/p-button.js b/lib/device/simulation/p-button.js
index 6ae6a3c4..37eb5955 100644
--- a/lib/device/simulation/p-button.js
+++ b/lib/device/simulation/p-button.js
@@ -98,8 +98,8 @@ module.exports = class devicePButton {
       this.setup = 'multiSwitch'
     }
 
-    // Add the get handlers only if the user has configured the offlineAsNoResponse setting
-    if (platform.config.offlineAsNoResponse) {
+    // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
+    if (!platform.config.disableNoResponse) {
       this.service.getCharacteristic(this.hapChar.ProgrammableSwitchEvent).onGet(() => {
         if (!this.isOnline) {
           throw new this.hapErr(-70402)
diff --git a/lib/device/simulation/purifier.js b/lib/device/simulation/purifier.js
index ac907754..7d198522 100644
--- a/lib/device/simulation/purifier.js
+++ b/lib/device/simulation/purifier.js
@@ -112,8 +112,8 @@ module.exports = class devicePurifier {
       })
       .updateValue(1)
 
-    // Add the get handlers only if the user has configured the offlineAsNoResponse setting
-    if (platform.config.offlineAsNoResponse) {
+    // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
+    if (!platform.config.disableNoResponse) {
       this.service.getCharacteristic(this.hapChar.Active).onGet(() => {
         if (!this.isOnline) {
           throw new this.hapErr(-70402)
diff --git a/lib/device/simulation/sensor.js b/lib/device/simulation/sensor.js
index 287aaa5c..58d17e57 100644
--- a/lib/device/simulation/sensor.js
+++ b/lib/device/simulation/sensor.js
@@ -147,8 +147,8 @@ module.exports = class deviceSensor {
       this.setup = 'multiSwitch'
     }
 
-    // Add the get handlers only if the user has configured the offlineAsNoResponse setting
-    if (platform.config.offlineAsNoResponse) {
+    // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
+    if (!platform.config.disableNoResponse) {
       this.service.getCharacteristic(this.char).onGet(() => {
         if (!this.isOnline) {
           throw new this.hapErr(-70402)
diff --git a/lib/device/simulation/switch-valve.js b/lib/device/simulation/switch-valve.js
index d6d5016a..5682f9ba 100644
--- a/lib/device/simulation/switch-valve.js
+++ b/lib/device/simulation/switch-valve.js
@@ -93,8 +93,8 @@ module.exports = class deviceSwitchValve {
       .getCharacteristic(this.hapChar.Active)
       .onSet(async value => await this.internalValveUpdate(value))
 
-    // Add the get handlers only if the user has configured the offlineAsNoResponse setting
-    if (platform.config.offlineAsNoResponse) {
+    // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
+    if (!platform.config.disableNoResponse) {
       this.sService.getCharacteristic(this.hapChar.On).onGet(() => {
         if (!this.isOnline) {
           throw new this.hapErr(-70402)
diff --git a/lib/device/simulation/tap-one.js b/lib/device/simulation/tap-one.js
index 759a7f9c..5e31f10d 100644
--- a/lib/device/simulation/tap-one.js
+++ b/lib/device/simulation/tap-one.js
@@ -101,8 +101,8 @@ module.exports = class deviceTapOne {
       await this.internalUpdate(value)
     })
 
-    // Add the get handlers only if the user has configured the offlineAsNoResponse setting
-    if (platform.config.offlineAsNoResponse) {
+    // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
+    if (!platform.config.disableNoResponse) {
       this.service.getCharacteristic(this.hapChar.Active).onGet(() => {
         if (!this.isOnline) {
           throw new this.hapErr(-70402)
diff --git a/lib/device/simulation/tap-two.js b/lib/device/simulation/tap-two.js
index 4c88e14e..4c112795 100644
--- a/lib/device/simulation/tap-two.js
+++ b/lib/device/simulation/tap-two.js
@@ -78,8 +78,8 @@ module.exports = class deviceTapTwo {
         .getCharacteristic(this.hapChar.Active)
         .onSet(async value => await this.internalUpdate('Tap ' + v, value))
 
-      // Add the get handlers only if the user has configured the offlineAsNoResponse setting
-      if (platform.config.offlineAsNoResponse) {
+      // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
+      if (!platform.config.disableNoResponse) {
         tapService.getCharacteristic(this.hapChar.Active).onGet(() => {
           if (!this.isOnline) {
             throw new this.hapErr(-70402)
diff --git a/lib/device/simulation/valve-four.js b/lib/device/simulation/valve-four.js
index d4865d19..7bc075f0 100644
--- a/lib/device/simulation/valve-four.js
+++ b/lib/device/simulation/valve-four.js
@@ -64,8 +64,8 @@ module.exports = class deviceValveFour {
         .getCharacteristic(this.hapChar.Active)
         .onSet(async value => await this.internalUpdate('Valve ' + v, value))
 
-      // Add the get handlers only if the user has configured the offlineAsNoResponse setting
-      if (platform.config.offlineAsNoResponse) {
+      // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
+      if (!platform.config.disableNoResponse) {
         valveService.getCharacteristic(this.hapChar.Active).onGet(() => {
           if (!this.isOnline) {
             throw new this.hapErr(-70402)
diff --git a/lib/device/simulation/valve-one.js b/lib/device/simulation/valve-one.js
index 3935020d..f526f699 100644
--- a/lib/device/simulation/valve-one.js
+++ b/lib/device/simulation/valve-one.js
@@ -103,8 +103,8 @@ module.exports = class deviceValveOne {
       .getCharacteristic(this.hapChar.Active)
       .onSet(async value => await this.internalUpdate(value))
 
-    // Add the get handlers only if the user has configured the offlineAsNoResponse setting
-    if (platform.config.offlineAsNoResponse) {
+    // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
+    if (!platform.config.disableNoResponse) {
       this.service.getCharacteristic(this.hapChar.Active).onGet(() => {
         if (!this.isOnline) {
           throw new this.hapErr(-70402)
diff --git a/lib/device/simulation/valve-two.js b/lib/device/simulation/valve-two.js
index 00d8604c..b5c606ed 100644
--- a/lib/device/simulation/valve-two.js
+++ b/lib/device/simulation/valve-two.js
@@ -80,8 +80,8 @@ module.exports = class deviceValveTwo {
         .getCharacteristic(this.hapChar.Active)
         .onSet(async value => await this.internalUpdate('Valve ' + v, value))
 
-      // Add the get handlers only if the user has configured the offlineAsNoResponse setting
-      if (platform.config.offlineAsNoResponse) {
+      // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
+      if (!platform.config.disableNoResponse) {
         valveService.getCharacteristic(this.hapChar.Active).onGet(() => {
           if (!this.isOnline) {
             throw new this.hapErr(-70402)
diff --git a/lib/device/simulation/window.js b/lib/device/simulation/window.js
index b352835a..ddca4396 100644
--- a/lib/device/simulation/window.js
+++ b/lib/device/simulation/window.js
@@ -82,8 +82,8 @@ module.exports = class deviceWindow {
       this.internalPositionUpdate(value)
     })
 
-    // Add the get handlers only if the user has configured the offlineAsNoResponse setting
-    if (platform.config.offlineAsNoResponse) {
+    // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
+    if (!platform.config.disableNoResponse) {
       this.service.getCharacteristic(this.hapChar.CurrentPosition).onGet(() => {
         if (!this.isOnline) {
           throw new this.hapErr(-70402)
diff --git a/lib/device/switch-multi.js b/lib/device/switch-multi.js
index 7e6c9373..d38bf4ee 100644
--- a/lib/device/switch-multi.js
+++ b/lib/device/switch-multi.js
@@ -102,8 +102,8 @@ module.exports = class deviceSwitchMulti {
       .getCharacteristic(this.hapChar.On)
       .onSet(async value => await this.internalStateUpdate(value))
 
-    // Add the get handlers only if the user has configured the offlineAsNoResponse setting
-    if (platform.config.offlineAsNoResponse) {
+    // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
+    if (!platform.config.disableNoResponse) {
       this.service.getCharacteristic(this.hapChar.On).onGet(() => {
         if (!this.isOnline) {
           throw new this.hapErr(-70402)
diff --git a/lib/device/switch-single.js b/lib/device/switch-single.js
index 8ad008b0..19f51df7 100644
--- a/lib/device/switch-single.js
+++ b/lib/device/switch-single.js
@@ -120,8 +120,8 @@ module.exports = class deviceSwitchSingle {
       .getCharacteristic(this.hapChar.On)
       .onSet(async value => await this.internalStateUpdate(value))
 
-    // Add the get handlers only if the user has configured the offlineAsNoResponse setting
-    if (platform.config.offlineAsNoResponse) {
+    // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
+    if (!platform.config.disableNoResponse) {
       this.service.getCharacteristic(this.hapChar.On).onGet(() => {
         if (!this.isOnline) {
           throw new this.hapErr(-70402)
diff --git a/lib/device/thermostat.js b/lib/device/thermostat.js
index 9bea8c19..d1be3e8f 100644
--- a/lib/device/thermostat.js
+++ b/lib/device/thermostat.js
@@ -102,8 +102,8 @@ module.exports = class deviceThermostat {
         await this.internalTargetUpdate(value)
       })
 
-    // Add the get handlers only if the user has configured the offlineAsNoResponse setting
-    if (platform.config.offlineAsNoResponse) {
+    // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
+    if (!platform.config.disableNoResponse) {
       this.service.getCharacteristic(this.hapChar.CurrentTemperature).onGet(() => {
         if (!this.isOnline) {
           throw new this.hapErr(-70402)
diff --git a/lib/index.js b/lib/index.js
index cf5176c8..8e4e2804 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -197,8 +197,8 @@ class eWeLinkPlatform {
         case 'debug':
         case 'debugFakegato':
         case 'disableDeviceLogging':
+        case 'disableNoResponse':
         case 'disablePlugin':
-        case 'offlineAsNoResponse':
           if (typeof val === 'string') {
             logQuotes(key)
           }
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 0215fdb3..8a5e9a10 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -8,7 +8,7 @@ module.exports = {
     username: '',
     password: '',
     mode: 'auto',
-    offlineAsNoResponse: false,
+    disableNoResponse: false,
     countryCode: '+44',
     httpHost: 'eu-apia.coolkit.cc',
     apiPort: 0,

From f42dfec0e64f1eff1358b1ba62621cbe8327dd37 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 22 Jul 2021 11:55:31 +0100
Subject: [PATCH 2561/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f3f86567..50c77b05 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,10 +6,12 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 ### Added
 
+- `disableNoResponse` setting to disable marking cloud-offline devices as 'No Response' in HomeKit
 - Option to offset recorded temperature or humidity by a scale factor
 
 ### Changed
 
+- Plugin will now mark cloud-offline devices with 'No Response' by default
 - Plugin will now reattempt initial HTTP connection on `ECONNABORTED` error
 - Plugin will now use HomeKit `Battery` service type instead of `BatteryService`
 
@@ -19,6 +21,7 @@ All notable changes to this homebridge-ewelink will be documented in this file.
 
 ### Removed
 
+- `offlineAsNoResponse` configuration setting - is now default - can be disabled with new `disableNoResponse` setting
 - `ignoredDevices` configuration setting - now use the `ignoreDevice` option in the device type sections
 - `groups` configuration setting - now use the `showAs` option in the device type sections
 

From a9586f57800c1ff787f28497f98969abad933a9e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 22 Jul 2021 11:56:04 +0100
Subject: [PATCH 2562/3183] 7.1.1-beta.1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 9c60a9fb..160bb613 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "7.1.1-beta.0",
+  "version": "7.1.1-beta.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 3a2d7f6a..b04a3a72 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "7.1.1-beta.0",
+  "version": "7.1.1-beta.1",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 593e2a2939f2c7e5b1e714495421d299aaad92af Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 22 Jul 2021 12:39:04 +0100
Subject: [PATCH 2563/3183] ignoredDevices not in config anymore

---
 lib/connection/http.js |  2 +-
 lib/index.js           | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/lib/connection/http.js b/lib/connection/http.js
index beec4afa..ca3fbca3 100644
--- a/lib/connection/http.js
+++ b/lib/connection/http.js
@@ -13,7 +13,7 @@ module.exports = class connectionHTTP {
     this.debug = platform.config.debug
     this.funcs = platform.funcs
     this.httpHost = platform.config.httpHost
-    this.ignoredDevices = platform.config.ignoredDevices
+    this.ignoredDevices = platform.ignoredDevices
     this.lang = platform.lang
     this.log = platform.log
     this.mode = platform.config.mode
diff --git a/lib/index.js b/lib/index.js
index 8e4e2804..49a0387b 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -43,6 +43,7 @@ class eWeLinkPlatform {
       this.rfSubdevices = {}
       this.hideChannels = []
       this.hideMasters = []
+      this.ignoredDevices = []
       this.ipOverride = {}
       this.obstructSwitches = {}
 
@@ -311,7 +312,7 @@ class eWeLinkPlatform {
                       logQuotes(key + '.' + id + '.' + k)
                     }
                     if (!!v && v !== 'false') {
-                      this.config.ignoredDevices.push(id)
+                      this.ignoredDevices.push(id)
                     }
                     break
                   case 'ipAddress': {
@@ -646,7 +647,7 @@ class eWeLinkPlatform {
             this.removeAccessory(devicesInHB.get(uuid))
           }
           this.log.warn('[%s] %s.', device.name, this.lang.dualr3NoCalib)
-          this.config.ignoredDevices.push(device.deviceid)
+          this.ignoredDevices.push(device.deviceid)
           return
         }
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
@@ -660,7 +661,7 @@ class eWeLinkPlatform {
           this.removeAccessory(devicesInHB.get(uuid))
         }
         this.log.warn('[%s] %s.', device.name, this.lang.dualr3NoMeter)
-        this.config.ignoredDevices.push(device.deviceid)
+        this.ignoredDevices.push(device.deviceid)
         return
       } else if (this.consts.devices.curtain.includes(uiid)) {
         /****************************
@@ -1177,7 +1178,7 @@ class eWeLinkPlatform {
         /************
         ZIGBEE BRIDGE
         ************/
-        this.config.ignoredDevices.push(device.deviceid)
+        this.ignoredDevices.push(device.deviceid)
         return
         /***********/
       } else if (this.consts.devices.zbSwitchStateless.includes(uiid)) {
@@ -1669,7 +1670,7 @@ class eWeLinkPlatform {
       // The device does not exist in HB so let's try to add it
       try {
         // Don't continue if the user has hidden this device
-        if (this.config.ignoredDevices.includes(deviceId) || !httpClient) {
+        if (this.ignoredDevices.includes(deviceId) || !httpClient) {
           return
         }
 

From 4929594ab3334a509d87ef8f0560f31faec9cb57 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 22 Jul 2021 15:20:04 +0100
Subject: [PATCH 2564/3183] Update ISSUE_TEMPLATE.md

---
 .github/ISSUE_TEMPLATE.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 26398aae..3e83f74b 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -31,8 +31,8 @@
 
 ### Please paste any relevant logs below.
 <!-- ABOUT LOGS
-   → More thorough logging can be seen by enabling 'Debug Logging' and
-     ...'Request & Response Logging' in the plugin settings.
+   → More thorough logging can be seen by enabling 'Debug Logging' in
+     ...the plugin settings.
    → If you are posting an error then it is helpful for me to also see
      ...the previous few lines as this can show the cause of the error.
    → Please enter the logs between the two ``` lines below so that

From 647bd0c4bf0c907b906413257fdbc194235f68dc Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 23 Jul 2021 15:03:19 +0100
Subject: [PATCH 2565/3183] unneeded const

---
 lib/connection/http.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/connection/http.js b/lib/connection/http.js
index ca3fbca3..452fa6d9 100644
--- a/lib/connection/http.js
+++ b/lib/connection/http.js
@@ -91,8 +91,7 @@ module.exports = class connectionHTTP {
       } else if (body.error === 10001 && !this.triedBase64) {
         // In this case the password is incorrect so try base64 decoding just once
         this.triedBase64 = true
-        const buff = Buffer.from(this.password, 'base64')
-        this.password = buff
+        this.password = Buffer.from(this.password, 'base64')
           .toString('utf8')
           .replace(/(\r\n|\n|\r)/gm, '')
           .trim()

From 321fc2137365fe0de1493ca2e65fa7fda6524637 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 25 Jul 2021 11:21:13 +0100
Subject: [PATCH 2566/3183] [feat] dualr3 motor mode as garage

---
 config.schema.json     |   4 ++
 lib/device/motor.js    | 134 ++++++++++++++++++++++++++++++++++-------
 lib/utils/constants.js |   2 +-
 3 files changed, 116 insertions(+), 24 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 8593af5c..809fa9a2 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -529,6 +529,10 @@
                   "title": "Door",
                   "enum": ["door"]
                 },
+                {
+                  "title": "Garage Door",
+                  "enum": ["garage"]
+                },
                 {
                   "title": "Window",
                   "enum": ["window"]
diff --git a/lib/device/motor.js b/lib/device/motor.js
index cc47411d..eda4dfe4 100644
--- a/lib/device/motor.js
+++ b/lib/device/motor.js
@@ -61,6 +61,22 @@ module.exports = class deviceMotor {
     switch (showAsMotor) {
       case 'door':
         service = this.hapServ.Door
+        if (this.accessory.getService(this.hapServ.GarageDoorOpener)) {
+          this.accessory.removeService(this.accessory.getService(this.hapServ.GarageDoorOpener))
+        }
+        if (this.accessory.getService(this.hapServ.Window)) {
+          this.accessory.removeService(this.accessory.getService(this.hapServ.Window))
+        }
+        if (this.accessory.getService(this.hapServ.WindowCovering)) {
+          this.accessory.removeService(this.accessory.getService(this.hapServ.WindowCovering))
+        }
+        break
+      case 'garage':
+        service = this.hapServ.GarageDoorOpener
+        this.isGarage = true
+        if (this.accessory.getService(this.hapServ.Door)) {
+          this.accessory.removeService(this.accessory.getService(this.hapServ.Door))
+        }
         if (this.accessory.getService(this.hapServ.Window)) {
           this.accessory.removeService(this.accessory.getService(this.hapServ.Window))
         }
@@ -73,6 +89,9 @@ module.exports = class deviceMotor {
         if (this.accessory.getService(this.hapServ.Door)) {
           this.accessory.removeService(this.accessory.getService(this.hapServ.Door))
         }
+        if (this.accessory.getService(this.hapServ.GarageDoorOpener)) {
+          this.accessory.removeService(this.accessory.getService(this.hapServ.GarageDoorOpener))
+        }
         if (this.accessory.getService(this.hapServ.WindowCovering)) {
           this.accessory.removeService(this.accessory.getService(this.hapServ.WindowCovering))
         }
@@ -82,6 +101,9 @@ module.exports = class deviceMotor {
         if (this.accessory.getService(this.hapServ.Door)) {
           this.accessory.removeService(this.accessory.getService(this.hapServ.Door))
         }
+        if (this.accessory.getService(this.hapServ.GarageDoorOpener)) {
+          this.accessory.removeService(this.accessory.getService(this.hapServ.GarageDoorOpener))
+        }
         if (this.accessory.getService(this.hapServ.Window)) {
           this.accessory.removeService(this.accessory.getService(this.hapServ.Window))
         }
@@ -101,24 +123,45 @@ module.exports = class deviceMotor {
     }
 
     // Add the set handler to the target position characteristic
-    this.service
-      .getCharacteristic(this.hapChar.TargetPosition)
-      .onSet(async value => await this.internalPositionUpdate(value))
+    if (this.isGarage) {
+      this.service
+        .getCharacteristic(this.hapChar.TargetDoorState)
+        .onSet(async value => await this.internalTargetUpdate(value))
+    } else {
+      this.service
+        .getCharacteristic(this.hapChar.TargetPosition)
+        .onSet(async value => await this.internalPositionUpdate(value))
+    }
 
     // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
     if (!platform.config.disableNoResponse) {
-      this.service.getCharacteristic(this.hapChar.CurrentPosition).onGet(() => {
-        if (!this.isOnline) {
-          throw new this.hapErr(-70402)
-        }
-        return this.service.getCharacteristic(this.hapChar.CurrentPosition).value
-      })
-      this.service.getCharacteristic(this.hapChar.TargetPosition).onGet(() => {
-        if (!this.isOnline) {
-          throw new this.hapErr(-70402)
-        }
-        return this.service.getCharacteristic(this.hapChar.TargetPosition).value
-      })
+      if (this.isGarage) {
+        this.service.getCharacteristic(this.hapChar.CurrentDoorState).onGet(() => {
+          if (!this.isOnline) {
+            throw new this.hapErr(-70402)
+          }
+          return this.service.getCharacteristic(this.hapChar.CurrentDoorState).value
+        })
+        this.service.getCharacteristic(this.hapChar.TargetDoorState).onGet(() => {
+          if (!this.isOnline) {
+            throw new this.hapErr(-70402)
+          }
+          return this.service.getCharacteristic(this.hapChar.TargetDoorState).value
+        })
+      } else {
+        this.service.getCharacteristic(this.hapChar.CurrentPosition).onGet(() => {
+          if (!this.isOnline) {
+            throw new this.hapErr(-70402)
+          }
+          return this.service.getCharacteristic(this.hapChar.CurrentPosition).value
+        })
+        this.service.getCharacteristic(this.hapChar.TargetPosition).onGet(() => {
+          if (!this.isOnline) {
+            throw new this.hapErr(-70402)
+          }
+          return this.service.getCharacteristic(this.hapChar.TargetPosition).value
+        })
+      }
     }
 
     if (platform.config.mode !== 'lan') {
@@ -171,6 +214,27 @@ module.exports = class deviceMotor {
     }
   }
 
+  async internalTargetUpdate (value) {
+    try {
+      // 0 for open, 1 for closed
+      // this.cachePos is 0 for closed and >0 for open
+
+      const params = { location: value === 1 ? 0 : 100 }
+      await this.platform.sendDeviceUpdate(this.accessory, params)
+      this.cacheTarg = value
+      if (this.enableLogging) {
+        this.log('[%s] %s [%s%].', this.name, this.lang.curTarg, this.cacheTarg)
+      }
+    } catch (err) {
+      // Catch any errors and let the platform display them
+      this.platform.deviceUpdateError(this.accessory, err, true)
+      setTimeout(() => {
+        this.service.updateCharacteristic(this.hapChar.TargetPosition, this.cacheTarg)
+      }, 2000)
+      throw new this.hapErr(-70402)
+    }
+  }
+
   async internalUIUpdate () {
     try {
       // Skip polling if device isn't online
@@ -191,7 +255,9 @@ module.exports = class deviceMotor {
       if (this.funcs.hasProperty(params, 'currLocation')) {
         if (params.currLocation !== this.cachePos) {
           this.cachePos = params.currLocation
-          this.service.updateCharacteristic(this.hapChar.CurrentPosition, this.cachePos)
+          if (!this.isGarage) {
+            this.service.updateCharacteristic(this.hapChar.CurrentPosition, this.cachePos)
+          }
           if (params.updateSource && this.enableLogging) {
             this.log('[%s] %s [%s%].', this.name, this.lang.curPos, this.cachePos)
           }
@@ -202,7 +268,9 @@ module.exports = class deviceMotor {
       if (this.funcs.hasProperty(params, 'location')) {
         if (params.location !== this.cacheTarg) {
           this.cacheTarg = params.location
-          this.service.updateCharacteristic(this.hapChar.TargetPosition, this.cacheTarg)
+          if (!this.isGarage) {
+            this.service.updateCharacteristic(this.hapChar.TargetPosition, this.cacheTarg)
+          }
           if (params.updateSource && this.enableLogging) {
             this.log('[%s] %s [%s%].', this.name, this.lang.curTarg, this.cacheTarg)
           }
@@ -211,14 +279,34 @@ module.exports = class deviceMotor {
 
       // If the two are equal then the motor must have stopped at this position
       if (this.cacheTarg === this.cachePos) {
-        // PositionState 2 === STOPPED
-        this.service.updateCharacteristic(this.hapChar.PositionState, 2)
+        if (this.isGarage) {
+          if (this.cachePos === 0) {
+            // CLOSED
+            this.service.updateCharacteristic(this.hapChar.CurrentDoorState, 1)
+          } else {
+            // OPEN
+            this.service.updateCharacteristic(this.hapChar.CurrentDoorState, 0)
+          }
+        } else {
+          // PositionState 2 === STOPPED
+          this.service.updateCharacteristic(this.hapChar.PositionState, 2)
+        }
       } else if (this.cacheTarg > this.cachePos) {
-        // PositionState 1 === INCREASING
-        this.service.updateCharacteristic(this.hapChar.PositionState, 1)
+        if (this.isGarage) {
+          // OPENING
+          this.service.updateCharacteristic(this.hapChar.CurrentDoorState, 2)
+        } else {
+          // PositionState 1 === INCREASING
+          this.service.updateCharacteristic(this.hapChar.PositionState, 1)
+        }
       } else {
-        // PositionState 0 === DECREASING
-        this.service.updateCharacteristic(this.hapChar.PositionState, 0)
+        if (this.isGarage) {
+          // CLOSING
+          this.service.updateCharacteristic(this.hapChar.CurrentDoorState, 3)
+        } else {
+          // PositionState 0 === DECREASING
+          this.service.updateCharacteristic(this.hapChar.PositionState, 0)
+        }
       }
 
       // Update power information if given
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 8a5e9a10..76f7a416 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -228,7 +228,7 @@ module.exports = {
       'valve_four',
       'window'
     ],
-    showAsMotor: ['blind', 'door', 'window']
+    showAsMotor: ['blind', 'door', 'garage', 'window']
   },
 
   devices: {

From 74cd5207e4f52885fcbde16fe2c7f4e13bb651f1 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 25 Jul 2021 11:21:54 +0100
Subject: [PATCH 2567/3183] 7.1.1-beta.2

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 160bb613..b5121ac9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "7.1.1-beta.1",
+  "version": "7.1.1-beta.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index b04a3a72..ec25fff9 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "7.1.1-beta.1",
+  "version": "7.1.1-beta.2",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From d058137d8ccf3fd375dbbf197c6675d2ac7ffd0a Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 25 Jul 2021 15:19:33 +0100
Subject: [PATCH 2568/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 50c77b05..9144efb4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Change Log
 
-All notable changes to this homebridge-ewelink will be documented in this file.
+All notable changes to homebridge-ewelink will be documented in this file.
 
 ## BETA
 

From eb08996b92de62234b98d1b8f5843bb51c933a90 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 25 Jul 2021 18:06:49 +0100
Subject: [PATCH 2569/3183] fix logging and error characteristic

---
 lib/device/motor.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/device/motor.js b/lib/device/motor.js
index eda4dfe4..e252b678 100644
--- a/lib/device/motor.js
+++ b/lib/device/motor.js
@@ -221,7 +221,7 @@ module.exports = class deviceMotor {
 
       const params = { location: value === 1 ? 0 : 100 }
       await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.cacheTarg = value
+      this.cacheTarg = value === 1 ? 0 : 100
       if (this.enableLogging) {
         this.log('[%s] %s [%s%].', this.name, this.lang.curTarg, this.cacheTarg)
       }
@@ -229,7 +229,7 @@ module.exports = class deviceMotor {
       // Catch any errors and let the platform display them
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
-        this.service.updateCharacteristic(this.hapChar.TargetPosition, this.cacheTarg)
+        this.service.updateCharacteristic(this.hapChar.TargetDoorState, this.cacheTarg)
       }, 2000)
       throw new this.hapErr(-70402)
     }

From 86541dc204b0b2ad0e4075ec7e0dbf87861b4010 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 25 Jul 2021 18:06:53 +0100
Subject: [PATCH 2570/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9144efb4..6dc802da 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@ All notable changes to homebridge-ewelink will be documented in this file.
 
 ### Added
 
+- Expose a DUALR3 in motor mode as a `GarageDoorOpener` accessory type
 - `disableNoResponse` setting to disable marking cloud-offline devices as 'No Response' in HomeKit
 - Option to offset recorded temperature or humidity by a scale factor
 

From 8187a12355e97f444bdef80fa7adc683efc62724 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 25 Jul 2021 18:08:20 +0100
Subject: [PATCH 2571/3183] 7.1.1-beta.3

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b5121ac9..2902f51f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "7.1.1-beta.2",
+  "version": "7.1.1-beta.3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index ec25fff9..5724605d 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "7.1.1-beta.2",
+  "version": "7.1.1-beta.3",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 7f2950fc406ea94fc51dcb8093827cfb3b5d83b6 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 25 Jul 2021 18:35:08 +0100
Subject: [PATCH 2572/3183] dualr3 motor - garage - update target on
 externalUpdate

---
 lib/device/motor.js | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/lib/device/motor.js b/lib/device/motor.js
index e252b678..be2e4816 100644
--- a/lib/device/motor.js
+++ b/lib/device/motor.js
@@ -277,15 +277,27 @@ module.exports = class deviceMotor {
         }
       }
 
+      // Get the target door state characteristic for use later
+      let targetChar
+      if (this.isGarage) {
+        targetChar = this.service.getCharacteristic(this.TargetDoorState)
+      }
+
       // If the two are equal then the motor must have stopped at this position
       if (this.cacheTarg === this.cachePos) {
         if (this.isGarage) {
           if (this.cachePos === 0) {
             // CLOSED
             this.service.updateCharacteristic(this.hapChar.CurrentDoorState, 1)
+            if (targetChar.value !== 1) {
+              targetChar.updateValue(1)
+            }
           } else {
             // OPEN
             this.service.updateCharacteristic(this.hapChar.CurrentDoorState, 0)
+            if (targetChar.value !== 0) {
+              targetChar.updateValue(0)
+            }
           }
         } else {
           // PositionState 2 === STOPPED
@@ -295,6 +307,9 @@ module.exports = class deviceMotor {
         if (this.isGarage) {
           // OPENING
           this.service.updateCharacteristic(this.hapChar.CurrentDoorState, 2)
+          if (targetChar.value !== 0) {
+            targetChar.updateValue(0)
+          }
         } else {
           // PositionState 1 === INCREASING
           this.service.updateCharacteristic(this.hapChar.PositionState, 1)
@@ -303,6 +318,9 @@ module.exports = class deviceMotor {
         if (this.isGarage) {
           // CLOSING
           this.service.updateCharacteristic(this.hapChar.CurrentDoorState, 3)
+          if (targetChar.value !== 1) {
+            targetChar.updateValue(1)
+          }
         } else {
           // PositionState 0 === DECREASING
           this.service.updateCharacteristic(this.hapChar.PositionState, 0)

From 48f3635d209c0d6d09ef57d988e72d393cbf4b80 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 25 Jul 2021 18:35:38 +0100
Subject: [PATCH 2573/3183] 7.1.1-beta.4

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 2902f51f..296addcb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "7.1.1-beta.3",
+  "version": "7.1.1-beta.4",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 5724605d..09e4bd91 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "7.1.1-beta.3",
+  "version": "7.1.1-beta.4",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 5f34f400f61157f16996b19096a4a097356bcf14 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 27 Jul 2021 09:28:03 +0100
Subject: [PATCH 2574/3183] enable historical power data via api

---
 lib/connection/api.js       |  2 +-
 lib/connection/ws.js        |  5 ++++-
 lib/device/outlet-single.js | 12 +++++++++++-
 lib/device/switch-single.js | 12 +++++++++++-
 lib/index.js                |  2 +-
 lib/utils/constants.js      |  1 +
 6 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/lib/connection/api.js b/lib/connection/api.js
index a9cbc23c..14162cca 100644
--- a/lib/connection/api.js
+++ b/lib/connection/api.js
@@ -316,7 +316,7 @@ module.exports = class connectionAPI {
           lan: !!accessory.context.reachableLAN,
           ip: accessory.context.ip || false
         },
-        ...accessory.control.currentState()
+        ...(await accessory.control.currentState())
       }
     }
 
diff --git a/lib/connection/ws.js b/lib/connection/ws.js
index 85894210..56377709 100644
--- a/lib/connection/ws.js
+++ b/lib/connection/ws.js
@@ -327,7 +327,10 @@ module.exports = class connectionWS {
         switch (res.error) {
           case 0:
             // No error is always what is wanted
-            return
+            if (res.config && res.config.hundredDaysKwhData) {
+              return res.config.hundredDaysKwhData
+            }
+            return true
           case 504:
             throw new Error(this.lang.wsReqTimeout + ' [504]')
           default:
diff --git a/lib/device/outlet-single.js b/lib/device/outlet-single.js
index b85a4727..6ecf7710 100644
--- a/lib/device/outlet-single.js
+++ b/lib/device/outlet-single.js
@@ -363,12 +363,22 @@ module.exports = class deviceOutletSingle {
     this.isOnline = isOnline
   }
 
-  currentState () {
+  async currentState () {
     const toReturn = {}
     toReturn.services = ['outlet']
     toReturn.outlet = {
       state: this.service.getCharacteristic(this.hapChar.On).value ? 'on' : 'off'
     }
+    if (this.powerReadings) {
+      try {
+        toReturn.services.push('power')
+        toReturn.power = {
+          state: await this.platform.sendDeviceUpdate(this.accessory, { hundredDaysKwh: 'get' })
+        }
+      } catch (err) {
+        // Suppress errors here
+      }
+    }
     return toReturn
   }
 }
diff --git a/lib/device/switch-single.js b/lib/device/switch-single.js
index 19f51df7..54489513 100644
--- a/lib/device/switch-single.js
+++ b/lib/device/switch-single.js
@@ -260,12 +260,22 @@ module.exports = class deviceSwitchSingle {
     this.isOnline = isOnline
   }
 
-  currentState () {
+  async currentState () {
     const toReturn = {}
     toReturn.services = ['switch']
     toReturn.switch = {
       state: this.service.getCharacteristic(this.hapChar.On).value ? 'on' : 'off'
     }
+    if (this.powerReadings) {
+      try {
+        toReturn.services.push('power')
+        toReturn.power = {
+          state: await this.platform.sendDeviceUpdate(this.accessory, { hundredDaysKwh: 'get' })
+        }
+      } catch (err) {
+        // Suppress errors here
+      }
+    }
     return toReturn
   }
 }
diff --git a/lib/index.js b/lib/index.js
index 49a0387b..00576c33 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1513,7 +1513,7 @@ class eWeLinkPlatform {
           // Attempt the update
           if (accessory.context.reachableWAN) {
             // Device is online via WS so send the update
-            await wsClient.sendUpdate(payload)
+            return await wsClient.sendUpdate(payload)
           } else {
             // Device appears to be offline
             throw new Error(this.lang.unreachable)
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 76f7a416..4245add1 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -276,6 +276,7 @@ module.exports = {
     'colorB',
     'colorG',
     'colorR',
+    'config',
     'current',
     'currentHumidity',
     'currentTemperature',

From e42fd6a967f34d827f434c1b900b635a9dfcc536 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 27 Jul 2021 09:28:39 +0100
Subject: [PATCH 2575/3183] 7.1.1-beta.5

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 296addcb..57f9337d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "7.1.1-beta.4",
+  "version": "7.1.1-beta.5",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 09e4bd91..9eb343cb 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "7.1.1-beta.4",
+  "version": "7.1.1-beta.5",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 4ee016d5029b6c52f71320e248308b01846e5431 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 27 Jul 2021 23:46:20 +0100
Subject: [PATCH 2576/3183] error correct hapChar

---
 lib/device/simulation/garage-eachen.js | 6 +++---
 lib/device/simulation/garage-four.js   | 6 +++---
 lib/device/simulation/garage-one.js    | 6 +++---
 lib/device/simulation/garage-two.js    | 6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/lib/device/simulation/garage-eachen.js b/lib/device/simulation/garage-eachen.js
index 52a7d65f..f24e6d85 100644
--- a/lib/device/simulation/garage-eachen.js
+++ b/lib/device/simulation/garage-eachen.js
@@ -157,11 +157,11 @@ module.exports = class deviceGarageEachen {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
         this.service.updateCharacteristic(
-          this.hapChar.TargetPosition,
-          this.accessory.context.cacheTargetPosition
+          this.hapChar.TargetDoorState,
+          this.accessory.context.cacheTargetDoorState
         )
       }, 2000)
-      this.service.updateCharacteristic(this.hapChar.TargetPosition, new this.hapErr(-70402))
+      this.service.updateCharacteristic(this.hapChar.TargetDoorState, new this.hapErr(-70402))
     }
   }
 
diff --git a/lib/device/simulation/garage-four.js b/lib/device/simulation/garage-four.js
index ae4306e7..1dd7d40f 100644
--- a/lib/device/simulation/garage-four.js
+++ b/lib/device/simulation/garage-four.js
@@ -167,11 +167,11 @@ module.exports = class deviceGarageFour {
       const gdService = this.accessory.getService('Garage ' + garage)
       setTimeout(() => {
         gdService.updateCharacteristic(
-          this.hapChar.TargetPosition,
-          this.accessory.context.cacheTargetPosition
+          this.hapChar.TargetDoorState,
+          this.accessory.context.cacheTargetDoorState
         )
       }, 2000)
-      gdService.updateCharacteristic(this.hapChar.TargetPosition, new this.hapErr(-70402))
+      gdService.updateCharacteristic(this.hapChar.TargetDoorState, new this.hapErr(-70402))
     }
   }
 
diff --git a/lib/device/simulation/garage-one.js b/lib/device/simulation/garage-one.js
index 178f834e..cf51cf63 100644
--- a/lib/device/simulation/garage-one.js
+++ b/lib/device/simulation/garage-one.js
@@ -257,11 +257,11 @@ module.exports = class deviceGarageOne {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
         this.service.updateCharacteristic(
-          this.hapChar.TargetPosition,
-          this.service.getCharacteristic(this.hapChar.TargetPosition).value
+          this.hapChar.TargetDoorState,
+          this.service.getCharacteristic(this.hapChar.TargetDoorState).value
         )
       }, 2000)
-      this.service.updateCharacteristic(this.hapChar.TargetPosition, new this.hapErr(-70402))
+      this.service.updateCharacteristic(this.hapChar.TargetDoorState, new this.hapErr(-70402))
     }
   }
 
diff --git a/lib/device/simulation/garage-two.js b/lib/device/simulation/garage-two.js
index 0851df61..9c0b2ba6 100644
--- a/lib/device/simulation/garage-two.js
+++ b/lib/device/simulation/garage-two.js
@@ -216,11 +216,11 @@ module.exports = class deviceGarageTwo {
       const gdService = this.accessory.getService(garage)
       setTimeout(() => {
         gdService.updateCharacteristic(
-          this.hapChar.TargetPosition,
-          this.accessory.context.cacheTargetPosition
+          this.hapChar.TargetDoorState,
+          this.accessory.context.cacheTargetDoorState
         )
       }, 2000)
-      gdService.updateCharacteristic(this.hapChar.TargetPosition, new this.hapErr(-70402))
+      gdService.updateCharacteristic(this.hapChar.TargetDoorState, new this.hapErr(-70402))
     }
   }
 

From 24704fadb7834669463ac63ab77f2f69346b81e2 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 28 Jul 2021 15:35:31 +0100
Subject: [PATCH 2577/3183] fix config item name

---
 config.schema.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config.schema.json b/config.schema.json
index 809fa9a2..6c87cd6d 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -1462,7 +1462,7 @@
           "type": "help",
           "helpvalue": "<label class=\"control-label text-warning\">⚠ Using LAN mode will remove any unsupported accessories from Homebridge.</label>"
         },
-        "disableNoReponse",
+        "disableNoResponse",
         "countryCode",
         "httpHost",
         "apiPort",

From b11222a7cae8dd4338ca11f93e6ddc036eb6a8b5 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 29 Jul 2021 14:33:37 +0100
Subject: [PATCH 2578/3183] test implementation of inched single switches

---
 config.schema.json                 |   9 +
 lib/device/outlet-single-inched.js | 397 +++++++++++++++++++++++++++++
 lib/device/switch-single-inched.js | 296 +++++++++++++++++++++
 lib/index.js                       |   7 +-
 lib/utils/constants.js             |   1 +
 5 files changed, 709 insertions(+), 1 deletion(-)
 create mode 100644 lib/device/outlet-single-inched.js
 create mode 100644 lib/device/switch-single-inched.js

diff --git a/config.schema.json b/config.schema.json
index 6c87cd6d..4ae3d9db 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -248,6 +248,14 @@
                 "functionBody": "return (model.singleDevices && model.singleDevices[arrayIndices] && ['pow', 'iw'].includes(model.singleDevices[arrayIndices].deviceModel) && ['outlet'].includes(model.singleDevices[arrayIndices].showAs) && !model.singleDevices[arrayIndices].ignoreDevice);"
               }
             },
+            "isInched": {
+              "type": "boolean",
+              "title": "Status By Inching",
+              "description": "If true, the plugin will show the on/off status based on inching mode.",
+              "condition": {
+                "functionBody": "return (model.singleDevices && model.singleDevices[arrayIndices] && [undefined, 'default', 'outlet'].includes(model.singleDevices[arrayIndices].showAs) && !model.singleDevices[arrayIndices].ignoreDevice);"
+              }
+            },
             "sensorType": {
               "type": "string",
               "title": "Sensor Type",
@@ -1488,6 +1496,7 @@
             "singleDevices[].deviceModel",
             "singleDevices[].showAs",
             "singleDevices[].inUsePowerThreshold",
+            "singleDevices[].isInched",
             "singleDevices[].operationTime",
             "singleDevices[].operationTimeDown",
             "singleDevices[].sensorId",
diff --git a/lib/device/outlet-single-inched.js b/lib/device/outlet-single-inched.js
new file mode 100644
index 00000000..7279d297
--- /dev/null
+++ b/lib/device/outlet-single-inched.js
@@ -0,0 +1,397 @@
+/* jshint node: true,esversion: 9, -W014, -W033 */
+/* eslint-disable new-cap */
+'use strict'
+
+module.exports = class deviceOutletSingleInched {
+  constructor (platform, accessory) {
+    // Set up variables from the platform
+    this.eveChar = platform.eveChar
+    this.funcs = platform.funcs
+    this.hapChar = platform.api.hap.Characteristic
+    this.hapErr = platform.api.hap.HapStatusError
+    this.hapServ = platform.api.hap.Service
+    this.lang = platform.lang
+    this.log = platform.log
+    this.platform = platform
+
+    // Set up variables from the accessory
+    this.name = accessory.displayName
+    this.accessory = accessory
+
+    // Initially set the online flag as true (to be then updated as false if necessary)
+    this.isOnline = true
+
+    /*
+    UIID 1/6/14/24/27/112/1256: single switch, no power readings
+    UIID 5: single switch, with wattage readings
+    UIID 32: single switch, with wattage, voltage and amp readings
+    UIID 77/78/81/107: single switch but firmware uses multiple channels (only need CH0)
+    */
+
+    // Set up custom variables for this device type
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
+    this.inUsePowerThreshold =
+      deviceConf && deviceConf.inUsePowerThreshold
+        ? deviceConf.inUsePowerThreshold
+        : platform.consts.defaultValues.inUsePowerThreshold
+
+    // Set the correct logging variables for this accessory
+    this.enableLogging = !platform.config.disableDeviceLogging
+    this.enableDebugLogging = platform.config.debug
+    if (deviceConf && deviceConf.overrideLogging) {
+      switch (deviceConf.overrideLogging) {
+        case 'standard':
+          this.enableLogging = true
+          this.enableDebugLogging = false
+          break
+        case 'debug':
+          this.enableLogging = true
+          this.enableDebugLogging = true
+          break
+        case 'disable':
+          this.enableLogging = false
+          this.enableDebugLogging = false
+          break
+      }
+    }
+
+    // If the accessory has a switch service then remove it
+    if (this.accessory.getService(this.hapServ.Switch)) {
+      this.accessory.removeService(this.accessory.getService(this.hapServ.Switch))
+    }
+
+    // Add the outlet service if it doesn't already exist
+    this.service =
+      this.accessory.getService(this.hapServ.Outlet) ||
+      this.accessory.addService(this.hapServ.Outlet)
+
+    switch (this.accessory.context.eweUIID) {
+      case 5:
+        // Add Eve power characteristics
+        this.powerReadings = true
+        if (!this.service.testCharacteristic(this.hapChar.OutletInUse)) {
+          this.service.addCharacteristic(this.hapChar.OutletInUse)
+        }
+        if (!this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
+          this.service.addCharacteristic(this.eveChar.CurrentConsumption)
+        }
+        if (!this.service.testCharacteristic(this.eveChar.TotalConsumption)) {
+          this.service.addCharacteristic(this.eveChar.TotalConsumption)
+        }
+        if (!this.service.testCharacteristic(this.eveChar.ResetTotal)) {
+          this.service.addCharacteristic(this.eveChar.ResetTotal)
+        }
+
+        // Remove unused Eve characteristics
+        if (this.service.testCharacteristic(this.eveChar.ElectricCurrent)) {
+          this.service.removeCharacteristic(
+            this.service.getCharacteristic(this.eveChar.ElectricCurrent)
+          )
+        }
+        if (this.service.testCharacteristic(this.eveChar.Voltage)) {
+          this.service.removeCharacteristic(this.service.getCharacteristic(this.eveChar.Voltage))
+        }
+        break
+      case 32:
+        // Add Eve power characteristics
+        this.powerReadings = true
+        if (!this.service.testCharacteristic(this.hapChar.OutletInUse)) {
+          this.service.addCharacteristic(this.hapChar.OutletInUse)
+        }
+        if (!this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
+          this.service.addCharacteristic(this.eveChar.CurrentConsumption)
+        }
+        if (!this.service.testCharacteristic(this.eveChar.ElectricCurrent)) {
+          this.service.addCharacteristic(this.eveChar.ElectricCurrent)
+        }
+        if (!this.service.testCharacteristic(this.eveChar.Voltage)) {
+          this.service.addCharacteristic(this.eveChar.Voltage)
+        }
+        if (!this.service.testCharacteristic(this.eveChar.TotalConsumption)) {
+          this.service.addCharacteristic(this.eveChar.TotalConsumption)
+        }
+        if (!this.service.testCharacteristic(this.eveChar.ResetTotal)) {
+          this.service.addCharacteristic(this.eveChar.ResetTotal)
+        }
+        break
+      default:
+        // Set a flag for devices with hardware that use multi-channel format
+        if (platform.consts.devices.outletSCM.includes(this.accessory.context.eweUIID)) {
+          this.isSCM = true
+        }
+
+        // Remove unused Eve characteristics
+        if (this.service.testCharacteristic(this.hapChar.OutletInUse)) {
+          this.service.removeCharacteristic(
+            this.service.getCharacteristic(this.eveChar.OutletInUse)
+          )
+        }
+        if (this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
+          this.service.removeCharacteristic(
+            this.service.getCharacteristic(this.eveChar.CurrentConsumption)
+          )
+        }
+        if (this.service.testCharacteristic(this.eveChar.ElectricCurrent)) {
+          this.service.removeCharacteristic(
+            this.service.getCharacteristic(this.eveChar.ElectricCurrent)
+          )
+        }
+        if (this.service.testCharacteristic(this.eveChar.Voltage)) {
+          this.service.removeCharacteristic(this.service.getCharacteristic(this.eveChar.Voltage))
+        }
+        if (this.service.testCharacteristic(this.eveChar.TotalConsumption)) {
+          this.service.removeCharacteristic(
+            this.service.getCharacteristic(this.eveChar.TotalConsumption)
+          )
+        }
+        if (this.service.testCharacteristic(this.eveChar.ResetTotal)) {
+          this.service.removeCharacteristic(this.service.getCharacteristic(this.eveChar.ResetTotal))
+        }
+        break
+    }
+
+    // Add the set handler to the outlet on/off characteristic
+    this.service
+      .getCharacteristic(this.hapChar.On)
+      .onSet(async value => await this.internalStateUpdate(value))
+
+    // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
+    if (!platform.config.disableNoResponse) {
+      this.service.getCharacteristic(this.hapChar.On).onGet(() => {
+        if (!this.isOnline) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.On).value
+      })
+    }
+
+    // Pass the accessory to Fakegato to set up with Eve
+    this.accessory.eveService = new platform.eveService('energy', this.accessory, {
+      log: platform.config.debugFakegato ? this.log : () => {},
+      showAs: 'outlet'
+    })
+
+    // Set up extra features for outlets that provide power readings
+    if (this.powerReadings) {
+      // TotalConsumption is calculated by the plugin with these context readings
+      if (!this.funcs.hasProperty(this.accessory.context, 'energyReadings')) {
+        this.accessory.context.energyReadings = []
+      }
+      if (!this.funcs.hasProperty(this.accessory.context, 'energyReadingTotal')) {
+        this.accessory.context.energyReadingTotal = 0
+      }
+
+      // Add the set handler to the outlet eve reset total energy characteristic
+      this.service.getCharacteristic(this.eveChar.ResetTotal).onSet(value => {
+        this.accessory.context.energyReadings = []
+        this.accessory.context.energyReadingTotal = 0
+        this.service.updateCharacteristic(this.eveChar.TotalConsumption, 0)
+      })
+
+      // Set up an interval for the plugin to calculate an approx total consumption
+      this.intervalPower = setInterval(() => {
+        // Every 30 seconds start with a zero reading
+        let total = 0
+
+        // Check we have had readings within the previous 30 seconds
+        if (this.accessory.context.energyReadings.length > 0) {
+          // Accumulate the total from the energy readings
+          this.accessory.context.energyReadings.forEach(x => {
+            total += x
+          })
+
+          // Divide this by the number of entries to get an average W5m
+          total /= this.accessory.context.energyReadings.length
+
+          // Convert this to Wh then kWh
+          total /= 12
+          total /= 1000
+
+          // Accumulate the grand total that Eve reads as the total consumption
+          this.accessory.context.energyReadingTotal += total
+        }
+
+        // Reset the array for each 30 second readings
+        this.accessory.context.energyReadings = []
+
+        // Update Eve with the new grand total
+        this.service.updateCharacteristic(
+          this.eveChar.TotalConsumption,
+          this.accessory.context.energyReadingTotal
+        )
+      }, 30000)
+
+      // Set up an interval to get eWeLink to send power updates
+      setTimeout(() => {
+        this.internalUIUpdate()
+        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
+      }, 5000)
+
+      // Stop the intervals on Homebridge shutdown
+      platform.api.on('shutdown', () => {
+        clearInterval(this.intervalPoll)
+        clearInterval(this.intervalPower)
+      })
+    }
+
+    // Output the customised options to the log
+    const opts = JSON.stringify({
+      inUsePowerThreshold: this.inUsePowerThreshold,
+      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
+      showAsType: 'outlet'
+    })
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
+  }
+
+  async internalStateUpdate (value) {
+    try {
+      const newValue = this.cacheState === 'on' ? 'off' : 'on'
+      const params = {}
+      if (this.isSCM) {
+        params.switches = [{ switch: 'on', outlet: 0 }]
+      } else {
+        params.switch = 'on'
+      }
+      this.ignoreUpdates = true
+      setTimeout(() => {
+        this.ignoreUpdates = false
+      }, 1500)
+      await this.platform.sendDeviceUpdate(this.accessory, params)
+      this.cacheState = newValue
+      if (this.powerReadings && this.cacheState === 'off') {
+        this.service.updateCharacteristic(this.hapChar.OutletInUse, false)
+        this.service.updateCharacteristic(this.eveChar.CurrentConsumption, 0)
+        this.accessory.eveService.addEntry({ power: 0 })
+        this.accessory.context.energyReadings.push(0)
+      }
+      this.accessory.eveService.addEntry({ status: this.cacheState === 'on' ? 1 : 0 })
+      if (this.enableLogging) {
+        this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
+      }
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, true)
+      setTimeout(() => {
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
+      }, 2000)
+      throw new this.hapErr(-70402)
+    }
+  }
+
+  async internalUIUpdate () {
+    try {
+      // Skip polling if device isn't online
+      if (!this.isOnline) {
+        return
+      }
+
+      // Send the params to request the updates
+      await this.platform.sendDeviceUpdate(this.accessory, { uiActive: 120 })
+    } catch (err) {
+      // Suppress errors here
+    }
+  }
+
+  async externalUpdate (params) {
+    try {
+      if (!this.isSCM && params.switch === 'on') {
+        if (!this.ignoreUpdates) {
+          this.ignoreUpdates = true
+          setTimeout(() => {
+            this.ignoreUpdates = false
+          }, 1500)
+          this.cacheState = this.cacheState === 'on' ? 'off' : 'on'
+          this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
+          this.accessory.eveService.addEntry({ status: this.cacheState === 'on' ? 1 : 0 })
+          if (this.powerReadings && this.cacheState === 'off') {
+            this.service.updateCharacteristic(this.hapChar.OutletInUse, false)
+            this.service.updateCharacteristic(this.eveChar.CurrentConsumption, 0)
+            this.accessory.eveService.addEntry({ power: 0 })
+            this.accessory.context.energyReadings.push(0)
+          }
+          if (params.updateSource && this.enableLogging) {
+            this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
+          }
+        }
+      }
+      if (this.isSCM && params.switches && params.switches[0].switch === 'on') {
+        if (!this.ignoreUpdates) {
+          this.ignoreUpdates = true
+          setTimeout(() => {
+            this.ignoreUpdates = false
+          }, 1500)
+          this.cacheState = this.cacheState === 'on' ? 'off' : 'on'
+          this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
+          this.accessory.eveService.addEntry({ status: this.cacheState === 'on' ? 1 : 0 })
+          if (params.updateSource && this.enableLogging) {
+            this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
+          }
+        }
+      }
+      if (!this.powerReadings) {
+        return
+      }
+      let logger = false
+      if (this.funcs.hasProperty(params, 'power')) {
+        const power = parseFloat(params.power)
+        this.service.updateCharacteristic(
+          this.hapChar.OutletInUse,
+          this.cacheState === 'on' && power > this.inUsePowerThreshold
+        )
+        this.service.updateCharacteristic(this.eveChar.CurrentConsumption, power)
+        this.accessory.eveService.addEntry({
+          power: this.cacheState === 'on' ? power : 0
+        })
+        this.accessory.context.energyReadings.push(power)
+        logger = true
+      }
+      if (this.funcs.hasProperty(params, 'voltage')) {
+        this.service.updateCharacteristic(this.eveChar.Voltage, parseFloat(params.voltage))
+        logger = true
+      }
+      if (this.funcs.hasProperty(params, 'current')) {
+        this.service.updateCharacteristic(this.eveChar.ElectricCurrent, parseFloat(params.current))
+        logger = true
+      }
+      if (params.updateSource && logger && this.enableLogging) {
+        this.log(
+          '[%s] %s%s%s.',
+          this.name,
+          this.funcs.hasProperty(params, 'power')
+            ? this.lang.curPower + ' [' + params.power + 'W]'
+            : '',
+          this.funcs.hasProperty(params, 'voltage')
+            ? ' ' + this.lang.curVolt + ' [' + params.voltage + 'V]'
+            : '',
+          this.funcs.hasProperty(params, 'current')
+            ? ' ' + this.lang.curCurr + ' [' + params.current + 'A]'
+            : ''
+        )
+      }
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, false)
+    }
+  }
+
+  markStatus (isOnline) {
+    this.isOnline = isOnline
+  }
+
+  async currentState () {
+    const toReturn = {}
+    toReturn.services = ['outlet']
+    toReturn.outlet = {
+      state: this.service.getCharacteristic(this.hapChar.On).value ? 'on' : 'off'
+    }
+    if (this.powerReadings) {
+      try {
+        toReturn.services.push('power')
+        toReturn.power = {
+          state: await this.platform.sendDeviceUpdate(this.accessory, { hundredDaysKwh: 'get' })
+        }
+      } catch (err) {
+        // Suppress errors here
+      }
+    }
+    return toReturn
+  }
+}
diff --git a/lib/device/switch-single-inched.js b/lib/device/switch-single-inched.js
new file mode 100644
index 00000000..623fea81
--- /dev/null
+++ b/lib/device/switch-single-inched.js
@@ -0,0 +1,296 @@
+/* jshint node: true,esversion: 9, -W014, -W033 */
+/* eslint-disable new-cap */
+'use strict'
+
+module.exports = class deviceSwitchSingleInched {
+  constructor (platform, accessory) {
+    // Set up variables from the platform
+    this.eveChar = platform.eveChar
+    this.funcs = platform.funcs
+    this.hapChar = platform.api.hap.Characteristic
+    this.hapErr = platform.api.hap.HapStatusError
+    this.hapServ = platform.api.hap.Service
+    this.lang = platform.lang
+    this.log = platform.log
+    this.platform = platform
+
+    // Set up variables from the accessory
+    this.name = accessory.displayName
+    this.accessory = accessory
+
+    // Initially set the online flag as true (to be then updated as false if necessary)
+    this.isOnline = true
+
+    /*
+    UIID 1/6/14/24/27/112/1256: single switch, no power readings
+    UIID 5: single switch, with wattage readings
+    UIID 32: single switch, with wattage, voltage and amp readings
+    UIID 77/78/81/107: single switch but firmware uses multiple channels (only need CH0)
+    */
+
+    // Set up custom variables for this device type
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
+
+    // Set the correct logging variables for this accessory
+    this.enableLogging = !platform.config.disableDeviceLogging
+    this.enableDebugLogging = platform.config.debug
+    if (deviceConf && deviceConf.overrideLogging) {
+      switch (deviceConf.overrideLogging) {
+        case 'standard':
+          this.enableLogging = true
+          this.enableDebugLogging = false
+          break
+        case 'debug':
+          this.enableLogging = true
+          this.enableDebugLogging = true
+          break
+        case 'disable':
+          this.enableLogging = false
+          this.enableDebugLogging = false
+          break
+      }
+    }
+
+    // If the accessory has a outlet service then remove it
+    if (this.accessory.getService(this.hapServ.Outlet)) {
+      this.accessory.removeService(this.accessory.getService(this.hapServ.Outlet))
+    }
+
+    // Add the switch service if it doesn't already exist
+    this.service =
+      this.accessory.getService(this.hapServ.Switch) ||
+      this.accessory.addService(this.hapServ.Switch)
+
+    switch (this.accessory.context.eweUIID) {
+      case 5:
+        // Add Eve power characteristics
+        this.powerReadings = true
+        if (!this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
+          this.service.addCharacteristic(this.eveChar.CurrentConsumption)
+        }
+
+        // Remove unused Eve characteristics
+        if (this.service.testCharacteristic(this.eveChar.ElectricCurrent)) {
+          this.service.removeCharacteristic(
+            this.service.getCharacteristic(this.eveChar.ElectricCurrent)
+          )
+        }
+        if (this.service.testCharacteristic(this.eveChar.Voltage)) {
+          this.service.removeCharacteristic(this.service.getCharacteristic(this.eveChar.Voltage))
+        }
+        break
+      case 32:
+        // Add Eve power characteristics
+        this.powerReadings = true
+        if (!this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
+          this.service.addCharacteristic(this.eveChar.CurrentConsumption)
+        }
+        if (!this.service.testCharacteristic(this.eveChar.ElectricCurrent)) {
+          this.service.addCharacteristic(this.eveChar.ElectricCurrent)
+        }
+        if (!this.service.testCharacteristic(this.eveChar.Voltage)) {
+          this.service.addCharacteristic(this.eveChar.Voltage)
+        }
+        break
+      default:
+        // Set a flag for devices with hardware that use multi-channel format
+        if (platform.consts.devices.outletSCM.includes(this.accessory.context.eweUIID)) {
+          this.isSCM = true
+        }
+
+        // Remove unused Eve characteristics
+        if (this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
+          this.service.removeCharacteristic(
+            this.service.getCharacteristic(this.eveChar.CurrentConsumption)
+          )
+        }
+        if (this.service.testCharacteristic(this.eveChar.ElectricCurrent)) {
+          this.service.removeCharacteristic(
+            this.service.getCharacteristic(this.eveChar.ElectricCurrent)
+          )
+        }
+        if (this.service.testCharacteristic(this.eveChar.Voltage)) {
+          this.service.removeCharacteristic(this.service.getCharacteristic(this.eveChar.Voltage))
+        }
+        break
+    }
+
+    // Add the set handler to the switch on/off characteristic
+    this.service
+      .getCharacteristic(this.hapChar.On)
+      .onSet(async value => await this.internalStateUpdate(value))
+      .updateValue(false)
+    this.cacheState = 'off'
+
+    // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
+    if (!platform.config.disableNoResponse) {
+      this.service.getCharacteristic(this.hapChar.On).onGet(() => {
+        if (!this.isOnline) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.On).value
+      })
+    }
+
+    // Pass the accessory to Fakegato to set up with Eve
+    this.accessory.eveService = new platform.eveService('switch', this.accessory, {
+      log: platform.config.debugFakegato ? this.log : () => {}
+    })
+
+    // Set up extra features for outlets that provide power readings
+    if (this.powerReadings) {
+      // Set up an interval to get eWeLink to send power updates
+      setTimeout(() => {
+        this.internalUIUpdate()
+        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
+      }, 5000)
+
+      // Stop the intervals on Homebridge shutdown
+      platform.api.on('shutdown', () => {
+        clearInterval(this.intervalPoll)
+        clearInterval(this.intervalPower)
+      })
+    }
+
+    // Output the customised options to the log
+    const opts = JSON.stringify({
+      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
+      showAs: 'default'
+    })
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
+  }
+
+  async internalStateUpdate (value) {
+    try {
+      const newValue = this.cacheState === 'on' ? 'off' : 'on'
+      const params = {}
+      if (this.isSCM) {
+        params.switches = [{ switch: 'on', outlet: 0 }]
+      } else {
+        params.switch = 'on'
+      }
+      this.ignoreUpdates = true
+      setTimeout(() => {
+        this.ignoreUpdates = false
+      }, 1500)
+      await this.platform.sendDeviceUpdate(this.accessory, params)
+      this.cacheState = newValue
+      if (this.cacheState === 'off' && this.powerReadings) {
+        this.service.updateCharacteristic(this.eveChar.CurrentConsumption, 0)
+      }
+      this.accessory.eveService.addEntry({ status: this.cacheState === 'on' ? 1 : 0 })
+      if (this.enableLogging) {
+        this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
+      }
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, true)
+      setTimeout(() => {
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
+      }, 2000)
+      throw new this.hapErr(-70402)
+    }
+  }
+
+  async internalUIUpdate () {
+    try {
+      // Skip polling if device isn't online
+      if (!this.isOnline) {
+        return
+      }
+
+      // Send the params to request the updates
+      await this.platform.sendDeviceUpdate(this.accessory, { uiActive: 120 })
+    } catch (err) {
+      // Suppress errors here
+    }
+  }
+
+  async externalUpdate (params) {
+    try {
+      if (!this.isSCM && params.switch === 'on') {
+        if (!this.ignoreUpdates) {
+          this.ignoreUpdates = true
+          setTimeout(() => {
+            this.ignoreUpdates = false
+          }, 1500)
+          this.cacheState = this.cacheState === 'on' ? 'off' : 'on'
+          this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
+          this.accessory.eveService.addEntry({ status: this.cacheState === 'on' ? 1 : 0 })
+          if (params.updateSource && this.enableLogging) {
+            this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
+          }
+        }
+      }
+      if (this.isSCM && params.switches && params.switches[0].switch === 'on') {
+        if (!this.ignoreUpdates) {
+          this.ignoreUpdates = true
+          setTimeout(() => {
+            this.ignoreUpdates = false
+          }, 1500)
+          this.cacheState = this.cacheState === 'on' ? 'off' : 'on'
+          this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
+          this.accessory.eveService.addEntry({ status: this.cacheState === 'on' ? 1 : 0 })
+          if (params.updateSource && this.enableLogging) {
+            this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
+          }
+        }
+      }
+      if (!this.powerReadings) {
+        return
+      }
+      let logger = false
+      if (this.funcs.hasProperty(params, 'power')) {
+        this.service.updateCharacteristic(this.eveChar.CurrentConsumption, parseFloat(params.power))
+        logger = true
+      }
+      if (this.funcs.hasProperty(params, 'voltage')) {
+        this.service.updateCharacteristic(this.eveChar.Voltage, parseFloat(params.voltage))
+        logger = true
+      }
+      if (this.funcs.hasProperty(params, 'current')) {
+        this.service.updateCharacteristic(this.eveChar.ElectricCurrent, parseFloat(params.current))
+        logger = true
+      }
+      if (params.updateSource && logger && this.enableLogging) {
+        this.log(
+          '[%s] %s%s%s.',
+          this.name,
+          this.funcs.hasProperty(params, 'power')
+            ? this.lang.curPower + ' [' + params.power + 'W]'
+            : '',
+          this.funcs.hasProperty(params, 'voltage')
+            ? ' ' + this.lang.curVolt + ' [' + params.voltage + 'V]'
+            : '',
+          this.funcs.hasProperty(params, 'current')
+            ? ' ' + this.lang.curCurr + ' [' + params.current + 'A]'
+            : ''
+        )
+      }
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, false)
+    }
+  }
+
+  markStatus (isOnline) {
+    this.isOnline = isOnline
+  }
+
+  async currentState () {
+    const toReturn = {}
+    toReturn.services = ['switch']
+    toReturn.switch = {
+      state: this.service.getCharacteristic(this.hapChar.On).value ? 'on' : 'off'
+    }
+    if (this.powerReadings) {
+      try {
+        toReturn.services.push('power')
+        toReturn.power = {
+          state: await this.platform.sendDeviceUpdate(this.accessory, { hundredDaysKwh: 'get' })
+        }
+      } catch (err) {
+        // Suppress errors here
+      }
+    }
+    return toReturn
+  }
+}
diff --git a/lib/index.js b/lib/index.js
index 00576c33..792e1220 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -286,6 +286,7 @@ class eWeLinkPlatform {
                   case 'hideSensor':
                   case 'hideSwitch':
                   case 'humidityOffsetFactor':
+                  case 'isInched':
                   case 'offsetFactor':
                   case 'resetOnStartup':
                   case 'scaleBattery':
@@ -976,7 +977,11 @@ class eWeLinkPlatform {
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control =
           device.showAs === 'outlet'
-            ? new (require('./device/outlet-single'))(this, accessory)
+            ? this.deviceConf[device.deviceid] && this.deviceConf[device.deviceid].isInched
+              ? new (require('./device/outlet-single-inched'))(this, accessory)
+              : new (require('./device/outlet-single'))(this, accessory)
+            : this.deviceConf[device.deviceid] && this.deviceConf[device.deviceid].isInched
+            ? new (require('./device/switch-single-inched'))(this, accessory)
             : new (require('./device/switch-single'))(this, accessory)
         /*******************************/
       } else if (this.consts.devices.multiSwitch.includes(uiid)) {
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 4245add1..c91d73c1 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -83,6 +83,7 @@ module.exports = {
       'deviceModel',
       'showAs',
       'inUsePowerThreshold',
+      'isInched',
       'operationTime',
       'operationTimeDown',
       'sensorId',

From 40c0a948726218b51f7a4ed252f8838463ce98f4 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 29 Jul 2021 14:34:07 +0100
Subject: [PATCH 2579/3183] 7.1.1-beta.6

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 57f9337d..746e860b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "7.1.1-beta.5",
+  "version": "7.1.1-beta.6",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 9eb343cb..16e9c31b 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "7.1.1-beta.5",
+  "version": "7.1.1-beta.6",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From bc978a32751beb5b6152a965c6b4841593011898 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 29 Jul 2021 14:40:31 +0100
Subject: [PATCH 2580/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6dc802da..1ccc6fa4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ All notable changes to homebridge-ewelink will be documented in this file.
 - Expose a DUALR3 in motor mode as a `GarageDoorOpener` accessory type
 - `disableNoResponse` setting to disable marking cloud-offline devices as 'No Response' in HomeKit
 - Option to offset recorded temperature or humidity by a scale factor
+- Option to configure a single/multi channel device to set its status based on device inching
 
 ### Changed
 

From 622b1043685fe372c5f7b7a99d787d9587d6f540 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 29 Jul 2021 20:04:57 +0100
Subject: [PATCH 2581/3183] config check for duplicate entries

---
 lib/index.js         | 11 +++++++++++
 lib/utils/lang-en.js |  1 +
 2 files changed, 12 insertions(+)

diff --git a/lib/index.js b/lib/index.js
index 792e1220..5ed02202 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -96,6 +96,9 @@ class eWeLinkPlatform {
     const logDefault = (k, def) => {
       this.log.warn('%s [%s] %s %s.', this.lang.cfgItem, k, this.lang.cfgDef, def)
     }
+    const logDuplicate = k => {
+      this.log.warn('%s [%s] %s.', this.lang.cfgItem, k, this.lang.cfgDup)
+    }
     const logIgnore = k => {
       this.log.warn('%s [%s] %s.', this.lang.cfgItem, k, this.lang.cfgIgn)
     }
@@ -139,6 +142,10 @@ class eWeLinkPlatform {
                 return
               }
               const id = this.funcs.parseDeviceId(x.fullDeviceId)
+              if (Object.keys(this.rfSubdevices).includes(id)) {
+                logDuplicate(key + '.' + id)
+                return
+              }
               const entries = Object.entries(x)
               if (entries.length === 1) {
                 logRemove(key + '.' + id)
@@ -219,6 +226,10 @@ class eWeLinkPlatform {
                 return
               }
               const id = this.funcs.parseDeviceId(x.deviceId)
+              if (Object.keys(this.deviceConf).includes(id)) {
+                logDuplicate(key + '.' + id)
+                return
+              }
               const entries = Object.entries(x)
               if (entries.length === 1) {
                 logRemove(key + '.' + id)
diff --git a/lib/utils/lang-en.js b/lib/utils/lang-en.js
index f50e92f0..c36a19f3 100644
--- a/lib/utils/lang-en.js
+++ b/lib/utils/lang-en.js
@@ -14,6 +14,7 @@ module.exports = {
   cantReadPacket: 'LAN message received could not be read as',
   cantParsePacket: 'Could not parse DNS packet as',
   cfgDef: 'is not a valid number so using default of',
+  cfgDup: 'will be ignored since another entry with this ID already exists',
   cfgIgn: 'is not configured correctly so ignoring',
   cfgIgnItem: 'has an invalid entry which will be ignored',
   cfgItem: 'Config entry',

From 81cbe90b9e2fcfbc5ea22afd629d8dddbf8bd5ec Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 29 Jul 2021 20:05:08 +0100
Subject: [PATCH 2582/3183] bump homebridge and node versions

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 16e9c31b..0df0c9c2 100644
--- a/package.json
+++ b/package.json
@@ -22,8 +22,8 @@
   ],
   "main": "lib/index.js",
   "engines": {
-    "homebridge": "^1.3.3",
-    "node": "^14.17.2 || ^16.5.0"
+    "homebridge": "^1.3.4",
+    "node": "^14.17.4 || ^16.5.0"
   },
   "repository": {
     "type": "git",

From 37eeea2441784632dd5e3d13418549b29acb9b06 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 29 Jul 2021 20:09:04 +0100
Subject: [PATCH 2583/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1ccc6fa4..c5cc35a8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,16 +6,26 @@ All notable changes to homebridge-ewelink will be documented in this file.
 
 ### Added
 
-- Expose a DUALR3 in motor mode as a `GarageDoorOpener` accessory type
-- `disableNoResponse` setting to disable marking cloud-offline devices as 'No Response' in HomeKit
-- Option to offset recorded temperature or humidity by a scale factor
-- Option to configure a single/multi channel device to set its status based on device inching
+- **Single/Multi Channel Devices**
+  - Option to configure a single/multi channel device to set its status based on device inching
+- **DUALR3 Motor Mode**
+  - Expose a DUALR3 in motor mode as a `GarageDoorOpener` accessory type
+- **Temperature/Humidity Sensor Devices**
+  - Option to offset recorded temperature or humidity by a scale factor
+- **Configuration**
+  - `disableNoResponse` setting to disable marking cloud-offline devices as 'No Response' in HomeKit
+  - Plugin will now check for duplicate device ID entries in the config and ignore them
 
 ### Changed
 
-- Plugin will now mark cloud-offline devices with 'No Response' by default
-- Plugin will now reattempt initial HTTP connection on `ECONNABORTED` error
-- Plugin will now use HomeKit `Battery` service type instead of `BatteryService`
+- ⚠️ **Platform Versions**
+  - Recommended node version bumped to v14.17.4
+  - Recommended homebridge version bumped to v1.3.4
+- **Accessories**
+  - Plugin will now mark cloud-offline devices with 'No Response' by default
+  - Plugin will now use HomeKit `Battery` service type instead of `BatteryService`
+- **Backend**
+  - Plugin will now reattempt initial HTTP connection on `ECONNABORTED` error
 
 ### Fixed
 
@@ -23,9 +33,9 @@ All notable changes to homebridge-ewelink will be documented in this file.
 
 ### Removed
 
-- `offlineAsNoResponse` configuration setting - is now default - can be disabled with new `disableNoResponse` setting
-- `ignoredDevices` configuration setting - now use the `ignoreDevice` option in the device type sections
-- `groups` configuration setting - now use the `showAs` option in the device type sections
+- ⚠️ `offlineAsNoResponse` configuration setting - is now default - can be disabled with new `disableNoResponse` setting
+- ⚠️ `ignoredDevices` configuration setting - now use the `ignoreDevice` option in the device type sections
+- ⚠️ `groups` configuration setting - now use the `showAs` option in the device type sections
 
 ## 7.1.0 (2021-07-10)
 

From b37b3cbd5ab585a96760a6a5d0ac919bb4bdd1ad Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 29 Jul 2021 21:20:04 +0100
Subject: [PATCH 2584/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c5cc35a8..84f06546 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,12 @@ All notable changes to homebridge-ewelink will be documented in this file.
 
 ## BETA
 
+### Important Note
+
+- Your Accessory Simulations will stop working with this update if you have not re-set them up in the appropriate device configuration sections.
+- **There is no longer a separate Accessory Simulations section**
+- It is recommended to re-setup your simulations **before** updating to this version
+
 ### Added
 
 - **Single/Multi Channel Devices**

From 6c08cdc69b5c1431bbda53c599df464172212ac6 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 29 Jul 2021 22:09:02 +0100
Subject: [PATCH 2585/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 84f06546..4ec2a51d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,8 +12,8 @@ All notable changes to homebridge-ewelink will be documented in this file.
 
 ### Added
 
-- **Single/Multi Channel Devices**
-  - Option to configure a single/multi channel device to set its status based on device inching
+- **Single Channel Devices**
+  - Option to configure a single channel device to set its status based on device inching
 - **DUALR3 Motor Mode**
   - Expose a DUALR3 in motor mode as a `GarageDoorOpener` accessory type
 - **Temperature/Humidity Sensor Devices**

From eababf0c75138283f7955a97a3fa42ac1a875b50 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 29 Jul 2021 22:09:56 +0100
Subject: [PATCH 2586/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4ec2a51d..20f4b9a6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 All notable changes to homebridge-ewelink will be documented in this file.
 
-## BETA
+## 8.0.0 (2021-07-29)
 
 ### Important Note
 
@@ -27,7 +27,7 @@ All notable changes to homebridge-ewelink will be documented in this file.
 - ⚠️ **Platform Versions**
   - Recommended node version bumped to v14.17.4
   - Recommended homebridge version bumped to v1.3.4
-- **Accessories**
+- ⚠️ **Accessories**
   - Plugin will now mark cloud-offline devices with 'No Response' by default
   - Plugin will now use HomeKit `Battery` service type instead of `BatteryService`
 - **Backend**

From b4ac3c44009884caf4f4dcbc1af3f3784bbeb0a8 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 29 Jul 2021 22:10:23 +0100
Subject: [PATCH 2587/3183] 8.0.0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 746e860b..f88fbbc9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ewelink",
-  "version": "7.1.1-beta.6",
+  "version": "8.0.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 0df0c9c2..497b20c2 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "7.1.1-beta.6",
+  "version": "8.0.0",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From f7754cd87aaf9a103eee63cd38585e77de96ce4c Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Fri, 30 Jul 2021 09:45:13 +0100
Subject: [PATCH 2588/3183] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 8495ca52..4f25e6e8 100644
--- a/README.md
+++ b/README.md
@@ -27,7 +27,7 @@ Homebridge plugin to control eWeLink devices
 
 ### Prerequisites
 
-- To use this plugin, you will need to already have [Homebridge](https://homebridge.io) (at least v1.3.3) or [HOOBS](https://hoobs.org) (at least v3.3.4) installed. Please refer to the links for more information and installation instructions.
+- To use this plugin, you will need to already have [Homebridge](https://homebridge.io) (at least v1.3.4) or [HOOBS](https://hoobs.org) (at least v4) installed. Refer to the links for more information and installation instructions.
 - It is recommended to use the current LTS version of Node, currently v14, however Node v12 is also supported.
 
 ### Setup

From a29188ae9f224934996fa2efe2139cb3debeffda Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 30 Jul 2021 20:34:59 +0100
Subject: [PATCH 2589/3183] Update package-lock.json

---
 package-lock.json | 29 +++++++++++++++++++++++++----
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index f88fbbc9..d876e30e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -40,9 +40,9 @@
       }
     },
     "es-abstract": {
-      "version": "1.18.3",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.3.tgz",
-      "integrity": "sha512-nQIr12dxV7SSxE6r6f1l3DtAeEYdsGpps13dR0TwJg1S8gyp4ZPgy3FZcHBgbiQqnoqSTb+oC+kO4UQ0C/J8vw==",
+      "version": "1.18.4",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.4.tgz",
+      "integrity": "sha512-xjDAPJRxKc1uoTkdW8MEk7Fq/2bzz3YoCADYniDV7+KITCUdu9c90fj1aKI7nEZFZxRrHlDo3wtma/C6QkhlXQ==",
       "requires": {
         "call-bind": "^1.0.2",
         "es-to-primitive": "^1.2.1",
@@ -50,11 +50,12 @@
         "get-intrinsic": "^1.1.1",
         "has": "^1.0.3",
         "has-symbols": "^1.0.2",
+        "internal-slot": "^1.0.3",
         "is-callable": "^1.2.3",
         "is-negative-zero": "^2.0.1",
         "is-regex": "^1.1.3",
         "is-string": "^1.0.6",
-        "object-inspect": "^1.10.3",
+        "object-inspect": "^1.11.0",
         "object-keys": "^1.1.1",
         "object.assign": "^4.1.2",
         "string.prototype.trimend": "^1.0.4",
@@ -115,6 +116,16 @@
       "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
       "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw=="
     },
+    "internal-slot": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz",
+      "integrity": "sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==",
+      "requires": {
+        "get-intrinsic": "^1.1.0",
+        "has": "^1.0.3",
+        "side-channel": "^1.0.4"
+      }
+    },
     "is-bigint": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.2.tgz",
@@ -238,6 +249,16 @@
       "resolved": "https://registry.npmjs.org/promised-map/-/promised-map-1.0.0.tgz",
       "integrity": "sha512-fP9VSMgcml+U2uJ9PBc4/LDQ3ZkJCH4blLNCS6gbH7RHyRZCYs91zxWHqiUy+heFiEMiB2op/qllYoFqmIqdWA=="
     },
+    "side-channel": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
+      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
+      "requires": {
+        "call-bind": "^1.0.0",
+        "get-intrinsic": "^1.0.2",
+        "object-inspect": "^1.9.0"
+      }
+    },
     "string.prototype.trimend": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz",

From e5305fed6d56d85241aaa01ab90f6a3393d0cef7 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 1 Aug 2021 22:28:37 +0100
Subject: [PATCH 2590/3183] Update package.json

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 497b20c2..58b63dfe 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,7 @@
   "main": "lib/index.js",
   "engines": {
     "homebridge": "^1.3.4",
-    "node": "^14.17.4 || ^16.5.0"
+    "node": "^14.17.4 || ^16.6.0"
   },
   "repository": {
     "type": "git",

From fde7b5ee5456e9c8efefb0f6a8f8c1983803704d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 2 Aug 2021 16:37:35 +0100
Subject: [PATCH 2591/3183] improved battery calculation for DW2

---
 lib/device/sensor-contact.js            |  4 ++--
 lib/device/simulation/sensor-leak.js    |  4 ++--
 lib/device/simulation/sensor-visible.js | 11 ++++++-----
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/lib/device/sensor-contact.js b/lib/device/sensor-contact.js
index 842e0dea..09c50950 100644
--- a/lib/device/sensor-contact.js
+++ b/lib/device/sensor-contact.js
@@ -88,8 +88,8 @@ module.exports = class deviceSensorContact {
     try {
       if (this.funcs.hasProperty(params, 'battery') && params.battery !== this.cacheBatt) {
         this.cacheBatt = params.battery
-        this.cacheBattScaled = Math.round(this.cacheBatt * 33.3)
-        this.cacheBattScaled = Math.max(Math.min(this.cacheBattScaled, 100), 0)
+        this.cacheBattScaled = Math.min(Math.max(this.cacheBatt, 2), 3)
+        this.cacheBattScaled = Math.round((this.cacheBattScaled - 2) * 100)
         this.batteryService.updateCharacteristic(this.hapChar.BatteryLevel, this.cacheBattScaled)
         this.batteryService.updateCharacteristic(
           this.hapChar.StatusLowBattery,
diff --git a/lib/device/simulation/sensor-leak.js b/lib/device/simulation/sensor-leak.js
index dd2c336a..cba271fc 100644
--- a/lib/device/simulation/sensor-leak.js
+++ b/lib/device/simulation/sensor-leak.js
@@ -78,8 +78,8 @@ module.exports = class deviceSensorLeak {
     try {
       if (this.funcs.hasProperty(params, 'battery') && this.cacheBatt !== params.battery) {
         this.cacheBatt = params.battery
-        this.cacheBattScaled = Math.round(params.battery * 33.3)
-        this.cacheBattScaled = Math.max(Math.min(this.cacheBattScaled, 100), 0)
+        this.cacheBattScaled = Math.min(Math.max(this.cacheBatt, 2), 3)
+        this.cacheBattScaled = Math.round((this.cacheBattScaled - 2) * 100)
         this.batteryService.updateCharacteristic(this.hapChar.BatteryLevel, this.cacheBattScaled)
         this.batteryService.updateCharacteristic(
           this.hapChar.StatusLowBattery,
diff --git a/lib/device/simulation/sensor-visible.js b/lib/device/simulation/sensor-visible.js
index 2b19d4ff..889eaf53 100644
--- a/lib/device/simulation/sensor-visible.js
+++ b/lib/device/simulation/sensor-visible.js
@@ -92,11 +92,12 @@ module.exports = class deviceSensorVisible {
     try {
       if (this.funcs.hasProperty(params, 'battery') && params.battery !== this.cacheBatt) {
         this.cacheBatt = params.battery
-        this.cacheBattScaled = this.isDW2
-          ? Math.round(this.cacheBatt * 33.3)
-          : this.scaleBattery
-          ? this.cacheBatt * 10
-          : this.cacheBatt
+        if (this.isDW2) {
+          this.cacheBattScaled = Math.min(Math.max(this.cacheBatt, 2), 3)
+          this.cacheBattScaled = Math.round((this.cacheBattScaled - 2) * 100)
+        } else {
+          this.cacheBattScaled = this.scaleBattery ? this.cacheBatt * 10 : this.cacheBatt
+        }
         this.cacheBattScaled = Math.max(Math.min(this.cacheBattScaled, 100), 0)
         this.batteryService.updateCharacteristic(this.hapChar.BatteryLevel, this.cacheBattScaled)
         this.batteryService.updateCharacteristic(

From 26454d1a74bbfa3ba51c09314e22239275b2bab1 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 2 Aug 2021 16:37:51 +0100
Subject: [PATCH 2592/3183] update packagejson lockfileVersion

---
 package-lock.json | 532 +++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 527 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d876e30e..53b205ed 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,8 +1,529 @@
 {
   "name": "homebridge-ewelink",
   "version": "8.0.0",
-  "lockfileVersion": 1,
+  "lockfileVersion": 2,
   "requires": true,
+  "packages": {
+    "": {
+      "version": "8.0.0",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/bwp91"
+        },
+        {
+          "type": "kofi",
+          "url": "https://ko-fi.com/bwp91"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/bwp91"
+        },
+        {
+          "type": "paypal",
+          "url": "https://www.paypal.me/BenPotter"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "@homebridge/plugin-ui-utils": "^0.0.19",
+        "axios": "^0.21.1",
+        "node-persist": "^3.1.0",
+        "p-queue": "^6.6.2",
+        "websocket-as-promised": "^2.0.1",
+        "ws": "^7.5.3"
+      },
+      "engines": {
+        "homebridge": "^1.3.4",
+        "node": "^14.17.4 || ^16.6.0"
+      }
+    },
+    "node_modules/@homebridge/plugin-ui-utils": {
+      "version": "0.0.19",
+      "resolved": "https://registry.npmjs.org/@homebridge/plugin-ui-utils/-/plugin-ui-utils-0.0.19.tgz",
+      "integrity": "sha512-axFX7lN2Yd7bz/6SlD7dzq5sY/N9+XYuLHPukuiyHQRDtNMRL1uDqJhOx6RVaN2tYDHB75h7YxRQWP7U44Mgzg=="
+    },
+    "node_modules/axios": {
+      "version": "0.21.1",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.1.tgz",
+      "integrity": "sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==",
+      "dependencies": {
+        "follow-redirects": "^1.10.0"
+      }
+    },
+    "node_modules/call-bind": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
+      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+      "dependencies": {
+        "function-bind": "^1.1.1",
+        "get-intrinsic": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/chnl": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/chnl/-/chnl-1.2.0.tgz",
+      "integrity": "sha512-g5gJb59edwCliFbX2j7G6sBfY4sX9YLy211yctONI2GRaiX0f2zIbKWmBm+sPqFNEpM7Ljzm7IJX/xrjiEbPrw=="
+    },
+    "node_modules/define-properties": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
+      "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
+      "dependencies": {
+        "object-keys": "^1.0.12"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-abstract": {
+      "version": "1.18.5",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.5.tgz",
+      "integrity": "sha512-DDggyJLoS91CkJjgauM5c0yZMjiD1uK3KcaCeAmffGwZ+ODWzOkPN4QwRbsK5DOFf06fywmyLci3ZD8jLGhVYA==",
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "es-to-primitive": "^1.2.1",
+        "function-bind": "^1.1.1",
+        "get-intrinsic": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.2",
+        "internal-slot": "^1.0.3",
+        "is-callable": "^1.2.3",
+        "is-negative-zero": "^2.0.1",
+        "is-regex": "^1.1.3",
+        "is-string": "^1.0.6",
+        "object-inspect": "^1.11.0",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.2",
+        "string.prototype.trimend": "^1.0.4",
+        "string.prototype.trimstart": "^1.0.4",
+        "unbox-primitive": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/es-to-primitive": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
+      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
+      "dependencies": {
+        "is-callable": "^1.1.4",
+        "is-date-object": "^1.0.1",
+        "is-symbol": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/eventemitter3": {
+      "version": "4.0.7",
+      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
+      "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="
+    },
+    "node_modules/follow-redirects": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.1.tgz",
+      "integrity": "sha512-HWqDgT7ZEkqRzBvc2s64vSZ/hfOceEol3ac/7tKwzuvEyWx3/4UegXh5oBOIotkGsObyk3xznnSRVADBgWSQVg==",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://github.com/sponsors/RubenVerborgh"
+        }
+      ],
+      "engines": {
+        "node": ">=4.0"
+      },
+      "peerDependenciesMeta": {
+        "debug": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/function-bind": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
+    },
+    "node_modules/get-intrinsic": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz",
+      "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==",
+      "dependencies": {
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+      "dependencies": {
+        "function-bind": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4.0"
+      }
+    },
+    "node_modules/has-bigints": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.1.tgz",
+      "integrity": "sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-symbols": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
+      "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/internal-slot": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz",
+      "integrity": "sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==",
+      "dependencies": {
+        "get-intrinsic": "^1.1.0",
+        "has": "^1.0.3",
+        "side-channel": "^1.0.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/is-bigint": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.2.tgz",
+      "integrity": "sha512-0JV5+SOCQkIdzjBK9buARcV804Ddu7A0Qet6sHi3FimE9ne6m4BGQZfRn+NZiXbBk4F4XmHfDZIipLj9pX8dSA==",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-boolean-object": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.1.tgz",
+      "integrity": "sha512-bXdQWkECBUIAcCkeH1unwJLIpZYaa5VvuygSyS/c2lf719mTKZDU5UdDRlpd01UjADgmW8RfqaP+mRaVPdr/Ng==",
+      "dependencies": {
+        "call-bind": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-callable": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.3.tgz",
+      "integrity": "sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ==",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-date-object": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.4.tgz",
+      "integrity": "sha512-/b4ZVsG7Z5XVtIxs/h9W8nvfLgSAyKYdtGWQLbqy6jA1icmgjf8WCoTKgeS4wy5tYaPePouzFMANbnj94c2Z+A==",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-negative-zero": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.1.tgz",
+      "integrity": "sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-number-object": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.5.tgz",
+      "integrity": "sha512-RU0lI/n95pMoUKu9v1BZP5MBcZuNSVJkMkAG2dJqC4z2GlkGUNeH68SuHuBKBD/XFe+LHZ+f9BKkLET60Niedw==",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-regex": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.3.tgz",
+      "integrity": "sha512-qSVXFz28HM7y+IWX6vLCsexdlvzT1PJNFSBuaQLQ5o0IEw8UDYW6/2+eCMVyIsbM8CNLX2a/QWmSpyxYEHY7CQ==",
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "has-symbols": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-string": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.6.tgz",
+      "integrity": "sha512-2gdzbKUuqtQ3lYNrUTQYoClPhm7oQu4UdpSZMp1/DGgkHBT8E2Z1l0yMdb6D4zNAxwDiMv8MdulKROJGNl0Q0w==",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-symbol": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
+      "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
+      "dependencies": {
+        "has-symbols": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/node-persist": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/node-persist/-/node-persist-3.1.0.tgz",
+      "integrity": "sha512-/j+fd/u71wNgKf3V2bx4tnDm+3GvLnlCuvf2MXbJ3wern+67IAb6zN9Leu1tCWPlPNZ+v1hLSibVukkPK2HqJw==",
+      "engines": {
+        "node": ">=10.12.0"
+      }
+    },
+    "node_modules/object-inspect": {
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.0.tgz",
+      "integrity": "sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg==",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object-keys": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/object.assign": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
+      "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
+      "dependencies": {
+        "call-bind": "^1.0.0",
+        "define-properties": "^1.1.3",
+        "has-symbols": "^1.0.1",
+        "object-keys": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/p-finally": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
+      "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/p-queue": {
+      "version": "6.6.2",
+      "resolved": "https://registry.npmjs.org/p-queue/-/p-queue-6.6.2.tgz",
+      "integrity": "sha512-RwFpb72c/BhQLEXIZ5K2e+AhgNVmIejGlTgiB9MzZ0e93GRvqZ7uSi0dvRF7/XIXDeNkra2fNHBxTyPDGySpjQ==",
+      "dependencies": {
+        "eventemitter3": "^4.0.4",
+        "p-timeout": "^3.2.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/p-timeout": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-3.2.0.tgz",
+      "integrity": "sha512-rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg==",
+      "dependencies": {
+        "p-finally": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/promise-controller": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/promise-controller/-/promise-controller-1.0.0.tgz",
+      "integrity": "sha512-goA0zA9L91tuQbUmiMinSYqlyUtEgg4fxJcjYnLYOQnrktb4o4UqciXDNXiRUPiDBPACmsr1k8jDW4r7UDq9Qw==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/promise.prototype.finally": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/promise.prototype.finally/-/promise.prototype.finally-3.1.2.tgz",
+      "integrity": "sha512-A2HuJWl2opDH0EafgdjwEw7HysI8ff/n4lW4QEVBCUXFk9QeGecBWv0Deph0UmLe3tTNYegz8MOjsVuE6SMoJA==",
+      "dependencies": {
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.0-next.0",
+        "function-bind": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/promised-map": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/promised-map/-/promised-map-1.0.0.tgz",
+      "integrity": "sha512-fP9VSMgcml+U2uJ9PBc4/LDQ3ZkJCH4blLNCS6gbH7RHyRZCYs91zxWHqiUy+heFiEMiB2op/qllYoFqmIqdWA==",
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/side-channel": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
+      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
+      "dependencies": {
+        "call-bind": "^1.0.0",
+        "get-intrinsic": "^1.0.2",
+        "object-inspect": "^1.9.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/string.prototype.trimend": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz",
+      "integrity": "sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==",
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/string.prototype.trimstart": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz",
+      "integrity": "sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==",
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/unbox-primitive": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.1.tgz",
+      "integrity": "sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw==",
+      "dependencies": {
+        "function-bind": "^1.1.1",
+        "has-bigints": "^1.0.1",
+        "has-symbols": "^1.0.2",
+        "which-boxed-primitive": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/websocket-as-promised": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/websocket-as-promised/-/websocket-as-promised-2.0.1.tgz",
+      "integrity": "sha512-ePV26D/D37ughXU9j+DjGmwUbelWJrC/vi+6GK++fRlBJmS7aU9T8ABu47KFF0O7r6XN2NAuqJRpegbUwXZxQg==",
+      "dependencies": {
+        "chnl": "^1.2.0",
+        "promise-controller": "^1.0.0",
+        "promise.prototype.finally": "^3.1.2",
+        "promised-map": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/which-boxed-primitive": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
+      "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
+      "dependencies": {
+        "is-bigint": "^1.0.1",
+        "is-boolean-object": "^1.1.0",
+        "is-number-object": "^1.0.4",
+        "is-string": "^1.0.5",
+        "is-symbol": "^1.0.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/ws": {
+      "version": "7.5.3",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.3.tgz",
+      "integrity": "sha512-kQ/dHIzuLrS6Je9+uv81ueZomEwH0qVYstcAQ4/Z93K8zeko9gtAbttJWzoC5ukqXY1PpoouV3+VSOqEAFt5wg==",
+      "engines": {
+        "node": ">=8.3.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": "^5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
+      }
+    }
+  },
   "dependencies": {
     "@homebridge/plugin-ui-utils": {
       "version": "0.0.19",
@@ -40,9 +561,9 @@
       }
     },
     "es-abstract": {
-      "version": "1.18.4",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.4.tgz",
-      "integrity": "sha512-xjDAPJRxKc1uoTkdW8MEk7Fq/2bzz3YoCADYniDV7+KITCUdu9c90fj1aKI7nEZFZxRrHlDo3wtma/C6QkhlXQ==",
+      "version": "1.18.5",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.5.tgz",
+      "integrity": "sha512-DDggyJLoS91CkJjgauM5c0yZMjiD1uK3KcaCeAmffGwZ+ODWzOkPN4QwRbsK5DOFf06fywmyLci3ZD8jLGhVYA==",
       "requires": {
         "call-bind": "^1.0.2",
         "es-to-primitive": "^1.2.1",
@@ -314,7 +835,8 @@
     "ws": {
       "version": "7.5.3",
       "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.3.tgz",
-      "integrity": "sha512-kQ/dHIzuLrS6Je9+uv81ueZomEwH0qVYstcAQ4/Z93K8zeko9gtAbttJWzoC5ukqXY1PpoouV3+VSOqEAFt5wg=="
+      "integrity": "sha512-kQ/dHIzuLrS6Je9+uv81ueZomEwH0qVYstcAQ4/Z93K8zeko9gtAbttJWzoC5ukqXY1PpoouV3+VSOqEAFt5wg==",
+      "requires": {}
     }
   }
 }

From 2b9a00c531358b0ce138225e37d4d3b763464071 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 2 Aug 2021 16:43:10 +0100
Subject: [PATCH 2593/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 20f4b9a6..6f798daf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 All notable changes to homebridge-ewelink will be documented in this file.
 
+## BETA
+
+### Changed
+
+- Improved battery calculations for DW2 sensors
+
 ## 8.0.0 (2021-07-29)
 
 ### Important Note

From d4b70f30df83f36f26389bd9b8f2a9b4fb12d07d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 2 Aug 2021 16:43:35 +0100
Subject: [PATCH 2594/3183] 8.0.1-beta.0

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 53b205ed..28a0758a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,11 +1,11 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.0.0",
+  "version": "8.0.1-beta.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
-      "version": "8.0.0",
+      "version": "8.0.1-beta.0",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 58b63dfe..0edcf831 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.0.0",
+  "version": "8.0.1-beta.0",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From efcf964521e803a019deb7e8673e9a3a7c953155 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 3 Aug 2021 13:10:49 +0100
Subject: [PATCH 2595/3183] set accessory name properly when adding

---
 lib/index.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/index.js b/lib/index.js
index 5ed02202..3fc82f11 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1405,6 +1405,7 @@ class eWeLinkPlatform {
       if (!hidden) {
         accessory
           .getService(this.api.hap.Service.AccessoryInformation)
+          .setCharacteristic(this.api.hap.Characteristic.Name, newDeviceName)
           .setCharacteristic(this.api.hap.Characteristic.SerialNumber, hbDeviceId)
           .setCharacteristic(this.api.hap.Characteristic.Manufacturer, device.brandName)
           .setCharacteristic(

From 20e3a21d2b2d5116095c2eab2e606923ee670811 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 3 Aug 2021 13:33:27 +0100
Subject: [PATCH 2596/3183] also set configuredName

---
 lib/index.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/index.js b/lib/index.js
index 3fc82f11..68a3e359 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1406,6 +1406,7 @@ class eWeLinkPlatform {
         accessory
           .getService(this.api.hap.Service.AccessoryInformation)
           .setCharacteristic(this.api.hap.Characteristic.Name, newDeviceName)
+          .setCharacteristic(this.api.hap.Characteristic.ConfiguredName, newDeviceName)
           .setCharacteristic(this.api.hap.Characteristic.SerialNumber, hbDeviceId)
           .setCharacteristic(this.api.hap.Characteristic.Manufacturer, device.brandName)
           .setCharacteristic(

From 80daa3256caaaf8bb6a825b0f70bc07dbf35d8ee Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 4 Aug 2021 15:38:01 +0100
Subject: [PATCH 2597/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6f798daf..201be846 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 All notable changes to homebridge-ewelink will be documented in this file.
 
-## BETA
+## 8.0.1 (2021-08-04)
 
 ### Changed
 

From 822714684cc298673d84b2f82cdb6dd7f889e057 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 4 Aug 2021 15:38:26 +0100
Subject: [PATCH 2598/3183] 8.0.1

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 28a0758a..ab6c5b7b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,11 +1,11 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.0.1-beta.0",
+  "version": "8.0.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
-      "version": "8.0.1-beta.0",
+      "version": "8.0.1",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 0edcf831..3622a07f 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.0.1-beta.0",
+  "version": "8.0.1",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 52cc5d42306752bfc598cf680013bdbcc1d756c0 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 6 Aug 2021 15:31:03 +0100
Subject: [PATCH 2599/3183] add minir3 uiids

---
 lib/utils/constants.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index c91d73c1..55b2aee8 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -433,6 +433,10 @@ module.exports = {
     93: 0, // "HTHD_AIR_CLEANER"
     94: 0, // "YIAN_ELECTRIC_PROTECT"
     109: 0, // "YK_INFRARED_2"
+    138: 1, // "MINIR3?"
+    139: 2, // "MINIR3?"
+    140: 3, // "MINIR3?"
+    141: 4, // "MINIR3?"
     1001: 0, // "BLADELESS_FAN"
     1002: 0, // "NEW_HUMIDIFIER"
     1003: 0 // "WARM_AIR_BLOWER"

From 4bbb4c006f8e6628d19f0ddef7576b006c5bcfc1 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 9 Aug 2021 21:08:41 +0100
Subject: [PATCH 2600/3183] Update package-lock.json

---
 package-lock.json | 134 ++++++++++++++++++++++++++++++----------------
 1 file changed, 88 insertions(+), 46 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ab6c5b7b..7f4ab213 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -197,6 +197,20 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/has-tostringtag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
+      "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
+      "dependencies": {
+        "has-symbols": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/internal-slot": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz",
@@ -211,19 +225,20 @@
       }
     },
     "node_modules/is-bigint": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.2.tgz",
-      "integrity": "sha512-0JV5+SOCQkIdzjBK9buARcV804Ddu7A0Qet6sHi3FimE9ne6m4BGQZfRn+NZiXbBk4F4XmHfDZIipLj9pX8dSA==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.3.tgz",
+      "integrity": "sha512-ZU538ajmYJmzysE5yU4Y7uIrPQ2j704u+hXFiIPQExpqzzUbpe5jCPdTfmz7jXRxZdvjY3KZ3ZNenoXQovX+Dg==",
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/is-boolean-object": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.1.tgz",
-      "integrity": "sha512-bXdQWkECBUIAcCkeH1unwJLIpZYaa5VvuygSyS/c2lf719mTKZDU5UdDRlpd01UjADgmW8RfqaP+mRaVPdr/Ng==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
+      "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
       "dependencies": {
-        "call-bind": "^1.0.2"
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -233,9 +248,9 @@
       }
     },
     "node_modules/is-callable": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.3.tgz",
-      "integrity": "sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ==",
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
+      "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
       "engines": {
         "node": ">= 0.4"
       },
@@ -244,9 +259,12 @@
       }
     },
     "node_modules/is-date-object": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.4.tgz",
-      "integrity": "sha512-/b4ZVsG7Z5XVtIxs/h9W8nvfLgSAyKYdtGWQLbqy6jA1icmgjf8WCoTKgeS4wy5tYaPePouzFMANbnj94c2Z+A==",
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
+      "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
+      "dependencies": {
+        "has-tostringtag": "^1.0.0"
+      },
       "engines": {
         "node": ">= 0.4"
       },
@@ -266,9 +284,12 @@
       }
     },
     "node_modules/is-number-object": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.5.tgz",
-      "integrity": "sha512-RU0lI/n95pMoUKu9v1BZP5MBcZuNSVJkMkAG2dJqC4z2GlkGUNeH68SuHuBKBD/XFe+LHZ+f9BKkLET60Niedw==",
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.6.tgz",
+      "integrity": "sha512-bEVOqiRcvo3zO1+G2lVMy+gkkEm9Yh7cDMRusKKu5ZJKPUYSJwICTKZrNKHA2EbSP0Tu0+6B/emsYNHZyn6K8g==",
+      "dependencies": {
+        "has-tostringtag": "^1.0.0"
+      },
       "engines": {
         "node": ">= 0.4"
       },
@@ -277,12 +298,12 @@
       }
     },
     "node_modules/is-regex": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.3.tgz",
-      "integrity": "sha512-qSVXFz28HM7y+IWX6vLCsexdlvzT1PJNFSBuaQLQ5o0IEw8UDYW6/2+eCMVyIsbM8CNLX2a/QWmSpyxYEHY7CQ==",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
+      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
       "dependencies": {
         "call-bind": "^1.0.2",
-        "has-symbols": "^1.0.2"
+        "has-tostringtag": "^1.0.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -292,9 +313,12 @@
       }
     },
     "node_modules/is-string": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.6.tgz",
-      "integrity": "sha512-2gdzbKUuqtQ3lYNrUTQYoClPhm7oQu4UdpSZMp1/DGgkHBT8E2Z1l0yMdb6D4zNAxwDiMv8MdulKROJGNl0Q0w==",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
+      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
+      "dependencies": {
+        "has-tostringtag": "^1.0.0"
+      },
       "engines": {
         "node": ">= 0.4"
       },
@@ -637,6 +661,14 @@
       "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
       "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw=="
     },
+    "has-tostringtag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
+      "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
+      "requires": {
+        "has-symbols": "^1.0.2"
+      }
+    },
     "internal-slot": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz",
@@ -648,27 +680,31 @@
       }
     },
     "is-bigint": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.2.tgz",
-      "integrity": "sha512-0JV5+SOCQkIdzjBK9buARcV804Ddu7A0Qet6sHi3FimE9ne6m4BGQZfRn+NZiXbBk4F4XmHfDZIipLj9pX8dSA=="
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.3.tgz",
+      "integrity": "sha512-ZU538ajmYJmzysE5yU4Y7uIrPQ2j704u+hXFiIPQExpqzzUbpe5jCPdTfmz7jXRxZdvjY3KZ3ZNenoXQovX+Dg=="
     },
     "is-boolean-object": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.1.tgz",
-      "integrity": "sha512-bXdQWkECBUIAcCkeH1unwJLIpZYaa5VvuygSyS/c2lf719mTKZDU5UdDRlpd01UjADgmW8RfqaP+mRaVPdr/Ng==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
+      "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
       "requires": {
-        "call-bind": "^1.0.2"
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
       }
     },
     "is-callable": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.3.tgz",
-      "integrity": "sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ=="
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
+      "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w=="
     },
     "is-date-object": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.4.tgz",
-      "integrity": "sha512-/b4ZVsG7Z5XVtIxs/h9W8nvfLgSAyKYdtGWQLbqy6jA1icmgjf8WCoTKgeS4wy5tYaPePouzFMANbnj94c2Z+A=="
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
+      "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
+      "requires": {
+        "has-tostringtag": "^1.0.0"
+      }
     },
     "is-negative-zero": {
       "version": "2.0.1",
@@ -676,23 +712,29 @@
       "integrity": "sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w=="
     },
     "is-number-object": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.5.tgz",
-      "integrity": "sha512-RU0lI/n95pMoUKu9v1BZP5MBcZuNSVJkMkAG2dJqC4z2GlkGUNeH68SuHuBKBD/XFe+LHZ+f9BKkLET60Niedw=="
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.6.tgz",
+      "integrity": "sha512-bEVOqiRcvo3zO1+G2lVMy+gkkEm9Yh7cDMRusKKu5ZJKPUYSJwICTKZrNKHA2EbSP0Tu0+6B/emsYNHZyn6K8g==",
+      "requires": {
+        "has-tostringtag": "^1.0.0"
+      }
     },
     "is-regex": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.3.tgz",
-      "integrity": "sha512-qSVXFz28HM7y+IWX6vLCsexdlvzT1PJNFSBuaQLQ5o0IEw8UDYW6/2+eCMVyIsbM8CNLX2a/QWmSpyxYEHY7CQ==",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
+      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
       "requires": {
         "call-bind": "^1.0.2",
-        "has-symbols": "^1.0.2"
+        "has-tostringtag": "^1.0.0"
       }
     },
     "is-string": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.6.tgz",
-      "integrity": "sha512-2gdzbKUuqtQ3lYNrUTQYoClPhm7oQu4UdpSZMp1/DGgkHBT8E2Z1l0yMdb6D4zNAxwDiMv8MdulKROJGNl0Q0w=="
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
+      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
+      "requires": {
+        "has-tostringtag": "^1.0.0"
+      }
     },
     "is-symbol": {
       "version": "1.0.4",

From 84b42aa2ff8f56532a7e91e8cd76b7fc6f123c2f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 10 Aug 2021 10:39:14 +0100
Subject: [PATCH 2601/3183] change ignore files

---
 .gitignore | 3 ++-
 .npmignore | 6 ++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7f010394..7f70e680 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 .DS_Store
 .nova
 .npm
-node_modules/
\ No newline at end of file
+node_modules
+.prettierignore
\ No newline at end of file
diff --git a/.npmignore b/.npmignore
index ac00d842..43f5b309 100644
--- a/.npmignore
+++ b/.npmignore
@@ -1,6 +1,4 @@
-.DS_Store
-.nova
 .github
+.nova
 .npm
-.prettierignore
-node_modules/
\ No newline at end of file
+.prettierignore
\ No newline at end of file

From 81d09ab81bd6e2bab5ff34c3d89e4010cd74761e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 10 Aug 2021 11:10:27 +0100
Subject: [PATCH 2602/3183] increase node 16 version

node 16 still not recommended to use, but having version here hides node version warnings for testers
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 3622a07f..988b71cd 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,7 @@
   "main": "lib/index.js",
   "engines": {
     "homebridge": "^1.3.4",
-    "node": "^14.17.4 || ^16.6.0"
+    "node": "^14.17.4 || ^16.6.1"
   },
   "repository": {
     "type": "git",

From a31bd982da9e6172682b7e4ad75f7fdebda32eed Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 10 Aug 2021 17:49:22 +0100
Subject: [PATCH 2603/3183] Update package-lock.json

---
 package-lock.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package-lock.json b/package-lock.json
index 7f4ab213..c8ce6a27 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -35,7 +35,7 @@
       },
       "engines": {
         "homebridge": "^1.3.4",
-        "node": "^14.17.4 || ^16.6.0"
+        "node": "^14.17.4 || ^16.6.1"
       }
     },
     "node_modules/@homebridge/plugin-ui-utils": {

From e1baa27bcf0184c339775656fcf67dfec1d38dd6 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 11 Aug 2021 19:59:00 +0100
Subject: [PATCH 2604/3183] bump node versions

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c8ce6a27..f6d4f84c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -35,7 +35,7 @@
       },
       "engines": {
         "homebridge": "^1.3.4",
-        "node": "^14.17.4 || ^16.6.1"
+        "node": "^14.17.5 || ^16.6.2"
       }
     },
     "node_modules/@homebridge/plugin-ui-utils": {
diff --git a/package.json b/package.json
index 988b71cd..e689b81d 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,7 @@
   "main": "lib/index.js",
   "engines": {
     "homebridge": "^1.3.4",
-    "node": "^14.17.4 || ^16.6.1"
+    "node": "^14.17.5 || ^16.6.2"
   },
   "repository": {
     "type": "git",

From deb58c73eda83b0f622814bf05a3b9feda3f10d1 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 11 Aug 2021 20:08:04 +0100
Subject: [PATCH 2605/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 201be846..008f1b1d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,13 @@
 
 All notable changes to homebridge-ewelink will be documented in this file.
 
+## BETA
+
+### Changed
+
+- **Platform Versions**
+  - Recommended node version bumped to v14.17.5
+
 ## 8.0.1 (2021-08-04)
 
 ### Changed

From 4814619b52244c0e4a6871cb2b9f0377a5a555e9 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 11 Aug 2021 22:30:21 +0100
Subject: [PATCH 2606/3183] 8.0.2-beta.0

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index f6d4f84c..8ad66a0f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,11 +1,11 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.0.1",
+  "version": "8.0.2-beta.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
-      "version": "8.0.1",
+      "version": "8.0.2-beta.0",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index e689b81d..0c1c8cd6 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.0.1",
+  "version": "8.0.2-beta.0",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From c111a6dcd5bd8870ac7ab78fd2fd08e3160d7afb Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 12 Aug 2021 14:05:17 +0100
Subject: [PATCH 2607/3183] remove duplicate eveService

not sure how it got there!
---
 lib/index.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/index.js b/lib/index.js
index 68a3e359..8033b52b 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -436,7 +436,6 @@ class eWeLinkPlatform {
 
       // Require any libraries that the accessory instances use
       this.colourUtils = require('./utils/colour-utils')
-      this.eveService = require('./fakegato/fakegato-history')(this.api)
       this.eveChar = new (require('./utils/eve-chars'))(this.api)
       this.eveService = require('./fakegato/fakegato-history')(this.api)
 

From 5faf8c220cd2d5bc2e63d22268230badd4851d2a Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 12 Aug 2021 16:14:44 +0100
Subject: [PATCH 2608/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 008f1b1d..15de8a68 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 All notable changes to homebridge-ewelink will be documented in this file.
 
-## BETA
+## 8.0.2 (2021-08-12)
 
 ### Changed
 

From 1e3811946ff78f0a9cefeb47a6251088b7fb534e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 12 Aug 2021 16:15:08 +0100
Subject: [PATCH 2609/3183] 8.0.2

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 8ad66a0f..6bf5550a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,11 +1,11 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.0.2-beta.0",
+  "version": "8.0.2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
-      "version": "8.0.2-beta.0",
+      "version": "8.0.2",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 0c1c8cd6..742e3785 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.0.2-beta.0",
+  "version": "8.0.2",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From c5781cd6dc87c711c110bbb1e94869d92af94f19 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 13 Aug 2021 09:45:25 +0100
Subject: [PATCH 2610/3183] Update package-lock.json

---
 package-lock.json | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 6bf5550a..16d124cc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -225,9 +225,12 @@
       }
     },
     "node_modules/is-bigint": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.3.tgz",
-      "integrity": "sha512-ZU538ajmYJmzysE5yU4Y7uIrPQ2j704u+hXFiIPQExpqzzUbpe5jCPdTfmz7jXRxZdvjY3KZ3ZNenoXQovX+Dg==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
+      "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
+      "dependencies": {
+        "has-bigints": "^1.0.1"
+      },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -680,9 +683,12 @@
       }
     },
     "is-bigint": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.3.tgz",
-      "integrity": "sha512-ZU538ajmYJmzysE5yU4Y7uIrPQ2j704u+hXFiIPQExpqzzUbpe5jCPdTfmz7jXRxZdvjY3KZ3ZNenoXQovX+Dg=="
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
+      "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
+      "requires": {
+        "has-bigints": "^1.0.1"
+      }
     },
     "is-boolean-object": {
       "version": "1.1.2",

From 970bd440867b50a63c2108f294d94e9f30f566d3 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 13 Aug 2021 09:45:39 +0100
Subject: [PATCH 2611/3183] fix properties in wrong place

---
 lib/device/outlet-single-inched.js | 6 +++---
 lib/device/outlet-single.js        | 5 ++---
 lib/device/switch-single-inched.js | 1 +
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/device/outlet-single-inched.js b/lib/device/outlet-single-inched.js
index 7279d297..c86e5454 100644
--- a/lib/device/outlet-single-inched.js
+++ b/lib/device/outlet-single-inched.js
@@ -167,8 +167,7 @@ module.exports = class deviceOutletSingleInched {
 
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new platform.eveService('energy', this.accessory, {
-      log: platform.config.debugFakegato ? this.log : () => {},
-      showAs: 'outlet'
+      log: platform.config.debugFakegato ? this.log : () => {}
     })
 
     // Set up extra features for outlets that provide power readings
@@ -237,8 +236,9 @@ module.exports = class deviceOutletSingleInched {
     // Output the customised options to the log
     const opts = JSON.stringify({
       inUsePowerThreshold: this.inUsePowerThreshold,
+      isInched: true,
       logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
-      showAsType: 'outlet'
+      showAs: 'outlet'
     })
     this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
diff --git a/lib/device/outlet-single.js b/lib/device/outlet-single.js
index 6ecf7710..5acabfe4 100644
--- a/lib/device/outlet-single.js
+++ b/lib/device/outlet-single.js
@@ -167,8 +167,7 @@ module.exports = class deviceOutletSingle {
 
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new platform.eveService('energy', this.accessory, {
-      log: platform.config.debugFakegato ? this.log : () => {},
-      showAs: 'outlet'
+      log: platform.config.debugFakegato ? this.log : () => {}
     })
 
     // Set up extra features for outlets that provide power readings
@@ -238,7 +237,7 @@ module.exports = class deviceOutletSingle {
     const opts = JSON.stringify({
       inUsePowerThreshold: this.inUsePowerThreshold,
       logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
-      showAsType: 'outlet'
+      showAs: 'outlet'
     })
     this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
diff --git a/lib/device/switch-single-inched.js b/lib/device/switch-single-inched.js
index 623fea81..3675bc5b 100644
--- a/lib/device/switch-single-inched.js
+++ b/lib/device/switch-single-inched.js
@@ -154,6 +154,7 @@ module.exports = class deviceSwitchSingleInched {
 
     // Output the customised options to the log
     const opts = JSON.stringify({
+      isInched: true,
       logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
       showAs: 'default'
     })

From 87ebed006275e6d26b2bfecec792988ecd4f6ce9 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 13 Aug 2021 11:47:00 +0100
Subject: [PATCH 2612/3183] no need for extra char

---
 lib/device/simulation/garage-one.js | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/lib/device/simulation/garage-one.js b/lib/device/simulation/garage-one.js
index cf51cf63..68e3df1b 100644
--- a/lib/device/simulation/garage-one.js
+++ b/lib/device/simulation/garage-one.js
@@ -233,8 +233,10 @@ module.exports = class deviceGarageOne {
           this.eveChar.LastActivation,
           Math.round(new Date().valueOf() / 1000) - initialTime
         )
-        const newTO = this.service.getCharacteristic(this.eveChar.TimesOpened).value + 1
-        this.service.updateCharacteristic(this.eveChar.TimesOpened, newTO)
+        this.service.updateCharacteristic(
+          this.eveChar.TimesOpened,
+          this.service.getCharacteristic(this.eveChar.TimesOpened).value + 1
+        )
       }
       const operationTime = newPos === 0 ? this.operationTimeUp : this.operationTimeDown
       await this.funcs.sleep(Math.max((operationTime - 20) * 100, 0))
@@ -357,8 +359,10 @@ module.exports = class deviceGarageOne {
             this.eveChar.LastActivation,
             Math.round(new Date().valueOf() / 1000) - initialTime
           )
-          const newTO = this.service.getCharacteristic(this.eveChar.TimesOpened).value + 1
-          this.service.updateCharacteristic(this.eveChar.TimesOpened, newTO)
+          this.service.updateCharacteristic(
+            this.eveChar.TimesOpened,
+            this.service.getCharacteristic(this.eveChar.TimesOpened).value + 1
+          )
         }
         const operationTime = newPos === 2 ? this.operationTimeUp : this.operationTimeDown
         await this.funcs.sleep(Math.max((operationTime - 20) * 100, 0))

From 63fe72c59a1709b2b56ceb6498269966a39e5b47 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 13 Aug 2021 18:11:26 +0100
Subject: [PATCH 2613/3183] Update package-lock.json

---
 package-lock.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package-lock.json b/package-lock.json
index 16d124cc..d0d357b5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5,6 +5,7 @@
   "requires": true,
   "packages": {
     "": {
+      "name": "homebridge-ewelink",
       "version": "8.0.2",
       "funding": [
         {

From 60895425a4378c596659682aa86c0a43e25cbacb Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 14 Aug 2021 14:34:39 +0100
Subject: [PATCH 2614/3183] outletInUse for switches and multi switch inch mode

---
 config.schema.json                 |  15 +-
 lib/device/switch-multi-inched.js  | 282 +++++++++++++++++++++++++++++
 lib/device/switch-multi.js         |  16 +-
 lib/device/switch-single-inched.js |  18 +-
 lib/device/switch-single.js        |  18 +-
 lib/index.js                       |  13 +-
 lib/utils/constants.js             |   1 +
 7 files changed, 349 insertions(+), 14 deletions(-)
 create mode 100644 lib/device/switch-multi-inched.js

diff --git a/config.schema.json b/config.schema.json
index 4ae3d9db..1da7698b 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -245,7 +245,7 @@
               "placeholder": 0,
               "minimum": 0,
               "condition": {
-                "functionBody": "return (model.singleDevices && model.singleDevices[arrayIndices] && ['pow', 'iw'].includes(model.singleDevices[arrayIndices].deviceModel) && ['outlet'].includes(model.singleDevices[arrayIndices].showAs) && !model.singleDevices[arrayIndices].ignoreDevice);"
+                "functionBody": "return (model.singleDevices && model.singleDevices[arrayIndices] && ['pow', 'iw'].includes(model.singleDevices[arrayIndices].deviceModel) && ['default', outlet'].includes(model.singleDevices[arrayIndices].showAs) && !model.singleDevices[arrayIndices].ignoreDevice);"
               }
             },
             "isInched": {
@@ -253,7 +253,7 @@
               "title": "Status By Inching",
               "description": "If true, the plugin will show the on/off status based on inching mode.",
               "condition": {
-                "functionBody": "return (model.singleDevices && model.singleDevices[arrayIndices] && [undefined, 'default', 'outlet'].includes(model.singleDevices[arrayIndices].showAs) && !model.singleDevices[arrayIndices].ignoreDevice);"
+                "functionBody": "return (model.singleDevices && model.singleDevices[arrayIndices] && ['default', 'outlet'].includes(model.singleDevices[arrayIndices].showAs) && !model.singleDevices[arrayIndices].ignoreDevice);"
               }
             },
             "sensorType": {
@@ -565,7 +565,15 @@
               "placeholder": 0,
               "minimum": 0,
               "condition": {
-                "functionBody": "return (model.multiDevices && model.multiDevices[arrayIndices] && model.multiDevices[arrayIndices].deviceId && ['outlet'].includes(model.multiDevices[arrayIndices].showAs) && ['dualr3_switch'].includes(model.multiDevices[arrayIndices].deviceModel) && !model.multiDevices[arrayIndices].ignoreDevice);"
+                "functionBody": "return (model.multiDevices && model.multiDevices[arrayIndices] && model.multiDevices[arrayIndices].deviceId && ['default', outlet'].includes(model.multiDevices[arrayIndices].showAs) && ['dualr3_switch'].includes(model.multiDevices[arrayIndices].deviceModel) && !model.multiDevices[arrayIndices].ignoreDevice);"
+              }
+            },
+            "isInched": {
+              "type": "boolean",
+              "title": "Status By Inching",
+              "description": "If true, the plugin will show the on/off status based on inching mode.",
+              "condition": {
+                "functionBody": "return (model.multiDevices && model.multiDevices[arrayIndices] && ['dual_dualr2', 'dualr3_switch', '4ch', 't', 'zb'].includes(model.multiDevices[arrayIndices].deviceModel) && ['default', 'outlet'].includes(model.multiDevices[arrayIndices].showAs) && !model.multiDevices[arrayIndices].ignoreDevice);"
               }
             },
             "sensorType": {
@@ -1528,6 +1536,7 @@
             "multiDevices[].showAsMotor",
             "multiDevices[].hideChannels",
             "multiDevices[].inUsePowerThreshold",
+            "multiDevices[].isInched",
             "multiDevices[].sensorType",
             "multiDevices[].operationTime",
             "multiDevices[].operationTimeDown",
diff --git a/lib/device/switch-multi-inched.js b/lib/device/switch-multi-inched.js
new file mode 100644
index 00000000..3fc27a50
--- /dev/null
+++ b/lib/device/switch-multi-inched.js
@@ -0,0 +1,282 @@
+/* jshint node: true,esversion: 9, -W014, -W033 */
+/* eslint-disable new-cap */
+'use strict'
+
+module.exports = class deviceSwitchMultiInched {
+  constructor (platform, accessory, devicesInHB) {
+    // Set up variables from the platform
+    this.devicesInHB = devicesInHB
+    this.eveChar = platform.eveChar
+    this.funcs = platform.funcs
+    this.hapChar = platform.api.hap.Characteristic
+    this.hapErr = platform.api.hap.HapStatusError
+    this.hapServ = platform.api.hap.Service
+    this.hapUUIDGen = platform.api.hap.uuid.generate
+    this.lang = platform.lang
+    this.log = platform.log
+    this.platform = platform
+
+    // Set up variables from the accessory
+    this.name = accessory.displayName
+    this.accessory = accessory
+
+    // Initially set the online flag as true (to be then updated as false if necessary)
+    this.isOnline = true
+
+    /*
+    UIID 2/3/4/7/8/9/29/30/31/41/82/83/84/113/114/2256/3256/4256: multi switch, no power readings
+    UIID 126: multi switch, with wattage, voltage and amp readings (DUALR3)
+    */
+
+    // Set up custom variables for this device type
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
+    this.hideChannels = deviceConf && deviceConf.hideChannels ? deviceConf.hideChannels : undefined
+    this.inUsePowerThreshold =
+      deviceConf && deviceConf.inUsePowerThreshold
+        ? deviceConf.inUsePowerThreshold
+        : platform.consts.defaultValues.inUsePowerThreshold
+
+    // Set the correct logging variables for this accessory
+    this.enableLogging = !platform.config.disableDeviceLogging
+    this.enableDebugLogging = platform.config.debug
+    if (deviceConf && deviceConf.overrideLogging) {
+      switch (deviceConf.overrideLogging) {
+        case 'standard':
+          this.enableLogging = true
+          this.enableDebugLogging = false
+          break
+        case 'debug':
+          this.enableLogging = true
+          this.enableDebugLogging = true
+          break
+        case 'disable':
+          this.enableLogging = false
+          this.enableDebugLogging = false
+          break
+      }
+    }
+
+    // If the accessory has an outlet service then remove it
+    if (this.accessory.getService(this.hapServ.Outlet)) {
+      this.accessory.removeService(this.accessory.getService(this.hapServ.Outlet))
+    }
+
+    // Add the switch service if it doesn't already exist
+    this.service =
+      this.accessory.getService(this.hapServ.Switch) ||
+      this.accessory.addService(this.hapServ.Switch)
+
+    switch (this.accessory.context.eweUIID) {
+      case 126:
+        // Add Eve power characteristics
+        this.powerReadings = true
+        this.isDual = true
+        if (accessory.context.switchNumber !== '0') {
+          if (!this.service.testCharacteristic(this.hapChar.OutletInUse)) {
+            this.service.addCharacteristic(this.hapChar.OutletInUse)
+          }
+          if (!this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
+            this.service.addCharacteristic(this.eveChar.CurrentConsumption)
+          }
+          if (!this.service.testCharacteristic(this.eveChar.ElectricCurrent)) {
+            this.service.addCharacteristic(this.eveChar.ElectricCurrent)
+          }
+          if (!this.service.testCharacteristic(this.eveChar.Voltage)) {
+            this.service.addCharacteristic(this.eveChar.Voltage)
+          }
+        }
+        break
+      default:
+        // Remove unused Eve characteristics
+        if (this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
+          this.service.removeCharacteristic(
+            this.service.getCharacteristic(this.eveChar.CurrentConsumption)
+          )
+        }
+        if (this.service.testCharacteristic(this.eveChar.ElectricCurrent)) {
+          this.service.removeCharacteristic(
+            this.service.getCharacteristic(this.eveChar.ElectricCurrent)
+          )
+        }
+        if (this.service.testCharacteristic(this.eveChar.Voltage)) {
+          this.service.removeCharacteristic(this.service.getCharacteristic(this.eveChar.Voltage))
+        }
+        break
+    }
+
+    // Add the set handler to the switch on/off characteristic
+    this.service
+      .getCharacteristic(this.hapChar.On)
+      .onSet(async value => await this.internalStateUpdate(value))
+      .updateValue(false)
+    this.cacheState = 'off'
+
+    // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
+    if (!platform.config.disableNoResponse) {
+      this.service.getCharacteristic(this.hapChar.On).onGet(() => {
+        if (!this.isOnline) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.On).value
+      })
+    }
+
+    // Pass the accessory to Fakegato to set up with Eve
+    this.accessory.eveService = new platform.eveService('switch', this.accessory, {
+      log: platform.config.debugFakegato ? this.log : () => {}
+    })
+
+    // Set up extra features for outlets that provide power readings
+    if (
+      this.powerReadings &&
+      accessory.context.switchNumber === '0' &&
+      platform.config.mode !== 'lan'
+    ) {
+      // Set up an interval to get eWeLink to send power updates
+      setTimeout(() => {
+        this.internalUIUpdate()
+        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
+      }, 5000)
+
+      // Stop the intervals on Homebridge shutdown
+      platform.api.on('shutdown', () => {
+        clearInterval(this.intervalPoll)
+      })
+    }
+
+    // Output the customised options to the log
+    if (accessory.context.switchNumber === '0') {
+      const opts = JSON.stringify({
+        inUsePowerThreshold: this.inUsePowerThreshold,
+        isInched: true,
+        hideChannels: this.hideChannels,
+        logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
+        showAs: 'default'
+      })
+      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
+    }
+  }
+
+  async internalStateUpdate (value) {
+    try {
+      const newValue = !this.service.getCharacteristic(this.hapChar.On).value
+      const params = {
+        switches: [
+          {
+            switch: 'on',
+            outlet: this.accessory.context.switchNumber - 1
+          }
+        ]
+      }
+      this.ignoreUpdates = true
+      setTimeout(() => {
+        this.ignoreUpdates = false
+      }, 1500)
+      await this.platform.sendDeviceUpdate(this.accessory, params)
+      this.accessory.eveService.addEntry({ status: newValue ? 1 : 0 })
+      if (this.enableLogging) {
+        this.log('[%s] %s [%s].', this.name, this.lang.curState, newValue ? 'on' : 'off')
+      }
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, true)
+      setTimeout(() => {
+        this.service.updateCharacteristic(this.hapChar.On, !value)
+      }, 2000)
+      throw new this.hapErr(-70402)
+    }
+  }
+
+  async internalUIUpdate () {
+    try {
+      // Skip polling if device isn't online
+      if (!this.isOnline) {
+        return
+      }
+
+      // Send the params to request the updates
+      await this.platform.sendDeviceUpdate(this.accessory, { uiActive: { outlet: 0, time: 120 } })
+      await this.funcs.sleep(2000)
+      await this.platform.sendDeviceUpdate(this.accessory, { uiActive: { outlet: 1, time: 120 } })
+    } catch (err) {
+      // Suppress errors here
+    }
+  }
+
+  async externalUpdate (params) {
+    try {
+      const idToCheck = this.accessory.context.eweDeviceId + 'SW'
+      for (let i = 1; i <= this.accessory.context.channelCount; i++) {
+        const uuid = this.hapUUIDGen(idToCheck + i)
+        if (this.devicesInHB.has(uuid)) {
+          const subAccessory = this.devicesInHB.get(uuid)
+          const service = subAccessory.getService(this.hapServ.Switch)
+          if (params.switches && params.switches[i - 1].switch === 'on') {
+            if (!this.ignoreUpdates) {
+              this.ignoreUpdates = true
+              setTimeout(() => {
+                this.ignoreUpdates = false
+              }, 1500)
+              const newState = !this.service.getCharacteristic(this.hapChar.On).value
+              this.service.updateCharacteristic(this.hapChar.On, newState)
+              this.accessory.eveService.addEntry({ status: newState ? 1 : 0 })
+              if (params.updateSource && this.enableLogging) {
+                this.log('[%s] %s [%s].', this.name, this.lang.curState, newState ? 'on' : 'off')
+              }
+            }
+          }
+          if (!this.powerReadings) {
+            continue
+          }
+          let logger = false
+          let power
+          let voltage
+          let current
+          if (this.funcs.hasProperty(params, 'actPow_0' + (i - 1))) {
+            power = parseInt(params['actPow_0' + (i - 1)]) / 100
+            const currentState = service.getCharacteristic(this.hapChar.On).value ? 'on' : 'off'
+            service.updateCharacteristic(this.eveChar.CurrentConsumption, power)
+            service.updateCharacteristic(
+              this.hapChar.OutletInUse,
+              currentState === 'on' && power > this.inUsePowerThreshold
+            )
+            logger = true
+          }
+          if (this.funcs.hasProperty(params, 'voltage_0' + (i - 1))) {
+            voltage = parseInt(params['voltage_0' + (i - 1)]) / 100
+            service.updateCharacteristic(this.eveChar.Voltage, voltage)
+            logger = true
+          }
+          if (this.funcs.hasProperty(params, 'current_0' + (i - 1))) {
+            current = parseInt(params['current_0' + (i - 1)]) / 100
+            service.updateCharacteristic(this.eveChar.ElectricCurrent, current)
+            logger = true
+          }
+          if (params.updateSource && logger && this.enableLogging) {
+            this.log(
+              '[%s] %s%s%s.',
+              subAccessory.displayName,
+              power !== undefined ? this.lang.curPower + ' [' + power + 'W]' : '',
+              voltage !== undefined ? ' ' + this.lang.curVolt + ' [' + voltage + 'V]' : '',
+              current !== undefined ? ' ' + this.lang.curCurr + ' [' + current + 'A]' : ''
+            )
+          }
+        }
+      }
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, false)
+    }
+  }
+
+  markStatus (isOnline) {
+    this.isOnline = isOnline
+  }
+
+  currentState () {
+    const toReturn = {}
+    toReturn.services = ['switch']
+    toReturn.switch = {
+      state: this.service.getCharacteristic(this.hapChar.On).value ? 'on' : 'off'
+    }
+    return toReturn
+  }
+}
diff --git a/lib/device/switch-multi.js b/lib/device/switch-multi.js
index d38bf4ee..63c2cd05 100644
--- a/lib/device/switch-multi.js
+++ b/lib/device/switch-multi.js
@@ -31,6 +31,10 @@ module.exports = class deviceSwitchMulti {
     // Set up custom variables for this device type
     const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
     this.hideChannels = deviceConf && deviceConf.hideChannels ? deviceConf.hideChannels : undefined
+    this.inUsePowerThreshold =
+      deviceConf && deviceConf.inUsePowerThreshold
+        ? deviceConf.inUsePowerThreshold
+        : platform.consts.defaultValues.inUsePowerThreshold
 
     // Set the correct logging variables for this accessory
     this.enableLogging = !platform.config.disableDeviceLogging
@@ -68,6 +72,9 @@ module.exports = class deviceSwitchMulti {
         this.powerReadings = true
         this.isDual = true
         if (accessory.context.switchNumber !== '0') {
+          if (!this.service.testCharacteristic(this.hapChar.OutletInUse)) {
+            this.service.addCharacteristic(this.hapChar.OutletInUse)
+          }
           if (!this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
             this.service.addCharacteristic(this.eveChar.CurrentConsumption)
           }
@@ -139,6 +146,7 @@ module.exports = class deviceSwitchMulti {
     if (accessory.context.switchNumber === '0') {
       const opts = JSON.stringify({
         hideChannels: this.hideChannels,
+        inUsePowerThreshold: this.inUsePowerThreshold,
         logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
         showAs: 'default'
       })
@@ -282,9 +290,6 @@ module.exports = class deviceSwitchMulti {
               subAccessory.eveService.addEntry({
                 status: params.switches[i - 1].switch === 'on' ? 1 : 0
               })
-              if (this.powerReadings && params.switches[i - 1].switch === 'off') {
-                service.updateCharacteristic(this.eveChar.CurrentConsumption, 0)
-              }
               if (params.updateSource && this.enableLogging) {
                 this.log(
                   '[%s] %s [%s].',
@@ -304,7 +309,12 @@ module.exports = class deviceSwitchMulti {
           let current
           if (this.funcs.hasProperty(params, 'actPow_0' + (i - 1))) {
             power = parseInt(params['actPow_0' + (i - 1)]) / 100
+            const currentState = service.getCharacteristic(this.hapChar.On).value ? 'on' : 'off'
             service.updateCharacteristic(this.eveChar.CurrentConsumption, power)
+            service.updateCharacteristic(
+              this.hapChar.OutletInUse,
+              currentState === 'on' && power > this.inUsePowerThreshold
+            )
             logger = true
           }
           if (this.funcs.hasProperty(params, 'voltage_0' + (i - 1))) {
diff --git a/lib/device/switch-single-inched.js b/lib/device/switch-single-inched.js
index 3675bc5b..19222bf4 100644
--- a/lib/device/switch-single-inched.js
+++ b/lib/device/switch-single-inched.js
@@ -30,6 +30,10 @@ module.exports = class deviceSwitchSingleInched {
 
     // Set up custom variables for this device type
     const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
+    this.inUsePowerThreshold =
+      deviceConf && deviceConf.inUsePowerThreshold
+        ? deviceConf.inUsePowerThreshold
+        : platform.consts.defaultValues.inUsePowerThreshold
 
     // Set the correct logging variables for this accessory
     this.enableLogging = !platform.config.disableDeviceLogging
@@ -65,6 +69,9 @@ module.exports = class deviceSwitchSingleInched {
       case 5:
         // Add Eve power characteristics
         this.powerReadings = true
+        if (!this.service.testCharacteristic(this.hapChar.OutletInUse)) {
+          this.service.addCharacteristic(this.hapChar.OutletInUse)
+        }
         if (!this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
           this.service.addCharacteristic(this.eveChar.CurrentConsumption)
         }
@@ -82,6 +89,9 @@ module.exports = class deviceSwitchSingleInched {
       case 32:
         // Add Eve power characteristics
         this.powerReadings = true
+        if (!this.service.testCharacteristic(this.hapChar.OutletInUse)) {
+          this.service.addCharacteristic(this.hapChar.OutletInUse)
+        }
         if (!this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
           this.service.addCharacteristic(this.eveChar.CurrentConsumption)
         }
@@ -154,6 +164,7 @@ module.exports = class deviceSwitchSingleInched {
 
     // Output the customised options to the log
     const opts = JSON.stringify({
+      inUsePowerThreshold: this.inUsePowerThreshold,
       isInched: true,
       logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
       showAs: 'default'
@@ -176,9 +187,6 @@ module.exports = class deviceSwitchSingleInched {
       }, 1500)
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.cacheState = newValue
-      if (this.cacheState === 'off' && this.powerReadings) {
-        this.service.updateCharacteristic(this.eveChar.CurrentConsumption, 0)
-      }
       this.accessory.eveService.addEntry({ status: this.cacheState === 'on' ? 1 : 0 })
       if (this.enableLogging) {
         this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
@@ -242,6 +250,10 @@ module.exports = class deviceSwitchSingleInched {
       let logger = false
       if (this.funcs.hasProperty(params, 'power')) {
         this.service.updateCharacteristic(this.eveChar.CurrentConsumption, parseFloat(params.power))
+        this.service.updateCharacteristic(
+          this.hapChar.OutletInUse,
+          this.cacheState === 'on' && parseFloat(params.power) > this.inUsePowerThreshold
+        )
         logger = true
       }
       if (this.funcs.hasProperty(params, 'voltage')) {
diff --git a/lib/device/switch-single.js b/lib/device/switch-single.js
index 54489513..0523684e 100644
--- a/lib/device/switch-single.js
+++ b/lib/device/switch-single.js
@@ -30,6 +30,10 @@ module.exports = class deviceSwitchSingle {
 
     // Set up custom variables for this device type
     const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
+    this.inUsePowerThreshold =
+      deviceConf && deviceConf.inUsePowerThreshold
+        ? deviceConf.inUsePowerThreshold
+        : platform.consts.defaultValues.inUsePowerThreshold
 
     // Set the correct logging variables for this accessory
     this.enableLogging = !platform.config.disableDeviceLogging
@@ -65,6 +69,9 @@ module.exports = class deviceSwitchSingle {
       case 5:
         // Add Eve power characteristics
         this.powerReadings = true
+        if (!this.service.testCharacteristic(this.hapChar.OutletInUse)) {
+          this.service.addCharacteristic(this.hapChar.OutletInUse)
+        }
         if (!this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
           this.service.addCharacteristic(this.eveChar.CurrentConsumption)
         }
@@ -82,6 +89,9 @@ module.exports = class deviceSwitchSingle {
       case 32:
         // Add Eve power characteristics
         this.powerReadings = true
+        if (!this.service.testCharacteristic(this.hapChar.OutletInUse)) {
+          this.service.addCharacteristic(this.hapChar.OutletInUse)
+        }
         if (!this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
           this.service.addCharacteristic(this.eveChar.CurrentConsumption)
         }
@@ -152,6 +162,7 @@ module.exports = class deviceSwitchSingle {
 
     // Output the customised options to the log
     const opts = JSON.stringify({
+      inUsePowerThreshold: this.inUsePowerThreshold,
       logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
       showAs: 'default'
     })
@@ -172,9 +183,6 @@ module.exports = class deviceSwitchSingle {
       }
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.cacheState = newValue
-      if (!value && this.powerReadings) {
-        this.service.updateCharacteristic(this.eveChar.CurrentConsumption, 0)
-      }
       this.accessory.eveService.addEntry({ status: value ? 1 : 0 })
       if (this.enableLogging) {
         this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
@@ -226,6 +234,10 @@ module.exports = class deviceSwitchSingle {
       let logger = false
       if (this.funcs.hasProperty(params, 'power')) {
         this.service.updateCharacteristic(this.eveChar.CurrentConsumption, parseFloat(params.power))
+        this.service.updateCharacteristic(
+          this.hapChar.OutletInUse,
+          this.cacheState === 'on' && parseFloat(params.power) > this.inUsePowerThreshold
+        )
         logger = true
       }
       if (this.funcs.hasProperty(params, 'voltage')) {
diff --git a/lib/index.js b/lib/index.js
index 8033b52b..a3032d6a 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1010,7 +1010,12 @@ class eWeLinkPlatform {
           const uuidsub = this.api.hap.uuid.generate(device.deviceid + 'SW' + i)
 
           // Check if the user has chosen to hide any channels for this device
-          if (this.hideChannels.includes(device.deviceid + 'SW' + i)) {
+          if (
+            this.hideChannels.includes(device.deviceid + 'SW' + i) ||
+            (this.deviceConf[device.deviceid] &&
+              this.deviceConf[device.deviceid].isInched &&
+              i === 0)
+          ) {
             // The user has hidden this channel so if it exists then remove it
             if (devicesInHB.has(uuidsub)) {
               this.removeAccessory(devicesInHB.get(uuidsub))
@@ -1049,7 +1054,11 @@ class eWeLinkPlatform {
           subAccessory.context.lanKey = device.devicekey
           subAccessory.control =
             device.showAs === 'outlet'
-              ? new (require('./device/outlet-multi'))(this, subAccessory, devicesInHB)
+              ? this.deviceConf[device.deviceid] && this.deviceConf[device.deviceid].isInched
+                ? new (require('./device/outlet-multi-inched'))(this, subAccessory, devicesInHB)
+                : new (require('./device/outlet-multi'))(this, subAccessory, devicesInHB)
+              : this.deviceConf[device.deviceid] && this.deviceConf[device.deviceid].isInched
+              ? new (require('./device/switch-multi-inched'))(this, subAccessory, devicesInHB)
               : new (require('./device/switch-multi'))(this, subAccessory, devicesInHB)
 
           // Mark the online/offline status of certain devices
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 55b2aee8..43409023 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -102,6 +102,7 @@ module.exports = {
       'showAsMotor',
       'hideChannels',
       'inUsePowerThreshold',
+      'isInched',
       'sensorType',
       'operationTime',
       'operationTimeDown',

From cc9ac6a9674ca4e762f3bee3695dd96c02e62d30 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 14 Aug 2021 14:38:17 +0100
Subject: [PATCH 2615/3183] leave readings to do job

---
 lib/device/outlet-multi.js         | 19 +------------------
 lib/device/outlet-single-inched.js | 16 +---------------
 lib/device/outlet-single.js        | 16 +---------------
 3 files changed, 3 insertions(+), 48 deletions(-)

diff --git a/lib/device/outlet-multi.js b/lib/device/outlet-multi.js
index 0a85063e..54797621 100644
--- a/lib/device/outlet-multi.js
+++ b/lib/device/outlet-multi.js
@@ -197,11 +197,6 @@ module.exports = class deviceOutletMulti {
               service.updateCharacteristic(this.hapChar.On, value)
               subAccessory.eveService.addEntry({ status: value ? 1 : 0 })
               if (i > 0) {
-                if (this.powerReadings && !value) {
-                  service.updateCharacteristic(this.hapChar.OutletInUse, false)
-                  service.updateCharacteristic(this.eveChar.CurrentConsumption, 0)
-                  subAccessory.eveService.addEntry({ power: 0 })
-                }
                 if (this.enableLogging) {
                   this.log(
                     '[%s] %s [%s].',
@@ -230,11 +225,6 @@ module.exports = class deviceOutletMulti {
                 }
                 subAccessory.eveService.addEntry({ status: value ? 1 : 0 })
                 if (i > 0) {
-                  if (this.powerReadings && !value) {
-                    service.updateCharacteristic(this.hapChar.OutletInUse, false)
-                    service.updateCharacteristic(this.eveChar.CurrentConsumption, 0)
-                    subAccessory.eveService.addEntry({ power: 0 })
-                  }
                   if (this.enableLogging) {
                     this.log(
                       '[%s] %s [%s].',
@@ -306,11 +296,6 @@ module.exports = class deviceOutletMulti {
               subAccessory.eveService.addEntry({
                 status: params.switches[i - 1].switch === 'on' ? 1 : 0
               })
-              if (this.powerReadings && params.switches[i - 1].switch === 'off') {
-                service.updateCharacteristic(this.hapChar.OutletInUse, false)
-                service.updateCharacteristic(this.eveChar.CurrentConsumption, 0)
-                subAccessory.eveService.addEntry({ power: 0 })
-              }
               if (params.updateSource && this.enableLogging) {
                 this.log(
                   '[%s] %s [%s].',
@@ -335,9 +320,7 @@ module.exports = class deviceOutletMulti {
               service.getCharacteristic(this.hapChar.On).value && power > this.inUsePowerThreshold
             )
             service.updateCharacteristic(this.eveChar.CurrentConsumption, power)
-            subAccessory.eveService.addEntry({
-              power: service.getCharacteristic(this.hapChar.On).value ? power : 0
-            })
+            subAccessory.eveService.addEntry({ power })
             logger = true
           }
           if (this.funcs.hasProperty(params, 'voltage_0' + (i - 1))) {
diff --git a/lib/device/outlet-single-inched.js b/lib/device/outlet-single-inched.js
index c86e5454..3f4cec72 100644
--- a/lib/device/outlet-single-inched.js
+++ b/lib/device/outlet-single-inched.js
@@ -258,12 +258,6 @@ module.exports = class deviceOutletSingleInched {
       }, 1500)
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.cacheState = newValue
-      if (this.powerReadings && this.cacheState === 'off') {
-        this.service.updateCharacteristic(this.hapChar.OutletInUse, false)
-        this.service.updateCharacteristic(this.eveChar.CurrentConsumption, 0)
-        this.accessory.eveService.addEntry({ power: 0 })
-        this.accessory.context.energyReadings.push(0)
-      }
       this.accessory.eveService.addEntry({ status: this.cacheState === 'on' ? 1 : 0 })
       if (this.enableLogging) {
         this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
@@ -302,12 +296,6 @@ module.exports = class deviceOutletSingleInched {
           this.cacheState = this.cacheState === 'on' ? 'off' : 'on'
           this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
           this.accessory.eveService.addEntry({ status: this.cacheState === 'on' ? 1 : 0 })
-          if (this.powerReadings && this.cacheState === 'off') {
-            this.service.updateCharacteristic(this.hapChar.OutletInUse, false)
-            this.service.updateCharacteristic(this.eveChar.CurrentConsumption, 0)
-            this.accessory.eveService.addEntry({ power: 0 })
-            this.accessory.context.energyReadings.push(0)
-          }
           if (params.updateSource && this.enableLogging) {
             this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
           }
@@ -338,9 +326,7 @@ module.exports = class deviceOutletSingleInched {
           this.cacheState === 'on' && power > this.inUsePowerThreshold
         )
         this.service.updateCharacteristic(this.eveChar.CurrentConsumption, power)
-        this.accessory.eveService.addEntry({
-          power: this.cacheState === 'on' ? power : 0
-        })
+        this.accessory.eveService.addEntry({ power })
         this.accessory.context.energyReadings.push(power)
         logger = true
       }
diff --git a/lib/device/outlet-single.js b/lib/device/outlet-single.js
index 5acabfe4..ce3a9119 100644
--- a/lib/device/outlet-single.js
+++ b/lib/device/outlet-single.js
@@ -256,12 +256,6 @@ module.exports = class deviceOutletSingle {
       }
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.cacheState = newValue
-      if (this.powerReadings && !value) {
-        this.service.updateCharacteristic(this.hapChar.OutletInUse, false)
-        this.service.updateCharacteristic(this.eveChar.CurrentConsumption, 0)
-        this.accessory.eveService.addEntry({ power: 0 })
-        this.accessory.context.energyReadings.push(0)
-      }
       this.accessory.eveService.addEntry({ status: value ? 1 : 0 })
       if (this.enableLogging) {
         this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
@@ -295,12 +289,6 @@ module.exports = class deviceOutletSingle {
         this.cacheState = params.switch
         this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
         this.accessory.eveService.addEntry({ status: this.cacheState === 'on' ? 1 : 0 })
-        if (this.powerReadings && this.cacheState === 'off') {
-          this.service.updateCharacteristic(this.hapChar.OutletInUse, false)
-          this.service.updateCharacteristic(this.eveChar.CurrentConsumption, 0)
-          this.accessory.eveService.addEntry({ power: 0 })
-          this.accessory.context.energyReadings.push(0)
-        }
         if (params.updateSource && this.enableLogging) {
           this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
         }
@@ -324,9 +312,7 @@ module.exports = class deviceOutletSingle {
           this.cacheState === 'on' && power > this.inUsePowerThreshold
         )
         this.service.updateCharacteristic(this.eveChar.CurrentConsumption, power)
-        this.accessory.eveService.addEntry({
-          power: this.cacheState === 'on' ? power : 0
-        })
+        this.accessory.eveService.addEntry({ power })
         this.accessory.context.energyReadings.push(power)
         logger = true
       }

From 6861e3c64d4d29070c1a495c60c7a87cdd6243d2 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 14 Aug 2021 14:40:38 +0100
Subject: [PATCH 2616/3183] 8.0.3-beta.0

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d0d357b5..8071046d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.0.2",
+  "version": "8.0.3-beta.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.0.2",
+      "version": "8.0.3-beta.0",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 742e3785..a13b1a84 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.0.2",
+  "version": "8.0.3-beta.0",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 1b229d7e22aee023bbcd9eb2050c0f3fcf11bdfa Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 14 Aug 2021 14:53:05 +0100
Subject: [PATCH 2617/3183] fixes for multi switch inch mode

---
 lib/device/switch-multi-inched.js | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/lib/device/switch-multi-inched.js b/lib/device/switch-multi-inched.js
index 3fc27a50..fad6121e 100644
--- a/lib/device/switch-multi-inched.js
+++ b/lib/device/switch-multi-inched.js
@@ -216,11 +216,16 @@ module.exports = class deviceSwitchMultiInched {
               setTimeout(() => {
                 this.ignoreUpdates = false
               }, 1500)
-              const newState = !this.service.getCharacteristic(this.hapChar.On).value
-              this.service.updateCharacteristic(this.hapChar.On, newState)
-              this.accessory.eveService.addEntry({ status: newState ? 1 : 0 })
+              const newState = !service.getCharacteristic(this.hapChar.On).value
+              service.updateCharacteristic(this.hapChar.On, newState)
+              subAccessory.eveService.addEntry({ status: newState ? 1 : 0 })
               if (params.updateSource && this.enableLogging) {
-                this.log('[%s] %s [%s].', this.name, this.lang.curState, newState ? 'on' : 'off')
+                this.log(
+                  '[%s] %s [%s].',
+                  subAccessory.displayName,
+                  this.lang.curState,
+                  newState ? 'on' : 'off'
+                )
               }
             }
           }

From e8e334368f1a5326c719eea4a4125de721ce8699 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 14 Aug 2021 14:53:32 +0100
Subject: [PATCH 2618/3183] 8.0.3-beta.1

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 8071046d..7a25ccaf 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.0.3-beta.0",
+  "version": "8.0.3-beta.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.0.3-beta.0",
+      "version": "8.0.3-beta.1",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index a13b1a84..999d91d1 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.0.3-beta.0",
+  "version": "8.0.3-beta.1",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 39629b41d67e3e13ff8279e6be41dec9e2b37a6e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 16 Aug 2021 13:36:42 +0100
Subject: [PATCH 2619/3183] next attempt for inched multi channel

---
 config.schema.json         | 12 +++----
 lib/device/switch-multi.js | 71 ++++++++++++++++++++++++++++++--------
 lib/index.js               | 19 +++++-----
 lib/utils/constants.js     |  2 +-
 4 files changed, 74 insertions(+), 30 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 1da7698b..f5bb1a29 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -245,7 +245,7 @@
               "placeholder": 0,
               "minimum": 0,
               "condition": {
-                "functionBody": "return (model.singleDevices && model.singleDevices[arrayIndices] && ['pow', 'iw'].includes(model.singleDevices[arrayIndices].deviceModel) && ['default', outlet'].includes(model.singleDevices[arrayIndices].showAs) && !model.singleDevices[arrayIndices].ignoreDevice);"
+                "functionBody": "return (model.singleDevices && model.singleDevices[arrayIndices] && ['pow', 'iw'].includes(model.singleDevices[arrayIndices].deviceModel) && ['default', 'outlet'].includes(model.singleDevices[arrayIndices].showAs) && !model.singleDevices[arrayIndices].ignoreDevice);"
               }
             },
             "isInched": {
@@ -565,13 +565,13 @@
               "placeholder": 0,
               "minimum": 0,
               "condition": {
-                "functionBody": "return (model.multiDevices && model.multiDevices[arrayIndices] && model.multiDevices[arrayIndices].deviceId && ['default', outlet'].includes(model.multiDevices[arrayIndices].showAs) && ['dualr3_switch'].includes(model.multiDevices[arrayIndices].deviceModel) && !model.multiDevices[arrayIndices].ignoreDevice);"
+                "functionBody": "return (model.multiDevices && model.multiDevices[arrayIndices] && model.multiDevices[arrayIndices].deviceId && ['default', 'outlet'].includes(model.multiDevices[arrayIndices].showAs) && ['dualr3_switch'].includes(model.multiDevices[arrayIndices].deviceModel) && !model.multiDevices[arrayIndices].ignoreDevice);"
               }
             },
-            "isInched": {
-              "type": "boolean",
+            "inchChannels": {
+              "type": "string",
               "title": "Status By Inching",
-              "description": "If true, the plugin will show the on/off status based on inching mode.",
+              "description": "A comma separated list of channels to show the on/off status based on inching mode. For example '1,2'.",
               "condition": {
                 "functionBody": "return (model.multiDevices && model.multiDevices[arrayIndices] && ['dual_dualr2', 'dualr3_switch', '4ch', 't', 'zb'].includes(model.multiDevices[arrayIndices].deviceModel) && ['default', 'outlet'].includes(model.multiDevices[arrayIndices].showAs) && !model.multiDevices[arrayIndices].ignoreDevice);"
               }
@@ -1536,7 +1536,7 @@
             "multiDevices[].showAsMotor",
             "multiDevices[].hideChannels",
             "multiDevices[].inUsePowerThreshold",
-            "multiDevices[].isInched",
+            "multiDevices[].inchChannels",
             "multiDevices[].sensorType",
             "multiDevices[].operationTime",
             "multiDevices[].operationTimeDown",
diff --git a/lib/device/switch-multi.js b/lib/device/switch-multi.js
index 63c2cd05..b624f8f1 100644
--- a/lib/device/switch-multi.js
+++ b/lib/device/switch-multi.js
@@ -31,10 +31,14 @@ module.exports = class deviceSwitchMulti {
     // Set up custom variables for this device type
     const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
     this.hideChannels = deviceConf && deviceConf.hideChannels ? deviceConf.hideChannels : undefined
+    this.inchChannels = deviceConf && deviceConf.inchChannels ? deviceConf.inchChannels : ''
     this.inUsePowerThreshold =
       deviceConf && deviceConf.inUsePowerThreshold
         ? deviceConf.inUsePowerThreshold
         : platform.consts.defaultValues.inUsePowerThreshold
+    accessory.context.isInched =
+      accessory.context.switchNumber !== '0' &&
+      this.inchChannels.includes(accessory.context.switchNumber)
 
     // Set the correct logging variables for this accessory
     this.enableLogging = !platform.config.disableDeviceLogging
@@ -109,6 +113,10 @@ module.exports = class deviceSwitchMulti {
       .getCharacteristic(this.hapChar.On)
       .onSet(async value => await this.internalStateUpdate(value))
 
+    if (this.accessory.context.isInched) {
+      this.service.updateCharacteristic(this.hapChar.On, false)
+    }
+
     // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
     if (!platform.config.disableNoResponse) {
       this.service.getCharacteristic(this.hapChar.On).onGet(() => {
@@ -146,6 +154,7 @@ module.exports = class deviceSwitchMulti {
     if (accessory.context.switchNumber === '0') {
       const opts = JSON.stringify({
         hideChannels: this.hideChannels,
+        inchChannels: this.inchChannels,
         inUsePowerThreshold: this.inUsePowerThreshold,
         logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
         showAs: 'default'
@@ -157,6 +166,9 @@ module.exports = class deviceSwitchMulti {
   async internalStateUpdate (value) {
     try {
       let primaryState = false
+      if (this.accessory.context.isInched) {
+        value = !this.service.getCharacteristic(this.hapChar.On).value
+      }
       const params = {
         switches: []
       }
@@ -175,11 +187,17 @@ module.exports = class deviceSwitchMulti {
         case '3':
         case '4':
           params.switches.push({
-            switch: value ? 'on' : 'off',
+            switch: value || this.accessory.context.isInched ? 'on' : 'off',
             outlet: switchNumber - 1
           })
           break
       }
+      if (this.accessory.context.isInched) {
+        this.accessory.context.ignoreUpdates = true
+        setTimeout(() => {
+          this.accessory.context.ignoreUpdates = false
+        }, 1500)
+      }
       await this.platform.sendDeviceUpdate(this.accessory, params)
       switch (switchNumber) {
         case '0':
@@ -281,22 +299,45 @@ module.exports = class deviceSwitchMulti {
           const subAccessory = this.devicesInHB.get(uuid)
           const service = subAccessory.getService(this.hapServ.Switch)
           if (params.switches) {
-            if (params.switches[i - 1].switch === 'on') {
-              primaryState = true
-            }
             const currentState = service.getCharacteristic(this.hapChar.On).value ? 'on' : 'off'
-            if (!params.updateSource || params.switches[i - 1].switch !== currentState) {
-              service.updateCharacteristic(this.hapChar.On, params.switches[i - 1].switch === 'on')
-              subAccessory.eveService.addEntry({
-                status: params.switches[i - 1].switch === 'on' ? 1 : 0
-              })
-              if (params.updateSource && this.enableLogging) {
-                this.log(
-                  '[%s] %s [%s].',
-                  subAccessory.displayName,
-                  this.lang.curState,
-                  params.switches[i - 1].switch
+            if (subAccessory.context.isInched) {
+              if (params.switches[i - 1].switch === 'on' && !subAccessory.context.ignoreUpdates) {
+                subAccessory.context.ignoreUpdates = true
+                setTimeout(() => {
+                  subAccessory.context.ignoreUpdates = false
+                }, 1500)
+                const newState = currentState === 'on' ? 'off' : 'on'
+                if (newState === 'on') {
+                  primaryState = true
+                }
+                service.updateCharacteristic(this.hapChar.On, newState === 'on')
+                subAccessory.eveService.addEntry({
+                  status: newState === 'on' ? 1 : 0
+                })
+                if (params.updateSource && this.enableLogging) {
+                  this.log('[%s] %s [%s].', subAccessory.displayName, this.lang.curState, newState)
+                }
+              }
+            } else {
+              if (params.switches[i - 1].switch === 'on') {
+                primaryState = true
+              }
+              if (!params.updateSource || params.switches[i - 1].switch !== currentState) {
+                service.updateCharacteristic(
+                  this.hapChar.On,
+                  params.switches[i - 1].switch === 'on'
                 )
+                subAccessory.eveService.addEntry({
+                  status: params.switches[i - 1].switch === 'on' ? 1 : 0
+                })
+                if (params.updateSource && this.enableLogging) {
+                  this.log(
+                    '[%s] %s [%s].',
+                    subAccessory.displayName,
+                    this.lang.curState,
+                    params.switches[i - 1].switch
+                  )
+                }
               }
             }
           }
diff --git a/lib/index.js b/lib/index.js
index a3032d6a..a6adf43f 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -327,6 +327,13 @@ class eWeLinkPlatform {
                       this.ignoredDevices.push(id)
                     }
                     break
+                  case 'inchChannels':
+                    if (typeof v !== 'string' || v === '') {
+                      logIgnore(key + '.' + id + '.' + k)
+                    } else {
+                      this.deviceConf[id][k] = v
+                    }
+                    break
                   case 'ipAddress': {
                     if (typeof v !== 'string' || v === '') {
                       logIgnore(key + '.' + id + '.' + k)
@@ -1012,9 +1019,9 @@ class eWeLinkPlatform {
           // Check if the user has chosen to hide any channels for this device
           if (
             this.hideChannels.includes(device.deviceid + 'SW' + i) ||
-            (this.deviceConf[device.deviceid] &&
-              this.deviceConf[device.deviceid].isInched &&
-              i === 0)
+            (i === 0 &&
+              this.deviceConf[device.deviceid] &&
+              this.deviceConf[device.deviceid].inchChannels)
           ) {
             // The user has hidden this channel so if it exists then remove it
             if (devicesInHB.has(uuidsub)) {
@@ -1054,11 +1061,7 @@ class eWeLinkPlatform {
           subAccessory.context.lanKey = device.devicekey
           subAccessory.control =
             device.showAs === 'outlet'
-              ? this.deviceConf[device.deviceid] && this.deviceConf[device.deviceid].isInched
-                ? new (require('./device/outlet-multi-inched'))(this, subAccessory, devicesInHB)
-                : new (require('./device/outlet-multi'))(this, subAccessory, devicesInHB)
-              : this.deviceConf[device.deviceid] && this.deviceConf[device.deviceid].isInched
-              ? new (require('./device/switch-multi-inched'))(this, subAccessory, devicesInHB)
+              ? new (require('./device/outlet-multi'))(this, subAccessory, devicesInHB)
               : new (require('./device/switch-multi'))(this, subAccessory, devicesInHB)
 
           // Mark the online/offline status of certain devices
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 43409023..6df8bacf 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -102,7 +102,7 @@ module.exports = {
       'showAsMotor',
       'hideChannels',
       'inUsePowerThreshold',
-      'isInched',
+      'inchChannels',
       'sensorType',
       'operationTime',
       'operationTimeDown',

From e5682a45aea37fa5cc3c6ddfe20c66ced3abc038 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 16 Aug 2021 13:37:09 +0100
Subject: [PATCH 2620/3183] 8.0.3-beta.2

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 7a25ccaf..caab5e41 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.0.3-beta.1",
+  "version": "8.0.3-beta.2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.0.3-beta.1",
+      "version": "8.0.3-beta.2",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 999d91d1..3ce30506 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.0.3-beta.1",
+  "version": "8.0.3-beta.2",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From ab6d6d8c95ee939444ac8e4a1cb7c83568fdab58 Mon Sep 17 00:00:00 2001
From: JP_LNO <jplno@gmail.com>
Date: Mon, 16 Aug 2021 21:08:20 +0200
Subject: [PATCH 2621/3183] Add french localization

---
 lib/utils/lang-fr.js | 165 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 165 insertions(+)
 create mode 100644 lib/utils/lang-fr.js

diff --git a/lib/utils/lang-fr.js b/lib/utils/lang-fr.js
new file mode 100644
index 00000000..e5098320
--- /dev/null
+++ b/lib/utils/lang-fr.js
@@ -0,0 +1,165 @@
+/* jshint node: true,esversion: 9, -W014, -W033 */
+/* eslint-disable new-cap */
+'use strict'
+
+module.exports = {
+  apiListenErr: 'Erreur de serveur d\'API interne',
+  apiListening: 'API interne à l\'écoute sur le port',
+  apiShutdown: 'L\'API interne s\'arrête normalement',
+  buttonDouble: 'appui double',
+  buttonLong: 'appui long',
+  buttonNotFound: 'rf button non trouvé (veuillez redémarrer Homebridge)',
+  buttonSingle: 'appui simple',
+  buttonTrig: 'boutton déclenché',
+  cantReadPacket: 'Le message LAN reçu n\'a pas pu être lu comme',
+  cantParsePacket: 'Impossible d\'analyser le paquet DNS en tant que',
+  cfgDef: 'n\'est pas un nombre valide, utilisation de la valeur par defaut',
+  cfgDup: 'sera ignoré tant qu\'une autre entrée avec cet ID existe',
+  cfgIgn: 'ignoré car non configuré correctement',
+  cfgIgnItem: 'a une entrée invalide et sera ignoré',
+  cfgItem: 'Configurer l\'entrée',
+  cfgLow: 'à une valeur trop basse et sera augmenté à',
+  cfgRmv: 'n\'est pas utilisé et peut-être enlevé',
+  cfgQts: 'ne devrait pas avoir de guillemets autour de son entrée',
+  complete: '✓ Configuration complète',
+  contactNo: 'contact non detecté',
+  contactYes: 'contact detecté',
+  curBatt: 'batterie actuelle',
+  curBright: 'luminosité actuelle',
+  curColour: 'couleur actuelle',
+  curCool: 'refroidissement actuel',
+  curCurr: 'actuel actuel',
+  curDehumid: 'déshumidification actuelle',
+  curHeat: 'chauffage actuel',
+  curHumi: 'humidité actuelle',
+  curHumid: 'humidification actuelle',
+  curLight: 'lumière actuelle',
+  curMode: 'mode actuel',
+  curPos: 'position actuelle',
+  curPower: 'alimentation actuelle',
+  curPur: 'purification actuelle',
+  curSpeed: 'vitesse actuelle',
+  curState: 'état actuel',
+  curTarg: 'cible actuelle',
+  curTemp: 'température actuelle',
+  curVolt: 'voltage actuel',
+  devAdd: 'a été ajouté à Homebridge',
+  devInit: 'initialisé et',
+  devInitOpts: 'initialisation avec options',
+  devNewNotAdd: 'redémarrer Homebridge pour ajouter un nouvel appareil, echec de l\'ajout automatique en tant que',
+  devNoAPIKey: 'ne peux pas récupérer la clé API de l\'appareil',
+  devNoControl: 'ne peux pas être controlé via le mode:lan n\'est pas compatible avec ce device',
+  devNotAdd: 'ne peux pas être ajouté à Homebridge en tant que',
+  devNotConf: 'ne peux pas être configuré en tant que ',
+  devNotConfLAN: 'appareil/commande non disponible via le mode LAN',
+  devNotFound: 'appareil non trouvé dans eWeLink',
+  devNotInit: 'ne peux pas être intialisé en tant que',
+  devNotReachLAN: 'appareil non joignable via le mode LAN',
+  devNotRf: 'ne peux pas être raffraichi en tant que',
+  devNotRemove: 'ne peux pas être supprimé de Homebridge en tant que',
+  devNotSup: 'n\'a pas pus être ajouté car ne peux pas être pas supporté',
+  devNotSupYet: 'non supporté, crée un ticket incident sur Github avec les infos suivantes',
+  devNotUpd: 'echec de la mise à jour de l\'appareil en tant que',
+  devRemove: 'a été supprimé de Homebridge',
+  disabled: 'Pour changer celà, régler disablePlugin à false',
+  disabledAL: 'luminosité adaptative désactivée suite à un changement de couleur',
+  disabling: 'Désactivation du plugin',
+  doorClosed: 'fermée',
+  doorOpen: 'ouverte',
+  dualr3NoCalib: 'Doit être calibré pour fonctionner en mode moteur',
+  dualr3NoMeter: 'n\'est pas supporté en mode mètre',
+  errGetDevice: 'Une erreur est survenue durant http getDevice()',
+  errGetDevices: 'Une erreur est survenue durant https getDevice()',
+  errGetHost: 'Une erreur est survenue durant ws getHost()',
+  errLogin: 'Une erreur est survenue durant http login()',
+  eweError: 'Une erreur eWeLink [500] est survenue, nouvel essaie dans 30 secondes',
+  foundWithIP: 'trouvé locallement avec IP',
+  foundWithManIP: 'utilisation de l\'IP manuelle',
+  hbVersionFail: 'Votre version de Homebridge est trop ancienne - Mettez à jour vers v1.3',
+  httpDisabled: 'HTTP/WS clients désactivé en tant que',
+  httpLogin10003: 'Consulter http://bit.ly/hb-ewelink-errors pour plus d\'informations sur cette erreur de connexion',
+  httpRetry: 'eWelink n\'est pas joignable, réessai dans 30 secondes',
+  identify: 'identifier le bouton préssé',
+  initialised: 'Plugin intitialisé. Configuration des accessoires...',
+  initialising: 'Initialisation du plugin',
+  invalidConfig: 'Configuration invalide',
+  lanDisabled: 'LAN mode est désactivé',
+  lanErr: 'Error LAN inconnue',
+  lanIPDifferent: 'IP manuelle ignorée depuis la découverte d\'une IP différente',
+  lanMonitor: 'Surveillance LAN démarré',
+  lanNotSup: 'le mode LAN n\'est pas supporté pour envoyer des mise à jour vers cet appareil',
+  lanStarted: 'découverte LAN complète',
+  lanStarting: 'début de la découverte LAN',
+  lanUnsupported: 'le mode LAN est indisponible car il est indisponible ou non découvert',
+  leakNo: 'fuite non détectée',
+  leakYes: 'fuite detectée',
+  lockLocked: 'Vérouillé',
+  lockUnlocked: 'Déverouillé',
+  missingCreds: 'paramètres de connexion eWeLink non configurés',
+  motionNo: 'mouvement non detecté',
+  motionYes: 'mouvement detecté',
+  newIP: 'changement de l\'adresse IP pour',
+  newRegionRec: 'Nouvel API hôte HTTTP reçcus',
+  noAuthRec: 'pas de token d\'authentification reçus',
+  noGarageForOD: 'pas d\accessoire de porte de garage trouvé',
+  noRegionRec: 'pas de région valide reçus',
+  noWSHost: 'le serveur ne répond pas avec un hote web socket',
+  pluginNotConf: 'le plugin n\'a pas été configuré',
+  recNew: 'réception des mises à jour pour un nouvel appareil',
+  repOffline: 'a été rapporté [offline]',
+  repOnline: 'a été rapporté [online]',
+  revertWS: 'retour au web socket en tant que',
+  rfNotFound: 'essayez de redémarrer Homebridge car aucun accéssoires n\'a été trouvé pour',
+  rfTrigNo: 'non déclenché',
+  rfTrigYes: 'déclenché',
+  sendLogin: 'Envoie d\'une requete HTTP login()',
+  sensorErr: 'non supporté comme des/humidifier tant que l\'équipement n\'à pas de capteur pris en charge',
+  sensorNo: 'désactivé',
+  sensorYes: 'activé',
+  shareWarn: 'utiliser un équipement partagé avec le cloud peut provoquer des erreurs, utilisez votre compte eWelink principal',
+  sonoffCamera: 'voir le wiki homebridge-ewelink pour plus de détails sur l\'activation de caméra',
+  stoppedLAN: 'surveillance LAN gracieusement arreté',
+  stoppedWS: 'socket web fracieusement fermé',
+  storageClearErr: 'Ne peut pas vider le stockage du dossier en tant que',
+  storageReadErr: 'Ne peut pas lire le dossier persitat en tant que',
+  storageSetupErr: 'Ne peut pas paramétrer le stockage client en tant que',
+  storageWriteErr: 'ne peux pas sauvegarder l\'équipement dans un fichier en tant que',
+  unreachable: 'n\'est pas joignable',
+  updRec: 'reception d\'une mise à jour',
+  updReq: 'récupération de l\'état actuel',
+  updSend: 'envoie de la mise à jour',
+  valveNo: 'arreté',
+  valveYes: 'en fonctionnement',
+  viaAL: 'via éclairafe adaptatif',
+  viaLAN: 'via LAN',
+  viaWS: 'via WS',
+  wsHostRec: 'reception d\'un hôte Web socket',
+  wsLogin: 'Envoie d\'une requête de connection WS',
+  wsLoginErr: 'Paramètres WS reçus inconnus',
+  wsLoginError: 'Echec de la connection WS en tant que',
+  wsLoginErrRecon: 'WS n\'a pas pus être ouvert and réessaiera dans 5 secondes',
+  wsLoginSuccess: 'Succès de la connection WS',
+  wsLogin406: 'Echec de la connection WS [406] voir http://bit.ly/hb-ewelink-errors',
+  wsPingError: 'Ne peux pas envoyer un ping WS en tant que',
+  wsRec: 'Message WS reçus',
+  wsReconnectClose: 'Évènement de fermeture WS et réessaiera de se connecter dans 5 secondes',
+  wsReconnectError: 'Évènement d\'erreur WS et réessaiera de se connecter dans 5 secondes',
+  wsRef: 'Actualisation de la connection WS',
+  wsRefFail: 'Echec de l\'actualisation de la connection en tant que',
+  wsRequired: 'la mise à jour doit être envoyée de cette façon',
+  wsReqTimeout: 'demande de délai d\'attente',
+  wsResend: 'Web socket n\'est pas ouvert - réessayer dans quelques secondes',
+  wsUnkAct: 'message WS reçus comme action inconnue',
+  wsUnkCmd: 'commande WS inconnue reçue',
+  wsUnkRes: 'réponse WS inconnue reçue',
+  zWelcome: [
+    "N'oubliez pas de ☆ ce plugin sur GitHub si vous le trouvez utile!",
+    'Vous avez une demande de fonctionnalité? Visitez http://bit.ly/hb-ewelink-issues pour demander!',
+    'Intéressé pour sponsoriser ce plugin? https://github.com/sponsors/bwp91',
+    "Rejoignez la communauté Discord de ce plugin! https://discord.gg/cMGhNtZ3tW",
+    'Merci d\'utiliser ce plugin. J\'espère que vous le trouvez utile!',
+    'Ce plugin a été fait avec ♥ par bwp91 au Royaume-Unis!',
+    'Un peu de temps pour laisser un avis sur ce plugin? http://bit.ly/hb-ewelink-review',
+    'Vous voulez voir ce plugin dans votre langage ? Dite le moi!'
+  ]
+}
\ No newline at end of file

From 0082f8748a6e569477f435b658e911d6d3c9dd00 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 17 Aug 2021 12:30:37 +0100
Subject: [PATCH 2622/3183] add opt for french logging

---
 config.schema.json     | 17 ++++++++
 lib/index.js           | 10 +++--
 lib/utils/constants.js |  5 ++-
 lib/utils/lang-fr.js   | 94 ++++++++++++++++++++++--------------------
 4 files changed, 77 insertions(+), 49 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index f5bb1a29..3e674a9f 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -26,6 +26,22 @@
         "required": true,
         "description": "Your eWeLink password, can also be a base64 encoded version of your password."
       },
+      "language": {
+        "type": "string",
+        "title": "Connection Mode",
+        "description": "Language to use for logging.",
+        "default": "en",
+        "oneOf": [
+          {
+            "title": "English",
+            "enum": ["en"]
+          },
+          {
+            "title": "French",
+            "enum": ["fr"]
+          }
+        ]
+      },
       "mode": {
         "type": "string",
         "title": "Connection Mode",
@@ -1473,6 +1489,7 @@
       "description": "Optional settings for the plugin, including account, API and global logging settings.",
       "expandable": true,
       "items": [
+        "language",
         "mode",
         {
           "type": "help",
diff --git a/lib/index.js b/lib/index.js
index a6adf43f..9d20a815 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -48,7 +48,10 @@ class eWeLinkPlatform {
       this.obstructSwitches = {}
 
       // Retrieve the user's chosen language file
-      this.lang = require('./utils/lang-en')
+      const lang = this.consts.allowed.language.includes(config.language)
+        ? config.language
+        : this.consts.defaultValues.language
+      this.lang = require('./utils/lang-' + lang)
 
       // Make sure user is running Homebridge v1.3 or above
       if (!api.versionGreaterOrEqual || !api.versionGreaterOrEqual('1.3.0')) {
@@ -390,12 +393,13 @@ class eWeLinkPlatform {
             : this.consts.defaultValues[key]
           break
         }
+        case 'language':
         case 'mode': {
-          const inSet = this.consts.allowed.modes.includes(val)
+          const inSet = this.consts.allowed[key].includes(val)
           if (typeof val !== 'string' || !inSet) {
             logIgnore(key)
           }
-          this.config.mode = inSet ? val : this.consts.defaultValues[key]
+          this.config[key] = inSet ? val : this.consts.defaultValues[key]
           break
         }
         case 'name':
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 6df8bacf..ad2e0076 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -7,6 +7,7 @@ module.exports = {
     name: 'eWeLink',
     username: '',
     password: '',
+    language: 'en',
     mode: 'auto',
     disableNoResponse: false,
     countryCode: '+44',
@@ -33,6 +34,7 @@ module.exports = {
     httpHost: 'eu-apia.coolkit.cc',
     humidityOffset: 0,
     inUsePowerThreshold: 0,
+    language: 'en',
     lowBattThreshold: 25,
     maxTarget: 30,
     minTarget: 10,
@@ -68,6 +70,7 @@ module.exports = {
   httpRetryCodes: ['ENOTFOUND', 'ETIMEDOUT', 'EAI_AGAIN', 'ECONNABORTED'],
 
   allowed: {
+    language: ['en', 'fr'],
     httpHosts: [
       'auto',
       'eu-apia.coolkit.cc',
@@ -75,7 +78,7 @@ module.exports = {
       'as-apia.coolkit.cc',
       'cn-apia.coolkit.cn'
     ],
-    modes: ['auto', 'wan', 'lan'],
+    mode: ['auto', 'wan', 'lan'],
     singleDevices: [
       'label',
       'deviceId',
diff --git a/lib/utils/lang-fr.js b/lib/utils/lang-fr.js
index e5098320..ea0acf4a 100644
--- a/lib/utils/lang-fr.js
+++ b/lib/utils/lang-fr.js
@@ -3,23 +3,23 @@
 'use strict'
 
 module.exports = {
-  apiListenErr: 'Erreur de serveur d\'API interne',
-  apiListening: 'API interne à l\'écoute sur le port',
-  apiShutdown: 'L\'API interne s\'arrête normalement',
+  apiListenErr: "Erreur de serveur d'API interne",
+  apiListening: "API interne à l'écoute sur le port",
+  apiShutdown: "L'API interne s'arrête normalement",
   buttonDouble: 'appui double',
   buttonLong: 'appui long',
   buttonNotFound: 'rf button non trouvé (veuillez redémarrer Homebridge)',
   buttonSingle: 'appui simple',
   buttonTrig: 'boutton déclenché',
-  cantReadPacket: 'Le message LAN reçu n\'a pas pu être lu comme',
-  cantParsePacket: 'Impossible d\'analyser le paquet DNS en tant que',
-  cfgDef: 'n\'est pas un nombre valide, utilisation de la valeur par defaut',
-  cfgDup: 'sera ignoré tant qu\'une autre entrée avec cet ID existe',
+  cantReadPacket: "Le message LAN reçu n'a pas pu être lu comme",
+  cantParsePacket: "Impossible d'analyser le paquet DNS en tant que",
+  cfgDef: "n'est pas un nombre valide, utilisation de la valeur par defaut",
+  cfgDup: "sera ignoré tant qu'une autre entrée avec cet ID existe",
   cfgIgn: 'ignoré car non configuré correctement',
   cfgIgnItem: 'a une entrée invalide et sera ignoré',
-  cfgItem: 'Configurer l\'entrée',
+  cfgItem: "Configurer l'entrée",
   cfgLow: 'à une valeur trop basse et sera augmenté à',
-  cfgRmv: 'n\'est pas utilisé et peut-être enlevé',
+  cfgRmv: "n'est pas utilisé et peut-être enlevé",
   cfgQts: 'ne devrait pas avoir de guillemets autour de son entrée',
   complete: '✓ Configuration complète',
   contactNo: 'contact non detecté',
@@ -46,9 +46,10 @@ module.exports = {
   devAdd: 'a été ajouté à Homebridge',
   devInit: 'initialisé et',
   devInitOpts: 'initialisation avec options',
-  devNewNotAdd: 'redémarrer Homebridge pour ajouter un nouvel appareil, echec de l\'ajout automatique en tant que',
-  devNoAPIKey: 'ne peux pas récupérer la clé API de l\'appareil',
-  devNoControl: 'ne peux pas être controlé via le mode:lan n\'est pas compatible avec ce device',
+  devNewNotAdd:
+    "redémarrer Homebridge pour ajouter un nouvel appareil, echec de l'ajout automatique en tant que",
+  devNoAPIKey: "ne peux pas récupérer la clé API de l'appareil",
+  devNoControl: "ne peux pas être controlé via le mode:lan n'est pas compatible avec ce device",
   devNotAdd: 'ne peux pas être ajouté à Homebridge en tant que',
   devNotConf: 'ne peux pas être configuré en tant que ',
   devNotConfLAN: 'appareil/commande non disponible via le mode LAN',
@@ -57,9 +58,9 @@ module.exports = {
   devNotReachLAN: 'appareil non joignable via le mode LAN',
   devNotRf: 'ne peux pas être raffraichi en tant que',
   devNotRemove: 'ne peux pas être supprimé de Homebridge en tant que',
-  devNotSup: 'n\'a pas pus être ajouté car ne peux pas être pas supporté',
+  devNotSup: "n'a pas pus être ajouté car ne peux pas être pas supporté",
   devNotSupYet: 'non supporté, crée un ticket incident sur Github avec les infos suivantes',
-  devNotUpd: 'echec de la mise à jour de l\'appareil en tant que',
+  devNotUpd: "echec de la mise à jour de l'appareil en tant que",
   devRemove: 'a été supprimé de Homebridge',
   disabled: 'Pour changer celà, régler disablePlugin à false',
   disabledAL: 'luminosité adaptative désactivée suite à un changement de couleur',
@@ -67,29 +68,30 @@ module.exports = {
   doorClosed: 'fermée',
   doorOpen: 'ouverte',
   dualr3NoCalib: 'Doit être calibré pour fonctionner en mode moteur',
-  dualr3NoMeter: 'n\'est pas supporté en mode mètre',
+  dualr3NoMeter: "n'est pas supporté en mode mètre",
   errGetDevice: 'Une erreur est survenue durant http getDevice()',
   errGetDevices: 'Une erreur est survenue durant https getDevice()',
   errGetHost: 'Une erreur est survenue durant ws getHost()',
   errLogin: 'Une erreur est survenue durant http login()',
   eweError: 'Une erreur eWeLink [500] est survenue, nouvel essaie dans 30 secondes',
   foundWithIP: 'trouvé locallement avec IP',
-  foundWithManIP: 'utilisation de l\'IP manuelle',
+  foundWithManIP: "utilisation de l'IP manuelle",
   hbVersionFail: 'Votre version de Homebridge est trop ancienne - Mettez à jour vers v1.3',
   httpDisabled: 'HTTP/WS clients désactivé en tant que',
-  httpLogin10003: 'Consulter http://bit.ly/hb-ewelink-errors pour plus d\'informations sur cette erreur de connexion',
-  httpRetry: 'eWelink n\'est pas joignable, réessai dans 30 secondes',
+  httpLogin10003:
+    "Consulter http://bit.ly/hb-ewelink-errors pour plus d'informations sur cette erreur de connexion",
+  httpRetry: "eWelink n'est pas joignable, réessai dans 30 secondes",
   identify: 'identifier le bouton préssé',
   initialised: 'Plugin intitialisé. Configuration des accessoires...',
   initialising: 'Initialisation du plugin',
   invalidConfig: 'Configuration invalide',
   lanDisabled: 'LAN mode est désactivé',
   lanErr: 'Error LAN inconnue',
-  lanIPDifferent: 'IP manuelle ignorée depuis la découverte d\'une IP différente',
+  lanIPDifferent: "IP manuelle ignorée depuis la découverte d'une IP différente",
   lanMonitor: 'Surveillance LAN démarré',
-  lanNotSup: 'le mode LAN n\'est pas supporté pour envoyer des mise à jour vers cet appareil',
-  lanStarted: 'découverte LAN complète',
-  lanStarting: 'début de la découverte LAN',
+  lanNotSup: "le mode LAN n'est pas supporté pour envoyer des mise à jour vers cet appareil",
+  lanStarted: 'Découverte LAN complète',
+  lanStarting: 'Début de la découverte LAN',
   lanUnsupported: 'le mode LAN est indisponible car il est indisponible ou non découvert',
   leakNo: 'fuite non détectée',
   leakYes: 'fuite detectée',
@@ -98,57 +100,59 @@ module.exports = {
   missingCreds: 'paramètres de connexion eWeLink non configurés',
   motionNo: 'mouvement non detecté',
   motionYes: 'mouvement detecté',
-  newIP: 'changement de l\'adresse IP pour',
+  newIP: "changement de l'adresse IP pour",
   newRegionRec: 'Nouvel API hôte HTTTP reçcus',
-  noAuthRec: 'pas de token d\'authentification reçus',
-  noGarageForOD: 'pas d\accessoire de porte de garage trouvé',
+  noAuthRec: "pas de token d'authentification reçus",
+  noGarageForOD: 'pas daccessoire de porte de garage trouvé',
   noRegionRec: 'pas de région valide reçus',
   noWSHost: 'le serveur ne répond pas avec un hote web socket',
-  pluginNotConf: 'le plugin n\'a pas été configuré',
+  pluginNotConf: "le plugin n'a pas été configuré",
   recNew: 'réception des mises à jour pour un nouvel appareil',
   repOffline: 'a été rapporté [offline]',
   repOnline: 'a été rapporté [online]',
   revertWS: 'retour au web socket en tant que',
-  rfNotFound: 'essayez de redémarrer Homebridge car aucun accéssoires n\'a été trouvé pour',
+  rfNotFound: "essayez de redémarrer Homebridge car aucun accéssoires n'a été trouvé pour",
   rfTrigNo: 'non déclenché',
   rfTrigYes: 'déclenché',
-  sendLogin: 'Envoie d\'une requete HTTP login()',
-  sensorErr: 'non supporté comme des/humidifier tant que l\'équipement n\'à pas de capteur pris en charge',
+  sendLogin: "Envoie d'une requete HTTP login()",
+  sensorErr:
+    "non supporté comme des/humidifier tant que l'équipement n'à pas de capteur pris en charge",
   sensorNo: 'désactivé',
   sensorYes: 'activé',
-  shareWarn: 'utiliser un équipement partagé avec le cloud peut provoquer des erreurs, utilisez votre compte eWelink principal',
-  sonoffCamera: 'voir le wiki homebridge-ewelink pour plus de détails sur l\'activation de caméra',
+  shareWarn:
+    'utiliser un équipement partagé avec le cloud peut provoquer des erreurs, utilisez votre compte eWelink principal',
+  sonoffCamera: "voir le wiki homebridge-ewelink pour plus de détails sur l'activation de caméra",
   stoppedLAN: 'surveillance LAN gracieusement arreté',
   stoppedWS: 'socket web fracieusement fermé',
   storageClearErr: 'Ne peut pas vider le stockage du dossier en tant que',
   storageReadErr: 'Ne peut pas lire le dossier persitat en tant que',
   storageSetupErr: 'Ne peut pas paramétrer le stockage client en tant que',
-  storageWriteErr: 'ne peux pas sauvegarder l\'équipement dans un fichier en tant que',
-  unreachable: 'n\'est pas joignable',
-  updRec: 'reception d\'une mise à jour',
-  updReq: 'récupération de l\'état actuel',
+  storageWriteErr: "ne peux pas sauvegarder l'équipement dans un fichier en tant que",
+  unreachable: "n'est pas joignable",
+  updRec: "reception d'une mise à jour",
+  updReq: "récupération de l'état actuel",
   updSend: 'envoie de la mise à jour',
   valveNo: 'arreté',
   valveYes: 'en fonctionnement',
   viaAL: 'via éclairafe adaptatif',
   viaLAN: 'via LAN',
   viaWS: 'via WS',
-  wsHostRec: 'reception d\'un hôte Web socket',
-  wsLogin: 'Envoie d\'une requête de connection WS',
+  wsHostRec: "reception d'un hôte Web socket",
+  wsLogin: "Envoie d'une requête de connection WS",
   wsLoginErr: 'Paramètres WS reçus inconnus',
   wsLoginError: 'Echec de la connection WS en tant que',
-  wsLoginErrRecon: 'WS n\'a pas pus être ouvert and réessaiera dans 5 secondes',
+  wsLoginErrRecon: "WS n'a pas pus être ouvert and réessaiera dans 5 secondes",
   wsLoginSuccess: 'Succès de la connection WS',
   wsLogin406: 'Echec de la connection WS [406] voir http://bit.ly/hb-ewelink-errors',
   wsPingError: 'Ne peux pas envoyer un ping WS en tant que',
   wsRec: 'Message WS reçus',
   wsReconnectClose: 'Évènement de fermeture WS et réessaiera de se connecter dans 5 secondes',
-  wsReconnectError: 'Évènement d\'erreur WS et réessaiera de se connecter dans 5 secondes',
+  wsReconnectError: "Évènement d'erreur WS et réessaiera de se connecter dans 5 secondes",
   wsRef: 'Actualisation de la connection WS',
-  wsRefFail: 'Echec de l\'actualisation de la connection en tant que',
+  wsRefFail: "Echec de l'actualisation de la connection en tant que",
   wsRequired: 'la mise à jour doit être envoyée de cette façon',
-  wsReqTimeout: 'demande de délai d\'attente',
-  wsResend: 'Web socket n\'est pas ouvert - réessayer dans quelques secondes',
+  wsReqTimeout: "demande de délai d'attente",
+  wsResend: "Web socket n'est pas ouvert - réessayer dans quelques secondes",
   wsUnkAct: 'message WS reçus comme action inconnue',
   wsUnkCmd: 'commande WS inconnue reçue',
   wsUnkRes: 'réponse WS inconnue reçue',
@@ -156,10 +160,10 @@ module.exports = {
     "N'oubliez pas de ☆ ce plugin sur GitHub si vous le trouvez utile!",
     'Vous avez une demande de fonctionnalité? Visitez http://bit.ly/hb-ewelink-issues pour demander!',
     'Intéressé pour sponsoriser ce plugin? https://github.com/sponsors/bwp91',
-    "Rejoignez la communauté Discord de ce plugin! https://discord.gg/cMGhNtZ3tW",
-    'Merci d\'utiliser ce plugin. J\'espère que vous le trouvez utile!',
+    'Rejoignez la communauté Discord de ce plugin! https://discord.gg/cMGhNtZ3tW',
+    "Merci d'utiliser ce plugin. J'espère que vous le trouvez utile!",
     'Ce plugin a été fait avec ♥ par bwp91 au Royaume-Unis!',
     'Un peu de temps pour laisser un avis sur ce plugin? http://bit.ly/hb-ewelink-review',
     'Vous voulez voir ce plugin dans votre langage ? Dite le moi!'
   ]
-}
\ No newline at end of file
+}

From 18142f1857bcb61676aef2825c79ab96ebccadbf Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 17 Aug 2021 12:35:05 +0100
Subject: [PATCH 2623/3183] apply inchChannels to multi-outlet

---
 lib/device/outlet-multi.js        |  71 ++++++--
 lib/device/switch-multi-inched.js | 287 ------------------------------
 2 files changed, 56 insertions(+), 302 deletions(-)
 delete mode 100644 lib/device/switch-multi-inched.js

diff --git a/lib/device/outlet-multi.js b/lib/device/outlet-multi.js
index 54797621..22a97b15 100644
--- a/lib/device/outlet-multi.js
+++ b/lib/device/outlet-multi.js
@@ -31,10 +31,14 @@ module.exports = class deviceOutletMulti {
     // Set up custom variables for this device type
     const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
     this.hideChannels = deviceConf && deviceConf.hideChannels ? deviceConf.hideChannels : undefined
+    this.inchChannels = deviceConf && deviceConf.inchChannels ? deviceConf.inchChannels : ''
     this.inUsePowerThreshold =
       deviceConf && deviceConf.inUsePowerThreshold
         ? deviceConf.inUsePowerThreshold
         : platform.consts.defaultValues.inUsePowerThreshold
+    accessory.context.isInched =
+      accessory.context.switchNumber !== '0' &&
+      this.inchChannels.includes(accessory.context.switchNumber)
 
     // Set the correct logging variables for this accessory
     this.enableLogging = !platform.config.disableDeviceLogging
@@ -114,6 +118,10 @@ module.exports = class deviceOutletMulti {
       .getCharacteristic(this.hapChar.On)
       .onSet(async value => await this.internalStateUpdate(value))
 
+    if (this.accessory.context.isInched) {
+      this.service.updateCharacteristic(this.hapChar.On, false)
+    }
+
     // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
     if (!platform.config.disableNoResponse) {
       this.service.getCharacteristic(this.hapChar.On).onGet(() => {
@@ -151,6 +159,7 @@ module.exports = class deviceOutletMulti {
     if (accessory.context.switchNumber === '0') {
       const opts = JSON.stringify({
         hideChannels: this.hideChannels,
+        inchChannels: this.inchChannels,
         inUsePowerThreshold: this.inUsePowerThreshold,
         logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
         showAs: 'outlet'
@@ -162,6 +171,9 @@ module.exports = class deviceOutletMulti {
   async internalStateUpdate (value) {
     try {
       let primaryState = false
+      if (this.accessory.context.isInched) {
+        value = !this.service.getCharacteristic(this.hapChar.On).value
+      }
       const params = {
         switches: []
       }
@@ -180,11 +192,17 @@ module.exports = class deviceOutletMulti {
         case '3':
         case '4':
           params.switches.push({
-            switch: value ? 'on' : 'off',
+            switch: value || this.accessory.context.isInched ? 'on' : 'off',
             outlet: switchNumber - 1
           })
           break
       }
+      if (this.accessory.context.isInched) {
+        this.accessory.context.ignoreUpdates = true
+        setTimeout(() => {
+          this.accessory.context.ignoreUpdates = false
+        }, 1500)
+      }
       await this.platform.sendDeviceUpdate(this.accessory, params)
       switch (switchNumber) {
         case '0':
@@ -287,22 +305,45 @@ module.exports = class deviceOutletMulti {
           const subAccessory = this.devicesInHB.get(uuid)
           const service = subAccessory.getService(this.hapServ.Outlet)
           if (params.switches) {
-            if (params.switches[i - 1].switch === 'on') {
-              primaryState = true
-            }
             const currentState = service.getCharacteristic(this.hapChar.On).value ? 'on' : 'off'
-            if (!params.updateSource || params.switches[i - 1].switch !== currentState) {
-              service.updateCharacteristic(this.hapChar.On, params.switches[i - 1].switch === 'on')
-              subAccessory.eveService.addEntry({
-                status: params.switches[i - 1].switch === 'on' ? 1 : 0
-              })
-              if (params.updateSource && this.enableLogging) {
-                this.log(
-                  '[%s] %s [%s].',
-                  subAccessory.displayName,
-                  this.lang.curState,
-                  params.switches[i - 1].switch
+            if (subAccessory.context.isInched) {
+              if (params.switches[i - 1].switch === 'on' && !subAccessory.context.ignoreUpdates) {
+                subAccessory.context.ignoreUpdates = true
+                setTimeout(() => {
+                  subAccessory.context.ignoreUpdates = false
+                }, 1500)
+                const newState = currentState === 'on' ? 'off' : 'on'
+                if (newState === 'on') {
+                  primaryState = true
+                }
+                service.updateCharacteristic(this.hapChar.On, newState === 'on')
+                subAccessory.eveService.addEntry({
+                  status: newState === 'on' ? 1 : 0
+                })
+                if (params.updateSource && this.enableLogging) {
+                  this.log('[%s] %s [%s].', subAccessory.displayName, this.lang.curState, newState)
+                }
+              }
+            } else {
+              if (params.switches[i - 1].switch === 'on') {
+                primaryState = true
+              }
+              if (!params.updateSource || params.switches[i - 1].switch !== currentState) {
+                service.updateCharacteristic(
+                  this.hapChar.On,
+                  params.switches[i - 1].switch === 'on'
                 )
+                subAccessory.eveService.addEntry({
+                  status: params.switches[i - 1].switch === 'on' ? 1 : 0
+                })
+                if (params.updateSource && this.enableLogging) {
+                  this.log(
+                    '[%s] %s [%s].',
+                    subAccessory.displayName,
+                    this.lang.curState,
+                    params.switches[i - 1].switch
+                  )
+                }
               }
             }
           }
diff --git a/lib/device/switch-multi-inched.js b/lib/device/switch-multi-inched.js
deleted file mode 100644
index fad6121e..00000000
--- a/lib/device/switch-multi-inched.js
+++ /dev/null
@@ -1,287 +0,0 @@
-/* jshint node: true,esversion: 9, -W014, -W033 */
-/* eslint-disable new-cap */
-'use strict'
-
-module.exports = class deviceSwitchMultiInched {
-  constructor (platform, accessory, devicesInHB) {
-    // Set up variables from the platform
-    this.devicesInHB = devicesInHB
-    this.eveChar = platform.eveChar
-    this.funcs = platform.funcs
-    this.hapChar = platform.api.hap.Characteristic
-    this.hapErr = platform.api.hap.HapStatusError
-    this.hapServ = platform.api.hap.Service
-    this.hapUUIDGen = platform.api.hap.uuid.generate
-    this.lang = platform.lang
-    this.log = platform.log
-    this.platform = platform
-
-    // Set up variables from the accessory
-    this.name = accessory.displayName
-    this.accessory = accessory
-
-    // Initially set the online flag as true (to be then updated as false if necessary)
-    this.isOnline = true
-
-    /*
-    UIID 2/3/4/7/8/9/29/30/31/41/82/83/84/113/114/2256/3256/4256: multi switch, no power readings
-    UIID 126: multi switch, with wattage, voltage and amp readings (DUALR3)
-    */
-
-    // Set up custom variables for this device type
-    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
-    this.hideChannels = deviceConf && deviceConf.hideChannels ? deviceConf.hideChannels : undefined
-    this.inUsePowerThreshold =
-      deviceConf && deviceConf.inUsePowerThreshold
-        ? deviceConf.inUsePowerThreshold
-        : platform.consts.defaultValues.inUsePowerThreshold
-
-    // Set the correct logging variables for this accessory
-    this.enableLogging = !platform.config.disableDeviceLogging
-    this.enableDebugLogging = platform.config.debug
-    if (deviceConf && deviceConf.overrideLogging) {
-      switch (deviceConf.overrideLogging) {
-        case 'standard':
-          this.enableLogging = true
-          this.enableDebugLogging = false
-          break
-        case 'debug':
-          this.enableLogging = true
-          this.enableDebugLogging = true
-          break
-        case 'disable':
-          this.enableLogging = false
-          this.enableDebugLogging = false
-          break
-      }
-    }
-
-    // If the accessory has an outlet service then remove it
-    if (this.accessory.getService(this.hapServ.Outlet)) {
-      this.accessory.removeService(this.accessory.getService(this.hapServ.Outlet))
-    }
-
-    // Add the switch service if it doesn't already exist
-    this.service =
-      this.accessory.getService(this.hapServ.Switch) ||
-      this.accessory.addService(this.hapServ.Switch)
-
-    switch (this.accessory.context.eweUIID) {
-      case 126:
-        // Add Eve power characteristics
-        this.powerReadings = true
-        this.isDual = true
-        if (accessory.context.switchNumber !== '0') {
-          if (!this.service.testCharacteristic(this.hapChar.OutletInUse)) {
-            this.service.addCharacteristic(this.hapChar.OutletInUse)
-          }
-          if (!this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
-            this.service.addCharacteristic(this.eveChar.CurrentConsumption)
-          }
-          if (!this.service.testCharacteristic(this.eveChar.ElectricCurrent)) {
-            this.service.addCharacteristic(this.eveChar.ElectricCurrent)
-          }
-          if (!this.service.testCharacteristic(this.eveChar.Voltage)) {
-            this.service.addCharacteristic(this.eveChar.Voltage)
-          }
-        }
-        break
-      default:
-        // Remove unused Eve characteristics
-        if (this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
-          this.service.removeCharacteristic(
-            this.service.getCharacteristic(this.eveChar.CurrentConsumption)
-          )
-        }
-        if (this.service.testCharacteristic(this.eveChar.ElectricCurrent)) {
-          this.service.removeCharacteristic(
-            this.service.getCharacteristic(this.eveChar.ElectricCurrent)
-          )
-        }
-        if (this.service.testCharacteristic(this.eveChar.Voltage)) {
-          this.service.removeCharacteristic(this.service.getCharacteristic(this.eveChar.Voltage))
-        }
-        break
-    }
-
-    // Add the set handler to the switch on/off characteristic
-    this.service
-      .getCharacteristic(this.hapChar.On)
-      .onSet(async value => await this.internalStateUpdate(value))
-      .updateValue(false)
-    this.cacheState = 'off'
-
-    // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
-    if (!platform.config.disableNoResponse) {
-      this.service.getCharacteristic(this.hapChar.On).onGet(() => {
-        if (!this.isOnline) {
-          throw new this.hapErr(-70402)
-        }
-        return this.service.getCharacteristic(this.hapChar.On).value
-      })
-    }
-
-    // Pass the accessory to Fakegato to set up with Eve
-    this.accessory.eveService = new platform.eveService('switch', this.accessory, {
-      log: platform.config.debugFakegato ? this.log : () => {}
-    })
-
-    // Set up extra features for outlets that provide power readings
-    if (
-      this.powerReadings &&
-      accessory.context.switchNumber === '0' &&
-      platform.config.mode !== 'lan'
-    ) {
-      // Set up an interval to get eWeLink to send power updates
-      setTimeout(() => {
-        this.internalUIUpdate()
-        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
-      }, 5000)
-
-      // Stop the intervals on Homebridge shutdown
-      platform.api.on('shutdown', () => {
-        clearInterval(this.intervalPoll)
-      })
-    }
-
-    // Output the customised options to the log
-    if (accessory.context.switchNumber === '0') {
-      const opts = JSON.stringify({
-        inUsePowerThreshold: this.inUsePowerThreshold,
-        isInched: true,
-        hideChannels: this.hideChannels,
-        logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
-        showAs: 'default'
-      })
-      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
-    }
-  }
-
-  async internalStateUpdate (value) {
-    try {
-      const newValue = !this.service.getCharacteristic(this.hapChar.On).value
-      const params = {
-        switches: [
-          {
-            switch: 'on',
-            outlet: this.accessory.context.switchNumber - 1
-          }
-        ]
-      }
-      this.ignoreUpdates = true
-      setTimeout(() => {
-        this.ignoreUpdates = false
-      }, 1500)
-      await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.accessory.eveService.addEntry({ status: newValue ? 1 : 0 })
-      if (this.enableLogging) {
-        this.log('[%s] %s [%s].', this.name, this.lang.curState, newValue ? 'on' : 'off')
-      }
-    } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
-      setTimeout(() => {
-        this.service.updateCharacteristic(this.hapChar.On, !value)
-      }, 2000)
-      throw new this.hapErr(-70402)
-    }
-  }
-
-  async internalUIUpdate () {
-    try {
-      // Skip polling if device isn't online
-      if (!this.isOnline) {
-        return
-      }
-
-      // Send the params to request the updates
-      await this.platform.sendDeviceUpdate(this.accessory, { uiActive: { outlet: 0, time: 120 } })
-      await this.funcs.sleep(2000)
-      await this.platform.sendDeviceUpdate(this.accessory, { uiActive: { outlet: 1, time: 120 } })
-    } catch (err) {
-      // Suppress errors here
-    }
-  }
-
-  async externalUpdate (params) {
-    try {
-      const idToCheck = this.accessory.context.eweDeviceId + 'SW'
-      for (let i = 1; i <= this.accessory.context.channelCount; i++) {
-        const uuid = this.hapUUIDGen(idToCheck + i)
-        if (this.devicesInHB.has(uuid)) {
-          const subAccessory = this.devicesInHB.get(uuid)
-          const service = subAccessory.getService(this.hapServ.Switch)
-          if (params.switches && params.switches[i - 1].switch === 'on') {
-            if (!this.ignoreUpdates) {
-              this.ignoreUpdates = true
-              setTimeout(() => {
-                this.ignoreUpdates = false
-              }, 1500)
-              const newState = !service.getCharacteristic(this.hapChar.On).value
-              service.updateCharacteristic(this.hapChar.On, newState)
-              subAccessory.eveService.addEntry({ status: newState ? 1 : 0 })
-              if (params.updateSource && this.enableLogging) {
-                this.log(
-                  '[%s] %s [%s].',
-                  subAccessory.displayName,
-                  this.lang.curState,
-                  newState ? 'on' : 'off'
-                )
-              }
-            }
-          }
-          if (!this.powerReadings) {
-            continue
-          }
-          let logger = false
-          let power
-          let voltage
-          let current
-          if (this.funcs.hasProperty(params, 'actPow_0' + (i - 1))) {
-            power = parseInt(params['actPow_0' + (i - 1)]) / 100
-            const currentState = service.getCharacteristic(this.hapChar.On).value ? 'on' : 'off'
-            service.updateCharacteristic(this.eveChar.CurrentConsumption, power)
-            service.updateCharacteristic(
-              this.hapChar.OutletInUse,
-              currentState === 'on' && power > this.inUsePowerThreshold
-            )
-            logger = true
-          }
-          if (this.funcs.hasProperty(params, 'voltage_0' + (i - 1))) {
-            voltage = parseInt(params['voltage_0' + (i - 1)]) / 100
-            service.updateCharacteristic(this.eveChar.Voltage, voltage)
-            logger = true
-          }
-          if (this.funcs.hasProperty(params, 'current_0' + (i - 1))) {
-            current = parseInt(params['current_0' + (i - 1)]) / 100
-            service.updateCharacteristic(this.eveChar.ElectricCurrent, current)
-            logger = true
-          }
-          if (params.updateSource && logger && this.enableLogging) {
-            this.log(
-              '[%s] %s%s%s.',
-              subAccessory.displayName,
-              power !== undefined ? this.lang.curPower + ' [' + power + 'W]' : '',
-              voltage !== undefined ? ' ' + this.lang.curVolt + ' [' + voltage + 'V]' : '',
-              current !== undefined ? ' ' + this.lang.curCurr + ' [' + current + 'A]' : ''
-            )
-          }
-        }
-      }
-    } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, false)
-    }
-  }
-
-  markStatus (isOnline) {
-    this.isOnline = isOnline
-  }
-
-  currentState () {
-    const toReturn = {}
-    toReturn.services = ['switch']
-    toReturn.switch = {
-      state: this.service.getCharacteristic(this.hapChar.On).value ? 'on' : 'off'
-    }
-    return toReturn
-  }
-}

From 1f481da97c18c095b05f2fcb4bc27546445e1b4e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 17 Aug 2021 12:37:20 +0100
Subject: [PATCH 2624/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 15de8a68..271339ba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,13 @@
 
 All notable changes to homebridge-ewelink will be documented in this file.
 
+## BETA
+
+### Added
+
+- `inchChannels` option for multi-channel switches and outlets (where the plugin will set on/off status based on inching)
+- `language` option to have the plugin log in French, thanks to @jp-lno
+
 ## 8.0.2 (2021-08-12)
 
 ### Changed

From f9bd51696691271f6f243ea4b49e7dc34a2ee2e9 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 17 Aug 2021 12:40:12 +0100
Subject: [PATCH 2625/3183] 8.0.3-beta.3

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index caab5e41..7b602c85 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.0.3-beta.2",
+  "version": "8.0.3-beta.3",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.0.3-beta.2",
+      "version": "8.0.3-beta.3",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 3ce30506..e730933e 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.0.3-beta.2",
+  "version": "8.0.3-beta.3",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 230f4b6f31520a77e1da9ccf980735fe21cc139d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 17 Aug 2021 12:51:58 +0100
Subject: [PATCH 2626/3183] fix title for language

---
 config.schema.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config.schema.json b/config.schema.json
index 3e674a9f..a04629b7 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -28,7 +28,7 @@
       },
       "language": {
         "type": "string",
-        "title": "Connection Mode",
+        "title": "Logging Language",
         "description": "Language to use for logging.",
         "default": "en",
         "oneOf": [

From 168f7d5abce4ac391884501afd78272e50f323e8 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 17 Aug 2021 12:52:20 +0100
Subject: [PATCH 2627/3183] 8.0.3-beta.4

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 7b602c85..77e764f8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.0.3-beta.3",
+  "version": "8.0.3-beta.4",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.0.3-beta.3",
+      "version": "8.0.3-beta.4",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index e730933e..6fc4338f 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.0.3-beta.3",
+  "version": "8.0.3-beta.4",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From e8395015897554dcf7a12cd371f15190bef1df52 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 17 Aug 2021 16:46:00 +0100
Subject: [PATCH 2628/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 271339ba..0802d0db 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 All notable changes to homebridge-ewelink will be documented in this file.
 
-## BETA
+## 8.1.0 (2021-08-17)
 
 ### Added
 

From 2416834771029b14825d3c38d0a375cb33065ce6 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 17 Aug 2021 16:46:19 +0100
Subject: [PATCH 2629/3183] 8.1.0

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 77e764f8..6acfd48f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.0.3-beta.4",
+  "version": "8.1.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.0.3-beta.4",
+      "version": "8.1.0",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 6fc4338f..6309432c 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.0.3-beta.4",
+  "version": "8.1.0",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From d0374ef7fa62dca3a5ea5150461427a173d14e13 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 20 Aug 2021 11:05:47 +0100
Subject: [PATCH 2630/3183] Update package-lock.json

---
 package-lock.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 6acfd48f..e3bb9224 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -132,9 +132,9 @@
       "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="
     },
     "node_modules/follow-redirects": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.1.tgz",
-      "integrity": "sha512-HWqDgT7ZEkqRzBvc2s64vSZ/hfOceEol3ac/7tKwzuvEyWx3/4UegXh5oBOIotkGsObyk3xznnSRVADBgWSQVg==",
+      "version": "1.14.2",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.2.tgz",
+      "integrity": "sha512-yLR6WaE2lbF0x4K2qE2p9PEXKLDjUjnR/xmjS3wHAYxtlsI9MLLBJUZirAHKzUZDGLxje7w/cXR49WOUo4rbsA==",
       "funding": [
         {
           "type": "individual",
@@ -628,9 +628,9 @@
       "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="
     },
     "follow-redirects": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.1.tgz",
-      "integrity": "sha512-HWqDgT7ZEkqRzBvc2s64vSZ/hfOceEol3ac/7tKwzuvEyWx3/4UegXh5oBOIotkGsObyk3xznnSRVADBgWSQVg=="
+      "version": "1.14.2",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.2.tgz",
+      "integrity": "sha512-yLR6WaE2lbF0x4K2qE2p9PEXKLDjUjnR/xmjS3wHAYxtlsI9MLLBJUZirAHKzUZDGLxje7w/cXR49WOUo4rbsA=="
     },
     "function-bind": {
       "version": "1.1.1",

From 91c04440af67ca78630705a35ec0e0b4fc7e7540 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 22 Aug 2021 09:15:57 +0100
Subject: [PATCH 2631/3183] some backend renaming, add UIID 138, 139, 140, 141

---
 lib/device/outlet-multi.js            | 69 +++++++++++++--------------
 lib/device/outlet-single-inched.js    |  2 +-
 lib/device/outlet-single.js           |  2 +-
 lib/device/simulation/blind.js        |  2 +-
 lib/device/simulation/door.js         |  2 +-
 lib/device/simulation/doorbell.js     | 22 ++++-----
 lib/device/simulation/garage-one.js   | 28 +++++------
 lib/device/simulation/garage-two.js   |  2 +-
 lib/device/simulation/lock-one.js     | 26 +++++-----
 lib/device/simulation/p-button.js     | 22 ++++-----
 lib/device/simulation/purifier.js     | 30 ++++++------
 lib/device/simulation/sensor.js       | 26 +++++-----
 lib/device/simulation/switch-valve.js |  2 +-
 lib/device/simulation/tap-one.js      | 30 ++++++------
 lib/device/simulation/tap-two.js      |  2 +-
 lib/device/simulation/valve-one.js    | 30 ++++++------
 lib/device/simulation/valve-two.js    |  2 +-
 lib/device/simulation/window.js       |  2 +-
 lib/device/switch-multi.js            | 61 +++++++++++------------
 lib/device/switch-single-inched.js    |  2 +-
 lib/device/switch-single.js           |  2 +-
 lib/index.js                          |  8 ++--
 lib/utils/constants.js                | 39 +++++++++++----
 23 files changed, 214 insertions(+), 199 deletions(-)

diff --git a/lib/device/outlet-multi.js b/lib/device/outlet-multi.js
index 22a97b15..ccd6d109 100644
--- a/lib/device/outlet-multi.js
+++ b/lib/device/outlet-multi.js
@@ -70,47 +70,42 @@ module.exports = class deviceOutletMulti {
       this.accessory.getService(this.hapServ.Outlet) ||
       this.accessory.addService(this.hapServ.Outlet)
 
-    switch (this.accessory.context.eweUIID) {
-      case 126:
-        // Add Eve power characteristics
-        this.powerReadings = true
-        this.isDual = true
-        if (accessory.context.switchNumber !== '0') {
-          if (!this.service.testCharacteristic(this.hapChar.OutletInUse)) {
-            this.service.addCharacteristic(this.hapChar.OutletInUse)
-          }
-          if (!this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
-            this.service.addCharacteristic(this.eveChar.CurrentConsumption)
-          }
-          if (!this.service.testCharacteristic(this.eveChar.ElectricCurrent)) {
-            this.service.addCharacteristic(this.eveChar.ElectricCurrent)
-          }
-          if (!this.service.testCharacteristic(this.eveChar.Voltage)) {
-            this.service.addCharacteristic(this.eveChar.Voltage)
-          }
-        }
-        break
-      default:
-        // Remove unused Eve characteristics
-        if (this.service.testCharacteristic(this.hapChar.OutletInUse)) {
-          this.service.removeCharacteristic(
-            this.service.getCharacteristic(this.eveChar.OutletInUse)
-          )
+    if (platform.consts.devices.switchMultiPower.includes(this.accessory.context.eweUIID)) {
+      // Add Eve power characteristics
+      this.powerReadings = true
+      this.isDual = true
+      if (accessory.context.switchNumber !== '0') {
+        if (!this.service.testCharacteristic(this.hapChar.OutletInUse)) {
+          this.service.addCharacteristic(this.hapChar.OutletInUse)
         }
-        if (this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
-          this.service.removeCharacteristic(
-            this.service.getCharacteristic(this.eveChar.CurrentConsumption)
-          )
+        if (!this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
+          this.service.addCharacteristic(this.eveChar.CurrentConsumption)
         }
-        if (this.service.testCharacteristic(this.eveChar.ElectricCurrent)) {
-          this.service.removeCharacteristic(
-            this.service.getCharacteristic(this.eveChar.ElectricCurrent)
-          )
+        if (!this.service.testCharacteristic(this.eveChar.ElectricCurrent)) {
+          this.service.addCharacteristic(this.eveChar.ElectricCurrent)
         }
-        if (this.service.testCharacteristic(this.eveChar.Voltage)) {
-          this.service.removeCharacteristic(this.service.getCharacteristic(this.eveChar.Voltage))
+        if (!this.service.testCharacteristic(this.eveChar.Voltage)) {
+          this.service.addCharacteristic(this.eveChar.Voltage)
         }
-        break
+      }
+    } else {
+      // Remove unused Eve characteristics
+      if (this.service.testCharacteristic(this.hapChar.OutletInUse)) {
+        this.service.removeCharacteristic(this.service.getCharacteristic(this.eveChar.OutletInUse))
+      }
+      if (this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
+        this.service.removeCharacteristic(
+          this.service.getCharacteristic(this.eveChar.CurrentConsumption)
+        )
+      }
+      if (this.service.testCharacteristic(this.eveChar.ElectricCurrent)) {
+        this.service.removeCharacteristic(
+          this.service.getCharacteristic(this.eveChar.ElectricCurrent)
+        )
+      }
+      if (this.service.testCharacteristic(this.eveChar.Voltage)) {
+        this.service.removeCharacteristic(this.service.getCharacteristic(this.eveChar.Voltage))
+      }
     }
 
     // Add the set handler to the outlet on/off characteristic
diff --git a/lib/device/outlet-single-inched.js b/lib/device/outlet-single-inched.js
index 3f4cec72..1affe2f1 100644
--- a/lib/device/outlet-single-inched.js
+++ b/lib/device/outlet-single-inched.js
@@ -116,7 +116,7 @@ module.exports = class deviceOutletSingleInched {
         break
       default:
         // Set a flag for devices with hardware that use multi-channel format
-        if (platform.consts.devices.outletSCM.includes(this.accessory.context.eweUIID)) {
+        if (platform.consts.devices.switchSCM.includes(this.accessory.context.eweUIID)) {
           this.isSCM = true
         }
 
diff --git a/lib/device/outlet-single.js b/lib/device/outlet-single.js
index ce3a9119..7e242c85 100644
--- a/lib/device/outlet-single.js
+++ b/lib/device/outlet-single.js
@@ -116,7 +116,7 @@ module.exports = class deviceOutletSingle {
         break
       default:
         // Set a flag for devices with hardware that use multi-channel format
-        if (platform.consts.devices.outletSCM.includes(this.accessory.context.eweUIID)) {
+        if (platform.consts.devices.switchSCM.includes(this.accessory.context.eweUIID)) {
           this.isSCM = true
         }
 
diff --git a/lib/device/simulation/blind.js b/lib/device/simulation/blind.js
index 18bbb71c..5900e0de 100644
--- a/lib/device/simulation/blind.js
+++ b/lib/device/simulation/blind.js
@@ -62,7 +62,7 @@ module.exports = class deviceBlind {
     }
 
     // Certain devices give power readings
-    if (this.accessory.context.eweUIID === 126) {
+    if (platform.consts.devices.switchMultiPower.includes(this.accessory.context.eweUIID)) {
       // Add Eve power characteristics
       this.powerReadings = true
       if (!this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
diff --git a/lib/device/simulation/door.js b/lib/device/simulation/door.js
index 7bb8d569..da639757 100644
--- a/lib/device/simulation/door.js
+++ b/lib/device/simulation/door.js
@@ -62,7 +62,7 @@ module.exports = class deviceDoor {
     }
 
     // Certain devices give power readings
-    if (this.accessory.context.eweUIID === 126) {
+    if (platform.consts.devices.switchMultiPower.includes(this.accessory.context.eweUIID)) {
       // Add Eve power characteristics
       this.powerReadings = true
       if (!this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
diff --git a/lib/device/simulation/doorbell.js b/lib/device/simulation/doorbell.js
index 5d05061d..4333a5ac 100644
--- a/lib/device/simulation/doorbell.js
+++ b/lib/device/simulation/doorbell.js
@@ -55,20 +55,20 @@ module.exports = class deviceDoorbell {
       this.accessory.addService(this.hapServ.Doorbell)
 
     // Set up the device type and power readings if necessary
-    if (platform.consts.devices.singleSwitch.includes(this.accessory.context.eweUIID)) {
-      this.setup = 'singleSwitch'
-    } else if (platform.consts.devices.outlet.includes(this.accessory.context.eweUIID)) {
-      this.setup = 'singleSwitch'
+    if (platform.consts.devices.switchSingle.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'switchSingle'
+    } else if (platform.consts.devices.switchSinglePower.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'switchSingle'
       this.powerReadings = true
-    } else if (platform.consts.devices.multiSwitch.includes(this.accessory.context.eweUIID)) {
-      this.setup = 'multiSwitch'
-      if (this.accessory.context.eweUIID === 126) {
+    } else if (platform.consts.devices.switchMulti.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'switchMulti'
+      if (platform.consts.devices.switchMultiPower.includes(this.accessory.context.eweUIID)) {
         // Add Eve power characteristics
         this.powerReadings = true
         this.isDualR3 = true
       }
-    } else if (platform.consts.devices.outletSCM.includes(this.accessory.context.eweUIID)) {
-      this.setup = 'multiSwitch'
+    } else if (platform.consts.devices.switchSCM.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'switchMulti'
     }
 
     // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
@@ -127,8 +127,8 @@ module.exports = class deviceDoorbell {
     try {
       if (!this.inUse) {
         if (
-          (this.setup === 'multiSwitch' && params.switches && params.switches[0].switch === 'on') ||
-          (this.setup === 'singleSwitch' && params.switch && params.switch === 'on')
+          (this.setup === 'switchMulti' && params.switches && params.switches[0].switch === 'on') ||
+          (this.setup === 'switchSingle' && params.switch && params.switch === 'on')
         ) {
           this.inUse = true
           setTimeout(() => {
diff --git a/lib/device/simulation/garage-one.js b/lib/device/simulation/garage-one.js
index 68e3df1b..d9c06ba4 100644
--- a/lib/device/simulation/garage-one.js
+++ b/lib/device/simulation/garage-one.js
@@ -87,10 +87,10 @@ module.exports = class deviceGarageOne {
     }
 
     // Set up the device type and power readings if necessary
-    if (platform.consts.devices.singleSwitch.includes(this.accessory.context.eweUIID)) {
-      this.setup = 'singleSwitch'
-    } else if (platform.consts.devices.outlet.includes(this.accessory.context.eweUIID)) {
-      this.setup = 'singleSwitch'
+    if (platform.consts.devices.switchSingle.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'switchSingle'
+    } else if (platform.consts.devices.switchSinglePower.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'switchSingle'
 
       // Add Eve power characteristics
       this.powerReadings = true
@@ -105,9 +105,9 @@ module.exports = class deviceGarageOne {
           this.service.addCharacteristic(this.eveChar.Voltage)
         }
       }
-    } else if (platform.consts.devices.multiSwitch.includes(this.accessory.context.eweUIID)) {
-      this.setup = 'multiSwitch'
-      if (this.accessory.context.eweUIID === 126) {
+    } else if (platform.consts.devices.switchMulti.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'switchMulti'
+      if (platform.consts.devices.switchMultiPower.includes(this.accessory.context.eweUIID)) {
         // Add Eve power characteristics
         this.powerReadings = true
         if (!this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
@@ -121,8 +121,8 @@ module.exports = class deviceGarageOne {
         }
         this.isDualR3 = true
       }
-    } else if (platform.consts.devices.outletSCM.includes(this.accessory.context.eweUIID)) {
-      this.setup = 'multiSwitch'
+    } else if (platform.consts.devices.switchSCM.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'switchMulti'
     }
 
     // Add the set handler to the garage door reset total characteristic
@@ -194,7 +194,7 @@ module.exports = class deviceGarageOne {
       }
       this.inUse = true
       this.cacheState = value
-      if (this.setup === 'singleSwitch' && [2, 3].includes(prevState)) {
+      if (this.setup === 'switchSingle' && [2, 3].includes(prevState)) {
         this.service.updateCharacteristic(this.hapChar.CurrentDoorState, ((prevState * 2) % 3) + 2)
         delay = 1500
       }
@@ -205,10 +205,10 @@ module.exports = class deviceGarageOne {
       this.service.updateCharacteristic(this.hapChar.TargetDoorState, newPos)
       this.service.updateCharacteristic(this.hapChar.CurrentDoorState, newPos + 2)
       switch (this.setup) {
-        case 'singleSwitch':
+        case 'switchSingle':
           params.switch = 'on'
           break
-        case 'multiSwitch':
+        case 'switchMulti':
           params.switches = [
             {
               switch: newPos === 0 ? 'on' : 'off',
@@ -333,14 +333,14 @@ module.exports = class deviceGarageOne {
       if (!this.inUse && !this.definedSensor) {
         const prevState = this.service.getCharacteristic(this.hapChar.CurrentDoorState).value
         const newPos = [0, 2].includes(prevState) ? 3 : 2
-        if (this.setup === 'multiSwitch' && params.switches) {
+        if (this.setup === 'switchMulti' && params.switches) {
           if (
             params.switches[0].switch === params.switches[1].switch ||
             params.switches[prevState % 2].switch === 'on'
           ) {
             return
           }
-        } else if (this.setup === 'singleSwitch' && params.switch) {
+        } else if (this.setup === 'switchSingle' && params.switch) {
           if (params.switch === 'off') {
             return
           }
diff --git a/lib/device/simulation/garage-two.js b/lib/device/simulation/garage-two.js
index 9c0b2ba6..258bf130 100644
--- a/lib/device/simulation/garage-two.js
+++ b/lib/device/simulation/garage-two.js
@@ -55,7 +55,7 @@ module.exports = class deviceGarageTwo {
     }
 
     // Certain devices give power readings
-    if (this.accessory.context.eweUIID === 126) {
+    if (platform.consts.devices.switchMultiPower.includes(this.accessory.context.eweUIID)) {
       this.powerReadings = true
     }
 
diff --git a/lib/device/simulation/lock-one.js b/lib/device/simulation/lock-one.js
index 83c87ffe..9f8768a9 100644
--- a/lib/device/simulation/lock-one.js
+++ b/lib/device/simulation/lock-one.js
@@ -61,10 +61,10 @@ module.exports = class deviceLockOne {
       this.accessory.addService(this.hapServ.LockMechanism)
 
     // Set up the device type and power readings if necessary
-    if (platform.consts.devices.singleSwitch.includes(this.accessory.context.eweUIID)) {
-      this.setup = 'singleSwitch'
-    } else if (platform.consts.devices.outlet.includes(this.accessory.context.eweUIID)) {
-      this.setup = 'singleSwitch'
+    if (platform.consts.devices.switchSingle.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'switchSingle'
+    } else if (platform.consts.devices.switchSinglePower.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'switchSingle'
 
       // Add Eve power characteristics
       this.powerReadings = true
@@ -79,9 +79,9 @@ module.exports = class deviceLockOne {
           this.service.addCharacteristic(this.eveChar.Voltage)
         }
       }
-    } else if (platform.consts.devices.multiSwitch.includes(this.accessory.context.eweUIID)) {
-      this.setup = 'multiSwitch'
-      if (this.accessory.context.eweUIID === 126) {
+    } else if (platform.consts.devices.switchMulti.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'switchMulti'
+      if (platform.consts.devices.switchMultiPower.includes(this.accessory.context.eweUIID)) {
         // Add Eve power characteristics
         this.powerReadings = true
         if (!this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
@@ -95,8 +95,8 @@ module.exports = class deviceLockOne {
         }
         this.isDualR3 = true
       }
-    } else if (platform.consts.devices.outletSCM.includes(this.accessory.context.eweUIID)) {
-      this.setup = 'multiSwitch'
+    } else if (platform.consts.devices.switchSCM.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'switchMulti'
     }
 
     // Add the set handler to the lock target state characteristic
@@ -161,10 +161,10 @@ module.exports = class deviceLockOne {
 
       const params = {}
       switch (this.setup) {
-        case 'singleSwitch':
+        case 'switchSingle':
           params.switch = 'on'
           break
-        case 'multiSwitch':
+        case 'switchMulti':
           params.switches = [
             {
               switch: 'on',
@@ -240,8 +240,8 @@ module.exports = class deviceLockOne {
     try {
       if (!this.inUse) {
         if (
-          (this.setup === 'multiSwitch' && params.switches && params.switches[0].switch === 'on') ||
-          (this.setup === 'singleSwitch' && params.switch && params.switch === 'on')
+          (this.setup === 'switchMulti' && params.switches && params.switches[0].switch === 'on') ||
+          (this.setup === 'switchSingle' && params.switch && params.switch === 'on')
         ) {
           if (this.definedSensor) {
             this.internalSensorCheck()
diff --git a/lib/device/simulation/p-button.js b/lib/device/simulation/p-button.js
index 37eb5955..22c7e124 100644
--- a/lib/device/simulation/p-button.js
+++ b/lib/device/simulation/p-button.js
@@ -60,10 +60,10 @@ module.exports = class devicePButton {
     })
 
     // Set up the device type and power readings if necessary
-    if (platform.consts.devices.singleSwitch.includes(this.accessory.context.eweUIID)) {
-      this.setup = 'singleSwitch'
-    } else if (platform.consts.devices.outlet.includes(this.accessory.context.eweUIID)) {
-      this.setup = 'singleSwitch'
+    if (platform.consts.devices.switchSingle.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'switchSingle'
+    } else if (platform.consts.devices.switchSinglePower.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'switchSingle'
 
       // Add Eve power characteristics
       this.powerReadings = true
@@ -78,9 +78,9 @@ module.exports = class devicePButton {
           this.service.addCharacteristic(this.eveChar.Voltage)
         }
       }
-    } else if (platform.consts.devices.multiSwitch.includes(this.accessory.context.eweUIID)) {
-      this.setup = 'multiSwitch'
-      if (this.accessory.context.eweUIID === 126) {
+    } else if (platform.consts.devices.switchMulti.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'switchMulti'
+      if (platform.consts.devices.switchMultiPower.includes(this.accessory.context.eweUIID)) {
         // Add Eve power characteristics
         this.powerReadings = true
         if (!this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
@@ -94,8 +94,8 @@ module.exports = class devicePButton {
         }
         this.isDualR3 = true
       }
-    } else if (platform.consts.devices.outletSCM.includes(this.accessory.context.eweUIID)) {
-      this.setup = 'multiSwitch'
+    } else if (platform.consts.devices.switchSCM.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'switchMulti'
     }
 
     // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
@@ -154,8 +154,8 @@ module.exports = class devicePButton {
     try {
       if (!this.inUse) {
         if (
-          (this.setup === 'multiSwitch' && params.switches && params.switches[0].switch === 'on') ||
-          (this.setup === 'singleSwitch' && params.switch && params.switch === 'on')
+          (this.setup === 'switchMulti' && params.switches && params.switches[0].switch === 'on') ||
+          (this.setup === 'switchSingle' && params.switch && params.switch === 'on')
         ) {
           this.inUse = true
           setTimeout(() => {
diff --git a/lib/device/simulation/purifier.js b/lib/device/simulation/purifier.js
index 7d198522..ddb0e346 100644
--- a/lib/device/simulation/purifier.js
+++ b/lib/device/simulation/purifier.js
@@ -59,10 +59,10 @@ module.exports = class devicePurifier {
       this.accessory.addService(this.hapServ.AirPurifier)
 
     // Set up the device type and power readings if necessary
-    if (platform.consts.devices.singleSwitch.includes(this.accessory.context.eweUIID)) {
-      this.setup = 'singleSwitch'
-    } else if (platform.consts.devices.outlet.includes(this.accessory.context.eweUIID)) {
-      this.setup = 'singleSwitch'
+    if (platform.consts.devices.switchSingle.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'switchSingle'
+    } else if (platform.consts.devices.switchSinglePower.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'switchSingle'
 
       // Add Eve power characteristics
       this.powerReadings = true
@@ -77,9 +77,9 @@ module.exports = class devicePurifier {
           this.service.addCharacteristic(this.eveChar.Voltage)
         }
       }
-    } else if (platform.consts.devices.multiSwitch.includes(this.accessory.context.eweUIID)) {
-      this.setup = 'multiSwitch'
-      if (this.accessory.context.eweUIID === 126) {
+    } else if (platform.consts.devices.switchMulti.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'switchMulti'
+      if (platform.consts.devices.switchMultiPower.includes(this.accessory.context.eweUIID)) {
         // Add Eve power characteristics
         this.powerReadings = true
         if (!this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
@@ -93,8 +93,8 @@ module.exports = class devicePurifier {
         }
         this.isDualR3 = true
       }
-    } else if (platform.consts.devices.outletSCM.includes(this.accessory.context.eweUIID)) {
-      this.setup = 'multiSwitch'
+    } else if (platform.consts.devices.switchSCM.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'switchMulti'
     }
 
     // Add the set handler to the purifier active characteristic
@@ -162,10 +162,10 @@ module.exports = class devicePurifier {
     try {
       const params = {}
       switch (this.setup) {
-        case 'singleSwitch':
+        case 'switchSingle':
           params.switch = value === 1 ? 'on' : 'off'
           break
-        case 'multiSwitch':
+        case 'switchMulti':
           params.switches = [
             {
               switch: value === 1 ? 'on' : 'off',
@@ -212,13 +212,13 @@ module.exports = class devicePurifier {
   async externalUpdate (params) {
     try {
       if (
-        (this.setup === 'multiSwitch' && params.switches) ||
-        (this.setup === 'singleSwitch' && params.switch)
+        (this.setup === 'switchMulti' && params.switches) ||
+        (this.setup === 'switchSingle' && params.switch)
       ) {
         let newState
-        if (this.setup === 'multiSwitch' && params.switches) {
+        if (this.setup === 'switchMulti' && params.switches) {
           newState = params.switches[0].switch
-        } else if (this.setup === 'singleSwitch' && params.switch) {
+        } else if (this.setup === 'switchSingle' && params.switch) {
           newState = params.switch
         }
         if (newState && newState !== this.cacheState) {
diff --git a/lib/device/simulation/sensor.js b/lib/device/simulation/sensor.js
index 58d17e57..223b9533 100644
--- a/lib/device/simulation/sensor.js
+++ b/lib/device/simulation/sensor.js
@@ -109,10 +109,10 @@ module.exports = class deviceSensor {
     }
 
     // Set up the device type and power readings if necessary
-    if (platform.consts.devices.singleSwitch.includes(this.accessory.context.eweUIID)) {
-      this.setup = 'singleSwitch'
-    } else if (platform.consts.devices.outlet.includes(this.accessory.context.eweUIID)) {
-      this.setup = 'singleSwitch'
+    if (platform.consts.devices.switchSingle.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'switchSingle'
+    } else if (platform.consts.devices.switchSinglePower.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'switchSingle'
 
       // Add Eve power characteristics
       this.powerReadings = true
@@ -127,9 +127,9 @@ module.exports = class deviceSensor {
           this.service.addCharacteristic(this.eveChar.Voltage)
         }
       }
-    } else if (platform.consts.devices.multiSwitch.includes(this.accessory.context.eweUIID)) {
-      this.setup = 'multiSwitch'
-      if (this.accessory.context.eweUIID === 126) {
+    } else if (platform.consts.devices.switchMulti.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'switchMulti'
+      if (platform.consts.devices.switchMultiPower.includes(this.accessory.context.eweUIID)) {
         // Add Eve power characteristics
         this.powerReadings = true
         if (!this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
@@ -143,8 +143,8 @@ module.exports = class deviceSensor {
         }
         this.isDualR3 = true
       }
-    } else if (platform.consts.devices.outletSCM.includes(this.accessory.context.eweUIID)) {
-      this.setup = 'multiSwitch'
+    } else if (platform.consts.devices.switchSCM.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'switchMulti'
     }
 
     // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
@@ -208,13 +208,13 @@ module.exports = class deviceSensor {
   async externalUpdate (params) {
     try {
       if (
-        (this.setup === 'multiSwitch' && params.switches) ||
-        (this.setup === 'singleSwitch' && params.switch)
+        (this.setup === 'switchMulti' && params.switches) ||
+        (this.setup === 'switchSingle' && params.switch)
       ) {
         let newState
-        if (this.setup === 'multiSwitch' && params.switches) {
+        if (this.setup === 'switchMulti' && params.switches) {
           newState = params.switches[0].switch
-        } else if (this.setup === 'singleSwitch' && params.switch) {
+        } else if (this.setup === 'switchSingle' && params.switch) {
           newState = params.switch
         }
         if (newState && newState !== this.cacheState) {
diff --git a/lib/device/simulation/switch-valve.js b/lib/device/simulation/switch-valve.js
index 5682f9ba..9e14bd14 100644
--- a/lib/device/simulation/switch-valve.js
+++ b/lib/device/simulation/switch-valve.js
@@ -60,7 +60,7 @@ module.exports = class deviceSwitchValve {
     }
 
     // Certain devices give power readings
-    if (this.accessory.context.eweUIID === 126) {
+    if (platform.consts.devices.switchMultiPower.includes(this.accessory.context.eweUIID)) {
       // Add Eve power characteristics
       this.powerReadings = true
       if (!this.sService.testCharacteristic(this.eveChar.CurrentConsumption)) {
diff --git a/lib/device/simulation/tap-one.js b/lib/device/simulation/tap-one.js
index 5e31f10d..cb475469 100644
--- a/lib/device/simulation/tap-one.js
+++ b/lib/device/simulation/tap-one.js
@@ -58,10 +58,10 @@ module.exports = class deviceTapOne {
     }
 
     // Set up the device type and power readings if necessary
-    if (platform.consts.devices.singleSwitch.includes(this.accessory.context.eweUIID)) {
-      this.setup = 'singleSwitch'
-    } else if (platform.consts.devices.outlet.includes(this.accessory.context.eweUIID)) {
-      this.setup = 'singleSwitch'
+    if (platform.consts.devices.switchSingle.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'switchSingle'
+    } else if (platform.consts.devices.switchSinglePower.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'switchSingle'
 
       // Add Eve power characteristics
       this.powerReadings = true
@@ -76,9 +76,9 @@ module.exports = class deviceTapOne {
           this.service.addCharacteristic(this.eveChar.Voltage)
         }
       }
-    } else if (platform.consts.devices.multiSwitch.includes(this.accessory.context.eweUIID)) {
-      this.setup = 'multiSwitch'
-      if (this.accessory.context.eweUIID === 126) {
+    } else if (platform.consts.devices.switchMulti.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'switchMulti'
+      if (platform.consts.devices.switchMultiPower.includes(this.accessory.context.eweUIID)) {
         // Add Eve power characteristics
         this.powerReadings = true
         if (!this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
@@ -92,8 +92,8 @@ module.exports = class deviceTapOne {
         }
         this.isDualR3 = true
       }
-    } else if (platform.consts.devices.outletSCM.includes(this.accessory.context.eweUIID)) {
-      this.setup = 'multiSwitch'
+    } else if (platform.consts.devices.switchSCM.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'switchMulti'
     }
 
     // Add the set handler to the tap active characteristic
@@ -139,10 +139,10 @@ module.exports = class deviceTapOne {
     try {
       const params = {}
       switch (this.setup) {
-        case 'singleSwitch':
+        case 'switchSingle':
           params.switch = value ? 'on' : 'off'
           break
-        case 'multiSwitch':
+        case 'switchMulti':
           params.switches = [
             {
               switch: value ? 'on' : 'off',
@@ -194,13 +194,13 @@ module.exports = class deviceTapOne {
   async externalUpdate (params) {
     try {
       if (
-        (this.setup === 'multiSwitch' && params.switches) ||
-        (this.setup === 'singleSwitch' && params.switch)
+        (this.setup === 'switchMulti' && params.switches) ||
+        (this.setup === 'switchSingle' && params.switch)
       ) {
         let newState
-        if (this.setup === 'multiSwitch' && params.switches) {
+        if (this.setup === 'switchMulti' && params.switches) {
           newState = params.switches[0].switch
-        } else if (this.setup === 'singleSwitch' && params.switch) {
+        } else if (this.setup === 'switchSingle' && params.switch) {
           newState = params.switch
         }
         if (newState && newState !== this.cacheState) {
diff --git a/lib/device/simulation/tap-two.js b/lib/device/simulation/tap-two.js
index 4c112795..467f0591 100644
--- a/lib/device/simulation/tap-two.js
+++ b/lib/device/simulation/tap-two.js
@@ -45,7 +45,7 @@ module.exports = class deviceTapTwo {
     }
 
     // Certain devices give power readings
-    if (this.accessory.context.eweUIID === 126) {
+    if (platform.consts.devices.switchMultiPower.includes(this.accessory.context.eweUIID)) {
       this.powerReadings = true
     }
 
diff --git a/lib/device/simulation/valve-one.js b/lib/device/simulation/valve-one.js
index f526f699..4e06e6cd 100644
--- a/lib/device/simulation/valve-one.js
+++ b/lib/device/simulation/valve-one.js
@@ -60,10 +60,10 @@ module.exports = class deviceValveOne {
     }
 
     // Set up the device type and power readings if necessary
-    if (platform.consts.devices.singleSwitch.includes(this.accessory.context.eweUIID)) {
-      this.setup = 'singleSwitch'
-    } else if (platform.consts.devices.outlet.includes(this.accessory.context.eweUIID)) {
-      this.setup = 'singleSwitch'
+    if (platform.consts.devices.switchSingle.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'switchSingle'
+    } else if (platform.consts.devices.switchSinglePower.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'switchSingle'
 
       // Add Eve power characteristics
       this.powerReadings = true
@@ -78,9 +78,9 @@ module.exports = class deviceValveOne {
           this.service.addCharacteristic(this.eveChar.Voltage)
         }
       }
-    } else if (platform.consts.devices.multiSwitch.includes(this.accessory.context.eweUIID)) {
-      this.setup = 'multiSwitch'
-      if (this.accessory.context.eweUIID === 126) {
+    } else if (platform.consts.devices.switchMulti.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'switchMulti'
+      if (platform.consts.devices.switchMultiPower.includes(this.accessory.context.eweUIID)) {
         // Add Eve power characteristics
         this.powerReadings = true
         if (!this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
@@ -94,8 +94,8 @@ module.exports = class deviceValveOne {
         }
         this.isDualR3 = true
       }
-    } else if (platform.consts.devices.outletSCM.includes(this.accessory.context.eweUIID)) {
-      this.setup = 'multiSwitch'
+    } else if (platform.consts.devices.switchSCM.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'switchMulti'
     }
 
     // Add the set handler to the valve active characteristic
@@ -159,10 +159,10 @@ module.exports = class deviceValveOne {
     try {
       const params = {}
       switch (this.setup) {
-        case 'singleSwitch':
+        case 'switchSingle':
           params.switch = value ? 'on' : 'off'
           break
-        case 'multiSwitch':
+        case 'switchMulti':
           params.switches = [
             {
               switch: value ? 'on' : 'off',
@@ -223,13 +223,13 @@ module.exports = class deviceValveOne {
   async externalUpdate (params) {
     try {
       if (
-        (this.setup === 'multiSwitch' && params.switches) ||
-        (this.setup === 'singleSwitch' && params.switch)
+        (this.setup === 'switchMulti' && params.switches) ||
+        (this.setup === 'switchSingle' && params.switch)
       ) {
         let newState
-        if (this.setup === 'multiSwitch' && params.switches) {
+        if (this.setup === 'switchMulti' && params.switches) {
           newState = params.switches[0].switch
-        } else if (this.setup === 'singleSwitch' && params.switch) {
+        } else if (this.setup === 'switchSingle' && params.switch) {
           newState = params.switch
         }
         if (newState === 'on') {
diff --git a/lib/device/simulation/valve-two.js b/lib/device/simulation/valve-two.js
index b5c606ed..17327401 100644
--- a/lib/device/simulation/valve-two.js
+++ b/lib/device/simulation/valve-two.js
@@ -45,7 +45,7 @@ module.exports = class deviceValveTwo {
     }
 
     // Certain devices give power readings
-    if (this.accessory.context.eweUIID === 126) {
+    if (platform.consts.devices.switchMultiPower.includes(this.accessory.context.eweUIID)) {
       this.powerReadings = true
     }
 
diff --git a/lib/device/simulation/window.js b/lib/device/simulation/window.js
index ddca4396..7f43c2c5 100644
--- a/lib/device/simulation/window.js
+++ b/lib/device/simulation/window.js
@@ -62,7 +62,7 @@ module.exports = class deviceWindow {
     }
 
     // Certain devices give power readings
-    if (this.accessory.context.eweUIID === 126) {
+    if (platform.consts.devices.switchMultiPower.includes(this.accessory.context.eweUIID)) {
       // Add Eve power characteristics
       this.powerReadings = true
       if (!this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
diff --git a/lib/device/switch-multi.js b/lib/device/switch-multi.js
index b624f8f1..b97f2023 100644
--- a/lib/device/switch-multi.js
+++ b/lib/device/switch-multi.js
@@ -70,42 +70,39 @@ module.exports = class deviceSwitchMulti {
       this.accessory.getService(this.hapServ.Switch) ||
       this.accessory.addService(this.hapServ.Switch)
 
-    switch (this.accessory.context.eweUIID) {
-      case 126:
-        // Add Eve power characteristics
-        this.powerReadings = true
-        this.isDual = true
-        if (accessory.context.switchNumber !== '0') {
-          if (!this.service.testCharacteristic(this.hapChar.OutletInUse)) {
-            this.service.addCharacteristic(this.hapChar.OutletInUse)
-          }
-          if (!this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
-            this.service.addCharacteristic(this.eveChar.CurrentConsumption)
-          }
-          if (!this.service.testCharacteristic(this.eveChar.ElectricCurrent)) {
-            this.service.addCharacteristic(this.eveChar.ElectricCurrent)
-          }
-          if (!this.service.testCharacteristic(this.eveChar.Voltage)) {
-            this.service.addCharacteristic(this.eveChar.Voltage)
-          }
+    if (platform.consts.devices.switchMultiPower.includes(this.accessory.context.eweUIID)) {
+      // Add Eve power characteristics
+      this.powerReadings = true
+      this.isDual = true
+      if (accessory.context.switchNumber !== '0') {
+        if (!this.service.testCharacteristic(this.hapChar.OutletInUse)) {
+          this.service.addCharacteristic(this.hapChar.OutletInUse)
         }
-        break
-      default:
-        // Remove unused Eve characteristics
-        if (this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
-          this.service.removeCharacteristic(
-            this.service.getCharacteristic(this.eveChar.CurrentConsumption)
-          )
+        if (!this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
+          this.service.addCharacteristic(this.eveChar.CurrentConsumption)
         }
-        if (this.service.testCharacteristic(this.eveChar.ElectricCurrent)) {
-          this.service.removeCharacteristic(
-            this.service.getCharacteristic(this.eveChar.ElectricCurrent)
-          )
+        if (!this.service.testCharacteristic(this.eveChar.ElectricCurrent)) {
+          this.service.addCharacteristic(this.eveChar.ElectricCurrent)
         }
-        if (this.service.testCharacteristic(this.eveChar.Voltage)) {
-          this.service.removeCharacteristic(this.service.getCharacteristic(this.eveChar.Voltage))
+        if (!this.service.testCharacteristic(this.eveChar.Voltage)) {
+          this.service.addCharacteristic(this.eveChar.Voltage)
         }
-        break
+      }
+    } else {
+      // Remove unused Eve characteristics
+      if (this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
+        this.service.removeCharacteristic(
+          this.service.getCharacteristic(this.eveChar.CurrentConsumption)
+        )
+      }
+      if (this.service.testCharacteristic(this.eveChar.ElectricCurrent)) {
+        this.service.removeCharacteristic(
+          this.service.getCharacteristic(this.eveChar.ElectricCurrent)
+        )
+      }
+      if (this.service.testCharacteristic(this.eveChar.Voltage)) {
+        this.service.removeCharacteristic(this.service.getCharacteristic(this.eveChar.Voltage))
+      }
     }
 
     // Add the set handler to the switch on/off characteristic
diff --git a/lib/device/switch-single-inched.js b/lib/device/switch-single-inched.js
index 19222bf4..542bf684 100644
--- a/lib/device/switch-single-inched.js
+++ b/lib/device/switch-single-inched.js
@@ -104,7 +104,7 @@ module.exports = class deviceSwitchSingleInched {
         break
       default:
         // Set a flag for devices with hardware that use multi-channel format
-        if (platform.consts.devices.outletSCM.includes(this.accessory.context.eweUIID)) {
+        if (platform.consts.devices.switchSCM.includes(this.accessory.context.eweUIID)) {
           this.isSCM = true
         }
 
diff --git a/lib/device/switch-single.js b/lib/device/switch-single.js
index 0523684e..eed6ef60 100644
--- a/lib/device/switch-single.js
+++ b/lib/device/switch-single.js
@@ -104,7 +104,7 @@ module.exports = class deviceSwitchSingle {
         break
       default:
         // Set a flag for devices with hardware that use multi-channel format
-        if (platform.consts.devices.outletSCM.includes(this.accessory.context.eweUIID)) {
+        if (platform.consts.devices.switchSCM.includes(this.accessory.context.eweUIID)) {
           this.isSCM = true
         }
 
diff --git a/lib/index.js b/lib/index.js
index 9d20a815..4c1b3f64 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -988,9 +988,9 @@ class eWeLinkPlatform {
         /*************/
         /**********************/
       } else if (
-        this.consts.devices.singleSwitch.includes(uiid) ||
-        this.consts.devices.outlet.includes(uiid) ||
-        this.consts.devices.outletSCM.includes(uiid)
+        this.consts.devices.switchSingle.includes(uiid) ||
+        this.consts.devices.switchSinglePower.includes(uiid) ||
+        this.consts.devices.switchSCM.includes(uiid)
       ) {
         /********************************
         SWITCHES/OUTLETS [SINGLE CHANNEL]
@@ -1005,7 +1005,7 @@ class eWeLinkPlatform {
             ? new (require('./device/switch-single-inched'))(this, accessory)
             : new (require('./device/switch-single'))(this, accessory)
         /*******************************/
-      } else if (this.consts.devices.multiSwitch.includes(uiid)) {
+      } else if (this.consts.devices.switchMulti.includes(uiid)) {
         /*******************************
         SWITCHES/OUTLETS [MULTI CHANNEL]
         *******************************/
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index ad2e0076..c40bd9ee 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -238,8 +238,33 @@ module.exports = {
 
   devices: {
     lan: [1, 2, 3, 4, 5, 6, 7, 8, 9, 14, 15, 28, 32, 34, 44, 77, 78, 126],
-    singleSwitch: [1, 6, 14, 24, 27, 112, 1009, 1256],
-    multiSwitch: [2, 3, 4, 7, 8, 9, 29, 30, 31, 41, 82, 83, 84, 113, 114, 126, 2256, 3256, 4256],
+    switchSingle: [1, 6, 14, 24, 27, 112, 1009, 1256],
+    switchSCM: [77, 78, 81, 107, 138],
+    switchSinglePower: [5, 32],
+    switchMulti: [
+      2,
+      3,
+      4,
+      7,
+      8,
+      9,
+      29,
+      30,
+      31,
+      41,
+      82,
+      83,
+      84,
+      113,
+      114,
+      139,
+      140,
+      141,
+      2256,
+      3256,
+      4256
+    ],
+    switchMultiPower: [126],
     lightDimmer: [36, 44, 57],
     lightRGB: [22],
     lightCCT: [103],
@@ -252,8 +277,6 @@ module.exports = {
     fan: [34],
     humidifier: [19],
     diffuser: [25],
-    outlet: [5, 32],
-    outletSCM: [77, 78, 81, 107],
     camera: [87],
     rfBridge: [28, 98],
     zbBridge: [66],
@@ -375,6 +398,10 @@ module.exports = {
     114: 3,
     126: 2, // "DUALR3"
     127: 1, // "GTTA127"
+    138: 1, // "MINIR3?" (WOOLLEY WLAN SMART SWITCH)
+    139: 2, // "MINIR3?"
+    140: 3, // "MINIR3?"
+    141: 4, // "MINIR3?"
     1000: 1, // "zigbee_ON_OFF_SWITCH_1000" (button device)
     1009: 1, // "" (Some sort of single switch device)
     1256: 1, // "ZIGBEE_SINGLE_SWITCH"
@@ -437,10 +464,6 @@ module.exports = {
     93: 0, // "HTHD_AIR_CLEANER"
     94: 0, // "YIAN_ELECTRIC_PROTECT"
     109: 0, // "YK_INFRARED_2"
-    138: 1, // "MINIR3?"
-    139: 2, // "MINIR3?"
-    140: 3, // "MINIR3?"
-    141: 4, // "MINIR3?"
     1001: 0, // "BLADELESS_FAN"
     1002: 0, // "NEW_HUMIDIFIER"
     1003: 0 // "WARM_AIR_BLOWER"

From 672bf7de487b8a2ca3ccdb14ca501de0d40f2c22 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 22 Aug 2021 09:17:29 +0100
Subject: [PATCH 2632/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0802d0db..35b9e2de 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 All notable changes to homebridge-ewelink will be documented in this file.
 
+## 8.2.0 (2021-08-22)
+
+### Added
+
+- Support for UIIDs `138` `139` `140` `141`
+
 ## 8.1.0 (2021-08-17)
 
 ### Added

From a16ff19338fe31b53f9741b04e47c2ab097727b2 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 22 Aug 2021 09:17:52 +0100
Subject: [PATCH 2633/3183] 8.2.0

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index e3bb9224..239d38fe 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.1.0",
+  "version": "8.2.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.1.0",
+      "version": "8.2.0",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 6309432c..18e53cdb 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.1.0",
+  "version": "8.2.0",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From de643f7b9a6fbed61b1a845289cd21f0e0d81404 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 22 Aug 2021 11:01:20 +0100
Subject: [PATCH 2634/3183] bump `ws` to 8.2.0

---
 package-lock.json | 16 ++++++++--------
 package.json      |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 239d38fe..3edd1a3c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -32,7 +32,7 @@
         "node-persist": "^3.1.0",
         "p-queue": "^6.6.2",
         "websocket-as-promised": "^2.0.1",
-        "ws": "^7.5.3"
+        "ws": "^8.2.0"
       },
       "engines": {
         "homebridge": "^1.3.4",
@@ -532,11 +532,11 @@
       }
     },
     "node_modules/ws": {
-      "version": "7.5.3",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.3.tgz",
-      "integrity": "sha512-kQ/dHIzuLrS6Je9+uv81ueZomEwH0qVYstcAQ4/Z93K8zeko9gtAbttJWzoC5ukqXY1PpoouV3+VSOqEAFt5wg==",
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.2.0.tgz",
+      "integrity": "sha512-uYhVJ/m9oXwEI04iIVmgLmugh2qrZihkywG9y5FfZV2ATeLIzHf93qs+tUNqlttbQK957/VX3mtwAS+UfIwA4g==",
       "engines": {
-        "node": ">=8.3.0"
+        "node": ">=10.0.0"
       },
       "peerDependencies": {
         "bufferutil": "^4.0.1",
@@ -882,9 +882,9 @@
       }
     },
     "ws": {
-      "version": "7.5.3",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.3.tgz",
-      "integrity": "sha512-kQ/dHIzuLrS6Je9+uv81ueZomEwH0qVYstcAQ4/Z93K8zeko9gtAbttJWzoC5ukqXY1PpoouV3+VSOqEAFt5wg==",
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.2.0.tgz",
+      "integrity": "sha512-uYhVJ/m9oXwEI04iIVmgLmugh2qrZihkywG9y5FfZV2ATeLIzHf93qs+tUNqlttbQK957/VX3mtwAS+UfIwA4g==",
       "requires": {}
     }
   }
diff --git a/package.json b/package.json
index 18e53cdb..1b59be70 100644
--- a/package.json
+++ b/package.json
@@ -56,7 +56,7 @@
     "node-persist": "^3.1.0",
     "p-queue": "^6.6.2",
     "websocket-as-promised": "^2.0.1",
-    "ws": "^7.5.3"
+    "ws": "^8.2.0"
   },
   "prettier": {
     "printWidth": 100

From d9e06f6f71a469d97eb4a474282d1febbee4fa56 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 22 Aug 2021 11:01:46 +0100
Subject: [PATCH 2635/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 35b9e2de..caf1620a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 All notable changes to homebridge-ewelink will be documented in this file.
 
+## BETA
+
+### Changed
+
+- Bump `ws` to v8.2.0
+
 ## 8.2.0 (2021-08-22)
 
 ### Added

From 288e93e1af0a630922cea429f06613df56af9163 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 22 Aug 2021 11:02:13 +0100
Subject: [PATCH 2636/3183] 8.2.1-beta.0

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 3edd1a3c..404cba09 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.2.0",
+  "version": "8.2.1-beta.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.2.0",
+      "version": "8.2.1-beta.0",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 1b59be70..1c7337d7 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.2.0",
+  "version": "8.2.1-beta.0",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 21c4f822519006a237a00b902410f56ad3e850b1 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 22 Aug 2021 15:28:09 +0100
Subject: [PATCH 2637/3183] revert bump ws

---
 CHANGELOG.md      |  2 +-
 package-lock.json | 16 ++++++++--------
 package.json      |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index caf1620a..d762d429 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,7 +6,7 @@ All notable changes to homebridge-ewelink will be documented in this file.
 
 ### Changed
 
-- Bump `ws` to v8.2.0
+- ~~Bump `ws` to v8.2.0~~
 
 ## 8.2.0 (2021-08-22)
 
diff --git a/package-lock.json b/package-lock.json
index 404cba09..906d3f4d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -32,7 +32,7 @@
         "node-persist": "^3.1.0",
         "p-queue": "^6.6.2",
         "websocket-as-promised": "^2.0.1",
-        "ws": "^8.2.0"
+        "ws": "^7.5.3"
       },
       "engines": {
         "homebridge": "^1.3.4",
@@ -532,11 +532,11 @@
       }
     },
     "node_modules/ws": {
-      "version": "8.2.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.2.0.tgz",
-      "integrity": "sha512-uYhVJ/m9oXwEI04iIVmgLmugh2qrZihkywG9y5FfZV2ATeLIzHf93qs+tUNqlttbQK957/VX3mtwAS+UfIwA4g==",
+      "version": "7.5.3",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.3.tgz",
+      "integrity": "sha512-kQ/dHIzuLrS6Je9+uv81ueZomEwH0qVYstcAQ4/Z93K8zeko9gtAbttJWzoC5ukqXY1PpoouV3+VSOqEAFt5wg==",
       "engines": {
-        "node": ">=10.0.0"
+        "node": ">=8.3.0"
       },
       "peerDependencies": {
         "bufferutil": "^4.0.1",
@@ -882,9 +882,9 @@
       }
     },
     "ws": {
-      "version": "8.2.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.2.0.tgz",
-      "integrity": "sha512-uYhVJ/m9oXwEI04iIVmgLmugh2qrZihkywG9y5FfZV2ATeLIzHf93qs+tUNqlttbQK957/VX3mtwAS+UfIwA4g==",
+      "version": "7.5.3",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.3.tgz",
+      "integrity": "sha512-kQ/dHIzuLrS6Je9+uv81ueZomEwH0qVYstcAQ4/Z93K8zeko9gtAbttJWzoC5ukqXY1PpoouV3+VSOqEAFt5wg==",
       "requires": {}
     }
   }
diff --git a/package.json b/package.json
index 1c7337d7..eb5f7251 100644
--- a/package.json
+++ b/package.json
@@ -56,7 +56,7 @@
     "node-persist": "^3.1.0",
     "p-queue": "^6.6.2",
     "websocket-as-promised": "^2.0.1",
-    "ws": "^8.2.0"
+    "ws": "^7.5.3"
   },
   "prettier": {
     "printWidth": 100

From 02c1d66747b14b0232e0c5651b0836d5f3d2d85c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 22 Aug 2021 15:30:23 +0100
Subject: [PATCH 2638/3183] fix some uiids

---
 lib/utils/constants.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index c40bd9ee..7f088dda 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -237,9 +237,9 @@ module.exports = {
   },
 
   devices: {
-    lan: [1, 2, 3, 4, 5, 6, 7, 8, 9, 14, 15, 28, 32, 34, 44, 77, 78, 126],
-    switchSingle: [1, 6, 14, 24, 27, 112, 1009, 1256],
-    switchSCM: [77, 78, 81, 107, 138],
+    lan: [1, 2, 3, 4, 5, 6, 7, 8, 9, 14, 15, 28, 32, 34, 44, 77, 78, 112, 113, 114, 126],
+    switchSingle: [1, 6, 14, 24, 27, 1009, 1256],
+    switchSCM: [77, 78, 81, 107, 112, 138],
     switchSinglePower: [5, 32],
     switchMulti: [
       2,

From 43ef5a5402a85e2c5c946a4fff27eb45b8e297c4 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 22 Aug 2021 15:47:34 +0100
Subject: [PATCH 2639/3183] rebump ws to 8.2.0 with necessary ws code change

---
 CHANGELOG.md         |  2 +-
 lib/connection/ws.js |  5 ++++-
 package-lock.json    | 16 ++++++++--------
 package.json         |  2 +-
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d762d429..caf1620a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,7 +6,7 @@ All notable changes to homebridge-ewelink will be documented in this file.
 
 ### Changed
 
-- ~~Bump `ws` to v8.2.0~~
+- Bump `ws` to v8.2.0
 
 ## 8.2.0 (2021-08-22)
 
diff --git a/lib/connection/ws.js b/lib/connection/ws.js
index 56377709..d436d0d2 100644
--- a/lib/connection/ws.js
+++ b/lib/connection/ws.js
@@ -99,7 +99,10 @@ module.exports = class connectionWS {
         attachRequestId: (data, requestId) => Object.assign({ sequence: requestId }, data),
         extractRequestId: data => data && data.sequence,
         packMessage: data => JSON.stringify(data),
-        unpackMessage: data => (data === 'pong' ? data : JSON.parse(data)),
+        unpackMessage: data => {
+          data = data.toString()
+          return data === 'pong' ? data : JSON.parse(data)
+        },
         timeout: 6000
       })
 
diff --git a/package-lock.json b/package-lock.json
index 906d3f4d..404cba09 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -32,7 +32,7 @@
         "node-persist": "^3.1.0",
         "p-queue": "^6.6.2",
         "websocket-as-promised": "^2.0.1",
-        "ws": "^7.5.3"
+        "ws": "^8.2.0"
       },
       "engines": {
         "homebridge": "^1.3.4",
@@ -532,11 +532,11 @@
       }
     },
     "node_modules/ws": {
-      "version": "7.5.3",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.3.tgz",
-      "integrity": "sha512-kQ/dHIzuLrS6Je9+uv81ueZomEwH0qVYstcAQ4/Z93K8zeko9gtAbttJWzoC5ukqXY1PpoouV3+VSOqEAFt5wg==",
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.2.0.tgz",
+      "integrity": "sha512-uYhVJ/m9oXwEI04iIVmgLmugh2qrZihkywG9y5FfZV2ATeLIzHf93qs+tUNqlttbQK957/VX3mtwAS+UfIwA4g==",
       "engines": {
-        "node": ">=8.3.0"
+        "node": ">=10.0.0"
       },
       "peerDependencies": {
         "bufferutil": "^4.0.1",
@@ -882,9 +882,9 @@
       }
     },
     "ws": {
-      "version": "7.5.3",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.3.tgz",
-      "integrity": "sha512-kQ/dHIzuLrS6Je9+uv81ueZomEwH0qVYstcAQ4/Z93K8zeko9gtAbttJWzoC5ukqXY1PpoouV3+VSOqEAFt5wg==",
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.2.0.tgz",
+      "integrity": "sha512-uYhVJ/m9oXwEI04iIVmgLmugh2qrZihkywG9y5FfZV2ATeLIzHf93qs+tUNqlttbQK957/VX3mtwAS+UfIwA4g==",
       "requires": {}
     }
   }
diff --git a/package.json b/package.json
index eb5f7251..1c7337d7 100644
--- a/package.json
+++ b/package.json
@@ -56,7 +56,7 @@
     "node-persist": "^3.1.0",
     "p-queue": "^6.6.2",
     "websocket-as-promised": "^2.0.1",
-    "ws": "^7.5.3"
+    "ws": "^8.2.0"
   },
   "prettier": {
     "printWidth": 100

From 099009fa9a2d9045bd22aa907eba8c5e26f839c1 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 22 Aug 2021 16:06:16 +0100
Subject: [PATCH 2640/3183] fix uiid 126 init

---
 lib/index.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/index.js b/lib/index.js
index 4c1b3f64..cf7af226 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1005,7 +1005,10 @@ class eWeLinkPlatform {
             ? new (require('./device/switch-single-inched'))(this, accessory)
             : new (require('./device/switch-single'))(this, accessory)
         /*******************************/
-      } else if (this.consts.devices.switchMulti.includes(uiid)) {
+      } else if (
+        this.consts.devices.switchMulti.includes(uiid) ||
+        this.consts.devices.switchMultiPower.includes(uiid)
+      ) {
         /*******************************
         SWITCHES/OUTLETS [MULTI CHANNEL]
         *******************************/

From a79d5bb2b30ee7291ef8eb2b30b0b80a827432a4 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 22 Aug 2021 16:07:05 +0100
Subject: [PATCH 2641/3183] 8.2.1-beta.1

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 404cba09..cedfccc1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.2.1-beta.0",
+  "version": "8.2.1-beta.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.2.1-beta.0",
+      "version": "8.2.1-beta.1",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 1c7337d7..43f66d6e 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.2.1-beta.0",
+  "version": "8.2.1-beta.1",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 625f7d738270f37fae44c27cccf5d8522fa2f770 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 22 Aug 2021 16:12:18 +0100
Subject: [PATCH 2642/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index caf1620a..c8e265ab 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,12 +2,17 @@
 
 All notable changes to homebridge-ewelink will be documented in this file.
 
-## BETA
+## 8.2.1 (2021-08-22)
 
 ### Changed
 
 - Bump `ws` to v8.2.0
 
+### Fixed
+
+- An issue preventing DUALR3 from initialising
+- Fix for uiid `112`
+
 ## 8.2.0 (2021-08-22)
 
 ### Added

From 0ffbce1855bed63fce76e3db62ef8b0b36b99c7c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 22 Aug 2021 16:13:01 +0100
Subject: [PATCH 2643/3183] 8.2.1

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index cedfccc1..763059c7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.2.1-beta.1",
+  "version": "8.2.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.2.1-beta.1",
+      "version": "8.2.1",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 43f66d6e..15abf7c3 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.2.1-beta.1",
+  "version": "8.2.1",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From e0b6498897837cbb45461f8383ef71decb1e267f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 23 Aug 2021 08:34:35 +0100
Subject: [PATCH 2644/3183] expose KING-Q4 device as door or window acc type

---
 config.schema.json     | 25 ++++++++++++++++-
 lib/device/curtain.js  | 62 ++++++++++++++++++++++++++++++++++++++++--
 lib/utils/constants.js |  1 +
 3 files changed, 84 insertions(+), 4 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index a04629b7..0f29dc8e 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -251,7 +251,29 @@
                 }
               ],
               "condition": {
-                "functionBody": "return (model.singleDevices && model.singleDevices[arrayIndices] && ['single', 't', 'pow', 'iw', 's', 'micro', 'slampher', 'king', 'zb'].includes(model.singleDevices[arrayIndices].deviceModel) && !model.singleDevices[arrayIndices].ignoreDevice);"
+                "functionBody": "return (model.singleDevices && model.singleDevices[arrayIndices] && ['single', 't', 'pow', 'iw', 's', 'micro', 'slampher', 'zb'].includes(model.singleDevices[arrayIndices].deviceModel) && !model.singleDevices[arrayIndices].ignoreDevice);"
+              }
+            },
+            "showAsMotor": {
+              "type": "string",
+              "title": "KingArt KING-Q4 Accessory Type",
+              "description": "Select the accessory type to show in HomeKit.",
+              "oneOf": [
+                {
+                  "title": "Window Blind/Covering (Default)",
+                  "enum": ["blind"]
+                },
+                {
+                  "title": "Door",
+                  "enum": ["door"]
+                },
+                {
+                  "title": "Window",
+                  "enum": ["window"]
+                }
+              ],
+              "condition": {
+                "functionBody": "return (model.singleDevices && model.singleDevices[arrayIndices] && model.singleDevices[arrayIndices].deviceId && ['king'].includes(model.singleDevices[arrayIndices].deviceModel) && !model.singleDevices[arrayIndices].ignoreDevice);"
               }
             },
             "inUsePowerThreshold": {
@@ -1520,6 +1542,7 @@
             "singleDevices[].ignoreDevice",
             "singleDevices[].deviceModel",
             "singleDevices[].showAs",
+            "singleDevices[].showAsMotor",
             "singleDevices[].inUsePowerThreshold",
             "singleDevices[].isInched",
             "singleDevices[].operationTime",
diff --git a/lib/device/curtain.js b/lib/device/curtain.js
index 8da748a5..af45aba4 100644
--- a/lib/device/curtain.js
+++ b/lib/device/curtain.js
@@ -22,6 +22,10 @@ module.exports = class deviceCurtain {
 
     // Set up custom variables for this device type
     const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
+    const showAsMotor =
+      deviceConf && deviceConf.showAsMotor
+        ? deviceConf.showAsMotor
+        : platform.consts.defaultValues.showAsMotor
 
     // Set the correct logging variables for this accessory
     this.enableLogging = !platform.config.disableDeviceLogging
@@ -44,9 +48,61 @@ module.exports = class deviceCurtain {
     }
 
     // Add the window covering service if it doesn't already exist
-    this.service =
-      this.accessory.getService(this.hapServ.WindowCovering) ||
-      this.accessory.addService(this.hapServ.WindowCovering)
+    let service
+    switch (showAsMotor) {
+      case 'door':
+        service = this.hapServ.Door
+        if (this.accessory.getService(this.hapServ.GarageDoorOpener)) {
+          this.accessory.removeService(this.accessory.getService(this.hapServ.GarageDoorOpener))
+        }
+        if (this.accessory.getService(this.hapServ.Window)) {
+          this.accessory.removeService(this.accessory.getService(this.hapServ.Window))
+        }
+        if (this.accessory.getService(this.hapServ.WindowCovering)) {
+          this.accessory.removeService(this.accessory.getService(this.hapServ.WindowCovering))
+        }
+        break
+      /*
+      case 'garage':
+        service = this.hapServ.GarageDoorOpener
+        this.isGarage = true
+        if (this.accessory.getService(this.hapServ.Door)) {
+          this.accessory.removeService(this.accessory.getService(this.hapServ.Door))
+        }
+        if (this.accessory.getService(this.hapServ.Window)) {
+          this.accessory.removeService(this.accessory.getService(this.hapServ.Window))
+        }
+        if (this.accessory.getService(this.hapServ.WindowCovering)) {
+          this.accessory.removeService(this.accessory.getService(this.hapServ.WindowCovering))
+        }
+        break
+      */
+      case 'window':
+        service = this.hapServ.Window
+        if (this.accessory.getService(this.hapServ.Door)) {
+          this.accessory.removeService(this.accessory.getService(this.hapServ.Door))
+        }
+        if (this.accessory.getService(this.hapServ.GarageDoorOpener)) {
+          this.accessory.removeService(this.accessory.getService(this.hapServ.GarageDoorOpener))
+        }
+        if (this.accessory.getService(this.hapServ.WindowCovering)) {
+          this.accessory.removeService(this.accessory.getService(this.hapServ.WindowCovering))
+        }
+        break
+      default:
+        service = this.hapServ.WindowCovering
+        if (this.accessory.getService(this.hapServ.Door)) {
+          this.accessory.removeService(this.accessory.getService(this.hapServ.Door))
+        }
+        if (this.accessory.getService(this.hapServ.GarageDoorOpener)) {
+          this.accessory.removeService(this.accessory.getService(this.hapServ.GarageDoorOpener))
+        }
+        if (this.accessory.getService(this.hapServ.Window)) {
+          this.accessory.removeService(this.accessory.getService(this.hapServ.Window))
+        }
+        break
+    }
+    this.service = this.accessory.getService(service) || this.accessory.addService(service)
 
     // Add the set handler to the target position characteristic
     this.service
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 7f088dda..55f13df6 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -85,6 +85,7 @@ module.exports = {
       'ignoreDevice',
       'deviceModel',
       'showAs',
+      'showAsMotor',
       'inUsePowerThreshold',
       'isInched',
       'operationTime',

From 828d587555a170f2611e0927cfe847a492dd03a2 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 23 Aug 2021 08:35:17 +0100
Subject: [PATCH 2645/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c8e265ab..fd2a048d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 All notable changes to homebridge-ewelink will be documented in this file.
 
+## BETA
+
+### Added
+
+- Expose KingArt KING-Q4 device as a `Window` or `Door` HomeKit accessory type
+
 ## 8.2.1 (2021-08-22)
 
 ### Changed

From bad35c995a921407e2ae48fd4b4a16a5330d0aff Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 23 Aug 2021 08:35:50 +0100
Subject: [PATCH 2646/3183] 8.2.2-beta.0

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 763059c7..a32da837 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.2.1",
+  "version": "8.2.2-beta.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.2.1",
+      "version": "8.2.2-beta.0",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 15abf7c3..dd700462 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.2.1",
+  "version": "8.2.2-beta.0",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 0d6dfc6b52b606f9f140c6a9d5ca69b6b1e1f2d7 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 24 Aug 2021 08:59:51 +0100
Subject: [PATCH 2647/3183] Update config.schema.json

---
 config.schema.json | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 0f29dc8e..fce15fa9 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -192,7 +192,7 @@
                   "enum": ["gddc5"]
                 },
                 {
-                  "title": "KingArt KING-Q4",
+                  "title": "KingArt KING-Q1/Q4",
                   "enum": ["king"]
                 },
                 {
@@ -256,7 +256,7 @@
             },
             "showAsMotor": {
               "type": "string",
-              "title": "KingArt KING-Q4 Accessory Type",
+              "title": "KingArt KING-Q1/Q4 Accessory Type",
               "description": "Select the accessory type to show in HomeKit.",
               "oneOf": [
                 {
@@ -267,6 +267,10 @@
                   "title": "Door",
                   "enum": ["door"]
                 },
+                {
+                  "title": "Garage Door",
+                  "enum": ["garage"]
+                },
                 {
                   "title": "Window",
                   "enum": ["window"]

From e51e22c93fc0ea8658ac055999c673a20f80932d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 24 Aug 2021 09:10:11 +0100
Subject: [PATCH 2648/3183] bump node

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index a32da837..28c48bbb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -36,7 +36,7 @@
       },
       "engines": {
         "homebridge": "^1.3.4",
-        "node": "^14.17.5 || ^16.6.2"
+        "node": "^14.17.5 || ^16.7.0"
       }
     },
     "node_modules/@homebridge/plugin-ui-utils": {
diff --git a/package.json b/package.json
index dd700462..92f64ca1 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,7 @@
   "main": "lib/index.js",
   "engines": {
     "homebridge": "^1.3.4",
-    "node": "^14.17.5 || ^16.6.2"
+    "node": "^14.17.5 || ^16.7.0"
   },
   "repository": {
     "type": "git",

From 3951564df1fb8406fe4a79163441651480649813 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 24 Aug 2021 09:29:39 +0100
Subject: [PATCH 2649/3183] avoid repeated log messages about camera and
 non-supported devices

---
 lib/index.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/index.js b/lib/index.js
index cf7af226..7a18ab6c 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1269,6 +1269,7 @@ class eWeLinkPlatform {
         SONOFF CAMERAS
         *************/
         this.log('[%s] %s.', device.name, this.lang.sonoffCamera)
+        this.ignoredDevices.push(device.deviceid)
         return
         /************/
       } else if (this.consts.devices.cannotSupport.includes(uiid)) {
@@ -1276,6 +1277,7 @@ class eWeLinkPlatform {
         DEVICES THAT CANNOT BE SUPPORTED
         *******************************/
         this.log('[%s] %s.', device.name, this.lang.devNotSup)
+        this.ignoredDevices.push(device.deviceid)
         return
         /******************************/
       } else {

From a5061732f1e2c4e5071eab5095cc2cd4ce4e3256 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 24 Aug 2021 16:39:51 +0100
Subject: [PATCH 2650/3183] uiid 67 as garage door

---
 lib/device/curtain.js  | 181 +++++++++++++++++++++++++++++------------
 lib/utils/constants.js |   2 +
 2 files changed, 131 insertions(+), 52 deletions(-)

diff --git a/lib/device/curtain.js b/lib/device/curtain.js
index af45aba4..af2fe889 100644
--- a/lib/device/curtain.js
+++ b/lib/device/curtain.js
@@ -62,7 +62,6 @@ module.exports = class deviceCurtain {
           this.accessory.removeService(this.accessory.getService(this.hapServ.WindowCovering))
         }
         break
-      /*
       case 'garage':
         service = this.hapServ.GarageDoorOpener
         this.isGarage = true
@@ -76,7 +75,6 @@ module.exports = class deviceCurtain {
           this.accessory.removeService(this.accessory.getService(this.hapServ.WindowCovering))
         }
         break
-      */
       case 'window':
         service = this.hapServ.Window
         if (this.accessory.getService(this.hapServ.Door)) {
@@ -105,31 +103,62 @@ module.exports = class deviceCurtain {
     this.service = this.accessory.getService(service) || this.accessory.addService(service)
 
     // Add the set handler to the target position characteristic
-    this.service
-      .getCharacteristic(this.hapChar.TargetPosition)
-      .onSet(async value => await this.internalPositionUpdate(value))
+    if (this.isGarage) {
+      this.service
+        .getCharacteristic(this.hapChar.TargetDoorState)
+        .onSet(async value => await this.internalTargetUpdate(value))
+    } else {
+      this.service
+        .getCharacteristic(this.hapChar.TargetPosition)
+        .onSet(async value => await this.internalPositionUpdate(value))
+    }
 
     // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
     if (!platform.config.disableNoResponse) {
-      this.service.getCharacteristic(this.hapChar.CurrentPosition).onGet(() => {
-        if (!this.isOnline) {
-          throw new this.hapErr(-70402)
-        }
-        return this.service.getCharacteristic(this.hapChar.CurrentPosition).value
-      })
-      this.service.getCharacteristic(this.hapChar.TargetPosition).onGet(() => {
-        if (!this.isOnline) {
-          throw new this.hapErr(-70402)
-        }
-        return this.service.getCharacteristic(this.hapChar.TargetPosition).value
-      })
+      if (this.isGarage) {
+        this.service.getCharacteristic(this.hapChar.CurrentDoorState).onGet(() => {
+          if (!this.isOnline) {
+            throw new this.hapErr(-70402)
+          }
+          return this.service.getCharacteristic(this.hapChar.CurrentDoorState).value
+        })
+        this.service.getCharacteristic(this.hapChar.TargetDoorState).onGet(() => {
+          if (!this.isOnline) {
+            throw new this.hapErr(-70402)
+          }
+          return this.service.getCharacteristic(this.hapChar.TargetDoorState).value
+        })
+      } else {
+        this.service.getCharacteristic(this.hapChar.CurrentPosition).onGet(() => {
+          if (!this.isOnline) {
+            throw new this.hapErr(-70402)
+          }
+          return this.service.getCharacteristic(this.hapChar.CurrentPosition).value
+        })
+        this.service.getCharacteristic(this.hapChar.TargetPosition).onGet(() => {
+          if (!this.isOnline) {
+            throw new this.hapErr(-70402)
+          }
+          return this.service.getCharacteristic(this.hapChar.TargetPosition).value
+        })
+      }
     }
 
     // Output the customised options to the log
     const opts = JSON.stringify({
-      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable'
+      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
+      showAsMotor: showAsMotor
     })
     this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
+
+    /*
+      Q1
+        {"op":3} -> command to close
+        {"op":3,"per":0} -> received when closed
+
+        {"op":1,} -> command to open
+        {"op":1,"per":100} -> received when open
+    */
   }
 
   async internalPositionUpdate (value) {
@@ -184,49 +213,97 @@ module.exports = class deviceCurtain {
     }
   }
 
-  async externalUpdate (params) {
+  async internalTargetUpdate (value) {
     try {
-      // Don't continue if there are no useful parameters
-      if (
-        !params.switch &&
-        !this.funcs.hasProperty(params, 'setclose') &&
-        !this.funcs.hasProperty(params, 'per')
-      ) {
-        return
-      }
-      let newPos
+      // value is 0 for open and 1 for closed
+      const params = {}
       switch (this.accessory.context.eweUIID) {
         case 11:
-          // 'setclose' is 0=OPEN 100=CLOSED whereas HomeKit is 0=CLOSED 100=OPEN
-          // 'switch' is 'on' for fully open and 'off' for fully close
-          if (this.funcs.hasProperty(params, 'setclose')) {
-            newPos = Math.abs(100 - params.setclose)
-          } else if (params.switch) {
-            newPos = params.switch === 'on' ? 100 : 0
-          } else {
-            return
-          }
+          params.switch = value === 0 ? 'on' : 'off'
           break
         case 67:
-          // 'per' matches HomeKit status 0=CLOSED 100=OPEN
-          if (this.funcs.hasProperty(params, 'per')) {
-            newPos = params.per
-          } else {
-            return
-          }
+          params.op = value === 0 ? 1 : 3
           break
       }
+      await this.platform.sendDeviceUpdate(this.accessory, params)
+    } catch (err) {
+      // Catch any errors and let the platform display them
+      this.platform.deviceUpdateError(this.accessory, err, true)
+      setTimeout(() => {
+        this.service.updateCharacteristic(this.hapChar.TargetDoorState, this.cachePos)
+      }, 2000)
+      throw new this.hapErr(-70402)
+    }
+  }
 
-      // Update HomeKit with the provided value
-      this.service.updateCharacteristic(this.hapChar.TargetPosition, newPos)
-      this.service.updateCharacteristic(this.hapChar.CurrentPosition, newPos)
-      this.service.updateCharacteristic(this.hapChar.PositionState, 2)
+  async externalUpdate (params) {
+    try {
+      // Don't continue if there are no useful parameters
+      if (this.isGarage) {
+        if (this.funcs.hasProperty(params, 'op') && this.funcs.hasProperty(params, 'per')) {
+          if (params.op === 3 && params.per === 0) {
+            // closed
+            if (this.cachePos !== 1) {
+              this.cachePos = 1
+              this.service.updateCharacteristic(this.hapChar.CurrentDoorState, 1)
+              this.service.updateCharacteristic(this.hapChar.TargetDoorState, 1)
+              if (params.updateSource && this.enableLogging) {
+                this.log('[%s] %s [%s].', this.name, 'current state', 'closed')
+              }
+            }
+          } else if (params.op === 1 && params.per === 100) {
+            // open
+            if (this.cachePos !== 0) {
+              this.cachePos = 0
+              this.service.updateCharacteristic(this.hapChar.CurrentDoorState, 0)
+              this.service.updateCharacteristic(this.hapChar.TargetDoorState, 0)
+              if (params.updateSource && this.enableLogging) {
+                this.log('[%s] %s [%s].', this.name, 'current state', 'open')
+              }
+            }
+          }
+        }
+      } else {
+        if (
+          params.switch ||
+          this.funcs.hasProperty(params, 'setclose') ||
+          this.funcs.hasProperty(params, 'per')
+        ) {
+          let newPos
+          switch (this.accessory.context.eweUIID) {
+            case 11:
+              // 'setclose' is 0=OPEN 100=CLOSED whereas HomeKit is 0=CLOSED 100=OPEN
+              // 'switch' is 'on' for fully open and 'off' for fully close
+              if (this.funcs.hasProperty(params, 'setclose')) {
+                newPos = Math.abs(100 - params.setclose)
+              } else if (params.switch) {
+                newPos = params.switch === 'on' ? 100 : 0
+              } else {
+                return
+              }
+              break
+            case 67:
+              // 'per' matches HomeKit status 0=CLOSED 100=OPEN
+              if (this.funcs.hasProperty(params, 'per')) {
+                newPos = params.per
+              } else {
+                return
+              }
+              break
+          }
 
-      // Only update the cache and log if the provided value has changed
-      if (params.updateSource && this.cachePos !== newPos) {
-        this.cachePos = newPos
-        if (this.enableLogging) {
-          this.log('[%s] %s [%s%].', this.name, this.lang.curPos, this.cachePos)
+          // Update HomeKit with the provided value
+          this.service.updateCharacteristic(this.hapChar.TargetPosition, newPos)
+          this.service.updateCharacteristic(this.hapChar.CurrentPosition, newPos)
+          this.service.updateCharacteristic(this.hapChar.PositionState, 2)
+
+          // Only update the cache and log if the provided value has changed
+          if (params.updateSource && this.cachePos !== newPos) {
+            this.cachePos = newPos
+            if (this.enableLogging) {
+              this.log('[%s] %s [%s%].', this.name, this.lang.curPos, this.cachePos)
+            }
+          }
         }
       }
     } catch (err) {
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 55f13df6..bf7eb364 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -327,7 +327,9 @@ module.exports = {
     'mode',
     'motion',
     'online',
+    'per',
     'power',
+    'op',
     'rfChl',
     'rfList',
     'rfTrig',

From 221ecbf279b51347febf28551892a6754ebbb46f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 24 Aug 2021 16:40:18 +0100
Subject: [PATCH 2651/3183] 8.2.2-beta.1

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 28c48bbb..51d089cc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.2.2-beta.0",
+  "version": "8.2.2-beta.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.2.2-beta.0",
+      "version": "8.2.2-beta.1",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 92f64ca1..60dec899 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.2.2-beta.0",
+  "version": "8.2.2-beta.1",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 4e4d03c182e4d42515e985d69ce8e978781d421c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 24 Aug 2021 17:06:19 +0100
Subject: [PATCH 2652/3183] curtain as garage check uiid

---
 lib/device/curtain.js | 47 +++++++++++++++++++++++++------------------
 1 file changed, 27 insertions(+), 20 deletions(-)

diff --git a/lib/device/curtain.js b/lib/device/curtain.js
index af2fe889..a970b4c3 100644
--- a/lib/device/curtain.js
+++ b/lib/device/curtain.js
@@ -240,28 +240,35 @@ module.exports = class deviceCurtain {
     try {
       // Don't continue if there are no useful parameters
       if (this.isGarage) {
-        if (this.funcs.hasProperty(params, 'op') && this.funcs.hasProperty(params, 'per')) {
-          if (params.op === 3 && params.per === 0) {
-            // closed
-            if (this.cachePos !== 1) {
-              this.cachePos = 1
-              this.service.updateCharacteristic(this.hapChar.CurrentDoorState, 1)
-              this.service.updateCharacteristic(this.hapChar.TargetDoorState, 1)
-              if (params.updateSource && this.enableLogging) {
-                this.log('[%s] %s [%s].', this.name, 'current state', 'closed')
+        switch (this.accessory.context.eweUIID) {
+          case 11:
+            // Todo
+            break
+          case 67:
+            if (this.funcs.hasProperty(params, 'op') && this.funcs.hasProperty(params, 'per')) {
+              if (params.op === 3 && params.per === 0) {
+                // closed
+                if (this.cachePos !== 1) {
+                  this.cachePos = 1
+                  this.service.updateCharacteristic(this.hapChar.CurrentDoorState, 1)
+                  this.service.updateCharacteristic(this.hapChar.TargetDoorState, 1)
+                  if (params.updateSource && this.enableLogging) {
+                    this.log('[%s] %s [%s].', this.name, this.lang.curState, this.lang.doorClosed)
+                  }
+                }
+              } else if (params.op === 1 && params.per === 100) {
+                // open
+                if (this.cachePos !== 0) {
+                  this.cachePos = 0
+                  this.service.updateCharacteristic(this.hapChar.CurrentDoorState, 0)
+                  this.service.updateCharacteristic(this.hapChar.TargetDoorState, 0)
+                  if (params.updateSource && this.enableLogging) {
+                    this.log('[%s] %s [%s].', this.name, this.lang.curState, this.lang.doorOpen)
+                  }
+                }
               }
             }
-          } else if (params.op === 1 && params.per === 100) {
-            // open
-            if (this.cachePos !== 0) {
-              this.cachePos = 0
-              this.service.updateCharacteristic(this.hapChar.CurrentDoorState, 0)
-              this.service.updateCharacteristic(this.hapChar.TargetDoorState, 0)
-              if (params.updateSource && this.enableLogging) {
-                this.log('[%s] %s [%s].', this.name, 'current state', 'open')
-              }
-            }
-          }
+            break
         }
       } else {
         if (

From 88cd05a91118b356f3548eae035dd020f7ebf121 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 24 Aug 2021 17:06:43 +0100
Subject: [PATCH 2653/3183] 8.2.2-beta.2

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 51d089cc..006cb068 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.2.2-beta.1",
+  "version": "8.2.2-beta.2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.2.2-beta.1",
+      "version": "8.2.2-beta.2",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 60dec899..9cea9205 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.2.2-beta.1",
+  "version": "8.2.2-beta.2",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 041bad9c791b257189cc4b1d6609cad5220c55d8 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 25 Aug 2021 07:51:26 +0100
Subject: [PATCH 2654/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fd2a048d..1a80f1fc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@ All notable changes to homebridge-ewelink will be documented in this file.
 
 ### Added
 
+- Support for KingArt KING-Q1 garage door device
 - Expose KingArt KING-Q4 device as a `Window` or `Door` HomeKit accessory type
 
 ## 8.2.1 (2021-08-22)

From dee5f1c9ec4523e0e90828cca83fec32570c40ee Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 25 Aug 2021 08:34:48 +0100
Subject: [PATCH 2655/3183] custom char for isInched to invert status

---
 lib/device/outlet-multi.js         | 17 +++++++++++++++++
 lib/device/outlet-single-inched.js | 21 +++++++++++++++++++++
 lib/device/switch-multi.js         | 17 +++++++++++++++++
 lib/device/switch-single-inched.js | 19 +++++++++++++++++++
 lib/index.js                       |  1 +
 lib/utils/custom-chars.js          | 25 +++++++++++++++++++++++++
 6 files changed, 100 insertions(+)
 create mode 100644 lib/utils/custom-chars.js

diff --git a/lib/device/outlet-multi.js b/lib/device/outlet-multi.js
index ccd6d109..b632385a 100644
--- a/lib/device/outlet-multi.js
+++ b/lib/device/outlet-multi.js
@@ -5,6 +5,7 @@
 module.exports = class deviceOutletMulti {
   constructor (platform, accessory, devicesInHB) {
     // Set up variables from the platform
+    this.cusChar = platform.cusChar
     this.devicesInHB = devicesInHB
     this.eveChar = platform.eveChar
     this.funcs = platform.funcs
@@ -113,8 +114,24 @@ module.exports = class deviceOutletMulti {
       .getCharacteristic(this.hapChar.On)
       .onSet(async value => await this.internalStateUpdate(value))
 
+    // Add a custom characteristic for inverting the switch if inching setting is enabled
     if (this.accessory.context.isInched) {
       this.service.updateCharacteristic(this.hapChar.On, false)
+      if (!this.service.testCharacteristic(this.cusChar.InvertSwitch)) {
+        this.service.addCharacteristic(this.cusChar.InvertSwitch)
+      }
+
+      // Add the set handler to invert the switch
+      this.service.getCharacteristic(this.cusChar.InvertSwitch).onSet(value => {
+        if (value) {
+          const curValue = this.service.getCharacteristic(this.hapChar.On).value
+          this.service.updateCharacteristic(this.hapChar.On, !curValue)
+          this.log('[%s] %s [%s].', this.name, this.lang.curState, curValue ? 'off' : 'on')
+          setTimeout(() => {
+            this.service.updateCharacteristic(this.cusChar.InvertSwitch, false)
+          }, 3000)
+        }
+      })
     }
 
     // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
diff --git a/lib/device/outlet-single-inched.js b/lib/device/outlet-single-inched.js
index 1affe2f1..11eaf8b6 100644
--- a/lib/device/outlet-single-inched.js
+++ b/lib/device/outlet-single-inched.js
@@ -5,6 +5,7 @@
 module.exports = class deviceOutletSingleInched {
   constructor (platform, accessory) {
     // Set up variables from the platform
+    this.cusChar = platform.cusChar
     this.eveChar = platform.eveChar
     this.funcs = platform.funcs
     this.hapChar = platform.api.hap.Characteristic
@@ -154,6 +155,26 @@ module.exports = class deviceOutletSingleInched {
     this.service
       .getCharacteristic(this.hapChar.On)
       .onSet(async value => await this.internalStateUpdate(value))
+      .updateValue(false)
+    this.cacheState = 'off'
+
+    // Add a custom characteristic for inverting the switch
+    if (!this.service.testCharacteristic(this.cusChar.InvertSwitch)) {
+      this.service.addCharacteristic(this.cusChar.InvertSwitch)
+    }
+
+    // Add the set handler to invert the switch
+    this.service.getCharacteristic(this.cusChar.InvertSwitch).onSet(value => {
+      if (value) {
+        const curValue = this.service.getCharacteristic(this.hapChar.On).value
+        this.service.updateCharacteristic(this.hapChar.On, !curValue)
+        this.cacheState = curValue ? 'off' : 'on'
+        this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
+        setTimeout(() => {
+          this.service.updateCharacteristic(this.cusChar.InvertSwitch, false)
+        }, 3000)
+      }
+    })
 
     // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
     if (!platform.config.disableNoResponse) {
diff --git a/lib/device/switch-multi.js b/lib/device/switch-multi.js
index b97f2023..432b43bf 100644
--- a/lib/device/switch-multi.js
+++ b/lib/device/switch-multi.js
@@ -5,6 +5,7 @@
 module.exports = class deviceSwitchMulti {
   constructor (platform, accessory, devicesInHB) {
     // Set up variables from the platform
+    this.cusChar = platform.cusChar
     this.devicesInHB = devicesInHB
     this.eveChar = platform.eveChar
     this.funcs = platform.funcs
@@ -110,8 +111,24 @@ module.exports = class deviceSwitchMulti {
       .getCharacteristic(this.hapChar.On)
       .onSet(async value => await this.internalStateUpdate(value))
 
+    // Add a custom characteristic for inverting the switch if inching setting is enabled
     if (this.accessory.context.isInched) {
       this.service.updateCharacteristic(this.hapChar.On, false)
+      if (!this.service.testCharacteristic(this.cusChar.InvertSwitch)) {
+        this.service.addCharacteristic(this.cusChar.InvertSwitch)
+      }
+
+      // Add the set handler to invert the switch
+      this.service.getCharacteristic(this.cusChar.InvertSwitch).onSet(value => {
+        if (value) {
+          const curValue = this.service.getCharacteristic(this.hapChar.On).value
+          this.service.updateCharacteristic(this.hapChar.On, !curValue)
+          this.log('[%s] %s [%s].', this.name, this.lang.curState, curValue ? 'off' : 'on')
+          setTimeout(() => {
+            this.service.updateCharacteristic(this.cusChar.InvertSwitch, false)
+          }, 3000)
+        }
+      })
     }
 
     // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
diff --git a/lib/device/switch-single-inched.js b/lib/device/switch-single-inched.js
index 542bf684..cc07b014 100644
--- a/lib/device/switch-single-inched.js
+++ b/lib/device/switch-single-inched.js
@@ -5,6 +5,7 @@
 module.exports = class deviceSwitchSingleInched {
   constructor (platform, accessory) {
     // Set up variables from the platform
+    this.cusChar = platform.cusChar
     this.eveChar = platform.eveChar
     this.funcs = platform.funcs
     this.hapChar = platform.api.hap.Characteristic
@@ -132,6 +133,24 @@ module.exports = class deviceSwitchSingleInched {
       .updateValue(false)
     this.cacheState = 'off'
 
+    // Add a custom characteristic for inverting the switch
+    if (!this.service.testCharacteristic(this.cusChar.InvertSwitch)) {
+      this.service.addCharacteristic(this.cusChar.InvertSwitch)
+    }
+
+    // Add the set handler to invert the switch
+    this.service.getCharacteristic(this.cusChar.InvertSwitch).onSet(value => {
+      if (value) {
+        const curValue = this.service.getCharacteristic(this.hapChar.On).value
+        this.service.updateCharacteristic(this.hapChar.On, !curValue)
+        this.cacheState = curValue ? 'off' : 'on'
+        this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
+        setTimeout(() => {
+          this.service.updateCharacteristic(this.cusChar.InvertSwitch, false)
+        }, 3000)
+      }
+    })
+
     // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
     if (!platform.config.disableNoResponse) {
       this.service.getCharacteristic(this.hapChar.On).onGet(() => {
diff --git a/lib/index.js b/lib/index.js
index 7a18ab6c..804508d4 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -447,6 +447,7 @@ class eWeLinkPlatform {
 
       // Require any libraries that the accessory instances use
       this.colourUtils = require('./utils/colour-utils')
+      this.cusChar = new (require('./utils/custom-chars'))(this.api)
       this.eveChar = new (require('./utils/eve-chars'))(this.api)
       this.eveService = require('./fakegato/fakegato-history')(this.api)
 
diff --git a/lib/utils/custom-chars.js b/lib/utils/custom-chars.js
new file mode 100644
index 00000000..e33ac577
--- /dev/null
+++ b/lib/utils/custom-chars.js
@@ -0,0 +1,25 @@
+/* jshint node: true,esversion: 9, -W014, -W033 */
+/* eslint-disable new-cap */
+'use strict'
+
+module.exports = class customCharacteristics {
+  constructor (api) {
+    this.hapServ = api.hap.Service
+    this.hapChar = api.hap.Characteristic
+    this.uuids = {
+      invertSwitch: 'E965F001-079E-48FF-8F27-9C2605A29F52'
+    }
+    const self = this
+    this.InvertSwitch = function () {
+      self.hapChar.call(this, 'Invert Switch', self.uuids.invertSwitch)
+      this.setProps({
+        format: self.hapChar.Formats.BOOL,
+        perms: [self.hapChar.Perms.READ, self.hapChar.Perms.WRITE, self.hapChar.Perms.NOTIFY]
+      })
+      this.value = this.getDefaultValue()
+    }
+    const inherits = require('util').inherits
+    inherits(this.InvertSwitch, this.hapChar)
+    this.InvertSwitch.UUID = this.uuids.invertSwitch
+  }
+}

From 6ad7791e8ecc8f35c64d7f7f0fdec4358b5515d9 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 25 Aug 2021 08:35:22 +0100
Subject: [PATCH 2656/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1a80f1fc..24b45a8f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@ All notable changes to homebridge-ewelink will be documented in this file.
 
 - Support for KingArt KING-Q1 garage door device
 - Expose KingArt KING-Q4 device as a `Window` or `Door` HomeKit accessory type
+- Custom characteristic to invert status of inched switch without sending a command to device
 
 ## 8.2.1 (2021-08-22)
 

From 59d743cfee3252daafb7df6087179c6a8aec763b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 25 Aug 2021 08:35:29 +0100
Subject: [PATCH 2657/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 24b45a8f..50b92c82 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,7 +8,7 @@ All notable changes to homebridge-ewelink will be documented in this file.
 
 - Support for KingArt KING-Q1 garage door device
 - Expose KingArt KING-Q4 device as a `Window` or `Door` HomeKit accessory type
-- Custom characteristic to invert status of inched switch without sending a command to device
+- Custom Eve characteristic to invert status of inched switch without sending a command to device
 
 ## 8.2.1 (2021-08-22)
 

From 81a069ef79a067ee207e94bd352225eed0273867 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 25 Aug 2021 08:35:54 +0100
Subject: [PATCH 2658/3183] 8.2.2-beta.3

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 006cb068..3ad1cce9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.2.2-beta.2",
+  "version": "8.2.2-beta.3",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.2.2-beta.2",
+      "version": "8.2.2-beta.3",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 9cea9205..cfc07c8d 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.2.2-beta.2",
+  "version": "8.2.2-beta.3",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 022819f2e39288f8e11762521ed4d879d09803e2 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 25 Aug 2021 08:56:23 +0100
Subject: [PATCH 2659/3183] more changes to inching settings

---
 lib/device/outlet-multi.js         | 19 ++++++++++---------
 lib/device/outlet-single-inched.js | 17 ++++++-----------
 lib/device/switch-multi.js         | 19 ++++++++++---------
 lib/device/switch-single-inched.js | 19 ++++++++-----------
 4 files changed, 34 insertions(+), 40 deletions(-)

diff --git a/lib/device/outlet-multi.js b/lib/device/outlet-multi.js
index b632385a..29491f8c 100644
--- a/lib/device/outlet-multi.js
+++ b/lib/device/outlet-multi.js
@@ -116,21 +116,18 @@ module.exports = class deviceOutletMulti {
 
     // Add a custom characteristic for inverting the switch if inching setting is enabled
     if (this.accessory.context.isInched) {
-      this.service.updateCharacteristic(this.hapChar.On, false)
       if (!this.service.testCharacteristic(this.cusChar.InvertSwitch)) {
         this.service.addCharacteristic(this.cusChar.InvertSwitch)
       }
+      this.service.updateCharacteristic(
+        this.cusChar.InvertSwitch,
+        this.service.getCharacteristic(this.hapChar.On).value
+      )
 
       // Add the set handler to invert the switch
       this.service.getCharacteristic(this.cusChar.InvertSwitch).onSet(value => {
-        if (value) {
-          const curValue = this.service.getCharacteristic(this.hapChar.On).value
-          this.service.updateCharacteristic(this.hapChar.On, !curValue)
-          this.log('[%s] %s [%s].', this.name, this.lang.curState, curValue ? 'off' : 'on')
-          setTimeout(() => {
-            this.service.updateCharacteristic(this.cusChar.InvertSwitch, false)
-          }, 3000)
-        }
+        this.service.updateCharacteristic(this.hapChar.On, value)
+        this.log('[%s] %s [%s].', this.name, this.lang.curState, value ? 'on' : 'off')
       })
     }
 
@@ -216,6 +213,9 @@ module.exports = class deviceOutletMulti {
         }, 1500)
       }
       await this.platform.sendDeviceUpdate(this.accessory, params)
+      if (this.accessory.context.isInched) {
+        this.service.updateCharacteristic(this.cusChar.InvertSwitch, value)
+      }
       switch (switchNumber) {
         case '0':
           for (let i = 0; i <= this.accessory.context.channelCount; i++) {
@@ -329,6 +329,7 @@ module.exports = class deviceOutletMulti {
                   primaryState = true
                 }
                 service.updateCharacteristic(this.hapChar.On, newState === 'on')
+                service.updateCharacteristic(this.cusChar.InvertSwitch, newState === 'on')
                 subAccessory.eveService.addEntry({
                   status: newState === 'on' ? 1 : 0
                 })
diff --git a/lib/device/outlet-single-inched.js b/lib/device/outlet-single-inched.js
index 11eaf8b6..9f12a7f0 100644
--- a/lib/device/outlet-single-inched.js
+++ b/lib/device/outlet-single-inched.js
@@ -155,25 +155,19 @@ module.exports = class deviceOutletSingleInched {
     this.service
       .getCharacteristic(this.hapChar.On)
       .onSet(async value => await this.internalStateUpdate(value))
-      .updateValue(false)
-    this.cacheState = 'off'
+    this.cacheState = this.service.getCharacteristic(this.hapChar.On).value ? 'on' : 'off'
 
     // Add a custom characteristic for inverting the switch
     if (!this.service.testCharacteristic(this.cusChar.InvertSwitch)) {
       this.service.addCharacteristic(this.cusChar.InvertSwitch)
     }
+    this.service.updateCharacteristic(this.cusChar.InvertSwitch, this.cacheState === 'on')
 
     // Add the set handler to invert the switch
     this.service.getCharacteristic(this.cusChar.InvertSwitch).onSet(value => {
-      if (value) {
-        const curValue = this.service.getCharacteristic(this.hapChar.On).value
-        this.service.updateCharacteristic(this.hapChar.On, !curValue)
-        this.cacheState = curValue ? 'off' : 'on'
-        this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
-        setTimeout(() => {
-          this.service.updateCharacteristic(this.cusChar.InvertSwitch, false)
-        }, 3000)
-      }
+      this.service.updateCharacteristic(this.hapChar.On, value)
+      this.cacheState = value ? 'on' : 'off'
+      this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
     })
 
     // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
@@ -279,6 +273,7 @@ module.exports = class deviceOutletSingleInched {
       }, 1500)
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.cacheState = newValue
+      this.service.updateCharacteristic(this.cusChar.InvertSwitch, value)
       this.accessory.eveService.addEntry({ status: this.cacheState === 'on' ? 1 : 0 })
       if (this.enableLogging) {
         this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
diff --git a/lib/device/switch-multi.js b/lib/device/switch-multi.js
index 432b43bf..55ac23f4 100644
--- a/lib/device/switch-multi.js
+++ b/lib/device/switch-multi.js
@@ -113,21 +113,18 @@ module.exports = class deviceSwitchMulti {
 
     // Add a custom characteristic for inverting the switch if inching setting is enabled
     if (this.accessory.context.isInched) {
-      this.service.updateCharacteristic(this.hapChar.On, false)
       if (!this.service.testCharacteristic(this.cusChar.InvertSwitch)) {
         this.service.addCharacteristic(this.cusChar.InvertSwitch)
       }
+      this.service.updateCharacteristic(
+        this.cusChar.InvertSwitch,
+        this.service.getCharacteristic(this.hapChar.On).value
+      )
 
       // Add the set handler to invert the switch
       this.service.getCharacteristic(this.cusChar.InvertSwitch).onSet(value => {
-        if (value) {
-          const curValue = this.service.getCharacteristic(this.hapChar.On).value
-          this.service.updateCharacteristic(this.hapChar.On, !curValue)
-          this.log('[%s] %s [%s].', this.name, this.lang.curState, curValue ? 'off' : 'on')
-          setTimeout(() => {
-            this.service.updateCharacteristic(this.cusChar.InvertSwitch, false)
-          }, 3000)
-        }
+        this.service.updateCharacteristic(this.hapChar.On, value)
+        this.log('[%s] %s [%s].', this.name, this.lang.curState, value ? 'on' : 'off')
       })
     }
 
@@ -213,6 +210,9 @@ module.exports = class deviceSwitchMulti {
         }, 1500)
       }
       await this.platform.sendDeviceUpdate(this.accessory, params)
+      if (this.accessory.context.isInched) {
+        this.service.updateCharacteristic(this.cusChar.InvertSwitch, value)
+      }
       switch (switchNumber) {
         case '0':
           for (let i = 0; i <= this.accessory.context.channelCount; i++) {
@@ -325,6 +325,7 @@ module.exports = class deviceSwitchMulti {
                   primaryState = true
                 }
                 service.updateCharacteristic(this.hapChar.On, newState === 'on')
+                service.updateCharacteristic(this.cusChar.InvertSwitch, newState === 'on')
                 subAccessory.eveService.addEntry({
                   status: newState === 'on' ? 1 : 0
                 })
diff --git a/lib/device/switch-single-inched.js b/lib/device/switch-single-inched.js
index cc07b014..c568e9bc 100644
--- a/lib/device/switch-single-inched.js
+++ b/lib/device/switch-single-inched.js
@@ -130,25 +130,19 @@ module.exports = class deviceSwitchSingleInched {
     this.service
       .getCharacteristic(this.hapChar.On)
       .onSet(async value => await this.internalStateUpdate(value))
-      .updateValue(false)
-    this.cacheState = 'off'
+    this.cacheState = this.service.getCharacteristic(this.hapChar.On).value ? 'on' : 'off'
 
     // Add a custom characteristic for inverting the switch
     if (!this.service.testCharacteristic(this.cusChar.InvertSwitch)) {
       this.service.addCharacteristic(this.cusChar.InvertSwitch)
     }
+    this.service.updateCharacteristic(this.cusChar.InvertSwitch, this.cacheState === 'on')
 
     // Add the set handler to invert the switch
     this.service.getCharacteristic(this.cusChar.InvertSwitch).onSet(value => {
-      if (value) {
-        const curValue = this.service.getCharacteristic(this.hapChar.On).value
-        this.service.updateCharacteristic(this.hapChar.On, !curValue)
-        this.cacheState = curValue ? 'off' : 'on'
-        this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
-        setTimeout(() => {
-          this.service.updateCharacteristic(this.cusChar.InvertSwitch, false)
-        }, 3000)
-      }
+      this.service.updateCharacteristic(this.hapChar.On, value)
+      this.cacheState = value ? 'on' : 'off'
+      this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
     })
 
     // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
@@ -206,6 +200,7 @@ module.exports = class deviceSwitchSingleInched {
       }, 1500)
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.cacheState = newValue
+      this.service.updateCharacteristic(this.cusChar.InvertSwitch, value)
       this.accessory.eveService.addEntry({ status: this.cacheState === 'on' ? 1 : 0 })
       if (this.enableLogging) {
         this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
@@ -243,6 +238,7 @@ module.exports = class deviceSwitchSingleInched {
           }, 1500)
           this.cacheState = this.cacheState === 'on' ? 'off' : 'on'
           this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
+          this.service.updateCharacteristic(this.cusChar.InvertSwitch, this.cacheState === 'on')
           this.accessory.eveService.addEntry({ status: this.cacheState === 'on' ? 1 : 0 })
           if (params.updateSource && this.enableLogging) {
             this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
@@ -257,6 +253,7 @@ module.exports = class deviceSwitchSingleInched {
           }, 1500)
           this.cacheState = this.cacheState === 'on' ? 'off' : 'on'
           this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
+          this.service.updateCharacteristic(this.cusChar.InvertSwitch, this.cacheState === 'on')
           this.accessory.eveService.addEntry({ status: this.cacheState === 'on' ? 1 : 0 })
           if (params.updateSource && this.enableLogging) {
             this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)

From 073607f1a7d6663bd2f7e6a0b19875f925509ca6 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 25 Aug 2021 08:56:52 +0100
Subject: [PATCH 2660/3183] 8.2.2-beta.4

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 3ad1cce9..455a2afb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.2.2-beta.3",
+  "version": "8.2.2-beta.4",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.2.2-beta.3",
+      "version": "8.2.2-beta.4",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index cfc07c8d..8af347ba 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.2.2-beta.3",
+  "version": "8.2.2-beta.4",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 6859e88b09b374077330ee9dcd78c777158baede Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 25 Aug 2021 09:04:39 +0100
Subject: [PATCH 2661/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 50b92c82..520530c7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,10 @@ All notable changes to homebridge-ewelink will be documented in this file.
 - Expose KingArt KING-Q4 device as a `Window` or `Door` HomeKit accessory type
 - Custom Eve characteristic to invert status of inched switch without sending a command to device
 
+### Changed
+
+- 'Status By Inching' switches will no longer revert to 'off' when Homebridge is restarted
+
 ## 8.2.1 (2021-08-22)
 
 ### Changed

From a2289eaccc3732948b9dd042525841186eaf7135 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 26 Aug 2021 10:45:15 +0100
Subject: [PATCH 2662/3183] node v

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 455a2afb..09acef3b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -36,7 +36,7 @@
       },
       "engines": {
         "homebridge": "^1.3.4",
-        "node": "^14.17.5 || ^16.7.0"
+        "node": "^14.17.5 || ^16.8.0"
       }
     },
     "node_modules/@homebridge/plugin-ui-utils": {
diff --git a/package.json b/package.json
index 8af347ba..2cfbe87b 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,7 @@
   "main": "lib/index.js",
   "engines": {
     "homebridge": "^1.3.4",
-    "node": "^14.17.5 || ^16.7.0"
+    "node": "^14.17.5 || ^16.8.0"
   },
   "repository": {
     "type": "git",

From 74635792756b48452a7b01aab82091dc886d4f66 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 26 Aug 2021 10:45:58 +0100
Subject: [PATCH 2663/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 520530c7..79f939ab 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 All notable changes to homebridge-ewelink will be documented in this file.
 
-## BETA
+## 8.3.0 (2021-08-26)
 
 ### Added
 

From 34dc64174b9142d87a769869253081e5dd460abe Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 26 Aug 2021 10:46:22 +0100
Subject: [PATCH 2664/3183] 8.3.0

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 09acef3b..11c7f165 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.2.2-beta.4",
+  "version": "8.3.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.2.2-beta.4",
+      "version": "8.3.0",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 2cfbe87b..bf823ad7 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.2.2-beta.4",
+  "version": "8.3.0",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 67e3f0c5d7360185555f3d154b5ee3732c044fc4 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 30 Aug 2021 07:47:32 +0100
Subject: [PATCH 2665/3183] bump ws to 8.2.1

---
 package-lock.json | 14 +++++++-------
 package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 11c7f165..6ebfc597 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -32,7 +32,7 @@
         "node-persist": "^3.1.0",
         "p-queue": "^6.6.2",
         "websocket-as-promised": "^2.0.1",
-        "ws": "^8.2.0"
+        "ws": "^8.2.1"
       },
       "engines": {
         "homebridge": "^1.3.4",
@@ -532,9 +532,9 @@
       }
     },
     "node_modules/ws": {
-      "version": "8.2.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.2.0.tgz",
-      "integrity": "sha512-uYhVJ/m9oXwEI04iIVmgLmugh2qrZihkywG9y5FfZV2ATeLIzHf93qs+tUNqlttbQK957/VX3mtwAS+UfIwA4g==",
+      "version": "8.2.1",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.2.1.tgz",
+      "integrity": "sha512-XkgWpJU3sHU7gX8f13NqTn6KQ85bd1WU7noBHTT8fSohx7OS1TPY8k+cyRPCzFkia7C4mM229yeHr1qK9sM4JQ==",
       "engines": {
         "node": ">=10.0.0"
       },
@@ -882,9 +882,9 @@
       }
     },
     "ws": {
-      "version": "8.2.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.2.0.tgz",
-      "integrity": "sha512-uYhVJ/m9oXwEI04iIVmgLmugh2qrZihkywG9y5FfZV2ATeLIzHf93qs+tUNqlttbQK957/VX3mtwAS+UfIwA4g==",
+      "version": "8.2.1",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.2.1.tgz",
+      "integrity": "sha512-XkgWpJU3sHU7gX8f13NqTn6KQ85bd1WU7noBHTT8fSohx7OS1TPY8k+cyRPCzFkia7C4mM229yeHr1qK9sM4JQ==",
       "requires": {}
     }
   }
diff --git a/package.json b/package.json
index bf823ad7..a2b74db0 100644
--- a/package.json
+++ b/package.json
@@ -56,7 +56,7 @@
     "node-persist": "^3.1.0",
     "p-queue": "^6.6.2",
     "websocket-as-promised": "^2.0.1",
-    "ws": "^8.2.0"
+    "ws": "^8.2.1"
   },
   "prettier": {
     "printWidth": 100

From e56d1c3fbf238876f2aa7a6911d4641fd296bbf4 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 30 Aug 2021 07:48:04 +0100
Subject: [PATCH 2666/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 79f939ab..6b1fa399 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 All notable changes to homebridge-ewelink will be documented in this file.
 
+## UPCOMING
+
+### Changed
+
+- Bump `ws` to v8.2.1
+
 ## 8.3.0 (2021-08-26)
 
 ### Added

From ec26072ff8172f27e8f952c5bdf5b4e2c97f5de3 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 1 Sep 2021 15:36:22 +0100
Subject: [PATCH 2667/3183] bump node

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 6ebfc597..4034af92 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -36,7 +36,7 @@
       },
       "engines": {
         "homebridge": "^1.3.4",
-        "node": "^14.17.5 || ^16.8.0"
+        "node": "^14.17.6 || ^16.8.0"
       }
     },
     "node_modules/@homebridge/plugin-ui-utils": {
diff --git a/package.json b/package.json
index a2b74db0..e56dff8e 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,7 @@
   "main": "lib/index.js",
   "engines": {
     "homebridge": "^1.3.4",
-    "node": "^14.17.5 || ^16.8.0"
+    "node": "^14.17.6 || ^16.8.0"
   },
   "repository": {
     "type": "git",

From 241c031f6d4af91e1a5fe7cba5d6fcbffd47eacc Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 2 Sep 2021 17:21:15 +0100
Subject: [PATCH 2668/3183] Update package-lock.json

---
 package-lock.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 4034af92..b212d3df 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -132,9 +132,9 @@
       "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="
     },
     "node_modules/follow-redirects": {
-      "version": "1.14.2",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.2.tgz",
-      "integrity": "sha512-yLR6WaE2lbF0x4K2qE2p9PEXKLDjUjnR/xmjS3wHAYxtlsI9MLLBJUZirAHKzUZDGLxje7w/cXR49WOUo4rbsA==",
+      "version": "1.14.3",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.3.tgz",
+      "integrity": "sha512-3MkHxknWMUtb23apkgz/83fDoe+y+qr0TdgacGIA7bew+QLBo3vdgEN2xEsuXNivpFy4CyDhBBZnNZOtalmenw==",
       "funding": [
         {
           "type": "individual",
@@ -628,9 +628,9 @@
       "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="
     },
     "follow-redirects": {
-      "version": "1.14.2",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.2.tgz",
-      "integrity": "sha512-yLR6WaE2lbF0x4K2qE2p9PEXKLDjUjnR/xmjS3wHAYxtlsI9MLLBJUZirAHKzUZDGLxje7w/cXR49WOUo4rbsA=="
+      "version": "1.14.3",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.3.tgz",
+      "integrity": "sha512-3MkHxknWMUtb23apkgz/83fDoe+y+qr0TdgacGIA7bew+QLBo3vdgEN2xEsuXNivpFy4CyDhBBZnNZOtalmenw=="
     },
     "function-bind": {
       "version": "1.1.1",

From ad0b73746c4d2a3f32a6f0b32da1495cf396adb5 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 5 Sep 2021 14:18:45 +0100
Subject: [PATCH 2669/3183] bump axios to 0.21.3

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index e56dff8e..6b976377 100644
--- a/package.json
+++ b/package.json
@@ -52,7 +52,7 @@
   ],
   "dependencies": {
     "@homebridge/plugin-ui-utils": "^0.0.19",
-    "axios": "^0.21.1",
+    "axios": "^0.21.3",
     "node-persist": "^3.1.0",
     "p-queue": "^6.6.2",
     "websocket-as-promised": "^2.0.1",

From 416b25b3b9f33fca7b5bf6d98fe54df833a347e7 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 5 Sep 2021 14:21:52 +0100
Subject: [PATCH 2670/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6b1fa399..743a902e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,8 @@ All notable changes to homebridge-ewelink will be documented in this file.
 
 ### Changed
 
+- Recommended node version bumped to v14.17.6
+- Bump `axios` to v0.21.3
 - Bump `ws` to v8.2.1
 
 ## 8.3.0 (2021-08-26)

From 6d0c104d9d8d5b5f4c846ca8ad58c10ba0eb2945 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 5 Sep 2021 14:21:55 +0100
Subject: [PATCH 2671/3183] Update package-lock.json

---
 package-lock.json | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b212d3df..4591fd95 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -28,7 +28,7 @@
       "license": "MIT",
       "dependencies": {
         "@homebridge/plugin-ui-utils": "^0.0.19",
-        "axios": "^0.21.1",
+        "axios": "^0.21.3",
         "node-persist": "^3.1.0",
         "p-queue": "^6.6.2",
         "websocket-as-promised": "^2.0.1",
@@ -45,11 +45,11 @@
       "integrity": "sha512-axFX7lN2Yd7bz/6SlD7dzq5sY/N9+XYuLHPukuiyHQRDtNMRL1uDqJhOx6RVaN2tYDHB75h7YxRQWP7U44Mgzg=="
     },
     "node_modules/axios": {
-      "version": "0.21.1",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.1.tgz",
-      "integrity": "sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==",
+      "version": "0.21.3",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.3.tgz",
+      "integrity": "sha512-JtoZ3Ndke/+Iwt5n+BgSli/3idTvpt5OjKyoCmz4LX5+lPiY5l7C1colYezhlxThjNa/NhngCUWZSZFypIFuaA==",
       "dependencies": {
-        "follow-redirects": "^1.10.0"
+        "follow-redirects": "^1.14.0"
       }
     },
     "node_modules/call-bind": {
@@ -559,11 +559,11 @@
       "integrity": "sha512-axFX7lN2Yd7bz/6SlD7dzq5sY/N9+XYuLHPukuiyHQRDtNMRL1uDqJhOx6RVaN2tYDHB75h7YxRQWP7U44Mgzg=="
     },
     "axios": {
-      "version": "0.21.1",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.1.tgz",
-      "integrity": "sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==",
+      "version": "0.21.3",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.3.tgz",
+      "integrity": "sha512-JtoZ3Ndke/+Iwt5n+BgSli/3idTvpt5OjKyoCmz4LX5+lPiY5l7C1colYezhlxThjNa/NhngCUWZSZFypIFuaA==",
       "requires": {
-        "follow-redirects": "^1.10.0"
+        "follow-redirects": "^1.14.0"
       }
     },
     "call-bind": {

From 4368372dc65368505d1a550e681b0056788c1733 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 5 Sep 2021 14:25:30 +0100
Subject: [PATCH 2672/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 743a902e..9e69d26a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 All notable changes to homebridge-ewelink will be documented in this file.
 
-## UPCOMING
+## 8.3.1 (2021-09-05)
 
 ### Changed
 

From ae075fe2daca669c0db7222adc978f097b704972 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 5 Sep 2021 14:25:54 +0100
Subject: [PATCH 2673/3183] 8.3.1

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 4591fd95..027197a1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.3.0",
+  "version": "8.3.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.3.0",
+      "version": "8.3.1",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 6b976377..0ba45bcd 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.3.0",
+  "version": "8.3.1",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 2a3b9fc57e36bbc68056836c48c5754bba6219f1 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 7 Sep 2021 07:30:49 +0100
Subject: [PATCH 2674/3183] bump axios

---
 package-lock.json | 14 +++++++-------
 package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 027197a1..2d045018 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -28,7 +28,7 @@
       "license": "MIT",
       "dependencies": {
         "@homebridge/plugin-ui-utils": "^0.0.19",
-        "axios": "^0.21.3",
+        "axios": "^0.21.4",
         "node-persist": "^3.1.0",
         "p-queue": "^6.6.2",
         "websocket-as-promised": "^2.0.1",
@@ -45,9 +45,9 @@
       "integrity": "sha512-axFX7lN2Yd7bz/6SlD7dzq5sY/N9+XYuLHPukuiyHQRDtNMRL1uDqJhOx6RVaN2tYDHB75h7YxRQWP7U44Mgzg=="
     },
     "node_modules/axios": {
-      "version": "0.21.3",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.3.tgz",
-      "integrity": "sha512-JtoZ3Ndke/+Iwt5n+BgSli/3idTvpt5OjKyoCmz4LX5+lPiY5l7C1colYezhlxThjNa/NhngCUWZSZFypIFuaA==",
+      "version": "0.21.4",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz",
+      "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==",
       "dependencies": {
         "follow-redirects": "^1.14.0"
       }
@@ -559,9 +559,9 @@
       "integrity": "sha512-axFX7lN2Yd7bz/6SlD7dzq5sY/N9+XYuLHPukuiyHQRDtNMRL1uDqJhOx6RVaN2tYDHB75h7YxRQWP7U44Mgzg=="
     },
     "axios": {
-      "version": "0.21.3",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.3.tgz",
-      "integrity": "sha512-JtoZ3Ndke/+Iwt5n+BgSli/3idTvpt5OjKyoCmz4LX5+lPiY5l7C1colYezhlxThjNa/NhngCUWZSZFypIFuaA==",
+      "version": "0.21.4",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz",
+      "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==",
       "requires": {
         "follow-redirects": "^1.14.0"
       }
diff --git a/package.json b/package.json
index 0ba45bcd..c6d7c988 100644
--- a/package.json
+++ b/package.json
@@ -52,7 +52,7 @@
   ],
   "dependencies": {
     "@homebridge/plugin-ui-utils": "^0.0.19",
-    "axios": "^0.21.3",
+    "axios": "^0.21.4",
     "node-persist": "^3.1.0",
     "p-queue": "^6.6.2",
     "websocket-as-promised": "^2.0.1",

From 3abfe7a335a604bb6b208774fd8225e04f252e9f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 7 Sep 2021 07:31:12 +0100
Subject: [PATCH 2675/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9e69d26a..3b623f52 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 All notable changes to homebridge-ewelink will be documented in this file.
 
+## UPCOMING
+
+### Changed
+
+- Bump `axios` to v0.21.4
+
 ## 8.3.1 (2021-09-05)
 
 ### Changed

From a86683f4eac172f8cb9725d24d2b6baec0a8e462 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 7 Sep 2021 16:36:21 +0100
Subject: [PATCH 2676/3183] bump node 16 version

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 2d045018..81b8b293 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -36,7 +36,7 @@
       },
       "engines": {
         "homebridge": "^1.3.4",
-        "node": "^14.17.6 || ^16.8.0"
+        "node": "^14.17.6 || ^16.9.0"
       }
     },
     "node_modules/@homebridge/plugin-ui-utils": {
diff --git a/package.json b/package.json
index c6d7c988..1ccec05d 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,7 @@
   "main": "lib/index.js",
   "engines": {
     "homebridge": "^1.3.4",
-    "node": "^14.17.6 || ^16.8.0"
+    "node": "^14.17.6 || ^16.9.0"
   },
   "repository": {
     "type": "git",

From 0fabd283c6c88e4dc912f4f6938c5483a069d28f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 8 Sep 2021 07:34:36 +0100
Subject: [PATCH 2677/3183] Update package-lock.json

---
 package-lock.json | 50 +++++++++++++++++++++++++++++++++++------------
 1 file changed, 38 insertions(+), 12 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 81b8b293..99d629d2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -81,21 +81,22 @@
       }
     },
     "node_modules/es-abstract": {
-      "version": "1.18.5",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.5.tgz",
-      "integrity": "sha512-DDggyJLoS91CkJjgauM5c0yZMjiD1uK3KcaCeAmffGwZ+ODWzOkPN4QwRbsK5DOFf06fywmyLci3ZD8jLGhVYA==",
+      "version": "1.18.6",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.6.tgz",
+      "integrity": "sha512-kAeIT4cku5eNLNuUKhlmtuk1/TRZvQoYccn6TO0cSVdf1kzB0T7+dYuVK9MWM7l+/53W2Q8M7N2c6MQvhXFcUQ==",
       "dependencies": {
         "call-bind": "^1.0.2",
         "es-to-primitive": "^1.2.1",
         "function-bind": "^1.1.1",
         "get-intrinsic": "^1.1.1",
+        "get-symbol-description": "^1.0.0",
         "has": "^1.0.3",
         "has-symbols": "^1.0.2",
         "internal-slot": "^1.0.3",
-        "is-callable": "^1.2.3",
+        "is-callable": "^1.2.4",
         "is-negative-zero": "^2.0.1",
-        "is-regex": "^1.1.3",
-        "is-string": "^1.0.6",
+        "is-regex": "^1.1.4",
+        "is-string": "^1.0.7",
         "object-inspect": "^1.11.0",
         "object-keys": "^1.1.1",
         "object.assign": "^4.1.2",
@@ -168,6 +169,21 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/get-symbol-description": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz",
+      "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==",
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/has": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
@@ -589,21 +605,22 @@
       }
     },
     "es-abstract": {
-      "version": "1.18.5",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.5.tgz",
-      "integrity": "sha512-DDggyJLoS91CkJjgauM5c0yZMjiD1uK3KcaCeAmffGwZ+ODWzOkPN4QwRbsK5DOFf06fywmyLci3ZD8jLGhVYA==",
+      "version": "1.18.6",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.6.tgz",
+      "integrity": "sha512-kAeIT4cku5eNLNuUKhlmtuk1/TRZvQoYccn6TO0cSVdf1kzB0T7+dYuVK9MWM7l+/53W2Q8M7N2c6MQvhXFcUQ==",
       "requires": {
         "call-bind": "^1.0.2",
         "es-to-primitive": "^1.2.1",
         "function-bind": "^1.1.1",
         "get-intrinsic": "^1.1.1",
+        "get-symbol-description": "^1.0.0",
         "has": "^1.0.3",
         "has-symbols": "^1.0.2",
         "internal-slot": "^1.0.3",
-        "is-callable": "^1.2.3",
+        "is-callable": "^1.2.4",
         "is-negative-zero": "^2.0.1",
-        "is-regex": "^1.1.3",
-        "is-string": "^1.0.6",
+        "is-regex": "^1.1.4",
+        "is-string": "^1.0.7",
         "object-inspect": "^1.11.0",
         "object-keys": "^1.1.1",
         "object.assign": "^4.1.2",
@@ -647,6 +664,15 @@
         "has-symbols": "^1.0.1"
       }
     },
+    "get-symbol-description": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz",
+      "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==",
+      "requires": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.1.1"
+      }
+    },
     "has": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",

From 7d411f962ae425ef886eb5704affb1dfa46035d7 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 8 Sep 2021 07:35:08 +0100
Subject: [PATCH 2678/3183] simplify `configureAccessory`

---
 lib/index.js | 39 +++++++++++----------------------------
 1 file changed, 11 insertions(+), 28 deletions(-)

diff --git a/lib/index.js b/lib/index.js
index 804508d4..1f64120b 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1474,35 +1474,18 @@ class eWeLinkPlatform {
   }
 
   configureAccessory (accessory) {
-    // Function is called to retrieve each accessory from the cache on startup
-    try {
-      if (!this.log) {
-        return
-      }
-
-      // A function for when the identify button is pressed in HomeKit apps
-      accessory.on('identify', (paired, callback) => {
-        callback()
-        this.log('[%s] %s.', accessory.displayName, this.lang.identify)
-      })
-
-      // Set the correct firmware version if we can
-      if (this.api && accessory.context.firmware) {
-        accessory
-          .getService(this.api.hap.Service.AccessoryInformation)
-          .updateCharacteristic(
-            this.api.hap.Characteristic.FirmwareRevision,
-            accessory.context.firmware
-          )
-      }
-
-      // Add the configured accessory to our global map
-      devicesInHB.set(accessory.UUID, accessory)
-    } catch (err) {
-      // Catch any errors during retrieve
-      const eText = this.funcs.parseError(err)
-      this.log.warn('[%s] %s %s.', accessory.displayName, this.lang.devNotConf, eText)
+    // Set the correct firmware version if we can
+    if (this.api && accessory.context.firmware) {
+      accessory
+        .getService(this.api.hap.Service.AccessoryInformation)
+        .updateCharacteristic(
+          this.api.hap.Characteristic.FirmwareRevision,
+          accessory.context.firmware
+        )
     }
+
+    // Add the configured accessory to our global map
+    devicesInHB.set(accessory.UUID, accessory)
   }
 
   removeAccessory (accessory) {

From b19d74ad536e6dd5894b3e1c23e2965db1e6d36f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 9 Sep 2021 08:46:07 +0100
Subject: [PATCH 2679/3183] bump `ws` dep

---
 package-lock.json | 14 +++++++-------
 package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 99d629d2..474fbee3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -32,7 +32,7 @@
         "node-persist": "^3.1.0",
         "p-queue": "^6.6.2",
         "websocket-as-promised": "^2.0.1",
-        "ws": "^8.2.1"
+        "ws": "^8.2.2"
       },
       "engines": {
         "homebridge": "^1.3.4",
@@ -548,9 +548,9 @@
       }
     },
     "node_modules/ws": {
-      "version": "8.2.1",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.2.1.tgz",
-      "integrity": "sha512-XkgWpJU3sHU7gX8f13NqTn6KQ85bd1WU7noBHTT8fSohx7OS1TPY8k+cyRPCzFkia7C4mM229yeHr1qK9sM4JQ==",
+      "version": "8.2.2",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.2.2.tgz",
+      "integrity": "sha512-Q6B6H2oc8QY3llc3cB8kVmQ6pnJWVQbP7Q5algTcIxx7YEpc0oU4NBVHlztA7Ekzfhw2r0rPducMUiCGWKQRzw==",
       "engines": {
         "node": ">=10.0.0"
       },
@@ -908,9 +908,9 @@
       }
     },
     "ws": {
-      "version": "8.2.1",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.2.1.tgz",
-      "integrity": "sha512-XkgWpJU3sHU7gX8f13NqTn6KQ85bd1WU7noBHTT8fSohx7OS1TPY8k+cyRPCzFkia7C4mM229yeHr1qK9sM4JQ==",
+      "version": "8.2.2",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.2.2.tgz",
+      "integrity": "sha512-Q6B6H2oc8QY3llc3cB8kVmQ6pnJWVQbP7Q5algTcIxx7YEpc0oU4NBVHlztA7Ekzfhw2r0rPducMUiCGWKQRzw==",
       "requires": {}
     }
   }
diff --git a/package.json b/package.json
index 1ccec05d..dfe0d79e 100644
--- a/package.json
+++ b/package.json
@@ -56,7 +56,7 @@
     "node-persist": "^3.1.0",
     "p-queue": "^6.6.2",
     "websocket-as-promised": "^2.0.1",
-    "ws": "^8.2.1"
+    "ws": "^8.2.2"
   },
   "prettier": {
     "printWidth": 100

From 9640a5885142a30564c4bb742bc618ae3a782092 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 9 Sep 2021 08:48:30 +0100
Subject: [PATCH 2680/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3b623f52..2c7f9746 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,11 +2,13 @@
 
 All notable changes to homebridge-ewelink will be documented in this file.
 
-## UPCOMING
+## 8.3.2 (2021-09-09)
 
 ### Changed
 
+- `configureAccessory` function simplified to reduce chance of accessory cache retrieval failing
 - Bump `axios` to v0.21.4
+- Bump `ws` to v8.2.2
 
 ## 8.3.1 (2021-09-05)
 

From 411bb63c6d480ca57438042013ee45840450f191 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 9 Sep 2021 08:48:55 +0100
Subject: [PATCH 2681/3183] 8.3.2

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 474fbee3..cfbc26c1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.3.1",
+  "version": "8.3.2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.3.1",
+      "version": "8.3.2",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index dfe0d79e..5c7e25c6 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.3.1",
+  "version": "8.3.2",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From d8bf03be17b51a7337ad0b2a4c4c4b89c14522ed Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 12 Sep 2021 13:14:07 +0100
Subject: [PATCH 2682/3183] bump node 16 v

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index cfbc26c1..b36160a2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -36,7 +36,7 @@
       },
       "engines": {
         "homebridge": "^1.3.4",
-        "node": "^14.17.6 || ^16.9.0"
+        "node": "^14.17.6 || ^16.9.1"
       }
     },
     "node_modules/@homebridge/plugin-ui-utils": {
diff --git a/package.json b/package.json
index 5c7e25c6..382cf923 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,7 @@
   "main": "lib/index.js",
   "engines": {
     "homebridge": "^1.3.4",
-    "node": "^14.17.6 || ^16.9.0"
+    "node": "^14.17.6 || ^16.9.1"
   },
   "repository": {
     "type": "git",

From 23fc6b8465a2edd3e67110d36c5da1cbe043fa5d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 13 Sep 2021 11:56:52 +0100
Subject: [PATCH 2683/3183] set characteristic on valve off

---
 lib/device/simulation/valve-four.js | 6 +++---
 lib/device/simulation/valve-one.js  | 6 +++---
 lib/device/simulation/valve-two.js  | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/lib/device/simulation/valve-four.js b/lib/device/simulation/valve-four.js
index 7bc075f0..48439383 100644
--- a/lib/device/simulation/valve-four.js
+++ b/lib/device/simulation/valve-four.js
@@ -86,7 +86,7 @@ module.exports = class deviceValveFour {
 
           // Set a new active timer with the new time amount
           valveService.timer = setTimeout(
-            () => valveService.updateCharacteristic(this.hapChar.Active, 0),
+            () => valveService.setCharacteristic(this.hapChar.Active, 0),
             value * 1000
           )
         }
@@ -137,7 +137,7 @@ module.exports = class deviceValveFour {
             this.log('[%s] [%s] %s [%s].', this.name, valve, this.lang.curState, this.lang.valveYes)
           }
           valveService.timer = setTimeout(() => {
-            valveService.updateCharacteristic(this.hapChar.Active, 0)
+            valveService.setCharacteristic(this.hapChar.Active, 0)
           }, timer * 1000)
           break
         }
@@ -176,7 +176,7 @@ module.exports = class deviceValveFour {
               )
             }
             valveService.timer = setTimeout(() => {
-              valveService.updateCharacteristic(this.hapChar.Active, 0)
+              valveService.setCharacteristic(this.hapChar.Active, 0)
             }, timer * 1000)
           }
           return
diff --git a/lib/device/simulation/valve-one.js b/lib/device/simulation/valve-one.js
index 4e06e6cd..68679ac3 100644
--- a/lib/device/simulation/valve-one.js
+++ b/lib/device/simulation/valve-one.js
@@ -125,7 +125,7 @@ module.exports = class deviceValveOne {
 
         // Set a new active timer with the new time amount
         this.timer = setTimeout(
-          () => this.service.updateCharacteristic(this.hapChar.Active, 0),
+          () => this.service.setCharacteristic(this.hapChar.Active, 0),
           value * 1000
         )
       }
@@ -187,7 +187,7 @@ module.exports = class deviceValveOne {
             this.log('[%s] %s [%s].', this.name, this.lang.curState, this.lang.valveYes)
           }
           this.timer = setTimeout(() => {
-            this.service.updateCharacteristic(this.hapChar.Active, 0)
+            this.service.setCharacteristic(this.hapChar.Active, 0)
           }, timer * 1000)
           break
         }
@@ -242,7 +242,7 @@ module.exports = class deviceValveOne {
               this.log('[%s] %s [%s].', this.name, this.lang.curState, this.lang.valveYes)
             }
             this.timer = setTimeout(() => {
-              this.service.updateCharacteristic(this.hapChar.Active, 0)
+              this.service.setCharacteristic(this.hapChar.Active, 0)
             }, timer * 1000)
           }
         } else {
diff --git a/lib/device/simulation/valve-two.js b/lib/device/simulation/valve-two.js
index 17327401..8b805816 100644
--- a/lib/device/simulation/valve-two.js
+++ b/lib/device/simulation/valve-two.js
@@ -102,7 +102,7 @@ module.exports = class deviceValveTwo {
 
           // Set a new active timer with the new time amount
           valveService.timer = setTimeout(
-            () => valveService.updateCharacteristic(this.hapChar.Active, 0),
+            () => valveService.setCharacteristic(this.hapChar.Active, 0),
             value * 1000
           )
         }
@@ -160,7 +160,7 @@ module.exports = class deviceValveTwo {
             this.log('[%s] [%s] %s [%s].', this.name, valve, this.lang.curState, this.lang.valveYes)
           }
           valveService.timer = setTimeout(() => {
-            valveService.updateCharacteristic(this.hapChar.Active, 0)
+            valveService.setCharacteristic(this.hapChar.Active, 0)
           }, timer * 1000)
           break
         }
@@ -213,7 +213,7 @@ module.exports = class deviceValveTwo {
                 )
               }
               valveService.timer = setTimeout(() => {
-                valveService.updateCharacteristic(this.hapChar.Active, 0)
+                valveService.setCharacteristic(this.hapChar.Active, 0)
               }, timer * 1000)
             }
             return

From 4ecec028377542d8086d7915425abb9b0026e7ab Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 13 Sep 2021 11:57:27 +0100
Subject: [PATCH 2684/3183] 8.3.3-beta.0

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b36160a2..aea26ee6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.3.2",
+  "version": "8.3.3-beta.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.3.2",
+      "version": "8.3.3-beta.0",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 382cf923..e8067bbc 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.3.2",
+  "version": "8.3.3-beta.0",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 4ac849b3d596f9448fcbf2076642b08d95e65c0d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 13 Sep 2021 12:58:15 +0100
Subject: [PATCH 2685/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2c7f9746..7896394a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 All notable changes to homebridge-ewelink will be documented in this file.
 
+## BETA
+
+## Fixed
+
+- Fixed an issue where an irrigation valve simulation would not turn off after the set time
+
 ## 8.3.2 (2021-09-09)
 
 ### Changed

From 49d457ecad43834741606d2311e54c4b7bc1ab99 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 14 Sep 2021 09:07:26 +0100
Subject: [PATCH 2686/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7896394a..d8f97853 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 All notable changes to homebridge-ewelink will be documented in this file.
 
-## BETA
+## 8.3.3 (2021-09-14)
 
 ## Fixed
 

From e6420226e8ceacdc01d0fcfc6aefcbe1606f6514 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 14 Sep 2021 09:07:49 +0100
Subject: [PATCH 2687/3183] 8.3.3

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index aea26ee6..af234dc8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.3.3-beta.0",
+  "version": "8.3.3",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.3.3-beta.0",
+      "version": "8.3.3",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index e8067bbc..49df000b 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.3.3-beta.0",
+  "version": "8.3.3",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 3c75b39e28abcf9c8b9e0132e9982a18d6d88ef3 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 16 Sep 2021 18:47:24 +0100
Subject: [PATCH 2688/3183] Update package-lock.json

---
 package-lock.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index af234dc8..d9e2d345 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -133,9 +133,9 @@
       "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="
     },
     "node_modules/follow-redirects": {
-      "version": "1.14.3",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.3.tgz",
-      "integrity": "sha512-3MkHxknWMUtb23apkgz/83fDoe+y+qr0TdgacGIA7bew+QLBo3vdgEN2xEsuXNivpFy4CyDhBBZnNZOtalmenw==",
+      "version": "1.14.4",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.4.tgz",
+      "integrity": "sha512-zwGkiSXC1MUJG/qmeIFH2HBJx9u0V46QGUe3YR1fXG8bXQxq7fLj0RjLZQ5nubr9qNJUZrH+xUcwXEoXNpfS+g==",
       "funding": [
         {
           "type": "individual",
@@ -645,9 +645,9 @@
       "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="
     },
     "follow-redirects": {
-      "version": "1.14.3",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.3.tgz",
-      "integrity": "sha512-3MkHxknWMUtb23apkgz/83fDoe+y+qr0TdgacGIA7bew+QLBo3vdgEN2xEsuXNivpFy4CyDhBBZnNZOtalmenw=="
+      "version": "1.14.4",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.4.tgz",
+      "integrity": "sha512-zwGkiSXC1MUJG/qmeIFH2HBJx9u0V46QGUe3YR1fXG8bXQxq7fLj0RjLZQ5nubr9qNJUZrH+xUcwXEoXNpfS+g=="
     },
     "function-bind": {
       "version": "1.1.1",

From ff05ddb299d81e55adc8e9c13264f4259b3a95f9 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 21 Sep 2021 15:02:19 +0100
Subject: [PATCH 2689/3183] add motorTurn to accepted params

---
 lib/utils/constants.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index bf7eb364..1a90d7ed 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -326,6 +326,7 @@ module.exports = {
     'mainSwitch',
     'mode',
     'motion',
+    'motorTurn',
     'online',
     'per',
     'power',

From e52b1fd01a009ef27777898550caefebe43a67ab Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 21 Sep 2021 15:02:52 +0100
Subject: [PATCH 2690/3183] 8.3.4-beta.0

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d9e2d345..ba7859f1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.3.3",
+  "version": "8.3.4-beta.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.3.3",
+      "version": "8.3.4-beta.0",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 49df000b..92feae20 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.3.3",
+  "version": "8.3.4-beta.0",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 83a3c259c8e14b1a090ec3f34047b877379b89ce Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 23 Sep 2021 10:39:23 +0100
Subject: [PATCH 2691/3183] bump deps

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ba7859f1..603f51b1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -36,7 +36,7 @@
       },
       "engines": {
         "homebridge": "^1.3.4",
-        "node": "^14.17.6 || ^16.9.1"
+        "node": "^14.17.6 || ^16.10.0"
       }
     },
     "node_modules/@homebridge/plugin-ui-utils": {
diff --git a/package.json b/package.json
index 92feae20..9a5b843f 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,7 @@
   "main": "lib/index.js",
   "engines": {
     "homebridge": "^1.3.4",
-    "node": "^14.17.6 || ^16.9.1"
+    "node": "^14.17.6 || ^16.10.0"
   },
   "repository": {
     "type": "git",

From 9abc5a4b8d3598395cc9e4637970713175abb12b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 29 Sep 2021 10:56:35 +0100
Subject: [PATCH 2692/3183] Update package-lock.json

---
 package-lock.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 603f51b1..ba886f09 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -81,9 +81,9 @@
       }
     },
     "node_modules/es-abstract": {
-      "version": "1.18.6",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.6.tgz",
-      "integrity": "sha512-kAeIT4cku5eNLNuUKhlmtuk1/TRZvQoYccn6TO0cSVdf1kzB0T7+dYuVK9MWM7l+/53W2Q8M7N2c6MQvhXFcUQ==",
+      "version": "1.18.7",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.7.tgz",
+      "integrity": "sha512-uFG1gyVX91tZIiDWNmPsL8XNpiCk/6tkB7MZphoSJflS4w+KgWyQ2gjCVDnsPxFAo9WjRXG3eqONNYdfbJjAtw==",
       "dependencies": {
         "call-bind": "^1.0.2",
         "es-to-primitive": "^1.2.1",
@@ -605,9 +605,9 @@
       }
     },
     "es-abstract": {
-      "version": "1.18.6",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.6.tgz",
-      "integrity": "sha512-kAeIT4cku5eNLNuUKhlmtuk1/TRZvQoYccn6TO0cSVdf1kzB0T7+dYuVK9MWM7l+/53W2Q8M7N2c6MQvhXFcUQ==",
+      "version": "1.18.7",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.7.tgz",
+      "integrity": "sha512-uFG1gyVX91tZIiDWNmPsL8XNpiCk/6tkB7MZphoSJflS4w+KgWyQ2gjCVDnsPxFAo9WjRXG3eqONNYdfbJjAtw==",
       "requires": {
         "call-bind": "^1.0.2",
         "es-to-primitive": "^1.2.1",

From 0b5e7645f657cb657bcc959d370558486931caed Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 29 Sep 2021 10:56:45 +0100
Subject: [PATCH 2693/3183] [temp] log all incoming ws

---
 lib/connection/ws.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/connection/ws.js b/lib/connection/ws.js
index d436d0d2..ce9e8af0 100644
--- a/lib/connection/ws.js
+++ b/lib/connection/ws.js
@@ -183,6 +183,8 @@ module.exports = class connectionWS {
           return
         }
 
+        this.log.error(JSON.stringify(msg))
+
         // Set a device online flag now which we can change later
         let onlineStatus = true
 

From c4dda528e40f27432a863383bfc1edb2dca24937 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 29 Sep 2021 10:57:07 +0100
Subject: [PATCH 2694/3183] 8.3.4-beta.1

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ba886f09..8f5d9742 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.3.4-beta.0",
+  "version": "8.3.4-beta.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.3.4-beta.0",
+      "version": "8.3.4-beta.1",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 9a5b843f..2bc1f15c 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.3.4-beta.0",
+  "version": "8.3.4-beta.1",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 284d206f121b29c88f33af3a165a739883708508 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 29 Sep 2021 11:08:51 +0100
Subject: [PATCH 2695/3183] [temp] remove ws timeout

---
 lib/connection/ws.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/connection/ws.js b/lib/connection/ws.js
index ce9e8af0..2e88e7bd 100644
--- a/lib/connection/ws.js
+++ b/lib/connection/ws.js
@@ -102,8 +102,7 @@ module.exports = class connectionWS {
         unpackMessage: data => {
           data = data.toString()
           return data === 'pong' ? data : JSON.parse(data)
-        },
-        timeout: 6000
+        }
       })
 
       // Add a listener to authenticate when a web socket connection is opened

From 76ff5f48e7856201e7ff3971777713ad29be9d55 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 29 Sep 2021 11:09:26 +0100
Subject: [PATCH 2696/3183] 8.3.4-beta.2

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 8f5d9742..feca96d3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.3.4-beta.1",
+  "version": "8.3.4-beta.2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.3.4-beta.1",
+      "version": "8.3.4-beta.2",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 2bc1f15c..b31f92fd 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.3.4-beta.1",
+  "version": "8.3.4-beta.2",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From a4578ee4a8cd9e37e5f01d6cdc498aa067596c79 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 29 Sep 2021 16:56:26 +0100
Subject: [PATCH 2697/3183] bump node

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index feca96d3..2279cf2c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -36,7 +36,7 @@
       },
       "engines": {
         "homebridge": "^1.3.4",
-        "node": "^14.17.6 || ^16.10.0"
+        "node": "^14.18.0 || ^16.10.0"
       }
     },
     "node_modules/@homebridge/plugin-ui-utils": {
diff --git a/package.json b/package.json
index b31f92fd..9ee613b6 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,7 @@
   "main": "lib/index.js",
   "engines": {
     "homebridge": "^1.3.4",
-    "node": "^14.17.6 || ^16.10.0"
+    "node": "^14.18.0 || ^16.10.0"
   },
   "repository": {
     "type": "git",

From 5b4555b9250d0d3b7004f4af942d6df69a4244c4 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 30 Sep 2021 09:50:18 +0100
Subject: [PATCH 2698/3183] revert ws debugging

---
 lib/connection/ws.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/connection/ws.js b/lib/connection/ws.js
index 2e88e7bd..1a8ded65 100644
--- a/lib/connection/ws.js
+++ b/lib/connection/ws.js
@@ -43,7 +43,8 @@ module.exports = class connectionWS {
             .substr(2, 8),
           ts: Math.floor(new Date().getTime() / 1000),
           version: 8
-        }
+        },
+        timeout: 6000
       })
 
       // Parse the response
@@ -182,8 +183,6 @@ module.exports = class connectionWS {
           return
         }
 
-        this.log.error(JSON.stringify(msg))
-
         // Set a device online flag now which we can change later
         let onlineStatus = true
 

From c3e893f21d8046db5d169e61501505396778641c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 30 Sep 2021 09:54:22 +0100
Subject: [PATCH 2699/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d8f97853..42b15802 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 All notable changes to homebridge-ewelink will be documented in this file.
 
+## 8.3.4 (2021-09-30)
+
+### Changed
+
+- Recommended node versions bumped to v14.18.0 or v16.10.0
+
 ## 8.3.3 (2021-09-14)
 
 ## Fixed

From d0dfa39f199498fd97fba958dd2157f6398b2da5 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 30 Sep 2021 09:54:48 +0100
Subject: [PATCH 2700/3183] 8.3.4

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 2279cf2c..84e74cdf 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.3.4-beta.2",
+  "version": "8.3.4",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.3.4-beta.2",
+      "version": "8.3.4",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 9ee613b6..739bc8b4 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.3.4-beta.2",
+  "version": "8.3.4",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 225112c936894cde1ca446d0c54a664ac8f80061 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 1 Oct 2021 07:01:57 +0100
Subject: [PATCH 2701/3183] bump axios

---
 package-lock.json | 66 ++++++++++++++++++++++++++++++++++++-----------
 package.json      |  2 +-
 2 files changed, 52 insertions(+), 16 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 84e74cdf..7cbbd911 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -28,7 +28,7 @@
       "license": "MIT",
       "dependencies": {
         "@homebridge/plugin-ui-utils": "^0.0.19",
-        "axios": "^0.21.4",
+        "axios": "^0.22.0",
         "node-persist": "^3.1.0",
         "p-queue": "^6.6.2",
         "websocket-as-promised": "^2.0.1",
@@ -45,11 +45,11 @@
       "integrity": "sha512-axFX7lN2Yd7bz/6SlD7dzq5sY/N9+XYuLHPukuiyHQRDtNMRL1uDqJhOx6RVaN2tYDHB75h7YxRQWP7U44Mgzg=="
     },
     "node_modules/axios": {
-      "version": "0.21.4",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz",
-      "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==",
+      "version": "0.22.0",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-0.22.0.tgz",
+      "integrity": "sha512-Z0U3uhqQeg1oNcihswf4ZD57O3NrR1+ZXhxaROaWpDmsDTx7T2HNBV2ulBtie2hwJptu8UvgnJoK+BIqdzh/1w==",
       "dependencies": {
-        "follow-redirects": "^1.14.0"
+        "follow-redirects": "^1.14.4"
       }
     },
     "node_modules/call-bind": {
@@ -81,9 +81,9 @@
       }
     },
     "node_modules/es-abstract": {
-      "version": "1.18.7",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.7.tgz",
-      "integrity": "sha512-uFG1gyVX91tZIiDWNmPsL8XNpiCk/6tkB7MZphoSJflS4w+KgWyQ2gjCVDnsPxFAo9WjRXG3eqONNYdfbJjAtw==",
+      "version": "1.19.0",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.0.tgz",
+      "integrity": "sha512-oWPrF+7P1nGv/rw9oIInwdkmI1qediEJSvVfHFryBd8mWllCKB5tke3aKyf51J6chgyKmi6mODqdnin2yb88Nw==",
       "dependencies": {
         "call-bind": "^1.0.2",
         "es-to-primitive": "^1.2.1",
@@ -96,7 +96,9 @@
         "is-callable": "^1.2.4",
         "is-negative-zero": "^2.0.1",
         "is-regex": "^1.1.4",
+        "is-shared-array-buffer": "^1.0.1",
         "is-string": "^1.0.7",
+        "is-weakref": "^1.0.1",
         "object-inspect": "^1.11.0",
         "object-keys": "^1.1.1",
         "object.assign": "^4.1.2",
@@ -332,6 +334,14 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/is-shared-array-buffer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz",
+      "integrity": "sha512-IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA==",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/is-string": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
@@ -360,6 +370,17 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/is-weakref": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.1.tgz",
+      "integrity": "sha512-b2jKc2pQZjaeFYWEf7ScFj+Be1I+PXmlu572Q8coTXZ+LD/QQZ7ShPMst8h16riVgyXTQwUsFEl74mDvc/3MHQ==",
+      "dependencies": {
+        "call-bind": "^1.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/node-persist": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/node-persist/-/node-persist-3.1.0.tgz",
@@ -575,11 +596,11 @@
       "integrity": "sha512-axFX7lN2Yd7bz/6SlD7dzq5sY/N9+XYuLHPukuiyHQRDtNMRL1uDqJhOx6RVaN2tYDHB75h7YxRQWP7U44Mgzg=="
     },
     "axios": {
-      "version": "0.21.4",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz",
-      "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==",
+      "version": "0.22.0",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-0.22.0.tgz",
+      "integrity": "sha512-Z0U3uhqQeg1oNcihswf4ZD57O3NrR1+ZXhxaROaWpDmsDTx7T2HNBV2ulBtie2hwJptu8UvgnJoK+BIqdzh/1w==",
       "requires": {
-        "follow-redirects": "^1.14.0"
+        "follow-redirects": "^1.14.4"
       }
     },
     "call-bind": {
@@ -605,9 +626,9 @@
       }
     },
     "es-abstract": {
-      "version": "1.18.7",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.7.tgz",
-      "integrity": "sha512-uFG1gyVX91tZIiDWNmPsL8XNpiCk/6tkB7MZphoSJflS4w+KgWyQ2gjCVDnsPxFAo9WjRXG3eqONNYdfbJjAtw==",
+      "version": "1.19.0",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.0.tgz",
+      "integrity": "sha512-oWPrF+7P1nGv/rw9oIInwdkmI1qediEJSvVfHFryBd8mWllCKB5tke3aKyf51J6chgyKmi6mODqdnin2yb88Nw==",
       "requires": {
         "call-bind": "^1.0.2",
         "es-to-primitive": "^1.2.1",
@@ -620,7 +641,9 @@
         "is-callable": "^1.2.4",
         "is-negative-zero": "^2.0.1",
         "is-regex": "^1.1.4",
+        "is-shared-array-buffer": "^1.0.1",
         "is-string": "^1.0.7",
+        "is-weakref": "^1.0.1",
         "object-inspect": "^1.11.0",
         "object-keys": "^1.1.1",
         "object.assign": "^4.1.2",
@@ -761,6 +784,11 @@
         "has-tostringtag": "^1.0.0"
       }
     },
+    "is-shared-array-buffer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz",
+      "integrity": "sha512-IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA=="
+    },
     "is-string": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
@@ -777,6 +805,14 @@
         "has-symbols": "^1.0.2"
       }
     },
+    "is-weakref": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.1.tgz",
+      "integrity": "sha512-b2jKc2pQZjaeFYWEf7ScFj+Be1I+PXmlu572Q8coTXZ+LD/QQZ7ShPMst8h16riVgyXTQwUsFEl74mDvc/3MHQ==",
+      "requires": {
+        "call-bind": "^1.0.0"
+      }
+    },
     "node-persist": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/node-persist/-/node-persist-3.1.0.tgz",
diff --git a/package.json b/package.json
index 739bc8b4..c6440e02 100644
--- a/package.json
+++ b/package.json
@@ -52,7 +52,7 @@
   ],
   "dependencies": {
     "@homebridge/plugin-ui-utils": "^0.0.19",
-    "axios": "^0.21.4",
+    "axios": "^0.22.0",
     "node-persist": "^3.1.0",
     "p-queue": "^6.6.2",
     "websocket-as-promised": "^2.0.1",

From 443ec67a772c357b72cd97cf81c473b1d15e9013 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 1 Oct 2021 07:02:31 +0100
Subject: [PATCH 2702/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 42b15802..9dde41c7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 All notable changes to homebridge-ewelink will be documented in this file.
 
+## 8.3.5
+
+### Changed
+
+- Bump `axios` to v0.22.0
+
 ## 8.3.4 (2021-09-30)
 
 ### Changed

From 768d0436bfc75e97c7953c91af98e955defb4837 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 1 Oct 2021 07:02:51 +0100
Subject: [PATCH 2703/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9dde41c7..552ac576 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 All notable changes to homebridge-ewelink will be documented in this file.
 
-## 8.3.5
+## 8.3.5 (2021-10-01)
 
 ### Changed
 

From ee4d4948d846209f22979da51231ca3a5b8c1a00 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 1 Oct 2021 07:03:09 +0100
Subject: [PATCH 2704/3183] 8.3.5

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 7cbbd911..ce46b8b9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.3.4",
+  "version": "8.3.5",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.3.4",
+      "version": "8.3.5",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index c6440e02..10fe4f25 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.3.4",
+  "version": "8.3.5",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From fb7a0f95055f5763321153763f4e948fdde7e9c9 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 3 Oct 2021 09:30:37 +0100
Subject: [PATCH 2705/3183] bump ws

---
 package-lock.json | 26 +++++++++++++-------------
 package.json      |  2 +-
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ce46b8b9..faf259cc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -32,7 +32,7 @@
         "node-persist": "^3.1.0",
         "p-queue": "^6.6.2",
         "websocket-as-promised": "^2.0.1",
-        "ws": "^8.2.2"
+        "ws": "^8.2.3"
       },
       "engines": {
         "homebridge": "^1.3.4",
@@ -81,9 +81,9 @@
       }
     },
     "node_modules/es-abstract": {
-      "version": "1.19.0",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.0.tgz",
-      "integrity": "sha512-oWPrF+7P1nGv/rw9oIInwdkmI1qediEJSvVfHFryBd8mWllCKB5tke3aKyf51J6chgyKmi6mODqdnin2yb88Nw==",
+      "version": "1.19.1",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.1.tgz",
+      "integrity": "sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w==",
       "dependencies": {
         "call-bind": "^1.0.2",
         "es-to-primitive": "^1.2.1",
@@ -569,9 +569,9 @@
       }
     },
     "node_modules/ws": {
-      "version": "8.2.2",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.2.2.tgz",
-      "integrity": "sha512-Q6B6H2oc8QY3llc3cB8kVmQ6pnJWVQbP7Q5algTcIxx7YEpc0oU4NBVHlztA7Ekzfhw2r0rPducMUiCGWKQRzw==",
+      "version": "8.2.3",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.2.3.tgz",
+      "integrity": "sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA==",
       "engines": {
         "node": ">=10.0.0"
       },
@@ -626,9 +626,9 @@
       }
     },
     "es-abstract": {
-      "version": "1.19.0",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.0.tgz",
-      "integrity": "sha512-oWPrF+7P1nGv/rw9oIInwdkmI1qediEJSvVfHFryBd8mWllCKB5tke3aKyf51J6chgyKmi6mODqdnin2yb88Nw==",
+      "version": "1.19.1",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.1.tgz",
+      "integrity": "sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w==",
       "requires": {
         "call-bind": "^1.0.2",
         "es-to-primitive": "^1.2.1",
@@ -944,9 +944,9 @@
       }
     },
     "ws": {
-      "version": "8.2.2",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.2.2.tgz",
-      "integrity": "sha512-Q6B6H2oc8QY3llc3cB8kVmQ6pnJWVQbP7Q5algTcIxx7YEpc0oU4NBVHlztA7Ekzfhw2r0rPducMUiCGWKQRzw==",
+      "version": "8.2.3",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.2.3.tgz",
+      "integrity": "sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA==",
       "requires": {}
     }
   }
diff --git a/package.json b/package.json
index 10fe4f25..1bbcb9be 100644
--- a/package.json
+++ b/package.json
@@ -56,7 +56,7 @@
     "node-persist": "^3.1.0",
     "p-queue": "^6.6.2",
     "websocket-as-promised": "^2.0.1",
-    "ws": "^8.2.2"
+    "ws": "^8.2.3"
   },
   "prettier": {
     "printWidth": 100

From dc9e7ac783b9946d214f448cacad8e70c2884efb Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 3 Oct 2021 09:31:06 +0100
Subject: [PATCH 2706/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 552ac576..7c50069d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 All notable changes to homebridge-ewelink will be documented in this file.
 
+## 8.3.6 (2021-10-01)
+
+### Changed
+
+- Bump `ws` to v8.2.3
+
 ## 8.3.5 (2021-10-01)
 
 ### Changed

From 0db51a3f66debc1f9d0c4223e300dfa47303d780 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 3 Oct 2021 09:31:36 +0100
Subject: [PATCH 2707/3183] 8.3.6

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index faf259cc..d2533734 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.3.5",
+  "version": "8.3.6",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.3.5",
+      "version": "8.3.6",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 1bbcb9be..eea2f86b 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.3.5",
+  "version": "8.3.6",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From 94a9ade4ec07351ba0837b02508562521946961a Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 3 Oct 2021 15:42:54 +0100
Subject: [PATCH 2708/3183] only unregister if not hidden

---
 lib/index.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/index.js b/lib/index.js
index 1f64120b..a5428463 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1491,7 +1491,9 @@ class eWeLinkPlatform {
   removeAccessory (accessory) {
     try {
       // Remove an accessory from Homebridge
-      this.api.unregisterPlatformAccessories(plugin.name, plugin.alias, [accessory])
+      if (!accessory.context.hidden) {
+        this.api.unregisterPlatformAccessories(plugin.name, plugin.alias, [accessory])
+      }
       devicesInHB.delete(accessory.UUID)
       this.log('[%s] %s.', accessory.displayName, this.lang.devRemove)
     } catch (err) {

From e2210f6e1ed4c3c3d81813e1ff9cea63ca6dc6d6 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 4 Oct 2021 15:21:39 +0100
Subject: [PATCH 2709/3183] disable no response if in lan mode

---
 lib/index.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/index.js b/lib/index.js
index a5428463..628df5c3 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -465,6 +465,11 @@ class eWeLinkPlatform {
         }
       }
 
+      // Manually disable no response mode if mode is set to lan
+      if (this.config.mode === 'lan') {
+        this.config.disableNoResponse = true
+      }
+
       const deviceList = []
 
       // Username and password are now optional

From 80f96e84e22f1af319a71b13c6f3f57fbe64ede8 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 4 Oct 2021 15:23:13 +0100
Subject: [PATCH 2710/3183] hide disable no response option if mode is lan

---
 config.schema.json | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/config.schema.json b/config.schema.json
index fce15fa9..84d327be 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -65,7 +65,10 @@
       "disableNoResponse": {
         "type": "boolean",
         "title": "Disable 'No Response'",
-        "description": "If true, devices marked as cloud-offline will not be shown as 'No Response' in HomeKit."
+        "description": "If true, devices marked as cloud-offline will not be shown as 'No Response' in HomeKit.",
+        "condition": {
+          "functionBody": "return (model.mode !== 'lan');"
+        }
       },
       "countryCode": {
         "title": "Country Code",

From 5bdc7f03aeb0b27beadfd27a5a7e032e8a4a9129 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 4 Oct 2021 15:25:56 +0100
Subject: [PATCH 2711/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7c50069d..ee2aac62 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,16 @@
 
 All notable changes to homebridge-ewelink will be documented in this file.
 
+## UPCOMING
+
+### Changed
+
+- `disableNoResponse` will be set to `true` by the plugin when using in LAN mode
+
+### Fixed
+
+- An error when trying to unregister a hidden accessory from Homebridge
+
 ## 8.3.6 (2021-10-01)
 
 ### Changed

From 27a0a9e5347b26f036a7d8f3dcf62a27c115117f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 4 Oct 2021 21:23:49 +0100
Subject: [PATCH 2712/3183] Update package-lock.json

---
 package-lock.json | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d2533734..ade5c7c1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -465,13 +465,13 @@
       }
     },
     "node_modules/promise.prototype.finally": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/promise.prototype.finally/-/promise.prototype.finally-3.1.2.tgz",
-      "integrity": "sha512-A2HuJWl2opDH0EafgdjwEw7HysI8ff/n4lW4QEVBCUXFk9QeGecBWv0Deph0UmLe3tTNYegz8MOjsVuE6SMoJA==",
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/promise.prototype.finally/-/promise.prototype.finally-3.1.3.tgz",
+      "integrity": "sha512-EXRF3fC9/0gz4qkt/f5EP5iW4kj9oFpBICNpCNOb/52+8nlHIX07FPLbi/q4qYBQ1xZqivMzTpNQSnArVASolQ==",
       "dependencies": {
+        "call-bind": "^1.0.2",
         "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.0-next.0",
-        "function-bind": "^1.1.1"
+        "es-abstract": "^1.19.1"
       },
       "engines": {
         "node": ">= 0.4"
@@ -867,13 +867,13 @@
       "integrity": "sha512-goA0zA9L91tuQbUmiMinSYqlyUtEgg4fxJcjYnLYOQnrktb4o4UqciXDNXiRUPiDBPACmsr1k8jDW4r7UDq9Qw=="
     },
     "promise.prototype.finally": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/promise.prototype.finally/-/promise.prototype.finally-3.1.2.tgz",
-      "integrity": "sha512-A2HuJWl2opDH0EafgdjwEw7HysI8ff/n4lW4QEVBCUXFk9QeGecBWv0Deph0UmLe3tTNYegz8MOjsVuE6SMoJA==",
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/promise.prototype.finally/-/promise.prototype.finally-3.1.3.tgz",
+      "integrity": "sha512-EXRF3fC9/0gz4qkt/f5EP5iW4kj9oFpBICNpCNOb/52+8nlHIX07FPLbi/q4qYBQ1xZqivMzTpNQSnArVASolQ==",
       "requires": {
+        "call-bind": "^1.0.2",
         "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.0-next.0",
-        "function-bind": "^1.1.1"
+        "es-abstract": "^1.19.1"
       }
     },
     "promised-map": {

From 4b9d6ddd4020c27b1369a248ed8637465202c949 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 8 Oct 2021 16:07:41 +0100
Subject: [PATCH 2713/3183] add gate as garage door type

---
 config.schema.json                |  12 +-
 lib/device/simulation/gate-one.js | 323 ++++++++++++++++++++++++++++++
 lib/index.js                      |   8 +
 lib/utils/constants.js            |   1 +
 4 files changed, 342 insertions(+), 2 deletions(-)
 create mode 100644 lib/device/simulation/gate-one.js

diff --git a/config.schema.json b/config.schema.json
index 84d327be..16dfa38b 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -232,6 +232,10 @@
                   "title": "1 Garage Door",
                   "enum": ["garage"]
                 },
+                {
+                  "title": "1 Gate (As Garage Door)",
+                  "enum": ["gate"]
+                },
                 {
                   "title": "1 Irrigation Valve",
                   "enum": ["valve"]
@@ -346,7 +350,7 @@
               "placeholder": 100,
               "minimum": 20,
               "condition": {
-                "functionBody": "return (model.singleDevices && model.singleDevices[arrayIndices] && (model.singleDevices[arrayIndices].deviceModel === 'gddc5' || ['garage', 'lock'].includes(model.singleDevices[arrayIndices].showAs)) && !model.singleDevices[arrayIndices].ignoreDevice);"
+                "functionBody": "return (model.singleDevices && model.singleDevices[arrayIndices] && (model.singleDevices[arrayIndices].deviceModel === 'gddc5' || ['garage', 'lock', 'gate'].includes(model.singleDevices[arrayIndices].showAs)) && !model.singleDevices[arrayIndices].ignoreDevice);"
               }
             },
             "operationTimeDown": {
@@ -520,6 +524,10 @@
                   "title": "4 Garage Doors",
                   "enum": ["garage_four"]
                 },
+                {
+                  "title": "1 Gate (As Garage Door)",
+                  "enum": ["gate"]
+                },
                 {
                   "title": "1 Irrigation Valve",
                   "enum": ["valve"]
@@ -666,7 +674,7 @@
               "placeholder": 100,
               "minimum": 20,
               "condition": {
-                "functionBody": "return (model.multiDevices && model.multiDevices[arrayIndices] && ['garage', 'garage_two', 'garage_four', 'blind', 'door', 'window', 'lock'].includes(model.multiDevices[arrayIndices].showAs) && !model.multiDevices[arrayIndices].ignoreDevice);"
+                "functionBody": "return (model.multiDevices && model.multiDevices[arrayIndices] && ['garage', 'garage_two', 'garage_four', 'blind', 'door', 'window', 'lock', 'gate'].includes(model.multiDevices[arrayIndices].showAs) && !model.multiDevices[arrayIndices].ignoreDevice);"
               }
             },
             "operationTimeDown": {
diff --git a/lib/device/simulation/gate-one.js b/lib/device/simulation/gate-one.js
new file mode 100644
index 00000000..e33d65d8
--- /dev/null
+++ b/lib/device/simulation/gate-one.js
@@ -0,0 +1,323 @@
+/* jshint node: true,esversion: 9, -W014, -W033 */
+/* eslint-disable new-cap */
+'use strict'
+
+module.exports = class deviceGateOne {
+  constructor (platform, accessory) {
+    // Set up variables from the platform
+    this.eveChar = platform.eveChar
+    this.funcs = platform.funcs
+    this.hapChar = platform.api.hap.Characteristic
+    this.hapErr = platform.api.hap.HapStatusError
+    this.hapServ = platform.api.hap.Service
+    this.lang = platform.lang
+    this.log = platform.log
+    this.platform = platform
+
+    // Set up variables from the accessory
+    this.name = accessory.displayName
+    this.accessory = accessory
+
+    // Initially set the online flag as true (to be then updated as false if necessary)
+    this.isOnline = true
+
+    // Set up custom variables for this device type
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
+    this.operationTime = deviceConf.operationTime || platform.consts.defaultValues.operationTime
+
+    // Set the correct logging variables for this accessory
+    this.enableLogging = !platform.config.disableDeviceLogging
+    this.enableDebugLogging = platform.config.debug
+    if (deviceConf && deviceConf.overrideLogging) {
+      switch (deviceConf.overrideLogging) {
+        case 'standard':
+          this.enableLogging = true
+          this.enableDebugLogging = false
+          break
+        case 'debug':
+          this.enableLogging = true
+          this.enableDebugLogging = true
+          break
+        case 'disable':
+          this.enableLogging = false
+          this.enableDebugLogging = false
+          break
+      }
+    }
+
+    // If the accessory has a switch service then remove it
+    if (this.accessory.getService(this.hapServ.Switch)) {
+      this.accessory.removeService(this.accessory.getService(this.hapServ.Switch))
+    }
+
+    // Add the garage door service if it doesn't already exist
+    if (!(this.service = this.accessory.getService(this.hapServ.GarageDoorOpener))) {
+      this.service = this.accessory.addService(this.hapServ.GarageDoorOpener)
+      this.service.updateCharacteristic(this.hapChar.CurrentDoorState, 1)
+      this.service.updateCharacteristic(this.hapChar.TargetDoorState, 1)
+      this.service.updateCharacteristic(this.hapChar.ObstructionDetected, false)
+      this.service.addCharacteristic(this.eveChar.LastActivation)
+      this.service.addCharacteristic(this.eveChar.ResetTotal)
+      this.service.addCharacteristic(this.eveChar.TimesOpened)
+    }
+
+    // Set up the device type and power readings if necessary
+    if (platform.consts.devices.switchSingle.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'switchSingle'
+    } else if (platform.consts.devices.switchSinglePower.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'switchSingle'
+
+      // Add Eve power characteristics
+      this.powerReadings = true
+      if (!this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
+        this.service.addCharacteristic(this.eveChar.CurrentConsumption)
+      }
+      if (this.accessory.context.eweUIID === 32) {
+        if (!this.service.testCharacteristic(this.eveChar.ElectricCurrent)) {
+          this.service.addCharacteristic(this.eveChar.ElectricCurrent)
+        }
+        if (!this.service.testCharacteristic(this.eveChar.Voltage)) {
+          this.service.addCharacteristic(this.eveChar.Voltage)
+        }
+      }
+    } else if (platform.consts.devices.switchMulti.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'switchMulti'
+      if (platform.consts.devices.switchMultiPower.includes(this.accessory.context.eweUIID)) {
+        // Add Eve power characteristics
+        this.powerReadings = true
+        if (!this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
+          this.service.addCharacteristic(this.eveChar.CurrentConsumption)
+        }
+        if (!this.service.testCharacteristic(this.eveChar.ElectricCurrent)) {
+          this.service.addCharacteristic(this.eveChar.ElectricCurrent)
+        }
+        if (!this.service.testCharacteristic(this.eveChar.Voltage)) {
+          this.service.addCharacteristic(this.eveChar.Voltage)
+        }
+        this.isDualR3 = true
+      }
+    } else if (platform.consts.devices.switchSCM.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'switchMulti'
+    }
+
+    // Add the set handler to the garage door reset total characteristic
+    this.service.getCharacteristic(this.eveChar.ResetTotal).onSet(value => {
+      this.service.updateCharacteristic(this.eveChar.TimesOpened, 0)
+    })
+
+    // Add the set handler to the target position characteristic
+    this.service.getCharacteristic(this.hapChar.TargetDoorState).onSet(value => {
+      // We don't use await as we want the callback to be run straight away
+      this.internalStateUpdate(value)
+    })
+
+    // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
+    if (!platform.config.disableNoResponse) {
+      this.service.getCharacteristic(this.hapChar.CurrentDoorState).onGet(() => {
+        if (!this.isOnline) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.CurrentDoorState).value
+      })
+      this.service.getCharacteristic(this.hapChar.TargetDoorState).onGet(() => {
+        if (!this.isOnline) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.TargetDoorState).value
+      })
+    }
+
+    // Update the obstruction detected to false on Homebridge restart
+    this.service.updateCharacteristic(this.hapChar.ObstructionDetected, false)
+
+    // Pass the accessory to Fakegato to set up with Eve
+    this.accessory.eveService = new platform.eveService('door', this.accessory, {
+      log: platform.config.debugFakegato ? this.log : () => {}
+    })
+
+    // Set up an interval to get eWeLink to send power updates
+    if (
+      this.powerReadings &&
+      (!this.isDualR3 || (this.isDualR3 && platform.config.mode !== 'lan'))
+    ) {
+      setTimeout(() => {
+        this.internalUIUpdate()
+        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
+      }, 5000)
+
+      // Stop the intervals on Homebridge shutdown
+      platform.api.on('shutdown', () => {
+        clearInterval(this.intervalPoll)
+      })
+    }
+
+    // Output the customised options to the log
+    const opts = JSON.stringify({
+      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
+      operationTime: this.operationTime,
+      showAs: 'gate'
+    })
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
+  }
+
+  async internalStateUpdate (value) {
+    try {
+      if (value === 1) {
+        this.service.updateCharacteristic(this.hapChar.CurrentDoorState, 1)
+        return
+      }
+
+      const params = {}
+      switch (this.setup) {
+        case 'switchSingle':
+          params.switch = 'on'
+          break
+        case 'switchMulti':
+          params.switches = [
+            {
+              switch: 'on',
+              outlet: 0
+            }
+          ]
+          break
+        default:
+          return
+      }
+      this.inUse = true
+      await this.platform.sendDeviceUpdate(this.accessory, params)
+      this.service.updateCharacteristic(this.hapChar.CurrentDoorState, 0)
+      this.accessory.eveService.addEntry({ status: 0 })
+      this.service.updateCharacteristic(
+        this.eveChar.LastActivation,
+        Math.round(new Date().valueOf() / 1000) - this.accessory.eveService.getInitialTime()
+      )
+      this.service.updateCharacteristic(
+        this.eveChar.TimesOpened,
+        this.service.getCharacteristic(this.eveChar.TimesOpened).value + 1
+      )
+      if (this.enableLogging) {
+        this.log('[%s] %s [%s].', this.name, this.lang.curState, this.lang.lockUnlocked)
+      }
+      await this.funcs.sleep(Math.max(this.operationTime * 100, 1000))
+      this.service.updateCharacteristic(this.hapChar.TargetDoorState, 1)
+      this.service.updateCharacteristic(this.hapChar.CurrentDoorState, 1)
+      this.accessory.eveService.addEntry({ status: 1 })
+      this.inUse = false
+      if (this.enableLogging) {
+        this.log('[%s] %s [%s].', this.name, this.lang.curState, this.lang.lockLocked)
+      }
+    } catch (err) {
+      this.inUse = false
+      this.platform.deviceUpdateError(this.accessory, err, true)
+      setTimeout(() => {
+        this.service.updateCharacteristic(this.hapChar.LockTargetState, 1)
+      }, 2000)
+      this.service.updateCharacteristic(this.hapChar.LockTargetState, new this.hapErr(-70402))
+    }
+  }
+
+  async internalUIUpdate () {
+    try {
+      // Skip polling if device isn't online
+      if (!this.isOnline) {
+        return
+      }
+
+      // Send the params to request the updates
+      if (this.isDualR3) {
+        await this.platform.sendDeviceUpdate(this.accessory, { uiActive: { outlet: 0, time: 120 } })
+      } else {
+        await this.platform.sendDeviceUpdate(this.accessory, { uiActive: 120 })
+      }
+    } catch (err) {
+      // Suppress errors here
+    }
+  }
+
+  async externalUpdate (params) {
+    try {
+      if (!this.inUse) {
+        if (
+          (this.setup === 'switchMulti' && params.switches && params.switches[0].switch === 'on') ||
+          (this.setup === 'switchSingle' && params.switch && params.switch === 'on')
+        ) {
+          this.inUse = true
+          this.service.updateCharacteristic(this.hapChar.TargetDoorState, 0)
+          this.service.updateCharacteristic(this.hapChar.CurrentDoorState, 0)
+          this.accessory.eveService.addEntry({ status: 0 })
+          this.service.updateCharacteristic(
+            this.eveChar.LastActivation,
+            Math.round(new Date().valueOf() / 1000) - this.accessory.eveService.getInitialTime()
+          )
+          this.service.updateCharacteristic(
+            this.eveChar.TimesOpened,
+            this.service.getCharacteristic(this.eveChar.TimesOpened).value + 1
+          )
+          if (params.updateSource && this.enableLogging) {
+            this.log('[%s] %s [%s].', this.name, this.lang.curState, this.lang.lockUnlocked)
+          }
+          await this.funcs.sleep(Math.max(this.operationTime * 100, 1000))
+          this.service.updateCharacteristic(this.hapChar.TargetDoorState, 1)
+          this.service.updateCharacteristic(this.hapChar.CurrentDoorState, 1)
+          this.accessory.eveService.addEntry({ status: 1 })
+          this.inUse = false
+          if (params.updateSource && this.enableLogging) {
+            this.log('[%s] %s [%s].', this.name, this.lang.curState, this.lang.lockLocked)
+          }
+        }
+      }
+
+      // Get the power readings given by certain devices
+      if (!this.powerReadings) {
+        return
+      }
+      let logger = false
+      let power
+      let voltage
+      let current
+      if (this.funcs.hasProperty(params, 'actPow_00')) {
+        power = parseInt(params.actPow_00) / 100
+        this.service.updateCharacteristic(this.eveChar.CurrentConsumption, power)
+        logger = true
+      } else if (this.funcs.hasProperty(params, 'power')) {
+        power = parseFloat(params.power)
+        this.service.updateCharacteristic(this.eveChar.CurrentConsumption, power)
+        logger = true
+      }
+      if (this.funcs.hasProperty(params, 'voltage_00')) {
+        voltage = parseInt(params.voltage_00) / 100
+        this.service.updateCharacteristic(this.eveChar.Voltage, voltage)
+        logger = true
+      } else if (this.funcs.hasProperty(params, 'voltage')) {
+        voltage = parseFloat(params.voltage)
+        this.service.updateCharacteristic(this.eveChar.Voltage, voltage)
+        logger = true
+      }
+      if (this.funcs.hasProperty(params, 'current_00')) {
+        current = parseInt(params.current_00) / 100
+        this.service.updateCharacteristic(this.eveChar.ElectricCurrent, current)
+        logger = true
+      } else if (this.funcs.hasProperty(params, 'current')) {
+        current = parseFloat(params.current)
+        this.service.updateCharacteristic(this.eveChar.ElectricCurrent, current)
+        logger = true
+      }
+      if (params.updateSource && logger && this.enableLogging) {
+        this.log(
+          '[%s] %s%s%s.',
+          this.name,
+          power !== undefined ? this.lang.curPower + ' [' + power + 'W]' : '',
+          voltage !== undefined ? ' ' + this.lang.curVolt + ' [' + voltage + 'V]' : '',
+          current !== undefined ? ' ' + this.lang.curCurr + ' [' + current + 'A]' : ''
+        )
+      }
+    } catch (err) {
+      this.inUse = false
+      this.platform.deviceUpdateError(this.accessory, err, false)
+    }
+  }
+
+  markStatus (isOnline) {
+    this.isOnline = isOnline
+  }
+}
diff --git a/lib/index.js b/lib/index.js
index 628df5c3..d23bd028 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -778,6 +778,14 @@ class eWeLinkPlatform {
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/simulation/garage-eachen'))(this, accessory)
         /**************************/
+      } else if (device.showAs === 'gate') {
+        /********************************************
+        GATES (AS GARAGE DOOR) [ACCESSORY SIMULATION]
+        ********************************************/
+        const instance = './device/simulation/gate-one'
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
+        accessory.control = new (require(instance))(this, accessory, devicesInHB)
+        /*******************************************/
       } else if (device.showAs === 'lock') {
         /***************************
         LOCKS [ACCESSORY SIMULATION]
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 1a90d7ed..8c23204a 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -218,6 +218,7 @@ module.exports = {
       'garage_eachen',
       'garage_four',
       'garage_two',
+      'gate',
       'heater',
       'humidifier',
       'lock',

From 5843a3eab13b64e16a947caf780c3d0ac40d8681 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 8 Oct 2021 16:08:35 +0100
Subject: [PATCH 2714/3183] 8.3.7-beta.0

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ade5c7c1..c5b90595 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.3.6",
+  "version": "8.3.7-beta.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.3.6",
+      "version": "8.3.7-beta.0",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index eea2f86b..ee9951b3 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.3.6",
+  "version": "8.3.7-beta.0",
   "author": "bwp91",
   "description": "Homebridge plugin to control eWeLink devices.",
   "license": "MIT",

From f058572709a1d46dd4ef3dc6895266e52c2c0bf1 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Fri, 8 Oct 2021 17:09:51 +0100
Subject: [PATCH 2715/3183] Update README.md

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 4f25e6e8..0e59bacd 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
   
 # homebridge-ewelink
 
-Homebridge plugin to control eWeLink devices
+Homebridge plugin to integrate eWeLink devices into HomeKit
 
 [![verified-by-homebridge](https://badgen.net/badge/homebridge/verified/purple)](https://github.com/homebridge/homebridge/wiki/Verified-Plugins)
 [![hoobs-certified](https://badgen.net/badge/HOOBS/certified/yellow)](https://plugins.hoobs.org/plugin/homebridge-ewelink)  
@@ -27,7 +27,7 @@ Homebridge plugin to control eWeLink devices
 
 ### Prerequisites
 
-- To use this plugin, you will need to already have [Homebridge](https://homebridge.io) (at least v1.3.4) or [HOOBS](https://hoobs.org) (at least v4) installed. Refer to the links for more information and installation instructions.
+- To use this plugin, you will need to already have [Homebridge](https://homebridge.io) (at least v1.3.5) or [HOOBS](https://hoobs.org) (at least v4) installed. Refer to the links for more information and installation instructions.
 - It is recommended to use the current LTS version of Node, currently v14, however Node v12 is also supported.
 
 ### Setup

From 8ed3ee520699a0f7e12f1bac01566b30754dcb7b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 8 Oct 2021 17:14:45 +0100
Subject: [PATCH 2716/3183] recommended hb version to 1.3.5, amend package desc

---
 package-lock.json | 2 +-
 package.json      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c5b90595..f572d93a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -35,7 +35,7 @@
         "ws": "^8.2.3"
       },
       "engines": {
-        "homebridge": "^1.3.4",
+        "homebridge": "^1.3.5",
         "node": "^14.18.0 || ^16.10.0"
       }
     },
diff --git a/package.json b/package.json
index ee9951b3..6d37a813 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "alias": "eWeLink",
   "version": "8.3.7-beta.0",
   "author": "bwp91",
-  "description": "Homebridge plugin to control eWeLink devices.",
+  "description": "Homebridge plugin to integrate eWeLink devices into HomeKit.",
   "license": "MIT",
   "keywords": [
     "homebridge",
@@ -22,7 +22,7 @@
   ],
   "main": "lib/index.js",
   "engines": {
-    "homebridge": "^1.3.4",
+    "homebridge": "^1.3.5",
     "node": "^14.18.0 || ^16.10.0"
   },
   "repository": {

From bec5ff00f6ae8c127806f8d255794f0cc8b078b9 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 8 Oct 2021 17:24:47 +0100
Subject: [PATCH 2717/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ee2aac62..a361a2b5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,11 +2,17 @@
 
 All notable changes to homebridge-ewelink will be documented in this file.
 
-## UPCOMING
+## BETA
+
+### Added
+
+- Expose a single or multi-channel device as a gate type (shown as garage door)
+  - If you use the Home app to open the door, it will then automatically close after a configured number of seconds
 
 ### Changed
 
 - `disableNoResponse` will be set to `true` by the plugin when using in LAN mode
+- Recommended Homebridge bumped to v1.3.5
 
 ### Fixed
 

From d9fadfd67dd3216801dec83015b3bd2bbb728ae9 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 9 Oct 2021 11:22:03 +0100
Subject: [PATCH 2718/3183] bump node16

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index f572d93a..0226de50 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -36,7 +36,7 @@
       },
       "engines": {
         "homebridge": "^1.3.5",
-        "node": "^14.18.0 || ^16.10.0"
+        "node": "^14.18.0 || ^16.11.0"
       }
     },
     "node_modules/@homebridge/plugin-ui-utils": {
diff --git a/package.json b/package.json
index 6d37a813..3f659d9b 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,7 @@
   "main": "lib/index.js",
   "engines": {
     "homebridge": "^1.3.5",
-    "node": "^14.18.0 || ^16.10.0"
+    "node": "^14.18.0 || ^16.11.0"
   },
   "repository": {
     "type": "git",

From 7177386306df768fac6316fcd63a3b96761c08a0 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 9 Oct 2021 11:22:05 +0100
Subject: [PATCH 2719/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a361a2b5..22f4ee85 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@ All notable changes to homebridge-ewelink will be documented in this file.
 ### Changed
 
 - `disableNoResponse` will be set to `true` by the plugin when using in LAN mode
+- Recommended node versions bumped to v14.18.0 or v16.11.0
 - Recommended Homebridge bumped to v1.3.5
 
 ### Fixed

From 7e9d44808aad71fdba9e1e0d931cdf49c9447909 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Sun, 10 Oct 2021 13:54:57 +0100
Subject: [PATCH 2720/3183] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 0e59bacd..3bce76a7 100644
--- a/README.md
+++ b/README.md
@@ -28,7 +28,7 @@ Homebridge plugin to integrate eWeLink devices into HomeKit
 ### Prerequisites
 
 - To use this plugin, you will need to already have [Homebridge](https://homebridge.io) (at least v1.3.5) or [HOOBS](https://hoobs.org) (at least v4) installed. Refer to the links for more information and installation instructions.
-- It is recommended to use the current LTS version of Node, currently v14, however Node v12 is also supported.
+- It is recommended to use [Node](https://nodejs.org/en/) v14, however v12 and v16 are also supported.
 
 ### Setup
 

From c5176ee187d4d07a8f9e9c3e393173f33f3f5eb3 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Sun, 10 Oct 2021 14:00:15 +0100
Subject: [PATCH 2721/3183] Update README.md

---
 README.md | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 3bce76a7..5655dee8 100644
--- a/README.md
+++ b/README.md
@@ -21,9 +21,10 @@ Homebridge plugin to integrate eWeLink devices into HomeKit
 ### Plugin Information
 
 - This plugin allows you to view and control your eWeLink devices within HomeKit. The plugin:
-  - requires your eWeLink credentials to function
-  - supports LAN control for certain devices
-  - uses a web socket for real-time device control and updates
+  - requires your eWeLink credentials to download a device list
+  - attempts to control your supported devices locally, reverting to cloud control if necessary
+  - listens for real-time device updates when controlled externally
+  - supports removing your eWeLink credentials from the configuration in certain situations, see [Connection Methods](https://github.com/bwp91/homebridge-ewelink/wiki/Connection-Methods)
 
 ### Prerequisites
 

From 81742a4dd343abd9c744d3e019bbf65e308dfab5 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Sun, 10 Oct 2021 14:00:46 +0100
Subject: [PATCH 2722/3183] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 5655dee8..d65d77fb 100644
--- a/README.md
+++ b/README.md
@@ -24,7 +24,7 @@ Homebridge plugin to integrate eWeLink devices into HomeKit
   - requires your eWeLink credentials to download a device list
   - attempts to control your supported devices locally, reverting to cloud control if necessary
   - listens for real-time device updates when controlled externally
-  - supports removing your eWeLink credentials from the configuration in certain situations, see [Connection Methods](https://github.com/bwp91/homebridge-ewelink/wiki/Connection-Methods)
+  - supports removing your eWeLink credentials from the configuration in certain situations, see [wiki](https://github.com/bwp91/homebridge-ewelink/wiki/Connection-Methods#lan-mode-without-ewelink-credentials)
 
 ### Prerequisites
 

From cbbddd2bf3e33ea7ac699b47d359ddb92b8ec74d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 12 Oct 2021 17:14:20 +0100
Subject: [PATCH 2723/3183] update deps

---
 CHANGELOG.md      |  3 ++-
 package-lock.json | 16 ++++++++--------
 package.json      |  4 ++--
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 22f4ee85..4fb10c27 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,8 +12,9 @@ All notable changes to homebridge-ewelink will be documented in this file.
 ### Changed
 
 - `disableNoResponse` will be set to `true` by the plugin when using in LAN mode
-- Recommended node versions bumped to v14.18.0 or v16.11.0
+- Recommended node versions bumped to v14.18.1 or v16.11.1
 - Recommended Homebridge bumped to v1.3.5
+- Bump `axios` to v0.23.0
 
 ### Fixed
 
diff --git a/package-lock.json b/package-lock.json
index 0226de50..9941a3ae 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -28,7 +28,7 @@
       "license": "MIT",
       "dependencies": {
         "@homebridge/plugin-ui-utils": "^0.0.19",
-        "axios": "^0.22.0",
+        "axios": "^0.23.0",
         "node-persist": "^3.1.0",
         "p-queue": "^6.6.2",
         "websocket-as-promised": "^2.0.1",
@@ -36,7 +36,7 @@
       },
       "engines": {
         "homebridge": "^1.3.5",
-        "node": "^14.18.0 || ^16.11.0"
+        "node": "^14.18.1 || ^16.11.1"
       }
     },
     "node_modules/@homebridge/plugin-ui-utils": {
@@ -45,9 +45,9 @@
       "integrity": "sha512-axFX7lN2Yd7bz/6SlD7dzq5sY/N9+XYuLHPukuiyHQRDtNMRL1uDqJhOx6RVaN2tYDHB75h7YxRQWP7U44Mgzg=="
     },
     "node_modules/axios": {
-      "version": "0.22.0",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-0.22.0.tgz",
-      "integrity": "sha512-Z0U3uhqQeg1oNcihswf4ZD57O3NrR1+ZXhxaROaWpDmsDTx7T2HNBV2ulBtie2hwJptu8UvgnJoK+BIqdzh/1w==",
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-0.23.0.tgz",
+      "integrity": "sha512-NmvAE4i0YAv5cKq8zlDoPd1VLKAqX5oLuZKs8xkJa4qi6RGn0uhCYFjWtHHC9EM/MwOwYWOs53W+V0aqEXq1sg==",
       "dependencies": {
         "follow-redirects": "^1.14.4"
       }
@@ -596,9 +596,9 @@
       "integrity": "sha512-axFX7lN2Yd7bz/6SlD7dzq5sY/N9+XYuLHPukuiyHQRDtNMRL1uDqJhOx6RVaN2tYDHB75h7YxRQWP7U44Mgzg=="
     },
     "axios": {
-      "version": "0.22.0",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-0.22.0.tgz",
-      "integrity": "sha512-Z0U3uhqQeg1oNcihswf4ZD57O3NrR1+ZXhxaROaWpDmsDTx7T2HNBV2ulBtie2hwJptu8UvgnJoK+BIqdzh/1w==",
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-0.23.0.tgz",
+      "integrity": "sha512-NmvAE4i0YAv5cKq8zlDoPd1VLKAqX5oLuZKs8xkJa4qi6RGn0uhCYFjWtHHC9EM/MwOwYWOs53W+V0aqEXq1sg==",
       "requires": {
         "follow-redirects": "^1.14.4"
       }
diff --git a/package.json b/package.json
index 3f659d9b..66c611e7 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,7 @@
   "main": "lib/index.js",
   "engines": {
     "homebridge": "^1.3.5",
-    "node": "^14.18.0 || ^16.11.0"
+    "node": "^14.18.1 || ^16.11.1"
   },
   "repository": {
     "type": "git",
@@ -52,7 +52,7 @@
   ],
   "dependencies": {
     "@homebridge/plugin-ui-utils": "^0.0.19",
-    "axios": "^0.22.0",
+    "axios": "^0.23.0",
     "node-persist": "^3.1.0",
     "p-queue": "^6.6.2",
     "websocket-as-promised": "^2.0.1",

From 2a9b3f71bb53bebf7fa87e14cb8721aba7f5677a Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 12 Oct 2021 17:53:13 +0100
Subject: [PATCH 2724/3183] 8.3.7-beta.1

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 9941a3ae..7504f840 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.3.7-beta.0",
+  "version": "8.3.7-beta.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.3.7-beta.0",
+      "version": "8.3.7-beta.1",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 66c611e7..36b6b8f5 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.3.7-beta.0",
+  "version": "8.3.7-beta.1",
   "author": "bwp91",
   "description": "Homebridge plugin to integrate eWeLink devices into HomeKit.",
   "license": "MIT",

From e116ec667ecb922acde39f3ab9afea63febf1b06 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 16 Oct 2021 13:40:11 +0100
Subject: [PATCH 2725/3183] use func to generate random string

---
 lib/device/curtain.js                  |  4 +---
 lib/device/diffuser.js                 | 20 +++++---------------
 lib/device/fan.js                      |  4 +---
 lib/device/humidifier.js               |  4 +---
 lib/device/light-cct.js                | 12 +++---------
 lib/device/light-dimmer.js             |  4 +---
 lib/device/light-rgb-cct.js            | 16 ++++------------
 lib/device/light-rgb.js                |  8 ++------
 lib/device/motor.js                    |  4 +---
 lib/device/simulation/blind.js         |  4 +---
 lib/device/simulation/door.js          |  4 +---
 lib/device/simulation/garage-eachen.js |  4 +---
 lib/device/simulation/garage-four.js   |  4 +---
 lib/device/simulation/window.js        |  4 +---
 lib/device/zigbee/light-cct.js         |  8 ++------
 lib/device/zigbee/light-dimmer.js      |  4 +---
 lib/utils/functions.js                 |  9 +++++++++
 17 files changed, 36 insertions(+), 81 deletions(-)

diff --git a/lib/device/curtain.js b/lib/device/curtain.js
index a970b4c3..6384be46 100644
--- a/lib/device/curtain.js
+++ b/lib/device/curtain.js
@@ -164,9 +164,7 @@ module.exports = class deviceCurtain {
   async internalPositionUpdate (value) {
     try {
       // This acts like a debounce function when endlessly sliding the slider
-      const updateKey = Math.random()
-        .toString(36)
-        .substr(2, 8)
+      const updateKey = this.funcs.generateRandomString(5)
       this.updateKey = updateKey
       await this.funcs.sleep(500)
       if (updateKey !== this.updateKey) {
diff --git a/lib/device/diffuser.js b/lib/device/diffuser.js
index 02900504..e82eb9e5 100644
--- a/lib/device/diffuser.js
+++ b/lib/device/diffuser.js
@@ -133,9 +133,7 @@ module.exports = class deviceDiffuser {
       const params = { switch: newValue }
 
       // Set up a five second timeout for the plugin to ignore incoming updates
-      const timerKey = Math.random()
-        .toString(36)
-        .substr(2, 8)
+      const timerKey = this.funcs.generateRandomString(5)
       this.updateTimeout = timerKey
       setTimeout(() => {
         if (this.updateTimeout === timerKey) {
@@ -182,9 +180,7 @@ module.exports = class deviceDiffuser {
       const params = { state: newValue / 50 }
 
       // This acts like a debounce function when endlessly sliding the brightness scale
-      const updateKeySpeed = Math.random()
-        .toString(36)
-        .substr(2, 8)
+      const updateKeySpeed = this.funcs.generateRandomString(5)
       this.updateKeySpeed = updateKeySpeed
       await this.funcs.sleep(450)
       if (updateKeySpeed !== this.updateKeySpeed) {
@@ -231,9 +227,7 @@ module.exports = class deviceDiffuser {
       const params = { lightswitch: this.cacheLight }
 
       // Set up a five second timeout for the plugin to ignore incoming updates
-      const updateKeyLight = Math.random()
-        .toString(36)
-        .substr(2, 8)
+      const updateKeyLight = this.funcs.generateRandomString(5)
       this.updateTimeout = updateKeyLight
       setTimeout(() => {
         if (this.updateTimeout === updateKeyLight) {
@@ -272,9 +266,7 @@ module.exports = class deviceDiffuser {
       const params = { lightbright: value }
 
       // This acts like a debounce function when endlessly sliding the brightness scale
-      const updateKeyBright = Math.random()
-        .toString(36)
-        .substr(2, 8)
+      const updateKeyBright = this.funcs.generateRandomString(5)
       this.updateKeyBright = updateKeyBright
       await this.funcs.sleep(500)
       if (updateKeyBright !== this.updateKeyBright) {
@@ -326,9 +318,7 @@ module.exports = class deviceDiffuser {
       }
 
       // This acts like a debounce function when endlessly sliding the colour wheel
-      const updateKeyColour = Math.random()
-        .toString(36)
-        .substr(2, 8)
+      const updateKeyColour = this.funcs.generateRandomString(5)
       this.updateKeyColour = updateKeyColour
       await this.funcs.sleep(400)
       if (updateKeyColour !== this.updateKeyColour) {
diff --git a/lib/device/fan.js b/lib/device/fan.js
index 975615d2..c4d8ed1d 100644
--- a/lib/device/fan.js
+++ b/lib/device/fan.js
@@ -159,9 +159,7 @@ module.exports = class deviceFan {
   async internalSpeedUpdate (value) {
     try {
       // This acts like a debounce function when endlessly sliding the slider
-      const updateKey = Math.random()
-        .toString(36)
-        .substr(2, 8)
+      const updateKey = this.funcs.generateRandomString(5)
       this.updateKey = updateKey
       await this.funcs.sleep(500)
       if (updateKey !== this.updateKey) {
diff --git a/lib/device/humidifier.js b/lib/device/humidifier.js
index 91acae2d..c2ab26c0 100644
--- a/lib/device/humidifier.js
+++ b/lib/device/humidifier.js
@@ -120,9 +120,7 @@ module.exports = class deviceHumidifier {
 
   async internalModeUpdate (value) {
     try {
-      const updateKey = Math.random()
-        .toString(36)
-        .substr(2, 8)
+      const updateKey = this.funcs.generateRandomString(5)
       this.updateKey = updateKey
       await this.funcs.sleep(500)
       if (updateKey !== this.updateKey) {
diff --git a/lib/device/light-cct.js b/lib/device/light-cct.js
index 7dbb7ae3..ee753c9e 100644
--- a/lib/device/light-cct.js
+++ b/lib/device/light-cct.js
@@ -145,9 +145,7 @@ module.exports = class deviceLightCCT {
       if (this.cacheState === newValue) {
         return
       }
-      const timerKey = Math.random()
-        .toString(36)
-        .substr(2, 8)
+      const timerKey = this.funcs.generateRandomString(5)
       this.updateTimeout = timerKey
       setTimeout(() => {
         if (this.updateTimeout === timerKey) {
@@ -175,9 +173,7 @@ module.exports = class deviceLightCCT {
       if (this.cacheBright === value) {
         return
       }
-      const updateKey = Math.random()
-        .toString(36)
-        .substr(2, 8)
+      const updateKey = this.funcs.generateRandomString(5)
       this.updateKeyBright = updateKey
       await this.funcs.sleep(500)
       if (updateKey !== this.updateKeyBright) {
@@ -221,9 +217,7 @@ module.exports = class deviceLightCCT {
       ) {
         return
       }
-      const updateKey = Math.random()
-        .toString(36)
-        .substr(2, 8)
+      const updateKey = this.funcs.generateRandomString(5)
       this.updateKeyCT = updateKey
       await this.funcs.sleep(400)
       if (updateKey !== this.updateKeyCT) {
diff --git a/lib/device/light-dimmer.js b/lib/device/light-dimmer.js
index c5ea3751..71773b0c 100644
--- a/lib/device/light-dimmer.js
+++ b/lib/device/light-dimmer.js
@@ -123,9 +123,7 @@ module.exports = class deviceLightDimmer {
       if (this.cacheBright === value) {
         return
       }
-      const updateKey = Math.random()
-        .toString(36)
-        .substr(2, 8)
+      const updateKey = this.funcs.generateRandomString(5)
       this.updateKeyBright = updateKey
       await this.funcs.sleep(500)
       if (updateKey !== this.updateKeyBright) {
diff --git a/lib/device/light-rgb-cct.js b/lib/device/light-rgb-cct.js
index cbe5c999..496b66d5 100644
--- a/lib/device/light-rgb-cct.js
+++ b/lib/device/light-rgb-cct.js
@@ -144,9 +144,7 @@ module.exports = class deviceLightRGBCCT {
       if (this.cacheState === newValue) {
         return
       }
-      const timerKey = Math.random()
-        .toString(36)
-        .substr(2, 8)
+      const timerKey = this.funcs.generateRandomString(5)
       this.updateTimeout = timerKey
       setTimeout(() => {
         if (this.updateTimeout === timerKey) {
@@ -173,9 +171,7 @@ module.exports = class deviceLightRGBCCT {
       if (this.cacheBright === value) {
         return
       }
-      const updateKey = Math.random()
-        .toString(36)
-        .substr(2, 8)
+      const updateKey = this.funcs.generateRandomString(5)
       this.updateKeyBright = updateKey
       await this.funcs.sleep(500)
       if (updateKey !== this.updateKeyBright) {
@@ -236,9 +232,7 @@ module.exports = class deviceLightRGBCCT {
       if (this.cacheHue === value || this.cacheState !== 'on') {
         return
       }
-      const updateKey = Math.random()
-        .toString(36)
-        .substr(2, 8)
+      const updateKey = this.funcs.generateRandomString(5)
       this.updateKey = updateKey
       await this.funcs.sleep(400)
       if (updateKey !== this.updateKey) {
@@ -316,9 +310,7 @@ module.exports = class deviceLightRGBCCT {
       ) {
         return
       }
-      const updateKey = Math.random()
-        .toString(36)
-        .substr(2, 8)
+      const updateKey = this.funcs.generateRandomString(5)
       this.updateKey = updateKey
       await this.funcs.sleep(400)
       if (updateKey !== this.updateKey) {
diff --git a/lib/device/light-rgb.js b/lib/device/light-rgb.js
index f5c41d5a..7768b4d5 100644
--- a/lib/device/light-rgb.js
+++ b/lib/device/light-rgb.js
@@ -113,9 +113,7 @@ module.exports = class deviceLightRGB {
         return
       }
       params.state = newValue
-      const timerKey = Math.random()
-        .toString(36)
-        .substr(2, 8)
+      const timerKey = this.funcs.generateRandomString(5)
       this.updateTimeout = timerKey
       setTimeout(() => {
         if (this.updateTimeout === timerKey) {
@@ -154,9 +152,7 @@ module.exports = class deviceLightRGB {
       if (this.cacheHue === value) {
         return
       }
-      const updateKeyColour = Math.random()
-        .toString(36)
-        .substr(2, 8)
+      const updateKeyColour = this.funcs.generateRandomString(5)
       this.updateKeyColour = updateKeyColour
       await this.funcs.sleep(400)
       if (updateKeyColour !== this.updateKeyColour) {
diff --git a/lib/device/motor.js b/lib/device/motor.js
index be2e4816..d1365847 100644
--- a/lib/device/motor.js
+++ b/lib/device/motor.js
@@ -190,9 +190,7 @@ module.exports = class deviceMotor {
       if (this.cachePos === value) {
         return
       }
-      const updateKey = Math.random()
-        .toString(36)
-        .substr(2, 8)
+      const updateKey = this.funcs.generateRandomString(5)
       this.updateKey = updateKey
       await this.funcs.sleep(500)
       if (updateKey !== this.updateKey) {
diff --git a/lib/device/simulation/blind.js b/lib/device/simulation/blind.js
index 5900e0de..b1ed2ded 100644
--- a/lib/device/simulation/blind.js
+++ b/lib/device/simulation/blind.js
@@ -133,9 +133,7 @@ module.exports = class deviceBlind {
       const prevState = this.accessory.context.cachePositionState
       const percentStepUpPerDS = this.operationTimeUp / 100
       const percentStepDownPerDS = this.operationTimeDown / 100
-      const updateKey = Math.random()
-        .toString(36)
-        .substr(2, 8)
+      const updateKey = this.funcs.generateRandomString(5)
       this.updateKey = updateKey
       if (prevState !== 2) {
         params.switches.push({ switch: 'off', outlet: 0 })
diff --git a/lib/device/simulation/door.js b/lib/device/simulation/door.js
index da639757..a3ddbd73 100644
--- a/lib/device/simulation/door.js
+++ b/lib/device/simulation/door.js
@@ -133,9 +133,7 @@ module.exports = class deviceDoor {
       const prevState = this.accessory.context.cachePositionState
       const percentStepUpPerDS = this.operationTimeUp / 100
       const percentStepDownPerDS = this.operationTimeDown / 100
-      const updateKey = Math.random()
-        .toString(36)
-        .substr(2, 8)
+      const updateKey = this.funcs.generateRandomString(5)
       this.updateKey = updateKey
       if (prevState !== 2) {
         params.switches.push({ switch: 'off', outlet: 0 })
diff --git a/lib/device/simulation/garage-eachen.js b/lib/device/simulation/garage-eachen.js
index f24e6d85..a728ee7a 100644
--- a/lib/device/simulation/garage-eachen.js
+++ b/lib/device/simulation/garage-eachen.js
@@ -172,9 +172,7 @@ module.exports = class deviceGarageEachen {
       }
 
       // In a period of three seconds we want to only use the 'last' update
-      const updateKey = Math.random()
-        .toString(36)
-        .substr(2, 8)
+      const updateKey = this.funcs.generateRandomString(5)
       this.updateKey = updateKey
       await this.funcs.sleep(3000)
       if (this.updateKey !== updateKey) {
diff --git a/lib/device/simulation/garage-four.js b/lib/device/simulation/garage-four.js
index 1dd7d40f..e8b621f3 100644
--- a/lib/device/simulation/garage-four.js
+++ b/lib/device/simulation/garage-four.js
@@ -126,9 +126,7 @@ module.exports = class deviceGarageFour {
       }
       const gdService = this.accessory.getService('Garage ' + garage)
       this.inUse = true
-      const updateKey = Math.random()
-        .toString(36)
-        .substr(2, 8)
+      const updateKey = this.funcs.generateRandomString(5)
       this.updateKey = updateKey
       gdService.updateCharacteristic(this.hapChar.TargetDoorState, value)
       gdService.updateCharacteristic(this.hapChar.CurrentDoorState, value + 2)
diff --git a/lib/device/simulation/window.js b/lib/device/simulation/window.js
index 7f43c2c5..a8763281 100644
--- a/lib/device/simulation/window.js
+++ b/lib/device/simulation/window.js
@@ -133,9 +133,7 @@ module.exports = class deviceWindow {
       const prevState = this.accessory.context.cachePositionState
       const percentStepUpPerDS = this.operationTimeUp / 100
       const percentStepDownPerDS = this.operationTimeDown / 100
-      const updateKey = Math.random()
-        .toString(36)
-        .substr(2, 8)
+      const updateKey = this.funcs.generateRandomString(5)
       this.updateKey = updateKey
       if (prevState !== 2) {
         params.switches.push({ switch: 'off', outlet: 0 })
diff --git a/lib/device/zigbee/light-cct.js b/lib/device/zigbee/light-cct.js
index ba74fb47..3f13b42c 100644
--- a/lib/device/zigbee/light-cct.js
+++ b/lib/device/zigbee/light-cct.js
@@ -135,9 +135,7 @@ module.exports = class deviceZBLightCCT {
       if (this.cacheBright === value || value === 0) {
         return
       }
-      const updateKey = Math.random()
-        .toString(36)
-        .substr(2, 8)
+      const updateKey = this.funcs.generateRandomString(5)
       this.updateKeyBright = updateKey
       await this.funcs.sleep(500)
       if (updateKey !== this.updateKeyBright) {
@@ -173,9 +171,7 @@ module.exports = class deviceZBLightCCT {
       ) {
         return
       }
-      const updateKey = Math.random()
-        .toString(36)
-        .substr(2, 8)
+      const updateKey = this.funcs.generateRandomString(5)
       this.updateKeyCT = updateKey
       await this.funcs.sleep(400)
       if (updateKey !== this.updateKeyCT) {
diff --git a/lib/device/zigbee/light-dimmer.js b/lib/device/zigbee/light-dimmer.js
index d128f957..757184f9 100644
--- a/lib/device/zigbee/light-dimmer.js
+++ b/lib/device/zigbee/light-dimmer.js
@@ -103,9 +103,7 @@ module.exports = class deviceZBLightDimmer {
       if (this.cacheBright === value || value === 0) {
         return
       }
-      const updateKey = Math.random()
-        .toString(36)
-        .substr(2, 8)
+      const updateKey = this.funcs.generateRandomString(5)
       this.updateKey = updateKey
       await this.funcs.sleep(500)
       if (updateKey !== this.updateKey) {
diff --git a/lib/utils/functions.js b/lib/utils/functions.js
index 815d15ae..3dbf5705 100644
--- a/lib/utils/functions.js
+++ b/lib/utils/functions.js
@@ -27,5 +27,14 @@ module.exports = {
       }
     }
     return toReturn
+  },
+
+  generateRandomString: length => {
+    const chars = 'abcdefghijklmnopqrstuvwxyz0123456789'
+    let nonce = ''
+    while (nonce.length < length) {
+      nonce += chars.charAt(Math.floor(Math.random() * chars.length))
+    }
+    return nonce
   }
 }

From ddc9975199501825b562a67ff7d2973cd46cf5df Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 16 Oct 2021 15:03:04 +0100
Subject: [PATCH 2726/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4fb10c27..75925545 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 All notable changes to homebridge-ewelink will be documented in this file.
 
-## BETA
+## 8.4.0 (2021-10-16)
 
 ### Added
 

From 6c920e8f1fcdbabd0d16fbc9c9986bc8ecc86d8f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 16 Oct 2021 15:03:19 +0100
Subject: [PATCH 2727/3183] 8.4.0

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 7504f840..d6c0c1fe 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.3.7-beta.1",
+  "version": "8.4.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.3.7-beta.1",
+      "version": "8.4.0",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 36b6b8f5..f9447729 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.3.7-beta.1",
+  "version": "8.4.0",
   "author": "bwp91",
   "description": "Homebridge plugin to integrate eWeLink devices into HomeKit.",
   "license": "MIT",

From 79e4887ed90e03ded6ce5db2ce6711e5e59c6f60 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 20 Oct 2021 09:10:13 +0100
Subject: [PATCH 2728/3183] small changes to fg debug logging

---
 CHANGELOG.md                     |  6 ++++++
 lib/fakegato/fakegato-history.js | 24 ++++++++++++------------
 lib/fakegato/fakegato-storage.js | 31 +++++++++++++++----------------
 lib/fakegato/fakegato-timer.js   | 14 +++++++-------
 4 files changed, 40 insertions(+), 35 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 75925545..fbc43a75 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 All notable changes to homebridge-ewelink will be documented in this file.
 
+## BETA
+
+### Changed
+
+- Some small changes to Fakegato debug logging
+
 ## 8.4.0 (2021-10-16)
 
 ### Added
diff --git a/lib/fakegato/fakegato-history.js b/lib/fakegato/fakegato-history.js
index d6a28668..121fdd36 100644
--- a/lib/fakegato/fakegato-history.js
+++ b/lib/fakegato/fakegato-history.js
@@ -146,10 +146,10 @@ module.exports = function (homebridge) {
           this.load(
             function (err, loaded) {
               if (err) {
-                this.log('FG history: load error: %s.', err)
+                this.log('FGH load error: %s.', err)
               } else {
                 if (loaded) {
-                  this.log('FG history: loaded from storage.')
+                  this.log('FGH loaded from storage.')
                 }
                 this.loaded = true
               }
@@ -415,7 +415,7 @@ module.exports = function (homebridge) {
     }
 
     registerEvents () {
-      this.log('[%s] FG history: registering events.', thisAccessory.displayName)
+      this.log('[%s] FGH registering events.', thisAccessory.displayName)
       this.service = thisAccessory.getService(FakeGatoHistoryService)
       if (this.service === undefined) {
         this.service = thisAccessory.addService(
@@ -552,7 +552,7 @@ module.exports = function (homebridge) {
         }
         this.service.getCharacteristic(S2R1Characteristic).setValue(hexToBase64(val))
         this.log(
-          '[%s] FG history: first entry [%s] last entry [%s] used memory [%s] 116 [%s].',
+          '[%s] FGH first entry [%s] last entry [%s] used memory [%s] 116 [%s].',
           this.accessoryName,
           this.firstEntry.toString(16),
           this.lastEntry.toString(16),
@@ -602,7 +602,7 @@ module.exports = function (homebridge) {
     }
 
     load (cb) {
-      this.log('FG history: loading.')
+      this.log('[%s] FGH loading.', this.accessoryName)
       homebridge.globalFakeGatoStorage.read({
         service: this,
         callback: function (err, data) {
@@ -619,7 +619,7 @@ module.exports = function (homebridge) {
                 this.history = jsonFile.history
                 this.extra = jsonFile.extra
               } catch (e) {
-                this.log('FG history: error fetching data - invalid JSON [%s].', e)
+                this.log('FGH error fetching data - invalid JSON [%s].', e)
                 cb(e, false)
               }
               cb(null, true)
@@ -632,7 +632,7 @@ module.exports = function (homebridge) {
     }
 
     cleanPersist () {
-      this.log('FG history: cleaning.')
+      this.log('FGH cleaning.')
       homebridge.globalFakeGatoStorage.remove({ service: this })
     }
 
@@ -654,7 +654,7 @@ module.exports = function (homebridge) {
             this.setTime = false
           } else {
             this.log(
-              '[%s] FG history: entry [%s] address [%s].',
+              '[%s] FGH entry [%s] address [%s].',
               this.accessoryName,
               this.currentEntry,
               this.memAddress
@@ -797,7 +797,7 @@ module.exports = function (homebridge) {
             break
           }
         }
-        this.log('[%s] FG history: data [%s].', this.accessoryName, this.dataStream)
+        this.log('[%s] FGH data [%s].', this.accessoryName, this.dataStream)
         const toReturn = hexToBase64(this.dataStream)
         this.dataStream = ''
         return toReturn
@@ -808,18 +808,18 @@ module.exports = function (homebridge) {
     }
 
     setCurrentS2W1 (value) {
-      this.log('[%s] FG history: data req [%s].', this.accessoryName, base64ToHex(value))
+      this.log('[%s] FGH data req [%s].', this.accessoryName, base64ToHex(value))
       const valHex = base64ToHex(value)
       const substring = valHex.substring(4, 12)
       const valInt = parseInt(substring, 16)
       const address = swap32(valInt)
       const hexAddress = address.toString('16')
-      this.log('[%s] FG history: address req [%s].', this.accessoryName, hexAddress)
+      this.log('[%s] FGH address req [%s].', this.accessoryName, hexAddress)
       this.sendHistory(address)
     }
 
     setCurrentS2W2 (value) {
-      this.log('[%s] FG history: clock adj [%s].', this.accessoryName, base64ToHex(value))
+      this.log('[%s] FGH clock adj [%s].', this.accessoryName, base64ToHex(value))
     }
   }
 
diff --git a/lib/fakegato/fakegato-storage.js b/lib/fakegato/fakegato-storage.js
index d21f546e..61068d58 100644
--- a/lib/fakegato/fakegato-storage.js
+++ b/lib/fakegato/fakegato-storage.js
@@ -26,7 +26,7 @@ class FakeGatoStorage {
       if (!params) {
         params = {}
       }
-      this.log('[%s] FS storage: addWriter().', service.accessoryName)
+      this.log('[%s] FGS addWriter().', service.accessoryName)
       const newWriter = {
         service,
         callback: params.callback,
@@ -70,20 +70,17 @@ class FakeGatoStorage {
           : typeof writer.callback === 'function'
           ? writer.callback
           : () => {}
+      const fileLoc = path.join(writer.path, writer.fileName)
       this.log(
-        'FG storage: write file [%s].',
-        path.join(writer.path, writer.fileName),
+        '[%s] FGS write file [%s] [%s].',
+        params.service.accessoryName,
+        fileLoc,
         params.data.substr(1, 80)
       )
-      writer.storageHandler.writeFile(
-        path.join(writer.path, writer.fileName),
-        params.data,
-        'utf8',
-        () => {
-          this.writing = false
-          callBack(arguments)
-        }
-      )
+      writer.storageHandler.writeFile(fileLoc, params.data, 'utf8', () => {
+        this.writing = false
+        callBack(arguments)
+      })
     } else {
       setTimeout(() => this.write(params), 100)
     }
@@ -97,8 +94,9 @@ class FakeGatoStorage {
         : typeof writer.callback === 'function'
         ? writer.callback
         : () => {}
-    this.log('FG storage: read file [%s].', path.join(writer.path, writer.fileName))
-    writer.storageHandler.readFile(path.join(writer.path, writer.fileName), 'utf8', callBack)
+    const fileLoc = path.join(writer.path, writer.fileName)
+    this.log('[%s] FGS read file [%s].', params.service.accessoryName, fileLoc)
+    writer.storageHandler.readFile(fileLoc, 'utf8', callBack)
   }
 
   remove (params) {
@@ -109,8 +107,9 @@ class FakeGatoStorage {
         : typeof writer.callback === 'function'
         ? writer.callback
         : () => {}
-    this.log('FG storage: delete file [%s].', path.join(writer.path, writer.fileName))
-    writer.storageHandler.unlink(path.join(writer.path, writer.fileName), callBack)
+    const fileLoc = path.join(writer.path, writer.fileName)
+    this.log('[%s] FGS delete file [%s].', params.service.accessoryName, fileLoc)
+    writer.storageHandler.unlink(fileLoc, callBack)
   }
 }
 
diff --git a/lib/fakegato/fakegato-timer.js b/lib/fakegato/fakegato-timer.js
index cec8a866..f03d9062 100644
--- a/lib/fakegato/fakegato-timer.js
+++ b/lib/fakegato/fakegato-timer.js
@@ -18,7 +18,7 @@ class FakeGatoTimer {
   }
 
   subscribe (service, callback) {
-    this.log('[%s] FG timer: new subscription.', service.accessoryName)
+    this.log('[%s] FGT new subscription.', service.accessoryName)
     const newService = {
       service,
       callback,
@@ -50,7 +50,7 @@ class FakeGatoTimer {
   }
 
   start () {
-    this.log('Starting global FG timer [%s minutes].', this.minutes)
+    this.log('Starting global FGT [%s minutes].', this.minutes)
     if (this.running) {
       this.stop()
     }
@@ -59,14 +59,14 @@ class FakeGatoTimer {
   }
 
   stop () {
-    this.log('Stopping global FG timer.')
+    this.log('Stopping global FGT.')
     clearInterval(this.intervalID)
     this.running = false
     this.intervalID = null
   }
 
   executeCallbacks () {
-    this.log('FG timer: executeCallbacks().')
+    this.log('FGT executeCallbacks().')
     if (this.subscribedServices.length !== 0) {
       for (const s in this.subscribedServices) {
         if (Object.prototype.hasOwnProperty.call(this.subscribedServices, s)) {
@@ -85,7 +85,7 @@ class FakeGatoTimer {
   }
 
   executeImmediateCallback (service) {
-    this.log('FG timer: executeImmediateCallback().')
+    this.log('[%s] FGT executeImmediateCallback().', service.accessoryName)
     if (typeof service.callback === 'function' && service.backLog.length) {
       service.callback({
         backLog: service.backLog,
@@ -100,7 +100,7 @@ class FakeGatoTimer {
     const service = params.service
     const immediateCallback = params.immediateCallback || false
     this.log(
-      '[%s] FG timer: addData() [%s] immediate [%s].',
+      '[%s] FGT addData() [%s] immediate [%s].',
       service.accessoryName,
       data,
       immediateCallback
@@ -119,7 +119,7 @@ class FakeGatoTimer {
   }
 
   emptyData (service) {
-    this.log('[%s] FG timer: emptyData().', service.accessoryName)
+    this.log('[%s] FGT emptyData().', service.accessoryName)
     const source = this.getSubscriber(service)
     if (source.backLog.length) {
       source.previousBackLog = source.backLog

From 02fabf3ff6cb2755243053cb5bad4d7c5ca9c4db Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 20 Oct 2021 09:15:34 +0100
Subject: [PATCH 2729/3183] eve garage gap fix

---
 CHANGELOG.md                            | 4 ++++
 lib/device/sensor-contact.js            | 3 +++
 lib/device/simulation/garage-eachen.js  | 3 +++
 lib/device/simulation/garage-one.js     | 3 +++
 lib/device/simulation/gate-one.js       | 3 +++
 lib/device/simulation/sensor-visible.js | 3 +++
 6 files changed, 19 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fbc43a75..7a664bef 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,10 @@ All notable changes to homebridge-ewelink will be documented in this file.
 
 - Some small changes to Fakegato debug logging
 
+### Fixed
+
+- An Eve app 'no data' gap for garage and contact sensor devices when restarting the plugin
+
 ## 8.4.0 (2021-10-16)
 
 ### Added
diff --git a/lib/device/sensor-contact.js b/lib/device/sensor-contact.js
index 09c50950..8e46f372 100644
--- a/lib/device/sensor-contact.js
+++ b/lib/device/sensor-contact.js
@@ -74,6 +74,9 @@ module.exports = class deviceSensorContact {
     this.accessory.eveService = new platform.eveService('door', this.accessory, {
       log: platform.config.debugFakegato ? this.log : () => {}
     })
+    this.accessory.eveService.addEntry({
+      status: this.service.getCharacteristic(this.hapChar.ContactSensorState).value
+    })
 
     // Output the customised options to the log
     const opts = JSON.stringify({
diff --git a/lib/device/simulation/garage-eachen.js b/lib/device/simulation/garage-eachen.js
index a728ee7a..4e27313d 100644
--- a/lib/device/simulation/garage-eachen.js
+++ b/lib/device/simulation/garage-eachen.js
@@ -113,6 +113,9 @@ module.exports = class deviceGarageEachen {
     this.accessory.eveService = new platform.eveService('door', this.accessory, {
       log: platform.config.debugFakegato ? this.log : () => {}
     })
+    this.accessory.eveService.addEntry({
+      status: this.service.getCharacteristic(this.hapChar.CurrentDoorState).value === 0 ? 0 : 1
+    })
 
     // Output the customised options to the log
     const opts = JSON.stringify({
diff --git a/lib/device/simulation/garage-one.js b/lib/device/simulation/garage-one.js
index d9c06ba4..aa2e8bcb 100644
--- a/lib/device/simulation/garage-one.js
+++ b/lib/device/simulation/garage-one.js
@@ -156,6 +156,9 @@ module.exports = class deviceGarageOne {
     this.accessory.eveService = new platform.eveService('door', this.accessory, {
       log: platform.config.debugFakegato ? this.log : () => {}
     })
+    this.accessory.eveService.addEntry({
+      status: this.service.getCharacteristic(this.hapChar.CurrentDoorState).value === 0 ? 0 : 1
+    })
 
     // Set up an interval to get eWeLink to send power updates
     if (
diff --git a/lib/device/simulation/gate-one.js b/lib/device/simulation/gate-one.js
index e33d65d8..0f9a72c5 100644
--- a/lib/device/simulation/gate-one.js
+++ b/lib/device/simulation/gate-one.js
@@ -134,6 +134,9 @@ module.exports = class deviceGateOne {
     this.accessory.eveService = new platform.eveService('door', this.accessory, {
       log: platform.config.debugFakegato ? this.log : () => {}
     })
+    this.accessory.eveService.addEntry({
+      status: this.service.getCharacteristic(this.hapChar.CurrentDoorState).value === 0 ? 0 : 1
+    })
 
     // Set up an interval to get eWeLink to send power updates
     if (
diff --git a/lib/device/simulation/sensor-visible.js b/lib/device/simulation/sensor-visible.js
index 889eaf53..6d7e4616 100644
--- a/lib/device/simulation/sensor-visible.js
+++ b/lib/device/simulation/sensor-visible.js
@@ -78,6 +78,9 @@ module.exports = class deviceSensorVisible {
     this.accessory.eveService = new platform.eveService('door', this.accessory, {
       log: platform.config.debugFakegato ? this.log : () => {}
     })
+    this.accessory.eveService.addEntry({
+      status: this.service.getCharacteristic(this.hapChar.ContactSensorState).value
+    })
 
     // Output the customised options to the log
     const opts = JSON.stringify({

From e4becf92f0ee0628f04f309ffef0e046996fb862 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 20 Oct 2021 09:16:23 +0100
Subject: [PATCH 2730/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7a664bef..3eac4d5c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 All notable changes to homebridge-ewelink will be documented in this file.
 
-## BETA
+## 8.4.1 (2021-10-20)
 
 ### Changed
 

From 70b36436a4b9a5c73cf78576090a1068f72fc5b5 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 20 Oct 2021 09:16:43 +0100
Subject: [PATCH 2731/3183] 8.4.1

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d6c0c1fe..f2cf6f60 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.4.0",
+  "version": "8.4.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.4.0",
+      "version": "8.4.1",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index f9447729..8b1df641 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.4.0",
+  "version": "8.4.1",
   "author": "bwp91",
   "description": "Homebridge plugin to integrate eWeLink devices into HomeKit.",
   "license": "MIT",

From 08588db1f8c282d705142e1842e91f273d604087 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 25 Oct 2021 07:46:04 +0100
Subject: [PATCH 2732/3183] bump node 16 v

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index f2cf6f60..d02a5574 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -36,7 +36,7 @@
       },
       "engines": {
         "homebridge": "^1.3.5",
-        "node": "^14.18.1 || ^16.11.1"
+        "node": "^14.18.1 || ^16.12.0"
       }
     },
     "node_modules/@homebridge/plugin-ui-utils": {
diff --git a/package.json b/package.json
index 8b1df641..15ebe183 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,7 @@
   "main": "lib/index.js",
   "engines": {
     "homebridge": "^1.3.5",
-    "node": "^14.18.1 || ^16.11.1"
+    "node": "^14.18.1 || ^16.12.0"
   },
   "repository": {
     "type": "git",

From 61082d6dd289a554ce6db2ea91ab5775dc746948 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 26 Oct 2021 08:05:42 +0100
Subject: [PATCH 2733/3183] bump axios

---
 package-lock.json | 14 +++++++-------
 package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d02a5574..1685a320 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -28,7 +28,7 @@
       "license": "MIT",
       "dependencies": {
         "@homebridge/plugin-ui-utils": "^0.0.19",
-        "axios": "^0.23.0",
+        "axios": "^0.24.0",
         "node-persist": "^3.1.0",
         "p-queue": "^6.6.2",
         "websocket-as-promised": "^2.0.1",
@@ -45,9 +45,9 @@
       "integrity": "sha512-axFX7lN2Yd7bz/6SlD7dzq5sY/N9+XYuLHPukuiyHQRDtNMRL1uDqJhOx6RVaN2tYDHB75h7YxRQWP7U44Mgzg=="
     },
     "node_modules/axios": {
-      "version": "0.23.0",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-0.23.0.tgz",
-      "integrity": "sha512-NmvAE4i0YAv5cKq8zlDoPd1VLKAqX5oLuZKs8xkJa4qi6RGn0uhCYFjWtHHC9EM/MwOwYWOs53W+V0aqEXq1sg==",
+      "version": "0.24.0",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-0.24.0.tgz",
+      "integrity": "sha512-Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA==",
       "dependencies": {
         "follow-redirects": "^1.14.4"
       }
@@ -596,9 +596,9 @@
       "integrity": "sha512-axFX7lN2Yd7bz/6SlD7dzq5sY/N9+XYuLHPukuiyHQRDtNMRL1uDqJhOx6RVaN2tYDHB75h7YxRQWP7U44Mgzg=="
     },
     "axios": {
-      "version": "0.23.0",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-0.23.0.tgz",
-      "integrity": "sha512-NmvAE4i0YAv5cKq8zlDoPd1VLKAqX5oLuZKs8xkJa4qi6RGn0uhCYFjWtHHC9EM/MwOwYWOs53W+V0aqEXq1sg==",
+      "version": "0.24.0",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-0.24.0.tgz",
+      "integrity": "sha512-Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA==",
       "requires": {
         "follow-redirects": "^1.14.4"
       }
diff --git a/package.json b/package.json
index 15ebe183..4a4cf7ad 100644
--- a/package.json
+++ b/package.json
@@ -52,7 +52,7 @@
   ],
   "dependencies": {
     "@homebridge/plugin-ui-utils": "^0.0.19",
-    "axios": "^0.23.0",
+    "axios": "^0.24.0",
     "node-persist": "^3.1.0",
     "p-queue": "^6.6.2",
     "websocket-as-promised": "^2.0.1",

From f67826e16dae0f9af00ee73ea450b9389235b926 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 27 Oct 2021 07:31:40 +0100
Subject: [PATCH 2734/3183] bump node 16 v

---
 CHANGELOG.md      | 7 +++++++
 package-lock.json | 2 +-
 package.json      | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3eac4d5c..94bdedbd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,13 @@
 
 All notable changes to homebridge-ewelink will be documented in this file.
 
+## UPCOMING
+
+### Changed
+
+- Bump `node` recommended versions to v14.18.1 or v16.13.0
+- Bump `axios` to v0.24.0
+
 ## 8.4.1 (2021-10-20)
 
 ### Changed
diff --git a/package-lock.json b/package-lock.json
index 1685a320..450c6ef8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -36,7 +36,7 @@
       },
       "engines": {
         "homebridge": "^1.3.5",
-        "node": "^14.18.1 || ^16.12.0"
+        "node": "^14.18.1 || ^16.13.0"
       }
     },
     "node_modules/@homebridge/plugin-ui-utils": {
diff --git a/package.json b/package.json
index 4a4cf7ad..dc65982d 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,7 @@
   "main": "lib/index.js",
   "engines": {
     "homebridge": "^1.3.5",
-    "node": "^14.18.1 || ^16.12.0"
+    "node": "^14.18.1 || ^16.13.0"
   },
   "repository": {
     "type": "git",

From cb7efd492060d645ac7b1f8deb272f66a3f8e507 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 31 Oct 2021 09:07:12 +0000
Subject: [PATCH 2735/3183] Update package-lock.json

---
 package-lock.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 450c6ef8..19ad41a6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -135,9 +135,9 @@
       "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="
     },
     "node_modules/follow-redirects": {
-      "version": "1.14.4",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.4.tgz",
-      "integrity": "sha512-zwGkiSXC1MUJG/qmeIFH2HBJx9u0V46QGUe3YR1fXG8bXQxq7fLj0RjLZQ5nubr9qNJUZrH+xUcwXEoXNpfS+g==",
+      "version": "1.14.5",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.5.tgz",
+      "integrity": "sha512-wtphSXy7d4/OR+MvIFbCVBDzZ5520qV8XfPklSN5QtxuMUJZ+b0Wnst1e1lCDocfzuCkHqj8k0FpZqO+UIaKNA==",
       "funding": [
         {
           "type": "individual",
@@ -668,9 +668,9 @@
       "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="
     },
     "follow-redirects": {
-      "version": "1.14.4",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.4.tgz",
-      "integrity": "sha512-zwGkiSXC1MUJG/qmeIFH2HBJx9u0V46QGUe3YR1fXG8bXQxq7fLj0RjLZQ5nubr9qNJUZrH+xUcwXEoXNpfS+g=="
+      "version": "1.14.5",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.5.tgz",
+      "integrity": "sha512-wtphSXy7d4/OR+MvIFbCVBDzZ5520qV8XfPklSN5QtxuMUJZ+b0Wnst1e1lCDocfzuCkHqj8k0FpZqO+UIaKNA=="
     },
     "function-bind": {
       "version": "1.1.1",

From e33878b55e0b2212b5199b249b1d1a6e869b90d3 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 31 Oct 2021 09:19:47 +0000
Subject: [PATCH 2736/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 94bdedbd..59c0b8f7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 All notable changes to homebridge-ewelink will be documented in this file.
 
-## UPCOMING
+## 8.4.2 (2021-10-31)
 
 ### Changed
 

From 4f2347f6859699fc8b72b04370e20189142de962 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 31 Oct 2021 09:20:14 +0000
Subject: [PATCH 2737/3183] 8.4.2

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 19ad41a6..d91a9b68 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.4.1",
+  "version": "8.4.2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.4.1",
+      "version": "8.4.2",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index dc65982d..efd0b098 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.4.1",
+  "version": "8.4.2",
   "author": "bwp91",
   "description": "Homebridge plugin to integrate eWeLink devices into HomeKit.",
   "license": "MIT",

From b1f353eca9f25e018c9f6ceec92b1e90931e4520 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Sun, 31 Oct 2021 09:34:59 +0000
Subject: [PATCH 2738/3183] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index d65d77fb..f0ef57e4 100644
--- a/README.md
+++ b/README.md
@@ -29,7 +29,7 @@ Homebridge plugin to integrate eWeLink devices into HomeKit
 ### Prerequisites
 
 - To use this plugin, you will need to already have [Homebridge](https://homebridge.io) (at least v1.3.5) or [HOOBS](https://hoobs.org) (at least v4) installed. Refer to the links for more information and installation instructions.
-- It is recommended to use [Node](https://nodejs.org/en/) v14, however v12 and v16 are also supported.
+- Whilst it is recommended to use [Node](https://nodejs.org/en/) v16, the plugin supports v12 and v14 as per the [Homebridge guidelines](https://github.com/homebridge/homebridge/wiki/How-To-Update-Node.js).
 
 ### Setup
 

From 6bd9c355ebd49baf546e26701fe75a16481fcd0c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 1 Nov 2021 17:02:36 +0000
Subject: [PATCH 2739/3183] update author for email address

---
 package.json | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index efd0b098..f7e57443 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,10 @@
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
   "version": "8.4.2",
-  "author": "bwp91",
+  "author": {
+    "name": "bwp91",
+    "email": "bwp91@icloud.com"
+  },
   "description": "Homebridge plugin to integrate eWeLink devices into HomeKit.",
   "license": "MIT",
   "keywords": [

From 6b023b66f1e22e837beb1ff57f6b6c2336ad1646 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 2 Nov 2021 07:23:19 +0000
Subject: [PATCH 2740/3183] use contact simulation as sensor for garage

---
 lib/index.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/index.js b/lib/index.js
index d23bd028..ce8fc674 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -728,15 +728,15 @@ class eWeLinkPlatform {
         accessory.control = new (require(instance))(this, accessory, devicesInHB)
         /****************************/
       } else if (
-        this.consts.devices.garageSensors.includes(uiid) &&
-        Object.values(this.deviceConf).some(el => el.sensorId === device.deviceid)
+        Object.values(this.deviceConf).some(el => el.sensorId === device.deviceid) &&
+        (this.consts.devices.garageSensors.includes(uiid) || device.showAs === 'sensor')
       ) {
         /************************************
         SENSORS [SONOFF DW2 AS GARAGE SENSOR]
         ************************************/
         const sim = Object.values(this.deviceConf).find(el => el.sensorId === device.deviceid)
         let instance
-        if (sim.hideSensor) {
+        if (sim.hideSensor || device.showAs === 'sensor') {
           // If the sensor exists in Homebridge then remove it as needs to be re-added as hidden
           if (devicesInHB.has(uuid)) {
             this.removeAccessory(devicesInHB.get(uuid))

From 187743c8de0e6d0879527c4adad6e5044cdfb792 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 2 Nov 2021 07:23:51 +0000
Subject: [PATCH 2741/3183] 8.4.3-beta.0

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d91a9b68..a42916d2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.4.2",
+  "version": "8.4.3-beta.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.4.2",
+      "version": "8.4.3-beta.0",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index f7e57443..0257771a 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.4.2",
+  "version": "8.4.3-beta.0",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From 7d6b5d30bfbd38ed6d323d82b7bf0934505d0f41 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 2 Nov 2021 08:00:13 +0000
Subject: [PATCH 2742/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 59c0b8f7..8ba2bb8e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 All notable changes to homebridge-ewelink will be documented in this file.
 
+## BETA
+
+### Added
+
+- Ability to use contact sensor simulation to show the correct state of a garage door/lock simulation
+
 ## 8.4.2 (2021-10-31)
 
 ### Changed

From e7071632c9909455fb487a473fd940902f32465b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 2 Nov 2021 09:40:50 +0000
Subject: [PATCH 2743/3183] respect sensor visibility for simulations

---
 lib/device/simulation/sensor-visible.js | 17 ++++++++++++-----
 lib/index.js                            |  2 +-
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/lib/device/simulation/sensor-visible.js b/lib/device/simulation/sensor-visible.js
index 6d7e4616..4dc09912 100644
--- a/lib/device/simulation/sensor-visible.js
+++ b/lib/device/simulation/sensor-visible.js
@@ -22,6 +22,7 @@ module.exports = class deviceSensorVisible {
 
     // Set up custom variables for this device type
     this.isDW2 = platform.consts.devices.sensorContact.includes(accessory.context.eweUIID)
+    this.hasBattery = platform.consts.devices.garageSensors.includes(accessory.context.eweUIID)
     const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
     this.scaleBattery = deviceConf && deviceConf.scaleBattery
     this.lowBattThreshold =
@@ -69,10 +70,12 @@ module.exports = class deviceSensorVisible {
       this.service.updateCharacteristic(this.eveChar.TimesOpened, 0)
     })
 
-    // Add the battery service if it doesn't already exist
-    this.batteryService =
-      this.accessory.getService(this.hapServ.Battery) ||
-      this.accessory.addService(this.hapServ.Battery)
+    if (this.hasBattery) {
+      // Add the battery service if it doesn't already exist
+      this.batteryService =
+        this.accessory.getService(this.hapServ.Battery) ||
+        this.accessory.addService(this.hapServ.Battery)
+    }
 
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new platform.eveService('door', this.accessory, {
@@ -93,7 +96,11 @@ module.exports = class deviceSensorVisible {
 
   async externalUpdate (params) {
     try {
-      if (this.funcs.hasProperty(params, 'battery') && params.battery !== this.cacheBatt) {
+      if (
+        this.batteryService &&
+        this.funcs.hasProperty(params, 'battery') &&
+        params.battery !== this.cacheBatt
+      ) {
         this.cacheBatt = params.battery
         if (this.isDW2) {
           this.cacheBattScaled = Math.min(Math.max(this.cacheBatt, 2), 3)
diff --git a/lib/index.js b/lib/index.js
index ce8fc674..352865b9 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -736,7 +736,7 @@ class eWeLinkPlatform {
         ************************************/
         const sim = Object.values(this.deviceConf).find(el => el.sensorId === device.deviceid)
         let instance
-        if (sim.hideSensor || device.showAs === 'sensor') {
+        if (sim.hideSensor) {
           // If the sensor exists in Homebridge then remove it as needs to be re-added as hidden
           if (devicesInHB.has(uuid)) {
             this.removeAccessory(devicesInHB.get(uuid))

From 40570b26589911254febf7cbc6c4f23c291a970c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 2 Nov 2021 09:41:14 +0000
Subject: [PATCH 2744/3183] 8.4.3-beta.1

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index a42916d2..26027a08 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.4.3-beta.0",
+  "version": "8.4.3-beta.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.4.3-beta.0",
+      "version": "8.4.3-beta.1",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 0257771a..d8659e82 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.4.3-beta.0",
+  "version": "8.4.3-beta.1",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From c5c125b06df071cfe7546cfe2255b0028ed8e229 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 3 Nov 2021 08:51:11 +0000
Subject: [PATCH 2745/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8ba2bb8e..a719ffcd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,11 +2,11 @@
 
 All notable changes to homebridge-ewelink will be documented in this file.
 
-## BETA
+## 8.5.0 (2021-11-03)
 
 ### Added
 
-- Ability to use contact sensor simulation to show the correct state of a garage door/lock simulation
+- Ability to use a contact sensor simulation to show the correct state of a garage door/lock simulation
 
 ## 8.4.2 (2021-10-31)
 

From b39c29c1e81e6a251b6bda7ca9b1653d6e9756ce Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 3 Nov 2021 08:51:32 +0000
Subject: [PATCH 2746/3183] 8.5.0

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 26027a08..d1f8fbba 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.4.3-beta.1",
+  "version": "8.5.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.4.3-beta.1",
+      "version": "8.5.0",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index d8659e82..38993c53 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.4.3-beta.1",
+  "version": "8.5.0",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From 57af95dcb3b71a1431ec42986fc839bed5ab7f9d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 3 Nov 2021 21:19:30 +0000
Subject: [PATCH 2747/3183] get devices from all ewelink homes

---
 lib/connection/http.js | 113 ++++++++++++++++++++++++++++++-----------
 lib/index.js           |   3 +-
 lib/utils/lang-en.js   |   1 +
 3 files changed, 85 insertions(+), 32 deletions(-)

diff --git a/lib/connection/http.js b/lib/connection/http.js
index 452fa6d9..62b1bfb6 100644
--- a/lib/connection/http.js
+++ b/lib/connection/http.js
@@ -12,6 +12,7 @@ module.exports = class connectionHTTP {
     this.countryCode = platform.config.countryCode
     this.debug = platform.config.debug
     this.funcs = platform.funcs
+    this.homeList = []
     this.httpHost = platform.config.httpHost
     this.ignoredDevices = platform.ignoredDevices
     this.lang = platform.lang
@@ -140,11 +141,11 @@ module.exports = class connectionHTTP {
     }
   }
 
-  async getDevices () {
-    // Used to get a user's device list
+  async getHomes () {
+    // Used to get a user's home list
     try {
       // Send the request
-      const res = await axios.get('https://' + this.httpHost + '/v2/device/thing', {
+      const res = await axios.get('https://' + this.httpHost + '/v2/family', {
         headers: {
           Authorization: 'Bearer ' + this.aToken,
           'Content-Type': 'application/json',
@@ -152,47 +153,97 @@ module.exports = class connectionHTTP {
           'X-CK-Nonce': Math.random()
             .toString(36)
             .substr(2, 8)
-        },
-        params: {
-          num: 0
         }
       })
 
       // Parse the response
       const body = res.data
-      if (!body.data || body.error !== 0) {
+      if (
+        !body.data ||
+        body.error !== 0 ||
+        !body.data.familyList ||
+        !Array.isArray(body.data.familyList)
+      ) {
         throw new Error(JSON.stringify(body, null, 2))
       }
 
-      // The list also includes scenes so we need to remove them
+      // Add the home id to the global array of ids
+      body.data.familyList.forEach(home => this.homeList.push(home.id))
+    } catch (err) {
+      // Check to see if it's a eWeLink server problem and we can retry
+      if (err.code && this.consts.httpRetryCodes.includes(err.code)) {
+        // Retry if another attempt could be successful
+        this.log.warn('%s [getHomes() - %s].', this.lang.httpRetry, err.code)
+        await this.funcs.sleep(30000)
+        await this.getHomes()
+      } else {
+        // It's not a eWeLink problem so report the error back
+        this.log.warn('%s.', this.lang.errGetHomes)
+        throw err
+      }
+    }
+  }
+
+  async getDevices () {
+    // Used to get a user's device list
+    try {
+      // Send the request to get a device list for each of the homes
+      const fullDeviceList = []
+      for (const homeId of this.homeList) {
+        const res = await axios.get('https://' + this.httpHost + '/v2/device/thing', {
+          headers: {
+            Authorization: 'Bearer ' + this.aToken,
+            'Content-Type': 'application/json',
+            'X-CK-Appid': this.consts.appId,
+            'X-CK-Nonce': Math.random()
+              .toString(36)
+              .substr(2, 8)
+          },
+          params: {
+            num: 0,
+            familyid: homeId
+          }
+        })
+
+        // Parse the response
+        const body = res.data
+        if (!body.data || body.error !== 0) {
+          throw new Error(JSON.stringify(body, null, 2))
+        }
+
+        // The list also includes scenes so we need to remove them
+        if (body.data.thingList && body.data.thingList.length > 0) {
+          body.data.thingList.forEach(device => fullDeviceList.push(device))
+        }
+      }
+
+      // Now we have a device list from all the eWeLink user homes
       const deviceList = []
       const sensorList = []
-      if (body.data.thingList && body.data.thingList.length > 0) {
-        body.data.thingList.forEach(d => {
-          // Check each item is a device and also remove any devices the user has ignored
+      fullDeviceList.forEach(d => {
+        // Check each item is a device and also remove any devices the user has ignored
+        if (
+          d.itemData &&
+          d.itemData.extra &&
+          d.itemData.extra.uiid &&
+          !this.ignoredDevices.includes(d.itemData.deviceid)
+        ) {
+          // If in LAN mode then don't add to device list
+          if (this.mode === 'lan' && !this.consts.devices.lan.includes(d.itemData.extra.uiid)) {
+            return
+          }
+          // Separate the sensors as these need to be set up last
+          const isObstructSwitch = this.obstructSwitches[d.itemData.deviceid]
           if (
-            d.itemData &&
-            d.itemData.extra &&
-            d.itemData.extra.uiid &&
-            !this.ignoredDevices.includes(d.itemData.deviceid)
+            this.consts.devices.garageSensors.includes(d.itemData.extra.uiid) ||
+            isObstructSwitch
           ) {
-            // If in LAN mode then don't add to device list
-            if (this.mode === 'lan' && !this.consts.devices.lan.includes(d.itemData.extra.uiid)) {
-              return
-            }
-            // Separate the sensors as these need to be set up last
-            const isObstructSwitch = this.obstructSwitches[d.itemData.deviceid]
-            if (
-              this.consts.devices.garageSensors.includes(d.itemData.extra.uiid) ||
-              isObstructSwitch
-            ) {
-              sensorList.push(d.itemData)
-            } else {
-              deviceList.push(d.itemData)
-            }
+            sensorList.push(d.itemData)
+          } else {
+            deviceList.push(d.itemData)
           }
-        })
-      }
+        }
+      })
 
       // Sensors need to go last as they update garages that need to exist already
       return deviceList.concat(sensorList)
diff --git a/lib/index.js b/lib/index.js
index 352865b9..da8de49a 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -479,7 +479,8 @@ class eWeLinkPlatform {
         const authData = await httpClient.login()
         this.config.password = authData.password
 
-        // Get a device list via HTTP request
+        // Get a home and device list via HTTP request
+        await httpClient.getHomes()
         const httpDeviceList = await httpClient.getDevices()
         httpDeviceList.forEach(device => deviceList.push(device))
 
diff --git a/lib/utils/lang-en.js b/lib/utils/lang-en.js
index c36a19f3..ddfbc93a 100644
--- a/lib/utils/lang-en.js
+++ b/lib/utils/lang-en.js
@@ -70,6 +70,7 @@ module.exports = {
   dualr3NoMeter: 'is not supported in meter mode',
   errGetDevice: 'An error occurred during http getDevice()',
   errGetDevices: 'An error occurred during http getDevices()',
+  errGetHomes: 'An error occurred during http getHomes()',
   errGetHost: 'An error occurred during ws getHost()',
   errLogin: 'An error occurred during http login()',
   eweError: 'An eWeLink error [500] occured, retrying in 30 seconds',

From 55c20ad39367edc85d0ebd66982fef8840a9ab1a Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 3 Nov 2021 21:19:45 +0000
Subject: [PATCH 2748/3183] updated config for future rf blind simulation

---
 config.schema.json | 70 ++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 67 insertions(+), 3 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 16dfa38b..5768d340 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -1417,6 +1417,66 @@
               "minLength": 13,
               "maxLength": 15
             },
+            "deviceType": {
+              "type": "string",
+              "title": "Device Type",
+              "description": "Select the type of RF device this is.",
+              "oneOf": [
+                {
+                  "title": "Button(s) (Default)",
+                  "enum": ["button"]
+                },
+                {
+                  "title": "Curtain",
+                  "enum": ["curtain"]
+                },
+                {
+                  "title": "Sensor/Doorbell",
+                  "enum": ["sensor"]
+                }
+              ],
+              "condition": {
+                "functionBody": "return (model.bridgeSensors && model.bridgeSensors[arrayIndices] && model.bridgeSensors[arrayIndices].fullDeviceId && model.bridgeSensors[arrayIndices].fullDeviceId.length >= 13);"
+              }
+            },
+            "curtainType": {
+              "type": "string",
+              "title": "Curtain Type",
+              "description": "Select the type of accessory you would like to expose this as.",
+              "oneOf": [
+                {
+                  "title": "3 Buttons (Open, Close, Stop) (Default)",
+                  "enum": ["buttons"]
+                },
+                {
+                  "title": "Window Blind/Covering",
+                  "enum": ["blind"]
+                }
+              ],
+              "condition": {
+                "functionBody": "return (model.bridgeSensors && model.bridgeSensors[arrayIndices] && model.bridgeSensors[arrayIndices].fullDeviceId && model.bridgeSensors[arrayIndices].fullDeviceId.length >= 13 && model.bridgeSensors[arrayIndices].deviceType === 'curtain');"
+              }
+            },
+            "operationTime": {
+              "type": "integer",
+              "title": "Operation Time (Deciseconds)",
+              "description": "The time to open/close the device. This setting is in deciseconds - count the time in seconds and multiply by 10, for example 75 for 7.5 seconds. Must be 20 or more.",
+              "placeholder": 100,
+              "minimum": 20,
+              "condition": {
+                "functionBody": "return (model.bridgeSensors && model.bridgeSensors[arrayIndices] && model.bridgeSensors[arrayIndices].fullDeviceId && model.bridgeSensors[arrayIndices].fullDeviceId.length >= 13 && model.bridgeSensors[arrayIndices].deviceType === 'curtain' && model.bridgeSensors[arrayIndices].curtainType === 'blind');"
+              }
+            },
+            "operationTimeDown": {
+              "type": "integer",
+              "title": "Operation Time Down (Deciseconds)",
+              "description": "If your device has a different operation time for up and down, use this setting to specify the operation time DOWN (in deciseconds) and the other setting to specify the operation time UP. Otherwise leave blank. Must be 20 or more.",
+              "placeholder": 100,
+              "minimum": 20,
+              "condition": {
+                "functionBody": "return (model.bridgeSensors && model.bridgeSensors[arrayIndices] && model.bridgeSensors[arrayIndices].fullDeviceId && model.bridgeSensors[arrayIndices].fullDeviceId.length >= 13 && model.bridgeSensors[arrayIndices].deviceType === 'curtain' && model.bridgeSensors[arrayIndices].curtainType === 'blind');"
+              }
+            },
             "type": {
               "type": "string",
               "title": "Sensor Type",
@@ -1460,7 +1520,7 @@
                 }
               ],
               "condition": {
-                "functionBody": "return (model.bridgeSensors && model.bridgeSensors[arrayIndices] && model.bridgeSensors[arrayIndices].fullDeviceId && model.bridgeSensors[arrayIndices].fullDeviceId.length >= 13);"
+                "functionBody": "return (model.bridgeSensors && model.bridgeSensors[arrayIndices] && model.bridgeSensors[arrayIndices].fullDeviceId && model.bridgeSensors[arrayIndices].fullDeviceId.length >= 13 && model.bridgeSensors[arrayIndices].deviceType === 'sensor');"
               }
             },
             "sensorTimeLength": {
@@ -1470,7 +1530,7 @@
               "placeholder": 60,
               "minimum": 1,
               "condition": {
-                "functionBody": "return (model.bridgeSensors && model.bridgeSensors[arrayIndices] && model.bridgeSensors[arrayIndices].type && ['motion', 'smoke', 'water', 'co', 'co2', 'occupancy', 'contact'].includes(model.bridgeSensors[arrayIndices].type));"
+                "functionBody": "return (model.bridgeSensors && model.bridgeSensors[arrayIndices] && model.bridgeSensors[arrayIndices].type && model.bridgeSensors[arrayIndices].deviceType === 'sensor' && ['motion', 'smoke', 'water', 'co', 'co2', 'occupancy', 'contact'].includes(model.bridgeSensors[arrayIndices].type));"
               }
             },
             "sensorTimeDifference": {
@@ -1480,7 +1540,7 @@
               "placeholder": 60,
               "minimum": 5,
               "condition": {
-                "functionBody": "return (model.bridgeSensors && model.bridgeSensors[arrayIndices] && model.bridgeSensors[arrayIndices].type && ['motion', 'smoke', 'water', 'co', 'co2', 'occupancy', 'contact'].includes(model.bridgeSensors[arrayIndices].type));"
+                "functionBody": "return (model.bridgeSensors && model.bridgeSensors[arrayIndices] && model.bridgeSensors[arrayIndices].type && model.bridgeSensors[arrayIndices].deviceType === 'sensor' && ['motion', 'smoke', 'water', 'co', 'co2', 'occupancy', 'contact'].includes(model.bridgeSensors[arrayIndices].type));"
               }
             },
             "overrideLogging": {
@@ -1741,6 +1801,10 @@
           "items": [
             "bridgeSensors[].label",
             "bridgeSensors[].fullDeviceId",
+            "bridgeSensors[].deviceType",
+            "bridgeSensors[].curtainType",
+            "bridgeSensors[].operationTime",
+            "bridgeSensors[].operationTimeDown",
             "bridgeSensors[].type",
             "bridgeSensors[].sensorTimeLength",
             "bridgeSensors[].sensorTimeDifference",

From 8eae241df71c7e2940c502614a883aec42a114a7 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 3 Nov 2021 21:20:13 +0000
Subject: [PATCH 2749/3183] 8.5.1-beta.0

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d1f8fbba..61833aad 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.5.0",
+  "version": "8.5.1-beta.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.5.0",
+      "version": "8.5.1-beta.0",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 38993c53..108b3f80 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.5.0",
+  "version": "8.5.1-beta.0",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From 865ebb1d7210dfaba7b82e0db26cdbb4148d8018 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 3 Nov 2021 22:15:42 +0000
Subject: [PATCH 2750/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a719ffcd..82c2ae6d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 All notable changes to homebridge-ewelink will be documented in this file.
 
+## BETA
+
+### Added
+
+- The plugin will now retrieve devices from **all** your homes in your eWeLink account
+
 ## 8.5.0 (2021-11-03)
 
 ### Added

From d93a81986d1a266efe481c2c17dc29cea52a49b7 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 3 Nov 2021 22:23:03 +0000
Subject: [PATCH 2751/3183] validate new rf config fields

---
 lib/index.js           | 10 +++++++---
 lib/utils/constants.js |  6 +++++-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/lib/index.js b/lib/index.js
index da8de49a..c13ba40f 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -157,9 +157,8 @@ class eWeLinkPlatform {
               this.rfSubdevices[id] = {}
               for (const [k, v] of entries) {
                 switch (k) {
-                  case 'fullDeviceId':
-                  case 'label':
-                    break
+                  case 'curtainType':
+                  case 'deviceType':
                   case 'overrideLogging':
                   case 'type': {
                     const index = k === 'type' ? 'sensorType' : k
@@ -171,6 +170,11 @@ class eWeLinkPlatform {
                     }
                     break
                   }
+                  case 'fullDeviceId':
+                  case 'label':
+                    break
+                  case 'operationTime':
+                  case 'operationTimeDown':
                   case 'sensorTimeDifference':
                   case 'sensorTimeLength': {
                     if (typeof v === 'string') {
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 8c23204a..78c15607 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -31,6 +31,8 @@ module.exports = {
     adaptiveLightingShift: 0,
     apiPort: 0,
     brightnessStep: 1,
+    curtainType: 'buttons',
+    deviceType: 'button',
     httpHost: 'eu-apia.coolkit.cc',
     humidityOffset: 0,
     inUsePowerThreshold: 0,
@@ -235,7 +237,9 @@ module.exports = {
       'valve_four',
       'window'
     ],
-    showAsMotor: ['blind', 'door', 'garage', 'window']
+    showAsMotor: ['blind', 'door', 'garage', 'window'],
+    curtainType: ['buttons', 'blind'],
+    deviceType: ['button', 'curtain', 'sensor']
   },
 
   devices: {

From 20d5e26cc475aaffe98b356e0bcf65fea1f6c3bb Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 4 Nov 2021 07:39:50 +0000
Subject: [PATCH 2752/3183] small rf refactoring, stage set for rf blind
 simulation

---
 lib/device/rf-bridge.js           |  54 +++++++-------
 lib/device/simulation/rf-blind.js | 114 ++++++++++++++++++++++++++++++
 lib/index.js                      |  13 +++-
 3 files changed, 149 insertions(+), 32 deletions(-)
 create mode 100644 lib/device/simulation/rf-blind.js

diff --git a/lib/device/rf-bridge.js b/lib/device/rf-bridge.js
index 53888438..a0c20704 100644
--- a/lib/device/rf-bridge.js
+++ b/lib/device/rf-bridge.js
@@ -131,7 +131,7 @@ module.exports = class deviceRFBridge {
               if (params[chan] === subAccessory.context.cacheLastAct) {
                 return
               }
-              const deviceConf = this.platform.rfSubdevices[subAccessory.context.hbDeviceId]
+              const deviceConf = this.platform.rfSubdevices[subAccessory.context.hbDeviceId] || {}
               let enableLogging = !this.disableDeviceLogging
               if (deviceConf && deviceConf.overrideLogging) {
                 switch (deviceConf.overrideLogging) {
@@ -144,42 +144,36 @@ module.exports = class deviceRFBridge {
                     break
                 }
               }
+              switch (subAccessory.context.subType) {
+                case 'blind':
+                  // Simulation
+                  return
+                case 'button':
+                case 'curtain': {
+                  const service = subAccessory.context.buttons[channel]
+                  subAccessory.getService(service).updateCharacteristic(this.hapChar.On, true)
+                  this.log(
+                    '[%s] %s [%s].',
+                    subAccessory.displayName,
+                    this.lang.curState,
+                    this.lang.buttonTrig
+                  )
+                  await this.funcs.sleep(3000)
+                  subAccessory.getService(service).updateCharacteristic(this.hapChar.On, false)
+                  return
+                }
+              }
               const sensorTimeLength =
-                deviceConf && deviceConf.sensorTimeLength
-                  ? deviceConf.sensorTimeLength
-                  : this.consts.defaultValues.sensorTimeLength
+                deviceConf.sensorTimeLength || this.consts.defaultValues.sensorTimeLength
               const sensorTimeDifference =
-                deviceConf && deviceConf.sensorTimeDifference
-                  ? deviceConf.sensorTimeDifference
-                  : this.consts.defaultValues.sensorTimeDifference
-              let sensorType
-              if (['button', 'curtain'].includes(subAccessory.context.subType)) {
-                sensorType = subAccessory.context.subType
-              } else {
-                sensorType = deviceConf && deviceConf.type ? deviceConf.type : 'motion'
-              }
-
+                deviceConf.sensorTimeDifference || this.consts.defaultValues.sensorTimeDifference
               subAccessory.context.cacheLastAct = params[chan]
               const timeOfMotion = new Date(params[chan])
               const diff = (timeNow.getTime() - timeOfMotion.getTime()) / 1000
               let serv
               let char
-              if (diff < sensorTimeDifference || ['button', 'curtain'].sensorType) {
-                switch (sensorType) {
-                  case 'button':
-                  case 'curtain': {
-                    const service = subAccessory.context.buttons[channel]
-                    subAccessory.getService(service).updateCharacteristic(this.hapChar.On, true)
-                    this.log(
-                      '[%s] %s [%s].',
-                      subAccessory.displayName,
-                      this.lang.curState,
-                      this.lang.buttonTrig
-                    )
-                    await this.funcs.sleep(3000)
-                    subAccessory.getService(service).updateCharacteristic(this.hapChar.On, false)
-                    return
-                  }
+              if (diff < sensorTimeDifference) {
+                switch (deviceConf.type) {
                   case 'water':
                     serv = this.hapServ.LeakSensor
                     char = this.hapChar.LeakDetected
diff --git a/lib/device/simulation/rf-blind.js b/lib/device/simulation/rf-blind.js
new file mode 100644
index 00000000..e290f5b2
--- /dev/null
+++ b/lib/device/simulation/rf-blind.js
@@ -0,0 +1,114 @@
+/* jshint node: true,esversion: 9, -W014, -W033 */
+/* eslint-disable new-cap */
+'use strict'
+
+module.exports = class deviceRFBlind {
+  constructor (platform, accessory) {
+    // Set up variables from the platform
+    this.eveChar = platform.eveChar
+    this.funcs = platform.funcs
+    this.hapChar = platform.api.hap.Characteristic
+    this.hapErr = platform.api.hap.HapStatusError
+    this.hapServ = platform.api.hap.Service
+    this.lang = platform.lang
+    this.log = platform.log
+    this.platform = platform
+
+    // Set up variables from the accessory
+    this.name = accessory.displayName
+    this.accessory = accessory
+
+    // Initially set the online flag as true (to be then updated as false if necessary)
+    this.isOnline = true
+
+    // Set up custom variables for this device type
+    const deviceConf = platform.rfSubdevices[accessory.context.hbDeviceId]
+
+    // Set the correct logging variables for this accessory
+    this.enableLogging = !platform.config.disableDeviceLogging
+    this.enableDebugLogging = platform.config.debug
+    if (deviceConf && deviceConf.overrideLogging) {
+      switch (deviceConf.overrideLogging) {
+        case 'standard':
+          this.enableLogging = true
+          this.enableDebugLogging = false
+          break
+        case 'debug':
+          this.enableLogging = true
+          this.enableDebugLogging = true
+          break
+        case 'disable':
+          this.enableLogging = false
+          this.enableDebugLogging = false
+          break
+      }
+    }
+
+    // This instance is a remote control with buttons or curtain control
+    Object.entries(this.accessory.context.buttons).forEach(([chan, name]) => {
+      // For each curtain/button we create a separate switch service
+
+      // Add the switch service if it doesn't already exist
+      if (!this.accessory.getService(name)) {
+        this.accessory.addService(this.hapServ.Switch, name, 'switch' + chan)
+      }
+
+      // Always start with the buttons off (useful when restarting Homebridge)
+      this.accessory.getService(name).updateCharacteristic(this.hapChar.On, false)
+
+      // Add the set handler to the switch on/off characteristic
+      this.accessory
+        .getService(name)
+        .getCharacteristic(this.hapChar.On)
+        .onSet(async value => await this.internalPressUpdate(chan, name, value))
+
+      // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
+      if (!platform.config.disableNoResponse) {
+        this.accessory
+          .getService(name)
+          .getCharacteristic(this.hapChar.On)
+          .onGet(() => {
+            if (!this.isOnline) {
+              throw new this.hapErr(-70402)
+            }
+            return this.accessory.getService(name).getCharacteristic(this.hapChar.On).value
+          })
+      }
+    })
+
+    // Output the customised options to the log
+    const opts = JSON.stringify({
+      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable'
+    })
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
+  }
+
+  async internalPressUpdate (rfChl, service, value) {
+    try {
+      if (!value) {
+        return
+      }
+      const params = {
+        cmd: 'transmit',
+        rfChl: parseInt(rfChl)
+      }
+      await this.platform.sendDeviceUpdate(this.accessory, params)
+      if (this.enableLogging) {
+        this.log('[%s] %s [%s].', this.name, this.lang.curState, this.lang.buttonTrig)
+      }
+      setTimeout(() => {
+        this.accessory.getService(service).updateCharacteristic(this.hapChar.On, false)
+      }, 1000)
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, true)
+      setTimeout(() => {
+        this.accessory.getService(service).updateCharacteristic(this.hapChar.On, false)
+      }, 2000)
+      throw new this.hapErr(-70402)
+    }
+  }
+
+  markStatus (isOnline) {
+    this.isOnline = isOnline
+  }
+}
diff --git a/lib/index.js b/lib/index.js
index c13ba40f..9d1d09a1 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1138,6 +1138,7 @@ class eWeLinkPlatform {
           let subType
           const fullDeviceId = device.deviceid + 'SW' + swNumber
           const uuidsub = this.api.hap.uuid.generate(fullDeviceId)
+          const deviceConf = this.rfSubdevices[device.deviceid] || {}
 
           // Check which eWeLink type the connected sub device is
           let instance
@@ -1150,8 +1151,16 @@ class eWeLinkPlatform {
               instance = 'rf-button'
               break
             case '5':
-              subType = 'curtain'
-              instance = 'rf-button'
+              switch (deviceConf.curtainType) {
+                case 'blind':
+                  subType = 'blind'
+                  instance = 'simulation/rf-blind'
+                  break
+                default:
+                  subType = 'curtain'
+                  instance = 'rf-button'
+                  break
+              }
               break
             case '6':
             case '7':

From e4767b32bc60c29c3c3c02600db7a16720b470f6 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 4 Nov 2021 07:40:19 +0000
Subject: [PATCH 2753/3183] 8.5.1-beta.1

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 61833aad..8217a236 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.5.1-beta.0",
+  "version": "8.5.1-beta.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.5.1-beta.0",
+      "version": "8.5.1-beta.1",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 108b3f80..1766020d 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.5.1-beta.0",
+  "version": "8.5.1-beta.1",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From 8cb65962ab13cb968f3910c874442725956eb1f3 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 4 Nov 2021 08:31:40 +0000
Subject: [PATCH 2754/3183] init attempt for rf blind simulation

---
 lib/device/rf-button.js           |   5 +
 lib/device/simulation/rf-blind.js | 166 ++++++++++++++++++++----------
 lib/index.js                      |   4 +-
 3 files changed, 119 insertions(+), 56 deletions(-)

diff --git a/lib/device/rf-button.js b/lib/device/rf-button.js
index afab1975..ad9e81f6 100644
--- a/lib/device/rf-button.js
+++ b/lib/device/rf-button.js
@@ -44,6 +44,11 @@ module.exports = class deviceRFButton {
       }
     }
 
+    // If the accessory has a window covering service (from an old simulation) then remove it
+    if (this.accessory.getService(this.hapServ.WindowCovering)) {
+      this.accessory.removeService(this.accessory.getService(this.hapServ.WindowCovering))
+    }
+
     // This instance is a remote control with buttons or curtain control
     Object.entries(this.accessory.context.buttons).forEach(([chan, name]) => {
       // For each curtain/button we create a separate switch service
diff --git a/lib/device/simulation/rf-blind.js b/lib/device/simulation/rf-blind.js
index e290f5b2..fb8ca891 100644
--- a/lib/device/simulation/rf-blind.js
+++ b/lib/device/simulation/rf-blind.js
@@ -22,89 +22,147 @@ module.exports = class deviceRFBlind {
     this.isOnline = true
 
     // Set up custom variables for this device type
-    const deviceConf = platform.rfSubdevices[accessory.context.hbDeviceId]
+    const deviceConf = platform.rfSubdevices[accessory.context.hbDeviceId] || {}
+    this.operationTimeUp = deviceConf.operationTime || platform.consts.defaultValues.operationTime
+    this.operationTimeDown = deviceConf.operationTimeDown || this.operationTimeUp
 
     // Set the correct logging variables for this accessory
     this.enableLogging = !platform.config.disableDeviceLogging
     this.enableDebugLogging = platform.config.debug
-    if (deviceConf && deviceConf.overrideLogging) {
-      switch (deviceConf.overrideLogging) {
-        case 'standard':
-          this.enableLogging = true
-          this.enableDebugLogging = false
-          break
-        case 'debug':
-          this.enableLogging = true
-          this.enableDebugLogging = true
-          break
-        case 'disable':
-          this.enableLogging = false
-          this.enableDebugLogging = false
-          break
-      }
+    switch (deviceConf.overrideLogging) {
+      case 'standard':
+        this.enableLogging = true
+        this.enableDebugLogging = false
+        break
+      case 'debug':
+        this.enableLogging = true
+        this.enableDebugLogging = true
+        break
+      case 'disable':
+        this.enableLogging = false
+        this.enableDebugLogging = false
+        break
     }
 
-    // This instance is a remote control with buttons or curtain control
-    Object.entries(this.accessory.context.buttons).forEach(([chan, name]) => {
-      // For each curtain/button we create a separate switch service
-
-      // Add the switch service if it doesn't already exist
-      if (!this.accessory.getService(name)) {
-        this.accessory.addService(this.hapServ.Switch, name, 'switch' + chan)
+    // Remove old switch services from before the simulation was configured
+    ;['ON', 'OFF', 'Stop'].forEach(name => {
+      if (this.accessory.getService(name)) {
+        this.accessory.removeService(this.accessory.getService(name))
       }
+    })
 
-      // Always start with the buttons off (useful when restarting Homebridge)
-      this.accessory.getService(name).updateCharacteristic(this.hapChar.On, false)
+    // Set up the accessory with default positions when added the first time
+    if (!this.funcs.hasProperty(this.accessory.context, 'cacheCurrentPosition')) {
+      this.accessory.context.cacheCurrentPosition = 0
+      this.accessory.context.cachePositionState = 2
+      this.accessory.context.cacheTargetPosition = 0
+    }
 
-      // Add the set handler to the switch on/off characteristic
-      this.accessory
-        .getService(name)
-        .getCharacteristic(this.hapChar.On)
-        .onSet(async value => await this.internalPressUpdate(chan, name, value))
+    // Add the window covering service if it doesn't already exist
+    if (!(this.service = this.accessory.getService(this.hapServ.WindowCovering))) {
+      this.service = this.accessory.addService(this.hapServ.WindowCovering)
+      this.service.updateCharacteristic(this.hapChar.CurrentPosition, 0)
+      this.service.updateCharacteristic(this.hapChar.TargetPosition, 0)
+      this.service.updateCharacteristic(this.hapChar.PositionState, 2)
+    }
 
-      // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
-      if (!platform.config.disableNoResponse) {
-        this.accessory
-          .getService(name)
-          .getCharacteristic(this.hapChar.On)
-          .onGet(() => {
-            if (!this.isOnline) {
-              throw new this.hapErr(-70402)
-            }
-            return this.accessory.getService(name).getCharacteristic(this.hapChar.On).value
-          })
-      }
+    // Add the set handler to the target position characteristic
+    this.service.getCharacteristic(this.hapChar.TargetPosition).onSet(value => {
+      // We don't use await as we want the callback to be run straight away
+      this.internalPositionUpdate(value)
     })
 
+    // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
+    if (!platform.config.disableNoResponse) {
+      this.service.getCharacteristic(this.hapChar.CurrentPosition).onGet(() => {
+        if (!this.isOnline) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.CurrentPosition).value
+      })
+      this.service.getCharacteristic(this.hapChar.TargetPosition).onGet(() => {
+        if (!this.isOnline) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.TargetPosition).value
+      })
+    }
+
     // Output the customised options to the log
     const opts = JSON.stringify({
-      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable'
+      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
+      operationTime: this.operationTimeUp,
+      operationTimeDown: this.operationTimeDown
     })
     this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
 
-  async internalPressUpdate (rfChl, service, value) {
+  async internalPositionUpdate (value) {
     try {
-      if (!value) {
+      let prevPosition = this.accessory.context.cacheCurrentPosition
+      if (value === prevPosition) {
         return
       }
-      const params = {
-        cmd: 'transmit',
-        rfChl: parseInt(rfChl)
+      const params = { cmd: 'transmit' }
+      const prevState = this.accessory.context.cachePositionState
+      const percentStepUpPerDS = this.operationTimeUp / 100
+      const percentStepDownPerDS = this.operationTimeDown / 100
+      const updateKey = this.funcs.generateRandomString(5)
+      this.updateKey = updateKey
+      if (prevState !== 2) {
+        params.rfChl = 1
+        await this.platform.sendDeviceUpdate(this.accessory, params)
+        const posPercentChange =
+          Math.floor(Date.now() / 100) - this.accessory.context.cacheLastStartTime
+        const posPercentChangeUp = Math.floor(percentStepUpPerDS * posPercentChange)
+        const posPercentChangeDown = Math.floor(percentStepDownPerDS * posPercentChange)
+        if (prevState === 0) {
+          // Was going down
+          prevPosition -= posPercentChangeDown
+        } else {
+          // Was going up
+          prevPosition += posPercentChangeUp
+        }
+        prevPosition = Math.min(Math.max(prevPosition, 0), 100)
+        this.service.updateCharacteristic(this.hapChar.CurrentPosition, prevPosition)
+        this.accessory.context.cacheCurrentPosition = prevPosition
+      }
+      const diffPosition = value - prevPosition
+      const setToMoveUp = diffPosition > 0
+      let decisecondsToMove
+      if (setToMoveUp) {
+        decisecondsToMove = Math.round(Math.abs(diffPosition) * percentStepUpPerDS)
+        params.rfChl = 0
+      } else {
+        decisecondsToMove = Math.round(Math.abs(diffPosition) * percentStepDownPerDS)
+        params.rfChl = 2
+      }
+      await this.platform.sendDeviceUpdate(this.accessory, params)
+      this.accessory.context.cacheTargetPosition = value
+      this.accessory.context.cachePositionState = setToMoveUp ? 1 : 0
+      this.accessory.context.cacheLastStartTime = Math.floor(Date.now() / 100)
+      await this.funcs.sleep(decisecondsToMove * 100)
+      if (this.updateKey !== updateKey) {
+        return
       }
+      params.rfChl = 1
       await this.platform.sendDeviceUpdate(this.accessory, params)
+      this.service.updateCharacteristic(this.hapChar.PositionState, 2)
+      this.service.updateCharacteristic(this.hapChar.CurrentPosition, value)
+      this.accessory.context.cachePositionState = 2
+      this.accessory.context.cacheCurrentPosition = value
       if (this.enableLogging) {
-        this.log('[%s] %s [%s].', this.name, this.lang.curState, this.lang.buttonTrig)
+        this.log('[%s] %s [%s%]', this.name, this.lang.curPos, value)
       }
-      setTimeout(() => {
-        this.accessory.getService(service).updateCharacteristic(this.hapChar.On, false)
-      }, 1000)
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
-        this.accessory.getService(service).updateCharacteristic(this.hapChar.On, false)
+        this.service.updateCharacteristic(
+          this.hapChar.TargetPosition,
+          this.accessory.context.cacheTargetPosition
+        )
       }, 2000)
-      throw new this.hapErr(-70402)
+      this.service.updateCharacteristic(this.hapChar.TargetPosition, new this.hapErr(-70402))
     }
   }
 
diff --git a/lib/index.js b/lib/index.js
index 9d1d09a1..4f6c0a49 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -140,7 +140,7 @@ class eWeLinkPlatform {
         case 'bridgeSensors':
           if (Array.isArray(val) && val.length > 0) {
             val.forEach(x => {
-              if (!x.type || !x.fullDeviceId) {
+              if (!x.fullDeviceId) {
                 logIgnoreItem(key)
                 return
               }
@@ -1138,7 +1138,7 @@ class eWeLinkPlatform {
           let subType
           const fullDeviceId = device.deviceid + 'SW' + swNumber
           const uuidsub = this.api.hap.uuid.generate(fullDeviceId)
-          const deviceConf = this.rfSubdevices[device.deviceid] || {}
+          const deviceConf = this.rfSubdevices[fullDeviceId] || {}
 
           // Check which eWeLink type the connected sub device is
           let instance

From 1473a7496b405f2e1a801471d184f8e3e9a095e3 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 4 Nov 2021 08:38:33 +0000
Subject: [PATCH 2755/3183] use correct rf channel for blind sim

---
 lib/device/simulation/rf-blind.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/lib/device/simulation/rf-blind.js b/lib/device/simulation/rf-blind.js
index fb8ca891..19a73862 100644
--- a/lib/device/simulation/rf-blind.js
+++ b/lib/device/simulation/rf-blind.js
@@ -25,6 +25,7 @@ module.exports = class deviceRFBlind {
     const deviceConf = platform.rfSubdevices[accessory.context.hbDeviceId] || {}
     this.operationTimeUp = deviceConf.operationTime || platform.consts.defaultValues.operationTime
     this.operationTimeDown = deviceConf.operationTimeDown || this.operationTimeUp
+    ;[this.chOpen, this.chStop, this.chClose] = Object.keys(this.accessory.context.buttons)
 
     // Set the correct logging variables for this accessory
     this.enableLogging = !platform.config.disableDeviceLogging
@@ -110,7 +111,7 @@ module.exports = class deviceRFBlind {
       const updateKey = this.funcs.generateRandomString(5)
       this.updateKey = updateKey
       if (prevState !== 2) {
-        params.rfChl = 1
+        params.rfChl = this.chStop
         await this.platform.sendDeviceUpdate(this.accessory, params)
         const posPercentChange =
           Math.floor(Date.now() / 100) - this.accessory.context.cacheLastStartTime
@@ -132,10 +133,10 @@ module.exports = class deviceRFBlind {
       let decisecondsToMove
       if (setToMoveUp) {
         decisecondsToMove = Math.round(Math.abs(diffPosition) * percentStepUpPerDS)
-        params.rfChl = 0
+        params.rfChl = this.chOpen
       } else {
         decisecondsToMove = Math.round(Math.abs(diffPosition) * percentStepDownPerDS)
-        params.rfChl = 2
+        params.rfChl = this.chClose
       }
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.accessory.context.cacheTargetPosition = value
@@ -145,7 +146,7 @@ module.exports = class deviceRFBlind {
       if (this.updateKey !== updateKey) {
         return
       }
-      params.rfChl = 1
+      params.rfChl = this.chStop
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.service.updateCharacteristic(this.hapChar.PositionState, 2)
       this.service.updateCharacteristic(this.hapChar.CurrentPosition, value)

From 85985e09f49719459c0bc718912ae9619be16b41 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 4 Nov 2021 08:38:59 +0000
Subject: [PATCH 2756/3183] 8.5.1-beta.2

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 8217a236..fe6716db 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.5.1-beta.1",
+  "version": "8.5.1-beta.2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.5.1-beta.1",
+      "version": "8.5.1-beta.2",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 1766020d..81e62109 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.5.1-beta.1",
+  "version": "8.5.1-beta.2",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From 40dd5a7f03e70a24de2814e623ba1fc9f2df2273 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 4 Nov 2021 09:00:03 +0000
Subject: [PATCH 2757/3183] no need to send stop command if already moving

---
 lib/device/simulation/rf-blind.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/lib/device/simulation/rf-blind.js b/lib/device/simulation/rf-blind.js
index 19a73862..70da0dd8 100644
--- a/lib/device/simulation/rf-blind.js
+++ b/lib/device/simulation/rf-blind.js
@@ -111,8 +111,6 @@ module.exports = class deviceRFBlind {
       const updateKey = this.funcs.generateRandomString(5)
       this.updateKey = updateKey
       if (prevState !== 2) {
-        params.rfChl = this.chStop
-        await this.platform.sendDeviceUpdate(this.accessory, params)
         const posPercentChange =
           Math.floor(Date.now() / 100) - this.accessory.context.cacheLastStartTime
         const posPercentChangeUp = Math.floor(percentStepUpPerDS * posPercentChange)

From 8a840478c20fee3754507b0e9ccfc0ac63e0f45d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 4 Nov 2021 09:00:59 +0000
Subject: [PATCH 2758/3183] 8.5.1-beta.3

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index fe6716db..935f73e7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.5.1-beta.2",
+  "version": "8.5.1-beta.3",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.5.1-beta.2",
+      "version": "8.5.1-beta.3",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 81e62109..f6fe54f2 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.5.1-beta.2",
+  "version": "8.5.1-beta.3",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From ca61ba2bb8f379e1fdde98d94e16dab1f4aa0978 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 4 Nov 2021 10:09:45 +0000
Subject: [PATCH 2759/3183] expose rf curtain as door or window accessory

---
 config.schema.json                 |  12 +-
 lib/device/rf-button.js            |  10 ++
 lib/device/simulation/rf-door.js   | 171 +++++++++++++++++++++++++++++
 lib/device/simulation/rf-window.js | 171 +++++++++++++++++++++++++++++
 lib/index.js                       |   6 +-
 lib/utils/constants.js             |   2 +-
 6 files changed, 367 insertions(+), 5 deletions(-)
 create mode 100644 lib/device/simulation/rf-door.js
 create mode 100644 lib/device/simulation/rf-window.js

diff --git a/config.schema.json b/config.schema.json
index 5768d340..86542a59 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -1451,6 +1451,14 @@
                 {
                   "title": "Window Blind/Covering",
                   "enum": ["blind"]
+                },
+                {
+                  "title": "Door",
+                  "enum": ["door"]
+                },
+                {
+                  "title": "Window",
+                  "enum": ["window"]
                 }
               ],
               "condition": {
@@ -1464,7 +1472,7 @@
               "placeholder": 100,
               "minimum": 20,
               "condition": {
-                "functionBody": "return (model.bridgeSensors && model.bridgeSensors[arrayIndices] && model.bridgeSensors[arrayIndices].fullDeviceId && model.bridgeSensors[arrayIndices].fullDeviceId.length >= 13 && model.bridgeSensors[arrayIndices].deviceType === 'curtain' && model.bridgeSensors[arrayIndices].curtainType === 'blind');"
+                "functionBody": "return (model.bridgeSensors && model.bridgeSensors[arrayIndices] && model.bridgeSensors[arrayIndices].fullDeviceId && model.bridgeSensors[arrayIndices].fullDeviceId.length >= 13 && model.bridgeSensors[arrayIndices].deviceType === 'curtain' && ['blind', 'door', 'window'].includes(model.bridgeSensors[arrayIndices].curtainType));"
               }
             },
             "operationTimeDown": {
@@ -1474,7 +1482,7 @@
               "placeholder": 100,
               "minimum": 20,
               "condition": {
-                "functionBody": "return (model.bridgeSensors && model.bridgeSensors[arrayIndices] && model.bridgeSensors[arrayIndices].fullDeviceId && model.bridgeSensors[arrayIndices].fullDeviceId.length >= 13 && model.bridgeSensors[arrayIndices].deviceType === 'curtain' && model.bridgeSensors[arrayIndices].curtainType === 'blind');"
+                "functionBody": "return (model.bridgeSensors && model.bridgeSensors[arrayIndices] && model.bridgeSensors[arrayIndices].fullDeviceId && model.bridgeSensors[arrayIndices].fullDeviceId.length >= 13 && model.bridgeSensors[arrayIndices].deviceType === 'curtain' && ['blind', 'door', 'window'].includes(model.bridgeSensors[arrayIndices].curtainType));"
               }
             },
             "type": {
diff --git a/lib/device/rf-button.js b/lib/device/rf-button.js
index ad9e81f6..e6c950dc 100644
--- a/lib/device/rf-button.js
+++ b/lib/device/rf-button.js
@@ -49,6 +49,16 @@ module.exports = class deviceRFButton {
       this.accessory.removeService(this.accessory.getService(this.hapServ.WindowCovering))
     }
 
+    // If the accessory has a door service (from an old simulation) then remove it
+    if (this.accessory.getService(this.hapServ.Door)) {
+      this.accessory.removeService(this.accessory.getService(this.hapServ.Door))
+    }
+
+    // If the accessory has a window service (from an old simulation) then remove it
+    if (this.accessory.getService(this.hapServ.Window)) {
+      this.accessory.removeService(this.accessory.getService(this.hapServ.Window))
+    }
+
     // This instance is a remote control with buttons or curtain control
     Object.entries(this.accessory.context.buttons).forEach(([chan, name]) => {
       // For each curtain/button we create a separate switch service
diff --git a/lib/device/simulation/rf-door.js b/lib/device/simulation/rf-door.js
new file mode 100644
index 00000000..ff588056
--- /dev/null
+++ b/lib/device/simulation/rf-door.js
@@ -0,0 +1,171 @@
+/* jshint node: true,esversion: 9, -W014, -W033 */
+/* eslint-disable new-cap */
+'use strict'
+
+module.exports = class deviceRFDoor {
+  constructor (platform, accessory) {
+    // Set up variables from the platform
+    this.eveChar = platform.eveChar
+    this.funcs = platform.funcs
+    this.hapChar = platform.api.hap.Characteristic
+    this.hapErr = platform.api.hap.HapStatusError
+    this.hapServ = platform.api.hap.Service
+    this.lang = platform.lang
+    this.log = platform.log
+    this.platform = platform
+
+    // Set up variables from the accessory
+    this.name = accessory.displayName
+    this.accessory = accessory
+
+    // Initially set the online flag as true (to be then updated as false if necessary)
+    this.isOnline = true
+
+    // Set up custom variables for this device type
+    const deviceConf = platform.rfSubdevices[accessory.context.hbDeviceId] || {}
+    this.operationTimeUp = deviceConf.operationTime || platform.consts.defaultValues.operationTime
+    this.operationTimeDown = deviceConf.operationTimeDown || this.operationTimeUp
+    ;[this.chOpen, this.chStop, this.chClose] = Object.keys(this.accessory.context.buttons)
+
+    // Set the correct logging variables for this accessory
+    this.enableLogging = !platform.config.disableDeviceLogging
+    this.enableDebugLogging = platform.config.debug
+    switch (deviceConf.overrideLogging) {
+      case 'standard':
+        this.enableLogging = true
+        this.enableDebugLogging = false
+        break
+      case 'debug':
+        this.enableLogging = true
+        this.enableDebugLogging = true
+        break
+      case 'disable':
+        this.enableLogging = false
+        this.enableDebugLogging = false
+        break
+    }
+
+    // Remove old switch services from before the simulation was configured
+    ;['ON', 'OFF', 'Stop'].forEach(name => {
+      if (this.accessory.getService(name)) {
+        this.accessory.removeService(this.accessory.getService(name))
+      }
+    })
+
+    // Set up the accessory with default positions when added the first time
+    if (!this.funcs.hasProperty(this.accessory.context, 'cacheCurrentPosition')) {
+      this.accessory.context.cacheCurrentPosition = 0
+      this.accessory.context.cachePositionState = 2
+      this.accessory.context.cacheTargetPosition = 0
+    }
+
+    // Add the window covering service if it doesn't already exist
+    if (!(this.service = this.accessory.getService(this.hapServ.Door))) {
+      this.service = this.accessory.addService(this.hapServ.Door)
+      this.service.updateCharacteristic(this.hapChar.CurrentPosition, 0)
+      this.service.updateCharacteristic(this.hapChar.TargetPosition, 0)
+      this.service.updateCharacteristic(this.hapChar.PositionState, 2)
+    }
+
+    // Add the set handler to the target position characteristic
+    this.service.getCharacteristic(this.hapChar.TargetPosition).onSet(value => {
+      // We don't use await as we want the callback to be run straight away
+      this.internalPositionUpdate(value)
+    })
+
+    // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
+    if (!platform.config.disableNoResponse) {
+      this.service.getCharacteristic(this.hapChar.CurrentPosition).onGet(() => {
+        if (!this.isOnline) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.CurrentPosition).value
+      })
+      this.service.getCharacteristic(this.hapChar.TargetPosition).onGet(() => {
+        if (!this.isOnline) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.TargetPosition).value
+      })
+    }
+
+    // Output the customised options to the log
+    const opts = JSON.stringify({
+      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
+      operationTime: this.operationTimeUp,
+      operationTimeDown: this.operationTimeDown
+    })
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
+  }
+
+  async internalPositionUpdate (value) {
+    try {
+      let prevPosition = this.accessory.context.cacheCurrentPosition
+      if (value === prevPosition) {
+        return
+      }
+      const params = { cmd: 'transmit' }
+      const prevState = this.accessory.context.cachePositionState
+      const percentStepUpPerDS = this.operationTimeUp / 100
+      const percentStepDownPerDS = this.operationTimeDown / 100
+      const updateKey = this.funcs.generateRandomString(5)
+      this.updateKey = updateKey
+      if (prevState !== 2) {
+        const posPercentChange =
+          Math.floor(Date.now() / 100) - this.accessory.context.cacheLastStartTime
+        const posPercentChangeUp = Math.floor(percentStepUpPerDS * posPercentChange)
+        const posPercentChangeDown = Math.floor(percentStepDownPerDS * posPercentChange)
+        if (prevState === 0) {
+          // Was going down
+          prevPosition -= posPercentChangeDown
+        } else {
+          // Was going up
+          prevPosition += posPercentChangeUp
+        }
+        prevPosition = Math.min(Math.max(prevPosition, 0), 100)
+        this.service.updateCharacteristic(this.hapChar.CurrentPosition, prevPosition)
+        this.accessory.context.cacheCurrentPosition = prevPosition
+      }
+      const diffPosition = value - prevPosition
+      const setToMoveUp = diffPosition > 0
+      let decisecondsToMove
+      if (setToMoveUp) {
+        decisecondsToMove = Math.round(Math.abs(diffPosition) * percentStepUpPerDS)
+        params.rfChl = this.chOpen
+      } else {
+        decisecondsToMove = Math.round(Math.abs(diffPosition) * percentStepDownPerDS)
+        params.rfChl = this.chClose
+      }
+      await this.platform.sendDeviceUpdate(this.accessory, params)
+      this.accessory.context.cacheTargetPosition = value
+      this.accessory.context.cachePositionState = setToMoveUp ? 1 : 0
+      this.accessory.context.cacheLastStartTime = Math.floor(Date.now() / 100)
+      await this.funcs.sleep(decisecondsToMove * 100)
+      if (this.updateKey !== updateKey) {
+        return
+      }
+      params.rfChl = this.chStop
+      await this.platform.sendDeviceUpdate(this.accessory, params)
+      this.service.updateCharacteristic(this.hapChar.PositionState, 2)
+      this.service.updateCharacteristic(this.hapChar.CurrentPosition, value)
+      this.accessory.context.cachePositionState = 2
+      this.accessory.context.cacheCurrentPosition = value
+      if (this.enableLogging) {
+        this.log('[%s] %s [%s%]', this.name, this.lang.curPos, value)
+      }
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, true)
+      setTimeout(() => {
+        this.service.updateCharacteristic(
+          this.hapChar.TargetPosition,
+          this.accessory.context.cacheTargetPosition
+        )
+      }, 2000)
+      this.service.updateCharacteristic(this.hapChar.TargetPosition, new this.hapErr(-70402))
+    }
+  }
+
+  markStatus (isOnline) {
+    this.isOnline = isOnline
+  }
+}
diff --git a/lib/device/simulation/rf-window.js b/lib/device/simulation/rf-window.js
new file mode 100644
index 00000000..3908cf80
--- /dev/null
+++ b/lib/device/simulation/rf-window.js
@@ -0,0 +1,171 @@
+/* jshint node: true,esversion: 9, -W014, -W033 */
+/* eslint-disable new-cap */
+'use strict'
+
+module.exports = class deviceRFWindow {
+  constructor (platform, accessory) {
+    // Set up variables from the platform
+    this.eveChar = platform.eveChar
+    this.funcs = platform.funcs
+    this.hapChar = platform.api.hap.Characteristic
+    this.hapErr = platform.api.hap.HapStatusError
+    this.hapServ = platform.api.hap.Service
+    this.lang = platform.lang
+    this.log = platform.log
+    this.platform = platform
+
+    // Set up variables from the accessory
+    this.name = accessory.displayName
+    this.accessory = accessory
+
+    // Initially set the online flag as true (to be then updated as false if necessary)
+    this.isOnline = true
+
+    // Set up custom variables for this device type
+    const deviceConf = platform.rfSubdevices[accessory.context.hbDeviceId] || {}
+    this.operationTimeUp = deviceConf.operationTime || platform.consts.defaultValues.operationTime
+    this.operationTimeDown = deviceConf.operationTimeDown || this.operationTimeUp
+    ;[this.chOpen, this.chStop, this.chClose] = Object.keys(this.accessory.context.buttons)
+
+    // Set the correct logging variables for this accessory
+    this.enableLogging = !platform.config.disableDeviceLogging
+    this.enableDebugLogging = platform.config.debug
+    switch (deviceConf.overrideLogging) {
+      case 'standard':
+        this.enableLogging = true
+        this.enableDebugLogging = false
+        break
+      case 'debug':
+        this.enableLogging = true
+        this.enableDebugLogging = true
+        break
+      case 'disable':
+        this.enableLogging = false
+        this.enableDebugLogging = false
+        break
+    }
+
+    // Remove old switch services from before the simulation was configured
+    ;['ON', 'OFF', 'Stop'].forEach(name => {
+      if (this.accessory.getService(name)) {
+        this.accessory.removeService(this.accessory.getService(name))
+      }
+    })
+
+    // Set up the accessory with default positions when added the first time
+    if (!this.funcs.hasProperty(this.accessory.context, 'cacheCurrentPosition')) {
+      this.accessory.context.cacheCurrentPosition = 0
+      this.accessory.context.cachePositionState = 2
+      this.accessory.context.cacheTargetPosition = 0
+    }
+
+    // Add the window covering service if it doesn't already exist
+    if (!(this.service = this.accessory.getService(this.hapServ.Window))) {
+      this.service = this.accessory.addService(this.hapServ.Window)
+      this.service.updateCharacteristic(this.hapChar.CurrentPosition, 0)
+      this.service.updateCharacteristic(this.hapChar.TargetPosition, 0)
+      this.service.updateCharacteristic(this.hapChar.PositionState, 2)
+    }
+
+    // Add the set handler to the target position characteristic
+    this.service.getCharacteristic(this.hapChar.TargetPosition).onSet(value => {
+      // We don't use await as we want the callback to be run straight away
+      this.internalPositionUpdate(value)
+    })
+
+    // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
+    if (!platform.config.disableNoResponse) {
+      this.service.getCharacteristic(this.hapChar.CurrentPosition).onGet(() => {
+        if (!this.isOnline) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.CurrentPosition).value
+      })
+      this.service.getCharacteristic(this.hapChar.TargetPosition).onGet(() => {
+        if (!this.isOnline) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.TargetPosition).value
+      })
+    }
+
+    // Output the customised options to the log
+    const opts = JSON.stringify({
+      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
+      operationTime: this.operationTimeUp,
+      operationTimeDown: this.operationTimeDown
+    })
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
+  }
+
+  async internalPositionUpdate (value) {
+    try {
+      let prevPosition = this.accessory.context.cacheCurrentPosition
+      if (value === prevPosition) {
+        return
+      }
+      const params = { cmd: 'transmit' }
+      const prevState = this.accessory.context.cachePositionState
+      const percentStepUpPerDS = this.operationTimeUp / 100
+      const percentStepDownPerDS = this.operationTimeDown / 100
+      const updateKey = this.funcs.generateRandomString(5)
+      this.updateKey = updateKey
+      if (prevState !== 2) {
+        const posPercentChange =
+          Math.floor(Date.now() / 100) - this.accessory.context.cacheLastStartTime
+        const posPercentChangeUp = Math.floor(percentStepUpPerDS * posPercentChange)
+        const posPercentChangeDown = Math.floor(percentStepDownPerDS * posPercentChange)
+        if (prevState === 0) {
+          // Was going down
+          prevPosition -= posPercentChangeDown
+        } else {
+          // Was going up
+          prevPosition += posPercentChangeUp
+        }
+        prevPosition = Math.min(Math.max(prevPosition, 0), 100)
+        this.service.updateCharacteristic(this.hapChar.CurrentPosition, prevPosition)
+        this.accessory.context.cacheCurrentPosition = prevPosition
+      }
+      const diffPosition = value - prevPosition
+      const setToMoveUp = diffPosition > 0
+      let decisecondsToMove
+      if (setToMoveUp) {
+        decisecondsToMove = Math.round(Math.abs(diffPosition) * percentStepUpPerDS)
+        params.rfChl = this.chOpen
+      } else {
+        decisecondsToMove = Math.round(Math.abs(diffPosition) * percentStepDownPerDS)
+        params.rfChl = this.chClose
+      }
+      await this.platform.sendDeviceUpdate(this.accessory, params)
+      this.accessory.context.cacheTargetPosition = value
+      this.accessory.context.cachePositionState = setToMoveUp ? 1 : 0
+      this.accessory.context.cacheLastStartTime = Math.floor(Date.now() / 100)
+      await this.funcs.sleep(decisecondsToMove * 100)
+      if (this.updateKey !== updateKey) {
+        return
+      }
+      params.rfChl = this.chStop
+      await this.platform.sendDeviceUpdate(this.accessory, params)
+      this.service.updateCharacteristic(this.hapChar.PositionState, 2)
+      this.service.updateCharacteristic(this.hapChar.CurrentPosition, value)
+      this.accessory.context.cachePositionState = 2
+      this.accessory.context.cacheCurrentPosition = value
+      if (this.enableLogging) {
+        this.log('[%s] %s [%s%]', this.name, this.lang.curPos, value)
+      }
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, true)
+      setTimeout(() => {
+        this.service.updateCharacteristic(
+          this.hapChar.TargetPosition,
+          this.accessory.context.cacheTargetPosition
+        )
+      }, 2000)
+      this.service.updateCharacteristic(this.hapChar.TargetPosition, new this.hapErr(-70402))
+    }
+  }
+
+  markStatus (isOnline) {
+    this.isOnline = isOnline
+  }
+}
diff --git a/lib/index.js b/lib/index.js
index 4f6c0a49..bb74c7ec 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1153,8 +1153,10 @@ class eWeLinkPlatform {
             case '5':
               switch (deviceConf.curtainType) {
                 case 'blind':
-                  subType = 'blind'
-                  instance = 'simulation/rf-blind'
+                case 'door':
+                case 'window':
+                  subType = deviceConf.curtainType
+                  instance = 'simulation/rf-' + deviceConf.curtainType
                   break
                 default:
                   subType = 'curtain'
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 78c15607..5d133c59 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -238,7 +238,7 @@ module.exports = {
       'window'
     ],
     showAsMotor: ['blind', 'door', 'garage', 'window'],
-    curtainType: ['buttons', 'blind'],
+    curtainType: ['buttons', 'blind', 'door', 'window'],
     deviceType: ['button', 'curtain', 'sensor']
   },
 

From c895613e96caf6e59d0eba8fe61204348a2b5b9f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 4 Nov 2021 10:10:45 +0000
Subject: [PATCH 2760/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 82c2ae6d..2fb7f4d7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@ All notable changes to homebridge-ewelink will be documented in this file.
 ### Added
 
 - The plugin will now retrieve devices from **all** your homes in your eWeLink account
+- Expose an RF Bridge `curtain` device type as a HomeKit `WindowCovering`, `Door` or `Window` accessory simulation
 
 ## 8.5.0 (2021-11-03)
 

From 2132e881082cbd4118e03676c3c2d2a4e8629841 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 4 Nov 2021 10:11:21 +0000
Subject: [PATCH 2761/3183] 8.5.1-beta.4

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 935f73e7..23e6d9ec 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.5.1-beta.3",
+  "version": "8.5.1-beta.4",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.5.1-beta.3",
+      "version": "8.5.1-beta.4",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index f6fe54f2..53c49d0e 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.5.1-beta.3",
+  "version": "8.5.1-beta.4",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From e7dfe7ee538f7b22d5253fbd8d3f0eee2973244c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 4 Nov 2021 10:15:33 +0000
Subject: [PATCH 2762/3183] remove old rf simulation services

---
 lib/device/simulation/rf-blind.js  | 10 ++++++++++
 lib/device/simulation/rf-door.js   | 10 ++++++++++
 lib/device/simulation/rf-window.js | 10 ++++++++++
 3 files changed, 30 insertions(+)

diff --git a/lib/device/simulation/rf-blind.js b/lib/device/simulation/rf-blind.js
index 70da0dd8..5d8afa7f 100644
--- a/lib/device/simulation/rf-blind.js
+++ b/lib/device/simulation/rf-blind.js
@@ -45,6 +45,16 @@ module.exports = class deviceRFBlind {
         break
     }
 
+    // If the accessory has a door service (from an old simulation) then remove it
+    if (this.accessory.getService(this.hapServ.Door)) {
+      this.accessory.removeService(this.accessory.getService(this.hapServ.Door))
+    }
+
+    // If the accessory has a window service (from an old simulation) then remove it
+    if (this.accessory.getService(this.hapServ.Window)) {
+      this.accessory.removeService(this.accessory.getService(this.hapServ.Window))
+    }
+
     // Remove old switch services from before the simulation was configured
     ;['ON', 'OFF', 'Stop'].forEach(name => {
       if (this.accessory.getService(name)) {
diff --git a/lib/device/simulation/rf-door.js b/lib/device/simulation/rf-door.js
index ff588056..f25aeb9c 100644
--- a/lib/device/simulation/rf-door.js
+++ b/lib/device/simulation/rf-door.js
@@ -45,6 +45,16 @@ module.exports = class deviceRFDoor {
         break
     }
 
+    // If the accessory has a window covering service (from an old simulation) then remove it
+    if (this.accessory.getService(this.hapServ.WindowCovering)) {
+      this.accessory.removeService(this.accessory.getService(this.hapServ.WindowCovering))
+    }
+
+    // If the accessory has a window service (from an old simulation) then remove it
+    if (this.accessory.getService(this.hapServ.Window)) {
+      this.accessory.removeService(this.accessory.getService(this.hapServ.Window))
+    }
+
     // Remove old switch services from before the simulation was configured
     ;['ON', 'OFF', 'Stop'].forEach(name => {
       if (this.accessory.getService(name)) {
diff --git a/lib/device/simulation/rf-window.js b/lib/device/simulation/rf-window.js
index 3908cf80..6cd9ca9d 100644
--- a/lib/device/simulation/rf-window.js
+++ b/lib/device/simulation/rf-window.js
@@ -45,6 +45,16 @@ module.exports = class deviceRFWindow {
         break
     }
 
+    // If the accessory has a window covering service (from an old simulation) then remove it
+    if (this.accessory.getService(this.hapServ.WindowCovering)) {
+      this.accessory.removeService(this.accessory.getService(this.hapServ.WindowCovering))
+    }
+
+    // If the accessory has a door service (from an old simulation) then remove it
+    if (this.accessory.getService(this.hapServ.Door)) {
+      this.accessory.removeService(this.accessory.getService(this.hapServ.Door))
+    }
+
     // Remove old switch services from before the simulation was configured
     ;['ON', 'OFF', 'Stop'].forEach(name => {
       if (this.accessory.getService(name)) {

From 28b8a322ccd1c96659e6228f84633e33293e5a45 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 4 Nov 2021 10:15:57 +0000
Subject: [PATCH 2763/3183] 8.5.1-beta.5

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 23e6d9ec..444c7c85 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.5.1-beta.4",
+  "version": "8.5.1-beta.5",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.5.1-beta.4",
+      "version": "8.5.1-beta.5",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 53c49d0e..cdca76f1 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.5.1-beta.4",
+  "version": "8.5.1-beta.5",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From eb950dcbd90f167ef0c0b527c1a7dc4cf5c58aac Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 4 Nov 2021 19:02:30 +0000
Subject: [PATCH 2764/3183] some rf fixes

---
 lib/device/rf-bridge.js | 2 ++
 lib/index.js            | 8 +++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/lib/device/rf-bridge.js b/lib/device/rf-bridge.js
index a0c20704..100602fe 100644
--- a/lib/device/rf-bridge.js
+++ b/lib/device/rf-bridge.js
@@ -146,6 +146,8 @@ module.exports = class deviceRFBridge {
               }
               switch (subAccessory.context.subType) {
                 case 'blind':
+                case 'door':
+                case 'window':
                   // Simulation
                   return
                 case 'button':
diff --git a/lib/index.js b/lib/index.js
index bb74c7ec..3334edc0 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1219,6 +1219,8 @@ class eWeLinkPlatform {
               : false
           subAccessory.context.lanKey = device.devicekey
 
+          subAccessory.context.subType = subType
+
           // Get the instance for this RF device
           subAccessory.control = new (require('./device/' + instance))(this, subAccessory)
 
@@ -1692,7 +1694,11 @@ class eWeLinkPlatform {
 
             // Update the WAN status
             subAccessory.context.reachableWAN = device.params.online
-            if (device.params.updateSource === 'WS' && subAccessory.control.markStatus) {
+            if (
+              device.params.updateSource === 'WS' &&
+              subAccessory.control &&
+              subAccessory.control.markStatus
+            ) {
               subAccessory.control.markStatus(device.params.online)
             }
 

From cf429dc160caba4a963c5e709fef142c8afaa777 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 4 Nov 2021 19:03:03 +0000
Subject: [PATCH 2765/3183] 8.5.1-beta.6

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 444c7c85..aca97042 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.5.1-beta.5",
+  "version": "8.5.1-beta.6",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.5.1-beta.5",
+      "version": "8.5.1-beta.6",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index cdca76f1..5ee5b9a5 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.5.1-beta.5",
+  "version": "8.5.1-beta.6",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From 80f5df60508594a4fd966598571ba7ad6d147fc1 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 6 Nov 2021 10:59:34 +0000
Subject: [PATCH 2766/3183] find sensor controlled accessories just on init,
 not every time of update

---
 lib/device/simulation/sensor-hidden.js  | 132 +++++++++++------------
 lib/device/simulation/sensor-visible.js | 138 +++++++++++-------------
 lib/index.js                            |  38 ++++---
 lib/utils/lang-en.js                    |   1 +
 lib/utils/lang-fr.js                    |   1 +
 5 files changed, 148 insertions(+), 162 deletions(-)

diff --git a/lib/device/simulation/sensor-hidden.js b/lib/device/simulation/sensor-hidden.js
index f21e7399..84e6ec7f 100644
--- a/lib/device/simulation/sensor-hidden.js
+++ b/lib/device/simulation/sensor-hidden.js
@@ -3,21 +3,36 @@
 'use strict'
 
 module.exports = class deviceSensorHidden {
-  constructor (platform, accessory, devicesInHB) {
+  constructor (platform, accessory, subAccessory) {
     // Set up variables from the platform
-    this.devicesInHB = devicesInHB
-    this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.eveChar = platform.eveChar
     this.funcs = platform.funcs
     this.hapChar = platform.api.hap.Characteristic
     this.hapServ = platform.api.hap.Service
-    this.hapUUIDGen = platform.api.hap.uuid.generate
     this.lang = platform.lang
     this.log = platform.log
     this.platform = platform
 
     // Set up variables from the accessory
     this.accessory = accessory
+    this.subAccessory = subAccessory
+
+    // Set up custom variables for this device type
+    const group = platform.deviceConf[subAccessory.context.hbDeviceId] || {}
+    this.isGarage = group.showAs === 'garage'
+    this.operationTime = group.operationTime || platform.consts.defaultValues.operationTime
+
+    // Set the correct logging variables for this accessory
+    this.enableLogging = !platform.config.disableDeviceLogging
+    switch (group.overrideLogging) {
+      case 'standard':
+      case 'debug':
+        this.enableLogging = true
+        break
+      case 'disable':
+        this.enableLogging = false
+        break
+    }
   }
 
   async externalUpdate (params) {
@@ -35,78 +50,51 @@ module.exports = class deviceSensorHidden {
         return
       }
       this.cacheState = newState
-      for (const [deviceId, group] of Object.entries(this.platform.deviceConf)) {
-        if (
-          group.sensorId === this.accessory.context.eweDeviceId &&
-          group.showAs &&
-          ['garage', 'lock'].includes(group.showAs)
-        ) {
-          const uuid = this.hapUUIDGen(deviceId + 'SWX')
-          if (this.devicesInHB.has(uuid)) {
-            const subAccessory = this.devicesInHB.get(uuid)
-
-            // Set the correct logging variables for this accessory
-            let enableLogging = !this.disableDeviceLogging
-            if (group.overrideLogging) {
-              switch (group.overrideLogging) {
-                case 'standard':
-                case 'debug':
-                  enableLogging = true
-                  break
-                case 'disable':
-                  enableLogging = false
-                  break
-              }
+      const subService = this.subAccessory.getService(
+        this.isGarage ? this.hapServ.GarageDoorOpener : this.hapServ.LockMechanism
+      )
+      const name = this.subAccessory.displayName
+      switch (newState) {
+        case 0:
+          if (this.isGarage) {
+            subService.updateCharacteristic(this.hapChar.TargetDoorState, 1)
+            subService.updateCharacteristic(this.hapChar.CurrentDoorState, 1)
+            this.subAccessory.eveService.addEntry({ status: 1 })
+            if (params.updateSource && this.enableLogging) {
+              this.log('[%s] %s [%s].', name, this.lang.curState, this.lang.doorClosed)
             }
-            const isGarage = group.showAs === 'garage'
-            const subService = subAccessory.getService(
-              isGarage ? this.hapServ.GarageDoorOpener : this.hapServ.LockMechanism
+          } else {
+            subService.updateCharacteristic(this.hapChar.LockTargetState, 1)
+            subService.updateCharacteristic(this.hapChar.LockCurrentState, 1)
+            if (params.updateSource && this.enableLogging) {
+              this.log('[%s] %s [%s].', name, this.lang.curState, this.lang.lockLocked)
+            }
+          }
+          break
+        case 1: {
+          if (this.isGarage) {
+            await this.funcs.sleep(Math.max(this.operationTime * 100, 2000))
+            subService.updateCharacteristic(this.hapChar.TargetDoorState, 0)
+            subService.updateCharacteristic(this.hapChar.CurrentDoorState, 0)
+            this.subAccessory.eveService.addEntry({ status: 0 })
+            const initialTime = this.subAccessory.eveService.getInitialTime()
+            subService.updateCharacteristic(
+              this.eveChar.LastActivation,
+              Math.round(new Date().valueOf() / 1000) - initialTime
             )
-            const name = subAccessory.displayName
-            switch (newState) {
-              case 0:
-                if (isGarage) {
-                  subService.updateCharacteristic(this.hapChar.TargetDoorState, 1)
-                  subService.updateCharacteristic(this.hapChar.CurrentDoorState, 1)
-                  subAccessory.eveService.addEntry({ status: 1 })
-                  if (params.updateSource && enableLogging) {
-                    this.log('[%s] %s [%s].', name, this.lang.curState, this.lang.doorClosed)
-                  }
-                } else {
-                  subService.updateCharacteristic(this.hapChar.LockTargetState, 1)
-                  subService.updateCharacteristic(this.hapChar.LockCurrentState, 1)
-                  if (params.updateSource && enableLogging) {
-                    this.log('[%s] %s [%s].', name, this.lang.curState, this.lang.lockLocked)
-                  }
-                }
-                break
-              case 1: {
-                if (isGarage) {
-                  await this.funcs.sleep(Math.max(group.operationTime * 100, 2000))
-                  subService.updateCharacteristic(this.hapChar.TargetDoorState, 0)
-                  subService.updateCharacteristic(this.hapChar.CurrentDoorState, 0)
-                  subAccessory.eveService.addEntry({ status: 0 })
-                  const initialTime = subAccessory.eveService.getInitialTime()
-                  subService.updateCharacteristic(
-                    this.eveChar.LastActivation,
-                    Math.round(new Date().valueOf() / 1000) - initialTime
-                  )
-                  const newTO = subService.getCharacteristic(this.eveChar.TimesOpened).value + 1
-                  subService.updateCharacteristic(this.eveChar.TimesOpened, newTO)
-                  if (params.updateSource && enableLogging) {
-                    this.log('[%s] %s [%s].', name, this.lang.curState, this.lang.doorOpen)
-                  }
-                } else {
-                  subService.updateCharacteristic(this.hapChar.LockTargetState, 0)
-                  subService.updateCharacteristic(this.hapChar.LockCurrentState, 0)
-                  if (params.updateSource && enableLogging) {
-                    this.log('[%s] %s [%s].', name, this.lang.curState, this.lang.lockUnlocked)
-                  }
-                }
-                break
-              }
+            const newTO = subService.getCharacteristic(this.eveChar.TimesOpened).value + 1
+            subService.updateCharacteristic(this.eveChar.TimesOpened, newTO)
+            if (params.updateSource && this.enableLogging) {
+              this.log('[%s] %s [%s].', name, this.lang.curState, this.lang.doorOpen)
+            }
+          } else {
+            subService.updateCharacteristic(this.hapChar.LockTargetState, 0)
+            subService.updateCharacteristic(this.hapChar.LockCurrentState, 0)
+            if (params.updateSource && this.enableLogging) {
+              this.log('[%s] %s [%s].', name, this.lang.curState, this.lang.lockUnlocked)
             }
           }
+          break
         }
       }
     } catch (err) {
diff --git a/lib/device/simulation/sensor-visible.js b/lib/device/simulation/sensor-visible.js
index 4dc09912..d077c08a 100644
--- a/lib/device/simulation/sensor-visible.js
+++ b/lib/device/simulation/sensor-visible.js
@@ -3,22 +3,21 @@
 'use strict'
 
 module.exports = class deviceSensorVisible {
-  constructor (platform, accessory, devicesInHB) {
+  constructor (platform, accessory, subAccessory) {
     // Set up variables from the platform
-    this.devicesInHB = devicesInHB
-    this.disableDeviceLogging = platform.config.disableDeviceLogging
     this.eveChar = platform.eveChar
     this.funcs = platform.funcs
     this.hapChar = platform.api.hap.Characteristic
     this.hapServ = platform.api.hap.Service
-    this.hapUUIDGen = platform.api.hap.uuid.generate
     this.lang = platform.lang
     this.log = platform.log
     this.platform = platform
 
     // Set up variables from the accessory
     this.name = accessory.displayName
+    this.nameSub = subAccessory.displayName
     this.accessory = accessory
+    this.subAccessory = subAccessory
 
     // Set up custom variables for this device type
     this.isDW2 = platform.consts.devices.sensorContact.includes(accessory.context.eweUIID)
@@ -29,6 +28,9 @@ module.exports = class deviceSensorVisible {
       deviceConf && deviceConf.lowBattThreshold
         ? Math.min(deviceConf.lowBattThreshold, 100)
         : platform.consts.defaultValues.lowBattThreshold
+    const group = platform.deviceConf[subAccessory.context.hbDeviceId] || {}
+    this.isGarage = group.showAs === 'garage'
+    this.operationTime = group.operationTime || platform.consts.defaultValues.operationTime
 
     // Set the correct logging variables for this accessory
     this.enableLogging = !platform.config.disableDeviceLogging
@@ -50,6 +52,18 @@ module.exports = class deviceSensorVisible {
       }
     }
 
+    // Set the correct logging variables for this sub accessory
+    this.enableLoggingSub = !platform.config.disableDeviceLogging
+    switch (group.overrideLogging) {
+      case 'standard':
+      case 'debug':
+        this.enableLoggingSub = true
+        break
+      case 'disable':
+        this.enableLoggingSub = false
+        break
+    }
+
     // If the accessory has a leak sensor service then remove it
     if (this.accessory.getService(this.hapServ.LeakSensor)) {
       this.accessory.removeService(this.accessory.getService(this.hapServ.LeakSensor))
@@ -153,82 +167,54 @@ module.exports = class deviceSensorVisible {
           newState === 0 ? this.lang.contactYes : this.lang.contactNo
         )
       }
-      for (const [deviceId, group] of Object.entries(this.platform.deviceConf)) {
-        if (
-          group.sensorId === this.accessory.context.eweDeviceId &&
-          group.showAs &&
-          ['garage', 'lock'].includes(group.showAs)
-        ) {
-          const uuid = this.hapUUIDGen(deviceId + 'SWX')
-          if (this.devicesInHB.has(uuid)) {
-            const subAccessory = this.devicesInHB.get(uuid)
-
-            // Set the correct logging variables for this accessory
-            let enableLogging = !this.disableDeviceLogging
-            if (group.overrideLogging) {
-              switch (group.overrideLogging) {
-                case 'standard':
-                case 'debug':
-                  enableLogging = true
-                  break
-                case 'disable':
-                  enableLogging = false
-                  break
-              }
+      const subService = this.subAccessory.getService(
+        this.isGarage ? this.hapServ.GarageDoorOpener : this.hapServ.LockMechanism
+      )
+      switch (newState) {
+        case 0:
+          if (this.isGarage) {
+            subService.updateCharacteristic(this.hapChar.TargetDoorState, 1)
+            subService.updateCharacteristic(this.hapChar.CurrentDoorState, 1)
+            this.subAccessory.eveService.addEntry({ status: 1 })
+            if (params.updateSource && this.enableLoggingSub) {
+              this.log('[%s] %s [%s].', this.nameSub, this.lang.curState, this.lang.doorClosed)
             }
-            const isGarage = group.showAs === 'garage'
-            const subService = subAccessory.getService(
-              isGarage ? this.hapServ.GarageDoorOpener : this.hapServ.LockMechanism
+          } else {
+            subService.updateCharacteristic(this.hapChar.LockTargetState, 1)
+            subService.updateCharacteristic(this.hapChar.LockCurrentState, 1)
+            this.subAccessory.context.contactDetected = true
+            if (params.updateSource && this.enableLoggingSub) {
+              this.log('[%s] %s [%s].', this.nameSub, this.lang.curState, this.lang.lockLocked)
+            }
+          }
+          break
+        case 1: {
+          if (this.isGarage) {
+            await this.funcs.sleep(Math.max(this.operationTime * 100, 2000))
+            subService.updateCharacteristic(this.hapChar.TargetDoorState, 0)
+            subService.updateCharacteristic(this.hapChar.CurrentDoorState, 0)
+            this.subAccessory.eveService.addEntry({ status: 0 })
+            const initialTime = this.subAccessory.eveService.getInitialTime()
+            subService.updateCharacteristic(
+              this.eveChar.LastActivation,
+              Math.round(new Date().valueOf() / 1000) - initialTime
+            )
+            subService.updateCharacteristic(
+              this.eveChar.TimesOpened,
+              subService.getCharacteristic(this.eveChar.TimesOpened).value + 1
             )
-            const name = subAccessory.displayName
-            switch (newState) {
-              case 0:
-                if (isGarage) {
-                  subService.updateCharacteristic(this.hapChar.TargetDoorState, 1)
-                  subService.updateCharacteristic(this.hapChar.CurrentDoorState, 1)
-                  subAccessory.eveService.addEntry({ status: 1 })
-                  if (params.updateSource && enableLogging) {
-                    this.log('[%s] %s [%s].', name, this.lang.curState, this.lang.doorClosed)
-                  }
-                } else {
-                  subService.updateCharacteristic(this.hapChar.LockTargetState, 1)
-                  subService.updateCharacteristic(this.hapChar.LockCurrentState, 1)
-                  subAccessory.context.contactDetected = true
-                  if (params.updateSource && enableLogging) {
-                    this.log('[%s] %s [%s].', name, this.lang.curState, this.lang.lockLocked)
-                  }
-                }
-                break
-              case 1: {
-                if (isGarage) {
-                  await this.funcs.sleep(Math.max(group.operationTime * 100, 2000))
-                  subService.updateCharacteristic(this.hapChar.TargetDoorState, 0)
-                  subService.updateCharacteristic(this.hapChar.CurrentDoorState, 0)
-                  subAccessory.eveService.addEntry({ status: 0 })
-                  const initialTime = subAccessory.eveService.getInitialTime()
-                  subService.updateCharacteristic(
-                    this.eveChar.LastActivation,
-                    Math.round(new Date().valueOf() / 1000) - initialTime
-                  )
-                  subService.updateCharacteristic(
-                    this.eveChar.TimesOpened,
-                    subService.getCharacteristic(this.eveChar.TimesOpened).value + 1
-                  )
-                  if (params.updateSource && enableLogging) {
-                    this.log('[%s] %s [%s].', name, this.lang.curState, this.lang.doorOpen)
-                  }
-                } else {
-                  subService.updateCharacteristic(this.hapChar.LockTargetState, 0)
-                  subService.updateCharacteristic(this.hapChar.LockCurrentState, 0)
-                  subAccessory.context.contactDetected = false
-                  if (params.updateSource && enableLogging) {
-                    this.log('[%s] %s [%s].', name, this.lang.curState, this.lang.lockUnlocked)
-                  }
-                }
-                break
-              }
+            if (params.updateSource && this.enableLoggingSub) {
+              this.log('[%s] %s [%s].', this.nameSub, this.lang.curState, this.lang.doorOpen)
+            }
+          } else {
+            subService.updateCharacteristic(this.hapChar.LockTargetState, 0)
+            subService.updateCharacteristic(this.hapChar.LockCurrentState, 0)
+            this.subAccessory.context.contactDetected = false
+            if (params.updateSource && this.enableLoggingSub) {
+              this.log('[%s] %s [%s].', this.nameSub, this.lang.curState, this.lang.lockUnlocked)
             }
           }
+          break
         }
       }
     } catch (err) {
diff --git a/lib/index.js b/lib/index.js
index 3334edc0..b6aa4e7b 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -736,24 +736,34 @@ class eWeLinkPlatform {
         Object.values(this.deviceConf).some(el => el.sensorId === device.deviceid) &&
         (this.consts.devices.garageSensors.includes(uiid) || device.showAs === 'sensor')
       ) {
-        /************************************
-        SENSORS [SONOFF DW2 AS GARAGE SENSOR]
-        ************************************/
-        const sim = Object.values(this.deviceConf).find(el => el.sensorId === device.deviceid)
-        let instance
-        if (sim.hideSensor) {
-          // If the sensor exists in Homebridge then remove it as needs to be re-added as hidden
-          if (devicesInHB.has(uuid)) {
-            this.removeAccessory(devicesInHB.get(uuid))
+        /*****************************************
+        SENSORS [AS GARAGE/LOCK SENSOR SIMULATION]
+        *****************************************/
+        const sim = Object.values(this.deviceConf).find(
+          el => el.sensorId === device.deviceid && ['garage', 'lock'].includes(el.showAs)
+        )
+        const uuidSub = this.hapUUIDGen(sim.deviceId + 'SWX')
+        if (devicesInHB.has(uuidSub)) {
+          const subAccessory = devicesInHB.get(uuidSub)
+          let instance
+          if (sim.hideSensor) {
+            // If the sensor exists in Homebridge then remove it as needs to be re-added as hidden
+            if (devicesInHB.has(uuid)) {
+              this.removeAccessory(devicesInHB.get(uuid))
+            }
+            instance = './device/simulation/sensor-hidden'
+            accessory = this.addAccessory(device, device.deviceid + 'SWX', true)
+          } else {
+            instance = './device/simulation/sensor-visible'
+            accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
           }
-          instance = './device/simulation/sensor-hidden'
-          accessory = this.addAccessory(device, device.deviceid + 'SWX', true)
+          accessory.control = new (require(instance))(this, accessory, subAccessory)
         } else {
-          instance = './device/simulation/sensor-visible'
           accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
+          this.log.warn('[%s] %s.', accessory.displayName, this.lang.sensorNoDevice)
+          accessory.control = new (require('./device/sensor-contact'))(this, accessory)
         }
-        accessory.control = new (require(instance))(this, accessory, devicesInHB)
-        /******************************************/
+        /***********************************************/
       } else if (device.showAs === 'garage') {
         /****************************************
         GARAGE DOORS [ONE] [ACCESSORY SIMULATION]
diff --git a/lib/utils/lang-en.js b/lib/utils/lang-en.js
index ddfbc93a..fc58b6bb 100644
--- a/lib/utils/lang-en.js
+++ b/lib/utils/lang-en.js
@@ -116,6 +116,7 @@ module.exports = {
   sendLogin: 'Sending HTTP login() request',
   sensorErr: 'unsupported as de/humidifier since device does not have supported sensor',
   sensorNo: 'deactivated',
+  sensorNoDevice: 'garage/lock accessory not found, this device will be setup as a normal sensor',
   sensorYes: 'activated',
   shareWarn: 'using a shared device with the cloud may cause errors, use your main eWeLink account',
   sonoffCamera: 'see the homebridge-ewelink wiki for details to enable the camera',
diff --git a/lib/utils/lang-fr.js b/lib/utils/lang-fr.js
index ea0acf4a..39a8c71f 100644
--- a/lib/utils/lang-fr.js
+++ b/lib/utils/lang-fr.js
@@ -119,6 +119,7 @@ module.exports = {
     "non supporté comme des/humidifier tant que l'équipement n'à pas de capteur pris en charge",
   sensorNo: 'désactivé',
   sensorYes: 'activé',
+  sensorNoDevice: 'garage/lock accessory not found, this device will be setup as a normal sensor',
   shareWarn:
     'utiliser un équipement partagé avec le cloud peut provoquer des erreurs, utilisez votre compte eWelink principal',
   sonoffCamera: "voir le wiki homebridge-ewelink pour plus de détails sur l'activation de caméra",

From 792e7fd849d1f94c72a7c337d027a15123d802fb Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 6 Nov 2021 10:59:59 +0000
Subject: [PATCH 2767/3183] 8.5.1-beta.7

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index aca97042..cdc4a85c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.5.1-beta.6",
+  "version": "8.5.1-beta.7",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.5.1-beta.6",
+      "version": "8.5.1-beta.7",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 5ee5b9a5..6da78037 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.5.1-beta.6",
+  "version": "8.5.1-beta.7",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From 87b55fe6fce4cf1d82b1bb93f480cb9082449f60 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 6 Nov 2021 11:51:06 +0000
Subject: [PATCH 2768/3183] some garage/lock+sensor sim fixes

---
 lib/device/simulation/sensor-hidden.js  | 2 +-
 lib/device/simulation/sensor-visible.js | 2 +-
 lib/index.js                            | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/device/simulation/sensor-hidden.js b/lib/device/simulation/sensor-hidden.js
index 84e6ec7f..087c5a26 100644
--- a/lib/device/simulation/sensor-hidden.js
+++ b/lib/device/simulation/sensor-hidden.js
@@ -18,7 +18,7 @@ module.exports = class deviceSensorHidden {
     this.subAccessory = subAccessory
 
     // Set up custom variables for this device type
-    const group = platform.deviceConf[subAccessory.context.hbDeviceId] || {}
+    const group = platform.deviceConf[subAccessory.context.eweDeviceId] || {}
     this.isGarage = group.showAs === 'garage'
     this.operationTime = group.operationTime || platform.consts.defaultValues.operationTime
 
diff --git a/lib/device/simulation/sensor-visible.js b/lib/device/simulation/sensor-visible.js
index d077c08a..83b25535 100644
--- a/lib/device/simulation/sensor-visible.js
+++ b/lib/device/simulation/sensor-visible.js
@@ -28,7 +28,7 @@ module.exports = class deviceSensorVisible {
       deviceConf && deviceConf.lowBattThreshold
         ? Math.min(deviceConf.lowBattThreshold, 100)
         : platform.consts.defaultValues.lowBattThreshold
-    const group = platform.deviceConf[subAccessory.context.hbDeviceId] || {}
+    const group = platform.deviceConf[subAccessory.context.eweDeviceId] || {}
     this.isGarage = group.showAs === 'garage'
     this.operationTime = group.operationTime || platform.consts.defaultValues.operationTime
 
diff --git a/lib/index.js b/lib/index.js
index b6aa4e7b..713ff41e 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -739,14 +739,14 @@ class eWeLinkPlatform {
         /*****************************************
         SENSORS [AS GARAGE/LOCK SENSOR SIMULATION]
         *****************************************/
-        const sim = Object.values(this.deviceConf).find(
-          el => el.sensorId === device.deviceid && ['garage', 'lock'].includes(el.showAs)
+        const sim = Object.entries(this.deviceConf).find(
+          ([id, el]) => el.sensorId === device.deviceid && ['garage', 'lock'].includes(el.showAs)
         )
-        const uuidSub = this.hapUUIDGen(sim.deviceId + 'SWX')
+        const uuidSub = this.api.hap.uuid.generate(sim[0] + 'SWX')
         if (devicesInHB.has(uuidSub)) {
           const subAccessory = devicesInHB.get(uuidSub)
           let instance
-          if (sim.hideSensor) {
+          if (sim[1].hideSensor) {
             // If the sensor exists in Homebridge then remove it as needs to be re-added as hidden
             if (devicesInHB.has(uuid)) {
               this.removeAccessory(devicesInHB.get(uuid))

From 95a76f3d893cc2fd9c22af98c0dcbad5f0b325fb Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 6 Nov 2021 11:52:09 +0000
Subject: [PATCH 2769/3183] temp enable logging for rf blind sim

---
 lib/device/simulation/rf-blind.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/device/simulation/rf-blind.js b/lib/device/simulation/rf-blind.js
index 5d8afa7f..d83a2e11 100644
--- a/lib/device/simulation/rf-blind.js
+++ b/lib/device/simulation/rf-blind.js
@@ -45,6 +45,10 @@ module.exports = class deviceRFBlind {
         break
     }
 
+    // temp override
+    this.enableLogging = true
+    this.enableDebugLogging = true
+
     // If the accessory has a door service (from an old simulation) then remove it
     if (this.accessory.getService(this.hapServ.Door)) {
       this.accessory.removeService(this.accessory.getService(this.hapServ.Door))

From 23802ddfbf3089b27b23011591c0b8f24811bf6f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 6 Nov 2021 11:52:34 +0000
Subject: [PATCH 2770/3183] 8.5.1-beta.8

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index cdc4a85c..43363f91 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.5.1-beta.7",
+  "version": "8.5.1-beta.8",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.5.1-beta.7",
+      "version": "8.5.1-beta.8",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 6da78037..81d8323f 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.5.1-beta.7",
+  "version": "8.5.1-beta.8",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From f918fec7e34dbdc7f796f39d6c783b3ed8b631fd Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 6 Nov 2021 12:38:22 +0000
Subject: [PATCH 2771/3183] properly remove switch services from old rf
 simulation accessories

---
 lib/device/simulation/rf-blind.js  | 8 +++-----
 lib/device/simulation/rf-door.js   | 8 +++-----
 lib/device/simulation/rf-window.js | 8 +++-----
 3 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/lib/device/simulation/rf-blind.js b/lib/device/simulation/rf-blind.js
index d83a2e11..727555fd 100644
--- a/lib/device/simulation/rf-blind.js
+++ b/lib/device/simulation/rf-blind.js
@@ -60,11 +60,9 @@ module.exports = class deviceRFBlind {
     }
 
     // Remove old switch services from before the simulation was configured
-    ;['ON', 'OFF', 'Stop'].forEach(name => {
-      if (this.accessory.getService(name)) {
-        this.accessory.removeService(this.accessory.getService(name))
-      }
-    })
+    this.accessory.services
+      .filter(el => el.constructor.name === 'Switch')
+      .forEach(el => this.accessory.removeService(el))
 
     // Set up the accessory with default positions when added the first time
     if (!this.funcs.hasProperty(this.accessory.context, 'cacheCurrentPosition')) {
diff --git a/lib/device/simulation/rf-door.js b/lib/device/simulation/rf-door.js
index f25aeb9c..63840f2c 100644
--- a/lib/device/simulation/rf-door.js
+++ b/lib/device/simulation/rf-door.js
@@ -56,11 +56,9 @@ module.exports = class deviceRFDoor {
     }
 
     // Remove old switch services from before the simulation was configured
-    ;['ON', 'OFF', 'Stop'].forEach(name => {
-      if (this.accessory.getService(name)) {
-        this.accessory.removeService(this.accessory.getService(name))
-      }
-    })
+    this.accessory.services
+      .filter(el => el.constructor.name === 'Switch')
+      .forEach(el => this.accessory.removeService(el))
 
     // Set up the accessory with default positions when added the first time
     if (!this.funcs.hasProperty(this.accessory.context, 'cacheCurrentPosition')) {
diff --git a/lib/device/simulation/rf-window.js b/lib/device/simulation/rf-window.js
index 6cd9ca9d..645d28ea 100644
--- a/lib/device/simulation/rf-window.js
+++ b/lib/device/simulation/rf-window.js
@@ -56,11 +56,9 @@ module.exports = class deviceRFWindow {
     }
 
     // Remove old switch services from before the simulation was configured
-    ;['ON', 'OFF', 'Stop'].forEach(name => {
-      if (this.accessory.getService(name)) {
-        this.accessory.removeService(this.accessory.getService(name))
-      }
-    })
+    this.accessory.services
+      .filter(el => el.constructor.name === 'Switch')
+      .forEach(el => this.accessory.removeService(el))
 
     // Set up the accessory with default positions when added the first time
     if (!this.funcs.hasProperty(this.accessory.context, 'cacheCurrentPosition')) {

From 17da68fff0baf1afc25c2a4c9d9f08d477df0b0b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 6 Nov 2021 12:41:42 +0000
Subject: [PATCH 2772/3183] rf sim send int channel not str

---
 lib/device/simulation/rf-blind.js  | 6 +++---
 lib/device/simulation/rf-door.js   | 6 +++---
 lib/device/simulation/rf-window.js | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/lib/device/simulation/rf-blind.js b/lib/device/simulation/rf-blind.js
index 727555fd..01214391 100644
--- a/lib/device/simulation/rf-blind.js
+++ b/lib/device/simulation/rf-blind.js
@@ -143,10 +143,10 @@ module.exports = class deviceRFBlind {
       let decisecondsToMove
       if (setToMoveUp) {
         decisecondsToMove = Math.round(Math.abs(diffPosition) * percentStepUpPerDS)
-        params.rfChl = this.chOpen
+        params.rfChl = parseInt(this.chOpen)
       } else {
         decisecondsToMove = Math.round(Math.abs(diffPosition) * percentStepDownPerDS)
-        params.rfChl = this.chClose
+        params.rfChl = parseInt(this.chClose)
       }
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.accessory.context.cacheTargetPosition = value
@@ -156,7 +156,7 @@ module.exports = class deviceRFBlind {
       if (this.updateKey !== updateKey) {
         return
       }
-      params.rfChl = this.chStop
+      params.rfChl = parseInt(this.chStop)
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.service.updateCharacteristic(this.hapChar.PositionState, 2)
       this.service.updateCharacteristic(this.hapChar.CurrentPosition, value)
diff --git a/lib/device/simulation/rf-door.js b/lib/device/simulation/rf-door.js
index 63840f2c..03463cd7 100644
--- a/lib/device/simulation/rf-door.js
+++ b/lib/device/simulation/rf-door.js
@@ -139,10 +139,10 @@ module.exports = class deviceRFDoor {
       let decisecondsToMove
       if (setToMoveUp) {
         decisecondsToMove = Math.round(Math.abs(diffPosition) * percentStepUpPerDS)
-        params.rfChl = this.chOpen
+        this.chOpen
       } else {
         decisecondsToMove = Math.round(Math.abs(diffPosition) * percentStepDownPerDS)
-        params.rfChl = this.chClose
+        this.chClose
       }
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.accessory.context.cacheTargetPosition = value
@@ -152,7 +152,7 @@ module.exports = class deviceRFDoor {
       if (this.updateKey !== updateKey) {
         return
       }
-      params.rfChl = this.chStop
+      this.chStop
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.service.updateCharacteristic(this.hapChar.PositionState, 2)
       this.service.updateCharacteristic(this.hapChar.CurrentPosition, value)
diff --git a/lib/device/simulation/rf-window.js b/lib/device/simulation/rf-window.js
index 645d28ea..8e5aaf77 100644
--- a/lib/device/simulation/rf-window.js
+++ b/lib/device/simulation/rf-window.js
@@ -139,10 +139,10 @@ module.exports = class deviceRFWindow {
       let decisecondsToMove
       if (setToMoveUp) {
         decisecondsToMove = Math.round(Math.abs(diffPosition) * percentStepUpPerDS)
-        params.rfChl = this.chOpen
+        this.chOpen
       } else {
         decisecondsToMove = Math.round(Math.abs(diffPosition) * percentStepDownPerDS)
-        params.rfChl = this.chClose
+        this.chClose
       }
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.accessory.context.cacheTargetPosition = value
@@ -152,7 +152,7 @@ module.exports = class deviceRFWindow {
       if (this.updateKey !== updateKey) {
         return
       }
-      params.rfChl = this.chStop
+      this.chStop
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.service.updateCharacteristic(this.hapChar.PositionState, 2)
       this.service.updateCharacteristic(this.hapChar.CurrentPosition, value)

From a73ab76c92c7af39b6c2b5bd7041eaaeb76210dc Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 6 Nov 2021 12:42:05 +0000
Subject: [PATCH 2773/3183] 8.5.1-beta.9

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 43363f91..1213fb7d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.5.1-beta.8",
+  "version": "8.5.1-beta.9",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.5.1-beta.8",
+      "version": "8.5.1-beta.9",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 81d8323f..49a0b174 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.5.1-beta.8",
+  "version": "8.5.1-beta.9",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From 7401bc27ac4a01b7246980e676ee3087d549a4d3 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 8 Nov 2021 13:24:07 +0000
Subject: [PATCH 2774/3183] rf sim fixes and debug logging

---
 lib/device/simulation/rf-blind.js  | 16 ++++++++++++----
 lib/device/simulation/rf-door.js   |  6 +++---
 lib/device/simulation/rf-window.js |  6 +++---
 3 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/lib/device/simulation/rf-blind.js b/lib/device/simulation/rf-blind.js
index 01214391..4cecd849 100644
--- a/lib/device/simulation/rf-blind.js
+++ b/lib/device/simulation/rf-blind.js
@@ -45,10 +45,6 @@ module.exports = class deviceRFBlind {
         break
     }
 
-    // temp override
-    this.enableLogging = true
-    this.enableDebugLogging = true
-
     // If the accessory has a door service (from an old simulation) then remove it
     if (this.accessory.getService(this.hapServ.Door)) {
       this.accessory.removeService(this.accessory.getService(this.hapServ.Door))
@@ -148,6 +144,18 @@ module.exports = class deviceRFBlind {
         decisecondsToMove = Math.round(Math.abs(diffPosition) * percentStepDownPerDS)
         params.rfChl = parseInt(this.chClose)
       }
+
+      // temp extra debug logging
+      this.log(
+        '[%s] from %s% to %s% - moving %s for %s seconds',
+        this.name,
+        prevPosition,
+        value,
+        setToMoveUp ? 'up' : 'down',
+        decisecondsToMove / 10
+      )
+
+      // Send the update
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.accessory.context.cacheTargetPosition = value
       this.accessory.context.cachePositionState = setToMoveUp ? 1 : 0
diff --git a/lib/device/simulation/rf-door.js b/lib/device/simulation/rf-door.js
index 03463cd7..dd0548ff 100644
--- a/lib/device/simulation/rf-door.js
+++ b/lib/device/simulation/rf-door.js
@@ -139,10 +139,10 @@ module.exports = class deviceRFDoor {
       let decisecondsToMove
       if (setToMoveUp) {
         decisecondsToMove = Math.round(Math.abs(diffPosition) * percentStepUpPerDS)
-        this.chOpen
+        params.rfChl = parseInt(this.chOpen)
       } else {
         decisecondsToMove = Math.round(Math.abs(diffPosition) * percentStepDownPerDS)
-        this.chClose
+        params.rfChl = parseInt(this.chClose)
       }
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.accessory.context.cacheTargetPosition = value
@@ -152,7 +152,7 @@ module.exports = class deviceRFDoor {
       if (this.updateKey !== updateKey) {
         return
       }
-      this.chStop
+      params.rfChl = parseInt(this.chStop)
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.service.updateCharacteristic(this.hapChar.PositionState, 2)
       this.service.updateCharacteristic(this.hapChar.CurrentPosition, value)
diff --git a/lib/device/simulation/rf-window.js b/lib/device/simulation/rf-window.js
index 8e5aaf77..17d9ef71 100644
--- a/lib/device/simulation/rf-window.js
+++ b/lib/device/simulation/rf-window.js
@@ -139,10 +139,10 @@ module.exports = class deviceRFWindow {
       let decisecondsToMove
       if (setToMoveUp) {
         decisecondsToMove = Math.round(Math.abs(diffPosition) * percentStepUpPerDS)
-        this.chOpen
+        params.rfChl = parseInt(this.chOpen)
       } else {
         decisecondsToMove = Math.round(Math.abs(diffPosition) * percentStepDownPerDS)
-        this.chClose
+        params.rfChl = parseInt(this.chClose)
       }
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.accessory.context.cacheTargetPosition = value
@@ -152,7 +152,7 @@ module.exports = class deviceRFWindow {
       if (this.updateKey !== updateKey) {
         return
       }
-      this.chStop
+      params.rfChl = parseInt(this.chStop)
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.service.updateCharacteristic(this.hapChar.PositionState, 2)
       this.service.updateCharacteristic(this.hapChar.CurrentPosition, value)

From 968ed0e61f2bc6d3af349b646b0f15a5e9c0e6cd Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 8 Nov 2021 13:24:37 +0000
Subject: [PATCH 2775/3183] 8.5.1-beta.10

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 1213fb7d..48d6d3ee 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.5.1-beta.9",
+  "version": "8.5.1-beta.10",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.5.1-beta.9",
+      "version": "8.5.1-beta.10",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 49a0b174..30af2cb0 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.5.1-beta.9",
+  "version": "8.5.1-beta.10",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From f02df20dfba536713b21f77ea6dfc5c8f463c8ef Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 8 Nov 2021 16:16:50 +0000
Subject: [PATCH 2776/3183] [temp] allow for TargetHeaterCoolerState

---
 lib/device/simulation/heater.js | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/lib/device/simulation/heater.js b/lib/device/simulation/heater.js
index b7be1562..395b412c 100644
--- a/lib/device/simulation/heater.js
+++ b/lib/device/simulation/heater.js
@@ -99,6 +99,12 @@ module.exports = class deviceHeater {
       this.accessory.removeService(this.accessory.getService(this.hapServ.TemperatureSensor))
     }
 
+    // TEMP
+    if (this.accessory.getService(this.hapServ.HeaterCooler)) {
+      this.accessory.removeService(this.accessory.getService(this.hapServ.HeaterCooler))
+    }
+    // END TEMP
+
     // Add the heater service if it doesn't already exist
     this.service =
       this.accessory.getService(this.hapServ.HeaterCooler) ||
@@ -129,12 +135,22 @@ module.exports = class deviceHeater {
       .getCharacteristic(this.hapChar.Active)
       .onSet(async value => await this.internalStateUpdate(value))
 
+    // TEMP
+    /*
     // Add options to the target state characteristic
     this.service.getCharacteristic(this.hapChar.TargetHeaterCoolerState).setProps({
       minValue: 0,
       maxValue: 0,
       validValues: [0]
     })
+    */
+    this.service.getCharacteristic(this.hapChar.TargetHeaterCoolerState).onSet(value => {
+      setTimeout(() => {
+        this.service.updateCharacteristic(this.hapChar.TargetHeaterCoolerState, 0)
+      }, 1500)
+    })
+    // END TEMP
+
 
     // Add the set handler to the target temperature characteristic
     this.service

From 7cfa759562484fa9b7780478c8f993281ec88be5 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 8 Nov 2021 16:17:14 +0000
Subject: [PATCH 2777/3183] 8.5.1-beta.11

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 48d6d3ee..d526988c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.5.1-beta.10",
+  "version": "8.5.1-beta.11",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.5.1-beta.10",
+      "version": "8.5.1-beta.11",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 30af2cb0..d361933b 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.5.1-beta.10",
+  "version": "8.5.1-beta.11",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From 03f345d35cc66ea90a4d74c0d0201e06fc036470 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 8 Nov 2021 16:25:39 +0000
Subject: [PATCH 2778/3183] remove repeated unncessary code

---
 lib/device/simulation/heater.js | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/lib/device/simulation/heater.js b/lib/device/simulation/heater.js
index 395b412c..2ba245f1 100644
--- a/lib/device/simulation/heater.js
+++ b/lib/device/simulation/heater.js
@@ -199,12 +199,6 @@ module.exports = class deviceHeater {
       })
       this.service
         .getCharacteristic(this.hapChar.HeatingThresholdTemperature)
-        .updateValue(this.accessory.context.cacheTarget)
-        .setProps({
-          minValue: this.minTarget,
-          maxValue: this.maxTarget,
-          minStep: 0.5
-        })
         .onGet(() => {
           if (!this.isOnline) {
             throw new this.hapErr(-70402)

From 28b95df62b50e95277abea1d80ca0c8b39811cd8 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 9 Nov 2021 10:00:55 +0000
Subject: [PATCH 2779/3183] formatting

---
 lib/device/simulation/heater.js | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/lib/device/simulation/heater.js b/lib/device/simulation/heater.js
index 2ba245f1..6b02a964 100644
--- a/lib/device/simulation/heater.js
+++ b/lib/device/simulation/heater.js
@@ -151,7 +151,6 @@ module.exports = class deviceHeater {
     })
     // END TEMP
 
-
     // Add the set handler to the target temperature characteristic
     this.service
       .getCharacteristic(this.hapChar.HeatingThresholdTemperature)
@@ -197,14 +196,12 @@ module.exports = class deviceHeater {
         }
         return this.service.getCharacteristic(this.hapChar.CurrentHeaterCoolerState).value
       })
-      this.service
-        .getCharacteristic(this.hapChar.HeatingThresholdTemperature)
-        .onGet(() => {
-          if (!this.isOnline) {
-            throw new this.hapErr(-70402)
-          }
-          return this.service.getCharacteristic(this.hapChar.HeatingThresholdTemperature).value
-        })
+      this.service.getCharacteristic(this.hapChar.HeatingThresholdTemperature).onGet(() => {
+        if (!this.isOnline) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.HeatingThresholdTemperature).value
+      })
     }
 
     // Initialise these caches now since they aren't determined by the initial externalUpdate()

From 802e865e595904287f325efc8ebf57e79f592d74 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 10 Nov 2021 17:44:48 +0000
Subject: [PATCH 2780/3183] recommended homebridge version to 1.3.6

---
 CHANGELOG.md      | 4 ++++
 package-lock.json | 2 +-
 package.json      | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2fb7f4d7..e247cc50 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,10 @@ All notable changes to homebridge-ewelink will be documented in this file.
 - The plugin will now retrieve devices from **all** your homes in your eWeLink account
 - Expose an RF Bridge `curtain` device type as a HomeKit `WindowCovering`, `Door` or `Window` accessory simulation
 
+### Changed
+
+- Recommended Homebridge bumped to v1.3.6
+
 ## 8.5.0 (2021-11-03)
 
 ### Added
diff --git a/package-lock.json b/package-lock.json
index d526988c..56edc116 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -35,7 +35,7 @@
         "ws": "^8.2.3"
       },
       "engines": {
-        "homebridge": "^1.3.5",
+        "homebridge": "^1.3.6",
         "node": "^14.18.1 || ^16.13.0"
       }
     },
diff --git a/package.json b/package.json
index d361933b..3d776b0a 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,7 @@
   ],
   "main": "lib/index.js",
   "engines": {
-    "homebridge": "^1.3.5",
+    "homebridge": "^1.3.6",
     "node": "^14.18.1 || ^16.13.0"
   },
   "repository": {

From db352f2f7bbab2e72a7e835111fb335056a86136 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 12 Nov 2021 18:02:16 +0000
Subject: [PATCH 2781/3183] revert test

---
 lib/device/simulation/heater.js | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/lib/device/simulation/heater.js b/lib/device/simulation/heater.js
index 6b02a964..873935d2 100644
--- a/lib/device/simulation/heater.js
+++ b/lib/device/simulation/heater.js
@@ -99,12 +99,6 @@ module.exports = class deviceHeater {
       this.accessory.removeService(this.accessory.getService(this.hapServ.TemperatureSensor))
     }
 
-    // TEMP
-    if (this.accessory.getService(this.hapServ.HeaterCooler)) {
-      this.accessory.removeService(this.accessory.getService(this.hapServ.HeaterCooler))
-    }
-    // END TEMP
-
     // Add the heater service if it doesn't already exist
     this.service =
       this.accessory.getService(this.hapServ.HeaterCooler) ||
@@ -135,21 +129,12 @@ module.exports = class deviceHeater {
       .getCharacteristic(this.hapChar.Active)
       .onSet(async value => await this.internalStateUpdate(value))
 
-    // TEMP
-    /*
     // Add options to the target state characteristic
     this.service.getCharacteristic(this.hapChar.TargetHeaterCoolerState).setProps({
       minValue: 0,
       maxValue: 0,
       validValues: [0]
     })
-    */
-    this.service.getCharacteristic(this.hapChar.TargetHeaterCoolerState).onSet(value => {
-      setTimeout(() => {
-        this.service.updateCharacteristic(this.hapChar.TargetHeaterCoolerState, 0)
-      }, 1500)
-    })
-    // END TEMP
 
     // Add the set handler to the target temperature characteristic
     this.service

From e762fe1e33ccff39e8402b8f2b05db40a6035ca1 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 12 Nov 2021 18:11:17 +0000
Subject: [PATCH 2782/3183] template for TH as thermostat sim

---
 config.schema.json                  |  14 +-
 lib/device/simulation/thermostat.js | 435 ++++++++++++++++++++++++++++
 lib/index.js                        |  26 +-
 3 files changed, 461 insertions(+), 14 deletions(-)
 create mode 100644 lib/device/simulation/thermostat.js

diff --git a/config.schema.json b/config.schema.json
index 86542a59..561d13a3 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -942,6 +942,10 @@
                   "title": "1 Switch + Sensors (Default)",
                   "enum": ["default"]
                 },
+                {
+                    "title": "1 Thermostat",
+                    "enum": ["thermostat"]
+                  },
                 {
                   "title": "1 Heater",
                   "enum": ["heater"]
@@ -968,7 +972,7 @@
               "title": "Hide Switch",
               "description": "If true, this accessory will hide the TH10/16 switch from HomeKit.",
               "condition": {
-                "functionBody": "return (model.thDevices && model.thDevices[arrayIndices] && ['th'].includes(model.thDevices[arrayIndices].deviceModel) && !['heater', 'cooler', 'humidifier', 'dehumidifier'].includes(model.thDevices[arrayIndices].showAs) && !model.thDevices[arrayIndices].ignoreDevice);"
+                "functionBody": "return (model.thDevices && model.thDevices[arrayIndices] && ['th'].includes(model.thDevices[arrayIndices].deviceModel) && !['thermostat', 'heater', 'cooler', 'humidifier', 'dehumidifier'].includes(model.thDevices[arrayIndices].showAs) && !model.thDevices[arrayIndices].ignoreDevice);"
               }
             },
             "offset": {
@@ -1008,21 +1012,21 @@
             "minTarget": {
               "type": "integer",
               "title": "Minimum Target Temperature",
-              "description": "Minimum target temperature for TH10/16 heater/cooler simulation to show in HomeKit apps. Must be 0 or more.",
+              "description": "Minimum target temperature for TH10/16 thermostat/heater/cooler simulation to show in HomeKit apps. Must be 0 or more.",
               "placeholder": 10,
               "minimum": 0,
               "condition": {
-                "functionBody": "return (model.thDevices && model.thDevices[arrayIndices] && ['th'].includes(model.thDevices[arrayIndices].deviceModel) && ['heater', 'cooler'].includes(model.thDevices[arrayIndices].showAs) && !model.thDevices[arrayIndices].ignoreDevice);"
+                "functionBody": "return (model.thDevices && model.thDevices[arrayIndices] && ['th'].includes(model.thDevices[arrayIndices].deviceModel) && ['thermostat', 'heater', 'cooler'].includes(model.thDevices[arrayIndices].showAs) && !model.thDevices[arrayIndices].ignoreDevice);"
               }
             },
             "maxTarget": {
               "type": "integer",
               "title": "Maximum Target Temperature",
-              "description": "Maximum target temperature for TH10/16 heater/cooler simulation to show in HomeKit apps. Must be 1 or more, and greater than the minimum value set above.",
+              "description": "Maximum target temperature for TH10/16 thermostat/heater/cooler simulation to show in HomeKit apps. Must be 1 or more, and greater than the minimum value set above.",
               "placeholder": 30,
               "minimum": 1,
               "condition": {
-                "functionBody": "return (model.thDevices && model.thDevices[arrayIndices] && ['th'].includes(model.thDevices[arrayIndices].deviceModel) && ['heater', 'cooler'].includes(model.thDevices[arrayIndices].showAs) && !model.thDevices[arrayIndices].ignoreDevice);"
+                "functionBody": "return (model.thDevices && model.thDevices[arrayIndices] && ['th'].includes(model.thDevices[arrayIndices].deviceModel) && ['thermostat', 'heater', 'cooler'].includes(model.thDevices[arrayIndices].showAs) && !model.thDevices[arrayIndices].ignoreDevice);"
               }
             },
             "ipAddress": {
diff --git a/lib/device/simulation/thermostat.js b/lib/device/simulation/thermostat.js
new file mode 100644
index 00000000..90c03ffe
--- /dev/null
+++ b/lib/device/simulation/thermostat.js
@@ -0,0 +1,435 @@
+/* jshint node: true,esversion: 9, -W014, -W033 */
+/* eslint-disable new-cap */
+'use strict'
+
+module.exports = class deviceThermostat {
+  constructor (platform, accessory) {
+    // Set up variables from the platform
+    this.funcs = platform.funcs
+    this.hapChar = platform.api.hap.Characteristic
+    this.hapErr = platform.api.hap.HapStatusError
+    this.hapServ = platform.api.hap.Service
+    this.lang = platform.lang
+    this.log = platform.log
+    this.platform = platform
+
+    // Set up variables from the accessory
+    this.name = accessory.displayName
+    this.accessory = accessory
+
+    // Initially set the online flag as true (to be then updated as false if necessary)
+    this.isOnline = true
+
+    // Set up custom variables for this device type
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
+    this.tempOffset =
+      deviceConf && deviceConf.offset ? deviceConf.offset : platform.consts.defaultValues.offset
+    this.tempOffsetFactor = deviceConf && deviceConf.offsetFactor
+    this.humiOffset =
+      deviceConf && deviceConf.humidityOffset
+        ? parseInt(deviceConf.humidityOffset)
+        : platform.consts.defaultValues.humidityOffset
+    this.humiOffsetFactor = deviceConf && deviceConf.humidityOffsetFactor
+    this.minTarget =
+      deviceConf && deviceConf.minTarget
+        ? deviceConf.minTarget
+        : platform.consts.defaultValues.minTarget
+    this.maxTarget =
+      deviceConf && deviceConf.maxTarget
+        ? Math.max(deviceConf.maxTarget, this.minTarget + 1)
+        : platform.consts.defaultValues.maxTarget
+
+    // Set the correct logging variables for this accessory
+    this.enableLogging = !platform.config.disableDeviceLogging
+    this.enableDebugLogging = platform.config.debug
+    if (deviceConf && deviceConf.overrideLogging) {
+      switch (deviceConf.overrideLogging) {
+        case 'standard':
+          this.enableLogging = true
+          this.enableDebugLogging = false
+          break
+        case 'debug':
+          this.enableLogging = true
+          this.enableDebugLogging = true
+          break
+        case 'disable':
+          this.enableLogging = false
+          this.enableDebugLogging = false
+          break
+      }
+    }
+
+    // If the accessory has a switch service then remove it
+    if (this.accessory.getService(this.hapServ.Switch)) {
+      this.accessory.removeService(this.accessory.getService(this.hapServ.Switch))
+    }
+
+    // If the accessory has a temperature sensor service then remove it
+    if (this.accessory.getService(this.hapServ.TemperatureSensor)) {
+      this.accessory.removeService(this.accessory.getService(this.hapServ.TemperatureSensor))
+    }
+
+    // Set up the accessory with default target temp when added the first time
+    if (!this.funcs.hasProperty(this.accessory.context, 'cacheTarget')) {
+      this.accessory.context.cacheTarget = 20
+    }
+
+    // Check to make sure user has not switched from cooler to heater
+    if (this.accessory.context.cacheType !== 'heater') {
+      // Remove and re-setup as a HeaterCooler
+      if (this.accessory.getService(this.hapServ.HeaterCooler)) {
+        this.accessory.removeService(this.accessory.getService(this.hapServ.HeaterCooler))
+      }
+      this.accessory.context.cacheType = 'heater'
+      this.accessory.context.cacheTarget = 20
+    }
+
+    // If the accessory has a thermostat service then remove it
+    if (this.accessory.getService(this.hapServ.Thermostat)) {
+      this.accessory.removeService(this.accessory.getService(this.hapServ.Thermostat))
+    }
+
+    // If the accessory has a humidifier service then remove it
+    if (this.accessory.getService(this.hapServ.HumidifierDehumidifier)) {
+      this.accessory.removeService(this.accessory.getService(this.hapServ.HumidifierDehumidifier))
+    }
+
+    // If the accessory has a temperature sensor service then remove it
+    if (this.accessory.getService(this.hapServ.TemperatureSensor)) {
+      this.accessory.removeService(this.accessory.getService(this.hapServ.TemperatureSensor))
+    }
+
+    // Add the heater service if it doesn't already exist
+    this.service =
+      this.accessory.getService(this.hapServ.HeaterCooler) ||
+      this.accessory.addService(this.hapServ.HeaterCooler)
+
+    // The DS18B20 sensor does not provide humidity readings
+    if (this.accessory.context.sensorType === 'DS18B20') {
+      if (this.accessory.getService(this.hapServ.HumiditySensor)) {
+        this.accessory.removeService(this.accessory.getService(this.hapServ.HumiditySensor))
+      }
+    } else {
+      // Add the humidity sensor service if it doesn't already exist
+      this.humiService =
+        this.accessory.getService(this.hapServ.HumiditySensor) ||
+        this.accessory.addService(this.hapServ.HumiditySensor)
+    }
+
+    // Set the heater as the primary service
+    this.service.setPrimaryService()
+
+    // Set custom properties of the current temperature characteristic
+    this.service.getCharacteristic(this.hapChar.CurrentTemperature).setProps({
+      minStep: 0.1
+    })
+
+    // Add the set handler to the heater active characteristic
+    this.service
+      .getCharacteristic(this.hapChar.Active)
+      .onSet(async value => await this.internalStateUpdate(value))
+
+    // Add options to the target state characteristic
+    this.service.getCharacteristic(this.hapChar.TargetHeaterCoolerState).setProps({
+      minValue: 0,
+      maxValue: 0,
+      validValues: [0]
+    })
+
+    // Add the set handler to the target temperature characteristic
+    this.service
+      .getCharacteristic(this.hapChar.HeatingThresholdTemperature)
+      .updateValue(this.accessory.context.cacheTarget)
+      .setProps({
+        minValue: this.minTarget,
+        maxValue: this.maxTarget,
+        minStep: 0.5
+      })
+      .onSet(async value => await this.internalTargetTempUpdate(value))
+
+    // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
+    if (!platform.config.disableNoResponse) {
+      if (this.humiService) {
+        this.humiService.getCharacteristic(this.hapChar.CurrentRelativeHumidity).onGet(() => {
+          if (!this.isOnline) {
+            throw new this.hapErr(-70402)
+          }
+          return this.humiService.getCharacteristic(this.hapChar.CurrentRelativeHumidity).value
+        })
+      }
+      this.service.getCharacteristic(this.hapChar.CurrentTemperature).onGet(() => {
+        if (!this.isOnline) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.CurrentTemperature).value
+      })
+      this.service.getCharacteristic(this.hapChar.Active).onGet(() => {
+        if (!this.isOnline) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.Active).value
+      })
+      this.service.getCharacteristic(this.hapChar.TargetHeaterCoolerState).onGet(() => {
+        if (!this.isOnline) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.TargetHeaterCoolerState).value
+      })
+      this.service.getCharacteristic(this.hapChar.CurrentHeaterCoolerState).onGet(() => {
+        if (!this.isOnline) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.CurrentHeaterCoolerState).value
+      })
+      this.service.getCharacteristic(this.hapChar.HeatingThresholdTemperature).onGet(() => {
+        if (!this.isOnline) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.HeatingThresholdTemperature).value
+      })
+    }
+
+    // Initialise these caches now since they aren't determined by the initial externalUpdate()
+    this.cacheState = this.service.getCharacteristic(this.hapChar.Active).value === 1 ? 'on' : 'off'
+    this.cacheHeat =
+      this.cacheState === 'on' &&
+      this.service.getCharacteristic(this.hapChar.TargetHeaterCoolerState).value === 2
+        ? 'on'
+        : 'off'
+
+    // Pass the accessory to Fakegato to set up with Eve
+    this.accessory.eveService = new platform.eveService('custom', this.accessory, {
+      log: platform.config.debugFakegato ? this.log : () => {}
+    })
+
+    // Set up an interval to get eWeLink to send regular temperature/humidity updates
+    if (platform.config.mode !== 'lan') {
+      setTimeout(() => {
+        this.internalUIUpdate()
+        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
+      }, 5000)
+
+      // Stop the intervals on Homebridge shutdown
+      platform.api.on('shutdown', () => {
+        clearInterval(this.intervalPoll)
+      })
+    }
+
+    // Output the customised options to the log
+    const opts = JSON.stringify({
+      humidityOffset: this.humiOffset,
+      humidityOffsetFactor: this.humiOffsetFactor,
+      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
+      maxTarget: this.maxTarget,
+      minTarget: this.minTarget,
+      offset: this.tempOffset,
+      offsetFactor: this.tempOffsetFactor,
+      showAs: 'heater'
+    })
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
+  }
+
+  async internalStateUpdate (value) {
+    try {
+      const params = { deviceType: 'normal' }
+      let newState
+      let newHeat
+      if (value === 0) {
+        params.mainSwitch = 'off'
+        params.switch = 'off'
+        newState = 'off'
+        newHeat = 'off'
+      } else {
+        if (this.cacheTemp < this.accessory.context.cacheTarget) {
+          params.mainSwitch = 'on'
+          params.switch = 'on'
+          newState = 'on'
+          newHeat = 'on'
+        } else {
+          params.mainSwitch = 'off'
+          params.switch = 'off'
+          newState = 'on'
+          newHeat = 'off'
+        }
+      }
+
+      // Only send the update if either:
+      // * The new value (state) is OFF and the cacheHeat was ON
+      // * The new value (state) is ON and newHeat is 'on'
+      if ((value === 0 && this.cacheHeat === 'on') || (value === 1 && newHeat === 'on')) {
+        await this.platform.sendDeviceUpdate(this.accessory, params)
+      }
+      if (newState !== this.cacheState) {
+        this.cacheState = newState
+        if (this.enableLogging) {
+          this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
+        }
+      }
+      if (newHeat !== this.cacheHeat) {
+        this.cacheHeat = newHeat
+        if (this.enableLogging) {
+          this.log('[%s] %s [%s].', this.name, this.lang.curHeat, this.cacheHeat)
+        }
+      }
+      this.service.updateCharacteristic(
+        this.hapChar.CurrentHeaterCoolerState,
+        value === 1 ? (this.cacheHeat === 'on' ? 2 : 1) : 0
+      )
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, true)
+      setTimeout(() => {
+        this.service.updateCharacteristic(this.hapChar.Active, this.cacheState === 'on' ? 1 : 0)
+      }, 2000)
+      throw new this.hapErr(-70402)
+    }
+  }
+
+  async internalTargetTempUpdate (value) {
+    try {
+      if (value === this.accessory.context.cacheTarget) {
+        return
+      }
+      this.accessory.context.cacheTarget = value
+      if (this.enableLogging) {
+        this.log('[%s] %s [%s°C].', this.name, this.lang.curTarg, value)
+      }
+      if (this.cacheState === 'off') {
+        return
+      }
+      const params = { deviceType: 'normal' }
+      let newHeat
+      if (this.cacheTemp < value) {
+        params.mainSwitch = 'on'
+        params.switch = 'on'
+        newHeat = 'on'
+      } else {
+        params.mainSwitch = 'off'
+        params.switch = 'off'
+        newHeat = 'off'
+      }
+      if (newHeat === this.cacheHeat) {
+        return
+      }
+      await this.platform.sendDeviceUpdate(this.accessory, params)
+      this.cacheHeat = newHeat
+      if (this.enableLogging) {
+        this.log('[%s] %s [%s].', this.name, this.lang.curHeat, this.cacheHeat)
+      }
+      this.service.updateCharacteristic(
+        this.hapChar.CurrentHeaterCoolerState,
+        this.cacheHeat === 'on' ? 2 : 1
+      )
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, true)
+      setTimeout(() => {
+        this.service.updateCharacteristic(
+          this.hapChar.HeatingThresholdTemperature,
+          this.accessory.context.cacheTarget
+        )
+      }, 2000)
+      throw new this.hapErr(-70402)
+    }
+  }
+
+  async internalCurrentTempUpdate () {
+    try {
+      if (this.cacheState === 'off') {
+        return
+      }
+      const params = { deviceType: 'normal' }
+      let newHeat
+      if (this.cacheTemp < this.accessory.context.cacheTarget) {
+        params.mainSwitch = 'on'
+        params.switch = 'on'
+        newHeat = 'on'
+      } else {
+        params.mainSwitch = 'off'
+        params.switch = 'off'
+        newHeat = 'off'
+      }
+      if (newHeat === this.cacheHeat) {
+        return
+      }
+      await this.platform.sendDeviceUpdate(this.accessory, params)
+      this.cacheHeat = newHeat
+      if (this.enableLogging) {
+        this.log('[%s] %s [%s].', this.name, this.lang.curHeat, this.cacheHeat)
+      }
+      this.service.updateCharacteristic(
+        this.hapChar.CurrentHeaterCoolerState,
+        this.cacheHeat === 'on' ? 2 : 1
+      )
+    } catch (err) {
+      // Suppress errors here
+    }
+  }
+
+  async internalUIUpdate () {
+    try {
+      // Skip polling if device isn't online
+      if (!this.isOnline) {
+        return
+      }
+
+      // Send the params to request the updates
+      await this.platform.sendDeviceUpdate(this.accessory, { uiActive: 120 })
+    } catch (err) {
+      // Suppress errors here
+    }
+  }
+
+  async externalUpdate (params) {
+    try {
+      if (
+        this.funcs.hasProperty(params, 'currentTemperature') &&
+        params.currentTemperature !== 'unavailable'
+      ) {
+        let newTemp = Number(params.currentTemperature)
+        if (this.tempOffsetFactor) {
+          newTemp *= this.tempOffset
+        } else {
+          newTemp += this.tempOffset
+        }
+        if (newTemp !== this.cacheTemp) {
+          this.cacheTemp = newTemp
+          this.service.updateCharacteristic(this.hapChar.CurrentTemperature, this.cacheTemp)
+          this.accessory.eveService.addEntry({ temp: this.cacheTemp })
+          if (params.updateSource && this.enableLogging) {
+            this.log('[%s] %s [%s°C].', this.name, this.lang.curTemp, this.cacheTemp)
+          }
+          await this.internalCurrentTempUpdate()
+        }
+      }
+      if (
+        this.funcs.hasProperty(params, 'currentHumidity') &&
+        params.currentHumidity !== 'unavailable' &&
+        this.humiService
+      ) {
+        let newHumi = parseInt(params.currentHumidity)
+        if (this.humiOffsetFactor) {
+          newHumi *= this.humiOffset
+        } else {
+          newHumi += this.humiOffset
+        }
+        newHumi = Math.max(Math.min(parseInt(newHumi), 100), 0)
+        if (newHumi !== this.cacheHumi) {
+          this.cacheHumi = newHumi
+          this.humiService.updateCharacteristic(
+            this.hapChar.CurrentRelativeHumidity,
+            this.cacheHumi
+          )
+          this.accessory.eveService.addEntry({ humidity: this.cacheHumi })
+          if (params.updateSource && this.enableLogging) {
+            this.log('[%s] %s [%s%].', this.name, this.lang.curHumi, this.cacheHumi)
+          }
+        }
+      }
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, false)
+    }
+  }
+
+  markStatus (isOnline) {
+    this.isOnline = isOnline
+  }
+}
diff --git a/lib/index.js b/lib/index.js
index 713ff41e..0a31887e 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -922,15 +922,23 @@ class eWeLinkPlatform {
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/thermostat'))(this, accessory)
         /*******/
-      } else if (device.showAs === 'heater' && this.consts.devices.sensorAmbient.includes(uiid)) {
-        /*************************************
-        HEATERS [TH10/16 ACCESSORY SIMULATION]
-        *************************************/
-        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.context.sensorType = device.params.sensorType
-        accessory.control = new (require('./device/simulation/heater'))(this, accessory)
-        /************************************/
-      } else if (device.showAs === 'cooler' && this.consts.devices.sensorAmbient.includes(uiid)) {
+      } else if (device.showAs === 'thermostat' && this.consts.devices.sensorAmbient.includes(uiid)) {
+          /*****************************************
+          THERMOSTATS [TH10/16 ACCESSORY SIMULATION]
+          *****************************************/
+          accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
+          accessory.context.sensorType = device.params.sensorType
+          accessory.control = new (require('./device/simulation/thermostat'))(this, accessory)
+          /****************************************/
+        } else if (device.showAs === 'heater' && this.consts.devices.sensorAmbient.includes(uiid)) {
+            /*************************************
+            HEATERS [TH10/16 ACCESSORY SIMULATION]
+            *************************************/
+            accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
+            accessory.context.sensorType = device.params.sensorType
+            accessory.control = new (require('./device/simulation/heater'))(this, accessory)
+            /************************************/
+          } else if (device.showAs === 'cooler' && this.consts.devices.sensorAmbient.includes(uiid)) {
         /*************************************
         COOLERS [TH10/16 ACCESSORY SIMULATION]
         *************************************/

From f8e92b3a0e657fcfc6a49bd5cf9357e56ab8269e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 12 Nov 2021 18:20:18 +0000
Subject: [PATCH 2783/3183] more changes and formatting

---
 config.schema.json                  |  6 ++--
 lib/device/simulation/cooler.js     |  5 ----
 lib/device/simulation/heater.js     |  5 ----
 lib/device/simulation/thermostat.js | 43 ++++++++++++-----------------
 lib/index.js                        | 29 ++++++++++---------
 5 files changed, 36 insertions(+), 52 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 561d13a3..55f29ba4 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -943,9 +943,9 @@
                   "enum": ["default"]
                 },
                 {
-                    "title": "1 Thermostat",
-                    "enum": ["thermostat"]
-                  },
+                  "title": "1 Thermostat",
+                  "enum": ["thermostat"]
+                },
                 {
                   "title": "1 Heater",
                   "enum": ["heater"]
diff --git a/lib/device/simulation/cooler.js b/lib/device/simulation/cooler.js
index f1a70042..0f2280d2 100644
--- a/lib/device/simulation/cooler.js
+++ b/lib/device/simulation/cooler.js
@@ -94,11 +94,6 @@ module.exports = class deviceHeater {
       this.accessory.removeService(this.accessory.getService(this.hapServ.HumidifierDehumidifier))
     }
 
-    // If the accessory has a temperature sensor service then remove it
-    if (this.accessory.getService(this.hapServ.TemperatureSensor)) {
-      this.accessory.removeService(this.accessory.getService(this.hapServ.TemperatureSensor))
-    }
-
     // Add the heater service if it doesn't already exist
     this.service =
       this.accessory.getService(this.hapServ.HeaterCooler) ||
diff --git a/lib/device/simulation/heater.js b/lib/device/simulation/heater.js
index 873935d2..c93ac382 100644
--- a/lib/device/simulation/heater.js
+++ b/lib/device/simulation/heater.js
@@ -94,11 +94,6 @@ module.exports = class deviceHeater {
       this.accessory.removeService(this.accessory.getService(this.hapServ.HumidifierDehumidifier))
     }
 
-    // If the accessory has a temperature sensor service then remove it
-    if (this.accessory.getService(this.hapServ.TemperatureSensor)) {
-      this.accessory.removeService(this.accessory.getService(this.hapServ.TemperatureSensor))
-    }
-
     // Add the heater service if it doesn't already exist
     this.service =
       this.accessory.getService(this.hapServ.HeaterCooler) ||
diff --git a/lib/device/simulation/thermostat.js b/lib/device/simulation/thermostat.js
index 90c03ffe..7af73fee 100644
--- a/lib/device/simulation/thermostat.js
+++ b/lib/device/simulation/thermostat.js
@@ -74,19 +74,9 @@ module.exports = class deviceThermostat {
       this.accessory.context.cacheTarget = 20
     }
 
-    // Check to make sure user has not switched from cooler to heater
-    if (this.accessory.context.cacheType !== 'heater') {
-      // Remove and re-setup as a HeaterCooler
-      if (this.accessory.getService(this.hapServ.HeaterCooler)) {
-        this.accessory.removeService(this.accessory.getService(this.hapServ.HeaterCooler))
-      }
-      this.accessory.context.cacheType = 'heater'
-      this.accessory.context.cacheTarget = 20
-    }
-
-    // If the accessory has a thermostat service then remove it
-    if (this.accessory.getService(this.hapServ.Thermostat)) {
-      this.accessory.removeService(this.accessory.getService(this.hapServ.Thermostat))
+    // If the accessory has a heater service then remove it
+    if (this.accessory.getService(this.hapServ.HeaterCooler)) {
+      this.accessory.removeService(this.accessory.getService(this.hapServ.HeaterCooler))
     }
 
     // If the accessory has a humidifier service then remove it
@@ -94,29 +84,30 @@ module.exports = class deviceThermostat {
       this.accessory.removeService(this.accessory.getService(this.hapServ.HumidifierDehumidifier))
     }
 
-    // If the accessory has a temperature sensor service then remove it
-    if (this.accessory.getService(this.hapServ.TemperatureSensor)) {
-      this.accessory.removeService(this.accessory.getService(this.hapServ.TemperatureSensor))
+    // If the accessory has a humidity sensor service then remove it
+    if (this.accessory.getService(this.hapServ.HumiditySensor)) {
+      this.accessory.removeService(this.accessory.getService(this.hapServ.HumiditySensor))
     }
 
-    // Add the heater service if it doesn't already exist
+    // Add the thermostat service if it doesn't already exist
     this.service =
-      this.accessory.getService(this.hapServ.HeaterCooler) ||
-      this.accessory.addService(this.hapServ.HeaterCooler)
+      this.accessory.getService(this.hapServ.Thermostat) ||
+      this.accessory.addService(this.hapServ.Thermostat)
 
     // The DS18B20 sensor does not provide humidity readings
     if (this.accessory.context.sensorType === 'DS18B20') {
-      if (this.accessory.getService(this.hapServ.HumiditySensor)) {
-        this.accessory.removeService(this.accessory.getService(this.hapServ.HumiditySensor))
+      if (this.service.testCharacteristic(this.hapChar.CurrentRelativeHumidity)) {
+        this.service.removeCharacteristic(
+          this.service.getCharacteristic(this.hapChar.CurrentRelativeHumidity)
+        )
       }
     } else {
-      // Add the humidity sensor service if it doesn't already exist
-      this.humiService =
-        this.accessory.getService(this.hapServ.HumiditySensor) ||
-        this.accessory.addService(this.hapServ.HumiditySensor)
+      if (!this.service.testCharacteristic(this.hapChar.CurrentRelativeHumidity)) {
+        this.service.addCharacteristic(this.hapChar.CurrentRelativeHumidity)
+      }
     }
 
-    // Set the heater as the primary service
+    // Set the thermostat as the primary service
     this.service.setPrimaryService()
 
     // Set custom properties of the current temperature characteristic
diff --git a/lib/index.js b/lib/index.js
index 0a31887e..7041fdf7 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -922,23 +922,26 @@ class eWeLinkPlatform {
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/thermostat'))(this, accessory)
         /*******/
-      } else if (device.showAs === 'thermostat' && this.consts.devices.sensorAmbient.includes(uiid)) {
-          /*****************************************
+      } else if (
+        device.showAs === 'thermostat' &&
+        this.consts.devices.sensorAmbient.includes(uiid)
+      ) {
+        /*****************************************
           THERMOSTATS [TH10/16 ACCESSORY SIMULATION]
           *****************************************/
-          accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
-          accessory.context.sensorType = device.params.sensorType
-          accessory.control = new (require('./device/simulation/thermostat'))(this, accessory)
-          /****************************************/
-        } else if (device.showAs === 'heater' && this.consts.devices.sensorAmbient.includes(uiid)) {
-            /*************************************
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
+        accessory.context.sensorType = device.params.sensorType
+        accessory.control = new (require('./device/simulation/thermostat'))(this, accessory)
+        /****************************************/
+      } else if (device.showAs === 'heater' && this.consts.devices.sensorAmbient.includes(uiid)) {
+        /*************************************
             HEATERS [TH10/16 ACCESSORY SIMULATION]
             *************************************/
-            accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
-            accessory.context.sensorType = device.params.sensorType
-            accessory.control = new (require('./device/simulation/heater'))(this, accessory)
-            /************************************/
-          } else if (device.showAs === 'cooler' && this.consts.devices.sensorAmbient.includes(uiid)) {
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
+        accessory.context.sensorType = device.params.sensorType
+        accessory.control = new (require('./device/simulation/heater'))(this, accessory)
+        /************************************/
+      } else if (device.showAs === 'cooler' && this.consts.devices.sensorAmbient.includes(uiid)) {
         /*************************************
         COOLERS [TH10/16 ACCESSORY SIMULATION]
         *************************************/

From 4c6be35caa4ad5fbcca7b62f1ea6c691732a0601 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 13 Nov 2021 09:38:48 +0000
Subject: [PATCH 2784/3183] finalise thermostat sim

---
 lib/device/simulation/thermostat.js | 85 +++++++++++++----------------
 lib/utils/constants.js              |  1 +
 2 files changed, 38 insertions(+), 48 deletions(-)

diff --git a/lib/device/simulation/thermostat.js b/lib/device/simulation/thermostat.js
index 7af73fee..0d05a0ce 100644
--- a/lib/device/simulation/thermostat.js
+++ b/lib/device/simulation/thermostat.js
@@ -69,6 +69,11 @@ module.exports = class deviceThermostat {
       this.accessory.removeService(this.accessory.getService(this.hapServ.TemperatureSensor))
     }
 
+    // If the accessory has a temperature sensor service then remove it
+    if (this.accessory.getService(this.hapServ.Thermostat)) {
+      this.accessory.removeService(this.accessory.getService(this.hapServ.Thermostat))
+    }
+
     // Set up the accessory with default target temp when added the first time
     if (!this.funcs.hasProperty(this.accessory.context, 'cacheTarget')) {
       this.accessory.context.cacheTarget = 20
@@ -105,31 +110,25 @@ module.exports = class deviceThermostat {
       if (!this.service.testCharacteristic(this.hapChar.CurrentRelativeHumidity)) {
         this.service.addCharacteristic(this.hapChar.CurrentRelativeHumidity)
       }
+      this.humiService = true
     }
 
-    // Set the thermostat as the primary service
-    this.service.setPrimaryService()
-
     // Set custom properties of the current temperature characteristic
     this.service.getCharacteristic(this.hapChar.CurrentTemperature).setProps({
       minStep: 0.1
     })
 
-    // Add the set handler to the heater active characteristic
+    // Add options to the target state characteristic
     this.service
-      .getCharacteristic(this.hapChar.Active)
+      .getCharacteristic(this.hapChar.TargetHeatingCoolingState)
+      .setProps({
+        validValues: [0, 3]
+      })
       .onSet(async value => await this.internalStateUpdate(value))
 
-    // Add options to the target state characteristic
-    this.service.getCharacteristic(this.hapChar.TargetHeaterCoolerState).setProps({
-      minValue: 0,
-      maxValue: 0,
-      validValues: [0]
-    })
-
     // Add the set handler to the target temperature characteristic
     this.service
-      .getCharacteristic(this.hapChar.HeatingThresholdTemperature)
+      .getCharacteristic(this.hapChar.TargetTemperature)
       .updateValue(this.accessory.context.cacheTarget)
       .setProps({
         minValue: this.minTarget,
@@ -140,51 +139,41 @@ module.exports = class deviceThermostat {
 
     // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
     if (!platform.config.disableNoResponse) {
-      if (this.humiService) {
-        this.humiService.getCharacteristic(this.hapChar.CurrentRelativeHumidity).onGet(() => {
-          if (!this.isOnline) {
-            throw new this.hapErr(-70402)
-          }
-          return this.humiService.getCharacteristic(this.hapChar.CurrentRelativeHumidity).value
-        })
-      }
       this.service.getCharacteristic(this.hapChar.CurrentTemperature).onGet(() => {
         if (!this.isOnline) {
           throw new this.hapErr(-70402)
         }
         return this.service.getCharacteristic(this.hapChar.CurrentTemperature).value
       })
-      this.service.getCharacteristic(this.hapChar.Active).onGet(() => {
-        if (!this.isOnline) {
-          throw new this.hapErr(-70402)
-        }
-        return this.service.getCharacteristic(this.hapChar.Active).value
-      })
-      this.service.getCharacteristic(this.hapChar.TargetHeaterCoolerState).onGet(() => {
+      this.service.getCharacteristic(this.hapChar.TargetHeatingCoolingState).onGet(() => {
         if (!this.isOnline) {
           throw new this.hapErr(-70402)
         }
-        return this.service.getCharacteristic(this.hapChar.TargetHeaterCoolerState).value
+        return this.service.getCharacteristic(this.hapChar.TargetHeatingCoolingState).value
       })
-      this.service.getCharacteristic(this.hapChar.CurrentHeaterCoolerState).onGet(() => {
+      this.service.getCharacteristic(this.hapChar.CurrentHeatingCoolingState).onGet(() => {
         if (!this.isOnline) {
           throw new this.hapErr(-70402)
         }
-        return this.service.getCharacteristic(this.hapChar.CurrentHeaterCoolerState).value
+        return this.service.getCharacteristic(this.hapChar.CurrentHeatingCoolingState).value
       })
-      this.service.getCharacteristic(this.hapChar.HeatingThresholdTemperature).onGet(() => {
+      this.service.getCharacteristic(this.hapChar.TargetTemperature).onGet(() => {
         if (!this.isOnline) {
           throw new this.hapErr(-70402)
         }
-        return this.service.getCharacteristic(this.hapChar.HeatingThresholdTemperature).value
+        return this.service.getCharacteristic(this.hapChar.TargetTemperature).value
       })
     }
 
     // Initialise these caches now since they aren't determined by the initial externalUpdate()
-    this.cacheState = this.service.getCharacteristic(this.hapChar.Active).value === 1 ? 'on' : 'off'
+    this.cacheState =
+      this.service.getCharacteristic(this.hapChar.TargetHeatingCoolingState).value === 3
+        ? 'on'
+        : 'off'
     this.cacheHeat =
       this.cacheState === 'on' &&
-      this.service.getCharacteristic(this.hapChar.TargetHeaterCoolerState).value === 2
+      this.service.getCharacteristic(this.hapChar.TargetTemperature).value >
+        this.service.getCharacteristic(this.hapChar.CurrentTemperature).value
         ? 'on'
         : 'off'
 
@@ -247,7 +236,7 @@ module.exports = class deviceThermostat {
       // Only send the update if either:
       // * The new value (state) is OFF and the cacheHeat was ON
       // * The new value (state) is ON and newHeat is 'on'
-      if ((value === 0 && this.cacheHeat === 'on') || (value === 1 && newHeat === 'on')) {
+      if ((value === 0 && this.cacheHeat === 'on') || (value === 3 && newHeat === 'on')) {
         await this.platform.sendDeviceUpdate(this.accessory, params)
       }
       if (newState !== this.cacheState) {
@@ -263,13 +252,16 @@ module.exports = class deviceThermostat {
         }
       }
       this.service.updateCharacteristic(
-        this.hapChar.CurrentHeaterCoolerState,
-        value === 1 ? (this.cacheHeat === 'on' ? 2 : 1) : 0
+        this.hapChar.CurrentHeatingCoolingState,
+        value === 3 ? 1 : 0
       )
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
-        this.service.updateCharacteristic(this.hapChar.Active, this.cacheState === 'on' ? 1 : 0)
+        this.service.updateCharacteristic(
+          this.hapChar.TargetHeatingCoolingState,
+          this.cacheState === 'on' ? 3 : 0
+        )
       }, 2000)
       throw new this.hapErr(-70402)
     }
@@ -307,14 +299,14 @@ module.exports = class deviceThermostat {
         this.log('[%s] %s [%s].', this.name, this.lang.curHeat, this.cacheHeat)
       }
       this.service.updateCharacteristic(
-        this.hapChar.CurrentHeaterCoolerState,
-        this.cacheHeat === 'on' ? 2 : 1
+        this.hapChar.CurrentHeatingCoolingState,
+        this.cacheHeat === 'on' ? 1 : 0
       )
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
         this.service.updateCharacteristic(
-          this.hapChar.HeatingThresholdTemperature,
+          this.hapChar.TargetTemperature,
           this.accessory.context.cacheTarget
         )
       }, 2000)
@@ -347,8 +339,8 @@ module.exports = class deviceThermostat {
         this.log('[%s] %s [%s].', this.name, this.lang.curHeat, this.cacheHeat)
       }
       this.service.updateCharacteristic(
-        this.hapChar.CurrentHeaterCoolerState,
-        this.cacheHeat === 'on' ? 2 : 1
+        this.hapChar.CurrentHeatingCoolingState,
+        this.cacheHeat === 'on' ? 1 : 0
       )
     } catch (err) {
       // Suppress errors here
@@ -405,10 +397,7 @@ module.exports = class deviceThermostat {
         newHumi = Math.max(Math.min(parseInt(newHumi), 100), 0)
         if (newHumi !== this.cacheHumi) {
           this.cacheHumi = newHumi
-          this.humiService.updateCharacteristic(
-            this.hapChar.CurrentRelativeHumidity,
-            this.cacheHumi
-          )
+          this.service.updateCharacteristic(this.hapChar.CurrentRelativeHumidity, this.cacheHumi)
           this.accessory.eveService.addEntry({ humidity: this.cacheHumi })
           if (params.updateSource && this.enableLogging) {
             this.log('[%s] %s [%s%].', this.name, this.lang.curHumi, this.cacheHumi)
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 5d133c59..9c0854d2 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -232,6 +232,7 @@ module.exports = {
       'switch_valve',
       'tap',
       'tap_two',
+      'thermostat',
       'valve',
       'valve_two',
       'valve_four',

From 2f9ce37719e6acb3d149b08af72465adc4aaf066 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 13 Nov 2021 09:39:16 +0000
Subject: [PATCH 2785/3183] 8.5.1-beta.12

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 56edc116..eca9cbd5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.5.1-beta.11",
+  "version": "8.5.1-beta.12",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.5.1-beta.11",
+      "version": "8.5.1-beta.12",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 3d776b0a..a95ae8ea 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.5.1-beta.11",
+  "version": "8.5.1-beta.12",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From 439ff90e3c641fc1c1f464af15d3dcf5cb91e502 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 13 Nov 2021 13:43:08 +0000
Subject: [PATCH 2786/3183] fix garage_two sim

---
 lib/device/simulation/garage-two.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/device/simulation/garage-two.js b/lib/device/simulation/garage-two.js
index 258bf130..ce8744bb 100644
--- a/lib/device/simulation/garage-two.js
+++ b/lib/device/simulation/garage-two.js
@@ -90,7 +90,7 @@ module.exports = class deviceGarageTwo {
       // Add the set handler to the target position characteristic
       gdService.getCharacteristic(this.hapChar.TargetDoorState).onSet(value => {
         // We don't use await as we want the callback to be run straight away
-        this.internalUpdate('Garage' + v, value)
+        this.internalUpdate('Garage ' + v, value)
       })
 
       // Add the get handlers only if the user hasn't disabled the disableNoResponse setting

From 3d45daaeda8fdc662bb0dd72e4354aab04dd583c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 13 Nov 2021 13:43:31 +0000
Subject: [PATCH 2787/3183] 8.5.1-beta.13

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index eca9cbd5..90c05b72 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.5.1-beta.12",
+  "version": "8.5.1-beta.13",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.5.1-beta.12",
+      "version": "8.5.1-beta.13",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index a95ae8ea..0888154e 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.5.1-beta.12",
+  "version": "8.5.1-beta.13",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From 44237508fec693ffa109ba51b7e187da0e27c58b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 13 Nov 2021 14:33:49 +0000
Subject: [PATCH 2788/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e247cc50..a16b031e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,11 +8,16 @@ All notable changes to homebridge-ewelink will be documented in this file.
 
 - The plugin will now retrieve devices from **all** your homes in your eWeLink account
 - Expose an RF Bridge `curtain` device type as a HomeKit `WindowCovering`, `Door` or `Window` accessory simulation
+- Expose a TH10/16 as a `Thermostat` device type
 
 ### Changed
 
 - Recommended Homebridge bumped to v1.3.6
 
+### Fixed
+
+- An issue initialising a 2-Garage-Door simulation
+
 ## 8.5.0 (2021-11-03)
 
 ### Added

From 07afd35d45c3a72555acfe853fdee58946d6b443 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 14 Nov 2021 00:11:29 +0000
Subject: [PATCH 2789/3183] add a couple more welcome messages

---
 lib/utils/lang-en.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/utils/lang-en.js b/lib/utils/lang-en.js
index fc58b6bb..67377b46 100644
--- a/lib/utils/lang-en.js
+++ b/lib/utils/lang-en.js
@@ -161,7 +161,9 @@ module.exports = {
     "Join the plugin's Discord community! https://discord.gg/cMGhNtZ3tW",
     'Thanks for using this plugin, I hope you find it helpful!',
     'This plugin has been made with ♥ by bwp91 from the UK!',
+    'Check out my other Homebridge plugins! https://github.com/bwp91',
     'Have time to give this plugin a review? http://bit.ly/hb-ewelink-review',
+    'This plugin currently has a 5☆ rating on HOOBS! http://bit.ly/hb-ewelink-review',
     'Want to see this plugin in your own language? Let me know!'
   ]
 }

From 796aaf28875c39541e4739f5384465614e364fd6 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 14 Nov 2021 11:14:04 +0000
Subject: [PATCH 2790/3183] update esversion for jshint

---
 lib/connection/api.js                     | 2 +-
 lib/connection/http.js                    | 2 +-
 lib/connection/lan.js                     | 2 +-
 lib/connection/ws.js                      | 2 +-
 lib/device/curtain.js                     | 2 +-
 lib/device/diffuser.js                    | 2 +-
 lib/device/fan.js                         | 2 +-
 lib/device/humidifier.js                  | 2 +-
 lib/device/light-cct.js                   | 2 +-
 lib/device/light-dimmer.js                | 2 +-
 lib/device/light-rgb-cct.js               | 2 +-
 lib/device/light-rgb.js                   | 2 +-
 lib/device/motor.js                       | 2 +-
 lib/device/outlet-multi.js                | 2 +-
 lib/device/outlet-single-inched.js        | 2 +-
 lib/device/outlet-single.js               | 2 +-
 lib/device/rf-bridge.js                   | 2 +-
 lib/device/rf-button.js                   | 2 +-
 lib/device/rf-sensor.js                   | 2 +-
 lib/device/sensor-ambient.js              | 2 +-
 lib/device/sensor-contact.js              | 2 +-
 lib/device/sensor-temp-humi.js            | 2 +-
 lib/device/simulation/blind.js            | 2 +-
 lib/device/simulation/cooler.js           | 2 +-
 lib/device/simulation/dehumidifier.js     | 2 +-
 lib/device/simulation/door.js             | 2 +-
 lib/device/simulation/doorbell.js         | 2 +-
 lib/device/simulation/garage-eachen.js    | 2 +-
 lib/device/simulation/garage-four.js      | 2 +-
 lib/device/simulation/garage-od-switch.js | 2 +-
 lib/device/simulation/garage-one.js       | 2 +-
 lib/device/simulation/garage-two.js       | 2 +-
 lib/device/simulation/gate-one.js         | 2 +-
 lib/device/simulation/heater.js           | 2 +-
 lib/device/simulation/humidifier.js       | 2 +-
 lib/device/simulation/lock-one.js         | 2 +-
 lib/device/simulation/p-button.js         | 2 +-
 lib/device/simulation/purifier.js         | 2 +-
 lib/device/simulation/rf-blind.js         | 2 +-
 lib/device/simulation/rf-door.js          | 2 +-
 lib/device/simulation/rf-window.js        | 2 +-
 lib/device/simulation/sensor-hidden.js    | 2 +-
 lib/device/simulation/sensor-leak.js      | 2 +-
 lib/device/simulation/sensor-visible.js   | 2 +-
 lib/device/simulation/sensor.js           | 2 +-
 lib/device/simulation/switch-valve.js     | 2 +-
 lib/device/simulation/tap-one.js          | 2 +-
 lib/device/simulation/tap-two.js          | 2 +-
 lib/device/simulation/thermostat.js       | 2 +-
 lib/device/simulation/valve-four.js       | 2 +-
 lib/device/simulation/valve-one.js        | 2 +-
 lib/device/simulation/valve-two.js        | 2 +-
 lib/device/simulation/window.js           | 2 +-
 lib/device/switch-multi.js                | 2 +-
 lib/device/switch-single-inched.js        | 2 +-
 lib/device/switch-single.js               | 2 +-
 lib/device/thermostat.js                  | 2 +-
 lib/device/zigbee/light-cct.js            | 2 +-
 lib/device/zigbee/light-dimmer.js         | 2 +-
 lib/device/zigbee/sensor-ambient.js       | 2 +-
 lib/device/zigbee/sensor-contact.js       | 2 +-
 lib/device/zigbee/sensor-leak.js          | 2 +-
 lib/device/zigbee/sensor-motion.js        | 2 +-
 lib/device/zigbee/switch-stateless.js     | 2 +-
 lib/fakegato/fakegato-history.js          | 2 +-
 lib/fakegato/fakegato-storage.js          | 2 +-
 lib/fakegato/fakegato-timer.js            | 2 +-
 lib/fakegato/uuid.js                      | 2 +-
 lib/homebridge-ui/server.js               | 2 +-
 lib/index.js                              | 2 +-
 lib/utils/colour-utils.js                 | 2 +-
 lib/utils/constants.js                    | 2 +-
 lib/utils/custom-chars.js                 | 2 +-
 lib/utils/eve-chars.js                    | 2 +-
 lib/utils/functions.js                    | 2 +-
 lib/utils/lang-en.js                      | 2 +-
 lib/utils/lang-fr.js                      | 2 +-
 77 files changed, 77 insertions(+), 77 deletions(-)

diff --git a/lib/connection/api.js b/lib/connection/api.js
index 14162cca..8d5ae527 100644
--- a/lib/connection/api.js
+++ b/lib/connection/api.js
@@ -1,4 +1,4 @@
-/* jshint node: true,esversion: 9, -W014, -W033 */
+/* jshint node: true, esversion: 10, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/connection/http.js b/lib/connection/http.js
index 62b1bfb6..397e8ed0 100644
--- a/lib/connection/http.js
+++ b/lib/connection/http.js
@@ -1,4 +1,4 @@
-/* jshint node: true,esversion: 9, -W014, -W033 */
+/* jshint node: true, esversion: 10, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/connection/lan.js b/lib/connection/lan.js
index 3bd9dbfb..f8da9659 100644
--- a/lib/connection/lan.js
+++ b/lib/connection/lan.js
@@ -1,4 +1,4 @@
-/* jshint node: true,esversion: 9, -W014, -W033 */
+/* jshint node: true, esversion: 10, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/connection/ws.js b/lib/connection/ws.js
index 1a8ded65..793558b6 100644
--- a/lib/connection/ws.js
+++ b/lib/connection/ws.js
@@ -1,4 +1,4 @@
-/* jshint node: true,esversion: 9, -W014, -W033 */
+/* jshint node: true, esversion: 10, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/curtain.js b/lib/device/curtain.js
index 6384be46..59604c19 100644
--- a/lib/device/curtain.js
+++ b/lib/device/curtain.js
@@ -1,4 +1,4 @@
-/* jshint node: true,esversion: 9, -W014, -W033 */
+/* jshint node: true, esversion: 10, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/diffuser.js b/lib/device/diffuser.js
index e82eb9e5..68e99154 100644
--- a/lib/device/diffuser.js
+++ b/lib/device/diffuser.js
@@ -1,4 +1,4 @@
-/* jshint node: true,esversion: 9, -W014, -W033 */
+/* jshint node: true, esversion: 10, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/fan.js b/lib/device/fan.js
index c4d8ed1d..5d4c46d3 100644
--- a/lib/device/fan.js
+++ b/lib/device/fan.js
@@ -1,4 +1,4 @@
-/* jshint node: true,esversion: 9, -W014, -W033 */
+/* jshint node: true, esversion: 10, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/humidifier.js b/lib/device/humidifier.js
index c2ab26c0..b034b615 100644
--- a/lib/device/humidifier.js
+++ b/lib/device/humidifier.js
@@ -1,4 +1,4 @@
-/* jshint node: true,esversion: 9, -W014, -W033 */
+/* jshint node: true, esversion: 10, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/light-cct.js b/lib/device/light-cct.js
index ee753c9e..b2ea4eea 100644
--- a/lib/device/light-cct.js
+++ b/lib/device/light-cct.js
@@ -1,4 +1,4 @@
-/* jshint node: true,esversion: 9, -W014, -W033 */
+/* jshint node: true, esversion: 10, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/light-dimmer.js b/lib/device/light-dimmer.js
index 71773b0c..6ec647c5 100644
--- a/lib/device/light-dimmer.js
+++ b/lib/device/light-dimmer.js
@@ -1,4 +1,4 @@
-/* jshint node: true,esversion: 9, -W014, -W033 */
+/* jshint node: true, esversion: 10, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/light-rgb-cct.js b/lib/device/light-rgb-cct.js
index 496b66d5..75afa1c3 100644
--- a/lib/device/light-rgb-cct.js
+++ b/lib/device/light-rgb-cct.js
@@ -1,4 +1,4 @@
-/* jshint node: true,esversion: 9, -W014, -W033 */
+/* jshint node: true, esversion: 10, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/light-rgb.js b/lib/device/light-rgb.js
index 7768b4d5..0ad54476 100644
--- a/lib/device/light-rgb.js
+++ b/lib/device/light-rgb.js
@@ -1,4 +1,4 @@
-/* jshint node: true,esversion: 9, -W014, -W033 */
+/* jshint node: true, esversion: 10, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/motor.js b/lib/device/motor.js
index d1365847..79a87430 100644
--- a/lib/device/motor.js
+++ b/lib/device/motor.js
@@ -1,4 +1,4 @@
-/* jshint node: true,esversion: 9, -W014, -W033 */
+/* jshint node: true, esversion: 10, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/outlet-multi.js b/lib/device/outlet-multi.js
index 29491f8c..360dd67b 100644
--- a/lib/device/outlet-multi.js
+++ b/lib/device/outlet-multi.js
@@ -1,4 +1,4 @@
-/* jshint node: true,esversion: 9, -W014, -W033 */
+/* jshint node: true, esversion: 10, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/outlet-single-inched.js b/lib/device/outlet-single-inched.js
index 9f12a7f0..5388f748 100644
--- a/lib/device/outlet-single-inched.js
+++ b/lib/device/outlet-single-inched.js
@@ -1,4 +1,4 @@
-/* jshint node: true,esversion: 9, -W014, -W033 */
+/* jshint node: true, esversion: 10, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/outlet-single.js b/lib/device/outlet-single.js
index 7e242c85..440d9da0 100644
--- a/lib/device/outlet-single.js
+++ b/lib/device/outlet-single.js
@@ -1,4 +1,4 @@
-/* jshint node: true,esversion: 9, -W014, -W033 */
+/* jshint node: true, esversion: 10, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/rf-bridge.js b/lib/device/rf-bridge.js
index 100602fe..e755f7b9 100644
--- a/lib/device/rf-bridge.js
+++ b/lib/device/rf-bridge.js
@@ -1,4 +1,4 @@
-/* jshint node: true,esversion: 9, -W014, -W033 */
+/* jshint node: true, esversion: 10, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/rf-button.js b/lib/device/rf-button.js
index e6c950dc..7bb1d93d 100644
--- a/lib/device/rf-button.js
+++ b/lib/device/rf-button.js
@@ -1,4 +1,4 @@
-/* jshint node: true,esversion: 9, -W014, -W033 */
+/* jshint node: true, esversion: 10, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/rf-sensor.js b/lib/device/rf-sensor.js
index 89752f08..61974d88 100644
--- a/lib/device/rf-sensor.js
+++ b/lib/device/rf-sensor.js
@@ -1,4 +1,4 @@
-/* jshint node: true,esversion: 9, -W014, -W033 */
+/* jshint node: true, esversion: 10, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/sensor-ambient.js b/lib/device/sensor-ambient.js
index 3c967baa..5e83b6e9 100644
--- a/lib/device/sensor-ambient.js
+++ b/lib/device/sensor-ambient.js
@@ -1,4 +1,4 @@
-/* jshint node: true,esversion: 9, -W014, -W033 */
+/* jshint node: true, esversion: 10, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/sensor-contact.js b/lib/device/sensor-contact.js
index 8e46f372..d4f6226f 100644
--- a/lib/device/sensor-contact.js
+++ b/lib/device/sensor-contact.js
@@ -1,4 +1,4 @@
-/* jshint node: true,esversion: 9, -W014, -W033 */
+/* jshint node: true, esversion: 10, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/sensor-temp-humi.js b/lib/device/sensor-temp-humi.js
index f8c61f65..cb7c45ab 100644
--- a/lib/device/sensor-temp-humi.js
+++ b/lib/device/sensor-temp-humi.js
@@ -1,4 +1,4 @@
-/* jshint node: true,esversion: 9, -W014, -W033 */
+/* jshint node: true, esversion: 10, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/simulation/blind.js b/lib/device/simulation/blind.js
index b1ed2ded..6928fc69 100644
--- a/lib/device/simulation/blind.js
+++ b/lib/device/simulation/blind.js
@@ -1,4 +1,4 @@
-/* jshint node: true,esversion: 9, -W014, -W033 */
+/* jshint node: true, esversion: 10, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/simulation/cooler.js b/lib/device/simulation/cooler.js
index 0f2280d2..c1e22c02 100644
--- a/lib/device/simulation/cooler.js
+++ b/lib/device/simulation/cooler.js
@@ -1,4 +1,4 @@
-/* jshint node: true,esversion: 9, -W014, -W033 */
+/* jshint node: true, esversion: 10, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/simulation/dehumidifier.js b/lib/device/simulation/dehumidifier.js
index d9bdca0e..68e6947d 100644
--- a/lib/device/simulation/dehumidifier.js
+++ b/lib/device/simulation/dehumidifier.js
@@ -1,4 +1,4 @@
-/* jshint node: true,esversion: 9, -W014, -W033 */
+/* jshint node: true, esversion: 10, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/simulation/door.js b/lib/device/simulation/door.js
index a3ddbd73..ac266a84 100644
--- a/lib/device/simulation/door.js
+++ b/lib/device/simulation/door.js
@@ -1,4 +1,4 @@
-/* jshint node: true,esversion: 9, -W014, -W033 */
+/* jshint node: true, esversion: 10, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/simulation/doorbell.js b/lib/device/simulation/doorbell.js
index 4333a5ac..8e08ada7 100644
--- a/lib/device/simulation/doorbell.js
+++ b/lib/device/simulation/doorbell.js
@@ -1,4 +1,4 @@
-/* jshint node: true,esversion: 9, -W014, -W033 */
+/* jshint node: true, esversion: 10, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/simulation/garage-eachen.js b/lib/device/simulation/garage-eachen.js
index 4e27313d..279476af 100644
--- a/lib/device/simulation/garage-eachen.js
+++ b/lib/device/simulation/garage-eachen.js
@@ -1,4 +1,4 @@
-/* jshint node: true,esversion: 9, -W014, -W033 */
+/* jshint node: true, esversion: 10, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/simulation/garage-four.js b/lib/device/simulation/garage-four.js
index e8b621f3..79d69ed2 100644
--- a/lib/device/simulation/garage-four.js
+++ b/lib/device/simulation/garage-four.js
@@ -1,4 +1,4 @@
-/* jshint node: true,esversion: 9, -W014, -W033 */
+/* jshint node: true, esversion: 10, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/simulation/garage-od-switch.js b/lib/device/simulation/garage-od-switch.js
index fc316879..cf6de206 100644
--- a/lib/device/simulation/garage-od-switch.js
+++ b/lib/device/simulation/garage-od-switch.js
@@ -1,4 +1,4 @@
-/* jshint node: true,esversion: 9, -W014, -W033 */
+/* jshint node: true, esversion: 10, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/simulation/garage-one.js b/lib/device/simulation/garage-one.js
index aa2e8bcb..4792e6d4 100644
--- a/lib/device/simulation/garage-one.js
+++ b/lib/device/simulation/garage-one.js
@@ -1,4 +1,4 @@
-/* jshint node: true,esversion: 9, -W014, -W033 */
+/* jshint node: true, esversion: 10, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/simulation/garage-two.js b/lib/device/simulation/garage-two.js
index ce8744bb..503df199 100644
--- a/lib/device/simulation/garage-two.js
+++ b/lib/device/simulation/garage-two.js
@@ -1,4 +1,4 @@
-/* jshint node: true,esversion: 9, -W014, -W033 */
+/* jshint node: true, esversion: 10, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/simulation/gate-one.js b/lib/device/simulation/gate-one.js
index 0f9a72c5..8cf6343e 100644
--- a/lib/device/simulation/gate-one.js
+++ b/lib/device/simulation/gate-one.js
@@ -1,4 +1,4 @@
-/* jshint node: true,esversion: 9, -W014, -W033 */
+/* jshint node: true, esversion: 10, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/simulation/heater.js b/lib/device/simulation/heater.js
index c93ac382..b49a7e43 100644
--- a/lib/device/simulation/heater.js
+++ b/lib/device/simulation/heater.js
@@ -1,4 +1,4 @@
-/* jshint node: true,esversion: 9, -W014, -W033 */
+/* jshint node: true, esversion: 10, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/simulation/humidifier.js b/lib/device/simulation/humidifier.js
index 32d808c0..7171d80f 100644
--- a/lib/device/simulation/humidifier.js
+++ b/lib/device/simulation/humidifier.js
@@ -1,4 +1,4 @@
-/* jshint node: true,esversion: 9, -W014, -W033 */
+/* jshint node: true, esversion: 10, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/simulation/lock-one.js b/lib/device/simulation/lock-one.js
index 9f8768a9..83052036 100644
--- a/lib/device/simulation/lock-one.js
+++ b/lib/device/simulation/lock-one.js
@@ -1,4 +1,4 @@
-/* jshint node: true,esversion: 9, -W014, -W033 */
+/* jshint node: true, esversion: 10, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/simulation/p-button.js b/lib/device/simulation/p-button.js
index 22c7e124..05853d7c 100644
--- a/lib/device/simulation/p-button.js
+++ b/lib/device/simulation/p-button.js
@@ -1,4 +1,4 @@
-/* jshint node: true,esversion: 9, -W014, -W033 */
+/* jshint node: true, esversion: 10, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/simulation/purifier.js b/lib/device/simulation/purifier.js
index ddb0e346..b9b69410 100644
--- a/lib/device/simulation/purifier.js
+++ b/lib/device/simulation/purifier.js
@@ -1,4 +1,4 @@
-/* jshint node: true,esversion: 9, -W014, -W033 */
+/* jshint node: true, esversion: 10, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/simulation/rf-blind.js b/lib/device/simulation/rf-blind.js
index 4cecd849..a1e24c3f 100644
--- a/lib/device/simulation/rf-blind.js
+++ b/lib/device/simulation/rf-blind.js
@@ -1,4 +1,4 @@
-/* jshint node: true,esversion: 9, -W014, -W033 */
+/* jshint node: true, esversion: 10, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/simulation/rf-door.js b/lib/device/simulation/rf-door.js
index dd0548ff..b590925c 100644
--- a/lib/device/simulation/rf-door.js
+++ b/lib/device/simulation/rf-door.js
@@ -1,4 +1,4 @@
-/* jshint node: true,esversion: 9, -W014, -W033 */
+/* jshint node: true, esversion: 10, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/simulation/rf-window.js b/lib/device/simulation/rf-window.js
index 17d9ef71..27eb3961 100644
--- a/lib/device/simulation/rf-window.js
+++ b/lib/device/simulation/rf-window.js
@@ -1,4 +1,4 @@
-/* jshint node: true,esversion: 9, -W014, -W033 */
+/* jshint node: true, esversion: 10, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/simulation/sensor-hidden.js b/lib/device/simulation/sensor-hidden.js
index 087c5a26..f037d635 100644
--- a/lib/device/simulation/sensor-hidden.js
+++ b/lib/device/simulation/sensor-hidden.js
@@ -1,4 +1,4 @@
-/* jshint node: true,esversion: 9, -W014, -W033 */
+/* jshint node: true, esversion: 10, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/simulation/sensor-leak.js b/lib/device/simulation/sensor-leak.js
index cba271fc..a4bef30a 100644
--- a/lib/device/simulation/sensor-leak.js
+++ b/lib/device/simulation/sensor-leak.js
@@ -1,4 +1,4 @@
-/* jshint node: true,esversion: 9, -W014, -W033 */
+/* jshint node: true, esversion: 10, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/simulation/sensor-visible.js b/lib/device/simulation/sensor-visible.js
index 83b25535..eaacfcd0 100644
--- a/lib/device/simulation/sensor-visible.js
+++ b/lib/device/simulation/sensor-visible.js
@@ -1,4 +1,4 @@
-/* jshint node: true,esversion: 9, -W014, -W033 */
+/* jshint node: true, esversion: 10, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/simulation/sensor.js b/lib/device/simulation/sensor.js
index 223b9533..1552d072 100644
--- a/lib/device/simulation/sensor.js
+++ b/lib/device/simulation/sensor.js
@@ -1,4 +1,4 @@
-/* jshint node: true,esversion: 9, -W014, -W033 */
+/* jshint node: true, esversion: 10, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/simulation/switch-valve.js b/lib/device/simulation/switch-valve.js
index 9e14bd14..3aaf8de2 100644
--- a/lib/device/simulation/switch-valve.js
+++ b/lib/device/simulation/switch-valve.js
@@ -1,4 +1,4 @@
-/* jshint node: true,esversion: 9, -W014, -W033 */
+/* jshint node: true, esversion: 10, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/simulation/tap-one.js b/lib/device/simulation/tap-one.js
index cb475469..0141e45d 100644
--- a/lib/device/simulation/tap-one.js
+++ b/lib/device/simulation/tap-one.js
@@ -1,4 +1,4 @@
-/* jshint node: true,esversion: 9, -W014, -W033 */
+/* jshint node: true, esversion: 10, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/simulation/tap-two.js b/lib/device/simulation/tap-two.js
index 467f0591..05841f9d 100644
--- a/lib/device/simulation/tap-two.js
+++ b/lib/device/simulation/tap-two.js
@@ -1,4 +1,4 @@
-/* jshint node: true,esversion: 9, -W014, -W033 */
+/* jshint node: true, esversion: 10, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/simulation/thermostat.js b/lib/device/simulation/thermostat.js
index 0d05a0ce..66679a4a 100644
--- a/lib/device/simulation/thermostat.js
+++ b/lib/device/simulation/thermostat.js
@@ -1,4 +1,4 @@
-/* jshint node: true,esversion: 9, -W014, -W033 */
+/* jshint node: true, esversion: 10, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/simulation/valve-four.js b/lib/device/simulation/valve-four.js
index 48439383..6f478a82 100644
--- a/lib/device/simulation/valve-four.js
+++ b/lib/device/simulation/valve-four.js
@@ -1,4 +1,4 @@
-/* jshint node: true,esversion: 9, -W014, -W033 */
+/* jshint node: true, esversion: 10, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/simulation/valve-one.js b/lib/device/simulation/valve-one.js
index 68679ac3..db64199c 100644
--- a/lib/device/simulation/valve-one.js
+++ b/lib/device/simulation/valve-one.js
@@ -1,4 +1,4 @@
-/* jshint node: true,esversion: 9, -W014, -W033 */
+/* jshint node: true, esversion: 10, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/simulation/valve-two.js b/lib/device/simulation/valve-two.js
index 8b805816..2234b290 100644
--- a/lib/device/simulation/valve-two.js
+++ b/lib/device/simulation/valve-two.js
@@ -1,4 +1,4 @@
-/* jshint node: true,esversion: 9, -W014, -W033 */
+/* jshint node: true, esversion: 10, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/simulation/window.js b/lib/device/simulation/window.js
index a8763281..53d696b3 100644
--- a/lib/device/simulation/window.js
+++ b/lib/device/simulation/window.js
@@ -1,4 +1,4 @@
-/* jshint node: true,esversion: 9, -W014, -W033 */
+/* jshint node: true, esversion: 10, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/switch-multi.js b/lib/device/switch-multi.js
index 55ac23f4..50852c98 100644
--- a/lib/device/switch-multi.js
+++ b/lib/device/switch-multi.js
@@ -1,4 +1,4 @@
-/* jshint node: true,esversion: 9, -W014, -W033 */
+/* jshint node: true, esversion: 10, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/switch-single-inched.js b/lib/device/switch-single-inched.js
index c568e9bc..775e5273 100644
--- a/lib/device/switch-single-inched.js
+++ b/lib/device/switch-single-inched.js
@@ -1,4 +1,4 @@
-/* jshint node: true,esversion: 9, -W014, -W033 */
+/* jshint node: true, esversion: 10, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/switch-single.js b/lib/device/switch-single.js
index eed6ef60..63750fe9 100644
--- a/lib/device/switch-single.js
+++ b/lib/device/switch-single.js
@@ -1,4 +1,4 @@
-/* jshint node: true,esversion: 9, -W014, -W033 */
+/* jshint node: true, esversion: 10, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/thermostat.js b/lib/device/thermostat.js
index d1be3e8f..04f5726a 100644
--- a/lib/device/thermostat.js
+++ b/lib/device/thermostat.js
@@ -1,4 +1,4 @@
-/* jshint node: true,esversion: 9, -W014, -W033 */
+/* jshint node: true, esversion: 10, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/zigbee/light-cct.js b/lib/device/zigbee/light-cct.js
index 3f13b42c..8060061f 100644
--- a/lib/device/zigbee/light-cct.js
+++ b/lib/device/zigbee/light-cct.js
@@ -1,4 +1,4 @@
-/* jshint node: true,esversion: 9, -W014, -W033 */
+/* jshint node: true, esversion: 10, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/zigbee/light-dimmer.js b/lib/device/zigbee/light-dimmer.js
index 757184f9..463ccdf3 100644
--- a/lib/device/zigbee/light-dimmer.js
+++ b/lib/device/zigbee/light-dimmer.js
@@ -1,4 +1,4 @@
-/* jshint node: true,esversion: 9, -W014, -W033 */
+/* jshint node: true, esversion: 10, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/zigbee/sensor-ambient.js b/lib/device/zigbee/sensor-ambient.js
index b72359ce..90717f0c 100644
--- a/lib/device/zigbee/sensor-ambient.js
+++ b/lib/device/zigbee/sensor-ambient.js
@@ -1,4 +1,4 @@
-/* jshint node: true,esversion: 9, -W014, -W033 */
+/* jshint node: true, esversion: 10, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/zigbee/sensor-contact.js b/lib/device/zigbee/sensor-contact.js
index 3fdd6cda..e76cbde1 100644
--- a/lib/device/zigbee/sensor-contact.js
+++ b/lib/device/zigbee/sensor-contact.js
@@ -1,4 +1,4 @@
-/* jshint node: true,esversion: 9, -W014, -W033 */
+/* jshint node: true, esversion: 10, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/zigbee/sensor-leak.js b/lib/device/zigbee/sensor-leak.js
index 2f10e7c5..b0c96c23 100644
--- a/lib/device/zigbee/sensor-leak.js
+++ b/lib/device/zigbee/sensor-leak.js
@@ -1,4 +1,4 @@
-/* jshint node: true,esversion: 9, -W014, -W033 */
+/* jshint node: true, esversion: 10, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/zigbee/sensor-motion.js b/lib/device/zigbee/sensor-motion.js
index 934aa8fd..74b7130f 100644
--- a/lib/device/zigbee/sensor-motion.js
+++ b/lib/device/zigbee/sensor-motion.js
@@ -1,4 +1,4 @@
-/* jshint node: true,esversion: 9, -W014, -W033 */
+/* jshint node: true, esversion: 10, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/device/zigbee/switch-stateless.js b/lib/device/zigbee/switch-stateless.js
index 9b8c15c9..fec5b8e2 100644
--- a/lib/device/zigbee/switch-stateless.js
+++ b/lib/device/zigbee/switch-stateless.js
@@ -1,4 +1,4 @@
-/* jshint node: true,esversion: 9, -W014, -W033 */
+/* jshint node: true, esversion: 10, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/fakegato/fakegato-history.js b/lib/fakegato/fakegato-history.js
index 121fdd36..794b61fe 100644
--- a/lib/fakegato/fakegato-history.js
+++ b/lib/fakegato/fakegato-history.js
@@ -1,4 +1,4 @@
-/* jshint node: true,esversion: 9, -W014, -W033 */
+/* jshint node: true, esversion: 10, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/fakegato/fakegato-storage.js b/lib/fakegato/fakegato-storage.js
index 61068d58..fdb39838 100644
--- a/lib/fakegato/fakegato-storage.js
+++ b/lib/fakegato/fakegato-storage.js
@@ -1,4 +1,4 @@
-/* jshint node: true,esversion: 9, -W014, -W033 */
+/* jshint node: true, esversion: 10, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/fakegato/fakegato-timer.js b/lib/fakegato/fakegato-timer.js
index f03d9062..e2235e37 100644
--- a/lib/fakegato/fakegato-timer.js
+++ b/lib/fakegato/fakegato-timer.js
@@ -1,4 +1,4 @@
-/* jshint node: true,esversion: 9, -W014, -W033 */
+/* jshint node: true, esversion: 10, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/fakegato/uuid.js b/lib/fakegato/uuid.js
index 821e80c2..e63a81bb 100644
--- a/lib/fakegato/uuid.js
+++ b/lib/fakegato/uuid.js
@@ -1,4 +1,4 @@
-/* jshint node: true,esversion: 9, -W014, -W033 */
+/* jshint node: true, esversion: 10, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/homebridge-ui/server.js b/lib/homebridge-ui/server.js
index 4dd99adf..f47a8cd2 100644
--- a/lib/homebridge-ui/server.js
+++ b/lib/homebridge-ui/server.js
@@ -1,4 +1,4 @@
-/* jshint node: true,esversion: 9, -W014, -W033 */
+/* jshint node: true, esversion: 10, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/index.js b/lib/index.js
index 7041fdf7..f8b8368a 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1,4 +1,4 @@
-/* jshint node: true,esversion: 9, -W014, -W033 */
+/* jshint node: true, esversion: 10, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/utils/colour-utils.js b/lib/utils/colour-utils.js
index 785a01e0..6c1059fe 100644
--- a/lib/utils/colour-utils.js
+++ b/lib/utils/colour-utils.js
@@ -1,4 +1,4 @@
-/* jshint node: true,esversion: 9, -W014, -W033 */
+/* jshint node: true, esversion: 10, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 9c0854d2..fcec6228 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -1,4 +1,4 @@
-/* jshint node: true,esversion: 9, -W014, -W033 */
+/* jshint node: true, esversion: 10, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/utils/custom-chars.js b/lib/utils/custom-chars.js
index e33ac577..0cd205d3 100644
--- a/lib/utils/custom-chars.js
+++ b/lib/utils/custom-chars.js
@@ -1,4 +1,4 @@
-/* jshint node: true,esversion: 9, -W014, -W033 */
+/* jshint node: true, esversion: 10, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/utils/eve-chars.js b/lib/utils/eve-chars.js
index bb357ca8..5ed8d31f 100644
--- a/lib/utils/eve-chars.js
+++ b/lib/utils/eve-chars.js
@@ -1,4 +1,4 @@
-/* jshint node: true,esversion: 9, -W014, -W033 */
+/* jshint node: true, esversion: 10, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/utils/functions.js b/lib/utils/functions.js
index 3dbf5705..d4d67c08 100644
--- a/lib/utils/functions.js
+++ b/lib/utils/functions.js
@@ -1,4 +1,4 @@
-/* jshint node: true,esversion: 9, -W014, -W033 */
+/* jshint node: true, esversion: 10, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/utils/lang-en.js b/lib/utils/lang-en.js
index 67377b46..14c21eb5 100644
--- a/lib/utils/lang-en.js
+++ b/lib/utils/lang-en.js
@@ -1,4 +1,4 @@
-/* jshint node: true,esversion: 9, -W014, -W033 */
+/* jshint node: true, esversion: 10, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 
diff --git a/lib/utils/lang-fr.js b/lib/utils/lang-fr.js
index 39a8c71f..7e01d58e 100644
--- a/lib/utils/lang-fr.js
+++ b/lib/utils/lang-fr.js
@@ -1,4 +1,4 @@
-/* jshint node: true,esversion: 9, -W014, -W033 */
+/* jshint node: true, esversion: 10, -W014, -W033 */
 /* eslint-disable new-cap */
 'use strict'
 

From 6b5803f6d5128020fa22b41477b4c295f7a0cc9e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 18 Nov 2021 08:01:20 +0000
Subject: [PATCH 2791/3183] revert hb version bump

---
 CHANGELOG.md      | 4 ----
 package-lock.json | 2 +-
 package.json      | 2 +-
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a16b031e..abaa342c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,10 +10,6 @@ All notable changes to homebridge-ewelink will be documented in this file.
 - Expose an RF Bridge `curtain` device type as a HomeKit `WindowCovering`, `Door` or `Window` accessory simulation
 - Expose a TH10/16 as a `Thermostat` device type
 
-### Changed
-
-- Recommended Homebridge bumped to v1.3.6
-
 ### Fixed
 
 - An issue initialising a 2-Garage-Door simulation
diff --git a/package-lock.json b/package-lock.json
index 90c05b72..43c47ddf 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -35,7 +35,7 @@
         "ws": "^8.2.3"
       },
       "engines": {
-        "homebridge": "^1.3.6",
+        "homebridge": "^1.3.5",
         "node": "^14.18.1 || ^16.13.0"
       }
     },
diff --git a/package.json b/package.json
index 0888154e..f608f362 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,7 @@
   ],
   "main": "lib/index.js",
   "engines": {
-    "homebridge": "^1.3.6",
+    "homebridge": "^1.3.5",
     "node": "^14.18.1 || ^16.13.0"
   },
   "repository": {

From dcd36915ccfdd7cb482ba528bda5506c6cfeec15 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 18 Nov 2021 08:01:37 +0000
Subject: [PATCH 2792/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index abaa342c..e9262b9c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 All notable changes to homebridge-ewelink will be documented in this file.
 
-## BETA
+## 8.6.0 (2021-11-18)
 
 ### Added
 

From e61a91bb084b5545e2244db16cb511565f4eb724 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 18 Nov 2021 08:01:58 +0000
Subject: [PATCH 2793/3183] 8.6.0

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 43c47ddf..9594580c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.5.1-beta.13",
+  "version": "8.6.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.5.1-beta.13",
+      "version": "8.6.0",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index f608f362..3c0aab42 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.5.1-beta.13",
+  "version": "8.6.0",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From fa5719b30a912bfd22843982e3f183774b2ccf8c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 19 Nov 2021 07:43:05 +0000
Subject: [PATCH 2794/3183] bump hb version back to 1.3.6

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 9594580c..e6fb1d11 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -35,7 +35,7 @@
         "ws": "^8.2.3"
       },
       "engines": {
-        "homebridge": "^1.3.5",
+        "homebridge": "^1.3.6",
         "node": "^14.18.1 || ^16.13.0"
       }
     },
diff --git a/package.json b/package.json
index 3c0aab42..bbc256cc 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,7 @@
   ],
   "main": "lib/index.js",
   "engines": {
-    "homebridge": "^1.3.5",
+    "homebridge": "^1.3.6",
     "node": "^14.18.1 || ^16.13.0"
   },
   "repository": {

From 5c4fcc72f1f12166427bbe27e2954e9453e5222a Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 20 Nov 2021 14:12:20 +0000
Subject: [PATCH 2795/3183] add tv simulation

---
 config.schema.json          |   8 ++
 lib/device/simulation/tv.js | 258 ++++++++++++++++++++++++++++++++++++
 lib/index.js                |  15 ++-
 lib/utils/constants.js      |   1 +
 4 files changed, 278 insertions(+), 4 deletions(-)
 create mode 100644 lib/device/simulation/tv.js

diff --git a/config.schema.json b/config.schema.json
index 55f29ba4..ef7c274e 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -255,6 +255,10 @@
                 {
                   "title": "1 Tap/Faucet",
                   "enum": ["tap"]
+                },
+                {
+                  "title": "1 Television",
+                  "enum": ["tv"]
                 }
               ],
               "condition": {
@@ -564,6 +568,10 @@
                   "title": "2 Taps/Faucets",
                   "enum": ["tap_two"]
                 },
+                {
+                  "title": "1 Television",
+                  "enum": ["tv"]
+                },
                 {
                   "title": "1 Window",
                   "enum": ["window"]
diff --git a/lib/device/simulation/tv.js b/lib/device/simulation/tv.js
new file mode 100644
index 00000000..aa1329b6
--- /dev/null
+++ b/lib/device/simulation/tv.js
@@ -0,0 +1,258 @@
+/* jshint node: true, esversion: 10, -W014, -W033 */
+/* eslint-disable new-cap */
+'use strict'
+
+module.exports = class deviceTelevision {
+  constructor (platform, accessory) {
+    // Set up variables from the platform
+    this.eveChar = platform.eveChar
+    this.funcs = platform.funcs
+    this.hapChar = platform.api.hap.Characteristic
+    this.hapErr = platform.api.hap.HapStatusError
+    this.hapServ = platform.api.hap.Service
+    this.lang = platform.lang
+    this.log = platform.log
+    this.platform = platform
+
+    // Set up variables from the accessory
+    this.name = accessory.displayName
+    this.accessory = accessory
+
+    // Initially set the online flag as true (to be then updated as false if necessary)
+    this.isOnline = true
+
+    // Set up custom variables for this device type
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
+
+    // Set the correct logging variables for this accessory
+    this.enableLogging = !platform.config.disableDeviceLogging
+    this.enableDebugLogging = platform.config.debug
+    if (deviceConf && deviceConf.overrideLogging) {
+      switch (deviceConf.overrideLogging) {
+        case 'standard':
+          this.enableLogging = true
+          this.enableDebugLogging = false
+          break
+        case 'debug':
+          this.enableLogging = true
+          this.enableDebugLogging = true
+          break
+        case 'disable':
+          this.enableLogging = false
+          this.enableDebugLogging = false
+          break
+      }
+    }
+
+    // If the accessory has a switch service then remove it
+    if (this.accessory.getService(this.hapServ.Switch)) {
+      this.accessory.removeService(this.accessory.getService(this.hapServ.Switch))
+    }
+
+    // Add the tv service if it doesn't already exist
+    this.service =
+      this.accessory.getService(this.hapServ.Television) ||
+      this.accessory.addService(this.hapServ.Television)
+
+    // Set up the device type and power readings if necessary
+    if (platform.consts.devices.switchSingle.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'switchSingle'
+    } else if (platform.consts.devices.switchSinglePower.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'switchSingle'
+
+      // Add Eve power characteristics
+      this.powerReadings = true
+      if (!this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
+        this.service.addCharacteristic(this.eveChar.CurrentConsumption)
+      }
+      if (this.accessory.context.eweUIID === 32) {
+        if (!this.service.testCharacteristic(this.eveChar.ElectricCurrent)) {
+          this.service.addCharacteristic(this.eveChar.ElectricCurrent)
+        }
+        if (!this.service.testCharacteristic(this.eveChar.Voltage)) {
+          this.service.addCharacteristic(this.eveChar.Voltage)
+        }
+      }
+    } else if (platform.consts.devices.switchMulti.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'switchMulti'
+      if (platform.consts.devices.switchMultiPower.includes(this.accessory.context.eweUIID)) {
+        // Add Eve power characteristics
+        this.powerReadings = true
+        if (!this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
+          this.service.addCharacteristic(this.eveChar.CurrentConsumption)
+        }
+        if (!this.service.testCharacteristic(this.eveChar.ElectricCurrent)) {
+          this.service.addCharacteristic(this.eveChar.ElectricCurrent)
+        }
+        if (!this.service.testCharacteristic(this.eveChar.Voltage)) {
+          this.service.addCharacteristic(this.eveChar.Voltage)
+        }
+        this.isDualR3 = true
+      }
+    } else if (platform.consts.devices.switchSCM.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'switchMulti'
+    }
+
+    // Add the set handler to the tap active characteristic
+    this.service.getCharacteristic(this.hapChar.Active).onSet(async value => {
+      await this.internalUpdate(value)
+    })
+
+    // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
+    if (!platform.config.disableNoResponse) {
+      this.service.getCharacteristic(this.hapChar.Active).onGet(() => {
+        if (!this.isOnline) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.Active).value
+      })
+    }
+
+    // Set up an interval to get eWeLink to send power updates
+    if (
+      this.powerReadings &&
+      (!this.isDualR3 || (this.isDualR3 && platform.config.mode !== 'lan'))
+    ) {
+      setTimeout(() => {
+        this.internalUIUpdate()
+        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
+      }, 5000)
+
+      // Stop the intervals on Homebridge shutdown
+      platform.api.on('shutdown', () => {
+        clearInterval(this.intervalPoll)
+      })
+    }
+
+    // Output the customised options to the log
+    const opts = JSON.stringify({
+      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
+      showAs: 'tv'
+    })
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
+  }
+
+  async internalUpdate (value) {
+    try {
+      const params = {}
+      switch (this.setup) {
+        case 'switchSingle':
+          params.switch = value === 1 ? 'on' : 'off'
+          break
+        case 'switchMulti':
+          params.switches = [
+            {
+              switch: value === 1 ? 'on' : 'off',
+              outlet: 0
+            }
+          ]
+          break
+        default:
+          return
+      }
+      await this.platform.sendDeviceUpdate(this.accessory, params)
+      this.cacheState = value === 1 ? 'on' : 'off'
+      if (this.enableLogging) {
+        this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
+      }
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, true)
+      setTimeout(() => {
+        this.service.updateCharacteristic(this.hapChar.Active, this.cacheState === 'on' ? 1 : 0)
+      }, 2000)
+      throw new this.hapErr(-70402)
+    }
+  }
+
+  async internalUIUpdate () {
+    try {
+      // Skip polling if device isn't online
+      if (!this.isOnline) {
+        return
+      }
+
+      // Send the params to request the updates
+      if (this.isDualR3) {
+        await this.platform.sendDeviceUpdate(this.accessory, { uiActive: { outlet: 0, time: 120 } })
+      } else {
+        await this.platform.sendDeviceUpdate(this.accessory, { uiActive: 120 })
+      }
+    } catch (err) {
+      // Suppress errors here
+    }
+  }
+
+  async externalUpdate (params) {
+    try {
+      if (
+        (this.setup === 'switchMulti' && params.switches) ||
+        (this.setup === 'switchSingle' && params.switch)
+      ) {
+        let newState
+        if (this.setup === 'switchMulti' && params.switches) {
+          newState = params.switches[0].switch
+        } else if (this.setup === 'switchSingle' && params.switch) {
+          newState = params.switch
+        }
+        if (newState && newState !== this.cacheState) {
+          this.cacheState = newState
+          this.service.updateCharacteristic(this.hapChar.Active, this.cacheState === 'on' ? 1 : 0)
+          if (params.updateSource && this.enableLogging) {
+            this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
+          }
+        }
+      }
+
+      // Get the power readings given by certain devices
+      if (!this.powerReadings) {
+        return
+      }
+      let logger = false
+      let power
+      let voltage
+      let current
+      if (this.funcs.hasProperty(params, 'actPow_00')) {
+        power = parseInt(params.actPow_00) / 100
+        this.service.updateCharacteristic(this.eveChar.CurrentConsumption, power)
+        logger = true
+      } else if (this.funcs.hasProperty(params, 'power')) {
+        power = parseFloat(params.power)
+        this.service.updateCharacteristic(this.eveChar.CurrentConsumption, power)
+        logger = true
+      }
+      if (this.funcs.hasProperty(params, 'voltage_00')) {
+        voltage = parseInt(params.voltage_00) / 100
+        this.service.updateCharacteristic(this.eveChar.Voltage, voltage)
+        logger = true
+      } else if (this.funcs.hasProperty(params, 'voltage')) {
+        voltage = parseFloat(params.voltage)
+        this.service.updateCharacteristic(this.eveChar.Voltage, voltage)
+        logger = true
+      }
+      if (this.funcs.hasProperty(params, 'current_00')) {
+        current = parseInt(params.current_00) / 100
+        this.service.updateCharacteristic(this.eveChar.ElectricCurrent, current)
+        logger = true
+      } else if (this.funcs.hasProperty(params, 'current')) {
+        current = parseFloat(params.current)
+        this.service.updateCharacteristic(this.eveChar.ElectricCurrent, current)
+        logger = true
+      }
+      if (params.updateSource && logger && this.enableLogging) {
+        this.log(
+          '[%s] %s%s%s.',
+          this.name,
+          power !== undefined ? this.lang.curPower + ' [' + power + 'W]' : '',
+          voltage !== undefined ? ' ' + this.lang.curVolt + ' [' + voltage + 'V]' : '',
+          current !== undefined ? ' ' + this.lang.curCurr + ' [' + current + 'A]' : ''
+        )
+      }
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, false)
+    }
+  }
+
+  markStatus (isOnline) {
+    this.isOnline = isOnline
+  }
+}
diff --git a/lib/index.js b/lib/index.js
index f8b8368a..aa4ce362 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -878,6 +878,13 @@ class eWeLinkPlatform {
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/simulation/purifier'))(this, accessory)
         /********************/
+      } else if (device.showAs === 'tv') {
+        /***********************
+        TELEVISIONS [SIMULATION]
+        ***********************/
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
+        accessory.control = new (require('./device/simulation/tv'))(this, accessory)
+        /**********************/
       } else if (
         device.showAs === 'sensor_leak' &&
         this.consts.devices.sensorContact.includes(uiid)
@@ -927,16 +934,16 @@ class eWeLinkPlatform {
         this.consts.devices.sensorAmbient.includes(uiid)
       ) {
         /*****************************************
-          THERMOSTATS [TH10/16 ACCESSORY SIMULATION]
-          *****************************************/
+        THERMOSTATS [TH10/16 ACCESSORY SIMULATION]
+        *****************************************/
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
         accessory.context.sensorType = device.params.sensorType
         accessory.control = new (require('./device/simulation/thermostat'))(this, accessory)
         /****************************************/
       } else if (device.showAs === 'heater' && this.consts.devices.sensorAmbient.includes(uiid)) {
         /*************************************
-            HEATERS [TH10/16 ACCESSORY SIMULATION]
-            *************************************/
+        HEATERS [TH10/16 ACCESSORY SIMULATION]
+        *************************************/
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
         accessory.context.sensorType = device.params.sensorType
         accessory.control = new (require('./device/simulation/heater'))(this, accessory)
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index fcec6228..abed366a 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -233,6 +233,7 @@ module.exports = {
       'tap',
       'tap_two',
       'thermostat',
+      'tv',
       'valve',
       'valve_two',
       'valve_four',

From f29e9c69b948647ddb33ebc43286cadf8b392ccf Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 20 Nov 2021 14:12:53 +0000
Subject: [PATCH 2796/3183] 8.6.1-beta.0

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index e6fb1d11..563c988e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.6.0",
+  "version": "8.6.1-beta.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.6.0",
+      "version": "8.6.1-beta.0",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index bbc256cc..9cd2f12f 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.6.0",
+  "version": "8.6.1-beta.0",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From 9966641acbdff3bb84d5c4042669921469a5c53f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 20 Nov 2021 14:15:56 +0000
Subject: [PATCH 2797/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e9262b9c..b57fdc5d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,16 @@
 
 All notable changes to homebridge-ewelink will be documented in this file.
 
+## BETA
+
+### Added
+
+- Expose a single or multi-channel generic switch as a `Telvision` HomeKit accessory type
+
+### Changed
+
+- Recommended Homebridge bumped to v1.3.6
+
 ## 8.6.0 (2021-11-18)
 
 ### Added

From 5c2affb9e6fb270fc4a7c273fa01ce4608c36d3b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 20 Nov 2021 19:42:31 +0000
Subject: [PATCH 2798/3183] change tv to audio receiver external type

---
 config.schema.json                            | 12 ++--
 .../simulation/{tv.js => audio-receiver.js}   |  2 +-
 lib/index.js                                  | 69 +++++++++++++++++--
 lib/utils/constants.js                        |  2 +-
 4 files changed, 70 insertions(+), 15 deletions(-)
 rename lib/device/simulation/{tv.js => audio-receiver.js} (99%)

diff --git a/config.schema.json b/config.schema.json
index ef7c274e..2e5595a6 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -257,8 +257,8 @@
                   "enum": ["tap"]
                 },
                 {
-                  "title": "1 Television",
-                  "enum": ["tv"]
+                  "title": "1 Audio Receiver (External Accessory)",
+                  "enum": ["audio"]
                 }
               ],
               "condition": {
@@ -568,10 +568,6 @@
                   "title": "2 Taps/Faucets",
                   "enum": ["tap_two"]
                 },
-                {
-                  "title": "1 Television",
-                  "enum": ["tv"]
-                },
                 {
                   "title": "1 Window",
                   "enum": ["window"]
@@ -579,6 +575,10 @@
                 {
                   "title": "1 Window Blind/Covering",
                   "enum": ["blind"]
+                },
+                {
+                  "title": "1 Audio Receiver (External Accessory)",
+                  "enum": ["audio"]
                 }
               ],
               "condition": {
diff --git a/lib/device/simulation/tv.js b/lib/device/simulation/audio-receiver.js
similarity index 99%
rename from lib/device/simulation/tv.js
rename to lib/device/simulation/audio-receiver.js
index aa1329b6..c6fc32b4 100644
--- a/lib/device/simulation/tv.js
+++ b/lib/device/simulation/audio-receiver.js
@@ -2,7 +2,7 @@
 /* eslint-disable new-cap */
 'use strict'
 
-module.exports = class deviceTelevision {
+module.exports = class deviceAudioReceiver {
   constructor (platform, accessory) {
     // Set up variables from the platform
     this.eveChar = platform.eveChar
diff --git a/lib/index.js b/lib/index.js
index aa4ce362..785f3e74 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -878,13 +878,13 @@ class eWeLinkPlatform {
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/simulation/purifier'))(this, accessory)
         /********************/
-      } else if (device.showAs === 'tv') {
-        /***********************
-        TELEVISIONS [SIMULATION]
-        ***********************/
-        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require('./device/simulation/tv'))(this, accessory)
-        /**********************/
+      } else if (device.showAs === 'audio') {
+        /***************************
+        AUDIO RECEIVERS [SIMULATION]
+        ***************************/
+        accessory = this.addExternalAccessory(device, device.deviceid + 'SWX', 34)
+        accessory.control = new (require('./device/simulation/audio-receiver'))(this, accessory)
+        /**************************/
       } else if (
         device.showAs === 'sensor_leak' &&
         this.consts.devices.sensorContact.includes(uiid)
@@ -1532,6 +1532,61 @@ class eWeLinkPlatform {
     }
   }
 
+  addExternalAccessory (device, hbDeviceId, category) {
+    try {
+      // Add the new accessory to Homebridge
+      const accessory = new this.api.platformAccessory(
+        device.name,
+        this.api.hap.uuid.generate(hbDeviceId),
+        category
+      )
+
+      // Set the accessory characteristics
+      accessory
+        .getService(this.api.hap.Service.AccessoryInformation)
+        .setCharacteristic(this.api.hap.Characteristic.Name, device.name)
+        .setCharacteristic(this.api.hap.Characteristic.ConfiguredName, device.name)
+        .setCharacteristic(this.api.hap.Characteristic.SerialNumber, hbDeviceId)
+        .setCharacteristic(this.api.hap.Characteristic.Manufacturer, device.brandName)
+        .setCharacteristic(
+          this.api.hap.Characteristic.Model,
+          device.productModel + ' (' + device.extra.model + ')'
+        )
+        .setCharacteristic(
+          this.api.hap.Characteristic.FirmwareRevision,
+          device.params.fwVersion || plugin.version
+        )
+        .setCharacteristic(this.api.hap.Characteristic.Identify, true)
+
+      // Add helpful context values to the accessory
+      accessory.context = {
+        ...{
+          hbDeviceId,
+          eweDeviceId: device.deviceid,
+          eweUIID: device.extra.uiid,
+          eweModel: device.productModel,
+          eweApiKey: device.apikey,
+          switchNumber: hbDeviceId.split('SW')[1].toString(),
+          channelCount: this.consts.supportedDevices[device.extra.uiid],
+          hidden: false
+        }
+      }
+
+      // Register the accessory
+      this.api.publishExternalAccessories(plugin.name, [accessory])
+      this.log('[%s] %s.', device.name, this.lang.devAdd)
+
+      // Return the new accessory
+      this.configureAccessory(accessory)
+      return accessory
+    } catch (err) {
+      // Catch any errors during add
+      const eText = this.funcs.parseError(err)
+      this.log.warn('[%s] %s %s.', device.name, this.lang.devNotAdd, eText)
+      return false
+    }
+  }
+
   configureAccessory (accessory) {
     // Set the correct firmware version if we can
     if (this.api && accessory.context.firmware) {
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index abed366a..64c88ffc 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -210,6 +210,7 @@ module.exports = {
       'doorbell'
     ],
     showAs: [
+      'audio',
       'blind',
       'cooler',
       'default',
@@ -233,7 +234,6 @@ module.exports = {
       'tap',
       'tap_two',
       'thermostat',
-      'tv',
       'valve',
       'valve_two',
       'valve_four',

From 40e901bed4ac77e00d88260c932ec4900ddd7329 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 20 Nov 2021 19:42:56 +0000
Subject: [PATCH 2799/3183] 8.6.1-beta.1

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 563c988e..8190888c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.6.1-beta.0",
+  "version": "8.6.1-beta.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.6.1-beta.0",
+      "version": "8.6.1-beta.1",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 9cd2f12f..af007556 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.6.1-beta.0",
+  "version": "8.6.1-beta.1",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From b402f1d0b5afe36413be3046654825c199a08ab7 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 20 Nov 2021 20:12:09 +0000
Subject: [PATCH 2800/3183] add new categories for sims

---
 CHANGELOG.md                                  |  3 ++-
 config.schema.json                            | 16 ++++++++++++
 .../simulation/{audio-receiver.js => tv.js}   |  9 ++-----
 lib/index.js                                  | 25 ++++++++++++++++++-
 lib/utils/constants.js                        |  2 ++
 5 files changed, 46 insertions(+), 9 deletions(-)
 rename lib/device/simulation/{audio-receiver.js => tv.js} (97%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b57fdc5d..f1b2502a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,7 +6,8 @@ All notable changes to homebridge-ewelink will be documented in this file.
 
 ### Added
 
-- Expose a single or multi-channel generic switch as a `Telvision` HomeKit accessory type
+- Expose a single or multi-channel generic switch as a `Audio Receiver`, `Set Top Box` or `Streaming Stick` HomeKit category types
+  - The accessory will need to be published as an external accessory meaning it will need to be added separately to HomeKit
 
 ### Changed
 
diff --git a/config.schema.json b/config.schema.json
index 2e5595a6..7c48dfc2 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -259,6 +259,14 @@
                 {
                   "title": "1 Audio Receiver (External Accessory)",
                   "enum": ["audio"]
+                },
+                {
+                  "title": "1 Set Top Box (External Accessory)",
+                  "enum": ["box"]
+                },
+                {
+                  "title": "1 Streaming Stick (External Accessory)",
+                  "enum": ["stick"]
                 }
               ],
               "condition": {
@@ -579,6 +587,14 @@
                 {
                   "title": "1 Audio Receiver (External Accessory)",
                   "enum": ["audio"]
+                },
+                {
+                  "title": "1 Set Top Box (External Accessory)",
+                  "enum": ["box"]
+                },
+                {
+                  "title": "1 Streaming Stick (External Accessory)",
+                  "enum": ["stick"]
                 }
               ],
               "condition": {
diff --git a/lib/device/simulation/audio-receiver.js b/lib/device/simulation/tv.js
similarity index 97%
rename from lib/device/simulation/audio-receiver.js
rename to lib/device/simulation/tv.js
index c6fc32b4..5d20f208 100644
--- a/lib/device/simulation/audio-receiver.js
+++ b/lib/device/simulation/tv.js
@@ -2,7 +2,7 @@
 /* eslint-disable new-cap */
 'use strict'
 
-module.exports = class deviceAudioReceiver {
+module.exports = class deviceTV {
   constructor (platform, accessory) {
     // Set up variables from the platform
     this.eveChar = platform.eveChar
@@ -44,11 +44,6 @@ module.exports = class deviceAudioReceiver {
       }
     }
 
-    // If the accessory has a switch service then remove it
-    if (this.accessory.getService(this.hapServ.Switch)) {
-      this.accessory.removeService(this.accessory.getService(this.hapServ.Switch))
-    }
-
     // Add the tv service if it doesn't already exist
     this.service =
       this.accessory.getService(this.hapServ.Television) ||
@@ -127,7 +122,7 @@ module.exports = class deviceAudioReceiver {
     // Output the customised options to the log
     const opts = JSON.stringify({
       logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
-      showAs: 'tv'
+      showAs: 'audio/box/stick'
     })
     this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
diff --git a/lib/index.js b/lib/index.js
index 785f3e74..42a83168 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -882,8 +882,31 @@ class eWeLinkPlatform {
         /***************************
         AUDIO RECEIVERS [SIMULATION]
         ***************************/
+        if (devicesInHB.has(uuid)) {
+          this.removeAccessory(devicesInHB.get(uuid))
+        }
         accessory = this.addExternalAccessory(device, device.deviceid + 'SWX', 34)
-        accessory.control = new (require('./device/simulation/audio-receiver'))(this, accessory)
+        accessory.control = new (require('./device/simulation/tv'))(this, accessory)
+        /**************************/
+      } else if (device.showAs === 'box') {
+        /***********************
+        SET TOP BOX [SIMULATION]
+        ***********************/
+        if (devicesInHB.has(uuid)) {
+          this.removeAccessory(devicesInHB.get(uuid))
+        }
+        accessory = this.addExternalAccessory(device, device.deviceid + 'SWX', 35)
+        accessory.control = new (require('./device/simulation/tv'))(this, accessory)
+        /**********************/
+      } else if (device.showAs === 'stick') {
+        /***************************
+        STREAMING STICK [SIMULATION]
+        ***************************/
+        if (devicesInHB.has(uuid)) {
+          this.removeAccessory(devicesInHB.get(uuid))
+        }
+        accessory = this.addExternalAccessory(device, device.deviceid + 'SWX', 36)
+        accessory.control = new (require('./device/simulation/tv'))(this, accessory)
         /**************************/
       } else if (
         device.showAs === 'sensor_leak' &&
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 64c88ffc..cfd36584 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -212,6 +212,7 @@ module.exports = {
     showAs: [
       'audio',
       'blind',
+      'box',
       'cooler',
       'default',
       'dehumidifier',
@@ -230,6 +231,7 @@ module.exports = {
       'p_button',
       'sensor',
       'sensor_leak',
+      'stick',
       'switch_valve',
       'tap',
       'tap_two',

From 7c95967e5953cc0a1ac7efcd312389b5f097e768 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 20 Nov 2021 20:12:35 +0000
Subject: [PATCH 2801/3183] 8.6.1-beta.2

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 8190888c..317fa23a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.6.1-beta.1",
+  "version": "8.6.1-beta.2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.6.1-beta.1",
+      "version": "8.6.1-beta.2",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index af007556..8721d537 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.6.1-beta.1",
+  "version": "8.6.1-beta.2",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From 1b2f400d7370418fdc360c15a960931c22b428de Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Tue, 23 Nov 2021 16:19:31 +0000
Subject: [PATCH 2802/3183] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index f0ef57e4..e9d17497 100644
--- a/README.md
+++ b/README.md
@@ -28,7 +28,7 @@ Homebridge plugin to integrate eWeLink devices into HomeKit
 
 ### Prerequisites
 
-- To use this plugin, you will need to already have [Homebridge](https://homebridge.io) (at least v1.3.5) or [HOOBS](https://hoobs.org) (at least v4) installed. Refer to the links for more information and installation instructions.
+- To use this plugin, you will need to already have [Homebridge](https://homebridge.io) (at least v1.3) or [HOOBS](https://hoobs.org) (at least v4.1) installed. Refer to the links for more information and installation instructions.
 - Whilst it is recommended to use [Node](https://nodejs.org/en/) v16, the plugin supports v12 and v14 as per the [Homebridge guidelines](https://github.com/homebridge/homebridge/wiki/How-To-Update-Node.js).
 
 ### Setup

From 839e213af42cf4a9b01c38a4608dfd5be7bdd90d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 23 Nov 2021 18:48:56 +0000
Subject: [PATCH 2803/3183] deps

---
 CHANGELOG.md                |  3 ++-
 lib/device/simulation/tv.js |  2 +-
 package-lock.json           | 16 ++++++++--------
 package.json                |  4 ++--
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f1b2502a..9310cd56 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,7 +11,8 @@ All notable changes to homebridge-ewelink will be documented in this file.
 
 ### Changed
 
-- Recommended Homebridge bumped to v1.3.6
+- Recommended Homebridge bumped to v1.3.8
+- Bump `ws` to v8.3.0
 
 ## 8.6.0 (2021-11-18)
 
diff --git a/lib/device/simulation/tv.js b/lib/device/simulation/tv.js
index 5d20f208..fdd0eeab 100644
--- a/lib/device/simulation/tv.js
+++ b/lib/device/simulation/tv.js
@@ -88,7 +88,7 @@ module.exports = class deviceTV {
       this.setup = 'switchMulti'
     }
 
-    // Add the set handler to the tap active characteristic
+    // Add the set handler to the tv active characteristic
     this.service.getCharacteristic(this.hapChar.Active).onSet(async value => {
       await this.internalUpdate(value)
     })
diff --git a/package-lock.json b/package-lock.json
index 317fa23a..bdab529a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -32,10 +32,10 @@
         "node-persist": "^3.1.0",
         "p-queue": "^6.6.2",
         "websocket-as-promised": "^2.0.1",
-        "ws": "^8.2.3"
+        "ws": "^8.3.0"
       },
       "engines": {
-        "homebridge": "^1.3.6",
+        "homebridge": "^1.3.8",
         "node": "^14.18.1 || ^16.13.0"
       }
     },
@@ -569,9 +569,9 @@
       }
     },
     "node_modules/ws": {
-      "version": "8.2.3",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.2.3.tgz",
-      "integrity": "sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA==",
+      "version": "8.3.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.3.0.tgz",
+      "integrity": "sha512-Gs5EZtpqZzLvmIM59w4igITU57lrtYVFneaa434VROv4thzJyV6UjIL3D42lslWlI+D4KzLYnxSwtfuiO79sNw==",
       "engines": {
         "node": ">=10.0.0"
       },
@@ -944,9 +944,9 @@
       }
     },
     "ws": {
-      "version": "8.2.3",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.2.3.tgz",
-      "integrity": "sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA==",
+      "version": "8.3.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.3.0.tgz",
+      "integrity": "sha512-Gs5EZtpqZzLvmIM59w4igITU57lrtYVFneaa434VROv4thzJyV6UjIL3D42lslWlI+D4KzLYnxSwtfuiO79sNw==",
       "requires": {}
     }
   }
diff --git a/package.json b/package.json
index 8721d537..e3eb6039 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,7 @@
   ],
   "main": "lib/index.js",
   "engines": {
-    "homebridge": "^1.3.6",
+    "homebridge": "^1.3.8",
     "node": "^14.18.1 || ^16.13.0"
   },
   "repository": {
@@ -59,7 +59,7 @@
     "node-persist": "^3.1.0",
     "p-queue": "^6.6.2",
     "websocket-as-promised": "^2.0.1",
-    "ws": "^8.2.3"
+    "ws": "^8.3.0"
   },
   "prettier": {
     "printWidth": 100

From cc64b97c3d871404b456dc499fb8beee82609989 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 24 Nov 2021 11:22:07 +0000
Subject: [PATCH 2804/3183] catch errors inside async update

---
 lib/device/rf-bridge.js | 285 ++++++++++++++++++++--------------------
 1 file changed, 145 insertions(+), 140 deletions(-)

diff --git a/lib/device/rf-bridge.js b/lib/device/rf-bridge.js
index e755f7b9..db50ffdb 100644
--- a/lib/device/rf-bridge.js
+++ b/lib/device/rf-bridge.js
@@ -116,166 +116,171 @@ module.exports = class deviceRFBridge {
         Object.keys(params)
           .filter(name => /rfTrig/.test(name))
           .forEach(async chan => {
-            this.devicesInHB.forEach(acc => {
-              if (
-                acc.context.eweDeviceId === this.accessory.context.eweDeviceId &&
-                this.funcs.hasProperty(acc.context, 'buttons') &&
-                this.funcs.hasProperty(acc.context.buttons, chan.split('g')[1].toString())
-              ) {
-                subAccessory = acc
-                channel = chan.split('g')[1].toString()
-              }
-            })
-            if (subAccessory) {
-              // Avoid duplicate triggers from LAN and WS
-              if (params[chan] === subAccessory.context.cacheLastAct) {
-                return
-              }
-              const deviceConf = this.platform.rfSubdevices[subAccessory.context.hbDeviceId] || {}
-              let enableLogging = !this.disableDeviceLogging
-              if (deviceConf && deviceConf.overrideLogging) {
-                switch (deviceConf.overrideLogging) {
-                  case 'standard':
-                  case 'debug':
-                    enableLogging = true
-                    break
-                  case 'disable':
-                    enableLogging = false
-                    break
+            try {
+              this.devicesInHB.forEach(acc => {
+                if (
+                  acc.context.eweDeviceId === this.accessory.context.eweDeviceId &&
+                  this.funcs.hasProperty(acc.context, 'buttons') &&
+                  this.funcs.hasProperty(acc.context.buttons, chan.split('g')[1].toString())
+                ) {
+                  subAccessory = acc
+                  channel = chan.split('g')[1].toString()
                 }
-              }
-              switch (subAccessory.context.subType) {
-                case 'blind':
-                case 'door':
-                case 'window':
-                  // Simulation
-                  return
-                case 'button':
-                case 'curtain': {
-                  const service = subAccessory.context.buttons[channel]
-                  subAccessory.getService(service).updateCharacteristic(this.hapChar.On, true)
-                  this.log(
-                    '[%s] %s [%s].',
-                    subAccessory.displayName,
-                    this.lang.curState,
-                    this.lang.buttonTrig
-                  )
-                  await this.funcs.sleep(3000)
-                  subAccessory.getService(service).updateCharacteristic(this.hapChar.On, false)
+              })
+              if (subAccessory) {
+                // Avoid duplicate triggers from LAN and WS
+                if (params[chan] === subAccessory.context.cacheLastAct) {
                   return
                 }
-              }
-              const sensorTimeLength =
-                deviceConf.sensorTimeLength || this.consts.defaultValues.sensorTimeLength
-              const sensorTimeDifference =
-                deviceConf.sensorTimeDifference || this.consts.defaultValues.sensorTimeDifference
-              subAccessory.context.cacheLastAct = params[chan]
-              const timeOfMotion = new Date(params[chan])
-              const diff = (timeNow.getTime() - timeOfMotion.getTime()) / 1000
-              let serv
-              let char
-              if (diff < sensorTimeDifference) {
-                switch (deviceConf.type) {
-                  case 'water':
-                    serv = this.hapServ.LeakSensor
-                    char = this.hapChar.LeakDetected
-                    break
-                  case 'fire':
-                  case 'smoke':
-                    serv = this.hapServ.SmokeSensor
-                    char = this.hapChar.SmokeDetected
-                    break
-                  case 'co':
-                    serv = this.hapServ.CarbonMonoxideSensor
-                    char = this.hapChar.CarbonMonoxideDetected
-                    break
-                  case 'co2':
-                    serv = this.hapServ.CarbonDioxideSensor
-                    char = this.hapChar.CarbonDioxideDetected
-                    break
-                  case 'contact': {
-                    serv = this.hapServ.ContactSensor
-                    char = this.hapChar.ContactSensorState
-                    const initialTime = subAccessory.eveService.getInitialTime()
-                    subAccessory
-                      .getService(serv)
-                      .updateCharacteristic(
-                        this.eveChar.LastActivation,
-                        Math.round(new Date().valueOf() / 1000) - initialTime
-                      )
-                    break
-                  }
-                  case 'occupancy':
-                    serv = this.hapServ.OccupancySensor
-                    char = this.hapChar.OccupancyDetected
-                    break
-                  case 'p_button':
-                    serv = this.hapServ.StatelessProgrammableSwitch
-                    char = this.hapChar.ProgrammableSwitchEvent
-                    break
-                  case 'doorbell':
-                    serv = this.hapServ.Doorbell
-                    char = this.hapChar.ProgrammableSwitchEvent
-                    break
-                  default: {
-                    serv = this.hapServ.MotionSensor
-                    char = this.hapChar.MotionDetected
-                    const initialTime = subAccessory.eveService.getInitialTime()
-                    subAccessory
-                      .getService(serv)
-                      .updateCharacteristic(
-                        this.eveChar.LastActivation,
-                        Math.round(new Date().valueOf() / 1000) - initialTime
-                      )
-                    break
+                const deviceConf = this.platform.rfSubdevices[subAccessory.context.hbDeviceId] || {}
+                let enableLogging = !this.disableDeviceLogging
+                if (deviceConf && deviceConf.overrideLogging) {
+                  switch (deviceConf.overrideLogging) {
+                    case 'standard':
+                    case 'debug':
+                      enableLogging = true
+                      break
+                    case 'disable':
+                      enableLogging = false
+                      break
                   }
                 }
-
-                // Programmable button and doorbell activate differently
-                if (char === this.hapChar.ProgrammableSwitchEvent) {
-                  subAccessory.getService(serv).updateCharacteristic(char, 0)
-                  if (params.updateSource && enableLogging) {
+                switch (subAccessory.context.subType) {
+                  case 'blind':
+                  case 'door':
+                  case 'window':
+                    // Simulations don't support external updates
+                    return
+                  case 'button':
+                  case 'curtain': {
+                    const service = subAccessory.context.buttons[channel]
+                    subAccessory.getService(service).updateCharacteristic(this.hapChar.On, true)
                     this.log(
                       '[%s] %s [%s].',
                       subAccessory.displayName,
                       this.lang.curState,
-                      this.lang.buttonSingle
+                      this.lang.buttonTrig
                     )
+                    await this.funcs.sleep(3000)
+                    subAccessory.getService(service).updateCharacteristic(this.hapChar.On, false)
+                    return
                   }
-                  return
-                } else {
-                  subAccessory.getService(serv).updateCharacteristic(char, 1)
-                  subAccessory.eveService.addEntry({ status: 1 })
+                }
+                const sensorTimeLength =
+                  deviceConf.sensorTimeLength || this.consts.defaultValues.sensorTimeLength
+                const sensorTimeDifference =
+                  deviceConf.sensorTimeDifference || this.consts.defaultValues.sensorTimeDifference
+                subAccessory.context.cacheLastAct = params[chan]
+                const timeOfMotion = new Date(params[chan])
+                const diff = (timeNow.getTime() - timeOfMotion.getTime()) / 1000
+                let serv
+                let char
+                if (diff < sensorTimeDifference) {
+                  switch (deviceConf.type) {
+                    case 'water':
+                      serv = this.hapServ.LeakSensor
+                      char = this.hapChar.LeakDetected
+                      break
+                    case 'fire':
+                    case 'smoke':
+                      serv = this.hapServ.SmokeSensor
+                      char = this.hapChar.SmokeDetected
+                      break
+                    case 'co':
+                      serv = this.hapServ.CarbonMonoxideSensor
+                      char = this.hapChar.CarbonMonoxideDetected
+                      break
+                    case 'co2':
+                      serv = this.hapServ.CarbonDioxideSensor
+                      char = this.hapChar.CarbonDioxideDetected
+                      break
+                    case 'contact': {
+                      serv = this.hapServ.ContactSensor
+                      char = this.hapChar.ContactSensorState
+                      const initialTime = subAccessory.eveService.getInitialTime()
+                      subAccessory
+                        .getService(serv)
+                        .updateCharacteristic(
+                          this.eveChar.LastActivation,
+                          Math.round(new Date().valueOf() / 1000) - initialTime
+                        )
+                      break
+                    }
+                    case 'occupancy':
+                      serv = this.hapServ.OccupancySensor
+                      char = this.hapChar.OccupancyDetected
+                      break
+                    case 'p_button':
+                      serv = this.hapServ.StatelessProgrammableSwitch
+                      char = this.hapChar.ProgrammableSwitchEvent
+                      break
+                    case 'doorbell':
+                      serv = this.hapServ.Doorbell
+                      char = this.hapChar.ProgrammableSwitchEvent
+                      break
+                    default: {
+                      serv = this.hapServ.MotionSensor
+                      char = this.hapChar.MotionDetected
+                      const initialTime = subAccessory.eveService.getInitialTime()
+                      subAccessory
+                        .getService(serv)
+                        .updateCharacteristic(
+                          this.eveChar.LastActivation,
+                          Math.round(new Date().valueOf() / 1000) - initialTime
+                        )
+                      break
+                    }
+                  }
+
+                  // Programmable button and doorbell activate differently
+                  if (char === this.hapChar.ProgrammableSwitchEvent) {
+                    subAccessory.getService(serv).updateCharacteristic(char, 0)
+                    if (params.updateSource && enableLogging) {
+                      this.log(
+                        '[%s] %s [%s].',
+                        subAccessory.displayName,
+                        this.lang.curState,
+                        this.lang.buttonSingle
+                      )
+                    }
+                    return
+                  } else {
+                    subAccessory.getService(serv).updateCharacteristic(char, 1)
+                    subAccessory.eveService.addEntry({ status: 1 })
+                    if (params.updateSource && enableLogging) {
+                      this.log(
+                        '[%s] %s [%s].',
+                        subAccessory.displayName,
+                        this.lang.curState,
+                        this.lang.rfTrigYes
+                      )
+                    }
+                  }
+                  const updateKey = Math.random()
+                    .toString(36)
+                    .substr(2, 8)
+                  subAccessory.context.updateKey = updateKey
+                  await this.funcs.sleep(sensorTimeLength * 1000)
+                  if (updateKey !== subAccessory.context.updateKey) {
+                    return
+                  }
+                  subAccessory.getService(serv).updateCharacteristic(char, 0)
+                  subAccessory.eveService.addEntry({ status: 0 })
                   if (params.updateSource && enableLogging) {
                     this.log(
                       '[%s] %s [%s].',
                       subAccessory.displayName,
                       this.lang.curState,
-                      this.lang.rfTrigYes
+                      this.lang.rfTrigNo
                     )
                   }
                 }
-                const updateKey = Math.random()
-                  .toString(36)
-                  .substr(2, 8)
-                subAccessory.context.updateKey = updateKey
-                await this.funcs.sleep(sensorTimeLength * 1000)
-                if (updateKey !== subAccessory.context.updateKey) {
-                  return
-                }
-                subAccessory.getService(serv).updateCharacteristic(char, 0)
-                subAccessory.eveService.addEntry({ status: 0 })
-                if (params.updateSource && enableLogging) {
-                  this.log(
-                    '[%s] %s [%s].',
-                    subAccessory.displayName,
-                    this.lang.curState,
-                    this.lang.rfTrigNo
-                  )
-                }
+              } else {
+                throw new Error(this.lang.rfNotFound + '[' + chan + ']')
               }
-            } else {
-              this.log.warn('[%s] %s [%s].', this.name, this.lang.rfNotFound, chan)
+            } catch (err) {
+              const eText = this.funcs.parseError(err)
+              this.log.warn('[%s] %s %s.', this.name, this.lang.devNotRf, eText)
             }
           })
       }

From 48f6aaeb424ae865f922009cc9d090d756339e06 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 24 Nov 2021 11:22:57 +0000
Subject: [PATCH 2805/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9310cd56..82bfb2e9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,10 @@ All notable changes to homebridge-ewelink will be documented in this file.
 - Recommended Homebridge bumped to v1.3.8
 - Bump `ws` to v8.3.0
 
+### Fixed
+
+- Potential uncaught errors updating subdevices of an RF bridge
+
 ## 8.6.0 (2021-11-18)
 
 ### Added

From 4d380b4bfa0ae244692d9b5683ca9cb800a965f5 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 24 Nov 2021 11:23:19 +0000
Subject: [PATCH 2806/3183] 8.6.1-beta.3

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index bdab529a..a2772d9c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.6.1-beta.2",
+  "version": "8.6.1-beta.3",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.6.1-beta.2",
+      "version": "8.6.1-beta.3",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index e3eb6039..b30605f4 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.6.1-beta.2",
+  "version": "8.6.1-beta.3",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From b449ed73e42de66b99e0c3e90535f7f1f27598b7 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 25 Nov 2021 08:31:52 +0000
Subject: [PATCH 2807/3183] support L2 basic functions

---
 CHANGELOG.md                |  1 +
 lib/device/light-rgb-cct.js | 30 ++++++++++++++++++++++--------
 lib/device/light-rgb.js     |  1 +
 lib/utils/constants.js      |  3 ++-
 4 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 82bfb2e9..3d7fc8d5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@ All notable changes to homebridge-ewelink will be documented in this file.
 
 ### Added
 
+- Support Sonoff L2
 - Expose a single or multi-channel generic switch as a `Audio Receiver`, `Set Top Box` or `Streaming Stick` HomeKit category types
   - The accessory will need to be published as an external accessory meaning it will need to be added separately to HomeKit
 
diff --git a/lib/device/light-rgb-cct.js b/lib/device/light-rgb-cct.js
index 75afa1c3..0d07b90b 100644
--- a/lib/device/light-rgb-cct.js
+++ b/lib/device/light-rgb-cct.js
@@ -84,6 +84,7 @@ module.exports = class deviceLightRGBCCT {
     this.service
       .getCharacteristic(this.hapChar.Hue)
       .onSet(async value => await this.internalColourUpdate(value))
+    this.cacheSat = this.service.getCharacteristic(this.hapChar.Saturation).value
 
     // Add the set handler to the lightbulb colour temperature characteristic
     this.service
@@ -152,7 +153,8 @@ module.exports = class deviceLightRGBCCT {
         }
       }, 5000)
       const params = { switch: newValue }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
+      // await this.platform.sendDeviceUpdate(this.accessory, params)
+      this.platform.sendDeviceUpdate(this.accessory, params)
       this.cacheState = newValue
       if (this.enableLogging) {
         this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
@@ -212,8 +214,14 @@ module.exports = class deviceLightRGBCCT {
             }
           }
           break
+        case 137:
+          params = {
+            bright: value
+          }
+          break
       }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
+      // await this.platform.sendDeviceUpdate(this.accessory, params)
+      this.platform.sendDeviceUpdate(this.accessory, params)
       this.cacheBright = value
       if (this.enableLogging) {
         this.log('[%s] %s [%s%].', this.name, this.lang.curBright, this.cacheBright)
@@ -250,7 +258,8 @@ module.exports = class deviceLightRGBCCT {
       const rgb = this.colourUtils.hs2rgb(value, sat)
       switch (this.accessory.context.eweUIID) {
         case 59:
-          // L1
+        case 137:
+          // L1/L2
           params = {
             mode: 1,
             colorR: rgb[0],
@@ -271,7 +280,8 @@ module.exports = class deviceLightRGBCCT {
           }
           break
       }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
+      // await this.platform.sendDeviceUpdate(this.accessory, params)
+      this.platform.sendDeviceUpdate(this.accessory, params)
       this.cacheHue = value
       this.cacheR = rgb[0]
       this.cacheG = rgb[1]
@@ -330,7 +340,8 @@ module.exports = class deviceLightRGBCCT {
       let params
       let newRGB
       switch (this.accessory.context.eweUIID) {
-        case 59: {
+        case 59:
+        case 137: {
           // L1
           newRGB = this.colourUtils.k2rgb(mToK)
           params = {
@@ -352,13 +363,15 @@ module.exports = class deviceLightRGBCCT {
           }
           break
       }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
+      // await this.platform.sendDeviceUpdate(this.accessory, params)
+      this.platform.sendDeviceUpdate(this.accessory, params)
       this.cacheMired = value
       this.cacheHue = hs[0]
       this.cacheCT = scaledCT
       this.cacheHue = 0
       switch (this.accessory.context.eweUIID) {
-        case 59: {
+        case 59:
+        case 137: {
           // L1
           this.cacheR = newRGB[0]
           this.cacheG = newRGB[1]
@@ -400,7 +413,8 @@ module.exports = class deviceLightRGBCCT {
       let hs
       switch (this.accessory.context.eweUIID) {
         case 59:
-          // L1
+        case 137:
+          // L1/L2
           if (this.funcs.hasProperty(params, 'bright')) {
             if (params.bright !== this.cacheBright) {
               this.cacheBright = params.bright
diff --git a/lib/device/light-rgb.js b/lib/device/light-rgb.js
index 0ad54476..f73dfcab 100644
--- a/lib/device/light-rgb.js
+++ b/lib/device/light-rgb.js
@@ -72,6 +72,7 @@ module.exports = class deviceLightRGB {
     this.service
       .getCharacteristic(this.hapChar.Hue)
       .onSet(async value => await this.internalColourUpdate(value))
+    this.cacheSat = this.service.getCharacteristic(this.hapChar.Saturation).value
 
     // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
     if (!platform.config.disableNoResponse) {
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index cfd36584..5b8ee3ee 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -278,7 +278,7 @@ module.exports = {
     lightDimmer: [36, 44, 57],
     lightRGB: [22],
     lightCCT: [103],
-    lightRGBCCT: [59, 104],
+    lightRGBCCT: [59, 104, 137],
     curtain: [11, 67],
     sensorContact: [102],
     sensorAmbient: [15],
@@ -411,6 +411,7 @@ module.exports = {
     114: 3,
     126: 2, // "DUALR3"
     127: 1, // "GTTA127"
+    137: 1, // "L2/SPIDER CONTROLLER"
     138: 1, // "MINIR3?" (WOOLLEY WLAN SMART SWITCH)
     139: 2, // "MINIR3?"
     140: 3, // "MINIR3?"

From 10603e330a701c8856e4e1fd9e1d45929c20daca Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 25 Nov 2021 08:32:51 +0000
Subject: [PATCH 2808/3183] ensure awaiting on senddeviceupdate rgb

---
 lib/device/light-rgb-cct.js | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/lib/device/light-rgb-cct.js b/lib/device/light-rgb-cct.js
index 0d07b90b..c2705320 100644
--- a/lib/device/light-rgb-cct.js
+++ b/lib/device/light-rgb-cct.js
@@ -153,8 +153,7 @@ module.exports = class deviceLightRGBCCT {
         }
       }, 5000)
       const params = { switch: newValue }
-      // await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.platform.sendDeviceUpdate(this.accessory, params)
+      await this.platform.sendDeviceUpdate(this.accessory, params)
       this.cacheState = newValue
       if (this.enableLogging) {
         this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
@@ -220,8 +219,7 @@ module.exports = class deviceLightRGBCCT {
           }
           break
       }
-      // await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.platform.sendDeviceUpdate(this.accessory, params)
+      await this.platform.sendDeviceUpdate(this.accessory, params)
       this.cacheBright = value
       if (this.enableLogging) {
         this.log('[%s] %s [%s%].', this.name, this.lang.curBright, this.cacheBright)
@@ -280,8 +278,7 @@ module.exports = class deviceLightRGBCCT {
           }
           break
       }
-      // await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.platform.sendDeviceUpdate(this.accessory, params)
+      await this.platform.sendDeviceUpdate(this.accessory, params)
       this.cacheHue = value
       this.cacheR = rgb[0]
       this.cacheG = rgb[1]
@@ -363,8 +360,7 @@ module.exports = class deviceLightRGBCCT {
           }
           break
       }
-      // await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.platform.sendDeviceUpdate(this.accessory, params)
+      await this.platform.sendDeviceUpdate(this.accessory, params)
       this.cacheMired = value
       this.cacheHue = hs[0]
       this.cacheCT = scaledCT

From c076895bddba8c96ead43693cebd3d054dc2dc08 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 25 Nov 2021 08:33:13 +0000
Subject: [PATCH 2809/3183] 8.6.1-beta.4

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index a2772d9c..1a810453 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.6.1-beta.3",
+  "version": "8.6.1-beta.4",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.6.1-beta.3",
+      "version": "8.6.1-beta.4",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index b30605f4..dba2e9b1 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.6.1-beta.3",
+  "version": "8.6.1-beta.4",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From d9b30da2609e2870a79ae93a2f549c182d874c60 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 25 Nov 2021 09:01:56 +0000
Subject: [PATCH 2810/3183] add L2 to config screen

---
 config.schema.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config.schema.json b/config.schema.json
index 7c48dfc2..bf99dada 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -815,7 +815,7 @@
                   "enum": ["b1"]
                 },
                 {
-                  "title": "Sonoff L1/Lite",
+                  "title": "Sonoff L1/L2/Lite",
                   "enum": ["l1"]
                 },
                 {

From e129328c10b1e73138340fa5488d0a8166477710 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 25 Nov 2021 09:13:51 +0000
Subject: [PATCH 2811/3183] fix changing colour when off

---
 lib/device/light-cct.js        | 6 +++---
 lib/device/light-rgb-cct.js    | 8 ++++----
 lib/device/zigbee/light-cct.js | 6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/lib/device/light-cct.js b/lib/device/light-cct.js
index b2ea4eea..63e51e9d 100644
--- a/lib/device/light-cct.js
+++ b/lib/device/light-cct.js
@@ -207,13 +207,13 @@ module.exports = class deviceLightCCT {
 
   async internalCTUpdate (value) {
     try {
-      if (this.cacheMired === value || this.cacheState !== 'on') {
+      if (this.cacheMired === value) {
         return
       }
       if (
-        !this.isOnline &&
         this.accessory.alController &&
-        this.accessory.alController.isAdaptiveLightingActive()
+        this.accessory.alController.isAdaptiveLightingActive() &&
+        (this.cacheState !== 'on' || !this.isOnline)
       ) {
         return
       }
diff --git a/lib/device/light-rgb-cct.js b/lib/device/light-rgb-cct.js
index c2705320..85683db1 100644
--- a/lib/device/light-rgb-cct.js
+++ b/lib/device/light-rgb-cct.js
@@ -235,7 +235,7 @@ module.exports = class deviceLightRGBCCT {
 
   async internalColourUpdate (value) {
     try {
-      if (this.cacheHue === value || this.cacheState !== 'on') {
+      if (this.cacheHue === value) {
         return
       }
       const updateKey = this.funcs.generateRandomString(5)
@@ -307,13 +307,13 @@ module.exports = class deviceLightRGBCCT {
 
   async internalCTUpdate (value) {
     try {
-      if (this.cacheMired === value || this.cacheState !== 'on') {
+      if (this.cacheMired === value) {
         return
       }
       if (
-        !this.isOnline &&
         this.accessory.alController &&
-        this.accessory.alController.isAdaptiveLightingActive()
+        this.accessory.alController.isAdaptiveLightingActive() &&
+        (this.cacheState !== 'on' || !this.isOnline)
       ) {
         return
       }
diff --git a/lib/device/zigbee/light-cct.js b/lib/device/zigbee/light-cct.js
index 8060061f..ee9a4a3c 100644
--- a/lib/device/zigbee/light-cct.js
+++ b/lib/device/zigbee/light-cct.js
@@ -161,13 +161,13 @@ module.exports = class deviceZBLightCCT {
 
   async internalCTUpdate (value) {
     try {
-      if (this.cacheMired === value || this.cacheState !== 'on') {
+      if (this.cacheMired === value) {
         return
       }
       if (
-        !this.isOnline &&
         this.accessory.alController &&
-        this.accessory.alController.isAdaptiveLightingActive()
+        this.accessory.alController.isAdaptiveLightingActive() &&
+        (this.cacheState !== 'on' || !this.isOnline)
       ) {
         return
       }

From d45ea19ffafccf62187dbb3bb56c56c41d701619 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 25 Nov 2021 09:14:11 +0000
Subject: [PATCH 2812/3183] 8.6.1-beta.5

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 1a810453..afc1d4b2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.6.1-beta.4",
+  "version": "8.6.1-beta.5",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.6.1-beta.4",
+      "version": "8.6.1-beta.5",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index dba2e9b1..deeb63ed 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.6.1-beta.4",
+  "version": "8.6.1-beta.5",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From 08cc9bfed55645682e44ce2edc8718055cc7c624 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 25 Nov 2021 17:36:21 +0000
Subject: [PATCH 2813/3183] cct for L2

---
 lib/device/light-rgb-cct.js | 84 +++++++++++++++++++++++++++++++++++--
 lib/utils/constants.js      |  1 +
 2 files changed, 82 insertions(+), 3 deletions(-)

diff --git a/lib/device/light-rgb-cct.js b/lib/device/light-rgb-cct.js
index 85683db1..60f54bd5 100644
--- a/lib/device/light-rgb-cct.js
+++ b/lib/device/light-rgb-cct.js
@@ -102,6 +102,41 @@ module.exports = class deviceLightRGBCCT {
       this.accessory.configureController(this.accessory.alController)
     }
 
+    /*
+      Modes for the L2 light
+      0 - rgb
+      1 - rgb (we use this for colour, not sure what the diff is to 0
+      2 - cct mode
+      3 - some black/white mode
+      4 - music mode:
+        { "mode": 4, "rhythmMode": 0, "rhythmSensitive": 0 } -> Classic
+        { "mode": 4, "rhythmMode": 1, "rhythmSensitive": 0 } -> Soft
+        { "mode": 4, "rhythmMode": 2, "rhythmSensitive": 0 } -> Dynamic
+        { "mode": 4, "rhythmMode": 3, "rhythmSensitive": 0 } -> Disco
+      5 - DIY scene
+      6 - Vibrant
+      7 - Reading
+      8 - Leisure
+      9 - Sunrise
+      10 - Sunshine
+      11 - Radiant
+      12 - Dream
+      13 - Candle
+      14 - Night
+      15 - Sunny
+      16 - Festive
+      17 - Vivid
+      18 - Work
+      19 - Ocean
+      20 - Creek
+      21 - Gentle
+      22 - Passive
+      23 - Joy
+      24 - Rainbow
+      25 - Moonlight
+      26 - Sunset
+    */
+
     // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
     if (!platform.config.disableNoResponse) {
       this.service.getCharacteristic(this.hapChar.On).onGet(() => {
@@ -333,13 +368,13 @@ module.exports = class deviceLightRGBCCT {
       this.service.updateCharacteristic(this.hapChar.Hue, hs[0])
       this.service.updateCharacteristic(this.hapChar.Saturation, hs[1])
       const mToK = Math.max(Math.min(Math.round(1000000 / value), 6500), 2700)
-      const scaledCT = Math.round(((mToK - 2700) / 3800) * 255)
+      let scaledCT
       let params
       let newRGB
       switch (this.accessory.context.eweUIID) {
-        case 59:
-        case 137: {
+        case 59: {
           // L1
+          scaledCT = Math.round(((mToK - 2700) / 3800) * 100)
           newRGB = this.colourUtils.k2rgb(mToK)
           params = {
             mode: 1,
@@ -351,6 +386,7 @@ module.exports = class deviceLightRGBCCT {
         }
         case 104:
           // B02-B-A60, B05-B-A60, GTLC104
+          scaledCT = Math.round(((mToK - 2700) / 3800) * 255)
           params = {
             ltype: this.cacheMode === 'white' ? undefined : 'white',
             white: {
@@ -359,6 +395,16 @@ module.exports = class deviceLightRGBCCT {
             }
           }
           break
+        case 137: {
+          // L2
+          scaledCT = 100 - Math.round(((mToK - 2700) / 3800) * 100)
+          newRGB = this.colourUtils.k2rgb(mToK)
+          params = {
+            mode: 2,
+            colorTemp: scaledCT
+          }
+          break
+        }
       }
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.cacheMired = value
@@ -460,6 +506,38 @@ module.exports = class deviceLightRGBCCT {
               }
             }
           }
+          if (
+            this.funcs.hasProperty(params, 'colorTemp') &&
+            params.colorTemp !== this.cacheCTRaw &&
+            params.mode === 2
+          ) {
+            this.cacheCTRaw = params.colorTemp
+            const ctDiff = Math.abs(params.colorTemp - this.cacheCTRaw)
+            this.cacheCT = 100 - params.colorTemp
+            const ctToK = Math.round((this.cacheCT / 100) * 3800 + 2700)
+            this.cacheMired = Math.max(Math.min(Math.round(1000000 / ctToK), 500), 140)
+            hs = this.colourUtils.m2hs(this.cacheMired)
+            this.cacheHue = hs[0]
+            this.service.updateCharacteristic(this.hapChar.Hue, this.cacheHue)
+            this.service.updateCharacteristic(this.hapChar.Saturation, hs[1])
+            this.service.updateCharacteristic(this.hapChar.ColorTemperature, this.cacheMired)
+            if (params.updateSource) {
+              if (this.enableLogging) {
+                this.log('[%s] %s [%sK].', this.name, this.lang.curColour, ctToK)
+              }
+              if (
+                this.accessory.alController &&
+                this.accessory.alController.isAdaptiveLightingActive() &&
+                ctDiff > 20
+              ) {
+                // Look for a variation greater than twenty
+                this.accessory.alController.disableAdaptiveLighting()
+                if (this.enableLogging) {
+                  this.log('[%s] %s.', this.name, this.lang.disabledAL)
+                }
+              }
+            }
+          }
           break
         case 104:
           // B02-B-A60, B05-B-A60, GTLC104
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 5b8ee3ee..ed6ba67b 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -314,6 +314,7 @@ module.exports = {
     'colorB',
     'colorG',
     'colorR',
+    'colorTemp',
     'config',
     'current',
     'currentHumidity',

From 302861f1c0e8521d2748a11482f412817b161d88 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 25 Nov 2021 17:36:46 +0000
Subject: [PATCH 2814/3183] 8.6.1-beta.6

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index afc1d4b2..146dd452 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.6.1-beta.5",
+  "version": "8.6.1-beta.6",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.6.1-beta.5",
+      "version": "8.6.1-beta.6",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index deeb63ed..d72189a6 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.6.1-beta.5",
+  "version": "8.6.1-beta.6",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From 4c735ef512815217ef80fefe88c49d9aaf091641 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 28 Nov 2021 09:05:04 +0000
Subject: [PATCH 2815/3183] don't remove thermostat every restart

---
 lib/device/simulation/thermostat.js | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/lib/device/simulation/thermostat.js b/lib/device/simulation/thermostat.js
index 66679a4a..a471b005 100644
--- a/lib/device/simulation/thermostat.js
+++ b/lib/device/simulation/thermostat.js
@@ -69,11 +69,6 @@ module.exports = class deviceThermostat {
       this.accessory.removeService(this.accessory.getService(this.hapServ.TemperatureSensor))
     }
 
-    // If the accessory has a temperature sensor service then remove it
-    if (this.accessory.getService(this.hapServ.Thermostat)) {
-      this.accessory.removeService(this.accessory.getService(this.hapServ.Thermostat))
-    }
-
     // Set up the accessory with default target temp when added the first time
     if (!this.funcs.hasProperty(this.accessory.context, 'cacheTarget')) {
       this.accessory.context.cacheTarget = 20

From bf01488264559792dd801a9a924feea080cd8d08 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 28 Nov 2021 09:05:29 +0000
Subject: [PATCH 2816/3183] 8.6.1-beta.7

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 146dd452..73b49248 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.6.1-beta.6",
+  "version": "8.6.1-beta.7",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.6.1-beta.6",
+      "version": "8.6.1-beta.7",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index d72189a6..7851b7c4 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.6.1-beta.6",
+  "version": "8.6.1-beta.7",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From 0c8b5dcb79bf1f4c034fee817cfafc10760be8f7 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 28 Nov 2021 09:11:54 +0000
Subject: [PATCH 2817/3183] update CurrentHeatingCoolingState correctly

---
 lib/device/simulation/thermostat.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/device/simulation/thermostat.js b/lib/device/simulation/thermostat.js
index a471b005..0d23b92d 100644
--- a/lib/device/simulation/thermostat.js
+++ b/lib/device/simulation/thermostat.js
@@ -248,7 +248,7 @@ module.exports = class deviceThermostat {
       }
       this.service.updateCharacteristic(
         this.hapChar.CurrentHeatingCoolingState,
-        value === 3 ? 1 : 0
+        this.cacheHeat === 'on' ? 1 : 0
       )
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)

From aa779a0b51e9359edcfd3bbbf6be02b5796998cd Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 28 Nov 2021 09:12:18 +0000
Subject: [PATCH 2818/3183] 8.6.1-beta.8

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 73b49248..06e44d6f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.6.1-beta.7",
+  "version": "8.6.1-beta.8",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.6.1-beta.7",
+      "version": "8.6.1-beta.8",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 7851b7c4..eeb01c24 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.6.1-beta.7",
+  "version": "8.6.1-beta.8",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From 42023fd10000b77354e04dee02d70aa1d92ca808 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 29 Nov 2021 12:06:45 +0000
Subject: [PATCH 2819/3183] add festive scene to L2

---
 lib/device/light-rgb-cct.js | 121 ++++++++++++++++++++++++++++--------
 lib/utils/custom-chars.js   |  13 +++-
 lib/utils/lang-en.js        |   1 +
 lib/utils/lang-fr.js        |   1 +
 4 files changed, 108 insertions(+), 28 deletions(-)

diff --git a/lib/device/light-rgb-cct.js b/lib/device/light-rgb-cct.js
index 60f54bd5..a8d13029 100644
--- a/lib/device/light-rgb-cct.js
+++ b/lib/device/light-rgb-cct.js
@@ -6,6 +6,7 @@ module.exports = class deviceLightRGBCCT {
   constructor (platform, accessory) {
     // Set up variables from the platform
     this.colourUtils = platform.colourUtils
+    this.cusChar = platform.cusChar
     this.funcs = platform.funcs
     this.hapChar = platform.api.hap.Characteristic
     this.hapErr = platform.api.hap.HapStatusError
@@ -94,6 +95,16 @@ module.exports = class deviceLightRGBCCT {
     // This is needed as sometimes we need to send the brightness with a cct update
     this.cacheBright = this.service.getCharacteristic(this.hapChar.Brightness).value
 
+    // If the device is the L2 then add the FestiveScene custom characteristic
+    if (this.accessory.context.eweUIID === 137) {
+      if (!this.service.testCharacteristic(this.cusChar.FestiveScene)) {
+        this.service.addCharacteristic(this.cusChar.FestiveScene)
+      }
+      this.service.getCharacteristic(this.cusChar.FestiveScene).onSet(async value => {
+        await this.internalSceneUpdate(16, value)
+      })
+    }
+
     // Set up the adaptive lighting controller if not disabled by user
     if (this.alShift !== -1) {
       this.accessory.alController = new platform.api.hap.AdaptiveLightingController(this.service, {
@@ -193,6 +204,9 @@ module.exports = class deviceLightRGBCCT {
       if (this.enableLogging) {
         this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
       }
+      if (this.accessory.context.eweUIID === 137 && this.cacheState === 'off') {
+        this.service.updateCharacteristic(this.cusChar.FestiveScene, false)
+      }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
@@ -331,6 +345,9 @@ module.exports = class deviceLightRGBCCT {
           this.cacheR + ' ' + this.cacheG + ' ' + this.cacheB
         )
       }
+      if (this.accessory.context.eweUIID === 137) {
+        this.service.updateCharacteristic(this.cusChar.FestiveScene, false)
+      }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
@@ -431,6 +448,9 @@ module.exports = class deviceLightRGBCCT {
           this.log('[%s] %s [%sK].', this.name, this.lang.curColour, mToK)
         }
       }
+      if (this.accessory.context.eweUIID === 137) {
+        this.service.updateCharacteristic(this.cusChar.FestiveScene, false)
+      }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
@@ -440,6 +460,38 @@ module.exports = class deviceLightRGBCCT {
     }
   }
 
+  async internalSceneUpdate (scene, value) {
+    try {
+      if (!value) {
+        return
+      }
+      const timerKey = this.funcs.generateRandomString(5)
+      this.updateTimeout = timerKey
+      setTimeout(() => {
+        if (this.updateTimeout === timerKey) {
+          this.updateTimeout = false
+        }
+      }, 5000)
+      const params = { mode: scene }
+      if (this.cacheState === 'off') {
+        params.switch = 'on'
+        this.cacheState = 'on'
+      }
+      await this.platform.sendDeviceUpdate(this.accessory, params)
+      this.service.updateCharacteristic(this.hapChar.On, true)
+      this.accessory.alController.disableAdaptiveLighting()
+      if (this.enableLogging) {
+        this.log('[%s] %s [%s].', this.name, this.lang.curScene, 'festive')
+      }
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, true)
+      setTimeout(() => {
+        this.service.updateCharacteristic(this.cusChar.FestiveScene, false)
+      }, 2000)
+      throw new this.hapErr(-70402)
+    }
+  }
+
   async externalUpdate (params) {
     try {
       if (this.updateTimeout) {
@@ -451,6 +503,9 @@ module.exports = class deviceLightRGBCCT {
         if (params.updateSource && this.enableLogging) {
           this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
         }
+        if (this.accessory.context.eweUIID === 137 && this.cacheState === 'off') {
+          this.service.updateCharacteristic(this.cusChar.FestiveScene, false)
+        }
       }
       let hs
       switch (this.accessory.context.eweUIID) {
@@ -467,6 +522,9 @@ module.exports = class deviceLightRGBCCT {
             }
           }
           if (this.funcs.hasProperty(params, 'colorR')) {
+            if (this.accessory.context.eweUIID === 137) {
+              this.service.updateCharacteristic(this.cusChar.FestiveScene, false)
+            }
             if (
               params.colorR !== this.cacheR ||
               params.colorG !== this.cacheB ||
@@ -506,38 +564,47 @@ module.exports = class deviceLightRGBCCT {
               }
             }
           }
-          if (
-            this.funcs.hasProperty(params, 'colorTemp') &&
-            params.colorTemp !== this.cacheCTRaw &&
-            params.mode === 2
-          ) {
-            this.cacheCTRaw = params.colorTemp
-            const ctDiff = Math.abs(params.colorTemp - this.cacheCTRaw)
-            this.cacheCT = 100 - params.colorTemp
-            const ctToK = Math.round((this.cacheCT / 100) * 3800 + 2700)
-            this.cacheMired = Math.max(Math.min(Math.round(1000000 / ctToK), 500), 140)
-            hs = this.colourUtils.m2hs(this.cacheMired)
-            this.cacheHue = hs[0]
-            this.service.updateCharacteristic(this.hapChar.Hue, this.cacheHue)
-            this.service.updateCharacteristic(this.hapChar.Saturation, hs[1])
-            this.service.updateCharacteristic(this.hapChar.ColorTemperature, this.cacheMired)
-            if (params.updateSource) {
-              if (this.enableLogging) {
-                this.log('[%s] %s [%sK].', this.name, this.lang.curColour, ctToK)
-              }
-              if (
-                this.accessory.alController &&
-                this.accessory.alController.isAdaptiveLightingActive() &&
-                ctDiff > 20
-              ) {
-                // Look for a variation greater than twenty
-                this.accessory.alController.disableAdaptiveLighting()
+          if (this.funcs.hasProperty(params, 'colorTemp')) {
+            if (this.accessory.context.eweUIID === 137) {
+              this.service.updateCharacteristic(this.cusChar.FestiveScene, false)
+            }
+            if (params.colorTemp !== this.cacheCTRaw && params.mode === 2) {
+              this.cacheCTRaw = params.colorTemp
+              const ctDiff = Math.abs(params.colorTemp - this.cacheCTRaw)
+              this.cacheCT = 100 - params.colorTemp
+              const ctToK = Math.round((this.cacheCT / 100) * 3800 + 2700)
+              this.cacheMired = Math.max(Math.min(Math.round(1000000 / ctToK), 500), 140)
+              hs = this.colourUtils.m2hs(this.cacheMired)
+              this.cacheHue = hs[0]
+              this.service.updateCharacteristic(this.hapChar.Hue, this.cacheHue)
+              this.service.updateCharacteristic(this.hapChar.Saturation, hs[1])
+              this.service.updateCharacteristic(this.hapChar.ColorTemperature, this.cacheMired)
+              if (params.updateSource) {
                 if (this.enableLogging) {
-                  this.log('[%s] %s.', this.name, this.lang.disabledAL)
+                  this.log('[%s] %s [%sK].', this.name, this.lang.curColour, ctToK)
+                }
+                if (
+                  this.accessory.alController &&
+                  this.accessory.alController.isAdaptiveLightingActive() &&
+                  ctDiff > 20
+                ) {
+                  // Look for a variation greater than twenty
+                  this.accessory.alController.disableAdaptiveLighting()
+                  if (this.enableLogging) {
+                    this.log('[%s] %s.', this.name, this.lang.disabledAL)
+                  }
                 }
               }
             }
           }
+          if (this.accessory.context.eweUIID === 137 && params.mode === 16) {
+            // Festive scene enabled
+            this.accessory.alController.disableAdaptiveLighting()
+            this.service.updateCharacteristic(this.cusChar.FestiveScene, true)
+            if (this.enableLogging) {
+              this.log('[%s] %s [%s].', this.name, this.lang.curScene, 'festive')
+            }
+          }
           break
         case 104:
           // B02-B-A60, B05-B-A60, GTLC104
diff --git a/lib/utils/custom-chars.js b/lib/utils/custom-chars.js
index 0cd205d3..498ebc45 100644
--- a/lib/utils/custom-chars.js
+++ b/lib/utils/custom-chars.js
@@ -7,7 +7,8 @@ module.exports = class customCharacteristics {
     this.hapServ = api.hap.Service
     this.hapChar = api.hap.Characteristic
     this.uuids = {
-      invertSwitch: 'E965F001-079E-48FF-8F27-9C2605A29F52'
+      invertSwitch: 'E965F001-079E-48FF-8F27-9C2605A29F52',
+      festiveScene: 'E965F002-079E-48FF-8F27-9C2605A29F52'
     }
     const self = this
     this.InvertSwitch = function () {
@@ -18,8 +19,18 @@ module.exports = class customCharacteristics {
       })
       this.value = this.getDefaultValue()
     }
+    this.FestiveScene = function () {
+      self.hapChar.call(this, 'Festive Scene', self.uuids.festiveScene)
+      this.setProps({
+        format: self.hapChar.Formats.BOOL,
+        perms: [self.hapChar.Perms.READ, self.hapChar.Perms.WRITE, self.hapChar.Perms.NOTIFY]
+      })
+      this.value = this.getDefaultValue()
+    }
     const inherits = require('util').inherits
     inherits(this.InvertSwitch, this.hapChar)
+    inherits(this.FestiveScene, this.hapChar)
     this.InvertSwitch.UUID = this.uuids.invertSwitch
+    this.FestiveScene.UUID = this.uuids.festiveScene
   }
 }
diff --git a/lib/utils/lang-en.js b/lib/utils/lang-en.js
index 14c21eb5..e666550f 100644
--- a/lib/utils/lang-en.js
+++ b/lib/utils/lang-en.js
@@ -38,6 +38,7 @@ module.exports = {
   curPos: 'current position',
   curPower: 'current power',
   curPur: 'current purifying',
+  curScene: 'current scene',
   curSpeed: 'current speed',
   curState: 'current state',
   curTarg: 'current target',
diff --git a/lib/utils/lang-fr.js b/lib/utils/lang-fr.js
index 7e01d58e..74109010 100644
--- a/lib/utils/lang-fr.js
+++ b/lib/utils/lang-fr.js
@@ -38,6 +38,7 @@ module.exports = {
   curPos: 'position actuelle',
   curPower: 'alimentation actuelle',
   curPur: 'purification actuelle',
+  curScene: 'current scene',
   curSpeed: 'vitesse actuelle',
   curState: 'état actuel',
   curTarg: 'cible actuelle',

From 9a33a3d67a78109281e6211acb5b78ff70d371c7 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 29 Nov 2021 12:07:08 +0000
Subject: [PATCH 2820/3183] 8.6.1-beta.9

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 06e44d6f..15caa298 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.6.1-beta.8",
+  "version": "8.6.1-beta.9",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.6.1-beta.8",
+      "version": "8.6.1-beta.9",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index eeb01c24..07e37b45 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.6.1-beta.8",
+  "version": "8.6.1-beta.9",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From 38ca094f24403280eb84539d0b737bd808388260 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 30 Nov 2021 08:12:35 +0000
Subject: [PATCH 2821/3183] create configuration for gd-dc5 lock simulation

---
 config.schema.json                   |  25 ++-
 lib/device/simulation/lock-eachen.js | 220 +++++++++++++++++++++++++++
 lib/index.js                         |   8 +-
 lib/utils/constants.js               |   2 +
 4 files changed, 251 insertions(+), 4 deletions(-)
 create mode 100644 lib/device/simulation/lock-eachen.js

diff --git a/config.schema.json b/config.schema.json
index bf99dada..6bb9da52 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -299,6 +299,24 @@
                 "functionBody": "return (model.singleDevices && model.singleDevices[arrayIndices] && model.singleDevices[arrayIndices].deviceId && ['king'].includes(model.singleDevices[arrayIndices].deviceModel) && !model.singleDevices[arrayIndices].ignoreDevice);"
               }
             },
+            "showAsEachen": {
+              "type": "string",
+              "title": "Garage Device Accessory Type",
+              "description": "Select the accessory type to show in HomeKit.",
+              "oneOf": [
+                {
+                  "title": "Garage Door (Default)",
+                  "enum": ["garage"]
+                },
+                {
+                  "title": "Lock",
+                  "enum": ["lock"]
+                }
+              ],
+              "condition": {
+                "functionBody": "return (model.singleDevices && model.singleDevices[arrayIndices] && model.singleDevices[arrayIndices].deviceId && ['gddc5'].includes(model.singleDevices[arrayIndices].deviceModel) && !model.singleDevices[arrayIndices].ignoreDevice);"
+              }
+            },
             "inUsePowerThreshold": {
               "type": "integer",
               "title": "Outlet 'In Use' Threshold",
@@ -314,7 +332,7 @@
               "title": "Status By Inching",
               "description": "If true, the plugin will show the on/off status based on inching mode.",
               "condition": {
-                "functionBody": "return (model.singleDevices && model.singleDevices[arrayIndices] && ['default', 'outlet'].includes(model.singleDevices[arrayIndices].showAs) && !model.singleDevices[arrayIndices].ignoreDevice);"
+                "functionBody": "return (model.singleDevices && model.singleDevices[arrayIndices] && ['default', 'outlet'].includes(model.singleDevices[arrayIndices].showAs) && !['king', 'gddc5'].includes(model.singleDevices[arrayIndices].deviceModel) && !model.singleDevices[arrayIndices].ignoreDevice);"
               }
             },
             "sensorType": {
@@ -362,7 +380,7 @@
               "placeholder": 100,
               "minimum": 20,
               "condition": {
-                "functionBody": "return (model.singleDevices && model.singleDevices[arrayIndices] && (model.singleDevices[arrayIndices].deviceModel === 'gddc5' || ['garage', 'lock', 'gate'].includes(model.singleDevices[arrayIndices].showAs)) && !model.singleDevices[arrayIndices].ignoreDevice);"
+                "functionBody": "return (model.singleDevices && model.singleDevices[arrayIndices] && ((model.singleDevices[arrayIndices].deviceModel === 'gddc5' && model.singleDevices[arrayIndices].showAsEachen !== 'lock') || ['garage', 'lock', 'gate'].includes(model.singleDevices[arrayIndices].showAs)) && !model.singleDevices[arrayIndices].ignoreDevice);"
               }
             },
             "operationTimeDown": {
@@ -398,7 +416,7 @@
               "title": "Obstruction Switch",
               "description": "An optional switch that will trigger the Obstruction Detected feature depending on its value. Otherwise leave blank.",
               "condition": {
-                "functionBody": "return (model.singleDevices && model.singleDevices[arrayIndices] && (model.singleDevices[arrayIndices].deviceModel === 'gddc5' || ['garage'].includes(model.singleDevices[arrayIndices].showAs)) && !model.singleDevices[arrayIndices].ignoreDevice);"
+                "functionBody": "return (model.singleDevices && model.singleDevices[arrayIndices] && ((model.singleDevices[arrayIndices].deviceModel === 'gddc5' && model.singleDevices[arrayIndices].showAsEachen !== 'lock') || ['garage'].includes(model.singleDevices[arrayIndices].showAs)) && !model.singleDevices[arrayIndices].ignoreDevice);"
               }
             },
             "ipAddress": {
@@ -1654,6 +1672,7 @@
             "singleDevices[].deviceModel",
             "singleDevices[].showAs",
             "singleDevices[].showAsMotor",
+            "singleDevices[].showAsEachen",
             "singleDevices[].inUsePowerThreshold",
             "singleDevices[].isInched",
             "singleDevices[].operationTime",
diff --git a/lib/device/simulation/lock-eachen.js b/lib/device/simulation/lock-eachen.js
new file mode 100644
index 00000000..2c12b07c
--- /dev/null
+++ b/lib/device/simulation/lock-eachen.js
@@ -0,0 +1,220 @@
+/* jshint node: true, esversion: 10, -W014, -W033 */
+/* eslint-disable new-cap */
+'use strict'
+
+module.exports = class deviceLockEachen {
+  constructor (platform, accessory) {
+    // Set up variables from the platform
+    this.eveChar = platform.eveChar
+    this.funcs = platform.funcs
+    this.hapChar = platform.api.hap.Characteristic
+    this.hapErr = platform.api.hap.HapStatusError
+    this.hapServ = platform.api.hap.Service
+    this.lang = platform.lang
+    this.log = platform.log
+    this.platform = platform
+
+    // Set up variables from the accessory
+    this.name = accessory.displayName
+    this.accessory = accessory
+
+    // Initially set the online flag as true (to be then updated as false if necessary)
+    this.isOnline = true
+
+    // Set up custom variables for this device type
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
+    this.operationTime = deviceConf.operationTime || platform.consts.defaultValues.operationTime
+
+    // Set the correct logging variables for this accessory
+    this.enableLogging = !platform.config.disableDeviceLogging
+    this.enableDebugLogging = platform.config.debug
+    if (deviceConf && deviceConf.overrideLogging) {
+      switch (deviceConf.overrideLogging) {
+        case 'standard':
+          this.enableLogging = true
+          this.enableDebugLogging = false
+          break
+        case 'debug':
+          this.enableLogging = true
+          this.enableDebugLogging = true
+          break
+        case 'disable':
+          this.enableLogging = false
+          this.enableDebugLogging = false
+          break
+      }
+    }
+
+    // If the accessory has a switch service then remove it
+    if (this.accessory.getService(this.hapServ.Switch)) {
+      this.accessory.removeService(this.accessory.getService(this.hapServ.Switch))
+    }
+
+    // If the accessory has a contact sensor service then remove it
+    if (this.accessory.getService(this.hapServ.ContactSensor)) {
+      this.accessory.removeService(this.accessory.getService(this.hapServ.ContactSensor))
+    }
+
+    // Add the garage door service if it doesn't already exist
+    if (!(this.service = this.accessory.getService(this.hapServ.GarageDoorOpener))) {
+      this.service = this.accessory.addService(this.hapServ.GarageDoorOpener)
+      this.service.updateCharacteristic(this.hapChar.CurrentDoorState, 1)
+      this.service.updateCharacteristic(this.hapChar.TargetDoorState, 1)
+      this.service.updateCharacteristic(this.hapChar.ObstructionDetected, false)
+      this.service.addCharacteristic(this.eveChar.LastActivation)
+      this.service.addCharacteristic(this.eveChar.ResetTotal)
+      this.service.addCharacteristic(this.eveChar.TimesOpened)
+    }
+
+    // Remove unneeded characteristics
+    if (this.service.testCharacteristic(this.hapChar.ContactSensorState)) {
+      this.service.removeCharacteristic(
+        this.service.getCharacteristic(this.hapChar.ContactSensorState)
+      )
+    }
+    if (this.service.testCharacteristic(this.hapChar.OpenDuration)) {
+      this.service.removeCharacteristic(this.service.getCharacteristic(this.hapChar.OpenDuration))
+    }
+    if (this.service.testCharacteristic(this.hapChar.ClosedDuration)) {
+      this.service.removeCharacteristic(this.service.getCharacteristic(this.hapChar.ClosedDuration))
+    }
+
+    // Add the set handler to the garage door reset total characteristic
+    this.service.getCharacteristic(this.eveChar.ResetTotal).onSet(value => {
+      this.service.updateCharacteristic(this.eveChar.TimesOpened, 0)
+    })
+
+    // Add the set handler to the target position characteristic
+    this.service.getCharacteristic(this.hapChar.TargetDoorState).onSet(value => {
+      // We don't use await as we want the callback to be run straight away
+      this.internalStateUpdate(value)
+    })
+
+    // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
+    if (!platform.config.disableNoResponse) {
+      this.service.getCharacteristic(this.hapChar.CurrentDoorState).onGet(() => {
+        if (!this.isOnline) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.CurrentDoorState).value
+      })
+      this.service.getCharacteristic(this.hapChar.TargetDoorState).onGet(() => {
+        if (!this.isOnline) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.TargetDoorState).value
+      })
+    }
+
+    // Update the obstruction detected to false on Homebridge restart
+    this.service.updateCharacteristic(this.hapChar.ObstructionDetected, false)
+
+    // Pass the accessory to Fakegato to set up with Eve
+    this.accessory.eveService = new platform.eveService('door', this.accessory, {
+      log: platform.config.debugFakegato ? this.log : () => {}
+    })
+    this.accessory.eveService.addEntry({
+      status: this.service.getCharacteristic(this.hapChar.CurrentDoorState).value === 0 ? 0 : 1
+    })
+
+    // Output the customised options to the log
+    const opts = JSON.stringify({
+      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
+      operationTime: this.operationTime,
+      showAs: 'garage_eachen'
+    })
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
+  }
+
+  async internalStateUpdate (value) {
+    try {
+      const params = { switch: value === 0 ? 'on' : 'off' }
+      const curState = this.service.getCharacteristic(this.hapChar.CurrentDoorState).value
+      if (value === curState % 2) {
+        return
+      }
+      this.inUse = true
+      await this.platform.sendDeviceUpdate(this.accessory, params)
+      this.service.updateCharacteristic(this.hapChar.TargetDoorState, value)
+      this.service.updateCharacteristic(this.hapChar.CurrentDoorState, value + 2)
+      await this.funcs.sleep(3000)
+      this.inUse = false
+      if (value === 0) {
+        this.accessory.eveService.addEntry({ status: 0 })
+        this.service.updateCharacteristic(
+          this.eveChar.LastActivation,
+          Math.round(new Date().valueOf() / 1000) - this.accessory.eveService.getInitialTime()
+        )
+        this.service.updateCharacteristic(
+          this.eveChar.TimesOpened,
+          this.service.getCharacteristic(this.eveChar.TimesOpened).value + 1
+        )
+        await this.funcs.sleep(Math.max((this.operationTime - 30) * 100, 0))
+        this.service.updateCharacteristic(this.hapChar.CurrentDoorState, 0)
+        if (this.enableLogging) {
+          this.log('[%s] %s [%s].', this.name, this.lang.curState, this.lang.doorOpen)
+        }
+      }
+    } catch (err) {
+      this.inUse = false
+      this.platform.deviceUpdateError(this.accessory, err, true)
+      setTimeout(() => {
+        this.service.updateCharacteristic(
+          this.hapChar.TargetDoorState,
+          this.accessory.context.cacheTargetDoorState
+        )
+      }, 2000)
+      this.service.updateCharacteristic(this.hapChar.TargetDoorState, new this.hapErr(-70402))
+    }
+  }
+
+  async externalUpdate (params) {
+    try {
+      if (!params.switch || this.inUse) {
+        return
+      }
+
+      // In a period of three seconds we want to only use the 'last' update
+      const updateKey = this.funcs.generateRandomString(5)
+      this.updateKey = updateKey
+      await this.funcs.sleep(3000)
+      if (this.updateKey !== updateKey) {
+        return
+      }
+
+      // Update the characteristics
+      const newValue = params.switch === 'on' ? 0 : 1
+      if (this.service.getCharacteristic(this.hapChar.TargetDoorState).value !== newValue) {
+        this.service.updateCharacteristic(this.hapChar.TargetDoorState, newValue)
+      }
+      if (this.service.getCharacteristic(this.hapChar.CurrentDoorState).value !== newValue) {
+        this.service.updateCharacteristic(this.hapChar.CurrentDoorState, newValue)
+      }
+      this.accessory.eveService.addEntry({ status: newValue })
+      if (newValue === 0) {
+        this.service.updateCharacteristic(
+          this.eveChar.LastActivation,
+          Math.round(new Date().valueOf() / 1000) - this.accessory.eveService.getInitialTime()
+        )
+        this.service.updateCharacteristic(
+          this.eveChar.TimesOpened,
+          this.service.getCharacteristic(this.eveChar.TimesOpened).value + 1
+        )
+      }
+      if (params.updateSource && this.enableLogging) {
+        this.log(
+          '[%s] %s [%s].',
+          this.name,
+          this.lang.curState,
+          params.switch === 'on' ? this.lang.doorOpen : this.lang.doorClosed
+        )
+      }
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, false)
+    }
+  }
+
+  markStatus (isOnline) {
+    this.isOnline = isOnline
+  }
+}
diff --git a/lib/index.js b/lib/index.js
index 42a83168..f1484096 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -361,6 +361,7 @@ class eWeLinkPlatform {
                   case 'overrideLogging':
                   case 'sensorType':
                   case 'showAs':
+                  case 'showAsEachen':
                   case 'showAsMotor': {
                     const inSet = this.consts.allowed[k].includes(v)
                     if (typeof v !== 'string' || !inSet) {
@@ -790,8 +791,13 @@ class eWeLinkPlatform {
         /***************************
         GARAGE DOORS [EACHEN GD-DC5]
         ***************************/
+        const instance =
+          this.deviceConf[device.deviceid] &&
+          this.deviceConf[device.deviceid].showAsEachen === 'lock'
+            ? 'lock-eachen'
+            : 'garage-eachen'
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require('./device/simulation/garage-eachen'))(this, accessory)
+        accessory.control = new (require('./device/simulation/' + instance))(this, accessory)
         /**************************/
       } else if (device.showAs === 'gate') {
         /********************************************
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index ed6ba67b..ce475f36 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -88,6 +88,7 @@ module.exports = {
       'deviceModel',
       'showAs',
       'showAsMotor',
+      'showAsEachen',
       'inUsePowerThreshold',
       'isInched',
       'operationTime',
@@ -242,6 +243,7 @@ module.exports = {
       'window'
     ],
     showAsMotor: ['blind', 'door', 'garage', 'window'],
+    showAsEachen: ['garage', 'lock'],
     curtainType: ['buttons', 'blind', 'door', 'window'],
     deviceType: ['button', 'curtain', 'sensor']
   },

From cd80581767542dd76c9f84f9c151bc43d3589c93 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 30 Nov 2021 08:45:02 +0000
Subject: [PATCH 2822/3183] create eachen lock sim

---
 lib/device/simulation/garage-eachen.js |   5 +
 lib/device/simulation/lock-eachen.js   | 128 +++++++------------------
 2 files changed, 39 insertions(+), 94 deletions(-)

diff --git a/lib/device/simulation/garage-eachen.js b/lib/device/simulation/garage-eachen.js
index 279476af..1fbd61e1 100644
--- a/lib/device/simulation/garage-eachen.js
+++ b/lib/device/simulation/garage-eachen.js
@@ -55,6 +55,11 @@ module.exports = class deviceGarageEachen {
       this.accessory.removeService(this.accessory.getService(this.hapServ.ContactSensor))
     }
 
+    // If the accessory has a lock service then remove it
+    if (this.accessory.getService(this.hapServ.LockMechanism)) {
+      this.accessory.removeService(this.accessory.getService(this.hapServ.LockMechanism))
+    }
+
     // Add the garage door service if it doesn't already exist
     if (!(this.service = this.accessory.getService(this.hapServ.GarageDoorOpener))) {
       this.service = this.accessory.addService(this.hapServ.GarageDoorOpener)
diff --git a/lib/device/simulation/lock-eachen.js b/lib/device/simulation/lock-eachen.js
index 2c12b07c..a8a91b62 100644
--- a/lib/device/simulation/lock-eachen.js
+++ b/lib/device/simulation/lock-eachen.js
@@ -50,121 +50,73 @@ module.exports = class deviceLockEachen {
       this.accessory.removeService(this.accessory.getService(this.hapServ.Switch))
     }
 
-    // If the accessory has a contact sensor service then remove it
-    if (this.accessory.getService(this.hapServ.ContactSensor)) {
-      this.accessory.removeService(this.accessory.getService(this.hapServ.ContactSensor))
+    // If the accessory has a garage  service then remove it
+    if (this.accessory.getService(this.hapServ.GarageDoorOpener)) {
+      this.accessory.removeService(this.accessory.getService(this.hapServ.GarageDoorOpener))
     }
 
-    // Add the garage door service if it doesn't already exist
-    if (!(this.service = this.accessory.getService(this.hapServ.GarageDoorOpener))) {
-      this.service = this.accessory.addService(this.hapServ.GarageDoorOpener)
-      this.service.updateCharacteristic(this.hapChar.CurrentDoorState, 1)
-      this.service.updateCharacteristic(this.hapChar.TargetDoorState, 1)
-      this.service.updateCharacteristic(this.hapChar.ObstructionDetected, false)
-      this.service.addCharacteristic(this.eveChar.LastActivation)
-      this.service.addCharacteristic(this.eveChar.ResetTotal)
-      this.service.addCharacteristic(this.eveChar.TimesOpened)
-    }
-
-    // Remove unneeded characteristics
-    if (this.service.testCharacteristic(this.hapChar.ContactSensorState)) {
-      this.service.removeCharacteristic(
-        this.service.getCharacteristic(this.hapChar.ContactSensorState)
-      )
-    }
-    if (this.service.testCharacteristic(this.hapChar.OpenDuration)) {
-      this.service.removeCharacteristic(this.service.getCharacteristic(this.hapChar.OpenDuration))
-    }
-    if (this.service.testCharacteristic(this.hapChar.ClosedDuration)) {
-      this.service.removeCharacteristic(this.service.getCharacteristic(this.hapChar.ClosedDuration))
-    }
-
-    // Add the set handler to the garage door reset total characteristic
-    this.service.getCharacteristic(this.eveChar.ResetTotal).onSet(value => {
-      this.service.updateCharacteristic(this.eveChar.TimesOpened, 0)
-    })
-
-    // Add the set handler to the target position characteristic
-    this.service.getCharacteristic(this.hapChar.TargetDoorState).onSet(value => {
+    // Add the set handler to the lock target state characteristic
+    this.service.getCharacteristic(this.hapChar.LockTargetState).onSet(value => {
       // We don't use await as we want the callback to be run straight away
-      this.internalStateUpdate(value)
+      this.internalUpdate(value)
     })
 
     // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
     if (!platform.config.disableNoResponse) {
-      this.service.getCharacteristic(this.hapChar.CurrentDoorState).onGet(() => {
+      this.service.getCharacteristic(this.hapChar.LockCurrentState).onGet(() => {
         if (!this.isOnline) {
           throw new this.hapErr(-70402)
         }
-        return this.service.getCharacteristic(this.hapChar.CurrentDoorState).value
+        return this.service.getCharacteristic(this.hapChar.LockCurrentState).value
       })
-      this.service.getCharacteristic(this.hapChar.TargetDoorState).onGet(() => {
+      this.service.getCharacteristic(this.hapChar.LockTargetState).onGet(() => {
         if (!this.isOnline) {
           throw new this.hapErr(-70402)
         }
-        return this.service.getCharacteristic(this.hapChar.TargetDoorState).value
+        return this.service.getCharacteristic(this.hapChar.LockTargetState).value
       })
     }
 
-    // Update the obstruction detected to false on Homebridge restart
-    this.service.updateCharacteristic(this.hapChar.ObstructionDetected, false)
-
-    // Pass the accessory to Fakegato to set up with Eve
-    this.accessory.eveService = new platform.eveService('door', this.accessory, {
-      log: platform.config.debugFakegato ? this.log : () => {}
-    })
-    this.accessory.eveService.addEntry({
-      status: this.service.getCharacteristic(this.hapChar.CurrentDoorState).value === 0 ? 0 : 1
-    })
-
     // Output the customised options to the log
     const opts = JSON.stringify({
       logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
-      operationTime: this.operationTime,
-      showAs: 'garage_eachen'
+      showAs: 'garage_eachen',
+      showAsEachen: 'lock'
     })
     this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
 
-  async internalStateUpdate (value) {
+  async internalUpdate (value) {
+    const currentState = this.service.getCharacteristic(this.hapChar.LockTargetState).value
     try {
-      const params = { switch: value === 0 ? 'on' : 'off' }
-      const curState = this.service.getCharacteristic(this.hapChar.CurrentDoorState).value
-      if (value === curState % 2) {
+      // Don't continue if the value is the same as before
+      if (value === currentState) {
         return
       }
+
+      // Generate the params
+      const params = { switch: value === 0 ? 'on' : 'off' }
       this.inUse = true
       await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.service.updateCharacteristic(this.hapChar.TargetDoorState, value)
-      this.service.updateCharacteristic(this.hapChar.CurrentDoorState, value + 2)
+      this.service.updateCharacteristic(this.hapChar.LockTargetState, value)
+      this.service.updateCharacteristic(this.hapChar.LockCurrentState, value)
       await this.funcs.sleep(3000)
       this.inUse = false
-      if (value === 0) {
-        this.accessory.eveService.addEntry({ status: 0 })
-        this.service.updateCharacteristic(
-          this.eveChar.LastActivation,
-          Math.round(new Date().valueOf() / 1000) - this.accessory.eveService.getInitialTime()
-        )
-        this.service.updateCharacteristic(
-          this.eveChar.TimesOpened,
-          this.service.getCharacteristic(this.eveChar.TimesOpened).value + 1
+      if (this.enableLogging) {
+        this.log(
+          '[%s] %s [%s].',
+          this.name,
+          this.lang.curState,
+          value === 0 ? this.lang.lockUnlocked : this.lang.lockLocked
         )
-        await this.funcs.sleep(Math.max((this.operationTime - 30) * 100, 0))
-        this.service.updateCharacteristic(this.hapChar.CurrentDoorState, 0)
-        if (this.enableLogging) {
-          this.log('[%s] %s [%s].', this.name, this.lang.curState, this.lang.doorOpen)
-        }
       }
     } catch (err) {
       this.inUse = false
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
-        this.service.updateCharacteristic(
-          this.hapChar.TargetDoorState,
-          this.accessory.context.cacheTargetDoorState
-        )
+        this.service.updateCharacteristic(this.hapChar.LockTargetState, currentState)
       }, 2000)
-      this.service.updateCharacteristic(this.hapChar.TargetDoorState, new this.hapErr(-70402))
+      this.service.updateCharacteristic(this.hapChar.LockTargetState, new this.hapErr(-70402))
     }
   }
 
@@ -184,29 +136,17 @@ module.exports = class deviceLockEachen {
 
       // Update the characteristics
       const newValue = params.switch === 'on' ? 0 : 1
-      if (this.service.getCharacteristic(this.hapChar.TargetDoorState).value !== newValue) {
-        this.service.updateCharacteristic(this.hapChar.TargetDoorState, newValue)
-      }
-      if (this.service.getCharacteristic(this.hapChar.CurrentDoorState).value !== newValue) {
-        this.service.updateCharacteristic(this.hapChar.CurrentDoorState, newValue)
-      }
-      this.accessory.eveService.addEntry({ status: newValue })
-      if (newValue === 0) {
-        this.service.updateCharacteristic(
-          this.eveChar.LastActivation,
-          Math.round(new Date().valueOf() / 1000) - this.accessory.eveService.getInitialTime()
-        )
-        this.service.updateCharacteristic(
-          this.eveChar.TimesOpened,
-          this.service.getCharacteristic(this.eveChar.TimesOpened).value + 1
-        )
+      if (this.service.getCharacteristic(this.hapChar.LockTargetState).value !== newValue) {
+        this.service.updateCharacteristic(this.hapChar.LockTargetState, newValue)
+        this.service.updateCharacteristic(this.hapChar.LockCurrentState, newValue)
       }
+
       if (params.updateSource && this.enableLogging) {
         this.log(
           '[%s] %s [%s].',
           this.name,
           this.lang.curState,
-          params.switch === 'on' ? this.lang.doorOpen : this.lang.doorClosed
+          params.switch === 'on' ? this.lang.lockUnlocked : this.lang.lockLocked
         )
       }
     } catch (err) {

From c4aa5af830910ad17453301ee61157a4a5e2251c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 30 Nov 2021 08:45:32 +0000
Subject: [PATCH 2823/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3d7fc8d5..86cba5bb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ All notable changes to homebridge-ewelink will be documented in this file.
 - Support Sonoff L2
 - Expose a single or multi-channel generic switch as a `Audio Receiver`, `Set Top Box` or `Streaming Stick` HomeKit category types
   - The accessory will need to be published as an external accessory meaning it will need to be added separately to HomeKit
+- Expose an Eachen GD-DC5 as a lock simulation
 
 ### Changed
 

From 3b80479e4bc8ddae3d9af6f477e3f5e8d2708081 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 30 Nov 2021 08:46:05 +0000
Subject: [PATCH 2824/3183] 8.6.1-beta.10

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 15caa298..0a08501e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.6.1-beta.9",
+  "version": "8.6.1-beta.10",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.6.1-beta.9",
+      "version": "8.6.1-beta.10",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 07e37b45..1581a908 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.6.1-beta.9",
+  "version": "8.6.1-beta.10",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From 92fd45032c42177243cacc1822b02a0d182a76ab Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 3 Dec 2021 06:19:43 +0000
Subject: [PATCH 2825/3183] bump node versions

---
 CHANGELOG.md      | 3 ++-
 package-lock.json | 2 +-
 package.json      | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 86cba5bb..ea80e1bb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,7 +13,8 @@ All notable changes to homebridge-ewelink will be documented in this file.
 
 ### Changed
 
-- Recommended Homebridge bumped to v1.3.8
+- Bump `homebridge` recommended version to v1.3.8
+- Bump `node` recommended versions to v14.18.2 or v16.13.1
 - Bump `ws` to v8.3.0
 
 ### Fixed
diff --git a/package-lock.json b/package-lock.json
index 0a08501e..5478c4b2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -36,7 +36,7 @@
       },
       "engines": {
         "homebridge": "^1.3.8",
-        "node": "^14.18.1 || ^16.13.0"
+        "node": "^14.18.2 || ^16.13.1"
       }
     },
     "node_modules/@homebridge/plugin-ui-utils": {
diff --git a/package.json b/package.json
index 1581a908..37a762df 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,7 @@
   "main": "lib/index.js",
   "engines": {
     "homebridge": "^1.3.8",
-    "node": "^14.18.1 || ^16.13.0"
+    "node": "^14.18.2 || ^16.13.1"
   },
   "repository": {
     "type": "git",

From 348a325fe95ad06585ff3122d76d7aa7c40ed43c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 5 Dec 2021 11:16:03 +0000
Subject: [PATCH 2826/3183] properly add the lock service

---
 lib/device/simulation/lock-eachen.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/device/simulation/lock-eachen.js b/lib/device/simulation/lock-eachen.js
index a8a91b62..a3a20019 100644
--- a/lib/device/simulation/lock-eachen.js
+++ b/lib/device/simulation/lock-eachen.js
@@ -55,6 +55,11 @@ module.exports = class deviceLockEachen {
       this.accessory.removeService(this.accessory.getService(this.hapServ.GarageDoorOpener))
     }
 
+    // Add the lock service if it doesn't already exist
+    this.service =
+      this.accessory.getService(this.hapServ.LockMechanism) ||
+      this.accessory.addService(this.hapServ.LockMechanism)
+
     // Add the set handler to the lock target state characteristic
     this.service.getCharacteristic(this.hapChar.LockTargetState).onSet(value => {
       // We don't use await as we want the callback to be run straight away

From c4a3b31cccaa19f4c4845fd56f71f51de916621f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 5 Dec 2021 11:16:35 +0000
Subject: [PATCH 2827/3183] 8.6.1-beta.11

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 5478c4b2..9bb9c614 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.6.1-beta.10",
+  "version": "8.6.1-beta.11",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.6.1-beta.10",
+      "version": "8.6.1-beta.11",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 37a762df..8069df58 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.6.1-beta.10",
+  "version": "8.6.1-beta.11",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From daa55d730ba2743969fc7418322defd8c608132b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 5 Dec 2021 17:17:39 +0000
Subject: [PATCH 2828/3183] show uiid and model on init

useful for me to debug other users
---
 lib/index.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/lib/index.js b/lib/index.js
index f1484096..32a90cd1 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1448,7 +1448,14 @@ class eWeLinkPlatform {
       // Update any changes to the device into our devicesInHB map
       this.api.updatePlatformAccessories(plugin.name, plugin.alias, [accessory])
       devicesInHB.set(accessory.UUID, accessory)
-      this.log('[%s] %s %s.', accessory.displayName, this.lang.devInit, str)
+      this.log(
+        '[%s] %s %s [%s:%s].',
+        accessory.displayName,
+        this.lang.devInit,
+        str,
+        uiid,
+        device.productModel
+      )
 
       // Store the device in the persist file
       if (storageClient && this.consts.devices.lan.includes(uiid)) {

From dd3fc8e3867f5fa55e4d8d94252e7bdfb11de69f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 5 Dec 2021 17:46:23 +0000
Subject: [PATCH 2829/3183] close 0185 before opening again

---
 lib/device/simulation/lock-one.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/lib/device/simulation/lock-one.js b/lib/device/simulation/lock-one.js
index 83052036..8b5a310d 100644
--- a/lib/device/simulation/lock-one.js
+++ b/lib/device/simulation/lock-one.js
@@ -159,6 +159,14 @@ module.exports = class deviceLockOne {
         return
       }
 
+      // This model may need a close command before opening again
+      if (this.accessory.context.eweModel === '0185') {
+        await this.platform.sendDeviceUpdate(this.accessory, {
+          switch: 'off'
+        })
+        await this.funcs.sleep(500)
+      }
+
       const params = {}
       switch (this.setup) {
         case 'switchSingle':

From caa40e02dec738d5c07a3db0290411b7fb6c2377 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 5 Dec 2021 17:46:52 +0000
Subject: [PATCH 2830/3183] 8.6.1-beta.12

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 9bb9c614..f167fff9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.6.1-beta.11",
+  "version": "8.6.1-beta.12",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.6.1-beta.11",
+      "version": "8.6.1-beta.12",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 8069df58..987e3ede 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.6.1-beta.11",
+  "version": "8.6.1-beta.12",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From c36cf2101ceca4fd89f9e4751fa4e125182ef9fe Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 8 Dec 2021 13:20:21 +0000
Subject: [PATCH 2831/3183] Update package-lock.json

---
 package-lock.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index f167fff9..9707ad58 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -390,9 +390,9 @@
       }
     },
     "node_modules/object-inspect": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.0.tgz",
-      "integrity": "sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg==",
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.1.tgz",
+      "integrity": "sha512-If7BjFlpkzzBeV1cqgT3OSWT3azyoxDGajR+iGnFBfVV2EWyDyWaZZW2ERDjUaY2QM8i5jI3Sj7mhsM4DDAqWA==",
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -819,9 +819,9 @@
       "integrity": "sha512-/j+fd/u71wNgKf3V2bx4tnDm+3GvLnlCuvf2MXbJ3wern+67IAb6zN9Leu1tCWPlPNZ+v1hLSibVukkPK2HqJw=="
     },
     "object-inspect": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.0.tgz",
-      "integrity": "sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg=="
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.1.tgz",
+      "integrity": "sha512-If7BjFlpkzzBeV1cqgT3OSWT3azyoxDGajR+iGnFBfVV2EWyDyWaZZW2ERDjUaY2QM8i5jI3Sj7mhsM4DDAqWA=="
     },
     "object-keys": {
       "version": "1.1.1",

From e44fe597f2a0ee3bb03563d1371272c65871fe61 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 8 Dec 2021 13:23:34 +0000
Subject: [PATCH 2832/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ea80e1bb..7746cd7a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 All notable changes to homebridge-ewelink will be documented in this file.
 
-## BETA
+## 8.7.0 (2021-12-08)
 
 ### Added
 

From 4bc67bbb66835fbd13ad8bfd7bc2089ce7535def Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 8 Dec 2021 13:23:52 +0000
Subject: [PATCH 2833/3183] 8.7.0

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 9707ad58..09792c05 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.6.1-beta.12",
+  "version": "8.7.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.6.1-beta.12",
+      "version": "8.7.0",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 987e3ede..43aa9b9d 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.6.1-beta.12",
+  "version": "8.7.0",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From c977fc3bc5b036b10920abe3a9077ef4f174760e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 9 Dec 2021 08:24:50 +0000
Subject: [PATCH 2834/3183] show some fields when no show as selected

---
 config.schema.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 6bb9da52..234b875b 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -324,7 +324,7 @@
               "placeholder": 0,
               "minimum": 0,
               "condition": {
-                "functionBody": "return (model.singleDevices && model.singleDevices[arrayIndices] && ['pow', 'iw'].includes(model.singleDevices[arrayIndices].deviceModel) && ['default', 'outlet'].includes(model.singleDevices[arrayIndices].showAs) && !model.singleDevices[arrayIndices].ignoreDevice);"
+                "functionBody": "return (model.singleDevices && model.singleDevices[arrayIndices] && ['pow', 'iw'].includes(model.singleDevices[arrayIndices].deviceModel) && [undefined, 'default', 'outlet'].includes(model.singleDevices[arrayIndices].showAs) && !model.singleDevices[arrayIndices].ignoreDevice);"
               }
             },
             "isInched": {
@@ -332,7 +332,7 @@
               "title": "Status By Inching",
               "description": "If true, the plugin will show the on/off status based on inching mode.",
               "condition": {
-                "functionBody": "return (model.singleDevices && model.singleDevices[arrayIndices] && ['default', 'outlet'].includes(model.singleDevices[arrayIndices].showAs) && !['king', 'gddc5'].includes(model.singleDevices[arrayIndices].deviceModel) && !model.singleDevices[arrayIndices].ignoreDevice);"
+                "functionBody": "return (model.singleDevices && model.singleDevices[arrayIndices] && [undefined, 'default', 'outlet'].includes(model.singleDevices[arrayIndices].showAs) && !['king', 'gddc5'].includes(model.singleDevices[arrayIndices].deviceModel) && !model.singleDevices[arrayIndices].ignoreDevice);"
               }
             },
             "sensorType": {
@@ -650,7 +650,7 @@
               "title": "Hide Channels",
               "description": "A comma separated list of channels to hide for this device. For example '0' or '0,1,2'.",
               "condition": {
-                "functionBody": "return (model.multiDevices && model.multiDevices[arrayIndices] && model.multiDevices[arrayIndices].deviceId && ['dual_dualr2', 'dualr3_switch', '4ch', 't', 'zb'].includes(model.multiDevices[arrayIndices].deviceModel) && ['default', 'outlet'].includes(model.multiDevices[arrayIndices].showAs) && !model.multiDevices[arrayIndices].ignoreDevice);"
+                "functionBody": "return (model.multiDevices && model.multiDevices[arrayIndices] && model.multiDevices[arrayIndices].deviceId && ['dual_dualr2', 'dualr3_switch', '4ch', 't', 'zb'].includes(model.multiDevices[arrayIndices].deviceModel) && [undefined, 'default', 'outlet'].includes(model.multiDevices[arrayIndices].showAs) && !model.multiDevices[arrayIndices].ignoreDevice);"
               }
             },
             "inUsePowerThreshold": {
@@ -660,7 +660,7 @@
               "placeholder": 0,
               "minimum": 0,
               "condition": {
-                "functionBody": "return (model.multiDevices && model.multiDevices[arrayIndices] && model.multiDevices[arrayIndices].deviceId && ['default', 'outlet'].includes(model.multiDevices[arrayIndices].showAs) && ['dualr3_switch'].includes(model.multiDevices[arrayIndices].deviceModel) && !model.multiDevices[arrayIndices].ignoreDevice);"
+                "functionBody": "return (model.multiDevices && model.multiDevices[arrayIndices] && model.multiDevices[arrayIndices].deviceId && [undefined, 'default', 'outlet'].includes(model.multiDevices[arrayIndices].showAs) && ['dualr3_switch'].includes(model.multiDevices[arrayIndices].deviceModel) && !model.multiDevices[arrayIndices].ignoreDevice);"
               }
             },
             "inchChannels": {
@@ -668,7 +668,7 @@
               "title": "Status By Inching",
               "description": "A comma separated list of channels to show the on/off status based on inching mode. For example '1,2'.",
               "condition": {
-                "functionBody": "return (model.multiDevices && model.multiDevices[arrayIndices] && ['dual_dualr2', 'dualr3_switch', '4ch', 't', 'zb'].includes(model.multiDevices[arrayIndices].deviceModel) && ['default', 'outlet'].includes(model.multiDevices[arrayIndices].showAs) && !model.multiDevices[arrayIndices].ignoreDevice);"
+                "functionBody": "return (model.multiDevices && model.multiDevices[arrayIndices] && ['dual_dualr2', 'dualr3_switch', '4ch', 't', 'zb'].includes(model.multiDevices[arrayIndices].deviceModel) && [undefined, 'default', 'outlet'].includes(model.multiDevices[arrayIndices].showAs) && !model.multiDevices[arrayIndices].ignoreDevice);"
               }
             },
             "sensorType": {

From cbe7a7b6a6f36a9e1c003c3d20684659419a0f78 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 9 Dec 2021 08:24:52 +0000
Subject: [PATCH 2835/3183] Update package-lock.json

---
 package-lock.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 09792c05..547704b0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -135,9 +135,9 @@
       "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="
     },
     "node_modules/follow-redirects": {
-      "version": "1.14.5",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.5.tgz",
-      "integrity": "sha512-wtphSXy7d4/OR+MvIFbCVBDzZ5520qV8XfPklSN5QtxuMUJZ+b0Wnst1e1lCDocfzuCkHqj8k0FpZqO+UIaKNA==",
+      "version": "1.14.6",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.6.tgz",
+      "integrity": "sha512-fhUl5EwSJbbl8AR+uYL2KQDxLkdSjZGR36xy46AO7cOMTrCMON6Sa28FmAnC2tRTDbd/Uuzz3aJBv7EBN7JH8A==",
       "funding": [
         {
           "type": "individual",
@@ -668,9 +668,9 @@
       "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="
     },
     "follow-redirects": {
-      "version": "1.14.5",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.5.tgz",
-      "integrity": "sha512-wtphSXy7d4/OR+MvIFbCVBDzZ5520qV8XfPklSN5QtxuMUJZ+b0Wnst1e1lCDocfzuCkHqj8k0FpZqO+UIaKNA=="
+      "version": "1.14.6",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.6.tgz",
+      "integrity": "sha512-fhUl5EwSJbbl8AR+uYL2KQDxLkdSjZGR36xy46AO7cOMTrCMON6Sa28FmAnC2tRTDbd/Uuzz3aJBv7EBN7JH8A=="
     },
     "function-bind": {
       "version": "1.1.1",

From bcabb7eaf835aac5f82e5a6da8c0febf9f8c1be9 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 9 Dec 2021 09:22:07 +0000
Subject: [PATCH 2836/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7746cd7a..479fbcba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 All notable changes to homebridge-ewelink will be documented in this file.
 
+## 8.7.1 (2021-12-09)
+
+### Fixed
+
+- Show 'Hide Channels' and 'Inched Channels' in config schema form even when no 'Show As' is selected
+
 ## 8.7.0 (2021-12-08)
 
 ### Added

From 23a8be1e8932f6542c8e497ecb1f8a42fbf05d22 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 9 Dec 2021 09:22:26 +0000
Subject: [PATCH 2837/3183] 8.7.1

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 547704b0..47cf5b82 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.7.0",
+  "version": "8.7.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.7.0",
+      "version": "8.7.1",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 43aa9b9d..8eb1a832 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.7.0",
+  "version": "8.7.1",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From 6d6ae9b710617f77b5f726d44957325fc7e3cd19 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 9 Dec 2021 12:27:46 +0000
Subject: [PATCH 2838/3183] auto reauthenticate on 406 error

---
 CHANGELOG.md         |  6 ++++++
 lib/connection/ws.js | 15 +++++++++------
 lib/index.js         | 16 +++++++++++++++-
 3 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 479fbcba..a597241b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 All notable changes to homebridge-ewelink will be documented in this file.
 
+## BETA
+
+### Added
+
+- Automatically re-authenticate credentials on `406` web socket error
+
 ## 8.7.1 (2021-12-09)
 
 ### Fixed
diff --git a/lib/connection/ws.js b/lib/connection/ws.js
index 793558b6..6a9fed6f 100644
--- a/lib/connection/ws.js
+++ b/lib/connection/ws.js
@@ -8,21 +8,24 @@ const ws = require('ws')
 const wsp = require('websocket-as-promised')
 
 module.exports = class connectionWS {
-  constructor (platform, authData) {
+  constructor (platform) {
     // Set up variables from the platform
     this.consts = platform.consts
     this.debug = platform.config.debug
     this.funcs = platform.funcs
     this.lang = platform.lang
     this.log = platform.log
+    this.platform = platform
 
+    // Flag used to determine ws connection status
+    this.wsIsConnected = false
+  }
+
+  receiveAuthData (authData) {
     // Set up variables from the authData (from HTTP)
     this.httpHost = authData.httpHost
     this.aToken = authData.aToken
     this.apiKey = authData.apiKey
-
-    // Flag used to determine ws connection status
-    this.wsIsConnected = false
   }
 
   async getHost () {
@@ -163,7 +166,7 @@ module.exports = class connectionWS {
           } else {
             // There was a problem with the authentication response
             if (res.error === 406) {
-              this.log.warn(this.lang.wsLogin406)
+              this.platform.reauthenticate()
             } else {
               const str = JSON.stringify(res, null, 2)
               throw new Error(this.lang.wsLoginErr + '\n' + str)
@@ -248,7 +251,7 @@ module.exports = class connectionWS {
               )
             }
           }
-        } else if (this.funcs.hasProperty(msg, 'error') && msg.error === 0) {
+        } else if (this.funcs.hasProperty(msg, 'error') && [0, 406].includes(msg.error)) {
           // Safe to ignore these messages
         } else {
           // WS message received has an unknown action
diff --git a/lib/index.js b/lib/index.js
index 32a90cd1..2382731f 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -491,7 +491,8 @@ class eWeLinkPlatform {
 
         // Set up the WS client, get the user WS host and login
         if (this.config.mode !== 'lan') {
-          wsClient = new (require('./connection/ws'))(this, authData)
+          wsClient = new (require('./connection/ws'))(this)
+          wsClient.receiveAuthData(authData)
           await wsClient.login()
 
           // Refresh the WS connection every 60 minutes
@@ -647,6 +648,19 @@ class eWeLinkPlatform {
     }
   }
 
+  async reauthenticate () {
+    try {
+      const authData = await httpClient.login()
+      this.config.password = authData.password
+      wsClient.receiveAuthData(authData)
+      await wsClient.login()
+    } catch (err) {
+      const eText = this.funcs.parseError(err)
+      this.log.warn(this.lang.wsLogin406)
+      this.log.warn('%s.', eText)
+    }
+  }
+
   async initialiseDevice (device) {
     try {
       let accessory

From c51ca99eb22dfe02992f514bb3a702a467977e2f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 9 Dec 2021 12:59:00 +0000
Subject: [PATCH 2839/3183] Revert "auto reauthenticate on 406 error"

This reverts commit 6d6ae9b710617f77b5f726d44957325fc7e3cd19.
---
 CHANGELOG.md         |  6 ------
 lib/connection/ws.js | 15 ++++++---------
 lib/index.js         | 16 +---------------
 3 files changed, 7 insertions(+), 30 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a597241b..479fbcba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,12 +2,6 @@
 
 All notable changes to homebridge-ewelink will be documented in this file.
 
-## BETA
-
-### Added
-
-- Automatically re-authenticate credentials on `406` web socket error
-
 ## 8.7.1 (2021-12-09)
 
 ### Fixed
diff --git a/lib/connection/ws.js b/lib/connection/ws.js
index 6a9fed6f..793558b6 100644
--- a/lib/connection/ws.js
+++ b/lib/connection/ws.js
@@ -8,24 +8,21 @@ const ws = require('ws')
 const wsp = require('websocket-as-promised')
 
 module.exports = class connectionWS {
-  constructor (platform) {
+  constructor (platform, authData) {
     // Set up variables from the platform
     this.consts = platform.consts
     this.debug = platform.config.debug
     this.funcs = platform.funcs
     this.lang = platform.lang
     this.log = platform.log
-    this.platform = platform
 
-    // Flag used to determine ws connection status
-    this.wsIsConnected = false
-  }
-
-  receiveAuthData (authData) {
     // Set up variables from the authData (from HTTP)
     this.httpHost = authData.httpHost
     this.aToken = authData.aToken
     this.apiKey = authData.apiKey
+
+    // Flag used to determine ws connection status
+    this.wsIsConnected = false
   }
 
   async getHost () {
@@ -166,7 +163,7 @@ module.exports = class connectionWS {
           } else {
             // There was a problem with the authentication response
             if (res.error === 406) {
-              this.platform.reauthenticate()
+              this.log.warn(this.lang.wsLogin406)
             } else {
               const str = JSON.stringify(res, null, 2)
               throw new Error(this.lang.wsLoginErr + '\n' + str)
@@ -251,7 +248,7 @@ module.exports = class connectionWS {
               )
             }
           }
-        } else if (this.funcs.hasProperty(msg, 'error') && [0, 406].includes(msg.error)) {
+        } else if (this.funcs.hasProperty(msg, 'error') && msg.error === 0) {
           // Safe to ignore these messages
         } else {
           // WS message received has an unknown action
diff --git a/lib/index.js b/lib/index.js
index 2382731f..32a90cd1 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -491,8 +491,7 @@ class eWeLinkPlatform {
 
         // Set up the WS client, get the user WS host and login
         if (this.config.mode !== 'lan') {
-          wsClient = new (require('./connection/ws'))(this)
-          wsClient.receiveAuthData(authData)
+          wsClient = new (require('./connection/ws'))(this, authData)
           await wsClient.login()
 
           // Refresh the WS connection every 60 minutes
@@ -648,19 +647,6 @@ class eWeLinkPlatform {
     }
   }
 
-  async reauthenticate () {
-    try {
-      const authData = await httpClient.login()
-      this.config.password = authData.password
-      wsClient.receiveAuthData(authData)
-      await wsClient.login()
-    } catch (err) {
-      const eText = this.funcs.parseError(err)
-      this.log.warn(this.lang.wsLogin406)
-      this.log.warn('%s.', eText)
-    }
-  }
-
   async initialiseDevice (device) {
     try {
       let accessory

From 0e6b9841a53656c05f58e67021d76f476df635e9 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 11 Dec 2021 15:46:36 +0000
Subject: [PATCH 2840/3183] Update package-lock.json

---
 package-lock.json | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 47cf5b82..8e234151 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -295,9 +295,9 @@
       }
     },
     "node_modules/is-negative-zero": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.1.tgz",
-      "integrity": "sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
+      "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
       "engines": {
         "node": ">= 0.4"
       },
@@ -371,11 +371,11 @@
       }
     },
     "node_modules/is-weakref": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.1.tgz",
-      "integrity": "sha512-b2jKc2pQZjaeFYWEf7ScFj+Be1I+PXmlu572Q8coTXZ+LD/QQZ7ShPMst8h16riVgyXTQwUsFEl74mDvc/3MHQ==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
+      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
       "dependencies": {
-        "call-bind": "^1.0.0"
+        "call-bind": "^1.0.2"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -763,9 +763,9 @@
       }
     },
     "is-negative-zero": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.1.tgz",
-      "integrity": "sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w=="
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
+      "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA=="
     },
     "is-number-object": {
       "version": "1.0.6",
@@ -806,11 +806,11 @@
       }
     },
     "is-weakref": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.1.tgz",
-      "integrity": "sha512-b2jKc2pQZjaeFYWEf7ScFj+Be1I+PXmlu572Q8coTXZ+LD/QQZ7ShPMst8h16riVgyXTQwUsFEl74mDvc/3MHQ==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
+      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
       "requires": {
-        "call-bind": "^1.0.0"
+        "call-bind": "^1.0.2"
       }
     },
     "node-persist": {

From bfa04919ac50488dac2a94d1ab8011962844e379 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 13 Dec 2021 20:20:39 +0000
Subject: [PATCH 2841/3183] support ewelink groups

---
 CHANGELOG.md           |  6 +++
 lib/connection/http.js | 37 ++++++++++++++++-
 lib/device/group.js    | 92 ++++++++++++++++++++++++++++++++++++++++++
 lib/index.js           | 36 ++++++++++++++++-
 lib/utils/constants.js |  4 +-
 5 files changed, 171 insertions(+), 4 deletions(-)
 create mode 100644 lib/device/group.js

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 479fbcba..53a65229 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 All notable changes to homebridge-ewelink will be documented in this file.
 
+## BETA
+
+### Added
+
+- Expose eWeLink groups as HomeKit switches
+
 ## 8.7.1 (2021-12-09)
 
 ### Fixed
diff --git a/lib/connection/http.js b/lib/connection/http.js
index 397e8ed0..c4009204 100644
--- a/lib/connection/http.js
+++ b/lib/connection/http.js
@@ -220,6 +220,7 @@ module.exports = class connectionHTTP {
       // Now we have a device list from all the eWeLink user homes
       const deviceList = []
       const sensorList = []
+      const groupList = []
       fullDeviceList.forEach(d => {
         // Check each item is a device and also remove any devices the user has ignored
         if (
@@ -242,11 +243,17 @@ module.exports = class connectionHTTP {
           } else {
             deviceList.push(d.itemData)
           }
+        } else if (d.itemType === 3) {
+          // Is a group
+          groupList.push(d.itemData)
         }
       })
 
       // Sensors need to go last as they update garages that need to exist already
-      return deviceList.concat(sensorList)
+      return {
+        httpDeviceList: deviceList.concat(sensorList),
+        httpGroupList: groupList
+      }
     } catch (err) {
       // Check to see if it's a eWeLink server problem and we can retry
       if (err.code && this.consts.httpRetryCodes.includes(err.code)) {
@@ -312,4 +319,32 @@ module.exports = class connectionHTTP {
       }
     }
   }
+
+  async updateGroup (groupId, params) {
+    // Used to get info about a specific device
+    const res = await axios.post(
+      'https://' + this.httpHost + '/v2/device/thing/status',
+      {
+        type: 2,
+        id: groupId,
+        params
+      },
+      {
+        headers: {
+          Authorization: 'Bearer ' + this.aToken,
+          'Content-Type': 'application/json',
+          'X-CK-Appid': this.consts.appId,
+          'X-CK-Nonce': Math.random()
+            .toString(36)
+            .substr(2, 8)
+        }
+      }
+    )
+
+    // Parse the response
+    const body = res.data
+    if (!body.data || body.error !== 0) {
+      throw new Error(JSON.stringify(body, null, 2))
+    }
+  }
 }
diff --git a/lib/device/group.js b/lib/device/group.js
new file mode 100644
index 00000000..caa0c1b6
--- /dev/null
+++ b/lib/device/group.js
@@ -0,0 +1,92 @@
+/* jshint node: true, esversion: 10, -W014, -W033 */
+/* eslint-disable new-cap */
+'use strict'
+
+module.exports = class deviceGroup {
+  constructor (platform, accessory) {
+    // Set up variables from the platform
+    this.eveChar = platform.eveChar
+    this.funcs = platform.funcs
+    this.hapChar = platform.api.hap.Characteristic
+    this.hapErr = platform.api.hap.HapStatusError
+    this.hapServ = platform.api.hap.Service
+    this.lang = platform.lang
+    this.log = platform.log
+    this.platform = platform
+
+    // Set up variables from the accessory
+    this.name = accessory.displayName
+    this.accessory = accessory
+
+    // Set the correct logging variables for this accessory
+    this.enableLogging = !platform.config.disableDeviceLogging
+    this.enableDebugLogging = platform.config.debug
+
+    // Add the switch service if it doesn't already exist
+    this.service =
+      this.accessory.getService(this.hapServ.Switch) ||
+      this.accessory.addService(this.hapServ.Switch)
+
+    // Add the set handler to the switch on/off characteristic
+    this.service
+      .getCharacteristic(this.hapChar.On)
+      .onSet(async value => await this.internalStateUpdate(value))
+
+    // Pass the accessory to Fakegato to set up with Eve
+    this.accessory.eveService = new platform.eveService('switch', this.accessory, {
+      log: platform.config.debugFakegato ? this.log : () => {}
+    })
+
+    // Output the customised options to the log
+    const opts = JSON.stringify({
+      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable'
+    })
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
+  }
+
+  async internalStateUpdate (value) {
+    try {
+      const newValue = value ? 'on' : 'off'
+      if (newValue === this.cacheState) {
+        return
+      }
+      const params = { switch: newValue }
+      await this.platform.sendGroupUpdate(this.accessory, params)
+      this.cacheState = newValue
+      this.accessory.eveService.addEntry({ status: value ? 1 : 0 })
+      if (this.enableLogging) {
+        this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
+      }
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, true)
+      setTimeout(() => {
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
+      }, 2000)
+      throw new this.hapErr(-70402)
+    }
+  }
+
+  async externalUpdate (params) {
+    try {
+      if (!this.isSCM && params.switch && params.switch !== this.cacheState) {
+        this.cacheState = params.switch
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
+        this.accessory.eveService.addEntry({ status: this.cacheState === 'on' ? 1 : 0 })
+        if (params.updateSource && this.enableLogging) {
+          this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
+        }
+      }
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, false)
+    }
+  }
+
+  async currentState () {
+    const toReturn = {}
+    toReturn.services = ['switch']
+    toReturn.switch = {
+      state: this.service.getCharacteristic(this.hapChar.On).value ? 'on' : 'off'
+    }
+    return toReturn
+  }
+}
diff --git a/lib/index.js b/lib/index.js
index 32a90cd1..9446c959 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -476,6 +476,7 @@ class eWeLinkPlatform {
       }
 
       const deviceList = []
+      const groupList = []
 
       // Username and password are now optional
       if (this.config.username && this.config.password) {
@@ -486,8 +487,9 @@ class eWeLinkPlatform {
 
         // Get a home and device list via HTTP request
         await httpClient.getHomes()
-        const httpDeviceList = await httpClient.getDevices()
+        const { httpDeviceList, httpGroupList } = await httpClient.getDevices()
         httpDeviceList.forEach(device => deviceList.push(device))
+        httpGroupList.forEach(group => groupList.push(group))
 
         // Set up the WS client, get the user WS host and login
         if (this.config.mode !== 'lan') {
@@ -547,10 +549,20 @@ class eWeLinkPlatform {
 
       // Initialise each device into HB
       deviceList.forEach(device => this.initialiseDevice(device))
+      groupList.forEach(async group => {
+        // Create the format of a device
+        group.extra = { uiid: 5000 }
+        group.deviceid = group.id
+        group.online = true
+        this.initialiseDevice(group)
+      })
 
       // Check for redundant accessories (in HB but not eWeLink)
       devicesInHB.forEach(async accessory => {
-        if (!deviceList.some(el => el.deviceid === accessory.context.eweDeviceId)) {
+        if (
+          !deviceList.some(el => el.deviceid === accessory.context.eweDeviceId) &&
+          !groupList.some(el => el.id === accessory.context.eweDeviceId)
+        ) {
           this.removeAccessory(accessory)
         }
       })
@@ -1353,6 +1365,13 @@ class eWeLinkPlatform {
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/zigbee/sensor-leak'))(this, accessory)
         /**************/
+      } else if (this.consts.devices.group.includes(uiid)) {
+        /*************
+        EWELINK GROUPS
+        *************/
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
+        accessory.control = new (require('./device/group'))(this, accessory)
+        /************/
       } else if (this.consts.devices.camera.includes(uiid)) {
         /*************
         SONOFF CAMERAS
@@ -1703,6 +1722,19 @@ class eWeLinkPlatform {
     })
   }
 
+  async sendGroupUpdate (accessory, params) {
+    // Add to a queue so multiple updates are at least 500ms apart
+    return await queue.add(async () => {
+      // Log the update being sent
+      if (accessory.control.enableDebugLogging) {
+        this.log('[%s] %s %s.', accessory.displayName, this.lang.updSend, JSON.stringify(params))
+      }
+
+      // Send the request via HTTP
+      httpClient.updateGroup(accessory.context.eweDeviceId, params)
+    })
+  }
+
   async receiveDeviceUpdate (device) {
     const deviceId = device.deviceid
     let accessory
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index ce475f36..0e263bfa 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -300,6 +300,7 @@ module.exports = {
     zbSensorMotion: [2026],
     zbSensorContact: [3026],
     zbSensorWater: [4026],
+    group: [5000],
     cannotSupport: [0, 65, 118, 119, 120, 121],
     garageSensors: [102, 3026],
     skipUpdateRequest: [1000]
@@ -430,7 +431,8 @@ module.exports = {
     3026: 1, // "ZIGBEE_DOOR_AND_WINDOW_SENSOR"
     3256: 3, // "ZIGBEE_SWITCH_3"
     4026: 1, // "ZIGBEE_WATER_SENSOR"
-    4256: 4 // "ZIGBEE_SWITCH_4"
+    4256: 4, // "ZIGBEE_SWITCH_4"
+    5000: 1 // Custom uiid for groups
   },
 
   cannotSupportDevices: {

From 748a4218f826c908f892923a009c6e4d99434e76 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 13 Dec 2021 20:21:11 +0000
Subject: [PATCH 2842/3183] 8.7.2-beta.0

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 8e234151..df07502e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.7.1",
+  "version": "8.7.2-beta.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.7.1",
+      "version": "8.7.2-beta.0",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 8eb1a832..789d0634 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.7.1",
+  "version": "8.7.2-beta.0",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From 54dc68405a7cca2ec75d4bf7e0f182d3d1383e6d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 14 Dec 2021 07:43:04 +0000
Subject: [PATCH 2843/3183] groups - single switch some uiid use switches param

---
 lib/device/group.js | 19 ++++++++++++++++++-
 lib/index.js        |  1 +
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/lib/device/group.js b/lib/device/group.js
index caa0c1b6..9804324d 100644
--- a/lib/device/group.js
+++ b/lib/device/group.js
@@ -22,6 +22,10 @@ module.exports = class deviceGroup {
     this.enableLogging = !platform.config.disableDeviceLogging
     this.enableDebugLogging = platform.config.debug
 
+    if (platform.consts.devices.switchSCM.includes(this.accessory.context.groupUIID)) {
+      this.isSCM = true
+    }
+
     // Add the switch service if it doesn't already exist
     this.service =
       this.accessory.getService(this.hapServ.Switch) ||
@@ -50,7 +54,12 @@ module.exports = class deviceGroup {
       if (newValue === this.cacheState) {
         return
       }
-      const params = { switch: newValue }
+      const params = {}
+      if (this.isSCM) {
+        params.switches = [{ switch: newValue, outlet: 0 }]
+      } else {
+        params.switch = newValue
+      }
       await this.platform.sendGroupUpdate(this.accessory, params)
       this.cacheState = newValue
       this.accessory.eveService.addEntry({ status: value ? 1 : 0 })
@@ -76,6 +85,14 @@ module.exports = class deviceGroup {
           this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
         }
       }
+      if (this.isSCM && params.switches && params.switches[0].switch !== this.cacheState) {
+        this.cacheState = params.switches[0].switch
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
+        this.accessory.eveService.addEntry({ status: this.cacheState === 'on' ? 1 : 0 })
+        if (params.updateSource && this.enableLogging) {
+          this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
+        }
+      }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
diff --git a/lib/index.js b/lib/index.js
index 9446c959..68d28781 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1370,6 +1370,7 @@ class eWeLinkPlatform {
         EWELINK GROUPS
         *************/
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
+        accessory.context.groupUIID = device.uiid
         accessory.control = new (require('./device/group'))(this, accessory)
         /************/
       } else if (this.consts.devices.camera.includes(uiid)) {

From a82b8faa01d7a034407923de663a1c586dd520a4 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 14 Dec 2021 07:43:57 +0000
Subject: [PATCH 2844/3183] 8.7.2-beta.1

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index df07502e..a722a3d7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.7.2-beta.0",
+  "version": "8.7.2-beta.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.7.2-beta.0",
+      "version": "8.7.2-beta.1",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 789d0634..0f204378 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.7.2-beta.0",
+  "version": "8.7.2-beta.1",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From 00adffdb428d796cb75e0ef1eceab633fdbe7475 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 14 Dec 2021 08:27:32 +0000
Subject: [PATCH 2845/3183] add group uiid and product model

---
 lib/index.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/index.js b/lib/index.js
index 68d28781..5debb5c2 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -553,6 +553,7 @@ class eWeLinkPlatform {
         // Create the format of a device
         group.extra = { uiid: 5000 }
         group.deviceid = group.id
+        group.productModel = 'Group [' + group.uiid + ']'
         group.online = true
         this.initialiseDevice(group)
       })

From 70372dce3f1ee296116be0f28335eb134d9647f7 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 14 Dec 2021 09:42:53 +0000
Subject: [PATCH 2846/3183] log group id on init

---
 lib/index.js         | 26 ++++++++++++++++++--------
 lib/utils/lang-en.js |  1 +
 lib/utils/lang-fr.js |  1 +
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/lib/index.js b/lib/index.js
index 5debb5c2..8c9a65fb 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1469,14 +1469,24 @@ class eWeLinkPlatform {
       // Update any changes to the device into our devicesInHB map
       this.api.updatePlatformAccessories(plugin.name, plugin.alias, [accessory])
       devicesInHB.set(accessory.UUID, accessory)
-      this.log(
-        '[%s] %s %s [%s:%s].',
-        accessory.displayName,
-        this.lang.devInit,
-        str,
-        uiid,
-        device.productModel
-      )
+      if (uiid === 5000) {
+        this.log(
+          '[%s] %s [%s] [%s].',
+          accessory.displayName,
+          this.lang.devInitGroup,
+          device.deviceid,
+          uiid
+        )
+      } else {
+        this.log(
+          '[%s] %s %s [%s:%s].',
+          accessory.displayName,
+          this.lang.devInit,
+          str,
+          uiid,
+          device.productModel
+        )
+      }
 
       // Store the device in the persist file
       if (storageClient && this.consts.devices.lan.includes(uiid)) {
diff --git a/lib/utils/lang-en.js b/lib/utils/lang-en.js
index e666550f..ba08682c 100644
--- a/lib/utils/lang-en.js
+++ b/lib/utils/lang-en.js
@@ -46,6 +46,7 @@ module.exports = {
   curVolt: 'current voltage',
   devAdd: 'has been added to Homebridge',
   devInit: 'initialised and',
+  devInitGroup: 'initialised with group id',
   devInitOpts: 'initialising with options',
   devNewNotAdd: 'restart Homebridge to add new device, failed to add automatically as',
   devNoAPIKey: 'cannot retrieve device API key',
diff --git a/lib/utils/lang-fr.js b/lib/utils/lang-fr.js
index 74109010..6de62bbe 100644
--- a/lib/utils/lang-fr.js
+++ b/lib/utils/lang-fr.js
@@ -46,6 +46,7 @@ module.exports = {
   curVolt: 'voltage actuel',
   devAdd: 'a été ajouté à Homebridge',
   devInit: 'initialisé et',
+  devInitGroup: 'initialised with group id',
   devInitOpts: 'initialisation avec options',
   devNewNotAdd:
     "redémarrer Homebridge pour ajouter un nouvel appareil, echec de l'ajout automatique en tant que",

From ffbddf1dba66cd9ccccc842c73d5d9f219623169 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 14 Dec 2021 09:44:13 +0000
Subject: [PATCH 2847/3183] add brand name to group info

---
 lib/index.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/index.js b/lib/index.js
index 8c9a65fb..3fd8ea68 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -554,6 +554,7 @@ class eWeLinkPlatform {
         group.extra = { uiid: 5000 }
         group.deviceid = group.id
         group.productModel = 'Group [' + group.uiid + ']'
+        device.brandName = 'eWeLink'
         group.online = true
         this.initialiseDevice(group)
       })

From c45103d0babcc02aac03fae89232008f6a652eb1 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 14 Dec 2021 09:48:41 +0000
Subject: [PATCH 2848/3183] correct var name

---
 lib/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/index.js b/lib/index.js
index 3fd8ea68..e3120e41 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -554,7 +554,7 @@ class eWeLinkPlatform {
         group.extra = { uiid: 5000 }
         group.deviceid = group.id
         group.productModel = 'Group [' + group.uiid + ']'
-        device.brandName = 'eWeLink'
+        group.brandName = 'eWeLink'
         group.online = true
         this.initialiseDevice(group)
       })

From 0acd079fc1ce7cf965b5be2b9239a6cd4a4494cc Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 14 Dec 2021 09:53:18 +0000
Subject: [PATCH 2849/3183] 8.7.2-beta.2

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index a722a3d7..5d4bad97 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.7.2-beta.1",
+  "version": "8.7.2-beta.2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.7.2-beta.1",
+      "version": "8.7.2-beta.2",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 0f204378..36200836 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.7.2-beta.1",
+  "version": "8.7.2-beta.2",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From ab1afc9f16fffbbbb9f52f6ef257b10282a870a2 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 16 Dec 2021 22:50:00 +0000
Subject: [PATCH 2850/3183] heater simulation

---
 config.schema.json                            |  13 +
 lib/device/simulation/heater.js               | 147 ++----
 .../simulation/{cooler.js => th-cooler.js}    |   2 +-
 .../{dehumidifier.js => th-dehumidifier.js}   |   2 +-
 lib/device/simulation/th-heater.js            | 430 ++++++++++++++++++
 .../{humidifier.js => th-humidifier.js}       |   2 +-
 .../{thermostat.js => th-thermostat.js}       |   2 +-
 lib/index.js                                  |  52 ++-
 lib/utils/constants.js                        |   1 +
 9 files changed, 514 insertions(+), 137 deletions(-)
 rename lib/device/simulation/{cooler.js => th-cooler.js} (99%)
 rename lib/device/simulation/{dehumidifier.js => th-dehumidifier.js} (99%)
 create mode 100644 lib/device/simulation/th-heater.js
 rename lib/device/simulation/{humidifier.js => th-humidifier.js} (99%)
 rename lib/device/simulation/{thermostat.js => th-thermostat.js} (99%)

diff --git a/config.schema.json b/config.schema.json
index 234b875b..0da940be 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -224,6 +224,10 @@
                   "title": "1 Air Purifier",
                   "enum": ["purifier"]
                 },
+                {
+                  "title": "1 Heater",
+                  "enum": ["heater"]
+                },
                 {
                   "title": "1 Doorbell",
                   "enum": ["doorbell"]
@@ -327,6 +331,14 @@
                 "functionBody": "return (model.singleDevices && model.singleDevices[arrayIndices] && ['pow', 'iw'].includes(model.singleDevices[arrayIndices].deviceModel) && [undefined, 'default', 'outlet'].includes(model.singleDevices[arrayIndices].showAs) && !model.singleDevices[arrayIndices].ignoreDevice);"
               }
             },
+            "temperatureSource": {
+              "type": "string",
+              "title": "Temperature Sensor ID",
+              "description": "Device ID which provides current temperature.",
+              "condition": {
+                "functionBody": "return (model.singleDevices && model.singleDevices[arrayIndices] && ['heater'].includes(model.singleDevices[arrayIndices].showAs) && !model.singleDevices[arrayIndices].ignoreDevice);"
+              }
+            },
             "isInched": {
               "type": "boolean",
               "title": "Status By Inching",
@@ -1674,6 +1686,7 @@
             "singleDevices[].showAsMotor",
             "singleDevices[].showAsEachen",
             "singleDevices[].inUsePowerThreshold",
+            "singleDevices[].temperatureSource",
             "singleDevices[].isInched",
             "singleDevices[].operationTime",
             "singleDevices[].operationTimeDown",
diff --git a/lib/device/simulation/heater.js b/lib/device/simulation/heater.js
index b49a7e43..c9849986 100644
--- a/lib/device/simulation/heater.js
+++ b/lib/device/simulation/heater.js
@@ -22,18 +22,8 @@ module.exports = class deviceHeater {
 
     // Set up custom variables for this device type
     const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
-    this.tempOffset =
-      deviceConf && deviceConf.offset ? deviceConf.offset : platform.consts.defaultValues.offset
-    this.tempOffsetFactor = deviceConf && deviceConf.offsetFactor
-    this.humiOffset =
-      deviceConf && deviceConf.humidityOffset
-        ? parseInt(deviceConf.humidityOffset)
-        : platform.consts.defaultValues.humidityOffset
-    this.humiOffsetFactor = deviceConf && deviceConf.humidityOffsetFactor
-    this.minTarget =
-      deviceConf && deviceConf.minTarget
-        ? deviceConf.minTarget
-        : platform.consts.defaultValues.minTarget
+    this.temperatureSource =
+      deviceConf && deviceConf.temperatureSource ? deviceConf.temperatureSource : ''
     this.maxTarget =
       deviceConf && deviceConf.maxTarget
         ? Math.max(deviceConf.maxTarget, this.minTarget + 1)
@@ -64,11 +54,6 @@ module.exports = class deviceHeater {
       this.accessory.removeService(this.accessory.getService(this.hapServ.Switch))
     }
 
-    // If the accessory has a temperature sensor service then remove it
-    if (this.accessory.getService(this.hapServ.TemperatureSensor)) {
-      this.accessory.removeService(this.accessory.getService(this.hapServ.TemperatureSensor))
-    }
-
     // Set up the accessory with default target temp when added the first time
     if (!this.funcs.hasProperty(this.accessory.context, 'cacheTarget')) {
       this.accessory.context.cacheTarget = 20
@@ -84,40 +69,16 @@ module.exports = class deviceHeater {
       this.accessory.context.cacheTarget = 20
     }
 
-    // If the accessory has a thermostat service then remove it
-    if (this.accessory.getService(this.hapServ.Thermostat)) {
-      this.accessory.removeService(this.accessory.getService(this.hapServ.Thermostat))
-    }
-
-    // If the accessory has a humidifier service then remove it
-    if (this.accessory.getService(this.hapServ.HumidifierDehumidifier)) {
-      this.accessory.removeService(this.accessory.getService(this.hapServ.HumidifierDehumidifier))
-    }
-
     // Add the heater service if it doesn't already exist
     this.service =
       this.accessory.getService(this.hapServ.HeaterCooler) ||
       this.accessory.addService(this.hapServ.HeaterCooler)
 
-    // The DS18B20 sensor does not provide humidity readings
-    if (this.accessory.context.sensorType === 'DS18B20') {
-      if (this.accessory.getService(this.hapServ.HumiditySensor)) {
-        this.accessory.removeService(this.accessory.getService(this.hapServ.HumiditySensor))
-      }
-    } else {
-      // Add the humidity sensor service if it doesn't already exist
-      this.humiService =
-        this.accessory.getService(this.hapServ.HumiditySensor) ||
-        this.accessory.addService(this.hapServ.HumiditySensor)
-    }
-
-    // Set the heater as the primary service
-    this.service.setPrimaryService()
-
     // Set custom properties of the current temperature characteristic
     this.service.getCharacteristic(this.hapChar.CurrentTemperature).setProps({
       minStep: 0.1
     })
+    this.cacheTemp = this.service.getCharacteristic(this.hapChar.CurrentTemperature).value
 
     // Add the set handler to the heater active characteristic
     this.service
@@ -135,11 +96,7 @@ module.exports = class deviceHeater {
     this.service
       .getCharacteristic(this.hapChar.HeatingThresholdTemperature)
       .updateValue(this.accessory.context.cacheTarget)
-      .setProps({
-        minValue: this.minTarget,
-        maxValue: this.maxTarget,
-        minStep: 0.5
-      })
+      .setProps({ minStep: 0.5 })
       .onSet(async value => await this.internalTargetTempUpdate(value))
 
     // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
@@ -198,28 +155,21 @@ module.exports = class deviceHeater {
     })
 
     // Set up an interval to get eWeLink to send regular temperature/humidity updates
-    if (platform.config.mode !== 'lan') {
-      setTimeout(() => {
-        this.internalUIUpdate()
-        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
-      }, 5000)
-
-      // Stop the intervals on Homebridge shutdown
-      platform.api.on('shutdown', () => {
-        clearInterval(this.intervalPoll)
-      })
-    }
+    setTimeout(() => {
+      this.getTemperature()
+      this.intervalPoll = setInterval(() => this.getTemperature(), 120000)
+    }, 5000)
+
+    // Stop the intervals on Homebridge shutdown
+    platform.api.on('shutdown', () => {
+      clearInterval(this.intervalPoll)
+    })
 
     // Output the customised options to the log
     const opts = JSON.stringify({
-      humidityOffset: this.humiOffset,
-      humidityOffsetFactor: this.humiOffsetFactor,
       logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
-      maxTarget: this.maxTarget,
-      minTarget: this.minTarget,
-      offset: this.tempOffset,
-      offsetFactor: this.tempOffsetFactor,
-      showAs: 'heater'
+      showAs: 'heater',
+      temperatureSource: this.temperatureSource
     })
     this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
@@ -359,71 +309,30 @@ module.exports = class deviceHeater {
     }
   }
 
-  async internalUIUpdate () {
+  async getTemperature () {
     try {
       // Skip polling if device isn't online
-      if (!this.isOnline) {
+      if (!this.isOnline || !this.platform.storageClientData) {
         return
       }
 
-      // Send the params to request the updates
-      await this.platform.sendDeviceUpdate(this.accessory, { uiActive: 120 })
-    } catch (err) {
-      // Suppress errors here
-    }
-  }
-
-  async externalUpdate (params) {
-    try {
-      if (
-        this.funcs.hasProperty(params, 'currentTemperature') &&
-        params.currentTemperature !== 'unavailable'
-      ) {
-        let newTemp = Number(params.currentTemperature)
-        if (this.tempOffsetFactor) {
-          newTemp *= this.tempOffset
-        } else {
-          newTemp += this.tempOffset
-        }
-        if (newTemp !== this.cacheTemp) {
-          this.cacheTemp = newTemp
-          this.service.updateCharacteristic(this.hapChar.CurrentTemperature, this.cacheTemp)
-          this.accessory.eveService.addEntry({ temp: this.cacheTemp })
-          if (params.updateSource && this.enableLogging) {
-            this.log('[%s] %s [%s°C].', this.name, this.lang.curTemp, this.cacheTemp)
-          }
-          await this.internalCurrentTempUpdate()
-        }
-      }
-      if (
-        this.funcs.hasProperty(params, 'currentHumidity') &&
-        params.currentHumidity !== 'unavailable' &&
-        this.humiService
-      ) {
-        let newHumi = parseInt(params.currentHumidity)
-        if (this.humiOffsetFactor) {
-          newHumi *= this.humiOffset
-        } else {
-          newHumi += this.humiOffset
-        }
-        newHumi = Math.max(Math.min(parseInt(newHumi), 100), 0)
-        if (newHumi !== this.cacheHumi) {
-          this.cacheHumi = newHumi
-          this.humiService.updateCharacteristic(
-            this.hapChar.CurrentRelativeHumidity,
-            this.cacheHumi
-          )
-          this.accessory.eveService.addEntry({ humidity: this.cacheHumi })
-          if (params.updateSource && this.enableLogging) {
-            this.log('[%s] %s [%s%].', this.name, this.lang.curHumi, this.cacheHumi)
-          }
+      const newTemp = await this.platform.storageData.getItem(this.temperatureSource + '_temp')
+      if (newTemp && newTemp !== this.cacheTemp) {
+        this.cacheTemp = newTemp
+        this.service.updateCharacteristic(this.hapChar.CurrentTemperature, this.cacheTemp)
+        this.accessory.eveService.addEntry({ temp: this.cacheTemp })
+        if (this.enableLogging) {
+          this.log('[%s] %s [%s°C].', this.name, this.lang.curTemp, this.cacheTemp)
         }
+        await this.internalCurrentTempUpdate()
       }
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, false)
+      this.log.error(err)
     }
   }
 
+  async externalUpdate (params) {}
+
   markStatus (isOnline) {
     this.isOnline = isOnline
   }
diff --git a/lib/device/simulation/cooler.js b/lib/device/simulation/th-cooler.js
similarity index 99%
rename from lib/device/simulation/cooler.js
rename to lib/device/simulation/th-cooler.js
index c1e22c02..c4825872 100644
--- a/lib/device/simulation/cooler.js
+++ b/lib/device/simulation/th-cooler.js
@@ -2,7 +2,7 @@
 /* eslint-disable new-cap */
 'use strict'
 
-module.exports = class deviceHeater {
+module.exports = class deviceTHCooler {
   constructor (platform, accessory) {
     // Set up variables from the platform
     this.funcs = platform.funcs
diff --git a/lib/device/simulation/dehumidifier.js b/lib/device/simulation/th-dehumidifier.js
similarity index 99%
rename from lib/device/simulation/dehumidifier.js
rename to lib/device/simulation/th-dehumidifier.js
index 68e6947d..237a0cfb 100644
--- a/lib/device/simulation/dehumidifier.js
+++ b/lib/device/simulation/th-dehumidifier.js
@@ -2,7 +2,7 @@
 /* eslint-disable new-cap */
 'use strict'
 
-module.exports = class deviceHeater {
+module.exports = class deviceTHDehumidifier {
   constructor (platform, accessory) {
     // Set up variables from the platform
     this.funcs = platform.funcs
diff --git a/lib/device/simulation/th-heater.js b/lib/device/simulation/th-heater.js
new file mode 100644
index 00000000..45f63c0e
--- /dev/null
+++ b/lib/device/simulation/th-heater.js
@@ -0,0 +1,430 @@
+/* jshint node: true, esversion: 10, -W014, -W033 */
+/* eslint-disable new-cap */
+'use strict'
+
+module.exports = class deviceTHHeater {
+  constructor (platform, accessory) {
+    // Set up variables from the platform
+    this.funcs = platform.funcs
+    this.hapChar = platform.api.hap.Characteristic
+    this.hapErr = platform.api.hap.HapStatusError
+    this.hapServ = platform.api.hap.Service
+    this.lang = platform.lang
+    this.log = platform.log
+    this.platform = platform
+
+    // Set up variables from the accessory
+    this.name = accessory.displayName
+    this.accessory = accessory
+
+    // Initially set the online flag as true (to be then updated as false if necessary)
+    this.isOnline = true
+
+    // Set up custom variables for this device type
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
+    this.tempOffset =
+      deviceConf && deviceConf.offset ? deviceConf.offset : platform.consts.defaultValues.offset
+    this.tempOffsetFactor = deviceConf && deviceConf.offsetFactor
+    this.humiOffset =
+      deviceConf && deviceConf.humidityOffset
+        ? parseInt(deviceConf.humidityOffset)
+        : platform.consts.defaultValues.humidityOffset
+    this.humiOffsetFactor = deviceConf && deviceConf.humidityOffsetFactor
+    this.minTarget =
+      deviceConf && deviceConf.minTarget
+        ? deviceConf.minTarget
+        : platform.consts.defaultValues.minTarget
+    this.maxTarget =
+      deviceConf && deviceConf.maxTarget
+        ? Math.max(deviceConf.maxTarget, this.minTarget + 1)
+        : platform.consts.defaultValues.maxTarget
+
+    // Set the correct logging variables for this accessory
+    this.enableLogging = !platform.config.disableDeviceLogging
+    this.enableDebugLogging = platform.config.debug
+    if (deviceConf && deviceConf.overrideLogging) {
+      switch (deviceConf.overrideLogging) {
+        case 'standard':
+          this.enableLogging = true
+          this.enableDebugLogging = false
+          break
+        case 'debug':
+          this.enableLogging = true
+          this.enableDebugLogging = true
+          break
+        case 'disable':
+          this.enableLogging = false
+          this.enableDebugLogging = false
+          break
+      }
+    }
+
+    // If the accessory has a switch service then remove it
+    if (this.accessory.getService(this.hapServ.Switch)) {
+      this.accessory.removeService(this.accessory.getService(this.hapServ.Switch))
+    }
+
+    // If the accessory has a temperature sensor service then remove it
+    if (this.accessory.getService(this.hapServ.TemperatureSensor)) {
+      this.accessory.removeService(this.accessory.getService(this.hapServ.TemperatureSensor))
+    }
+
+    // Set up the accessory with default target temp when added the first time
+    if (!this.funcs.hasProperty(this.accessory.context, 'cacheTarget')) {
+      this.accessory.context.cacheTarget = 20
+    }
+
+    // Check to make sure user has not switched from cooler to heater
+    if (this.accessory.context.cacheType !== 'heater') {
+      // Remove and re-setup as a HeaterCooler
+      if (this.accessory.getService(this.hapServ.HeaterCooler)) {
+        this.accessory.removeService(this.accessory.getService(this.hapServ.HeaterCooler))
+      }
+      this.accessory.context.cacheType = 'heater'
+      this.accessory.context.cacheTarget = 20
+    }
+
+    // If the accessory has a thermostat service then remove it
+    if (this.accessory.getService(this.hapServ.Thermostat)) {
+      this.accessory.removeService(this.accessory.getService(this.hapServ.Thermostat))
+    }
+
+    // If the accessory has a humidifier service then remove it
+    if (this.accessory.getService(this.hapServ.HumidifierDehumidifier)) {
+      this.accessory.removeService(this.accessory.getService(this.hapServ.HumidifierDehumidifier))
+    }
+
+    // Add the heater service if it doesn't already exist
+    this.service =
+      this.accessory.getService(this.hapServ.HeaterCooler) ||
+      this.accessory.addService(this.hapServ.HeaterCooler)
+
+    // The DS18B20 sensor does not provide humidity readings
+    if (this.accessory.context.sensorType === 'DS18B20') {
+      if (this.accessory.getService(this.hapServ.HumiditySensor)) {
+        this.accessory.removeService(this.accessory.getService(this.hapServ.HumiditySensor))
+      }
+    } else {
+      // Add the humidity sensor service if it doesn't already exist
+      this.humiService =
+        this.accessory.getService(this.hapServ.HumiditySensor) ||
+        this.accessory.addService(this.hapServ.HumiditySensor)
+    }
+
+    // Set the heater as the primary service
+    this.service.setPrimaryService()
+
+    // Set custom properties of the current temperature characteristic
+    this.service.getCharacteristic(this.hapChar.CurrentTemperature).setProps({
+      minStep: 0.1
+    })
+
+    // Add the set handler to the heater active characteristic
+    this.service
+      .getCharacteristic(this.hapChar.Active)
+      .onSet(async value => await this.internalStateUpdate(value))
+
+    // Add options to the target state characteristic
+    this.service.getCharacteristic(this.hapChar.TargetHeaterCoolerState).setProps({
+      minValue: 0,
+      maxValue: 0,
+      validValues: [0]
+    })
+
+    // Add the set handler to the target temperature characteristic
+    this.service
+      .getCharacteristic(this.hapChar.HeatingThresholdTemperature)
+      .updateValue(this.accessory.context.cacheTarget)
+      .setProps({
+        minValue: this.minTarget,
+        maxValue: this.maxTarget,
+        minStep: 0.5
+      })
+      .onSet(async value => await this.internalTargetTempUpdate(value))
+
+    // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
+    if (!platform.config.disableNoResponse) {
+      if (this.humiService) {
+        this.humiService.getCharacteristic(this.hapChar.CurrentRelativeHumidity).onGet(() => {
+          if (!this.isOnline) {
+            throw new this.hapErr(-70402)
+          }
+          return this.humiService.getCharacteristic(this.hapChar.CurrentRelativeHumidity).value
+        })
+      }
+      this.service.getCharacteristic(this.hapChar.CurrentTemperature).onGet(() => {
+        if (!this.isOnline) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.CurrentTemperature).value
+      })
+      this.service.getCharacteristic(this.hapChar.Active).onGet(() => {
+        if (!this.isOnline) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.Active).value
+      })
+      this.service.getCharacteristic(this.hapChar.TargetHeaterCoolerState).onGet(() => {
+        if (!this.isOnline) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.TargetHeaterCoolerState).value
+      })
+      this.service.getCharacteristic(this.hapChar.CurrentHeaterCoolerState).onGet(() => {
+        if (!this.isOnline) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.CurrentHeaterCoolerState).value
+      })
+      this.service.getCharacteristic(this.hapChar.HeatingThresholdTemperature).onGet(() => {
+        if (!this.isOnline) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.HeatingThresholdTemperature).value
+      })
+    }
+
+    // Initialise these caches now since they aren't determined by the initial externalUpdate()
+    this.cacheState = this.service.getCharacteristic(this.hapChar.Active).value === 1 ? 'on' : 'off'
+    this.cacheHeat =
+      this.cacheState === 'on' &&
+      this.service.getCharacteristic(this.hapChar.TargetHeaterCoolerState).value === 2
+        ? 'on'
+        : 'off'
+
+    // Pass the accessory to Fakegato to set up with Eve
+    this.accessory.eveService = new platform.eveService('custom', this.accessory, {
+      log: platform.config.debugFakegato ? this.log : () => {}
+    })
+
+    // Set up an interval to get eWeLink to send regular temperature/humidity updates
+    if (platform.config.mode !== 'lan') {
+      setTimeout(() => {
+        this.internalUIUpdate()
+        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
+      }, 5000)
+
+      // Stop the intervals on Homebridge shutdown
+      platform.api.on('shutdown', () => {
+        clearInterval(this.intervalPoll)
+      })
+    }
+
+    // Output the customised options to the log
+    const opts = JSON.stringify({
+      humidityOffset: this.humiOffset,
+      humidityOffsetFactor: this.humiOffsetFactor,
+      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
+      maxTarget: this.maxTarget,
+      minTarget: this.minTarget,
+      offset: this.tempOffset,
+      offsetFactor: this.tempOffsetFactor,
+      showAs: 'heater'
+    })
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
+  }
+
+  async internalStateUpdate (value) {
+    try {
+      const params = { deviceType: 'normal' }
+      let newState
+      let newHeat
+      if (value === 0) {
+        params.mainSwitch = 'off'
+        params.switch = 'off'
+        newState = 'off'
+        newHeat = 'off'
+      } else {
+        if (this.cacheTemp < this.accessory.context.cacheTarget) {
+          params.mainSwitch = 'on'
+          params.switch = 'on'
+          newState = 'on'
+          newHeat = 'on'
+        } else {
+          params.mainSwitch = 'off'
+          params.switch = 'off'
+          newState = 'on'
+          newHeat = 'off'
+        }
+      }
+
+      // Only send the update if either:
+      // * The new value (state) is OFF and the cacheHeat was ON
+      // * The new value (state) is ON and newHeat is 'on'
+      if ((value === 0 && this.cacheHeat === 'on') || (value === 1 && newHeat === 'on')) {
+        await this.platform.sendDeviceUpdate(this.accessory, params)
+      }
+      if (newState !== this.cacheState) {
+        this.cacheState = newState
+        if (this.enableLogging) {
+          this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
+        }
+      }
+      if (newHeat !== this.cacheHeat) {
+        this.cacheHeat = newHeat
+        if (this.enableLogging) {
+          this.log('[%s] %s [%s].', this.name, this.lang.curHeat, this.cacheHeat)
+        }
+      }
+      this.service.updateCharacteristic(
+        this.hapChar.CurrentHeaterCoolerState,
+        value === 1 ? (this.cacheHeat === 'on' ? 2 : 1) : 0
+      )
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, true)
+      setTimeout(() => {
+        this.service.updateCharacteristic(this.hapChar.Active, this.cacheState === 'on' ? 1 : 0)
+      }, 2000)
+      throw new this.hapErr(-70402)
+    }
+  }
+
+  async internalTargetTempUpdate (value) {
+    try {
+      if (value === this.accessory.context.cacheTarget) {
+        return
+      }
+      this.accessory.context.cacheTarget = value
+      if (this.enableLogging) {
+        this.log('[%s] %s [%s°C].', this.name, this.lang.curTarg, value)
+      }
+      if (this.cacheState === 'off') {
+        return
+      }
+      const params = { deviceType: 'normal' }
+      let newHeat
+      if (this.cacheTemp < value) {
+        params.mainSwitch = 'on'
+        params.switch = 'on'
+        newHeat = 'on'
+      } else {
+        params.mainSwitch = 'off'
+        params.switch = 'off'
+        newHeat = 'off'
+      }
+      if (newHeat === this.cacheHeat) {
+        return
+      }
+      await this.platform.sendDeviceUpdate(this.accessory, params)
+      this.cacheHeat = newHeat
+      if (this.enableLogging) {
+        this.log('[%s] %s [%s].', this.name, this.lang.curHeat, this.cacheHeat)
+      }
+      this.service.updateCharacteristic(
+        this.hapChar.CurrentHeaterCoolerState,
+        this.cacheHeat === 'on' ? 2 : 1
+      )
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, true)
+      setTimeout(() => {
+        this.service.updateCharacteristic(
+          this.hapChar.HeatingThresholdTemperature,
+          this.accessory.context.cacheTarget
+        )
+      }, 2000)
+      throw new this.hapErr(-70402)
+    }
+  }
+
+  async internalCurrentTempUpdate () {
+    try {
+      if (this.cacheState === 'off') {
+        return
+      }
+      const params = { deviceType: 'normal' }
+      let newHeat
+      if (this.cacheTemp < this.accessory.context.cacheTarget) {
+        params.mainSwitch = 'on'
+        params.switch = 'on'
+        newHeat = 'on'
+      } else {
+        params.mainSwitch = 'off'
+        params.switch = 'off'
+        newHeat = 'off'
+      }
+      if (newHeat === this.cacheHeat) {
+        return
+      }
+      await this.platform.sendDeviceUpdate(this.accessory, params)
+      this.cacheHeat = newHeat
+      if (this.enableLogging) {
+        this.log('[%s] %s [%s].', this.name, this.lang.curHeat, this.cacheHeat)
+      }
+      this.service.updateCharacteristic(
+        this.hapChar.CurrentHeaterCoolerState,
+        this.cacheHeat === 'on' ? 2 : 1
+      )
+    } catch (err) {
+      // Suppress errors here
+    }
+  }
+
+  async internalUIUpdate () {
+    try {
+      // Skip polling if device isn't online
+      if (!this.isOnline) {
+        return
+      }
+
+      // Send the params to request the updates
+      await this.platform.sendDeviceUpdate(this.accessory, { uiActive: 120 })
+    } catch (err) {
+      // Suppress errors here
+    }
+  }
+
+  async externalUpdate (params) {
+    try {
+      if (
+        this.funcs.hasProperty(params, 'currentTemperature') &&
+        params.currentTemperature !== 'unavailable'
+      ) {
+        let newTemp = Number(params.currentTemperature)
+        if (this.tempOffsetFactor) {
+          newTemp *= this.tempOffset
+        } else {
+          newTemp += this.tempOffset
+        }
+        if (newTemp !== this.cacheTemp) {
+          this.cacheTemp = newTemp
+          this.service.updateCharacteristic(this.hapChar.CurrentTemperature, this.cacheTemp)
+          this.accessory.eveService.addEntry({ temp: this.cacheTemp })
+          if (params.updateSource && this.enableLogging) {
+            this.log('[%s] %s [%s°C].', this.name, this.lang.curTemp, this.cacheTemp)
+          }
+          await this.internalCurrentTempUpdate()
+        }
+      }
+      if (
+        this.funcs.hasProperty(params, 'currentHumidity') &&
+        params.currentHumidity !== 'unavailable' &&
+        this.humiService
+      ) {
+        let newHumi = parseInt(params.currentHumidity)
+        if (this.humiOffsetFactor) {
+          newHumi *= this.humiOffset
+        } else {
+          newHumi += this.humiOffset
+        }
+        newHumi = Math.max(Math.min(parseInt(newHumi), 100), 0)
+        if (newHumi !== this.cacheHumi) {
+          this.cacheHumi = newHumi
+          this.humiService.updateCharacteristic(
+            this.hapChar.CurrentRelativeHumidity,
+            this.cacheHumi
+          )
+          this.accessory.eveService.addEntry({ humidity: this.cacheHumi })
+          if (params.updateSource && this.enableLogging) {
+            this.log('[%s] %s [%s%].', this.name, this.lang.curHumi, this.cacheHumi)
+          }
+        }
+      }
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, false)
+    }
+  }
+
+  markStatus (isOnline) {
+    this.isOnline = isOnline
+  }
+}
diff --git a/lib/device/simulation/humidifier.js b/lib/device/simulation/th-humidifier.js
similarity index 99%
rename from lib/device/simulation/humidifier.js
rename to lib/device/simulation/th-humidifier.js
index 7171d80f..717480a4 100644
--- a/lib/device/simulation/humidifier.js
+++ b/lib/device/simulation/th-humidifier.js
@@ -2,7 +2,7 @@
 /* eslint-disable new-cap */
 'use strict'
 
-module.exports = class deviceHeater {
+module.exports = class deviceTHHumidifier {
   constructor (platform, accessory) {
     // Set up variables from the platform
     this.funcs = platform.funcs
diff --git a/lib/device/simulation/thermostat.js b/lib/device/simulation/th-thermostat.js
similarity index 99%
rename from lib/device/simulation/thermostat.js
rename to lib/device/simulation/th-thermostat.js
index 0d23b92d..e5f5607d 100644
--- a/lib/device/simulation/thermostat.js
+++ b/lib/device/simulation/th-thermostat.js
@@ -2,7 +2,7 @@
 /* eslint-disable new-cap */
 'use strict'
 
-module.exports = class deviceThermostat {
+module.exports = class deviceTHThermostat {
   constructor (platform, accessory) {
     // Set up variables from the platform
     this.funcs = platform.funcs
diff --git a/lib/index.js b/lib/index.js
index e3120e41..7a284f2f 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -20,7 +20,6 @@ let apiServer
 let httpClient
 let lanClient
 let lanDevices
-let storageClient
 let wsClient
 
 // Create the platform class
@@ -335,6 +334,7 @@ class eWeLinkPlatform {
                     }
                     break
                   case 'inchChannels':
+                  case 'temperatureSource':
                     if (typeof v !== 'string' || v === '') {
                       logIgnore(key + '.' + id + '.' + k)
                     } else {
@@ -458,11 +458,27 @@ class eWeLinkPlatform {
 
       // Persist files are used to store device info that could be used for LAN only mode
       try {
-        await storage.init({
+        this.storageLAN = storage.create({
           dir: require('path').join(this.api.user.persistPath(), '/../homebridge-ewelink'),
           forgiveParseErrors: true
         })
-        storageClient = true
+        await this.storageLAN.init()
+        this.storageClientLAN = true
+      } catch (err) {
+        if (this.config.debug) {
+          const eText = this.funcs.parseError(err)
+          this.log.warn('%s %s.', this.lang.storageSetupErr, eText)
+        }
+      }
+
+      // Persist files are used to store device info that can be used by my other plugins
+      try {
+        this.storageData = storage.create({
+          dir: require('path').join(this.api.user.persistPath(), '/../bwp91_cache'),
+          forgiveParseErrors: true
+        })
+        await this.storageData.init()
+        this.storageClientData = true
       } catch (err) {
         if (this.config.debug) {
           const eText = this.funcs.parseError(err)
@@ -511,9 +527,9 @@ class eWeLinkPlatform {
         }
 
         // Clear the storage folder and start again when we have access to http devices
-        if (storageClient) {
+        if (this.storageClientLAN) {
           try {
-            await storage.clear()
+            await this.storageLAN.clear()
           } catch (err) {
             if (this.config.debug) {
               const eText = this.funcs.parseError(err)
@@ -526,10 +542,10 @@ class eWeLinkPlatform {
         this.log.warn('%s %s.', this.lang.httpDisabled, this.lang.missingCreds)
 
         // Get the persist device data if we are in lan only mode
-        if (this.config.mode === 'lan' && storageClient) {
+        if (this.config.mode === 'lan' && this.storageClientLAN) {
           try {
             this.log('Obtaining device list from storage.')
-            const persistDeviceList = await storage.values()
+            const persistDeviceList = await this.storageLAN.values()
             persistDeviceList.forEach(device => deviceList.push(device))
           } catch (err) {
             if (this.config.debug) {
@@ -981,7 +997,7 @@ class eWeLinkPlatform {
         *****************************************/
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
         accessory.context.sensorType = device.params.sensorType
-        accessory.control = new (require('./device/simulation/thermostat'))(this, accessory)
+        accessory.control = new (require('./device/simulation/th-thermostat'))(this, accessory)
         /****************************************/
       } else if (device.showAs === 'heater' && this.consts.devices.sensorAmbient.includes(uiid)) {
         /*************************************
@@ -989,7 +1005,7 @@ class eWeLinkPlatform {
         *************************************/
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
         accessory.context.sensorType = device.params.sensorType
-        accessory.control = new (require('./device/simulation/heater'))(this, accessory)
+        accessory.control = new (require('./device/simulation/th-heater'))(this, accessory)
         /************************************/
       } else if (device.showAs === 'cooler' && this.consts.devices.sensorAmbient.includes(uiid)) {
         /*************************************
@@ -997,7 +1013,7 @@ class eWeLinkPlatform {
         *************************************/
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
         accessory.context.sensorType = device.params.sensorType
-        accessory.control = new (require('./device/simulation/cooler'))(this, accessory)
+        accessory.control = new (require('./device/simulation/th-cooler'))(this, accessory)
         /************************************/
       } else if (
         device.showAs === 'humidifier' &&
@@ -1015,7 +1031,7 @@ class eWeLinkPlatform {
         }
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
         accessory.context.sensorType = device.params.sensorType
-        accessory.control = new (require('./device/simulation/humidifier'))(this, accessory)
+        accessory.control = new (require('./device/simulation/th-humidifier'))(this, accessory)
         /*****************************************/
       } else if (
         device.showAs === 'dehumidifier' &&
@@ -1031,7 +1047,7 @@ class eWeLinkPlatform {
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
         accessory.context.sensorType = device.params.sensorType
-        accessory.control = new (require('./device/simulation/dehumidifier'))(this, accessory)
+        accessory.control = new (require('./device/simulation/th-dehumidifier'))(this, accessory)
         /*******************************************/
       } else if (this.consts.devices.sensorAmbient.includes(uiid)) {
         /***********************
@@ -1048,6 +1064,14 @@ class eWeLinkPlatform {
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/sensor-temp-humi'))(this, accessory)
         /************************/
+      } else if (device.showAs === 'heater') {
+        /*******************
+        HEATERS [SIMULATION]
+        *******************/
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
+        accessory.context.sensorType = device.params.sensorType
+        accessory.control = new (require('./device/simulation/heater'))(this, accessory)
+        /******************/
       } else if (this.consts.devices.lightRGB.includes(uiid)) {
         /***********
         LIGHTS [RGB]
@@ -1490,9 +1514,9 @@ class eWeLinkPlatform {
       }
 
       // Store the device in the persist file
-      if (storageClient && this.consts.devices.lan.includes(uiid)) {
+      if (this.storageClientLAN && this.consts.devices.lan.includes(uiid)) {
         try {
-          await storage.setItem(device.deviceid, device)
+          await this.storageLAN.setItem(device.deviceid, device)
         } catch (err) {
           if (this.config.debug) {
             const eText = this.funcs.parseError(err)
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 0e263bfa..c4d15ad5 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -90,6 +90,7 @@ module.exports = {
       'showAsMotor',
       'showAsEachen',
       'inUsePowerThreshold',
+      'temperatureSource',
       'isInched',
       'operationTime',
       'operationTimeDown',

From 62f237ada6bb71e92fa9bfa37b2dd07535070bc6 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 16 Dec 2021 22:50:58 +0000
Subject: [PATCH 2851/3183] 8.7.2-beta.3

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 5d4bad97..50b0cef3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.7.2-beta.2",
+  "version": "8.7.2-beta.3",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.7.2-beta.2",
+      "version": "8.7.2-beta.3",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 36200836..60802d6b 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.7.2-beta.2",
+  "version": "8.7.2-beta.3",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From 1f0e71fd842480d069e64d61dd04dc4f657e78c8 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 16 Dec 2021 23:08:51 +0000
Subject: [PATCH 2852/3183] remove mainswitch

---
 lib/device/simulation/heater.js | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/lib/device/simulation/heater.js b/lib/device/simulation/heater.js
index c9849986..6e6c22e5 100644
--- a/lib/device/simulation/heater.js
+++ b/lib/device/simulation/heater.js
@@ -176,22 +176,18 @@ module.exports = class deviceHeater {
 
   async internalStateUpdate (value) {
     try {
-      const params = { deviceType: 'normal' }
       let newState
       let newHeat
       if (value === 0) {
-        params.mainSwitch = 'off'
         params.switch = 'off'
         newState = 'off'
         newHeat = 'off'
       } else {
         if (this.cacheTemp < this.accessory.context.cacheTarget) {
-          params.mainSwitch = 'on'
           params.switch = 'on'
           newState = 'on'
           newHeat = 'on'
         } else {
-          params.mainSwitch = 'off'
           params.switch = 'off'
           newState = 'on'
           newHeat = 'off'
@@ -244,11 +240,9 @@ module.exports = class deviceHeater {
       const params = { deviceType: 'normal' }
       let newHeat
       if (this.cacheTemp < value) {
-        params.mainSwitch = 'on'
         params.switch = 'on'
         newHeat = 'on'
       } else {
-        params.mainSwitch = 'off'
         params.switch = 'off'
         newHeat = 'off'
       }
@@ -284,11 +278,9 @@ module.exports = class deviceHeater {
       const params = { deviceType: 'normal' }
       let newHeat
       if (this.cacheTemp < this.accessory.context.cacheTarget) {
-        params.mainSwitch = 'on'
         params.switch = 'on'
         newHeat = 'on'
       } else {
-        params.mainSwitch = 'off'
         params.switch = 'off'
         newHeat = 'off'
       }

From ad8bfdbc7d2cb0b599b3e95bcf427dbebe3e1ebe Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 16 Dec 2021 23:09:47 +0000
Subject: [PATCH 2853/3183] 8.7.2-beta.4

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 50b0cef3..59f05816 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.7.2-beta.3",
+  "version": "8.7.2-beta.4",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.7.2-beta.3",
+      "version": "8.7.2-beta.4",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 60802d6b..94cda8dd 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.7.2-beta.3",
+  "version": "8.7.2-beta.4",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From edce8b9fe14c39b1092a32a91f61cd57fe30cafb Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 17 Dec 2021 07:53:08 +0000
Subject: [PATCH 2854/3183] more heater sim updates

---
 config.schema.json                       |  2 +-
 lib/device/sensor-ambient.js             | 25 ++++++++++++++++++++++++
 lib/device/sensor-temp-humi.js           | 25 ++++++++++++++++++++++++
 lib/device/simulation/heater.js          |  1 +
 lib/device/simulation/th-cooler.js       | 25 ++++++++++++++++++++++++
 lib/device/simulation/th-dehumidifier.js | 25 ++++++++++++++++++++++++
 lib/device/simulation/th-heater.js       | 25 ++++++++++++++++++++++++
 lib/device/simulation/th-humidifier.js   | 25 ++++++++++++++++++++++++
 lib/device/simulation/th-thermostat.js   | 25 ++++++++++++++++++++++++
 lib/device/thermostat.js                 | 25 ++++++++++++++++++++++++
 lib/device/zigbee/sensor-ambient.js      | 25 ++++++++++++++++++++++++
 lib/index.js                             |  7 +++++++
 lib/utils/lang-en.js                     |  1 +
 lib/utils/lang-fr.js                     |  1 +
 14 files changed, 236 insertions(+), 1 deletion(-)

diff --git a/config.schema.json b/config.schema.json
index 0da940be..1301a26d 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -334,7 +334,7 @@
             "temperatureSource": {
               "type": "string",
               "title": "Temperature Sensor ID",
-              "description": "Device ID which provides current temperature.",
+              "description": "Enter a eWeLink or Govee device ID which provides a current temperature reading.",
               "condition": {
                 "functionBody": "return (model.singleDevices && model.singleDevices[arrayIndices] && ['heater'].includes(model.singleDevices[arrayIndices].showAs) && !model.singleDevices[arrayIndices].ignoreDevice);"
               }
diff --git a/lib/device/sensor-ambient.js b/lib/device/sensor-ambient.js
index 5e83b6e9..44f855d1 100644
--- a/lib/device/sensor-ambient.js
+++ b/lib/device/sensor-ambient.js
@@ -94,6 +94,8 @@ module.exports = class deviceSensorAmbient {
     this.tempService.getCharacteristic(this.hapChar.CurrentTemperature).setProps({
       minStep: 0.1
     })
+    this.cacheTemp = this.tempService.getCharacteristic(this.hapChar.CurrentTemperature).value
+    this.updateCache()
 
     // The DS18B20 sensor does not provide humidity readings
     if (this.accessory.context.sensorType === 'DS18B20') {
@@ -240,6 +242,9 @@ module.exports = class deviceSensorAmbient {
           if (params.updateSource && this.enableLogging) {
             this.log('[%s] %s [%s°C].', this.name, this.lang.curTemp, this.cacheTemp)
           }
+
+          // Update the cache file with the new temperature
+          this.updateCache()
         }
       }
       if (
@@ -271,6 +276,26 @@ module.exports = class deviceSensorAmbient {
     }
   }
 
+  async updateCache () {
+    // Don't continue if the storage client hasn't initialised properly
+    if (!this.platform.storageClientData) {
+      return
+    }
+
+    // Attempt to save the new temperature to the cache
+    try {
+      await this.platform.storageData.setItem(
+        this.accessory.context.eweDeviceId + '_temp',
+        this.cacheTemp
+      )
+    } catch (err) {
+      if (this.enableLogging) {
+        const eText = this.funcs.parseError(err)
+        this.log.warn('[%s] %s %s.', this.name, this.lang.storageWriteErr, eText)
+      }
+    }
+  }
+
   currentState () {
     const toReturn = {}
     toReturn.services = ['temperature']
diff --git a/lib/device/sensor-temp-humi.js b/lib/device/sensor-temp-humi.js
index cb7c45ab..39d1d579 100644
--- a/lib/device/sensor-temp-humi.js
+++ b/lib/device/sensor-temp-humi.js
@@ -59,6 +59,8 @@ module.exports = class deviceSensorTempHumi {
     this.tempService.getCharacteristic(this.hapChar.CurrentTemperature).setProps({
       minStep: 0.1
     })
+    this.cacheTemp = this.tempService.getCharacteristic(this.hapChar.CurrentTemperature).value
+    this.updateCache()
 
     // Add the humidity sensor service if it doesn't already exist
     this.humiService =
@@ -118,6 +120,9 @@ module.exports = class deviceSensorTempHumi {
           if (params.updateSource && this.enableLogging) {
             this.log('[%s] %s [%s°C].', this.name, this.lang.curTemp, this.cacheTemp)
           }
+
+          // Update the cache file with the new temperature
+          this.updateCache()
         }
       }
       if (this.funcs.hasProperty(params, 'humidity')) {
@@ -145,6 +150,26 @@ module.exports = class deviceSensorTempHumi {
     }
   }
 
+  async updateCache () {
+    // Don't continue if the storage client hasn't initialised properly
+    if (!this.platform.storageClientData) {
+      return
+    }
+
+    // Attempt to save the new temperature to the cache
+    try {
+      await this.platform.storageData.setItem(
+        this.accessory.context.eweDeviceId + '_temp',
+        this.cacheTemp
+      )
+    } catch (err) {
+      if (this.enableLogging) {
+        const eText = this.funcs.parseError(err)
+        this.log.warn('[%s] %s %s.', this.name, this.lang.storageWriteErr, eText)
+      }
+    }
+  }
+
   currentState () {
     const toReturn = {}
     toReturn.services = ['temperature', 'humidity']
diff --git a/lib/device/simulation/heater.js b/lib/device/simulation/heater.js
index 6e6c22e5..5e16012d 100644
--- a/lib/device/simulation/heater.js
+++ b/lib/device/simulation/heater.js
@@ -178,6 +178,7 @@ module.exports = class deviceHeater {
     try {
       let newState
       let newHeat
+      const params = {}
       if (value === 0) {
         params.switch = 'off'
         newState = 'off'
diff --git a/lib/device/simulation/th-cooler.js b/lib/device/simulation/th-cooler.js
index c4825872..58efbe6e 100644
--- a/lib/device/simulation/th-cooler.js
+++ b/lib/device/simulation/th-cooler.js
@@ -118,6 +118,8 @@ module.exports = class deviceTHCooler {
     this.service.getCharacteristic(this.hapChar.CurrentTemperature).setProps({
       minStep: 0.1
     })
+    this.cacheTemp = this.service.getCharacteristic(this.hapChar.CurrentTemperature).value
+    this.updateCache()
 
     // Add the set handler to the heater active characteristic
     this.service
@@ -394,6 +396,9 @@ module.exports = class deviceTHCooler {
           if (params.updateSource && this.enableLogging) {
             this.log('[%s] %s [%s°C].', this.name, this.lang.curTemp, this.cacheTemp)
           }
+
+          // Update the cache file with the new temperature
+          this.updateCache()
           await this.internalCurrentTempUpdate()
         }
       }
@@ -426,6 +431,26 @@ module.exports = class deviceTHCooler {
     }
   }
 
+  async updateCache () {
+    // Don't continue if the storage client hasn't initialised properly
+    if (!this.platform.storageClientData) {
+      return
+    }
+
+    // Attempt to save the new temperature to the cache
+    try {
+      await this.platform.storageData.setItem(
+        this.accessory.context.eweDeviceId + '_temp',
+        this.cacheTemp
+      )
+    } catch (err) {
+      if (this.enableLogging) {
+        const eText = this.funcs.parseError(err)
+        this.log.warn('[%s] %s %s.', this.name, this.lang.storageWriteErr, eText)
+      }
+    }
+  }
+
   markStatus (isOnline) {
     this.isOnline = isOnline
   }
diff --git a/lib/device/simulation/th-dehumidifier.js b/lib/device/simulation/th-dehumidifier.js
index 237a0cfb..f4be527d 100644
--- a/lib/device/simulation/th-dehumidifier.js
+++ b/lib/device/simulation/th-dehumidifier.js
@@ -100,6 +100,8 @@ module.exports = class deviceTHDehumidifier {
     this.tempService =
       this.accessory.getService(this.hapServ.TemperatureSensor) ||
       this.accessory.addService(this.hapServ.TemperatureSensor)
+    this.cacheTemp = this.tempService.getCharacteristic(this.hapChar.CurrentTemperature).value
+    this.updateCache()
 
     // Set the dehumidifier as the primary service
     this.service.setPrimaryService()
@@ -375,6 +377,9 @@ module.exports = class deviceTHDehumidifier {
           if (params.updateSource && this.enableLogging) {
             this.log('[%s] %s [%s°C].', this.name, this.lang.curTemp, this.cacheTemp)
           }
+
+          // Update the cache file with the new temperature
+          this.updateCache()
         }
       }
       if (
@@ -403,6 +408,26 @@ module.exports = class deviceTHDehumidifier {
     }
   }
 
+  async updateCache () {
+    // Don't continue if the storage client hasn't initialised properly
+    if (!this.platform.storageClientData) {
+      return
+    }
+
+    // Attempt to save the new temperature to the cache
+    try {
+      await this.platform.storageData.setItem(
+        this.accessory.context.eweDeviceId + '_temp',
+        this.cacheTemp
+      )
+    } catch (err) {
+      if (this.enableLogging) {
+        const eText = this.funcs.parseError(err)
+        this.log.warn('[%s] %s %s.', this.name, this.lang.storageWriteErr, eText)
+      }
+    }
+  }
+
   markStatus (isOnline) {
     this.isOnline = isOnline
   }
diff --git a/lib/device/simulation/th-heater.js b/lib/device/simulation/th-heater.js
index 45f63c0e..c034dd26 100644
--- a/lib/device/simulation/th-heater.js
+++ b/lib/device/simulation/th-heater.js
@@ -118,6 +118,8 @@ module.exports = class deviceTHHeater {
     this.service.getCharacteristic(this.hapChar.CurrentTemperature).setProps({
       minStep: 0.1
     })
+    this.cacheTemp = this.service.getCharacteristic(this.hapChar.CurrentTemperature).value
+    this.updateCache()
 
     // Add the set handler to the heater active characteristic
     this.service
@@ -392,6 +394,9 @@ module.exports = class deviceTHHeater {
           if (params.updateSource && this.enableLogging) {
             this.log('[%s] %s [%s°C].', this.name, this.lang.curTemp, this.cacheTemp)
           }
+
+          // Update the cache file with the new temperature
+          this.updateCache()
           await this.internalCurrentTempUpdate()
         }
       }
@@ -424,6 +429,26 @@ module.exports = class deviceTHHeater {
     }
   }
 
+  async updateCache () {
+    // Don't continue if the storage client hasn't initialised properly
+    if (!this.platform.storageClientData) {
+      return
+    }
+
+    // Attempt to save the new temperature to the cache
+    try {
+      await this.platform.storageData.setItem(
+        this.accessory.context.eweDeviceId + '_temp',
+        this.cacheTemp
+      )
+    } catch (err) {
+      if (this.enableLogging) {
+        const eText = this.funcs.parseError(err)
+        this.log.warn('[%s] %s %s.', this.name, this.lang.storageWriteErr, eText)
+      }
+    }
+  }
+
   markStatus (isOnline) {
     this.isOnline = isOnline
   }
diff --git a/lib/device/simulation/th-humidifier.js b/lib/device/simulation/th-humidifier.js
index 717480a4..65b0c069 100644
--- a/lib/device/simulation/th-humidifier.js
+++ b/lib/device/simulation/th-humidifier.js
@@ -100,6 +100,8 @@ module.exports = class deviceTHHumidifier {
     this.tempService =
       this.accessory.getService(this.hapServ.TemperatureSensor) ||
       this.accessory.addService(this.hapServ.TemperatureSensor)
+    this.cacheTemp = this.tempService.getCharacteristic(this.hapChar.CurrentTemperature).value
+    this.updateCache()
 
     // Set the humidifier as the primary service
     this.service.setPrimaryService()
@@ -375,6 +377,9 @@ module.exports = class deviceTHHumidifier {
           if (params.updateSource && this.enableLogging) {
             this.log('[%s] %s [%s°C].', this.name, this.lang.curTemp, this.cacheTemp)
           }
+
+          // Update the cache file with the new temperature
+          this.updateCache()
         }
       }
       if (
@@ -403,6 +408,26 @@ module.exports = class deviceTHHumidifier {
     }
   }
 
+  async updateCache () {
+    // Don't continue if the storage client hasn't initialised properly
+    if (!this.platform.storageClientData) {
+      return
+    }
+
+    // Attempt to save the new temperature to the cache
+    try {
+      await this.platform.storageData.setItem(
+        this.accessory.context.eweDeviceId + '_temp',
+        this.cacheTemp
+      )
+    } catch (err) {
+      if (this.enableLogging) {
+        const eText = this.funcs.parseError(err)
+        this.log.warn('[%s] %s %s.', this.name, this.lang.storageWriteErr, eText)
+      }
+    }
+  }
+
   markStatus (isOnline) {
     this.isOnline = isOnline
   }
diff --git a/lib/device/simulation/th-thermostat.js b/lib/device/simulation/th-thermostat.js
index e5f5607d..9034f79b 100644
--- a/lib/device/simulation/th-thermostat.js
+++ b/lib/device/simulation/th-thermostat.js
@@ -112,6 +112,8 @@ module.exports = class deviceTHThermostat {
     this.service.getCharacteristic(this.hapChar.CurrentTemperature).setProps({
       minStep: 0.1
     })
+    this.cacheTemp = this.service.getCharacteristic(this.hapChar.CurrentTemperature).value
+    this.updateCache()
 
     // Add options to the target state characteristic
     this.service
@@ -375,6 +377,9 @@ module.exports = class deviceTHThermostat {
           if (params.updateSource && this.enableLogging) {
             this.log('[%s] %s [%s°C].', this.name, this.lang.curTemp, this.cacheTemp)
           }
+
+          // Update the cache file with the new temperature
+          this.updateCache()
           await this.internalCurrentTempUpdate()
         }
       }
@@ -404,6 +409,26 @@ module.exports = class deviceTHThermostat {
     }
   }
 
+  async updateCache () {
+    // Don't continue if the storage client hasn't initialised properly
+    if (!this.platform.storageClientData) {
+      return
+    }
+
+    // Attempt to save the new temperature to the cache
+    try {
+      await this.platform.storageData.setItem(
+        this.accessory.context.eweDeviceId + '_temp',
+        this.cacheTemp
+      )
+    } catch (err) {
+      if (this.enableLogging) {
+        const eText = this.funcs.parseError(err)
+        this.log.warn('[%s] %s %s.', this.name, this.lang.storageWriteErr, eText)
+      }
+    }
+  }
+
   markStatus (isOnline) {
     this.isOnline = isOnline
   }
diff --git a/lib/device/thermostat.js b/lib/device/thermostat.js
index 04f5726a..26746353 100644
--- a/lib/device/thermostat.js
+++ b/lib/device/thermostat.js
@@ -77,6 +77,8 @@ module.exports = class deviceThermostat {
     this.service.getCharacteristic(this.hapChar.CurrentTemperature).setProps({
       minStep: 0.1
     })
+    this.cacheTemp = this.service.getCharacteristic(this.hapChar.CurrentTemperature).value
+    this.updateCache()
 
     // Add the set handler to the target state characteristic
     this.service
@@ -256,6 +258,9 @@ module.exports = class deviceThermostat {
           if (params.updateSource && this.enableLogging) {
             this.log('[%s] %s [%s°C].', this.name, this.lang.curTemp, this.cacheTemp)
           }
+
+          // Update the cache file with the new temperature
+          this.updateCache()
         }
       }
     } catch (err) {
@@ -263,6 +268,26 @@ module.exports = class deviceThermostat {
     }
   }
 
+  async updateCache () {
+    // Don't continue if the storage client hasn't initialised properly
+    if (!this.platform.storageClientData) {
+      return
+    }
+
+    // Attempt to save the new temperature to the cache
+    try {
+      await this.platform.storageData.setItem(
+        this.accessory.context.eweDeviceId + '_temp',
+        this.cacheTemp
+      )
+    } catch (err) {
+      if (this.enableLogging) {
+        const eText = this.funcs.parseError(err)
+        this.log.warn('[%s] %s %s.', this.name, this.lang.storageWriteErr, eText)
+      }
+    }
+  }
+
   markStatus (isOnline) {
     this.isOnline = isOnline
   }
diff --git a/lib/device/zigbee/sensor-ambient.js b/lib/device/zigbee/sensor-ambient.js
index 90717f0c..3d2925e5 100644
--- a/lib/device/zigbee/sensor-ambient.js
+++ b/lib/device/zigbee/sensor-ambient.js
@@ -60,6 +60,8 @@ module.exports = class deviceZBSensorAmbient {
     this.tempService.getCharacteristic(this.hapChar.CurrentTemperature).setProps({
       minStep: 0.1
     })
+    this.cacheTemp = this.tempService.getCharacteristic(this.hapChar.CurrentTemperature).value
+    this.updateCache()
 
     // Add the humidity sensor service if it doesn't already exist
     this.humiService =
@@ -116,6 +118,9 @@ module.exports = class deviceZBSensorAmbient {
           if (params.updateSource && this.enableLogging) {
             this.log('[%s] %s [%s°C].', this.name, this.lang.curTemp, this.cacheTemp)
           }
+
+          // Update the cache file with the new temperature
+          this.updateCache()
         }
       }
       if (this.funcs.hasProperty(params, 'humidity')) {
@@ -143,6 +148,26 @@ module.exports = class deviceZBSensorAmbient {
     }
   }
 
+  async updateCache () {
+    // Don't continue if the storage client hasn't initialised properly
+    if (!this.platform.storageClientData) {
+      return
+    }
+
+    // Attempt to save the new temperature to the cache
+    try {
+      await this.platform.storageData.setItem(
+        this.accessory.context.eweDeviceId + '_temp',
+        this.cacheTemp
+      )
+    } catch (err) {
+      if (this.enableLogging) {
+        const eText = this.funcs.parseError(err)
+        this.log.warn('[%s] %s %s.', this.name, this.lang.storageWriteErr, eText)
+      }
+    }
+  }
+
   currentState () {
     const toReturn = {}
     toReturn.services = ['temperature', 'humidity', 'battery']
diff --git a/lib/index.js b/lib/index.js
index 7a284f2f..ddf6ba43 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1068,6 +1068,13 @@ class eWeLinkPlatform {
         /*******************
         HEATERS [SIMULATION]
         *******************/
+        if (!this.deviceConf[device.deviceid].temperatureSource) {
+          this.log.warn('[%s] %s.', device.name, this.lang.heaterSimNoSensor)
+          if (devicesInHB.has(uuid)) {
+            this.removeAccessory(devicesInHB.get(uuid))
+          }
+          return
+        }
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
         accessory.context.sensorType = device.params.sensorType
         accessory.control = new (require('./device/simulation/heater'))(this, accessory)
diff --git a/lib/utils/lang-en.js b/lib/utils/lang-en.js
index ba08682c..5fe8ba98 100644
--- a/lib/utils/lang-en.js
+++ b/lib/utils/lang-en.js
@@ -79,6 +79,7 @@ module.exports = {
   foundWithIP: 'found locally with IP',
   foundWithManIP: 'using manual IP',
   hbVersionFail: 'Your version of Homebridge is too low - update to v1.3',
+  heaterSimNoSensor: 'you must configure a device ID that provides a temperature reading',
   httpDisabled: 'HTTP/WS clients disabled as',
   httpLogin10003: 'See http://bit.ly/hb-ewelink-errors for more info about login issues',
   httpRetry: 'Unable to reach eWeLink, retrying in 30 seconds',
diff --git a/lib/utils/lang-fr.js b/lib/utils/lang-fr.js
index 6de62bbe..088fea5c 100644
--- a/lib/utils/lang-fr.js
+++ b/lib/utils/lang-fr.js
@@ -79,6 +79,7 @@ module.exports = {
   foundWithIP: 'trouvé locallement avec IP',
   foundWithManIP: "utilisation de l'IP manuelle",
   hbVersionFail: 'Votre version de Homebridge est trop ancienne - Mettez à jour vers v1.3',
+  heaterSimNoSensor: 'you must configure a device ID that provides a temperature reading',
   httpDisabled: 'HTTP/WS clients désactivé en tant que',
   httpLogin10003:
     "Consulter http://bit.ly/hb-ewelink-errors pour plus d'informations sur cette erreur de connexion",

From 53865dd9708efaaf28af82a00c51757402cab393 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 17 Dec 2021 07:53:32 +0000
Subject: [PATCH 2855/3183] 8.7.2-beta.5

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 59f05816..d13eb572 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.7.2-beta.4",
+  "version": "8.7.2-beta.5",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.7.2-beta.4",
+      "version": "8.7.2-beta.5",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 94cda8dd..037ba90b 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.7.2-beta.4",
+  "version": "8.7.2-beta.5",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From 81df19b72d239b41f6ff1d3a9e44bd0552ddf56a Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 17 Dec 2021 08:44:35 +0000
Subject: [PATCH 2856/3183] expose as cooler too

---
 CHANGELOG.md                    |   1 +
 config.schema.json              |   6 +-
 lib/device/simulation/cooler.js | 319 ++++++++++++++++++++++++++++++++
 lib/device/simulation/heater.js |  19 +-
 lib/index.js                    |  15 +-
 5 files changed, 342 insertions(+), 18 deletions(-)
 create mode 100644 lib/device/simulation/cooler.js

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 53a65229..d4cbf29c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@ All notable changes to homebridge-ewelink will be documented in this file.
 
 ### Added
 
+- Expose a single-channel device as a `Heater` or `Cooler` accessory type, using the current temperature value from another eWeLink or Govee sensor
 - Expose eWeLink groups as HomeKit switches
 
 ## 8.7.1 (2021-12-09)
diff --git a/config.schema.json b/config.schema.json
index 1301a26d..7c25d6be 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -228,6 +228,10 @@
                   "title": "1 Heater",
                   "enum": ["heater"]
                 },
+                {
+                  "title": "1 Cooler",
+                  "enum": ["cooler"]
+                },
                 {
                   "title": "1 Doorbell",
                   "enum": ["doorbell"]
@@ -336,7 +340,7 @@
               "title": "Temperature Sensor ID",
               "description": "Enter a eWeLink or Govee device ID which provides a current temperature reading.",
               "condition": {
-                "functionBody": "return (model.singleDevices && model.singleDevices[arrayIndices] && ['heater'].includes(model.singleDevices[arrayIndices].showAs) && !model.singleDevices[arrayIndices].ignoreDevice);"
+                "functionBody": "return (model.singleDevices && model.singleDevices[arrayIndices] && ['heater', 'cooler'].includes(model.singleDevices[arrayIndices].showAs) && !model.singleDevices[arrayIndices].ignoreDevice);"
               }
             },
             "isInched": {
diff --git a/lib/device/simulation/cooler.js b/lib/device/simulation/cooler.js
new file mode 100644
index 00000000..46a6e4b4
--- /dev/null
+++ b/lib/device/simulation/cooler.js
@@ -0,0 +1,319 @@
+/* jshint node: true, esversion: 10, -W014, -W033 */
+/* eslint-disable new-cap */
+'use strict'
+
+module.exports = class deviceCooler {
+  constructor (platform, accessory) {
+    // Set up variables from the platform
+    this.funcs = platform.funcs
+    this.hapChar = platform.api.hap.Characteristic
+    this.hapErr = platform.api.hap.HapStatusError
+    this.hapServ = platform.api.hap.Service
+    this.lang = platform.lang
+    this.log = platform.log
+    this.platform = platform
+
+    // Set up variables from the accessory
+    this.name = accessory.displayName
+    this.accessory = accessory
+
+    // Initially set the online flag as true (to be then updated as false if necessary)
+    this.isOnline = true
+
+    // Set up custom variables for this device type
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
+    this.temperatureSource = deviceConf.temperatureSource
+
+    // Set the correct logging variables for this accessory
+    this.enableLogging = !platform.config.disableDeviceLogging
+    this.enableDebugLogging = platform.config.debug
+    if (deviceConf && deviceConf.overrideLogging) {
+      switch (deviceConf.overrideLogging) {
+        case 'standard':
+          this.enableLogging = true
+          this.enableDebugLogging = false
+          break
+        case 'debug':
+          this.enableLogging = true
+          this.enableDebugLogging = true
+          break
+        case 'disable':
+          this.enableLogging = false
+          this.enableDebugLogging = false
+          break
+      }
+    }
+
+    // If the accessory has a switch service then remove it
+    if (this.accessory.getService(this.hapServ.Switch)) {
+      this.accessory.removeService(this.accessory.getService(this.hapServ.Switch))
+    }
+
+    // Set up the accessory with default target temp when added the first time
+    if (!this.funcs.hasProperty(this.accessory.context, 'cacheTarget')) {
+      this.accessory.context.cacheTarget = 20
+    }
+
+    // Check to make sure user has not switched from cooler to heater
+    if (this.accessory.context.cacheType !== 'cooler') {
+      // Remove and re-setup as a HeaterCooler
+      if (this.accessory.getService(this.hapServ.HeaterCooler)) {
+        this.accessory.removeService(this.accessory.getService(this.hapServ.HeaterCooler))
+      }
+      this.accessory.context.cacheType = 'cooler'
+      this.accessory.context.cacheTarget = 20
+    }
+
+    // Add the heater service if it doesn't already exist
+    this.service =
+      this.accessory.getService(this.hapServ.HeaterCooler) ||
+      this.accessory.addService(this.hapServ.HeaterCooler)
+
+    // Set custom properties of the current temperature characteristic
+    this.service.getCharacteristic(this.hapChar.CurrentTemperature).setProps({
+      minStep: 0.1
+    })
+    this.cacheTemp = this.service.getCharacteristic(this.hapChar.CurrentTemperature).value
+
+    // Add the set handler to the heater active characteristic
+    this.service
+      .getCharacteristic(this.hapChar.Active)
+      .onSet(async value => await this.internalStateUpdate(value))
+
+    // Add options to the target state characteristic
+    this.service.getCharacteristic(this.hapChar.TargetHeaterCoolerState).setProps({
+      minValue: 0,
+      maxValue: 0,
+      validValues: [0]
+    })
+
+    // Add the set handler to the target temperature characteristic
+    this.service
+      .getCharacteristic(this.hapChar.CoolingThresholdTemperature)
+      .updateValue(this.accessory.context.cacheTarget)
+      .setProps({ minStep: 0.5 })
+      .onSet(async value => await this.internalTargetTempUpdate(value))
+
+    // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
+    if (!platform.config.disableNoResponse) {
+      this.service.getCharacteristic(this.hapChar.CurrentTemperature).onGet(() => {
+        if (!this.isOnline) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.CurrentTemperature).value
+      })
+      this.service.getCharacteristic(this.hapChar.Active).onGet(() => {
+        if (!this.isOnline) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.Active).value
+      })
+      this.service.getCharacteristic(this.hapChar.TargetHeaterCoolerState).onGet(() => {
+        if (!this.isOnline) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.TargetHeaterCoolerState).value
+      })
+      this.service.getCharacteristic(this.hapChar.CurrentHeaterCoolerState).onGet(() => {
+        if (!this.isOnline) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.CurrentHeaterCoolerState).value
+      })
+      this.service.getCharacteristic(this.hapChar.CoolingThresholdTemperature).onGet(() => {
+        if (!this.isOnline) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.CoolingThresholdTemperature).value
+      })
+    }
+
+    // Initialise these caches now since they aren't determined by the initial externalUpdate()
+    this.cacheState = this.service.getCharacteristic(this.hapChar.Active).value === 1 ? 'on' : 'off'
+    this.cacheCool =
+      this.cacheState === 'on' &&
+      this.service.getCharacteristic(this.hapChar.TargetHeaterCoolerState).value === 3
+        ? 'on'
+        : 'off'
+
+    // Pass the accessory to Fakegato to set up with Eve
+    this.accessory.eveService = new platform.eveService('custom', this.accessory, {
+      log: platform.config.debugFakegato ? this.log : () => {}
+    })
+
+    // Set up an interval to get eWeLink to send regular temperature/humidity updates
+    setTimeout(() => {
+      this.getTemperature()
+      this.intervalPoll = setInterval(() => this.getTemperature(), 120000)
+    }, 5000)
+
+    // Stop the intervals on Homebridge shutdown
+    platform.api.on('shutdown', () => {
+      clearInterval(this.intervalPoll)
+    })
+
+    // Output the customised options to the log
+    const opts = JSON.stringify({
+      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
+      showAs: 'cooler',
+      temperatureSource: this.temperatureSource
+    })
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
+  }
+
+  async internalStateUpdate (value) {
+    try {
+      let newState
+      let newCool
+      const params = {}
+      if (value === 0) {
+        params.switch = 'off'
+        newState = 'off'
+        newCool = 'off'
+      } else {
+        if (this.cacheTemp > this.accessory.context.cacheTarget) {
+          params.switch = 'on'
+          newState = 'on'
+          newCool = 'on'
+        } else {
+          params.switch = 'off'
+          newState = 'on'
+          newCool = 'off'
+        }
+      }
+
+      // Only send the update if either:
+      // * The new value (state) is OFF and the cacheCool was ON
+      // * The new value (state) is ON and newCool is 'on'
+      if ((value === 0 && this.cacheCool === 'on') || (value === 1 && newCool === 'on')) {
+        await this.platform.sendDeviceUpdate(this.accessory, params)
+      }
+      if (newState !== this.cacheState) {
+        this.cacheState = newState
+        if (this.enableLogging) {
+          this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
+        }
+      }
+      if (newCool !== this.cacheCool) {
+        this.cacheCool = newCool
+        if (this.enableLogging) {
+          this.log('[%s] %s [%s].', this.name, this.lang.curCool, this.cacheCool)
+        }
+      }
+      this.service.updateCharacteristic(
+        this.hapChar.CurrentHeaterCoolerState,
+        value === 1 ? (this.cacheCool === 'on' ? 3 : 1) : 0
+      )
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, true)
+      setTimeout(() => {
+        this.service.updateCharacteristic(this.hapChar.Active, this.cacheState === 'on' ? 1 : 0)
+      }, 2000)
+      throw new this.hapErr(-70402)
+    }
+  }
+
+  async internalTargetTempUpdate (value) {
+    try {
+      if (value === this.accessory.context.cacheTarget) {
+        return
+      }
+      this.accessory.context.cacheTarget = value
+      if (this.enableLogging) {
+        this.log('[%s] %s [%s°C].', this.name, this.lang.curTarg, value)
+      }
+      if (this.cacheState === 'off') {
+        return
+      }
+      const params = {}
+      let newCool
+      if (this.cacheTemp > value) {
+        params.switch = 'on'
+        newCool = 'on'
+      } else {
+        params.switch = 'off'
+        newCool = 'off'
+      }
+      if (newCool === this.cacheCool) {
+        return
+      }
+      await this.platform.sendDeviceUpdate(this.accessory, params)
+      this.cacheCool = newCool
+      if (this.enableLogging) {
+        this.log('[%s] %s [%s].', this.name, this.lang.curCool, this.cacheCool)
+      }
+      this.service.updateCharacteristic(
+        this.hapChar.CurrentHeaterCoolerState,
+        this.cacheCool === 'on' ? 3 : 1
+      )
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, true)
+      setTimeout(() => {
+        this.service.updateCharacteristic(
+          this.hapChar.CoolingThresholdTemperature,
+          this.accessory.context.cacheTarget
+        )
+      }, 2000)
+      throw new this.hapErr(-70402)
+    }
+  }
+
+  async internalCurrentTempUpdate () {
+    try {
+      if (this.cacheState === 'off') {
+        return
+      }
+      const params = {}
+      let newCool
+      if (this.cacheTemp > this.accessory.context.cacheTarget) {
+        params.switch = 'on'
+        newCool = 'on'
+      } else {
+        params.switch = 'off'
+        newCool = 'off'
+      }
+      if (newCool === this.cacheCool) {
+        return
+      }
+      await this.platform.sendDeviceUpdate(this.accessory, params)
+      this.cacheCool = newCool
+      if (this.enableLogging) {
+        this.log('[%s] %s [%s].', this.name, this.lang.curCool, this.cacheCool)
+      }
+      this.service.updateCharacteristic(
+        this.hapChar.CurrentHeaterCoolerState,
+        this.cacheCool === 'on' ? 3 : 1
+      )
+    } catch (err) {
+      // Suppress errors here
+    }
+  }
+
+  async getTemperature () {
+    try {
+      // Skip polling if device isn't online
+      if (!this.isOnline || !this.platform.storageClientData) {
+        return
+      }
+
+      const newTemp = await this.platform.storageData.getItem(this.temperatureSource + '_temp')
+      if (newTemp && newTemp !== this.cacheTemp) {
+        this.cacheTemp = newTemp
+        this.service.updateCharacteristic(this.hapChar.CurrentTemperature, this.cacheTemp)
+        this.accessory.eveService.addEntry({ temp: this.cacheTemp })
+        if (this.enableLogging) {
+          this.log('[%s] %s [%s°C].', this.name, this.lang.curTemp, this.cacheTemp)
+        }
+        await this.internalCurrentTempUpdate()
+      }
+    } catch (err) {
+      this.log.error(err)
+    }
+  }
+
+  async externalUpdate (params) {}
+
+  markStatus (isOnline) {
+    this.isOnline = isOnline
+  }
+}
diff --git a/lib/device/simulation/heater.js b/lib/device/simulation/heater.js
index 5e16012d..7172b3d1 100644
--- a/lib/device/simulation/heater.js
+++ b/lib/device/simulation/heater.js
@@ -22,12 +22,7 @@ module.exports = class deviceHeater {
 
     // Set up custom variables for this device type
     const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
-    this.temperatureSource =
-      deviceConf && deviceConf.temperatureSource ? deviceConf.temperatureSource : ''
-    this.maxTarget =
-      deviceConf && deviceConf.maxTarget
-        ? Math.max(deviceConf.maxTarget, this.minTarget + 1)
-        : platform.consts.defaultValues.maxTarget
+    this.temperatureSource = deviceConf.temperatureSource
 
     // Set the correct logging variables for this accessory
     this.enableLogging = !platform.config.disableDeviceLogging
@@ -101,14 +96,6 @@ module.exports = class deviceHeater {
 
     // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
     if (!platform.config.disableNoResponse) {
-      if (this.humiService) {
-        this.humiService.getCharacteristic(this.hapChar.CurrentRelativeHumidity).onGet(() => {
-          if (!this.isOnline) {
-            throw new this.hapErr(-70402)
-          }
-          return this.humiService.getCharacteristic(this.hapChar.CurrentRelativeHumidity).value
-        })
-      }
       this.service.getCharacteristic(this.hapChar.CurrentTemperature).onGet(() => {
         if (!this.isOnline) {
           throw new this.hapErr(-70402)
@@ -238,7 +225,7 @@ module.exports = class deviceHeater {
       if (this.cacheState === 'off') {
         return
       }
-      const params = { deviceType: 'normal' }
+      const params = {}
       let newHeat
       if (this.cacheTemp < value) {
         params.switch = 'on'
@@ -276,7 +263,7 @@ module.exports = class deviceHeater {
       if (this.cacheState === 'off') {
         return
       }
-      const params = { deviceType: 'normal' }
+      const params = {}
       let newHeat
       if (this.cacheTemp < this.accessory.context.cacheTarget) {
         params.switch = 'on'
diff --git a/lib/index.js b/lib/index.js
index ddf6ba43..949dabe7 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1076,9 +1076,22 @@ class eWeLinkPlatform {
           return
         }
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.context.sensorType = device.params.sensorType
         accessory.control = new (require('./device/simulation/heater'))(this, accessory)
         /******************/
+      } else if (device.showAs === 'cooler') {
+        /*******************
+        COOLERS [SIMULATION]
+        *******************/
+        if (!this.deviceConf[device.deviceid].temperatureSource) {
+          this.log.warn('[%s] %s.', device.name, this.lang.heaterSimNoSensor)
+          if (devicesInHB.has(uuid)) {
+            this.removeAccessory(devicesInHB.get(uuid))
+          }
+          return
+        }
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
+        accessory.control = new (require('./device/simulation/cooler'))(this, accessory)
+        /******************/
       } else if (this.consts.devices.lightRGB.includes(uiid)) {
         /***********
         LIGHTS [RGB]

From bb37ecc79aa45584018412e08ec183157276be73 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 17 Dec 2021 08:45:00 +0000
Subject: [PATCH 2857/3183] 8.7.2-beta.6

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d13eb572..5a46f6be 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.7.2-beta.5",
+  "version": "8.7.2-beta.6",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.7.2-beta.5",
+      "version": "8.7.2-beta.6",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 037ba90b..2cacf2f0 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.7.2-beta.5",
+  "version": "8.7.2-beta.6",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From de1c6edfa42a42aa55608a8cccf60179a3970356 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 17 Dec 2021 10:38:03 +0000
Subject: [PATCH 2858/3183] some changes to ui screen

---
 CHANGELOG.md           |  4 ++
 config.schema.json     | 93 +++++++++++++++++++-----------------------
 lib/utils/constants.js | 10 ++---
 3 files changed, 52 insertions(+), 55 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d4cbf29c..36af36fb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,10 @@ All notable changes to homebridge-ewelink will be documented in this file.
 - Expose a single-channel device as a `Heater` or `Cooler` accessory type, using the current temperature value from another eWeLink or Govee sensor
 - Expose eWeLink groups as HomeKit switches
 
+### Changed
+
+- Some config options rearranged for easier access
+
 ## 8.7.1 (2021-12-09)
 
 ### Fixed
diff --git a/config.schema.json b/config.schema.json
index 7c25d6be..7392a532 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -26,22 +26,6 @@
         "required": true,
         "description": "Your eWeLink password, can also be a base64 encoded version of your password."
       },
-      "language": {
-        "type": "string",
-        "title": "Logging Language",
-        "description": "Language to use for logging.",
-        "default": "en",
-        "oneOf": [
-          {
-            "title": "English",
-            "enum": ["en"]
-          },
-          {
-            "title": "French",
-            "enum": ["fr"]
-          }
-        ]
-      },
       "mode": {
         "type": "string",
         "title": "Connection Mode",
@@ -49,7 +33,7 @@
         "default": "auto",
         "oneOf": [
           {
-            "title": "Auto (Recommended)",
+            "title": "Hybrid (Recommended)",
             "enum": ["auto"]
           },
           {
@@ -62,6 +46,42 @@
           }
         ]
       },
+      "debug": {
+        "title": "Debug Logging",
+        "type": "boolean",
+        "description": "Global logging setting for the plugin. If true then debug information will be added to the log. This can also be set per accessory later in the config."
+      },
+      "debugFakegato": {
+        "title": "Debug Fakegato",
+        "type": "boolean",
+        "description": "If true, the included Fakegato library will debug to the log."
+      },
+      "disablePlugin": {
+        "title": "Disable Plugin",
+        "type": "boolean",
+        "description": "If true, the plugin will remove all accessories and not load the plugin on restart."
+      },
+      "language": {
+        "type": "string",
+        "title": "Logging Language",
+        "description": "Language to use for logging.",
+        "default": "en",
+        "oneOf": [
+          {
+            "title": "English",
+            "enum": ["en"]
+          },
+          {
+            "title": "French",
+            "enum": ["fr"]
+          }
+        ]
+      },
+      "disableDeviceLogging": {
+        "type": "boolean",
+        "title": "Disable Device Logging",
+        "description": "Global logging setting for accessory status changes. If true then accessory status changes will not be logged. This can also be set per accessory later in the config."
+      },
       "disableNoResponse": {
         "type": "boolean",
         "title": "Disable 'No Response'",
@@ -108,27 +128,7 @@
         "type": "integer",
         "title": "Internal API Port",
         "description": "Port to use for the internal HTTP API. Set to 0 to disable. Set to 1 to choose a randomly available port.",
-        "minimum": 1
-      },
-      "disableDeviceLogging": {
-        "type": "boolean",
-        "title": "Disable Device Logging",
-        "description": "Global logging setting for accessory status changes. If true then accessory status changes will not be logged. This can also be set per accessory later in the config."
-      },
-      "debug": {
-        "title": "Debug Logging",
-        "type": "boolean",
-        "description": "Global logging setting for the plugin. If true then debug information will be added to the log. This can also be set per accessory later in the config."
-      },
-      "debugFakegato": {
-        "title": "Debug Fakegato",
-        "type": "boolean",
-        "description": "If true, the included Fakegato library will debug to the log."
-      },
-      "disablePlugin": {
-        "title": "Disable Plugin",
-        "type": "boolean",
-        "description": "If true, the plugin will remove all accessories and not load the plugin on restart."
+        "minimum": 0
       },
       "singleDevices": {
         "title": "Single Channel Devices",
@@ -1648,27 +1648,20 @@
     {
       "type": "fieldset",
       "title": "Required Settings",
-      "items": ["username", "password"]
+      "items": ["username", "password", "mode", "debug", "disablePlugin"]
     },
     {
       "type": "fieldset",
-      "title": "Optional Settings",
-      "description": "Optional settings for the plugin, including account, API and global logging settings.",
+      "title": "Advanced Settings",
+      "description": "Advanced settings for the plugin, including account and API options.",
       "expandable": true,
       "items": [
         "language",
-        "mode",
-        {
-          "type": "help",
-          "helpvalue": "<label class=\"control-label text-warning\">⚠ Using LAN mode will remove any unsupported accessories from Homebridge.</label>"
-        },
+        "disableDeviceLogging",
         "disableNoResponse",
         "countryCode",
         "httpHost",
-        "apiPort",
-        "disableDeviceLogging",
-        "debug",
-        "disablePlugin"
+        "apiPort"
       ]
     },
     {
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index c4d15ad5..a49816c3 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -7,16 +7,16 @@ module.exports = {
     name: 'eWeLink',
     username: '',
     password: '',
-    language: 'en',
     mode: 'auto',
+    debug: false,
+    debugFakegato: false,
+    disablePlugin: false,
+    language: 'en',
+    disableDeviceLogging: false,
     disableNoResponse: false,
     countryCode: '+44',
     httpHost: 'eu-apia.coolkit.cc',
     apiPort: 0,
-    disableDeviceLogging: false,
-    debug: false,
-    debugFakegato: false,
-    disablePlugin: false,
     singleDevices: [],
     multiDevices: [],
     lightDevices: [],

From c73094b27f208f4f3d042474c5c4ef7d792ef88f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 17 Dec 2021 10:38:31 +0000
Subject: [PATCH 2859/3183] 8.7.2-beta.7

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 5a46f6be..7c77623e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.7.2-beta.6",
+  "version": "8.7.2-beta.7",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.7.2-beta.6",
+      "version": "8.7.2-beta.7",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 2cacf2f0..cc274565 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.7.2-beta.6",
+  "version": "8.7.2-beta.7",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From caec6210fde72a3ad6cb6ec403b34f19fc7a61e0 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 17 Dec 2021 10:54:50 +0000
Subject: [PATCH 2860/3183] remove descs

---
 config.schema.json | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 7392a532..56fb044d 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -48,18 +48,15 @@
       },
       "debug": {
         "title": "Debug Logging",
-        "type": "boolean",
-        "description": "Global logging setting for the plugin. If true then debug information will be added to the log. This can also be set per accessory later in the config."
+        "type": "boolean"
       },
       "debugFakegato": {
         "title": "Debug Fakegato",
-        "type": "boolean",
-        "description": "If true, the included Fakegato library will debug to the log."
+        "type": "boolean"
       },
       "disablePlugin": {
         "title": "Disable Plugin",
-        "type": "boolean",
-        "description": "If true, the plugin will remove all accessories and not load the plugin on restart."
+        "type": "boolean"
       },
       "language": {
         "type": "string",

From 9633bd7911974f1b3b804330657dd2c8fa9bc7af Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 17 Dec 2021 10:55:26 +0000
Subject: [PATCH 2861/3183] 8.7.2-beta.8

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 7c77623e..0a79f7e9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.7.2-beta.7",
+  "version": "8.7.2-beta.8",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.7.2-beta.7",
+      "version": "8.7.2-beta.8",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index cc274565..e80ce692 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.7.2-beta.7",
+  "version": "8.7.2-beta.8",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From 7fcf9d2cdabf5fb4c9ad81923c0af3b1f41b9171 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 17 Dec 2021 11:27:10 +0000
Subject: [PATCH 2862/3183] more small changes to heater/cooler sim

---
 lib/device/simulation/cooler.js | 10 ++++++----
 lib/device/simulation/heater.js | 10 ++++++----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/lib/device/simulation/cooler.js b/lib/device/simulation/cooler.js
index 46a6e4b4..06e026bc 100644
--- a/lib/device/simulation/cooler.js
+++ b/lib/device/simulation/cooler.js
@@ -141,7 +141,7 @@ module.exports = class deviceCooler {
       log: platform.config.debugFakegato ? this.log : () => {}
     })
 
-    // Set up an interval to get eWeLink to send regular temperature/humidity updates
+    // Set up an interval to get regular temperature updates
     setTimeout(() => {
       this.getTemperature()
       this.intervalPoll = setInterval(() => this.getTemperature(), 120000)
@@ -285,13 +285,14 @@ module.exports = class deviceCooler {
         this.cacheCool === 'on' ? 3 : 1
       )
     } catch (err) {
-      // Suppress errors here
+      const eText = this.funcs.parseError(err)
+      this.log.warn('[%s] %s.', this.name, eText)
     }
   }
 
   async getTemperature () {
     try {
-      // Skip polling if device isn't online
+      // Skip polling if device isn't online or if the storage hasn't initialised properly
       if (!this.isOnline || !this.platform.storageClientData) {
         return
       }
@@ -307,7 +308,8 @@ module.exports = class deviceCooler {
         await this.internalCurrentTempUpdate()
       }
     } catch (err) {
-      this.log.error(err)
+      const eText = this.funcs.parseError(err)
+      this.log.warn('[%s] %s.', this.name, eText)
     }
   }
 
diff --git a/lib/device/simulation/heater.js b/lib/device/simulation/heater.js
index 7172b3d1..dd2dba12 100644
--- a/lib/device/simulation/heater.js
+++ b/lib/device/simulation/heater.js
@@ -141,7 +141,7 @@ module.exports = class deviceHeater {
       log: platform.config.debugFakegato ? this.log : () => {}
     })
 
-    // Set up an interval to get eWeLink to send regular temperature/humidity updates
+    // Set up an interval to get regular temperature updates
     setTimeout(() => {
       this.getTemperature()
       this.intervalPoll = setInterval(() => this.getTemperature(), 120000)
@@ -285,13 +285,14 @@ module.exports = class deviceHeater {
         this.cacheHeat === 'on' ? 2 : 1
       )
     } catch (err) {
-      // Suppress errors here
+      const eText = this.funcs.parseError(err)
+      this.log.warn('[%s] %s.', this.name, eText)
     }
   }
 
   async getTemperature () {
     try {
-      // Skip polling if device isn't online
+      // Skip polling if device isn't online or if the storage hasn't initialised properly
       if (!this.isOnline || !this.platform.storageClientData) {
         return
       }
@@ -307,7 +308,8 @@ module.exports = class deviceHeater {
         await this.internalCurrentTempUpdate()
       }
     } catch (err) {
-      this.log.error(err)
+      const eText = this.funcs.parseError(err)
+      this.log.warn('[%s] %s.', this.name, eText)
     }
   }
 

From b954d7d8bae0e7cee98fc90c9b6c689bead999bb Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 17 Dec 2021 13:25:50 +0000
Subject: [PATCH 2863/3183] initial support for nspanel

---
 CHANGELOG.md           |   1 +
 lib/device/panel.js    | 174 +++++++++++++++++++++++++++++++++++++++++
 lib/index.js           |   7 ++
 lib/utils/constants.js |   2 +
 4 files changed, 184 insertions(+)
 create mode 100644 lib/device/panel.js

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 36af36fb..fa8e4d2a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@ All notable changes to homebridge-ewelink will be documented in this file.
 ### Added
 
 - Expose a single-channel device as a `Heater` or `Cooler` accessory type, using the current temperature value from another eWeLink or Govee sensor
+- Initial support for Sonoff NSPanel
 - Expose eWeLink groups as HomeKit switches
 
 ### Changed
diff --git a/lib/device/panel.js b/lib/device/panel.js
new file mode 100644
index 00000000..bc2c37f1
--- /dev/null
+++ b/lib/device/panel.js
@@ -0,0 +1,174 @@
+/* jshint node: true, esversion: 10, -W014, -W033 */
+/* eslint-disable new-cap */
+'use strict'
+
+module.exports = class deviceSwitchSingle {
+  constructor (platform, accessory) {
+    // Set up variables from the platform
+    this.funcs = platform.funcs
+    this.hapChar = platform.api.hap.Characteristic
+    this.hapErr = platform.api.hap.HapStatusError
+    this.hapServ = platform.api.hap.Service
+    this.lang = platform.lang
+    this.log = platform.log
+    this.platform = platform
+
+    // Set up variables from the accessory
+    this.name = accessory.displayName
+    this.accessory = accessory
+
+    // Initially set the online flag as true (to be then updated as false if necessary)
+    this.isOnline = true
+
+    // Set up custom variables for this device type
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
+
+    // Set the correct logging variables for this accessory
+    this.enableLogging = !platform.config.disableDeviceLogging
+    this.enableDebugLogging = platform.config.debug
+    if (deviceConf && deviceConf.overrideLogging) {
+      switch (deviceConf.overrideLogging) {
+        case 'standard':
+          this.enableLogging = true
+          this.enableDebugLogging = false
+          break
+        case 'debug':
+          this.enableLogging = true
+          this.enableDebugLogging = true
+          break
+        case 'disable':
+          this.enableLogging = false
+          this.enableDebugLogging = false
+          break
+      }
+    }
+
+    // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
+    if (!platform.config.disableNoResponse) {
+      // Empty
+    }
+
+    // Output the customised options to the log
+    const opts = JSON.stringify({
+      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable'
+    })
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
+
+    /*
+      {
+         "bindInfos":{
+            "gaction":[
+               ""
+            ],
+            "scene":2
+         },
+         "version":8,
+         "pulses":[
+            {
+               "pulse":"off",
+               "width":1000,
+               "outlet":0
+            },
+            {
+               "pulse":"off",
+               "width":1000,
+               "outlet":1
+            }
+         ],
+         "switches":[
+            {
+               "switch":"off",
+               "outlet":0
+            },
+            {
+               "switch":"off",
+               "outlet":1
+            }
+         ],
+         "configure":[
+            {
+               "startup":"off",
+               "outlet":0
+            },
+            {
+               "startup":"off",
+               "outlet":1
+            }
+         ],
+         "lock":0,
+         "fwVersion":"1.0.2",
+         "temperature":24,
+         "humidity":50,
+         "tempUnit":0,
+         "HMI_outdoorTemp":{
+            "current":13,
+            "range":"-2,14"
+         },
+         "HMI_weather":1,
+         "cityId":"00000",
+         "dst":0,
+         "dstChange":"",
+         "geo":"",
+         "timeZone":1,
+         "HMI_dimEnable":0,
+         "HMI_resources":[
+            {
+               "ctype":"device",
+               "id":"100000000",
+               "uiid":6
+            },
+            {
+               "ctype":"device",
+               "id":"100000001",
+               "uiid":1
+            },
+            {
+               "ctype":"device",
+               "id":"100000002",
+               "uiid":6
+            },
+            {
+               "ctype":"idle"
+            },
+            {
+               "ctype":"idle"
+            },
+            {
+               "ctype":"idle"
+            },
+            {
+               "ctype":"idle"
+            },
+            {
+               "ctype":"idle"
+            }
+         ],
+         "HMI_ATCDevice":{
+            "ctype":"device",
+            "id":"100000000",
+            "outlet":0,
+            "etype":"hot"
+         },
+         "ctype":"device",
+         "id":"100000000",
+         "resourcetype":"ATC",
+         "ATCMode":1,
+         "ATCExpect0":23,
+         "ATCEnable":1,
+         "ATCExpect1":23
+      }
+    */
+  }
+
+  async externalUpdate (params) {
+    try {
+      this.log.warn(JSON.stringify(params))
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, false)
+    }
+  }
+
+  markStatus (isOnline) {
+    this.isOnline = isOnline
+  }
+}
diff --git a/lib/index.js b/lib/index.js
index 949dabe7..17cae839 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -727,6 +727,13 @@ class eWeLinkPlatform {
         this.log.warn('[%s] %s.', device.name, this.lang.dualr3NoMeter)
         this.ignoredDevices.push(device.deviceid)
         return
+      } else if (this.consts.devices.panel.includes(uiid)) {
+        /******
+        NSPANEL
+        ******/
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
+        accessory.control = new (require('./device/panel'))(this, accessory)
+        /*****/
       } else if (this.consts.devices.curtain.includes(uiid)) {
         /****************************
         BLINDS [EWELINK UIID 11 & 67]
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index a49816c3..61e62222 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -287,6 +287,7 @@ module.exports = {
     sensorAmbient: [15],
     sensorTempHumi: [18],
     thermostat: [127],
+    panel: [133],
     fan: [34],
     humidifier: [19],
     diffuser: [25],
@@ -416,6 +417,7 @@ module.exports = {
     114: 3,
     126: 2, // "DUALR3"
     127: 1, // "GTTA127"
+    133: 1, // "NSPANEL"
     137: 1, // "L2/SPIDER CONTROLLER"
     138: 1, // "MINIR3?" (WOOLLEY WLAN SMART SWITCH)
     139: 2, // "MINIR3?"

From 6eaac35b5a3edb255e69c5eae5d386c3122c7102 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 17 Dec 2021 13:26:17 +0000
Subject: [PATCH 2864/3183] 8.7.2-beta.9

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 0a79f7e9..50ed188b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.7.2-beta.8",
+  "version": "8.7.2-beta.9",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.7.2-beta.8",
+      "version": "8.7.2-beta.9",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index e80ce692..7c69ea7a 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.7.2-beta.8",
+  "version": "8.7.2-beta.9",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From 8e462bb6c21babc6d947c6773f7ffa3e0925da9e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 17 Dec 2021 15:08:11 +0000
Subject: [PATCH 2865/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fa8e4d2a..c3c39a19 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,9 +6,10 @@ All notable changes to homebridge-ewelink will be documented in this file.
 
 ### Added
 
-- Expose a single-channel device as a `Heater` or `Cooler` accessory type, using the current temperature value from another eWeLink or Govee sensor
+- Expose a single-channel device as a `Heater` or `Cooler` accessory type, using the current temperature value from another eWeLink, Govee or Meross sensor
 - Initial support for Sonoff NSPanel
 - Expose eWeLink groups as HomeKit switches
+- Current temperature values from sensors will be cached in the homebridge storage directory to allow my other plugins to create `Heater` and `Cooler` accessories with the temperature values
 
 ### Changed
 

From 8b6e87437da983cb437134098204d8c47411dc02 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 17 Dec 2021 15:09:26 +0000
Subject: [PATCH 2866/3183] Update config.schema.json

---
 config.schema.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config.schema.json b/config.schema.json
index 56fb044d..352ff93c 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -335,7 +335,7 @@
             "temperatureSource": {
               "type": "string",
               "title": "Temperature Sensor ID",
-              "description": "Enter a eWeLink or Govee device ID which provides a current temperature reading.",
+              "description": "Enter a eWeLink, Govee or Meross device ID which provides a current temperature reading.",
               "condition": {
                 "functionBody": "return (model.singleDevices && model.singleDevices[arrayIndices] && ['heater', 'cooler'].includes(model.singleDevices[arrayIndices].showAs) && !model.singleDevices[arrayIndices].ignoreDevice);"
               }

From 5e9e8b2d87767b6e39e494074e0eabdcfa174b71 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 17 Dec 2021 15:10:02 +0000
Subject: [PATCH 2867/3183] 8.7.2-beta.10

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 50ed188b..9e27502b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.7.2-beta.9",
+  "version": "8.7.2-beta.10",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.7.2-beta.9",
+      "version": "8.7.2-beta.10",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 7c69ea7a..61ea7bba 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.7.2-beta.9",
+  "version": "8.7.2-beta.10",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From 52aaeca234f2796a5c6ddd9fcef6ca5d54131a52 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 17 Dec 2021 15:22:40 +0000
Subject: [PATCH 2868/3183] temp sensor for nspanel

---
 config.schema.json  | 16 +++++----
 lib/device/panel.js | 85 +++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 92 insertions(+), 9 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 352ff93c..67d96ce1 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -941,7 +941,7 @@
       },
       "thDevices": {
         "title": "Thermostat Devices",
-        "description": "Optional settings for thermostat devices and the TH10/16.",
+        "description": "Optional settings for thermostat devices, NSPanel and the TH10/16.",
         "type": "array",
         "items": {
           "type": "object",
@@ -975,6 +975,10 @@
                   "title": "Sonoff TH10/16",
                   "enum": ["th"]
                 },
+                {
+                  "title": "Sonoff NSPanel",
+                  "enum": ["panel"]
+                },
                 {
                   "title": "Sonoff SC",
                   "enum": ["sc"]
@@ -1036,7 +1040,7 @@
               "description": "You can offset the temperature that the sensor reads. An offset of 2 means 2 degrees will be added to the recorded temperature. Can be positive or negative and can include a decimal point '.'.",
               "placeholder": 0,
               "condition": {
-                "functionBody": "return (model.thDevices && model.thDevices[arrayIndices] && ['th', 'sc', 'hc'].includes(model.thDevices[arrayIndices].deviceModel) && !model.thDevices[arrayIndices].ignoreDevice);"
+                "functionBody": "return (model.thDevices && model.thDevices[arrayIndices] && ['th', 'sc', 'hc', 'panel'].includes(model.thDevices[arrayIndices].deviceModel) && !model.thDevices[arrayIndices].ignoreDevice);"
               }
             },
             "offsetFactor": {
@@ -1044,7 +1048,7 @@
               "title": "Temperature Offset Factor",
               "description": "If true then the above value will be used as a factor, i.e. the recorded temperature will be multipled by this number instead.",
               "condition": {
-                "functionBody": "return (model.thDevices && model.thDevices[arrayIndices] && ['th', 'sc', 'hc'].includes(model.thDevices[arrayIndices].deviceModel) && model.thDevices[arrayIndices].offset && !model.thDevices[arrayIndices].ignoreDevice);"
+                "functionBody": "return (model.thDevices && model.thDevices[arrayIndices] && ['th', 'sc', 'hc', 'panel'].includes(model.thDevices[arrayIndices].deviceModel) && model.thDevices[arrayIndices].offset && !model.thDevices[arrayIndices].ignoreDevice);"
               }
             },
             "humidityOffset": {
@@ -1089,7 +1093,7 @@
               "title": "IP Address",
               "description": "You can manually set the IP address for this Sonoff TH10/16 if it cannot be discovered by the plugin.",
               "condition": {
-                "functionBody": "return (model.mode !== 'wan' && model.thDevices && model.thDevices[arrayIndices] && ['th'].includes(model.thDevices[arrayIndices].deviceModel) && !model.thDevices[arrayIndices].ignoreDevice);"
+                "functionBody": "return (model.mode !== 'wan' && model.thDevices && model.thDevices[arrayIndices] && ['th', 'panel'].includes(model.thDevices[arrayIndices].deviceModel) && !model.thDevices[arrayIndices].ignoreDevice);"
               }
             },
             "overrideLogging": {
@@ -1115,7 +1119,7 @@
                 }
               ],
               "condition": {
-                "functionBody": "return (model.thDevices && model.thDevices[arrayIndices] && ['th', 'sc', 'hc'].includes(model.thDevices[arrayIndices].deviceModel) && !model.thDevices[arrayIndices].ignoreDevice);"
+                "functionBody": "return (model.thDevices && model.thDevices[arrayIndices] && ['th', 'sc', 'hc', 'panel'].includes(model.thDevices[arrayIndices].deviceModel) && !model.thDevices[arrayIndices].ignoreDevice);"
               }
             }
           }
@@ -1752,7 +1756,7 @@
     {
       "key": "thDevices",
       "title": "Thermostat Devices",
-      "description": "Optional settings for thermostat devices and the TH10/16.",
+      "description": "Optional settings for thermostat devices, NSPanel and the TH10/16.",
       "expandable": true,
       "add": "Add Another Device",
       "type": "array",
diff --git a/lib/device/panel.js b/lib/device/panel.js
index bc2c37f1..a788539a 100644
--- a/lib/device/panel.js
+++ b/lib/device/panel.js
@@ -22,6 +22,9 @@ module.exports = class deviceSwitchSingle {
 
     // Set up custom variables for this device type
     const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
+    this.tempOffset =
+      deviceConf && deviceConf.offset ? deviceConf.offset : platform.consts.defaultValues.offset
+    this.tempOffsetFactor = deviceConf && deviceConf.offsetFactor
 
     // Set the correct logging variables for this accessory
     this.enableLogging = !platform.config.disableDeviceLogging
@@ -43,14 +46,43 @@ module.exports = class deviceSwitchSingle {
       }
     }
 
+    // Add the temperature sensor service if it doesn't already exist
+    this.tempService =
+      this.accessory.getService(this.hapServ.TemperatureSensor) ||
+      this.accessory.addService(this.hapServ.TemperatureSensor)
+
+    // Set custom properties of the current temperature characteristic
+    this.tempService.getCharacteristic(this.hapChar.CurrentTemperature).setProps({
+      minStep: 0.1
+    })
+    this.cacheTemp = this.tempService.getCharacteristic(this.hapChar.CurrentTemperature).value
+    this.updateCache()
+
     // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
     if (!platform.config.disableNoResponse) {
-      // Empty
+      this.tempService
+        .getCharacteristic(this.hapChar.CurrentTemperature)
+        .setProps({
+          minStep: 0.1
+        })
+        .onGet(() => {
+          if (!this.isOnline) {
+            throw new this.hapErr(-70402)
+          }
+          return this.tempService.getCharacteristic(this.hapChar.CurrentTemperature).value
+        })
     }
 
+    // Pass the accessory to Fakegato to set up with Eve
+    this.accessory.eveService = new platform.eveService('custom', this.accessory, {
+      log: platform.config.debugFakegato ? this.log : () => {}
+    })
+
     // Output the customised options to the log
     const opts = JSON.stringify({
-      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable'
+      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
+      offset: this.tempOffset,
+      offsetFactor: this.tempOffsetFactor
     })
     this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
 
@@ -162,12 +194,59 @@ module.exports = class deviceSwitchSingle {
 
   async externalUpdate (params) {
     try {
-      this.log.warn(JSON.stringify(params))
+      if (this.funcs.hasProperty(params, 'temperature')) {
+        let newTemp = Number(params.temperature)
+        if (this.tempOffsetFactor) {
+          newTemp *= this.tempOffset
+        } else {
+          newTemp += this.tempOffset
+        }
+        if (newTemp !== this.cacheTemp) {
+          this.cacheTemp = newTemp
+          this.tempService.updateCharacteristic(this.hapChar.CurrentTemperature, this.cacheTemp)
+          this.accessory.eveService.addEntry({ temp: this.cacheTemp })
+          if (params.updateSource && this.enableLogging) {
+            this.log('[%s] %s [%s°C].', this.name, this.lang.curTemp, this.cacheTemp)
+          }
+
+          // Update the cache file with the new temperature
+          this.updateCache()
+        }
+      }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
 
+  async updateCache () {
+    // Don't continue if the storage client hasn't initialised properly
+    if (!this.platform.storageClientData) {
+      return
+    }
+
+    // Attempt to save the new temperature to the cache
+    try {
+      await this.platform.storageData.setItem(
+        this.accessory.context.eweDeviceId + '_temp',
+        this.cacheTemp
+      )
+    } catch (err) {
+      if (this.enableLogging) {
+        const eText = this.funcs.parseError(err)
+        this.log.warn('[%s] %s %s.', this.name, this.lang.storageWriteErr, eText)
+      }
+    }
+  }
+
+  currentState () {
+    const toReturn = {}
+    toReturn.services = ['temperature']
+    toReturn.temperature = {
+      current: this.tempService.getCharacteristic(this.hapChar.CurrentTemperature).value
+    }
+    return toReturn
+  }
+
   markStatus (isOnline) {
     this.isOnline = isOnline
   }

From 06c81a94de688c64d3beff7dbc87c48775e14da0 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 17 Dec 2021 15:23:07 +0000
Subject: [PATCH 2869/3183] 8.7.2-beta.11

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 9e27502b..79f7458f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.7.2-beta.10",
+  "version": "8.7.2-beta.11",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.7.2-beta.10",
+      "version": "8.7.2-beta.11",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 61ea7bba..63f65008 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.7.2-beta.10",
+  "version": "8.7.2-beta.11",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From 9cf8a067f48f704ff7956bffaf5626efae2cc36d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 17 Dec 2021 16:18:47 +0000
Subject: [PATCH 2870/3183] add buttons for nspanel

---
 lib/device/panel.js    | 97 +++++++++++++++++++++++++++++++++++++-----
 lib/utils/constants.js |  2 +-
 2 files changed, 87 insertions(+), 12 deletions(-)

diff --git a/lib/device/panel.js b/lib/device/panel.js
index a788539a..79f8c527 100644
--- a/lib/device/panel.js
+++ b/lib/device/panel.js
@@ -58,19 +58,44 @@ module.exports = class deviceSwitchSingle {
     this.cacheTemp = this.tempService.getCharacteristic(this.hapChar.CurrentTemperature).value
     this.updateCache()
 
+    // Add the outlet services if they don't already exist
+    this.service1 =
+      this.accessory.getService('Channel 1') ||
+      this.accessory.addService(this.hapServ.Switch, 'Channel 1', 'channel1')
+    this.service2 =
+      this.accessory.getService('Channel 2') ||
+      this.accessory.addService(this.hapServ.Switch, 'Channel 2', 'channel2')
+
+    // Add the set handler to the switch on/off characteristic
+    this.service1.getCharacteristic(this.hapChar.On).onSet(async value => {
+      await this.internalStateUpdate(this.service1, value)
+    })
+    this.cacheState1 = this.service1.getCharacteristic(this.hapChar.On).value ? 'on' : 'off'
+    this.service2.getCharacteristic(this.hapChar.On).onSet(async value => {
+      await this.internalStateUpdate(this.service2, value)
+    })
+    this.cacheState2 = this.service2.getCharacteristic(this.hapChar.On).value ? 'on' : 'off'
+
     // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
     if (!platform.config.disableNoResponse) {
-      this.tempService
-        .getCharacteristic(this.hapChar.CurrentTemperature)
-        .setProps({
-          minStep: 0.1
-        })
-        .onGet(() => {
-          if (!this.isOnline) {
-            throw new this.hapErr(-70402)
-          }
-          return this.tempService.getCharacteristic(this.hapChar.CurrentTemperature).value
-        })
+      this.tempService.getCharacteristic(this.hapChar.CurrentTemperature).onGet(() => {
+        if (!this.isOnline) {
+          throw new this.hapErr(-70402)
+        }
+        return this.tempService.getCharacteristic(this.hapChar.CurrentTemperature).value
+      })
+      this.service1.getCharacteristic(this.hapChar.On).onGet(() => {
+        if (!this.isOnline) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service1.getCharacteristic(this.hapChar.On).value
+      })
+      this.service2.getCharacteristic(this.hapChar.On).onGet(() => {
+        if (!this.isOnline) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service1.getCharacteristic(this.hapChar.On).value
+      })
     }
 
     // Pass the accessory to Fakegato to set up with Eve
@@ -192,6 +217,56 @@ module.exports = class deviceSwitchSingle {
     */
   }
 
+  async internalStateUpdate (service, value) {
+    try {
+      const newValue = value ? 'on' : 'off'
+      const params = { switches: [] }
+      switch (service) {
+        case this.service1: {
+          if (newValue === this.cacheState1) {
+            return
+          }
+          params.switches.push({ outlet: 0, switch: value ? 'on' : 'off' })
+          break
+        }
+        case this.service2: {
+          if (newValue === this.cacheState2) {
+            return
+          }
+          params.switches.push({ outlet: 1, switch: value ? 'on' : 'off' })
+          break
+        }
+      }
+      // await this.platform.sendDeviceUpdate(this.accessory, params)
+      this.platform.sendDeviceUpdate(this.accessory, params)
+      switch (service) {
+        case this.service1: {
+          this.cacheState1 = newValue
+          if (this.enableLogging) {
+            this.log('[%s] %s [%s].', service.displayName, this.lang.curState, this.cacheState1)
+          }
+          break
+        }
+        case this.service2: {
+          this.cacheState2 = newValue
+          if (this.enableLogging) {
+            this.log('[%s] %s [%s].', service.displayName, this.lang.curState, this.cacheState2)
+          }
+          break
+        }
+      }
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, true)
+      setTimeout(() => {
+        service.updateCharacteristic(
+          this.hapChar.On,
+          service.getCharacteristic(this.hapChar.On).value
+        )
+      }, 2000)
+      throw new this.hapErr(-70402)
+    }
+  }
+
   async externalUpdate (params) {
     try {
       if (this.funcs.hasProperty(params, 'temperature')) {
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 61e62222..b021c48e 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -194,7 +194,7 @@ module.exports = {
         'zl_d',
         'zl_dc'
       ],
-      thDevices: ['th', 'sc', 'hc'],
+      thDevices: ['th', 'panel', 'sc', 'hc'],
       fanDevices: ['ifan'],
       sensorDevices: ['dw', 'snzb01', 'snzb02', 'snzb03', 'snzb04', 'leak'],
       rfDevices: []

From a176296cf4277b7942191783179d7409dc832080 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 17 Dec 2021 16:19:54 +0000
Subject: [PATCH 2871/3183] lan mode and await for nspanel

---
 lib/device/panel.js    | 3 +--
 lib/utils/constants.js | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/device/panel.js b/lib/device/panel.js
index 79f8c527..4fa16823 100644
--- a/lib/device/panel.js
+++ b/lib/device/panel.js
@@ -237,8 +237,7 @@ module.exports = class deviceSwitchSingle {
           break
         }
       }
-      // await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.platform.sendDeviceUpdate(this.accessory, params)
+      await this.platform.sendDeviceUpdate(this.accessory, params)
       switch (service) {
         case this.service1: {
           this.cacheState1 = newValue
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index b021c48e..fd81ad73 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -250,7 +250,7 @@ module.exports = {
   },
 
   devices: {
-    lan: [1, 2, 3, 4, 5, 6, 7, 8, 9, 14, 15, 28, 32, 34, 44, 77, 78, 112, 113, 114, 126],
+    lan: [1, 2, 3, 4, 5, 6, 7, 8, 9, 14, 15, 28, 32, 34, 44, 77, 78, 112, 113, 114, 126, 133],
     switchSingle: [1, 6, 14, 24, 27, 1009, 1256],
     switchSCM: [77, 78, 81, 107, 112, 138],
     switchSinglePower: [5, 32],

From 27f51946e529caa376b21c53a7ac23a752b11ef8 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 17 Dec 2021 16:20:16 +0000
Subject: [PATCH 2872/3183] 8.7.2-beta.12

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 79f7458f..16b0f06c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.7.2-beta.11",
+  "version": "8.7.2-beta.12",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.7.2-beta.11",
+      "version": "8.7.2-beta.12",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 63f65008..45577c7d 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.7.2-beta.11",
+  "version": "8.7.2-beta.12",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From 09f800e457a6d1bc552fbd2bec2261e6c04eccd1 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 17 Dec 2021 16:31:34 +0000
Subject: [PATCH 2873/3183] add external update to nspanel buttons

---
 lib/device/panel.js | 53 +++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 51 insertions(+), 2 deletions(-)

diff --git a/lib/device/panel.js b/lib/device/panel.js
index 4fa16823..603841e4 100644
--- a/lib/device/panel.js
+++ b/lib/device/panel.js
@@ -242,14 +242,26 @@ module.exports = class deviceSwitchSingle {
         case this.service1: {
           this.cacheState1 = newValue
           if (this.enableLogging) {
-            this.log('[%s] %s [%s].', service.displayName, this.lang.curState, this.cacheState1)
+            this.log(
+              '[%s] [%s] %s [%s].',
+              this.name,
+              service.displayName,
+              this.lang.curState,
+              this.cacheState1
+            )
           }
           break
         }
         case this.service2: {
           this.cacheState2 = newValue
           if (this.enableLogging) {
-            this.log('[%s] %s [%s].', service.displayName, this.lang.curState, this.cacheState2)
+            this.log(
+              '[%s] [%s] %s [%s].',
+              this.name,
+              service.displayName,
+              this.lang.curState,
+              this.cacheState2
+            )
           }
           break
         }
@@ -268,6 +280,43 @@ module.exports = class deviceSwitchSingle {
 
   async externalUpdate (params) {
     try {
+      // Switches
+      if (params.switches && Array.isArray(params.switches)) {
+        if (params.switches[0]) {
+          const newValue = params.switches[0].switch
+          if (newValue !== this.cacheState1) {
+            this.cacheState1 = newValue
+            this.service1.updateCharacteristic(this.hapChar.On, this.cacheState1)
+            if (this.enableLogging) {
+              this.log(
+                '[%s] [%s] %s [%s].',
+                this.name,
+                this.service1.displayName,
+                this.lang.curState,
+                this.cacheState1
+              )
+            }
+          }
+        }
+        if (params.switches[1]) {
+          const newValue = params.switches[1].switch
+          if (newValue !== this.cacheState2) {
+            this.cacheState2 = newValue
+            this.service2.updateCharacteristic(this.hapChar.On, this.cacheState1)
+            if (this.enableLogging) {
+              this.log(
+                '[%s] [%s] %s [%s].',
+                this.name,
+                this.service2.displayName,
+                this.lang.curState,
+                this.cacheState2
+              )
+            }
+          }
+        }
+      }
+
+      // Current temperature
       if (this.funcs.hasProperty(params, 'temperature')) {
         let newTemp = Number(params.temperature)
         if (this.tempOffsetFactor) {

From 56120abbdb2c5e6c4990fcac7f8951125ec0f84a Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 17 Dec 2021 16:31:56 +0000
Subject: [PATCH 2874/3183] 8.7.2-beta.13

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 16b0f06c..eb66d676 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.7.2-beta.12",
+  "version": "8.7.2-beta.13",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.7.2-beta.12",
+      "version": "8.7.2-beta.13",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 45577c7d..1b7059a6 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.7.2-beta.12",
+  "version": "8.7.2-beta.13",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From 275a78d44969fa55e5107add5795d0a5dbf6b17c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 17 Dec 2021 16:37:15 +0000
Subject: [PATCH 2875/3183] Update panel.js

---
 lib/device/panel.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/device/panel.js b/lib/device/panel.js
index 603841e4..f93061fa 100644
--- a/lib/device/panel.js
+++ b/lib/device/panel.js
@@ -287,7 +287,7 @@ module.exports = class deviceSwitchSingle {
           if (newValue !== this.cacheState1) {
             this.cacheState1 = newValue
             this.service1.updateCharacteristic(this.hapChar.On, this.cacheState1)
-            if (this.enableLogging) {
+            if (params.updateSource && this.enableLogging) {
               this.log(
                 '[%s] [%s] %s [%s].',
                 this.name,
@@ -303,7 +303,7 @@ module.exports = class deviceSwitchSingle {
           if (newValue !== this.cacheState2) {
             this.cacheState2 = newValue
             this.service2.updateCharacteristic(this.hapChar.On, this.cacheState1)
-            if (this.enableLogging) {
+            if (params.updateSource && this.enableLogging) {
               this.log(
                 '[%s] [%s] %s [%s].',
                 this.name,

From dcf87035154e67f609c09dc8e79bba1a16c99b96 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 17 Dec 2021 16:37:37 +0000
Subject: [PATCH 2876/3183] 8.7.2-beta.14

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index eb66d676..48f27ce0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.7.2-beta.13",
+  "version": "8.7.2-beta.14",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.7.2-beta.13",
+      "version": "8.7.2-beta.14",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 1b7059a6..3b80e1aa 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.7.2-beta.13",
+  "version": "8.7.2-beta.14",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From c1e37d60bc443c7256ea2465c4ce0be4536760fc Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 17 Dec 2021 16:38:56 +0000
Subject: [PATCH 2877/3183] fix nspanel

---
 lib/device/panel.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/device/panel.js b/lib/device/panel.js
index f93061fa..3df7f286 100644
--- a/lib/device/panel.js
+++ b/lib/device/panel.js
@@ -286,7 +286,7 @@ module.exports = class deviceSwitchSingle {
           const newValue = params.switches[0].switch
           if (newValue !== this.cacheState1) {
             this.cacheState1 = newValue
-            this.service1.updateCharacteristic(this.hapChar.On, this.cacheState1)
+            this.service1.updateCharacteristic(this.hapChar.On, this.cacheState1 === 'on')
             if (params.updateSource && this.enableLogging) {
               this.log(
                 '[%s] [%s] %s [%s].',
@@ -302,7 +302,7 @@ module.exports = class deviceSwitchSingle {
           const newValue = params.switches[1].switch
           if (newValue !== this.cacheState2) {
             this.cacheState2 = newValue
-            this.service2.updateCharacteristic(this.hapChar.On, this.cacheState1)
+            this.service2.updateCharacteristic(this.hapChar.On, this.cacheState1 === 'on')
             if (params.updateSource && this.enableLogging) {
               this.log(
                 '[%s] [%s] %s [%s].',

From 7bd19ad293c4f025ca6637a1a775b68860f80b1d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 17 Dec 2021 16:39:18 +0000
Subject: [PATCH 2878/3183] 8.7.2-beta.15

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 48f27ce0..59fe1615 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.7.2-beta.14",
+  "version": "8.7.2-beta.15",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.7.2-beta.14",
+      "version": "8.7.2-beta.15",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 3b80e1aa..e7af00a5 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.7.2-beta.14",
+  "version": "8.7.2-beta.15",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From 4b2281a15924ed1955e2c17f2fccd0ced40c6eb8 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 17 Dec 2021 16:56:07 +0000
Subject: [PATCH 2879/3183] final nspanel fix

---
 lib/device/panel.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/device/panel.js b/lib/device/panel.js
index 3df7f286..daf5917c 100644
--- a/lib/device/panel.js
+++ b/lib/device/panel.js
@@ -302,7 +302,7 @@ module.exports = class deviceSwitchSingle {
           const newValue = params.switches[1].switch
           if (newValue !== this.cacheState2) {
             this.cacheState2 = newValue
-            this.service2.updateCharacteristic(this.hapChar.On, this.cacheState1 === 'on')
+            this.service2.updateCharacteristic(this.hapChar.On, this.cacheState2 === 'on')
             if (params.updateSource && this.enableLogging) {
               this.log(
                 '[%s] [%s] %s [%s].',

From 42f80568553b99254bb904da05e9fb79c168fd13 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 17 Dec 2021 16:56:32 +0000
Subject: [PATCH 2880/3183] 8.7.2-beta.16

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 59fe1615..6ebe7609 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.7.2-beta.15",
+  "version": "8.7.2-beta.16",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.7.2-beta.15",
+      "version": "8.7.2-beta.16",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index e7af00a5..b192d328 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.7.2-beta.15",
+  "version": "8.7.2-beta.16",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From beefa2ad5d083f3d5c732308f487bc4bfe38cb74 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 18 Dec 2021 11:56:24 +0000
Subject: [PATCH 2881/3183] note lan only removes unsupported devices

---
 config.schema.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config.schema.json b/config.schema.json
index 67d96ce1..73064cd4 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -41,7 +41,7 @@
             "enum": ["wan"]
           },
           {
-            "title": "LAN Only",
+            "title": "LAN Only (will remove unsupported devices)",
             "enum": ["lan"]
           }
         ]

From 46b2ac661c71f7a16d3e274f62a1f469e10f595e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 19 Dec 2021 21:52:48 +0000
Subject: [PATCH 2882/3183] add uiid 160

---
 lib/utils/constants.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index fd81ad73..66be726b 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -250,7 +250,7 @@ module.exports = {
   },
 
   devices: {
-    lan: [1, 2, 3, 4, 5, 6, 7, 8, 9, 14, 15, 28, 32, 34, 44, 77, 78, 112, 113, 114, 126, 133],
+    lan: [1, 2, 3, 4, 5, 6, 7, 8, 9, 14, 15, 28, 32, 34, 44, 77, 78, 112, 113, 114, 126, 133, 160],
     switchSingle: [1, 6, 14, 24, 27, 1009, 1256],
     switchSCM: [77, 78, 81, 107, 112, 138],
     switchSinglePower: [5, 32],
@@ -273,6 +273,7 @@ module.exports = {
       139,
       140,
       141,
+      160,
       2256,
       3256,
       4256
@@ -423,6 +424,7 @@ module.exports = {
     139: 2, // "MINIR3?"
     140: 3, // "MINIR3?"
     141: 4, // "MINIR3?"
+    160: 3, // "SwitchMan Smart Wall Switch-M5 - 3 Gang"
     1000: 1, // "zigbee_ON_OFF_SWITCH_1000" (button device)
     1009: 1, // "" (Some sort of single switch device)
     1256: 1, // "ZIGBEE_SINGLE_SWITCH"

From 7db2a2a9a5aaa17bbd8f4d90c2b0f52650b0689c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 19 Dec 2021 21:52:51 +0000
Subject: [PATCH 2883/3183] Update package-lock.json

---
 package-lock.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 6ebe7609..1fca9d24 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -390,9 +390,9 @@
       }
     },
     "node_modules/object-inspect": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.1.tgz",
-      "integrity": "sha512-If7BjFlpkzzBeV1cqgT3OSWT3azyoxDGajR+iGnFBfVV2EWyDyWaZZW2ERDjUaY2QM8i5jI3Sj7mhsM4DDAqWA==",
+      "version": "1.12.0",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz",
+      "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==",
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -819,9 +819,9 @@
       "integrity": "sha512-/j+fd/u71wNgKf3V2bx4tnDm+3GvLnlCuvf2MXbJ3wern+67IAb6zN9Leu1tCWPlPNZ+v1hLSibVukkPK2HqJw=="
     },
     "object-inspect": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.1.tgz",
-      "integrity": "sha512-If7BjFlpkzzBeV1cqgT3OSWT3azyoxDGajR+iGnFBfVV2EWyDyWaZZW2ERDjUaY2QM8i5jI3Sj7mhsM4DDAqWA=="
+      "version": "1.12.0",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz",
+      "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g=="
     },
     "object-keys": {
       "version": "1.1.1",

From 0866b29afec4f208f4445e932808f8aea57bb836 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 19 Dec 2021 21:53:31 +0000
Subject: [PATCH 2884/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c3c39a19..b3a7edd3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@ All notable changes to homebridge-ewelink will be documented in this file.
 
 ### Added
 
+- Support for SwitchMan M5 (3 Gang)
 - Expose a single-channel device as a `Heater` or `Cooler` accessory type, using the current temperature value from another eWeLink, Govee or Meross sensor
 - Initial support for Sonoff NSPanel
 - Expose eWeLink groups as HomeKit switches

From f34777473fd1aa72df95f272c1e228544cda75b0 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 19 Dec 2021 21:53:58 +0000
Subject: [PATCH 2885/3183] 8.7.2-beta.17

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 1fca9d24..29ef5602 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.7.2-beta.16",
+  "version": "8.7.2-beta.17",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.7.2-beta.16",
+      "version": "8.7.2-beta.17",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index b192d328..8f62ce21 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.7.2-beta.16",
+  "version": "8.7.2-beta.17",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From 3ea8b6f5f62ed24c58172aee37aee2b447b4d3c0 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 20 Dec 2021 13:02:11 +0000
Subject: [PATCH 2886/3183] uiid 160 is 1-gang

---
 CHANGELOG.md           | 2 +-
 lib/utils/constants.js | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b3a7edd3..e59b50b9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,7 +6,7 @@ All notable changes to homebridge-ewelink will be documented in this file.
 
 ### Added
 
-- Support for SwitchMan M5 (3 Gang)
+- Support for SwitchMan M5 (1 Gang)
 - Expose a single-channel device as a `Heater` or `Cooler` accessory type, using the current temperature value from another eWeLink, Govee or Meross sensor
 - Initial support for Sonoff NSPanel
 - Expose eWeLink groups as HomeKit switches
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 66be726b..d01dc487 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -252,7 +252,7 @@ module.exports = {
   devices: {
     lan: [1, 2, 3, 4, 5, 6, 7, 8, 9, 14, 15, 28, 32, 34, 44, 77, 78, 112, 113, 114, 126, 133, 160],
     switchSingle: [1, 6, 14, 24, 27, 1009, 1256],
-    switchSCM: [77, 78, 81, 107, 112, 138],
+    switchSCM: [77, 78, 81, 107, 112, 138, 160],
     switchSinglePower: [5, 32],
     switchMulti: [
       2,
@@ -273,7 +273,6 @@ module.exports = {
       139,
       140,
       141,
-      160,
       2256,
       3256,
       4256
@@ -424,7 +423,7 @@ module.exports = {
     139: 2, // "MINIR3?"
     140: 3, // "MINIR3?"
     141: 4, // "MINIR3?"
-    160: 3, // "SwitchMan Smart Wall Switch-M5 - 3 Gang"
+    160: 1, // "SwitchMan Smart Wall Switch-M5 - 1 Gang"
     1000: 1, // "zigbee_ON_OFF_SWITCH_1000" (button device)
     1009: 1, // "" (Some sort of single switch device)
     1256: 1, // "ZIGBEE_SINGLE_SWITCH"

From 2fc2e8a45fc4165cb42c0ac77eda377a0038363f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 20 Dec 2021 13:02:41 +0000
Subject: [PATCH 2887/3183] 8.7.2-beta.18

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 29ef5602..dabb62a4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.7.2-beta.17",
+  "version": "8.7.2-beta.18",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.7.2-beta.17",
+      "version": "8.7.2-beta.18",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 8f62ce21..2b8373ef 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.7.2-beta.17",
+  "version": "8.7.2-beta.18",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From 6117d2893cc216bfe39f63a08389cc043cc5d4b4 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 20 Dec 2021 19:12:20 +0000
Subject: [PATCH 2888/3183] M5 1/2/3 gang

---
 CHANGELOG.md           |  2 +-
 config.schema.json     |  4 ++--
 lib/utils/constants.js | 32 +++++++++++++++++++++++++++++++-
 3 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e59b50b9..efc3168d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,7 +6,7 @@ All notable changes to homebridge-ewelink will be documented in this file.
 
 ### Added
 
-- Support for SwitchMan M5 (1 Gang)
+- Support for SwitchMan M5 (1/2/3 Gang)
 - Expose a single-channel device as a `Heater` or `Cooler` accessory type, using the current temperature value from another eWeLink, Govee or Meross sensor
 - Initial support for Sonoff NSPanel
 - Expose eWeLink groups as HomeKit switches
diff --git a/config.schema.json b/config.schema.json
index 73064cd4..237fc527 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -164,7 +164,7 @@
                   "enum": ["single"]
                 },
                 {
-                  "title": "Sonoff T1/T2/T3/TX-1C",
+                  "title": "Sonoff T1/T2/T3/TX-1C/M5-1-Gang",
                   "enum": ["t"]
                 },
                 {
@@ -518,7 +518,7 @@
                   "enum": ["4ch"]
                 },
                 {
-                  "title": "Sonoff T1/T2/T3/TX-2C/3C/4C",
+                  "title": "Sonoff T1/T2/T3/TX-2C/3C/4C/M5-2/3-Gang",
                   "enum": ["t"]
                 },
                 {
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index d01dc487..6d68becc 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -250,7 +250,33 @@ module.exports = {
   },
 
   devices: {
-    lan: [1, 2, 3, 4, 5, 6, 7, 8, 9, 14, 15, 28, 32, 34, 44, 77, 78, 112, 113, 114, 126, 133, 160],
+    lan: [
+      1,
+      2,
+      3,
+      4,
+      5,
+      6,
+      7,
+      8,
+      9,
+      14,
+      15,
+      28,
+      32,
+      34,
+      44,
+      77,
+      78,
+      112,
+      113,
+      114,
+      126,
+      133,
+      160,
+      161,
+      162
+    ],
     switchSingle: [1, 6, 14, 24, 27, 1009, 1256],
     switchSCM: [77, 78, 81, 107, 112, 138, 160],
     switchSinglePower: [5, 32],
@@ -273,6 +299,8 @@ module.exports = {
       139,
       140,
       141,
+      161,
+      162,
       2256,
       3256,
       4256
@@ -424,6 +452,8 @@ module.exports = {
     140: 3, // "MINIR3?"
     141: 4, // "MINIR3?"
     160: 1, // "SwitchMan Smart Wall Switch-M5 - 1 Gang"
+    161: 2, // "SwitchMan Smart Wall Switch-M5 - 2 Gang"
+    162: 3, // "SwitchMan Smart Wall Switch-M5 - 3 Gang"
     1000: 1, // "zigbee_ON_OFF_SWITCH_1000" (button device)
     1009: 1, // "" (Some sort of single switch device)
     1256: 1, // "ZIGBEE_SINGLE_SWITCH"

From 62b659635129795bfe7d629fcf62187ddf287277 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 20 Dec 2021 19:14:50 +0000
Subject: [PATCH 2889/3183] 8.7.2-beta.19

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index dabb62a4..5b09b5e7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.7.2-beta.18",
+  "version": "8.7.2-beta.19",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.7.2-beta.18",
+      "version": "8.7.2-beta.19",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 2b8373ef..ff324bff 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.7.2-beta.18",
+  "version": "8.7.2-beta.19",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From 3bc5f1b1a8c90735d8e03e1deefb8aa877302f6a Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 20 Dec 2021 20:23:53 +0000
Subject: [PATCH 2890/3183] bump ws

---
 CHANGELOG.md      |  1 +
 package-lock.json | 14 +++++++-------
 package.json      |  2 +-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index efc3168d..e16198bd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@ All notable changes to homebridge-ewelink will be documented in this file.
 ### Changed
 
 - Some config options rearranged for easier access
+- Bump `ws` to v8.4.0
 
 ## 8.7.1 (2021-12-09)
 
diff --git a/package-lock.json b/package-lock.json
index 5b09b5e7..0b3f6d60 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -32,7 +32,7 @@
         "node-persist": "^3.1.0",
         "p-queue": "^6.6.2",
         "websocket-as-promised": "^2.0.1",
-        "ws": "^8.3.0"
+        "ws": "^8.4.0"
       },
       "engines": {
         "homebridge": "^1.3.8",
@@ -569,9 +569,9 @@
       }
     },
     "node_modules/ws": {
-      "version": "8.3.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.3.0.tgz",
-      "integrity": "sha512-Gs5EZtpqZzLvmIM59w4igITU57lrtYVFneaa434VROv4thzJyV6UjIL3D42lslWlI+D4KzLYnxSwtfuiO79sNw==",
+      "version": "8.4.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.4.0.tgz",
+      "integrity": "sha512-IHVsKe2pjajSUIl4KYMQOdlyliovpEPquKkqbwswulszzI7r0SfQrxnXdWAEqOlDCLrVSJzo+O1hAwdog2sKSQ==",
       "engines": {
         "node": ">=10.0.0"
       },
@@ -944,9 +944,9 @@
       }
     },
     "ws": {
-      "version": "8.3.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.3.0.tgz",
-      "integrity": "sha512-Gs5EZtpqZzLvmIM59w4igITU57lrtYVFneaa434VROv4thzJyV6UjIL3D42lslWlI+D4KzLYnxSwtfuiO79sNw==",
+      "version": "8.4.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.4.0.tgz",
+      "integrity": "sha512-IHVsKe2pjajSUIl4KYMQOdlyliovpEPquKkqbwswulszzI7r0SfQrxnXdWAEqOlDCLrVSJzo+O1hAwdog2sKSQ==",
       "requires": {}
     }
   }
diff --git a/package.json b/package.json
index ff324bff..527389a9 100644
--- a/package.json
+++ b/package.json
@@ -59,7 +59,7 @@
     "node-persist": "^3.1.0",
     "p-queue": "^6.6.2",
     "websocket-as-promised": "^2.0.1",
-    "ws": "^8.3.0"
+    "ws": "^8.4.0"
   },
   "prettier": {
     "printWidth": 100

From 263be67abeb08f1ebbf0b65440fefed0c42cae29 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 20 Dec 2021 20:24:35 +0000
Subject: [PATCH 2891/3183] 8.7.2-beta.20

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 0b3f6d60..8a425cff 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.7.2-beta.19",
+  "version": "8.7.2-beta.20",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.7.2-beta.19",
+      "version": "8.7.2-beta.20",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 527389a9..49a2f54e 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.7.2-beta.19",
+  "version": "8.7.2-beta.20",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From 8ea0c0116983ce321eb474dfc3b834acde2d7821 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 21 Dec 2021 08:41:22 +0000
Subject: [PATCH 2892/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e16198bd..70b312ab 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,7 +7,7 @@ All notable changes to homebridge-ewelink will be documented in this file.
 ### Added
 
 - Support for SwitchMan M5 (1/2/3 Gang)
-- Expose a single-channel device as a `Heater` or `Cooler` accessory type, using the current temperature value from another eWeLink, Govee or Meross sensor
+- Expose a single-channel device as a `Heater` or `Cooler` accessory type, using the current temperature value from another eWeLink, Govee or Meross sensor (Govee and Meross sensors will not work with HOOBS)
 - Initial support for Sonoff NSPanel
 - Expose eWeLink groups as HomeKit switches
 - Current temperature values from sensors will be cached in the homebridge storage directory to allow my other plugins to create `Heater` and `Cooler` accessories with the temperature values

From a0fadaa9fe5fc5c20a9646126b1ca2114fe4e513 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 21 Dec 2021 09:24:01 +0000
Subject: [PATCH 2893/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 70b312ab..52e96bda 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,15 +2,18 @@
 
 All notable changes to homebridge-ewelink will be documented in this file.
 
-## BETA
+## 8.8.0 (2021-12-21)
 
 ### Added
 
-- Support for SwitchMan M5 (1/2/3 Gang)
-- Expose a single-channel device as a `Heater` or `Cooler` accessory type, using the current temperature value from another eWeLink, Govee or Meross sensor (Govee and Meross sensors will not work with HOOBS)
-- Initial support for Sonoff NSPanel
-- Expose eWeLink groups as HomeKit switches
-- Current temperature values from sensors will be cached in the homebridge storage directory to allow my other plugins to create `Heater` and `Cooler` accessories with the temperature values
+- **New Devices**
+  - Support for SwitchMan M5 (1/2/3 Gang)
+  - Support for Sonoff NSPanel
+- **Simulations**
+  - Expose a single-channel device as a `Heater` or `Cooler` accessory type, using the current temperature value from another eWeLink, Govee or Meross sensor (Govee and Meross sensors will not work with HOOBS)
+  - Current temperature values from sensors will be cached in the homebridge storage directory to allow my other plugins to create `Heater` and `Cooler` accessories with the temperature values
+- **eWeLink Groups**
+  - Expose eWeLink groups as HomeKit switches
 
 ### Changed
 

From 70da68db77260e5cc0764260dfba2353fbe1a54b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 21 Dec 2021 09:24:26 +0000
Subject: [PATCH 2894/3183] 8.8.0

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 8a425cff..075deb0b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.7.2-beta.20",
+  "version": "8.8.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.7.2-beta.20",
+      "version": "8.8.0",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 49a2f54e..29a48f3d 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.7.2-beta.20",
+  "version": "8.8.0",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From 002853225f39400421e5698ce50bd29b898061b4 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 26 Dec 2021 17:06:03 +0000
Subject: [PATCH 2895/3183] th thermo sim show heat and cool modes

---
 config.schema.json                     |   9 +
 lib/device/simulation/th-thermostat.js | 297 ++++++++++++++++++++-----
 lib/index.js                           |   3 +-
 lib/utils/constants.js                 |   1 +
 4 files changed, 249 insertions(+), 61 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 237fc527..0904712c 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -1026,6 +1026,14 @@
                 "functionBody": "return (model.thDevices && model.thDevices[arrayIndices] && ['th'].includes(model.thDevices[arrayIndices].deviceModel) && !model.thDevices[arrayIndices].ignoreDevice);"
               }
             },
+            "showHeatCool": {
+              "type": "boolean",
+              "title": "Show Heat/Cool Modes",
+              "description": "If true, the 'Heat' and 'Cool' modes will be shown in HomeKit.",
+              "condition": {
+                "functionBody": "return (model.thDevices && model.thDevices[arrayIndices] && ['th'].includes(model.thDevices[arrayIndices].deviceModel) && model.thDevices[arrayIndices].showAs === 'thermostat' && !model.thDevices[arrayIndices].ignoreDevice);"
+              }
+            },
             "hideSwitch": {
               "type": "boolean",
               "title": "Hide Switch",
@@ -1769,6 +1777,7 @@
             "thDevices[].ignoreDevice",
             "thDevices[].deviceModel",
             "thDevices[].showAs",
+            "thDevices[].showHeatCool",
             "thDevices[].hideSwitch",
             "thDevices[].offset",
             "thDevices[].offsetFactor",
diff --git a/lib/device/simulation/th-thermostat.js b/lib/device/simulation/th-thermostat.js
index 9034f79b..e773d50b 100644
--- a/lib/device/simulation/th-thermostat.js
+++ b/lib/device/simulation/th-thermostat.js
@@ -38,6 +38,7 @@ module.exports = class deviceTHThermostat {
       deviceConf && deviceConf.maxTarget
         ? Math.max(deviceConf.maxTarget, this.minTarget + 1)
         : platform.consts.defaultValues.maxTarget
+    this.showHeatCool = deviceConf && deviceConf.showHeatCool
 
     // Set the correct logging variables for this accessory
     this.enableLogging = !platform.config.disableDeviceLogging
@@ -89,6 +90,27 @@ module.exports = class deviceTHThermostat {
       this.accessory.removeService(this.accessory.getService(this.hapServ.HumiditySensor))
     }
 
+    // Add a context property to save the desired state of the showHeatCool option
+    if (!this.funcs.hasProperty(accessory.context, 'showHeatCool')) {
+      accessory.context.showHeatCool = false
+    }
+
+    // Reset the thermostat service if showHeatCool has been switched on from off
+    if (this.showHeatCool && !accessory.context.showHeatCool) {
+      accessory.context.showHeatCool = true
+      if (this.accessory.getService(this.hapServ.Thermostat)) {
+        this.accessory.removeService(this.accessory.getService(this.hapServ.Thermostat))
+      }
+    }
+
+    // Reset the thermostat service if showHeatCool has been switched off from on
+    if (!this.showHeatCool && accessory.context.showHeatCool) {
+      accessory.context.showHeatCool = false
+      if (this.accessory.getService(this.hapServ.Thermostat)) {
+        this.accessory.removeService(this.accessory.getService(this.hapServ.Thermostat))
+      }
+    }
+
     // Add the thermostat service if it doesn't already exist
     this.service =
       this.accessory.getService(this.hapServ.Thermostat) ||
@@ -119,7 +141,7 @@ module.exports = class deviceTHThermostat {
     this.service
       .getCharacteristic(this.hapChar.TargetHeatingCoolingState)
       .setProps({
-        validValues: [0, 3]
+        validValues: this.showHeatCool ? [0, 1, 2] : [0, 3]
       })
       .onSet(async value => await this.internalStateUpdate(value))
 
@@ -163,16 +185,22 @@ module.exports = class deviceTHThermostat {
     }
 
     // Initialise these caches now since they aren't determined by the initial externalUpdate()
-    this.cacheState =
-      this.service.getCharacteristic(this.hapChar.TargetHeatingCoolingState).value === 3
-        ? 'on'
-        : 'off'
+    const curState = this.service.getCharacteristic(this.hapChar.TargetHeatingCoolingState).value
+    this.cacheState = curState > 0 ? 'on' : 'off'
     this.cacheHeat =
-      this.cacheState === 'on' &&
-      this.service.getCharacteristic(this.hapChar.TargetTemperature).value >
-        this.service.getCharacteristic(this.hapChar.CurrentTemperature).value
-        ? 'on'
-        : 'off'
+      this.cacheState === 'on' && [1, 3].includes(curState)
+        ? this.service.getCharacteristic(this.hapChar.TargetTemperature).value >
+          this.service.getCharacteristic(this.hapChar.CurrentTemperature).value
+          ? 'on'
+          : 'off'
+        : undefined
+    this.cacheHeat =
+      this.cacheState === 'on' && curState === 2
+        ? this.service.getCharacteristic(this.hapChar.TargetTemperature).value <
+          this.service.getCharacteristic(this.hapChar.CurrentTemperature).value
+          ? 'on'
+          : 'off'
+        : undefined
 
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new platform.eveService('custom', this.accessory, {
@@ -209,55 +237,122 @@ module.exports = class deviceTHThermostat {
   async internalStateUpdate (value) {
     try {
       const params = { deviceType: 'normal' }
+
+      // this.showHeatCool true, values can be 0, 1, 2 otherwise 0, 3
       let newState
       let newHeat
-      if (value === 0) {
-        params.mainSwitch = 'off'
-        params.switch = 'off'
-        newState = 'off'
-        newHeat = 'off'
-      } else {
-        if (this.cacheTemp < this.accessory.context.cacheTarget) {
-          params.mainSwitch = 'on'
-          params.switch = 'on'
-          newState = 'on'
-          newHeat = 'on'
-        } else {
+      let newCool
+      switch (value) {
+        case 0:
+          // Turning off
           params.mainSwitch = 'off'
           params.switch = 'off'
-          newState = 'on'
+          newState = 'off'
           newHeat = 'off'
-        }
+          newCool = 'off'
+          break
+        case 1:
+          // Turning to heat
+          if (!this.showHeatCool) {
+            return
+          }
+          if (this.cacheTemp < this.accessory.context.cacheTarget) {
+            params.mainSwitch = 'on'
+            params.switch = 'on'
+            newState = 'on'
+            newHeat = 'on'
+            newCool = 'off'
+          } else {
+            params.mainSwitch = 'off'
+            params.switch = 'off'
+            newState = 'on'
+            newHeat = 'off'
+            newCool = 'off'
+          }
+          break
+        case 2:
+          // Turning to cool
+          if (!this.showHeatCool) {
+            return
+          }
+          if (this.cacheTemp > this.accessory.context.cacheTarget) {
+            params.mainSwitch = 'on'
+            params.switch = 'on'
+            newState = 'on'
+            newHeat = 'off'
+            newCool = 'on'
+          } else {
+            params.mainSwitch = 'off'
+            params.switch = 'off'
+            newState = 'on'
+            newHeat = 'off'
+            newCool = 'off'
+          }
+          break
+        case 3:
+          // Turning to auto
+          if (this.showHeatCool) {
+            return
+          }
+          if (this.cacheTemp < this.accessory.context.cacheTarget) {
+            params.mainSwitch = 'on'
+            params.switch = 'on'
+            newState = 'on'
+            newHeat = 'on'
+            newCool = 'off'
+          } else {
+            params.mainSwitch = 'off'
+            params.switch = 'off'
+            newState = 'on'
+            newHeat = 'off'
+            newCool = 'off'
+          }
+          break
       }
 
       // Only send the update if either:
-      // * The new value (state) is OFF and the cacheHeat was ON
-      // * The new value (state) is ON and newHeat is 'on'
-      if ((value === 0 && this.cacheHeat === 'on') || (value === 3 && newHeat === 'on')) {
+      // * The new value (state) is OFF and (the cacheHeat was ON or cacheCool was ON)
+      // * The new value (state) is ON and (newHeat is 'on' or newCool is 'on')
+      // * (cacheHeat was ON and newCool is ON) or (cacheCool was ON and newHeat is ON)
+      if (
+        (value === 0 && (this.cacheHeat === 'on' || this.cacheCool === 'on')) ||
+        ([1, 3].includes(value) && newHeat !== this.cacheHeat) ||
+        (value === 2 && newCool !== this.cacheCool)
+      ) {
         await this.platform.sendDeviceUpdate(this.accessory, params)
       }
       if (newState !== this.cacheState) {
         this.cacheState = newState
+        this.cacheHeat = undefined
+        this.cacheCool = undefined
         if (this.enableLogging) {
           this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
         }
       }
-      if (newHeat !== this.cacheHeat) {
+      if ([1, 3].includes(value) && newHeat !== this.cacheHeat) {
         this.cacheHeat = newHeat
+        this.cacheCool = undefined
         if (this.enableLogging) {
           this.log('[%s] %s [%s].', this.name, this.lang.curHeat, this.cacheHeat)
         }
       }
+      if (value === 2 && newCool !== this.cacheCool) {
+        this.cacheCool = newCool
+        this.cacheHeat = undefined
+        if (this.enableLogging) {
+          this.log('[%s] %s [%s].', this.name, this.lang.curCool, this.cacheCool)
+        }
+      }
       this.service.updateCharacteristic(
         this.hapChar.CurrentHeatingCoolingState,
-        this.cacheHeat === 'on' ? 1 : 0
+        this.cacheCool === 'on' ? 2 : this.cacheHeat === 'on' ? 1 : 0
       )
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
       setTimeout(() => {
         this.service.updateCharacteristic(
           this.hapChar.TargetHeatingCoolingState,
-          this.cacheState === 'on' ? 3 : 0
+          this.cacheCool === 'on' ? 2 : this.cacheHeat === 'on' ? 1 : 0
         )
       }, 2000)
       throw new this.hapErr(-70402)
@@ -278,26 +373,67 @@ module.exports = class deviceTHThermostat {
       }
       const params = { deviceType: 'normal' }
       let newHeat
-      if (this.cacheTemp < value) {
-        params.mainSwitch = 'on'
-        params.switch = 'on'
-        newHeat = 'on'
-      } else {
-        params.mainSwitch = 'off'
-        params.switch = 'off'
-        newHeat = 'off'
+      let newCool
+
+      const curMode = this.service.getCharacteristic(this.hapChar.TargetHeatingCoolingState).value
+      switch (curMode) {
+        case 1:
+        case 3:
+          // Currently in heating or auto mode
+          if (this.cacheTemp < this.accessory.context.cacheTarget) {
+            params.mainSwitch = 'on'
+            params.switch = 'on'
+            newHeat = 'on'
+            newCool = 'off'
+          } else {
+            params.mainSwitch = 'off'
+            params.switch = 'off'
+            newHeat = 'off'
+            newCool = 'off'
+          }
+          break
+        case 2:
+          // Currently in cooling mode
+          if (this.cacheTemp > this.accessory.context.cacheTarget) {
+            params.mainSwitch = 'on'
+            params.switch = 'on'
+            newHeat = 'off'
+            newCool = 'on'
+          } else {
+            params.mainSwitch = 'off'
+            params.switch = 'off'
+            newHeat = 'off'
+            newCool = 'off'
+          }
+          break
       }
-      if (newHeat === this.cacheHeat) {
-        return
+
+      // Only send the update if either:
+      // * The new value (state) is ON and (newHeat is 'on' or newCool is 'on')
+      // * (cacheHeat was ON and newCool is ON) or (cacheCool was ON and newHeat is ON)
+      if (
+        ([1, 3].includes(curMode) && newHeat !== this.cacheHeat) ||
+        (curMode === 2 && newCool !== this.cacheCool)
+      ) {
+        await this.platform.sendDeviceUpdate(this.accessory, params)
       }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.cacheHeat = newHeat
-      if (this.enableLogging) {
-        this.log('[%s] %s [%s].', this.name, this.lang.curHeat, this.cacheHeat)
+      if ([1, 3].includes(curMode) && newHeat !== this.cacheHeat) {
+        this.cacheHeat = newHeat
+        this.cacheCool = undefined
+        if (this.enableLogging) {
+          this.log('[%s] %s [%s].', this.name, this.lang.curHeat, this.cacheHeat)
+        }
+      }
+      if (curMode === 2 && newCool !== this.cacheCool) {
+        this.cacheCool = newCool
+        this.cacheHeat = undefined
+        if (this.enableLogging) {
+          this.log('[%s] %s [%s].', this.name, this.lang.curCool, this.cacheCool)
+        }
       }
       this.service.updateCharacteristic(
         this.hapChar.CurrentHeatingCoolingState,
-        this.cacheHeat === 'on' ? 1 : 0
+        this.cacheCool === 'on' ? 2 : this.cacheHeat === 'on' ? 1 : 0
       )
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true)
@@ -318,26 +454,67 @@ module.exports = class deviceTHThermostat {
       }
       const params = { deviceType: 'normal' }
       let newHeat
-      if (this.cacheTemp < this.accessory.context.cacheTarget) {
-        params.mainSwitch = 'on'
-        params.switch = 'on'
-        newHeat = 'on'
-      } else {
-        params.mainSwitch = 'off'
-        params.switch = 'off'
-        newHeat = 'off'
+      let newCool
+
+      const curMode = this.service.getCharacteristic(this.hapChar.TargetHeatingCoolingState).value
+      switch (curMode) {
+        case 1:
+        case 3:
+          // Currently in heating or auto mode
+          if (this.cacheTemp < this.accessory.context.cacheTarget) {
+            params.mainSwitch = 'on'
+            params.switch = 'on'
+            newHeat = 'on'
+            newCool = 'off'
+          } else {
+            params.mainSwitch = 'off'
+            params.switch = 'off'
+            newHeat = 'off'
+            newCool = 'off'
+          }
+          break
+        case 2:
+          // Currently in cooling mode
+          if (this.cacheTemp > this.accessory.context.cacheTarget) {
+            params.mainSwitch = 'on'
+            params.switch = 'on'
+            newHeat = 'off'
+            newCool = 'on'
+          } else {
+            params.mainSwitch = 'off'
+            params.switch = 'off'
+            newHeat = 'off'
+            newCool = 'off'
+          }
+          break
       }
-      if (newHeat === this.cacheHeat) {
-        return
+
+      // Only send the update if either:
+      // * The new value (state) is ON and (newHeat is 'on' or newCool is 'on')
+      // * (cacheHeat was ON and newCool is ON) or (cacheCool was ON and newHeat is ON)
+      if (
+        ([1, 3].includes(curMode) && newHeat !== this.cacheHeat) ||
+        (curMode === 2 && newCool !== this.cacheCool)
+      ) {
+        await this.platform.sendDeviceUpdate(this.accessory, params)
       }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.cacheHeat = newHeat
-      if (this.enableLogging) {
-        this.log('[%s] %s [%s].', this.name, this.lang.curHeat, this.cacheHeat)
+      if ([1, 3].includes(curMode) && newHeat !== this.cacheHeat) {
+        this.cacheHeat = newHeat
+        this.cacheCool = undefined
+        if (this.enableLogging) {
+          this.log('[%s] %s [%s].', this.name, this.lang.curHeat, this.cacheHeat)
+        }
+      }
+      if (curMode === 2 && newCool !== this.cacheCool) {
+        this.cacheCool = newCool
+        this.cacheHeat = undefined
+        if (this.enableLogging) {
+          this.log('[%s] %s [%s].', this.name, this.lang.curCool, this.cacheCool)
+        }
       }
       this.service.updateCharacteristic(
         this.hapChar.CurrentHeatingCoolingState,
-        this.cacheHeat === 'on' ? 1 : 0
+        this.cacheCool === 'on' ? 2 : this.cacheHeat === 'on' ? 1 : 0
       )
     } catch (err) {
       // Suppress errors here
diff --git a/lib/index.js b/lib/index.js
index 17cae839..4c11b04b 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -307,6 +307,7 @@ class eWeLinkPlatform {
                   case 'offsetFactor':
                   case 'resetOnStartup':
                   case 'scaleBattery':
+                  case 'showHeatCool':
                     if (typeof v === 'string') {
                       logQuotes(key + '.' + id + '.' + k)
                     }
@@ -1773,7 +1774,7 @@ class eWeLinkPlatform {
             return await wsClient.sendUpdate(payload)
           } else {
             // Device appears to be offline
-            throw new Error(this.lang.unreachable)
+            // throw new Error(this.lang.unreachable)
           }
         } else {
           // Device isn't online via WS so report the error back
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 6d68becc..6111b450 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -136,6 +136,7 @@ module.exports = {
       'ignoreDevice',
       'deviceModel',
       'showAs',
+      'showHeatCool',
       'hideSwitch',
       'offset',
       'offsetFactor',

From 5a06cd64af521e61da2f976b9eeae2932c411779 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 26 Dec 2021 17:06:43 +0000
Subject: [PATCH 2896/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 52e96bda..430abf0e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 All notable changes to homebridge-ewelink will be documented in this file.
 
+## BETA
+
+### Added
+
+- Option to show both 'Heat' and 'Cool' modes for the TH10/16 thermostat simulation
+
 ## 8.8.0 (2021-12-21)
 
 ### Added

From 24e51f9b16e7d6239a50b3a259489de625dabbd1 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 26 Dec 2021 17:07:15 +0000
Subject: [PATCH 2897/3183] 8.8.1-beta.0

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 075deb0b..6a975010 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.8.0",
+  "version": "8.8.1-beta.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.8.0",
+      "version": "8.8.1-beta.0",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 29a48f3d..6e3037a4 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.8.0",
+  "version": "8.8.1-beta.0",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From 84ba56d880f4de870cd70747970127e80654f5db Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 26 Dec 2021 17:08:01 +0000
Subject: [PATCH 2898/3183] Update index.js

---
 lib/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/index.js b/lib/index.js
index 4c11b04b..a503e46c 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1774,7 +1774,7 @@ class eWeLinkPlatform {
             return await wsClient.sendUpdate(payload)
           } else {
             // Device appears to be offline
-            // throw new Error(this.lang.unreachable)
+            throw new Error(this.lang.unreachable)
           }
         } else {
           // Device isn't online via WS so report the error back

From 0b9f27b3f493c9dfe25e5fc75d2fc5e3f9c3d596 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 26 Dec 2021 17:08:23 +0000
Subject: [PATCH 2899/3183] 8.8.1-beta.1

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 6a975010..de432247 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.8.1-beta.0",
+  "version": "8.8.1-beta.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.8.1-beta.0",
+      "version": "8.8.1-beta.1",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 6e3037a4..c885d9ad 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.8.1-beta.0",
+  "version": "8.8.1-beta.1",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From 0d005ed95f1e4fbb25ef98250c007e872962f5d9 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 27 Dec 2021 13:06:33 +0000
Subject: [PATCH 2900/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 430abf0e..a96e7887 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 All notable changes to homebridge-ewelink will be documented in this file.
 
-## BETA
+## 8.9.0 (2021-12-27)
 
 ### Added
 

From d1419a3fa48d702913188b06deeeb855b70105c5 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 27 Dec 2021 13:06:57 +0000
Subject: [PATCH 2901/3183] 8.9.0

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index de432247..29a2e109 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.8.1-beta.1",
+  "version": "8.9.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.8.1-beta.1",
+      "version": "8.9.0",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index c885d9ad..1ec18d83 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.8.1-beta.1",
+  "version": "8.9.0",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From 148240ceb2ed528568cdfcf48f13e76b3cab249b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 29 Dec 2021 14:14:48 +0000
Subject: [PATCH 2902/3183] bump hb version

---
 CHANGELOG.md      | 6 ++++++
 package-lock.json | 2 +-
 package.json      | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a96e7887..140ea190 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 All notable changes to homebridge-ewelink will be documented in this file.
 
+## BETA
+
+### Changed
+
+- Bump `homebridge` recommended version to v1.3.9
+
 ## 8.9.0 (2021-12-27)
 
 ### Added
diff --git a/package-lock.json b/package-lock.json
index 29a2e109..8f2f14a5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -35,7 +35,7 @@
         "ws": "^8.4.0"
       },
       "engines": {
-        "homebridge": "^1.3.8",
+        "homebridge": "^1.3.9",
         "node": "^14.18.2 || ^16.13.1"
       }
     },
diff --git a/package.json b/package.json
index 1ec18d83..3e8bb64c 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,7 @@
   ],
   "main": "lib/index.js",
   "engines": {
-    "homebridge": "^1.3.8",
+    "homebridge": "^1.3.9",
     "node": "^14.18.2 || ^16.13.1"
   },
   "repository": {

From b6f6865ceadef64857134c4046308a2775045248 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 29 Dec 2021 16:13:01 +0000
Subject: [PATCH 2903/3183] show hapnodejs version on init

---
 CHANGELOG.md | 1 +
 lib/index.js | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 140ea190..6cf7b7df 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@ All notable changes to homebridge-ewelink will be documented in this file.
 
 ### Changed
 
+- Plugin will log HAPNodeJS version on startup
 - Bump `homebridge` recommended version to v1.3.9
 
 ## 8.9.0 (2021-12-27)
diff --git a/lib/index.js b/lib/index.js
index a503e46c..8bdc265c 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -64,11 +64,12 @@ class eWeLinkPlatform {
 
       // Log some environment info for debugging
       this.log(
-        '%s v%s | Node %s | HB v%s%s...',
+        '%s v%s | Node %s | HB v%s | HAPNodeJS v%s%s...',
         this.lang.initialising,
         plugin.version,
         process.version,
         api.serverVersion,
+        api.hap.HAPLibraryVersion(),
         config.plugin_map
           ? ' | HOOBS v3'
           : require('os')

From 1e5e1b452116b6d664cd6563d66071b1db355db8 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 5 Jan 2022 04:39:50 +0000
Subject: [PATCH 2904/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6cf7b7df..aef93914 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 All notable changes to homebridge-ewelink will be documented in this file.
 
-## BETA
+## 8.9.1 (2022-01-05)
 
 ### Changed
 

From c5d324e337175e2b981f42d4afe14fbd1935c50e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 5 Jan 2022 04:40:14 +0000
Subject: [PATCH 2905/3183] 8.9.1

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 8f2f14a5..3c7e4261 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.9.0",
+  "version": "8.9.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.9.0",
+      "version": "8.9.1",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 3e8bb64c..d58893e1 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.9.0",
+  "version": "8.9.1",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From 3b02f2ff2f9f579a18bf4ed7a63daf36c8eaace2 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 6 Jan 2022 18:31:59 +0000
Subject: [PATCH 2906/3183] plugin crash for older vsions of hap

---
 CHANGELOG.md | 6 ++++++
 lib/index.js | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index aef93914..72f2fd98 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 All notable changes to homebridge-ewelink will be documented in this file.
 
+## BETA
+
+### Fixed
+
+- Plugin crash for older versions of Homebridge
+
 ## 8.9.1 (2022-01-05)
 
 ### Changed
diff --git a/lib/index.js b/lib/index.js
index 8bdc265c..42085ca3 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -69,7 +69,7 @@ class eWeLinkPlatform {
         plugin.version,
         process.version,
         api.serverVersion,
-        api.hap.HAPLibraryVersion(),
+        api.hap.HAPLibraryVersion ? api.hap.HAPLibraryVersion() : '?',
         config.plugin_map
           ? ' | HOOBS v3'
           : require('os')

From 9f4bff04f89162ebd0bbc93a0abf01bb4694feac Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 6 Jan 2022 18:32:40 +0000
Subject: [PATCH 2907/3183] 8.9.2-beta.0

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 3c7e4261..54ed34ad 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.9.1",
+  "version": "8.9.2-beta.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.9.1",
+      "version": "8.9.2-beta.0",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index d58893e1..7e0ebecd 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.9.1",
+  "version": "8.9.2-beta.0",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From 5c8e9b53df59f8b2a541496b4fdc9165ab95061a Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 6 Jan 2022 19:05:59 +0000
Subject: [PATCH 2908/3183] support for uiid 33

---
 CHANGELOG.md                | 4 ++++
 lib/device/light-rgb-cct.js | 4 ++++
 lib/utils/constants.js      | 4 ++--
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 72f2fd98..aa4d34ff 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to homebridge-ewelink will be documented in this file.
 
 ## BETA
 
+### Added
+
+- Support for Mangotek RLD60C0E27 light (and all devices with UIID 33)
+
 ### Fixed
 
 - Plugin crash for older versions of Homebridge
diff --git a/lib/device/light-rgb-cct.js b/lib/device/light-rgb-cct.js
index a8d13029..f52d7b08 100644
--- a/lib/device/light-rgb-cct.js
+++ b/lib/device/light-rgb-cct.js
@@ -235,6 +235,7 @@ module.exports = class deviceLightRGBCCT {
         }
       }, 5000)
       switch (this.accessory.context.eweUIID) {
+        case 33:
         case 59:
           // L1
           params = {
@@ -304,6 +305,7 @@ module.exports = class deviceLightRGBCCT {
       const sat = this.service.getCharacteristic(this.hapChar.Saturation).value
       const rgb = this.colourUtils.hs2rgb(value, sat)
       switch (this.accessory.context.eweUIID) {
+        case 33:
         case 59:
         case 137:
           // L1/L2
@@ -389,6 +391,7 @@ module.exports = class deviceLightRGBCCT {
       let params
       let newRGB
       switch (this.accessory.context.eweUIID) {
+        case 33:
         case 59: {
           // L1
           scaledCT = Math.round(((mToK - 2700) / 3800) * 100)
@@ -509,6 +512,7 @@ module.exports = class deviceLightRGBCCT {
       }
       let hs
       switch (this.accessory.context.eweUIID) {
+        case 33:
         case 59:
         case 137:
           // L1/L2
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 6111b450..798c1216 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -310,7 +310,7 @@ module.exports = {
     lightDimmer: [36, 44, 57],
     lightRGB: [22],
     lightCCT: [103],
-    lightRGBCCT: [59, 104, 137],
+    lightRGBCCT: [33, 59, 104, 137],
     curtain: [11, 67],
     sensorContact: [102],
     sensorAmbient: [15],
@@ -421,6 +421,7 @@ module.exports = {
     30: 3, // "GSM_SOCKET_3"
     31: 4, // "GSM_SOCKET_4"
     32: 1, // "POWER_DETECTION_SOCKET" (Pow_R2, S31, IW101)
+    33: 1, // "LIGHT_BELT",
     34: 4, // "FAN_LIGHT" (iFan02, iFan)
     36: 1, // "SINGLE_CHANNEL_DIMMER_SWITCH" (KING-M4)
     41: 4, // "CUN_YOU_DOOR"
@@ -487,7 +488,6 @@ module.exports = {
     17: 0, // "THREE_GEAR_FAN"
     23: 0, // "NEST_THERMOSTAT"
     26: 0, // "RuiMiTeWenKongQi"
-    33: 0, // "LIGHT_BELT",
     35: 0, // "EZVIZ_CAMERA",
     38: 0, // "HOME_KIT_BRIDGE",
     40: 0, // "FUJIN_OPS"

From d36f322f55a13cd0a40a7a0fb95794c5c9c04d23 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 6 Jan 2022 19:06:23 +0000
Subject: [PATCH 2909/3183] 8.9.2-beta.1

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 54ed34ad..34543903 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.9.2-beta.0",
+  "version": "8.9.2-beta.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.9.2-beta.0",
+      "version": "8.9.2-beta.1",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 7e0ebecd..95b5eec4 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.9.2-beta.0",
+  "version": "8.9.2-beta.1",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From b6db3debf57bae4d55e9404254e683bffc8b2693 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 6 Jan 2022 21:20:52 +0000
Subject: [PATCH 2910/3183] support zigbee smoke sensor

---
 CHANGELOG.md                       |   5 +-
 lib/device/outlet-single-inched.js |   2 +-
 lib/device/outlet-single.js        |   2 +-
 lib/device/switch-single-inched.js |   2 +-
 lib/device/switch-single.js        |   2 +-
 lib/device/zigbee/sensor-smoke.js  | 101 +++++++++++++++++++++++++++++
 lib/index.js                       |   7 ++
 lib/utils/constants.js             |  15 +++--
 lib/utils/lang-en.js               |   2 +
 lib/utils/lang-fr.js               |   2 +
 10 files changed, 130 insertions(+), 10 deletions(-)
 create mode 100644 lib/device/zigbee/sensor-smoke.js

diff --git a/CHANGELOG.md b/CHANGELOG.md
index aa4d34ff..5d11ed6d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,7 +6,10 @@ All notable changes to homebridge-ewelink will be documented in this file.
 
 ### Added
 
-- Support for Mangotek RLD60C0E27 light (and all devices with UIID 33)
+- **New Devices**
+  - Support for Mangotek RLD60C0E27 light (devices with UIID 33)
+  - Support for Zigbee Smoke Sensors (devices with UIID 5026)
+  - TODO: UUID [3258](https://github.com/CoolKit-Technologies/eWeLink-API/blob/main/en/UIIDProtocol.md#uiid3258-zigbee-five-color-light)
 
 ### Fixed
 
diff --git a/lib/device/outlet-single-inched.js b/lib/device/outlet-single-inched.js
index 5388f748..377c189b 100644
--- a/lib/device/outlet-single-inched.js
+++ b/lib/device/outlet-single-inched.js
@@ -23,7 +23,7 @@ module.exports = class deviceOutletSingleInched {
     this.isOnline = true
 
     /*
-    UIID 1/6/14/24/27/112/1256: single switch, no power readings
+    UIID 1/6/14/24/27/112/1009/1256/7004: single switch, no power readings
     UIID 5: single switch, with wattage readings
     UIID 32: single switch, with wattage, voltage and amp readings
     UIID 77/78/81/107: single switch but firmware uses multiple channels (only need CH0)
diff --git a/lib/device/outlet-single.js b/lib/device/outlet-single.js
index 440d9da0..54a6e0c9 100644
--- a/lib/device/outlet-single.js
+++ b/lib/device/outlet-single.js
@@ -22,7 +22,7 @@ module.exports = class deviceOutletSingle {
     this.isOnline = true
 
     /*
-    UIID 1/6/14/24/27/112/1256: single switch, no power readings
+    UIID 1/6/14/24/27/112/1009/1256/7004: single switch, no power readings
     UIID 5: single switch, with wattage readings
     UIID 32: single switch, with wattage, voltage and amp readings
     UIID 77/78/81/107: single switch but firmware uses multiple channels (only need CH0)
diff --git a/lib/device/switch-single-inched.js b/lib/device/switch-single-inched.js
index 775e5273..d27996cc 100644
--- a/lib/device/switch-single-inched.js
+++ b/lib/device/switch-single-inched.js
@@ -23,7 +23,7 @@ module.exports = class deviceSwitchSingleInched {
     this.isOnline = true
 
     /*
-    UIID 1/6/14/24/27/112/1256: single switch, no power readings
+    UIID 1/6/14/24/27/112/1009/1256/7004: single switch, no power readings
     UIID 5: single switch, with wattage readings
     UIID 32: single switch, with wattage, voltage and amp readings
     UIID 77/78/81/107: single switch but firmware uses multiple channels (only need CH0)
diff --git a/lib/device/switch-single.js b/lib/device/switch-single.js
index 63750fe9..179bb671 100644
--- a/lib/device/switch-single.js
+++ b/lib/device/switch-single.js
@@ -22,7 +22,7 @@ module.exports = class deviceSwitchSingle {
     this.isOnline = true
 
     /*
-    UIID 1/6/14/24/27/112/1256: single switch, no power readings
+    UIID 1/6/14/24/27/112/1009/1256/7004: single switch, no power readings
     UIID 5: single switch, with wattage readings
     UIID 32: single switch, with wattage, voltage and amp readings
     UIID 77/78/81/107: single switch but firmware uses multiple channels (only need CH0)
diff --git a/lib/device/zigbee/sensor-smoke.js b/lib/device/zigbee/sensor-smoke.js
new file mode 100644
index 00000000..27b183bc
--- /dev/null
+++ b/lib/device/zigbee/sensor-smoke.js
@@ -0,0 +1,101 @@
+/* jshint node: true, esversion: 10, -W014, -W033 */
+/* eslint-disable new-cap */
+'use strict'
+
+module.exports = class deviceZBSensorSmoke {
+  constructor (platform, accessory) {
+    // Set up variables from the platform
+    this.eveChar = platform.eveChar
+    this.funcs = platform.funcs
+    this.hapChar = platform.api.hap.Characteristic
+    this.hapServ = platform.api.hap.Service
+    this.hapUUIDGen = platform.api.hap.uuid.generate
+    this.lang = platform.lang
+    this.log = platform.log
+    this.platform = platform
+
+    // Set up variables from the accessory
+    this.name = accessory.displayName
+    this.accessory = accessory
+
+    // Set up custom variables for this device type
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
+    this.lowBattThreshold =
+      deviceConf && deviceConf.lowBattThreshold
+        ? Math.min(deviceConf.lowBattThreshold, 100)
+        : platform.consts.defaultValues.lowBattThreshold
+
+    // Set the correct logging variables for this accessory
+    this.enableLogging = !platform.config.disableDeviceLogging
+    this.enableDebugLogging = platform.config.debug
+    if (deviceConf && deviceConf.overrideLogging) {
+      switch (deviceConf.overrideLogging) {
+        case 'standard':
+          this.enableLogging = true
+          this.enableDebugLogging = false
+          break
+        case 'debug':
+          this.enableLogging = true
+          this.enableDebugLogging = true
+          break
+        case 'disable':
+          this.enableLogging = false
+          this.enableDebugLogging = false
+          break
+      }
+    }
+
+    // Add the smoke sensor service if it doesn't already exist
+    this.service =
+      this.accessory.getService(this.hapServ.SmokeSensor) ||
+      this.accessory.addService(this.hapServ.SmokeSensor)
+
+    // Add the battery service if it doesn't already exist
+    this.battService =
+      this.accessory.getService(this.hapServ.Battery) ||
+      this.accessory.addService(this.hapServ.Battery)
+
+    // Output the customised options to the log
+    const opts = JSON.stringify({
+      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
+      lowBattThreshold: this.lowBattThreshold
+    })
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
+  }
+
+  async externalUpdate (params) {
+    try {
+      if (this.funcs.hasProperty(params, 'battery') && params.battery !== this.cacheBatt) {
+        this.cacheBatt = params.battery
+        this.cacheBattScaled = this.scaleBattery ? this.cacheBatt * 10 : this.cacheBatt
+        this.cacheBattScaled = Math.max(Math.min(this.cacheBattScaled, 100), 0)
+        this.battService.updateCharacteristic(this.hapChar.BatteryLevel, this.cacheBattScaled)
+        this.battService.updateCharacteristic(
+          this.hapChar.StatusLowBattery,
+          this.cacheBattScaled < this.lowBattThreshold ? 1 : 0
+        )
+        if (params.updateSource && this.enableLogging) {
+          this.log('[%s] %s [%s%].', this.name, this.lang.curBatt, this.cacheBattScaled)
+        }
+      }
+      if (
+        this.funcs.hasProperty(params, 'smoke') &&
+        [0, 1].includes(params.smoke) &&
+        params.smoke !== this.cacheState
+      ) {
+        this.cacheState = params.smoke
+        this.service.updateCharacteristic(this.hapChar.SmokeDetected, this.cacheState)
+        if (params.updateSource && this.enableLogging) {
+          this.log(
+            '[%s] %s [%s].',
+            this.name,
+            this.lang.curState,
+            params.smoke === 0 ? this.lang.smokeYes : this.lang.smokeNo
+          )
+        }
+      }
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, false)
+    }
+  }
+}
diff --git a/lib/index.js b/lib/index.js
index 42085ca3..326464f5 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1420,6 +1420,13 @@ class eWeLinkPlatform {
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/zigbee/sensor-leak'))(this, accessory)
         /**************/
+      } else if (this.consts.devices.zbSensorSmoke.includes(uiid)) {
+        /****************
+        ZB SENSOR [SMOKE]
+        ****************/
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
+        accessory.control = new (require('./device/zigbee/sensor-smoke'))(this, accessory)
+        /***************/
       } else if (this.consts.devices.group.includes(uiid)) {
         /*************
         EWELINK GROUPS
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 798c1216..581e70d1 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -278,7 +278,7 @@ module.exports = {
       161,
       162
     ],
-    switchSingle: [1, 6, 14, 24, 27, 1009, 1256],
+    switchSingle: [1, 6, 14, 24, 27, 1009, 1256, 7004],
     switchSCM: [77, 78, 81, 107, 112, 138, 160],
     switchSinglePower: [5, 32],
     switchMulti: [
@@ -324,13 +324,13 @@ module.exports = {
     rfBridge: [28, 98],
     zbBridge: [66],
     zbSwitchStateless: [1000],
-    zbSwitchSingle: [1009, 1256],
     zbLightDimmer: [1257],
     zbLightCCT: [1258],
     zbSensorAmbient: [1770],
-    zbSensorMotion: [2026],
-    zbSensorContact: [3026],
+    zbSensorMotion: [2026, 7002],
+    zbSensorContact: [3026, 7003],
     zbSensorWater: [4026],
+    zbSensorSmoke: [5026],
     group: [5000],
     cannotSupport: [0, 65, 118, 119, 120, 121],
     garageSensors: [102, 3026],
@@ -379,6 +379,7 @@ module.exports = {
     'rfList',
     'rfTrig',
     'setclose',
+    'smoke',
     'speed',
     'state',
     'switch',
@@ -468,7 +469,11 @@ module.exports = {
     3256: 3, // "ZIGBEE_SWITCH_3"
     4026: 1, // "ZIGBEE_WATER_SENSOR"
     4256: 4, // "ZIGBEE_SWITCH_4"
-    5000: 1 // Custom uiid for groups
+    5000: 1, // Custom uiid for groups
+    5026: 1, // Zigbee Smoke Sensor
+    7002: 1, // Zigbee Human Body Sensor_Support OTA
+    7003: 1, // Zigbee Door Magnet_Support OTA
+    7004: 1 // Zigbee Single-Channel Switch ­_Support OTA
   },
 
   cannotSupportDevices: {
diff --git a/lib/utils/lang-en.js b/lib/utils/lang-en.js
index 5fe8ba98..3824522f 100644
--- a/lib/utils/lang-en.js
+++ b/lib/utils/lang-en.js
@@ -122,6 +122,8 @@ module.exports = {
   sensorNoDevice: 'garage/lock accessory not found, this device will be setup as a normal sensor',
   sensorYes: 'activated',
   shareWarn: 'using a shared device with the cloud may cause errors, use your main eWeLink account',
+  smokeNo: 'smoke not detected',
+  smokeYes: 'smoke detected',
   sonoffCamera: 'see the homebridge-ewelink wiki for details to enable the camera',
   stoppedLAN: 'LAN monitoring gracefully stopped',
   stoppedWS: 'Web socket gracefully closed',
diff --git a/lib/utils/lang-fr.js b/lib/utils/lang-fr.js
index 088fea5c..222156dd 100644
--- a/lib/utils/lang-fr.js
+++ b/lib/utils/lang-fr.js
@@ -125,6 +125,8 @@ module.exports = {
   sensorNoDevice: 'garage/lock accessory not found, this device will be setup as a normal sensor',
   shareWarn:
     'utiliser un équipement partagé avec le cloud peut provoquer des erreurs, utilisez votre compte eWelink principal',
+  smokeNo: 'smoke not detected',
+  smokeYes: 'smoke detected',
   sonoffCamera: "voir le wiki homebridge-ewelink pour plus de détails sur l'activation de caméra",
   stoppedLAN: 'surveillance LAN gracieusement arreté',
   stoppedWS: 'socket web fracieusement fermé',

From 64dc42d563a1a5f6f8d1f862df4b2a65860958de Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 6 Jan 2022 21:21:23 +0000
Subject: [PATCH 2911/3183] 8.9.2-beta.2

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 34543903..dbd6a444 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.9.2-beta.1",
+  "version": "8.9.2-beta.2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.9.2-beta.1",
+      "version": "8.9.2-beta.2",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 95b5eec4..7f71fd1c 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.9.2-beta.1",
+  "version": "8.9.2-beta.2",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From d5c6189fc68ebab26e505c2976ba3715ec9161e9 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 7 Jan 2022 18:27:44 +0000
Subject: [PATCH 2912/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5d11ed6d..5ff4aaf8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,14 +2,13 @@
 
 All notable changes to homebridge-ewelink will be documented in this file.
 
-## BETA
+## 8.10.0 (2022-01-07)
 
 ### Added
 
 - **New Devices**
   - Support for Mangotek RLD60C0E27 light (devices with UIID 33)
   - Support for Zigbee Smoke Sensors (devices with UIID 5026)
-  - TODO: UUID [3258](https://github.com/CoolKit-Technologies/eWeLink-API/blob/main/en/UIIDProtocol.md#uiid3258-zigbee-five-color-light)
 
 ### Fixed
 

From a68e98c44a4abc58d0139fec112dc4a10b95c060 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 7 Jan 2022 18:28:06 +0000
Subject: [PATCH 2913/3183] 8.10.0

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index dbd6a444..d7dbec58 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.9.2-beta.2",
+  "version": "8.10.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.9.2-beta.2",
+      "version": "8.10.0",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 7f71fd1c..948f4100 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.9.2-beta.2",
+  "version": "8.10.0",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From b45d3f13a85077f1bca8440352e7b221e6cd2a36 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 9 Jan 2022 04:52:40 +0000
Subject: [PATCH 2914/3183] cct fix for uiid 33

---
 CHANGELOG.md                | 6 ++++++
 lib/device/light-rgb-cct.js | 1 +
 2 files changed, 7 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5ff4aaf8..8a55f2f8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 All notable changes to homebridge-ewelink will be documented in this file.
 
+## BETA
+
+### Fixed
+
+- Minor colour temperature issue for Mangotek RLD60C0E27 (UIID 33)
+
 ## 8.10.0 (2022-01-07)
 
 ### Added
diff --git a/lib/device/light-rgb-cct.js b/lib/device/light-rgb-cct.js
index f52d7b08..25e65a6c 100644
--- a/lib/device/light-rgb-cct.js
+++ b/lib/device/light-rgb-cct.js
@@ -432,6 +432,7 @@ module.exports = class deviceLightRGBCCT {
       this.cacheCT = scaledCT
       this.cacheHue = 0
       switch (this.accessory.context.eweUIID) {
+        case 33:
         case 59:
         case 137: {
           // L1

From 69c4e64538bc9b28ce30290631411e8a52980917 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 11 Jan 2022 21:02:54 +0000
Subject: [PATCH 2915/3183] bump node versions

---
 CHANGELOG.md      |  4 ++++
 package-lock.json | 14 +++++++-------
 package.json      |  2 +-
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8a55f2f8..7bbf8643 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to homebridge-ewelink will be documented in this file.
 
 ## BETA
 
+### Changed
+
+- Bump `node` recommended versions to v14.18.3 or v16.13.2
+
 ### Fixed
 
 - Minor colour temperature issue for Mangotek RLD60C0E27 (UIID 33)
diff --git a/package-lock.json b/package-lock.json
index d7dbec58..fce297d5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -36,7 +36,7 @@
       },
       "engines": {
         "homebridge": "^1.3.9",
-        "node": "^14.18.2 || ^16.13.1"
+        "node": "^14.18.3 || ^16.13.2"
       }
     },
     "node_modules/@homebridge/plugin-ui-utils": {
@@ -135,9 +135,9 @@
       "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="
     },
     "node_modules/follow-redirects": {
-      "version": "1.14.6",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.6.tgz",
-      "integrity": "sha512-fhUl5EwSJbbl8AR+uYL2KQDxLkdSjZGR36xy46AO7cOMTrCMON6Sa28FmAnC2tRTDbd/Uuzz3aJBv7EBN7JH8A==",
+      "version": "1.14.7",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.7.tgz",
+      "integrity": "sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ==",
       "funding": [
         {
           "type": "individual",
@@ -668,9 +668,9 @@
       "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="
     },
     "follow-redirects": {
-      "version": "1.14.6",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.6.tgz",
-      "integrity": "sha512-fhUl5EwSJbbl8AR+uYL2KQDxLkdSjZGR36xy46AO7cOMTrCMON6Sa28FmAnC2tRTDbd/Uuzz3aJBv7EBN7JH8A=="
+      "version": "1.14.7",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.7.tgz",
+      "integrity": "sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ=="
     },
     "function-bind": {
       "version": "1.1.1",
diff --git a/package.json b/package.json
index 948f4100..f604d0ee 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,7 @@
   "main": "lib/index.js",
   "engines": {
     "homebridge": "^1.3.9",
-    "node": "^14.18.2 || ^16.13.1"
+    "node": "^14.18.3 || ^16.13.2"
   },
   "repository": {
     "type": "git",

From 0d8171cd84ac87a35392dd4eaf66fb60d5d23da9 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 12 Jan 2022 18:12:33 +0000
Subject: [PATCH 2916/3183] add option to ignore ewelink homes

---
 CHANGELOG.md           |   4 +
 config.schema.json     |   7 ++
 lib/connection/http.js |   9 +-
 lib/index.js           | 257 +++++++++++++++++++----------------------
 lib/utils/constants.js |   1 +
 lib/utils/lang-en.js   |   2 +-
 lib/utils/lang-fr.js   |   2 +-
 7 files changed, 140 insertions(+), 142 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7bbf8643..d305b58f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to homebridge-ewelink will be documented in this file.
 
 ## BETA
 
+### Added
+
+- Option to ignore eWeLink homes by ID (IDs will be displayed in the log when plugin starts)
+
 ### Changed
 
 - Bump `node` recommended versions to v14.18.3 or v16.13.2
diff --git a/config.schema.json b/config.schema.json
index 0904712c..42b66b6d 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -87,6 +87,12 @@
           "functionBody": "return (model.mode !== 'lan');"
         }
       },
+      "ignoredHomes": {
+        "title": "Ignored Homes",
+        "type": "string",
+        "description": "A list of comma-separated eWeLink home ids to ignore.",
+        "placeholder": ""
+      },
       "countryCode": {
         "title": "Country Code",
         "type": "string",
@@ -1668,6 +1674,7 @@
         "language",
         "disableDeviceLogging",
         "disableNoResponse",
+        "ignoredHomes",
         "countryCode",
         "httpHost",
         "apiPort"
diff --git a/lib/connection/http.js b/lib/connection/http.js
index c4009204..e14d0e8d 100644
--- a/lib/connection/http.js
+++ b/lib/connection/http.js
@@ -15,6 +15,7 @@ module.exports = class connectionHTTP {
     this.homeList = []
     this.httpHost = platform.config.httpHost
     this.ignoredDevices = platform.ignoredDevices
+    this.ignoredHomes = platform.config.ignoredHomes.split(',')
     this.lang = platform.lang
     this.log = platform.log
     this.mode = platform.config.mode
@@ -168,7 +169,13 @@ module.exports = class connectionHTTP {
       }
 
       // Add the home id to the global array of ids
-      body.data.familyList.forEach(home => this.homeList.push(home.id))
+      body.data.familyList.forEach(home => {
+        if (this.ignoredHomes.includes(home.id)) {
+          return
+        }
+        this.log('%s [%s] [%s].', this.lang.fetchHome, home.name, home.id)
+        this.homeList.push(home.id)
+      })
     } catch (err) {
       // Check to see if it's a eWeLink server problem and we can retry
       if (err.code && this.consts.httpRetryCodes.includes(err.code)) {
diff --git a/lib/index.js b/lib/index.js
index 326464f5..99c169cc 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -400,6 +400,14 @@ class eWeLinkPlatform {
             : this.consts.defaultValues[key]
           break
         }
+        case 'ignoredHomes':
+        case 'username':
+          if (typeof val !== 'string') {
+            logIgnore(key)
+          } else {
+            this.config[key] = val.replace(/[\s]+/g, '')
+          }
+          break
         case 'language':
         case 'mode': {
           const inSet = this.consts.allowed[key].includes(val)
@@ -420,13 +428,6 @@ class eWeLinkPlatform {
             this.config.password = val
           }
           break
-        case 'username':
-          if (typeof val !== 'string') {
-            logIgnore(key)
-          } else {
-            this.config.username = val.replace(/[\s]+/g, '')
-          }
-          break
         default:
           logRemove(key)
           break
@@ -1816,163 +1817,141 @@ class eWeLinkPlatform {
     // Find our accessory for which the updates relates to
     const uuid1 = this.api.hap.uuid.generate(deviceId + 'SWX')
     const uuid2 = this.api.hap.uuid.generate(deviceId + 'SW0')
-    if ((accessory = devicesInHB.get(uuid1) || devicesInHB.get(uuid2))) {
-      if (accessory.control.enableDebugLogging) {
-        this.log(
-          '[%s] %s %s.',
-          accessory.displayName,
-          this.lang.updRec,
-          JSON.stringify(device.params)
-        )
-      }
-      if (device.params.updateSource === 'WS') {
-        // The update is from WS so update the WS online/offline status
-        if (device.params.online !== accessory.context.reachableWAN) {
-          accessory.context.reachableWAN = device.params.online
-          this.api.updatePlatformAccessories(plugin.name, plugin.alias, [accessory])
-          devicesInHB.set(accessory.UUID, accessory)
-
-          // Flag this true to update the sub accessories later
-          reachableChange = true
-
-          // Log the new reachability of the device
-          if (accessory.control.enableLogging) {
-            if (accessory.context.reachableWAN) {
-              this.log('[%s] %s %s.', accessory.displayName, this.lang.repOnline, this.lang.viaWS)
-            } else {
-              this.log.warn(
-                '[%s] %s %s.',
-                accessory.displayName,
-                this.lang.repOffline,
-                this.lang.viaWS
-              )
-            }
+    if (!(accessory = devicesInHB.get(uuid1) || devicesInHB.get(uuid2))) {
+      return
+    }
+    if (accessory.control.enableDebugLogging) {
+      this.log(
+        '[%s] %s %s.',
+        accessory.displayName,
+        this.lang.updRec,
+        JSON.stringify(device.params)
+      )
+    }
+    if (device.params.updateSource === 'WS') {
+      // The update is from WS so update the WS online/offline status
+      if (device.params.online !== accessory.context.reachableWAN) {
+        accessory.context.reachableWAN = device.params.online
+        this.api.updatePlatformAccessories(plugin.name, plugin.alias, [accessory])
+        devicesInHB.set(accessory.UUID, accessory)
+
+        // Flag this true to update the sub accessories later
+        reachableChange = true
+
+        // Log the new reachability of the device
+        if (accessory.control.enableLogging) {
+          if (accessory.context.reachableWAN) {
+            this.log('[%s] %s %s.', accessory.displayName, this.lang.repOnline, this.lang.viaWS)
+          } else {
+            this.log.warn(
+              '[%s] %s %s.',
+              accessory.displayName,
+              this.lang.repOffline,
+              this.lang.viaWS
+            )
           }
+        }
 
-          // Mark the online/offline status of certain devices
-          if (accessory.control.markStatus) {
-            accessory.control.markStatus(device.params.online)
-          }
+        // Mark the online/offline status of certain devices
+        if (accessory.control.markStatus) {
+          accessory.control.markStatus(device.params.online)
+        }
 
-          // Try and request an update through WS if the device has come back online
-          if (accessory.context.reachableWAN && wsClient) {
-            try {
-              await wsClient.requestUpdate(accessory)
-            } catch (err) {
-              // Suppress any errors here
-            }
+        // Try and request an update through WS if the device has come back online
+        if (accessory.context.reachableWAN && wsClient) {
+          try {
+            await wsClient.requestUpdate(accessory)
+          } catch (err) {
+            // Suppress any errors here
           }
         }
       }
-      if (device.params.updateSource === 'LAN') {
-        // The update is from LAN so it must be online
-        if (!accessory.context.reachableLAN) {
-          accessory.context.reachableLAN = true
+    }
+    if (device.params.updateSource === 'LAN') {
+      // The update is from LAN so it must be online
+      if (!accessory.context.reachableLAN) {
+        accessory.context.reachableLAN = true
 
-          // Flag this true to update the sub accessories later
-          reachableChange = true
+        // Flag this true to update the sub accessories later
+        reachableChange = true
 
-          // Log the new reachability of the device
-          if (accessory.control.enableLogging) {
-            this.log('[%s] %s %s.', accessory.displayName, this.lang.repOnline, this.lang.viaLAN)
-          }
+        // Log the new reachability of the device
+        if (accessory.control.enableLogging) {
+          this.log('[%s] %s %s.', accessory.displayName, this.lang.repOnline, this.lang.viaLAN)
+        }
 
-          // Try and request an update through WS if the device has come back online
-          if (accessory.context.reachableWAN && wsClient) {
-            try {
-              await wsClient.requestUpdate(accessory)
-            } catch (err) {
-              // Suppress any errors here
-            }
+        // Try and request an update through WS if the device has come back online
+        if (accessory.context.reachableWAN && wsClient) {
+          try {
+            await wsClient.requestUpdate(accessory)
+          } catch (err) {
+            // Suppress any errors here
           }
         }
+      }
 
-        // Check to see if the IP of the device has changed
-        if (device.params.ip && device.params.ip !== accessory.context.ip) {
-          accessory.context.ip = device.params.ip
+      // Check to see if the IP of the device has changed
+      if (device.params.ip && device.params.ip !== accessory.context.ip) {
+        accessory.context.ip = device.params.ip
 
-          // Flag this true to update the sub accessories later
-          reachableChange = true
+        // Flag this true to update the sub accessories later
+        reachableChange = true
 
-          // Log the new ip of the device
-          if (accessory.control.enableLogging) {
-            this.log('[%s] %s [%s].', accessory.displayName, this.lang.newIP, device.params.ip)
-          }
+        // Log the new ip of the device
+        if (accessory.control.enableLogging) {
+          this.log('[%s] %s [%s].', accessory.displayName, this.lang.newIP, device.params.ip)
         }
+      }
 
-        // Update the accessory context if the device is back online or the IP changed
-        if (reachableChange) {
-          this.api.updatePlatformAccessories(plugin.name, plugin.alias, [accessory])
-          devicesInHB.set(accessory.UUID, accessory)
-        }
+      // Update the accessory context if the device is back online or the IP changed
+      if (reachableChange) {
+        this.api.updatePlatformAccessories(plugin.name, plugin.alias, [accessory])
+        devicesInHB.set(accessory.UUID, accessory)
       }
+    }
 
-      // Update this new online/offline status for all switches of multi channel devices
-      if (reachableChange && accessory.context.hbDeviceId.substr(-1) !== 'X') {
-        // Loop through to see which channels are in HB
-        for (let i = 1; i <= accessory.context.channelCount; i++) {
-          const uuid = this.api.hap.uuid.generate(deviceId + 'SW' + i)
-          if (devicesInHB.has(uuid)) {
-            // Find the sub accessory
-            const subAccessory = devicesInHB.get(uuid)
-
-            // Update the WAN status
-            subAccessory.context.reachableWAN = device.params.online
-            if (
-              device.params.updateSource === 'WS' &&
-              subAccessory.control &&
-              subAccessory.control.markStatus
-            ) {
-              subAccessory.control.markStatus(device.params.online)
-            }
+    // Update this new online/offline status for all switches of multi channel devices
+    if (reachableChange && accessory.context.hbDeviceId.substr(-1) !== 'X') {
+      // Loop through to see which channels are in HB
+      for (let i = 1; i <= accessory.context.channelCount; i++) {
+        const uuid = this.api.hap.uuid.generate(deviceId + 'SW' + i)
+        if (devicesInHB.has(uuid)) {
+          // Find the sub accessory
+          const subAccessory = devicesInHB.get(uuid)
 
-            // Update the LAN status
-            if (device.params.updateSource === 'LAN') {
-              subAccessory.context.reachableLAN = true
-              if (device.params.ip) {
-                subAccessory.context.ip = device.params.ip
-              }
-            }
+          // Update the WAN status
+          subAccessory.context.reachableWAN = device.params.online
+          if (
+            device.params.updateSource === 'WS' &&
+            subAccessory.control &&
+            subAccessory.control.markStatus
+          ) {
+            subAccessory.control.markStatus(device.params.online)
+          }
 
-            // Save the sub accessory updates to the platform
-            this.api.updatePlatformAccessories(plugin.name, plugin.alias, [subAccessory])
-            devicesInHB.set(subAccessory.UUID, subAccessory)
+          // Update the LAN status
+          if (device.params.updateSource === 'LAN') {
+            subAccessory.context.reachableLAN = true
+            if (device.params.ip) {
+              subAccessory.context.ip = device.params.ip
+            }
           }
-        }
-      }
-      try {
-        // Update the accessory with the new data
-        if (accessory.control && accessory.control.externalUpdate) {
-          accessory.control.externalUpdate(device.params)
-        }
-      } catch (err) {
-        const eText = this.funcs.parseError(err)
-        this.log.warn('[%s] %s %s.', accessory.displayName, this.lang.devNotRf, eText)
-      }
-    } else {
-      // The device does not exist in HB so let's try to add it
-      try {
-        // Don't continue if the user has hidden this device
-        if (this.ignoredDevices.includes(deviceId) || !httpClient) {
-          return
-        }
 
-        // Log the update if debug is set to true
-        if (this.config.debug) {
-          this.log('[%s] %s %s.', deviceId, this.lang.recNew, JSON.stringify(device.params))
+          // Save the sub accessory updates to the platform
+          this.api.updatePlatformAccessories(plugin.name, plugin.alias, [subAccessory])
+          devicesInHB.set(subAccessory.UUID, subAccessory)
         }
-
-        // Obtain full device information from the HTTP API
-        const newDevice = await httpClient.getDevice(deviceId)
-
-        // Initialise the device in HB
-        this.initialiseDevice(newDevice)
-      } catch (err) {
-        // Automatically adding the new device failed for some reason
-        const eText = this.funcs.parseError(err)
-        this.log.warn('[%s] %s %s.', deviceId, this.lang.devNewNotAdd, eText)
       }
     }
+    try {
+      // Update the accessory with the new data
+      if (accessory.control && accessory.control.externalUpdate) {
+        accessory.control.externalUpdate(device.params)
+      }
+    } catch (err) {
+      const eText = this.funcs.parseError(err)
+      this.log.warn('[%s] %s %s.', accessory.displayName, this.lang.devNotRf, eText)
+    }
   }
 
   async deviceUpdateError (accessory, err, requestRefresh) {
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 581e70d1..19887f0e 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -14,6 +14,7 @@ module.exports = {
     language: 'en',
     disableDeviceLogging: false,
     disableNoResponse: false,
+    ignoredHomes: '',
     countryCode: '+44',
     httpHost: 'eu-apia.coolkit.cc',
     apiPort: 0,
diff --git a/lib/utils/lang-en.js b/lib/utils/lang-en.js
index 3824522f..b7680d52 100644
--- a/lib/utils/lang-en.js
+++ b/lib/utils/lang-en.js
@@ -76,6 +76,7 @@ module.exports = {
   errGetHost: 'An error occurred during ws getHost()',
   errLogin: 'An error occurred during http login()',
   eweError: 'An eWeLink error [500] occured, retrying in 30 seconds',
+  fetchHome: 'Fetching devices from eWeLink home/id',
   foundWithIP: 'found locally with IP',
   foundWithManIP: 'using manual IP',
   hbVersionFail: 'Your version of Homebridge is too low - update to v1.3',
@@ -109,7 +110,6 @@ module.exports = {
   noRegionRec: 'No valid region received',
   noWSHost: 'Server did not respond with a web socket host',
   pluginNotConf: 'Plugin has not been configured',
-  recNew: 'receiving update for new device',
   repOffline: 'has been reported [offline]',
   repOnline: 'has been reported [online]',
   revertWS: 'reverting to web socket as',
diff --git a/lib/utils/lang-fr.js b/lib/utils/lang-fr.js
index 222156dd..6e84c784 100644
--- a/lib/utils/lang-fr.js
+++ b/lib/utils/lang-fr.js
@@ -76,6 +76,7 @@ module.exports = {
   errGetHost: 'Une erreur est survenue durant ws getHost()',
   errLogin: 'Une erreur est survenue durant http login()',
   eweError: 'Une erreur eWeLink [500] est survenue, nouvel essaie dans 30 secondes',
+  fetchHome: 'Fetching devices from eWeLink home/id',
   foundWithIP: 'trouvé locallement avec IP',
   foundWithManIP: "utilisation de l'IP manuelle",
   hbVersionFail: 'Votre version de Homebridge est trop ancienne - Mettez à jour vers v1.3',
@@ -110,7 +111,6 @@ module.exports = {
   noRegionRec: 'pas de région valide reçus',
   noWSHost: 'le serveur ne répond pas avec un hote web socket',
   pluginNotConf: "le plugin n'a pas été configuré",
-  recNew: 'réception des mises à jour pour un nouvel appareil',
   repOffline: 'a été rapporté [offline]',
   repOnline: 'a été rapporté [online]',
   revertWS: 'retour au web socket en tant que',

From 9d3f5253ef1606a0d03dcf6817768fdfca077071 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 12 Jan 2022 18:13:30 +0000
Subject: [PATCH 2917/3183] 8.10.1-beta.0

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index fce297d5..30fcf21a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.10.0",
+  "version": "8.10.1-beta.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.10.0",
+      "version": "8.10.1-beta.0",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index f604d0ee..22079502 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.10.0",
+  "version": "8.10.1-beta.0",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From acf8029e1db82f97c31b7f6e962f90849b227a7b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 13 Jan 2022 22:26:25 +0000
Subject: [PATCH 2918/3183] bump `ws`

---
 CHANGELOG.md      |  3 ++-
 package-lock.json | 12 ++++++------
 package.json      |  2 +-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d305b58f..99e74cf7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 All notable changes to homebridge-ewelink will be documented in this file.
 
-## BETA
+## 8.11.0 (2022-01-13)
 
 ### Added
 
@@ -11,6 +11,7 @@ All notable changes to homebridge-ewelink will be documented in this file.
 ### Changed
 
 - Bump `node` recommended versions to v14.18.3 or v16.13.2
+- Bump `ws` to v8.4.1
 
 ### Fixed
 
diff --git a/package-lock.json b/package-lock.json
index 30fcf21a..b68aa1c7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -569,9 +569,9 @@
       }
     },
     "node_modules/ws": {
-      "version": "8.4.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.4.0.tgz",
-      "integrity": "sha512-IHVsKe2pjajSUIl4KYMQOdlyliovpEPquKkqbwswulszzI7r0SfQrxnXdWAEqOlDCLrVSJzo+O1hAwdog2sKSQ==",
+      "version": "8.4.1",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.4.1.tgz",
+      "integrity": "sha512-6eqQ4yN2y2xv8b+BgbkUzPPyfo/PDl3VOWb06ZE0jIFYwuHMsMQN6F7o84yxJYCblfCRAxzpU59We4Rr4w0Luw==",
       "engines": {
         "node": ">=10.0.0"
       },
@@ -944,9 +944,9 @@
       }
     },
     "ws": {
-      "version": "8.4.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.4.0.tgz",
-      "integrity": "sha512-IHVsKe2pjajSUIl4KYMQOdlyliovpEPquKkqbwswulszzI7r0SfQrxnXdWAEqOlDCLrVSJzo+O1hAwdog2sKSQ==",
+      "version": "8.4.1",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.4.1.tgz",
+      "integrity": "sha512-6eqQ4yN2y2xv8b+BgbkUzPPyfo/PDl3VOWb06ZE0jIFYwuHMsMQN6F7o84yxJYCblfCRAxzpU59We4Rr4w0Luw==",
       "requires": {}
     }
   }
diff --git a/package.json b/package.json
index 22079502..325d74a5 100644
--- a/package.json
+++ b/package.json
@@ -59,7 +59,7 @@
     "node-persist": "^3.1.0",
     "p-queue": "^6.6.2",
     "websocket-as-promised": "^2.0.1",
-    "ws": "^8.4.0"
+    "ws": "^8.4.1"
   },
   "prettier": {
     "printWidth": 100

From 71fae1dc4158f6a5ddb7974802135e02a6c1eab9 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 13 Jan 2022 22:26:43 +0000
Subject: [PATCH 2919/3183] 8.11.0

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b68aa1c7..53d6470b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.10.1-beta.0",
+  "version": "8.11.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.10.1-beta.0",
+      "version": "8.11.0",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 325d74a5..3fa2d39b 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.10.1-beta.0",
+  "version": "8.11.0",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From e201e7b5f1b198d090ce1ab9dc97e924902ec801 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 15 Jan 2022 17:32:35 +0000
Subject: [PATCH 2920/3183] updates

---
 CHANGELOG.md         | 10 ++++++++++
 lib/connection/ws.js |  2 +-
 package-lock.json    | 14 +++++++-------
 package.json         |  2 +-
 4 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 99e74cf7..dabec7f4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,16 @@
 
 All notable changes to homebridge-ewelink will be documented in this file.
 
+## 8.11.1 (2022-01-15)
+
+### Changed
+
+- Bump `ws` to v8.4.2
+
+### Fixed
+
+- `undefined` log message on web socket error
+
 ## 8.11.0 (2022-01-13)
 
 ### Added
diff --git a/lib/connection/ws.js b/lib/connection/ws.js
index 793558b6..0da578d7 100644
--- a/lib/connection/ws.js
+++ b/lib/connection/ws.js
@@ -71,7 +71,7 @@ module.exports = class connectionWS {
         return await this.getHost()
       } else {
         // It's not a eWeLink problem so report the error back
-        this.log.warn('%s.', this.lang.errgetHost)
+        this.log.warn('%s.', this.lang.errGetHost)
         throw err
       }
     }
diff --git a/package-lock.json b/package-lock.json
index 53d6470b..a341551d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -32,7 +32,7 @@
         "node-persist": "^3.1.0",
         "p-queue": "^6.6.2",
         "websocket-as-promised": "^2.0.1",
-        "ws": "^8.4.0"
+        "ws": "^8.4.2"
       },
       "engines": {
         "homebridge": "^1.3.9",
@@ -569,9 +569,9 @@
       }
     },
     "node_modules/ws": {
-      "version": "8.4.1",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.4.1.tgz",
-      "integrity": "sha512-6eqQ4yN2y2xv8b+BgbkUzPPyfo/PDl3VOWb06ZE0jIFYwuHMsMQN6F7o84yxJYCblfCRAxzpU59We4Rr4w0Luw==",
+      "version": "8.4.2",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.4.2.tgz",
+      "integrity": "sha512-Kbk4Nxyq7/ZWqr/tarI9yIt/+iNNFOjBXEWgTb4ydaNHBNGgvf2QHbS9fdfsndfjFlFwEd4Al+mw83YkaD10ZA==",
       "engines": {
         "node": ">=10.0.0"
       },
@@ -944,9 +944,9 @@
       }
     },
     "ws": {
-      "version": "8.4.1",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.4.1.tgz",
-      "integrity": "sha512-6eqQ4yN2y2xv8b+BgbkUzPPyfo/PDl3VOWb06ZE0jIFYwuHMsMQN6F7o84yxJYCblfCRAxzpU59We4Rr4w0Luw==",
+      "version": "8.4.2",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.4.2.tgz",
+      "integrity": "sha512-Kbk4Nxyq7/ZWqr/tarI9yIt/+iNNFOjBXEWgTb4ydaNHBNGgvf2QHbS9fdfsndfjFlFwEd4Al+mw83YkaD10ZA==",
       "requires": {}
     }
   }
diff --git a/package.json b/package.json
index 3fa2d39b..64696cc3 100644
--- a/package.json
+++ b/package.json
@@ -59,7 +59,7 @@
     "node-persist": "^3.1.0",
     "p-queue": "^6.6.2",
     "websocket-as-promised": "^2.0.1",
-    "ws": "^8.4.1"
+    "ws": "^8.4.2"
   },
   "prettier": {
     "printWidth": 100

From 91da8a5560d11d48ea18a15697ca221aa6d8aebc Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 15 Jan 2022 17:32:58 +0000
Subject: [PATCH 2921/3183] 8.11.1

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index a341551d..1e8408f1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.11.0",
+  "version": "8.11.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.11.0",
+      "version": "8.11.1",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 64696cc3..99fc0b4d 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.11.0",
+  "version": "8.11.1",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From c85b544fa66c59d50f389b170c16b21a0f7b0a73 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 19 Jan 2022 18:05:46 +0000
Subject: [PATCH 2922/3183] bump axios

---
 CHANGELOG.md      |  6 ++++++
 package-lock.json | 18 +++++++++---------
 package.json      |  2 +-
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dabec7f4..f4538996 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 All notable changes to homebridge-ewelink will be documented in this file.
 
+## BETA
+
+### Changed
+
+- Bump `axios` to v0.25.0
+
 ## 8.11.1 (2022-01-15)
 
 ### Changed
diff --git a/package-lock.json b/package-lock.json
index 1e8408f1..1c102c1a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -28,7 +28,7 @@
       "license": "MIT",
       "dependencies": {
         "@homebridge/plugin-ui-utils": "^0.0.19",
-        "axios": "^0.24.0",
+        "axios": "^0.25.0",
         "node-persist": "^3.1.0",
         "p-queue": "^6.6.2",
         "websocket-as-promised": "^2.0.1",
@@ -45,11 +45,11 @@
       "integrity": "sha512-axFX7lN2Yd7bz/6SlD7dzq5sY/N9+XYuLHPukuiyHQRDtNMRL1uDqJhOx6RVaN2tYDHB75h7YxRQWP7U44Mgzg=="
     },
     "node_modules/axios": {
-      "version": "0.24.0",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-0.24.0.tgz",
-      "integrity": "sha512-Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA==",
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-0.25.0.tgz",
+      "integrity": "sha512-cD8FOb0tRH3uuEe6+evtAbgJtfxr7ly3fQjYcMcuPlgkwVS9xboaVIpcDV+cYQe+yGykgwZCs1pzjntcGa6l5g==",
       "dependencies": {
-        "follow-redirects": "^1.14.4"
+        "follow-redirects": "^1.14.7"
       }
     },
     "node_modules/call-bind": {
@@ -596,11 +596,11 @@
       "integrity": "sha512-axFX7lN2Yd7bz/6SlD7dzq5sY/N9+XYuLHPukuiyHQRDtNMRL1uDqJhOx6RVaN2tYDHB75h7YxRQWP7U44Mgzg=="
     },
     "axios": {
-      "version": "0.24.0",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-0.24.0.tgz",
-      "integrity": "sha512-Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA==",
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-0.25.0.tgz",
+      "integrity": "sha512-cD8FOb0tRH3uuEe6+evtAbgJtfxr7ly3fQjYcMcuPlgkwVS9xboaVIpcDV+cYQe+yGykgwZCs1pzjntcGa6l5g==",
       "requires": {
-        "follow-redirects": "^1.14.4"
+        "follow-redirects": "^1.14.7"
       }
     },
     "call-bind": {
diff --git a/package.json b/package.json
index 99fc0b4d..eed68d72 100644
--- a/package.json
+++ b/package.json
@@ -55,7 +55,7 @@
   ],
   "dependencies": {
     "@homebridge/plugin-ui-utils": "^0.0.19",
-    "axios": "^0.24.0",
+    "axios": "^0.25.0",
     "node-persist": "^3.1.0",
     "p-queue": "^6.6.2",
     "websocket-as-promised": "^2.0.1",

From 264dc3012355b40eb14aada98e2ef2fdc40bc5b5 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 23 Jan 2022 16:21:35 +0000
Subject: [PATCH 2923/3183] [test] fix lan mode for ifan04

---
 CHANGELOG.md          | 4 ++++
 lib/connection/lan.js | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f4538996..1d3ba92c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,10 @@ All notable changes to homebridge-ewelink will be documented in this file.
 
 - Bump `axios` to v0.25.0
 
+### Fixed
+
+- [Test] Fix LAN mode support for iFan04
+
 ## 8.11.1 (2022-01-15)
 
 ### Changed
diff --git a/lib/connection/lan.js b/lib/connection/lan.js
index f8da9659..ccf66fcd 100644
--- a/lib/connection/lan.js
+++ b/lib/connection/lan.js
@@ -173,7 +173,8 @@ module.exports = class connectionLAN {
         params.mode = 0
         suffix = 'dimmable'
       } else if (json.params.switches) {
-        if (deviceInfo.uiid === 34 && ['iFan03', 'iFan'].includes(deviceInfo.productModel)) {
+        const specialModels = ['iFan03', 'iFan', 'iFan04']
+        if (deviceInfo.uiid === 34 && specialModels.includes(deviceInfo.productModel)) {
           // Special format for some iFan models
           if (json.params.switches[0].outlet === 0) {
             // Turn on/off the light for the iFan

From 0b4f0b767bb2dde40a769fc0a7fc88d6facc364d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 23 Jan 2022 16:22:36 +0000
Subject: [PATCH 2924/3183] 8.11.2-beta.0

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 1c102c1a..b29999cb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.11.1",
+  "version": "8.11.2-beta.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.11.1",
+      "version": "8.11.2-beta.0",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index eed68d72..908fdb98 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.11.1",
+  "version": "8.11.2-beta.0",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From d77b059fdf6707599e5ff2415ae8686eae4f79d3 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 23 Jan 2022 16:56:17 +0000
Subject: [PATCH 2925/3183] update label for ifan04

---
 config.schema.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config.schema.json b/config.schema.json
index 42b66b6d..adff8158 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -1172,7 +1172,7 @@
               "description": "This setting has no effect except showing the relevant options for this model below.",
               "oneOf": [
                 {
-                  "title": "Sonoff iFan/02/03",
+                  "title": "Sonoff iFan/02/03/04",
                   "enum": ["ifan"]
                 }
               ],

From 67d0eae777615a08240cd57b61136885e32dc38e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 23 Jan 2022 16:57:19 +0000
Subject: [PATCH 2926/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1d3ba92c..2b6665ce 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 All notable changes to homebridge-ewelink will be documented in this file.
 
-## BETA
+## 8.11.2 (2022-01-23)
 
 ### Changed
 

From 7fc85f0cf987fe5a9b16ebfb72b4f41a0000f547 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 23 Jan 2022 16:57:40 +0000
Subject: [PATCH 2927/3183] 8.11.2

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b29999cb..036a8e0d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.11.2-beta.0",
+  "version": "8.11.2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.11.2-beta.0",
+      "version": "8.11.2",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 908fdb98..3d5bae08 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.11.2-beta.0",
+  "version": "8.11.2",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From 9a42fe9ad7f42c5d57d000a30ba93fa0936ae7ff Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 23 Jan 2022 16:58:02 +0000
Subject: [PATCH 2928/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2b6665ce..d7f1b251 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,7 +10,7 @@ All notable changes to homebridge-ewelink will be documented in this file.
 
 ### Fixed
 
-- [Test] Fix LAN mode support for iFan04
+- Fix LAN mode support for iFan04
 
 ## 8.11.1 (2022-01-15)
 

From 9278ce35201b30d3746ee8c1095bfba89163025d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 24 Jan 2022 07:07:54 +0000
Subject: [PATCH 2929/3183] bump hb

---
 CHANGELOG.md      | 6 ++++++
 package-lock.json | 2 +-
 package.json      | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d7f1b251..c4959506 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 All notable changes to homebridge-ewelink will be documented in this file.
 
+## BETA
+
+### Changed
+
+- Bump `homebridge` recommended version to v1.4.0
+
 ## 8.11.2 (2022-01-23)
 
 ### Changed
diff --git a/package-lock.json b/package-lock.json
index 036a8e0d..1bcedb71 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -35,7 +35,7 @@
         "ws": "^8.4.2"
       },
       "engines": {
-        "homebridge": "^1.3.9",
+        "homebridge": "^1.4.0",
         "node": "^14.18.3 || ^16.13.2"
       }
     },
diff --git a/package.json b/package.json
index 3d5bae08..d6ef502d 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,7 @@
   ],
   "main": "lib/index.js",
   "engines": {
-    "homebridge": "^1.3.9",
+    "homebridge": "^1.4.0",
     "node": "^14.18.3 || ^16.13.2"
   },
   "repository": {

From 6573fee01ecc5187704ea5a4125504c515712e9e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 27 Jan 2022 18:36:56 +0000
Subject: [PATCH 2930/3183] option to disable timer for valve simulation

---
 CHANGELOG.md                        |  4 ++
 config.schema.json                  | 18 ++++++
 lib/device/simulation/valve-four.js | 88 +++++++++++++++++++----------
 lib/device/simulation/valve-one.js  | 77 ++++++++++++++++---------
 lib/device/simulation/valve-two.js  | 85 ++++++++++++++++++----------
 lib/index.js                        | 25 ++++----
 lib/utils/constants.js              |  2 +
 7 files changed, 198 insertions(+), 101 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c4959506..9203a982 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to homebridge-ewelink will be documented in this file.
 
 ## BETA
 
+### Added
+
+- Option to disable the timer for irrigation valve simulations
+
 ### Changed
 
 - Bump `homebridge` recommended version to v1.4.0
diff --git a/config.schema.json b/config.schema.json
index adff8158..26ae7b62 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -338,6 +338,14 @@
                 "functionBody": "return (model.singleDevices && model.singleDevices[arrayIndices] && ['pow', 'iw'].includes(model.singleDevices[arrayIndices].deviceModel) && [undefined, 'default', 'outlet'].includes(model.singleDevices[arrayIndices].showAs) && !model.singleDevices[arrayIndices].ignoreDevice);"
               }
             },
+            "disableTimer": {
+              "type": "boolean",
+              "title": "Disable Valve Timer",
+              "description": "If true, the timer for the valve will be removed.",
+              "condition": {
+                "functionBody": "return (model.singleDevices && model.singleDevices[arrayIndices] && ['valve'].includes(model.singleDevices[arrayIndices].showAs) && !model.singleDevices[arrayIndices].ignoreDevice);"
+              }
+            },
             "temperatureSource": {
               "type": "string",
               "title": "Temperature Sensor ID",
@@ -682,6 +690,14 @@
                 "functionBody": "return (model.multiDevices && model.multiDevices[arrayIndices] && model.multiDevices[arrayIndices].deviceId && [undefined, 'default', 'outlet'].includes(model.multiDevices[arrayIndices].showAs) && ['dualr3_switch'].includes(model.multiDevices[arrayIndices].deviceModel) && !model.multiDevices[arrayIndices].ignoreDevice);"
               }
             },
+            "disableTimer": {
+              "type": "boolean",
+              "title": "Disable Valve Timer",
+              "description": "If true, the timer for the valve will be removed.",
+              "condition": {
+                "functionBody": "return (model.multiDevices && model.multiDevices[arrayIndices] && ['valve', 'valve_two', 'valve_four'].includes(model.multiDevices[arrayIndices].showAs) && !model.multiDevices[arrayIndices].ignoreDevice);"
+              }
+            },
             "inchChannels": {
               "type": "string",
               "title": "Status By Inching",
@@ -1699,6 +1715,7 @@
             "singleDevices[].showAsMotor",
             "singleDevices[].showAsEachen",
             "singleDevices[].inUsePowerThreshold",
+            "singleDevices[].disableTimer",
             "singleDevices[].temperatureSource",
             "singleDevices[].isInched",
             "singleDevices[].operationTime",
@@ -1732,6 +1749,7 @@
             "multiDevices[].showAsMotor",
             "multiDevices[].hideChannels",
             "multiDevices[].inUsePowerThreshold",
+            "multiDevices[].disableTimer",
             "multiDevices[].inchChannels",
             "multiDevices[].sensorType",
             "multiDevices[].operationTime",
diff --git a/lib/device/simulation/valve-four.js b/lib/device/simulation/valve-four.js
index 6f478a82..ef111be2 100644
--- a/lib/device/simulation/valve-four.js
+++ b/lib/device/simulation/valve-four.js
@@ -21,6 +21,7 @@ module.exports = class deviceValveFour {
 
     // Set up custom variables for this device type
     const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
+    this.disableTimer = deviceConf && deviceConf.disableTimer
 
     // Set the correct logging variables for this accessory
     this.enableLogging = !platform.config.disableDeviceLogging
@@ -54,9 +55,11 @@ module.exports = class deviceValveFour {
         )
         valveService.updateCharacteristic(this.hapChar.Active, 0)
         valveService.updateCharacteristic(this.hapChar.InUse, 0)
-        valveService.updateCharacteristic(this.hapChar.ValveType, 1)
-        valveService.updateCharacteristic(this.hapChar.SetDuration, 120)
-        valveService.addCharacteristic(this.hapChar.RemainingDuration)
+        if (!this.disableTimer) {
+          valveService.updateCharacteristic(this.hapChar.ValveType, 1)
+          valveService.updateCharacteristic(this.hapChar.SetDuration, 120)
+          valveService.addCharacteristic(this.hapChar.RemainingDuration)
+        }
       }
 
       // Add the set handler to the valve active characteristic
@@ -75,26 +78,40 @@ module.exports = class deviceValveFour {
       }
 
       // Add the set handler to the valve set duration characteristic
-      valveService.getCharacteristic(this.hapChar.SetDuration).onSet(value => {
-        // Check if the valve is currently active
-        if (valveService.getCharacteristic(this.hapChar.InUse).value === 1) {
-          // Update the remaining duration characteristic with the new value
-          valveService.updateCharacteristic(this.hapChar.RemainingDuration, value)
-
-          // Clear any existing active timers
-          clearTimeout(valveService.timer)
-
-          // Set a new active timer with the new time amount
-          valveService.timer = setTimeout(
-            () => valveService.setCharacteristic(this.hapChar.Active, 0),
-            value * 1000
+      if (this.disableTimer) {
+        if (valveService.testCharacteristic(this.hapChar.SetDuration)) {
+          valveService.removeCharacteristic(
+            valveService.getCharacteristic(this.hapChar.SetDuration)
           )
         }
-      })
+        if (valveService.testCharacteristic(this.hapChar.RemainingDuration)) {
+          valveService.removeCharacteristic(
+            valveService.getCharacteristic(this.hapChar.RemainingDuration)
+          )
+        }
+      } else {
+        valveService.getCharacteristic(this.hapChar.SetDuration).onSet(value => {
+          // Check if the valve is currently active
+          if (valveService.getCharacteristic(this.hapChar.InUse).value === 1) {
+            // Update the remaining duration characteristic with the new value
+            valveService.updateCharacteristic(this.hapChar.RemainingDuration, value)
+
+            // Clear any existing active timers
+            clearTimeout(valveService.timer)
+
+            // Set a new active timer with the new time amount
+            valveService.timer = setTimeout(
+              () => valveService.setCharacteristic(this.hapChar.Active, 0),
+              value * 1000
+            )
+          }
+        })
+      }
     })
 
     // Output the customised options to the log
     const opts = JSON.stringify({
+      disableTimer: this.disableTimer,
       logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
       showAs: 'valve_four'
     })
@@ -124,21 +141,26 @@ module.exports = class deviceValveFour {
       valveService.updateCharacteristic(this.hapChar.InUse, value)
       switch (value) {
         case 0:
-          valveService.updateCharacteristic(this.hapChar.RemainingDuration, 0)
-          clearTimeout(this.accessory.getService(valve).timer)
+          if (!this.disableTimer) {
+            valveService.updateCharacteristic(this.hapChar.RemainingDuration, 0)
+            clearTimeout(this.accessory.getService(valve).timer)
+          }
           if (this.enableLogging) {
             this.log('[%s] [%s] %s [%s].', this.name, valve, this.lang.curState, this.lang.valveNo)
           }
           break
         case 1: {
-          const timer = valveService.getCharacteristic(this.hapChar.SetDuration).value
-          valveService.updateCharacteristic(this.hapChar.RemainingDuration, timer)
+          if (!this.disableTimer) {
+            const timer = valveService.getCharacteristic(this.hapChar.SetDuration).value
+            valveService.updateCharacteristic(this.hapChar.RemainingDuration, timer)
+            valveService.timer = setTimeout(() => {
+              valveService.setCharacteristic(this.hapChar.Active, 0)
+            }, timer * 1000)
+          }
           if (this.enableLogging) {
             this.log('[%s] [%s] %s [%s].', this.name, valve, this.lang.curState, this.lang.valveYes)
           }
-          valveService.timer = setTimeout(() => {
-            valveService.setCharacteristic(this.hapChar.Active, 0)
-          }, timer * 1000)
+
           break
         }
       }
@@ -162,10 +184,15 @@ module.exports = class deviceValveFour {
         const valveService = this.accessory.getService('Valve ' + v)
         if (params.switches[k].switch === 'on') {
           if (valveService.getCharacteristic(this.hapChar.Active).value === 0) {
-            const timer = valveService.getCharacteristic(this.hapChar.SetDuration).value
             valveService.updateCharacteristic(this.hapChar.Active, 1)
             valveService.updateCharacteristic(this.hapChar.InUse, 1)
-            valveService.updateCharacteristic(this.hapChar.RemainingDuration, timer)
+            if (!this.disableTimer) {
+              const timer = valveService.getCharacteristic(this.hapChar.SetDuration).value
+              valveService.updateCharacteristic(this.hapChar.RemainingDuration, timer)
+              valveService.timer = setTimeout(() => {
+                valveService.setCharacteristic(this.hapChar.Active, 0)
+              }, timer * 1000)
+            }
             if (params.updateSource && this.enableLogging) {
               this.log(
                 '[%s] [Valve %s] %s [%s].',
@@ -175,16 +202,15 @@ module.exports = class deviceValveFour {
                 this.lang.valveYes
               )
             }
-            valveService.timer = setTimeout(() => {
-              valveService.setCharacteristic(this.hapChar.Active, 0)
-            }, timer * 1000)
           }
           return
         }
         valveService.updateCharacteristic(this.hapChar.Active, 0)
         valveService.updateCharacteristic(this.hapChar.InUse, 0)
-        valveService.updateCharacteristic(this.hapChar.RemainingDuration, 0)
-        clearTimeout(valveService.timer)
+        if (!this.disableTimer) {
+          valveService.updateCharacteristic(this.hapChar.RemainingDuration, 0)
+          clearTimeout(valveService.timer)
+        }
       })
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
diff --git a/lib/device/simulation/valve-one.js b/lib/device/simulation/valve-one.js
index db64199c..d600d6ef 100644
--- a/lib/device/simulation/valve-one.js
+++ b/lib/device/simulation/valve-one.js
@@ -23,6 +23,7 @@ module.exports = class deviceValveOne {
 
     // Set up custom variables for this device type
     const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
+    this.disableTimer = deviceConf && deviceConf.disableTimer
 
     // Set the correct logging variables for this accessory
     this.enableLogging = !platform.config.disableDeviceLogging
@@ -114,22 +115,33 @@ module.exports = class deviceValveOne {
     }
 
     // Add the set handler to the valve set duration characteristic
-    this.service.getCharacteristic(this.hapChar.SetDuration).onSet(value => {
-      // Check if the valve is currently active
-      if (this.service.getCharacteristic(this.hapChar.InUse).value === 1) {
-        // Update the remaining duration characteristic with the new value
-        this.service.updateCharacteristic(this.hapChar.RemainingDuration, value)
-
-        // Clear any existing active timers
-        clearTimeout(this.timer)
-
-        // Set a new active timer with the new time amount
-        this.timer = setTimeout(
-          () => this.service.setCharacteristic(this.hapChar.Active, 0),
-          value * 1000
+    if (this.disableTimer) {
+      if (this.service.testCharacteristic(this.hapChar.SetDuration)) {
+        this.service.removeCharacteristic(this.service.getCharacteristic(this.hapChar.SetDuration))
+      }
+      if (this.service.testCharacteristic(this.hapChar.RemainingDuration)) {
+        this.service.removeCharacteristic(
+          this.service.getCharacteristic(this.hapChar.RemainingDuration)
         )
       }
-    })
+    } else {
+      this.service.getCharacteristic(this.hapChar.SetDuration).onSet(value => {
+        // Check if the valve is currently active
+        if (this.service.getCharacteristic(this.hapChar.InUse).value === 1) {
+          // Update the remaining duration characteristic with the new value
+          this.service.updateCharacteristic(this.hapChar.RemainingDuration, value)
+
+          // Clear any existing active timers
+          clearTimeout(this.timer)
+
+          // Set a new active timer with the new time amount
+          this.timer = setTimeout(
+            () => this.service.setCharacteristic(this.hapChar.Active, 0),
+            value * 1000
+          )
+        }
+      })
+    }
 
     // Set up an interval to get eWeLink to send power updates
     if (
@@ -149,6 +161,7 @@ module.exports = class deviceValveOne {
 
     // Output the customised options to the log
     const opts = JSON.stringify({
+      disableTimer: this.disableTimer,
       logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
       showAs: 'valve'
     })
@@ -174,21 +187,25 @@ module.exports = class deviceValveOne {
       this.service.updateCharacteristic(this.hapChar.InUse, value)
       switch (value) {
         case 0:
-          this.service.updateCharacteristic(this.hapChar.RemainingDuration, 0)
-          clearTimeout(this.timer)
+          if (!this.disableTimer) {
+            this.service.updateCharacteristic(this.hapChar.RemainingDuration, 0)
+            clearTimeout(this.timer)
+          }
           if (this.enableLogging) {
             this.log('[%s] %s [%s].', this.name, this.lang.curState, this.lang.valveNo)
           }
           break
         case 1: {
-          const timer = this.service.getCharacteristic(this.hapChar.SetDuration).value
-          this.service.updateCharacteristic(this.hapChar.RemainingDuration, timer)
+          if (!this.disableTimer) {
+            const timer = this.service.getCharacteristic(this.hapChar.SetDuration).value
+            this.service.updateCharacteristic(this.hapChar.RemainingDuration, timer)
+            this.timer = setTimeout(() => {
+              this.service.setCharacteristic(this.hapChar.Active, 0)
+            }, timer * 1000)
+          }
           if (this.enableLogging) {
             this.log('[%s] %s [%s].', this.name, this.lang.curState, this.lang.valveYes)
           }
-          this.timer = setTimeout(() => {
-            this.service.setCharacteristic(this.hapChar.Active, 0)
-          }, timer * 1000)
           break
         }
       }
@@ -234,22 +251,26 @@ module.exports = class deviceValveOne {
         }
         if (newState === 'on') {
           if (this.service.getCharacteristic(this.hapChar.Active).value === 0) {
-            const timer = this.service.getCharacteristic(this.hapChar.SetDuration).value
             this.service.updateCharacteristic(this.hapChar.Active, 1)
             this.service.updateCharacteristic(this.hapChar.InUse, 1)
-            this.service.updateCharacteristic(this.hapChar.RemainingDuration, timer)
             if (params.updateSource && this.enableLogging) {
               this.log('[%s] %s [%s].', this.name, this.lang.curState, this.lang.valveYes)
             }
-            this.timer = setTimeout(() => {
-              this.service.setCharacteristic(this.hapChar.Active, 0)
-            }, timer * 1000)
+            if (!this.disableTimer) {
+              const timer = this.service.getCharacteristic(this.hapChar.SetDuration).value
+              this.service.updateCharacteristic(this.hapChar.RemainingDuration, timer)
+              this.timer = setTimeout(() => {
+                this.service.setCharacteristic(this.hapChar.Active, 0)
+              }, timer * 1000)
+            }
           }
         } else {
           this.service.updateCharacteristic(this.hapChar.Active, 0)
           this.service.updateCharacteristic(this.hapChar.InUse, 0)
-          this.service.updateCharacteristic(this.hapChar.RemainingDuration, 0)
-          clearTimeout(this.timer)
+          if (!this.disableTimer) {
+            this.service.updateCharacteristic(this.hapChar.RemainingDuration, 0)
+            clearTimeout(this.timer)
+          }
         }
       }
 
diff --git a/lib/device/simulation/valve-two.js b/lib/device/simulation/valve-two.js
index 2234b290..9d5f0b42 100644
--- a/lib/device/simulation/valve-two.js
+++ b/lib/device/simulation/valve-two.js
@@ -23,6 +23,7 @@ module.exports = class deviceValveTwo {
 
     // Set up custom variables for this device type
     const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
+    this.disableTimer = deviceConf && deviceConf.disableTimer
 
     // Set the correct logging variables for this accessory
     this.enableLogging = !platform.config.disableDeviceLogging
@@ -58,8 +59,10 @@ module.exports = class deviceValveTwo {
         valveService.updateCharacteristic(this.hapChar.Active, 0)
         valveService.updateCharacteristic(this.hapChar.InUse, 0)
         valveService.updateCharacteristic(this.hapChar.ValveType, 1)
-        valveService.updateCharacteristic(this.hapChar.SetDuration, 120)
-        valveService.addCharacteristic(this.hapChar.RemainingDuration)
+        if (!this.disableTimer) {
+          valveService.updateCharacteristic(this.hapChar.SetDuration, 120)
+          valveService.addCharacteristic(this.hapChar.RemainingDuration)
+        }
       }
 
       // Add Eve power characteristics
@@ -91,22 +94,35 @@ module.exports = class deviceValveTwo {
       }
 
       // Add the set handler to the valve set duration characteristic
-      valveService.getCharacteristic(this.hapChar.SetDuration).onSet(value => {
-        // Check if the valve is currently active
-        if (valveService.getCharacteristic(this.hapChar.InUse).value === 1) {
-          // Update the remaining duration characteristic with the new value
-          valveService.updateCharacteristic(this.hapChar.RemainingDuration, value)
-
-          // Clear any existing active timers
-          clearTimeout(valveService.timer)
-
-          // Set a new active timer with the new time amount
-          valveService.timer = setTimeout(
-            () => valveService.setCharacteristic(this.hapChar.Active, 0),
-            value * 1000
+      if (this.disableTimer) {
+        if (valveService.testCharacteristic(this.hapChar.SetDuration)) {
+          valveService.removeCharacteristic(
+            valveService.getCharacteristic(this.hapChar.SetDuration)
           )
         }
-      })
+        if (valveService.testCharacteristic(this.hapChar.RemainingDuration)) {
+          valveService.removeCharacteristic(
+            valveService.getCharacteristic(this.hapChar.RemainingDuration)
+          )
+        }
+      } else {
+        valveService.getCharacteristic(this.hapChar.SetDuration).onSet(value => {
+          // Check if the valve is currently active
+          if (valveService.getCharacteristic(this.hapChar.InUse).value === 1) {
+            // Update the remaining duration characteristic with the new value
+            valveService.updateCharacteristic(this.hapChar.RemainingDuration, value)
+
+            // Clear any existing active timers
+            clearTimeout(valveService.timer)
+
+            // Set a new active timer with the new time amount
+            valveService.timer = setTimeout(
+              () => valveService.setCharacteristic(this.hapChar.Active, 0),
+              value * 1000
+            )
+          }
+        })
+      }
     })
 
     // Set up an interval to get eWeLink to send power updates
@@ -124,6 +140,7 @@ module.exports = class deviceValveTwo {
 
     // Output the customised options to the log
     const opts = JSON.stringify({
+      disableTimer: this.disableTimer,
       logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
       showAs: 'valve_two'
     })
@@ -147,21 +164,25 @@ module.exports = class deviceValveTwo {
       valveService.updateCharacteristic(this.hapChar.InUse, value)
       switch (value) {
         case 0:
-          valveService.updateCharacteristic(this.hapChar.RemainingDuration, 0)
-          clearTimeout(this.accessory.getService(valve).timer)
+          if (!this.disableTimer) {
+            valveService.updateCharacteristic(this.hapChar.RemainingDuration, 0)
+            clearTimeout(this.accessory.getService(valve).timer)
+          }
           if (this.enableLogging) {
             this.log('[%s] [%s] %s [%s].', this.name, valve, this.lang.curState, this.lang.valveNo)
           }
           break
         case 1: {
-          const timer = valveService.getCharacteristic(this.hapChar.SetDuration).value
-          valveService.updateCharacteristic(this.hapChar.RemainingDuration, timer)
+          if (!this.disableTimer) {
+            const timer = valveService.getCharacteristic(this.hapChar.SetDuration).value
+            valveService.updateCharacteristic(this.hapChar.RemainingDuration, timer)
+            valveService.timer = setTimeout(() => {
+              valveService.setCharacteristic(this.hapChar.Active, 0)
+            }, timer * 1000)
+          }
           if (this.enableLogging) {
             this.log('[%s] [%s] %s [%s].', this.name, valve, this.lang.curState, this.lang.valveYes)
           }
-          valveService.timer = setTimeout(() => {
-            valveService.setCharacteristic(this.hapChar.Active, 0)
-          }, timer * 1000)
           break
         }
       }
@@ -199,10 +220,15 @@ module.exports = class deviceValveTwo {
           const valveService = this.accessory.getService('Valve ' + v)
           if (params.switches[k].switch === 'on') {
             if (valveService.getCharacteristic(this.hapChar.Active).value === 0) {
-              const timer = valveService.getCharacteristic(this.hapChar.SetDuration).value
               valveService.updateCharacteristic(this.hapChar.Active, 1)
               valveService.updateCharacteristic(this.hapChar.InUse, 1)
-              valveService.updateCharacteristic(this.hapChar.RemainingDuration, timer)
+              if (!this.disableTimer) {
+                const timer = valveService.getCharacteristic(this.hapChar.SetDuration).value
+                valveService.updateCharacteristic(this.hapChar.RemainingDuration, timer)
+                valveService.timer = setTimeout(() => {
+                  valveService.setCharacteristic(this.hapChar.Active, 0)
+                }, timer * 1000)
+              }
               if (params.updateSource && this.enableLogging) {
                 this.log(
                   '[%s] [Valve %s] %s [%s].',
@@ -212,16 +238,15 @@ module.exports = class deviceValveTwo {
                   this.lang.valveYes
                 )
               }
-              valveService.timer = setTimeout(() => {
-                valveService.setCharacteristic(this.hapChar.Active, 0)
-              }, timer * 1000)
             }
             return
           }
           valveService.updateCharacteristic(this.hapChar.Active, 0)
           valveService.updateCharacteristic(this.hapChar.InUse, 0)
-          valveService.updateCharacteristic(this.hapChar.RemainingDuration, 0)
-          clearTimeout(valveService.timer)
+          if (!this.disableTimer) {
+            valveService.updateCharacteristic(this.hapChar.RemainingDuration, 0)
+            clearTimeout(valveService.timer)
+          }
         })
       }
 
diff --git a/lib/index.js b/lib/index.js
index 99c169cc..53bdabd4 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -287,18 +287,7 @@ class eWeLinkPlatform {
                       }
                     }
                     break
-                  case 'hideChannels': {
-                    if (typeof v !== 'string' || v === '') {
-                      logIgnore(key + '.' + id + '.' + k)
-                    } else {
-                      const channels = v.split(',')
-                      channels.forEach(channel => {
-                        this.hideChannels.push(id + 'SW' + channel.replace(/[^0-9]+/g, ''))
-                        this.deviceConf[id][k] = v
-                      })
-                    }
-                    break
-                  }
+                  case 'disableTimer':
                   case 'hideLight':
                   case 'hideLongDouble':
                   case 'hideSensor':
@@ -314,6 +303,18 @@ class eWeLinkPlatform {
                     }
                     this.deviceConf[id][k] = v === 'false' ? false : !!v
                     break
+                  case 'hideChannels': {
+                    if (typeof v !== 'string' || v === '') {
+                      logIgnore(key + '.' + id + '.' + k)
+                    } else {
+                      const channels = v.split(',')
+                      channels.forEach(channel => {
+                        this.hideChannels.push(id + 'SW' + channel.replace(/[^0-9]+/g, ''))
+                        this.deviceConf[id][k] = v
+                      })
+                    }
+                    break
+                  }
                   case 'humidityOffset':
                   case 'offset': {
                     if (typeof v === 'string') {
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 19887f0e..b22bec93 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -91,6 +91,7 @@ module.exports = {
       'showAsMotor',
       'showAsEachen',
       'inUsePowerThreshold',
+      'disableTimer',
       'temperatureSource',
       'isInched',
       'operationTime',
@@ -111,6 +112,7 @@ module.exports = {
       'showAsMotor',
       'hideChannels',
       'inUsePowerThreshold',
+      'disableTimer',
       'inchChannels',
       'sensorType',
       'operationTime',

From 570a8d169fa50d6b66039b4027194add38b07fe3 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 27 Jan 2022 18:37:24 +0000
Subject: [PATCH 2931/3183] 8.11.3-beta.0

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 1bcedb71..80482bbc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.11.2",
+  "version": "8.11.3-beta.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.11.2",
+      "version": "8.11.3-beta.0",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index d6ef502d..28d0efcc 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.11.2",
+  "version": "8.11.3-beta.0",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From c306e61d7e7e8d605bec29f98f29330f1ec6eb53 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 27 Jan 2022 18:53:09 +0000
Subject: [PATCH 2932/3183] implement api state for more types

---
 lib/device/simulation/garage-eachen.js | 10 ++++++++++
 lib/device/simulation/switch-valve.js  | 12 ++++++++++++
 lib/device/zigbee/sensor-contact.js    |  9 +++++++++
 3 files changed, 31 insertions(+)

diff --git a/lib/device/simulation/garage-eachen.js b/lib/device/simulation/garage-eachen.js
index 1fbd61e1..60ea8322 100644
--- a/lib/device/simulation/garage-eachen.js
+++ b/lib/device/simulation/garage-eachen.js
@@ -219,6 +219,16 @@ module.exports = class deviceGarageEachen {
     }
   }
 
+  currentState () {
+    return {
+      services: ['garage'],
+      garage: {
+        target: this.service.getCharacteristic(this.hapChar.TargetDoorState).value,
+        state: this.service.getCharacteristic(this.hapChar.CurrentDoorState).value
+      }
+    }
+  }
+
   markStatus (isOnline) {
     this.isOnline = isOnline
   }
diff --git a/lib/device/simulation/switch-valve.js b/lib/device/simulation/switch-valve.js
index 3aaf8de2..4a096b3e 100644
--- a/lib/device/simulation/switch-valve.js
+++ b/lib/device/simulation/switch-valve.js
@@ -334,6 +334,18 @@ module.exports = class deviceSwitchValve {
     }
   }
 
+  currentState () {
+    return {
+      services: ['switch', 'valve'],
+      switch: {
+        state: this.sService.getCharacteristic(this.hapChar.On).value ? 'on' : 'off'
+      },
+      valve: {
+        state: this.vService.getCharacteristic(this.hapChar.Active).value === 1 ? 'on' : 'off'
+      }
+    }
+  }
+
   markStatus (isOnline) {
     this.isOnline = isOnline
   }
diff --git a/lib/device/zigbee/sensor-contact.js b/lib/device/zigbee/sensor-contact.js
index e76cbde1..dc7e62f8 100644
--- a/lib/device/zigbee/sensor-contact.js
+++ b/lib/device/zigbee/sensor-contact.js
@@ -128,4 +128,13 @@ module.exports = class deviceZBSensorContact {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
+
+  currentState () {
+    return {
+      services: ['contact'],
+      contact: {
+        state: this.service.getCharacteristic(this.hapChar.ContactSensorState).value
+      }
+    }
+  }
 }

From 7c75adc9b28ebeb140fa579e38252e7fcfc1bc32 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 27 Jan 2022 18:53:31 +0000
Subject: [PATCH 2933/3183] 8.11.3-beta.1

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 80482bbc..b01e3ee0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.11.3-beta.0",
+  "version": "8.11.3-beta.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.11.3-beta.0",
+      "version": "8.11.3-beta.1",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 28d0efcc..7ce91657 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.11.3-beta.0",
+  "version": "8.11.3-beta.1",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From a8e34eb4ad00b0d45e0c3a15fd47ca9b93fc789a Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 3 Feb 2022 20:30:00 +0000
Subject: [PATCH 2934/3183] add power info in internal api calls

---
 lib/device/outlet-single-inched.js | 11 ++++++++++-
 lib/device/outlet-single.js        | 11 ++++++++++-
 lib/device/switch-single-inched.js | 11 ++++++++++-
 lib/device/switch-single.js        | 11 ++++++++++-
 4 files changed, 40 insertions(+), 4 deletions(-)

diff --git a/lib/device/outlet-single-inched.js b/lib/device/outlet-single-inched.js
index 377c189b..0187b86e 100644
--- a/lib/device/outlet-single-inched.js
+++ b/lib/device/outlet-single-inched.js
@@ -388,7 +388,16 @@ module.exports = class deviceOutletSingleInched {
       try {
         toReturn.services.push('power')
         toReturn.power = {
-          state: await this.platform.sendDeviceUpdate(this.accessory, { hundredDaysKwh: 'get' })
+          state: await this.platform.sendDeviceUpdate(this.accessory, { hundredDaysKwh: 'get' }),
+          voltage: this.service.testCharacteristic(this.eveChar.Voltage)
+            ? this.service.getCharacteristic(this.eveChar.Voltage).value
+            : undefined,
+          power: this.service.testCharacteristic(this.eveChar.CurrentConsumption)
+            ? this.service.getCharacteristic(this.eveChar.CurrentConsumption).value
+            : undefined,
+          current: this.service.testCharacteristic(this.eveChar.ElectricCurrent)
+            ? this.service.getCharacteristic(this.eveChar.ElectricCurrent).value
+            : undefined
         }
       } catch (err) {
         // Suppress errors here
diff --git a/lib/device/outlet-single.js b/lib/device/outlet-single.js
index 54a6e0c9..5c4d5e2f 100644
--- a/lib/device/outlet-single.js
+++ b/lib/device/outlet-single.js
@@ -358,7 +358,16 @@ module.exports = class deviceOutletSingle {
       try {
         toReturn.services.push('power')
         toReturn.power = {
-          state: await this.platform.sendDeviceUpdate(this.accessory, { hundredDaysKwh: 'get' })
+          state: await this.platform.sendDeviceUpdate(this.accessory, { hundredDaysKwh: 'get' }),
+          voltage: this.service.testCharacteristic(this.eveChar.Voltage)
+            ? this.service.getCharacteristic(this.eveChar.Voltage).value
+            : undefined,
+          power: this.service.testCharacteristic(this.eveChar.CurrentConsumption)
+            ? this.service.getCharacteristic(this.eveChar.CurrentConsumption).value
+            : undefined,
+          current: this.service.testCharacteristic(this.eveChar.ElectricCurrent)
+            ? this.service.getCharacteristic(this.eveChar.ElectricCurrent).value
+            : undefined
         }
       } catch (err) {
         // Suppress errors here
diff --git a/lib/device/switch-single-inched.js b/lib/device/switch-single-inched.js
index d27996cc..38f5d1b5 100644
--- a/lib/device/switch-single-inched.js
+++ b/lib/device/switch-single-inched.js
@@ -314,7 +314,16 @@ module.exports = class deviceSwitchSingleInched {
       try {
         toReturn.services.push('power')
         toReturn.power = {
-          state: await this.platform.sendDeviceUpdate(this.accessory, { hundredDaysKwh: 'get' })
+          state: await this.platform.sendDeviceUpdate(this.accessory, { hundredDaysKwh: 'get' }),
+          voltage: this.service.testCharacteristic(this.eveChar.Voltage)
+            ? this.service.getCharacteristic(this.eveChar.Voltage).value
+            : undefined,
+          power: this.service.testCharacteristic(this.eveChar.CurrentConsumption)
+            ? this.service.getCharacteristic(this.eveChar.CurrentConsumption).value
+            : undefined,
+          current: this.service.testCharacteristic(this.eveChar.ElectricCurrent)
+            ? this.service.getCharacteristic(this.eveChar.ElectricCurrent).value
+            : undefined
         }
       } catch (err) {
         // Suppress errors here
diff --git a/lib/device/switch-single.js b/lib/device/switch-single.js
index 179bb671..f28b8052 100644
--- a/lib/device/switch-single.js
+++ b/lib/device/switch-single.js
@@ -282,7 +282,16 @@ module.exports = class deviceSwitchSingle {
       try {
         toReturn.services.push('power')
         toReturn.power = {
-          state: await this.platform.sendDeviceUpdate(this.accessory, { hundredDaysKwh: 'get' })
+          state: await this.platform.sendDeviceUpdate(this.accessory, { hundredDaysKwh: 'get' }),
+          voltage: this.service.testCharacteristic(this.eveChar.Voltage)
+            ? this.service.getCharacteristic(this.eveChar.Voltage).value
+            : undefined,
+          power: this.service.testCharacteristic(this.eveChar.CurrentConsumption)
+            ? this.service.getCharacteristic(this.eveChar.CurrentConsumption).value
+            : undefined,
+          current: this.service.testCharacteristic(this.eveChar.ElectricCurrent)
+            ? this.service.getCharacteristic(this.eveChar.ElectricCurrent).value
+            : undefined
         }
       } catch (err) {
         // Suppress errors here

From 1ae7ae4773e099b0accce73ed067daa2a8f0a31a Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 3 Feb 2022 20:30:38 +0000
Subject: [PATCH 2935/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9203a982..6905d7f3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@ All notable changes to homebridge-ewelink will be documented in this file.
 ### Added
 
 - Option to disable the timer for irrigation valve simulations
+- Power information to supported devices in internal API
 
 ### Changed
 

From a6c1456c35a8f05deea46c6c5d71d91246fbbade Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 3 Feb 2022 20:31:11 +0000
Subject: [PATCH 2936/3183] 8.11.3-beta.2

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b01e3ee0..f7771cf1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.11.3-beta.1",
+  "version": "8.11.3-beta.2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.11.3-beta.1",
+      "version": "8.11.3-beta.2",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 7ce91657..66906c74 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.11.3-beta.1",
+  "version": "8.11.3-beta.2",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From a4df51687abd90248c79ceff24bd85b1bd83032f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 8 Feb 2022 07:31:10 +0000
Subject: [PATCH 2937/3183] fix valve logging

---
 CHANGELOG.md                        |  1 +
 lib/device/simulation/valve-four.js | 10 ++++++++++
 lib/device/simulation/valve-one.js  |  4 ++++
 lib/device/simulation/valve-two.js  | 10 ++++++++++
 package-lock.json                   | 14 +++++++-------
 package.json                        |  2 +-
 6 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6905d7f3..437cc241 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@ All notable changes to homebridge-ewelink will be documented in this file.
 ### Changed
 
 - Bump `homebridge` recommended version to v1.4.0
+- Bump `ws` to v8.5.0
 
 ## 8.11.2 (2022-01-23)
 
diff --git a/lib/device/simulation/valve-four.js b/lib/device/simulation/valve-four.js
index ef111be2..f64d2111 100644
--- a/lib/device/simulation/valve-four.js
+++ b/lib/device/simulation/valve-four.js
@@ -210,6 +210,16 @@ module.exports = class deviceValveFour {
         if (!this.disableTimer) {
           valveService.updateCharacteristic(this.hapChar.RemainingDuration, 0)
           clearTimeout(valveService.timer)
+        } else {
+          if (params.updateSource && this.enableLogging) {
+            this.log(
+              '[%s] [Valve %s] %s [%s].',
+              this.name,
+              v,
+              this.lang.curState,
+              this.lang.valveNo
+            )
+          }
         }
       })
     } catch (err) {
diff --git a/lib/device/simulation/valve-one.js b/lib/device/simulation/valve-one.js
index d600d6ef..1a3fb328 100644
--- a/lib/device/simulation/valve-one.js
+++ b/lib/device/simulation/valve-one.js
@@ -270,6 +270,10 @@ module.exports = class deviceValveOne {
           if (!this.disableTimer) {
             this.service.updateCharacteristic(this.hapChar.RemainingDuration, 0)
             clearTimeout(this.timer)
+          } else {
+            if (params.updateSource && this.enableLogging) {
+              this.log('[%s] %s [%s].', this.name, this.lang.curState, this.lang.valveNo)
+            }
           }
         }
       }
diff --git a/lib/device/simulation/valve-two.js b/lib/device/simulation/valve-two.js
index 9d5f0b42..6be5f0b4 100644
--- a/lib/device/simulation/valve-two.js
+++ b/lib/device/simulation/valve-two.js
@@ -246,6 +246,16 @@ module.exports = class deviceValveTwo {
           if (!this.disableTimer) {
             valveService.updateCharacteristic(this.hapChar.RemainingDuration, 0)
             clearTimeout(valveService.timer)
+          } else {
+            if (params.updateSource && this.enableLogging) {
+              this.log(
+                '[%s] [Valve %s] %s [%s].',
+                this.name,
+                v,
+                this.lang.curState,
+                this.lang.valveNo
+              )
+            }
           }
         })
       }
diff --git a/package-lock.json b/package-lock.json
index f7771cf1..969a71a0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -32,7 +32,7 @@
         "node-persist": "^3.1.0",
         "p-queue": "^6.6.2",
         "websocket-as-promised": "^2.0.1",
-        "ws": "^8.4.2"
+        "ws": "^8.5.0"
       },
       "engines": {
         "homebridge": "^1.4.0",
@@ -569,9 +569,9 @@
       }
     },
     "node_modules/ws": {
-      "version": "8.4.2",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.4.2.tgz",
-      "integrity": "sha512-Kbk4Nxyq7/ZWqr/tarI9yIt/+iNNFOjBXEWgTb4ydaNHBNGgvf2QHbS9fdfsndfjFlFwEd4Al+mw83YkaD10ZA==",
+      "version": "8.5.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.5.0.tgz",
+      "integrity": "sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg==",
       "engines": {
         "node": ">=10.0.0"
       },
@@ -944,9 +944,9 @@
       }
     },
     "ws": {
-      "version": "8.4.2",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.4.2.tgz",
-      "integrity": "sha512-Kbk4Nxyq7/ZWqr/tarI9yIt/+iNNFOjBXEWgTb4ydaNHBNGgvf2QHbS9fdfsndfjFlFwEd4Al+mw83YkaD10ZA==",
+      "version": "8.5.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.5.0.tgz",
+      "integrity": "sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg==",
       "requires": {}
     }
   }
diff --git a/package.json b/package.json
index 66906c74..a8f193bb 100644
--- a/package.json
+++ b/package.json
@@ -59,7 +59,7 @@
     "node-persist": "^3.1.0",
     "p-queue": "^6.6.2",
     "websocket-as-promised": "^2.0.1",
-    "ws": "^8.4.2"
+    "ws": "^8.5.0"
   },
   "prettier": {
     "printWidth": 100

From bb3f06ae7f28e2909340c9140c1ae76176ee49f8 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 8 Feb 2022 07:31:35 +0000
Subject: [PATCH 2938/3183] 8.11.3-beta.3

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 969a71a0..6a2d9dff 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.11.3-beta.2",
+  "version": "8.11.3-beta.3",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.11.3-beta.2",
+      "version": "8.11.3-beta.3",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index a8f193bb..52c920e1 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.11.3-beta.2",
+  "version": "8.11.3-beta.3",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From 847ef665e39bb0d98c9cb485edaf093da266c4a6 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 8 Feb 2022 08:23:32 +0000
Subject: [PATCH 2939/3183] Update valve-one.js

---
 lib/device/simulation/valve-one.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/lib/device/simulation/valve-one.js b/lib/device/simulation/valve-one.js
index 1a3fb328..e91e7e7b 100644
--- a/lib/device/simulation/valve-one.js
+++ b/lib/device/simulation/valve-one.js
@@ -327,6 +327,15 @@ module.exports = class deviceValveOne {
     }
   }
 
+  currentState () {
+    return {
+      services: ['valve'],
+      valve: {
+        state: this.service.getCharacteristic(this.hapChar.Active).value === 1 ? 'on' : 'off'
+      }
+    }
+  }
+
   markStatus (isOnline) {
     this.isOnline = isOnline
   }

From 9ef9c2de83e7fff68960639999cdf487eb7ff15f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 8 Feb 2022 08:24:07 +0000
Subject: [PATCH 2940/3183] Update tap-one.js

---
 lib/device/simulation/tap-one.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/lib/device/simulation/tap-one.js b/lib/device/simulation/tap-one.js
index 0141e45d..14b741d3 100644
--- a/lib/device/simulation/tap-one.js
+++ b/lib/device/simulation/tap-one.js
@@ -267,6 +267,15 @@ module.exports = class deviceTapOne {
     }
   }
 
+  currentState () {
+    return {
+      services: ['valve'],
+      valve: {
+        state: this.service.getCharacteristic(this.hapChar.Active).value === 1 ? 'on' : 'off'
+      }
+    }
+  }
+
   markStatus (isOnline) {
     this.isOnline = isOnline
   }

From 2c0e38459ed63234d12cbff2b68cb8e0d9349da9 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 8 Feb 2022 08:24:35 +0000
Subject: [PATCH 2941/3183] 8.11.3-beta.4

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 6a2d9dff..e477e6ee 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.11.3-beta.3",
+  "version": "8.11.3-beta.4",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.11.3-beta.3",
+      "version": "8.11.3-beta.4",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 52c920e1..fb9fa604 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.11.3-beta.3",
+  "version": "8.11.3-beta.4",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From 578c59c0b45fda4548ab3b8c38c0ff3794fdbac4 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 12 Feb 2022 11:06:17 +0000
Subject: [PATCH 2942/3183] update node versions

---
 CHANGELOG.md      |  1 +
 package-lock.json | 14 +++++++-------
 package.json      |  2 +-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 437cc241..10b2e69f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ All notable changes to homebridge-ewelink will be documented in this file.
 
 ### Changed
 
+- Bump `node` recommended versions to v14.19.0 or v16.14.0
 - Bump `homebridge` recommended version to v1.4.0
 - Bump `ws` to v8.5.0
 
diff --git a/package-lock.json b/package-lock.json
index e477e6ee..0605e149 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -36,7 +36,7 @@
       },
       "engines": {
         "homebridge": "^1.4.0",
-        "node": "^14.18.3 || ^16.13.2"
+        "node": "^14.19.0 || ^16.14.0"
       }
     },
     "node_modules/@homebridge/plugin-ui-utils": {
@@ -135,9 +135,9 @@
       "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="
     },
     "node_modules/follow-redirects": {
-      "version": "1.14.7",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.7.tgz",
-      "integrity": "sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ==",
+      "version": "1.14.8",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.8.tgz",
+      "integrity": "sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA==",
       "funding": [
         {
           "type": "individual",
@@ -668,9 +668,9 @@
       "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="
     },
     "follow-redirects": {
-      "version": "1.14.7",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.7.tgz",
-      "integrity": "sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ=="
+      "version": "1.14.8",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.8.tgz",
+      "integrity": "sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA=="
     },
     "function-bind": {
       "version": "1.1.1",
diff --git a/package.json b/package.json
index fb9fa604..34d27855 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,7 @@
   "main": "lib/index.js",
   "engines": {
     "homebridge": "^1.4.0",
-    "node": "^14.18.3 || ^16.13.2"
+    "node": "^14.19.0 || ^16.14.0"
   },
   "repository": {
     "type": "git",

From cba8fdbf0b9af6d3a4abe80e6796919a7cc9e232 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 12 Feb 2022 11:15:48 +0000
Subject: [PATCH 2943/3183] valve disable timer fix

---
 lib/device/simulation/valve-four.js | 32 +++++++++++++++--------------
 lib/device/simulation/valve-one.js  | 18 ++++++++--------
 lib/device/simulation/valve-two.js  | 32 +++++++++++++++--------------
 3 files changed, 44 insertions(+), 38 deletions(-)

diff --git a/lib/device/simulation/valve-four.js b/lib/device/simulation/valve-four.js
index f64d2111..98eb1b9a 100644
--- a/lib/device/simulation/valve-four.js
+++ b/lib/device/simulation/valve-four.js
@@ -203,22 +203,24 @@ module.exports = class deviceValveFour {
               )
             }
           }
-          return
-        }
-        valveService.updateCharacteristic(this.hapChar.Active, 0)
-        valveService.updateCharacteristic(this.hapChar.InUse, 0)
-        if (!this.disableTimer) {
-          valveService.updateCharacteristic(this.hapChar.RemainingDuration, 0)
-          clearTimeout(valveService.timer)
         } else {
-          if (params.updateSource && this.enableLogging) {
-            this.log(
-              '[%s] [Valve %s] %s [%s].',
-              this.name,
-              v,
-              this.lang.curState,
-              this.lang.valveNo
-            )
+          if (valveService.getCharacteristic(this.hapChar.Active).value === 1) {
+            valveService.updateCharacteristic(this.hapChar.Active, 0)
+            valveService.updateCharacteristic(this.hapChar.InUse, 0)
+            if (!this.disableTimer) {
+              valveService.updateCharacteristic(this.hapChar.RemainingDuration, 0)
+              clearTimeout(valveService.timer)
+            } else {
+              if (params.updateSource && this.enableLogging) {
+                this.log(
+                  '[%s] [Valve %s] %s [%s].',
+                  this.name,
+                  v,
+                  this.lang.curState,
+                  this.lang.valveNo
+                )
+              }
+            }
           }
         }
       })
diff --git a/lib/device/simulation/valve-one.js b/lib/device/simulation/valve-one.js
index e91e7e7b..a96640e1 100644
--- a/lib/device/simulation/valve-one.js
+++ b/lib/device/simulation/valve-one.js
@@ -265,14 +265,16 @@ module.exports = class deviceValveOne {
             }
           }
         } else {
-          this.service.updateCharacteristic(this.hapChar.Active, 0)
-          this.service.updateCharacteristic(this.hapChar.InUse, 0)
-          if (!this.disableTimer) {
-            this.service.updateCharacteristic(this.hapChar.RemainingDuration, 0)
-            clearTimeout(this.timer)
-          } else {
-            if (params.updateSource && this.enableLogging) {
-              this.log('[%s] %s [%s].', this.name, this.lang.curState, this.lang.valveNo)
+          if (this.service.getCharacteristic(this.hapChar.Active).value === 1) {
+            this.service.updateCharacteristic(this.hapChar.Active, 0)
+            this.service.updateCharacteristic(this.hapChar.InUse, 0)
+            if (!this.disableTimer) {
+              this.service.updateCharacteristic(this.hapChar.RemainingDuration, 0)
+              clearTimeout(this.timer)
+            } else {
+              if (params.updateSource && this.enableLogging) {
+                this.log('[%s] %s [%s].', this.name, this.lang.curState, this.lang.valveNo)
+              }
             }
           }
         }
diff --git a/lib/device/simulation/valve-two.js b/lib/device/simulation/valve-two.js
index 6be5f0b4..2b95b26f 100644
--- a/lib/device/simulation/valve-two.js
+++ b/lib/device/simulation/valve-two.js
@@ -239,22 +239,24 @@ module.exports = class deviceValveTwo {
                 )
               }
             }
-            return
-          }
-          valveService.updateCharacteristic(this.hapChar.Active, 0)
-          valveService.updateCharacteristic(this.hapChar.InUse, 0)
-          if (!this.disableTimer) {
-            valveService.updateCharacteristic(this.hapChar.RemainingDuration, 0)
-            clearTimeout(valveService.timer)
           } else {
-            if (params.updateSource && this.enableLogging) {
-              this.log(
-                '[%s] [Valve %s] %s [%s].',
-                this.name,
-                v,
-                this.lang.curState,
-                this.lang.valveNo
-              )
+            if (valveService.getCharacteristic(this.hapChar.Active).value === 1) {
+              valveService.updateCharacteristic(this.hapChar.Active, 0)
+              valveService.updateCharacteristic(this.hapChar.InUse, 0)
+              if (!this.disableTimer) {
+                valveService.updateCharacteristic(this.hapChar.RemainingDuration, 0)
+                clearTimeout(valveService.timer)
+              } else {
+                if (params.updateSource && this.enableLogging) {
+                  this.log(
+                    '[%s] [Valve %s] %s [%s].',
+                    this.name,
+                    v,
+                    this.lang.curState,
+                    this.lang.valveNo
+                  )
+                }
+              }
             }
           }
         })

From a873e0d03d0436471354a84459101a0d9f1772de Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 12 Feb 2022 11:54:29 +0000
Subject: [PATCH 2944/3183] add targetTempThreshold for TH-heater, see #346

---
 CHANGELOG.md                       |  1 +
 config.schema.json                 | 10 ++++++++++
 lib/device/simulation/th-heater.js | 25 ++++++++++++++++++-------
 lib/index.js                       |  3 ++-
 lib/utils/constants.js             |  7 +++++--
 5 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 10b2e69f..fb6e9fce 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@ All notable changes to homebridge-ewelink will be documented in this file.
 
 - Option to disable the timer for irrigation valve simulations
 - Power information to supported devices in internal API
+- Target temperature threshold for TH-heater simulation, see #346
 
 ### Changed
 
diff --git a/config.schema.json b/config.schema.json
index 26ae7b62..007d1d66 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -1098,6 +1098,15 @@
                 "functionBody": "return (model.thDevices && model.thDevices[arrayIndices] && ['th', 'sc', 'hc'].includes(model.thDevices[arrayIndices].deviceModel) && model.thDevices[arrayIndices].humidityOffset && !model.thDevices[arrayIndices].ignoreDevice);"
               }
             },
+            "targetTempThreshold": {
+              "type": "number",
+              "title": "Target Temperature Threshold",
+              "description": "You can add a threshold so the device only switches on when the current temperature is at least the threshold away from the target temperature. This can be useful for devices that don't require an exact temperature and you want to reduce the on-off cycles. Must be positive and can include a decimal point.",
+              "placeholder": 0,
+              "condition": {
+                "functionBody": "return (model.thDevices && model.thDevices[arrayIndices] && ['th', 'sc', 'hc', 'panel'].includes(model.thDevices[arrayIndices].deviceModel) && ['heater'].includes(model.thDevices[arrayIndices].showAs) && !model.thDevices[arrayIndices].ignoreDevice);"
+              }
+            },
             "minTarget": {
               "type": "integer",
               "title": "Minimum Target Temperature",
@@ -1808,6 +1817,7 @@
             "thDevices[].offsetFactor",
             "thDevices[].humidityOffset",
             "thDevices[].humidityOffsetFactor",
+            "thDevices[].targetTempThreshold",
             "thDevices[].minTarget",
             "thDevices[].maxTarget",
             "thDevices[].ipAddress",
diff --git a/lib/device/simulation/th-heater.js b/lib/device/simulation/th-heater.js
index c034dd26..a876307b 100644
--- a/lib/device/simulation/th-heater.js
+++ b/lib/device/simulation/th-heater.js
@@ -25,6 +25,10 @@ module.exports = class deviceTHHeater {
     this.tempOffset =
       deviceConf && deviceConf.offset ? deviceConf.offset : platform.consts.defaultValues.offset
     this.tempOffsetFactor = deviceConf && deviceConf.offsetFactor
+    this.targetTempThreshold =
+      deviceConf && deviceConf.targetTempThreshold
+        ? deviceConf.targetTempThreshold
+        : platform.consts.defaultValues.targetTempThreshold
     this.humiOffset =
       deviceConf && deviceConf.humidityOffset
         ? parseInt(deviceConf.humidityOffset)
@@ -221,7 +225,8 @@ module.exports = class deviceTHHeater {
       minTarget: this.minTarget,
       offset: this.tempOffset,
       offsetFactor: this.tempOffsetFactor,
-      showAs: 'heater'
+      showAs: 'heater',
+      targetTempThreshold: this.targetTempThreshold
     })
     this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
@@ -237,16 +242,18 @@ module.exports = class deviceTHHeater {
         newState = 'off'
         newHeat = 'off'
       } else {
-        if (this.cacheTemp < this.accessory.context.cacheTarget) {
+        if (this.cacheTemp < this.accessory.context.cacheTarget - this.targetTempThreshold) {
           params.mainSwitch = 'on'
           params.switch = 'on'
           newState = 'on'
           newHeat = 'on'
-        } else {
+        } else if (this.cacheTemp >= this.accessory.context.cacheTarget) {
           params.mainSwitch = 'off'
           params.switch = 'off'
           newState = 'on'
           newHeat = 'off'
+        } else {
+          return
         }
       }
 
@@ -295,14 +302,16 @@ module.exports = class deviceTHHeater {
       }
       const params = { deviceType: 'normal' }
       let newHeat
-      if (this.cacheTemp < value) {
+      if (this.cacheTemp < value - this.targetTempThreshold) {
         params.mainSwitch = 'on'
         params.switch = 'on'
         newHeat = 'on'
-      } else {
+      } else if (this.cacheTemp >= value) {
         params.mainSwitch = 'off'
         params.switch = 'off'
         newHeat = 'off'
+      } else {
+        return
       }
       if (newHeat === this.cacheHeat) {
         return
@@ -335,14 +344,16 @@ module.exports = class deviceTHHeater {
       }
       const params = { deviceType: 'normal' }
       let newHeat
-      if (this.cacheTemp < this.accessory.context.cacheTarget) {
+      if (this.cacheTemp < this.accessory.context.cacheTarget - this.targetTempThreshold) {
         params.mainSwitch = 'on'
         params.switch = 'on'
         newHeat = 'on'
-      } else {
+      } else if (this.cacheTemp >= this.accessory.context.cacheTarget) {
         params.mainSwitch = 'off'
         params.switch = 'off'
         newHeat = 'off'
+      } else {
+        return
       }
       if (newHeat === this.cacheHeat) {
         return
diff --git a/lib/index.js b/lib/index.js
index 53bdabd4..5901df48 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -316,7 +316,8 @@ class eWeLinkPlatform {
                     break
                   }
                   case 'humidityOffset':
-                  case 'offset': {
+                  case 'offset':
+                  case 'targetTempThreshold': {
                     if (typeof v === 'string') {
                       logQuotes(key + '.' + id + '.' + k)
                     }
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index b22bec93..3d824b9e 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -49,7 +49,8 @@ module.exports = {
     sensorTimeDifference: 60,
     sensorTimeLength: 60,
     showAs: 'default',
-    showAsMotor: 'blind'
+    showAsMotor: 'blind',
+    targetTempThreshold: 0
   },
 
   minValues: {
@@ -63,7 +64,8 @@ module.exports = {
     operationTime: 20,
     operationTimeDown: 20,
     sensorTimeDifference: 5,
-    sensorTimeLength: 1
+    sensorTimeLength: 1,
+    targetTempThreshold: 0
   },
 
   appId: 'oeVkj2lYFGnJu5XUtWisfW4utiN4u9Mq',
@@ -145,6 +147,7 @@ module.exports = {
       'offsetFactor',
       'humidityOffset',
       'humidityOffsetFactor',
+      'targetTempThreshold',
       'minTarget',
       'maxTarget',
       'ipAddress',

From 1d082bd17d7a48b318476a566f8c5fb92e097f4d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 12 Feb 2022 11:54:37 +0000
Subject: [PATCH 2945/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fb6e9fce..88e92451 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 All notable changes to homebridge-ewelink will be documented in this file.
 
-## BETA
+## 8.12.0
 
 ### Added
 

From 935522ae0ed40afb1fe5f44daad9ec4e81e27ab2 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 12 Feb 2022 11:55:05 +0000
Subject: [PATCH 2946/3183] 8.12.0

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 0605e149..cdec14da 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.11.3-beta.4",
+  "version": "8.12.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.11.3-beta.4",
+      "version": "8.12.0",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 34d27855..6109b88c 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.11.3-beta.4",
+  "version": "8.12.0",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From e5926eb232aced3e5d3035fc950692f15c2cf12d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 12 Feb 2022 11:55:36 +0000
Subject: [PATCH 2947/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 88e92451..8f2103a9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 All notable changes to homebridge-ewelink will be documented in this file.
 
-## 8.12.0
+## 8.12.0 (2022-02-12)
 
 ### Added
 

From 77b6875018760743c12f86b658f4479f0e34f045 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 13 Feb 2022 16:45:59 +0000
Subject: [PATCH 2948/3183] bump axios

---
 CHANGELOG.md      |  6 ++++++
 package-lock.json | 18 +++++++++---------
 package.json      |  2 +-
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8f2103a9..c375126e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 All notable changes to homebridge-ewelink will be documented in this file.
 
+## BETA
+
+### Changed
+
+- Bump `axios` to v0.26.0
+
 ## 8.12.0 (2022-02-12)
 
 ### Added
diff --git a/package-lock.json b/package-lock.json
index cdec14da..c93b5d12 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -28,7 +28,7 @@
       "license": "MIT",
       "dependencies": {
         "@homebridge/plugin-ui-utils": "^0.0.19",
-        "axios": "^0.25.0",
+        "axios": "^0.26.0",
         "node-persist": "^3.1.0",
         "p-queue": "^6.6.2",
         "websocket-as-promised": "^2.0.1",
@@ -45,11 +45,11 @@
       "integrity": "sha512-axFX7lN2Yd7bz/6SlD7dzq5sY/N9+XYuLHPukuiyHQRDtNMRL1uDqJhOx6RVaN2tYDHB75h7YxRQWP7U44Mgzg=="
     },
     "node_modules/axios": {
-      "version": "0.25.0",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-0.25.0.tgz",
-      "integrity": "sha512-cD8FOb0tRH3uuEe6+evtAbgJtfxr7ly3fQjYcMcuPlgkwVS9xboaVIpcDV+cYQe+yGykgwZCs1pzjntcGa6l5g==",
+      "version": "0.26.0",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-0.26.0.tgz",
+      "integrity": "sha512-lKoGLMYtHvFrPVt3r+RBMp9nh34N0M8zEfCWqdWZx6phynIEhQqAdydpyBAAG211zlhX9Rgu08cOamy6XjE5Og==",
       "dependencies": {
-        "follow-redirects": "^1.14.7"
+        "follow-redirects": "^1.14.8"
       }
     },
     "node_modules/call-bind": {
@@ -596,11 +596,11 @@
       "integrity": "sha512-axFX7lN2Yd7bz/6SlD7dzq5sY/N9+XYuLHPukuiyHQRDtNMRL1uDqJhOx6RVaN2tYDHB75h7YxRQWP7U44Mgzg=="
     },
     "axios": {
-      "version": "0.25.0",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-0.25.0.tgz",
-      "integrity": "sha512-cD8FOb0tRH3uuEe6+evtAbgJtfxr7ly3fQjYcMcuPlgkwVS9xboaVIpcDV+cYQe+yGykgwZCs1pzjntcGa6l5g==",
+      "version": "0.26.0",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-0.26.0.tgz",
+      "integrity": "sha512-lKoGLMYtHvFrPVt3r+RBMp9nh34N0M8zEfCWqdWZx6phynIEhQqAdydpyBAAG211zlhX9Rgu08cOamy6XjE5Og==",
       "requires": {
-        "follow-redirects": "^1.14.7"
+        "follow-redirects": "^1.14.8"
       }
     },
     "call-bind": {
diff --git a/package.json b/package.json
index 6109b88c..e12ccacc 100644
--- a/package.json
+++ b/package.json
@@ -55,7 +55,7 @@
   ],
   "dependencies": {
     "@homebridge/plugin-ui-utils": "^0.0.19",
-    "axios": "^0.25.0",
+    "axios": "^0.26.0",
     "node-persist": "^3.1.0",
     "p-queue": "^6.6.2",
     "websocket-as-promised": "^2.0.1",

From 25f7eaa732a6fd0ddc66c45393fe259753b0b3fd Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 14 Feb 2022 21:00:23 +0000
Subject: [PATCH 2949/3183] [test] support dualr3 lite

---
 CHANGELOG.md           |  4 ++++
 lib/connection/lan.js  |  5 ++++-
 lib/index.js           | 10 +++++++---
 lib/utils/constants.js |  6 ++++--
 4 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c375126e..2c71d49a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to homebridge-ewelink will be documented in this file.
 
 ## BETA
 
+### Added
+
+- Support DUALR3 Lite
+
 ### Changed
 
 - Bump `axios` to v0.26.0
diff --git a/lib/connection/lan.js b/lib/connection/lan.js
index ccf66fcd..6d97aeab 100644
--- a/lib/connection/lan.js
+++ b/lib/connection/lan.js
@@ -217,7 +217,10 @@ module.exports = class connectionLAN {
           }
         }
         suffix = 'switch'
-      } else if (this.funcs.hasProperty(json.params, 'location') && deviceInfo.uiid === 126) {
+      } else if (
+        this.funcs.hasProperty(json.params, 'location') &&
+        this.consts.devices.switchMultiPower.includes(deviceInfo.uiid)
+      ) {
         // Use hasProperty has location can be INT 0
         params.location = json.params.location
         suffix = 'location'
diff --git a/lib/index.js b/lib/index.js
index 5901df48..3f028c96 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -695,7 +695,8 @@ class eWeLinkPlatform {
       // Remove old sub accessories for Accessory Simulations and DUALR3 in motor/meter mode
       if (
         device.showAs !== 'default' ||
-        (uiid === 126 && [2, 3].includes(device.params.workMode))
+        (this.consts.devices.switchMultiPower.includes(uiid) &&
+          [2, 3].includes(device.params.workMode))
       ) {
         for (let i = 0; i <= 4; i++) {
           const uuidsub = this.api.hap.uuid.generate(device.deviceid + 'SW' + i)
@@ -706,7 +707,7 @@ class eWeLinkPlatform {
       }
 
       // Set up the correct instance for this particular device
-      if (uiid === 126 && device.params.workMode === 2) {
+      if (this.consts.devices.switchMultiPower.includes(uiid) && device.params.workMode === 2) {
         /*************************
         BLINDS [DUALR3 MOTOR MODE]
         *************************/
@@ -722,7 +723,10 @@ class eWeLinkPlatform {
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/motor'))(this, accessory)
         /************************/
-      } else if (uiid === 126 && device.params.workMode === 3) {
+      } else if (
+        this.consts.devices.switchMultiPower.includes(uiid) &&
+        device.params.workMode === 3
+      ) {
         /*************************
         BLINDS [DUALR3 METER MODE]
         *************************/
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 3d824b9e..f6226255 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -282,7 +282,8 @@ module.exports = {
       133,
       160,
       161,
-      162
+      162,
+      165
     ],
     switchSingle: [1, 6, 14, 24, 27, 1009, 1256, 7004],
     switchSCM: [77, 78, 81, 107, 112, 138, 160],
@@ -312,7 +313,7 @@ module.exports = {
       3256,
       4256
     ],
-    switchMultiPower: [126],
+    switchMultiPower: [126, 165],
     lightDimmer: [36, 44, 57],
     lightRGB: [22],
     lightCCT: [103],
@@ -463,6 +464,7 @@ module.exports = {
     160: 1, // "SwitchMan Smart Wall Switch-M5 - 1 Gang"
     161: 2, // "SwitchMan Smart Wall Switch-M5 - 2 Gang"
     162: 3, // "SwitchMan Smart Wall Switch-M5 - 3 Gang"
+    165: 2, // "DUALR3 Lite"
     1000: 1, // "zigbee_ON_OFF_SWITCH_1000" (button device)
     1009: 1, // "" (Some sort of single switch device)
     1256: 1, // "ZIGBEE_SINGLE_SWITCH"

From 3cde4f0ab3487ef33ca55aee2b87ad84f55a3232 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 14 Feb 2022 21:01:01 +0000
Subject: [PATCH 2950/3183] 8.12.1-beta.0

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c93b5d12..2360de91 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.12.0",
+  "version": "8.12.1-beta.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.12.0",
+      "version": "8.12.1-beta.0",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index e12ccacc..e5e76bbd 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.12.0",
+  "version": "8.12.1-beta.0",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From 6d53fed59c398890a1edfaa94a734e782b117250 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 16 Feb 2022 22:43:11 +0000
Subject: [PATCH 2951/3183] api add switch state

---
 lib/device/sensor-ambient.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/device/sensor-ambient.js b/lib/device/sensor-ambient.js
index 44f855d1..32f201bd 100644
--- a/lib/device/sensor-ambient.js
+++ b/lib/device/sensor-ambient.js
@@ -298,7 +298,10 @@ module.exports = class deviceSensorAmbient {
 
   currentState () {
     const toReturn = {}
-    toReturn.services = ['temperature']
+    toReturn.services = ['switch', 'temperature']
+    toReturn.switch = {
+      state: this.cacheState
+    }
     toReturn.temperature = {
       current: this.tempService.getCharacteristic(this.hapChar.CurrentTemperature).value
     }

From c0dfa301549f4dfc9e4cd2f1afce75ef4dadb1b6 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 16 Feb 2022 22:57:48 +0000
Subject: [PATCH 2952/3183] fix target + currents in th sims

---
 lib/device/simulation/cooler.js          | 2 +-
 lib/device/simulation/heater.js          | 2 +-
 lib/device/simulation/th-cooler.js       | 2 +-
 lib/device/simulation/th-dehumidifier.js | 2 +-
 lib/device/simulation/th-heater.js       | 2 +-
 lib/device/simulation/th-humidifier.js   | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/device/simulation/cooler.js b/lib/device/simulation/cooler.js
index 06e026bc..2cf9d1b9 100644
--- a/lib/device/simulation/cooler.js
+++ b/lib/device/simulation/cooler.js
@@ -132,7 +132,7 @@ module.exports = class deviceCooler {
     this.cacheState = this.service.getCharacteristic(this.hapChar.Active).value === 1 ? 'on' : 'off'
     this.cacheCool =
       this.cacheState === 'on' &&
-      this.service.getCharacteristic(this.hapChar.TargetHeaterCoolerState).value === 3
+      this.service.getCharacteristic(this.hapChar.CurrentHeaterCoolerState).value === 3
         ? 'on'
         : 'off'
 
diff --git a/lib/device/simulation/heater.js b/lib/device/simulation/heater.js
index dd2dba12..27cb8262 100644
--- a/lib/device/simulation/heater.js
+++ b/lib/device/simulation/heater.js
@@ -132,7 +132,7 @@ module.exports = class deviceHeater {
     this.cacheState = this.service.getCharacteristic(this.hapChar.Active).value === 1 ? 'on' : 'off'
     this.cacheHeat =
       this.cacheState === 'on' &&
-      this.service.getCharacteristic(this.hapChar.TargetHeaterCoolerState).value === 2
+      this.service.getCharacteristic(this.hapChar.CurrentHeaterCoolerState).value === 2
         ? 'on'
         : 'off'
 
diff --git a/lib/device/simulation/th-cooler.js b/lib/device/simulation/th-cooler.js
index 58efbe6e..51dc179e 100644
--- a/lib/device/simulation/th-cooler.js
+++ b/lib/device/simulation/th-cooler.js
@@ -192,7 +192,7 @@ module.exports = class deviceTHCooler {
     this.cacheState = this.service.getCharacteristic(this.hapChar.Active).value === 1 ? 'on' : 'off'
     this.cacheCool =
       this.cacheState === 'on' &&
-      this.service.getCharacteristic(this.hapChar.TargetHeaterCoolerState).value === 3
+      this.service.getCharacteristic(this.hapChar.CurrentHeaterCoolerState).value === 3
         ? 'on'
         : 'off'
 
diff --git a/lib/device/simulation/th-dehumidifier.js b/lib/device/simulation/th-dehumidifier.js
index f4be527d..5270b5f7 100644
--- a/lib/device/simulation/th-dehumidifier.js
+++ b/lib/device/simulation/th-dehumidifier.js
@@ -175,7 +175,7 @@ module.exports = class deviceTHDehumidifier {
     this.cacheState = this.service.getCharacteristic(this.hapChar.Active).value === 1 ? 'on' : 'off'
     this.cacheHumid =
       this.cacheState === 'on' &&
-      this.service.getCharacteristic(this.hapChar.TargetHumidifierDehumidifierState).value === 3
+      this.service.getCharacteristic(this.hapChar.CurrentHumidifierDehumidifierState).value === 3
         ? 'on'
         : 'off'
 
diff --git a/lib/device/simulation/th-heater.js b/lib/device/simulation/th-heater.js
index a876307b..14dd03cb 100644
--- a/lib/device/simulation/th-heater.js
+++ b/lib/device/simulation/th-heater.js
@@ -194,7 +194,7 @@ module.exports = class deviceTHHeater {
     this.cacheState = this.service.getCharacteristic(this.hapChar.Active).value === 1 ? 'on' : 'off'
     this.cacheHeat =
       this.cacheState === 'on' &&
-      this.service.getCharacteristic(this.hapChar.TargetHeaterCoolerState).value === 2
+      this.service.getCharacteristic(this.hapChar.CurrentHeaterCoolerState).value === 2
         ? 'on'
         : 'off'
 
diff --git a/lib/device/simulation/th-humidifier.js b/lib/device/simulation/th-humidifier.js
index 65b0c069..970ec65b 100644
--- a/lib/device/simulation/th-humidifier.js
+++ b/lib/device/simulation/th-humidifier.js
@@ -175,7 +175,7 @@ module.exports = class deviceTHHumidifier {
     this.cacheState = this.service.getCharacteristic(this.hapChar.Active).value === 1 ? 'on' : 'off'
     this.cacheHumid =
       this.cacheState === 'on' &&
-      this.service.getCharacteristic(this.hapChar.TargetHumidifierDehumidifierState).value === 2
+      this.service.getCharacteristic(this.hapChar.CurrentHumidifierDehumidifierState).value === 2
         ? 'on'
         : 'off'
 

From 49536a511c94c87ea3d71bd086bb76327497fc7f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 16 Feb 2022 22:58:27 +0000
Subject: [PATCH 2953/3183] 8.12.1-beta.1

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 2360de91..be68c71e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.12.1-beta.0",
+  "version": "8.12.1-beta.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.12.1-beta.0",
+      "version": "8.12.1-beta.1",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index e5e76bbd..bbf2abe8 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.12.1-beta.0",
+  "version": "8.12.1-beta.1",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From b39b5b35644b816bc4a81fe6191ae700aff9cfd3 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 23 Feb 2022 07:09:31 +0000
Subject: [PATCH 2954/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2c71d49a..be803dae 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 All notable changes to homebridge-ewelink will be documented in this file.
 
-## BETA
+## 8.13.0 (2022-02-23)
 
 ### Added
 

From 97926113fa06a9222f5fdb6dfce0aaadfa0b08a8 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 23 Feb 2022 07:09:33 +0000
Subject: [PATCH 2955/3183] Update package-lock.json

---
 package-lock.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index be68c71e..995a2568 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -135,9 +135,9 @@
       "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="
     },
     "node_modules/follow-redirects": {
-      "version": "1.14.8",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.8.tgz",
-      "integrity": "sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA==",
+      "version": "1.14.9",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.9.tgz",
+      "integrity": "sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w==",
       "funding": [
         {
           "type": "individual",
@@ -668,9 +668,9 @@
       "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="
     },
     "follow-redirects": {
-      "version": "1.14.8",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.8.tgz",
-      "integrity": "sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA=="
+      "version": "1.14.9",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.9.tgz",
+      "integrity": "sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w=="
     },
     "function-bind": {
       "version": "1.1.1",

From a85cfd76cb033d1b51db9855a0de84180463f6f0 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 23 Feb 2022 07:09:56 +0000
Subject: [PATCH 2956/3183] 8.13.0

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 995a2568..0da77c40 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.12.1-beta.1",
+  "version": "8.13.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.12.1-beta.1",
+      "version": "8.13.0",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index bbf2abe8..ce6def27 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.12.1-beta.1",
+  "version": "8.13.0",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From 0491a7d8c21a69abfdfa635504d01133effc8794 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 27 Feb 2022 08:21:53 +0000
Subject: [PATCH 2957/3183] update builds for node and increase issue closure
 periods

---
 .github/no-response.yml     | 2 +-
 .github/stale.yml           | 4 ++--
 .github/workflows/build.yml | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/no-response.yml b/.github/no-response.yml
index 4523097f..6bf04292 100644
--- a/.github/no-response.yml
+++ b/.github/no-response.yml
@@ -1,5 +1,5 @@
 # Number of days of inactivity before an Issue is closed for lack of response
-daysUntilClose: 3
+daysUntilClose: 7
 # Label requiring a response
 responseRequiredLabel: complete
 # Comment to post when closing an Issue for lack of response. Set to `false` to disable
diff --git a/.github/stale.yml b/.github/stale.yml
index cd68e851..47fa62a3 100644
--- a/.github/stale.yml
+++ b/.github/stale.yml
@@ -1,7 +1,7 @@
 # Number of days of inactivity before an issue becomes stale
-daysUntilStale: 7
+daysUntilStale: 14
 # Number of days of inactivity before a stale issue is closed
-daysUntilClose: 3
+daysUntilClose: 7
 # Issues with these labels will never be considered stale
 exemptLabels:
   - "feedback wanted"
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e248ae14..b1aacab9 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -9,12 +9,12 @@ jobs:
     strategy:
       matrix:
         # the Node.js versions to build on
-        node-version: [10.x, 12.x, 14.x]
+        node-version: [12.x, 14.x, 16.x]
 
     steps:
       - uses: actions/checkout@v2
 
-      - name: Use Node.js ${{ matrix.node-version }} 
+      - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v1
         with:
           node-version: ${{ matrix.node-version }}

From 9bcd31179bc912678abaad2ef900462b62c1646a Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 27 Feb 2022 08:24:37 +0000
Subject: [PATCH 2958/3183] update builds for node and increase issue closure
 periods

---
 .github/no-response.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/no-response.yml b/.github/no-response.yml
index 6bf04292..c4bf7399 100644
--- a/.github/no-response.yml
+++ b/.github/no-response.yml
@@ -5,6 +5,6 @@ responseRequiredLabel: complete
 # Comment to post when closing an Issue for lack of response. Set to `false` to disable
 closeComment: >
   This issue has been automatically closed as it was marked as complete and has had
-  no further responses within three days. If you are still experiencing problems related
+  no further responses within seven days. If you are still experiencing problems related
   to the original issue then please reply to this message and the issue will be reopened
   if necessary. Thank you.

From e5ec38c8df32f9c7cf4a5e8dd9776341f6516ab7 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 20 Mar 2022 11:12:03 +0000
Subject: [PATCH 2959/3183] packages

---
 CHANGELOG.md      |  7 +++++++
 package-lock.json | 28 ++++++++++++++--------------
 package.json      |  4 ++--
 3 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index be803dae..568f5457 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,13 @@
 
 All notable changes to homebridge-ewelink will be documented in this file.
 
+## 8.13.1 (2022-03-20)
+
+### Changed
+
+- Bump `axios` to v0.26.1
+- Bump `node` recommended versions to v14.19.1 or v16.14.2
+
 ## 8.13.0 (2022-02-23)
 
 ### Added
diff --git a/package-lock.json b/package-lock.json
index 0da77c40..dee8b188 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -28,7 +28,7 @@
       "license": "MIT",
       "dependencies": {
         "@homebridge/plugin-ui-utils": "^0.0.19",
-        "axios": "^0.26.0",
+        "axios": "^0.26.1",
         "node-persist": "^3.1.0",
         "p-queue": "^6.6.2",
         "websocket-as-promised": "^2.0.1",
@@ -36,7 +36,7 @@
       },
       "engines": {
         "homebridge": "^1.4.0",
-        "node": "^14.19.0 || ^16.14.0"
+        "node": "^14.19.1 || ^16.14.2"
       }
     },
     "node_modules/@homebridge/plugin-ui-utils": {
@@ -45,9 +45,9 @@
       "integrity": "sha512-axFX7lN2Yd7bz/6SlD7dzq5sY/N9+XYuLHPukuiyHQRDtNMRL1uDqJhOx6RVaN2tYDHB75h7YxRQWP7U44Mgzg=="
     },
     "node_modules/axios": {
-      "version": "0.26.0",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-0.26.0.tgz",
-      "integrity": "sha512-lKoGLMYtHvFrPVt3r+RBMp9nh34N0M8zEfCWqdWZx6phynIEhQqAdydpyBAAG211zlhX9Rgu08cOamy6XjE5Og==",
+      "version": "0.26.1",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-0.26.1.tgz",
+      "integrity": "sha512-fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA==",
       "dependencies": {
         "follow-redirects": "^1.14.8"
       }
@@ -206,9 +206,9 @@
       }
     },
     "node_modules/has-symbols": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
-      "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
       "engines": {
         "node": ">= 0.4"
       },
@@ -596,9 +596,9 @@
       "integrity": "sha512-axFX7lN2Yd7bz/6SlD7dzq5sY/N9+XYuLHPukuiyHQRDtNMRL1uDqJhOx6RVaN2tYDHB75h7YxRQWP7U44Mgzg=="
     },
     "axios": {
-      "version": "0.26.0",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-0.26.0.tgz",
-      "integrity": "sha512-lKoGLMYtHvFrPVt3r+RBMp9nh34N0M8zEfCWqdWZx6phynIEhQqAdydpyBAAG211zlhX9Rgu08cOamy6XjE5Og==",
+      "version": "0.26.1",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-0.26.1.tgz",
+      "integrity": "sha512-fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA==",
       "requires": {
         "follow-redirects": "^1.14.8"
       }
@@ -710,9 +710,9 @@
       "integrity": "sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA=="
     },
     "has-symbols": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
-      "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw=="
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="
     },
     "has-tostringtag": {
       "version": "1.0.0",
diff --git a/package.json b/package.json
index ce6def27..7eea23a9 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,7 @@
   "main": "lib/index.js",
   "engines": {
     "homebridge": "^1.4.0",
-    "node": "^14.19.0 || ^16.14.0"
+    "node": "^14.19.1 || ^16.14.2"
   },
   "repository": {
     "type": "git",
@@ -55,7 +55,7 @@
   ],
   "dependencies": {
     "@homebridge/plugin-ui-utils": "^0.0.19",
-    "axios": "^0.26.0",
+    "axios": "^0.26.1",
     "node-persist": "^3.1.0",
     "p-queue": "^6.6.2",
     "websocket-as-promised": "^2.0.1",

From 07155039ef3505cc21bd535b9b88cc5d2fc2ccf3 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 20 Mar 2022 11:12:25 +0000
Subject: [PATCH 2960/3183] 8.13.1

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index dee8b188..54d7c586 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.13.0",
+  "version": "8.13.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.13.0",
+      "version": "8.13.1",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 7eea23a9..1c760228 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.13.0",
+  "version": "8.13.1",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From 5437a5f6cfca04c2f700b5ef7444e67554a95bc0 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 3 Apr 2022 12:42:24 +0100
Subject: [PATCH 2961/3183] Update package-lock.json

---
 package-lock.json | 58 ++++++++++++++++++++++++++---------------------
 1 file changed, 32 insertions(+), 26 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 54d7c586..37b64846 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -81,9 +81,9 @@
       }
     },
     "node_modules/es-abstract": {
-      "version": "1.19.1",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.1.tgz",
-      "integrity": "sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w==",
+      "version": "1.19.2",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.2.tgz",
+      "integrity": "sha512-gfSBJoZdlL2xRiOCy0g8gLMryhoe1TlimjzU99L/31Z8QEGIhVQI+EWwt5lT+AuU9SnorVupXFqqOGqGfsyO6w==",
       "dependencies": {
         "call-bind": "^1.0.2",
         "es-to-primitive": "^1.2.1",
@@ -91,15 +91,15 @@
         "get-intrinsic": "^1.1.1",
         "get-symbol-description": "^1.0.0",
         "has": "^1.0.3",
-        "has-symbols": "^1.0.2",
+        "has-symbols": "^1.0.3",
         "internal-slot": "^1.0.3",
         "is-callable": "^1.2.4",
-        "is-negative-zero": "^2.0.1",
+        "is-negative-zero": "^2.0.2",
         "is-regex": "^1.1.4",
         "is-shared-array-buffer": "^1.0.1",
         "is-string": "^1.0.7",
-        "is-weakref": "^1.0.1",
-        "object-inspect": "^1.11.0",
+        "is-weakref": "^1.0.2",
+        "object-inspect": "^1.12.0",
         "object-keys": "^1.1.1",
         "object.assign": "^4.1.2",
         "string.prototype.trimend": "^1.0.4",
@@ -306,9 +306,9 @@
       }
     },
     "node_modules/is-number-object": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.6.tgz",
-      "integrity": "sha512-bEVOqiRcvo3zO1+G2lVMy+gkkEm9Yh7cDMRusKKu5ZJKPUYSJwICTKZrNKHA2EbSP0Tu0+6B/emsYNHZyn6K8g==",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
+      "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==",
       "dependencies": {
         "has-tostringtag": "^1.0.0"
       },
@@ -335,9 +335,12 @@
       }
     },
     "node_modules/is-shared-array-buffer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz",
-      "integrity": "sha512-IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
+      "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
+      "dependencies": {
+        "call-bind": "^1.0.2"
+      },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -626,9 +629,9 @@
       }
     },
     "es-abstract": {
-      "version": "1.19.1",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.1.tgz",
-      "integrity": "sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w==",
+      "version": "1.19.2",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.2.tgz",
+      "integrity": "sha512-gfSBJoZdlL2xRiOCy0g8gLMryhoe1TlimjzU99L/31Z8QEGIhVQI+EWwt5lT+AuU9SnorVupXFqqOGqGfsyO6w==",
       "requires": {
         "call-bind": "^1.0.2",
         "es-to-primitive": "^1.2.1",
@@ -636,15 +639,15 @@
         "get-intrinsic": "^1.1.1",
         "get-symbol-description": "^1.0.0",
         "has": "^1.0.3",
-        "has-symbols": "^1.0.2",
+        "has-symbols": "^1.0.3",
         "internal-slot": "^1.0.3",
         "is-callable": "^1.2.4",
-        "is-negative-zero": "^2.0.1",
+        "is-negative-zero": "^2.0.2",
         "is-regex": "^1.1.4",
         "is-shared-array-buffer": "^1.0.1",
         "is-string": "^1.0.7",
-        "is-weakref": "^1.0.1",
-        "object-inspect": "^1.11.0",
+        "is-weakref": "^1.0.2",
+        "object-inspect": "^1.12.0",
         "object-keys": "^1.1.1",
         "object.assign": "^4.1.2",
         "string.prototype.trimend": "^1.0.4",
@@ -768,9 +771,9 @@
       "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA=="
     },
     "is-number-object": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.6.tgz",
-      "integrity": "sha512-bEVOqiRcvo3zO1+G2lVMy+gkkEm9Yh7cDMRusKKu5ZJKPUYSJwICTKZrNKHA2EbSP0Tu0+6B/emsYNHZyn6K8g==",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
+      "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==",
       "requires": {
         "has-tostringtag": "^1.0.0"
       }
@@ -785,9 +788,12 @@
       }
     },
     "is-shared-array-buffer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz",
-      "integrity": "sha512-IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA=="
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
+      "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
+      "requires": {
+        "call-bind": "^1.0.2"
+      }
     },
     "is-string": {
       "version": "1.0.7",

From 22bc0c973a0c10474d619b941984144784d2817d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 3 Apr 2022 12:44:46 +0100
Subject: [PATCH 2962/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 568f5457..9e88a01b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 All notable changes to homebridge-ewelink will be documented in this file.
 
+## 8.13.2 (2022-04-03)
+
+### Changed
+
+- Updated dependencies
+
 ## 8.13.1 (2022-03-20)
 
 ### Changed

From bd7824476f648e039e48286903c4417d38c44124 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 3 Apr 2022 12:45:08 +0100
Subject: [PATCH 2963/3183] 8.13.2

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 37b64846..3235855f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.13.1",
+  "version": "8.13.2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.13.1",
+      "version": "8.13.2",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 1c760228..b65a2e12 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.13.1",
+  "version": "8.13.2",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From e79bac3991cd1785fbd0702a9bfa5d0c45a0f7ac Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 14 Apr 2022 19:15:59 +0100
Subject: [PATCH 2964/3183] Update package-lock.json

---
 package-lock.json | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 3235855f..faa4a069 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -81,9 +81,9 @@
       }
     },
     "node_modules/es-abstract": {
-      "version": "1.19.2",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.2.tgz",
-      "integrity": "sha512-gfSBJoZdlL2xRiOCy0g8gLMryhoe1TlimjzU99L/31Z8QEGIhVQI+EWwt5lT+AuU9SnorVupXFqqOGqGfsyO6w==",
+      "version": "1.19.5",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.5.tgz",
+      "integrity": "sha512-Aa2G2+Rd3b6kxEUKTF4TaW67czBLyAv3z7VOhYRU50YBx+bbsYZ9xQP4lMNazePuFlybXI0V4MruPos7qUo5fA==",
       "dependencies": {
         "call-bind": "^1.0.2",
         "es-to-primitive": "^1.2.1",
@@ -96,7 +96,7 @@
         "is-callable": "^1.2.4",
         "is-negative-zero": "^2.0.2",
         "is-regex": "^1.1.4",
-        "is-shared-array-buffer": "^1.0.1",
+        "is-shared-array-buffer": "^1.0.2",
         "is-string": "^1.0.7",
         "is-weakref": "^1.0.2",
         "object-inspect": "^1.12.0",
@@ -629,9 +629,9 @@
       }
     },
     "es-abstract": {
-      "version": "1.19.2",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.2.tgz",
-      "integrity": "sha512-gfSBJoZdlL2xRiOCy0g8gLMryhoe1TlimjzU99L/31Z8QEGIhVQI+EWwt5lT+AuU9SnorVupXFqqOGqGfsyO6w==",
+      "version": "1.19.5",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.5.tgz",
+      "integrity": "sha512-Aa2G2+Rd3b6kxEUKTF4TaW67czBLyAv3z7VOhYRU50YBx+bbsYZ9xQP4lMNazePuFlybXI0V4MruPos7qUo5fA==",
       "requires": {
         "call-bind": "^1.0.2",
         "es-to-primitive": "^1.2.1",
@@ -644,7 +644,7 @@
         "is-callable": "^1.2.4",
         "is-negative-zero": "^2.0.2",
         "is-regex": "^1.1.4",
-        "is-shared-array-buffer": "^1.0.1",
+        "is-shared-array-buffer": "^1.0.2",
         "is-string": "^1.0.7",
         "is-weakref": "^1.0.2",
         "object-inspect": "^1.12.0",

From a984aa761dd9255645d519f1627239fc494f6b92 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 14 Apr 2022 19:16:23 +0100
Subject: [PATCH 2965/3183] add template dev device type for uiid 136

---
 lib/device/template.js | 47 ++++++++++++++++++++++++++++++++++++++++++
 lib/index.js           |  7 +++++++
 lib/utils/constants.js |  2 ++
 3 files changed, 56 insertions(+)
 create mode 100644 lib/device/template.js

diff --git a/lib/device/template.js b/lib/device/template.js
new file mode 100644
index 00000000..4432a608
--- /dev/null
+++ b/lib/device/template.js
@@ -0,0 +1,47 @@
+/* jshint node: true, esversion: 10, -W014, -W033 */
+/* eslint-disable new-cap */
+'use strict'
+
+module.exports = class deviceTemplate {
+  constructor (platform, accessory) {
+    // Set up variables from the platform
+    this.eveChar = platform.eveChar
+    this.funcs = platform.funcs
+    this.hapChar = platform.api.hap.Characteristic
+    this.hapErr = platform.api.hap.HapStatusError
+    this.hapServ = platform.api.hap.Service
+    this.lang = platform.lang
+    this.log = platform.log
+    this.platform = platform
+
+    // Set up variables from the accessory
+    this.name = accessory.displayName
+    this.accessory = accessory
+
+    // Initially set the online flag as true (to be then updated as false if necessary)
+    this.isOnline = true
+
+    // Set the correct logging variables for this accessory
+    this.enableLogging = true
+    this.enableDebugLogging = true
+
+    // Output the customised options to the log
+    const opts = JSON.stringify({
+      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable'
+    })
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
+  }
+
+  async externalUpdate (params) {
+    try {
+      this.log.warn('New Command Received:')
+      this.log(JSON.stringify(params))
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, false)
+    }
+  }
+
+  markStatus (isOnline) {
+    this.isOnline = isOnline
+  }
+}
diff --git a/lib/index.js b/lib/index.js
index 3f028c96..075a8008 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1450,6 +1450,13 @@ class eWeLinkPlatform {
         this.ignoredDevices.push(device.deviceid)
         return
         /************/
+      } else if (this.consts.devices.template.includes(uiid)) {
+        /***********
+        TEMPLATE DEV
+        ***********/
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
+        accessory.control = new (require('./device/template'))(this, accessory)
+        /**********/
       } else if (this.consts.devices.cannotSupport.includes(uiid)) {
         /*******************************
         DEVICES THAT CANNOT BE SUPPORTED
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index f6226255..63ae1f9a 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -339,6 +339,7 @@ module.exports = {
     zbSensorWater: [4026],
     zbSensorSmoke: [5026],
     group: [5000],
+    template: [136],
     cannotSupport: [0, 65, 118, 119, 120, 121],
     garageSensors: [102, 3026],
     skipUpdateRequest: [1000]
@@ -456,6 +457,7 @@ module.exports = {
     126: 2, // "DUALR3"
     127: 1, // "GTTA127"
     133: 1, // "NSPANEL"
+    136: 1, // RGB Five-Color Light_Support 2.4G eWeLink-Remote
     137: 1, // "L2/SPIDER CONTROLLER"
     138: 1, // "MINIR3?" (WOOLLEY WLAN SMART SWITCH)
     139: 2, // "MINIR3?"

From 88a79a71832cf13c095425ceac3f5606d1d4bd94 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 15 Apr 2022 08:24:49 +0100
Subject: [PATCH 2966/3183] add s-mate uiid177 to template devices

---
 lib/utils/constants.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 63ae1f9a..177ddea1 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -339,7 +339,7 @@ module.exports = {
     zbSensorWater: [4026],
     zbSensorSmoke: [5026],
     group: [5000],
-    template: [136],
+    template: [136, 177],
     cannotSupport: [0, 65, 118, 119, 120, 121],
     garageSensors: [102, 3026],
     skipUpdateRequest: [1000]
@@ -380,6 +380,7 @@ module.exports = {
     'motion',
     'motorTurn',
     'online',
+    'outlet',
     'per',
     'power',
     'op',
@@ -467,6 +468,7 @@ module.exports = {
     161: 2, // "SwitchMan Smart Wall Switch-M5 - 2 Gang"
     162: 3, // "SwitchMan Smart Wall Switch-M5 - 3 Gang"
     165: 2, // "DUALR3 Lite"
+    177: 1, // Switch Mate
     1000: 1, // "zigbee_ON_OFF_SWITCH_1000" (button device)
     1009: 1, // "" (Some sort of single switch device)
     1256: 1, // "ZIGBEE_SINGLE_SWITCH"

From 6e7640b2f4a36cfb065af86497ef0df32a7463d7 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 15 Apr 2022 08:24:52 +0100
Subject: [PATCH 2967/3183] Update package-lock.json

---
 package-lock.json | 40 ++++++++++++++++++++++++++++++++--------
 1 file changed, 32 insertions(+), 8 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index faa4a069..1637e371 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -70,14 +70,18 @@
       "integrity": "sha512-g5gJb59edwCliFbX2j7G6sBfY4sX9YLy211yctONI2GRaiX0f2zIbKWmBm+sPqFNEpM7Ljzm7IJX/xrjiEbPrw=="
     },
     "node_modules/define-properties": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
-      "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
+      "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
       "dependencies": {
-        "object-keys": "^1.0.12"
+        "has-property-descriptors": "^1.0.0",
+        "object-keys": "^1.1.1"
       },
       "engines": {
         "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/es-abstract": {
@@ -205,6 +209,17 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/has-property-descriptors": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz",
+      "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==",
+      "dependencies": {
+        "get-intrinsic": "^1.1.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/has-symbols": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
@@ -621,11 +636,12 @@
       "integrity": "sha512-g5gJb59edwCliFbX2j7G6sBfY4sX9YLy211yctONI2GRaiX0f2zIbKWmBm+sPqFNEpM7Ljzm7IJX/xrjiEbPrw=="
     },
     "define-properties": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
-      "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
+      "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
       "requires": {
-        "object-keys": "^1.0.12"
+        "has-property-descriptors": "^1.0.0",
+        "object-keys": "^1.1.1"
       }
     },
     "es-abstract": {
@@ -712,6 +728,14 @@
       "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.1.tgz",
       "integrity": "sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA=="
     },
+    "has-property-descriptors": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz",
+      "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==",
+      "requires": {
+        "get-intrinsic": "^1.1.1"
+      }
+    },
     "has-symbols": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",

From 18bb881529de27d8cdf063bd71bf846792342a41 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 15 Apr 2022 08:25:27 +0100
Subject: [PATCH 2968/3183] 8.13.3-beta.0

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 1637e371..a2ec1e9f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.13.2",
+  "version": "8.13.3-beta.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.13.2",
+      "version": "8.13.3-beta.0",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index b65a2e12..2f15c3e0 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.13.2",
+  "version": "8.13.3-beta.0",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From 44fe8048c78852214667e957a664b6a098b7c6a9 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 15 Apr 2022 14:41:23 +0100
Subject: [PATCH 2969/3183] try support uiid136

---
 CHANGELOG.md           | 6 ++++++
 lib/utils/constants.js | 5 +++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9e88a01b..96f03797 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 All notable changes to homebridge-ewelink will be documented in this file.
 
+## BETA
+
+### Added
+
+- Support RGB Five-Color Light UIID 136 device class
+
 ## 8.13.2 (2022-04-03)
 
 ### Changed
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 177ddea1..f11c45b5 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -317,7 +317,7 @@ module.exports = {
     lightDimmer: [36, 44, 57],
     lightRGB: [22],
     lightCCT: [103],
-    lightRGBCCT: [33, 59, 104, 137],
+    lightRGBCCT: [33, 59, 104, 136, 137],
     curtain: [11, 67],
     sensorContact: [102],
     sensorAmbient: [15],
@@ -339,7 +339,7 @@ module.exports = {
     zbSensorWater: [4026],
     zbSensorSmoke: [5026],
     group: [5000],
-    template: [136, 177],
+    template: [177],
     cannotSupport: [0, 65, 118, 119, 120, 121],
     garageSensors: [102, 3026],
     skipUpdateRequest: [1000]
@@ -407,6 +407,7 @@ module.exports = {
     'zyx_mode'
   ],
 
+  // Ref: https://github.com/CoolKit-Technologies/eWeLink-API/blob/main/en/UIIDProtocol.md
   supportedDevices: {
     1: 1, // "SOCKET" (MINI, BASIC, S20, S26, S55, RF, RF_R2)
     2: 2, // "SOCKET_2"

From ec031ca15ffd6ac1fe43855b41f35ed38c5905bb Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 15 Apr 2022 14:41:50 +0100
Subject: [PATCH 2970/3183] 8.13.3-beta.1

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index a2ec1e9f..63c90aad 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.13.3-beta.0",
+  "version": "8.13.3-beta.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.13.3-beta.0",
+      "version": "8.13.3-beta.1",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 2f15c3e0..53671b5e 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.13.3-beta.0",
+  "version": "8.13.3-beta.1",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From 0379fdf85b2eba87c156e5c5fadf225d7f910f32 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 16 Apr 2022 08:54:15 +0100
Subject: [PATCH 2971/3183] Update light-rgb-cct.js

---
 lib/device/light-rgb-cct.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/device/light-rgb-cct.js b/lib/device/light-rgb-cct.js
index 25e65a6c..94d5e0d8 100644
--- a/lib/device/light-rgb-cct.js
+++ b/lib/device/light-rgb-cct.js
@@ -244,6 +244,7 @@ module.exports = class deviceLightRGBCCT {
           }
           break
         case 104:
+        case 136:
           // B02-B-A60, B05-B-A60, GTLC104
           if (this.cacheMode === 'white') {
             params = {
@@ -317,6 +318,7 @@ module.exports = class deviceLightRGBCCT {
           }
           break
         case 104:
+        case 136:
           // B02-B-A60, B05-B-A60, GTLC104
           params = {
             ltype: this.cacheMode === 'color' ? undefined : 'color',
@@ -336,7 +338,7 @@ module.exports = class deviceLightRGBCCT {
       this.cacheB = rgb[2]
       this.cacheMired = 0
       this.cacheCT = 0
-      if (this.accessory.context.eweUIID === 104) {
+      if ([104, 136].includes(this.accessory.context.eweUIID)) {
         this.cacheMode = 'color'
       }
       if (this.enableLogging) {
@@ -405,6 +407,7 @@ module.exports = class deviceLightRGBCCT {
           break
         }
         case 104:
+        case 136:
           // B02-B-A60, B05-B-A60, GTLC104
           scaledCT = Math.round(((mToK - 2700) / 3800) * 255)
           params = {
@@ -442,6 +445,7 @@ module.exports = class deviceLightRGBCCT {
           break
         }
         case 104:
+        case 136:
           this.cacheMode = 'white'
           break
       }
@@ -612,6 +616,7 @@ module.exports = class deviceLightRGBCCT {
           }
           break
         case 104:
+        case 136:
           // B02-B-A60, B05-B-A60, GTLC104
           if (params.ltype === 'color' && params.color) {
             if (this.funcs.hasProperty(params.color, 'br')) {

From b268b3103aee5673f44b4b51927ab86de2353c41 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 16 Apr 2022 08:54:39 +0100
Subject: [PATCH 2972/3183] 8.13.3-beta.2

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 63c90aad..ed6df2d1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.13.3-beta.1",
+  "version": "8.13.3-beta.2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.13.3-beta.1",
+      "version": "8.13.3-beta.2",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 53671b5e..c583b557 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.13.3-beta.1",
+  "version": "8.13.3-beta.2",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From c58622201664525cbc7d17801aae6a678b9f88a7 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 16 Apr 2022 13:16:08 +0100
Subject: [PATCH 2973/3183] try supporting channels of SMate

---
 lib/device/switch-mate.js | 142 ++++++++++++++++++++++++++++++++++++++
 lib/index.js              |   8 +++
 lib/utils/constants.js    |   3 +-
 3 files changed, 152 insertions(+), 1 deletion(-)
 create mode 100644 lib/device/switch-mate.js

diff --git a/lib/device/switch-mate.js b/lib/device/switch-mate.js
new file mode 100644
index 00000000..8a1c8dc6
--- /dev/null
+++ b/lib/device/switch-mate.js
@@ -0,0 +1,142 @@
+/* jshint node: true, esversion: 10, -W014, -W033 */
+/* eslint-disable new-cap */
+'use strict'
+
+module.exports = class deviceSwitchMate {
+  constructor (platform, accessory) {
+    // Set up variables from the platform
+    this.eveChar = platform.eveChar
+    this.funcs = platform.funcs
+    this.hapChar = platform.api.hap.Characteristic
+    this.hapErr = platform.api.hap.HapStatusError
+    this.hapServ = platform.api.hap.Service
+    this.lang = platform.lang
+    this.log = platform.log
+    this.platform = platform
+
+    // Set up variables from the accessory
+    this.name = accessory.displayName
+    this.accessory = accessory
+
+    // Initially set the online flag as true (to be then updated as false if necessary)
+    this.isOnline = true
+
+    // Set up custom variables for this device type
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
+
+    // Set the correct logging variables for this accessory
+    this.enableLogging = !platform.config.disableDeviceLogging
+    this.enableDebugLogging = platform.config.debug
+    if (deviceConf && deviceConf.overrideLogging) {
+      switch (deviceConf.overrideLogging) {
+        case 'standard':
+          this.enableLogging = true
+          this.enableDebugLogging = false
+          break
+        case 'debug':
+          this.enableLogging = true
+          this.enableDebugLogging = true
+          break
+        case 'disable':
+          this.enableLogging = false
+          this.enableDebugLogging = false
+          break
+      }
+    }
+
+    // Add the switch for channel 1
+    this.service1 =
+      this.accessory.getService('Channel 1') ||
+      this.accessory.addService(this.hapServ.Switch, 'Channel 1', 'channel1')
+
+    // Add the switch for channel 2
+    this.service2 =
+      this.accessory.getService('Channel 2') ||
+      this.accessory.addService(this.hapServ.Switch, 'Channel 2', 'channel2')
+
+    // Add the switch for channel 3
+    this.service3 =
+      this.accessory.getService('Channel 3') ||
+      this.accessory.addService(this.hapServ.Switch, 'Channel 3', 'channel3')
+
+    // Add the set handlers
+    this.service1
+      .getCharacteristic(this.hapChar.On)
+      .onSet(async value => await this.internalStateUpdate(value, 1, this.service1))
+    this.service2
+      .getCharacteristic(this.hapChar.On)
+      .onSet(async value => await this.internalStateUpdate(value, 2, this.service2))
+    this.service3
+      .getCharacteristic(this.hapChar.On)
+      .onSet(async value => await this.internalStateUpdate(value, 3, this.service3))
+
+    // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
+    if (!platform.config.disableNoResponse) {
+      this.service1.getCharacteristic(this.hapChar.On).onGet(() => {
+        if (!this.isOnline) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service1.getCharacteristic(this.hapChar.On).value
+      })
+      this.service2.getCharacteristic(this.hapChar.On).onGet(() => {
+        if (!this.isOnline) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service2.getCharacteristic(this.hapChar.On).value
+      })
+      this.service3.getCharacteristic(this.hapChar.On).onGet(() => {
+        if (!this.isOnline) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service3.getCharacteristic(this.hapChar.On).value
+      })
+    }
+
+    // Output the customised options to the log
+    const opts = JSON.stringify({
+      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable'
+    })
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
+  }
+
+  async internalStateUpdate (value, channel, service) {
+    try {
+      if (value) {
+        return
+      }
+      const params = {
+        outlet: channel,
+        key: 0
+      }
+      await this.platform.sendDeviceUpdate(this.accessory, params)
+      if (this.enableLogging) {
+        this.log('[%s] [%s] %s [on].', this.name, service.displayName, this.lang.curState)
+      }
+      setTimeout(() => {
+        service.updateCharacteristic(this.hapChar.On, false)
+        if (this.enableLogging) {
+          this.log('[%s] [%s] %s [off].', this.name, service.displayName, this.lang.curState)
+        }
+      }, 2000)
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, true)
+      setTimeout(() => {
+        service.updateCharacteristic(this.hapChar.On, false)
+      }, 2000)
+      throw new this.hapErr(-70402)
+    }
+  }
+
+  async externalUpdate (params) {
+    try {
+      this.log.warn('New Command Received:')
+      this.log(JSON.stringify(params))
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, false)
+    }
+  }
+
+  markStatus (isOnline) {
+    this.isOnline = isOnline
+  }
+}
diff --git a/lib/index.js b/lib/index.js
index 075a8008..ae432834 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1234,6 +1234,14 @@ class eWeLinkPlatform {
           }
         }
         /******************************/
+      } else if (this.consts.devices.switchMate.includes(uiid)) {
+        /*******************
+        SWITCH MATE (S-MATE)
+        *******************/
+        this.log.error(`\n${JSON.stringify(device, null, 2)}`)
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
+        accessory.control = new (require('./device/switch-mate'))(this, accessory)
+        /******************/
       } else if (this.consts.devices.rfBridge.includes(uiid)) {
         /*********************
         RF BRIDGE + SUBDEVICES
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index f11c45b5..3449aeb9 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -314,6 +314,7 @@ module.exports = {
       4256
     ],
     switchMultiPower: [126, 165],
+    switchMate: [177],
     lightDimmer: [36, 44, 57],
     lightRGB: [22],
     lightCCT: [103],
@@ -339,7 +340,7 @@ module.exports = {
     zbSensorWater: [4026],
     zbSensorSmoke: [5026],
     group: [5000],
-    template: [177],
+    template: [],
     cannotSupport: [0, 65, 118, 119, 120, 121],
     garageSensors: [102, 3026],
     skipUpdateRequest: [1000]

From 23b698317d106f4a11c7cdbf4c011458f0db5984 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 16 Apr 2022 13:16:36 +0100
Subject: [PATCH 2974/3183] 8.13.3-beta.3

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ed6df2d1..3db77360 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.13.3-beta.2",
+  "version": "8.13.3-beta.3",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.13.3-beta.2",
+      "version": "8.13.3-beta.3",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index c583b557..09ac408a 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.13.3-beta.2",
+  "version": "8.13.3-beta.3",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From 64cff93bf64b81cb43836aedfe1172637e5f007a Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 16 Apr 2022 13:29:24 +0100
Subject: [PATCH 2975/3183] uiid136 always needs ltype param

---
 lib/device/light-rgb-cct.js | 45 ++++++++++++++++++++++++++++++++++---
 1 file changed, 42 insertions(+), 3 deletions(-)

diff --git a/lib/device/light-rgb-cct.js b/lib/device/light-rgb-cct.js
index 94d5e0d8..958096c0 100644
--- a/lib/device/light-rgb-cct.js
+++ b/lib/device/light-rgb-cct.js
@@ -244,7 +244,6 @@ module.exports = class deviceLightRGBCCT {
           }
           break
         case 104:
-        case 136:
           // B02-B-A60, B05-B-A60, GTLC104
           if (this.cacheMode === 'white') {
             params = {
@@ -264,6 +263,27 @@ module.exports = class deviceLightRGBCCT {
             }
           }
           break
+        case 136:
+          if (this.cacheMode === 'white') {
+            params = {
+              ltype: 'white',
+              white: {
+                br: value,
+                ct: this.cacheCT
+              }
+            }
+          } else {
+            params = {
+              ltype: 'color',
+              color: {
+                br: value,
+                r: this.cacheR,
+                g: this.cacheG,
+                b: this.cacheB
+              }
+            }
+          }
+          break
         case 137:
           params = {
             bright: value
@@ -318,7 +338,6 @@ module.exports = class deviceLightRGBCCT {
           }
           break
         case 104:
-        case 136:
           // B02-B-A60, B05-B-A60, GTLC104
           params = {
             ltype: this.cacheMode === 'color' ? undefined : 'color',
@@ -330,6 +349,17 @@ module.exports = class deviceLightRGBCCT {
             }
           }
           break
+        case 136:
+          params = {
+            ltype: 'color',
+            color: {
+              br: this.cacheBright,
+              r: rgb[0],
+              g: rgb[1],
+              b: rgb[2]
+            }
+          }
+          break
       }
       await this.platform.sendDeviceUpdate(this.accessory, params)
       this.cacheHue = value
@@ -407,7 +437,6 @@ module.exports = class deviceLightRGBCCT {
           break
         }
         case 104:
-        case 136:
           // B02-B-A60, B05-B-A60, GTLC104
           scaledCT = Math.round(((mToK - 2700) / 3800) * 255)
           params = {
@@ -418,6 +447,16 @@ module.exports = class deviceLightRGBCCT {
             }
           }
           break
+        case 136:
+          scaledCT = Math.round(((mToK - 2700) / 3800) * 255)
+          params = {
+            ltype: 'white',
+            white: {
+              br: this.cacheBright,
+              ct: scaledCT
+            }
+          }
+          break
         case 137: {
           // L2
           scaledCT = 100 - Math.round(((mToK - 2700) / 3800) * 100)

From dac68d6ce4c285e3ef6f840f58818db1d66b5e10 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 16 Apr 2022 13:29:47 +0100
Subject: [PATCH 2976/3183] 8.13.3-beta.4

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 3db77360..78840376 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.13.3-beta.3",
+  "version": "8.13.3-beta.4",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.13.3-beta.3",
+      "version": "8.13.3-beta.4",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 09ac408a..935d18b3 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.13.3-beta.3",
+  "version": "8.13.3-beta.4",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From d16a712523170cf0578b66ba4480af03be7ba7fe Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 16 Apr 2022 14:04:03 +0100
Subject: [PATCH 2977/3183] config for new bulb, changelog

---
 CHANGELOG.md           |  3 ++-
 config.schema.json     | 20 ++++++++++++--------
 lib/utils/constants.js |  3 ++-
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 96f03797..1384ba68 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,7 +6,8 @@ All notable changes to homebridge-ewelink will be documented in this file.
 
 ### Added
 
-- Support RGB Five-Color Light UIID 136 device class
+- Support Sonoff B05-BL-A19 (UIID 136 devices)
+- Support Sonoff S-Mate
 
 ## 8.13.2 (2022-04-03)
 
diff --git a/config.schema.json b/config.schema.json
index 007d1d66..39e0dd41 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -875,10 +875,6 @@
                   "title": "Sonoff B02-B-A60",
                   "enum": ["bulbB02BA60"]
                 },
-                {
-                  "title": "Sonoff B05-B-A60",
-                  "enum": ["bulbB05BA60"]
-                },
                 {
                   "title": "Sonoff B02-F-A60",
                   "enum": ["bulbB02FA60"]
@@ -887,6 +883,14 @@
                   "title": "Sonoff B02-F-ST64",
                   "enum": ["bulbB02FST64"]
                 },
+                {
+                  "title": "Sonoff B05-B-A60",
+                  "enum": ["bulbB05BA60"]
+                },
+                {
+                  "title": "Sonoff B05-BL-A19",
+                  "enum": ["bulbB05BLA19"]
+                },
                 {
                   "title": "KingArt KING-M4",
                   "enum": ["king"]
@@ -911,7 +915,7 @@
               "placeholder": 1,
               "minimum": 1,
               "condition": {
-                "functionBody": "return (model.lightDevices && model.lightDevices[arrayIndices] && ['d1', 'l1', 'bulbB02BA60', 'bulbB05BA60', 'bulbB02FA60', 'bulbB02FST64', 'king', 'zl_d', 'zl_dc'].includes(model.lightDevices[arrayIndices].deviceModel) && !model.lightDevices[arrayIndices].ignoreDevice);"
+                "functionBody": "return (model.lightDevices && model.lightDevices[arrayIndices] && ['d1', 'l1', 'bulbB02BA60', 'bulbB05BA60', 'bulbB02FA60', 'bulbB02FST64', 'bulbB05BLA19', 'king', 'zl_d', 'zl_dc'].includes(model.lightDevices[arrayIndices].deviceModel) && !model.lightDevices[arrayIndices].ignoreDevice);"
               }
             },
             "adaptiveLightingShift": {
@@ -921,7 +925,7 @@
               "placeholder": 0,
               "minimum": -1,
               "condition": {
-                "functionBody": "return (model.lightDevices && model.lightDevices[arrayIndices] && ['l1', 'bulbB02BA60', 'bulbB05BA60', 'bulbB02FA60', 'bulbB02FST64', 'zl_dc'].includes(model.lightDevices[arrayIndices].deviceModel) && !model.lightDevices[arrayIndices].ignoreDevice);"
+                "functionBody": "return (model.lightDevices && model.lightDevices[arrayIndices] && ['l1', 'bulbB02BA60', 'bulbB05BA60', 'bulbB02FA60', 'bulbB02FST64', 'bulbB05BLA19', 'zl_dc'].includes(model.lightDevices[arrayIndices].deviceModel) && !model.lightDevices[arrayIndices].ignoreDevice);"
               }
             },
             "ipAddress": {
@@ -929,7 +933,7 @@
               "title": "IP Address",
               "description": "You can manually set the IP address for this device if it cannot be discovered by the plugin.",
               "condition": {
-                "functionBody": "return (model.mode !== 'wan' && model.lightDevices && model.lightDevices[arrayIndices] && ['d1'].includes(model.lightDevices[arrayIndices].deviceModel) && !model.lightDevices[arrayIndices].ignoreDevice);"
+                "functionBody": "return (model.mode !== 'wan' && model.lightDevices && model.lightDevices[arrayIndices] && ['d1', 'bulbB05BLA19'].includes(model.lightDevices[arrayIndices].deviceModel) && !model.lightDevices[arrayIndices].ignoreDevice);"
               }
             },
             "overrideLogging": {
@@ -955,7 +959,7 @@
                 }
               ],
               "condition": {
-                "functionBody": "return (model.lightDevices && model.lightDevices[arrayIndices] && ['d1', 'b1', 'l1', 'bulbB02BA60', 'bulbB05BA60', 'bulbB02FA60', 'bulbB02FST64', 'king', 'zl_d', 'zl_dc'].includes(model.lightDevices[arrayIndices].deviceModel) && !model.lightDevices[arrayIndices].ignoreDevice);"
+                "functionBody": "return (model.lightDevices && model.lightDevices[arrayIndices] && ['d1', 'b1', 'l1', 'bulbB02BA60', 'bulbB05BA60', 'bulbB02FA60', 'bulbB02FST64', 'bulbB05BLA19', 'king', 'zl_d', 'zl_dc'].includes(model.lightDevices[arrayIndices].deviceModel) && !model.lightDevices[arrayIndices].ignoreDevice);"
               }
             }
           }
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 3449aeb9..3f132dc5 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -194,9 +194,10 @@ module.exports = {
         'b1',
         'l1',
         'bulbB02BA60',
-        'bulbB05BA60',
         'bulbB02FA60',
         'bulbB02FST64',
+        'bulbB05BA60',
+        'bulbB05BLA19',
         'king',
         'zl_d',
         'zl_dc'

From bbbe9b60f05e1d3063ddaa76547220107f9c207b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 16 Apr 2022 14:04:29 +0100
Subject: [PATCH 2978/3183] 8.13.3-beta.5

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 78840376..51832d75 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.13.3-beta.4",
+  "version": "8.13.3-beta.5",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.13.3-beta.4",
+      "version": "8.13.3-beta.5",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 935d18b3..805f46b1 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.13.3-beta.4",
+  "version": "8.13.3-beta.5",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From 9d892634351ad2a29bc4888f39e48d786c18348c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 16 Apr 2022 16:15:38 +0100
Subject: [PATCH 2979/3183] try lan mode for UIID136

---
 lib/connection/lan.js  | 8 ++++++++
 lib/utils/constants.js | 1 +
 2 files changed, 9 insertions(+)

diff --git a/lib/connection/lan.js b/lib/connection/lan.js
index 6d97aeab..5f876d44 100644
--- a/lib/connection/lan.js
+++ b/lib/connection/lan.js
@@ -231,6 +231,14 @@ module.exports = class connectionLAN {
         params.cmd = 'transmit'
         params.rfChl = json.params.rfChl
         suffix = 'transmit'
+      } else if (this.funcs.hasProperty(json.params, 'ltype')) {
+        params.ltype = json.params.ltype
+        if (this.funcs.hasProperty(json.params, 'white')) {
+          params.white = json.params.white
+        } else {
+          params.color = json.params.color
+        }
+        suffix = 'dimmable'
       } else {
         throw new Error(this.lang.devNotConfLAN)
       }
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 3f132dc5..38aaf5bc 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -281,6 +281,7 @@ module.exports = {
       114,
       126,
       133,
+      136,
       160,
       161,
       162,

From f8b1a90cc28f790b8403870fe0e59aa9884998c4 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 16 Apr 2022 16:16:03 +0100
Subject: [PATCH 2980/3183] 8.13.3-beta.6

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 51832d75..2d863d93 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.13.3-beta.5",
+  "version": "8.13.3-beta.6",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.13.3-beta.5",
+      "version": "8.13.3-beta.6",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 805f46b1..00851b40 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.13.3-beta.5",
+  "version": "8.13.3-beta.6",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From 10eecaaddb788e81c4b4c71ffdd8d75c0c45e3fb Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 17 Apr 2022 09:11:02 +0100
Subject: [PATCH 2981/3183] s-mate as sensor

---
 lib/device/switch-mate.js | 119 +++++++++++---------------------------
 lib/index.js              |   7 ++-
 lib/utils/constants.js    |   2 +
 3 files changed, 40 insertions(+), 88 deletions(-)

diff --git a/lib/device/switch-mate.js b/lib/device/switch-mate.js
index 8a1c8dc6..3967d55d 100644
--- a/lib/device/switch-mate.js
+++ b/lib/device/switch-mate.js
@@ -5,10 +5,8 @@
 module.exports = class deviceSwitchMate {
   constructor (platform, accessory) {
     // Set up variables from the platform
-    this.eveChar = platform.eveChar
     this.funcs = platform.funcs
     this.hapChar = platform.api.hap.Characteristic
-    this.hapErr = platform.api.hap.HapStatusError
     this.hapServ = platform.api.hap.Service
     this.lang = platform.lang
     this.log = platform.log
@@ -18,9 +16,6 @@ module.exports = class deviceSwitchMate {
     this.name = accessory.displayName
     this.accessory = accessory
 
-    // Initially set the online flag as true (to be then updated as false if necessary)
-    this.isOnline = true
-
     // Set up custom variables for this device type
     const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
 
@@ -43,55 +38,17 @@ module.exports = class deviceSwitchMate {
           break
       }
     }
-
-    // Add the switch for channel 1
-    this.service1 =
-      this.accessory.getService('Channel 1') ||
-      this.accessory.addService(this.hapServ.Switch, 'Channel 1', 'channel1')
-
-    // Add the switch for channel 2
-    this.service2 =
-      this.accessory.getService('Channel 2') ||
-      this.accessory.addService(this.hapServ.Switch, 'Channel 2', 'channel2')
-
-    // Add the switch for channel 3
-    this.service3 =
-      this.accessory.getService('Channel 3') ||
-      this.accessory.addService(this.hapServ.Switch, 'Channel 3', 'channel3')
-
-    // Add the set handlers
-    this.service1
-      .getCharacteristic(this.hapChar.On)
-      .onSet(async value => await this.internalStateUpdate(value, 1, this.service1))
-    this.service2
-      .getCharacteristic(this.hapChar.On)
-      .onSet(async value => await this.internalStateUpdate(value, 2, this.service2))
-    this.service3
-      .getCharacteristic(this.hapChar.On)
-      .onSet(async value => await this.internalStateUpdate(value, 3, this.service3))
-
-    // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
-    if (!platform.config.disableNoResponse) {
-      this.service1.getCharacteristic(this.hapChar.On).onGet(() => {
-        if (!this.isOnline) {
-          throw new this.hapErr(-70402)
-        }
-        return this.service1.getCharacteristic(this.hapChar.On).value
-      })
-      this.service2.getCharacteristic(this.hapChar.On).onGet(() => {
-        if (!this.isOnline) {
-          throw new this.hapErr(-70402)
-        }
-        return this.service2.getCharacteristic(this.hapChar.On).value
-      })
-      this.service3.getCharacteristic(this.hapChar.On).onGet(() => {
-        if (!this.isOnline) {
-          throw new this.hapErr(-70402)
-        }
-        return this.service3.getCharacteristic(this.hapChar.On).value
-      })
+    this.timeouts = {
+      0: false,
+      1: false,
+      2: false
     }
 
+    // Add the stateless switch service if it doesn't already exist
+    this.service =
+      this.accessory.getService(this.hapServ.StatelessProgrammableSwitch) ||
+      this.accessory.addService(this.hapServ.StatelessProgrammableSwitch)
+
     // Output the customised options to the log
     const opts = JSON.stringify({
       logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable'
@@ -99,44 +56,34 @@ module.exports = class deviceSwitchMate {
     this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
 
-  async internalStateUpdate (value, channel, service) {
-    try {
-      if (value) {
-        return
-      }
-      const params = {
-        outlet: channel,
-        key: 0
-      }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
-      if (this.enableLogging) {
-        this.log('[%s] [%s] %s [on].', this.name, service.displayName, this.lang.curState)
-      }
-      setTimeout(() => {
-        service.updateCharacteristic(this.hapChar.On, false)
-        if (this.enableLogging) {
-          this.log('[%s] [%s] %s [off].', this.name, service.displayName, this.lang.curState)
-        }
-      }, 2000)
-    } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
-      setTimeout(() => {
-        service.updateCharacteristic(this.hapChar.On, false)
-      }, 2000)
-      throw new this.hapErr(-70402)
-    }
-  }
-
   async externalUpdate (params) {
     try {
-      this.log.warn('New Command Received:')
-      this.log(JSON.stringify(params))
+      if (
+        this.funcs.hasProperty(params, 'outlet') &&
+        [0, 1, 2].includes(params.outlet) &&
+        params.actionTime &&
+        !this.timeouts[params.outlet]
+      ) {
+        this.timeouts[params.outlet] = true
+        setTimeout(() => {
+          this.timeouts[params.outlet] = false
+        }, 1000)
+        const timeDiff = (new Date().getTime() - Date.parse(params.actionTime)) / 1000
+        if (timeDiff < 5) {
+          this.service.updateCharacteristic(this.hapChar.ProgrammableSwitchEvent, params.outlet)
+          if (params.updateSource && this.enableLogging) {
+            const textLabel =
+              params.key === 0
+                ? this.lang.buttonSingle
+                : params.key === 1
+                ? this.lang.buttonDouble
+                : this.lang.buttonLong
+            this.log('[%s] %s [%s].', this.name, this.lang.curState, textLabel)
+          }
+        }
+      }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
-
-  markStatus (isOnline) {
-    this.isOnline = isOnline
-  }
 }
diff --git a/lib/index.js b/lib/index.js
index ae432834..d567f65b 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -64,9 +64,10 @@ class eWeLinkPlatform {
 
       // Log some environment info for debugging
       this.log(
-        '%s v%s | Node %s | HB v%s | HAPNodeJS v%s%s...',
+        '%s v%s | System %s | Node %s | HB v%s | HAPNodeJS v%s%s...',
         this.lang.initialising,
         plugin.version,
+        process.platform,
         process.version,
         api.serverVersion,
         api.hap.HAPLibraryVersion ? api.hap.HAPLibraryVersion() : '?',
@@ -1238,7 +1239,9 @@ class eWeLinkPlatform {
         /*******************
         SWITCH MATE (S-MATE)
         *******************/
-        this.log.error(`\n${JSON.stringify(device, null, 2)}`)
+        if (devicesInHB.get(uuid)) {
+          this.removeAccessory(devicesInHB.get(uuid))
+        }
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/switch-mate'))(this, accessory)
         /******************/
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 38aaf5bc..d235814c 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -282,6 +282,7 @@ module.exports = {
       126,
       133,
       136,
+      138,
       160,
       161,
       162,
@@ -349,6 +350,7 @@ module.exports = {
   },
 
   paramsToKeep: [
+    'actionTime',
     'actPow_',
     'battery',
     'bright',

From 8da279eeead0415a6704977c5faff3be129e3b83 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 17 Apr 2022 09:11:29 +0100
Subject: [PATCH 2982/3183] 8.13.3-beta.7

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 2d863d93..f2ca8e40 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.13.3-beta.6",
+  "version": "8.13.3-beta.7",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.13.3-beta.6",
+      "version": "8.13.3-beta.7",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 00851b40..1f6ab1d2 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.13.3-beta.6",
+  "version": "8.13.3-beta.7",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From 9dacaaac07b3a9e788cba8c60a6056cf2257473b Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 17 Apr 2022 09:13:14 +0100
Subject: [PATCH 2983/3183] don't refresh s-mate now

---
 lib/index.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/lib/index.js b/lib/index.js
index d567f65b..415a261f 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1239,9 +1239,6 @@ class eWeLinkPlatform {
         /*******************
         SWITCH MATE (S-MATE)
         *******************/
-        if (devicesInHB.get(uuid)) {
-          this.removeAccessory(devicesInHB.get(uuid))
-        }
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
         accessory.control = new (require('./device/switch-mate'))(this, accessory)
         /******************/

From cc254c730cf670f05546a2e273498ec81d366884 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 17 Apr 2022 09:17:27 +0100
Subject: [PATCH 2984/3183] 8.13.3-beta.8

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index f2ca8e40..4f58cfd6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.13.3-beta.7",
+  "version": "8.13.3-beta.8",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.13.3-beta.7",
+      "version": "8.13.3-beta.8",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 1f6ab1d2..1e14a7e5 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.13.3-beta.7",
+  "version": "8.13.3-beta.8",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From c12fc0d37fe3b9e866df70fff465ce2b1d85b1f5 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 17 Apr 2022 09:20:35 +0100
Subject: [PATCH 2985/3183] fix s-mate logging

---
 lib/device/switch-mate.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/device/switch-mate.js b/lib/device/switch-mate.js
index 3967d55d..394a1d1d 100644
--- a/lib/device/switch-mate.js
+++ b/lib/device/switch-mate.js
@@ -73,9 +73,9 @@ module.exports = class deviceSwitchMate {
           this.service.updateCharacteristic(this.hapChar.ProgrammableSwitchEvent, params.outlet)
           if (params.updateSource && this.enableLogging) {
             const textLabel =
-              params.key === 0
+              params.outlet === 0
                 ? this.lang.buttonSingle
-                : params.key === 1
+                : params.outlet === 1
                 ? this.lang.buttonDouble
                 : this.lang.buttonLong
             this.log('[%s] %s [%s].', this.name, this.lang.curState, textLabel)

From 1ad88f5592c319e7964b7d12b736eecea00ea87c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 17 Apr 2022 09:21:06 +0100
Subject: [PATCH 2986/3183] 8.13.3-beta.9

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 4f58cfd6..65689640 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.13.3-beta.8",
+  "version": "8.13.3-beta.9",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.13.3-beta.8",
+      "version": "8.13.3-beta.9",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 1e14a7e5..dfc481d1 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.13.3-beta.8",
+  "version": "8.13.3-beta.9",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From 36b724dc2c1f665cf488d5f5b86de556855cbedb Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 17 Apr 2022 09:50:54 +0100
Subject: [PATCH 2987/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1384ba68..b3659cb1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,8 +6,9 @@ All notable changes to homebridge-ewelink will be documented in this file.
 
 ### Added
 
-- Support Sonoff B05-BL-A19 (UIID 136 devices)
-- Support Sonoff S-Mate
+- Support Sonoff B05-BL-A19 (UIID 136 devices) (also supports LAN mode)
+- Support Sonoff MINIR3 (UIID 138 devices) (also supports LAN mode)
+- Support Sonoff S-Mate (UIID 177 devices) as a Stateless Programmable Sensor
 
 ## 8.13.2 (2022-04-03)
 

From f1daa145fe229a4c87972566595123fd32e1eb2e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 17 Apr 2022 10:29:45 +0100
Subject: [PATCH 2988/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b3659cb1..bc943620 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,13 +2,14 @@
 
 All notable changes to homebridge-ewelink will be documented in this file.
 
-## BETA
+## 8.14.0 (2022-04-17)
 
 ### Added
 
-- Support Sonoff B05-BL-A19 (UIID 136 devices) (also supports LAN mode)
-- Support Sonoff MINIR3 (UIID 138 devices) (also supports LAN mode)
-- Support Sonoff S-Mate (UIID 177 devices) as a Stateless Programmable Sensor
+- **New Devices**
+  - Sonoff B05-BL-A19 bulbs (UIID 136 devices) (also supports LAN mode)
+  - Sonoff MINIR3 (UIID 138 devices) (also supports LAN mode)
+  - Sonoff S-Mate (UIID 177 devices) as a Stateless Programmable Sensor
 
 ## 8.13.2 (2022-04-03)
 

From 310bdf0065f2cfc1d2daceac3a6ad85eedeac8e8 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 17 Apr 2022 10:30:17 +0100
Subject: [PATCH 2989/3183] 8.14.0

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 65689640..899b7d14 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.13.3-beta.9",
+  "version": "8.14.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.13.3-beta.9",
+      "version": "8.14.0",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index dfc481d1..9ebbcfcd 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.13.3-beta.9",
+  "version": "8.14.0",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From ad0ea96327fd5cbde2dcd3bfe8dc4430e0064c38 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 18 Apr 2022 22:08:36 +0100
Subject: [PATCH 2990/3183] offlineAsOff option for light devices

---
 CHANGELOG.md                |  6 ++++++
 config.schema.json          |  9 +++++++++
 lib/device/light-cct.js     | 13 ++++++++++++-
 lib/device/light-dimmer.js  | 13 ++++++++++++-
 lib/device/light-rgb-cct.js | 13 ++++++++++++-
 lib/device/light-rgb.js     | 13 ++++++++++++-
 lib/index.js                |  1 +
 lib/utils/constants.js      |  1 +
 8 files changed, 65 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bc943620..40ea31dc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 All notable changes to homebridge-ewelink will be documented in this file.
 
+## BETA
+
+### Added
+
+- `offlineAsOff` option for light devices - enable to show offline devices as 'off' in Homebridge/HomeKit
+
 ## 8.14.0 (2022-04-17)
 
 ### Added
diff --git a/config.schema.json b/config.schema.json
index 39e0dd41..07d02dd3 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -928,6 +928,14 @@
                 "functionBody": "return (model.lightDevices && model.lightDevices[arrayIndices] && ['l1', 'bulbB02BA60', 'bulbB05BA60', 'bulbB02FA60', 'bulbB02FST64', 'bulbB05BLA19', 'zl_dc'].includes(model.lightDevices[arrayIndices].deviceModel) && !model.lightDevices[arrayIndices].ignoreDevice);"
               }
             },
+            "offlineAsOff": {
+              "type": "boolean",
+              "title": "Offline As Off",
+              "description": "If true, this accessory will show as off if reported offline.",
+              "condition": {
+                "functionBody": "return (model.lightDevices && model.lightDevices[arrayIndices] && model.lightDevices[arrayIndices].deviceId && model.lightDevices[arrayIndices].deviceId.length === 10 && !model.lightDevices[arrayIndices].ignoreDevice);"
+              }
+            },
             "ipAddress": {
               "type": "string",
               "title": "IP Address",
@@ -1793,6 +1801,7 @@
             "lightDevices[].deviceModel",
             "lightDevices[].brightnessStep",
             "lightDevices[].adaptiveLightingShift",
+            "lightDevices[].offlineAsOff",
             "lightDevices[].ipAddress",
             "lightDevices[].overrideLogging"
           ]
diff --git a/lib/device/light-cct.js b/lib/device/light-cct.js
index 63e51e9d..f5caf2ab 100644
--- a/lib/device/light-cct.js
+++ b/lib/device/light-cct.js
@@ -31,6 +31,7 @@ module.exports = class deviceLightCCT {
       deviceConf && deviceConf.brightnessStep
         ? Math.min(deviceConf.brightnessStep, 100)
         : platform.consts.defaultValues.brightnessStep
+    this.offlineAsOff = deviceConf && deviceConf.offlineAsOff
 
     // Set the correct logging variables for this accessory
     this.enableLogging = !platform.config.disableDeviceLogging
@@ -134,7 +135,8 @@ module.exports = class deviceLightCCT {
       adaptiveLightingShift: this.alShift,
       brightnessStep: this.brightStep,
       deviceModel: this.deviceModel,
-      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable'
+      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
+      offlineAsOff: !!this.offlineAsOff
     })
     this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
@@ -309,6 +311,15 @@ module.exports = class deviceLightCCT {
 
   markStatus (isOnline) {
     this.isOnline = isOnline
+
+    // Show as off if offline if configured by user
+    if (this.offlineAsOff && !isOnline && this.cacheState !== 'off') {
+      this.service.updateCharacteristic(this.hapChar.On, false)
+      this.cacheState = 'off'
+      if (this.enableLogging) {
+        this.log('[%s] %s [%s - offline]', this.name, this.lang.curState, this.cacheState)
+      }
+    }
   }
 
   currentState () {
diff --git a/lib/device/light-dimmer.js b/lib/device/light-dimmer.js
index 6ec647c5..b262758b 100644
--- a/lib/device/light-dimmer.js
+++ b/lib/device/light-dimmer.js
@@ -26,6 +26,7 @@ module.exports = class deviceLightDimmer {
       deviceConf && deviceConf.brightnessStep
         ? Math.min(deviceConf.brightnessStep, 100)
         : platform.consts.defaultValues.brightnessStep
+    this.offlineAsOff = deviceConf && deviceConf.offlineAsOff
 
     // Set the correct logging variables for this accessory
     this.enableLogging = !platform.config.disableDeviceLogging
@@ -82,7 +83,8 @@ module.exports = class deviceLightDimmer {
     // Output the customised options to the log
     const opts = JSON.stringify({
       brightnessStep: this.brightStep,
-      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable'
+      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
+      offlineAsOff: !!this.offlineAsOff
     })
     this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
@@ -227,6 +229,15 @@ module.exports = class deviceLightDimmer {
 
   markStatus (isOnline) {
     this.isOnline = isOnline
+
+    // Show as off if offline if configured by user
+    if (this.offlineAsOff && !isOnline && this.cacheState !== 'off') {
+      this.service.updateCharacteristic(this.hapChar.On, false)
+      this.cacheState = 'off'
+      if (this.enableLogging) {
+        this.log('[%s] %s [%s - offline]', this.name, this.lang.curState, this.cacheState)
+      }
+    }
   }
 
   currentState () {
diff --git a/lib/device/light-rgb-cct.js b/lib/device/light-rgb-cct.js
index 958096c0..a8960679 100644
--- a/lib/device/light-rgb-cct.js
+++ b/lib/device/light-rgb-cct.js
@@ -32,6 +32,7 @@ module.exports = class deviceLightRGBCCT {
       deviceConf && deviceConf.brightnessStep
         ? Math.min(deviceConf.brightnessStep, 100)
         : platform.consts.defaultValues.brightnessStep
+    this.offlineAsOff = deviceConf && deviceConf.offlineAsOff
 
     // Set the correct logging variables for this accessory
     this.enableLogging = !platform.config.disableDeviceLogging
@@ -180,7 +181,8 @@ module.exports = class deviceLightRGBCCT {
     const opts = JSON.stringify({
       adaptiveLightingShift: this.alShift,
       brightnessStep: this.brightStep,
-      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable'
+      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
+      offlineAsOff: !!this.offlineAsOff
     })
     this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
@@ -753,6 +755,15 @@ module.exports = class deviceLightRGBCCT {
 
   markStatus (isOnline) {
     this.isOnline = isOnline
+
+    // Show as off if offline if configured by user
+    if (this.offlineAsOff && !isOnline && this.cacheState !== 'off') {
+      this.service.updateCharacteristic(this.hapChar.On, false)
+      this.cacheState = 'off'
+      if (this.enableLogging) {
+        this.log('[%s] %s [%s - offline]', this.name, this.lang.curState, this.cacheState)
+      }
+    }
   }
 
   currentState () {
diff --git a/lib/device/light-rgb.js b/lib/device/light-rgb.js
index f73dfcab..c36fee6d 100644
--- a/lib/device/light-rgb.js
+++ b/lib/device/light-rgb.js
@@ -31,6 +31,7 @@ module.exports = class deviceLightRGB {
       deviceConf && deviceConf.brightnessStep
         ? Math.min(deviceConf.brightnessStep, 100)
         : platform.consts.defaultValues.brightnessStep
+    this.offlineAsOff = deviceConf && deviceConf.offlineAsOff
 
     // Set the correct logging variables for this accessory
     this.enableLogging = !platform.config.disableDeviceLogging
@@ -101,7 +102,8 @@ module.exports = class deviceLightRGB {
 
     // Output the customised options to the log
     const opts = JSON.stringify({
-      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable'
+      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
+      offlineAsOff: !!this.offlineAsOff
     })
     this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
   }
@@ -259,6 +261,15 @@ module.exports = class deviceLightRGB {
 
   markStatus (isOnline) {
     this.isOnline = isOnline
+
+    // Show as off if offline if configured by user
+    if (this.offlineAsOff && !isOnline && this.cacheState !== 'off') {
+      this.service.updateCharacteristic(this.hapChar.On, false)
+      this.cacheState = 'off'
+      if (this.enableLogging) {
+        this.log('[%s] %s [%s - offline]', this.name, this.lang.curState, this.cacheState)
+      }
+    }
   }
 
   currentState () {
diff --git a/lib/index.js b/lib/index.js
index 415a261f..a3b6eadd 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -295,6 +295,7 @@ class eWeLinkPlatform {
                   case 'hideSwitch':
                   case 'humidityOffsetFactor':
                   case 'isInched':
+                  case 'offlineAsOff':
                   case 'offsetFactor':
                   case 'resetOnStartup':
                   case 'scaleBattery':
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index d235814c..9c26bdb0 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -132,6 +132,7 @@ module.exports = {
       'deviceModel',
       'brightnessStep',
       'adaptiveLightingShift',
+      'offlineAsOff',
       'ipAddress',
       'overrideLogging'
     ],

From e0163cefe497ba753ec6e38702acd5078290f8ec Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 23 Apr 2022 09:37:30 +0100
Subject: [PATCH 2991/3183] add device

---
 CHANGELOG.md                             |  5 ++++-
 lib/device/motor.js                      |  4 +---
 lib/device/outlet-multi.js               |  4 +---
 lib/device/outlet-single-inched.js       | 15 ++++++++++-----
 lib/device/outlet-single.js              | 15 ++++++++++-----
 lib/device/sensor-ambient.js             |  4 +---
 lib/device/simulation/blind.js           |  4 +---
 lib/device/simulation/door.js            |  4 +---
 lib/device/simulation/doorbell.js        |  7 ++++---
 lib/device/simulation/garage-one.js      |  7 ++++---
 lib/device/simulation/garage-two.js      |  4 +---
 lib/device/simulation/gate-one.js        |  7 ++++---
 lib/device/simulation/lock-one.js        |  7 ++++---
 lib/device/simulation/p-button.js        |  7 ++++---
 lib/device/simulation/purifier.js        |  7 ++++---
 lib/device/simulation/sensor.js          |  7 ++++---
 lib/device/simulation/switch-valve.js    |  4 +---
 lib/device/simulation/tap-one.js         |  7 ++++---
 lib/device/simulation/tap-two.js         |  4 +---
 lib/device/simulation/th-cooler.js       |  4 +---
 lib/device/simulation/th-dehumidifier.js |  4 +---
 lib/device/simulation/th-heater.js       |  4 +---
 lib/device/simulation/th-humidifier.js   |  4 +---
 lib/device/simulation/th-thermostat.js   |  4 +---
 lib/device/simulation/tv.js              |  7 ++++---
 lib/device/simulation/valve-one.js       |  7 ++++---
 lib/device/simulation/valve-two.js       |  4 +---
 lib/device/simulation/window.js          |  4 +---
 lib/device/switch-multi.js               |  4 +---
 lib/device/switch-single-inched.js       | 20 +++++++++++---------
 lib/device/switch-single.js              | 20 +++++++++++---------
 lib/index.js                             |  3 ++-
 lib/utils/constants.js                   |  5 ++++-
 package-lock.json                        | 12 ++++++------
 34 files changed, 114 insertions(+), 115 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 40ea31dc..43f95497 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,8 +5,11 @@ All notable changes to homebridge-ewelink will be documented in this file.
 ## BETA
 
 ### Added
+- **New Devices**
+  - Sonoff S40
 
-- `offlineAsOff` option for light devices - enable to show offline devices as 'off' in Homebridge/HomeKit
+- **Configuration**
+  - `offlineAsOff` option for light devices - enable to show offline devices as 'off' in Homebridge/HomeKit
 
 ## 8.14.0 (2022-04-17)
 
diff --git a/lib/device/motor.js b/lib/device/motor.js
index 79a87430..646cd241 100644
--- a/lib/device/motor.js
+++ b/lib/device/motor.js
@@ -172,9 +172,7 @@ module.exports = class deviceMotor {
       }, 5000)
 
       // Stop the intervals on Homebridge shutdown
-      platform.api.on('shutdown', () => {
-        clearInterval(this.intervalPoll)
-      })
+      platform.api.on('shutdown', () => clearInterval(this.intervalPoll))
     }
 
     // Output the customised options to the log
diff --git a/lib/device/outlet-multi.js b/lib/device/outlet-multi.js
index 360dd67b..f716b86e 100644
--- a/lib/device/outlet-multi.js
+++ b/lib/device/outlet-multi.js
@@ -159,9 +159,7 @@ module.exports = class deviceOutletMulti {
       }, 5000)
 
       // Stop the intervals on Homebridge shutdown
-      platform.api.on('shutdown', () => {
-        clearInterval(this.intervalPoll)
-      })
+      platform.api.on('shutdown', () => clearInterval(this.intervalPoll))
     }
 
     // Output the customised options to the log
diff --git a/lib/device/outlet-single-inched.js b/lib/device/outlet-single-inched.js
index 0187b86e..8a1b59f8 100644
--- a/lib/device/outlet-single-inched.js
+++ b/lib/device/outlet-single-inched.js
@@ -27,6 +27,7 @@ module.exports = class deviceOutletSingleInched {
     UIID 5: single switch, with wattage readings
     UIID 32: single switch, with wattage, voltage and amp readings
     UIID 77/78/81/107: single switch but firmware uses multiple channels (only need CH0)
+    UIID 182: single switch but multiple channels with wattage, voltage and amp readings
     */
 
     // Set up custom variables for this device type
@@ -68,6 +69,7 @@ module.exports = class deviceOutletSingleInched {
 
     switch (this.accessory.context.eweUIID) {
       case 5:
+      case 182:
         // Add Eve power characteristics
         this.powerReadings = true
         if (!this.service.testCharacteristic(this.hapChar.OutletInUse)) {
@@ -116,11 +118,6 @@ module.exports = class deviceOutletSingleInched {
         }
         break
       default:
-        // Set a flag for devices with hardware that use multi-channel format
-        if (platform.consts.devices.switchSCM.includes(this.accessory.context.eweUIID)) {
-          this.isSCM = true
-        }
-
         // Remove unused Eve characteristics
         if (this.service.testCharacteristic(this.hapChar.OutletInUse)) {
           this.service.removeCharacteristic(
@@ -151,6 +148,14 @@ module.exports = class deviceOutletSingleInched {
         break
     }
 
+    // Set a flag for devices with hardware that use multi-channel format
+    if (
+      platform.consts.devices.switchSCM.includes(this.accessory.context.eweUIID) ||
+      platform.consts.devices.switchSCMPower.includes(this.accessory.context.eweUIID)
+    ) {
+      this.isSCM = true
+    }
+
     // Add the set handler to the outlet on/off characteristic
     this.service
       .getCharacteristic(this.hapChar.On)
diff --git a/lib/device/outlet-single.js b/lib/device/outlet-single.js
index 5c4d5e2f..24e1b504 100644
--- a/lib/device/outlet-single.js
+++ b/lib/device/outlet-single.js
@@ -26,6 +26,7 @@ module.exports = class deviceOutletSingle {
     UIID 5: single switch, with wattage readings
     UIID 32: single switch, with wattage, voltage and amp readings
     UIID 77/78/81/107: single switch but firmware uses multiple channels (only need CH0)
+    UIID 182: single switch but multiple channels with wattage, voltage and amp readings
     */
 
     // Set up custom variables for this device type
@@ -67,6 +68,7 @@ module.exports = class deviceOutletSingle {
 
     switch (this.accessory.context.eweUIID) {
       case 5:
+      case 182:
         // Add Eve power characteristics
         this.powerReadings = true
         if (!this.service.testCharacteristic(this.hapChar.OutletInUse)) {
@@ -115,11 +117,6 @@ module.exports = class deviceOutletSingle {
         }
         break
       default:
-        // Set a flag for devices with hardware that use multi-channel format
-        if (platform.consts.devices.switchSCM.includes(this.accessory.context.eweUIID)) {
-          this.isSCM = true
-        }
-
         // Remove unused Eve characteristics
         if (this.service.testCharacteristic(this.hapChar.OutletInUse)) {
           this.service.removeCharacteristic(
@@ -150,6 +147,14 @@ module.exports = class deviceOutletSingle {
         break
     }
 
+    // Set a flag for devices with hardware that use multi-channel format
+    if (
+      platform.consts.devices.switchSCM.includes(this.accessory.context.eweUIID) ||
+      platform.consts.devices.switchSCMPower.includes(this.accessory.context.eweUIID)
+    ) {
+      this.isSCM = true
+    }
+
     // Add the set handler to the outlet on/off characteristic
     this.service
       .getCharacteristic(this.hapChar.On)
diff --git a/lib/device/sensor-ambient.js b/lib/device/sensor-ambient.js
index 32f201bd..2dd84d63 100644
--- a/lib/device/sensor-ambient.js
+++ b/lib/device/sensor-ambient.js
@@ -153,9 +153,7 @@ module.exports = class deviceSensorAmbient {
       }, 5000)
 
       // Stop the intervals on Homebridge shutdown
-      platform.api.on('shutdown', () => {
-        clearInterval(this.intervalPoll)
-      })
+      platform.api.on('shutdown', () => clearInterval(this.intervalPoll))
     }
 
     // Output the customised options to the log
diff --git a/lib/device/simulation/blind.js b/lib/device/simulation/blind.js
index 6928fc69..e3a21c1b 100644
--- a/lib/device/simulation/blind.js
+++ b/lib/device/simulation/blind.js
@@ -106,9 +106,7 @@ module.exports = class deviceBlind {
       }, 5000)
 
       // Stop the intervals on Homebridge shutdown
-      platform.api.on('shutdown', () => {
-        clearInterval(this.intervalPoll)
-      })
+      platform.api.on('shutdown', () => clearInterval(this.intervalPoll))
     }
 
     // Output the customised options to the log
diff --git a/lib/device/simulation/door.js b/lib/device/simulation/door.js
index ac266a84..e970e58e 100644
--- a/lib/device/simulation/door.js
+++ b/lib/device/simulation/door.js
@@ -106,9 +106,7 @@ module.exports = class deviceDoor {
       }, 5000)
 
       // Stop the intervals on Homebridge shutdown
-      platform.api.on('shutdown', () => {
-        clearInterval(this.intervalPoll)
-      })
+      platform.api.on('shutdown', () => clearInterval(this.intervalPoll))
     }
 
     // Output the customised options to the log
diff --git a/lib/device/simulation/doorbell.js b/lib/device/simulation/doorbell.js
index 8e08ada7..6741108e 100644
--- a/lib/device/simulation/doorbell.js
+++ b/lib/device/simulation/doorbell.js
@@ -69,6 +69,9 @@ module.exports = class deviceDoorbell {
       }
     } else if (platform.consts.devices.switchSCM.includes(this.accessory.context.eweUIID)) {
       this.setup = 'switchMulti'
+    } else if (platform.consts.devices.switchSCMPower.includes(this.accessory.context.eweUIID)) {
+      // Could do power here
+      this.setup = 'switchMulti'
     }
 
     // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
@@ -92,9 +95,7 @@ module.exports = class deviceDoorbell {
       }, 5000)
 
       // Stop the intervals on Homebridge shutdown
-      platform.api.on('shutdown', () => {
-        clearInterval(this.intervalPoll)
-      })
+      platform.api.on('shutdown', () => clearInterval(this.intervalPoll))
     }
 
     // Output the customised options to the log
diff --git a/lib/device/simulation/garage-one.js b/lib/device/simulation/garage-one.js
index 4792e6d4..b96731f6 100644
--- a/lib/device/simulation/garage-one.js
+++ b/lib/device/simulation/garage-one.js
@@ -123,6 +123,9 @@ module.exports = class deviceGarageOne {
       }
     } else if (platform.consts.devices.switchSCM.includes(this.accessory.context.eweUIID)) {
       this.setup = 'switchMulti'
+    } else if (platform.consts.devices.switchSCMPower.includes(this.accessory.context.eweUIID)) {
+      // Could do power here
+      this.setup = 'switchMulti'
     }
 
     // Add the set handler to the garage door reset total characteristic
@@ -171,9 +174,7 @@ module.exports = class deviceGarageOne {
       }, 5000)
 
       // Stop the intervals on Homebridge shutdown
-      platform.api.on('shutdown', () => {
-        clearInterval(this.intervalPoll)
-      })
+      platform.api.on('shutdown', () => clearInterval(this.intervalPoll))
     }
 
     // Output the customised options to the log
diff --git a/lib/device/simulation/garage-two.js b/lib/device/simulation/garage-two.js
index 503df199..7bb08677 100644
--- a/lib/device/simulation/garage-two.js
+++ b/lib/device/simulation/garage-two.js
@@ -118,9 +118,7 @@ module.exports = class deviceGarageTwo {
       }, 5000)
 
       // Stop the intervals on Homebridge shutdown
-      platform.api.on('shutdown', () => {
-        clearInterval(this.intervalPoll)
-      })
+      platform.api.on('shutdown', () => clearInterval(this.intervalPoll))
     }
 
     // Output the customised options to the log
diff --git a/lib/device/simulation/gate-one.js b/lib/device/simulation/gate-one.js
index 8cf6343e..804d45d3 100644
--- a/lib/device/simulation/gate-one.js
+++ b/lib/device/simulation/gate-one.js
@@ -98,6 +98,9 @@ module.exports = class deviceGateOne {
       }
     } else if (platform.consts.devices.switchSCM.includes(this.accessory.context.eweUIID)) {
       this.setup = 'switchMulti'
+    } else if (platform.consts.devices.switchSCMPower.includes(this.accessory.context.eweUIID)) {
+      // Could do power here
+      this.setup = 'switchMulti'
     }
 
     // Add the set handler to the garage door reset total characteristic
@@ -149,9 +152,7 @@ module.exports = class deviceGateOne {
       }, 5000)
 
       // Stop the intervals on Homebridge shutdown
-      platform.api.on('shutdown', () => {
-        clearInterval(this.intervalPoll)
-      })
+      platform.api.on('shutdown', () => clearInterval(this.intervalPoll))
     }
 
     // Output the customised options to the log
diff --git a/lib/device/simulation/lock-one.js b/lib/device/simulation/lock-one.js
index 8b5a310d..8838263f 100644
--- a/lib/device/simulation/lock-one.js
+++ b/lib/device/simulation/lock-one.js
@@ -97,6 +97,9 @@ module.exports = class deviceLockOne {
       }
     } else if (platform.consts.devices.switchSCM.includes(this.accessory.context.eweUIID)) {
       this.setup = 'switchMulti'
+    } else if (platform.consts.devices.switchSCMPower.includes(this.accessory.context.eweUIID)) {
+      // Could do power here
+      this.setup = 'switchMulti'
     }
 
     // Add the set handler to the lock target state characteristic
@@ -138,9 +141,7 @@ module.exports = class deviceLockOne {
       }, 5000)
 
       // Stop the intervals on Homebridge shutdown
-      platform.api.on('shutdown', () => {
-        clearInterval(this.intervalPoll)
-      })
+      platform.api.on('shutdown', () => clearInterval(this.intervalPoll))
     }
 
     // Output the customised options to the log
diff --git a/lib/device/simulation/p-button.js b/lib/device/simulation/p-button.js
index 05853d7c..fc15ccd8 100644
--- a/lib/device/simulation/p-button.js
+++ b/lib/device/simulation/p-button.js
@@ -96,6 +96,9 @@ module.exports = class devicePButton {
       }
     } else if (platform.consts.devices.switchSCM.includes(this.accessory.context.eweUIID)) {
       this.setup = 'switchMulti'
+    } else if (platform.consts.devices.switchSCMPower.includes(this.accessory.context.eweUIID)) {
+      // Could do power here
+      this.setup = 'switchMulti'
     }
 
     // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
@@ -119,9 +122,7 @@ module.exports = class devicePButton {
       }, 5000)
 
       // Stop the intervals on Homebridge shutdown
-      platform.api.on('shutdown', () => {
-        clearInterval(this.intervalPoll)
-      })
+      platform.api.on('shutdown', () => clearInterval(this.intervalPoll))
     }
 
     // Output the customised options to the log
diff --git a/lib/device/simulation/purifier.js b/lib/device/simulation/purifier.js
index b9b69410..11ebde6b 100644
--- a/lib/device/simulation/purifier.js
+++ b/lib/device/simulation/purifier.js
@@ -95,6 +95,9 @@ module.exports = class devicePurifier {
       }
     } else if (platform.consts.devices.switchSCM.includes(this.accessory.context.eweUIID)) {
       this.setup = 'switchMulti'
+    } else if (platform.consts.devices.switchSCMPower.includes(this.accessory.context.eweUIID)) {
+      // Could do power here
+      this.setup = 'switchMulti'
     }
 
     // Add the set handler to the purifier active characteristic
@@ -145,9 +148,7 @@ module.exports = class devicePurifier {
       }, 5000)
 
       // Stop the intervals on Homebridge shutdown
-      platform.api.on('shutdown', () => {
-        clearInterval(this.intervalPoll)
-      })
+      platform.api.on('shutdown', () => clearInterval(this.intervalPoll))
     }
 
     // Output the customised options to the log
diff --git a/lib/device/simulation/sensor.js b/lib/device/simulation/sensor.js
index 1552d072..50829382 100644
--- a/lib/device/simulation/sensor.js
+++ b/lib/device/simulation/sensor.js
@@ -145,6 +145,9 @@ module.exports = class deviceSensor {
       }
     } else if (platform.consts.devices.switchSCM.includes(this.accessory.context.eweUIID)) {
       this.setup = 'switchMulti'
+    } else if (platform.consts.devices.switchSCMPower.includes(this.accessory.context.eweUIID)) {
+      // Could do power here
+      this.setup = 'switchMulti'
     }
 
     // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
@@ -173,9 +176,7 @@ module.exports = class deviceSensor {
       }, 5000)
 
       // Stop the intervals on Homebridge shutdown
-      platform.api.on('shutdown', () => {
-        clearInterval(this.intervalPoll)
-      })
+      platform.api.on('shutdown', () => clearInterval(this.intervalPoll))
     }
 
     // Output the customised options to the log
diff --git a/lib/device/simulation/switch-valve.js b/lib/device/simulation/switch-valve.js
index 4a096b3e..25eb3bfb 100644
--- a/lib/device/simulation/switch-valve.js
+++ b/lib/device/simulation/switch-valve.js
@@ -140,9 +140,7 @@ module.exports = class deviceSwitchValve {
       }, 5000)
 
       // Stop the intervals on Homebridge shutdown
-      platform.api.on('shutdown', () => {
-        clearInterval(this.intervalPoll)
-      })
+      platform.api.on('shutdown', () => clearInterval(this.intervalPoll))
     }
 
     // Output the customised options to the log
diff --git a/lib/device/simulation/tap-one.js b/lib/device/simulation/tap-one.js
index 14b741d3..eb8a53d0 100644
--- a/lib/device/simulation/tap-one.js
+++ b/lib/device/simulation/tap-one.js
@@ -94,6 +94,9 @@ module.exports = class deviceTapOne {
       }
     } else if (platform.consts.devices.switchSCM.includes(this.accessory.context.eweUIID)) {
       this.setup = 'switchMulti'
+    } else if (platform.consts.devices.switchSCMPower.includes(this.accessory.context.eweUIID)) {
+      // Could do power here
+      this.setup = 'switchMulti'
     }
 
     // Add the set handler to the tap active characteristic
@@ -122,9 +125,7 @@ module.exports = class deviceTapOne {
       }, 5000)
 
       // Stop the intervals on Homebridge shutdown
-      platform.api.on('shutdown', () => {
-        clearInterval(this.intervalPoll)
-      })
+      platform.api.on('shutdown', () => clearInterval(this.intervalPoll))
     }
 
     // Output the customised options to the log
diff --git a/lib/device/simulation/tap-two.js b/lib/device/simulation/tap-two.js
index 05841f9d..75bdb15f 100644
--- a/lib/device/simulation/tap-two.js
+++ b/lib/device/simulation/tap-two.js
@@ -97,9 +97,7 @@ module.exports = class deviceTapTwo {
       }, 5000)
 
       // Stop the intervals on Homebridge shutdown
-      platform.api.on('shutdown', () => {
-        clearInterval(this.intervalPoll)
-      })
+      platform.api.on('shutdown', () => clearInterval(this.intervalPoll))
     }
 
     // Output the customised options to the log
diff --git a/lib/device/simulation/th-cooler.js b/lib/device/simulation/th-cooler.js
index 51dc179e..1da42aa5 100644
--- a/lib/device/simulation/th-cooler.js
+++ b/lib/device/simulation/th-cooler.js
@@ -209,9 +209,7 @@ module.exports = class deviceTHCooler {
       }, 5000)
 
       // Stop the intervals on Homebridge shutdown
-      platform.api.on('shutdown', () => {
-        clearInterval(this.intervalPoll)
-      })
+      platform.api.on('shutdown', () => clearInterval(this.intervalPoll))
     }
 
     // Output the customised options to the log
diff --git a/lib/device/simulation/th-dehumidifier.js b/lib/device/simulation/th-dehumidifier.js
index 5270b5f7..d0d3f69a 100644
--- a/lib/device/simulation/th-dehumidifier.js
+++ b/lib/device/simulation/th-dehumidifier.js
@@ -192,9 +192,7 @@ module.exports = class deviceTHDehumidifier {
       }, 5000)
 
       // Stop the intervals on Homebridge shutdown
-      platform.api.on('shutdown', () => {
-        clearInterval(this.intervalPoll)
-      })
+      platform.api.on('shutdown', () => clearInterval(this.intervalPoll))
     }
 
     // Output the customised options to the log
diff --git a/lib/device/simulation/th-heater.js b/lib/device/simulation/th-heater.js
index 14dd03cb..2d95da69 100644
--- a/lib/device/simulation/th-heater.js
+++ b/lib/device/simulation/th-heater.js
@@ -211,9 +211,7 @@ module.exports = class deviceTHHeater {
       }, 5000)
 
       // Stop the intervals on Homebridge shutdown
-      platform.api.on('shutdown', () => {
-        clearInterval(this.intervalPoll)
-      })
+      platform.api.on('shutdown', () => clearInterval(this.intervalPoll))
     }
 
     // Output the customised options to the log
diff --git a/lib/device/simulation/th-humidifier.js b/lib/device/simulation/th-humidifier.js
index 970ec65b..6e83b1fc 100644
--- a/lib/device/simulation/th-humidifier.js
+++ b/lib/device/simulation/th-humidifier.js
@@ -192,9 +192,7 @@ module.exports = class deviceTHHumidifier {
       }, 5000)
 
       // Stop the intervals on Homebridge shutdown
-      platform.api.on('shutdown', () => {
-        clearInterval(this.intervalPoll)
-      })
+      platform.api.on('shutdown', () => clearInterval(this.intervalPoll))
     }
 
     // Output the customised options to the log
diff --git a/lib/device/simulation/th-thermostat.js b/lib/device/simulation/th-thermostat.js
index e773d50b..3a0d3838 100644
--- a/lib/device/simulation/th-thermostat.js
+++ b/lib/device/simulation/th-thermostat.js
@@ -215,9 +215,7 @@ module.exports = class deviceTHThermostat {
       }, 5000)
 
       // Stop the intervals on Homebridge shutdown
-      platform.api.on('shutdown', () => {
-        clearInterval(this.intervalPoll)
-      })
+      platform.api.on('shutdown', () => clearInterval(this.intervalPoll))
     }
 
     // Output the customised options to the log
diff --git a/lib/device/simulation/tv.js b/lib/device/simulation/tv.js
index fdd0eeab..a166060a 100644
--- a/lib/device/simulation/tv.js
+++ b/lib/device/simulation/tv.js
@@ -86,6 +86,9 @@ module.exports = class deviceTV {
       }
     } else if (platform.consts.devices.switchSCM.includes(this.accessory.context.eweUIID)) {
       this.setup = 'switchMulti'
+    } else if (platform.consts.devices.switchSCMPower.includes(this.accessory.context.eweUIID)) {
+      // Could do power here
+      this.setup = 'switchMulti'
     }
 
     // Add the set handler to the tv active characteristic
@@ -114,9 +117,7 @@ module.exports = class deviceTV {
       }, 5000)
 
       // Stop the intervals on Homebridge shutdown
-      platform.api.on('shutdown', () => {
-        clearInterval(this.intervalPoll)
-      })
+      platform.api.on('shutdown', () => clearInterval(this.intervalPoll))
     }
 
     // Output the customised options to the log
diff --git a/lib/device/simulation/valve-one.js b/lib/device/simulation/valve-one.js
index a96640e1..88871c57 100644
--- a/lib/device/simulation/valve-one.js
+++ b/lib/device/simulation/valve-one.js
@@ -97,6 +97,9 @@ module.exports = class deviceValveOne {
       }
     } else if (platform.consts.devices.switchSCM.includes(this.accessory.context.eweUIID)) {
       this.setup = 'switchMulti'
+    } else if (platform.consts.devices.switchSCMPower.includes(this.accessory.context.eweUIID)) {
+      // Could do power here
+      this.setup = 'switchMulti'
     }
 
     // Add the set handler to the valve active characteristic
@@ -154,9 +157,7 @@ module.exports = class deviceValveOne {
       }, 5000)
 
       // Stop the intervals on Homebridge shutdown
-      platform.api.on('shutdown', () => {
-        clearInterval(this.intervalPoll)
-      })
+      platform.api.on('shutdown', () => clearInterval(this.intervalPoll))
     }
 
     // Output the customised options to the log
diff --git a/lib/device/simulation/valve-two.js b/lib/device/simulation/valve-two.js
index 2b95b26f..254669a5 100644
--- a/lib/device/simulation/valve-two.js
+++ b/lib/device/simulation/valve-two.js
@@ -133,9 +133,7 @@ module.exports = class deviceValveTwo {
       }, 5000)
 
       // Stop the intervals on Homebridge shutdown
-      platform.api.on('shutdown', () => {
-        clearInterval(this.intervalPoll)
-      })
+      platform.api.on('shutdown', () => clearInterval(this.intervalPoll))
     }
 
     // Output the customised options to the log
diff --git a/lib/device/simulation/window.js b/lib/device/simulation/window.js
index 53d696b3..44e85110 100644
--- a/lib/device/simulation/window.js
+++ b/lib/device/simulation/window.js
@@ -106,9 +106,7 @@ module.exports = class deviceWindow {
       }, 5000)
 
       // Stop the intervals on Homebridge shutdown
-      platform.api.on('shutdown', () => {
-        clearInterval(this.intervalPoll)
-      })
+      platform.api.on('shutdown', () => clearInterval(this.intervalPoll))
     }
 
     // Output the customised options to the log
diff --git a/lib/device/switch-multi.js b/lib/device/switch-multi.js
index 50852c98..b0484086 100644
--- a/lib/device/switch-multi.js
+++ b/lib/device/switch-multi.js
@@ -156,9 +156,7 @@ module.exports = class deviceSwitchMulti {
       }, 5000)
 
       // Stop the intervals on Homebridge shutdown
-      platform.api.on('shutdown', () => {
-        clearInterval(this.intervalPoll)
-      })
+      platform.api.on('shutdown', () => clearInterval(this.intervalPoll))
     }
 
     // Output the customised options to the log
diff --git a/lib/device/switch-single-inched.js b/lib/device/switch-single-inched.js
index 38f5d1b5..e082b041 100644
--- a/lib/device/switch-single-inched.js
+++ b/lib/device/switch-single-inched.js
@@ -27,6 +27,7 @@ module.exports = class deviceSwitchSingleInched {
     UIID 5: single switch, with wattage readings
     UIID 32: single switch, with wattage, voltage and amp readings
     UIID 77/78/81/107: single switch but firmware uses multiple channels (only need CH0)
+    UIID 182: single switch but multiple channels with wattage, voltage and amp readings
     */
 
     // Set up custom variables for this device type
@@ -68,6 +69,7 @@ module.exports = class deviceSwitchSingleInched {
 
     switch (this.accessory.context.eweUIID) {
       case 5:
+      case 182:
         // Add Eve power characteristics
         this.powerReadings = true
         if (!this.service.testCharacteristic(this.hapChar.OutletInUse)) {
@@ -104,11 +106,6 @@ module.exports = class deviceSwitchSingleInched {
         }
         break
       default:
-        // Set a flag for devices with hardware that use multi-channel format
-        if (platform.consts.devices.switchSCM.includes(this.accessory.context.eweUIID)) {
-          this.isSCM = true
-        }
-
         // Remove unused Eve characteristics
         if (this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
           this.service.removeCharacteristic(
@@ -126,6 +123,14 @@ module.exports = class deviceSwitchSingleInched {
         break
     }
 
+    // Set a flag for devices with hardware that use multi-channel format
+    if (
+      platform.consts.devices.switchSCM.includes(this.accessory.context.eweUIID) ||
+      platform.consts.devices.switchSCMPower.includes(this.accessory.context.eweUIID)
+    ) {
+      this.isSCM = true
+    }
+
     // Add the set handler to the switch on/off characteristic
     this.service
       .getCharacteristic(this.hapChar.On)
@@ -169,10 +174,7 @@ module.exports = class deviceSwitchSingleInched {
       }, 5000)
 
       // Stop the intervals on Homebridge shutdown
-      platform.api.on('shutdown', () => {
-        clearInterval(this.intervalPoll)
-        clearInterval(this.intervalPower)
-      })
+      platform.api.on('shutdown', () => clearInterval(this.intervalPoll))
     }
 
     // Output the customised options to the log
diff --git a/lib/device/switch-single.js b/lib/device/switch-single.js
index f28b8052..7c51a99e 100644
--- a/lib/device/switch-single.js
+++ b/lib/device/switch-single.js
@@ -26,6 +26,7 @@ module.exports = class deviceSwitchSingle {
     UIID 5: single switch, with wattage readings
     UIID 32: single switch, with wattage, voltage and amp readings
     UIID 77/78/81/107: single switch but firmware uses multiple channels (only need CH0)
+    UIID 182: single switch but multiple channels with wattage, voltage and amp readings
     */
 
     // Set up custom variables for this device type
@@ -67,6 +68,7 @@ module.exports = class deviceSwitchSingle {
 
     switch (this.accessory.context.eweUIID) {
       case 5:
+      case 182:
         // Add Eve power characteristics
         this.powerReadings = true
         if (!this.service.testCharacteristic(this.hapChar.OutletInUse)) {
@@ -103,11 +105,6 @@ module.exports = class deviceSwitchSingle {
         }
         break
       default:
-        // Set a flag for devices with hardware that use multi-channel format
-        if (platform.consts.devices.switchSCM.includes(this.accessory.context.eweUIID)) {
-          this.isSCM = true
-        }
-
         // Remove unused Eve characteristics
         if (this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
           this.service.removeCharacteristic(
@@ -125,6 +122,14 @@ module.exports = class deviceSwitchSingle {
         break
     }
 
+    // Set a flag for devices with hardware that use multi-channel format
+    if (
+      platform.consts.devices.switchSCM.includes(this.accessory.context.eweUIID) ||
+      platform.consts.devices.switchSCMPower.includes(this.accessory.context.eweUIID)
+    ) {
+      this.isSCM = true
+    }
+
     // Add the set handler to the switch on/off characteristic
     this.service
       .getCharacteristic(this.hapChar.On)
@@ -154,10 +159,7 @@ module.exports = class deviceSwitchSingle {
       }, 5000)
 
       // Stop the intervals on Homebridge shutdown
-      platform.api.on('shutdown', () => {
-        clearInterval(this.intervalPoll)
-        clearInterval(this.intervalPower)
-      })
+      platform.api.on('shutdown', () => clearInterval(this.intervalPoll))
     }
 
     // Output the customised options to the log
diff --git a/lib/index.js b/lib/index.js
index a3b6eadd..feb0d596 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1142,7 +1142,8 @@ class eWeLinkPlatform {
       } else if (
         this.consts.devices.switchSingle.includes(uiid) ||
         this.consts.devices.switchSinglePower.includes(uiid) ||
-        this.consts.devices.switchSCM.includes(uiid)
+        this.consts.devices.switchSCM.includes(uiid) ||
+        this.consts.devices.switchSCMPower.includes(uiid)
       ) {
         /********************************
         SWITCHES/OUTLETS [SINGLE CHANNEL]
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 9c26bdb0..e5d45284 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -287,10 +287,12 @@ module.exports = {
       160,
       161,
       162,
-      165
+      165,
+      182
     ],
     switchSingle: [1, 6, 14, 24, 27, 1009, 1256, 7004],
     switchSCM: [77, 78, 81, 107, 112, 138, 160],
+    switchSCMPower: [182],
     switchSinglePower: [5, 32],
     switchMulti: [
       2,
@@ -476,6 +478,7 @@ module.exports = {
     162: 3, // "SwitchMan Smart Wall Switch-M5 - 3 Gang"
     165: 2, // "DUALR3 Lite"
     177: 1, // Switch Mate
+    182: 1, // Power Detection Plug Overload Alarm-Multi-Channel Protocols (S40)
     1000: 1, // "zigbee_ON_OFF_SWITCH_1000" (button device)
     1009: 1, // "" (Some sort of single switch device)
     1256: 1, // "ZIGBEE_SINGLE_SWITCH"
diff --git a/package-lock.json b/package-lock.json
index 899b7d14..c216cce7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -202,9 +202,9 @@
       }
     },
     "node_modules/has-bigints": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.1.tgz",
-      "integrity": "sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
+      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -724,9 +724,9 @@
       }
     },
     "has-bigints": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.1.tgz",
-      "integrity": "sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA=="
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
+      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ=="
     },
     "has-property-descriptors": {
       "version": "1.0.0",

From ef57201994be22f55a01c662c07b36babd1c50b9 Mon Sep 17 00:00:00 2001
From: Suthep Yonpimai <tomzt@users.noreply.github.com>
Date: Mon, 2 May 2022 15:50:39 +0700
Subject: [PATCH 2992/3183] Create lang-th.js

Create Thai language and Translate English to Thai
---
 lib/utils/lang-th.js | 174 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 174 insertions(+)
 create mode 100644 lib/utils/lang-th.js

diff --git a/lib/utils/lang-th.js b/lib/utils/lang-th.js
new file mode 100644
index 00000000..cbc98ad8
--- /dev/null
+++ b/lib/utils/lang-th.js
@@ -0,0 +1,174 @@
+/* jshint node: true, esversion: 10, -W014, -W033 */
+/* eslint-disable new-cap */
+'use strict'
+
+module.exports = {
+  apiListenErr: 'ข้อผิดพลาดเซิร์ฟเวอร์ API ภายใน',
+  apiListening: 'การฟัง API ภายในบนพอร์ต',
+  apiShutdown: 'API ภายในปิดได้อย่างสมบูรณ์',
+  buttonDouble: 'กดสองครั้ง',
+  buttonLong: 'กดค้าง',
+  buttonNotFound: 'ไม่พบปุ่ม rf (รีสตาร์ท Homebridge)',
+  buttonSingle: 'กดครั้งเดียว',
+  buttonTrig: 'ปุ่มได้ถูกกระตุ้นแล้ว',
+  cantReadPacket: 'ข้อความจาก LAN ไม่สามารถได้เป็น',
+  cantParsePacket: 'ไม่สามารถแยกวิเคราะห์แพ็กเก็ต DNS เป็น',
+  cfgDef: 'ไม่ใช่ตัวเลขที่ถูกต้องดังนั้นใช้ค่าเริ่มต้นของ',
+  cfgDup: 'จะถูกละเว้นเนื่องจากมีรายการอื่นที่มี ID นี้อยู่แล้ว',
+  cfgIgn: 'ไม่ได้กำหนดค่าอย่างถูกต้องดังนั้นจะถูกละเว้นไว้',
+  cfgIgnItem: 'มีรายการที่ไม่ถูกต้องซึ่งจะถูกละเว้นไว้',
+  cfgItem: 'รายการกำหนดค่า',
+  cfgLow: 'ถูกตั้งไว้ต่ำเกินไปจึงเพิ่มขึ้นเป็น',
+  cfgRmv: 'ไม่ได้ใช้งานและสามารถนำออกได้',
+  cfgQts: 'ไม่ควรมีเครื่องหมายคำพูดรอบรายการ',
+  complete: '✓ การตั้งค่าเสร็จสมบูรณ์',
+  contactNo: 'ไม่พบการติดต่อ',
+  contactYes: 'ตรวจพบการติดต่อแล้ว',
+  curBatt: 'สถานะแบตเตอรี่',
+  curBright: 'ความสว่างในตอนนี้',
+  curColour: 'สีตอนนี้',
+  curCool: 'ความเย็นในตอนนี้',
+  curCurr: 'กระแสในตอนนี้',
+  curDehumid: 'ค่าความชื้นในตอนนี้',
+  curHeat: 'ค่าความร้อนในตอนนี้',
+  curHumi: 'ค่าความชื้นในตอนนี้',
+  curHumid: 'ค่าความชื้นในตอนนี้',
+  curLight: 'แสงตอนนี้',
+  curMode: 'โหมดตอนนี้',
+  curPos: 'ตำแหน่งตอนนี้',
+  curPower: 'กำลังไฟตอนนี้',
+  curPur: 'การทำให้บริสุทธิ์ในตอนนี้',
+  curScene: 'ฉากตอนนี้',
+  curSpeed: 'ความเร็วในตอนนี้',
+  curState: 'สถานะตอนนี้',
+  curTarg: 'เป้าหมายตอนนี้',
+  curTemp: 'อุณหภูมิตอนนี้',
+  curVolt: 'แรงดันตอนนี้',
+  devAdd: 'ถูกเพิ่มใน Homebridge แล้ว',
+  devInit: 'เริ่มต้นและ',
+  devInitGroup: 'เริ่มต้นด้วยรหัสกลุ่ม',
+  devInitOpts: 'เริ่มต้นด้วยตัวเลือก',
+  devNewNotAdd: 'รีสตาร์ท Homebridge เพื่อเพิ่มอุปกรณ์ใหม่ ไม่สามารถเพิ่มโดยอัตโนมัติเป็น',
+  devNoAPIKey: 'ไม่สามารถเรียกคีย์ API ของอุปกรณ์ได้',
+  devNoControl: 'ไม่สามารถควบคุมเป็นโหมด: LAN เข้ากันไม่ได้กับอุปกรณ์นี้',
+  devNotAdd: 'ไม่สามารถเพิ่มใน Homebridge เป็น',
+  devNotConf: 'ไม่สามารถกำหนดค่าเป็น',
+  devNotConfLAN: 'อุปกรณ์/คำสั่งไม่พร้อมใช้งานผ่านโหมด LAN',
+  devNotFound: 'ไม่พบอุปกรณ์ใน eWeLink',
+  devNotInit: 'ไม่สามารถเริ่มต้นเป็น',
+  devNotReachLAN: 'อุปกรณ์ไม่สามารถเข้าถึงได้ผ่านโหมด LAN',
+  devNotRf: 'ไม่สามารถรีเฟรชได้เป็น',
+  devNotRemove: 'ไม่สามารถลบออกจาก Homebridge ได้เหมือน',
+  devNotSup: 'ไม่ได้เพิ่มเพราะไม่รองรับ',
+  devNotSupYet: 'ไม่รองรับ แจ้งปัญหาใน GitHub ด้วยข้อมูลต่อไปนี้',
+  devNotUpd: 'การอัปเดตอุปกรณ์ล้มเหลวเนื่องจาก',
+  devRemove: 'ถูกลบออกจาก Homebridge แล้ว',
+  disabled: 'หากต้องการเปลี่ยนแปลง ให้ตั้งค่า ปิดการใช้งานปลั๊กอิน เป็น false',
+  disabledAL: 'ระบบปรับแสงอัตโนมัติถูกปิดใช้งานเนื่องจากการเปลี่ยนสีอย่างมีนัยสำคัญ',
+  disabling: 'ปิดการใช้งานปลั๊กอิน',
+  doorClosed: 'ปิดแล้ว',
+  doorOpen: 'เปิด',
+  dualr3NoCalib: 'ต้องสอบเทียบให้ทำงานในโหมดมอเตอร์',
+  dualr3NoMeter: 'ไม่รองรับโหมดมิเตอร์',
+  errGetDevice: 'เกิดข้อผิดพลาดระหว่าง http getDevice()',
+  errGetDevices: 'เกิดข้อผิดพลาดระหว่าง http getDevices()',
+  errGetHomes: 'เกิดข้อผิดพลาดระหว่าง http getHomes()',
+  errGetHost: 'เกิดข้อผิดพลาดระหว่าง ws getHost()',
+  errLogin: 'เกิดข้อผิดพลาดระหว่างการเข้าสู่ระบบ http()',
+  eweError: 'เกิดข้อผิดพลาด eWeLink [500] ลองอีกครั้งใน 30 วินาที',
+  fetchHome: 'กำลังดึงอุปกรณ์จาก eWeLink home/id',
+  foundWithIP: 'พบในท้องที่ด้วย IP',
+  foundWithManIP: 'ใช้ IP ด้วยตนเอง',
+  hbVersionFail: 'เวอร์ชัน Homebridge ของคุณต่ำเกินไป - อัปเดตเป็น v1.3',
+  heaterSimNoSensor: 'คุณต้องกำหนดค่า ID อุปกรณ์ที่ให้การอ่านอุณหภูมิ',
+  httpDisabled: 'ไคลเอ็นต์ HTTP/WS ถูกปิดใช้งานเป็น',
+  httpLogin10003: 'ดู http://bit.ly/hb-ewelink-errors สำหรับข้อมูลเพิ่มเติมเกี่ยวกับปัญหาการเข้าสู่ระบบ',
+  httpRetry: 'ไม่สามารถเข้าถึง eWeLink ได้ ลองอีกครั้งใน 30 วินาที',
+  identify: 'ระบุปุ่มกด',
+  initialised: 'ปลั๊กอินเริ่มต้น กำลังตั้งค่าอุปกรณ์เสริม...',
+  initialising: 'กำลังเริ่มต้นปลั๊กอิน',
+  invalidConfig: 'config ไม่ถูกต้อง',
+  lanDisabled: 'โหมด LAN ถูกปิดใช้งาน',
+  lanErr: 'ข้อผิดพลาด LAN ที่ไม่รู้จัก',
+  lanIPDifferent: 'ละเว้น IP ด้วยตนเองตั้งแต่ค้นพบด้วย IP ที่แตกต่างกัน',
+  lanMonitor: 'เริ่มการตรวจสอบ LAN แล้ว',
+  lanNotSup: 'ไม่รองรับโหมด LAN ในการส่งการอัปเดตไปยังอุปกรณ์นี้',
+  lanStarted: 'การค้นหาใน LAN เสร็จสมบูรณ์',
+  lanStarting: 'การค้นหาใน LAN เริ่มต้นg',
+  lanUnsupported: 'โหมด LAN ไม่พร้อมใช้งานเนื่องจากไม่พบ/สนับสนุน',
+  leakNo: 'ตรวจไม่พบการรั่ว',
+  leakYes: 'ตรวจพบการรั่ว',
+  lockLocked: 'ล็อคแล้ว',
+  lockUnlocked: 'ปลดล็อคแล้ว',
+  missingCreds: 'ไม่ได้กำหนดค่าข้อมูลรับรอง eWeLink',
+  motionNo: 'ตรวจไม่พบการเคลื่อนไหว',
+  motionYes: 'ตรวจพบการเคลื่อนไหว',
+  newIP: 'เปลี่ยนที่อยู่ IP เป็น',
+  newRegionRec: 'ได้รับโฮสต์ HTTP API ใหม่แล้ว',
+  noAuthRec: 'ไม่ได้รับโทเค็นการตรวจสอบสิทธิ์',
+  noGarageForOD: 'ไม่พบอุปกรณ์เสริมประตูโรงรถที่สอดคล้องกัน',
+  noRegionRec: 'ไม่ได้รับภูมิภาคที่ถูกต้อง',
+  noWSHost: 'เซิร์ฟเวอร์ไม่ตอบสนองกับโฮสต์เว็บซ็อกเก็ต',
+  pluginNotConf: 'ปลั๊กอินไม่ได้รับการกำหนดค่า',
+  repOffline: 'มีการรายงาน [ออฟไลน์]',
+  repOnline: 'มีการรายงาน [ออนไลน์]',
+  revertWS: 'เปลี่ยนกลับเป็นเว็บซ็อกเก็ตเป็น',
+  rfNotFound: 'ลองรีสตาร์ท Homebridge เนื่องจากไม่พบอุปกรณ์เสริมสำหรับ',
+  rfTrigNo: 'ไม่ถูกกระตุ้น',
+  rfTrigYes: 'ถูกกระตุ้น',
+  sendLogin: 'กำลังส่งคำขอเข้าสู่ระบบ HTTP ()',
+  sensorErr: 'ไม่รองรับเป็น ลด/เพิ่มความชื้นเนื่องจากอุปกรณ์ไม่รองรับเซ็นเซอร์',
+  sensorNo: 'ปิดการใช้งาน',
+  sensorNoDevice: 'ไม่พบอุปกรณ์โรงรถ/ล็อค อุปกรณ์นี้จะถูกตั้งค่าเป็นเซ็นเซอร์ปกติ',
+  sensorYes: 'เปิดใช้งาน',
+  shareWarn: 'การใช้อุปกรณ์ที่ใช้ร่วมกันกับคลาวด์อาจทำให้เกิดข้อผิดพลาด ใช้บัญชี eWeLink หลักของคุณ',
+  smokeNo: 'ตรวจไม่พบควัน',
+  smokeYes: 'ตรวจพบควัน',
+  sonoffCamera: 'ดูวิกิ homebridge-ewelink สำหรับรายละเอียดเพื่อเปิดใช้งานกล้อง',
+  stoppedLAN: 'การตรวจสอบ LAN หยุดลงอย่างสมบูรณ์',
+  stoppedWS: 'เว็บซ็อกเก็ตปิดอย่างสมบูรณ์',
+  storageClearErr: 'ไม่สามารถล้างโฟลเดอร์ที่เก็บข้อมูลเป็น',
+  storageReadErr: 'ไม่สามารถอ่านโฟลเดอร์คงอยู่เป็น',
+  storageSetupErr: 'ไม่สามารถตั้งค่าไคลเอนต์ที่เก็บข้อมูลเป็น',
+  storageWriteErr: 'ไม่สามารถบันทึกอุปกรณ์เสริมลงในไฟล์เป็น',
+  unreachable: 'มันเข้าถึงไม่ได้',
+  updRec: 'ได้รับการปรับปรุง',
+  updReq: 'ขอสถานะปัจจุบัน',
+  updSend: 'กำลังส่งการปรับปรุง',
+  valveNo: 'หยุดแล้ว',
+  valveYes: 'กำลังดำเนินงาน',
+  viaAL: 'ผ่านแสงแบบปรับได้',
+  viaLAN: 'ผ่าน LAN',
+  viaWS: 'ผ่าน WS',
+  wsHostRec: 'ได้รับโฮสต์เว็บซ็อกเก็ต',
+  wsLogin: 'กำลังส่งคำขอเข้าสู่ระบบ WS',
+  wsLoginErr: 'ได้รับพารามิเตอร์ WS ที่ไม่รู้จัก',
+  wsLoginError: 'การเข้าสู่ระบบ WS ล้มเหลวเนื่องจาก',
+  wsLoginErrRecon: 'ไม่สามารถเปิด WS ได้และจะลองอีกครั้งใน 5 วินาที',
+  wsLoginSuccess: 'เข้าสู่ระบบ WS สำเร็จ',
+  wsLogin406: 'การเข้าสู่ระบบ WS ล้มเหลว [406] ดู http://bit.ly/hb-ewelink-errors',
+  wsPingError: 'ไม่สามารถส่ง WS ping เป็น',
+  wsRec: 'ได้รับข้อความ WS',
+  wsReconnectClose: 'WS ปิดเหตุการณ์และจะพยายามเชื่อมต่อใหม่ใน 5 วินาที',
+  wsReconnectError: 'เหตุการณ์ข้อผิดพลาด WS และจะพยายามเชื่อมต่อใหม่ใน 5 วินาที',
+  wsRef: 'กำลังรีเฟรชการเชื่อมต่อ WS',
+  wsRefFail: 'การรีเฟรชการเชื่อมต่อ WS ล้มเหลวเนื่องจาก',
+  wsRequired: 'ต้องส่งการอัพเดทมาทางนี้',
+  wsReqTimeout: 'หมดเวลาการร้องขอ',
+  wsResend: 'เว็บซ็อกเก็ตไม่เปิด - โปรดลองอีกครั้งหลังจากผ่านไปสักครู่',
+  wsUnkAct: 'ได้รับข้อความ WS มีการดำเนินการที่ไม่รู้จัก',
+  wsUnkCmd: 'ได้รับคำสั่ง WS ที่ไม่รู้จัก',
+  wsUnkRes: 'การตอบสนอง WS ที่ไม่รู้จัก',
+  zWelcome: [
+    "อย่าลืม ☆ ปลั๊กอินนี้บน GitHub หากคุณพบว่ามีประโยชน์!",
+     'มีคำขอคุณสมบัติ? เข้าไปที่ http://bit.ly/hb-ewelink-issues เพื่อสอบถาม!',
+     'สนใจสนับสนุนปลั๊กอินนี้หรือไม่? https://github.com/sponsors/bwp91',
+     "เข้าร่วมชุมชน Discord ของปลั๊กอิน! https://discord.gg/cMGhNtZ3tW",
+     'ขอบคุณที่ใช้ปลั๊กอินนี้ ฉันหวังว่าคุณจะพบว่ามีประโยชน์!',
+     'ปลั๊กอินนี้สร้างด้วย ♥ โดย bwp91 จากสหราชอาณาจักร!',
+     'ลองดูปลั๊กอิน Homebridge อื่นๆ ของฉันสิ! https://github.com/bwp91',
+     'มีเวลาให้รีวิวปลั๊กอินนี้หรือไม่? http://bit.ly/hb-ewelink-review',
+     'ปลั๊กอินนี้มีคะแนน 5☆ บน HOOBS! http://bit.ly/hb-ewelink-review',
+     'ต้องการดูปลั๊กอินนี้ในภาษาของคุณเองหรือ? แจ้งให้เราทราบ!
+  ]
+}

From 0cd54d5840bbf8fc7cb921b43c309c288b61ddd0 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 2 May 2022 13:30:27 +0100
Subject: [PATCH 2993/3183] add options for thai translation

---
 config.schema.json     | 4 ++++
 lib/utils/constants.js | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/config.schema.json b/config.schema.json
index 07d02dd3..b456b69d 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -71,6 +71,10 @@
           {
             "title": "French",
             "enum": ["fr"]
+          },
+          {
+            "title": "Thai",
+            "enum": ["th"]
           }
         ]
       },
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index e5d45284..5af3f5c6 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -75,7 +75,7 @@ module.exports = {
   httpRetryCodes: ['ENOTFOUND', 'ETIMEDOUT', 'EAI_AGAIN', 'ECONNABORTED'],
 
   allowed: {
-    language: ['en', 'fr'],
+    language: ['en', 'fr', 'th'],
     httpHosts: [
       'auto',
       'eu-apia.coolkit.cc',

From 8326b88f50415145f5235992a21249e8a8f7848d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 2 May 2022 13:33:55 +0100
Subject: [PATCH 2994/3183] bump deps + changelog

---
 CHANGELOG.md      |  10 ++-
 package-lock.json | 157 +++++++++++++++++++++++++++++++++++++---------
 package.json      |   6 +-
 3 files changed, 140 insertions(+), 33 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 43f95497..1cd48784 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,15 +2,23 @@
 
 All notable changes to homebridge-ewelink will be documented in this file.
 
-## BETA
+## 8.15.0 (2022-05-02)
 
 ### Added
 - **New Devices**
   - Sonoff S40
+- **New Log Languages**
+  - Thai (thanks [@tomzt](https://github.com/bwp91/homebridge-ewelink/pull/367))
 
 - **Configuration**
   - `offlineAsOff` option for light devices - enable to show offline devices as 'off' in Homebridge/HomeKit
 
+### Changed
+
+- Bump `axios` to v0.27.2
+- Bump `ws` to v8.6.0
+- Bump `node` recommended versions to v14.19.1 or v16.15.0
+
 ## 8.14.0 (2022-04-17)
 
 ### Added
diff --git a/package-lock.json b/package-lock.json
index c216cce7..6dfbebf6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -28,15 +28,15 @@
       "license": "MIT",
       "dependencies": {
         "@homebridge/plugin-ui-utils": "^0.0.19",
-        "axios": "^0.26.1",
+        "axios": "^0.27.2",
         "node-persist": "^3.1.0",
         "p-queue": "^6.6.2",
         "websocket-as-promised": "^2.0.1",
-        "ws": "^8.5.0"
+        "ws": "^8.6.0"
       },
       "engines": {
         "homebridge": "^1.4.0",
-        "node": "^14.19.1 || ^16.14.2"
+        "node": "^14.19.1 || ^16.15.0"
       }
     },
     "node_modules/@homebridge/plugin-ui-utils": {
@@ -44,12 +44,18 @@
       "resolved": "https://registry.npmjs.org/@homebridge/plugin-ui-utils/-/plugin-ui-utils-0.0.19.tgz",
       "integrity": "sha512-axFX7lN2Yd7bz/6SlD7dzq5sY/N9+XYuLHPukuiyHQRDtNMRL1uDqJhOx6RVaN2tYDHB75h7YxRQWP7U44Mgzg=="
     },
+    "node_modules/asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
+    },
     "node_modules/axios": {
-      "version": "0.26.1",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-0.26.1.tgz",
-      "integrity": "sha512-fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA==",
+      "version": "0.27.2",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-0.27.2.tgz",
+      "integrity": "sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==",
       "dependencies": {
-        "follow-redirects": "^1.14.8"
+        "follow-redirects": "^1.14.9",
+        "form-data": "^4.0.0"
       }
     },
     "node_modules/call-bind": {
@@ -69,6 +75,17 @@
       "resolved": "https://registry.npmjs.org/chnl/-/chnl-1.2.0.tgz",
       "integrity": "sha512-g5gJb59edwCliFbX2j7G6sBfY4sX9YLy211yctONI2GRaiX0f2zIbKWmBm+sPqFNEpM7Ljzm7IJX/xrjiEbPrw=="
     },
+    "node_modules/combined-stream": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+      "dependencies": {
+        "delayed-stream": "~1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
     "node_modules/define-properties": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
@@ -84,6 +101,14 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
     "node_modules/es-abstract": {
       "version": "1.19.5",
       "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.5.tgz",
@@ -157,6 +182,19 @@
         }
       }
     },
+    "node_modules/form-data": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
+      "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
+      "dependencies": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.8",
+        "mime-types": "^2.1.12"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
     "node_modules/function-bind": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
@@ -399,6 +437,25 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/mime-db": {
+      "version": "1.52.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/mime-types": {
+      "version": "2.1.35",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+      "dependencies": {
+        "mime-db": "1.52.0"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
     "node_modules/node-persist": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/node-persist/-/node-persist-3.1.0.tgz",
@@ -544,13 +601,13 @@
       }
     },
     "node_modules/unbox-primitive": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.1.tgz",
-      "integrity": "sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
+      "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
       "dependencies": {
-        "function-bind": "^1.1.1",
-        "has-bigints": "^1.0.1",
-        "has-symbols": "^1.0.2",
+        "call-bind": "^1.0.2",
+        "has-bigints": "^1.0.2",
+        "has-symbols": "^1.0.3",
         "which-boxed-primitive": "^1.0.2"
       },
       "funding": {
@@ -587,9 +644,9 @@
       }
     },
     "node_modules/ws": {
-      "version": "8.5.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.5.0.tgz",
-      "integrity": "sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg==",
+      "version": "8.6.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.6.0.tgz",
+      "integrity": "sha512-AzmM3aH3gk0aX7/rZLYvjdvZooofDu3fFOzGqcSnQ1tOcTWwhM/o+q++E8mAyVVIyUdajrkzWUGftaVSDLn1bw==",
       "engines": {
         "node": ">=10.0.0"
       },
@@ -613,12 +670,18 @@
       "resolved": "https://registry.npmjs.org/@homebridge/plugin-ui-utils/-/plugin-ui-utils-0.0.19.tgz",
       "integrity": "sha512-axFX7lN2Yd7bz/6SlD7dzq5sY/N9+XYuLHPukuiyHQRDtNMRL1uDqJhOx6RVaN2tYDHB75h7YxRQWP7U44Mgzg=="
     },
+    "asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
+    },
     "axios": {
-      "version": "0.26.1",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-0.26.1.tgz",
-      "integrity": "sha512-fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA==",
+      "version": "0.27.2",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-0.27.2.tgz",
+      "integrity": "sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==",
       "requires": {
-        "follow-redirects": "^1.14.8"
+        "follow-redirects": "^1.14.9",
+        "form-data": "^4.0.0"
       }
     },
     "call-bind": {
@@ -635,6 +698,14 @@
       "resolved": "https://registry.npmjs.org/chnl/-/chnl-1.2.0.tgz",
       "integrity": "sha512-g5gJb59edwCliFbX2j7G6sBfY4sX9YLy211yctONI2GRaiX0f2zIbKWmBm+sPqFNEpM7Ljzm7IJX/xrjiEbPrw=="
     },
+    "combined-stream": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+      "requires": {
+        "delayed-stream": "~1.0.0"
+      }
+    },
     "define-properties": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
@@ -644,6 +715,11 @@
         "object-keys": "^1.1.1"
       }
     },
+    "delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
+    },
     "es-abstract": {
       "version": "1.19.5",
       "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.5.tgz",
@@ -691,6 +767,16 @@
       "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.9.tgz",
       "integrity": "sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w=="
     },
+    "form-data": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
+      "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
+      "requires": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.8",
+        "mime-types": "^2.1.12"
+      }
+    },
     "function-bind": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
@@ -843,6 +929,19 @@
         "call-bind": "^1.0.2"
       }
     },
+    "mime-db": {
+      "version": "1.52.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="
+    },
+    "mime-types": {
+      "version": "2.1.35",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+      "requires": {
+        "mime-db": "1.52.0"
+      }
+    },
     "node-persist": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/node-persist/-/node-persist-3.1.0.tgz",
@@ -940,13 +1039,13 @@
       }
     },
     "unbox-primitive": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.1.tgz",
-      "integrity": "sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
+      "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
       "requires": {
-        "function-bind": "^1.1.1",
-        "has-bigints": "^1.0.1",
-        "has-symbols": "^1.0.2",
+        "call-bind": "^1.0.2",
+        "has-bigints": "^1.0.2",
+        "has-symbols": "^1.0.3",
         "which-boxed-primitive": "^1.0.2"
       }
     },
@@ -974,9 +1073,9 @@
       }
     },
     "ws": {
-      "version": "8.5.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.5.0.tgz",
-      "integrity": "sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg==",
+      "version": "8.6.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.6.0.tgz",
+      "integrity": "sha512-AzmM3aH3gk0aX7/rZLYvjdvZooofDu3fFOzGqcSnQ1tOcTWwhM/o+q++E8mAyVVIyUdajrkzWUGftaVSDLn1bw==",
       "requires": {}
     }
   }
diff --git a/package.json b/package.json
index 9ebbcfcd..00093bad 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,7 @@
   "main": "lib/index.js",
   "engines": {
     "homebridge": "^1.4.0",
-    "node": "^14.19.1 || ^16.14.2"
+    "node": "^14.19.1 || ^16.15.0"
   },
   "repository": {
     "type": "git",
@@ -55,11 +55,11 @@
   ],
   "dependencies": {
     "@homebridge/plugin-ui-utils": "^0.0.19",
-    "axios": "^0.26.1",
+    "axios": "^0.27.2",
     "node-persist": "^3.1.0",
     "p-queue": "^6.6.2",
     "websocket-as-promised": "^2.0.1",
-    "ws": "^8.5.0"
+    "ws": "^8.6.0"
   },
   "prettier": {
     "printWidth": 100

From 142e5d0f1b2d3ff8ea6a84236bb60663581f0857 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 2 May 2022 13:40:11 +0100
Subject: [PATCH 2995/3183] quotes

---
 lib/utils/lang-th.js | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/lib/utils/lang-th.js b/lib/utils/lang-th.js
index cbc98ad8..fa53f065 100644
--- a/lib/utils/lang-th.js
+++ b/lib/utils/lang-th.js
@@ -160,15 +160,15 @@ module.exports = {
   wsUnkCmd: 'ได้รับคำสั่ง WS ที่ไม่รู้จัก',
   wsUnkRes: 'การตอบสนอง WS ที่ไม่รู้จัก',
   zWelcome: [
-    "อย่าลืม ☆ ปลั๊กอินนี้บน GitHub หากคุณพบว่ามีประโยชน์!",
-     'มีคำขอคุณสมบัติ? เข้าไปที่ http://bit.ly/hb-ewelink-issues เพื่อสอบถาม!',
-     'สนใจสนับสนุนปลั๊กอินนี้หรือไม่? https://github.com/sponsors/bwp91',
-     "เข้าร่วมชุมชน Discord ของปลั๊กอิน! https://discord.gg/cMGhNtZ3tW",
-     'ขอบคุณที่ใช้ปลั๊กอินนี้ ฉันหวังว่าคุณจะพบว่ามีประโยชน์!',
-     'ปลั๊กอินนี้สร้างด้วย ♥ โดย bwp91 จากสหราชอาณาจักร!',
-     'ลองดูปลั๊กอิน Homebridge อื่นๆ ของฉันสิ! https://github.com/bwp91',
-     'มีเวลาให้รีวิวปลั๊กอินนี้หรือไม่? http://bit.ly/hb-ewelink-review',
-     'ปลั๊กอินนี้มีคะแนน 5☆ บน HOOBS! http://bit.ly/hb-ewelink-review',
-     'ต้องการดูปลั๊กอินนี้ในภาษาของคุณเองหรือ? แจ้งให้เราทราบ!
+    'อย่าลืม ☆ ปลั๊กอินนี้บน GitHub หากคุณพบว่ามีประโยชน์!',
+    'มีคำขอคุณสมบัติ? เข้าไปที่ http://bit.ly/hb-ewelink-issues เพื่อสอบถาม!',
+    'สนใจสนับสนุนปลั๊กอินนี้หรือไม่? https://github.com/sponsors/bwp91',
+    'เข้าร่วมชุมชน Discord ของปลั๊กอิน! https://discord.gg/cMGhNtZ3tW',
+    'ขอบคุณที่ใช้ปลั๊กอินนี้ ฉันหวังว่าคุณจะพบว่ามีประโยชน์!',
+    'ปลั๊กอินนี้สร้างด้วย ♥ โดย bwp91 จากสหราชอาณาจักร!',
+    'ลองดูปลั๊กอิน Homebridge อื่นๆ ของฉันสิ! https://github.com/bwp91',
+    'มีเวลาให้รีวิวปลั๊กอินนี้หรือไม่? http://bit.ly/hb-ewelink-review',
+    'ปลั๊กอินนี้มีคะแนน 5☆ บน HOOBS! http://bit.ly/hb-ewelink-review',
+    'ต้องการดูปลั๊กอินนี้ในภาษาของคุณเองหรือ? แจ้งให้เราทราบ!'
   ]
 }

From 7c1c6e989025cbbdf5199f11f2d53db2599558df Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 2 May 2022 13:40:37 +0100
Subject: [PATCH 2996/3183] 8.15.0

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 6dfbebf6..2c51f0f7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.14.0",
+  "version": "8.15.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.14.0",
+      "version": "8.15.0",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 00093bad..3d23251c 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.14.0",
+  "version": "8.15.0",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From 0279a60fecd14019a6ae987b3ebe3d1a10c76f0d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 2 May 2022 13:41:15 +0100
Subject: [PATCH 2997/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1cd48784..a2b0dd93 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,11 +5,11 @@ All notable changes to homebridge-ewelink will be documented in this file.
 ## 8.15.0 (2022-05-02)
 
 ### Added
+
 - **New Devices**
   - Sonoff S40
 - **New Log Languages**
   - Thai (thanks [@tomzt](https://github.com/bwp91/homebridge-ewelink/pull/367))
-
 - **Configuration**
   - `offlineAsOff` option for light devices - enable to show offline devices as 'off' in Homebridge/HomeKit
 

From 2e5bcea4775273ef21a3b65c82dbdc9aaed6837a Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Sat, 28 May 2022 13:33:56 +0100
Subject: [PATCH 2998/3183] Update README.md

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index e9d17497..0b14f646 100644
--- a/README.md
+++ b/README.md
@@ -28,8 +28,8 @@ Homebridge plugin to integrate eWeLink devices into HomeKit
 
 ### Prerequisites
 
-- To use this plugin, you will need to already have [Homebridge](https://homebridge.io) (at least v1.3) or [HOOBS](https://hoobs.org) (at least v4.1) installed. Refer to the links for more information and installation instructions.
-- Whilst it is recommended to use [Node](https://nodejs.org/en/) v16, the plugin supports v12 and v14 as per the [Homebridge guidelines](https://github.com/homebridge/homebridge/wiki/How-To-Update-Node.js).
+- To use this plugin, you will need to already have [Homebridge](https://homebridge.io) (at least v1.4) or [HOOBS](https://hoobs.org) (at least v4.2) installed. Refer to the links for more information and installation instructions.
+- Whilst it is recommended to use [Node](https://nodejs.org/en/) v16, the plugin supports v14 as per the [Homebridge guidelines](https://github.com/homebridge/homebridge/wiki/How-To-Update-Node.js).
 
 ### Setup
 

From 5ce5ab8137c2796b49f93e57833ff9a41c91c7ae Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 28 May 2022 13:39:53 +0100
Subject: [PATCH 2999/3183] updates

---
 package-lock.json | 181 +++++++++++++++++++++++++++++++++-------------
 package.json      |   4 +-
 2 files changed, 131 insertions(+), 54 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 2c51f0f7..c04d483e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -32,11 +32,11 @@
         "node-persist": "^3.1.0",
         "p-queue": "^6.6.2",
         "websocket-as-promised": "^2.0.1",
-        "ws": "^8.6.0"
+        "ws": "^8.7.0"
       },
       "engines": {
         "homebridge": "^1.4.0",
-        "node": "^14.19.1 || ^16.15.0"
+        "node": "^14.19.3 || ^16.15.0"
       }
     },
     "node_modules/@homebridge/plugin-ui-utils": {
@@ -47,7 +47,7 @@
     "node_modules/asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
+      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
     },
     "node_modules/axios": {
       "version": "0.27.2",
@@ -104,22 +104,24 @@
     "node_modules/delayed-stream": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
+      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
       "engines": {
         "node": ">=0.4.0"
       }
     },
     "node_modules/es-abstract": {
-      "version": "1.19.5",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.5.tgz",
-      "integrity": "sha512-Aa2G2+Rd3b6kxEUKTF4TaW67czBLyAv3z7VOhYRU50YBx+bbsYZ9xQP4lMNazePuFlybXI0V4MruPos7qUo5fA==",
+      "version": "1.20.1",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.1.tgz",
+      "integrity": "sha512-WEm2oBhfoI2sImeM4OF2zE2V3BYdSF+KnSi9Sidz51fQHd7+JuF8Xgcj9/0o+OWeIeIS/MiuNnlruQrJf16GQA==",
       "dependencies": {
         "call-bind": "^1.0.2",
         "es-to-primitive": "^1.2.1",
         "function-bind": "^1.1.1",
+        "function.prototype.name": "^1.1.5",
         "get-intrinsic": "^1.1.1",
         "get-symbol-description": "^1.0.0",
         "has": "^1.0.3",
+        "has-property-descriptors": "^1.0.0",
         "has-symbols": "^1.0.3",
         "internal-slot": "^1.0.3",
         "is-callable": "^1.2.4",
@@ -131,9 +133,10 @@
         "object-inspect": "^1.12.0",
         "object-keys": "^1.1.1",
         "object.assign": "^4.1.2",
-        "string.prototype.trimend": "^1.0.4",
-        "string.prototype.trimstart": "^1.0.4",
-        "unbox-primitive": "^1.0.1"
+        "regexp.prototype.flags": "^1.4.3",
+        "string.prototype.trimend": "^1.0.5",
+        "string.prototype.trimstart": "^1.0.5",
+        "unbox-primitive": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -164,9 +167,9 @@
       "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="
     },
     "node_modules/follow-redirects": {
-      "version": "1.14.9",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.9.tgz",
-      "integrity": "sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w==",
+      "version": "1.15.1",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.1.tgz",
+      "integrity": "sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA==",
       "funding": [
         {
           "type": "individual",
@@ -200,6 +203,31 @@
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
       "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
     },
+    "node_modules/function.prototype.name": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz",
+      "integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==",
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.19.0",
+        "functions-have-names": "^1.2.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/functions-have-names": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
+      "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/get-intrinsic": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz",
@@ -465,9 +493,9 @@
       }
     },
     "node_modules/object-inspect": {
-      "version": "1.12.0",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz",
-      "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==",
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz",
+      "integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==",
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -563,6 +591,22 @@
         "node": ">=10"
       }
     },
+    "node_modules/regexp.prototype.flags": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
+      "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==",
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3",
+        "functions-have-names": "^1.2.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/side-channel": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
@@ -577,24 +621,26 @@
       }
     },
     "node_modules/string.prototype.trimend": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz",
-      "integrity": "sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==",
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz",
+      "integrity": "sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==",
       "dependencies": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3"
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.19.5"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/string.prototype.trimstart": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz",
-      "integrity": "sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==",
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz",
+      "integrity": "sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==",
       "dependencies": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3"
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.19.5"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -644,9 +690,9 @@
       }
     },
     "node_modules/ws": {
-      "version": "8.6.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.6.0.tgz",
-      "integrity": "sha512-AzmM3aH3gk0aX7/rZLYvjdvZooofDu3fFOzGqcSnQ1tOcTWwhM/o+q++E8mAyVVIyUdajrkzWUGftaVSDLn1bw==",
+      "version": "8.7.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.7.0.tgz",
+      "integrity": "sha512-c2gsP0PRwcLFzUiA8Mkr37/MI7ilIlHQxaEAtd0uNMbVMoy8puJyafRlm0bV9MbGSabUPeLrRRaqIBcFcA2Pqg==",
       "engines": {
         "node": ">=10.0.0"
       },
@@ -673,7 +719,7 @@
     "asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
+      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
     },
     "axios": {
       "version": "0.27.2",
@@ -718,19 +764,21 @@
     "delayed-stream": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
+      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ=="
     },
     "es-abstract": {
-      "version": "1.19.5",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.5.tgz",
-      "integrity": "sha512-Aa2G2+Rd3b6kxEUKTF4TaW67czBLyAv3z7VOhYRU50YBx+bbsYZ9xQP4lMNazePuFlybXI0V4MruPos7qUo5fA==",
+      "version": "1.20.1",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.1.tgz",
+      "integrity": "sha512-WEm2oBhfoI2sImeM4OF2zE2V3BYdSF+KnSi9Sidz51fQHd7+JuF8Xgcj9/0o+OWeIeIS/MiuNnlruQrJf16GQA==",
       "requires": {
         "call-bind": "^1.0.2",
         "es-to-primitive": "^1.2.1",
         "function-bind": "^1.1.1",
+        "function.prototype.name": "^1.1.5",
         "get-intrinsic": "^1.1.1",
         "get-symbol-description": "^1.0.0",
         "has": "^1.0.3",
+        "has-property-descriptors": "^1.0.0",
         "has-symbols": "^1.0.3",
         "internal-slot": "^1.0.3",
         "is-callable": "^1.2.4",
@@ -742,9 +790,10 @@
         "object-inspect": "^1.12.0",
         "object-keys": "^1.1.1",
         "object.assign": "^4.1.2",
-        "string.prototype.trimend": "^1.0.4",
-        "string.prototype.trimstart": "^1.0.4",
-        "unbox-primitive": "^1.0.1"
+        "regexp.prototype.flags": "^1.4.3",
+        "string.prototype.trimend": "^1.0.5",
+        "string.prototype.trimstart": "^1.0.5",
+        "unbox-primitive": "^1.0.2"
       }
     },
     "es-to-primitive": {
@@ -763,9 +812,9 @@
       "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="
     },
     "follow-redirects": {
-      "version": "1.14.9",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.9.tgz",
-      "integrity": "sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w=="
+      "version": "1.15.1",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.1.tgz",
+      "integrity": "sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA=="
     },
     "form-data": {
       "version": "4.0.0",
@@ -782,6 +831,22 @@
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
       "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
     },
+    "function.prototype.name": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz",
+      "integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==",
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.19.0",
+        "functions-have-names": "^1.2.2"
+      }
+    },
+    "functions-have-names": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
+      "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ=="
+    },
     "get-intrinsic": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz",
@@ -948,9 +1013,9 @@
       "integrity": "sha512-/j+fd/u71wNgKf3V2bx4tnDm+3GvLnlCuvf2MXbJ3wern+67IAb6zN9Leu1tCWPlPNZ+v1hLSibVukkPK2HqJw=="
     },
     "object-inspect": {
-      "version": "1.12.0",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz",
-      "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g=="
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz",
+      "integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ=="
     },
     "object-keys": {
       "version": "1.1.1",
@@ -1010,6 +1075,16 @@
       "resolved": "https://registry.npmjs.org/promised-map/-/promised-map-1.0.0.tgz",
       "integrity": "sha512-fP9VSMgcml+U2uJ9PBc4/LDQ3ZkJCH4blLNCS6gbH7RHyRZCYs91zxWHqiUy+heFiEMiB2op/qllYoFqmIqdWA=="
     },
+    "regexp.prototype.flags": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
+      "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==",
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3",
+        "functions-have-names": "^1.2.2"
+      }
+    },
     "side-channel": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
@@ -1021,21 +1096,23 @@
       }
     },
     "string.prototype.trimend": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz",
-      "integrity": "sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==",
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz",
+      "integrity": "sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==",
       "requires": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3"
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.19.5"
       }
     },
     "string.prototype.trimstart": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz",
-      "integrity": "sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==",
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz",
+      "integrity": "sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==",
       "requires": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3"
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.19.5"
       }
     },
     "unbox-primitive": {
@@ -1073,9 +1150,9 @@
       }
     },
     "ws": {
-      "version": "8.6.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.6.0.tgz",
-      "integrity": "sha512-AzmM3aH3gk0aX7/rZLYvjdvZooofDu3fFOzGqcSnQ1tOcTWwhM/o+q++E8mAyVVIyUdajrkzWUGftaVSDLn1bw==",
+      "version": "8.7.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.7.0.tgz",
+      "integrity": "sha512-c2gsP0PRwcLFzUiA8Mkr37/MI7ilIlHQxaEAtd0uNMbVMoy8puJyafRlm0bV9MbGSabUPeLrRRaqIBcFcA2Pqg==",
       "requires": {}
     }
   }
diff --git a/package.json b/package.json
index 3d23251c..c465a24c 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,7 @@
   "main": "lib/index.js",
   "engines": {
     "homebridge": "^1.4.0",
-    "node": "^14.19.1 || ^16.15.0"
+    "node": "^14.19.3 || ^16.15.0"
   },
   "repository": {
     "type": "git",
@@ -59,7 +59,7 @@
     "node-persist": "^3.1.0",
     "p-queue": "^6.6.2",
     "websocket-as-promised": "^2.0.1",
-    "ws": "^8.6.0"
+    "ws": "^8.7.0"
   },
   "prettier": {
     "printWidth": 100

From dd0e595151c21c4fc0a9a0e212e60bfc5797b4a9 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 29 May 2022 16:06:10 +0100
Subject: [PATCH 3000/3183] esm v9

---
 .eslintrc.cjs                             |   24 +
 .gitignore                                |    2 +-
 .npmignore                                |    2 +-
 .prettierignore                           |    3 -
 CHANGELOG.md                              |   12 +
 LICENSE                                   |    4 +-
 lib/connection/api.js                     |  259 +-
 lib/connection/http.js                    |  374 ++-
 lib/connection/lan.js                     |  301 +--
 lib/connection/ws.js                      |  309 ++-
 lib/device/curtain.js                     |  324 +--
 lib/device/diffuser.js                    |  374 ++-
 lib/device/fan.js                         |  340 ++-
 lib/device/group.js                       |  113 +-
 lib/device/humidifier.js                  |  196 +-
 lib/device/index.js                       |   59 +
 lib/device/light-cct.js                   |  342 ++-
 lib/device/light-dimmer.js                |  261 +-
 lib/device/light-rgb-cct.js               |  732 ++---
 lib/device/light-rgb.js                   |  285 +-
 lib/device/motor.js                       |  324 ++-
 lib/device/outlet-multi.js                |  431 ++-
 lib/device/outlet-single-inched.js        |  375 ++-
 lib/device/outlet-single.js               |  339 ++-
 lib/device/panel.js                       |  261 +-
 lib/device/rf-bridge.js                   |  360 +--
 lib/device/rf-button.js                   |  120 +-
 lib/device/rf-sensor.js                   |  207 +-
 lib/device/sensor-ambient.js              |  286 +-
 lib/device/sensor-contact.js              |  163 +-
 lib/device/sensor-temp-humi.js            |  197 +-
 lib/device/simulation/blind.js            |  297 +-
 lib/device/simulation/cooler.js           |  315 ++-
 lib/device/simulation/door.js             |  297 +-
 lib/device/simulation/doorbell.js         |  214 +-
 lib/device/simulation/garage-eachen.js    |  236 +-
 lib/device/simulation/garage-four.js      |  211 +-
 lib/device/simulation/garage-od-switch.js |   34 +-
 lib/device/simulation/garage-one.js       |  412 +--
 lib/device/simulation/garage-two.js       |  426 +--
 lib/device/simulation/gate-one.js         |  362 +--
 lib/device/simulation/heater.js           |  315 ++-
 lib/device/simulation/index.js            |   73 +
 lib/device/simulation/lock-eachen.js      |  166 +-
 lib/device/simulation/lock-one.js         |  342 ++-
 lib/device/simulation/p-button.js         |  242 +-
 lib/device/simulation/purifier.js         |  297 +-
 lib/device/simulation/rf-blind.js         |  209 +-
 lib/device/simulation/rf-door.js          |  207 +-
 lib/device/simulation/rf-window.js        |  207 +-
 lib/device/simulation/sensor-hidden.js    |  114 +-
 lib/device/simulation/sensor-leak.js      |  136 +-
 lib/device/simulation/sensor-visible.js   |  260 +-
 lib/device/simulation/sensor.js           |  324 +--
 lib/device/simulation/switch-valve.js     |  361 +--
 lib/device/simulation/tap-one.js          |  298 +--
 lib/device/simulation/tap-two.js          |  271 +-
 lib/device/simulation/th-cooler.js        |  421 ++-
 lib/device/simulation/th-dehumidifier.js  |  399 ++-
 lib/device/simulation/th-heater.js        |  434 ++-
 lib/device/simulation/th-humidifier.js    |  399 ++-
 lib/device/simulation/th-thermostat.js    |  598 ++---
 lib/device/simulation/tv.js               |  274 +-
 lib/device/simulation/valve-four.js       |  251 +-
 lib/device/simulation/valve-one.js        |  358 +--
 lib/device/simulation/valve-two.js        |  351 ++-
 lib/device/simulation/window.js           |  297 +-
 lib/device/switch-mate.js                 |  107 +-
 lib/device/switch-multi.js                |  430 ++-
 lib/device/switch-single-inched.js        |  309 ++-
 lib/device/switch-single.js               |  269 +-
 lib/device/template.js                    |   52 +-
 lib/device/thermostat.js                  |  257 +-
 lib/device/zigbee/index.js                |   19 +
 lib/device/zigbee/light-cct.js            |  273 +-
 lib/device/zigbee/light-dimmer.js         |  170 +-
 lib/device/zigbee/sensor-ambient.js       |  207 +-
 lib/device/zigbee/sensor-contact.js       |  169 +-
 lib/device/zigbee/sensor-leak.js          |  149 +-
 lib/device/zigbee/sensor-motion.js        |  149 +-
 lib/device/zigbee/sensor-smoke.js         |  123 +-
 lib/device/zigbee/switch-stateless.js     |  135 +-
 lib/fakegato/fakegato-history.js          |  832 +++---
 lib/fakegato/fakegato-storage.js          |  139 +-
 lib/fakegato/fakegato-timer.js            |  123 +-
 lib/fakegato/uuid.js                      |   40 +-
 lib/homebridge-ui/server.js               |   36 +-
 lib/index.js                              | 2000 +-------------
 lib/node-dns-sd/lib/dns-sd-composer.js    |   90 +-
 lib/node-dns-sd/lib/dns-sd-parser.js      |  589 ++--
 lib/node-dns-sd/lib/dns-sd.js             | 1165 ++++----
 lib/platform.js                           | 1945 ++++++++++++++
 lib/utils/colour-utils.js                 |  551 ----
 lib/utils/colour.js                       |  552 ++++
 lib/utils/constants.js                    |   56 +-
 lib/utils/custom-chars.js                 |   51 +-
 lib/utils/eve-chars.js                    |  163 +-
 lib/utils/functions.js                    |   68 +-
 lib/utils/lang-en.js                      |   23 +-
 lib/utils/lang-fr.js                      |   99 +-
 lib/utils/lang-th.js                      |   19 +-
 lib/utils/lang.js                         |    5 +
 package-lock.json                         | 2972 ++++++++++++++++++++-
 package.json                              |   19 +-
 104 files changed, 17399 insertions(+), 14743 deletions(-)
 create mode 100644 .eslintrc.cjs
 delete mode 100644 .prettierignore
 create mode 100644 lib/device/index.js
 create mode 100644 lib/device/simulation/index.js
 create mode 100644 lib/device/zigbee/index.js
 create mode 100644 lib/platform.js
 delete mode 100644 lib/utils/colour-utils.js
 create mode 100644 lib/utils/colour.js
 create mode 100644 lib/utils/lang.js

diff --git a/.eslintrc.cjs b/.eslintrc.cjs
new file mode 100644
index 00000000..78f18e0d
--- /dev/null
+++ b/.eslintrc.cjs
@@ -0,0 +1,24 @@
+module.exports = {
+  env: {
+    es2022: true,
+    node: true,
+  },
+  extends: ['airbnb'],
+  ignorePatterns: ['lib/node-dns-sd/*'],
+  parserOptions: {
+    ecmaVersion: 'latest',
+    sourceType: 'module',
+  },
+  plugins: ['import', 'sort-exports'],
+  rules: {
+    camelcase: 'off',
+    'import/extensions': ['error',  { js: 'always', json: 'always' }],
+    'import/order': ['warn', { alphabetize: { order: 'asc' } }],
+    'max-len': 'off',
+    'new-cap': 0,
+    quotes: ['error', 'single'],
+    'no-multiple-empty-lines': ['error', { max: 1, maxBOF: 1, maxEOF: 0 }],
+    'no-param-reassign': 0,
+    'sort-exports/sort-exports': ['warn', { sortDir: 'asc' }],
+  },
+};
diff --git a/.gitignore b/.gitignore
index 7f70e680..ebac030b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,4 @@
 .nova
 .npm
 node_modules
-.prettierignore
\ No newline at end of file
+.idea
diff --git a/.npmignore b/.npmignore
index 43f5b309..2ae5d6d6 100644
--- a/.npmignore
+++ b/.npmignore
@@ -1,4 +1,4 @@
 .github
 .nova
 .npm
-.prettierignore
\ No newline at end of file
+.idea
diff --git a/.prettierignore b/.prettierignore
deleted file mode 100644
index d926ea4b..00000000
--- a/.prettierignore
+++ /dev/null
@@ -1,3 +0,0 @@
-.github/
-.nova
-lib/node-dns-sd
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a2b0dd93..abb25049 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,18 @@
 
 All notable changes to homebridge-ewelink will be documented in this file.
 
+## 9.0.0 (2022-05-29)
+
+### Potentially Breaking Changes
+
+⚠️ The minimum required version of Homebridge is now v1.4.0
+⚠️ The minimum required version of Node is now v14
+
+### Changed
+
+- Changed to ESM package
+- Bump `node` recommended versions to v14.19.3 or v16.15.0
+
 ## 8.15.0 (2022-05-02)
 
 ### Added
diff --git a/LICENSE b/LICENSE
index 98b201cb..43444eaa 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021 Ben Potter
+Copyright (c) 2022 Ben Potter
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
\ No newline at end of file
+SOFTWARE.
diff --git a/lib/connection/api.js b/lib/connection/api.js
index 8d5ae527..62981cc2 100644
--- a/lib/connection/api.js
+++ b/lib/connection/api.js
@@ -1,23 +1,17 @@
-/* jshint node: true, esversion: 10, -W014, -W033 */
-/* eslint-disable new-cap */
-'use strict'
-
-module.exports = class connectionAPI {
-  constructor (platform, devicesInHB) {
+export default class {
+  constructor(platform, devicesInHB) {
     // Set up variables from the platform
-    this.config = platform.config
-    this.consts = platform.consts
-    this.debug = platform.config.debug
-    this.devicesInHB = devicesInHB
-    this.funcs = platform.funcs
-    this.hapChar = platform.api.hap.Characteristic
-    this.hapServ = platform.api.hap.Service
-    this.hapUUIDGen = platform.api.hap.uuid.generate
-    this.lang = platform.lang
-    this.log = platform.log
+    this.config = platform.config;
+    this.debug = platform.config.debug;
+    this.devicesInHB = devicesInHB;
+    this.hapChar = platform.api.hap.Characteristic;
+    this.hapServ = platform.api.hap.Service;
+    this.hapUUIDGen = platform.api.hap.uuid.generate;
+    this.log = platform.log;
   }
 
-  showHome () {
+  // eslint-disable-next-line class-methods-use-this
+  showHome() {
     // Return the home page for the API
     return `<!doctype html>
     <html lang="en">
@@ -44,7 +38,7 @@ module.exports = class connectionAPI {
               <h5 class="mt-4 mb-2">Documentation</h5>
               <ul class="small">
                 <li>All requests are of type <code>HTTP GET</code></li>
-                <li>All requests must include a HTTP authentication header in the form:
+                <li>All requests must include an HTTP authentication header in the form:
                   <ul>
                     <li><code>Authorization: "Basic %%%"</code></li>
                     <li>Where <code>%%%</code> is a base64-encoded string of your eWeLink credentials in the form <code>username:password</code></li>
@@ -57,8 +51,8 @@ module.exports = class connectionAPI {
                 <li>A note about offline devices:
                   <ul>
                     <li>Querying any characteristic will return the HomeKit cache value</li>
-                    <li>Updating an characteristic which matches the HomeKit cache value will return a <code>success:true</code> response</li>
-                    <li>Updating an characteristic which does not match the HomeKit cache value will return a <code>success:false</code> with an <code>error:"HAP Status Error: -70402"</code> response</li>
+                    <li>Updating a characteristic which matches the HomeKit cache value will return a <code>success:true</code> response</li>
+                    <li>Updating a characteristic which does not match the HomeKit cache value will return a <code>success:false</code> with an <code>error:"HAP Status Error: -70402"</code> response</li>
                   </ul>
                 </li>
               </ul>
@@ -215,63 +209,63 @@ module.exports = class connectionAPI {
           banner.style.display = 'block'
         </script>
       </body>
-    </html>`
+    </html>`;
   }
 
-  async action (req) {
+  async action(req) {
     // Log the request if appropriate
     if (this.debug) {
-      this.log('API request [%s].', req.url)
+      this.log('API request [%s].', req.url);
     }
 
     // Authenticate the request
     if (
-      !req.headers ||
-      !req.headers.authorization ||
-      req.headers.authorization.indexOf('Basic ') === -1
+      !req.headers
+      || !req.headers.authorization
+      || req.headers.authorization.indexOf('Basic ') === -1
     ) {
-      throw new Error('Invalid authentication')
+      throw new Error('Invalid authentication');
     }
-    const encodedCreds = req.headers.authorization.split(' ')[1]
-    const buff = Buffer.from(encodedCreds, 'base64')
+    const encodedCreds = req.headers.authorization.split(' ')[1];
+    const buff = Buffer.from(encodedCreds, 'base64');
     const decodedCreds = buff
       .toString('utf8')
       .replace(/(\r\n|\n|\r)/gm, '')
-      .trim()
-    const [user, pass] = decodedCreds.split(':')
+      .trim();
+    const [user, pass] = decodedCreds.split(':');
     if (user !== this.config.username || pass !== this.config.password) {
-      throw new Error('Invalid authentication')
+      throw new Error('Invalid authentication');
     }
 
     // Obtain the parts of the request url
-    const pathParts = req.url.split('/')
-    const action = pathParts[1]
-    const device = pathParts[2]
-    const servToUpdate = pathParts[3]
-    const charToUpdate = pathParts[4]
-    const newValue = pathParts[5]
+    const pathParts = req.url.split('/');
+    const action = pathParts[1];
+    const device = pathParts[2];
+    const servToUpdate = pathParts[3];
+    const charToUpdate = pathParts[4];
+    const newValue = pathParts[5];
 
     // Check an action was specified
     if (!action) {
-      throw new Error('No action specified')
+      throw new Error('No action specified');
     }
 
     // Check the action is either get or set
     if (!['get', 'set'].includes(action)) {
-      throw new Error("Action must be 'get' or 'set'")
+      throw new Error('Action must be \'get\' or \'set\'');
     }
 
     // Check a device was specified
     if (!device) {
-      throw new Error('No accessory specified')
+      throw new Error('No accessory specified');
     }
 
     // Special case for the device list
     if (device === 'devicelist') {
-      const deviceList = []
-      this.devicesInHB.forEach(accessory => {
+      const deviceList = [];
+      this.devicesInHB.forEach((accessory) => {
         if (accessory.context.hidden) {
-          return
+          return;
         }
         deviceList.push({
           name: accessory.displayName,
@@ -279,234 +273,235 @@ module.exports = class connectionAPI {
           status: {
             wan: !!accessory.context.reachableWAN,
             lan: !!accessory.context.reachableLAN,
-            ip: accessory.context.ip || false
-          }
-        })
-      })
-      return deviceList
+            ip: accessory.context.ip || false,
+          },
+        });
+      });
+      return deviceList;
     }
 
     // Try and find the device in Homebridge
-    const uuid = this.hapUUIDGen(device)
+    const uuid = this.hapUUIDGen(device);
     if (!this.devicesInHB.has(uuid)) {
-      throw new Error('Accessory not found in Homebridge')
+      throw new Error('Accessory not found in Homebridge');
     }
 
     // Obtain the corresponding accessory
-    const accessory = this.devicesInHB.get(uuid)
+    const accessory = this.devicesInHB.get(uuid);
 
     // Check the accessory isn't hidden from Homebridge
     if (accessory.context.hidden) {
-      throw new Error('Accessory not found in Homebridge')
+      throw new Error('Accessory not found in Homebridge');
     }
 
     // Check the device is controllable
     if (!accessory.control) {
-      throw new Error('Accessory has not been initialised yet')
+      throw new Error('Accessory has not been initialised yet');
     }
 
     // If the action is 'get' then return the properties
     if (action === 'get') {
       if (!accessory.control.currentState()) {
-        throw new Error('Accessory does not yet support querying')
+        throw new Error('Accessory does not yet support querying');
       }
       return {
         status: {
           wan: !!accessory.context.reachableWAN,
           lan: !!accessory.context.reachableLAN,
-          ip: accessory.context.ip || false
+          ip: accessory.context.ip || false,
         },
-        ...(await accessory.control.currentState())
-      }
+        ...(await accessory.control.currentState()),
+      };
     }
 
     // From now on the action must be 'set'
 
     // Check a servToUpdate to update was specified
     if (!servToUpdate) {
-      throw new Error('No service specified')
+      throw new Error('No service specified');
     }
 
-    let service
+    let service;
     switch (servToUpdate) {
       case 'fan':
-        service = this.hapServ.Fan
-        break
+        service = this.hapServ.Fan;
+        break;
       case 'light':
-        service = this.hapServ.Lightbulb
-        break
+        service = this.hapServ.Lightbulb;
+        break;
       case 'outlet':
-        service = this.hapServ.Outlet
-        break
+        service = this.hapServ.Outlet;
+        break;
       case 'switch':
-        service = this.hapServ.Switch
-        break
+        service = this.hapServ.Switch;
+        break;
       default:
-        throw new Error('Invalid service specified')
+        throw new Error('Invalid service specified');
     }
 
     if (!accessory.getService(service)) {
-      throw new Error('Accessory does not have service:' + servToUpdate)
+      throw new Error(`Accessory does not have service:${servToUpdate}`);
     }
 
     // Check an charToUpdate for a servToUpdate was specified
     if (!charToUpdate) {
-      throw new Error('No characteristic specified for service:' + servToUpdate)
+      throw new Error(`No characteristic specified for service:${servToUpdate}`);
     }
 
-    const accServ = accessory.getService(service)
+    const accServ = accessory.getService(service);
 
     // These variables depend on the charToUpdate that was supplied
-    let charName
+    let charName;
 
     switch (charToUpdate) {
       case 'adaptivelighting':
       case 'colourtemperature':
         charName = accServ.testCharacteristic(this.hapChar.ColorTemperature)
           ? this.hapChar.ColorTemperature
-          : false
-        break
+          : false;
+        break;
       case 'brightness':
         charName = accServ.testCharacteristic(this.hapChar.Brightness)
           ? this.hapChar.Brightness
-          : false
-        break
+          : false;
+        break;
       case 'hue':
-        charName = accServ.testCharacteristic(this.hapChar.Hue) ? this.hapChar.Hue : false
-        break
+        charName = accServ.testCharacteristic(this.hapChar.Hue) ? this.hapChar.Hue : false;
+        break;
       case 'speed':
         charName = accServ.testCharacteristic(this.hapChar.RotationSpeed)
           ? this.hapChar.RotationSpeed
-          : false
-        break
+          : false;
+        break;
       case 'state':
-        charName = accServ.testCharacteristic(this.hapChar.On) ? this.hapChar.On : false
-        break
+        charName = accServ.testCharacteristic(this.hapChar.On) ? this.hapChar.On : false;
+        break;
       default:
-        throw new Error('Invalid characteristic specified for service:' + servToUpdate)
+        throw new Error(`Invalid characteristic specified for service:${servToUpdate}`);
     }
 
     // Check that the accessory has the corresponding characteristic for the charToUpdate
     if (!charName) {
       throw new Error(
-        'Accessory service:' + servToUpdate + ' does not support characteristic:' + charToUpdate
-      )
+        `Accessory service:${servToUpdate} does not support characteristic:${charToUpdate}`,
+      );
     }
 
     // Check a new status was supplied if the action is set
     if (!newValue) {
-      throw new Error('No value specified for characteristic:' + charToUpdate)
+      throw new Error(`No value specified for characteristic:${charToUpdate}`);
     }
 
-    let newHKStatus
+    let newHKStatus;
     switch (charToUpdate) {
       case 'brightness': {
         // The new status for brightness must be an integer between 0 and 100
-        newHKStatus = parseInt(newValue)
-        if (isNaN(newHKStatus) || newHKStatus < 0 || newHKStatus > 100) {
-          throw new Error('Value must be integer 0-100 for characteristic:brightness')
+        newHKStatus = parseInt(newValue, 10);
+        if (Number.isNaN(newHKStatus) || newHKStatus < 0 || newHKStatus > 100) {
+          throw new Error('Value must be integer 0-100 for characteristic:brightness');
         }
 
         // Check the accessory has a correct set handler for on/off
         if (!accessory.control.internalBrightnessUpdate) {
-          throw new Error('Function to control accessory not found')
+          throw new Error('Function to control accessory not found');
         }
 
         // Call the set handler to send the request to eWeLink
-        await accessory.control.internalBrightnessUpdate(newHKStatus)
-        break
+        await accessory.control.internalBrightnessUpdate(newHKStatus);
+        break;
       }
       case 'colourtemperature': {
         // The new status for colour temperature must be an integer between 140 and 500
-        newHKStatus = parseInt(newValue)
-        if (isNaN(newHKStatus) || newHKStatus < 140 || newHKStatus > 500) {
-          throw new Error('Value must be integer 140-500 for characteristic:colourtemperature')
+        newHKStatus = parseInt(newValue, 10);
+        if (Number.isNaN(newHKStatus) || newHKStatus < 140 || newHKStatus > 500) {
+          throw new Error('Value must be integer 140-500 for characteristic:colourtemperature');
         }
 
         // Check the accessory has a correct set handler for on/off
         if (!accessory.control.internalCTUpdate) {
-          throw new Error('Accessory does not support controlling characteristic:' + charToUpdate)
+          throw new Error(`Accessory does not support controlling characteristic:${charToUpdate}`);
         }
 
         // Call the set handler to send the request to eWeLink
-        if (accessory.alController && accessory.alController.isAdaptiveLightingActive()) {
-          accessory.alController.disableAdaptiveLighting()
+        if (accessory?.alController?.isAdaptiveLightingActive()) {
+          accessory.alController.disableAdaptiveLighting();
         }
-        await accessory.control.internalCTUpdate(newHKStatus)
-        break
+        await accessory.control.internalCTUpdate(newHKStatus);
+        break;
       }
       case 'hue': {
         // The new status for hue must be an integer between 0 and 360
-        newHKStatus = parseInt(newValue)
-        if (isNaN(newHKStatus) || newHKStatus < 0 || newHKStatus > 360) {
-          throw new Error('Value must be integer 0-360 for characteristic:hue')
+        newHKStatus = parseInt(newValue, 10);
+        if (Number.isNaN(newHKStatus) || newHKStatus < 0 || newHKStatus > 360) {
+          throw new Error('Value must be integer 0-360 for characteristic:hue');
         }
 
         // Check the accessory has a correct set handler for on/off
         if (!accessory.control.internalColourUpdate) {
-          throw new Error('Function to control accessory not found')
+          throw new Error('Function to control accessory not found');
         }
 
         // Call the set handler to send the request to eWeLink
-        if (accessory.alController && accessory.alController.isAdaptiveLightingActive()) {
-          accessory.alController.disableAdaptiveLighting()
+        if (accessory?.alController?.isAdaptiveLightingActive()) {
+          accessory.alController.disableAdaptiveLighting();
         }
-        await accessory.control.internalColourUpdate(newHKStatus)
-        break
+        await accessory.control.internalColourUpdate(newHKStatus);
+        break;
       }
       case 'speed':
         // The new status for speed must be low, medium or high
         switch (newValue) {
           case 'low':
-            newHKStatus = 33
-            break
+            newHKStatus = 33;
+            break;
           case 'medium':
-            newHKStatus = 66
-            break
+            newHKStatus = 66;
+            break;
           case 'high':
-            newHKStatus = 99
-            break
+            newHKStatus = 99;
+            break;
           default:
-            throw new Error("Value must be 'low', 'medium' or 'high' for characteristic:speed")
+            throw new Error('Value must be \'low\', \'medium\' or \'high\' for characteristic:speed');
         }
 
         // Check the accessory has a correct set handler for speed
         if (!accessory.control.internalSpeedUpdate) {
-          throw new Error('Function to control accessory not found')
+          throw new Error('Function to control accessory not found');
         }
 
         // Call the set handler to send the request to eWeLink
-        await accessory.control.internalSpeedUpdate(newHKStatus)
-        break
+        await accessory.control.internalSpeedUpdate(newHKStatus);
+        break;
       case 'state':
         // The new status for state must be on, off or toggle
         switch (newValue) {
           case 'on':
-            newHKStatus = true
-            break
+            newHKStatus = true;
+            break;
           case 'off':
-            newHKStatus = false
-            break
+            newHKStatus = false;
+            break;
           case 'toggle':
-            newHKStatus = !accServ.getCharacteristic(this.hapChar.On).value
-            break
+            newHKStatus = !accServ.getCharacteristic(this.hapChar.On).value;
+            break;
           default:
-            throw new Error("Value must be 'on', 'off' or 'toggle' for characteristic:state")
+            throw new Error('Value must be \'on\', \'off\' or \'toggle\' for characteristic:state');
         }
 
         // Check the accessory has a correct set handler for on/off
         if (!accessory.control.internalStateUpdate) {
-          throw new Error('Function to control accessory not found')
+          throw new Error('Function to control accessory not found');
         }
 
         // Call the set handler to send the request to eWeLink
-        await accessory.control.internalStateUpdate(newHKStatus)
-        break
+        await accessory.control.internalStateUpdate(newHKStatus);
+        break;
       default:
-        throw new Error('Invalid value for characteristic:' + charToUpdate)
+        throw new Error(`Invalid value for characteristic:${charToUpdate}`);
     }
 
     // The eWeLink request was successful so update the characteristic in HomeKit
-    accServ.updateCharacteristic(charName, newHKStatus)
+    accServ.updateCharacteristic(charName, newHKStatus);
+    return true;
   }
 }
diff --git a/lib/connection/http.js b/lib/connection/http.js
index e14d0e8d..a1896abc 100644
--- a/lib/connection/http.js
+++ b/lib/connection/http.js
@@ -1,357 +1,293 @@
-/* jshint node: true, esversion: 10, -W014, -W033 */
-/* eslint-disable new-cap */
-'use strict'
+import { createHmac } from 'crypto';
+import axios from 'axios';
+import platformConsts from '../utils/constants.js';
+import { sleep } from '../utils/functions.js';
 
-const axios = require('axios')
-const crypto = require('crypto')
-
-module.exports = class connectionHTTP {
-  constructor (platform) {
+export default class {
+  constructor(platform) {
     // Set up variables from the platform
-    this.consts = platform.consts
-    this.countryCode = platform.config.countryCode
-    this.debug = platform.config.debug
-    this.funcs = platform.funcs
-    this.homeList = []
-    this.httpHost = platform.config.httpHost
-    this.ignoredDevices = platform.ignoredDevices
-    this.ignoredHomes = platform.config.ignoredHomes.split(',')
-    this.lang = platform.lang
-    this.log = platform.log
-    this.mode = platform.config.mode
-    this.obstructSwitches = platform.obstructSwitches
-    this.password = platform.config.password
-    this.triedBase64 = false
-    this.username = platform.config.username
+    this.countryCode = platform.config.countryCode;
+    this.debug = platform.config.debug;
+    this.homeList = [];
+    this.httpHost = platform.config.httpHost;
+    this.ignoredDevices = platform.ignoredDevices;
+    this.ignoredHomes = platform.config.ignoredHomes.split(',');
+    this.lang = platform.lang;
+    this.log = platform.log;
+    this.mode = platform.config.mode;
+    this.obstructSwitches = platform.obstructSwitches;
+    this.password = platform.config.password;
+    this.triedBase64 = false;
+    this.username = platform.config.username;
   }
 
-  async login () {
+  async login() {
     try {
       // Used to log the user in and obtain the user api key and token
       const data = {
         countryCode: this.countryCode,
-        password: this.password
-      }
+        password: this.password,
+      };
 
       // See if the user has provided an email or phone as username
       if (this.username.includes('@')) {
-        data.email = this.username
+        data.email = this.username;
       } else {
-        data.phoneNumber = this.username
+        data.phoneNumber = this.username;
       }
 
       // Log the data depending on the debug setting
       if (this.debug) {
-        this.log('%s.', this.lang.sendLogin)
+        this.log('%s.', this.lang.sendLogin);
       }
 
       // Set up the request signature
-      const dataToSign = crypto
-        .createHmac('sha256', this.consts.appSecret)
+      const dataToSign = createHmac('sha256', platformConsts.appSecret)
         .update(JSON.stringify(data))
-        .digest('base64')
+        .digest('base64');
 
       // Send the request
-      const res = await axios.post('https://' + this.httpHost + '/v2/user/login', data, {
+      const res = await axios.post(`https://${this.httpHost}/v2/user/login`, data, {
         headers: {
-          Authorization: 'Sign ' + dataToSign,
+          Authorization: `Sign ${dataToSign}`,
           'Content-Type': 'application/json',
-          'X-CK-Appid': this.consts.appId,
+          'X-CK-Appid': platformConsts.appId,
           'X-CK-Nonce': Math.random()
             .toString(36)
-            .substr(2, 8)
-        }
-      })
+            .substr(2, 8),
+        },
+      });
 
       // Parse the response
-      const body = res.data
-      if (body.error === 10004 && body.data && body.data.region) {
+      const body = res.data;
+      if (body.error === 10004 && body?.data?.region) {
         // In this case the user has been given a different region so retry login
-        const givenRegion = body.data.region
+        const givenRegion = body.data.region;
 
         // Check the new received region is valid
         switch (givenRegion) {
           case 'eu':
           case 'us':
           case 'as':
-            this.httpHost = givenRegion + '-apia.coolkit.cc'
-            break
+            this.httpHost = `${givenRegion}-apia.coolkit.cc`;
+            break;
           case 'cn':
-            this.httpHost = 'cn-apia.coolkit.cn'
-            break
+            this.httpHost = 'cn-apia.coolkit.cn';
+            break;
           default:
-            throw new Error(this.lang.noRegionRec + ' - [' + givenRegion + '].')
+            throw new Error(`${this.lang.noRegionRec} - [${givenRegion}].`);
         }
 
         // Log the new http host if appropriate
         if (this.debug) {
-          this.log('%s [%s].', this.lang.newRegionRec, this.httpHost)
+          this.log('%s [%s].', this.lang.newRegionRec, this.httpHost);
         }
 
         // Retry the login with the new http host
-        return await this.login()
-      } else if (body.error === 10001 && !this.triedBase64) {
+        return await this.login();
+      } if (body.error === 10001 && !this.triedBase64) {
         // In this case the password is incorrect so try base64 decoding just once
-        this.triedBase64 = true
+        this.triedBase64 = true;
         this.password = Buffer.from(this.password, 'base64')
           .toString('utf8')
           .replace(/(\r\n|\n|\r)/gm, '')
-          .trim()
-        return await this.login()
+          .trim();
+        return await this.login();
+      } if (body.data.at) {
+        // User api key and token received successfully
+        this.aToken = body.data.at;
+        this.apiKey = body.data.user.apikey;
+        return {
+          aToken: this.aToken,
+          apiKey: this.apiKey,
+          httpHost: this.httpHost,
+          password: this.password,
+        };
+      }
+      if (body.error === 500) {
+        // Retry if another attempt could be successful
+        this.log.warn('%s.', this.lang.eweError);
+        await sleep(30000);
+        return await this.login();
+      }
+      if (body.msg) {
+        throw new Error(body.msg + (body.error ? ` [${body.error}]` : ''));
       } else {
-        if (body.data.at) {
-          // User api key and token received successfully
-          this.aToken = body.data.at
-          this.apiKey = body.data.user.apikey
-          return {
-            aToken: this.aToken,
-            apiKey: this.apiKey,
-            httpHost: this.httpHost,
-            password: this.password
-          }
-        } else {
-          if (body.error === 500) {
-            // Retry if another attempt could be successful
-            this.log.warn('%s.', this.lang.eweError)
-            await this.funcs.sleep(30000)
-            return await this.login()
-          } else {
-            if (body.msg) {
-              throw new Error(body.msg + (body.error ? ' [' + body.error + ']' : ''))
-            } else {
-              throw new Error(this.lang.noAuthRec + '.\n' + JSON.stringify(body, null, 2))
-            }
-          }
-        }
+        throw new Error(`${this.lang.noAuthRec}.\n${JSON.stringify(body, null, 2)}`);
       }
     } catch (err) {
-      // Check to see if it's a eWeLink server problem and we can retry
-      if (err.code && this.consts.httpRetryCodes.includes(err.code)) {
+      // Check to see if it's a eWeLink server problem, and we can retry
+      if (err.code && platformConsts.httpRetryCodes.includes(err.code)) {
         // Retry if another attempt could be successful
-        this.log.warn('%s [login() - %s].', this.lang.httpRetry, err.code)
-        await this.funcs.sleep(30000)
-        return await this.login()
-      } else {
-        // It's not a eWeLink problem so report the error back
-        this.log.warn('%s.', this.lang.errLogin)
-        if (err.message.includes('10003')) {
-          this.log.warn('%s', this.lang.httpLogin10003)
-        }
-        throw err
+        this.log.warn('%s [login() - %s].', this.lang.httpRetry, err.code);
+        await sleep(30000);
+        return this.login();
+      }
+      // It's not a eWeLink problem so report the error back
+      this.log.warn('%s.', this.lang.errLogin);
+      if (err.message.includes('10003')) {
+        this.log.warn('%s', this.lang.httpLogin10003);
       }
+      throw err;
     }
   }
 
-  async getHomes () {
+  async getHomes() {
     // Used to get a user's home list
     try {
       // Send the request
-      const res = await axios.get('https://' + this.httpHost + '/v2/family', {
+      const res = await axios.get(`https://${this.httpHost}/v2/family`, {
         headers: {
-          Authorization: 'Bearer ' + this.aToken,
+          Authorization: `Bearer ${this.aToken}`,
           'Content-Type': 'application/json',
-          'X-CK-Appid': this.consts.appId,
+          'X-CK-Appid': platformConsts.appId,
           'X-CK-Nonce': Math.random()
             .toString(36)
-            .substr(2, 8)
-        }
-      })
+            .substr(2, 8),
+        },
+      });
 
       // Parse the response
-      const body = res.data
+      const body = res.data;
       if (
-        !body.data ||
-        body.error !== 0 ||
-        !body.data.familyList ||
-        !Array.isArray(body.data.familyList)
+        !body.data
+        || body.error !== 0
+        || !body.data.familyList
+        || !Array.isArray(body.data.familyList)
       ) {
-        throw new Error(JSON.stringify(body, null, 2))
+        throw new Error(JSON.stringify(body, null, 2));
       }
 
       // Add the home id to the global array of ids
-      body.data.familyList.forEach(home => {
+      body.data.familyList.forEach((home) => {
         if (this.ignoredHomes.includes(home.id)) {
-          return
+          return;
         }
-        this.log('%s [%s] [%s].', this.lang.fetchHome, home.name, home.id)
-        this.homeList.push(home.id)
-      })
+        this.log('%s [%s] [%s].', this.lang.fetchHome, home.name, home.id);
+        this.homeList.push(home.id);
+      });
     } catch (err) {
-      // Check to see if it's a eWeLink server problem and we can retry
-      if (err.code && this.consts.httpRetryCodes.includes(err.code)) {
+      // Check to see if it's a eWeLink server problem, and we can retry
+      if (err.code && platformConsts.httpRetryCodes.includes(err.code)) {
         // Retry if another attempt could be successful
-        this.log.warn('%s [getHomes() - %s].', this.lang.httpRetry, err.code)
-        await this.funcs.sleep(30000)
-        await this.getHomes()
+        this.log.warn('%s [getHomes() - %s].', this.lang.httpRetry, err.code);
+        await sleep(30000);
+        await this.getHomes();
       } else {
         // It's not a eWeLink problem so report the error back
-        this.log.warn('%s.', this.lang.errGetHomes)
-        throw err
+        this.log.warn('%s.', this.lang.errGetHomes);
+        throw err;
       }
     }
   }
 
-  async getDevices () {
+  async getDevices() {
     // Used to get a user's device list
     try {
       // Send the request to get a device list for each of the homes
-      const fullDeviceList = []
+      const fullDeviceList = [];
+
+      // eslint-disable-next-line no-restricted-syntax
       for (const homeId of this.homeList) {
-        const res = await axios.get('https://' + this.httpHost + '/v2/device/thing', {
+        // eslint-disable-next-line no-await-in-loop
+        const res = await axios.get(`https://${this.httpHost}/v2/device/thing`, {
           headers: {
-            Authorization: 'Bearer ' + this.aToken,
+            Authorization: `Bearer ${this.aToken}`,
             'Content-Type': 'application/json',
-            'X-CK-Appid': this.consts.appId,
+            'X-CK-Appid': platformConsts.appId,
             'X-CK-Nonce': Math.random()
               .toString(36)
-              .substr(2, 8)
+              .substr(2, 8),
           },
           params: {
             num: 0,
-            familyid: homeId
-          }
-        })
+            familyid: homeId,
+          },
+        });
 
         // Parse the response
-        const body = res.data
+        const body = res.data;
         if (!body.data || body.error !== 0) {
-          throw new Error(JSON.stringify(body, null, 2))
+          throw new Error(JSON.stringify(body, null, 2));
         }
 
-        // The list also includes scenes so we need to remove them
-        if (body.data.thingList && body.data.thingList.length > 0) {
-          body.data.thingList.forEach(device => fullDeviceList.push(device))
+        // The list also includes scenes, so we need to remove them
+        if (body.data?.thingList.length > 0) {
+          body.data.thingList.forEach((device) => fullDeviceList.push(device));
         }
       }
 
       // Now we have a device list from all the eWeLink user homes
-      const deviceList = []
-      const sensorList = []
-      const groupList = []
-      fullDeviceList.forEach(d => {
+      const deviceList = [];
+      const sensorList = [];
+      const groupList = [];
+      fullDeviceList.forEach((d) => {
         // Check each item is a device and also remove any devices the user has ignored
-        if (
-          d.itemData &&
-          d.itemData.extra &&
-          d.itemData.extra.uiid &&
-          !this.ignoredDevices.includes(d.itemData.deviceid)
-        ) {
+        if (d?.itemData?.extra?.uiid && !this.ignoredDevices.includes(d.itemData.deviceid)) {
           // If in LAN mode then don't add to device list
-          if (this.mode === 'lan' && !this.consts.devices.lan.includes(d.itemData.extra.uiid)) {
-            return
+          if (this.mode === 'lan' && !platformConsts.devices.lan.includes(d.itemData.extra.uiid)) {
+            return;
           }
           // Separate the sensors as these need to be set up last
-          const isObstructSwitch = this.obstructSwitches[d.itemData.deviceid]
+          const isObstructSwitch = this.obstructSwitches[d.itemData.deviceid];
           if (
-            this.consts.devices.garageSensors.includes(d.itemData.extra.uiid) ||
-            isObstructSwitch
+            platformConsts.devices.garageSensors.includes(d.itemData.extra.uiid)
+            || isObstructSwitch
           ) {
-            sensorList.push(d.itemData)
+            sensorList.push(d.itemData);
           } else {
-            deviceList.push(d.itemData)
+            deviceList.push(d.itemData);
           }
         } else if (d.itemType === 3) {
           // Is a group
-          groupList.push(d.itemData)
+          groupList.push(d.itemData);
         }
-      })
+      });
 
       // Sensors need to go last as they update garages that need to exist already
       return {
         httpDeviceList: deviceList.concat(sensorList),
-        httpGroupList: groupList
-      }
-    } catch (err) {
-      // Check to see if it's a eWeLink server problem and we can retry
-      if (err.code && this.consts.httpRetryCodes.includes(err.code)) {
-        // Retry if another attempt could be successful
-        this.log.warn('%s [getDevices() - %s].', this.lang.httpRetry, err.code)
-        await this.funcs.sleep(30000)
-        return await this.getDevices()
-      } else {
-        // It's not a eWeLink problem so report the error back
-        this.log.warn('%s.', this.lang.errGetDevices)
-        throw err
-      }
-    }
-  }
-
-  async getDevice (deviceId) {
-    // Used to get info about a specific device
-    try {
-      // Send the request
-      const res = await axios.post(
-        'https://' + this.httpHost + '/v2/device/thing',
-        {
-          thingList: [
-            {
-              itemType: 1,
-              id: deviceId
-            }
-          ]
-        },
-        {
-          headers: {
-            Authorization: 'Bearer ' + this.aToken,
-            'Content-Type': 'application/json',
-            'X-CK-Appid': this.consts.appId,
-            'X-CK-Nonce': Math.random()
-              .toString(36)
-              .substr(2, 8)
-          }
-        }
-      )
-
-      // Parse the response
-      const body = res.data
-      if (!body.data || body.error !== 0) {
-        throw new Error(JSON.stringify(body, null, 2))
-      }
-      if (body.data.thingList && body.data.thingList.length === 1) {
-        // Return the device data
-        return body.data.thingList[0].itemData
-      } else {
-        throw new Error(this.lang.devNotFound)
-      }
+        httpGroupList: groupList,
+      };
     } catch (err) {
-      if (err.code && this.consts.httpRetryCodes.includes(err.code)) {
+      // Check to see if it's a eWeLink server problem, and we can retry
+      if (err.code && platformConsts.httpRetryCodes.includes(err.code)) {
         // Retry if another attempt could be successful
-        this.log.warn('%s [getDevice() - %s].', this.lang.httpRetry, err.code)
-        await this.funcs.sleep(30000)
-        return await this.getDevice(deviceId)
-      } else {
-        // It's not a eWeLink problem so report the error back
-        this.log.warn('%s.', this.lang.errGetDevice)
-        throw err
+        this.log.warn('%s [getDevices() - %s].', this.lang.httpRetry, err.code);
+        await sleep(30000);
+        return this.getDevices();
       }
+      // It's not a eWeLink problem so report the error back
+      this.log.warn('%s.', this.lang.errGetDevices);
+      throw err;
     }
   }
 
-  async updateGroup (groupId, params) {
+  async updateGroup(groupId, params) {
     // Used to get info about a specific device
     const res = await axios.post(
-      'https://' + this.httpHost + '/v2/device/thing/status',
+      `https://${this.httpHost}/v2/device/thing/status`,
       {
         type: 2,
         id: groupId,
-        params
+        params,
       },
       {
         headers: {
-          Authorization: 'Bearer ' + this.aToken,
+          Authorization: `Bearer ${this.aToken}`,
           'Content-Type': 'application/json',
-          'X-CK-Appid': this.consts.appId,
+          'X-CK-Appid': platformConsts.appId,
           'X-CK-Nonce': Math.random()
             .toString(36)
-            .substr(2, 8)
-        }
-      }
-    )
+            .substr(2, 8),
+        },
+      },
+    );
 
     // Parse the response
-    const body = res.data
+    const body = res.data;
     if (!body.data || body.error !== 0) {
-      throw new Error(JSON.stringify(body, null, 2))
+      throw new Error(JSON.stringify(body, null, 2));
     }
   }
 }
diff --git a/lib/connection/lan.js b/lib/connection/lan.js
index 5f876d44..a991a1a3 100644
--- a/lib/connection/lan.js
+++ b/lib/connection/lan.js
@@ -1,306 +1,309 @@
-/* jshint node: true, esversion: 10, -W014, -W033 */
-/* eslint-disable new-cap */
-'use strict'
+import {
+  createCipheriv,
+  createDecipheriv,
+  createHash,
+  randomBytes,
+} from 'crypto';
+import events from 'events';
+import axios from 'axios';
+import dnsSd from '../node-dns-sd/lib/dns-sd.js'; // eslint-disable-line
+import platformConsts from '../utils/constants.js';
+import { hasProperty, parseError } from '../utils/functions.js';
 
-const axios = require('axios')
-const crypto = require('crypto')
-const dnsSd = require('./../node-dns-sd')
-const emitter = new (require('events'))()
+const emitter = new events();
 
-module.exports = class connectionLAN {
-  constructor (platform) {
+export default class {
+  constructor(platform) {
     // Set up variables from the platform
-    this.consts = platform.consts
-    this.debug = platform.config.debug
-    this.funcs = platform.funcs
-    this.ipOverride = platform.ipOverride
-    this.lang = platform.lang
-    this.log = platform.log
-    this.mode = platform.config.mode
+    this.debug = platform.config.debug;
+    this.ipOverride = platform.ipOverride;
+    this.lang = platform.lang;
+    this.log = platform.log;
+    this.mode = platform.config.mode;
 
     // Set up other variables and libraries needed by this class
-    this.deviceMap = new Map()
+    this.deviceMap = new Map();
   }
 
-  async getHosts () {
+  async getHosts() {
     // Create a template map with our device list from the HTTP client
-    for (const [deviceId, ip] of Object.entries(this.ipOverride)) {
-      // Add this device into the map with it's user configured IP
-      this.deviceMap.set(deviceId, { ip })
-    }
+    Object.entries(this.ipOverride).forEach((entry) => {
+      const [deviceId, ip] = entry;
+      // Add this device into the map with its user configured IP
+      this.deviceMap.set(deviceId, { ip });
+    });
 
     // Perform an initial discovery of devices on the local network
     if (this.debug) {
-      this.log('%s.', this.lang.lanStarting)
+      this.log('%s.', this.lang.lanStarting);
     }
-    const res = await dnsSd.discover({ name: '_ewelink._tcp.local' })
+    const res = await dnsSd.discover({ name: '_ewelink._tcp.local' });
     if (this.debug) {
-      this.log('%s.', this.lang.lanStarted)
+      this.log('%s.', this.lang.lanStarted);
     }
 
     // Update the device map for each device found on the local network
-    res.forEach(device => {
+    res.forEach((device) => {
       // Obtain the ewelink deviceId and check to see it is in our map
-      const deviceId = device.fqdn.replace('._ewelink._tcp.local', '').replace('eWeLink_', '')
-      this.deviceMap.set(deviceId, { ip: device.address })
-    })
-    return this.deviceMap
+      const deviceId = device.fqdn.replace('._ewelink._tcp.local', '').replace('eWeLink_', '');
+      this.deviceMap.set(deviceId, { ip: device.address });
+    });
+    return this.deviceMap;
   }
 
-  async startMonitor () {
+  async startMonitor() {
     // Function to parse DNS packets picked up by node-dns-sd
-    dnsSd.ondata = packet => {
+    dnsSd.ondata = (packet) => {
       try {
         if (!packet.answers) {
-          return
+          return;
         }
         packet.answers
-          .filter(value => value.name.includes('_ewelink._tcp.local'))
-          .filter(value => value.type === 'TXT')
-          .filter(value => this.deviceMap.has(value.rdata.id))
-          .filter(value => this.deviceMap.get(value.rdata.id).lanKey)
-          .forEach(value => {
-            const rdata = value.rdata
+          .filter((value) => value.name.includes('_ewelink._tcp.local'))
+          .filter((value) => value.type === 'TXT')
+          .filter((value) => this.deviceMap.has(value.rdata.id))
+          .filter((value) => this.deviceMap.get(value.rdata.id).lanKey)
+          .forEach((value) => {
+            const { rdata } = value;
 
             // Check the packet relates to a device in our map
-            const deviceInfo = this.deviceMap.get(rdata.id)
+            const deviceInfo = this.deviceMap.get(rdata.id);
 
             // Skip the update if it's a duplicate
             if (deviceInfo.lastIV === rdata.iv) {
-              return
+              return;
             }
-            deviceInfo.lastIV = rdata.iv
+            deviceInfo.lastIV = rdata.iv;
 
             // Obtain the packet information
-            const data =
-              rdata.data1 + (rdata.data2 || '') + (rdata.data3 || '') + (rdata.data4 || '')
-            const key = crypto
-              .createHash('md5')
+            const data = rdata.data1 + (rdata.data2 || '') + (rdata.data3 || '') + (rdata.data4 || '');
+            const key = createHash('md5')
               .update(Buffer.from(deviceInfo.lanKey, 'utf8'))
-              .digest()
-            const dText = crypto.createDecipheriv(
+              .digest();
+            const dText = createDecipheriv(
               'aes-128-cbc',
               key,
-              Buffer.from(rdata.iv, 'base64')
-            )
+              Buffer.from(rdata.iv, 'base64'),
+            );
             const pText = Buffer.concat([
               dText.update(Buffer.from(data, 'base64')),
-              dText.final()
-            ]).toString('utf8')
+              dText.final(),
+            ]).toString('utf8');
 
             // Check to see if the IP address of the device has changed
             if (packet.address !== deviceInfo.ip) {
-              deviceInfo.ip = packet.address
+              deviceInfo.ip = packet.address;
             }
 
-            this.deviceMap.set(rdata.id, deviceInfo)
+            this.deviceMap.set(rdata.id, deviceInfo);
 
             // Parse the deconstructed information from the packet
-            let params
+            let params;
             try {
-              params = JSON.parse(pText)
+              params = JSON.parse(pText);
             } catch (err) {
               this.log.warn(
                 '[%s] %s %s:\n%s',
                 rdata.id,
                 this.lang.cantReadPacket,
                 err.message,
-                pText
-              )
-              return
+                pText,
+              );
+              return;
             }
 
             // Remove any params we don't need
-            for (const param in params) {
-              if (this.funcs.hasProperty(params, param)) {
-                if (!this.consts.paramsToKeep.includes(param.replace(/[0-9]/g, ''))) {
-                  delete params[param]
-                }
+            Object.keys(params).forEach((param) => {
+              if (!platformConsts.paramsToKeep.includes(param.replace(/\d/g, ''))) {
+                delete params[param];
               }
-            }
+            });
 
             // If any params are left then generate the template to be emitted
             if (Object.keys(params).length > 0) {
               if (packet.address !== deviceInfo.ip) {
-                params.ip = packet.address
+                params.ip = packet.address;
               }
-              params.online = true
-              params.updateSource = 'LAN'
+              params.online = true;
+              params.updateSource = 'LAN';
               const returnTemplate = {
                 deviceid: rdata.id,
-                params
-              }
-              emitter.emit('update', returnTemplate)
+                params,
+              };
+              emitter.emit('update', returnTemplate);
             }
-          })
+          });
       } catch (err) {
-        const eText = this.funcs.parseError(err)
-        this.log.warn('%s %s.', this.lang.cantParsePacket, eText)
+        const eText = parseError(err);
+        this.log.warn('%s %s.', this.lang.cantParsePacket, eText);
       }
-    }
+    };
 
     // Start the DNS packet monitoring
-    await dnsSd.startMonitoring()
-    this.log('%s.', this.lang.lanMonitor)
+    await dnsSd.startMonitoring();
+    this.log('%s.', this.lang.lanMonitor);
   }
 
-  async sendUpdate (json) {
+  async sendUpdate(json) {
     try {
       // Check this device exists in the map
       if (!this.deviceMap.has(json.deviceid)) {
-        throw new Error(this.lang.devNotReachLAN)
+        throw new Error(this.lang.devNotReachLAN);
       }
 
-      const deviceInfo = this.deviceMap.get(json.deviceid)
+      const deviceInfo = this.deviceMap.get(json.deviceid);
 
       // Check we have an IP address for the device
       if (!deviceInfo.ip) {
-        throw new Error(this.lang.devNotReachLAN)
+        throw new Error(this.lang.devNotReachLAN);
       }
 
       // Check we have the device lan key
       if (!deviceInfo.lanKey || !deviceInfo.uiid || !deviceInfo.productModel) {
-        throw new Error(this.lang.devNoAPIKey)
+        throw new Error(this.lang.devNoAPIKey);
       }
 
-      const params = {}
-      let suffix
+      const params = {};
+      let suffix;
 
       // Check the params to see which suffix and params we need
       if (json.params.brightness) {
-        params.switch = 'on'
-        params.brightness = json.params.brightness
-        params.mode = 0
-        suffix = 'dimmable'
+        params.switch = 'on';
+        params.brightness = json.params.brightness;
+        params.mode = 0;
+        suffix = 'dimmable';
       } else if (json.params.switches) {
-        const specialModels = ['iFan03', 'iFan', 'iFan04']
+        const specialModels = ['iFan03', 'iFan', 'iFan04'];
         if (deviceInfo.uiid === 34 && specialModels.includes(deviceInfo.productModel)) {
           // Special format for some iFan models
           if (json.params.switches[0].outlet === 0) {
             // Turn on/off the light for the iFan
-            params.light = json.params.switches[0].switch
-            suffix = 'light'
+            params.light = json.params.switches[0].switch;
+            suffix = 'light';
           } else {
             // Change the state or speed of the iFan
             if (json.params.switches[0].switch === 'off') {
-              params.fan = 'off'
+              params.fan = 'off';
             } else {
-              params.fan = 'on'
+              params.fan = 'on';
               switch (json.params.switches[1].switch + json.params.switches[2].switch) {
                 case 'offoff':
-                  params.speed = 1
-                  break
+                  params.speed = 1;
+                  break;
                 case 'onoff':
-                  params.speed = 2
-                  break
+                  params.speed = 2;
+                  break;
                 case 'offon':
-                  params.speed = 3
-                  break
+                  params.speed = 3;
+                  break;
+                default:
+                  // Should never happen
+                  return 'ok';
               }
             }
-            suffix = 'fan'
+            suffix = 'fan';
           }
         } else {
-          params.switches = json.params.switches
-          suffix = 'switches'
+          params.switches = json.params.switches;
+          suffix = 'switches';
         }
       } else if (json.params.switch) {
-        params.switch = json.params.switch
+        params.switch = json.params.switch;
         if (deviceInfo.uiid === 15) {
           // TH10/16 only supports LAN in normal mode
           if (json.params.deviceType === 'normal') {
             // Extra params for the TH10/16
-            params.mainSwitch = json.params.mainSwitch
-            params.deviceType = json.params.deviceType
+            params.mainSwitch = json.params.mainSwitch;
+            params.deviceType = json.params.deviceType;
           } else {
-            throw new Error(this.lang.devNotConfLAN)
+            throw new Error(this.lang.devNotConfLAN);
           }
         }
-        suffix = 'switch'
+        suffix = 'switch';
       } else if (
-        this.funcs.hasProperty(json.params, 'location') &&
-        this.consts.devices.switchMultiPower.includes(deviceInfo.uiid)
+        hasProperty(json.params, 'location')
+        && platformConsts.devices.switchMultiPower.includes(deviceInfo.uiid)
       ) {
         // Use hasProperty has location can be INT 0
-        params.location = json.params.location
-        suffix = 'location'
+        params.location = json.params.location;
+        suffix = 'location';
       } else if (json.params.uiActive && deviceInfo.uiid === 32) {
-        params.uiActive = json.params.uiActive
-        suffix = 'monitor'
+        params.uiActive = json.params.uiActive;
+        suffix = 'monitor';
       } else if (json.params.cmd) {
-        params.cmd = 'transmit'
-        params.rfChl = json.params.rfChl
-        suffix = 'transmit'
-      } else if (this.funcs.hasProperty(json.params, 'ltype')) {
-        params.ltype = json.params.ltype
-        if (this.funcs.hasProperty(json.params, 'white')) {
-          params.white = json.params.white
+        params.cmd = 'transmit';
+        params.rfChl = json.params.rfChl;
+        suffix = 'transmit';
+      } else if (hasProperty(json.params, 'ltype')) {
+        params.ltype = json.params.ltype;
+        if (hasProperty(json.params, 'white')) {
+          params.white = json.params.white;
         } else {
-          params.color = json.params.color
+          params.color = json.params.color;
         }
-        suffix = 'dimmable'
+        suffix = 'dimmable';
       } else {
-        throw new Error(this.lang.devNotConfLAN)
+        throw new Error(this.lang.devNotConfLAN);
       }
 
       // Generate the HTTP request
-      const key = crypto
-        .createHash('md5')
+      const key = createHash('md5')
         .update(Buffer.from(deviceInfo.lanKey, 'utf8'))
-        .digest()
-      const iv = crypto.randomBytes(16)
-      const enc = crypto.createCipheriv('aes-128-cbc', key, iv)
+        .digest();
+      const iv = randomBytes(16);
+      const enc = createCipheriv('aes-128-cbc', key, iv);
       const data = {
         data: Buffer.concat([enc.update(JSON.stringify(params)), enc.final()]).toString('base64'),
         deviceid: json.deviceid,
         encrypt: true,
         iv: iv.toString('base64'),
         selfApikey: '123',
-        sequence: Date.now().toString()
-      }
+        sequence: Date.now().toString(),
+      };
 
       // Send the HTTP request
       const res = await axios({
         method: 'post',
-        url: 'http://' + deviceInfo.ip + ':8081/zeroconf/' + suffix,
+        url: `http://${deviceInfo.ip}:8081/zeroconf/${suffix}`,
         headers: {
           Accept: 'application/json',
-          'Content-Type': 'application/json'
+          'Content-Type': 'application/json',
         },
         data,
-        timeout: this.mode === 'lan' ? 9000 : 3000
-      })
+        timeout: this.mode === 'lan' ? 9000 : 3000,
+      });
 
       // Check for any errors in the response
       if (!res.data || res.data.error !== 0) {
-        const error = res.data && res.data.error ? res.data.error : this.lang.lanErr
-        throw new Error(error)
+        const error = res?.data?.error || this.lang.lanErr;
+        throw new Error(error);
       }
 
       // This ok is needed by the plugin
-      return 'ok'
+      return 'ok';
     } catch (err) {
-      return this.funcs.parseError(err)
+      return parseError(err);
     }
   }
 
-  receiveUpdate (f) {
-    emitter.addListener('update', f)
+  // eslint-disable-next-line class-methods-use-this
+  receiveUpdate(f) {
+    emitter.addListener('update', f);
   }
 
-  addDeviceDetailsToMap (deviceId, context) {
-    const entry = this.deviceMap.get(deviceId) || { ip: this.ipOverride[deviceId] }
-    entry.lanKey = context.lanKey
-    entry.uiid = context.eweUIID
-    entry.productModel = context.eweModel
-    this.deviceMap.set(deviceId, entry)
+  addDeviceDetailsToMap(deviceId, context) {
+    const entry = this.deviceMap.get(deviceId) || { ip: this.ipOverride[deviceId] };
+    entry.lanKey = context.lanKey;
+    entry.uiid = context.eweUIID;
+    entry.productModel = context.eweModel;
+    this.deviceMap.set(deviceId, entry);
   }
 
-  async closeConnection () {
+  async closeConnection() {
     // This is called when Homebridge is shutdown
-    await dnsSd.stopMonitoring()
+    await dnsSd.stopMonitoring();
     if (this.debug) {
-      this.log('%s.', this.lang.stoppedLAN)
+      this.log('%s.', this.lang.stoppedLAN);
     }
   }
 }
diff --git a/lib/connection/ws.js b/lib/connection/ws.js
index 0da578d7..c1de8cb6 100644
--- a/lib/connection/ws.js
+++ b/lib/connection/ws.js
@@ -1,120 +1,119 @@
-/* jshint node: true, esversion: 10, -W014, -W033 */
-/* eslint-disable new-cap */
-'use strict'
+import events from 'events';
+import axios from 'axios';
+import wsp from 'websocket-as-promised';
+import ws from 'ws';
+import platformConsts from '../utils/constants.js';
+import { hasProperty, parseError, sleep } from '../utils/functions.js';
 
-const axios = require('axios')
-const emitter = new (require('events'))()
-const ws = require('ws')
-const wsp = require('websocket-as-promised')
+const emitter = new events();
 
-module.exports = class connectionWS {
-  constructor (platform, authData) {
+export default class {
+  constructor(platform, authData) {
     // Set up variables from the platform
-    this.consts = platform.consts
-    this.debug = platform.config.debug
-    this.funcs = platform.funcs
-    this.lang = platform.lang
-    this.log = platform.log
+    this.debug = platform.config.debug;
+    this.lang = platform.lang;
+    this.log = platform.log;
 
     // Set up variables from the authData (from HTTP)
-    this.httpHost = authData.httpHost
-    this.aToken = authData.aToken
-    this.apiKey = authData.apiKey
+    this.httpHost = authData.httpHost;
+    this.aToken = authData.aToken;
+    this.apiKey = authData.apiKey;
 
     // Flag used to determine ws connection status
-    this.wsIsConnected = false
+    this.wsIsConnected = false;
   }
 
-  async getHost () {
+  async getHost() {
     // Used to get the web socket host
     try {
       // Send the HTTP request to get the web socket host
       const res = await axios({
         method: 'post',
-        url: 'https://' + this.httpHost.replace('-api', '-disp') + '/dispatch/app',
+        url: `https://${this.httpHost.replace('-api', '-disp')}/dispatch/app`,
         headers: {
-          Authorization: 'Bearer ' + this.aToken,
-          'Content-Type': 'application/json'
+          Authorization: `Bearer ${this.aToken}`,
+          'Content-Type': 'application/json',
         },
         data: {
-          appid: this.consts.appId,
+          appid: platformConsts.appId,
           nonce: Math.random()
             .toString(36)
             .substr(2, 8),
           ts: Math.floor(new Date().getTime() / 1000),
-          version: 8
+          version: 8,
         },
-        timeout: 6000
-      })
+        timeout: 6000,
+      });
 
       // Parse the response
-      const body = res.data
+      const body = res.data;
 
       // Check for any reason a host wasn't received
       if (!body.domain) {
-        throw new Error(this.lang.noWSHost)
+        throw new Error(this.lang.noWSHost);
       }
 
       // Log the received host if appropriate
       if (this.debug) {
-        this.log('%s [%s].', this.lang.wsHostRec, body.domain)
+        this.log('%s [%s].', this.lang.wsHostRec, body.domain);
       }
 
       // Return the received web socket host
-      return body.domain
+      return body.domain;
     } catch (err) {
-      // Check to see if it's a eWeLink server problem and we can retry
-      if (err.code && this.consts.httpRetryCodes.includes(err.code)) {
+      // Check to see if it's a eWeLink server problem, and we can retry
+      if (err.code && platformConsts.httpRetryCodes.includes(err.code)) {
         // Retry if another attempt could be successful
-        this.log.warn('%s [getHost() - %s].', this.lang.httpRetry, err.code)
-        await this.funcs.sleep(30000)
-        return await this.getHost()
-      } else {
-        // It's not a eWeLink problem so report the error back
-        this.log.warn('%s.', this.lang.errGetHost)
-        throw err
+        this.log.warn('%s [getHost() - %s].', this.lang.httpRetry, err.code);
+        await sleep(30000);
+        return this.getHost();
       }
+      // It's not a eWeLink problem so report the error back
+      this.log.warn('%s.', this.lang.errGetHost);
+      throw err;
     }
   }
 
-  async login () {
+  async login() {
     // Used to create the web socket connection and authenticate
     try {
       // This may be called onClose and onError, we just want it to run once
       if (this.debounce) {
-        return
+        return;
       }
-      this.debounce = true
-      setTimeout(() => (this.debounce = false), 4000)
+      this.debounce = true;
+      setTimeout(() => {
+        this.debounce = false;
+      }, 4000);
 
       // Close any existing web socket connection
-      await this.closeConnection()
+      await this.closeConnection();
 
       // Refresh the web socket host
-      const wsHost = await this.getHost()
+      const wsHost = await this.getHost();
 
       // Create the web socket client
-      this.wsClient = new wsp('wss://' + wsHost + ':8080/api/ws', {
-        createWebSocket: url => new ws(url),
-        extractMessageData: event => event,
-        attachRequestId: (data, requestId) => Object.assign({ sequence: requestId }, data),
-        extractRequestId: data => data && data.sequence,
-        packMessage: data => JSON.stringify(data),
-        unpackMessage: data => {
-          data = data.toString()
-          return data === 'pong' ? data : JSON.parse(data)
-        }
-      })
+      this.wsClient = new wsp(`wss://${wsHost}:8080/api/ws`, {
+        createWebSocket: (url) => new ws(url),
+        extractMessageData: (event) => event,
+        attachRequestId: (data, requestId) => ({ sequence: requestId, ...data }),
+        extractRequestId: (data) => data && data.sequence,
+        packMessage: (data) => JSON.stringify(data),
+        unpackMessage: (data) => {
+          data = data.toString();
+          return data === 'pong' ? data : JSON.parse(data);
+        },
+      });
 
       // Add a listener to authenticate when a web socket connection is opened
       this.wsClient.onOpen.addListener(async () => {
-        const sequence = Math.floor(new Date()).toString()
+        const sequence = Math.floor(new Date()).toString();
 
         // Generate the login payload for the web socket
         const payload = {
           action: 'userOnline',
           apikey: this.apiKey,
-          appid: this.consts.appId,
+          appid: platformConsts.appId,
           at: this.aToken,
           nonce: Math.random()
             .toString(36)
@@ -122,80 +121,79 @@ module.exports = class connectionWS {
           sequence,
           ts: Math.floor(new Date() / 1000),
           userAgent: 'app',
-          version: 8
-        }
+          version: 8,
+        };
 
         // Log the web socket login if appropriate
         if (this.debug) {
-          this.log('%s.', this.lang.wsLogin)
+          this.log('%s.', this.lang.wsLogin);
         }
 
         // Attempt to authenticate the web socket connection
         try {
           // Send the request
           const res = await this.wsClient.sendRequest(payload, {
-            requestId: sequence
-          })
+            requestId: sequence,
+          });
 
           // Parse the response
           if (res.config && res.config.hb && res.config.hbInterval) {
             // Update the flags
-            this.wsIsConnected = true
+            this.wsIsConnected = true;
 
             // Create a new ping interval
             this.hbInterval = setInterval(() => {
               try {
                 // Send the ping
-                this.wsClient.send('ping')
+                this.wsClient.send('ping');
               } catch (err) {
                 // Catch errors sending ping and show in debug mode
                 if (this.debug) {
-                  const eText = this.funcs.parseError(err)
-                  this.log.warn('%s %s.', this.lang.wsPingError, eText)
+                  const eText = parseError(err);
+                  this.log.warn('%s %s.', this.lang.wsPingError, eText);
                 }
               }
-            }, (res.config.hbInterval + 7) * 1000)
+            }, (res.config.hbInterval + 7) * 1000);
 
             // Login was successful and log if appropriate
             if (this.debug) {
-              this.log('%s.', this.lang.wsLoginSuccess)
+              this.log('%s.', this.lang.wsLoginSuccess);
             }
+          } else if (res.error === 406) {
+            // There was a problem with the authentication response
+            this.log.warn(this.lang.wsLogin406);
           } else {
             // There was a problem with the authentication response
-            if (res.error === 406) {
-              this.log.warn(this.lang.wsLogin406)
-            } else {
-              const str = JSON.stringify(res, null, 2)
-              throw new Error(this.lang.wsLoginErr + '\n' + str)
-            }
+            const str = JSON.stringify(res, null, 2);
+            throw new Error(`${this.lang.wsLoginErr}\n${str}`);
           }
         } catch (err) {
           // Catch any errors authenticating the WS connection
-          const eText = this.funcs.parseError(err)
-          this.log.warn('%s %s.', this.lang.wsLoginError, eText)
+          const eText = parseError(err);
+          this.log.warn('%s %s.', this.lang.wsLoginError, eText);
         }
-      })
+      });
 
       // Add a listener for when we receive a WS message
-      this.wsClient.onUnpackedMessage.addListener(msg => {
+      this.wsClient.onUnpackedMessage.addListener((msg) => {
         // Don't continue if it's a simple pong
         if (msg === 'pong') {
-          return
+          return;
         }
 
         // Set a device online flag now which we can change later
-        let onlineStatus = true
+        let onlineStatus = true;
 
         // Set up a params object if one didn't already come within the message
         if (!msg.params) {
-          msg.params = {}
+          msg.params = {};
         }
 
         // We received a device on/offline or error notification
-        if (msg.deviceid && this.funcs.hasProperty(msg, 'error')) {
-          msg.action = 'update'
+        if (msg.deviceid && hasProperty(msg, 'error')) {
+          msg.action = 'update';
           // Set the online status of the device
-          onlineStatus = msg.error === 0
+          onlineStatus = msg.error === 0;
         }
 
         // Normally the WS messages comes with an action
@@ -204,166 +202,165 @@ module.exports = class connectionWS {
           switch (msg.action) {
             case 'update':
             case 'sysmsg': {
-              if (msg.action === 'sysmsg' && this.funcs.hasProperty(msg.params, 'online')) {
+              if (msg.action === 'sysmsg' && hasProperty(msg.params, 'online')) {
                 // Update the online/offline status provided in the message
-                onlineStatus = msg.params.online
+                onlineStatus = msg.params.online;
               }
 
               // Loop through the device parameters received
-              for (const param in msg.params) {
-                if (this.funcs.hasProperty(msg.params, param)) {
-                  // Remove any params that the plugin doesn't need
-                  if (!this.consts.paramsToKeep.includes(param.replace(/[0-9]/g, ''))) {
-                    delete msg.params[param]
-                  }
+              Object.keys(msg.params).forEach((param) => {
+                // Remove any params that the plugin doesn't need
+                if (!platformConsts.paramsToKeep.includes(param.replace(/\d/g, ''))) {
+                  delete msg.params[param];
                 }
-              }
+              });
 
               if (Object.keys(msg.params).length > 0) {
                 // Add more params to report back to the plugin
-                msg.params.online = onlineStatus
-                msg.params.updateSource = 'WS'
+                msg.params.online = onlineStatus;
+                msg.params.updateSource = 'WS';
 
                 // Generate the object to return to the plugin
                 const returnTemplate = {
                   deviceid: msg.deviceid,
-                  params: msg.params
-                }
+                  params: msg.params,
+                };
 
                 // Report the new device params object back to the plugin to deal with
-                emitter.emit('update', returnTemplate)
+                emitter.emit('update', returnTemplate);
               }
-              break
+              break;
             }
             case 'reportSubDevice':
             case 'subDevice':
               // We don't need to do anything with this action
-              return
+              return;
             default: {
               this.log.warn(
                 '[%s] %s.\n%s',
                 msg.deviceid,
                 this.lang.wsUnkAct,
-                JSON.stringify(msg, null, 2)
-              )
+                JSON.stringify(msg, null, 2),
+              );
             }
           }
-        } else if (this.funcs.hasProperty(msg, 'error') && msg.error === 0) {
+        } else if (hasProperty(msg, 'error') && msg.error === 0) {
           // Safe to ignore these messages
         } else {
           // WS message received has an unknown action
-          this.log.warn('%s.\n%s', this.lang.wsUnkCmd, JSON.stringify(msg, null, 2))
+          this.log.warn('%s.\n%s', this.lang.wsUnkCmd, JSON.stringify(msg, null, 2));
         }
-      })
+      });
 
       // Add a listener for when the web socket closes for any reason
-      this.wsClient.onClose.addListener(async e => {
+      this.wsClient.onClose.addListener(async (e) => {
         // Don't continue further with logging/reconnection if it's a wanted closure
         if (e === 1005) {
-          return
+          return;
         }
 
         // Log that the web socket has closed if appropriate
         if (this.debug) {
-          this.log.warn('%s [%s].', this.lang.wsReconnectError, e)
+          this.log.warn('%s [%s].', this.lang.wsReconnectError, e);
         }
 
         // Wait for 4 seconds and try to re-establish the web socket connection
-        await this.funcs.sleep(4000)
-        await this.login()
-      })
+        await sleep(4000);
+        await this.login();
+      });
 
       // Add a listener for when the web socket throws an error
-      this.wsClient.onError.addListener(async e => {
+      this.wsClient.onError.addListener(async (e) => {
         // Log that the web socket has closed if appropriate
         if (this.debug) {
-          this.log.warn('%s [%s].', this.lang.wsReconnectClose, e)
+          this.log.warn('%s [%s].', this.lang.wsReconnectClose, e);
         }
 
         // Wait for 6 seconds and try to re-establish the web socket connection
-        await this.funcs.sleep(6000)
-        await this.login()
-      })
+        await sleep(6000);
+        await this.login();
+      });
 
       // Open the web socket connection
-      await this.wsClient.open()
+      await this.wsClient.open();
     } catch (err) {
-      const errToShow = this.funcs.parseError(err)
+      const errToShow = parseError(err);
 
       // Log the error if appropriate (debug on)
       if (this.debug) {
-        this.log('%s: %s.', this.lang.wsLoginErrRecon, errToShow)
+        this.log('%s: %s.', this.lang.wsLoginErrRecon, errToShow);
       }
 
       // Wait for 5 seconds and try to re-establish the web socket connection
-      await this.funcs.sleep(5000)
-      await this.login()
+      await sleep(5000);
+      await this.login();
     }
   }
 
-  async sendUpdate (json) {
+  async sendUpdate(json) {
     // Generate the payload to send
     const toSend = {
       ...json,
       ...{
         action: 'update',
         ts: 0,
-        userAgent: 'app'
-      }
-    }
+        userAgent: 'app',
+      },
+    };
 
     // Check the web socket is open
     if (this.wsClient && this.wsIsConnected) {
       try {
         // Generate the sequence that will be attached to the message
-        const sequence = Math.floor(new Date()).toString()
+        const sequence = Math.floor(new Date()).toString();
 
         // Send the request to eWeLink
         const res = await this.wsClient.sendRequest(toSend, {
-          requestId: sequence
-        })
+          requestId: sequence,
+        });
 
         // Parse the response and see if any error has been reported back
-        res.error = this.funcs.hasProperty(res, 'error') ? res.error : -1
+        res.error = hasProperty(res, 'error') ? res.error : -1;
 
         // Check if and which error has been reported back
         switch (res.error) {
           case 0:
             // No error is always what is wanted
             if (res.config && res.config.hundredDaysKwhData) {
-              return res.config.hundredDaysKwhData
+              return res.config.hundredDaysKwhData;
             }
-            return true
+            return true;
           case 504:
-            throw new Error(this.lang.wsReqTimeout + ' [504]')
+            throw new Error(`${this.lang.wsReqTimeout} [504]`);
           default:
             // An error has occurred
-            throw new Error(this.lang.wsUnkRes + ' [' + res.error + ']')
+            throw new Error(`${this.lang.wsUnkRes} [${res.error}]`);
         }
       } catch (err) {
         // Catch any errors sending the device update
-        const eText = this.funcs.parseError(err)
-        throw new Error(eText)
+        const eText = parseError(err);
+        throw new Error(eText);
       }
     } else {
       // The web socket isn't currently open so log this
-      throw new Error(this.lang.wsResend)
+      throw new Error(this.lang.wsResend);
     }
   }
 
-  receiveUpdate (f) {
-    emitter.addListener('update', f)
+  // eslint-disable-next-line class-methods-use-this
+  receiveUpdate(f) {
+    emitter.addListener('update', f);
   }
 
-  async requestUpdate (accessory) {
+  async requestUpdate(accessory) {
     // Don't continue if disabled for any eWeLink UIID
-    if (this.consts.devices.skipUpdateRequest.includes(accessory.context.eweUIID)) {
-      return
+    if (platformConsts.devices.skipUpdateRequest.includes(accessory.context.eweUIID)) {
+      return;
     }
 
     // Log the action if appropriate
     if (accessory.control.enableDebugLogging) {
-      this.log('[%s] %s.', accessory.displayName, this.lang.updReq)
+      this.log('[%s] %s.', accessory.displayName, this.lang.updReq);
     }
 
     // Generate the payload to send
@@ -374,44 +371,44 @@ module.exports = class connectionWS {
       params: [],
       sequence: Math.floor(new Date()).toString(),
       ts: 0,
-      userAgent: 'app'
-    }
+      userAgent: 'app',
+    };
 
     // Check the web socket is open
     if (this.wsClient && this.wsIsConnected) {
       // Send the request
-      this.wsClient.send(JSON.stringify(json))
+      this.wsClient.send(JSON.stringify(json));
     } else {
       // The web socket isn't currently open so log this
-      throw new Error(this.lang.wsResend)
+      throw new Error(this.lang.wsResend);
     }
   }
 
-  async closeConnection () {
+  async closeConnection() {
     // This is called when refreshing connection or if Homebridge shuts down
 
     // Clear any existing ping interval
     if (this.hbInterval) {
-      clearInterval(this.hbInterval)
-      this.hbInterval = null
+      clearInterval(this.hbInterval);
+      this.hbInterval = null;
     }
 
-    // Check the ws client is setup
+    // Check the ws client is set up
     if (this.wsClient) {
-      // Remove any existing existing listeners
-      this.wsClient.removeAllListeners()
+      // Remove any existing listeners
+      this.wsClient.removeAllListeners();
 
       // Close the web socket connection
       if (this.wsIsConnected) {
         // Set the connection flag to false
-        this.wsIsConnected = false
+        this.wsIsConnected = false;
 
         // Close the connection
-        await this.wsClient.close()
+        await this.wsClient.close();
 
         // Log if appropriate
         if (this.debug) {
-          this.log('%s.', this.lang.stoppedWS)
+          this.log('%s.', this.lang.stoppedWS);
         }
       }
     }
diff --git a/lib/device/curtain.js b/lib/device/curtain.js
index 59604c19..8a1069df 100644
--- a/lib/device/curtain.js
+++ b/lib/device/curtain.js
@@ -1,116 +1,111 @@
-/* jshint node: true, esversion: 10, -W014, -W033 */
-/* eslint-disable new-cap */
-'use strict'
+import platformConsts from '../utils/constants.js';
+import { generateRandomString, hasProperty, sleep } from '../utils/functions.js';
 
-module.exports = class deviceCurtain {
-  constructor (platform, accessory) {
+export default class {
+  constructor(platform, accessory) {
     // Set up variables from the platform
-    this.funcs = platform.funcs
-    this.hapChar = platform.api.hap.Characteristic
-    this.hapErr = platform.api.hap.HapStatusError
-    this.hapServ = platform.api.hap.Service
-    this.lang = platform.lang
-    this.log = platform.log
-    this.platform = platform
+    this.hapChar = platform.api.hap.Characteristic;
+    this.hapErr = platform.api.hap.HapStatusError;
+    this.hapServ = platform.api.hap.Service;
+    this.lang = platform.lang;
+    this.log = platform.log;
+    this.platform = platform;
 
     // Set up variables from the accessory
-    this.name = accessory.displayName
-    this.accessory = accessory
+    this.name = accessory.displayName;
+    this.accessory = accessory;
 
     // Initially set the online flag as true (to be then updated as false if necessary)
-    this.isOnline = true
+    this.isOnline = true;
 
     // Set up custom variables for this device type
-    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
-    const showAsMotor =
-      deviceConf && deviceConf.showAsMotor
-        ? deviceConf.showAsMotor
-        : platform.consts.defaultValues.showAsMotor
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId] || {};
+    const showAsMotor = deviceConf.showAsMotor || platformConsts.defaultValues.showAsMotor;
 
     // Set the correct logging variables for this accessory
-    this.enableLogging = !platform.config.disableDeviceLogging
-    this.enableDebugLogging = platform.config.debug
-    if (deviceConf && deviceConf.overrideLogging) {
-      switch (deviceConf.overrideLogging) {
-        case 'standard':
-          this.enableLogging = true
-          this.enableDebugLogging = false
-          break
-        case 'debug':
-          this.enableLogging = true
-          this.enableDebugLogging = true
-          break
-        case 'disable':
-          this.enableLogging = false
-          this.enableDebugLogging = false
-          break
-      }
+    switch (deviceConf.overrideLogging) {
+      case 'standard':
+        this.enableLogging = true;
+        this.enableDebugLogging = false;
+        break;
+      case 'debug':
+        this.enableLogging = true;
+        this.enableDebugLogging = true;
+        break;
+      case 'disable':
+        this.enableLogging = false;
+        this.enableDebugLogging = false;
+        break;
+      default:
+        this.enableLogging = !platform.config.disableDeviceLogging;
+        this.enableDebugLogging = platform.config.debug;
+        break;
     }
 
     // Add the window covering service if it doesn't already exist
-    let service
+    let service;
     switch (showAsMotor) {
       case 'door':
-        service = this.hapServ.Door
+        service = this.hapServ.Door;
         if (this.accessory.getService(this.hapServ.GarageDoorOpener)) {
-          this.accessory.removeService(this.accessory.getService(this.hapServ.GarageDoorOpener))
+          this.accessory.removeService(this.accessory.getService(this.hapServ.GarageDoorOpener));
         }
         if (this.accessory.getService(this.hapServ.Window)) {
-          this.accessory.removeService(this.accessory.getService(this.hapServ.Window))
+          this.accessory.removeService(this.accessory.getService(this.hapServ.Window));
         }
         if (this.accessory.getService(this.hapServ.WindowCovering)) {
-          this.accessory.removeService(this.accessory.getService(this.hapServ.WindowCovering))
+          this.accessory.removeService(this.accessory.getService(this.hapServ.WindowCovering));
         }
-        break
+        break;
       case 'garage':
-        service = this.hapServ.GarageDoorOpener
-        this.isGarage = true
+        service = this.hapServ.GarageDoorOpener;
+        this.isGarage = true;
         if (this.accessory.getService(this.hapServ.Door)) {
-          this.accessory.removeService(this.accessory.getService(this.hapServ.Door))
+          this.accessory.removeService(this.accessory.getService(this.hapServ.Door));
         }
         if (this.accessory.getService(this.hapServ.Window)) {
-          this.accessory.removeService(this.accessory.getService(this.hapServ.Window))
+          this.accessory.removeService(this.accessory.getService(this.hapServ.Window));
         }
         if (this.accessory.getService(this.hapServ.WindowCovering)) {
-          this.accessory.removeService(this.accessory.getService(this.hapServ.WindowCovering))
+          this.accessory.removeService(this.accessory.getService(this.hapServ.WindowCovering));
         }
-        break
+        break;
       case 'window':
-        service = this.hapServ.Window
+        service = this.hapServ.Window;
         if (this.accessory.getService(this.hapServ.Door)) {
-          this.accessory.removeService(this.accessory.getService(this.hapServ.Door))
+          this.accessory.removeService(this.accessory.getService(this.hapServ.Door));
         }
         if (this.accessory.getService(this.hapServ.GarageDoorOpener)) {
-          this.accessory.removeService(this.accessory.getService(this.hapServ.GarageDoorOpener))
+          this.accessory.removeService(this.accessory.getService(this.hapServ.GarageDoorOpener));
         }
         if (this.accessory.getService(this.hapServ.WindowCovering)) {
-          this.accessory.removeService(this.accessory.getService(this.hapServ.WindowCovering))
+          this.accessory.removeService(this.accessory.getService(this.hapServ.WindowCovering));
         }
-        break
+        break;
       default:
-        service = this.hapServ.WindowCovering
+        service = this.hapServ.WindowCovering;
         if (this.accessory.getService(this.hapServ.Door)) {
-          this.accessory.removeService(this.accessory.getService(this.hapServ.Door))
+          this.accessory.removeService(this.accessory.getService(this.hapServ.Door));
         }
         if (this.accessory.getService(this.hapServ.GarageDoorOpener)) {
-          this.accessory.removeService(this.accessory.getService(this.hapServ.GarageDoorOpener))
+          this.accessory.removeService(this.accessory.getService(this.hapServ.GarageDoorOpener));
         }
         if (this.accessory.getService(this.hapServ.Window)) {
-          this.accessory.removeService(this.accessory.getService(this.hapServ.Window))
+          this.accessory.removeService(this.accessory.getService(this.hapServ.Window));
         }
-        break
+        break;
     }
-    this.service = this.accessory.getService(service) || this.accessory.addService(service)
+    this.service = this.accessory.getService(service) || this.accessory.addService(service);
 
     // Add the set handler to the target position characteristic
     if (this.isGarage) {
       this.service
         .getCharacteristic(this.hapChar.TargetDoorState)
-        .onSet(async value => await this.internalTargetUpdate(value))
+        .onSet(async (value) => this.internalTargetUpdate(value));
     } else {
       this.service
         .getCharacteristic(this.hapChar.TargetPosition)
-        .onSet(async value => await this.internalPositionUpdate(value))
+        .onSet(async (value) => this.internalPositionUpdate(value));
     }
 
     // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
@@ -118,38 +113,39 @@ module.exports = class deviceCurtain {
       if (this.isGarage) {
         this.service.getCharacteristic(this.hapChar.CurrentDoorState).onGet(() => {
           if (!this.isOnline) {
-            throw new this.hapErr(-70402)
+            throw new this.hapErr(-70402);
           }
-          return this.service.getCharacteristic(this.hapChar.CurrentDoorState).value
-        })
+          return this.service.getCharacteristic(this.hapChar.CurrentDoorState).value;
+        });
         this.service.getCharacteristic(this.hapChar.TargetDoorState).onGet(() => {
           if (!this.isOnline) {
-            throw new this.hapErr(-70402)
+            throw new this.hapErr(-70402);
           }
-          return this.service.getCharacteristic(this.hapChar.TargetDoorState).value
-        })
+          return this.service.getCharacteristic(this.hapChar.TargetDoorState).value;
+        });
       } else {
         this.service.getCharacteristic(this.hapChar.CurrentPosition).onGet(() => {
           if (!this.isOnline) {
-            throw new this.hapErr(-70402)
+            throw new this.hapErr(-70402);
           }
-          return this.service.getCharacteristic(this.hapChar.CurrentPosition).value
-        })
+          return this.service.getCharacteristic(this.hapChar.CurrentPosition).value;
+        });
         this.service.getCharacteristic(this.hapChar.TargetPosition).onGet(() => {
           if (!this.isOnline) {
-            throw new this.hapErr(-70402)
+            throw new this.hapErr(-70402);
           }
-          return this.service.getCharacteristic(this.hapChar.TargetPosition).value
-        })
+          return this.service.getCharacteristic(this.hapChar.TargetPosition).value;
+        });
       }
     }
 
     // Output the customised options to the log
+    const normalLogging = this.enableLogging ? 'standard' : 'disable';
     const opts = JSON.stringify({
-      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
-      showAsMotor: showAsMotor
-    })
-    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
+      logging: this.enableDebugLogging ? 'debug' : normalLogging,
+      showAsMotor,
+    });
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts);
 
     /*
       Q1
@@ -161,163 +157,169 @@ module.exports = class deviceCurtain {
     */
   }
 
-  async internalPositionUpdate (value) {
+  async internalPositionUpdate(value) {
     try {
       // This acts like a debounce function when endlessly sliding the slider
-      const updateKey = this.funcs.generateRandomString(5)
-      this.updateKey = updateKey
-      await this.funcs.sleep(500)
+      const updateKey = generateRandomString(5);
+      this.updateKey = updateKey;
+      await sleep(500);
       if (updateKey !== this.updateKey) {
-        return
+        return;
       }
 
       // Create the params object to send
-      const params = {}
+      const params = {};
 
       switch (this.accessory.context.eweUIID) {
         case 11:
           // If we are to fully open/close the curtain we can use the switch param
           if ([0, 100].includes(value)) {
             // 'on' for fully open and 'off' for fully close
-            params.switch = value === 100 ? 'on' : 'off'
+            params.switch = value === 100 ? 'on' : 'off';
           } else {
-            // Otherwise for a %-point we can use the 'setclose' param
-            params.setclose = Math.abs(100 - value)
+            // Otherwise, for a %-point we can use the 'setclose' param
+            params.setclose = Math.abs(100 - value);
           }
-          break
+          break;
         case 67:
           // For a %-point we can use the 'per' param int[0=CLOSED, 100=OPEN]
-          params.per = value
-          break
+          params.per = value;
+          break;
+        default:
+          return;
       }
 
       // Send the device update
-      await this.platform.sendDeviceUpdate(this.accessory, params)
+      await this.platform.sendDeviceUpdate(this.accessory, params);
 
       // Update the cache with the new position
-      this.cachePos = value
+      this.cachePos = value;
 
       // Log the update if appropriate
       if (this.enableLogging) {
-        this.log('[%s] %s [%s%].', this.name, this.lang.curPos, this.cachePos)
+        this.log('[%s] %s [%s%].', this.name, this.lang.curPos, this.cachePos);
       }
     } catch (err) {
       // Catch any errors and let the platform display them
-      this.platform.deviceUpdateError(this.accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true);
       setTimeout(() => {
-        this.service.updateCharacteristic(this.hapChar.TargetPosition, this.cachePos)
-      }, 2000)
-      throw new this.hapErr(-70402)
+        this.service.updateCharacteristic(this.hapChar.TargetPosition, this.cachePos);
+      }, 2000);
+      throw new this.hapErr(-70402);
     }
   }
 
-  async internalTargetUpdate (value) {
+  async internalTargetUpdate(value) {
     try {
       // value is 0 for open and 1 for closed
-      const params = {}
+      const params = {};
       switch (this.accessory.context.eweUIID) {
         case 11:
-          params.switch = value === 0 ? 'on' : 'off'
-          break
+          params.switch = value === 0 ? 'on' : 'off';
+          break;
         case 67:
-          params.op = value === 0 ? 1 : 3
-          break
+          params.op = value === 0 ? 1 : 3;
+          break;
+        default:
+          return;
       }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
+      await this.platform.sendDeviceUpdate(this.accessory, params);
     } catch (err) {
       // Catch any errors and let the platform display them
-      this.platform.deviceUpdateError(this.accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true);
       setTimeout(() => {
-        this.service.updateCharacteristic(this.hapChar.TargetDoorState, this.cachePos)
-      }, 2000)
-      throw new this.hapErr(-70402)
+        this.service.updateCharacteristic(this.hapChar.TargetDoorState, this.cachePos);
+      }, 2000);
+      throw new this.hapErr(-70402);
     }
   }
 
-  async externalUpdate (params) {
+  async externalUpdate(params) {
     try {
       // Don't continue if there are no useful parameters
       if (this.isGarage) {
         switch (this.accessory.context.eweUIID) {
           case 11:
             // Todo
-            break
+            break;
           case 67:
-            if (this.funcs.hasProperty(params, 'op') && this.funcs.hasProperty(params, 'per')) {
+            if (hasProperty(params, 'op') && hasProperty(params, 'per')) {
               if (params.op === 3 && params.per === 0) {
                 // closed
                 if (this.cachePos !== 1) {
-                  this.cachePos = 1
-                  this.service.updateCharacteristic(this.hapChar.CurrentDoorState, 1)
-                  this.service.updateCharacteristic(this.hapChar.TargetDoorState, 1)
+                  this.cachePos = 1;
+                  this.service.updateCharacteristic(this.hapChar.CurrentDoorState, 1);
+                  this.service.updateCharacteristic(this.hapChar.TargetDoorState, 1);
                   if (params.updateSource && this.enableLogging) {
-                    this.log('[%s] %s [%s].', this.name, this.lang.curState, this.lang.doorClosed)
+                    this.log('[%s] %s [%s].', this.name, this.lang.curState, this.lang.doorClosed);
                   }
                 }
               } else if (params.op === 1 && params.per === 100) {
                 // open
                 if (this.cachePos !== 0) {
-                  this.cachePos = 0
-                  this.service.updateCharacteristic(this.hapChar.CurrentDoorState, 0)
-                  this.service.updateCharacteristic(this.hapChar.TargetDoorState, 0)
+                  this.cachePos = 0;
+                  this.service.updateCharacteristic(this.hapChar.CurrentDoorState, 0);
+                  this.service.updateCharacteristic(this.hapChar.TargetDoorState, 0);
                   if (params.updateSource && this.enableLogging) {
-                    this.log('[%s] %s [%s].', this.name, this.lang.curState, this.lang.doorOpen)
+                    this.log('[%s] %s [%s].', this.name, this.lang.curState, this.lang.doorOpen);
                   }
                 }
               }
             }
-            break
+            break;
+          default:
+            return;
+        }
+      } else if (
+        params.switch
+          || hasProperty(params, 'setclose')
+          || hasProperty(params, 'per')
+      ) {
+        let newPos;
+        switch (this.accessory.context.eweUIID) {
+          case 11:
+            // 'setclose' is 0=OPEN 100=CLOSED whereas HomeKit is 0=CLOSED 100=OPEN
+            // 'switch' is 'on' for fully open and 'off' for fully close
+            if (hasProperty(params, 'setclose')) {
+              newPos = Math.abs(100 - params.setclose);
+            } else if (params.switch) {
+              newPos = params.switch === 'on' ? 100 : 0;
+            } else {
+              return;
+            }
+            break;
+          case 67:
+            // 'per' matches HomeKit status 0=CLOSED 100=OPEN
+            if (hasProperty(params, 'per')) {
+              newPos = params.per;
+            } else {
+              return;
+            }
+            break;
+          default:
+            return;
         }
-      } else {
-        if (
-          params.switch ||
-          this.funcs.hasProperty(params, 'setclose') ||
-          this.funcs.hasProperty(params, 'per')
-        ) {
-          let newPos
-          switch (this.accessory.context.eweUIID) {
-            case 11:
-              // 'setclose' is 0=OPEN 100=CLOSED whereas HomeKit is 0=CLOSED 100=OPEN
-              // 'switch' is 'on' for fully open and 'off' for fully close
-              if (this.funcs.hasProperty(params, 'setclose')) {
-                newPos = Math.abs(100 - params.setclose)
-              } else if (params.switch) {
-                newPos = params.switch === 'on' ? 100 : 0
-              } else {
-                return
-              }
-              break
-            case 67:
-              // 'per' matches HomeKit status 0=CLOSED 100=OPEN
-              if (this.funcs.hasProperty(params, 'per')) {
-                newPos = params.per
-              } else {
-                return
-              }
-              break
-          }
 
-          // Update HomeKit with the provided value
-          this.service.updateCharacteristic(this.hapChar.TargetPosition, newPos)
-          this.service.updateCharacteristic(this.hapChar.CurrentPosition, newPos)
-          this.service.updateCharacteristic(this.hapChar.PositionState, 2)
+        // Update HomeKit with the provided value
+        this.service.updateCharacteristic(this.hapChar.TargetPosition, newPos);
+        this.service.updateCharacteristic(this.hapChar.CurrentPosition, newPos);
+        this.service.updateCharacteristic(this.hapChar.PositionState, 2);
 
-          // Only update the cache and log if the provided value has changed
-          if (params.updateSource && this.cachePos !== newPos) {
-            this.cachePos = newPos
-            if (this.enableLogging) {
-              this.log('[%s] %s [%s%].', this.name, this.lang.curPos, this.cachePos)
-            }
+        // Only update the cache and log if the provided value has changed
+        if (params.updateSource && this.cachePos !== newPos) {
+          this.cachePos = newPos;
+          if (this.enableLogging) {
+            this.log('[%s] %s [%s%].', this.name, this.lang.curPos, this.cachePos);
           }
         }
       }
     } catch (err) {
       // Catch any errors and let the platform display them
-      this.platform.deviceUpdateError(this.accessory, err, false)
+      this.platform.deviceUpdateError(this.accessory, err, false);
     }
   }
 
-  markStatus (isOnline) {
-    this.isOnline = isOnline
+  markStatus(isOnline) {
+    this.isOnline = isOnline;
   }
 }
diff --git a/lib/device/diffuser.js b/lib/device/diffuser.js
index 68e99154..6338f86c 100644
--- a/lib/device/diffuser.js
+++ b/lib/device/diffuser.js
@@ -1,346 +1,340 @@
-/* jshint node: true, esversion: 10, -W014, -W033 */
-/* eslint-disable new-cap */
-'use strict'
+import { hs2rgb, rgb2hs } from '../utils/colour.js';
+import { generateRandomString, hasProperty, sleep } from '../utils/functions.js';
 
-module.exports = class deviceDiffuser {
-  constructor (platform, accessory) {
+export default class {
+  constructor(platform, accessory) {
     // Set up variables from the platform
-    this.colourUtils = platform.colourUtils
-    this.funcs = platform.funcs
-    this.hapChar = platform.api.hap.Characteristic
-    this.hapErr = platform.api.hap.HapStatusError
-    this.hapServ = platform.api.hap.Service
-    this.lang = platform.lang
-    this.log = platform.log
-    this.platform = platform
+    this.hapChar = platform.api.hap.Characteristic;
+    this.hapErr = platform.api.hap.HapStatusError;
+    this.hapServ = platform.api.hap.Service;
+    this.lang = platform.lang;
+    this.log = platform.log;
+    this.platform = platform;
 
     // Set up variables from the accessory
-    this.name = accessory.displayName
-    this.accessory = accessory
+    this.name = accessory.displayName;
+    this.accessory = accessory;
 
     // Initially set the online flag as true (to be then updated as false if necessary)
-    this.isOnline = true
+    this.isOnline = true;
 
     // Set up custom variables for this device type
-    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId] || {};
 
     // Set the correct logging variables for this accessory
-    this.enableLogging = !platform.config.disableDeviceLogging
-    this.enableDebugLogging = platform.config.debug
-    if (deviceConf && deviceConf.overrideLogging) {
-      switch (deviceConf.overrideLogging) {
-        case 'standard':
-          this.enableLogging = true
-          this.enableDebugLogging = false
-          break
-        case 'debug':
-          this.enableLogging = true
-          this.enableDebugLogging = true
-          break
-        case 'disable':
-          this.enableLogging = false
-          this.enableDebugLogging = false
-          break
-      }
+    switch (deviceConf.overrideLogging) {
+      case 'standard':
+        this.enableLogging = true;
+        this.enableDebugLogging = false;
+        break;
+      case 'debug':
+        this.enableLogging = true;
+        this.enableDebugLogging = true;
+        break;
+      case 'disable':
+        this.enableLogging = false;
+        this.enableDebugLogging = false;
+        break;
+      default:
+        this.enableLogging = !platform.config.disableDeviceLogging;
+        this.enableDebugLogging = platform.config.debug;
+        break;
     }
 
     // Add the fan service if it doesn't already exist
-    this.fanService =
-      this.accessory.getService('Diffuser') ||
-      this.accessory.addService(this.hapServ.Fan, 'Diffuser', 'diffuser')
+    this.fanService = this.accessory.getService('Diffuser')
+      || this.accessory.addService(this.hapServ.Fan, 'Diffuser', 'diffuser');
 
     // Add the lightbulb service if it doesn't already exist
-    this.lightService =
-      this.accessory.getService('Light') ||
-      this.accessory.addService(this.hapServ.Lightbulb, 'Light', 'light')
+    this.lightService = this.accessory.getService('Light')
+      || this.accessory.addService(this.hapServ.Lightbulb, 'Light', 'light');
 
     // Add the set handler to the fan on/off characteristic
     this.fanService
       .getCharacteristic(this.hapChar.On)
-      .onSet(async value => await this.internalDiffuserOnOffUpdate(value))
+      .onSet(async (value) => this.internalDiffuserOnOffUpdate(value));
 
     // Add the set handler to the fan rotation characteristic
     this.fanService
       .getCharacteristic(this.hapChar.RotationSpeed)
       .setProps({ minStep: 50 })
-      .onSet(async value => await this.internalDiffuserSpeedUpdate(value))
+      .onSet(async (value) => this.internalDiffuserSpeedUpdate(value));
 
     // Add the set handler to the lightbulb on/off characteristic
     this.lightService
       .getCharacteristic(this.hapChar.On)
-      .onSet(async value => await this.internalLightStateUpdate(value))
+      .onSet(async (value) => this.internalLightStateUpdate(value));
 
     // Add the set handler to the lightbulb brightness characteristic
     this.lightService
       .getCharacteristic(this.hapChar.Brightness)
-      .onSet(async value => await this.internalLightBrightnessUpdate(value))
+      .onSet(async (value) => this.internalLightBrightnessUpdate(value));
 
     // Add the set handler to the lightbulb hue characteristic
     this.lightService
       .getCharacteristic(this.hapChar.Hue)
-      .onSet(async value => await this.internalLightColourUpdate(value))
+      .onSet(async (value) => this.internalLightColourUpdate(value));
 
     // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
     if (!platform.config.disableNoResponse) {
       this.fanService.getCharacteristic(this.hapChar.On).onGet(() => {
         if (!this.isOnline) {
-          throw new this.hapErr(-70402)
+          throw new this.hapErr(-70402);
         }
-        return this.fanService.getCharacteristic(this.hapChar.On).value
-      })
+        return this.fanService.getCharacteristic(this.hapChar.On).value;
+      });
       this.fanService.getCharacteristic(this.hapChar.RotationSpeed).onGet(() => {
         if (!this.isOnline) {
-          throw new this.hapErr(-70402)
+          throw new this.hapErr(-70402);
         }
-        return this.fanService.getCharacteristic(this.hapChar.RotationSpeed).value
-      })
+        return this.fanService.getCharacteristic(this.hapChar.RotationSpeed).value;
+      });
       this.lightService.getCharacteristic(this.hapChar.On).onGet(() => {
         if (!this.isOnline) {
-          throw new this.hapErr(-70402)
+          throw new this.hapErr(-70402);
         }
-        return this.lightService.getCharacteristic(this.hapChar.On).value
-      })
+        return this.lightService.getCharacteristic(this.hapChar.On).value;
+      });
       this.lightService.getCharacteristic(this.hapChar.Brightness).onGet(() => {
         if (!this.isOnline) {
-          throw new this.hapErr(-70402)
+          throw new this.hapErr(-70402);
         }
-        return this.lightService.getCharacteristic(this.hapChar.Brightness).value
-      })
+        return this.lightService.getCharacteristic(this.hapChar.Brightness).value;
+      });
       this.lightService.getCharacteristic(this.hapChar.Hue).onGet(() => {
         if (!this.isOnline) {
-          throw new this.hapErr(-70402)
+          throw new this.hapErr(-70402);
         }
-        return this.lightService.getCharacteristic(this.hapChar.Hue).value
-      })
+        return this.lightService.getCharacteristic(this.hapChar.Hue).value;
+      });
     }
 
     // Output the customised options to the log
+    const normalLogging = this.enableLogging ? 'standard' : 'disable';
     const opts = JSON.stringify({
-      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable'
-    })
-    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
+      logging: this.enableDebugLogging ? 'debug' : normalLogging,
+    });
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts);
   }
 
-  async internalDiffuserOnOffUpdate (value) {
+  async internalDiffuserOnOffUpdate(value) {
     try {
       // Don't continue if the requested new state is the same as the current state
-      const newValue = value ? 'on' : 'off'
+      const newValue = value ? 'on' : 'off';
       if (this.cacheState === newValue) {
-        return
+        return;
       }
 
       // Create the params object to send
-      const params = { switch: newValue }
+      const params = { switch: newValue };
 
       // Set up a five second timeout for the plugin to ignore incoming updates
-      const timerKey = this.funcs.generateRandomString(5)
-      this.updateTimeout = timerKey
+      const timerKey = generateRandomString(5);
+      this.updateTimeout = timerKey;
       setTimeout(() => {
         if (this.updateTimeout === timerKey) {
-          this.updateTimeout = false
+          this.updateTimeout = false;
         }
-      }, 5000)
+      }, 5000);
 
       // Send the device update
-      await this.platform.sendDeviceUpdate(this.accessory, params)
+      await this.platform.sendDeviceUpdate(this.accessory, params);
 
       // Update the cache with the new state
-      this.cacheState = newValue
+      this.cacheState = newValue;
 
       // Log the update if appropriate
       if (this.enableLogging) {
-        this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
+        this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState);
       }
     } catch (err) {
       // Catch any errors and let the platform display them
-      this.platform.deviceUpdateError(this.accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true);
       setTimeout(() => {
-        this.fanService.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
-      }, 2000)
-      throw new this.hapErr(-70402)
+        this.fanService.updateCharacteristic(this.hapChar.On, this.cacheState === 'on');
+      }, 2000);
+      throw new this.hapErr(-70402);
     }
   }
 
-  async internalDiffuserSpeedUpdate (value) {
+  async internalDiffuserSpeedUpdate(value) {
     try {
       // Don't continue if turning off as this will be handled by on/off handler
       if (value === 0) {
-        return
+        return;
       }
 
       // The new speed can be {50, 100} so use rounding on the new value
-      const newValue = value <= 50 ? 50 : 100
+      const newValue = value <= 50 ? 50 : 100;
 
       // Check the rounded speed against the current cache value
       if (newValue === this.cacheSpeed) {
-        return
+        return;
       }
 
       // Create the params object, mapping the state to {50, 100} -> {1, 2}
-      const params = { state: newValue / 50 }
+      const params = { state: newValue / 50 };
 
       // This acts like a debounce function when endlessly sliding the brightness scale
-      const updateKeySpeed = this.funcs.generateRandomString(5)
-      this.updateKeySpeed = updateKeySpeed
-      await this.funcs.sleep(450)
+      const updateKeySpeed = generateRandomString(5);
+      this.updateKeySpeed = updateKeySpeed;
+      await sleep(450);
       if (updateKeySpeed !== this.updateKeySpeed) {
-        return
+        return;
       }
 
       // Set up a five second timeout for the plugin to ignore incoming updates
-      this.updateTimeout = updateKeySpeed
+      this.updateTimeout = updateKeySpeed;
       setTimeout(() => {
         if (this.updateTimeout === updateKeySpeed) {
-          this.updateTimeout = false
+          this.updateTimeout = false;
         }
-      }, 5000)
+      }, 5000);
 
       // Send the device update
-      await this.platform.sendDeviceUpdate(this.accessory, params)
+      await this.platform.sendDeviceUpdate(this.accessory, params);
 
       // Update the cache value with the new speed
-      this.cacheSpeed = newValue
+      this.cacheSpeed = newValue;
 
       // Log the update if appropriate
       if (this.enableLogging) {
-        this.log('[%s] %s [%s%].', this.name, this.lang.curSpeed, this.cacheSpeed)
+        this.log('[%s] %s [%s%].', this.name, this.lang.curSpeed, this.cacheSpeed);
       }
     } catch (err) {
       // Catch any errors and let the platform display them
-      this.platform.deviceUpdateError(this.accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true);
       setTimeout(() => {
-        this.fanService.updateCharacteristic(this.hapChar.RotationSpeed, this.cacheSpeed)
-      }, 2000)
-      throw new this.hapErr(-70402)
+        this.fanService.updateCharacteristic(this.hapChar.RotationSpeed, this.cacheSpeed);
+      }, 2000);
+      throw new this.hapErr(-70402);
     }
   }
 
-  async internalLightStateUpdate (value) {
+  async internalLightStateUpdate(value) {
     try {
       // Don't continue if the new value is the same as before
-      const newValue = value ? 1 : 0
+      const newValue = value ? 1 : 0;
       if (this.cacheLight === newValue) {
-        return
+        return;
       }
 
       // Create the params object
-      const params = { lightswitch: this.cacheLight }
+      const params = { lightswitch: this.cacheLight };
 
       // Set up a five second timeout for the plugin to ignore incoming updates
-      const updateKeyLight = this.funcs.generateRandomString(5)
-      this.updateTimeout = updateKeyLight
+      const updateKeyLight = generateRandomString(5);
+      this.updateTimeout = updateKeyLight;
       setTimeout(() => {
         if (this.updateTimeout === updateKeyLight) {
-          this.updateTimeout = false
+          this.updateTimeout = false;
         }
-      }, 5000)
+      }, 5000);
 
       // Send the device update
-      await this.platform.sendDeviceUpdate(this.accessory, params)
+      await this.platform.sendDeviceUpdate(this.accessory, params);
 
       // Update the cache value
-      this.cacheLight = newValue
+      this.cacheLight = newValue;
 
       // Log the update if appropriate
       if (this.enableLogging) {
-        this.log('[%s] %s [%s%].', this.name, this.lang.curLight, value === 1 ? 'on' : 'off')
+        this.log('[%s] %s [%s%].', this.name, this.lang.curLight, value === 1 ? 'on' : 'off');
       }
     } catch (err) {
       // Catch any errors and let the platform display them
-      this.platform.deviceUpdateError(this.accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true);
       setTimeout(() => {
-        this.lightService.updateCharacteristic(this.hapChar.On, this.cacheLight === 'on')
-      }, 2000)
-      throw new this.hapErr(-70402)
+        this.lightService.updateCharacteristic(this.hapChar.On, this.cacheLight === 'on');
+      }, 2000);
+      throw new this.hapErr(-70402);
     }
   }
 
-  async internalLightBrightnessUpdate (value) {
+  async internalLightBrightnessUpdate(value) {
     try {
       // Don't continue if the new value is the same as before
       if (this.cacheBright === value) {
-        return
+        return;
       }
 
       // Create the params object
-      const params = { lightbright: value }
+      const params = { lightbright: value };
 
       // This acts like a debounce function when endlessly sliding the brightness scale
-      const updateKeyBright = this.funcs.generateRandomString(5)
-      this.updateKeyBright = updateKeyBright
-      await this.funcs.sleep(500)
+      const updateKeyBright = generateRandomString(5);
+      this.updateKeyBright = updateKeyBright;
+      await sleep(500);
       if (updateKeyBright !== this.updateKeyBright) {
-        return
+        return;
       }
 
       // Set up a five second timeout for the plugin to ignore incoming updates
-      this.updateTimeout = updateKeyBright
+      this.updateTimeout = updateKeyBright;
       setTimeout(() => {
         if (this.updateTimeout === updateKeyBright) {
-          this.updateTimeout = false
+          this.updateTimeout = false;
         }
-      }, 5000)
+      }, 5000);
 
       // Send the device update
-      await this.platform.sendDeviceUpdate(this.accessory, params)
+      await this.platform.sendDeviceUpdate(this.accessory, params);
 
       // Update the cache value
-      this.cacheBright = value
+      this.cacheBright = value;
 
       // Log the update if appropriate
       if (this.enableLogging) {
-        this.log('[%s] %s [%s%].', this.name, this.lang.curBright, this.cacheBright)
+        this.log('[%s] %s [%s%].', this.name, this.lang.curBright, this.cacheBright);
       }
     } catch (err) {
       // Catch any errors and let the platform display them
-      this.platform.deviceUpdateError(this.accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true);
       setTimeout(() => {
-        this.lightService.updateCharacteristic(this.hapChar.Brightness, this.cacheBright)
-      }, 2000)
-      throw new this.hapErr(-70402)
+        this.lightService.updateCharacteristic(this.hapChar.Brightness, this.cacheBright);
+      }, 2000);
+      throw new this.hapErr(-70402);
     }
   }
 
-  async internalLightColourUpdate (value) {
+  async internalLightColourUpdate(value) {
     try {
       // Don't continue if the light is off or the new value is the same as before
       if (this.cacheState !== 'on' || this.cacheHue === value) {
-        return
+        return;
       }
 
       // Create the params object
-      const sat = this.lightService.getCharacteristic(this.hapChar.Saturation).value
-      const newRGB = this.colourUtils.hs2rgb(value, sat)
+      const sat = this.lightService.getCharacteristic(this.hapChar.Saturation).value;
+      const newRGB = hs2rgb(value, sat);
       const params = {
         lightRcolor: newRGB[0],
         lightGcolor: newRGB[1],
-        lightBcolor: newRGB[2]
-      }
+        lightBcolor: newRGB[2],
+      };
 
       // This acts like a debounce function when endlessly sliding the colour wheel
-      const updateKeyColour = this.funcs.generateRandomString(5)
-      this.updateKeyColour = updateKeyColour
-      await this.funcs.sleep(400)
+      const updateKeyColour = generateRandomString(5);
+      this.updateKeyColour = updateKeyColour;
+      await sleep(400);
       if (updateKeyColour !== this.updateKeyColour) {
-        return
+        return;
       }
 
       // Set up a five second timeout for the plugin to ignore incoming updates
-      this.updateTimeout = updateKeyColour
+      this.updateTimeout = updateKeyColour;
       setTimeout(() => {
         if (this.updateTimeout === updateKeyColour) {
-          this.updateTimeout = false
+          this.updateTimeout = false;
         }
-      }, 5000)
+      }, 5000);
 
       // Send the device update
-      await this.platform.sendDeviceUpdate(this.accessory, params)
+      await this.platform.sendDeviceUpdate(this.accessory, params);
 
       // Update the cache values
-      this.cacheHue = value
-      this.cacheR = newRGB[0]
-      this.cacheG = newRGB[0]
-      this.cacheB = newRGB[0]
+      this.cacheHue = value;
+      [this.cacheR, this.cacheG, this.cacheB] = newRGB;
 
       // Log the update if appropriate
       if (this.enableLogging) {
@@ -348,66 +342,66 @@ module.exports = class deviceDiffuser {
           '[%s] %s [rgb %s].',
           this.name,
           this.lang.curColour,
-          this.cacheR + ' ' + this.cacheG + ' ' + this.cacheB
-        )
+          `${this.cacheR} ${this.cacheG} ${this.cacheB}`,
+        );
       }
     } catch (err) {
       // Catch any errors and let the platform display them
-      this.platform.deviceUpdateError(this.accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true);
       setTimeout(() => {
-        this.lightService.updateCharacteristic(this.hapChar.Hue, this.cacheHue)
-      }, 2000)
-      throw new this.hapErr(-70402)
+        this.lightService.updateCharacteristic(this.hapChar.Hue, this.cacheHue);
+      }, 2000);
+      throw new this.hapErr(-70402);
     }
   }
 
-  async externalUpdate (params) {
+  async externalUpdate(params) {
     try {
       // We can often receive old info when updating new values so ignore during timeout
       if (this.updateTimeout) {
-        return
+        return;
       }
 
       // Check to see if we are provided new and different on/off information
       if (params.switch && params.switch !== this.cacheState) {
         // Update the cache value
-        this.cacheState = params.switch
+        this.cacheState = params.switch;
 
         // Update the HomeKit value
-        this.fanService.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
+        this.fanService.updateCharacteristic(this.hapChar.On, this.cacheState === 'on');
 
         // If the diffuser is on but no speed provided, then update speed with the cache
-        if (this.cacheState === 'on' && !this.funcs.hasProperty(params, 'state')) {
-          this.fanService.updateCharacteristic(this.hapChar.RotationSpeed, this.cacheSpeed)
+        if (this.cacheState === 'on' && !hasProperty(params, 'state')) {
+          this.fanService.updateCharacteristic(this.hapChar.RotationSpeed, this.cacheSpeed);
         }
 
         // Log if appropriate
         if (params.updateSource && this.enableLogging) {
-          this.log('[%s] %s [%s%].', this.name, this.lang.curState, this.cacheState)
+          this.log('[%s] %s [%s%].', this.name, this.lang.curState, this.cacheState);
         }
       }
 
       // Check to see if we are provided new and different speed information
-      if (this.funcs.hasProperty(params, 'state') && params.state * 50 !== this.cacheSpeed) {
+      if (hasProperty(params, 'state') && params.state * 50 !== this.cacheSpeed) {
         // State is {0, 1, 2} corresponding to {0, 50, 100} rotation speed
-        this.cacheSpeed = params.state * 50
+        this.cacheSpeed = params.state * 50;
 
         // Update the HomeKit value
-        this.fanService.updateCharacteristic(this.hapChar.RotationSpeed, this.cacheSpeed)
+        this.fanService.updateCharacteristic(this.hapChar.RotationSpeed, this.cacheSpeed);
 
         // Log if appropriate
         if (params.updateSource && this.enableLogging) {
-          this.log('[%s] %s [%s%].', this.name, this.lang.curSpeed, this.cacheSpeed)
+          this.log('[%s] %s [%s%].', this.name, this.lang.curSpeed, this.cacheSpeed);
         }
       }
 
       // Check to see if we are provided new and different light on/off information
-      if (this.funcs.hasProperty(params, 'lightswitch') && this.cacheLight !== params.lightswitch) {
+      if (hasProperty(params, 'lightswitch') && this.cacheLight !== params.lightswitch) {
         // Lightswitch is {0, 1} corresponding to {false, true} off/on state
-        this.cacheLight = params.lightswitch
+        this.cacheLight = params.lightswitch;
 
         // Update the HomeKit value
-        this.lightService.updateCharacteristic(this.hapChar.On, params.lightswitch === 1)
+        this.lightService.updateCharacteristic(this.hapChar.On, params.lightswitch === 1);
 
         // Log if appropriate
         if (params.updateSource && this.enableLogging) {
@@ -415,47 +409,47 @@ module.exports = class deviceDiffuser {
             '[%s] %s [%s%].',
             this.name,
             this.lang.curLight,
-            params.lightswitch === 1 ? 'on' : 'off'
-          )
+            params.lightswitch === 1 ? 'on' : 'off',
+          );
         }
       }
 
       // Check to see if we are provided new and different light brightness information
       if (
-        this.funcs.hasProperty(params, 'lightbright') &&
-        this.cacheBright !== params.lightbright
+        hasProperty(params, 'lightbright')
+        && this.cacheBright !== params.lightbright
       ) {
         // Lightbright is [0, 100] corresponding to [0, 100] brightness
-        this.cacheBright = params.lightbright
+        this.cacheBright = params.lightbright;
 
         // Update the HomeKit value
-        this.lightService.updateCharacteristic(this.hapChar.Brightness, params.lightbright)
+        this.lightService.updateCharacteristic(this.hapChar.Brightness, params.lightbright);
 
         // Log if appropriate
         if (params.updateSource && this.enableLogging) {
-          this.log('[%s] %s [%s%].', this.name, this.lang.curBright, this.cacheBright)
+          this.log('[%s] %s [%s%].', this.name, this.lang.curBright, this.cacheBright);
         }
       }
 
       // Check to see if we are provided new and different light colour information
       if (
-        this.funcs.hasProperty(params, 'lightRcolor') &&
-        (this.cacheR !== params.lightRcolor ||
-          this.cacheG !== params.lightGcolor ||
-          this.cacheB !== params.lightBcolor)
+        hasProperty(params, 'lightRcolor')
+        && (this.cacheR !== params.lightRcolor
+          || this.cacheG !== params.lightGcolor
+          || this.cacheB !== params.lightBcolor)
       ) {
         // Lightcolor is provided as [0, 255] corresponding to RGB values
-        this.cacheR = params.lightRcolor
-        this.cacheG = params.lightGcolor
-        this.cacheB = params.lightBcolor
+        this.cacheR = params.lightRcolor;
+        this.cacheG = params.lightGcolor;
+        this.cacheB = params.lightBcolor;
 
         // Get the Hue information from the RGB colour (saturation is always 100)
-        const newColour = this.colourUtils.rgb2hs(this.cacheR, this.cacheG, this.cacheB)
-        this.cacheHue = newColour[0]
+        const newColour = rgb2hs(this.cacheR, this.cacheG, this.cacheB);
+        [this.cacheHue] = newColour;
 
         // Update the HomeKit values
-        this.lightService.updateCharacteristic(this.hapChar.Hue, this.cacheHue)
-        this.lightService.updateCharacteristic(this.hapChar.Saturation, 100)
+        this.lightService.updateCharacteristic(this.hapChar.Hue, this.cacheHue);
+        this.lightService.updateCharacteristic(this.hapChar.Saturation, 100);
 
         // Log if appropriate
         if (params.updateSource && this.enableLogging) {
@@ -463,17 +457,17 @@ module.exports = class deviceDiffuser {
             '[%s] %s [rgb %s].',
             this.name,
             this.lang.curColour,
-            this.cacheR + ' ' + this.cacheG + ' ' + this.cacheB
-          )
+            `${this.cacheR} ${this.cacheG} ${this.cacheB}`,
+          );
         }
       }
     } catch (err) {
       // Catch any errors and let the platform display them
-      this.platform.deviceUpdateError(this.accessory, err, false)
+      this.platform.deviceUpdateError(this.accessory, err, false);
     }
   }
 
-  markStatus (isOnline) {
-    this.isOnline = isOnline
+  markStatus(isOnline) {
+    this.isOnline = isOnline;
   }
 }
diff --git a/lib/device/fan.js b/lib/device/fan.js
index 5d4c46d3..860e697d 100644
--- a/lib/device/fan.js
+++ b/lib/device/fan.js
@@ -1,351 +1,347 @@
-/* jshint node: true, esversion: 10, -W014, -W033 */
-/* eslint-disable new-cap */
-'use strict'
+import { generateRandomString, sleep } from '../utils/functions.js';
 
-module.exports = class deviceFan {
-  constructor (platform, accessory) {
+export default class {
+  constructor(platform, accessory) {
     // Set up variables from the platform
-    this.funcs = platform.funcs
-    this.hapChar = platform.api.hap.Characteristic
-    this.hapErr = platform.api.hap.HapStatusError
-    this.hapServ = platform.api.hap.Service
-    this.lang = platform.lang
-    this.log = platform.log
-    this.platform = platform
+    this.hapChar = platform.api.hap.Characteristic;
+    this.hapErr = platform.api.hap.HapStatusError;
+    this.hapServ = platform.api.hap.Service;
+    this.lang = platform.lang;
+    this.log = platform.log;
+    this.platform = platform;
 
     // Set up variables from the accessory
-    this.name = accessory.displayName
-    this.accessory = accessory
+    this.name = accessory.displayName;
+    this.accessory = accessory;
 
     // Initially set the online flag as true (to be then updated as false if necessary)
-    this.isOnline = true
+    this.isOnline = true;
 
     // Set up custom variables for this device type
-    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
-    this.hideLight = deviceConf && deviceConf.hideLight
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId] || {};
+    this.hideLight = deviceConf.hideLight;
 
     // Set the correct logging variables for this accessory
-    this.enableLogging = !platform.config.disableDeviceLogging
-    this.enableDebugLogging = platform.config.debug
-    if (deviceConf && deviceConf.overrideLogging) {
-      switch (deviceConf.overrideLogging) {
-        case 'standard':
-          this.enableLogging = true
-          this.enableDebugLogging = false
-          break
-        case 'debug':
-          this.enableLogging = true
-          this.enableDebugLogging = true
-          break
-        case 'disable':
-          this.enableLogging = false
-          this.enableDebugLogging = false
-          break
-      }
+    switch (deviceConf.overrideLogging) {
+      case 'standard':
+        this.enableLogging = true;
+        this.enableDebugLogging = false;
+        break;
+      case 'debug':
+        this.enableLogging = true;
+        this.enableDebugLogging = true;
+        break;
+      case 'disable':
+        this.enableLogging = false;
+        this.enableDebugLogging = false;
+        break;
+      default:
+        this.enableLogging = !platform.config.disableDeviceLogging;
+        this.enableDebugLogging = platform.config.debug;
+        break;
     }
 
     // Add the fan service if it doesn't already exist
-    this.service =
-      this.accessory.getService(this.hapServ.Fan) || this.accessory.addService(this.hapServ.Fan)
+    this.service = this.accessory.getService(this.hapServ.Fan) || this.accessory.addService(this.hapServ.Fan);
 
     // Add the set handler to the fan on/off characteristic
     this.service
       .getCharacteristic(this.hapChar.On)
-      .onSet(async value => await this.internalStateUpdate(value))
+      .onSet(async (value) => this.internalStateUpdate(value));
 
     // Add the set handler to the fan rotation speed characteristic
     this.service
       .getCharacteristic(this.hapChar.RotationSpeed)
       .setProps({ minStep: 33 })
-      .onSet(async value => await this.internalSpeedUpdate(value))
+      .onSet(async (value) => this.internalSpeedUpdate(value));
 
     // Check to see if the user has hidden the light channel
     if (this.hideLight) {
       // The user has hidden the light channel, so remove it if it exists
       if (this.accessory.getService(this.hapServ.Lightbulb)) {
-        this.accessory.removeService(this.accessory.getService(this.hapServ.Lightbulb))
+        this.accessory.removeService(this.accessory.getService(this.hapServ.Lightbulb));
       }
     } else {
       // The user has not hidden the light channel, so add it if it doesn't exist
-      this.lightService =
-        this.accessory.getService(this.hapServ.Lightbulb) ||
-        this.accessory.addService(this.hapServ.Lightbulb)
+      this.lightService = this.accessory.getService(this.hapServ.Lightbulb)
+        || this.accessory.addService(this.hapServ.Lightbulb);
 
       // Add the set handler to the lightbulb on/off characteristic
       this.lightService
         .getCharacteristic(this.hapChar.On)
-        .onSet(async value => await this.internalLightUpdate(value))
+        .onSet(async (value) => this.internalLightUpdate(value));
     }
 
     // Set the fan service to the primary service
-    this.service.setPrimaryService()
+    this.service.setPrimaryService();
 
     // Conversion object eWeLink mode to text label
     this.speed2label = {
       33: 'low',
       66: 'medium',
-      99: 'high'
-    }
+      99: 'high',
+    };
 
     // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
     if (!platform.config.disableNoResponse) {
       this.service.getCharacteristic(this.hapChar.On).onGet(() => {
         if (!this.isOnline) {
-          throw new this.hapErr(-70402)
+          throw new this.hapErr(-70402);
         }
-        return this.service.getCharacteristic(this.hapChar.On).value
-      })
+        return this.service.getCharacteristic(this.hapChar.On).value;
+      });
       this.service.getCharacteristic(this.hapChar.RotationSpeed).onGet(() => {
         if (!this.isOnline) {
-          throw new this.hapErr(-70402)
+          throw new this.hapErr(-70402);
         }
-        return this.service.getCharacteristic(this.hapChar.RotationSpeed).value
-      })
+        return this.service.getCharacteristic(this.hapChar.RotationSpeed).value;
+      });
       if (this.lightService) {
         this.lightService.getCharacteristic(this.hapChar.On).onGet(() => {
           if (!this.isOnline) {
-            throw new this.hapErr(-70402)
+            throw new this.hapErr(-70402);
           }
-          return this.lightService.getCharacteristic(this.hapChar.On).value
-        })
+          return this.lightService.getCharacteristic(this.hapChar.On).value;
+        });
       }
     }
 
     // Output the customised options to the log
+    const normalLogging = this.enableLogging ? 'standard' : 'disable';
     const opts = JSON.stringify({
       hideLight: this.hideLight,
-      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable'
-    })
-    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
+      logging: this.enableDebugLogging ? 'debug' : normalLogging,
+    });
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts);
   }
 
-  async internalStateUpdate (value) {
+  async internalStateUpdate(value) {
     try {
-      const newState = value ? 'on' : 'off'
+      const newState = value ? 'on' : 'off';
       if (newState === this.cacheState) {
-        return
+        return;
       }
       const params = {
-        switches: []
-      }
+        switches: [],
+      };
       params.switches.push({
         switch: newState,
-        outlet: 1
-      })
+        outlet: 1,
+      });
       if (newState === 'on') {
         params.switches.push({
           switch: this.cacheSpeed === 66 ? 'on' : 'off',
-          outlet: 2
-        })
+          outlet: 2,
+        });
         params.switches.push({
           switch: this.cacheSpeed === 99 ? 'on' : 'off',
-          outlet: 3
-        })
+          outlet: 3,
+        });
       }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.cacheState = newState
+      await this.platform.sendDeviceUpdate(this.accessory, params);
+      this.cacheState = newState;
       if (this.enableLogging) {
-        this.log('[%s] %s [%s].', this.name, this.lang.curState, newState)
+        this.log('[%s] %s [%s].', this.name, this.lang.curState, newState);
       }
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true);
       setTimeout(() => {
-        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
-      }, 2000)
-      throw new this.hapErr(-70402)
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on');
+      }, 2000);
+      throw new this.hapErr(-70402);
     }
   }
 
-  async internalSpeedUpdate (value) {
+  async internalSpeedUpdate(value) {
     try {
       // This acts like a debounce function when endlessly sliding the slider
-      const updateKey = this.funcs.generateRandomString(5)
-      this.updateKey = updateKey
-      await this.funcs.sleep(500)
+      const updateKey = generateRandomString(5);
+      this.updateKey = updateKey;
+      await sleep(500);
       if (updateKey !== this.updateKey) {
-        return
+        return;
       }
       const params = {
-        switches: []
-      }
-      const newState = value >= 1 ? 'on' : 'off'
-      let newSpeed
+        switches: [],
+      };
+      const newState = value >= 1 ? 'on' : 'off';
+      let newSpeed;
       if (value === 0) {
-        newSpeed = 0
+        newSpeed = 0;
       } else if (value <= 33) {
-        newSpeed = 33
+        newSpeed = 33;
       } else if (value <= 66) {
-        newSpeed = 66
+        newSpeed = 66;
       } else {
-        newSpeed = 99
+        newSpeed = 99;
       }
       if (newSpeed === this.cacheSpeed) {
-        return
+        return;
       }
       params.switches.push({
         switch: newState === 'on' && newSpeed >= 33 ? 'on' : 'off',
-        outlet: 1
-      })
+        outlet: 1,
+      });
       params.switches.push({
         switch: newState === 'on' && newSpeed === 66 ? 'on' : 'off',
-        outlet: 2
-      })
+        outlet: 2,
+      });
       params.switches.push({
         switch: newState === 'on' && newSpeed === 99 ? 'on' : 'off',
-        outlet: 3
-      })
-      await this.platform.sendDeviceUpdate(this.accessory, params)
+        outlet: 3,
+      });
+      await this.platform.sendDeviceUpdate(this.accessory, params);
       if (newState !== this.cacheState) {
-        this.cacheState = newState
+        this.cacheState = newState;
         if (this.enableLogging) {
-          this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
+          this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState);
         }
       }
       if (newSpeed === 0) {
         // Update the rotation speed back to the previous value (with the fan still off)
         setTimeout(() => {
-          this.service.updateCharacteristic(this.hapChar.RotationSpeed, this.cacheSpeed)
-        }, 2000)
-        return
+          this.service.updateCharacteristic(this.hapChar.RotationSpeed, this.cacheSpeed);
+        }, 2000);
+        return;
       }
-      this.cacheSpeed = newSpeed
+      this.cacheSpeed = newSpeed;
       if (this.enableLogging) {
-        this.log('[%s] %s [%s].', this.name, this.lang.curSpeed, this.speed2label[this.cacheSpeed])
+        this.log('[%s] %s [%s].', this.name, this.lang.curSpeed, this.speed2label[this.cacheSpeed]);
       }
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true);
       setTimeout(() => {
-        this.service.updateCharacteristic(this.hapChar.RotationSpeed, this.cacheSpeed)
-      }, 2000)
-      throw new this.hapErr(-70402)
+        this.service.updateCharacteristic(this.hapChar.RotationSpeed, this.cacheSpeed);
+      }, 2000);
+      throw new this.hapErr(-70402);
     }
   }
 
-  async internalLightUpdate (value) {
+  async internalLightUpdate(value) {
     try {
       const params = {
-        switches: []
-      }
-      const newLight = value ? 'on' : 'off'
+        switches: [],
+      };
+      const newLight = value ? 'on' : 'off';
       if (newLight === this.cacheLight) {
-        return
+        return;
       }
       params.switches.push({
         switch: newLight,
-        outlet: 0
-      })
-      await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.cacheLight = newLight
+        outlet: 0,
+      });
+      await this.platform.sendDeviceUpdate(this.accessory, params);
+      this.cacheLight = newLight;
       if (this.enableLogging) {
-        this.log('[%s] %s [%s].', this.name, this.lang.curLight, this.cacheLight)
+        this.log('[%s] %s [%s].', this.name, this.lang.curLight, this.cacheLight);
       }
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true);
       setTimeout(() => {
-        this.lightService.updateCharacteristic(this.hapChar.On, this.cacheLight === 'on')
-      }, 2000)
-      throw new this.hapErr(-70402)
+        this.lightService.updateCharacteristic(this.hapChar.On, this.cacheLight === 'on');
+      }, 2000);
+      throw new this.hapErr(-70402);
     }
   }
 
-  async externalUpdate (params) {
+  async externalUpdate(params) {
     try {
       if (params.light && params.fan && params.speed) {
         // LAN update from iFan03
-        params.switches = {}
-        params.switches[0] = { switch: params.light }
-        params.switches[1] = { switch: params.fan }
+        params.switches = {};
+        params.switches[0] = { switch: params.light };
+        params.switches[1] = { switch: params.fan };
         switch (params.speed) {
           case 1:
-            params.switches[2] = { switch: 'off' }
-            params.switches[3] = { switch: 'off' }
-            break
+            params.switches[2] = { switch: 'off' };
+            params.switches[3] = { switch: 'off' };
+            break;
           case 2:
-            params.switches[2] = { switch: 'on' }
-            params.switches[3] = { switch: 'off' }
-            break
+            params.switches[2] = { switch: 'on' };
+            params.switches[3] = { switch: 'off' };
+            break;
           case 3:
-            params.switches[2] = { switch: 'off' }
-            params.switches[3] = { switch: 'on' }
-            break
+            params.switches[2] = { switch: 'off' };
+            params.switches[3] = { switch: 'on' };
+            break;
           default:
-            return
+            return;
         }
       }
       if (!params.switches) {
-        return
+        return;
       }
       if (params.switches[1].switch !== this.cacheState) {
-        this.cacheState = params.switches[1].switch
-        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
+        this.cacheState = params.switches[1].switch;
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on');
         if (params.updateSource && this.enableLogging) {
-          this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
+          this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState);
         }
       }
-      let speed
+      let speed;
       switch (params.switches[2].switch + params.switches[3].switch) {
         case 'onoff':
-          speed = 66
-          break
+          speed = 66;
+          break;
         case 'offon':
-          speed = 99
-          break
+          speed = 99;
+          break;
         default:
-          speed = 33
-          break
+          speed = 33;
+          break;
       }
       if (speed !== this.cacheSpeed && this.cacheState === 'on') {
-        this.cacheSpeed = speed
-        this.service.updateCharacteristic(this.hapChar.RotationSpeed, this.cacheSpeed)
+        this.cacheSpeed = speed;
+        this.service.updateCharacteristic(this.hapChar.RotationSpeed, this.cacheSpeed);
         if (params.updateSource && this.enableLogging) {
           this.log(
             '[%s] %s [%s].',
             this.name,
             this.lang.curSpeed,
-            this.speed2label[this.cacheSpeed]
-          )
+            this.speed2label[this.cacheSpeed],
+          );
         }
       }
       if (this.lightService && params.switches[0].switch !== this.cacheLight) {
-        this.cacheLight = params.switches[0].switch
-        this.lightService.updateCharacteristic(this.hapChar.On, this.cacheLight === 'on')
+        this.cacheLight = params.switches[0].switch;
+        this.lightService.updateCharacteristic(this.hapChar.On, this.cacheLight === 'on');
         if (params.updateSource && this.enableLogging) {
-          this.log('[%s] %s [%s].', this.name, this.lang.curLight, this.cacheLight)
+          this.log('[%s] %s [%s].', this.name, this.lang.curLight, this.cacheLight);
         }
       }
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, false)
+      this.platform.deviceUpdateError(this.accessory, err, false);
     }
   }
 
-  currentState () {
-    const toReturn = {}
-    let speedLabel
-    const speed = this.service.getCharacteristic(this.hapChar.RotationSpeed).value
+  currentState() {
+    const toReturn = {};
+    let speedLabel;
+    const speed = this.service.getCharacteristic(this.hapChar.RotationSpeed).value;
     if (speed === 0) {
-      speedLabel = 'off'
+      speedLabel = 'off';
     } else if (speed <= 33) {
-      speedLabel = 'low'
+      speedLabel = 'low';
     } else if (speed <= 66) {
-      speedLabel = 'medium'
+      speedLabel = 'medium';
     } else {
-      speedLabel = 'high'
+      speedLabel = 'high';
     }
-    toReturn.services = ['fan']
+    toReturn.services = ['fan'];
     toReturn.fan = {
       state: this.service.getCharacteristic(this.hapChar.On).value ? 'on' : 'off',
-      speed: speedLabel
-    }
+      speed: speedLabel,
+    };
     if (!this.hideLight) {
-      toReturn.services.push('light')
+      toReturn.services.push('light');
       toReturn.light = {
-        state: this.lightService.getCharacteristic(this.hapChar.On).value ? 'on' : 'off'
-      }
+        state: this.lightService.getCharacteristic(this.hapChar.On).value ? 'on' : 'off',
+      };
     }
-    return toReturn
+    return toReturn;
   }
 
-  markStatus (isOnline) {
-    this.isOnline = isOnline
+  markStatus(isOnline) {
+    this.isOnline = isOnline;
   }
 }
diff --git a/lib/device/group.js b/lib/device/group.js
index 9804324d..ed2948df 100644
--- a/lib/device/group.js
+++ b/lib/device/group.js
@@ -1,109 +1,106 @@
-/* jshint node: true, esversion: 10, -W014, -W033 */
-/* eslint-disable new-cap */
-'use strict'
+import platformConsts from '../utils/constants.js';
 
-module.exports = class deviceGroup {
-  constructor (platform, accessory) {
+export default class {
+  constructor(platform, accessory) {
     // Set up variables from the platform
-    this.eveChar = platform.eveChar
-    this.funcs = platform.funcs
-    this.hapChar = platform.api.hap.Characteristic
-    this.hapErr = platform.api.hap.HapStatusError
-    this.hapServ = platform.api.hap.Service
-    this.lang = platform.lang
-    this.log = platform.log
-    this.platform = platform
+    this.eveChar = platform.eveChar;
+    this.hapChar = platform.api.hap.Characteristic;
+    this.hapErr = platform.api.hap.HapStatusError;
+    this.hapServ = platform.api.hap.Service;
+    this.lang = platform.lang;
+    this.log = platform.log;
+    this.platform = platform;
 
     // Set up variables from the accessory
-    this.name = accessory.displayName
-    this.accessory = accessory
+    this.name = accessory.displayName;
+    this.accessory = accessory;
 
     // Set the correct logging variables for this accessory
-    this.enableLogging = !platform.config.disableDeviceLogging
-    this.enableDebugLogging = platform.config.debug
+    this.enableLogging = !platform.config.disableDeviceLogging;
+    this.enableDebugLogging = platform.config.debug;
 
-    if (platform.consts.devices.switchSCM.includes(this.accessory.context.groupUIID)) {
-      this.isSCM = true
+    if (platformConsts.devices.switchSCM.includes(this.accessory.context.groupUIID)) {
+      this.isSCM = true;
     }
 
     // Add the switch service if it doesn't already exist
-    this.service =
-      this.accessory.getService(this.hapServ.Switch) ||
-      this.accessory.addService(this.hapServ.Switch)
+    this.service = this.accessory.getService(this.hapServ.Switch)
+      || this.accessory.addService(this.hapServ.Switch);
 
     // Add the set handler to the switch on/off characteristic
     this.service
       .getCharacteristic(this.hapChar.On)
-      .onSet(async value => await this.internalStateUpdate(value))
+      .onSet(async (value) => this.internalStateUpdate(value));
 
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new platform.eveService('switch', this.accessory, {
-      log: platform.config.debugFakegato ? this.log : () => {}
-    })
+      log: platform.config.debugFakegato ? this.log : () => {},
+    });
 
     // Output the customised options to the log
+    const normalLogging = this.enableLogging ? 'standard' : 'disable';
     const opts = JSON.stringify({
-      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable'
-    })
-    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
+      logging: this.enableDebugLogging ? 'debug' : normalLogging,
+    });
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts);
   }
 
-  async internalStateUpdate (value) {
+  async internalStateUpdate(value) {
     try {
-      const newValue = value ? 'on' : 'off'
+      const newValue = value ? 'on' : 'off';
       if (newValue === this.cacheState) {
-        return
+        return;
       }
-      const params = {}
+      const params = {};
       if (this.isSCM) {
-        params.switches = [{ switch: newValue, outlet: 0 }]
+        params.switches = [{ switch: newValue, outlet: 0 }];
       } else {
-        params.switch = newValue
+        params.switch = newValue;
       }
-      await this.platform.sendGroupUpdate(this.accessory, params)
-      this.cacheState = newValue
-      this.accessory.eveService.addEntry({ status: value ? 1 : 0 })
+      await this.platform.sendGroupUpdate(this.accessory, params);
+      this.cacheState = newValue;
+      this.accessory.eveService.addEntry({ status: value ? 1 : 0 });
       if (this.enableLogging) {
-        this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
+        this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState);
       }
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true);
       setTimeout(() => {
-        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
-      }, 2000)
-      throw new this.hapErr(-70402)
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on');
+      }, 2000);
+      throw new this.hapErr(-70402);
     }
   }
 
-  async externalUpdate (params) {
+  async externalUpdate(params) {
     try {
       if (!this.isSCM && params.switch && params.switch !== this.cacheState) {
-        this.cacheState = params.switch
-        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
-        this.accessory.eveService.addEntry({ status: this.cacheState === 'on' ? 1 : 0 })
+        this.cacheState = params.switch;
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on');
+        this.accessory.eveService.addEntry({ status: this.cacheState === 'on' ? 1 : 0 });
         if (params.updateSource && this.enableLogging) {
-          this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
+          this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState);
         }
       }
       if (this.isSCM && params.switches && params.switches[0].switch !== this.cacheState) {
-        this.cacheState = params.switches[0].switch
-        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
-        this.accessory.eveService.addEntry({ status: this.cacheState === 'on' ? 1 : 0 })
+        this.cacheState = params.switches[0].switch;
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on');
+        this.accessory.eveService.addEntry({ status: this.cacheState === 'on' ? 1 : 0 });
         if (params.updateSource && this.enableLogging) {
-          this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
+          this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState);
         }
       }
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, false)
+      this.platform.deviceUpdateError(this.accessory, err, false);
     }
   }
 
-  async currentState () {
-    const toReturn = {}
-    toReturn.services = ['switch']
+  async currentState() {
+    const toReturn = {};
+    toReturn.services = ['switch'];
     toReturn.switch = {
-      state: this.service.getCharacteristic(this.hapChar.On).value ? 'on' : 'off'
-    }
-    return toReturn
+      state: this.service.getCharacteristic(this.hapChar.On).value ? 'on' : 'off',
+    };
+    return toReturn;
   }
 }
diff --git a/lib/device/humidifier.js b/lib/device/humidifier.js
index b034b615..a5e6fb09 100644
--- a/lib/device/humidifier.js
+++ b/lib/device/humidifier.js
@@ -1,46 +1,43 @@
-/* jshint node: true, esversion: 10, -W014, -W033 */
-/* eslint-disable new-cap */
-'use strict'
+import { generateRandomString, sleep } from '../utils/functions.js';
 
-module.exports = class deviceHumidifier {
-  constructor (platform, accessory) {
+export default class {
+  constructor(platform, accessory) {
     // Set up variables from the platform
-    this.funcs = platform.funcs
-    this.hapChar = platform.api.hap.Characteristic
-    this.hapErr = platform.api.hap.HapStatusError
-    this.hapServ = platform.api.hap.Service
-    this.lang = platform.lang
-    this.log = platform.log
-    this.platform = platform
+    this.hapChar = platform.api.hap.Characteristic;
+    this.hapErr = platform.api.hap.HapStatusError;
+    this.hapServ = platform.api.hap.Service;
+    this.lang = platform.lang;
+    this.log = platform.log;
+    this.platform = platform;
 
     // Set up variables from the accessory
-    this.name = accessory.displayName
-    this.accessory = accessory
+    this.name = accessory.displayName;
+    this.accessory = accessory;
 
     // Initially set the online flag as true (to be then updated as false if necessary)
-    this.isOnline = true
+    this.isOnline = true;
 
     // Set up custom variables for this device type
-    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId] || {};
 
     // Set the correct logging variables for this accessory
-    this.enableLogging = !platform.config.disableDeviceLogging
-    this.enableDebugLogging = platform.config.debug
-    if (deviceConf && deviceConf.overrideLogging) {
-      switch (deviceConf.overrideLogging) {
-        case 'standard':
-          this.enableLogging = true
-          this.enableDebugLogging = false
-          break
-        case 'debug':
-          this.enableLogging = true
-          this.enableDebugLogging = true
-          break
-        case 'disable':
-          this.enableLogging = false
-          this.enableDebugLogging = false
-          break
-      }
+    switch (deviceConf.overrideLogging) {
+      case 'standard':
+        this.enableLogging = true;
+        this.enableDebugLogging = false;
+        break;
+      case 'debug':
+        this.enableLogging = true;
+        this.enableDebugLogging = true;
+        break;
+      case 'disable':
+        this.enableLogging = false;
+        this.enableDebugLogging = false;
+        break;
+      default:
+        this.enableLogging = !platform.config.disableDeviceLogging;
+        this.enableDebugLogging = platform.config.debug;
+        break;
     }
 
     /*
@@ -50,154 +47,153 @@ module.exports = class deviceHumidifier {
     */
 
     // Add the fan service if it doesn't already exist
-    this.service =
-      this.accessory.getService(this.hapServ.Fan) || this.accessory.addService(this.hapServ.Fan)
+    this.service = this.accessory.getService(this.hapServ.Fan) || this.accessory.addService(this.hapServ.Fan);
 
     // Add the set handler to the fan on/off characteristic
     this.service
       .getCharacteristic(this.hapChar.On)
-      .onSet(async value => await this.internalStateUpdate(value))
+      .onSet(async (value) => this.internalStateUpdate(value));
 
     // Add the set handler to the fan rotation speed characteristic
     this.service
       .getCharacteristic(this.hapChar.RotationSpeed)
       .setProps({ minStep: 33 })
-      .onSet(async value => await this.internalModeUpdate(value))
+      .onSet(async (value) => this.internalModeUpdate(value));
 
     // Conversion object eWeLink mode to text label
     this.mode2label = {
       1: 'low',
       2: 'medium',
-      3: 'high'
-    }
+      3: 'high',
+    };
 
     // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
     if (!platform.config.disableNoResponse) {
       this.service.getCharacteristic(this.hapChar.On).onGet(() => {
         if (!this.isOnline) {
-          throw new this.hapErr(-70402)
+          throw new this.hapErr(-70402);
         }
-        return this.service.getCharacteristic(this.hapChar.On).value
-      })
+        return this.service.getCharacteristic(this.hapChar.On).value;
+      });
       this.service.getCharacteristic(this.hapChar.RotationSpeed).onGet(() => {
         if (!this.isOnline) {
-          throw new this.hapErr(-70402)
+          throw new this.hapErr(-70402);
         }
-        return this.service.getCharacteristic(this.hapChar.RotationSpeed).value
-      })
+        return this.service.getCharacteristic(this.hapChar.RotationSpeed).value;
+      });
     }
 
     // Output the customised options to the log
+    const normalLogging = this.enableLogging ? 'standard' : 'disable';
     const opts = JSON.stringify({
-      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable'
-    })
-    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
+      logging: this.enableDebugLogging ? 'debug' : normalLogging,
+    });
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts);
   }
 
-  async internalStateUpdate (value) {
+  async internalStateUpdate(value) {
     try {
-      const newState = value ? 'on' : 'off'
+      const newState = value ? 'on' : 'off';
       if (newState === this.cacheState) {
-        return
+        return;
       }
-      const params = { switch: newState }
+      const params = { switch: newState };
       if (newState === 'on') {
-        params.state = this.cacheMode
+        params.state = this.cacheMode;
       }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.cacheState = newState
+      await this.platform.sendDeviceUpdate(this.accessory, params);
+      this.cacheState = newState;
       if (this.enableLogging) {
-        this.log('[%s] %s [%s].', this.name, this.lang.curState, newState)
+        this.log('[%s] %s [%s].', this.name, this.lang.curState, newState);
       }
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true);
       setTimeout(() => {
-        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
-      }, 2000)
-      throw new this.hapErr(-70402)
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on');
+      }, 2000);
+      throw new this.hapErr(-70402);
     }
   }
 
-  async internalModeUpdate (value) {
+  async internalModeUpdate(value) {
     try {
-      const updateKey = this.funcs.generateRandomString(5)
-      this.updateKey = updateKey
-      await this.funcs.sleep(500)
+      const updateKey = generateRandomString(5);
+      this.updateKey = updateKey;
+      await sleep(500);
       if (updateKey !== this.updateKey) {
-        return
+        return;
       }
-      const params = {}
-      const newState = value >= 1 ? 'on' : 'off'
-      params.switch = newState
-      let newMode
+      const params = {};
+      const newState = value >= 1 ? 'on' : 'off';
+      params.switch = newState;
+      let newMode;
       if (value > 0) {
         if (value <= 33) {
-          newMode = 1
+          newMode = 1;
         } else if (value <= 66) {
-          newMode = 2
+          newMode = 2;
         } else {
-          newMode = 3
+          newMode = 3;
         }
         if (this.cacheMode === newMode) {
-          return
+          return;
         }
-        params.state = newMode
+        params.state = newMode;
       }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
+      await this.platform.sendDeviceUpdate(this.accessory, params);
       if (newState !== this.cacheState) {
-        this.cacheState = newState
+        this.cacheState = newState;
         if (this.enableLogging) {
-          this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
+          this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState);
         }
       }
       if (value === 0) {
         // Update the rotation speed back to the previous value (with the fan still off)
         setTimeout(() => {
-          this.service.updateCharacteristic(this.hapChar.RotationSpeed, this.cacheMode * 33)
-        }, 2000)
-        return
-      } else {
-        this.cacheMode = newMode
-        if (this.enableLogging) {
-          this.log('[%s] %s [%s].', this.name, this.lang.curMode, this.mode2label[this.cacheMode])
-        }
+          this.service.updateCharacteristic(this.hapChar.RotationSpeed, this.cacheMode * 33);
+        }, 2000);
+        return;
+      }
+      this.cacheMode = newMode;
+      if (this.enableLogging) {
+        this.log('[%s] %s [%s].', this.name, this.lang.curMode, this.mode2label[this.cacheMode]);
       }
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true);
       setTimeout(() => {
-        this.service.updateCharacteristic(this.hapChar.RotationSpeed, this.cacheMode * 33)
-      }, 2000)
-      throw new this.hapErr(-70402)
+        this.service.updateCharacteristic(this.hapChar.RotationSpeed, this.cacheMode * 33);
+      }, 2000);
+      throw new this.hapErr(-70402);
     }
   }
 
-  async externalUpdate (params) {
+  async externalUpdate(params) {
     try {
       if (params.switch && params.switch !== this.cacheState) {
-        this.cacheState = params.switch
+        this.cacheState = params.switch;
         if (params.updateSource && this.enableLogging) {
-          this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
+          this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState);
         }
-        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on');
         if (this.cacheState !== 'on') {
-          this.service.updateCharacteristic(this.hapChar.RotationSpeed, 0)
+          this.service.updateCharacteristic(this.hapChar.RotationSpeed, 0);
         }
       }
       if (params.state && params.state !== this.cacheMode) {
-        this.cacheMode = params.state
+        this.cacheMode = params.state;
         if (this.cacheState === 'on') {
           if (params.updateSource && this.enableLogging) {
-            this.log('[%s] %s [%s].', this.name, this.lang.curMode, this.mode2label[this.cacheMode])
+            this.log('[%s] %s [%s].', this.name, this.lang.curMode, this.mode2label[this.cacheMode]);
           }
-          this.service.updateCharacteristic(this.hapChar.RotationSpeed, this.cacheMode * 33)
+          this.service.updateCharacteristic(this.hapChar.RotationSpeed, this.cacheMode * 33);
         }
       }
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, false)
+      this.platform.deviceUpdateError(this.accessory, err, false);
     }
   }
 
-  markStatus (isOnline) {
-    this.isOnline = isOnline
+  markStatus(isOnline) {
+    this.isOnline = isOnline;
   }
 }
diff --git a/lib/device/index.js b/lib/device/index.js
new file mode 100644
index 00000000..c3fa352b
--- /dev/null
+++ b/lib/device/index.js
@@ -0,0 +1,59 @@
+import deviceCurtain from './curtain.js';
+import deviceDiffuser from './diffuser.js';
+import deviceFan from './fan.js';
+import deviceGroup from './group.js';
+import deviceHumidifier from './humidifier.js';
+import deviceLightCCT from './light-cct.js';
+import deviceLightDimmer from './light-dimmer.js';
+import deviceLightRGBCCT from './light-rgb-cct.js';
+import deviceLightRGB from './light-rgb.js';
+import deviceMotor from './motor.js';
+import deviceOutletMulti from './outlet-multi.js';
+import deviceOutletSingleInched from './outlet-single-inched.js';
+import deviceOutletSingle from './outlet-single.js';
+import devicePanel from './panel.js';
+import deviceRfBridge from './rf-bridge.js';
+import deviceRfButton from './rf-button.js';
+import deviceRfSensor from './rf-sensor.js';
+import deviceSensorAmbient from './sensor-ambient.js';
+import deviceSensorContact from './sensor-contact.js';
+import deviceSensorTempHumi from './sensor-temp-humi.js';
+import sim from './simulation/index.js';
+import deviceSwitchMate from './switch-mate.js';
+import deviceSwitchMulti from './switch-multi.js';
+import deviceSwitchSingleInched from './switch-single-inched.js';
+import deviceSwitchSingle from './switch-single.js';
+import deviceTemplate from './template.js';
+import deviceThermostat from './thermostat.js';
+import zb from './zigbee/index.js';
+
+export default {
+  deviceCurtain,
+  deviceDiffuser,
+  deviceFan,
+  deviceGroup,
+  deviceHumidifier,
+  deviceLightCCT,
+  deviceLightDimmer,
+  deviceLightRGB,
+  deviceLightRGBCCT,
+  deviceMotor,
+  deviceOutletMulti,
+  deviceOutletSingle,
+  deviceOutletSingleInched,
+  devicePanel,
+  deviceRfBridge,
+  deviceRfButton,
+  deviceRfSensor,
+  deviceSensorAmbient,
+  deviceSensorContact,
+  deviceSensorTempHumi,
+  deviceSwitchMate,
+  deviceSwitchMulti,
+  deviceSwitchSingle,
+  deviceSwitchSingleInched,
+  deviceTemplate,
+  deviceThermostat,
+  sim,
+  zb,
+};
diff --git a/lib/device/light-cct.js b/lib/device/light-cct.js
index f5caf2ab..d5cb91f1 100644
--- a/lib/device/light-cct.js
+++ b/lib/device/light-cct.js
@@ -1,330 +1,324 @@
-/* jshint node: true, esversion: 10, -W014, -W033 */
-/* eslint-disable new-cap */
-'use strict'
+import platformConsts from '../utils/constants.js';
+import { generateRandomString, hasProperty, sleep } from '../utils/functions.js';
 
-module.exports = class deviceLightCCT {
-  constructor (platform, accessory) {
+export default class {
+  constructor(platform, accessory) {
     // Set up variables from the platform
-    this.funcs = platform.funcs
-    this.hapChar = platform.api.hap.Characteristic
-    this.hapErr = platform.api.hap.HapStatusError
-    this.hapServ = platform.api.hap.Service
-    this.lang = platform.lang
-    this.log = platform.log
-    this.platform = platform
+    this.hapChar = platform.api.hap.Characteristic;
+    this.hapErr = platform.api.hap.HapStatusError;
+    this.hapServ = platform.api.hap.Service;
+    this.lang = platform.lang;
+    this.log = platform.log;
+    this.platform = platform;
 
     // Set up variables from the accessory
-    this.name = accessory.displayName
-    this.accessory = accessory
+    this.name = accessory.displayName;
+    this.accessory = accessory;
 
     // Initially set the online flag as true (to be then updated as false if necessary)
-    this.isOnline = true
+    this.isOnline = true;
 
     // Set up custom variables for this device type
-    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
-    this.deviceModel = deviceConf && deviceConf.deviceModel ? deviceConf.deviceModel : 'bulbB02FA60'
-    this.alShift =
-      deviceConf && deviceConf.adaptiveLightingShift
-        ? deviceConf.adaptiveLightingShift
-        : platform.consts.defaultValues.adaptiveLightingShift
-    this.brightStep =
-      deviceConf && deviceConf.brightnessStep
-        ? Math.min(deviceConf.brightnessStep, 100)
-        : platform.consts.defaultValues.brightnessStep
-    this.offlineAsOff = deviceConf && deviceConf.offlineAsOff
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId] || {};
+    this.deviceModel = deviceConf.deviceModel || 'bulbB02FA60';
+    this.alShift = deviceConf.adaptiveLightingShift || platformConsts.defaultValues.adaptiveLightingShift;
+    this.brightStep = deviceConf.brightnessStep
+      ? Math.min(deviceConf.brightnessStep, 100)
+      : platformConsts.defaultValues.brightnessStep;
+    this.offlineAsOff = deviceConf.offlineAsOff;
 
     // Set the correct logging variables for this accessory
-    this.enableLogging = !platform.config.disableDeviceLogging
-    this.enableDebugLogging = platform.config.debug
-    if (deviceConf && deviceConf.overrideLogging) {
-      switch (deviceConf.overrideLogging) {
-        case 'standard':
-          this.enableLogging = true
-          this.enableDebugLogging = false
-          break
-        case 'debug':
-          this.enableLogging = true
-          this.enableDebugLogging = true
-          break
-        case 'disable':
-          this.enableLogging = false
-          this.enableDebugLogging = false
-          break
-      }
+    switch (deviceConf.overrideLogging) {
+      case 'standard':
+        this.enableLogging = true;
+        this.enableDebugLogging = false;
+        break;
+      case 'debug':
+        this.enableLogging = true;
+        this.enableDebugLogging = true;
+        break;
+      case 'disable':
+        this.enableLogging = false;
+        this.enableDebugLogging = false;
+        break;
+      default:
+        this.enableLogging = !platform.config.disableDeviceLogging;
+        this.enableDebugLogging = platform.config.debug;
+        break;
     }
 
     // Different bulbs have different colour temperature ranges
     switch (this.deviceModel) {
       case 'bulbB02FST64':
-        this.minK = 1800
-        this.maxK = 5000
-        break
+        this.minK = 1800;
+        this.maxK = 5000;
+        break;
       case 'bulbB02BA60':
-        this.minK = 2700
-        this.maxK = 6500
-        break
+        this.minK = 2700;
+        this.maxK = 6500;
+        break;
       default:
-        this.minK = 2200
-        this.maxK = 6500
-        break
+        this.minK = 2200;
+        this.maxK = 6500;
+        break;
     }
 
     // Add the lightbulb service if it doesn't already exist
-    this.service =
-      this.accessory.getService(this.hapServ.Lightbulb) ||
-      this.accessory.addService(this.hapServ.Lightbulb)
+    this.service = this.accessory.getService(this.hapServ.Lightbulb)
+      || this.accessory.addService(this.hapServ.Lightbulb);
 
     // If adaptive lighting has just been disabled then remove and re-add service to hide AL icon
     if (this.alShift === -1 && this.accessory.context.adaptiveLighting) {
-      this.accessory.removeService(this.service)
-      this.service = this.accessory.addService(this.hapServ.Lightbulb)
-      this.accessory.context.adaptiveLighting = false
+      this.accessory.removeService(this.service);
+      this.service = this.accessory.addService(this.hapServ.Lightbulb);
+      this.accessory.context.adaptiveLighting = false;
     }
 
     // Add the set handler to the lightbulb on/off characteristic
     this.service
       .getCharacteristic(this.hapChar.On)
-      .onSet(async value => await this.internalStateUpdate(value))
+      .onSet(async (value) => this.internalStateUpdate(value));
 
     // Add the set handler to the lightbulb brightness characteristic
     this.service
       .getCharacteristic(this.hapChar.Brightness)
       .setProps({ minStep: this.brightStep })
-      .onSet(async value => await this.internalBrightnessUpdate(value))
+      .onSet(async (value) => this.internalBrightnessUpdate(value));
 
     // Add the set handler to the lightbulb colour temperature characteristic
     this.service
       .getCharacteristic(this.hapChar.ColorTemperature)
-      .onSet(async value => await this.internalCTUpdate(value))
+      .onSet(async (value) => this.internalCTUpdate(value));
 
     // This is needed as sometimes we need to send the brightness with a cct update
-    this.cacheBright = this.service.getCharacteristic(this.hapChar.Brightness).value
+    this.cacheBright = this.service.getCharacteristic(this.hapChar.Brightness).value;
 
     // Set up the adaptive lighting controller if not disabled by user
     if (this.alShift !== -1) {
       this.accessory.alController = new platform.api.hap.AdaptiveLightingController(this.service, {
-        customTemperatureAdjustment: this.alShift
-      })
-      this.accessory.configureController(this.accessory.alController)
+        customTemperatureAdjustment: this.alShift,
+      });
+      this.accessory.configureController(this.accessory.alController);
     }
 
     // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
     if (!platform.config.disableNoResponse) {
       this.service.getCharacteristic(this.hapChar.On).onGet(() => {
         if (!this.isOnline) {
-          throw new this.hapErr(-70402)
+          throw new this.hapErr(-70402);
         }
-        return this.service.getCharacteristic(this.hapChar.On).value
-      })
+        return this.service.getCharacteristic(this.hapChar.On).value;
+      });
       this.service.getCharacteristic(this.hapChar.Brightness).onGet(() => {
         if (!this.isOnline) {
-          throw new this.hapErr(-70402)
+          throw new this.hapErr(-70402);
         }
-        return this.service.getCharacteristic(this.hapChar.Brightness).value
-      })
+        return this.service.getCharacteristic(this.hapChar.Brightness).value;
+      });
       this.service.getCharacteristic(this.hapChar.ColorTemperature).onGet(() => {
         if (!this.isOnline) {
-          throw new this.hapErr(-70402)
+          throw new this.hapErr(-70402);
         }
-        return this.service.getCharacteristic(this.hapChar.ColorTemperature).value
-      })
+        return this.service.getCharacteristic(this.hapChar.ColorTemperature).value;
+      });
     }
 
     // Output the customised options to the log
+    const normalLogging = this.enableLogging ? 'standard' : 'disable';
     const opts = JSON.stringify({
       adaptiveLightingShift: this.alShift,
       brightnessStep: this.brightStep,
       deviceModel: this.deviceModel,
-      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
-      offlineAsOff: !!this.offlineAsOff
-    })
-    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
+      logging: this.enableDebugLogging ? 'debug' : normalLogging,
+      offlineAsOff: !!this.offlineAsOff,
+    });
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts);
   }
 
-  async internalStateUpdate (value) {
+  async internalStateUpdate(value) {
     try {
-      const newValue = value ? 'on' : 'off'
+      const newValue = value ? 'on' : 'off';
       if (this.cacheState === newValue) {
-        return
+        return;
       }
-      const timerKey = this.funcs.generateRandomString(5)
-      this.updateTimeout = timerKey
+      const timerKey = generateRandomString(5);
+      this.updateTimeout = timerKey;
       setTimeout(() => {
         if (this.updateTimeout === timerKey) {
-          this.updateTimeout = false
+          this.updateTimeout = false;
         }
-      }, 5000)
+      }, 5000);
       await this.platform.sendDeviceUpdate(this.accessory, {
-        switch: newValue
-      })
-      this.cacheState = newValue
+        switch: newValue,
+      });
+      this.cacheState = newValue;
       if (this.enableLogging) {
-        this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
+        this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState);
       }
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true);
       setTimeout(() => {
-        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
-      }, 2000)
-      throw new this.hapErr(-70402)
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on');
+      }, 2000);
+      throw new this.hapErr(-70402);
     }
   }
 
-  async internalBrightnessUpdate (value) {
+  async internalBrightnessUpdate(value) {
     try {
       if (this.cacheBright === value) {
-        return
+        return;
       }
-      const updateKey = this.funcs.generateRandomString(5)
-      this.updateKeyBright = updateKey
-      await this.funcs.sleep(500)
+      const updateKey = generateRandomString(5);
+      this.updateKeyBright = updateKey;
+      await sleep(500);
       if (updateKey !== this.updateKeyBright) {
-        return
+        return;
       }
-      this.updateTimeout = updateKey
+      this.updateTimeout = updateKey;
       setTimeout(() => {
         if (this.updateTimeout === updateKey) {
-          this.updateTimeout = false
+          this.updateTimeout = false;
         }
-      }, 5000)
+      }, 5000);
       const params = {
         white: {
           br: value,
-          ct: this.cacheCT
-        }
-      }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.cacheBright = value
+          ct: this.cacheCT,
+        },
+      };
+      await this.platform.sendDeviceUpdate(this.accessory, params);
+      this.cacheBright = value;
       if (this.enableLogging) {
-        this.log('[%s] %s [%s%].', this.name, this.lang.curBright, this.cacheBright)
+        this.log('[%s] %s [%s%].', this.name, this.lang.curBright, this.cacheBright);
       }
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true);
       setTimeout(() => {
-        this.service.updateCharacteristic(this.hapChar.Brightness, this.cacheBright)
-      }, 2000)
-      throw new this.hapErr(-70402)
+        this.service.updateCharacteristic(this.hapChar.Brightness, this.cacheBright);
+      }, 2000);
+      throw new this.hapErr(-70402);
     }
   }
 
-  async internalCTUpdate (value) {
+  async internalCTUpdate(value) {
     try {
       if (this.cacheMired === value) {
-        return
+        return;
       }
       if (
-        this.accessory.alController &&
-        this.accessory.alController.isAdaptiveLightingActive() &&
-        (this.cacheState !== 'on' || !this.isOnline)
+        this.accessory.alController
+        && this.accessory.alController.isAdaptiveLightingActive()
+        && (this.cacheState !== 'on' || !this.isOnline)
       ) {
-        return
+        return;
       }
-      const updateKey = this.funcs.generateRandomString(5)
-      this.updateKeyCT = updateKey
-      await this.funcs.sleep(400)
+      const updateKey = generateRandomString(5);
+      this.updateKeyCT = updateKey;
+      await sleep(400);
       if (updateKey !== this.updateKeyCT) {
-        return
+        return;
       }
-      this.updateTimeout = updateKey
+      this.updateTimeout = updateKey;
       setTimeout(() => {
         if (this.updateTimeout === updateKey) {
-          this.updateTimeout = false
+          this.updateTimeout = false;
         }
-      }, 5000)
-      const kelvin = Math.round(1000000 / value)
-      const scaledK = Math.max(Math.min(kelvin, this.maxK), this.minK)
-      const scaledCT = Math.round(((scaledK - this.minK) / (this.maxK - this.minK)) * 255)
+      }, 5000);
+      const kelvin = Math.round(1000000 / value);
+      const scaledK = Math.max(Math.min(kelvin, this.maxK), this.minK);
+      const scaledCT = Math.round(((scaledK - this.minK) / (this.maxK - this.minK)) * 255);
       const params = {
         white: {
           br: this.cacheBright,
-          ct: scaledCT
-        }
-      }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.cacheMired = value
-      this.cacheCT = scaledCT
+          ct: scaledCT,
+        },
+      };
+      await this.platform.sendDeviceUpdate(this.accessory, params);
+      this.cacheMired = value;
+      this.cacheCT = scaledCT;
       if (this.enableLogging) {
         if (this.accessory.alController && this.accessory.alController.isAdaptiveLightingActive()) {
-          this.log('[%s] %s [%sK] %s.', this.name, this.lang.curColour, scaledK, this.lang.viaAL)
+          this.log('[%s] %s [%sK] %s.', this.name, this.lang.curColour, scaledK, this.lang.viaAL);
         } else {
-          this.log('[%s] %s [%sK].', this.name, this.lang.curColour, scaledK)
+          this.log('[%s] %s [%sK].', this.name, this.lang.curColour, scaledK);
         }
       }
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true);
       setTimeout(() => {
-        this.service.updateCharacteristic(this.hapChar.ColorTemperature, this.cacheMired)
-      }, 2000)
-      throw new this.hapErr(-70402)
+        this.service.updateCharacteristic(this.hapChar.ColorTemperature, this.cacheMired);
+      }, 2000);
+      throw new this.hapErr(-70402);
     }
   }
 
-  async externalUpdate (params) {
+  async externalUpdate(params) {
     try {
       if (this.updateTimeout) {
-        return
+        return;
       }
       if (params.switch && params.switch !== this.cacheState) {
-        this.cacheState = params.switch
-        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
+        this.cacheState = params.switch;
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on');
         if (params.updateSource && this.enableLogging) {
-          this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
+          this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState);
         }
       }
       if (params.white) {
-        if (this.funcs.hasProperty(params.white, 'br') && this.cacheBright !== params.white.br) {
-          this.cacheBright = params.white.br
-          this.service.updateCharacteristic(this.hapChar.Brightness, this.cacheBright)
+        if (hasProperty(params.white, 'br') && this.cacheBright !== params.white.br) {
+          this.cacheBright = params.white.br;
+          this.service.updateCharacteristic(this.hapChar.Brightness, this.cacheBright);
           if (params.updateSource && this.enableLogging) {
-            this.log('[%s] %s [%s%].', this.name, this.lang.curBright, this.cacheBright)
+            this.log('[%s] %s [%s%].', this.name, this.lang.curBright, this.cacheBright);
           }
         }
-        if (this.funcs.hasProperty(params.white, 'ct') && this.cacheCT !== params.white.ct) {
-          const ctDiff = Math.abs(params.white.ct - this.cacheCT)
-          this.cacheCT = params.white.ct
-          const kelvin = (this.cacheCT / 255) * (this.maxK - this.minK) + this.minK
-          const scaledK = Math.round(kelvin)
-          this.cacheMired = Math.min(Math.max(Math.round(1000000 / scaledK), 140), 500)
-          this.service.updateCharacteristic(this.hapChar.ColorTemperature, this.cacheMired)
+        if (hasProperty(params.white, 'ct') && this.cacheCT !== params.white.ct) {
+          const ctDiff = Math.abs(params.white.ct - this.cacheCT);
+          this.cacheCT = params.white.ct;
+          const kelvin = (this.cacheCT / 255) * (this.maxK - this.minK) + this.minK;
+          const scaledK = Math.round(kelvin);
+          this.cacheMired = Math.min(Math.max(Math.round(1000000 / scaledK), 140), 500);
+          this.service.updateCharacteristic(this.hapChar.ColorTemperature, this.cacheMired);
           if (params.updateSource) {
             if (this.enableLogging) {
-              this.log('[%s] %s [%sK].', this.name, this.lang.curColour, scaledK)
+              this.log('[%s] %s [%sK].', this.name, this.lang.curColour, scaledK);
             }
             if (
-              this.accessory.alController &&
-              this.accessory.alController.isAdaptiveLightingActive() &&
-              ctDiff > 20
+              this.accessory.alController
+              && this.accessory.alController.isAdaptiveLightingActive()
+              && ctDiff > 20
             ) {
               // Look for a variation greater than twenty
-              this.accessory.alController.disableAdaptiveLighting()
+              this.accessory.alController.disableAdaptiveLighting();
               if (this.enableLogging) {
-                this.log('[%s] %s.', this.name, this.lang.disabledAL)
+                this.log('[%s] %s.', this.name, this.lang.disabledAL);
               }
             }
           }
         }
       }
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, false)
+      this.platform.deviceUpdateError(this.accessory, err, false);
     }
   }
 
-  markStatus (isOnline) {
-    this.isOnline = isOnline
+  markStatus(isOnline) {
+    this.isOnline = isOnline;
 
     // Show as off if offline if configured by user
     if (this.offlineAsOff && !isOnline && this.cacheState !== 'off') {
-      this.service.updateCharacteristic(this.hapChar.On, false)
-      this.cacheState = 'off'
+      this.service.updateCharacteristic(this.hapChar.On, false);
+      this.cacheState = 'off';
       if (this.enableLogging) {
-        this.log('[%s] %s [%s - offline]', this.name, this.lang.curState, this.cacheState)
+        this.log('[%s] %s [%s - offline]', this.name, this.lang.curState, this.cacheState);
       }
     }
   }
 
-  currentState () {
-    const toReturn = {}
-    toReturn.services = ['light']
+  currentState() {
+    const toReturn = {};
+    toReturn.services = ['light'];
     toReturn.light = {
       state: this.service.getCharacteristic(this.hapChar.On).value ? 'on' : 'off',
       brightness: this.service.getCharacteristic(this.hapChar.Brightness).value,
@@ -332,8 +326,8 @@ module.exports = class deviceLightCCT {
       adaptivelighting:
         this.accessory.alController && this.accessory.alController.isAdaptiveLightingActive()
           ? 'on'
-          : 'off'
-    }
-    return toReturn
+          : 'off',
+    };
+    return toReturn;
   }
 }
diff --git a/lib/device/light-dimmer.js b/lib/device/light-dimmer.js
index b262758b..b97d217d 100644
--- a/lib/device/light-dimmer.js
+++ b/lib/device/light-dimmer.js
@@ -1,252 +1,253 @@
-/* jshint node: true, esversion: 10, -W014, -W033 */
-/* eslint-disable new-cap */
-'use strict'
+import platformConsts from '../utils/constants.js';
+import { generateRandomString, hasProperty, sleep } from '../utils/functions.js';
 
-module.exports = class deviceLightDimmer {
-  constructor (platform, accessory) {
+export default class {
+  constructor(platform, accessory) {
     // Set up variables from the platform
-    this.funcs = platform.funcs
-    this.hapChar = platform.api.hap.Characteristic
-    this.hapErr = platform.api.hap.HapStatusError
-    this.hapServ = platform.api.hap.Service
-    this.lang = platform.lang
-    this.log = platform.log
-    this.platform = platform
+    this.hapChar = platform.api.hap.Characteristic;
+    this.hapErr = platform.api.hap.HapStatusError;
+    this.hapServ = platform.api.hap.Service;
+    this.lang = platform.lang;
+    this.log = platform.log;
+    this.platform = platform;
 
     // Set up variables from the accessory
-    this.name = accessory.displayName
-    this.accessory = accessory
+    this.name = accessory.displayName;
+    this.accessory = accessory;
 
     // Initially set the online flag as true (to be then updated as false if necessary)
-    this.isOnline = true
+    this.isOnline = true;
 
     // Set up custom variables for this device type
-    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
-    this.brightStep =
-      deviceConf && deviceConf.brightnessStep
-        ? Math.min(deviceConf.brightnessStep, 100)
-        : platform.consts.defaultValues.brightnessStep
-    this.offlineAsOff = deviceConf && deviceConf.offlineAsOff
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId] || {};
+    this.brightStep = deviceConf.brightnessStep
+      ? Math.min(deviceConf.brightnessStep, 100)
+      : platformConsts.defaultValues.brightnessStep;
+    this.offlineAsOff = deviceConf.offlineAsOff;
 
     // Set the correct logging variables for this accessory
-    this.enableLogging = !platform.config.disableDeviceLogging
-    this.enableDebugLogging = platform.config.debug
-    if (deviceConf && deviceConf.overrideLogging) {
-      switch (deviceConf.overrideLogging) {
-        case 'standard':
-          this.enableLogging = true
-          this.enableDebugLogging = false
-          break
-        case 'debug':
-          this.enableLogging = true
-          this.enableDebugLogging = true
-          break
-        case 'disable':
-          this.enableLogging = false
-          this.enableDebugLogging = false
-          break
-      }
+    switch (deviceConf.overrideLogging) {
+      case 'standard':
+        this.enableLogging = true;
+        this.enableDebugLogging = false;
+        break;
+      case 'debug':
+        this.enableLogging = true;
+        this.enableDebugLogging = true;
+        break;
+      case 'disable':
+        this.enableLogging = false;
+        this.enableDebugLogging = false;
+        break;
+      default:
+        this.enableLogging = !platform.config.disableDeviceLogging;
+        this.enableDebugLogging = platform.config.debug;
+        break;
     }
 
     // Add the lightbulb service if it doesn't already exist
-    this.service =
-      this.accessory.getService(this.hapServ.Lightbulb) ||
-      this.accessory.addService(this.hapServ.Lightbulb)
+    this.service = this.accessory.getService(this.hapServ.Lightbulb)
+      || this.accessory.addService(this.hapServ.Lightbulb);
 
     // Add the set handler to the lightbulb on/off characteristic
     this.service
       .getCharacteristic(this.hapChar.On)
-      .onSet(async value => await this.internalStateUpdate(value))
+      .onSet(async (value) => this.internalStateUpdate(value));
 
     // Add the set handler to the lightbulb brightness characteristic
     this.service
       .getCharacteristic(this.hapChar.Brightness)
       .setProps({ minStep: this.brightStep })
-      .onSet(async value => await this.internalBrightnessUpdate(value))
+      .onSet(async (value) => this.internalBrightnessUpdate(value));
 
     // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
     if (!platform.config.disableNoResponse) {
       this.service.getCharacteristic(this.hapChar.On).onGet(() => {
         if (!this.isOnline) {
-          throw new this.hapErr(-70402)
+          throw new this.hapErr(-70402);
         }
-        return this.service.getCharacteristic(this.hapChar.On).value
-      })
+        return this.service.getCharacteristic(this.hapChar.On).value;
+      });
       this.service.getCharacteristic(this.hapChar.Brightness).onGet(() => {
         if (!this.isOnline) {
-          throw new this.hapErr(-70402)
+          throw new this.hapErr(-70402);
         }
-        return this.service.getCharacteristic(this.hapChar.Brightness).value
-      })
+        return this.service.getCharacteristic(this.hapChar.Brightness).value;
+      });
     }
 
     // Output the customised options to the log
+    const normalLogging = this.enableLogging ? 'standard' : 'disable';
     const opts = JSON.stringify({
       brightnessStep: this.brightStep,
-      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
-      offlineAsOff: !!this.offlineAsOff
-    })
-    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
+      logging: this.enableDebugLogging ? 'debug' : normalLogging,
+      offlineAsOff: !!this.offlineAsOff,
+    });
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts);
   }
 
-  async internalStateUpdate (value) {
+  async internalStateUpdate(value) {
     try {
-      const newValue = value ? 'on' : 'off'
+      const newValue = value ? 'on' : 'off';
       if (this.cacheState === newValue) {
-        return
+        return;
       }
-      const params = {}
+      const params = {};
       switch (this.accessory.context.eweUIID) {
         case 36:
         case 44:
           // KING-M4, D1
-          params.switch = newValue
-          break
+          params.switch = newValue;
+          break;
         case 57:
-          params.state = newValue
-          break
+          params.state = newValue;
+          break;
+        default:
+          return;
       }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.cacheState = newValue
+      await this.platform.sendDeviceUpdate(this.accessory, params);
+      this.cacheState = newValue;
       if (this.enableLogging) {
-        this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
+        this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState);
       }
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true);
       setTimeout(() => {
-        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
-      }, 2000)
-      throw new this.hapErr(-70402)
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on');
+      }, 2000);
+      throw new this.hapErr(-70402);
     }
   }
 
-  async internalBrightnessUpdate (value) {
+  async internalBrightnessUpdate(value) {
     try {
       if (this.cacheBright === value) {
-        return
+        return;
       }
-      const updateKey = this.funcs.generateRandomString(5)
-      this.updateKeyBright = updateKey
-      await this.funcs.sleep(500)
+      const updateKey = generateRandomString(5);
+      this.updateKeyBright = updateKey;
+      await sleep(500);
       if (updateKey !== this.updateKeyBright) {
-        return
+        return;
       }
-      const params = {}
+      const params = {};
       switch (this.accessory.context.eweUIID) {
         case 36:
-          params.bright = Math.round((value * 9) / 10 + 10)
+          params.bright = Math.round((value * 9) / 10 + 10);
           // KING-M4 eWeLink scale is 10-100 and HomeKit scale is 0-100
-          break
+          break;
         case 44:
-          params.brightness = value
+          params.brightness = value;
           // D1 eWeLink scale matches HomeKit scale of 0-100
-          params.mode = 0
-          break
+          params.mode = 0;
+          break;
         case 57:
-          params.channel0 = Math.round((value * 23) / 10 + 25).toString()
+          params.channel0 = Math.round((value * 23) / 10 + 25).toString();
           // Device eWeLink scale is 25-255 and HomeKit scale is 0-100.
-          break
+          break;
+        default:
+          return;
       }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.cacheBright = value
+      await this.platform.sendDeviceUpdate(this.accessory, params);
+      this.cacheBright = value;
       if (this.enableLogging) {
-        this.log('[%s] %s [%s%].', this.name, this.lang.curBright, this.cacheBright)
+        this.log('[%s] %s [%s%].', this.name, this.lang.curBright, this.cacheBright);
       }
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true);
       setTimeout(() => {
-        this.service.updateCharacteristic(this.hapChar.Brightness, this.cacheBright)
-      }, 2000)
-      throw new this.hapErr(-70402)
+        this.service.updateCharacteristic(this.hapChar.Brightness, this.cacheBright);
+      }, 2000);
+      throw new this.hapErr(-70402);
     }
   }
 
-  async externalUpdate (params) {
+  async externalUpdate(params) {
     try {
       if (this.accessory.context.eweUIID === 57) {
         if (params.state && params.state !== this.cacheState) {
-          this.service.updateCharacteristic(this.hapChar.On, params.state === 'on')
-          this.cacheState = params.state
+          this.service.updateCharacteristic(this.hapChar.On, params.state === 'on');
+          this.cacheState = params.state;
           if (params.updateSource && this.enableLogging) {
-            this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
+            this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState);
           }
         }
-      } else {
-        if (params.switch && params.switch !== this.cacheState) {
-          this.service.updateCharacteristic(this.hapChar.On, params.switch === 'on')
-          this.cacheState = params.switch
-          if (params.updateSource && this.enableLogging) {
-            this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
-          }
+      } else if (params.switch && params.switch !== this.cacheState) {
+        this.service.updateCharacteristic(this.hapChar.On, params.switch === 'on');
+        this.cacheState = params.switch;
+        if (params.updateSource && this.enableLogging) {
+          this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState);
         }
       }
 
       switch (this.accessory.context.eweUIID) {
         case 36:
           // KING-M4 eWeLink scale is 10-100 and HomeKit scale is 0-100.
-          if (this.funcs.hasProperty(params, 'bright')) {
-            const nb = Math.round(((params.bright - 10) * 10) / 9)
+          if (hasProperty(params, 'bright')) {
+            const nb = Math.round(((params.bright - 10) * 10) / 9);
             if (nb !== this.cacheBright) {
-              this.service.updateCharacteristic(this.hapChar.Brightness, nb)
-              this.cacheBright = nb
+              this.service.updateCharacteristic(this.hapChar.Brightness, nb);
+              this.cacheBright = nb;
               if (params.updateSource && this.enableLogging) {
-                this.log('[%s] %s [%s%].', this.name, this.lang.curBright, nb)
+                this.log('[%s] %s [%s%].', this.name, this.lang.curBright, nb);
               }
             }
           }
-          break
+          break;
         case 44:
           // D1 eWeLink scale matches HomeKit scale of 0-100
-          if (this.funcs.hasProperty(params, 'brightness')) {
-            const nb = params.brightness
+          if (hasProperty(params, 'brightness')) {
+            const nb = params.brightness;
             if (nb !== this.cacheBright) {
-              this.service.updateCharacteristic(this.hapChar.Brightness, nb)
-              this.cacheBright = nb
+              this.service.updateCharacteristic(this.hapChar.Brightness, nb);
+              this.cacheBright = nb;
               if (params.updateSource && this.enableLogging) {
-                this.log('[%s] %s [%s%].', this.name, this.lang.curBright, nb)
+                this.log('[%s] %s [%s%].', this.name, this.lang.curBright, nb);
               }
             }
           }
-          break
+          break;
         case 57:
           // Device eWeLink scale is 25-255 and HomeKit scale is 0-100.
-          if (this.funcs.hasProperty(params, 'channel0')) {
-            const nb = Math.round(((parseInt(params.channel0) - 25) * 10) / 23)
+          if (hasProperty(params, 'channel0')) {
+            const nb = Math.round(((parseInt(params.channel0, 10) - 25) * 10) / 23);
             if (nb !== this.cacheBright) {
-              this.service.updateCharacteristic(this.hapChar.Brightness, nb)
-              this.cacheBright = nb
+              this.service.updateCharacteristic(this.hapChar.Brightness, nb);
+              this.cacheBright = nb;
               if (params.updateSource && this.enableLogging) {
-                this.log('[%s] %s [%s%].', this.name, this.lang.curBright, nb)
+                this.log('[%s] %s [%s%].', this.name, this.lang.curBright, nb);
               }
             }
           }
-          break
+          break;
+        default:
+          return;
       }
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, false)
+      this.platform.deviceUpdateError(this.accessory, err, false);
     }
   }
 
-  markStatus (isOnline) {
-    this.isOnline = isOnline
+  markStatus(isOnline) {
+    this.isOnline = isOnline;
 
     // Show as off if offline if configured by user
     if (this.offlineAsOff && !isOnline && this.cacheState !== 'off') {
-      this.service.updateCharacteristic(this.hapChar.On, false)
-      this.cacheState = 'off'
+      this.service.updateCharacteristic(this.hapChar.On, false);
+      this.cacheState = 'off';
       if (this.enableLogging) {
-        this.log('[%s] %s [%s - offline]', this.name, this.lang.curState, this.cacheState)
+        this.log('[%s] %s [%s - offline]', this.name, this.lang.curState, this.cacheState);
       }
     }
   }
 
-  currentState () {
-    const toReturn = {}
-    toReturn.services = ['light']
+  currentState() {
+    const toReturn = {};
+    toReturn.services = ['light'];
     toReturn.light = {
       state: this.service.getCharacteristic(this.hapChar.On).value ? 'on' : 'off',
-      brightness: this.service.getCharacteristic(this.hapChar.Brightness).value
-    }
-    return toReturn
+      brightness: this.service.getCharacteristic(this.hapChar.Brightness).value,
+    };
+    return toReturn;
   }
 }
diff --git a/lib/device/light-rgb-cct.js b/lib/device/light-rgb-cct.js
index a8960679..c6705424 100644
--- a/lib/device/light-rgb-cct.js
+++ b/lib/device/light-rgb-cct.js
@@ -1,117 +1,115 @@
-/* jshint node: true, esversion: 10, -W014, -W033 */
-/* eslint-disable new-cap */
-'use strict'
+import {
+  hs2rgb,
+  k2rgb,
+  m2hs,
+  rgb2hs,
+} from '../utils/colour.js';
+import platformConsts from '../utils/constants.js';
+import { generateRandomString, hasProperty, sleep } from '../utils/functions.js';
 
-module.exports = class deviceLightRGBCCT {
-  constructor (platform, accessory) {
+export default class {
+  constructor(platform, accessory) {
     // Set up variables from the platform
-    this.colourUtils = platform.colourUtils
-    this.cusChar = platform.cusChar
-    this.funcs = platform.funcs
-    this.hapChar = platform.api.hap.Characteristic
-    this.hapErr = platform.api.hap.HapStatusError
-    this.hapServ = platform.api.hap.Service
-    this.lang = platform.lang
-    this.log = platform.log
-    this.platform = platform
+    this.cusChar = platform.cusChar;
+    this.hapChar = platform.api.hap.Characteristic;
+    this.hapErr = platform.api.hap.HapStatusError;
+    this.hapServ = platform.api.hap.Service;
+    this.lang = platform.lang;
+    this.log = platform.log;
+    this.platform = platform;
 
     // Set up variables from the accessory
-    this.name = accessory.displayName
-    this.accessory = accessory
+    this.name = accessory.displayName;
+    this.accessory = accessory;
 
     // Initially set the online flag as true (to be then updated as false if necessary)
-    this.isOnline = true
+    this.isOnline = true;
 
     // Set up custom variables for this device type
-    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
-    this.alShift =
-      deviceConf && deviceConf.adaptiveLightingShift
-        ? deviceConf.adaptiveLightingShift
-        : platform.consts.defaultValues.adaptiveLightingShift
-    this.brightStep =
-      deviceConf && deviceConf.brightnessStep
-        ? Math.min(deviceConf.brightnessStep, 100)
-        : platform.consts.defaultValues.brightnessStep
-    this.offlineAsOff = deviceConf && deviceConf.offlineAsOff
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId] || {};
+    this.alShift = deviceConf.adaptiveLightingShift || platformConsts.defaultValues.adaptiveLightingShift;
+    this.brightStep = deviceConf.brightnessStep
+      ? Math.min(deviceConf.brightnessStep, 100)
+      : platformConsts.defaultValues.brightnessStep;
+    this.offlineAsOff = deviceConf.offlineAsOff;
 
     // Set the correct logging variables for this accessory
-    this.enableLogging = !platform.config.disableDeviceLogging
-    this.enableDebugLogging = platform.config.debug
-    if (deviceConf && deviceConf.overrideLogging) {
-      switch (deviceConf.overrideLogging) {
-        case 'standard':
-          this.enableLogging = true
-          this.enableDebugLogging = false
-          break
-        case 'debug':
-          this.enableLogging = true
-          this.enableDebugLogging = true
-          break
-        case 'disable':
-          this.enableLogging = false
-          this.enableDebugLogging = false
-          break
-      }
+    switch (deviceConf.overrideLogging) {
+      case 'standard':
+        this.enableLogging = true;
+        this.enableDebugLogging = false;
+        break;
+      case 'debug':
+        this.enableLogging = true;
+        this.enableDebugLogging = true;
+        break;
+      case 'disable':
+        this.enableLogging = false;
+        this.enableDebugLogging = false;
+        break;
+      default:
+        this.enableLogging = !platform.config.disableDeviceLogging;
+        this.enableDebugLogging = platform.config.debug;
+        break;
     }
 
     // If the accessory has a outlet service then remove it (remedies bug int in v5)
     if (this.accessory.getService(this.hapServ.Switch)) {
-      this.accessory.removeService(this.accessory.getService(this.hapServ.Switch))
+      this.accessory.removeService(this.accessory.getService(this.hapServ.Switch));
     }
 
     // Add the lightbulb service if it doesn't already exist
-    this.service =
-      this.accessory.getService(this.hapServ.Lightbulb) ||
-      this.accessory.addService(this.hapServ.Lightbulb)
+    this.service = this.accessory.getService(this.hapServ.Lightbulb)
+      || this.accessory.addService(this.hapServ.Lightbulb);
 
     // If adaptive lighting has just been disabled then remove and re-add service to hide AL icon
     if (this.alShift === -1 && this.accessory.context.adaptiveLighting) {
-      this.accessory.removeService(this.service)
-      this.service = this.accessory.addService(this.hapServ.Lightbulb)
-      this.accessory.context.adaptiveLighting = false
+      this.accessory.removeService(this.service);
+      this.service = this.accessory.addService(this.hapServ.Lightbulb);
+      this.accessory.context.adaptiveLighting = false;
     }
 
     // Add the set handler to the lightbulb on/off characteristic
     this.service
       .getCharacteristic(this.hapChar.On)
-      .onSet(async value => await this.internalStateUpdate(value))
+      .onSet(async (value) => this.internalStateUpdate(value));
 
     // Add the set handler to the lightbulb brightness characteristic
     this.service
       .getCharacteristic(this.hapChar.Brightness)
       .setProps({ minStep: this.brightStep })
-      .onSet(async value => await this.internalBrightnessUpdate(value))
+      .onSet(async (value) => this.internalBrightnessUpdate(value));
 
     // Add the set handler to the lightbulb hue characteristic
     this.service
       .getCharacteristic(this.hapChar.Hue)
-      .onSet(async value => await this.internalColourUpdate(value))
-    this.cacheSat = this.service.getCharacteristic(this.hapChar.Saturation).value
+      .onSet(async (value) => this.internalColourUpdate(value));
+    this.cacheSat = this.service.getCharacteristic(this.hapChar.Saturation).value;
 
     // Add the set handler to the lightbulb colour temperature characteristic
     this.service
       .getCharacteristic(this.hapChar.ColorTemperature)
-      .onSet(async value => await this.internalCTUpdate(value))
+      .onSet(async (value) => this.internalCTUpdate(value));
 
     // This is needed as sometimes we need to send the brightness with a cct update
-    this.cacheBright = this.service.getCharacteristic(this.hapChar.Brightness).value
+    this.cacheBright = this.service.getCharacteristic(this.hapChar.Brightness).value;
 
     // If the device is the L2 then add the FestiveScene custom characteristic
     if (this.accessory.context.eweUIID === 137) {
       if (!this.service.testCharacteristic(this.cusChar.FestiveScene)) {
-        this.service.addCharacteristic(this.cusChar.FestiveScene)
+        this.service.addCharacteristic(this.cusChar.FestiveScene);
       }
-      this.service.getCharacteristic(this.cusChar.FestiveScene).onSet(async value => {
-        await this.internalSceneUpdate(16, value)
-      })
+      this.service.getCharacteristic(this.cusChar.FestiveScene).onSet(async (value) => {
+        this.internalSceneUpdate(16, value);
+      });
     }
 
     // Set up the adaptive lighting controller if not disabled by user
     if (this.alShift !== -1) {
       this.accessory.alController = new platform.api.hap.AdaptiveLightingController(this.service, {
-        customTemperatureAdjustment: this.alShift
-      })
-      this.accessory.configureController(this.accessory.alController)
+        customTemperatureAdjustment: this.alShift,
+      });
+      this.accessory.configureController(this.accessory.alController);
     }
 
     /*
@@ -153,127 +151,128 @@ module.exports = class deviceLightRGBCCT {
     if (!platform.config.disableNoResponse) {
       this.service.getCharacteristic(this.hapChar.On).onGet(() => {
         if (!this.isOnline) {
-          throw new this.hapErr(-70402)
+          throw new this.hapErr(-70402);
         }
-        return this.service.getCharacteristic(this.hapChar.On).value
-      })
+        return this.service.getCharacteristic(this.hapChar.On).value;
+      });
       this.service.getCharacteristic(this.hapChar.Brightness).onGet(() => {
         if (!this.isOnline) {
-          throw new this.hapErr(-70402)
+          throw new this.hapErr(-70402);
         }
-        return this.service.getCharacteristic(this.hapChar.Brightness).value
-      })
+        return this.service.getCharacteristic(this.hapChar.Brightness).value;
+      });
       this.service.getCharacteristic(this.hapChar.Hue).onGet(() => {
         if (!this.isOnline) {
-          throw new this.hapErr(-70402)
+          throw new this.hapErr(-70402);
         }
-        return this.service.getCharacteristic(this.hapChar.Hue).value
-      })
+        return this.service.getCharacteristic(this.hapChar.Hue).value;
+      });
       this.service.getCharacteristic(this.hapChar.ColorTemperature).onGet(() => {
         if (!this.isOnline) {
-          throw new this.hapErr(-70402)
+          throw new this.hapErr(-70402);
         }
-        return this.service.getCharacteristic(this.hapChar.ColorTemperature).value
-      })
+        return this.service.getCharacteristic(this.hapChar.ColorTemperature).value;
+      });
     }
 
     // Output the customised options to the log
+    const normalLogging = this.enableLogging ? 'standard' : 'disable';
     const opts = JSON.stringify({
       adaptiveLightingShift: this.alShift,
       brightnessStep: this.brightStep,
-      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
-      offlineAsOff: !!this.offlineAsOff
-    })
-    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
+      logging: this.enableDebugLogging ? 'debug' : normalLogging,
+      offlineAsOff: !!this.offlineAsOff,
+    });
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts);
   }
 
-  async internalStateUpdate (value) {
+  async internalStateUpdate(value) {
     try {
-      const newValue = value ? 'on' : 'off'
+      const newValue = value ? 'on' : 'off';
       if (this.cacheState === newValue) {
-        return
+        return;
       }
-      const timerKey = this.funcs.generateRandomString(5)
-      this.updateTimeout = timerKey
+      const timerKey = generateRandomString(5);
+      this.updateTimeout = timerKey;
       setTimeout(() => {
         if (this.updateTimeout === timerKey) {
-          this.updateTimeout = false
+          this.updateTimeout = false;
         }
-      }, 5000)
-      const params = { switch: newValue }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.cacheState = newValue
+      }, 5000);
+      const params = { switch: newValue };
+      await this.platform.sendDeviceUpdate(this.accessory, params);
+      this.cacheState = newValue;
       if (this.enableLogging) {
-        this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
+        this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState);
       }
       if (this.accessory.context.eweUIID === 137 && this.cacheState === 'off') {
-        this.service.updateCharacteristic(this.cusChar.FestiveScene, false)
+        this.service.updateCharacteristic(this.cusChar.FestiveScene, false);
       }
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true);
       setTimeout(() => {
-        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
-      }, 2000)
-      throw new this.hapErr(-70402)
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on');
+      }, 2000);
+      throw new this.hapErr(-70402);
     }
   }
 
-  async internalBrightnessUpdate (value) {
+  async internalBrightnessUpdate(value) {
     try {
       if (this.cacheBright === value) {
-        return
+        return;
       }
-      const updateKey = this.funcs.generateRandomString(5)
-      this.updateKeyBright = updateKey
-      await this.funcs.sleep(500)
+      const updateKey = generateRandomString(5);
+      this.updateKeyBright = updateKey;
+      await sleep(500);
       if (updateKey !== this.updateKeyBright) {
-        return
+        return;
       }
-      let params
-      this.updateTimeout = updateKey
+      let params;
+      this.updateTimeout = updateKey;
       setTimeout(() => {
         if (this.updateTimeout === updateKey) {
-          this.updateTimeout = false
+          this.updateTimeout = false;
         }
-      }, 5000)
+      }, 5000);
       switch (this.accessory.context.eweUIID) {
         case 33:
         case 59:
           // L1
           params = {
             mode: 1,
-            bright: value
-          }
-          break
+            bright: value,
+          };
+          break;
         case 104:
           // B02-B-A60, B05-B-A60, GTLC104
           if (this.cacheMode === 'white') {
             params = {
               white: {
                 br: value,
-                ct: this.cacheCT
-              }
-            }
+                ct: this.cacheCT,
+              },
+            };
           } else {
             params = {
               color: {
                 br: value,
                 r: this.cacheR,
                 g: this.cacheG,
-                b: this.cacheB
-              }
-            }
+                b: this.cacheB,
+              },
+            };
           }
-          break
+          break;
         case 136:
           if (this.cacheMode === 'white') {
             params = {
               ltype: 'white',
               white: {
                 br: value,
-                ct: this.cacheCT
-              }
-            }
+                ct: this.cacheCT,
+              },
+            };
           } else {
             params = {
               ltype: 'color',
@@ -281,52 +280,54 @@ module.exports = class deviceLightRGBCCT {
                 br: value,
                 r: this.cacheR,
                 g: this.cacheG,
-                b: this.cacheB
-              }
-            }
+                b: this.cacheB,
+              },
+            };
           }
-          break
+          break;
         case 137:
           params = {
-            bright: value
-          }
-          break
+            bright: value,
+          };
+          break;
+        default:
+          return;
       }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.cacheBright = value
+      await this.platform.sendDeviceUpdate(this.accessory, params);
+      this.cacheBright = value;
       if (this.enableLogging) {
-        this.log('[%s] %s [%s%].', this.name, this.lang.curBright, this.cacheBright)
+        this.log('[%s] %s [%s%].', this.name, this.lang.curBright, this.cacheBright);
       }
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true);
       setTimeout(() => {
-        this.service.updateCharacteristic(this.hapChar.Brightness, this.cacheBright)
-      }, 2000)
-      throw new this.hapErr(-70402)
+        this.service.updateCharacteristic(this.hapChar.Brightness, this.cacheBright);
+      }, 2000);
+      throw new this.hapErr(-70402);
     }
   }
 
-  async internalColourUpdate (value) {
+  async internalColourUpdate(value) {
     try {
       if (this.cacheHue === value) {
-        return
+        return;
       }
-      const updateKey = this.funcs.generateRandomString(5)
-      this.updateKey = updateKey
-      await this.funcs.sleep(400)
+      const updateKey = generateRandomString(5);
+      this.updateKey = updateKey;
+      await sleep(400);
       if (updateKey !== this.updateKey) {
-        return
+        return;
       }
-      this.updateTimeout = updateKey
+      this.updateTimeout = updateKey;
       setTimeout(() => {
         if (this.updateTimeout === updateKey) {
-          this.updateTimeout = false
+          this.updateTimeout = false;
         }
-      }, 5000)
-      this.service.updateCharacteristic(this.hapChar.ColorTemperature, 140)
-      let params
-      const sat = this.service.getCharacteristic(this.hapChar.Saturation).value
-      const rgb = this.colourUtils.hs2rgb(value, sat)
+      }, 5000);
+      this.service.updateCharacteristic(this.hapChar.ColorTemperature, 140);
+      let params;
+      const sat = this.service.getCharacteristic(this.hapChar.Saturation).value;
+      const rgb = hs2rgb(value, sat);
       switch (this.accessory.context.eweUIID) {
         case 33:
         case 59:
@@ -336,9 +337,9 @@ module.exports = class deviceLightRGBCCT {
             mode: 1,
             colorR: rgb[0],
             colorG: rgb[1],
-            colorB: rgb[2]
-          }
-          break
+            colorB: rgb[2],
+          };
+          break;
         case 104:
           // B02-B-A60, B05-B-A60, GTLC104
           params = {
@@ -347,10 +348,10 @@ module.exports = class deviceLightRGBCCT {
               br: this.cacheBright,
               r: rgb[0],
               g: rgb[1],
-              b: rgb[2]
-            }
-          }
-          break
+              b: rgb[2],
+            },
+          };
+          break;
         case 136:
           params = {
             ltype: 'color',
@@ -358,290 +359,291 @@ module.exports = class deviceLightRGBCCT {
               br: this.cacheBright,
               r: rgb[0],
               g: rgb[1],
-              b: rgb[2]
-            }
-          }
-          break
+              b: rgb[2],
+            },
+          };
+          break;
+        default:
+          return;
       }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.cacheHue = value
-      this.cacheR = rgb[0]
-      this.cacheG = rgb[1]
-      this.cacheB = rgb[2]
-      this.cacheMired = 0
-      this.cacheCT = 0
+      await this.platform.sendDeviceUpdate(this.accessory, params);
+      this.cacheHue = value;
+      [this.cacheR, this.cacheG, this.cacheB] = rgb;
+      this.cacheMired = 0;
+      this.cacheCT = 0;
       if ([104, 136].includes(this.accessory.context.eweUIID)) {
-        this.cacheMode = 'color'
+        this.cacheMode = 'color';
       }
       if (this.enableLogging) {
         this.log(
           '[%s] %s [rgb %s].',
           this.name,
           this.lang.curColour,
-          this.cacheR + ' ' + this.cacheG + ' ' + this.cacheB
-        )
+          `${this.cacheR} ${this.cacheG} ${this.cacheB}`,
+        );
       }
       if (this.accessory.context.eweUIID === 137) {
-        this.service.updateCharacteristic(this.cusChar.FestiveScene, false)
+        this.service.updateCharacteristic(this.cusChar.FestiveScene, false);
       }
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true);
       setTimeout(() => {
-        this.service.updateCharacteristic(this.hapChar.Hue, this.cacheHue)
-      }, 2000)
-      throw new this.hapErr(-70402)
+        this.service.updateCharacteristic(this.hapChar.Hue, this.cacheHue);
+      }, 2000);
+      throw new this.hapErr(-70402);
     }
   }
 
-  async internalCTUpdate (value) {
+  async internalCTUpdate(value) {
     try {
       if (this.cacheMired === value) {
-        return
+        return;
       }
       if (
-        this.accessory.alController &&
-        this.accessory.alController.isAdaptiveLightingActive() &&
-        (this.cacheState !== 'on' || !this.isOnline)
+        this.accessory.alController
+        && this.accessory.alController.isAdaptiveLightingActive()
+        && (this.cacheState !== 'on' || !this.isOnline)
       ) {
-        return
+        return;
       }
-      const updateKey = this.funcs.generateRandomString(5)
-      this.updateKey = updateKey
-      await this.funcs.sleep(400)
+      const updateKey = generateRandomString(5);
+      this.updateKey = updateKey;
+      await sleep(400);
       if (updateKey !== this.updateKey) {
-        return
+        return;
       }
-      this.updateTimeout = updateKey
+      this.updateTimeout = updateKey;
       setTimeout(() => {
         if (this.updateTimeout === updateKey) {
-          this.updateTimeout = false
+          this.updateTimeout = false;
         }
-      }, 5000)
-      const hs = this.colourUtils.m2hs(value)
-      this.service.updateCharacteristic(this.hapChar.Hue, hs[0])
-      this.service.updateCharacteristic(this.hapChar.Saturation, hs[1])
-      const mToK = Math.max(Math.min(Math.round(1000000 / value), 6500), 2700)
-      let scaledCT
-      let params
-      let newRGB
+      }, 5000);
+      const hs = m2hs(value);
+      this.service.updateCharacteristic(this.hapChar.Hue, hs[0]);
+      this.service.updateCharacteristic(this.hapChar.Saturation, hs[1]);
+      const mToK = Math.max(Math.min(Math.round(1000000 / value), 6500), 2700);
+      let scaledCT;
+      let params;
+      let newRGB;
       switch (this.accessory.context.eweUIID) {
         case 33:
         case 59: {
           // L1
-          scaledCT = Math.round(((mToK - 2700) / 3800) * 100)
-          newRGB = this.colourUtils.k2rgb(mToK)
+          scaledCT = Math.round(((mToK - 2700) / 3800) * 100);
+          newRGB = k2rgb(mToK);
           params = {
             mode: 1,
             colorR: newRGB[0],
             colorG: newRGB[1],
-            colorB: newRGB[2]
-          }
-          break
+            colorB: newRGB[2],
+          };
+          break;
         }
         case 104:
           // B02-B-A60, B05-B-A60, GTLC104
-          scaledCT = Math.round(((mToK - 2700) / 3800) * 255)
+          scaledCT = Math.round(((mToK - 2700) / 3800) * 255);
           params = {
             ltype: this.cacheMode === 'white' ? undefined : 'white',
             white: {
               br: this.cacheBright,
-              ct: scaledCT
-            }
-          }
-          break
+              ct: scaledCT,
+            },
+          };
+          break;
         case 136:
-          scaledCT = Math.round(((mToK - 2700) / 3800) * 255)
+          scaledCT = Math.round(((mToK - 2700) / 3800) * 255);
           params = {
             ltype: 'white',
             white: {
               br: this.cacheBright,
-              ct: scaledCT
-            }
-          }
-          break
+              ct: scaledCT,
+            },
+          };
+          break;
         case 137: {
           // L2
-          scaledCT = 100 - Math.round(((mToK - 2700) / 3800) * 100)
-          newRGB = this.colourUtils.k2rgb(mToK)
+          scaledCT = 100 - Math.round(((mToK - 2700) / 3800) * 100);
+          newRGB = k2rgb(mToK);
           params = {
             mode: 2,
-            colorTemp: scaledCT
-          }
-          break
+            colorTemp: scaledCT,
+          };
+          break;
         }
+        default:
+          return;
       }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.cacheMired = value
-      this.cacheHue = hs[0]
-      this.cacheCT = scaledCT
-      this.cacheHue = 0
+      await this.platform.sendDeviceUpdate(this.accessory, params);
+      this.cacheMired = value;
+      [this.cacheHue] = hs;
+      this.cacheCT = scaledCT;
+      this.cacheHue = 0;
       switch (this.accessory.context.eweUIID) {
         case 33:
         case 59:
         case 137: {
           // L1
-          this.cacheR = newRGB[0]
-          this.cacheG = newRGB[1]
-          this.cacheB = newRGB[2]
-          break
+          [this.cacheR, this.cacheG, this.cacheB] = newRGB;
+          break;
         }
         case 104:
         case 136:
-          this.cacheMode = 'white'
-          break
+          this.cacheMode = 'white';
+          break;
+        default:
+          return;
       }
       if (this.enableLogging) {
         if (this.accessory.alController && this.accessory.alController.isAdaptiveLightingActive()) {
-          this.log('[%s] %s [%sK] %s.', this.name, this.lang.curColour, mToK, this.lang.viaAL)
+          this.log('[%s] %s [%sK] %s.', this.name, this.lang.curColour, mToK, this.lang.viaAL);
         } else {
-          this.log('[%s] %s [%sK].', this.name, this.lang.curColour, mToK)
+          this.log('[%s] %s [%sK].', this.name, this.lang.curColour, mToK);
         }
       }
       if (this.accessory.context.eweUIID === 137) {
-        this.service.updateCharacteristic(this.cusChar.FestiveScene, false)
+        this.service.updateCharacteristic(this.cusChar.FestiveScene, false);
       }
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true);
       setTimeout(() => {
-        this.service.updateCharacteristic(this.hapChar.ColorTemperature, this.cacheMired)
-      }, 2000)
-      throw new this.hapErr(-70402)
+        this.service.updateCharacteristic(this.hapChar.ColorTemperature, this.cacheMired);
+      }, 2000);
+      throw new this.hapErr(-70402);
     }
   }
 
-  async internalSceneUpdate (scene, value) {
+  async internalSceneUpdate(scene, value) {
     try {
       if (!value) {
-        return
+        return;
       }
-      const timerKey = this.funcs.generateRandomString(5)
-      this.updateTimeout = timerKey
+      const timerKey = generateRandomString(5);
+      this.updateTimeout = timerKey;
       setTimeout(() => {
         if (this.updateTimeout === timerKey) {
-          this.updateTimeout = false
+          this.updateTimeout = false;
         }
-      }, 5000)
-      const params = { mode: scene }
+      }, 5000);
+      const params = { mode: scene };
       if (this.cacheState === 'off') {
-        params.switch = 'on'
-        this.cacheState = 'on'
+        params.switch = 'on';
+        this.cacheState = 'on';
       }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.service.updateCharacteristic(this.hapChar.On, true)
-      this.accessory.alController.disableAdaptiveLighting()
+      await this.platform.sendDeviceUpdate(this.accessory, params);
+      this.service.updateCharacteristic(this.hapChar.On, true);
+      this.accessory.alController.disableAdaptiveLighting();
       if (this.enableLogging) {
-        this.log('[%s] %s [%s].', this.name, this.lang.curScene, 'festive')
+        this.log('[%s] %s [%s].', this.name, this.lang.curScene, 'festive');
       }
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true);
       setTimeout(() => {
-        this.service.updateCharacteristic(this.cusChar.FestiveScene, false)
-      }, 2000)
-      throw new this.hapErr(-70402)
+        this.service.updateCharacteristic(this.cusChar.FestiveScene, false);
+      }, 2000);
+      throw new this.hapErr(-70402);
     }
   }
 
-  async externalUpdate (params) {
+  async externalUpdate(params) {
     try {
       if (this.updateTimeout) {
-        return
+        return;
       }
       if (params.switch && params.switch !== this.cacheState) {
-        this.cacheState = params.switch
-        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
+        this.cacheState = params.switch;
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on');
         if (params.updateSource && this.enableLogging) {
-          this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
+          this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState);
         }
         if (this.accessory.context.eweUIID === 137 && this.cacheState === 'off') {
-          this.service.updateCharacteristic(this.cusChar.FestiveScene, false)
+          this.service.updateCharacteristic(this.cusChar.FestiveScene, false);
         }
       }
-      let hs
+      let hs;
       switch (this.accessory.context.eweUIID) {
         case 33:
         case 59:
         case 137:
           // L1/L2
-          if (this.funcs.hasProperty(params, 'bright')) {
+          if (hasProperty(params, 'bright')) {
             if (params.bright !== this.cacheBright) {
-              this.cacheBright = params.bright
-              this.service.updateCharacteristic(this.hapChar.Brightness, this.cacheBright)
+              this.cacheBright = params.bright;
+              this.service.updateCharacteristic(this.hapChar.Brightness, this.cacheBright);
               if (params.updateSource && this.enableLogging) {
-                this.log('[%s] %s [%s%].', this.name, this.lang.curBright, this.cacheBright)
+                this.log('[%s] %s [%s%].', this.name, this.lang.curBright, this.cacheBright);
               }
             }
           }
-          if (this.funcs.hasProperty(params, 'colorR')) {
+          if (hasProperty(params, 'colorR')) {
             if (this.accessory.context.eweUIID === 137) {
-              this.service.updateCharacteristic(this.cusChar.FestiveScene, false)
+              this.service.updateCharacteristic(this.cusChar.FestiveScene, false);
             }
             if (
-              params.colorR !== this.cacheR ||
-              params.colorG !== this.cacheB ||
-              params.colorB !== this.cacheB
+              params.colorR !== this.cacheR
+              || params.colorG !== this.cacheB
+              || params.colorB !== this.cacheB
             ) {
-              const rgbDiff =
-                Math.abs(params.colorR - this.cacheR) +
-                Math.abs(params.colorG - this.cacheG) +
-                Math.abs(params.colorG - this.cacheB)
-              this.cacheR = params.colorR
-              this.cacheG = params.colorG
-              this.cacheB = params.colorB
-              hs = this.colourUtils.rgb2hs(this.cacheR, this.cacheG, this.cacheB)
-              this.cacheHue = hs[0]
-              this.cacheMired = 140
-              this.service.updateCharacteristic(this.hapChar.Hue, this.cacheHue)
-              this.service.updateCharacteristic(this.hapChar.Saturation, hs[1])
+              const rgbDiff = Math.abs(params.colorR - this.cacheR)
+                + Math.abs(params.colorG - this.cacheG)
+                + Math.abs(params.colorG - this.cacheB);
+              this.cacheR = params.colorR;
+              this.cacheG = params.colorG;
+              this.cacheB = params.colorB;
+              hs = rgb2hs(this.cacheR, this.cacheG, this.cacheB);
+              [this.cacheHue] = hs;
+              this.cacheMired = 140;
+              this.service.updateCharacteristic(this.hapChar.Hue, this.cacheHue);
+              this.service.updateCharacteristic(this.hapChar.Saturation, hs[1]);
               if (params.updateSource) {
                 if (this.enableLogging) {
                   this.log(
                     '[%s] %s [rgb %s].',
                     this.name,
                     this.lang.curColour,
-                    this.cacheR + ' ' + this.cacheG + ' ' + this.cacheB
-                  )
+                    `${this.cacheR} ${this.cacheG} ${this.cacheB}`,
+                  );
                 }
                 if (
-                  this.accessory.alController &&
-                  this.accessory.alController.isAdaptiveLightingActive() &&
-                  rgbDiff > 50
+                  this.accessory.alController
+                  && this.accessory.alController.isAdaptiveLightingActive()
+                  && rgbDiff > 50
                 ) {
-                  this.accessory.alController.disableAdaptiveLighting()
+                  this.accessory.alController.disableAdaptiveLighting();
                   if (this.enableLogging) {
-                    this.log('[%s] %s.', this.name, this.lang.disabledAL)
+                    this.log('[%s] %s.', this.name, this.lang.disabledAL);
                   }
                 }
               }
             }
           }
-          if (this.funcs.hasProperty(params, 'colorTemp')) {
+          if (hasProperty(params, 'colorTemp')) {
             if (this.accessory.context.eweUIID === 137) {
-              this.service.updateCharacteristic(this.cusChar.FestiveScene, false)
+              this.service.updateCharacteristic(this.cusChar.FestiveScene, false);
             }
             if (params.colorTemp !== this.cacheCTRaw && params.mode === 2) {
-              this.cacheCTRaw = params.colorTemp
-              const ctDiff = Math.abs(params.colorTemp - this.cacheCTRaw)
-              this.cacheCT = 100 - params.colorTemp
-              const ctToK = Math.round((this.cacheCT / 100) * 3800 + 2700)
-              this.cacheMired = Math.max(Math.min(Math.round(1000000 / ctToK), 500), 140)
-              hs = this.colourUtils.m2hs(this.cacheMired)
-              this.cacheHue = hs[0]
-              this.service.updateCharacteristic(this.hapChar.Hue, this.cacheHue)
-              this.service.updateCharacteristic(this.hapChar.Saturation, hs[1])
-              this.service.updateCharacteristic(this.hapChar.ColorTemperature, this.cacheMired)
+              this.cacheCTRaw = params.colorTemp;
+              const ctDiff = Math.abs(params.colorTemp - this.cacheCTRaw);
+              this.cacheCT = 100 - params.colorTemp;
+              const ctToK = Math.round((this.cacheCT / 100) * 3800 + 2700);
+              this.cacheMired = Math.max(Math.min(Math.round(1000000 / ctToK), 500), 140);
+              hs = m2hs(this.cacheMired);
+              [this.cacheHue] = hs;
+              this.service.updateCharacteristic(this.hapChar.Hue, this.cacheHue);
+              this.service.updateCharacteristic(this.hapChar.Saturation, hs[1]);
+              this.service.updateCharacteristic(this.hapChar.ColorTemperature, this.cacheMired);
               if (params.updateSource) {
                 if (this.enableLogging) {
-                  this.log('[%s] %s [%sK].', this.name, this.lang.curColour, ctToK)
+                  this.log('[%s] %s [%sK].', this.name, this.lang.curColour, ctToK);
                 }
                 if (
-                  this.accessory.alController &&
-                  this.accessory.alController.isAdaptiveLightingActive() &&
-                  ctDiff > 20
+                  this.accessory.alController
+                  && this.accessory.alController.isAdaptiveLightingActive()
+                  && ctDiff > 20
                 ) {
                   // Look for a variation greater than twenty
-                  this.accessory.alController.disableAdaptiveLighting()
+                  this.accessory.alController.disableAdaptiveLighting();
                   if (this.enableLogging) {
-                    this.log('[%s] %s.', this.name, this.lang.disabledAL)
+                    this.log('[%s] %s.', this.name, this.lang.disabledAL);
                   }
                 }
               }
@@ -649,126 +651,128 @@ module.exports = class deviceLightRGBCCT {
           }
           if (this.accessory.context.eweUIID === 137 && params.mode === 16) {
             // Festive scene enabled
-            this.accessory.alController.disableAdaptiveLighting()
-            this.service.updateCharacteristic(this.cusChar.FestiveScene, true)
+            this.accessory.alController.disableAdaptiveLighting();
+            this.service.updateCharacteristic(this.cusChar.FestiveScene, true);
             if (this.enableLogging) {
-              this.log('[%s] %s [%s].', this.name, this.lang.curScene, 'festive')
+              this.log('[%s] %s [%s].', this.name, this.lang.curScene, 'festive');
             }
           }
-          break
+          break;
         case 104:
         case 136:
           // B02-B-A60, B05-B-A60, GTLC104
           if (params.ltype === 'color' && params.color) {
-            if (this.funcs.hasProperty(params.color, 'br')) {
+            if (hasProperty(params.color, 'br')) {
               if (params.color.br !== this.cacheBright) {
-                this.cacheBright = params.color.br
-                this.service.updateCharacteristic(this.hapChar.Brightness, this.cacheBright)
+                this.cacheBright = params.color.br;
+                this.service.updateCharacteristic(this.hapChar.Brightness, this.cacheBright);
                 if (params.updateSource && this.enableLogging) {
-                  this.log('[%s] %s [%s%].', this.name, this.lang.curBright, this.cacheBright)
+                  this.log('[%s] %s [%s%].', this.name, this.lang.curBright, this.cacheBright);
                 }
               }
             }
-            if (this.funcs.hasProperty(params.color, 'r')) {
+            if (hasProperty(params.color, 'r')) {
               if (
-                params.color.r !== this.cacheR ||
-                params.color.g !== this.cacheG ||
-                params.color.b !== this.cacheB ||
-                this.cacheMode !== 'color'
+                params.color.r !== this.cacheR
+                || params.color.g !== this.cacheG
+                || params.color.b !== this.cacheB
+                || this.cacheMode !== 'color'
               ) {
-                this.cacheMode = 'color'
-                this.cacheR = params.color.r
-                this.cacheG = params.color.g
-                this.cacheB = params.color.b
-                this.cacheMired = 140
-                hs = this.colourUtils.rgb2hs(this.cacheR, this.cacheG, this.cacheB)
-                this.cacheHue = hs[0]
-                this.service.updateCharacteristic(this.hapChar.ColorTemperature, 140)
-                this.service.updateCharacteristic(this.hapChar.Hue, this.cacheHue)
-                this.service.updateCharacteristic(this.hapChar.Saturation, 100)
+                this.cacheMode = 'color';
+                this.cacheR = params.color.r;
+                this.cacheG = params.color.g;
+                this.cacheB = params.color.b;
+                this.cacheMired = 140;
+                hs = rgb2hs(this.cacheR, this.cacheG, this.cacheB);
+                [this.cacheHue] = hs;
+                this.service.updateCharacteristic(this.hapChar.ColorTemperature, 140);
+                this.service.updateCharacteristic(this.hapChar.Hue, this.cacheHue);
+                this.service.updateCharacteristic(this.hapChar.Saturation, 100);
                 if (params.updateSource && this.enableLogging) {
                   this.log(
                     '[%s] %s [rgb %s].',
                     this.name,
                     this.lang.curColour,
-                    this.cacheR + ' ' + this.cacheG + ' ' + this.cacheB
-                  )
+                    `${this.cacheR} ${this.cacheG} ${this.cacheB}`,
+                  );
                 }
               }
             }
             if (
-              params.updateSource &&
-              this.accessory.alController &&
-              this.accessory.alController.isAdaptiveLightingActive()
+              params.updateSource
+              && this.accessory.alController
+              && this.accessory.alController.isAdaptiveLightingActive()
             ) {
-              this.accessory.alController.disableAdaptiveLighting()
+              this.accessory.alController.disableAdaptiveLighting();
               if (this.enableLogging) {
-                this.log('[%s] %s.', this.name, this.lang.disabledAL)
+                this.log('[%s] %s.', this.name, this.lang.disabledAL);
               }
             }
           }
           if (params.ltype === 'white' && params.white) {
-            if (this.funcs.hasProperty(params.white, 'br')) {
+            if (hasProperty(params.white, 'br')) {
               if (params.white.br !== this.cacheBright || this.cacheMode !== 'white') {
-                this.cacheBright = params.white.br
-                this.service.updateCharacteristic(this.hapChar.Brightness, this.cacheBright)
+                this.cacheBright = params.white.br;
+                this.service.updateCharacteristic(this.hapChar.Brightness, this.cacheBright);
                 if (params.updateSource && this.enableLogging) {
-                  this.log('[%s] %s [%s%].', this.name, this.lang.curBright, this.cacheBright)
+                  this.log('[%s] %s [%s%].', this.name, this.lang.curBright, this.cacheBright);
                 }
               }
             }
-            if (this.funcs.hasProperty(params.white, 'ct') && params.white.ct !== this.cacheCT) {
-              this.cacheMode = 'white'
-              const ctDiff = Math.abs(params.white.ct - this.cacheCT)
-              this.cacheCT = params.white.ct
-              const ctToK = Math.round((this.cacheCT / 255) * 3800 + 2700)
-              this.cacheMired = Math.max(Math.min(Math.round(1000000 / ctToK), 500), 140)
-              hs = this.colourUtils.m2hs(this.cacheMired)
-              this.cacheHue = hs[0]
-              this.service.updateCharacteristic(this.hapChar.Hue, this.cacheHue)
-              this.service.updateCharacteristic(this.hapChar.Saturation, hs[1])
-              this.service.updateCharacteristic(this.hapChar.ColorTemperature, this.cacheMired)
+            if (hasProperty(params.white, 'ct') && params.white.ct !== this.cacheCT) {
+              this.cacheMode = 'white';
+              const ctDiff = Math.abs(params.white.ct - this.cacheCT);
+              this.cacheCT = params.white.ct;
+              const ctToK = Math.round((this.cacheCT / 255) * 3800 + 2700);
+              this.cacheMired = Math.max(Math.min(Math.round(1000000 / ctToK), 500), 140);
+              hs = m2hs(this.cacheMired);
+              [this.cacheHue] = hs;
+              this.service.updateCharacteristic(this.hapChar.Hue, this.cacheHue);
+              this.service.updateCharacteristic(this.hapChar.Saturation, hs[1]);
+              this.service.updateCharacteristic(this.hapChar.ColorTemperature, this.cacheMired);
               if (params.updateSource) {
                 if (this.enableLogging) {
-                  this.log('[%s] %s [%sK].', this.name, this.lang.curColour, ctToK)
+                  this.log('[%s] %s [%sK].', this.name, this.lang.curColour, ctToK);
                 }
                 if (
-                  this.accessory.alController &&
-                  this.accessory.alController.isAdaptiveLightingActive() &&
-                  ctDiff > 20
+                  this.accessory.alController
+                  && this.accessory.alController.isAdaptiveLightingActive()
+                  && ctDiff > 20
                 ) {
                   // Look for a variation greater than twenty
-                  this.accessory.alController.disableAdaptiveLighting()
+                  this.accessory.alController.disableAdaptiveLighting();
                   if (this.enableLogging) {
-                    this.log('[%s] %s.', this.name, this.lang.disabledAL)
+                    this.log('[%s] %s.', this.name, this.lang.disabledAL);
                   }
                 }
               }
             }
           }
-          break
+          break;
+        default:
+          return;
       }
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, false)
+      this.platform.deviceUpdateError(this.accessory, err, false);
     }
   }
 
-  markStatus (isOnline) {
-    this.isOnline = isOnline
+  markStatus(isOnline) {
+    this.isOnline = isOnline;
 
     // Show as off if offline if configured by user
     if (this.offlineAsOff && !isOnline && this.cacheState !== 'off') {
-      this.service.updateCharacteristic(this.hapChar.On, false)
-      this.cacheState = 'off'
+      this.service.updateCharacteristic(this.hapChar.On, false);
+      this.cacheState = 'off';
       if (this.enableLogging) {
-        this.log('[%s] %s [%s - offline]', this.name, this.lang.curState, this.cacheState)
+        this.log('[%s] %s [%s - offline]', this.name, this.lang.curState, this.cacheState);
       }
     }
   }
 
-  currentState () {
-    const toReturn = {}
-    toReturn.services = ['light']
+  currentState() {
+    const toReturn = {};
+    toReturn.services = ['light'];
     toReturn.light = {
       state: this.service.getCharacteristic(this.hapChar.On).value ? 'on' : 'off',
       brightness: this.service.getCharacteristic(this.hapChar.Brightness).value,
@@ -779,8 +783,8 @@ module.exports = class deviceLightRGBCCT {
       adaptivelighting:
         this.accessory.alController && this.accessory.alController.isAdaptiveLightingActive()
           ? 'on'
-          : 'off'
-    }
-    return toReturn
+          : 'off',
+    };
+    return toReturn;
   }
 }
diff --git a/lib/device/light-rgb.js b/lib/device/light-rgb.js
index c36fee6d..d499e5d5 100644
--- a/lib/device/light-rgb.js
+++ b/lib/device/light-rgb.js
@@ -1,174 +1,163 @@
-/* jshint node: true, esversion: 10, -W014, -W033 */
-/* eslint-disable new-cap */
-'use strict'
+import { hs2rgb, rgb2hs } from '../utils/colour.js';
+import { generateRandomString, hasProperty, sleep } from '../utils/functions.js';
 
-module.exports = class deviceLightRGB {
-  constructor (platform, accessory) {
+export default class {
+  constructor(platform, accessory) {
     // Set up variables from the platform
-    this.colourUtils = platform.colourUtils
-    this.funcs = platform.funcs
-    this.hapChar = platform.api.hap.Characteristic
-    this.hapErr = platform.api.hap.HapStatusError
-    this.hapServ = platform.api.hap.Service
-    this.lang = platform.lang
-    this.log = platform.log
-    this.platform = platform
+    this.hapChar = platform.api.hap.Characteristic;
+    this.hapErr = platform.api.hap.HapStatusError;
+    this.hapServ = platform.api.hap.Service;
+    this.lang = platform.lang;
+    this.log = platform.log;
+    this.platform = platform;
 
     // Set up variables from the accessory
-    this.name = accessory.displayName
-    this.accessory = accessory
+    this.name = accessory.displayName;
+    this.accessory = accessory;
 
     // Initially set the online flag as true (to be then updated as false if necessary)
-    this.isOnline = true
+    this.isOnline = true;
 
     // Set up custom variables for this device type
-    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
-    this.alShift =
-      deviceConf && deviceConf.adaptiveLightingShift
-        ? deviceConf.adaptiveLightingShift
-        : platform.consts.defaultValues.adaptiveLightingShift
-    this.brightStep =
-      deviceConf && deviceConf.brightnessStep
-        ? Math.min(deviceConf.brightnessStep, 100)
-        : platform.consts.defaultValues.brightnessStep
-    this.offlineAsOff = deviceConf && deviceConf.offlineAsOff
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId] || {};
+    this.offlineAsOff = deviceConf.offlineAsOff;
 
     // Set the correct logging variables for this accessory
-    this.enableLogging = !platform.config.disableDeviceLogging
-    this.enableDebugLogging = platform.config.debug
-    if (deviceConf && deviceConf.overrideLogging) {
-      switch (deviceConf.overrideLogging) {
-        case 'standard':
-          this.enableLogging = true
-          this.enableDebugLogging = false
-          break
-        case 'debug':
-          this.enableLogging = true
-          this.enableDebugLogging = true
-          break
-        case 'disable':
-          this.enableLogging = false
-          this.enableDebugLogging = false
-          break
-      }
+    switch (deviceConf.overrideLogging) {
+      case 'standard':
+        this.enableLogging = true;
+        this.enableDebugLogging = false;
+        break;
+      case 'debug':
+        this.enableLogging = true;
+        this.enableDebugLogging = true;
+        break;
+      case 'disable':
+        this.enableLogging = false;
+        this.enableDebugLogging = false;
+        break;
+      default:
+        this.enableLogging = !platform.config.disableDeviceLogging;
+        this.enableDebugLogging = platform.config.debug;
+        break;
     }
 
     // Add the lightbulb service if it doesn't already exist
-    this.service =
-      this.accessory.getService(this.hapServ.Lightbulb) ||
-      this.accessory.addService(this.hapServ.Lightbulb)
+    this.service = this.accessory.getService(this.hapServ.Lightbulb)
+      || this.accessory.addService(this.hapServ.Lightbulb);
 
     // Add the set handler to the lightbulb on/off characteristic
     this.service
       .getCharacteristic(this.hapChar.On)
-      .onSet(async value => await this.internalStateUpdate(value))
+      .onSet(async (value) => this.internalStateUpdate(value));
 
     // Add the set handler to the lightbulb brightness characteristic
     this.service
       .getCharacteristic(this.hapChar.Brightness)
       .setProps({ minStep: 100 })
-      .onSet(async value => await this.internalBrightnessUpdate(value))
+      .onSet(async (value) => this.internalBrightnessUpdate(value));
 
     // Add the set handler to the lightbulb hue characteristic
     this.service
       .getCharacteristic(this.hapChar.Hue)
-      .onSet(async value => await this.internalColourUpdate(value))
-    this.cacheSat = this.service.getCharacteristic(this.hapChar.Saturation).value
+      .onSet(async (value) => this.internalColourUpdate(value));
+    this.cacheSat = this.service.getCharacteristic(this.hapChar.Saturation).value;
 
     // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
     if (!platform.config.disableNoResponse) {
       this.service.getCharacteristic(this.hapChar.On).onGet(() => {
         if (!this.isOnline) {
-          throw new this.hapErr(-70402)
+          throw new this.hapErr(-70402);
         }
-        return this.service.getCharacteristic(this.hapChar.On).value
-      })
+        return this.service.getCharacteristic(this.hapChar.On).value;
+      });
       this.service
         .getCharacteristic(this.hapChar.Brightness)
         .setProps({ minStep: 100 })
         .onGet(() => {
           if (!this.isOnline) {
-            throw new this.hapErr(-70402)
+            throw new this.hapErr(-70402);
           }
-          return this.service.getCharacteristic(this.hapChar.Brightness).value
-        })
+          return this.service.getCharacteristic(this.hapChar.Brightness).value;
+        });
       this.service.getCharacteristic(this.hapChar.Hue).onGet(() => {
         if (!this.isOnline) {
-          throw new this.hapErr(-70402)
+          throw new this.hapErr(-70402);
         }
-        return this.service.getCharacteristic(this.hapChar.Hue).value
-      })
+        return this.service.getCharacteristic(this.hapChar.Hue).value;
+      });
     }
 
     // Output the customised options to the log
+    const normalLogging = this.enableLogging ? 'standard' : 'disable';
     const opts = JSON.stringify({
-      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
-      offlineAsOff: !!this.offlineAsOff
-    })
-    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
+      logging: this.enableDebugLogging ? 'debug' : normalLogging,
+      offlineAsOff: !!this.offlineAsOff,
+    });
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts);
   }
 
-  async internalStateUpdate (value) {
+  async internalStateUpdate(value) {
     try {
-      const params = {}
-      const newValue = value ? 'on' : 'off'
+      const params = {};
+      const newValue = value ? 'on' : 'off';
       if (this.cacheState === newValue) {
-        return
+        return;
       }
-      params.state = newValue
-      const timerKey = this.funcs.generateRandomString(5)
-      this.updateTimeout = timerKey
+      params.state = newValue;
+      const timerKey = generateRandomString(5);
+      this.updateTimeout = timerKey;
       setTimeout(() => {
         if (this.updateTimeout === timerKey) {
-          this.updateTimeout = false
+          this.updateTimeout = false;
         }
-      }, 5000)
-      await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.cacheState = newValue
+      }, 5000);
+      await this.platform.sendDeviceUpdate(this.accessory, params);
+      this.cacheState = newValue;
       if (this.enableLogging) {
-        this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
+        this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState);
       }
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true);
       setTimeout(() => {
-        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
-      }, 2000)
-      throw new this.hapErr(-70402)
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on');
+      }, 2000);
+      throw new this.hapErr(-70402);
     }
   }
 
-  async internalBrightnessUpdate (value) {
+  async internalBrightnessUpdate(value) {
     try {
       // B1 doesn't support brightness
-      this.cacheBright = value
+      this.cacheBright = value;
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true);
       setTimeout(() => {
-        this.service.updateCharacteristic(this.hapChar.Brightness, this.cacheBright)
-      }, 2000)
-      throw new this.hapErr(-70402)
+        this.service.updateCharacteristic(this.hapChar.Brightness, this.cacheBright);
+      }, 2000);
+      throw new this.hapErr(-70402);
     }
   }
 
-  async internalColourUpdate (value) {
+  async internalColourUpdate(value) {
     try {
       if (this.cacheHue === value) {
-        return
+        return;
       }
-      const updateKeyColour = this.funcs.generateRandomString(5)
-      this.updateKeyColour = updateKeyColour
-      await this.funcs.sleep(400)
+      const updateKeyColour = generateRandomString(5);
+      this.updateKeyColour = updateKeyColour;
+      await sleep(400);
       if (updateKeyColour !== this.updateKeyColour) {
-        return
+        return;
       }
-      this.updateTimeout = updateKeyColour
+      this.updateTimeout = updateKeyColour;
       setTimeout(() => {
         if (this.updateTimeout === updateKeyColour) {
-          this.updateTimeout = false
+          this.updateTimeout = false;
         }
-      }, 5000)
-      const saturation = this.service.getCharacteristic(this.hapChar.Saturation).value
-      const newRGB = this.colourUtils.hs2rgb(value, saturation)
+      }, 5000);
+      const saturation = this.service.getCharacteristic(this.hapChar.Saturation).value;
+      const newRGB = hs2rgb(value, saturation);
       const params = {
         zyx_mode: 2,
         type: 'middle',
@@ -176,111 +165,109 @@ module.exports = class deviceLightRGB {
         channel1: '0',
         channel2: newRGB[0].toString(),
         channel3: newRGB[1].toString(),
-        channel4: newRGB[2].toString()
-      }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.cacheHue = value
-      this.cacheR = newRGB[0]
-      this.cacheG = newRGB[1]
-      this.cacheB = newRGB[2]
+        channel4: newRGB[2].toString(),
+      };
+      await this.platform.sendDeviceUpdate(this.accessory, params);
+      this.cacheHue = value;
+      [this.cacheR, this.cacheG, this.cacheB] = newRGB;
       if (this.enableLogging) {
         this.log(
           '[%s] %s [rgb %s].',
           this.name,
           this.lang.curColour,
-          this.cacheR + ' ' + this.cacheG + ' ' + this.cacheB
-        )
+          `${this.cacheR} ${this.cacheG} ${this.cacheB}`,
+        );
       }
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true);
       setTimeout(() => {
-        this.service.updateCharacteristic(this.hapChar.Hue, this.cacheHue)
-      }, 2000)
-      throw new this.hapErr(-70402)
+        this.service.updateCharacteristic(this.hapChar.Hue, this.cacheHue);
+      }, 2000);
+      throw new this.hapErr(-70402);
     }
   }
 
-  async externalUpdate (params) {
+  async externalUpdate(params) {
     try {
       if (this.updateTimeout) {
-        return
+        return;
       }
       if (params.state && params.state !== this.cacheState) {
-        this.cacheState = params.state
-        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
+        this.cacheState = params.state;
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on');
         this.service.updateCharacteristic(
           this.hapChar.Brightness,
-          this.cacheState === 'on' ? 100 : 0
-        )
+          this.cacheState === 'on' ? 100 : 0,
+        );
         if (params.updateSource && this.enableLogging) {
-          this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
+          this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState);
         }
       }
-      let hs
-      let mode
+      let hs;
+      let mode;
       if (params.zyx_mode) {
-        mode = parseInt(params.zyx_mode)
+        mode = parseInt(params.zyx_mode, 10);
       } else if (
-        this.funcs.hasProperty(params, 'channel0') &&
-        parseInt(params.channel0) + parseInt(params.channel1) > 0
+        hasProperty(params, 'channel0')
+        && parseInt(params.channel0, 10) + parseInt(params.channel1, 10) > 0
       ) {
-        mode = 1
+        mode = 1;
       } else {
-        mode = 2
+        mode = 2;
       }
       if (mode === 2) {
-        if (this.funcs.hasProperty(params, 'channel2')) {
+        if (hasProperty(params, 'channel2')) {
           if (
-            params.channel2 !== (this.cacheR || 0).toString() ||
-            params.channel3 !== (this.cacheG || 0).toString() ||
-            params.channel4 !== (this.cacheB || 0).toString()
+            params.channel2 !== (this.cacheR || 0).toString()
+            || params.channel3 !== (this.cacheG || 0).toString()
+            || params.channel4 !== (this.cacheB || 0).toString()
           ) {
-            this.cacheR = parseInt(params.channel2)
-            this.cacheG = parseInt(params.channel3)
-            this.cacheB = parseInt(params.channel4)
-            hs = this.colourUtils.rgb2hs(this.cacheR, this.cacheG, this.cacheB)
-            this.cacheHue = hs[0]
-            this.service.updateCharacteristic(this.hapChar.Hue, this.cacheHue)
-            this.service.updateCharacteristic(this.hapChar.Saturation, 100)
-            this.service.updateCharacteristic(this.hapChar.Brightness, 100)
+            this.cacheR = parseInt(params.channel2, 10);
+            this.cacheG = parseInt(params.channel3, 10);
+            this.cacheB = parseInt(params.channel4, 10);
+            hs = rgb2hs(this.cacheR, this.cacheG, this.cacheB);
+            [this.cacheHue] = hs;
+            this.service.updateCharacteristic(this.hapChar.Hue, this.cacheHue);
+            this.service.updateCharacteristic(this.hapChar.Saturation, 100);
+            this.service.updateCharacteristic(this.hapChar.Brightness, 100);
             if (params.updateSource && this.enableLogging) {
               this.log(
                 '[%s] %s [rgb %s].',
                 this.name,
                 this.lang.curColour,
-                this.cacheR + ' ' + this.cacheG + ' ' + this.cacheB
-              )
+                `${this.cacheR} ${this.cacheG} ${this.cacheB}`,
+              );
             }
           }
         }
       }
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, false)
+      this.platform.deviceUpdateError(this.accessory, err, false);
     }
   }
 
-  markStatus (isOnline) {
-    this.isOnline = isOnline
+  markStatus(isOnline) {
+    this.isOnline = isOnline;
 
     // Show as off if offline if configured by user
     if (this.offlineAsOff && !isOnline && this.cacheState !== 'off') {
-      this.service.updateCharacteristic(this.hapChar.On, false)
-      this.cacheState = 'off'
+      this.service.updateCharacteristic(this.hapChar.On, false);
+      this.cacheState = 'off';
       if (this.enableLogging) {
-        this.log('[%s] %s [%s - offline]', this.name, this.lang.curState, this.cacheState)
+        this.log('[%s] %s [%s - offline]', this.name, this.lang.curState, this.cacheState);
       }
     }
   }
 
-  currentState () {
-    const toReturn = {}
-    toReturn.services = ['light']
+  currentState() {
+    const toReturn = {};
+    toReturn.services = ['light'];
     toReturn.light = {
       state: this.service.getCharacteristic(this.hapChar.On).value ? 'on' : 'off',
       brightness: this.service.getCharacteristic(this.hapChar.Brightness).value,
       hue: this.service.getCharacteristic(this.hapChar.Hue).value,
-      saturation: this.service.getCharacteristic(this.hapChar.Saturation).value
-    }
-    return toReturn
+      saturation: this.service.getCharacteristic(this.hapChar.Saturation).value,
+    };
+    return toReturn;
   }
 }
diff --git a/lib/device/motor.js b/lib/device/motor.js
index 646cd241..65be9f51 100644
--- a/lib/device/motor.js
+++ b/lib/device/motor.js
@@ -1,25 +1,23 @@
-/* jshint node: true, esversion: 10, -W014, -W033 */
-/* eslint-disable new-cap */
-'use strict'
+import platformConsts from '../utils/constants.js';
+import { generateRandomString, hasProperty, sleep } from '../utils/functions.js';
 
-module.exports = class deviceMotor {
-  constructor (platform, accessory) {
+export default class {
+  constructor(platform, accessory) {
     // Set up variables from the platform
-    this.eveChar = platform.eveChar
-    this.funcs = platform.funcs
-    this.hapChar = platform.api.hap.Characteristic
-    this.hapErr = platform.api.hap.HapStatusError
-    this.hapServ = platform.api.hap.Service
-    this.lang = platform.lang
-    this.log = platform.log
-    this.platform = platform
+    this.eveChar = platform.eveChar;
+    this.hapChar = platform.api.hap.Characteristic;
+    this.hapErr = platform.api.hap.HapStatusError;
+    this.hapServ = platform.api.hap.Service;
+    this.lang = platform.lang;
+    this.log = platform.log;
+    this.platform = platform;
 
     // Set up variables from the accessory
-    this.name = accessory.displayName
-    this.accessory = accessory
+    this.name = accessory.displayName;
+    this.accessory = accessory;
 
     // Initially set the online flag as true (to be then updated as false if necessary)
-    this.isOnline = true
+    this.isOnline = true;
 
     /*
       This is for the DUALR3 using motor mode
@@ -30,107 +28,104 @@ module.exports = class deviceMotor {
     */
 
     // Set up custom variables for this device type
-    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
-    const showAsMotor =
-      deviceConf && deviceConf.showAsMotor
-        ? deviceConf.showAsMotor
-        : platform.consts.defaultValues.showAsMotor
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId] || {};
+    const showAsMotor = deviceConf.showAsMotor || platformConsts.defaultValues.showAsMotor;
 
     // Set the correct logging variables for this accessory
-    this.enableLogging = !platform.config.disableDeviceLogging
-    this.enableDebugLogging = platform.config.debug
-    if (deviceConf && deviceConf.overrideLogging) {
-      switch (deviceConf.overrideLogging) {
-        case 'standard':
-          this.enableLogging = true
-          this.enableDebugLogging = false
-          break
-        case 'debug':
-          this.enableLogging = true
-          this.enableDebugLogging = true
-          break
-        case 'disable':
-          this.enableLogging = false
-          this.enableDebugLogging = false
-          break
-      }
+    switch (deviceConf.overrideLogging) {
+      case 'standard':
+        this.enableLogging = true;
+        this.enableDebugLogging = false;
+        break;
+      case 'debug':
+        this.enableLogging = true;
+        this.enableDebugLogging = true;
+        break;
+      case 'disable':
+        this.enableLogging = false;
+        this.enableDebugLogging = false;
+        break;
+      default:
+        this.enableLogging = !platform.config.disableDeviceLogging;
+        this.enableDebugLogging = platform.config.debug;
+        break;
     }
 
     // Add the window covering service if it doesn't already exist
-    let service
+    let service;
     switch (showAsMotor) {
       case 'door':
-        service = this.hapServ.Door
+        service = this.hapServ.Door;
         if (this.accessory.getService(this.hapServ.GarageDoorOpener)) {
-          this.accessory.removeService(this.accessory.getService(this.hapServ.GarageDoorOpener))
+          this.accessory.removeService(this.accessory.getService(this.hapServ.GarageDoorOpener));
         }
         if (this.accessory.getService(this.hapServ.Window)) {
-          this.accessory.removeService(this.accessory.getService(this.hapServ.Window))
+          this.accessory.removeService(this.accessory.getService(this.hapServ.Window));
         }
         if (this.accessory.getService(this.hapServ.WindowCovering)) {
-          this.accessory.removeService(this.accessory.getService(this.hapServ.WindowCovering))
+          this.accessory.removeService(this.accessory.getService(this.hapServ.WindowCovering));
         }
-        break
+        break;
       case 'garage':
-        service = this.hapServ.GarageDoorOpener
-        this.isGarage = true
+        service = this.hapServ.GarageDoorOpener;
+        this.isGarage = true;
         if (this.accessory.getService(this.hapServ.Door)) {
-          this.accessory.removeService(this.accessory.getService(this.hapServ.Door))
+          this.accessory.removeService(this.accessory.getService(this.hapServ.Door));
         }
         if (this.accessory.getService(this.hapServ.Window)) {
-          this.accessory.removeService(this.accessory.getService(this.hapServ.Window))
+          this.accessory.removeService(this.accessory.getService(this.hapServ.Window));
         }
         if (this.accessory.getService(this.hapServ.WindowCovering)) {
-          this.accessory.removeService(this.accessory.getService(this.hapServ.WindowCovering))
+          this.accessory.removeService(this.accessory.getService(this.hapServ.WindowCovering));
         }
-        break
+        break;
       case 'window':
-        service = this.hapServ.Window
+        service = this.hapServ.Window;
         if (this.accessory.getService(this.hapServ.Door)) {
-          this.accessory.removeService(this.accessory.getService(this.hapServ.Door))
+          this.accessory.removeService(this.accessory.getService(this.hapServ.Door));
         }
         if (this.accessory.getService(this.hapServ.GarageDoorOpener)) {
-          this.accessory.removeService(this.accessory.getService(this.hapServ.GarageDoorOpener))
+          this.accessory.removeService(this.accessory.getService(this.hapServ.GarageDoorOpener));
         }
         if (this.accessory.getService(this.hapServ.WindowCovering)) {
-          this.accessory.removeService(this.accessory.getService(this.hapServ.WindowCovering))
+          this.accessory.removeService(this.accessory.getService(this.hapServ.WindowCovering));
         }
-        break
+        break;
       default:
-        service = this.hapServ.WindowCovering
+        service = this.hapServ.WindowCovering;
         if (this.accessory.getService(this.hapServ.Door)) {
-          this.accessory.removeService(this.accessory.getService(this.hapServ.Door))
+          this.accessory.removeService(this.accessory.getService(this.hapServ.Door));
         }
         if (this.accessory.getService(this.hapServ.GarageDoorOpener)) {
-          this.accessory.removeService(this.accessory.getService(this.hapServ.GarageDoorOpener))
+          this.accessory.removeService(this.accessory.getService(this.hapServ.GarageDoorOpener));
         }
         if (this.accessory.getService(this.hapServ.Window)) {
-          this.accessory.removeService(this.accessory.getService(this.hapServ.Window))
+          this.accessory.removeService(this.accessory.getService(this.hapServ.Window));
         }
-        break
+        break;
     }
-    this.service = this.accessory.getService(service) || this.accessory.addService(service)
+    this.service = this.accessory.getService(service) || this.accessory.addService(service);
 
     // Add Eve power characteristics
     if (!this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
-      this.service.addCharacteristic(this.eveChar.CurrentConsumption)
+      this.service.addCharacteristic(this.eveChar.CurrentConsumption);
     }
     if (!this.service.testCharacteristic(this.eveChar.ElectricCurrent)) {
-      this.service.addCharacteristic(this.eveChar.ElectricCurrent)
+      this.service.addCharacteristic(this.eveChar.ElectricCurrent);
     }
     if (!this.service.testCharacteristic(this.eveChar.Voltage)) {
-      this.service.addCharacteristic(this.eveChar.Voltage)
+      this.service.addCharacteristic(this.eveChar.Voltage);
     }
 
     // Add the set handler to the target position characteristic
     if (this.isGarage) {
       this.service
         .getCharacteristic(this.hapChar.TargetDoorState)
-        .onSet(async value => await this.internalTargetUpdate(value))
+        .onSet(async (value) => this.internalTargetUpdate(value));
     } else {
       this.service
         .getCharacteristic(this.hapChar.TargetPosition)
-        .onSet(async value => await this.internalPositionUpdate(value))
+        .onSet(async (value) => this.internalPositionUpdate(value));
     }
 
     // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
@@ -138,145 +133,146 @@ module.exports = class deviceMotor {
       if (this.isGarage) {
         this.service.getCharacteristic(this.hapChar.CurrentDoorState).onGet(() => {
           if (!this.isOnline) {
-            throw new this.hapErr(-70402)
+            throw new this.hapErr(-70402);
           }
-          return this.service.getCharacteristic(this.hapChar.CurrentDoorState).value
-        })
+          return this.service.getCharacteristic(this.hapChar.CurrentDoorState).value;
+        });
         this.service.getCharacteristic(this.hapChar.TargetDoorState).onGet(() => {
           if (!this.isOnline) {
-            throw new this.hapErr(-70402)
+            throw new this.hapErr(-70402);
           }
-          return this.service.getCharacteristic(this.hapChar.TargetDoorState).value
-        })
+          return this.service.getCharacteristic(this.hapChar.TargetDoorState).value;
+        });
       } else {
         this.service.getCharacteristic(this.hapChar.CurrentPosition).onGet(() => {
           if (!this.isOnline) {
-            throw new this.hapErr(-70402)
+            throw new this.hapErr(-70402);
           }
-          return this.service.getCharacteristic(this.hapChar.CurrentPosition).value
-        })
+          return this.service.getCharacteristic(this.hapChar.CurrentPosition).value;
+        });
         this.service.getCharacteristic(this.hapChar.TargetPosition).onGet(() => {
           if (!this.isOnline) {
-            throw new this.hapErr(-70402)
+            throw new this.hapErr(-70402);
           }
-          return this.service.getCharacteristic(this.hapChar.TargetPosition).value
-        })
+          return this.service.getCharacteristic(this.hapChar.TargetPosition).value;
+        });
       }
     }
 
     if (platform.config.mode !== 'lan') {
       // Set up an interval to get eWeLink to send power updates
       setTimeout(() => {
-        this.internalUIUpdate()
-        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
-      }, 5000)
+        this.internalUIUpdate();
+        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000);
+      }, 5000);
 
       // Stop the intervals on Homebridge shutdown
-      platform.api.on('shutdown', () => clearInterval(this.intervalPoll))
+      platform.api.on('shutdown', () => clearInterval(this.intervalPoll));
     }
 
     // Output the customised options to the log
+    const normalLogging = this.enableLogging ? 'standard' : 'disable';
     const opts = JSON.stringify({
-      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
-      showAsMotor: showAsMotor
-    })
-    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
+      logging: this.enableDebugLogging ? 'debug' : normalLogging,
+      showAsMotor,
+    });
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts);
   }
 
-  async internalPositionUpdate (value) {
+  async internalPositionUpdate(value) {
     try {
       if (this.cachePos === value) {
-        return
+        return;
       }
-      const updateKey = this.funcs.generateRandomString(5)
-      this.updateKey = updateKey
-      await this.funcs.sleep(500)
+      const updateKey = generateRandomString(5);
+      this.updateKey = updateKey;
+      await sleep(500);
       if (updateKey !== this.updateKey) {
-        return
+        return;
       }
-      const params = { location: value }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.cacheTarg = value
+      const params = { location: value };
+      await this.platform.sendDeviceUpdate(this.accessory, params);
+      this.cacheTarg = value;
       if (this.enableLogging) {
-        this.log('[%s] %s [%s%].', this.name, this.lang.curTarg, this.cacheTarg)
+        this.log('[%s] %s [%s%].', this.name, this.lang.curTarg, this.cacheTarg);
       }
     } catch (err) {
       // Catch any errors and let the platform display them
-      this.platform.deviceUpdateError(this.accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true);
       setTimeout(() => {
-        this.service.updateCharacteristic(this.hapChar.TargetPosition, this.cacheTarg)
-      }, 2000)
-      throw new this.hapErr(-70402)
+        this.service.updateCharacteristic(this.hapChar.TargetPosition, this.cacheTarg);
+      }, 2000);
+      throw new this.hapErr(-70402);
     }
   }
 
-  async internalTargetUpdate (value) {
+  async internalTargetUpdate(value) {
     try {
       // 0 for open, 1 for closed
       // this.cachePos is 0 for closed and >0 for open
 
-      const params = { location: value === 1 ? 0 : 100 }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.cacheTarg = value === 1 ? 0 : 100
+      const params = { location: value === 1 ? 0 : 100 };
+      await this.platform.sendDeviceUpdate(this.accessory, params);
+      this.cacheTarg = value === 1 ? 0 : 100;
       if (this.enableLogging) {
-        this.log('[%s] %s [%s%].', this.name, this.lang.curTarg, this.cacheTarg)
+        this.log('[%s] %s [%s%].', this.name, this.lang.curTarg, this.cacheTarg);
       }
     } catch (err) {
       // Catch any errors and let the platform display them
-      this.platform.deviceUpdateError(this.accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true);
       setTimeout(() => {
-        this.service.updateCharacteristic(this.hapChar.TargetDoorState, this.cacheTarg)
-      }, 2000)
-      throw new this.hapErr(-70402)
+        this.service.updateCharacteristic(this.hapChar.TargetDoorState, this.cacheTarg);
+      }, 2000);
+      throw new this.hapErr(-70402);
     }
   }
 
-  async internalUIUpdate () {
+  async internalUIUpdate() {
     try {
       // Skip polling if device isn't online
       if (!this.isOnline) {
-        return
+        return;
       }
 
       // Send the params to request the updates
-      await this.platform.sendDeviceUpdate(this.accessory, { uiActive: { outlet: 0, time: 120 } })
+      await this.platform.sendDeviceUpdate(this.accessory, { uiActive: { outlet: 0, time: 120 } });
     } catch (err) {
-      this.log.error(err)
+      this.log.error(err);
     }
   }
 
-  async externalUpdate (params) {
+  async externalUpdate(params) {
     try {
       // currLocation is the current position of the motor
-      if (this.funcs.hasProperty(params, 'currLocation')) {
+      if (hasProperty(params, 'currLocation')) {
         if (params.currLocation !== this.cachePos) {
-          this.cachePos = params.currLocation
+          this.cachePos = params.currLocation;
           if (!this.isGarage) {
-            this.service.updateCharacteristic(this.hapChar.CurrentPosition, this.cachePos)
+            this.service.updateCharacteristic(this.hapChar.CurrentPosition, this.cachePos);
           }
           if (params.updateSource && this.enableLogging) {
-            this.log('[%s] %s [%s%].', this.name, this.lang.curPos, this.cachePos)
+            this.log('[%s] %s [%s%].', this.name, this.lang.curPos, this.cachePos);
           }
         }
       }
 
       // location is the target position of the motor
-      if (this.funcs.hasProperty(params, 'location')) {
+      if (hasProperty(params, 'location')) {
         if (params.location !== this.cacheTarg) {
-          this.cacheTarg = params.location
+          this.cacheTarg = params.location;
           if (!this.isGarage) {
-            this.service.updateCharacteristic(this.hapChar.TargetPosition, this.cacheTarg)
+            this.service.updateCharacteristic(this.hapChar.TargetPosition, this.cacheTarg);
           }
           if (params.updateSource && this.enableLogging) {
-            this.log('[%s] %s [%s%].', this.name, this.lang.curTarg, this.cacheTarg)
+            this.log('[%s] %s [%s%].', this.name, this.lang.curTarg, this.cacheTarg);
           }
         }
       }
 
       // Get the target door state characteristic for use later
-      let targetChar
+      let targetChar;
       if (this.isGarage) {
-        targetChar = this.service.getCharacteristic(this.TargetDoorState)
+        targetChar = this.service.getCharacteristic(this.TargetDoorState);
       }
 
       // If the two are equal then the motor must have stopped at this position
@@ -284,81 +280,79 @@ module.exports = class deviceMotor {
         if (this.isGarage) {
           if (this.cachePos === 0) {
             // CLOSED
-            this.service.updateCharacteristic(this.hapChar.CurrentDoorState, 1)
+            this.service.updateCharacteristic(this.hapChar.CurrentDoorState, 1);
             if (targetChar.value !== 1) {
-              targetChar.updateValue(1)
+              targetChar.updateValue(1);
             }
           } else {
             // OPEN
-            this.service.updateCharacteristic(this.hapChar.CurrentDoorState, 0)
+            this.service.updateCharacteristic(this.hapChar.CurrentDoorState, 0);
             if (targetChar.value !== 0) {
-              targetChar.updateValue(0)
+              targetChar.updateValue(0);
             }
           }
         } else {
           // PositionState 2 === STOPPED
-          this.service.updateCharacteristic(this.hapChar.PositionState, 2)
+          this.service.updateCharacteristic(this.hapChar.PositionState, 2);
         }
       } else if (this.cacheTarg > this.cachePos) {
         if (this.isGarage) {
           // OPENING
-          this.service.updateCharacteristic(this.hapChar.CurrentDoorState, 2)
+          this.service.updateCharacteristic(this.hapChar.CurrentDoorState, 2);
           if (targetChar.value !== 0) {
-            targetChar.updateValue(0)
+            targetChar.updateValue(0);
           }
         } else {
           // PositionState 1 === INCREASING
-          this.service.updateCharacteristic(this.hapChar.PositionState, 1)
+          this.service.updateCharacteristic(this.hapChar.PositionState, 1);
         }
-      } else {
-        if (this.isGarage) {
-          // CLOSING
-          this.service.updateCharacteristic(this.hapChar.CurrentDoorState, 3)
-          if (targetChar.value !== 1) {
-            targetChar.updateValue(1)
-          }
-        } else {
-          // PositionState 0 === DECREASING
-          this.service.updateCharacteristic(this.hapChar.PositionState, 0)
+      } else if (this.isGarage) {
+        // CLOSING
+        this.service.updateCharacteristic(this.hapChar.CurrentDoorState, 3);
+        if (targetChar.value !== 1) {
+          targetChar.updateValue(1);
         }
+      } else {
+        // PositionState 0 === DECREASING
+        this.service.updateCharacteristic(this.hapChar.PositionState, 0);
       }
 
       // Update power information if given
-      let logger = false
-      let power
-      let voltage
-      let current
-      if (this.funcs.hasProperty(params, 'actPow_00')) {
-        power = parseInt(params.actPow_00) / 100
-        this.service.updateCharacteristic(this.eveChar.CurrentConsumption, power)
-        logger = true
+      let logger = false;
+      let power;
+      let voltage;
+      let current;
+      if (hasProperty(params, 'actPow_00')) {
+        power = parseInt(params.actPow_00, 10) / 100;
+        this.service.updateCharacteristic(this.eveChar.CurrentConsumption, power);
+        logger = true;
       }
-      if (this.funcs.hasProperty(params, 'voltage_00')) {
-        voltage = parseInt(params.voltage_00) / 100
-        this.service.updateCharacteristic(this.eveChar.Voltage, voltage)
-        logger = true
+      if (hasProperty(params, 'voltage_00')) {
+        voltage = parseInt(params.voltage_00, 10) / 100;
+        this.service.updateCharacteristic(this.eveChar.Voltage, voltage);
+        logger = true;
       }
-      if (this.funcs.hasProperty(params, 'current_00')) {
-        current = parseInt(params.current_00) / 100
-        this.service.updateCharacteristic(this.eveChar.ElectricCurrent, current)
-        logger = true
+      if (hasProperty(params, 'current_00')) {
+        current = parseInt(params.current_00, 10) / 100;
+        this.service.updateCharacteristic(this.eveChar.ElectricCurrent, current);
+        logger = true;
       }
       if (params.updateSource && logger && this.enableLogging) {
         this.log(
           '[%s] %s%s%s.',
           this.name,
-          power !== undefined ? this.lang.curPower + ' [' + power + 'W]' : '',
-          voltage !== undefined ? ' ' + this.lang.curVolt + ' [' + voltage + 'V]' : '',
-          current !== undefined ? ' ' + this.lang.curCurr + ' [' + current + 'A]' : ''
-        )
+          power !== undefined ? `${this.lang.curPower} [${power}W]` : '',
+          voltage !== undefined ? ` ${this.lang.curVolt} [${voltage}V]` : '',
+          current !== undefined ? ` ${this.lang.curCurr} [${current}A]` : '',
+        );
       }
     } catch (err) {
       // Catch any errors and let the platform display them
-      this.platform.deviceUpdateError(this.accessory, err, false)
+      this.platform.deviceUpdateError(this.accessory, err, false);
     }
   }
 
-  markStatus (isOnline) {
-    this.isOnline = isOnline
+  markStatus(isOnline) {
+    this.isOnline = isOnline;
   }
 }
diff --git a/lib/device/outlet-multi.js b/lib/device/outlet-multi.js
index f716b86e..f87b79f9 100644
--- a/lib/device/outlet-multi.js
+++ b/lib/device/outlet-multi.js
@@ -1,28 +1,26 @@
-/* jshint node: true, esversion: 10, -W014, -W033 */
-/* eslint-disable new-cap */
-'use strict'
+import platformConsts from '../utils/constants.js';
+import { hasProperty, sleep } from '../utils/functions.js';
 
-module.exports = class deviceOutletMulti {
-  constructor (platform, accessory, devicesInHB) {
+export default class {
+  constructor(platform, accessory, devicesInHB) {
     // Set up variables from the platform
-    this.cusChar = platform.cusChar
-    this.devicesInHB = devicesInHB
-    this.eveChar = platform.eveChar
-    this.funcs = platform.funcs
-    this.hapChar = platform.api.hap.Characteristic
-    this.hapErr = platform.api.hap.HapStatusError
-    this.hapServ = platform.api.hap.Service
-    this.hapUUIDGen = platform.api.hap.uuid.generate
-    this.lang = platform.lang
-    this.log = platform.log
-    this.platform = platform
+    this.cusChar = platform.cusChar;
+    this.devicesInHB = devicesInHB;
+    this.eveChar = platform.eveChar;
+    this.hapChar = platform.api.hap.Characteristic;
+    this.hapErr = platform.api.hap.HapStatusError;
+    this.hapServ = platform.api.hap.Service;
+    this.hapUUIDGen = platform.api.hap.uuid.generate;
+    this.lang = platform.lang;
+    this.log = platform.log;
+    this.platform = platform;
 
     // Set up variables from the accessory
-    this.name = accessory.displayName
-    this.accessory = accessory
+    this.name = accessory.displayName;
+    this.accessory = accessory;
 
     // Initially set the online flag as true (to be then updated as false if necessary)
-    this.isOnline = true
+    this.isOnline = true;
 
     /*
     UIID 2/3/4/7/8/9/29/30/31/41/82/83/84/113/114: multi switch, no power readings
@@ -30,394 +28,391 @@ module.exports = class deviceOutletMulti {
     */
 
     // Set up custom variables for this device type
-    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
-    this.hideChannels = deviceConf && deviceConf.hideChannels ? deviceConf.hideChannels : undefined
-    this.inchChannels = deviceConf && deviceConf.inchChannels ? deviceConf.inchChannels : ''
-    this.inUsePowerThreshold =
-      deviceConf && deviceConf.inUsePowerThreshold
-        ? deviceConf.inUsePowerThreshold
-        : platform.consts.defaultValues.inUsePowerThreshold
-    accessory.context.isInched =
-      accessory.context.switchNumber !== '0' &&
-      this.inchChannels.includes(accessory.context.switchNumber)
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId] || {};
+    this.hideChannels = deviceConf.hideChannels;
+    this.inchChannels = deviceConf.inchChannels || '';
+    this.inUsePowerThreshold = deviceConf.inUsePowerThreshold || platformConsts.defaultValues.inUsePowerThreshold;
+    accessory.context.isInched = accessory.context.switchNumber !== '0'
+      && this.inchChannels.includes(accessory.context.switchNumber);
 
     // Set the correct logging variables for this accessory
-    this.enableLogging = !platform.config.disableDeviceLogging
-    this.enableDebugLogging = platform.config.debug
-    if (deviceConf && deviceConf.overrideLogging) {
-      switch (deviceConf.overrideLogging) {
-        case 'standard':
-          this.enableLogging = true
-          this.enableDebugLogging = false
-          break
-        case 'debug':
-          this.enableLogging = true
-          this.enableDebugLogging = true
-          break
-        case 'disable':
-          this.enableLogging = false
-          this.enableDebugLogging = false
-          break
-      }
+    switch (deviceConf.overrideLogging) {
+      case 'standard':
+        this.enableLogging = true;
+        this.enableDebugLogging = false;
+        break;
+      case 'debug':
+        this.enableLogging = true;
+        this.enableDebugLogging = true;
+        break;
+      case 'disable':
+        this.enableLogging = false;
+        this.enableDebugLogging = false;
+        break;
+      default:
+        this.enableLogging = !platform.config.disableDeviceLogging;
+        this.enableDebugLogging = platform.config.debug;
+        break;
     }
 
     // If the accessory has a switch service then remove it
     if (this.accessory.getService(this.hapServ.Switch)) {
-      this.accessory.removeService(this.accessory.getService(this.hapServ.Switch))
+      this.accessory.removeService(this.accessory.getService(this.hapServ.Switch));
     }
 
     // Add the outlet service if it doesn't already exist
-    this.service =
-      this.accessory.getService(this.hapServ.Outlet) ||
-      this.accessory.addService(this.hapServ.Outlet)
+    this.service = this.accessory.getService(this.hapServ.Outlet)
+      || this.accessory.addService(this.hapServ.Outlet);
 
-    if (platform.consts.devices.switchMultiPower.includes(this.accessory.context.eweUIID)) {
+    if (platformConsts.devices.switchMultiPower.includes(this.accessory.context.eweUIID)) {
       // Add Eve power characteristics
-      this.powerReadings = true
-      this.isDual = true
+      this.powerReadings = true;
+      this.isDual = true;
       if (accessory.context.switchNumber !== '0') {
         if (!this.service.testCharacteristic(this.hapChar.OutletInUse)) {
-          this.service.addCharacteristic(this.hapChar.OutletInUse)
+          this.service.addCharacteristic(this.hapChar.OutletInUse);
         }
         if (!this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
-          this.service.addCharacteristic(this.eveChar.CurrentConsumption)
+          this.service.addCharacteristic(this.eveChar.CurrentConsumption);
         }
         if (!this.service.testCharacteristic(this.eveChar.ElectricCurrent)) {
-          this.service.addCharacteristic(this.eveChar.ElectricCurrent)
+          this.service.addCharacteristic(this.eveChar.ElectricCurrent);
         }
         if (!this.service.testCharacteristic(this.eveChar.Voltage)) {
-          this.service.addCharacteristic(this.eveChar.Voltage)
+          this.service.addCharacteristic(this.eveChar.Voltage);
         }
       }
     } else {
       // Remove unused Eve characteristics
       if (this.service.testCharacteristic(this.hapChar.OutletInUse)) {
-        this.service.removeCharacteristic(this.service.getCharacteristic(this.eveChar.OutletInUse))
+        this.service.removeCharacteristic(this.service.getCharacteristic(this.eveChar.OutletInUse));
       }
       if (this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
         this.service.removeCharacteristic(
-          this.service.getCharacteristic(this.eveChar.CurrentConsumption)
-        )
+          this.service.getCharacteristic(this.eveChar.CurrentConsumption),
+        );
       }
       if (this.service.testCharacteristic(this.eveChar.ElectricCurrent)) {
         this.service.removeCharacteristic(
-          this.service.getCharacteristic(this.eveChar.ElectricCurrent)
-        )
+          this.service.getCharacteristic(this.eveChar.ElectricCurrent),
+        );
       }
       if (this.service.testCharacteristic(this.eveChar.Voltage)) {
-        this.service.removeCharacteristic(this.service.getCharacteristic(this.eveChar.Voltage))
+        this.service.removeCharacteristic(this.service.getCharacteristic(this.eveChar.Voltage));
       }
     }
 
     // Add the set handler to the outlet on/off characteristic
     this.service
       .getCharacteristic(this.hapChar.On)
-      .onSet(async value => await this.internalStateUpdate(value))
+      .onSet(async (value) => this.internalStateUpdate(value));
 
     // Add a custom characteristic for inverting the switch if inching setting is enabled
     if (this.accessory.context.isInched) {
       if (!this.service.testCharacteristic(this.cusChar.InvertSwitch)) {
-        this.service.addCharacteristic(this.cusChar.InvertSwitch)
+        this.service.addCharacteristic(this.cusChar.InvertSwitch);
       }
       this.service.updateCharacteristic(
         this.cusChar.InvertSwitch,
-        this.service.getCharacteristic(this.hapChar.On).value
-      )
+        this.service.getCharacteristic(this.hapChar.On).value,
+      );
 
       // Add the set handler to invert the switch
-      this.service.getCharacteristic(this.cusChar.InvertSwitch).onSet(value => {
-        this.service.updateCharacteristic(this.hapChar.On, value)
-        this.log('[%s] %s [%s].', this.name, this.lang.curState, value ? 'on' : 'off')
-      })
+      this.service.getCharacteristic(this.cusChar.InvertSwitch).onSet((value) => {
+        this.service.updateCharacteristic(this.hapChar.On, value);
+        this.log('[%s] %s [%s].', this.name, this.lang.curState, value ? 'on' : 'off');
+      });
     }
 
     // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
     if (!platform.config.disableNoResponse) {
       this.service.getCharacteristic(this.hapChar.On).onGet(() => {
         if (!this.isOnline) {
-          throw new this.hapErr(-70402)
+          throw new this.hapErr(-70402);
         }
-        return this.service.getCharacteristic(this.hapChar.On).value
-      })
+        return this.service.getCharacteristic(this.hapChar.On).value;
+      });
     }
 
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new platform.eveService('energy', this.accessory, {
-      log: platform.config.debugFakegato ? this.log : () => {}
-    })
+      log: platform.config.debugFakegato ? this.log : () => {},
+    });
 
     // Set up extra features for outlets that provide power readings
     if (
-      this.powerReadings &&
-      accessory.context.switchNumber === '0' &&
-      platform.config.mode !== 'lan'
+      this.powerReadings
+      && accessory.context.switchNumber === '0'
+      && platform.config.mode !== 'lan'
     ) {
       // Set up an interval to get eWeLink to send power updates
       setTimeout(() => {
-        this.internalUIUpdate()
-        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
-      }, 5000)
+        this.internalUIUpdate();
+        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000);
+      }, 5000);
 
       // Stop the intervals on Homebridge shutdown
-      platform.api.on('shutdown', () => clearInterval(this.intervalPoll))
+      platform.api.on('shutdown', () => clearInterval(this.intervalPoll));
     }
 
     // Output the customised options to the log
     if (accessory.context.switchNumber === '0') {
+      const normalLogging = this.enableLogging ? 'standard' : 'disable';
       const opts = JSON.stringify({
         hideChannels: this.hideChannels,
         inchChannels: this.inchChannels,
         inUsePowerThreshold: this.inUsePowerThreshold,
-        logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
-        showAs: 'outlet'
-      })
-      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
+        logging: this.enableDebugLogging ? 'debug' : normalLogging,
+        showAs: 'outlet',
+      });
+      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts);
     }
   }
 
-  async internalStateUpdate (value) {
+  async internalStateUpdate(value) {
     try {
-      let primaryState = false
+      let primaryState = false;
       if (this.accessory.context.isInched) {
-        value = !this.service.getCharacteristic(this.hapChar.On).value
+        value = !this.service.getCharacteristic(this.hapChar.On).value;
       }
       const params = {
-        switches: []
-      }
-      const switchNumber = this.accessory.context.switchNumber
+        switches: [],
+      };
+      const { switchNumber } = this.accessory.context;
       switch (switchNumber) {
         case '0':
-          params.switches.push({ switch: value ? 'on' : 'off', outlet: 0 })
-          params.switches.push({ switch: value ? 'on' : 'off', outlet: 1 })
+          params.switches.push({ switch: value ? 'on' : 'off', outlet: 0 });
+          params.switches.push({ switch: value ? 'on' : 'off', outlet: 1 });
           if (!this.isDual) {
-            params.switches.push({ switch: value ? 'on' : 'off', outlet: 2 })
-            params.switches.push({ switch: value ? 'on' : 'off', outlet: 3 })
+            params.switches.push({ switch: value ? 'on' : 'off', outlet: 2 });
+            params.switches.push({ switch: value ? 'on' : 'off', outlet: 3 });
           }
-          break
+          break;
         case '1':
         case '2':
         case '3':
         case '4':
           params.switches.push({
             switch: value || this.accessory.context.isInched ? 'on' : 'off',
-            outlet: switchNumber - 1
-          })
-          break
+            outlet: switchNumber - 1,
+          });
+          break;
+        default:
+          return;
       }
       if (this.accessory.context.isInched) {
-        this.accessory.context.ignoreUpdates = true
+        this.accessory.context.ignoreUpdates = true;
         setTimeout(() => {
-          this.accessory.context.ignoreUpdates = false
-        }, 1500)
+          this.accessory.context.ignoreUpdates = false;
+        }, 1500);
       }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
+      await this.platform.sendDeviceUpdate(this.accessory, params);
       if (this.accessory.context.isInched) {
-        this.service.updateCharacteristic(this.cusChar.InvertSwitch, value)
+        this.service.updateCharacteristic(this.cusChar.InvertSwitch, value);
       }
       switch (switchNumber) {
         case '0':
-          for (let i = 0; i <= this.accessory.context.channelCount; i++) {
-            const idToCheck = this.accessory.context.eweDeviceId + 'SW' + i
-            const uuid = this.hapUUIDGen(idToCheck)
+          for (let i = 0; i <= this.accessory.context.channelCount; i += 1) {
+            const idToCheck = `${this.accessory.context.eweDeviceId}SW${i}`;
+            const uuid = this.hapUUIDGen(idToCheck);
             if (this.devicesInHB.has(uuid)) {
-              const subAccessory = this.devicesInHB.get(uuid)
-              const service = subAccessory.getService(this.hapServ.Outlet)
-              service.updateCharacteristic(this.hapChar.On, value)
-              subAccessory.eveService.addEntry({ status: value ? 1 : 0 })
+              const subAccessory = this.devicesInHB.get(uuid);
+              const service = subAccessory.getService(this.hapServ.Outlet);
+              service.updateCharacteristic(this.hapChar.On, value);
+              subAccessory.eveService.addEntry({ status: value ? 1 : 0 });
               if (i > 0) {
                 if (this.enableLogging) {
                   this.log(
                     '[%s] %s [%s].',
                     subAccessory.displayName,
                     this.lang.curState,
-                    value ? 'on' : 'off'
-                  )
+                    value ? 'on' : 'off',
+                  );
                 }
               }
             }
           }
-          break
+          break;
         case '1':
         case '2':
         case '3':
         case '4':
-          for (let i = 1; i <= this.accessory.context.channelCount; i++) {
-            const idToCheck = this.accessory.context.eweDeviceId + 'SW' + i
-            const uuid = this.hapUUIDGen(idToCheck)
+          for (let i = 1; i <= this.accessory.context.channelCount; i += 1) {
+            const idToCheck = `${this.accessory.context.eweDeviceId}SW${i}`;
+            const uuid = this.hapUUIDGen(idToCheck);
             if (this.devicesInHB.has(uuid)) {
-              const subAccessory = this.devicesInHB.get(uuid)
-              const service = subAccessory.getService(this.hapServ.Outlet)
-              if (i === parseInt(switchNumber)) {
+              const subAccessory = this.devicesInHB.get(uuid);
+              const service = subAccessory.getService(this.hapServ.Outlet);
+              if (i === parseInt(switchNumber, 10)) {
                 if (value) {
-                  primaryState = true
+                  primaryState = true;
                 }
-                subAccessory.eveService.addEntry({ status: value ? 1 : 0 })
+                subAccessory.eveService.addEntry({ status: value ? 1 : 0 });
                 if (i > 0) {
                   if (this.enableLogging) {
                     this.log(
                       '[%s] %s [%s].',
                       subAccessory.displayName,
                       this.lang.curState,
-                      value ? 'on' : 'off'
-                    )
+                      value ? 'on' : 'off',
+                    );
                   }
                 }
-              } else {
-                if (service.getCharacteristic(this.hapChar.On).value) {
-                  primaryState = true
-                }
+              } else if (service.getCharacteristic(this.hapChar.On).value) {
+                primaryState = true;
               }
             }
           }
           if (!this.platform.hideMasters.includes(this.accessory.context.eweDeviceId)) {
-            const idToCheck = this.accessory.context.eweDeviceId + 'SW0'
-            const uuid = this.hapUUIDGen(idToCheck)
-            const priAccessory = this.devicesInHB.get(uuid)
+            const idToCheck = `${this.accessory.context.eweDeviceId}SW0`;
+            const uuid = this.hapUUIDGen(idToCheck);
+            const priAccessory = this.devicesInHB.get(uuid);
             priAccessory
               .getService(this.hapServ.Outlet)
-              .updateCharacteristic(this.hapChar.On, primaryState)
-            priAccessory.eveService.addEntry({ status: primaryState ? 1 : 0 })
+              .updateCharacteristic(this.hapChar.On, primaryState);
+            priAccessory.eveService.addEntry({ status: primaryState ? 1 : 0 });
           }
-          break
+          break;
+        default:
+          return;
       }
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true);
       setTimeout(() => {
-        this.service.updateCharacteristic(this.hapChar.On, !value)
-      }, 2000)
-      throw new this.hapErr(-70402)
+        this.service.updateCharacteristic(this.hapChar.On, !value);
+      }, 2000);
+      throw new this.hapErr(-70402);
     }
   }
 
-  async internalUIUpdate () {
+  async internalUIUpdate() {
     try {
       // Skip polling if device isn't online
       if (!this.isOnline) {
-        return
+        return;
       }
 
       // Send the params to request the updates
-      await this.platform.sendDeviceUpdate(this.accessory, { uiActive: { outlet: 0, time: 120 } })
-      await this.funcs.sleep(2000)
-      await this.platform.sendDeviceUpdate(this.accessory, { uiActive: { outlet: 1, time: 120 } })
+      await this.platform.sendDeviceUpdate(this.accessory, { uiActive: { outlet: 0, time: 120 } });
+      await sleep(2000);
+      await this.platform.sendDeviceUpdate(this.accessory, { uiActive: { outlet: 1, time: 120 } });
     } catch (err) {
       // Suppress errors here
     }
   }
 
-  async externalUpdate (params) {
+  async externalUpdate(params) {
     try {
-      const idToCheck = this.accessory.context.eweDeviceId + 'SW'
-      let primaryState = false
-      for (let i = 1; i <= this.accessory.context.channelCount; i++) {
-        const uuid = this.hapUUIDGen(idToCheck + i)
+      const idToCheck = `${this.accessory.context.eweDeviceId}SW`;
+      let primaryState = false;
+      for (let i = 1; i <= this.accessory.context.channelCount; i += 1) {
+        const uuid = this.hapUUIDGen(idToCheck + i);
         if (this.devicesInHB.has(uuid)) {
-          const subAccessory = this.devicesInHB.get(uuid)
-          const service = subAccessory.getService(this.hapServ.Outlet)
+          const subAccessory = this.devicesInHB.get(uuid);
+          const service = subAccessory.getService(this.hapServ.Outlet);
           if (params.switches) {
-            const currentState = service.getCharacteristic(this.hapChar.On).value ? 'on' : 'off'
+            const currentState = service.getCharacteristic(this.hapChar.On).value ? 'on' : 'off';
             if (subAccessory.context.isInched) {
               if (params.switches[i - 1].switch === 'on' && !subAccessory.context.ignoreUpdates) {
-                subAccessory.context.ignoreUpdates = true
+                subAccessory.context.ignoreUpdates = true;
                 setTimeout(() => {
-                  subAccessory.context.ignoreUpdates = false
-                }, 1500)
-                const newState = currentState === 'on' ? 'off' : 'on'
+                  subAccessory.context.ignoreUpdates = false;
+                }, 1500);
+                const newState = currentState === 'on' ? 'off' : 'on';
                 if (newState === 'on') {
-                  primaryState = true
+                  primaryState = true;
                 }
-                service.updateCharacteristic(this.hapChar.On, newState === 'on')
-                service.updateCharacteristic(this.cusChar.InvertSwitch, newState === 'on')
+                service.updateCharacteristic(this.hapChar.On, newState === 'on');
+                service.updateCharacteristic(this.cusChar.InvertSwitch, newState === 'on');
                 subAccessory.eveService.addEntry({
-                  status: newState === 'on' ? 1 : 0
-                })
+                  status: newState === 'on' ? 1 : 0,
+                });
                 if (params.updateSource && this.enableLogging) {
-                  this.log('[%s] %s [%s].', subAccessory.displayName, this.lang.curState, newState)
+                  this.log('[%s] %s [%s].', subAccessory.displayName, this.lang.curState, newState);
                 }
               }
             } else {
               if (params.switches[i - 1].switch === 'on') {
-                primaryState = true
+                primaryState = true;
               }
               if (!params.updateSource || params.switches[i - 1].switch !== currentState) {
                 service.updateCharacteristic(
                   this.hapChar.On,
-                  params.switches[i - 1].switch === 'on'
-                )
+                  params.switches[i - 1].switch === 'on',
+                );
                 subAccessory.eveService.addEntry({
-                  status: params.switches[i - 1].switch === 'on' ? 1 : 0
-                })
+                  status: params.switches[i - 1].switch === 'on' ? 1 : 0,
+                });
                 if (params.updateSource && this.enableLogging) {
                   this.log(
                     '[%s] %s [%s].',
                     subAccessory.displayName,
                     this.lang.curState,
-                    params.switches[i - 1].switch
-                  )
+                    params.switches[i - 1].switch,
+                  );
                 }
               }
             }
           }
-          if (!this.powerReadings) {
-            continue
-          }
-          let logger = false
-          let power
-          let voltage
-          let current
-          if (this.funcs.hasProperty(params, 'actPow_0' + (i - 1))) {
-            power = parseInt(params['actPow_0' + (i - 1)]) / 100
-            service.updateCharacteristic(
-              this.hapChar.OutletInUse,
-              service.getCharacteristic(this.hapChar.On).value && power > this.inUsePowerThreshold
-            )
-            service.updateCharacteristic(this.eveChar.CurrentConsumption, power)
-            subAccessory.eveService.addEntry({ power })
-            logger = true
-          }
-          if (this.funcs.hasProperty(params, 'voltage_0' + (i - 1))) {
-            voltage = parseInt(params['voltage_0' + (i - 1)]) / 100
-            service.updateCharacteristic(this.eveChar.Voltage, voltage)
-            logger = true
-          }
-          if (this.funcs.hasProperty(params, 'current_0' + (i - 1))) {
-            current = parseInt(params['current_0' + (i - 1)]) / 100
-            service.updateCharacteristic(this.eveChar.ElectricCurrent, current)
-            logger = true
-          }
-          if (params.updateSource && logger && this.enableLogging) {
-            this.log(
-              '[%s] %s%s%s.',
-              subAccessory.displayName,
-              power !== undefined ? this.lang.curPower + ' [' + power + 'W]' : '',
-              voltage !== undefined ? ' ' + this.lang.curVolt + ' [' + voltage + 'V]' : '',
-              current !== undefined ? ' ' + this.lang.curCurr + ' [' + current + 'A]' : ''
-            )
+          if (this.powerReadings) {
+            let logger = false;
+            let power;
+            let voltage;
+            let current;
+            if (hasProperty(params, `actPow_0${i - 1}`)) {
+              power = parseInt(params[`actPow_0${i - 1}`], 10) / 100;
+              service.updateCharacteristic(
+                this.hapChar.OutletInUse,
+                service.getCharacteristic(this.hapChar.On).value && power > this.inUsePowerThreshold,
+              );
+              service.updateCharacteristic(this.eveChar.CurrentConsumption, power);
+              subAccessory.eveService.addEntry({ power });
+              logger = true;
+            }
+            if (hasProperty(params, `voltage_0${i - 1}`)) {
+              voltage = parseInt(params[`voltage_0${i - 1}`], 10) / 100;
+              service.updateCharacteristic(this.eveChar.Voltage, voltage);
+              logger = true;
+            }
+            if (hasProperty(params, `current_0${i - 1}`)) {
+              current = parseInt(params[`current_0${i - 1}`], 10) / 100;
+              service.updateCharacteristic(this.eveChar.ElectricCurrent, current);
+              logger = true;
+            }
+            if (params.updateSource && logger && this.enableLogging) {
+              this.log(
+                '[%s] %s%s%s.',
+                subAccessory.displayName,
+                power !== undefined ? `${this.lang.curPower} [${power}W]` : '',
+                voltage !== undefined ? ` ${this.lang.curVolt} [${voltage}V]` : '',
+                current !== undefined ? ` ${this.lang.curCurr} [${current}A]` : '',
+              );
+            }
           }
         }
       }
       if (
-        !this.platform.hideMasters.includes(this.accessory.context.eweDeviceId) &&
-        params.switches
+        !this.platform.hideMasters.includes(this.accessory.context.eweDeviceId)
+        && params.switches
       ) {
-        this.service.updateCharacteristic(this.hapChar.On, primaryState)
-        this.accessory.eveService.addEntry({ status: primaryState ? 1 : 0 })
+        this.service.updateCharacteristic(this.hapChar.On, primaryState);
+        this.accessory.eveService.addEntry({ status: primaryState ? 1 : 0 });
       }
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, false)
+      this.platform.deviceUpdateError(this.accessory, err, false);
     }
   }
 
-  markStatus (isOnline) {
-    this.isOnline = isOnline
+  markStatus(isOnline) {
+    this.isOnline = isOnline;
   }
 
-  currentState () {
-    const toReturn = {}
-    toReturn.services = ['outlet']
+  currentState() {
+    const toReturn = {};
+    toReturn.services = ['outlet'];
     toReturn.outlet = {
-      state: this.service.getCharacteristic(this.hapChar.On).value ? 'on' : 'off'
-    }
-    return toReturn
+      state: this.service.getCharacteristic(this.hapChar.On).value ? 'on' : 'off',
+    };
+    return toReturn;
   }
 }
diff --git a/lib/device/outlet-single-inched.js b/lib/device/outlet-single-inched.js
index 8a1b59f8..8ca037f2 100644
--- a/lib/device/outlet-single-inched.js
+++ b/lib/device/outlet-single-inched.js
@@ -1,26 +1,24 @@
-/* jshint node: true, esversion: 10, -W014, -W033 */
-/* eslint-disable new-cap */
-'use strict'
+import platformConsts from '../utils/constants.js';
+import { hasProperty } from '../utils/functions.js';
 
-module.exports = class deviceOutletSingleInched {
-  constructor (platform, accessory) {
+export default class {
+  constructor(platform, accessory) {
     // Set up variables from the platform
-    this.cusChar = platform.cusChar
-    this.eveChar = platform.eveChar
-    this.funcs = platform.funcs
-    this.hapChar = platform.api.hap.Characteristic
-    this.hapErr = platform.api.hap.HapStatusError
-    this.hapServ = platform.api.hap.Service
-    this.lang = platform.lang
-    this.log = platform.log
-    this.platform = platform
+    this.cusChar = platform.cusChar;
+    this.eveChar = platform.eveChar;
+    this.hapChar = platform.api.hap.Characteristic;
+    this.hapErr = platform.api.hap.HapStatusError;
+    this.hapServ = platform.api.hap.Service;
+    this.lang = platform.lang;
+    this.log = platform.log;
+    this.platform = platform;
 
     // Set up variables from the accessory
-    this.name = accessory.displayName
-    this.accessory = accessory
+    this.name = accessory.displayName;
+    this.accessory = accessory;
 
     // Initially set the online flag as true (to be then updated as false if necessary)
-    this.isOnline = true
+    this.isOnline = true;
 
     /*
     UIID 1/6/14/24/27/112/1009/1256/7004: single switch, no power readings
@@ -31,367 +29,364 @@ module.exports = class deviceOutletSingleInched {
     */
 
     // Set up custom variables for this device type
-    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
-    this.inUsePowerThreshold =
-      deviceConf && deviceConf.inUsePowerThreshold
-        ? deviceConf.inUsePowerThreshold
-        : platform.consts.defaultValues.inUsePowerThreshold
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId] || {};
+    this.inUsePowerThreshold = deviceConf.inUsePowerThreshold || platformConsts.defaultValues.inUsePowerThreshold;
 
     // Set the correct logging variables for this accessory
-    this.enableLogging = !platform.config.disableDeviceLogging
-    this.enableDebugLogging = platform.config.debug
-    if (deviceConf && deviceConf.overrideLogging) {
-      switch (deviceConf.overrideLogging) {
-        case 'standard':
-          this.enableLogging = true
-          this.enableDebugLogging = false
-          break
-        case 'debug':
-          this.enableLogging = true
-          this.enableDebugLogging = true
-          break
-        case 'disable':
-          this.enableLogging = false
-          this.enableDebugLogging = false
-          break
-      }
+    switch (deviceConf.overrideLogging) {
+      case 'standard':
+        this.enableLogging = true;
+        this.enableDebugLogging = false;
+        break;
+      case 'debug':
+        this.enableLogging = true;
+        this.enableDebugLogging = true;
+        break;
+      case 'disable':
+        this.enableLogging = false;
+        this.enableDebugLogging = false;
+        break;
+      default:
+        this.enableLogging = !platform.config.disableDeviceLogging;
+        this.enableDebugLogging = platform.config.debug;
+        break;
     }
 
     // If the accessory has a switch service then remove it
     if (this.accessory.getService(this.hapServ.Switch)) {
-      this.accessory.removeService(this.accessory.getService(this.hapServ.Switch))
+      this.accessory.removeService(this.accessory.getService(this.hapServ.Switch));
     }
 
     // Add the outlet service if it doesn't already exist
-    this.service =
-      this.accessory.getService(this.hapServ.Outlet) ||
-      this.accessory.addService(this.hapServ.Outlet)
+    this.service = this.accessory.getService(this.hapServ.Outlet)
+      || this.accessory.addService(this.hapServ.Outlet);
 
     switch (this.accessory.context.eweUIID) {
       case 5:
       case 182:
         // Add Eve power characteristics
-        this.powerReadings = true
+        this.powerReadings = true;
         if (!this.service.testCharacteristic(this.hapChar.OutletInUse)) {
-          this.service.addCharacteristic(this.hapChar.OutletInUse)
+          this.service.addCharacteristic(this.hapChar.OutletInUse);
         }
         if (!this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
-          this.service.addCharacteristic(this.eveChar.CurrentConsumption)
+          this.service.addCharacteristic(this.eveChar.CurrentConsumption);
         }
         if (!this.service.testCharacteristic(this.eveChar.TotalConsumption)) {
-          this.service.addCharacteristic(this.eveChar.TotalConsumption)
+          this.service.addCharacteristic(this.eveChar.TotalConsumption);
         }
         if (!this.service.testCharacteristic(this.eveChar.ResetTotal)) {
-          this.service.addCharacteristic(this.eveChar.ResetTotal)
+          this.service.addCharacteristic(this.eveChar.ResetTotal);
         }
 
         // Remove unused Eve characteristics
         if (this.service.testCharacteristic(this.eveChar.ElectricCurrent)) {
           this.service.removeCharacteristic(
-            this.service.getCharacteristic(this.eveChar.ElectricCurrent)
-          )
+            this.service.getCharacteristic(this.eveChar.ElectricCurrent),
+          );
         }
         if (this.service.testCharacteristic(this.eveChar.Voltage)) {
-          this.service.removeCharacteristic(this.service.getCharacteristic(this.eveChar.Voltage))
+          this.service.removeCharacteristic(this.service.getCharacteristic(this.eveChar.Voltage));
         }
-        break
+        break;
       case 32:
         // Add Eve power characteristics
-        this.powerReadings = true
+        this.powerReadings = true;
         if (!this.service.testCharacteristic(this.hapChar.OutletInUse)) {
-          this.service.addCharacteristic(this.hapChar.OutletInUse)
+          this.service.addCharacteristic(this.hapChar.OutletInUse);
         }
         if (!this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
-          this.service.addCharacteristic(this.eveChar.CurrentConsumption)
+          this.service.addCharacteristic(this.eveChar.CurrentConsumption);
         }
         if (!this.service.testCharacteristic(this.eveChar.ElectricCurrent)) {
-          this.service.addCharacteristic(this.eveChar.ElectricCurrent)
+          this.service.addCharacteristic(this.eveChar.ElectricCurrent);
         }
         if (!this.service.testCharacteristic(this.eveChar.Voltage)) {
-          this.service.addCharacteristic(this.eveChar.Voltage)
+          this.service.addCharacteristic(this.eveChar.Voltage);
         }
         if (!this.service.testCharacteristic(this.eveChar.TotalConsumption)) {
-          this.service.addCharacteristic(this.eveChar.TotalConsumption)
+          this.service.addCharacteristic(this.eveChar.TotalConsumption);
         }
         if (!this.service.testCharacteristic(this.eveChar.ResetTotal)) {
-          this.service.addCharacteristic(this.eveChar.ResetTotal)
+          this.service.addCharacteristic(this.eveChar.ResetTotal);
         }
-        break
+        break;
       default:
         // Remove unused Eve characteristics
         if (this.service.testCharacteristic(this.hapChar.OutletInUse)) {
           this.service.removeCharacteristic(
-            this.service.getCharacteristic(this.eveChar.OutletInUse)
-          )
+            this.service.getCharacteristic(this.eveChar.OutletInUse),
+          );
         }
         if (this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
           this.service.removeCharacteristic(
-            this.service.getCharacteristic(this.eveChar.CurrentConsumption)
-          )
+            this.service.getCharacteristic(this.eveChar.CurrentConsumption),
+          );
         }
         if (this.service.testCharacteristic(this.eveChar.ElectricCurrent)) {
           this.service.removeCharacteristic(
-            this.service.getCharacteristic(this.eveChar.ElectricCurrent)
-          )
+            this.service.getCharacteristic(this.eveChar.ElectricCurrent),
+          );
         }
         if (this.service.testCharacteristic(this.eveChar.Voltage)) {
-          this.service.removeCharacteristic(this.service.getCharacteristic(this.eveChar.Voltage))
+          this.service.removeCharacteristic(this.service.getCharacteristic(this.eveChar.Voltage));
         }
         if (this.service.testCharacteristic(this.eveChar.TotalConsumption)) {
           this.service.removeCharacteristic(
-            this.service.getCharacteristic(this.eveChar.TotalConsumption)
-          )
+            this.service.getCharacteristic(this.eveChar.TotalConsumption),
+          );
         }
         if (this.service.testCharacteristic(this.eveChar.ResetTotal)) {
-          this.service.removeCharacteristic(this.service.getCharacteristic(this.eveChar.ResetTotal))
+          this.service.removeCharacteristic(this.service.getCharacteristic(this.eveChar.ResetTotal));
         }
-        break
+        break;
     }
 
     // Set a flag for devices with hardware that use multi-channel format
     if (
-      platform.consts.devices.switchSCM.includes(this.accessory.context.eweUIID) ||
-      platform.consts.devices.switchSCMPower.includes(this.accessory.context.eweUIID)
+      platformConsts.devices.switchSCM.includes(this.accessory.context.eweUIID)
+      || platformConsts.devices.switchSCMPower.includes(this.accessory.context.eweUIID)
     ) {
-      this.isSCM = true
+      this.isSCM = true;
     }
 
     // Add the set handler to the outlet on/off characteristic
     this.service
       .getCharacteristic(this.hapChar.On)
-      .onSet(async value => await this.internalStateUpdate(value))
-    this.cacheState = this.service.getCharacteristic(this.hapChar.On).value ? 'on' : 'off'
+      .onSet(async (value) => this.internalStateUpdate(value));
+    this.cacheState = this.service.getCharacteristic(this.hapChar.On).value ? 'on' : 'off';
 
     // Add a custom characteristic for inverting the switch
     if (!this.service.testCharacteristic(this.cusChar.InvertSwitch)) {
-      this.service.addCharacteristic(this.cusChar.InvertSwitch)
+      this.service.addCharacteristic(this.cusChar.InvertSwitch);
     }
-    this.service.updateCharacteristic(this.cusChar.InvertSwitch, this.cacheState === 'on')
+    this.service.updateCharacteristic(this.cusChar.InvertSwitch, this.cacheState === 'on');
 
     // Add the set handler to invert the switch
-    this.service.getCharacteristic(this.cusChar.InvertSwitch).onSet(value => {
-      this.service.updateCharacteristic(this.hapChar.On, value)
-      this.cacheState = value ? 'on' : 'off'
-      this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
-    })
+    this.service.getCharacteristic(this.cusChar.InvertSwitch).onSet((value) => {
+      this.service.updateCharacteristic(this.hapChar.On, value);
+      this.cacheState = value ? 'on' : 'off';
+      this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState);
+    });
 
     // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
     if (!platform.config.disableNoResponse) {
       this.service.getCharacteristic(this.hapChar.On).onGet(() => {
         if (!this.isOnline) {
-          throw new this.hapErr(-70402)
+          throw new this.hapErr(-70402);
         }
-        return this.service.getCharacteristic(this.hapChar.On).value
-      })
+        return this.service.getCharacteristic(this.hapChar.On).value;
+      });
     }
 
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new platform.eveService('energy', this.accessory, {
-      log: platform.config.debugFakegato ? this.log : () => {}
-    })
+      log: platform.config.debugFakegato ? this.log : () => {},
+    });
 
     // Set up extra features for outlets that provide power readings
     if (this.powerReadings) {
       // TotalConsumption is calculated by the plugin with these context readings
-      if (!this.funcs.hasProperty(this.accessory.context, 'energyReadings')) {
-        this.accessory.context.energyReadings = []
+      if (!hasProperty(this.accessory.context, 'energyReadings')) {
+        this.accessory.context.energyReadings = [];
       }
-      if (!this.funcs.hasProperty(this.accessory.context, 'energyReadingTotal')) {
-        this.accessory.context.energyReadingTotal = 0
+      if (!hasProperty(this.accessory.context, 'energyReadingTotal')) {
+        this.accessory.context.energyReadingTotal = 0;
       }
 
       // Add the set handler to the outlet eve reset total energy characteristic
-      this.service.getCharacteristic(this.eveChar.ResetTotal).onSet(value => {
-        this.accessory.context.energyReadings = []
-        this.accessory.context.energyReadingTotal = 0
-        this.service.updateCharacteristic(this.eveChar.TotalConsumption, 0)
-      })
+      this.service.getCharacteristic(this.eveChar.ResetTotal).onSet(() => {
+        this.accessory.context.energyReadings = [];
+        this.accessory.context.energyReadingTotal = 0;
+        this.service.updateCharacteristic(this.eveChar.TotalConsumption, 0);
+      });
 
       // Set up an interval for the plugin to calculate an approx total consumption
       this.intervalPower = setInterval(() => {
         // Every 30 seconds start with a zero reading
-        let total = 0
+        let total = 0;
 
         // Check we have had readings within the previous 30 seconds
         if (this.accessory.context.energyReadings.length > 0) {
           // Accumulate the total from the energy readings
-          this.accessory.context.energyReadings.forEach(x => {
-            total += x
-          })
+          this.accessory.context.energyReadings.forEach((x) => {
+            total += x;
+          });
 
           // Divide this by the number of entries to get an average W5m
-          total /= this.accessory.context.energyReadings.length
+          total /= this.accessory.context.energyReadings.length;
 
           // Convert this to Wh then kWh
-          total /= 12
-          total /= 1000
+          total /= 12;
+          total /= 1000;
 
           // Accumulate the grand total that Eve reads as the total consumption
-          this.accessory.context.energyReadingTotal += total
+          this.accessory.context.energyReadingTotal += total;
         }
 
         // Reset the array for each 30 second readings
-        this.accessory.context.energyReadings = []
+        this.accessory.context.energyReadings = [];
 
         // Update Eve with the new grand total
         this.service.updateCharacteristic(
           this.eveChar.TotalConsumption,
-          this.accessory.context.energyReadingTotal
-        )
-      }, 30000)
+          this.accessory.context.energyReadingTotal,
+        );
+      }, 30000);
 
       // Set up an interval to get eWeLink to send power updates
       setTimeout(() => {
-        this.internalUIUpdate()
-        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
-      }, 5000)
+        this.internalUIUpdate();
+        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000);
+      }, 5000);
 
       // Stop the intervals on Homebridge shutdown
       platform.api.on('shutdown', () => {
-        clearInterval(this.intervalPoll)
-        clearInterval(this.intervalPower)
-      })
+        clearInterval(this.intervalPoll);
+        clearInterval(this.intervalPower);
+      });
     }
 
     // Output the customised options to the log
+    const normalLogging = this.enableLogging ? 'standard' : 'disable';
     const opts = JSON.stringify({
       inUsePowerThreshold: this.inUsePowerThreshold,
       isInched: true,
-      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
-      showAs: 'outlet'
-    })
-    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
+      logging: this.enableDebugLogging ? 'debug' : normalLogging,
+      showAs: 'outlet',
+    });
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts);
   }
 
-  async internalStateUpdate (value) {
+  async internalStateUpdate(value) {
     try {
-      const newValue = this.cacheState === 'on' ? 'off' : 'on'
-      const params = {}
+      const newValue = this.cacheState === 'on' ? 'off' : 'on';
+      const params = {};
       if (this.isSCM) {
-        params.switches = [{ switch: 'on', outlet: 0 }]
+        params.switches = [{ switch: 'on', outlet: 0 }];
       } else {
-        params.switch = 'on'
+        params.switch = 'on';
       }
-      this.ignoreUpdates = true
+      this.ignoreUpdates = true;
       setTimeout(() => {
-        this.ignoreUpdates = false
-      }, 1500)
-      await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.cacheState = newValue
-      this.service.updateCharacteristic(this.cusChar.InvertSwitch, value)
-      this.accessory.eveService.addEntry({ status: this.cacheState === 'on' ? 1 : 0 })
+        this.ignoreUpdates = false;
+      }, 1500);
+      await this.platform.sendDeviceUpdate(this.accessory, params);
+      this.cacheState = newValue;
+      this.service.updateCharacteristic(this.cusChar.InvertSwitch, value);
+      this.accessory.eveService.addEntry({ status: this.cacheState === 'on' ? 1 : 0 });
       if (this.enableLogging) {
-        this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
+        this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState);
       }
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true);
       setTimeout(() => {
-        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
-      }, 2000)
-      throw new this.hapErr(-70402)
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on');
+      }, 2000);
+      throw new this.hapErr(-70402);
     }
   }
 
-  async internalUIUpdate () {
+  async internalUIUpdate() {
     try {
       // Skip polling if device isn't online
       if (!this.isOnline) {
-        return
+        return;
       }
 
       // Send the params to request the updates
-      await this.platform.sendDeviceUpdate(this.accessory, { uiActive: 120 })
+      await this.platform.sendDeviceUpdate(this.accessory, { uiActive: 120 });
     } catch (err) {
       // Suppress errors here
     }
   }
 
-  async externalUpdate (params) {
+  async externalUpdate(params) {
     try {
       if (!this.isSCM && params.switch === 'on') {
         if (!this.ignoreUpdates) {
-          this.ignoreUpdates = true
+          this.ignoreUpdates = true;
           setTimeout(() => {
-            this.ignoreUpdates = false
-          }, 1500)
-          this.cacheState = this.cacheState === 'on' ? 'off' : 'on'
-          this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
-          this.accessory.eveService.addEntry({ status: this.cacheState === 'on' ? 1 : 0 })
+            this.ignoreUpdates = false;
+          }, 1500);
+          this.cacheState = this.cacheState === 'on' ? 'off' : 'on';
+          this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on');
+          this.accessory.eveService.addEntry({ status: this.cacheState === 'on' ? 1 : 0 });
           if (params.updateSource && this.enableLogging) {
-            this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
+            this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState);
           }
         }
       }
       if (this.isSCM && params.switches && params.switches[0].switch === 'on') {
         if (!this.ignoreUpdates) {
-          this.ignoreUpdates = true
+          this.ignoreUpdates = true;
           setTimeout(() => {
-            this.ignoreUpdates = false
-          }, 1500)
-          this.cacheState = this.cacheState === 'on' ? 'off' : 'on'
-          this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
-          this.accessory.eveService.addEntry({ status: this.cacheState === 'on' ? 1 : 0 })
+            this.ignoreUpdates = false;
+          }, 1500);
+          this.cacheState = this.cacheState === 'on' ? 'off' : 'on';
+          this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on');
+          this.accessory.eveService.addEntry({ status: this.cacheState === 'on' ? 1 : 0 });
           if (params.updateSource && this.enableLogging) {
-            this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
+            this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState);
           }
         }
       }
       if (!this.powerReadings) {
-        return
+        return;
       }
-      let logger = false
-      if (this.funcs.hasProperty(params, 'power')) {
-        const power = parseFloat(params.power)
+      let logger = false;
+      if (hasProperty(params, 'power')) {
+        const power = parseFloat(params.power);
         this.service.updateCharacteristic(
           this.hapChar.OutletInUse,
-          this.cacheState === 'on' && power > this.inUsePowerThreshold
-        )
-        this.service.updateCharacteristic(this.eveChar.CurrentConsumption, power)
-        this.accessory.eveService.addEntry({ power })
-        this.accessory.context.energyReadings.push(power)
-        logger = true
+          this.cacheState === 'on' && power > this.inUsePowerThreshold,
+        );
+        this.service.updateCharacteristic(this.eveChar.CurrentConsumption, power);
+        this.accessory.eveService.addEntry({ power });
+        this.accessory.context.energyReadings.push(power);
+        logger = true;
       }
-      if (this.funcs.hasProperty(params, 'voltage')) {
-        this.service.updateCharacteristic(this.eveChar.Voltage, parseFloat(params.voltage))
-        logger = true
+      if (hasProperty(params, 'voltage')) {
+        this.service.updateCharacteristic(this.eveChar.Voltage, parseFloat(params.voltage));
+        logger = true;
       }
-      if (this.funcs.hasProperty(params, 'current')) {
-        this.service.updateCharacteristic(this.eveChar.ElectricCurrent, parseFloat(params.current))
-        logger = true
+      if (hasProperty(params, 'current')) {
+        this.service.updateCharacteristic(this.eveChar.ElectricCurrent, parseFloat(params.current));
+        logger = true;
       }
       if (params.updateSource && logger && this.enableLogging) {
         this.log(
           '[%s] %s%s%s.',
           this.name,
-          this.funcs.hasProperty(params, 'power')
-            ? this.lang.curPower + ' [' + params.power + 'W]'
+          hasProperty(params, 'power')
+            ? `${this.lang.curPower} [${params.power}W]`
+            : '',
+          hasProperty(params, 'voltage')
+            ? ` ${this.lang.curVolt} [${params.voltage}V]`
             : '',
-          this.funcs.hasProperty(params, 'voltage')
-            ? ' ' + this.lang.curVolt + ' [' + params.voltage + 'V]'
+          hasProperty(params, 'current')
+            ? ` ${this.lang.curCurr} [${params.current}A]`
             : '',
-          this.funcs.hasProperty(params, 'current')
-            ? ' ' + this.lang.curCurr + ' [' + params.current + 'A]'
-            : ''
-        )
+        );
       }
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, false)
+      this.platform.deviceUpdateError(this.accessory, err, false);
     }
   }
 
-  markStatus (isOnline) {
-    this.isOnline = isOnline
+  markStatus(isOnline) {
+    this.isOnline = isOnline;
   }
 
-  async currentState () {
-    const toReturn = {}
-    toReturn.services = ['outlet']
+  async currentState() {
+    const toReturn = {};
+    toReturn.services = ['outlet'];
     toReturn.outlet = {
-      state: this.service.getCharacteristic(this.hapChar.On).value ? 'on' : 'off'
-    }
+      state: this.service.getCharacteristic(this.hapChar.On).value ? 'on' : 'off',
+    };
     if (this.powerReadings) {
       try {
-        toReturn.services.push('power')
+        toReturn.services.push('power');
         toReturn.power = {
           state: await this.platform.sendDeviceUpdate(this.accessory, { hundredDaysKwh: 'get' }),
           voltage: this.service.testCharacteristic(this.eveChar.Voltage)
@@ -402,12 +397,12 @@ module.exports = class deviceOutletSingleInched {
             : undefined,
           current: this.service.testCharacteristic(this.eveChar.ElectricCurrent)
             ? this.service.getCharacteristic(this.eveChar.ElectricCurrent).value
-            : undefined
-        }
+            : undefined,
+        };
       } catch (err) {
         // Suppress errors here
       }
     }
-    return toReturn
+    return toReturn;
   }
 }
diff --git a/lib/device/outlet-single.js b/lib/device/outlet-single.js
index 24e1b504..ee524dfa 100644
--- a/lib/device/outlet-single.js
+++ b/lib/device/outlet-single.js
@@ -1,25 +1,23 @@
-/* jshint node: true, esversion: 10, -W014, -W033 */
-/* eslint-disable new-cap */
-'use strict'
+import platformConsts from '../utils/constants.js';
+import { hasProperty } from '../utils/functions.js';
 
-module.exports = class deviceOutletSingle {
-  constructor (platform, accessory) {
+export default class {
+  constructor(platform, accessory) {
     // Set up variables from the platform
-    this.eveChar = platform.eveChar
-    this.funcs = platform.funcs
-    this.hapChar = platform.api.hap.Characteristic
-    this.hapErr = platform.api.hap.HapStatusError
-    this.hapServ = platform.api.hap.Service
-    this.lang = platform.lang
-    this.log = platform.log
-    this.platform = platform
+    this.eveChar = platform.eveChar;
+    this.hapChar = platform.api.hap.Characteristic;
+    this.hapErr = platform.api.hap.HapStatusError;
+    this.hapServ = platform.api.hap.Service;
+    this.lang = platform.lang;
+    this.log = platform.log;
+    this.platform = platform;
 
     // Set up variables from the accessory
-    this.name = accessory.displayName
-    this.accessory = accessory
+    this.name = accessory.displayName;
+    this.accessory = accessory;
 
     // Initially set the online flag as true (to be then updated as false if necessary)
-    this.isOnline = true
+    this.isOnline = true;
 
     /*
     UIID 1/6/14/24/27/112/1009/1256/7004: single switch, no power readings
@@ -30,338 +28,335 @@ module.exports = class deviceOutletSingle {
     */
 
     // Set up custom variables for this device type
-    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
-    this.inUsePowerThreshold =
-      deviceConf && deviceConf.inUsePowerThreshold
-        ? deviceConf.inUsePowerThreshold
-        : platform.consts.defaultValues.inUsePowerThreshold
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId] || {};
+    this.inUsePowerThreshold = deviceConf.inUsePowerThreshold || platformConsts.defaultValues.inUsePowerThreshold;
 
     // Set the correct logging variables for this accessory
-    this.enableLogging = !platform.config.disableDeviceLogging
-    this.enableDebugLogging = platform.config.debug
-    if (deviceConf && deviceConf.overrideLogging) {
-      switch (deviceConf.overrideLogging) {
-        case 'standard':
-          this.enableLogging = true
-          this.enableDebugLogging = false
-          break
-        case 'debug':
-          this.enableLogging = true
-          this.enableDebugLogging = true
-          break
-        case 'disable':
-          this.enableLogging = false
-          this.enableDebugLogging = false
-          break
-      }
+    switch (deviceConf.overrideLogging) {
+      case 'standard':
+        this.enableLogging = true;
+        this.enableDebugLogging = false;
+        break;
+      case 'debug':
+        this.enableLogging = true;
+        this.enableDebugLogging = true;
+        break;
+      case 'disable':
+        this.enableLogging = false;
+        this.enableDebugLogging = false;
+        break;
+      default:
+        this.enableLogging = !platform.config.disableDeviceLogging;
+        this.enableDebugLogging = platform.config.debug;
+        break;
     }
 
     // If the accessory has a switch service then remove it
     if (this.accessory.getService(this.hapServ.Switch)) {
-      this.accessory.removeService(this.accessory.getService(this.hapServ.Switch))
+      this.accessory.removeService(this.accessory.getService(this.hapServ.Switch));
     }
 
     // Add the outlet service if it doesn't already exist
-    this.service =
-      this.accessory.getService(this.hapServ.Outlet) ||
-      this.accessory.addService(this.hapServ.Outlet)
+    this.service = this.accessory.getService(this.hapServ.Outlet)
+      || this.accessory.addService(this.hapServ.Outlet);
 
     switch (this.accessory.context.eweUIID) {
       case 5:
       case 182:
         // Add Eve power characteristics
-        this.powerReadings = true
+        this.powerReadings = true;
         if (!this.service.testCharacteristic(this.hapChar.OutletInUse)) {
-          this.service.addCharacteristic(this.hapChar.OutletInUse)
+          this.service.addCharacteristic(this.hapChar.OutletInUse);
         }
         if (!this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
-          this.service.addCharacteristic(this.eveChar.CurrentConsumption)
+          this.service.addCharacteristic(this.eveChar.CurrentConsumption);
         }
         if (!this.service.testCharacteristic(this.eveChar.TotalConsumption)) {
-          this.service.addCharacteristic(this.eveChar.TotalConsumption)
+          this.service.addCharacteristic(this.eveChar.TotalConsumption);
         }
         if (!this.service.testCharacteristic(this.eveChar.ResetTotal)) {
-          this.service.addCharacteristic(this.eveChar.ResetTotal)
+          this.service.addCharacteristic(this.eveChar.ResetTotal);
         }
 
         // Remove unused Eve characteristics
         if (this.service.testCharacteristic(this.eveChar.ElectricCurrent)) {
           this.service.removeCharacteristic(
-            this.service.getCharacteristic(this.eveChar.ElectricCurrent)
-          )
+            this.service.getCharacteristic(this.eveChar.ElectricCurrent),
+          );
         }
         if (this.service.testCharacteristic(this.eveChar.Voltage)) {
-          this.service.removeCharacteristic(this.service.getCharacteristic(this.eveChar.Voltage))
+          this.service.removeCharacteristic(this.service.getCharacteristic(this.eveChar.Voltage));
         }
-        break
+        break;
       case 32:
         // Add Eve power characteristics
-        this.powerReadings = true
+        this.powerReadings = true;
         if (!this.service.testCharacteristic(this.hapChar.OutletInUse)) {
-          this.service.addCharacteristic(this.hapChar.OutletInUse)
+          this.service.addCharacteristic(this.hapChar.OutletInUse);
         }
         if (!this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
-          this.service.addCharacteristic(this.eveChar.CurrentConsumption)
+          this.service.addCharacteristic(this.eveChar.CurrentConsumption);
         }
         if (!this.service.testCharacteristic(this.eveChar.ElectricCurrent)) {
-          this.service.addCharacteristic(this.eveChar.ElectricCurrent)
+          this.service.addCharacteristic(this.eveChar.ElectricCurrent);
         }
         if (!this.service.testCharacteristic(this.eveChar.Voltage)) {
-          this.service.addCharacteristic(this.eveChar.Voltage)
+          this.service.addCharacteristic(this.eveChar.Voltage);
         }
         if (!this.service.testCharacteristic(this.eveChar.TotalConsumption)) {
-          this.service.addCharacteristic(this.eveChar.TotalConsumption)
+          this.service.addCharacteristic(this.eveChar.TotalConsumption);
         }
         if (!this.service.testCharacteristic(this.eveChar.ResetTotal)) {
-          this.service.addCharacteristic(this.eveChar.ResetTotal)
+          this.service.addCharacteristic(this.eveChar.ResetTotal);
         }
-        break
+        break;
       default:
         // Remove unused Eve characteristics
         if (this.service.testCharacteristic(this.hapChar.OutletInUse)) {
           this.service.removeCharacteristic(
-            this.service.getCharacteristic(this.eveChar.OutletInUse)
-          )
+            this.service.getCharacteristic(this.eveChar.OutletInUse),
+          );
         }
         if (this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
           this.service.removeCharacteristic(
-            this.service.getCharacteristic(this.eveChar.CurrentConsumption)
-          )
+            this.service.getCharacteristic(this.eveChar.CurrentConsumption),
+          );
         }
         if (this.service.testCharacteristic(this.eveChar.ElectricCurrent)) {
           this.service.removeCharacteristic(
-            this.service.getCharacteristic(this.eveChar.ElectricCurrent)
-          )
+            this.service.getCharacteristic(this.eveChar.ElectricCurrent),
+          );
         }
         if (this.service.testCharacteristic(this.eveChar.Voltage)) {
-          this.service.removeCharacteristic(this.service.getCharacteristic(this.eveChar.Voltage))
+          this.service.removeCharacteristic(this.service.getCharacteristic(this.eveChar.Voltage));
         }
         if (this.service.testCharacteristic(this.eveChar.TotalConsumption)) {
           this.service.removeCharacteristic(
-            this.service.getCharacteristic(this.eveChar.TotalConsumption)
-          )
+            this.service.getCharacteristic(this.eveChar.TotalConsumption),
+          );
         }
         if (this.service.testCharacteristic(this.eveChar.ResetTotal)) {
-          this.service.removeCharacteristic(this.service.getCharacteristic(this.eveChar.ResetTotal))
+          this.service.removeCharacteristic(this.service.getCharacteristic(this.eveChar.ResetTotal));
         }
-        break
+        break;
     }
 
     // Set a flag for devices with hardware that use multi-channel format
     if (
-      platform.consts.devices.switchSCM.includes(this.accessory.context.eweUIID) ||
-      platform.consts.devices.switchSCMPower.includes(this.accessory.context.eweUIID)
+      platformConsts.devices.switchSCM.includes(this.accessory.context.eweUIID)
+      || platformConsts.devices.switchSCMPower.includes(this.accessory.context.eweUIID)
     ) {
-      this.isSCM = true
+      this.isSCM = true;
     }
 
     // Add the set handler to the outlet on/off characteristic
     this.service
       .getCharacteristic(this.hapChar.On)
-      .onSet(async value => await this.internalStateUpdate(value))
+      .onSet(async (value) => this.internalStateUpdate(value));
 
     // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
     if (!platform.config.disableNoResponse) {
       this.service.getCharacteristic(this.hapChar.On).onGet(() => {
         if (!this.isOnline) {
-          throw new this.hapErr(-70402)
+          throw new this.hapErr(-70402);
         }
-        return this.service.getCharacteristic(this.hapChar.On).value
-      })
+        return this.service.getCharacteristic(this.hapChar.On).value;
+      });
     }
 
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new platform.eveService('energy', this.accessory, {
-      log: platform.config.debugFakegato ? this.log : () => {}
-    })
+      log: platform.config.debugFakegato ? this.log : () => {},
+    });
 
     // Set up extra features for outlets that provide power readings
     if (this.powerReadings) {
       // TotalConsumption is calculated by the plugin with these context readings
-      if (!this.funcs.hasProperty(this.accessory.context, 'energyReadings')) {
-        this.accessory.context.energyReadings = []
+      if (!hasProperty(this.accessory.context, 'energyReadings')) {
+        this.accessory.context.energyReadings = [];
       }
-      if (!this.funcs.hasProperty(this.accessory.context, 'energyReadingTotal')) {
-        this.accessory.context.energyReadingTotal = 0
+      if (!hasProperty(this.accessory.context, 'energyReadingTotal')) {
+        this.accessory.context.energyReadingTotal = 0;
       }
 
       // Add the set handler to the outlet eve reset total energy characteristic
-      this.service.getCharacteristic(this.eveChar.ResetTotal).onSet(value => {
-        this.accessory.context.energyReadings = []
-        this.accessory.context.energyReadingTotal = 0
-        this.service.updateCharacteristic(this.eveChar.TotalConsumption, 0)
-      })
+      this.service.getCharacteristic(this.eveChar.ResetTotal).onSet(() => {
+        this.accessory.context.energyReadings = [];
+        this.accessory.context.energyReadingTotal = 0;
+        this.service.updateCharacteristic(this.eveChar.TotalConsumption, 0);
+      });
 
       // Set up an interval for the plugin to calculate an approx total consumption
       this.intervalPower = setInterval(() => {
         // Every 30 seconds start with a zero reading
-        let total = 0
+        let total = 0;
 
         // Check we have had readings within the previous 30 seconds
         if (this.accessory.context.energyReadings.length > 0) {
           // Accumulate the total from the energy readings
-          this.accessory.context.energyReadings.forEach(x => {
-            total += x
-          })
+          this.accessory.context.energyReadings.forEach((x) => {
+            total += x;
+          });
 
           // Divide this by the number of entries to get an average W5m
-          total /= this.accessory.context.energyReadings.length
+          total /= this.accessory.context.energyReadings.length;
 
           // Convert this to Wh then kWh
-          total /= 12
-          total /= 1000
+          total /= 12;
+          total /= 1000;
 
           // Accumulate the grand total that Eve reads as the total consumption
-          this.accessory.context.energyReadingTotal += total
+          this.accessory.context.energyReadingTotal += total;
         }
 
         // Reset the array for each 30 second readings
-        this.accessory.context.energyReadings = []
+        this.accessory.context.energyReadings = [];
 
         // Update Eve with the new grand total
         this.service.updateCharacteristic(
           this.eveChar.TotalConsumption,
-          this.accessory.context.energyReadingTotal
-        )
-      }, 30000)
+          this.accessory.context.energyReadingTotal,
+        );
+      }, 30000);
 
       // Set up an interval to get eWeLink to send power updates
       setTimeout(() => {
-        this.internalUIUpdate()
-        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
-      }, 5000)
+        this.internalUIUpdate();
+        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000);
+      }, 5000);
 
       // Stop the intervals on Homebridge shutdown
       platform.api.on('shutdown', () => {
-        clearInterval(this.intervalPoll)
-        clearInterval(this.intervalPower)
-      })
+        clearInterval(this.intervalPoll);
+        clearInterval(this.intervalPower);
+      });
     }
 
     // Output the customised options to the log
+    const normalLogging = this.enableLogging ? 'standard' : 'disable';
     const opts = JSON.stringify({
       inUsePowerThreshold: this.inUsePowerThreshold,
-      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
-      showAs: 'outlet'
-    })
-    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
+      logging: this.enableDebugLogging ? 'debug' : normalLogging,
+      showAs: 'outlet',
+    });
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts);
   }
 
-  async internalStateUpdate (value) {
+  async internalStateUpdate(value) {
     try {
-      const newValue = value ? 'on' : 'off'
+      const newValue = value ? 'on' : 'off';
       if (newValue === this.cacheState) {
-        return
+        return;
       }
-      const params = {}
+      const params = {};
       if (this.isSCM) {
-        params.switches = [{ switch: newValue, outlet: 0 }]
+        params.switches = [{ switch: newValue, outlet: 0 }];
       } else {
-        params.switch = newValue
+        params.switch = newValue;
       }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.cacheState = newValue
-      this.accessory.eveService.addEntry({ status: value ? 1 : 0 })
+      await this.platform.sendDeviceUpdate(this.accessory, params);
+      this.cacheState = newValue;
+      this.accessory.eveService.addEntry({ status: value ? 1 : 0 });
       if (this.enableLogging) {
-        this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
+        this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState);
       }
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true);
       setTimeout(() => {
-        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
-      }, 2000)
-      throw new this.hapErr(-70402)
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on');
+      }, 2000);
+      throw new this.hapErr(-70402);
     }
   }
 
-  async internalUIUpdate () {
+  async internalUIUpdate() {
     try {
       // Skip polling if device isn't online
       if (!this.isOnline) {
-        return
+        return;
       }
 
       // Send the params to request the updates
-      await this.platform.sendDeviceUpdate(this.accessory, { uiActive: 120 })
+      await this.platform.sendDeviceUpdate(this.accessory, { uiActive: 120 });
     } catch (err) {
       // Suppress errors here
     }
   }
 
-  async externalUpdate (params) {
+  async externalUpdate(params) {
     try {
       if (!this.isSCM && params.switch && params.switch !== this.cacheState) {
-        this.cacheState = params.switch
-        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
-        this.accessory.eveService.addEntry({ status: this.cacheState === 'on' ? 1 : 0 })
+        this.cacheState = params.switch;
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on');
+        this.accessory.eveService.addEntry({ status: this.cacheState === 'on' ? 1 : 0 });
         if (params.updateSource && this.enableLogging) {
-          this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
+          this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState);
         }
       }
       if (this.isSCM && params.switches && params.switches[0].switch !== this.cacheState) {
-        this.cacheState = params.switches[0].switch
-        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
-        this.accessory.eveService.addEntry({ status: this.cacheState === 'on' ? 1 : 0 })
+        this.cacheState = params.switches[0].switch;
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on');
+        this.accessory.eveService.addEntry({ status: this.cacheState === 'on' ? 1 : 0 });
         if (params.updateSource && this.enableLogging) {
-          this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
+          this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState);
         }
       }
       if (!this.powerReadings) {
-        return
+        return;
       }
-      let logger = false
-      if (this.funcs.hasProperty(params, 'power')) {
-        const power = parseFloat(params.power)
+      let logger = false;
+      if (hasProperty(params, 'power')) {
+        const power = parseFloat(params.power);
         this.service.updateCharacteristic(
           this.hapChar.OutletInUse,
-          this.cacheState === 'on' && power > this.inUsePowerThreshold
-        )
-        this.service.updateCharacteristic(this.eveChar.CurrentConsumption, power)
-        this.accessory.eveService.addEntry({ power })
-        this.accessory.context.energyReadings.push(power)
-        logger = true
+          this.cacheState === 'on' && power > this.inUsePowerThreshold,
+        );
+        this.service.updateCharacteristic(this.eveChar.CurrentConsumption, power);
+        this.accessory.eveService.addEntry({ power });
+        this.accessory.context.energyReadings.push(power);
+        logger = true;
       }
-      if (this.funcs.hasProperty(params, 'voltage')) {
-        this.service.updateCharacteristic(this.eveChar.Voltage, parseFloat(params.voltage))
-        logger = true
+      if (hasProperty(params, 'voltage')) {
+        this.service.updateCharacteristic(this.eveChar.Voltage, parseFloat(params.voltage));
+        logger = true;
       }
-      if (this.funcs.hasProperty(params, 'current')) {
-        this.service.updateCharacteristic(this.eveChar.ElectricCurrent, parseFloat(params.current))
-        logger = true
+      if (hasProperty(params, 'current')) {
+        this.service.updateCharacteristic(this.eveChar.ElectricCurrent, parseFloat(params.current));
+        logger = true;
       }
       if (params.updateSource && logger && this.enableLogging) {
         this.log(
           '[%s] %s%s%s.',
           this.name,
-          this.funcs.hasProperty(params, 'power')
-            ? this.lang.curPower + ' [' + params.power + 'W]'
+          hasProperty(params, 'power')
+            ? `${this.lang.curPower} [${params.power}W]`
+            : '',
+          hasProperty(params, 'voltage')
+            ? ` ${this.lang.curVolt} [${params.voltage}V]`
             : '',
-          this.funcs.hasProperty(params, 'voltage')
-            ? ' ' + this.lang.curVolt + ' [' + params.voltage + 'V]'
+          hasProperty(params, 'current')
+            ? ` ${this.lang.curCurr} [${params.current}A]`
             : '',
-          this.funcs.hasProperty(params, 'current')
-            ? ' ' + this.lang.curCurr + ' [' + params.current + 'A]'
-            : ''
-        )
+        );
       }
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, false)
+      this.platform.deviceUpdateError(this.accessory, err, false);
     }
   }
 
-  markStatus (isOnline) {
-    this.isOnline = isOnline
+  markStatus(isOnline) {
+    this.isOnline = isOnline;
   }
 
-  async currentState () {
-    const toReturn = {}
-    toReturn.services = ['outlet']
+  async currentState() {
+    const toReturn = {};
+    toReturn.services = ['outlet'];
     toReturn.outlet = {
-      state: this.service.getCharacteristic(this.hapChar.On).value ? 'on' : 'off'
-    }
+      state: this.service.getCharacteristic(this.hapChar.On).value ? 'on' : 'off',
+    };
     if (this.powerReadings) {
       try {
-        toReturn.services.push('power')
+        toReturn.services.push('power');
         toReturn.power = {
           state: await this.platform.sendDeviceUpdate(this.accessory, { hundredDaysKwh: 'get' }),
           voltage: this.service.testCharacteristic(this.eveChar.Voltage)
@@ -372,12 +367,12 @@ module.exports = class deviceOutletSingle {
             : undefined,
           current: this.service.testCharacteristic(this.eveChar.ElectricCurrent)
             ? this.service.getCharacteristic(this.eveChar.ElectricCurrent).value
-            : undefined
-        }
+            : undefined,
+        };
       } catch (err) {
         // Suppress errors here
       }
     }
-    return toReturn
+    return toReturn;
   }
 }
diff --git a/lib/device/panel.js b/lib/device/panel.js
index daf5917c..72327ec8 100644
--- a/lib/device/panel.js
+++ b/lib/device/panel.js
@@ -1,115 +1,110 @@
-/* jshint node: true, esversion: 10, -W014, -W033 */
-/* eslint-disable new-cap */
-'use strict'
+import platformConsts from '../utils/constants.js';
+import { hasProperty, parseError } from '../utils/functions.js';
 
-module.exports = class deviceSwitchSingle {
-  constructor (platform, accessory) {
+export default class {
+  constructor(platform, accessory) {
     // Set up variables from the platform
-    this.funcs = platform.funcs
-    this.hapChar = platform.api.hap.Characteristic
-    this.hapErr = platform.api.hap.HapStatusError
-    this.hapServ = platform.api.hap.Service
-    this.lang = platform.lang
-    this.log = platform.log
-    this.platform = platform
+    this.hapChar = platform.api.hap.Characteristic;
+    this.hapErr = platform.api.hap.HapStatusError;
+    this.hapServ = platform.api.hap.Service;
+    this.lang = platform.lang;
+    this.log = platform.log;
+    this.platform = platform;
 
     // Set up variables from the accessory
-    this.name = accessory.displayName
-    this.accessory = accessory
+    this.name = accessory.displayName;
+    this.accessory = accessory;
 
     // Initially set the online flag as true (to be then updated as false if necessary)
-    this.isOnline = true
+    this.isOnline = true;
 
     // Set up custom variables for this device type
-    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
-    this.tempOffset =
-      deviceConf && deviceConf.offset ? deviceConf.offset : platform.consts.defaultValues.offset
-    this.tempOffsetFactor = deviceConf && deviceConf.offsetFactor
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId] || {};
+    this.tempOffset = deviceConf.offset || platformConsts.defaultValues.offset;
+    this.tempOffsetFactor = deviceConf.offsetFactor;
 
     // Set the correct logging variables for this accessory
-    this.enableLogging = !platform.config.disableDeviceLogging
-    this.enableDebugLogging = platform.config.debug
-    if (deviceConf && deviceConf.overrideLogging) {
-      switch (deviceConf.overrideLogging) {
-        case 'standard':
-          this.enableLogging = true
-          this.enableDebugLogging = false
-          break
-        case 'debug':
-          this.enableLogging = true
-          this.enableDebugLogging = true
-          break
-        case 'disable':
-          this.enableLogging = false
-          this.enableDebugLogging = false
-          break
-      }
+    switch (deviceConf.overrideLogging) {
+      case 'standard':
+        this.enableLogging = true;
+        this.enableDebugLogging = false;
+        break;
+      case 'debug':
+        this.enableLogging = true;
+        this.enableDebugLogging = true;
+        break;
+      case 'disable':
+        this.enableLogging = false;
+        this.enableDebugLogging = false;
+        break;
+      default:
+        this.enableLogging = !platform.config.disableDeviceLogging;
+        this.enableDebugLogging = platform.config.debug;
+        break;
     }
 
     // Add the temperature sensor service if it doesn't already exist
-    this.tempService =
-      this.accessory.getService(this.hapServ.TemperatureSensor) ||
-      this.accessory.addService(this.hapServ.TemperatureSensor)
+    this.tempService = this.accessory.getService(this.hapServ.TemperatureSensor)
+      || this.accessory.addService(this.hapServ.TemperatureSensor);
 
     // Set custom properties of the current temperature characteristic
     this.tempService.getCharacteristic(this.hapChar.CurrentTemperature).setProps({
-      minStep: 0.1
-    })
-    this.cacheTemp = this.tempService.getCharacteristic(this.hapChar.CurrentTemperature).value
-    this.updateCache()
+      minStep: 0.1,
+    });
+    this.cacheTemp = this.tempService.getCharacteristic(this.hapChar.CurrentTemperature).value;
+    this.updateCache();
 
     // Add the outlet services if they don't already exist
-    this.service1 =
-      this.accessory.getService('Channel 1') ||
-      this.accessory.addService(this.hapServ.Switch, 'Channel 1', 'channel1')
-    this.service2 =
-      this.accessory.getService('Channel 2') ||
-      this.accessory.addService(this.hapServ.Switch, 'Channel 2', 'channel2')
+    this.service1 = this.accessory.getService('Channel 1')
+      || this.accessory.addService(this.hapServ.Switch, 'Channel 1', 'channel1');
+    this.service2 = this.accessory.getService('Channel 2')
+      || this.accessory.addService(this.hapServ.Switch, 'Channel 2', 'channel2');
 
     // Add the set handler to the switch on/off characteristic
-    this.service1.getCharacteristic(this.hapChar.On).onSet(async value => {
-      await this.internalStateUpdate(this.service1, value)
-    })
-    this.cacheState1 = this.service1.getCharacteristic(this.hapChar.On).value ? 'on' : 'off'
-    this.service2.getCharacteristic(this.hapChar.On).onSet(async value => {
-      await this.internalStateUpdate(this.service2, value)
-    })
-    this.cacheState2 = this.service2.getCharacteristic(this.hapChar.On).value ? 'on' : 'off'
+    this.service1.getCharacteristic(this.hapChar.On).onSet(async (value) => {
+      this.internalStateUpdate(this.service1, value);
+    });
+    this.cacheState1 = this.service1.getCharacteristic(this.hapChar.On).value ? 'on' : 'off';
+    this.service2.getCharacteristic(this.hapChar.On).onSet(async (value) => {
+      this.internalStateUpdate(this.service2, value);
+    });
+    this.cacheState2 = this.service2.getCharacteristic(this.hapChar.On).value ? 'on' : 'off';
 
     // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
     if (!platform.config.disableNoResponse) {
       this.tempService.getCharacteristic(this.hapChar.CurrentTemperature).onGet(() => {
         if (!this.isOnline) {
-          throw new this.hapErr(-70402)
+          throw new this.hapErr(-70402);
         }
-        return this.tempService.getCharacteristic(this.hapChar.CurrentTemperature).value
-      })
+        return this.tempService.getCharacteristic(this.hapChar.CurrentTemperature).value;
+      });
       this.service1.getCharacteristic(this.hapChar.On).onGet(() => {
         if (!this.isOnline) {
-          throw new this.hapErr(-70402)
+          throw new this.hapErr(-70402);
         }
-        return this.service1.getCharacteristic(this.hapChar.On).value
-      })
+        return this.service1.getCharacteristic(this.hapChar.On).value;
+      });
       this.service2.getCharacteristic(this.hapChar.On).onGet(() => {
         if (!this.isOnline) {
-          throw new this.hapErr(-70402)
+          throw new this.hapErr(-70402);
         }
-        return this.service1.getCharacteristic(this.hapChar.On).value
-      })
+        return this.service1.getCharacteristic(this.hapChar.On).value;
+      });
     }
 
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new platform.eveService('custom', this.accessory, {
-      log: platform.config.debugFakegato ? this.log : () => {}
-    })
+      log: platform.config.debugFakegato ? this.log : () => {},
+    });
 
     // Output the customised options to the log
+    const normalLogging = this.enableLogging ? 'standard' : 'disable';
     const opts = JSON.stringify({
-      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
+      logging: this.enableDebugLogging ? 'debug' : normalLogging,
       offset: this.tempOffset,
-      offsetFactor: this.tempOffsetFactor
-    })
-    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
+      offsetFactor: this.tempOffsetFactor,
+    });
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts);
 
     /*
       {
@@ -217,160 +212,164 @@ module.exports = class deviceSwitchSingle {
     */
   }
 
-  async internalStateUpdate (service, value) {
+  async internalStateUpdate(service, value) {
     try {
-      const newValue = value ? 'on' : 'off'
-      const params = { switches: [] }
+      const newValue = value ? 'on' : 'off';
+      const params = { switches: [] };
       switch (service) {
         case this.service1: {
           if (newValue === this.cacheState1) {
-            return
+            return;
           }
-          params.switches.push({ outlet: 0, switch: value ? 'on' : 'off' })
-          break
+          params.switches.push({ outlet: 0, switch: value ? 'on' : 'off' });
+          break;
         }
         case this.service2: {
           if (newValue === this.cacheState2) {
-            return
+            return;
           }
-          params.switches.push({ outlet: 1, switch: value ? 'on' : 'off' })
-          break
+          params.switches.push({ outlet: 1, switch: value ? 'on' : 'off' });
+          break;
         }
+        default:
+          return;
       }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
+      await this.platform.sendDeviceUpdate(this.accessory, params);
       switch (service) {
         case this.service1: {
-          this.cacheState1 = newValue
+          this.cacheState1 = newValue;
           if (this.enableLogging) {
             this.log(
               '[%s] [%s] %s [%s].',
               this.name,
               service.displayName,
               this.lang.curState,
-              this.cacheState1
-            )
+              this.cacheState1,
+            );
           }
-          break
+          break;
         }
         case this.service2: {
-          this.cacheState2 = newValue
+          this.cacheState2 = newValue;
           if (this.enableLogging) {
             this.log(
               '[%s] [%s] %s [%s].',
               this.name,
               service.displayName,
               this.lang.curState,
-              this.cacheState2
-            )
+              this.cacheState2,
+            );
           }
-          break
+          break;
         }
+        default:
+          return;
       }
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true);
       setTimeout(() => {
         service.updateCharacteristic(
           this.hapChar.On,
-          service.getCharacteristic(this.hapChar.On).value
-        )
-      }, 2000)
-      throw new this.hapErr(-70402)
+          service.getCharacteristic(this.hapChar.On).value,
+        );
+      }, 2000);
+      throw new this.hapErr(-70402);
     }
   }
 
-  async externalUpdate (params) {
+  async externalUpdate(params) {
     try {
       // Switches
       if (params.switches && Array.isArray(params.switches)) {
         if (params.switches[0]) {
-          const newValue = params.switches[0].switch
+          const newValue = params.switches[0].switch;
           if (newValue !== this.cacheState1) {
-            this.cacheState1 = newValue
-            this.service1.updateCharacteristic(this.hapChar.On, this.cacheState1 === 'on')
+            this.cacheState1 = newValue;
+            this.service1.updateCharacteristic(this.hapChar.On, this.cacheState1 === 'on');
             if (params.updateSource && this.enableLogging) {
               this.log(
                 '[%s] [%s] %s [%s].',
                 this.name,
                 this.service1.displayName,
                 this.lang.curState,
-                this.cacheState1
-              )
+                this.cacheState1,
+              );
             }
           }
         }
         if (params.switches[1]) {
-          const newValue = params.switches[1].switch
+          const newValue = params.switches[1].switch;
           if (newValue !== this.cacheState2) {
-            this.cacheState2 = newValue
-            this.service2.updateCharacteristic(this.hapChar.On, this.cacheState2 === 'on')
+            this.cacheState2 = newValue;
+            this.service2.updateCharacteristic(this.hapChar.On, this.cacheState2 === 'on');
             if (params.updateSource && this.enableLogging) {
               this.log(
                 '[%s] [%s] %s [%s].',
                 this.name,
                 this.service2.displayName,
                 this.lang.curState,
-                this.cacheState2
-              )
+                this.cacheState2,
+              );
             }
           }
         }
       }
 
       // Current temperature
-      if (this.funcs.hasProperty(params, 'temperature')) {
-        let newTemp = Number(params.temperature)
+      if (hasProperty(params, 'temperature')) {
+        let newTemp = Number(params.temperature);
         if (this.tempOffsetFactor) {
-          newTemp *= this.tempOffset
+          newTemp *= this.tempOffset;
         } else {
-          newTemp += this.tempOffset
+          newTemp += this.tempOffset;
         }
         if (newTemp !== this.cacheTemp) {
-          this.cacheTemp = newTemp
-          this.tempService.updateCharacteristic(this.hapChar.CurrentTemperature, this.cacheTemp)
-          this.accessory.eveService.addEntry({ temp: this.cacheTemp })
+          this.cacheTemp = newTemp;
+          this.tempService.updateCharacteristic(this.hapChar.CurrentTemperature, this.cacheTemp);
+          this.accessory.eveService.addEntry({ temp: this.cacheTemp });
           if (params.updateSource && this.enableLogging) {
-            this.log('[%s] %s [%s°C].', this.name, this.lang.curTemp, this.cacheTemp)
+            this.log('[%s] %s [%s°C].', this.name, this.lang.curTemp, this.cacheTemp);
           }
 
           // Update the cache file with the new temperature
-          this.updateCache()
+          this.updateCache();
         }
       }
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, false)
+      this.platform.deviceUpdateError(this.accessory, err, false);
     }
   }
 
-  async updateCache () {
+  async updateCache() {
     // Don't continue if the storage client hasn't initialised properly
     if (!this.platform.storageClientData) {
-      return
+      return;
     }
 
     // Attempt to save the new temperature to the cache
     try {
       await this.platform.storageData.setItem(
-        this.accessory.context.eweDeviceId + '_temp',
-        this.cacheTemp
-      )
+        `${this.accessory.context.eweDeviceId}_temp`,
+        this.cacheTemp,
+      );
     } catch (err) {
       if (this.enableLogging) {
-        const eText = this.funcs.parseError(err)
-        this.log.warn('[%s] %s %s.', this.name, this.lang.storageWriteErr, eText)
+        const eText = parseError(err);
+        this.log.warn('[%s] %s %s.', this.name, this.lang.storageWriteErr, eText);
       }
     }
   }
 
-  currentState () {
-    const toReturn = {}
-    toReturn.services = ['temperature']
+  currentState() {
+    const toReturn = {};
+    toReturn.services = ['temperature'];
     toReturn.temperature = {
-      current: this.tempService.getCharacteristic(this.hapChar.CurrentTemperature).value
-    }
-    return toReturn
+      current: this.tempService.getCharacteristic(this.hapChar.CurrentTemperature).value,
+    };
+    return toReturn;
   }
 
-  markStatus (isOnline) {
-    this.isOnline = isOnline
+  markStatus(isOnline) {
+    this.isOnline = isOnline;
   }
 }
diff --git a/lib/device/rf-bridge.js b/lib/device/rf-bridge.js
index db50ffdb..2881c48b 100644
--- a/lib/device/rf-bridge.js
+++ b/lib/device/rf-bridge.js
@@ -1,295 +1,295 @@
-/* jshint node: true, esversion: 10, -W014, -W033 */
-/* eslint-disable new-cap */
-'use strict'
+import platformConsts from '../utils/constants.js';
+import { hasProperty, parseError, sleep } from '../utils/functions.js';
 
-module.exports = class deviceRFBridge {
-  constructor (platform, accessory, devicesInHB) {
+export default class {
+  constructor(platform, accessory, devicesInHB) {
     // Set up variables from the platform
-    this.consts = platform.consts
-    this.devicesInHB = devicesInHB
-    this.disableDeviceLogging = platform.config.disableDeviceLogging
-    this.eveChar = platform.eveChar
-    this.funcs = platform.funcs
-    this.hapChar = platform.api.hap.Characteristic
-    this.hapErr = platform.api.hap.HapStatusError
-    this.hapServ = platform.api.hap.Service
-    this.lang = platform.lang
-    this.log = platform.log
-    this.platform = platform
+    this.devicesInHB = devicesInHB;
+    this.disableDeviceLogging = platform.config.disableDeviceLogging;
+    this.eveChar = platform.eveChar;
+    this.hapChar = platform.api.hap.Characteristic;
+    this.hapErr = platform.api.hap.HapStatusError;
+    this.hapServ = platform.api.hap.Service;
+    this.lang = platform.lang;
+    this.log = platform.log;
+    this.platform = platform;
 
     // Set up variables from the accessory
-    this.name = accessory.displayName
-    this.accessory = accessory
+    this.name = accessory.displayName;
+    this.accessory = accessory;
 
     // Initially set the online flag as true (to be then updated as false if necessary)
-    this.isOnline = true
+    this.isOnline = true;
 
     // Set up custom variables for this device type
-    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
-    const resetOnStartup = deviceConf && deviceConf.resetOnStartup
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId] || {};
+    const { resetOnStartup } = deviceConf;
 
     // Set the correct logging variables for this accessory
-    this.enableLogging = !platform.config.disableDeviceLogging
-    this.enableDebugLogging = platform.config.debug
-    if (deviceConf && deviceConf.overrideLogging) {
-      switch (deviceConf.overrideLogging) {
-        case 'standard':
-          this.enableLogging = true
-          this.enableDebugLogging = false
-          break
-        case 'debug':
-          this.enableLogging = true
-          this.enableDebugLogging = true
-          break
-        case 'disable':
-          this.enableLogging = false
-          this.enableDebugLogging = false
-          break
-      }
+    switch (deviceConf.overrideLogging) {
+      case 'standard':
+        this.enableLogging = true;
+        this.enableDebugLogging = false;
+        break;
+      case 'debug':
+        this.enableLogging = true;
+        this.enableDebugLogging = true;
+        break;
+      case 'disable':
+        this.enableLogging = false;
+        this.enableDebugLogging = false;
+        break;
+      default:
+        this.enableLogging = !platform.config.disableDeviceLogging;
+        this.enableDebugLogging = platform.config.debug;
+        break;
     }
 
     // Output the customised options to the log
+    const normalLogging = this.enableLogging ? 'standard' : 'disable';
     const opts = JSON.stringify({
-      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
-      resetOnStartup
-    })
-    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
+      logging: this.enableDebugLogging ? 'debug' : normalLogging,
+      resetOnStartup,
+    });
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts);
   }
 
-  async externalUpdate (params) {
+  async externalUpdate(params) {
     try {
-      if (!this.funcs.hasProperty(params, 'updateSource')) {
-        return
+      if (!hasProperty(params, 'updateSource')) {
+        return;
       }
-      const timeNow = new Date()
-      let subAccessory = false
-      let channel
+      const timeNow = new Date();
+      let subAccessory = false;
+      let channel;
       if (
-        this.funcs.hasProperty(params, 'cmd') &&
-        params.cmd === 'transmit' &&
-        this.funcs.hasProperty(params, 'rfChl')
+        hasProperty(params, 'cmd')
+        && params.cmd === 'transmit'
+        && hasProperty(params, 'rfChl')
       ) {
         // RF Button
-        this.devicesInHB.forEach(acc => {
+        this.devicesInHB.forEach((acc) => {
           if (
-            acc.context.eweDeviceId === this.accessory.context.eweDeviceId &&
-            this.funcs.hasProperty(acc.context, 'buttons') &&
-            this.funcs.hasProperty(acc.context.buttons, params.rfChl.toString())
+            acc.context.eweDeviceId === this.accessory.context.eweDeviceId
+            && hasProperty(acc.context, 'buttons')
+            && hasProperty(acc.context.buttons, params.rfChl.toString())
           ) {
-            subAccessory = acc
+            subAccessory = acc;
           }
-        })
+        });
         if (subAccessory) {
-          const deviceConf = this.platform.rfSubdevices[subAccessory.context.hbDeviceId]
-          let enableLogging = !this.disableDeviceLogging
-          if (deviceConf && deviceConf.overrideLogging) {
-            switch (deviceConf.overrideLogging) {
-              case 'standard':
-              case 'debug':
-                enableLogging = true
-                break
-              case 'disable':
-                enableLogging = false
-                break
-            }
+          const deviceConf = this.platform.rfSubdevices[subAccessory.context.hbDeviceId];
+          let enableLogging;
+          switch (deviceConf.overrideLogging) {
+            case 'standard':
+            case 'debug':
+              enableLogging = true;
+              break;
+            case 'disable':
+              enableLogging = false;
+              break;
+            default:
+              enableLogging = !this.disableDeviceLogging;
+              break;
           }
-          const service = subAccessory.context.buttons[params.rfChl]
-          subAccessory.getService(service).updateCharacteristic(this.hapChar.On, true)
+          const service = subAccessory.context.buttons[params.rfChl];
+          subAccessory.getService(service).updateCharacteristic(this.hapChar.On, true);
           if (params.updateSource && enableLogging) {
             this.log(
               '[%s] %s [%s].',
               subAccessory.displayName,
               this.lang.curState,
-              this.lang.buttonTrig
-            )
+              this.lang.buttonTrig,
+            );
           }
-          await this.funcs.sleep(3000)
-          subAccessory.getService(service).updateCharacteristic(this.hapChar.On, false)
+          await sleep(3000);
+          subAccessory.getService(service).updateCharacteristic(this.hapChar.On, false);
         } else {
-          throw new Error(this.lang.buttonNotFound)
+          throw new Error(this.lang.buttonNotFound);
         }
       } else if (
-        (this.funcs.hasProperty(params, 'cmd') && params.cmd === 'trigger') ||
-        params.updateSource === 'LAN'
+        (hasProperty(params, 'cmd') && params.cmd === 'trigger')
+        || params.updateSource === 'LAN'
       ) {
         // RF Sensor
         Object.keys(params)
-          .filter(name => /rfTrig/.test(name))
-          .forEach(async chan => {
+          .filter((name) => /rfTrig/.test(name))
+          .forEach(async (chan) => {
             try {
-              this.devicesInHB.forEach(acc => {
+              this.devicesInHB.forEach((acc) => {
                 if (
-                  acc.context.eweDeviceId === this.accessory.context.eweDeviceId &&
-                  this.funcs.hasProperty(acc.context, 'buttons') &&
-                  this.funcs.hasProperty(acc.context.buttons, chan.split('g')[1].toString())
+                  acc.context.eweDeviceId === this.accessory.context.eweDeviceId
+                  && hasProperty(acc.context, 'buttons')
+                  && hasProperty(acc.context.buttons, chan.split('g')[1].toString())
                 ) {
-                  subAccessory = acc
-                  channel = chan.split('g')[1].toString()
+                  subAccessory = acc;
+                  channel = chan.split('g')[1].toString();
                 }
-              })
+              });
               if (subAccessory) {
                 // Avoid duplicate triggers from LAN and WS
                 if (params[chan] === subAccessory.context.cacheLastAct) {
-                  return
+                  return;
                 }
-                const deviceConf = this.platform.rfSubdevices[subAccessory.context.hbDeviceId] || {}
-                let enableLogging = !this.disableDeviceLogging
-                if (deviceConf && deviceConf.overrideLogging) {
-                  switch (deviceConf.overrideLogging) {
-                    case 'standard':
-                    case 'debug':
-                      enableLogging = true
-                      break
-                    case 'disable':
-                      enableLogging = false
-                      break
-                  }
+                const deviceConf = this.platform.rfSubdevices[subAccessory.context.hbDeviceId] || {};
+                let enableLogging;
+                switch (deviceConf.overrideLogging) {
+                  case 'standard':
+                  case 'debug':
+                    enableLogging = true;
+                    break;
+                  case 'disable':
+                    enableLogging = false;
+                    break;
+                  default:
+                    enableLogging = !this.disableDeviceLogging;
+                    break;
                 }
                 switch (subAccessory.context.subType) {
                   case 'blind':
                   case 'door':
                   case 'window':
                     // Simulations don't support external updates
-                    return
+                    return;
                   case 'button':
                   case 'curtain': {
-                    const service = subAccessory.context.buttons[channel]
-                    subAccessory.getService(service).updateCharacteristic(this.hapChar.On, true)
+                    const service = subAccessory.context.buttons[channel];
+                    subAccessory.getService(service).updateCharacteristic(this.hapChar.On, true);
                     this.log(
                       '[%s] %s [%s].',
                       subAccessory.displayName,
                       this.lang.curState,
-                      this.lang.buttonTrig
-                    )
-                    await this.funcs.sleep(3000)
-                    subAccessory.getService(service).updateCharacteristic(this.hapChar.On, false)
-                    return
+                      this.lang.buttonTrig,
+                    );
+                    await sleep(3000);
+                    subAccessory.getService(service).updateCharacteristic(this.hapChar.On, false);
+                    return;
                   }
+                  default:
+                    break;
                 }
-                const sensorTimeLength =
-                  deviceConf.sensorTimeLength || this.consts.defaultValues.sensorTimeLength
-                const sensorTimeDifference =
-                  deviceConf.sensorTimeDifference || this.consts.defaultValues.sensorTimeDifference
-                subAccessory.context.cacheLastAct = params[chan]
-                const timeOfMotion = new Date(params[chan])
-                const diff = (timeNow.getTime() - timeOfMotion.getTime()) / 1000
-                let serv
-                let char
+                const sensorTimeLength = deviceConf.sensorTimeLength || platformConsts.defaultValues.sensorTimeLength;
+                const sensorTimeDifference = deviceConf.sensorTimeDifference || platformConsts.defaultValues.sensorTimeDifference;
+                subAccessory.context.cacheLastAct = params[chan];
+                const timeOfMotion = new Date(params[chan]);
+                const diff = (timeNow.getTime() - timeOfMotion.getTime()) / 1000;
+                let serv;
+                let char;
                 if (diff < sensorTimeDifference) {
                   switch (deviceConf.type) {
                     case 'water':
-                      serv = this.hapServ.LeakSensor
-                      char = this.hapChar.LeakDetected
-                      break
+                      serv = this.hapServ.LeakSensor;
+                      char = this.hapChar.LeakDetected;
+                      break;
                     case 'fire':
                     case 'smoke':
-                      serv = this.hapServ.SmokeSensor
-                      char = this.hapChar.SmokeDetected
-                      break
+                      serv = this.hapServ.SmokeSensor;
+                      char = this.hapChar.SmokeDetected;
+                      break;
                     case 'co':
-                      serv = this.hapServ.CarbonMonoxideSensor
-                      char = this.hapChar.CarbonMonoxideDetected
-                      break
+                      serv = this.hapServ.CarbonMonoxideSensor;
+                      char = this.hapChar.CarbonMonoxideDetected;
+                      break;
                     case 'co2':
-                      serv = this.hapServ.CarbonDioxideSensor
-                      char = this.hapChar.CarbonDioxideDetected
-                      break
+                      serv = this.hapServ.CarbonDioxideSensor;
+                      char = this.hapChar.CarbonDioxideDetected;
+                      break;
                     case 'contact': {
-                      serv = this.hapServ.ContactSensor
-                      char = this.hapChar.ContactSensorState
-                      const initialTime = subAccessory.eveService.getInitialTime()
+                      serv = this.hapServ.ContactSensor;
+                      char = this.hapChar.ContactSensorState;
+                      const initialTime = subAccessory.eveService.getInitialTime();
                       subAccessory
                         .getService(serv)
                         .updateCharacteristic(
                           this.eveChar.LastActivation,
-                          Math.round(new Date().valueOf() / 1000) - initialTime
-                        )
-                      break
+                          Math.round(new Date().valueOf() / 1000) - initialTime,
+                        );
+                      break;
                     }
                     case 'occupancy':
-                      serv = this.hapServ.OccupancySensor
-                      char = this.hapChar.OccupancyDetected
-                      break
+                      serv = this.hapServ.OccupancySensor;
+                      char = this.hapChar.OccupancyDetected;
+                      break;
                     case 'p_button':
-                      serv = this.hapServ.StatelessProgrammableSwitch
-                      char = this.hapChar.ProgrammableSwitchEvent
-                      break
+                      serv = this.hapServ.StatelessProgrammableSwitch;
+                      char = this.hapChar.ProgrammableSwitchEvent;
+                      break;
                     case 'doorbell':
-                      serv = this.hapServ.Doorbell
-                      char = this.hapChar.ProgrammableSwitchEvent
-                      break
+                      serv = this.hapServ.Doorbell;
+                      char = this.hapChar.ProgrammableSwitchEvent;
+                      break;
                     default: {
-                      serv = this.hapServ.MotionSensor
-                      char = this.hapChar.MotionDetected
-                      const initialTime = subAccessory.eveService.getInitialTime()
+                      serv = this.hapServ.MotionSensor;
+                      char = this.hapChar.MotionDetected;
+                      const initialTime = subAccessory.eveService.getInitialTime();
                       subAccessory
                         .getService(serv)
                         .updateCharacteristic(
                           this.eveChar.LastActivation,
-                          Math.round(new Date().valueOf() / 1000) - initialTime
-                        )
-                      break
+                          Math.round(new Date().valueOf() / 1000) - initialTime,
+                        );
+                      break;
                     }
                   }
 
                   // Programmable button and doorbell activate differently
                   if (char === this.hapChar.ProgrammableSwitchEvent) {
-                    subAccessory.getService(serv).updateCharacteristic(char, 0)
-                    if (params.updateSource && enableLogging) {
-                      this.log(
-                        '[%s] %s [%s].',
-                        subAccessory.displayName,
-                        this.lang.curState,
-                        this.lang.buttonSingle
-                      )
-                    }
-                    return
-                  } else {
-                    subAccessory.getService(serv).updateCharacteristic(char, 1)
-                    subAccessory.eveService.addEntry({ status: 1 })
+                    subAccessory.getService(serv).updateCharacteristic(char, 0);
                     if (params.updateSource && enableLogging) {
                       this.log(
                         '[%s] %s [%s].',
                         subAccessory.displayName,
                         this.lang.curState,
-                        this.lang.rfTrigYes
-                      )
+                        this.lang.buttonSingle,
+                      );
                     }
+                    return;
+                  }
+                  subAccessory.getService(serv).updateCharacteristic(char, 1);
+                  subAccessory.eveService.addEntry({ status: 1 });
+                  if (params.updateSource && enableLogging) {
+                    this.log(
+                      '[%s] %s [%s].',
+                      subAccessory.displayName,
+                      this.lang.curState,
+                      this.lang.rfTrigYes,
+                    );
                   }
+
                   const updateKey = Math.random()
                     .toString(36)
-                    .substr(2, 8)
-                  subAccessory.context.updateKey = updateKey
-                  await this.funcs.sleep(sensorTimeLength * 1000)
+                    .substr(2, 8);
+                  subAccessory.context.updateKey = updateKey;
+                  await sleep(sensorTimeLength * 1000);
                   if (updateKey !== subAccessory.context.updateKey) {
-                    return
+                    return;
                   }
-                  subAccessory.getService(serv).updateCharacteristic(char, 0)
-                  subAccessory.eveService.addEntry({ status: 0 })
+                  subAccessory.getService(serv).updateCharacteristic(char, 0);
+                  subAccessory.eveService.addEntry({ status: 0 });
                   if (params.updateSource && enableLogging) {
                     this.log(
                       '[%s] %s [%s].',
                       subAccessory.displayName,
                       this.lang.curState,
-                      this.lang.rfTrigNo
-                    )
+                      this.lang.rfTrigNo,
+                    );
                   }
                 }
               } else {
-                throw new Error(this.lang.rfNotFound + '[' + chan + ']')
+                throw new Error(`${this.lang.rfNotFound}[${chan}]`);
               }
             } catch (err) {
-              const eText = this.funcs.parseError(err)
-              this.log.warn('[%s] %s %s.', this.name, this.lang.devNotRf, eText)
+              const eText = parseError(err);
+              this.log.warn('[%s] %s %s.', this.name, this.lang.devNotRf, eText);
             }
-          })
+          });
       }
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, false)
+      this.platform.deviceUpdateError(this.accessory, err, false);
     }
   }
 
-  markStatus (isOnline) {
-    this.isOnline = isOnline
+  markStatus(isOnline) {
+    this.isOnline = isOnline;
   }
 }
diff --git a/lib/device/rf-button.js b/lib/device/rf-button.js
index 7bb1d93d..67bf80a5 100644
--- a/lib/device/rf-button.js
+++ b/lib/device/rf-button.js
@@ -1,62 +1,57 @@
-/* jshint node: true, esversion: 10, -W014, -W033 */
-/* eslint-disable new-cap */
-'use strict'
-
-module.exports = class deviceRFButton {
-  constructor (platform, accessory) {
+export default class {
+  constructor(platform, accessory) {
     // Set up variables from the platform
-    this.eveChar = platform.eveChar
-    this.funcs = platform.funcs
-    this.hapChar = platform.api.hap.Characteristic
-    this.hapErr = platform.api.hap.HapStatusError
-    this.hapServ = platform.api.hap.Service
-    this.lang = platform.lang
-    this.log = platform.log
-    this.platform = platform
+    this.eveChar = platform.eveChar;
+    this.hapChar = platform.api.hap.Characteristic;
+    this.hapErr = platform.api.hap.HapStatusError;
+    this.hapServ = platform.api.hap.Service;
+    this.lang = platform.lang;
+    this.log = platform.log;
+    this.platform = platform;
 
     // Set up variables from the accessory
-    this.name = accessory.displayName
-    this.accessory = accessory
+    this.name = accessory.displayName;
+    this.accessory = accessory;
 
     // Initially set the online flag as true (to be then updated as false if necessary)
-    this.isOnline = true
+    this.isOnline = true;
 
     // Set up custom variables for this device type
-    const deviceConf = platform.rfSubdevices[accessory.context.hbDeviceId]
+    const deviceConf = platform.rfSubdevices[accessory.context.hbDeviceId] || {};
 
     // Set the correct logging variables for this accessory
-    this.enableLogging = !platform.config.disableDeviceLogging
-    this.enableDebugLogging = platform.config.debug
-    if (deviceConf && deviceConf.overrideLogging) {
-      switch (deviceConf.overrideLogging) {
-        case 'standard':
-          this.enableLogging = true
-          this.enableDebugLogging = false
-          break
-        case 'debug':
-          this.enableLogging = true
-          this.enableDebugLogging = true
-          break
-        case 'disable':
-          this.enableLogging = false
-          this.enableDebugLogging = false
-          break
-      }
+    switch (deviceConf.overrideLogging) {
+      case 'standard':
+        this.enableLogging = true;
+        this.enableDebugLogging = false;
+        break;
+      case 'debug':
+        this.enableLogging = true;
+        this.enableDebugLogging = true;
+        break;
+      case 'disable':
+        this.enableLogging = false;
+        this.enableDebugLogging = false;
+        break;
+      default:
+        this.enableLogging = !platform.config.disableDeviceLogging;
+        this.enableDebugLogging = platform.config.debug;
+        break;
     }
 
     // If the accessory has a window covering service (from an old simulation) then remove it
     if (this.accessory.getService(this.hapServ.WindowCovering)) {
-      this.accessory.removeService(this.accessory.getService(this.hapServ.WindowCovering))
+      this.accessory.removeService(this.accessory.getService(this.hapServ.WindowCovering));
     }
 
     // If the accessory has a door service (from an old simulation) then remove it
     if (this.accessory.getService(this.hapServ.Door)) {
-      this.accessory.removeService(this.accessory.getService(this.hapServ.Door))
+      this.accessory.removeService(this.accessory.getService(this.hapServ.Door));
     }
 
     // If the accessory has a window service (from an old simulation) then remove it
     if (this.accessory.getService(this.hapServ.Window)) {
-      this.accessory.removeService(this.accessory.getService(this.hapServ.Window))
+      this.accessory.removeService(this.accessory.getService(this.hapServ.Window));
     }
 
     // This instance is a remote control with buttons or curtain control
@@ -65,17 +60,17 @@ module.exports = class deviceRFButton {
 
       // Add the switch service if it doesn't already exist
       if (!this.accessory.getService(name)) {
-        this.accessory.addService(this.hapServ.Switch, name, 'switch' + chan)
+        this.accessory.addService(this.hapServ.Switch, name, `switch${chan}`);
       }
 
       // Always start with the buttons off (useful when restarting Homebridge)
-      this.accessory.getService(name).updateCharacteristic(this.hapChar.On, false)
+      this.accessory.getService(name).updateCharacteristic(this.hapChar.On, false);
 
       // Add the set handler to the switch on/off characteristic
       this.accessory
         .getService(name)
         .getCharacteristic(this.hapChar.On)
-        .onSet(async value => await this.internalPressUpdate(chan, name, value))
+        .onSet(async (value) => this.internalPressUpdate(chan, name, value));
 
       // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
       if (!platform.config.disableNoResponse) {
@@ -84,46 +79,47 @@ module.exports = class deviceRFButton {
           .getCharacteristic(this.hapChar.On)
           .onGet(() => {
             if (!this.isOnline) {
-              throw new this.hapErr(-70402)
+              throw new this.hapErr(-70402);
             }
-            return this.accessory.getService(name).getCharacteristic(this.hapChar.On).value
-          })
+            return this.accessory.getService(name).getCharacteristic(this.hapChar.On).value;
+          });
       }
-    })
+    });
 
     // Output the customised options to the log
+    const normalLogging = this.enableLogging ? 'standard' : 'disable';
     const opts = JSON.stringify({
-      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable'
-    })
-    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
+      logging: this.enableDebugLogging ? 'debug' : normalLogging,
+    });
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts);
   }
 
-  async internalPressUpdate (rfChl, service, value) {
+  async internalPressUpdate(rfChl, service, value) {
     try {
       if (!value) {
-        return
+        return;
       }
       const params = {
         cmd: 'transmit',
-        rfChl: parseInt(rfChl)
-      }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
+        rfChl: parseInt(rfChl, 10),
+      };
+      await this.platform.sendDeviceUpdate(this.accessory, params);
       if (this.enableLogging) {
-        this.log('[%s] %s [%s].', this.name, this.lang.curState, this.lang.buttonTrig)
+        this.log('[%s] %s [%s].', this.name, this.lang.curState, this.lang.buttonTrig);
       }
       setTimeout(() => {
-        this.accessory.getService(service).updateCharacteristic(this.hapChar.On, false)
-      }, 1000)
+        this.accessory.getService(service).updateCharacteristic(this.hapChar.On, false);
+      }, 1000);
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true);
       setTimeout(() => {
-        this.accessory.getService(service).updateCharacteristic(this.hapChar.On, false)
-      }, 2000)
-      throw new this.hapErr(-70402)
+        this.accessory.getService(service).updateCharacteristic(this.hapChar.On, false);
+      }, 2000);
+      throw new this.hapErr(-70402);
     }
   }
 
-  markStatus (isOnline) {
-    this.isOnline = isOnline
+  markStatus(isOnline) {
+    this.isOnline = isOnline;
   }
 }
diff --git a/lib/device/rf-sensor.js b/lib/device/rf-sensor.js
index 61974d88..431dc7d9 100644
--- a/lib/device/rf-sensor.js
+++ b/lib/device/rf-sensor.js
@@ -1,59 +1,50 @@
-/* jshint node: true, esversion: 10, -W014, -W033 */
-/* eslint-disable new-cap */
-'use strict'
+import platformConsts from '../utils/constants.js';
 
-module.exports = class deviceRFSensor {
-  constructor (platform, accessory) {
+export default class {
+  constructor(platform, accessory) {
     // Set up variables from the platform
-    this.eveChar = platform.eveChar
-    this.funcs = platform.funcs
-    this.hapChar = platform.api.hap.Characteristic
-    this.hapErr = platform.api.hap.HapStatusError
-    this.hapServ = platform.api.hap.Service
-    this.lang = platform.lang
-    this.log = platform.log
-    this.platform = platform
+    this.eveChar = platform.eveChar;
+    this.hapChar = platform.api.hap.Characteristic;
+    this.hapErr = platform.api.hap.HapStatusError;
+    this.hapServ = platform.api.hap.Service;
+    this.lang = platform.lang;
+    this.log = platform.log;
+    this.platform = platform;
 
     // Initially set the online flag as true (to be then updated as false if necessary)
-    this.isOnline = true
+    this.isOnline = true;
 
     // Set up custom variables for this device type
-    const deviceConf = platform.rfSubdevices[accessory.context.hbDeviceId]
-    this.sensorTimeLength =
-      deviceConf && deviceConf.sensorTimeLength
-        ? deviceConf.sensorTimeLength
-        : platform.consts.defaultValues.sensorTimeLength
-    this.sensorTimeDifference =
-      deviceConf && deviceConf.sensorTimeDifference
-        ? deviceConf.sensorTimeDifference
-        : platform.consts.defaultValues.sensorTimeDifference
-    this.sensorType = deviceConf && deviceConf.type ? deviceConf.type : 'motion'
+    const deviceConf = platform.rfSubdevices[accessory.context.hbDeviceId] || {};
+    this.sensorTimeLength = deviceConf.sensorTimeLength || platformConsts.defaultValues.sensorTimeLength;
+    this.sensorTimeDifference = deviceConf.sensorTimeDifference || platformConsts.defaultValues.sensorTimeDifference;
+    this.sensorType = deviceConf.type ? deviceConf.type : 'motion';
 
     // Set the correct logging variables for this accessory
-    this.enableLogging = !platform.config.disableDeviceLogging
-    this.enableDebugLogging = platform.config.debug
-    if (deviceConf && deviceConf.overrideLogging) {
-      switch (deviceConf.overrideLogging) {
-        case 'standard':
-          this.enableLogging = true
-          this.enableDebugLogging = false
-          break
-        case 'debug':
-          this.enableLogging = true
-          this.enableDebugLogging = true
-          break
-        case 'disable':
-          this.enableLogging = false
-          this.enableDebugLogging = false
-          break
-      }
+    switch (deviceConf.overrideLogging) {
+      case 'standard':
+        this.enableLogging = true;
+        this.enableDebugLogging = false;
+        break;
+      case 'debug':
+        this.enableLogging = true;
+        this.enableDebugLogging = true;
+        break;
+      case 'disable':
+        this.enableLogging = false;
+        this.enableDebugLogging = false;
+        break;
+      default:
+        this.enableLogging = !platform.config.disableDeviceLogging;
+        this.enableDebugLogging = platform.config.debug;
+        break;
     }
 
     // This instance is a sensor which the user can define as different types
-    let serv
-    let char
-    let eveType
-    let addLACharacteristic = false
+    let serv;
+    let char;
+    let eveType;
+    let addLACharacteristic = false;
 
     // Create an array of hap sensor services to for later to check sensor type hasn't changed
     let hapServList = [
@@ -65,122 +56,118 @@ module.exports = class deviceRFSensor {
       this.hapServ.OccupancySensor,
       this.hapServ.MotionSensor,
       this.hapServ.StatelessProgrammableSwitch,
-      this.hapServ.Doorbell
-    ]
+      this.hapServ.Doorbell,
+    ];
 
     // Check which type this sensor is and get the correct service/characteristic
     switch (this.sensorType) {
       case 'water':
-        serv = this.hapServ.LeakSensor
-        char = this.hapChar.LeakDetected
-        eveType = 'motion'
-        break
+        serv = this.hapServ.LeakSensor;
+        char = this.hapChar.LeakDetected;
+        eveType = 'motion';
+        break;
       case 'fire':
       case 'smoke':
-        serv = this.hapServ.SmokeSensor
-        char = this.hapChar.SmokeDetected
-        eveType = 'motion'
-        break
+        serv = this.hapServ.SmokeSensor;
+        char = this.hapChar.SmokeDetected;
+        eveType = 'motion';
+        break;
       case 'co':
-        serv = this.hapServ.CarbonMonoxideSensor
-        char = this.hapChar.CarbonMonoxideDetected
-        eveType = 'motion'
-        break
+        serv = this.hapServ.CarbonMonoxideSensor;
+        char = this.hapChar.CarbonMonoxideDetected;
+        eveType = 'motion';
+        break;
       case 'co2':
-        serv = this.hapServ.CarbonDioxideSensor
-        char = this.hapChar.CarbonDioxideDetected
-        eveType = 'motion'
-        break
+        serv = this.hapServ.CarbonDioxideSensor;
+        char = this.hapChar.CarbonDioxideDetected;
+        eveType = 'motion';
+        break;
       case 'contact':
-        serv = this.hapServ.ContactSensor
-        char = this.hapChar.ContactSensorState
-        eveType = 'door'
-        addLACharacteristic = true
-        break
+        serv = this.hapServ.ContactSensor;
+        char = this.hapChar.ContactSensorState;
+        eveType = 'door';
+        addLACharacteristic = true;
+        break;
       case 'occupancy':
-        serv = this.hapServ.OccupancySensor
-        char = this.hapChar.OccupancyDetected
-        eveType = 'motion'
-        break
+        serv = this.hapServ.OccupancySensor;
+        char = this.hapChar.OccupancyDetected;
+        eveType = 'motion';
+        break;
       case 'p_button':
-        serv = this.hapServ.StatelessProgrammableSwitch
-        char = this.hapChar.ProgrammableSwitchEvent
-        break
+        serv = this.hapServ.StatelessProgrammableSwitch;
+        char = this.hapChar.ProgrammableSwitchEvent;
+        break;
       case 'doorbell':
-        serv = this.hapServ.Doorbell
-        char = this.hapChar.ProgrammableSwitchEvent
-        break
+        serv = this.hapServ.Doorbell;
+        char = this.hapChar.ProgrammableSwitchEvent;
+        break;
       default:
-        serv = this.hapServ.MotionSensor
-        char = this.hapChar.MotionDetected
-        eveType = 'motion'
-        addLACharacteristic = true
-        break
+        serv = this.hapServ.MotionSensor;
+        char = this.hapChar.MotionDetected;
+        eveType = 'motion';
+        addLACharacteristic = true;
+        break;
     }
 
     // Remove wanted sensor from hap sensor type list
-    hapServList = hapServList.filter(el => el !== serv)
+    hapServList = hapServList.filter((el) => el !== serv);
 
     // Check and remove and redundant hap sensor types
-    hapServList.forEach(hapSensor => {
+    hapServList.forEach((hapSensor) => {
       if (accessory.getService(hapSensor)) {
-        accessory.removeService(accessory.getService(hapSensor))
+        accessory.removeService(accessory.getService(hapSensor));
       }
-    })
+    });
 
     // Add the sensor if it doesn't already exist
-    let service
-    if (!(service = accessory.getService(serv))) {
-      service = accessory.addService(serv)
-    }
+    const service = accessory.getService(serv) || accessory.addService(serv);
 
     // Remove double and long press from Button and Doorbell service
     if (char === this.hapChar.ProgrammableSwitchEvent) {
       service.getCharacteristic(this.hapChar.ProgrammableSwitchEvent).setProps({
-        validValues: [0]
-      })
+        validValues: [0],
+      });
     } else {
       // Always start with the sensor off (useful when restarting Homebridge, except Doorbell)
-      service.updateCharacteristic(char, 0)
+      service.updateCharacteristic(char, 0);
     }
 
     // See if we need to add or remove the Last Activation characteristic
     if (addLACharacteristic) {
       if (!service.testCharacteristic(this.eveChar.LastActivation)) {
-        service.addCharacteristic(this.eveChar.LastActivation)
-      }
-    } else {
-      if (service.testCharacteristic(this.eveChar.LastActivation)) {
-        service.removeCharacteristic(service.getCharacteristic(this.eveChar.LastActivation))
+        service.addCharacteristic(this.eveChar.LastActivation);
       }
+    } else if (service.testCharacteristic(this.eveChar.LastActivation)) {
+      service.removeCharacteristic(service.getCharacteristic(this.eveChar.LastActivation));
     }
 
     // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
     if (!platform.config.disableNoResponse) {
       service.getCharacteristic(char).onGet(() => {
         if (!this.isOnline) {
-          throw new this.hapErr(-70402)
+          throw new this.hapErr(-70402);
         }
-        return service.getCharacteristic(char).value
-      })
+        return service.getCharacteristic(char).value;
+      });
     }
 
     // Pass the accessory to Fakegato to set up with Eve
     accessory.eveService = new platform.eveService(eveType, accessory, {
-      log: platform.config.debugFakegato ? this.log : () => {}
-    })
+      log: platform.config.debugFakegato ? this.log : () => {},
+    });
 
     // Output the customised options to the log
+    const normalLogging = this.enableLogging ? 'standard' : 'disable';
     const opts = JSON.stringify({
-      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
+      logging: this.enableDebugLogging ? 'debug' : normalLogging,
       sensorTimeDifference: this.sensorTimeDifference,
       sensorTimeLength: this.sensorTimeLength,
-      type: this.sensorType
-    })
-    this.log('[%s] %s %s.', accessory.displayName, this.lang.devInitOpts, opts)
+      type: this.sensorType,
+    });
+    this.log('[%s] %s %s.', accessory.displayName, this.lang.devInitOpts, opts);
   }
 
-  markStatus (isOnline) {
-    this.isOnline = isOnline
+  markStatus(isOnline) {
+    this.isOnline = isOnline;
   }
 }
diff --git a/lib/device/sensor-ambient.js b/lib/device/sensor-ambient.js
index 2dd84d63..ae1bf88d 100644
--- a/lib/device/sensor-ambient.js
+++ b/lib/device/sensor-ambient.js
@@ -1,112 +1,105 @@
-/* jshint node: true, esversion: 10, -W014, -W033 */
-/* eslint-disable new-cap */
-'use strict'
+import platformConsts from '../utils/constants.js';
+import { hasProperty, parseError } from '../utils/functions.js';
 
-module.exports = class deviceSensorAmbient {
-  constructor (platform, accessory) {
+export default class {
+  constructor(platform, accessory) {
     // Set up variables from the platform
-    this.funcs = platform.funcs
-    this.hapChar = platform.api.hap.Characteristic
-    this.hapServ = platform.api.hap.Service
-    this.hapErr = platform.api.hap.HapStatusError
-    this.lang = platform.lang
-    this.log = platform.log
-    this.platform = platform
+    this.hapChar = platform.api.hap.Characteristic;
+    this.hapServ = platform.api.hap.Service;
+    this.hapErr = platform.api.hap.HapStatusError;
+    this.lang = platform.lang;
+    this.log = platform.log;
+    this.platform = platform;
 
     // Set up variables from the accessory
-    this.name = accessory.displayName
-    this.accessory = accessory
+    this.name = accessory.displayName;
+    this.accessory = accessory;
 
     // Initially set the online flag as true (to be then updated as false if necessary)
-    this.isOnline = true
+    this.isOnline = true;
 
     // Set up custom variables for this device type
-    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
-    this.hideSwitch = deviceConf && deviceConf.hideSwitch
-    this.tempOffset =
-      deviceConf && deviceConf.offset ? deviceConf.offset : platform.consts.defaultValues.offset
-    this.tempOffsetFactor = deviceConf && deviceConf.offsetFactor
-    this.humiOffset =
-      deviceConf && deviceConf.humidityOffset
-        ? parseInt(deviceConf.humidityOffset)
-        : platform.consts.defaultValues.humidityOffset
-    this.humiOffsetFactor = deviceConf && deviceConf.humidityOffsetFactor
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId] || {};
+    this.hideSwitch = deviceConf.hideSwitch;
+    this.tempOffset = deviceConf.offset || platformConsts.defaultValues.offset;
+    this.tempOffsetFactor = deviceConf.offsetFactor;
+    this.humiOffset = deviceConf.humidityOffset
+      ? parseInt(deviceConf.humidityOffset, 10)
+      : platformConsts.defaultValues.humidityOffset;
+    this.humiOffsetFactor = deviceConf.humidityOffsetFactor;
 
     // Set the correct logging variables for this accessory
-    this.enableLogging = !platform.config.disableDeviceLogging
-    this.enableDebugLogging = platform.config.debug
-    if (deviceConf && deviceConf.overrideLogging) {
-      switch (deviceConf.overrideLogging) {
-        case 'standard':
-          this.enableLogging = true
-          this.enableDebugLogging = false
-          break
-        case 'debug':
-          this.enableLogging = true
-          this.enableDebugLogging = true
-          break
-        case 'disable':
-          this.enableLogging = false
-          this.enableDebugLogging = false
-          break
-      }
+    switch (deviceConf.overrideLogging) {
+      case 'standard':
+        this.enableLogging = true;
+        this.enableDebugLogging = false;
+        break;
+      case 'debug':
+        this.enableLogging = true;
+        this.enableDebugLogging = true;
+        break;
+      case 'disable':
+        this.enableLogging = false;
+        this.enableDebugLogging = false;
+        break;
+      default:
+        this.enableLogging = !platform.config.disableDeviceLogging;
+        this.enableDebugLogging = platform.config.debug;
+        break;
     }
 
     // If the accessory has a thermostat service then remove it
     if (this.accessory.getService(this.hapServ.Thermostat)) {
-      this.accessory.removeService(this.accessory.getService(this.hapServ.Thermostat))
+      this.accessory.removeService(this.accessory.getService(this.hapServ.Thermostat));
     }
 
     // If the accessory has a heater service then remove it
     if (this.accessory.getService(this.hapServ.HeaterCooler)) {
-      this.accessory.removeService(this.accessory.getService(this.hapServ.HeaterCooler))
+      this.accessory.removeService(this.accessory.getService(this.hapServ.HeaterCooler));
     }
 
     // If the accessory has a humidifier service then remove it
     if (this.accessory.getService(this.hapServ.HumidifierDehumidifier)) {
-      this.accessory.removeService(this.accessory.getService(this.hapServ.HumidifierDehumidifier))
+      this.accessory.removeService(this.accessory.getService(this.hapServ.HumidifierDehumidifier));
     }
 
     // The user can choose to hide the switch service if they desire
     if (this.hideSwitch) {
       // User has hidden the switch service so remove it if it exists
       if (this.accessory.getService(this.hapServ.Switch)) {
-        this.accessory.removeService(this.accessory.getService(this.hapServ.Switch))
+        this.accessory.removeService(this.accessory.getService(this.hapServ.Switch));
       }
     } else {
       // User has not hidden the switch service so add it if it doesn't already exist
-      this.switchService =
-        this.accessory.getService(this.hapServ.Switch) ||
-        this.accessory.addService(this.hapServ.Switch)
+      this.switchService = this.accessory.getService(this.hapServ.Switch)
+        || this.accessory.addService(this.hapServ.Switch);
 
       // Add the set handler to the switch on/off characteristic
       this.switchService
         .getCharacteristic(this.hapChar.On)
-        .onSet(async value => await this.internalStateUpdate(value))
+        .onSet(async (value) => this.internalStateUpdate(value));
     }
 
     // Add the temperature sensor service if it doesn't already exist
-    this.tempService =
-      this.accessory.getService(this.hapServ.TemperatureSensor) ||
-      this.accessory.addService(this.hapServ.TemperatureSensor)
+    this.tempService = this.accessory.getService(this.hapServ.TemperatureSensor)
+      || this.accessory.addService(this.hapServ.TemperatureSensor);
 
     // Set custom properties of the current temperature characteristic
     this.tempService.getCharacteristic(this.hapChar.CurrentTemperature).setProps({
-      minStep: 0.1
-    })
-    this.cacheTemp = this.tempService.getCharacteristic(this.hapChar.CurrentTemperature).value
-    this.updateCache()
+      minStep: 0.1,
+    });
+    this.cacheTemp = this.tempService.getCharacteristic(this.hapChar.CurrentTemperature).value;
+    this.updateCache();
 
     // The DS18B20 sensor does not provide humidity readings
     if (this.accessory.context.sensorType === 'DS18B20') {
       if (this.accessory.getService(this.hapServ.HumiditySensor)) {
-        this.accessory.removeService(this.accessory.getService(this.hapServ.HumiditySensor))
+        this.accessory.removeService(this.accessory.getService(this.hapServ.HumiditySensor));
       }
     } else {
       // Add the humidity sensor service if it doesn't already exist
-      this.humiService =
-        this.accessory.getService(this.hapServ.HumiditySensor) ||
-        this.accessory.addService(this.hapServ.HumiditySensor)
+      this.humiService = this.accessory.getService(this.hapServ.HumiditySensor)
+        || this.accessory.addService(this.hapServ.HumiditySensor);
     }
 
     // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
@@ -114,205 +107,206 @@ module.exports = class deviceSensorAmbient {
       if (this.switchService) {
         this.switchService.getCharacteristic(this.hapChar.On).onGet(() => {
           if (!this.isOnline) {
-            throw new this.hapErr(-70402)
+            throw new this.hapErr(-70402);
           }
-          return this.switchService.getCharacteristic(this.hapChar.On).value
-        })
+          return this.switchService.getCharacteristic(this.hapChar.On).value;
+        });
       }
       this.tempService.getCharacteristic(this.hapChar.CurrentTemperature).onGet(() => {
         if (!this.isOnline) {
-          throw new this.hapErr(-70402)
+          throw new this.hapErr(-70402);
         }
-        return this.tempService.getCharacteristic(this.hapChar.CurrentTemperature).value
-      })
+        return this.tempService.getCharacteristic(this.hapChar.CurrentTemperature).value;
+      });
       if (this.humiService) {
         this.humiService.getCharacteristic(this.hapChar.CurrentRelativeHumidity).onGet(() => {
           if (!this.isOnline) {
-            throw new this.hapErr(-70402)
+            throw new this.hapErr(-70402);
           }
-          return this.humiService.getCharacteristic(this.hapChar.CurrentRelativeHumidity).value
-        })
+          return this.humiService.getCharacteristic(this.hapChar.CurrentRelativeHumidity).value;
+        });
       }
     }
 
     // The switch as the primary service ensures the status is reflected in the Home icon
     if (this.switchService) {
-      this.switchService.setPrimaryService()
+      this.switchService.setPrimaryService();
     }
 
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new platform.eveService('custom', this.accessory, {
-      log: platform.config.debugFakegato ? this.log : () => {}
-    })
+      log: platform.config.debugFakegato ? this.log : () => {},
+    });
 
     // Set up an interval to get eWeLink to send regular temperature/humidity updates
     if (platform.config.mode !== 'lan') {
       setTimeout(() => {
-        this.internalUIUpdate()
-        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
-      }, 5000)
+        this.internalUIUpdate();
+        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000);
+      }, 5000);
 
       // Stop the intervals on Homebridge shutdown
-      platform.api.on('shutdown', () => clearInterval(this.intervalPoll))
+      platform.api.on('shutdown', () => clearInterval(this.intervalPoll));
     }
 
     // Output the customised options to the log
+    const normalLogging = this.enableLogging ? 'standard' : 'disable';
     const opts = JSON.stringify({
       hideSwitch: this.hideSwitch,
       humidityOffset: this.humiOffset,
       humidityOffsetFactor: this.humiOffsetFactor,
-      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
+      logging: this.enableDebugLogging ? 'debug' : normalLogging,
       offset: this.tempOffset,
       offsetFactor: this.tempOffsetFactor,
-      showAs: 'default'
-    })
-    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
+      showAs: 'default',
+    });
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts);
   }
 
-  async internalStateUpdate (value) {
+  async internalStateUpdate(value) {
     try {
-      const newValue = value ? 'on' : 'off'
+      const newValue = value ? 'on' : 'off';
       if (newValue === this.cacheState) {
-        return
+        return;
       }
       const params = {
         switch: newValue,
         mainSwitch: newValue,
-        deviceType: 'normal'
-      }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.cacheState = newValue
+        deviceType: 'normal',
+      };
+      await this.platform.sendDeviceUpdate(this.accessory, params);
+      this.cacheState = newValue;
       if (this.enableLogging) {
-        this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
+        this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState);
       }
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true);
       setTimeout(() => {
-        this.switchService.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
-      }, 2000)
-      throw new this.hapErr(-70402)
+        this.switchService.updateCharacteristic(this.hapChar.On, this.cacheState === 'on');
+      }, 2000);
+      throw new this.hapErr(-70402);
     }
   }
 
-  async internalUIUpdate () {
+  async internalUIUpdate() {
     try {
       // Skip polling if device isn't online
       if (!this.isOnline) {
-        return
+        return;
       }
 
       // Send the params to request the updates
-      await this.platform.sendDeviceUpdate(this.accessory, { uiActive: 120 })
+      await this.platform.sendDeviceUpdate(this.accessory, { uiActive: 120 });
     } catch (err) {
       // Suppress errors here
     }
   }
 
-  async externalUpdate (params) {
+  async externalUpdate(params) {
     try {
       if (!this.hideSwitch && params.switch) {
-        const newState = params.switch
+        const newState = params.switch;
         if (this.cacheState !== newState) {
-          this.cacheState = newState
-          this.switchService.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
+          this.cacheState = newState;
+          this.switchService.updateCharacteristic(this.hapChar.On, this.cacheState === 'on');
           this.accessory.eveService.addEntry({
-            status: this.cacheState === 'on' ? 1 : 0
-          })
+            status: this.cacheState === 'on' ? 1 : 0,
+          });
           if (params.updateSource && this.enableLogging) {
-            this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
+            this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState);
           }
         }
       }
       if (
-        this.funcs.hasProperty(params, 'currentTemperature') &&
-        params.currentTemperature !== 'unavailable'
+        hasProperty(params, 'currentTemperature')
+        && params.currentTemperature !== 'unavailable'
       ) {
-        let newTemp = Number(params.currentTemperature)
+        let newTemp = Number(params.currentTemperature);
         if (this.tempOffsetFactor) {
-          newTemp *= this.tempOffset
+          newTemp *= this.tempOffset;
         } else {
-          newTemp += this.tempOffset
+          newTemp += this.tempOffset;
         }
         if (newTemp !== this.cacheTemp) {
-          this.cacheTemp = newTemp
-          this.tempService.updateCharacteristic(this.hapChar.CurrentTemperature, this.cacheTemp)
-          this.accessory.eveService.addEntry({ temp: this.cacheTemp })
+          this.cacheTemp = newTemp;
+          this.tempService.updateCharacteristic(this.hapChar.CurrentTemperature, this.cacheTemp);
+          this.accessory.eveService.addEntry({ temp: this.cacheTemp });
           if (params.updateSource && this.enableLogging) {
-            this.log('[%s] %s [%s°C].', this.name, this.lang.curTemp, this.cacheTemp)
+            this.log('[%s] %s [%s°C].', this.name, this.lang.curTemp, this.cacheTemp);
           }
 
           // Update the cache file with the new temperature
-          this.updateCache()
+          this.updateCache();
         }
       }
       if (
-        this.funcs.hasProperty(params, 'currentHumidity') &&
-        params.currentHumidity !== 'unavailable' &&
-        this.humiService
+        hasProperty(params, 'currentHumidity')
+        && params.currentHumidity !== 'unavailable'
+        && this.humiService
       ) {
-        let newHumi = parseInt(params.currentHumidity)
+        let newHumi = parseInt(params.currentHumidity, 10);
         if (this.humiOffsetFactor) {
-          newHumi *= this.humiOffset
+          newHumi *= this.humiOffset;
         } else {
-          newHumi += this.humiOffset
+          newHumi += this.humiOffset;
         }
-        newHumi = Math.max(Math.min(parseInt(newHumi), 100), 0)
+        newHumi = Math.max(Math.min(parseInt(newHumi, 10), 100), 0);
         if (newHumi !== this.cacheHumi) {
-          this.cacheHumi = newHumi
+          this.cacheHumi = newHumi;
           this.humiService.updateCharacteristic(
             this.hapChar.CurrentRelativeHumidity,
-            this.cacheHumi
-          )
-          this.accessory.eveService.addEntry({ humidity: this.cacheHumi })
+            this.cacheHumi,
+          );
+          this.accessory.eveService.addEntry({ humidity: this.cacheHumi });
           if (params.updateSource && this.enableLogging) {
-            this.log('[%s] %s [%s%].', this.name, this.lang.curHumi, this.cacheHumi)
+            this.log('[%s] %s [%s%].', this.name, this.lang.curHumi, this.cacheHumi);
           }
         }
       }
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, false)
+      this.platform.deviceUpdateError(this.accessory, err, false);
     }
   }
 
-  async updateCache () {
+  async updateCache() {
     // Don't continue if the storage client hasn't initialised properly
     if (!this.platform.storageClientData) {
-      return
+      return;
     }
 
     // Attempt to save the new temperature to the cache
     try {
       await this.platform.storageData.setItem(
-        this.accessory.context.eweDeviceId + '_temp',
-        this.cacheTemp
-      )
+        `${this.accessory.context.eweDeviceId}_temp`,
+        this.cacheTemp,
+      );
     } catch (err) {
       if (this.enableLogging) {
-        const eText = this.funcs.parseError(err)
-        this.log.warn('[%s] %s %s.', this.name, this.lang.storageWriteErr, eText)
+        const eText = parseError(err);
+        this.log.warn('[%s] %s %s.', this.name, this.lang.storageWriteErr, eText);
       }
     }
   }
 
-  currentState () {
-    const toReturn = {}
-    toReturn.services = ['switch', 'temperature']
+  currentState() {
+    const toReturn = {};
+    toReturn.services = ['switch', 'temperature'];
     toReturn.switch = {
-      state: this.cacheState
-    }
+      state: this.cacheState,
+    };
     toReturn.temperature = {
-      current: this.tempService.getCharacteristic(this.hapChar.CurrentTemperature).value
-    }
+      current: this.tempService.getCharacteristic(this.hapChar.CurrentTemperature).value,
+    };
     if (this.humiService) {
-      toReturn.services.push('humidity')
+      toReturn.services.push('humidity');
       toReturn.humidity = {
-        current: this.humiService.getCharacteristic(this.hapChar.CurrentRelativeHumidity).value
-      }
+        current: this.humiService.getCharacteristic(this.hapChar.CurrentRelativeHumidity).value,
+      };
     }
-    return toReturn
+    return toReturn;
   }
 
-  markStatus (isOnline) {
-    this.isOnline = isOnline
+  markStatus(isOnline) {
+    this.isOnline = isOnline;
   }
 }
diff --git a/lib/device/sensor-contact.js b/lib/device/sensor-contact.js
index d4f6226f..ecc44e2e 100644
--- a/lib/device/sensor-contact.js
+++ b/lib/device/sensor-contact.js
@@ -1,136 +1,133 @@
-/* jshint node: true, esversion: 10, -W014, -W033 */
-/* eslint-disable new-cap */
-'use strict'
+import platformConsts from '../utils/constants.js';
+import { hasProperty } from '../utils/functions.js';
 
-module.exports = class deviceSensorContact {
-  constructor (platform, accessory) {
+export default class {
+  constructor(platform, accessory) {
     // Set up variables from the platform
-    this.eveChar = platform.eveChar
-    this.funcs = platform.funcs
-    this.hapChar = platform.api.hap.Characteristic
-    this.hapServ = platform.api.hap.Service
-    this.hapUUIDGen = platform.api.hap.uuid.generate
-    this.lang = platform.lang
-    this.log = platform.log
-    this.platform = platform
+    this.eveChar = platform.eveChar;
+    this.hapChar = platform.api.hap.Characteristic;
+    this.hapServ = platform.api.hap.Service;
+    this.lang = platform.lang;
+    this.log = platform.log;
+    this.platform = platform;
 
     // Set up variables from the accessory
-    this.name = accessory.displayName
-    this.accessory = accessory
+    this.name = accessory.displayName;
+    this.accessory = accessory;
 
     // Set up custom variables for this device type
-    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
-    this.lowBattThreshold =
-      deviceConf && deviceConf.lowBattThreshold
-        ? Math.min(deviceConf.lowBattThreshold, 100)
-        : platform.consts.defaultValues.lowBattThreshold
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId] || {};
+    this.lowBattThreshold = deviceConf.lowBattThreshold
+      ? Math.min(deviceConf.lowBattThreshold, 100)
+      : platformConsts.defaultValues.lowBattThreshold;
 
     // Set the correct logging variables for this accessory
-    this.enableLogging = !platform.config.disableDeviceLogging
-    this.enableDebugLogging = platform.config.debug
-    if (deviceConf && deviceConf.overrideLogging) {
-      switch (deviceConf.overrideLogging) {
-        case 'standard':
-          this.enableLogging = true
-          this.enableDebugLogging = false
-          break
-        case 'debug':
-          this.enableLogging = true
-          this.enableDebugLogging = true
-          break
-        case 'disable':
-          this.enableLogging = false
-          this.enableDebugLogging = false
-          break
-      }
+    switch (deviceConf.overrideLogging) {
+      case 'standard':
+        this.enableLogging = true;
+        this.enableDebugLogging = false;
+        break;
+      case 'debug':
+        this.enableLogging = true;
+        this.enableDebugLogging = true;
+        break;
+      case 'disable':
+        this.enableLogging = false;
+        this.enableDebugLogging = false;
+        break;
+      default:
+        this.enableLogging = !platform.config.disableDeviceLogging;
+        this.enableDebugLogging = platform.config.debug;
+        break;
     }
 
     // If the accessory has a leak sensor service then remove it
     if (this.accessory.getService(this.hapServ.LeakSensor)) {
-      this.accessory.removeService(this.accessory.getService(this.hapServ.LeakSensor))
+      this.accessory.removeService(this.accessory.getService(this.hapServ.LeakSensor));
     }
 
     // Add the contact sensor service if it doesn't already exist
-    if (!(this.service = this.accessory.getService(this.hapServ.ContactSensor))) {
-      this.service = this.accessory.addService(this.hapServ.ContactSensor)
-      this.service.addCharacteristic(this.eveChar.LastActivation)
-      this.service.addCharacteristic(this.eveChar.ResetTotal)
-      this.service.addCharacteristic(this.eveChar.OpenDuration)
-      this.service.addCharacteristic(this.eveChar.ClosedDuration)
-      this.service.addCharacteristic(this.eveChar.TimesOpened)
+    this.service = this.accessory.getService(this.hapServ.ContactSensor);
+    if (!this.service) {
+      this.service = this.accessory.addService(this.hapServ.ContactSensor);
+      this.service.addCharacteristic(this.eveChar.LastActivation);
+      this.service.addCharacteristic(this.eveChar.ResetTotal);
+      this.service.addCharacteristic(this.eveChar.OpenDuration);
+      this.service.addCharacteristic(this.eveChar.ClosedDuration);
+      this.service.addCharacteristic(this.eveChar.TimesOpened);
     }
 
     // Add the set handler to the contact sensor reset total characteristic
-    this.service.getCharacteristic(this.eveChar.ResetTotal).onSet(value => {
-      this.service.updateCharacteristic(this.eveChar.TimesOpened, 0)
-    })
+    this.service.getCharacteristic(this.eveChar.ResetTotal).onSet(() => {
+      this.service.updateCharacteristic(this.eveChar.TimesOpened, 0);
+    });
 
     // Add the battery service if it doesn't already exist
-    this.batteryService =
-      this.accessory.getService(this.hapServ.Battery) ||
-      this.accessory.addService(this.hapServ.Battery)
+    this.batteryService = this.accessory.getService(this.hapServ.Battery)
+      || this.accessory.addService(this.hapServ.Battery);
 
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new platform.eveService('door', this.accessory, {
-      log: platform.config.debugFakegato ? this.log : () => {}
-    })
+      log: platform.config.debugFakegato ? this.log : () => {},
+    });
     this.accessory.eveService.addEntry({
-      status: this.service.getCharacteristic(this.hapChar.ContactSensorState).value
-    })
+      status: this.service.getCharacteristic(this.hapChar.ContactSensorState).value,
+    });
 
     // Output the customised options to the log
+    const normalLogging = this.enableLogging ? 'standard' : 'disable';
     const opts = JSON.stringify({
-      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
+      logging: this.enableDebugLogging ? 'debug' : normalLogging,
       lowBattThreshold: this.lowBattThreshold,
-      showAs: 'default'
-    })
-    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
+      showAs: 'default',
+    });
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts);
   }
 
-  async externalUpdate (params) {
+  async externalUpdate(params) {
     try {
-      if (this.funcs.hasProperty(params, 'battery') && params.battery !== this.cacheBatt) {
-        this.cacheBatt = params.battery
-        this.cacheBattScaled = Math.min(Math.max(this.cacheBatt, 2), 3)
-        this.cacheBattScaled = Math.round((this.cacheBattScaled - 2) * 100)
-        this.batteryService.updateCharacteristic(this.hapChar.BatteryLevel, this.cacheBattScaled)
+      if (hasProperty(params, 'battery') && params.battery !== this.cacheBatt) {
+        this.cacheBatt = params.battery;
+        this.cacheBattScaled = Math.min(Math.max(this.cacheBatt, 2), 3);
+        this.cacheBattScaled = Math.round((this.cacheBattScaled - 2) * 100);
+        this.batteryService.updateCharacteristic(this.hapChar.BatteryLevel, this.cacheBattScaled);
         this.batteryService.updateCharacteristic(
           this.hapChar.StatusLowBattery,
-          this.cacheBattScaled < this.lowBattThreshold ? 1 : 0
-        )
+          this.cacheBattScaled < this.lowBattThreshold ? 1 : 0,
+        );
         if (params.updateSource && this.enableLogging) {
-          this.log('[%s] %s [%s%].', this.name, this.lang.curBatt, this.cacheBattScaled)
+          this.log('[%s] %s [%s%].', this.name, this.lang.curBatt, this.cacheBattScaled);
         }
       }
       if (!params.switch || params.switch === this.cacheState) {
-        return
+        return;
       }
-      this.cacheState = params.switch
-      const newState = params.switch === 'on' ? 1 : 0
+      this.cacheState = params.switch;
+      const newState = params.switch === 'on' ? 1 : 0;
       if (newState === 1) {
-        this.service.updateCharacteristic(this.hapChar.ContactSensorState, 1)
-        this.accessory.eveService.addEntry({ status: 1 })
-        const initialTime = this.accessory.eveService.getInitialTime()
+        this.service.updateCharacteristic(this.hapChar.ContactSensorState, 1);
+        this.accessory.eveService.addEntry({ status: 1 });
+        const initialTime = this.accessory.eveService.getInitialTime();
         this.service.updateCharacteristic(
           this.eveChar.LastActivation,
-          Math.round(new Date().valueOf() / 1000) - initialTime
-        )
-        const newTO = this.service.getCharacteristic(this.eveChar.TimesOpened).value + 1
-        this.service.updateCharacteristic(this.eveChar.TimesOpened, newTO)
+          Math.round(new Date().valueOf() / 1000) - initialTime,
+        );
+        const newTO = this.service.getCharacteristic(this.eveChar.TimesOpened).value + 1;
+        this.service.updateCharacteristic(this.eveChar.TimesOpened, newTO);
       } else {
-        this.service.updateCharacteristic(this.hapChar.ContactSensorState, 0)
-        this.accessory.eveService.addEntry({ status: 0 })
+        this.service.updateCharacteristic(this.hapChar.ContactSensorState, 0);
+        this.accessory.eveService.addEntry({ status: 0 });
       }
       if (params.updateSource && this.enableLogging) {
         this.log(
           '[%s] %s [%s].',
           this.name,
           this.lang.curState,
-          newState === 0 ? this.lang.contactYes : this.lang.contactNo
-        )
+          newState === 0 ? this.lang.contactYes : this.lang.contactNo,
+        );
       }
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, false)
+      this.platform.deviceUpdateError(this.accessory, err, false);
     }
   }
 }
diff --git a/lib/device/sensor-temp-humi.js b/lib/device/sensor-temp-humi.js
index 39d1d579..401c73ce 100644
--- a/lib/device/sensor-temp-humi.js
+++ b/lib/device/sensor-temp-humi.js
@@ -1,188 +1,183 @@
-/* jshint node: true, esversion: 10, -W014, -W033 */
-/* eslint-disable new-cap */
-'use strict'
+import platformConsts from '../utils/constants.js';
+import { hasProperty, parseError } from '../utils/functions.js';
 
-module.exports = class deviceSensorTempHumi {
-  constructor (platform, accessory) {
+export default class {
+  constructor(platform, accessory) {
     // Set up variables from the platform
-    this.funcs = platform.funcs
-    this.hapChar = platform.api.hap.Characteristic
-    this.hapServ = platform.api.hap.Service
-    this.lang = platform.lang
-    this.log = platform.log
-    this.platform = platform
+    this.hapChar = platform.api.hap.Characteristic;
+    this.hapServ = platform.api.hap.Service;
+    this.lang = platform.lang;
+    this.log = platform.log;
+    this.platform = platform;
 
     // Set up variables from the accessory
-    this.name = accessory.displayName
-    this.accessory = accessory
+    this.name = accessory.displayName;
+    this.accessory = accessory;
 
     // Initially set the online flag as true (to be then updated as false if necessary)
-    this.isOnline = true
+    this.isOnline = true;
 
     // Set up custom variables for this device type
-    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
-    this.tempOffset =
-      deviceConf && deviceConf.offset ? deviceConf.offset : platform.consts.defaultValues.offset
-    this.tempOffsetFactor = deviceConf && deviceConf.offsetFactor
-    this.humiOffset =
-      deviceConf && deviceConf.humidityOffset
-        ? parseInt(deviceConf.humidityOffset)
-        : platform.consts.defaultValues.humidityOffset
-    this.humiOffsetFactor = deviceConf && deviceConf.humidityOffsetFactor
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId] || {};
+    this.tempOffset = deviceConf.offset || platformConsts.defaultValues.offset;
+    this.tempOffsetFactor = deviceConf.offsetFactor;
+    this.humiOffset = deviceConf && deviceConf.humidityOffset
+      ? parseInt(deviceConf.humidityOffset, 10)
+      : platformConsts.defaultValues.humidityOffset;
+    this.humiOffsetFactor = deviceConf.humidityOffsetFactor;
 
     // Set the correct logging variables for this accessory
-    this.enableLogging = !platform.config.disableDeviceLogging
-    this.enableDebugLogging = platform.config.debug
-    if (deviceConf && deviceConf.overrideLogging) {
-      switch (deviceConf.overrideLogging) {
-        case 'standard':
-          this.enableLogging = true
-          this.enableDebugLogging = false
-          break
-        case 'debug':
-          this.enableLogging = true
-          this.enableDebugLogging = true
-          break
-        case 'disable':
-          this.enableLogging = false
-          this.enableDebugLogging = false
-          break
-      }
+    switch (deviceConf.overrideLogging) {
+      case 'standard':
+        this.enableLogging = true;
+        this.enableDebugLogging = false;
+        break;
+      case 'debug':
+        this.enableLogging = true;
+        this.enableDebugLogging = true;
+        break;
+      case 'disable':
+        this.enableLogging = false;
+        this.enableDebugLogging = false;
+        break;
+      default:
+        this.enableLogging = !platform.config.disableDeviceLogging;
+        this.enableDebugLogging = platform.config.debug;
+        break;
     }
 
     // Add the temperature sensor service if it doesn't already exist
-    this.tempService =
-      this.accessory.getService(this.hapServ.TemperatureSensor) ||
-      this.accessory.addService(this.hapServ.TemperatureSensor)
+    this.tempService = this.accessory.getService(this.hapServ.TemperatureSensor)
+      || this.accessory.addService(this.hapServ.TemperatureSensor);
 
     // Set custom properties of the current temperature characteristic
     this.tempService.getCharacteristic(this.hapChar.CurrentTemperature).setProps({
-      minStep: 0.1
-    })
-    this.cacheTemp = this.tempService.getCharacteristic(this.hapChar.CurrentTemperature).value
-    this.updateCache()
+      minStep: 0.1,
+    });
+    this.cacheTemp = this.tempService.getCharacteristic(this.hapChar.CurrentTemperature).value;
+    this.updateCache();
 
     // Add the humidity sensor service if it doesn't already exist
-    this.humiService =
-      this.accessory.getService(this.hapServ.HumiditySensor) ||
-      this.accessory.addService(this.hapServ.HumiditySensor)
+    this.humiService = this.accessory.getService(this.hapServ.HumiditySensor)
+      || this.accessory.addService(this.hapServ.HumiditySensor);
 
     // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
     if (!platform.config.disableNoResponse) {
       this.tempService
         .getCharacteristic(this.hapChar.CurrentTemperature)
         .setProps({
-          minStep: 0.1
+          minStep: 0.1,
         })
         .onGet(() => {
           if (!this.isOnline) {
-            throw new this.hapErr(-70402)
+            throw new this.hapErr(-70402);
           }
-          return this.tempService.getCharacteristic(this.hapChar.CurrentTemperature).value
-        })
+          return this.tempService.getCharacteristic(this.hapChar.CurrentTemperature).value;
+        });
       this.humiService.getCharacteristic(this.hapChar.CurrentRelativeHumidity).onGet(() => {
         if (!this.isOnline) {
-          throw new this.hapErr(-70402)
+          throw new this.hapErr(-70402);
         }
-        return this.humiService.getCharacteristic(this.hapChar.CurrentRelativeHumidity).value
-      })
+        return this.humiService.getCharacteristic(this.hapChar.CurrentRelativeHumidity).value;
+      });
     }
 
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new platform.eveService('custom', this.accessory, {
-      log: platform.config.debugFakegato ? this.log : () => {}
-    })
+      log: platform.config.debugFakegato ? this.log : () => {},
+    });
 
     // Output the customised options to the log
+    const normalLogging = this.enableLogging ? 'standard' : 'disable';
     const opts = JSON.stringify({
       humidityOffset: this.humiOffset,
       humidityOffsetFactor: this.humiOffsetFactor,
-      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
+      logging: this.enableDebugLogging ? 'debug' : normalLogging,
       offset: this.tempOffset,
-      offsetFactor: this.tempOffsetFactor
-    })
-    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
+      offsetFactor: this.tempOffsetFactor,
+    });
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts);
   }
 
-  async externalUpdate (params) {
+  async externalUpdate(params) {
     try {
-      if (this.funcs.hasProperty(params, 'temperature')) {
-        let newTemp = Number(params.temperature)
+      if (hasProperty(params, 'temperature')) {
+        let newTemp = Number(params.temperature);
         if (this.tempOffsetFactor) {
-          newTemp *= this.tempOffset
+          newTemp *= this.tempOffset;
         } else {
-          newTemp += this.tempOffset
+          newTemp += this.tempOffset;
         }
         if (newTemp !== this.cacheTemp) {
-          this.cacheTemp = newTemp
-          this.tempService.updateCharacteristic(this.hapChar.CurrentTemperature, this.cacheTemp)
-          this.accessory.eveService.addEntry({ temp: this.cacheTemp })
+          this.cacheTemp = newTemp;
+          this.tempService.updateCharacteristic(this.hapChar.CurrentTemperature, this.cacheTemp);
+          this.accessory.eveService.addEntry({ temp: this.cacheTemp });
           if (params.updateSource && this.enableLogging) {
-            this.log('[%s] %s [%s°C].', this.name, this.lang.curTemp, this.cacheTemp)
+            this.log('[%s] %s [%s°C].', this.name, this.lang.curTemp, this.cacheTemp);
           }
 
           // Update the cache file with the new temperature
-          this.updateCache()
+          this.updateCache();
         }
       }
-      if (this.funcs.hasProperty(params, 'humidity')) {
-        let newHumi = parseInt(params.humidity)
+      if (hasProperty(params, 'humidity')) {
+        let newHumi = parseInt(params.humidity, 10);
         if (this.humiOffsetFactor) {
-          newHumi *= this.humiOffset
+          newHumi *= this.humiOffset;
         } else {
-          newHumi += this.humiOffset
+          newHumi += this.humiOffset;
         }
-        newHumi = Math.max(Math.min(parseInt(newHumi), 100), 0)
+        newHumi = Math.max(Math.min(parseInt(newHumi, 10), 100), 0);
         if (newHumi !== this.cacheHumi) {
-          this.cacheHumi = newHumi
+          this.cacheHumi = newHumi;
           this.humiService.updateCharacteristic(
             this.hapChar.CurrentRelativeHumidity,
-            this.cacheHumi
-          )
-          this.accessory.eveService.addEntry({ humidity: this.cacheHumi })
+            this.cacheHumi,
+          );
+          this.accessory.eveService.addEntry({ humidity: this.cacheHumi });
           if (params.updateSource && this.enableLogging) {
-            this.log('[%s] %s [%s%].', this.name, this.lang.curHumi, this.cacheHumi)
+            this.log('[%s] %s [%s%].', this.name, this.lang.curHumi, this.cacheHumi);
           }
         }
       }
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, false)
+      this.platform.deviceUpdateError(this.accessory, err, false);
     }
   }
 
-  async updateCache () {
+  async updateCache() {
     // Don't continue if the storage client hasn't initialised properly
     if (!this.platform.storageClientData) {
-      return
+      return;
     }
 
     // Attempt to save the new temperature to the cache
     try {
       await this.platform.storageData.setItem(
-        this.accessory.context.eweDeviceId + '_temp',
-        this.cacheTemp
-      )
+        `${this.accessory.context.eweDeviceId}_temp`,
+        this.cacheTemp,
+      );
     } catch (err) {
       if (this.enableLogging) {
-        const eText = this.funcs.parseError(err)
-        this.log.warn('[%s] %s %s.', this.name, this.lang.storageWriteErr, eText)
+        const eText = parseError(err);
+        this.log.warn('[%s] %s %s.', this.name, this.lang.storageWriteErr, eText);
       }
     }
   }
 
-  currentState () {
-    const toReturn = {}
-    toReturn.services = ['temperature', 'humidity']
+  currentState() {
+    const toReturn = {};
+    toReturn.services = ['temperature', 'humidity'];
     toReturn.temperature = {
-      current: this.tempService.getCharacteristic(this.hapChar.CurrentTemperature).value
-    }
+      current: this.tempService.getCharacteristic(this.hapChar.CurrentTemperature).value,
+    };
     toReturn.humidity = {
-      current: this.humiService.getCharacteristic(this.hapChar.CurrentRelativeHumidity).value
-    }
-    return toReturn
+      current: this.humiService.getCharacteristic(this.hapChar.CurrentRelativeHumidity).value,
+    };
+    return toReturn;
   }
 
-  markStatus (isOnline) {
-    this.isOnline = isOnline
+  markStatus(isOnline) {
+    this.isOnline = isOnline;
   }
 }
diff --git a/lib/device/simulation/blind.js b/lib/device/simulation/blind.js
index e3a21c1b..ae186a92 100644
--- a/lib/device/simulation/blind.js
+++ b/lib/device/simulation/blind.js
@@ -1,254 +1,253 @@
-/* jshint node: true, esversion: 10, -W014, -W033 */
-/* eslint-disable new-cap */
-'use strict'
+import platformConsts from '../../utils/constants.js';
+import { generateRandomString, hasProperty, sleep } from '../../utils/functions.js';
 
-module.exports = class deviceBlind {
-  constructor (platform, accessory) {
+export default class {
+  constructor(platform, accessory) {
     // Set up variables from the platform
-    this.eveChar = platform.eveChar
-    this.funcs = platform.funcs
-    this.hapChar = platform.api.hap.Characteristic
-    this.hapErr = platform.api.hap.HapStatusError
-    this.hapServ = platform.api.hap.Service
-    this.lang = platform.lang
-    this.log = platform.log
-    this.platform = platform
+    this.eveChar = platform.eveChar;
+    this.hapChar = platform.api.hap.Characteristic;
+    this.hapErr = platform.api.hap.HapStatusError;
+    this.hapServ = platform.api.hap.Service;
+    this.lang = platform.lang;
+    this.log = platform.log;
+    this.platform = platform;
 
     // Set up variables from the accessory
-    this.name = accessory.displayName
-    this.accessory = accessory
+    this.name = accessory.displayName;
+    this.accessory = accessory;
 
     // Initially set the online flag as true (to be then updated as false if necessary)
-    this.isOnline = true
+    this.isOnline = true;
 
     // Set up custom variables for this device type
-    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
-    this.operationTimeUp = deviceConf.operationTime || platform.consts.defaultValues.operationTime
-    this.operationTimeDown = deviceConf.operationTimeDown || this.operationTimeUp
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId] || {};
+    this.operationTimeUp = deviceConf.operationTime || platformConsts.defaultValues.operationTime;
+    this.operationTimeDown = deviceConf.operationTimeDown || this.operationTimeUp;
 
     // Set the correct logging variables for this accessory
-    this.enableLogging = !platform.config.disableDeviceLogging
-    this.enableDebugLogging = platform.config.debug
-    if (deviceConf && deviceConf.overrideLogging) {
-      switch (deviceConf.overrideLogging) {
-        case 'standard':
-          this.enableLogging = true
-          this.enableDebugLogging = false
-          break
-        case 'debug':
-          this.enableLogging = true
-          this.enableDebugLogging = true
-          break
-        case 'disable':
-          this.enableLogging = false
-          this.enableDebugLogging = false
-          break
-      }
+    switch (deviceConf.overrideLogging) {
+      case 'standard':
+        this.enableLogging = true;
+        this.enableDebugLogging = false;
+        break;
+      case 'debug':
+        this.enableLogging = true;
+        this.enableDebugLogging = true;
+        break;
+      case 'disable':
+        this.enableLogging = false;
+        this.enableDebugLogging = false;
+        break;
+      default:
+        this.enableLogging = !platform.config.disableDeviceLogging;
+        this.enableDebugLogging = platform.config.debug;
+        break;
     }
 
     // Set up the accessory with default positions when added the first time
-    if (!this.funcs.hasProperty(this.accessory.context, 'cacheCurrentPosition')) {
-      this.accessory.context.cacheCurrentPosition = 0
-      this.accessory.context.cachePositionState = 2
-      this.accessory.context.cacheTargetPosition = 0
+    if (!hasProperty(this.accessory.context, 'cacheCurrentPosition')) {
+      this.accessory.context.cacheCurrentPosition = 0;
+      this.accessory.context.cachePositionState = 2;
+      this.accessory.context.cacheTargetPosition = 0;
     }
 
     // Add the window covering service if it doesn't already exist
-    if (!(this.service = this.accessory.getService(this.hapServ.WindowCovering))) {
-      this.service = this.accessory.addService(this.hapServ.WindowCovering)
-      this.service.updateCharacteristic(this.hapChar.CurrentPosition, 0)
-      this.service.updateCharacteristic(this.hapChar.TargetPosition, 0)
-      this.service.updateCharacteristic(this.hapChar.PositionState, 2)
+    this.service = this.accessory.getService(this.hapServ.WindowCovering);
+    if (!this.service) {
+      this.service = this.accessory.addService(this.hapServ.WindowCovering);
+      this.service.updateCharacteristic(this.hapChar.CurrentPosition, 0);
+      this.service.updateCharacteristic(this.hapChar.TargetPosition, 0);
+      this.service.updateCharacteristic(this.hapChar.PositionState, 2);
     }
 
     // Certain devices give power readings
-    if (platform.consts.devices.switchMultiPower.includes(this.accessory.context.eweUIID)) {
+    if (platformConsts.devices.switchMultiPower.includes(this.accessory.context.eweUIID)) {
       // Add Eve power characteristics
-      this.powerReadings = true
+      this.powerReadings = true;
       if (!this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
-        this.service.addCharacteristic(this.eveChar.CurrentConsumption)
+        this.service.addCharacteristic(this.eveChar.CurrentConsumption);
       }
       if (!this.service.testCharacteristic(this.eveChar.ElectricCurrent)) {
-        this.service.addCharacteristic(this.eveChar.ElectricCurrent)
+        this.service.addCharacteristic(this.eveChar.ElectricCurrent);
       }
       if (!this.service.testCharacteristic(this.eveChar.Voltage)) {
-        this.service.addCharacteristic(this.eveChar.Voltage)
+        this.service.addCharacteristic(this.eveChar.Voltage);
       }
     }
 
     // Add the set handler to the target position characteristic
-    this.service.getCharacteristic(this.hapChar.TargetPosition).onSet(value => {
+    this.service.getCharacteristic(this.hapChar.TargetPosition).onSet((value) => {
       // We don't use await as we want the callback to be run straight away
-      this.internalPositionUpdate(value)
-    })
+      this.internalPositionUpdate(value);
+    });
 
     // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
     if (!platform.config.disableNoResponse) {
       this.service.getCharacteristic(this.hapChar.CurrentPosition).onGet(() => {
         if (!this.isOnline) {
-          throw new this.hapErr(-70402)
+          throw new this.hapErr(-70402);
         }
-        return this.service.getCharacteristic(this.hapChar.CurrentPosition).value
-      })
+        return this.service.getCharacteristic(this.hapChar.CurrentPosition).value;
+      });
       this.service.getCharacteristic(this.hapChar.TargetPosition).onGet(() => {
         if (!this.isOnline) {
-          throw new this.hapErr(-70402)
+          throw new this.hapErr(-70402);
         }
-        return this.service.getCharacteristic(this.hapChar.TargetPosition).value
-      })
+        return this.service.getCharacteristic(this.hapChar.TargetPosition).value;
+      });
     }
 
     // Set up an interval to get eWeLink to send power updates
     if (this.powerReadings && platform.config.mode !== 'lan') {
       setTimeout(() => {
-        this.internalUIUpdate()
-        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
-      }, 5000)
+        this.internalUIUpdate();
+        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000);
+      }, 5000);
 
       // Stop the intervals on Homebridge shutdown
-      platform.api.on('shutdown', () => clearInterval(this.intervalPoll))
+      platform.api.on('shutdown', () => clearInterval(this.intervalPoll));
     }
 
     // Output the customised options to the log
+    const normalLogging = this.enableLogging ? 'standard' : 'disable';
     const opts = JSON.stringify({
-      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
+      logging: this.enableDebugLogging ? 'debug' : normalLogging,
       operationTimeDown: this.operationTimeDown,
       operationTimeUp: this.operationTimeUp,
-      showAs: 'blind'
-    })
-    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
+      showAs: 'blind',
+    });
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts);
   }
 
-  async internalPositionUpdate (value) {
+  async internalPositionUpdate(value) {
     try {
-      let prevPosition = this.accessory.context.cacheCurrentPosition
+      let prevPosition = this.accessory.context.cacheCurrentPosition;
       if (value === prevPosition) {
-        return
+        return;
       }
       const params = {
-        switches: []
-      }
-      const prevState = this.accessory.context.cachePositionState
-      const percentStepUpPerDS = this.operationTimeUp / 100
-      const percentStepDownPerDS = this.operationTimeDown / 100
-      const updateKey = this.funcs.generateRandomString(5)
-      this.updateKey = updateKey
+        switches: [],
+      };
+      const prevState = this.accessory.context.cachePositionState;
+      const percentStepUpPerDS = this.operationTimeUp / 100;
+      const percentStepDownPerDS = this.operationTimeDown / 100;
+      const updateKey = generateRandomString(5);
+      this.updateKey = updateKey;
       if (prevState !== 2) {
-        params.switches.push({ switch: 'off', outlet: 0 })
-        params.switches.push({ switch: 'off', outlet: 1 })
-        await this.platform.sendDeviceUpdate(this.accessory, params)
-        params.switches = []
-        const posPercentChange =
-          Math.floor(Date.now() / 100) - this.accessory.context.cacheLastStartTime
-        const posPercentChangeUp = Math.floor(percentStepUpPerDS * posPercentChange)
-        const posPercentChangeDown = Math.floor(percentStepDownPerDS * posPercentChange)
+        params.switches.push({ switch: 'off', outlet: 0 });
+        params.switches.push({ switch: 'off', outlet: 1 });
+        await this.platform.sendDeviceUpdate(this.accessory, params);
+        params.switches = [];
+        const posPercentChange = Math.floor(Date.now() / 100) - this.accessory.context.cacheLastStartTime;
+        const posPercentChangeUp = Math.floor(percentStepUpPerDS * posPercentChange);
+        const posPercentChangeDown = Math.floor(percentStepDownPerDS * posPercentChange);
         if (prevState === 0) {
           // Was going down
-          prevPosition -= posPercentChangeDown
+          prevPosition -= posPercentChangeDown;
         } else {
           // Was going up
-          prevPosition += posPercentChangeUp
+          prevPosition += posPercentChangeUp;
         }
-        prevPosition = Math.min(Math.max(prevPosition, 0), 100)
-        this.service.updateCharacteristic(this.hapChar.CurrentPosition, prevPosition)
-        this.accessory.context.cacheCurrentPosition = prevPosition
+        prevPosition = Math.min(Math.max(prevPosition, 0), 100);
+        this.service.updateCharacteristic(this.hapChar.CurrentPosition, prevPosition);
+        this.accessory.context.cacheCurrentPosition = prevPosition;
       }
-      const diffPosition = value - prevPosition
-      const setToMoveUp = diffPosition > 0
-      let decisecondsToMove
+      const diffPosition = value - prevPosition;
+      const setToMoveUp = diffPosition > 0;
+      let decisecondsToMove;
       if (setToMoveUp) {
-        decisecondsToMove = Math.round(Math.abs(diffPosition) * percentStepUpPerDS)
-        params.switches.push({ switch: 'on', outlet: 0 })
+        decisecondsToMove = Math.round(Math.abs(diffPosition) * percentStepUpPerDS);
+        params.switches.push({ switch: 'on', outlet: 0 });
       } else {
-        decisecondsToMove = Math.round(Math.abs(diffPosition) * percentStepDownPerDS)
-        params.switches.push({ switch: 'on', outlet: 1 })
-      }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
-      params.switches = []
-      this.accessory.context.cacheTargetPosition = value
-      this.accessory.context.cachePositionState = setToMoveUp ? 1 : 0
-      this.accessory.context.cacheLastStartTime = Math.floor(Date.now() / 100)
-      await this.funcs.sleep(decisecondsToMove * 100)
+        decisecondsToMove = Math.round(Math.abs(diffPosition) * percentStepDownPerDS);
+        params.switches.push({ switch: 'on', outlet: 1 });
+      }
+      await this.platform.sendDeviceUpdate(this.accessory, params);
+      params.switches = [];
+      this.accessory.context.cacheTargetPosition = value;
+      this.accessory.context.cachePositionState = setToMoveUp ? 1 : 0;
+      this.accessory.context.cacheLastStartTime = Math.floor(Date.now() / 100);
+      await sleep(decisecondsToMove * 100);
       if (this.updateKey !== updateKey) {
-        return
+        return;
       }
       params.switches.push({
         switch: 'off',
-        outlet: setToMoveUp ? 0 : 1
-      })
-      await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.service.updateCharacteristic(this.hapChar.PositionState, 2)
-      this.service.updateCharacteristic(this.hapChar.CurrentPosition, value)
-      this.accessory.context.cachePositionState = 2
-      this.accessory.context.cacheCurrentPosition = value
+        outlet: setToMoveUp ? 0 : 1,
+      });
+      await this.platform.sendDeviceUpdate(this.accessory, params);
+      this.service.updateCharacteristic(this.hapChar.PositionState, 2);
+      this.service.updateCharacteristic(this.hapChar.CurrentPosition, value);
+      this.accessory.context.cachePositionState = 2;
+      this.accessory.context.cacheCurrentPosition = value;
       if (this.enableLogging) {
-        this.log('[%s] %s [%s%]', this.name, this.lang.curPos, value)
+        this.log('[%s] %s [%s%]', this.name, this.lang.curPos, value);
       }
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true);
       setTimeout(() => {
         this.service.updateCharacteristic(
           this.hapChar.TargetPosition,
-          this.accessory.context.cacheTargetPosition
-        )
-      }, 2000)
-      this.service.updateCharacteristic(this.hapChar.TargetPosition, new this.hapErr(-70402))
+          this.accessory.context.cacheTargetPosition,
+        );
+      }, 2000);
+      this.service.updateCharacteristic(this.hapChar.TargetPosition, new this.hapErr(-70402));
     }
   }
 
-  async internalUIUpdate () {
+  async internalUIUpdate() {
     try {
       // Skip polling if device isn't online
       if (!this.isOnline) {
-        return
+        return;
       }
 
       // Send the params to request the updates
-      await this.platform.sendDeviceUpdate(this.accessory, { uiActive: { outlet: 0, time: 120 } })
+      await this.platform.sendDeviceUpdate(this.accessory, { uiActive: { outlet: 0, time: 120 } });
     } catch (err) {
       // Suppress errors here
     }
   }
 
-  async externalUpdate (params) {
+  async externalUpdate(params) {
     try {
       if (!this.powerReadings) {
-        return
-      }
-      let logger = false
-      let power
-      let voltage
-      let current
-      if (this.funcs.hasProperty(params, 'actPow_00')) {
-        power = parseInt(params.actPow_00) / 100
-        this.service.updateCharacteristic(this.eveChar.CurrentConsumption, power)
-        logger = true
-      }
-      if (this.funcs.hasProperty(params, 'voltage_00')) {
-        voltage = parseInt(params.voltage_00) / 100
-        this.service.updateCharacteristic(this.eveChar.Voltage, voltage)
-        logger = true
-      }
-      if (this.funcs.hasProperty(params, 'current_00')) {
-        current = parseInt(params.current_00) / 100
-        this.service.updateCharacteristic(this.eveChar.ElectricCurrent, current)
-        logger = true
+        return;
+      }
+      let logger = false;
+      let power;
+      let voltage;
+      let current;
+      if (hasProperty(params, 'actPow_00')) {
+        power = parseInt(params.actPow_00, 10) / 100;
+        this.service.updateCharacteristic(this.eveChar.CurrentConsumption, power);
+        logger = true;
+      }
+      if (hasProperty(params, 'voltage_00')) {
+        voltage = parseInt(params.voltage_00, 10) / 100;
+        this.service.updateCharacteristic(this.eveChar.Voltage, voltage);
+        logger = true;
+      }
+      if (hasProperty(params, 'current_00')) {
+        current = parseInt(params.current_00, 10) / 100;
+        this.service.updateCharacteristic(this.eveChar.ElectricCurrent, current);
+        logger = true;
       }
       if (params.updateSource && logger && this.enableLogging) {
         this.log(
           '[%s] %s%s%s.',
           this.name,
-          power !== undefined ? this.lang.curPower + ' [' + power + 'W]' : '',
-          voltage !== undefined ? ' ' + this.lang.curVolt + ' [' + voltage + 'V]' : '',
-          current !== undefined ? ' ' + this.lang.curCurr + ' [' + current + 'A]' : ''
-        )
+          power !== undefined ? `${this.lang.curPower} [${power}W]` : '',
+          voltage !== undefined ? ` ${this.lang.curVolt} [${voltage}V]` : '',
+          current !== undefined ? ` ${this.lang.curCurr} [${current}A]` : '',
+        );
       }
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, false)
+      this.platform.deviceUpdateError(this.accessory, err, false);
     }
   }
 
-  markStatus (isOnline) {
-    this.isOnline = isOnline
+  markStatus(isOnline) {
+    this.isOnline = isOnline;
   }
 }
diff --git a/lib/device/simulation/cooler.js b/lib/device/simulation/cooler.js
index 2cf9d1b9..92316918 100644
--- a/lib/device/simulation/cooler.js
+++ b/lib/device/simulation/cooler.js
@@ -1,321 +1,314 @@
-/* jshint node: true, esversion: 10, -W014, -W033 */
-/* eslint-disable new-cap */
-'use strict'
+import { hasProperty, parseError } from '../../utils/functions.js';
 
-module.exports = class deviceCooler {
-  constructor (platform, accessory) {
+export default class {
+  constructor(platform, accessory) {
     // Set up variables from the platform
-    this.funcs = platform.funcs
-    this.hapChar = platform.api.hap.Characteristic
-    this.hapErr = platform.api.hap.HapStatusError
-    this.hapServ = platform.api.hap.Service
-    this.lang = platform.lang
-    this.log = platform.log
-    this.platform = platform
+    this.hapChar = platform.api.hap.Characteristic;
+    this.hapErr = platform.api.hap.HapStatusError;
+    this.hapServ = platform.api.hap.Service;
+    this.lang = platform.lang;
+    this.log = platform.log;
+    this.platform = platform;
 
     // Set up variables from the accessory
-    this.name = accessory.displayName
-    this.accessory = accessory
+    this.name = accessory.displayName;
+    this.accessory = accessory;
 
     // Initially set the online flag as true (to be then updated as false if necessary)
-    this.isOnline = true
+    this.isOnline = true;
 
     // Set up custom variables for this device type
-    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
-    this.temperatureSource = deviceConf.temperatureSource
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId] || {};
+    this.temperatureSource = deviceConf.temperatureSource;
 
     // Set the correct logging variables for this accessory
-    this.enableLogging = !platform.config.disableDeviceLogging
-    this.enableDebugLogging = platform.config.debug
-    if (deviceConf && deviceConf.overrideLogging) {
-      switch (deviceConf.overrideLogging) {
-        case 'standard':
-          this.enableLogging = true
-          this.enableDebugLogging = false
-          break
-        case 'debug':
-          this.enableLogging = true
-          this.enableDebugLogging = true
-          break
-        case 'disable':
-          this.enableLogging = false
-          this.enableDebugLogging = false
-          break
-      }
+    switch (deviceConf.overrideLogging) {
+      case 'standard':
+        this.enableLogging = true;
+        this.enableDebugLogging = false;
+        break;
+      case 'debug':
+        this.enableLogging = true;
+        this.enableDebugLogging = true;
+        break;
+      case 'disable':
+        this.enableLogging = false;
+        this.enableDebugLogging = false;
+        break;
+      default:
+        this.enableLogging = !platform.config.disableDeviceLogging;
+        this.enableDebugLogging = platform.config.debug;
+        break;
     }
 
     // If the accessory has a switch service then remove it
     if (this.accessory.getService(this.hapServ.Switch)) {
-      this.accessory.removeService(this.accessory.getService(this.hapServ.Switch))
+      this.accessory.removeService(this.accessory.getService(this.hapServ.Switch));
     }
 
     // Set up the accessory with default target temp when added the first time
-    if (!this.funcs.hasProperty(this.accessory.context, 'cacheTarget')) {
-      this.accessory.context.cacheTarget = 20
+    if (!hasProperty(this.accessory.context, 'cacheTarget')) {
+      this.accessory.context.cacheTarget = 20;
     }
 
     // Check to make sure user has not switched from cooler to heater
     if (this.accessory.context.cacheType !== 'cooler') {
       // Remove and re-setup as a HeaterCooler
       if (this.accessory.getService(this.hapServ.HeaterCooler)) {
-        this.accessory.removeService(this.accessory.getService(this.hapServ.HeaterCooler))
+        this.accessory.removeService(this.accessory.getService(this.hapServ.HeaterCooler));
       }
-      this.accessory.context.cacheType = 'cooler'
-      this.accessory.context.cacheTarget = 20
+      this.accessory.context.cacheType = 'cooler';
+      this.accessory.context.cacheTarget = 20;
     }
 
     // Add the heater service if it doesn't already exist
-    this.service =
-      this.accessory.getService(this.hapServ.HeaterCooler) ||
-      this.accessory.addService(this.hapServ.HeaterCooler)
+    this.service = this.accessory.getService(this.hapServ.HeaterCooler)
+      || this.accessory.addService(this.hapServ.HeaterCooler);
 
     // Set custom properties of the current temperature characteristic
     this.service.getCharacteristic(this.hapChar.CurrentTemperature).setProps({
-      minStep: 0.1
-    })
-    this.cacheTemp = this.service.getCharacteristic(this.hapChar.CurrentTemperature).value
+      minStep: 0.1,
+    });
+    this.cacheTemp = this.service.getCharacteristic(this.hapChar.CurrentTemperature).value;
 
     // Add the set handler to the heater active characteristic
     this.service
       .getCharacteristic(this.hapChar.Active)
-      .onSet(async value => await this.internalStateUpdate(value))
+      .onSet(async (value) => this.internalStateUpdate(value));
 
     // Add options to the target state characteristic
     this.service.getCharacteristic(this.hapChar.TargetHeaterCoolerState).setProps({
       minValue: 0,
       maxValue: 0,
-      validValues: [0]
-    })
+      validValues: [0],
+    });
 
     // Add the set handler to the target temperature characteristic
     this.service
       .getCharacteristic(this.hapChar.CoolingThresholdTemperature)
       .updateValue(this.accessory.context.cacheTarget)
       .setProps({ minStep: 0.5 })
-      .onSet(async value => await this.internalTargetTempUpdate(value))
+      .onSet(async (value) => this.internalTargetTempUpdate(value));
 
     // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
     if (!platform.config.disableNoResponse) {
       this.service.getCharacteristic(this.hapChar.CurrentTemperature).onGet(() => {
         if (!this.isOnline) {
-          throw new this.hapErr(-70402)
+          throw new this.hapErr(-70402);
         }
-        return this.service.getCharacteristic(this.hapChar.CurrentTemperature).value
-      })
+        return this.service.getCharacteristic(this.hapChar.CurrentTemperature).value;
+      });
       this.service.getCharacteristic(this.hapChar.Active).onGet(() => {
         if (!this.isOnline) {
-          throw new this.hapErr(-70402)
+          throw new this.hapErr(-70402);
         }
-        return this.service.getCharacteristic(this.hapChar.Active).value
-      })
+        return this.service.getCharacteristic(this.hapChar.Active).value;
+      });
       this.service.getCharacteristic(this.hapChar.TargetHeaterCoolerState).onGet(() => {
         if (!this.isOnline) {
-          throw new this.hapErr(-70402)
+          throw new this.hapErr(-70402);
         }
-        return this.service.getCharacteristic(this.hapChar.TargetHeaterCoolerState).value
-      })
+        return this.service.getCharacteristic(this.hapChar.TargetHeaterCoolerState).value;
+      });
       this.service.getCharacteristic(this.hapChar.CurrentHeaterCoolerState).onGet(() => {
         if (!this.isOnline) {
-          throw new this.hapErr(-70402)
+          throw new this.hapErr(-70402);
         }
-        return this.service.getCharacteristic(this.hapChar.CurrentHeaterCoolerState).value
-      })
+        return this.service.getCharacteristic(this.hapChar.CurrentHeaterCoolerState).value;
+      });
       this.service.getCharacteristic(this.hapChar.CoolingThresholdTemperature).onGet(() => {
         if (!this.isOnline) {
-          throw new this.hapErr(-70402)
+          throw new this.hapErr(-70402);
         }
-        return this.service.getCharacteristic(this.hapChar.CoolingThresholdTemperature).value
-      })
+        return this.service.getCharacteristic(this.hapChar.CoolingThresholdTemperature).value;
+      });
     }
 
     // Initialise these caches now since they aren't determined by the initial externalUpdate()
-    this.cacheState = this.service.getCharacteristic(this.hapChar.Active).value === 1 ? 'on' : 'off'
-    this.cacheCool =
-      this.cacheState === 'on' &&
-      this.service.getCharacteristic(this.hapChar.CurrentHeaterCoolerState).value === 3
-        ? 'on'
-        : 'off'
+    this.cacheState = this.service.getCharacteristic(this.hapChar.Active).value === 1 ? 'on' : 'off';
+    this.cacheCool = this.cacheState === 'on'
+      && this.service.getCharacteristic(this.hapChar.CurrentHeaterCoolerState).value === 3
+      ? 'on'
+      : 'off';
 
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new platform.eveService('custom', this.accessory, {
-      log: platform.config.debugFakegato ? this.log : () => {}
-    })
+      log: platform.config.debugFakegato ? this.log : () => {},
+    });
 
     // Set up an interval to get regular temperature updates
     setTimeout(() => {
-      this.getTemperature()
-      this.intervalPoll = setInterval(() => this.getTemperature(), 120000)
-    }, 5000)
+      this.getTemperature();
+      this.intervalPoll = setInterval(() => this.getTemperature(), 120000);
+    }, 5000);
 
     // Stop the intervals on Homebridge shutdown
     platform.api.on('shutdown', () => {
-      clearInterval(this.intervalPoll)
-    })
+      clearInterval(this.intervalPoll);
+    });
 
     // Output the customised options to the log
+    const normalLogging = this.enableLogging ? 'standard' : 'disable';
     const opts = JSON.stringify({
-      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
+      logging: this.enableDebugLogging ? 'debug' : normalLogging,
       showAs: 'cooler',
-      temperatureSource: this.temperatureSource
-    })
-    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
+      temperatureSource: this.temperatureSource,
+    });
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts);
   }
 
-  async internalStateUpdate (value) {
+  async internalStateUpdate(value) {
     try {
-      let newState
-      let newCool
-      const params = {}
+      let newState;
+      let newCool;
+      const params = {};
       if (value === 0) {
-        params.switch = 'off'
-        newState = 'off'
-        newCool = 'off'
+        params.switch = 'off';
+        newState = 'off';
+        newCool = 'off';
+      } else if (this.cacheTemp > this.accessory.context.cacheTarget) {
+        params.switch = 'on';
+        newState = 'on';
+        newCool = 'on';
       } else {
-        if (this.cacheTemp > this.accessory.context.cacheTarget) {
-          params.switch = 'on'
-          newState = 'on'
-          newCool = 'on'
-        } else {
-          params.switch = 'off'
-          newState = 'on'
-          newCool = 'off'
-        }
+        params.switch = 'off';
+        newState = 'on';
+        newCool = 'off';
       }
 
       // Only send the update if either:
       // * The new value (state) is OFF and the cacheCool was ON
       // * The new value (state) is ON and newCool is 'on'
       if ((value === 0 && this.cacheCool === 'on') || (value === 1 && newCool === 'on')) {
-        await this.platform.sendDeviceUpdate(this.accessory, params)
+        await this.platform.sendDeviceUpdate(this.accessory, params);
       }
       if (newState !== this.cacheState) {
-        this.cacheState = newState
+        this.cacheState = newState;
         if (this.enableLogging) {
-          this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
+          this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState);
         }
       }
       if (newCool !== this.cacheCool) {
-        this.cacheCool = newCool
+        this.cacheCool = newCool;
         if (this.enableLogging) {
-          this.log('[%s] %s [%s].', this.name, this.lang.curCool, this.cacheCool)
+          this.log('[%s] %s [%s].', this.name, this.lang.curCool, this.cacheCool);
         }
       }
+      const hapState = this.cacheCool === 'on' ? 3 : 1;
       this.service.updateCharacteristic(
         this.hapChar.CurrentHeaterCoolerState,
-        value === 1 ? (this.cacheCool === 'on' ? 3 : 1) : 0
-      )
+        value === 1 ? hapState : 0,
+      );
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true);
       setTimeout(() => {
-        this.service.updateCharacteristic(this.hapChar.Active, this.cacheState === 'on' ? 1 : 0)
-      }, 2000)
-      throw new this.hapErr(-70402)
+        this.service.updateCharacteristic(this.hapChar.Active, this.cacheState === 'on' ? 1 : 0);
+      }, 2000);
+      throw new this.hapErr(-70402);
     }
   }
 
-  async internalTargetTempUpdate (value) {
+  async internalTargetTempUpdate(value) {
     try {
       if (value === this.accessory.context.cacheTarget) {
-        return
+        return;
       }
-      this.accessory.context.cacheTarget = value
+      this.accessory.context.cacheTarget = value;
       if (this.enableLogging) {
-        this.log('[%s] %s [%s°C].', this.name, this.lang.curTarg, value)
+        this.log('[%s] %s [%s°C].', this.name, this.lang.curTarg, value);
       }
       if (this.cacheState === 'off') {
-        return
+        return;
       }
-      const params = {}
-      let newCool
+      const params = {};
+      let newCool;
       if (this.cacheTemp > value) {
-        params.switch = 'on'
-        newCool = 'on'
+        params.switch = 'on';
+        newCool = 'on';
       } else {
-        params.switch = 'off'
-        newCool = 'off'
+        params.switch = 'off';
+        newCool = 'off';
       }
       if (newCool === this.cacheCool) {
-        return
+        return;
       }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.cacheCool = newCool
+      await this.platform.sendDeviceUpdate(this.accessory, params);
+      this.cacheCool = newCool;
       if (this.enableLogging) {
-        this.log('[%s] %s [%s].', this.name, this.lang.curCool, this.cacheCool)
+        this.log('[%s] %s [%s].', this.name, this.lang.curCool, this.cacheCool);
       }
       this.service.updateCharacteristic(
         this.hapChar.CurrentHeaterCoolerState,
-        this.cacheCool === 'on' ? 3 : 1
-      )
+        this.cacheCool === 'on' ? 3 : 1,
+      );
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true);
       setTimeout(() => {
         this.service.updateCharacteristic(
           this.hapChar.CoolingThresholdTemperature,
-          this.accessory.context.cacheTarget
-        )
-      }, 2000)
-      throw new this.hapErr(-70402)
+          this.accessory.context.cacheTarget,
+        );
+      }, 2000);
+      throw new this.hapErr(-70402);
     }
   }
 
-  async internalCurrentTempUpdate () {
+  async internalCurrentTempUpdate() {
     try {
       if (this.cacheState === 'off') {
-        return
+        return;
       }
-      const params = {}
-      let newCool
+      const params = {};
+      let newCool;
       if (this.cacheTemp > this.accessory.context.cacheTarget) {
-        params.switch = 'on'
-        newCool = 'on'
+        params.switch = 'on';
+        newCool = 'on';
       } else {
-        params.switch = 'off'
-        newCool = 'off'
+        params.switch = 'off';
+        newCool = 'off';
       }
       if (newCool === this.cacheCool) {
-        return
+        return;
       }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.cacheCool = newCool
+      await this.platform.sendDeviceUpdate(this.accessory, params);
+      this.cacheCool = newCool;
       if (this.enableLogging) {
-        this.log('[%s] %s [%s].', this.name, this.lang.curCool, this.cacheCool)
+        this.log('[%s] %s [%s].', this.name, this.lang.curCool, this.cacheCool);
       }
       this.service.updateCharacteristic(
         this.hapChar.CurrentHeaterCoolerState,
-        this.cacheCool === 'on' ? 3 : 1
-      )
+        this.cacheCool === 'on' ? 3 : 1,
+      );
     } catch (err) {
-      const eText = this.funcs.parseError(err)
-      this.log.warn('[%s] %s.', this.name, eText)
+      const eText = parseError(err);
+      this.log.warn('[%s] %s.', this.name, eText);
     }
   }
 
-  async getTemperature () {
+  async getTemperature() {
     try {
       // Skip polling if device isn't online or if the storage hasn't initialised properly
       if (!this.isOnline || !this.platform.storageClientData) {
-        return
+        return;
       }
 
-      const newTemp = await this.platform.storageData.getItem(this.temperatureSource + '_temp')
+      const newTemp = await this.platform.storageData.getItem(`${this.temperatureSource}_temp`);
       if (newTemp && newTemp !== this.cacheTemp) {
-        this.cacheTemp = newTemp
-        this.service.updateCharacteristic(this.hapChar.CurrentTemperature, this.cacheTemp)
-        this.accessory.eveService.addEntry({ temp: this.cacheTemp })
+        this.cacheTemp = newTemp;
+        this.service.updateCharacteristic(this.hapChar.CurrentTemperature, this.cacheTemp);
+        this.accessory.eveService.addEntry({ temp: this.cacheTemp });
         if (this.enableLogging) {
-          this.log('[%s] %s [%s°C].', this.name, this.lang.curTemp, this.cacheTemp)
+          this.log('[%s] %s [%s°C].', this.name, this.lang.curTemp, this.cacheTemp);
         }
-        await this.internalCurrentTempUpdate()
+        this.internalCurrentTempUpdate();
       }
     } catch (err) {
-      const eText = this.funcs.parseError(err)
-      this.log.warn('[%s] %s.', this.name, eText)
+      const eText = parseError(err);
+      this.log.warn('[%s] %s.', this.name, eText);
     }
   }
 
-  async externalUpdate (params) {}
-
-  markStatus (isOnline) {
-    this.isOnline = isOnline
+  markStatus(isOnline) {
+    this.isOnline = isOnline;
   }
 }
diff --git a/lib/device/simulation/door.js b/lib/device/simulation/door.js
index e970e58e..141abead 100644
--- a/lib/device/simulation/door.js
+++ b/lib/device/simulation/door.js
@@ -1,254 +1,253 @@
-/* jshint node: true, esversion: 10, -W014, -W033 */
-/* eslint-disable new-cap */
-'use strict'
+import platformConsts from '../../utils/constants.js';
+import { generateRandomString, hasProperty, sleep } from '../../utils/functions.js';
 
-module.exports = class deviceDoor {
-  constructor (platform, accessory) {
+export default class {
+  constructor(platform, accessory) {
     // Set up variables from the platform
-    this.eveChar = platform.eveChar
-    this.funcs = platform.funcs
-    this.hapChar = platform.api.hap.Characteristic
-    this.hapErr = platform.api.hap.HapStatusError
-    this.hapServ = platform.api.hap.Service
-    this.lang = platform.lang
-    this.log = platform.log
-    this.platform = platform
+    this.eveChar = platform.eveChar;
+    this.hapChar = platform.api.hap.Characteristic;
+    this.hapErr = platform.api.hap.HapStatusError;
+    this.hapServ = platform.api.hap.Service;
+    this.lang = platform.lang;
+    this.log = platform.log;
+    this.platform = platform;
 
     // Set up variables from the accessory
-    this.name = accessory.displayName
-    this.accessory = accessory
+    this.name = accessory.displayName;
+    this.accessory = accessory;
 
     // Initially set the online flag as true (to be then updated as false if necessary)
-    this.isOnline = true
+    this.isOnline = true;
 
     // Set up custom variables for this device type
-    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
-    this.operationTimeUp = deviceConf.operationTime || platform.consts.defaultValues.operationTime
-    this.operationTimeDown = deviceConf.operationTimeDown || this.operationTimeUp
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId] || {};
+    this.operationTimeUp = deviceConf.operationTime || platformConsts.defaultValues.operationTime;
+    this.operationTimeDown = deviceConf.operationTimeDown || this.operationTimeUp;
 
     // Set the correct logging variables for this accessory
-    this.enableLogging = !platform.config.disableDeviceLogging
-    this.enableDebugLogging = platform.config.debug
-    if (deviceConf && deviceConf.overrideLogging) {
-      switch (deviceConf.overrideLogging) {
-        case 'standard':
-          this.enableLogging = true
-          this.enableDebugLogging = false
-          break
-        case 'debug':
-          this.enableLogging = true
-          this.enableDebugLogging = true
-          break
-        case 'disable':
-          this.enableLogging = false
-          this.enableDebugLogging = false
-          break
-      }
+    switch (deviceConf.overrideLogging) {
+      case 'standard':
+        this.enableLogging = true;
+        this.enableDebugLogging = false;
+        break;
+      case 'debug':
+        this.enableLogging = true;
+        this.enableDebugLogging = true;
+        break;
+      case 'disable':
+        this.enableLogging = false;
+        this.enableDebugLogging = false;
+        break;
+      default:
+        this.enableLogging = !platform.config.disableDeviceLogging;
+        this.enableDebugLogging = platform.config.debug;
+        break;
     }
 
     // Set up the accessory with default positions when added the first time
-    if (!this.funcs.hasProperty(this.accessory.context, 'cacheCurrentPosition')) {
-      this.accessory.context.cacheCurrentPosition = 0
-      this.accessory.context.cachePositionState = 2
-      this.accessory.context.cacheTargetPosition = 0
+    if (!hasProperty(this.accessory.context, 'cacheCurrentPosition')) {
+      this.accessory.context.cacheCurrentPosition = 0;
+      this.accessory.context.cachePositionState = 2;
+      this.accessory.context.cacheTargetPosition = 0;
     }
 
     // Add the door service if it doesn't already exist
-    if (!(this.service = this.accessory.getService(this.hapServ.Door))) {
-      this.service = this.accessory.addService(this.hapServ.Door)
-      this.service.updateCharacteristic(this.hapChar.CurrentPosition, 0)
-      this.service.updateCharacteristic(this.hapChar.TargetPosition, 0)
-      this.service.updateCharacteristic(this.hapChar.PositionState, 2)
+    this.service = this.accessory.getService(this.hapServ.Door);
+    if (!this.service) {
+      this.service = this.accessory.addService(this.hapServ.Door);
+      this.service.updateCharacteristic(this.hapChar.CurrentPosition, 0);
+      this.service.updateCharacteristic(this.hapChar.TargetPosition, 0);
+      this.service.updateCharacteristic(this.hapChar.PositionState, 2);
     }
 
     // Certain devices give power readings
-    if (platform.consts.devices.switchMultiPower.includes(this.accessory.context.eweUIID)) {
+    if (platformConsts.devices.switchMultiPower.includes(this.accessory.context.eweUIID)) {
       // Add Eve power characteristics
-      this.powerReadings = true
+      this.powerReadings = true;
       if (!this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
-        this.service.addCharacteristic(this.eveChar.CurrentConsumption)
+        this.service.addCharacteristic(this.eveChar.CurrentConsumption);
       }
       if (!this.service.testCharacteristic(this.eveChar.ElectricCurrent)) {
-        this.service.addCharacteristic(this.eveChar.ElectricCurrent)
+        this.service.addCharacteristic(this.eveChar.ElectricCurrent);
       }
       if (!this.service.testCharacteristic(this.eveChar.Voltage)) {
-        this.service.addCharacteristic(this.eveChar.Voltage)
+        this.service.addCharacteristic(this.eveChar.Voltage);
       }
     }
 
     // Add the set handler to the target position characteristic
-    this.service.getCharacteristic(this.hapChar.TargetPosition).onSet(value => {
+    this.service.getCharacteristic(this.hapChar.TargetPosition).onSet((value) => {
       // We don't use await as we want the callback to be run straight away
-      this.internalPositionUpdate(value)
-    })
+      this.internalPositionUpdate(value);
+    });
 
     // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
     if (!platform.config.disableNoResponse) {
       this.service.getCharacteristic(this.hapChar.CurrentPosition).onGet(() => {
         if (!this.isOnline) {
-          throw new this.hapErr(-70402)
+          throw new this.hapErr(-70402);
         }
-        return this.service.getCharacteristic(this.hapChar.CurrentPosition).value
-      })
+        return this.service.getCharacteristic(this.hapChar.CurrentPosition).value;
+      });
       this.service.getCharacteristic(this.hapChar.TargetPosition).onGet(() => {
         if (!this.isOnline) {
-          throw new this.hapErr(-70402)
+          throw new this.hapErr(-70402);
         }
-        return this.service.getCharacteristic(this.hapChar.TargetPosition).value
-      })
+        return this.service.getCharacteristic(this.hapChar.TargetPosition).value;
+      });
     }
 
     // Set up an interval to get eWeLink to send power updates
     if (this.powerReadings && platform.config.mode !== 'lan') {
       setTimeout(() => {
-        this.internalUIUpdate()
-        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
-      }, 5000)
+        this.internalUIUpdate();
+        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000);
+      }, 5000);
 
       // Stop the intervals on Homebridge shutdown
-      platform.api.on('shutdown', () => clearInterval(this.intervalPoll))
+      platform.api.on('shutdown', () => clearInterval(this.intervalPoll));
     }
 
     // Output the customised options to the log
+    const normalLogging = this.enableLogging ? 'standard' : 'disable';
     const opts = JSON.stringify({
-      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
+      logging: this.enableDebugLogging ? 'debug' : normalLogging,
       operationTimeDown: this.operationTimeDown,
       operationTimeUp: this.operationTimeUp,
-      showAs: 'door'
-    })
-    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
+      showAs: 'door',
+    });
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts);
   }
 
-  async internalPositionUpdate (value) {
+  async internalPositionUpdate(value) {
     try {
-      let prevPosition = this.accessory.context.cacheCurrentPosition
+      let prevPosition = this.accessory.context.cacheCurrentPosition;
       if (value === prevPosition) {
-        return
+        return;
       }
       const params = {
-        switches: []
-      }
-      const prevState = this.accessory.context.cachePositionState
-      const percentStepUpPerDS = this.operationTimeUp / 100
-      const percentStepDownPerDS = this.operationTimeDown / 100
-      const updateKey = this.funcs.generateRandomString(5)
-      this.updateKey = updateKey
+        switches: [],
+      };
+      const prevState = this.accessory.context.cachePositionState;
+      const percentStepUpPerDS = this.operationTimeUp / 100;
+      const percentStepDownPerDS = this.operationTimeDown / 100;
+      const updateKey = generateRandomString(5);
+      this.updateKey = updateKey;
       if (prevState !== 2) {
-        params.switches.push({ switch: 'off', outlet: 0 })
-        params.switches.push({ switch: 'off', outlet: 1 })
-        await this.platform.sendDeviceUpdate(this.accessory, params)
-        params.switches = []
-        const posPercentChange =
-          Math.floor(Date.now() / 100) - this.accessory.context.cacheLastStartTime
-        const posPercentChangeUp = Math.floor(percentStepUpPerDS * posPercentChange)
-        const posPercentChangeDown = Math.floor(percentStepDownPerDS * posPercentChange)
+        params.switches.push({ switch: 'off', outlet: 0 });
+        params.switches.push({ switch: 'off', outlet: 1 });
+        await this.platform.sendDeviceUpdate(this.accessory, params);
+        params.switches = [];
+        const posPercentChange = Math.floor(Date.now() / 100) - this.accessory.context.cacheLastStartTime;
+        const posPercentChangeUp = Math.floor(percentStepUpPerDS * posPercentChange);
+        const posPercentChangeDown = Math.floor(percentStepDownPerDS * posPercentChange);
         if (prevState === 0) {
           // Was going down
-          prevPosition -= posPercentChangeDown
+          prevPosition -= posPercentChangeDown;
         } else {
           // Was going up
-          prevPosition += posPercentChangeUp
+          prevPosition += posPercentChangeUp;
         }
-        prevPosition = Math.min(Math.max(prevPosition, 0), 100)
-        this.service.updateCharacteristic(this.hapChar.CurrentPosition, prevPosition)
-        this.accessory.context.cacheCurrentPosition = prevPosition
+        prevPosition = Math.min(Math.max(prevPosition, 0), 100);
+        this.service.updateCharacteristic(this.hapChar.CurrentPosition, prevPosition);
+        this.accessory.context.cacheCurrentPosition = prevPosition;
       }
-      const diffPosition = value - prevPosition
-      const setToMoveUp = diffPosition > 0
-      let decisecondsToMove
+      const diffPosition = value - prevPosition;
+      const setToMoveUp = diffPosition > 0;
+      let decisecondsToMove;
       if (setToMoveUp) {
-        decisecondsToMove = Math.round(Math.abs(diffPosition) * percentStepUpPerDS)
-        params.switches.push({ switch: 'on', outlet: 0 })
+        decisecondsToMove = Math.round(Math.abs(diffPosition) * percentStepUpPerDS);
+        params.switches.push({ switch: 'on', outlet: 0 });
       } else {
-        decisecondsToMove = Math.round(Math.abs(diffPosition) * percentStepDownPerDS)
-        params.switches.push({ switch: 'on', outlet: 1 })
-      }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
-      params.switches = []
-      this.accessory.context.cacheTargetPosition = value
-      this.accessory.context.cachePositionState = setToMoveUp ? 1 : 0
-      this.accessory.context.cacheLastStartTime = Math.floor(Date.now() / 100)
-      await this.funcs.sleep(decisecondsToMove * 100)
+        decisecondsToMove = Math.round(Math.abs(diffPosition) * percentStepDownPerDS);
+        params.switches.push({ switch: 'on', outlet: 1 });
+      }
+      await this.platform.sendDeviceUpdate(this.accessory, params);
+      params.switches = [];
+      this.accessory.context.cacheTargetPosition = value;
+      this.accessory.context.cachePositionState = setToMoveUp ? 1 : 0;
+      this.accessory.context.cacheLastStartTime = Math.floor(Date.now() / 100);
+      await sleep(decisecondsToMove * 100);
       if (this.updateKey !== updateKey) {
-        return
+        return;
       }
       params.switches.push({
         switch: 'off',
-        outlet: setToMoveUp ? 0 : 1
-      })
-      await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.service.updateCharacteristic(this.hapChar.PositionState, 2)
-      this.service.updateCharacteristic(this.hapChar.CurrentPosition, value)
-      this.accessory.context.cachePositionState = 2
-      this.accessory.context.cacheCurrentPosition = value
+        outlet: setToMoveUp ? 0 : 1,
+      });
+      await this.platform.sendDeviceUpdate(this.accessory, params);
+      this.service.updateCharacteristic(this.hapChar.PositionState, 2);
+      this.service.updateCharacteristic(this.hapChar.CurrentPosition, value);
+      this.accessory.context.cachePositionState = 2;
+      this.accessory.context.cacheCurrentPosition = value;
       if (this.enableLogging) {
-        this.log('[%s] %s [%s%]', this.name, this.lang.curPos, value)
+        this.log('[%s] %s [%s%]', this.name, this.lang.curPos, value);
       }
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true);
       setTimeout(() => {
         this.service.updateCharacteristic(
           this.hapChar.TargetPosition,
-          this.accessory.context.cacheTargetPosition
-        )
-      }, 2000)
-      this.service.updateCharacteristic(this.hapChar.TargetPosition, new this.hapErr(-70402))
+          this.accessory.context.cacheTargetPosition,
+        );
+      }, 2000);
+      this.service.updateCharacteristic(this.hapChar.TargetPosition, new this.hapErr(-70402));
     }
   }
 
-  async internalUIUpdate () {
+  async internalUIUpdate() {
     try {
       // Skip polling if device isn't online
       if (!this.isOnline) {
-        return
+        return;
       }
 
       // Send the params to request the updates
-      await this.platform.sendDeviceUpdate(this.accessory, { uiActive: { outlet: 0, time: 120 } })
+      await this.platform.sendDeviceUpdate(this.accessory, { uiActive: { outlet: 0, time: 120 } });
     } catch (err) {
       // Suppress errors here
     }
   }
 
-  async externalUpdate (params) {
+  async externalUpdate(params) {
     try {
       if (!this.powerReadings) {
-        return
-      }
-      let logger = false
-      let power
-      let voltage
-      let current
-      if (this.funcs.hasProperty(params, 'actPow_00')) {
-        power = parseInt(params.actPow_00) / 100
-        this.service.updateCharacteristic(this.eveChar.CurrentConsumption, power)
-        logger = true
-      }
-      if (this.funcs.hasProperty(params, 'voltage_00')) {
-        voltage = parseInt(params.voltage_00) / 100
-        this.service.updateCharacteristic(this.eveChar.Voltage, voltage)
-        logger = true
-      }
-      if (this.funcs.hasProperty(params, 'current_00')) {
-        current = parseInt(params.current_00) / 100
-        this.service.updateCharacteristic(this.eveChar.ElectricCurrent, current)
-        logger = true
+        return;
+      }
+      let logger = false;
+      let power;
+      let voltage;
+      let current;
+      if (hasProperty(params, 'actPow_00')) {
+        power = parseInt(params.actPow_00, 10) / 100;
+        this.service.updateCharacteristic(this.eveChar.CurrentConsumption, power);
+        logger = true;
+      }
+      if (hasProperty(params, 'voltage_00')) {
+        voltage = parseInt(params.voltage_00, 10) / 100;
+        this.service.updateCharacteristic(this.eveChar.Voltage, voltage);
+        logger = true;
+      }
+      if (hasProperty(params, 'current_00')) {
+        current = parseInt(params.current_00, 10) / 100;
+        this.service.updateCharacteristic(this.eveChar.ElectricCurrent, current);
+        logger = true;
       }
       if (params.updateSource && logger && this.enableLogging) {
         this.log(
           '[%s] %s%s%s.',
           this.name,
-          power !== undefined ? this.lang.curPower + ' [' + power + 'W]' : '',
-          voltage !== undefined ? ' ' + this.lang.curVolt + ' [' + voltage + 'V]' : '',
-          current !== undefined ? ' ' + this.lang.curCurr + ' [' + current + 'A]' : ''
-        )
+          power !== undefined ? `${this.lang.curPower} [${power}W]` : '',
+          voltage !== undefined ? ` ${this.lang.curVolt} [${voltage}V]` : '',
+          current !== undefined ? ` ${this.lang.curCurr} [${current}A]` : '',
+        );
       }
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, false)
+      this.platform.deviceUpdateError(this.accessory, err, false);
     }
   }
 
-  markStatus (isOnline) {
-    this.isOnline = isOnline
+  markStatus(isOnline) {
+    this.isOnline = isOnline;
   }
 }
diff --git a/lib/device/simulation/doorbell.js b/lib/device/simulation/doorbell.js
index 6741108e..a67bf826 100644
--- a/lib/device/simulation/doorbell.js
+++ b/lib/device/simulation/doorbell.js
@@ -1,192 +1,190 @@
-/* jshint node: true, esversion: 10, -W014, -W033 */
-/* eslint-disable new-cap */
-'use strict'
+import platformConsts from '../../utils/constants.js';
+import { hasProperty } from '../../utils/functions.js';
 
-module.exports = class deviceDoorbell {
-  constructor (platform, accessory) {
+export default class {
+  constructor(platform, accessory) {
     // Set up variables from the platform
-    this.eveChar = platform.eveChar
-    this.funcs = platform.funcs
-    this.hapChar = platform.api.hap.Characteristic
-    this.hapErr = platform.api.hap.HapStatusError
-    this.hapServ = platform.api.hap.Service
-    this.lang = platform.lang
-    this.log = platform.log
-    this.platform = platform
+    this.eveChar = platform.eveChar;
+    this.hapChar = platform.api.hap.Characteristic;
+    this.hapErr = platform.api.hap.HapStatusError;
+    this.hapServ = platform.api.hap.Service;
+    this.lang = platform.lang;
+    this.log = platform.log;
+    this.platform = platform;
 
     // Set up variables from the accessory
-    this.name = accessory.displayName
-    this.accessory = accessory
+    this.name = accessory.displayName;
+    this.accessory = accessory;
 
     // Initially set the online flag as true (to be then updated as false if necessary)
-    this.isOnline = true
+    this.isOnline = true;
 
     // Set up custom variables for this device type
-    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId] || {};
 
     // Set the correct logging variables for this accessory
-    this.enableLogging = !platform.config.disableDeviceLogging
-    this.enableDebugLogging = platform.config.debug
-    if (deviceConf && deviceConf.overrideLogging) {
-      switch (deviceConf.overrideLogging) {
-        case 'standard':
-          this.enableLogging = true
-          this.enableDebugLogging = false
-          break
-        case 'debug':
-          this.enableLogging = true
-          this.enableDebugLogging = true
-          break
-        case 'disable':
-          this.enableLogging = false
-          this.enableDebugLogging = false
-          break
-      }
+    switch (deviceConf.overrideLogging) {
+      case 'standard':
+        this.enableLogging = true;
+        this.enableDebugLogging = false;
+        break;
+      case 'debug':
+        this.enableLogging = true;
+        this.enableDebugLogging = true;
+        break;
+      case 'disable':
+        this.enableLogging = false;
+        this.enableDebugLogging = false;
+        break;
+      default:
+        this.enableLogging = !platform.config.disableDeviceLogging;
+        this.enableDebugLogging = platform.config.debug;
+        break;
     }
 
     // If the accessory has a switch service then remove it
     if (this.accessory.getService(this.hapServ.Switch)) {
-      this.accessory.removeService(this.accessory.getService(this.hapServ.Switch))
+      this.accessory.removeService(this.accessory.getService(this.hapServ.Switch));
     }
 
     // Add the doorbell service if it doesn't already exist
-    this.service =
-      this.accessory.getService(this.hapServ.Doorbell) ||
-      this.accessory.addService(this.hapServ.Doorbell)
+    this.service = this.accessory.getService(this.hapServ.Doorbell)
+      || this.accessory.addService(this.hapServ.Doorbell);
 
     // Set up the device type and power readings if necessary
-    if (platform.consts.devices.switchSingle.includes(this.accessory.context.eweUIID)) {
-      this.setup = 'switchSingle'
-    } else if (platform.consts.devices.switchSinglePower.includes(this.accessory.context.eweUIID)) {
-      this.setup = 'switchSingle'
-      this.powerReadings = true
-    } else if (platform.consts.devices.switchMulti.includes(this.accessory.context.eweUIID)) {
-      this.setup = 'switchMulti'
-      if (platform.consts.devices.switchMultiPower.includes(this.accessory.context.eweUIID)) {
+    if (platformConsts.devices.switchSingle.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'switchSingle';
+    } else if (platformConsts.devices.switchSinglePower.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'switchSingle';
+      this.powerReadings = true;
+    } else if (platformConsts.devices.switchMulti.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'switchMulti';
+      if (platformConsts.devices.switchMultiPower.includes(this.accessory.context.eweUIID)) {
         // Add Eve power characteristics
-        this.powerReadings = true
-        this.isDualR3 = true
+        this.powerReadings = true;
+        this.isDualR3 = true;
       }
-    } else if (platform.consts.devices.switchSCM.includes(this.accessory.context.eweUIID)) {
-      this.setup = 'switchMulti'
-    } else if (platform.consts.devices.switchSCMPower.includes(this.accessory.context.eweUIID)) {
+    } else if (platformConsts.devices.switchSCM.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'switchMulti';
+    } else if (platformConsts.devices.switchSCMPower.includes(this.accessory.context.eweUIID)) {
       // Could do power here
-      this.setup = 'switchMulti'
+      this.setup = 'switchMulti';
     }
 
     // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
     if (!platform.config.disableNoResponse) {
       this.service.getCharacteristic(this.hapChar.ProgrammableSwitchEvent).onGet(() => {
         if (!this.isOnline) {
-          throw new this.hapErr(-70402)
+          throw new this.hapErr(-70402);
         }
-        return this.service.getCharacteristic(this.hapChar.ProgrammableSwitchEvent).value
-      })
+        return this.service.getCharacteristic(this.hapChar.ProgrammableSwitchEvent).value;
+      });
     }
 
     // Set up an interval to get eWeLink to send power updates
     if (
-      this.powerReadings &&
-      (!this.isDualR3 || (this.isDualR3 && platform.config.mode !== 'lan'))
+      this.powerReadings
+      && (!this.isDualR3 || (this.isDualR3 && platform.config.mode !== 'lan'))
     ) {
       setTimeout(() => {
-        this.internalUIUpdate()
-        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
-      }, 5000)
+        this.internalUIUpdate();
+        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000);
+      }, 5000);
 
       // Stop the intervals on Homebridge shutdown
-      platform.api.on('shutdown', () => clearInterval(this.intervalPoll))
+      platform.api.on('shutdown', () => clearInterval(this.intervalPoll));
     }
 
     // Output the customised options to the log
+    const normalLogging = this.enableLogging ? 'standard' : 'disable';
     const opts = JSON.stringify({
-      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
-      showAs: 'doorbell'
-    })
-    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
+      logging: this.enableDebugLogging ? 'debug' : normalLogging,
+      showAs: 'doorbell',
+    });
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts);
   }
 
-  async internalUIUpdate () {
+  async internalUIUpdate() {
     try {
       // Skip polling if device isn't online
       if (!this.isOnline) {
-        return
+        return;
       }
 
       // Send the params to request the updates
       if (this.isDualR3) {
-        await this.platform.sendDeviceUpdate(this.accessory, { uiActive: { outlet: 0, time: 120 } })
+        await this.platform.sendDeviceUpdate(this.accessory, { uiActive: { outlet: 0, time: 120 } });
       } else {
-        await this.platform.sendDeviceUpdate(this.accessory, { uiActive: 120 })
+        await this.platform.sendDeviceUpdate(this.accessory, { uiActive: 120 });
       }
     } catch (err) {
       // Suppress errors here
     }
   }
 
-  async externalUpdate (params) {
+  async externalUpdate(params) {
     try {
       if (!this.inUse) {
         if (
-          (this.setup === 'switchMulti' && params.switches && params.switches[0].switch === 'on') ||
-          (this.setup === 'switchSingle' && params.switch && params.switch === 'on')
+          (this.setup === 'switchMulti' && params.switches && params.switches[0].switch === 'on')
+          || (this.setup === 'switchSingle' && params.switch && params.switch === 'on')
         ) {
-          this.inUse = true
+          this.inUse = true;
           setTimeout(() => {
-            this.inUse = false
-          }, 2000)
-          this.service.updateCharacteristic(this.hapChar.ProgrammableSwitchEvent, 0)
+            this.inUse = false;
+          }, 2000);
+          this.service.updateCharacteristic(this.hapChar.ProgrammableSwitchEvent, 0);
           if (params.updateSource && this.enableLogging) {
-            this.log('[%s] %s [%s].', this.name, this.lang.curState, this.lang.buttonSingle)
+            this.log('[%s] %s [%s].', this.name, this.lang.curState, this.lang.buttonSingle);
           }
         }
       }
 
       // Get the power readings given by certain devices
       if (!this.powerReadings) {
-        return
+        return;
       }
-      let logger = false
-      let power
-      let voltage
-      let current
-      if (this.funcs.hasProperty(params, 'actPow_00')) {
-        power = parseInt(params.actPow_00) / 100
-        logger = true
-      } else if (this.funcs.hasProperty(params, 'power')) {
-        power = parseFloat(params.power)
-        logger = true
+      let logger = false;
+      let power;
+      let voltage;
+      let current;
+      if (hasProperty(params, 'actPow_00')) {
+        power = parseInt(params.actPow_00, 10) / 100;
+        logger = true;
+      } else if (hasProperty(params, 'power')) {
+        power = parseFloat(params.power);
+        logger = true;
       }
-      if (this.funcs.hasProperty(params, 'voltage_00')) {
-        voltage = parseInt(params.voltage_00) / 100
-        logger = true
-      } else if (this.funcs.hasProperty(params, 'voltage')) {
-        voltage = parseFloat(params.voltage)
-        logger = true
+      if (hasProperty(params, 'voltage_00')) {
+        voltage = parseInt(params.voltage_00, 10) / 100;
+        logger = true;
+      } else if (hasProperty(params, 'voltage')) {
+        voltage = parseFloat(params.voltage);
+        logger = true;
       }
-      if (this.funcs.hasProperty(params, 'current_00')) {
-        current = parseInt(params.current_00) / 100
-        logger = true
-      } else if (this.funcs.hasProperty(params, 'current')) {
-        current = parseFloat(params.current)
-        logger = true
+      if (hasProperty(params, 'current_00')) {
+        current = parseInt(params.current_00, 10) / 100;
+        logger = true;
+      } else if (hasProperty(params, 'current')) {
+        current = parseFloat(params.current);
+        logger = true;
       }
       if (params.updateSource && logger && this.enableLogging) {
         this.log(
           '[%s] %s%s%s.',
           this.name,
-          power !== undefined ? this.lang.curPower + ' [' + power + 'W]' : '',
-          voltage !== undefined ? ' ' + this.lang.curVolt + ' [' + voltage + 'V]' : '',
-          current !== undefined ? ' ' + this.lang.curCurr + ' [' + current + 'A]' : ''
-        )
+          power !== undefined ? `${this.lang.curPower} [${power}W]` : '',
+          voltage !== undefined ? ` ${this.lang.curVolt} [${voltage}V]` : '',
+          current !== undefined ? ` ${this.lang.curCurr} [${current}A]` : '',
+        );
       }
     } catch (err) {
-      this.inUse = false
-      this.platform.deviceUpdateError(this.accessory, err, false)
+      this.inUse = false;
+      this.platform.deviceUpdateError(this.accessory, err, false);
     }
   }
 
-  markStatus (isOnline) {
-    this.isOnline = isOnline
+  markStatus(isOnline) {
+    this.isOnline = isOnline;
   }
 }
diff --git a/lib/device/simulation/garage-eachen.js b/lib/device/simulation/garage-eachen.js
index 60ea8322..dd6da50f 100644
--- a/lib/device/simulation/garage-eachen.js
+++ b/lib/device/simulation/garage-eachen.js
@@ -1,235 +1,235 @@
-/* jshint node: true, esversion: 10, -W014, -W033 */
-/* eslint-disable new-cap */
-'use strict'
+import platformConsts from '../../utils/constants.js';
+import { generateRandomString, sleep } from '../../utils/functions.js';
 
-module.exports = class deviceGarageEachen {
-  constructor (platform, accessory) {
+export default class {
+  constructor(platform, accessory) {
     // Set up variables from the platform
-    this.eveChar = platform.eveChar
-    this.funcs = platform.funcs
-    this.hapChar = platform.api.hap.Characteristic
-    this.hapErr = platform.api.hap.HapStatusError
-    this.hapServ = platform.api.hap.Service
-    this.lang = platform.lang
-    this.log = platform.log
-    this.platform = platform
+    this.eveChar = platform.eveChar;
+    this.hapChar = platform.api.hap.Characteristic;
+    this.hapErr = platform.api.hap.HapStatusError;
+    this.hapServ = platform.api.hap.Service;
+    this.lang = platform.lang;
+    this.log = platform.log;
+    this.platform = platform;
 
     // Set up variables from the accessory
-    this.name = accessory.displayName
-    this.accessory = accessory
+    this.name = accessory.displayName;
+    this.accessory = accessory;
 
     // Initially set the online flag as true (to be then updated as false if necessary)
-    this.isOnline = true
+    this.isOnline = true;
 
     // Set up custom variables for this device type
-    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
-    this.operationTime = deviceConf.operationTime || platform.consts.defaultValues.operationTime
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId] || {};
+    this.operationTime = deviceConf.operationTime || platformConsts.defaultValues.operationTime;
 
     // Set the correct logging variables for this accessory
-    this.enableLogging = !platform.config.disableDeviceLogging
-    this.enableDebugLogging = platform.config.debug
-    if (deviceConf && deviceConf.overrideLogging) {
-      switch (deviceConf.overrideLogging) {
-        case 'standard':
-          this.enableLogging = true
-          this.enableDebugLogging = false
-          break
-        case 'debug':
-          this.enableLogging = true
-          this.enableDebugLogging = true
-          break
-        case 'disable':
-          this.enableLogging = false
-          this.enableDebugLogging = false
-          break
-      }
+    switch (deviceConf.overrideLogging) {
+      case 'standard':
+        this.enableLogging = true;
+        this.enableDebugLogging = false;
+        break;
+      case 'debug':
+        this.enableLogging = true;
+        this.enableDebugLogging = true;
+        break;
+      case 'disable':
+        this.enableLogging = false;
+        this.enableDebugLogging = false;
+        break;
+      default:
+        this.enableLogging = !platform.config.disableDeviceLogging;
+        this.enableDebugLogging = platform.config.debug;
+        break;
     }
 
     // If the accessory has a switch service then remove it
     if (this.accessory.getService(this.hapServ.Switch)) {
-      this.accessory.removeService(this.accessory.getService(this.hapServ.Switch))
+      this.accessory.removeService(this.accessory.getService(this.hapServ.Switch));
     }
 
     // If the accessory has a contact sensor service then remove it
     if (this.accessory.getService(this.hapServ.ContactSensor)) {
-      this.accessory.removeService(this.accessory.getService(this.hapServ.ContactSensor))
+      this.accessory.removeService(this.accessory.getService(this.hapServ.ContactSensor));
     }
 
     // If the accessory has a lock service then remove it
     if (this.accessory.getService(this.hapServ.LockMechanism)) {
-      this.accessory.removeService(this.accessory.getService(this.hapServ.LockMechanism))
+      this.accessory.removeService(this.accessory.getService(this.hapServ.LockMechanism));
     }
 
     // Add the garage door service if it doesn't already exist
-    if (!(this.service = this.accessory.getService(this.hapServ.GarageDoorOpener))) {
-      this.service = this.accessory.addService(this.hapServ.GarageDoorOpener)
-      this.service.updateCharacteristic(this.hapChar.CurrentDoorState, 1)
-      this.service.updateCharacteristic(this.hapChar.TargetDoorState, 1)
-      this.service.updateCharacteristic(this.hapChar.ObstructionDetected, false)
-      this.service.addCharacteristic(this.eveChar.LastActivation)
-      this.service.addCharacteristic(this.eveChar.ResetTotal)
-      this.service.addCharacteristic(this.eveChar.TimesOpened)
+    this.service = this.accessory.getService(this.hapServ.GarageDoorOpener);
+    if (!this.service) {
+      this.service = this.accessory.addService(this.hapServ.GarageDoorOpener);
+      this.service.updateCharacteristic(this.hapChar.CurrentDoorState, 1);
+      this.service.updateCharacteristic(this.hapChar.TargetDoorState, 1);
+      this.service.updateCharacteristic(this.hapChar.ObstructionDetected, false);
+      this.service.addCharacteristic(this.eveChar.LastActivation);
+      this.service.addCharacteristic(this.eveChar.ResetTotal);
+      this.service.addCharacteristic(this.eveChar.TimesOpened);
     }
 
     // Remove unneeded characteristics
     if (this.service.testCharacteristic(this.hapChar.ContactSensorState)) {
       this.service.removeCharacteristic(
-        this.service.getCharacteristic(this.hapChar.ContactSensorState)
-      )
+        this.service.getCharacteristic(this.hapChar.ContactSensorState),
+      );
     }
     if (this.service.testCharacteristic(this.hapChar.OpenDuration)) {
-      this.service.removeCharacteristic(this.service.getCharacteristic(this.hapChar.OpenDuration))
+      this.service.removeCharacteristic(this.service.getCharacteristic(this.hapChar.OpenDuration));
     }
     if (this.service.testCharacteristic(this.hapChar.ClosedDuration)) {
-      this.service.removeCharacteristic(this.service.getCharacteristic(this.hapChar.ClosedDuration))
+      this.service.removeCharacteristic(this.service.getCharacteristic(this.hapChar.ClosedDuration));
     }
 
     // Add the set handler to the garage door reset total characteristic
-    this.service.getCharacteristic(this.eveChar.ResetTotal).onSet(value => {
-      this.service.updateCharacteristic(this.eveChar.TimesOpened, 0)
-    })
+    this.service.getCharacteristic(this.eveChar.ResetTotal).onSet(() => {
+      this.service.updateCharacteristic(this.eveChar.TimesOpened, 0);
+    });
 
     // Add the set handler to the target position characteristic
-    this.service.getCharacteristic(this.hapChar.TargetDoorState).onSet(value => {
+    this.service.getCharacteristic(this.hapChar.TargetDoorState).onSet((value) => {
       // We don't use await as we want the callback to be run straight away
-      this.internalStateUpdate(value)
-    })
+      this.internalStateUpdate(value);
+    });
 
     // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
     if (!platform.config.disableNoResponse) {
       this.service.getCharacteristic(this.hapChar.CurrentDoorState).onGet(() => {
         if (!this.isOnline) {
-          throw new this.hapErr(-70402)
+          throw new this.hapErr(-70402);
         }
-        return this.service.getCharacteristic(this.hapChar.CurrentDoorState).value
-      })
+        return this.service.getCharacteristic(this.hapChar.CurrentDoorState).value;
+      });
       this.service.getCharacteristic(this.hapChar.TargetDoorState).onGet(() => {
         if (!this.isOnline) {
-          throw new this.hapErr(-70402)
+          throw new this.hapErr(-70402);
         }
-        return this.service.getCharacteristic(this.hapChar.TargetDoorState).value
-      })
+        return this.service.getCharacteristic(this.hapChar.TargetDoorState).value;
+      });
     }
 
     // Update the obstruction detected to false on Homebridge restart
-    this.service.updateCharacteristic(this.hapChar.ObstructionDetected, false)
+    this.service.updateCharacteristic(this.hapChar.ObstructionDetected, false);
 
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new platform.eveService('door', this.accessory, {
-      log: platform.config.debugFakegato ? this.log : () => {}
-    })
+      log: platform.config.debugFakegato ? this.log : () => {},
+    });
     this.accessory.eveService.addEntry({
-      status: this.service.getCharacteristic(this.hapChar.CurrentDoorState).value === 0 ? 0 : 1
-    })
+      status: this.service.getCharacteristic(this.hapChar.CurrentDoorState).value === 0 ? 0 : 1,
+    });
 
     // Output the customised options to the log
+    const normalLogging = this.enableLogging ? 'standard' : 'disable';
     const opts = JSON.stringify({
-      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
+      logging: this.enableDebugLogging ? 'debug' : normalLogging,
       operationTime: this.operationTime,
-      showAs: 'garage_eachen'
-    })
-    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
+      showAs: 'garage_eachen',
+    });
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts);
   }
 
-  async internalStateUpdate (value) {
+  async internalStateUpdate(value) {
     try {
-      const params = { switch: value === 0 ? 'on' : 'off' }
-      const curState = this.service.getCharacteristic(this.hapChar.CurrentDoorState).value
+      const params = { switch: value === 0 ? 'on' : 'off' };
+      const curState = this.service.getCharacteristic(this.hapChar.CurrentDoorState).value;
       if (value === curState % 2) {
-        return
+        return;
       }
-      this.inUse = true
-      await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.service.updateCharacteristic(this.hapChar.TargetDoorState, value)
-      this.service.updateCharacteristic(this.hapChar.CurrentDoorState, value + 2)
-      await this.funcs.sleep(3000)
-      this.inUse = false
+      this.inUse = true;
+      await this.platform.sendDeviceUpdate(this.accessory, params);
+      this.service.updateCharacteristic(this.hapChar.TargetDoorState, value);
+      this.service.updateCharacteristic(this.hapChar.CurrentDoorState, value + 2);
+      await sleep(3000);
+      this.inUse = false;
       if (value === 0) {
-        this.accessory.eveService.addEntry({ status: 0 })
+        this.accessory.eveService.addEntry({ status: 0 });
         this.service.updateCharacteristic(
           this.eveChar.LastActivation,
-          Math.round(new Date().valueOf() / 1000) - this.accessory.eveService.getInitialTime()
-        )
+          Math.round(new Date().valueOf() / 1000) - this.accessory.eveService.getInitialTime(),
+        );
         this.service.updateCharacteristic(
           this.eveChar.TimesOpened,
-          this.service.getCharacteristic(this.eveChar.TimesOpened).value + 1
-        )
-        await this.funcs.sleep(Math.max((this.operationTime - 30) * 100, 0))
-        this.service.updateCharacteristic(this.hapChar.CurrentDoorState, 0)
+          this.service.getCharacteristic(this.eveChar.TimesOpened).value + 1,
+        );
+        await sleep(Math.max((this.operationTime - 30) * 100, 0));
+        this.service.updateCharacteristic(this.hapChar.CurrentDoorState, 0);
         if (this.enableLogging) {
-          this.log('[%s] %s [%s].', this.name, this.lang.curState, this.lang.doorOpen)
+          this.log('[%s] %s [%s].', this.name, this.lang.curState, this.lang.doorOpen);
         }
       }
     } catch (err) {
-      this.inUse = false
-      this.platform.deviceUpdateError(this.accessory, err, true)
+      this.inUse = false;
+      this.platform.deviceUpdateError(this.accessory, err, true);
       setTimeout(() => {
         this.service.updateCharacteristic(
           this.hapChar.TargetDoorState,
-          this.accessory.context.cacheTargetDoorState
-        )
-      }, 2000)
-      this.service.updateCharacteristic(this.hapChar.TargetDoorState, new this.hapErr(-70402))
+          this.accessory.context.cacheTargetDoorState,
+        );
+      }, 2000);
+      this.service.updateCharacteristic(this.hapChar.TargetDoorState, new this.hapErr(-70402));
     }
   }
 
-  async externalUpdate (params) {
+  async externalUpdate(params) {
     try {
       if (!params.switch || this.inUse) {
-        return
+        return;
       }
 
       // In a period of three seconds we want to only use the 'last' update
-      const updateKey = this.funcs.generateRandomString(5)
-      this.updateKey = updateKey
-      await this.funcs.sleep(3000)
+      const updateKey = generateRandomString(5);
+      this.updateKey = updateKey;
+      await sleep(3000);
       if (this.updateKey !== updateKey) {
-        return
+        return;
       }
 
       // Update the characteristics
-      const newValue = params.switch === 'on' ? 0 : 1
+      const newValue = params.switch === 'on' ? 0 : 1;
       if (this.service.getCharacteristic(this.hapChar.TargetDoorState).value !== newValue) {
-        this.service.updateCharacteristic(this.hapChar.TargetDoorState, newValue)
+        this.service.updateCharacteristic(this.hapChar.TargetDoorState, newValue);
       }
       if (this.service.getCharacteristic(this.hapChar.CurrentDoorState).value !== newValue) {
-        this.service.updateCharacteristic(this.hapChar.CurrentDoorState, newValue)
+        this.service.updateCharacteristic(this.hapChar.CurrentDoorState, newValue);
       }
-      this.accessory.eveService.addEntry({ status: newValue })
+      this.accessory.eveService.addEntry({ status: newValue });
       if (newValue === 0) {
         this.service.updateCharacteristic(
           this.eveChar.LastActivation,
-          Math.round(new Date().valueOf() / 1000) - this.accessory.eveService.getInitialTime()
-        )
+          Math.round(new Date().valueOf() / 1000) - this.accessory.eveService.getInitialTime(),
+        );
         this.service.updateCharacteristic(
           this.eveChar.TimesOpened,
-          this.service.getCharacteristic(this.eveChar.TimesOpened).value + 1
-        )
+          this.service.getCharacteristic(this.eveChar.TimesOpened).value + 1,
+        );
       }
       if (params.updateSource && this.enableLogging) {
         this.log(
           '[%s] %s [%s].',
           this.name,
           this.lang.curState,
-          params.switch === 'on' ? this.lang.doorOpen : this.lang.doorClosed
-        )
+          params.switch === 'on' ? this.lang.doorOpen : this.lang.doorClosed,
+        );
       }
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, false)
+      this.platform.deviceUpdateError(this.accessory, err, false);
     }
   }
 
-  currentState () {
+  currentState() {
     return {
       services: ['garage'],
       garage: {
         target: this.service.getCharacteristic(this.hapChar.TargetDoorState).value,
-        state: this.service.getCharacteristic(this.hapChar.CurrentDoorState).value
-      }
-    }
+        state: this.service.getCharacteristic(this.hapChar.CurrentDoorState).value,
+      },
+    };
   }
 
-  markStatus (isOnline) {
-    this.isOnline = isOnline
+  markStatus(isOnline) {
+    this.isOnline = isOnline;
   }
 }
diff --git a/lib/device/simulation/garage-four.js b/lib/device/simulation/garage-four.js
index 79d69ed2..985bd8b1 100644
--- a/lib/device/simulation/garage-four.js
+++ b/lib/device/simulation/garage-four.js
@@ -1,181 +1,176 @@
-/* jshint node: true, esversion: 10, -W014, -W033 */
-/* eslint-disable new-cap */
-'use strict'
+import platformConsts from '../../utils/constants.js';
+import { generateRandomString, hasProperty, sleep } from '../../utils/functions.js';
 
-module.exports = class deviceGarageFour {
-  constructor (platform, accessory) {
+export default class {
+  constructor(platform, accessory) {
     // Set up variables from the platform
-    this.funcs = platform.funcs
-    this.hapChar = platform.api.hap.Characteristic
-    this.hapErr = platform.api.hap.HapStatusError
-    this.hapServ = platform.api.hap.Service
-    this.lang = platform.lang
-    this.log = platform.log
-    this.platform = platform
+    this.hapChar = platform.api.hap.Characteristic;
+    this.hapErr = platform.api.hap.HapStatusError;
+    this.hapServ = platform.api.hap.Service;
+    this.lang = platform.lang;
+    this.log = platform.log;
+    this.platform = platform;
 
     // Set up variables from the accessory
-    this.name = accessory.displayName
-    this.accessory = accessory
+    this.name = accessory.displayName;
+    this.accessory = accessory;
 
     // Initially set the online flag as true (to be then updated as false if necessary)
-    this.isOnline = true
+    this.isOnline = true;
 
     // Set up custom variables for this device type
-    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
-    this.operationTimeUp = deviceConf.operationTime || platform.consts.defaultValues.operationTime
-    this.operationTimeDown = deviceConf.operationTimeDown || this.operationTimeUp
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId] || {};
+    this.operationTimeUp = deviceConf.operationTime || platformConsts.defaultValues.operationTime;
+    this.operationTimeDown = deviceConf.operationTimeDown || this.operationTimeUp;
 
     // Set the correct logging variables for this accessory
-    this.enableLogging = !platform.config.disableDeviceLogging
-    this.enableDebugLogging = platform.config.debug
-    if (deviceConf && deviceConf.overrideLogging) {
-      switch (deviceConf.overrideLogging) {
-        case 'standard':
-          this.enableLogging = true
-          this.enableDebugLogging = false
-          break
-        case 'debug':
-          this.enableLogging = true
-          this.enableDebugLogging = true
-          break
-        case 'disable':
-          this.enableLogging = false
-          this.enableDebugLogging = false
-          break
-      }
+    switch (deviceConf.overrideLogging) {
+      case 'standard':
+        this.enableLogging = true;
+        this.enableDebugLogging = false;
+        break;
+      case 'debug':
+        this.enableLogging = true;
+        this.enableDebugLogging = true;
+        break;
+      case 'disable':
+        this.enableLogging = false;
+        this.enableDebugLogging = false;
+        break;
+      default:
+        this.enableLogging = !platform.config.disableDeviceLogging;
+        this.enableDebugLogging = platform.config.debug;
+        break;
     }
 
     // Set up the accessory with default positions when added the first time
-    if (!this.funcs.hasProperty(this.accessory.context, 'cacheStates')) {
+    if (!hasProperty(this.accessory.context, 'cacheStates')) {
       this.accessory.context.cacheStates = [
         { cacheCurrentDoorState: 1, cacheTargetDoorState: 1 },
         { cacheCurrentDoorState: 1, cacheTargetDoorState: 1 },
         { cacheCurrentDoorState: 1, cacheTargetDoorState: 1 },
-        { cacheCurrentDoorState: 1, cacheTargetDoorState: 1 }
-      ]
+        { cacheCurrentDoorState: 1, cacheTargetDoorState: 1 },
+      ];
     }
 
     // We want four garage door services for this accessory
-    ;['A', 'B', 'C', 'D'].forEach(v => {
+    ['A', 'B', 'C', 'D'].forEach((v) => {
       // Add the garage door service if it doesn't already exist
-      let gdService
-      if (!(gdService = this.accessory.getService('Garage ' + v))) {
-        gdService = this.accessory.addService(
-          this.hapServ.GarageDoorOpener,
-          'Garage ' + v,
-          'garage' + v
-        )
-        gdService.updateCharacteristic(this.hapChar.CurrentDoorState, 1)
-        gdService.updateCharacteristic(this.hapChar.TargetDoorState, 1)
-        gdService.updateCharacteristic(this.hapChar.ObstructionDetected, false)
+      let gdService = this.accessory.getService(`Garage ${v}`);
+      if (!gdService) {
+        gdService = this.accessory.addService(this.hapServ.GarageDoorOpener, `Garage ${v}`, `garage${v}`);
+        gdService.updateCharacteristic(this.hapChar.CurrentDoorState, 1);
+        gdService.updateCharacteristic(this.hapChar.TargetDoorState, 1);
+        gdService.updateCharacteristic(this.hapChar.ObstructionDetected, false);
       }
 
       // Add the set handler to the target position characteristic
-      gdService.getCharacteristic(this.hapChar.TargetDoorState).onSet(value => {
+      gdService.getCharacteristic(this.hapChar.TargetDoorState).onSet((value) => {
         // We don't use await as we want the callback to be run straight away
-        this.internalStateUpdate(v, value)
-      })
+        this.internalStateUpdate(v, value);
+      });
 
       // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
       if (!platform.config.disableNoResponse) {
         gdService.getCharacteristic(this.hapChar.CurrentDoorState).onGet(() => {
           if (!this.isOnline) {
-            throw new this.hapErr(-70402)
+            throw new this.hapErr(-70402);
           }
-          return gdService.getCharacteristic(this.hapChar.CurrentDoorState).value
-        })
+          return gdService.getCharacteristic(this.hapChar.CurrentDoorState).value;
+        });
         gdService.getCharacteristic(this.hapChar.TargetDoorState).onGet(() => {
           if (!this.isOnline) {
-            throw new this.hapErr(-70402)
+            throw new this.hapErr(-70402);
           }
-          return gdService.getCharacteristic(this.hapChar.TargetDoorState).value
-        })
+          return gdService.getCharacteristic(this.hapChar.TargetDoorState).value;
+        });
       }
-    })
+    });
 
     // Output the customised options to the log
+    const normalLogging = this.enableLogging ? 'standard' : 'disable';
     const opts = JSON.stringify({
-      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
+      logging: this.enableDebugLogging ? 'debug' : normalLogging,
       operationTimeDown: this.operationTimeDown,
       operationTimeUp: this.operationTimeUp,
-      showAs: 'garage_four'
-    })
-    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
+      showAs: 'garage_four',
+    });
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts);
   }
 
-  async internalStateUpdate (garage, value) {
+  async internalStateUpdate(garage, value) {
     try {
-      let garageChannel
+      let garageChannel;
       switch (garage) {
         case 'A':
-          garageChannel = 0
-          break
+          garageChannel = 0;
+          break;
         case 'B':
-          garageChannel = 1
-          break
+          garageChannel = 1;
+          break;
         case 'C':
-          garageChannel = 2
-          break
+          garageChannel = 2;
+          break;
         case 'D':
-          garageChannel = 3
-          break
+          garageChannel = 3;
+          break;
+        default:
+          return;
       }
-      const prevState = this.accessory.context.cacheStates[garageChannel].cacheCurrentDoorState
+      const prevState = this.accessory.context.cacheStates[garageChannel].cacheCurrentDoorState;
       if (value === prevState % 2) {
-        return
+        return;
       }
-      const gdService = this.accessory.getService('Garage ' + garage)
-      this.inUse = true
-      const updateKey = this.funcs.generateRandomString(5)
-      this.updateKey = updateKey
-      gdService.updateCharacteristic(this.hapChar.TargetDoorState, value)
-      gdService.updateCharacteristic(this.hapChar.CurrentDoorState, value + 2)
-      this.accessory.context.cacheStates[garageChannel].cacheTargetDoorState = value
-      this.accessory.context.cacheStates[garageChannel].cacheCurrentDoorState = value + 2
+      const gdService = this.accessory.getService(`Garage ${garage}`);
+      this.inUse = true;
+      const updateKey = generateRandomString(5);
+      this.updateKey = updateKey;
+      gdService.updateCharacteristic(this.hapChar.TargetDoorState, value);
+      gdService.updateCharacteristic(this.hapChar.CurrentDoorState, value + 2);
+      this.accessory.context.cacheStates[garageChannel].cacheTargetDoorState = value;
+      this.accessory.context.cacheStates[garageChannel].cacheCurrentDoorState = value + 2;
       const params = {
         switches: [
           {
             switch: 'on',
-            outlet: garageChannel
-          }
-        ]
-      }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
-      await this.funcs.sleep(2000)
-      this.inUse = false
-      const operationTime = value === 0 ? this.operationTimeUp : this.operationTimeDown
-      await this.funcs.sleep(Math.max((operationTime - 20) * 100, 0))
+            outlet: garageChannel,
+          },
+        ],
+      };
+      await this.platform.sendDeviceUpdate(this.accessory, params);
+      await sleep(2000);
+      this.inUse = false;
+      const operationTime = value === 0 ? this.operationTimeUp : this.operationTimeDown;
+      await sleep(Math.max((operationTime - 20) * 100, 0));
       if (this.updateKey !== updateKey) {
-        return
+        return;
       }
-      gdService.updateCharacteristic(this.hapChar.CurrentDoorState, value)
-      this.accessory.context.cacheStates[garageChannel].cacheCurrentDoorState = value
+      gdService.updateCharacteristic(this.hapChar.CurrentDoorState, value);
+      this.accessory.context.cacheStates[garageChannel].cacheCurrentDoorState = value;
       if (this.enableLogging) {
         this.log(
           '[%s] %s [garage %s %s].',
           this.name,
           this.lang.curState,
           garageChannel,
-          value === 0 ? this.lang.doorOpen : this.lang.doorClosed
-        )
+          value === 0 ? this.lang.doorOpen : this.lang.doorClosed,
+        );
       }
     } catch (err) {
-      this.inUse = false
-      this.platform.deviceUpdateError(this.accessory, err, true)
-      const gdService = this.accessory.getService('Garage ' + garage)
+      this.inUse = false;
+      this.platform.deviceUpdateError(this.accessory, err, true);
+      const gdService = this.accessory.getService(`Garage ${garage}`);
       setTimeout(() => {
         gdService.updateCharacteristic(
           this.hapChar.TargetDoorState,
-          this.accessory.context.cacheTargetDoorState
-        )
-      }, 2000)
-      gdService.updateCharacteristic(this.hapChar.TargetDoorState, new this.hapErr(-70402))
+          this.accessory.context.cacheTargetDoorState,
+        );
+      }, 2000);
+      gdService.updateCharacteristic(this.hapChar.TargetDoorState, new this.hapErr(-70402));
     }
   }
 
-  async externalUpdate (params) {}
-
-  markStatus (isOnline) {
-    this.isOnline = isOnline
+  markStatus(isOnline) {
+    this.isOnline = isOnline;
   }
 }
diff --git a/lib/device/simulation/garage-od-switch.js b/lib/device/simulation/garage-od-switch.js
index cf6de206..1fef456c 100644
--- a/lib/device/simulation/garage-od-switch.js
+++ b/lib/device/simulation/garage-od-switch.js
@@ -1,40 +1,36 @@
-/* jshint node: true, esversion: 10, -W014, -W033 */
-/* eslint-disable new-cap */
-'use strict'
-
-module.exports = class deviceGarageODSwitch {
-  constructor (platform, accessory, devicesInHB) {
+export default class {
+  constructor(platform, accessory, devicesInHB) {
     // Set up variables from the platform
-    this.hapChar = platform.api.hap.Characteristic
-    this.hapServ = platform.api.hap.Service
-    this.platform = platform
+    this.hapChar = platform.api.hap.Characteristic;
+    this.hapServ = platform.api.hap.Service;
+    this.platform = platform;
 
     // Set up variables from the accessory
-    this.accessory = accessory
+    this.accessory = accessory;
 
     // Set up custom variables for this device type
-    const garageId = platform.obstructSwitches[accessory.context.eweDeviceId]
+    const garageId = platform.obstructSwitches[accessory.context.eweDeviceId];
 
     // Check the garage door exists in Homebridge
-    const uuid = platform.api.hap.uuid.generate(garageId + 'SWX')
+    const uuid = platform.api.hap.uuid.generate(`${garageId}SWX`);
     if (!devicesInHB.has(uuid)) {
       // Can't find garage so throw an error
-      throw new Error(platform.lang.noGarageForOD)
+      throw new Error(platform.lang.noGarageForOD);
     } else {
       // Get the garage door accessory
-      this.gService = devicesInHB.get(uuid).getService(this.hapServ.GarageDoorOpener)
+      this.gService = devicesInHB.get(uuid).getService(this.hapServ.GarageDoorOpener);
     }
   }
 
-  async externalUpdate (params) {
+  async externalUpdate(params) {
     try {
       if (!params.switch || params.switch === this.cacheState || !this.gService) {
-        return
+        return;
       }
-      this.gService.updateCharacteristic(this.hapChar.ObstructionDetected, params.switch === 'on')
-      this.cacheState = params.switch
+      this.gService.updateCharacteristic(this.hapChar.ObstructionDetected, params.switch === 'on');
+      this.cacheState = params.switch;
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, false)
+      this.platform.deviceUpdateError(this.accessory, err, false);
     }
   }
 }
diff --git a/lib/device/simulation/garage-one.js b/lib/device/simulation/garage-one.js
index b96731f6..c7470e86 100644
--- a/lib/device/simulation/garage-one.js
+++ b/lib/device/simulation/garage-one.js
@@ -1,395 +1,395 @@
-/* jshint node: true, esversion: 10, -W014, -W033 */
-/* eslint-disable new-cap */
-'use strict'
+import platformConsts from '../../utils/constants.js';
+import { hasProperty, sleep } from '../../utils/functions.js';
 
-module.exports = class deviceGarageOne {
-  constructor (platform, accessory, devicesInHB) {
+export default class {
+  constructor(platform, accessory) {
     // Set up variables from the platform
-    this.eveChar = platform.eveChar
-    this.funcs = platform.funcs
-    this.hapChar = platform.api.hap.Characteristic
-    this.hapErr = platform.api.hap.HapStatusError
-    this.hapServ = platform.api.hap.Service
-    this.hapUUIDGen = platform.api.hap.uuid.generate
-    this.lang = platform.lang
-    this.log = platform.log
-    this.platform = platform
+    this.eveChar = platform.eveChar;
+    this.hapChar = platform.api.hap.Characteristic;
+    this.hapErr = platform.api.hap.HapStatusError;
+    this.hapServ = platform.api.hap.Service;
+    this.hapUUIDGen = platform.api.hap.uuid.generate;
+    this.lang = platform.lang;
+    this.log = platform.log;
+    this.platform = platform;
 
     // Set up variables from the accessory
-    this.name = accessory.displayName
-    this.accessory = accessory
+    this.name = accessory.displayName;
+    this.accessory = accessory;
 
     // Initially set the online flag as true (to be then updated as false if necessary)
-    this.isOnline = true
+    this.isOnline = true;
 
     // Set up custom variables for this device type
-    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
-    this.operationTimeUp = deviceConf.operationTime || platform.consts.defaultValues.operationTime
-    this.operationTimeDown = deviceConf.operationTimeDown || this.operationTimeUp
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId] || {};
+    this.operationTimeUp = deviceConf.operationTime || platformConsts.defaultValues.operationTime;
+    this.operationTimeDown = deviceConf.operationTimeDown || this.operationTimeUp;
 
     // Set the correct logging variables for this accessory
-    this.enableLogging = !platform.config.disableDeviceLogging
-    this.enableDebugLogging = platform.config.debug
-    if (deviceConf && deviceConf.overrideLogging) {
-      switch (deviceConf.overrideLogging) {
-        case 'standard':
-          this.enableLogging = true
-          this.enableDebugLogging = false
-          break
-        case 'debug':
-          this.enableLogging = true
-          this.enableDebugLogging = true
-          break
-        case 'disable':
-          this.enableLogging = false
-          this.enableDebugLogging = false
-          break
-      }
+    switch (deviceConf.overrideLogging) {
+      case 'standard':
+        this.enableLogging = true;
+        this.enableDebugLogging = false;
+        break;
+      case 'debug':
+        this.enableLogging = true;
+        this.enableDebugLogging = true;
+        break;
+      case 'disable':
+        this.enableLogging = false;
+        this.enableDebugLogging = false;
+        break;
+      default:
+        this.enableLogging = !platform.config.disableDeviceLogging;
+        this.enableDebugLogging = platform.config.debug;
+        break;
     }
 
     // Check the sensor is valid if defined by the user
     if (deviceConf.sensorId) {
-      this.definedSensor = true
+      this.definedSensor = true;
     }
 
     // If the accessory has a switch service then remove it
     if (this.accessory.getService(this.hapServ.Switch)) {
-      this.accessory.removeService(this.accessory.getService(this.hapServ.Switch))
+      this.accessory.removeService(this.accessory.getService(this.hapServ.Switch));
     }
 
     // If the accessory has a contact sensor service then remove it
     if (this.accessory.getService(this.hapServ.ContactSensor)) {
-      this.accessory.removeService(this.accessory.getService(this.hapServ.ContactSensor))
+      this.accessory.removeService(this.accessory.getService(this.hapServ.ContactSensor));
     }
 
     // Add the garage door service if it doesn't already exist
-    if (!(this.service = this.accessory.getService(this.hapServ.GarageDoorOpener))) {
-      this.service = this.accessory.addService(this.hapServ.GarageDoorOpener)
-      this.service.updateCharacteristic(this.hapChar.CurrentDoorState, 1)
-      this.service.updateCharacteristic(this.hapChar.TargetDoorState, 1)
-      this.service.updateCharacteristic(this.hapChar.ObstructionDetected, false)
-      this.service.addCharacteristic(this.eveChar.LastActivation)
-      this.service.addCharacteristic(this.eveChar.ResetTotal)
-      this.service.addCharacteristic(this.eveChar.TimesOpened)
+    this.service = this.accessory.getService(this.hapServ.GarageDoorOpener);
+    if (!this.service) {
+      this.service = this.accessory.addService(this.hapServ.GarageDoorOpener);
+      this.service.updateCharacteristic(this.hapChar.CurrentDoorState, 1);
+      this.service.updateCharacteristic(this.hapChar.TargetDoorState, 1);
+      this.service.updateCharacteristic(this.hapChar.ObstructionDetected, false);
+      this.service.addCharacteristic(this.eveChar.LastActivation);
+      this.service.addCharacteristic(this.eveChar.ResetTotal);
+      this.service.addCharacteristic(this.eveChar.TimesOpened);
     }
 
     // Remove unneeded characteristics
     if (this.service.testCharacteristic(this.hapChar.ContactSensorState)) {
       this.service.removeCharacteristic(
-        this.service.getCharacteristic(this.hapChar.ContactSensorState)
-      )
+        this.service.getCharacteristic(this.hapChar.ContactSensorState),
+      );
     }
     if (this.service.testCharacteristic(this.hapChar.OpenDuration)) {
-      this.service.removeCharacteristic(this.service.getCharacteristic(this.hapChar.OpenDuration))
+      this.service.removeCharacteristic(this.service.getCharacteristic(this.hapChar.OpenDuration));
     }
     if (this.service.testCharacteristic(this.hapChar.ClosedDuration)) {
-      this.service.removeCharacteristic(this.service.getCharacteristic(this.hapChar.ClosedDuration))
+      this.service.removeCharacteristic(this.service.getCharacteristic(this.hapChar.ClosedDuration));
     }
 
     // Set up the device type and power readings if necessary
-    if (platform.consts.devices.switchSingle.includes(this.accessory.context.eweUIID)) {
-      this.setup = 'switchSingle'
-    } else if (platform.consts.devices.switchSinglePower.includes(this.accessory.context.eweUIID)) {
-      this.setup = 'switchSingle'
+    if (platformConsts.devices.switchSingle.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'switchSingle';
+    } else if (platformConsts.devices.switchSinglePower.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'switchSingle';
 
       // Add Eve power characteristics
-      this.powerReadings = true
+      this.powerReadings = true;
       if (!this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
-        this.service.addCharacteristic(this.eveChar.CurrentConsumption)
+        this.service.addCharacteristic(this.eveChar.CurrentConsumption);
       }
       if (this.accessory.context.eweUIID === 32) {
         if (!this.service.testCharacteristic(this.eveChar.ElectricCurrent)) {
-          this.service.addCharacteristic(this.eveChar.ElectricCurrent)
+          this.service.addCharacteristic(this.eveChar.ElectricCurrent);
         }
         if (!this.service.testCharacteristic(this.eveChar.Voltage)) {
-          this.service.addCharacteristic(this.eveChar.Voltage)
+          this.service.addCharacteristic(this.eveChar.Voltage);
         }
       }
-    } else if (platform.consts.devices.switchMulti.includes(this.accessory.context.eweUIID)) {
-      this.setup = 'switchMulti'
-      if (platform.consts.devices.switchMultiPower.includes(this.accessory.context.eweUIID)) {
+    } else if (platformConsts.devices.switchMulti.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'switchMulti';
+      if (platformConsts.devices.switchMultiPower.includes(this.accessory.context.eweUIID)) {
         // Add Eve power characteristics
-        this.powerReadings = true
+        this.powerReadings = true;
         if (!this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
-          this.service.addCharacteristic(this.eveChar.CurrentConsumption)
+          this.service.addCharacteristic(this.eveChar.CurrentConsumption);
         }
         if (!this.service.testCharacteristic(this.eveChar.ElectricCurrent)) {
-          this.service.addCharacteristic(this.eveChar.ElectricCurrent)
+          this.service.addCharacteristic(this.eveChar.ElectricCurrent);
         }
         if (!this.service.testCharacteristic(this.eveChar.Voltage)) {
-          this.service.addCharacteristic(this.eveChar.Voltage)
+          this.service.addCharacteristic(this.eveChar.Voltage);
         }
-        this.isDualR3 = true
+        this.isDualR3 = true;
       }
-    } else if (platform.consts.devices.switchSCM.includes(this.accessory.context.eweUIID)) {
-      this.setup = 'switchMulti'
-    } else if (platform.consts.devices.switchSCMPower.includes(this.accessory.context.eweUIID)) {
+    } else if (platformConsts.devices.switchSCM.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'switchMulti';
+    } else if (platformConsts.devices.switchSCMPower.includes(this.accessory.context.eweUIID)) {
       // Could do power here
-      this.setup = 'switchMulti'
+      this.setup = 'switchMulti';
     }
 
     // Add the set handler to the garage door reset total characteristic
-    this.service.getCharacteristic(this.eveChar.ResetTotal).onSet(value => {
-      this.service.updateCharacteristic(this.eveChar.TimesOpened, 0)
-    })
+    this.service.getCharacteristic(this.eveChar.ResetTotal).onSet(() => {
+      this.service.updateCharacteristic(this.eveChar.TimesOpened, 0);
+    });
 
     // Add the set handler to the target position characteristic
-    this.service.getCharacteristic(this.hapChar.TargetDoorState).onSet(value => {
+    this.service.getCharacteristic(this.hapChar.TargetDoorState).onSet((value) => {
       // We don't use await as we want the callback to be run straight away
-      this.internalUpdate(value)
-    })
+      this.internalUpdate(value);
+    });
 
     // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
     if (!platform.config.disableNoResponse) {
       this.service.getCharacteristic(this.hapChar.CurrentDoorState).onGet(() => {
         if (!this.isOnline) {
-          throw new this.hapErr(-70402)
+          throw new this.hapErr(-70402);
         }
-        return this.service.getCharacteristic(this.hapChar.CurrentDoorState).value
-      })
+        return this.service.getCharacteristic(this.hapChar.CurrentDoorState).value;
+      });
       this.service.getCharacteristic(this.hapChar.TargetDoorState).onGet(() => {
         if (!this.isOnline) {
-          throw new this.hapErr(-70402)
+          throw new this.hapErr(-70402);
         }
-        return this.service.getCharacteristic(this.hapChar.TargetDoorState).value
-      })
+        return this.service.getCharacteristic(this.hapChar.TargetDoorState).value;
+      });
     }
 
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new platform.eveService('door', this.accessory, {
-      log: platform.config.debugFakegato ? this.log : () => {}
-    })
+      log: platform.config.debugFakegato ? this.log : () => {},
+    });
     this.accessory.eveService.addEntry({
-      status: this.service.getCharacteristic(this.hapChar.CurrentDoorState).value === 0 ? 0 : 1
-    })
+      status: this.service.getCharacteristic(this.hapChar.CurrentDoorState).value === 0 ? 0 : 1,
+    });
 
     // Set up an interval to get eWeLink to send power updates
     if (
-      this.powerReadings &&
-      (!this.isDualR3 || (this.isDualR3 && platform.config.mode !== 'lan'))
+      this.powerReadings
+      && (!this.isDualR3 || (this.isDualR3 && platform.config.mode !== 'lan'))
     ) {
       setTimeout(() => {
-        this.internalUIUpdate()
-        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
-      }, 5000)
+        this.internalUIUpdate();
+        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000);
+      }, 5000);
 
       // Stop the intervals on Homebridge shutdown
-      platform.api.on('shutdown', () => clearInterval(this.intervalPoll))
+      platform.api.on('shutdown', () => clearInterval(this.intervalPoll));
     }
 
     // Output the customised options to the log
+    const normalLogging = this.enableLogging ? 'standard' : 'disable';
     const opts = JSON.stringify({
-      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
+      logging: this.enableDebugLogging ? 'debug' : normalLogging,
       operationTimeDown: this.operationTimeDown,
       operationTimeUp: this.operationTimeUp,
-      showAs: 'garage'
-    })
-    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
+      showAs: 'garage',
+    });
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts);
   }
 
-  async internalUpdate (value) {
+  async internalUpdate(value) {
     try {
-      const newPos = value
-      const params = {}
-      let delay = 0
-      const prevState = this.service.getCharacteristic(this.hapChar.CurrentDoorState).value
+      const newPos = value;
+      const params = {};
+      let delay = 0;
+      const prevState = this.service.getCharacteristic(this.hapChar.CurrentDoorState).value;
       if (newPos === prevState % 2) {
-        return
+        return;
       }
-      this.inUse = true
-      this.cacheState = value
+      this.inUse = true;
+      this.cacheState = value;
       if (this.setup === 'switchSingle' && [2, 3].includes(prevState)) {
-        this.service.updateCharacteristic(this.hapChar.CurrentDoorState, ((prevState * 2) % 3) + 2)
-        delay = 1500
+        this.service.updateCharacteristic(this.hapChar.CurrentDoorState, ((prevState * 2) % 3) + 2);
+        delay = 1500;
       }
       if (this.cacheState !== newPos) {
-        return
+        return;
       }
-      await this.funcs.sleep(delay)
-      this.service.updateCharacteristic(this.hapChar.TargetDoorState, newPos)
-      this.service.updateCharacteristic(this.hapChar.CurrentDoorState, newPos + 2)
+      await sleep(delay);
+      this.service.updateCharacteristic(this.hapChar.TargetDoorState, newPos);
+      this.service.updateCharacteristic(this.hapChar.CurrentDoorState, newPos + 2);
       switch (this.setup) {
         case 'switchSingle':
-          params.switch = 'on'
-          break
+          params.switch = 'on';
+          break;
         case 'switchMulti':
           params.switches = [
             {
               switch: newPos === 0 ? 'on' : 'off',
-              outlet: 0
+              outlet: 0,
             },
             {
               switch: newPos === 1 ? 'on' : 'off',
-              outlet: 1
-            }
-          ]
-          break
+              outlet: 1,
+            },
+          ];
+          break;
         default:
-          return
+          return;
       }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
-      await this.funcs.sleep(2000)
-      this.inUse = false
+      await this.platform.sendDeviceUpdate(this.accessory, params);
+      await sleep(2000);
+      this.inUse = false;
       if (!this.definedSensor && newPos === 0) {
-        this.accessory.eveService.addEntry({ status: 0 })
-        const initialTime = this.accessory.eveService.getInitialTime()
+        this.accessory.eveService.addEntry({ status: 0 });
+        const initialTime = this.accessory.eveService.getInitialTime();
         this.service.updateCharacteristic(
           this.eveChar.LastActivation,
-          Math.round(new Date().valueOf() / 1000) - initialTime
-        )
+          Math.round(new Date().valueOf() / 1000) - initialTime,
+        );
         this.service.updateCharacteristic(
           this.eveChar.TimesOpened,
-          this.service.getCharacteristic(this.eveChar.TimesOpened).value + 1
-        )
+          this.service.getCharacteristic(this.eveChar.TimesOpened).value + 1,
+        );
       }
-      const operationTime = newPos === 0 ? this.operationTimeUp : this.operationTimeDown
-      await this.funcs.sleep(Math.max((operationTime - 20) * 100, 0))
+      const operationTime = newPos === 0 ? this.operationTimeUp : this.operationTimeDown;
+      await sleep(Math.max((operationTime - 20) * 100, 0));
       if (!this.definedSensor) {
-        this.service.updateCharacteristic(this.hapChar.CurrentDoorState, newPos)
+        this.service.updateCharacteristic(this.hapChar.CurrentDoorState, newPos);
         if (newPos === 1) {
-          this.accessory.eveService.addEntry({ status: 1 })
+          this.accessory.eveService.addEntry({ status: 1 });
         }
         if (this.enableLogging) {
           this.log(
             '[%s] %s [%s].',
             this.name,
             this.lang.curState,
-            newPos === 0 ? this.lang.doorOpen : this.lang.doorClosed
-          )
+            newPos === 0 ? this.lang.doorOpen : this.lang.doorClosed,
+          );
         }
       }
     } catch (err) {
-      this.inUse = false
-      this.platform.deviceUpdateError(this.accessory, err, true)
+      this.inUse = false;
+      this.platform.deviceUpdateError(this.accessory, err, true);
       setTimeout(() => {
         this.service.updateCharacteristic(
           this.hapChar.TargetDoorState,
-          this.service.getCharacteristic(this.hapChar.TargetDoorState).value
-        )
-      }, 2000)
-      this.service.updateCharacteristic(this.hapChar.TargetDoorState, new this.hapErr(-70402))
+          this.service.getCharacteristic(this.hapChar.TargetDoorState).value,
+        );
+      }, 2000);
+      this.service.updateCharacteristic(this.hapChar.TargetDoorState, new this.hapErr(-70402));
     }
   }
 
-  async internalUIUpdate () {
+  async internalUIUpdate() {
     try {
       // Skip polling if device isn't online
       if (!this.isOnline) {
-        return
+        return;
       }
 
       // Send the params to request the updates
       if (this.isDualR3) {
-        await this.platform.sendDeviceUpdate(this.accessory, { uiActive: { outlet: 0, time: 120 } })
+        await this.platform.sendDeviceUpdate(this.accessory, { uiActive: { outlet: 0, time: 120 } });
       } else {
-        await this.platform.sendDeviceUpdate(this.accessory, { uiActive: 120 })
+        await this.platform.sendDeviceUpdate(this.accessory, { uiActive: 120 });
       }
     } catch (err) {
       // Suppress errors here
     }
   }
 
-  async externalUpdate (params) {
+  async externalUpdate(params) {
     try {
       if (this.powerReadings) {
-        let logger = false
-        let power
-        let voltage
-        let current
-        if (this.funcs.hasProperty(params, 'actPow_00')) {
-          power = parseInt(params.actPow_00) / 100
-          this.service.updateCharacteristic(this.eveChar.CurrentConsumption, power)
-          logger = true
-        } else if (this.funcs.hasProperty(params, 'power')) {
-          power = parseFloat(params.power)
-          this.service.updateCharacteristic(this.eveChar.CurrentConsumption, power)
-          logger = true
+        let logger = false;
+        let power;
+        let voltage;
+        let current;
+        if (hasProperty(params, 'actPow_00')) {
+          power = parseInt(params.actPow_00, 10) / 100;
+          this.service.updateCharacteristic(this.eveChar.CurrentConsumption, power);
+          logger = true;
+        } else if (hasProperty(params, 'power')) {
+          power = parseFloat(params.power);
+          this.service.updateCharacteristic(this.eveChar.CurrentConsumption, power);
+          logger = true;
         }
-        if (this.funcs.hasProperty(params, 'voltage_00')) {
-          voltage = parseInt(params.voltage_00) / 100
-          this.service.updateCharacteristic(this.eveChar.Voltage, voltage)
-          logger = true
-        } else if (this.funcs.hasProperty(params, 'voltage')) {
-          voltage = parseFloat(params.voltage)
-          this.service.updateCharacteristic(this.eveChar.Voltage, voltage)
-          logger = true
+        if (hasProperty(params, 'voltage_00')) {
+          voltage = parseInt(params.voltage_00, 10) / 100;
+          this.service.updateCharacteristic(this.eveChar.Voltage, voltage);
+          logger = true;
+        } else if (hasProperty(params, 'voltage')) {
+          voltage = parseFloat(params.voltage);
+          this.service.updateCharacteristic(this.eveChar.Voltage, voltage);
+          logger = true;
         }
-        if (this.funcs.hasProperty(params, 'current_00')) {
-          current = parseInt(params.current_00) / 100
-          this.service.updateCharacteristic(this.eveChar.ElectricCurrent, current)
-          logger = true
-        } else if (this.funcs.hasProperty(params, 'current')) {
-          current = parseFloat(params.current)
-          this.service.updateCharacteristic(this.eveChar.ElectricCurrent, current)
-          logger = true
+        if (hasProperty(params, 'current_00')) {
+          current = parseInt(params.current_00, 10) / 100;
+          this.service.updateCharacteristic(this.eveChar.ElectricCurrent, current);
+          logger = true;
+        } else if (hasProperty(params, 'current')) {
+          current = parseFloat(params.current);
+          this.service.updateCharacteristic(this.eveChar.ElectricCurrent, current);
+          logger = true;
         }
         if (params.updateSource && logger && this.enableLogging) {
           this.log(
             '[%s] %s%s%s.',
             this.name,
-            power !== undefined ? this.lang.curPower + ' [' + power + 'W]' : '',
-            voltage !== undefined ? ' ' + this.lang.curVolt + ' [' + voltage + 'V]' : '',
-            current !== undefined ? ' ' + this.lang.curCurr + ' [' + current + 'A]' : ''
-          )
+            power !== undefined ? `${this.lang.curPower} [${power}W]` : '',
+            voltage !== undefined ? ` ${this.lang.curVolt} [${voltage}V]` : '',
+            current !== undefined ? ` ${this.lang.curCurr} [${current}A]` : '',
+          );
         }
       }
 
       if (!this.inUse && !this.definedSensor) {
-        const prevState = this.service.getCharacteristic(this.hapChar.CurrentDoorState).value
-        const newPos = [0, 2].includes(prevState) ? 3 : 2
+        const prevState = this.service.getCharacteristic(this.hapChar.CurrentDoorState).value;
+        const newPos = [0, 2].includes(prevState) ? 3 : 2;
         if (this.setup === 'switchMulti' && params.switches) {
           if (
-            params.switches[0].switch === params.switches[1].switch ||
-            params.switches[prevState % 2].switch === 'on'
+            params.switches[0].switch === params.switches[1].switch
+            || params.switches[prevState % 2].switch === 'on'
           ) {
-            return
+            return;
           }
         } else if (this.setup === 'switchSingle' && params.switch) {
           if (params.switch === 'off') {
-            return
+            return;
           }
         } else {
-          return
+          return;
         }
-        this.inUse = true
-        this.service.updateCharacteristic(this.hapChar.TargetDoorState, newPos - 2)
-        this.service.updateCharacteristic(this.hapChar.CurrentDoorState, newPos)
-        await this.funcs.sleep(2000)
-        this.inUse = false
+        this.inUse = true;
+        this.service.updateCharacteristic(this.hapChar.TargetDoorState, newPos - 2);
+        this.service.updateCharacteristic(this.hapChar.CurrentDoorState, newPos);
+        await sleep(2000);
+        this.inUse = false;
         if (newPos === 2) {
-          this.accessory.eveService.addEntry({ status: 0 })
-          const initialTime = this.accessory.eveService.getInitialTime()
+          this.accessory.eveService.addEntry({ status: 0 });
+          const initialTime = this.accessory.eveService.getInitialTime();
           this.service.updateCharacteristic(
             this.eveChar.LastActivation,
-            Math.round(new Date().valueOf() / 1000) - initialTime
-          )
+            Math.round(new Date().valueOf() / 1000) - initialTime,
+          );
           this.service.updateCharacteristic(
             this.eveChar.TimesOpened,
-            this.service.getCharacteristic(this.eveChar.TimesOpened).value + 1
-          )
+            this.service.getCharacteristic(this.eveChar.TimesOpened).value + 1,
+          );
         }
-        const operationTime = newPos === 2 ? this.operationTimeUp : this.operationTimeDown
-        await this.funcs.sleep(Math.max((operationTime - 20) * 100, 0))
-        this.service.updateCharacteristic(this.hapChar.CurrentDoorState, newPos - 2)
+        const operationTime = newPos === 2 ? this.operationTimeUp : this.operationTimeDown;
+        await sleep(Math.max((operationTime - 20) * 100, 0));
+        this.service.updateCharacteristic(this.hapChar.CurrentDoorState, newPos - 2);
         if (newPos === 3) {
-          this.accessory.eveService.addEntry({ status: 1 })
+          this.accessory.eveService.addEntry({ status: 1 });
         }
         if (this.enableLogging) {
           this.log(
             '[%s] %s [%s].',
             this.name,
             this.lang.curState,
-            newPos === 2 ? this.lang.doorOpen : this.lang.doorClosed
-          )
+            newPos === 2 ? this.lang.doorOpen : this.lang.doorClosed,
+          );
         }
       }
     } catch (err) {
-      this.inUse = false
-      this.platform.deviceUpdateError(this.accessory, err, false)
+      this.inUse = false;
+      this.platform.deviceUpdateError(this.accessory, err, false);
     }
   }
 
-  markStatus (isOnline) {
-    this.isOnline = isOnline
+  markStatus(isOnline) {
+    this.isOnline = isOnline;
   }
 }
diff --git a/lib/device/simulation/garage-two.js b/lib/device/simulation/garage-two.js
index 7bb08677..f5d0a5ac 100644
--- a/lib/device/simulation/garage-two.js
+++ b/lib/device/simulation/garage-two.js
@@ -1,393 +1,395 @@
-/* jshint node: true, esversion: 10, -W014, -W033 */
-/* eslint-disable new-cap */
-'use strict'
+import platformConsts from '../../utils/constants.js';
+import { hasProperty, sleep } from '../../utils/functions.js';
 
-module.exports = class deviceGarageTwo {
-  constructor (platform, accessory) {
+export default class {
+  constructor(platform, accessory) {
     // Set up variables from the platform
-    this.eveChar = platform.eveChar
-    this.funcs = platform.funcs
-    this.hapChar = platform.api.hap.Characteristic
-    this.hapErr = platform.api.hap.HapStatusError
-    this.hapServ = platform.api.hap.Service
-    this.lang = platform.lang
-    this.log = platform.log
-    this.platform = platform
+    this.eveChar = platform.eveChar;
+    this.hapChar = platform.api.hap.Characteristic;
+    this.hapErr = platform.api.hap.HapStatusError;
+    this.hapServ = platform.api.hap.Service;
+    this.lang = platform.lang;
+    this.log = platform.log;
+    this.platform = platform;
 
     // Set up variables from the accessory
-    this.name = accessory.displayName
-    this.accessory = accessory
+    this.name = accessory.displayName;
+    this.accessory = accessory;
 
     // Initially set the online flag as true (to be then updated as false if necessary)
-    this.isOnline = true
+    this.isOnline = true;
 
     // Set up custom variables for this device type
-    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
-    this.operationTimeUp = deviceConf.operationTime || platform.consts.defaultValues.operationTime
-    this.operationTimeDown = deviceConf.operationTimeDown || this.operationTimeUp
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId] || {};
+    this.operationTimeUp = deviceConf.operationTime || platformConsts.defaultValues.operationTime;
+    this.operationTimeDown = deviceConf.operationTimeDown || this.operationTimeUp;
 
     // Set the correct logging variables for this accessory
-    this.enableLogging = !platform.config.disableDeviceLogging
-    this.enableDebugLogging = platform.config.debug
-    if (deviceConf && deviceConf.overrideLogging) {
-      switch (deviceConf.overrideLogging) {
-        case 'standard':
-          this.enableLogging = true
-          this.enableDebugLogging = false
-          break
-        case 'debug':
-          this.enableLogging = true
-          this.enableDebugLogging = true
-          break
-        case 'disable':
-          this.enableLogging = false
-          this.enableDebugLogging = false
-          break
-      }
+    switch (deviceConf.overrideLogging) {
+      case 'standard':
+        this.enableLogging = true;
+        this.enableDebugLogging = false;
+        break;
+      case 'debug':
+        this.enableLogging = true;
+        this.enableDebugLogging = true;
+        break;
+      case 'disable':
+        this.enableLogging = false;
+        this.enableDebugLogging = false;
+        break;
+      default:
+        this.enableLogging = !platform.config.disableDeviceLogging;
+        this.enableDebugLogging = platform.config.debug;
+        break;
     }
 
     // Set up the accessory with default positions when added the first time
-    if (!this.funcs.hasProperty(this.accessory.context, 'cacheCurrentDoorState')) {
-      this.accessory.context.cacheOneCurrentDoorState = 1
-      this.accessory.context.cacheOneTargetDoorState = 1
-      this.accessory.context.cacheTwoCurrentDoorState = 1
-      this.accessory.context.cacheTwoTargetDoorState = 1
+    if (!hasProperty(this.accessory.context, 'cacheCurrentDoorState')) {
+      this.accessory.context.cacheOneCurrentDoorState = 1;
+      this.accessory.context.cacheOneTargetDoorState = 1;
+      this.accessory.context.cacheTwoCurrentDoorState = 1;
+      this.accessory.context.cacheTwoTargetDoorState = 1;
     }
 
     // Certain devices give power readings
-    if (platform.consts.devices.switchMultiPower.includes(this.accessory.context.eweUIID)) {
-      this.powerReadings = true
+    if (platformConsts.devices.switchMultiPower.includes(this.accessory.context.eweUIID)) {
+      this.powerReadings = true;
     }
 
     // We want two garage door services for this accessory
-    ;['1', '2'].forEach(v => {
+    ['1', '2'].forEach((v) => {
       // Add the garage door service if it doesn't already exist
-      let gdService
-      if (!(gdService = this.accessory.getService('Garage ' + v))) {
-        gdService = this.accessory.addService(
-          this.hapServ.GarageDoorOpener,
-          'Garage ' + v,
-          'garage' + v
-        )
-        gdService.updateCharacteristic(this.hapChar.CurrentDoorState, 1)
-        gdService.updateCharacteristic(this.hapChar.TargetDoorState, 1)
-        gdService.updateCharacteristic(this.hapChar.ObstructionDetected, false)
+      let gdService = this.accessory.getService(`Garage ${v}`);
+      if (!gdService) {
+        gdService = this.accessory.addService(this.hapServ.GarageDoorOpener, `Garage ${v}`, `garage${v}`);
+        gdService.updateCharacteristic(this.hapChar.CurrentDoorState, 1);
+        gdService.updateCharacteristic(this.hapChar.TargetDoorState, 1);
+        gdService.updateCharacteristic(this.hapChar.ObstructionDetected, false);
       }
 
       // Add Eve power characteristics
       if (this.powerReadings) {
         if (!gdService.testCharacteristic(this.eveChar.CurrentConsumption)) {
-          gdService.addCharacteristic(this.eveChar.CurrentConsumption)
+          gdService.addCharacteristic(this.eveChar.CurrentConsumption);
         }
         if (!gdService.testCharacteristic(this.eveChar.ElectricCurrent)) {
-          gdService.addCharacteristic(this.eveChar.ElectricCurrent)
+          gdService.addCharacteristic(this.eveChar.ElectricCurrent);
         }
         if (!gdService.testCharacteristic(this.eveChar.Voltage)) {
-          gdService.addCharacteristic(this.eveChar.Voltage)
+          gdService.addCharacteristic(this.eveChar.Voltage);
         }
       }
 
       // Add the set handler to the target position characteristic
-      gdService.getCharacteristic(this.hapChar.TargetDoorState).onSet(value => {
+      gdService.getCharacteristic(this.hapChar.TargetDoorState).onSet((value) => {
         // We don't use await as we want the callback to be run straight away
-        this.internalUpdate('Garage ' + v, value)
-      })
+        this.internalUpdate(`Garage ${v}`, value);
+      });
 
       // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
       if (!platform.config.disableNoResponse) {
         gdService.getCharacteristic(this.hapChar.CurrentDoorState).onGet(() => {
           if (!this.isOnline) {
-            throw new this.hapErr(-70402)
+            throw new this.hapErr(-70402);
           }
-          return gdService.getCharacteristic(this.hapChar.CurrentDoorState).value
-        })
+          return gdService.getCharacteristic(this.hapChar.CurrentDoorState).value;
+        });
         gdService.getCharacteristic(this.hapChar.TargetDoorState).onGet(() => {
           if (!this.isOnline) {
-            throw new this.hapErr(-70402)
+            throw new this.hapErr(-70402);
           }
-          return gdService.getCharacteristic(this.hapChar.TargetDoorState).value
-        })
+          return gdService.getCharacteristic(this.hapChar.TargetDoorState).value;
+        });
       }
-    })
+    });
 
     // Set up an interval to get eWeLink to send power updates
     if (this.powerReadings && platform.config.mode !== 'lan') {
       setTimeout(() => {
-        this.internalUIUpdate()
-        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
-      }, 5000)
+        this.internalUIUpdate();
+        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000);
+      }, 5000);
 
       // Stop the intervals on Homebridge shutdown
-      platform.api.on('shutdown', () => clearInterval(this.intervalPoll))
+      platform.api.on('shutdown', () => clearInterval(this.intervalPoll));
     }
 
     // Output the customised options to the log
+    const normalLogging = this.enableLogging ? 'standard' : 'disable';
     const opts = JSON.stringify({
-      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
+      logging: this.enableDebugLogging ? 'debug' : normalLogging,
       operationTimeDown: this.operationTimeDown,
       operationTimeUp: this.operationTimeUp,
-      showAs: 'garage_two'
-    })
-    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
+      showAs: 'garage_two',
+    });
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts);
   }
 
-  async internalUpdate (garage, value) {
+  async internalUpdate(garage, value) {
     try {
-      const newPos = value
+      const newPos = value;
       const params = {
-        switches: []
-      }
-      const gdService = this.accessory.getService(garage)
-      const prevState =
-        garage === 'Garage 1'
-          ? this.accessory.context.cacheOneCurrentDoorState
-          : this.accessory.context.cacheTwoCurrentDoorState
+        switches: [],
+      };
+      const gdService = this.accessory.getService(garage);
+      const prevState = garage === 'Garage 1'
+        ? this.accessory.context.cacheOneCurrentDoorState
+        : this.accessory.context.cacheTwoCurrentDoorState;
       if (newPos === prevState % 2) {
-        return
+        return;
       }
-      this.inUse = true
-      gdService.updateCharacteristic(this.hapChar.TargetDoorState, newPos)
-      gdService.updateCharacteristic(this.hapChar.CurrentDoorState, newPos + 2)
+      this.inUse = true;
+      gdService.updateCharacteristic(this.hapChar.TargetDoorState, newPos);
+      gdService.updateCharacteristic(this.hapChar.CurrentDoorState, newPos + 2);
       switch (garage) {
         case 'Garage 1': {
-          this.accessory.context.cacheOneTargetDoorState = newPos
-          this.accessory.context.cacheOneCurrentDoorState = newPos + 2
+          this.accessory.context.cacheOneTargetDoorState = newPos;
+          this.accessory.context.cacheOneCurrentDoorState = newPos + 2;
           params.switches.push({
             switch: newPos === 0 ? 'on' : 'off',
-            outlet: 0
-          })
+            outlet: 0,
+          });
           params.switches.push({
             switch: newPos === 1 ? 'on' : 'off',
-            outlet: 1
-          })
-          break
+            outlet: 1,
+          });
+          break;
         }
         case 'Garage 2': {
-          this.accessory.context.cacheTwoTargetDoorState = newPos
-          this.accessory.context.cacheTwoCurrentDoorState = newPos + 2
+          this.accessory.context.cacheTwoTargetDoorState = newPos;
+          this.accessory.context.cacheTwoCurrentDoorState = newPos + 2;
           params.switches.push({
             switch: newPos === 0 ? 'on' : 'off',
-            outlet: 2
-          })
+            outlet: 2,
+          });
           params.switches.push({
             switch: newPos === 1 ? 'on' : 'off',
-            outlet: 3
-          })
-          break
+            outlet: 3,
+          });
+          break;
         }
+        default:
+          return;
       }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
-      await this.funcs.sleep(2000)
-      this.inUse = false
-      const operationTime = newPos === 0 ? this.operationTimeUp : this.operationTimeDown
-      await this.funcs.sleep(Math.max((operationTime - 20) * 100, 0))
-      gdService.updateCharacteristic(this.hapChar.CurrentDoorState, newPos)
+      await this.platform.sendDeviceUpdate(this.accessory, params);
+      await sleep(2000);
+      this.inUse = false;
+      const operationTime = newPos === 0 ? this.operationTimeUp : this.operationTimeDown;
+      await sleep(Math.max((operationTime - 20) * 100, 0));
+      gdService.updateCharacteristic(this.hapChar.CurrentDoorState, newPos);
       switch (garage) {
         case 'Garage 1': {
-          this.accessory.context.cacheOneCurrentDoorState = newPos
+          this.accessory.context.cacheOneCurrentDoorState = newPos;
           if (this.enableLogging) {
             this.log(
               '[%s] [garage 1] %s [%s].',
               this.name,
               this.lang.curState,
-              newPos === 0 ? this.lang.doorOpen : this.lang.doorClosed
-            )
+              newPos === 0 ? this.lang.doorOpen : this.lang.doorClosed,
+            );
           }
-          break
+          break;
         }
         case 'Garage 2': {
-          this.accessory.context.cacheTwoCurrentDoorState = newPos
+          this.accessory.context.cacheTwoCurrentDoorState = newPos;
           if (this.enableLogging) {
             this.log(
               '[%s] [garage 2] %s [%s].',
               this.name,
               this.lang.curState,
-              newPos === 0 ? this.lang.doorOpen : this.lang.doorClosed
-            )
+              newPos === 0 ? this.lang.doorOpen : this.lang.doorClosed,
+            );
           }
-          break
+          break;
         }
+        default:
+          return;
       }
     } catch (err) {
-      this.inUse = false
-      this.platform.deviceUpdateError(this.accessory, err, true)
-      const gdService = this.accessory.getService(garage)
+      this.inUse = false;
+      this.platform.deviceUpdateError(this.accessory, err, true);
+      const gdService = this.accessory.getService(garage);
       setTimeout(() => {
         gdService.updateCharacteristic(
           this.hapChar.TargetDoorState,
-          this.accessory.context.cacheTargetDoorState
-        )
-      }, 2000)
-      gdService.updateCharacteristic(this.hapChar.TargetDoorState, new this.hapErr(-70402))
+          this.accessory.context.cacheTargetDoorState,
+        );
+      }, 2000);
+      gdService.updateCharacteristic(this.hapChar.TargetDoorState, new this.hapErr(-70402));
     }
   }
 
-  async internalUIUpdate () {
+  async internalUIUpdate() {
     try {
       // Skip polling if device isn't online
       if (!this.isOnline) {
-        return
+        return;
       }
 
       // Send the params to request the updates
-      await this.platform.sendDeviceUpdate(this.accessory, { uiActive: { outlet: 0, time: 120 } })
-      await this.funcs.sleep(2000)
-      await this.platform.sendDeviceUpdate(this.accessory, { uiActive: { outlet: 1, time: 120 } })
+      await this.platform.sendDeviceUpdate(this.accessory, { uiActive: { outlet: 0, time: 120 } });
+      await sleep(2000);
+      await this.platform.sendDeviceUpdate(this.accessory, { uiActive: { outlet: 1, time: 120 } });
     } catch (err) {
       // Suppress errors here
     }
   }
 
-  externalUpdate (params) {
+  externalUpdate(params) {
     try {
       if (params.switches && !this.inUse) {
-        ;['1', '2'].forEach(async v => {
-          const gcService = this.accessory.getService('Garage ' + v)
-          const prevState =
-            v === '1'
-              ? this.accessory.context.cacheOneCurrentDoorState
-              : this.accessory.context.cacheTwoCurrentDoorState
-          const newPos = [0, 2].includes(prevState) ? 3 : 2
+        ['1', '2'].forEach(async (v) => {
+          const gcService = this.accessory.getService(`Garage ${v}`);
+          const prevState = v === '1'
+            ? this.accessory.context.cacheOneCurrentDoorState
+            : this.accessory.context.cacheTwoCurrentDoorState;
+          const newPos = [0, 2].includes(prevState) ? 3 : 2;
           switch (v) {
             case '1':
               if (
-                params.switches[0].switch === params.switches[1].switch ||
-                params.switches[prevState % 2].switch === 'on'
+                params.switches[0].switch === params.switches[1].switch
+                || params.switches[prevState % 2].switch === 'on'
               ) {
-                return
+                return;
               }
-              break
+              break;
             case '2':
               if (
-                params.switches[2].switch === params.switches[3].switch ||
-                params.switches[(prevState % 2) + 2].switch === 'on'
+                params.switches[2].switch === params.switches[3].switch
+                || params.switches[(prevState % 2) + 2].switch === 'on'
               ) {
-                return
+                return;
               }
-              break
+              break;
+            default:
+              return;
           }
-          this.inUse = true
-          gcService.updateCharacteristic(this.hapChar.TargetDoorState, newPos - 2)
-          gcService.updateCharacteristic(this.hapChar.CurrentDoorState, newPos)
+          this.inUse = true;
+          gcService.updateCharacteristic(this.hapChar.TargetDoorState, newPos - 2);
+          gcService.updateCharacteristic(this.hapChar.CurrentDoorState, newPos);
           switch (v) {
             case '1':
-              this.accessory.context.cacheOneCurrentDoorState = newPos
-              this.accessory.context.cacheTwoTargetDoorState = newPos - 2
-              break
+              this.accessory.context.cacheOneCurrentDoorState = newPos;
+              this.accessory.context.cacheTwoTargetDoorState = newPos - 2;
+              break;
             case '2':
-              this.accessory.context.cacheTwoCurrentDoorState = newPos
-              this.accessory.context.cacheTwoTargetDoorState = newPos - 2
-              break
+              this.accessory.context.cacheTwoCurrentDoorState = newPos;
+              this.accessory.context.cacheTwoTargetDoorState = newPos - 2;
+              break;
+            default:
+              return;
           }
-          await this.funcs.sleep(2000)
-          this.inUse = false
-          const operationTime = newPos === 2 ? this.operationTimeUp : this.operationTimeDown
-          await this.funcs.sleep(Math.max((operationTime - 20) * 100, 0))
-          gcService.updateCharacteristic(this.hapChar.CurrentDoorState, newPos - 2)
+          await sleep(2000);
+          this.inUse = false;
+          const operationTime = newPos === 2 ? this.operationTimeUp : this.operationTimeDown;
+          await sleep(Math.max((operationTime - 20) * 100, 0));
+          gcService.updateCharacteristic(this.hapChar.CurrentDoorState, newPos - 2);
           switch (v) {
             case '1':
-              this.accessory.context.cacheOneCurrentDoorState = newPos - 2
+              this.accessory.context.cacheOneCurrentDoorState = newPos - 2;
               if (params.updateSource && this.enableLogging) {
                 this.log(
                   '[%s] [garage 1] %s [%s].',
                   this.name,
                   this.lang.curState,
-                  newPos === 2 ? this.lang.doorOpen : this.lang.doorClosed
-                )
+                  newPos === 2 ? this.lang.doorOpen : this.lang.doorClosed,
+                );
               }
-              break
+              break;
             case '2':
-              this.accessory.context.cacheTwoCurrentDoorState = newPos - 2
+              this.accessory.context.cacheTwoCurrentDoorState = newPos - 2;
               if (params.updateSource && this.enableLogging) {
                 this.log(
                   '[%s] [garage 2] %s [%s].',
                   this.name,
                   this.lang.curState,
-                  newPos === 2 ? this.lang.doorOpen : this.lang.doorClosed
-                )
+                  newPos === 2 ? this.lang.doorOpen : this.lang.doorClosed,
+                );
               }
-              break
+              break;
+            default:
           }
-        })
+        });
       }
 
       // Get the power readings given by certain devices
       if (!this.powerReadings) {
-        return
+        return;
       }
-      let logger0 = false
-      let logger1 = false
-      let power0
-      let power1
-      let voltage0
-      let voltage1
-      let current0
-      let current1
-      if (this.funcs.hasProperty(params, 'actPow_00')) {
-        power0 = parseInt(params.actPow_00) / 100
+      let logger0 = false;
+      let logger1 = false;
+      let power0;
+      let power1;
+      let voltage0;
+      let voltage1;
+      let current0;
+      let current1;
+      if (hasProperty(params, 'actPow_00')) {
+        power0 = parseInt(params.actPow_00, 10) / 100;
         this.accessory
           .getService('Garage 1')
-          .updateCharacteristic(this.eveChar.CurrentConsumption, power0)
-        logger0 = true
+          .updateCharacteristic(this.eveChar.CurrentConsumption, power0);
+        logger0 = true;
       }
-      if (this.funcs.hasProperty(params, 'actPow_01')) {
-        power1 = parseInt(params.actPow_01) / 100
+      if (hasProperty(params, 'actPow_01')) {
+        power1 = parseInt(params.actPow_01, 10) / 100;
         this.accessory
           .getService('Garage 2')
-          .updateCharacteristic(this.eveChar.CurrentConsumption, power1)
-        logger1 = true
+          .updateCharacteristic(this.eveChar.CurrentConsumption, power1);
+        logger1 = true;
       }
-      if (this.funcs.hasProperty(params, 'voltage_00')) {
-        voltage0 = parseInt(params.voltage_00) / 100
-        this.accessory.getService('Garage 1').updateCharacteristic(this.eveChar.Voltage, voltage0)
-        logger0 = true
+      if (hasProperty(params, 'voltage_00')) {
+        voltage0 = parseInt(params.voltage_00, 10) / 100;
+        this.accessory.getService('Garage 1').updateCharacteristic(this.eveChar.Voltage, voltage0);
+        logger0 = true;
       }
-      if (this.funcs.hasProperty(params, 'voltage_01')) {
-        voltage1 = parseInt(params.voltage_01) / 100
-        this.accessory.getService('Garage 2').updateCharacteristic(this.eveChar.Voltage, voltage1)
-        logger1 = true
+      if (hasProperty(params, 'voltage_01')) {
+        voltage1 = parseInt(params.voltage_01, 10) / 100;
+        this.accessory.getService('Garage 2').updateCharacteristic(this.eveChar.Voltage, voltage1);
+        logger1 = true;
       }
-      if (this.funcs.hasProperty(params, 'current_00')) {
-        current0 = parseInt(params.current_00) / 100
+      if (hasProperty(params, 'current_00')) {
+        current0 = parseInt(params.current_00, 10) / 100;
         this.accessory
           .getService('Garage 1')
-          .updateCharacteristic(this.eveChar.ElectricCurrent, current0)
-        logger0 = true
+          .updateCharacteristic(this.eveChar.ElectricCurrent, current0);
+        logger0 = true;
       }
-      if (this.funcs.hasProperty(params, 'current_01')) {
-        current1 = parseInt(params.current_01) / 100
+      if (hasProperty(params, 'current_01')) {
+        current1 = parseInt(params.current_01, 10) / 100;
         this.accessory
           .getService('Garage 2')
-          .updateCharacteristic(this.eveChar.ElectricCurrent, current1)
-        logger1 = true
+          .updateCharacteristic(this.eveChar.ElectricCurrent, current1);
+        logger1 = true;
       }
       if (params.updateSource && this.enableLogging) {
         if (logger0) {
           this.log(
             '[%s] [garage 1] %s%s%s.',
             this.name,
-            power0 !== undefined ? this.lang.curPower + ' [' + power0 + 'W]' : '',
-            voltage0 !== undefined ? ' ' + this.lang.curVolt + ' [' + voltage0 + 'V]' : '',
-            current0 !== undefined ? ' ' + this.lang.curCurr + ' [' + current0 + 'A]' : ''
-          )
+            power0 !== undefined ? `${this.lang.curPower} [${power0}W]` : '',
+            voltage0 !== undefined ? ` ${this.lang.curVolt} [${voltage0}V]` : '',
+            current0 !== undefined ? ` ${this.lang.curCurr} [${current0}A]` : '',
+          );
         }
         if (logger1) {
           this.log(
             '[%s] [garage 2] %s%s%s.',
             this.name,
-            power1 !== undefined ? this.lang.curPower + ' [' + power1 + 'W]' : '',
-            voltage1 !== undefined ? ' ' + this.lang.curVolt + ' [' + voltage1 + 'V]' : '',
-            current1 !== undefined ? ' ' + this.lang.curCurr + ' [' + current1 + 'A]' : ''
-          )
+            power1 !== undefined ? `${this.lang.curPower} [${power1}W]` : '',
+            voltage1 !== undefined ? ` ${this.lang.curVolt} [${voltage1}V]` : '',
+            current1 !== undefined ? ` ${this.lang.curCurr} [${current1}A]` : '',
+          );
         }
       }
     } catch (err) {
-      this.inUse = false
-      this.platform.deviceUpdateError(this.accessory, err, false)
+      this.inUse = false;
+      this.platform.deviceUpdateError(this.accessory, err, false);
     }
   }
 
-  markStatus (isOnline) {
-    this.isOnline = isOnline
+  markStatus(isOnline) {
+    this.isOnline = isOnline;
   }
 }
diff --git a/lib/device/simulation/gate-one.js b/lib/device/simulation/gate-one.js
index 804d45d3..0c54fe47 100644
--- a/lib/device/simulation/gate-one.js
+++ b/lib/device/simulation/gate-one.js
@@ -1,327 +1,327 @@
-/* jshint node: true, esversion: 10, -W014, -W033 */
-/* eslint-disable new-cap */
-'use strict'
+import platformConsts from '../../utils/constants.js';
+import { hasProperty, sleep } from '../../utils/functions.js';
 
-module.exports = class deviceGateOne {
-  constructor (platform, accessory) {
+export default class {
+  constructor(platform, accessory) {
     // Set up variables from the platform
-    this.eveChar = platform.eveChar
-    this.funcs = platform.funcs
-    this.hapChar = platform.api.hap.Characteristic
-    this.hapErr = platform.api.hap.HapStatusError
-    this.hapServ = platform.api.hap.Service
-    this.lang = platform.lang
-    this.log = platform.log
-    this.platform = platform
+    this.eveChar = platform.eveChar;
+    this.hapChar = platform.api.hap.Characteristic;
+    this.hapErr = platform.api.hap.HapStatusError;
+    this.hapServ = platform.api.hap.Service;
+    this.lang = platform.lang;
+    this.log = platform.log;
+    this.platform = platform;
 
     // Set up variables from the accessory
-    this.name = accessory.displayName
-    this.accessory = accessory
+    this.name = accessory.displayName;
+    this.accessory = accessory;
 
     // Initially set the online flag as true (to be then updated as false if necessary)
-    this.isOnline = true
+    this.isOnline = true;
 
     // Set up custom variables for this device type
-    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
-    this.operationTime = deviceConf.operationTime || platform.consts.defaultValues.operationTime
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId] || {};
+    this.operationTime = deviceConf.operationTime || platformConsts.defaultValues.operationTime;
 
     // Set the correct logging variables for this accessory
-    this.enableLogging = !platform.config.disableDeviceLogging
-    this.enableDebugLogging = platform.config.debug
-    if (deviceConf && deviceConf.overrideLogging) {
-      switch (deviceConf.overrideLogging) {
-        case 'standard':
-          this.enableLogging = true
-          this.enableDebugLogging = false
-          break
-        case 'debug':
-          this.enableLogging = true
-          this.enableDebugLogging = true
-          break
-        case 'disable':
-          this.enableLogging = false
-          this.enableDebugLogging = false
-          break
-      }
+    switch (deviceConf.overrideLogging) {
+      case 'standard':
+        this.enableLogging = true;
+        this.enableDebugLogging = false;
+        break;
+      case 'debug':
+        this.enableLogging = true;
+        this.enableDebugLogging = true;
+        break;
+      case 'disable':
+        this.enableLogging = false;
+        this.enableDebugLogging = false;
+        break;
+      default:
+        this.enableLogging = !platform.config.disableDeviceLogging;
+        this.enableDebugLogging = platform.config.debug;
+        break;
     }
 
     // If the accessory has a switch service then remove it
     if (this.accessory.getService(this.hapServ.Switch)) {
-      this.accessory.removeService(this.accessory.getService(this.hapServ.Switch))
+      this.accessory.removeService(this.accessory.getService(this.hapServ.Switch));
     }
 
     // Add the garage door service if it doesn't already exist
-    if (!(this.service = this.accessory.getService(this.hapServ.GarageDoorOpener))) {
-      this.service = this.accessory.addService(this.hapServ.GarageDoorOpener)
-      this.service.updateCharacteristic(this.hapChar.CurrentDoorState, 1)
-      this.service.updateCharacteristic(this.hapChar.TargetDoorState, 1)
-      this.service.updateCharacteristic(this.hapChar.ObstructionDetected, false)
-      this.service.addCharacteristic(this.eveChar.LastActivation)
-      this.service.addCharacteristic(this.eveChar.ResetTotal)
-      this.service.addCharacteristic(this.eveChar.TimesOpened)
+    this.service = this.accessory.getService(this.hapServ.GarageDoorOpener);
+    if (!this.service) {
+      this.service = this.accessory.addService(this.hapServ.GarageDoorOpener);
+      this.service.updateCharacteristic(this.hapChar.CurrentDoorState, 1);
+      this.service.updateCharacteristic(this.hapChar.TargetDoorState, 1);
+      this.service.updateCharacteristic(this.hapChar.ObstructionDetected, false);
+      this.service.addCharacteristic(this.eveChar.LastActivation);
+      this.service.addCharacteristic(this.eveChar.ResetTotal);
+      this.service.addCharacteristic(this.eveChar.TimesOpened);
     }
 
     // Set up the device type and power readings if necessary
-    if (platform.consts.devices.switchSingle.includes(this.accessory.context.eweUIID)) {
-      this.setup = 'switchSingle'
-    } else if (platform.consts.devices.switchSinglePower.includes(this.accessory.context.eweUIID)) {
-      this.setup = 'switchSingle'
+    if (platformConsts.devices.switchSingle.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'switchSingle';
+    } else if (platformConsts.devices.switchSinglePower.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'switchSingle';
 
       // Add Eve power characteristics
-      this.powerReadings = true
+      this.powerReadings = true;
       if (!this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
-        this.service.addCharacteristic(this.eveChar.CurrentConsumption)
+        this.service.addCharacteristic(this.eveChar.CurrentConsumption);
       }
       if (this.accessory.context.eweUIID === 32) {
         if (!this.service.testCharacteristic(this.eveChar.ElectricCurrent)) {
-          this.service.addCharacteristic(this.eveChar.ElectricCurrent)
+          this.service.addCharacteristic(this.eveChar.ElectricCurrent);
         }
         if (!this.service.testCharacteristic(this.eveChar.Voltage)) {
-          this.service.addCharacteristic(this.eveChar.Voltage)
+          this.service.addCharacteristic(this.eveChar.Voltage);
         }
       }
-    } else if (platform.consts.devices.switchMulti.includes(this.accessory.context.eweUIID)) {
-      this.setup = 'switchMulti'
-      if (platform.consts.devices.switchMultiPower.includes(this.accessory.context.eweUIID)) {
+    } else if (platformConsts.devices.switchMulti.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'switchMulti';
+      if (platformConsts.devices.switchMultiPower.includes(this.accessory.context.eweUIID)) {
         // Add Eve power characteristics
-        this.powerReadings = true
+        this.powerReadings = true;
         if (!this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
-          this.service.addCharacteristic(this.eveChar.CurrentConsumption)
+          this.service.addCharacteristic(this.eveChar.CurrentConsumption);
         }
         if (!this.service.testCharacteristic(this.eveChar.ElectricCurrent)) {
-          this.service.addCharacteristic(this.eveChar.ElectricCurrent)
+          this.service.addCharacteristic(this.eveChar.ElectricCurrent);
         }
         if (!this.service.testCharacteristic(this.eveChar.Voltage)) {
-          this.service.addCharacteristic(this.eveChar.Voltage)
+          this.service.addCharacteristic(this.eveChar.Voltage);
         }
-        this.isDualR3 = true
+        this.isDualR3 = true;
       }
-    } else if (platform.consts.devices.switchSCM.includes(this.accessory.context.eweUIID)) {
-      this.setup = 'switchMulti'
-    } else if (platform.consts.devices.switchSCMPower.includes(this.accessory.context.eweUIID)) {
+    } else if (platformConsts.devices.switchSCM.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'switchMulti';
+    } else if (platformConsts.devices.switchSCMPower.includes(this.accessory.context.eweUIID)) {
       // Could do power here
-      this.setup = 'switchMulti'
+      this.setup = 'switchMulti';
     }
 
     // Add the set handler to the garage door reset total characteristic
-    this.service.getCharacteristic(this.eveChar.ResetTotal).onSet(value => {
-      this.service.updateCharacteristic(this.eveChar.TimesOpened, 0)
-    })
+    this.service.getCharacteristic(this.eveChar.ResetTotal).onSet(() => {
+      this.service.updateCharacteristic(this.eveChar.TimesOpened, 0);
+    });
 
     // Add the set handler to the target position characteristic
-    this.service.getCharacteristic(this.hapChar.TargetDoorState).onSet(value => {
+    this.service.getCharacteristic(this.hapChar.TargetDoorState).onSet((value) => {
       // We don't use await as we want the callback to be run straight away
-      this.internalStateUpdate(value)
-    })
+      this.internalStateUpdate(value);
+    });
 
     // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
     if (!platform.config.disableNoResponse) {
       this.service.getCharacteristic(this.hapChar.CurrentDoorState).onGet(() => {
         if (!this.isOnline) {
-          throw new this.hapErr(-70402)
+          throw new this.hapErr(-70402);
         }
-        return this.service.getCharacteristic(this.hapChar.CurrentDoorState).value
-      })
+        return this.service.getCharacteristic(this.hapChar.CurrentDoorState).value;
+      });
       this.service.getCharacteristic(this.hapChar.TargetDoorState).onGet(() => {
         if (!this.isOnline) {
-          throw new this.hapErr(-70402)
+          throw new this.hapErr(-70402);
         }
-        return this.service.getCharacteristic(this.hapChar.TargetDoorState).value
-      })
+        return this.service.getCharacteristic(this.hapChar.TargetDoorState).value;
+      });
     }
 
     // Update the obstruction detected to false on Homebridge restart
-    this.service.updateCharacteristic(this.hapChar.ObstructionDetected, false)
+    this.service.updateCharacteristic(this.hapChar.ObstructionDetected, false);
 
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new platform.eveService('door', this.accessory, {
-      log: platform.config.debugFakegato ? this.log : () => {}
-    })
+      log: platform.config.debugFakegato ? this.log : () => {},
+    });
     this.accessory.eveService.addEntry({
-      status: this.service.getCharacteristic(this.hapChar.CurrentDoorState).value === 0 ? 0 : 1
-    })
+      status: this.service.getCharacteristic(this.hapChar.CurrentDoorState).value === 0 ? 0 : 1,
+    });
 
     // Set up an interval to get eWeLink to send power updates
     if (
-      this.powerReadings &&
-      (!this.isDualR3 || (this.isDualR3 && platform.config.mode !== 'lan'))
+      this.powerReadings
+      && (!this.isDualR3 || (this.isDualR3 && platform.config.mode !== 'lan'))
     ) {
       setTimeout(() => {
-        this.internalUIUpdate()
-        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
-      }, 5000)
+        this.internalUIUpdate();
+        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000);
+      }, 5000);
 
       // Stop the intervals on Homebridge shutdown
-      platform.api.on('shutdown', () => clearInterval(this.intervalPoll))
+      platform.api.on('shutdown', () => clearInterval(this.intervalPoll));
     }
 
     // Output the customised options to the log
+    const normalLogging = this.enableLogging ? 'standard' : 'disable';
     const opts = JSON.stringify({
-      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
+      logging: this.enableDebugLogging ? 'debug' : normalLogging,
       operationTime: this.operationTime,
-      showAs: 'gate'
-    })
-    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
+      showAs: 'gate',
+    });
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts);
   }
 
-  async internalStateUpdate (value) {
+  async internalStateUpdate(value) {
     try {
       if (value === 1) {
-        this.service.updateCharacteristic(this.hapChar.CurrentDoorState, 1)
-        return
+        this.service.updateCharacteristic(this.hapChar.CurrentDoorState, 1);
+        return;
       }
 
-      const params = {}
+      const params = {};
       switch (this.setup) {
         case 'switchSingle':
-          params.switch = 'on'
-          break
+          params.switch = 'on';
+          break;
         case 'switchMulti':
           params.switches = [
             {
               switch: 'on',
-              outlet: 0
-            }
-          ]
-          break
+              outlet: 0,
+            },
+          ];
+          break;
         default:
-          return
+          return;
       }
-      this.inUse = true
-      await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.service.updateCharacteristic(this.hapChar.CurrentDoorState, 0)
-      this.accessory.eveService.addEntry({ status: 0 })
+      this.inUse = true;
+      await this.platform.sendDeviceUpdate(this.accessory, params);
+      this.service.updateCharacteristic(this.hapChar.CurrentDoorState, 0);
+      this.accessory.eveService.addEntry({ status: 0 });
       this.service.updateCharacteristic(
         this.eveChar.LastActivation,
-        Math.round(new Date().valueOf() / 1000) - this.accessory.eveService.getInitialTime()
-      )
+        Math.round(new Date().valueOf() / 1000) - this.accessory.eveService.getInitialTime(),
+      );
       this.service.updateCharacteristic(
         this.eveChar.TimesOpened,
-        this.service.getCharacteristic(this.eveChar.TimesOpened).value + 1
-      )
+        this.service.getCharacteristic(this.eveChar.TimesOpened).value + 1,
+      );
       if (this.enableLogging) {
-        this.log('[%s] %s [%s].', this.name, this.lang.curState, this.lang.lockUnlocked)
+        this.log('[%s] %s [%s].', this.name, this.lang.curState, this.lang.lockUnlocked);
       }
-      await this.funcs.sleep(Math.max(this.operationTime * 100, 1000))
-      this.service.updateCharacteristic(this.hapChar.TargetDoorState, 1)
-      this.service.updateCharacteristic(this.hapChar.CurrentDoorState, 1)
-      this.accessory.eveService.addEntry({ status: 1 })
-      this.inUse = false
+      await sleep(Math.max(this.operationTime * 100, 1000));
+      this.service.updateCharacteristic(this.hapChar.TargetDoorState, 1);
+      this.service.updateCharacteristic(this.hapChar.CurrentDoorState, 1);
+      this.accessory.eveService.addEntry({ status: 1 });
+      this.inUse = false;
       if (this.enableLogging) {
-        this.log('[%s] %s [%s].', this.name, this.lang.curState, this.lang.lockLocked)
+        this.log('[%s] %s [%s].', this.name, this.lang.curState, this.lang.lockLocked);
       }
     } catch (err) {
-      this.inUse = false
-      this.platform.deviceUpdateError(this.accessory, err, true)
+      this.inUse = false;
+      this.platform.deviceUpdateError(this.accessory, err, true);
       setTimeout(() => {
-        this.service.updateCharacteristic(this.hapChar.LockTargetState, 1)
-      }, 2000)
-      this.service.updateCharacteristic(this.hapChar.LockTargetState, new this.hapErr(-70402))
+        this.service.updateCharacteristic(this.hapChar.LockTargetState, 1);
+      }, 2000);
+      this.service.updateCharacteristic(this.hapChar.LockTargetState, new this.hapErr(-70402));
     }
   }
 
-  async internalUIUpdate () {
+  async internalUIUpdate() {
     try {
       // Skip polling if device isn't online
       if (!this.isOnline) {
-        return
+        return;
       }
 
       // Send the params to request the updates
       if (this.isDualR3) {
-        await this.platform.sendDeviceUpdate(this.accessory, { uiActive: { outlet: 0, time: 120 } })
+        await this.platform.sendDeviceUpdate(this.accessory, { uiActive: { outlet: 0, time: 120 } });
       } else {
-        await this.platform.sendDeviceUpdate(this.accessory, { uiActive: 120 })
+        await this.platform.sendDeviceUpdate(this.accessory, { uiActive: 120 });
       }
     } catch (err) {
       // Suppress errors here
     }
   }
 
-  async externalUpdate (params) {
+  async externalUpdate(params) {
     try {
       if (!this.inUse) {
         if (
-          (this.setup === 'switchMulti' && params.switches && params.switches[0].switch === 'on') ||
-          (this.setup === 'switchSingle' && params.switch && params.switch === 'on')
+          (this.setup === 'switchMulti' && params.switches && params.switches[0].switch === 'on')
+          || (this.setup === 'switchSingle' && params.switch && params.switch === 'on')
         ) {
-          this.inUse = true
-          this.service.updateCharacteristic(this.hapChar.TargetDoorState, 0)
-          this.service.updateCharacteristic(this.hapChar.CurrentDoorState, 0)
-          this.accessory.eveService.addEntry({ status: 0 })
+          this.inUse = true;
+          this.service.updateCharacteristic(this.hapChar.TargetDoorState, 0);
+          this.service.updateCharacteristic(this.hapChar.CurrentDoorState, 0);
+          this.accessory.eveService.addEntry({ status: 0 });
           this.service.updateCharacteristic(
             this.eveChar.LastActivation,
-            Math.round(new Date().valueOf() / 1000) - this.accessory.eveService.getInitialTime()
-          )
+            Math.round(new Date().valueOf() / 1000) - this.accessory.eveService.getInitialTime(),
+          );
           this.service.updateCharacteristic(
             this.eveChar.TimesOpened,
-            this.service.getCharacteristic(this.eveChar.TimesOpened).value + 1
-          )
+            this.service.getCharacteristic(this.eveChar.TimesOpened).value + 1,
+          );
           if (params.updateSource && this.enableLogging) {
-            this.log('[%s] %s [%s].', this.name, this.lang.curState, this.lang.lockUnlocked)
+            this.log('[%s] %s [%s].', this.name, this.lang.curState, this.lang.lockUnlocked);
           }
-          await this.funcs.sleep(Math.max(this.operationTime * 100, 1000))
-          this.service.updateCharacteristic(this.hapChar.TargetDoorState, 1)
-          this.service.updateCharacteristic(this.hapChar.CurrentDoorState, 1)
-          this.accessory.eveService.addEntry({ status: 1 })
-          this.inUse = false
+          await sleep(Math.max(this.operationTime * 100, 1000));
+          this.service.updateCharacteristic(this.hapChar.TargetDoorState, 1);
+          this.service.updateCharacteristic(this.hapChar.CurrentDoorState, 1);
+          this.accessory.eveService.addEntry({ status: 1 });
+          this.inUse = false;
           if (params.updateSource && this.enableLogging) {
-            this.log('[%s] %s [%s].', this.name, this.lang.curState, this.lang.lockLocked)
+            this.log('[%s] %s [%s].', this.name, this.lang.curState, this.lang.lockLocked);
           }
         }
       }
 
       // Get the power readings given by certain devices
       if (!this.powerReadings) {
-        return
+        return;
       }
-      let logger = false
-      let power
-      let voltage
-      let current
-      if (this.funcs.hasProperty(params, 'actPow_00')) {
-        power = parseInt(params.actPow_00) / 100
-        this.service.updateCharacteristic(this.eveChar.CurrentConsumption, power)
-        logger = true
-      } else if (this.funcs.hasProperty(params, 'power')) {
-        power = parseFloat(params.power)
-        this.service.updateCharacteristic(this.eveChar.CurrentConsumption, power)
-        logger = true
+      let logger = false;
+      let power;
+      let voltage;
+      let current;
+      if (hasProperty(params, 'actPow_00')) {
+        power = parseInt(params.actPow_00, 10) / 100;
+        this.service.updateCharacteristic(this.eveChar.CurrentConsumption, power);
+        logger = true;
+      } else if (hasProperty(params, 'power')) {
+        power = parseFloat(params.power);
+        this.service.updateCharacteristic(this.eveChar.CurrentConsumption, power);
+        logger = true;
       }
-      if (this.funcs.hasProperty(params, 'voltage_00')) {
-        voltage = parseInt(params.voltage_00) / 100
-        this.service.updateCharacteristic(this.eveChar.Voltage, voltage)
-        logger = true
-      } else if (this.funcs.hasProperty(params, 'voltage')) {
-        voltage = parseFloat(params.voltage)
-        this.service.updateCharacteristic(this.eveChar.Voltage, voltage)
-        logger = true
+      if (hasProperty(params, 'voltage_00')) {
+        voltage = parseInt(params.voltage_00, 10) / 100;
+        this.service.updateCharacteristic(this.eveChar.Voltage, voltage);
+        logger = true;
+      } else if (hasProperty(params, 'voltage')) {
+        voltage = parseFloat(params.voltage);
+        this.service.updateCharacteristic(this.eveChar.Voltage, voltage);
+        logger = true;
       }
-      if (this.funcs.hasProperty(params, 'current_00')) {
-        current = parseInt(params.current_00) / 100
-        this.service.updateCharacteristic(this.eveChar.ElectricCurrent, current)
-        logger = true
-      } else if (this.funcs.hasProperty(params, 'current')) {
-        current = parseFloat(params.current)
-        this.service.updateCharacteristic(this.eveChar.ElectricCurrent, current)
-        logger = true
+      if (hasProperty(params, 'current_00')) {
+        current = parseInt(params.current_00, 10) / 100;
+        this.service.updateCharacteristic(this.eveChar.ElectricCurrent, current);
+        logger = true;
+      } else if (hasProperty(params, 'current')) {
+        current = parseFloat(params.current);
+        this.service.updateCharacteristic(this.eveChar.ElectricCurrent, current);
+        logger = true;
       }
       if (params.updateSource && logger && this.enableLogging) {
         this.log(
           '[%s] %s%s%s.',
           this.name,
-          power !== undefined ? this.lang.curPower + ' [' + power + 'W]' : '',
-          voltage !== undefined ? ' ' + this.lang.curVolt + ' [' + voltage + 'V]' : '',
-          current !== undefined ? ' ' + this.lang.curCurr + ' [' + current + 'A]' : ''
-        )
+          power !== undefined ? `${this.lang.curPower} [${power}W]` : '',
+          voltage !== undefined ? ` ${this.lang.curVolt} [${voltage}V]` : '',
+          current !== undefined ? ` ${this.lang.curCurr} [${current}A]` : '',
+        );
       }
     } catch (err) {
-      this.inUse = false
-      this.platform.deviceUpdateError(this.accessory, err, false)
+      this.inUse = false;
+      this.platform.deviceUpdateError(this.accessory, err, false);
     }
   }
 
-  markStatus (isOnline) {
-    this.isOnline = isOnline
+  markStatus(isOnline) {
+    this.isOnline = isOnline;
   }
 }
diff --git a/lib/device/simulation/heater.js b/lib/device/simulation/heater.js
index 27cb8262..6747faac 100644
--- a/lib/device/simulation/heater.js
+++ b/lib/device/simulation/heater.js
@@ -1,321 +1,314 @@
-/* jshint node: true, esversion: 10, -W014, -W033 */
-/* eslint-disable new-cap */
-'use strict'
+import { hasProperty, parseError } from '../../utils/functions.js';
 
-module.exports = class deviceHeater {
-  constructor (platform, accessory) {
+export default class {
+  constructor(platform, accessory) {
     // Set up variables from the platform
-    this.funcs = platform.funcs
-    this.hapChar = platform.api.hap.Characteristic
-    this.hapErr = platform.api.hap.HapStatusError
-    this.hapServ = platform.api.hap.Service
-    this.lang = platform.lang
-    this.log = platform.log
-    this.platform = platform
+    this.hapChar = platform.api.hap.Characteristic;
+    this.hapErr = platform.api.hap.HapStatusError;
+    this.hapServ = platform.api.hap.Service;
+    this.lang = platform.lang;
+    this.log = platform.log;
+    this.platform = platform;
 
     // Set up variables from the accessory
-    this.name = accessory.displayName
-    this.accessory = accessory
+    this.name = accessory.displayName;
+    this.accessory = accessory;
 
     // Initially set the online flag as true (to be then updated as false if necessary)
-    this.isOnline = true
+    this.isOnline = true;
 
     // Set up custom variables for this device type
-    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
-    this.temperatureSource = deviceConf.temperatureSource
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId] || {};
+    this.temperatureSource = deviceConf.temperatureSource;
 
     // Set the correct logging variables for this accessory
-    this.enableLogging = !platform.config.disableDeviceLogging
-    this.enableDebugLogging = platform.config.debug
-    if (deviceConf && deviceConf.overrideLogging) {
-      switch (deviceConf.overrideLogging) {
-        case 'standard':
-          this.enableLogging = true
-          this.enableDebugLogging = false
-          break
-        case 'debug':
-          this.enableLogging = true
-          this.enableDebugLogging = true
-          break
-        case 'disable':
-          this.enableLogging = false
-          this.enableDebugLogging = false
-          break
-      }
+    switch (deviceConf.overrideLogging) {
+      case 'standard':
+        this.enableLogging = true;
+        this.enableDebugLogging = false;
+        break;
+      case 'debug':
+        this.enableLogging = true;
+        this.enableDebugLogging = true;
+        break;
+      case 'disable':
+        this.enableLogging = false;
+        this.enableDebugLogging = false;
+        break;
+      default:
+        this.enableLogging = !platform.config.disableDeviceLogging;
+        this.enableDebugLogging = platform.config.debug;
+        break;
     }
 
     // If the accessory has a switch service then remove it
     if (this.accessory.getService(this.hapServ.Switch)) {
-      this.accessory.removeService(this.accessory.getService(this.hapServ.Switch))
+      this.accessory.removeService(this.accessory.getService(this.hapServ.Switch));
     }
 
     // Set up the accessory with default target temp when added the first time
-    if (!this.funcs.hasProperty(this.accessory.context, 'cacheTarget')) {
-      this.accessory.context.cacheTarget = 20
+    if (!hasProperty(this.accessory.context, 'cacheTarget')) {
+      this.accessory.context.cacheTarget = 20;
     }
 
     // Check to make sure user has not switched from cooler to heater
     if (this.accessory.context.cacheType !== 'heater') {
       // Remove and re-setup as a HeaterCooler
       if (this.accessory.getService(this.hapServ.HeaterCooler)) {
-        this.accessory.removeService(this.accessory.getService(this.hapServ.HeaterCooler))
+        this.accessory.removeService(this.accessory.getService(this.hapServ.HeaterCooler));
       }
-      this.accessory.context.cacheType = 'heater'
-      this.accessory.context.cacheTarget = 20
+      this.accessory.context.cacheType = 'heater';
+      this.accessory.context.cacheTarget = 20;
     }
 
     // Add the heater service if it doesn't already exist
-    this.service =
-      this.accessory.getService(this.hapServ.HeaterCooler) ||
-      this.accessory.addService(this.hapServ.HeaterCooler)
+    this.service = this.accessory.getService(this.hapServ.HeaterCooler)
+      || this.accessory.addService(this.hapServ.HeaterCooler);
 
     // Set custom properties of the current temperature characteristic
     this.service.getCharacteristic(this.hapChar.CurrentTemperature).setProps({
-      minStep: 0.1
-    })
-    this.cacheTemp = this.service.getCharacteristic(this.hapChar.CurrentTemperature).value
+      minStep: 0.1,
+    });
+    this.cacheTemp = this.service.getCharacteristic(this.hapChar.CurrentTemperature).value;
 
     // Add the set handler to the heater active characteristic
     this.service
       .getCharacteristic(this.hapChar.Active)
-      .onSet(async value => await this.internalStateUpdate(value))
+      .onSet(async (value) => this.internalStateUpdate(value));
 
     // Add options to the target state characteristic
     this.service.getCharacteristic(this.hapChar.TargetHeaterCoolerState).setProps({
       minValue: 0,
       maxValue: 0,
-      validValues: [0]
-    })
+      validValues: [0],
+    });
 
     // Add the set handler to the target temperature characteristic
     this.service
       .getCharacteristic(this.hapChar.HeatingThresholdTemperature)
       .updateValue(this.accessory.context.cacheTarget)
       .setProps({ minStep: 0.5 })
-      .onSet(async value => await this.internalTargetTempUpdate(value))
+      .onSet(async (value) => this.internalTargetTempUpdate(value));
 
     // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
     if (!platform.config.disableNoResponse) {
       this.service.getCharacteristic(this.hapChar.CurrentTemperature).onGet(() => {
         if (!this.isOnline) {
-          throw new this.hapErr(-70402)
+          throw new this.hapErr(-70402);
         }
-        return this.service.getCharacteristic(this.hapChar.CurrentTemperature).value
-      })
+        return this.service.getCharacteristic(this.hapChar.CurrentTemperature).value;
+      });
       this.service.getCharacteristic(this.hapChar.Active).onGet(() => {
         if (!this.isOnline) {
-          throw new this.hapErr(-70402)
+          throw new this.hapErr(-70402);
         }
-        return this.service.getCharacteristic(this.hapChar.Active).value
-      })
+        return this.service.getCharacteristic(this.hapChar.Active).value;
+      });
       this.service.getCharacteristic(this.hapChar.TargetHeaterCoolerState).onGet(() => {
         if (!this.isOnline) {
-          throw new this.hapErr(-70402)
+          throw new this.hapErr(-70402);
         }
-        return this.service.getCharacteristic(this.hapChar.TargetHeaterCoolerState).value
-      })
+        return this.service.getCharacteristic(this.hapChar.TargetHeaterCoolerState).value;
+      });
       this.service.getCharacteristic(this.hapChar.CurrentHeaterCoolerState).onGet(() => {
         if (!this.isOnline) {
-          throw new this.hapErr(-70402)
+          throw new this.hapErr(-70402);
         }
-        return this.service.getCharacteristic(this.hapChar.CurrentHeaterCoolerState).value
-      })
+        return this.service.getCharacteristic(this.hapChar.CurrentHeaterCoolerState).value;
+      });
       this.service.getCharacteristic(this.hapChar.HeatingThresholdTemperature).onGet(() => {
         if (!this.isOnline) {
-          throw new this.hapErr(-70402)
+          throw new this.hapErr(-70402);
         }
-        return this.service.getCharacteristic(this.hapChar.HeatingThresholdTemperature).value
-      })
+        return this.service.getCharacteristic(this.hapChar.HeatingThresholdTemperature).value;
+      });
     }
 
     // Initialise these caches now since they aren't determined by the initial externalUpdate()
-    this.cacheState = this.service.getCharacteristic(this.hapChar.Active).value === 1 ? 'on' : 'off'
-    this.cacheHeat =
-      this.cacheState === 'on' &&
-      this.service.getCharacteristic(this.hapChar.CurrentHeaterCoolerState).value === 2
-        ? 'on'
-        : 'off'
+    this.cacheState = this.service.getCharacteristic(this.hapChar.Active).value === 1 ? 'on' : 'off';
+    this.cacheHeat = this.cacheState === 'on'
+      && this.service.getCharacteristic(this.hapChar.CurrentHeaterCoolerState).value === 2
+      ? 'on'
+      : 'off';
 
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new platform.eveService('custom', this.accessory, {
-      log: platform.config.debugFakegato ? this.log : () => {}
-    })
+      log: platform.config.debugFakegato ? this.log : () => {},
+    });
 
     // Set up an interval to get regular temperature updates
     setTimeout(() => {
-      this.getTemperature()
-      this.intervalPoll = setInterval(() => this.getTemperature(), 120000)
-    }, 5000)
+      this.getTemperature();
+      this.intervalPoll = setInterval(() => this.getTemperature(), 120000);
+    }, 5000);
 
     // Stop the intervals on Homebridge shutdown
     platform.api.on('shutdown', () => {
-      clearInterval(this.intervalPoll)
-    })
+      clearInterval(this.intervalPoll);
+    });
 
     // Output the customised options to the log
+    const normalLogging = this.enableLogging ? 'standard' : 'disable';
     const opts = JSON.stringify({
-      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
+      logging: this.enableDebugLogging ? 'debug' : normalLogging,
       showAs: 'heater',
-      temperatureSource: this.temperatureSource
-    })
-    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
+      temperatureSource: this.temperatureSource,
+    });
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts);
   }
 
-  async internalStateUpdate (value) {
+  async internalStateUpdate(value) {
     try {
-      let newState
-      let newHeat
-      const params = {}
+      let newState;
+      let newHeat;
+      const params = {};
       if (value === 0) {
-        params.switch = 'off'
-        newState = 'off'
-        newHeat = 'off'
+        params.switch = 'off';
+        newState = 'off';
+        newHeat = 'off';
+      } else if (this.cacheTemp < this.accessory.context.cacheTarget) {
+        params.switch = 'on';
+        newState = 'on';
+        newHeat = 'on';
       } else {
-        if (this.cacheTemp < this.accessory.context.cacheTarget) {
-          params.switch = 'on'
-          newState = 'on'
-          newHeat = 'on'
-        } else {
-          params.switch = 'off'
-          newState = 'on'
-          newHeat = 'off'
-        }
+        params.switch = 'off';
+        newState = 'on';
+        newHeat = 'off';
       }
 
       // Only send the update if either:
       // * The new value (state) is OFF and the cacheHeat was ON
       // * The new value (state) is ON and newHeat is 'on'
       if ((value === 0 && this.cacheHeat === 'on') || (value === 1 && newHeat === 'on')) {
-        await this.platform.sendDeviceUpdate(this.accessory, params)
+        await this.platform.sendDeviceUpdate(this.accessory, params);
       }
       if (newState !== this.cacheState) {
-        this.cacheState = newState
+        this.cacheState = newState;
         if (this.enableLogging) {
-          this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
+          this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState);
         }
       }
       if (newHeat !== this.cacheHeat) {
-        this.cacheHeat = newHeat
+        this.cacheHeat = newHeat;
         if (this.enableLogging) {
-          this.log('[%s] %s [%s].', this.name, this.lang.curHeat, this.cacheHeat)
+          this.log('[%s] %s [%s].', this.name, this.lang.curHeat, this.cacheHeat);
         }
       }
+      const hapState = this.cacheHeat === 'on' ? 2 : 1;
       this.service.updateCharacteristic(
         this.hapChar.CurrentHeaterCoolerState,
-        value === 1 ? (this.cacheHeat === 'on' ? 2 : 1) : 0
-      )
+        value === 1 ? hapState : 0,
+      );
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true);
       setTimeout(() => {
-        this.service.updateCharacteristic(this.hapChar.Active, this.cacheState === 'on' ? 1 : 0)
-      }, 2000)
-      throw new this.hapErr(-70402)
+        this.service.updateCharacteristic(this.hapChar.Active, this.cacheState === 'on' ? 1 : 0);
+      }, 2000);
+      throw new this.hapErr(-70402);
     }
   }
 
-  async internalTargetTempUpdate (value) {
+  async internalTargetTempUpdate(value) {
     try {
       if (value === this.accessory.context.cacheTarget) {
-        return
+        return;
       }
-      this.accessory.context.cacheTarget = value
+      this.accessory.context.cacheTarget = value;
       if (this.enableLogging) {
-        this.log('[%s] %s [%s°C].', this.name, this.lang.curTarg, value)
+        this.log('[%s] %s [%s°C].', this.name, this.lang.curTarg, value);
       }
       if (this.cacheState === 'off') {
-        return
+        return;
       }
-      const params = {}
-      let newHeat
+      const params = {};
+      let newHeat;
       if (this.cacheTemp < value) {
-        params.switch = 'on'
-        newHeat = 'on'
+        params.switch = 'on';
+        newHeat = 'on';
       } else {
-        params.switch = 'off'
-        newHeat = 'off'
+        params.switch = 'off';
+        newHeat = 'off';
       }
       if (newHeat === this.cacheHeat) {
-        return
+        return;
       }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.cacheHeat = newHeat
+      await this.platform.sendDeviceUpdate(this.accessory, params);
+      this.cacheHeat = newHeat;
       if (this.enableLogging) {
-        this.log('[%s] %s [%s].', this.name, this.lang.curHeat, this.cacheHeat)
+        this.log('[%s] %s [%s].', this.name, this.lang.curHeat, this.cacheHeat);
       }
       this.service.updateCharacteristic(
         this.hapChar.CurrentHeaterCoolerState,
-        this.cacheHeat === 'on' ? 2 : 1
-      )
+        this.cacheHeat === 'on' ? 2 : 1,
+      );
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true);
       setTimeout(() => {
         this.service.updateCharacteristic(
           this.hapChar.HeatingThresholdTemperature,
-          this.accessory.context.cacheTarget
-        )
-      }, 2000)
-      throw new this.hapErr(-70402)
+          this.accessory.context.cacheTarget,
+        );
+      }, 2000);
+      throw new this.hapErr(-70402);
     }
   }
 
-  async internalCurrentTempUpdate () {
+  async internalCurrentTempUpdate() {
     try {
       if (this.cacheState === 'off') {
-        return
+        return;
       }
-      const params = {}
-      let newHeat
+      const params = {};
+      let newHeat;
       if (this.cacheTemp < this.accessory.context.cacheTarget) {
-        params.switch = 'on'
-        newHeat = 'on'
+        params.switch = 'on';
+        newHeat = 'on';
       } else {
-        params.switch = 'off'
-        newHeat = 'off'
+        params.switch = 'off';
+        newHeat = 'off';
       }
       if (newHeat === this.cacheHeat) {
-        return
+        return;
       }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.cacheHeat = newHeat
+      await this.platform.sendDeviceUpdate(this.accessory, params);
+      this.cacheHeat = newHeat;
       if (this.enableLogging) {
-        this.log('[%s] %s [%s].', this.name, this.lang.curHeat, this.cacheHeat)
+        this.log('[%s] %s [%s].', this.name, this.lang.curHeat, this.cacheHeat);
       }
       this.service.updateCharacteristic(
         this.hapChar.CurrentHeaterCoolerState,
-        this.cacheHeat === 'on' ? 2 : 1
-      )
+        this.cacheHeat === 'on' ? 2 : 1,
+      );
     } catch (err) {
-      const eText = this.funcs.parseError(err)
-      this.log.warn('[%s] %s.', this.name, eText)
+      const eText = parseError(err);
+      this.log.warn('[%s] %s.', this.name, eText);
     }
   }
 
-  async getTemperature () {
+  async getTemperature() {
     try {
       // Skip polling if device isn't online or if the storage hasn't initialised properly
       if (!this.isOnline || !this.platform.storageClientData) {
-        return
+        return;
       }
 
-      const newTemp = await this.platform.storageData.getItem(this.temperatureSource + '_temp')
+      const newTemp = await this.platform.storageData.getItem(`${this.temperatureSource}_temp`);
       if (newTemp && newTemp !== this.cacheTemp) {
-        this.cacheTemp = newTemp
-        this.service.updateCharacteristic(this.hapChar.CurrentTemperature, this.cacheTemp)
-        this.accessory.eveService.addEntry({ temp: this.cacheTemp })
+        this.cacheTemp = newTemp;
+        this.service.updateCharacteristic(this.hapChar.CurrentTemperature, this.cacheTemp);
+        this.accessory.eveService.addEntry({ temp: this.cacheTemp });
         if (this.enableLogging) {
-          this.log('[%s] %s [%s°C].', this.name, this.lang.curTemp, this.cacheTemp)
+          this.log('[%s] %s [%s°C].', this.name, this.lang.curTemp, this.cacheTemp);
         }
-        await this.internalCurrentTempUpdate()
+        this.internalCurrentTempUpdate();
       }
     } catch (err) {
-      const eText = this.funcs.parseError(err)
-      this.log.warn('[%s] %s.', this.name, eText)
+      const eText = parseError(err);
+      this.log.warn('[%s] %s.', this.name, eText);
     }
   }
 
-  async externalUpdate (params) {}
-
-  markStatus (isOnline) {
-    this.isOnline = isOnline
+  markStatus(isOnline) {
+    this.isOnline = isOnline;
   }
 }
diff --git a/lib/device/simulation/index.js b/lib/device/simulation/index.js
new file mode 100644
index 00000000..8f3367e3
--- /dev/null
+++ b/lib/device/simulation/index.js
@@ -0,0 +1,73 @@
+import deviceBlind from './blind.js';
+import deviceCooler from './cooler.js';
+import deviceDoor from './door.js';
+import deviceDoorbell from './doorbell.js';
+import deviceGarageEachen from './garage-eachen.js';
+import deviceGarageFour from './garage-four.js';
+import deviceGarageOdSwitch from './garage-od-switch.js';
+import deviceGarageOne from './garage-one.js';
+import deviceGarageTwo from './garage-two.js';
+import deviceGateOne from './gate-one.js';
+import deviceHeater from './heater.js';
+import deviceLockEachen from './lock-eachen.js';
+import deviceLockOne from './lock-one.js';
+import devicePButton from './p-button.js';
+import devicePurifier from './purifier.js';
+import deviceRfBlind from './rf-blind.js';
+import deviceRfDoor from './rf-door.js';
+import deviceRfWindow from './rf-window.js';
+import deviceSensorHidden from './sensor-hidden.js';
+import deviceSensorLeak from './sensor-leak.js';
+import deviceSensorVisible from './sensor-visible.js';
+import deviceSensor from './sensor.js';
+import deviceSwitchValve from './switch-valve.js';
+import deviceTapOne from './tap-one.js';
+import deviceTapTwo from './tap-two.js';
+import deviceThCooler from './th-cooler.js';
+import deviceThDehumidifier from './th-dehumidifier.js';
+import deviceThHeater from './th-heater.js';
+import deviceThHumidifier from './th-humidifier.js';
+import deviceThThermostat from './th-thermostat.js';
+import deviceTv from './tv.js';
+import deviceValveFour from './valve-four.js';
+import deviceValveOne from './valve-one.js';
+import deviceValveTwo from './valve-two.js';
+import deviceWindow from './window.js';
+
+export default {
+  deviceBlind,
+  deviceCooler,
+  deviceDoor,
+  deviceDoorbell,
+  deviceGarageEachen,
+  deviceGarageFour,
+  deviceGarageOdSwitch,
+  deviceGarageOne,
+  deviceGarageTwo,
+  deviceGateOne,
+  deviceHeater,
+  deviceLockEachen,
+  deviceLockOne,
+  devicePButton,
+  devicePurifier,
+  deviceRfBlind,
+  deviceRfDoor,
+  deviceRfWindow,
+  deviceSensor,
+  deviceSensorHidden,
+  deviceSensorLeak,
+  deviceSensorVisible,
+  deviceSwitchValve,
+  deviceTapOne,
+  deviceTapTwo,
+  deviceThCooler,
+  deviceThDehumidifier,
+  deviceThHeater,
+  deviceThHumidifier,
+  deviceThThermostat,
+  deviceTv,
+  deviceValveFour,
+  deviceValveOne,
+  deviceValveTwo,
+  deviceWindow,
+};
diff --git a/lib/device/simulation/lock-eachen.js b/lib/device/simulation/lock-eachen.js
index a3a20019..1ba1c8f8 100644
--- a/lib/device/simulation/lock-eachen.js
+++ b/lib/device/simulation/lock-eachen.js
@@ -1,149 +1,147 @@
-/* jshint node: true, esversion: 10, -W014, -W033 */
-/* eslint-disable new-cap */
-'use strict'
+import platformConsts from '../../utils/constants.js';
+import { generateRandomString, sleep } from '../../utils/functions.js';
 
-module.exports = class deviceLockEachen {
-  constructor (platform, accessory) {
+export default class {
+  constructor(platform, accessory) {
     // Set up variables from the platform
-    this.eveChar = platform.eveChar
-    this.funcs = platform.funcs
-    this.hapChar = platform.api.hap.Characteristic
-    this.hapErr = platform.api.hap.HapStatusError
-    this.hapServ = platform.api.hap.Service
-    this.lang = platform.lang
-    this.log = platform.log
-    this.platform = platform
+    this.eveChar = platform.eveChar;
+    this.hapChar = platform.api.hap.Characteristic;
+    this.hapErr = platform.api.hap.HapStatusError;
+    this.hapServ = platform.api.hap.Service;
+    this.lang = platform.lang;
+    this.log = platform.log;
+    this.platform = platform;
 
     // Set up variables from the accessory
-    this.name = accessory.displayName
-    this.accessory = accessory
+    this.name = accessory.displayName;
+    this.accessory = accessory;
 
     // Initially set the online flag as true (to be then updated as false if necessary)
-    this.isOnline = true
+    this.isOnline = true;
 
     // Set up custom variables for this device type
-    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
-    this.operationTime = deviceConf.operationTime || platform.consts.defaultValues.operationTime
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId] || {};
+    this.operationTime = deviceConf.operationTime || platformConsts.defaultValues.operationTime;
 
     // Set the correct logging variables for this accessory
-    this.enableLogging = !platform.config.disableDeviceLogging
-    this.enableDebugLogging = platform.config.debug
-    if (deviceConf && deviceConf.overrideLogging) {
-      switch (deviceConf.overrideLogging) {
-        case 'standard':
-          this.enableLogging = true
-          this.enableDebugLogging = false
-          break
-        case 'debug':
-          this.enableLogging = true
-          this.enableDebugLogging = true
-          break
-        case 'disable':
-          this.enableLogging = false
-          this.enableDebugLogging = false
-          break
-      }
+    switch (deviceConf.overrideLogging) {
+      case 'standard':
+        this.enableLogging = true;
+        this.enableDebugLogging = false;
+        break;
+      case 'debug':
+        this.enableLogging = true;
+        this.enableDebugLogging = true;
+        break;
+      case 'disable':
+        this.enableLogging = false;
+        this.enableDebugLogging = false;
+        break;
+      default:
+        this.enableLogging = !platform.config.disableDeviceLogging;
+        this.enableDebugLogging = platform.config.debug;
+        break;
     }
 
     // If the accessory has a switch service then remove it
     if (this.accessory.getService(this.hapServ.Switch)) {
-      this.accessory.removeService(this.accessory.getService(this.hapServ.Switch))
+      this.accessory.removeService(this.accessory.getService(this.hapServ.Switch));
     }
 
     // If the accessory has a garage  service then remove it
     if (this.accessory.getService(this.hapServ.GarageDoorOpener)) {
-      this.accessory.removeService(this.accessory.getService(this.hapServ.GarageDoorOpener))
+      this.accessory.removeService(this.accessory.getService(this.hapServ.GarageDoorOpener));
     }
 
     // Add the lock service if it doesn't already exist
-    this.service =
-      this.accessory.getService(this.hapServ.LockMechanism) ||
-      this.accessory.addService(this.hapServ.LockMechanism)
+    this.service = this.accessory.getService(this.hapServ.LockMechanism)
+      || this.accessory.addService(this.hapServ.LockMechanism);
 
     // Add the set handler to the lock target state characteristic
-    this.service.getCharacteristic(this.hapChar.LockTargetState).onSet(value => {
+    this.service.getCharacteristic(this.hapChar.LockTargetState).onSet((value) => {
       // We don't use await as we want the callback to be run straight away
-      this.internalUpdate(value)
-    })
+      this.internalUpdate(value);
+    });
 
     // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
     if (!platform.config.disableNoResponse) {
       this.service.getCharacteristic(this.hapChar.LockCurrentState).onGet(() => {
         if (!this.isOnline) {
-          throw new this.hapErr(-70402)
+          throw new this.hapErr(-70402);
         }
-        return this.service.getCharacteristic(this.hapChar.LockCurrentState).value
-      })
+        return this.service.getCharacteristic(this.hapChar.LockCurrentState).value;
+      });
       this.service.getCharacteristic(this.hapChar.LockTargetState).onGet(() => {
         if (!this.isOnline) {
-          throw new this.hapErr(-70402)
+          throw new this.hapErr(-70402);
         }
-        return this.service.getCharacteristic(this.hapChar.LockTargetState).value
-      })
+        return this.service.getCharacteristic(this.hapChar.LockTargetState).value;
+      });
     }
 
     // Output the customised options to the log
+    const normalLogging = this.enableLogging ? 'standard' : 'disable';
     const opts = JSON.stringify({
-      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
+      logging: this.enableDebugLogging ? 'debug' : normalLogging,
       showAs: 'garage_eachen',
-      showAsEachen: 'lock'
-    })
-    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
+      showAsEachen: 'lock',
+    });
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts);
   }
 
-  async internalUpdate (value) {
-    const currentState = this.service.getCharacteristic(this.hapChar.LockTargetState).value
+  async internalUpdate(value) {
+    const currentState = this.service.getCharacteristic(this.hapChar.LockTargetState).value;
     try {
       // Don't continue if the value is the same as before
       if (value === currentState) {
-        return
+        return;
       }
 
       // Generate the params
-      const params = { switch: value === 0 ? 'on' : 'off' }
-      this.inUse = true
-      await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.service.updateCharacteristic(this.hapChar.LockTargetState, value)
-      this.service.updateCharacteristic(this.hapChar.LockCurrentState, value)
-      await this.funcs.sleep(3000)
-      this.inUse = false
+      const params = { switch: value === 0 ? 'on' : 'off' };
+      this.inUse = true;
+      await this.platform.sendDeviceUpdate(this.accessory, params);
+      this.service.updateCharacteristic(this.hapChar.LockTargetState, value);
+      this.service.updateCharacteristic(this.hapChar.LockCurrentState, value);
+      await sleep(3000);
+      this.inUse = false;
       if (this.enableLogging) {
         this.log(
           '[%s] %s [%s].',
           this.name,
           this.lang.curState,
-          value === 0 ? this.lang.lockUnlocked : this.lang.lockLocked
-        )
+          value === 0 ? this.lang.lockUnlocked : this.lang.lockLocked,
+        );
       }
     } catch (err) {
-      this.inUse = false
-      this.platform.deviceUpdateError(this.accessory, err, true)
+      this.inUse = false;
+      this.platform.deviceUpdateError(this.accessory, err, true);
       setTimeout(() => {
-        this.service.updateCharacteristic(this.hapChar.LockTargetState, currentState)
-      }, 2000)
-      this.service.updateCharacteristic(this.hapChar.LockTargetState, new this.hapErr(-70402))
+        this.service.updateCharacteristic(this.hapChar.LockTargetState, currentState);
+      }, 2000);
+      this.service.updateCharacteristic(this.hapChar.LockTargetState, new this.hapErr(-70402));
     }
   }
 
-  async externalUpdate (params) {
+  async externalUpdate(params) {
     try {
       if (!params.switch || this.inUse) {
-        return
+        return;
       }
 
       // In a period of three seconds we want to only use the 'last' update
-      const updateKey = this.funcs.generateRandomString(5)
-      this.updateKey = updateKey
-      await this.funcs.sleep(3000)
+      const updateKey = generateRandomString(5);
+      this.updateKey = updateKey;
+      await sleep(3000);
       if (this.updateKey !== updateKey) {
-        return
+        return;
       }
 
       // Update the characteristics
-      const newValue = params.switch === 'on' ? 0 : 1
+      const newValue = params.switch === 'on' ? 0 : 1;
       if (this.service.getCharacteristic(this.hapChar.LockTargetState).value !== newValue) {
-        this.service.updateCharacteristic(this.hapChar.LockTargetState, newValue)
-        this.service.updateCharacteristic(this.hapChar.LockCurrentState, newValue)
+        this.service.updateCharacteristic(this.hapChar.LockTargetState, newValue);
+        this.service.updateCharacteristic(this.hapChar.LockCurrentState, newValue);
       }
 
       if (params.updateSource && this.enableLogging) {
@@ -151,15 +149,15 @@ module.exports = class deviceLockEachen {
           '[%s] %s [%s].',
           this.name,
           this.lang.curState,
-          params.switch === 'on' ? this.lang.lockUnlocked : this.lang.lockLocked
-        )
+          params.switch === 'on' ? this.lang.lockUnlocked : this.lang.lockLocked,
+        );
       }
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, false)
+      this.platform.deviceUpdateError(this.accessory, err, false);
     }
   }
 
-  markStatus (isOnline) {
-    this.isOnline = isOnline
+  markStatus(isOnline) {
+    this.isOnline = isOnline;
   }
 }
diff --git a/lib/device/simulation/lock-one.js b/lib/device/simulation/lock-one.js
index 8838263f..a96c9808 100644
--- a/lib/device/simulation/lock-one.js
+++ b/lib/device/simulation/lock-one.js
@@ -1,272 +1,270 @@
-/* jshint node: true, esversion: 10, -W014, -W033 */
-/* eslint-disable new-cap */
-'use strict'
+import platformConsts from '../../utils/constants.js';
+import { hasProperty, sleep } from '../../utils/functions.js';
 
-module.exports = class deviceLockOne {
-  constructor (platform, accessory) {
+export default class {
+  constructor(platform, accessory) {
     // Set up variables from the platform
-    this.eveChar = platform.eveChar
-    this.funcs = platform.funcs
-    this.hapChar = platform.api.hap.Characteristic
-    this.hapErr = platform.api.hap.HapStatusError
-    this.hapServ = platform.api.hap.Service
-    this.lang = platform.lang
-    this.log = platform.log
-    this.platform = platform
+    this.eveChar = platform.eveChar;
+    this.hapChar = platform.api.hap.Characteristic;
+    this.hapErr = platform.api.hap.HapStatusError;
+    this.hapServ = platform.api.hap.Service;
+    this.lang = platform.lang;
+    this.log = platform.log;
+    this.platform = platform;
 
     // Set up variables from the accessory
-    this.name = accessory.displayName
-    this.accessory = accessory
+    this.name = accessory.displayName;
+    this.accessory = accessory;
 
     // Initially set the online flag as true (to be then updated as false if necessary)
-    this.isOnline = true
+    this.isOnline = true;
 
     // Set up custom variables for this device type
-    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
-    this.operationTime = deviceConf.operationTime || platform.consts.defaultValues.operationTime
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId] || {};
+    this.operationTime = deviceConf.operationTime || platformConsts.defaultValues.operationTime;
 
     // Set the correct logging variables for this accessory
-    this.enableLogging = !platform.config.disableDeviceLogging
-    this.enableDebugLogging = platform.config.debug
-    if (deviceConf && deviceConf.overrideLogging) {
-      switch (deviceConf.overrideLogging) {
-        case 'standard':
-          this.enableLogging = true
-          this.enableDebugLogging = false
-          break
-        case 'debug':
-          this.enableLogging = true
-          this.enableDebugLogging = true
-          break
-        case 'disable':
-          this.enableLogging = false
-          this.enableDebugLogging = false
-          break
-      }
+    switch (deviceConf.overrideLogging) {
+      case 'standard':
+        this.enableLogging = true;
+        this.enableDebugLogging = false;
+        break;
+      case 'debug':
+        this.enableLogging = true;
+        this.enableDebugLogging = true;
+        break;
+      case 'disable':
+        this.enableLogging = false;
+        this.enableDebugLogging = false;
+        break;
+      default:
+        this.enableLogging = !platform.config.disableDeviceLogging;
+        this.enableDebugLogging = platform.config.debug;
+        break;
     }
 
     // Check the sensor is valid if defined by the user
     if (deviceConf.sensorId) {
-      this.definedSensor = true
+      this.definedSensor = true;
     }
 
     // If the accessory has a switch service then remove it
     if (this.accessory.getService(this.hapServ.Switch)) {
-      this.accessory.removeService(this.accessory.getService(this.hapServ.Switch))
+      this.accessory.removeService(this.accessory.getService(this.hapServ.Switch));
     }
 
     // Add the lock service if it doesn't already exist
-    this.service =
-      this.accessory.getService(this.hapServ.LockMechanism) ||
-      this.accessory.addService(this.hapServ.LockMechanism)
+    this.service = this.accessory.getService(this.hapServ.LockMechanism)
+      || this.accessory.addService(this.hapServ.LockMechanism);
 
     // Set up the device type and power readings if necessary
-    if (platform.consts.devices.switchSingle.includes(this.accessory.context.eweUIID)) {
-      this.setup = 'switchSingle'
-    } else if (platform.consts.devices.switchSinglePower.includes(this.accessory.context.eweUIID)) {
-      this.setup = 'switchSingle'
+    if (platformConsts.devices.switchSingle.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'switchSingle';
+    } else if (platformConsts.devices.switchSinglePower.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'switchSingle';
 
       // Add Eve power characteristics
-      this.powerReadings = true
+      this.powerReadings = true;
       if (!this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
-        this.service.addCharacteristic(this.eveChar.CurrentConsumption)
+        this.service.addCharacteristic(this.eveChar.CurrentConsumption);
       }
       if (this.accessory.context.eweUIID === 32) {
         if (!this.service.testCharacteristic(this.eveChar.ElectricCurrent)) {
-          this.service.addCharacteristic(this.eveChar.ElectricCurrent)
+          this.service.addCharacteristic(this.eveChar.ElectricCurrent);
         }
         if (!this.service.testCharacteristic(this.eveChar.Voltage)) {
-          this.service.addCharacteristic(this.eveChar.Voltage)
+          this.service.addCharacteristic(this.eveChar.Voltage);
         }
       }
-    } else if (platform.consts.devices.switchMulti.includes(this.accessory.context.eweUIID)) {
-      this.setup = 'switchMulti'
-      if (platform.consts.devices.switchMultiPower.includes(this.accessory.context.eweUIID)) {
+    } else if (platformConsts.devices.switchMulti.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'switchMulti';
+      if (platformConsts.devices.switchMultiPower.includes(this.accessory.context.eweUIID)) {
         // Add Eve power characteristics
-        this.powerReadings = true
+        this.powerReadings = true;
         if (!this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
-          this.service.addCharacteristic(this.eveChar.CurrentConsumption)
+          this.service.addCharacteristic(this.eveChar.CurrentConsumption);
         }
         if (!this.service.testCharacteristic(this.eveChar.ElectricCurrent)) {
-          this.service.addCharacteristic(this.eveChar.ElectricCurrent)
+          this.service.addCharacteristic(this.eveChar.ElectricCurrent);
         }
         if (!this.service.testCharacteristic(this.eveChar.Voltage)) {
-          this.service.addCharacteristic(this.eveChar.Voltage)
+          this.service.addCharacteristic(this.eveChar.Voltage);
         }
-        this.isDualR3 = true
+        this.isDualR3 = true;
       }
-    } else if (platform.consts.devices.switchSCM.includes(this.accessory.context.eweUIID)) {
-      this.setup = 'switchMulti'
-    } else if (platform.consts.devices.switchSCMPower.includes(this.accessory.context.eweUIID)) {
+    } else if (platformConsts.devices.switchSCM.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'switchMulti';
+    } else if (platformConsts.devices.switchSCMPower.includes(this.accessory.context.eweUIID)) {
       // Could do power here
-      this.setup = 'switchMulti'
+      this.setup = 'switchMulti';
     }
 
     // Add the set handler to the lock target state characteristic
-    this.service.getCharacteristic(this.hapChar.LockTargetState).onSet(value => {
+    this.service.getCharacteristic(this.hapChar.LockTargetState).onSet((value) => {
       // We don't use await as we want the callback to be run straight away
-      this.internalUpdate(value)
-    })
+      this.internalUpdate(value);
+    });
 
     // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
     if (!platform.config.disableNoResponse) {
       this.service.getCharacteristic(this.hapChar.LockCurrentState).onGet(() => {
         if (!this.isOnline) {
-          throw new this.hapErr(-70402)
+          throw new this.hapErr(-70402);
         }
-        return this.service.getCharacteristic(this.hapChar.LockCurrentState).value
-      })
+        return this.service.getCharacteristic(this.hapChar.LockCurrentState).value;
+      });
       this.service.getCharacteristic(this.hapChar.LockTargetState).onGet(() => {
         if (!this.isOnline) {
-          throw new this.hapErr(-70402)
+          throw new this.hapErr(-70402);
         }
-        return this.service.getCharacteristic(this.hapChar.LockTargetState).value
-      })
+        return this.service.getCharacteristic(this.hapChar.LockTargetState).value;
+      });
     }
 
     // Always show the accessory as locked on Homebridge restart
     this.service
       .updateCharacteristic(this.hapChar.LockCurrentState, 1)
-      .updateCharacteristic(this.hapChar.LockTargetState, 1)
-    this.accessory.context.contactDetected = true
+      .updateCharacteristic(this.hapChar.LockTargetState, 1);
+    this.accessory.context.contactDetected = true;
 
     // Set up an interval to get eWeLink to send power updates
     if (
-      this.powerReadings &&
-      (!this.isDualR3 || (this.isDualR3 && platform.config.mode !== 'lan'))
+      this.powerReadings
+      && (!this.isDualR3 || (this.isDualR3 && platform.config.mode !== 'lan'))
     ) {
       setTimeout(() => {
-        this.internalUIUpdate()
-        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
-      }, 5000)
+        this.internalUIUpdate();
+        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000);
+      }, 5000);
 
       // Stop the intervals on Homebridge shutdown
-      platform.api.on('shutdown', () => clearInterval(this.intervalPoll))
+      platform.api.on('shutdown', () => clearInterval(this.intervalPoll));
     }
 
     // Output the customised options to the log
+    const normalLogging = this.enableLogging ? 'standard' : 'disable';
     const opts = JSON.stringify({
-      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
+      logging: this.enableDebugLogging ? 'debug' : normalLogging,
       operationTime: this.operationTime,
-      showAs: 'lock'
-    })
-    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
+      showAs: 'lock',
+    });
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts);
   }
 
-  async internalUpdate (value) {
+  async internalUpdate(value) {
     try {
       if (value === 1) {
-        this.service.updateCharacteristic(this.hapChar.LockCurrentState, 1)
-        return
+        this.service.updateCharacteristic(this.hapChar.LockCurrentState, 1);
+        return;
       }
 
       // This model may need a close command before opening again
       if (this.accessory.context.eweModel === '0185') {
         await this.platform.sendDeviceUpdate(this.accessory, {
-          switch: 'off'
-        })
-        await this.funcs.sleep(500)
+          switch: 'off',
+        });
+        await sleep(500);
       }
 
-      const params = {}
+      const params = {};
       switch (this.setup) {
         case 'switchSingle':
-          params.switch = 'on'
-          break
+          params.switch = 'on';
+          break;
         case 'switchMulti':
           params.switches = [
             {
               switch: 'on',
-              outlet: 0
-            }
-          ]
-          break
+              outlet: 0,
+            },
+          ];
+          break;
         default:
-          return
+          return;
       }
-      this.inUse = true
-      await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.service.updateCharacteristic(this.hapChar.LockCurrentState, 0)
+      this.inUse = true;
+      await this.platform.sendDeviceUpdate(this.accessory, params);
+      this.service.updateCharacteristic(this.hapChar.LockCurrentState, 0);
       if (this.enableLogging) {
-        this.log('[%s] %s [%s].', this.name, this.lang.curState, this.lang.lockUnlocked)
+        this.log('[%s] %s [%s].', this.name, this.lang.curState, this.lang.lockUnlocked);
       }
       if (this.definedSensor) {
-        this.internalSensorCheck()
-        return
+        this.internalSensorCheck();
+        return;
       }
-      await this.funcs.sleep(Math.max(this.operationTime * 100, 1000))
-      this.service.updateCharacteristic(this.hapChar.LockTargetState, 1)
-      this.service.updateCharacteristic(this.hapChar.LockCurrentState, 1)
-      this.inUse = false
+      await sleep(Math.max(this.operationTime * 100, 1000));
+      this.service.updateCharacteristic(this.hapChar.LockTargetState, 1);
+      this.service.updateCharacteristic(this.hapChar.LockCurrentState, 1);
+      this.inUse = false;
       if (this.enableLogging) {
-        this.log('[%s] %s [%s].', this.name, this.lang.curState, this.lang.lockLocked)
+        this.log('[%s] %s [%s].', this.name, this.lang.curState, this.lang.lockLocked);
       }
     } catch (err) {
-      this.inUse = false
-      this.platform.deviceUpdateError(this.accessory, err, true)
+      this.inUse = false;
+      this.platform.deviceUpdateError(this.accessory, err, true);
       setTimeout(() => {
-        this.service.updateCharacteristic(this.hapChar.LockTargetState, 1)
-      }, 2000)
-      this.service.updateCharacteristic(this.hapChar.LockTargetState, new this.hapErr(-70402))
+        this.service.updateCharacteristic(this.hapChar.LockTargetState, 1);
+      }, 2000);
+      this.service.updateCharacteristic(this.hapChar.LockTargetState, new this.hapErr(-70402));
     }
   }
 
-  async internalUIUpdate () {
+  async internalUIUpdate() {
     try {
       // Skip polling if device isn't online
       if (!this.isOnline) {
-        return
+        return;
       }
 
       // Send the params to request the updates
       if (this.isDualR3) {
-        await this.platform.sendDeviceUpdate(this.accessory, { uiActive: { outlet: 0, time: 120 } })
+        await this.platform.sendDeviceUpdate(this.accessory, { uiActive: { outlet: 0, time: 120 } });
       } else {
-        await this.platform.sendDeviceUpdate(this.accessory, { uiActive: 120 })
+        await this.platform.sendDeviceUpdate(this.accessory, { uiActive: 120 });
       }
     } catch (err) {
       // Suppress errors here
     }
   }
 
-  internalSensorCheck () {
+  internalSensorCheck() {
     if (this.timeoutInterval) {
-      clearTimeout(this.timeoutInterval)
+      clearTimeout(this.timeoutInterval);
     }
     this.timeoutInterval = setTimeout(() => {
       if (this.accessory.context.contactDetected) {
-        this.service.updateCharacteristic(this.hapChar.LockCurrentState, 1)
-        this.service.updateCharacteristic(this.hapChar.LockTargetState, 1)
-        this.inUse = false
+        this.service.updateCharacteristic(this.hapChar.LockCurrentState, 1);
+        this.service.updateCharacteristic(this.hapChar.LockTargetState, 1);
+        this.inUse = false;
         if (this.enableLogging) {
-          this.log('[%s] %s [%s].', this.name, this.lang.curState, this.lang.lockLocked)
+          this.log('[%s] %s [%s].', this.name, this.lang.curState, this.lang.lockLocked);
         }
       }
-    }, this.operationTime * 100 + 50)
+    }, this.operationTime * 100 + 50);
   }
 
-  async externalUpdate (params) {
+  async externalUpdate(params) {
     try {
       if (!this.inUse) {
         if (
-          (this.setup === 'switchMulti' && params.switches && params.switches[0].switch === 'on') ||
-          (this.setup === 'switchSingle' && params.switch && params.switch === 'on')
+          (this.setup === 'switchMulti' && params.switches && params.switches[0].switch === 'on')
+          || (this.setup === 'switchSingle' && params.switch && params.switch === 'on')
         ) {
           if (this.definedSensor) {
-            this.internalSensorCheck()
+            this.internalSensorCheck();
           } else {
-            this.inUse = true
-            this.service.updateCharacteristic(this.hapChar.LockCurrentState, 0)
-            this.service.updateCharacteristic(this.hapChar.LockTargetState, 0)
+            this.inUse = true;
+            this.service.updateCharacteristic(this.hapChar.LockCurrentState, 0);
+            this.service.updateCharacteristic(this.hapChar.LockTargetState, 0);
             if (params.updateSource && this.enableLogging) {
-              this.log('[%s] %s [%s].', this.name, this.lang.curState, this.lang.lockUnlocked)
+              this.log('[%s] %s [%s].', this.name, this.lang.curState, this.lang.lockUnlocked);
             }
-            await this.funcs.sleep(Math.max(this.operationTime * 100, 1000))
-            this.service.updateCharacteristic(this.hapChar.LockCurrentState, 1)
-            this.service.updateCharacteristic(this.hapChar.LockTargetState, 1)
-            this.inUse = false
+            await sleep(Math.max(this.operationTime * 100, 1000));
+            this.service.updateCharacteristic(this.hapChar.LockCurrentState, 1);
+            this.service.updateCharacteristic(this.hapChar.LockTargetState, 1);
+            this.inUse = false;
             if (params.updateSource && this.enableLogging) {
-              this.log('[%s] %s [%s].', this.name, this.lang.curState, this.lang.lockLocked)
+              this.log('[%s] %s [%s].', this.name, this.lang.curState, this.lang.lockLocked);
             }
           }
         }
@@ -274,55 +272,55 @@ module.exports = class deviceLockOne {
 
       // Get the power readings given by certain devices
       if (!this.powerReadings) {
-        return
+        return;
       }
-      let logger = false
-      let power
-      let voltage
-      let current
-      if (this.funcs.hasProperty(params, 'actPow_00')) {
-        power = parseInt(params.actPow_00) / 100
-        this.service.updateCharacteristic(this.eveChar.CurrentConsumption, power)
-        logger = true
-      } else if (this.funcs.hasProperty(params, 'power')) {
-        power = parseFloat(params.power)
-        this.service.updateCharacteristic(this.eveChar.CurrentConsumption, power)
-        logger = true
+      let logger = false;
+      let power;
+      let voltage;
+      let current;
+      if (hasProperty(params, 'actPow_00')) {
+        power = parseInt(params.actPow_00, 10) / 100;
+        this.service.updateCharacteristic(this.eveChar.CurrentConsumption, power);
+        logger = true;
+      } else if (hasProperty(params, 'power')) {
+        power = parseFloat(params.power);
+        this.service.updateCharacteristic(this.eveChar.CurrentConsumption, power);
+        logger = true;
       }
-      if (this.funcs.hasProperty(params, 'voltage_00')) {
-        voltage = parseInt(params.voltage_00) / 100
-        this.service.updateCharacteristic(this.eveChar.Voltage, voltage)
-        logger = true
-      } else if (this.funcs.hasProperty(params, 'voltage')) {
-        voltage = parseFloat(params.voltage)
-        this.service.updateCharacteristic(this.eveChar.Voltage, voltage)
-        logger = true
+      if (hasProperty(params, 'voltage_00')) {
+        voltage = parseInt(params.voltage_00, 10) / 100;
+        this.service.updateCharacteristic(this.eveChar.Voltage, voltage);
+        logger = true;
+      } else if (hasProperty(params, 'voltage')) {
+        voltage = parseFloat(params.voltage);
+        this.service.updateCharacteristic(this.eveChar.Voltage, voltage);
+        logger = true;
       }
-      if (this.funcs.hasProperty(params, 'current_00')) {
-        current = parseInt(params.current_00) / 100
-        this.service.updateCharacteristic(this.eveChar.ElectricCurrent, current)
-        logger = true
-      } else if (this.funcs.hasProperty(params, 'current')) {
-        current = parseFloat(params.current)
-        this.service.updateCharacteristic(this.eveChar.ElectricCurrent, current)
-        logger = true
+      if (hasProperty(params, 'current_00')) {
+        current = parseInt(params.current_00, 10) / 100;
+        this.service.updateCharacteristic(this.eveChar.ElectricCurrent, current);
+        logger = true;
+      } else if (hasProperty(params, 'current')) {
+        current = parseFloat(params.current);
+        this.service.updateCharacteristic(this.eveChar.ElectricCurrent, current);
+        logger = true;
       }
       if (params.updateSource && logger && this.enableLogging) {
         this.log(
           '[%s] %s%s%s.',
           this.name,
-          power !== undefined ? this.lang.curPower + ' [' + power + 'W]' : '',
-          voltage !== undefined ? ' ' + this.lang.curVolt + ' [' + voltage + 'V]' : '',
-          current !== undefined ? ' ' + this.lang.curCurr + ' [' + current + 'A]' : ''
-        )
+          power !== undefined ? `${this.lang.curPower} [${power}W]` : '',
+          voltage !== undefined ? ` ${this.lang.curVolt} [${voltage}V]` : '',
+          current !== undefined ? ` ${this.lang.curCurr} [${current}A]` : '',
+        );
       }
     } catch (err) {
-      this.inUse = false
-      this.platform.deviceUpdateError(this.accessory, err, false)
+      this.inUse = false;
+      this.platform.deviceUpdateError(this.accessory, err, false);
     }
   }
 
-  markStatus (isOnline) {
-    this.isOnline = isOnline
+  markStatus(isOnline) {
+    this.isOnline = isOnline;
   }
 }
diff --git a/lib/device/simulation/p-button.js b/lib/device/simulation/p-button.js
index fc15ccd8..a1b2fd57 100644
--- a/lib/device/simulation/p-button.js
+++ b/lib/device/simulation/p-button.js
@@ -1,225 +1,223 @@
-/* jshint node: true, esversion: 10, -W014, -W033 */
-/* eslint-disable new-cap */
-'use strict'
+import platformConsts from '../../utils/constants.js';
+import { hasProperty } from '../../utils/functions.js';
 
-module.exports = class devicePButton {
-  constructor (platform, accessory) {
+export default class {
+  constructor(platform, accessory) {
     // Set up variables from the platform
-    this.eveChar = platform.eveChar
-    this.funcs = platform.funcs
-    this.hapChar = platform.api.hap.Characteristic
-    this.hapErr = platform.api.hap.HapStatusError
-    this.hapServ = platform.api.hap.Service
-    this.lang = platform.lang
-    this.log = platform.log
-    this.platform = platform
+    this.eveChar = platform.eveChar;
+    this.hapChar = platform.api.hap.Characteristic;
+    this.hapErr = platform.api.hap.HapStatusError;
+    this.hapServ = platform.api.hap.Service;
+    this.lang = platform.lang;
+    this.log = platform.log;
+    this.platform = platform;
 
     // Set up variables from the accessory
-    this.name = accessory.displayName
-    this.accessory = accessory
+    this.name = accessory.displayName;
+    this.accessory = accessory;
 
     // Initially set the online flag as true (to be then updated as false if necessary)
-    this.isOnline = true
+    this.isOnline = true;
 
     // Set up custom variables for this device type
-    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId] || {};
 
     // Set the correct logging variables for this accessory
-    this.enableLogging = !platform.config.disableDeviceLogging
-    this.enableDebugLogging = platform.config.debug
-    if (deviceConf && deviceConf.overrideLogging) {
-      switch (deviceConf.overrideLogging) {
-        case 'standard':
-          this.enableLogging = true
-          this.enableDebugLogging = false
-          break
-        case 'debug':
-          this.enableLogging = true
-          this.enableDebugLogging = true
-          break
-        case 'disable':
-          this.enableLogging = false
-          this.enableDebugLogging = false
-          break
-      }
+    switch (deviceConf.overrideLogging) {
+      case 'standard':
+        this.enableLogging = true;
+        this.enableDebugLogging = false;
+        break;
+      case 'debug':
+        this.enableLogging = true;
+        this.enableDebugLogging = true;
+        break;
+      case 'disable':
+        this.enableLogging = false;
+        this.enableDebugLogging = false;
+        break;
+      default:
+        this.enableLogging = !platform.config.disableDeviceLogging;
+        this.enableDebugLogging = platform.config.debug;
+        break;
     }
 
     // If the accessory has a switch service then remove it
     if (this.accessory.getService(this.hapServ.Switch)) {
-      this.accessory.removeService(this.accessory.getService(this.hapServ.Switch))
+      this.accessory.removeService(this.accessory.getService(this.hapServ.Switch));
     }
 
     // Add the stateless programmable switch service if it doesn't already exist
-    this.service =
-      this.accessory.getService(this.hapServ.StatelessProgrammableSwitch) ||
-      this.accessory.addService(this.hapServ.StatelessProgrammableSwitch)
+    this.service = this.accessory.getService(this.hapServ.StatelessProgrammableSwitch)
+      || this.accessory.addService(this.hapServ.StatelessProgrammableSwitch);
 
     // Remove the double and long press options
     this.service.getCharacteristic(this.hapChar.ProgrammableSwitchEvent).setProps({
-      validValues: [0]
-    })
+      validValues: [0],
+    });
 
     // Set up the device type and power readings if necessary
-    if (platform.consts.devices.switchSingle.includes(this.accessory.context.eweUIID)) {
-      this.setup = 'switchSingle'
-    } else if (platform.consts.devices.switchSinglePower.includes(this.accessory.context.eweUIID)) {
-      this.setup = 'switchSingle'
+    if (platformConsts.devices.switchSingle.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'switchSingle';
+    } else if (platformConsts.devices.switchSinglePower.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'switchSingle';
 
       // Add Eve power characteristics
-      this.powerReadings = true
+      this.powerReadings = true;
       if (!this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
-        this.service.addCharacteristic(this.eveChar.CurrentConsumption)
+        this.service.addCharacteristic(this.eveChar.CurrentConsumption);
       }
       if (this.accessory.context.eweUIID === 32) {
         if (!this.service.testCharacteristic(this.eveChar.ElectricCurrent)) {
-          this.service.addCharacteristic(this.eveChar.ElectricCurrent)
+          this.service.addCharacteristic(this.eveChar.ElectricCurrent);
         }
         if (!this.service.testCharacteristic(this.eveChar.Voltage)) {
-          this.service.addCharacteristic(this.eveChar.Voltage)
+          this.service.addCharacteristic(this.eveChar.Voltage);
         }
       }
-    } else if (platform.consts.devices.switchMulti.includes(this.accessory.context.eweUIID)) {
-      this.setup = 'switchMulti'
-      if (platform.consts.devices.switchMultiPower.includes(this.accessory.context.eweUIID)) {
+    } else if (platformConsts.devices.switchMulti.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'switchMulti';
+      if (platformConsts.devices.switchMultiPower.includes(this.accessory.context.eweUIID)) {
         // Add Eve power characteristics
-        this.powerReadings = true
+        this.powerReadings = true;
         if (!this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
-          this.service.addCharacteristic(this.eveChar.CurrentConsumption)
+          this.service.addCharacteristic(this.eveChar.CurrentConsumption);
         }
         if (!this.service.testCharacteristic(this.eveChar.ElectricCurrent)) {
-          this.service.addCharacteristic(this.eveChar.ElectricCurrent)
+          this.service.addCharacteristic(this.eveChar.ElectricCurrent);
         }
         if (!this.service.testCharacteristic(this.eveChar.Voltage)) {
-          this.service.addCharacteristic(this.eveChar.Voltage)
+          this.service.addCharacteristic(this.eveChar.Voltage);
         }
-        this.isDualR3 = true
+        this.isDualR3 = true;
       }
-    } else if (platform.consts.devices.switchSCM.includes(this.accessory.context.eweUIID)) {
-      this.setup = 'switchMulti'
-    } else if (platform.consts.devices.switchSCMPower.includes(this.accessory.context.eweUIID)) {
+    } else if (platformConsts.devices.switchSCM.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'switchMulti';
+    } else if (platformConsts.devices.switchSCMPower.includes(this.accessory.context.eweUIID)) {
       // Could do power here
-      this.setup = 'switchMulti'
+      this.setup = 'switchMulti';
     }
 
     // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
     if (!platform.config.disableNoResponse) {
       this.service.getCharacteristic(this.hapChar.ProgrammableSwitchEvent).onGet(() => {
         if (!this.isOnline) {
-          throw new this.hapErr(-70402)
+          throw new this.hapErr(-70402);
         }
-        return this.service.getCharacteristic(this.hapChar.ProgrammableSwitchEvent).value
-      })
+        return this.service.getCharacteristic(this.hapChar.ProgrammableSwitchEvent).value;
+      });
     }
 
     // Set up an interval to get eWeLink to send power updates
     if (
-      this.powerReadings &&
-      (!this.isDualR3 || (this.isDualR3 && platform.config.mode !== 'lan'))
+      this.powerReadings
+      && (!this.isDualR3 || (this.isDualR3 && platform.config.mode !== 'lan'))
     ) {
       setTimeout(() => {
-        this.internalUIUpdate()
-        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
-      }, 5000)
+        this.internalUIUpdate();
+        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000);
+      }, 5000);
 
       // Stop the intervals on Homebridge shutdown
-      platform.api.on('shutdown', () => clearInterval(this.intervalPoll))
+      platform.api.on('shutdown', () => clearInterval(this.intervalPoll));
     }
 
     // Output the customised options to the log
+    const normalLogging = this.enableLogging ? 'standard' : 'disable';
     const opts = JSON.stringify({
-      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
-      showAs: 'p_button'
-    })
-    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
+      logging: this.enableDebugLogging ? 'debug' : normalLogging,
+      showAs: 'p_button',
+    });
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts);
   }
 
-  async internalUIUpdate () {
+  async internalUIUpdate() {
     try {
       // Skip polling if device isn't online
       if (!this.isOnline) {
-        return
+        return;
       }
 
       // Send the params to request the updates
       if (this.isDualR3) {
-        await this.platform.sendDeviceUpdate(this.accessory, { uiActive: { outlet: 0, time: 120 } })
+        await this.platform.sendDeviceUpdate(this.accessory, { uiActive: { outlet: 0, time: 120 } });
       } else {
-        await this.platform.sendDeviceUpdate(this.accessory, { uiActive: 120 })
+        await this.platform.sendDeviceUpdate(this.accessory, { uiActive: 120 });
       }
     } catch (err) {
       // Suppress errors here
     }
   }
 
-  async externalUpdate (params) {
+  async externalUpdate(params) {
     try {
       if (!this.inUse) {
         if (
-          (this.setup === 'switchMulti' && params.switches && params.switches[0].switch === 'on') ||
-          (this.setup === 'switchSingle' && params.switch && params.switch === 'on')
+          (this.setup === 'switchMulti' && params.switches && params.switches[0].switch === 'on')
+          || (this.setup === 'switchSingle' && params.switch && params.switch === 'on')
         ) {
-          this.inUse = true
+          this.inUse = true;
           setTimeout(() => {
-            this.inUse = false
-          }, 2000)
-          this.service.updateCharacteristic(this.hapChar.ProgrammableSwitchEvent, 0)
+            this.inUse = false;
+          }, 2000);
+          this.service.updateCharacteristic(this.hapChar.ProgrammableSwitchEvent, 0);
           if (params.updateSource && this.enableLogging) {
-            this.log('[%s] %s [%s].', this.name, this.lang.curState, this.lang.buttonSingle)
+            this.log('[%s] %s [%s].', this.name, this.lang.curState, this.lang.buttonSingle);
           }
         }
       }
 
       // Get the power readings given by certain devices
       if (!this.powerReadings) {
-        return
+        return;
       }
-      let logger = false
-      let power
-      let voltage
-      let current
-      if (this.funcs.hasProperty(params, 'actPow_00')) {
-        power = parseInt(params.actPow_00) / 100
-        this.service.updateCharacteristic(this.eveChar.CurrentConsumption, power)
-        logger = true
-      } else if (this.funcs.hasProperty(params, 'power')) {
-        power = parseFloat(params.power)
-        this.service.updateCharacteristic(this.eveChar.CurrentConsumption, power)
-        logger = true
+      let logger = false;
+      let power;
+      let voltage;
+      let current;
+      if (hasProperty(params, 'actPow_00')) {
+        power = parseInt(params.actPow_00, 10) / 100;
+        this.service.updateCharacteristic(this.eveChar.CurrentConsumption, power);
+        logger = true;
+      } else if (hasProperty(params, 'power')) {
+        power = parseFloat(params.power);
+        this.service.updateCharacteristic(this.eveChar.CurrentConsumption, power);
+        logger = true;
       }
-      if (this.funcs.hasProperty(params, 'voltage_00')) {
-        voltage = parseInt(params.voltage_00) / 100
-        this.service.updateCharacteristic(this.eveChar.Voltage, voltage)
-        logger = true
-      } else if (this.funcs.hasProperty(params, 'voltage')) {
-        voltage = parseFloat(params.voltage)
-        this.service.updateCharacteristic(this.eveChar.Voltage, voltage)
-        logger = true
+      if (hasProperty(params, 'voltage_00')) {
+        voltage = parseInt(params.voltage_00, 10) / 100;
+        this.service.updateCharacteristic(this.eveChar.Voltage, voltage);
+        logger = true;
+      } else if (hasProperty(params, 'voltage')) {
+        voltage = parseFloat(params.voltage);
+        this.service.updateCharacteristic(this.eveChar.Voltage, voltage);
+        logger = true;
       }
-      if (this.funcs.hasProperty(params, 'current_00')) {
-        current = parseInt(params.current_00) / 100
-        this.service.updateCharacteristic(this.eveChar.ElectricCurrent, current)
-        logger = true
-      } else if (this.funcs.hasProperty(params, 'current')) {
-        current = parseFloat(params.current)
-        this.service.updateCharacteristic(this.eveChar.ElectricCurrent, current)
-        logger = true
+      if (hasProperty(params, 'current_00')) {
+        current = parseInt(params.current_00, 10) / 100;
+        this.service.updateCharacteristic(this.eveChar.ElectricCurrent, current);
+        logger = true;
+      } else if (hasProperty(params, 'current')) {
+        current = parseFloat(params.current);
+        this.service.updateCharacteristic(this.eveChar.ElectricCurrent, current);
+        logger = true;
       }
       if (params.updateSource && logger && this.enableLogging) {
         this.log(
           '[%s] %s%s%s.',
           this.name,
-          power !== undefined ? this.lang.curPower + ' [' + power + 'W]' : '',
-          voltage !== undefined ? ' ' + this.lang.curVolt + ' [' + voltage + 'V]' : '',
-          current !== undefined ? ' ' + this.lang.curCurr + ' [' + current + 'A]' : ''
-        )
+          power !== undefined ? `${this.lang.curPower} [${power}W]` : '',
+          voltage !== undefined ? ` ${this.lang.curVolt} [${voltage}V]` : '',
+          current !== undefined ? ` ${this.lang.curCurr} [${current}A]` : '',
+        );
       }
     } catch (err) {
-      this.inUse = false
-      this.platform.deviceUpdateError(this.accessory, err, false)
+      this.inUse = false;
+      this.platform.deviceUpdateError(this.accessory, err, false);
     }
   }
 
-  markStatus (isOnline) {
-    this.isOnline = isOnline
+  markStatus(isOnline) {
+    this.isOnline = isOnline;
   }
 }
diff --git a/lib/device/simulation/purifier.js b/lib/device/simulation/purifier.js
index 11ebde6b..35c34644 100644
--- a/lib/device/simulation/purifier.js
+++ b/lib/device/simulation/purifier.js
@@ -1,109 +1,107 @@
-/* jshint node: true, esversion: 10, -W014, -W033 */
-/* eslint-disable new-cap */
-'use strict'
+import platformConsts from '../../utils/constants.js';
+import { hasProperty } from '../../utils/functions.js';
 
-module.exports = class devicePurifier {
-  constructor (platform, accessory) {
+export default class {
+  constructor(platform, accessory) {
     // Set up variables from the platform
-    this.eveChar = platform.eveChar
-    this.funcs = platform.funcs
-    this.hapChar = platform.api.hap.Characteristic
-    this.hapErr = platform.api.hap.HapStatusError
-    this.hapServ = platform.api.hap.Service
-    this.lang = platform.lang
-    this.log = platform.log
-    this.platform = platform
+    this.eveChar = platform.eveChar;
+    this.hapChar = platform.api.hap.Characteristic;
+    this.hapErr = platform.api.hap.HapStatusError;
+    this.hapServ = platform.api.hap.Service;
+    this.lang = platform.lang;
+    this.log = platform.log;
+    this.platform = platform;
 
     // Set up variables from the accessory
-    this.name = accessory.displayName
-    this.accessory = accessory
+    this.name = accessory.displayName;
+    this.accessory = accessory;
 
     // Initially set the online flag as true (to be then updated as false if necessary)
-    this.isOnline = true
+    this.isOnline = true;
 
     // Set up custom variables for this device type
-    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId] || {};
+
     // Set the correct logging variables for this accessory
-    this.enableLogging = !platform.config.disableDeviceLogging
-    this.enableDebugLogging = platform.config.debug
-    if (deviceConf && deviceConf.overrideLogging) {
-      switch (deviceConf.overrideLogging) {
-        case 'standard':
-          this.enableLogging = true
-          this.enableDebugLogging = false
-          break
-        case 'debug':
-          this.enableLogging = true
-          this.enableDebugLogging = true
-          break
-        case 'disable':
-          this.enableLogging = false
-          this.enableDebugLogging = false
-          break
-      }
+    switch (deviceConf.overrideLogging) {
+      case 'standard':
+        this.enableLogging = true;
+        this.enableDebugLogging = false;
+        break;
+      case 'debug':
+        this.enableLogging = true;
+        this.enableDebugLogging = true;
+        break;
+      case 'disable':
+        this.enableLogging = false;
+        this.enableDebugLogging = false;
+        break;
+      default:
+        this.enableLogging = !platform.config.disableDeviceLogging;
+        this.enableDebugLogging = platform.config.debug;
+        break;
     }
 
     // If the accessory has a switch service then remove it
     if (this.accessory.getService(this.hapServ.Switch)) {
-      this.accessory.removeService(this.accessory.getService(this.hapServ.Switch))
+      this.accessory.removeService(this.accessory.getService(this.hapServ.Switch));
     }
 
     // If the accessory has an outlet service then remove it
     if (this.accessory.getService(this.hapServ.Outlet)) {
-      this.accessory.removeService(this.accessory.getService(this.hapServ.Outlet))
+      this.accessory.removeService(this.accessory.getService(this.hapServ.Outlet));
     }
 
     // Add the air purifier service if it doesn't already exist
-    this.service =
-      this.accessory.getService(this.hapServ.AirPurifier) ||
-      this.accessory.addService(this.hapServ.AirPurifier)
+    this.service = this.accessory.getService(this.hapServ.AirPurifier)
+      || this.accessory.addService(this.hapServ.AirPurifier);
 
     // Set up the device type and power readings if necessary
-    if (platform.consts.devices.switchSingle.includes(this.accessory.context.eweUIID)) {
-      this.setup = 'switchSingle'
-    } else if (platform.consts.devices.switchSinglePower.includes(this.accessory.context.eweUIID)) {
-      this.setup = 'switchSingle'
+    if (platformConsts.devices.switchSingle.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'switchSingle';
+    } else if (platformConsts.devices.switchSinglePower.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'switchSingle';
 
       // Add Eve power characteristics
-      this.powerReadings = true
+      this.powerReadings = true;
       if (!this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
-        this.service.addCharacteristic(this.eveChar.CurrentConsumption)
+        this.service.addCharacteristic(this.eveChar.CurrentConsumption);
       }
       if (this.accessory.context.eweUIID === 32) {
         if (!this.service.testCharacteristic(this.eveChar.ElectricCurrent)) {
-          this.service.addCharacteristic(this.eveChar.ElectricCurrent)
+          this.service.addCharacteristic(this.eveChar.ElectricCurrent);
         }
         if (!this.service.testCharacteristic(this.eveChar.Voltage)) {
-          this.service.addCharacteristic(this.eveChar.Voltage)
+          this.service.addCharacteristic(this.eveChar.Voltage);
         }
       }
-    } else if (platform.consts.devices.switchMulti.includes(this.accessory.context.eweUIID)) {
-      this.setup = 'switchMulti'
-      if (platform.consts.devices.switchMultiPower.includes(this.accessory.context.eweUIID)) {
+    } else if (platformConsts.devices.switchMulti.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'switchMulti';
+      if (platformConsts.devices.switchMultiPower.includes(this.accessory.context.eweUIID)) {
         // Add Eve power characteristics
-        this.powerReadings = true
+        this.powerReadings = true;
         if (!this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
-          this.service.addCharacteristic(this.eveChar.CurrentConsumption)
+          this.service.addCharacteristic(this.eveChar.CurrentConsumption);
         }
         if (!this.service.testCharacteristic(this.eveChar.ElectricCurrent)) {
-          this.service.addCharacteristic(this.eveChar.ElectricCurrent)
+          this.service.addCharacteristic(this.eveChar.ElectricCurrent);
         }
         if (!this.service.testCharacteristic(this.eveChar.Voltage)) {
-          this.service.addCharacteristic(this.eveChar.Voltage)
+          this.service.addCharacteristic(this.eveChar.Voltage);
         }
-        this.isDualR3 = true
+        this.isDualR3 = true;
       }
-    } else if (platform.consts.devices.switchSCM.includes(this.accessory.context.eweUIID)) {
-      this.setup = 'switchMulti'
-    } else if (platform.consts.devices.switchSCMPower.includes(this.accessory.context.eweUIID)) {
+    } else if (platformConsts.devices.switchSCM.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'switchMulti';
+    } else if (platformConsts.devices.switchSCMPower.includes(this.accessory.context.eweUIID)) {
       // Could do power here
-      this.setup = 'switchMulti'
+      this.setup = 'switchMulti';
     }
 
     // Add the set handler to the purifier active characteristic
     this.service
       .getCharacteristic(this.hapChar.Active)
-      .onSet(async value => await this.internalStateUpdate(value))
+      .onSet(async (value) => this.internalStateUpdate(value));
 
     // Add options to the purifier target state characteristic
     this.service
@@ -111,180 +109,181 @@ module.exports = class devicePurifier {
       .setProps({
         minValue: 1,
         maxValue: 1,
-        validValues: [1]
+        validValues: [1],
       })
-      .updateValue(1)
+      .updateValue(1);
 
     // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
     if (!platform.config.disableNoResponse) {
       this.service.getCharacteristic(this.hapChar.Active).onGet(() => {
         if (!this.isOnline) {
-          throw new this.hapErr(-70402)
+          throw new this.hapErr(-70402);
         }
-        return this.service.getCharacteristic(this.hapChar.Active).value
-      })
+        return this.service.getCharacteristic(this.hapChar.Active).value;
+      });
       this.service.getCharacteristic(this.hapChar.CurrentAirPurifierState).onGet(() => {
         if (!this.isOnline) {
-          throw new this.hapErr(-70402)
+          throw new this.hapErr(-70402);
         }
-        return this.service.getCharacteristic(this.hapChar.CurrentAirPurifierState).value
-      })
+        return this.service.getCharacteristic(this.hapChar.CurrentAirPurifierState).value;
+      });
       this.service.getCharacteristic(this.hapChar.TargetAirPurifierState).onGet(() => {
         if (!this.isOnline) {
-          throw new this.hapErr(-70402)
+          throw new this.hapErr(-70402);
         }
-        return this.service.getCharacteristic(this.hapChar.TargetAirPurifierState).value
-      })
+        return this.service.getCharacteristic(this.hapChar.TargetAirPurifierState).value;
+      });
     }
 
     // Set up an interval to get eWeLink to send power updates
     if (
-      this.powerReadings &&
-      (!this.isDualR3 || (this.isDualR3 && platform.config.mode !== 'lan'))
+      this.powerReadings
+      && (!this.isDualR3 || (this.isDualR3 && platform.config.mode !== 'lan'))
     ) {
       setTimeout(() => {
-        this.internalUIUpdate()
-        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
-      }, 5000)
+        this.internalUIUpdate();
+        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000);
+      }, 5000);
 
       // Stop the intervals on Homebridge shutdown
-      platform.api.on('shutdown', () => clearInterval(this.intervalPoll))
+      platform.api.on('shutdown', () => clearInterval(this.intervalPoll));
     }
 
     // Output the customised options to the log
+    const normalLogging = this.enableLogging ? 'standard' : 'disable';
     const opts = JSON.stringify({
-      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
-      showAs: 'purifier'
-    })
-    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
+      logging: this.enableDebugLogging ? 'debug' : normalLogging,
+      showAs: 'purifier',
+    });
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts);
   }
 
-  async internalStateUpdate (value) {
+  async internalStateUpdate(value) {
     try {
-      const params = {}
+      const params = {};
       switch (this.setup) {
         case 'switchSingle':
-          params.switch = value === 1 ? 'on' : 'off'
-          break
+          params.switch = value === 1 ? 'on' : 'off';
+          break;
         case 'switchMulti':
           params.switches = [
             {
               switch: value === 1 ? 'on' : 'off',
-              outlet: 0
-            }
-          ]
-          break
+              outlet: 0,
+            },
+          ];
+          break;
         default:
-          return
+          return;
       }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.cacheState = value === 1 ? 'on' : 'off'
-      this.service.updateCharacteristic(this.hapChar.CurrentAirPurifierState, value === 1 ? 2 : 0)
+      await this.platform.sendDeviceUpdate(this.accessory, params);
+      this.cacheState = value === 1 ? 'on' : 'off';
+      this.service.updateCharacteristic(this.hapChar.CurrentAirPurifierState, value === 1 ? 2 : 0);
       if (this.enableLogging) {
-        this.log('[%s] %s [%s].', this.name, this.lang.curPur, this.cacheState)
+        this.log('[%s] %s [%s].', this.name, this.lang.curPur, this.cacheState);
       }
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true);
       setTimeout(() => {
-        this.service.updateCharacteristic(this.hapChar.Active, this.cacheState === 'on' ? 1 : 0)
-      }, 2000)
-      throw new this.hapErr(-70402)
+        this.service.updateCharacteristic(this.hapChar.Active, this.cacheState === 'on' ? 1 : 0);
+      }, 2000);
+      throw new this.hapErr(-70402);
     }
   }
 
-  async internalUIUpdate () {
+  async internalUIUpdate() {
     try {
       // Skip polling if device isn't online
       if (!this.isOnline) {
-        return
+        return;
       }
 
       // Send the params to request the updates
       if (this.isDualR3) {
-        await this.platform.sendDeviceUpdate(this.accessory, { uiActive: { outlet: 0, time: 120 } })
+        await this.platform.sendDeviceUpdate(this.accessory, { uiActive: { outlet: 0, time: 120 } });
       } else {
-        await this.platform.sendDeviceUpdate(this.accessory, { uiActive: 120 })
+        await this.platform.sendDeviceUpdate(this.accessory, { uiActive: 120 });
       }
     } catch (err) {
       // Suppress errors here
     }
   }
 
-  async externalUpdate (params) {
+  async externalUpdate(params) {
     try {
       if (
-        (this.setup === 'switchMulti' && params.switches) ||
-        (this.setup === 'switchSingle' && params.switch)
+        (this.setup === 'switchMulti' && params.switches)
+        || (this.setup === 'switchSingle' && params.switch)
       ) {
-        let newState
+        let newState;
         if (this.setup === 'switchMulti' && params.switches) {
-          newState = params.switches[0].switch
+          newState = params.switches[0].switch;
         } else if (this.setup === 'switchSingle' && params.switch) {
-          newState = params.switch
+          newState = params.switch;
         }
         if (newState && newState !== this.cacheState) {
-          this.cacheState = newState
-          this.service.updateCharacteristic(this.hapChar.Active, this.cacheState === 'on' ? 1 : 0)
+          this.cacheState = newState;
+          this.service.updateCharacteristic(this.hapChar.Active, this.cacheState === 'on' ? 1 : 0);
           this.service.updateCharacteristic(
             this.hapChar.CurrentAirPurifierState,
-            this.cacheState === 'on' ? 2 : 0
-          )
+            this.cacheState === 'on' ? 2 : 0,
+          );
           if (params.updateSource && this.enableLogging) {
-            this.log('[%s] %s [%s].', this.name, this.lang.curPur, this.cacheState)
+            this.log('[%s] %s [%s].', this.name, this.lang.curPur, this.cacheState);
           }
         }
       }
 
       // Get the power readings given by certain devices
       if (!this.powerReadings) {
-        return
+        return;
       }
-      let logger = false
-      let power
-      let voltage
-      let current
-      if (this.funcs.hasProperty(params, 'actPow_00')) {
-        power = parseInt(params.actPow_00) / 100
-        this.service.updateCharacteristic(this.eveChar.CurrentConsumption, power)
-        logger = true
-      } else if (this.funcs.hasProperty(params, 'power')) {
-        power = parseFloat(params.power)
-        this.service.updateCharacteristic(this.eveChar.CurrentConsumption, power)
-        logger = true
+      let logger = false;
+      let power;
+      let voltage;
+      let current;
+      if (hasProperty(params, 'actPow_00')) {
+        power = parseInt(params.actPow_00, 10) / 100;
+        this.service.updateCharacteristic(this.eveChar.CurrentConsumption, power);
+        logger = true;
+      } else if (hasProperty(params, 'power')) {
+        power = parseFloat(params.power);
+        this.service.updateCharacteristic(this.eveChar.CurrentConsumption, power);
+        logger = true;
       }
-      if (this.funcs.hasProperty(params, 'voltage_00')) {
-        voltage = parseInt(params.voltage_00) / 100
-        this.service.updateCharacteristic(this.eveChar.Voltage, voltage)
-        logger = true
-      } else if (this.funcs.hasProperty(params, 'voltage')) {
-        voltage = parseFloat(params.voltage)
-        this.service.updateCharacteristic(this.eveChar.Voltage, voltage)
-        logger = true
+      if (hasProperty(params, 'voltage_00')) {
+        voltage = parseInt(params.voltage_00, 10) / 100;
+        this.service.updateCharacteristic(this.eveChar.Voltage, voltage);
+        logger = true;
+      } else if (hasProperty(params, 'voltage')) {
+        voltage = parseFloat(params.voltage);
+        this.service.updateCharacteristic(this.eveChar.Voltage, voltage);
+        logger = true;
       }
-      if (this.funcs.hasProperty(params, 'current_00')) {
-        current = parseInt(params.current_00) / 100
-        this.service.updateCharacteristic(this.eveChar.ElectricCurrent, current)
-        logger = true
-      } else if (this.funcs.hasProperty(params, 'current')) {
-        current = parseFloat(params.current)
-        this.service.updateCharacteristic(this.eveChar.ElectricCurrent, current)
-        logger = true
+      if (hasProperty(params, 'current_00')) {
+        current = parseInt(params.current_00, 10) / 100;
+        this.service.updateCharacteristic(this.eveChar.ElectricCurrent, current);
+        logger = true;
+      } else if (hasProperty(params, 'current')) {
+        current = parseFloat(params.current);
+        this.service.updateCharacteristic(this.eveChar.ElectricCurrent, current);
+        logger = true;
       }
       if (params.updateSource && logger && this.enableLogging) {
         this.log(
           '[%s] %s%s%s.',
           this.name,
-          power !== undefined ? this.lang.curPower + ' [' + power + 'W]' : '',
-          voltage !== undefined ? ' ' + this.lang.curVolt + ' [' + voltage + 'V]' : '',
-          current !== undefined ? ' ' + this.lang.curCurr + ' [' + current + 'A]' : ''
-        )
+          power !== undefined ? `${this.lang.curPower} [${power}W]` : '',
+          voltage !== undefined ? ` ${this.lang.curVolt} [${voltage}V]` : '',
+          current !== undefined ? ` ${this.lang.curCurr} [${current}A]` : '',
+        );
       }
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, false)
+      this.platform.deviceUpdateError(this.accessory, err, false);
     }
   }
 
-  markStatus (isOnline) {
-    this.isOnline = isOnline
+  markStatus(isOnline) {
+    this.isOnline = isOnline;
   }
 }
diff --git a/lib/device/simulation/rf-blind.js b/lib/device/simulation/rf-blind.js
index a1e24c3f..551e9140 100644
--- a/lib/device/simulation/rf-blind.js
+++ b/lib/device/simulation/rf-blind.js
@@ -1,148 +1,149 @@
-/* jshint node: true, esversion: 10, -W014, -W033 */
-/* eslint-disable new-cap */
-'use strict'
+import platformConsts from '../../utils/constants.js';
+import { generateRandomString, hasProperty, sleep } from '../../utils/functions.js';
 
-module.exports = class deviceRFBlind {
-  constructor (platform, accessory) {
+export default class {
+  constructor(platform, accessory) {
     // Set up variables from the platform
-    this.eveChar = platform.eveChar
-    this.funcs = platform.funcs
-    this.hapChar = platform.api.hap.Characteristic
-    this.hapErr = platform.api.hap.HapStatusError
-    this.hapServ = platform.api.hap.Service
-    this.lang = platform.lang
-    this.log = platform.log
-    this.platform = platform
+    this.eveChar = platform.eveChar;
+    this.hapChar = platform.api.hap.Characteristic;
+    this.hapErr = platform.api.hap.HapStatusError;
+    this.hapServ = platform.api.hap.Service;
+    this.lang = platform.lang;
+    this.log = platform.log;
+    this.platform = platform;
 
     // Set up variables from the accessory
-    this.name = accessory.displayName
-    this.accessory = accessory
+    this.name = accessory.displayName;
+    this.accessory = accessory;
 
     // Initially set the online flag as true (to be then updated as false if necessary)
-    this.isOnline = true
+    this.isOnline = true;
 
     // Set up custom variables for this device type
-    const deviceConf = platform.rfSubdevices[accessory.context.hbDeviceId] || {}
-    this.operationTimeUp = deviceConf.operationTime || platform.consts.defaultValues.operationTime
-    this.operationTimeDown = deviceConf.operationTimeDown || this.operationTimeUp
-    ;[this.chOpen, this.chStop, this.chClose] = Object.keys(this.accessory.context.buttons)
+    const deviceConf = platform.rfSubdevices[accessory.context.hbDeviceId] || {};
+    this.operationTimeUp = deviceConf.operationTime || platformConsts.defaultValues.operationTime;
+    this.operationTimeDown = deviceConf.operationTimeDown || this.operationTimeUp;
+    [this.chOpen, this.chStop, this.chClose] = Object.keys(this.accessory.context.buttons);
 
     // Set the correct logging variables for this accessory
-    this.enableLogging = !platform.config.disableDeviceLogging
-    this.enableDebugLogging = platform.config.debug
     switch (deviceConf.overrideLogging) {
       case 'standard':
-        this.enableLogging = true
-        this.enableDebugLogging = false
-        break
+        this.enableLogging = true;
+        this.enableDebugLogging = false;
+        break;
       case 'debug':
-        this.enableLogging = true
-        this.enableDebugLogging = true
-        break
+        this.enableLogging = true;
+        this.enableDebugLogging = true;
+        break;
       case 'disable':
-        this.enableLogging = false
-        this.enableDebugLogging = false
-        break
+        this.enableLogging = false;
+        this.enableDebugLogging = false;
+        break;
+      default:
+        this.enableLogging = !platform.config.disableDeviceLogging;
+        this.enableDebugLogging = platform.config.debug;
+        break;
     }
 
     // If the accessory has a door service (from an old simulation) then remove it
     if (this.accessory.getService(this.hapServ.Door)) {
-      this.accessory.removeService(this.accessory.getService(this.hapServ.Door))
+      this.accessory.removeService(this.accessory.getService(this.hapServ.Door));
     }
 
     // If the accessory has a window service (from an old simulation) then remove it
     if (this.accessory.getService(this.hapServ.Window)) {
-      this.accessory.removeService(this.accessory.getService(this.hapServ.Window))
+      this.accessory.removeService(this.accessory.getService(this.hapServ.Window));
     }
 
     // Remove old switch services from before the simulation was configured
     this.accessory.services
-      .filter(el => el.constructor.name === 'Switch')
-      .forEach(el => this.accessory.removeService(el))
+      .filter((el) => el.constructor.name === 'Switch')
+      .forEach((el) => this.accessory.removeService(el));
 
     // Set up the accessory with default positions when added the first time
-    if (!this.funcs.hasProperty(this.accessory.context, 'cacheCurrentPosition')) {
-      this.accessory.context.cacheCurrentPosition = 0
-      this.accessory.context.cachePositionState = 2
-      this.accessory.context.cacheTargetPosition = 0
+    if (!hasProperty(this.accessory.context, 'cacheCurrentPosition')) {
+      this.accessory.context.cacheCurrentPosition = 0;
+      this.accessory.context.cachePositionState = 2;
+      this.accessory.context.cacheTargetPosition = 0;
     }
 
     // Add the window covering service if it doesn't already exist
-    if (!(this.service = this.accessory.getService(this.hapServ.WindowCovering))) {
-      this.service = this.accessory.addService(this.hapServ.WindowCovering)
-      this.service.updateCharacteristic(this.hapChar.CurrentPosition, 0)
-      this.service.updateCharacteristic(this.hapChar.TargetPosition, 0)
-      this.service.updateCharacteristic(this.hapChar.PositionState, 2)
+    this.service = this.accessory.getService(this.hapServ.WindowCovering);
+    if (!this.service) {
+      this.service = this.accessory.addService(this.hapServ.WindowCovering);
+      this.service.updateCharacteristic(this.hapChar.CurrentPosition, 0);
+      this.service.updateCharacteristic(this.hapChar.TargetPosition, 0);
+      this.service.updateCharacteristic(this.hapChar.PositionState, 2);
     }
 
     // Add the set handler to the target position characteristic
-    this.service.getCharacteristic(this.hapChar.TargetPosition).onSet(value => {
+    this.service.getCharacteristic(this.hapChar.TargetPosition).onSet((value) => {
       // We don't use await as we want the callback to be run straight away
-      this.internalPositionUpdate(value)
-    })
+      this.internalPositionUpdate(value);
+    });
 
     // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
     if (!platform.config.disableNoResponse) {
       this.service.getCharacteristic(this.hapChar.CurrentPosition).onGet(() => {
         if (!this.isOnline) {
-          throw new this.hapErr(-70402)
+          throw new this.hapErr(-70402);
         }
-        return this.service.getCharacteristic(this.hapChar.CurrentPosition).value
-      })
+        return this.service.getCharacteristic(this.hapChar.CurrentPosition).value;
+      });
       this.service.getCharacteristic(this.hapChar.TargetPosition).onGet(() => {
         if (!this.isOnline) {
-          throw new this.hapErr(-70402)
+          throw new this.hapErr(-70402);
         }
-        return this.service.getCharacteristic(this.hapChar.TargetPosition).value
-      })
+        return this.service.getCharacteristic(this.hapChar.TargetPosition).value;
+      });
     }
 
     // Output the customised options to the log
+    const normalLogging = this.enableLogging ? 'standard' : 'disable';
     const opts = JSON.stringify({
-      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
+      logging: this.enableDebugLogging ? 'debug' : normalLogging,
       operationTime: this.operationTimeUp,
-      operationTimeDown: this.operationTimeDown
-    })
-    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
+      operationTimeDown: this.operationTimeDown,
+    });
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts);
   }
 
-  async internalPositionUpdate (value) {
+  async internalPositionUpdate(value) {
     try {
-      let prevPosition = this.accessory.context.cacheCurrentPosition
+      let prevPosition = this.accessory.context.cacheCurrentPosition;
       if (value === prevPosition) {
-        return
+        return;
       }
-      const params = { cmd: 'transmit' }
-      const prevState = this.accessory.context.cachePositionState
-      const percentStepUpPerDS = this.operationTimeUp / 100
-      const percentStepDownPerDS = this.operationTimeDown / 100
-      const updateKey = this.funcs.generateRandomString(5)
-      this.updateKey = updateKey
+      const params = { cmd: 'transmit' };
+      const prevState = this.accessory.context.cachePositionState;
+      const percentStepUpPerDS = this.operationTimeUp / 100;
+      const percentStepDownPerDS = this.operationTimeDown / 100;
+      const updateKey = generateRandomString(5);
+      this.updateKey = updateKey;
       if (prevState !== 2) {
-        const posPercentChange =
-          Math.floor(Date.now() / 100) - this.accessory.context.cacheLastStartTime
-        const posPercentChangeUp = Math.floor(percentStepUpPerDS * posPercentChange)
-        const posPercentChangeDown = Math.floor(percentStepDownPerDS * posPercentChange)
+        const posPercentChange = Math.floor(Date.now() / 100) - this.accessory.context.cacheLastStartTime;
+        const posPercentChangeUp = Math.floor(percentStepUpPerDS * posPercentChange);
+        const posPercentChangeDown = Math.floor(percentStepDownPerDS * posPercentChange);
         if (prevState === 0) {
           // Was going down
-          prevPosition -= posPercentChangeDown
+          prevPosition -= posPercentChangeDown;
         } else {
           // Was going up
-          prevPosition += posPercentChangeUp
+          prevPosition += posPercentChangeUp;
         }
-        prevPosition = Math.min(Math.max(prevPosition, 0), 100)
-        this.service.updateCharacteristic(this.hapChar.CurrentPosition, prevPosition)
-        this.accessory.context.cacheCurrentPosition = prevPosition
+        prevPosition = Math.min(Math.max(prevPosition, 0), 100);
+        this.service.updateCharacteristic(this.hapChar.CurrentPosition, prevPosition);
+        this.accessory.context.cacheCurrentPosition = prevPosition;
       }
-      const diffPosition = value - prevPosition
-      const setToMoveUp = diffPosition > 0
-      let decisecondsToMove
+      const diffPosition = value - prevPosition;
+      const setToMoveUp = diffPosition > 0;
+      let decisecondsToMove;
       if (setToMoveUp) {
-        decisecondsToMove = Math.round(Math.abs(diffPosition) * percentStepUpPerDS)
-        params.rfChl = parseInt(this.chOpen)
+        decisecondsToMove = Math.round(Math.abs(diffPosition) * percentStepUpPerDS);
+        params.rfChl = parseInt(this.chOpen, 10);
       } else {
-        decisecondsToMove = Math.round(Math.abs(diffPosition) * percentStepDownPerDS)
-        params.rfChl = parseInt(this.chClose)
+        decisecondsToMove = Math.round(Math.abs(diffPosition) * percentStepDownPerDS);
+        params.rfChl = parseInt(this.chClose, 10);
       }
 
       // temp extra debug logging
@@ -152,40 +153,40 @@ module.exports = class deviceRFBlind {
         prevPosition,
         value,
         setToMoveUp ? 'up' : 'down',
-        decisecondsToMove / 10
-      )
+        decisecondsToMove / 10,
+      );
 
       // Send the update
-      await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.accessory.context.cacheTargetPosition = value
-      this.accessory.context.cachePositionState = setToMoveUp ? 1 : 0
-      this.accessory.context.cacheLastStartTime = Math.floor(Date.now() / 100)
-      await this.funcs.sleep(decisecondsToMove * 100)
+      await this.platform.sendDeviceUpdate(this.accessory, params);
+      this.accessory.context.cacheTargetPosition = value;
+      this.accessory.context.cachePositionState = setToMoveUp ? 1 : 0;
+      this.accessory.context.cacheLastStartTime = Math.floor(Date.now() / 100);
+      await sleep(decisecondsToMove * 100);
       if (this.updateKey !== updateKey) {
-        return
+        return;
       }
-      params.rfChl = parseInt(this.chStop)
-      await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.service.updateCharacteristic(this.hapChar.PositionState, 2)
-      this.service.updateCharacteristic(this.hapChar.CurrentPosition, value)
-      this.accessory.context.cachePositionState = 2
-      this.accessory.context.cacheCurrentPosition = value
+      params.rfChl = parseInt(this.chStop, 10);
+      await this.platform.sendDeviceUpdate(this.accessory, params);
+      this.service.updateCharacteristic(this.hapChar.PositionState, 2);
+      this.service.updateCharacteristic(this.hapChar.CurrentPosition, value);
+      this.accessory.context.cachePositionState = 2;
+      this.accessory.context.cacheCurrentPosition = value;
       if (this.enableLogging) {
-        this.log('[%s] %s [%s%]', this.name, this.lang.curPos, value)
+        this.log('[%s] %s [%s%]', this.name, this.lang.curPos, value);
       }
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true);
       setTimeout(() => {
         this.service.updateCharacteristic(
           this.hapChar.TargetPosition,
-          this.accessory.context.cacheTargetPosition
-        )
-      }, 2000)
-      this.service.updateCharacteristic(this.hapChar.TargetPosition, new this.hapErr(-70402))
+          this.accessory.context.cacheTargetPosition,
+        );
+      }, 2000);
+      this.service.updateCharacteristic(this.hapChar.TargetPosition, new this.hapErr(-70402));
     }
   }
 
-  markStatus (isOnline) {
-    this.isOnline = isOnline
+  markStatus(isOnline) {
+    this.isOnline = isOnline;
   }
 }
diff --git a/lib/device/simulation/rf-door.js b/lib/device/simulation/rf-door.js
index b590925c..ec218833 100644
--- a/lib/device/simulation/rf-door.js
+++ b/lib/device/simulation/rf-door.js
@@ -1,179 +1,180 @@
-/* jshint node: true, esversion: 10, -W014, -W033 */
-/* eslint-disable new-cap */
-'use strict'
+import platformConsts from '../../utils/constants.js';
+import { generateRandomString, hasProperty, sleep } from '../../utils/functions.js';
 
-module.exports = class deviceRFDoor {
-  constructor (platform, accessory) {
+export default class {
+  constructor(platform, accessory) {
     // Set up variables from the platform
-    this.eveChar = platform.eveChar
-    this.funcs = platform.funcs
-    this.hapChar = platform.api.hap.Characteristic
-    this.hapErr = platform.api.hap.HapStatusError
-    this.hapServ = platform.api.hap.Service
-    this.lang = platform.lang
-    this.log = platform.log
-    this.platform = platform
+    this.eveChar = platform.eveChar;
+    this.hapChar = platform.api.hap.Characteristic;
+    this.hapErr = platform.api.hap.HapStatusError;
+    this.hapServ = platform.api.hap.Service;
+    this.lang = platform.lang;
+    this.log = platform.log;
+    this.platform = platform;
 
     // Set up variables from the accessory
-    this.name = accessory.displayName
-    this.accessory = accessory
+    this.name = accessory.displayName;
+    this.accessory = accessory;
 
     // Initially set the online flag as true (to be then updated as false if necessary)
-    this.isOnline = true
+    this.isOnline = true;
 
     // Set up custom variables for this device type
-    const deviceConf = platform.rfSubdevices[accessory.context.hbDeviceId] || {}
-    this.operationTimeUp = deviceConf.operationTime || platform.consts.defaultValues.operationTime
-    this.operationTimeDown = deviceConf.operationTimeDown || this.operationTimeUp
-    ;[this.chOpen, this.chStop, this.chClose] = Object.keys(this.accessory.context.buttons)
+    const deviceConf = platform.rfSubdevices[accessory.context.hbDeviceId] || {};
+    this.operationTimeUp = deviceConf.operationTime || platformConsts.defaultValues.operationTime;
+    this.operationTimeDown = deviceConf.operationTimeDown || this.operationTimeUp;
+    [this.chOpen, this.chStop, this.chClose] = Object.keys(this.accessory.context.buttons);
 
     // Set the correct logging variables for this accessory
-    this.enableLogging = !platform.config.disableDeviceLogging
-    this.enableDebugLogging = platform.config.debug
     switch (deviceConf.overrideLogging) {
       case 'standard':
-        this.enableLogging = true
-        this.enableDebugLogging = false
-        break
+        this.enableLogging = true;
+        this.enableDebugLogging = false;
+        break;
       case 'debug':
-        this.enableLogging = true
-        this.enableDebugLogging = true
-        break
+        this.enableLogging = true;
+        this.enableDebugLogging = true;
+        break;
       case 'disable':
-        this.enableLogging = false
-        this.enableDebugLogging = false
-        break
+        this.enableLogging = false;
+        this.enableDebugLogging = false;
+        break;
+      default:
+        this.enableLogging = !platform.config.disableDeviceLogging;
+        this.enableDebugLogging = platform.config.debug;
+        break;
     }
 
     // If the accessory has a window covering service (from an old simulation) then remove it
     if (this.accessory.getService(this.hapServ.WindowCovering)) {
-      this.accessory.removeService(this.accessory.getService(this.hapServ.WindowCovering))
+      this.accessory.removeService(this.accessory.getService(this.hapServ.WindowCovering));
     }
 
     // If the accessory has a window service (from an old simulation) then remove it
     if (this.accessory.getService(this.hapServ.Window)) {
-      this.accessory.removeService(this.accessory.getService(this.hapServ.Window))
+      this.accessory.removeService(this.accessory.getService(this.hapServ.Window));
     }
 
     // Remove old switch services from before the simulation was configured
     this.accessory.services
-      .filter(el => el.constructor.name === 'Switch')
-      .forEach(el => this.accessory.removeService(el))
+      .filter((el) => el.constructor.name === 'Switch')
+      .forEach((el) => this.accessory.removeService(el));
 
     // Set up the accessory with default positions when added the first time
-    if (!this.funcs.hasProperty(this.accessory.context, 'cacheCurrentPosition')) {
-      this.accessory.context.cacheCurrentPosition = 0
-      this.accessory.context.cachePositionState = 2
-      this.accessory.context.cacheTargetPosition = 0
+    if (!hasProperty(this.accessory.context, 'cacheCurrentPosition')) {
+      this.accessory.context.cacheCurrentPosition = 0;
+      this.accessory.context.cachePositionState = 2;
+      this.accessory.context.cacheTargetPosition = 0;
     }
 
-    // Add the window covering service if it doesn't already exist
-    if (!(this.service = this.accessory.getService(this.hapServ.Door))) {
-      this.service = this.accessory.addService(this.hapServ.Door)
-      this.service.updateCharacteristic(this.hapChar.CurrentPosition, 0)
-      this.service.updateCharacteristic(this.hapChar.TargetPosition, 0)
-      this.service.updateCharacteristic(this.hapChar.PositionState, 2)
+    // Add the door service if it doesn't already exist
+    this.service = this.accessory.getService(this.hapServ.Door);
+    if (!this.service) {
+      this.service = this.accessory.addService(this.hapServ.Door);
+      this.service.updateCharacteristic(this.hapChar.CurrentPosition, 0);
+      this.service.updateCharacteristic(this.hapChar.TargetPosition, 0);
+      this.service.updateCharacteristic(this.hapChar.PositionState, 2);
     }
 
     // Add the set handler to the target position characteristic
-    this.service.getCharacteristic(this.hapChar.TargetPosition).onSet(value => {
+    this.service.getCharacteristic(this.hapChar.TargetPosition).onSet((value) => {
       // We don't use await as we want the callback to be run straight away
-      this.internalPositionUpdate(value)
-    })
+      this.internalPositionUpdate(value);
+    });
 
     // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
     if (!platform.config.disableNoResponse) {
       this.service.getCharacteristic(this.hapChar.CurrentPosition).onGet(() => {
         if (!this.isOnline) {
-          throw new this.hapErr(-70402)
+          throw new this.hapErr(-70402);
         }
-        return this.service.getCharacteristic(this.hapChar.CurrentPosition).value
-      })
+        return this.service.getCharacteristic(this.hapChar.CurrentPosition).value;
+      });
       this.service.getCharacteristic(this.hapChar.TargetPosition).onGet(() => {
         if (!this.isOnline) {
-          throw new this.hapErr(-70402)
+          throw new this.hapErr(-70402);
         }
-        return this.service.getCharacteristic(this.hapChar.TargetPosition).value
-      })
+        return this.service.getCharacteristic(this.hapChar.TargetPosition).value;
+      });
     }
 
     // Output the customised options to the log
+    const normalLogging = this.enableLogging ? 'standard' : 'disable';
     const opts = JSON.stringify({
-      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
+      logging: this.enableDebugLogging ? 'debug' : normalLogging,
       operationTime: this.operationTimeUp,
-      operationTimeDown: this.operationTimeDown
-    })
-    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
+      operationTimeDown: this.operationTimeDown,
+    });
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts);
   }
 
-  async internalPositionUpdate (value) {
+  async internalPositionUpdate(value) {
     try {
-      let prevPosition = this.accessory.context.cacheCurrentPosition
+      let prevPosition = this.accessory.context.cacheCurrentPosition;
       if (value === prevPosition) {
-        return
+        return;
       }
-      const params = { cmd: 'transmit' }
-      const prevState = this.accessory.context.cachePositionState
-      const percentStepUpPerDS = this.operationTimeUp / 100
-      const percentStepDownPerDS = this.operationTimeDown / 100
-      const updateKey = this.funcs.generateRandomString(5)
-      this.updateKey = updateKey
+      const params = { cmd: 'transmit' };
+      const prevState = this.accessory.context.cachePositionState;
+      const percentStepUpPerDS = this.operationTimeUp / 100;
+      const percentStepDownPerDS = this.operationTimeDown / 100;
+      const updateKey = generateRandomString(5);
+      this.updateKey = updateKey;
       if (prevState !== 2) {
-        const posPercentChange =
-          Math.floor(Date.now() / 100) - this.accessory.context.cacheLastStartTime
-        const posPercentChangeUp = Math.floor(percentStepUpPerDS * posPercentChange)
-        const posPercentChangeDown = Math.floor(percentStepDownPerDS * posPercentChange)
+        const posPercentChange = Math.floor(Date.now() / 100) - this.accessory.context.cacheLastStartTime;
+        const posPercentChangeUp = Math.floor(percentStepUpPerDS * posPercentChange);
+        const posPercentChangeDown = Math.floor(percentStepDownPerDS * posPercentChange);
         if (prevState === 0) {
           // Was going down
-          prevPosition -= posPercentChangeDown
+          prevPosition -= posPercentChangeDown;
         } else {
           // Was going up
-          prevPosition += posPercentChangeUp
+          prevPosition += posPercentChangeUp;
         }
-        prevPosition = Math.min(Math.max(prevPosition, 0), 100)
-        this.service.updateCharacteristic(this.hapChar.CurrentPosition, prevPosition)
-        this.accessory.context.cacheCurrentPosition = prevPosition
+        prevPosition = Math.min(Math.max(prevPosition, 0), 100);
+        this.service.updateCharacteristic(this.hapChar.CurrentPosition, prevPosition);
+        this.accessory.context.cacheCurrentPosition = prevPosition;
       }
-      const diffPosition = value - prevPosition
-      const setToMoveUp = diffPosition > 0
-      let decisecondsToMove
+      const diffPosition = value - prevPosition;
+      const setToMoveUp = diffPosition > 0;
+      let decisecondsToMove;
       if (setToMoveUp) {
-        decisecondsToMove = Math.round(Math.abs(diffPosition) * percentStepUpPerDS)
-        params.rfChl = parseInt(this.chOpen)
+        decisecondsToMove = Math.round(Math.abs(diffPosition) * percentStepUpPerDS);
+        params.rfChl = parseInt(this.chOpen, 10);
       } else {
-        decisecondsToMove = Math.round(Math.abs(diffPosition) * percentStepDownPerDS)
-        params.rfChl = parseInt(this.chClose)
+        decisecondsToMove = Math.round(Math.abs(diffPosition) * percentStepDownPerDS);
+        params.rfChl = parseInt(this.chClose, 10);
       }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.accessory.context.cacheTargetPosition = value
-      this.accessory.context.cachePositionState = setToMoveUp ? 1 : 0
-      this.accessory.context.cacheLastStartTime = Math.floor(Date.now() / 100)
-      await this.funcs.sleep(decisecondsToMove * 100)
+      await this.platform.sendDeviceUpdate(this.accessory, params);
+      this.accessory.context.cacheTargetPosition = value;
+      this.accessory.context.cachePositionState = setToMoveUp ? 1 : 0;
+      this.accessory.context.cacheLastStartTime = Math.floor(Date.now() / 100);
+      await sleep(decisecondsToMove * 100);
       if (this.updateKey !== updateKey) {
-        return
+        return;
       }
-      params.rfChl = parseInt(this.chStop)
-      await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.service.updateCharacteristic(this.hapChar.PositionState, 2)
-      this.service.updateCharacteristic(this.hapChar.CurrentPosition, value)
-      this.accessory.context.cachePositionState = 2
-      this.accessory.context.cacheCurrentPosition = value
+      params.rfChl = parseInt(this.chStop, 10);
+      await this.platform.sendDeviceUpdate(this.accessory, params);
+      this.service.updateCharacteristic(this.hapChar.PositionState, 2);
+      this.service.updateCharacteristic(this.hapChar.CurrentPosition, value);
+      this.accessory.context.cachePositionState = 2;
+      this.accessory.context.cacheCurrentPosition = value;
       if (this.enableLogging) {
-        this.log('[%s] %s [%s%]', this.name, this.lang.curPos, value)
+        this.log('[%s] %s [%s%]', this.name, this.lang.curPos, value);
       }
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true);
       setTimeout(() => {
         this.service.updateCharacteristic(
           this.hapChar.TargetPosition,
-          this.accessory.context.cacheTargetPosition
-        )
-      }, 2000)
-      this.service.updateCharacteristic(this.hapChar.TargetPosition, new this.hapErr(-70402))
+          this.accessory.context.cacheTargetPosition,
+        );
+      }, 2000);
+      this.service.updateCharacteristic(this.hapChar.TargetPosition, new this.hapErr(-70402));
     }
   }
 
-  markStatus (isOnline) {
-    this.isOnline = isOnline
+  markStatus(isOnline) {
+    this.isOnline = isOnline;
   }
 }
diff --git a/lib/device/simulation/rf-window.js b/lib/device/simulation/rf-window.js
index 27eb3961..44b2e803 100644
--- a/lib/device/simulation/rf-window.js
+++ b/lib/device/simulation/rf-window.js
@@ -1,179 +1,180 @@
-/* jshint node: true, esversion: 10, -W014, -W033 */
-/* eslint-disable new-cap */
-'use strict'
+import platformConsts from '../../utils/constants.js';
+import { generateRandomString, hasProperty, sleep } from '../../utils/functions.js';
 
-module.exports = class deviceRFWindow {
-  constructor (platform, accessory) {
+export default class {
+  constructor(platform, accessory) {
     // Set up variables from the platform
-    this.eveChar = platform.eveChar
-    this.funcs = platform.funcs
-    this.hapChar = platform.api.hap.Characteristic
-    this.hapErr = platform.api.hap.HapStatusError
-    this.hapServ = platform.api.hap.Service
-    this.lang = platform.lang
-    this.log = platform.log
-    this.platform = platform
+    this.eveChar = platform.eveChar;
+    this.hapChar = platform.api.hap.Characteristic;
+    this.hapErr = platform.api.hap.HapStatusError;
+    this.hapServ = platform.api.hap.Service;
+    this.lang = platform.lang;
+    this.log = platform.log;
+    this.platform = platform;
 
     // Set up variables from the accessory
-    this.name = accessory.displayName
-    this.accessory = accessory
+    this.name = accessory.displayName;
+    this.accessory = accessory;
 
     // Initially set the online flag as true (to be then updated as false if necessary)
-    this.isOnline = true
+    this.isOnline = true;
 
     // Set up custom variables for this device type
-    const deviceConf = platform.rfSubdevices[accessory.context.hbDeviceId] || {}
-    this.operationTimeUp = deviceConf.operationTime || platform.consts.defaultValues.operationTime
-    this.operationTimeDown = deviceConf.operationTimeDown || this.operationTimeUp
-    ;[this.chOpen, this.chStop, this.chClose] = Object.keys(this.accessory.context.buttons)
+    const deviceConf = platform.rfSubdevices[accessory.context.hbDeviceId] || {};
+    this.operationTimeUp = deviceConf.operationTime || platformConsts.defaultValues.operationTime;
+    this.operationTimeDown = deviceConf.operationTimeDown || this.operationTimeUp;
+    [this.chOpen, this.chStop, this.chClose] = Object.keys(this.accessory.context.buttons);
 
     // Set the correct logging variables for this accessory
-    this.enableLogging = !platform.config.disableDeviceLogging
-    this.enableDebugLogging = platform.config.debug
     switch (deviceConf.overrideLogging) {
       case 'standard':
-        this.enableLogging = true
-        this.enableDebugLogging = false
-        break
+        this.enableLogging = true;
+        this.enableDebugLogging = false;
+        break;
       case 'debug':
-        this.enableLogging = true
-        this.enableDebugLogging = true
-        break
+        this.enableLogging = true;
+        this.enableDebugLogging = true;
+        break;
       case 'disable':
-        this.enableLogging = false
-        this.enableDebugLogging = false
-        break
+        this.enableLogging = false;
+        this.enableDebugLogging = false;
+        break;
+      default:
+        this.enableLogging = !platform.config.disableDeviceLogging;
+        this.enableDebugLogging = platform.config.debug;
+        break;
     }
 
     // If the accessory has a window covering service (from an old simulation) then remove it
     if (this.accessory.getService(this.hapServ.WindowCovering)) {
-      this.accessory.removeService(this.accessory.getService(this.hapServ.WindowCovering))
+      this.accessory.removeService(this.accessory.getService(this.hapServ.WindowCovering));
     }
 
     // If the accessory has a door service (from an old simulation) then remove it
     if (this.accessory.getService(this.hapServ.Door)) {
-      this.accessory.removeService(this.accessory.getService(this.hapServ.Door))
+      this.accessory.removeService(this.accessory.getService(this.hapServ.Door));
     }
 
     // Remove old switch services from before the simulation was configured
     this.accessory.services
-      .filter(el => el.constructor.name === 'Switch')
-      .forEach(el => this.accessory.removeService(el))
+      .filter((el) => el.constructor.name === 'Switch')
+      .forEach((el) => this.accessory.removeService(el));
 
     // Set up the accessory with default positions when added the first time
-    if (!this.funcs.hasProperty(this.accessory.context, 'cacheCurrentPosition')) {
-      this.accessory.context.cacheCurrentPosition = 0
-      this.accessory.context.cachePositionState = 2
-      this.accessory.context.cacheTargetPosition = 0
+    if (!hasProperty(this.accessory.context, 'cacheCurrentPosition')) {
+      this.accessory.context.cacheCurrentPosition = 0;
+      this.accessory.context.cachePositionState = 2;
+      this.accessory.context.cacheTargetPosition = 0;
     }
 
-    // Add the window covering service if it doesn't already exist
-    if (!(this.service = this.accessory.getService(this.hapServ.Window))) {
-      this.service = this.accessory.addService(this.hapServ.Window)
-      this.service.updateCharacteristic(this.hapChar.CurrentPosition, 0)
-      this.service.updateCharacteristic(this.hapChar.TargetPosition, 0)
-      this.service.updateCharacteristic(this.hapChar.PositionState, 2)
+    // Add the window service if it doesn't already exist
+    this.service = this.accessory.getService(this.hapServ.Window);
+    if (!(this.service)) {
+      this.service = this.accessory.addService(this.hapServ.Window);
+      this.service.updateCharacteristic(this.hapChar.CurrentPosition, 0);
+      this.service.updateCharacteristic(this.hapChar.TargetPosition, 0);
+      this.service.updateCharacteristic(this.hapChar.PositionState, 2);
     }
 
     // Add the set handler to the target position characteristic
-    this.service.getCharacteristic(this.hapChar.TargetPosition).onSet(value => {
+    this.service.getCharacteristic(this.hapChar.TargetPosition).onSet((value) => {
       // We don't use await as we want the callback to be run straight away
-      this.internalPositionUpdate(value)
-    })
+      this.internalPositionUpdate(value);
+    });
 
     // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
     if (!platform.config.disableNoResponse) {
       this.service.getCharacteristic(this.hapChar.CurrentPosition).onGet(() => {
         if (!this.isOnline) {
-          throw new this.hapErr(-70402)
+          throw new this.hapErr(-70402);
         }
-        return this.service.getCharacteristic(this.hapChar.CurrentPosition).value
-      })
+        return this.service.getCharacteristic(this.hapChar.CurrentPosition).value;
+      });
       this.service.getCharacteristic(this.hapChar.TargetPosition).onGet(() => {
         if (!this.isOnline) {
-          throw new this.hapErr(-70402)
+          throw new this.hapErr(-70402);
         }
-        return this.service.getCharacteristic(this.hapChar.TargetPosition).value
-      })
+        return this.service.getCharacteristic(this.hapChar.TargetPosition).value;
+      });
     }
 
     // Output the customised options to the log
+    const normalLogging = this.enableLogging ? 'standard' : 'disable';
     const opts = JSON.stringify({
-      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
+      logging: this.enableDebugLogging ? 'debug' : normalLogging,
       operationTime: this.operationTimeUp,
-      operationTimeDown: this.operationTimeDown
-    })
-    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
+      operationTimeDown: this.operationTimeDown,
+    });
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts);
   }
 
-  async internalPositionUpdate (value) {
+  async internalPositionUpdate(value) {
     try {
-      let prevPosition = this.accessory.context.cacheCurrentPosition
+      let prevPosition = this.accessory.context.cacheCurrentPosition;
       if (value === prevPosition) {
-        return
+        return;
       }
-      const params = { cmd: 'transmit' }
-      const prevState = this.accessory.context.cachePositionState
-      const percentStepUpPerDS = this.operationTimeUp / 100
-      const percentStepDownPerDS = this.operationTimeDown / 100
-      const updateKey = this.funcs.generateRandomString(5)
-      this.updateKey = updateKey
+      const params = { cmd: 'transmit' };
+      const prevState = this.accessory.context.cachePositionState;
+      const percentStepUpPerDS = this.operationTimeUp / 100;
+      const percentStepDownPerDS = this.operationTimeDown / 100;
+      const updateKey = generateRandomString(5);
+      this.updateKey = updateKey;
       if (prevState !== 2) {
-        const posPercentChange =
-          Math.floor(Date.now() / 100) - this.accessory.context.cacheLastStartTime
-        const posPercentChangeUp = Math.floor(percentStepUpPerDS * posPercentChange)
-        const posPercentChangeDown = Math.floor(percentStepDownPerDS * posPercentChange)
+        const posPercentChange = Math.floor(Date.now() / 100) - this.accessory.context.cacheLastStartTime;
+        const posPercentChangeUp = Math.floor(percentStepUpPerDS * posPercentChange);
+        const posPercentChangeDown = Math.floor(percentStepDownPerDS * posPercentChange);
         if (prevState === 0) {
           // Was going down
-          prevPosition -= posPercentChangeDown
+          prevPosition -= posPercentChangeDown;
         } else {
           // Was going up
-          prevPosition += posPercentChangeUp
+          prevPosition += posPercentChangeUp;
         }
-        prevPosition = Math.min(Math.max(prevPosition, 0), 100)
-        this.service.updateCharacteristic(this.hapChar.CurrentPosition, prevPosition)
-        this.accessory.context.cacheCurrentPosition = prevPosition
+        prevPosition = Math.min(Math.max(prevPosition, 0), 100);
+        this.service.updateCharacteristic(this.hapChar.CurrentPosition, prevPosition);
+        this.accessory.context.cacheCurrentPosition = prevPosition;
       }
-      const diffPosition = value - prevPosition
-      const setToMoveUp = diffPosition > 0
-      let decisecondsToMove
+      const diffPosition = value - prevPosition;
+      const setToMoveUp = diffPosition > 0;
+      let decisecondsToMove;
       if (setToMoveUp) {
-        decisecondsToMove = Math.round(Math.abs(diffPosition) * percentStepUpPerDS)
-        params.rfChl = parseInt(this.chOpen)
+        decisecondsToMove = Math.round(Math.abs(diffPosition) * percentStepUpPerDS);
+        params.rfChl = parseInt(this.chOpen, 10);
       } else {
-        decisecondsToMove = Math.round(Math.abs(diffPosition) * percentStepDownPerDS)
-        params.rfChl = parseInt(this.chClose)
+        decisecondsToMove = Math.round(Math.abs(diffPosition) * percentStepDownPerDS);
+        params.rfChl = parseInt(this.chClose, 10);
       }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.accessory.context.cacheTargetPosition = value
-      this.accessory.context.cachePositionState = setToMoveUp ? 1 : 0
-      this.accessory.context.cacheLastStartTime = Math.floor(Date.now() / 100)
-      await this.funcs.sleep(decisecondsToMove * 100)
+      await this.platform.sendDeviceUpdate(this.accessory, params);
+      this.accessory.context.cacheTargetPosition = value;
+      this.accessory.context.cachePositionState = setToMoveUp ? 1 : 0;
+      this.accessory.context.cacheLastStartTime = Math.floor(Date.now() / 100);
+      await sleep(decisecondsToMove * 100);
       if (this.updateKey !== updateKey) {
-        return
+        return;
       }
-      params.rfChl = parseInt(this.chStop)
-      await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.service.updateCharacteristic(this.hapChar.PositionState, 2)
-      this.service.updateCharacteristic(this.hapChar.CurrentPosition, value)
-      this.accessory.context.cachePositionState = 2
-      this.accessory.context.cacheCurrentPosition = value
+      params.rfChl = parseInt(this.chStop, 10);
+      await this.platform.sendDeviceUpdate(this.accessory, params);
+      this.service.updateCharacteristic(this.hapChar.PositionState, 2);
+      this.service.updateCharacteristic(this.hapChar.CurrentPosition, value);
+      this.accessory.context.cachePositionState = 2;
+      this.accessory.context.cacheCurrentPosition = value;
       if (this.enableLogging) {
-        this.log('[%s] %s [%s%]', this.name, this.lang.curPos, value)
+        this.log('[%s] %s [%s%]', this.name, this.lang.curPos, value);
       }
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true);
       setTimeout(() => {
         this.service.updateCharacteristic(
           this.hapChar.TargetPosition,
-          this.accessory.context.cacheTargetPosition
-        )
-      }, 2000)
-      this.service.updateCharacteristic(this.hapChar.TargetPosition, new this.hapErr(-70402))
+          this.accessory.context.cacheTargetPosition,
+        );
+      }, 2000);
+      this.service.updateCharacteristic(this.hapChar.TargetPosition, new this.hapErr(-70402));
     }
   }
 
-  markStatus (isOnline) {
-    this.isOnline = isOnline
+  markStatus(isOnline) {
+    this.isOnline = isOnline;
   }
 }
diff --git a/lib/device/simulation/sensor-hidden.js b/lib/device/simulation/sensor-hidden.js
index f037d635..d373ae56 100644
--- a/lib/device/simulation/sensor-hidden.js
+++ b/lib/device/simulation/sensor-hidden.js
@@ -1,104 +1,106 @@
-/* jshint node: true, esversion: 10, -W014, -W033 */
-/* eslint-disable new-cap */
-'use strict'
+import platformConsts from '../../utils/constants.js';
+import { hasProperty, sleep } from '../../utils/functions.js';
 
-module.exports = class deviceSensorHidden {
-  constructor (platform, accessory, subAccessory) {
+export default class {
+  constructor(platform, accessory, subAccessory) {
     // Set up variables from the platform
-    this.eveChar = platform.eveChar
-    this.funcs = platform.funcs
-    this.hapChar = platform.api.hap.Characteristic
-    this.hapServ = platform.api.hap.Service
-    this.lang = platform.lang
-    this.log = platform.log
-    this.platform = platform
+    this.eveChar = platform.eveChar;
+    this.hapChar = platform.api.hap.Characteristic;
+    this.hapServ = platform.api.hap.Service;
+    this.lang = platform.lang;
+    this.log = platform.log;
+    this.platform = platform;
 
     // Set up variables from the accessory
-    this.accessory = accessory
-    this.subAccessory = subAccessory
+    this.accessory = accessory;
+    this.subAccessory = subAccessory;
 
     // Set up custom variables for this device type
-    const group = platform.deviceConf[subAccessory.context.eweDeviceId] || {}
-    this.isGarage = group.showAs === 'garage'
-    this.operationTime = group.operationTime || platform.consts.defaultValues.operationTime
+    const group = platform.deviceConf[subAccessory.context.eweDeviceId] || {};
+    this.isGarage = group.showAs === 'garage';
+    this.operationTime = group.operationTime || platformConsts.defaultValues.operationTime;
 
     // Set the correct logging variables for this accessory
-    this.enableLogging = !platform.config.disableDeviceLogging
     switch (group.overrideLogging) {
       case 'standard':
       case 'debug':
-        this.enableLogging = true
-        break
+        this.enableLogging = true;
+        break;
       case 'disable':
-        this.enableLogging = false
-        break
+        this.enableLogging = false;
+        break;
+      default:
+        this.enableLogging = !platform.config.disableDeviceLogging;
+        break;
     }
   }
 
-  async externalUpdate (params) {
+  async externalUpdate(params) {
     try {
-      if (!this.funcs.hasProperty(params, 'lock') && !params.switch) {
-        return
+      if (!hasProperty(params, 'lock') && !params.switch) {
+        return;
       }
-      let newState
+      let newState;
       if (params.switch) {
-        newState = params.switch === 'on' ? 1 : 0
+        newState = params.switch === 'on' ? 1 : 0;
       } else {
-        newState = params.lock
+        newState = params.lock;
       }
       if (newState === this.cacheState) {
-        return
+        return;
       }
-      this.cacheState = newState
+      this.cacheState = newState;
       const subService = this.subAccessory.getService(
-        this.isGarage ? this.hapServ.GarageDoorOpener : this.hapServ.LockMechanism
-      )
-      const name = this.subAccessory.displayName
+        this.isGarage ? this.hapServ.GarageDoorOpener : this.hapServ.LockMechanism,
+      );
+      const name = this.subAccessory.displayName;
       switch (newState) {
         case 0:
           if (this.isGarage) {
-            subService.updateCharacteristic(this.hapChar.TargetDoorState, 1)
-            subService.updateCharacteristic(this.hapChar.CurrentDoorState, 1)
-            this.subAccessory.eveService.addEntry({ status: 1 })
+            subService.updateCharacteristic(this.hapChar.TargetDoorState, 1);
+            subService.updateCharacteristic(this.hapChar.CurrentDoorState, 1);
+            this.subAccessory.eveService.addEntry({ status: 1 });
             if (params.updateSource && this.enableLogging) {
-              this.log('[%s] %s [%s].', name, this.lang.curState, this.lang.doorClosed)
+              this.log('[%s] %s [%s].', name, this.lang.curState, this.lang.doorClosed);
             }
           } else {
-            subService.updateCharacteristic(this.hapChar.LockTargetState, 1)
-            subService.updateCharacteristic(this.hapChar.LockCurrentState, 1)
+            subService.updateCharacteristic(this.hapChar.LockTargetState, 1);
+            subService.updateCharacteristic(this.hapChar.LockCurrentState, 1);
             if (params.updateSource && this.enableLogging) {
-              this.log('[%s] %s [%s].', name, this.lang.curState, this.lang.lockLocked)
+              this.log('[%s] %s [%s].', name, this.lang.curState, this.lang.lockLocked);
             }
           }
-          break
+          break;
         case 1: {
           if (this.isGarage) {
-            await this.funcs.sleep(Math.max(this.operationTime * 100, 2000))
-            subService.updateCharacteristic(this.hapChar.TargetDoorState, 0)
-            subService.updateCharacteristic(this.hapChar.CurrentDoorState, 0)
-            this.subAccessory.eveService.addEntry({ status: 0 })
-            const initialTime = this.subAccessory.eveService.getInitialTime()
+            await sleep(Math.max(this.operationTime * 100, 2000));
+            subService.updateCharacteristic(this.hapChar.TargetDoorState, 0);
+            subService.updateCharacteristic(this.hapChar.CurrentDoorState, 0);
+            this.subAccessory.eveService.addEntry({ status: 0 });
+            const initialTime = this.subAccessory.eveService.getInitialTime();
             subService.updateCharacteristic(
               this.eveChar.LastActivation,
-              Math.round(new Date().valueOf() / 1000) - initialTime
-            )
-            const newTO = subService.getCharacteristic(this.eveChar.TimesOpened).value + 1
-            subService.updateCharacteristic(this.eveChar.TimesOpened, newTO)
+              Math.round(new Date().valueOf() / 1000) - initialTime,
+            );
+            const newTO = subService.getCharacteristic(this.eveChar.TimesOpened).value + 1;
+            subService.updateCharacteristic(this.eveChar.TimesOpened, newTO);
             if (params.updateSource && this.enableLogging) {
-              this.log('[%s] %s [%s].', name, this.lang.curState, this.lang.doorOpen)
+              this.log('[%s] %s [%s].', name, this.lang.curState, this.lang.doorOpen);
             }
           } else {
-            subService.updateCharacteristic(this.hapChar.LockTargetState, 0)
-            subService.updateCharacteristic(this.hapChar.LockCurrentState, 0)
+            subService.updateCharacteristic(this.hapChar.LockTargetState, 0);
+            subService.updateCharacteristic(this.hapChar.LockCurrentState, 0);
             if (params.updateSource && this.enableLogging) {
-              this.log('[%s] %s [%s].', name, this.lang.curState, this.lang.lockUnlocked)
+              this.log('[%s] %s [%s].', name, this.lang.curState, this.lang.lockUnlocked);
             }
           }
-          break
+          break;
         }
+        default:
+          return;
       }
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, false)
+      this.platform.deviceUpdateError(this.accessory, err, false);
     }
   }
 }
diff --git a/lib/device/simulation/sensor-leak.js b/lib/device/simulation/sensor-leak.js
index a4bef30a..24f7b316 100644
--- a/lib/device/simulation/sensor-leak.js
+++ b/lib/device/simulation/sensor-leak.js
@@ -1,118 +1,116 @@
-/* jshint node: true, esversion: 10, -W014, -W033 */
-/* eslint-disable new-cap */
-'use strict'
+import platformConsts from '../../utils/constants.js';
+import { hasProperty } from '../../utils/functions.js';
 
-module.exports = class deviceSensorLeak {
-  constructor (platform, accessory) {
+export default class {
+  constructor(platform, accessory) {
     // Set up variables from the platform
-    this.eveChar = platform.eveChar
-    this.funcs = platform.funcs
-    this.hapChar = platform.api.hap.Characteristic
-    this.hapServ = platform.api.hap.Service
-    this.lang = platform.lang
-    this.log = platform.log
-    this.platform = platform
+    this.eveChar = platform.eveChar;
+    this.hapChar = platform.api.hap.Characteristic;
+    this.hapServ = platform.api.hap.Service;
+    this.lang = platform.lang;
+    this.log = platform.log;
+    this.platform = platform;
 
     // Set up variables from the accessory
-    this.name = accessory.displayName
-    this.accessory = accessory
+    this.name = accessory.displayName;
+    this.accessory = accessory;
 
     // Set up custom variables for this device type
-    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
-    this.lowBattThreshold =
-      deviceConf && deviceConf.lowBattThreshold
-        ? Math.min(deviceConf.lowBattThreshold, 100)
-        : platform.consts.defaultValues.lowBattThreshold
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId] || {};
+    this.lowBattThreshold = deviceConf.lowBattThreshold
+      ? Math.min(deviceConf.lowBattThreshold, 100)
+      : platformConsts.defaultValues.lowBattThreshold;
 
     // Set the correct logging variables for this accessory
-    this.enableLogging = !platform.config.disableDeviceLogging
-    this.enableDebugLogging = platform.config.debug
-    if (deviceConf && deviceConf.overrideLogging) {
-      switch (deviceConf.overrideLogging) {
-        case 'standard':
-          this.enableLogging = true
-          this.enableDebugLogging = false
-          break
-        case 'debug':
-          this.enableLogging = true
-          this.enableDebugLogging = true
-          break
-        case 'disable':
-          this.enableLogging = false
-          this.enableDebugLogging = false
-          break
-      }
+    switch (deviceConf.overrideLogging) {
+      case 'standard':
+        this.enableLogging = true;
+        this.enableDebugLogging = false;
+        break;
+      case 'debug':
+        this.enableLogging = true;
+        this.enableDebugLogging = true;
+        break;
+      case 'disable':
+        this.enableLogging = false;
+        this.enableDebugLogging = false;
+        break;
+      default:
+        this.enableLogging = !platform.config.disableDeviceLogging;
+        this.enableDebugLogging = platform.config.debug;
+        break;
     }
 
     // If the accessory has a contact sensor service then remove it
     if (this.accessory.getService(this.hapServ.ContactSensor)) {
-      this.accessory.removeService(this.accessory.getService(this.hapServ.ContactSensor))
+      this.accessory.removeService(this.accessory.getService(this.hapServ.ContactSensor));
     }
 
     // Add the leak sensor service if it doesn't already exist
-    if (!(this.service = this.accessory.getService(this.hapServ.LeakSensor))) {
-      this.service = this.accessory.addService(this.hapServ.LeakSensor)
-      this.service.addCharacteristic(this.eveChar.LastActivation)
+    this.service = this.accessory.getService(this.hapServ.LeakSensor);
+    if (!this.service) {
+      this.service = this.accessory.addService(this.hapServ.LeakSensor);
+      this.service.addCharacteristic(this.eveChar.LastActivation);
     }
 
     // Add the battery service if it doesn't already exist
-    this.batteryService =
-      this.accessory.getService(this.hapServ.Battery) ||
-      this.accessory.addService(this.hapServ.Battery)
+    this.batteryService = this.accessory.getService(this.hapServ.Battery)
+      || this.accessory.addService(this.hapServ.Battery);
 
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new platform.eveService('motion', this.accessory, {
-      log: platform.config.debugFakegato ? this.log : () => {}
-    })
+      log: platform.config.debugFakegato ? this.log : () => {},
+    });
 
     // Output the customised options to the log
+    const normalLogging = this.enableLogging ? 'standard' : 'disable';
     const opts = JSON.stringify({
-      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
+      logging: this.enableDebugLogging ? 'debug' : normalLogging,
       lowBattThreshold: this.lowBattThreshold,
-      showAs: 'sensor_leak'
-    })
-    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
+      showAs: 'sensor_leak',
+    });
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts);
   }
 
-  async externalUpdate (params) {
+  async externalUpdate(params) {
     try {
-      if (this.funcs.hasProperty(params, 'battery') && this.cacheBatt !== params.battery) {
-        this.cacheBatt = params.battery
-        this.cacheBattScaled = Math.min(Math.max(this.cacheBatt, 2), 3)
-        this.cacheBattScaled = Math.round((this.cacheBattScaled - 2) * 100)
-        this.batteryService.updateCharacteristic(this.hapChar.BatteryLevel, this.cacheBattScaled)
+      if (hasProperty(params, 'battery') && this.cacheBatt !== params.battery) {
+        this.cacheBatt = params.battery;
+        this.cacheBattScaled = Math.min(Math.max(this.cacheBatt, 2), 3);
+        this.cacheBattScaled = Math.round((this.cacheBattScaled - 2) * 100);
+        this.batteryService.updateCharacteristic(this.hapChar.BatteryLevel, this.cacheBattScaled);
         this.batteryService.updateCharacteristic(
           this.hapChar.StatusLowBattery,
-          this.cacheBattScaled < this.lowBattThreshold ? 1 : 0
-        )
+          this.cacheBattScaled < this.lowBattThreshold ? 1 : 0,
+        );
         if (params.updateSource && this.enableLogging) {
-          this.log('[%s] %s [%s%].', this.name, this.lang.curBatt, this.cacheBattScaled)
+          this.log('[%s] %s [%s%].', this.name, this.lang.curBatt, this.cacheBattScaled);
         }
       }
       if (!params.switch || params.switch === this.cacheState) {
-        return
+        return;
       }
-      this.cacheState = params.switch
-      const newState = params.switch === 'on' ? 0 : 1
-      this.service.updateCharacteristic(this.hapChar.LeakDetected, newState)
-      this.accessory.eveService.addEntry({ status: newState })
+      this.cacheState = params.switch;
+      const newState = params.switch === 'on' ? 0 : 1;
+      this.service.updateCharacteristic(this.hapChar.LeakDetected, newState);
+      this.accessory.eveService.addEntry({ status: newState });
       if (newState === 1) {
-        const initialTime = this.accessory.eveService.getInitialTime()
+        const initialTime = this.accessory.eveService.getInitialTime();
         this.service.updateCharacteristic(
           this.eveChar.LastActivation,
-          Math.round(new Date().valueOf() / 1000) - initialTime
-        )
+          Math.round(new Date().valueOf() / 1000) - initialTime,
+        );
       }
       if (params.updateSource && this.enableLogging) {
         this.log(
           '[%s] %s [%s].',
           this.name,
           this.lang.curState,
-          newState === 1 ? this.lang.leakYes : this.lang.leakNo
-        )
+          newState === 1 ? this.lang.leakYes : this.lang.leakNo,
+        );
       }
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, false)
+      this.platform.deviceUpdateError(this.accessory, err, false);
     }
   }
 }
diff --git a/lib/device/simulation/sensor-visible.js b/lib/device/simulation/sensor-visible.js
index eaacfcd0..4f070421 100644
--- a/lib/device/simulation/sensor-visible.js
+++ b/lib/device/simulation/sensor-visible.js
@@ -1,224 +1,226 @@
-/* jshint node: true, esversion: 10, -W014, -W033 */
-/* eslint-disable new-cap */
-'use strict'
+import platformConsts from '../../utils/constants.js';
+import { hasProperty, sleep } from '../../utils/functions.js';
 
-module.exports = class deviceSensorVisible {
-  constructor (platform, accessory, subAccessory) {
+export default class {
+  constructor(platform, accessory, subAccessory) {
     // Set up variables from the platform
-    this.eveChar = platform.eveChar
-    this.funcs = platform.funcs
-    this.hapChar = platform.api.hap.Characteristic
-    this.hapServ = platform.api.hap.Service
-    this.lang = platform.lang
-    this.log = platform.log
-    this.platform = platform
+    this.eveChar = platform.eveChar;
+    this.hapChar = platform.api.hap.Characteristic;
+    this.hapServ = platform.api.hap.Service;
+    this.lang = platform.lang;
+    this.log = platform.log;
+    this.platform = platform;
 
     // Set up variables from the accessory
-    this.name = accessory.displayName
-    this.nameSub = subAccessory.displayName
-    this.accessory = accessory
-    this.subAccessory = subAccessory
+    this.name = accessory.displayName;
+    this.nameSub = subAccessory.displayName;
+    this.accessory = accessory;
+    this.subAccessory = subAccessory;
 
     // Set up custom variables for this device type
-    this.isDW2 = platform.consts.devices.sensorContact.includes(accessory.context.eweUIID)
-    this.hasBattery = platform.consts.devices.garageSensors.includes(accessory.context.eweUIID)
-    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
-    this.scaleBattery = deviceConf && deviceConf.scaleBattery
-    this.lowBattThreshold =
-      deviceConf && deviceConf.lowBattThreshold
-        ? Math.min(deviceConf.lowBattThreshold, 100)
-        : platform.consts.defaultValues.lowBattThreshold
-    const group = platform.deviceConf[subAccessory.context.eweDeviceId] || {}
-    this.isGarage = group.showAs === 'garage'
-    this.operationTime = group.operationTime || platform.consts.defaultValues.operationTime
+    this.isDW2 = platformConsts.devices.sensorContact.includes(accessory.context.eweUIID);
+    this.hasBattery = platformConsts.devices.garageSensors.includes(accessory.context.eweUIID);
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId] || {};
+    this.scaleBattery = deviceConf.scaleBattery;
+    this.lowBattThreshold = deviceConf.lowBattThreshold
+      ? Math.min(deviceConf.lowBattThreshold, 100)
+      : platformConsts.defaultValues.lowBattThreshold;
+    const group = platform.deviceConf[subAccessory.context.eweDeviceId] || {};
+    this.isGarage = group.showAs === 'garage';
+    this.operationTime = group.operationTime || platformConsts.defaultValues.operationTime;
 
     // Set the correct logging variables for this accessory
-    this.enableLogging = !platform.config.disableDeviceLogging
-    this.enableDebugLogging = platform.config.debug
-    if (deviceConf && deviceConf.overrideLogging) {
-      switch (deviceConf.overrideLogging) {
-        case 'standard':
-          this.enableLogging = true
-          this.enableDebugLogging = false
-          break
-        case 'debug':
-          this.enableLogging = true
-          this.enableDebugLogging = true
-          break
-        case 'disable':
-          this.enableLogging = false
-          this.enableDebugLogging = false
-          break
-      }
+    switch (deviceConf.overrideLogging) {
+      case 'standard':
+        this.enableLogging = true;
+        this.enableDebugLogging = false;
+        break;
+      case 'debug':
+        this.enableLogging = true;
+        this.enableDebugLogging = true;
+        break;
+      case 'disable':
+        this.enableLogging = false;
+        this.enableDebugLogging = false;
+        break;
+      default:
+        this.enableLogging = !platform.config.disableDeviceLogging;
+        this.enableDebugLogging = platform.config.debug;
+        break;
     }
 
     // Set the correct logging variables for this sub accessory
-    this.enableLoggingSub = !platform.config.disableDeviceLogging
     switch (group.overrideLogging) {
       case 'standard':
       case 'debug':
-        this.enableLoggingSub = true
-        break
+        this.enableLoggingSub = true;
+        break;
       case 'disable':
-        this.enableLoggingSub = false
-        break
+        this.enableLoggingSub = false;
+        break;
+      default:
+        this.enableLoggingSub = !platform.config.disableDeviceLogging;
+        break;
     }
 
     // If the accessory has a leak sensor service then remove it
     if (this.accessory.getService(this.hapServ.LeakSensor)) {
-      this.accessory.removeService(this.accessory.getService(this.hapServ.LeakSensor))
+      this.accessory.removeService(this.accessory.getService(this.hapServ.LeakSensor));
     }
 
     // Add the contact sensor service if it doesn't already exist
-    if (!(this.service = this.accessory.getService(this.hapServ.ContactSensor))) {
-      this.service = this.accessory.addService(this.hapServ.ContactSensor)
-      this.service.addCharacteristic(this.eveChar.LastActivation)
-      this.service.addCharacteristic(this.eveChar.ResetTotal)
-      this.service.addCharacteristic(this.eveChar.OpenDuration)
-      this.service.addCharacteristic(this.eveChar.ClosedDuration)
-      this.service.addCharacteristic(this.eveChar.TimesOpened)
+    this.service = this.accessory.getService(this.hapServ.ContactSensor);
+    if (!this.service) {
+      this.service = this.accessory.addService(this.hapServ.ContactSensor);
+      this.service.addCharacteristic(this.eveChar.LastActivation);
+      this.service.addCharacteristic(this.eveChar.ResetTotal);
+      this.service.addCharacteristic(this.eveChar.OpenDuration);
+      this.service.addCharacteristic(this.eveChar.ClosedDuration);
+      this.service.addCharacteristic(this.eveChar.TimesOpened);
     }
 
     // Add the set handler to the contact sensor reset total characteristic
-    this.service.getCharacteristic(this.eveChar.ResetTotal).onSet(value => {
-      this.service.updateCharacteristic(this.eveChar.TimesOpened, 0)
-    })
+    this.service.getCharacteristic(this.eveChar.ResetTotal).onSet(() => {
+      this.service.updateCharacteristic(this.eveChar.TimesOpened, 0);
+    });
 
     if (this.hasBattery) {
       // Add the battery service if it doesn't already exist
-      this.batteryService =
-        this.accessory.getService(this.hapServ.Battery) ||
-        this.accessory.addService(this.hapServ.Battery)
+      this.batteryService = this.accessory.getService(this.hapServ.Battery)
+        || this.accessory.addService(this.hapServ.Battery);
     }
 
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new platform.eveService('door', this.accessory, {
-      log: platform.config.debugFakegato ? this.log : () => {}
-    })
+      log: platform.config.debugFakegato ? this.log : () => {},
+    });
     this.accessory.eveService.addEntry({
-      status: this.service.getCharacteristic(this.hapChar.ContactSensorState).value
-    })
+      status: this.service.getCharacteristic(this.hapChar.ContactSensorState).value,
+    });
 
     // Output the customised options to the log
+    const normalLogging = this.enableLogging ? 'standard' : 'disable';
     const opts = JSON.stringify({
-      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
+      logging: this.enableDebugLogging ? 'debug' : normalLogging,
       lowBattThreshold: this.lowBattThreshold,
-      scaleBattery: this.scaleBattery
-    })
-    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
+      scaleBattery: this.scaleBattery,
+    });
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts);
   }
 
-  async externalUpdate (params) {
+  async externalUpdate(params) {
     try {
       if (
-        this.batteryService &&
-        this.funcs.hasProperty(params, 'battery') &&
-        params.battery !== this.cacheBatt
+        this.batteryService
+        && hasProperty(params, 'battery')
+        && params.battery !== this.cacheBatt
       ) {
-        this.cacheBatt = params.battery
+        this.cacheBatt = params.battery;
         if (this.isDW2) {
-          this.cacheBattScaled = Math.min(Math.max(this.cacheBatt, 2), 3)
-          this.cacheBattScaled = Math.round((this.cacheBattScaled - 2) * 100)
+          this.cacheBattScaled = Math.min(Math.max(this.cacheBatt, 2), 3);
+          this.cacheBattScaled = Math.round((this.cacheBattScaled - 2) * 100);
         } else {
-          this.cacheBattScaled = this.scaleBattery ? this.cacheBatt * 10 : this.cacheBatt
+          this.cacheBattScaled = this.scaleBattery ? this.cacheBatt * 10 : this.cacheBatt;
         }
-        this.cacheBattScaled = Math.max(Math.min(this.cacheBattScaled, 100), 0)
-        this.batteryService.updateCharacteristic(this.hapChar.BatteryLevel, this.cacheBattScaled)
+        this.cacheBattScaled = Math.max(Math.min(this.cacheBattScaled, 100), 0);
+        this.batteryService.updateCharacteristic(this.hapChar.BatteryLevel, this.cacheBattScaled);
         this.batteryService.updateCharacteristic(
           this.hapChar.StatusLowBattery,
-          this.cacheBattScaled < this.lowBattThreshold ? 1 : 0
-        )
+          this.cacheBattScaled < this.lowBattThreshold ? 1 : 0,
+        );
         if (params.updateSource && this.enableLogging) {
-          this.log('[%s] %s [%s%].', this.name, this.lang.curBatt, this.cacheBattScaled)
+          this.log('[%s] %s [%s%].', this.name, this.lang.curBatt, this.cacheBattScaled);
         }
       }
-      if (!this.funcs.hasProperty(params, 'lock') && !params.switch) {
-        return
+      if (!hasProperty(params, 'lock') && !params.switch) {
+        return;
       }
-      let newState
+      let newState;
       if (params.switch) {
-        newState = params.switch === 'on' ? 1 : 0
+        newState = params.switch === 'on' ? 1 : 0;
       } else {
-        newState = params.lock
+        newState = params.lock;
       }
       if (newState === this.cacheState) {
-        return
+        return;
       }
-      this.cacheState = newState
+      this.cacheState = newState;
       if (newState === 1) {
-        this.service.updateCharacteristic(this.hapChar.ContactSensorState, 1)
-        this.accessory.eveService.addEntry({ status: 1 })
-        const initialTime = this.accessory.eveService.getInitialTime()
+        this.service.updateCharacteristic(this.hapChar.ContactSensorState, 1);
+        this.accessory.eveService.addEntry({ status: 1 });
+        const initialTime = this.accessory.eveService.getInitialTime();
         this.service.updateCharacteristic(
           this.eveChar.LastActivation,
-          Math.round(new Date().valueOf() / 1000) - initialTime
-        )
-        const newTO = this.service.getCharacteristic(this.eveChar.TimesOpened).value + 1
-        this.service.updateCharacteristic(this.eveChar.TimesOpened, newTO)
+          Math.round(new Date().valueOf() / 1000) - initialTime,
+        );
+        const newTO = this.service.getCharacteristic(this.eveChar.TimesOpened).value + 1;
+        this.service.updateCharacteristic(this.eveChar.TimesOpened, newTO);
       } else {
-        this.service.updateCharacteristic(this.hapChar.ContactSensorState, 0)
-        this.accessory.eveService.addEntry({ status: 0 })
+        this.service.updateCharacteristic(this.hapChar.ContactSensorState, 0);
+        this.accessory.eveService.addEntry({ status: 0 });
       }
       if (params.updateSource && this.enableLogging) {
         this.log(
           '[%s] %s [%s].',
           this.name,
           this.lang.curState,
-          newState === 0 ? this.lang.contactYes : this.lang.contactNo
-        )
+          newState === 0 ? this.lang.contactYes : this.lang.contactNo,
+        );
       }
       const subService = this.subAccessory.getService(
-        this.isGarage ? this.hapServ.GarageDoorOpener : this.hapServ.LockMechanism
-      )
+        this.isGarage ? this.hapServ.GarageDoorOpener : this.hapServ.LockMechanism,
+      );
       switch (newState) {
         case 0:
           if (this.isGarage) {
-            subService.updateCharacteristic(this.hapChar.TargetDoorState, 1)
-            subService.updateCharacteristic(this.hapChar.CurrentDoorState, 1)
-            this.subAccessory.eveService.addEntry({ status: 1 })
+            subService.updateCharacteristic(this.hapChar.TargetDoorState, 1);
+            subService.updateCharacteristic(this.hapChar.CurrentDoorState, 1);
+            this.subAccessory.eveService.addEntry({ status: 1 });
             if (params.updateSource && this.enableLoggingSub) {
-              this.log('[%s] %s [%s].', this.nameSub, this.lang.curState, this.lang.doorClosed)
+              this.log('[%s] %s [%s].', this.nameSub, this.lang.curState, this.lang.doorClosed);
             }
           } else {
-            subService.updateCharacteristic(this.hapChar.LockTargetState, 1)
-            subService.updateCharacteristic(this.hapChar.LockCurrentState, 1)
-            this.subAccessory.context.contactDetected = true
+            subService.updateCharacteristic(this.hapChar.LockTargetState, 1);
+            subService.updateCharacteristic(this.hapChar.LockCurrentState, 1);
+            this.subAccessory.context.contactDetected = true;
             if (params.updateSource && this.enableLoggingSub) {
-              this.log('[%s] %s [%s].', this.nameSub, this.lang.curState, this.lang.lockLocked)
+              this.log('[%s] %s [%s].', this.nameSub, this.lang.curState, this.lang.lockLocked);
             }
           }
-          break
+          break;
         case 1: {
           if (this.isGarage) {
-            await this.funcs.sleep(Math.max(this.operationTime * 100, 2000))
-            subService.updateCharacteristic(this.hapChar.TargetDoorState, 0)
-            subService.updateCharacteristic(this.hapChar.CurrentDoorState, 0)
-            this.subAccessory.eveService.addEntry({ status: 0 })
-            const initialTime = this.subAccessory.eveService.getInitialTime()
+            await sleep(Math.max(this.operationTime * 100, 2000));
+            subService.updateCharacteristic(this.hapChar.TargetDoorState, 0);
+            subService.updateCharacteristic(this.hapChar.CurrentDoorState, 0);
+            this.subAccessory.eveService.addEntry({ status: 0 });
+            const initialTime = this.subAccessory.eveService.getInitialTime();
             subService.updateCharacteristic(
               this.eveChar.LastActivation,
-              Math.round(new Date().valueOf() / 1000) - initialTime
-            )
+              Math.round(new Date().valueOf() / 1000) - initialTime,
+            );
             subService.updateCharacteristic(
               this.eveChar.TimesOpened,
-              subService.getCharacteristic(this.eveChar.TimesOpened).value + 1
-            )
+              subService.getCharacteristic(this.eveChar.TimesOpened).value + 1,
+            );
             if (params.updateSource && this.enableLoggingSub) {
-              this.log('[%s] %s [%s].', this.nameSub, this.lang.curState, this.lang.doorOpen)
+              this.log('[%s] %s [%s].', this.nameSub, this.lang.curState, this.lang.doorOpen);
             }
           } else {
-            subService.updateCharacteristic(this.hapChar.LockTargetState, 0)
-            subService.updateCharacteristic(this.hapChar.LockCurrentState, 0)
-            this.subAccessory.context.contactDetected = false
+            subService.updateCharacteristic(this.hapChar.LockTargetState, 0);
+            subService.updateCharacteristic(this.hapChar.LockCurrentState, 0);
+            this.subAccessory.context.contactDetected = false;
             if (params.updateSource && this.enableLoggingSub) {
-              this.log('[%s] %s [%s].', this.nameSub, this.lang.curState, this.lang.lockUnlocked)
+              this.log('[%s] %s [%s].', this.nameSub, this.lang.curState, this.lang.lockUnlocked);
             }
           }
-          break
+          break;
         }
+        default:
+          return;
       }
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, false)
+      this.platform.deviceUpdateError(this.accessory, err, false);
     }
   }
 }
diff --git a/lib/device/simulation/sensor.js b/lib/device/simulation/sensor.js
index 50829382..0e9c8fea 100644
--- a/lib/device/simulation/sensor.js
+++ b/lib/device/simulation/sensor.js
@@ -1,300 +1,300 @@
-/* jshint node: true, esversion: 10, -W014, -W033 */
-/* eslint-disable new-cap */
-'use strict'
+import platformConsts from '../../utils/constants.js';
+import { hasProperty } from '../../utils/functions.js';
 
-module.exports = class deviceSensor {
-  constructor (platform, accessory) {
+export default class {
+  constructor(platform, accessory) {
     // Set up variables from the platform
-    this.eveChar = platform.eveChar
-    this.funcs = platform.funcs
-    this.hapChar = platform.api.hap.Characteristic
-    this.hapServ = platform.api.hap.Service
-    this.lang = platform.lang
-    this.log = platform.log
-    this.platform = platform
+    this.eveChar = platform.eveChar;
+    this.hapChar = platform.api.hap.Characteristic;
+    this.hapServ = platform.api.hap.Service;
+    this.lang = platform.lang;
+    this.log = platform.log;
+    this.platform = platform;
 
     // Set up variables from the accessory
-    this.name = accessory.displayName
-    this.accessory = accessory
+    this.name = accessory.displayName;
+    this.accessory = accessory;
 
     // Initially set the online flag as true (to be then updated as false if necessary)
-    this.isOnline = true
+    this.isOnline = true;
 
     // Set up custom variables for this device type
-    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
-    this.sensorType = deviceConf.sensorType || 'motion'
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId] || {};
+    this.sensorType = deviceConf.sensorType || 'motion';
 
     // Set the correct logging variables for this accessory
-    this.enableLogging = !platform.config.disableDeviceLogging
-    this.enableDebugLogging = platform.config.debug
-    if (deviceConf && deviceConf.overrideLogging) {
-      switch (deviceConf.overrideLogging) {
-        case 'standard':
-          this.enableLogging = true
-          this.enableDebugLogging = false
-          break
-        case 'debug':
-          this.enableLogging = true
-          this.enableDebugLogging = true
-          break
-        case 'disable':
-          this.enableLogging = false
-          this.enableDebugLogging = false
-          break
-      }
+    switch (deviceConf.overrideLogging) {
+      case 'standard':
+        this.enableLogging = true;
+        this.enableDebugLogging = false;
+        break;
+      case 'debug':
+        this.enableLogging = true;
+        this.enableDebugLogging = true;
+        break;
+      case 'disable':
+        this.enableLogging = false;
+        this.enableDebugLogging = false;
+        break;
+      default:
+        this.enableLogging = !platform.config.disableDeviceLogging;
+        this.enableDebugLogging = platform.config.debug;
+        break;
     }
 
     // If the accessory has a switch service then remove it
     if (this.accessory.getService(this.hapServ.Switch)) {
-      this.accessory.removeService(this.accessory.getService(this.hapServ.Switch))
+      this.accessory.removeService(this.accessory.getService(this.hapServ.Switch));
     }
 
     // If the accessory has an outlet service then remove it
     if (this.accessory.getService(this.hapServ.Outlet)) {
-      this.accessory.removeService(this.accessory.getService(this.hapServ.Outlet))
+      this.accessory.removeService(this.accessory.getService(this.hapServ.Outlet));
     }
 
     // This instance is a sensor which the user can define as different types
-    let serv
-    let eveType
+    let serv;
+    let eveType;
 
     // Check which type this sensor is and get the correct service/characteristic
     switch (this.sensorType) {
       case 'water':
-        serv = this.hapServ.LeakSensor
-        this.char = this.hapChar.LeakDetected
-        eveType = 'motion'
-        break
+        serv = this.hapServ.LeakSensor;
+        this.char = this.hapChar.LeakDetected;
+        eveType = 'motion';
+        break;
       case 'fire':
       case 'smoke':
-        serv = this.hapServ.SmokeSensor
-        this.char = this.hapChar.SmokeDetected
-        eveType = 'motion'
-        break
+        serv = this.hapServ.SmokeSensor;
+        this.char = this.hapChar.SmokeDetected;
+        eveType = 'motion';
+        break;
       case 'co':
-        serv = this.hapServ.CarbonMonoxideSensor
-        this.char = this.hapChar.CarbonMonoxideDetected
-        eveType = 'motion'
-        break
+        serv = this.hapServ.CarbonMonoxideSensor;
+        this.char = this.hapChar.CarbonMonoxideDetected;
+        eveType = 'motion';
+        break;
       case 'co2':
-        serv = this.hapServ.CarbonDioxideSensor
-        this.char = this.hapChar.CarbonDioxideDetected
-        eveType = 'motion'
-        break
+        serv = this.hapServ.CarbonDioxideSensor;
+        this.char = this.hapChar.CarbonDioxideDetected;
+        eveType = 'motion';
+        break;
       case 'contact':
-        serv = this.hapServ.ContactSensor
-        this.char = this.hapChar.ContactSensorState
-        eveType = 'door'
-        this.useLastActivation = true
-        break
+        serv = this.hapServ.ContactSensor;
+        this.char = this.hapChar.ContactSensorState;
+        eveType = 'door';
+        this.useLastActivation = true;
+        break;
       case 'occupancy':
-        serv = this.hapServ.OccupancySensor
-        this.char = this.hapChar.OccupancyDetected
-        eveType = 'motion'
-        break
+        serv = this.hapServ.OccupancySensor;
+        this.char = this.hapChar.OccupancyDetected;
+        eveType = 'motion';
+        break;
       default:
-        serv = this.hapServ.MotionSensor
-        this.char = this.hapChar.MotionDetected
-        eveType = 'motion'
-        this.useLastActivation = true
-        break
+        serv = this.hapServ.MotionSensor;
+        this.char = this.hapChar.MotionDetected;
+        eveType = 'motion';
+        this.useLastActivation = true;
+        break;
     }
 
     // Add the sensor if it doesn't already exist
-    if (!(this.service = this.accessory.getService(serv))) {
-      this.service = this.accessory.addService(serv)
+    this.service = this.accessory.getService(serv);
+    if (!this.service) {
+      this.service = this.accessory.addService(serv);
       if (this.useLastActivation) {
-        this.service.addCharacteristic(this.eveChar.LastActivation)
+        this.service.addCharacteristic(this.eveChar.LastActivation);
       }
     }
 
     // Set up the device type and power readings if necessary
-    if (platform.consts.devices.switchSingle.includes(this.accessory.context.eweUIID)) {
-      this.setup = 'switchSingle'
-    } else if (platform.consts.devices.switchSinglePower.includes(this.accessory.context.eweUIID)) {
-      this.setup = 'switchSingle'
+    if (platformConsts.devices.switchSingle.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'switchSingle';
+    } else if (platformConsts.devices.switchSinglePower.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'switchSingle';
 
       // Add Eve power characteristics
-      this.powerReadings = true
+      this.powerReadings = true;
       if (!this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
-        this.service.addCharacteristic(this.eveChar.CurrentConsumption)
+        this.service.addCharacteristic(this.eveChar.CurrentConsumption);
       }
       if (this.accessory.context.eweUIID === 32) {
         if (!this.service.testCharacteristic(this.eveChar.ElectricCurrent)) {
-          this.service.addCharacteristic(this.eveChar.ElectricCurrent)
+          this.service.addCharacteristic(this.eveChar.ElectricCurrent);
         }
         if (!this.service.testCharacteristic(this.eveChar.Voltage)) {
-          this.service.addCharacteristic(this.eveChar.Voltage)
+          this.service.addCharacteristic(this.eveChar.Voltage);
         }
       }
-    } else if (platform.consts.devices.switchMulti.includes(this.accessory.context.eweUIID)) {
-      this.setup = 'switchMulti'
-      if (platform.consts.devices.switchMultiPower.includes(this.accessory.context.eweUIID)) {
+    } else if (platformConsts.devices.switchMulti.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'switchMulti';
+      if (platformConsts.devices.switchMultiPower.includes(this.accessory.context.eweUIID)) {
         // Add Eve power characteristics
-        this.powerReadings = true
+        this.powerReadings = true;
         if (!this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
-          this.service.addCharacteristic(this.eveChar.CurrentConsumption)
+          this.service.addCharacteristic(this.eveChar.CurrentConsumption);
         }
         if (!this.service.testCharacteristic(this.eveChar.ElectricCurrent)) {
-          this.service.addCharacteristic(this.eveChar.ElectricCurrent)
+          this.service.addCharacteristic(this.eveChar.ElectricCurrent);
         }
         if (!this.service.testCharacteristic(this.eveChar.Voltage)) {
-          this.service.addCharacteristic(this.eveChar.Voltage)
+          this.service.addCharacteristic(this.eveChar.Voltage);
         }
-        this.isDualR3 = true
+        this.isDualR3 = true;
       }
-    } else if (platform.consts.devices.switchSCM.includes(this.accessory.context.eweUIID)) {
-      this.setup = 'switchMulti'
-    } else if (platform.consts.devices.switchSCMPower.includes(this.accessory.context.eweUIID)) {
+    } else if (platformConsts.devices.switchSCM.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'switchMulti';
+    } else if (platformConsts.devices.switchSCMPower.includes(this.accessory.context.eweUIID)) {
       // Could do power here
-      this.setup = 'switchMulti'
+      this.setup = 'switchMulti';
     }
 
     // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
     if (!platform.config.disableNoResponse) {
       this.service.getCharacteristic(this.char).onGet(() => {
         if (!this.isOnline) {
-          throw new this.hapErr(-70402)
+          throw new this.hapErr(-70402);
         }
-        return this.service.getCharacteristic(this.char).value
-      })
+        return this.service.getCharacteristic(this.char).value;
+      });
     }
 
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new platform.eveService(eveType, this.accessory, {
-      log: platform.config.debugFakegato ? this.log : () => {}
-    })
+      log: platform.config.debugFakegato ? this.log : () => {},
+    });
 
     // Set up an interval to get eWeLink to send power updates
     if (
-      this.powerReadings &&
-      (!this.isDualR3 || (this.isDualR3 && platform.config.mode !== 'lan'))
+      this.powerReadings
+      && (!this.isDualR3 || (this.isDualR3 && platform.config.mode !== 'lan'))
     ) {
       setTimeout(() => {
-        this.internalUIUpdate()
-        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
-      }, 5000)
+        this.internalUIUpdate();
+        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000);
+      }, 5000);
 
       // Stop the intervals on Homebridge shutdown
-      platform.api.on('shutdown', () => clearInterval(this.intervalPoll))
+      platform.api.on('shutdown', () => clearInterval(this.intervalPoll));
     }
 
     // Output the customised options to the log
+    const normalLogging = this.enableLogging ? 'standard' : 'disable';
     const opts = JSON.stringify({
-      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
+      logging: this.enableDebugLogging ? 'debug' : normalLogging,
       sensorType: this.sensorType,
-      showAs: 'sensor'
-    })
-    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
+      showAs: 'sensor',
+    });
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts);
   }
 
-  async internalUIUpdate () {
+  async internalUIUpdate() {
     try {
       // Skip polling if device isn't online
       if (!this.isOnline) {
-        return
+        return;
       }
 
       // Send the params to request the updates
       if (this.isDualR3) {
-        await this.platform.sendDeviceUpdate(this.accessory, { uiActive: { outlet: 0, time: 120 } })
+        await this.platform.sendDeviceUpdate(this.accessory, { uiActive: { outlet: 0, time: 120 } });
       } else {
-        await this.platform.sendDeviceUpdate(this.accessory, { uiActive: 120 })
+        await this.platform.sendDeviceUpdate(this.accessory, { uiActive: 120 });
       }
     } catch (err) {
       // Suppress errors here
     }
   }
 
-  async externalUpdate (params) {
+  async externalUpdate(params) {
     try {
       if (
-        (this.setup === 'switchMulti' && params.switches) ||
-        (this.setup === 'switchSingle' && params.switch)
+        (this.setup === 'switchMulti' && params.switches)
+        || (this.setup === 'switchSingle' && params.switch)
       ) {
-        let newState
+        let newState;
         if (this.setup === 'switchMulti' && params.switches) {
-          newState = params.switches[0].switch
+          newState = params.switches[0].switch;
         } else if (this.setup === 'switchSingle' && params.switch) {
-          newState = params.switch
+          newState = params.switch;
         }
         if (newState && newState !== this.cacheState) {
-          this.cacheState = newState
+          this.cacheState = newState;
           if (this.cacheState === 'on') {
-            this.service.updateCharacteristic(this.char, 1)
-            this.accessory.eveService.addEntry({ status: 1 })
+            this.service.updateCharacteristic(this.char, 1);
+            this.accessory.eveService.addEntry({ status: 1 });
             if (this.useLastActivation) {
-              const initialTime = this.accessory.eveService.getInitialTime()
+              const initialTime = this.accessory.eveService.getInitialTime();
               this.service.updateCharacteristic(
                 this.eveChar.LastActivation,
-                Math.round(new Date().valueOf() / 1000) - initialTime
-              )
+                Math.round(new Date().valueOf() / 1000) - initialTime,
+              );
             }
           } else {
-            this.service.updateCharacteristic(this.char, 0)
-            this.accessory.eveService.addEntry({ status: 0 })
+            this.service.updateCharacteristic(this.char, 0);
+            this.accessory.eveService.addEntry({ status: 0 });
           }
           if (params.updateSource && this.enableLogging) {
             this.log(
               '[%s] %s [%s].',
               this.name,
               this.lang.curState,
-              this.cacheState === 'on' ? this.lang.sensorYes : this.lang.sensorNo
-            )
+              this.cacheState === 'on' ? this.lang.sensorYes : this.lang.sensorNo,
+            );
           }
         }
       }
 
       // Get the power readings given by certain devices
       if (!this.powerReadings) {
-        return
+        return;
       }
-      let logger = false
-      let power
-      let voltage
-      let current
-      if (this.funcs.hasProperty(params, 'actPow_00')) {
-        power = parseInt(params.actPow_00) / 100
-        this.service.updateCharacteristic(this.eveChar.CurrentConsumption, power)
-        logger = true
-      } else if (this.funcs.hasProperty(params, 'power')) {
-        power = parseFloat(params.power)
-        this.service.updateCharacteristic(this.eveChar.CurrentConsumption, power)
-        logger = true
+      let logger = false;
+      let power;
+      let voltage;
+      let current;
+      if (hasProperty(params, 'actPow_00')) {
+        power = parseInt(params.actPow_00, 10) / 100;
+        this.service.updateCharacteristic(this.eveChar.CurrentConsumption, power);
+        logger = true;
+      } else if (hasProperty(params, 'power')) {
+        power = parseFloat(params.power);
+        this.service.updateCharacteristic(this.eveChar.CurrentConsumption, power);
+        logger = true;
       }
-      if (this.funcs.hasProperty(params, 'voltage_00')) {
-        voltage = parseInt(params.voltage_00) / 100
-        this.service.updateCharacteristic(this.eveChar.Voltage, voltage)
-        logger = true
-      } else if (this.funcs.hasProperty(params, 'voltage')) {
-        voltage = parseFloat(params.voltage)
-        this.service.updateCharacteristic(this.eveChar.Voltage, voltage)
-        logger = true
+      if (hasProperty(params, 'voltage_00')) {
+        voltage = parseInt(params.voltage_00, 10) / 100;
+        this.service.updateCharacteristic(this.eveChar.Voltage, voltage);
+        logger = true;
+      } else if (hasProperty(params, 'voltage')) {
+        voltage = parseFloat(params.voltage);
+        this.service.updateCharacteristic(this.eveChar.Voltage, voltage);
+        logger = true;
       }
-      if (this.funcs.hasProperty(params, 'current_00')) {
-        current = parseInt(params.current_00) / 100
-        this.service.updateCharacteristic(this.eveChar.ElectricCurrent, current)
-        logger = true
-      } else if (this.funcs.hasProperty(params, 'current')) {
-        current = parseFloat(params.current)
-        this.service.updateCharacteristic(this.eveChar.ElectricCurrent, current)
-        logger = true
+      if (hasProperty(params, 'current_00')) {
+        current = parseInt(params.current_00, 10) / 100;
+        this.service.updateCharacteristic(this.eveChar.ElectricCurrent, current);
+        logger = true;
+      } else if (hasProperty(params, 'current')) {
+        current = parseFloat(params.current);
+        this.service.updateCharacteristic(this.eveChar.ElectricCurrent, current);
+        logger = true;
       }
       if (params.updateSource && logger && this.enableLogging) {
         this.log(
           '[%s] %s%s%s.',
           this.name,
-          power !== undefined ? this.lang.curPower + ' [' + power + 'W]' : '',
-          voltage !== undefined ? ' ' + this.lang.curVolt + ' [' + voltage + 'V]' : '',
-          current !== undefined ? ' ' + this.lang.curCurr + ' [' + current + 'A]' : ''
-        )
+          power !== undefined ? `${this.lang.curPower} [${power}W]` : '',
+          voltage !== undefined ? ` ${this.lang.curVolt} [${voltage}V]` : '',
+          current !== undefined ? ` ${this.lang.curCurr} [${current}A]` : '',
+        );
       }
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, false)
+      this.platform.deviceUpdateError(this.accessory, err, false);
     }
   }
 
-  markStatus (isOnline) {
-    this.isOnline = isOnline
+  markStatus(isOnline) {
+    this.isOnline = isOnline;
   }
 }
diff --git a/lib/device/simulation/switch-valve.js b/lib/device/simulation/switch-valve.js
index 25eb3bfb..b47ddc3a 100644
--- a/lib/device/simulation/switch-valve.js
+++ b/lib/device/simulation/switch-valve.js
@@ -1,350 +1,351 @@
-/* jshint node: true, esversion: 10, -W014, -W033 */
-/* eslint-disable new-cap */
-'use strict'
+import platformConsts from '../../utils/constants.js';
+import { hasProperty, sleep } from '../../utils/functions.js';
 
-module.exports = class deviceSwitchValve {
-  constructor (platform, accessory) {
+export default class {
+  constructor(platform, accessory) {
     // Set up variables from the platform
-    this.eveChar = platform.eveChar
-    this.funcs = platform.funcs
-    this.hapChar = platform.api.hap.Characteristic
-    this.hapErr = platform.api.hap.HapStatusError
-    this.hapServ = platform.api.hap.Service
-    this.lang = platform.lang
-    this.log = platform.log
-    this.platform = platform
+    this.eveChar = platform.eveChar;
+    this.hapChar = platform.api.hap.Characteristic;
+    this.hapErr = platform.api.hap.HapStatusError;
+    this.hapServ = platform.api.hap.Service;
+    this.lang = platform.lang;
+    this.log = platform.log;
+    this.platform = platform;
 
     // Set up variables from the accessory
-    this.name = accessory.displayName
-    this.accessory = accessory
+    this.name = accessory.displayName;
+    this.accessory = accessory;
 
     // Initially set the online flag as true (to be then updated as false if necessary)
-    this.isOnline = true
+    this.isOnline = true;
 
     // Set up custom variables for this device type
-    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId] || {};
 
     // Set the correct logging variables for this accessory
-    this.enableLogging = !platform.config.disableDeviceLogging
-    this.enableDebugLogging = platform.config.debug
-    if (deviceConf && deviceConf.overrideLogging) {
-      switch (deviceConf.overrideLogging) {
-        case 'standard':
-          this.enableLogging = true
-          this.enableDebugLogging = false
-          break
-        case 'debug':
-          this.enableLogging = true
-          this.enableDebugLogging = true
-          break
-        case 'disable':
-          this.enableLogging = false
-          this.enableDebugLogging = false
-          break
-      }
+    switch (deviceConf.overrideLogging) {
+      case 'standard':
+        this.enableLogging = true;
+        this.enableDebugLogging = false;
+        break;
+      case 'debug':
+        this.enableLogging = true;
+        this.enableDebugLogging = true;
+        break;
+      case 'disable':
+        this.enableLogging = false;
+        this.enableDebugLogging = false;
+        break;
+      default:
+        this.enableLogging = !platform.config.disableDeviceLogging;
+        this.enableDebugLogging = platform.config.debug;
+        break;
     }
 
     // Add the switch service if it doesn't already exist
-    this.sService =
-      this.accessory.getService(this.hapServ.Switch) ||
-      this.accessory.addService(this.hapServ.Switch)
+    this.sService = this.accessory.getService(this.hapServ.Switch)
+      || this.accessory.addService(this.hapServ.Switch);
 
     // Add the valve service if it doesn't already exist
-    if (!(this.vService = this.accessory.getService(this.hapServ.Valve))) {
-      this.vService = this.accessory.addService(this.hapServ.Valve)
-      this.vService.updateCharacteristic(this.hapChar.Active, 0)
-      this.vService.updateCharacteristic(this.hapChar.InUse, 0)
-      this.vService.updateCharacteristic(this.hapChar.ValveType, 1)
-      this.vService.updateCharacteristic(this.hapChar.SetDuration, 120)
-      this.vService.addCharacteristic(this.hapChar.RemainingDuration)
+    this.vService = this.accessory.getService(this.hapServ.Valve);
+    if (!this.vService) {
+      this.vService = this.accessory.addService(this.hapServ.Valve);
+      this.vService.updateCharacteristic(this.hapChar.Active, 0);
+      this.vService.updateCharacteristic(this.hapChar.InUse, 0);
+      this.vService.updateCharacteristic(this.hapChar.ValveType, 1);
+      this.vService.updateCharacteristic(this.hapChar.SetDuration, 120);
+      this.vService.addCharacteristic(this.hapChar.RemainingDuration);
     }
 
     // Certain devices give power readings
-    if (platform.consts.devices.switchMultiPower.includes(this.accessory.context.eweUIID)) {
+    if (platformConsts.devices.switchMultiPower.includes(this.accessory.context.eweUIID)) {
       // Add Eve power characteristics
-      this.powerReadings = true
+      this.powerReadings = true;
       if (!this.sService.testCharacteristic(this.eveChar.CurrentConsumption)) {
-        this.sService.addCharacteristic(this.eveChar.CurrentConsumption)
+        this.sService.addCharacteristic(this.eveChar.CurrentConsumption);
       }
       if (!this.vService.testCharacteristic(this.eveChar.CurrentConsumption)) {
-        this.vService.addCharacteristic(this.eveChar.CurrentConsumption)
+        this.vService.addCharacteristic(this.eveChar.CurrentConsumption);
       }
       if (!this.sService.testCharacteristic(this.eveChar.ElectricCurrent)) {
-        this.sService.addCharacteristic(this.eveChar.ElectricCurrent)
+        this.sService.addCharacteristic(this.eveChar.ElectricCurrent);
       }
       if (!this.vService.testCharacteristic(this.eveChar.ElectricCurrent)) {
-        this.vService.addCharacteristic(this.eveChar.ElectricCurrent)
+        this.vService.addCharacteristic(this.eveChar.ElectricCurrent);
       }
       if (!this.sService.testCharacteristic(this.eveChar.Voltage)) {
-        this.sService.addCharacteristic(this.eveChar.Voltage)
+        this.sService.addCharacteristic(this.eveChar.Voltage);
       }
       if (!this.vService.testCharacteristic(this.eveChar.Voltage)) {
-        this.vService.addCharacteristic(this.eveChar.Voltage)
+        this.vService.addCharacteristic(this.eveChar.Voltage);
       }
     }
 
     // Add the set handler to the switch on/off characteristic
     this.sService
       .getCharacteristic(this.hapChar.On)
-      .onSet(async value => await this.internalSwitchUpdate(value))
+      .onSet(async (value) => this.internalSwitchUpdate(value));
 
     // Add the set handler to the valve active characteristic
     this.vService
       .getCharacteristic(this.hapChar.Active)
-      .onSet(async value => await this.internalValveUpdate(value))
+      .onSet(async (value) => this.internalValveUpdate(value));
 
     // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
     if (!platform.config.disableNoResponse) {
       this.sService.getCharacteristic(this.hapChar.On).onGet(() => {
         if (!this.isOnline) {
-          throw new this.hapErr(-70402)
+          throw new this.hapErr(-70402);
         }
-        return this.sService.getCharacteristic(this.hapChar.On).value
-      })
+        return this.sService.getCharacteristic(this.hapChar.On).value;
+      });
       this.vService.getCharacteristic(this.hapChar.Active).onGet(() => {
         if (!this.isOnline) {
-          throw new this.hapErr(-70402)
+          throw new this.hapErr(-70402);
         }
-        return this.vService.getCharacteristic(this.hapChar.Active).value
-      })
+        return this.vService.getCharacteristic(this.hapChar.Active).value;
+      });
     }
 
     // Add the set handler to the valve set duration characteristic
-    this.vService.getCharacteristic(this.hapChar.SetDuration).onSet(value => {
+    this.vService.getCharacteristic(this.hapChar.SetDuration).onSet((value) => {
       // Check if the valve is currently active
       if (this.vService.getCharacteristic(this.hapChar.InUse).value === 1) {
         // Update the remaining duration characteristic with the new value
-        this.vService.updateCharacteristic(this.hapChar.RemainingDuration, value)
+        this.vService.updateCharacteristic(this.hapChar.RemainingDuration, value);
 
         // Clear any existing active timers
-        clearTimeout(this.timer)
+        clearTimeout(this.timer);
 
         // Set a new active timer with the new time amount
         this.timer = setTimeout(
           () => this.vService.updateCharacteristic(this.hapChar.Active, 0),
-          value * 1000
-        )
+          value * 1000,
+        );
       }
-    })
+    });
 
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new platform.eveService('switch', this.accessory, {
-      log: platform.config.debugFakegato ? this.log : () => {}
-    })
+      log: platform.config.debugFakegato ? this.log : () => {},
+    });
 
     // Set up an interval to get eWeLink to send power updates
     if (this.powerReadings && platform.config.mode !== 'lan') {
       setTimeout(() => {
-        this.internalUIUpdate()
-        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
-      }, 5000)
+        this.internalUIUpdate();
+        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000);
+      }, 5000);
 
       // Stop the intervals on Homebridge shutdown
-      platform.api.on('shutdown', () => clearInterval(this.intervalPoll))
+      platform.api.on('shutdown', () => clearInterval(this.intervalPoll));
     }
 
     // Output the customised options to the log
+    const normalLogging = this.enableLogging ? 'standard' : 'disable';
     const opts = JSON.stringify({
-      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
-      showAs: 'switch_valve'
-    })
-    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
+      logging: this.enableDebugLogging ? 'debug' : normalLogging,
+      showAs: 'switch_valve',
+    });
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts);
   }
 
-  async internalSwitchUpdate (value) {
+  async internalSwitchUpdate(value) {
     try {
       const params = {
         switches: [
           {
             switch: value ? 'on' : 'off',
-            outlet: 0
-          }
-        ]
-      }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.cacheState = value ? 'on' : 'off'
-      this.accessory.eveService.addEntry({ status: value ? 1 : 0 })
+            outlet: 0,
+          },
+        ],
+      };
+      await this.platform.sendDeviceUpdate(this.accessory, params);
+      this.cacheState = value ? 'on' : 'off';
+      this.accessory.eveService.addEntry({ status: value ? 1 : 0 });
       if (this.enableLogging) {
-        this.log('[%s] [switch] %s [%s].', this.name, this.lang.curState, this.cacheState)
+        this.log('[%s] [switch] %s [%s].', this.name, this.lang.curState, this.cacheState);
       }
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true);
       setTimeout(() => {
-        this.sService.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
-      }, 2000)
-      throw new this.hapErr(-70402)
+        this.sService.updateCharacteristic(this.hapChar.On, this.cacheState === 'on');
+      }, 2000);
+      throw new this.hapErr(-70402);
     }
   }
 
-  async internalValveUpdate (value) {
+  async internalValveUpdate(value) {
     try {
       const params = {
         switches: [
           {
             switch: value ? 'on' : 'off',
-            outlet: 1
-          }
-        ]
-      }
-      this.vService.updateCharacteristic(this.hapChar.InUse, value)
+            outlet: 1,
+          },
+        ],
+      };
+      this.vService.updateCharacteristic(this.hapChar.InUse, value);
       switch (value) {
         case 0:
-          this.vService.updateCharacteristic(this.hapChar.RemainingDuration, 0)
-          clearTimeout(this.timer)
+          this.vService.updateCharacteristic(this.hapChar.RemainingDuration, 0);
+          clearTimeout(this.timer);
           if (this.enableLogging) {
-            this.log('[%s] [valve] %s [%s].', this.name, this.lang.curState, this.lang.valveNo)
+            this.log('[%s] [valve] %s [%s].', this.name, this.lang.curState, this.lang.valveNo);
           }
-          break
+          break;
         case 1: {
-          const timer = this.vService.getCharacteristic(this.hapChar.SetDuration).value
-          this.vService.updateCharacteristic(this.hapChar.RemainingDuration, timer)
+          const timer = this.vService.getCharacteristic(this.hapChar.SetDuration).value;
+          this.vService.updateCharacteristic(this.hapChar.RemainingDuration, timer);
           if (this.enableLogging) {
-            this.log('[%s] [valve] %s [%s].', this.name, this.lang.curState, this.lang.valveYes)
+            this.log('[%s] [valve] %s [%s].', this.name, this.lang.curState, this.lang.valveYes);
           }
           this.timer = setTimeout(() => {
-            this.vService.updateCharacteristic(this.hapChar.Active, 0)
-          }, timer * 1000)
-          break
+            this.vService.updateCharacteristic(this.hapChar.Active, 0);
+          }, timer * 1000);
+          break;
         }
+        default:
+          return;
       }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
+      await this.platform.sendDeviceUpdate(this.accessory, params);
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true);
       setTimeout(() => {
-        this.sService.updateCharacteristic(this.hapChar.Active, 0)
-      }, 2000)
-      throw new this.hapErr(-70402)
+        this.sService.updateCharacteristic(this.hapChar.Active, 0);
+      }, 2000);
+      throw new this.hapErr(-70402);
     }
   }
 
-  async internalUIUpdate () {
+  async internalUIUpdate() {
     try {
       // Skip polling if device isn't online
       if (!this.isOnline) {
-        return
+        return;
       }
 
       // Send the params to request the updates
-      await this.platform.sendDeviceUpdate(this.accessory, { uiActive: { outlet: 0, time: 120 } })
-      await this.funcs.sleep(2000)
-      await this.platform.sendDeviceUpdate(this.accessory, { uiActive: { outlet: 1, time: 120 } })
+      await this.platform.sendDeviceUpdate(this.accessory, { uiActive: { outlet: 0, time: 120 } });
+      await sleep(2000);
+      await this.platform.sendDeviceUpdate(this.accessory, { uiActive: { outlet: 1, time: 120 } });
     } catch (err) {
       // Suppress errors here
     }
   }
 
-  async externalUpdate (params) {
+  async externalUpdate(params) {
     try {
       if (params.switches) {
         if (this.cacheState !== params.switches[0].switch) {
-          this.cacheState = params.switches[0].switch
-          this.sService.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
-          this.accessory.eveService.addEntry({ status: this.cacheState === 'on' ? 1 : 0 })
+          this.cacheState = params.switches[0].switch;
+          this.sService.updateCharacteristic(this.hapChar.On, this.cacheState === 'on');
+          this.accessory.eveService.addEntry({ status: this.cacheState === 'on' ? 1 : 0 });
           if (params.updateSource && this.enableLogging) {
-            this.log('[%s] [switch] %s [%s].', this.name, this.lang.curState, this.cacheState)
+            this.log('[%s] [switch] %s [%s].', this.name, this.lang.curState, this.cacheState);
           }
         }
         if (params.switches[1].switch === 'on') {
           if (this.vService.getCharacteristic(this.hapChar.Active).value === 0) {
-            const timer = this.vService.getCharacteristic(this.hapChar.SetDuration).value
-            this.vService.updateCharacteristic(this.hapChar.Active, 1)
-            this.vService.updateCharacteristic(this.hapChar.InUse, 1)
-            this.vService.updateCharacteristic(this.hapChar.RemainingDuration, timer)
+            const timer = this.vService.getCharacteristic(this.hapChar.SetDuration).value;
+            this.vService.updateCharacteristic(this.hapChar.Active, 1);
+            this.vService.updateCharacteristic(this.hapChar.InUse, 1);
+            this.vService.updateCharacteristic(this.hapChar.RemainingDuration, timer);
             if (params.updateSource && this.enableLogging) {
-              this.log('[%s] [valve] %s [%s].', this.name, this.lang.curState, this.lang.valveYes)
+              this.log('[%s] [valve] %s [%s].', this.name, this.lang.curState, this.lang.valveYes);
             }
             this.timer = setTimeout(() => {
-              this.vService.updateCharacteristic(this.hapChar.Active, 0)
-            }, timer * 1000)
+              this.vService.updateCharacteristic(this.hapChar.Active, 0);
+            }, timer * 1000);
           }
         } else {
-          this.vService.updateCharacteristic(this.hapChar.Active, 0)
-          this.vService.updateCharacteristic(this.hapChar.InUse, 0)
-          this.vService.updateCharacteristic(this.hapChar.RemainingDuration, 0)
-          clearTimeout(this.timer)
+          this.vService.updateCharacteristic(this.hapChar.Active, 0);
+          this.vService.updateCharacteristic(this.hapChar.InUse, 0);
+          this.vService.updateCharacteristic(this.hapChar.RemainingDuration, 0);
+          clearTimeout(this.timer);
         }
       }
 
       // Get the power readings given by certain devices
       if (!this.powerReadings) {
-        return
+        return;
       }
-      let logger0 = false
-      let logger1 = false
-      let power0
-      let power1
-      let voltage0
-      let voltage1
-      let current0
-      let current1
-      if (this.funcs.hasProperty(params, 'actPow_00')) {
-        power0 = parseInt(params.actPow_00) / 100
-        this.sService.updateCharacteristic(this.eveChar.CurrentConsumption, power0)
-        logger0 = true
+      let logger0 = false;
+      let logger1 = false;
+      let power0;
+      let power1;
+      let voltage0;
+      let voltage1;
+      let current0;
+      let current1;
+      if (hasProperty(params, 'actPow_00')) {
+        power0 = parseInt(params.actPow_00, 10) / 100;
+        this.sService.updateCharacteristic(this.eveChar.CurrentConsumption, power0);
+        logger0 = true;
       }
-      if (this.funcs.hasProperty(params, 'actPow_01')) {
-        power1 = parseInt(params.actPow_01) / 100
-        this.vService.updateCharacteristic(this.eveChar.CurrentConsumption, power1)
-        logger1 = true
+      if (hasProperty(params, 'actPow_01')) {
+        power1 = parseInt(params.actPow_01, 10) / 100;
+        this.vService.updateCharacteristic(this.eveChar.CurrentConsumption, power1);
+        logger1 = true;
       }
-      if (this.funcs.hasProperty(params, 'voltage_00')) {
-        voltage0 = parseInt(params.voltage_00) / 100
-        this.sService.updateCharacteristic(this.eveChar.Voltage, voltage0)
-        logger0 = true
+      if (hasProperty(params, 'voltage_00')) {
+        voltage0 = parseInt(params.voltage_00, 10) / 100;
+        this.sService.updateCharacteristic(this.eveChar.Voltage, voltage0);
+        logger0 = true;
       }
-      if (this.funcs.hasProperty(params, 'voltage_01')) {
-        voltage1 = parseInt(params.voltage_01) / 100
-        this.vService.updateCharacteristic(this.eveChar.Voltage, voltage1)
-        logger1 = true
+      if (hasProperty(params, 'voltage_01')) {
+        voltage1 = parseInt(params.voltage_01, 10) / 100;
+        this.vService.updateCharacteristic(this.eveChar.Voltage, voltage1);
+        logger1 = true;
       }
-      if (this.funcs.hasProperty(params, 'current_00')) {
-        current0 = parseInt(params.current_00) / 100
-        this.sService.updateCharacteristic(this.eveChar.ElectricCurrent, current0)
-        logger0 = true
+      if (hasProperty(params, 'current_00')) {
+        current0 = parseInt(params.current_00, 10) / 100;
+        this.sService.updateCharacteristic(this.eveChar.ElectricCurrent, current0);
+        logger0 = true;
       }
-      if (this.funcs.hasProperty(params, 'current_01')) {
-        current1 = parseInt(params.current_01) / 100
-        this.vService.updateCharacteristic(this.eveChar.ElectricCurrent, current1)
-        logger1 = true
+      if (hasProperty(params, 'current_01')) {
+        current1 = parseInt(params.current_01, 10) / 100;
+        this.vService.updateCharacteristic(this.eveChar.ElectricCurrent, current1);
+        logger1 = true;
       }
       if (params.updateSource && this.enableLogging) {
         if (logger0) {
           this.log(
             '[%s] [switch] %s%s%s.',
             this.name,
-            power0 !== undefined ? this.lang.curPower + ' [' + power0 + 'W]' : '',
-            voltage0 !== undefined ? ' ' + this.lang.curVolt + ' [' + voltage0 + 'V]' : '',
-            current0 !== undefined ? ' ' + this.lang.curCurr + ' [' + current0 + 'A]' : ''
-          )
+            power0 !== undefined ? `${this.lang.curPower} [${power0}W]` : '',
+            voltage0 !== undefined ? ` ${this.lang.curVolt} [${voltage0}V]` : '',
+            current0 !== undefined ? ` ${this.lang.curCurr} [${current0}A]` : '',
+          );
         }
         if (logger1) {
           this.log(
             '[%s] [valve] %s%s%s.',
             this.name,
-            power1 !== undefined ? this.lang.curPower + ' [' + power1 + 'W]' : '',
-            voltage1 !== undefined ? ' ' + this.lang.curVolt + ' [' + voltage1 + 'V]' : '',
-            current1 !== undefined ? ' ' + this.lang.curCurr + ' [' + current1 + 'A]' : ''
-          )
+            power1 !== undefined ? `${this.lang.curPower} [${power1}W]` : '',
+            voltage1 !== undefined ? ` ${this.lang.curVolt} [${voltage1}V]` : '',
+            current1 !== undefined ? ` ${this.lang.curCurr} [${current1}A]` : '',
+          );
         }
       }
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, false)
+      this.platform.deviceUpdateError(this.accessory, err, false);
     }
   }
 
-  currentState () {
+  currentState() {
     return {
       services: ['switch', 'valve'],
       switch: {
-        state: this.sService.getCharacteristic(this.hapChar.On).value ? 'on' : 'off'
+        state: this.sService.getCharacteristic(this.hapChar.On).value ? 'on' : 'off',
       },
       valve: {
-        state: this.vService.getCharacteristic(this.hapChar.Active).value === 1 ? 'on' : 'off'
-      }
-    }
+        state: this.vService.getCharacteristic(this.hapChar.Active).value === 1 ? 'on' : 'off',
+      },
+    };
   }
 
-  markStatus (isOnline) {
-    this.isOnline = isOnline
+  markStatus(isOnline) {
+    this.isOnline = isOnline;
   }
 }
diff --git a/lib/device/simulation/tap-one.js b/lib/device/simulation/tap-one.js
index eb8a53d0..b09c79f7 100644
--- a/lib/device/simulation/tap-one.js
+++ b/lib/device/simulation/tap-one.js
@@ -1,283 +1,283 @@
-/* jshint node: true, esversion: 10, -W014, -W033 */
-/* eslint-disable new-cap */
-'use strict'
+import platformConsts from '../../utils/constants.js';
+import { hasProperty } from '../../utils/functions.js';
 
-module.exports = class deviceTapOne {
-  constructor (platform, accessory) {
+export default class {
+  constructor(platform, accessory) {
     // Set up variables from the platform
-    this.eveChar = platform.eveChar
-    this.funcs = platform.funcs
-    this.hapChar = platform.api.hap.Characteristic
-    this.hapErr = platform.api.hap.HapStatusError
-    this.hapServ = platform.api.hap.Service
-    this.lang = platform.lang
-    this.log = platform.log
-    this.platform = platform
+    this.eveChar = platform.eveChar;
+    this.hapChar = platform.api.hap.Characteristic;
+    this.hapErr = platform.api.hap.HapStatusError;
+    this.hapServ = platform.api.hap.Service;
+    this.lang = platform.lang;
+    this.log = platform.log;
+    this.platform = platform;
 
     // Set up variables from the accessory
-    this.name = accessory.displayName
-    this.accessory = accessory
+    this.name = accessory.displayName;
+    this.accessory = accessory;
 
     // Initially set the online flag as true (to be then updated as false if necessary)
-    this.isOnline = true
+    this.isOnline = true;
 
     // Set up custom variables for this device type
-    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId] || {};
 
     // Set the correct logging variables for this accessory
-    this.enableLogging = !platform.config.disableDeviceLogging
-    this.enableDebugLogging = platform.config.debug
-    if (deviceConf && deviceConf.overrideLogging) {
-      switch (deviceConf.overrideLogging) {
-        case 'standard':
-          this.enableLogging = true
-          this.enableDebugLogging = false
-          break
-        case 'debug':
-          this.enableLogging = true
-          this.enableDebugLogging = true
-          break
-        case 'disable':
-          this.enableLogging = false
-          this.enableDebugLogging = false
-          break
-      }
+    switch (deviceConf.overrideLogging) {
+      case 'standard':
+        this.enableLogging = true;
+        this.enableDebugLogging = false;
+        break;
+      case 'debug':
+        this.enableLogging = true;
+        this.enableDebugLogging = true;
+        break;
+      case 'disable':
+        this.enableLogging = false;
+        this.enableDebugLogging = false;
+        break;
+      default:
+        this.enableLogging = !platform.config.disableDeviceLogging;
+        this.enableDebugLogging = platform.config.debug;
+        break;
     }
 
     // If the accessory has a switch service then remove it
     if (this.accessory.getService(this.hapServ.Switch)) {
-      this.accessory.removeService(this.accessory.getService(this.hapServ.Switch))
+      this.accessory.removeService(this.accessory.getService(this.hapServ.Switch));
     }
 
     // Add the tap service if it doesn't already exist
-    if (!(this.service = this.accessory.getService(this.hapServ.Valve))) {
-      this.service = this.accessory.addService(this.hapServ.Valve)
-      this.service.updateCharacteristic(this.hapChar.Active, 0)
-      this.service.updateCharacteristic(this.hapChar.InUse, 0)
-      this.service.updateCharacteristic(this.hapChar.ValveType, 3)
+    this.service = this.accessory.getService(this.hapServ.Valve);
+    if (!this.service) {
+      this.service = this.accessory.addService(this.hapServ.Valve);
+      this.service.updateCharacteristic(this.hapChar.Active, 0);
+      this.service.updateCharacteristic(this.hapChar.InUse, 0);
+      this.service.updateCharacteristic(this.hapChar.ValveType, 3);
     }
 
     // Set up the device type and power readings if necessary
-    if (platform.consts.devices.switchSingle.includes(this.accessory.context.eweUIID)) {
-      this.setup = 'switchSingle'
-    } else if (platform.consts.devices.switchSinglePower.includes(this.accessory.context.eweUIID)) {
-      this.setup = 'switchSingle'
+    if (platformConsts.devices.switchSingle.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'switchSingle';
+    } else if (platformConsts.devices.switchSinglePower.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'switchSingle';
 
       // Add Eve power characteristics
-      this.powerReadings = true
+      this.powerReadings = true;
       if (!this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
-        this.service.addCharacteristic(this.eveChar.CurrentConsumption)
+        this.service.addCharacteristic(this.eveChar.CurrentConsumption);
       }
       if (this.accessory.context.eweUIID === 32) {
         if (!this.service.testCharacteristic(this.eveChar.ElectricCurrent)) {
-          this.service.addCharacteristic(this.eveChar.ElectricCurrent)
+          this.service.addCharacteristic(this.eveChar.ElectricCurrent);
         }
         if (!this.service.testCharacteristic(this.eveChar.Voltage)) {
-          this.service.addCharacteristic(this.eveChar.Voltage)
+          this.service.addCharacteristic(this.eveChar.Voltage);
         }
       }
-    } else if (platform.consts.devices.switchMulti.includes(this.accessory.context.eweUIID)) {
-      this.setup = 'switchMulti'
-      if (platform.consts.devices.switchMultiPower.includes(this.accessory.context.eweUIID)) {
+    } else if (platformConsts.devices.switchMulti.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'switchMulti';
+      if (platformConsts.devices.switchMultiPower.includes(this.accessory.context.eweUIID)) {
         // Add Eve power characteristics
-        this.powerReadings = true
+        this.powerReadings = true;
         if (!this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
-          this.service.addCharacteristic(this.eveChar.CurrentConsumption)
+          this.service.addCharacteristic(this.eveChar.CurrentConsumption);
         }
         if (!this.service.testCharacteristic(this.eveChar.ElectricCurrent)) {
-          this.service.addCharacteristic(this.eveChar.ElectricCurrent)
+          this.service.addCharacteristic(this.eveChar.ElectricCurrent);
         }
         if (!this.service.testCharacteristic(this.eveChar.Voltage)) {
-          this.service.addCharacteristic(this.eveChar.Voltage)
+          this.service.addCharacteristic(this.eveChar.Voltage);
         }
-        this.isDualR3 = true
+        this.isDualR3 = true;
       }
-    } else if (platform.consts.devices.switchSCM.includes(this.accessory.context.eweUIID)) {
-      this.setup = 'switchMulti'
-    } else if (platform.consts.devices.switchSCMPower.includes(this.accessory.context.eweUIID)) {
+    } else if (platformConsts.devices.switchSCM.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'switchMulti';
+    } else if (platformConsts.devices.switchSCMPower.includes(this.accessory.context.eweUIID)) {
       // Could do power here
-      this.setup = 'switchMulti'
+      this.setup = 'switchMulti';
     }
 
     // Add the set handler to the tap active characteristic
-    this.service.getCharacteristic(this.hapChar.Active).onSet(async value => {
-      await this.internalUpdate(value)
-    })
+    this.service.getCharacteristic(this.hapChar.Active).onSet(async (value) => {
+      this.internalUpdate(value);
+    });
 
     // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
     if (!platform.config.disableNoResponse) {
       this.service.getCharacteristic(this.hapChar.Active).onGet(() => {
         if (!this.isOnline) {
-          throw new this.hapErr(-70402)
+          throw new this.hapErr(-70402);
         }
-        return this.service.getCharacteristic(this.hapChar.Active).value
-      })
+        return this.service.getCharacteristic(this.hapChar.Active).value;
+      });
     }
 
     // Set up an interval to get eWeLink to send power updates
     if (
-      this.powerReadings &&
-      (!this.isDualR3 || (this.isDualR3 && platform.config.mode !== 'lan'))
+      this.powerReadings
+      && (!this.isDualR3 || (this.isDualR3 && platform.config.mode !== 'lan'))
     ) {
       setTimeout(() => {
-        this.internalUIUpdate()
-        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
-      }, 5000)
+        this.internalUIUpdate();
+        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000);
+      }, 5000);
 
       // Stop the intervals on Homebridge shutdown
-      platform.api.on('shutdown', () => clearInterval(this.intervalPoll))
+      platform.api.on('shutdown', () => clearInterval(this.intervalPoll));
     }
 
     // Output the customised options to the log
+    const normalLogging = this.enableLogging ? 'standard' : 'disable';
     const opts = JSON.stringify({
-      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
-      showAs: 'tap'
-    })
-    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
+      logging: this.enableDebugLogging ? 'debug' : normalLogging,
+      showAs: 'tap',
+    });
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts);
   }
 
-  async internalUpdate (value) {
+  async internalUpdate(value) {
     try {
-      const params = {}
+      const params = {};
       switch (this.setup) {
         case 'switchSingle':
-          params.switch = value ? 'on' : 'off'
-          break
+          params.switch = value ? 'on' : 'off';
+          break;
         case 'switchMulti':
           params.switches = [
             {
               switch: value ? 'on' : 'off',
-              outlet: 0
-            }
-          ]
-          break
+              outlet: 0,
+            },
+          ];
+          break;
         default:
-          return
+          return;
       }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.cacheState = value ? 'on' : 'off'
-      this.service.updateCharacteristic(this.hapChar.InUse, value)
+      await this.platform.sendDeviceUpdate(this.accessory, params);
+      this.cacheState = value ? 'on' : 'off';
+      this.service.updateCharacteristic(this.hapChar.InUse, value);
       if (this.enableLogging) {
         this.log(
           '[%s] %s [%s].',
           this.name,
           this.lang.curState,
-          value === 1 ? this.lang.valveYes : this.lang.valveNo
-        )
+          value === 1 ? this.lang.valveYes : this.lang.valveNo,
+        );
       }
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true);
       setTimeout(() => {
-        this.service.updateCharacteristic(this.hapChar.Active, this.cacheState === 'on')
-      }, 2000)
-      throw new this.hapErr(-70402)
+        this.service.updateCharacteristic(this.hapChar.Active, this.cacheState === 'on');
+      }, 2000);
+      throw new this.hapErr(-70402);
     }
   }
 
-  async internalUIUpdate () {
+  async internalUIUpdate() {
     try {
       // Skip polling if device isn't online
       if (!this.isOnline) {
-        return
+        return;
       }
 
       // Send the params to request the updates
       if (this.isDualR3) {
-        await this.platform.sendDeviceUpdate(this.accessory, { uiActive: { outlet: 0, time: 120 } })
+        await this.platform.sendDeviceUpdate(this.accessory, { uiActive: { outlet: 0, time: 120 } });
       } else {
-        await this.platform.sendDeviceUpdate(this.accessory, { uiActive: 120 })
+        await this.platform.sendDeviceUpdate(this.accessory, { uiActive: 120 });
       }
     } catch (err) {
       // Suppress errors here
     }
   }
 
-  async externalUpdate (params) {
+  async externalUpdate(params) {
     try {
       if (
-        (this.setup === 'switchMulti' && params.switches) ||
-        (this.setup === 'switchSingle' && params.switch)
+        (this.setup === 'switchMulti' && params.switches)
+        || (this.setup === 'switchSingle' && params.switch)
       ) {
-        let newState
+        let newState;
         if (this.setup === 'switchMulti' && params.switches) {
-          newState = params.switches[0].switch
+          newState = params.switches[0].switch;
         } else if (this.setup === 'switchSingle' && params.switch) {
-          newState = params.switch
+          newState = params.switch;
         }
         if (newState && newState !== this.cacheState) {
-          this.cacheState = newState
-          this.service.updateCharacteristic(this.hapChar.Active, this.cacheState === 'on' ? 1 : 0)
-          this.service.updateCharacteristic(this.hapChar.InUse, this.cacheState === 'on' ? 1 : 0)
+          this.cacheState = newState;
+          this.service.updateCharacteristic(this.hapChar.Active, this.cacheState === 'on' ? 1 : 0);
+          this.service.updateCharacteristic(this.hapChar.InUse, this.cacheState === 'on' ? 1 : 0);
           if (params.updateSource && this.enableLogging) {
             this.log(
               '[%s] %s [%s].',
               this.name,
               this.lang.curState,
-              this.cacheState === 'on' ? this.lang.valveYes : this.lang.valveNo
-            )
+              this.cacheState === 'on' ? this.lang.valveYes : this.lang.valveNo,
+            );
           }
         }
       }
 
       // Get the power readings given by certain devices
       if (!this.powerReadings) {
-        return
+        return;
       }
-      let logger = false
-      let power
-      let voltage
-      let current
-      if (this.funcs.hasProperty(params, 'actPow_00')) {
-        power = parseInt(params.actPow_00) / 100
-        this.service.updateCharacteristic(this.eveChar.CurrentConsumption, power)
-        logger = true
-      } else if (this.funcs.hasProperty(params, 'power')) {
-        power = parseFloat(params.power)
-        this.service.updateCharacteristic(this.eveChar.CurrentConsumption, power)
-        logger = true
+      let logger = false;
+      let power;
+      let voltage;
+      let current;
+      if (hasProperty(params, 'actPow_00')) {
+        power = parseInt(params.actPow_00, 10) / 100;
+        this.service.updateCharacteristic(this.eveChar.CurrentConsumption, power);
+        logger = true;
+      } else if (hasProperty(params, 'power')) {
+        power = parseFloat(params.power);
+        this.service.updateCharacteristic(this.eveChar.CurrentConsumption, power);
+        logger = true;
       }
-      if (this.funcs.hasProperty(params, 'voltage_00')) {
-        voltage = parseInt(params.voltage_00) / 100
-        this.service.updateCharacteristic(this.eveChar.Voltage, voltage)
-        logger = true
-      } else if (this.funcs.hasProperty(params, 'voltage')) {
-        voltage = parseFloat(params.voltage)
-        this.service.updateCharacteristic(this.eveChar.Voltage, voltage)
-        logger = true
+      if (hasProperty(params, 'voltage_00')) {
+        voltage = parseInt(params.voltage_00, 10) / 100;
+        this.service.updateCharacteristic(this.eveChar.Voltage, voltage);
+        logger = true;
+      } else if (hasProperty(params, 'voltage')) {
+        voltage = parseFloat(params.voltage);
+        this.service.updateCharacteristic(this.eveChar.Voltage, voltage);
+        logger = true;
       }
-      if (this.funcs.hasProperty(params, 'current_00')) {
-        current = parseInt(params.current_00) / 100
-        this.service.updateCharacteristic(this.eveChar.ElectricCurrent, current)
-        logger = true
-      } else if (this.funcs.hasProperty(params, 'current')) {
-        current = parseFloat(params.current)
-        this.service.updateCharacteristic(this.eveChar.ElectricCurrent, current)
-        logger = true
+      if (hasProperty(params, 'current_00')) {
+        current = parseInt(params.current_00, 10) / 100;
+        this.service.updateCharacteristic(this.eveChar.ElectricCurrent, current);
+        logger = true;
+      } else if (hasProperty(params, 'current')) {
+        current = parseFloat(params.current);
+        this.service.updateCharacteristic(this.eveChar.ElectricCurrent, current);
+        logger = true;
       }
       if (params.updateSource && logger && this.enableLogging) {
         this.log(
           '[%s] %s%s%s.',
           this.name,
-          power !== undefined ? this.lang.curPower + ' [' + power + 'W]' : '',
-          voltage !== undefined ? ' ' + this.lang.curVolt + ' [' + voltage + 'V]' : '',
-          current !== undefined ? ' ' + this.lang.curCurr + ' [' + current + 'A]' : ''
-        )
+          power !== undefined ? `${this.lang.curPower} [${power}W]` : '',
+          voltage !== undefined ? ` ${this.lang.curVolt} [${voltage}V]` : '',
+          current !== undefined ? ` ${this.lang.curCurr} [${current}A]` : '',
+        );
       }
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, false)
+      this.platform.deviceUpdateError(this.accessory, err, false);
     }
   }
 
-  currentState () {
+  currentState() {
     return {
       services: ['valve'],
       valve: {
-        state: this.service.getCharacteristic(this.hapChar.Active).value === 1 ? 'on' : 'off'
-      }
-    }
+        state: this.service.getCharacteristic(this.hapChar.Active).value === 1 ? 'on' : 'off',
+      },
+    };
   }
 
-  markStatus (isOnline) {
-    this.isOnline = isOnline
+  markStatus(isOnline) {
+    this.isOnline = isOnline;
   }
 }
diff --git a/lib/device/simulation/tap-two.js b/lib/device/simulation/tap-two.js
index 75bdb15f..bd84900d 100644
--- a/lib/device/simulation/tap-two.js
+++ b/lib/device/simulation/tap-two.js
@@ -1,265 +1,266 @@
-/* jshint node: true, esversion: 10, -W014, -W033 */
-/* eslint-disable new-cap */
-'use strict'
+import platformConsts from '../../utils/constants.js';
+import { hasProperty, sleep } from '../../utils/functions.js';
 
-module.exports = class deviceTapTwo {
-  constructor (platform, accessory) {
+export default class {
+  constructor(platform, accessory) {
     // Set up variables from the platform
-    this.eveChar = platform.eveChar
-    this.funcs = platform.funcs
-    this.hapChar = platform.api.hap.Characteristic
-    this.hapErr = platform.api.hap.HapStatusError
-    this.hapServ = platform.api.hap.Service
-    this.lang = platform.lang
-    this.log = platform.log
-    this.platform = platform
+    this.eveChar = platform.eveChar;
+    this.hapChar = platform.api.hap.Characteristic;
+    this.hapErr = platform.api.hap.HapStatusError;
+    this.hapServ = platform.api.hap.Service;
+    this.lang = platform.lang;
+    this.log = platform.log;
+    this.platform = platform;
 
     // Set up variables from the accessory
-    this.name = accessory.displayName
-    this.accessory = accessory
+    this.name = accessory.displayName;
+    this.accessory = accessory;
 
     // Initially set the online flag as true (to be then updated as false if necessary)
-    this.isOnline = true
+    this.isOnline = true;
 
     // Set up custom variables for this device type
-    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId] || {};
 
     // Set the correct logging variables for this accessory
-    this.enableLogging = !platform.config.disableDeviceLogging
-    this.enableDebugLogging = platform.config.debug
-    if (deviceConf && deviceConf.overrideLogging) {
-      switch (deviceConf.overrideLogging) {
-        case 'standard':
-          this.enableLogging = true
-          this.enableDebugLogging = false
-          break
-        case 'debug':
-          this.enableLogging = true
-          this.enableDebugLogging = true
-          break
-        case 'disable':
-          this.enableLogging = false
-          this.enableDebugLogging = false
-          break
-      }
+    switch (deviceConf.overrideLogging) {
+      case 'standard':
+        this.enableLogging = true;
+        this.enableDebugLogging = false;
+        break;
+      case 'debug':
+        this.enableLogging = true;
+        this.enableDebugLogging = true;
+        break;
+      case 'disable':
+        this.enableLogging = false;
+        this.enableDebugLogging = false;
+        break;
+      default:
+        this.enableLogging = !platform.config.disableDeviceLogging;
+        this.enableDebugLogging = platform.config.debug;
+        break;
     }
 
     // Certain devices give power readings
-    if (platform.consts.devices.switchMultiPower.includes(this.accessory.context.eweUIID)) {
-      this.powerReadings = true
+    if (platformConsts.devices.switchMultiPower.includes(this.accessory.context.eweUIID)) {
+      this.powerReadings = true;
     }
 
     // We want two tap services for this accessory
-    ;['1', '2'].forEach(v => {
+    ['1', '2'].forEach((v) => {
       // Add the tap service if it doesn't already exist
-      let tapService
-      if (!(tapService = this.accessory.getService('Tap ' + v))) {
-        tapService = this.accessory.addService(this.hapServ.Valve, 'Tap ' + v, 'tap' + v)
-        tapService.updateCharacteristic(this.hapChar.Active, 0)
-        tapService.updateCharacteristic(this.hapChar.InUse, 0)
-        tapService.updateCharacteristic(this.hapChar.ValveType, 3)
+      let tapService = this.accessory.getService(`Tap ${v}`);
+      if (!tapService) {
+        tapService = this.accessory.addService(this.hapServ.Valve, `Tap ${v}`, `tap${v}`);
+        tapService.updateCharacteristic(this.hapChar.Active, 0);
+        tapService.updateCharacteristic(this.hapChar.InUse, 0);
+        tapService.updateCharacteristic(this.hapChar.ValveType, 3);
       }
 
       // Add Eve power characteristics
       if (this.powerReadings) {
         if (!tapService.testCharacteristic(this.eveChar.CurrentConsumption)) {
-          tapService.addCharacteristic(this.eveChar.CurrentConsumption)
+          tapService.addCharacteristic(this.eveChar.CurrentConsumption);
         }
         if (!tapService.testCharacteristic(this.eveChar.ElectricCurrent)) {
-          tapService.addCharacteristic(this.eveChar.ElectricCurrent)
+          tapService.addCharacteristic(this.eveChar.ElectricCurrent);
         }
         if (!tapService.testCharacteristic(this.eveChar.Voltage)) {
-          tapService.addCharacteristic(this.eveChar.Voltage)
+          tapService.addCharacteristic(this.eveChar.Voltage);
         }
       }
 
       // Add the set handler to the tap active characteristic
       tapService
         .getCharacteristic(this.hapChar.Active)
-        .onSet(async value => await this.internalUpdate('Tap ' + v, value))
+        .onSet(async (value) => this.internalUpdate(`Tap ${v}`, value));
 
       // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
       if (!platform.config.disableNoResponse) {
         tapService.getCharacteristic(this.hapChar.Active).onGet(() => {
           if (!this.isOnline) {
-            throw new this.hapErr(-70402)
+            throw new this.hapErr(-70402);
           }
-          return tapService.getCharacteristic(this.hapChar.Active).value
-        })
+          return tapService.getCharacteristic(this.hapChar.Active).value;
+        });
       }
-    })
+    });
 
     // Set up an interval to get eWeLink to send power updates
     if (this.powerReadings && platform.config.mode !== 'lan') {
       setTimeout(() => {
-        this.internalUIUpdate()
-        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
-      }, 5000)
+        this.internalUIUpdate();
+        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000);
+      }, 5000);
 
       // Stop the intervals on Homebridge shutdown
-      platform.api.on('shutdown', () => clearInterval(this.intervalPoll))
+      platform.api.on('shutdown', () => clearInterval(this.intervalPoll));
     }
 
     // Output the customised options to the log
+    const normalLogging = this.enableLogging ? 'standard' : 'disable';
     const opts = JSON.stringify({
-      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
-      showAs: 'tap_two'
-    })
-    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
+      logging: this.enableDebugLogging ? 'debug' : normalLogging,
+      showAs: 'tap_two',
+    });
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts);
   }
 
-  async internalUpdate (tap, value) {
+  async internalUpdate(tap, value) {
     try {
       const params = {
-        switches: []
-      }
-      const tapService = this.accessory.getService(tap)
+        switches: [],
+      };
+      const tapService = this.accessory.getService(tap);
       switch (tap) {
         case 'Tap 1':
-          params.switches.push({ switch: value ? 'on' : 'off', outlet: 0 })
-          break
+          params.switches.push({ switch: value ? 'on' : 'off', outlet: 0 });
+          break;
         case 'Tap 2':
-          params.switches.push({ switch: value ? 'on' : 'off', outlet: 1 })
-          break
+          params.switches.push({ switch: value ? 'on' : 'off', outlet: 1 });
+          break;
+        default:
+          return;
       }
-      tapService.updateCharacteristic(this.hapChar.InUse, value)
+      tapService.updateCharacteristic(this.hapChar.InUse, value);
       if (this.enableLogging) {
         this.log(
           '[%s] [%s] %s [%s].',
           this.name,
           tap,
           this.lang.curState,
-          value === 1 ? this.lang.valveYes : this.lang.valveNo
-        )
+          value === 1 ? this.lang.valveYes : this.lang.valveNo,
+        );
       }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
+      await this.platform.sendDeviceUpdate(this.accessory, params);
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
-      const tapService = this.accessory.getService(tap)
+      this.platform.deviceUpdateError(this.accessory, err, true);
+      const tapService = this.accessory.getService(tap);
       setTimeout(() => {
-        tapService.updateCharacteristic(this.hapChar.Active, value === 1 ? 0 : 1)
-      }, 2000)
-      throw new this.hapErr(-70402)
+        tapService.updateCharacteristic(this.hapChar.Active, value === 1 ? 0 : 1);
+      }, 2000);
+      throw new this.hapErr(-70402);
     }
   }
 
-  async internalUIUpdate () {
+  async internalUIUpdate() {
     try {
       // Skip polling if device isn't online
       if (!this.isOnline) {
-        return
+        return;
       }
 
       // Send the params to request the updates
-      await this.platform.sendDeviceUpdate(this.accessory, { uiActive: { outlet: 0, time: 120 } })
-      await this.funcs.sleep(2000)
-      await this.platform.sendDeviceUpdate(this.accessory, { uiActive: { outlet: 1, time: 120 } })
+      await this.platform.sendDeviceUpdate(this.accessory, { uiActive: { outlet: 0, time: 120 } });
+      await sleep(2000);
+      await this.platform.sendDeviceUpdate(this.accessory, { uiActive: { outlet: 1, time: 120 } });
     } catch (err) {
       // Suppress errors here
     }
   }
 
-  async externalUpdate (params) {
+  async externalUpdate(params) {
     try {
       if (params.switches) {
-        ;['1', '2'].forEach((v, k) => {
-          const tapService = this.accessory.getService('Tap ' + v)
+        ['1', '2'].forEach((v, k) => {
+          const tapService = this.accessory.getService(`Tap ${v}`);
           tapService.updateCharacteristic(
             this.hapChar.Active,
-            params.switches[k].switch === 'on' ? 1 : 0
-          )
+            params.switches[k].switch === 'on' ? 1 : 0,
+          );
           tapService.updateCharacteristic(
             this.hapChar.InUse,
-            params.switches[k].switch === 'on' ? 1 : 0
-          )
+            params.switches[k].switch === 'on' ? 1 : 0,
+          );
           if (params.updateSource && this.enableLogging) {
             this.log(
               '[%s] [Tap %s] %s [%s].',
               this.name,
               v,
               this.lang.curState,
-              params.switches[k].switch === 'on' ? this.lang.valveYes : this.lang.valveNo
-            )
+              params.switches[k].switch === 'on' ? this.lang.valveYes : this.lang.valveNo,
+            );
           }
-        })
+        });
       }
 
       // Get the power readings given by certain devices
       if (!this.powerReadings) {
-        return
+        return;
       }
-      let logger0 = false
-      let logger1 = false
-      let power0
-      let power1
-      let voltage0
-      let voltage1
-      let current0
-      let current1
-      if (this.funcs.hasProperty(params, 'actPow_00')) {
-        power0 = parseInt(params.actPow_00) / 100
+      let logger0 = false;
+      let logger1 = false;
+      let power0;
+      let power1;
+      let voltage0;
+      let voltage1;
+      let current0;
+      let current1;
+      if (hasProperty(params, 'actPow_00')) {
+        power0 = parseInt(params.actPow_00, 10) / 100;
         this.accessory
           .getService('Tap 1')
-          .updateCharacteristic(this.eveChar.CurrentConsumption, power0)
-        logger0 = true
+          .updateCharacteristic(this.eveChar.CurrentConsumption, power0);
+        logger0 = true;
       }
-      if (this.funcs.hasProperty(params, 'actPow_01')) {
-        power1 = parseInt(params.actPow_01) / 100
+      if (hasProperty(params, 'actPow_01')) {
+        power1 = parseInt(params.actPow_01, 10) / 100;
         this.accessory
           .getService('Tap 2')
-          .updateCharacteristic(this.eveChar.CurrentConsumption, power1)
-        logger1 = true
+          .updateCharacteristic(this.eveChar.CurrentConsumption, power1);
+        logger1 = true;
       }
-      if (this.funcs.hasProperty(params, 'voltage_00')) {
-        voltage0 = parseInt(params.voltage_00) / 100
-        this.accessory.getService('Tap 1').updateCharacteristic(this.eveChar.Voltage, voltage0)
-        logger0 = true
+      if (hasProperty(params, 'voltage_00')) {
+        voltage0 = parseInt(params.voltage_00, 10) / 100;
+        this.accessory.getService('Tap 1').updateCharacteristic(this.eveChar.Voltage, voltage0);
+        logger0 = true;
       }
-      if (this.funcs.hasProperty(params, 'voltage_01')) {
-        voltage1 = parseInt(params.voltage_01) / 100
-        this.accessory.getService('Tap 2').updateCharacteristic(this.eveChar.Voltage, voltage1)
-        logger1 = true
+      if (hasProperty(params, 'voltage_01')) {
+        voltage1 = parseInt(params.voltage_01, 10) / 100;
+        this.accessory.getService('Tap 2').updateCharacteristic(this.eveChar.Voltage, voltage1);
+        logger1 = true;
       }
-      if (this.funcs.hasProperty(params, 'current_00')) {
-        current0 = parseInt(params.current_00) / 100
+      if (hasProperty(params, 'current_00')) {
+        current0 = parseInt(params.current_00, 10) / 100;
         this.accessory
           .getService('Tap 1')
-          .updateCharacteristic(this.eveChar.ElectricCurrent, current0)
-        logger0 = true
+          .updateCharacteristic(this.eveChar.ElectricCurrent, current0);
+        logger0 = true;
       }
-      if (this.funcs.hasProperty(params, 'current_01')) {
-        current1 = parseInt(params.current_01) / 100
+      if (hasProperty(params, 'current_01')) {
+        current1 = parseInt(params.current_01, 10) / 100;
         this.accessory
           .getService('Tap 2')
-          .updateCharacteristic(this.eveChar.ElectricCurrent, current1)
-        logger1 = true
+          .updateCharacteristic(this.eveChar.ElectricCurrent, current1);
+        logger1 = true;
       }
       if (params.updateSource && this.enableLogging) {
         if (logger0) {
           this.log(
             '[%s] [Tap 1] %s%s%s.',
             this.name,
-            power0 !== undefined ? this.lang.curPower + ' [' + power0 + 'W]' : '',
-            voltage0 !== undefined ? ' ' + this.lang.curVolt + ' [' + voltage0 + 'V]' : '',
-            current0 !== undefined ? ' ' + this.lang.curCurr + ' [' + current0 + 'A]' : ''
-          )
+            power0 !== undefined ? `${this.lang.curPower} [${power0}W]` : '',
+            voltage0 !== undefined ? ` ${this.lang.curVolt} [${voltage0}V]` : '',
+            current0 !== undefined ? ` ${this.lang.curCurr} [${current0}A]` : '',
+          );
         }
         if (logger1) {
           this.log(
             '[%s] [Tap 2] %s%s%s.',
             this.name,
-            power1 !== undefined ? this.lang.curPower + ' [' + power1 + 'W]' : '',
-            voltage1 !== undefined ? ' ' + this.lang.curVolt + ' [' + voltage1 + 'V]' : '',
-            current1 !== undefined ? ' ' + this.lang.curCurr + ' [' + current1 + 'A]' : ''
-          )
+            power1 !== undefined ? `${this.lang.curPower} [${power1}W]` : '',
+            voltage1 !== undefined ? ` ${this.lang.curVolt} [${voltage1}V]` : '',
+            current1 !== undefined ? ` ${this.lang.curCurr} [${current1}A]` : '',
+          );
         }
       }
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, false)
+      this.platform.deviceUpdateError(this.accessory, err, false);
     }
   }
 
-  markStatus (isOnline) {
-    this.isOnline = isOnline
+  markStatus(isOnline) {
+    this.isOnline = isOnline;
   }
 }
diff --git a/lib/device/simulation/th-cooler.js b/lib/device/simulation/th-cooler.js
index 1da42aa5..de8cb7f6 100644
--- a/lib/device/simulation/th-cooler.js
+++ b/lib/device/simulation/th-cooler.js
@@ -1,145 +1,135 @@
-/* jshint node: true, esversion: 10, -W014, -W033 */
-/* eslint-disable new-cap */
-'use strict'
+import platformConsts from '../../utils/constants.js';
+import { hasProperty, parseError } from '../../utils/functions.js';
 
-module.exports = class deviceTHCooler {
-  constructor (platform, accessory) {
+export default class {
+  constructor(platform, accessory) {
     // Set up variables from the platform
-    this.funcs = platform.funcs
-    this.hapChar = platform.api.hap.Characteristic
-    this.hapErr = platform.api.hap.HapStatusError
-    this.hapServ = platform.api.hap.Service
-    this.lang = platform.lang
-    this.log = platform.log
-    this.platform = platform
+    this.hapChar = platform.api.hap.Characteristic;
+    this.hapErr = platform.api.hap.HapStatusError;
+    this.hapServ = platform.api.hap.Service;
+    this.lang = platform.lang;
+    this.log = platform.log;
+    this.platform = platform;
 
     // Set up variables from the accessory
-    this.name = accessory.displayName
-    this.accessory = accessory
+    this.name = accessory.displayName;
+    this.accessory = accessory;
 
     // Initially set the online flag as true (to be then updated as false if necessary)
-    this.isOnline = true
+    this.isOnline = true;
 
     // Set up custom variables for this device type
-    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
-    this.tempOffset =
-      deviceConf && deviceConf.offset ? deviceConf.offset : platform.consts.defaultValues.offset
-    this.tempOffsetFactor = deviceConf && deviceConf.offsetFactor
-    this.humiOffset =
-      deviceConf && deviceConf.humidityOffset
-        ? parseInt(deviceConf.humidityOffset)
-        : platform.consts.defaultValues.humidityOffset
-    this.humiOffsetFactor = deviceConf && deviceConf.humidityOffsetFactor
-    this.minTarget =
-      deviceConf && deviceConf.minTarget
-        ? deviceConf.minTarget
-        : platform.consts.defaultValues.minTarget
-    this.maxTarget =
-      deviceConf && deviceConf.maxTarget
-        ? Math.max(deviceConf.maxTarget, this.minTarget + 1)
-        : platform.consts.defaultValues.maxTarget
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId] || {};
+    this.tempOffset = deviceConf.offset || platformConsts.defaultValues.offset;
+    this.tempOffsetFactor = deviceConf.offsetFactor;
+    this.humiOffset = deviceConf && deviceConf.humidityOffset
+      ? parseInt(deviceConf.humidityOffset, 10)
+      : platformConsts.defaultValues.humidityOffset;
+    this.humiOffsetFactor = deviceConf.humidityOffsetFactor;
+    this.minTarget = deviceConf.minTarget || platformConsts.defaultValues.minTarget;
+    this.maxTarget = deviceConf.maxTarget
+      ? Math.max(deviceConf.maxTarget, this.minTarget + 1)
+      : platformConsts.defaultValues.maxTarget;
 
     // Set the correct logging variables for this accessory
-    this.enableLogging = !platform.config.disableDeviceLogging
-    this.enableDebugLogging = platform.config.debug
-    if (deviceConf && deviceConf.overrideLogging) {
-      switch (deviceConf.overrideLogging) {
-        case 'standard':
-          this.enableLogging = true
-          this.enableDebugLogging = false
-          break
-        case 'debug':
-          this.enableLogging = true
-          this.enableDebugLogging = true
-          break
-        case 'disable':
-          this.enableLogging = false
-          this.enableDebugLogging = false
-          break
-      }
+    switch (deviceConf.overrideLogging) {
+      case 'standard':
+        this.enableLogging = true;
+        this.enableDebugLogging = false;
+        break;
+      case 'debug':
+        this.enableLogging = true;
+        this.enableDebugLogging = true;
+        break;
+      case 'disable':
+        this.enableLogging = false;
+        this.enableDebugLogging = false;
+        break;
+      default:
+        this.enableLogging = !platform.config.disableDeviceLogging;
+        this.enableDebugLogging = platform.config.debug;
+        break;
     }
 
     // If the accessory has a switch service then remove it
     if (this.accessory.getService(this.hapServ.Switch)) {
-      this.accessory.removeService(this.accessory.getService(this.hapServ.Switch))
+      this.accessory.removeService(this.accessory.getService(this.hapServ.Switch));
     }
 
     // If the accessory has a temperature sensor service then remove it
     if (this.accessory.getService(this.hapServ.TemperatureSensor)) {
-      this.accessory.removeService(this.accessory.getService(this.hapServ.TemperatureSensor))
+      this.accessory.removeService(this.accessory.getService(this.hapServ.TemperatureSensor));
     }
 
     // Set up the accessory with default target temp when added the first time
-    if (!this.funcs.hasProperty(this.accessory.context, 'cacheTarget')) {
-      this.accessory.context.cacheTarget = 20
+    if (!hasProperty(this.accessory.context, 'cacheTarget')) {
+      this.accessory.context.cacheTarget = 20;
     }
 
     // Check to make sure user has not switched from heater to cooler
     if (this.accessory.context.cacheType !== 'cooler') {
       // Remove and re-setup as a HeaterCooler
       if (this.accessory.getService(this.hapServ.HeaterCooler)) {
-        this.accessory.removeService(this.accessory.getService(this.hapServ.HeaterCooler))
+        this.accessory.removeService(this.accessory.getService(this.hapServ.HeaterCooler));
       }
-      this.accessory.context.cacheType = 'cooler'
-      this.accessory.context.cacheTarget = 20
+      this.accessory.context.cacheType = 'cooler';
+      this.accessory.context.cacheTarget = 20;
     }
 
     // If the accessory has a thermostat service then remove it
     if (this.accessory.getService(this.hapServ.Thermostat)) {
-      this.accessory.removeService(this.accessory.getService(this.hapServ.Thermostat))
+      this.accessory.removeService(this.accessory.getService(this.hapServ.Thermostat));
     }
 
     // If the accessory has a humidifier service then remove it
     if (this.accessory.getService(this.hapServ.HumidifierDehumidifier)) {
-      this.accessory.removeService(this.accessory.getService(this.hapServ.HumidifierDehumidifier))
+      this.accessory.removeService(this.accessory.getService(this.hapServ.HumidifierDehumidifier));
     }
 
     // Add the heater service if it doesn't already exist
-    this.service =
-      this.accessory.getService(this.hapServ.HeaterCooler) ||
-      this.accessory.addService(this.hapServ.HeaterCooler)
+    this.service = this.accessory.getService(this.hapServ.HeaterCooler)
+      || this.accessory.addService(this.hapServ.HeaterCooler);
 
     // The DS18B20 sensor does not provide humidity readings
     if (this.accessory.context.sensorType === 'DS18B20') {
       if (this.accessory.getService(this.hapServ.HumiditySensor)) {
-        this.accessory.removeService(this.accessory.getService(this.hapServ.HumiditySensor))
+        this.accessory.removeService(this.accessory.getService(this.hapServ.HumiditySensor));
       }
     } else {
       // Add the humidity sensor service if it doesn't already exist
-      this.humiService =
-        this.accessory.getService(this.hapServ.HumiditySensor) ||
-        this.accessory.addService(this.hapServ.HumiditySensor)
+      this.humiService = this.accessory.getService(this.hapServ.HumiditySensor)
+        || this.accessory.addService(this.hapServ.HumiditySensor);
     }
 
     // Set the heater as the primary service
-    this.service.setPrimaryService()
+    this.service.setPrimaryService();
 
     // Set custom properties of the current temperature characteristic
     this.service.getCharacteristic(this.hapChar.CurrentTemperature).setProps({
-      minStep: 0.1
-    })
-    this.cacheTemp = this.service.getCharacteristic(this.hapChar.CurrentTemperature).value
-    this.updateCache()
+      minStep: 0.1,
+    });
+    this.cacheTemp = this.service.getCharacteristic(this.hapChar.CurrentTemperature).value;
+    this.updateCache();
 
     // Add the set handler to the heater active characteristic
     this.service
       .getCharacteristic(this.hapChar.Active)
-      .onSet(async value => await this.internalStateUpdate(value))
+      .onSet(async (value) => this.internalStateUpdate(value));
 
     // Add options to the target state characteristic
     this.service.getCharacteristic(this.hapChar.TargetHeaterCoolerState).setProps({
       minValue: 0,
       maxValue: 0,
-      validValues: [0]
-    })
+      validValues: [0],
+    });
 
     // Add a get handler to the current state characteristics
     this.service.getCharacteristic(this.hapChar.CurrentHeaterCoolerState).onGet(() => {
       if (!this.isOnline) {
-        throw new this.hapErr(-70402)
+        throw new this.hapErr(-70402);
       }
-      return this.service.getCharacteristic(this.hapChar.CurrentHeaterCoolerState).value
-    })
+      return this.service.getCharacteristic(this.hapChar.CurrentHeaterCoolerState).value;
+    });
 
     // Add the set handler to the target temperature characteristic
     this.service
@@ -148,308 +138,307 @@ module.exports = class deviceTHCooler {
       .setProps({
         minValue: this.minTarget,
         maxValue: this.maxTarget,
-        minStep: 0.5
+        minStep: 0.5,
       })
-      .onSet(async value => await this.internalTargetTempUpdate(value))
+      .onSet(async (value) => this.internalTargetTempUpdate(value));
 
     // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
     if (!platform.config.disableNoResponse) {
       if (this.humiService) {
         this.humiService.getCharacteristic(this.hapChar.CurrentRelativeHumidity).onGet(() => {
           if (!this.isOnline) {
-            throw new this.hapErr(-70402)
+            throw new this.hapErr(-70402);
           }
-          return this.humiService.getCharacteristic(this.hapChar.CurrentRelativeHumidity).value
-        })
+          return this.humiService.getCharacteristic(this.hapChar.CurrentRelativeHumidity).value;
+        });
       }
       this.service.getCharacteristic(this.hapChar.CurrentTemperature).onGet(() => {
         if (!this.isOnline) {
-          throw new this.hapErr(-70402)
+          throw new this.hapErr(-70402);
         }
-        return this.service.getCharacteristic(this.hapChar.CurrentTemperature).value
-      })
+        return this.service.getCharacteristic(this.hapChar.CurrentTemperature).value;
+      });
       this.service.getCharacteristic(this.hapChar.Active).onGet(() => {
         if (!this.isOnline) {
-          throw new this.hapErr(-70402)
+          throw new this.hapErr(-70402);
         }
-        return this.service.getCharacteristic(this.hapChar.Active).value
-      })
+        return this.service.getCharacteristic(this.hapChar.Active).value;
+      });
       this.service.getCharacteristic(this.hapChar.TargetHeaterCoolerState).onGet(() => {
         if (!this.isOnline) {
-          throw new this.hapErr(-70402)
+          throw new this.hapErr(-70402);
         }
-        return this.service.getCharacteristic(this.hapChar.TargetHeaterCoolerState).value
-      })
+        return this.service.getCharacteristic(this.hapChar.TargetHeaterCoolerState).value;
+      });
       this.service.getCharacteristic(this.hapChar.CoolingThresholdTemperature).onGet(() => {
         if (!this.isOnline) {
-          throw new this.hapErr(-70402)
+          throw new this.hapErr(-70402);
         }
-        return this.service.getCharacteristic(this.hapChar.CoolingThresholdTemperature).value
-      })
+        return this.service.getCharacteristic(this.hapChar.CoolingThresholdTemperature).value;
+      });
     }
 
     // Initialise these caches now since they aren't determined by the initial externalUpdate()
-    this.cacheState = this.service.getCharacteristic(this.hapChar.Active).value === 1 ? 'on' : 'off'
-    this.cacheCool =
-      this.cacheState === 'on' &&
-      this.service.getCharacteristic(this.hapChar.CurrentHeaterCoolerState).value === 3
-        ? 'on'
-        : 'off'
+    this.cacheState = this.service.getCharacteristic(this.hapChar.Active).value === 1 ? 'on' : 'off';
+    this.cacheCool = this.cacheState === 'on'
+      && this.service.getCharacteristic(this.hapChar.CurrentHeaterCoolerState).value === 3
+      ? 'on'
+      : 'off';
 
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new platform.eveService('custom', this.accessory, {
-      log: platform.config.debugFakegato ? this.log : () => {}
-    })
+      log: platform.config.debugFakegato ? this.log : () => {},
+    });
 
     // Set up an interval to get eWeLink to send regular temperature/humidity updates
     if (platform.config.mode !== 'lan') {
       setTimeout(() => {
-        this.internalUIUpdate()
-        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
-      }, 5000)
+        this.internalUIUpdate();
+        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000);
+      }, 5000);
 
       // Stop the intervals on Homebridge shutdown
-      platform.api.on('shutdown', () => clearInterval(this.intervalPoll))
+      platform.api.on('shutdown', () => clearInterval(this.intervalPoll));
     }
 
     // Output the customised options to the log
+    const normalLogging = this.enableLogging ? 'standard' : 'disable';
     const opts = JSON.stringify({
       humidityOffset: this.humiOffset,
       humidityOffsetFactor: this.humiOffsetFactor,
-      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
+      logging: this.enableDebugLogging ? 'debug' : normalLogging,
       maxTarget: this.maxTarget,
       minTarget: this.minTarget,
       offset: this.tempOffset,
       offsetFactor: this.tempOffsetFactor,
-      showAs: 'cooler'
-    })
-    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
+      showAs: 'cooler',
+    });
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts);
   }
 
-  async internalStateUpdate (value) {
+  async internalStateUpdate(value) {
     try {
-      const params = { deviceType: 'normal' }
-      let newState
-      let newCool
+      const params = { deviceType: 'normal' };
+      let newState;
+      let newCool;
       if (value === 0) {
-        params.mainSwitch = 'off'
-        params.switch = 'off'
-        newState = 'off'
-        newCool = 'off'
+        params.mainSwitch = 'off';
+        params.switch = 'off';
+        newState = 'off';
+        newCool = 'off';
+      } else if (this.cacheTemp > this.accessory.context.cacheTarget) {
+        params.mainSwitch = 'on';
+        params.switch = 'on';
+        newState = 'on';
+        newCool = 'on';
       } else {
-        if (this.cacheTemp > this.accessory.context.cacheTarget) {
-          params.mainSwitch = 'on'
-          params.switch = 'on'
-          newState = 'on'
-          newCool = 'on'
-        } else {
-          params.mainSwitch = 'off'
-          params.switch = 'off'
-          newState = 'on'
-          newCool = 'off'
-        }
+        params.mainSwitch = 'off';
+        params.switch = 'off';
+        newState = 'on';
+        newCool = 'off';
       }
 
       // Only send the update if either:
       // * The new value (state) is OFF and the cacheCool was ON
       // * The new value (state) is ON and newCool is 'on'
       if ((value === 0 && this.cacheCool === 'on') || (value === 1 && newCool === 'on')) {
-        await this.platform.sendDeviceUpdate(this.accessory, params)
+        await this.platform.sendDeviceUpdate(this.accessory, params);
       }
       if (newState !== this.cacheState) {
-        this.cacheState = newState
+        this.cacheState = newState;
         if (this.enableLogging) {
-          this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
+          this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState);
         }
       }
       if (newCool !== this.cacheCool) {
-        this.cacheCool = newCool
+        this.cacheCool = newCool;
         if (this.enableLogging) {
-          this.log('[%s] %s [%s].', this.name, this.lang.curCool, this.cacheCool)
+          this.log('[%s] %s [%s].', this.name, this.lang.curCool, this.cacheCool);
         }
       }
+      const hapState = this.cacheCool === 'on' ? 3 : 1;
       this.service.updateCharacteristic(
         this.hapChar.CurrentHeaterCoolerState,
-        value === 1 ? (this.cacheCool === 'on' ? 3 : 1) : 0
-      )
+        value === 1 ? hapState : 0,
+      );
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true);
       setTimeout(() => {
-        this.service.updateCharacteristic(this.hapChar.Active, this.cacheState === 'on' ? 1 : 0)
-      }, 2000)
-      throw new this.hapErr(-70402)
+        this.service.updateCharacteristic(this.hapChar.Active, this.cacheState === 'on' ? 1 : 0);
+      }, 2000);
+      throw new this.hapErr(-70402);
     }
   }
 
-  async internalTargetTempUpdate (value) {
+  async internalTargetTempUpdate(value) {
     try {
       if (value === this.accessory.context.cacheTarget) {
-        return
+        return;
       }
-      this.accessory.context.cacheTarget = value
+      this.accessory.context.cacheTarget = value;
       if (this.enableLogging) {
-        this.log('[%s] %s [%s°C].', this.name, this.lang.curTarg, value)
+        this.log('[%s] %s [%s°C].', this.name, this.lang.curTarg, value);
       }
       if (this.cacheState === 'off') {
-        return
+        return;
       }
-      const params = { deviceType: 'normal' }
-      let newCool
+      const params = { deviceType: 'normal' };
+      let newCool;
       if (this.cacheTemp > value) {
-        params.mainSwitch = 'on'
-        params.switch = 'on'
-        newCool = 'on'
+        params.mainSwitch = 'on';
+        params.switch = 'on';
+        newCool = 'on';
       } else {
-        params.mainSwitch = 'off'
-        params.switch = 'off'
-        newCool = 'off'
+        params.mainSwitch = 'off';
+        params.switch = 'off';
+        newCool = 'off';
       }
       if (newCool === this.cacheCool) {
-        return
+        return;
       }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.cacheCool = newCool
+      await this.platform.sendDeviceUpdate(this.accessory, params);
+      this.cacheCool = newCool;
       if (this.enableLogging) {
-        this.log('[%s] %s [%s].', this.name, this.lang.curCool, this.cacheCool)
+        this.log('[%s] %s [%s].', this.name, this.lang.curCool, this.cacheCool);
       }
       this.service.updateCharacteristic(
         this.hapChar.CurrentHeaterCoolerState,
-        this.cacheCool === 'on' ? 3 : 1
-      )
+        this.cacheCool === 'on' ? 3 : 1,
+      );
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true);
       setTimeout(() => {
         this.service.updateCharacteristic(
           this.hapChar.CoolingThresholdTemperature,
-          this.accessory.context.cacheTarget
-        )
-      }, 2000)
-      throw new this.hapErr(-70402)
+          this.accessory.context.cacheTarget,
+        );
+      }, 2000);
+      throw new this.hapErr(-70402);
     }
   }
 
-  async internalCurrentTempUpdate () {
+  async internalCurrentTempUpdate() {
     try {
       if (this.cacheState === 'off') {
-        return
+        return;
       }
-      const params = { deviceType: 'normal' }
-      let newCool
+      const params = { deviceType: 'normal' };
+      let newCool;
       if (this.cacheTemp > this.accessory.context.cacheTarget) {
-        params.mainSwitch = 'on'
-        params.switch = 'on'
-        newCool = 'on'
+        params.mainSwitch = 'on';
+        params.switch = 'on';
+        newCool = 'on';
       } else {
-        params.mainSwitch = 'off'
-        params.switch = 'off'
-        newCool = 'off'
+        params.mainSwitch = 'off';
+        params.switch = 'off';
+        newCool = 'off';
       }
       if (newCool === this.cacheCool) {
-        return
+        return;
       }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.cacheCool = newCool
+      await this.platform.sendDeviceUpdate(this.accessory, params);
+      this.cacheCool = newCool;
       if (this.enableLogging) {
-        this.log('[%s] %s [%s].', this.name, this.lang.curCool, this.cacheCool)
+        this.log('[%s] %s [%s].', this.name, this.lang.curCool, this.cacheCool);
       }
       this.service.updateCharacteristic(
         this.hapChar.CurrentHeaterCoolerState,
-        this.cacheCool === 'on' ? 3 : 1
-      )
+        this.cacheCool === 'on' ? 3 : 1,
+      );
     } catch (err) {
       // Suppress errors here
     }
   }
 
-  async internalUIUpdate () {
+  async internalUIUpdate() {
     try {
       // Skip polling if device isn't online
       if (!this.isOnline) {
-        return
+        return;
       }
 
       // Send the params to request the updates
-      await this.platform.sendDeviceUpdate(this.accessory, { uiActive: 120 })
+      await this.platform.sendDeviceUpdate(this.accessory, { uiActive: 120 });
     } catch (err) {
       // Suppress errors here
     }
   }
 
-  async externalUpdate (params) {
+  async externalUpdate(params) {
     try {
       if (
-        this.funcs.hasProperty(params, 'currentTemperature') &&
-        params.currentTemperature !== 'unavailable'
+        hasProperty(params, 'currentTemperature')
+        && params.currentTemperature !== 'unavailable'
       ) {
-        let newTemp = Number(params.currentTemperature)
+        let newTemp = Number(params.currentTemperature);
         if (this.tempOffsetFactor) {
-          newTemp *= this.tempOffset
+          newTemp *= this.tempOffset;
         } else {
-          newTemp += this.tempOffset
+          newTemp += this.tempOffset;
         }
         if (newTemp !== this.cacheTemp) {
-          this.cacheTemp = newTemp
-          this.service.updateCharacteristic(this.hapChar.CurrentTemperature, this.cacheTemp)
-          this.accessory.eveService.addEntry({ temp: this.cacheTemp })
+          this.cacheTemp = newTemp;
+          this.service.updateCharacteristic(this.hapChar.CurrentTemperature, this.cacheTemp);
+          this.accessory.eveService.addEntry({ temp: this.cacheTemp });
           if (params.updateSource && this.enableLogging) {
-            this.log('[%s] %s [%s°C].', this.name, this.lang.curTemp, this.cacheTemp)
+            this.log('[%s] %s [%s°C].', this.name, this.lang.curTemp, this.cacheTemp);
           }
 
           // Update the cache file with the new temperature
-          this.updateCache()
-          await this.internalCurrentTempUpdate()
+          this.updateCache();
+          this.internalCurrentTempUpdate();
         }
       }
       if (
-        this.funcs.hasProperty(params, 'currentHumidity') &&
-        params.currentHumidity !== 'unavailable' &&
-        this.humiService
+        hasProperty(params, 'currentHumidity')
+        && params.currentHumidity !== 'unavailable'
+        && this.humiService
       ) {
-        let newHumi = parseInt(params.currentHumidity)
+        let newHumi = parseInt(params.currentHumidity, 10);
         if (this.humiOffsetFactor) {
-          newHumi *= this.humiOffset
+          newHumi *= this.humiOffset;
         } else {
-          newHumi += this.humiOffset
+          newHumi += this.humiOffset;
         }
-        newHumi = Math.max(Math.min(parseInt(newHumi), 100), 0)
+        newHumi = Math.max(Math.min(parseInt(newHumi, 10), 100), 0);
         if (newHumi !== this.cacheHumi) {
-          this.cacheHumi = newHumi
+          this.cacheHumi = newHumi;
           this.humiService.updateCharacteristic(
             this.hapChar.CurrentRelativeHumidity,
-            this.cacheHumi
-          )
-          this.accessory.eveService.addEntry({ humidity: this.cacheHumi })
+            this.cacheHumi,
+          );
+          this.accessory.eveService.addEntry({ humidity: this.cacheHumi });
           if (params.updateSource && this.enableLogging) {
-            this.log('[%s] %s [%s%].', this.name, this.lang.curHumi, this.cacheHumi)
+            this.log('[%s] %s [%s%].', this.name, this.lang.curHumi, this.cacheHumi);
           }
         }
       }
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, false)
+      this.platform.deviceUpdateError(this.accessory, err, false);
     }
   }
 
-  async updateCache () {
+  async updateCache() {
     // Don't continue if the storage client hasn't initialised properly
     if (!this.platform.storageClientData) {
-      return
+      return;
     }
 
     // Attempt to save the new temperature to the cache
     try {
       await this.platform.storageData.setItem(
-        this.accessory.context.eweDeviceId + '_temp',
-        this.cacheTemp
-      )
+        `${this.accessory.context.eweDeviceId}_temp`,
+        this.cacheTemp,
+      );
     } catch (err) {
       if (this.enableLogging) {
-        const eText = this.funcs.parseError(err)
-        this.log.warn('[%s] %s %s.', this.name, this.lang.storageWriteErr, eText)
+        const eText = parseError(err);
+        this.log.warn('[%s] %s %s.', this.name, this.lang.storageWriteErr, eText);
       }
     }
   }
 
-  markStatus (isOnline) {
-    this.isOnline = isOnline
+  markStatus(isOnline) {
+    this.isOnline = isOnline;
   }
 }
diff --git a/lib/device/simulation/th-dehumidifier.js b/lib/device/simulation/th-dehumidifier.js
index d0d3f69a..f2920b8a 100644
--- a/lib/device/simulation/th-dehumidifier.js
+++ b/lib/device/simulation/th-dehumidifier.js
@@ -1,115 +1,109 @@
-/* jshint node: true, esversion: 10, -W014, -W033 */
-/* eslint-disable new-cap */
-'use strict'
+import platformConsts from '../../utils/constants.js';
+import { hasProperty, parseError } from '../../utils/functions.js';
 
-module.exports = class deviceTHDehumidifier {
-  constructor (platform, accessory) {
+export default class {
+  constructor(platform, accessory) {
     // Set up variables from the platform
-    this.funcs = platform.funcs
-    this.hapChar = platform.api.hap.Characteristic
-    this.hapErr = platform.api.hap.HapStatusError
-    this.hapServ = platform.api.hap.Service
-    this.lang = platform.lang
-    this.log = platform.log
-    this.platform = platform
+    this.hapChar = platform.api.hap.Characteristic;
+    this.hapErr = platform.api.hap.HapStatusError;
+    this.hapServ = platform.api.hap.Service;
+    this.lang = platform.lang;
+    this.log = platform.log;
+    this.platform = platform;
 
     // Set up variables from the accessory
-    this.name = accessory.displayName
-    this.accessory = accessory
+    this.name = accessory.displayName;
+    this.accessory = accessory;
 
     // Initially set the online flag as true (to be then updated as false if necessary)
-    this.isOnline = true
+    this.isOnline = true;
 
     // Set up custom variables for this device type
-    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
-    this.tempOffset =
-      deviceConf && deviceConf.offset ? deviceConf.offset : platform.consts.defaultValues.offset
-    this.tempOffsetFactor = deviceConf && deviceConf.offsetFactor
-    this.humiOffset =
-      deviceConf && deviceConf.humidityOffset
-        ? parseInt(deviceConf.humidityOffset)
-        : platform.consts.defaultValues.humidityOffset
-    this.humiOffsetFactor = deviceConf && deviceConf.humidityOffsetFactor
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId] || {};
+    this.tempOffset = deviceConf.offset || platformConsts.defaultValues.offset;
+    this.tempOffsetFactor = deviceConf.offsetFactor;
+    this.humiOffset = deviceConf.humidityOffset
+      ? parseInt(deviceConf.humidityOffset, 10)
+      : platformConsts.defaultValues.humidityOffset;
+    this.humiOffsetFactor = deviceConf.humidityOffsetFactor;
 
     // Set the correct logging variables for this accessory
-    this.enableLogging = !platform.config.disableDeviceLogging
-    this.enableDebugLogging = platform.config.debug
-    if (deviceConf && deviceConf.overrideLogging) {
-      switch (deviceConf.overrideLogging) {
-        case 'standard':
-          this.enableLogging = true
-          this.enableDebugLogging = false
-          break
-        case 'debug':
-          this.enableLogging = true
-          this.enableDebugLogging = true
-          break
-        case 'disable':
-          this.enableLogging = false
-          this.enableDebugLogging = false
-          break
-      }
+    switch (deviceConf.overrideLogging) {
+      case 'standard':
+        this.enableLogging = true;
+        this.enableDebugLogging = false;
+        break;
+      case 'debug':
+        this.enableLogging = true;
+        this.enableDebugLogging = true;
+        break;
+      case 'disable':
+        this.enableLogging = false;
+        this.enableDebugLogging = false;
+        break;
+      default:
+        this.enableLogging = !platform.config.disableDeviceLogging;
+        this.enableDebugLogging = platform.config.debug;
+        break;
     }
 
     // If the accessory has a switch service then remove it
     if (this.accessory.getService(this.hapServ.Switch)) {
-      this.accessory.removeService(this.accessory.getService(this.hapServ.Switch))
+      this.accessory.removeService(this.accessory.getService(this.hapServ.Switch));
     }
 
     // If the accessory has a temperature sensor service then remove it
     if (this.accessory.getService(this.hapServ.TemperatureSensor)) {
-      this.accessory.removeService(this.accessory.getService(this.hapServ.TemperatureSensor))
+      this.accessory.removeService(this.accessory.getService(this.hapServ.TemperatureSensor));
     }
 
     // Set up the accessory with default target relative humidity when added the first time
-    if (!this.funcs.hasProperty(this.accessory.context, 'cacheTarget')) {
-      this.accessory.context.cacheTarget = 50
+    if (!hasProperty(this.accessory.context, 'cacheTarget')) {
+      this.accessory.context.cacheTarget = 50;
     }
 
     // Check to make sure user has not switched from humidifier to dehumidifier
     if (this.accessory.context.cacheType !== 'dehumidifier') {
       // Remove and re-setup as a HeaterCooler
       if (this.accessory.getService(this.hapServ.HumidifierDehumidifier)) {
-        this.accessory.removeService(this.accessory.getService(this.hapServ.HumidifierDehumidifier))
+        this.accessory.removeService(this.accessory.getService(this.hapServ.HumidifierDehumidifier));
       }
-      this.accessory.context.cacheType = 'dehumidifier'
-      this.accessory.context.cacheTarget = 50
+      this.accessory.context.cacheType = 'dehumidifier';
+      this.accessory.context.cacheTarget = 50;
     }
 
     // If the accessory has a thermostat service then remove it
     if (this.accessory.getService(this.hapServ.Thermostat)) {
-      this.accessory.removeService(this.accessory.getService(this.hapServ.Thermostat))
+      this.accessory.removeService(this.accessory.getService(this.hapServ.Thermostat));
     }
 
     // If the accessory has a heater service then remove it
     if (this.accessory.getService(this.hapServ.HeaterCooler)) {
-      this.accessory.removeService(this.accessory.getService(this.hapServ.HeaterCooler))
+      this.accessory.removeService(this.accessory.getService(this.hapServ.HeaterCooler));
     }
 
     // If the accessory has a humidity sensor service then remove it
     if (this.accessory.getService(this.hapServ.HumiditySensor)) {
-      this.accessory.removeService(this.accessory.getService(this.hapServ.HumiditySensor))
+      this.accessory.removeService(this.accessory.getService(this.hapServ.HumiditySensor));
     }
 
     // Add the dehumidifier service if it doesn't already exist
-    this.service =
-      this.accessory.getService(this.hapServ.HumidifierDehumidifier) ||
-      this.accessory.addService(this.hapServ.HumidifierDehumidifier)
+    this.service = this.accessory.getService(this.hapServ.HumidifierDehumidifier)
+      || this.accessory.addService(this.hapServ.HumidifierDehumidifier);
 
     // Add the temperature sensor service if it doesn't already exist
-    this.tempService =
-      this.accessory.getService(this.hapServ.TemperatureSensor) ||
-      this.accessory.addService(this.hapServ.TemperatureSensor)
-    this.cacheTemp = this.tempService.getCharacteristic(this.hapChar.CurrentTemperature).value
-    this.updateCache()
+    this.tempService = this.accessory.getService(this.hapServ.TemperatureSensor)
+      || this.accessory.addService(this.hapServ.TemperatureSensor);
+    this.cacheTemp = this.tempService.getCharacteristic(this.hapChar.CurrentTemperature).value;
+    this.updateCache();
 
     // Set the dehumidifier as the primary service
-    this.service.setPrimaryService()
+    this.service.setPrimaryService();
 
     // Add the set handler to the humidifier active characteristic
     this.service
       .getCharacteristic(this.hapChar.Active)
-      .onSet(async value => await this.internalStateUpdate(value))
+      .onSet(async (value) => this.internalStateUpdate(value));
 
     // Add options to the target state characteristic
     this.service
@@ -118,315 +112,314 @@ module.exports = class deviceTHDehumidifier {
       .setProps({
         minValue: 2,
         maxValue: 2,
-        validValues: [2]
-      })
+        validValues: [2],
+      });
 
     // Add the set handler to the target relative humidity characteristic
     this.service
       .getCharacteristic(this.hapChar.RelativeHumidityDehumidifierThreshold)
       .updateValue(this.accessory.context.cacheTarget)
-      .onSet(async value => await this.internalTargetHumidityUpdate(value))
+      .onSet(async (value) => this.internalTargetHumidityUpdate(value));
 
     // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
     if (!platform.config.disableNoResponse) {
       this.tempService.getCharacteristic(this.hapChar.CurrentTemperature).onGet(() => {
         if (!this.isOnline) {
-          throw new this.hapErr(-70402)
+          throw new this.hapErr(-70402);
         }
-        return this.tempService.getCharacteristic(this.hapChar.CurrentTemperature).value
-      })
+        return this.tempService.getCharacteristic(this.hapChar.CurrentTemperature).value;
+      });
       this.service.getCharacteristic(this.hapChar.Active).onGet(() => {
         if (!this.isOnline) {
-          throw new this.hapErr(-70402)
+          throw new this.hapErr(-70402);
         }
-        return this.service.getCharacteristic(this.hapChar.Active).value
-      })
+        return this.service.getCharacteristic(this.hapChar.Active).value;
+      });
       this.service.getCharacteristic(this.hapChar.CurrentHumidifierDehumidifierState).onGet(() => {
         if (!this.isOnline) {
-          throw new this.hapErr(-70402)
+          throw new this.hapErr(-70402);
         }
-        return this.service.getCharacteristic(this.hapChar.CurrentHumidifierDehumidifierState).value
-      })
+        return this.service.getCharacteristic(this.hapChar.CurrentHumidifierDehumidifierState).value;
+      });
       this.service.getCharacteristic(this.hapChar.TargetHumidifierDehumidifierState).onGet(() => {
         if (!this.isOnline) {
-          throw new this.hapErr(-70402)
+          throw new this.hapErr(-70402);
         }
-        return this.service.getCharacteristic(this.hapChar.TargetHumidifierDehumidifierState).value
-      })
+        return this.service.getCharacteristic(this.hapChar.TargetHumidifierDehumidifierState).value;
+      });
       this.service.getCharacteristic(this.hapChar.CurrentRelativeHumidity).onGet(() => {
         if (!this.isOnline) {
-          throw new this.hapErr(-70402)
+          throw new this.hapErr(-70402);
         }
-        return this.service.getCharacteristic(this.hapChar.CurrentRelativeHumidity).value
-      })
+        return this.service.getCharacteristic(this.hapChar.CurrentRelativeHumidity).value;
+      });
       this.service
         .getCharacteristic(this.hapChar.RelativeHumidityDehumidifierThreshold)
         .updateValue(this.accessory.context.cacheTarget)
         .onGet(() => {
           if (!this.isOnline) {
-            throw new this.hapErr(-70402)
+            throw new this.hapErr(-70402);
           }
           return this.service.getCharacteristic(this.hapChar.RelativeHumidityDehumidifierThreshold)
-            .value
-        })
+            .value;
+        });
     }
 
     // Initialise these caches now since they aren't determined by the initial externalUpdate()
-    this.cacheState = this.service.getCharacteristic(this.hapChar.Active).value === 1 ? 'on' : 'off'
-    this.cacheHumid =
-      this.cacheState === 'on' &&
-      this.service.getCharacteristic(this.hapChar.CurrentHumidifierDehumidifierState).value === 3
-        ? 'on'
-        : 'off'
+    this.cacheState = this.service.getCharacteristic(this.hapChar.Active).value === 1 ? 'on' : 'off';
+    this.cacheHumid = this.cacheState === 'on'
+      && this.service.getCharacteristic(this.hapChar.CurrentHumidifierDehumidifierState).value === 3
+      ? 'on'
+      : 'off';
 
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new platform.eveService('custom', this.accessory, {
-      log: platform.config.debugFakegato ? this.log : () => {}
-    })
+      log: platform.config.debugFakegato ? this.log : () => {},
+    });
 
     // Set up an interval to get eWeLink to send regular temperature/humidity updates
     if (platform.config.mode !== 'lan') {
       setTimeout(() => {
-        this.internalUIUpdate()
-        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
-      }, 5000)
+        this.internalUIUpdate();
+        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000);
+      }, 5000);
 
       // Stop the intervals on Homebridge shutdown
-      platform.api.on('shutdown', () => clearInterval(this.intervalPoll))
+      platform.api.on('shutdown', () => clearInterval(this.intervalPoll));
     }
 
     // Output the customised options to the log
+    const normalLogging = this.enableLogging ? 'standard' : 'disable';
     const opts = JSON.stringify({
       humidityOffset: this.humiOffset,
       humidityOffsetFactor: this.humiOffsetFactor,
-      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
+      logging: this.enableDebugLogging ? 'debug' : normalLogging,
       offset: this.tempOffset,
       offsetFactor: this.tempOffsetFactor,
-      showAs: 'dehumidifier'
-    })
-    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
+      showAs: 'dehumidifier',
+    });
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts);
   }
 
-  async internalStateUpdate (value) {
+  async internalStateUpdate(value) {
     try {
-      const params = { deviceType: 'normal' }
-      let newState
-      let newHumid
+      const params = { deviceType: 'normal' };
+      let newState;
+      let newHumid;
       if (value === 0) {
-        params.mainSwitch = 'off'
-        params.switch = 'off'
-        newState = 'off'
-        newHumid = 'off'
+        params.mainSwitch = 'off';
+        params.switch = 'off';
+        newState = 'off';
+        newHumid = 'off';
+      } else if (this.cacheHumi > this.accessory.context.cacheTarget) {
+        params.mainSwitch = 'on';
+        params.switch = 'on';
+        newState = 'on';
+        newHumid = 'on';
       } else {
-        if (this.cacheHumi > this.accessory.context.cacheTarget) {
-          params.mainSwitch = 'on'
-          params.switch = 'on'
-          newState = 'on'
-          newHumid = 'on'
-        } else {
-          params.mainSwitch = 'off'
-          params.switch = 'off'
-          newState = 'on'
-          newHumid = 'off'
-        }
+        params.mainSwitch = 'off';
+        params.switch = 'off';
+        newState = 'on';
+        newHumid = 'off';
       }
 
       // Only send the update if either:
       // * The new value (state) is OFF and the cacheHumid was ON
       // * The new value (state) is ON and newHumid is 'on'
       if ((value === 0 && this.cacheHumid === 'on') || (value === 1 && newHumid === 'on')) {
-        await this.platform.sendDeviceUpdate(this.accessory, params)
+        await this.platform.sendDeviceUpdate(this.accessory, params);
       }
       if (newState !== this.cacheState) {
-        this.cacheState = newState
+        this.cacheState = newState;
         if (this.enableLogging) {
-          this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
+          this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState);
         }
       }
       if (newHumid !== this.cacheHumid) {
-        this.cacheHumid = newHumid
+        this.cacheHumid = newHumid;
         if (this.enableLogging) {
-          this.log('[%s] %s [%s].', this.name, this.lang.curDehumid, this.cacheHumid)
+          this.log('[%s] %s [%s].', this.name, this.lang.curDehumid, this.cacheHumid);
         }
       }
+      const hapState = this.cacheHumid === 'on' ? 3 : 1;
       this.service.updateCharacteristic(
         this.hapChar.CurrentHumidifierDehumidifierState,
-        value === 1 ? (this.cacheHumid === 'on' ? 3 : 1) : 0
-      )
+        value === 1 ? hapState : 0,
+      );
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true);
       setTimeout(() => {
-        this.service.updateCharacteristic(this.hapChar.Active, this.cacheState === 'on' ? 1 : 0)
-      }, 2000)
-      throw new this.hapErr(-70402)
+        this.service.updateCharacteristic(this.hapChar.Active, this.cacheState === 'on' ? 1 : 0);
+      }, 2000);
+      throw new this.hapErr(-70402);
     }
   }
 
-  async internalTargetHumidityUpdate (value) {
+  async internalTargetHumidityUpdate(value) {
     try {
       if (value === this.accessory.context.cacheTarget) {
-        return
+        return;
       }
-      this.accessory.context.cacheTarget = value
+      this.accessory.context.cacheTarget = value;
       if (this.enableLogging) {
-        this.log('[%s] %s [%s%].', this.name, this.lang.curTarg, value)
+        this.log('[%s] %s [%s%].', this.name, this.lang.curTarg, value);
       }
       if (this.cacheState === 'off') {
-        return
+        return;
       }
-      const params = { deviceType: 'normal' }
-      let newHumid
+      const params = { deviceType: 'normal' };
+      let newHumid;
       if (this.cacheHumi > value) {
-        params.mainSwitch = 'on'
-        params.switch = 'on'
-        newHumid = 'on'
+        params.mainSwitch = 'on';
+        params.switch = 'on';
+        newHumid = 'on';
       } else {
-        params.mainSwitch = 'off'
-        params.switch = 'off'
-        newHumid = 'off'
+        params.mainSwitch = 'off';
+        params.switch = 'off';
+        newHumid = 'off';
       }
       if (newHumid === this.cacheHumid) {
-        return
+        return;
       }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.cacheHumid = newHumid
+      await this.platform.sendDeviceUpdate(this.accessory, params);
+      this.cacheHumid = newHumid;
       if (this.enableLogging) {
-        this.log('[%s] %s [%s].', this.name, this.lang.curDehumid, this.cacheHumid)
+        this.log('[%s] %s [%s].', this.name, this.lang.curDehumid, this.cacheHumid);
       }
       this.service.updateCharacteristic(
         this.hapChar.CurrentHumidifierDehumidifierState,
-        this.cacheHumid === 'on' ? 3 : 1
-      )
+        this.cacheHumid === 'on' ? 3 : 1,
+      );
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true);
       setTimeout(() => {
         this.service.updateCharacteristic(
           this.hapChar.RelativeHumidityDehumidifierThreshold,
-          this.accessory.context.cacheTarget
-        )
-      }, 2000)
-      throw new this.hapErr(-70402)
+          this.accessory.context.cacheTarget,
+        );
+      }, 2000);
+      throw new this.hapErr(-70402);
     }
   }
 
-  async internalCurrentHumidityUpdate () {
+  async internalCurrentHumidityUpdate() {
     try {
       if (this.cacheState === 'off') {
-        return
+        return;
       }
-      const params = { deviceType: 'normal' }
-      let newHumid
+      const params = { deviceType: 'normal' };
+      let newHumid;
       if (this.cacheHumi > this.accessory.context.cacheTarget) {
-        params.mainSwitch = 'on'
-        params.switch = 'on'
-        newHumid = 'on'
+        params.mainSwitch = 'on';
+        params.switch = 'on';
+        newHumid = 'on';
       } else {
-        params.mainSwitch = 'off'
-        params.switch = 'off'
-        newHumid = 'off'
+        params.mainSwitch = 'off';
+        params.switch = 'off';
+        newHumid = 'off';
       }
       if (newHumid === this.cacheHumid) {
-        return
+        return;
       }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.cacheHumid = newHumid
+      await this.platform.sendDeviceUpdate(this.accessory, params);
+      this.cacheHumid = newHumid;
       if (this.enableLogging) {
-        this.log('[%s] %s [%s].', this.name, this.lang.curDehumid, this.cacheHumid)
+        this.log('[%s] %s [%s].', this.name, this.lang.curDehumid, this.cacheHumid);
       }
       this.service.updateCharacteristic(
         this.hapChar.CurrentHumidifierDehumidifierState,
-        this.cacheHumid === 'on' ? 3 : 1
-      )
+        this.cacheHumid === 'on' ? 3 : 1,
+      );
     } catch (err) {
       // Suppress errors here
     }
   }
 
-  async internalUIUpdate () {
+  async internalUIUpdate() {
     try {
       // Skip polling if device isn't online
       if (!this.isOnline) {
-        return
+        return;
       }
 
       // Send the params to request the updates
-      await this.platform.sendDeviceUpdate(this.accessory, { uiActive: 120 })
+      await this.platform.sendDeviceUpdate(this.accessory, { uiActive: 120 });
     } catch (err) {
       // Suppress errors here
     }
   }
 
-  async externalUpdate (params) {
+  async externalUpdate(params) {
     try {
       if (
-        this.funcs.hasProperty(params, 'currentTemperature') &&
-        params.currentTemperature !== 'unavailable'
+        hasProperty(params, 'currentTemperature')
+        && params.currentTemperature !== 'unavailable'
       ) {
-        let newTemp = Number(params.currentTemperature)
+        let newTemp = Number(params.currentTemperature);
         if (this.tempOffsetFactor) {
-          newTemp *= this.tempOffset
+          newTemp *= this.tempOffset;
         } else {
-          newTemp += this.tempOffset
+          newTemp += this.tempOffset;
         }
         if (newTemp !== this.cacheTemp) {
-          this.cacheTemp = newTemp
-          this.tempService.updateCharacteristic(this.hapChar.CurrentTemperature, this.cacheTemp)
-          this.accessory.eveService.addEntry({ temp: this.cacheTemp })
+          this.cacheTemp = newTemp;
+          this.tempService.updateCharacteristic(this.hapChar.CurrentTemperature, this.cacheTemp);
+          this.accessory.eveService.addEntry({ temp: this.cacheTemp });
           if (params.updateSource && this.enableLogging) {
-            this.log('[%s] %s [%s°C].', this.name, this.lang.curTemp, this.cacheTemp)
+            this.log('[%s] %s [%s°C].', this.name, this.lang.curTemp, this.cacheTemp);
           }
 
           // Update the cache file with the new temperature
-          this.updateCache()
+          this.updateCache();
         }
       }
       if (
-        this.funcs.hasProperty(params, 'currentHumidity') &&
-        params.currentHumidity !== 'unavailable'
+        hasProperty(params, 'currentHumidity')
+        && params.currentHumidity !== 'unavailable'
       ) {
-        let newHumi = parseInt(params.currentHumidity)
+        let newHumi = parseInt(params.currentHumidity, 10);
         if (this.humiOffsetFactor) {
-          newHumi *= this.humiOffset
+          newHumi *= this.humiOffset;
         } else {
-          newHumi += this.humiOffset
+          newHumi += this.humiOffset;
         }
-        newHumi = Math.max(Math.min(parseInt(newHumi), 100), 0)
+        newHumi = Math.max(Math.min(parseInt(newHumi, 10), 100), 0);
         if (newHumi !== this.cacheHumi) {
-          this.cacheHumi = newHumi
-          this.service.updateCharacteristic(this.hapChar.CurrentRelativeHumidity, this.cacheHumi)
-          this.accessory.eveService.addEntry({ humidity: this.cacheHumi })
+          this.cacheHumi = newHumi;
+          this.service.updateCharacteristic(this.hapChar.CurrentRelativeHumidity, this.cacheHumi);
+          this.accessory.eveService.addEntry({ humidity: this.cacheHumi });
           if (params.updateSource && this.enableLogging) {
-            this.log('[%s] %s [%s%].', this.name, this.lang.curHumi, this.cacheHumi)
+            this.log('[%s] %s [%s%].', this.name, this.lang.curHumi, this.cacheHumi);
           }
-          await this.internalCurrentHumidityUpdate()
+          this.internalCurrentHumidityUpdate();
         }
       }
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, false)
+      this.platform.deviceUpdateError(this.accessory, err, false);
     }
   }
 
-  async updateCache () {
+  async updateCache() {
     // Don't continue if the storage client hasn't initialised properly
     if (!this.platform.storageClientData) {
-      return
+      return;
     }
 
     // Attempt to save the new temperature to the cache
     try {
       await this.platform.storageData.setItem(
-        this.accessory.context.eweDeviceId + '_temp',
-        this.cacheTemp
-      )
+        `${this.accessory.context.eweDeviceId}_temp`,
+        this.cacheTemp,
+      );
     } catch (err) {
       if (this.enableLogging) {
-        const eText = this.funcs.parseError(err)
-        this.log.warn('[%s] %s %s.', this.name, this.lang.storageWriteErr, eText)
+        const eText = parseError(err);
+        this.log.warn('[%s] %s %s.', this.name, this.lang.storageWriteErr, eText);
       }
     }
   }
 
-  markStatus (isOnline) {
-    this.isOnline = isOnline
+  markStatus(isOnline) {
+    this.isOnline = isOnline;
   }
 }
diff --git a/lib/device/simulation/th-heater.js b/lib/device/simulation/th-heater.js
index 2d95da69..bb057974 100644
--- a/lib/device/simulation/th-heater.js
+++ b/lib/device/simulation/th-heater.js
@@ -1,141 +1,128 @@
-/* jshint node: true, esversion: 10, -W014, -W033 */
-/* eslint-disable new-cap */
-'use strict'
+import platformConsts from '../../utils/constants.js';
+import { hasProperty, parseError } from '../../utils/functions.js';
 
-module.exports = class deviceTHHeater {
-  constructor (platform, accessory) {
+export default class {
+  constructor(platform, accessory) {
     // Set up variables from the platform
-    this.funcs = platform.funcs
-    this.hapChar = platform.api.hap.Characteristic
-    this.hapErr = platform.api.hap.HapStatusError
-    this.hapServ = platform.api.hap.Service
-    this.lang = platform.lang
-    this.log = platform.log
-    this.platform = platform
+    this.hapChar = platform.api.hap.Characteristic;
+    this.hapErr = platform.api.hap.HapStatusError;
+    this.hapServ = platform.api.hap.Service;
+    this.lang = platform.lang;
+    this.log = platform.log;
+    this.platform = platform;
 
     // Set up variables from the accessory
-    this.name = accessory.displayName
-    this.accessory = accessory
+    this.name = accessory.displayName;
+    this.accessory = accessory;
 
     // Initially set the online flag as true (to be then updated as false if necessary)
-    this.isOnline = true
+    this.isOnline = true;
 
     // Set up custom variables for this device type
-    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
-    this.tempOffset =
-      deviceConf && deviceConf.offset ? deviceConf.offset : platform.consts.defaultValues.offset
-    this.tempOffsetFactor = deviceConf && deviceConf.offsetFactor
-    this.targetTempThreshold =
-      deviceConf && deviceConf.targetTempThreshold
-        ? deviceConf.targetTempThreshold
-        : platform.consts.defaultValues.targetTempThreshold
-    this.humiOffset =
-      deviceConf && deviceConf.humidityOffset
-        ? parseInt(deviceConf.humidityOffset)
-        : platform.consts.defaultValues.humidityOffset
-    this.humiOffsetFactor = deviceConf && deviceConf.humidityOffsetFactor
-    this.minTarget =
-      deviceConf && deviceConf.minTarget
-        ? deviceConf.minTarget
-        : platform.consts.defaultValues.minTarget
-    this.maxTarget =
-      deviceConf && deviceConf.maxTarget
-        ? Math.max(deviceConf.maxTarget, this.minTarget + 1)
-        : platform.consts.defaultValues.maxTarget
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId] || {};
+    this.tempOffset = deviceConf.offset || platformConsts.defaultValues.offset;
+    this.tempOffsetFactor = deviceConf.offsetFactor;
+    this.targetTempThreshold = deviceConf.targetTempThreshold || platformConsts.defaultValues.targetTempThreshold;
+    this.humiOffset = deviceConf.humidityOffset
+      ? parseInt(deviceConf.humidityOffset, 10)
+      : platformConsts.defaultValues.humidityOffset;
+    this.humiOffsetFactor = deviceConf.humidityOffsetFactor;
+    this.minTarget = deviceConf.minTarget || platformConsts.defaultValues.minTarget;
+    this.maxTarget = deviceConf.maxTarget
+      ? Math.max(deviceConf.maxTarget, this.minTarget + 1)
+      : platformConsts.defaultValues.maxTarget;
 
     // Set the correct logging variables for this accessory
-    this.enableLogging = !platform.config.disableDeviceLogging
-    this.enableDebugLogging = platform.config.debug
-    if (deviceConf && deviceConf.overrideLogging) {
-      switch (deviceConf.overrideLogging) {
-        case 'standard':
-          this.enableLogging = true
-          this.enableDebugLogging = false
-          break
-        case 'debug':
-          this.enableLogging = true
-          this.enableDebugLogging = true
-          break
-        case 'disable':
-          this.enableLogging = false
-          this.enableDebugLogging = false
-          break
-      }
+    switch (deviceConf.overrideLogging) {
+      case 'standard':
+        this.enableLogging = true;
+        this.enableDebugLogging = false;
+        break;
+      case 'debug':
+        this.enableLogging = true;
+        this.enableDebugLogging = true;
+        break;
+      case 'disable':
+        this.enableLogging = false;
+        this.enableDebugLogging = false;
+        break;
+      default:
+        this.enableLogging = !platform.config.disableDeviceLogging;
+        this.enableDebugLogging = platform.config.debug;
+        break;
     }
 
     // If the accessory has a switch service then remove it
     if (this.accessory.getService(this.hapServ.Switch)) {
-      this.accessory.removeService(this.accessory.getService(this.hapServ.Switch))
+      this.accessory.removeService(this.accessory.getService(this.hapServ.Switch));
     }
 
     // If the accessory has a temperature sensor service then remove it
     if (this.accessory.getService(this.hapServ.TemperatureSensor)) {
-      this.accessory.removeService(this.accessory.getService(this.hapServ.TemperatureSensor))
+      this.accessory.removeService(this.accessory.getService(this.hapServ.TemperatureSensor));
     }
 
     // Set up the accessory with default target temp when added the first time
-    if (!this.funcs.hasProperty(this.accessory.context, 'cacheTarget')) {
-      this.accessory.context.cacheTarget = 20
+    if (!hasProperty(this.accessory.context, 'cacheTarget')) {
+      this.accessory.context.cacheTarget = 20;
     }
 
     // Check to make sure user has not switched from cooler to heater
     if (this.accessory.context.cacheType !== 'heater') {
       // Remove and re-setup as a HeaterCooler
       if (this.accessory.getService(this.hapServ.HeaterCooler)) {
-        this.accessory.removeService(this.accessory.getService(this.hapServ.HeaterCooler))
+        this.accessory.removeService(this.accessory.getService(this.hapServ.HeaterCooler));
       }
-      this.accessory.context.cacheType = 'heater'
-      this.accessory.context.cacheTarget = 20
+      this.accessory.context.cacheType = 'heater';
+      this.accessory.context.cacheTarget = 20;
     }
 
     // If the accessory has a thermostat service then remove it
     if (this.accessory.getService(this.hapServ.Thermostat)) {
-      this.accessory.removeService(this.accessory.getService(this.hapServ.Thermostat))
+      this.accessory.removeService(this.accessory.getService(this.hapServ.Thermostat));
     }
 
     // If the accessory has a humidifier service then remove it
     if (this.accessory.getService(this.hapServ.HumidifierDehumidifier)) {
-      this.accessory.removeService(this.accessory.getService(this.hapServ.HumidifierDehumidifier))
+      this.accessory.removeService(this.accessory.getService(this.hapServ.HumidifierDehumidifier));
     }
 
     // Add the heater service if it doesn't already exist
-    this.service =
-      this.accessory.getService(this.hapServ.HeaterCooler) ||
-      this.accessory.addService(this.hapServ.HeaterCooler)
+    this.service = this.accessory.getService(this.hapServ.HeaterCooler)
+      || this.accessory.addService(this.hapServ.HeaterCooler);
 
     // The DS18B20 sensor does not provide humidity readings
     if (this.accessory.context.sensorType === 'DS18B20') {
       if (this.accessory.getService(this.hapServ.HumiditySensor)) {
-        this.accessory.removeService(this.accessory.getService(this.hapServ.HumiditySensor))
+        this.accessory.removeService(this.accessory.getService(this.hapServ.HumiditySensor));
       }
     } else {
       // Add the humidity sensor service if it doesn't already exist
-      this.humiService =
-        this.accessory.getService(this.hapServ.HumiditySensor) ||
-        this.accessory.addService(this.hapServ.HumiditySensor)
+      this.humiService = this.accessory.getService(this.hapServ.HumiditySensor)
+        || this.accessory.addService(this.hapServ.HumiditySensor);
     }
 
     // Set the heater as the primary service
-    this.service.setPrimaryService()
+    this.service.setPrimaryService();
 
     // Set custom properties of the current temperature characteristic
     this.service.getCharacteristic(this.hapChar.CurrentTemperature).setProps({
-      minStep: 0.1
-    })
-    this.cacheTemp = this.service.getCharacteristic(this.hapChar.CurrentTemperature).value
-    this.updateCache()
+      minStep: 0.1,
+    });
+    this.cacheTemp = this.service.getCharacteristic(this.hapChar.CurrentTemperature).value;
+    this.updateCache();
 
     // Add the set handler to the heater active characteristic
     this.service
       .getCharacteristic(this.hapChar.Active)
-      .onSet(async value => await this.internalStateUpdate(value))
+      .onSet(async (value) => this.internalStateUpdate(value));
 
     // Add options to the target state characteristic
     this.service.getCharacteristic(this.hapChar.TargetHeaterCoolerState).setProps({
       minValue: 0,
       maxValue: 0,
-      validValues: [0]
-    })
+      validValues: [0],
+    });
 
     // Add the set handler to the target temperature characteristic
     this.service
@@ -144,321 +131,320 @@ module.exports = class deviceTHHeater {
       .setProps({
         minValue: this.minTarget,
         maxValue: this.maxTarget,
-        minStep: 0.5
+        minStep: 0.5,
       })
-      .onSet(async value => await this.internalTargetTempUpdate(value))
+      .onSet(async (value) => this.internalTargetTempUpdate(value));
 
     // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
     if (!platform.config.disableNoResponse) {
       if (this.humiService) {
         this.humiService.getCharacteristic(this.hapChar.CurrentRelativeHumidity).onGet(() => {
           if (!this.isOnline) {
-            throw new this.hapErr(-70402)
+            throw new this.hapErr(-70402);
           }
-          return this.humiService.getCharacteristic(this.hapChar.CurrentRelativeHumidity).value
-        })
+          return this.humiService.getCharacteristic(this.hapChar.CurrentRelativeHumidity).value;
+        });
       }
       this.service.getCharacteristic(this.hapChar.CurrentTemperature).onGet(() => {
         if (!this.isOnline) {
-          throw new this.hapErr(-70402)
+          throw new this.hapErr(-70402);
         }
-        return this.service.getCharacteristic(this.hapChar.CurrentTemperature).value
-      })
+        return this.service.getCharacteristic(this.hapChar.CurrentTemperature).value;
+      });
       this.service.getCharacteristic(this.hapChar.Active).onGet(() => {
         if (!this.isOnline) {
-          throw new this.hapErr(-70402)
+          throw new this.hapErr(-70402);
         }
-        return this.service.getCharacteristic(this.hapChar.Active).value
-      })
+        return this.service.getCharacteristic(this.hapChar.Active).value;
+      });
       this.service.getCharacteristic(this.hapChar.TargetHeaterCoolerState).onGet(() => {
         if (!this.isOnline) {
-          throw new this.hapErr(-70402)
+          throw new this.hapErr(-70402);
         }
-        return this.service.getCharacteristic(this.hapChar.TargetHeaterCoolerState).value
-      })
+        return this.service.getCharacteristic(this.hapChar.TargetHeaterCoolerState).value;
+      });
       this.service.getCharacteristic(this.hapChar.CurrentHeaterCoolerState).onGet(() => {
         if (!this.isOnline) {
-          throw new this.hapErr(-70402)
+          throw new this.hapErr(-70402);
         }
-        return this.service.getCharacteristic(this.hapChar.CurrentHeaterCoolerState).value
-      })
+        return this.service.getCharacteristic(this.hapChar.CurrentHeaterCoolerState).value;
+      });
       this.service.getCharacteristic(this.hapChar.HeatingThresholdTemperature).onGet(() => {
         if (!this.isOnline) {
-          throw new this.hapErr(-70402)
+          throw new this.hapErr(-70402);
         }
-        return this.service.getCharacteristic(this.hapChar.HeatingThresholdTemperature).value
-      })
+        return this.service.getCharacteristic(this.hapChar.HeatingThresholdTemperature).value;
+      });
     }
 
     // Initialise these caches now since they aren't determined by the initial externalUpdate()
-    this.cacheState = this.service.getCharacteristic(this.hapChar.Active).value === 1 ? 'on' : 'off'
-    this.cacheHeat =
-      this.cacheState === 'on' &&
-      this.service.getCharacteristic(this.hapChar.CurrentHeaterCoolerState).value === 2
-        ? 'on'
-        : 'off'
+    this.cacheState = this.service.getCharacteristic(this.hapChar.Active).value === 1 ? 'on' : 'off';
+    this.cacheHeat = this.cacheState === 'on'
+      && this.service.getCharacteristic(this.hapChar.CurrentHeaterCoolerState).value === 2
+      ? 'on'
+      : 'off';
 
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new platform.eveService('custom', this.accessory, {
-      log: platform.config.debugFakegato ? this.log : () => {}
-    })
+      log: platform.config.debugFakegato ? this.log : () => {},
+    });
 
     // Set up an interval to get eWeLink to send regular temperature/humidity updates
     if (platform.config.mode !== 'lan') {
       setTimeout(() => {
-        this.internalUIUpdate()
-        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
-      }, 5000)
+        this.internalUIUpdate();
+        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000);
+      }, 5000);
 
       // Stop the intervals on Homebridge shutdown
-      platform.api.on('shutdown', () => clearInterval(this.intervalPoll))
+      platform.api.on('shutdown', () => clearInterval(this.intervalPoll));
     }
 
     // Output the customised options to the log
+    const normalLogging = this.enableLogging ? 'standard' : 'disable';
     const opts = JSON.stringify({
       humidityOffset: this.humiOffset,
       humidityOffsetFactor: this.humiOffsetFactor,
-      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
+      logging: this.enableDebugLogging ? 'debug' : normalLogging,
       maxTarget: this.maxTarget,
       minTarget: this.minTarget,
       offset: this.tempOffset,
       offsetFactor: this.tempOffsetFactor,
       showAs: 'heater',
-      targetTempThreshold: this.targetTempThreshold
-    })
-    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
+      targetTempThreshold: this.targetTempThreshold,
+    });
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts);
   }
 
-  async internalStateUpdate (value) {
+  async internalStateUpdate(value) {
     try {
-      const params = { deviceType: 'normal' }
-      let newState
-      let newHeat
+      const params = { deviceType: 'normal' };
+      let newState;
+      let newHeat;
       if (value === 0) {
-        params.mainSwitch = 'off'
-        params.switch = 'off'
-        newState = 'off'
-        newHeat = 'off'
+        params.mainSwitch = 'off';
+        params.switch = 'off';
+        newState = 'off';
+        newHeat = 'off';
+      } else if (this.cacheTemp < this.accessory.context.cacheTarget - this.targetTempThreshold) {
+        params.mainSwitch = 'on';
+        params.switch = 'on';
+        newState = 'on';
+        newHeat = 'on';
+      } else if (this.cacheTemp >= this.accessory.context.cacheTarget) {
+        params.mainSwitch = 'off';
+        params.switch = 'off';
+        newState = 'on';
+        newHeat = 'off';
       } else {
-        if (this.cacheTemp < this.accessory.context.cacheTarget - this.targetTempThreshold) {
-          params.mainSwitch = 'on'
-          params.switch = 'on'
-          newState = 'on'
-          newHeat = 'on'
-        } else if (this.cacheTemp >= this.accessory.context.cacheTarget) {
-          params.mainSwitch = 'off'
-          params.switch = 'off'
-          newState = 'on'
-          newHeat = 'off'
-        } else {
-          return
-        }
+        return;
       }
 
       // Only send the update if either:
       // * The new value (state) is OFF and the cacheHeat was ON
       // * The new value (state) is ON and newHeat is 'on'
       if ((value === 0 && this.cacheHeat === 'on') || (value === 1 && newHeat === 'on')) {
-        await this.platform.sendDeviceUpdate(this.accessory, params)
+        await this.platform.sendDeviceUpdate(this.accessory, params);
       }
       if (newState !== this.cacheState) {
-        this.cacheState = newState
+        this.cacheState = newState;
         if (this.enableLogging) {
-          this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
+          this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState);
         }
       }
       if (newHeat !== this.cacheHeat) {
-        this.cacheHeat = newHeat
+        this.cacheHeat = newHeat;
         if (this.enableLogging) {
-          this.log('[%s] %s [%s].', this.name, this.lang.curHeat, this.cacheHeat)
+          this.log('[%s] %s [%s].', this.name, this.lang.curHeat, this.cacheHeat);
         }
       }
+      const hapState = this.cacheHeat === 'on' ? 2 : 1;
       this.service.updateCharacteristic(
         this.hapChar.CurrentHeaterCoolerState,
-        value === 1 ? (this.cacheHeat === 'on' ? 2 : 1) : 0
-      )
+        value === 1 ? hapState : 0,
+      );
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true);
       setTimeout(() => {
-        this.service.updateCharacteristic(this.hapChar.Active, this.cacheState === 'on' ? 1 : 0)
-      }, 2000)
-      throw new this.hapErr(-70402)
+        this.service.updateCharacteristic(this.hapChar.Active, this.cacheState === 'on' ? 1 : 0);
+      }, 2000);
+      throw new this.hapErr(-70402);
     }
   }
 
-  async internalTargetTempUpdate (value) {
+  async internalTargetTempUpdate(value) {
     try {
       if (value === this.accessory.context.cacheTarget) {
-        return
+        return;
       }
-      this.accessory.context.cacheTarget = value
+      this.accessory.context.cacheTarget = value;
       if (this.enableLogging) {
-        this.log('[%s] %s [%s°C].', this.name, this.lang.curTarg, value)
+        this.log('[%s] %s [%s°C].', this.name, this.lang.curTarg, value);
       }
       if (this.cacheState === 'off') {
-        return
+        return;
       }
-      const params = { deviceType: 'normal' }
-      let newHeat
+      const params = { deviceType: 'normal' };
+      let newHeat;
       if (this.cacheTemp < value - this.targetTempThreshold) {
-        params.mainSwitch = 'on'
-        params.switch = 'on'
-        newHeat = 'on'
+        params.mainSwitch = 'on';
+        params.switch = 'on';
+        newHeat = 'on';
       } else if (this.cacheTemp >= value) {
-        params.mainSwitch = 'off'
-        params.switch = 'off'
-        newHeat = 'off'
+        params.mainSwitch = 'off';
+        params.switch = 'off';
+        newHeat = 'off';
       } else {
-        return
+        return;
       }
       if (newHeat === this.cacheHeat) {
-        return
+        return;
       }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.cacheHeat = newHeat
+      await this.platform.sendDeviceUpdate(this.accessory, params);
+      this.cacheHeat = newHeat;
       if (this.enableLogging) {
-        this.log('[%s] %s [%s].', this.name, this.lang.curHeat, this.cacheHeat)
+        this.log('[%s] %s [%s].', this.name, this.lang.curHeat, this.cacheHeat);
       }
       this.service.updateCharacteristic(
         this.hapChar.CurrentHeaterCoolerState,
-        this.cacheHeat === 'on' ? 2 : 1
-      )
+        this.cacheHeat === 'on' ? 2 : 1,
+      );
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true);
       setTimeout(() => {
         this.service.updateCharacteristic(
           this.hapChar.HeatingThresholdTemperature,
-          this.accessory.context.cacheTarget
-        )
-      }, 2000)
-      throw new this.hapErr(-70402)
+          this.accessory.context.cacheTarget,
+        );
+      }, 2000);
+      throw new this.hapErr(-70402);
     }
   }
 
-  async internalCurrentTempUpdate () {
+  async internalCurrentTempUpdate() {
     try {
       if (this.cacheState === 'off') {
-        return
+        return;
       }
-      const params = { deviceType: 'normal' }
-      let newHeat
+      const params = { deviceType: 'normal' };
+      let newHeat;
       if (this.cacheTemp < this.accessory.context.cacheTarget - this.targetTempThreshold) {
-        params.mainSwitch = 'on'
-        params.switch = 'on'
-        newHeat = 'on'
+        params.mainSwitch = 'on';
+        params.switch = 'on';
+        newHeat = 'on';
       } else if (this.cacheTemp >= this.accessory.context.cacheTarget) {
-        params.mainSwitch = 'off'
-        params.switch = 'off'
-        newHeat = 'off'
+        params.mainSwitch = 'off';
+        params.switch = 'off';
+        newHeat = 'off';
       } else {
-        return
+        return;
       }
       if (newHeat === this.cacheHeat) {
-        return
+        return;
       }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.cacheHeat = newHeat
+      await this.platform.sendDeviceUpdate(this.accessory, params);
+      this.cacheHeat = newHeat;
       if (this.enableLogging) {
-        this.log('[%s] %s [%s].', this.name, this.lang.curHeat, this.cacheHeat)
+        this.log('[%s] %s [%s].', this.name, this.lang.curHeat, this.cacheHeat);
       }
       this.service.updateCharacteristic(
         this.hapChar.CurrentHeaterCoolerState,
-        this.cacheHeat === 'on' ? 2 : 1
-      )
+        this.cacheHeat === 'on' ? 2 : 1,
+      );
     } catch (err) {
       // Suppress errors here
     }
   }
 
-  async internalUIUpdate () {
+  async internalUIUpdate() {
     try {
       // Skip polling if device isn't online
       if (!this.isOnline) {
-        return
+        return;
       }
 
       // Send the params to request the updates
-      await this.platform.sendDeviceUpdate(this.accessory, { uiActive: 120 })
+      await this.platform.sendDeviceUpdate(this.accessory, { uiActive: 120 });
     } catch (err) {
       // Suppress errors here
     }
   }
 
-  async externalUpdate (params) {
+  async externalUpdate(params) {
     try {
       if (
-        this.funcs.hasProperty(params, 'currentTemperature') &&
-        params.currentTemperature !== 'unavailable'
+        hasProperty(params, 'currentTemperature')
+        && params.currentTemperature !== 'unavailable'
       ) {
-        let newTemp = Number(params.currentTemperature)
+        let newTemp = Number(params.currentTemperature);
         if (this.tempOffsetFactor) {
-          newTemp *= this.tempOffset
+          newTemp *= this.tempOffset;
         } else {
-          newTemp += this.tempOffset
+          newTemp += this.tempOffset;
         }
         if (newTemp !== this.cacheTemp) {
-          this.cacheTemp = newTemp
-          this.service.updateCharacteristic(this.hapChar.CurrentTemperature, this.cacheTemp)
-          this.accessory.eveService.addEntry({ temp: this.cacheTemp })
+          this.cacheTemp = newTemp;
+          this.service.updateCharacteristic(this.hapChar.CurrentTemperature, this.cacheTemp);
+          this.accessory.eveService.addEntry({ temp: this.cacheTemp });
           if (params.updateSource && this.enableLogging) {
-            this.log('[%s] %s [%s°C].', this.name, this.lang.curTemp, this.cacheTemp)
+            this.log('[%s] %s [%s°C].', this.name, this.lang.curTemp, this.cacheTemp);
           }
 
           // Update the cache file with the new temperature
-          this.updateCache()
-          await this.internalCurrentTempUpdate()
+          this.updateCache();
+          this.internalCurrentTempUpdate();
         }
       }
       if (
-        this.funcs.hasProperty(params, 'currentHumidity') &&
-        params.currentHumidity !== 'unavailable' &&
-        this.humiService
+        hasProperty(params, 'currentHumidity')
+        && params.currentHumidity !== 'unavailable'
+        && this.humiService
       ) {
-        let newHumi = parseInt(params.currentHumidity)
+        let newHumi = parseInt(params.currentHumidity, 10);
         if (this.humiOffsetFactor) {
-          newHumi *= this.humiOffset
+          newHumi *= this.humiOffset;
         } else {
-          newHumi += this.humiOffset
+          newHumi += this.humiOffset;
         }
-        newHumi = Math.max(Math.min(parseInt(newHumi), 100), 0)
+        newHumi = Math.max(Math.min(parseInt(newHumi, 10), 100), 0);
         if (newHumi !== this.cacheHumi) {
-          this.cacheHumi = newHumi
+          this.cacheHumi = newHumi;
           this.humiService.updateCharacteristic(
             this.hapChar.CurrentRelativeHumidity,
-            this.cacheHumi
-          )
-          this.accessory.eveService.addEntry({ humidity: this.cacheHumi })
+            this.cacheHumi,
+          );
+          this.accessory.eveService.addEntry({ humidity: this.cacheHumi });
           if (params.updateSource && this.enableLogging) {
-            this.log('[%s] %s [%s%].', this.name, this.lang.curHumi, this.cacheHumi)
+            this.log('[%s] %s [%s%].', this.name, this.lang.curHumi, this.cacheHumi);
           }
         }
       }
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, false)
+      this.platform.deviceUpdateError(this.accessory, err, false);
     }
   }
 
-  async updateCache () {
+  async updateCache() {
     // Don't continue if the storage client hasn't initialised properly
     if (!this.platform.storageClientData) {
-      return
+      return;
     }
 
     // Attempt to save the new temperature to the cache
     try {
       await this.platform.storageData.setItem(
-        this.accessory.context.eweDeviceId + '_temp',
-        this.cacheTemp
-      )
+        `${this.accessory.context.eweDeviceId}_temp`,
+        this.cacheTemp,
+      );
     } catch (err) {
       if (this.enableLogging) {
-        const eText = this.funcs.parseError(err)
-        this.log.warn('[%s] %s %s.', this.name, this.lang.storageWriteErr, eText)
+        const eText = parseError(err);
+        this.log.warn('[%s] %s %s.', this.name, this.lang.storageWriteErr, eText);
       }
     }
   }
 
-  markStatus (isOnline) {
-    this.isOnline = isOnline
+  markStatus(isOnline) {
+    this.isOnline = isOnline;
   }
 }
diff --git a/lib/device/simulation/th-humidifier.js b/lib/device/simulation/th-humidifier.js
index 6e83b1fc..294be681 100644
--- a/lib/device/simulation/th-humidifier.js
+++ b/lib/device/simulation/th-humidifier.js
@@ -1,115 +1,109 @@
-/* jshint node: true, esversion: 10, -W014, -W033 */
-/* eslint-disable new-cap */
-'use strict'
+import platformConsts from '../../utils/constants.js';
+import { hasProperty, parseError } from '../../utils/functions.js';
 
-module.exports = class deviceTHHumidifier {
-  constructor (platform, accessory) {
+export default class {
+  constructor(platform, accessory) {
     // Set up variables from the platform
-    this.funcs = platform.funcs
-    this.hapChar = platform.api.hap.Characteristic
-    this.hapErr = platform.api.hap.HapStatusError
-    this.hapServ = platform.api.hap.Service
-    this.lang = platform.lang
-    this.log = platform.log
-    this.platform = platform
+    this.hapChar = platform.api.hap.Characteristic;
+    this.hapErr = platform.api.hap.HapStatusError;
+    this.hapServ = platform.api.hap.Service;
+    this.lang = platform.lang;
+    this.log = platform.log;
+    this.platform = platform;
 
     // Set up variables from the accessory
-    this.name = accessory.displayName
-    this.accessory = accessory
+    this.name = accessory.displayName;
+    this.accessory = accessory;
 
     // Initially set the online flag as true (to be then updated as false if necessary)
-    this.isOnline = true
+    this.isOnline = true;
 
     // Set up custom variables for this device type
-    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
-    this.tempOffset =
-      deviceConf && deviceConf.offset ? deviceConf.offset : platform.consts.defaultValues.offset
-    this.tempOffsetFactor = deviceConf && deviceConf.offsetFactor
-    this.humiOffset =
-      deviceConf && deviceConf.humidityOffset
-        ? parseInt(deviceConf.humidityOffset)
-        : platform.consts.defaultValues.humidityOffset
-    this.humiOffsetFactor = deviceConf && deviceConf.humidityOffsetFactor
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId] || {};
+    this.tempOffset = deviceConf.offset || platformConsts.defaultValues.offset;
+    this.tempOffsetFactor = deviceConf.offsetFactor;
+    this.humiOffset = deviceConf.humidityOffset
+      ? parseInt(deviceConf.humidityOffset, 10)
+      : platformConsts.defaultValues.humidityOffset;
+    this.humiOffsetFactor = deviceConf.humidityOffsetFactor;
 
     // Set the correct logging variables for this accessory
-    this.enableLogging = !platform.config.disableDeviceLogging
-    this.enableDebugLogging = platform.config.debug
-    if (deviceConf && deviceConf.overrideLogging) {
-      switch (deviceConf.overrideLogging) {
-        case 'standard':
-          this.enableLogging = true
-          this.enableDebugLogging = false
-          break
-        case 'debug':
-          this.enableLogging = true
-          this.enableDebugLogging = true
-          break
-        case 'disable':
-          this.enableLogging = false
-          this.enableDebugLogging = false
-          break
-      }
+    switch (deviceConf.overrideLogging) {
+      case 'standard':
+        this.enableLogging = true;
+        this.enableDebugLogging = false;
+        break;
+      case 'debug':
+        this.enableLogging = true;
+        this.enableDebugLogging = true;
+        break;
+      case 'disable':
+        this.enableLogging = false;
+        this.enableDebugLogging = false;
+        break;
+      default:
+        this.enableLogging = !platform.config.disableDeviceLogging;
+        this.enableDebugLogging = platform.config.debug;
+        break;
     }
 
     // If the accessory has a switch service then remove it
     if (this.accessory.getService(this.hapServ.Switch)) {
-      this.accessory.removeService(this.accessory.getService(this.hapServ.Switch))
+      this.accessory.removeService(this.accessory.getService(this.hapServ.Switch));
     }
 
     // If the accessory has a temperature sensor service then remove it
     if (this.accessory.getService(this.hapServ.TemperatureSensor)) {
-      this.accessory.removeService(this.accessory.getService(this.hapServ.TemperatureSensor))
+      this.accessory.removeService(this.accessory.getService(this.hapServ.TemperatureSensor));
     }
 
     // Set up the accessory with default target relative humidity when added the first time
-    if (!this.funcs.hasProperty(this.accessory.context, 'cacheTarget')) {
-      this.accessory.context.cacheTarget = 50
+    if (!hasProperty(this.accessory.context, 'cacheTarget')) {
+      this.accessory.context.cacheTarget = 50;
     }
 
     // Check to make sure user has not switched from dehumidifier to humidifier
     if (this.accessory.context.cacheType !== 'humidifier') {
       // Remove and re-setup as a HeaterCooler
       if (this.accessory.getService(this.hapServ.HumidifierDehumidifier)) {
-        this.accessory.removeService(this.accessory.getService(this.hapServ.HumidifierDehumidifier))
+        this.accessory.removeService(this.accessory.getService(this.hapServ.HumidifierDehumidifier));
       }
-      this.accessory.context.cacheType = 'humidifier'
-      this.accessory.context.cacheTarget = 50
+      this.accessory.context.cacheType = 'humidifier';
+      this.accessory.context.cacheTarget = 50;
     }
 
     // If the accessory has a thermostat service then remove it
     if (this.accessory.getService(this.hapServ.Thermostat)) {
-      this.accessory.removeService(this.accessory.getService(this.hapServ.Thermostat))
+      this.accessory.removeService(this.accessory.getService(this.hapServ.Thermostat));
     }
 
     // If the accessory has a heater service then remove it
     if (this.accessory.getService(this.hapServ.HeaterCooler)) {
-      this.accessory.removeService(this.accessory.getService(this.hapServ.HeaterCooler))
+      this.accessory.removeService(this.accessory.getService(this.hapServ.HeaterCooler));
     }
 
     // If the accessory has a humidity sensor service then remove it
     if (this.accessory.getService(this.hapServ.HumiditySensor)) {
-      this.accessory.removeService(this.accessory.getService(this.hapServ.HumiditySensor))
+      this.accessory.removeService(this.accessory.getService(this.hapServ.HumiditySensor));
     }
 
     // Add the humidifier service if it doesn't already exist
-    this.service =
-      this.accessory.getService(this.hapServ.HumidifierDehumidifier) ||
-      this.accessory.addService(this.hapServ.HumidifierDehumidifier)
+    this.service = this.accessory.getService(this.hapServ.HumidifierDehumidifier)
+      || this.accessory.addService(this.hapServ.HumidifierDehumidifier);
 
     // Add the temperature sensor service if it doesn't already exist
-    this.tempService =
-      this.accessory.getService(this.hapServ.TemperatureSensor) ||
-      this.accessory.addService(this.hapServ.TemperatureSensor)
-    this.cacheTemp = this.tempService.getCharacteristic(this.hapChar.CurrentTemperature).value
-    this.updateCache()
+    this.tempService = this.accessory.getService(this.hapServ.TemperatureSensor)
+      || this.accessory.addService(this.hapServ.TemperatureSensor);
+    this.cacheTemp = this.tempService.getCharacteristic(this.hapChar.CurrentTemperature).value;
+    this.updateCache();
 
     // Set the humidifier as the primary service
-    this.service.setPrimaryService()
+    this.service.setPrimaryService();
 
     // Add the set handler to the humidifier active characteristic
     this.service
       .getCharacteristic(this.hapChar.Active)
-      .onSet(async value => await this.internalStateUpdate(value))
+      .onSet(async (value) => this.internalStateUpdate(value));
 
     // Add options to the target state characteristic
     this.service
@@ -118,315 +112,314 @@ module.exports = class deviceTHHumidifier {
       .setProps({
         minValue: 1,
         maxValue: 1,
-        validValues: [1]
-      })
+        validValues: [1],
+      });
 
     // Add the set handler to the target relative humidity characteristic
     this.service
       .getCharacteristic(this.hapChar.RelativeHumidityHumidifierThreshold)
       .updateValue(this.accessory.context.cacheTarget)
-      .onSet(async value => await this.internalTargetHumidityUpdate(value))
+      .onSet(async (value) => this.internalTargetHumidityUpdate(value));
 
     // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
     if (!platform.config.disableNoResponse) {
       this.tempService.getCharacteristic(this.hapChar.CurrentTemperature).onGet(() => {
         if (!this.isOnline) {
-          throw new this.hapErr(-70402)
+          throw new this.hapErr(-70402);
         }
-        return this.tempService.getCharacteristic(this.hapChar.CurrentTemperature).value
-      })
+        return this.tempService.getCharacteristic(this.hapChar.CurrentTemperature).value;
+      });
       this.service.getCharacteristic(this.hapChar.Active).onGet(() => {
         if (!this.isOnline) {
-          throw new this.hapErr(-70402)
+          throw new this.hapErr(-70402);
         }
-        return this.service.getCharacteristic(this.hapChar.Active).value
-      })
+        return this.service.getCharacteristic(this.hapChar.Active).value;
+      });
       this.service.getCharacteristic(this.hapChar.CurrentHumidifierDehumidifierState).onGet(() => {
         if (!this.isOnline) {
-          throw new this.hapErr(-70402)
+          throw new this.hapErr(-70402);
         }
-        return this.service.getCharacteristic(this.hapChar.CurrentHumidifierDehumidifierState).value
-      })
+        return this.service.getCharacteristic(this.hapChar.CurrentHumidifierDehumidifierState).value;
+      });
       this.service.getCharacteristic(this.hapChar.TargetHumidifierDehumidifierState).onGet(() => {
         if (!this.isOnline) {
-          throw new this.hapErr(-70402)
+          throw new this.hapErr(-70402);
         }
-        return this.service.getCharacteristic(this.hapChar.TargetHumidifierDehumidifierState).value
-      })
+        return this.service.getCharacteristic(this.hapChar.TargetHumidifierDehumidifierState).value;
+      });
       this.service.getCharacteristic(this.hapChar.CurrentRelativeHumidity).onGet(() => {
         if (!this.isOnline) {
-          throw new this.hapErr(-70402)
+          throw new this.hapErr(-70402);
         }
-        return this.service.getCharacteristic(this.hapChar.CurrentRelativeHumidity).value
-      })
+        return this.service.getCharacteristic(this.hapChar.CurrentRelativeHumidity).value;
+      });
       this.service
         .getCharacteristic(this.hapChar.RelativeHumidityHumidifierThreshold)
         .updateValue(this.accessory.context.cacheTarget)
         .onGet(() => {
           if (!this.isOnline) {
-            throw new this.hapErr(-70402)
+            throw new this.hapErr(-70402);
           }
           return this.service.getCharacteristic(this.hapChar.RelativeHumidityHumidifierThreshold)
-            .value
-        })
+            .value;
+        });
     }
 
     // Initialise these caches now since they aren't determined by the initial externalUpdate()
-    this.cacheState = this.service.getCharacteristic(this.hapChar.Active).value === 1 ? 'on' : 'off'
-    this.cacheHumid =
-      this.cacheState === 'on' &&
-      this.service.getCharacteristic(this.hapChar.CurrentHumidifierDehumidifierState).value === 2
-        ? 'on'
-        : 'off'
+    this.cacheState = this.service.getCharacteristic(this.hapChar.Active).value === 1 ? 'on' : 'off';
+    this.cacheHumid = this.cacheState === 'on'
+      && this.service.getCharacteristic(this.hapChar.CurrentHumidifierDehumidifierState).value === 2
+      ? 'on'
+      : 'off';
 
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new platform.eveService('custom', this.accessory, {
-      log: platform.config.debugFakegato ? this.log : () => {}
-    })
+      log: platform.config.debugFakegato ? this.log : () => {},
+    });
 
     // Set up an interval to get eWeLink to send regular temperature/humidity updates
     if (platform.config.mode !== 'lan') {
       setTimeout(() => {
-        this.internalUIUpdate()
-        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
-      }, 5000)
+        this.internalUIUpdate();
+        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000);
+      }, 5000);
 
       // Stop the intervals on Homebridge shutdown
-      platform.api.on('shutdown', () => clearInterval(this.intervalPoll))
+      platform.api.on('shutdown', () => clearInterval(this.intervalPoll));
     }
 
     // Output the customised options to the log
+    const normalLogging = this.enableLogging ? 'standard' : 'disable';
     const opts = JSON.stringify({
       humidityOffset: this.humiOffset,
       humidityOffsetFactor: this.humiOffsetFactor,
-      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
+      logging: this.enableDebugLogging ? 'debug' : normalLogging,
       offset: this.tempOffset,
       offsetFactor: this.tempOffsetFactor,
-      showAs: 'humidifier'
-    })
-    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
+      showAs: 'humidifier',
+    });
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts);
   }
 
-  async internalStateUpdate (value) {
+  async internalStateUpdate(value) {
     try {
-      const params = { deviceType: 'normal' }
-      let newState
-      let newHumid
+      const params = { deviceType: 'normal' };
+      let newState;
+      let newHumid;
       if (value === 0) {
-        params.mainSwitch = 'off'
-        params.switch = 'off'
-        newState = 'off'
-        newHumid = 'off'
+        params.mainSwitch = 'off';
+        params.switch = 'off';
+        newState = 'off';
+        newHumid = 'off';
+      } else if (this.cacheHumi < this.accessory.context.cacheTarget) {
+        params.mainSwitch = 'on';
+        params.switch = 'on';
+        newState = 'on';
+        newHumid = 'on';
       } else {
-        if (this.cacheHumi < this.accessory.context.cacheTarget) {
-          params.mainSwitch = 'on'
-          params.switch = 'on'
-          newState = 'on'
-          newHumid = 'on'
-        } else {
-          params.mainSwitch = 'off'
-          params.switch = 'off'
-          newState = 'on'
-          newHumid = 'off'
-        }
+        params.mainSwitch = 'off';
+        params.switch = 'off';
+        newState = 'on';
+        newHumid = 'off';
       }
 
       // Only send the update if either:
       // * The new value (state) is OFF and the cacheHumid was ON
       // * The new value (state) is ON and newHumid is 'on'
       if ((value === 0 && this.cacheHumid === 'on') || (value === 1 && newHumid === 'on')) {
-        await this.platform.sendDeviceUpdate(this.accessory, params)
+        await this.platform.sendDeviceUpdate(this.accessory, params);
       }
       if (newState !== this.cacheState) {
-        this.cacheState = newState
+        this.cacheState = newState;
         if (this.enableLogging) {
-          this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
+          this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState);
         }
       }
       if (newHumid !== this.cacheHumid) {
-        this.cacheHumid = newHumid
+        this.cacheHumid = newHumid;
         if (this.enableLogging) {
-          this.log('[%s] %s [%s].', this.name, this.lang.curHumid, this.cacheHumid)
+          this.log('[%s] %s [%s].', this.name, this.lang.curHumid, this.cacheHumid);
         }
       }
+      const hapState = this.cacheHumid === 'on' ? 2 : 1;
       this.service.updateCharacteristic(
         this.hapChar.CurrentHumidifierDehumidifierState,
-        value === 1 ? (this.cacheHumid === 'on' ? 2 : 1) : 0
-      )
+        value === 1 ? hapState : 0,
+      );
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true);
       setTimeout(() => {
-        this.service.updateCharacteristic(this.hapChar.Active, this.cacheState === 'on' ? 1 : 0)
-      }, 2000)
-      throw new this.hapErr(-70402)
+        this.service.updateCharacteristic(this.hapChar.Active, this.cacheState === 'on' ? 1 : 0);
+      }, 2000);
+      throw new this.hapErr(-70402);
     }
   }
 
-  async internalTargetHumidityUpdate (value) {
+  async internalTargetHumidityUpdate(value) {
     try {
       if (value === this.accessory.context.cacheTarget) {
-        return
+        return;
       }
-      this.accessory.context.cacheTarget = value
+      this.accessory.context.cacheTarget = value;
       if (this.enableLogging) {
-        this.log('[%s] %s [%s%].', this.name, this.lang.curTarg, value)
+        this.log('[%s] %s [%s%].', this.name, this.lang.curTarg, value);
       }
       if (this.cacheState === 'off') {
-        return
+        return;
       }
-      const params = { deviceType: 'normal' }
-      let newHumid
+      const params = { deviceType: 'normal' };
+      let newHumid;
       if (this.cacheHumi < value) {
-        params.mainSwitch = 'on'
-        params.switch = 'on'
-        newHumid = 'on'
+        params.mainSwitch = 'on';
+        params.switch = 'on';
+        newHumid = 'on';
       } else {
-        params.mainSwitch = 'off'
-        params.switch = 'off'
-        newHumid = 'off'
+        params.mainSwitch = 'off';
+        params.switch = 'off';
+        newHumid = 'off';
       }
       if (newHumid === this.cacheHumid) {
-        return
+        return;
       }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.cacheHumid = newHumid
+      await this.platform.sendDeviceUpdate(this.accessory, params);
+      this.cacheHumid = newHumid;
       if (this.enableLogging) {
-        this.log('[%s] %s [%s].', this.name, this.lang.curHumid, this.cacheHumid)
+        this.log('[%s] %s [%s].', this.name, this.lang.curHumid, this.cacheHumid);
       }
       this.service.updateCharacteristic(
         this.hapChar.CurrentHumidifierDehumidifierState,
-        this.cacheHumid === 'on' ? 2 : 1
-      )
+        this.cacheHumid === 'on' ? 2 : 1,
+      );
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true);
       setTimeout(() => {
         this.service.updateCharacteristic(
           this.hapChar.RelativeHumidityHumidifierThreshold,
-          this.accessory.context.cacheTarget
-        )
-      }, 2000)
-      throw new this.hapErr(-70402)
+          this.accessory.context.cacheTarget,
+        );
+      }, 2000);
+      throw new this.hapErr(-70402);
     }
   }
 
-  async internalCurrentHumidityUpdate () {
+  async internalCurrentHumidityUpdate() {
     try {
       if (this.cacheState === 'off') {
-        return
+        return;
       }
-      const params = { deviceType: 'normal' }
-      let newHumid
+      const params = { deviceType: 'normal' };
+      let newHumid;
       if (this.cacheHumi < this.accessory.context.cacheTarget) {
-        params.mainSwitch = 'on'
-        params.switch = 'on'
-        newHumid = 'on'
+        params.mainSwitch = 'on';
+        params.switch = 'on';
+        newHumid = 'on';
       } else {
-        params.mainSwitch = 'off'
-        params.switch = 'off'
-        newHumid = 'off'
+        params.mainSwitch = 'off';
+        params.switch = 'off';
+        newHumid = 'off';
       }
       if (newHumid === this.cacheHumid) {
-        return
+        return;
       }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.cacheHumid = newHumid
+      await this.platform.sendDeviceUpdate(this.accessory, params);
+      this.cacheHumid = newHumid;
       if (this.enableLogging) {
-        this.log('[%s] %s [%s].', this.name, this.lang.curHumid, this.cacheHumid)
+        this.log('[%s] %s [%s].', this.name, this.lang.curHumid, this.cacheHumid);
       }
       this.service.updateCharacteristic(
         this.hapChar.CurrentHumidifierDehumidifierState,
-        this.cacheHumid === 'on' ? 2 : 1
-      )
+        this.cacheHumid === 'on' ? 2 : 1,
+      );
     } catch (err) {
       // Suppress errors here
     }
   }
 
-  async internalUIUpdate () {
+  async internalUIUpdate() {
     try {
       // Skip polling if device isn't online
       if (!this.isOnline) {
-        return
+        return;
       }
 
       // Send the params to request the updates
-      await this.platform.sendDeviceUpdate(this.accessory, { uiActive: 120 })
+      await this.platform.sendDeviceUpdate(this.accessory, { uiActive: 120 });
     } catch (err) {
       // Suppress errors here
     }
   }
 
-  async externalUpdate (params) {
+  async externalUpdate(params) {
     try {
       if (
-        this.funcs.hasProperty(params, 'currentTemperature') &&
-        params.currentTemperature !== 'unavailable'
+        hasProperty(params, 'currentTemperature')
+        && params.currentTemperature !== 'unavailable'
       ) {
-        let newTemp = Number(params.currentTemperature)
+        let newTemp = Number(params.currentTemperature);
         if (this.tempOffsetFactor) {
-          newTemp *= this.tempOffset
+          newTemp *= this.tempOffset;
         } else {
-          newTemp += this.tempOffset
+          newTemp += this.tempOffset;
         }
         if (newTemp !== this.cacheTemp) {
-          this.cacheTemp = newTemp
-          this.tempService.updateCharacteristic(this.hapChar.CurrentTemperature, this.cacheTemp)
-          this.accessory.eveService.addEntry({ temp: this.cacheTemp })
+          this.cacheTemp = newTemp;
+          this.tempService.updateCharacteristic(this.hapChar.CurrentTemperature, this.cacheTemp);
+          this.accessory.eveService.addEntry({ temp: this.cacheTemp });
           if (params.updateSource && this.enableLogging) {
-            this.log('[%s] %s [%s°C].', this.name, this.lang.curTemp, this.cacheTemp)
+            this.log('[%s] %s [%s°C].', this.name, this.lang.curTemp, this.cacheTemp);
           }
 
           // Update the cache file with the new temperature
-          this.updateCache()
+          this.updateCache();
         }
       }
       if (
-        this.funcs.hasProperty(params, 'currentHumidity') &&
-        params.currentHumidity !== 'unavailable'
+        hasProperty(params, 'currentHumidity')
+        && params.currentHumidity !== 'unavailable'
       ) {
-        let newHumi = parseInt(params.currentHumidity)
+        let newHumi = parseInt(params.currentHumidity, 10);
         if (this.humiOffsetFactor) {
-          newHumi *= this.humiOffset
+          newHumi *= this.humiOffset;
         } else {
-          newHumi += this.humiOffset
+          newHumi += this.humiOffset;
         }
-        newHumi = Math.max(Math.min(parseInt(newHumi), 100), 0)
+        newHumi = Math.max(Math.min(parseInt(newHumi, 10), 100), 0);
         if (newHumi !== this.cacheHumi) {
-          this.cacheHumi = newHumi
-          this.service.updateCharacteristic(this.hapChar.CurrentRelativeHumidity, this.cacheHumi)
-          this.accessory.eveService.addEntry({ humidity: this.cacheHumi })
+          this.cacheHumi = newHumi;
+          this.service.updateCharacteristic(this.hapChar.CurrentRelativeHumidity, this.cacheHumi);
+          this.accessory.eveService.addEntry({ humidity: this.cacheHumi });
           if (params.updateSource && this.enableLogging) {
-            this.log('[%s] %s [%s%].', this.name, this.lang.curHumi, this.cacheHumi)
+            this.log('[%s] %s [%s%].', this.name, this.lang.curHumi, this.cacheHumi);
           }
-          await this.internalCurrentHumidityUpdate()
+          this.internalCurrentHumidityUpdate();
         }
       }
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, false)
+      this.platform.deviceUpdateError(this.accessory, err, false);
     }
   }
 
-  async updateCache () {
+  async updateCache() {
     // Don't continue if the storage client hasn't initialised properly
     if (!this.platform.storageClientData) {
-      return
+      return;
     }
 
     // Attempt to save the new temperature to the cache
     try {
       await this.platform.storageData.setItem(
-        this.accessory.context.eweDeviceId + '_temp',
-        this.cacheTemp
-      )
+        `${this.accessory.context.eweDeviceId}_temp`,
+        this.cacheTemp,
+      );
     } catch (err) {
       if (this.enableLogging) {
-        const eText = this.funcs.parseError(err)
-        this.log.warn('[%s] %s %s.', this.name, this.lang.storageWriteErr, eText)
+        const eText = parseError(err);
+        this.log.warn('[%s] %s %s.', this.name, this.lang.storageWriteErr, eText);
       }
     }
   }
 
-  markStatus (isOnline) {
-    this.isOnline = isOnline
+  markStatus(isOnline) {
+    this.isOnline = isOnline;
   }
 }
diff --git a/lib/device/simulation/th-thermostat.js b/lib/device/simulation/th-thermostat.js
index 3a0d3838..86affb2b 100644
--- a/lib/device/simulation/th-thermostat.js
+++ b/lib/device/simulation/th-thermostat.js
@@ -1,149 +1,140 @@
-/* jshint node: true, esversion: 10, -W014, -W033 */
-/* eslint-disable new-cap */
-'use strict'
+import platformConsts from '../../utils/constants.js';
+import { hasProperty, parseError } from '../../utils/functions.js';
 
-module.exports = class deviceTHThermostat {
-  constructor (platform, accessory) {
+export default class {
+  constructor(platform, accessory) {
     // Set up variables from the platform
-    this.funcs = platform.funcs
-    this.hapChar = platform.api.hap.Characteristic
-    this.hapErr = platform.api.hap.HapStatusError
-    this.hapServ = platform.api.hap.Service
-    this.lang = platform.lang
-    this.log = platform.log
-    this.platform = platform
+    this.hapChar = platform.api.hap.Characteristic;
+    this.hapErr = platform.api.hap.HapStatusError;
+    this.hapServ = platform.api.hap.Service;
+    this.lang = platform.lang;
+    this.log = platform.log;
+    this.platform = platform;
 
     // Set up variables from the accessory
-    this.name = accessory.displayName
-    this.accessory = accessory
+    this.name = accessory.displayName;
+    this.accessory = accessory;
 
     // Initially set the online flag as true (to be then updated as false if necessary)
-    this.isOnline = true
+    this.isOnline = true;
 
     // Set up custom variables for this device type
-    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
-    this.tempOffset =
-      deviceConf && deviceConf.offset ? deviceConf.offset : platform.consts.defaultValues.offset
-    this.tempOffsetFactor = deviceConf && deviceConf.offsetFactor
-    this.humiOffset =
-      deviceConf && deviceConf.humidityOffset
-        ? parseInt(deviceConf.humidityOffset)
-        : platform.consts.defaultValues.humidityOffset
-    this.humiOffsetFactor = deviceConf && deviceConf.humidityOffsetFactor
-    this.minTarget =
-      deviceConf && deviceConf.minTarget
-        ? deviceConf.minTarget
-        : platform.consts.defaultValues.minTarget
-    this.maxTarget =
-      deviceConf && deviceConf.maxTarget
-        ? Math.max(deviceConf.maxTarget, this.minTarget + 1)
-        : platform.consts.defaultValues.maxTarget
-    this.showHeatCool = deviceConf && deviceConf.showHeatCool
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId] || {};
+    this.tempOffset = deviceConf.offset || platformConsts.defaultValues.offset;
+    this.tempOffsetFactor = deviceConf.offsetFactor;
+    this.humiOffset = deviceConf.humidityOffset
+      ? parseInt(deviceConf.humidityOffset, 10)
+      : platformConsts.defaultValues.humidityOffset;
+    this.humiOffsetFactor = deviceConf.humidityOffsetFactor;
+    this.minTarget = deviceConf.minTarget || platformConsts.defaultValues.minTarget;
+    this.maxTarget = deviceConf.maxTarget
+      ? Math.max(deviceConf.maxTarget, this.minTarget + 1)
+      : platformConsts.defaultValues.maxTarget;
+    this.showHeatCool = deviceConf.showHeatCool;
 
     // Set the correct logging variables for this accessory
-    this.enableLogging = !platform.config.disableDeviceLogging
-    this.enableDebugLogging = platform.config.debug
-    if (deviceConf && deviceConf.overrideLogging) {
-      switch (deviceConf.overrideLogging) {
-        case 'standard':
-          this.enableLogging = true
-          this.enableDebugLogging = false
-          break
-        case 'debug':
-          this.enableLogging = true
-          this.enableDebugLogging = true
-          break
-        case 'disable':
-          this.enableLogging = false
-          this.enableDebugLogging = false
-          break
-      }
+    switch (deviceConf.overrideLogging) {
+      case 'standard':
+        this.enableLogging = true;
+        this.enableDebugLogging = false;
+        break;
+      case 'debug':
+        this.enableLogging = true;
+        this.enableDebugLogging = true;
+        break;
+      case 'disable':
+        this.enableLogging = false;
+        this.enableDebugLogging = false;
+        break;
+      default:
+        this.enableLogging = !platform.config.disableDeviceLogging;
+        this.enableDebugLogging = platform.config.debug;
+        break;
     }
 
     // If the accessory has a switch service then remove it
     if (this.accessory.getService(this.hapServ.Switch)) {
-      this.accessory.removeService(this.accessory.getService(this.hapServ.Switch))
+      this.accessory.removeService(this.accessory.getService(this.hapServ.Switch));
     }
 
     // If the accessory has a temperature sensor service then remove it
     if (this.accessory.getService(this.hapServ.TemperatureSensor)) {
-      this.accessory.removeService(this.accessory.getService(this.hapServ.TemperatureSensor))
+      this.accessory.removeService(this.accessory.getService(this.hapServ.TemperatureSensor));
     }
 
     // Set up the accessory with default target temp when added the first time
-    if (!this.funcs.hasProperty(this.accessory.context, 'cacheTarget')) {
-      this.accessory.context.cacheTarget = 20
+    if (!hasProperty(this.accessory.context, 'cacheTarget')) {
+      this.accessory.context.cacheTarget = 20;
     }
 
     // If the accessory has a heater service then remove it
     if (this.accessory.getService(this.hapServ.HeaterCooler)) {
-      this.accessory.removeService(this.accessory.getService(this.hapServ.HeaterCooler))
+      this.accessory.removeService(this.accessory.getService(this.hapServ.HeaterCooler));
     }
 
     // If the accessory has a humidifier service then remove it
     if (this.accessory.getService(this.hapServ.HumidifierDehumidifier)) {
-      this.accessory.removeService(this.accessory.getService(this.hapServ.HumidifierDehumidifier))
+      this.accessory.removeService(this.accessory.getService(this.hapServ.HumidifierDehumidifier));
     }
 
     // If the accessory has a humidity sensor service then remove it
     if (this.accessory.getService(this.hapServ.HumiditySensor)) {
-      this.accessory.removeService(this.accessory.getService(this.hapServ.HumiditySensor))
+      this.accessory.removeService(this.accessory.getService(this.hapServ.HumiditySensor));
     }
 
     // Add a context property to save the desired state of the showHeatCool option
-    if (!this.funcs.hasProperty(accessory.context, 'showHeatCool')) {
-      accessory.context.showHeatCool = false
+    if (!hasProperty(accessory.context, 'showHeatCool')) {
+      accessory.context.showHeatCool = false;
     }
 
     // Reset the thermostat service if showHeatCool has been switched on from off
     if (this.showHeatCool && !accessory.context.showHeatCool) {
-      accessory.context.showHeatCool = true
+      accessory.context.showHeatCool = true;
       if (this.accessory.getService(this.hapServ.Thermostat)) {
-        this.accessory.removeService(this.accessory.getService(this.hapServ.Thermostat))
+        this.accessory.removeService(this.accessory.getService(this.hapServ.Thermostat));
       }
     }
 
     // Reset the thermostat service if showHeatCool has been switched off from on
     if (!this.showHeatCool && accessory.context.showHeatCool) {
-      accessory.context.showHeatCool = false
+      accessory.context.showHeatCool = false;
       if (this.accessory.getService(this.hapServ.Thermostat)) {
-        this.accessory.removeService(this.accessory.getService(this.hapServ.Thermostat))
+        this.accessory.removeService(this.accessory.getService(this.hapServ.Thermostat));
       }
     }
 
     // Add the thermostat service if it doesn't already exist
-    this.service =
-      this.accessory.getService(this.hapServ.Thermostat) ||
-      this.accessory.addService(this.hapServ.Thermostat)
+    this.service = this.accessory.getService(this.hapServ.Thermostat)
+      || this.accessory.addService(this.hapServ.Thermostat);
 
     // The DS18B20 sensor does not provide humidity readings
     if (this.accessory.context.sensorType === 'DS18B20') {
       if (this.service.testCharacteristic(this.hapChar.CurrentRelativeHumidity)) {
         this.service.removeCharacteristic(
-          this.service.getCharacteristic(this.hapChar.CurrentRelativeHumidity)
-        )
+          this.service.getCharacteristic(this.hapChar.CurrentRelativeHumidity),
+        );
       }
     } else {
       if (!this.service.testCharacteristic(this.hapChar.CurrentRelativeHumidity)) {
-        this.service.addCharacteristic(this.hapChar.CurrentRelativeHumidity)
+        this.service.addCharacteristic(this.hapChar.CurrentRelativeHumidity);
       }
-      this.humiService = true
+      this.humiService = true;
     }
 
     // Set custom properties of the current temperature characteristic
     this.service.getCharacteristic(this.hapChar.CurrentTemperature).setProps({
-      minStep: 0.1
-    })
-    this.cacheTemp = this.service.getCharacteristic(this.hapChar.CurrentTemperature).value
-    this.updateCache()
+      minStep: 0.1,
+    });
+    this.cacheTemp = this.service.getCharacteristic(this.hapChar.CurrentTemperature).value;
+    this.updateCache();
 
     // Add options to the target state characteristic
     this.service
       .getCharacteristic(this.hapChar.TargetHeatingCoolingState)
       .setProps({
-        validValues: this.showHeatCool ? [0, 1, 2] : [0, 3]
+        validValues: this.showHeatCool ? [0, 1, 2] : [0, 3],
       })
-      .onSet(async value => await this.internalStateUpdate(value))
+      .onSet(async (value) => this.internalStateUpdate(value));
 
     // Add the set handler to the target temperature characteristic
     this.service
@@ -152,160 +143,163 @@ module.exports = class deviceTHThermostat {
       .setProps({
         minValue: this.minTarget,
         maxValue: this.maxTarget,
-        minStep: 0.5
+        minStep: 0.5,
       })
-      .onSet(async value => await this.internalTargetTempUpdate(value))
+      .onSet(async (value) => this.internalTargetTempUpdate(value));
 
     // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
     if (!platform.config.disableNoResponse) {
       this.service.getCharacteristic(this.hapChar.CurrentTemperature).onGet(() => {
         if (!this.isOnline) {
-          throw new this.hapErr(-70402)
+          throw new this.hapErr(-70402);
         }
-        return this.service.getCharacteristic(this.hapChar.CurrentTemperature).value
-      })
+        return this.service.getCharacteristic(this.hapChar.CurrentTemperature).value;
+      });
       this.service.getCharacteristic(this.hapChar.TargetHeatingCoolingState).onGet(() => {
         if (!this.isOnline) {
-          throw new this.hapErr(-70402)
+          throw new this.hapErr(-70402);
         }
-        return this.service.getCharacteristic(this.hapChar.TargetHeatingCoolingState).value
-      })
+        return this.service.getCharacteristic(this.hapChar.TargetHeatingCoolingState).value;
+      });
       this.service.getCharacteristic(this.hapChar.CurrentHeatingCoolingState).onGet(() => {
         if (!this.isOnline) {
-          throw new this.hapErr(-70402)
+          throw new this.hapErr(-70402);
         }
-        return this.service.getCharacteristic(this.hapChar.CurrentHeatingCoolingState).value
-      })
+        return this.service.getCharacteristic(this.hapChar.CurrentHeatingCoolingState).value;
+      });
       this.service.getCharacteristic(this.hapChar.TargetTemperature).onGet(() => {
         if (!this.isOnline) {
-          throw new this.hapErr(-70402)
+          throw new this.hapErr(-70402);
         }
-        return this.service.getCharacteristic(this.hapChar.TargetTemperature).value
-      })
+        return this.service.getCharacteristic(this.hapChar.TargetTemperature).value;
+      });
     }
 
     // Initialise these caches now since they aren't determined by the initial externalUpdate()
-    const curState = this.service.getCharacteristic(this.hapChar.TargetHeatingCoolingState).value
-    this.cacheState = curState > 0 ? 'on' : 'off'
-    this.cacheHeat =
-      this.cacheState === 'on' && [1, 3].includes(curState)
-        ? this.service.getCharacteristic(this.hapChar.TargetTemperature).value >
-          this.service.getCharacteristic(this.hapChar.CurrentTemperature).value
-          ? 'on'
-          : 'off'
-        : undefined
-    this.cacheHeat =
-      this.cacheState === 'on' && curState === 2
-        ? this.service.getCharacteristic(this.hapChar.TargetTemperature).value <
-          this.service.getCharacteristic(this.hapChar.CurrentTemperature).value
-          ? 'on'
-          : 'off'
-        : undefined
+    const curState = this.service.getCharacteristic(this.hapChar.TargetHeatingCoolingState).value;
+    this.cacheState = curState > 0 ? 'on' : 'off';
+    const heatTest = this.service.getCharacteristic(this.hapChar.TargetTemperature).value
+      > this.service.getCharacteristic(this.hapChar.CurrentTemperature).value
+      ? 'on'
+      : 'off';
+    this.cacheHeat = this.cacheState === 'on' && [1, 3].includes(curState)
+      ? heatTest
+      : undefined;
+    const coolTest = this.service.getCharacteristic(this.hapChar.TargetTemperature).value
+      < this.service.getCharacteristic(this.hapChar.CurrentTemperature).value
+      ? 'on'
+      : 'off';
+    this.cacheCool = this.cacheState === 'on' && curState === 2
+      ? coolTest
+      : undefined;
 
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new platform.eveService('custom', this.accessory, {
-      log: platform.config.debugFakegato ? this.log : () => {}
-    })
+      log: platform.config.debugFakegato ? this.log : () => {},
+    });
 
     // Set up an interval to get eWeLink to send regular temperature/humidity updates
     if (platform.config.mode !== 'lan') {
       setTimeout(() => {
-        this.internalUIUpdate()
-        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
-      }, 5000)
+        this.internalUIUpdate();
+        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000);
+      }, 5000);
 
       // Stop the intervals on Homebridge shutdown
-      platform.api.on('shutdown', () => clearInterval(this.intervalPoll))
+      platform.api.on('shutdown', () => clearInterval(this.intervalPoll));
     }
 
     // Output the customised options to the log
+    const normalLogging = this.enableLogging ? 'standard' : 'disable';
     const opts = JSON.stringify({
       humidityOffset: this.humiOffset,
       humidityOffsetFactor: this.humiOffsetFactor,
-      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
+      logging: this.enableDebugLogging ? 'debug' : normalLogging,
       maxTarget: this.maxTarget,
       minTarget: this.minTarget,
       offset: this.tempOffset,
       offsetFactor: this.tempOffsetFactor,
-      showAs: 'heater'
-    })
-    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
+      showAs: 'heater',
+    });
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts);
   }
 
-  async internalStateUpdate (value) {
+  async internalStateUpdate(value) {
     try {
-      const params = { deviceType: 'normal' }
+      const params = { deviceType: 'normal' };
 
       // this.showHeatCool true, values can be 0, 1, 2 otherwise 0, 3
-      let newState
-      let newHeat
-      let newCool
+      let newState;
+      let newHeat;
+      let newCool;
       switch (value) {
         case 0:
           // Turning off
-          params.mainSwitch = 'off'
-          params.switch = 'off'
-          newState = 'off'
-          newHeat = 'off'
-          newCool = 'off'
-          break
+          params.mainSwitch = 'off';
+          params.switch = 'off';
+          newState = 'off';
+          newHeat = 'off';
+          newCool = 'off';
+          break;
         case 1:
           // Turning to heat
           if (!this.showHeatCool) {
-            return
+            return;
           }
           if (this.cacheTemp < this.accessory.context.cacheTarget) {
-            params.mainSwitch = 'on'
-            params.switch = 'on'
-            newState = 'on'
-            newHeat = 'on'
-            newCool = 'off'
+            params.mainSwitch = 'on';
+            params.switch = 'on';
+            newState = 'on';
+            newHeat = 'on';
+            newCool = 'off';
           } else {
-            params.mainSwitch = 'off'
-            params.switch = 'off'
-            newState = 'on'
-            newHeat = 'off'
-            newCool = 'off'
+            params.mainSwitch = 'off';
+            params.switch = 'off';
+            newState = 'on';
+            newHeat = 'off';
+            newCool = 'off';
           }
-          break
+          break;
         case 2:
           // Turning to cool
           if (!this.showHeatCool) {
-            return
+            return;
           }
           if (this.cacheTemp > this.accessory.context.cacheTarget) {
-            params.mainSwitch = 'on'
-            params.switch = 'on'
-            newState = 'on'
-            newHeat = 'off'
-            newCool = 'on'
+            params.mainSwitch = 'on';
+            params.switch = 'on';
+            newState = 'on';
+            newHeat = 'off';
+            newCool = 'on';
           } else {
-            params.mainSwitch = 'off'
-            params.switch = 'off'
-            newState = 'on'
-            newHeat = 'off'
-            newCool = 'off'
+            params.mainSwitch = 'off';
+            params.switch = 'off';
+            newState = 'on';
+            newHeat = 'off';
+            newCool = 'off';
           }
-          break
+          break;
         case 3:
           // Turning to auto
           if (this.showHeatCool) {
-            return
+            return;
           }
           if (this.cacheTemp < this.accessory.context.cacheTarget) {
-            params.mainSwitch = 'on'
-            params.switch = 'on'
-            newState = 'on'
-            newHeat = 'on'
-            newCool = 'off'
+            params.mainSwitch = 'on';
+            params.switch = 'on';
+            newState = 'on';
+            newHeat = 'on';
+            newCool = 'off';
           } else {
-            params.mainSwitch = 'off'
-            params.switch = 'off'
-            newState = 'on'
-            newHeat = 'off'
-            newCool = 'off'
+            params.mainSwitch = 'off';
+            params.switch = 'off';
+            newState = 'on';
+            newHeat = 'off';
+            newCool = 'off';
           }
-          break
+          break;
+        default:
+          return;
       }
 
       // Only send the update if either:
@@ -313,298 +307,306 @@ module.exports = class deviceTHThermostat {
       // * The new value (state) is ON and (newHeat is 'on' or newCool is 'on')
       // * (cacheHeat was ON and newCool is ON) or (cacheCool was ON and newHeat is ON)
       if (
-        (value === 0 && (this.cacheHeat === 'on' || this.cacheCool === 'on')) ||
-        ([1, 3].includes(value) && newHeat !== this.cacheHeat) ||
-        (value === 2 && newCool !== this.cacheCool)
+        (value === 0 && (this.cacheHeat === 'on' || this.cacheCool === 'on'))
+        || ([1, 3].includes(value) && newHeat !== this.cacheHeat)
+        || (value === 2 && newCool !== this.cacheCool)
       ) {
-        await this.platform.sendDeviceUpdate(this.accessory, params)
+        await this.platform.sendDeviceUpdate(this.accessory, params);
       }
       if (newState !== this.cacheState) {
-        this.cacheState = newState
-        this.cacheHeat = undefined
-        this.cacheCool = undefined
+        this.cacheState = newState;
+        this.cacheHeat = undefined;
+        this.cacheCool = undefined;
         if (this.enableLogging) {
-          this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
+          this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState);
         }
       }
       if ([1, 3].includes(value) && newHeat !== this.cacheHeat) {
-        this.cacheHeat = newHeat
-        this.cacheCool = undefined
+        this.cacheHeat = newHeat;
+        this.cacheCool = undefined;
         if (this.enableLogging) {
-          this.log('[%s] %s [%s].', this.name, this.lang.curHeat, this.cacheHeat)
+          this.log('[%s] %s [%s].', this.name, this.lang.curHeat, this.cacheHeat);
         }
       }
       if (value === 2 && newCool !== this.cacheCool) {
-        this.cacheCool = newCool
-        this.cacheHeat = undefined
+        this.cacheCool = newCool;
+        this.cacheHeat = undefined;
         if (this.enableLogging) {
-          this.log('[%s] %s [%s].', this.name, this.lang.curCool, this.cacheCool)
+          this.log('[%s] %s [%s].', this.name, this.lang.curCool, this.cacheCool);
         }
       }
+      const hapState = this.cacheHeat === 'on' ? 1 : 0;
       this.service.updateCharacteristic(
         this.hapChar.CurrentHeatingCoolingState,
-        this.cacheCool === 'on' ? 2 : this.cacheHeat === 'on' ? 1 : 0
-      )
+        this.cacheCool === 'on' ? 2 : hapState,
+      );
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true);
       setTimeout(() => {
+        const hapState = this.cacheHeat === 'on' ? 1 : 0;
         this.service.updateCharacteristic(
           this.hapChar.TargetHeatingCoolingState,
-          this.cacheCool === 'on' ? 2 : this.cacheHeat === 'on' ? 1 : 0
-        )
-      }, 2000)
-      throw new this.hapErr(-70402)
+          this.cacheCool === 'on' ? 2 : hapState,
+        );
+      }, 2000);
+      throw new this.hapErr(-70402);
     }
   }
 
-  async internalTargetTempUpdate (value) {
+  async internalTargetTempUpdate(value) {
     try {
       if (value === this.accessory.context.cacheTarget) {
-        return
+        return;
       }
-      this.accessory.context.cacheTarget = value
+      this.accessory.context.cacheTarget = value;
       if (this.enableLogging) {
-        this.log('[%s] %s [%s°C].', this.name, this.lang.curTarg, value)
+        this.log('[%s] %s [%s°C].', this.name, this.lang.curTarg, value);
       }
       if (this.cacheState === 'off') {
-        return
+        return;
       }
-      const params = { deviceType: 'normal' }
-      let newHeat
-      let newCool
+      const params = { deviceType: 'normal' };
+      let newHeat;
+      let newCool;
 
-      const curMode = this.service.getCharacteristic(this.hapChar.TargetHeatingCoolingState).value
+      const curMode = this.service.getCharacteristic(this.hapChar.TargetHeatingCoolingState).value;
       switch (curMode) {
         case 1:
         case 3:
           // Currently in heating or auto mode
           if (this.cacheTemp < this.accessory.context.cacheTarget) {
-            params.mainSwitch = 'on'
-            params.switch = 'on'
-            newHeat = 'on'
-            newCool = 'off'
+            params.mainSwitch = 'on';
+            params.switch = 'on';
+            newHeat = 'on';
+            newCool = 'off';
           } else {
-            params.mainSwitch = 'off'
-            params.switch = 'off'
-            newHeat = 'off'
-            newCool = 'off'
+            params.mainSwitch = 'off';
+            params.switch = 'off';
+            newHeat = 'off';
+            newCool = 'off';
           }
-          break
+          break;
         case 2:
           // Currently in cooling mode
           if (this.cacheTemp > this.accessory.context.cacheTarget) {
-            params.mainSwitch = 'on'
-            params.switch = 'on'
-            newHeat = 'off'
-            newCool = 'on'
+            params.mainSwitch = 'on';
+            params.switch = 'on';
+            newHeat = 'off';
+            newCool = 'on';
           } else {
-            params.mainSwitch = 'off'
-            params.switch = 'off'
-            newHeat = 'off'
-            newCool = 'off'
+            params.mainSwitch = 'off';
+            params.switch = 'off';
+            newHeat = 'off';
+            newCool = 'off';
           }
-          break
+          break;
+        default:
+          return;
       }
 
       // Only send the update if either:
       // * The new value (state) is ON and (newHeat is 'on' or newCool is 'on')
       // * (cacheHeat was ON and newCool is ON) or (cacheCool was ON and newHeat is ON)
       if (
-        ([1, 3].includes(curMode) && newHeat !== this.cacheHeat) ||
-        (curMode === 2 && newCool !== this.cacheCool)
+        ([1, 3].includes(curMode) && newHeat !== this.cacheHeat)
+        || (curMode === 2 && newCool !== this.cacheCool)
       ) {
-        await this.platform.sendDeviceUpdate(this.accessory, params)
+        await this.platform.sendDeviceUpdate(this.accessory, params);
       }
       if ([1, 3].includes(curMode) && newHeat !== this.cacheHeat) {
-        this.cacheHeat = newHeat
-        this.cacheCool = undefined
+        this.cacheHeat = newHeat;
+        this.cacheCool = undefined;
         if (this.enableLogging) {
-          this.log('[%s] %s [%s].', this.name, this.lang.curHeat, this.cacheHeat)
+          this.log('[%s] %s [%s].', this.name, this.lang.curHeat, this.cacheHeat);
         }
       }
       if (curMode === 2 && newCool !== this.cacheCool) {
-        this.cacheCool = newCool
-        this.cacheHeat = undefined
+        this.cacheCool = newCool;
+        this.cacheHeat = undefined;
         if (this.enableLogging) {
-          this.log('[%s] %s [%s].', this.name, this.lang.curCool, this.cacheCool)
+          this.log('[%s] %s [%s].', this.name, this.lang.curCool, this.cacheCool);
         }
       }
+      const hapState = this.cacheHeat === 'on' ? 1 : 0;
       this.service.updateCharacteristic(
         this.hapChar.CurrentHeatingCoolingState,
-        this.cacheCool === 'on' ? 2 : this.cacheHeat === 'on' ? 1 : 0
-      )
+        this.cacheCool === 'on' ? 2 : hapState,
+      );
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true);
       setTimeout(() => {
         this.service.updateCharacteristic(
           this.hapChar.TargetTemperature,
-          this.accessory.context.cacheTarget
-        )
-      }, 2000)
-      throw new this.hapErr(-70402)
+          this.accessory.context.cacheTarget,
+        );
+      }, 2000);
+      throw new this.hapErr(-70402);
     }
   }
 
-  async internalCurrentTempUpdate () {
+  async internalCurrentTempUpdate() {
     try {
       if (this.cacheState === 'off') {
-        return
+        return;
       }
-      const params = { deviceType: 'normal' }
-      let newHeat
-      let newCool
+      const params = { deviceType: 'normal' };
+      let newHeat;
+      let newCool;
 
-      const curMode = this.service.getCharacteristic(this.hapChar.TargetHeatingCoolingState).value
+      const curMode = this.service.getCharacteristic(this.hapChar.TargetHeatingCoolingState).value;
       switch (curMode) {
         case 1:
         case 3:
           // Currently in heating or auto mode
           if (this.cacheTemp < this.accessory.context.cacheTarget) {
-            params.mainSwitch = 'on'
-            params.switch = 'on'
-            newHeat = 'on'
-            newCool = 'off'
+            params.mainSwitch = 'on';
+            params.switch = 'on';
+            newHeat = 'on';
+            newCool = 'off';
           } else {
-            params.mainSwitch = 'off'
-            params.switch = 'off'
-            newHeat = 'off'
-            newCool = 'off'
+            params.mainSwitch = 'off';
+            params.switch = 'off';
+            newHeat = 'off';
+            newCool = 'off';
           }
-          break
+          break;
         case 2:
           // Currently in cooling mode
           if (this.cacheTemp > this.accessory.context.cacheTarget) {
-            params.mainSwitch = 'on'
-            params.switch = 'on'
-            newHeat = 'off'
-            newCool = 'on'
+            params.mainSwitch = 'on';
+            params.switch = 'on';
+            newHeat = 'off';
+            newCool = 'on';
           } else {
-            params.mainSwitch = 'off'
-            params.switch = 'off'
-            newHeat = 'off'
-            newCool = 'off'
+            params.mainSwitch = 'off';
+            params.switch = 'off';
+            newHeat = 'off';
+            newCool = 'off';
           }
-          break
+          break;
+        default:
+          return;
       }
 
       // Only send the update if either:
       // * The new value (state) is ON and (newHeat is 'on' or newCool is 'on')
       // * (cacheHeat was ON and newCool is ON) or (cacheCool was ON and newHeat is ON)
       if (
-        ([1, 3].includes(curMode) && newHeat !== this.cacheHeat) ||
-        (curMode === 2 && newCool !== this.cacheCool)
+        ([1, 3].includes(curMode) && newHeat !== this.cacheHeat)
+        || (curMode === 2 && newCool !== this.cacheCool)
       ) {
-        await this.platform.sendDeviceUpdate(this.accessory, params)
+        await this.platform.sendDeviceUpdate(this.accessory, params);
       }
       if ([1, 3].includes(curMode) && newHeat !== this.cacheHeat) {
-        this.cacheHeat = newHeat
-        this.cacheCool = undefined
+        this.cacheHeat = newHeat;
+        this.cacheCool = undefined;
         if (this.enableLogging) {
-          this.log('[%s] %s [%s].', this.name, this.lang.curHeat, this.cacheHeat)
+          this.log('[%s] %s [%s].', this.name, this.lang.curHeat, this.cacheHeat);
         }
       }
       if (curMode === 2 && newCool !== this.cacheCool) {
-        this.cacheCool = newCool
-        this.cacheHeat = undefined
+        this.cacheCool = newCool;
+        this.cacheHeat = undefined;
         if (this.enableLogging) {
-          this.log('[%s] %s [%s].', this.name, this.lang.curCool, this.cacheCool)
+          this.log('[%s] %s [%s].', this.name, this.lang.curCool, this.cacheCool);
         }
       }
+      const hapState = this.cacheHeat === 'on' ? 1 : 0;
       this.service.updateCharacteristic(
         this.hapChar.CurrentHeatingCoolingState,
-        this.cacheCool === 'on' ? 2 : this.cacheHeat === 'on' ? 1 : 0
-      )
+        this.cacheCool === 'on' ? 2 : hapState,
+      );
     } catch (err) {
       // Suppress errors here
     }
   }
 
-  async internalUIUpdate () {
+  async internalUIUpdate() {
     try {
       // Skip polling if device isn't online
       if (!this.isOnline) {
-        return
+        return;
       }
 
       // Send the params to request the updates
-      await this.platform.sendDeviceUpdate(this.accessory, { uiActive: 120 })
+      await this.platform.sendDeviceUpdate(this.accessory, { uiActive: 120 });
     } catch (err) {
       // Suppress errors here
     }
   }
 
-  async externalUpdate (params) {
+  async externalUpdate(params) {
     try {
       if (
-        this.funcs.hasProperty(params, 'currentTemperature') &&
-        params.currentTemperature !== 'unavailable'
+        hasProperty(params, 'currentTemperature')
+        && params.currentTemperature !== 'unavailable'
       ) {
-        let newTemp = Number(params.currentTemperature)
+        let newTemp = Number(params.currentTemperature);
         if (this.tempOffsetFactor) {
-          newTemp *= this.tempOffset
+          newTemp *= this.tempOffset;
         } else {
-          newTemp += this.tempOffset
+          newTemp += this.tempOffset;
         }
         if (newTemp !== this.cacheTemp) {
-          this.cacheTemp = newTemp
-          this.service.updateCharacteristic(this.hapChar.CurrentTemperature, this.cacheTemp)
-          this.accessory.eveService.addEntry({ temp: this.cacheTemp })
+          this.cacheTemp = newTemp;
+          this.service.updateCharacteristic(this.hapChar.CurrentTemperature, this.cacheTemp);
+          this.accessory.eveService.addEntry({ temp: this.cacheTemp });
           if (params.updateSource && this.enableLogging) {
-            this.log('[%s] %s [%s°C].', this.name, this.lang.curTemp, this.cacheTemp)
+            this.log('[%s] %s [%s°C].', this.name, this.lang.curTemp, this.cacheTemp);
           }
 
           // Update the cache file with the new temperature
-          this.updateCache()
-          await this.internalCurrentTempUpdate()
+          this.updateCache();
+          this.internalCurrentTempUpdate();
         }
       }
       if (
-        this.funcs.hasProperty(params, 'currentHumidity') &&
-        params.currentHumidity !== 'unavailable' &&
-        this.humiService
+        hasProperty(params, 'currentHumidity')
+        && params.currentHumidity !== 'unavailable'
+        && this.humiService
       ) {
-        let newHumi = parseInt(params.currentHumidity)
+        let newHumi = parseInt(params.currentHumidity, 10);
         if (this.humiOffsetFactor) {
-          newHumi *= this.humiOffset
+          newHumi *= this.humiOffset;
         } else {
-          newHumi += this.humiOffset
+          newHumi += this.humiOffset;
         }
-        newHumi = Math.max(Math.min(parseInt(newHumi), 100), 0)
+        newHumi = Math.max(Math.min(parseInt(newHumi, 10), 100), 0);
         if (newHumi !== this.cacheHumi) {
-          this.cacheHumi = newHumi
-          this.service.updateCharacteristic(this.hapChar.CurrentRelativeHumidity, this.cacheHumi)
-          this.accessory.eveService.addEntry({ humidity: this.cacheHumi })
+          this.cacheHumi = newHumi;
+          this.service.updateCharacteristic(this.hapChar.CurrentRelativeHumidity, this.cacheHumi);
+          this.accessory.eveService.addEntry({ humidity: this.cacheHumi });
           if (params.updateSource && this.enableLogging) {
-            this.log('[%s] %s [%s%].', this.name, this.lang.curHumi, this.cacheHumi)
+            this.log('[%s] %s [%s%].', this.name, this.lang.curHumi, this.cacheHumi);
           }
         }
       }
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, false)
+      this.platform.deviceUpdateError(this.accessory, err, false);
     }
   }
 
-  async updateCache () {
+  async updateCache() {
     // Don't continue if the storage client hasn't initialised properly
     if (!this.platform.storageClientData) {
-      return
+      return;
     }
 
     // Attempt to save the new temperature to the cache
     try {
       await this.platform.storageData.setItem(
-        this.accessory.context.eweDeviceId + '_temp',
-        this.cacheTemp
-      )
+        `${this.accessory.context.eweDeviceId}_temp`,
+        this.cacheTemp,
+      );
     } catch (err) {
       if (this.enableLogging) {
-        const eText = this.funcs.parseError(err)
-        this.log.warn('[%s] %s %s.', this.name, this.lang.storageWriteErr, eText)
+        const eText = parseError(err);
+        this.log.warn('[%s] %s %s.', this.name, this.lang.storageWriteErr, eText);
       }
     }
   }
 
-  markStatus (isOnline) {
-    this.isOnline = isOnline
+  markStatus(isOnline) {
+    this.isOnline = isOnline;
   }
 }
diff --git a/lib/device/simulation/tv.js b/lib/device/simulation/tv.js
index a166060a..975c1b5a 100644
--- a/lib/device/simulation/tv.js
+++ b/lib/device/simulation/tv.js
@@ -1,254 +1,252 @@
-/* jshint node: true, esversion: 10, -W014, -W033 */
-/* eslint-disable new-cap */
-'use strict'
+import platformConsts from '../../utils/constants.js';
+import { hasProperty } from '../../utils/functions.js';
 
-module.exports = class deviceTV {
-  constructor (platform, accessory) {
+export default class {
+  constructor(platform, accessory) {
     // Set up variables from the platform
-    this.eveChar = platform.eveChar
-    this.funcs = platform.funcs
-    this.hapChar = platform.api.hap.Characteristic
-    this.hapErr = platform.api.hap.HapStatusError
-    this.hapServ = platform.api.hap.Service
-    this.lang = platform.lang
-    this.log = platform.log
-    this.platform = platform
+    this.eveChar = platform.eveChar;
+    this.hapChar = platform.api.hap.Characteristic;
+    this.hapErr = platform.api.hap.HapStatusError;
+    this.hapServ = platform.api.hap.Service;
+    this.lang = platform.lang;
+    this.log = platform.log;
+    this.platform = platform;
 
     // Set up variables from the accessory
-    this.name = accessory.displayName
-    this.accessory = accessory
+    this.name = accessory.displayName;
+    this.accessory = accessory;
 
     // Initially set the online flag as true (to be then updated as false if necessary)
-    this.isOnline = true
+    this.isOnline = true;
 
     // Set up custom variables for this device type
-    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId] || {};
 
     // Set the correct logging variables for this accessory
-    this.enableLogging = !platform.config.disableDeviceLogging
-    this.enableDebugLogging = platform.config.debug
-    if (deviceConf && deviceConf.overrideLogging) {
-      switch (deviceConf.overrideLogging) {
-        case 'standard':
-          this.enableLogging = true
-          this.enableDebugLogging = false
-          break
-        case 'debug':
-          this.enableLogging = true
-          this.enableDebugLogging = true
-          break
-        case 'disable':
-          this.enableLogging = false
-          this.enableDebugLogging = false
-          break
-      }
+    switch (deviceConf.overrideLogging) {
+      case 'standard':
+        this.enableLogging = true;
+        this.enableDebugLogging = false;
+        break;
+      case 'debug':
+        this.enableLogging = true;
+        this.enableDebugLogging = true;
+        break;
+      case 'disable':
+        this.enableLogging = false;
+        this.enableDebugLogging = false;
+        break;
+      default:
+        this.enableLogging = !platform.config.disableDeviceLogging;
+        this.enableDebugLogging = platform.config.debug;
+        break;
     }
 
     // Add the tv service if it doesn't already exist
-    this.service =
-      this.accessory.getService(this.hapServ.Television) ||
-      this.accessory.addService(this.hapServ.Television)
+    this.service = this.accessory.getService(this.hapServ.Television)
+      || this.accessory.addService(this.hapServ.Television);
 
     // Set up the device type and power readings if necessary
-    if (platform.consts.devices.switchSingle.includes(this.accessory.context.eweUIID)) {
-      this.setup = 'switchSingle'
-    } else if (platform.consts.devices.switchSinglePower.includes(this.accessory.context.eweUIID)) {
-      this.setup = 'switchSingle'
+    if (platformConsts.devices.switchSingle.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'switchSingle';
+    } else if (platformConsts.devices.switchSinglePower.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'switchSingle';
 
       // Add Eve power characteristics
-      this.powerReadings = true
+      this.powerReadings = true;
       if (!this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
-        this.service.addCharacteristic(this.eveChar.CurrentConsumption)
+        this.service.addCharacteristic(this.eveChar.CurrentConsumption);
       }
       if (this.accessory.context.eweUIID === 32) {
         if (!this.service.testCharacteristic(this.eveChar.ElectricCurrent)) {
-          this.service.addCharacteristic(this.eveChar.ElectricCurrent)
+          this.service.addCharacteristic(this.eveChar.ElectricCurrent);
         }
         if (!this.service.testCharacteristic(this.eveChar.Voltage)) {
-          this.service.addCharacteristic(this.eveChar.Voltage)
+          this.service.addCharacteristic(this.eveChar.Voltage);
         }
       }
-    } else if (platform.consts.devices.switchMulti.includes(this.accessory.context.eweUIID)) {
-      this.setup = 'switchMulti'
-      if (platform.consts.devices.switchMultiPower.includes(this.accessory.context.eweUIID)) {
+    } else if (platformConsts.devices.switchMulti.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'switchMulti';
+      if (platformConsts.devices.switchMultiPower.includes(this.accessory.context.eweUIID)) {
         // Add Eve power characteristics
-        this.powerReadings = true
+        this.powerReadings = true;
         if (!this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
-          this.service.addCharacteristic(this.eveChar.CurrentConsumption)
+          this.service.addCharacteristic(this.eveChar.CurrentConsumption);
         }
         if (!this.service.testCharacteristic(this.eveChar.ElectricCurrent)) {
-          this.service.addCharacteristic(this.eveChar.ElectricCurrent)
+          this.service.addCharacteristic(this.eveChar.ElectricCurrent);
         }
         if (!this.service.testCharacteristic(this.eveChar.Voltage)) {
-          this.service.addCharacteristic(this.eveChar.Voltage)
+          this.service.addCharacteristic(this.eveChar.Voltage);
         }
-        this.isDualR3 = true
+        this.isDualR3 = true;
       }
-    } else if (platform.consts.devices.switchSCM.includes(this.accessory.context.eweUIID)) {
-      this.setup = 'switchMulti'
-    } else if (platform.consts.devices.switchSCMPower.includes(this.accessory.context.eweUIID)) {
+    } else if (platformConsts.devices.switchSCM.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'switchMulti';
+    } else if (platformConsts.devices.switchSCMPower.includes(this.accessory.context.eweUIID)) {
       // Could do power here
-      this.setup = 'switchMulti'
+      this.setup = 'switchMulti';
     }
 
     // Add the set handler to the tv active characteristic
-    this.service.getCharacteristic(this.hapChar.Active).onSet(async value => {
-      await this.internalUpdate(value)
-    })
+    this.service.getCharacteristic(this.hapChar.Active).onSet(async (value) => {
+      this.internalUpdate(value);
+    });
 
     // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
     if (!platform.config.disableNoResponse) {
       this.service.getCharacteristic(this.hapChar.Active).onGet(() => {
         if (!this.isOnline) {
-          throw new this.hapErr(-70402)
+          throw new this.hapErr(-70402);
         }
-        return this.service.getCharacteristic(this.hapChar.Active).value
-      })
+        return this.service.getCharacteristic(this.hapChar.Active).value;
+      });
     }
 
     // Set up an interval to get eWeLink to send power updates
     if (
-      this.powerReadings &&
-      (!this.isDualR3 || (this.isDualR3 && platform.config.mode !== 'lan'))
+      this.powerReadings
+      && (!this.isDualR3 || (this.isDualR3 && platform.config.mode !== 'lan'))
     ) {
       setTimeout(() => {
-        this.internalUIUpdate()
-        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
-      }, 5000)
+        this.internalUIUpdate();
+        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000);
+      }, 5000);
 
       // Stop the intervals on Homebridge shutdown
-      platform.api.on('shutdown', () => clearInterval(this.intervalPoll))
+      platform.api.on('shutdown', () => clearInterval(this.intervalPoll));
     }
 
     // Output the customised options to the log
+    const normalLogging = this.enableLogging ? 'standard' : 'disable';
     const opts = JSON.stringify({
-      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
-      showAs: 'audio/box/stick'
-    })
-    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
+      logging: this.enableDebugLogging ? 'debug' : normalLogging,
+      showAs: 'audio/box/stick',
+    });
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts);
   }
 
-  async internalUpdate (value) {
+  async internalUpdate(value) {
     try {
-      const params = {}
+      const params = {};
       switch (this.setup) {
         case 'switchSingle':
-          params.switch = value === 1 ? 'on' : 'off'
-          break
+          params.switch = value === 1 ? 'on' : 'off';
+          break;
         case 'switchMulti':
           params.switches = [
             {
               switch: value === 1 ? 'on' : 'off',
-              outlet: 0
-            }
-          ]
-          break
+              outlet: 0,
+            },
+          ];
+          break;
         default:
-          return
+          return;
       }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.cacheState = value === 1 ? 'on' : 'off'
+      await this.platform.sendDeviceUpdate(this.accessory, params);
+      this.cacheState = value === 1 ? 'on' : 'off';
       if (this.enableLogging) {
-        this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
+        this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState);
       }
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true);
       setTimeout(() => {
-        this.service.updateCharacteristic(this.hapChar.Active, this.cacheState === 'on' ? 1 : 0)
-      }, 2000)
-      throw new this.hapErr(-70402)
+        this.service.updateCharacteristic(this.hapChar.Active, this.cacheState === 'on' ? 1 : 0);
+      }, 2000);
+      throw new this.hapErr(-70402);
     }
   }
 
-  async internalUIUpdate () {
+  async internalUIUpdate() {
     try {
       // Skip polling if device isn't online
       if (!this.isOnline) {
-        return
+        return;
       }
 
       // Send the params to request the updates
       if (this.isDualR3) {
-        await this.platform.sendDeviceUpdate(this.accessory, { uiActive: { outlet: 0, time: 120 } })
+        await this.platform.sendDeviceUpdate(this.accessory, { uiActive: { outlet: 0, time: 120 } });
       } else {
-        await this.platform.sendDeviceUpdate(this.accessory, { uiActive: 120 })
+        await this.platform.sendDeviceUpdate(this.accessory, { uiActive: 120 });
       }
     } catch (err) {
       // Suppress errors here
     }
   }
 
-  async externalUpdate (params) {
+  async externalUpdate(params) {
     try {
       if (
-        (this.setup === 'switchMulti' && params.switches) ||
-        (this.setup === 'switchSingle' && params.switch)
+        (this.setup === 'switchMulti' && params.switches)
+        || (this.setup === 'switchSingle' && params.switch)
       ) {
-        let newState
+        let newState;
         if (this.setup === 'switchMulti' && params.switches) {
-          newState = params.switches[0].switch
+          newState = params.switches[0].switch;
         } else if (this.setup === 'switchSingle' && params.switch) {
-          newState = params.switch
+          newState = params.switch;
         }
         if (newState && newState !== this.cacheState) {
-          this.cacheState = newState
-          this.service.updateCharacteristic(this.hapChar.Active, this.cacheState === 'on' ? 1 : 0)
+          this.cacheState = newState;
+          this.service.updateCharacteristic(this.hapChar.Active, this.cacheState === 'on' ? 1 : 0);
           if (params.updateSource && this.enableLogging) {
-            this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
+            this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState);
           }
         }
       }
 
       // Get the power readings given by certain devices
       if (!this.powerReadings) {
-        return
+        return;
       }
-      let logger = false
-      let power
-      let voltage
-      let current
-      if (this.funcs.hasProperty(params, 'actPow_00')) {
-        power = parseInt(params.actPow_00) / 100
-        this.service.updateCharacteristic(this.eveChar.CurrentConsumption, power)
-        logger = true
-      } else if (this.funcs.hasProperty(params, 'power')) {
-        power = parseFloat(params.power)
-        this.service.updateCharacteristic(this.eveChar.CurrentConsumption, power)
-        logger = true
+      let logger = false;
+      let power;
+      let voltage;
+      let current;
+      if (hasProperty(params, 'actPow_00')) {
+        power = parseInt(params.actPow_00, 10) / 100;
+        this.service.updateCharacteristic(this.eveChar.CurrentConsumption, power);
+        logger = true;
+      } else if (hasProperty(params, 'power')) {
+        power = parseFloat(params.power);
+        this.service.updateCharacteristic(this.eveChar.CurrentConsumption, power);
+        logger = true;
       }
-      if (this.funcs.hasProperty(params, 'voltage_00')) {
-        voltage = parseInt(params.voltage_00) / 100
-        this.service.updateCharacteristic(this.eveChar.Voltage, voltage)
-        logger = true
-      } else if (this.funcs.hasProperty(params, 'voltage')) {
-        voltage = parseFloat(params.voltage)
-        this.service.updateCharacteristic(this.eveChar.Voltage, voltage)
-        logger = true
+      if (hasProperty(params, 'voltage_00')) {
+        voltage = parseInt(params.voltage_00, 10) / 100;
+        this.service.updateCharacteristic(this.eveChar.Voltage, voltage);
+        logger = true;
+      } else if (hasProperty(params, 'voltage')) {
+        voltage = parseFloat(params.voltage);
+        this.service.updateCharacteristic(this.eveChar.Voltage, voltage);
+        logger = true;
       }
-      if (this.funcs.hasProperty(params, 'current_00')) {
-        current = parseInt(params.current_00) / 100
-        this.service.updateCharacteristic(this.eveChar.ElectricCurrent, current)
-        logger = true
-      } else if (this.funcs.hasProperty(params, 'current')) {
-        current = parseFloat(params.current)
-        this.service.updateCharacteristic(this.eveChar.ElectricCurrent, current)
-        logger = true
+      if (hasProperty(params, 'current_00')) {
+        current = parseInt(params.current_00, 10) / 100;
+        this.service.updateCharacteristic(this.eveChar.ElectricCurrent, current);
+        logger = true;
+      } else if (hasProperty(params, 'current')) {
+        current = parseFloat(params.current);
+        this.service.updateCharacteristic(this.eveChar.ElectricCurrent, current);
+        logger = true;
       }
       if (params.updateSource && logger && this.enableLogging) {
         this.log(
           '[%s] %s%s%s.',
           this.name,
-          power !== undefined ? this.lang.curPower + ' [' + power + 'W]' : '',
-          voltage !== undefined ? ' ' + this.lang.curVolt + ' [' + voltage + 'V]' : '',
-          current !== undefined ? ' ' + this.lang.curCurr + ' [' + current + 'A]' : ''
-        )
+          power !== undefined ? `${this.lang.curPower} [${power}W]` : '',
+          voltage !== undefined ? ` ${this.lang.curVolt} [${voltage}V]` : '',
+          current !== undefined ? ` ${this.lang.curCurr} [${current}A]` : '',
+        );
       }
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, false)
+      this.platform.deviceUpdateError(this.accessory, err, false);
     }
   }
 
-  markStatus (isOnline) {
-    this.isOnline = isOnline
+  markStatus(isOnline) {
+    this.isOnline = isOnline;
   }
 }
diff --git a/lib/device/simulation/valve-four.js b/lib/device/simulation/valve-four.js
index 98eb1b9a..48b3f4e8 100644
--- a/lib/device/simulation/valve-four.js
+++ b/lib/device/simulation/valve-four.js
@@ -1,197 +1,198 @@
-/* jshint node: true, esversion: 10, -W014, -W033 */
-/* eslint-disable new-cap */
-'use strict'
-
-module.exports = class deviceValveFour {
-  constructor (platform, accessory) {
+export default class {
+  constructor(platform, accessory) {
     // Set up variables from the platform
-    this.hapChar = platform.api.hap.Characteristic
-    this.hapErr = platform.api.hap.HapStatusError
-    this.hapServ = platform.api.hap.Service
-    this.lang = platform.lang
-    this.log = platform.log
-    this.platform = platform
+    this.hapChar = platform.api.hap.Characteristic;
+    this.hapErr = platform.api.hap.HapStatusError;
+    this.hapServ = platform.api.hap.Service;
+    this.lang = platform.lang;
+    this.log = platform.log;
+    this.platform = platform;
 
     // Set up variables from the accessory
-    this.name = accessory.displayName
-    this.accessory = accessory
+    this.name = accessory.displayName;
+    this.accessory = accessory;
 
     // Initially set the online flag as true (to be then updated as false if necessary)
-    this.isOnline = true
+    this.isOnline = true;
 
     // Set up custom variables for this device type
-    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
-    this.disableTimer = deviceConf && deviceConf.disableTimer
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId] || {};
+    this.disableTimer = deviceConf.disableTimer;
 
     // Set the correct logging variables for this accessory
-    this.enableLogging = !platform.config.disableDeviceLogging
-    this.enableDebugLogging = platform.config.debug
-    if (deviceConf && deviceConf.overrideLogging) {
-      switch (deviceConf.overrideLogging) {
-        case 'standard':
-          this.enableLogging = true
-          this.enableDebugLogging = false
-          break
-        case 'debug':
-          this.enableLogging = true
-          this.enableDebugLogging = true
-          break
-        case 'disable':
-          this.enableLogging = false
-          this.enableDebugLogging = false
-          break
-      }
+    switch (deviceConf.overrideLogging) {
+      case 'standard':
+        this.enableLogging = true;
+        this.enableDebugLogging = false;
+        break;
+      case 'debug':
+        this.enableLogging = true;
+        this.enableDebugLogging = true;
+        break;
+      case 'disable':
+        this.enableLogging = false;
+        this.enableDebugLogging = false;
+        break;
+      default:
+        this.enableLogging = !platform.config.disableDeviceLogging;
+        this.enableDebugLogging = platform.config.debug;
+        break;
     }
 
     // We want four valve services for this accessory
-    ;['A', 'B', 'C', 'D'].forEach(v => {
+    ['A', 'B', 'C', 'D'].forEach((v) => {
       // Add the valve service if it doesn't already exist
-      let valveService
-      if (!(valveService = this.accessory.getService('Valve ' + v))) {
+      let valveService = this.accessory.getService(`Valve ${v}`);
+      if (!valveService) {
         valveService = this.accessory.addService(
           this.hapServ.Valve,
-          'Valve ' + v,
-          'valve' + v.toLowerCase()
-        )
-        valveService.updateCharacteristic(this.hapChar.Active, 0)
-        valveService.updateCharacteristic(this.hapChar.InUse, 0)
+          `Valve ${v}`,
+          `valve${v.toLowerCase()}`,
+        );
+        valveService.updateCharacteristic(this.hapChar.Active, 0);
+        valveService.updateCharacteristic(this.hapChar.InUse, 0);
         if (!this.disableTimer) {
-          valveService.updateCharacteristic(this.hapChar.ValveType, 1)
-          valveService.updateCharacteristic(this.hapChar.SetDuration, 120)
-          valveService.addCharacteristic(this.hapChar.RemainingDuration)
+          valveService.updateCharacteristic(this.hapChar.ValveType, 1);
+          valveService.updateCharacteristic(this.hapChar.SetDuration, 120);
+          valveService.addCharacteristic(this.hapChar.RemainingDuration);
         }
       }
 
       // Add the set handler to the valve active characteristic
       valveService
         .getCharacteristic(this.hapChar.Active)
-        .onSet(async value => await this.internalUpdate('Valve ' + v, value))
+        .onSet(async (value) => this.internalUpdate(`Valve ${v}`, value));
 
       // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
       if (!platform.config.disableNoResponse) {
         valveService.getCharacteristic(this.hapChar.Active).onGet(() => {
           if (!this.isOnline) {
-            throw new this.hapErr(-70402)
+            throw new this.hapErr(-70402);
           }
-          return valveService.getCharacteristic(this.hapChar.Active).value
-        })
+          return valveService.getCharacteristic(this.hapChar.Active).value;
+        });
       }
 
       // Add the set handler to the valve set duration characteristic
       if (this.disableTimer) {
         if (valveService.testCharacteristic(this.hapChar.SetDuration)) {
           valveService.removeCharacteristic(
-            valveService.getCharacteristic(this.hapChar.SetDuration)
-          )
+            valveService.getCharacteristic(this.hapChar.SetDuration),
+          );
         }
         if (valveService.testCharacteristic(this.hapChar.RemainingDuration)) {
           valveService.removeCharacteristic(
-            valveService.getCharacteristic(this.hapChar.RemainingDuration)
-          )
+            valveService.getCharacteristic(this.hapChar.RemainingDuration),
+          );
         }
       } else {
-        valveService.getCharacteristic(this.hapChar.SetDuration).onSet(value => {
+        valveService.getCharacteristic(this.hapChar.SetDuration).onSet((value) => {
           // Check if the valve is currently active
           if (valveService.getCharacteristic(this.hapChar.InUse).value === 1) {
             // Update the remaining duration characteristic with the new value
-            valveService.updateCharacteristic(this.hapChar.RemainingDuration, value)
+            valveService.updateCharacteristic(this.hapChar.RemainingDuration, value);
 
             // Clear any existing active timers
-            clearTimeout(valveService.timer)
+            clearTimeout(valveService.timer);
 
             // Set a new active timer with the new time amount
             valveService.timer = setTimeout(
               () => valveService.setCharacteristic(this.hapChar.Active, 0),
-              value * 1000
-            )
+              value * 1000,
+            );
           }
-        })
+        });
       }
-    })
+    });
 
     // Output the customised options to the log
+    const normalLogging = this.enableLogging ? 'standard' : 'disable';
     const opts = JSON.stringify({
       disableTimer: this.disableTimer,
-      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
-      showAs: 'valve_four'
-    })
-    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
+      logging: this.enableDebugLogging ? 'debug' : normalLogging,
+      showAs: 'valve_four',
+    });
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts);
   }
 
-  async internalUpdate (valve, value) {
+  async internalUpdate(valve, value) {
     try {
       const params = {
-        switches: []
-      }
-      const valveService = this.accessory.getService(valve)
+        switches: [],
+      };
+      const valveService = this.accessory.getService(valve);
       switch (valve) {
         case 'Valve A':
-          params.switches.push({ switch: value ? 'on' : 'off', outlet: 0 })
-          break
+          params.switches.push({ switch: value ? 'on' : 'off', outlet: 0 });
+          break;
         case 'Valve B':
-          params.switches.push({ switch: value ? 'on' : 'off', outlet: 1 })
-          break
+          params.switches.push({ switch: value ? 'on' : 'off', outlet: 1 });
+          break;
         case 'Valve C':
-          params.switches.push({ switch: value ? 'on' : 'off', outlet: 2 })
-          break
+          params.switches.push({ switch: value ? 'on' : 'off', outlet: 2 });
+          break;
         case 'Valve D':
-          params.switches.push({ switch: value ? 'on' : 'off', outlet: 3 })
-          break
+          params.switches.push({ switch: value ? 'on' : 'off', outlet: 3 });
+          break;
+        default:
+          return;
       }
-      valveService.updateCharacteristic(this.hapChar.InUse, value)
+      valveService.updateCharacteristic(this.hapChar.InUse, value);
       switch (value) {
         case 0:
           if (!this.disableTimer) {
-            valveService.updateCharacteristic(this.hapChar.RemainingDuration, 0)
-            clearTimeout(this.accessory.getService(valve).timer)
+            valveService.updateCharacteristic(this.hapChar.RemainingDuration, 0);
+            clearTimeout(this.accessory.getService(valve).timer);
           }
           if (this.enableLogging) {
-            this.log('[%s] [%s] %s [%s].', this.name, valve, this.lang.curState, this.lang.valveNo)
+            this.log('[%s] [%s] %s [%s].', this.name, valve, this.lang.curState, this.lang.valveNo);
           }
-          break
+          break;
         case 1: {
           if (!this.disableTimer) {
-            const timer = valveService.getCharacteristic(this.hapChar.SetDuration).value
-            valveService.updateCharacteristic(this.hapChar.RemainingDuration, timer)
+            const timer = valveService.getCharacteristic(this.hapChar.SetDuration).value;
+            valveService.updateCharacteristic(this.hapChar.RemainingDuration, timer);
             valveService.timer = setTimeout(() => {
-              valveService.setCharacteristic(this.hapChar.Active, 0)
-            }, timer * 1000)
+              valveService.setCharacteristic(this.hapChar.Active, 0);
+            }, timer * 1000);
           }
           if (this.enableLogging) {
-            this.log('[%s] [%s] %s [%s].', this.name, valve, this.lang.curState, this.lang.valveYes)
+            this.log('[%s] [%s] %s [%s].', this.name, valve, this.lang.curState, this.lang.valveYes);
           }
 
-          break
+          break;
         }
+        default:
+          return;
       }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
+      await this.platform.sendDeviceUpdate(this.accessory, params);
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
-      const valveService = this.accessory.getService(valve)
+      this.platform.deviceUpdateError(this.accessory, err, true);
+      const valveService = this.accessory.getService(valve);
       setTimeout(() => {
-        valveService.updateCharacteristic(this.hapChar.Active, value === 1 ? 0 : 1)
-      }, 2000)
-      throw new this.hapErr(-70402)
+        valveService.updateCharacteristic(this.hapChar.Active, value === 1 ? 0 : 1);
+      }, 2000);
+      throw new this.hapErr(-70402);
     }
   }
 
-  async externalUpdate (params) {
+  async externalUpdate(params) {
     try {
       if (!params.switches) {
-        return
+        return;
       }
-      ;['A', 'B', 'C', 'D'].forEach((v, k) => {
-        const valveService = this.accessory.getService('Valve ' + v)
+      ['A', 'B', 'C', 'D'].forEach((v, k) => {
+        const valveService = this.accessory.getService(`Valve ${v}`);
         if (params.switches[k].switch === 'on') {
           if (valveService.getCharacteristic(this.hapChar.Active).value === 0) {
-            valveService.updateCharacteristic(this.hapChar.Active, 1)
-            valveService.updateCharacteristic(this.hapChar.InUse, 1)
+            valveService.updateCharacteristic(this.hapChar.Active, 1);
+            valveService.updateCharacteristic(this.hapChar.InUse, 1);
             if (!this.disableTimer) {
-              const timer = valveService.getCharacteristic(this.hapChar.SetDuration).value
-              valveService.updateCharacteristic(this.hapChar.RemainingDuration, timer)
+              const timer = valveService.getCharacteristic(this.hapChar.SetDuration).value;
+              valveService.updateCharacteristic(this.hapChar.RemainingDuration, timer);
               valveService.timer = setTimeout(() => {
-                valveService.setCharacteristic(this.hapChar.Active, 0)
-              }, timer * 1000)
+                valveService.setCharacteristic(this.hapChar.Active, 0);
+              }, timer * 1000);
             }
             if (params.updateSource && this.enableLogging) {
               this.log(
@@ -199,37 +200,33 @@ module.exports = class deviceValveFour {
                 this.name,
                 v,
                 this.lang.curState,
-                this.lang.valveYes
-              )
+                this.lang.valveYes,
+              );
             }
           }
-        } else {
-          if (valveService.getCharacteristic(this.hapChar.Active).value === 1) {
-            valveService.updateCharacteristic(this.hapChar.Active, 0)
-            valveService.updateCharacteristic(this.hapChar.InUse, 0)
-            if (!this.disableTimer) {
-              valveService.updateCharacteristic(this.hapChar.RemainingDuration, 0)
-              clearTimeout(valveService.timer)
-            } else {
-              if (params.updateSource && this.enableLogging) {
-                this.log(
-                  '[%s] [Valve %s] %s [%s].',
-                  this.name,
-                  v,
-                  this.lang.curState,
-                  this.lang.valveNo
-                )
-              }
-            }
+        } else if (valveService.getCharacteristic(this.hapChar.Active).value === 1) {
+          valveService.updateCharacteristic(this.hapChar.Active, 0);
+          valveService.updateCharacteristic(this.hapChar.InUse, 0);
+          if (!this.disableTimer) {
+            valveService.updateCharacteristic(this.hapChar.RemainingDuration, 0);
+            clearTimeout(valveService.timer);
+          } else if (params.updateSource && this.enableLogging) {
+            this.log(
+              '[%s] [Valve %s] %s [%s].',
+              this.name,
+              v,
+              this.lang.curState,
+              this.lang.valveNo,
+            );
           }
         }
-      })
+      });
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, false)
+      this.platform.deviceUpdateError(this.accessory, err, false);
     }
   }
 
-  markStatus (isOnline) {
-    this.isOnline = isOnline
+  markStatus(isOnline) {
+    this.isOnline = isOnline;
   }
 }
diff --git a/lib/device/simulation/valve-one.js b/lib/device/simulation/valve-one.js
index 88871c57..b7ec903c 100644
--- a/lib/device/simulation/valve-one.js
+++ b/lib/device/simulation/valve-one.js
@@ -1,345 +1,345 @@
-/* jshint node: true, esversion: 10, -W014, -W033 */
-/* eslint-disable new-cap */
-'use strict'
+import platformConsts from '../../utils/constants.js';
+import { hasProperty } from '../../utils/functions.js';
 
-module.exports = class deviceValveOne {
-  constructor (platform, accessory) {
+export default class {
+  constructor(platform, accessory) {
     // Set up variables from the platform
-    this.eveChar = platform.eveChar
-    this.funcs = platform.funcs
-    this.hapChar = platform.api.hap.Characteristic
-    this.hapErr = platform.api.hap.HapStatusError
-    this.hapServ = platform.api.hap.Service
-    this.lang = platform.lang
-    this.log = platform.log
-    this.platform = platform
+    this.eveChar = platform.eveChar;
+    this.hapChar = platform.api.hap.Characteristic;
+    this.hapErr = platform.api.hap.HapStatusError;
+    this.hapServ = platform.api.hap.Service;
+    this.lang = platform.lang;
+    this.log = platform.log;
+    this.platform = platform;
 
     // Set up variables from the accessory
-    this.name = accessory.displayName
-    this.accessory = accessory
+    this.name = accessory.displayName;
+    this.accessory = accessory;
 
     // Initially set the online flag as true (to be then updated as false if necessary)
-    this.isOnline = true
+    this.isOnline = true;
 
     // Set up custom variables for this device type
-    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
-    this.disableTimer = deviceConf && deviceConf.disableTimer
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId] || {};
+    this.disableTimer = deviceConf.disableTimer;
 
     // Set the correct logging variables for this accessory
-    this.enableLogging = !platform.config.disableDeviceLogging
-    this.enableDebugLogging = platform.config.debug
-    if (deviceConf && deviceConf.overrideLogging) {
-      switch (deviceConf.overrideLogging) {
-        case 'standard':
-          this.enableLogging = true
-          this.enableDebugLogging = false
-          break
-        case 'debug':
-          this.enableLogging = true
-          this.enableDebugLogging = true
-          break
-        case 'disable':
-          this.enableLogging = false
-          this.enableDebugLogging = false
-          break
-      }
+    switch (deviceConf.overrideLogging) {
+      case 'standard':
+        this.enableLogging = true;
+        this.enableDebugLogging = false;
+        break;
+      case 'debug':
+        this.enableLogging = true;
+        this.enableDebugLogging = true;
+        break;
+      case 'disable':
+        this.enableLogging = false;
+        this.enableDebugLogging = false;
+        break;
+      default:
+        this.enableLogging = !platform.config.disableDeviceLogging;
+        this.enableDebugLogging = platform.config.debug;
+        break;
     }
 
     // If the accessory has a switch service then remove it
     if (this.accessory.getService(this.hapServ.Switch)) {
-      this.accessory.removeService(this.accessory.getService(this.hapServ.Switch))
+      this.accessory.removeService(this.accessory.getService(this.hapServ.Switch));
     }
 
     // Add the valve service if it doesn't already exist
-    if (!(this.service = this.accessory.getService(this.hapServ.Valve))) {
-      this.service = this.accessory.addService(this.hapServ.Valve)
-      this.service.updateCharacteristic(this.hapChar.Active, 0)
-      this.service.updateCharacteristic(this.hapChar.InUse, 0)
-      this.service.updateCharacteristic(this.hapChar.ValveType, 1)
-      this.service.updateCharacteristic(this.hapChar.SetDuration, 120)
-      this.service.addCharacteristic(this.hapChar.RemainingDuration)
+    this.service = this.accessory.getService(this.hapServ.Valve);
+    if (!this.service) {
+      this.service = this.accessory.addService(this.hapServ.Valve);
+      this.service.updateCharacteristic(this.hapChar.Active, 0);
+      this.service.updateCharacteristic(this.hapChar.InUse, 0);
+      this.service.updateCharacteristic(this.hapChar.ValveType, 1);
+      this.service.updateCharacteristic(this.hapChar.SetDuration, 120);
+      this.service.addCharacteristic(this.hapChar.RemainingDuration);
     }
 
     // Set up the device type and power readings if necessary
-    if (platform.consts.devices.switchSingle.includes(this.accessory.context.eweUIID)) {
-      this.setup = 'switchSingle'
-    } else if (platform.consts.devices.switchSinglePower.includes(this.accessory.context.eweUIID)) {
-      this.setup = 'switchSingle'
+    if (platformConsts.devices.switchSingle.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'switchSingle';
+    } else if (platformConsts.devices.switchSinglePower.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'switchSingle';
 
       // Add Eve power characteristics
-      this.powerReadings = true
+      this.powerReadings = true;
       if (!this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
-        this.service.addCharacteristic(this.eveChar.CurrentConsumption)
+        this.service.addCharacteristic(this.eveChar.CurrentConsumption);
       }
       if (this.accessory.context.eweUIID === 32) {
         if (!this.service.testCharacteristic(this.eveChar.ElectricCurrent)) {
-          this.service.addCharacteristic(this.eveChar.ElectricCurrent)
+          this.service.addCharacteristic(this.eveChar.ElectricCurrent);
         }
         if (!this.service.testCharacteristic(this.eveChar.Voltage)) {
-          this.service.addCharacteristic(this.eveChar.Voltage)
+          this.service.addCharacteristic(this.eveChar.Voltage);
         }
       }
-    } else if (platform.consts.devices.switchMulti.includes(this.accessory.context.eweUIID)) {
-      this.setup = 'switchMulti'
-      if (platform.consts.devices.switchMultiPower.includes(this.accessory.context.eweUIID)) {
+    } else if (platformConsts.devices.switchMulti.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'switchMulti';
+      if (platformConsts.devices.switchMultiPower.includes(this.accessory.context.eweUIID)) {
         // Add Eve power characteristics
-        this.powerReadings = true
+        this.powerReadings = true;
         if (!this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
-          this.service.addCharacteristic(this.eveChar.CurrentConsumption)
+          this.service.addCharacteristic(this.eveChar.CurrentConsumption);
         }
         if (!this.service.testCharacteristic(this.eveChar.ElectricCurrent)) {
-          this.service.addCharacteristic(this.eveChar.ElectricCurrent)
+          this.service.addCharacteristic(this.eveChar.ElectricCurrent);
         }
         if (!this.service.testCharacteristic(this.eveChar.Voltage)) {
-          this.service.addCharacteristic(this.eveChar.Voltage)
+          this.service.addCharacteristic(this.eveChar.Voltage);
         }
-        this.isDualR3 = true
+        this.isDualR3 = true;
       }
-    } else if (platform.consts.devices.switchSCM.includes(this.accessory.context.eweUIID)) {
-      this.setup = 'switchMulti'
-    } else if (platform.consts.devices.switchSCMPower.includes(this.accessory.context.eweUIID)) {
+    } else if (platformConsts.devices.switchSCM.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'switchMulti';
+    } else if (platformConsts.devices.switchSCMPower.includes(this.accessory.context.eweUIID)) {
       // Could do power here
-      this.setup = 'switchMulti'
+      this.setup = 'switchMulti';
     }
 
     // Add the set handler to the valve active characteristic
     this.service
       .getCharacteristic(this.hapChar.Active)
-      .onSet(async value => await this.internalUpdate(value))
+      .onSet(async (value) => this.internalUpdate(value));
 
     // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
     if (!platform.config.disableNoResponse) {
       this.service.getCharacteristic(this.hapChar.Active).onGet(() => {
         if (!this.isOnline) {
-          throw new this.hapErr(-70402)
+          throw new this.hapErr(-70402);
         }
-        return this.service.getCharacteristic(this.hapChar.Active).value
-      })
+        return this.service.getCharacteristic(this.hapChar.Active).value;
+      });
     }
 
     // Add the set handler to the valve set duration characteristic
     if (this.disableTimer) {
       if (this.service.testCharacteristic(this.hapChar.SetDuration)) {
-        this.service.removeCharacteristic(this.service.getCharacteristic(this.hapChar.SetDuration))
+        this.service.removeCharacteristic(this.service.getCharacteristic(this.hapChar.SetDuration));
       }
       if (this.service.testCharacteristic(this.hapChar.RemainingDuration)) {
         this.service.removeCharacteristic(
-          this.service.getCharacteristic(this.hapChar.RemainingDuration)
-        )
+          this.service.getCharacteristic(this.hapChar.RemainingDuration),
+        );
       }
     } else {
-      this.service.getCharacteristic(this.hapChar.SetDuration).onSet(value => {
+      this.service.getCharacteristic(this.hapChar.SetDuration).onSet((value) => {
         // Check if the valve is currently active
         if (this.service.getCharacteristic(this.hapChar.InUse).value === 1) {
           // Update the remaining duration characteristic with the new value
-          this.service.updateCharacteristic(this.hapChar.RemainingDuration, value)
+          this.service.updateCharacteristic(this.hapChar.RemainingDuration, value);
 
           // Clear any existing active timers
-          clearTimeout(this.timer)
+          clearTimeout(this.timer);
 
           // Set a new active timer with the new time amount
           this.timer = setTimeout(
             () => this.service.setCharacteristic(this.hapChar.Active, 0),
-            value * 1000
-          )
+            value * 1000,
+          );
         }
-      })
+      });
     }
 
     // Set up an interval to get eWeLink to send power updates
     if (
-      this.powerReadings &&
-      (!this.isDualR3 || (this.isDualR3 && platform.config.mode !== 'lan'))
+      this.powerReadings
+      && (!this.isDualR3 || (this.isDualR3 && platform.config.mode !== 'lan'))
     ) {
       setTimeout(() => {
-        this.internalUIUpdate()
-        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
-      }, 5000)
+        this.internalUIUpdate();
+        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000);
+      }, 5000);
 
       // Stop the intervals on Homebridge shutdown
-      platform.api.on('shutdown', () => clearInterval(this.intervalPoll))
+      platform.api.on('shutdown', () => clearInterval(this.intervalPoll));
     }
 
     // Output the customised options to the log
+    const normalLogging = this.enableLogging ? 'standard' : 'disable';
     const opts = JSON.stringify({
       disableTimer: this.disableTimer,
-      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
-      showAs: 'valve'
-    })
-    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
+      logging: this.enableDebugLogging ? 'debug' : normalLogging,
+      showAs: 'valve',
+    });
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts);
   }
 
-  async internalUpdate (value) {
+  async internalUpdate(value) {
     try {
-      const params = {}
+      const params = {};
       switch (this.setup) {
         case 'switchSingle':
-          params.switch = value ? 'on' : 'off'
-          break
+          params.switch = value ? 'on' : 'off';
+          break;
         case 'switchMulti':
           params.switches = [
             {
               switch: value ? 'on' : 'off',
-              outlet: 0
-            }
-          ]
-          break
+              outlet: 0,
+            },
+          ];
+          break;
+        default:
+          return;
       }
-      this.service.updateCharacteristic(this.hapChar.InUse, value)
+      this.service.updateCharacteristic(this.hapChar.InUse, value);
       switch (value) {
         case 0:
           if (!this.disableTimer) {
-            this.service.updateCharacteristic(this.hapChar.RemainingDuration, 0)
-            clearTimeout(this.timer)
+            this.service.updateCharacteristic(this.hapChar.RemainingDuration, 0);
+            clearTimeout(this.timer);
           }
           if (this.enableLogging) {
-            this.log('[%s] %s [%s].', this.name, this.lang.curState, this.lang.valveNo)
+            this.log('[%s] %s [%s].', this.name, this.lang.curState, this.lang.valveNo);
           }
-          break
+          break;
         case 1: {
           if (!this.disableTimer) {
-            const timer = this.service.getCharacteristic(this.hapChar.SetDuration).value
-            this.service.updateCharacteristic(this.hapChar.RemainingDuration, timer)
+            const timer = this.service.getCharacteristic(this.hapChar.SetDuration).value;
+            this.service.updateCharacteristic(this.hapChar.RemainingDuration, timer);
             this.timer = setTimeout(() => {
-              this.service.setCharacteristic(this.hapChar.Active, 0)
-            }, timer * 1000)
+              this.service.setCharacteristic(this.hapChar.Active, 0);
+            }, timer * 1000);
           }
           if (this.enableLogging) {
-            this.log('[%s] %s [%s].', this.name, this.lang.curState, this.lang.valveYes)
+            this.log('[%s] %s [%s].', this.name, this.lang.curState, this.lang.valveYes);
           }
-          break
+          break;
         }
+        default:
+          return;
       }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
+      await this.platform.sendDeviceUpdate(this.accessory, params);
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true);
       setTimeout(() => {
-        this.service.updateCharacteristic(this.hapChar.Active, value === 1 ? 0 : 1)
-      }, 2000)
-      throw new this.hapErr(-70402)
+        this.service.updateCharacteristic(this.hapChar.Active, value === 1 ? 0 : 1);
+      }, 2000);
+      throw new this.hapErr(-70402);
     }
   }
 
-  async internalUIUpdate () {
+  async internalUIUpdate() {
     try {
       // Skip polling if device isn't online
       if (!this.isOnline) {
-        return
+        return;
       }
 
       // Send the params to request the updates
       if (this.isDualR3) {
-        await this.platform.sendDeviceUpdate(this.accessory, { uiActive: { outlet: 0, time: 120 } })
+        await this.platform.sendDeviceUpdate(this.accessory, { uiActive: { outlet: 0, time: 120 } });
       } else {
-        await this.platform.sendDeviceUpdate(this.accessory, { uiActive: 120 })
+        await this.platform.sendDeviceUpdate(this.accessory, { uiActive: 120 });
       }
     } catch (err) {
       // Suppress errors here
     }
   }
 
-  async externalUpdate (params) {
+  async externalUpdate(params) {
     try {
       if (
-        (this.setup === 'switchMulti' && params.switches) ||
-        (this.setup === 'switchSingle' && params.switch)
+        (this.setup === 'switchMulti' && params.switches)
+        || (this.setup === 'switchSingle' && params.switch)
       ) {
-        let newState
+        let newState;
         if (this.setup === 'switchMulti' && params.switches) {
-          newState = params.switches[0].switch
+          newState = params.switches[0].switch;
         } else if (this.setup === 'switchSingle' && params.switch) {
-          newState = params.switch
+          newState = params.switch;
         }
         if (newState === 'on') {
           if (this.service.getCharacteristic(this.hapChar.Active).value === 0) {
-            this.service.updateCharacteristic(this.hapChar.Active, 1)
-            this.service.updateCharacteristic(this.hapChar.InUse, 1)
+            this.service.updateCharacteristic(this.hapChar.Active, 1);
+            this.service.updateCharacteristic(this.hapChar.InUse, 1);
             if (params.updateSource && this.enableLogging) {
-              this.log('[%s] %s [%s].', this.name, this.lang.curState, this.lang.valveYes)
+              this.log('[%s] %s [%s].', this.name, this.lang.curState, this.lang.valveYes);
             }
             if (!this.disableTimer) {
-              const timer = this.service.getCharacteristic(this.hapChar.SetDuration).value
-              this.service.updateCharacteristic(this.hapChar.RemainingDuration, timer)
+              const timer = this.service.getCharacteristic(this.hapChar.SetDuration).value;
+              this.service.updateCharacteristic(this.hapChar.RemainingDuration, timer);
               this.timer = setTimeout(() => {
-                this.service.setCharacteristic(this.hapChar.Active, 0)
-              }, timer * 1000)
+                this.service.setCharacteristic(this.hapChar.Active, 0);
+              }, timer * 1000);
             }
           }
-        } else {
-          if (this.service.getCharacteristic(this.hapChar.Active).value === 1) {
-            this.service.updateCharacteristic(this.hapChar.Active, 0)
-            this.service.updateCharacteristic(this.hapChar.InUse, 0)
-            if (!this.disableTimer) {
-              this.service.updateCharacteristic(this.hapChar.RemainingDuration, 0)
-              clearTimeout(this.timer)
-            } else {
-              if (params.updateSource && this.enableLogging) {
-                this.log('[%s] %s [%s].', this.name, this.lang.curState, this.lang.valveNo)
-              }
-            }
+        } else if (this.service.getCharacteristic(this.hapChar.Active).value === 1) {
+          this.service.updateCharacteristic(this.hapChar.Active, 0);
+          this.service.updateCharacteristic(this.hapChar.InUse, 0);
+          if (!this.disableTimer) {
+            this.service.updateCharacteristic(this.hapChar.RemainingDuration, 0);
+            clearTimeout(this.timer);
+          } else if (params.updateSource && this.enableLogging) {
+            this.log('[%s] %s [%s].', this.name, this.lang.curState, this.lang.valveNo);
           }
         }
       }
 
       // Get the power readings given by certain devices
       if (!this.powerReadings) {
-        return
+        return;
       }
-      let logger = false
-      let power
-      let voltage
-      let current
-      if (this.funcs.hasProperty(params, 'actPow_00')) {
-        power = parseInt(params.actPow_00) / 100
-        this.service.updateCharacteristic(this.eveChar.CurrentConsumption, power)
-        logger = true
-      } else if (this.funcs.hasProperty(params, 'power')) {
-        power = parseFloat(params.power)
-        this.service.updateCharacteristic(this.eveChar.CurrentConsumption, power)
-        logger = true
+      let logger = false;
+      let power;
+      let voltage;
+      let current;
+      if (hasProperty(params, 'actPow_00')) {
+        power = parseInt(params.actPow_00, 10) / 100;
+        this.service.updateCharacteristic(this.eveChar.CurrentConsumption, power);
+        logger = true;
+      } else if (hasProperty(params, 'power')) {
+        power = parseFloat(params.power);
+        this.service.updateCharacteristic(this.eveChar.CurrentConsumption, power);
+        logger = true;
       }
-      if (this.funcs.hasProperty(params, 'voltage_00')) {
-        voltage = parseInt(params.voltage_00) / 100
-        this.service.updateCharacteristic(this.eveChar.Voltage, voltage)
-        logger = true
-      } else if (this.funcs.hasProperty(params, 'voltage')) {
-        voltage = parseFloat(params.voltage)
-        this.service.updateCharacteristic(this.eveChar.Voltage, voltage)
-        logger = true
+      if (hasProperty(params, 'voltage_00')) {
+        voltage = parseInt(params.voltage_00, 10) / 100;
+        this.service.updateCharacteristic(this.eveChar.Voltage, voltage);
+        logger = true;
+      } else if (hasProperty(params, 'voltage')) {
+        voltage = parseFloat(params.voltage);
+        this.service.updateCharacteristic(this.eveChar.Voltage, voltage);
+        logger = true;
       }
-      if (this.funcs.hasProperty(params, 'current_00')) {
-        current = parseInt(params.current_00) / 100
-        this.service.updateCharacteristic(this.eveChar.ElectricCurrent, current)
-        logger = true
-      } else if (this.funcs.hasProperty(params, 'current')) {
-        current = parseFloat(params.current)
-        this.service.updateCharacteristic(this.eveChar.ElectricCurrent, current)
-        logger = true
+      if (hasProperty(params, 'current_00')) {
+        current = parseInt(params.current_00, 10) / 100;
+        this.service.updateCharacteristic(this.eveChar.ElectricCurrent, current);
+        logger = true;
+      } else if (hasProperty(params, 'current')) {
+        current = parseFloat(params.current);
+        this.service.updateCharacteristic(this.eveChar.ElectricCurrent, current);
+        logger = true;
       }
       if (params.updateSource && logger && this.enableLogging) {
         this.log(
           '[%s] %s%s%s.',
           this.name,
-          power !== undefined ? this.lang.curPower + ' [' + power + 'W]' : '',
-          voltage !== undefined ? ' ' + this.lang.curVolt + ' [' + voltage + 'V]' : '',
-          current !== undefined ? ' ' + this.lang.curCurr + ' [' + current + 'A]' : ''
-        )
+          power !== undefined ? `${this.lang.curPower} [${power}W]` : '',
+          voltage !== undefined ? ` ${this.lang.curVolt} [${voltage}V]` : '',
+          current !== undefined ? ` ${this.lang.curCurr} [${current}A]` : '',
+        );
       }
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, false)
+      this.platform.deviceUpdateError(this.accessory, err, false);
     }
   }
 
-  currentState () {
+  currentState() {
     return {
       services: ['valve'],
       valve: {
-        state: this.service.getCharacteristic(this.hapChar.Active).value === 1 ? 'on' : 'off'
-      }
-    }
+        state: this.service.getCharacteristic(this.hapChar.Active).value === 1 ? 'on' : 'off',
+      },
+    };
   }
 
-  markStatus (isOnline) {
-    this.isOnline = isOnline
+  markStatus(isOnline) {
+    this.isOnline = isOnline;
   }
 }
diff --git a/lib/device/simulation/valve-two.js b/lib/device/simulation/valve-two.js
index 254669a5..c203ada4 100644
--- a/lib/device/simulation/valve-two.js
+++ b/lib/device/simulation/valve-two.js
@@ -1,231 +1,234 @@
-/* jshint node: true, esversion: 10, -W014, -W033 */
-/* eslint-disable new-cap */
-'use strict'
+import platformConsts from '../../utils/constants.js';
+import { hasProperty, sleep } from '../../utils/functions.js';
 
-module.exports = class deviceValveTwo {
-  constructor (platform, accessory) {
+export default class {
+  constructor(platform, accessory) {
     // Set up variables from the platform
-    this.eveChar = platform.eveChar
-    this.funcs = platform.funcs
-    this.hapChar = platform.api.hap.Characteristic
-    this.hapErr = platform.api.hap.HapStatusError
-    this.hapServ = platform.api.hap.Service
-    this.lang = platform.lang
-    this.log = platform.log
-    this.platform = platform
+    this.eveChar = platform.eveChar;
+    this.hapChar = platform.api.hap.Characteristic;
+    this.hapErr = platform.api.hap.HapStatusError;
+    this.hapServ = platform.api.hap.Service;
+    this.lang = platform.lang;
+    this.log = platform.log;
+    this.platform = platform;
 
     // Set up variables from the accessory
-    this.name = accessory.displayName
-    this.accessory = accessory
+    this.name = accessory.displayName;
+    this.accessory = accessory;
 
     // Initially set the online flag as true (to be then updated as false if necessary)
-    this.isOnline = true
+    this.isOnline = true;
 
     // Set up custom variables for this device type
-    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
-    this.disableTimer = deviceConf && deviceConf.disableTimer
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId] || {};
+    this.disableTimer = deviceConf.disableTimer;
 
     // Set the correct logging variables for this accessory
-    this.enableLogging = !platform.config.disableDeviceLogging
-    this.enableDebugLogging = platform.config.debug
-    if (deviceConf && deviceConf.overrideLogging) {
-      switch (deviceConf.overrideLogging) {
-        case 'standard':
-          this.enableLogging = true
-          this.enableDebugLogging = false
-          break
-        case 'debug':
-          this.enableLogging = true
-          this.enableDebugLogging = true
-          break
-        case 'disable':
-          this.enableLogging = false
-          this.enableDebugLogging = false
-          break
-      }
+    switch (deviceConf.overrideLogging) {
+      case 'standard':
+        this.enableLogging = true;
+        this.enableDebugLogging = false;
+        break;
+      case 'debug':
+        this.enableLogging = true;
+        this.enableDebugLogging = true;
+        break;
+      case 'disable':
+        this.enableLogging = false;
+        this.enableDebugLogging = false;
+        break;
+      default:
+        this.enableLogging = !platform.config.disableDeviceLogging;
+        this.enableDebugLogging = platform.config.debug;
+        break;
     }
 
     // Certain devices give power readings
-    if (platform.consts.devices.switchMultiPower.includes(this.accessory.context.eweUIID)) {
-      this.powerReadings = true
+    if (platformConsts.devices.switchMultiPower.includes(this.accessory.context.eweUIID)) {
+      this.powerReadings = true;
     }
 
     // We want two valve services for this accessory
-    ;['1', '2'].forEach(v => {
+    ['1', '2'].forEach((v) => {
       // Add the valve service if it doesn't already exist
-      let valveService
-      if (!(valveService = this.accessory.getService('Valve ' + v))) {
-        valveService = this.accessory.addService(this.hapServ.Valve, 'Valve ' + v, 'valve' + v)
-        valveService.updateCharacteristic(this.hapChar.Active, 0)
-        valveService.updateCharacteristic(this.hapChar.InUse, 0)
-        valveService.updateCharacteristic(this.hapChar.ValveType, 1)
+      let valveService = this.accessory.getService(`Valve ${v}`);
+      if (!valveService) {
+        valveService = this.accessory.addService(this.hapServ.Valve, `Valve ${v}`, `valve${v}`);
+        valveService.updateCharacteristic(this.hapChar.Active, 0);
+        valveService.updateCharacteristic(this.hapChar.InUse, 0);
+        valveService.updateCharacteristic(this.hapChar.ValveType, 1);
         if (!this.disableTimer) {
-          valveService.updateCharacteristic(this.hapChar.SetDuration, 120)
-          valveService.addCharacteristic(this.hapChar.RemainingDuration)
+          valveService.updateCharacteristic(this.hapChar.SetDuration, 120);
+          valveService.addCharacteristic(this.hapChar.RemainingDuration);
         }
       }
 
       // Add Eve power characteristics
       if (this.powerReadings) {
         if (!valveService.testCharacteristic(this.eveChar.CurrentConsumption)) {
-          valveService.addCharacteristic(this.eveChar.CurrentConsumption)
+          valveService.addCharacteristic(this.eveChar.CurrentConsumption);
         }
         if (!valveService.testCharacteristic(this.eveChar.ElectricCurrent)) {
-          valveService.addCharacteristic(this.eveChar.ElectricCurrent)
+          valveService.addCharacteristic(this.eveChar.ElectricCurrent);
         }
         if (!valveService.testCharacteristic(this.eveChar.Voltage)) {
-          valveService.addCharacteristic(this.eveChar.Voltage)
+          valveService.addCharacteristic(this.eveChar.Voltage);
         }
       }
 
       // Add the set handler to the valve active characteristic
       valveService
         .getCharacteristic(this.hapChar.Active)
-        .onSet(async value => await this.internalUpdate('Valve ' + v, value))
+        .onSet(async (value) => this.internalUpdate(`Valve ${v}`, value));
 
       // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
       if (!platform.config.disableNoResponse) {
         valveService.getCharacteristic(this.hapChar.Active).onGet(() => {
           if (!this.isOnline) {
-            throw new this.hapErr(-70402)
+            throw new this.hapErr(-70402);
           }
-          return valveService.getCharacteristic(this.hapChar.Active).value
-        })
+          return valveService.getCharacteristic(this.hapChar.Active).value;
+        });
       }
 
       // Add the set handler to the valve set duration characteristic
       if (this.disableTimer) {
         if (valveService.testCharacteristic(this.hapChar.SetDuration)) {
           valveService.removeCharacteristic(
-            valveService.getCharacteristic(this.hapChar.SetDuration)
-          )
+            valveService.getCharacteristic(this.hapChar.SetDuration),
+          );
         }
         if (valveService.testCharacteristic(this.hapChar.RemainingDuration)) {
           valveService.removeCharacteristic(
-            valveService.getCharacteristic(this.hapChar.RemainingDuration)
-          )
+            valveService.getCharacteristic(this.hapChar.RemainingDuration),
+          );
         }
       } else {
-        valveService.getCharacteristic(this.hapChar.SetDuration).onSet(value => {
+        valveService.getCharacteristic(this.hapChar.SetDuration).onSet((value) => {
           // Check if the valve is currently active
           if (valveService.getCharacteristic(this.hapChar.InUse).value === 1) {
             // Update the remaining duration characteristic with the new value
-            valveService.updateCharacteristic(this.hapChar.RemainingDuration, value)
+            valveService.updateCharacteristic(this.hapChar.RemainingDuration, value);
 
             // Clear any existing active timers
-            clearTimeout(valveService.timer)
+            clearTimeout(valveService.timer);
 
             // Set a new active timer with the new time amount
             valveService.timer = setTimeout(
               () => valveService.setCharacteristic(this.hapChar.Active, 0),
-              value * 1000
-            )
+              value * 1000,
+            );
           }
-        })
+        });
       }
-    })
+    });
 
     // Set up an interval to get eWeLink to send power updates
     if (this.powerReadings && platform.config.mode !== 'lan') {
       setTimeout(() => {
-        this.internalUIUpdate()
-        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
-      }, 5000)
+        this.internalUIUpdate();
+        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000);
+      }, 5000);
 
       // Stop the intervals on Homebridge shutdown
-      platform.api.on('shutdown', () => clearInterval(this.intervalPoll))
+      platform.api.on('shutdown', () => clearInterval(this.intervalPoll));
     }
 
     // Output the customised options to the log
+    const normalLogging = this.enableLogging ? 'standard' : 'disable';
     const opts = JSON.stringify({
       disableTimer: this.disableTimer,
-      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
-      showAs: 'valve_two'
-    })
-    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
+      logging: this.enableDebugLogging ? 'debug' : normalLogging,
+      showAs: 'valve_two',
+    });
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts);
   }
 
-  async internalUpdate (valve, value) {
+  async internalUpdate(valve, value) {
     try {
       const params = {
-        switches: []
-      }
-      const valveService = this.accessory.getService(valve)
+        switches: [],
+      };
+      const valveService = this.accessory.getService(valve);
       switch (valve) {
         case 'Valve 1':
-          params.switches.push({ switch: value ? 'on' : 'off', outlet: 0 })
-          break
+          params.switches.push({ switch: value ? 'on' : 'off', outlet: 0 });
+          break;
         case 'Valve 2':
-          params.switches.push({ switch: value ? 'on' : 'off', outlet: 1 })
-          break
+          params.switches.push({ switch: value ? 'on' : 'off', outlet: 1 });
+          break;
+        default:
+          return;
       }
-      valveService.updateCharacteristic(this.hapChar.InUse, value)
+      valveService.updateCharacteristic(this.hapChar.InUse, value);
       switch (value) {
         case 0:
           if (!this.disableTimer) {
-            valveService.updateCharacteristic(this.hapChar.RemainingDuration, 0)
-            clearTimeout(this.accessory.getService(valve).timer)
+            valveService.updateCharacteristic(this.hapChar.RemainingDuration, 0);
+            clearTimeout(this.accessory.getService(valve).timer);
           }
           if (this.enableLogging) {
-            this.log('[%s] [%s] %s [%s].', this.name, valve, this.lang.curState, this.lang.valveNo)
+            this.log('[%s] [%s] %s [%s].', this.name, valve, this.lang.curState, this.lang.valveNo);
           }
-          break
+          break;
         case 1: {
           if (!this.disableTimer) {
-            const timer = valveService.getCharacteristic(this.hapChar.SetDuration).value
-            valveService.updateCharacteristic(this.hapChar.RemainingDuration, timer)
+            const timer = valveService.getCharacteristic(this.hapChar.SetDuration).value;
+            valveService.updateCharacteristic(this.hapChar.RemainingDuration, timer);
             valveService.timer = setTimeout(() => {
-              valveService.setCharacteristic(this.hapChar.Active, 0)
-            }, timer * 1000)
+              valveService.setCharacteristic(this.hapChar.Active, 0);
+            }, timer * 1000);
           }
           if (this.enableLogging) {
-            this.log('[%s] [%s] %s [%s].', this.name, valve, this.lang.curState, this.lang.valveYes)
+            this.log('[%s] [%s] %s [%s].', this.name, valve, this.lang.curState, this.lang.valveYes);
           }
-          break
+          break;
         }
+        default:
+          return;
       }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
+      await this.platform.sendDeviceUpdate(this.accessory, params);
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
-      const valveService = this.accessory.getService(valve)
+      this.platform.deviceUpdateError(this.accessory, err, true);
+      const valveService = this.accessory.getService(valve);
       setTimeout(() => {
-        valveService.updateCharacteristic(this.hapChar.Active, value === 1 ? 0 : 1)
-      }, 2000)
-      throw new this.hapErr(-70402)
+        valveService.updateCharacteristic(this.hapChar.Active, value === 1 ? 0 : 1);
+      }, 2000);
+      throw new this.hapErr(-70402);
     }
   }
 
-  async internalUIUpdate () {
+  async internalUIUpdate() {
     try {
       // Skip polling if device isn't online
       if (!this.isOnline) {
-        return
+        return;
       }
 
       // Send the params to request the updates
-      await this.platform.sendDeviceUpdate(this.accessory, { uiActive: { outlet: 0, time: 120 } })
-      await this.funcs.sleep(2000)
-      await this.platform.sendDeviceUpdate(this.accessory, { uiActive: { outlet: 1, time: 120 } })
+      await this.platform.sendDeviceUpdate(this.accessory, { uiActive: { outlet: 0, time: 120 } });
+      await sleep(2000);
+      await this.platform.sendDeviceUpdate(this.accessory, { uiActive: { outlet: 1, time: 120 } });
     } catch (err) {
       // Suppress errors here
     }
   }
 
-  async externalUpdate (params) {
+  async externalUpdate(params) {
     try {
       if (params.switches) {
-        ;['1', '2'].forEach((v, k) => {
-          const valveService = this.accessory.getService('Valve ' + v)
+        ['1', '2'].forEach((v, k) => {
+          const valveService = this.accessory.getService(`Valve ${v}`);
           if (params.switches[k].switch === 'on') {
             if (valveService.getCharacteristic(this.hapChar.Active).value === 0) {
-              valveService.updateCharacteristic(this.hapChar.Active, 1)
-              valveService.updateCharacteristic(this.hapChar.InUse, 1)
+              valveService.updateCharacteristic(this.hapChar.Active, 1);
+              valveService.updateCharacteristic(this.hapChar.InUse, 1);
               if (!this.disableTimer) {
-                const timer = valveService.getCharacteristic(this.hapChar.SetDuration).value
-                valveService.updateCharacteristic(this.hapChar.RemainingDuration, timer)
+                const timer = valveService.getCharacteristic(this.hapChar.SetDuration).value;
+                valveService.updateCharacteristic(this.hapChar.RemainingDuration, timer);
                 valveService.timer = setTimeout(() => {
-                  valveService.setCharacteristic(this.hapChar.Active, 0)
-                }, timer * 1000)
+                  valveService.setCharacteristic(this.hapChar.Active, 0);
+                }, timer * 1000);
               }
               if (params.updateSource && this.enableLogging) {
                 this.log(
@@ -233,109 +236,105 @@ module.exports = class deviceValveTwo {
                   this.name,
                   v,
                   this.lang.curState,
-                  this.lang.valveYes
-                )
+                  this.lang.valveYes,
+                );
               }
             }
-          } else {
-            if (valveService.getCharacteristic(this.hapChar.Active).value === 1) {
-              valveService.updateCharacteristic(this.hapChar.Active, 0)
-              valveService.updateCharacteristic(this.hapChar.InUse, 0)
-              if (!this.disableTimer) {
-                valveService.updateCharacteristic(this.hapChar.RemainingDuration, 0)
-                clearTimeout(valveService.timer)
-              } else {
-                if (params.updateSource && this.enableLogging) {
-                  this.log(
-                    '[%s] [Valve %s] %s [%s].',
-                    this.name,
-                    v,
-                    this.lang.curState,
-                    this.lang.valveNo
-                  )
-                }
-              }
+          } else if (valveService.getCharacteristic(this.hapChar.Active).value === 1) {
+            valveService.updateCharacteristic(this.hapChar.Active, 0);
+            valveService.updateCharacteristic(this.hapChar.InUse, 0);
+            if (!this.disableTimer) {
+              valveService.updateCharacteristic(this.hapChar.RemainingDuration, 0);
+              clearTimeout(valveService.timer);
+            } else if (params.updateSource && this.enableLogging) {
+              this.log(
+                '[%s] [Valve %s] %s [%s].',
+                this.name,
+                v,
+                this.lang.curState,
+                this.lang.valveNo,
+              );
             }
           }
-        })
+        });
       }
 
       // Get the power readings given by certain devices
       if (!this.powerReadings) {
-        return
+        return;
       }
-      let logger0 = false
-      let logger1 = false
-      let power0
-      let power1
-      let voltage0
-      let voltage1
-      let current0
-      let current1
-      if (this.funcs.hasProperty(params, 'actPow_00')) {
-        power0 = parseInt(params.actPow_00) / 100
+      let logger0 = false;
+      let logger1 = false;
+      let power0;
+      let power1;
+      let voltage0;
+      let voltage1;
+      let current0;
+      let current1;
+      if (hasProperty(params, 'actPow_00')) {
+        power0 = parseInt(params.actPow_00, 10) / 100;
         this.accessory
           .getService('Valve 1')
-          .updateCharacteristic(this.eveChar.CurrentConsumption, power0)
-        logger0 = true
+          .updateCharacteristic(this.eveChar.CurrentConsumption, power0);
+        logger0 = true;
       }
-      if (this.funcs.hasProperty(params, 'actPow_01')) {
-        power1 = parseInt(params.actPow_01) / 100
+      if (hasProperty(params, 'actPow_01')) {
+        power1 = parseInt(params.actPow_01, 10) / 100;
         this.accessory
           .getService('Valve 2')
-          .updateCharacteristic(this.eveChar.CurrentConsumption, power1)
-        logger1 = true
+          .updateCharacteristic(this.eveChar.CurrentConsumption, power1);
+        logger1 = true;
       }
-      if (this.funcs.hasProperty(params, 'voltage_00')) {
-        voltage0 = parseInt(params.voltage_00) / 100
-        this.accessory.getService('Valve 1').updateCharacteristic(this.eveChar.Voltage, voltage0)
-        logger0 = true
+      if (hasProperty(params, 'voltage_00')) {
+        voltage0 = parseInt(params.voltage_00, 10) / 100;
+        this.accessory.getService('Valve 1').updateCharacteristic(this.eveChar.Voltage, voltage0);
+        logger0 = true;
       }
-      if (this.funcs.hasProperty(params, 'voltage_01')) {
-        voltage1 = parseInt(params.voltage_01) / 100
-        this.accessory.getService('Valve 2').updateCharacteristic(this.eveChar.Voltage, voltage1)
-        logger1 = true
+      if (hasProperty(params, 'voltage_01')) {
+        voltage1 = parseInt(params.voltage_01, 10) / 100;
+        this.accessory.getService('Valve 2').updateCharacteristic(this.eveChar.Voltage, voltage1);
+        logger1 = true;
       }
-      if (this.funcs.hasProperty(params, 'current_00')) {
-        current0 = parseInt(params.current_00) / 100
+      if (hasProperty(params, 'current_00')) {
+        current0 = parseInt(params.current_00, 10) / 100;
         this.accessory
           .getService('Valve 1')
-          .updateCharacteristic(this.eveChar.ElectricCurrent, current0)
-        logger0 = true
+          .updateCharacteristic(this.eveChar.ElectricCurrent, current0);
+        logger0 = true;
       }
-      if (this.funcs.hasProperty(params, 'current_01')) {
-        current1 = parseInt(params.current_01) / 100
+      if (hasProperty(params, 'current_01')) {
+        current1 = parseInt(params.current_01, 10) / 100;
         this.accessory
           .getService('Valve 2')
-          .updateCharacteristic(this.eveChar.ElectricCurrent, current1)
-        logger1 = true
+          .updateCharacteristic(this.eveChar.ElectricCurrent, current1);
+        logger1 = true;
       }
       if (params.updateSource && this.enableLogging) {
         if (logger0) {
           this.log(
             '[%s] [Valve 1] %s%s%s.',
             this.name,
-            power0 !== undefined ? this.lang.curPower + ' [' + power0 + 'W]' : '',
-            voltage0 !== undefined ? ' ' + this.lang.curVolt + ' [' + voltage0 + 'V]' : '',
-            current0 !== undefined ? ' ' + this.lang.curCurr + ' [' + current0 + 'A]' : ''
-          )
+            power0 !== undefined ? `${this.lang.curPower} [${power0}W]` : '',
+            voltage0 !== undefined ? ` ${this.lang.curVolt} [${voltage0}V]` : '',
+            current0 !== undefined ? ` ${this.lang.curCurr} [${current0}A]` : '',
+          );
         }
         if (logger1) {
           this.log(
             '[%s] [Valve 2] %s%s%s.',
             this.name,
-            power1 !== undefined ? this.lang.curPower + ' [' + power1 + 'W]' : '',
-            voltage1 !== undefined ? ' ' + this.lang.curVolt + ' [' + voltage1 + 'V]' : '',
-            current1 !== undefined ? ' ' + this.lang.curCurr + ' [' + current1 + 'A]' : ''
-          )
+            power1 !== undefined ? `${this.lang.curPower} [${power1}W]` : '',
+            voltage1 !== undefined ? ` ${this.lang.curVolt} [${voltage1}V]` : '',
+            current1 !== undefined ? ` ${this.lang.curCurr} [${current1}A]` : '',
+          );
         }
       }
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, false)
+      this.platform.deviceUpdateError(this.accessory, err, false);
     }
   }
 
-  markStatus (isOnline) {
-    this.isOnline = isOnline
+  markStatus(isOnline) {
+    this.isOnline = isOnline;
   }
 }
diff --git a/lib/device/simulation/window.js b/lib/device/simulation/window.js
index 44e85110..89436fb4 100644
--- a/lib/device/simulation/window.js
+++ b/lib/device/simulation/window.js
@@ -1,254 +1,253 @@
-/* jshint node: true, esversion: 10, -W014, -W033 */
-/* eslint-disable new-cap */
-'use strict'
+import platformConsts from '../../utils/constants.js';
+import { generateRandomString, hasProperty, sleep } from '../../utils/functions.js';
 
-module.exports = class deviceWindow {
-  constructor (platform, accessory) {
+export default class {
+  constructor(platform, accessory) {
     // Set up variables from the platform
-    this.eveChar = platform.eveChar
-    this.funcs = platform.funcs
-    this.hapChar = platform.api.hap.Characteristic
-    this.hapErr = platform.api.hap.HapStatusError
-    this.hapServ = platform.api.hap.Service
-    this.lang = platform.lang
-    this.log = platform.log
-    this.platform = platform
+    this.eveChar = platform.eveChar;
+    this.hapChar = platform.api.hap.Characteristic;
+    this.hapErr = platform.api.hap.HapStatusError;
+    this.hapServ = platform.api.hap.Service;
+    this.lang = platform.lang;
+    this.log = platform.log;
+    this.platform = platform;
 
     // Set up variables from the accessory
-    this.name = accessory.displayName
-    this.accessory = accessory
+    this.name = accessory.displayName;
+    this.accessory = accessory;
 
     // Initially set the online flag as true (to be then updated as false if necessary)
-    this.isOnline = true
+    this.isOnline = true;
 
     // Set up custom variables for this device type
-    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
-    this.operationTimeUp = deviceConf.operationTime || platform.consts.defaultValues.operationTime
-    this.operationTimeDown = deviceConf.operationTimeDown || this.operationTimeUp
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId] || {};
+    this.operationTimeUp = deviceConf.operationTime || platformConsts.defaultValues.operationTime;
+    this.operationTimeDown = deviceConf.operationTimeDown || this.operationTimeUp;
 
     // Set the correct logging variables for this accessory
-    this.enableLogging = !platform.config.disableDeviceLogging
-    this.enableDebugLogging = platform.config.debug
-    if (deviceConf && deviceConf.overrideLogging) {
-      switch (deviceConf.overrideLogging) {
-        case 'standard':
-          this.enableLogging = true
-          this.enableDebugLogging = false
-          break
-        case 'debug':
-          this.enableLogging = true
-          this.enableDebugLogging = true
-          break
-        case 'disable':
-          this.enableLogging = false
-          this.enableDebugLogging = false
-          break
-      }
+    switch (deviceConf.overrideLogging) {
+      case 'standard':
+        this.enableLogging = true;
+        this.enableDebugLogging = false;
+        break;
+      case 'debug':
+        this.enableLogging = true;
+        this.enableDebugLogging = true;
+        break;
+      case 'disable':
+        this.enableLogging = false;
+        this.enableDebugLogging = false;
+        break;
+      default:
+        this.enableLogging = !platform.config.disableDeviceLogging;
+        this.enableDebugLogging = platform.config.debug;
+        break;
     }
 
     // Set up the accessory with default positions when added the first time
-    if (!this.funcs.hasProperty(this.accessory.context, 'cacheCurrentPosition')) {
-      this.accessory.context.cacheCurrentPosition = 0
-      this.accessory.context.cachePositionState = 2
-      this.accessory.context.cacheTargetPosition = 0
+    if (!hasProperty(this.accessory.context, 'cacheCurrentPosition')) {
+      this.accessory.context.cacheCurrentPosition = 0;
+      this.accessory.context.cachePositionState = 2;
+      this.accessory.context.cacheTargetPosition = 0;
     }
 
     // Add the window service if it doesn't already exist
-    if (!(this.service = this.accessory.getService(this.hapServ.Window))) {
-      this.service = this.accessory.addService(this.hapServ.Window)
-      this.service.updateCharacteristic(this.hapChar.CurrentPosition, 0)
-      this.service.updateCharacteristic(this.hapChar.TargetPosition, 0)
-      this.service.updateCharacteristic(this.hapChar.PositionState, 2)
+    this.service = this.accessory.getService(this.hapServ.Window);
+    if (!this.service) {
+      this.service = this.accessory.addService(this.hapServ.Window);
+      this.service.updateCharacteristic(this.hapChar.CurrentPosition, 0);
+      this.service.updateCharacteristic(this.hapChar.TargetPosition, 0);
+      this.service.updateCharacteristic(this.hapChar.PositionState, 2);
     }
 
     // Certain devices give power readings
-    if (platform.consts.devices.switchMultiPower.includes(this.accessory.context.eweUIID)) {
+    if (platformConsts.devices.switchMultiPower.includes(this.accessory.context.eweUIID)) {
       // Add Eve power characteristics
-      this.powerReadings = true
+      this.powerReadings = true;
       if (!this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
-        this.service.addCharacteristic(this.eveChar.CurrentConsumption)
+        this.service.addCharacteristic(this.eveChar.CurrentConsumption);
       }
       if (!this.service.testCharacteristic(this.eveChar.ElectricCurrent)) {
-        this.service.addCharacteristic(this.eveChar.ElectricCurrent)
+        this.service.addCharacteristic(this.eveChar.ElectricCurrent);
       }
       if (!this.service.testCharacteristic(this.eveChar.Voltage)) {
-        this.service.addCharacteristic(this.eveChar.Voltage)
+        this.service.addCharacteristic(this.eveChar.Voltage);
       }
     }
 
     // Add the set handler to the target position characteristic
-    this.service.getCharacteristic(this.hapChar.TargetPosition).onSet(value => {
+    this.service.getCharacteristic(this.hapChar.TargetPosition).onSet((value) => {
       // We don't use await as we want the callback to be run straight away
-      this.internalPositionUpdate(value)
-    })
+      this.internalPositionUpdate(value);
+    });
 
     // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
     if (!platform.config.disableNoResponse) {
       this.service.getCharacteristic(this.hapChar.CurrentPosition).onGet(() => {
         if (!this.isOnline) {
-          throw new this.hapErr(-70402)
+          throw new this.hapErr(-70402);
         }
-        return this.service.getCharacteristic(this.hapChar.CurrentPosition).value
-      })
+        return this.service.getCharacteristic(this.hapChar.CurrentPosition).value;
+      });
       this.service.getCharacteristic(this.hapChar.TargetPosition).onGet(() => {
         if (!this.isOnline) {
-          throw new this.hapErr(-70402)
+          throw new this.hapErr(-70402);
         }
-        return this.service.getCharacteristic(this.hapChar.TargetPosition).value
-      })
+        return this.service.getCharacteristic(this.hapChar.TargetPosition).value;
+      });
     }
 
     // Set up an interval to get eWeLink to send power updates
     if (this.powerReadings && platform.config.mode !== 'lan') {
       setTimeout(() => {
-        this.internalUIUpdate()
-        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
-      }, 5000)
+        this.internalUIUpdate();
+        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000);
+      }, 5000);
 
       // Stop the intervals on Homebridge shutdown
-      platform.api.on('shutdown', () => clearInterval(this.intervalPoll))
+      platform.api.on('shutdown', () => clearInterval(this.intervalPoll));
     }
 
     // Output the customised options to the log
+    const normalLogging = this.enableLogging ? 'standard' : 'disable';
     const opts = JSON.stringify({
-      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
+      logging: this.enableDebugLogging ? 'debug' : normalLogging,
       operationTimeDown: this.operationTimeDown,
       operationTimeUp: this.operationTimeUp,
-      showAs: 'window'
-    })
-    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
+      showAs: 'window',
+    });
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts);
   }
 
-  async internalPositionUpdate (value) {
+  async internalPositionUpdate(value) {
     try {
-      let prevPosition = this.accessory.context.cacheCurrentPosition
+      let prevPosition = this.accessory.context.cacheCurrentPosition;
       if (value === prevPosition) {
-        return
+        return;
       }
       const params = {
-        switches: []
-      }
-      const prevState = this.accessory.context.cachePositionState
-      const percentStepUpPerDS = this.operationTimeUp / 100
-      const percentStepDownPerDS = this.operationTimeDown / 100
-      const updateKey = this.funcs.generateRandomString(5)
-      this.updateKey = updateKey
+        switches: [],
+      };
+      const prevState = this.accessory.context.cachePositionState;
+      const percentStepUpPerDS = this.operationTimeUp / 100;
+      const percentStepDownPerDS = this.operationTimeDown / 100;
+      const updateKey = generateRandomString(5);
+      this.updateKey = updateKey;
       if (prevState !== 2) {
-        params.switches.push({ switch: 'off', outlet: 0 })
-        params.switches.push({ switch: 'off', outlet: 1 })
-        await this.platform.sendDeviceUpdate(this.accessory, params)
-        params.switches = []
-        const posPercentChange =
-          Math.floor(Date.now() / 100) - this.accessory.context.cacheLastStartTime
-        const posPercentChangeUp = Math.floor(percentStepUpPerDS * posPercentChange)
-        const posPercentChangeDown = Math.floor(percentStepDownPerDS * posPercentChange)
+        params.switches.push({ switch: 'off', outlet: 0 });
+        params.switches.push({ switch: 'off', outlet: 1 });
+        await this.platform.sendDeviceUpdate(this.accessory, params);
+        params.switches = [];
+        const posPercentChange = Math.floor(Date.now() / 100) - this.accessory.context.cacheLastStartTime;
+        const posPercentChangeUp = Math.floor(percentStepUpPerDS * posPercentChange);
+        const posPercentChangeDown = Math.floor(percentStepDownPerDS * posPercentChange);
         if (prevState === 0) {
           // Was going down
-          prevPosition -= posPercentChangeDown
+          prevPosition -= posPercentChangeDown;
         } else {
           // Was going up
-          prevPosition += posPercentChangeUp
+          prevPosition += posPercentChangeUp;
         }
-        prevPosition = Math.min(Math.max(prevPosition, 0), 100)
-        this.service.updateCharacteristic(this.hapChar.CurrentPosition, prevPosition)
-        this.accessory.context.cacheCurrentPosition = prevPosition
+        prevPosition = Math.min(Math.max(prevPosition, 0), 100);
+        this.service.updateCharacteristic(this.hapChar.CurrentPosition, prevPosition);
+        this.accessory.context.cacheCurrentPosition = prevPosition;
       }
-      const diffPosition = value - prevPosition
-      const setToMoveUp = diffPosition > 0
-      let decisecondsToMove
+      const diffPosition = value - prevPosition;
+      const setToMoveUp = diffPosition > 0;
+      let decisecondsToMove;
       if (setToMoveUp) {
-        decisecondsToMove = Math.round(Math.abs(diffPosition) * percentStepUpPerDS)
-        params.switches.push({ switch: 'on', outlet: 0 })
+        decisecondsToMove = Math.round(Math.abs(diffPosition) * percentStepUpPerDS);
+        params.switches.push({ switch: 'on', outlet: 0 });
       } else {
-        decisecondsToMove = Math.round(Math.abs(diffPosition) * percentStepDownPerDS)
-        params.switches.push({ switch: 'on', outlet: 1 })
-      }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
-      params.switches = []
-      this.accessory.context.cacheTargetPosition = value
-      this.accessory.context.cachePositionState = setToMoveUp ? 1 : 0
-      this.accessory.context.cacheLastStartTime = Math.floor(Date.now() / 100)
-      await this.funcs.sleep(decisecondsToMove * 100)
+        decisecondsToMove = Math.round(Math.abs(diffPosition) * percentStepDownPerDS);
+        params.switches.push({ switch: 'on', outlet: 1 });
+      }
+      await this.platform.sendDeviceUpdate(this.accessory, params);
+      params.switches = [];
+      this.accessory.context.cacheTargetPosition = value;
+      this.accessory.context.cachePositionState = setToMoveUp ? 1 : 0;
+      this.accessory.context.cacheLastStartTime = Math.floor(Date.now() / 100);
+      await sleep(decisecondsToMove * 100);
       if (this.updateKey !== updateKey) {
-        return
+        return;
       }
       params.switches.push({
         switch: 'off',
-        outlet: setToMoveUp ? 0 : 1
-      })
-      await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.service.updateCharacteristic(this.hapChar.PositionState, 2)
-      this.service.updateCharacteristic(this.hapChar.CurrentPosition, value)
-      this.accessory.context.cachePositionState = 2
-      this.accessory.context.cacheCurrentPosition = value
+        outlet: setToMoveUp ? 0 : 1,
+      });
+      await this.platform.sendDeviceUpdate(this.accessory, params);
+      this.service.updateCharacteristic(this.hapChar.PositionState, 2);
+      this.service.updateCharacteristic(this.hapChar.CurrentPosition, value);
+      this.accessory.context.cachePositionState = 2;
+      this.accessory.context.cacheCurrentPosition = value;
       if (this.enableLogging) {
-        this.log('[%s] %s [%s%]', this.name, this.lang.curPos, value)
+        this.log('[%s] %s [%s%]', this.name, this.lang.curPos, value);
       }
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true);
       setTimeout(() => {
         this.service.updateCharacteristic(
           this.hapChar.TargetPosition,
-          this.accessory.context.cacheTargetPosition
-        )
-      }, 2000)
-      this.service.updateCharacteristic(this.hapChar.TargetPosition, new this.hapErr(-70402))
+          this.accessory.context.cacheTargetPosition,
+        );
+      }, 2000);
+      this.service.updateCharacteristic(this.hapChar.TargetPosition, new this.hapErr(-70402));
     }
   }
 
-  async internalUIUpdate () {
+  async internalUIUpdate() {
     try {
       // Skip polling if device isn't online
       if (!this.isOnline) {
-        return
+        return;
       }
 
       // Send the params to request the updates
-      await this.platform.sendDeviceUpdate(this.accessory, { uiActive: { outlet: 0, time: 120 } })
+      await this.platform.sendDeviceUpdate(this.accessory, { uiActive: { outlet: 0, time: 120 } });
     } catch (err) {
       // Suppress errors here
     }
   }
 
-  async externalUpdate (params) {
+  async externalUpdate(params) {
     try {
       if (!this.powerReadings) {
-        return
-      }
-      let logger = false
-      let power
-      let voltage
-      let current
-      if (this.funcs.hasProperty(params, 'actPow_00')) {
-        power = parseInt(params.actPow_00) / 100
-        this.service.updateCharacteristic(this.eveChar.CurrentConsumption, power)
-        logger = true
-      }
-      if (this.funcs.hasProperty(params, 'voltage_00')) {
-        voltage = parseInt(params.voltage_00) / 100
-        this.service.updateCharacteristic(this.eveChar.Voltage, voltage)
-        logger = true
-      }
-      if (this.funcs.hasProperty(params, 'current_00')) {
-        current = parseInt(params.current_00) / 100
-        this.service.updateCharacteristic(this.eveChar.ElectricCurrent, current)
-        logger = true
+        return;
+      }
+      let logger = false;
+      let power;
+      let voltage;
+      let current;
+      if (hasProperty(params, 'actPow_00')) {
+        power = parseInt(params.actPow_00, 10) / 100;
+        this.service.updateCharacteristic(this.eveChar.CurrentConsumption, power);
+        logger = true;
+      }
+      if (hasProperty(params, 'voltage_00')) {
+        voltage = parseInt(params.voltage_00, 10) / 100;
+        this.service.updateCharacteristic(this.eveChar.Voltage, voltage);
+        logger = true;
+      }
+      if (hasProperty(params, 'current_00')) {
+        current = parseInt(params.current_00, 10) / 100;
+        this.service.updateCharacteristic(this.eveChar.ElectricCurrent, current);
+        logger = true;
       }
       if (params.updateSource && logger && this.enableLogging) {
         this.log(
           '[%s] %s%s%s.',
           this.name,
-          power !== undefined ? this.lang.curPower + ' [' + power + 'W]' : '',
-          voltage !== undefined ? ' ' + this.lang.curVolt + ' [' + voltage + 'V]' : '',
-          current !== undefined ? ' ' + this.lang.curCurr + ' [' + current + 'A]' : ''
-        )
+          power !== undefined ? `${this.lang.curPower} [${power}W]` : '',
+          voltage !== undefined ? ` ${this.lang.curVolt} [${voltage}V]` : '',
+          current !== undefined ? ` ${this.lang.curCurr} [${current}A]` : '',
+        );
       }
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, false)
+      this.platform.deviceUpdateError(this.accessory, err, false);
     }
   }
 
-  markStatus (isOnline) {
-    this.isOnline = isOnline
+  markStatus(isOnline) {
+    this.isOnline = isOnline;
   }
 }
diff --git a/lib/device/switch-mate.js b/lib/device/switch-mate.js
index 394a1d1d..30d3398d 100644
--- a/lib/device/switch-mate.js
+++ b/lib/device/switch-mate.js
@@ -1,89 +1,82 @@
-/* jshint node: true, esversion: 10, -W014, -W033 */
-/* eslint-disable new-cap */
-'use strict'
+import { hasProperty } from '../utils/functions.js';
 
-module.exports = class deviceSwitchMate {
-  constructor (platform, accessory) {
+export default class {
+  constructor(platform, accessory) {
     // Set up variables from the platform
-    this.funcs = platform.funcs
-    this.hapChar = platform.api.hap.Characteristic
-    this.hapServ = platform.api.hap.Service
-    this.lang = platform.lang
-    this.log = platform.log
-    this.platform = platform
+    this.hapChar = platform.api.hap.Characteristic;
+    this.hapServ = platform.api.hap.Service;
+    this.lang = platform.lang;
+    this.log = platform.log;
+    this.platform = platform;
 
     // Set up variables from the accessory
-    this.name = accessory.displayName
-    this.accessory = accessory
+    this.name = accessory.displayName;
+    this.accessory = accessory;
 
     // Set up custom variables for this device type
-    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId] || {};
 
     // Set the correct logging variables for this accessory
-    this.enableLogging = !platform.config.disableDeviceLogging
-    this.enableDebugLogging = platform.config.debug
-    if (deviceConf && deviceConf.overrideLogging) {
-      switch (deviceConf.overrideLogging) {
-        case 'standard':
-          this.enableLogging = true
-          this.enableDebugLogging = false
-          break
-        case 'debug':
-          this.enableLogging = true
-          this.enableDebugLogging = true
-          break
-        case 'disable':
-          this.enableLogging = false
-          this.enableDebugLogging = false
-          break
-      }
+    switch (deviceConf.overrideLogging) {
+      case 'standard':
+        this.enableLogging = true;
+        this.enableDebugLogging = false;
+        break;
+      case 'debug':
+        this.enableLogging = true;
+        this.enableDebugLogging = true;
+        break;
+      case 'disable':
+        this.enableLogging = false;
+        this.enableDebugLogging = false;
+        break;
+      default:
+        this.enableLogging = !platform.config.disableDeviceLogging;
+        this.enableDebugLogging = platform.config.debug;
+        break;
     }
     this.timeouts = {
       0: false,
       1: false,
-      2: false
-    }
+      2: false,
+    };
 
     // Add the stateless switch service if it doesn't already exist
-    this.service =
-      this.accessory.getService(this.hapServ.StatelessProgrammableSwitch) ||
-      this.accessory.addService(this.hapServ.StatelessProgrammableSwitch)
+    this.service = this.accessory.getService(this.hapServ.StatelessProgrammableSwitch)
+      || this.accessory.addService(this.hapServ.StatelessProgrammableSwitch);
 
     // Output the customised options to the log
+    const normalLogging = this.enableLogging ? 'standard' : 'disable';
     const opts = JSON.stringify({
-      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable'
-    })
-    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
+      logging: this.enableDebugLogging ? 'debug' : normalLogging,
+    });
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts);
   }
 
-  async externalUpdate (params) {
+  async externalUpdate(params) {
     try {
       if (
-        this.funcs.hasProperty(params, 'outlet') &&
-        [0, 1, 2].includes(params.outlet) &&
-        params.actionTime &&
-        !this.timeouts[params.outlet]
+        hasProperty(params, 'outlet')
+        && [0, 1, 2].includes(params.outlet)
+        && params.actionTime
+        && !this.timeouts[params.outlet]
       ) {
-        this.timeouts[params.outlet] = true
+        this.timeouts[params.outlet] = true;
         setTimeout(() => {
-          this.timeouts[params.outlet] = false
-        }, 1000)
-        const timeDiff = (new Date().getTime() - Date.parse(params.actionTime)) / 1000
+          this.timeouts[params.outlet] = false;
+        }, 1000);
+        const timeDiff = (new Date().getTime() - Date.parse(params.actionTime)) / 1000;
         if (timeDiff < 5) {
-          this.service.updateCharacteristic(this.hapChar.ProgrammableSwitchEvent, params.outlet)
+          this.service.updateCharacteristic(this.hapChar.ProgrammableSwitchEvent, params.outlet);
           if (params.updateSource && this.enableLogging) {
-            const textLabel =
-              params.outlet === 0
-                ? this.lang.buttonSingle
-                : params.outlet === 1
-                ? this.lang.buttonDouble
-                : this.lang.buttonLong
-            this.log('[%s] %s [%s].', this.name, this.lang.curState, textLabel)
+            const doubleLong = params.outlet === 1 ? this.lang.buttonDouble : this.lang.buttonLong;
+            const textLabel = params.outlet === 0 ? this.lang.buttonSingle : doubleLong;
+            this.log('[%s] %s [%s].', this.name, this.lang.curState, textLabel);
           }
         }
       }
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, false)
+      this.platform.deviceUpdateError(this.accessory, err, false);
     }
   }
 }
diff --git a/lib/device/switch-multi.js b/lib/device/switch-multi.js
index b0484086..18a59d0a 100644
--- a/lib/device/switch-multi.js
+++ b/lib/device/switch-multi.js
@@ -1,28 +1,26 @@
-/* jshint node: true, esversion: 10, -W014, -W033 */
-/* eslint-disable new-cap */
-'use strict'
+import platformConsts from '../utils/constants.js';
+import { hasProperty, sleep } from '../utils/functions.js';
 
-module.exports = class deviceSwitchMulti {
-  constructor (platform, accessory, devicesInHB) {
+export default class {
+  constructor(platform, accessory, devicesInHB) {
     // Set up variables from the platform
-    this.cusChar = platform.cusChar
-    this.devicesInHB = devicesInHB
-    this.eveChar = platform.eveChar
-    this.funcs = platform.funcs
-    this.hapChar = platform.api.hap.Characteristic
-    this.hapErr = platform.api.hap.HapStatusError
-    this.hapServ = platform.api.hap.Service
-    this.hapUUIDGen = platform.api.hap.uuid.generate
-    this.lang = platform.lang
-    this.log = platform.log
-    this.platform = platform
+    this.cusChar = platform.cusChar;
+    this.devicesInHB = devicesInHB;
+    this.eveChar = platform.eveChar;
+    this.hapChar = platform.api.hap.Characteristic;
+    this.hapErr = platform.api.hap.HapStatusError;
+    this.hapServ = platform.api.hap.Service;
+    this.hapUUIDGen = platform.api.hap.uuid.generate;
+    this.lang = platform.lang;
+    this.log = platform.log;
+    this.platform = platform;
 
     // Set up variables from the accessory
-    this.name = accessory.displayName
-    this.accessory = accessory
+    this.name = accessory.displayName;
+    this.accessory = accessory;
 
     // Initially set the online flag as true (to be then updated as false if necessary)
-    this.isOnline = true
+    this.isOnline = true;
 
     /*
     UIID 2/3/4/7/8/9/29/30/31/41/82/83/84/113/114/2256/3256/4256: multi switch, no power readings
@@ -30,390 +28,386 @@ module.exports = class deviceSwitchMulti {
     */
 
     // Set up custom variables for this device type
-    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
-    this.hideChannels = deviceConf && deviceConf.hideChannels ? deviceConf.hideChannels : undefined
-    this.inchChannels = deviceConf && deviceConf.inchChannels ? deviceConf.inchChannels : ''
-    this.inUsePowerThreshold =
-      deviceConf && deviceConf.inUsePowerThreshold
-        ? deviceConf.inUsePowerThreshold
-        : platform.consts.defaultValues.inUsePowerThreshold
-    accessory.context.isInched =
-      accessory.context.switchNumber !== '0' &&
-      this.inchChannels.includes(accessory.context.switchNumber)
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId] || {};
+    this.hideChannels = deviceConf.hideChannels;
+    this.inchChannels = deviceConf.inchChannels || '';
+    this.inUsePowerThreshold = deviceConf.inUsePowerThreshold || platformConsts.defaultValues.inUsePowerThreshold;
+    accessory.context.isInched = accessory.context.switchNumber !== '0' && this.inchChannels.includes(accessory.context.switchNumber);
 
     // Set the correct logging variables for this accessory
-    this.enableLogging = !platform.config.disableDeviceLogging
-    this.enableDebugLogging = platform.config.debug
-    if (deviceConf && deviceConf.overrideLogging) {
-      switch (deviceConf.overrideLogging) {
-        case 'standard':
-          this.enableLogging = true
-          this.enableDebugLogging = false
-          break
-        case 'debug':
-          this.enableLogging = true
-          this.enableDebugLogging = true
-          break
-        case 'disable':
-          this.enableLogging = false
-          this.enableDebugLogging = false
-          break
-      }
+    switch (deviceConf.overrideLogging) {
+      case 'standard':
+        this.enableLogging = true;
+        this.enableDebugLogging = false;
+        break;
+      case 'debug':
+        this.enableLogging = true;
+        this.enableDebugLogging = true;
+        break;
+      case 'disable':
+        this.enableLogging = false;
+        this.enableDebugLogging = false;
+        break;
+      default:
+        this.enableLogging = !platform.config.disableDeviceLogging;
+        this.enableDebugLogging = platform.config.debug;
+        break;
     }
 
     // If the accessory has an outlet service then remove it
     if (this.accessory.getService(this.hapServ.Outlet)) {
-      this.accessory.removeService(this.accessory.getService(this.hapServ.Outlet))
+      this.accessory.removeService(this.accessory.getService(this.hapServ.Outlet));
     }
 
     // Add the switch service if it doesn't already exist
-    this.service =
-      this.accessory.getService(this.hapServ.Switch) ||
-      this.accessory.addService(this.hapServ.Switch)
+    this.service = this.accessory.getService(this.hapServ.Switch)
+      || this.accessory.addService(this.hapServ.Switch);
 
-    if (platform.consts.devices.switchMultiPower.includes(this.accessory.context.eweUIID)) {
+    if (platformConsts.devices.switchMultiPower.includes(this.accessory.context.eweUIID)) {
       // Add Eve power characteristics
-      this.powerReadings = true
-      this.isDual = true
+      this.powerReadings = true;
+      this.isDual = true;
       if (accessory.context.switchNumber !== '0') {
         if (!this.service.testCharacteristic(this.hapChar.OutletInUse)) {
-          this.service.addCharacteristic(this.hapChar.OutletInUse)
+          this.service.addCharacteristic(this.hapChar.OutletInUse);
         }
         if (!this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
-          this.service.addCharacteristic(this.eveChar.CurrentConsumption)
+          this.service.addCharacteristic(this.eveChar.CurrentConsumption);
         }
         if (!this.service.testCharacteristic(this.eveChar.ElectricCurrent)) {
-          this.service.addCharacteristic(this.eveChar.ElectricCurrent)
+          this.service.addCharacteristic(this.eveChar.ElectricCurrent);
         }
         if (!this.service.testCharacteristic(this.eveChar.Voltage)) {
-          this.service.addCharacteristic(this.eveChar.Voltage)
+          this.service.addCharacteristic(this.eveChar.Voltage);
         }
       }
     } else {
       // Remove unused Eve characteristics
       if (this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
         this.service.removeCharacteristic(
-          this.service.getCharacteristic(this.eveChar.CurrentConsumption)
-        )
+          this.service.getCharacteristic(this.eveChar.CurrentConsumption),
+        );
       }
       if (this.service.testCharacteristic(this.eveChar.ElectricCurrent)) {
         this.service.removeCharacteristic(
-          this.service.getCharacteristic(this.eveChar.ElectricCurrent)
-        )
+          this.service.getCharacteristic(this.eveChar.ElectricCurrent),
+        );
       }
       if (this.service.testCharacteristic(this.eveChar.Voltage)) {
-        this.service.removeCharacteristic(this.service.getCharacteristic(this.eveChar.Voltage))
+        this.service.removeCharacteristic(this.service.getCharacteristic(this.eveChar.Voltage));
       }
     }
 
     // Add the set handler to the switch on/off characteristic
     this.service
       .getCharacteristic(this.hapChar.On)
-      .onSet(async value => await this.internalStateUpdate(value))
+      .onSet(async (value) => this.internalStateUpdate(value));
 
     // Add a custom characteristic for inverting the switch if inching setting is enabled
     if (this.accessory.context.isInched) {
       if (!this.service.testCharacteristic(this.cusChar.InvertSwitch)) {
-        this.service.addCharacteristic(this.cusChar.InvertSwitch)
+        this.service.addCharacteristic(this.cusChar.InvertSwitch);
       }
       this.service.updateCharacteristic(
         this.cusChar.InvertSwitch,
-        this.service.getCharacteristic(this.hapChar.On).value
-      )
+        this.service.getCharacteristic(this.hapChar.On).value,
+      );
 
       // Add the set handler to invert the switch
-      this.service.getCharacteristic(this.cusChar.InvertSwitch).onSet(value => {
-        this.service.updateCharacteristic(this.hapChar.On, value)
-        this.log('[%s] %s [%s].', this.name, this.lang.curState, value ? 'on' : 'off')
-      })
+      this.service.getCharacteristic(this.cusChar.InvertSwitch).onSet((value) => {
+        this.service.updateCharacteristic(this.hapChar.On, value);
+        this.log('[%s] %s [%s].', this.name, this.lang.curState, value ? 'on' : 'off');
+      });
     }
 
     // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
     if (!platform.config.disableNoResponse) {
       this.service.getCharacteristic(this.hapChar.On).onGet(() => {
         if (!this.isOnline) {
-          throw new this.hapErr(-70402)
+          throw new this.hapErr(-70402);
         }
-        return this.service.getCharacteristic(this.hapChar.On).value
-      })
+        return this.service.getCharacteristic(this.hapChar.On).value;
+      });
     }
 
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new platform.eveService('switch', this.accessory, {
-      log: platform.config.debugFakegato ? this.log : () => {}
-    })
+      log: platform.config.debugFakegato ? this.log : () => {},
+    });
 
     // Set up extra features for outlets that provide power readings
     if (
-      this.powerReadings &&
-      accessory.context.switchNumber === '0' &&
-      platform.config.mode !== 'lan'
+      this.powerReadings
+      && accessory.context.switchNumber === '0'
+      && platform.config.mode !== 'lan'
     ) {
       // Set up an interval to get eWeLink to send power updates
       setTimeout(() => {
-        this.internalUIUpdate()
-        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
-      }, 5000)
+        this.internalUIUpdate();
+        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000);
+      }, 5000);
 
       // Stop the intervals on Homebridge shutdown
-      platform.api.on('shutdown', () => clearInterval(this.intervalPoll))
+      platform.api.on('shutdown', () => clearInterval(this.intervalPoll));
     }
 
     // Output the customised options to the log
     if (accessory.context.switchNumber === '0') {
+      const normalLogging = this.enableLogging ? 'standard' : 'disable';
       const opts = JSON.stringify({
         hideChannels: this.hideChannels,
         inchChannels: this.inchChannels,
         inUsePowerThreshold: this.inUsePowerThreshold,
-        logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
-        showAs: 'default'
-      })
-      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
+        logging: this.enableDebugLogging ? 'debug' : normalLogging,
+        showAs: 'default',
+      });
+      this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts);
     }
   }
 
-  async internalStateUpdate (value) {
+  async internalStateUpdate(value) {
     try {
-      let primaryState = false
+      let primaryState = false;
       if (this.accessory.context.isInched) {
-        value = !this.service.getCharacteristic(this.hapChar.On).value
+        value = !this.service.getCharacteristic(this.hapChar.On).value;
       }
       const params = {
-        switches: []
-      }
-      const switchNumber = this.accessory.context.switchNumber
+        switches: [],
+      };
+      const { switchNumber } = this.accessory.context;
       switch (switchNumber) {
         case '0':
-          params.switches.push({ switch: value ? 'on' : 'off', outlet: 0 })
-          params.switches.push({ switch: value ? 'on' : 'off', outlet: 1 })
+          params.switches.push({ switch: value ? 'on' : 'off', outlet: 0 });
+          params.switches.push({ switch: value ? 'on' : 'off', outlet: 1 });
           if (!this.isDual) {
-            params.switches.push({ switch: value ? 'on' : 'off', outlet: 2 })
-            params.switches.push({ switch: value ? 'on' : 'off', outlet: 3 })
+            params.switches.push({ switch: value ? 'on' : 'off', outlet: 2 });
+            params.switches.push({ switch: value ? 'on' : 'off', outlet: 3 });
           }
-          break
+          break;
         case '1':
         case '2':
         case '3':
         case '4':
           params.switches.push({
             switch: value || this.accessory.context.isInched ? 'on' : 'off',
-            outlet: switchNumber - 1
-          })
-          break
+            outlet: switchNumber - 1,
+          });
+          break;
+        default:
+          return;
       }
       if (this.accessory.context.isInched) {
-        this.accessory.context.ignoreUpdates = true
+        this.accessory.context.ignoreUpdates = true;
         setTimeout(() => {
-          this.accessory.context.ignoreUpdates = false
-        }, 1500)
+          this.accessory.context.ignoreUpdates = false;
+        }, 1500);
       }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
+      await this.platform.sendDeviceUpdate(this.accessory, params);
       if (this.accessory.context.isInched) {
-        this.service.updateCharacteristic(this.cusChar.InvertSwitch, value)
+        this.service.updateCharacteristic(this.cusChar.InvertSwitch, value);
       }
       switch (switchNumber) {
         case '0':
-          for (let i = 0; i <= this.accessory.context.channelCount; i++) {
-            const idToCheck = this.accessory.context.eweDeviceId + 'SW' + i
-            const uuid = this.hapUUIDGen(idToCheck)
+          for (let i = 0; i <= this.accessory.context.channelCount; i += 1) {
+            const idToCheck = `${this.accessory.context.eweDeviceId}SW${i}`;
+            const uuid = this.hapUUIDGen(idToCheck);
             if (this.devicesInHB.has(uuid)) {
-              const subAccessory = this.devicesInHB.get(uuid)
+              const subAccessory = this.devicesInHB.get(uuid);
               subAccessory
                 .getService(this.hapServ.Switch)
-                .updateCharacteristic(this.hapChar.On, value)
-              subAccessory.eveService.addEntry({ status: value ? 1 : 0 })
+                .updateCharacteristic(this.hapChar.On, value);
+              subAccessory.eveService.addEntry({ status: value ? 1 : 0 });
               if (i > 0 && this.enableLogging) {
                 this.log(
                   '[%s] %s [%s].',
                   subAccessory.displayName,
                   this.lang.curState,
-                  value ? 'on' : 'off'
-                )
+                  value ? 'on' : 'off',
+                );
               }
             }
           }
-          break
+          break;
         case '1':
         case '2':
         case '3':
         case '4':
-          for (let i = 1; i <= this.accessory.context.channelCount; i++) {
-            const idToCheck = this.accessory.context.eweDeviceId + 'SW' + i
-            const uuid = this.hapUUIDGen(idToCheck)
+          for (let i = 1; i <= this.accessory.context.channelCount; i += 1) {
+            const idToCheck = `${this.accessory.context.eweDeviceId}SW${i}`;
+            const uuid = this.hapUUIDGen(idToCheck);
             if (this.devicesInHB.has(uuid)) {
-              const subAccessory = this.devicesInHB.get(uuid)
-              if (i === parseInt(switchNumber)) {
+              const subAccessory = this.devicesInHB.get(uuid);
+              if (i === parseInt(switchNumber, 10)) {
                 if (value) {
-                  primaryState = true
+                  primaryState = true;
                 }
-                subAccessory.eveService.addEntry({ status: value ? 1 : 0 })
+                subAccessory.eveService.addEntry({ status: value ? 1 : 0 });
                 if (i > 0 && this.enableLogging) {
                   this.log(
                     '[%s] %s [%s].',
                     subAccessory.displayName,
                     this.lang.curState,
-                    value ? 'on' : 'off'
-                  )
-                }
-              } else {
-                if (
-                  subAccessory.getService(this.hapServ.Switch).getCharacteristic(this.hapChar.On)
-                    .value
-                ) {
-                  primaryState = true
+                    value ? 'on' : 'off',
+                  );
                 }
+              } else if (
+                subAccessory.getService(this.hapServ.Switch).getCharacteristic(this.hapChar.On)
+                  .value
+              ) {
+                primaryState = true;
               }
             }
           }
           if (!this.platform.hideMasters.includes(this.accessory.context.eweDeviceId)) {
-            const idToCheck = this.accessory.context.eweDeviceId + 'SW0'
-            const uuid = this.hapUUIDGen(idToCheck)
-            const priAccessory = this.devicesInHB.get(uuid)
+            const idToCheck = `${this.accessory.context.eweDeviceId}SW0`;
+            const uuid = this.hapUUIDGen(idToCheck);
+            const priAccessory = this.devicesInHB.get(uuid);
             priAccessory
               .getService(this.hapServ.Switch)
-              .updateCharacteristic(this.hapChar.On, primaryState)
-            priAccessory.eveService.addEntry({ status: primaryState ? 1 : 0 })
+              .updateCharacteristic(this.hapChar.On, primaryState);
+            priAccessory.eveService.addEntry({ status: primaryState ? 1 : 0 });
           }
-          break
+          break;
+        default:
+          return;
       }
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true);
       setTimeout(() => {
-        this.service.updateCharacteristic(this.hapChar.On, !value)
-      }, 2000)
-      throw new this.hapErr(-70402)
+        this.service.updateCharacteristic(this.hapChar.On, !value);
+      }, 2000);
+      throw new this.hapErr(-70402);
     }
   }
 
-  async internalUIUpdate () {
+  async internalUIUpdate() {
     try {
       // Skip polling if device isn't online
       if (!this.isOnline) {
-        return
+        return;
       }
 
       // Send the params to request the updates
-      await this.platform.sendDeviceUpdate(this.accessory, { uiActive: { outlet: 0, time: 120 } })
-      await this.funcs.sleep(2000)
-      await this.platform.sendDeviceUpdate(this.accessory, { uiActive: { outlet: 1, time: 120 } })
+      await this.platform.sendDeviceUpdate(this.accessory, { uiActive: { outlet: 0, time: 120 } });
+      await sleep(2000);
+      await this.platform.sendDeviceUpdate(this.accessory, { uiActive: { outlet: 1, time: 120 } });
     } catch (err) {
       // Suppress errors here
     }
   }
 
-  async externalUpdate (params) {
+  async externalUpdate(params) {
     try {
-      const idToCheck = this.accessory.context.eweDeviceId + 'SW'
-      let primaryState = false
-      for (let i = 1; i <= this.accessory.context.channelCount; i++) {
-        const uuid = this.hapUUIDGen(idToCheck + i)
+      const idToCheck = `${this.accessory.context.eweDeviceId}SW`;
+      let primaryState = false;
+      for (let i = 1; i <= this.accessory.context.channelCount; i += 1) {
+        const uuid = this.hapUUIDGen(idToCheck + i);
         if (this.devicesInHB.has(uuid)) {
-          const subAccessory = this.devicesInHB.get(uuid)
-          const service = subAccessory.getService(this.hapServ.Switch)
+          const subAccessory = this.devicesInHB.get(uuid);
+          const service = subAccessory.getService(this.hapServ.Switch);
           if (params.switches) {
-            const currentState = service.getCharacteristic(this.hapChar.On).value ? 'on' : 'off'
+            const currentState = service.getCharacteristic(this.hapChar.On).value ? 'on' : 'off';
             if (subAccessory.context.isInched) {
               if (params.switches[i - 1].switch === 'on' && !subAccessory.context.ignoreUpdates) {
-                subAccessory.context.ignoreUpdates = true
+                subAccessory.context.ignoreUpdates = true;
                 setTimeout(() => {
-                  subAccessory.context.ignoreUpdates = false
-                }, 1500)
-                const newState = currentState === 'on' ? 'off' : 'on'
+                  subAccessory.context.ignoreUpdates = false;
+                }, 1500);
+                const newState = currentState === 'on' ? 'off' : 'on';
                 if (newState === 'on') {
-                  primaryState = true
+                  primaryState = true;
                 }
-                service.updateCharacteristic(this.hapChar.On, newState === 'on')
-                service.updateCharacteristic(this.cusChar.InvertSwitch, newState === 'on')
+                service.updateCharacteristic(this.hapChar.On, newState === 'on');
+                service.updateCharacteristic(this.cusChar.InvertSwitch, newState === 'on');
                 subAccessory.eveService.addEntry({
-                  status: newState === 'on' ? 1 : 0
-                })
+                  status: newState === 'on' ? 1 : 0,
+                });
                 if (params.updateSource && this.enableLogging) {
-                  this.log('[%s] %s [%s].', subAccessory.displayName, this.lang.curState, newState)
+                  this.log('[%s] %s [%s].', subAccessory.displayName, this.lang.curState, newState);
                 }
               }
             } else {
               if (params.switches[i - 1].switch === 'on') {
-                primaryState = true
+                primaryState = true;
               }
               if (!params.updateSource || params.switches[i - 1].switch !== currentState) {
                 service.updateCharacteristic(
                   this.hapChar.On,
-                  params.switches[i - 1].switch === 'on'
-                )
+                  params.switches[i - 1].switch === 'on',
+                );
                 subAccessory.eveService.addEntry({
-                  status: params.switches[i - 1].switch === 'on' ? 1 : 0
-                })
+                  status: params.switches[i - 1].switch === 'on' ? 1 : 0,
+                });
                 if (params.updateSource && this.enableLogging) {
                   this.log(
                     '[%s] %s [%s].',
                     subAccessory.displayName,
                     this.lang.curState,
-                    params.switches[i - 1].switch
-                  )
+                    params.switches[i - 1].switch,
+                  );
                 }
               }
             }
           }
-          if (!this.powerReadings) {
-            continue
-          }
-          let logger = false
-          let power
-          let voltage
-          let current
-          if (this.funcs.hasProperty(params, 'actPow_0' + (i - 1))) {
-            power = parseInt(params['actPow_0' + (i - 1)]) / 100
-            const currentState = service.getCharacteristic(this.hapChar.On).value ? 'on' : 'off'
-            service.updateCharacteristic(this.eveChar.CurrentConsumption, power)
-            service.updateCharacteristic(
-              this.hapChar.OutletInUse,
-              currentState === 'on' && power > this.inUsePowerThreshold
-            )
-            logger = true
-          }
-          if (this.funcs.hasProperty(params, 'voltage_0' + (i - 1))) {
-            voltage = parseInt(params['voltage_0' + (i - 1)]) / 100
-            service.updateCharacteristic(this.eveChar.Voltage, voltage)
-            logger = true
-          }
-          if (this.funcs.hasProperty(params, 'current_0' + (i - 1))) {
-            current = parseInt(params['current_0' + (i - 1)]) / 100
-            service.updateCharacteristic(this.eveChar.ElectricCurrent, current)
-            logger = true
-          }
-          if (params.updateSource && logger && this.enableLogging) {
-            this.log(
-              '[%s] %s%s%s.',
-              subAccessory.displayName,
-              power !== undefined ? this.lang.curPower + ' [' + power + 'W]' : '',
-              voltage !== undefined ? ' ' + this.lang.curVolt + ' [' + voltage + 'V]' : '',
-              current !== undefined ? ' ' + this.lang.curCurr + ' [' + current + 'A]' : ''
-            )
+          if (this.powerReadings) {
+            let logger = false;
+            let power;
+            let voltage;
+            let current;
+            if (hasProperty(params, `actPow_0${i - 1}`)) {
+              power = parseInt(params[`actPow_0${i - 1}`], 10) / 100;
+              const currentState = service.getCharacteristic(this.hapChar.On).value ? 'on' : 'off';
+              service.updateCharacteristic(this.eveChar.CurrentConsumption, power);
+              service.updateCharacteristic(
+                this.hapChar.OutletInUse,
+                currentState === 'on' && power > this.inUsePowerThreshold,
+              );
+              logger = true;
+            }
+            if (hasProperty(params, `voltage_0${i - 1}`)) {
+              voltage = parseInt(params[`voltage_0${i - 1}`], 10) / 100;
+              service.updateCharacteristic(this.eveChar.Voltage, voltage);
+              logger = true;
+            }
+            if (hasProperty(params, `current_0${i - 1}`)) {
+              current = parseInt(params[`current_0${i - 1}`], 10) / 100;
+              service.updateCharacteristic(this.eveChar.ElectricCurrent, current);
+              logger = true;
+            }
+            if (params.updateSource && logger && this.enableLogging) {
+              this.log(
+                '[%s] %s%s%s.',
+                subAccessory.displayName,
+                power !== undefined ? `${this.lang.curPower} [${power}W]` : '',
+                voltage !== undefined ? ` ${this.lang.curVolt} [${voltage}V]` : '',
+                current !== undefined ? ` ${this.lang.curCurr} [${current}A]` : '',
+              );
+            }
           }
         }
       }
       if (
-        !this.platform.hideMasters.includes(this.accessory.context.eweDeviceId) &&
-        params.switches
+        !this.platform.hideMasters.includes(this.accessory.context.eweDeviceId)
+        && params.switches
       ) {
-        this.service.updateCharacteristic(this.hapChar.On, primaryState)
-        this.accessory.eveService.addEntry({ status: primaryState ? 1 : 0 })
+        this.service.updateCharacteristic(this.hapChar.On, primaryState);
+        this.accessory.eveService.addEntry({ status: primaryState ? 1 : 0 });
       }
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, false)
+      this.platform.deviceUpdateError(this.accessory, err, false);
     }
   }
 
-  markStatus (isOnline) {
-    this.isOnline = isOnline
+  markStatus(isOnline) {
+    this.isOnline = isOnline;
   }
 
-  currentState () {
-    const toReturn = {}
-    toReturn.services = ['switch']
+  currentState() {
+    const toReturn = {};
+    toReturn.services = ['switch'];
     toReturn.switch = {
-      state: this.service.getCharacteristic(this.hapChar.On).value ? 'on' : 'off'
-    }
-    return toReturn
+      state: this.service.getCharacteristic(this.hapChar.On).value ? 'on' : 'off',
+    };
+    return toReturn;
   }
 }
diff --git a/lib/device/switch-single-inched.js b/lib/device/switch-single-inched.js
index e082b041..670913bd 100644
--- a/lib/device/switch-single-inched.js
+++ b/lib/device/switch-single-inched.js
@@ -1,26 +1,24 @@
-/* jshint node: true, esversion: 10, -W014, -W033 */
-/* eslint-disable new-cap */
-'use strict'
+import platformConsts from '../utils/constants.js';
+import { hasProperty } from '../utils/functions.js';
 
-module.exports = class deviceSwitchSingleInched {
-  constructor (platform, accessory) {
+export default class {
+  constructor(platform, accessory) {
     // Set up variables from the platform
-    this.cusChar = platform.cusChar
-    this.eveChar = platform.eveChar
-    this.funcs = platform.funcs
-    this.hapChar = platform.api.hap.Characteristic
-    this.hapErr = platform.api.hap.HapStatusError
-    this.hapServ = platform.api.hap.Service
-    this.lang = platform.lang
-    this.log = platform.log
-    this.platform = platform
+    this.cusChar = platform.cusChar;
+    this.eveChar = platform.eveChar;
+    this.hapChar = platform.api.hap.Characteristic;
+    this.hapErr = platform.api.hap.HapStatusError;
+    this.hapServ = platform.api.hap.Service;
+    this.lang = platform.lang;
+    this.log = platform.log;
+    this.platform = platform;
 
     // Set up variables from the accessory
-    this.name = accessory.displayName
-    this.accessory = accessory
+    this.name = accessory.displayName;
+    this.accessory = accessory;
 
     // Initially set the online flag as true (to be then updated as false if necessary)
-    this.isOnline = true
+    this.isOnline = true;
 
     /*
     UIID 1/6/14/24/27/112/1009/1256/7004: single switch, no power readings
@@ -31,290 +29,287 @@ module.exports = class deviceSwitchSingleInched {
     */
 
     // Set up custom variables for this device type
-    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
-    this.inUsePowerThreshold =
-      deviceConf && deviceConf.inUsePowerThreshold
-        ? deviceConf.inUsePowerThreshold
-        : platform.consts.defaultValues.inUsePowerThreshold
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId] || {};
+    this.inUsePowerThreshold = deviceConf.inUsePowerThreshold || platformConsts.defaultValues.inUsePowerThreshold;
 
     // Set the correct logging variables for this accessory
-    this.enableLogging = !platform.config.disableDeviceLogging
-    this.enableDebugLogging = platform.config.debug
-    if (deviceConf && deviceConf.overrideLogging) {
-      switch (deviceConf.overrideLogging) {
-        case 'standard':
-          this.enableLogging = true
-          this.enableDebugLogging = false
-          break
-        case 'debug':
-          this.enableLogging = true
-          this.enableDebugLogging = true
-          break
-        case 'disable':
-          this.enableLogging = false
-          this.enableDebugLogging = false
-          break
-      }
+    switch (deviceConf.overrideLogging) {
+      case 'standard':
+        this.enableLogging = true;
+        this.enableDebugLogging = false;
+        break;
+      case 'debug':
+        this.enableLogging = true;
+        this.enableDebugLogging = true;
+        break;
+      case 'disable':
+        this.enableLogging = false;
+        this.enableDebugLogging = false;
+        break;
+      default:
+        this.enableLogging = !platform.config.disableDeviceLogging;
+        this.enableDebugLogging = platform.config.debug;
+        break;
     }
 
     // If the accessory has a outlet service then remove it
     if (this.accessory.getService(this.hapServ.Outlet)) {
-      this.accessory.removeService(this.accessory.getService(this.hapServ.Outlet))
+      this.accessory.removeService(this.accessory.getService(this.hapServ.Outlet));
     }
 
     // Add the switch service if it doesn't already exist
-    this.service =
-      this.accessory.getService(this.hapServ.Switch) ||
-      this.accessory.addService(this.hapServ.Switch)
+    this.service = this.accessory.getService(this.hapServ.Switch)
+      || this.accessory.addService(this.hapServ.Switch);
 
     switch (this.accessory.context.eweUIID) {
       case 5:
       case 182:
         // Add Eve power characteristics
-        this.powerReadings = true
+        this.powerReadings = true;
         if (!this.service.testCharacteristic(this.hapChar.OutletInUse)) {
-          this.service.addCharacteristic(this.hapChar.OutletInUse)
+          this.service.addCharacteristic(this.hapChar.OutletInUse);
         }
         if (!this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
-          this.service.addCharacteristic(this.eveChar.CurrentConsumption)
+          this.service.addCharacteristic(this.eveChar.CurrentConsumption);
         }
 
         // Remove unused Eve characteristics
         if (this.service.testCharacteristic(this.eveChar.ElectricCurrent)) {
           this.service.removeCharacteristic(
-            this.service.getCharacteristic(this.eveChar.ElectricCurrent)
-          )
+            this.service.getCharacteristic(this.eveChar.ElectricCurrent),
+          );
         }
         if (this.service.testCharacteristic(this.eveChar.Voltage)) {
-          this.service.removeCharacteristic(this.service.getCharacteristic(this.eveChar.Voltage))
+          this.service.removeCharacteristic(this.service.getCharacteristic(this.eveChar.Voltage));
         }
-        break
+        break;
       case 32:
         // Add Eve power characteristics
-        this.powerReadings = true
+        this.powerReadings = true;
         if (!this.service.testCharacteristic(this.hapChar.OutletInUse)) {
-          this.service.addCharacteristic(this.hapChar.OutletInUse)
+          this.service.addCharacteristic(this.hapChar.OutletInUse);
         }
         if (!this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
-          this.service.addCharacteristic(this.eveChar.CurrentConsumption)
+          this.service.addCharacteristic(this.eveChar.CurrentConsumption);
         }
         if (!this.service.testCharacteristic(this.eveChar.ElectricCurrent)) {
-          this.service.addCharacteristic(this.eveChar.ElectricCurrent)
+          this.service.addCharacteristic(this.eveChar.ElectricCurrent);
         }
         if (!this.service.testCharacteristic(this.eveChar.Voltage)) {
-          this.service.addCharacteristic(this.eveChar.Voltage)
+          this.service.addCharacteristic(this.eveChar.Voltage);
         }
-        break
+        break;
       default:
         // Remove unused Eve characteristics
         if (this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
           this.service.removeCharacteristic(
-            this.service.getCharacteristic(this.eveChar.CurrentConsumption)
-          )
+            this.service.getCharacteristic(this.eveChar.CurrentConsumption),
+          );
         }
         if (this.service.testCharacteristic(this.eveChar.ElectricCurrent)) {
           this.service.removeCharacteristic(
-            this.service.getCharacteristic(this.eveChar.ElectricCurrent)
-          )
+            this.service.getCharacteristic(this.eveChar.ElectricCurrent),
+          );
         }
         if (this.service.testCharacteristic(this.eveChar.Voltage)) {
-          this.service.removeCharacteristic(this.service.getCharacteristic(this.eveChar.Voltage))
+          this.service.removeCharacteristic(this.service.getCharacteristic(this.eveChar.Voltage));
         }
-        break
+        break;
     }
 
     // Set a flag for devices with hardware that use multi-channel format
     if (
-      platform.consts.devices.switchSCM.includes(this.accessory.context.eweUIID) ||
-      platform.consts.devices.switchSCMPower.includes(this.accessory.context.eweUIID)
+      platformConsts.devices.switchSCM.includes(this.accessory.context.eweUIID)
+      || platformConsts.devices.switchSCMPower.includes(this.accessory.context.eweUIID)
     ) {
-      this.isSCM = true
+      this.isSCM = true;
     }
 
     // Add the set handler to the switch on/off characteristic
     this.service
       .getCharacteristic(this.hapChar.On)
-      .onSet(async value => await this.internalStateUpdate(value))
-    this.cacheState = this.service.getCharacteristic(this.hapChar.On).value ? 'on' : 'off'
+      .onSet(async (value) => this.internalStateUpdate(value));
+    this.cacheState = this.service.getCharacteristic(this.hapChar.On).value ? 'on' : 'off';
 
     // Add a custom characteristic for inverting the switch
     if (!this.service.testCharacteristic(this.cusChar.InvertSwitch)) {
-      this.service.addCharacteristic(this.cusChar.InvertSwitch)
+      this.service.addCharacteristic(this.cusChar.InvertSwitch);
     }
-    this.service.updateCharacteristic(this.cusChar.InvertSwitch, this.cacheState === 'on')
+    this.service.updateCharacteristic(this.cusChar.InvertSwitch, this.cacheState === 'on');
 
     // Add the set handler to invert the switch
-    this.service.getCharacteristic(this.cusChar.InvertSwitch).onSet(value => {
-      this.service.updateCharacteristic(this.hapChar.On, value)
-      this.cacheState = value ? 'on' : 'off'
-      this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
-    })
+    this.service.getCharacteristic(this.cusChar.InvertSwitch).onSet((value) => {
+      this.service.updateCharacteristic(this.hapChar.On, value);
+      this.cacheState = value ? 'on' : 'off';
+      this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState);
+    });
 
     // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
     if (!platform.config.disableNoResponse) {
       this.service.getCharacteristic(this.hapChar.On).onGet(() => {
         if (!this.isOnline) {
-          throw new this.hapErr(-70402)
+          throw new this.hapErr(-70402);
         }
-        return this.service.getCharacteristic(this.hapChar.On).value
-      })
+        return this.service.getCharacteristic(this.hapChar.On).value;
+      });
     }
 
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new platform.eveService('switch', this.accessory, {
-      log: platform.config.debugFakegato ? this.log : () => {}
-    })
+      log: platform.config.debugFakegato ? this.log : () => {},
+    });
 
     // Set up extra features for outlets that provide power readings
     if (this.powerReadings) {
       // Set up an interval to get eWeLink to send power updates
       setTimeout(() => {
-        this.internalUIUpdate()
-        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
-      }, 5000)
+        this.internalUIUpdate();
+        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000);
+      }, 5000);
 
       // Stop the intervals on Homebridge shutdown
-      platform.api.on('shutdown', () => clearInterval(this.intervalPoll))
+      platform.api.on('shutdown', () => clearInterval(this.intervalPoll));
     }
 
     // Output the customised options to the log
+    const normalLogging = this.enableLogging ? 'standard' : 'disable';
     const opts = JSON.stringify({
       inUsePowerThreshold: this.inUsePowerThreshold,
       isInched: true,
-      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
-      showAs: 'default'
-    })
-    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
+      logging: this.enableDebugLogging ? 'debug' : normalLogging,
+      showAs: 'default',
+    });
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts);
   }
 
-  async internalStateUpdate (value) {
+  async internalStateUpdate(value) {
     try {
-      const newValue = this.cacheState === 'on' ? 'off' : 'on'
-      const params = {}
+      const newValue = this.cacheState === 'on' ? 'off' : 'on';
+      const params = {};
       if (this.isSCM) {
-        params.switches = [{ switch: 'on', outlet: 0 }]
+        params.switches = [{ switch: 'on', outlet: 0 }];
       } else {
-        params.switch = 'on'
+        params.switch = 'on';
       }
-      this.ignoreUpdates = true
+      this.ignoreUpdates = true;
       setTimeout(() => {
-        this.ignoreUpdates = false
-      }, 1500)
-      await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.cacheState = newValue
-      this.service.updateCharacteristic(this.cusChar.InvertSwitch, value)
-      this.accessory.eveService.addEntry({ status: this.cacheState === 'on' ? 1 : 0 })
+        this.ignoreUpdates = false;
+      }, 1500);
+      await this.platform.sendDeviceUpdate(this.accessory, params);
+      this.cacheState = newValue;
+      this.service.updateCharacteristic(this.cusChar.InvertSwitch, value);
+      this.accessory.eveService.addEntry({ status: this.cacheState === 'on' ? 1 : 0 });
       if (this.enableLogging) {
-        this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
+        this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState);
       }
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true);
       setTimeout(() => {
-        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
-      }, 2000)
-      throw new this.hapErr(-70402)
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on');
+      }, 2000);
+      throw new this.hapErr(-70402);
     }
   }
 
-  async internalUIUpdate () {
+  async internalUIUpdate() {
     try {
       // Skip polling if device isn't online
       if (!this.isOnline) {
-        return
+        return;
       }
 
       // Send the params to request the updates
-      await this.platform.sendDeviceUpdate(this.accessory, { uiActive: 120 })
+      await this.platform.sendDeviceUpdate(this.accessory, { uiActive: 120 });
     } catch (err) {
       // Suppress errors here
     }
   }
 
-  async externalUpdate (params) {
+  async externalUpdate(params) {
     try {
       if (!this.isSCM && params.switch === 'on') {
         if (!this.ignoreUpdates) {
-          this.ignoreUpdates = true
+          this.ignoreUpdates = true;
           setTimeout(() => {
-            this.ignoreUpdates = false
-          }, 1500)
-          this.cacheState = this.cacheState === 'on' ? 'off' : 'on'
-          this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
-          this.service.updateCharacteristic(this.cusChar.InvertSwitch, this.cacheState === 'on')
-          this.accessory.eveService.addEntry({ status: this.cacheState === 'on' ? 1 : 0 })
+            this.ignoreUpdates = false;
+          }, 1500);
+          this.cacheState = this.cacheState === 'on' ? 'off' : 'on';
+          this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on');
+          this.service.updateCharacteristic(this.cusChar.InvertSwitch, this.cacheState === 'on');
+          this.accessory.eveService.addEntry({ status: this.cacheState === 'on' ? 1 : 0 });
           if (params.updateSource && this.enableLogging) {
-            this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
+            this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState);
           }
         }
       }
       if (this.isSCM && params.switches && params.switches[0].switch === 'on') {
         if (!this.ignoreUpdates) {
-          this.ignoreUpdates = true
+          this.ignoreUpdates = true;
           setTimeout(() => {
-            this.ignoreUpdates = false
-          }, 1500)
-          this.cacheState = this.cacheState === 'on' ? 'off' : 'on'
-          this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
-          this.service.updateCharacteristic(this.cusChar.InvertSwitch, this.cacheState === 'on')
-          this.accessory.eveService.addEntry({ status: this.cacheState === 'on' ? 1 : 0 })
+            this.ignoreUpdates = false;
+          }, 1500);
+          this.cacheState = this.cacheState === 'on' ? 'off' : 'on';
+          this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on');
+          this.service.updateCharacteristic(this.cusChar.InvertSwitch, this.cacheState === 'on');
+          this.accessory.eveService.addEntry({ status: this.cacheState === 'on' ? 1 : 0 });
           if (params.updateSource && this.enableLogging) {
-            this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
+            this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState);
           }
         }
       }
       if (!this.powerReadings) {
-        return
+        return;
       }
-      let logger = false
-      if (this.funcs.hasProperty(params, 'power')) {
-        this.service.updateCharacteristic(this.eveChar.CurrentConsumption, parseFloat(params.power))
+      let logger = false;
+      if (hasProperty(params, 'power')) {
+        this.service.updateCharacteristic(this.eveChar.CurrentConsumption, parseFloat(params.power));
         this.service.updateCharacteristic(
           this.hapChar.OutletInUse,
-          this.cacheState === 'on' && parseFloat(params.power) > this.inUsePowerThreshold
-        )
-        logger = true
+          this.cacheState === 'on' && parseFloat(params.power) > this.inUsePowerThreshold,
+        );
+        logger = true;
       }
-      if (this.funcs.hasProperty(params, 'voltage')) {
-        this.service.updateCharacteristic(this.eveChar.Voltage, parseFloat(params.voltage))
-        logger = true
+      if (hasProperty(params, 'voltage')) {
+        this.service.updateCharacteristic(this.eveChar.Voltage, parseFloat(params.voltage));
+        logger = true;
       }
-      if (this.funcs.hasProperty(params, 'current')) {
-        this.service.updateCharacteristic(this.eveChar.ElectricCurrent, parseFloat(params.current))
-        logger = true
+      if (hasProperty(params, 'current')) {
+        this.service.updateCharacteristic(this.eveChar.ElectricCurrent, parseFloat(params.current));
+        logger = true;
       }
       if (params.updateSource && logger && this.enableLogging) {
         this.log(
           '[%s] %s%s%s.',
           this.name,
-          this.funcs.hasProperty(params, 'power')
-            ? this.lang.curPower + ' [' + params.power + 'W]'
+          hasProperty(params, 'power')
+            ? `${this.lang.curPower} [${params.power}W]`
+            : '',
+          hasProperty(params, 'voltage')
+            ? ` ${this.lang.curVolt} [${params.voltage}V]`
             : '',
-          this.funcs.hasProperty(params, 'voltage')
-            ? ' ' + this.lang.curVolt + ' [' + params.voltage + 'V]'
+          hasProperty(params, 'current')
+            ? ` ${this.lang.curCurr} [${params.current}A]`
             : '',
-          this.funcs.hasProperty(params, 'current')
-            ? ' ' + this.lang.curCurr + ' [' + params.current + 'A]'
-            : ''
-        )
+        );
       }
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, false)
+      this.platform.deviceUpdateError(this.accessory, err, false);
     }
   }
 
-  markStatus (isOnline) {
-    this.isOnline = isOnline
+  markStatus(isOnline) {
+    this.isOnline = isOnline;
   }
 
-  async currentState () {
-    const toReturn = {}
-    toReturn.services = ['switch']
+  async currentState() {
+    const toReturn = {};
+    toReturn.services = ['switch'];
     toReturn.switch = {
-      state: this.service.getCharacteristic(this.hapChar.On).value ? 'on' : 'off'
-    }
+      state: this.service.getCharacteristic(this.hapChar.On).value ? 'on' : 'off',
+    };
     if (this.powerReadings) {
       try {
-        toReturn.services.push('power')
+        toReturn.services.push('power');
         toReturn.power = {
           state: await this.platform.sendDeviceUpdate(this.accessory, { hundredDaysKwh: 'get' }),
           voltage: this.service.testCharacteristic(this.eveChar.Voltage)
@@ -325,12 +320,12 @@ module.exports = class deviceSwitchSingleInched {
             : undefined,
           current: this.service.testCharacteristic(this.eveChar.ElectricCurrent)
             ? this.service.getCharacteristic(this.eveChar.ElectricCurrent).value
-            : undefined
-        }
+            : undefined,
+        };
       } catch (err) {
         // Suppress errors here
       }
     }
-    return toReturn
+    return toReturn;
   }
 }
diff --git a/lib/device/switch-single.js b/lib/device/switch-single.js
index 7c51a99e..85036cf6 100644
--- a/lib/device/switch-single.js
+++ b/lib/device/switch-single.js
@@ -1,25 +1,23 @@
-/* jshint node: true, esversion: 10, -W014, -W033 */
-/* eslint-disable new-cap */
-'use strict'
+import platformConsts from '../utils/constants.js';
+import { hasProperty } from '../utils/functions.js';
 
-module.exports = class deviceSwitchSingle {
-  constructor (platform, accessory) {
+export default class {
+  constructor(platform, accessory) {
     // Set up variables from the platform
-    this.eveChar = platform.eveChar
-    this.funcs = platform.funcs
-    this.hapChar = platform.api.hap.Characteristic
-    this.hapErr = platform.api.hap.HapStatusError
-    this.hapServ = platform.api.hap.Service
-    this.lang = platform.lang
-    this.log = platform.log
-    this.platform = platform
+    this.eveChar = platform.eveChar;
+    this.hapChar = platform.api.hap.Characteristic;
+    this.hapErr = platform.api.hap.HapStatusError;
+    this.hapServ = platform.api.hap.Service;
+    this.lang = platform.lang;
+    this.log = platform.log;
+    this.platform = platform;
 
     // Set up variables from the accessory
-    this.name = accessory.displayName
-    this.accessory = accessory
+    this.name = accessory.displayName;
+    this.accessory = accessory;
 
     // Initially set the online flag as true (to be then updated as false if necessary)
-    this.isOnline = true
+    this.isOnline = true;
 
     /*
     UIID 1/6/14/24/27/112/1009/1256/7004: single switch, no power readings
@@ -30,259 +28,256 @@ module.exports = class deviceSwitchSingle {
     */
 
     // Set up custom variables for this device type
-    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
-    this.inUsePowerThreshold =
-      deviceConf && deviceConf.inUsePowerThreshold
-        ? deviceConf.inUsePowerThreshold
-        : platform.consts.defaultValues.inUsePowerThreshold
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId] || {};
+    this.inUsePowerThreshold = deviceConf.inUsePowerThreshold || platformConsts.defaultValues.inUsePowerThreshold;
 
     // Set the correct logging variables for this accessory
-    this.enableLogging = !platform.config.disableDeviceLogging
-    this.enableDebugLogging = platform.config.debug
-    if (deviceConf && deviceConf.overrideLogging) {
-      switch (deviceConf.overrideLogging) {
-        case 'standard':
-          this.enableLogging = true
-          this.enableDebugLogging = false
-          break
-        case 'debug':
-          this.enableLogging = true
-          this.enableDebugLogging = true
-          break
-        case 'disable':
-          this.enableLogging = false
-          this.enableDebugLogging = false
-          break
-      }
+    switch (deviceConf.overrideLogging) {
+      case 'standard':
+        this.enableLogging = true;
+        this.enableDebugLogging = false;
+        break;
+      case 'debug':
+        this.enableLogging = true;
+        this.enableDebugLogging = true;
+        break;
+      case 'disable':
+        this.enableLogging = false;
+        this.enableDebugLogging = false;
+        break;
+      default:
+        this.enableLogging = !platform.config.disableDeviceLogging;
+        this.enableDebugLogging = platform.config.debug;
+        break;
     }
 
     // If the accessory has a outlet service then remove it
     if (this.accessory.getService(this.hapServ.Outlet)) {
-      this.accessory.removeService(this.accessory.getService(this.hapServ.Outlet))
+      this.accessory.removeService(this.accessory.getService(this.hapServ.Outlet));
     }
 
     // Add the switch service if it doesn't already exist
-    this.service =
-      this.accessory.getService(this.hapServ.Switch) ||
-      this.accessory.addService(this.hapServ.Switch)
+    this.service = this.accessory.getService(this.hapServ.Switch)
+      || this.accessory.addService(this.hapServ.Switch);
 
     switch (this.accessory.context.eweUIID) {
       case 5:
       case 182:
         // Add Eve power characteristics
-        this.powerReadings = true
+        this.powerReadings = true;
         if (!this.service.testCharacteristic(this.hapChar.OutletInUse)) {
-          this.service.addCharacteristic(this.hapChar.OutletInUse)
+          this.service.addCharacteristic(this.hapChar.OutletInUse);
         }
         if (!this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
-          this.service.addCharacteristic(this.eveChar.CurrentConsumption)
+          this.service.addCharacteristic(this.eveChar.CurrentConsumption);
         }
 
         // Remove unused Eve characteristics
         if (this.service.testCharacteristic(this.eveChar.ElectricCurrent)) {
           this.service.removeCharacteristic(
-            this.service.getCharacteristic(this.eveChar.ElectricCurrent)
-          )
+            this.service.getCharacteristic(this.eveChar.ElectricCurrent),
+          );
         }
         if (this.service.testCharacteristic(this.eveChar.Voltage)) {
-          this.service.removeCharacteristic(this.service.getCharacteristic(this.eveChar.Voltage))
+          this.service.removeCharacteristic(this.service.getCharacteristic(this.eveChar.Voltage));
         }
-        break
+        break;
       case 32:
         // Add Eve power characteristics
-        this.powerReadings = true
+        this.powerReadings = true;
         if (!this.service.testCharacteristic(this.hapChar.OutletInUse)) {
-          this.service.addCharacteristic(this.hapChar.OutletInUse)
+          this.service.addCharacteristic(this.hapChar.OutletInUse);
         }
         if (!this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
-          this.service.addCharacteristic(this.eveChar.CurrentConsumption)
+          this.service.addCharacteristic(this.eveChar.CurrentConsumption);
         }
         if (!this.service.testCharacteristic(this.eveChar.ElectricCurrent)) {
-          this.service.addCharacteristic(this.eveChar.ElectricCurrent)
+          this.service.addCharacteristic(this.eveChar.ElectricCurrent);
         }
         if (!this.service.testCharacteristic(this.eveChar.Voltage)) {
-          this.service.addCharacteristic(this.eveChar.Voltage)
+          this.service.addCharacteristic(this.eveChar.Voltage);
         }
-        break
+        break;
       default:
         // Remove unused Eve characteristics
         if (this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
           this.service.removeCharacteristic(
-            this.service.getCharacteristic(this.eveChar.CurrentConsumption)
-          )
+            this.service.getCharacteristic(this.eveChar.CurrentConsumption),
+          );
         }
         if (this.service.testCharacteristic(this.eveChar.ElectricCurrent)) {
           this.service.removeCharacteristic(
-            this.service.getCharacteristic(this.eveChar.ElectricCurrent)
-          )
+            this.service.getCharacteristic(this.eveChar.ElectricCurrent),
+          );
         }
         if (this.service.testCharacteristic(this.eveChar.Voltage)) {
-          this.service.removeCharacteristic(this.service.getCharacteristic(this.eveChar.Voltage))
+          this.service.removeCharacteristic(this.service.getCharacteristic(this.eveChar.Voltage));
         }
-        break
+        break;
     }
 
     // Set a flag for devices with hardware that use multi-channel format
     if (
-      platform.consts.devices.switchSCM.includes(this.accessory.context.eweUIID) ||
-      platform.consts.devices.switchSCMPower.includes(this.accessory.context.eweUIID)
+      platformConsts.devices.switchSCM.includes(this.accessory.context.eweUIID)
+      || platformConsts.devices.switchSCMPower.includes(this.accessory.context.eweUIID)
     ) {
-      this.isSCM = true
+      this.isSCM = true;
     }
 
     // Add the set handler to the switch on/off characteristic
     this.service
       .getCharacteristic(this.hapChar.On)
-      .onSet(async value => await this.internalStateUpdate(value))
+      .onSet(async (value) => this.internalStateUpdate(value));
 
     // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
     if (!platform.config.disableNoResponse) {
       this.service.getCharacteristic(this.hapChar.On).onGet(() => {
         if (!this.isOnline) {
-          throw new this.hapErr(-70402)
+          throw new this.hapErr(-70402);
         }
-        return this.service.getCharacteristic(this.hapChar.On).value
-      })
+        return this.service.getCharacteristic(this.hapChar.On).value;
+      });
     }
 
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new platform.eveService('switch', this.accessory, {
-      log: platform.config.debugFakegato ? this.log : () => {}
-    })
+      log: platform.config.debugFakegato ? this.log : () => {},
+    });
 
     // Set up extra features for outlets that provide power readings
     if (this.powerReadings) {
       // Set up an interval to get eWeLink to send power updates
       setTimeout(() => {
-        this.internalUIUpdate()
-        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000)
-      }, 5000)
+        this.internalUIUpdate();
+        this.intervalPoll = setInterval(() => this.internalUIUpdate(), 120000);
+      }, 5000);
 
       // Stop the intervals on Homebridge shutdown
-      platform.api.on('shutdown', () => clearInterval(this.intervalPoll))
+      platform.api.on('shutdown', () => clearInterval(this.intervalPoll));
     }
 
     // Output the customised options to the log
+    const normalLogging = this.enableLogging ? 'standard' : 'disable';
     const opts = JSON.stringify({
       inUsePowerThreshold: this.inUsePowerThreshold,
-      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
-      showAs: 'default'
-    })
-    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
+      logging: this.enableDebugLogging ? 'debug' : normalLogging,
+      showAs: 'default',
+    });
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts);
   }
 
-  async internalStateUpdate (value) {
+  async internalStateUpdate(value) {
     try {
-      const newValue = value ? 'on' : 'off'
+      const newValue = value ? 'on' : 'off';
       if (newValue === this.cacheState) {
-        return
+        return;
       }
-      const params = {}
+      const params = {};
       if (this.isSCM) {
-        params.switches = [{ switch: newValue, outlet: 0 }]
+        params.switches = [{ switch: newValue, outlet: 0 }];
       } else {
-        params.switch = newValue
+        params.switch = newValue;
       }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.cacheState = newValue
-      this.accessory.eveService.addEntry({ status: value ? 1 : 0 })
+      await this.platform.sendDeviceUpdate(this.accessory, params);
+      this.cacheState = newValue;
+      this.accessory.eveService.addEntry({ status: value ? 1 : 0 });
       if (this.enableLogging) {
-        this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
+        this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState);
       }
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true);
       setTimeout(() => {
-        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
-      }, 2000)
-      throw new this.hapErr(-70402)
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on');
+      }, 2000);
+      throw new this.hapErr(-70402);
     }
   }
 
-  async internalUIUpdate () {
+  async internalUIUpdate() {
     try {
       // Skip polling if device isn't online
       if (!this.isOnline) {
-        return
+        return;
       }
 
       // Send the params to request the updates
-      await this.platform.sendDeviceUpdate(this.accessory, { uiActive: 120 })
+      await this.platform.sendDeviceUpdate(this.accessory, { uiActive: 120 });
     } catch (err) {
       // Suppress errors here
     }
   }
 
-  async externalUpdate (params) {
+  async externalUpdate(params) {
     try {
       if (!this.isSCM && params.switch && params.switch !== this.cacheState) {
-        this.cacheState = params.switch
-        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
-        this.accessory.eveService.addEntry({ status: this.cacheState === 'on' ? 1 : 0 })
+        this.cacheState = params.switch;
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on');
+        this.accessory.eveService.addEntry({ status: this.cacheState === 'on' ? 1 : 0 });
         if (params.updateSource && this.enableLogging) {
-          this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
+          this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState);
         }
       }
       if (this.isSCM && params.switches && params.switches[0].switch !== this.cacheState) {
-        this.cacheState = params.switches[0].switch
-        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
-        this.accessory.eveService.addEntry({ status: this.cacheState === 'on' ? 1 : 0 })
+        this.cacheState = params.switches[0].switch;
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on');
+        this.accessory.eveService.addEntry({ status: this.cacheState === 'on' ? 1 : 0 });
         if (params.updateSource && this.enableLogging) {
-          this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
+          this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState);
         }
       }
       if (!this.powerReadings) {
-        return
+        return;
       }
-      let logger = false
-      if (this.funcs.hasProperty(params, 'power')) {
-        this.service.updateCharacteristic(this.eveChar.CurrentConsumption, parseFloat(params.power))
+      let logger = false;
+      if (hasProperty(params, 'power')) {
+        this.service.updateCharacteristic(this.eveChar.CurrentConsumption, parseFloat(params.power));
         this.service.updateCharacteristic(
           this.hapChar.OutletInUse,
-          this.cacheState === 'on' && parseFloat(params.power) > this.inUsePowerThreshold
-        )
-        logger = true
+          this.cacheState === 'on' && parseFloat(params.power) > this.inUsePowerThreshold,
+        );
+        logger = true;
       }
-      if (this.funcs.hasProperty(params, 'voltage')) {
-        this.service.updateCharacteristic(this.eveChar.Voltage, parseFloat(params.voltage))
-        logger = true
+      if (hasProperty(params, 'voltage')) {
+        this.service.updateCharacteristic(this.eveChar.Voltage, parseFloat(params.voltage));
+        logger = true;
       }
-      if (this.funcs.hasProperty(params, 'current')) {
-        this.service.updateCharacteristic(this.eveChar.ElectricCurrent, parseFloat(params.current))
-        logger = true
+      if (hasProperty(params, 'current')) {
+        this.service.updateCharacteristic(this.eveChar.ElectricCurrent, parseFloat(params.current));
+        logger = true;
       }
       if (params.updateSource && logger && this.enableLogging) {
         this.log(
           '[%s] %s%s%s.',
           this.name,
-          this.funcs.hasProperty(params, 'power')
-            ? this.lang.curPower + ' [' + params.power + 'W]'
+          hasProperty(params, 'power')
+            ? `${this.lang.curPower} [${params.power}W]`
+            : '',
+          hasProperty(params, 'voltage')
+            ? ` ${this.lang.curVolt} [${params.voltage}V]`
             : '',
-          this.funcs.hasProperty(params, 'voltage')
-            ? ' ' + this.lang.curVolt + ' [' + params.voltage + 'V]'
+          hasProperty(params, 'current')
+            ? ` ${this.lang.curCurr} [${params.current}A]`
             : '',
-          this.funcs.hasProperty(params, 'current')
-            ? ' ' + this.lang.curCurr + ' [' + params.current + 'A]'
-            : ''
-        )
+        );
       }
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, false)
+      this.platform.deviceUpdateError(this.accessory, err, false);
     }
   }
 
-  markStatus (isOnline) {
-    this.isOnline = isOnline
+  markStatus(isOnline) {
+    this.isOnline = isOnline;
   }
 
-  async currentState () {
-    const toReturn = {}
-    toReturn.services = ['switch']
+  async currentState() {
+    const toReturn = {};
+    toReturn.services = ['switch'];
     toReturn.switch = {
-      state: this.service.getCharacteristic(this.hapChar.On).value ? 'on' : 'off'
-    }
+      state: this.service.getCharacteristic(this.hapChar.On).value ? 'on' : 'off',
+    };
     if (this.powerReadings) {
       try {
-        toReturn.services.push('power')
+        toReturn.services.push('power');
         toReturn.power = {
           state: await this.platform.sendDeviceUpdate(this.accessory, { hundredDaysKwh: 'get' }),
           voltage: this.service.testCharacteristic(this.eveChar.Voltage)
@@ -293,12 +288,12 @@ module.exports = class deviceSwitchSingle {
             : undefined,
           current: this.service.testCharacteristic(this.eveChar.ElectricCurrent)
             ? this.service.getCharacteristic(this.eveChar.ElectricCurrent).value
-            : undefined
-        }
+            : undefined,
+        };
       } catch (err) {
         // Suppress errors here
       }
     }
-    return toReturn
+    return toReturn;
   }
 }
diff --git a/lib/device/template.js b/lib/device/template.js
index 4432a608..205fb765 100644
--- a/lib/device/template.js
+++ b/lib/device/template.js
@@ -1,47 +1,43 @@
-/* jshint node: true, esversion: 10, -W014, -W033 */
-/* eslint-disable new-cap */
-'use strict'
-
-module.exports = class deviceTemplate {
-  constructor (platform, accessory) {
+export default class {
+  constructor(platform, accessory) {
     // Set up variables from the platform
-    this.eveChar = platform.eveChar
-    this.funcs = platform.funcs
-    this.hapChar = platform.api.hap.Characteristic
-    this.hapErr = platform.api.hap.HapStatusError
-    this.hapServ = platform.api.hap.Service
-    this.lang = platform.lang
-    this.log = platform.log
-    this.platform = platform
+    this.eveChar = platform.eveChar;
+    this.hapChar = platform.api.hap.Characteristic;
+    this.hapErr = platform.api.hap.HapStatusError;
+    this.hapServ = platform.api.hap.Service;
+    this.lang = platform.lang;
+    this.log = platform.log;
+    this.platform = platform;
 
     // Set up variables from the accessory
-    this.name = accessory.displayName
-    this.accessory = accessory
+    this.name = accessory.displayName;
+    this.accessory = accessory;
 
     // Initially set the online flag as true (to be then updated as false if necessary)
-    this.isOnline = true
+    this.isOnline = true;
 
     // Set the correct logging variables for this accessory
-    this.enableLogging = true
-    this.enableDebugLogging = true
+    this.enableLogging = true;
+    this.enableDebugLogging = true;
 
     // Output the customised options to the log
+    const normalLogging = this.enableLogging ? 'standard' : 'disable';
     const opts = JSON.stringify({
-      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable'
-    })
-    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
+      logging: this.enableDebugLogging ? 'debug' : normalLogging,
+    });
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts);
   }
 
-  async externalUpdate (params) {
+  async externalUpdate(params) {
     try {
-      this.log.warn('New Command Received:')
-      this.log(JSON.stringify(params))
+      this.log.warn('New Command Received:');
+      this.log(JSON.stringify(params));
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, false)
+      this.platform.deviceUpdateError(this.accessory, err, false);
     }
   }
 
-  markStatus (isOnline) {
-    this.isOnline = isOnline
+  markStatus(isOnline) {
+    this.isOnline = isOnline;
   }
 }
diff --git a/lib/device/thermostat.js b/lib/device/thermostat.js
index 26746353..d50c4b03 100644
--- a/lib/device/thermostat.js
+++ b/lib/device/thermostat.js
@@ -1,49 +1,46 @@
-/* jshint node: true, esversion: 10, -W014, -W033 */
-/* eslint-disable new-cap */
-'use strict'
+import platformConsts from '../utils/constants.js';
+import { hasProperty, parseError } from '../utils/functions.js';
 
-module.exports = class deviceThermostat {
-  constructor (platform, accessory) {
+export default class {
+  constructor(platform, accessory) {
     // Set up variables from the platform
-    this.funcs = platform.funcs
-    this.hapChar = platform.api.hap.Characteristic
-    this.hapServ = platform.api.hap.Service
-    this.hapErr = platform.api.hap.HapStatusError
-    this.lang = platform.lang
-    this.log = platform.log
-    this.platform = platform
+    this.hapChar = platform.api.hap.Characteristic;
+    this.hapServ = platform.api.hap.Service;
+    this.hapErr = platform.api.hap.HapStatusError;
+    this.lang = platform.lang;
+    this.log = platform.log;
+    this.platform = platform;
 
     // Set up variables from the accessory
-    this.name = accessory.displayName
-    this.accessory = accessory
+    this.name = accessory.displayName;
+    this.accessory = accessory;
 
     // Initially set the online flag as true (to be then updated as false if necessary)
-    this.isOnline = true
+    this.isOnline = true;
 
     // Set up custom variables for this device type
-    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
-    this.tempOffset =
-      deviceConf && deviceConf.offset ? deviceConf.offset : platform.consts.defaultValues.offset
-    this.tempOffsetFactor = deviceConf && deviceConf.offsetFactor
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId] || {};
+    this.tempOffset = deviceConf.offset || platformConsts.defaultValues.offset;
+    this.tempOffsetFactor = deviceConf.offsetFactor;
 
     // Set the correct logging variables for this accessory
-    this.enableLogging = !platform.config.disableDeviceLogging
-    this.enableDebugLogging = platform.config.debug
-    if (deviceConf && deviceConf.overrideLogging) {
-      switch (deviceConf.overrideLogging) {
-        case 'standard':
-          this.enableLogging = true
-          this.enableDebugLogging = false
-          break
-        case 'debug':
-          this.enableLogging = true
-          this.enableDebugLogging = true
-          break
-        case 'disable':
-          this.enableLogging = false
-          this.enableDebugLogging = false
-          break
-      }
+    switch (deviceConf.overrideLogging) {
+      case 'standard':
+        this.enableLogging = true;
+        this.enableDebugLogging = false;
+        break;
+      case 'debug':
+        this.enableLogging = true;
+        this.enableDebugLogging = true;
+        break;
+      case 'disable':
+        this.enableLogging = false;
+        this.enableDebugLogging = false;
+        break;
+      default:
+        this.enableLogging = !platform.config.disableDeviceLogging;
+        this.enableDebugLogging = platform.config.debug;
+        break;
     }
 
     /*
@@ -69,16 +66,15 @@ module.exports = class deviceThermostat {
     */
 
     // Add the thermostat service if it doesn't already exist
-    this.service =
-      this.accessory.getService(this.hapServ.Thermostat) ||
-      this.accessory.addService(this.hapServ.Thermostat)
+    this.service = this.accessory.getService(this.hapServ.Thermostat)
+      || this.accessory.addService(this.hapServ.Thermostat);
 
     // Set custom properties of the current temperature characteristic
     this.service.getCharacteristic(this.hapChar.CurrentTemperature).setProps({
-      minStep: 0.1
-    })
-    this.cacheTemp = this.service.getCharacteristic(this.hapChar.CurrentTemperature).value
-    this.updateCache()
+      minStep: 0.1,
+    });
+    this.cacheTemp = this.service.getCharacteristic(this.hapChar.CurrentTemperature).value;
+    this.updateCache();
 
     // Add the set handler to the target state characteristic
     this.service
@@ -86,11 +82,11 @@ module.exports = class deviceThermostat {
       .setProps({
         minValue: 0,
         maxValue: 1,
-        validValues: [0, 1]
-      })
-      .onSet(async value => {
-        await this.internalStateUpdate(value)
+        validValues: [0, 1],
       })
+      .onSet(async (value) => {
+        this.internalStateUpdate(value);
+      });
 
     // Add the set handler to the target temperature characteristic
     this.service
@@ -98,197 +94,198 @@ module.exports = class deviceThermostat {
       .setProps({
         minValue: 5,
         maxValue: 45,
-        minStep: 0.5
-      })
-      .onSet(async value => {
-        await this.internalTargetUpdate(value)
+        minStep: 0.5,
       })
+      .onSet(async (value) => {
+        this.internalTargetUpdate(value);
+      });
 
     // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
     if (!platform.config.disableNoResponse) {
       this.service.getCharacteristic(this.hapChar.CurrentTemperature).onGet(() => {
         if (!this.isOnline) {
-          throw new this.hapErr(-70402)
+          throw new this.hapErr(-70402);
         }
-        return this.service.getCharacteristic(this.hapChar.CurrentTemperature).value
-      })
+        return this.service.getCharacteristic(this.hapChar.CurrentTemperature).value;
+      });
       this.service.getCharacteristic(this.hapChar.CurrentHeatingCoolingState).onGet(() => {
         if (!this.isOnline) {
-          throw new this.hapErr(-70402)
+          throw new this.hapErr(-70402);
         }
-        return this.service.getCharacteristic(this.hapChar.CurrentHeatingCoolingState).value
-      })
+        return this.service.getCharacteristic(this.hapChar.CurrentHeatingCoolingState).value;
+      });
       this.service.getCharacteristic(this.hapChar.TargetHeatingCoolingState).onGet(() => {
         if (!this.isOnline) {
-          throw new this.hapErr(-70402)
+          throw new this.hapErr(-70402);
         }
-        return this.service.getCharacteristic(this.hapChar.TargetHeatingCoolingState).value
-      })
+        return this.service.getCharacteristic(this.hapChar.TargetHeatingCoolingState).value;
+      });
       this.service.getCharacteristic(this.hapChar.TargetTemperature).onGet(() => {
         if (!this.isOnline) {
-          throw new this.hapErr(-70402)
+          throw new this.hapErr(-70402);
         }
-        return this.service.getCharacteristic(this.hapChar.TargetTemperature).value
-      })
+        return this.service.getCharacteristic(this.hapChar.TargetTemperature).value;
+      });
     }
 
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new platform.eveService('custom', this.accessory, {
-      log: platform.config.debugFakegato ? this.log : () => {}
-    })
+      log: platform.config.debugFakegato ? this.log : () => {},
+    });
 
     // Output the customised options to the log
+    const normalLogging = this.enableLogging ? 'standard' : 'disable';
     const opts = JSON.stringify({
-      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
+      logging: this.enableDebugLogging ? 'debug' : normalLogging,
       offset: this.tempOffset,
-      offsetFactor: this.tempOffsetFactor
-    })
-    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
+      offsetFactor: this.tempOffsetFactor,
+    });
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts);
   }
 
-  async internalStateUpdate (value) {
+  async internalStateUpdate(value) {
     try {
-      const newValue = value !== 0 ? 'on' : 'off'
+      const newValue = value !== 0 ? 'on' : 'off';
       const params = {
-        switch: newValue
-      }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
+        switch: newValue,
+      };
+      await this.platform.sendDeviceUpdate(this.accessory, params);
       if (value === 0) {
-        this.service.updateCharacteristic(this.hapChar.CurrentHeatingCoolingState, 0)
+        this.service.updateCharacteristic(this.hapChar.CurrentHeatingCoolingState, 0);
       }
-      this.cacheState = newValue
+      this.cacheState = newValue;
       if (this.enableLogging) {
-        this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
+        this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState);
       }
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true);
       setTimeout(() => {
         this.service.updateCharacteristic(
           this.hapChar.TargetHeatingCoolingState,
-          this.cacheState === 'on' ? 1 : 0
-        )
-      }, 2000)
-      throw new this.hapErr(-70402)
+          this.cacheState === 'on' ? 1 : 0,
+        );
+      }, 2000);
+      throw new this.hapErr(-70402);
     }
   }
 
-  async internalTargetUpdate (value) {
+  async internalTargetUpdate(value) {
     try {
       const params = {
         workMode: 1,
         targetTemp: value,
-        tempScale: 'c'
-      }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.cacheTarg = value
+        tempScale: 'c',
+      };
+      await this.platform.sendDeviceUpdate(this.accessory, params);
+      this.cacheTarg = value;
       if (this.enableLogging) {
-        this.log('[%s] %s [%s°C].', this.name, this.lang.curTarg, this.cacheTarg)
+        this.log('[%s] %s [%s°C].', this.name, this.lang.curTarg, this.cacheTarg);
       }
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true);
       setTimeout(() => {
-        this.service.updateCharacteristic(this.hapChar.TargetTemperature, this.cacheTarg)
-      }, 2000)
-      throw new this.hapErr(-70402)
+        this.service.updateCharacteristic(this.hapChar.TargetTemperature, this.cacheTarg);
+      }, 2000);
+      throw new this.hapErr(-70402);
     }
   }
 
-  async externalUpdate (params) {
+  async externalUpdate(params) {
     try {
       if (params.switch && params.switch !== this.OnOff) {
-        this.cacheState = params.switch
+        this.cacheState = params.switch;
         if (this.cacheState === 'off') {
-          this.service.updateCharacteristic(this.hapChar.CurrentHeatingCoolingState, 0)
+          this.service.updateCharacteristic(this.hapChar.CurrentHeatingCoolingState, 0);
         }
         this.service.updateCharacteristic(
           this.hapChar.TargetHeatingCoolingState,
-          this.cacheState === 'on' ? 1 : 0
-        )
+          this.cacheState === 'on' ? 1 : 0,
+        );
         if (params.updateSource && this.enableLogging) {
-          this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
+          this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState);
         }
       }
 
       if (params.workState) {
-        const workState = params.workState === 1 ? 'on' : 'off'
+        const workState = params.workState === 1 ? 'on' : 'off';
         if (this.cacheHeat !== workState) {
-          this.cacheHeat = workState
+          this.cacheHeat = workState;
           this.service.updateCharacteristic(
             this.hapChar.CurrentHeatingCoolingState,
-            this.cacheHeat === 'on' ? 1 : 0
-          )
+            this.cacheHeat === 'on' ? 1 : 0,
+          );
           if (params.updateSource && this.enableLogging) {
-            this.log('[%s] %s [%s].', this.name, this.lang.curHeat, this.cacheHeat)
+            this.log('[%s] %s [%s].', this.name, this.lang.curHeat, this.cacheHeat);
           }
         }
       }
 
-      if (this.funcs.hasProperty(params, 'targetTemp')) {
-        const targetTemp = Number(params.targetTemp)
+      if (hasProperty(params, 'targetTemp')) {
+        const targetTemp = Number(params.targetTemp);
         if (this.cacheTarg !== targetTemp) {
-          this.cacheTarg = targetTemp
-          this.service.updateCharacteristic(this.hapChar.TargetTemperature, this.cacheTarg)
+          this.cacheTarg = targetTemp;
+          this.service.updateCharacteristic(this.hapChar.TargetTemperature, this.cacheTarg);
           if (params.updateSource && this.enableLogging) {
-            this.log('[%s] %s [%s°C].', this.name, this.lang.curTarg, this.cacheTarg)
+            this.log('[%s] %s [%s°C].', this.name, this.lang.curTarg, this.cacheTarg);
           }
         }
       }
 
-      if (this.funcs.hasProperty(params, 'temperature')) {
-        let currentTemp
+      if (hasProperty(params, 'temperature')) {
+        let currentTemp;
         if (params.tempScale && params.tempScale === 'f') {
           // Convert to celcius
-          currentTemp = ((Number(params.temperature) - 32) * 5) / 9
+          currentTemp = ((Number(params.temperature) - 32) * 5) / 9;
 
           // Round to nearest 0.5
-          currentTemp = Math.round(currentTemp * 2) / 2
+          currentTemp = Math.round(currentTemp * 2) / 2;
         } else {
-          currentTemp = Number(params.temperature)
+          currentTemp = Number(params.temperature);
         }
         if (this.tempOffsetFactor) {
-          currentTemp *= this.tempOffset
+          currentTemp *= this.tempOffset;
         } else {
-          currentTemp += this.tempOffset
+          currentTemp += this.tempOffset;
         }
 
         if (this.cacheTemp !== currentTemp) {
-          this.cacheTemp = currentTemp
-          this.service.updateCharacteristic(this.hapChar.CurrentTemperature, this.cacheTemp)
-          this.accessory.eveService.addEntry({ temp: this.cacheTemp })
+          this.cacheTemp = currentTemp;
+          this.service.updateCharacteristic(this.hapChar.CurrentTemperature, this.cacheTemp);
+          this.accessory.eveService.addEntry({ temp: this.cacheTemp });
           if (params.updateSource && this.enableLogging) {
-            this.log('[%s] %s [%s°C].', this.name, this.lang.curTemp, this.cacheTemp)
+            this.log('[%s] %s [%s°C].', this.name, this.lang.curTemp, this.cacheTemp);
           }
 
           // Update the cache file with the new temperature
-          this.updateCache()
+          this.updateCache();
         }
       }
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, false)
+      this.platform.deviceUpdateError(this.accessory, err, false);
     }
   }
 
-  async updateCache () {
+  async updateCache() {
     // Don't continue if the storage client hasn't initialised properly
     if (!this.platform.storageClientData) {
-      return
+      return;
     }
 
     // Attempt to save the new temperature to the cache
     try {
       await this.platform.storageData.setItem(
-        this.accessory.context.eweDeviceId + '_temp',
-        this.cacheTemp
-      )
+        `${this.accessory.context.eweDeviceId}_temp`,
+        this.cacheTemp,
+      );
     } catch (err) {
       if (this.enableLogging) {
-        const eText = this.funcs.parseError(err)
-        this.log.warn('[%s] %s %s.', this.name, this.lang.storageWriteErr, eText)
+        const eText = parseError(err);
+        this.log.warn('[%s] %s %s.', this.name, this.lang.storageWriteErr, eText);
       }
     }
   }
 
-  markStatus (isOnline) {
-    this.isOnline = isOnline
+  markStatus(isOnline) {
+    this.isOnline = isOnline;
   }
 }
diff --git a/lib/device/zigbee/index.js b/lib/device/zigbee/index.js
new file mode 100644
index 00000000..24b20ef1
--- /dev/null
+++ b/lib/device/zigbee/index.js
@@ -0,0 +1,19 @@
+import deviceLightCCT from './light-cct.js';
+import deviceLightDimmer from './light-dimmer.js';
+import deviceSensorAmbient from './sensor-ambient.js';
+import deviceSensorContact from './sensor-contact.js';
+import deviceSensorLeak from './sensor-leak.js';
+import deviceSensorMotion from './sensor-motion.js';
+import deviceSensorSmoke from './sensor-smoke.js';
+import deviceSwitchStateless from './switch-stateless.js';
+
+export default {
+  deviceLightCCT,
+  deviceLightDimmer,
+  deviceSensorAmbient,
+  deviceSensorContact,
+  deviceSensorLeak,
+  deviceSensorMotion,
+  deviceSensorSmoke,
+  deviceSwitchStateless,
+};
diff --git a/lib/device/zigbee/light-cct.js b/lib/device/zigbee/light-cct.js
index ee9a4a3c..c74d9722 100644
--- a/lib/device/zigbee/light-cct.js
+++ b/lib/device/zigbee/light-cct.js
@@ -1,67 +1,60 @@
-/* jshint node: true, esversion: 10, -W014, -W033 */
-/* eslint-disable new-cap */
-'use strict'
+import platformConsts from '../../utils/constants.js';
+import { generateRandomString, hasProperty, sleep } from '../../utils/functions.js';
 
-module.exports = class deviceZBLightCCT {
-  constructor (platform, accessory) {
+export default class {
+  constructor(platform, accessory) {
     // Set up variables from the platform
-    this.funcs = platform.funcs
-    this.hapChar = platform.api.hap.Characteristic
-    this.hapErr = platform.api.hap.HapStatusError
-    this.hapServ = platform.api.hap.Service
-    this.lang = platform.lang
-    this.log = platform.log
-    this.platform = platform
+    this.hapChar = platform.api.hap.Characteristic;
+    this.hapErr = platform.api.hap.HapStatusError;
+    this.hapServ = platform.api.hap.Service;
+    this.lang = platform.lang;
+    this.log = platform.log;
+    this.platform = platform;
 
     // Set up variables from the accessory
-    this.name = accessory.displayName
-    this.accessory = accessory
+    this.name = accessory.displayName;
+    this.accessory = accessory;
 
     // Set up custom variables for this device type
-    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
-    this.brightStep =
-      deviceConf && deviceConf.brightnessStep
-        ? Math.min(deviceConf.brightnessStep, 100)
-        : platform.consts.defaultValues.brightnessStep
-    this.alShift =
-      deviceConf && deviceConf.adaptiveLightingShift
-        ? deviceConf.adaptiveLightingShift
-        : platform.consts.defaultValues.adaptiveLightingShift
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId] || {};
+    this.brightStep = deviceConf.brightnessStep
+      ? Math.min(deviceConf.brightnessStep, 100)
+      : platformConsts.defaultValues.brightnessStep;
+    this.alShift = deviceConf.adaptiveLightingShift || platformConsts.defaultValues.adaptiveLightingShift;
 
     // Set the correct logging variables for this accessory
-    this.enableLogging = !platform.config.disableDeviceLogging
-    this.enableDebugLogging = platform.config.debug
-    if (deviceConf && deviceConf.overrideLogging) {
-      switch (deviceConf.overrideLogging) {
-        case 'standard':
-          this.enableLogging = true
-          this.enableDebugLogging = false
-          break
-        case 'debug':
-          this.enableLogging = true
-          this.enableDebugLogging = true
-          break
-        case 'disable':
-          this.enableLogging = false
-          this.enableDebugLogging = false
-          break
-      }
+    switch (deviceConf.overrideLogging) {
+      case 'standard':
+        this.enableLogging = true;
+        this.enableDebugLogging = false;
+        break;
+      case 'debug':
+        this.enableLogging = true;
+        this.enableDebugLogging = true;
+        break;
+      case 'disable':
+        this.enableLogging = false;
+        this.enableDebugLogging = false;
+        break;
+      default:
+        this.enableLogging = !platform.config.disableDeviceLogging;
+        this.enableDebugLogging = platform.config.debug;
+        break;
     }
 
     // Different bulbs have different colour temperature ranges
-    this.minK = 2200
-    this.maxK = 4000
+    this.minK = 2200;
+    this.maxK = 4000;
 
     // Add the lightbulb service if it doesn't already exist
-    this.service =
-      this.accessory.getService(this.hapServ.Lightbulb) ||
-      this.accessory.addService(this.hapServ.Lightbulb)
+    this.service = this.accessory.getService(this.hapServ.Lightbulb)
+      || this.accessory.addService(this.hapServ.Lightbulb);
 
     // If adaptive lighting has just been disabled then remove and re-add service to hide AL icon
     if (this.alShift === -1 && this.accessory.context.adaptiveLighting) {
-      this.accessory.removeService(this.service)
-      this.service = this.accessory.addService(this.hapServ.Lightbulb)
-      this.accessory.context.adaptiveLighting = false
+      this.accessory.removeService(this.service);
+      this.service = this.accessory.addService(this.hapServ.Lightbulb);
+      this.accessory.context.adaptiveLighting = false;
     }
 
     // Add the get/set handler to the lightbulb on/off characteristic
@@ -69,190 +62,190 @@ module.exports = class deviceZBLightCCT {
       .getCharacteristic(this.hapChar.On)
       .onGet(() => {
         if (this.isOnline) {
-          return this.service.getCharacteristic(this.hapChar.On).value
-        } else {
-          throw new this.hapErr(-70402)
+          return this.service.getCharacteristic(this.hapChar.On).value;
         }
+        throw new this.hapErr(-70402);
       })
-      .onSet(async value => {
-        await this.internalStateUpdate(value)
-      })
+      .onSet(async (value) => {
+        this.internalStateUpdate(value);
+      });
 
     // Add the set handler to the lightbulb brightness characteristic
     this.service
       .getCharacteristic(this.hapChar.Brightness)
       .setProps({ minStep: this.brightStep })
-      .onSet(async value => {
-        await this.internalBrightnessUpdate(value)
-      })
+      .onSet(async (value) => {
+        this.internalBrightnessUpdate(value);
+      });
 
     // Add the set handler to the lightbulb colour temperature characteristic
-    this.service.getCharacteristic(this.hapChar.ColorTemperature).onSet(async value => {
-      await this.internalCTUpdate(value)
-    })
+    this.service.getCharacteristic(this.hapChar.ColorTemperature).onSet(async (value) => {
+      this.internalCTUpdate(value);
+    });
 
     // This is needed as sometimes we need to send the brightness with a cct update
-    this.cacheBright = this.service.getCharacteristic(this.hapChar.Brightness).value
+    this.cacheBright = this.service.getCharacteristic(this.hapChar.Brightness).value;
 
     // Set up the adaptive lighting controller if not disabled by user
     if (this.alShift !== -1) {
       this.accessory.alController = new platform.api.hap.AdaptiveLightingController(this.service, {
-        customTemperatureAdjustment: this.alShift
-      })
-      this.accessory.configureController(this.accessory.alController)
+        customTemperatureAdjustment: this.alShift,
+      });
+      this.accessory.configureController(this.accessory.alController);
     }
 
     // Output the customised options to the log
+    const normalLogging = this.enableLogging ? 'standard' : 'disable';
     const opts = JSON.stringify({
       adaptiveLightingShift: this.alShift,
       brightnessStep: this.brightStep,
-      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable'
-    })
-    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
+      logging: this.enableDebugLogging ? 'debug' : normalLogging,
+    });
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts);
   }
 
-  async internalStateUpdate (value) {
+  async internalStateUpdate(value) {
     try {
-      const newValue = value ? 'on' : 'off'
+      const newValue = value ? 'on' : 'off';
       await this.platform.sendDeviceUpdate(this.accessory, {
-        switch: newValue
-      })
-      this.cacheState = newValue
+        switch: newValue,
+      });
+      this.cacheState = newValue;
       if (this.enableLogging) {
-        this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
+        this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState);
       }
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true);
       setTimeout(() => {
-        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
-      }, 2000)
-      throw new this.hapErr(-70402)
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on');
+      }, 2000);
+      throw new this.hapErr(-70402);
     }
   }
 
-  async internalBrightnessUpdate (value) {
+  async internalBrightnessUpdate(value) {
     try {
       if (this.cacheBright === value || value === 0) {
-        return
+        return;
       }
-      const updateKey = this.funcs.generateRandomString(5)
-      this.updateKeyBright = updateKey
-      await this.funcs.sleep(500)
+      const updateKey = generateRandomString(5);
+      this.updateKeyBright = updateKey;
+      await sleep(500);
       if (updateKey !== this.updateKeyBright) {
-        return
+        return;
       }
       const params = {
         switch: 'on',
-        brightness: value
-      }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.cacheBright = value
+        brightness: value,
+      };
+      await this.platform.sendDeviceUpdate(this.accessory, params);
+      this.cacheBright = value;
       if (this.enableLogging) {
-        this.log('[%s] %s [%s%].', this.name, this.lang.curBright, this.cacheBright)
+        this.log('[%s] %s [%s%].', this.name, this.lang.curBright, this.cacheBright);
       }
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true);
       setTimeout(() => {
-        this.service.updateCharacteristic(this.hapChar.Brightness, this.cacheBright)
-      }, 2000)
-      throw new this.hapErr(-70402)
+        this.service.updateCharacteristic(this.hapChar.Brightness, this.cacheBright);
+      }, 2000);
+      throw new this.hapErr(-70402);
     }
   }
 
-  async internalCTUpdate (value) {
+  async internalCTUpdate(value) {
     try {
       if (this.cacheMired === value) {
-        return
+        return;
       }
       if (
-        this.accessory.alController &&
-        this.accessory.alController.isAdaptiveLightingActive() &&
-        (this.cacheState !== 'on' || !this.isOnline)
+        this.accessory.alController
+        && this.accessory.alController.isAdaptiveLightingActive()
+        && (this.cacheState !== 'on' || !this.isOnline)
       ) {
-        return
+        return;
       }
-      const updateKey = this.funcs.generateRandomString(5)
-      this.updateKeyCT = updateKey
-      await this.funcs.sleep(400)
+      const updateKey = generateRandomString(5);
+      this.updateKeyCT = updateKey;
+      await sleep(400);
       if (updateKey !== this.updateKeyCT) {
-        return
+        return;
       }
-      const kelvin = Math.round(1000000 / value)
-      const scaledK = Math.max(Math.min(kelvin, this.maxK), this.minK)
-      const scaledCT = Math.round(((scaledK - this.minK) / (this.maxK - this.minK)) * 100)
+      const kelvin = Math.round(1000000 / value);
+      const scaledK = Math.max(Math.min(kelvin, this.maxK), this.minK);
+      const scaledCT = Math.round(((scaledK - this.minK) / (this.maxK - this.minK)) * 100);
       const params = {
         switch: 'on',
-        colorTemp: scaledCT
-      }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.cacheMired = value
-      this.cacheCT = scaledCT
+        colorTemp: scaledCT,
+      };
+      await this.platform.sendDeviceUpdate(this.accessory, params);
+      this.cacheMired = value;
+      this.cacheCT = scaledCT;
       if (this.enableLogging) {
         if (this.accessory.alController && this.accessory.alController.isAdaptiveLightingActive()) {
-          this.log('[%s] %s [%sK] %s.', this.name, this.lang.curColour, scaledK, this.lang.viaAL)
+          this.log('[%s] %s [%sK] %s.', this.name, this.lang.curColour, scaledK, this.lang.viaAL);
         } else {
-          this.log('[%s] %s [%sK].', this.name, this.lang.curColour, scaledK)
+          this.log('[%s] %s [%sK].', this.name, this.lang.curColour, scaledK);
         }
       }
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true);
       setTimeout(() => {
-        this.service.updateCharacteristic(this.hapChar.ColorTemperature, this.cacheMired)
-      }, 2000)
-      throw new this.hapErr(-70402)
+        this.service.updateCharacteristic(this.hapChar.ColorTemperature, this.cacheMired);
+      }, 2000);
+      throw new this.hapErr(-70402);
     }
   }
 
-  async externalUpdate (params) {
+  async externalUpdate(params) {
     try {
       if (params.switch && params.switch !== this.cacheState) {
-        this.cacheState = params.switch
-        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
+        this.cacheState = params.switch;
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on');
         if (params.updateSource && this.enableLogging) {
-          this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
+          this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState);
         }
       }
-      if (this.funcs.hasProperty(params, 'brightness')) {
+      if (hasProperty(params, 'brightness')) {
         if (params.brightness !== this.cacheBright) {
-          this.cacheBright = params.brightness
-          this.service.updateCharacteristic(this.hapChar.Brightness, this.cacheBright)
+          this.cacheBright = params.brightness;
+          this.service.updateCharacteristic(this.hapChar.Brightness, this.cacheBright);
           if (params.updateSource && this.enableLogging) {
-            this.log('[%s] %s [%s%].', this.name, this.lang.curBright, this.cacheBright)
+            this.log('[%s] %s [%s%].', this.name, this.lang.curBright, this.cacheBright);
           }
         }
       }
-      if (this.funcs.hasProperty(params, 'colorTemp')) {
+      if (hasProperty(params, 'colorTemp')) {
         if (params.colorTemp !== this.cacheCT) {
-          const ctDiff = Math.abs(params.colorTemp - this.cacheCT)
-          this.cacheCT = params.colorTemp
-          const kelvin = (this.cacheCT / 100) * (this.maxK - this.minK) + this.minK
-          const scaledK = Math.round(kelvin)
-          this.cacheMired = Math.min(Math.max(Math.round(1000000 / scaledK), 140), 500)
-          this.service.updateCharacteristic(this.hapChar.ColorTemperature, this.cacheMired)
+          const ctDiff = Math.abs(params.colorTemp - this.cacheCT);
+          this.cacheCT = params.colorTemp;
+          const kelvin = (this.cacheCT / 100) * (this.maxK - this.minK) + this.minK;
+          const scaledK = Math.round(kelvin);
+          this.cacheMired = Math.min(Math.max(Math.round(1000000 / scaledK), 140), 500);
+          this.service.updateCharacteristic(this.hapChar.ColorTemperature, this.cacheMired);
           if (params.updateSource) {
             if (this.enableLogging) {
-              this.log('[%s] %s [%sK].', this.name, this.lang.curColour, scaledK)
+              this.log('[%s] %s [%sK].', this.name, this.lang.curColour, scaledK);
             }
             if (
-              this.accessory.alController &&
-              this.accessory.alController.isAdaptiveLightingActive() &&
-              ctDiff > 20
+              this.accessory.alController
+              && this.accessory.alController.isAdaptiveLightingActive()
+              && ctDiff > 20
             ) {
               // Look for a variation greater than twenty
-              this.accessory.alController.disableAdaptiveLighting()
+              this.accessory.alController.disableAdaptiveLighting();
               if (this.enableLogging) {
-                this.log('[%s] %s.', this.name, this.lang.disabledAL)
+                this.log('[%s] %s.', this.name, this.lang.disabledAL);
               }
             }
           }
         }
       }
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, false)
+      this.platform.deviceUpdateError(this.accessory, err, false);
     }
   }
 
-  markStatus (isOnline) {
-    this.isOnline = isOnline
+  markStatus(isOnline) {
+    this.isOnline = isOnline;
   }
 }
diff --git a/lib/device/zigbee/light-dimmer.js b/lib/device/zigbee/light-dimmer.js
index 463ccdf3..6a40d228 100644
--- a/lib/device/zigbee/light-dimmer.js
+++ b/lib/device/zigbee/light-dimmer.js
@@ -1,156 +1,152 @@
-/* jshint node: true, esversion: 10, -W014, -W033 */
-/* eslint-disable new-cap */
-'use strict'
+import platformConsts from '../../utils/constants.js';
+import { generateRandomString, hasProperty, sleep } from '../../utils/functions.js';
 
-module.exports = class deviceZBLightDimmer {
-  constructor (platform, accessory) {
+export default class {
+  constructor(platform, accessory) {
     // Set up variables from the platform
-    this.funcs = platform.funcs
-    this.hapChar = platform.api.hap.Characteristic
-    this.hapErr = platform.api.hap.HapStatusError
-    this.hapServ = platform.api.hap.Service
-    this.lang = platform.lang
-    this.log = platform.log
-    this.platform = platform
+    this.hapChar = platform.api.hap.Characteristic;
+    this.hapErr = platform.api.hap.HapStatusError;
+    this.hapServ = platform.api.hap.Service;
+    this.lang = platform.lang;
+    this.log = platform.log;
+    this.platform = platform;
 
     // Set up variables from the accessory
-    this.name = accessory.displayName
-    this.accessory = accessory
+    this.name = accessory.displayName;
+    this.accessory = accessory;
 
     // Set up custom variables for this device type
-    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
-    this.brightStep =
-      deviceConf && deviceConf.brightnessStep
-        ? Math.min(deviceConf.brightnessStep, 100)
-        : platform.consts.defaultValues.brightnessStep
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId] || {};
+    this.brightStep = deviceConf.brightnessStep
+      ? Math.min(deviceConf.brightnessStep, 100)
+      : platformConsts.defaultValues.brightnessStep;
 
     // Set the correct logging variables for this accessory
-    this.enableLogging = !platform.config.disableDeviceLogging
-    this.enableDebugLogging = platform.config.debug
-    if (deviceConf && deviceConf.overrideLogging) {
-      switch (deviceConf.overrideLogging) {
-        case 'standard':
-          this.enableLogging = true
-          this.enableDebugLogging = false
-          break
-        case 'debug':
-          this.enableLogging = true
-          this.enableDebugLogging = true
-          break
-        case 'disable':
-          this.enableLogging = false
-          this.enableDebugLogging = false
-          break
-      }
+    switch (deviceConf.overrideLogging) {
+      case 'standard':
+        this.enableLogging = true;
+        this.enableDebugLogging = false;
+        break;
+      case 'debug':
+        this.enableLogging = true;
+        this.enableDebugLogging = true;
+        break;
+      case 'disable':
+        this.enableLogging = false;
+        this.enableDebugLogging = false;
+        break;
+      default:
+        this.enableLogging = !platform.config.disableDeviceLogging;
+        this.enableDebugLogging = platform.config.debug;
+        break;
     }
 
     // Add the lightbulb service if it doesn't already exist
-    this.service =
-      this.accessory.getService(this.hapServ.Lightbulb) ||
-      this.accessory.addService(this.hapServ.Lightbulb)
+    this.service = this.accessory.getService(this.hapServ.Lightbulb)
+      || this.accessory.addService(this.hapServ.Lightbulb);
 
     // Add the get/set handler to the lightbulb on/off characteristic
     this.service
       .getCharacteristic(this.hapChar.On)
       .onGet(() => {
         if (this.isOnline) {
-          return this.service.getCharacteristic(this.hapChar.On).value
-        } else {
-          throw new this.hapErr(-70402)
+          return this.service.getCharacteristic(this.hapChar.On).value;
         }
+        throw new this.hapErr(-70402);
       })
-      .onSet(async value => {
-        await this.internalStateUpdate(value)
-      })
+      .onSet(async (value) => {
+        this.internalStateUpdate(value);
+      });
 
     // Add the set handler to the lightbulb brightness characteristic
     this.service
       .getCharacteristic(this.hapChar.Brightness)
       .setProps({ minStep: this.brightStep })
-      .onSet(async value => {
-        await this.internalBrightnessUpdate(value)
-      })
+      .onSet(async (value) => {
+        this.internalBrightnessUpdate(value);
+      });
 
     // Output the customised options to the log
+    const normalLogging = this.enableLogging ? 'standard' : 'disable';
     const opts = JSON.stringify({
       brightnessStep: this.brightStep,
-      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable'
-    })
-    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
+      logging: this.enableDebugLogging ? 'debug' : normalLogging,
+    });
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts);
   }
 
-  async internalStateUpdate (value) {
+  async internalStateUpdate(value) {
     try {
-      const newValue = value ? 'on' : 'off'
+      const newValue = value ? 'on' : 'off';
       await this.platform.sendDeviceUpdate(this.accessory, {
-        switch: newValue
-      })
-      this.cacheState = newValue
+        switch: newValue,
+      });
+      this.cacheState = newValue;
       if (this.enableLogging) {
-        this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
+        this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState);
       }
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true);
       setTimeout(() => {
-        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
-      }, 2000)
-      throw new this.hapErr(-70402)
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on');
+      }, 2000);
+      throw new this.hapErr(-70402);
     }
   }
 
-  async internalBrightnessUpdate (value) {
+  async internalBrightnessUpdate(value) {
     try {
       if (this.cacheBright === value || value === 0) {
-        return
+        return;
       }
-      const updateKey = this.funcs.generateRandomString(5)
-      this.updateKey = updateKey
-      await this.funcs.sleep(500)
+      const updateKey = generateRandomString(5);
+      this.updateKey = updateKey;
+      await sleep(500);
       if (updateKey !== this.updateKey) {
-        return
+        return;
       }
       const params = {
         switch: 'on',
-        brightness: value
-      }
-      await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.cacheBright = value
+        brightness: value,
+      };
+      await this.platform.sendDeviceUpdate(this.accessory, params);
+      this.cacheBright = value;
       if (this.enableLogging) {
-        this.log('[%s] %s [%s%].', this.name, this.lang.curBright, this.cacheBright)
+        this.log('[%s] %s [%s%].', this.name, this.lang.curBright, this.cacheBright);
       }
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, true)
+      this.platform.deviceUpdateError(this.accessory, err, true);
       setTimeout(() => {
-        this.service.updateCharacteristic(this.hapChar.Brightness, this.cacheBright)
-      }, 2000)
-      throw new this.hapErr(-70402)
+        this.service.updateCharacteristic(this.hapChar.Brightness, this.cacheBright);
+      }, 2000);
+      throw new this.hapErr(-70402);
     }
   }
 
-  async externalUpdate (params) {
+  async externalUpdate(params) {
     try {
       if (params.switch && params.switch !== this.cacheState) {
-        this.cacheState = params.switch
-        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
+        this.cacheState = params.switch;
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on');
         if (params.updateSource && this.enableLogging) {
-          this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
+          this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState);
         }
       }
-      if (this.funcs.hasProperty(params, 'brightness')) {
+      if (hasProperty(params, 'brightness')) {
         if (params.brightness !== this.cacheBright) {
-          this.cacheBright = params.brightness
-          this.service.updateCharacteristic(this.hapChar.Brightness, this.cacheBright)
+          this.cacheBright = params.brightness;
+          this.service.updateCharacteristic(this.hapChar.Brightness, this.cacheBright);
           if (params.updateSource && this.enableLogging) {
-            this.log('[%s] %s [%s%].', this.name, this.lang.curBright, this.cacheBright)
+            this.log('[%s] %s [%s%].', this.name, this.lang.curBright, this.cacheBright);
           }
         }
       }
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, false)
+      this.platform.deviceUpdateError(this.accessory, err, false);
     }
   }
 
-  markStatus (isOnline) {
-    this.isOnline = isOnline
+  markStatus(isOnline) {
+    this.isOnline = isOnline;
   }
 }
diff --git a/lib/device/zigbee/sensor-ambient.js b/lib/device/zigbee/sensor-ambient.js
index 3d2925e5..68264419 100644
--- a/lib/device/zigbee/sensor-ambient.js
+++ b/lib/device/zigbee/sensor-ambient.js
@@ -1,185 +1,178 @@
-/* jshint node: true, esversion: 10, -W014, -W033 */
-/* eslint-disable new-cap */
-'use strict'
+import platformConsts from '../../utils/constants.js';
+import { hasProperty, parseError } from '../../utils/functions.js';
 
-module.exports = class deviceZBSensorAmbient {
-  constructor (platform, accessory) {
+export default class {
+  constructor(platform, accessory) {
     // Set up variables from the platform
-    this.funcs = platform.funcs
-    this.hapChar = platform.api.hap.Characteristic
-    this.hapServ = platform.api.hap.Service
-    this.lang = platform.lang
-    this.log = platform.log
-    this.platform = platform
+    this.hapChar = platform.api.hap.Characteristic;
+    this.hapServ = platform.api.hap.Service;
+    this.lang = platform.lang;
+    this.log = platform.log;
+    this.platform = platform;
 
     // Set up variables from the accessory
-    this.name = accessory.displayName
-    this.accessory = accessory
+    this.name = accessory.displayName;
+    this.accessory = accessory;
 
     // Set up custom variables for this device type
-    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
-    this.lowBattThreshold =
-      deviceConf && deviceConf.lowBattThreshold
-        ? Math.min(deviceConf.lowBattThreshold, 100)
-        : platform.consts.defaultValues.lowBattThreshold
-    this.tempOffset =
-      deviceConf && deviceConf.offset ? deviceConf.offset : platform.consts.defaultValues.offset
-    this.tempOffsetFactor = deviceConf && deviceConf.offsetFactor
-    this.humiOffset =
-      deviceConf && deviceConf.humidityOffset
-        ? parseInt(deviceConf.humidityOffset)
-        : platform.consts.defaultValues.humidityOffset
-    this.humiOffsetFactor = deviceConf && deviceConf.humidityOffsetFactor
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId] || {};
+    this.lowBattThreshold = deviceConf.lowBattThreshold
+      ? Math.min(deviceConf.lowBattThreshold, 100)
+      : platformConsts.defaultValues.lowBattThreshold;
+    this.tempOffset = deviceConf.offset || platformConsts.defaultValues.offset;
+    this.tempOffsetFactor = deviceConf.offsetFactor;
+    this.humiOffset = deviceConf.humidityOffset
+      ? parseInt(deviceConf.humidityOffset, 10)
+      : platformConsts.defaultValues.humidityOffset;
+    this.humiOffsetFactor = deviceConf.humidityOffsetFactor;
 
     // Set the correct logging variables for this accessory
-    this.enableLogging = !platform.config.disableDeviceLogging
-    this.enableDebugLogging = platform.config.debug
-    if (deviceConf && deviceConf.overrideLogging) {
-      switch (deviceConf.overrideLogging) {
-        case 'standard':
-          this.enableLogging = true
-          this.enableDebugLogging = false
-          break
-        case 'debug':
-          this.enableLogging = true
-          this.enableDebugLogging = true
-          break
-        case 'disable':
-          this.enableLogging = false
-          this.enableDebugLogging = false
-          break
-      }
+    switch (deviceConf.overrideLogging) {
+      case 'standard':
+        this.enableLogging = true;
+        this.enableDebugLogging = false;
+        break;
+      case 'debug':
+        this.enableLogging = true;
+        this.enableDebugLogging = true;
+        break;
+      case 'disable':
+        this.enableLogging = false;
+        this.enableDebugLogging = false;
+        break;
+      default:
+        this.enableLogging = !platform.config.disableDeviceLogging;
+        this.enableDebugLogging = platform.config.debug;
+        break;
     }
 
     // Add the temperature sensor service if it doesn't already exist
-    this.tempService =
-      this.accessory.getService(this.hapServ.TemperatureSensor) ||
-      this.accessory.addService(this.hapServ.TemperatureSensor)
+    this.tempService = this.accessory.getService(this.hapServ.TemperatureSensor)
+      || this.accessory.addService(this.hapServ.TemperatureSensor);
 
     // Add options to the current temperature characteristic
     this.tempService.getCharacteristic(this.hapChar.CurrentTemperature).setProps({
-      minStep: 0.1
-    })
-    this.cacheTemp = this.tempService.getCharacteristic(this.hapChar.CurrentTemperature).value
-    this.updateCache()
+      minStep: 0.1,
+    });
+    this.cacheTemp = this.tempService.getCharacteristic(this.hapChar.CurrentTemperature).value;
+    this.updateCache();
 
     // Add the humidity sensor service if it doesn't already exist
-    this.humiService =
-      this.accessory.getService(this.hapServ.HumiditySensor) ||
-      this.accessory.addService(this.hapServ.HumiditySensor)
+    this.humiService = this.accessory.getService(this.hapServ.HumiditySensor)
+      || this.accessory.addService(this.hapServ.HumiditySensor);
 
     // Add the battery service if it doesn't already exist
-    this.battService =
-      this.accessory.getService(this.hapServ.Battery) ||
-      this.accessory.addService(this.hapServ.Battery)
+    this.battService = this.accessory.getService(this.hapServ.Battery)
+      || this.accessory.addService(this.hapServ.Battery);
 
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new platform.eveService('weather', this.accessory, {
-      log: platform.config.debugFakegato ? this.log : () => {}
-    })
+      log: platform.config.debugFakegato ? this.log : () => {},
+    });
 
     // Output the customised options to the log
+    const normalLogging = this.enableLogging ? 'standard' : 'disable';
     const opts = JSON.stringify({
       humidityOffset: this.humiOffset,
       humidityOffsetFactor: this.humiOffsetFactor,
-      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
+      logging: this.enableDebugLogging ? 'debug' : normalLogging,
       lowBattThreshold: this.lowBattThreshold,
       offset: this.tempOffset,
-      offsetFactor: this.tempOffsetFactor
-    })
-    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
+      offsetFactor: this.tempOffsetFactor,
+    });
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts);
   }
 
-  async externalUpdate (params) {
+  async externalUpdate(params) {
     try {
-      if (this.funcs.hasProperty(params, 'battery') && params.battery !== this.cacheBatt) {
-        this.cacheBatt = params.battery
-        this.cacheBattScaled = Math.max(Math.min(this.cacheBatt, 100), 0)
-        this.battService.updateCharacteristic(this.hapChar.BatteryLevel, this.cacheBattScaled)
+      if (hasProperty(params, 'battery') && params.battery !== this.cacheBatt) {
+        this.cacheBatt = params.battery;
+        this.cacheBattScaled = Math.max(Math.min(this.cacheBatt, 100), 0);
+        this.battService.updateCharacteristic(this.hapChar.BatteryLevel, this.cacheBattScaled);
         this.battService.updateCharacteristic(
           this.hapChar.StatusLowBattery,
-          this.cacheBattScaled < this.lowBattThreshold ? 1 : 0
-        )
+          this.cacheBattScaled < this.lowBattThreshold ? 1 : 0,
+        );
         if (params.updateSource && this.enableLogging) {
-          this.log('[%s] %s [%s%].', this.name, this.lang.curBatt, this.cacheBattScaled)
+          this.log('[%s] %s [%s%].', this.name, this.lang.curBatt, this.cacheBattScaled);
         }
       }
-      if (this.funcs.hasProperty(params, 'temperature')) {
-        let newTemp = parseInt(params.temperature) / 100
+      if (hasProperty(params, 'temperature')) {
+        let newTemp = parseInt(params.temperature, 10) / 100;
         if (this.tempOffsetFactor) {
-          newTemp *= this.tempOffset
+          newTemp *= this.tempOffset;
         } else {
-          newTemp += this.tempOffset
+          newTemp += this.tempOffset;
         }
         if (newTemp !== this.cacheTemp) {
-          this.cacheTemp = newTemp
-          this.tempService.updateCharacteristic(this.hapChar.CurrentTemperature, this.cacheTemp)
-          this.accessory.eveService.addEntry({ temp: this.cacheTemp })
+          this.cacheTemp = newTemp;
+          this.tempService.updateCharacteristic(this.hapChar.CurrentTemperature, this.cacheTemp);
+          this.accessory.eveService.addEntry({ temp: this.cacheTemp });
           if (params.updateSource && this.enableLogging) {
-            this.log('[%s] %s [%s°C].', this.name, this.lang.curTemp, this.cacheTemp)
+            this.log('[%s] %s [%s°C].', this.name, this.lang.curTemp, this.cacheTemp);
           }
 
           // Update the cache file with the new temperature
-          this.updateCache()
+          this.updateCache();
         }
       }
-      if (this.funcs.hasProperty(params, 'humidity')) {
-        let newHumi = parseInt(params.humidity) / 100
+      if (hasProperty(params, 'humidity')) {
+        let newHumi = parseInt(params.humidity, 10) / 100;
         if (this.humiOffsetFactor) {
-          newHumi *= this.humiOffset
+          newHumi *= this.humiOffset;
         } else {
-          newHumi += this.humiOffset
+          newHumi += this.humiOffset;
         }
-        newHumi = Math.max(Math.min(parseInt(newHumi), 100), 0)
+        newHumi = Math.max(Math.min(parseInt(newHumi, 10), 100), 0);
         if (newHumi !== this.cacheHumi) {
-          this.cacheHumi = newHumi
+          this.cacheHumi = newHumi;
           this.humiService.updateCharacteristic(
             this.hapChar.CurrentRelativeHumidity,
-            this.cacheHumi
-          )
-          this.accessory.eveService.addEntry({ humidity: this.cacheHumi })
+            this.cacheHumi,
+          );
+          this.accessory.eveService.addEntry({ humidity: this.cacheHumi });
           if (params.updateSource && this.enableLogging) {
-            this.log('[%s] %s [%s%].', this.name, this.lang.curHumi, this.cacheHumi)
+            this.log('[%s] %s [%s%].', this.name, this.lang.curHumi, this.cacheHumi);
           }
         }
       }
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, false)
+      this.platform.deviceUpdateError(this.accessory, err, false);
     }
   }
 
-  async updateCache () {
+  async updateCache() {
     // Don't continue if the storage client hasn't initialised properly
     if (!this.platform.storageClientData) {
-      return
+      return;
     }
 
     // Attempt to save the new temperature to the cache
     try {
       await this.platform.storageData.setItem(
-        this.accessory.context.eweDeviceId + '_temp',
-        this.cacheTemp
-      )
+        `${this.accessory.context.eweDeviceId}_temp`,
+        this.cacheTemp,
+      );
     } catch (err) {
       if (this.enableLogging) {
-        const eText = this.funcs.parseError(err)
-        this.log.warn('[%s] %s %s.', this.name, this.lang.storageWriteErr, eText)
+        const eText = parseError(err);
+        this.log.warn('[%s] %s %s.', this.name, this.lang.storageWriteErr, eText);
       }
     }
   }
 
-  currentState () {
-    const toReturn = {}
-    toReturn.services = ['temperature', 'humidity', 'battery']
+  currentState() {
+    const toReturn = {};
+    toReturn.services = ['temperature', 'humidity', 'battery'];
     toReturn.temperature = {
-      current: this.tempService.getCharacteristic(this.hapChar.CurrentTemperature).value
-    }
+      current: this.tempService.getCharacteristic(this.hapChar.CurrentTemperature).value,
+    };
     toReturn.humidity = {
-      current: this.humiService.getCharacteristic(this.hapChar.CurrentRelativeHumidity).value
-    }
+      current: this.humiService.getCharacteristic(this.hapChar.CurrentRelativeHumidity).value,
+    };
     toReturn.battery = {
-      current: this.battService.getCharacteristic(this.hapChar.BatteryLevel).value
-    }
-    return toReturn
+      current: this.battService.getCharacteristic(this.hapChar.BatteryLevel).value,
+    };
+    return toReturn;
   }
 }
diff --git a/lib/device/zigbee/sensor-contact.js b/lib/device/zigbee/sensor-contact.js
index dc7e62f8..95e14d01 100644
--- a/lib/device/zigbee/sensor-contact.js
+++ b/lib/device/zigbee/sensor-contact.js
@@ -1,140 +1,137 @@
-/* jshint node: true, esversion: 10, -W014, -W033 */
-/* eslint-disable new-cap */
-'use strict'
+import platformConsts from '../../utils/constants.js';
+import { hasProperty } from '../../utils/functions.js';
 
-module.exports = class deviceZBSensorContact {
-  constructor (platform, accessory) {
+export default class {
+  constructor(platform, accessory) {
     // Set up variables from the platform
-    this.eveChar = platform.eveChar
-    this.funcs = platform.funcs
-    this.hapChar = platform.api.hap.Characteristic
-    this.hapServ = platform.api.hap.Service
-    this.hapUUIDGen = platform.api.hap.uuid.generate
-    this.lang = platform.lang
-    this.log = platform.log
-    this.platform = platform
+    this.eveChar = platform.eveChar;
+    this.hapChar = platform.api.hap.Characteristic;
+    this.hapServ = platform.api.hap.Service;
+    this.lang = platform.lang;
+    this.log = platform.log;
+    this.platform = platform;
 
     // Set up variables from the accessory
-    this.name = accessory.displayName
-    this.accessory = accessory
+    this.name = accessory.displayName;
+    this.accessory = accessory;
 
     // Set up custom variables for this device type
-    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
-    this.scaleBattery = deviceConf && deviceConf.scaleBattery
-    this.lowBattThreshold =
-      deviceConf && deviceConf.lowBattThreshold
-        ? Math.min(deviceConf.lowBattThreshold, 100)
-        : platform.consts.defaultValues.lowBattThreshold
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId] || {};
+    this.scaleBattery = deviceConf.scaleBattery;
+    this.lowBattThreshold = deviceConf.lowBattThreshold
+      ? Math.min(deviceConf.lowBattThreshold, 100)
+      : platformConsts.defaultValues.lowBattThreshold;
 
     // Set the correct logging variables for this accessory
-    this.enableLogging = !platform.config.disableDeviceLogging
-    this.enableDebugLogging = platform.config.debug
-    if (deviceConf && deviceConf.overrideLogging) {
-      switch (deviceConf.overrideLogging) {
-        case 'standard':
-          this.enableLogging = true
-          this.enableDebugLogging = false
-          break
-        case 'debug':
-          this.enableLogging = true
-          this.enableDebugLogging = true
-          break
-        case 'disable':
-          this.enableLogging = false
-          this.enableDebugLogging = false
-          break
-      }
+    switch (deviceConf.overrideLogging) {
+      case 'standard':
+        this.enableLogging = true;
+        this.enableDebugLogging = false;
+        break;
+      case 'debug':
+        this.enableLogging = true;
+        this.enableDebugLogging = true;
+        break;
+      case 'disable':
+        this.enableLogging = false;
+        this.enableDebugLogging = false;
+        break;
+      default:
+        this.enableLogging = !platform.config.disableDeviceLogging;
+        this.enableDebugLogging = platform.config.debug;
+        break;
     }
 
     // Add the contact sensor service if it doesn't already exist
-    if (!(this.service = this.accessory.getService(this.hapServ.ContactSensor))) {
-      this.service = this.accessory.addService(this.hapServ.ContactSensor)
-      this.service.addCharacteristic(this.eveChar.LastActivation)
-      this.service.addCharacteristic(this.eveChar.ResetTotal)
-      this.service.addCharacteristic(this.eveChar.OpenDuration)
-      this.service.addCharacteristic(this.eveChar.ClosedDuration)
-      this.service.addCharacteristic(this.eveChar.TimesOpened)
+    this.service = this.accessory.getService(this.hapServ.ContactSensor);
+    if (!this.service) {
+      this.service = this.accessory.addService(this.hapServ.ContactSensor);
+      this.service.addCharacteristic(this.eveChar.LastActivation);
+      this.service.addCharacteristic(this.eveChar.ResetTotal);
+      this.service.addCharacteristic(this.eveChar.OpenDuration);
+      this.service.addCharacteristic(this.eveChar.ClosedDuration);
+      this.service.addCharacteristic(this.eveChar.TimesOpened);
     }
 
     // Add the set handler to the contact sensor reset total characteristic
-    this.service.getCharacteristic(this.eveChar.ResetTotal).onSet(value => {
-      this.service.updateCharacteristic(this.eveChar.TimesOpened, 0)
-    })
+    this.service.getCharacteristic(this.eveChar.ResetTotal).onSet(() => {
+      this.service.updateCharacteristic(this.eveChar.TimesOpened, 0);
+    });
 
     // Add the battery service if it doesn't already exist
-    this.battService =
-      this.accessory.getService(this.hapServ.Battery) ||
-      this.accessory.addService(this.hapServ.Battery)
+    this.battService = this.accessory.getService(this.hapServ.Battery)
+      || this.accessory.addService(this.hapServ.Battery);
 
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new platform.eveService('door', this.accessory, {
-      log: platform.config.debugFakegato ? this.log : () => {}
-    })
+      log: platform.config.debugFakegato ? this.log : () => {},
+    });
 
     // Output the customised options to the log
+    const normalLogging = this.enableLogging ? 'standard' : 'disable';
     const opts = JSON.stringify({
-      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
+      logging: this.enableDebugLogging ? 'debug' : normalLogging,
       lowBattThreshold: this.lowBattThreshold,
-      scaleBattery: this.scaleBattery
-    })
-    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
+      scaleBattery: this.scaleBattery,
+    });
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts);
   }
 
-  async externalUpdate (params) {
+  async externalUpdate(params) {
     try {
-      if (this.funcs.hasProperty(params, 'battery') && params.battery !== this.cacheBatt) {
-        this.cacheBatt = params.battery
-        this.cacheBattScaled = this.scaleBattery ? this.cacheBatt * 10 : this.cacheBatt
-        this.cacheBattScaled = Math.max(Math.min(this.cacheBattScaled, 100), 0)
-        this.battService.updateCharacteristic(this.hapChar.BatteryLevel, this.cacheBattScaled)
+      if (hasProperty(params, 'battery') && params.battery !== this.cacheBatt) {
+        this.cacheBatt = params.battery;
+        this.cacheBattScaled = this.scaleBattery ? this.cacheBatt * 10 : this.cacheBatt;
+        this.cacheBattScaled = Math.max(Math.min(this.cacheBattScaled, 100), 0);
+        this.battService.updateCharacteristic(this.hapChar.BatteryLevel, this.cacheBattScaled);
         this.battService.updateCharacteristic(
           this.hapChar.StatusLowBattery,
-          this.cacheBattScaled < this.lowBattThreshold ? 1 : 0
-        )
+          this.cacheBattScaled < this.lowBattThreshold ? 1 : 0,
+        );
         if (params.updateSource && this.enableLogging) {
-          this.log('[%s] %s [%s%].', this.name, this.lang.curBatt, this.cacheBattScaled)
+          this.log('[%s] %s [%s%].', this.name, this.lang.curBatt, this.cacheBattScaled);
         }
       }
       if (
-        this.funcs.hasProperty(params, 'lock') &&
-        [0, 1].includes(params.lock) &&
-        params.lock !== this.cacheState
+        hasProperty(params, 'lock')
+        && [0, 1].includes(params.lock)
+        && params.lock !== this.cacheState
       ) {
-        this.cacheState = params.lock
+        this.cacheState = params.lock;
         if (params.lock === 1) {
-          this.service.updateCharacteristic(this.hapChar.ContactSensorState, 1)
-          this.accessory.eveService.addEntry({ status: 1 })
-          const initialTime = this.accessory.eveService.getInitialTime()
+          this.service.updateCharacteristic(this.hapChar.ContactSensorState, 1);
+          this.accessory.eveService.addEntry({ status: 1 });
+          const initialTime = this.accessory.eveService.getInitialTime();
           this.service.updateCharacteristic(
             this.eveChar.LastActivation,
-            Math.round(new Date().valueOf() / 1000) - initialTime
-          )
-          const newTO = this.service.getCharacteristic(this.eveChar.TimesOpened).value + 1
-          this.service.updateCharacteristic(this.eveChar.TimesOpened, newTO)
+            Math.round(new Date().valueOf() / 1000) - initialTime,
+          );
+          const newTO = this.service.getCharacteristic(this.eveChar.TimesOpened).value + 1;
+          this.service.updateCharacteristic(this.eveChar.TimesOpened, newTO);
         } else {
-          this.service.updateCharacteristic(this.hapChar.ContactSensorState, 0)
-          this.accessory.eveService.addEntry({ status: 0 })
+          this.service.updateCharacteristic(this.hapChar.ContactSensorState, 0);
+          this.accessory.eveService.addEntry({ status: 0 });
         }
         if (params.updateSource && this.enableLogging) {
           this.log(
             '[%s] %s [%s].',
             this.name,
             this.lang.curState,
-            params.lock === 0 ? this.lang.contactYes : this.lang.contactNo
-          )
+            params.lock === 0 ? this.lang.contactYes : this.lang.contactNo,
+          );
         }
       }
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, false)
+      this.platform.deviceUpdateError(this.accessory, err, false);
     }
   }
 
-  currentState () {
+  currentState() {
     return {
       services: ['contact'],
       contact: {
-        state: this.service.getCharacteristic(this.hapChar.ContactSensorState).value
-      }
-    }
+        state: this.service.getCharacteristic(this.hapChar.ContactSensorState).value,
+      },
+    };
   }
 }
diff --git a/lib/device/zigbee/sensor-leak.js b/lib/device/zigbee/sensor-leak.js
index b0c96c23..00f67e02 100644
--- a/lib/device/zigbee/sensor-leak.js
+++ b/lib/device/zigbee/sensor-leak.js
@@ -1,124 +1,119 @@
-/* jshint node: true, esversion: 10, -W014, -W033 */
-/* eslint-disable new-cap */
-'use strict'
+import platformConsts from '../../utils/constants.js';
+import { hasProperty } from '../../utils/functions.js';
 
-module.exports = class deviceZBSensorLeak {
-  constructor (platform, accessory) {
+export default class {
+  constructor(platform, accessory) {
     // Set up variables from the platform
-    this.eveChar = platform.eveChar
-    this.funcs = platform.funcs
-    this.hapChar = platform.api.hap.Characteristic
-    this.hapServ = platform.api.hap.Service
-    this.lang = platform.lang
-    this.log = platform.log
-    this.platform = platform
+    this.eveChar = platform.eveChar;
+    this.hapChar = platform.api.hap.Characteristic;
+    this.hapServ = platform.api.hap.Service;
+    this.lang = platform.lang;
+    this.log = platform.log;
+    this.platform = platform;
 
     // Set up variables from the accessory
-    this.name = accessory.displayName
-    this.accessory = accessory
+    this.name = accessory.displayName;
+    this.accessory = accessory;
 
     // Set up custom variables for this device type
-    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
-    this.lowBattThreshold =
-      deviceConf && deviceConf.lowBattThreshold
-        ? Math.min(deviceConf.lowBattThreshold, 100)
-        : platform.consts.defaultValues.lowBattThreshold
-    this.sensorTimeDifference =
-      deviceConf && deviceConf.sensorTimeDifference
-        ? deviceConf.sensorTimeDifference
-        : platform.consts.defaultValues.sensorTimeDifference
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId] || {};
+    this.lowBattThreshold = deviceConf.lowBattThreshold
+      ? Math.min(deviceConf.lowBattThreshold, 100)
+      : platformConsts.defaultValues.lowBattThreshold;
+    this.sensorTimeDifference = deviceConf.sensorTimeDifference || platformConsts.defaultValues.sensorTimeDifference;
 
     // Set the correct logging variables for this accessory
-    this.enableLogging = !platform.config.disableDeviceLogging
-    this.enableDebugLogging = platform.config.debug
-    if (deviceConf && deviceConf.overrideLogging) {
-      switch (deviceConf.overrideLogging) {
-        case 'standard':
-          this.enableLogging = true
-          this.enableDebugLogging = false
-          break
-        case 'debug':
-          this.enableLogging = true
-          this.enableDebugLogging = true
-          break
-        case 'disable':
-          this.enableLogging = false
-          this.enableDebugLogging = false
-          break
-      }
+    switch (deviceConf.overrideLogging) {
+      case 'standard':
+        this.enableLogging = true;
+        this.enableDebugLogging = false;
+        break;
+      case 'debug':
+        this.enableLogging = true;
+        this.enableDebugLogging = true;
+        break;
+      case 'disable':
+        this.enableLogging = false;
+        this.enableDebugLogging = false;
+        break;
+      default:
+        this.enableLogging = !platform.config.disableDeviceLogging;
+        this.enableDebugLogging = platform.config.debug;
+        break;
     }
 
     // Add the leak sensor service if it doesn't already exist
-    if (!(this.service = this.accessory.getService(this.hapServ.LeakSensor))) {
-      this.service = this.accessory.addService(this.hapServ.LeakSensor)
-      this.service.addCharacteristic(this.eveChar.LastActivation)
+    this.service = this.accessory.getService(this.hapServ.LeakSensor);
+    if (!this.service) {
+      this.service = this.accessory.addService(this.hapServ.LeakSensor);
+      this.service.addCharacteristic(this.eveChar.LastActivation);
     }
 
     // Add the battery service if it doesn't already exist
-    this.battService =
-      this.accessory.getService(this.hapServ.Battery) ||
-      this.accessory.addService(this.hapServ.Battery)
+    this.battService = this.accessory.getService(this.hapServ.Battery)
+      || this.accessory.addService(this.hapServ.Battery);
 
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new platform.eveService('motion', this.accessory, {
-      log: platform.config.debugFakegato ? this.log : () => {}
-    })
+      log: platform.config.debugFakegato ? this.log : () => {},
+    });
 
     // Output the customised options to the log
+    const normalLogging = this.enableLogging ? 'standard' : 'disable';
     const opts = JSON.stringify({
-      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
+      logging: this.enableDebugLogging ? 'debug' : normalLogging,
       lowBattThreshold: this.lowBattThreshold,
-      sensorTimeDifference: this.sensorTimeDifference
-    })
-    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
+      sensorTimeDifference: this.sensorTimeDifference,
+    });
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts);
   }
 
-  async externalUpdate (params) {
+  async externalUpdate(params) {
     try {
-      if (this.funcs.hasProperty(params, 'battery') && params.battery !== this.cacheBatt) {
-        this.cacheBatt = params.battery
-        this.cacheBattScaled = Math.max(Math.min(this.cacheBatt, 100), 0)
-        this.battService.updateCharacteristic(this.hapChar.BatteryLevel, this.cacheBattScaled)
+      if (hasProperty(params, 'battery') && params.battery !== this.cacheBatt) {
+        this.cacheBatt = params.battery;
+        this.cacheBattScaled = Math.max(Math.min(this.cacheBatt, 100), 0);
+        this.battService.updateCharacteristic(this.hapChar.BatteryLevel, this.cacheBattScaled);
         this.battService.updateCharacteristic(
           this.hapChar.StatusLowBattery,
-          this.cacheBattScaled < this.lowBattThreshold ? 1 : 0
-        )
+          this.cacheBattScaled < this.lowBattThreshold ? 1 : 0,
+        );
         if (params.updateSource && this.enableLogging) {
-          this.log('[%s] %s [%s%].', this.name, this.lang.curBatt, this.cacheBattScaled)
+          this.log('[%s] %s [%s%].', this.name, this.lang.curBatt, this.cacheBattScaled);
         }
       }
       if (
-        this.funcs.hasProperty(params, 'water') &&
-        this.funcs.hasProperty(params, 'trigTime') &&
-        this.cacheState !== params.water
+        hasProperty(params, 'water')
+        && hasProperty(params, 'trigTime')
+        && this.cacheState !== params.water
       ) {
-        this.cacheState = params.water
-        const timeDiff = (new Date().getTime() - params.trigTime) / 1000
+        this.cacheState = params.water;
+        const timeDiff = (new Date().getTime() - params.trigTime) / 1000;
         const leakDetected = !!(
-          params.updateSource &&
-          params.water === 1 &&
-          timeDiff < this.sensorTimeDifference
-        )
-        this.service.updateCharacteristic(this.hapChar.LeakDetected, leakDetected ? 1 : 0)
+          params.updateSource
+          && params.water === 1
+          && timeDiff < this.sensorTimeDifference
+        );
+        this.service.updateCharacteristic(this.hapChar.LeakDetected, leakDetected ? 1 : 0);
         if (leakDetected) {
-          const initialTime = this.accessory.eveService.getInitialTime()
+          const initialTime = this.accessory.eveService.getInitialTime();
           this.service.updateCharacteristic(
             this.eveChar.LastActivation,
-            Math.round(new Date().valueOf() / 1000) - initialTime
-          )
+            Math.round(new Date().valueOf() / 1000) - initialTime,
+          );
         }
-        this.accessory.eveService.addEntry({ status: leakDetected ? 1 : 0 })
+        this.accessory.eveService.addEntry({ status: leakDetected ? 1 : 0 });
         if (params.updateSource && this.enableLogging) {
           this.log(
             '[%s] %s [%s].',
             this.name,
             this.lang.curState,
-            leakDetected ? this.lang.leakYes : this.lang.leakNo
-          )
+            leakDetected ? this.lang.leakYes : this.lang.leakNo,
+          );
         }
       }
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, false)
+      this.platform.deviceUpdateError(this.accessory, err, false);
     }
   }
 }
diff --git a/lib/device/zigbee/sensor-motion.js b/lib/device/zigbee/sensor-motion.js
index 74b7130f..0c66078b 100644
--- a/lib/device/zigbee/sensor-motion.js
+++ b/lib/device/zigbee/sensor-motion.js
@@ -1,124 +1,119 @@
-/* jshint node: true, esversion: 10, -W014, -W033 */
-/* eslint-disable new-cap */
-'use strict'
+import platformConsts from '../../utils/constants.js';
+import { hasProperty } from '../../utils/functions.js';
 
-module.exports = class deviceZBSensorMotion {
-  constructor (platform, accessory) {
+export default class {
+  constructor(platform, accessory) {
     // Set up variables from the platform
-    this.eveChar = platform.eveChar
-    this.funcs = platform.funcs
-    this.hapChar = platform.api.hap.Characteristic
-    this.hapServ = platform.api.hap.Service
-    this.lang = platform.lang
-    this.log = platform.log
-    this.platform = platform
+    this.eveChar = platform.eveChar;
+    this.hapChar = platform.api.hap.Characteristic;
+    this.hapServ = platform.api.hap.Service;
+    this.lang = platform.lang;
+    this.log = platform.log;
+    this.platform = platform;
 
     // Set up variables from the accessory
-    this.name = accessory.displayName
-    this.accessory = accessory
+    this.name = accessory.displayName;
+    this.accessory = accessory;
 
     // Set up custom variables for this device type
-    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
-    this.lowBattThreshold =
-      deviceConf && deviceConf.lowBattThreshold
-        ? Math.min(deviceConf.lowBattThreshold, 100)
-        : platform.consts.defaultValues.lowBattThreshold
-    this.sensorTimeDifference =
-      deviceConf && deviceConf.sensorTimeDifference
-        ? deviceConf.sensorTimeDifference
-        : platform.consts.defaultValues.sensorTimeDifference
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId] || {};
+    this.lowBattThreshold = deviceConf.lowBattThreshold
+      ? Math.min(deviceConf.lowBattThreshold, 100)
+      : platformConsts.defaultValues.lowBattThreshold;
+    this.sensorTimeDifference = deviceConf.sensorTimeDifference || platformConsts.defaultValues.sensorTimeDifference;
 
     // Set the correct logging variables for this accessory
-    this.enableLogging = !platform.config.disableDeviceLogging
-    this.enableDebugLogging = platform.config.debug
-    if (deviceConf && deviceConf.overrideLogging) {
-      switch (deviceConf.overrideLogging) {
-        case 'standard':
-          this.enableLogging = true
-          this.enableDebugLogging = false
-          break
-        case 'debug':
-          this.enableLogging = true
-          this.enableDebugLogging = true
-          break
-        case 'disable':
-          this.enableLogging = false
-          this.enableDebugLogging = false
-          break
-      }
+    switch (deviceConf.overrideLogging) {
+      case 'standard':
+        this.enableLogging = true;
+        this.enableDebugLogging = false;
+        break;
+      case 'debug':
+        this.enableLogging = true;
+        this.enableDebugLogging = true;
+        break;
+      case 'disable':
+        this.enableLogging = false;
+        this.enableDebugLogging = false;
+        break;
+      default:
+        this.enableLogging = !platform.config.disableDeviceLogging;
+        this.enableDebugLogging = platform.config.debug;
+        break;
     }
 
     // Add the motion sensor service if it doesn't already exist
-    if (!(this.service = this.accessory.getService(this.hapServ.MotionSensor))) {
-      this.service = this.accessory.addService(this.hapServ.MotionSensor)
-      this.service.addCharacteristic(this.eveChar.LastActivation)
+    this.service = this.accessory.getService(this.hapServ.MotionSensor);
+    if (!this.service) {
+      this.service = this.accessory.addService(this.hapServ.MotionSensor);
+      this.service.addCharacteristic(this.eveChar.LastActivation);
     }
 
     // Add the battery service if it doesn't already exist
-    this.battService =
-      this.accessory.getService(this.hapServ.Battery) ||
-      this.accessory.addService(this.hapServ.Battery)
+    this.battService = this.accessory.getService(this.hapServ.Battery)
+      || this.accessory.addService(this.hapServ.Battery);
 
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new platform.eveService('motion', this.accessory, {
-      log: platform.config.debugFakegato ? this.log : () => {}
-    })
+      log: platform.config.debugFakegato ? this.log : () => {},
+    });
 
     // Output the customised options to the log
+    const normalLogging = this.enableLogging ? 'standard' : 'disable';
     const opts = JSON.stringify({
-      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
+      logging: this.enableDebugLogging ? 'debug' : normalLogging,
       lowBattThreshold: this.lowBattThreshold,
-      sensorTimeDifference: this.sensorTimeDifference
-    })
-    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
+      sensorTimeDifference: this.sensorTimeDifference,
+    });
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts);
   }
 
-  async externalUpdate (params) {
+  async externalUpdate(params) {
     try {
-      if (this.funcs.hasProperty(params, 'battery') && params.battery !== this.cacheBatt) {
-        this.cacheBatt = params.battery
-        this.cacheBattScaled = Math.max(Math.min(this.cacheBatt, 100), 0)
-        this.battService.updateCharacteristic(this.hapChar.BatteryLevel, this.cacheBattScaled)
+      if (hasProperty(params, 'battery') && params.battery !== this.cacheBatt) {
+        this.cacheBatt = params.battery;
+        this.cacheBattScaled = Math.max(Math.min(this.cacheBatt, 100), 0);
+        this.battService.updateCharacteristic(this.hapChar.BatteryLevel, this.cacheBattScaled);
         this.battService.updateCharacteristic(
           this.hapChar.StatusLowBattery,
-          this.cacheBattScaled < this.lowBattThreshold ? 1 : 0
-        )
+          this.cacheBattScaled < this.lowBattThreshold ? 1 : 0,
+        );
         if (params.updateSource && this.enableLogging) {
-          this.log('[%s] %s [%s%].', this.name, this.lang.curBatt, this.cacheBattScaled)
+          this.log('[%s] %s [%s%].', this.name, this.lang.curBatt, this.cacheBattScaled);
         }
       }
       if (
-        this.funcs.hasProperty(params, 'motion') &&
-        this.funcs.hasProperty(params, 'trigTime') &&
-        params.motion !== this.cacheState
+        hasProperty(params, 'motion')
+        && hasProperty(params, 'trigTime')
+        && params.motion !== this.cacheState
       ) {
-        this.cacheState = params.motion
-        const timeDiff = (new Date().getTime() - params.trigTime) / 1000
+        this.cacheState = params.motion;
+        const timeDiff = (new Date().getTime() - params.trigTime) / 1000;
         const motionDetected = !!(
-          params.updateSource &&
-          params.motion === 1 &&
-          timeDiff < this.sensorTimeDifference
-        )
-        this.service.updateCharacteristic(this.hapChar.MotionDetected, motionDetected)
+          params.updateSource
+          && params.motion === 1
+          && timeDiff < this.sensorTimeDifference
+        );
+        this.service.updateCharacteristic(this.hapChar.MotionDetected, motionDetected);
         if (motionDetected) {
-          const initialTime = this.accessory.eveService.getInitialTime()
+          const initialTime = this.accessory.eveService.getInitialTime();
           this.service.updateCharacteristic(
             this.eveChar.LastActivation,
-            Math.round(new Date().valueOf() / 1000) - initialTime
-          )
+            Math.round(new Date().valueOf() / 1000) - initialTime,
+          );
         }
-        this.accessory.eveService.addEntry({ status: motionDetected ? 1 : 0 })
+        this.accessory.eveService.addEntry({ status: motionDetected ? 1 : 0 });
         if (params.updateSource && this.enableLogging) {
           this.log(
             '[%s] %s [%s].',
             this.name,
             this.lang.curState,
-            motionDetected ? this.lang.motionYes : this.lang.motionNo
-          )
+            motionDetected ? this.lang.motionYes : this.lang.motionNo,
+          );
         }
       }
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, false)
+      this.platform.deviceUpdateError(this.accessory, err, false);
     }
   }
 }
diff --git a/lib/device/zigbee/sensor-smoke.js b/lib/device/zigbee/sensor-smoke.js
index 27b183bc..749258e6 100644
--- a/lib/device/zigbee/sensor-smoke.js
+++ b/lib/device/zigbee/sensor-smoke.js
@@ -1,101 +1,96 @@
-/* jshint node: true, esversion: 10, -W014, -W033 */
-/* eslint-disable new-cap */
-'use strict'
+import platformConsts from '../../utils/constants.js';
+import { hasProperty } from '../../utils/functions.js';
 
-module.exports = class deviceZBSensorSmoke {
-  constructor (platform, accessory) {
+export default class {
+  constructor(platform, accessory) {
     // Set up variables from the platform
-    this.eveChar = platform.eveChar
-    this.funcs = platform.funcs
-    this.hapChar = platform.api.hap.Characteristic
-    this.hapServ = platform.api.hap.Service
-    this.hapUUIDGen = platform.api.hap.uuid.generate
-    this.lang = platform.lang
-    this.log = platform.log
-    this.platform = platform
+    this.eveChar = platform.eveChar;
+    this.hapChar = platform.api.hap.Characteristic;
+    this.hapServ = platform.api.hap.Service;
+    this.lang = platform.lang;
+    this.log = platform.log;
+    this.platform = platform;
 
     // Set up variables from the accessory
-    this.name = accessory.displayName
-    this.accessory = accessory
+    this.name = accessory.displayName;
+    this.accessory = accessory;
 
     // Set up custom variables for this device type
-    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
-    this.lowBattThreshold =
-      deviceConf && deviceConf.lowBattThreshold
-        ? Math.min(deviceConf.lowBattThreshold, 100)
-        : platform.consts.defaultValues.lowBattThreshold
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId] || {};
+    this.lowBattThreshold = deviceConf.lowBattThreshold
+      ? Math.min(deviceConf.lowBattThreshold, 100)
+      : platformConsts.defaultValues.lowBattThreshold;
 
     // Set the correct logging variables for this accessory
-    this.enableLogging = !platform.config.disableDeviceLogging
-    this.enableDebugLogging = platform.config.debug
-    if (deviceConf && deviceConf.overrideLogging) {
-      switch (deviceConf.overrideLogging) {
-        case 'standard':
-          this.enableLogging = true
-          this.enableDebugLogging = false
-          break
-        case 'debug':
-          this.enableLogging = true
-          this.enableDebugLogging = true
-          break
-        case 'disable':
-          this.enableLogging = false
-          this.enableDebugLogging = false
-          break
-      }
+    switch (deviceConf.overrideLogging) {
+      case 'standard':
+        this.enableLogging = true;
+        this.enableDebugLogging = false;
+        break;
+      case 'debug':
+        this.enableLogging = true;
+        this.enableDebugLogging = true;
+        break;
+      case 'disable':
+        this.enableLogging = false;
+        this.enableDebugLogging = false;
+        break;
+      default:
+        this.enableLogging = !platform.config.disableDeviceLogging;
+        this.enableDebugLogging = platform.config.debug;
+        break;
     }
 
     // Add the smoke sensor service if it doesn't already exist
-    this.service =
-      this.accessory.getService(this.hapServ.SmokeSensor) ||
-      this.accessory.addService(this.hapServ.SmokeSensor)
+    this.service = this.accessory.getService(this.hapServ.SmokeSensor)
+      || this.accessory.addService(this.hapServ.SmokeSensor);
 
     // Add the battery service if it doesn't already exist
-    this.battService =
-      this.accessory.getService(this.hapServ.Battery) ||
-      this.accessory.addService(this.hapServ.Battery)
+    this.battService = this.accessory.getService(this.hapServ.Battery)
+      || this.accessory.addService(this.hapServ.Battery);
 
     // Output the customised options to the log
+    const normalLogging = this.enableLogging ? 'standard' : 'disable';
     const opts = JSON.stringify({
-      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
-      lowBattThreshold: this.lowBattThreshold
-    })
-    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
+      logging: this.enableDebugLogging ? 'debug' : normalLogging,
+      lowBattThreshold: this.lowBattThreshold,
+    });
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts);
   }
 
-  async externalUpdate (params) {
+  async externalUpdate(params) {
     try {
-      if (this.funcs.hasProperty(params, 'battery') && params.battery !== this.cacheBatt) {
-        this.cacheBatt = params.battery
-        this.cacheBattScaled = this.scaleBattery ? this.cacheBatt * 10 : this.cacheBatt
-        this.cacheBattScaled = Math.max(Math.min(this.cacheBattScaled, 100), 0)
-        this.battService.updateCharacteristic(this.hapChar.BatteryLevel, this.cacheBattScaled)
+      if (hasProperty(params, 'battery') && params.battery !== this.cacheBatt) {
+        this.cacheBatt = params.battery;
+        this.cacheBattScaled = this.scaleBattery ? this.cacheBatt * 10 : this.cacheBatt;
+        this.cacheBattScaled = Math.max(Math.min(this.cacheBattScaled, 100), 0);
+        this.battService.updateCharacteristic(this.hapChar.BatteryLevel, this.cacheBattScaled);
         this.battService.updateCharacteristic(
           this.hapChar.StatusLowBattery,
-          this.cacheBattScaled < this.lowBattThreshold ? 1 : 0
-        )
+          this.cacheBattScaled < this.lowBattThreshold ? 1 : 0,
+        );
         if (params.updateSource && this.enableLogging) {
-          this.log('[%s] %s [%s%].', this.name, this.lang.curBatt, this.cacheBattScaled)
+          this.log('[%s] %s [%s%].', this.name, this.lang.curBatt, this.cacheBattScaled);
         }
       }
       if (
-        this.funcs.hasProperty(params, 'smoke') &&
-        [0, 1].includes(params.smoke) &&
-        params.smoke !== this.cacheState
+        hasProperty(params, 'smoke')
+        && [0, 1].includes(params.smoke)
+        && params.smoke !== this.cacheState
       ) {
-        this.cacheState = params.smoke
-        this.service.updateCharacteristic(this.hapChar.SmokeDetected, this.cacheState)
+        this.cacheState = params.smoke;
+        this.service.updateCharacteristic(this.hapChar.SmokeDetected, this.cacheState);
         if (params.updateSource && this.enableLogging) {
           this.log(
             '[%s] %s [%s].',
             this.name,
             this.lang.curState,
-            params.smoke === 0 ? this.lang.smokeYes : this.lang.smokeNo
-          )
+            params.smoke === 0 ? this.lang.smokeYes : this.lang.smokeNo,
+          );
         }
       }
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, false)
+      this.platform.deviceUpdateError(this.accessory, err, false);
     }
   }
 }
diff --git a/lib/device/zigbee/switch-stateless.js b/lib/device/zigbee/switch-stateless.js
index fec5b8e2..78b03296 100644
--- a/lib/device/zigbee/switch-stateless.js
+++ b/lib/device/zigbee/switch-stateless.js
@@ -1,115 +1,104 @@
-/* jshint node: true, esversion: 10, -W014, -W033 */
-/* eslint-disable new-cap */
-'use strict'
+import platformConsts from '../../utils/constants.js';
+import { hasProperty } from '../../utils/functions.js';
 
-module.exports = class deviceZBSwitchStateless {
-  constructor (platform, accessory) {
+export default class {
+  constructor(platform, accessory) {
     // Set up variables from the platform
-    this.funcs = platform.funcs
-    this.hapChar = platform.api.hap.Characteristic
-    this.hapServ = platform.api.hap.Service
-    this.lang = platform.lang
-    this.log = platform.log
-    this.platform = platform
+    this.hapChar = platform.api.hap.Characteristic;
+    this.hapServ = platform.api.hap.Service;
+    this.lang = platform.lang;
+    this.log = platform.log;
+    this.platform = platform;
 
     // Set up variables from the accessory
-    this.name = accessory.displayName
-    this.accessory = accessory
+    this.name = accessory.displayName;
+    this.accessory = accessory;
 
     // Set up custom variables for this device type
-    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId]
-    this.hideLongDouble = deviceConf && deviceConf.hideLongDouble
-    this.lowBattThreshold =
-      deviceConf && deviceConf.lowBattThreshold
-        ? Math.min(deviceConf.lowBattThreshold, 100)
-        : platform.consts.defaultValues.lowBattThreshold
-    this.sensorTimeDifference =
-      deviceConf && deviceConf.sensorTimeDifference
-        ? deviceConf.sensorTimeDifference
-        : platform.consts.defaultValues.sensorTimeDifference
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId] || {};
+    this.hideLongDouble = deviceConf.hideLongDouble;
+    this.lowBattThreshold = deviceConf.lowBattThreshold
+      ? Math.min(deviceConf.lowBattThreshold, 100)
+      : platformConsts.defaultValues.lowBattThreshold;
+    this.sensorTimeDifference = deviceConf.sensorTimeDifference || platformConsts.defaultValues.sensorTimeDifference;
 
     // Set the correct logging variables for this accessory
-    this.enableLogging = !platform.config.disableDeviceLogging
-    this.enableDebugLogging = platform.config.debug
-    if (deviceConf && deviceConf.overrideLogging) {
-      switch (deviceConf.overrideLogging) {
-        case 'standard':
-          this.enableLogging = true
-          this.enableDebugLogging = false
-          break
-        case 'debug':
-          this.enableLogging = true
-          this.enableDebugLogging = true
-          break
-        case 'disable':
-          this.enableLogging = false
-          this.enableDebugLogging = false
-          break
-      }
+    switch (deviceConf.overrideLogging) {
+      case 'standard':
+        this.enableLogging = true;
+        this.enableDebugLogging = false;
+        break;
+      case 'debug':
+        this.enableLogging = true;
+        this.enableDebugLogging = true;
+        break;
+      case 'disable':
+        this.enableLogging = false;
+        this.enableDebugLogging = false;
+        break;
+      default:
+        this.enableLogging = !platform.config.disableDeviceLogging;
+        this.enableDebugLogging = platform.config.debug;
+        break;
     }
 
     // Add the stateless switch service if it doesn't already exist
-    this.service =
-      this.accessory.getService(this.hapServ.StatelessProgrammableSwitch) ||
-      this.accessory.addService(this.hapServ.StatelessProgrammableSwitch)
+    this.service = this.accessory.getService(this.hapServ.StatelessProgrammableSwitch)
+      || this.accessory.addService(this.hapServ.StatelessProgrammableSwitch);
 
     // Hide the double and long press options if the user wants
     if (this.hideLongDouble) {
       this.service.getCharacteristic(this.hapChar.ProgrammableSwitchEvent).setProps({
-        validValues: [0]
-      })
+        validValues: [0],
+      });
     }
 
     // Add the battery service if it doesn't already exist
-    this.battService =
-      this.accessory.getService(this.hapServ.Battery) ||
-      this.accessory.addService(this.hapServ.Battery)
+    this.battService = this.accessory.getService(this.hapServ.Battery)
+      || this.accessory.addService(this.hapServ.Battery);
 
     // Output the customised options to the log
+    const normalLogging = this.enableLogging ? 'standard' : 'disable';
     const opts = JSON.stringify({
       hideLongDouble: this.hideLongDouble,
-      logging: this.enableDebugLogging ? 'debug' : this.enableLogging ? 'standard' : 'disable',
+      logging: this.enableDebugLogging ? 'debug' : normalLogging,
       lowBattThreshold: this.lowBattThreshold,
-      sensorTimeDifference: this.sensorTimeDifference
-    })
-    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
+      sensorTimeDifference: this.sensorTimeDifference,
+    });
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts);
   }
 
-  async externalUpdate (params) {
+  async externalUpdate(params) {
     try {
-      if (this.funcs.hasProperty(params, 'battery') && params.battery !== this.cacheBatt) {
-        this.cacheBatt = params.battery
-        this.cacheBattScaled = Math.max(Math.min(this.cacheBatt, 100), 0)
-        this.battService.updateCharacteristic(this.hapChar.BatteryLevel, this.cacheBattScaled)
+      if (hasProperty(params, 'battery') && params.battery !== this.cacheBatt) {
+        this.cacheBatt = params.battery;
+        this.cacheBattScaled = Math.max(Math.min(this.cacheBatt, 100), 0);
+        this.battService.updateCharacteristic(this.hapChar.BatteryLevel, this.cacheBattScaled);
         this.battService.updateCharacteristic(
           this.hapChar.StatusLowBattery,
-          this.cacheBattScaled < this.lowBattThreshold ? 1 : 0
-        )
+          this.cacheBattScaled < this.lowBattThreshold ? 1 : 0,
+        );
         if (params.updateSource && this.enableLogging) {
-          this.log('[%s] %s [%s%].', this.name, this.lang.curBatt, this.cacheBattScaled)
+          this.log('[%s] %s [%s%].', this.name, this.lang.curBatt, this.cacheBattScaled);
         }
       }
       if (
-        this.funcs.hasProperty(params, 'key') &&
-        [0, 1, 2].includes(params.key) &&
-        params.trigTime
+        hasProperty(params, 'key')
+        && [0, 1, 2].includes(params.key)
+        && params.trigTime
       ) {
-        const timeDiff = (new Date().getTime() - params.trigTime) / 1000
+        const timeDiff = (new Date().getTime() - params.trigTime) / 1000;
         if (timeDiff < this.sensorTimeDifference) {
-          this.service.updateCharacteristic(this.hapChar.ProgrammableSwitchEvent, params.key)
+          this.service.updateCharacteristic(this.hapChar.ProgrammableSwitchEvent, params.key);
           if (params.updateSource && this.enableLogging) {
-            const textLabel =
-              params.key === 0
-                ? this.lang.buttonSingle
-                : params.key === 1
-                ? this.lang.buttonDouble
-                : this.lang.buttonLong
-            this.log('[%s] %s [%s].', this.name, this.lang.curState, textLabel)
+            const doubleLong = params.key === 1 ? this.lang.buttonDouble : this.lang.buttonLong;
+            const textLabel = params.key === 0 ? this.lang.buttonSingle : doubleLong;
+            this.log('[%s] %s [%s].', this.name, this.lang.curState, textLabel);
           }
         }
       }
     } catch (err) {
-      this.platform.deviceUpdateError(this.accessory, err, false)
+      this.platform.deviceUpdateError(this.accessory, err, false);
     }
   }
 }
diff --git a/lib/fakegato/fakegato-history.js b/lib/fakegato/fakegato-history.js
index 794b61fe..819472a1 100644
--- a/lib/fakegato/fakegato-history.js
+++ b/lib/fakegato/fakegato-history.js
@@ -1,534 +1,520 @@
-/* jshint node: true, esversion: 10, -W014, -W033 */
-/* eslint-disable new-cap */
-'use strict'
-
-const Format = require('util').format
-const FakeGatoTimer = require('./fakegato-timer').FakeGatoTimer
-const FakeGatoStorage = require('./fakegato-storage').FakeGatoStorage
-const _EPOCH = 978307200
-let Characteristic, Service
-
-module.exports = function (homebridge) {
-  Characteristic = homebridge.hap.Characteristic
-  Service = homebridge.hap.Service
-
-  const hexToBase64 = val => {
-    return Buffer.from(('' + val).replace(/[^0-9A-F]/gi, ''), 'hex').toString('base64')
-  }
+/* eslint-disable */
+import { format as Format } from 'util';
+import FakeGatoStorage from './fakegato-storage.js';
+import FakeGatoTimer from './fakegato-timer.js';
+import { toLongFormUUID, toShortFormUUID } from './uuid.js';
+
+const _EPOCH = 978307200;
+let Characteristic;
+let Service;
+
+export default function (homebridge) {
+  Characteristic = homebridge.hap.Characteristic;
+  Service = homebridge.hap.Service;
 
-  const base64ToHex = val => {
+  const hexToBase64 = (val) => Buffer.from((`${val}`).replace(/[^\dA-F]/gi, ''), 'hex').toString('base64');
+
+  const base64ToHex = (val) => {
     if (!val) {
-      return val
+      return val;
     }
-    return Buffer.from(val, 'base64').toString('hex')
-  }
+    return Buffer.from(val, 'base64').toString('hex');
+  };
 
-  const swap16 = val => {
-    return ((val & 0xff) << 8) | ((val >>> 8) & 0xff)
-  }
+  const swap16 = (val) => ((val & 0xff) << 8) | ((val >>> 8) & 0xff);
 
-  const swap32 = val => {
-    return (
-      ((val & 0xff) << 24) | ((val & 0xff00) << 8) | ((val >>> 8) & 0xff00) | ((val >>> 24) & 0xff)
-    )
-  }
+  const swap32 = (val) => (
+    ((val & 0xff) << 24) | ((val & 0xff00) << 8) | ((val >>> 8) & 0xff00) | ((val >>> 24) & 0xff)
+  );
 
   const numToHex = (val, len) => {
-    let s = Number(val >>> 0).toString(16)
+    let s = Number(val >>> 0).toString(16);
     if (s.length % 2 !== 0) {
-      s = '0' + s
+      s = `0${s}`;
     }
     if (len) {
-      return ('0000000000000' + s).slice(-1 * len)
+      return (`0000000000000${s}`).slice(-1 * len);
     }
-    return s
-  }
+    return s;
+  };
 
-  const ucfirst = val => {
-    return val.charAt(0).toUpperCase() + val.substr(1)
-  }
+  const ucfirst = (val) => val.charAt(0).toUpperCase() + val.substr(1);
 
   const precisionRound = (number, precision) => {
-    const factor = Math.pow(10, precision)
-    return Math.round(number * factor) / factor
-  }
+    const factor = 10 ** precision;
+    return Math.round(number * factor) / factor;
+  };
 
   class S2R1Characteristic extends Characteristic {
-    constructor () {
-      super('S2R1', S2R1Characteristic.UUID)
+    constructor() {
+      super('S2R1', S2R1Characteristic.UUID);
       this.setProps({
         format: Characteristic.Formats.DATA,
-        perms: [Characteristic.Perms.READ, Characteristic.Perms.NOTIFY, Characteristic.Perms.HIDDEN]
-      })
+        perms: [Characteristic.Perms.READ, Characteristic.Perms.NOTIFY, Characteristic.Perms.HIDDEN],
+      });
     }
   }
 
-  S2R1Characteristic.UUID = 'E863F116-079E-48FF-8F27-9C2605A29F52'
+  S2R1Characteristic.UUID = 'E863F116-079E-48FF-8F27-9C2605A29F52';
 
   class S2R2Characteristic extends Characteristic {
-    constructor () {
-      super('S2R2', S2R2Characteristic.UUID)
+    constructor() {
+      super('S2R2', S2R2Characteristic.UUID);
       this.setProps({
         format: Characteristic.Formats.DATA,
-        perms: [Characteristic.Perms.READ, Characteristic.Perms.NOTIFY, Characteristic.Perms.HIDDEN]
-      })
+        perms: [Characteristic.Perms.READ, Characteristic.Perms.NOTIFY, Characteristic.Perms.HIDDEN],
+      });
     }
   }
 
-  S2R2Characteristic.UUID = 'E863F117-079E-48FF-8F27-9C2605A29F52'
+  S2R2Characteristic.UUID = 'E863F117-079E-48FF-8F27-9C2605A29F52';
 
   class S2W1Characteristic extends Characteristic {
-    constructor () {
-      super('S2W1', S2W1Characteristic.UUID)
+    constructor() {
+      super('S2W1', S2W1Characteristic.UUID);
       this.setProps({
         format: Characteristic.Formats.DATA,
-        perms: [Characteristic.Perms.WRITE, Characteristic.Perms.HIDDEN]
-      })
+        perms: [Characteristic.Perms.WRITE, Characteristic.Perms.HIDDEN],
+      });
     }
   }
 
-  S2W1Characteristic.UUID = 'E863F11C-079E-48FF-8F27-9C2605A29F52'
+  S2W1Characteristic.UUID = 'E863F11C-079E-48FF-8F27-9C2605A29F52';
 
   class S2W2Characteristic extends Characteristic {
-    constructor () {
-      super('S2W2', S2W2Characteristic.UUID)
+    constructor() {
+      super('S2W2', S2W2Characteristic.UUID);
       this.setProps({
         format: Characteristic.Formats.DATA,
-        perms: [Characteristic.Perms.WRITE, Characteristic.Perms.HIDDEN]
-      })
+        perms: [Characteristic.Perms.WRITE, Characteristic.Perms.HIDDEN],
+      });
     }
   }
 
-  S2W2Characteristic.UUID = 'E863F121-079E-48FF-8F27-9C2605A29F52'
+  S2W2Characteristic.UUID = 'E863F121-079E-48FF-8F27-9C2605A29F52';
 
   class FakeGatoHistoryService extends Service {
-    constructor (displayName, subtype) {
-      super(displayName, FakeGatoHistoryService.UUID, subtype)
-      this.addCharacteristic(S2R1Characteristic)
-      this.addCharacteristic(S2R2Characteristic)
-      this.addCharacteristic(S2W1Characteristic)
-      this.addCharacteristic(S2W2Characteristic)
+    constructor(displayName, subtype) {
+      super(displayName, FakeGatoHistoryService.UUID, subtype);
+      this.addCharacteristic(S2R1Characteristic);
+      this.addCharacteristic(S2R2Characteristic);
+      this.addCharacteristic(S2W1Characteristic);
+      this.addCharacteristic(S2W2Characteristic);
     }
   }
 
-  FakeGatoHistoryService.UUID = 'E863F007-079E-48FF-8F27-9C2605A29F52'
+  FakeGatoHistoryService.UUID = 'E863F007-079E-48FF-8F27-9C2605A29F52';
 
-  let thisAccessory = {}
+  let thisAccessory = {};
 
   class FakeGatoHistory extends Service {
-    constructor (accessoryType, accessory, optionalParams) {
-      super(accessory.displayName + ' History', FakeGatoHistoryService.UUID)
-      thisAccessory = accessory
-      this.accessoryName = thisAccessory.displayName
-      this.signatures = []
-      this.uuid = require('./uuid.js')
-      this.path = homebridge.user.storagePath() + '/persist/'
-      this.minutes = optionalParams.minutes || 10
-      this.log = optionalParams.log
+    constructor(accessoryType, accessory, optionalParams) {
+      super(`${accessory.displayName} History`, FakeGatoHistoryService.UUID);
+      thisAccessory = accessory;
+      this.accessoryName = thisAccessory.displayName;
+      this.signatures = [];
+      this.path = `${homebridge.user.storagePath()}/persist/`;
+      this.minutes = optionalParams.minutes || 10;
+      this.log = optionalParams.log;
       if (!this.log) {
-        this.log = () => {}
+        this.log = () => {};
       }
       if (homebridge.globalFakeGatoTimer === undefined) {
         homebridge.globalFakeGatoTimer = new FakeGatoTimer({
           minutes: this.minutes,
-          log: this.log
-        })
+          log: this.log,
+        });
       }
-      this.loaded = false
+      this.loaded = false;
       if (homebridge.globalFakeGatoStorage === undefined) {
         homebridge.globalFakeGatoStorage = new FakeGatoStorage({
-          log: this.log
-        })
+          log: this.log,
+        });
       }
       homebridge.globalFakeGatoStorage.addWriter(this, {
         path: this.path,
         onReady: function () {
           this.load(
-            function (err, loaded) {
+            (err, loaded) => {
               if (err) {
-                this.log('FGH load error: %s.', err)
+                this.log('FGH load error: %s.', err);
               } else {
                 if (loaded) {
-                  this.log('FGH loaded from storage.')
+                  this.log('FGH loaded from storage.');
                 }
-                this.loaded = true
+                this.loaded = true;
               }
-            }.bind(this)
-          )
-        }.bind(this)
-      })
+            },
+          );
+        }.bind(this),
+      });
       switch (accessoryType) {
         case 'weather':
-          this.accessoryType116 = '03 0102 0202 0302'
-          this.accessoryType117 = '07'
-          homebridge.globalFakeGatoTimer.subscribe(this, this.calculateAverage)
-          break
+          this.accessoryType116 = '03 0102 0202 0302';
+          this.accessoryType117 = '07';
+          homebridge.globalFakeGatoTimer.subscribe(this, this.calculateAverage);
+          break;
         case 'energy':
-          this.accessoryType116 = '04 0102 0202 0702 0f03'
-          this.accessoryType117 = '1f'
-          homebridge.globalFakeGatoTimer.subscribe(this, this.calculateAverage)
-          break
+          this.accessoryType116 = '04 0102 0202 0702 0f03';
+          this.accessoryType117 = '1f';
+          homebridge.globalFakeGatoTimer.subscribe(this, this.calculateAverage);
+          break;
         case 'room':
-          this.accessoryType116 = '04 0102 0202 0402 0f03'
-          this.accessoryType117 = '0f'
-          homebridge.globalFakeGatoTimer.subscribe(this, this.calculateAverage)
-          break
+          this.accessoryType116 = '04 0102 0202 0402 0f03';
+          this.accessoryType117 = '0f';
+          homebridge.globalFakeGatoTimer.subscribe(this, this.calculateAverage);
+          break;
         case 'door':
-          this.accessoryType116 = '01 0601'
-          this.accessoryType117 = '01'
+          this.accessoryType116 = '01 0601';
+          this.accessoryType117 = '01';
           homebridge.globalFakeGatoTimer.subscribe(this, function (params) {
-            const backLog = params.backLog || []
-            const immediate = params.immediate
-            const fakegato = this.service
-            const actualEntry = {}
+            const backLog = params.backLog || [];
+            const { immediate } = params;
+            const fakegato = this.service;
+            const actualEntry = {};
             if (backLog.length) {
               if (immediate) {
-                actualEntry.time = backLog[0].time
-                actualEntry.status = backLog[0].status
+                actualEntry.time = backLog[0].time;
+                actualEntry.status = backLog[0].status;
               } else {
-                actualEntry.time = Math.round(new Date().valueOf() / 1000)
-                actualEntry.status = backLog[0].status
+                actualEntry.time = Math.round(new Date().valueOf() / 1000);
+                actualEntry.status = backLog[0].status;
               }
               fakegato.log(
                 '[%s] FG timer: callbackDoor [%s] immediate [%s].',
                 fakegato.accessoryName,
                 actualEntry,
-                immediate
-              )
-              fakegato._addEntry(actualEntry)
+                immediate,
+              );
+              fakegato._addEntry(actualEntry);
             }
-          })
-          break
+          });
+          break;
         case 'motion':
-          this.accessoryType116 = '02 1301 1c01'
-          this.accessoryType117 = '02'
+          this.accessoryType116 = '02 1301 1c01';
+          this.accessoryType117 = '02';
           homebridge.globalFakeGatoTimer.subscribe(this, function (params) {
-            const backLog = params.backLog || []
-            const immediate = params.immediate
-            const fakegato = this.service
-            const actualEntry = {}
+            const backLog = params.backLog || [];
+            const { immediate } = params;
+            const fakegato = this.service;
+            const actualEntry = {};
             if (backLog.length) {
               if (immediate) {
-                actualEntry.time = backLog[0].time
-                actualEntry.status = backLog[0].status
+                actualEntry.time = backLog[0].time;
+                actualEntry.status = backLog[0].status;
               } else {
-                actualEntry.time = Math.round(new Date().valueOf() / 1000)
-                actualEntry.status = backLog[0].status
+                actualEntry.time = Math.round(new Date().valueOf() / 1000);
+                actualEntry.status = backLog[0].status;
               }
               fakegato.log(
                 '[%s] FG timer: callbackMotion [%s] immediate [%s].',
                 fakegato.accessoryName,
                 actualEntry,
-                immediate
-              )
-              fakegato._addEntry(actualEntry)
+                immediate,
+              );
+              fakegato._addEntry(actualEntry);
             }
-          })
-          break
+          });
+          break;
         case 'switch':
-          this.accessoryType116 = '01 0e01'
-          this.accessoryType117 = '01'
+          this.accessoryType116 = '01 0e01';
+          this.accessoryType117 = '01';
           homebridge.globalFakeGatoTimer.subscribe(this, function (params) {
-            const backLog = params.backLog || []
-            const immediate = params.immediate
-            const fakegato = this.service
-            const actualEntry = {}
+            const backLog = params.backLog || [];
+            const { immediate } = params;
+            const fakegato = this.service;
+            const actualEntry = {};
             if (backLog.length) {
               if (immediate) {
-                actualEntry.time = backLog[0].time
-                actualEntry.status = backLog[0].status
+                actualEntry.time = backLog[0].time;
+                actualEntry.status = backLog[0].status;
               } else {
-                actualEntry.time = Math.round(new Date().valueOf() / 1000)
-                actualEntry.status = backLog[0].status
+                actualEntry.time = Math.round(new Date().valueOf() / 1000);
+                actualEntry.status = backLog[0].status;
               }
               fakegato.log(
                 '[%s] FG timer: callbackSwitch [%s] immediate [%s].',
                 fakegato.accessoryName,
                 actualEntry,
-                immediate
-              )
-              fakegato._addEntry(actualEntry)
+                immediate,
+              );
+              fakegato._addEntry(actualEntry);
             }
-          })
-          break
+          });
+          break;
         case 'custom':
           thisAccessory.services.forEach((service, i) => {
             service.characteristics.forEach((characteristic, i) => {
-              switch (this.uuid.toLongFormUUID(characteristic.UUID)) {
+              switch (toLongFormUUID(characteristic.UUID)) {
                 case Characteristic.CurrentTemperature.UUID:
                   this.signatures.push({
                     signature: '0102',
                     length: 4,
-                    uuid: this.uuid.toShortFormUUID(characteristic.UUID),
+                    uuid: toShortFormUUID(characteristic.UUID),
                     factor: 100,
-                    entry: 'temp'
-                  })
-                  break
+                    entry: 'temp',
+                  });
+                  break;
                 case Characteristic.CurrentRelativeHumidity.UUID:
                   this.signatures.push({
                     signature: '0202',
                     length: 4,
-                    uuid: this.uuid.toShortFormUUID(characteristic.UUID),
+                    uuid: toShortFormUUID(characteristic.UUID),
                     factor: 100,
-                    entry: 'humidity'
-                  })
-                  break
+                    entry: 'humidity',
+                  });
+                  break;
                 case 'E863F10F-079E-48FF-8F27-9C2605A29F52':
                   this.signatures.push({
                     signature: '0302',
                     length: 4,
-                    uuid: this.uuid.toShortFormUUID(characteristic.UUID),
+                    uuid: toShortFormUUID(characteristic.UUID),
                     factor: 10,
-                    entry: 'pressure'
-                  })
-                  break
+                    entry: 'pressure',
+                  });
+                  break;
                 case 'E863F10B-079E-48FF-8F27-9C2605A29F52':
                   this.signatures.push({
                     signature: '0702',
                     length: 4,
-                    uuid: this.uuid.toShortFormUUID(characteristic.UUID),
+                    uuid: toShortFormUUID(characteristic.UUID),
                     factor: 10,
-                    entry: 'ppm'
-                  })
-                  break
+                    entry: 'ppm',
+                  });
+                  break;
                 case Characteristic.ContactSensorState.UUID:
                   this.signatures.push({
                     signature: '0601',
                     length: 2,
-                    uuid: this.uuid.toShortFormUUID(characteristic.UUID),
+                    uuid: toShortFormUUID(characteristic.UUID),
                     factor: 1,
-                    entry: 'contact'
-                  })
-                  break
+                    entry: 'contact',
+                  });
+                  break;
                 case 'E863F10D-079E-48FF-8F27-9C2605A29F52':
                   this.signatures.push({
                     signature: '0702',
                     length: 4,
-                    uuid: this.uuid.toShortFormUUID(characteristic.UUID),
+                    uuid: toShortFormUUID(characteristic.UUID),
                     factor: 10,
-                    entry: 'power'
-                  })
-                  break
+                    entry: 'power',
+                  });
+                  break;
                 case Characteristic.On.UUID:
                   this.signatures.push({
                     signature: '0e01',
                     length: 2,
-                    uuid: this.uuid.toShortFormUUID(characteristic.UUID),
+                    uuid: toShortFormUUID(characteristic.UUID),
                     factor: 1,
-                    entry: 'status'
-                  })
-                  break
+                    entry: 'status',
+                  });
+                  break;
                 case Characteristic.MotionDetected.UUID:
                   this.signatures.push({
                     signature: '1c01',
                     length: 2,
-                    uuid: this.uuid.toShortFormUUID(characteristic.UUID),
+                    uuid: toShortFormUUID(characteristic.UUID),
                     factor: 1,
-                    entry: 'motion'
-                  })
-                  break
+                    entry: 'motion',
+                  });
+                  break;
               }
-            })
-          })
-          this.accessoryType116 =
-            ' 0' +
-            this.signatures.length.toString() +
-            ' ' +
+            });
+          });
+          this.accessoryType116 = ` 0${
+            this.signatures.length.toString()
+          } ${
             this.signatures
-              .sort((a, b) => {
-                return a.signature > b.signature ? 1 : -1
-              })
-              .map(a => a.signature)
-              .join(' ') +
-            ' '
-          homebridge.globalFakeGatoTimer.subscribe(this, this.calculateAverage)
-          break
+              .sort((a, b) => (a.signature > b.signature ? 1 : -1))
+              .map((a) => a.signature)
+              .join(' ')
+          } `;
+          homebridge.globalFakeGatoTimer.subscribe(this, this.calculateAverage);
+          break;
         case 'aqua':
-          this.accessoryType116 = '03 1f01 2a08 2302'
-          this.accessoryType117 = '05'
-          this.accessoryType117bis = '07'
-          break
+          this.accessoryType116 = '03 1f01 2a08 2302';
+          this.accessoryType117 = '05';
+          this.accessoryType117bis = '07';
+          break;
         case 'thermo':
-          this.accessoryType116 = '05 0102 1102 1001 1201 1d01'
-          this.accessoryType117 = '1f'
-          break
+          this.accessoryType116 = '05 0102 1102 1001 1201 1d01';
+          this.accessoryType117 = '1f';
+          break;
       }
-      this.accessoryType = accessoryType
-      this.firstEntry = 0
-      this.lastEntry = 0
-      this.history = ['noValue']
-      this.memorySize = 4032
-      this.usedMemory = 0
-      this.currentEntry = 1
-      this.transfer = false
-      this.setTime = true
-      this.restarted = true
-      this.refTime = 0
-      this.memAddress = 0
-      this.dataStream = ''
-      this.saving = false
-      this.registerEvents()
+      this.accessoryType = accessoryType;
+      this.firstEntry = 0;
+      this.lastEntry = 0;
+      this.history = ['noValue'];
+      this.memorySize = 4032;
+      this.usedMemory = 0;
+      this.currentEntry = 1;
+      this.transfer = false;
+      this.setTime = true;
+      this.restarted = true;
+      this.refTime = 0;
+      this.memAddress = 0;
+      this.dataStream = '';
+      this.saving = false;
+      this.registerEvents();
     }
 
-    calculateAverage (params) {
-      const backLog = params.backLog || []
-      const previousAvrg = params.previousAvrg || {}
-      const timer = params.timer
-      const fakegato = this.service
+    calculateAverage(params) {
+      const backLog = params.backLog || [];
+      const previousAvrg = params.previousAvrg || {};
+      const { timer } = params;
+      const fakegato = this.service;
       const calc = {
         sum: {},
         num: {},
-        avrg: {}
-      }
+        avrg: {},
+      };
       for (const h in backLog) {
         if (Object.prototype.hasOwnProperty.call(backLog, h)) {
           for (const key in backLog[h]) {
             if (Object.prototype.hasOwnProperty.call(backLog[h], key) && key !== 'time') {
               if (!calc.sum[key]) {
-                calc.sum[key] = 0
+                calc.sum[key] = 0;
               }
               if (!calc.num[key]) {
-                calc.num[key] = 0
+                calc.num[key] = 0;
               }
-              calc.sum[key] += backLog[h][key]
-              calc.num[key]++
-              calc.avrg[key] = precisionRound(calc.sum[key] / calc.num[key], 2)
+              calc.sum[key] += backLog[h][key];
+              calc.num[key]++;
+              calc.avrg[key] = precisionRound(calc.sum[key] / calc.num[key], 2);
             }
           }
         }
       }
-      calc.avrg.time = Math.round(new Date().valueOf() / 1000)
+      calc.avrg.time = Math.round(new Date().valueOf() / 1000);
 
       for (const key in previousAvrg) {
         if (Object.prototype.hasOwnProperty.call(previousAvrg, key) && key !== 'time') {
           if (!backLog.length || calc.avrg[key] === undefined) {
-            calc.avrg[key] = previousAvrg[key]
+            calc.avrg[key] = previousAvrg[key];
           }
         }
       }
 
       if (Object.keys(calc.avrg).length > 1) {
-        fakegato._addEntry(calc.avrg)
-        timer.emptyData(fakegato)
+        fakegato._addEntry(calc.avrg);
+        timer.emptyData(fakegato);
       }
-      return calc.avrg
+      return calc.avrg;
     }
 
-    registerEvents () {
-      this.log('[%s] FGH registering events.', thisAccessory.displayName)
-      this.service = thisAccessory.getService(FakeGatoHistoryService)
+    registerEvents() {
+      this.log('[%s] FGH registering events.', thisAccessory.displayName);
+      this.service = thisAccessory.getService(FakeGatoHistoryService);
       if (this.service === undefined) {
         this.service = thisAccessory.addService(
           FakeGatoHistoryService,
-          ucfirst(thisAccessory.displayName) + ' History',
-          this.accessoryType
-        )
+          `${ucfirst(thisAccessory.displayName)} History`,
+          this.accessoryType,
+        );
       }
-      this.service.getCharacteristic(S2R2Characteristic).onGet(() => {
-        return this.getCurrentS2R2()
-      })
-      this.service.getCharacteristic(S2W1Characteristic).onSet(value => {
-        this.setCurrentS2W1(value)
-      })
-      this.service.getCharacteristic(S2W2Characteristic).onSet(value => {
-        this.setCurrentS2W2(value)
-      })
+      this.service.getCharacteristic(S2R2Characteristic).onGet(() => this.getCurrentS2R2());
+      this.service.getCharacteristic(S2W1Characteristic).onSet((value) => {
+        this.setCurrentS2W1(value);
+      });
+      this.service.getCharacteristic(S2W2Characteristic).onSet((value) => {
+        this.setCurrentS2W2(value);
+      });
     }
 
-    sendHistory (address) {
+    sendHistory(address) {
       if (address !== 0) {
-        this.currentEntry = address
+        this.currentEntry = address;
       } else {
-        this.currentEntry = 1
+        this.currentEntry = 1;
       }
-      this.transfer = true
+      this.transfer = true;
     }
 
-    addEntry (entry) {
-      entry.time = Math.round(new Date().valueOf() / 1000)
+    addEntry(entry) {
+      entry.time = Math.round(new Date().valueOf() / 1000);
       switch (this.accessoryType) {
         case 'door':
         case 'motion':
         case 'switch':
           homebridge.globalFakeGatoTimer.addData({
-            entry: entry,
+            entry,
             service: this,
-            immediateCallback: true
-          })
-          break
+            immediateCallback: true,
+          });
+          break;
         case 'aqua':
           this._addEntry({
             time: entry.time,
             status: entry.status,
-            waterAmount: entry.waterAmount
-          })
-          break
+            waterAmount: entry.waterAmount,
+          });
+          break;
         case 'weather':
           homebridge.globalFakeGatoTimer.addData({
-            entry: entry,
-            service: this
-          })
-          break
+            entry,
+            service: this,
+          });
+          break;
         case 'room':
           homebridge.globalFakeGatoTimer.addData({
-            entry: entry,
-            service: this
-          })
-          break
+            entry,
+            service: this,
+          });
+          break;
         case 'energy':
           homebridge.globalFakeGatoTimer.addData({
-            entry: entry,
-            service: this
-          })
-          break
+            entry,
+            service: this,
+          });
+          break;
         case 'custom':
           if ('power' in entry || 'temp' in entry || 'humidity' in entry) {
             homebridge.globalFakeGatoTimer.addData({
-              entry: entry,
-              service: this
-            })
+              entry,
+              service: this,
+            });
           } else {
-            this._addEntry(entry)
+            this._addEntry(entry);
           }
-          break
+          break;
         default:
-          this._addEntry(entry)
-          break
+          this._addEntry(entry);
+          break;
       }
     }
 
-    _addEntry (entry) {
+    _addEntry(entry) {
       if (this.loaded) {
-        const entry2address = val => val % this.memorySize
-        let val
+        const entry2address = (val) => val % this.memorySize;
+        let val;
         if (this.usedMemory < this.memorySize) {
-          this.usedMemory++
-          this.firstEntry = 0
-          this.lastEntry = this.usedMemory
+          this.usedMemory++;
+          this.firstEntry = 0;
+          this.lastEntry = this.usedMemory;
         } else {
-          this.firstEntry++
-          this.lastEntry = this.firstEntry + this.usedMemory
+          this.firstEntry++;
+          this.lastEntry = this.firstEntry + this.usedMemory;
           if (this.restarted) {
             this.history[entry2address(this.lastEntry)] = {
               time: entry.time,
-              setRefTime: 1
-            }
-            this.firstEntry++
-            this.lastEntry = this.firstEntry + this.usedMemory
-            this.restarted = false
+              setRefTime: 1,
+            };
+            this.firstEntry++;
+            this.lastEntry = this.firstEntry + this.usedMemory;
+            this.restarted = false;
           }
         }
         if (this.refTime === 0) {
-          this.refTime = entry.time - _EPOCH
+          this.refTime = entry.time - _EPOCH;
           this.history[this.lastEntry] = {
             time: entry.time,
-            setRefTime: 1
-          }
-          this.initialTime = entry.time
-          this.lastEntry++
-          this.usedMemory++
+            setRefTime: 1,
+          };
+          this.initialTime = entry.time;
+          this.lastEntry++;
+          this.usedMemory++;
         }
-        this.history[entry2address(this.lastEntry)] = entry
+        this.history[entry2address(this.lastEntry)] = entry;
         if (this.usedMemory < this.memorySize) {
           val = Format(
             '%s00000000%s%s%s%s%s000000000101',
@@ -537,8 +523,8 @@ module.exports = function (homebridge) {
             this.accessoryType116,
             numToHex(swap16(this.usedMemory + 1), 4),
             numToHex(swap16(this.memorySize), 4),
-            numToHex(swap32(this.firstEntry), 8)
-          )
+            numToHex(swap32(this.firstEntry), 8),
+          );
         } else {
           val = Format(
             '%s00000000%s%s%s%s%s000000000101',
@@ -547,41 +533,41 @@ module.exports = function (homebridge) {
             this.accessoryType116,
             numToHex(swap16(this.usedMemory), 4),
             numToHex(swap16(this.memorySize), 4),
-            numToHex(swap32(this.firstEntry + 1), 8)
-          )
+            numToHex(swap32(this.firstEntry + 1), 8),
+          );
         }
-        this.service.getCharacteristic(S2R1Characteristic).setValue(hexToBase64(val))
+        this.service.getCharacteristic(S2R1Characteristic).setValue(hexToBase64(val));
         this.log(
           '[%s] FGH first entry [%s] last entry [%s] used memory [%s] 116 [%s].',
           this.accessoryName,
           this.firstEntry.toString(16),
           this.lastEntry.toString(16),
           this.usedMemory.toString(16),
-          val
-        )
-        this.save()
+          val,
+        );
+        this.save();
       } else {
-        setTimeout(() => this._addEntry(entry), 100)
+        setTimeout(() => this._addEntry(entry), 100);
       }
     }
 
-    getInitialTime () {
-      return this.initialTime || 0
+    getInitialTime() {
+      return this.initialTime || 0;
     }
 
-    setExtraPersistedData (extra) {
-      this.extra = extra
+    setExtraPersistedData(extra) {
+      this.extra = extra;
     }
 
-    getExtraPersistedData () {
-      return this.extra
+    getExtraPersistedData() {
+      return this.extra;
     }
 
-    isHistoryLoaded () {
-      return this.loaded
+    isHistoryLoaded() {
+      return this.loaded;
     }
 
-    save () {
+    save() {
       if (this.loaded) {
         const data = {
           firstEntry: this.firstEntry,
@@ -590,19 +576,19 @@ module.exports = function (homebridge) {
           refTime: this.refTime,
           initialTime: this.initialTime,
           history: this.history,
-          extra: this.extra
-        }
+          extra: this.extra,
+        };
         homebridge.globalFakeGatoStorage.write({
           service: this,
-          data: typeof data === 'object' ? JSON.stringify(data) : data
-        })
+          data: typeof data === 'object' ? JSON.stringify(data) : data,
+        });
       } else {
-        setTimeout(() => this.save(), 100)
+        setTimeout(() => this.save(), 100);
       }
     }
 
-    load (cb) {
-      this.log('[%s] FGH loading.', this.accessoryName)
+    load(cb) {
+      this.log('[%s] FGH loading.', this.accessoryName);
       homebridge.globalFakeGatoStorage.read({
         service: this,
         callback: function (err, data) {
@@ -610,55 +596,55 @@ module.exports = function (homebridge) {
             if (data) {
               try {
                 // this.log('[%s] read data [%s].', this.accessoryName, data)
-                const jsonFile = typeof data === 'object' ? data : JSON.parse(data)
-                this.firstEntry = jsonFile.firstEntry
-                this.lastEntry = jsonFile.lastEntry
-                this.usedMemory = jsonFile.usedMemory
-                this.refTime = jsonFile.refTime
-                this.initialTime = jsonFile.initialTime
-                this.history = jsonFile.history
-                this.extra = jsonFile.extra
+                const jsonFile = typeof data === 'object' ? data : JSON.parse(data);
+                this.firstEntry = jsonFile.firstEntry;
+                this.lastEntry = jsonFile.lastEntry;
+                this.usedMemory = jsonFile.usedMemory;
+                this.refTime = jsonFile.refTime;
+                this.initialTime = jsonFile.initialTime;
+                this.history = jsonFile.history;
+                this.extra = jsonFile.extra;
               } catch (e) {
-                this.log('FGH error fetching data - invalid JSON [%s].', e)
-                cb(e, false)
+                this.log('FGH error fetching data - invalid JSON [%s].', e);
+                cb(e, false);
               }
-              cb(null, true)
+              cb(null, true);
             }
           } else {
-            cb(null, false)
+            cb(null, false);
           }
-        }.bind(this)
-      })
+        }.bind(this),
+      });
     }
 
-    cleanPersist () {
-      this.log('FGH cleaning.')
-      homebridge.globalFakeGatoStorage.remove({ service: this })
+    cleanPersist() {
+      this.log('FGH cleaning.');
+      homebridge.globalFakeGatoStorage.remove({ service: this });
     }
 
-    getCurrentS2R2 () {
-      const entry2address = val => val % this.memorySize
+    getCurrentS2R2() {
+      const entry2address = (val) => val % this.memorySize;
       if (this.currentEntry <= this.lastEntry && this.transfer) {
-        this.memAddress = entry2address(this.currentEntry)
-        for (let i = 0; i < 11; i++) {
+        this.memAddress = entry2address(this.currentEntry);
+        for (let i = 0; i < 11; i += 1) {
           if (
-            this.history[this.memAddress].setRefTime === 1 ||
-            this.setTime ||
-            this.currentEntry === this.firstEntry + 1
+            this.history[this.memAddress].setRefTime === 1
+            || this.setTime
+            || this.currentEntry === this.firstEntry + 1
           ) {
             this.dataStream += Format(
               ',15%s 0100 0000 81%s0000 0000 00 0000',
               numToHex(swap32(this.currentEntry), 8),
-              numToHex(swap32(this.refTime), 8)
-            )
-            this.setTime = false
+              numToHex(swap32(this.refTime), 8),
+            );
+            this.setTime = false;
           } else {
             this.log(
               '[%s] FGH entry [%s] address [%s].',
               this.accessoryName,
               this.currentEntry,
-              this.memAddress
-            )
+              this.memAddress,
+            );
             switch (this.accessoryType) {
               case 'weather':
                 this.dataStream += Format(
@@ -668,18 +654,18 @@ module.exports = function (homebridge) {
                   this.accessoryType117,
                   numToHex(swap16(this.history[this.memAddress].temp * 100), 4),
                   numToHex(swap16(this.history[this.memAddress].humidity * 100), 4),
-                  numToHex(swap16(this.history[this.memAddress].pressure * 10), 4)
-                )
-                break
+                  numToHex(swap16(this.history[this.memAddress].pressure * 10), 4),
+                );
+                break;
               case 'energy':
                 this.dataStream += Format(
                   ',14 %s%s-%s:0000 0000 %s 0000 0000',
                   numToHex(swap32(this.currentEntry), 8),
                   numToHex(swap32(this.history[this.memAddress].time - this.refTime - _EPOCH), 8),
                   this.accessoryType117,
-                  numToHex(swap16(this.history[this.memAddress].power * 10), 4)
-                )
-                break
+                  numToHex(swap16(this.history[this.memAddress].power * 10), 4),
+                );
+                break;
               case 'room':
                 this.dataStream += Format(
                   ',13 %s%s%s%s%s%s0000 00',
@@ -688,9 +674,9 @@ module.exports = function (homebridge) {
                   this.accessoryType117,
                   numToHex(swap16(this.history[this.memAddress].temp * 100), 4),
                   numToHex(swap16(this.history[this.memAddress].humidity * 100), 4),
-                  numToHex(swap16(this.history[this.memAddress].ppm), 4)
-                )
-                break
+                  numToHex(swap16(this.history[this.memAddress].ppm), 4),
+                );
+                break;
               case 'door':
               case 'motion':
               case 'switch':
@@ -699,9 +685,9 @@ module.exports = function (homebridge) {
                   numToHex(swap32(this.currentEntry), 8),
                   numToHex(swap32(this.history[this.memAddress].time - this.refTime - _EPOCH), 8),
                   this.accessoryType117,
-                  numToHex(this.history[this.memAddress].status, 2)
-                )
-                break
+                  numToHex(this.history[this.memAddress].status, 2),
+                );
+                break;
               case 'aqua':
                 if (this.history[this.memAddress].status) {
                   this.dataStream += Format(
@@ -709,8 +695,8 @@ module.exports = function (homebridge) {
                     numToHex(swap32(this.currentEntry), 8),
                     numToHex(swap32(this.history[this.memAddress].time - this.refTime - _EPOCH), 8),
                     this.accessoryType117,
-                    numToHex(this.history[this.memAddress].status, 2)
-                  )
+                    numToHex(this.history[this.memAddress].status, 2),
+                  );
                 } else {
                   this.dataStream += Format(
                     ',15 %s%s%s%s%s 00000000 300c',
@@ -718,10 +704,10 @@ module.exports = function (homebridge) {
                     numToHex(swap32(this.history[this.memAddress].time - this.refTime - _EPOCH), 8),
                     this.accessoryType117bis,
                     numToHex(this.history[this.memAddress].status, 2),
-                    numToHex(swap32(this.history[this.memAddress].waterAmount), 8)
-                  )
+                    numToHex(swap32(this.history[this.memAddress].waterAmount), 8),
+                  );
                 }
-                break
+                break;
               case 'thermo':
                 this.dataStream += Format(
                   ',11 %s%s%s%s%s%s 0000',
@@ -730,21 +716,21 @@ module.exports = function (homebridge) {
                   this.accessoryType117,
                   numToHex(swap16(this.history[this.memAddress].currentTemp * 100), 4),
                   numToHex(swap16(this.history[this.memAddress].setTemp * 100), 4),
-                  numToHex(this.history[this.memAddress].valvePosition, 2)
-                )
-                break
+                  numToHex(this.history[this.memAddress].valvePosition, 2),
+                );
+                break;
               case 'custom': {
-                const result = []
-                let bitmask = 0
+                const result = [];
+                let bitmask = 0;
                 const dataStream = Format(
                   '%s%s',
                   numToHex(swap32(this.currentEntry), 8),
-                  numToHex(swap32(this.history[this.memAddress].time - this.refTime - _EPOCH), 8)
-                )
+                  numToHex(swap32(this.history[this.memAddress].time - this.refTime - _EPOCH), 8),
+                );
                 for (const [k, v] of Object.entries(this.history[this.memAddress])) {
                   switch (k) {
                     case 'time':
-                      break
+                      break;
                     default:
                       for (let x = 0, iLen = this.signatures.length; x < iLen; x++) {
                         if (this.signatures[x].entry === k) {
@@ -754,76 +740,74 @@ module.exports = function (homebridge) {
                                 '%s',
                                 numToHex(
                                   swap32(v * this.signatures[x].factor),
-                                  this.signatures[x].length
-                                )
-                              )
-                              break
+                                  this.signatures[x].length,
+                                ),
+                              );
+                              break;
                             case 4:
                               result[x] = Format(
                                 '%s',
                                 numToHex(
                                   swap16(v * this.signatures[x].factor),
-                                  this.signatures[x].length
-                                )
-                              )
-                              break
+                                  this.signatures[x].length,
+                                ),
+                              );
+                              break;
                             case 2:
                               result[x] = Format(
                                 '%s',
-                                numToHex(v * this.signatures[x].factor, this.signatures[x].length)
-                              )
-                              break
+                                numToHex(v * this.signatures[x].factor, this.signatures[x].length),
+                              );
+                              break;
                           }
-                          bitmask += Math.pow(2, x)
+                          bitmask += 2 ** x;
                         }
                       }
                   }
                 }
-                const results =
-                  dataStream + ' ' + numToHex(bitmask, 2) + ' ' + result.map(a => a).join(' ')
-                this.dataStream +=
-                  ' ' +
-                  numToHex(results.replace(/[^0-9A-F]/gi, '').length / 2 + 1) +
-                  ' ' +
-                  results +
-                  ','
-                break
+                const results = `${dataStream} ${numToHex(bitmask, 2)} ${result.map((a) => a).join(' ')}`;
+                this.dataStream
+                  += ` ${
+                  numToHex(results.replace(/[^0-9A-F]/gi, '').length / 2 + 1)
+                } ${
+                  results
+                },`;
+                break;
               }
             }
           }
-          this.currentEntry++
-          this.memAddress = entry2address(this.currentEntry)
+          this.currentEntry++;
+          this.memAddress = entry2address(this.currentEntry);
           if (this.currentEntry > this.lastEntry) {
-            break
+            break;
           }
         }
-        this.log('[%s] FGH data [%s].', this.accessoryName, this.dataStream)
-        const toReturn = hexToBase64(this.dataStream)
-        this.dataStream = ''
-        return toReturn
-      } else {
-        this.transfer = false
-        return hexToBase64('00')
+        this.log('[%s] FGH data [%s].', this.accessoryName, this.dataStream);
+        const toReturn = hexToBase64(this.dataStream);
+        this.dataStream = '';
+        return toReturn;
       }
+      this.transfer = false;
+      return hexToBase64('00');
     }
 
-    setCurrentS2W1 (value) {
-      this.log('[%s] FGH data req [%s].', this.accessoryName, base64ToHex(value))
-      const valHex = base64ToHex(value)
-      const substring = valHex.substring(4, 12)
-      const valInt = parseInt(substring, 16)
-      const address = swap32(valInt)
-      const hexAddress = address.toString('16')
-      this.log('[%s] FGH address req [%s].', this.accessoryName, hexAddress)
-      this.sendHistory(address)
+    setCurrentS2W1(value) {
+      this.log('[%s] FGH data req [%s].', this.accessoryName, base64ToHex(value));
+      const valHex = base64ToHex(value);
+      const substring = valHex.substring(4, 12);
+      const valInt = parseInt(substring, 16);
+      const address = swap32(valInt);
+      const hexAddress = address.toString('16');
+      this.log('[%s] FGH address req [%s].', this.accessoryName, hexAddress);
+      this.sendHistory(address);
     }
 
-    setCurrentS2W2 (value) {
-      this.log('[%s] FGH clock adj [%s].', this.accessoryName, base64ToHex(value))
+    setCurrentS2W2(value) {
+      this.log('[%s] FGH clock adj [%s].', this.accessoryName, base64ToHex(value));
     }
   }
 
-  FakeGatoHistoryService.UUID = 'E863F007-079E-48FF-8F27-9C2605A29F52'
+  FakeGatoHistoryService.UUID = 'E863F007-079E-48FF-8F27-9C2605A29F52';
 
-  return FakeGatoHistory
+  return FakeGatoHistory;
 }
diff --git a/lib/fakegato/fakegato-storage.js b/lib/fakegato/fakegato-storage.js
index fdb39838..397bc721 100644
--- a/lib/fakegato/fakegato-storage.js
+++ b/lib/fakegato/fakegato-storage.js
@@ -1,116 +1,109 @@
-/* jshint node: true, esversion: 10, -W014, -W033 */
-/* eslint-disable new-cap */
-'use strict'
+/* eslint-disable */
+import fs from 'fs';
+import os from 'os';
+import path from 'path';
 
-const fs = require('fs')
-const os = require('os')
-const path = require('path')
-const hostname = os.hostname().split('.')[0]
+const hostname = os.hostname().split('.')[0];
 
-class FakeGatoStorage {
-  constructor (params) {
+export default class {
+  constructor(params) {
     if (!params) {
-      params = {}
+      params = {};
     }
-    this.writers = []
-    this.log = params.log || {}
+    this.writers = [];
+    this.log = params.log || {};
     if (!this.log) {
-      this.log = () => {}
+      this.log = () => {};
     }
-    this.addingWriter = false
+    this.addingWriter = false;
   }
 
-  addWriter (service, params) {
+  addWriter(service, params) {
     if (!this.addingWriter) {
-      this.addingWriter = true
+      this.addingWriter = true;
       if (!params) {
-        params = {}
+        params = {};
       }
-      this.log('[%s] FGS addWriter().', service.accessoryName)
+      this.log('[%s] FGS addWriter().', service.accessoryName);
       const newWriter = {
         service,
         callback: params.callback,
-        fileName: hostname + '_' + service.accessoryName + '_persist.json'
-      }
-      const onReady = typeof params.onReady === 'function' ? params.onReady : () => {}
-      newWriter.storageHandler = fs
-      newWriter.path = params.path || path.join(os.homedir(), '.homebridge')
-      this.writers.push(newWriter)
-      this.addingWriter = false
-      onReady()
+        fileName: `${hostname}_${service.accessoryName}_persist.json`,
+      };
+      const onReady = typeof params.onReady === 'function' ? params.onReady : () => {};
+      newWriter.storageHandler = fs;
+      newWriter.path = params.path || path.join(os.homedir(), '.homebridge');
+      this.writers.push(newWriter);
+      this.addingWriter = false;
+      onReady();
     } else {
-      setTimeout(() => this.addWriter(service, params), 100)
+      setTimeout(() => this.addWriter(service, params), 100);
     }
   }
 
-  getWriter (service) {
-    return this.writers.find(ele => ele.service === service)
+  getWriter(service) {
+    return this.writers.find((ele) => ele.service === service);
   }
 
-  _getWriterIndex (service) {
-    return this.writers.findIndex(ele => ele.service === service)
+  _getWriterIndex(service) {
+    return this.writers.findIndex((ele) => ele.service === service);
   }
 
-  getWriters () {
-    return this.writers
+  getWriters() {
+    return this.writers;
   }
 
-  delWriter (service) {
-    const index = this._getWriterIndex(service)
-    this.writers.splice(index, 1)
+  delWriter(service) {
+    const index = this._getWriterIndex(service);
+    this.writers.splice(index, 1);
   }
 
-  write (params) {
+  write(params) {
     if (!this.writing) {
-      this.writing = true
-      const writer = this.getWriter(params.service)
-      const callBack =
-        typeof params.callback === 'function'
-          ? params.callback
-          : typeof writer.callback === 'function'
+      this.writing = true;
+      const writer = this.getWriter(params.service);
+      const callBack = typeof params.callback === 'function'
+        ? params.callback
+        : typeof writer.callback === 'function'
           ? writer.callback
-          : () => {}
-      const fileLoc = path.join(writer.path, writer.fileName)
+          : () => {};
+      const fileLoc = path.join(writer.path, writer.fileName);
       this.log(
         '[%s] FGS write file [%s] [%s].',
         params.service.accessoryName,
         fileLoc,
-        params.data.substr(1, 80)
-      )
+        params.data.substr(1, 80),
+      );
       writer.storageHandler.writeFile(fileLoc, params.data, 'utf8', () => {
-        this.writing = false
-        callBack(arguments)
-      })
+        this.writing = false;
+        callBack(arguments);
+      });
     } else {
-      setTimeout(() => this.write(params), 100)
+      setTimeout(() => this.write(params), 100);
     }
   }
 
-  read (params) {
-    const writer = this.getWriter(params.service)
-    const callBack =
-      typeof params.callback === 'function'
-        ? params.callback
-        : typeof writer.callback === 'function'
+  read(params) {
+    const writer = this.getWriter(params.service);
+    const callBack = typeof params.callback === 'function'
+      ? params.callback
+      : typeof writer.callback === 'function'
         ? writer.callback
-        : () => {}
-    const fileLoc = path.join(writer.path, writer.fileName)
-    this.log('[%s] FGS read file [%s].', params.service.accessoryName, fileLoc)
-    writer.storageHandler.readFile(fileLoc, 'utf8', callBack)
+        : () => {};
+    const fileLoc = path.join(writer.path, writer.fileName);
+    this.log('[%s] FGS read file [%s].', params.service.accessoryName, fileLoc);
+    writer.storageHandler.readFile(fileLoc, 'utf8', callBack);
   }
 
-  remove (params) {
-    const writer = this.getWriter(params.service)
-    const callBack =
-      typeof params.callback === 'function'
-        ? params.callback
-        : typeof writer.callback === 'function'
+  remove(params) {
+    const writer = this.getWriter(params.service);
+    const callBack = typeof params.callback === 'function'
+      ? params.callback
+      : typeof writer.callback === 'function'
         ? writer.callback
-        : () => {}
-    const fileLoc = path.join(writer.path, writer.fileName)
-    this.log('[%s] FGS delete file [%s].', params.service.accessoryName, fileLoc)
-    writer.storageHandler.unlink(fileLoc, callBack)
+        : () => {};
+    const fileLoc = path.join(writer.path, writer.fileName);
+    this.log('[%s] FGS delete file [%s].', params.service.accessoryName, fileLoc);
+    writer.storageHandler.unlink(fileLoc, callBack);
   }
 }
-
-module.exports = { FakeGatoStorage }
diff --git a/lib/fakegato/fakegato-timer.js b/lib/fakegato/fakegato-timer.js
index e2235e37..f32c4a9d 100644
--- a/lib/fakegato/fakegato-timer.js
+++ b/lib/fakegato/fakegato-timer.js
@@ -1,131 +1,126 @@
-/* jshint node: true, esversion: 10, -W014, -W033 */
-/* eslint-disable new-cap */
-'use strict'
-
-class FakeGatoTimer {
-  constructor (params) {
+/* eslint-disable */
+export default class {
+  constructor(params) {
     if (!params) {
-      params = {}
+      params = {};
     }
-    this.subscribedServices = []
-    this.minutes = params.minutes || 10
-    this.intervalID = null
-    this.running = false
-    this.log = params.log || {}
+    this.subscribedServices = [];
+    this.minutes = params.minutes || 10;
+    this.intervalID = null;
+    this.running = false;
+    this.log = params.log || {};
     if (!this.log) {
-      this.log = () => {}
+      this.log = () => {};
     }
   }
 
-  subscribe (service, callback) {
-    this.log('[%s] FGT new subscription.', service.accessoryName)
+  subscribe(service, callback) {
+    this.log('[%s] FGT new subscription.', service.accessoryName);
     const newService = {
       service,
       callback,
       backLog: [],
       previousBackLog: [],
-      previousAvrg: {}
-    }
-    this.subscribedServices.push(newService)
+      previousAvrg: {},
+    };
+    this.subscribedServices.push(newService);
   }
 
-  getSubscriber (service) {
-    return this.subscribedServices.find(el => el.service === service)
+  getSubscriber(service) {
+    return this.subscribedServices.find((el) => el.service === service);
   }
 
-  _getSubscriberIndex (service) {
-    return this.subscribedServices.findIndex(el => el.service === service)
+  _getSubscriberIndex(service) {
+    return this.subscribedServices.findIndex((el) => el.service === service);
   }
 
-  getSubscribers () {
-    return this.subscribedServices
+  getSubscribers() {
+    return this.subscribedServices;
   }
 
-  unsubscribe (service) {
-    const index = this._getSubscriberIndex(service)
-    this.subscribedServices.splice(index, 1)
+  unsubscribe(service) {
+    const index = this._getSubscriberIndex(service);
+    this.subscribedServices.splice(index, 1);
     if (this.subscribedServices.length === 0 && this.running) {
-      this.stop()
+      this.stop();
     }
   }
 
-  start () {
-    this.log('Starting global FGT [%s minutes].', this.minutes)
+  start() {
+    this.log('Starting global FGT [%s minutes].', this.minutes);
     if (this.running) {
-      this.stop()
+      this.stop();
     }
-    this.running = true
-    this.intervalID = setInterval(this.executeCallbacks.bind(this), this.minutes * 60 * 1000)
+    this.running = true;
+    this.intervalID = setInterval(this.executeCallbacks.bind(this), this.minutes * 60 * 1000);
   }
 
-  stop () {
-    this.log('Stopping global FGT.')
-    clearInterval(this.intervalID)
-    this.running = false
-    this.intervalID = null
+  stop() {
+    this.log('Stopping global FGT.');
+    clearInterval(this.intervalID);
+    this.running = false;
+    this.intervalID = null;
   }
 
-  executeCallbacks () {
-    this.log('FGT executeCallbacks().')
+  executeCallbacks() {
+    this.log('FGT executeCallbacks().');
     if (this.subscribedServices.length !== 0) {
       for (const s in this.subscribedServices) {
         if (Object.prototype.hasOwnProperty.call(this.subscribedServices, s)) {
-          const service = this.subscribedServices[s]
+          const service = this.subscribedServices[s];
           if (typeof service.callback === 'function') {
             service.previousAvrg = service.callback({
               backLog: service.backLog,
               previousAvrg: service.previousAvrg,
               timer: this,
-              immediate: false
-            })
+              immediate: false,
+            });
           }
         }
       }
     }
   }
 
-  executeImmediateCallback (service) {
-    this.log('[%s] FGT executeImmediateCallback().', service.accessoryName)
+  executeImmediateCallback(service) {
+    this.log('[%s] FGT executeImmediateCallback().', service.accessoryName);
     if (typeof service.callback === 'function' && service.backLog.length) {
       service.callback({
         backLog: service.backLog,
         timer: this,
-        immediate: true
-      })
+        immediate: true,
+      });
     }
   }
 
-  addData (params) {
-    const data = params.entry
-    const service = params.service
-    const immediateCallback = params.immediateCallback || false
+  addData(params) {
+    const data = params.entry;
+    const { service } = params;
+    const immediateCallback = params.immediateCallback || false;
     this.log(
       '[%s] FGT addData() [%s] immediate [%s].',
       service.accessoryName,
       data,
-      immediateCallback
-    )
+      immediateCallback,
+    );
     if (immediateCallback) {
-      this.getSubscriber(service).backLog[0] = data
+      this.getSubscriber(service).backLog[0] = data;
     } else {
-      this.getSubscriber(service).backLog.push(data)
+      this.getSubscriber(service).backLog.push(data);
     }
     if (immediateCallback) {
-      this.executeImmediateCallback(this.getSubscriber(service))
+      this.executeImmediateCallback(this.getSubscriber(service));
     }
     if (!this.running) {
-      this.start()
+      this.start();
     }
   }
 
-  emptyData (service) {
-    this.log('[%s] FGT emptyData().', service.accessoryName)
-    const source = this.getSubscriber(service)
+  emptyData(service) {
+    this.log('[%s] FGT emptyData().', service.accessoryName);
+    const source = this.getSubscriber(service);
     if (source.backLog.length) {
-      source.previousBackLog = source.backLog
+      source.previousBackLog = source.backLog;
     }
-    source.backLog = []
+    source.backLog = [];
   }
 }
-
-module.exports = { FakeGatoTimer }
diff --git a/lib/fakegato/uuid.js b/lib/fakegato/uuid.js
index e63a81bb..f0a48162 100644
--- a/lib/fakegato/uuid.js
+++ b/lib/fakegato/uuid.js
@@ -1,33 +1,27 @@
-/* jshint node: true, esversion: 10, -W014, -W033 */
-/* eslint-disable new-cap */
-'use strict'
-
 // https://github.com/homebridge/HAP-NodeJS/blob/master/src/lib/util/uuid.ts
 
-function isValid (UUID) {
-  const uuidRegex = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i
-  return uuidRegex.test(UUID)
-}
+const isValid = (UUID) => {
+  const uuidRegex = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+  return uuidRegex.test(UUID);
+};
 
-function toLongFormUUID (uuid, base = '-0000-1000-8000-0026BB765291') {
-  const shortRegex = /^[0-9a-f]{1,8}$/i
+const toLongFormUUID = (uuid, base = '-0000-1000-8000-0026BB765291') => {
+  const shortRegex = /^[0-9a-f]{1,8}$/i;
   if (isValid(uuid)) {
-    return uuid.toUpperCase()
+    return uuid.toUpperCase();
   }
   if (!shortRegex.test(uuid)) {
-    throw new TypeError('uuid was not a valid UUID or short form UUID')
+    throw new TypeError('uuid was not a valid UUID or short form UUID');
   }
-  if (!isValid('00000000' + base)) {
-    throw new TypeError('base was not a valid base UUID')
+  if (!isValid(`00000000${base}`)) {
+    throw new TypeError('base was not a valid base UUID');
   }
-  return (('00000000' + uuid).substr(-8) + base).toUpperCase()
-}
+  return ((`00000000${uuid}`).substr(-8) + base).toUpperCase();
+};
 
-function toShortFormUUID (uuid, base = '-0000-1000-8000-0026BB765291') {
-  uuid = toLongFormUUID(uuid, base)
-  return uuid.substr(0, 8)
-}
+const toShortFormUUID = (uuid, base = '-0000-1000-8000-0026BB765291') => {
+  uuid = toLongFormUUID(uuid, base);
+  return uuid.substr(0, 8);
+};
 
-exports.isValid = isValid
-exports.toLongFormUUID = toLongFormUUID
-exports.toShortFormUUID = toShortFormUUID
+export { toLongFormUUID, toShortFormUUID };
diff --git a/lib/homebridge-ui/server.js b/lib/homebridge-ui/server.js
index f47a8cd2..bdd7c64d 100644
--- a/lib/homebridge-ui/server.js
+++ b/lib/homebridge-ui/server.js
@@ -1,13 +1,9 @@
-/* jshint node: true, esversion: 10, -W014, -W033 */
-/* eslint-disable new-cap */
-'use strict'
-
-const { HomebridgePluginUiServer } = require('@homebridge/plugin-ui-utils')
-const fs = require('fs')
+import fs from 'fs';
+import { HomebridgePluginUiServer } from '@homebridge/plugin-ui-utils';
 
 class PluginUiServer extends HomebridgePluginUiServer {
-  constructor () {
-    super()
+  constructor() {
+    super();
 
     /*
       A native method getCachedAccessories() was introduced in config-ui-x v4.37.0
@@ -16,35 +12,35 @@ class PluginUiServer extends HomebridgePluginUiServer {
     this.onRequest('/getCachedAccessories', async () => {
       try {
         // Define the plugin and create the array to return
-        const plugin = 'homebridge-ewelink'
-        const devicesToReturn = []
+        const plugin = 'homebridge-ewelink';
+        const devicesToReturn = [];
 
         // The path and file of the cached accessories
-        const accFile = this.homebridgeStoragePath + '/accessories/cachedAccessories'
+        const accFile = `${this.homebridgeStoragePath}/accessories/cachedAccessories`;
 
         // Check the file exists
         if (fs.existsSync(accFile)) {
           // Read the cached accessories file
-          let cachedAccessories = await fs.promises.readFile(accFile)
+          let cachedAccessories = await fs.promises.readFile(accFile);
 
           // Parse the JSON
-          cachedAccessories = JSON.parse(cachedAccessories)
+          cachedAccessories = JSON.parse(cachedAccessories);
 
           // We only want the accessories for this plugin
           cachedAccessories
-            .filter(accessory => accessory.plugin === plugin)
-            .forEach(accessory => devicesToReturn.push(accessory))
+            .filter((accessory) => accessory.plugin === plugin)
+            .forEach((accessory) => devicesToReturn.push(accessory));
         }
 
         // Return the array
-        return devicesToReturn
+        return devicesToReturn;
       } catch (err) {
         // Just return an empty accessory list in case of any errors
-        return []
+        return [];
       }
-    })
-    this.ready()
+    });
+    this.ready();
   }
 }
 
-;(() => new PluginUiServer())()
+(() => new PluginUiServer())();
diff --git a/lib/index.js b/lib/index.js
index feb0d596..7846ce23 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1,1997 +1,7 @@
-/* jshint node: true, esversion: 10, -W014, -W033 */
-/* eslint-disable new-cap */
-'use strict'
+import { createRequire } from 'module';
+import ewelinkPlatform from './platform.js';
 
-// Packages and constant variables for this class
-const devicesInHB = new Map()
-const http = require('http')
-const { default: PQueue } = require('p-queue')
-const plugin = require('./../package.json')
-const queue = new PQueue({
-  interval: 250,
-  intervalCap: 1,
-  timeout: 10000
-})
-const storage = require('node-persist')
+const require = createRequire(import.meta.url);
+const plugin = require('../package.json');
 
-// Variables for this class to use later
-let apiClient
-let apiServer
-let httpClient
-let lanClient
-let lanDevices
-let wsClient
-
-// Create the platform class
-class eWeLinkPlatform {
-  constructor (log, config, api) {
-    // Don't load the plugin if these aren't accessible for any reason
-    if (!log || !api) {
-      return
-    }
-
-    // Begin plugin initialisation
-    try {
-      this.api = api
-      this.consts = require('./utils/constants')
-      this.funcs = require('./utils/functions')
-      this.log = log
-
-      // Configuration objects for accessories
-      this.deviceConf = {}
-      this.rfSubdevices = {}
-      this.hideChannels = []
-      this.hideMasters = []
-      this.ignoredDevices = []
-      this.ipOverride = {}
-      this.obstructSwitches = {}
-
-      // Retrieve the user's chosen language file
-      const lang = this.consts.allowed.language.includes(config.language)
-        ? config.language
-        : this.consts.defaultValues.language
-      this.lang = require('./utils/lang-' + lang)
-
-      // Make sure user is running Homebridge v1.3 or above
-      if (!api.versionGreaterOrEqual || !api.versionGreaterOrEqual('1.3.0')) {
-        throw new Error(this.lang.hbVersionFail)
-      }
-
-      // Check the user has configured the plugin
-      if (!config) {
-        throw new Error(this.lang.pluginNotConf)
-      }
-
-      // Log some environment info for debugging
-      this.log(
-        '%s v%s | System %s | Node %s | HB v%s | HAPNodeJS v%s%s...',
-        this.lang.initialising,
-        plugin.version,
-        process.platform,
-        process.version,
-        api.serverVersion,
-        api.hap.HAPLibraryVersion ? api.hap.HAPLibraryVersion() : '?',
-        config.plugin_map
-          ? ' | HOOBS v3'
-          : require('os')
-              .hostname()
-              .includes('hoobs')
-          ? ' | HOOBS v4'
-          : ''
-      )
-
-      // Apply the user's configuration
-      this.config = this.consts.defaultConfig
-      this.applyUserConfig(config)
-
-      // Set up the Homebridge events
-      this.api.on('didFinishLaunching', () => this.pluginSetup())
-      this.api.on('shutdown', () => this.pluginShutdown())
-    } catch (err) {
-      // Catch any errors during initialisation
-      const eText = this.funcs.parseError(err, [this.lang.hbVersionFail, this.lang.pluginNotConf])
-      log.warn('***** %s. *****', this.lang.disabling)
-      log.warn('***** %s. *****', eText)
-    }
-  }
-
-  applyUserConfig (config) {
-    // These shorthand functions save line space during config parsing
-    const logDefault = (k, def) => {
-      this.log.warn('%s [%s] %s %s.', this.lang.cfgItem, k, this.lang.cfgDef, def)
-    }
-    const logDuplicate = k => {
-      this.log.warn('%s [%s] %s.', this.lang.cfgItem, k, this.lang.cfgDup)
-    }
-    const logIgnore = k => {
-      this.log.warn('%s [%s] %s.', this.lang.cfgItem, k, this.lang.cfgIgn)
-    }
-    const logIgnoreItem = k => {
-      this.log.warn('%s [%s] %s.', this.lang.cfgItem, k, this.lang.cfgIgnItem)
-    }
-    const logIncrease = (k, min) => {
-      this.log.warn('%s [%s] %s %s.', this.lang.cfgItem, k, this.lang.cfgLow, min)
-    }
-    const logQuotes = k => {
-      this.log.warn('%s [%s] %s.', this.lang.cfgItem, k, this.lang.cfgQts)
-    }
-    const logRemove = k => {
-      this.log.warn('%s [%s] %s.', this.lang.cfgItem, k, this.lang.cfgRmv)
-    }
-
-    // Begin applying the user's config
-    for (const [key, val] of Object.entries(config)) {
-      switch (key) {
-        case 'apiPort': {
-          if (typeof v === 'string') {
-            logQuotes(key)
-          }
-          const intVal = parseInt(val)
-          if (isNaN(intVal)) {
-            logDefault(key, this.consts.defaultValues[key])
-            this.config.apiPort = this.consts.defaultValues[key]
-          } else if (intVal < this.consts.minValues[key]) {
-            logIncrease(key, this.consts.minValues[key])
-            this.config.apiPort = this.consts.minValues[key]
-          } else {
-            this.config.apiPort = intVal
-          }
-          break
-        }
-        case 'bridgeSensors':
-          if (Array.isArray(val) && val.length > 0) {
-            val.forEach(x => {
-              if (!x.fullDeviceId) {
-                logIgnoreItem(key)
-                return
-              }
-              const id = this.funcs.parseDeviceId(x.fullDeviceId)
-              if (Object.keys(this.rfSubdevices).includes(id)) {
-                logDuplicate(key + '.' + id)
-                return
-              }
-              const entries = Object.entries(x)
-              if (entries.length === 1) {
-                logRemove(key + '.' + id)
-                return
-              }
-              this.rfSubdevices[id] = {}
-              for (const [k, v] of entries) {
-                switch (k) {
-                  case 'curtainType':
-                  case 'deviceType':
-                  case 'overrideLogging':
-                  case 'type': {
-                    const index = k === 'type' ? 'sensorType' : k
-                    const inSet = this.consts.allowed[index].includes(v)
-                    if (typeof v !== 'string' || !inSet) {
-                      logIgnore(key + '.' + id + '.' + k)
-                    } else {
-                      this.rfSubdevices[id][k] = inSet ? v : this.consts.defaultValues[k]
-                    }
-                    break
-                  }
-                  case 'fullDeviceId':
-                  case 'label':
-                    break
-                  case 'operationTime':
-                  case 'operationTimeDown':
-                  case 'sensorTimeDifference':
-                  case 'sensorTimeLength': {
-                    if (typeof v === 'string') {
-                      logQuotes(key + '.' + id + '.' + k)
-                    }
-                    const intVal = parseInt(v)
-                    if (isNaN(intVal)) {
-                      logDefault(key + '.' + id + '.' + k, this.consts.defaultValues[k])
-                      this.rfSubdevices[id][k] = this.consts.defaultValues[k]
-                    } else if (intVal < this.consts.minValues[k]) {
-                      logIncrease(key + '.' + id + '.' + k, this.consts.minValues[k])
-                      this.rfSubdevices[id][k] = this.consts.minValues[k]
-                    } else {
-                      this.rfSubdevices[id][k] = intVal
-                    }
-                    break
-                  }
-                  default:
-                    logRemove(key + '.' + id + '.' + k)
-                    break
-                }
-              }
-            })
-          } else {
-            logIgnore(key)
-          }
-          break
-        case 'countryCode':
-          if (typeof val !== 'string' || val === '') {
-            logIgnore(key)
-          } else {
-            this.config.countryCode = '+' + val.replace(/[^0-9]/g, '')
-          }
-          break
-        case 'debug':
-        case 'debugFakegato':
-        case 'disableDeviceLogging':
-        case 'disableNoResponse':
-        case 'disablePlugin':
-          if (typeof val === 'string') {
-            logQuotes(key)
-          }
-          this.config[key] = val === 'false' ? false : !!val
-          break
-        case 'fanDevices':
-        case 'lightDevices':
-        case 'multiDevices':
-        case 'rfDevices':
-        case 'sensorDevices':
-        case 'singleDevices':
-        case 'thDevices':
-          if (Array.isArray(val) && val.length > 0) {
-            val.forEach(x => {
-              if (!x.deviceId) {
-                logIgnoreItem(key)
-                return
-              }
-              const id = this.funcs.parseDeviceId(x.deviceId)
-              if (Object.keys(this.deviceConf).includes(id)) {
-                logDuplicate(key + '.' + id)
-                return
-              }
-              const entries = Object.entries(x)
-              if (entries.length === 1) {
-                logRemove(key + '.' + id)
-                return
-              }
-              this.deviceConf[id] = {}
-              for (const [k, v] of entries) {
-                if (!this.consts.allowed[key].includes(k)) {
-                  logRemove(key + '.' + id + '.' + k)
-                  continue
-                }
-                switch (k) {
-                  case 'adaptiveLightingShift':
-                  case 'brightnessStep':
-                  case 'inUsePowerThreshold':
-                  case 'lowBattThreshold':
-                  case 'minTarget':
-                  case 'maxTarget':
-                  case 'operationTime':
-                  case 'operationTimeDown':
-                  case 'sensorTimeDifference': {
-                    if (typeof v === 'string') {
-                      logQuotes(key + '.' + id + '.' + k)
-                    }
-                    const intVal = parseInt(v)
-                    if (isNaN(intVal)) {
-                      logDefault(key + '.' + id + '.' + k, this.consts.defaultValues[k])
-                      this.deviceConf[id][k] = this.consts.defaultValues[k]
-                    } else if (intVal < this.consts.minValues[k]) {
-                      logIncrease(key + '.' + id + '.' + k, this.consts.minValues[k])
-                      this.deviceConf[id][k] = this.consts.minValues[k]
-                    } else {
-                      this.deviceConf[id][k] = intVal
-                    }
-                    break
-                  }
-                  case 'deviceId':
-                  case 'label':
-                    break
-                  case 'deviceModel':
-                    if (typeof v !== 'string' || v === '') {
-                      logIgnore(key + '.' + id + '.' + k)
-                    } else if (!this.consts.allowed.models[key].includes(v)) {
-                      logIgnore(key + '.' + id + '.' + k)
-                    } else {
-                      if (v === 'gddc5' && key === 'singleDevices') {
-                        this.deviceConf[id].showAs = 'garage_eachen'
-                      }
-                    }
-                    break
-                  case 'disableTimer':
-                  case 'hideLight':
-                  case 'hideLongDouble':
-                  case 'hideSensor':
-                  case 'hideSwitch':
-                  case 'humidityOffsetFactor':
-                  case 'isInched':
-                  case 'offlineAsOff':
-                  case 'offsetFactor':
-                  case 'resetOnStartup':
-                  case 'scaleBattery':
-                  case 'showHeatCool':
-                    if (typeof v === 'string') {
-                      logQuotes(key + '.' + id + '.' + k)
-                    }
-                    this.deviceConf[id][k] = v === 'false' ? false : !!v
-                    break
-                  case 'hideChannels': {
-                    if (typeof v !== 'string' || v === '') {
-                      logIgnore(key + '.' + id + '.' + k)
-                    } else {
-                      const channels = v.split(',')
-                      channels.forEach(channel => {
-                        this.hideChannels.push(id + 'SW' + channel.replace(/[^0-9]+/g, ''))
-                        this.deviceConf[id][k] = v
-                      })
-                    }
-                    break
-                  }
-                  case 'humidityOffset':
-                  case 'offset':
-                  case 'targetTempThreshold': {
-                    if (typeof v === 'string') {
-                      logQuotes(key + '.' + id + '.' + k)
-                    }
-                    const numVal = Number(v)
-                    if (isNaN(numVal)) {
-                      logIgnore(key + '.' + id + '.' + k)
-                    } else {
-                      this.deviceConf[id][k] = numVal
-                    }
-                    break
-                  }
-                  case 'ignoreDevice':
-                    if (typeof v === 'string') {
-                      logQuotes(key + '.' + id + '.' + k)
-                    }
-                    if (!!v && v !== 'false') {
-                      this.ignoredDevices.push(id)
-                    }
-                    break
-                  case 'inchChannels':
-                  case 'temperatureSource':
-                    if (typeof v !== 'string' || v === '') {
-                      logIgnore(key + '.' + id + '.' + k)
-                    } else {
-                      this.deviceConf[id][k] = v
-                    }
-                    break
-                  case 'ipAddress': {
-                    if (typeof v !== 'string' || v === '') {
-                      logIgnore(key + '.' + id + '.' + k)
-                    } else {
-                      this.ipOverride[id] = v
-                    }
-                    break
-                  }
-                  case 'obstructId':
-                    if (typeof v !== 'string' || v === '') {
-                      logIgnore(key + '.' + id + '.' + k)
-                    } else {
-                      const parsed = this.funcs.parseDeviceId(v)
-                      this.deviceConf[id][k] = parsed
-                      this.obstructSwitches[parsed] = id
-                    }
-                    break
-                  case 'overrideLogging':
-                  case 'sensorType':
-                  case 'showAs':
-                  case 'showAsEachen':
-                  case 'showAsMotor': {
-                    const inSet = this.consts.allowed[k].includes(v)
-                    if (typeof v !== 'string' || !inSet) {
-                      logIgnore(key + '.' + id + '.' + k)
-                    } else {
-                      this.deviceConf[id][k] = inSet ? v : this.consts.defaultValues[k]
-                    }
-                    break
-                  }
-                  case 'sensorId':
-                    if (typeof v !== 'string' || v === '') {
-                      logIgnore(key + '.' + id + '.' + k)
-                    } else {
-                      const parsed = this.funcs.parseDeviceId(v)
-                      this.deviceConf[id].sensorId = parsed
-                    }
-                    break
-                }
-              }
-            })
-          } else {
-            logIgnore(key)
-          }
-          break
-        case 'httpHost': {
-          const inSet = this.consts.allowed.httpHosts.includes(val)
-          if (typeof val !== 'string' || !inSet) {
-            logIgnore(key)
-          }
-          this.config.httpHost = inSet
-            ? val === 'auto'
-              ? this.consts.defaultValues[key]
-              : val
-            : this.consts.defaultValues[key]
-          break
-        }
-        case 'ignoredHomes':
-        case 'username':
-          if (typeof val !== 'string') {
-            logIgnore(key)
-          } else {
-            this.config[key] = val.replace(/[\s]+/g, '')
-          }
-          break
-        case 'language':
-        case 'mode': {
-          const inSet = this.consts.allowed[key].includes(val)
-          if (typeof val !== 'string' || !inSet) {
-            logIgnore(key)
-          }
-          this.config[key] = inSet ? val : this.consts.defaultValues[key]
-          break
-        }
-        case 'name':
-        case 'platform':
-        case 'plugin_map':
-          break
-        case 'password':
-          if (typeof val !== 'string') {
-            logIgnore(key)
-          } else {
-            this.config.password = val
-          }
-          break
-        default:
-          logRemove(key)
-          break
-      }
-    }
-  }
-
-  async pluginSetup () {
-    // Plugin has finished initialising so now onto setup
-    try {
-      // Log that the plugin initialisation has been successful
-      this.log('%s.', this.lang.initialised)
-
-      // If the user has disabled the plugin then remove all accessories
-      if (this.config.disablePlugin) {
-        devicesInHB.forEach(accessory => this.removeAccessory(accessory))
-        throw new Error(this.lang.disabled)
-      }
-
-      // Check the eWeLink credentials are configured (except lan mode)
-      if (this.config.mode !== 'lan' && (!this.config.username || !this.config.password)) {
-        devicesInHB.forEach(accessory => this.removeAccessory(accessory))
-        throw new Error(this.lang.missingCreds)
-      }
-
-      // Require any libraries that the accessory instances use
-      this.colourUtils = require('./utils/colour-utils')
-      this.cusChar = new (require('./utils/custom-chars'))(this.api)
-      this.eveChar = new (require('./utils/eve-chars'))(this.api)
-      this.eveService = require('./fakegato/fakegato-history')(this.api)
-
-      // Persist files are used to store device info that could be used for LAN only mode
-      try {
-        this.storageLAN = storage.create({
-          dir: require('path').join(this.api.user.persistPath(), '/../homebridge-ewelink'),
-          forgiveParseErrors: true
-        })
-        await this.storageLAN.init()
-        this.storageClientLAN = true
-      } catch (err) {
-        if (this.config.debug) {
-          const eText = this.funcs.parseError(err)
-          this.log.warn('%s %s.', this.lang.storageSetupErr, eText)
-        }
-      }
-
-      // Persist files are used to store device info that can be used by my other plugins
-      try {
-        this.storageData = storage.create({
-          dir: require('path').join(this.api.user.persistPath(), '/../bwp91_cache'),
-          forgiveParseErrors: true
-        })
-        await this.storageData.init()
-        this.storageClientData = true
-      } catch (err) {
-        if (this.config.debug) {
-          const eText = this.funcs.parseError(err)
-          this.log.warn('%s %s.', this.lang.storageSetupErr, eText)
-        }
-      }
-
-      // Manually disable no response mode if mode is set to lan
-      if (this.config.mode === 'lan') {
-        this.config.disableNoResponse = true
-      }
-
-      const deviceList = []
-      const groupList = []
-
-      // Username and password are now optional
-      if (this.config.username && this.config.password) {
-        // Set up the HTTP client, get the user HTTP host, and login
-        httpClient = new (require('./connection/http'))(this)
-        const authData = await httpClient.login()
-        this.config.password = authData.password
-
-        // Get a home and device list via HTTP request
-        await httpClient.getHomes()
-        const { httpDeviceList, httpGroupList } = await httpClient.getDevices()
-        httpDeviceList.forEach(device => deviceList.push(device))
-        httpGroupList.forEach(group => groupList.push(group))
-
-        // Set up the WS client, get the user WS host and login
-        if (this.config.mode !== 'lan') {
-          wsClient = new (require('./connection/ws'))(this, authData)
-          await wsClient.login()
-
-          // Refresh the WS connection every 60 minutes
-          this.wsRefresh = setInterval(async () => {
-            try {
-              if (this.config.debug) {
-                this.log('%s.', this.lang.wsRef)
-              }
-              await wsClient.login()
-            } catch (err) {
-              const eText = this.funcs.parseError(err)
-              this.log.warn('%s %s.', this.lang.wsRefFail, eText)
-            }
-          }, 3600000)
-        }
-
-        // Clear the storage folder and start again when we have access to http devices
-        if (this.storageClientLAN) {
-          try {
-            await this.storageLAN.clear()
-          } catch (err) {
-            if (this.config.debug) {
-              const eText = this.funcs.parseError(err)
-              this.log.warn('%s %s.', this.lang.storageClearErr, eText)
-            }
-          }
-        }
-      } else {
-        // Warn that HTTP and WS are disabled
-        this.log.warn('%s %s.', this.lang.httpDisabled, this.lang.missingCreds)
-
-        // Get the persist device data if we are in lan only mode
-        if (this.config.mode === 'lan' && this.storageClientLAN) {
-          try {
-            this.log('Obtaining device list from storage.')
-            const persistDeviceList = await this.storageLAN.values()
-            persistDeviceList.forEach(device => deviceList.push(device))
-          } catch (err) {
-            if (this.config.debug) {
-              const eText = this.funcs.parseError(err)
-              this.log.warn('%s %s.', this.lang.storageReadErr, eText)
-            }
-          }
-        }
-      }
-
-      // Set up the LAN client, scan for device and start monitoring
-      if (this.config.mode !== 'wan') {
-        lanClient = new (require('./connection/lan'))(this)
-        lanDevices = await lanClient.getHosts()
-        await lanClient.startMonitor()
-      }
-
-      // Initialise each device into HB
-      deviceList.forEach(device => this.initialiseDevice(device))
-      groupList.forEach(async group => {
-        // Create the format of a device
-        group.extra = { uiid: 5000 }
-        group.deviceid = group.id
-        group.productModel = 'Group [' + group.uiid + ']'
-        group.brandName = 'eWeLink'
-        group.online = true
-        this.initialiseDevice(group)
-      })
-
-      // Check for redundant accessories (in HB but not eWeLink)
-      devicesInHB.forEach(async accessory => {
-        if (
-          !deviceList.some(el => el.deviceid === accessory.context.eweDeviceId) &&
-          !groupList.some(el => el.id === accessory.context.eweDeviceId)
-        ) {
-          this.removeAccessory(accessory)
-        }
-      })
-
-      // Setup the LAN listener for device notifications
-      if (lanClient) {
-        lanClient.receiveUpdate(device => this.receiveDeviceUpdate(device))
-      }
-
-      // Setup the WS listener for device notifications
-      if (wsClient) {
-        wsClient.receiveUpdate(device => this.receiveDeviceUpdate(device))
-      }
-
-      // Set up the listener server for the API if the user has this enabled
-      if (this.config.apiPort !== 0 && this.config.password) {
-        apiClient = new (require('./connection/api'))(this, devicesInHB)
-        apiServer = http.createServer(async (req, res) => {
-          // The 'homepage' shows an html document with info about the API
-          if (req.url === '/') {
-            res.writeHead(200, { 'Content-Type': 'text/html' })
-            res.end(apiClient.showHome())
-            return
-          }
-
-          // Request is not for the homepage so action appropriately
-          res.writeHead(200, { 'Content-Type': 'application/json' })
-          try {
-            const response = await apiClient.action(req)
-
-            // Actioning the request was successful so respond with a success
-            res.end(JSON.stringify({ success: true, response }))
-          } catch (err) {
-            // An error occurred actioning the request so respond with the error
-            res.end(JSON.stringify({ success: false, error: err.message + '.' }))
-          }
-        })
-
-        // Start listening on the above created server
-        apiServer.listen(this.config.apiPort === 1 ? 0 : this.config.apiPort, err => {
-          if (err) {
-            this.log.warn('%s [%s].', this.lang.apiListenErr, err)
-          } else {
-            this.log('%s [%s].', this.lang.apiListening, apiServer.address().port)
-          }
-        })
-      }
-
-      // Log that the plugin setup has been successful with a welcome message
-      const randIndex = Math.floor(Math.random() * this.lang.zWelcome.length)
-
-      // Set a small timeout so the message should appear after the API port log entry
-      setTimeout(() => {
-        this.log('%s. %s', this.lang.complete, this.lang.zWelcome[randIndex])
-      }, 2000)
-    } catch (err) {
-      // Catch any errors during setup
-      const eText = this.funcs.parseError(err, [
-        this.lang.disabled,
-        this.lang.missingCreds,
-        'password error! [10001]',
-        'user does not exists [10003]'
-      ])
-      this.log.warn('***** %s. *****', this.lang.disabling)
-      this.log.warn('***** %s. *****', eText)
-      this.pluginShutdown()
-    }
-  }
-
-  pluginShutdown () {
-    // A function that is called when the plugin fails to load or Homebridge restarts
-    try {
-      // Shutdown the listener server if it's running
-      if (apiServer) {
-        apiServer.close(() => {
-          if (this.config.debug) {
-            this.log('%s.', this.lang.apiShutdown)
-          }
-        })
-      }
-
-      // Stop the LAN monitoring
-      if (lanClient) {
-        lanClient.closeConnection()
-      }
-
-      // Close the WS connection
-      if (wsClient) {
-        clearInterval(this.wsRefresh)
-        wsClient.closeConnection()
-      }
-    } catch (err) {
-      // No need to show errors at this point
-    }
-  }
-
-  async initialiseDevice (device) {
-    try {
-      let accessory
-      const uiid = device.extra && device.extra.uiid ? device.extra.uiid : 0
-      const uuid = this.api.hap.uuid.generate(device.deviceid + 'SWX')
-      device.showAs =
-        this.deviceConf[device.deviceid] && this.deviceConf[device.deviceid].showAs
-          ? this.deviceConf[device.deviceid].showAs
-          : 'default'
-
-      // Remove old sub accessories for Accessory Simulations and DUALR3 in motor/meter mode
-      if (
-        device.showAs !== 'default' ||
-        (this.consts.devices.switchMultiPower.includes(uiid) &&
-          [2, 3].includes(device.params.workMode))
-      ) {
-        for (let i = 0; i <= 4; i++) {
-          const uuidsub = this.api.hap.uuid.generate(device.deviceid + 'SW' + i)
-          if (devicesInHB.has(uuidsub)) {
-            this.removeAccessory(devicesInHB.get(uuidsub))
-          }
-        }
-      }
-
-      // Set up the correct instance for this particular device
-      if (this.consts.devices.switchMultiPower.includes(uiid) && device.params.workMode === 2) {
-        /*************************
-        BLINDS [DUALR3 MOTOR MODE]
-        *************************/
-        // Check the device has been calibrated
-        if (device.params.calibState === 0) {
-          if (devicesInHB.has(uuid)) {
-            this.removeAccessory(devicesInHB.get(uuid))
-          }
-          this.log.warn('[%s] %s.', device.name, this.lang.dualr3NoCalib)
-          this.ignoredDevices.push(device.deviceid)
-          return
-        }
-        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require('./device/motor'))(this, accessory)
-        /************************/
-      } else if (
-        this.consts.devices.switchMultiPower.includes(uiid) &&
-        device.params.workMode === 3
-      ) {
-        /*************************
-        BLINDS [DUALR3 METER MODE]
-        *************************/
-        if (devicesInHB.has(uuid)) {
-          this.removeAccessory(devicesInHB.get(uuid))
-        }
-        this.log.warn('[%s] %s.', device.name, this.lang.dualr3NoMeter)
-        this.ignoredDevices.push(device.deviceid)
-        return
-      } else if (this.consts.devices.panel.includes(uiid)) {
-        /******
-        NSPANEL
-        ******/
-        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require('./device/panel'))(this, accessory)
-        /*****/
-      } else if (this.consts.devices.curtain.includes(uiid)) {
-        /****************************
-        BLINDS [EWELINK UIID 11 & 67]
-        ****************************/
-        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require('./device/curtain'))(this, accessory)
-        /***************************/
-      } else if (device.showAs === 'blind') {
-        /****************************
-        BLINDS [ACCESSORY SIMULATION]
-        ****************************/
-        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require('./device/simulation/blind'))(this, accessory)
-        /***************************/
-      } else if (device.showAs === 'door') {
-        /***************************
-        DOORS [ACCESSORY SIMULATION]
-        ***************************/
-        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require('./device/simulation/door'))(this, accessory)
-        /**************************/
-      } else if (device.showAs === 'window') {
-        /*****************************
-        WINDOWS [ACCESSORY SIMULATION]
-        *****************************/
-        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require('./device/simulation/window'))(this, accessory)
-        /****************************/
-      } else if (this.obstructSwitches[device.deviceid]) {
-        /*****************************
-        OBSTRUCTION DETECTION SWITCHES
-        *****************************/
-        const instance = './device/simulation/garage-od-switch'
-        accessory = this.addAccessory(device, device.deviceid + 'SWX', true)
-        accessory.control = new (require(instance))(this, accessory, devicesInHB)
-        /****************************/
-      } else if (
-        Object.values(this.deviceConf).some(el => el.sensorId === device.deviceid) &&
-        (this.consts.devices.garageSensors.includes(uiid) || device.showAs === 'sensor')
-      ) {
-        /*****************************************
-        SENSORS [AS GARAGE/LOCK SENSOR SIMULATION]
-        *****************************************/
-        const sim = Object.entries(this.deviceConf).find(
-          ([id, el]) => el.sensorId === device.deviceid && ['garage', 'lock'].includes(el.showAs)
-        )
-        const uuidSub = this.api.hap.uuid.generate(sim[0] + 'SWX')
-        if (devicesInHB.has(uuidSub)) {
-          const subAccessory = devicesInHB.get(uuidSub)
-          let instance
-          if (sim[1].hideSensor) {
-            // If the sensor exists in Homebridge then remove it as needs to be re-added as hidden
-            if (devicesInHB.has(uuid)) {
-              this.removeAccessory(devicesInHB.get(uuid))
-            }
-            instance = './device/simulation/sensor-hidden'
-            accessory = this.addAccessory(device, device.deviceid + 'SWX', true)
-          } else {
-            instance = './device/simulation/sensor-visible'
-            accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
-          }
-          accessory.control = new (require(instance))(this, accessory, subAccessory)
-        } else {
-          accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
-          this.log.warn('[%s] %s.', accessory.displayName, this.lang.sensorNoDevice)
-          accessory.control = new (require('./device/sensor-contact'))(this, accessory)
-        }
-        /***********************************************/
-      } else if (device.showAs === 'garage') {
-        /****************************************
-        GARAGE DOORS [ONE] [ACCESSORY SIMULATION]
-        ****************************************/
-        const instance = './device/simulation/garage-one'
-        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require(instance))(this, accessory, devicesInHB)
-        /***************************************/
-      } else if (device.showAs === 'garage_two') {
-        /****************************************
-        GARAGE DOORS [TWO] [ACCESSORY SIMULATION]
-        ****************************************/
-        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require('./device/simulation/garage-two'))(this, accessory)
-        /***************************************/
-      } else if (device.showAs === 'garage_four') {
-        /*****************************************
-        GARAGE DOORS [FOUR] [ACCESSORY SIMULATION]
-        *****************************************/
-        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require('./device/simulation/garage-four'))(this, accessory)
-        /****************************************/
-      } else if (device.showAs === 'garage_eachen') {
-        /***************************
-        GARAGE DOORS [EACHEN GD-DC5]
-        ***************************/
-        const instance =
-          this.deviceConf[device.deviceid] &&
-          this.deviceConf[device.deviceid].showAsEachen === 'lock'
-            ? 'lock-eachen'
-            : 'garage-eachen'
-        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require('./device/simulation/' + instance))(this, accessory)
-        /**************************/
-      } else if (device.showAs === 'gate') {
-        /********************************************
-        GATES (AS GARAGE DOOR) [ACCESSORY SIMULATION]
-        ********************************************/
-        const instance = './device/simulation/gate-one'
-        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require(instance))(this, accessory, devicesInHB)
-        /*******************************************/
-      } else if (device.showAs === 'lock') {
-        /***************************
-        LOCKS [ACCESSORY SIMULATION]
-        ***************************/
-        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require('./device/simulation/lock-one'))(this, accessory)
-        /**************************/
-      } else if (device.showAs === 'switch_valve') {
-        /**********************************
-        SWITCH-VALVE [ACCESSORY SIMULATION]
-        **********************************/
-        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require('./device/simulation/switch-valve'))(this, accessory)
-        /*********************************/
-      } else if (device.showAs === 'tap') {
-        /********************************
-        TAPS [ONE] [ACCESSORY SIMULATION]
-        ********************************/
-        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require('./device/simulation/tap-one'))(this, accessory)
-        /*******************************/
-      } else if (device.showAs === 'tap_two') {
-        /********************************
-        TAPS [TWO] [ACCESSORY SIMULATION]
-        ********************************/
-        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require('./device/simulation/tap-two'))(this, accessory)
-        /*******************************/
-      } else if (device.showAs === 'valve') {
-        /**********************************
-        VALVES [ONE] [ACCESSORY SIMULATION]
-        **********************************/
-        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require('./device/simulation/valve-one'))(this, accessory)
-        /*********************************/
-      } else if (device.showAs === 'valve_two') {
-        /**********************************
-        VALVES [TWO] [ACCESSORY SIMULATION]
-        **********************************/
-        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require('./device/simulation/valve-two'))(this, accessory)
-        /*********************************/
-      } else if (device.showAs === 'valve_four') {
-        /***********************************
-        VALVES [FOUR] [ACCESSORY SIMULATION]
-        ***********************************/
-        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require('./device/simulation/valve-four'))(this, accessory)
-        /**********************************/
-      } else if (device.showAs === 'sensor') {
-        /*******************
-        SENSORS [SIMULATION]
-        *******************/
-        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require('./device/simulation/sensor'))(this, accessory)
-        /******************/
-      } else if (device.showAs === 'p_button') {
-        /*******************************
-        PROGRAMMABLE BUTTON [SIMULATION]
-        *******************************/
-        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require('./device/simulation/p-button'))(this, accessory)
-        /******************************/
-      } else if (device.showAs === 'doorbell') {
-        /********************
-        DOORBELL [SIMULATION]
-        ********************/
-        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require('./device/simulation/doorbell'))(this, accessory)
-        /*******************/
-      } else if (device.showAs === 'purifier') {
-        /*********************
-        PURIFIERS [SIMULATION]
-        *********************/
-        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require('./device/simulation/purifier'))(this, accessory)
-        /********************/
-      } else if (device.showAs === 'audio') {
-        /***************************
-        AUDIO RECEIVERS [SIMULATION]
-        ***************************/
-        if (devicesInHB.has(uuid)) {
-          this.removeAccessory(devicesInHB.get(uuid))
-        }
-        accessory = this.addExternalAccessory(device, device.deviceid + 'SWX', 34)
-        accessory.control = new (require('./device/simulation/tv'))(this, accessory)
-        /**************************/
-      } else if (device.showAs === 'box') {
-        /***********************
-        SET TOP BOX [SIMULATION]
-        ***********************/
-        if (devicesInHB.has(uuid)) {
-          this.removeAccessory(devicesInHB.get(uuid))
-        }
-        accessory = this.addExternalAccessory(device, device.deviceid + 'SWX', 35)
-        accessory.control = new (require('./device/simulation/tv'))(this, accessory)
-        /**********************/
-      } else if (device.showAs === 'stick') {
-        /***************************
-        STREAMING STICK [SIMULATION]
-        ***************************/
-        if (devicesInHB.has(uuid)) {
-          this.removeAccessory(devicesInHB.get(uuid))
-        }
-        accessory = this.addExternalAccessory(device, device.deviceid + 'SWX', 36)
-        accessory.control = new (require('./device/simulation/tv'))(this, accessory)
-        /**************************/
-      } else if (
-        device.showAs === 'sensor_leak' &&
-        this.consts.devices.sensorContact.includes(uiid)
-      ) {
-        /**************************************
-        SENSORS [LEAK DW2 ACCESSORY SIMULATION]
-        **************************************/
-        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require('./device/simulation/sensor-leak'))(this, accessory)
-        /*************************************/
-      } else if (this.consts.devices.sensorContact.includes(uiid)) {
-        /*******************
-        SENSORS [SONOFF DW2]
-        *******************/
-        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require('./device/sensor-contact'))(this, accessory)
-      } else if (this.consts.devices.fan.includes(uiid)) {
-        /***
-        FANS
-        ***/
-        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require('./device/fan'))(this, accessory)
-        /**/
-      } else if (this.consts.devices.diffuser.includes(uiid)) {
-        /********
-        DIFFUSERS
-        ********/
-        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require('./device/diffuser'))(this, accessory)
-        /*******/
-      } else if (this.consts.devices.humidifier.includes(uiid)) {
-        /**********
-        HUMIDIFIERS
-        **********/
-        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require('./device/humidifier'))(this, accessory)
-        /*********/
-      } else if (this.consts.devices.thermostat.includes(uiid)) {
-        /**********
-        THERMOSTATS
-        **********/
-        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require('./device/thermostat'))(this, accessory)
-        /*******/
-      } else if (
-        device.showAs === 'thermostat' &&
-        this.consts.devices.sensorAmbient.includes(uiid)
-      ) {
-        /*****************************************
-        THERMOSTATS [TH10/16 ACCESSORY SIMULATION]
-        *****************************************/
-        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.context.sensorType = device.params.sensorType
-        accessory.control = new (require('./device/simulation/th-thermostat'))(this, accessory)
-        /****************************************/
-      } else if (device.showAs === 'heater' && this.consts.devices.sensorAmbient.includes(uiid)) {
-        /*************************************
-        HEATERS [TH10/16 ACCESSORY SIMULATION]
-        *************************************/
-        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.context.sensorType = device.params.sensorType
-        accessory.control = new (require('./device/simulation/th-heater'))(this, accessory)
-        /************************************/
-      } else if (device.showAs === 'cooler' && this.consts.devices.sensorAmbient.includes(uiid)) {
-        /*************************************
-        COOLERS [TH10/16 ACCESSORY SIMULATION]
-        *************************************/
-        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.context.sensorType = device.params.sensorType
-        accessory.control = new (require('./device/simulation/th-cooler'))(this, accessory)
-        /************************************/
-      } else if (
-        device.showAs === 'humidifier' &&
-        this.consts.devices.sensorAmbient.includes(uiid)
-      ) {
-        /*****************************************
-        HUMIDIFIERS [TH10/16 ACCESSORY SIMULATION]
-        *****************************************/
-        if (device.params.sensorType === 'DS18B20') {
-          if (devicesInHB.has(uuid)) {
-            this.removeAccessory(devicesInHB.get(uuid))
-          }
-          this.log.warn('[%s] %s.', device.name, this.lang.sensorErr)
-          return
-        }
-        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.context.sensorType = device.params.sensorType
-        accessory.control = new (require('./device/simulation/th-humidifier'))(this, accessory)
-        /*****************************************/
-      } else if (
-        device.showAs === 'dehumidifier' &&
-        this.consts.devices.sensorAmbient.includes(uiid)
-      ) {
-        /*******************************************
-        DEHUMIDIFIERS [TH10/16 ACCESSORY SIMULATION]
-        *******************************************/
-        if (device.params.sensorType === 'DS18B20') {
-          this.log.warn('[%s] %s.', device.name, this.lang.sensorErr)
-          return
-        }
-        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
-        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.context.sensorType = device.params.sensorType
-        accessory.control = new (require('./device/simulation/th-dehumidifier'))(this, accessory)
-        /*******************************************/
-      } else if (this.consts.devices.sensorAmbient.includes(uiid)) {
-        /***********************
-        SENSOR [AMBIENT-TH10/16]
-        ***********************/
-        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.context.sensorType = device.params.sensorType
-        accessory.control = new (require('./device/sensor-ambient'))(this, accessory)
-        /**********************/
-      } else if (this.consts.devices.sensorTempHumi.includes(uiid)) {
-        /*************************
-        SENSOR [AMBIENT-SONOFF SC]
-        *************************/
-        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require('./device/sensor-temp-humi'))(this, accessory)
-        /************************/
-      } else if (device.showAs === 'heater') {
-        /*******************
-        HEATERS [SIMULATION]
-        *******************/
-        if (!this.deviceConf[device.deviceid].temperatureSource) {
-          this.log.warn('[%s] %s.', device.name, this.lang.heaterSimNoSensor)
-          if (devicesInHB.has(uuid)) {
-            this.removeAccessory(devicesInHB.get(uuid))
-          }
-          return
-        }
-        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require('./device/simulation/heater'))(this, accessory)
-        /******************/
-      } else if (device.showAs === 'cooler') {
-        /*******************
-        COOLERS [SIMULATION]
-        *******************/
-        if (!this.deviceConf[device.deviceid].temperatureSource) {
-          this.log.warn('[%s] %s.', device.name, this.lang.heaterSimNoSensor)
-          if (devicesInHB.has(uuid)) {
-            this.removeAccessory(devicesInHB.get(uuid))
-          }
-          return
-        }
-        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require('./device/simulation/cooler'))(this, accessory)
-        /******************/
-      } else if (this.consts.devices.lightRGB.includes(uiid)) {
-        /***********
-        LIGHTS [RGB]
-        ***********/
-        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require('./device/light-rgb'))(this, accessory)
-        /**********/
-      } else if (this.consts.devices.lightCCT.includes(uiid)) {
-        /***********
-        LIGHTS [CCT]
-        ***********/
-        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require('./device/light-cct'))(this, accessory)
-        /**********/
-      } else if (this.consts.devices.lightRGBCCT.includes(uiid)) {
-        /*****************
-        LIGHTS [RGB & CCT]
-        *****************/
-        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require('./device/light-rgb-cct'))(this, accessory)
-        /****************/
-      } else if (this.consts.devices.lightDimmer.includes(uiid)) {
-        /**************
-        LIGHTS [DIMMER]
-        **************/
-        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require('./device/light-dimmer'))(this, accessory)
-        /*************/
-        /**********************/
-      } else if (
-        this.consts.devices.switchSingle.includes(uiid) ||
-        this.consts.devices.switchSinglePower.includes(uiid) ||
-        this.consts.devices.switchSCM.includes(uiid) ||
-        this.consts.devices.switchSCMPower.includes(uiid)
-      ) {
-        /********************************
-        SWITCHES/OUTLETS [SINGLE CHANNEL]
-        ********************************/
-        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control =
-          device.showAs === 'outlet'
-            ? this.deviceConf[device.deviceid] && this.deviceConf[device.deviceid].isInched
-              ? new (require('./device/outlet-single-inched'))(this, accessory)
-              : new (require('./device/outlet-single'))(this, accessory)
-            : this.deviceConf[device.deviceid] && this.deviceConf[device.deviceid].isInched
-            ? new (require('./device/switch-single-inched'))(this, accessory)
-            : new (require('./device/switch-single'))(this, accessory)
-        /*******************************/
-      } else if (
-        this.consts.devices.switchMulti.includes(uiid) ||
-        this.consts.devices.switchMultiPower.includes(uiid)
-      ) {
-        /*******************************
-        SWITCHES/OUTLETS [MULTI CHANNEL]
-        *******************************/
-
-        // If a single accessory is leftover from a simulation then remove it
-        if (devicesInHB.has(uuid)) {
-          this.removeAccessory(devicesInHB.get(uuid))
-        }
-
-        // Loop through the channels of the device
-        for (let i = 0; i <= this.consts.supportedDevices[uiid]; i++) {
-          let subAccessory
-          const uuidsub = this.api.hap.uuid.generate(device.deviceid + 'SW' + i)
-
-          // Check if the user has chosen to hide any channels for this device
-          if (
-            this.hideChannels.includes(device.deviceid + 'SW' + i) ||
-            (i === 0 &&
-              this.deviceConf[device.deviceid] &&
-              this.deviceConf[device.deviceid].inchChannels)
-          ) {
-            // The user has hidden this channel so if it exists then remove it
-            if (devicesInHB.has(uuidsub)) {
-              this.removeAccessory(devicesInHB.get(uuidsub))
-            }
-
-            // If this is the main channel then add it to the array of hidden masters
-            if (i === 0) {
-              this.hideMasters.push(device.deviceid)
-            }
-
-            // Add the sub accessory, but hidden, to Homebridge
-            subAccessory = this.addAccessory(device, device.deviceid + 'SW' + i, true)
-          } else {
-            // The user has not hidden this channel
-            subAccessory =
-              devicesInHB.get(uuidsub) || this.addAccessory(device, device.deviceid + 'SW' + i)
-          }
-
-          // Add context information to the sub accessory
-          subAccessory.context.firmware = device.params.fwVersion || plugin.version
-          subAccessory.context.reachableWAN = wsClient && device.online
-          subAccessory.context.reachableLAN =
-            lanClient && lanDevices.has(device.deviceid) && lanDevices.get(device.deviceid).ip
-          subAccessory.context.eweBrandName = device.brandName
-          subAccessory.context.eweBrandLogo = device.brandLogo
-          subAccessory.context.eweShared =
-            device.sharedBy && device.sharedBy.email ? device.sharedBy.email : false
-          subAccessory.context.ip =
-            lanClient && subAccessory.context.reachableLAN
-              ? lanDevices.get(device.deviceid).ip
-              : false
-          subAccessory.context.macAddress =
-            device.extra && device.extra.staMac
-              ? device.extra.staMac.replace(/[:]+/g, '').replace(/..\B/g, '$&:')
-              : false
-          subAccessory.context.lanKey = device.devicekey
-          subAccessory.control =
-            device.showAs === 'outlet'
-              ? new (require('./device/outlet-multi'))(this, subAccessory, devicesInHB)
-              : new (require('./device/switch-multi'))(this, subAccessory, devicesInHB)
-
-          // Mark the online/offline status of certain devices
-          if (wsClient && subAccessory.control && subAccessory.control.markStatus) {
-            subAccessory.control.markStatus(device.online)
-          }
-
-          // Update any changes to the sub accessory to the platform
-          this.api.updatePlatformAccessories(plugin.name, plugin.alias, [subAccessory])
-          devicesInHB.set(subAccessory.UUID, subAccessory)
-          if (i === 0) {
-            accessory = subAccessory
-          }
-        }
-        /******************************/
-      } else if (this.consts.devices.switchMate.includes(uiid)) {
-        /*******************
-        SWITCH MATE (S-MATE)
-        *******************/
-        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require('./device/switch-mate'))(this, accessory)
-        /******************/
-      } else if (this.consts.devices.rfBridge.includes(uiid)) {
-        /*********************
-        RF BRIDGE + SUBDEVICES
-        *********************/
-        let rfChlCounter = 0
-
-        // Make an array of sub devices connected to the RF Bridge
-        const rfMap = []
-        if (device.tags && device.tags.zyx_info) {
-          device.tags.zyx_info.forEach(remote =>
-            rfMap.push({
-              name: remote.name,
-              type: remote.remote_type,
-              buttons: Object.assign({}, ...remote.buttonName)
-            })
-          )
-        }
-        accessory = this.addAccessory(device, device.deviceid + 'SW0', true, { rfMap }, 'rf_pri')
-        const instance = './device/rf-bridge'
-        accessory.control = new (require(instance))(this, accessory, devicesInHB)
-
-        // We don't want to add the main bridge as a visible accessory in Homebridge
-        this.hideMasters.push(device.deviceid)
-
-        // Flag used for later to remove and re-add the subdevices if user configured
-        const resetRF =
-          this.deviceConf[device.deviceid] && this.deviceConf[device.deviceid].resetOnStartup
-
-        // Loop through each sub device connected to the RF Bridge
-        rfMap.forEach(subDevice => {
-          const swNumber = rfChlCounter + 1
-          let subAccessory
-          let subType
-          const fullDeviceId = device.deviceid + 'SW' + swNumber
-          const uuidsub = this.api.hap.uuid.generate(fullDeviceId)
-          const deviceConf = this.rfSubdevices[fullDeviceId] || {}
-
-          // Check which eWeLink type the connected sub device is
-          let instance
-          switch (subDevice.type) {
-            case '1':
-            case '2':
-            case '3':
-            case '4':
-              subType = 'button'
-              instance = 'rf-button'
-              break
-            case '5':
-              switch (deviceConf.curtainType) {
-                case 'blind':
-                case 'door':
-                case 'window':
-                  subType = deviceConf.curtainType
-                  instance = 'simulation/rf-' + deviceConf.curtainType
-                  break
-                default:
-                  subType = 'curtain'
-                  instance = 'rf-button'
-                  break
-              }
-              break
-            case '6':
-            case '7':
-              subType = 'sensor'
-              instance = 'rf-sensor'
-              break
-            default: {
-              this.log.warn(
-                '[%s] %s:\n[%s-%s] %s.',
-                device.name,
-                this.lang.devNotSupYet,
-                uiid,
-                subDevice.type || '?',
-                JSON.stringify(device.params)
-              )
-              return
-            }
-          }
-
-          // Create an object to save to the sub accessory context
-          const subExtraContext = {
-            buttons: subDevice.buttons,
-            subType,
-            swNumber,
-            name: subDevice.name
-          }
-
-          // Check if we need to reset the RF devices
-          if (resetRF && (subAccessory = devicesInHB.get(uuidsub))) {
-            this.removeAccessory(subAccessory)
-          }
-
-          // Get the sub accessory if it's new or hasn't been removed above
-          subAccessory =
-            devicesInHB.get(uuidsub) ||
-            this.addAccessory(device, fullDeviceId, false, subExtraContext, 'rf_sub')
-
-          // Add context information to the sub accessory
-          subAccessory.context.firmware = device.params.fwVersion || plugin.version
-          subAccessory.context.reachableWAN = wsClient && device.online
-          subAccessory.context.reachableLAN =
-            lanClient && lanDevices.has(device.deviceid) && lanDevices.get(device.deviceid).ip
-          subAccessory.context.eweBrandName = device.brandName
-          subAccessory.context.eweBrandLogo = device.brandLogo
-          subAccessory.context.eweShared =
-            device.sharedBy && device.sharedBy.email ? device.sharedBy.email : false
-          subAccessory.context.ip =
-            lanClient && subAccessory.context.reachableLAN
-              ? lanDevices.get(device.deviceid).ip
-              : false
-          subAccessory.context.macAddress =
-            device.extra && device.extra.staMac
-              ? device.extra.staMac.replace(/[:]+/g, '').replace(/..\B/g, '$&:')
-              : false
-          subAccessory.context.lanKey = device.devicekey
-
-          subAccessory.context.subType = subType
-
-          // Get the instance for this RF device
-          subAccessory.control = new (require('./device/' + instance))(this, subAccessory)
-
-          // Mark the online/offline status of certain devices
-          if (wsClient && subAccessory.control && subAccessory.control.markStatus) {
-            subAccessory.control.markStatus(device.online)
-          }
-
-          // Update any changes to the sub accessory to the platform
-          this.api.updatePlatformAccessories(plugin.name, plugin.alias, [subAccessory])
-          devicesInHB.set(subAccessory.UUID, subAccessory)
-
-          // Increment the counter
-          rfChlCounter += Object.keys(subDevice.buttons || {}).length
-        })
-
-        // Update any changes to the accessory to the platform
-        accessory.context.channelCount = rfChlCounter
-        /********************/
-      } else if (this.consts.devices.zbBridge.includes(uiid)) {
-        /************
-        ZIGBEE BRIDGE
-        ************/
-        this.ignoredDevices.push(device.deviceid)
-        return
-        /***********/
-      } else if (this.consts.devices.zbSwitchStateless.includes(uiid)) {
-        /**********************
-        ZIGBEE STATELESS SWITCH
-        **********************/
-        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require('./device/zigbee/switch-stateless'))(this, accessory)
-        /*********************/
-      } else if (this.consts.devices.zbLightDimmer.includes(uiid)) {
-        /*****************
-        ZB LIGHTS [DIMMER]
-        *****************/
-        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require('./device/zigbee/light-dimmer'))(this, accessory)
-        /****************/
-      } else if (this.consts.devices.zbLightCCT.includes(uiid)) {
-        /**************
-        ZB LIGHTS [CCT]
-        **************/
-        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require('./device/zigbee/light-cct'))(this, accessory)
-        /*************/
-      } else if (this.consts.devices.zbSensorAmbient.includes(uiid)) {
-        /******************
-        ZB SENSOR [AMBIENT]
-        ******************/
-        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require('./device/zigbee/sensor-ambient'))(this, accessory)
-        /*****************/
-      } else if (this.consts.devices.zbSensorMotion.includes(uiid)) {
-        /*****************
-        ZB SENSOR [MOTION]
-        *****************/
-        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require('./device/zigbee/sensor-motion'))(this, accessory)
-        /****************/
-      } else if (this.consts.devices.zbSensorContact.includes(uiid)) {
-        /******************
-        ZB SENSOR [CONTACT]
-        ******************/
-        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require('./device/zigbee/sensor-contact'))(this, accessory)
-        /*****************/
-      } else if (this.consts.devices.zbSensorWater.includes(uiid)) {
-        /***************
-        ZB SENSOR [LEAK]
-        ***************/
-        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require('./device/zigbee/sensor-leak'))(this, accessory)
-        /**************/
-      } else if (this.consts.devices.zbSensorSmoke.includes(uiid)) {
-        /****************
-        ZB SENSOR [SMOKE]
-        ****************/
-        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require('./device/zigbee/sensor-smoke'))(this, accessory)
-        /***************/
-      } else if (this.consts.devices.group.includes(uiid)) {
-        /*************
-        EWELINK GROUPS
-        *************/
-        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.context.groupUIID = device.uiid
-        accessory.control = new (require('./device/group'))(this, accessory)
-        /************/
-      } else if (this.consts.devices.camera.includes(uiid)) {
-        /*************
-        SONOFF CAMERAS
-        *************/
-        this.log('[%s] %s.', device.name, this.lang.sonoffCamera)
-        this.ignoredDevices.push(device.deviceid)
-        return
-        /************/
-      } else if (this.consts.devices.template.includes(uiid)) {
-        /***********
-        TEMPLATE DEV
-        ***********/
-        accessory = devicesInHB.get(uuid) || this.addAccessory(device, device.deviceid + 'SWX')
-        accessory.control = new (require('./device/template'))(this, accessory)
-        /**********/
-      } else if (this.consts.devices.cannotSupport.includes(uiid)) {
-        /*******************************
-        DEVICES THAT CANNOT BE SUPPORTED
-        *******************************/
-        this.log('[%s] %s.', device.name, this.lang.devNotSup)
-        this.ignoredDevices.push(device.deviceid)
-        return
-        /******************************/
-      } else {
-        /**********************
-        DEVICES PENDING SUPPORT
-        **********************/
-        this.log.warn(
-          '[%s] %s:\n[%s] %s.',
-          device.name,
-          this.lang.devNotSupYet,
-          uiid,
-          JSON.stringify(device.params)
-        )
-        return
-        /*********************/
-      }
-
-      // Update the reachability values (via WS and LAN)
-      accessory.context.firmware = device.params.fwVersion || plugin.version
-      accessory.context.reachableWAN = wsClient && device.online
-      accessory.context.reachableLAN =
-        lanClient && lanDevices.has(device.deviceid) && lanDevices.get(device.deviceid).ip
-      accessory.context.eweBrandName = device.brandName
-      accessory.context.eweBrandLogo = device.brandLogo
-      accessory.context.eweShared =
-        device.sharedBy && device.sharedBy.email ? device.sharedBy.email : false
-      accessory.context.ip =
-        lanClient && accessory.context.reachableLAN ? lanDevices.get(device.deviceid).ip : false
-      accessory.context.macAddress =
-        device.extra && device.extra.staMac
-          ? device.extra.staMac.replace(/[:]+/g, '').replace(/..\B/g, '$&:')
-          : false
-      accessory.context.lanKey = device.devicekey
-
-      // Add the uuid and lanKey to the lanClient map
-      if (lanClient) {
-        lanClient.addDeviceDetailsToMap(device.deviceid, accessory.context)
-      }
-
-      // Helpful logging for each device
-      const str = accessory.context.reachableLAN
-        ? this.lang.foundWithIP + ' [' + lanDevices.get(device.deviceid).ip + ']'
-        : this.lang.lanUnsupported
-
-      // Check to see if the discovered IP is different from any manually configured IP
-      if (
-        accessory.context.reachableLAN &&
-        this.ipOverride[device.deviceid] &&
-        this.ipOverride[device.deviceid] !== lanDevices.get(device.deviceid).ip
-      ) {
-        this.log.warn(
-          '[%s] %s [%s].',
-          accessory.displayName,
-          this.lang.lanIPDifferent,
-          lanDevices.get(device.deviceid).ip
-        )
-      }
-
-      // Check to see if it's a shared device being used with the cloud
-      if (!accessory.context.reachableLAN && accessory.context.eweShared) {
-        this.log.warn('[%s] %s.', accessory.displayName, this.lang.shareWarn)
-      }
-
-      // Check to see if the device has initially been reported offline
-      if (wsClient && !accessory.context.reachableWAN && !accessory.context.reachableLAN) {
-        this.log.warn('[%s] %s %s.', accessory.displayName, this.lang.repOffline, this.lang.viaWS)
-      }
-
-      // Update accessory characteristics with latest values
-      if (wsClient && accessory.control && accessory.control.externalUpdate) {
-        accessory.control.externalUpdate(device.params)
-
-        // Mark the online/offline status of certain devices
-        if (accessory.control.markStatus) {
-          accessory.control.markStatus(device.online)
-        }
-      }
-
-      // Update any changes to the device into our devicesInHB map
-      this.api.updatePlatformAccessories(plugin.name, plugin.alias, [accessory])
-      devicesInHB.set(accessory.UUID, accessory)
-      if (uiid === 5000) {
-        this.log(
-          '[%s] %s [%s] [%s].',
-          accessory.displayName,
-          this.lang.devInitGroup,
-          device.deviceid,
-          uiid
-        )
-      } else {
-        this.log(
-          '[%s] %s %s [%s:%s].',
-          accessory.displayName,
-          this.lang.devInit,
-          str,
-          uiid,
-          device.productModel
-        )
-      }
-
-      // Store the device in the persist file
-      if (this.storageClientLAN && this.consts.devices.lan.includes(uiid)) {
-        try {
-          await this.storageLAN.setItem(device.deviceid, device)
-        } catch (err) {
-          if (this.config.debug) {
-            const eText = this.funcs.parseError(err)
-            this.log.warn('[%s] %s %s.', accessory.displayName, this.lang.storageWriteErr, eText)
-          }
-        }
-      }
-    } catch (err) {
-      // Catch any errors during initialisation
-      const eText = this.funcs.parseError(err)
-      this.log.warn('[%s] %s %s.', device.name, this.lang.devNotInit, eText)
-    }
-  }
-
-  addAccessory (device, hbDeviceId, hidden = false, extraContext = {}, type = '') {
-    // Add an accessory to Homebridge
-    let newDeviceName
-    try {
-      // Get the switchNumber which can be {X, 0, 1, 2, 3, 4, ...}
-      const switchNumber = hbDeviceId.split('SW')[1].toString()
-      const channelCount =
-        type === 'rf_pri'
-          ? Object.keys((device.tags && device.tags.zyx_info) || []).length
-          : this.consts.supportedDevices[device.extra.uiid]
-
-      // Set up the device name which can depend on the accessory type
-      if (type === 'rf_sub') {
-        // RF accessories have their name stored in the context
-        newDeviceName = extraContext.name
-      } else {
-        // Other accessories store the name initially as the device name
-        newDeviceName = device.name
-
-        // Check if it's a channel of a multi-channel device
-        if (['1', '2', '3', '4'].includes(switchNumber)) {
-          // Try and obtain the eWeLink channel name
-          if (
-            device.tags &&
-            device.tags.ck_channel_name &&
-            device.tags.ck_channel_name[parseInt(switchNumber) - 1]
-          ) {
-            // Found the eWeLink channel name
-            newDeviceName = device.tags.ck_channel_name[parseInt(switchNumber) - 1]
-          } else {
-            // Didn't find the eWeLink channel name use generic SW channel
-            newDeviceName += ' SW' + switchNumber
-          }
-        }
-      }
-
-      // Add the new accessory to Homebridge
-      const accessory = new this.api.platformAccessory(
-        newDeviceName,
-        this.api.hap.uuid.generate(hbDeviceId)
-      )
-
-      // If it isn't a hidden device then set the accessory characteristics
-      if (!hidden) {
-        accessory
-          .getService(this.api.hap.Service.AccessoryInformation)
-          .setCharacteristic(this.api.hap.Characteristic.Name, newDeviceName)
-          .setCharacteristic(this.api.hap.Characteristic.ConfiguredName, newDeviceName)
-          .setCharacteristic(this.api.hap.Characteristic.SerialNumber, hbDeviceId)
-          .setCharacteristic(this.api.hap.Characteristic.Manufacturer, device.brandName)
-          .setCharacteristic(
-            this.api.hap.Characteristic.Model,
-            device.productModel + ' (' + device.extra.model + ')'
-          )
-          .setCharacteristic(
-            this.api.hap.Characteristic.FirmwareRevision,
-            device.params.fwVersion || plugin.version
-          )
-          .setCharacteristic(this.api.hap.Characteristic.Identify, true)
-      }
-
-      // Add helpful context values to the accessory
-      accessory.context = {
-        ...{
-          hbDeviceId,
-          eweDeviceId: device.deviceid,
-          eweUIID: device.extra.uiid,
-          eweModel: device.productModel,
-          eweApiKey: device.apikey,
-          switchNumber,
-          channelCount,
-          hidden
-        },
-        ...extraContext
-      }
-
-      // Register the accessory if it hasn't been hidden by the user
-      if (!hidden) {
-        this.api.registerPlatformAccessories(plugin.name, plugin.alias, [accessory])
-        this.log('[%s] %s.', newDeviceName, this.lang.devAdd)
-      }
-
-      // Return the new accessory
-      this.configureAccessory(accessory)
-      return accessory
-    } catch (err) {
-      // Catch any errors during add
-      const eText = this.funcs.parseError(err)
-      this.log.warn('[%s] %s %s.', newDeviceName, this.lang.devNotAdd, eText)
-      return false
-    }
-  }
-
-  addExternalAccessory (device, hbDeviceId, category) {
-    try {
-      // Add the new accessory to Homebridge
-      const accessory = new this.api.platformAccessory(
-        device.name,
-        this.api.hap.uuid.generate(hbDeviceId),
-        category
-      )
-
-      // Set the accessory characteristics
-      accessory
-        .getService(this.api.hap.Service.AccessoryInformation)
-        .setCharacteristic(this.api.hap.Characteristic.Name, device.name)
-        .setCharacteristic(this.api.hap.Characteristic.ConfiguredName, device.name)
-        .setCharacteristic(this.api.hap.Characteristic.SerialNumber, hbDeviceId)
-        .setCharacteristic(this.api.hap.Characteristic.Manufacturer, device.brandName)
-        .setCharacteristic(
-          this.api.hap.Characteristic.Model,
-          device.productModel + ' (' + device.extra.model + ')'
-        )
-        .setCharacteristic(
-          this.api.hap.Characteristic.FirmwareRevision,
-          device.params.fwVersion || plugin.version
-        )
-        .setCharacteristic(this.api.hap.Characteristic.Identify, true)
-
-      // Add helpful context values to the accessory
-      accessory.context = {
-        ...{
-          hbDeviceId,
-          eweDeviceId: device.deviceid,
-          eweUIID: device.extra.uiid,
-          eweModel: device.productModel,
-          eweApiKey: device.apikey,
-          switchNumber: hbDeviceId.split('SW')[1].toString(),
-          channelCount: this.consts.supportedDevices[device.extra.uiid],
-          hidden: false
-        }
-      }
-
-      // Register the accessory
-      this.api.publishExternalAccessories(plugin.name, [accessory])
-      this.log('[%s] %s.', device.name, this.lang.devAdd)
-
-      // Return the new accessory
-      this.configureAccessory(accessory)
-      return accessory
-    } catch (err) {
-      // Catch any errors during add
-      const eText = this.funcs.parseError(err)
-      this.log.warn('[%s] %s %s.', device.name, this.lang.devNotAdd, eText)
-      return false
-    }
-  }
-
-  configureAccessory (accessory) {
-    // Set the correct firmware version if we can
-    if (this.api && accessory.context.firmware) {
-      accessory
-        .getService(this.api.hap.Service.AccessoryInformation)
-        .updateCharacteristic(
-          this.api.hap.Characteristic.FirmwareRevision,
-          accessory.context.firmware
-        )
-    }
-
-    // Add the configured accessory to our global map
-    devicesInHB.set(accessory.UUID, accessory)
-  }
-
-  removeAccessory (accessory) {
-    try {
-      // Remove an accessory from Homebridge
-      if (!accessory.context.hidden) {
-        this.api.unregisterPlatformAccessories(plugin.name, plugin.alias, [accessory])
-      }
-      devicesInHB.delete(accessory.UUID)
-      this.log('[%s] %s.', accessory.displayName, this.lang.devRemove)
-    } catch (err) {
-      // Catch any errors during remove
-      const eText = this.funcs.parseError(err)
-      this.log.warn('[%s] %s %s.', accessory.displayName, this.lang.devNotRemove, eText)
-    }
-  }
-
-  async sendDeviceUpdate (accessory, params) {
-    // Add to a queue so multiple updates are at least 500ms apart
-    return await queue.add(async () => {
-      // Log the update being sent
-      if (accessory.control.enableDebugLogging) {
-        this.log('[%s] %s %s.', accessory.displayName, this.lang.updSend, JSON.stringify(params))
-      }
-
-      // Set up the payload to send via LAN/WS
-      const payload = {
-        apikey: accessory.context.eweApiKey,
-        deviceid: accessory.context.eweDeviceId,
-        params
-      }
-
-      // Check if we can send via LAN otherwise send via WS
-      const res = !lanClient
-        ? this.lang.lanDisabled
-        : !this.consts.devices.lan.includes(accessory.context.eweUIID)
-        ? this.lang.lanNotSup
-        : await lanClient.sendUpdate(payload)
-
-      // Revert to WS if LAN mode not possible for whatever reason
-      if (res !== 'ok') {
-        // Check to see if the device is online
-        if (wsClient) {
-          // Log the revert if appropriate
-          if (accessory.control.enableDebugLogging) {
-            this.log('[%s] %s %s.', accessory.displayName, this.lang.revertWS, res)
-          }
-
-          // Attempt the update
-          if (accessory.context.reachableWAN) {
-            // Device is online via WS so send the update
-            return await wsClient.sendUpdate(payload)
-          } else {
-            // Device appears to be offline
-            throw new Error(this.lang.unreachable)
-          }
-        } else {
-          // Device isn't online via WS so report the error back
-          const eText = [this.lang.lanDisabled, this.lang.lanNotSup].includes(res)
-            ? res
-            : this.lang.unreachable + ' [' + res + ']'
-          throw new Error(eText)
-        }
-      }
-    })
-  }
-
-  async sendGroupUpdate (accessory, params) {
-    // Add to a queue so multiple updates are at least 500ms apart
-    return await queue.add(async () => {
-      // Log the update being sent
-      if (accessory.control.enableDebugLogging) {
-        this.log('[%s] %s %s.', accessory.displayName, this.lang.updSend, JSON.stringify(params))
-      }
-
-      // Send the request via HTTP
-      httpClient.updateGroup(accessory.context.eweDeviceId, params)
-    })
-  }
-
-  async receiveDeviceUpdate (device) {
-    const deviceId = device.deviceid
-    let accessory
-    let reachableChange = false
-
-    // Find our accessory for which the updates relates to
-    const uuid1 = this.api.hap.uuid.generate(deviceId + 'SWX')
-    const uuid2 = this.api.hap.uuid.generate(deviceId + 'SW0')
-    if (!(accessory = devicesInHB.get(uuid1) || devicesInHB.get(uuid2))) {
-      return
-    }
-    if (accessory.control.enableDebugLogging) {
-      this.log(
-        '[%s] %s %s.',
-        accessory.displayName,
-        this.lang.updRec,
-        JSON.stringify(device.params)
-      )
-    }
-    if (device.params.updateSource === 'WS') {
-      // The update is from WS so update the WS online/offline status
-      if (device.params.online !== accessory.context.reachableWAN) {
-        accessory.context.reachableWAN = device.params.online
-        this.api.updatePlatformAccessories(plugin.name, plugin.alias, [accessory])
-        devicesInHB.set(accessory.UUID, accessory)
-
-        // Flag this true to update the sub accessories later
-        reachableChange = true
-
-        // Log the new reachability of the device
-        if (accessory.control.enableLogging) {
-          if (accessory.context.reachableWAN) {
-            this.log('[%s] %s %s.', accessory.displayName, this.lang.repOnline, this.lang.viaWS)
-          } else {
-            this.log.warn(
-              '[%s] %s %s.',
-              accessory.displayName,
-              this.lang.repOffline,
-              this.lang.viaWS
-            )
-          }
-        }
-
-        // Mark the online/offline status of certain devices
-        if (accessory.control.markStatus) {
-          accessory.control.markStatus(device.params.online)
-        }
-
-        // Try and request an update through WS if the device has come back online
-        if (accessory.context.reachableWAN && wsClient) {
-          try {
-            await wsClient.requestUpdate(accessory)
-          } catch (err) {
-            // Suppress any errors here
-          }
-        }
-      }
-    }
-    if (device.params.updateSource === 'LAN') {
-      // The update is from LAN so it must be online
-      if (!accessory.context.reachableLAN) {
-        accessory.context.reachableLAN = true
-
-        // Flag this true to update the sub accessories later
-        reachableChange = true
-
-        // Log the new reachability of the device
-        if (accessory.control.enableLogging) {
-          this.log('[%s] %s %s.', accessory.displayName, this.lang.repOnline, this.lang.viaLAN)
-        }
-
-        // Try and request an update through WS if the device has come back online
-        if (accessory.context.reachableWAN && wsClient) {
-          try {
-            await wsClient.requestUpdate(accessory)
-          } catch (err) {
-            // Suppress any errors here
-          }
-        }
-      }
-
-      // Check to see if the IP of the device has changed
-      if (device.params.ip && device.params.ip !== accessory.context.ip) {
-        accessory.context.ip = device.params.ip
-
-        // Flag this true to update the sub accessories later
-        reachableChange = true
-
-        // Log the new ip of the device
-        if (accessory.control.enableLogging) {
-          this.log('[%s] %s [%s].', accessory.displayName, this.lang.newIP, device.params.ip)
-        }
-      }
-
-      // Update the accessory context if the device is back online or the IP changed
-      if (reachableChange) {
-        this.api.updatePlatformAccessories(plugin.name, plugin.alias, [accessory])
-        devicesInHB.set(accessory.UUID, accessory)
-      }
-    }
-
-    // Update this new online/offline status for all switches of multi channel devices
-    if (reachableChange && accessory.context.hbDeviceId.substr(-1) !== 'X') {
-      // Loop through to see which channels are in HB
-      for (let i = 1; i <= accessory.context.channelCount; i++) {
-        const uuid = this.api.hap.uuid.generate(deviceId + 'SW' + i)
-        if (devicesInHB.has(uuid)) {
-          // Find the sub accessory
-          const subAccessory = devicesInHB.get(uuid)
-
-          // Update the WAN status
-          subAccessory.context.reachableWAN = device.params.online
-          if (
-            device.params.updateSource === 'WS' &&
-            subAccessory.control &&
-            subAccessory.control.markStatus
-          ) {
-            subAccessory.control.markStatus(device.params.online)
-          }
-
-          // Update the LAN status
-          if (device.params.updateSource === 'LAN') {
-            subAccessory.context.reachableLAN = true
-            if (device.params.ip) {
-              subAccessory.context.ip = device.params.ip
-            }
-          }
-
-          // Save the sub accessory updates to the platform
-          this.api.updatePlatformAccessories(plugin.name, plugin.alias, [subAccessory])
-          devicesInHB.set(subAccessory.UUID, subAccessory)
-        }
-      }
-    }
-    try {
-      // Update the accessory with the new data
-      if (accessory.control && accessory.control.externalUpdate) {
-        accessory.control.externalUpdate(device.params)
-      }
-    } catch (err) {
-      const eText = this.funcs.parseError(err)
-      this.log.warn('[%s] %s %s.', accessory.displayName, this.lang.devNotRf, eText)
-    }
-  }
-
-  async deviceUpdateError (accessory, err, requestRefresh) {
-    // Log the error
-    const eText = this.funcs.parseError(err)
-    this.log.warn('[%s] %s %s.', accessory.displayName, this.lang.devNotUpd, eText)
-
-    // We only request a device refresh on failed internal updates
-    if (requestRefresh && accessory.context.reachableWAN && wsClient) {
-      try {
-        await wsClient.requestUpdate(accessory)
-      } catch (err) {
-        // Suppress any errors at this point
-      }
-    }
-  }
-}
-
-// Export the plugin to Homebridge
-module.exports = hb => hb.registerPlatform(plugin.alias, eWeLinkPlatform)
+export default (hb) => hb.registerPlatform(plugin.alias, ewelinkPlatform);
diff --git a/lib/node-dns-sd/lib/dns-sd-composer.js b/lib/node-dns-sd/lib/dns-sd-composer.js
index 4ff70295..9dbccdbc 100644
--- a/lib/node-dns-sd/lib/dns-sd-composer.js
+++ b/lib/node-dns-sd/lib/dns-sd-composer.js
@@ -5,14 +5,13 @@
 * Released under the MIT license
 * Date: 2018-10-25
 * ---------------------------------------------------------------- */
-'use strict';
 
 /* ------------------------------------------------------------------
 * Constructor: DnsSdComposer()
 * ---------------------------------------------------------------- */
-const DnsSdComposer = function() {
-	this._CLASSES = require('./dns-sd-classes.json');
-	this._TYPES = require('./dns-sd-types.json');
+const DnsSdComposer = function () {
+  this._CLASSES = require('./dns-sd-classes.json');
+  this._TYPES = require('./dns-sd-types.json');
 };
 
 /* ------------------------------------------------------------------
@@ -21,53 +20,52 @@ const DnsSdComposer = function() {
 *   - name    | Array  | Requred  | Servcie name.(e.g., ["_googlecast._tcp.local"])
 *   - type    | String | Optional | Query Type (e.g., "PTR"). The default value is "*"
 * ---------------------------------------------------------------- */
-DnsSdComposer.prototype.compose = function(params) {
-	let name_list = params['name'];
-	let type_name = params['type'];
-	let type_code = 0xff;
-	if(type_name) {
-		if(typeof(type_name) === 'string') {
-			if(this._TYPES[type_name]) {
-				type_code = this._TYPES[type_name];
-			} else {
-				throw new Error('The specified query type name is unknown: ' + type_name);
-			}
-		} else {
-			throw new Error('The specified query type is invalid.');
-		}
-	}
+DnsSdComposer.prototype.compose = function (params) {
+  const name_list = params.name;
+  const type_name = params.type;
+  let type_code = 0xff;
+  if (type_name) {
+    if (typeof (type_name) === 'string') {
+      if (this._TYPES[type_name]) {
+        type_code = this._TYPES[type_name];
+      } else {
+        throw new Error(`The specified query type name is unknown: ${type_name}`);
+      }
+    } else {
+      throw new Error('The specified query type is invalid.');
+    }
+  }
 
-	let hbuf = Buffer.from([ // Header
-		0x00, 0x00, // Transaction ID
-		0x00, 0x00, // Flags
-		0x00, name_list.length, // Questions
-		0x00, 0x00, // Answer PRs
-		0x00, 0x00, // Authority PRs
-		0x00, 0x00 // Additional PRs
-	]);
+  const hbuf = Buffer.from([ // Header
+    0x00, 0x00, // Transaction ID
+    0x00, 0x00, // Flags
+    0x00, name_list.length, // Questions
+    0x00, 0x00, // Answer PRs
+    0x00, 0x00, // Authority PRs
+    0x00, 0x00, // Additional PRs
+  ]);
 
-	let qbuf_list = [];
-	name_list.forEach((name) => {
-		(name.split('.')).forEach((part) => {
-			let part_buf = Buffer.from(part, 'utf8');
-			qbuf_list.push(Buffer.from([part_buf.length]));
-			qbuf_list.push(part_buf);
-		});
-		qbuf_list.push(Buffer.from([0x00])); // Null-terminated string for the domain name
+  const qbuf_list = [];
+  name_list.forEach((name) => {
+    (name.split('.')).forEach((part) => {
+      const part_buf = Buffer.from(part, 'utf8');
+      qbuf_list.push(Buffer.from([part_buf.length]));
+      qbuf_list.push(part_buf);
+    });
+    qbuf_list.push(Buffer.from([0x00])); // Null-terminated string for the domain name
 
-		let type_buf = Buffer.alloc(2);
-		type_buf.writeUInt16BE(type_code, 0);
-		qbuf_list.push(type_buf);
+    const type_buf = Buffer.alloc(2);
+    type_buf.writeUInt16BE(type_code, 0);
+    qbuf_list.push(type_buf);
 
-		let class_buf = Buffer.alloc(2);
-		class_buf.writeUInt16BE(this._CLASSES['IN'], 0);
-		qbuf_list.push(class_buf);
-	});
-	let qbuf = Buffer.concat(qbuf_list);
+    const class_buf = Buffer.alloc(2);
+    class_buf.writeUInt16BE(this._CLASSES.IN, 0);
+    qbuf_list.push(class_buf);
+  });
+  const qbuf = Buffer.concat(qbuf_list);
 
-	let buf = Buffer.concat([hbuf, qbuf]);
-	return buf;
+  const buf = Buffer.concat([hbuf, qbuf]);
+  return buf;
 };
 
 module.exports = new DnsSdComposer();
-
diff --git a/lib/node-dns-sd/lib/dns-sd-parser.js b/lib/node-dns-sd/lib/dns-sd-parser.js
index d07bab46..8202c94c 100644
--- a/lib/node-dns-sd/lib/dns-sd-parser.js
+++ b/lib/node-dns-sd/lib/dns-sd-parser.js
@@ -15,333 +15,328 @@
 * - RFC 2782 (A DNS RR for specifying the location of services (DNS SRV))
 *     https://tools.ietf.org/html/rfc2782
 * ---------------------------------------------------------------- */
-'use strict';
 
 /* ------------------------------------------------------------------
 * Constructor: DnsSdParser()
 * ---------------------------------------------------------------- */
-const DnsSdParser = function() {
-	this._CLASSES = require('./dns-sd-classes.json');
-	this._CLASS_MAP = {};
-	Object.keys(this._CLASSES).forEach((k) => {
-		this._CLASS_MAP[this._CLASSES[k]] = k;
-	});
+const DnsSdParser = function () {
+  this._CLASSES = require('./dns-sd-classes.json');
+  this._CLASS_MAP = {};
+  Object.keys(this._CLASSES).forEach((k) => {
+    this._CLASS_MAP[this._CLASSES[k]] = k;
+  });
 
-	this._TYPES = require('./dns-sd-types.json');
-	this._TYPE_MAP = {};
-	Object.keys(this._TYPES).forEach((k) => {
-		this._TYPE_MAP[this._TYPES[k]] = k;
-	});
+  this._TYPES = require('./dns-sd-types.json');
+  this._TYPE_MAP = {};
+  Object.keys(this._TYPES).forEach((k) => {
+    this._TYPE_MAP[this._TYPES[k]] = k;
+  });
 };
 
 /* ------------------------------------------------------------------
 * Method: parse(buf)
 * ---------------------------------------------------------------- */
-DnsSdParser.prototype.parse = function(buf) {
-	if(buf.length <= 12) {
-		return null;
-	}
-	let header = {
-		id: buf.readUInt16BE(0),
-		qr: buf.readUInt8(2) >> 7, // 0: Query, 1: Response
-		op: (buf.readUInt8(2) & 0b01111000) >> 3, // 0: Normal query, 4: Notify, 5: Update
-		aa: (buf.readUInt8(2) & 0b00000100) >> 2,
-		tc: (buf.readUInt8(2) & 0b00000010) >> 1,
-		rd: (buf.readUInt8(2) & 0b00000001),
-		ra: (buf.readUInt8(3) & 0b10000000) >> 7,
-		z : (buf.readUInt8(3) & 0b01000000) >> 6,
-		ad: (buf.readUInt8(3) & 0b00100000) >> 6,
-		cd: (buf.readUInt8(3) & 0b00010000) >> 5,
-		rc: (buf.readUInt8(3) & 0b00001111),
-		questions  : buf.readUInt16BE(4),
-		answers    : buf.readUInt16BE(6),
-		authorities: buf.readUInt16BE(8),
-		additionals: buf.readUInt16BE(10)
-	};
-	if(header['tc'] !== 0 || header['rd'] !== 0 || header['ra'] !== 0 || header['z'] !== 0 || header['ad'] !== 0 || header['cd'] !== 0 || header['rc'] !== 0) {
-		return null;
-	}
-	if(header['questions'] + header['answers'] + header['authorities'] + header['additionals'] === 0) {
-		return null;
-	}
-	let offset = 12;
-	let records = {
-		header: header,
-		questions: [],
-		answers: [],
-		authorities: [],
-		additionals: []
-	};
-	let record_count_list = [];
-	['questions', 'answers', 'authorities', 'additionals'].forEach((k) => {
-		let cnt = header[k];
-		if(cnt > 0) {
-			record_count_list.push({name: k, count: cnt});
-		}
-	});
-	let invalid = false;
-	while(true) {
-		let domain_name_parts = [];
-		let parsed = this._parseLabel(buf, offset);
-		let domain_name = '';
-		if(parsed) {
-			offset += parsed['length'];
-			domain_name = parsed['name'];
-		} else {
-			invalid = true;
-			break;
-		}
+DnsSdParser.prototype.parse = function (buf) {
+  if (buf.length <= 12) {
+    return null;
+  }
+  const header = {
+    id: buf.readUInt16BE(0),
+    qr: buf.readUInt8(2) >> 7, // 0: Query, 1: Response
+    op: (buf.readUInt8(2) & 0b01111000) >> 3, // 0: Normal query, 4: Notify, 5: Update
+    aa: (buf.readUInt8(2) & 0b00000100) >> 2,
+    tc: (buf.readUInt8(2) & 0b00000010) >> 1,
+    rd: (buf.readUInt8(2) & 0b00000001),
+    ra: (buf.readUInt8(3) & 0b10000000) >> 7,
+    z: (buf.readUInt8(3) & 0b01000000) >> 6,
+    ad: (buf.readUInt8(3) & 0b00100000) >> 6,
+    cd: (buf.readUInt8(3) & 0b00010000) >> 5,
+    rc: (buf.readUInt8(3) & 0b00001111),
+    questions: buf.readUInt16BE(4),
+    answers: buf.readUInt16BE(6),
+    authorities: buf.readUInt16BE(8),
+    additionals: buf.readUInt16BE(10),
+  };
+  if (header.tc !== 0 || header.rd !== 0 || header.ra !== 0 || header.z !== 0 || header.ad !== 0 || header.cd !== 0 || header.rc !== 0) {
+    return null;
+  }
+  if (header.questions + header.answers + header.authorities + header.additionals === 0) {
+    return null;
+  }
+  let offset = 12;
+  const records = {
+    header,
+    questions: [],
+    answers: [],
+    authorities: [],
+    additionals: [],
+  };
+  const record_count_list = [];
+  ['questions', 'answers', 'authorities', 'additionals'].forEach((k) => {
+    const cnt = header[k];
+    if (cnt > 0) {
+      record_count_list.push({ name: k, count: cnt });
+    }
+  });
+  let invalid = false;
+  while (true) {
+    const domain_name_parts = [];
+    const parsed = this._parseLabel(buf, offset);
+    let domain_name = '';
+    if (parsed) {
+      offset += parsed.length;
+      domain_name = parsed.name;
+    } else {
+      invalid = true;
+      break;
+    }
 
-		let record_key = record_count_list[0]['name'];
-		if(record_key === 'questions') {
-			if(offset + 4 > buf.length) {
-				invalid = true;
-				break;
-			}
-			let type_value = buf.readUInt16BE(offset);
-			let type = this._TYPE_MAP[type_value];
-			offset += 2;
-			let cls_value = buf.readUInt16BE(offset);
-			let cls = this._CLASS_MAP[cls_value];
-			offset += 2;
-			records[record_key].push({
-				name  : domain_name,
-				type  : type || '',
-				class : cls || ''
-			});
-		} else {
-			if(offset + 10 > buf.length) {
-				invalid = true;
-				break;
-			}
-			let type_value = buf.readUInt16BE(offset);
-			let type = this._TYPE_MAP[type_value] || '';
-			offset += 2;
-			let cls_value = buf.readUInt16BE(offset);
-			let cls = this._CLASS_MAP[cls_value & 0b0111111111111111];
-			let flash = (cls_value & 0b1000000000000000) ? true : false;
-			offset += 2;
-			let ttl = buf.readUInt32BE(offset);
-			offset += 4;
-			let rdlen = buf.readUInt16BE(offset);
-			offset += 2;
-			if(offset + rdlen > buf.length) {
-				invalid = true;
-				break;
-			}
-			let rdata = '';
-			let rdbuf = buf.slice(offset, offset + rdlen);
-			let rdata_txt_buffer = null;
-			if(type === 'A') {
-				rdata = this._parseRdataA(buf, offset, rdlen);
-			} else if(type === 'AAAA') {
-				rdata = this._parseRdataAAAA(buf, offset, rdlen);
-			} else if(type === 'PTR') {
-				rdata = this._parseRdataPtr(buf, offset, rdlen);
-			} else if(type === 'TXT') {
-				rdata = this._parseRdataTxt(buf, offset, rdlen);
-				rdata_txt_buffer = this._parseRdataTxt(buf, offset, rdlen, true);
-			} else if(type === 'SRV') {
-				rdata = this._parseRdataSrv(buf, offset, rdlen);
-			} else if(type === 'HINFO') {
-				rdata = this._parseRdataHinfo(buf, offset, rdlen);
-			} else {
-				rdata = this._parseRdataOther(buf, offset, rdlen);
-			}
-			offset += rdlen;
+    const record_key = record_count_list[0].name;
+    if (record_key === 'questions') {
+      if (offset + 4 > buf.length) {
+        invalid = true;
+        break;
+      }
+      const type_value = buf.readUInt16BE(offset);
+      const type = this._TYPE_MAP[type_value];
+      offset += 2;
+      const cls_value = buf.readUInt16BE(offset);
+      const cls = this._CLASS_MAP[cls_value];
+      offset += 2;
+      records[record_key].push({
+        name: domain_name,
+        type: type || '',
+        class: cls || '',
+      });
+    } else {
+      if (offset + 10 > buf.length) {
+        invalid = true;
+        break;
+      }
+      const type_value = buf.readUInt16BE(offset);
+      const type = this._TYPE_MAP[type_value] || '';
+      offset += 2;
+      const cls_value = buf.readUInt16BE(offset);
+      const cls = this._CLASS_MAP[cls_value & 0b0111111111111111];
+      const flash = !!((cls_value & 0b1000000000000000));
+      offset += 2;
+      const ttl = buf.readUInt32BE(offset);
+      offset += 4;
+      const rdlen = buf.readUInt16BE(offset);
+      offset += 2;
+      if (offset + rdlen > buf.length) {
+        invalid = true;
+        break;
+      }
+      let rdata = '';
+      const rdbuf = buf.slice(offset, offset + rdlen);
+      let rdata_txt_buffer = null;
+      if (type === 'A') {
+        rdata = this._parseRdataA(buf, offset, rdlen);
+      } else if (type === 'AAAA') {
+        rdata = this._parseRdataAAAA(buf, offset, rdlen);
+      } else if (type === 'PTR') {
+        rdata = this._parseRdataPtr(buf, offset, rdlen);
+      } else if (type === 'TXT') {
+        rdata = this._parseRdataTxt(buf, offset, rdlen);
+        rdata_txt_buffer = this._parseRdataTxt(buf, offset, rdlen, true);
+      } else if (type === 'SRV') {
+        rdata = this._parseRdataSrv(buf, offset, rdlen);
+      } else if (type === 'HINFO') {
+        rdata = this._parseRdataHinfo(buf, offset, rdlen);
+      } else {
+        rdata = this._parseRdataOther(buf, offset, rdlen);
+      }
+      offset += rdlen;
 
-			if(!rdata) {
-				invalid = true;
-				break;
-			}
+      if (!rdata) {
+        invalid = true;
+        break;
+      }
 
-			let d = {	
-				name  : domain_name,
-				type  : type || '',
-				class : cls || '',
-				flash : flash,
-				ttl   : ttl,
-				rdata : rdata
-			};
-			if(rdata_txt_buffer) {
-				d['rdata_buffer'] = rdata_txt_buffer;
-			}
-			records[record_key].push(d);
-		}
+      const d = {
+        name: domain_name,
+        type: type || '',
+        class: cls || '',
+        flash,
+        ttl,
+        rdata,
+      };
+      if (rdata_txt_buffer) {
+        d.rdata_buffer = rdata_txt_buffer;
+      }
+      records[record_key].push(d);
+    }
 
-		if(offset >= buf.length) {
-			break;
-		}
-		record_count_list[0]['count'] --;
-		if(record_count_list[0]['count'] <= 0) {
-			record_count_list.shift();
-		}
-		if(record_count_list.length === 0) {
-			break;
-		}
-	}
-	if(invalid === true) {
-		return null;
-	} else {
-		return records;
-	};
+    if (offset >= buf.length) {
+      break;
+    }
+    record_count_list[0].count--;
+    if (record_count_list[0].count <= 0) {
+      record_count_list.shift();
+    }
+    if (record_count_list.length === 0) {
+      break;
+    }
+  }
+  if (invalid === true) {
+    return null;
+  }
+  return records;
 };
 
-DnsSdParser.prototype._parseLabel = function(buf, offset) {
-	try {
-		let labels = [];
-		let length = 0;
-		let invalid = false;
-		while(true) {
-			let label_len = buf.readUInt8(offset + length);
-			if((label_len & 0b11000000) === 0b11000000) {
-				let i = buf.readUInt16BE(offset + length) & 0b0011111111111111;
-				let parsed = this._parseLabel(buf, i);
-				if(parsed) { 
-					labels.push(parsed['name']);
-					length += 2;
-					break;
-				} else {
-					invalid = true;
-					break;
-				}
-			} else if((label_len & 0b11000000) === 0b00000000) {
-				length += 1;
-				if(label_len === 0x00) {
-					break;
-				} else if(offset + length + label_len <= buf.length) {
-					let label = buf.slice(offset + length, offset + length + label_len).toString('utf8');
-					labels.push(label);
-					length += label_len;
-				} else {
-					invalid = true;
-					break;
-				}
-			} else {
-				invalid = true;
-				break;
-			}
-		}
-		if(invalid === true) {
-			return null;
-		} else {
-			return {
-				name   : labels.join('.'),
-				length : length
-			};
-		}
-	} catch (err) {
-		return null;
-	}
+DnsSdParser.prototype._parseLabel = function (buf, offset) {
+  try {
+    const labels = [];
+    let length = 0;
+    let invalid = false;
+    while (true) {
+      const label_len = buf.readUInt8(offset + length);
+      if ((label_len & 0b11000000) === 0b11000000) {
+        const i = buf.readUInt16BE(offset + length) & 0b0011111111111111;
+        const parsed = this._parseLabel(buf, i);
+        if (parsed) {
+          labels.push(parsed.name);
+          length += 2;
+          break;
+        } else {
+          invalid = true;
+          break;
+        }
+      } else if ((label_len & 0b11000000) === 0b00000000) {
+        length += 1;
+        if (label_len === 0x00) {
+          break;
+        } else if (offset + length + label_len <= buf.length) {
+          const label = buf.slice(offset + length, offset + length + label_len).toString('utf8');
+          labels.push(label);
+          length += label_len;
+        } else {
+          invalid = true;
+          break;
+        }
+      } else {
+        invalid = true;
+        break;
+      }
+    }
+    if (invalid === true) {
+      return null;
+    }
+    return {
+      name: labels.join('.'),
+      length,
+    };
+  } catch (err) {
+    return null;
+  }
 };
 
-DnsSdParser.prototype._parseRdataA = function(buf, offset, len) {
-	let addr_parts = [];
-	for(let i=0; i<len; i++) {
-		addr_parts.push(buf.readUInt8(offset + i));
-	}
-	let addr = addr_parts.join('.');
-	return addr;
+DnsSdParser.prototype._parseRdataA = function (buf, offset, len) {
+  const addr_parts = [];
+  for (let i = 0; i < len; i += 1) {
+    addr_parts.push(buf.readUInt8(offset + i));
+  }
+  const addr = addr_parts.join('.');
+  return addr;
 };
 
-DnsSdParser.prototype._parseRdataAAAA = function(buf, offset, len) {
-	let addr_parts = [];
-	for(let i=0; i<len; i+=2) {
-		addr_parts.push(buf.slice(offset + i, offset + i + 2).toString('hex'));
-	}
-	let addr = addr_parts.join(':');
-	return addr;
+DnsSdParser.prototype._parseRdataAAAA = function (buf, offset, len) {
+  const addr_parts = [];
+  for (let i = 0; i < len; i += 2) {
+    addr_parts.push(buf.slice(offset + i, offset + i + 2).toString('hex'));
+  }
+  const addr = addr_parts.join(':');
+  return addr;
 };
 
-DnsSdParser.prototype._parseRdataPtr = function(buf, offset, len) {
-	let parsed = this._parseLabel(buf, offset);
-	if(parsed) {
-		return parsed['name'];
-	} else {
-		return null;
-	}
+DnsSdParser.prototype._parseRdataPtr = function (buf, offset, len) {
+  const parsed = this._parseLabel(buf, offset);
+  if (parsed) {
+    return parsed.name;
+  }
+  return null;
 };
 
-DnsSdParser.prototype._parseRdataTxt = function(buf, offset, len, buf_flag) {
-	let labels = {};
-	let i = 0;
-	while(true) {
-		if(i >= len) {
-			break;
-		}
-		let blen = buf.readUInt8(offset + i);
-		i += 1;
-		if(i + blen <= len) {
-			let pair = buf.slice(offset + i, offset + i + blen).toString('utf8');
-			let m = pair.match(/^([^\=]+)\=(.*)/);
-			if(m) {
-				labels[m[1]] = m[2];
-				if(buf_flag) {
-					let s = offset + i + m[1].length + 1;
-					let e = offset + i + blen;
-					labels[m[1]] = buf.slice(s, e);
-				}
-			}
-			i += blen;
-		} else {
-			break;
-		}
-	}
-	return labels;
+DnsSdParser.prototype._parseRdataTxt = function (buf, offset, len, buf_flag) {
+  const labels = {};
+  let i = 0;
+  while (true) {
+    if (i >= len) {
+      break;
+    }
+    const blen = buf.readUInt8(offset + i);
+    i += 1;
+    if (i + blen <= len) {
+      const pair = buf.slice(offset + i, offset + i + blen).toString('utf8');
+      const m = pair.match(/^([^\=]+)\=(.*)/);
+      if (m) {
+        labels[m[1]] = m[2];
+        if (buf_flag) {
+          const s = offset + i + m[1].length + 1;
+          const e = offset + i + blen;
+          labels[m[1]] = buf.slice(s, e);
+        }
+      }
+      i += blen;
+    } else {
+      break;
+    }
+  }
+  return labels;
 };
 
-DnsSdParser.prototype._parseRdataSrv = function(buf, offset, len) {
-	if(len <= 6) {
-		return null;
-	}
-	let target = null;
-	let parsed = this._parseLabel(buf, offset + 6);
-	if(parsed) {
-		target = parsed['name'];
-	}
-	return {
-		priority : buf.readUInt16BE(offset),
-		weight   : buf.readUInt16BE(offset + 2),
-		port     : buf.readUInt16BE(offset + 4),
-		target   : target
-	};
+DnsSdParser.prototype._parseRdataSrv = function (buf, offset, len) {
+  if (len <= 6) {
+    return null;
+  }
+  let target = null;
+  const parsed = this._parseLabel(buf, offset + 6);
+  if (parsed) {
+    target = parsed.name;
+  }
+  return {
+    priority: buf.readUInt16BE(offset),
+    weight: buf.readUInt16BE(offset + 2),
+    port: buf.readUInt16BE(offset + 4),
+    target,
+  };
 };
 
-DnsSdParser.prototype._parseRdataHinfo = function(buf, offset, len) {
-	let txt_list = [];
-	let i = 0;
-	while(true) {
-		if(i >= len) {
-			break;
-		}
-		let blen = buf.readUInt8(offset + i);
-		i += 1;
-		if(i + blen <= len) {
-			let v = buf.slice(offset + i, offset + i + blen).toString('utf8');
-			txt_list.push(v);
-			i += blen;
-		} else {
-			break;
-		}
-	}
-	let info = {};
-	if(txt_list[0]) {
-		info['cpu'] = txt_list[0];
-	}
-	if(txt_list[1]) {
-		info['os'] = txt_list[1];
-	}
-	return info;
+DnsSdParser.prototype._parseRdataHinfo = function (buf, offset, len) {
+  const txt_list = [];
+  let i = 0;
+  while (true) {
+    if (i >= len) {
+      break;
+    }
+    const blen = buf.readUInt8(offset + i);
+    i += 1;
+    if (i + blen <= len) {
+      const v = buf.slice(offset + i, offset + i + blen).toString('utf8');
+      txt_list.push(v);
+      i += blen;
+    } else {
+      break;
+    }
+  }
+  const info = {};
+  if (txt_list[0]) {
+    info.cpu = txt_list[0];
+  }
+  if (txt_list[1]) {
+    info.os = txt_list[1];
+  }
+  return info;
 };
 
-DnsSdParser.prototype._parseRdataOther = function(buf, offset, len) {
-	let rdata_parts = [];
-	for(let i=0; i<len; i++) {
-		rdata_parts.push(buf.slice(offset + i, offset + i + 1).toString('hex'));
-	}
-	let rdata = rdata_parts.join(' ');
-	return rdata;
+DnsSdParser.prototype._parseRdataOther = function (buf, offset, len) {
+  const rdata_parts = [];
+  for (let i = 0; i < len; i += 1) {
+    rdata_parts.push(buf.slice(offset + i, offset + i + 1).toString('hex'));
+  }
+  const rdata = rdata_parts.join(' ');
+  return rdata;
 };
 
 module.exports = new DnsSdParser();
-
diff --git a/lib/node-dns-sd/lib/dns-sd.js b/lib/node-dns-sd/lib/dns-sd.js
index 2320cc6f..bdd62296 100644
--- a/lib/node-dns-sd/lib/dns-sd.js
+++ b/lib/node-dns-sd/lib/dns-sd.js
@@ -1,586 +1,579 @@
-/* ------------------------------------------------------------------
-* node-dns-sd - dns-sd.js
-*
-* Copyright (c) 2018 - 2020, Futomi Hatano, All rights reserved.
-* Released under the MIT license
-* Date: 2020-09-30
-* ---------------------------------------------------------------- */
-'use strict';
-const mDgram = require('dgram');
-const mOs = require('os');
-const mDnsSdParser = require('./dns-sd-parser.js');
-const mDnsSdComposer = require('./dns-sd-composer.js');
-
-/* ------------------------------------------------------------------
-* Constructor: DnsSd()
-* ---------------------------------------------------------------- */
-const DnsSd = function () {
-	// Public
-	this.ondata = () => { };
-
-	// Private
-	this._MULTICAST_ADDR = '224.0.0.251';
-	this._UDP_PORT = 5353;
-	this._DISCOVERY_WAIT_DEFAULT = 3; // sec
-
-	this._udp = null;
-	this._source_address_list = [];
-	this._discovered_devices = {};
-	this._is_discovering = false;
-	this._is_monitoring = false;
-	this._is_listening = false;
-	this._onreceive = () => { };
-};
-
-/* ------------------------------------------------------------------
-* Method: discover(params)
-* - params   | Object    | Required |
-*   - name   | String or | Required | Servcie name.(e.g., "_googlecast._tcp.local")
-*            | Array     |          |
-*   - type   | String    | Optional | Query Type (e.g., "PTR"). The default value is "*".
-*   - key    | String    | Optional | "address" (default) or "fqdn".
-*            |           |          | - "address": IP address based discovery
-*            |           |          | - "fqdn": FQDN (service) based discovery
-*   - wait   | Integer   | Optional | Duration of monitoring. The default value is 3 (sec).
-*   - quick  | Boolean   | Optional | If `true`, this method returns immediately after
-*            |           |          | a device was found ignoring the value of the `wait`.
-*            |           |          | The default value is `false`.
-*   - filter | String or | Optional | If specified as a string, this method discovers only
-*            | Function  |          | devices which the string is found in the `fqdn`,
-*            |           |          | `address`, `modelName` or `familyName`.
-*            |           |          | If specified as a function, this method discovers 
-*            |           |          | only devices for which the function returns `true`. 
-* ---------------------------------------------------------------- */
-DnsSd.prototype.discover = function (params) {
-	let promise = new Promise((resolve, reject) => {
-		if (this._is_discovering === true) {
-			reject(new Error('The discovery process is running.'));
-			return;
-		}
-		// Check the parameters
-		let res = this._checkDiscoveryParameters(params);
-		if (res['error']) {
-			reject(res['error']);
-			return;
-		}
-		let device_list = [];
-		this._startListening().then(() => {
-			return this._startDiscovery(res['params']);
-		}).then(() => {
-			for (let addr in this._discovered_devices) {
-				let device = this._discovered_devices[addr];
-				device_list.push(device);
-			}
-			this._stopDiscovery().then(() => {
-				resolve(device_list);
-			});
-		}).catch((error) => {
-			this._stopDiscovery().then(() => {
-				reject(error);
-			});
-		});
-	});
-	return promise;
-};
-
-DnsSd.prototype._createDeviceObject = function (packet) {
-	let o = {};
-
-	let trecs = {};
-	['answers', 'authorities', 'additionals'].forEach((k) => {
-		packet[k].forEach((r) => {
-			let type = r['type'];
-			if (!trecs[type]) {
-				trecs[type] = [];
-			}
-			trecs[type].push(r);
-		});
-	});
-
-	o['address'] = null;
-	if (trecs['A']) {
-		o['address'] = trecs['A'][0]['rdata'];
-	}
-	if (!o['address']) {
-		o['address'] = packet['address'];
-	}
-
-	o['fqdn'] = null;
-	let hostname = null;
-	if (trecs['PTR']) {
-		let rec = trecs['PTR'][0];
-		o['fqdn'] = rec['rdata'];
-	}
-
-	o['modelName'] = null;
-	o['familyName'] = null;
-	if (trecs['TXT'] && trecs['TXT'][0] && trecs['TXT'][0]['rdata']) {
-		let r = trecs['TXT'][0];
-		let d = r['rdata'] || {};
-		let name = r['name'] || '';
-		if (/Apple TV/.test(name)) {
-			o['modelName'] = 'Apple TV';
-			if (trecs['TXT']) {
-				for (let i = 0; i < trecs['TXT'].length; i++) {
-					let r = trecs['TXT'][i];
-					if ((/_device-info/).test(r['name']) && r['rdata'] && r['rdata']['model']) {
-						o['modelName'] = 'Apple TV ' + r['rdata']['model'];
-						break;
-					}
-				}
-			}
-		} else if (/_googlecast/.test(name)) {
-			o['modelName'] = d['md'] || null;
-			o['familyName'] = d['fn'] || null;
-		} else if (/Philips hue/.test(name)) {
-			o['modelName'] = 'Philips hue';
-			if (d['md']) {
-				o['modelName'] += ' ' + d['md'];
-			}
-		} else if (/Canon/.test(name)) {
-			o['modelName'] = d['ty'] || null;
-		}
-	}
-	if (!o['modelName']) {
-		if (trecs['A'] && trecs['A'][0]) {
-			let r = trecs['A'][0];
-			let name = r['name'];
-			if (/Apple\-TV/.test(name)) {
-				o['modelName'] = 'Apple TV';
-			} else if (/iPad/.test(name)) {
-				o['modelName'] = 'iPad';
-			}
-		}
-	}
-
-	if (!o['modelName']) {
-		if (o['fqdn']) {
-			let hostname = (o['fqdn'].split('.')).shift();
-			if (hostname && / /.test(hostname)) {
-				o['modelName'] = hostname;
-			}
-		}
-	}
-
-	o['service'] = null;
-	if (trecs['SRV']) {
-		let rec = trecs['SRV'][0];
-		let name_parts = rec['name'].split('.');
-		name_parts.reverse();
-		o['service'] = {
-			port: rec['rdata']['port'],
-			protocol: name_parts[1].replace(/^_/, ''),
-			type: name_parts[2].replace(/^_/, '')
-		};
-	}
-
-	o['packet'] = packet;
-	return o;
-};
-
-DnsSd.prototype._checkDiscoveryParameters = function (params) {
-	let p = {};
-	if (params) {
-		if (typeof (params) !== 'object') {
-			return { error: new Error('The argument `params` is invalid.') };
-		}
-	} else {
-		return { error: new Error('The argument `params` is required.') };
-	}
-
-	if ('name' in params) {
-		let v = params['name'];
-		if (typeof (v) === 'string') {
-			if (v === '') {
-				return { error: new Error('The `name` must be an non-empty string.') };
-			}
-			p['name'] = [v];
-		} else if (Array.isArray(v)) {
-			if (v.length === 0) {
-				return { error: new Error('The `name` must be a non-empty array.') };
-			} else if (v.length > 255) {
-				return { error: new Error('The `name` can include up to 255 elements.') };
-			}
-			let err = null;
-			let list = [];
-			for (let i = 0; i < v.length; i++) {
-				if (typeof (v[i]) === 'string' && v[i] !== '') {
-					list.push(v[i]);
-				} else {
-					err = new Error('The `name` must be an Array object including non-empty strings.');
-					break;
-				}
-			}
-			if (err) {
-				return { error: err };
-			}
-			p['name'] = list;
-		} else {
-			return { error: new Error('The `name` must be a string or an Array object.') };
-		}
-	} else {
-		return { error: new Error('The `name` is required.') };
-	}
-
-
-	if ('type' in params) {
-		let v = params['type'];
-		if (typeof (v) !== 'string' || !(/^[a-zA-Z0-9]{1,10}$/.test(v) || v === '*')) {
-			return { error: new Error('The `type` is invalid.') };
-		}
-		p['type'] = v.toUpperCase();
-	}
-
-	if ('key' in params) {
-		let v = params['key'];
-		if (typeof (v) !== 'string' || !/^(address|fqdn)$/.test(v)) {
-			return { error: new Error('The `key` is invalid.') };
-		}
-		if (!v) {
-			v = 'address';
-		}
-		p['key'] = v;
-	}
-
-	if ('wait' in params) {
-		let v = params['wait'];
-		if (typeof (v) !== 'number' || v <= 0 || v % 1 !== 0) {
-			return { error: new Error('The `wait` is invalid.') };
-		}
-		p['wait'] = v;
-	}
-
-	if ('quick' in params) {
-		let v = params['quick'];
-		if (typeof (v) !== 'boolean') {
-			return { error: new Error('The `quick` must be a boolean.') };
-		}
-		p['quick'] = v;
-	} else {
-		p['quick'] = false;
-	}
-
-	if (`filter` in params) {
-		let v = params['filter'];
-		if (typeof (v) !== 'string' && typeof (v) !== 'function') {
-			return { error: new Error('The `filter` must be a string.') };
-		}
-		if (v) {
-			p['filter'] = v;
-		}
-	}
-
-	return { params: p };
-};
-
-DnsSd.prototype._startDiscovery = function (params) {
-	let promise = new Promise((resolve, reject) => {
-		this._discovered_devices = {};
-		this._is_discovering = true;
-		let wait = (params && params['wait']) ? params['wait'] : this._DISCOVERY_WAIT_DEFAULT;
-		// Create a request packet
-		let buf = mDnsSdComposer.compose({
-			name: params['name'],
-			type: params['type']
-		});
-
-		// Timer
-		let send_timer = null;
-		let wait_timer = null;
-
-		let clearTimer = () => {
-			if (send_timer) {
-				clearTimeout(send_timer);
-				send_timer = null;
-			}
-			if (wait_timer) {
-				clearTimeout(wait_timer);
-				wait_timer = null;
-			}
-			this._onreceive = () => { };
-		};
-
-		wait_timer = setTimeout(() => {
-			clearTimer();
-			resolve();
-		}, wait * 1000);
-
-		let quick = params['quick'];
-		let key = params['key'];
-		if (!key) {
-			key = 'address';
-		}
-		this._onreceive = (addr, packet) => {
-			if (!this._isTargettedDevice(packet, params['name'])) {
-				return;
-			}
-			let device = this._createDeviceObject(packet);
-			if (!this._evaluateDeviceFilter(device, params['filter'])) {
-				return;
-			}
-			if (key === 'fqdn') {
-				let fqdn = device['fqdn'];
-				this._discovered_devices[fqdn] = device;
-			} else {
-				this._discovered_devices[addr] = device;
-			}
-			if (quick) {
-				clearTimer();
-				resolve();
-			}
-		};
-
-		// Send a packet
-		let send_num = 0;
-		let sendQueryPacket = () => {
-			this._udp.send(buf, 0, buf.length, this._UDP_PORT, this._MULTICAST_ADDR, (error, bytes) => {
-				if (error) {
-					clearTimer();
-					reject(error);
-				} else {
-					send_num++;
-					if (send_num < 3) {
-						send_timer = setTimeout(() => {
-							sendQueryPacket();
-						}, 1000);
-					} else {
-						send_timer = null;
-					}
-				}
-			});
-		};
-		sendQueryPacket();
-	});
-	return promise;
-};
-
-DnsSd.prototype._isTargettedDevice = function (packet, name_list) {
-	let hit = false;
-	packet['answers'].forEach((ans) => {
-		let name = ans['name'];
-		if (name && name_list.indexOf(name) >= 0) {
-			hit = true;
-		}
-	});
-	return hit;
-};
-
-DnsSd.prototype._evaluateDeviceFilter = function (device, filter) {
-	if (filter) {
-		let filter_type = typeof (filter);
-		if (filter_type === 'string') {
-			return this._evaluateDeviceFilterString(device, filter);
-		} else if (filter_type === 'function') {
-			return this._evaluateDeviceFilterFunction(device, filter);
-		} else {
-			return false;
-		}
-	} else {
-		return true;
-	}
-};
-
-DnsSd.prototype._evaluateDeviceFilterString = function (device, filter) {
-	if (device['fqdn'] && device['fqdn'].indexOf(filter) >= 0) {
-		return true;
-	}
-	if (device['address'] && device['address'].indexOf(filter) >= 0) {
-		return true;
-	}
-	if (device['modelName'] && device['modelName'].indexOf(filter) >= 0) {
-		return true;
-	}
-	if (device['familyName'] && device['familyName'].indexOf(filter) >= 0) {
-		return true;
-	}
-	return false;
-};
-
-DnsSd.prototype._evaluateDeviceFilterFunction = function (device, filter) {
-	let res = false;
-	try {
-		res = filter(device);
-	} catch (e) { }
-	res = res ? true : false;
-	return res;
-};
-
-DnsSd.prototype._stopDiscovery = function () {
-	let promise = new Promise((resolve, reject) => {
-		this._discovered_devices = {};
-		this._is_discovering = false;
-		this._stopListening().then(() => {
-			resolve();
-		}).catch((error) => {
-			resolve();
-		});
-	});
-	return promise;
-};
-
-DnsSd.prototype._addMembership = function () {
-	this._source_address_list.forEach((netif) => {
-		try {
-			this._udp.addMembership(this._MULTICAST_ADDR, netif);
-		} catch(e) {
-			console.log(`Catching error on address already in use: ${JSON.stringify(e)}`);
-		}
-	});
-};
-
-DnsSd.prototype._dropMembership = function () {
-	this._source_address_list.forEach((netif) => {
-		try {
-			this._udp.dropMembership(this._MULTICAST_ADDR, netif);
-		} catch(e) {
-			console.log(`Catching error on dropMembership: ${JSON.stringify(e)}`);
-		}
-	});
-};
-
-DnsSd.prototype._getSourceAddressList = function () {
-	let list = [];
-	let netifs = mOs.networkInterfaces();
-	for (let dev in netifs) {
-		netifs[dev].forEach((info) => {
-			if (info.family === 'IPv4' && info.internal === false) {
-				let m = info.address.match(/^(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})/);
-				if (m) {
-					list.push(m[1]);
-				}
-			}
-		});
-	}
-	return list;
-};
-
-/* ------------------------------------------------------------------
-* Method: startMonitoring()
-* ---------------------------------------------------------------- */
-DnsSd.prototype.startMonitoring = function () {
-	let promise = new Promise((resolve, reject) => {
-		if (this._is_monitoring === true) {
-			resolve();
-			return;
-		}
-		this._startListening().then(() => {
-			this._is_monitoring = true;
-			resolve();
-		}).catch((error) => {
-			this._is_monitoring = false;
-			this._stopListening().then(() => {
-				reject(error);
-			});
-		});
-	});
-	return promise;
-};
-
-/* ------------------------------------------------------------------
-* Method: stopMonitoring()
-* ---------------------------------------------------------------- */
-DnsSd.prototype.stopMonitoring = function () {
-	let promise = new Promise((resolve, reject) => {
-		this._is_monitoring = false;
-		this._stopListening().then(() => {
-			resolve();
-		}).catch((error) => {
-			resolve();
-		});
-	});
-	return promise;
-};
-
-DnsSd.prototype._startListening = function () {
-	let promise = new Promise((resolve, reject) => {
-		if (this._is_listening === true) {
-			resolve();
-			return;
-		}
-		// Get the source IP address
-		this._source_address_list = this._getSourceAddressList();
-		// Set up a UDP tranceiver
-		this._udp = mDgram.createSocket({
-			type: 'udp4',
-			reuseAddr: true
-		});
-		this._udp.once('error', (error) => {
-			this._is_listening = false;
-			reject(error);
-			return;
-		});
-		this._udp.once('listening', () => {
-			this._udp.setMulticastLoopback(false);
-			this._addMembership();
-			this._is_listening = true;
-			resolve();
-			return;
-		});
-		this._udp.on('message', (buf, rinfo) => {
-			this._receivePacket(buf, rinfo);
-		});
-		this._udp.bind({ port: this._UDP_PORT }, () => {
-			this._udp.removeAllListeners('error');
-		});
-	});
-	return promise;
-};
-
-DnsSd.prototype._stopListening = function () {
-	let promise = new Promise((resolve, reject) => {
-		this._dropMembership();
-		if (this._is_discovering || this._is_monitoring) {
-			resolve();
-		} else {
-			let cleanObj = () => {
-				if (this._udp) {
-					this._udp.unref();
-					this._udp = null;
-				}
-				this._is_listening = false;
-				resolve();
-			};
-			if (this._udp) {
-				this._udp.removeAllListeners('message');
-				this._udp.removeAllListeners('error');
-				this._udp.removeAllListeners('listening');
-				this._udp.close(() => {
-					cleanObj();
-				});
-			} else {
-				cleanObj();
-			}
-		}
-	});
-	return promise;
-};
-
-DnsSd.prototype._receivePacket = function (buf, rinfo) {
-	let p = mDnsSdParser.parse(buf);
-	if (!p) {
-		return;
-	}
-	p['address'] = rinfo.address;
-	if (this._is_discovering) {
-		if (this._isAnswerPacket(p, rinfo.address)) {
-			this._onreceive(rinfo.address, p);
-		}
-	}
-	if (this._is_monitoring) {
-		if (typeof (this.ondata) === 'function') {
-			this.ondata(p);
-		}
-	}
-};
-
-DnsSd.prototype._isAnswerPacket = function (p, address) {
-	if (this._source_address_list.indexOf(address) >= 0) {
-		return false;
-	}
-	if (!(p['header']['qr'] === 1 && p['header']['op'] === 0)) {
-		return false;
-	}
-	return true;
-};
-
-module.exports = new DnsSd();
+/* ------------------------------------------------------------------
+* node-dns-sd - dns-sd.js
+*
+* Copyright (c) 2018 - 2020, Futomi Hatano, All rights reserved.
+* Released under the MIT license
+* Date: 2020-09-30
+* ---------------------------------------------------------------- */
+
+const mDgram = require('dgram');
+const mOs = require('os');
+const mDnsSdComposer = require('./dns-sd-composer.js');
+const mDnsSdParser = require('./dns-sd-parser.js');
+
+/* ------------------------------------------------------------------
+* Constructor: DnsSd()
+* ---------------------------------------------------------------- */
+const DnsSd = function () {
+  // Public
+  this.ondata = () => { };
+
+  // Private
+  this._MULTICAST_ADDR = '224.0.0.251';
+  this._UDP_PORT = 5353;
+  this._DISCOVERY_WAIT_DEFAULT = 3; // sec
+
+  this._udp = null;
+  this._source_address_list = [];
+  this._discovered_devices = {};
+  this._is_discovering = false;
+  this._is_monitoring = false;
+  this._is_listening = false;
+  this._onreceive = () => { };
+};
+
+/* ------------------------------------------------------------------
+* Method: discover(params)
+* - params   | Object    | Required |
+*   - name   | String or | Required | Servcie name.(e.g., "_googlecast._tcp.local")
+*            | Array     |          |
+*   - type   | String    | Optional | Query Type (e.g., "PTR"). The default value is "*".
+*   - key    | String    | Optional | "address" (default) or "fqdn".
+*            |           |          | - "address": IP address based discovery
+*            |           |          | - "fqdn": FQDN (service) based discovery
+*   - wait   | Integer   | Optional | Duration of monitoring. The default value is 3 (sec).
+*   - quick  | Boolean   | Optional | If `true`, this method returns immediately after
+*            |           |          | a device was found ignoring the value of the `wait`.
+*            |           |          | The default value is `false`.
+*   - filter | String or | Optional | If specified as a string, this method discovers only
+*            | Function  |          | devices which the string is found in the `fqdn`,
+*            |           |          | `address`, `modelName` or `familyName`.
+*            |           |          | If specified as a function, this method discovers
+*            |           |          | only devices for which the function returns `true`.
+* ---------------------------------------------------------------- */
+DnsSd.prototype.discover = function (params) {
+  const promise = new Promise((resolve, reject) => {
+    if (this._is_discovering === true) {
+      reject(new Error('The discovery process is running.'));
+      return;
+    }
+    // Check the parameters
+    const res = this._checkDiscoveryParameters(params);
+    if (res.error) {
+      reject(res.error);
+      return;
+    }
+    const device_list = [];
+    this._startListening().then(() => this._startDiscovery(res.params)).then(() => {
+      for (const addr in this._discovered_devices) {
+        const device = this._discovered_devices[addr];
+        device_list.push(device);
+      }
+      this._stopDiscovery().then(() => {
+        resolve(device_list);
+      });
+    }).catch((error) => {
+      this._stopDiscovery().then(() => {
+        reject(error);
+      });
+    });
+  });
+  return promise;
+};
+
+DnsSd.prototype._createDeviceObject = function (packet) {
+  const o = {};
+
+  const trecs = {};
+  ['answers', 'authorities', 'additionals'].forEach((k) => {
+    packet[k].forEach((r) => {
+      const { type } = r;
+      if (!trecs[type]) {
+        trecs[type] = [];
+      }
+      trecs[type].push(r);
+    });
+  });
+
+  o.address = null;
+  if (trecs.A) {
+    o.address = trecs.A[0].rdata;
+  }
+  if (!o.address) {
+    o.address = packet.address;
+  }
+
+  o.fqdn = null;
+  const hostname = null;
+  if (trecs.PTR) {
+    const rec = trecs.PTR[0];
+    o.fqdn = rec.rdata;
+  }
+
+  o.modelName = null;
+  o.familyName = null;
+  if (trecs.TXT && trecs.TXT[0] && trecs.TXT[0].rdata) {
+    const r = trecs.TXT[0];
+    const d = r.rdata || {};
+    const name = r.name || '';
+    if (/Apple TV/.test(name)) {
+      o.modelName = 'Apple TV';
+      if (trecs.TXT) {
+        for (let i = 0; i < trecs.TXT.length; i += 1) {
+          const r = trecs.TXT[i];
+          if ((/_device-info/).test(r.name) && r.rdata && r.rdata.model) {
+            o.modelName = `Apple TV ${r.rdata.model}`;
+            break;
+          }
+        }
+      }
+    } else if (/_googlecast/.test(name)) {
+      o.modelName = d.md || null;
+      o.familyName = d.fn || null;
+    } else if (/Philips hue/.test(name)) {
+      o.modelName = 'Philips hue';
+      if (d.md) {
+        o.modelName += ` ${d.md}`;
+      }
+    } else if (/Canon/.test(name)) {
+      o.modelName = d.ty || null;
+    }
+  }
+  if (!o.modelName) {
+    if (trecs.A && trecs.A[0]) {
+      const r = trecs.A[0];
+      const { name } = r;
+      if (/Apple\-TV/.test(name)) {
+        o.modelName = 'Apple TV';
+      } else if (/iPad/.test(name)) {
+        o.modelName = 'iPad';
+      }
+    }
+  }
+
+  if (!o.modelName) {
+    if (o.fqdn) {
+      const hostname = (o.fqdn.split('.')).shift();
+      if (hostname && / /.test(hostname)) {
+        o.modelName = hostname;
+      }
+    }
+  }
+
+  o.service = null;
+  if (trecs.SRV) {
+    const rec = trecs.SRV[0];
+    const name_parts = rec.name.split('.');
+    name_parts.reverse();
+    o.service = {
+      port: rec.rdata.port,
+      protocol: name_parts[1].replace(/^_/, ''),
+      type: name_parts[2].replace(/^_/, ''),
+    };
+  }
+
+  o.packet = packet;
+  return o;
+};
+
+DnsSd.prototype._checkDiscoveryParameters = function (params) {
+  const p = {};
+  if (params) {
+    if (typeof (params) !== 'object') {
+      return { error: new Error('The argument `params` is invalid.') };
+    }
+  } else {
+    return { error: new Error('The argument `params` is required.') };
+  }
+
+  if ('name' in params) {
+    const v = params.name;
+    if (typeof (v) === 'string') {
+      if (v === '') {
+        return { error: new Error('The `name` must be an non-empty string.') };
+      }
+      p.name = [v];
+    } else if (Array.isArray(v)) {
+      if (v.length === 0) {
+        return { error: new Error('The `name` must be a non-empty array.') };
+      } if (v.length > 255) {
+        return { error: new Error('The `name` can include up to 255 elements.') };
+      }
+      let err = null;
+      const list = [];
+      for (let i = 0; i < v.length; i += 1) {
+        if (typeof (v[i]) === 'string' && v[i] !== '') {
+          list.push(v[i]);
+        } else {
+          err = new Error('The `name` must be an Array object including non-empty strings.');
+          break;
+        }
+      }
+      if (err) {
+        return { error: err };
+      }
+      p.name = list;
+    } else {
+      return { error: new Error('The `name` must be a string or an Array object.') };
+    }
+  } else {
+    return { error: new Error('The `name` is required.') };
+  }
+
+  if ('type' in params) {
+    const v = params.type;
+    if (typeof (v) !== 'string' || !(/^[a-zA-Z0-9]{1,10}$/.test(v) || v === '*')) {
+      return { error: new Error('The `type` is invalid.') };
+    }
+    p.type = v.toUpperCase();
+  }
+
+  if ('key' in params) {
+    let v = params.key;
+    if (typeof (v) !== 'string' || !/^(address|fqdn)$/.test(v)) {
+      return { error: new Error('The `key` is invalid.') };
+    }
+    if (!v) {
+      v = 'address';
+    }
+    p.key = v;
+  }
+
+  if ('wait' in params) {
+    const v = params.wait;
+    if (typeof (v) !== 'number' || v <= 0 || v % 1 !== 0) {
+      return { error: new Error('The `wait` is invalid.') };
+    }
+    p.wait = v;
+  }
+
+  if ('quick' in params) {
+    const v = params.quick;
+    if (typeof (v) !== 'boolean') {
+      return { error: new Error('The `quick` must be a boolean.') };
+    }
+    p.quick = v;
+  } else {
+    p.quick = false;
+  }
+
+  if ('filter' in params) {
+    const v = params.filter;
+    if (typeof (v) !== 'string' && typeof (v) !== 'function') {
+      return { error: new Error('The `filter` must be a string.') };
+    }
+    if (v) {
+      p.filter = v;
+    }
+  }
+
+  return { params: p };
+};
+
+DnsSd.prototype._startDiscovery = function (params) {
+  const promise = new Promise((resolve, reject) => {
+    this._discovered_devices = {};
+    this._is_discovering = true;
+    const wait = (params && params.wait) ? params.wait : this._DISCOVERY_WAIT_DEFAULT;
+    // Create a request packet
+    const buf = mDnsSdComposer.compose({
+      name: params.name,
+      type: params.type,
+    });
+
+    // Timer
+    let send_timer = null;
+    let wait_timer = null;
+
+    const clearTimer = () => {
+      if (send_timer) {
+        clearTimeout(send_timer);
+        send_timer = null;
+      }
+      if (wait_timer) {
+        clearTimeout(wait_timer);
+        wait_timer = null;
+      }
+      this._onreceive = () => { };
+    };
+
+    wait_timer = setTimeout(() => {
+      clearTimer();
+      resolve();
+    }, wait * 1000);
+
+    const { quick } = params;
+    let { key } = params;
+    if (!key) {
+      key = 'address';
+    }
+    this._onreceive = (addr, packet) => {
+      if (!this._isTargettedDevice(packet, params.name)) {
+        return;
+      }
+      const device = this._createDeviceObject(packet);
+      if (!this._evaluateDeviceFilter(device, params.filter)) {
+        return;
+      }
+      if (key === 'fqdn') {
+        const { fqdn } = device;
+        this._discovered_devices[fqdn] = device;
+      } else {
+        this._discovered_devices[addr] = device;
+      }
+      if (quick) {
+        clearTimer();
+        resolve();
+      }
+    };
+
+    // Send a packet
+    let send_num = 0;
+    const sendQueryPacket = () => {
+      this._udp.send(buf, 0, buf.length, this._UDP_PORT, this._MULTICAST_ADDR, (error, bytes) => {
+        if (error) {
+          clearTimer();
+          reject(error);
+        } else {
+          send_num++;
+          if (send_num < 3) {
+            send_timer = setTimeout(() => {
+              sendQueryPacket();
+            }, 1000);
+          } else {
+            send_timer = null;
+          }
+        }
+      });
+    };
+    sendQueryPacket();
+  });
+  return promise;
+};
+
+DnsSd.prototype._isTargettedDevice = function (packet, name_list) {
+  let hit = false;
+  packet.answers.forEach((ans) => {
+    const { name } = ans;
+    if (name && name_list.indexOf(name) >= 0) {
+      hit = true;
+    }
+  });
+  return hit;
+};
+
+DnsSd.prototype._evaluateDeviceFilter = function (device, filter) {
+  if (filter) {
+    const filter_type = typeof (filter);
+    if (filter_type === 'string') {
+      return this._evaluateDeviceFilterString(device, filter);
+    } if (filter_type === 'function') {
+      return this._evaluateDeviceFilterFunction(device, filter);
+    }
+    return false;
+  }
+  return true;
+};
+
+DnsSd.prototype._evaluateDeviceFilterString = function (device, filter) {
+  if (device.fqdn && device.fqdn.indexOf(filter) >= 0) {
+    return true;
+  }
+  if (device.address && device.address.indexOf(filter) >= 0) {
+    return true;
+  }
+  if (device.modelName && device.modelName.indexOf(filter) >= 0) {
+    return true;
+  }
+  if (device.familyName && device.familyName.indexOf(filter) >= 0) {
+    return true;
+  }
+  return false;
+};
+
+DnsSd.prototype._evaluateDeviceFilterFunction = function (device, filter) {
+  let res = false;
+  try {
+    res = filter(device);
+  } catch (e) { }
+  res = !!res;
+  return res;
+};
+
+DnsSd.prototype._stopDiscovery = function () {
+  const promise = new Promise((resolve, reject) => {
+    this._discovered_devices = {};
+    this._is_discovering = false;
+    this._stopListening().then(() => {
+      resolve();
+    }).catch((error) => {
+      resolve();
+    });
+  });
+  return promise;
+};
+
+DnsSd.prototype._addMembership = function () {
+  this._source_address_list.forEach((netif) => {
+    try {
+      this._udp.addMembership(this._MULTICAST_ADDR, netif);
+    } catch (e) {
+      console.log(`Catching error on address already in use: ${JSON.stringify(e)}`);
+    }
+  });
+};
+
+DnsSd.prototype._dropMembership = function () {
+  this._source_address_list.forEach((netif) => {
+    try {
+      this._udp.dropMembership(this._MULTICAST_ADDR, netif);
+    } catch (e) {
+      console.log(`Catching error on dropMembership: ${JSON.stringify(e)}`);
+    }
+  });
+};
+
+DnsSd.prototype._getSourceAddressList = function () {
+  const list = [];
+  const netifs = mOs.networkInterfaces();
+  for (const dev in netifs) {
+    netifs[dev].forEach((info) => {
+      if (info.family === 'IPv4' && info.internal === false) {
+        const m = info.address.match(/^(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})/);
+        if (m) {
+          list.push(m[1]);
+        }
+      }
+    });
+  }
+  return list;
+};
+
+/* ------------------------------------------------------------------
+* Method: startMonitoring()
+* ---------------------------------------------------------------- */
+DnsSd.prototype.startMonitoring = function () {
+  const promise = new Promise((resolve, reject) => {
+    if (this._is_monitoring === true) {
+      resolve();
+      return;
+    }
+    this._startListening().then(() => {
+      this._is_monitoring = true;
+      resolve();
+    }).catch((error) => {
+      this._is_monitoring = false;
+      this._stopListening().then(() => {
+        reject(error);
+      });
+    });
+  });
+  return promise;
+};
+
+/* ------------------------------------------------------------------
+* Method: stopMonitoring()
+* ---------------------------------------------------------------- */
+DnsSd.prototype.stopMonitoring = function () {
+  const promise = new Promise((resolve, reject) => {
+    this._is_monitoring = false;
+    this._stopListening().then(() => {
+      resolve();
+    }).catch((error) => {
+      resolve();
+    });
+  });
+  return promise;
+};
+
+DnsSd.prototype._startListening = function () {
+  const promise = new Promise((resolve, reject) => {
+    if (this._is_listening === true) {
+      resolve();
+      return;
+    }
+    // Get the source IP address
+    this._source_address_list = this._getSourceAddressList();
+    // Set up a UDP tranceiver
+    this._udp = mDgram.createSocket({
+      type: 'udp4',
+      reuseAddr: true,
+    });
+    this._udp.once('error', (error) => {
+      this._is_listening = false;
+      reject(error);
+    });
+    this._udp.once('listening', () => {
+      this._udp.setMulticastLoopback(false);
+      this._addMembership();
+      this._is_listening = true;
+      resolve();
+    });
+    this._udp.on('message', (buf, rinfo) => {
+      this._receivePacket(buf, rinfo);
+    });
+    this._udp.bind({ port: this._UDP_PORT }, () => {
+      this._udp.removeAllListeners('error');
+    });
+  });
+  return promise;
+};
+
+DnsSd.prototype._stopListening = function () {
+  const promise = new Promise((resolve, reject) => {
+    this._dropMembership();
+    if (this._is_discovering || this._is_monitoring) {
+      resolve();
+    } else {
+      const cleanObj = () => {
+        if (this._udp) {
+          this._udp.unref();
+          this._udp = null;
+        }
+        this._is_listening = false;
+        resolve();
+      };
+      if (this._udp) {
+        this._udp.removeAllListeners('message');
+        this._udp.removeAllListeners('error');
+        this._udp.removeAllListeners('listening');
+        this._udp.close(() => {
+          cleanObj();
+        });
+      } else {
+        cleanObj();
+      }
+    }
+  });
+  return promise;
+};
+
+DnsSd.prototype._receivePacket = function (buf, rinfo) {
+  const p = mDnsSdParser.parse(buf);
+  if (!p) {
+    return;
+  }
+  p.address = rinfo.address;
+  if (this._is_discovering) {
+    if (this._isAnswerPacket(p, rinfo.address)) {
+      this._onreceive(rinfo.address, p);
+    }
+  }
+  if (this._is_monitoring) {
+    if (typeof (this.ondata) === 'function') {
+      this.ondata(p);
+    }
+  }
+};
+
+DnsSd.prototype._isAnswerPacket = function (p, address) {
+  if (this._source_address_list.indexOf(address) >= 0) {
+    return false;
+  }
+  if (!(p.header.qr === 1 && p.header.op === 0)) {
+    return false;
+  }
+  return true;
+};
+
+module.exports = new DnsSd();
diff --git a/lib/platform.js b/lib/platform.js
new file mode 100644
index 00000000..85727865
--- /dev/null
+++ b/lib/platform.js
@@ -0,0 +1,1945 @@
+import { createServer } from 'http';
+import { createRequire } from 'module';
+import { join } from 'path';
+import storage from 'node-persist';
+import PQueue from 'p-queue'; // eslint-disable-line import/no-unresolved
+import apiClient from './connection/api.js';
+import httpClient from './connection/http.js';
+import lanClient from './connection/lan.js';
+import wsClient from './connection/ws.js';
+import deviceTypes from './device/index.js';
+import eveService from './fakegato/fakegato-history.js';
+import platformConsts from './utils/constants.js';
+import platformChars from './utils/custom-chars.js';
+import eveChars from './utils/eve-chars.js';
+import { parseDeviceId, parseError } from './utils/functions.js';
+import platformLang from './utils/lang.js';
+
+const require = createRequire(import.meta.url);
+const plugin = require('../package.json');
+
+const devicesInHB = new Map();
+const queue = new PQueue({
+  interval: 250,
+  intervalCap: 1,
+  timeout: 10000,
+});
+
+export default class {
+  constructor(log, config, api) {
+    if (!log || !api) {
+      return;
+    }
+
+    // Begin plugin initialisation
+    try {
+      this.api = api;
+      this.log = log;
+      this.apiClient = false;
+      this.apiServer = false;
+      this.httpClient = false;
+      this.lanClient = false;
+      this.lanDevices = false;
+      this.wsClient = false;
+
+      // Configuration objects for accessories
+      this.deviceConf = {};
+      this.rfSubdevices = {};
+      this.hideChannels = [];
+      this.hideMasters = [];
+      this.ignoredDevices = [];
+      this.ipOverride = {};
+      this.obstructSwitches = {};
+
+      // Retrieve the user's chosen language file
+      const lang = platformConsts.allowed.language.includes(config.language)
+        ? config.language
+        : platformConsts.defaultValues.language;
+      this.lang = platformLang[lang];
+
+      // Make sure user is running Homebridge v1.4 or above
+      if (!api?.versionGreaterOrEqual('1.4.0')) {
+        throw new Error(platformLang.hbVersionFail);
+      }
+
+      // Check the user has configured the plugin
+      if (!config) {
+        throw new Error(this.lang.pluginNotConf);
+      }
+
+      // Log some environment info for debugging
+      this.log(
+        '%s v%s | System %s | Node %s | HB v%s | HAPNodeJS v%s...',
+        platformLang.initialising,
+        plugin.version,
+        process.platform,
+        process.version,
+        api.serverVersion,
+        api.hap.HAPLibraryVersion(),
+      );
+
+      // Apply the user's configuration
+      this.config = platformConsts.defaultConfig;
+      this.applyUserConfig(config);
+
+      // Set up the Homebridge events
+      this.api.on('didFinishLaunching', () => this.pluginSetup());
+      this.api.on('shutdown', () => this.pluginShutdown());
+    } catch (err) {
+      // Catch any errors during initialisation
+      const eText = parseError(err, [this.lang.hbVersionFail, this.lang.pluginNotConf]);
+      log.warn('***** %s. *****', this.lang.disabling);
+      log.warn('***** %s. *****', eText);
+    }
+  }
+
+  applyUserConfig(config) {
+    // These shorthand functions save line space during config parsing
+    const logDefault = (k, def) => {
+      this.log.warn('%s [%s] %s %s.', this.lang.cfgItem, k, this.lang.cfgDef, def);
+    };
+    const logDuplicate = (k) => {
+      this.log.warn('%s [%s] %s.', this.lang.cfgItem, k, this.lang.cfgDup);
+    };
+    const logIgnore = (k) => {
+      this.log.warn('%s [%s] %s.', this.lang.cfgItem, k, this.lang.cfgIgn);
+    };
+    const logIgnoreItem = (k) => {
+      this.log.warn('%s [%s] %s.', this.lang.cfgItem, k, this.lang.cfgIgnItem);
+    };
+    const logIncrease = (k, min) => {
+      this.log.warn('%s [%s] %s %s.', this.lang.cfgItem, k, this.lang.cfgLow, min);
+    };
+    const logQuotes = (k) => {
+      this.log.warn('%s [%s] %s.', this.lang.cfgItem, k, this.lang.cfgQts);
+    };
+    const logRemove = (k) => {
+      this.log.warn('%s [%s] %s.', this.lang.cfgItem, k, this.lang.cfgRmv);
+    };
+
+    // Begin applying the user's config
+    Object.entries(config).forEach((entry) => {
+      const [key, val] = entry;
+      switch (key) {
+        case 'apiPort': {
+          if (typeof v === 'string') {
+            logQuotes(key);
+          }
+          const intVal = parseInt(val, 10);
+          if (Number.isNaN(intVal)) {
+            logDefault(key, platformConsts.defaultValues[key]);
+            this.config.apiPort = platformConsts.defaultValues[key];
+          } else if (intVal < platformConsts.minValues[key]) {
+            logIncrease(key, platformConsts.minValues[key]);
+            this.config.apiPort = platformConsts.minValues[key];
+          } else {
+            this.config.apiPort = intVal;
+          }
+          break;
+        }
+        case 'bridgeSensors':
+          if (Array.isArray(val) && val.length > 0) {
+            val.forEach((x) => {
+              if (!x.fullDeviceId) {
+                logIgnoreItem(key);
+                return;
+              }
+              const id = parseDeviceId(x.fullDeviceId);
+              if (Object.keys(this.rfSubdevices).includes(id)) {
+                logDuplicate(`${key}.${id}`);
+                return;
+              }
+              const entries = Object.entries(x);
+              if (entries.length === 1) {
+                logRemove(`${key}.${id}`);
+                return;
+              }
+              this.rfSubdevices[id] = {};
+              entries.forEach((subEntry) => {
+                const [k, v] = subEntry;
+                switch (k) {
+                  case 'curtainType':
+                  case 'deviceType':
+                  case 'overrideLogging':
+                  case 'type': {
+                    const index = k === 'type' ? 'sensorType' : k;
+                    const inSet = platformConsts.allowed[index].includes(v);
+                    if (typeof v !== 'string' || !inSet) {
+                      logIgnore(`${key}.${id}.${k}`);
+                    } else {
+                      this.rfSubdevices[id][k] = inSet ? v : platformConsts.defaultValues[k];
+                    }
+                    break;
+                  }
+                  case 'fullDeviceId':
+                  case 'label':
+                    break;
+                  case 'operationTime':
+                  case 'operationTimeDown':
+                  case 'sensorTimeDifference':
+                  case 'sensorTimeLength': {
+                    if (typeof v === 'string') {
+                      logQuotes(`${key}.${id}.${k}`);
+                    }
+                    const intVal = parseInt(v, 10);
+                    if (Number.isNaN(intVal)) {
+                      logDefault(`${key}.${id}.${k}`, platformConsts.defaultValues[k]);
+                      this.rfSubdevices[id][k] = platformConsts.defaultValues[k];
+                    } else if (intVal < platformConsts.minValues[k]) {
+                      logIncrease(`${key}.${id}.${k}`, platformConsts.minValues[k]);
+                      this.rfSubdevices[id][k] = platformConsts.minValues[k];
+                    } else {
+                      this.rfSubdevices[id][k] = intVal;
+                    }
+                    break;
+                  }
+                  default:
+                    logRemove(`${key}.${id}.${k}`);
+                    break;
+                }
+              });
+            });
+          } else {
+            logIgnore(key);
+          }
+          break;
+        case 'countryCode':
+          if (typeof val !== 'string' || val === '') {
+            logIgnore(key);
+          } else {
+            this.config.countryCode = `+${val.replace(/\D/g, '')}`;
+          }
+          break;
+        case 'debug':
+        case 'debugFakegato':
+        case 'disableDeviceLogging':
+        case 'disableNoResponse':
+        case 'disablePlugin':
+          if (typeof val === 'string') {
+            logQuotes(key);
+          }
+          this.config[key] = val === 'false' ? false : !!val;
+          break;
+        case 'fanDevices':
+        case 'lightDevices':
+        case 'multiDevices':
+        case 'rfDevices':
+        case 'sensorDevices':
+        case 'singleDevices':
+        case 'thDevices':
+          if (Array.isArray(val) && val.length > 0) {
+            val.forEach((x) => {
+              if (!x.deviceId) {
+                logIgnoreItem(key);
+                return;
+              }
+              const id = parseDeviceId(x.deviceId);
+              if (Object.keys(this.deviceConf).includes(id)) {
+                logDuplicate(`${key}.${id}`);
+                return;
+              }
+              const entries = Object.entries(x);
+              if (entries.length === 1) {
+                logRemove(`${key}.${id}`);
+                return;
+              }
+              this.deviceConf[id] = {};
+              entries.forEach((subEntry) => {
+                const [k, v] = subEntry;
+                switch (k) {
+                  case 'adaptiveLightingShift':
+                  case 'brightnessStep':
+                  case 'inUsePowerThreshold':
+                  case 'lowBattThreshold':
+                  case 'minTarget':
+                  case 'maxTarget':
+                  case 'operationTime':
+                  case 'operationTimeDown':
+                  case 'sensorTimeDifference': {
+                    if (typeof v === 'string') {
+                      logQuotes(`${key}.${id}.${k}`);
+                    }
+                    const intVal = parseInt(v, 10);
+                    if (Number.isNaN(intVal)) {
+                      logDefault(`${key}.${id}.${k}`, platformConsts.defaultValues[k]);
+                      this.deviceConf[id][k] = platformConsts.defaultValues[k];
+                    } else if (intVal < platformConsts.minValues[k]) {
+                      logIncrease(`${key}.${id}.${k}`, platformConsts.minValues[k]);
+                      this.deviceConf[id][k] = platformConsts.minValues[k];
+                    } else {
+                      this.deviceConf[id][k] = intVal;
+                    }
+                    break;
+                  }
+                  case 'deviceId':
+                  case 'label':
+                    break;
+                  case 'deviceModel':
+                    if (typeof v !== 'string' || v === '') {
+                      logIgnore(`${key}.${id}.${k}`);
+                    } else if (!platformConsts.allowed.models[key].includes(v)) {
+                      logIgnore(`${key}.${id}.${k}`);
+                    } else if (v === 'gddc5' && key === 'singleDevices') {
+                      this.deviceConf[id].showAs = 'garage_eachen';
+                    }
+                    break;
+                  case 'disableTimer':
+                  case 'hideLight':
+                  case 'hideLongDouble':
+                  case 'hideSensor':
+                  case 'hideSwitch':
+                  case 'humidityOffsetFactor':
+                  case 'isInched':
+                  case 'offlineAsOff':
+                  case 'offsetFactor':
+                  case 'resetOnStartup':
+                  case 'scaleBattery':
+                  case 'showHeatCool':
+                    if (typeof v === 'string') {
+                      logQuotes(`${key}.${id}.${k}`);
+                    }
+                    this.deviceConf[id][k] = v === 'false' ? false : !!v;
+                    break;
+                  case 'hideChannels': {
+                    if (typeof v !== 'string' || v === '') {
+                      logIgnore(`${key}.${id}.${k}`);
+                    } else {
+                      const channels = v.split(',');
+                      channels.forEach((channel) => {
+                        this.hideChannels.push(`${id}SW${channel.replace(/\D+/g, '')}`);
+                        this.deviceConf[id][k] = v;
+                      });
+                    }
+                    break;
+                  }
+                  case 'humidityOffset':
+                  case 'offset':
+                  case 'targetTempThreshold': {
+                    if (typeof v === 'string') {
+                      logQuotes(`${key}.${id}.${k}`);
+                    }
+                    const numVal = Number(v);
+                    if (Number.isNaN(numVal)) {
+                      logIgnore(`${key}.${id}.${k}`);
+                    } else {
+                      this.deviceConf[id][k] = numVal;
+                    }
+                    break;
+                  }
+                  case 'ignoreDevice':
+                    if (typeof v === 'string') {
+                      logQuotes(`${key}.${id}.${k}`);
+                    }
+                    if (!!v && v !== 'false') {
+                      this.ignoredDevices.push(id);
+                    }
+                    break;
+                  case 'inchChannels':
+                  case 'temperatureSource':
+                    if (typeof v !== 'string' || v === '') {
+                      logIgnore(`${key}.${id}.${k}`);
+                    } else {
+                      this.deviceConf[id][k] = v;
+                    }
+                    break;
+                  case 'ipAddress': {
+                    if (typeof v !== 'string' || v === '') {
+                      logIgnore(`${key}.${id}.${k}`);
+                    } else {
+                      this.ipOverride[id] = v;
+                    }
+                    break;
+                  }
+                  case 'obstructId':
+                    if (typeof v !== 'string' || v === '') {
+                      logIgnore(`${key}.${id}.${k}`);
+                    } else {
+                      const parsed = parseDeviceId(v);
+                      this.deviceConf[id][k] = parsed;
+                      this.obstructSwitches[parsed] = id;
+                    }
+                    break;
+                  case 'overrideLogging':
+                  case 'sensorType':
+                  case 'showAs':
+                  case 'showAsEachen':
+                  case 'showAsMotor': {
+                    const inSet = platformConsts.allowed[k].includes(v);
+                    if (typeof v !== 'string' || !inSet) {
+                      logIgnore(`${key}.${id}.${k}`);
+                    } else {
+                      this.deviceConf[id][k] = inSet ? v : platformConsts.defaultValues[k];
+                    }
+                    break;
+                  }
+                  case 'sensorId':
+                    if (typeof v !== 'string' || v === '') {
+                      logIgnore(`${key}.${id}.${k}`);
+                    } else {
+                      this.deviceConf[id].sensorId = parseDeviceId(v);
+                    }
+                    break;
+                  default:
+                    logRemove(`${key}.${id}.${k}`);
+                }
+              });
+            });
+          } else {
+            logIgnore(key);
+          }
+          break;
+        case 'httpHost': {
+          const inSet = platformConsts.allowed.httpHosts.includes(val);
+          if (typeof val !== 'string' || !inSet) {
+            logIgnore(key);
+          }
+          const defaultAutoHost = val === 'auto' ? platformConsts.defaultValues[key] : val;
+          this.config.httpHost = inSet ? defaultAutoHost : platformConsts.defaultValues[key];
+          break;
+        }
+        case 'ignoredHomes':
+        case 'username':
+          if (typeof val !== 'string') {
+            logIgnore(key);
+          } else {
+            this.config[key] = val.replace(/\s+/g, '');
+          }
+          break;
+        case 'language':
+        case 'mode': {
+          const inSet = platformConsts.allowed[key].includes(val);
+          if (typeof val !== 'string' || !inSet) {
+            logIgnore(key);
+          }
+          this.config[key] = inSet ? val : platformConsts.defaultValues[key];
+          break;
+        }
+        case 'name':
+        case 'platform':
+          break;
+        case 'password':
+          if (typeof val !== 'string') {
+            logIgnore(key);
+          } else {
+            this.config.password = val;
+          }
+          break;
+        default:
+          logRemove(key);
+          break;
+      }
+    });
+  }
+
+  async pluginSetup() {
+    // Plugin has finished initialising so now onto setup
+    try {
+      // Log that the plugin initialisation has been successful
+      this.log('%s.', this.lang.initialised);
+
+      // If the user has disabled the plugin then remove all accessories
+      if (this.config.disablePlugin) {
+        devicesInHB.forEach((accessory) => this.removeAccessory(accessory));
+        throw new Error(this.lang.disabled);
+      }
+
+      // Check the eWeLink credentials are configured (except lan mode)
+      if (this.config.mode !== 'lan' && (!this.config.username || !this.config.password)) {
+        devicesInHB.forEach((accessory) => this.removeAccessory(accessory));
+        throw new Error(this.lang.missingCreds);
+      }
+
+      // Require any libraries that the accessory instances use
+      this.cusChar = new platformChars(this.api);
+      this.eveChar = new eveChars(this.api);
+      this.eveService = eveService(this.api);
+
+      // Persist files are used to store device info that could be used for LAN only mode
+      try {
+        this.storageLAN = storage.create({
+          dir: join(this.api.user.persistPath(), '/../homebridge-ewelink'),
+          forgiveParseErrors: true,
+        });
+        await this.storageLAN.init();
+        this.storageClientLAN = true;
+      } catch (err) {
+        if (this.config.debug) {
+          const eText = parseError(err);
+          this.log.warn('%s %s.', this.lang.storageSetupErr, eText);
+        }
+      }
+
+      // Persist files are used to store device info that can be used by my other plugins
+      try {
+        this.storageData = storage.create({
+          dir: join(this.api.user.persistPath(), '/../bwp91_cache'),
+          forgiveParseErrors: true,
+        });
+        await this.storageData.init();
+        this.storageClientData = true;
+      } catch (err) {
+        if (this.config.debug) {
+          const eText = parseError(err);
+          this.log.warn('%s %s.', this.lang.storageSetupErr, eText);
+        }
+      }
+
+      // Manually disable no response mode if mode is set to lan
+      if (this.config.mode === 'lan') {
+        this.config.disableNoResponse = true;
+      }
+
+      const deviceList = [];
+      const groupList = [];
+
+      // Username and password are now optional
+      if (this.config.username && this.config.password) {
+        // Set up the HTTP client, get the user HTTP host, and login
+        this.httpClient = new httpClient(this);
+        const authData = await this.httpClient.login();
+        this.config.password = authData.password;
+
+        // Get a home and device list via HTTP request
+        await this.httpClient.getHomes();
+        const { httpDeviceList, httpGroupList } = await this.httpClient.getDevices();
+        httpDeviceList.forEach((device) => deviceList.push(device));
+        httpGroupList.forEach((group) => groupList.push(group));
+
+        // Set up the WS client, get the user WS host and login
+        if (this.config.mode !== 'lan') {
+          this.wsClient = new wsClient(this, authData);
+          await this.wsClient.login();
+
+          // Refresh the WS connection every 60 minutes
+          this.wsRefresh = setInterval(async () => {
+            try {
+              if (this.config.debug) {
+                this.log('%s.', this.lang.wsRef);
+              }
+              await this.wsClient.login();
+            } catch (err) {
+              const eText = parseError(err);
+              this.log.warn('%s %s.', this.lang.wsRefFail, eText);
+            }
+          }, 3600000);
+        }
+
+        // Clear the storage folder and start again when we have access to http devices
+        if (this.storageClientLAN) {
+          try {
+            await this.storageLAN.clear();
+          } catch (err) {
+            if (this.config.debug) {
+              const eText = parseError(err);
+              this.log.warn('%s %s.', this.lang.storageClearErr, eText);
+            }
+          }
+        }
+      } else {
+        // Warn that HTTP and WS are disabled
+        this.log.warn('%s %s.', this.lang.httpDisabled, this.lang.missingCreds);
+
+        // Get the persisted device data if we are in lan only mode
+        if (this.config.mode === 'lan' && this.storageClientLAN) {
+          try {
+            this.log('Obtaining device list from storage.');
+            const persistDeviceList = await this.storageLAN.values();
+            persistDeviceList.forEach((device) => deviceList.push(device));
+          } catch (err) {
+            if (this.config.debug) {
+              const eText = parseError(err);
+              this.log.warn('%s %s.', this.lang.storageReadErr, eText);
+            }
+          }
+        }
+      }
+
+      // Set up the LAN client, scan for device and start monitoring
+      if (this.config.mode !== 'wan') {
+        this.lanClient = new lanClient(this);
+        this.lanDevices = await this.lanClient.getHosts();
+        await this.lanClient.startMonitor();
+      }
+
+      // Initialise each device into HB
+      deviceList.forEach((device) => this.initialiseDevice(device));
+      groupList.forEach(async (group) => {
+        // Create the format of a device
+        group.extra = { uiid: 5000 };
+        group.deviceid = group.id;
+        group.productModel = `Group [${group.uiid}]`;
+        group.brandName = 'eWeLink';
+        group.online = true;
+        await this.initialiseDevice(group);
+      });
+
+      // Check for redundant accessories (in HB but not eWeLink)
+      devicesInHB.forEach(async (accessory) => {
+        if (
+          !deviceList.some((el) => el.deviceid === accessory.context.eweDeviceId)
+          && !groupList.some((el) => el.id === accessory.context.eweDeviceId)
+        ) {
+          this.removeAccessory(accessory);
+        }
+      });
+
+      // Set up the LAN listener for device notifications
+      if (this.lanClient) {
+        this.lanClient.receiveUpdate((device) => this.receiveDeviceUpdate(device));
+      }
+
+      // Set up the WS listener for device notifications
+      if (this.wsClient) {
+        this.wsClient.receiveUpdate((device) => this.receiveDeviceUpdate(device));
+      }
+
+      // Set up the listener server for the API if the user has this enabled
+      if (this.config.apiPort !== 0 && this.config.password) {
+        this.apiClient = new apiClient(this, devicesInHB);
+        this.apiServer = createServer(async (req, res) => {
+          // The 'homepage' shows a html document with info about the API
+          if (req.url === '/') {
+            res.writeHead(200, { 'Content-Type': 'text/html' });
+            res.end(this.apiClient.showHome());
+            return;
+          }
+
+          // Request is not for the homepage so action appropriately
+          res.writeHead(200, { 'Content-Type': 'application/json' });
+          try {
+            const response = await this.apiClient.action(req);
+
+            // Actioning the request was successful so respond with a success
+            res.end(JSON.stringify({ success: true, response }));
+          } catch (err) {
+            // An error occurred actioning the request so respond with the error
+            res.end(JSON.stringify({ success: false, error: `${err.message}.` }));
+          }
+        });
+
+        // Start listening on the above created server
+        this.apiServer.listen(this.config.apiPort === 1 ? 0 : this.config.apiPort, (err) => {
+          if (err) {
+            this.log.warn('%s [%s].', this.lang.apiListenErr, err);
+          } else {
+            this.log('%s [%s].', this.lang.apiListening, this.apiServer.address().port);
+          }
+        });
+      }
+
+      // Log that the plugin setup has been successful with a welcome message
+      const randIndex = Math.floor(Math.random() * this.lang.zWelcome.length);
+
+      // Set a small timeout so the message should appear after the API port log entry
+      setTimeout(() => {
+        this.log('%s. %s', this.lang.complete, this.lang.zWelcome[randIndex]);
+      }, 2000);
+    } catch (err) {
+      // Catch any errors during setup
+      const eText = parseError(err, [
+        this.lang.disabled,
+        this.lang.missingCreds,
+        'password error! [10001]',
+        'user does not exists [10003]',
+      ]);
+      this.log.warn('***** %s. *****', this.lang.disabling);
+      this.log.warn('***** %s. *****', eText);
+      this.pluginShutdown();
+    }
+  }
+
+  pluginShutdown() {
+    // A function that is called when the plugin fails to load or Homebridge restarts
+    try {
+      // Shutdown the listener server if it's running
+      if (this.apiServer) {
+        this.apiServer.close(() => {
+          if (this.config.debug) {
+            this.log('%s.', this.lang.apiShutdown);
+          }
+        });
+      }
+
+      // Stop the LAN monitoring
+      if (this.lanClient) {
+        this.lanClient.closeConnection();
+      }
+
+      // Close the WS connection
+      if (this.wsClient) {
+        clearInterval(this.wsRefresh);
+        this.wsClient.closeConnection();
+      }
+    } catch (err) {
+      // No need to show errors at this point
+    }
+  }
+
+  async initialiseDevice(device) {
+    try {
+      let accessory;
+      const uiid = device?.extra?.uiid || 0;
+      const uuid = this.api.hap.uuid.generate(`${device.deviceid}SWX`);
+      device.showAs = this.deviceConf?.[device.deviceid]?.showAs || 'default';
+
+      // Remove old sub accessories for Accessory Simulations and DUALR3 in motor/meter mode
+      if (
+        device.showAs !== 'default'
+        || (platformConsts.devices.switchMultiPower.includes(uiid)
+          && [2, 3].includes(device.params.workMode))
+      ) {
+        for (let i = 0; i <= 4; i += 1) {
+          const uuidsub = this.api.hap.uuid.generate(`${device.deviceid}SW${i}`);
+          if (devicesInHB.has(uuidsub)) {
+            this.removeAccessory(devicesInHB.get(uuidsub));
+          }
+        }
+      }
+
+      // Set up the correct instance for this particular device
+      if (platformConsts.devices.switchMultiPower.includes(uiid) && device.params.workMode === 2) {
+        /** ***********************
+         BLINDS [DUALR3 MOTOR MODE]
+         ************************ */
+        // Check the device has been calibrated
+        if (device.params.calibState === 0) {
+          if (devicesInHB.has(uuid)) {
+            this.removeAccessory(devicesInHB.get(uuid));
+          }
+          this.log.warn('[%s] %s.', device.name, this.lang.dualr3NoCalib);
+          this.ignoredDevices.push(device.deviceid);
+          return;
+        }
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+        accessory.control = new deviceTypes.deviceMotor(this, accessory);
+        /** ********************* */
+      } else if (
+        platformConsts.devices.switchMultiPower.includes(uiid)
+        && device.params.workMode === 3
+      ) {
+        /** ***********************
+         BLINDS [DUALR3 METER MODE]
+         ************************ */
+        if (devicesInHB.has(uuid)) {
+          this.removeAccessory(devicesInHB.get(uuid));
+        }
+        this.log.warn('[%s] %s.', device.name, this.lang.dualr3NoMeter);
+        this.ignoredDevices.push(device.deviceid);
+        return;
+      } else if (platformConsts.devices.panel.includes(uiid)) {
+        /** ****
+         NSPANEL
+         ***** */
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+        accessory.control = new deviceTypes.devicePanel(this, accessory);
+        /** ** */
+      } else if (platformConsts.devices.curtain.includes(uiid)) {
+        /** **************************
+         BLINDS [EWELINK UIID 11 & 67]
+         *************************** */
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+        accessory.control = new deviceTypes.deviceCurtain(this, accessory);
+        /** ************************ */
+      } else if (device.showAs === 'blind') {
+        /** **************************
+         BLINDS [ACCESSORY SIMULATION]
+         *************************** */
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+        accessory.control = new deviceTypes.sim.deviceBlind(this, accessory);
+        /** ************************ */
+      } else if (device.showAs === 'door') {
+        /** *************************
+         DOORS [ACCESSORY SIMULATION]
+         ************************** */
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+        accessory.control = new deviceTypes.sim.deviceDoor(this, accessory);
+        /** *********************** */
+      } else if (device.showAs === 'window') {
+        /** ***************************
+         WINDOWS [ACCESSORY SIMULATION]
+         **************************** */
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+        accessory.control = new deviceTypes.sim.deviceWindow(this, accessory);
+        /** ************************* */
+      } else if (this.obstructSwitches[device.deviceid]) {
+        /** ***************************
+         OBSTRUCTION DETECTION SWITCHES
+         **************************** */
+        accessory = this.addAccessory(device, `${device.deviceid}SWX`, true);
+        accessory.control = new deviceTypes.sim.deviceGarageOdSwitch(this, accessory, devicesInHB);
+        /** ************************* */
+      } else if (
+        Object.values(this.deviceConf).some((el) => el.sensorId === device.deviceid)
+        && (platformConsts.devices.garageSensors.includes(uiid) || device.showAs === 'sensor')
+      ) {
+        /** ***************************************
+         SENSORS [AS GARAGE/LOCK SENSOR SIMULATION]
+         **************************************** */
+        const sim = Object.entries(this.deviceConf).find(
+          ([, el]) => el.sensorId === device.deviceid && ['garage', 'lock'].includes(el.showAs),
+        );
+        const uuidSub = this.api.hap.uuid.generate(`${sim[0]}SWX`);
+        if (devicesInHB.has(uuidSub)) {
+          const subAccessory = devicesInHB.get(uuidSub);
+          let instance;
+          if (sim[1].hideSensor) {
+            // If the sensor exists in Homebridge then remove it as needs to be re-added as hidden
+            if (devicesInHB.has(uuid)) {
+              this.removeAccessory(devicesInHB.get(uuid));
+            }
+            instance = deviceTypes.sim.deviceSensorHidden;
+            accessory = this.addAccessory(device, `${device.deviceid}SWX`, true);
+          } else {
+            instance = deviceTypes.sim.deviceSensorVisible;
+            accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+          }
+          accessory.control = new instance(this, accessory, subAccessory);
+        } else {
+          accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+          this.log.warn('[%s] %s.', accessory.displayName, this.lang.sensorNoDevice);
+          accessory.control = new deviceTypes.deviceSensorContact(this, accessory);
+        }
+        /** ******************************************** */
+      } else if (device.showAs === 'garage') {
+        /** **************************************
+         GARAGE DOORS [ONE] [ACCESSORY SIMULATION]
+         *************************************** */
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+        accessory.control = new deviceTypes.sim.deviceGarageOne(this, accessory);
+        /** ************************************ */
+      } else if (device.showAs === 'garage_two') {
+        /** **************************************
+         GARAGE DOORS [TWO] [ACCESSORY SIMULATION]
+         *************************************** */
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+        accessory.control = new deviceTypes.sim.deviceGarageTwo(this, accessory);
+        /** ************************************ */
+      } else if (device.showAs === 'garage_four') {
+        /** ***************************************
+         GARAGE DOORS [FOUR] [ACCESSORY SIMULATION]
+         **************************************** */
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+        accessory.control = new deviceTypes.sim.deviceGarageFour(this, accessory);
+        /** ************************************* */
+      } else if (device.showAs === 'garage_eachen') {
+        /** *************************
+         GARAGE DOORS [EACHEN GD-DC5]
+         ************************** */
+        const instance = this.deviceConf[device.deviceid]
+          && this.deviceConf[device.deviceid].showAsEachen === 'lock'
+          ? deviceTypes.sim.deviceLockEachen
+          : deviceTypes.sim.deviceGarageEachen;
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+        accessory.control = new instance(this, accessory);
+        /** *********************** */
+      } else if (device.showAs === 'gate') {
+        /** ******************************************
+         GATES (AS GARAGE DOOR) [ACCESSORY SIMULATION]
+         ******************************************* */
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+        accessory.control = new deviceTypes.sim.deviceGateOne(this, accessory, devicesInHB);
+        /** **************************************** */
+      } else if (device.showAs === 'lock') {
+        /** *************************
+         LOCKS [ACCESSORY SIMULATION]
+         ************************** */
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+        accessory.control = new deviceTypes.sim.deviceLockOne(this, accessory);
+        /** *********************** */
+      } else if (device.showAs === 'switch_valve') {
+        /** ********************************
+         SWITCH-VALVE [ACCESSORY SIMULATION]
+         ********************************* */
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+        accessory.control = new deviceTypes.sim.deviceSwitchValve(this, accessory);
+        /** ****************************** */
+      } else if (device.showAs === 'tap') {
+        /** ******************************
+         TAPS [ONE] [ACCESSORY SIMULATION]
+         ******************************* */
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+        accessory.control = new deviceTypes.sim.deviceTapOne(this, accessory);
+        /** **************************** */
+      } else if (device.showAs === 'tap_two') {
+        /** ******************************
+         TAPS [TWO] [ACCESSORY SIMULATION]
+         ******************************* */
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+        accessory.control = new deviceTypes.sim.deviceTapTwo(this, accessory);
+        /** **************************** */
+      } else if (device.showAs === 'valve') {
+        /** ********************************
+         VALVES [ONE] [ACCESSORY SIMULATION]
+         ********************************* */
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+        accessory.control = new deviceTypes.sim.deviceValveOne(this, accessory);
+        /** ****************************** */
+      } else if (device.showAs === 'valve_two') {
+        /** ********************************
+         VALVES [TWO] [ACCESSORY SIMULATION]
+         ********************************* */
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+        accessory.control = new deviceTypes.sim.deviceValveTwo(this, accessory);
+        /** ****************************** */
+      } else if (device.showAs === 'valve_four') {
+        /** *********************************
+         VALVES [FOUR] [ACCESSORY SIMULATION]
+         ********************************** */
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+        accessory.control = new deviceTypes.sim.deviceValveFour(this, accessory);
+        /** ******************************* */
+      } else if (device.showAs === 'sensor') {
+        /** *****************
+         SENSORS [SIMULATION]
+         ****************** */
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+        accessory.control = new deviceTypes.sim.deviceSensor(this, accessory);
+        /** *************** */
+      } else if (device.showAs === 'p_button') {
+        /** *****************************
+         PROGRAMMABLE BUTTON [SIMULATION]
+         ****************************** */
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+        accessory.control = new deviceTypes.sim.devicePButton(this, accessory);
+        /** *************************** */
+      } else if (device.showAs === 'doorbell') {
+        /** ******************
+         DOORBELL [SIMULATION]
+         ******************* */
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+        accessory.control = new deviceTypes.sim.deviceDoorbell(this, accessory);
+        /** **************** */
+      } else if (device.showAs === 'purifier') {
+        /** *******************
+         PURIFIERS [SIMULATION]
+         ******************** */
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+        accessory.control = new deviceTypes.sim.devicePurifier(this, accessory);
+        /** ***************** */
+      } else if (device.showAs === 'audio') {
+        /** *************************
+         AUDIO RECEIVERS [SIMULATION]
+         ************************** */
+        if (devicesInHB.has(uuid)) {
+          this.removeAccessory(devicesInHB.get(uuid));
+        }
+        accessory = this.addExternalAccessory(device, `${device.deviceid}SWX`, 34);
+        accessory.control = new deviceTypes.sim.deviceTv(this, accessory);
+        /** *********************** */
+      } else if (device.showAs === 'box') {
+        /** *********************
+         SET-TOP BOX [SIMULATION]
+         ********************** */
+        if (devicesInHB.has(uuid)) {
+          this.removeAccessory(devicesInHB.get(uuid));
+        }
+        accessory = this.addExternalAccessory(device, `${device.deviceid}SWX`, 35);
+        accessory.control = new deviceTypes.sim.deviceTv(this, accessory);
+        /** ******************* */
+      } else if (device.showAs === 'stick') {
+        /** *************************
+         STREAMING STICK [SIMULATION]
+         ************************** */
+        if (devicesInHB.has(uuid)) {
+          this.removeAccessory(devicesInHB.get(uuid));
+        }
+        accessory = this.addExternalAccessory(device, `${device.deviceid}SWX`, 36);
+        accessory.control = new deviceTypes.sim.deviceTv(this, accessory);
+        /** *********************** */
+      } else if (
+        device.showAs === 'sensor_leak'
+        && platformConsts.devices.sensorContact.includes(uiid)
+      ) {
+        /** ************************************
+         SENSORS [LEAK DW2 ACCESSORY SIMULATION]
+         ************************************* */
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+        accessory.control = new deviceTypes.sim.deviceSensorLeak(this, accessory);
+        /** ********************************** */
+      } else if (platformConsts.devices.sensorContact.includes(uiid)) {
+        /** *****************
+         SENSORS [SONOFF DW2]
+         ****************** */
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+        accessory.control = new deviceTypes.deviceSensorContact(this, accessory);
+      } else if (platformConsts.devices.fan.includes(uiid)) {
+        /** *
+         FANS
+         ** */
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+        accessory.control = new deviceTypes.deviceFan(this, accessory);
+        /**/
+      } else if (platformConsts.devices.diffuser.includes(uiid)) {
+        /** ******
+         DIFFUSERS
+         ******* */
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+        accessory.control = new deviceTypes.deviceDiffuser(this, accessory);
+        /** **** */
+      } else if (platformConsts.devices.humidifier.includes(uiid)) {
+        /** ********
+         HUMIDIFIERS
+         ********* */
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+        accessory.control = new deviceTypes.deviceHumidifier(this, accessory);
+        /** ****** */
+      } else if (platformConsts.devices.thermostat.includes(uiid)) {
+        /** ********
+         THERMOSTATS
+         ********* */
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+        accessory.control = new deviceTypes.deviceThermostat(this, accessory);
+        /** **** */
+      } else if (
+        device.showAs === 'thermostat'
+        && platformConsts.devices.sensorAmbient.includes(uiid)
+      ) {
+        /** ***************************************
+         THERMOSTATS [TH10/16 ACCESSORY SIMULATION]
+         **************************************** */
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+        accessory.context.sensorType = device.params.sensorType;
+        accessory.control = new deviceTypes.sim.deviceThThermostat(this, accessory);
+        /** ************************************* */
+      } else if (device.showAs === 'heater' && platformConsts.devices.sensorAmbient.includes(uiid)) {
+        /** ***********************************
+         HEATERS [TH10/16 ACCESSORY SIMULATION]
+         ************************************ */
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+        accessory.context.sensorType = device.params.sensorType;
+        accessory.control = new deviceTypes.sim.deviceThHeater(this, accessory);
+        /** ********************************* */
+      } else if (device.showAs === 'cooler' && platformConsts.devices.sensorAmbient.includes(uiid)) {
+        /** ***********************************
+         COOLERS [TH10/16 ACCESSORY SIMULATION]
+         ************************************ */
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+        accessory.context.sensorType = device.params.sensorType;
+        accessory.control = new deviceTypes.sim.deviceThCooler(this, accessory);
+        /** ********************************* */
+      } else if (
+        device.showAs === 'humidifier'
+        && platformConsts.devices.sensorAmbient.includes(uiid)
+      ) {
+        /** ***************************************
+         HUMIDIFIERS [TH10/16 ACCESSORY SIMULATION]
+         **************************************** */
+        if (device.params.sensorType === 'DS18B20') {
+          if (devicesInHB.has(uuid)) {
+            this.removeAccessory(devicesInHB.get(uuid));
+          }
+          this.log.warn('[%s] %s.', device.name, this.lang.sensorErr);
+          return;
+        }
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+        accessory.context.sensorType = device.params.sensorType;
+        accessory.control = new deviceTypes.sim.deviceThHumidifier(this, accessory);
+        /** ************************************** */
+      } else if (
+        device.showAs === 'dehumidifier'
+        && platformConsts.devices.sensorAmbient.includes(uiid)
+      ) {
+        /** *****************************************
+         DEHUMIDIFIERS [TH10/16 ACCESSORY SIMULATION]
+         ****************************************** */
+        if (device.params.sensorType === 'DS18B20') {
+          this.log.warn('[%s] %s.', device.name, this.lang.sensorErr);
+          return;
+        }
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+        accessory.context.sensorType = device.params.sensorType;
+        accessory.control = new deviceTypes.sim.deviceThDehumidifier(this, accessory);
+        /** **************************************** */
+      } else if (platformConsts.devices.sensorAmbient.includes(uiid)) {
+        /** *********************
+         SENSOR [AMBIENT-TH10/16]
+         ********************** */
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+        accessory.context.sensorType = device.params.sensorType;
+        accessory.control = new deviceTypes.deviceSensorAmbient(this, accessory);
+        /** ******************* */
+      } else if (platformConsts.devices.sensorTempHumi.includes(uiid)) {
+        /** ***********************
+         SENSOR [AMBIENT-SONOFF SC]
+         ************************ */
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+        accessory.control = new deviceTypes.deviceSensorTempHumi(this, accessory);
+        /** ********************* */
+      } else if (device.showAs === 'heater') {
+        /** *****************
+         HEATERS [SIMULATION]
+         ****************** */
+        if (!this.deviceConf[device.deviceid].temperatureSource) {
+          this.log.warn('[%s] %s.', device.name, this.lang.heaterSimNoSensor);
+          if (devicesInHB.has(uuid)) {
+            this.removeAccessory(devicesInHB.get(uuid));
+          }
+          return;
+        }
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+        accessory.control = new deviceTypes.sim.deviceHeater(this, accessory);
+        /** *************** */
+      } else if (device.showAs === 'cooler') {
+        /** *****************
+         COOLERS [SIMULATION]
+         ****************** */
+        if (!this.deviceConf[device.deviceid].temperatureSource) {
+          this.log.warn('[%s] %s.', device.name, this.lang.heaterSimNoSensor);
+          if (devicesInHB.has(uuid)) {
+            this.removeAccessory(devicesInHB.get(uuid));
+          }
+          return;
+        }
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+        accessory.control = new deviceTypes.sim.deviceCooler(this, accessory);
+        /** *************** */
+      } else if (platformConsts.devices.lightRGB.includes(uiid)) {
+        /** *********
+         LIGHTS [RGB]
+         ********** */
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+        accessory.control = new deviceTypes.deviceLightRGB(this, accessory);
+        /** ******* */
+      } else if (platformConsts.devices.lightCCT.includes(uiid)) {
+        /** *********
+         LIGHTS [CCT]
+         ********** */
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+        accessory.control = new deviceTypes.deviceLightCCT(this, accessory);
+        /** ******* */
+      } else if (platformConsts.devices.lightRGBCCT.includes(uiid)) {
+        /** ***************
+         LIGHTS [RGB & CCT]
+         **************** */
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+        accessory.control = new deviceTypes.deviceLightRGBCCT(this, accessory);
+        /** ************* */
+      } else if (platformConsts.devices.lightDimmer.includes(uiid)) {
+        /** ************
+         LIGHTS [DIMMER]
+         ************* */
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+        accessory.control = new deviceTypes.deviceLightDimmer(this, accessory);
+        /** ********** */
+        /** ******************* */
+      } else if (
+        platformConsts.devices.switchSingle.includes(uiid)
+        || platformConsts.devices.switchSinglePower.includes(uiid)
+        || platformConsts.devices.switchSCM.includes(uiid)
+        || platformConsts.devices.switchSCMPower.includes(uiid)
+      ) {
+        /** ******************************
+         SWITCHES/OUTLETS [SINGLE CHANNEL]
+         ******************************* */
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+        if (device.showAs === 'outlet') {
+          accessory.control = this.deviceConf?.[device.deviceid]?.isInched
+            ? new deviceTypes.deviceOutletSingleInched(this, accessory)
+            : new deviceTypes.deviceOutletSingle(this, accessory);
+        } else {
+          accessory.control = this.deviceConf?.[device.deviceid]?.isInched
+            ? new deviceTypes.deviceSwitchSingleInched(this, accessory)
+            : new deviceTypes.deviceSwitchSingle(this, accessory);
+        }
+        /** **************************** */
+      } else if (
+        platformConsts.devices.switchMulti.includes(uiid)
+        || platformConsts.devices.switchMultiPower.includes(uiid)
+      ) {
+        /** *****************************
+         SWITCHES/OUTLETS [MULTI CHANNEL]
+         ****************************** */
+
+        // If a single accessory is leftover from a simulation then remove it
+        if (devicesInHB.has(uuid)) {
+          this.removeAccessory(devicesInHB.get(uuid));
+        }
+
+        // Loop through the channels of the device
+        for (let i = 0; i <= platformConsts.supportedDevices[uiid]; i += 1) {
+          let subAccessory;
+          const uuidsub = this.api.hap.uuid.generate(`${device.deviceid}SW${i}`);
+
+          // Check if the user has chosen to hide any channels for this device
+          if (
+            this.hideChannels.includes(`${device.deviceid}SW${i}`)
+            || (i === 0 && this.deviceConf?.[device.deviceid]?.inchChannels)
+          ) {
+            // The user has hidden this channel so if it exists then remove it
+            if (devicesInHB.has(uuidsub)) {
+              this.removeAccessory(devicesInHB.get(uuidsub));
+            }
+
+            // If this is the main channel then add it to the array of hidden masters
+            if (i === 0) {
+              this.hideMasters.push(device.deviceid);
+            }
+
+            // Add the sub accessory, but hidden, to Homebridge
+            subAccessory = this.addAccessory(device, `${device.deviceid}SW${i}`, true);
+          } else {
+            // The user has not hidden this channel
+            subAccessory = devicesInHB.get(uuidsub) || this.addAccessory(device, `${device.deviceid}SW${i}`);
+          }
+
+          // Add context information to the sub accessory
+          subAccessory.context.firmware = device.params.fwVersion || plugin.version;
+          subAccessory.context.reachableWAN = this.wsClient && device.online;
+          subAccessory.context.reachableLAN = this.lanClient && this.lanDevices.has(device.deviceid) && this.lanDevices.get(device.deviceid).ip;
+          subAccessory.context.eweBrandName = device.brandName;
+          subAccessory.context.eweBrandLogo = device.brandLogo;
+          subAccessory.context.eweShared = device?.sharedBy?.email || false;
+          subAccessory.context.ip = this.lanClient && subAccessory.context.reachableLAN
+            ? this.lanDevices.get(device.deviceid).ip
+            : false;
+          subAccessory.context.macAddress = device.extra?.staMac?.replace(/:+/g, '').replace(/..\B/g, '$&:') || false;
+          subAccessory.context.lanKey = device.devicekey;
+          subAccessory.control = device.showAs === 'outlet'
+            ? new deviceTypes.deviceOutletMulti(this, subAccessory, devicesInHB)
+            : new deviceTypes.deviceSwitchMulti(this, subAccessory, devicesInHB);
+
+          // Mark the online/offline status of certain devices
+          if (this.wsClient && subAccessory?.control?.markStatus) {
+            subAccessory.control.markStatus(device.online);
+          }
+
+          // Update any changes to the sub accessory to the platform
+          this.api.updatePlatformAccessories(plugin.name, plugin.alias, [subAccessory]);
+          devicesInHB.set(subAccessory.UUID, subAccessory);
+          if (i === 0) {
+            accessory = subAccessory;
+          }
+        }
+        /** *************************** */
+      } else if (platformConsts.devices.switchMate.includes(uiid)) {
+        /** *****************
+         SWITCH MATE (S-MATE)
+         ****************** */
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+        accessory.control = new deviceTypes.deviceSwitchMate(this, accessory);
+        /** *************** */
+      } else if (platformConsts.devices.rfBridge.includes(uiid)) {
+        /** *******************
+         RF BRIDGE + SUBDEVICES
+         ******************** */
+        let rfChlCounter = 0;
+
+        // Make an array of sub devices connected to the RF Bridge
+        const rfMap = [];
+        if (device?.tags?.zyx_info) {
+          device.tags.zyx_info.forEach((remote) => rfMap.push({
+            name: remote.name,
+            type: remote.remote_type,
+            buttons: Object.assign({}, ...remote.buttonName),
+          }));
+        }
+        accessory = this.addAccessory(device, `${device.deviceid}SW0`, true, { rfMap }, 'rf_pri');
+        accessory.control = new deviceTypes.deviceRfBridge(this, accessory, devicesInHB);
+
+        // We don't want to add the main bridge as a visible accessory in Homebridge
+        this.hideMasters.push(device.deviceid);
+
+        // Flag used for later to remove and re-add the subdevices if user configured
+        const resetRF = this.deviceConf?.[device.deviceid]?.resetOnStartup;
+
+        // Loop through each sub device connected to the RF Bridge
+        rfMap.forEach((subDevice) => {
+          const swNumber = rfChlCounter + 1;
+          let subAccessory;
+          let subType;
+          const fullDeviceId = `${device.deviceid}SW${swNumber}`;
+          const uuidsub = this.api.hap.uuid.generate(fullDeviceId);
+          const deviceConf = this.rfSubdevices[fullDeviceId] || {};
+
+          // Check which eWeLink type the connected sub device is
+          let subInstance;
+          switch (subDevice.type) {
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+              subType = 'button';
+              subInstance = deviceTypes.deviceRfButton;
+              break;
+            case '5':
+              switch (deviceConf.curtainType) {
+                case 'blind':
+                case 'door':
+                case 'window':
+                  subType = deviceConf.curtainType;
+                  subInstance = `simulation/rf-${deviceConf.curtainType}`;
+                  break;
+                default:
+                  subType = 'curtain';
+                  subInstance = deviceTypes.deviceRfButton;
+                  break;
+              }
+              break;
+            case '6':
+            case '7':
+              subType = 'sensor';
+              subInstance = deviceTypes.deviceRfSensor;
+              break;
+            default: {
+              this.log.warn(
+                '[%s] %s:\n[%s-%s] %s.',
+                device.name,
+                this.lang.devNotSupYet,
+                uiid,
+                subDevice.type || '?',
+                JSON.stringify(device.params),
+              );
+              return;
+            }
+          }
+
+          // Create an object to save to the sub accessory context
+          const subExtraContext = {
+            buttons: subDevice.buttons,
+            subType,
+            swNumber,
+            name: subDevice.name,
+          };
+
+          // Check if we need to reset the RF devices
+          subAccessory = devicesInHB.get(uuidsub);
+          if (resetRF && subAccessory) {
+            this.removeAccessory(subAccessory);
+          }
+
+          // Get the sub accessory if it's new or hasn't been removed above
+          subAccessory = devicesInHB.get(uuidsub)
+            || this.addAccessory(device, fullDeviceId, false, subExtraContext, 'rf_sub');
+
+          // Add context information to the sub accessory
+          subAccessory.context.firmware = device.params.fwVersion || plugin.version;
+          subAccessory.context.reachableWAN = this.wsClient && device.online;
+          subAccessory.context.reachableLAN = this.lanClient && this.lanDevices.has(device.deviceid) && this.lanDevices.get(device.deviceid).ip;
+          subAccessory.context.eweBrandName = device.brandName;
+          subAccessory.context.eweBrandLogo = device.brandLogo;
+          subAccessory.context.eweShared = device?.sharedBy?.email || false;
+          subAccessory.context.ip = this.lanClient && subAccessory.context.reachableLAN
+            ? this.lanDevices.get(device.deviceid).ip
+            : false;
+          subAccessory.context.macAddress = device.extra?.staMac?.replace(/:+/g, '').replace(/..\B/g, '$&:') || false;
+          subAccessory.context.lanKey = device.devicekey;
+          subAccessory.context.subType = subType;
+
+          // Get the instance for this RF device
+          subAccessory.control = new subInstance(this, subAccessory);
+
+          // Mark the online/offline status of certain devices
+          if (this.wsClient && subAccessory?.control?.markStatus) {
+            subAccessory.control.markStatus(device.online);
+          }
+
+          // Update any changes to the sub accessory to the platform
+          this.api.updatePlatformAccessories(plugin.name, plugin.alias, [subAccessory]);
+          devicesInHB.set(subAccessory.UUID, subAccessory);
+
+          // Increment the counter
+          rfChlCounter += Object.keys(subDevice.buttons || {}).length;
+        });
+
+        // Update any changes to the accessory to the platform
+        accessory.context.channelCount = rfChlCounter;
+        /** ***************** */
+      } else if (platformConsts.devices.zbBridge.includes(uiid)) {
+        /** **********
+         ZIGBEE BRIDGE
+         *********** */
+        this.ignoredDevices.push(device.deviceid);
+        return;
+        /** ******** */
+      } else if (platformConsts.devices.zbSwitchStateless.includes(uiid)) {
+        /** ********************
+         ZIGBEE STATELESS SWITCH
+         ********************* */
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+        accessory.control = new deviceTypes.zb.deviceSwitchStateless(this, accessory);
+        /** ****************** */
+      } else if (platformConsts.devices.zbLightDimmer.includes(uiid)) {
+        /** ***************
+         ZB LIGHTS [DIMMER]
+         **************** */
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+        accessory.control = new deviceTypes.zb.deviceLightDimmer(this, accessory);
+        /** ************* */
+      } else if (platformConsts.devices.zbLightCCT.includes(uiid)) {
+        /** ************
+         ZB LIGHTS [CCT]
+         ************* */
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+        accessory.control = new deviceTypes.zb.deviceLightCCT(this, accessory);
+        /** ********** */
+      } else if (platformConsts.devices.zbSensorAmbient.includes(uiid)) {
+        /** ****************
+         ZB SENSOR [AMBIENT]
+         ***************** */
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+        accessory.control = new deviceTypes.zb.deviceSensorAmbient(this, accessory);
+        /** ************** */
+      } else if (platformConsts.devices.zbSensorMotion.includes(uiid)) {
+        /** ***************
+         ZB SENSOR [MOTION]
+         **************** */
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+        accessory.control = new deviceTypes.zb.deviceSensorMotion(this, accessory);
+        /** ************* */
+      } else if (platformConsts.devices.zbSensorContact.includes(uiid)) {
+        /** ****************
+         ZB SENSOR [CONTACT]
+         ***************** */
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+        accessory.control = new deviceTypes.zb.deviceSensorContact(this, accessory);
+        /** ************** */
+      } else if (platformConsts.devices.zbSensorWater.includes(uiid)) {
+        /** *************
+         ZB SENSOR [LEAK]
+         ************** */
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+        accessory.control = new deviceTypes.zb.deviceSensorLeak(this, accessory);
+        /** *********** */
+      } else if (platformConsts.devices.zbSensorSmoke.includes(uiid)) {
+        /** **************
+         ZB SENSOR [SMOKE]
+         *************** */
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+        accessory.control = new deviceTypes.zb.deviceSensorSmoke(this, accessory);
+        /** ************ */
+      } else if (platformConsts.devices.group.includes(uiid)) {
+        /** ***********
+         EWELINK GROUPS
+         ************ */
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+        accessory.context.groupUIID = device.uiid;
+        accessory.control = new deviceTypes.deviceGroup(this, accessory);
+        /** ********* */
+      } else if (platformConsts.devices.camera.includes(uiid)) {
+        /** ***********
+         SONOFF CAMERAS
+         ************ */
+        this.log('[%s] %s.', device.name, this.lang.sonoffCamera);
+        this.ignoredDevices.push(device.deviceid);
+        return;
+        /** ********* */
+      } else if (platformConsts.devices.template.includes(uiid)) {
+        /** *********
+         TEMPLATE DEV
+         ********** */
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+        accessory.control = new deviceTypes.deviceTemplate(this, accessory);
+        /** ******* */
+      } else if (platformConsts.devices.cannotSupport.includes(uiid)) {
+        /** *****************************
+         DEVICES THAT CANNOT BE SUPPORTED
+         ****************************** */
+        this.log('[%s] %s.', device.name, this.lang.devNotSup);
+        this.ignoredDevices.push(device.deviceid);
+        return;
+        /** *************************** */
+      } else {
+        /** ********************
+         DEVICES PENDING SUPPORT
+         ********************* */
+        this.log.warn(
+          '[%s] %s:\n[%s] %s.',
+          device.name,
+          this.lang.devNotSupYet,
+          uiid,
+          JSON.stringify(device.params),
+        );
+        return;
+        /** ****************** */
+      }
+
+      // Update the reachability values (via WS and LAN)
+      accessory.context.firmware = device.params.fwVersion || plugin.version;
+      accessory.context.reachableWAN = this.wsClient && device.online;
+      accessory.context.reachableLAN = this.lanClient && this.lanDevices.has(device.deviceid) && this.lanDevices.get(device.deviceid).ip;
+      accessory.context.eweBrandName = device.brandName;
+      accessory.context.eweBrandLogo = device.brandLogo;
+      accessory.context.eweShared = device?.sharedBy?.email || false;
+      accessory.context.ip = this.lanClient && accessory.context.reachableLAN ? this.lanDevices.get(device.deviceid).ip : false;
+      accessory.context.macAddress = device.extra?.staMac?.replace(/:+/g, '').replace(/..\B/g, '$&:') || false;
+      accessory.context.lanKey = device.devicekey;
+
+      // Add the uuid and lanKey to the this.lanClient map
+      if (this.lanClient) {
+        this.lanClient.addDeviceDetailsToMap(device.deviceid, accessory.context);
+      }
+
+      // Helpful logging for each device
+      const str = accessory.context.reachableLAN
+        ? `${this.lang.foundWithIP} [${this.lanDevices.get(device.deviceid).ip}]`
+        : this.lang.lanUnsupported;
+
+      // Check to see if the discovered IP is different from any manually configured IP
+      if (
+        accessory.context.reachableLAN
+        && this.ipOverride[device.deviceid]
+        && this.ipOverride[device.deviceid] !== this.lanDevices.get(device.deviceid).ip
+      ) {
+        this.log.warn(
+          '[%s] %s [%s].',
+          accessory.displayName,
+          this.lang.lanIPDifferent,
+          this.lanDevices.get(device.deviceid).ip,
+        );
+      }
+
+      // Check to see if it's a shared device being used with the cloud
+      if (!accessory.context.reachableLAN && accessory.context.eweShared) {
+        this.log.warn('[%s] %s.', accessory.displayName, this.lang.shareWarn);
+      }
+
+      // Check to see if the device has initially been reported offline
+      if (this.wsClient && !accessory.context.reachableWAN && !accessory.context.reachableLAN) {
+        this.log.warn('[%s] %s %s.', accessory.displayName, this.lang.repOffline, this.lang.viaWS);
+      }
+
+      // Update accessory characteristics with the latest values
+      if (this.wsClient && accessory?.control?.externalUpdate) {
+        accessory.control.externalUpdate(device.params);
+
+        // Mark the online/offline status of certain devices
+        if (accessory.control.markStatus) {
+          accessory.control.markStatus(device.online);
+        }
+      }
+
+      // Update any changes to the device into our devicesInHB map
+      this.api.updatePlatformAccessories(plugin.name, plugin.alias, [accessory]);
+      devicesInHB.set(accessory.UUID, accessory);
+      if (uiid === 5000) {
+        this.log(
+          '[%s] %s [%s] [%s].',
+          accessory.displayName,
+          this.lang.devInitGroup,
+          device.deviceid,
+          uiid,
+        );
+      } else {
+        this.log(
+          '[%s] %s %s [%s:%s].',
+          accessory.displayName,
+          this.lang.devInit,
+          str,
+          uiid,
+          device.productModel,
+        );
+      }
+
+      // Store the device in the persist file
+      if (this.storageClientLAN && platformConsts.devices.lan.includes(uiid)) {
+        try {
+          await this.storageLAN.setItem(device.deviceid, device);
+        } catch (err) {
+          if (this.config.debug) {
+            const eText = parseError(err);
+            this.log.warn('[%s] %s %s.', accessory.displayName, this.lang.storageWriteErr, eText);
+          }
+        }
+      }
+    } catch (err) {
+      // Catch any errors during initialisation
+      const eText = parseError(err);
+      this.log.warn('[%s] %s %s.', device.name, this.lang.devNotInit, eText);
+    }
+  }
+
+  addAccessory(device, hbDeviceId, hidden = false, extraContext = {}, type = '') {
+    // Add an accessory to Homebridge
+    let newDeviceName = 'Unknown';
+    try {
+      // Get the switchNumber which can be {X, 0, 1, 2, 3, 4, ...}
+      const switchNumber = hbDeviceId.split('SW')[1].toString();
+      const channelCount = type === 'rf_pri'
+        ? Object.keys((device?.tags?.zyx_info) || []).length
+        : platformConsts.supportedDevices[device.extra.uiid];
+
+      // Set up the device name which can depend on the accessory type
+      if (type === 'rf_sub') {
+        // RF accessories have their name stored in the context
+        newDeviceName = extraContext.name;
+      } else {
+        // Other accessories store the name initially as the device name
+        newDeviceName = device.name;
+
+        // Check if it's a channel of a multi-channel device
+        if (['1', '2', '3', '4'].includes(switchNumber)) {
+          // Try and obtain the eWeLink channel name
+          if (device?.tags?.ck_channel_name?.[parseInt(switchNumber, 10) - 1]) {
+            // Found the eWeLink channel name
+            newDeviceName = device.tags.ck_channel_name[parseInt(switchNumber, 19) - 1];
+          } else {
+            // Didn't find the eWeLink channel name use generic SW channel
+            newDeviceName += ` SW${switchNumber}`;
+          }
+        }
+      }
+
+      // Add the new accessory to Homebridge
+      const accessory = new this.api.platformAccessory(
+        newDeviceName,
+        this.api.hap.uuid.generate(hbDeviceId),
+      );
+
+      // If it isn't a hidden device then set the accessory characteristics
+      if (!hidden) {
+        accessory
+          .getService(this.api.hap.Service.AccessoryInformation)
+          .setCharacteristic(this.api.hap.Characteristic.Name, newDeviceName)
+          .setCharacteristic(this.api.hap.Characteristic.ConfiguredName, newDeviceName)
+          .setCharacteristic(this.api.hap.Characteristic.SerialNumber, hbDeviceId)
+          .setCharacteristic(this.api.hap.Characteristic.Manufacturer, device.brandName)
+          .setCharacteristic(
+            this.api.hap.Characteristic.Model,
+            `${device.productModel} (${device.extra.model})`,
+          )
+          .setCharacteristic(
+            this.api.hap.Characteristic.FirmwareRevision,
+            device.params.fwVersion || plugin.version,
+          )
+          .setCharacteristic(this.api.hap.Characteristic.Identify, true);
+      }
+
+      // Add helpful context values to the accessory
+      accessory.context = {
+        ...{
+          hbDeviceId,
+          eweDeviceId: device.deviceid,
+          eweUIID: device.extra.uiid,
+          eweModel: device.productModel,
+          eweApiKey: device.apikey,
+          switchNumber,
+          channelCount,
+          hidden,
+        },
+        ...extraContext,
+      };
+
+      // Register the accessory if it hasn't been hidden by the user
+      if (!hidden) {
+        this.api.registerPlatformAccessories(plugin.name, plugin.alias, [accessory]);
+        this.log('[%s] %s.', newDeviceName, this.lang.devAdd);
+      }
+
+      // Return the new accessory
+      this.configureAccessory(accessory);
+      return accessory;
+    } catch (err) {
+      // Catch any errors during add
+      const eText = parseError(err);
+      this.log.warn('[%s] %s %s.', newDeviceName, this.lang.devNotAdd, eText);
+      return false;
+    }
+  }
+
+  addExternalAccessory(device, hbDeviceId, category) {
+    try {
+      // Add the new accessory to Homebridge
+      const accessory = new this.api.platformAccessory(
+        device.name,
+        this.api.hap.uuid.generate(hbDeviceId),
+        category,
+      );
+
+      // Set the accessory characteristics
+      accessory
+        .getService(this.api.hap.Service.AccessoryInformation)
+        .setCharacteristic(this.api.hap.Characteristic.Name, device.name)
+        .setCharacteristic(this.api.hap.Characteristic.ConfiguredName, device.name)
+        .setCharacteristic(this.api.hap.Characteristic.SerialNumber, hbDeviceId)
+        .setCharacteristic(this.api.hap.Characteristic.Manufacturer, device.brandName)
+        .setCharacteristic(
+          this.api.hap.Characteristic.Model,
+          `${device.productModel} (${device.extra.model})`,
+        )
+        .setCharacteristic(
+          this.api.hap.Characteristic.FirmwareRevision,
+          device.params.fwVersion || plugin.version,
+        )
+        .setCharacteristic(this.api.hap.Characteristic.Identify, true);
+
+      // Add helpful context values to the accessory
+      accessory.context = {
+        ...{
+          hbDeviceId,
+          eweDeviceId: device.deviceid,
+          eweUIID: device.extra.uiid,
+          eweModel: device.productModel,
+          eweApiKey: device.apikey,
+          switchNumber: hbDeviceId.split('SW')[1].toString(),
+          channelCount: platformConsts.supportedDevices[device.extra.uiid],
+          hidden: false,
+        },
+      };
+
+      // Register the accessory
+      this.api.publishExternalAccessories(plugin.name, [accessory]);
+      this.log('[%s] %s.', device.name, this.lang.devAdd);
+
+      // Return the new accessory
+      this.configureAccessory(accessory);
+      return accessory;
+    } catch (err) {
+      // Catch any errors during add
+      const eText = parseError(err);
+      this.log.warn('[%s] %s %s.', device.name, this.lang.devNotAdd, eText);
+      return false;
+    }
+  }
+
+  configureAccessory(accessory) {
+    // Set the correct firmware version if we can
+    if (this.api && accessory.context.firmware) {
+      accessory
+        .getService(this.api.hap.Service.AccessoryInformation)
+        .updateCharacteristic(
+          this.api.hap.Characteristic.FirmwareRevision,
+          accessory.context.firmware,
+        );
+    }
+
+    // Add the configured accessory to our global map
+    devicesInHB.set(accessory.UUID, accessory);
+  }
+
+  removeAccessory(accessory) {
+    try {
+      // Remove an accessory from Homebridge
+      if (!accessory.context.hidden) {
+        this.api.unregisterPlatformAccessories(plugin.name, plugin.alias, [accessory]);
+      }
+      devicesInHB.delete(accessory.UUID);
+      this.log('[%s] %s.', accessory.displayName, this.lang.devRemove);
+    } catch (err) {
+      // Catch any errors during remove
+      const eText = parseError(err);
+      this.log.warn('[%s] %s %s.', accessory.displayName, this.lang.devNotRemove, eText);
+    }
+  }
+
+  async sendDeviceUpdate(accessory, params) {
+    // Add to a queue so multiple updates are at least 500ms apart
+    return queue.add(async () => {
+      // Log the update being sent
+      if (accessory.control.enableDebugLogging) {
+        this.log('[%s] %s %s.', accessory.displayName, this.lang.updSend, JSON.stringify(params));
+      }
+
+      // Set up the payload to send via LAN/WS
+      const payload = {
+        apikey: accessory.context.eweApiKey,
+        deviceid: accessory.context.eweDeviceId,
+        params,
+      };
+
+      // Check if we can send via LAN otherwise send via WS
+      let res;
+      if (this.lanClient) {
+        res = platformConsts.devices.lan.includes(accessory.context.eweUIID)
+          ? await this.lanClient.sendUpdate(payload)
+          : this.lang.lanNotSup;
+      } else {
+        res = this.lang.lanDisabled;
+      }
+
+      // Revert to WS if LAN mode not possible for whatever reason
+      if (res !== 'ok') {
+        // Check to see if the device is online
+        if (this.wsClient) {
+          // Log the revert if appropriate
+          if (accessory.control.enableDebugLogging) {
+            this.log('[%s] %s %s.', accessory.displayName, this.lang.revertWS, res);
+          }
+
+          // Attempt the update
+          if (accessory.context.reachableWAN) {
+            // Device is online via WS so send the update
+            return this.wsClient.sendUpdate(payload);
+          }
+          // Device appears to be offline
+          throw new Error(this.lang.unreachable);
+        } else {
+          // Device isn't online via WS so report the error back
+          const eText = [this.lang.lanDisabled, this.lang.lanNotSup].includes(res)
+            ? res
+            : `${this.lang.unreachable} [${res}]`;
+          throw new Error(eText);
+        }
+      }
+      return true;
+    });
+  }
+
+  async sendGroupUpdate(accessory, params) {
+    // Add to a queue so multiple updates are at least 500ms apart
+    return queue.add(async () => {
+      // Log the update being sent
+      if (accessory.control.enableDebugLogging) {
+        this.log('[%s] %s %s.', accessory.displayName, this.lang.updSend, JSON.stringify(params));
+      }
+
+      // Send the request via HTTP
+      this.httpClient.updateGroup(accessory.context.eweDeviceId, params);
+    });
+  }
+
+  async receiveDeviceUpdate(device) {
+    const deviceId = device.deviceid;
+    let reachableChange = false;
+
+    // Find our accessory for which the updates relate to
+    const uuid1 = this.api.hap.uuid.generate(`${deviceId}SWX`);
+    const uuid2 = this.api.hap.uuid.generate(`${deviceId}SW0`);
+    const accessory = devicesInHB.get(uuid1) || devicesInHB.get(uuid2);
+    if (!accessory) {
+      return;
+    }
+    if (accessory.control.enableDebugLogging) {
+      this.log(
+        '[%s] %s %s.',
+        accessory.displayName,
+        this.lang.updRec,
+        JSON.stringify(device.params),
+      );
+    }
+    if (device.params.updateSource === 'WS') {
+      // The update is from WS so update the WS online/offline status
+      if (device.params.online !== accessory.context.reachableWAN) {
+        accessory.context.reachableWAN = device.params.online;
+        this.api.updatePlatformAccessories(plugin.name, plugin.alias, [accessory]);
+        devicesInHB.set(accessory.UUID, accessory);
+
+        // Flag this true to update the sub accessories later
+        reachableChange = true;
+
+        // Log the new reachability of the device
+        if (accessory.control.enableLogging) {
+          if (accessory.context.reachableWAN) {
+            this.log('[%s] %s %s.', accessory.displayName, this.lang.repOnline, this.lang.viaWS);
+          } else {
+            this.log.warn(
+              '[%s] %s %s.',
+              accessory.displayName,
+              this.lang.repOffline,
+              this.lang.viaWS,
+            );
+          }
+        }
+
+        // Mark the online/offline status of certain devices
+        if (accessory.control.markStatus) {
+          accessory.control.markStatus(device.params.online);
+        }
+
+        // Try and request an update through WS if the device has come back online
+        if (accessory.context.reachableWAN && this.wsClient) {
+          try {
+            await this.wsClient.requestUpdate(accessory);
+          } catch (err) {
+            // Suppress any errors here
+          }
+        }
+      }
+    }
+    if (device.params.updateSource === 'LAN') {
+      // The update is from LAN so it must be online
+      if (!accessory.context.reachableLAN) {
+        accessory.context.reachableLAN = true;
+
+        // Flag this true to update the sub accessories later
+        reachableChange = true;
+
+        // Log the new reachability of the device
+        if (accessory.control.enableLogging) {
+          this.log('[%s] %s %s.', accessory.displayName, this.lang.repOnline, this.lang.viaLAN);
+        }
+
+        // Try and request an update through WS if the device has come back online
+        if (accessory.context.reachableWAN && this.wsClient) {
+          try {
+            await this.wsClient.requestUpdate(accessory);
+          } catch (err) {
+            // Suppress any errors here
+          }
+        }
+      }
+
+      // Check to see if the IP of the device has changed
+      if (device.params.ip && device.params.ip !== accessory.context.ip) {
+        accessory.context.ip = device.params.ip;
+
+        // Flag this true to update the sub accessories later
+        reachableChange = true;
+
+        // Log the new ip of the device
+        if (accessory.control.enableLogging) {
+          this.log('[%s] %s [%s].', accessory.displayName, this.lang.newIP, device.params.ip);
+        }
+      }
+
+      // Update the accessory context if the device is back online or the IP changed
+      if (reachableChange) {
+        this.api.updatePlatformAccessories(plugin.name, plugin.alias, [accessory]);
+        devicesInHB.set(accessory.UUID, accessory);
+      }
+    }
+
+    // Update this new online/offline status for all switches of multichannel devices
+    if (reachableChange && accessory.context.hbDeviceId.substr(-1) !== 'X') {
+      // Loop through to see which channels are in HB
+      for (let i = 1; i <= accessory.context.channelCount; i += 1) {
+        const uuid = this.api.hap.uuid.generate(`${deviceId}SW${i}`);
+        if (devicesInHB.has(uuid)) {
+          // Find the sub accessory
+          const subAccessory = devicesInHB.get(uuid);
+
+          // Update the WAN status
+          subAccessory.context.reachableWAN = device.params.online;
+          if (device.params.updateSource === 'WS' && subAccessory?.control?.markStatus) {
+            subAccessory.control.markStatus(device.params.online);
+          }
+
+          // Update the LAN status
+          if (device.params.updateSource === 'LAN') {
+            subAccessory.context.reachableLAN = true;
+            if (device.params.ip) {
+              subAccessory.context.ip = device.params.ip;
+            }
+          }
+
+          // Save the sub accessory updates to the platform
+          this.api.updatePlatformAccessories(plugin.name, plugin.alias, [subAccessory]);
+          devicesInHB.set(subAccessory.UUID, subAccessory);
+        }
+      }
+    }
+    try {
+      // Update the accessory with the new data
+      if (accessory?.control?.externalUpdate) {
+        accessory.control.externalUpdate(device.params);
+      }
+    } catch (err) {
+      const eText = parseError(err);
+      this.log.warn('[%s] %s %s.', accessory.displayName, this.lang.devNotRf, eText);
+    }
+  }
+
+  async deviceUpdateError(accessory, err, requestRefresh) {
+    // Log the error
+    const eText = parseError(err);
+    this.log.warn('[%s] %s %s.', accessory.displayName, this.lang.devNotUpd, eText);
+
+    // We only request a device refresh on failed internal updates
+    if (requestRefresh && accessory.context.reachableWAN && this.wsClient) {
+      try {
+        await this.wsClient.requestUpdate(accessory);
+      } catch (error) {
+        // Suppress any errors at this point
+      }
+    }
+  }
+}
diff --git a/lib/utils/colour-utils.js b/lib/utils/colour-utils.js
deleted file mode 100644
index 6c1059fe..00000000
--- a/lib/utils/colour-utils.js
+++ /dev/null
@@ -1,551 +0,0 @@
-/* jshint node: true, esversion: 10, -W014, -W033 */
-/* eslint-disable new-cap */
-'use strict'
-
-module.exports = {
-  hs2rgb: (h, s) => {
-    /*
-      Credit:
-      https://github.com/WickyNilliams/pure-color
-    */
-    h = parseInt(h) / 60
-    s = parseInt(s) / 100
-    const f = h - Math.floor(h)
-    const p = 255 * (1 - s)
-    const q = 255 * (1 - s * f)
-    const t = 255 * (1 - s * (1 - f))
-    let rgb
-    switch (Math.floor(h) % 6) {
-      case 0:
-        rgb = [255, t, p]
-        break
-      case 1:
-        rgb = [q, 255, p]
-        break
-      case 2:
-        rgb = [p, 255, t]
-        break
-      case 3:
-        rgb = [p, q, 255]
-        break
-      case 4:
-        rgb = [t, p, 255]
-        break
-      case 5:
-        rgb = [255, p, q]
-        break
-    }
-    if (rgb[0] === 255 && rgb[1] <= 25 && rgb[2] <= 25) {
-      rgb[1] = 0
-      rgb[2] = 0
-    }
-    return [Math.round(rgb[0]), Math.round(rgb[1]), Math.round(rgb[2])]
-  },
-
-  rgb2hs: (r, g, b) => {
-    /*
-      Credit:
-      https://github.com/WickyNilliams/pure-color
-    */
-    r = parseInt(r)
-    g = parseInt(g)
-    b = parseInt(b)
-    const min = Math.min(r, g, b)
-    const max = Math.max(r, g, b)
-    const delta = max - min
-    let h
-    let s
-    if (max === 0) {
-      s = 0
-    } else {
-      s = (delta / max) * 100
-    }
-    if (max === min) {
-      h = 0
-    } else if (r === max) {
-      h = (g - b) / delta
-    } else if (g === max) {
-      h = 2 + (b - r) / delta
-    } else if (b === max) {
-      h = 4 + (r - g) / delta
-    }
-    h = Math.min(h * 60, 360)
-
-    if (h < 0) {
-      h += 360
-    }
-    return [Math.round(h), Math.round(s)]
-  },
-
-  k2rgb: k => {
-    /*
-      Credit:
-      https://tannerhelland.com/2012/09/18/convert-temperature-rgb-algorithm-code.html
-    */
-    k = k / 100
-    let r
-    let g
-    let b
-    if (k <= 66) {
-      r = 255
-    } else {
-      r = k - 60
-      r = 329.698727466 * Math.pow(r, -0.1332047592)
-      if (r < 0) {
-        r = 0
-      }
-      if (r > 255) {
-        r = 255
-      }
-    }
-    if (k <= 66) {
-      g = k
-      g = 99.4708025861 * Math.log(g) - 161.1195681661
-      if (g < 0) {
-        g = 0
-      }
-      if (g > 255) {
-        g = 255
-      }
-    } else {
-      g = k - 60
-      g = 288.1221695283 * Math.pow(g, -0.0755148492)
-      if (g < 0) {
-        g = 0
-      }
-      if (g > 255) {
-        g = 255
-      }
-    }
-    if (k >= 66) {
-      b = 255
-    } else {
-      if (k <= 19) {
-        b = 0
-      } else {
-        b = k - 10
-        b = 138.5177312231 * Math.log(b) - 305.0447927307
-        if (b < 0) {
-          b = 0
-        }
-        if (b > 255) {
-          b = 255
-        }
-      }
-    }
-    return [Math.round(r), Math.round(g), Math.round(b)]
-  },
-
-  m2hs: m => {
-    /*
-      Credit:
-      https://github.com/homebridge/HAP-NodeJS
-    */
-    const table = {
-      100: [19, 222.1],
-      101: [18.7, 222.2],
-      102: [18.4, 222.3],
-      103: [18.2, 222.3],
-      104: [17.9, 222.4],
-      105: [17.6, 222.5],
-      106: [17.3, 222.7],
-      107: [17, 222.8],
-      108: [16.7, 222.9],
-      109: [16.4, 223],
-      110: [16.1, 223.2],
-      111: [15.8, 223.3],
-      112: [15.4, 223.4],
-      113: [15.2, 223.6],
-      114: [14.9, 223.8],
-      115: [14.7, 223.9],
-      116: [14.3, 224.1],
-      117: [14.1, 224.2],
-      118: [13.8, 224.4],
-      119: [13.5, 224.6],
-      120: [13.2, 224.8],
-      121: [12.9, 225],
-      122: [12.5, 225.3],
-      123: [12.2, 225.6],
-      124: [11.8, 225.9],
-      125: [11.4, 226.3],
-      126: [11.1, 226.7],
-      127: [10.7, 227.1],
-      128: [10.3, 227.6],
-      129: [9.9, 228],
-      130: [9.6, 228.5],
-      131: [9.3, 229.1],
-      132: [8.9, 229.6],
-      133: [8.5, 230.2],
-      134: [8.2, 230.9],
-      135: [7.8, 231.6],
-      136: [7.5, 232.5],
-      137: [7.1, 233.5],
-      138: [6.7, 234.6],
-      139: [6.3, 235.8],
-      140: [6, 237.1],
-      141: [5.6, 238.9],
-      142: [5.2, 240.9],
-      143: [5, 242.9],
-      144: [4.8, 244.9],
-      145: [4.6, 246.9],
-      146: [4.4, 249.3],
-      147: [4.3, 251.9],
-      148: [4.1, 254.9],
-      149: [3.9, 258],
-      150: [3.7, 261.8],
-      151: [3.4, 265.9],
-      152: [3.2, 271],
-      153: [3, 276.4],
-      154: [2.8, 283.6],
-      155: [2.6, 290.4],
-      156: [2.3, 295.3],
-      157: [2.1, 300],
-      158: [1.9, 300],
-      159: [1.6, 300],
-      160: [1.4, 195.8],
-      161: [1.2, 84.3],
-      162: [1.3, 58.2],
-      163: [1.5, 55.9],
-      164: [1.7, 53.2],
-      165: [1.9, 50.2],
-      166: [2.1, 47.1],
-      167: [2.4, 44.5],
-      168: [2.6, 42.6],
-      169: [2.9, 40.9],
-      170: [3.1, 39.5],
-      171: [3.4, 38.3],
-      172: [3.7, 37.3],
-      173: [3.9, 36.5],
-      174: [4.2, 35.7],
-      175: [4.4, 35.1],
-      176: [4.6, 34.5],
-      177: [4.9, 34],
-      178: [5.1, 33.5],
-      179: [5.3, 33],
-      180: [5.6, 32.7],
-      181: [5.8, 32.3],
-      182: [6, 32],
-      183: [6.3, 31.7],
-      184: [6.5, 31.4],
-      185: [6.7, 31.2],
-      186: [7, 30.9],
-      187: [7.2, 30.7],
-      188: [7.4, 30.5],
-      189: [7.6, 30.3],
-      190: [7.9, 30.1],
-      191: [8.1, 29.9],
-      192: [8.4, 29.7],
-      193: [8.6, 29.6],
-      194: [8.9, 29.5],
-      195: [9.1, 29.3],
-      196: [9.4, 29.2],
-      197: [9.6, 29.1],
-      198: [9.8, 29],
-      199: [10, 28.9],
-      200: [10.2, 28.7],
-      201: [10.5, 28.7],
-      202: [10.7, 28.6],
-      203: [11, 28.5],
-      204: [11.2, 28.4],
-      205: [11.4, 28.3],
-      206: [11.6, 28.3],
-      207: [11.8, 28.2],
-      208: [12.1, 28.1],
-      209: [12.3, 28.1],
-      210: [12.5, 28],
-      211: [12.7, 28],
-      212: [12.9, 27.9],
-      213: [13.2, 27.8],
-      214: [13.4, 27.8],
-      215: [13.6, 27.7],
-      216: [13.8, 27.7],
-      217: [14, 27.7],
-      218: [14.3, 27.6],
-      219: [14.5, 27.6],
-      220: [14.7, 27.5],
-      221: [14.9, 27.5],
-      222: [15.1, 27.5],
-      223: [15.3, 27.4],
-      224: [15.5, 27.4],
-      225: [15.8, 27.4],
-      226: [16, 27.3],
-      227: [16.2, 27.3],
-      228: [16.4, 27.3],
-      229: [16.6, 27.3],
-      230: [16.8, 27.2],
-      231: [17, 27.2],
-      232: [17.2, 27.2],
-      233: [17.4, 27.2],
-      234: [17.6, 27.2],
-      235: [17.8, 27.1],
-      236: [18, 27.1],
-      237: [18.2, 27.1],
-      238: [18.4, 27.1],
-      239: [18.7, 27.1],
-      240: [18.8, 27],
-      241: [19, 27],
-      242: [19.2, 27],
-      243: [19.4, 27],
-      244: [19.6, 27],
-      245: [19.8, 27],
-      246: [20, 27],
-      247: [20.3, 26.9],
-      248: [20.5, 26.9],
-      249: [20.6, 26.9],
-      250: [20.8, 26.9],
-      251: [21, 26.9],
-      252: [21.3, 26.9],
-      253: [21.5, 26.9],
-      254: [21.6, 26.9],
-      255: [21.8, 26.8],
-      256: [22, 26.8],
-      257: [22.2, 26.8],
-      258: [22.4, 26.8],
-      259: [22.6, 26.8],
-      260: [22.8, 26.8],
-      261: [23, 26.8],
-      262: [23.2, 26.8],
-      263: [23.4, 26.8],
-      264: [23.6, 26.8],
-      265: [23.8, 26.8],
-      266: [24, 26.8],
-      267: [24.1, 26.8],
-      268: [24.3, 26.8],
-      269: [24.5, 26.8],
-      270: [24.7, 26.8],
-      271: [24.8, 26.8],
-      272: [25.1, 26.7],
-      273: [25.3, 26.7],
-      274: [25.4, 26.7],
-      275: [25.6, 26.7],
-      276: [25.8, 26.7],
-      277: [26, 26.7],
-      278: [26.1, 26.7],
-      279: [26.3, 26.7],
-      280: [26.5, 26.7],
-      281: [26.7, 26.7],
-      282: [26.9, 26.7],
-      283: [27.1, 26.7],
-      284: [27.3, 26.7],
-      285: [27.5, 26.7],
-      286: [27.7, 26.7],
-      287: [27.8, 26.7],
-      288: [28, 26.7],
-      289: [28.2, 26.7],
-      290: [28.4, 26.7],
-      291: [28.6, 26.7],
-      292: [28.8, 26.7],
-      293: [28.9, 26.7],
-      294: [29.1, 26.7],
-      295: [29.3, 26.7],
-      296: [29.5, 26.7],
-      297: [29.6, 26.7],
-      298: [29.8, 26.7],
-      299: [30, 26.7],
-      300: [30.2, 26.7],
-      301: [30.4, 26.7],
-      302: [30.5, 26.7],
-      303: [30.7, 26.7],
-      304: [30.9, 26.7],
-      305: [31.1, 26.7],
-      306: [31.2, 26.7],
-      307: [31.4, 26.7],
-      308: [31.6, 26.7],
-      309: [31.8, 26.8],
-      310: [31.9, 26.8],
-      311: [32.1, 26.8],
-      312: [32.3, 26.8],
-      313: [32.5, 26.8],
-      314: [32.6, 26.8],
-      315: [32.8, 26.8],
-      316: [33, 26.8],
-      317: [33.2, 26.8],
-      318: [33.3, 26.8],
-      319: [33.5, 26.8],
-      320: [33.7, 26.8],
-      321: [33.8, 26.8],
-      322: [34, 26.8],
-      323: [34.2, 26.8],
-      324: [34.4, 26.8],
-      325: [34.5, 26.8],
-      326: [34.7, 26.8],
-      327: [34.9, 26.8],
-      328: [35.1, 26.8],
-      329: [35.2, 26.8],
-      330: [35.4, 26.8],
-      331: [35.5, 26.8],
-      332: [35.7, 26.8],
-      333: [35.9, 26.8],
-      334: [36.1, 26.8],
-      335: [36.3, 26.9],
-      336: [36.5, 26.9],
-      337: [36.7, 26.9],
-      338: [36.9, 26.9],
-      339: [37.1, 26.9],
-      340: [37.2, 26.9],
-      341: [37.4, 26.9],
-      342: [37.5, 26.9],
-      343: [37.7, 26.9],
-      344: [37.9, 26.9],
-      345: [38.1, 26.9],
-      346: [38.3, 26.9],
-      347: [38.5, 26.9],
-      348: [38.7, 26.9],
-      349: [38.9, 26.9],
-      350: [39, 26.9],
-      351: [39.2, 26.9],
-      352: [39.3, 27],
-      353: [39.5, 27],
-      354: [39.7, 27],
-      355: [39.9, 27],
-      356: [40.1, 27],
-      357: [40.2, 27],
-      358: [40.4, 27],
-      359: [40.6, 27],
-      360: [40.8, 27],
-      361: [40.9, 27],
-      362: [41.1, 27],
-      363: [41.2, 27],
-      364: [41.4, 27],
-      365: [41.6, 27],
-      366: [41.8, 27],
-      367: [42, 27],
-      368: [42.1, 27.1],
-      369: [42.3, 27.1],
-      370: [42.4, 27.1],
-      371: [42.6, 27.1],
-      372: [42.8, 27.1],
-      373: [43, 27.1],
-      374: [43.1, 27.1],
-      375: [43.2, 27.1],
-      376: [43.4, 27.1],
-      377: [43.6, 27.1],
-      378: [43.8, 27.1],
-      379: [43.9, 27.1],
-      380: [44.1, 27.1],
-      381: [44.3, 27.2],
-      382: [44.4, 27.2],
-      383: [44.6, 27.2],
-      384: [44.7, 27.2],
-      385: [44.9, 27.2],
-      386: [45.1, 27.2],
-      387: [45.3, 27.2],
-      388: [45.5, 27.2],
-      389: [45.6, 27.2],
-      390: [45.8, 27.2],
-      391: [46, 27.2],
-      392: [46.2, 27.2],
-      393: [46.4, 27.3],
-      394: [46.5, 27.3],
-      395: [46.7, 27.3],
-      396: [46.9, 27.3],
-      397: [47.1, 27.3],
-      398: [47.2, 27.3],
-      399: [47.4, 27.3],
-      400: [47.6, 27.3],
-      401: [47.7, 27.3],
-      402: [47.9, 27.3],
-      403: [48.1, 27.3],
-      404: [48.3, 27.3],
-      405: [48.5, 27.4],
-      406: [48.7, 27.4],
-      407: [48.8, 27.4],
-      408: [49, 27.4],
-      409: [49.2, 27.4],
-      410: [49.4, 27.4],
-      411: [49.6, 27.4],
-      412: [49.7, 27.4],
-      413: [49.9, 27.4],
-      414: [50.1, 27.4],
-      415: [50.2, 27.4],
-      416: [50.4, 27.4],
-      417: [50.6, 27.5],
-      418: [50.7, 27.5],
-      419: [50.9, 27.5],
-      420: [51.1, 27.5],
-      421: [51.2, 27.5],
-      422: [51.4, 27.5],
-      423: [51.6, 27.5],
-      424: [51.7, 27.5],
-      425: [51.9, 27.5],
-      426: [52.1, 27.5],
-      427: [51.2, 27.6],
-      428: [52.4, 27.6],
-      429: [52.5, 27.6],
-      430: [52.7, 27.6],
-      431: [52.9, 27.6],
-      432: [53.1, 27.6],
-      433: [53.2, 27.6],
-      434: [53.4, 27.6],
-      435: [53.6, 27.6],
-      436: [53.7, 27.6],
-      437: [53.9, 27.6],
-      438: [54.1, 27.7],
-      439: [54.2, 27.7],
-      440: [54.3, 27.7],
-      441: [54.5, 27.7],
-      442: [54.7, 27.7],
-      443: [54.8, 27.7],
-      444: [55, 27.7],
-      445: [55.2, 27.7],
-      446: [55.3, 27.7],
-      447: [55.5, 27.7],
-      448: [55.7, 27.7],
-      449: [55.8, 27.8],
-      450: [56, 27.8],
-      451: [56.2, 27.8],
-      452: [56.3, 27.8],
-      453: [56.5, 27.8],
-      454: [56.7, 27.8],
-      455: [56.8, 27.8],
-      456: [57, 27.8],
-      457: [57.2, 27.8],
-      458: [57.3, 27.9],
-      459: [57.4, 27.9],
-      460: [57.6, 27.9],
-      461: [57.8, 27.9],
-      462: [57.9, 27.9],
-      463: [58.1, 27.9],
-      464: [58.3, 27.9],
-      465: [58.4, 27.9],
-      466: [58.6, 27.9],
-      467: [58.8, 27.9],
-      468: [59, 28],
-      469: [59.1, 28],
-      470: [59.2, 28],
-      471: [59.4, 28],
-      472: [59.6, 28],
-      473: [59.7, 28],
-      474: [60, 28],
-      475: [60.1, 28],
-      476: [60.2, 28],
-      477: [60.4, 28],
-      478: [60.6, 28.1],
-      479: [60.7, 28.1],
-      480: [60.9, 28.1],
-      481: [60.1, 28.1],
-      482: [60.3, 28.1],
-      483: [61.4, 28.1],
-      484: [61.5, 28.1],
-      485: [61.7, 28.1],
-      486: [61.9, 28.1],
-      487: [62, 28.2],
-      488: [62.2, 28.2],
-      489: [62.3, 28.2],
-      490: [62.5, 28.2],
-      491: [62.7, 28.2],
-      492: [62.8, 28.2],
-      493: [63, 28.2],
-      494: [63.2, 28.2],
-      495: [63.3, 28.2],
-      496: [63.4, 28.2],
-      497: [63.6, 28.2],
-      498: [63.8, 28.3],
-      499: [63.9, 28.3],
-      500: [64.1, 28.3]
-    }
-    const input = Math.min(Math.max(Math.round(m), 140), 500)
-    const toReturn = table[input]
-    return [Math.round(toReturn[1]), Math.round(toReturn[0])]
-  }
-}
diff --git a/lib/utils/colour.js b/lib/utils/colour.js
new file mode 100644
index 00000000..a0f72249
--- /dev/null
+++ b/lib/utils/colour.js
@@ -0,0 +1,552 @@
+const hs2rgb = (h, s) => {
+  /*
+    Credit:
+    https://github.com/WickyNilliams/pure-color
+  */
+  h = parseInt(h, 10) / 60;
+  s = parseInt(s, 10) / 100;
+  const f = h - Math.floor(h);
+  const p = 255 * (1 - s);
+  const q = 255 * (1 - s * f);
+  const t = 255 * (1 - s * (1 - f));
+  let rgb;
+  switch (Math.floor(h) % 6) {
+    case 0:
+      rgb = [255, t, p];
+      break;
+    case 1:
+      rgb = [q, 255, p];
+      break;
+    case 2:
+      rgb = [p, 255, t];
+      break;
+    case 3:
+      rgb = [p, q, 255];
+      break;
+    case 4:
+      rgb = [t, p, 255];
+      break;
+    case 5:
+      rgb = [255, p, q];
+      break;
+    default:
+      return [];
+  }
+  if (rgb[0] === 255 && rgb[1] <= 25 && rgb[2] <= 25) {
+    rgb[1] = 0;
+    rgb[2] = 0;
+  }
+  return [Math.round(rgb[0]), Math.round(rgb[1]), Math.round(rgb[2])];
+};
+
+const rgb2hs = (r, g, b) => {
+  /*
+    Credit:
+    https://github.com/WickyNilliams/pure-color
+  */
+  r = parseInt(r, 10);
+  g = parseInt(g, 10);
+  b = parseInt(b, 10);
+  const min = Math.min(r, g, b);
+  const max = Math.max(r, g, b);
+  const delta = max - min;
+  let h;
+  let s;
+  if (max === 0) {
+    s = 0;
+  } else {
+    s = (delta / max) * 100;
+  }
+  if (max === min) {
+    h = 0;
+  } else if (r === max) {
+    h = (g - b) / delta;
+  } else if (g === max) {
+    h = 2 + (b - r) / delta;
+  } else if (b === max) {
+    h = 4 + (r - g) / delta;
+  }
+  h = Math.min(h * 60, 360);
+
+  if (h < 0) {
+    h += 360;
+  }
+  return [Math.round(h), Math.round(s)];
+};
+
+const k2rgb = (k) => {
+  /*
+    Credit:
+    https://tannerhelland.com/2012/09/18/convert-temperature-rgb-algorithm-code.html
+  */
+  k /= 100;
+  let r;
+  let g;
+  let b;
+  if (k <= 66) {
+    r = 255;
+  } else {
+    r = k - 60;
+    r = 329.698727466 * r ** -0.1332047592;
+    if (r < 0) {
+      r = 0;
+    }
+    if (r > 255) {
+      r = 255;
+    }
+  }
+  if (k <= 66) {
+    g = k;
+    g = 99.4708025861 * Math.log(g) - 161.1195681661;
+    if (g < 0) {
+      g = 0;
+    }
+    if (g > 255) {
+      g = 255;
+    }
+  } else {
+    g = k - 60;
+    g = 288.1221695283 * g ** -0.0755148492;
+    if (g < 0) {
+      g = 0;
+    }
+    if (g > 255) {
+      g = 255;
+    }
+  }
+  if (k >= 66) {
+    b = 255;
+  } else if (k <= 19) {
+    b = 0;
+  } else {
+    b = k - 10;
+    b = 138.5177312231 * Math.log(b) - 305.0447927307;
+    if (b < 0) {
+      b = 0;
+    }
+    if (b > 255) {
+      b = 255;
+    }
+  }
+  return [Math.round(r), Math.round(g), Math.round(b)];
+};
+
+const m2hs = (m) => {
+  /*
+    Credit:
+    https://github.com/homebridge/HAP-NodeJS
+  */
+  const table = {
+    100: [19, 222.1],
+    101: [18.7, 222.2],
+    102: [18.4, 222.3],
+    103: [18.2, 222.3],
+    104: [17.9, 222.4],
+    105: [17.6, 222.5],
+    106: [17.3, 222.7],
+    107: [17, 222.8],
+    108: [16.7, 222.9],
+    109: [16.4, 223],
+    110: [16.1, 223.2],
+    111: [15.8, 223.3],
+    112: [15.4, 223.4],
+    113: [15.2, 223.6],
+    114: [14.9, 223.8],
+    115: [14.7, 223.9],
+    116: [14.3, 224.1],
+    117: [14.1, 224.2],
+    118: [13.8, 224.4],
+    119: [13.5, 224.6],
+    120: [13.2, 224.8],
+    121: [12.9, 225],
+    122: [12.5, 225.3],
+    123: [12.2, 225.6],
+    124: [11.8, 225.9],
+    125: [11.4, 226.3],
+    126: [11.1, 226.7],
+    127: [10.7, 227.1],
+    128: [10.3, 227.6],
+    129: [9.9, 228],
+    130: [9.6, 228.5],
+    131: [9.3, 229.1],
+    132: [8.9, 229.6],
+    133: [8.5, 230.2],
+    134: [8.2, 230.9],
+    135: [7.8, 231.6],
+    136: [7.5, 232.5],
+    137: [7.1, 233.5],
+    138: [6.7, 234.6],
+    139: [6.3, 235.8],
+    140: [6, 237.1],
+    141: [5.6, 238.9],
+    142: [5.2, 240.9],
+    143: [5, 242.9],
+    144: [4.8, 244.9],
+    145: [4.6, 246.9],
+    146: [4.4, 249.3],
+    147: [4.3, 251.9],
+    148: [4.1, 254.9],
+    149: [3.9, 258],
+    150: [3.7, 261.8],
+    151: [3.4, 265.9],
+    152: [3.2, 271],
+    153: [3, 276.4],
+    154: [2.8, 283.6],
+    155: [2.6, 290.4],
+    156: [2.3, 295.3],
+    157: [2.1, 300],
+    158: [1.9, 300],
+    159: [1.6, 300],
+    160: [1.4, 195.8],
+    161: [1.2, 84.3],
+    162: [1.3, 58.2],
+    163: [1.5, 55.9],
+    164: [1.7, 53.2],
+    165: [1.9, 50.2],
+    166: [2.1, 47.1],
+    167: [2.4, 44.5],
+    168: [2.6, 42.6],
+    169: [2.9, 40.9],
+    170: [3.1, 39.5],
+    171: [3.4, 38.3],
+    172: [3.7, 37.3],
+    173: [3.9, 36.5],
+    174: [4.2, 35.7],
+    175: [4.4, 35.1],
+    176: [4.6, 34.5],
+    177: [4.9, 34],
+    178: [5.1, 33.5],
+    179: [5.3, 33],
+    180: [5.6, 32.7],
+    181: [5.8, 32.3],
+    182: [6, 32],
+    183: [6.3, 31.7],
+    184: [6.5, 31.4],
+    185: [6.7, 31.2],
+    186: [7, 30.9],
+    187: [7.2, 30.7],
+    188: [7.4, 30.5],
+    189: [7.6, 30.3],
+    190: [7.9, 30.1],
+    191: [8.1, 29.9],
+    192: [8.4, 29.7],
+    193: [8.6, 29.6],
+    194: [8.9, 29.5],
+    195: [9.1, 29.3],
+    196: [9.4, 29.2],
+    197: [9.6, 29.1],
+    198: [9.8, 29],
+    199: [10, 28.9],
+    200: [10.2, 28.7],
+    201: [10.5, 28.7],
+    202: [10.7, 28.6],
+    203: [11, 28.5],
+    204: [11.2, 28.4],
+    205: [11.4, 28.3],
+    206: [11.6, 28.3],
+    207: [11.8, 28.2],
+    208: [12.1, 28.1],
+    209: [12.3, 28.1],
+    210: [12.5, 28],
+    211: [12.7, 28],
+    212: [12.9, 27.9],
+    213: [13.2, 27.8],
+    214: [13.4, 27.8],
+    215: [13.6, 27.7],
+    216: [13.8, 27.7],
+    217: [14, 27.7],
+    218: [14.3, 27.6],
+    219: [14.5, 27.6],
+    220: [14.7, 27.5],
+    221: [14.9, 27.5],
+    222: [15.1, 27.5],
+    223: [15.3, 27.4],
+    224: [15.5, 27.4],
+    225: [15.8, 27.4],
+    226: [16, 27.3],
+    227: [16.2, 27.3],
+    228: [16.4, 27.3],
+    229: [16.6, 27.3],
+    230: [16.8, 27.2],
+    231: [17, 27.2],
+    232: [17.2, 27.2],
+    233: [17.4, 27.2],
+    234: [17.6, 27.2],
+    235: [17.8, 27.1],
+    236: [18, 27.1],
+    237: [18.2, 27.1],
+    238: [18.4, 27.1],
+    239: [18.7, 27.1],
+    240: [18.8, 27],
+    241: [19, 27],
+    242: [19.2, 27],
+    243: [19.4, 27],
+    244: [19.6, 27],
+    245: [19.8, 27],
+    246: [20, 27],
+    247: [20.3, 26.9],
+    248: [20.5, 26.9],
+    249: [20.6, 26.9],
+    250: [20.8, 26.9],
+    251: [21, 26.9],
+    252: [21.3, 26.9],
+    253: [21.5, 26.9],
+    254: [21.6, 26.9],
+    255: [21.8, 26.8],
+    256: [22, 26.8],
+    257: [22.2, 26.8],
+    258: [22.4, 26.8],
+    259: [22.6, 26.8],
+    260: [22.8, 26.8],
+    261: [23, 26.8],
+    262: [23.2, 26.8],
+    263: [23.4, 26.8],
+    264: [23.6, 26.8],
+    265: [23.8, 26.8],
+    266: [24, 26.8],
+    267: [24.1, 26.8],
+    268: [24.3, 26.8],
+    269: [24.5, 26.8],
+    270: [24.7, 26.8],
+    271: [24.8, 26.8],
+    272: [25.1, 26.7],
+    273: [25.3, 26.7],
+    274: [25.4, 26.7],
+    275: [25.6, 26.7],
+    276: [25.8, 26.7],
+    277: [26, 26.7],
+    278: [26.1, 26.7],
+    279: [26.3, 26.7],
+    280: [26.5, 26.7],
+    281: [26.7, 26.7],
+    282: [26.9, 26.7],
+    283: [27.1, 26.7],
+    284: [27.3, 26.7],
+    285: [27.5, 26.7],
+    286: [27.7, 26.7],
+    287: [27.8, 26.7],
+    288: [28, 26.7],
+    289: [28.2, 26.7],
+    290: [28.4, 26.7],
+    291: [28.6, 26.7],
+    292: [28.8, 26.7],
+    293: [28.9, 26.7],
+    294: [29.1, 26.7],
+    295: [29.3, 26.7],
+    296: [29.5, 26.7],
+    297: [29.6, 26.7],
+    298: [29.8, 26.7],
+    299: [30, 26.7],
+    300: [30.2, 26.7],
+    301: [30.4, 26.7],
+    302: [30.5, 26.7],
+    303: [30.7, 26.7],
+    304: [30.9, 26.7],
+    305: [31.1, 26.7],
+    306: [31.2, 26.7],
+    307: [31.4, 26.7],
+    308: [31.6, 26.7],
+    309: [31.8, 26.8],
+    310: [31.9, 26.8],
+    311: [32.1, 26.8],
+    312: [32.3, 26.8],
+    313: [32.5, 26.8],
+    314: [32.6, 26.8],
+    315: [32.8, 26.8],
+    316: [33, 26.8],
+    317: [33.2, 26.8],
+    318: [33.3, 26.8],
+    319: [33.5, 26.8],
+    320: [33.7, 26.8],
+    321: [33.8, 26.8],
+    322: [34, 26.8],
+    323: [34.2, 26.8],
+    324: [34.4, 26.8],
+    325: [34.5, 26.8],
+    326: [34.7, 26.8],
+    327: [34.9, 26.8],
+    328: [35.1, 26.8],
+    329: [35.2, 26.8],
+    330: [35.4, 26.8],
+    331: [35.5, 26.8],
+    332: [35.7, 26.8],
+    333: [35.9, 26.8],
+    334: [36.1, 26.8],
+    335: [36.3, 26.9],
+    336: [36.5, 26.9],
+    337: [36.7, 26.9],
+    338: [36.9, 26.9],
+    339: [37.1, 26.9],
+    340: [37.2, 26.9],
+    341: [37.4, 26.9],
+    342: [37.5, 26.9],
+    343: [37.7, 26.9],
+    344: [37.9, 26.9],
+    345: [38.1, 26.9],
+    346: [38.3, 26.9],
+    347: [38.5, 26.9],
+    348: [38.7, 26.9],
+    349: [38.9, 26.9],
+    350: [39, 26.9],
+    351: [39.2, 26.9],
+    352: [39.3, 27],
+    353: [39.5, 27],
+    354: [39.7, 27],
+    355: [39.9, 27],
+    356: [40.1, 27],
+    357: [40.2, 27],
+    358: [40.4, 27],
+    359: [40.6, 27],
+    360: [40.8, 27],
+    361: [40.9, 27],
+    362: [41.1, 27],
+    363: [41.2, 27],
+    364: [41.4, 27],
+    365: [41.6, 27],
+    366: [41.8, 27],
+    367: [42, 27],
+    368: [42.1, 27.1],
+    369: [42.3, 27.1],
+    370: [42.4, 27.1],
+    371: [42.6, 27.1],
+    372: [42.8, 27.1],
+    373: [43, 27.1],
+    374: [43.1, 27.1],
+    375: [43.2, 27.1],
+    376: [43.4, 27.1],
+    377: [43.6, 27.1],
+    378: [43.8, 27.1],
+    379: [43.9, 27.1],
+    380: [44.1, 27.1],
+    381: [44.3, 27.2],
+    382: [44.4, 27.2],
+    383: [44.6, 27.2],
+    384: [44.7, 27.2],
+    385: [44.9, 27.2],
+    386: [45.1, 27.2],
+    387: [45.3, 27.2],
+    388: [45.5, 27.2],
+    389: [45.6, 27.2],
+    390: [45.8, 27.2],
+    391: [46, 27.2],
+    392: [46.2, 27.2],
+    393: [46.4, 27.3],
+    394: [46.5, 27.3],
+    395: [46.7, 27.3],
+    396: [46.9, 27.3],
+    397: [47.1, 27.3],
+    398: [47.2, 27.3],
+    399: [47.4, 27.3],
+    400: [47.6, 27.3],
+    401: [47.7, 27.3],
+    402: [47.9, 27.3],
+    403: [48.1, 27.3],
+    404: [48.3, 27.3],
+    405: [48.5, 27.4],
+    406: [48.7, 27.4],
+    407: [48.8, 27.4],
+    408: [49, 27.4],
+    409: [49.2, 27.4],
+    410: [49.4, 27.4],
+    411: [49.6, 27.4],
+    412: [49.7, 27.4],
+    413: [49.9, 27.4],
+    414: [50.1, 27.4],
+    415: [50.2, 27.4],
+    416: [50.4, 27.4],
+    417: [50.6, 27.5],
+    418: [50.7, 27.5],
+    419: [50.9, 27.5],
+    420: [51.1, 27.5],
+    421: [51.2, 27.5],
+    422: [51.4, 27.5],
+    423: [51.6, 27.5],
+    424: [51.7, 27.5],
+    425: [51.9, 27.5],
+    426: [52.1, 27.5],
+    427: [51.2, 27.6],
+    428: [52.4, 27.6],
+    429: [52.5, 27.6],
+    430: [52.7, 27.6],
+    431: [52.9, 27.6],
+    432: [53.1, 27.6],
+    433: [53.2, 27.6],
+    434: [53.4, 27.6],
+    435: [53.6, 27.6],
+    436: [53.7, 27.6],
+    437: [53.9, 27.6],
+    438: [54.1, 27.7],
+    439: [54.2, 27.7],
+    440: [54.3, 27.7],
+    441: [54.5, 27.7],
+    442: [54.7, 27.7],
+    443: [54.8, 27.7],
+    444: [55, 27.7],
+    445: [55.2, 27.7],
+    446: [55.3, 27.7],
+    447: [55.5, 27.7],
+    448: [55.7, 27.7],
+    449: [55.8, 27.8],
+    450: [56, 27.8],
+    451: [56.2, 27.8],
+    452: [56.3, 27.8],
+    453: [56.5, 27.8],
+    454: [56.7, 27.8],
+    455: [56.8, 27.8],
+    456: [57, 27.8],
+    457: [57.2, 27.8],
+    458: [57.3, 27.9],
+    459: [57.4, 27.9],
+    460: [57.6, 27.9],
+    461: [57.8, 27.9],
+    462: [57.9, 27.9],
+    463: [58.1, 27.9],
+    464: [58.3, 27.9],
+    465: [58.4, 27.9],
+    466: [58.6, 27.9],
+    467: [58.8, 27.9],
+    468: [59, 28],
+    469: [59.1, 28],
+    470: [59.2, 28],
+    471: [59.4, 28],
+    472: [59.6, 28],
+    473: [59.7, 28],
+    474: [60, 28],
+    475: [60.1, 28],
+    476: [60.2, 28],
+    477: [60.4, 28],
+    478: [60.6, 28.1],
+    479: [60.7, 28.1],
+    480: [60.9, 28.1],
+    481: [60.1, 28.1],
+    482: [60.3, 28.1],
+    483: [61.4, 28.1],
+    484: [61.5, 28.1],
+    485: [61.7, 28.1],
+    486: [61.9, 28.1],
+    487: [62, 28.2],
+    488: [62.2, 28.2],
+    489: [62.3, 28.2],
+    490: [62.5, 28.2],
+    491: [62.7, 28.2],
+    492: [62.8, 28.2],
+    493: [63, 28.2],
+    494: [63.2, 28.2],
+    495: [63.3, 28.2],
+    496: [63.4, 28.2],
+    497: [63.6, 28.2],
+    498: [63.8, 28.3],
+    499: [63.9, 28.3],
+    500: [64.1, 28.3],
+  };
+  const input = Math.min(Math.max(Math.round(m), 140), 500);
+  const toReturn = table[input];
+  return [Math.round(toReturn[1]), Math.round(toReturn[0])];
+};
+
+export {
+  hs2rgb,
+  k2rgb,
+  m2hs,
+  rgb2hs,
+};
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 5af3f5c6..1803643c 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -1,8 +1,4 @@
-/* jshint node: true, esversion: 10, -W014, -W033 */
-/* eslint-disable new-cap */
-'use strict'
-
-module.exports = {
+export default {
   defaultConfig: {
     name: 'eWeLink',
     username: '',
@@ -25,7 +21,7 @@ module.exports = {
     fanDevices: [],
     sensorDevices: [],
     bridgeSensors: [],
-    platform: 'eWeLink'
+    platform: 'eWeLink',
   },
 
   defaultValues: {
@@ -50,7 +46,7 @@ module.exports = {
     sensorTimeLength: 60,
     showAs: 'default',
     showAsMotor: 'blind',
-    targetTempThreshold: 0
+    targetTempThreshold: 0,
   },
 
   minValues: {
@@ -65,7 +61,7 @@ module.exports = {
     operationTimeDown: 20,
     sensorTimeDifference: 5,
     sensorTimeLength: 1,
-    targetTempThreshold: 0
+    targetTempThreshold: 0,
   },
 
   appId: 'oeVkj2lYFGnJu5XUtWisfW4utiN4u9Mq',
@@ -81,7 +77,7 @@ module.exports = {
       'eu-apia.coolkit.cc',
       'us-apia.coolkit.cc',
       'as-apia.coolkit.cc',
-      'cn-apia.coolkit.cn'
+      'cn-apia.coolkit.cn',
     ],
     mode: ['auto', 'wan', 'lan'],
     singleDevices: [
@@ -103,7 +99,7 @@ module.exports = {
       'obstructId',
       'sensorType',
       'ipAddress',
-      'overrideLogging'
+      'overrideLogging',
     ],
     multiDevices: [
       'label',
@@ -123,7 +119,7 @@ module.exports = {
       'hideSensor',
       'obstructId',
       'ipAddress',
-      'overrideLogging'
+      'overrideLogging',
     ],
     lightDevices: [
       'label',
@@ -134,7 +130,7 @@ module.exports = {
       'adaptiveLightingShift',
       'offlineAsOff',
       'ipAddress',
-      'overrideLogging'
+      'overrideLogging',
     ],
     thDevices: [
       'label',
@@ -152,7 +148,7 @@ module.exports = {
       'minTarget',
       'maxTarget',
       'ipAddress',
-      'overrideLogging'
+      'overrideLogging',
     ],
     fanDevices: [
       'label',
@@ -161,7 +157,7 @@ module.exports = {
       'deviceModel',
       'hideLight',
       'ipAddress',
-      'overrideLogging'
+      'overrideLogging',
     ],
     sensorDevices: [
       'label',
@@ -177,7 +173,7 @@ module.exports = {
       'hideLongDouble',
       'scaleBattery',
       'sensorTimeDifference',
-      'overrideLogging'
+      'overrideLogging',
     ],
     rfDevices: [
       'label',
@@ -185,7 +181,7 @@ module.exports = {
       'ignoreDevice',
       'resetOnStartup',
       'ipAddress',
-      'overrideLogging'
+      'overrideLogging',
     ],
     models: {
       singleDevices: ['single', 't', 'pow', 'iw', 's', 'micro', 'slampher', 'gddc5', 'king', 'zb'],
@@ -201,12 +197,12 @@ module.exports = {
         'bulbB05BLA19',
         'king',
         'zl_d',
-        'zl_dc'
+        'zl_dc',
       ],
       thDevices: ['th', 'panel', 'sc', 'hc'],
       fanDevices: ['ifan'],
       sensorDevices: ['dw', 'snzb01', 'snzb02', 'snzb03', 'snzb04', 'leak'],
-      rfDevices: []
+      rfDevices: [],
     },
     overrideLogging: ['default', 'standard', 'debug', 'disable'],
     sensorType: [
@@ -218,7 +214,7 @@ module.exports = {
       'occupancy',
       'motion',
       'p_button',
-      'doorbell'
+      'doorbell',
     ],
     showAs: [
       'audio',
@@ -250,12 +246,12 @@ module.exports = {
       'valve',
       'valve_two',
       'valve_four',
-      'window'
+      'window',
     ],
     showAsMotor: ['blind', 'door', 'garage', 'window'],
     showAsEachen: ['garage', 'lock'],
     curtainType: ['buttons', 'blind', 'door', 'window'],
-    deviceType: ['button', 'curtain', 'sensor']
+    deviceType: ['button', 'curtain', 'sensor'],
   },
 
   devices: {
@@ -288,7 +284,7 @@ module.exports = {
       161,
       162,
       165,
-      182
+      182,
     ],
     switchSingle: [1, 6, 14, 24, 27, 1009, 1256, 7004],
     switchSCM: [77, 78, 81, 107, 112, 138, 160],
@@ -317,7 +313,7 @@ module.exports = {
       162,
       2256,
       3256,
-      4256
+      4256,
     ],
     switchMultiPower: [126, 165],
     switchMate: [177],
@@ -349,7 +345,7 @@ module.exports = {
     template: [],
     cannotSupport: [0, 65, 118, 119, 120, 121],
     garageSensors: [102, 3026],
-    skipUpdateRequest: [1000]
+    skipUpdateRequest: [1000],
   },
 
   paramsToKeep: [
@@ -412,7 +408,7 @@ module.exports = {
     'white',
     'workMode',
     'workState',
-    'zyx_mode'
+    'zyx_mode',
   ],
 
   // Ref: https://github.com/CoolKit-Technologies/eWeLink-API/blob/main/en/UIIDProtocol.md
@@ -495,7 +491,7 @@ module.exports = {
     5026: 1, // Zigbee Smoke Sensor
     7002: 1, // Zigbee Human Body Sensor_Support OTA
     7003: 1, // Zigbee Door Magnet_Support OTA
-    7004: 1 // Zigbee Single-Channel Switch ­_Support OTA
+    7004: 1, // Zigbee Single-Channel Switch ­_Support OTA
   },
 
   cannotSupportDevices: {
@@ -504,7 +500,7 @@ module.exports = {
     118: 0, // "2.4G-1C" (eWeLink 2.4G Remote)
     119: 0, // "2.4G-2C" (eWeLink 2.4G Remote)
     120: 0, // "2.4G-3C" (eWeLink 2.4G Remote)
-    121: 0 // "2.4G-6C" (eWeLink 2.4G Remote)
+    121: 0, // "2.4G-6C" (eWeLink 2.4G Remote)
   },
 
   yetToSupportDevices: {
@@ -547,6 +543,6 @@ module.exports = {
     109: 0, // "YK_INFRARED_2"
     1001: 0, // "BLADELESS_FAN"
     1002: 0, // "NEW_HUMIDIFIER"
-    1003: 0 // "WARM_AIR_BLOWER"
-  }
-}
+    1003: 0, // "WARM_AIR_BLOWER"
+  },
+};
diff --git a/lib/utils/custom-chars.js b/lib/utils/custom-chars.js
index 498ebc45..120859ea 100644
--- a/lib/utils/custom-chars.js
+++ b/lib/utils/custom-chars.js
@@ -1,36 +1,33 @@
-/* jshint node: true, esversion: 10, -W014, -W033 */
-/* eslint-disable new-cap */
-'use strict'
+import { inherits } from 'util';
 
-module.exports = class customCharacteristics {
-  constructor (api) {
-    this.hapServ = api.hap.Service
-    this.hapChar = api.hap.Characteristic
+export default class {
+  constructor(api) {
+    this.hapServ = api.hap.Service;
+    this.hapChar = api.hap.Characteristic;
     this.uuids = {
       invertSwitch: 'E965F001-079E-48FF-8F27-9C2605A29F52',
-      festiveScene: 'E965F002-079E-48FF-8F27-9C2605A29F52'
-    }
-    const self = this
-    this.InvertSwitch = function () {
-      self.hapChar.call(this, 'Invert Switch', self.uuids.invertSwitch)
+      festiveScene: 'E965F002-079E-48FF-8F27-9C2605A29F52',
+    };
+    const self = this;
+    this.InvertSwitch = function InvertSwitch() {
+      self.hapChar.call(this, 'Invert Switch', self.uuids.invertSwitch);
       this.setProps({
         format: self.hapChar.Formats.BOOL,
-        perms: [self.hapChar.Perms.READ, self.hapChar.Perms.WRITE, self.hapChar.Perms.NOTIFY]
-      })
-      this.value = this.getDefaultValue()
-    }
-    this.FestiveScene = function () {
-      self.hapChar.call(this, 'Festive Scene', self.uuids.festiveScene)
+        perms: [self.hapChar.Perms.READ, self.hapChar.Perms.WRITE, self.hapChar.Perms.NOTIFY],
+      });
+      this.value = this.getDefaultValue();
+    };
+    this.FestiveScene = function FestiveScene() {
+      self.hapChar.call(this, 'Festive Scene', self.uuids.festiveScene);
       this.setProps({
         format: self.hapChar.Formats.BOOL,
-        perms: [self.hapChar.Perms.READ, self.hapChar.Perms.WRITE, self.hapChar.Perms.NOTIFY]
-      })
-      this.value = this.getDefaultValue()
-    }
-    const inherits = require('util').inherits
-    inherits(this.InvertSwitch, this.hapChar)
-    inherits(this.FestiveScene, this.hapChar)
-    this.InvertSwitch.UUID = this.uuids.invertSwitch
-    this.FestiveScene.UUID = this.uuids.festiveScene
+        perms: [self.hapChar.Perms.READ, self.hapChar.Perms.WRITE, self.hapChar.Perms.NOTIFY],
+      });
+      this.value = this.getDefaultValue();
+    };
+    inherits(this.InvertSwitch, this.hapChar);
+    inherits(this.FestiveScene, this.hapChar);
+    this.InvertSwitch.UUID = this.uuids.invertSwitch;
+    this.FestiveScene.UUID = this.uuids.festiveScene;
   }
 }
diff --git a/lib/utils/eve-chars.js b/lib/utils/eve-chars.js
index 5ed8d31f..07195ad1 100644
--- a/lib/utils/eve-chars.js
+++ b/lib/utils/eve-chars.js
@@ -1,11 +1,9 @@
-/* jshint node: true, esversion: 10, -W014, -W033 */
-/* eslint-disable new-cap */
-'use strict'
+import { inherits } from 'util';
 
-module.exports = class eveCharacteristics {
-  constructor (api) {
-    this.hapServ = api.hap.Service
-    this.hapChar = api.hap.Characteristic
+export default class {
+  constructor(api) {
+    this.hapServ = api.hap.Service;
+    this.hapChar = api.hap.Characteristic;
     this.uuids = {
       currentConsumption: 'E863F10D-079E-48FF-8F27-9C2605A29F52',
       totalConsumption: 'E863F10C-079E-48FF-8F27-9C2605A29F52',
@@ -15,119 +13,118 @@ module.exports = class eveCharacteristics {
       lastActivation: 'E863F11A-079E-48FF-8F27-9C2605A29F52',
       openDuration: 'E863F118-079E-48FF-8F27-9C2605A29F52',
       closedDuration: 'E863F119-079E-48FF-8F27-9C2605A29F52',
-      timesOpened: 'E863F129-079E-48FF-8F27-9C2605A29F52'
-    }
-    const self = this
-    this.CurrentConsumption = function () {
-      self.hapChar.call(this, 'Current Consumption', self.uuids.currentConsumption)
+      timesOpened: 'E863F129-079E-48FF-8F27-9C2605A29F52',
+    };
+    const self = this;
+    this.CurrentConsumption = function CurrentConsumption() {
+      self.hapChar.call(this, 'Current Consumption', self.uuids.currentConsumption);
       this.setProps({
         format: self.hapChar.Formats.UINT16,
         unit: 'W',
         maxValue: 100000,
         minValue: 0,
         minStep: 1,
-        perms: [self.hapChar.Perms.READ, self.hapChar.Perms.NOTIFY]
-      })
-      this.value = this.getDefaultValue()
-    }
-    this.TotalConsumption = function () {
-      self.hapChar.call(this, 'Total Consumption', self.uuids.totalConsumption)
+        perms: [self.hapChar.Perms.READ, self.hapChar.Perms.NOTIFY],
+      });
+      this.value = this.getDefaultValue();
+    };
+    this.TotalConsumption = function TotalConsumption() {
+      self.hapChar.call(this, 'Total Consumption', self.uuids.totalConsumption);
       this.setProps({
         format: self.hapChar.Formats.FLOAT,
         unit: 'kWh',
         maxValue: 100000000000,
         minValue: 0,
         minStep: 0.01,
-        perms: [self.hapChar.Perms.READ, self.hapChar.Perms.NOTIFY]
-      })
-      this.value = this.getDefaultValue()
-    }
-    this.Voltage = function () {
-      self.hapChar.call(this, 'Voltage', self.uuids.voltage)
+        perms: [self.hapChar.Perms.READ, self.hapChar.Perms.NOTIFY],
+      });
+      this.value = this.getDefaultValue();
+    };
+    this.Voltage = function Voltage() {
+      self.hapChar.call(this, 'Voltage', self.uuids.voltage);
       this.setProps({
         format: self.hapChar.Formats.FLOAT,
         unit: 'V',
         maxValue: 100000000000,
         minValue: 0,
         minStep: 1,
-        perms: [self.hapChar.Perms.READ, self.hapChar.Perms.NOTIFY]
-      })
-      this.value = this.getDefaultValue()
-    }
-    this.ElectricCurrent = function () {
-      self.hapChar.call(this, 'Electric Current', self.uuids.electricCurrent)
+        perms: [self.hapChar.Perms.READ, self.hapChar.Perms.NOTIFY],
+      });
+      this.value = this.getDefaultValue();
+    };
+    this.ElectricCurrent = function ElectricCurrent() {
+      self.hapChar.call(this, 'Electric Current', self.uuids.electricCurrent);
       this.setProps({
         format: self.hapChar.Formats.FLOAT,
         unit: 'A',
         maxValue: 100000000000,
         minValue: 0,
         minStep: 0.1,
-        perms: [self.hapChar.Perms.READ, self.hapChar.Perms.NOTIFY]
-      })
-      this.value = this.getDefaultValue()
-    }
-    this.ResetTotal = function () {
-      self.hapChar.call(this, 'Reset Total', self.uuids.resetTotal)
+        perms: [self.hapChar.Perms.READ, self.hapChar.Perms.NOTIFY],
+      });
+      this.value = this.getDefaultValue();
+    };
+    this.ResetTotal = function ResetTotal() {
+      self.hapChar.call(this, 'Reset Total', self.uuids.resetTotal);
       this.setProps({
         format: self.hapChar.Formats.UINT32,
         unit: self.hapChar.Units.seconds,
-        perms: [self.hapChar.Perms.READ, self.hapChar.Perms.NOTIFY, self.hapChar.Perms.WRITE]
-      })
-      this.value = this.getDefaultValue()
-    }
-    this.LastActivation = function () {
-      self.hapChar.call(this, 'Last Activation', self.uuids.lastActivation)
+        perms: [self.hapChar.Perms.READ, self.hapChar.Perms.NOTIFY, self.hapChar.Perms.WRITE],
+      });
+      this.value = this.getDefaultValue();
+    };
+    this.LastActivation = function LastActivation() {
+      self.hapChar.call(this, 'Last Activation', self.uuids.lastActivation);
       this.setProps({
         format: self.hapChar.Formats.UINT32,
         unit: self.hapChar.Units.SECONDS,
-        perms: [self.hapChar.Perms.READ, self.hapChar.Perms.NOTIFY]
-      })
-      this.value = this.getDefaultValue()
-    }
-    this.OpenDuration = function () {
-      self.hapChar.call(this, 'Open Duration', self.uuids.openDuration)
+        perms: [self.hapChar.Perms.READ, self.hapChar.Perms.NOTIFY],
+      });
+      this.value = this.getDefaultValue();
+    };
+    this.OpenDuration = function OpenDuration() {
+      self.hapChar.call(this, 'Open Duration', self.uuids.openDuration);
       this.setProps({
         format: self.hapChar.Formats.UINT32,
         unit: self.hapChar.Units.SECONDS,
-        perms: [self.hapChar.Perms.READ, self.hapChar.Perms.NOTIFY, self.hapChar.Perms.WRITE]
-      })
-      this.value = this.getDefaultValue()
-    }
-    this.ClosedDuration = function () {
-      self.hapChar.call(this, 'Closed Duration', self.uuids.closedDuration)
+        perms: [self.hapChar.Perms.READ, self.hapChar.Perms.NOTIFY, self.hapChar.Perms.WRITE],
+      });
+      this.value = this.getDefaultValue();
+    };
+    this.ClosedDuration = function ClosedDuration() {
+      self.hapChar.call(this, 'Closed Duration', self.uuids.closedDuration);
       this.setProps({
         format: self.hapChar.Formats.UINT32,
         unit: self.hapChar.Units.SECONDS,
-        perms: [self.hapChar.Perms.READ, self.hapChar.Perms.NOTIFY, self.hapChar.Perms.WRITE]
-      })
-      this.value = this.getDefaultValue()
-    }
-    this.TimesOpened = function () {
-      self.hapChar.call(this, 'Times Opened', self.uuids.timesOpened)
+        perms: [self.hapChar.Perms.READ, self.hapChar.Perms.NOTIFY, self.hapChar.Perms.WRITE],
+      });
+      this.value = this.getDefaultValue();
+    };
+    this.TimesOpened = function TimesOpened() {
+      self.hapChar.call(this, 'Times Opened', self.uuids.timesOpened);
       this.setProps({
         format: self.hapChar.Formats.UINT32,
-        perms: [self.hapChar.Perms.READ, self.hapChar.Perms.NOTIFY]
-      })
-      this.value = this.getDefaultValue()
-    }
-    const inherits = require('util').inherits
-    inherits(this.CurrentConsumption, this.hapChar)
-    inherits(this.TotalConsumption, this.hapChar)
-    inherits(this.Voltage, this.hapChar)
-    inherits(this.ElectricCurrent, this.hapChar)
-    inherits(this.LastActivation, this.hapChar)
-    inherits(this.ResetTotal, this.hapChar)
-    inherits(this.OpenDuration, this.hapChar)
-    inherits(this.ClosedDuration, this.hapChar)
-    inherits(this.TimesOpened, this.hapChar)
-    this.CurrentConsumption.UUID = this.uuids.currentConsumption
-    this.TotalConsumption.UUID = this.uuids.totalConsumption
-    this.Voltage.UUID = this.uuids.voltage
-    this.ElectricCurrent.UUID = this.uuids.electricCurrent
-    this.LastActivation.UUID = this.uuids.lastActivation
-    this.ResetTotal.UUID = this.uuids.resetTotal
-    this.OpenDuration.UUID = this.uuids.openDuration
-    this.ClosedDuration.UUID = this.uuids.closedDuration
-    this.TimesOpened.UUID = this.uuids.timesOpened
+        perms: [self.hapChar.Perms.READ, self.hapChar.Perms.NOTIFY],
+      });
+      this.value = this.getDefaultValue();
+    };
+    inherits(this.CurrentConsumption, this.hapChar);
+    inherits(this.TotalConsumption, this.hapChar);
+    inherits(this.Voltage, this.hapChar);
+    inherits(this.ElectricCurrent, this.hapChar);
+    inherits(this.LastActivation, this.hapChar);
+    inherits(this.ResetTotal, this.hapChar);
+    inherits(this.OpenDuration, this.hapChar);
+    inherits(this.ClosedDuration, this.hapChar);
+    inherits(this.TimesOpened, this.hapChar);
+    this.CurrentConsumption.UUID = this.uuids.currentConsumption;
+    this.TotalConsumption.UUID = this.uuids.totalConsumption;
+    this.Voltage.UUID = this.uuids.voltage;
+    this.ElectricCurrent.UUID = this.uuids.electricCurrent;
+    this.LastActivation.UUID = this.uuids.lastActivation;
+    this.ResetTotal.UUID = this.uuids.resetTotal;
+    this.OpenDuration.UUID = this.uuids.openDuration;
+    this.ClosedDuration.UUID = this.uuids.closedDuration;
+    this.TimesOpened.UUID = this.uuids.timesOpened;
   }
 }
diff --git a/lib/utils/functions.js b/lib/utils/functions.js
index d4d67c08..b48768de 100644
--- a/lib/utils/functions.js
+++ b/lib/utils/functions.js
@@ -1,40 +1,38 @@
-/* jshint node: true, esversion: 10, -W014, -W033 */
-/* eslint-disable new-cap */
-'use strict'
-
-module.exports = {
-  hasProperty: (obj, prop) => {
-    return Object.prototype.hasOwnProperty.call(obj, prop)
-  },
-
-  sleep: ms => {
-    return new Promise(resolve => setTimeout(resolve, ms))
-  },
+const generateRandomString = (length) => {
+  const chars = 'abcdefghijklmnopqrstuvwxyz0123456789';
+  let nonce = '';
+  while (nonce.length < length) {
+    nonce += chars.charAt(Math.floor(Math.random() * chars.length));
+  }
+  return nonce;
+};
 
-  parseDeviceId: deviceId => {
-    return deviceId
-      .toLowerCase()
-      .replace(/[^a-z0-9]+/g, '')
-      .replace('sw', 'SW')
-  },
+const hasProperty = (obj, prop) => Object.prototype.hasOwnProperty.call(obj, prop);
 
-  parseError: (err, hideStack = []) => {
-    let toReturn = err.message
-    if (err.stack && err.stack.length > 0 && !hideStack.includes(err.message)) {
-      const stack = err.stack.split('\n')
-      if (stack[1]) {
-        toReturn += stack[1].replace('   ', '')
-      }
-    }
-    return toReturn
-  },
+const parseDeviceId = (deviceId) => deviceId
+  .toLowerCase()
+  .replace(/[^a-z0-9]+/g, '')
+  .replace('sw', 'SW');
 
-  generateRandomString: length => {
-    const chars = 'abcdefghijklmnopqrstuvwxyz0123456789'
-    let nonce = ''
-    while (nonce.length < length) {
-      nonce += chars.charAt(Math.floor(Math.random() * chars.length))
+const parseError = (err, hideStack = []) => {
+  let toReturn = err.message;
+  if (err?.stack.length > 0 && !hideStack.includes(err.message)) {
+    const stack = err.stack.split('\n');
+    if (stack[1]) {
+      toReturn += stack[1].replace('   ', '');
     }
-    return nonce
   }
-}
+  return toReturn;
+};
+
+const sleep = (ms) => new Promise((resolve) => {
+  setTimeout(resolve, ms);
+});
+
+export {
+  generateRandomString,
+  hasProperty,
+  parseDeviceId,
+  parseError,
+  sleep,
+};
diff --git a/lib/utils/lang-en.js b/lib/utils/lang-en.js
index b7680d52..975f1440 100644
--- a/lib/utils/lang-en.js
+++ b/lib/utils/lang-en.js
@@ -1,8 +1,4 @@
-/* jshint node: true, esversion: 10, -W014, -W033 */
-/* eslint-disable new-cap */
-'use strict'
-
-module.exports = {
+export default {
   apiListenErr: 'Internal API server error',
   apiListening: 'Internal API listening on port',
   apiShutdown: 'Internal API gracefully shutdown',
@@ -70,7 +66,6 @@ module.exports = {
   doorOpen: 'open',
   dualr3NoCalib: 'must be calibrated to work in motor mode',
   dualr3NoMeter: 'is not supported in meter mode',
-  errGetDevice: 'An error occurred during http getDevice()',
   errGetDevices: 'An error occurred during http getDevices()',
   errGetHomes: 'An error occurred during http getHomes()',
   errGetHost: 'An error occurred during ws getHost()',
@@ -160,15 +155,15 @@ module.exports = {
   wsUnkCmd: 'WS unknown command received',
   wsUnkRes: 'unknown WS response',
   zWelcome: [
-    "Don't forget to ☆ this plugin on GitHub if you're finding it useful!",
-    'Have a feature request? Visit http://bit.ly/hb-ewelink-issues to ask!',
+    'Don\'t forget to ☆ this plugin on GitHub if you\'re finding it useful!',
+    'Have a feature request? Visit https://bit.ly/hb-ewelink-issues to ask!',
     'Interested in sponsoring this plugin? https://github.com/sponsors/bwp91',
-    "Join the plugin's Discord community! https://discord.gg/cMGhNtZ3tW",
+    'Join the plugin\'s Discord community! https://discord.gg/cMGhNtZ3tW',
     'Thanks for using this plugin, I hope you find it helpful!',
     'This plugin has been made with ♥ by bwp91 from the UK!',
     'Check out my other Homebridge plugins! https://github.com/bwp91',
-    'Have time to give this plugin a review? http://bit.ly/hb-ewelink-review',
-    'This plugin currently has a 5☆ rating on HOOBS! http://bit.ly/hb-ewelink-review',
-    'Want to see this plugin in your own language? Let me know!'
-  ]
-}
+    'Have time to give this plugin a review? https://bit.ly/hb-ewelink-review',
+    'This plugin currently has a 5☆ rating on HOOBS! https://bit.ly/hb-ewelink-review',
+    'Want to see this plugin in your own language? Let me know!',
+  ],
+};
diff --git a/lib/utils/lang-fr.js b/lib/utils/lang-fr.js
index 6e84c784..7cee64fc 100644
--- a/lib/utils/lang-fr.js
+++ b/lib/utils/lang-fr.js
@@ -1,25 +1,21 @@
-/* jshint node: true, esversion: 10, -W014, -W033 */
-/* eslint-disable new-cap */
-'use strict'
-
-module.exports = {
-  apiListenErr: "Erreur de serveur d'API interne",
-  apiListening: "API interne à l'écoute sur le port",
-  apiShutdown: "L'API interne s'arrête normalement",
+export default {
+  apiListenErr: 'Erreur de serveur d\'API interne',
+  apiListening: 'API interne à l\'écoute sur le port',
+  apiShutdown: 'L\'API interne s\'arrête normalement',
   buttonDouble: 'appui double',
   buttonLong: 'appui long',
   buttonNotFound: 'rf button non trouvé (veuillez redémarrer Homebridge)',
   buttonSingle: 'appui simple',
   buttonTrig: 'boutton déclenché',
-  cantReadPacket: "Le message LAN reçu n'a pas pu être lu comme",
-  cantParsePacket: "Impossible d'analyser le paquet DNS en tant que",
-  cfgDef: "n'est pas un nombre valide, utilisation de la valeur par defaut",
-  cfgDup: "sera ignoré tant qu'une autre entrée avec cet ID existe",
+  cantReadPacket: 'Le message LAN reçu n\'a pas pu être lu comme',
+  cantParsePacket: 'Impossible d\'analyser le paquet DNS en tant que',
+  cfgDef: 'n\'est pas un nombre valide, utilisation de la valeur par defaut',
+  cfgDup: 'sera ignoré tant qu\'une autre entrée avec cet ID existe',
   cfgIgn: 'ignoré car non configuré correctement',
   cfgIgnItem: 'a une entrée invalide et sera ignoré',
-  cfgItem: "Configurer l'entrée",
+  cfgItem: 'Configurer l\'entrée',
   cfgLow: 'à une valeur trop basse et sera augmenté à',
-  cfgRmv: "n'est pas utilisé et peut-être enlevé",
+  cfgRmv: 'n\'est pas utilisé et peut-être enlevé',
   cfgQts: 'ne devrait pas avoir de guillemets autour de son entrée',
   complete: '✓ Configuration complète',
   contactNo: 'contact non detecté',
@@ -49,9 +45,9 @@ module.exports = {
   devInitGroup: 'initialised with group id',
   devInitOpts: 'initialisation avec options',
   devNewNotAdd:
-    "redémarrer Homebridge pour ajouter un nouvel appareil, echec de l'ajout automatique en tant que",
-  devNoAPIKey: "ne peux pas récupérer la clé API de l'appareil",
-  devNoControl: "ne peux pas être controlé via le mode:lan n'est pas compatible avec ce device",
+    'redémarrer Homebridge pour ajouter un nouvel appareil, echec de l\'ajout automatique en tant que',
+  devNoAPIKey: 'ne peux pas récupérer la clé API de l\'appareil',
+  devNoControl: 'ne peux pas être controlé via le mode:lan n\'est pas compatible avec ce device',
   devNotAdd: 'ne peux pas être ajouté à Homebridge en tant que',
   devNotConf: 'ne peux pas être configuré en tant que ',
   devNotConfLAN: 'appareil/commande non disponible via le mode LAN',
@@ -60,9 +56,9 @@ module.exports = {
   devNotReachLAN: 'appareil non joignable via le mode LAN',
   devNotRf: 'ne peux pas être raffraichi en tant que',
   devNotRemove: 'ne peux pas être supprimé de Homebridge en tant que',
-  devNotSup: "n'a pas pus être ajouté car ne peux pas être pas supporté",
+  devNotSup: 'n\'a pas pus être ajouté car ne peux pas être pas supporté',
   devNotSupYet: 'non supporté, crée un ticket incident sur Github avec les infos suivantes',
-  devNotUpd: "echec de la mise à jour de l'appareil en tant que",
+  devNotUpd: 'echec de la mise à jour de l\'appareil en tant que',
   devRemove: 'a été supprimé de Homebridge',
   disabled: 'Pour changer celà, régler disablePlugin à false',
   disabledAL: 'luminosité adaptative désactivée suite à un changement de couleur',
@@ -70,30 +66,29 @@ module.exports = {
   doorClosed: 'fermée',
   doorOpen: 'ouverte',
   dualr3NoCalib: 'Doit être calibré pour fonctionner en mode moteur',
-  dualr3NoMeter: "n'est pas supporté en mode mètre",
-  errGetDevice: 'Une erreur est survenue durant http getDevice()',
-  errGetDevices: 'Une erreur est survenue durant https getDevice()',
+  dualr3NoMeter: 'n\'est pas supporté en mode mètre',
+  errGetDevices: 'Une erreur est survenue durant https getDevices()',
   errGetHost: 'Une erreur est survenue durant ws getHost()',
   errLogin: 'Une erreur est survenue durant http login()',
   eweError: 'Une erreur eWeLink [500] est survenue, nouvel essaie dans 30 secondes',
   fetchHome: 'Fetching devices from eWeLink home/id',
   foundWithIP: 'trouvé locallement avec IP',
-  foundWithManIP: "utilisation de l'IP manuelle",
+  foundWithManIP: 'utilisation de l\'IP manuelle',
   hbVersionFail: 'Votre version de Homebridge est trop ancienne - Mettez à jour vers v1.3',
   heaterSimNoSensor: 'you must configure a device ID that provides a temperature reading',
   httpDisabled: 'HTTP/WS clients désactivé en tant que',
   httpLogin10003:
-    "Consulter http://bit.ly/hb-ewelink-errors pour plus d'informations sur cette erreur de connexion",
-  httpRetry: "eWelink n'est pas joignable, réessai dans 30 secondes",
+    'Consulter http://bit.ly/hb-ewelink-errors pour plus d\'informations sur cette erreur de connexion',
+  httpRetry: 'eWelink n\'est pas joignable, réessai dans 30 secondes',
   identify: 'identifier le bouton préssé',
   initialised: 'Plugin intitialisé. Configuration des accessoires...',
   initialising: 'Initialisation du plugin',
   invalidConfig: 'Configuration invalide',
   lanDisabled: 'LAN mode est désactivé',
   lanErr: 'Error LAN inconnue',
-  lanIPDifferent: "IP manuelle ignorée depuis la découverte d'une IP différente",
+  lanIPDifferent: 'IP manuelle ignorée depuis la découverte d\'une IP différente',
   lanMonitor: 'Surveillance LAN démarré',
-  lanNotSup: "le mode LAN n'est pas supporté pour envoyer des mise à jour vers cet appareil",
+  lanNotSup: 'le mode LAN n\'est pas supporté pour envoyer des mise à jour vers cet appareil',
   lanStarted: 'Découverte LAN complète',
   lanStarting: 'Début de la découverte LAN',
   lanUnsupported: 'le mode LAN est indisponible car il est indisponible ou non découvert',
@@ -104,22 +99,22 @@ module.exports = {
   missingCreds: 'paramètres de connexion eWeLink non configurés',
   motionNo: 'mouvement non detecté',
   motionYes: 'mouvement detecté',
-  newIP: "changement de l'adresse IP pour",
+  newIP: 'changement de l\'adresse IP pour',
   newRegionRec: 'Nouvel API hôte HTTTP reçcus',
-  noAuthRec: "pas de token d'authentification reçus",
+  noAuthRec: 'pas de token d\'authentification reçus',
   noGarageForOD: 'pas daccessoire de porte de garage trouvé',
   noRegionRec: 'pas de région valide reçus',
   noWSHost: 'le serveur ne répond pas avec un hote web socket',
-  pluginNotConf: "le plugin n'a pas été configuré",
+  pluginNotConf: 'le plugin n\'a pas été configuré',
   repOffline: 'a été rapporté [offline]',
   repOnline: 'a été rapporté [online]',
   revertWS: 'retour au web socket en tant que',
-  rfNotFound: "essayez de redémarrer Homebridge car aucun accéssoires n'a été trouvé pour",
+  rfNotFound: 'essayez de redémarrer Homebridge car aucun accéssoires n\'a été trouvé pour',
   rfTrigNo: 'non déclenché',
   rfTrigYes: 'déclenché',
-  sendLogin: "Envoie d'une requete HTTP login()",
+  sendLogin: 'Envoie d\'une requete HTTP login()',
   sensorErr:
-    "non supporté comme des/humidifier tant que l'équipement n'à pas de capteur pris en charge",
+    'non supporté comme des/humidifier tant que l\'équipement n\'à pas de capteur pris en charge',
   sensorNo: 'désactivé',
   sensorYes: 'activé',
   sensorNoDevice: 'garage/lock accessory not found, this device will be setup as a normal sensor',
@@ -127,49 +122,49 @@ module.exports = {
     'utiliser un équipement partagé avec le cloud peut provoquer des erreurs, utilisez votre compte eWelink principal',
   smokeNo: 'smoke not detected',
   smokeYes: 'smoke detected',
-  sonoffCamera: "voir le wiki homebridge-ewelink pour plus de détails sur l'activation de caméra",
+  sonoffCamera: 'voir le wiki homebridge-ewelink pour plus de détails sur l\'activation de caméra',
   stoppedLAN: 'surveillance LAN gracieusement arreté',
   stoppedWS: 'socket web fracieusement fermé',
   storageClearErr: 'Ne peut pas vider le stockage du dossier en tant que',
   storageReadErr: 'Ne peut pas lire le dossier persitat en tant que',
   storageSetupErr: 'Ne peut pas paramétrer le stockage client en tant que',
-  storageWriteErr: "ne peux pas sauvegarder l'équipement dans un fichier en tant que",
-  unreachable: "n'est pas joignable",
-  updRec: "reception d'une mise à jour",
-  updReq: "récupération de l'état actuel",
+  storageWriteErr: 'ne peux pas sauvegarder l\'équipement dans un fichier en tant que',
+  unreachable: 'n\'est pas joignable',
+  updRec: 'reception d\'une mise à jour',
+  updReq: 'récupération de l\'état actuel',
   updSend: 'envoie de la mise à jour',
   valveNo: 'arreté',
   valveYes: 'en fonctionnement',
   viaAL: 'via éclairafe adaptatif',
   viaLAN: 'via LAN',
   viaWS: 'via WS',
-  wsHostRec: "reception d'un hôte Web socket",
-  wsLogin: "Envoie d'une requête de connection WS",
+  wsHostRec: 'reception d\'un hôte Web socket',
+  wsLogin: 'Envoie d\'une requête de connection WS',
   wsLoginErr: 'Paramètres WS reçus inconnus',
   wsLoginError: 'Echec de la connection WS en tant que',
-  wsLoginErrRecon: "WS n'a pas pus être ouvert and réessaiera dans 5 secondes",
+  wsLoginErrRecon: 'WS n\'a pas pus être ouvert and réessaiera dans 5 secondes',
   wsLoginSuccess: 'Succès de la connection WS',
   wsLogin406: 'Echec de la connection WS [406] voir http://bit.ly/hb-ewelink-errors',
   wsPingError: 'Ne peux pas envoyer un ping WS en tant que',
   wsRec: 'Message WS reçus',
   wsReconnectClose: 'Évènement de fermeture WS et réessaiera de se connecter dans 5 secondes',
-  wsReconnectError: "Évènement d'erreur WS et réessaiera de se connecter dans 5 secondes",
+  wsReconnectError: 'Évènement d\'erreur WS et réessaiera de se connecter dans 5 secondes',
   wsRef: 'Actualisation de la connection WS',
-  wsRefFail: "Echec de l'actualisation de la connection en tant que",
+  wsRefFail: 'Echec de l\'actualisation de la connection en tant que',
   wsRequired: 'la mise à jour doit être envoyée de cette façon',
-  wsReqTimeout: "demande de délai d'attente",
-  wsResend: "Web socket n'est pas ouvert - réessayer dans quelques secondes",
+  wsReqTimeout: 'demande de délai d\'attente',
+  wsResend: 'Web socket n\'est pas ouvert - réessayer dans quelques secondes',
   wsUnkAct: 'message WS reçus comme action inconnue',
   wsUnkCmd: 'commande WS inconnue reçue',
   wsUnkRes: 'réponse WS inconnue reçue',
   zWelcome: [
-    "N'oubliez pas de ☆ ce plugin sur GitHub si vous le trouvez utile!",
-    'Vous avez une demande de fonctionnalité? Visitez http://bit.ly/hb-ewelink-issues pour demander!',
+    'N\'oubliez pas de ☆ ce plugin sur GitHub si vous le trouvez utile!',
+    'Vous avez une demande de fonctionnalité? Visitez https://bit.ly/hb-ewelink-issues pour demander!',
     'Intéressé pour sponsoriser ce plugin? https://github.com/sponsors/bwp91',
     'Rejoignez la communauté Discord de ce plugin! https://discord.gg/cMGhNtZ3tW',
-    "Merci d'utiliser ce plugin. J'espère que vous le trouvez utile!",
+    'Merci d\'utiliser ce plugin. J\'espère que vous le trouvez utile!',
     'Ce plugin a été fait avec ♥ par bwp91 au Royaume-Unis!',
-    'Un peu de temps pour laisser un avis sur ce plugin? http://bit.ly/hb-ewelink-review',
-    'Vous voulez voir ce plugin dans votre langage ? Dite le moi!'
-  ]
-}
+    'Un peu de temps pour laisser un avis sur ce plugin? https://bit.ly/hb-ewelink-review',
+    'Vous voulez voir ce plugin dans votre langage ? Dite le moi!',
+  ],
+};
diff --git a/lib/utils/lang-th.js b/lib/utils/lang-th.js
index fa53f065..35758245 100644
--- a/lib/utils/lang-th.js
+++ b/lib/utils/lang-th.js
@@ -1,8 +1,4 @@
-/* jshint node: true, esversion: 10, -W014, -W033 */
-/* eslint-disable new-cap */
-'use strict'
-
-module.exports = {
+export default {
   apiListenErr: 'ข้อผิดพลาดเซิร์ฟเวอร์ API ภายใน',
   apiListening: 'การฟัง API ภายในบนพอร์ต',
   apiShutdown: 'API ภายในปิดได้อย่างสมบูรณ์',
@@ -70,7 +66,6 @@ module.exports = {
   doorOpen: 'เปิด',
   dualr3NoCalib: 'ต้องสอบเทียบให้ทำงานในโหมดมอเตอร์',
   dualr3NoMeter: 'ไม่รองรับโหมดมิเตอร์',
-  errGetDevice: 'เกิดข้อผิดพลาดระหว่าง http getDevice()',
   errGetDevices: 'เกิดข้อผิดพลาดระหว่าง http getDevices()',
   errGetHomes: 'เกิดข้อผิดพลาดระหว่าง http getHomes()',
   errGetHost: 'เกิดข้อผิดพลาดระหว่าง ws getHost()',
@@ -161,14 +156,14 @@ module.exports = {
   wsUnkRes: 'การตอบสนอง WS ที่ไม่รู้จัก',
   zWelcome: [
     'อย่าลืม ☆ ปลั๊กอินนี้บน GitHub หากคุณพบว่ามีประโยชน์!',
-    'มีคำขอคุณสมบัติ? เข้าไปที่ http://bit.ly/hb-ewelink-issues เพื่อสอบถาม!',
+    'มีคำขอคุณสมบัติ? เข้าไปที่ https://bit.ly/hb-ewelink-issues เพื่อสอบถาม!',
     'สนใจสนับสนุนปลั๊กอินนี้หรือไม่? https://github.com/sponsors/bwp91',
     'เข้าร่วมชุมชน Discord ของปลั๊กอิน! https://discord.gg/cMGhNtZ3tW',
     'ขอบคุณที่ใช้ปลั๊กอินนี้ ฉันหวังว่าคุณจะพบว่ามีประโยชน์!',
     'ปลั๊กอินนี้สร้างด้วย ♥ โดย bwp91 จากสหราชอาณาจักร!',
     'ลองดูปลั๊กอิน Homebridge อื่นๆ ของฉันสิ! https://github.com/bwp91',
-    'มีเวลาให้รีวิวปลั๊กอินนี้หรือไม่? http://bit.ly/hb-ewelink-review',
-    'ปลั๊กอินนี้มีคะแนน 5☆ บน HOOBS! http://bit.ly/hb-ewelink-review',
-    'ต้องการดูปลั๊กอินนี้ในภาษาของคุณเองหรือ? แจ้งให้เราทราบ!'
-  ]
-}
+    'มีเวลาให้รีวิวปลั๊กอินนี้หรือไม่? https://bit.ly/hb-ewelink-review',
+    'ปลั๊กอินนี้มีคะแนน 5☆ บน HOOBS! https://bit.ly/hb-ewelink-review',
+    'ต้องการดูปลั๊กอินนี้ในภาษาของคุณเองหรือ? แจ้งให้เราทราบ!',
+  ],
+};
diff --git a/lib/utils/lang.js b/lib/utils/lang.js
new file mode 100644
index 00000000..b5bf6f67
--- /dev/null
+++ b/lib/utils/lang.js
@@ -0,0 +1,5 @@
+import en from './lang-en.js';
+import fr from './lang-fr.js';
+import th from './lang-th.js';
+
+export default { en, fr, th };
diff --git a/package-lock.json b/package-lock.json
index c04d483e..6a548724 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -30,25 +30,258 @@
         "@homebridge/plugin-ui-utils": "^0.0.19",
         "axios": "^0.27.2",
         "node-persist": "^3.1.0",
-        "p-queue": "^6.6.2",
+        "p-queue": "^7.2.0",
         "websocket-as-promised": "^2.0.1",
         "ws": "^8.7.0"
       },
+      "devDependencies": {
+        "eslint": "^8.16.0",
+        "eslint-config-airbnb": "^19.0.4",
+        "eslint-plugin-import": "^2.26.0",
+        "eslint-plugin-sort-exports": "^0.6.0"
+      },
       "engines": {
         "homebridge": "^1.4.0",
         "node": "^14.19.3 || ^16.15.0"
       }
     },
+    "node_modules/@babel/runtime": {
+      "version": "7.18.3",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.18.3.tgz",
+      "integrity": "sha512-38Y8f7YUhce/K7RMwTp7m0uCumpv9hZkitCbBClqQIow1qSbCvGkcegKOXpEWCQLfWmevgRiWokZ1GkpfhbZug==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "regenerator-runtime": "^0.13.4"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/runtime-corejs3": {
+      "version": "7.18.3",
+      "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.18.3.tgz",
+      "integrity": "sha512-l4ddFwrc9rnR+EJsHsh+TJ4A35YqQz/UqcjtlX2ov53hlJYG5CxtQmNZxyajwDVmCxwy++rtvGU5HazCK4W41Q==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "core-js-pure": "^3.20.2",
+        "regenerator-runtime": "^0.13.4"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@eslint/eslintrc": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.0.tgz",
+      "integrity": "sha512-UWW0TMTmk2d7hLcWD1/e2g5HDM/HQ3csaLSqXCfqwh4uNDuNqlaKWXmEsL4Cs41Z0KnILNvwbHAah3C2yt06kw==",
+      "dev": true,
+      "dependencies": {
+        "ajv": "^6.12.4",
+        "debug": "^4.3.2",
+        "espree": "^9.3.2",
+        "globals": "^13.15.0",
+        "ignore": "^5.2.0",
+        "import-fresh": "^3.2.1",
+        "js-yaml": "^4.1.0",
+        "minimatch": "^3.1.2",
+        "strip-json-comments": "^3.1.1"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      }
+    },
     "node_modules/@homebridge/plugin-ui-utils": {
       "version": "0.0.19",
       "resolved": "https://registry.npmjs.org/@homebridge/plugin-ui-utils/-/plugin-ui-utils-0.0.19.tgz",
       "integrity": "sha512-axFX7lN2Yd7bz/6SlD7dzq5sY/N9+XYuLHPukuiyHQRDtNMRL1uDqJhOx6RVaN2tYDHB75h7YxRQWP7U44Mgzg=="
     },
+    "node_modules/@humanwhocodes/config-array": {
+      "version": "0.9.5",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.9.5.tgz",
+      "integrity": "sha512-ObyMyWxZiCu/yTisA7uzx81s40xR2fD5Cg/2Kq7G02ajkNubJf6BopgDTmDyc3U7sXpNKM8cYOw7s7Tyr+DnCw==",
+      "dev": true,
+      "dependencies": {
+        "@humanwhocodes/object-schema": "^1.2.1",
+        "debug": "^4.1.1",
+        "minimatch": "^3.0.4"
+      },
+      "engines": {
+        "node": ">=10.10.0"
+      }
+    },
+    "node_modules/@humanwhocodes/object-schema": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
+      "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
+      "dev": true
+    },
+    "node_modules/@types/json5": {
+      "version": "0.0.29",
+      "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
+      "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==",
+      "dev": true
+    },
+    "node_modules/acorn": {
+      "version": "8.7.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.1.tgz",
+      "integrity": "sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==",
+      "dev": true,
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/acorn-jsx": {
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
+      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
+      "dev": true,
+      "peerDependencies": {
+        "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
+      }
+    },
+    "node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/argparse": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+      "dev": true
+    },
+    "node_modules/aria-query": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-4.2.2.tgz",
+      "integrity": "sha512-o/HelwhuKpTj/frsOsbNLNgnNGVIFsVP/SW2BSF14gVl7kAfMOJ6/8wUAUvG1R1NHKrfG+2sHZTu0yauT1qBrA==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "@babel/runtime": "^7.10.2",
+        "@babel/runtime-corejs3": "^7.10.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      }
+    },
+    "node_modules/array-includes": {
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.5.tgz",
+      "integrity": "sha512-iSDYZMMyTPkiFasVqfuAQnWAYcvO/SeBSCGKePoEthjp4LEMTe4uLc7b025o4jAZpHhihh8xPo99TNWUWWkGDQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.19.5",
+        "get-intrinsic": "^1.1.1",
+        "is-string": "^1.0.7"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array.prototype.flat": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.0.tgz",
+      "integrity": "sha512-12IUEkHsAhA4DY5s0FPgNXIdc8VRSqD9Zp78a5au9abH/SOBrsp082JOWFNTjkMozh8mqcdiKuaLGhPeYztxSw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.19.2",
+        "es-shim-unscopables": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array.prototype.flatmap": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.0.tgz",
+      "integrity": "sha512-PZC9/8TKAIxcWKdyeb77EzULHPrIX/tIZebLJUQOMR1OwYosT8yggdfWScfTBCDj5utONvOuPQQumYsU2ULbkg==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.19.2",
+        "es-shim-unscopables": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/ast-types-flow": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.7.tgz",
+      "integrity": "sha512-eBvWn1lvIApYMhzQMsu9ciLfkBY499mFZlNqG+/9WR7PVlroQw0vG30cOQQbaKz3sCEc44TAOu2ykzqXSNnwag==",
+      "dev": true,
+      "peer": true
+    },
     "node_modules/asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
       "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
     },
+    "node_modules/axe-core": {
+      "version": "4.4.2",
+      "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.4.2.tgz",
+      "integrity": "sha512-LVAaGp/wkkgYJcjmHsoKx4juT1aQvJyPcW09MLCjVTh3V2cc6PnyempiLMNH5iMdfIX/zdbjUx2KDjMLCTdPeA==",
+      "dev": true,
+      "peer": true,
+      "engines": {
+        "node": ">=12"
+      }
+    },
     "node_modules/axios": {
       "version": "0.27.2",
       "resolved": "https://registry.npmjs.org/axios/-/axios-0.27.2.tgz",
@@ -58,6 +291,29 @@
         "form-data": "^4.0.0"
       }
     },
+    "node_modules/axobject-query": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.2.0.tgz",
+      "integrity": "sha512-Td525n+iPOOyUQIeBfcASuG6uJsDOITl7Mds5gFyerkWiX7qhUTdYUBlSgNMyVqtSJqwpt1kXGLdUt6SykLMRA==",
+      "dev": true,
+      "peer": true
+    },
+    "node_modules/balanced-match": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+      "dev": true
+    },
+    "node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
     "node_modules/call-bind": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
@@ -70,11 +326,54 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/callsites": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
     "node_modules/chnl": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/chnl/-/chnl-1.2.0.tgz",
       "integrity": "sha512-g5gJb59edwCliFbX2j7G6sBfY4sX9YLy211yctONI2GRaiX0f2zIbKWmBm+sPqFNEpM7Ljzm7IJX/xrjiEbPrw=="
     },
+    "node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
     "node_modules/combined-stream": {
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
@@ -86,6 +385,74 @@
         "node": ">= 0.8"
       }
     },
+    "node_modules/concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
+      "dev": true
+    },
+    "node_modules/confusing-browser-globals": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/confusing-browser-globals/-/confusing-browser-globals-1.0.11.tgz",
+      "integrity": "sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA==",
+      "dev": true
+    },
+    "node_modules/core-js-pure": {
+      "version": "3.22.7",
+      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.22.7.tgz",
+      "integrity": "sha512-wTriFxiZI+C8msGeh7fJcbC/a0V8fdInN1oS2eK79DMBGs8iIJiXhtFJCiT3rBa8w6zroHWW3p8ArlujZ/Mz+w==",
+      "dev": true,
+      "hasInstallScript": true,
+      "peer": true,
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/core-js"
+      }
+    },
+    "node_modules/cross-spawn": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "dev": true,
+      "dependencies": {
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/damerau-levenshtein": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz",
+      "integrity": "sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA==",
+      "dev": true,
+      "peer": true
+    },
+    "node_modules/debug": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/deep-is": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
+      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
+      "dev": true
+    },
     "node_modules/define-properties": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
@@ -109,6 +476,25 @@
         "node": ">=0.4.0"
       }
     },
+    "node_modules/doctrine": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
+      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
+      "dev": true,
+      "dependencies": {
+        "esutils": "^2.0.2"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/emoji-regex": {
+      "version": "9.2.2",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
+      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
+      "dev": true,
+      "peer": true
+    },
     "node_modules/es-abstract": {
       "version": "1.20.1",
       "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.1.tgz",
@@ -145,6 +531,15 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/es-shim-unscopables": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz",
+      "integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==",
+      "dev": true,
+      "dependencies": {
+        "has": "^1.0.3"
+      }
+    },
     "node_modules/es-to-primitive": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
@@ -161,11 +556,481 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/escape-string-regexp": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/eslint": {
+      "version": "8.16.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.16.0.tgz",
+      "integrity": "sha512-MBndsoXY/PeVTDJeWsYj7kLZ5hQpJOfMYLsF6LicLHQWbRDG19lK5jOix4DPl8yY4SUFcE3txy86OzFLWT+yoA==",
+      "dev": true,
+      "dependencies": {
+        "@eslint/eslintrc": "^1.3.0",
+        "@humanwhocodes/config-array": "^0.9.2",
+        "ajv": "^6.10.0",
+        "chalk": "^4.0.0",
+        "cross-spawn": "^7.0.2",
+        "debug": "^4.3.2",
+        "doctrine": "^3.0.0",
+        "escape-string-regexp": "^4.0.0",
+        "eslint-scope": "^7.1.1",
+        "eslint-utils": "^3.0.0",
+        "eslint-visitor-keys": "^3.3.0",
+        "espree": "^9.3.2",
+        "esquery": "^1.4.0",
+        "esutils": "^2.0.2",
+        "fast-deep-equal": "^3.1.3",
+        "file-entry-cache": "^6.0.1",
+        "functional-red-black-tree": "^1.0.1",
+        "glob-parent": "^6.0.1",
+        "globals": "^13.15.0",
+        "ignore": "^5.2.0",
+        "import-fresh": "^3.0.0",
+        "imurmurhash": "^0.1.4",
+        "is-glob": "^4.0.0",
+        "js-yaml": "^4.1.0",
+        "json-stable-stringify-without-jsonify": "^1.0.1",
+        "levn": "^0.4.1",
+        "lodash.merge": "^4.6.2",
+        "minimatch": "^3.1.2",
+        "natural-compare": "^1.4.0",
+        "optionator": "^0.9.1",
+        "regexpp": "^3.2.0",
+        "strip-ansi": "^6.0.1",
+        "strip-json-comments": "^3.1.0",
+        "text-table": "^0.2.0",
+        "v8-compile-cache": "^2.0.3"
+      },
+      "bin": {
+        "eslint": "bin/eslint.js"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/eslint-config-airbnb": {
+      "version": "19.0.4",
+      "resolved": "https://registry.npmjs.org/eslint-config-airbnb/-/eslint-config-airbnb-19.0.4.tgz",
+      "integrity": "sha512-T75QYQVQX57jiNgpF9r1KegMICE94VYwoFQyMGhrvc+lB8YF2E/M/PYDaQe1AJcWaEgqLE+ErXV1Og/+6Vyzew==",
+      "dev": true,
+      "dependencies": {
+        "eslint-config-airbnb-base": "^15.0.0",
+        "object.assign": "^4.1.2",
+        "object.entries": "^1.1.5"
+      },
+      "engines": {
+        "node": "^10.12.0 || ^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "peerDependencies": {
+        "eslint": "^7.32.0 || ^8.2.0",
+        "eslint-plugin-import": "^2.25.3",
+        "eslint-plugin-jsx-a11y": "^6.5.1",
+        "eslint-plugin-react": "^7.28.0",
+        "eslint-plugin-react-hooks": "^4.3.0"
+      }
+    },
+    "node_modules/eslint-config-airbnb-base": {
+      "version": "15.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-airbnb-base/-/eslint-config-airbnb-base-15.0.0.tgz",
+      "integrity": "sha512-xaX3z4ZZIcFLvh2oUNvcX5oEofXda7giYmuplVxoOg5A7EXJMrUyqRgR+mhDhPK8LZ4PttFOBvCYDbX3sUoUig==",
+      "dev": true,
+      "dependencies": {
+        "confusing-browser-globals": "^1.0.10",
+        "object.assign": "^4.1.2",
+        "object.entries": "^1.1.5",
+        "semver": "^6.3.0"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      },
+      "peerDependencies": {
+        "eslint": "^7.32.0 || ^8.2.0",
+        "eslint-plugin-import": "^2.25.2"
+      }
+    },
+    "node_modules/eslint-import-resolver-node": {
+      "version": "0.3.6",
+      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz",
+      "integrity": "sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^3.2.7",
+        "resolve": "^1.20.0"
+      }
+    },
+    "node_modules/eslint-import-resolver-node/node_modules/debug": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/eslint-module-utils": {
+      "version": "2.7.3",
+      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.3.tgz",
+      "integrity": "sha512-088JEC7O3lDZM9xGe0RerkOMd0EjFl+Yvd1jPWIkMT5u3H9+HC34mWWPnqPrN13gieT9pBOO+Qt07Nb/6TresQ==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^3.2.7",
+        "find-up": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/eslint-module-utils/node_modules/debug": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/eslint-plugin-import": {
+      "version": "2.26.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz",
+      "integrity": "sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA==",
+      "dev": true,
+      "dependencies": {
+        "array-includes": "^3.1.4",
+        "array.prototype.flat": "^1.2.5",
+        "debug": "^2.6.9",
+        "doctrine": "^2.1.0",
+        "eslint-import-resolver-node": "^0.3.6",
+        "eslint-module-utils": "^2.7.3",
+        "has": "^1.0.3",
+        "is-core-module": "^2.8.1",
+        "is-glob": "^4.0.3",
+        "minimatch": "^3.1.2",
+        "object.values": "^1.1.5",
+        "resolve": "^1.22.0",
+        "tsconfig-paths": "^3.14.1"
+      },
+      "engines": {
+        "node": ">=4"
+      },
+      "peerDependencies": {
+        "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8"
+      }
+    },
+    "node_modules/eslint-plugin-import/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/eslint-plugin-import/node_modules/doctrine": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
+      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
+      "dev": true,
+      "dependencies": {
+        "esutils": "^2.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/eslint-plugin-import/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+      "dev": true
+    },
+    "node_modules/eslint-plugin-jsx-a11y": {
+      "version": "6.5.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.5.1.tgz",
+      "integrity": "sha512-sVCFKX9fllURnXT2JwLN5Qgo24Ug5NF6dxhkmxsMEUZhXRcGg+X3e1JbJ84YePQKBl5E0ZjAH5Q4rkdcGY99+g==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "@babel/runtime": "^7.16.3",
+        "aria-query": "^4.2.2",
+        "array-includes": "^3.1.4",
+        "ast-types-flow": "^0.0.7",
+        "axe-core": "^4.3.5",
+        "axobject-query": "^2.2.0",
+        "damerau-levenshtein": "^1.0.7",
+        "emoji-regex": "^9.2.2",
+        "has": "^1.0.3",
+        "jsx-ast-utils": "^3.2.1",
+        "language-tags": "^1.0.5",
+        "minimatch": "^3.0.4"
+      },
+      "engines": {
+        "node": ">=4.0"
+      },
+      "peerDependencies": {
+        "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8"
+      }
+    },
+    "node_modules/eslint-plugin-react": {
+      "version": "7.30.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.30.0.tgz",
+      "integrity": "sha512-RgwH7hjW48BleKsYyHK5vUAvxtE9SMPDKmcPRQgtRCYaZA0XQPt5FSkrU3nhz5ifzMZcA8opwmRJ2cmOO8tr5A==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "array-includes": "^3.1.5",
+        "array.prototype.flatmap": "^1.3.0",
+        "doctrine": "^2.1.0",
+        "estraverse": "^5.3.0",
+        "jsx-ast-utils": "^2.4.1 || ^3.0.0",
+        "minimatch": "^3.1.2",
+        "object.entries": "^1.1.5",
+        "object.fromentries": "^2.0.5",
+        "object.hasown": "^1.1.1",
+        "object.values": "^1.1.5",
+        "prop-types": "^15.8.1",
+        "resolve": "^2.0.0-next.3",
+        "semver": "^6.3.0",
+        "string.prototype.matchall": "^4.0.7"
+      },
+      "engines": {
+        "node": ">=4"
+      },
+      "peerDependencies": {
+        "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8"
+      }
+    },
+    "node_modules/eslint-plugin-react-hooks": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.5.0.tgz",
+      "integrity": "sha512-8k1gRt7D7h03kd+SAAlzXkQwWK22BnK6GKZG+FJA6BAGy22CFvl8kCIXKpVux0cCxMWDQUPqSok0LKaZ0aOcCw==",
+      "dev": true,
+      "peer": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "peerDependencies": {
+        "eslint": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0"
+      }
+    },
+    "node_modules/eslint-plugin-react/node_modules/doctrine": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
+      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "esutils": "^2.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/eslint-plugin-react/node_modules/resolve": {
+      "version": "2.0.0-next.3",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.3.tgz",
+      "integrity": "sha512-W8LucSynKUIDu9ylraa7ueVZ7hc0uAgJBxVsQSKOXOyle8a93qXhcz+XAXZ8bIq2d6i4Ehddn6Evt+0/UwKk6Q==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "is-core-module": "^2.2.0",
+        "path-parse": "^1.0.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/eslint-plugin-sort-exports": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-sort-exports/-/eslint-plugin-sort-exports-0.6.0.tgz",
+      "integrity": "sha512-NMFUDPL6jVkTiGR698sv6nNEM/cA7CzSJaeIDdBnzkyj8ZYe7eFvcaxLSSSSouikQaxZQukVd74CIQ2sggbrtg==",
+      "dev": true,
+      "peerDependencies": {
+        "eslint": ">=5.0.0"
+      }
+    },
+    "node_modules/eslint-scope": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz",
+      "integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==",
+      "dev": true,
+      "dependencies": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^5.2.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      }
+    },
+    "node_modules/eslint-utils": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
+      "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
+      "dev": true,
+      "dependencies": {
+        "eslint-visitor-keys": "^2.0.0"
+      },
+      "engines": {
+        "node": "^10.0.0 || ^12.0.0 || >= 14.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/mysticatea"
+      },
+      "peerDependencies": {
+        "eslint": ">=5"
+      }
+    },
+    "node_modules/eslint-utils/node_modules/eslint-visitor-keys": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
+      "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/eslint-visitor-keys": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
+      "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
+      "dev": true,
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      }
+    },
+    "node_modules/espree": {
+      "version": "9.3.2",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-9.3.2.tgz",
+      "integrity": "sha512-D211tC7ZwouTIuY5x9XnS0E9sWNChB7IYKX/Xp5eQj3nFXhqmiUDB9q27y76oFl8jTg3pXcQx/bpxMfs3CIZbA==",
+      "dev": true,
+      "dependencies": {
+        "acorn": "^8.7.1",
+        "acorn-jsx": "^5.3.2",
+        "eslint-visitor-keys": "^3.3.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      }
+    },
+    "node_modules/esquery": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
+      "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
+      "dev": true,
+      "dependencies": {
+        "estraverse": "^5.1.0"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/esrecurse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
+      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+      "dev": true,
+      "dependencies": {
+        "estraverse": "^5.2.0"
+      },
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/estraverse": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+      "dev": true,
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/esutils": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/eventemitter3": {
       "version": "4.0.7",
       "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
       "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="
     },
+    "node_modules/fast-deep-equal": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+      "dev": true
+    },
+    "node_modules/fast-json-stable-stringify": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+      "dev": true
+    },
+    "node_modules/fast-levenshtein": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+      "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
+      "dev": true
+    },
+    "node_modules/file-entry-cache": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
+      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
+      "dev": true,
+      "dependencies": {
+        "flat-cache": "^3.0.4"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      }
+    },
+    "node_modules/find-up": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+      "integrity": "sha512-NWzkk0jSJtTt08+FBFMvXoeZnOJD+jTtsRmBYbAIzJdX6l7dLgR7CTubCM5/eDdPUBvLCeVasP1brfVR/9/EZQ==",
+      "dev": true,
+      "dependencies": {
+        "locate-path": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/flat-cache": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
+      "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
+      "dev": true,
+      "dependencies": {
+        "flatted": "^3.1.0",
+        "rimraf": "^3.0.2"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      }
+    },
+    "node_modules/flatted": {
+      "version": "3.2.5",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.5.tgz",
+      "integrity": "sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg==",
+      "dev": true
+    },
     "node_modules/follow-redirects": {
       "version": "1.15.1",
       "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.1.tgz",
@@ -198,6 +1063,12 @@
         "node": ">= 6"
       }
     },
+    "node_modules/fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
+      "dev": true
+    },
     "node_modules/function-bind": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
@@ -220,6 +1091,12 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/functional-red-black-tree": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
+      "integrity": "sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==",
+      "dev": true
+    },
     "node_modules/functions-have-names": {
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
@@ -256,6 +1133,53 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/glob": {
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "dev": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.1.1",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/glob-parent": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
+      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
+      "dev": true,
+      "dependencies": {
+        "is-glob": "^4.0.3"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/globals": {
+      "version": "13.15.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.15.0.tgz",
+      "integrity": "sha512-bpzcOlgDhMG070Av0Vy5Owklpv1I6+j96GhUI7Rh7IzDCKLzboflLrrfqMu8NquDbiR4EOQk7XzJwqVJxicxog==",
+      "dev": true,
+      "dependencies": {
+        "type-fest": "^0.20.2"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/has": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
@@ -275,6 +1199,15 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/has-property-descriptors": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz",
@@ -311,6 +1244,56 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/ignore": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
+      "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/import-fresh": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
+      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
+      "dev": true,
+      "dependencies": {
+        "parent-module": "^1.0.0",
+        "resolve-from": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.19"
+      }
+    },
+    "node_modules/inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+      "dev": true,
+      "dependencies": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "node_modules/inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+      "dev": true
+    },
     "node_modules/internal-slot": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz",
@@ -361,6 +1344,18 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/is-core-module": {
+      "version": "2.9.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.9.0.tgz",
+      "integrity": "sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==",
+      "dev": true,
+      "dependencies": {
+        "has": "^1.0.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/is-date-object": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
@@ -375,6 +1370,27 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-glob": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+      "dev": true,
+      "dependencies": {
+        "is-extglob": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/is-negative-zero": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
@@ -465,6 +1481,131 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
+      "dev": true
+    },
+    "node_modules/js-tokens": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+      "dev": true,
+      "peer": true
+    },
+    "node_modules/js-yaml": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+      "dev": true,
+      "dependencies": {
+        "argparse": "^2.0.1"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
+    },
+    "node_modules/json-stable-stringify-without-jsonify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+      "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
+      "dev": true
+    },
+    "node_modules/json5": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+      "dev": true,
+      "dependencies": {
+        "minimist": "^1.2.0"
+      },
+      "bin": {
+        "json5": "lib/cli.js"
+      }
+    },
+    "node_modules/jsx-ast-utils": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.0.tgz",
+      "integrity": "sha512-XzO9luP6L0xkxwhIJMTJQpZo/eeN60K08jHdexfD569AGxeNug6UketeHXEhROoM8aR7EcUoOQmIhcJQjcuq8Q==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "array-includes": "^3.1.4",
+        "object.assign": "^4.1.2"
+      },
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/language-subtag-registry": {
+      "version": "0.3.21",
+      "resolved": "https://registry.npmjs.org/language-subtag-registry/-/language-subtag-registry-0.3.21.tgz",
+      "integrity": "sha512-L0IqwlIXjilBVVYKFT37X9Ih11Um5NEl9cbJIuU/SwP/zEEAbBPOnEeeuxVMf45ydWQRDQN3Nqc96OgbH1K+Pg==",
+      "dev": true,
+      "peer": true
+    },
+    "node_modules/language-tags": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/language-tags/-/language-tags-1.0.5.tgz",
+      "integrity": "sha1-0yHbxNowuovzAk4ED6XBRmH5GTo=",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "language-subtag-registry": "~0.3.2"
+      }
+    },
+    "node_modules/levn": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
+      "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
+      "dev": true,
+      "dependencies": {
+        "prelude-ls": "^1.2.1",
+        "type-check": "~0.4.0"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/locate-path": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
+      "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
+      "dev": true,
+      "dependencies": {
+        "p-locate": "^2.0.0",
+        "path-exists": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/lodash.merge": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
+      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
+      "dev": true
+    },
+    "node_modules/loose-envify": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
+      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "js-tokens": "^3.0.0 || ^4.0.0"
+      },
+      "bin": {
+        "loose-envify": "cli.js"
+      }
+    },
     "node_modules/mime-db": {
       "version": "1.52.0",
       "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
@@ -484,6 +1625,36 @@
         "node": ">= 0.6"
       }
     },
+    "node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/minimist": {
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
+      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
+      "dev": true
+    },
+    "node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/natural-compare": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
+      "dev": true
+    },
     "node_modules/node-persist": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/node-persist/-/node-persist-3.1.0.tgz",
@@ -492,31 +1663,104 @@
         "node": ">=10.12.0"
       }
     },
-    "node_modules/object-inspect": {
-      "version": "1.12.2",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz",
-      "integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==",
+    "node_modules/object-assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
+      "dev": true,
+      "peer": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object-inspect": {
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz",
+      "integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object-keys": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/object.assign": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
+      "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
+      "dependencies": {
+        "call-bind": "^1.0.0",
+        "define-properties": "^1.1.3",
+        "has-symbols": "^1.0.1",
+        "object-keys": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.entries": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.5.tgz",
+      "integrity": "sha512-TyxmjUoZggd4OrrU1W66FMDG6CuqJxsFvymeyXI51+vQLN67zYfZseptRge703kKQdo4uccgAKebXFcRCzk4+g==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.19.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/object.fromentries": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.5.tgz",
+      "integrity": "sha512-CAyG5mWQRRiBU57Re4FKoTBjXfDoNwdFVH2Y1tS9PqCsfUTymAohOkEMSG3aRNKmv4lV3O7p1et7c187q6bynw==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.19.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/object-keys": {
+    "node_modules/object.hasown": {
       "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
-      "engines": {
-        "node": ">= 0.4"
+      "resolved": "https://registry.npmjs.org/object.hasown/-/object.hasown-1.1.1.tgz",
+      "integrity": "sha512-LYLe4tivNQzq4JdaWW6WO3HMZZJWzkkH8fnI6EebWl0VZth2wL2Lovm74ep2/gZzlaTdV62JZHEqHQ2yVn8Q/A==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.19.5"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/object.assign": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
-      "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
+    "node_modules/object.values": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.5.tgz",
+      "integrity": "sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg==",
+      "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.0",
+        "call-bind": "^1.0.2",
         "define-properties": "^1.1.3",
-        "has-symbols": "^1.0.1",
-        "object-keys": "^1.1.1"
+        "es-abstract": "^1.19.1"
       },
       "engines": {
         "node": ">= 0.4"
@@ -525,40 +1769,145 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/p-finally": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
-      "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=",
+    "node_modules/once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "dev": true,
+      "dependencies": {
+        "wrappy": "1"
+      }
+    },
+    "node_modules/optionator": {
+      "version": "0.9.1",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
+      "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
+      "dev": true,
+      "dependencies": {
+        "deep-is": "^0.1.3",
+        "fast-levenshtein": "^2.0.6",
+        "levn": "^0.4.1",
+        "prelude-ls": "^1.2.1",
+        "type-check": "^0.4.0",
+        "word-wrap": "^1.2.3"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/p-limit": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
+      "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
+      "dev": true,
+      "dependencies": {
+        "p-try": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/p-locate": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
+      "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
+      "dev": true,
+      "dependencies": {
+        "p-limit": "^1.1.0"
+      },
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/p-queue": {
-      "version": "6.6.2",
-      "resolved": "https://registry.npmjs.org/p-queue/-/p-queue-6.6.2.tgz",
-      "integrity": "sha512-RwFpb72c/BhQLEXIZ5K2e+AhgNVmIejGlTgiB9MzZ0e93GRvqZ7uSi0dvRF7/XIXDeNkra2fNHBxTyPDGySpjQ==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/p-queue/-/p-queue-7.2.0.tgz",
+      "integrity": "sha512-Kvv7p13M46lTYLQ/PsZdaj/1Vj6u/8oiIJgyQyx4oVkOfHdd7M2EZvXigDvcsSzRwanCzQirV5bJPQFoSQt5MA==",
       "dependencies": {
-        "eventemitter3": "^4.0.4",
-        "p-timeout": "^3.2.0"
+        "eventemitter3": "^4.0.7",
+        "p-timeout": "^5.0.2"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=12"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/p-timeout": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-3.2.0.tgz",
-      "integrity": "sha512-rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-5.1.0.tgz",
+      "integrity": "sha512-auFDyzzzGZZZdHz3BtET9VEz0SE/uMEAx7uWfGPucfzEwwe/xH0iVeZibQmANYE/hp9T2+UUZT5m+BKyrDp3Ew==",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/p-try": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
+      "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/parent-module": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+      "dev": true,
       "dependencies": {
-        "p-finally": "^1.0.0"
+        "callsites": "^3.0.0"
       },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/path-exists": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+      "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/path-key": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+      "dev": true,
       "engines": {
         "node": ">=8"
       }
     },
+    "node_modules/path-parse": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
+      "dev": true
+    },
+    "node_modules/prelude-ls": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
+      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
     "node_modules/promise-controller": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/promise-controller/-/promise-controller-1.0.0.tgz",
@@ -591,6 +1940,41 @@
         "node": ">=10"
       }
     },
+    "node_modules/prop-types": {
+      "version": "15.8.1",
+      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
+      "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "loose-envify": "^1.4.0",
+        "object-assign": "^4.1.1",
+        "react-is": "^16.13.1"
+      }
+    },
+    "node_modules/punycode": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/react-is": {
+      "version": "16.13.1",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
+      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
+      "dev": true,
+      "peer": true
+    },
+    "node_modules/regenerator-runtime": {
+      "version": "0.13.9",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",
+      "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==",
+      "dev": true,
+      "peer": true
+    },
     "node_modules/regexp.prototype.flags": {
       "version": "1.4.3",
       "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
@@ -607,6 +1991,89 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/regexpp": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
+      "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/mysticatea"
+      }
+    },
+    "node_modules/resolve": {
+      "version": "1.22.0",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz",
+      "integrity": "sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==",
+      "dev": true,
+      "dependencies": {
+        "is-core-module": "^2.8.1",
+        "path-parse": "^1.0.7",
+        "supports-preserve-symlinks-flag": "^1.0.0"
+      },
+      "bin": {
+        "resolve": "bin/resolve"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/resolve-from": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/rimraf": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+      "dev": true,
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/semver": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/shebang-command": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+      "dev": true,
+      "dependencies": {
+        "shebang-regex": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/shebang-regex": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/side-channel": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
@@ -620,6 +2087,26 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/string.prototype.matchall": {
+      "version": "4.0.7",
+      "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.7.tgz",
+      "integrity": "sha512-f48okCX7JiwVi1NXCVWcFnZgADDC/n2vePlQ/KUCNqCikLLilQvwjMO8+BHVKvgzH0JB0J9LEPgxOGT02RoETg==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.19.1",
+        "get-intrinsic": "^1.1.1",
+        "has-symbols": "^1.0.3",
+        "internal-slot": "^1.0.3",
+        "regexp.prototype.flags": "^1.4.1",
+        "side-channel": "^1.0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/string.prototype.trimend": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz",
@@ -646,6 +2133,105 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-bom": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+      "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/strip-json-comments": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/supports-preserve-symlinks-flag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
+      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/text-table": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
+      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
+      "dev": true
+    },
+    "node_modules/tsconfig-paths": {
+      "version": "3.14.1",
+      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz",
+      "integrity": "sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/json5": "^0.0.29",
+        "json5": "^1.0.1",
+        "minimist": "^1.2.6",
+        "strip-bom": "^3.0.0"
+      }
+    },
+    "node_modules/type-check": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
+      "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
+      "dev": true,
+      "dependencies": {
+        "prelude-ls": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/type-fest": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/unbox-primitive": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
@@ -660,6 +2246,21 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/uri-js": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
+      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
+      "dev": true,
+      "dependencies": {
+        "punycode": "^2.1.0"
+      }
+    },
+    "node_modules/v8-compile-cache": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
+      "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==",
+      "dev": true
+    },
     "node_modules/websocket-as-promised": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/websocket-as-promised/-/websocket-as-promised-2.0.1.tgz",
@@ -674,6 +2275,21 @@
         "node": ">=6"
       }
     },
+    "node_modules/which": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+      "dev": true,
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "node-which": "bin/node-which"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
     "node_modules/which-boxed-primitive": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
@@ -689,6 +2305,21 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/word-wrap": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
+      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+      "dev": true
+    },
     "node_modules/ws": {
       "version": "8.7.0",
       "resolved": "https://registry.npmjs.org/ws/-/ws-8.7.0.tgz",
@@ -711,16 +2342,186 @@
     }
   },
   "dependencies": {
+    "@babel/runtime": {
+      "version": "7.18.3",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.18.3.tgz",
+      "integrity": "sha512-38Y8f7YUhce/K7RMwTp7m0uCumpv9hZkitCbBClqQIow1qSbCvGkcegKOXpEWCQLfWmevgRiWokZ1GkpfhbZug==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "regenerator-runtime": "^0.13.4"
+      }
+    },
+    "@babel/runtime-corejs3": {
+      "version": "7.18.3",
+      "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.18.3.tgz",
+      "integrity": "sha512-l4ddFwrc9rnR+EJsHsh+TJ4A35YqQz/UqcjtlX2ov53hlJYG5CxtQmNZxyajwDVmCxwy++rtvGU5HazCK4W41Q==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "core-js-pure": "^3.20.2",
+        "regenerator-runtime": "^0.13.4"
+      }
+    },
+    "@eslint/eslintrc": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.0.tgz",
+      "integrity": "sha512-UWW0TMTmk2d7hLcWD1/e2g5HDM/HQ3csaLSqXCfqwh4uNDuNqlaKWXmEsL4Cs41Z0KnILNvwbHAah3C2yt06kw==",
+      "dev": true,
+      "requires": {
+        "ajv": "^6.12.4",
+        "debug": "^4.3.2",
+        "espree": "^9.3.2",
+        "globals": "^13.15.0",
+        "ignore": "^5.2.0",
+        "import-fresh": "^3.2.1",
+        "js-yaml": "^4.1.0",
+        "minimatch": "^3.1.2",
+        "strip-json-comments": "^3.1.1"
+      }
+    },
     "@homebridge/plugin-ui-utils": {
       "version": "0.0.19",
       "resolved": "https://registry.npmjs.org/@homebridge/plugin-ui-utils/-/plugin-ui-utils-0.0.19.tgz",
       "integrity": "sha512-axFX7lN2Yd7bz/6SlD7dzq5sY/N9+XYuLHPukuiyHQRDtNMRL1uDqJhOx6RVaN2tYDHB75h7YxRQWP7U44Mgzg=="
     },
+    "@humanwhocodes/config-array": {
+      "version": "0.9.5",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.9.5.tgz",
+      "integrity": "sha512-ObyMyWxZiCu/yTisA7uzx81s40xR2fD5Cg/2Kq7G02ajkNubJf6BopgDTmDyc3U7sXpNKM8cYOw7s7Tyr+DnCw==",
+      "dev": true,
+      "requires": {
+        "@humanwhocodes/object-schema": "^1.2.1",
+        "debug": "^4.1.1",
+        "minimatch": "^3.0.4"
+      }
+    },
+    "@humanwhocodes/object-schema": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
+      "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
+      "dev": true
+    },
+    "@types/json5": {
+      "version": "0.0.29",
+      "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
+      "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==",
+      "dev": true
+    },
+    "acorn": {
+      "version": "8.7.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.1.tgz",
+      "integrity": "sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==",
+      "dev": true
+    },
+    "acorn-jsx": {
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
+      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
+      "dev": true,
+      "requires": {}
+    },
+    "ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dev": true,
+      "requires": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      }
+    },
+    "ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true
+    },
+    "ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "requires": {
+        "color-convert": "^2.0.1"
+      }
+    },
+    "argparse": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+      "dev": true
+    },
+    "aria-query": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-4.2.2.tgz",
+      "integrity": "sha512-o/HelwhuKpTj/frsOsbNLNgnNGVIFsVP/SW2BSF14gVl7kAfMOJ6/8wUAUvG1R1NHKrfG+2sHZTu0yauT1qBrA==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "@babel/runtime": "^7.10.2",
+        "@babel/runtime-corejs3": "^7.10.2"
+      }
+    },
+    "array-includes": {
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.5.tgz",
+      "integrity": "sha512-iSDYZMMyTPkiFasVqfuAQnWAYcvO/SeBSCGKePoEthjp4LEMTe4uLc7b025o4jAZpHhihh8xPo99TNWUWWkGDQ==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.19.5",
+        "get-intrinsic": "^1.1.1",
+        "is-string": "^1.0.7"
+      }
+    },
+    "array.prototype.flat": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.0.tgz",
+      "integrity": "sha512-12IUEkHsAhA4DY5s0FPgNXIdc8VRSqD9Zp78a5au9abH/SOBrsp082JOWFNTjkMozh8mqcdiKuaLGhPeYztxSw==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.19.2",
+        "es-shim-unscopables": "^1.0.0"
+      }
+    },
+    "array.prototype.flatmap": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.0.tgz",
+      "integrity": "sha512-PZC9/8TKAIxcWKdyeb77EzULHPrIX/tIZebLJUQOMR1OwYosT8yggdfWScfTBCDj5utONvOuPQQumYsU2ULbkg==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.19.2",
+        "es-shim-unscopables": "^1.0.0"
+      }
+    },
+    "ast-types-flow": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.7.tgz",
+      "integrity": "sha512-eBvWn1lvIApYMhzQMsu9ciLfkBY499mFZlNqG+/9WR7PVlroQw0vG30cOQQbaKz3sCEc44TAOu2ykzqXSNnwag==",
+      "dev": true,
+      "peer": true
+    },
     "asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
       "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
     },
+    "axe-core": {
+      "version": "4.4.2",
+      "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.4.2.tgz",
+      "integrity": "sha512-LVAaGp/wkkgYJcjmHsoKx4juT1aQvJyPcW09MLCjVTh3V2cc6PnyempiLMNH5iMdfIX/zdbjUx2KDjMLCTdPeA==",
+      "dev": true,
+      "peer": true
+    },
     "axios": {
       "version": "0.27.2",
       "resolved": "https://registry.npmjs.org/axios/-/axios-0.27.2.tgz",
@@ -730,6 +2531,29 @@
         "form-data": "^4.0.0"
       }
     },
+    "axobject-query": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.2.0.tgz",
+      "integrity": "sha512-Td525n+iPOOyUQIeBfcASuG6uJsDOITl7Mds5gFyerkWiX7qhUTdYUBlSgNMyVqtSJqwpt1kXGLdUt6SykLMRA==",
+      "dev": true,
+      "peer": true
+    },
+    "balanced-match": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+      "dev": true
+    },
+    "brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "requires": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
     "call-bind": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
@@ -739,11 +2563,42 @@
         "get-intrinsic": "^1.0.2"
       }
     },
+    "callsites": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+      "dev": true
+    },
+    "chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "requires": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      }
+    },
     "chnl": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/chnl/-/chnl-1.2.0.tgz",
       "integrity": "sha512-g5gJb59edwCliFbX2j7G6sBfY4sX9YLy211yctONI2GRaiX0f2zIbKWmBm+sPqFNEpM7Ljzm7IJX/xrjiEbPrw=="
     },
+    "color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "requires": {
+        "color-name": "~1.1.4"
+      }
+    },
+    "color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
     "combined-stream": {
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
@@ -752,6 +2607,58 @@
         "delayed-stream": "~1.0.0"
       }
     },
+    "concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
+      "dev": true
+    },
+    "confusing-browser-globals": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/confusing-browser-globals/-/confusing-browser-globals-1.0.11.tgz",
+      "integrity": "sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA==",
+      "dev": true
+    },
+    "core-js-pure": {
+      "version": "3.22.7",
+      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.22.7.tgz",
+      "integrity": "sha512-wTriFxiZI+C8msGeh7fJcbC/a0V8fdInN1oS2eK79DMBGs8iIJiXhtFJCiT3rBa8w6zroHWW3p8ArlujZ/Mz+w==",
+      "dev": true,
+      "peer": true
+    },
+    "cross-spawn": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "dev": true,
+      "requires": {
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
+      }
+    },
+    "damerau-levenshtein": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz",
+      "integrity": "sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA==",
+      "dev": true,
+      "peer": true
+    },
+    "debug": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "dev": true,
+      "requires": {
+        "ms": "2.1.2"
+      }
+    },
+    "deep-is": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
+      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
+      "dev": true
+    },
     "define-properties": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
@@ -766,6 +2673,22 @@
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
       "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ=="
     },
+    "doctrine": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
+      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
+      "dev": true,
+      "requires": {
+        "esutils": "^2.0.2"
+      }
+    },
+    "emoji-regex": {
+      "version": "9.2.2",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
+      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
+      "dev": true,
+      "peer": true
+    },
     "es-abstract": {
       "version": "1.20.1",
       "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.1.tgz",
@@ -796,6 +2719,15 @@
         "unbox-primitive": "^1.0.2"
       }
     },
+    "es-shim-unscopables": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz",
+      "integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==",
+      "dev": true,
+      "requires": {
+        "has": "^1.0.3"
+      }
+    },
     "es-to-primitive": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
@@ -806,11 +2738,380 @@
         "is-symbol": "^1.0.2"
       }
     },
+    "escape-string-regexp": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+      "dev": true
+    },
+    "eslint": {
+      "version": "8.16.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.16.0.tgz",
+      "integrity": "sha512-MBndsoXY/PeVTDJeWsYj7kLZ5hQpJOfMYLsF6LicLHQWbRDG19lK5jOix4DPl8yY4SUFcE3txy86OzFLWT+yoA==",
+      "dev": true,
+      "requires": {
+        "@eslint/eslintrc": "^1.3.0",
+        "@humanwhocodes/config-array": "^0.9.2",
+        "ajv": "^6.10.0",
+        "chalk": "^4.0.0",
+        "cross-spawn": "^7.0.2",
+        "debug": "^4.3.2",
+        "doctrine": "^3.0.0",
+        "escape-string-regexp": "^4.0.0",
+        "eslint-scope": "^7.1.1",
+        "eslint-utils": "^3.0.0",
+        "eslint-visitor-keys": "^3.3.0",
+        "espree": "^9.3.2",
+        "esquery": "^1.4.0",
+        "esutils": "^2.0.2",
+        "fast-deep-equal": "^3.1.3",
+        "file-entry-cache": "^6.0.1",
+        "functional-red-black-tree": "^1.0.1",
+        "glob-parent": "^6.0.1",
+        "globals": "^13.15.0",
+        "ignore": "^5.2.0",
+        "import-fresh": "^3.0.0",
+        "imurmurhash": "^0.1.4",
+        "is-glob": "^4.0.0",
+        "js-yaml": "^4.1.0",
+        "json-stable-stringify-without-jsonify": "^1.0.1",
+        "levn": "^0.4.1",
+        "lodash.merge": "^4.6.2",
+        "minimatch": "^3.1.2",
+        "natural-compare": "^1.4.0",
+        "optionator": "^0.9.1",
+        "regexpp": "^3.2.0",
+        "strip-ansi": "^6.0.1",
+        "strip-json-comments": "^3.1.0",
+        "text-table": "^0.2.0",
+        "v8-compile-cache": "^2.0.3"
+      }
+    },
+    "eslint-config-airbnb": {
+      "version": "19.0.4",
+      "resolved": "https://registry.npmjs.org/eslint-config-airbnb/-/eslint-config-airbnb-19.0.4.tgz",
+      "integrity": "sha512-T75QYQVQX57jiNgpF9r1KegMICE94VYwoFQyMGhrvc+lB8YF2E/M/PYDaQe1AJcWaEgqLE+ErXV1Og/+6Vyzew==",
+      "dev": true,
+      "requires": {
+        "eslint-config-airbnb-base": "^15.0.0",
+        "object.assign": "^4.1.2",
+        "object.entries": "^1.1.5"
+      }
+    },
+    "eslint-config-airbnb-base": {
+      "version": "15.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-airbnb-base/-/eslint-config-airbnb-base-15.0.0.tgz",
+      "integrity": "sha512-xaX3z4ZZIcFLvh2oUNvcX5oEofXda7giYmuplVxoOg5A7EXJMrUyqRgR+mhDhPK8LZ4PttFOBvCYDbX3sUoUig==",
+      "dev": true,
+      "requires": {
+        "confusing-browser-globals": "^1.0.10",
+        "object.assign": "^4.1.2",
+        "object.entries": "^1.1.5",
+        "semver": "^6.3.0"
+      }
+    },
+    "eslint-import-resolver-node": {
+      "version": "0.3.6",
+      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz",
+      "integrity": "sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw==",
+      "dev": true,
+      "requires": {
+        "debug": "^3.2.7",
+        "resolve": "^1.20.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.2.7",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        }
+      }
+    },
+    "eslint-module-utils": {
+      "version": "2.7.3",
+      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.3.tgz",
+      "integrity": "sha512-088JEC7O3lDZM9xGe0RerkOMd0EjFl+Yvd1jPWIkMT5u3H9+HC34mWWPnqPrN13gieT9pBOO+Qt07Nb/6TresQ==",
+      "dev": true,
+      "requires": {
+        "debug": "^3.2.7",
+        "find-up": "^2.1.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.2.7",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        }
+      }
+    },
+    "eslint-plugin-import": {
+      "version": "2.26.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz",
+      "integrity": "sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA==",
+      "dev": true,
+      "requires": {
+        "array-includes": "^3.1.4",
+        "array.prototype.flat": "^1.2.5",
+        "debug": "^2.6.9",
+        "doctrine": "^2.1.0",
+        "eslint-import-resolver-node": "^0.3.6",
+        "eslint-module-utils": "^2.7.3",
+        "has": "^1.0.3",
+        "is-core-module": "^2.8.1",
+        "is-glob": "^4.0.3",
+        "minimatch": "^3.1.2",
+        "object.values": "^1.1.5",
+        "resolve": "^1.22.0",
+        "tsconfig-paths": "^3.14.1"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "doctrine": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
+          "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
+          "dev": true,
+          "requires": {
+            "esutils": "^2.0.2"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "dev": true
+        }
+      }
+    },
+    "eslint-plugin-jsx-a11y": {
+      "version": "6.5.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.5.1.tgz",
+      "integrity": "sha512-sVCFKX9fllURnXT2JwLN5Qgo24Ug5NF6dxhkmxsMEUZhXRcGg+X3e1JbJ84YePQKBl5E0ZjAH5Q4rkdcGY99+g==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "@babel/runtime": "^7.16.3",
+        "aria-query": "^4.2.2",
+        "array-includes": "^3.1.4",
+        "ast-types-flow": "^0.0.7",
+        "axe-core": "^4.3.5",
+        "axobject-query": "^2.2.0",
+        "damerau-levenshtein": "^1.0.7",
+        "emoji-regex": "^9.2.2",
+        "has": "^1.0.3",
+        "jsx-ast-utils": "^3.2.1",
+        "language-tags": "^1.0.5",
+        "minimatch": "^3.0.4"
+      }
+    },
+    "eslint-plugin-react": {
+      "version": "7.30.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.30.0.tgz",
+      "integrity": "sha512-RgwH7hjW48BleKsYyHK5vUAvxtE9SMPDKmcPRQgtRCYaZA0XQPt5FSkrU3nhz5ifzMZcA8opwmRJ2cmOO8tr5A==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "array-includes": "^3.1.5",
+        "array.prototype.flatmap": "^1.3.0",
+        "doctrine": "^2.1.0",
+        "estraverse": "^5.3.0",
+        "jsx-ast-utils": "^2.4.1 || ^3.0.0",
+        "minimatch": "^3.1.2",
+        "object.entries": "^1.1.5",
+        "object.fromentries": "^2.0.5",
+        "object.hasown": "^1.1.1",
+        "object.values": "^1.1.5",
+        "prop-types": "^15.8.1",
+        "resolve": "^2.0.0-next.3",
+        "semver": "^6.3.0",
+        "string.prototype.matchall": "^4.0.7"
+      },
+      "dependencies": {
+        "doctrine": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
+          "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
+          "dev": true,
+          "peer": true,
+          "requires": {
+            "esutils": "^2.0.2"
+          }
+        },
+        "resolve": {
+          "version": "2.0.0-next.3",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.3.tgz",
+          "integrity": "sha512-W8LucSynKUIDu9ylraa7ueVZ7hc0uAgJBxVsQSKOXOyle8a93qXhcz+XAXZ8bIq2d6i4Ehddn6Evt+0/UwKk6Q==",
+          "dev": true,
+          "peer": true,
+          "requires": {
+            "is-core-module": "^2.2.0",
+            "path-parse": "^1.0.6"
+          }
+        }
+      }
+    },
+    "eslint-plugin-react-hooks": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.5.0.tgz",
+      "integrity": "sha512-8k1gRt7D7h03kd+SAAlzXkQwWK22BnK6GKZG+FJA6BAGy22CFvl8kCIXKpVux0cCxMWDQUPqSok0LKaZ0aOcCw==",
+      "dev": true,
+      "peer": true,
+      "requires": {}
+    },
+    "eslint-plugin-sort-exports": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-sort-exports/-/eslint-plugin-sort-exports-0.6.0.tgz",
+      "integrity": "sha512-NMFUDPL6jVkTiGR698sv6nNEM/cA7CzSJaeIDdBnzkyj8ZYe7eFvcaxLSSSSouikQaxZQukVd74CIQ2sggbrtg==",
+      "dev": true,
+      "requires": {}
+    },
+    "eslint-scope": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz",
+      "integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==",
+      "dev": true,
+      "requires": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^5.2.0"
+      }
+    },
+    "eslint-utils": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
+      "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
+      "dev": true,
+      "requires": {
+        "eslint-visitor-keys": "^2.0.0"
+      },
+      "dependencies": {
+        "eslint-visitor-keys": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
+          "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
+          "dev": true
+        }
+      }
+    },
+    "eslint-visitor-keys": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
+      "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
+      "dev": true
+    },
+    "espree": {
+      "version": "9.3.2",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-9.3.2.tgz",
+      "integrity": "sha512-D211tC7ZwouTIuY5x9XnS0E9sWNChB7IYKX/Xp5eQj3nFXhqmiUDB9q27y76oFl8jTg3pXcQx/bpxMfs3CIZbA==",
+      "dev": true,
+      "requires": {
+        "acorn": "^8.7.1",
+        "acorn-jsx": "^5.3.2",
+        "eslint-visitor-keys": "^3.3.0"
+      }
+    },
+    "esquery": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
+      "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
+      "dev": true,
+      "requires": {
+        "estraverse": "^5.1.0"
+      }
+    },
+    "esrecurse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
+      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+      "dev": true,
+      "requires": {
+        "estraverse": "^5.2.0"
+      }
+    },
+    "estraverse": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+      "dev": true
+    },
+    "esutils": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+      "dev": true
+    },
     "eventemitter3": {
       "version": "4.0.7",
       "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
       "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="
     },
+    "fast-deep-equal": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+      "dev": true
+    },
+    "fast-json-stable-stringify": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+      "dev": true
+    },
+    "fast-levenshtein": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+      "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
+      "dev": true
+    },
+    "file-entry-cache": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
+      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
+      "dev": true,
+      "requires": {
+        "flat-cache": "^3.0.4"
+      }
+    },
+    "find-up": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+      "integrity": "sha512-NWzkk0jSJtTt08+FBFMvXoeZnOJD+jTtsRmBYbAIzJdX6l7dLgR7CTubCM5/eDdPUBvLCeVasP1brfVR/9/EZQ==",
+      "dev": true,
+      "requires": {
+        "locate-path": "^2.0.0"
+      }
+    },
+    "flat-cache": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
+      "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
+      "dev": true,
+      "requires": {
+        "flatted": "^3.1.0",
+        "rimraf": "^3.0.2"
+      }
+    },
+    "flatted": {
+      "version": "3.2.5",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.5.tgz",
+      "integrity": "sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg==",
+      "dev": true
+    },
     "follow-redirects": {
       "version": "1.15.1",
       "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.1.tgz",
@@ -826,6 +3127,12 @@
         "mime-types": "^2.1.12"
       }
     },
+    "fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
+      "dev": true
+    },
     "function-bind": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
@@ -842,6 +3149,12 @@
         "functions-have-names": "^1.2.2"
       }
     },
+    "functional-red-black-tree": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
+      "integrity": "sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==",
+      "dev": true
+    },
     "functions-have-names": {
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
@@ -866,6 +3179,38 @@
         "get-intrinsic": "^1.1.1"
       }
     },
+    "glob": {
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "dev": true,
+      "requires": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.1.1",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      }
+    },
+    "glob-parent": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
+      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
+      "dev": true,
+      "requires": {
+        "is-glob": "^4.0.3"
+      }
+    },
+    "globals": {
+      "version": "13.15.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.15.0.tgz",
+      "integrity": "sha512-bpzcOlgDhMG070Av0Vy5Owklpv1I6+j96GhUI7Rh7IzDCKLzboflLrrfqMu8NquDbiR4EOQk7XzJwqVJxicxog==",
+      "dev": true,
+      "requires": {
+        "type-fest": "^0.20.2"
+      }
+    },
     "has": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
@@ -879,6 +3224,12 @@
       "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
       "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ=="
     },
+    "has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true
+    },
     "has-property-descriptors": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz",
@@ -900,6 +3251,44 @@
         "has-symbols": "^1.0.2"
       }
     },
+    "ignore": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
+      "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
+      "dev": true
+    },
+    "import-fresh": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
+      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
+      "dev": true,
+      "requires": {
+        "parent-module": "^1.0.0",
+        "resolve-from": "^4.0.0"
+      }
+    },
+    "imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
+      "dev": true
+    },
+    "inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+      "dev": true,
+      "requires": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+      "dev": true
+    },
     "internal-slot": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz",
@@ -932,6 +3321,15 @@
       "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
       "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w=="
     },
+    "is-core-module": {
+      "version": "2.9.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.9.0.tgz",
+      "integrity": "sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==",
+      "dev": true,
+      "requires": {
+        "has": "^1.0.3"
+      }
+    },
     "is-date-object": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
@@ -940,6 +3338,21 @@
         "has-tostringtag": "^1.0.0"
       }
     },
+    "is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
+      "dev": true
+    },
+    "is-glob": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+      "dev": true,
+      "requires": {
+        "is-extglob": "^2.1.1"
+      }
+    },
     "is-negative-zero": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
@@ -994,6 +3407,113 @@
         "call-bind": "^1.0.2"
       }
     },
+    "isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
+      "dev": true
+    },
+    "js-tokens": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+      "dev": true,
+      "peer": true
+    },
+    "js-yaml": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+      "dev": true,
+      "requires": {
+        "argparse": "^2.0.1"
+      }
+    },
+    "json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
+    },
+    "json-stable-stringify-without-jsonify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+      "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
+      "dev": true
+    },
+    "json5": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+      "dev": true,
+      "requires": {
+        "minimist": "^1.2.0"
+      }
+    },
+    "jsx-ast-utils": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.0.tgz",
+      "integrity": "sha512-XzO9luP6L0xkxwhIJMTJQpZo/eeN60K08jHdexfD569AGxeNug6UketeHXEhROoM8aR7EcUoOQmIhcJQjcuq8Q==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "array-includes": "^3.1.4",
+        "object.assign": "^4.1.2"
+      }
+    },
+    "language-subtag-registry": {
+      "version": "0.3.21",
+      "resolved": "https://registry.npmjs.org/language-subtag-registry/-/language-subtag-registry-0.3.21.tgz",
+      "integrity": "sha512-L0IqwlIXjilBVVYKFT37X9Ih11Um5NEl9cbJIuU/SwP/zEEAbBPOnEeeuxVMf45ydWQRDQN3Nqc96OgbH1K+Pg==",
+      "dev": true,
+      "peer": true
+    },
+    "language-tags": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/language-tags/-/language-tags-1.0.5.tgz",
+      "integrity": "sha1-0yHbxNowuovzAk4ED6XBRmH5GTo=",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "language-subtag-registry": "~0.3.2"
+      }
+    },
+    "levn": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
+      "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
+      "dev": true,
+      "requires": {
+        "prelude-ls": "^1.2.1",
+        "type-check": "~0.4.0"
+      }
+    },
+    "locate-path": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
+      "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
+      "dev": true,
+      "requires": {
+        "p-locate": "^2.0.0",
+        "path-exists": "^3.0.0"
+      }
+    },
+    "lodash.merge": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
+      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
+      "dev": true
+    },
+    "loose-envify": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
+      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "js-tokens": "^3.0.0 || ^4.0.0"
+      }
+    },
     "mime-db": {
       "version": "1.52.0",
       "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
@@ -1007,11 +3527,45 @@
         "mime-db": "1.52.0"
       }
     },
+    "minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
+      "requires": {
+        "brace-expansion": "^1.1.7"
+      }
+    },
+    "minimist": {
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
+      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
+      "dev": true
+    },
+    "ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "natural-compare": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
+      "dev": true
+    },
     "node-persist": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/node-persist/-/node-persist-3.1.0.tgz",
       "integrity": "sha512-/j+fd/u71wNgKf3V2bx4tnDm+3GvLnlCuvf2MXbJ3wern+67IAb6zN9Leu1tCWPlPNZ+v1hLSibVukkPK2HqJw=="
     },
+    "object-assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
+      "dev": true,
+      "peer": true
+    },
     "object-inspect": {
       "version": "1.12.2",
       "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz",
@@ -1033,28 +3587,151 @@
         "object-keys": "^1.1.1"
       }
     },
-    "p-finally": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
-      "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4="
+    "object.entries": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.5.tgz",
+      "integrity": "sha512-TyxmjUoZggd4OrrU1W66FMDG6CuqJxsFvymeyXI51+vQLN67zYfZseptRge703kKQdo4uccgAKebXFcRCzk4+g==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.19.1"
+      }
+    },
+    "object.fromentries": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.5.tgz",
+      "integrity": "sha512-CAyG5mWQRRiBU57Re4FKoTBjXfDoNwdFVH2Y1tS9PqCsfUTymAohOkEMSG3aRNKmv4lV3O7p1et7c187q6bynw==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.19.1"
+      }
+    },
+    "object.hasown": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/object.hasown/-/object.hasown-1.1.1.tgz",
+      "integrity": "sha512-LYLe4tivNQzq4JdaWW6WO3HMZZJWzkkH8fnI6EebWl0VZth2wL2Lovm74ep2/gZzlaTdV62JZHEqHQ2yVn8Q/A==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.19.5"
+      }
+    },
+    "object.values": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.5.tgz",
+      "integrity": "sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.19.1"
+      }
+    },
+    "once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "dev": true,
+      "requires": {
+        "wrappy": "1"
+      }
+    },
+    "optionator": {
+      "version": "0.9.1",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
+      "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
+      "dev": true,
+      "requires": {
+        "deep-is": "^0.1.3",
+        "fast-levenshtein": "^2.0.6",
+        "levn": "^0.4.1",
+        "prelude-ls": "^1.2.1",
+        "type-check": "^0.4.0",
+        "word-wrap": "^1.2.3"
+      }
+    },
+    "p-limit": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
+      "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
+      "dev": true,
+      "requires": {
+        "p-try": "^1.0.0"
+      }
+    },
+    "p-locate": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
+      "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
+      "dev": true,
+      "requires": {
+        "p-limit": "^1.1.0"
+      }
     },
     "p-queue": {
-      "version": "6.6.2",
-      "resolved": "https://registry.npmjs.org/p-queue/-/p-queue-6.6.2.tgz",
-      "integrity": "sha512-RwFpb72c/BhQLEXIZ5K2e+AhgNVmIejGlTgiB9MzZ0e93GRvqZ7uSi0dvRF7/XIXDeNkra2fNHBxTyPDGySpjQ==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/p-queue/-/p-queue-7.2.0.tgz",
+      "integrity": "sha512-Kvv7p13M46lTYLQ/PsZdaj/1Vj6u/8oiIJgyQyx4oVkOfHdd7M2EZvXigDvcsSzRwanCzQirV5bJPQFoSQt5MA==",
       "requires": {
-        "eventemitter3": "^4.0.4",
-        "p-timeout": "^3.2.0"
+        "eventemitter3": "^4.0.7",
+        "p-timeout": "^5.0.2"
       }
     },
     "p-timeout": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-3.2.0.tgz",
-      "integrity": "sha512-rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-5.1.0.tgz",
+      "integrity": "sha512-auFDyzzzGZZZdHz3BtET9VEz0SE/uMEAx7uWfGPucfzEwwe/xH0iVeZibQmANYE/hp9T2+UUZT5m+BKyrDp3Ew=="
+    },
+    "p-try": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
+      "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
+      "dev": true
+    },
+    "parent-module": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+      "dev": true,
       "requires": {
-        "p-finally": "^1.0.0"
+        "callsites": "^3.0.0"
       }
     },
+    "path-exists": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+      "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
+      "dev": true
+    },
+    "path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+      "dev": true
+    },
+    "path-key": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+      "dev": true
+    },
+    "path-parse": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
+      "dev": true
+    },
+    "prelude-ls": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
+      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
+      "dev": true
+    },
     "promise-controller": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/promise-controller/-/promise-controller-1.0.0.tgz",
@@ -1075,6 +3752,38 @@
       "resolved": "https://registry.npmjs.org/promised-map/-/promised-map-1.0.0.tgz",
       "integrity": "sha512-fP9VSMgcml+U2uJ9PBc4/LDQ3ZkJCH4blLNCS6gbH7RHyRZCYs91zxWHqiUy+heFiEMiB2op/qllYoFqmIqdWA=="
     },
+    "prop-types": {
+      "version": "15.8.1",
+      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
+      "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "loose-envify": "^1.4.0",
+        "object-assign": "^4.1.1",
+        "react-is": "^16.13.1"
+      }
+    },
+    "punycode": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+      "dev": true
+    },
+    "react-is": {
+      "version": "16.13.1",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
+      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
+      "dev": true,
+      "peer": true
+    },
+    "regenerator-runtime": {
+      "version": "0.13.9",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",
+      "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==",
+      "dev": true,
+      "peer": true
+    },
     "regexp.prototype.flags": {
       "version": "1.4.3",
       "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
@@ -1085,6 +3794,59 @@
         "functions-have-names": "^1.2.2"
       }
     },
+    "regexpp": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
+      "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
+      "dev": true
+    },
+    "resolve": {
+      "version": "1.22.0",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz",
+      "integrity": "sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==",
+      "dev": true,
+      "requires": {
+        "is-core-module": "^2.8.1",
+        "path-parse": "^1.0.7",
+        "supports-preserve-symlinks-flag": "^1.0.0"
+      }
+    },
+    "resolve-from": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+      "dev": true
+    },
+    "rimraf": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+      "dev": true,
+      "requires": {
+        "glob": "^7.1.3"
+      }
+    },
+    "semver": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+      "dev": true
+    },
+    "shebang-command": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+      "dev": true,
+      "requires": {
+        "shebang-regex": "^3.0.0"
+      }
+    },
+    "shebang-regex": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+      "dev": true
+    },
     "side-channel": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
@@ -1095,6 +3857,23 @@
         "object-inspect": "^1.9.0"
       }
     },
+    "string.prototype.matchall": {
+      "version": "4.0.7",
+      "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.7.tgz",
+      "integrity": "sha512-f48okCX7JiwVi1NXCVWcFnZgADDC/n2vePlQ/KUCNqCikLLilQvwjMO8+BHVKvgzH0JB0J9LEPgxOGT02RoETg==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.19.1",
+        "get-intrinsic": "^1.1.1",
+        "has-symbols": "^1.0.3",
+        "internal-slot": "^1.0.3",
+        "regexp.prototype.flags": "^1.4.1",
+        "side-channel": "^1.0.4"
+      }
+    },
     "string.prototype.trimend": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz",
@@ -1115,6 +3894,75 @@
         "es-abstract": "^1.19.5"
       }
     },
+    "strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "requires": {
+        "ansi-regex": "^5.0.1"
+      }
+    },
+    "strip-bom": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+      "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
+      "dev": true
+    },
+    "strip-json-comments": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+      "dev": true
+    },
+    "supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "requires": {
+        "has-flag": "^4.0.0"
+      }
+    },
+    "supports-preserve-symlinks-flag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
+      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
+      "dev": true
+    },
+    "text-table": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
+      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
+      "dev": true
+    },
+    "tsconfig-paths": {
+      "version": "3.14.1",
+      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz",
+      "integrity": "sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==",
+      "dev": true,
+      "requires": {
+        "@types/json5": "^0.0.29",
+        "json5": "^1.0.1",
+        "minimist": "^1.2.6",
+        "strip-bom": "^3.0.0"
+      }
+    },
+    "type-check": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
+      "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
+      "dev": true,
+      "requires": {
+        "prelude-ls": "^1.2.1"
+      }
+    },
+    "type-fest": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+      "dev": true
+    },
     "unbox-primitive": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
@@ -1126,6 +3974,21 @@
         "which-boxed-primitive": "^1.0.2"
       }
     },
+    "uri-js": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
+      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
+      "dev": true,
+      "requires": {
+        "punycode": "^2.1.0"
+      }
+    },
+    "v8-compile-cache": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
+      "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==",
+      "dev": true
+    },
     "websocket-as-promised": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/websocket-as-promised/-/websocket-as-promised-2.0.1.tgz",
@@ -1137,6 +4000,15 @@
         "promised-map": "^1.0.0"
       }
     },
+    "which": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+      "dev": true,
+      "requires": {
+        "isexe": "^2.0.0"
+      }
+    },
     "which-boxed-primitive": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
@@ -1149,6 +4021,18 @@
         "is-symbol": "^1.0.3"
       }
     },
+    "word-wrap": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
+      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
+      "dev": true
+    },
+    "wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+      "dev": true
+    },
     "ws": {
       "version": "8.7.0",
       "resolved": "https://registry.npmjs.org/ws/-/ws-8.7.0.tgz",
diff --git a/package.json b/package.json
index c465a24c..66a41e0e 100644
--- a/package.json
+++ b/package.json
@@ -7,6 +7,7 @@
     "email": "bwp91@icloud.com"
   },
   "description": "Homebridge plugin to integrate eWeLink devices into HomeKit.",
+  "type": "module",
   "license": "MIT",
   "keywords": [
     "homebridge",
@@ -24,6 +25,10 @@
     "smartwise"
   ],
   "main": "lib/index.js",
+  "scripts": {
+    "lint": "eslint . --fix",
+    "rebuild": "rm -rf package-lock.json && rm -rf node_modules && npm install"
+  },
   "engines": {
     "homebridge": "^1.4.0",
     "node": "^14.19.3 || ^16.15.0"
@@ -57,16 +62,14 @@
     "@homebridge/plugin-ui-utils": "^0.0.19",
     "axios": "^0.27.2",
     "node-persist": "^3.1.0",
-    "p-queue": "^6.6.2",
+    "p-queue": "^7.2.0",
     "websocket-as-promised": "^2.0.1",
     "ws": "^8.7.0"
   },
-  "prettier": {
-    "printWidth": 100
-  },
-  "standard": {
-    "ignore": [
-      "/lib/node-dns-sd/"
-    ]
+  "devDependencies": {
+    "eslint": "^8.16.0",
+    "eslint-config-airbnb": "^19.0.4",
+    "eslint-plugin-import": "^2.26.0",
+    "eslint-plugin-sort-exports": "^0.6.0"
   }
 }

From 139cb39569956bf362a74afae01fbdf8eedbbd45 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 29 May 2022 16:06:42 +0100
Subject: [PATCH 3001/3183] 9.0.0

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 6a548724..a9e614b9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "8.15.0",
+  "version": "9.0.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "8.15.0",
+      "version": "9.0.0",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 66a41e0e..ab18eef8 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "8.15.0",
+  "version": "9.0.0",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From b194462b50dae656f8fc7ca6102b2df329274107 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 8 Jun 2022 20:15:25 +0100
Subject: [PATCH 3002/3183] fix error error

---
 lib/utils/functions.js |   2 +-
 package-lock.json      | 102 ++++++++++++++++++++---------------------
 package.json           |   2 +-
 3 files changed, 53 insertions(+), 53 deletions(-)

diff --git a/lib/utils/functions.js b/lib/utils/functions.js
index b48768de..794b626c 100644
--- a/lib/utils/functions.js
+++ b/lib/utils/functions.js
@@ -16,7 +16,7 @@ const parseDeviceId = (deviceId) => deviceId
 
 const parseError = (err, hideStack = []) => {
   let toReturn = err.message;
-  if (err?.stack.length > 0 && !hideStack.includes(err.message)) {
+  if (err?.stack?.length > 0 && !hideStack.includes(err.message)) {
     const stack = err.stack.split('\n');
     if (stack[1]) {
       toReturn += stack[1].replace('   ', '');
diff --git a/package-lock.json b/package-lock.json
index a9e614b9..c86d1643 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -35,7 +35,7 @@
         "ws": "^8.7.0"
       },
       "devDependencies": {
-        "eslint": "^8.16.0",
+        "eslint": "^8.17.0",
         "eslint-config-airbnb": "^19.0.4",
         "eslint-plugin-import": "^2.26.0",
         "eslint-plugin-sort-exports": "^0.6.0"
@@ -398,9 +398,9 @@
       "dev": true
     },
     "node_modules/core-js-pure": {
-      "version": "3.22.7",
-      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.22.7.tgz",
-      "integrity": "sha512-wTriFxiZI+C8msGeh7fJcbC/a0V8fdInN1oS2eK79DMBGs8iIJiXhtFJCiT3rBa8w6zroHWW3p8ArlujZ/Mz+w==",
+      "version": "3.22.8",
+      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.22.8.tgz",
+      "integrity": "sha512-bOxbZIy9S5n4OVH63XaLVXZ49QKicjowDx/UELyJ68vxfCRpYsbyh/WNZNfEfAk+ekA8vSjt+gCDpvh672bc3w==",
       "dev": true,
       "hasInstallScript": true,
       "peer": true,
@@ -569,9 +569,9 @@
       }
     },
     "node_modules/eslint": {
-      "version": "8.16.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.16.0.tgz",
-      "integrity": "sha512-MBndsoXY/PeVTDJeWsYj7kLZ5hQpJOfMYLsF6LicLHQWbRDG19lK5jOix4DPl8yY4SUFcE3txy86OzFLWT+yoA==",
+      "version": "8.17.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.17.0.tgz",
+      "integrity": "sha512-gq0m0BTJfci60Fz4nczYxNAlED+sMcihltndR8t9t1evnU/azx53x3t2UHXC/uRjcbvRw/XctpaNygSTcQD+Iw==",
       "dev": true,
       "dependencies": {
         "@eslint/eslintrc": "^1.3.0",
@@ -752,7 +752,7 @@
     "node_modules/eslint-plugin-import/node_modules/ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
       "dev": true
     },
     "node_modules/eslint-plugin-jsx-a11y": {
@@ -1106,13 +1106,13 @@
       }
     },
     "node_modules/get-intrinsic": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz",
-      "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.2.tgz",
+      "integrity": "sha512-Jfm3OyCxHh9DJyc28qGk+JmfkpO41A4XkneDSujN9MDXrm4oDKdHvndhZ2dN94+ERNfkYJWDclW6k2L/ZGHjXA==",
       "dependencies": {
         "function-bind": "^1.1.1",
         "has": "^1.0.3",
-        "has-symbols": "^1.0.1"
+        "has-symbols": "^1.0.3"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -1272,7 +1272,7 @@
     "node_modules/imurmurhash": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
+      "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
       "dev": true,
       "engines": {
         "node": ">=0.8.19"
@@ -1281,7 +1281,7 @@
     "node_modules/inflight": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
       "dev": true,
       "dependencies": {
         "once": "^1.3.0",
@@ -1373,7 +1373,7 @@
     "node_modules/is-extglob": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
+      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
@@ -1484,7 +1484,7 @@
     "node_modules/isexe": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
+      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
       "dev": true
     },
     "node_modules/js-tokens": {
@@ -1515,7 +1515,7 @@
     "node_modules/json-stable-stringify-without-jsonify": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-      "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
+      "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
       "dev": true
     },
     "node_modules/json5": {
@@ -1554,7 +1554,7 @@
     "node_modules/language-tags": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/language-tags/-/language-tags-1.0.5.tgz",
-      "integrity": "sha1-0yHbxNowuovzAk4ED6XBRmH5GTo=",
+      "integrity": "sha512-qJhlO9cGXi6hBGKoxEG/sKZDAHD5Hnu9Hs4WbOY3pCWXDhw0N8x1NenNzm2EnNLkLkk7J2SdxAkDSbb6ftT+UQ==",
       "dev": true,
       "peer": true,
       "dependencies": {
@@ -1577,7 +1577,7 @@
     "node_modules/locate-path": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
-      "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
+      "integrity": "sha512-NCI2kiDkyR7VeEKm27Kda/iQHyKJe1Bu0FlTbYp3CqJu+9IFe9bLyAjMxf5ZDDbEg+iMPzB5zYyUTSm8wVTKmA==",
       "dev": true,
       "dependencies": {
         "p-locate": "^2.0.0",
@@ -1652,7 +1652,7 @@
     "node_modules/natural-compare": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
+      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
       "dev": true
     },
     "node_modules/node-persist": {
@@ -1666,7 +1666,7 @@
     "node_modules/object-assign": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
+      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
       "dev": true,
       "peer": true,
       "engines": {
@@ -1772,7 +1772,7 @@
     "node_modules/once": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
       "dev": true,
       "dependencies": {
         "wrappy": "1"
@@ -1810,7 +1810,7 @@
     "node_modules/p-locate": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
-      "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
+      "integrity": "sha512-nQja7m7gSKuewoVRen45CtVfODR3crN3goVQ0DDZ9N3yHxgpkuBhZqsaiotSQRrADUrne346peY7kT3TSACykg==",
       "dev": true,
       "dependencies": {
         "p-limit": "^1.1.0"
@@ -1848,7 +1848,7 @@
     "node_modules/p-try": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
-      "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
+      "integrity": "sha512-U1etNYuMJoIz3ZXSrrySFjsXQTWOx2/jdi86L+2pRvph/qMKL6sbcCYdH23fqsbm8TH2Gn0OybpT4eSFlCVHww==",
       "dev": true,
       "engines": {
         "node": ">=4"
@@ -1869,7 +1869,7 @@
     "node_modules/path-exists": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-      "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
+      "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==",
       "dev": true,
       "engines": {
         "node": ">=4"
@@ -1878,7 +1878,7 @@
     "node_modules/path-is-absolute": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
@@ -2620,9 +2620,9 @@
       "dev": true
     },
     "core-js-pure": {
-      "version": "3.22.7",
-      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.22.7.tgz",
-      "integrity": "sha512-wTriFxiZI+C8msGeh7fJcbC/a0V8fdInN1oS2eK79DMBGs8iIJiXhtFJCiT3rBa8w6zroHWW3p8ArlujZ/Mz+w==",
+      "version": "3.22.8",
+      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.22.8.tgz",
+      "integrity": "sha512-bOxbZIy9S5n4OVH63XaLVXZ49QKicjowDx/UELyJ68vxfCRpYsbyh/WNZNfEfAk+ekA8vSjt+gCDpvh672bc3w==",
       "dev": true,
       "peer": true
     },
@@ -2745,9 +2745,9 @@
       "dev": true
     },
     "eslint": {
-      "version": "8.16.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.16.0.tgz",
-      "integrity": "sha512-MBndsoXY/PeVTDJeWsYj7kLZ5hQpJOfMYLsF6LicLHQWbRDG19lK5jOix4DPl8yY4SUFcE3txy86OzFLWT+yoA==",
+      "version": "8.17.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.17.0.tgz",
+      "integrity": "sha512-gq0m0BTJfci60Fz4nczYxNAlED+sMcihltndR8t9t1evnU/azx53x3t2UHXC/uRjcbvRw/XctpaNygSTcQD+Iw==",
       "dev": true,
       "requires": {
         "@eslint/eslintrc": "^1.3.0",
@@ -2894,7 +2894,7 @@
         "ms": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
           "dev": true
         }
       }
@@ -3161,13 +3161,13 @@
       "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ=="
     },
     "get-intrinsic": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz",
-      "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.2.tgz",
+      "integrity": "sha512-Jfm3OyCxHh9DJyc28qGk+JmfkpO41A4XkneDSujN9MDXrm4oDKdHvndhZ2dN94+ERNfkYJWDclW6k2L/ZGHjXA==",
       "requires": {
         "function-bind": "^1.1.1",
         "has": "^1.0.3",
-        "has-symbols": "^1.0.1"
+        "has-symbols": "^1.0.3"
       }
     },
     "get-symbol-description": {
@@ -3270,13 +3270,13 @@
     "imurmurhash": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
+      "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
       "dev": true
     },
     "inflight": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
       "dev": true,
       "requires": {
         "once": "^1.3.0",
@@ -3341,7 +3341,7 @@
     "is-extglob": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
+      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
       "dev": true
     },
     "is-glob": {
@@ -3410,7 +3410,7 @@
     "isexe": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
+      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
       "dev": true
     },
     "js-tokens": {
@@ -3438,7 +3438,7 @@
     "json-stable-stringify-without-jsonify": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-      "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
+      "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
       "dev": true
     },
     "json5": {
@@ -3471,7 +3471,7 @@
     "language-tags": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/language-tags/-/language-tags-1.0.5.tgz",
-      "integrity": "sha1-0yHbxNowuovzAk4ED6XBRmH5GTo=",
+      "integrity": "sha512-qJhlO9cGXi6hBGKoxEG/sKZDAHD5Hnu9Hs4WbOY3pCWXDhw0N8x1NenNzm2EnNLkLkk7J2SdxAkDSbb6ftT+UQ==",
       "dev": true,
       "peer": true,
       "requires": {
@@ -3491,7 +3491,7 @@
     "locate-path": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
-      "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
+      "integrity": "sha512-NCI2kiDkyR7VeEKm27Kda/iQHyKJe1Bu0FlTbYp3CqJu+9IFe9bLyAjMxf5ZDDbEg+iMPzB5zYyUTSm8wVTKmA==",
       "dev": true,
       "requires": {
         "p-locate": "^2.0.0",
@@ -3551,7 +3551,7 @@
     "natural-compare": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
+      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
       "dev": true
     },
     "node-persist": {
@@ -3562,7 +3562,7 @@
     "object-assign": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
+      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
       "dev": true,
       "peer": true
     },
@@ -3635,7 +3635,7 @@
     "once": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
       "dev": true,
       "requires": {
         "wrappy": "1"
@@ -3667,7 +3667,7 @@
     "p-locate": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
-      "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
+      "integrity": "sha512-nQja7m7gSKuewoVRen45CtVfODR3crN3goVQ0DDZ9N3yHxgpkuBhZqsaiotSQRrADUrne346peY7kT3TSACykg==",
       "dev": true,
       "requires": {
         "p-limit": "^1.1.0"
@@ -3690,7 +3690,7 @@
     "p-try": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
-      "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
+      "integrity": "sha512-U1etNYuMJoIz3ZXSrrySFjsXQTWOx2/jdi86L+2pRvph/qMKL6sbcCYdH23fqsbm8TH2Gn0OybpT4eSFlCVHww==",
       "dev": true
     },
     "parent-module": {
@@ -3705,13 +3705,13 @@
     "path-exists": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-      "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
+      "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==",
       "dev": true
     },
     "path-is-absolute": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
       "dev": true
     },
     "path-key": {
diff --git a/package.json b/package.json
index ab18eef8..096452a8 100644
--- a/package.json
+++ b/package.json
@@ -67,7 +67,7 @@
     "ws": "^8.7.0"
   },
   "devDependencies": {
-    "eslint": "^8.16.0",
+    "eslint": "^8.17.0",
     "eslint-config-airbnb": "^19.0.4",
     "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-sort-exports": "^0.6.0"

From ceeab8ce839940e80f59cf34b3c6dfab3b4c4b9e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 8 Jun 2022 20:16:00 +0100
Subject: [PATCH 3003/3183] 9.0.1-beta.0

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c86d1643..bc20e890 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "9.0.0",
+  "version": "9.0.1-beta.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "9.0.0",
+      "version": "9.0.1-beta.0",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 096452a8..a7243dcb 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "9.0.0",
+  "version": "9.0.1-beta.0",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From e30bd3d8980d06f75e4af3265d43d0084c3777b0 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 8 Jun 2022 23:21:02 +0100
Subject: [PATCH 3004/3183] prep 9.0.1

---
 CHANGELOG.md      | 10 ++++++++++
 package-lock.json |  2 +-
 package.json      |  2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index abb25049..d793a048 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,16 @@
 
 All notable changes to homebridge-ewelink will be documented in this file.
 
+## 9.0.1 (2022-06-08)
+
+### Changed
+
+- Bump `node` recommended versions to v14.19.3 or v16.15.1
+
+### Fixed
+
+- A potential issue showing errors in the logs
+
 ## 9.0.0 (2022-05-29)
 
 ### Potentially Breaking Changes
diff --git a/package-lock.json b/package-lock.json
index bc20e890..8e58cd9f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -42,7 +42,7 @@
       },
       "engines": {
         "homebridge": "^1.4.0",
-        "node": "^14.19.3 || ^16.15.0"
+        "node": "^14.19.3 || ^16.15.1"
       }
     },
     "node_modules/@babel/runtime": {
diff --git a/package.json b/package.json
index a7243dcb..1b4ed9ec 100644
--- a/package.json
+++ b/package.json
@@ -31,7 +31,7 @@
   },
   "engines": {
     "homebridge": "^1.4.0",
-    "node": "^14.19.3 || ^16.15.0"
+    "node": "^14.19.3 || ^16.15.1"
   },
   "repository": {
     "type": "git",

From f1b2db30e2f3e8ffcfc04a621d2de295459b968a Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 8 Jun 2022 23:21:26 +0100
Subject: [PATCH 3005/3183] 9.0.1

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 8e58cd9f..1e8baf72 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "9.0.1-beta.0",
+  "version": "9.0.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "9.0.1-beta.0",
+      "version": "9.0.1",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 1b4ed9ec..6b2abb24 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "9.0.1-beta.0",
+  "version": "9.0.1",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From 79c310f698c21c03ec22f3c18505049b8877dcd2 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 13 Jun 2022 21:59:47 +0100
Subject: [PATCH 3006/3183] h/k

---
 .eslintrc.cjs     |   2 +-
 CHANGELOG.md      |   6 +
 package-lock.json | 685 +---------------------------------------------
 package.json      |   4 +-
 4 files changed, 23 insertions(+), 674 deletions(-)

diff --git a/.eslintrc.cjs b/.eslintrc.cjs
index 78f18e0d..5c991ca8 100644
--- a/.eslintrc.cjs
+++ b/.eslintrc.cjs
@@ -3,7 +3,7 @@ module.exports = {
     es2022: true,
     node: true,
   },
-  extends: ['airbnb'],
+  extends: ['airbnb-base'],
   ignorePatterns: ['lib/node-dns-sd/*'],
   parserOptions: {
     ecmaVersion: 'latest',
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d793a048..6f1f92de 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 All notable changes to homebridge-ewelink will be documented in this file.
 
+## BETA
+
+### Changed
+
+- Bump `ws` to v8.8.0
+- 
 ## 9.0.1 (2022-06-08)
 
 ### Changed
diff --git a/package-lock.json b/package-lock.json
index 1e8baf72..52cea32c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -32,11 +32,11 @@
         "node-persist": "^3.1.0",
         "p-queue": "^7.2.0",
         "websocket-as-promised": "^2.0.1",
-        "ws": "^8.7.0"
+        "ws": "^8.8.0"
       },
       "devDependencies": {
         "eslint": "^8.17.0",
-        "eslint-config-airbnb": "^19.0.4",
+        "eslint-config-airbnb-base": "^15.0.0",
         "eslint-plugin-import": "^2.26.0",
         "eslint-plugin-sort-exports": "^0.6.0"
       },
@@ -45,33 +45,6 @@
         "node": "^14.19.3 || ^16.15.1"
       }
     },
-    "node_modules/@babel/runtime": {
-      "version": "7.18.3",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.18.3.tgz",
-      "integrity": "sha512-38Y8f7YUhce/K7RMwTp7m0uCumpv9hZkitCbBClqQIow1qSbCvGkcegKOXpEWCQLfWmevgRiWokZ1GkpfhbZug==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "regenerator-runtime": "^0.13.4"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/runtime-corejs3": {
-      "version": "7.18.3",
-      "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.18.3.tgz",
-      "integrity": "sha512-l4ddFwrc9rnR+EJsHsh+TJ4A35YqQz/UqcjtlX2ov53hlJYG5CxtQmNZxyajwDVmCxwy++rtvGU5HazCK4W41Q==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "core-js-pure": "^3.20.2",
-        "regenerator-runtime": "^0.13.4"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
     "node_modules/@eslint/eslintrc": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.0.tgz",
@@ -190,20 +163,6 @@
       "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
       "dev": true
     },
-    "node_modules/aria-query": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-4.2.2.tgz",
-      "integrity": "sha512-o/HelwhuKpTj/frsOsbNLNgnNGVIFsVP/SW2BSF14gVl7kAfMOJ6/8wUAUvG1R1NHKrfG+2sHZTu0yauT1qBrA==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "@babel/runtime": "^7.10.2",
-        "@babel/runtime-corejs3": "^7.10.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      }
-    },
     "node_modules/array-includes": {
       "version": "3.1.5",
       "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.5.tgz",
@@ -241,47 +200,11 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/array.prototype.flatmap": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.0.tgz",
-      "integrity": "sha512-PZC9/8TKAIxcWKdyeb77EzULHPrIX/tIZebLJUQOMR1OwYosT8yggdfWScfTBCDj5utONvOuPQQumYsU2ULbkg==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.2",
-        "es-shim-unscopables": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/ast-types-flow": {
-      "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.7.tgz",
-      "integrity": "sha512-eBvWn1lvIApYMhzQMsu9ciLfkBY499mFZlNqG+/9WR7PVlroQw0vG30cOQQbaKz3sCEc44TAOu2ykzqXSNnwag==",
-      "dev": true,
-      "peer": true
-    },
     "node_modules/asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
       "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
     },
-    "node_modules/axe-core": {
-      "version": "4.4.2",
-      "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.4.2.tgz",
-      "integrity": "sha512-LVAaGp/wkkgYJcjmHsoKx4juT1aQvJyPcW09MLCjVTh3V2cc6PnyempiLMNH5iMdfIX/zdbjUx2KDjMLCTdPeA==",
-      "dev": true,
-      "peer": true,
-      "engines": {
-        "node": ">=12"
-      }
-    },
     "node_modules/axios": {
       "version": "0.27.2",
       "resolved": "https://registry.npmjs.org/axios/-/axios-0.27.2.tgz",
@@ -291,13 +214,6 @@
         "form-data": "^4.0.0"
       }
     },
-    "node_modules/axobject-query": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.2.0.tgz",
-      "integrity": "sha512-Td525n+iPOOyUQIeBfcASuG6uJsDOITl7Mds5gFyerkWiX7qhUTdYUBlSgNMyVqtSJqwpt1kXGLdUt6SykLMRA==",
-      "dev": true,
-      "peer": true
-    },
     "node_modules/balanced-match": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
@@ -397,18 +313,6 @@
       "integrity": "sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA==",
       "dev": true
     },
-    "node_modules/core-js-pure": {
-      "version": "3.22.8",
-      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.22.8.tgz",
-      "integrity": "sha512-bOxbZIy9S5n4OVH63XaLVXZ49QKicjowDx/UELyJ68vxfCRpYsbyh/WNZNfEfAk+ekA8vSjt+gCDpvh672bc3w==",
-      "dev": true,
-      "hasInstallScript": true,
-      "peer": true,
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/core-js"
-      }
-    },
     "node_modules/cross-spawn": {
       "version": "7.0.3",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
@@ -423,13 +327,6 @@
         "node": ">= 8"
       }
     },
-    "node_modules/damerau-levenshtein": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz",
-      "integrity": "sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA==",
-      "dev": true,
-      "peer": true
-    },
     "node_modules/debug": {
       "version": "4.3.4",
       "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
@@ -488,13 +385,6 @@
         "node": ">=6.0.0"
       }
     },
-    "node_modules/emoji-regex": {
-      "version": "9.2.2",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
-      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
-      "dev": true,
-      "peer": true
-    },
     "node_modules/es-abstract": {
       "version": "1.20.1",
       "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.1.tgz",
@@ -620,27 +510,6 @@
         "url": "https://opencollective.com/eslint"
       }
     },
-    "node_modules/eslint-config-airbnb": {
-      "version": "19.0.4",
-      "resolved": "https://registry.npmjs.org/eslint-config-airbnb/-/eslint-config-airbnb-19.0.4.tgz",
-      "integrity": "sha512-T75QYQVQX57jiNgpF9r1KegMICE94VYwoFQyMGhrvc+lB8YF2E/M/PYDaQe1AJcWaEgqLE+ErXV1Og/+6Vyzew==",
-      "dev": true,
-      "dependencies": {
-        "eslint-config-airbnb-base": "^15.0.0",
-        "object.assign": "^4.1.2",
-        "object.entries": "^1.1.5"
-      },
-      "engines": {
-        "node": "^10.12.0 || ^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "peerDependencies": {
-        "eslint": "^7.32.0 || ^8.2.0",
-        "eslint-plugin-import": "^2.25.3",
-        "eslint-plugin-jsx-a11y": "^6.5.1",
-        "eslint-plugin-react": "^7.28.0",
-        "eslint-plugin-react-hooks": "^4.3.0"
-      }
-    },
     "node_modules/eslint-config-airbnb-base": {
       "version": "15.0.0",
       "resolved": "https://registry.npmjs.org/eslint-config-airbnb-base/-/eslint-config-airbnb-base-15.0.0.tgz",
@@ -755,102 +624,6 @@
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
       "dev": true
     },
-    "node_modules/eslint-plugin-jsx-a11y": {
-      "version": "6.5.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.5.1.tgz",
-      "integrity": "sha512-sVCFKX9fllURnXT2JwLN5Qgo24Ug5NF6dxhkmxsMEUZhXRcGg+X3e1JbJ84YePQKBl5E0ZjAH5Q4rkdcGY99+g==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "@babel/runtime": "^7.16.3",
-        "aria-query": "^4.2.2",
-        "array-includes": "^3.1.4",
-        "ast-types-flow": "^0.0.7",
-        "axe-core": "^4.3.5",
-        "axobject-query": "^2.2.0",
-        "damerau-levenshtein": "^1.0.7",
-        "emoji-regex": "^9.2.2",
-        "has": "^1.0.3",
-        "jsx-ast-utils": "^3.2.1",
-        "language-tags": "^1.0.5",
-        "minimatch": "^3.0.4"
-      },
-      "engines": {
-        "node": ">=4.0"
-      },
-      "peerDependencies": {
-        "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8"
-      }
-    },
-    "node_modules/eslint-plugin-react": {
-      "version": "7.30.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.30.0.tgz",
-      "integrity": "sha512-RgwH7hjW48BleKsYyHK5vUAvxtE9SMPDKmcPRQgtRCYaZA0XQPt5FSkrU3nhz5ifzMZcA8opwmRJ2cmOO8tr5A==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "array-includes": "^3.1.5",
-        "array.prototype.flatmap": "^1.3.0",
-        "doctrine": "^2.1.0",
-        "estraverse": "^5.3.0",
-        "jsx-ast-utils": "^2.4.1 || ^3.0.0",
-        "minimatch": "^3.1.2",
-        "object.entries": "^1.1.5",
-        "object.fromentries": "^2.0.5",
-        "object.hasown": "^1.1.1",
-        "object.values": "^1.1.5",
-        "prop-types": "^15.8.1",
-        "resolve": "^2.0.0-next.3",
-        "semver": "^6.3.0",
-        "string.prototype.matchall": "^4.0.7"
-      },
-      "engines": {
-        "node": ">=4"
-      },
-      "peerDependencies": {
-        "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8"
-      }
-    },
-    "node_modules/eslint-plugin-react-hooks": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.5.0.tgz",
-      "integrity": "sha512-8k1gRt7D7h03kd+SAAlzXkQwWK22BnK6GKZG+FJA6BAGy22CFvl8kCIXKpVux0cCxMWDQUPqSok0LKaZ0aOcCw==",
-      "dev": true,
-      "peer": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "peerDependencies": {
-        "eslint": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0"
-      }
-    },
-    "node_modules/eslint-plugin-react/node_modules/doctrine": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
-      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "esutils": "^2.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/eslint-plugin-react/node_modules/resolve": {
-      "version": "2.0.0-next.3",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.3.tgz",
-      "integrity": "sha512-W8LucSynKUIDu9ylraa7ueVZ7hc0uAgJBxVsQSKOXOyle8a93qXhcz+XAXZ8bIq2d6i4Ehddn6Evt+0/UwKk6Q==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "is-core-module": "^2.2.0",
-        "path-parse": "^1.0.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/eslint-plugin-sort-exports": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/eslint-plugin-sort-exports/-/eslint-plugin-sort-exports-0.6.0.tgz",
@@ -1487,13 +1260,6 @@
       "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
       "dev": true
     },
-    "node_modules/js-tokens": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-      "dev": true,
-      "peer": true
-    },
     "node_modules/js-yaml": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
@@ -1530,37 +1296,6 @@
         "json5": "lib/cli.js"
       }
     },
-    "node_modules/jsx-ast-utils": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.0.tgz",
-      "integrity": "sha512-XzO9luP6L0xkxwhIJMTJQpZo/eeN60K08jHdexfD569AGxeNug6UketeHXEhROoM8aR7EcUoOQmIhcJQjcuq8Q==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "array-includes": "^3.1.4",
-        "object.assign": "^4.1.2"
-      },
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/language-subtag-registry": {
-      "version": "0.3.21",
-      "resolved": "https://registry.npmjs.org/language-subtag-registry/-/language-subtag-registry-0.3.21.tgz",
-      "integrity": "sha512-L0IqwlIXjilBVVYKFT37X9Ih11Um5NEl9cbJIuU/SwP/zEEAbBPOnEeeuxVMf45ydWQRDQN3Nqc96OgbH1K+Pg==",
-      "dev": true,
-      "peer": true
-    },
-    "node_modules/language-tags": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/language-tags/-/language-tags-1.0.5.tgz",
-      "integrity": "sha512-qJhlO9cGXi6hBGKoxEG/sKZDAHD5Hnu9Hs4WbOY3pCWXDhw0N8x1NenNzm2EnNLkLkk7J2SdxAkDSbb6ftT+UQ==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "language-subtag-registry": "~0.3.2"
-      }
-    },
     "node_modules/levn": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
@@ -1593,19 +1328,6 @@
       "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
       "dev": true
     },
-    "node_modules/loose-envify": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
-      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "js-tokens": "^3.0.0 || ^4.0.0"
-      },
-      "bin": {
-        "loose-envify": "cli.js"
-      }
-    },
     "node_modules/mime-db": {
       "version": "1.52.0",
       "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
@@ -1663,16 +1385,6 @@
         "node": ">=10.12.0"
       }
     },
-    "node_modules/object-assign": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
-      "dev": true,
-      "peer": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/object-inspect": {
       "version": "1.12.2",
       "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz",
@@ -1720,38 +1432,6 @@
         "node": ">= 0.4"
       }
     },
-    "node_modules/object.fromentries": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.5.tgz",
-      "integrity": "sha512-CAyG5mWQRRiBU57Re4FKoTBjXfDoNwdFVH2Y1tS9PqCsfUTymAohOkEMSG3aRNKmv4lV3O7p1et7c187q6bynw==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.hasown": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object.hasown/-/object.hasown-1.1.1.tgz",
-      "integrity": "sha512-LYLe4tivNQzq4JdaWW6WO3HMZZJWzkkH8fnI6EebWl0VZth2wL2Lovm74ep2/gZzlaTdV62JZHEqHQ2yVn8Q/A==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.19.5"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/object.values": {
       "version": "1.1.5",
       "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.5.tgz",
@@ -1940,18 +1620,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/prop-types": {
-      "version": "15.8.1",
-      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
-      "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "loose-envify": "^1.4.0",
-        "object-assign": "^4.1.1",
-        "react-is": "^16.13.1"
-      }
-    },
     "node_modules/punycode": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
@@ -1961,20 +1629,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/react-is": {
-      "version": "16.13.1",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
-      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
-      "dev": true,
-      "peer": true
-    },
-    "node_modules/regenerator-runtime": {
-      "version": "0.13.9",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",
-      "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==",
-      "dev": true,
-      "peer": true
-    },
     "node_modules/regexp.prototype.flags": {
       "version": "1.4.3",
       "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
@@ -2087,26 +1741,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/string.prototype.matchall": {
-      "version": "4.0.7",
-      "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.7.tgz",
-      "integrity": "sha512-f48okCX7JiwVi1NXCVWcFnZgADDC/n2vePlQ/KUCNqCikLLilQvwjMO8+BHVKvgzH0JB0J9LEPgxOGT02RoETg==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.1",
-        "get-intrinsic": "^1.1.1",
-        "has-symbols": "^1.0.3",
-        "internal-slot": "^1.0.3",
-        "regexp.prototype.flags": "^1.4.1",
-        "side-channel": "^1.0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/string.prototype.trimend": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz",
@@ -2148,7 +1782,7 @@
     "node_modules/strip-bom": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-      "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
+      "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
       "dev": true,
       "engines": {
         "node": ">=4"
@@ -2193,7 +1827,7 @@
     "node_modules/text-table": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
+      "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
       "dev": true
     },
     "node_modules/tsconfig-paths": {
@@ -2317,13 +1951,13 @@
     "node_modules/wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
       "dev": true
     },
     "node_modules/ws": {
-      "version": "8.7.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.7.0.tgz",
-      "integrity": "sha512-c2gsP0PRwcLFzUiA8Mkr37/MI7ilIlHQxaEAtd0uNMbVMoy8puJyafRlm0bV9MbGSabUPeLrRRaqIBcFcA2Pqg==",
+      "version": "8.8.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.8.0.tgz",
+      "integrity": "sha512-JDAgSYQ1ksuwqfChJusw1LSJ8BizJ2e/vVu5Lxjq3YvNJNlROv1ui4i+c/kUUrPheBvQl4c5UbERhTwKa6QBJQ==",
       "engines": {
         "node": ">=10.0.0"
       },
@@ -2342,27 +1976,6 @@
     }
   },
   "dependencies": {
-    "@babel/runtime": {
-      "version": "7.18.3",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.18.3.tgz",
-      "integrity": "sha512-38Y8f7YUhce/K7RMwTp7m0uCumpv9hZkitCbBClqQIow1qSbCvGkcegKOXpEWCQLfWmevgRiWokZ1GkpfhbZug==",
-      "dev": true,
-      "peer": true,
-      "requires": {
-        "regenerator-runtime": "^0.13.4"
-      }
-    },
-    "@babel/runtime-corejs3": {
-      "version": "7.18.3",
-      "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.18.3.tgz",
-      "integrity": "sha512-l4ddFwrc9rnR+EJsHsh+TJ4A35YqQz/UqcjtlX2ov53hlJYG5CxtQmNZxyajwDVmCxwy++rtvGU5HazCK4W41Q==",
-      "dev": true,
-      "peer": true,
-      "requires": {
-        "core-js-pure": "^3.20.2",
-        "regenerator-runtime": "^0.13.4"
-      }
-    },
     "@eslint/eslintrc": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.0.tgz",
@@ -2454,17 +2067,6 @@
       "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
       "dev": true
     },
-    "aria-query": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-4.2.2.tgz",
-      "integrity": "sha512-o/HelwhuKpTj/frsOsbNLNgnNGVIFsVP/SW2BSF14gVl7kAfMOJ6/8wUAUvG1R1NHKrfG+2sHZTu0yauT1qBrA==",
-      "dev": true,
-      "peer": true,
-      "requires": {
-        "@babel/runtime": "^7.10.2",
-        "@babel/runtime-corejs3": "^7.10.2"
-      }
-    },
     "array-includes": {
       "version": "3.1.5",
       "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.5.tgz",
@@ -2490,38 +2092,11 @@
         "es-shim-unscopables": "^1.0.0"
       }
     },
-    "array.prototype.flatmap": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.0.tgz",
-      "integrity": "sha512-PZC9/8TKAIxcWKdyeb77EzULHPrIX/tIZebLJUQOMR1OwYosT8yggdfWScfTBCDj5utONvOuPQQumYsU2ULbkg==",
-      "dev": true,
-      "peer": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.2",
-        "es-shim-unscopables": "^1.0.0"
-      }
-    },
-    "ast-types-flow": {
-      "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.7.tgz",
-      "integrity": "sha512-eBvWn1lvIApYMhzQMsu9ciLfkBY499mFZlNqG+/9WR7PVlroQw0vG30cOQQbaKz3sCEc44TAOu2ykzqXSNnwag==",
-      "dev": true,
-      "peer": true
-    },
     "asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
       "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
     },
-    "axe-core": {
-      "version": "4.4.2",
-      "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.4.2.tgz",
-      "integrity": "sha512-LVAaGp/wkkgYJcjmHsoKx4juT1aQvJyPcW09MLCjVTh3V2cc6PnyempiLMNH5iMdfIX/zdbjUx2KDjMLCTdPeA==",
-      "dev": true,
-      "peer": true
-    },
     "axios": {
       "version": "0.27.2",
       "resolved": "https://registry.npmjs.org/axios/-/axios-0.27.2.tgz",
@@ -2531,13 +2106,6 @@
         "form-data": "^4.0.0"
       }
     },
-    "axobject-query": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.2.0.tgz",
-      "integrity": "sha512-Td525n+iPOOyUQIeBfcASuG6uJsDOITl7Mds5gFyerkWiX7qhUTdYUBlSgNMyVqtSJqwpt1kXGLdUt6SykLMRA==",
-      "dev": true,
-      "peer": true
-    },
     "balanced-match": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
@@ -2619,13 +2187,6 @@
       "integrity": "sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA==",
       "dev": true
     },
-    "core-js-pure": {
-      "version": "3.22.8",
-      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.22.8.tgz",
-      "integrity": "sha512-bOxbZIy9S5n4OVH63XaLVXZ49QKicjowDx/UELyJ68vxfCRpYsbyh/WNZNfEfAk+ekA8vSjt+gCDpvh672bc3w==",
-      "dev": true,
-      "peer": true
-    },
     "cross-spawn": {
       "version": "7.0.3",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
@@ -2637,13 +2198,6 @@
         "which": "^2.0.1"
       }
     },
-    "damerau-levenshtein": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz",
-      "integrity": "sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA==",
-      "dev": true,
-      "peer": true
-    },
     "debug": {
       "version": "4.3.4",
       "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
@@ -2682,13 +2236,6 @@
         "esutils": "^2.0.2"
       }
     },
-    "emoji-regex": {
-      "version": "9.2.2",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
-      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
-      "dev": true,
-      "peer": true
-    },
     "es-abstract": {
       "version": "1.20.1",
       "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.1.tgz",
@@ -2787,17 +2334,6 @@
         "v8-compile-cache": "^2.0.3"
       }
     },
-    "eslint-config-airbnb": {
-      "version": "19.0.4",
-      "resolved": "https://registry.npmjs.org/eslint-config-airbnb/-/eslint-config-airbnb-19.0.4.tgz",
-      "integrity": "sha512-T75QYQVQX57jiNgpF9r1KegMICE94VYwoFQyMGhrvc+lB8YF2E/M/PYDaQe1AJcWaEgqLE+ErXV1Og/+6Vyzew==",
-      "dev": true,
-      "requires": {
-        "eslint-config-airbnb-base": "^15.0.0",
-        "object.assign": "^4.1.2",
-        "object.entries": "^1.1.5"
-      }
-    },
     "eslint-config-airbnb-base": {
       "version": "15.0.0",
       "resolved": "https://registry.npmjs.org/eslint-config-airbnb-base/-/eslint-config-airbnb-base-15.0.0.tgz",
@@ -2899,81 +2435,6 @@
         }
       }
     },
-    "eslint-plugin-jsx-a11y": {
-      "version": "6.5.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.5.1.tgz",
-      "integrity": "sha512-sVCFKX9fllURnXT2JwLN5Qgo24Ug5NF6dxhkmxsMEUZhXRcGg+X3e1JbJ84YePQKBl5E0ZjAH5Q4rkdcGY99+g==",
-      "dev": true,
-      "peer": true,
-      "requires": {
-        "@babel/runtime": "^7.16.3",
-        "aria-query": "^4.2.2",
-        "array-includes": "^3.1.4",
-        "ast-types-flow": "^0.0.7",
-        "axe-core": "^4.3.5",
-        "axobject-query": "^2.2.0",
-        "damerau-levenshtein": "^1.0.7",
-        "emoji-regex": "^9.2.2",
-        "has": "^1.0.3",
-        "jsx-ast-utils": "^3.2.1",
-        "language-tags": "^1.0.5",
-        "minimatch": "^3.0.4"
-      }
-    },
-    "eslint-plugin-react": {
-      "version": "7.30.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.30.0.tgz",
-      "integrity": "sha512-RgwH7hjW48BleKsYyHK5vUAvxtE9SMPDKmcPRQgtRCYaZA0XQPt5FSkrU3nhz5ifzMZcA8opwmRJ2cmOO8tr5A==",
-      "dev": true,
-      "peer": true,
-      "requires": {
-        "array-includes": "^3.1.5",
-        "array.prototype.flatmap": "^1.3.0",
-        "doctrine": "^2.1.0",
-        "estraverse": "^5.3.0",
-        "jsx-ast-utils": "^2.4.1 || ^3.0.0",
-        "minimatch": "^3.1.2",
-        "object.entries": "^1.1.5",
-        "object.fromentries": "^2.0.5",
-        "object.hasown": "^1.1.1",
-        "object.values": "^1.1.5",
-        "prop-types": "^15.8.1",
-        "resolve": "^2.0.0-next.3",
-        "semver": "^6.3.0",
-        "string.prototype.matchall": "^4.0.7"
-      },
-      "dependencies": {
-        "doctrine": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
-          "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
-          "dev": true,
-          "peer": true,
-          "requires": {
-            "esutils": "^2.0.2"
-          }
-        },
-        "resolve": {
-          "version": "2.0.0-next.3",
-          "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.3.tgz",
-          "integrity": "sha512-W8LucSynKUIDu9ylraa7ueVZ7hc0uAgJBxVsQSKOXOyle8a93qXhcz+XAXZ8bIq2d6i4Ehddn6Evt+0/UwKk6Q==",
-          "dev": true,
-          "peer": true,
-          "requires": {
-            "is-core-module": "^2.2.0",
-            "path-parse": "^1.0.6"
-          }
-        }
-      }
-    },
-    "eslint-plugin-react-hooks": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.5.0.tgz",
-      "integrity": "sha512-8k1gRt7D7h03kd+SAAlzXkQwWK22BnK6GKZG+FJA6BAGy22CFvl8kCIXKpVux0cCxMWDQUPqSok0LKaZ0aOcCw==",
-      "dev": true,
-      "peer": true,
-      "requires": {}
-    },
     "eslint-plugin-sort-exports": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/eslint-plugin-sort-exports/-/eslint-plugin-sort-exports-0.6.0.tgz",
@@ -3413,13 +2874,6 @@
       "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
       "dev": true
     },
-    "js-tokens": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-      "dev": true,
-      "peer": true
-    },
     "js-yaml": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
@@ -3450,34 +2904,6 @@
         "minimist": "^1.2.0"
       }
     },
-    "jsx-ast-utils": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.0.tgz",
-      "integrity": "sha512-XzO9luP6L0xkxwhIJMTJQpZo/eeN60K08jHdexfD569AGxeNug6UketeHXEhROoM8aR7EcUoOQmIhcJQjcuq8Q==",
-      "dev": true,
-      "peer": true,
-      "requires": {
-        "array-includes": "^3.1.4",
-        "object.assign": "^4.1.2"
-      }
-    },
-    "language-subtag-registry": {
-      "version": "0.3.21",
-      "resolved": "https://registry.npmjs.org/language-subtag-registry/-/language-subtag-registry-0.3.21.tgz",
-      "integrity": "sha512-L0IqwlIXjilBVVYKFT37X9Ih11Um5NEl9cbJIuU/SwP/zEEAbBPOnEeeuxVMf45ydWQRDQN3Nqc96OgbH1K+Pg==",
-      "dev": true,
-      "peer": true
-    },
-    "language-tags": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/language-tags/-/language-tags-1.0.5.tgz",
-      "integrity": "sha512-qJhlO9cGXi6hBGKoxEG/sKZDAHD5Hnu9Hs4WbOY3pCWXDhw0N8x1NenNzm2EnNLkLkk7J2SdxAkDSbb6ftT+UQ==",
-      "dev": true,
-      "peer": true,
-      "requires": {
-        "language-subtag-registry": "~0.3.2"
-      }
-    },
     "levn": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
@@ -3504,16 +2930,6 @@
       "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
       "dev": true
     },
-    "loose-envify": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
-      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
-      "dev": true,
-      "peer": true,
-      "requires": {
-        "js-tokens": "^3.0.0 || ^4.0.0"
-      }
-    },
     "mime-db": {
       "version": "1.52.0",
       "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
@@ -3559,13 +2975,6 @@
       "resolved": "https://registry.npmjs.org/node-persist/-/node-persist-3.1.0.tgz",
       "integrity": "sha512-/j+fd/u71wNgKf3V2bx4tnDm+3GvLnlCuvf2MXbJ3wern+67IAb6zN9Leu1tCWPlPNZ+v1hLSibVukkPK2HqJw=="
     },
-    "object-assign": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
-      "dev": true,
-      "peer": true
-    },
     "object-inspect": {
       "version": "1.12.2",
       "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz",
@@ -3598,29 +3007,6 @@
         "es-abstract": "^1.19.1"
       }
     },
-    "object.fromentries": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.5.tgz",
-      "integrity": "sha512-CAyG5mWQRRiBU57Re4FKoTBjXfDoNwdFVH2Y1tS9PqCsfUTymAohOkEMSG3aRNKmv4lV3O7p1et7c187q6bynw==",
-      "dev": true,
-      "peer": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.1"
-      }
-    },
-    "object.hasown": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object.hasown/-/object.hasown-1.1.1.tgz",
-      "integrity": "sha512-LYLe4tivNQzq4JdaWW6WO3HMZZJWzkkH8fnI6EebWl0VZth2wL2Lovm74ep2/gZzlaTdV62JZHEqHQ2yVn8Q/A==",
-      "dev": true,
-      "peer": true,
-      "requires": {
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.19.5"
-      }
-    },
     "object.values": {
       "version": "1.1.5",
       "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.5.tgz",
@@ -3752,38 +3138,12 @@
       "resolved": "https://registry.npmjs.org/promised-map/-/promised-map-1.0.0.tgz",
       "integrity": "sha512-fP9VSMgcml+U2uJ9PBc4/LDQ3ZkJCH4blLNCS6gbH7RHyRZCYs91zxWHqiUy+heFiEMiB2op/qllYoFqmIqdWA=="
     },
-    "prop-types": {
-      "version": "15.8.1",
-      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
-      "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
-      "dev": true,
-      "peer": true,
-      "requires": {
-        "loose-envify": "^1.4.0",
-        "object-assign": "^4.1.1",
-        "react-is": "^16.13.1"
-      }
-    },
     "punycode": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
       "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
       "dev": true
     },
-    "react-is": {
-      "version": "16.13.1",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
-      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
-      "dev": true,
-      "peer": true
-    },
-    "regenerator-runtime": {
-      "version": "0.13.9",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",
-      "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==",
-      "dev": true,
-      "peer": true
-    },
     "regexp.prototype.flags": {
       "version": "1.4.3",
       "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
@@ -3857,23 +3217,6 @@
         "object-inspect": "^1.9.0"
       }
     },
-    "string.prototype.matchall": {
-      "version": "4.0.7",
-      "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.7.tgz",
-      "integrity": "sha512-f48okCX7JiwVi1NXCVWcFnZgADDC/n2vePlQ/KUCNqCikLLilQvwjMO8+BHVKvgzH0JB0J9LEPgxOGT02RoETg==",
-      "dev": true,
-      "peer": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.1",
-        "get-intrinsic": "^1.1.1",
-        "has-symbols": "^1.0.3",
-        "internal-slot": "^1.0.3",
-        "regexp.prototype.flags": "^1.4.1",
-        "side-channel": "^1.0.4"
-      }
-    },
     "string.prototype.trimend": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz",
@@ -3906,7 +3249,7 @@
     "strip-bom": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-      "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
+      "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
       "dev": true
     },
     "strip-json-comments": {
@@ -3933,7 +3276,7 @@
     "text-table": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
+      "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
       "dev": true
     },
     "tsconfig-paths": {
@@ -4030,13 +3373,13 @@
     "wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
       "dev": true
     },
     "ws": {
-      "version": "8.7.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.7.0.tgz",
-      "integrity": "sha512-c2gsP0PRwcLFzUiA8Mkr37/MI7ilIlHQxaEAtd0uNMbVMoy8puJyafRlm0bV9MbGSabUPeLrRRaqIBcFcA2Pqg==",
+      "version": "8.8.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.8.0.tgz",
+      "integrity": "sha512-JDAgSYQ1ksuwqfChJusw1LSJ8BizJ2e/vVu5Lxjq3YvNJNlROv1ui4i+c/kUUrPheBvQl4c5UbERhTwKa6QBJQ==",
       "requires": {}
     }
   }
diff --git a/package.json b/package.json
index 6b2abb24..78873a49 100644
--- a/package.json
+++ b/package.json
@@ -64,11 +64,11 @@
     "node-persist": "^3.1.0",
     "p-queue": "^7.2.0",
     "websocket-as-promised": "^2.0.1",
-    "ws": "^8.7.0"
+    "ws": "^8.8.0"
   },
   "devDependencies": {
     "eslint": "^8.17.0",
-    "eslint-config-airbnb": "^19.0.4",
+    "eslint-config-airbnb-base": "^15.0.0",
     "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-sort-exports": "^0.6.0"
   }

From 12e82641964bfc01d8eaa617f21d5b336a11e618 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 22 Jun 2022 22:18:44 +0100
Subject: [PATCH 3007/3183] deps

---
 package-lock.json | 30 +++++++++++++++---------------
 package.json      |  2 +-
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 52cea32c..3ba7dadc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -35,7 +35,7 @@
         "ws": "^8.8.0"
       },
       "devDependencies": {
-        "eslint": "^8.17.0",
+        "eslint": "^8.18.0",
         "eslint-config-airbnb-base": "^15.0.0",
         "eslint-plugin-import": "^2.26.0",
         "eslint-plugin-sort-exports": "^0.6.0"
@@ -459,9 +459,9 @@
       }
     },
     "node_modules/eslint": {
-      "version": "8.17.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.17.0.tgz",
-      "integrity": "sha512-gq0m0BTJfci60Fz4nczYxNAlED+sMcihltndR8t9t1evnU/azx53x3t2UHXC/uRjcbvRw/XctpaNygSTcQD+Iw==",
+      "version": "8.18.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.18.0.tgz",
+      "integrity": "sha512-As1EfFMVk7Xc6/CvhssHUjsAQSkpfXvUGMFC3ce8JDe6WvqCgRrLOBQbVpsBFr1X1V+RACOadnzVvcUS5ni2bA==",
       "dev": true,
       "dependencies": {
         "@eslint/eslintrc": "^1.3.0",
@@ -1658,12 +1658,12 @@
       }
     },
     "node_modules/resolve": {
-      "version": "1.22.0",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz",
-      "integrity": "sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==",
+      "version": "1.22.1",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz",
+      "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==",
       "dev": true,
       "dependencies": {
-        "is-core-module": "^2.8.1",
+        "is-core-module": "^2.9.0",
         "path-parse": "^1.0.7",
         "supports-preserve-symlinks-flag": "^1.0.0"
       },
@@ -2292,9 +2292,9 @@
       "dev": true
     },
     "eslint": {
-      "version": "8.17.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.17.0.tgz",
-      "integrity": "sha512-gq0m0BTJfci60Fz4nczYxNAlED+sMcihltndR8t9t1evnU/azx53x3t2UHXC/uRjcbvRw/XctpaNygSTcQD+Iw==",
+      "version": "8.18.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.18.0.tgz",
+      "integrity": "sha512-As1EfFMVk7Xc6/CvhssHUjsAQSkpfXvUGMFC3ce8JDe6WvqCgRrLOBQbVpsBFr1X1V+RACOadnzVvcUS5ni2bA==",
       "dev": true,
       "requires": {
         "@eslint/eslintrc": "^1.3.0",
@@ -3161,12 +3161,12 @@
       "dev": true
     },
     "resolve": {
-      "version": "1.22.0",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz",
-      "integrity": "sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==",
+      "version": "1.22.1",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz",
+      "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==",
       "dev": true,
       "requires": {
-        "is-core-module": "^2.8.1",
+        "is-core-module": "^2.9.0",
         "path-parse": "^1.0.7",
         "supports-preserve-symlinks-flag": "^1.0.0"
       }
diff --git a/package.json b/package.json
index 78873a49..b5c48f5c 100644
--- a/package.json
+++ b/package.json
@@ -67,7 +67,7 @@
     "ws": "^8.8.0"
   },
   "devDependencies": {
-    "eslint": "^8.17.0",
+    "eslint": "^8.18.0",
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-sort-exports": "^0.6.0"

From 7ff1cf7a8e6f357ae228f242157d333e31707f2c Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 26 Jun 2022 16:01:01 +0100
Subject: [PATCH 3008/3183] deps etc

---
 .eslintrc.cjs           |  7 +++++--
 config.schema.json      | 16 +++++++++++-----
 lib/device/rf-bridge.js | 26 ++++++++++++++++++++++++++
 lib/platform.js         |  7 +++++++
 lib/utils/constants.js  |  1 +
 package-lock.json       | 23 +++++++++++++++++++++++
 package.json            |  5 +++--
 7 files changed, 76 insertions(+), 9 deletions(-)

diff --git a/.eslintrc.cjs b/.eslintrc.cjs
index 5c991ca8..fdc313a1 100644
--- a/.eslintrc.cjs
+++ b/.eslintrc.cjs
@@ -6,19 +6,22 @@ module.exports = {
   extends: ['airbnb-base'],
   ignorePatterns: ['lib/node-dns-sd/*'],
   parserOptions: {
-    ecmaVersion: 'latest',
+    ecmaVersion: 13,
     sourceType: 'module',
   },
-  plugins: ['import', 'sort-exports'],
+  plugins: ['import', 'import-newlines', 'sort-exports'],
   rules: {
     camelcase: 'off',
     'import/extensions': ['error',  { js: 'always', json: 'always' }],
     'import/order': ['warn', { alphabetize: { order: 'asc' } }],
+    'import-newlines/enforce': ['error', 3],
+    indent: ['error', 2, { SwitchCase: 1 }],
     'max-len': 'off',
     'new-cap': 0,
     quotes: ['error', 'single'],
     'no-multiple-empty-lines': ['error', { max: 1, maxBOF: 1, maxEOF: 0 }],
     'no-param-reassign': 0,
     'sort-exports/sort-exports': ['warn', { sortDir: 'asc' }],
+    'sort-imports': ['warn', { ignoreDeclarationSort: true }],
   },
 };
diff --git a/config.schema.json b/config.schema.json
index b456b69d..94831b73 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -1669,6 +1669,15 @@
                 "functionBody": "return (model.bridgeSensors && model.bridgeSensors[arrayIndices] && model.bridgeSensors[arrayIndices].type && model.bridgeSensors[arrayIndices].deviceType === 'sensor' && ['motion', 'smoke', 'water', 'co', 'co2', 'occupancy', 'contact'].includes(model.bridgeSensors[arrayIndices].type));"
               }
             },
+            "sensorWebHook": {
+              "type": "string",
+              "title": "Sensor Web Hook",
+              "description": "A URL for the plugin to ping when the sensor is activated.",
+              "placeholder": "http://192.168.1.1/endpoint",
+              "condition": {
+                "functionBody": "return (model.bridgeSensors && model.bridgeSensors[arrayIndices] && model.bridgeSensors[arrayIndices].type && model.bridgeSensors[arrayIndices].deviceType === 'sensor' && ['motion', 'smoke', 'water', 'co', 'co2', 'occupancy', 'contact', 'p_button', 'doorbell'].includes(model.bridgeSensors[arrayIndices].type));"
+              }
+            },
             "overrideLogging": {
               "type": "string",
               "title": "Override Logging Setting",
@@ -1935,11 +1944,8 @@
             "bridgeSensors[].type",
             "bridgeSensors[].sensorTimeLength",
             "bridgeSensors[].sensorTimeDifference",
-            "bridgeSensors[].overrideLogging",
-            {
-              "type": "help",
-              "helpvalue": "<label class=\"control-label text-warning\">⚠ Any changes you make to a sensor will reset its connected RF Bridge, resetting all its devices' HomeKit names, room associations and automations.</label>"
-            }
+            "bridgeSensors[].sensorWebHook",
+            "bridgeSensors[].overrideLogging"
           ]
         }
       ]
diff --git a/lib/device/rf-bridge.js b/lib/device/rf-bridge.js
index 2881c48b..cf068cc9 100644
--- a/lib/device/rf-bridge.js
+++ b/lib/device/rf-bridge.js
@@ -1,3 +1,4 @@
+import axios from 'axios';
 import platformConsts from '../utils/constants.js';
 import { hasProperty, parseError, sleep } from '../utils/functions.js';
 
@@ -256,6 +257,31 @@ export default class {
                     );
                   }
 
+                  // Call any webhook that is defined in the config
+                  if (deviceConf.sensorWebHook) {
+                    try {
+                      await axios.get(deviceConf.sensorWebHook, {
+                        timeout: 5000,
+                      });
+                      if (enableLogging) {
+                        this.log(
+                          '[%s] %s %s.',
+                          subAccessory.displayName,
+                          'http webhook request successful',
+                        );
+                      }
+                    } catch (e) {
+                      if (enableLogging) {
+                        this.log(
+                          '[%s] %s %s.',
+                          subAccessory.displayName,
+                          'http webhook request failed as',
+                          e.message,
+                        );
+                      }
+                    }
+                  }
+
                   const updateKey = Math.random()
                     .toString(36)
                     .substr(2, 8);
diff --git a/lib/platform.js b/lib/platform.js
index 85727865..d9bf6624 100644
--- a/lib/platform.js
+++ b/lib/platform.js
@@ -193,6 +193,13 @@ export default class {
                     }
                     break;
                   }
+                  case 'sensorWebHook':
+                    if (typeof v !== 'string' || v === '') {
+                      logIgnore(`${key}.${id}.${k}`);
+                    } else {
+                      this.rfSubdevices[id][k] = v;
+                    }
+                    break;
                   default:
                     logRemove(`${key}.${id}.${k}`);
                     break;
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 1803643c..c24623f3 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -44,6 +44,7 @@ export default {
     overrideLogging: 'default',
     sensorTimeDifference: 60,
     sensorTimeLength: 60,
+    sensorWebHook: '',
     showAs: 'default',
     showAsMotor: 'blind',
     targetTempThreshold: 0,
diff --git a/package-lock.json b/package-lock.json
index 3ba7dadc..c7346fb7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -38,6 +38,7 @@
         "eslint": "^8.18.0",
         "eslint-config-airbnb-base": "^15.0.0",
         "eslint-plugin-import": "^2.26.0",
+        "eslint-plugin-import-newlines": "^1.2.2",
         "eslint-plugin-sort-exports": "^0.6.0"
       },
       "engines": {
@@ -597,6 +598,21 @@
         "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8"
       }
     },
+    "node_modules/eslint-plugin-import-newlines": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import-newlines/-/eslint-plugin-import-newlines-1.2.2.tgz",
+      "integrity": "sha512-SoKiFtSW/+dHsla/qzijU/RP+i8CNhYHuzfGelFf4SLpz+bzcshur6Qy7uzMow4sBg5HquAYOf/yGTKZMrbVcg==",
+      "dev": true,
+      "bin": {
+        "import-linter": "lib/index.js"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      },
+      "peerDependencies": {
+        "eslint": ">=6.0.0"
+      }
+    },
     "node_modules/eslint-plugin-import/node_modules/debug": {
       "version": "2.6.9",
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
@@ -2435,6 +2451,13 @@
         }
       }
     },
+    "eslint-plugin-import-newlines": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import-newlines/-/eslint-plugin-import-newlines-1.2.2.tgz",
+      "integrity": "sha512-SoKiFtSW/+dHsla/qzijU/RP+i8CNhYHuzfGelFf4SLpz+bzcshur6Qy7uzMow4sBg5HquAYOf/yGTKZMrbVcg==",
+      "dev": true,
+      "requires": {}
+    },
     "eslint-plugin-sort-exports": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/eslint-plugin-sort-exports/-/eslint-plugin-sort-exports-0.6.0.tgz",
diff --git a/package.json b/package.json
index b5c48f5c..23a4af5b 100644
--- a/package.json
+++ b/package.json
@@ -67,9 +67,10 @@
     "ws": "^8.8.0"
   },
   "devDependencies": {
-    "eslint": "^8.18.0",
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-plugin-import": "^2.26.0",
-    "eslint-plugin-sort-exports": "^0.6.0"
+    "eslint-plugin-import-newlines": "^1.2.2",
+    "eslint-plugin-sort-exports": "^0.6.0",
+    "eslint": "^8.18.0"
   }
 }

From 4af0bfebd78502eaf9c6cc23fb9c7e7804f46b8e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 26 Jun 2022 16:03:05 +0100
Subject: [PATCH 3009/3183] 9.0.2-beta.0

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c7346fb7..ab54aa4b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "9.0.1",
+  "version": "9.0.2-beta.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "9.0.1",
+      "version": "9.0.2-beta.0",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 23a4af5b..ee350d02 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "9.0.1",
+  "version": "9.0.2-beta.0",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From baf123d94340693668dd49913b2dd39202688d48 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 26 Jun 2022 16:33:17 +0100
Subject: [PATCH 3010/3183] Update rf-bridge.js

---
 lib/device/rf-bridge.js | 48 ++++++++++++++++++++---------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/lib/device/rf-bridge.js b/lib/device/rf-bridge.js
index cf068cc9..da71d907 100644
--- a/lib/device/rf-bridge.js
+++ b/lib/device/rf-bridge.js
@@ -233,30 +233,6 @@ export default class {
                     }
                   }
 
-                  // Programmable button and doorbell activate differently
-                  if (char === this.hapChar.ProgrammableSwitchEvent) {
-                    subAccessory.getService(serv).updateCharacteristic(char, 0);
-                    if (params.updateSource && enableLogging) {
-                      this.log(
-                        '[%s] %s [%s].',
-                        subAccessory.displayName,
-                        this.lang.curState,
-                        this.lang.buttonSingle,
-                      );
-                    }
-                    return;
-                  }
-                  subAccessory.getService(serv).updateCharacteristic(char, 1);
-                  subAccessory.eveService.addEntry({ status: 1 });
-                  if (params.updateSource && enableLogging) {
-                    this.log(
-                      '[%s] %s [%s].',
-                      subAccessory.displayName,
-                      this.lang.curState,
-                      this.lang.rfTrigYes,
-                    );
-                  }
-
                   // Call any webhook that is defined in the config
                   if (deviceConf.sensorWebHook) {
                     try {
@@ -282,6 +258,30 @@ export default class {
                     }
                   }
 
+                  // Programmable button and doorbell activate differently
+                  if (char === this.hapChar.ProgrammableSwitchEvent) {
+                    subAccessory.getService(serv).updateCharacteristic(char, 0);
+                    if (params.updateSource && enableLogging) {
+                      this.log(
+                        '[%s] %s [%s].',
+                        subAccessory.displayName,
+                        this.lang.curState,
+                        this.lang.buttonSingle,
+                      );
+                    }
+                    return;
+                  }
+                  subAccessory.getService(serv).updateCharacteristic(char, 1);
+                  subAccessory.eveService.addEntry({ status: 1 });
+                  if (params.updateSource && enableLogging) {
+                    this.log(
+                      '[%s] %s [%s].',
+                      subAccessory.displayName,
+                      this.lang.curState,
+                      this.lang.rfTrigYes,
+                    );
+                  }
+
                   const updateKey = Math.random()
                     .toString(36)
                     .substr(2, 8);

From ea9ee3d2a1f9ed302464d98d111fa01463185a12 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 26 Jun 2022 16:33:46 +0100
Subject: [PATCH 3011/3183] 9.0.2-beta.1

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ab54aa4b..736d5e2c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "9.0.2-beta.0",
+  "version": "9.0.2-beta.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "9.0.2-beta.0",
+      "version": "9.0.2-beta.1",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index ee350d02..0480580b 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "9.0.2-beta.0",
+  "version": "9.0.2-beta.1",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From 2496893d8ced052b98364ec3c7c9dba985209ac5 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 26 Jun 2022 16:46:07 +0100
Subject: [PATCH 3012/3183] Update rf-bridge.js

---
 lib/device/rf-bridge.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/device/rf-bridge.js b/lib/device/rf-bridge.js
index da71d907..0d14e6be 100644
--- a/lib/device/rf-bridge.js
+++ b/lib/device/rf-bridge.js
@@ -241,9 +241,10 @@ export default class {
                       });
                       if (enableLogging) {
                         this.log(
-                          '[%s] %s %s.',
+                          '[%s] %s [GET %s].',
                           subAccessory.displayName,
                           'http webhook request successful',
+                          deviceConf.sensorWebHook,
                         );
                       }
                     } catch (e) {

From 9620083d9983e4734a9f808046843f9a4eedc8b2 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 26 Jun 2022 16:46:28 +0100
Subject: [PATCH 3013/3183] 9.0.2-beta.2

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 736d5e2c..090333d6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "9.0.2-beta.1",
+  "version": "9.0.2-beta.2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "9.0.2-beta.1",
+      "version": "9.0.2-beta.2",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 0480580b..b282a92b 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "9.0.2-beta.1",
+  "version": "9.0.2-beta.2",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From 6bec51313c3d03124657261b76fba667a014a8c7 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 29 Jun 2022 08:25:55 +0100
Subject: [PATCH 3014/3183] test support TH Elite

---
 lib/utils/constants.js |  4 +++-
 package-lock.json      | 12 ++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index c24623f3..627cea36 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -285,6 +285,7 @@ export default {
       161,
       162,
       165,
+      181,
       182,
     ],
     switchSingle: [1, 6, 14, 24, 27, 1009, 1256, 7004],
@@ -324,7 +325,7 @@ export default {
     lightRGBCCT: [33, 59, 104, 136, 137],
     curtain: [11, 67],
     sensorContact: [102],
-    sensorAmbient: [15],
+    sensorAmbient: [15, 181],
     sensorTempHumi: [18],
     thermostat: [127],
     panel: [133],
@@ -475,6 +476,7 @@ export default {
     162: 3, // "SwitchMan Smart Wall Switch-M5 - 3 Gang"
     165: 2, // "DUALR3 Lite"
     177: 1, // Switch Mate
+    181: 1, // "Sonoff TH Elite THR316D"
     182: 1, // Power Detection Plug Overload Alarm-Multi-Channel Protocols (S40)
     1000: 1, // "zigbee_ON_OFF_SWITCH_1000" (button device)
     1009: 1, // "" (Some sort of single switch device)
diff --git a/package-lock.json b/package-lock.json
index 090333d6..e1748515 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -815,9 +815,9 @@
       }
     },
     "node_modules/flatted": {
-      "version": "3.2.5",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.5.tgz",
-      "integrity": "sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg==",
+      "version": "3.2.6",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.6.tgz",
+      "integrity": "sha512-0sQoMh9s0BYsm+12Huy/rkKxVu4R1+r96YX5cG44rHV0pQ6iC3Q+mkoMFaGWObMFYQxCVT+ssG1ksneA2MI9KQ==",
       "dev": true
     },
     "node_modules/follow-redirects": {
@@ -2591,9 +2591,9 @@
       }
     },
     "flatted": {
-      "version": "3.2.5",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.5.tgz",
-      "integrity": "sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg==",
+      "version": "3.2.6",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.6.tgz",
+      "integrity": "sha512-0sQoMh9s0BYsm+12Huy/rkKxVu4R1+r96YX5cG44rHV0pQ6iC3Q+mkoMFaGWObMFYQxCVT+ssG1ksneA2MI9KQ==",
       "dev": true
     },
     "follow-redirects": {

From e2d4827c42d717e679da458a5bd9f6f19ad45a24 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 29 Jun 2022 08:26:18 +0100
Subject: [PATCH 3015/3183] 9.0.2-beta.3

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index e1748515..d63b4e22 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "9.0.2-beta.2",
+  "version": "9.0.2-beta.3",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "9.0.2-beta.2",
+      "version": "9.0.2-beta.3",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index b282a92b..9af533f9 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "9.0.2-beta.2",
+  "version": "9.0.2-beta.3",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From d4d1fd9e38fc4f930231d35ea5db597b15e214e0 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 6 Jul 2022 08:34:06 +0100
Subject: [PATCH 3016/3183] package updates

---
 lib/utils/constants.js |  4 ++--
 package-lock.json      | 40 ++++++++++++++++++++--------------------
 package.json           |  4 ++--
 3 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 627cea36..0ed32f6a 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -65,9 +65,9 @@ export default {
     targetTempThreshold: 0,
   },
 
-  appId: 'oeVkj2lYFGnJu5XUtWisfW4utiN4u9Mq',
+  appId: 'R8Oq3y0eSZSYdKccHlrQzT1ACCOUT9Gv',
 
-  appSecret: '6Nz4n0xA8s8qdxQf2GqurZj2Fs55FUvM',
+  appSecret: '1ve5Qk9GXfUhKAn1svnKwpAlxXkMarru',
 
   httpRetryCodes: ['ENOTFOUND', 'ETIMEDOUT', 'EAI_AGAIN', 'ECONNABORTED'],
 
diff --git a/package-lock.json b/package-lock.json
index d63b4e22..c9e53e0c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -35,10 +35,10 @@
         "ws": "^8.8.0"
       },
       "devDependencies": {
-        "eslint": "^8.18.0",
+        "eslint": "^8.19.0",
         "eslint-config-airbnb-base": "^15.0.0",
         "eslint-plugin-import": "^2.26.0",
-        "eslint-plugin-import-newlines": "^1.2.2",
+        "eslint-plugin-import-newlines": "^1.2.3",
         "eslint-plugin-sort-exports": "^0.6.0"
       },
       "engines": {
@@ -460,9 +460,9 @@
       }
     },
     "node_modules/eslint": {
-      "version": "8.18.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.18.0.tgz",
-      "integrity": "sha512-As1EfFMVk7Xc6/CvhssHUjsAQSkpfXvUGMFC3ce8JDe6WvqCgRrLOBQbVpsBFr1X1V+RACOadnzVvcUS5ni2bA==",
+      "version": "8.19.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.19.0.tgz",
+      "integrity": "sha512-SXOPj3x9VKvPe81TjjUJCYlV4oJjQw68Uek+AM0X4p+33dj2HY5bpTZOgnQHcG2eAm1mtCU9uNMnJi7exU/kYw==",
       "dev": true,
       "dependencies": {
         "@eslint/eslintrc": "^1.3.0",
@@ -599,9 +599,9 @@
       }
     },
     "node_modules/eslint-plugin-import-newlines": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import-newlines/-/eslint-plugin-import-newlines-1.2.2.tgz",
-      "integrity": "sha512-SoKiFtSW/+dHsla/qzijU/RP+i8CNhYHuzfGelFf4SLpz+bzcshur6Qy7uzMow4sBg5HquAYOf/yGTKZMrbVcg==",
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import-newlines/-/eslint-plugin-import-newlines-1.2.3.tgz",
+      "integrity": "sha512-UQBhG7dcIoBjaPjbcudqqcKYQVhYXnu9NBB7d8pBnDFZP4GTNPdszpeUbvSxcp/JyBE4TsUZt5u/UtEVioxh9g==",
       "dev": true,
       "bin": {
         "import-linter": "lib/index.js"
@@ -955,9 +955,9 @@
       }
     },
     "node_modules/globals": {
-      "version": "13.15.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.15.0.tgz",
-      "integrity": "sha512-bpzcOlgDhMG070Av0Vy5Owklpv1I6+j96GhUI7Rh7IzDCKLzboflLrrfqMu8NquDbiR4EOQk7XzJwqVJxicxog==",
+      "version": "13.16.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.16.0.tgz",
+      "integrity": "sha512-A1lrQfpNF+McdPOnnFqY3kSN0AFTy485bTi1bkLk4mVPODIUEcSfhHgRqA+QdXPksrSTTztYXx37NFV+GpGk3Q==",
       "dev": true,
       "dependencies": {
         "type-fest": "^0.20.2"
@@ -2308,9 +2308,9 @@
       "dev": true
     },
     "eslint": {
-      "version": "8.18.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.18.0.tgz",
-      "integrity": "sha512-As1EfFMVk7Xc6/CvhssHUjsAQSkpfXvUGMFC3ce8JDe6WvqCgRrLOBQbVpsBFr1X1V+RACOadnzVvcUS5ni2bA==",
+      "version": "8.19.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.19.0.tgz",
+      "integrity": "sha512-SXOPj3x9VKvPe81TjjUJCYlV4oJjQw68Uek+AM0X4p+33dj2HY5bpTZOgnQHcG2eAm1mtCU9uNMnJi7exU/kYw==",
       "dev": true,
       "requires": {
         "@eslint/eslintrc": "^1.3.0",
@@ -2452,9 +2452,9 @@
       }
     },
     "eslint-plugin-import-newlines": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import-newlines/-/eslint-plugin-import-newlines-1.2.2.tgz",
-      "integrity": "sha512-SoKiFtSW/+dHsla/qzijU/RP+i8CNhYHuzfGelFf4SLpz+bzcshur6Qy7uzMow4sBg5HquAYOf/yGTKZMrbVcg==",
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import-newlines/-/eslint-plugin-import-newlines-1.2.3.tgz",
+      "integrity": "sha512-UQBhG7dcIoBjaPjbcudqqcKYQVhYXnu9NBB7d8pBnDFZP4GTNPdszpeUbvSxcp/JyBE4TsUZt5u/UtEVioxh9g==",
       "dev": true,
       "requires": {}
     },
@@ -2687,9 +2687,9 @@
       }
     },
     "globals": {
-      "version": "13.15.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.15.0.tgz",
-      "integrity": "sha512-bpzcOlgDhMG070Av0Vy5Owklpv1I6+j96GhUI7Rh7IzDCKLzboflLrrfqMu8NquDbiR4EOQk7XzJwqVJxicxog==",
+      "version": "13.16.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.16.0.tgz",
+      "integrity": "sha512-A1lrQfpNF+McdPOnnFqY3kSN0AFTy485bTi1bkLk4mVPODIUEcSfhHgRqA+QdXPksrSTTztYXx37NFV+GpGk3Q==",
       "dev": true,
       "requires": {
         "type-fest": "^0.20.2"
diff --git a/package.json b/package.json
index 9af533f9..2781fd44 100644
--- a/package.json
+++ b/package.json
@@ -69,8 +69,8 @@
   "devDependencies": {
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-plugin-import": "^2.26.0",
-    "eslint-plugin-import-newlines": "^1.2.2",
+    "eslint-plugin-import-newlines": "^1.2.3",
     "eslint-plugin-sort-exports": "^0.6.0",
-    "eslint": "^8.18.0"
+    "eslint": "^8.19.0"
   }
 }

From c43d53afb9ba150f6b29fbd81f17769d9df19cac Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Wed, 6 Jul 2022 08:34:51 +0100
Subject: [PATCH 3017/3183] 9.0.2-beta.4

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c9e53e0c..be34d545 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "9.0.2-beta.3",
+  "version": "9.0.2-beta.4",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "9.0.2-beta.3",
+      "version": "9.0.2-beta.4",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 2781fd44..bac63e7a 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "9.0.2-beta.3",
+  "version": "9.0.2-beta.4",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From ac86734d129babd93cf0dd7b6b0b8d3beb6ef0e3 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 7 Jul 2022 07:18:43 +0100
Subject: [PATCH 3018/3183] prep

---
 CHANGELOG.md      | 11 +++++++++--
 package-lock.json | 14 +++++++-------
 package.json      |  2 +-
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6f1f92de..df5122c6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,12 +2,19 @@
 
 All notable changes to homebridge-ewelink will be documented in this file.
 
-## BETA
+## 9.1.0 (2022-07-07)
+
+⚠️ This update may remove some devices from your Homebridge instance. Unfortunately this is out my control. See [this link](https://github.com/bwp91/homebridge-ewelink/issues/385#issuecomment-1176457283).
+
+### Added
+
+- Support for Sonoff TH Elite
 
 ### Changed
 
 - Bump `ws` to v8.8.0
-- 
+- Updated dev dependencies
+
 ## 9.0.1 (2022-06-08)
 
 ### Changed
diff --git a/package-lock.json b/package-lock.json
index be34d545..e3b7561c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -39,7 +39,7 @@
         "eslint-config-airbnb-base": "^15.0.0",
         "eslint-plugin-import": "^2.26.0",
         "eslint-plugin-import-newlines": "^1.2.3",
-        "eslint-plugin-sort-exports": "^0.6.0"
+        "eslint-plugin-sort-exports": "^0.7.0"
       },
       "engines": {
         "homebridge": "^1.4.0",
@@ -641,9 +641,9 @@
       "dev": true
     },
     "node_modules/eslint-plugin-sort-exports": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-sort-exports/-/eslint-plugin-sort-exports-0.6.0.tgz",
-      "integrity": "sha512-NMFUDPL6jVkTiGR698sv6nNEM/cA7CzSJaeIDdBnzkyj8ZYe7eFvcaxLSSSSouikQaxZQukVd74CIQ2sggbrtg==",
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-sort-exports/-/eslint-plugin-sort-exports-0.7.0.tgz",
+      "integrity": "sha512-z3mpCMUOF7qWq5L/9SbEvG3fcfpOJgaNTkYvjwacPBDa1F3Ow1Q/WA0apr3sKtKy+5zXb4XOych+ir3p+u+Xlg==",
       "dev": true,
       "peerDependencies": {
         "eslint": ">=5.0.0"
@@ -2459,9 +2459,9 @@
       "requires": {}
     },
     "eslint-plugin-sort-exports": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-sort-exports/-/eslint-plugin-sort-exports-0.6.0.tgz",
-      "integrity": "sha512-NMFUDPL6jVkTiGR698sv6nNEM/cA7CzSJaeIDdBnzkyj8ZYe7eFvcaxLSSSSouikQaxZQukVd74CIQ2sggbrtg==",
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-sort-exports/-/eslint-plugin-sort-exports-0.7.0.tgz",
+      "integrity": "sha512-z3mpCMUOF7qWq5L/9SbEvG3fcfpOJgaNTkYvjwacPBDa1F3Ow1Q/WA0apr3sKtKy+5zXb4XOych+ir3p+u+Xlg==",
       "dev": true,
       "requires": {}
     },
diff --git a/package.json b/package.json
index bac63e7a..44ba5a40 100644
--- a/package.json
+++ b/package.json
@@ -70,7 +70,7 @@
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-import-newlines": "^1.2.3",
-    "eslint-plugin-sort-exports": "^0.6.0",
+    "eslint-plugin-sort-exports": "^0.7.0",
     "eslint": "^8.19.0"
   }
 }

From b4d0e03b6770fb8bf885f337623b7c8994d3d135 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 7 Jul 2022 07:19:05 +0100
Subject: [PATCH 3019/3183] 9.1.0

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index e3b7561c..94ae95eb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "9.0.2-beta.4",
+  "version": "9.1.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "9.0.2-beta.4",
+      "version": "9.1.0",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 44ba5a40..ac846f97 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "9.0.2-beta.4",
+  "version": "9.1.0",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From 8d81b541f9a3db22ddb3bf25ba621a329f5ef807 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 7 Jul 2022 07:57:52 +0100
Subject: [PATCH 3020/3183] Update constants.js

---
 lib/utils/constants.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 0ed32f6a..205327f5 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -65,9 +65,9 @@ export default {
     targetTempThreshold: 0,
   },
 
-  appId: 'R8Oq3y0eSZSYdKccHlrQzT1ACCOUT9Gv',
+  appId: '4s1FXKC9FaGfoqXhmXSJneb3qcm1gOak',
 
-  appSecret: '1ve5Qk9GXfUhKAn1svnKwpAlxXkMarru',
+  appSecret: 'oKvCM06gvwkRbfetd6qWRrbC3rFrbIpV',
 
   httpRetryCodes: ['ENOTFOUND', 'ETIMEDOUT', 'EAI_AGAIN', 'ECONNABORTED'],
 

From 5d1b0f7551f2948c8c894c785c8f2bddf2b4c4b4 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 7 Jul 2022 07:58:29 +0100
Subject: [PATCH 3021/3183] 9.1.1-beta.0

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 94ae95eb..423a4e31 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "9.1.0",
+  "version": "9.1.1-beta.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "9.1.0",
+      "version": "9.1.1-beta.0",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index ac846f97..38e0b219 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "9.1.0",
+  "version": "9.1.1-beta.0",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From 58888a61c8d563e2e563fd19c0d185c2cf953024 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 7 Jul 2022 16:56:27 +0100
Subject: [PATCH 3022/3183] try again

---
 lib/connection/http.js | 2 +-
 lib/utils/constants.js | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/connection/http.js b/lib/connection/http.js
index a1896abc..49ddf1fe 100644
--- a/lib/connection/http.js
+++ b/lib/connection/http.js
@@ -85,7 +85,7 @@ export default class {
 
         // Retry the login with the new http host
         return await this.login();
-      } if (body.error === 10001 && !this.triedBase64) {
+      } if ([10001, 10014].includes(body.error) && !this.triedBase64) {
         // In this case the password is incorrect so try base64 decoding just once
         this.triedBase64 = true;
         this.password = Buffer.from(this.password, 'base64')
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 205327f5..bdff61d4 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -65,9 +65,9 @@ export default {
     targetTempThreshold: 0,
   },
 
-  appId: '4s1FXKC9FaGfoqXhmXSJneb3qcm1gOak',
+  appId: 'Uw83EKZFxdif7XFXEsrpduz5YyjP7nTl',
 
-  appSecret: 'oKvCM06gvwkRbfetd6qWRrbC3rFrbIpV',
+  appSecret: 'mXLOjea0woSMvK9gw7Fjsy7YlFO4iSu6',
 
   httpRetryCodes: ['ENOTFOUND', 'ETIMEDOUT', 'EAI_AGAIN', 'ECONNABORTED'],
 

From d2b07d7b9cfa298faec2d2cc02db85dfbdca8dbc Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Thu, 7 Jul 2022 16:57:07 +0100
Subject: [PATCH 3023/3183] 9.1.1-beta.1

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 423a4e31..04ab6185 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "9.1.1-beta.0",
+  "version": "9.1.1-beta.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "9.1.1-beta.0",
+      "version": "9.1.1-beta.1",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 38e0b219..a5cce94e 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "9.1.1-beta.0",
+  "version": "9.1.1-beta.1",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From 12f37c755b7a1db2cfa8547d4dddf779ea761060 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 8 Jul 2022 06:41:56 +0100
Subject: [PATCH 3024/3183] node

---
 CHANGELOG.md      | 6 ++++++
 package-lock.json | 2 +-
 package.json      | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index df5122c6..27c23790 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 All notable changes to homebridge-ewelink will be documented in this file.
 
+## BETA
+
+### Changed
+
+- Bump `node` recommended versions to v14.20.0 or v16.16.0
+
 ## 9.1.0 (2022-07-07)
 
 ⚠️ This update may remove some devices from your Homebridge instance. Unfortunately this is out my control. See [this link](https://github.com/bwp91/homebridge-ewelink/issues/385#issuecomment-1176457283).
diff --git a/package-lock.json b/package-lock.json
index 04ab6185..af04197c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -43,7 +43,7 @@
       },
       "engines": {
         "homebridge": "^1.4.0",
-        "node": "^14.19.3 || ^16.15.1"
+        "node": "^14.20.0 || ^16.16.0"
       }
     },
     "node_modules/@eslint/eslintrc": {
diff --git a/package.json b/package.json
index a5cce94e..3dd0464a 100644
--- a/package.json
+++ b/package.json
@@ -31,7 +31,7 @@
   },
   "engines": {
     "homebridge": "^1.4.0",
-    "node": "^14.19.3 || ^16.15.1"
+    "node": "^14.20.0 || ^16.16.0"
   },
   "repository": {
     "type": "git",

From 0967970e7aae8e843cb77b756731041f029f6a26 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 8 Jul 2022 19:23:24 +0100
Subject: [PATCH 3025/3183] custom appid/secret

---
 config.schema.json     | 13 +++++++++++++
 lib/connection/http.js | 12 +++++++-----
 lib/connection/ws.js   |  6 ++++--
 lib/platform.js        | 18 ++++++++++--------
 4 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 94831b73..0040229f 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -103,6 +103,17 @@
         "description": "Override the default country code, may help with login issues for users in other regions.",
         "placeholder": "+44"
       },
+      "appId": {
+        "title": "App ID",
+        "type": "string",
+        "description": "Available if you want to override the eWeLink App ID"
+      },
+      "appSecret": {
+        "title": "App Secret",
+        "type": "string",
+        "description": "Available if you want to override the eWeLink App Secret"
+      }
+    },
       "httpHost": {
         "title": "HTTP Host",
         "type": "string",
@@ -1727,6 +1738,8 @@
         "ignoredHomes",
         "countryCode",
         "httpHost",
+        "appId",
+        "appSecret",
         "apiPort"
       ]
     },
diff --git a/lib/connection/http.js b/lib/connection/http.js
index 49ddf1fe..342e15d2 100644
--- a/lib/connection/http.js
+++ b/lib/connection/http.js
@@ -6,6 +6,8 @@ import { sleep } from '../utils/functions.js';
 export default class {
   constructor(platform) {
     // Set up variables from the platform
+    this.appId = platform.config.appId || platformConsts.appId;
+    this.appSecret = platform.config.appSecret || platformConsts.appSecret;
     this.countryCode = platform.config.countryCode;
     this.debug = platform.config.debug;
     this.homeList = [];
@@ -42,7 +44,7 @@ export default class {
       }
 
       // Set up the request signature
-      const dataToSign = createHmac('sha256', platformConsts.appSecret)
+      const dataToSign = createHmac('sha256', this.appSecret)
         .update(JSON.stringify(data))
         .digest('base64');
 
@@ -51,7 +53,7 @@ export default class {
         headers: {
           Authorization: `Sign ${dataToSign}`,
           'Content-Type': 'application/json',
-          'X-CK-Appid': platformConsts.appId,
+          'X-CK-Appid': this.appId,
           'X-CK-Nonce': Math.random()
             .toString(36)
             .substr(2, 8),
@@ -140,7 +142,7 @@ export default class {
         headers: {
           Authorization: `Bearer ${this.aToken}`,
           'Content-Type': 'application/json',
-          'X-CK-Appid': platformConsts.appId,
+          'X-CK-Appid': this.appId,
           'X-CK-Nonce': Math.random()
             .toString(36)
             .substr(2, 8),
@@ -194,7 +196,7 @@ export default class {
           headers: {
             Authorization: `Bearer ${this.aToken}`,
             'Content-Type': 'application/json',
-            'X-CK-Appid': platformConsts.appId,
+            'X-CK-Appid': this.appId,
             'X-CK-Nonce': Math.random()
               .toString(36)
               .substr(2, 8),
@@ -276,7 +278,7 @@ export default class {
         headers: {
           Authorization: `Bearer ${this.aToken}`,
           'Content-Type': 'application/json',
-          'X-CK-Appid': platformConsts.appId,
+          'X-CK-Appid': this.appId,
           'X-CK-Nonce': Math.random()
             .toString(36)
             .substr(2, 8),
diff --git a/lib/connection/ws.js b/lib/connection/ws.js
index c1de8cb6..56a221d9 100644
--- a/lib/connection/ws.js
+++ b/lib/connection/ws.js
@@ -10,6 +10,8 @@ const emitter = new events();
 export default class {
   constructor(platform, authData) {
     // Set up variables from the platform
+    this.appId = platform.config.appId || platformConsts.appId;
+    this.appSecret = platform.config.appSecret || platformConsts.appSecret;
     this.debug = platform.config.debug;
     this.lang = platform.lang;
     this.log = platform.log;
@@ -35,7 +37,7 @@ export default class {
           'Content-Type': 'application/json',
         },
         data: {
-          appid: platformConsts.appId,
+          appid: this.appId,
           nonce: Math.random()
             .toString(36)
             .substr(2, 8),
@@ -113,7 +115,7 @@ export default class {
         const payload = {
           action: 'userOnline',
           apikey: this.apiKey,
-          appid: platformConsts.appId,
+          appid: this.appId,
           at: this.aToken,
           nonce: Math.random()
             .toString(36)
diff --git a/lib/platform.js b/lib/platform.js
index d9bf6624..66d3528a 100644
--- a/lib/platform.js
+++ b/lib/platform.js
@@ -137,6 +137,16 @@ export default class {
           }
           break;
         }
+        case 'appId':
+        case 'appSecret':
+        case 'ignoredHomes':
+        case 'username':
+          if (typeof val !== 'string') {
+            logIgnore(key);
+          } else {
+            this.config[key] = val.replace(/\s+/g, '');
+          }
+          break;
         case 'bridgeSensors':
           if (Array.isArray(val) && val.length > 0) {
             val.forEach((x) => {
@@ -404,14 +414,6 @@ export default class {
           this.config.httpHost = inSet ? defaultAutoHost : platformConsts.defaultValues[key];
           break;
         }
-        case 'ignoredHomes':
-        case 'username':
-          if (typeof val !== 'string') {
-            logIgnore(key);
-          } else {
-            this.config[key] = val.replace(/\s+/g, '');
-          }
-          break;
         case 'language':
         case 'mode': {
           const inSet = platformConsts.allowed[key].includes(val);

From 327a48b5e72a1fcb60ed9910243643c45aef9e55 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 8 Jul 2022 19:23:53 +0100
Subject: [PATCH 3026/3183] 9.1.1-beta.2

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index af04197c..53fe2595 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "9.1.1-beta.1",
+  "version": "9.1.1-beta.2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "9.1.1-beta.1",
+      "version": "9.1.1-beta.2",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 3dd0464a..b57a694d 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "9.1.1-beta.1",
+  "version": "9.1.1-beta.2",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From aae1d3161be8d568c26cf496e420c4fad4ca11ed Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 8 Jul 2022 19:47:44 +0100
Subject: [PATCH 3027/3183] fix schema

---
 config.schema.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index 0040229f..bb0fcae4 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -112,8 +112,7 @@
         "title": "App Secret",
         "type": "string",
         "description": "Available if you want to override the eWeLink App Secret"
-      }
-    },
+      },
       "httpHost": {
         "title": "HTTP Host",
         "type": "string",

From 72d83fa1b3402fc9d854d6d9e6670506f3f7a393 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 8 Jul 2022 19:48:47 +0100
Subject: [PATCH 3028/3183] Update config.schema.json

---
 config.schema.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index bb0fcae4..a081ca04 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -106,17 +106,17 @@
       "appId": {
         "title": "App ID",
         "type": "string",
-        "description": "Available if you want to override the eWeLink App ID"
+        "description": "Available if you want to override the eWeLink App ID."
       },
       "appSecret": {
         "title": "App Secret",
         "type": "string",
-        "description": "Available if you want to override the eWeLink App Secret"
+        "description": "Available if you want to override the eWeLink App Secret."
       },
       "httpHost": {
         "title": "HTTP Host",
         "type": "string",
-        "description": "Override the default API host, may help with login issues for users in other regions.",
+        "description": "Available if you want to override the API host.",
         "placeholder": "eu-apia.coolkit.cc",
         "oneOf": [
           {

From 5af05ee42f169ac87827bc03ffa53a00033250ad Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 8 Jul 2022 19:49:13 +0100
Subject: [PATCH 3029/3183] 9.1.1-beta.3

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 53fe2595..ceb828fc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "9.1.1-beta.2",
+  "version": "9.1.1-beta.3",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "9.1.1-beta.2",
+      "version": "9.1.1-beta.3",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index b57a694d..24a0b3ec 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "9.1.1-beta.2",
+  "version": "9.1.1-beta.3",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From ebca158c6fc3eb34cb11f82c98cd241f75ec2875 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 8 Jul 2022 20:42:12 +0100
Subject: [PATCH 3030/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 27c23790..13725334 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,12 @@
 
 All notable changes to homebridge-ewelink will be documented in this file.
 
-## BETA
+## 10.0.0 (2022-07-08)
+
+⚠️ After updating to this version:
+  - Each time you start the plugin, you will be logged out the eWeLink app, and so I would recommend:
+    - Creating a new eWeLink account, and sharing your devices to this new account
+    - **Most importantly**, you should use your **main** account with the plugin, and login to the eWeLink app with your shared account
 
 ### Changed
 

From fca55f173ec70eec2c0eaa646a2ab45d4b5bdf36 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 8 Jul 2022 20:45:15 +0100
Subject: [PATCH 3031/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 13725334..60e2634d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,8 @@ All notable changes to homebridge-ewelink will be documented in this file.
 
 ## 10.0.0 (2022-07-08)
 
+*On a personal level, this is not the kind of release I like to make. But circumstances have changed and so modifications to the plugin have needed to be made*
+
 ⚠️ After updating to this version:
   - Each time you start the plugin, you will be logged out the eWeLink app, and so I would recommend:
     - Creating a new eWeLink account, and sharing your devices to this new account

From f83066b9ee0d00d53300cc0fe2f3412ecb3caa9f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 8 Jul 2022 20:46:23 +0100
Subject: [PATCH 3032/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 60e2634d..5a5d6bb2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,7 @@ All notable changes to homebridge-ewelink will be documented in this file.
 
 ## 10.0.0 (2022-07-08)
 
-*On a personal level, this is not the kind of release I like to make. But circumstances have changed and so modifications to the plugin have needed to be made*
+*On a personal level, this is not the kind of release I like to make. But circumstances have changed and so modifications to the plugin have needed to be made:*
 
 ⚠️ After updating to this version:
   - Each time you start the plugin, you will be logged out the eWeLink app, and so I would recommend:

From a758454ced1ef4030f81baf4e031ba321940fbe4 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 8 Jul 2022 20:47:00 +0100
Subject: [PATCH 3033/3183] Update CHANGELOG.md

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5a5d6bb2..00d994de 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,10 @@ All notable changes to homebridge-ewelink will be documented in this file.
     - Creating a new eWeLink account, and sharing your devices to this new account
     - **Most importantly**, you should use your **main** account with the plugin, and login to the eWeLink app with your shared account
 
+### Added
+
+- Use a custom eWeLink APPID and APPSECRET if needed
+
 ### Changed
 
 - Bump `node` recommended versions to v14.20.0 or v16.16.0

From f82d957f43853ab351c8f362ada641e681ebd5e2 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 8 Jul 2022 20:47:39 +0100
Subject: [PATCH 3034/3183] 10.0.0

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ceb828fc..2a17c031 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "9.1.1-beta.3",
+  "version": "10.0.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "9.1.1-beta.3",
+      "version": "10.0.0",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 24a0b3ec..a4f0affc 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "9.1.1-beta.3",
+  "version": "10.0.0",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From fd8611a76e197a6185c8dac4bdaaeb0795e0a285 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 24 Jul 2022 12:21:30 +0100
Subject: [PATCH 3035/3183] packages

---
 package-lock.json | 52 +++++++++++++++++++++++------------------------
 package.json      |  4 ++--
 2 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 2a17c031..794820bd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -32,10 +32,10 @@
         "node-persist": "^3.1.0",
         "p-queue": "^7.2.0",
         "websocket-as-promised": "^2.0.1",
-        "ws": "^8.8.0"
+        "ws": "^8.8.1"
       },
       "devDependencies": {
-        "eslint": "^8.19.0",
+        "eslint": "^8.20.0",
         "eslint-config-airbnb-base": "^15.0.0",
         "eslint-plugin-import": "^2.26.0",
         "eslint-plugin-import-newlines": "^1.2.3",
@@ -98,9 +98,9 @@
       "dev": true
     },
     "node_modules/acorn": {
-      "version": "8.7.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.1.tgz",
-      "integrity": "sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==",
+      "version": "8.8.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.0.tgz",
+      "integrity": "sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w==",
       "dev": true,
       "bin": {
         "acorn": "bin/acorn"
@@ -460,9 +460,9 @@
       }
     },
     "node_modules/eslint": {
-      "version": "8.19.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.19.0.tgz",
-      "integrity": "sha512-SXOPj3x9VKvPe81TjjUJCYlV4oJjQw68Uek+AM0X4p+33dj2HY5bpTZOgnQHcG2eAm1mtCU9uNMnJi7exU/kYw==",
+      "version": "8.20.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.20.0.tgz",
+      "integrity": "sha512-d4ixhz5SKCa1D6SCPrivP7yYVi7nyD6A4vs6HIAul9ujBzcEmZVM3/0NN/yu5nKhmO1wjp5xQ46iRfmDGlOviA==",
       "dev": true,
       "dependencies": {
         "@eslint/eslintrc": "^1.3.0",
@@ -955,9 +955,9 @@
       }
     },
     "node_modules/globals": {
-      "version": "13.16.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.16.0.tgz",
-      "integrity": "sha512-A1lrQfpNF+McdPOnnFqY3kSN0AFTy485bTi1bkLk4mVPODIUEcSfhHgRqA+QdXPksrSTTztYXx37NFV+GpGk3Q==",
+      "version": "13.17.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.17.0.tgz",
+      "integrity": "sha512-1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw==",
       "dev": true,
       "dependencies": {
         "type-fest": "^0.20.2"
@@ -1971,9 +1971,9 @@
       "dev": true
     },
     "node_modules/ws": {
-      "version": "8.8.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.8.0.tgz",
-      "integrity": "sha512-JDAgSYQ1ksuwqfChJusw1LSJ8BizJ2e/vVu5Lxjq3YvNJNlROv1ui4i+c/kUUrPheBvQl4c5UbERhTwKa6QBJQ==",
+      "version": "8.8.1",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.8.1.tgz",
+      "integrity": "sha512-bGy2JzvzkPowEJV++hF07hAD6niYSr0JzBNo/J29WsB57A2r7Wlc1UFcTR9IzrPvuNVO4B8LGqF8qcpsVOhJCA==",
       "engines": {
         "node": ">=10.0.0"
       },
@@ -2038,9 +2038,9 @@
       "dev": true
     },
     "acorn": {
-      "version": "8.7.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.1.tgz",
-      "integrity": "sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==",
+      "version": "8.8.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.0.tgz",
+      "integrity": "sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w==",
       "dev": true
     },
     "acorn-jsx": {
@@ -2308,9 +2308,9 @@
       "dev": true
     },
     "eslint": {
-      "version": "8.19.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.19.0.tgz",
-      "integrity": "sha512-SXOPj3x9VKvPe81TjjUJCYlV4oJjQw68Uek+AM0X4p+33dj2HY5bpTZOgnQHcG2eAm1mtCU9uNMnJi7exU/kYw==",
+      "version": "8.20.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.20.0.tgz",
+      "integrity": "sha512-d4ixhz5SKCa1D6SCPrivP7yYVi7nyD6A4vs6HIAul9ujBzcEmZVM3/0NN/yu5nKhmO1wjp5xQ46iRfmDGlOviA==",
       "dev": true,
       "requires": {
         "@eslint/eslintrc": "^1.3.0",
@@ -2687,9 +2687,9 @@
       }
     },
     "globals": {
-      "version": "13.16.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.16.0.tgz",
-      "integrity": "sha512-A1lrQfpNF+McdPOnnFqY3kSN0AFTy485bTi1bkLk4mVPODIUEcSfhHgRqA+QdXPksrSTTztYXx37NFV+GpGk3Q==",
+      "version": "13.17.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.17.0.tgz",
+      "integrity": "sha512-1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw==",
       "dev": true,
       "requires": {
         "type-fest": "^0.20.2"
@@ -3400,9 +3400,9 @@
       "dev": true
     },
     "ws": {
-      "version": "8.8.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.8.0.tgz",
-      "integrity": "sha512-JDAgSYQ1ksuwqfChJusw1LSJ8BizJ2e/vVu5Lxjq3YvNJNlROv1ui4i+c/kUUrPheBvQl4c5UbERhTwKa6QBJQ==",
+      "version": "8.8.1",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.8.1.tgz",
+      "integrity": "sha512-bGy2JzvzkPowEJV++hF07hAD6niYSr0JzBNo/J29WsB57A2r7Wlc1UFcTR9IzrPvuNVO4B8LGqF8qcpsVOhJCA==",
       "requires": {}
     }
   }
diff --git a/package.json b/package.json
index a4f0affc..b92d6a60 100644
--- a/package.json
+++ b/package.json
@@ -64,13 +64,13 @@
     "node-persist": "^3.1.0",
     "p-queue": "^7.2.0",
     "websocket-as-promised": "^2.0.1",
-    "ws": "^8.8.0"
+    "ws": "^8.8.1"
   },
   "devDependencies": {
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-import-newlines": "^1.2.3",
     "eslint-plugin-sort-exports": "^0.7.0",
-    "eslint": "^8.19.0"
+    "eslint": "^8.20.0"
   }
 }

From 154a031f57cb8a574eb923a94e16fb2b183c2ed5 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 24 Jul 2022 12:24:05 +0100
Subject: [PATCH 3036/3183] DW2-Wifi-L UIID 154

---
 CHANGELOG.md                            |  6 ++++++
 lib/device/sensor-contact.js            | 11 +++++++++--
 lib/device/simulation/sensor-leak.js    | 11 +++++++++--
 lib/device/simulation/sensor-visible.js | 10 ++++++++--
 lib/utils/constants.js                  |  5 +++--
 5 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 00d994de..7d285181 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 All notable changes to homebridge-ewelink will be documented in this file.
 
+## BETA
+
+### Added
+
+- Support Sonoff DW2-Wifi-L
+
 ## 10.0.0 (2022-07-08)
 
 *On a personal level, this is not the kind of release I like to make. But circumstances have changed and so modifications to the plugin have needed to be made:*
diff --git a/lib/device/sensor-contact.js b/lib/device/sensor-contact.js
index ecc44e2e..db6ed70b 100644
--- a/lib/device/sensor-contact.js
+++ b/lib/device/sensor-contact.js
@@ -88,8 +88,15 @@ export default class {
     try {
       if (hasProperty(params, 'battery') && params.battery !== this.cacheBatt) {
         this.cacheBatt = params.battery;
-        this.cacheBattScaled = Math.min(Math.max(this.cacheBatt, 2), 3);
-        this.cacheBattScaled = Math.round((this.cacheBattScaled - 2) * 100);
+        if (this.accessory.context.eweUIID === 154) {
+          // No scaling needed for this model as provided as a %
+          this.cacheBattScaled = this.cacheBatt;
+        } else {
+          // Scaling needed for UIID 102 as provided as a voltage rather than a %
+          this.cacheBattScaled = Math.min(Math.max(this.cacheBatt, 2), 3);
+          this.cacheBattScaled = Math.round((this.cacheBattScaled - 2) * 100);
+        }
+
         this.batteryService.updateCharacteristic(this.hapChar.BatteryLevel, this.cacheBattScaled);
         this.batteryService.updateCharacteristic(
           this.hapChar.StatusLowBattery,
diff --git a/lib/device/simulation/sensor-leak.js b/lib/device/simulation/sensor-leak.js
index 24f7b316..32833136 100644
--- a/lib/device/simulation/sensor-leak.js
+++ b/lib/device/simulation/sensor-leak.js
@@ -76,8 +76,15 @@ export default class {
     try {
       if (hasProperty(params, 'battery') && this.cacheBatt !== params.battery) {
         this.cacheBatt = params.battery;
-        this.cacheBattScaled = Math.min(Math.max(this.cacheBatt, 2), 3);
-        this.cacheBattScaled = Math.round((this.cacheBattScaled - 2) * 100);
+        if (this.accessory.context.eweUIID === 154) {
+          // No scaling needed for this model as provided as a %
+          this.cacheBattScaled = this.cacheBatt;
+        } else {
+          // Scaling needed for UIID 102 as provided as a voltage rather than a %
+          this.cacheBattScaled = Math.min(Math.max(this.cacheBatt, 2), 3);
+          this.cacheBattScaled = Math.round((this.cacheBattScaled - 2) * 100);
+        }
+
         this.batteryService.updateCharacteristic(this.hapChar.BatteryLevel, this.cacheBattScaled);
         this.batteryService.updateCharacteristic(
           this.hapChar.StatusLowBattery,
diff --git a/lib/device/simulation/sensor-visible.js b/lib/device/simulation/sensor-visible.js
index 4f070421..9e266b4e 100644
--- a/lib/device/simulation/sensor-visible.js
+++ b/lib/device/simulation/sensor-visible.js
@@ -117,8 +117,14 @@ export default class {
       ) {
         this.cacheBatt = params.battery;
         if (this.isDW2) {
-          this.cacheBattScaled = Math.min(Math.max(this.cacheBatt, 2), 3);
-          this.cacheBattScaled = Math.round((this.cacheBattScaled - 2) * 100);
+          if (this.accessory.context.eweUIID === 154) {
+            // No scaling needed for this model as provided as a %
+            this.cacheBattScaled = this.cacheBatt;
+          } else {
+            // Scaling needed for UIID 102 as provided as a voltage rather than a %
+            this.cacheBattScaled = Math.min(Math.max(this.cacheBatt, 2), 3);
+            this.cacheBattScaled = Math.round((this.cacheBattScaled - 2) * 100);
+          }
         } else {
           this.cacheBattScaled = this.scaleBattery ? this.cacheBatt * 10 : this.cacheBatt;
         }
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index bdff61d4..2bf7506c 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -324,7 +324,7 @@ export default {
     lightCCT: [103],
     lightRGBCCT: [33, 59, 104, 136, 137],
     curtain: [11, 67],
-    sensorContact: [102],
+    sensorContact: [102, 154],
     sensorAmbient: [15, 181],
     sensorTempHumi: [18],
     thermostat: [127],
@@ -346,7 +346,7 @@ export default {
     group: [5000],
     template: [],
     cannotSupport: [0, 65, 118, 119, 120, 121],
-    garageSensors: [102, 3026],
+    garageSensors: [102, 154, 3026],
     skipUpdateRequest: [1000],
   },
 
@@ -471,6 +471,7 @@ export default {
     139: 2, // "MINIR3?"
     140: 3, // "MINIR3?"
     141: 4, // "MINIR3?"
+    154: 1, // DW2-Wi-Fi-L
     160: 1, // "SwitchMan Smart Wall Switch-M5 - 1 Gang"
     161: 2, // "SwitchMan Smart Wall Switch-M5 - 2 Gang"
     162: 3, // "SwitchMan Smart Wall Switch-M5 - 3 Gang"

From e217129b9c8d136dc3afa7585fd41ca3d5e9ac68 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 24 Jul 2022 12:27:35 +0100
Subject: [PATCH 3037/3183] 10.0.1-beta.0

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 794820bd..9f862dab 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "10.0.0",
+  "version": "10.0.1-beta.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "10.0.0",
+      "version": "10.0.1-beta.0",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index b92d6a60..06ad6cf6 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "10.0.0",
+  "version": "10.0.1-beta.0",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From d418ed291203e73dce1ebb7a899f2928190fd9ad Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 24 Jul 2022 18:01:59 +0100
Subject: [PATCH 3038/3183] fix initial lang

---
 lib/platform.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/platform.js b/lib/platform.js
index 66d3528a..d731925e 100644
--- a/lib/platform.js
+++ b/lib/platform.js
@@ -59,7 +59,7 @@ export default class {
 
       // Make sure user is running Homebridge v1.4 or above
       if (!api?.versionGreaterOrEqual('1.4.0')) {
-        throw new Error(platformLang.hbVersionFail);
+        throw new Error(this.lang.hbVersionFail);
       }
 
       // Check the user has configured the plugin
@@ -70,7 +70,7 @@ export default class {
       // Log some environment info for debugging
       this.log(
         '%s v%s | System %s | Node %s | HB v%s | HAPNodeJS v%s...',
-        platformLang.initialising,
+        this.lang.initialising,
         plugin.version,
         process.platform,
         process.version,

From fb612d63f807ca7d95a3c1038edca98c3ab28da0 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 24 Jul 2022 18:29:47 +0100
Subject: [PATCH 3039/3183] use forEach NSpanel switches

---
 lib/device/panel.js | 64 +++++++++++++++++++++++++--------------------
 1 file changed, 35 insertions(+), 29 deletions(-)

diff --git a/lib/device/panel.js b/lib/device/panel.js
index 72327ec8..b5d8f1c7 100644
--- a/lib/device/panel.js
+++ b/lib/device/panel.js
@@ -281,38 +281,44 @@ export default class {
     try {
       // Switches
       if (params.switches && Array.isArray(params.switches)) {
-        if (params.switches[0]) {
-          const newValue = params.switches[0].switch;
-          if (newValue !== this.cacheState1) {
-            this.cacheState1 = newValue;
-            this.service1.updateCharacteristic(this.hapChar.On, this.cacheState1 === 'on');
-            if (params.updateSource && this.enableLogging) {
-              this.log(
-                '[%s] [%s] %s [%s].',
-                this.name,
-                this.service1.displayName,
-                this.lang.curState,
-                this.cacheState1,
-              );
+        params.switches.forEach((switchEntry) => {
+          const newValue = switchEntry.switch;
+          switch (switchEntry.outlet) {
+            case 0: {
+              if (newValue !== this.cacheState1) {
+                this.cacheState1 = newValue;
+                this.service1.updateCharacteristic(this.hapChar.On, this.cacheState1 === 'on');
+                if (params.updateSource && this.enableLogging) {
+                  this.log(
+                    '[%s] [%s] %s [%s].',
+                    this.name,
+                    this.service1.displayName,
+                    this.lang.curState,
+                    this.cacheState1,
+                  );
+                }
+              }
+              break;
             }
-          }
-        }
-        if (params.switches[1]) {
-          const newValue = params.switches[1].switch;
-          if (newValue !== this.cacheState2) {
-            this.cacheState2 = newValue;
-            this.service2.updateCharacteristic(this.hapChar.On, this.cacheState2 === 'on');
-            if (params.updateSource && this.enableLogging) {
-              this.log(
-                '[%s] [%s] %s [%s].',
-                this.name,
-                this.service2.displayName,
-                this.lang.curState,
-                this.cacheState2,
-              );
+            case 1: {
+              if (newValue !== this.cacheState2) {
+                this.cacheState2 = newValue;
+                this.service2.updateCharacteristic(this.hapChar.On, this.cacheState2 === 'on');
+                if (params.updateSource && this.enableLogging) {
+                  this.log(
+                    '[%s] [%s] %s [%s].',
+                    this.name,
+                    this.service2.displayName,
+                    this.lang.curState,
+                    this.cacheState2,
+                  );
+                }
+              }
+              break;
             }
+            default:
           }
-        }
+        });
       }
 
       // Current temperature

From f6f69d4e0739791b7f26bd2880a641e52a00bccc Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 24 Jul 2022 19:50:27 +0100
Subject: [PATCH 3040/3183] Update http.js

---
 lib/connection/http.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/connection/http.js b/lib/connection/http.js
index 342e15d2..cc9857c7 100644
--- a/lib/connection/http.js
+++ b/lib/connection/http.js
@@ -19,6 +19,10 @@ export default class {
     this.mode = platform.config.mode;
     this.obstructSwitches = platform.obstructSwitches;
     this.password = platform.config.password;
+    this.sensorSwitches = Object
+      .values(platform.deviceConf)
+      .filter((el) => el.sensorId && ['garage', 'lock'].includes(el.showAs))
+      .map((el) => el.sensorId);
     this.triedBase64 = false;
     this.username = platform.config.username;
   }
@@ -232,9 +236,11 @@ export default class {
           }
           // Separate the sensors as these need to be set up last
           const isObstructSwitch = this.obstructSwitches[d.itemData.deviceid];
+          const isSensorSwitch = this.sensorSwitches[d.itemData.deviceid];
           if (
             platformConsts.devices.garageSensors.includes(d.itemData.extra.uiid)
             || isObstructSwitch
+            || isSensorSwitch
           ) {
             sensorList.push(d.itemData);
           } else {

From 400ef8c6d6ed07c7cfdfb2220a91f04d107f12ff Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 24 Jul 2022 19:50:51 +0100
Subject: [PATCH 3041/3183] 10.0.1-beta.1

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 9f862dab..c0f748e6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "10.0.1-beta.0",
+  "version": "10.0.1-beta.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "10.0.1-beta.0",
+      "version": "10.0.1-beta.1",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 06ad6cf6..978cc31b 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "10.0.1-beta.0",
+  "version": "10.0.1-beta.1",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From f5b5460edf1e5091cc7176708320bab6f4dce15f Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 30 Jul 2022 11:59:25 +0100
Subject: [PATCH 3042/3183] update p-queue

---
 package-lock.json | 14 +++++++-------
 package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c0f748e6..9e23d644 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -30,7 +30,7 @@
         "@homebridge/plugin-ui-utils": "^0.0.19",
         "axios": "^0.27.2",
         "node-persist": "^3.1.0",
-        "p-queue": "^7.2.0",
+        "p-queue": "^7.3.0",
         "websocket-as-promised": "^2.0.1",
         "ws": "^8.8.1"
       },
@@ -1516,9 +1516,9 @@
       }
     },
     "node_modules/p-queue": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/p-queue/-/p-queue-7.2.0.tgz",
-      "integrity": "sha512-Kvv7p13M46lTYLQ/PsZdaj/1Vj6u/8oiIJgyQyx4oVkOfHdd7M2EZvXigDvcsSzRwanCzQirV5bJPQFoSQt5MA==",
+      "version": "7.3.0",
+      "resolved": "https://registry.npmjs.org/p-queue/-/p-queue-7.3.0.tgz",
+      "integrity": "sha512-5fP+yVQ0qp0rEfZoDTlP2c3RYBgxvRsw30qO+VtPPc95lyvSG+x6USSh1TuLB4n96IO6I8/oXQGsTgtna4q2nQ==",
       "dependencies": {
         "eventemitter3": "^4.0.7",
         "p-timeout": "^5.0.2"
@@ -3083,9 +3083,9 @@
       }
     },
     "p-queue": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/p-queue/-/p-queue-7.2.0.tgz",
-      "integrity": "sha512-Kvv7p13M46lTYLQ/PsZdaj/1Vj6u/8oiIJgyQyx4oVkOfHdd7M2EZvXigDvcsSzRwanCzQirV5bJPQFoSQt5MA==",
+      "version": "7.3.0",
+      "resolved": "https://registry.npmjs.org/p-queue/-/p-queue-7.3.0.tgz",
+      "integrity": "sha512-5fP+yVQ0qp0rEfZoDTlP2c3RYBgxvRsw30qO+VtPPc95lyvSG+x6USSh1TuLB4n96IO6I8/oXQGsTgtna4q2nQ==",
       "requires": {
         "eventemitter3": "^4.0.7",
         "p-timeout": "^5.0.2"
diff --git a/package.json b/package.json
index 978cc31b..cf5da586 100644
--- a/package.json
+++ b/package.json
@@ -62,7 +62,7 @@
     "@homebridge/plugin-ui-utils": "^0.0.19",
     "axios": "^0.27.2",
     "node-persist": "^3.1.0",
-    "p-queue": "^7.2.0",
+    "p-queue": "^7.3.0",
     "websocket-as-promised": "^2.0.1",
     "ws": "^8.8.1"
   },

From a56daf0306d28e6fe10a592445d5c2c269f05db9 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 30 Jul 2022 11:59:30 +0100
Subject: [PATCH 3043/3183] support UIID 190

---
 lib/device/outlet-single.js        | 3 ++-
 lib/device/switch-single-inched.js | 3 ++-
 lib/device/switch-single.js        | 3 ++-
 lib/utils/constants.js             | 4 +++-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/lib/device/outlet-single.js b/lib/device/outlet-single.js
index ee524dfa..c0e890e4 100644
--- a/lib/device/outlet-single.js
+++ b/lib/device/outlet-single.js
@@ -24,7 +24,7 @@ export default class {
     UIID 5: single switch, with wattage readings
     UIID 32: single switch, with wattage, voltage and amp readings
     UIID 77/78/81/107: single switch but firmware uses multiple channels (only need CH0)
-    UIID 182: single switch but multiple channels with wattage, voltage and amp readings
+    UIID 182/190: single switch but multiple channels with wattage, voltage and amp readings
     */
 
     // Set up custom variables for this device type
@@ -63,6 +63,7 @@ export default class {
     switch (this.accessory.context.eweUIID) {
       case 5:
       case 182:
+      case 190:
         // Add Eve power characteristics
         this.powerReadings = true;
         if (!this.service.testCharacteristic(this.hapChar.OutletInUse)) {
diff --git a/lib/device/switch-single-inched.js b/lib/device/switch-single-inched.js
index 670913bd..eff07709 100644
--- a/lib/device/switch-single-inched.js
+++ b/lib/device/switch-single-inched.js
@@ -25,7 +25,7 @@ export default class {
     UIID 5: single switch, with wattage readings
     UIID 32: single switch, with wattage, voltage and amp readings
     UIID 77/78/81/107: single switch but firmware uses multiple channels (only need CH0)
-    UIID 182: single switch but multiple channels with wattage, voltage and amp readings
+    UIID 182/190: single switch but multiple channels with wattage, voltage and amp readings
     */
 
     // Set up custom variables for this device type
@@ -64,6 +64,7 @@ export default class {
     switch (this.accessory.context.eweUIID) {
       case 5:
       case 182:
+      case 190:
         // Add Eve power characteristics
         this.powerReadings = true;
         if (!this.service.testCharacteristic(this.hapChar.OutletInUse)) {
diff --git a/lib/device/switch-single.js b/lib/device/switch-single.js
index 85036cf6..e2535205 100644
--- a/lib/device/switch-single.js
+++ b/lib/device/switch-single.js
@@ -24,7 +24,7 @@ export default class {
     UIID 5: single switch, with wattage readings
     UIID 32: single switch, with wattage, voltage and amp readings
     UIID 77/78/81/107: single switch but firmware uses multiple channels (only need CH0)
-    UIID 182: single switch but multiple channels with wattage, voltage and amp readings
+    UIID 182/190: single switch but multiple channels with wattage, voltage and amp readings
     */
 
     // Set up custom variables for this device type
@@ -63,6 +63,7 @@ export default class {
     switch (this.accessory.context.eweUIID) {
       case 5:
       case 182:
+      case 190:
         // Add Eve power characteristics
         this.powerReadings = true;
         if (!this.service.testCharacteristic(this.hapChar.OutletInUse)) {
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 2bf7506c..4818ceb5 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -287,10 +287,11 @@ export default {
       165,
       181,
       182,
+      190,
     ],
     switchSingle: [1, 6, 14, 24, 27, 1009, 1256, 7004],
     switchSCM: [77, 78, 81, 107, 112, 138, 160],
-    switchSCMPower: [182],
+    switchSCMPower: [182, 190],
     switchSinglePower: [5, 32],
     switchMulti: [
       2,
@@ -479,6 +480,7 @@ export default {
     177: 1, // Switch Mate
     181: 1, // "Sonoff TH Elite THR316D"
     182: 1, // Power Detection Plug Overload Alarm-Multi-Channel Protocols (S40)
+    190: 1, // POWR316 POWR316D POWR320D
     1000: 1, // "zigbee_ON_OFF_SWITCH_1000" (button device)
     1009: 1, // "" (Some sort of single switch device)
     1256: 1, // "ZIGBEE_SINGLE_SWITCH"

From 609603151c18d0e3393a7a140d6b0f4cdc6396fc Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 30 Jul 2022 12:01:55 +0100
Subject: [PATCH 3044/3183] add THR to models in config schema

---
 config.schema.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config.schema.json b/config.schema.json
index a081ca04..e9803d4b 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -989,7 +989,7 @@
       },
       "thDevices": {
         "title": "Thermostat Devices",
-        "description": "Optional settings for thermostat devices, NSPanel and the TH10/16.",
+        "description": "Optional settings for thermostat devices, NSPanel, TH10/16 and THR316/320.",
         "type": "array",
         "items": {
           "type": "object",
@@ -1020,7 +1020,7 @@
               "description": "This setting has no effect except showing the relevant options for this model below.",
               "oneOf": [
                 {
-                  "title": "Sonoff TH10/16",
+                  "title": "Sonoff TH10/16 and THR316/320",
                   "enum": ["th"]
                 },
                 {

From ba7ee5b1f43e6feaef0056cbf6a29cfc575f46e3 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 30 Jul 2022 12:02:49 +0100
Subject: [PATCH 3045/3183] Update constants.js

---
 lib/utils/constants.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 4818ceb5..f06b10a8 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -478,7 +478,7 @@ export default {
     162: 3, // "SwitchMan Smart Wall Switch-M5 - 3 Gang"
     165: 2, // "DUALR3 Lite"
     177: 1, // Switch Mate
-    181: 1, // "Sonoff TH Elite THR316D"
+    181: 1, // Sonoff TH Elite THR316 and THR320
     182: 1, // Power Detection Plug Overload Alarm-Multi-Channel Protocols (S40)
     190: 1, // POWR316 POWR316D POWR320D
     1000: 1, // "zigbee_ON_OFF_SWITCH_1000" (button device)

From 57483a5d2edbc5ffd34e0e8522355257b5cb10e1 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 30 Jul 2022 12:07:44 +0100
Subject: [PATCH 3046/3183] add template for zigbee blinds

---
 lib/device/zigbee/index.js |  2 +
 lib/device/zigbee/motor.js | 79 ++++++++++++++++++++++++++++++++++++++
 lib/platform.js            |  7 ++++
 lib/utils/constants.js     |  2 +
 4 files changed, 90 insertions(+)
 create mode 100644 lib/device/zigbee/motor.js

diff --git a/lib/device/zigbee/index.js b/lib/device/zigbee/index.js
index 24b20ef1..4833aa31 100644
--- a/lib/device/zigbee/index.js
+++ b/lib/device/zigbee/index.js
@@ -1,5 +1,6 @@
 import deviceLightCCT from './light-cct.js';
 import deviceLightDimmer from './light-dimmer.js';
+import deviceMotor from './motor.js';
 import deviceSensorAmbient from './sensor-ambient.js';
 import deviceSensorContact from './sensor-contact.js';
 import deviceSensorLeak from './sensor-leak.js';
@@ -10,6 +11,7 @@ import deviceSwitchStateless from './switch-stateless.js';
 export default {
   deviceLightCCT,
   deviceLightDimmer,
+  deviceMotor,
   deviceSensorAmbient,
   deviceSensorContact,
   deviceSensorLeak,
diff --git a/lib/device/zigbee/motor.js b/lib/device/zigbee/motor.js
new file mode 100644
index 00000000..51cfe5b8
--- /dev/null
+++ b/lib/device/zigbee/motor.js
@@ -0,0 +1,79 @@
+import platformConsts from '../../utils/constants.js';
+import { hasProperty } from '../../utils/functions.js';
+
+export default class {
+  constructor(platform, accessory) {
+    // Set up variables from the platform
+    this.hapChar = platform.api.hap.Characteristic;
+    this.hapServ = platform.api.hap.Service;
+    this.lang = platform.lang;
+    this.log = platform.log;
+    this.platform = platform;
+
+    // Set up variables from the accessory
+    this.name = accessory.displayName;
+    this.accessory = accessory;
+
+    // Set up custom variables for this device type
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId] || {};
+    this.lowBattThreshold = deviceConf.lowBattThreshold
+      ? Math.min(deviceConf.lowBattThreshold, 100)
+      : platformConsts.defaultValues.lowBattThreshold;
+
+    // Set the correct logging variables for this accessory
+    switch (deviceConf.overrideLogging) {
+      case 'standard':
+        this.enableLogging = true;
+        this.enableDebugLogging = false;
+        break;
+      case 'debug':
+        this.enableLogging = true;
+        this.enableDebugLogging = true;
+        break;
+      case 'disable':
+        this.enableLogging = false;
+        this.enableDebugLogging = false;
+        break;
+      default:
+        this.enableLogging = !platform.config.disableDeviceLogging;
+        this.enableDebugLogging = platform.config.debug;
+        break;
+    }
+
+    // Temp override for debugging
+    this.enableLogging = true;
+    this.enableDebugLogging = true;
+
+    // Add the battery service if it doesn't already exist
+    this.battService = this.accessory.getService(this.hapServ.Battery)
+      || this.accessory.addService(this.hapServ.Battery);
+    this.cacheBatt = this.battService.getCharacteristic(this.hapChar.BatteryLevel).value;
+
+    // Output the customised options to the log
+    const normalLogging = this.enableLogging ? 'standard' : 'disable';
+    const opts = JSON.stringify({
+      logging: this.enableDebugLogging ? 'debug' : normalLogging,
+      lowBattThreshold: this.lowBattThreshold,
+    });
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts);
+  }
+
+  async externalUpdate(params) {
+    try {
+      if (hasProperty(params, 'battery') && params.battery !== this.cacheBatt) {
+        this.cacheBatt = params.battery;
+        this.cacheBattScaled = Math.max(Math.min(this.cacheBatt, 100), 0);
+        this.battService.updateCharacteristic(this.hapChar.BatteryLevel, this.cacheBattScaled);
+        this.battService.updateCharacteristic(
+          this.hapChar.StatusLowBattery,
+          this.cacheBattScaled < this.lowBattThreshold ? 1 : 0,
+        );
+        if (params.updateSource && this.enableLogging) {
+          this.log('[%s] %s [%s%].', this.name, this.lang.curBatt, this.cacheBattScaled);
+        }
+      }
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, false);
+    }
+  }
+}
diff --git a/lib/platform.js b/lib/platform.js
index d731925e..1444f055 100644
--- a/lib/platform.js
+++ b/lib/platform.js
@@ -1381,6 +1381,13 @@ export default class {
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
         accessory.control = new deviceTypes.zb.deviceLightCCT(this, accessory);
         /** ********** */
+      } else if (platformConsts.devices.zbMotor.includes(uiid)) {
+        /** ************
+         ZB LIGHTS [CCT]
+         ************* */
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+        accessory.control = new deviceTypes.zb.deviceMotor(this, accessory);
+        /** ********** */
       } else if (platformConsts.devices.zbSensorAmbient.includes(uiid)) {
         /** ****************
          ZB SENSOR [AMBIENT]
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index f06b10a8..52f95cbe 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -339,6 +339,7 @@ export default {
     zbSwitchStateless: [1000],
     zbLightDimmer: [1257],
     zbLightCCT: [1258],
+    zbMotor: [1514],
     zbSensorAmbient: [1770],
     zbSensorMotion: [2026, 7002],
     zbSensorContact: [3026, 7003],
@@ -486,6 +487,7 @@ export default {
     1256: 1, // "ZIGBEE_SINGLE_SWITCH"
     1257: 1, // "ZigbeeWhiteLight"
     1258: 1,
+    1514: 1, // Graywind Zigbee Shades
     1770: 1, // "ZIGBEE_TEMPERATURE_SENSOR"
     2026: 1, // "ZIGBEE_MOBILE_SENSOR"
     2256: 2, // "ZIGBEE_SWITCH_2"

From c80396c58f2c96e51bd812f8fa14e0260166adcd Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 30 Jul 2022 12:08:13 +0100
Subject: [PATCH 3047/3183] 10.0.1-beta.2

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 9e23d644..1859a3cc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "10.0.1-beta.1",
+  "version": "10.0.1-beta.2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "10.0.1-beta.1",
+      "version": "10.0.1-beta.2",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index cf5da586..d8b68403 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "10.0.1-beta.1",
+  "version": "10.0.1-beta.2",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From 0019c6f1d1bc3efee61751b1f003af0545ea55dd Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 3 Sep 2022 15:24:57 +0100
Subject: [PATCH 3048/3183] support zigbee bridge pro

---
 lib/utils/constants.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 52f95cbe..6ed4e681 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -335,7 +335,7 @@ export default {
     diffuser: [25],
     camera: [87],
     rfBridge: [28, 98],
-    zbBridge: [66],
+    zbBridge: [66, 168],
     zbSwitchStateless: [1000],
     zbLightDimmer: [1257],
     zbLightCCT: [1258],
@@ -478,6 +478,7 @@ export default {
     161: 2, // "SwitchMan Smart Wall Switch-M5 - 2 Gang"
     162: 3, // "SwitchMan Smart Wall Switch-M5 - 3 Gang"
     165: 2, // "DUALR3 Lite"
+    168: 1, // Zigbee Bridge Pro
     177: 1, // Switch Mate
     181: 1, // Sonoff TH Elite THR316 and THR320
     182: 1, // Power Detection Plug Overload Alarm-Multi-Channel Protocols (S40)

From e1394d9506c0880af733b0ce47a58c7537232d70 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 3 Sep 2022 15:32:25 +0100
Subject: [PATCH 3049/3183] update dependencies

---
 package-lock.json | 824 +++++++++++++++++++++++++++++++++++++---------
 package.json      |   6 +-
 2 files changed, 668 insertions(+), 162 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 1859a3cc..62f3348f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -35,26 +35,26 @@
         "ws": "^8.8.1"
       },
       "devDependencies": {
-        "eslint": "^8.20.0",
+        "eslint": "^8.23.0",
         "eslint-config-airbnb-base": "^15.0.0",
         "eslint-plugin-import": "^2.26.0",
         "eslint-plugin-import-newlines": "^1.2.3",
         "eslint-plugin-sort-exports": "^0.7.0"
       },
       "engines": {
-        "homebridge": "^1.4.0",
-        "node": "^14.20.0 || ^16.16.0"
+        "homebridge": "^1.5.0",
+        "node": "^14.20.0 || ^16.17.0"
       }
     },
     "node_modules/@eslint/eslintrc": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.0.tgz",
-      "integrity": "sha512-UWW0TMTmk2d7hLcWD1/e2g5HDM/HQ3csaLSqXCfqwh4uNDuNqlaKWXmEsL4Cs41Z0KnILNvwbHAah3C2yt06kw==",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.1.tgz",
+      "integrity": "sha512-OhSY22oQQdw3zgPOOwdoj01l/Dzl1Z+xyUP33tkSN+aqyEhymJCcPHyXt+ylW8FSe0TfRC2VG+ROQOapD0aZSQ==",
       "dev": true,
       "dependencies": {
         "ajv": "^6.12.4",
         "debug": "^4.3.2",
-        "espree": "^9.3.2",
+        "espree": "^9.4.0",
         "globals": "^13.15.0",
         "ignore": "^5.2.0",
         "import-fresh": "^3.2.1",
@@ -64,6 +64,9 @@
       },
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
       }
     },
     "node_modules/@homebridge/plugin-ui-utils": {
@@ -72,9 +75,9 @@
       "integrity": "sha512-axFX7lN2Yd7bz/6SlD7dzq5sY/N9+XYuLHPukuiyHQRDtNMRL1uDqJhOx6RVaN2tYDHB75h7YxRQWP7U44Mgzg=="
     },
     "node_modules/@humanwhocodes/config-array": {
-      "version": "0.9.5",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.9.5.tgz",
-      "integrity": "sha512-ObyMyWxZiCu/yTisA7uzx81s40xR2fD5Cg/2Kq7G02ajkNubJf6BopgDTmDyc3U7sXpNKM8cYOw7s7Tyr+DnCw==",
+      "version": "0.10.4",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.10.4.tgz",
+      "integrity": "sha512-mXAIHxZT3Vcpg83opl1wGlVZ9xydbfZO3r5YfRSH6Gpp2J/PfdBP0wbDa2sO6/qRbcalpoevVyW6A/fI6LfeMw==",
       "dev": true,
       "dependencies": {
         "@humanwhocodes/object-schema": "^1.2.1",
@@ -85,12 +88,70 @@
         "node": ">=10.10.0"
       }
     },
+    "node_modules/@humanwhocodes/gitignore-to-minimatch": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/gitignore-to-minimatch/-/gitignore-to-minimatch-1.0.2.tgz",
+      "integrity": "sha512-rSqmMJDdLFUsyxR6FMtD00nfQKKLFb1kv+qBbOVKqErvloEIJLo5bDTJTQNTYgeyp78JsA7u/NPi5jT1GR/MuA==",
+      "dev": true,
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/nzakas"
+      }
+    },
+    "node_modules/@humanwhocodes/module-importer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
+      "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==",
+      "dev": true,
+      "engines": {
+        "node": ">=12.22"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/nzakas"
+      }
+    },
     "node_modules/@humanwhocodes/object-schema": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
       "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
       "dev": true
     },
+    "node_modules/@nodelib/fs.scandir": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
+      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
+      "dev": true,
+      "dependencies": {
+        "@nodelib/fs.stat": "2.0.5",
+        "run-parallel": "^1.1.9"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@nodelib/fs.stat": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
+      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
+      "dev": true,
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@nodelib/fs.walk": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
+      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
+      "dev": true,
+      "dependencies": {
+        "@nodelib/fs.scandir": "2.1.5",
+        "fastq": "^1.6.0"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
     "node_modules/@types/json5": {
       "version": "0.0.29",
       "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
@@ -183,6 +244,15 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/array-union": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
+      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/array.prototype.flat": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.0.tgz",
@@ -231,6 +301,18 @@
         "concat-map": "0.0.1"
       }
     },
+    "node_modules/braces": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "dev": true,
+      "dependencies": {
+        "fill-range": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/call-bind": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
@@ -374,6 +456,18 @@
         "node": ">=0.4.0"
       }
     },
+    "node_modules/dir-glob": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
+      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
+      "dev": true,
+      "dependencies": {
+        "path-type": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/doctrine": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
@@ -387,15 +481,15 @@
       }
     },
     "node_modules/es-abstract": {
-      "version": "1.20.1",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.1.tgz",
-      "integrity": "sha512-WEm2oBhfoI2sImeM4OF2zE2V3BYdSF+KnSi9Sidz51fQHd7+JuF8Xgcj9/0o+OWeIeIS/MiuNnlruQrJf16GQA==",
+      "version": "1.20.2",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.2.tgz",
+      "integrity": "sha512-XxXQuVNrySBNlEkTYJoDNFe5+s2yIOpzq80sUHEdPdQr0S5nTLz4ZPPPswNIpKseDDUS5yghX1gfLIHQZ1iNuQ==",
       "dependencies": {
         "call-bind": "^1.0.2",
         "es-to-primitive": "^1.2.1",
         "function-bind": "^1.1.1",
         "function.prototype.name": "^1.1.5",
-        "get-intrinsic": "^1.1.1",
+        "get-intrinsic": "^1.1.2",
         "get-symbol-description": "^1.0.0",
         "has": "^1.0.3",
         "has-property-descriptors": "^1.0.0",
@@ -407,9 +501,9 @@
         "is-shared-array-buffer": "^1.0.2",
         "is-string": "^1.0.7",
         "is-weakref": "^1.0.2",
-        "object-inspect": "^1.12.0",
+        "object-inspect": "^1.12.2",
         "object-keys": "^1.1.1",
-        "object.assign": "^4.1.2",
+        "object.assign": "^4.1.4",
         "regexp.prototype.flags": "^1.4.3",
         "string.prototype.trimend": "^1.0.5",
         "string.prototype.trimstart": "^1.0.5",
@@ -460,13 +554,15 @@
       }
     },
     "node_modules/eslint": {
-      "version": "8.20.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.20.0.tgz",
-      "integrity": "sha512-d4ixhz5SKCa1D6SCPrivP7yYVi7nyD6A4vs6HIAul9ujBzcEmZVM3/0NN/yu5nKhmO1wjp5xQ46iRfmDGlOviA==",
+      "version": "8.23.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.23.0.tgz",
+      "integrity": "sha512-pBG/XOn0MsJcKcTRLr27S5HpzQo4kLr+HjLQIyK4EiCsijDl/TB+h5uEuJU6bQ8Edvwz1XWOjpaP2qgnXGpTcA==",
       "dev": true,
       "dependencies": {
-        "@eslint/eslintrc": "^1.3.0",
-        "@humanwhocodes/config-array": "^0.9.2",
+        "@eslint/eslintrc": "^1.3.1",
+        "@humanwhocodes/config-array": "^0.10.4",
+        "@humanwhocodes/gitignore-to-minimatch": "^1.0.2",
+        "@humanwhocodes/module-importer": "^1.0.1",
         "ajv": "^6.10.0",
         "chalk": "^4.0.0",
         "cross-spawn": "^7.0.2",
@@ -476,14 +572,17 @@
         "eslint-scope": "^7.1.1",
         "eslint-utils": "^3.0.0",
         "eslint-visitor-keys": "^3.3.0",
-        "espree": "^9.3.2",
+        "espree": "^9.4.0",
         "esquery": "^1.4.0",
         "esutils": "^2.0.2",
         "fast-deep-equal": "^3.1.3",
         "file-entry-cache": "^6.0.1",
+        "find-up": "^5.0.0",
         "functional-red-black-tree": "^1.0.1",
         "glob-parent": "^6.0.1",
         "globals": "^13.15.0",
+        "globby": "^11.1.0",
+        "grapheme-splitter": "^1.0.4",
         "ignore": "^5.2.0",
         "import-fresh": "^3.0.0",
         "imurmurhash": "^0.1.4",
@@ -498,8 +597,7 @@
         "regexpp": "^3.2.0",
         "strip-ansi": "^6.0.1",
         "strip-json-comments": "^3.1.0",
-        "text-table": "^0.2.0",
-        "v8-compile-cache": "^2.0.3"
+        "text-table": "^0.2.0"
       },
       "bin": {
         "eslint": "bin/eslint.js"
@@ -550,16 +648,20 @@
       }
     },
     "node_modules/eslint-module-utils": {
-      "version": "2.7.3",
-      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.3.tgz",
-      "integrity": "sha512-088JEC7O3lDZM9xGe0RerkOMd0EjFl+Yvd1jPWIkMT5u3H9+HC34mWWPnqPrN13gieT9pBOO+Qt07Nb/6TresQ==",
+      "version": "2.7.4",
+      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.4.tgz",
+      "integrity": "sha512-j4GT+rqzCoRKHwURX7pddtIPGySnX9Si/cgMI5ztrcqOPtk5dDEeZ34CQVPphnqkJytlc97Vuk05Um2mJ3gEQA==",
       "dev": true,
       "dependencies": {
-        "debug": "^3.2.7",
-        "find-up": "^2.1.0"
+        "debug": "^3.2.7"
       },
       "engines": {
         "node": ">=4"
+      },
+      "peerDependenciesMeta": {
+        "eslint": {
+          "optional": true
+        }
       }
     },
     "node_modules/eslint-module-utils/node_modules/debug": {
@@ -699,17 +801,20 @@
       }
     },
     "node_modules/espree": {
-      "version": "9.3.2",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-9.3.2.tgz",
-      "integrity": "sha512-D211tC7ZwouTIuY5x9XnS0E9sWNChB7IYKX/Xp5eQj3nFXhqmiUDB9q27y76oFl8jTg3pXcQx/bpxMfs3CIZbA==",
+      "version": "9.4.0",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-9.4.0.tgz",
+      "integrity": "sha512-DQmnRpLj7f6TgN/NYb0MTzJXL+vJF9h3pHy4JhCIs3zwcgez8xmGg3sXHcEO97BrmO2OSvCwMdfdlyl+E9KjOw==",
       "dev": true,
       "dependencies": {
-        "acorn": "^8.7.1",
+        "acorn": "^8.8.0",
         "acorn-jsx": "^5.3.2",
         "eslint-visitor-keys": "^3.3.0"
       },
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
       }
     },
     "node_modules/esquery": {
@@ -765,6 +870,34 @@
       "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
       "dev": true
     },
+    "node_modules/fast-glob": {
+      "version": "3.2.11",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz",
+      "integrity": "sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==",
+      "dev": true,
+      "dependencies": {
+        "@nodelib/fs.stat": "^2.0.2",
+        "@nodelib/fs.walk": "^1.2.3",
+        "glob-parent": "^5.1.2",
+        "merge2": "^1.3.0",
+        "micromatch": "^4.0.4"
+      },
+      "engines": {
+        "node": ">=8.6.0"
+      }
+    },
+    "node_modules/fast-glob/node_modules/glob-parent": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "dev": true,
+      "dependencies": {
+        "is-glob": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
     "node_modules/fast-json-stable-stringify": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
@@ -777,6 +910,15 @@
       "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
       "dev": true
     },
+    "node_modules/fastq": {
+      "version": "1.13.0",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz",
+      "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==",
+      "dev": true,
+      "dependencies": {
+        "reusify": "^1.0.4"
+      }
+    },
     "node_modules/file-entry-cache": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
@@ -789,16 +931,32 @@
         "node": "^10.12.0 || >=12.0.0"
       }
     },
+    "node_modules/fill-range": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+      "dev": true,
+      "dependencies": {
+        "to-regex-range": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/find-up": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
-      "integrity": "sha512-NWzkk0jSJtTt08+FBFMvXoeZnOJD+jTtsRmBYbAIzJdX6l7dLgR7CTubCM5/eDdPUBvLCeVasP1brfVR/9/EZQ==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
+      "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
       "dev": true,
       "dependencies": {
-        "locate-path": "^2.0.0"
+        "locate-path": "^6.0.0",
+        "path-exists": "^4.0.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/flat-cache": {
@@ -815,9 +973,9 @@
       }
     },
     "node_modules/flatted": {
-      "version": "3.2.6",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.6.tgz",
-      "integrity": "sha512-0sQoMh9s0BYsm+12Huy/rkKxVu4R1+r96YX5cG44rHV0pQ6iC3Q+mkoMFaGWObMFYQxCVT+ssG1ksneA2MI9KQ==",
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz",
+      "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==",
       "dev": true
     },
     "node_modules/follow-redirects": {
@@ -969,6 +1127,32 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/globby": {
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
+      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
+      "dev": true,
+      "dependencies": {
+        "array-union": "^2.1.0",
+        "dir-glob": "^3.0.1",
+        "fast-glob": "^3.2.9",
+        "ignore": "^5.2.0",
+        "merge2": "^1.4.1",
+        "slash": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/grapheme-splitter": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz",
+      "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==",
+      "dev": true
+    },
     "node_modules/has": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
@@ -1134,9 +1318,9 @@
       }
     },
     "node_modules/is-core-module": {
-      "version": "2.9.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.9.0.tgz",
-      "integrity": "sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==",
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.10.0.tgz",
+      "integrity": "sha512-Erxj2n/LDAZ7H8WNJXd9tw38GYM3dv8rk8Zcs+jJuxYTW7sozH+SS8NtrSjVL1/vpLvWi1hxy96IzjJ3EHTJJg==",
       "dev": true,
       "dependencies": {
         "has": "^1.0.3"
@@ -1191,6 +1375,15 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/is-number": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.12.0"
+      }
+    },
     "node_modules/is-number-object": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
@@ -1326,16 +1519,18 @@
       }
     },
     "node_modules/locate-path": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
-      "integrity": "sha512-NCI2kiDkyR7VeEKm27Kda/iQHyKJe1Bu0FlTbYp3CqJu+9IFe9bLyAjMxf5ZDDbEg+iMPzB5zYyUTSm8wVTKmA==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
+      "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
       "dev": true,
       "dependencies": {
-        "p-locate": "^2.0.0",
-        "path-exists": "^3.0.0"
+        "p-locate": "^5.0.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/lodash.merge": {
@@ -1344,6 +1539,28 @@
       "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
       "dev": true
     },
+    "node_modules/merge2": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
+      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/micromatch": {
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
+      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
+      "dev": true,
+      "dependencies": {
+        "braces": "^3.0.2",
+        "picomatch": "^2.3.1"
+      },
+      "engines": {
+        "node": ">=8.6"
+      }
+    },
     "node_modules/mime-db": {
       "version": "1.52.0",
       "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
@@ -1418,13 +1635,13 @@
       }
     },
     "node_modules/object.assign": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
-      "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
+      "version": "4.1.4",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",
+      "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
       "dependencies": {
-        "call-bind": "^1.0.0",
-        "define-properties": "^1.1.3",
-        "has-symbols": "^1.0.1",
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "has-symbols": "^1.0.3",
         "object-keys": "^1.1.1"
       },
       "engines": {
@@ -1492,27 +1709,33 @@
       }
     },
     "node_modules/p-limit": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
-      "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
       "dev": true,
       "dependencies": {
-        "p-try": "^1.0.0"
+        "yocto-queue": "^0.1.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/p-locate": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
-      "integrity": "sha512-nQja7m7gSKuewoVRen45CtVfODR3crN3goVQ0DDZ9N3yHxgpkuBhZqsaiotSQRrADUrne346peY7kT3TSACykg==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
+      "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
       "dev": true,
       "dependencies": {
-        "p-limit": "^1.1.0"
+        "p-limit": "^3.0.2"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/p-queue": {
@@ -1541,15 +1764,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/p-try": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
-      "integrity": "sha512-U1etNYuMJoIz3ZXSrrySFjsXQTWOx2/jdi86L+2pRvph/qMKL6sbcCYdH23fqsbm8TH2Gn0OybpT4eSFlCVHww==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/parent-module": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
@@ -1563,12 +1777,12 @@
       }
     },
     "node_modules/path-exists": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-      "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
       "dev": true,
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
       }
     },
     "node_modules/path-is-absolute": {
@@ -1595,6 +1809,27 @@
       "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
       "dev": true
     },
+    "node_modules/path-type": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
+      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/picomatch": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "dev": true,
+      "engines": {
+        "node": ">=8.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
     "node_modules/prelude-ls": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
@@ -1645,6 +1880,26 @@
         "node": ">=6"
       }
     },
+    "node_modules/queue-microtask": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
+      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
     "node_modules/regexp.prototype.flags": {
       "version": "1.4.3",
       "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
@@ -1699,6 +1954,16 @@
         "node": ">=4"
       }
     },
+    "node_modules/reusify": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
+      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
+      "dev": true,
+      "engines": {
+        "iojs": ">=1.0.0",
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/rimraf": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
@@ -1714,6 +1979,29 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
+    "node_modules/run-parallel": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
+      "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "dependencies": {
+        "queue-microtask": "^1.2.2"
+      }
+    },
     "node_modules/semver": {
       "version": "6.3.0",
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
@@ -1757,6 +2045,15 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/slash": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/string.prototype.trimend": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz",
@@ -1846,6 +2143,18 @@
       "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
       "dev": true
     },
+    "node_modules/to-regex-range": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+      "dev": true,
+      "dependencies": {
+        "is-number": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=8.0"
+      }
+    },
     "node_modules/tsconfig-paths": {
       "version": "3.14.1",
       "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz",
@@ -1905,12 +2214,6 @@
         "punycode": "^2.1.0"
       }
     },
-    "node_modules/v8-compile-cache": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
-      "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==",
-      "dev": true
-    },
     "node_modules/websocket-as-promised": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/websocket-as-promised/-/websocket-as-promised-2.0.1.tgz",
@@ -1989,18 +2292,30 @@
           "optional": true
         }
       }
+    },
+    "node_modules/yocto-queue": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
+      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
     }
   },
   "dependencies": {
     "@eslint/eslintrc": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.0.tgz",
-      "integrity": "sha512-UWW0TMTmk2d7hLcWD1/e2g5HDM/HQ3csaLSqXCfqwh4uNDuNqlaKWXmEsL4Cs41Z0KnILNvwbHAah3C2yt06kw==",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.1.tgz",
+      "integrity": "sha512-OhSY22oQQdw3zgPOOwdoj01l/Dzl1Z+xyUP33tkSN+aqyEhymJCcPHyXt+ylW8FSe0TfRC2VG+ROQOapD0aZSQ==",
       "dev": true,
       "requires": {
         "ajv": "^6.12.4",
         "debug": "^4.3.2",
-        "espree": "^9.3.2",
+        "espree": "^9.4.0",
         "globals": "^13.15.0",
         "ignore": "^5.2.0",
         "import-fresh": "^3.2.1",
@@ -2015,9 +2330,9 @@
       "integrity": "sha512-axFX7lN2Yd7bz/6SlD7dzq5sY/N9+XYuLHPukuiyHQRDtNMRL1uDqJhOx6RVaN2tYDHB75h7YxRQWP7U44Mgzg=="
     },
     "@humanwhocodes/config-array": {
-      "version": "0.9.5",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.9.5.tgz",
-      "integrity": "sha512-ObyMyWxZiCu/yTisA7uzx81s40xR2fD5Cg/2Kq7G02ajkNubJf6BopgDTmDyc3U7sXpNKM8cYOw7s7Tyr+DnCw==",
+      "version": "0.10.4",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.10.4.tgz",
+      "integrity": "sha512-mXAIHxZT3Vcpg83opl1wGlVZ9xydbfZO3r5YfRSH6Gpp2J/PfdBP0wbDa2sO6/qRbcalpoevVyW6A/fI6LfeMw==",
       "dev": true,
       "requires": {
         "@humanwhocodes/object-schema": "^1.2.1",
@@ -2025,12 +2340,50 @@
         "minimatch": "^3.0.4"
       }
     },
+    "@humanwhocodes/gitignore-to-minimatch": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/gitignore-to-minimatch/-/gitignore-to-minimatch-1.0.2.tgz",
+      "integrity": "sha512-rSqmMJDdLFUsyxR6FMtD00nfQKKLFb1kv+qBbOVKqErvloEIJLo5bDTJTQNTYgeyp78JsA7u/NPi5jT1GR/MuA==",
+      "dev": true
+    },
+    "@humanwhocodes/module-importer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
+      "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==",
+      "dev": true
+    },
     "@humanwhocodes/object-schema": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
       "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
       "dev": true
     },
+    "@nodelib/fs.scandir": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
+      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
+      "dev": true,
+      "requires": {
+        "@nodelib/fs.stat": "2.0.5",
+        "run-parallel": "^1.1.9"
+      }
+    },
+    "@nodelib/fs.stat": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
+      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
+      "dev": true
+    },
+    "@nodelib/fs.walk": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
+      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
+      "dev": true,
+      "requires": {
+        "@nodelib/fs.scandir": "2.1.5",
+        "fastq": "^1.6.0"
+      }
+    },
     "@types/json5": {
       "version": "0.0.29",
       "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
@@ -2096,6 +2449,12 @@
         "is-string": "^1.0.7"
       }
     },
+    "array-union": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
+      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
+      "dev": true
+    },
     "array.prototype.flat": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.0.tgz",
@@ -2138,6 +2497,15 @@
         "concat-map": "0.0.1"
       }
     },
+    "braces": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "dev": true,
+      "requires": {
+        "fill-range": "^7.0.1"
+      }
+    },
     "call-bind": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
@@ -2243,6 +2611,15 @@
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
       "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ=="
     },
+    "dir-glob": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
+      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
+      "dev": true,
+      "requires": {
+        "path-type": "^4.0.0"
+      }
+    },
     "doctrine": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
@@ -2253,15 +2630,15 @@
       }
     },
     "es-abstract": {
-      "version": "1.20.1",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.1.tgz",
-      "integrity": "sha512-WEm2oBhfoI2sImeM4OF2zE2V3BYdSF+KnSi9Sidz51fQHd7+JuF8Xgcj9/0o+OWeIeIS/MiuNnlruQrJf16GQA==",
+      "version": "1.20.2",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.2.tgz",
+      "integrity": "sha512-XxXQuVNrySBNlEkTYJoDNFe5+s2yIOpzq80sUHEdPdQr0S5nTLz4ZPPPswNIpKseDDUS5yghX1gfLIHQZ1iNuQ==",
       "requires": {
         "call-bind": "^1.0.2",
         "es-to-primitive": "^1.2.1",
         "function-bind": "^1.1.1",
         "function.prototype.name": "^1.1.5",
-        "get-intrinsic": "^1.1.1",
+        "get-intrinsic": "^1.1.2",
         "get-symbol-description": "^1.0.0",
         "has": "^1.0.3",
         "has-property-descriptors": "^1.0.0",
@@ -2273,9 +2650,9 @@
         "is-shared-array-buffer": "^1.0.2",
         "is-string": "^1.0.7",
         "is-weakref": "^1.0.2",
-        "object-inspect": "^1.12.0",
+        "object-inspect": "^1.12.2",
         "object-keys": "^1.1.1",
-        "object.assign": "^4.1.2",
+        "object.assign": "^4.1.4",
         "regexp.prototype.flags": "^1.4.3",
         "string.prototype.trimend": "^1.0.5",
         "string.prototype.trimstart": "^1.0.5",
@@ -2308,13 +2685,15 @@
       "dev": true
     },
     "eslint": {
-      "version": "8.20.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.20.0.tgz",
-      "integrity": "sha512-d4ixhz5SKCa1D6SCPrivP7yYVi7nyD6A4vs6HIAul9ujBzcEmZVM3/0NN/yu5nKhmO1wjp5xQ46iRfmDGlOviA==",
+      "version": "8.23.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.23.0.tgz",
+      "integrity": "sha512-pBG/XOn0MsJcKcTRLr27S5HpzQo4kLr+HjLQIyK4EiCsijDl/TB+h5uEuJU6bQ8Edvwz1XWOjpaP2qgnXGpTcA==",
       "dev": true,
       "requires": {
-        "@eslint/eslintrc": "^1.3.0",
-        "@humanwhocodes/config-array": "^0.9.2",
+        "@eslint/eslintrc": "^1.3.1",
+        "@humanwhocodes/config-array": "^0.10.4",
+        "@humanwhocodes/gitignore-to-minimatch": "^1.0.2",
+        "@humanwhocodes/module-importer": "^1.0.1",
         "ajv": "^6.10.0",
         "chalk": "^4.0.0",
         "cross-spawn": "^7.0.2",
@@ -2324,14 +2703,17 @@
         "eslint-scope": "^7.1.1",
         "eslint-utils": "^3.0.0",
         "eslint-visitor-keys": "^3.3.0",
-        "espree": "^9.3.2",
+        "espree": "^9.4.0",
         "esquery": "^1.4.0",
         "esutils": "^2.0.2",
         "fast-deep-equal": "^3.1.3",
         "file-entry-cache": "^6.0.1",
+        "find-up": "^5.0.0",
         "functional-red-black-tree": "^1.0.1",
         "glob-parent": "^6.0.1",
         "globals": "^13.15.0",
+        "globby": "^11.1.0",
+        "grapheme-splitter": "^1.0.4",
         "ignore": "^5.2.0",
         "import-fresh": "^3.0.0",
         "imurmurhash": "^0.1.4",
@@ -2346,8 +2728,7 @@
         "regexpp": "^3.2.0",
         "strip-ansi": "^6.0.1",
         "strip-json-comments": "^3.1.0",
-        "text-table": "^0.2.0",
-        "v8-compile-cache": "^2.0.3"
+        "text-table": "^0.2.0"
       }
     },
     "eslint-config-airbnb-base": {
@@ -2384,13 +2765,12 @@
       }
     },
     "eslint-module-utils": {
-      "version": "2.7.3",
-      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.3.tgz",
-      "integrity": "sha512-088JEC7O3lDZM9xGe0RerkOMd0EjFl+Yvd1jPWIkMT5u3H9+HC34mWWPnqPrN13gieT9pBOO+Qt07Nb/6TresQ==",
+      "version": "2.7.4",
+      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.4.tgz",
+      "integrity": "sha512-j4GT+rqzCoRKHwURX7pddtIPGySnX9Si/cgMI5ztrcqOPtk5dDEeZ34CQVPphnqkJytlc97Vuk05Um2mJ3gEQA==",
       "dev": true,
       "requires": {
-        "debug": "^3.2.7",
-        "find-up": "^2.1.0"
+        "debug": "^3.2.7"
       },
       "dependencies": {
         "debug": {
@@ -2499,12 +2879,12 @@
       "dev": true
     },
     "espree": {
-      "version": "9.3.2",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-9.3.2.tgz",
-      "integrity": "sha512-D211tC7ZwouTIuY5x9XnS0E9sWNChB7IYKX/Xp5eQj3nFXhqmiUDB9q27y76oFl8jTg3pXcQx/bpxMfs3CIZbA==",
+      "version": "9.4.0",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-9.4.0.tgz",
+      "integrity": "sha512-DQmnRpLj7f6TgN/NYb0MTzJXL+vJF9h3pHy4JhCIs3zwcgez8xmGg3sXHcEO97BrmO2OSvCwMdfdlyl+E9KjOw==",
       "dev": true,
       "requires": {
-        "acorn": "^8.7.1",
+        "acorn": "^8.8.0",
         "acorn-jsx": "^5.3.2",
         "eslint-visitor-keys": "^3.3.0"
       }
@@ -2550,6 +2930,30 @@
       "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
       "dev": true
     },
+    "fast-glob": {
+      "version": "3.2.11",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz",
+      "integrity": "sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==",
+      "dev": true,
+      "requires": {
+        "@nodelib/fs.stat": "^2.0.2",
+        "@nodelib/fs.walk": "^1.2.3",
+        "glob-parent": "^5.1.2",
+        "merge2": "^1.3.0",
+        "micromatch": "^4.0.4"
+      },
+      "dependencies": {
+        "glob-parent": {
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+          "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+          "dev": true,
+          "requires": {
+            "is-glob": "^4.0.1"
+          }
+        }
+      }
+    },
     "fast-json-stable-stringify": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
@@ -2562,6 +2966,15 @@
       "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
       "dev": true
     },
+    "fastq": {
+      "version": "1.13.0",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz",
+      "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==",
+      "dev": true,
+      "requires": {
+        "reusify": "^1.0.4"
+      }
+    },
     "file-entry-cache": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
@@ -2571,13 +2984,23 @@
         "flat-cache": "^3.0.4"
       }
     },
+    "fill-range": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+      "dev": true,
+      "requires": {
+        "to-regex-range": "^5.0.1"
+      }
+    },
     "find-up": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
-      "integrity": "sha512-NWzkk0jSJtTt08+FBFMvXoeZnOJD+jTtsRmBYbAIzJdX6l7dLgR7CTubCM5/eDdPUBvLCeVasP1brfVR/9/EZQ==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
+      "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
       "dev": true,
       "requires": {
-        "locate-path": "^2.0.0"
+        "locate-path": "^6.0.0",
+        "path-exists": "^4.0.0"
       }
     },
     "flat-cache": {
@@ -2591,9 +3014,9 @@
       }
     },
     "flatted": {
-      "version": "3.2.6",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.6.tgz",
-      "integrity": "sha512-0sQoMh9s0BYsm+12Huy/rkKxVu4R1+r96YX5cG44rHV0pQ6iC3Q+mkoMFaGWObMFYQxCVT+ssG1ksneA2MI9KQ==",
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz",
+      "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==",
       "dev": true
     },
     "follow-redirects": {
@@ -2695,6 +3118,26 @@
         "type-fest": "^0.20.2"
       }
     },
+    "globby": {
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
+      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
+      "dev": true,
+      "requires": {
+        "array-union": "^2.1.0",
+        "dir-glob": "^3.0.1",
+        "fast-glob": "^3.2.9",
+        "ignore": "^5.2.0",
+        "merge2": "^1.4.1",
+        "slash": "^3.0.0"
+      }
+    },
+    "grapheme-splitter": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz",
+      "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==",
+      "dev": true
+    },
     "has": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
@@ -2806,9 +3249,9 @@
       "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w=="
     },
     "is-core-module": {
-      "version": "2.9.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.9.0.tgz",
-      "integrity": "sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==",
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.10.0.tgz",
+      "integrity": "sha512-Erxj2n/LDAZ7H8WNJXd9tw38GYM3dv8rk8Zcs+jJuxYTW7sozH+SS8NtrSjVL1/vpLvWi1hxy96IzjJ3EHTJJg==",
       "dev": true,
       "requires": {
         "has": "^1.0.3"
@@ -2842,6 +3285,12 @@
       "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
       "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA=="
     },
+    "is-number": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "dev": true
+    },
     "is-number-object": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
@@ -2938,13 +3387,12 @@
       }
     },
     "locate-path": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
-      "integrity": "sha512-NCI2kiDkyR7VeEKm27Kda/iQHyKJe1Bu0FlTbYp3CqJu+9IFe9bLyAjMxf5ZDDbEg+iMPzB5zYyUTSm8wVTKmA==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
+      "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
       "dev": true,
       "requires": {
-        "p-locate": "^2.0.0",
-        "path-exists": "^3.0.0"
+        "p-locate": "^5.0.0"
       }
     },
     "lodash.merge": {
@@ -2953,6 +3401,22 @@
       "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
       "dev": true
     },
+    "merge2": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
+      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
+      "dev": true
+    },
+    "micromatch": {
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
+      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
+      "dev": true,
+      "requires": {
+        "braces": "^3.0.2",
+        "picomatch": "^2.3.1"
+      }
+    },
     "mime-db": {
       "version": "1.52.0",
       "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
@@ -3009,13 +3473,13 @@
       "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="
     },
     "object.assign": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
-      "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
+      "version": "4.1.4",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",
+      "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
       "requires": {
-        "call-bind": "^1.0.0",
-        "define-properties": "^1.1.3",
-        "has-symbols": "^1.0.1",
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "has-symbols": "^1.0.3",
         "object-keys": "^1.1.1"
       }
     },
@@ -3065,21 +3529,21 @@
       }
     },
     "p-limit": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
-      "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
       "dev": true,
       "requires": {
-        "p-try": "^1.0.0"
+        "yocto-queue": "^0.1.0"
       }
     },
     "p-locate": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
-      "integrity": "sha512-nQja7m7gSKuewoVRen45CtVfODR3crN3goVQ0DDZ9N3yHxgpkuBhZqsaiotSQRrADUrne346peY7kT3TSACykg==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
+      "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
       "dev": true,
       "requires": {
-        "p-limit": "^1.1.0"
+        "p-limit": "^3.0.2"
       }
     },
     "p-queue": {
@@ -3096,12 +3560,6 @@
       "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-5.1.0.tgz",
       "integrity": "sha512-auFDyzzzGZZZdHz3BtET9VEz0SE/uMEAx7uWfGPucfzEwwe/xH0iVeZibQmANYE/hp9T2+UUZT5m+BKyrDp3Ew=="
     },
-    "p-try": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
-      "integrity": "sha512-U1etNYuMJoIz3ZXSrrySFjsXQTWOx2/jdi86L+2pRvph/qMKL6sbcCYdH23fqsbm8TH2Gn0OybpT4eSFlCVHww==",
-      "dev": true
-    },
     "parent-module": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
@@ -3112,9 +3570,9 @@
       }
     },
     "path-exists": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-      "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
       "dev": true
     },
     "path-is-absolute": {
@@ -3135,6 +3593,18 @@
       "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
       "dev": true
     },
+    "path-type": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
+      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
+      "dev": true
+    },
+    "picomatch": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "dev": true
+    },
     "prelude-ls": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
@@ -3167,6 +3637,12 @@
       "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
       "dev": true
     },
+    "queue-microtask": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
+      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
+      "dev": true
+    },
     "regexp.prototype.flags": {
       "version": "1.4.3",
       "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
@@ -3200,6 +3676,12 @@
       "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
       "dev": true
     },
+    "reusify": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
+      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
+      "dev": true
+    },
     "rimraf": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
@@ -3209,6 +3691,15 @@
         "glob": "^7.1.3"
       }
     },
+    "run-parallel": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
+      "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
+      "dev": true,
+      "requires": {
+        "queue-microtask": "^1.2.2"
+      }
+    },
     "semver": {
       "version": "6.3.0",
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
@@ -3240,6 +3731,12 @@
         "object-inspect": "^1.9.0"
       }
     },
+    "slash": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+      "dev": true
+    },
     "string.prototype.trimend": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz",
@@ -3302,6 +3799,15 @@
       "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
       "dev": true
     },
+    "to-regex-range": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+      "dev": true,
+      "requires": {
+        "is-number": "^7.0.0"
+      }
+    },
     "tsconfig-paths": {
       "version": "3.14.1",
       "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz",
@@ -3349,12 +3855,6 @@
         "punycode": "^2.1.0"
       }
     },
-    "v8-compile-cache": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
-      "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==",
-      "dev": true
-    },
     "websocket-as-promised": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/websocket-as-promised/-/websocket-as-promised-2.0.1.tgz",
@@ -3404,6 +3904,12 @@
       "resolved": "https://registry.npmjs.org/ws/-/ws-8.8.1.tgz",
       "integrity": "sha512-bGy2JzvzkPowEJV++hF07hAD6niYSr0JzBNo/J29WsB57A2r7Wlc1UFcTR9IzrPvuNVO4B8LGqF8qcpsVOhJCA==",
       "requires": {}
+    },
+    "yocto-queue": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
+      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
+      "dev": true
     }
   }
 }
diff --git a/package.json b/package.json
index d8b68403..6a93837f 100644
--- a/package.json
+++ b/package.json
@@ -30,8 +30,8 @@
     "rebuild": "rm -rf package-lock.json && rm -rf node_modules && npm install"
   },
   "engines": {
-    "homebridge": "^1.4.0",
-    "node": "^14.20.0 || ^16.16.0"
+    "homebridge": "^1.5.0",
+    "node": "^14.20.0 || ^16.17.0"
   },
   "repository": {
     "type": "git",
@@ -71,6 +71,6 @@
     "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-import-newlines": "^1.2.3",
     "eslint-plugin-sort-exports": "^0.7.0",
-    "eslint": "^8.20.0"
+    "eslint": "^8.23.0"
   }
 }

From 3213ce98a5e0438886ada28300e89a2472b7ecc8 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 3 Sep 2022 15:32:59 +0100
Subject: [PATCH 3050/3183] start to support zigbee rgbcct light

---
 lib/device/zigbee/index.js         |   2 +
 lib/device/zigbee/light-rgb-cct.js | 105 +++++++++++++++++++++++++++++
 lib/platform.js                    |  13 +++-
 lib/utils/constants.js             |   7 ++
 4 files changed, 124 insertions(+), 3 deletions(-)
 create mode 100644 lib/device/zigbee/light-rgb-cct.js

diff --git a/lib/device/zigbee/index.js b/lib/device/zigbee/index.js
index 4833aa31..0c618324 100644
--- a/lib/device/zigbee/index.js
+++ b/lib/device/zigbee/index.js
@@ -1,5 +1,6 @@
 import deviceLightCCT from './light-cct.js';
 import deviceLightDimmer from './light-dimmer.js';
+import deviceLightRGBCCT from './light-rgb-cct.js';
 import deviceMotor from './motor.js';
 import deviceSensorAmbient from './sensor-ambient.js';
 import deviceSensorContact from './sensor-contact.js';
@@ -10,6 +11,7 @@ import deviceSwitchStateless from './switch-stateless.js';
 
 export default {
   deviceLightCCT,
+  deviceLightRGBCCT,
   deviceLightDimmer,
   deviceMotor,
   deviceSensorAmbient,
diff --git a/lib/device/zigbee/light-rgb-cct.js b/lib/device/zigbee/light-rgb-cct.js
new file mode 100644
index 00000000..b1fe75e9
--- /dev/null
+++ b/lib/device/zigbee/light-rgb-cct.js
@@ -0,0 +1,105 @@
+import platformConsts from '../../utils/constants.js';
+
+export default class {
+  constructor(platform, accessory) {
+    // Set up variables from the platform
+    this.hapChar = platform.api.hap.Characteristic;
+    this.hapErr = platform.api.hap.HapStatusError;
+    this.hapServ = platform.api.hap.Service;
+    this.lang = platform.lang;
+    this.log = platform.log;
+    this.platform = platform;
+
+    // Set up variables from the accessory
+    this.name = accessory.displayName;
+    this.accessory = accessory;
+
+    // Set up custom variables for this device type
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId] || {};
+    this.brightStep = deviceConf.brightnessStep
+      ? Math.min(deviceConf.brightnessStep, 100)
+      : platformConsts.defaultValues.brightnessStep;
+
+    // Set the correct logging variables for this accessory
+    switch (deviceConf.overrideLogging) {
+      case 'standard':
+        this.enableLogging = true;
+        this.enableDebugLogging = false;
+        break;
+      case 'debug':
+        this.enableLogging = true;
+        this.enableDebugLogging = true;
+        break;
+      case 'disable':
+        this.enableLogging = false;
+        this.enableDebugLogging = false;
+        break;
+      default:
+        this.enableLogging = !platform.config.disableDeviceLogging;
+        this.enableDebugLogging = platform.config.debug;
+        break;
+    }
+
+    // Add the lightbulb service if it doesn't already exist
+    this.service = this.accessory.getService(this.hapServ.Lightbulb)
+      || this.accessory.addService(this.hapServ.Lightbulb);
+
+    // Add the get/set handler to the lightbulb on/off characteristic
+    this.service
+      .getCharacteristic(this.hapChar.On)
+      .onGet(() => {
+        if (this.isOnline) {
+          return this.service.getCharacteristic(this.hapChar.On).value;
+        }
+        throw new this.hapErr(-70402);
+      })
+      .onSet(async (value) => {
+        this.internalStateUpdate(value);
+      });
+
+    // Output the customised options to the log
+    const normalLogging = this.enableLogging ? 'standard' : 'disable';
+    const opts = JSON.stringify({
+      brightnessStep: this.brightStep,
+      logging: this.enableDebugLogging ? 'debug' : normalLogging,
+    });
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts);
+  }
+
+  async internalStateUpdate(value) {
+    try {
+      const newValue = value ? 'on' : 'off';
+      await this.platform.sendDeviceUpdate(this.accessory, {
+        switch: newValue,
+      });
+      this.cacheState = newValue;
+      if (this.enableLogging) {
+        this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState);
+      }
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, true);
+      setTimeout(() => {
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on');
+      }, 2000);
+      throw new this.hapErr(-70402);
+    }
+  }
+
+  async externalUpdate(params) {
+    try {
+      if (params.switch && params.switch !== this.cacheState) {
+        this.cacheState = params.switch;
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on');
+        if (params.updateSource && this.enableLogging) {
+          this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState);
+        }
+      }
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, false);
+    }
+  }
+
+  markStatus(isOnline) {
+    this.isOnline = isOnline;
+  }
+}
diff --git a/lib/platform.js b/lib/platform.js
index 1444f055..200772d5 100644
--- a/lib/platform.js
+++ b/lib/platform.js
@@ -1381,10 +1381,17 @@ export default class {
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
         accessory.control = new deviceTypes.zb.deviceLightCCT(this, accessory);
         /** ********** */
+      } else if (platformConsts.devices.zbLightRGBCCT.includes(uiid)) {
+        /** ****************
+         ZB LIGHTS [RGB+CCT]
+         ***************** */
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+        accessory.control = new deviceTypes.zb.deviceLightRGBCCT(this, accessory);
+        /** ********** */
       } else if (platformConsts.devices.zbMotor.includes(uiid)) {
-        /** ************
-         ZB LIGHTS [CCT]
-         ************* */
+        /** *****
+         ZB MOTOR
+         ****** */
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
         accessory.control = new deviceTypes.zb.deviceMotor(this, accessory);
         /** ********** */
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 6ed4e681..dcf1cf1f 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -339,6 +339,7 @@ export default {
     zbSwitchStateless: [1000],
     zbLightDimmer: [1257],
     zbLightCCT: [1258],
+    zbLightRGBCCT: [3258],
     zbMotor: [1514],
     zbSensorAmbient: [1770],
     zbSensorMotion: [2026, 7002],
@@ -358,11 +359,13 @@ export default {
     'battery',
     'bright',
     'brightness',
+    'cctBrightness',
     'channel',
     'cmd',
     'color',
     'colorB',
     'colorG',
+    'colorMode',
     'colorR',
     'colorTemp',
     'config',
@@ -372,6 +375,7 @@ export default {
     'current_',
     'currLocation',
     'fan',
+    'hue',
     'humidity',
     'key',
     'light',
@@ -395,6 +399,8 @@ export default {
     'rfChl',
     'rfList',
     'rfTrig',
+    'rgbBrightness',
+    'saturation',
     'setclose',
     'smoke',
     'speed',
@@ -494,6 +500,7 @@ export default {
     2256: 2, // "ZIGBEE_SWITCH_2"
     3026: 1, // "ZIGBEE_DOOR_AND_WINDOW_SENSOR"
     3256: 3, // "ZIGBEE_SWITCH_3"
+    3258: 1, // "ZigbeeRGBLight"
     4026: 1, // "ZIGBEE_WATER_SENSOR"
     4256: 4, // "ZIGBEE_SWITCH_4"
     5000: 1, // Custom uiid for groups

From bd9d022b88b9efef1df6d9a1a62a483637f3ab48 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 3 Sep 2022 15:39:22 +0100
Subject: [PATCH 3051/3183] support some new devices

---
 lib/utils/constants.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index dcf1cf1f..111fbb4b 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -323,7 +323,7 @@ export default {
     lightDimmer: [36, 44, 57],
     lightRGB: [22],
     lightCCT: [103],
-    lightRGBCCT: [33, 59, 104, 136, 137],
+    lightRGBCCT: [33, 59, 104, 136, 137, 173],
     curtain: [11, 67],
     sensorContact: [102, 154],
     sensorAmbient: [15, 181],
@@ -335,7 +335,7 @@ export default {
     diffuser: [25],
     camera: [87],
     rfBridge: [28, 98],
-    zbBridge: [66, 168],
+    zbBridge: [66, 128, 168], // 128 not technically Zigbee, but same data structure
     zbSwitchStateless: [1000],
     zbLightDimmer: [1257],
     zbLightCCT: [1258],
@@ -347,7 +347,7 @@ export default {
     zbSensorWater: [4026],
     zbSensorSmoke: [5026],
     group: [5000],
-    template: [],
+    template: [130], // SPM sub unit
     cannotSupport: [0, 65, 118, 119, 120, 121],
     garageSensors: [102, 154, 3026],
     skipUpdateRequest: [1000],
@@ -472,6 +472,8 @@ export default {
     114: 3,
     126: 2, // "DUALR3"
     127: 1, // "GTTA127"
+    128: 1, // SPM Main Unit (same data structure as zigbee bridge)
+    130: 1, // SPM Sub Unit
     133: 1, // "NSPANEL"
     136: 1, // RGB Five-Color Light_Support 2.4G eWeLink-Remote
     137: 1, // "L2/SPIDER CONTROLLER"
@@ -485,6 +487,7 @@ export default {
     162: 3, // "SwitchMan Smart Wall Switch-M5 - 3 Gang"
     165: 2, // "DUALR3 Lite"
     168: 1, // Zigbee Bridge Pro
+    173: 1, // Sonoff L3
     177: 1, // Switch Mate
     181: 1, // Sonoff TH Elite THR316 and THR320
     182: 1, // Power Detection Plug Overload Alarm-Multi-Channel Protocols (S40)

From e07998cbacd4459218a475152e131011c1208a40 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 3 Sep 2022 15:39:58 +0100
Subject: [PATCH 3052/3183] 10.0.1-beta.3

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 62f3348f..787d8b39 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "10.0.1-beta.2",
+  "version": "10.0.1-beta.3",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "10.0.1-beta.2",
+      "version": "10.0.1-beta.3",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 6a93837f..c6ac506d 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "10.0.1-beta.2",
+  "version": "10.0.1-beta.3",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From 8c4c2fc53bff03facb6ba0b88d835e8f154f1349 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 3 Sep 2022 15:42:27 +0100
Subject: [PATCH 3053/3183] stop autoclosing/staling of issues

---
 .github/label-commenter-config.yml    |  5 -----
 .github/no-response.yml               | 10 ----------
 .github/stale.yml                     | 18 ------------------
 .github/workflows/label-commenter.yml | 16 ----------------
 4 files changed, 49 deletions(-)
 delete mode 100644 .github/label-commenter-config.yml
 delete mode 100644 .github/no-response.yml
 delete mode 100644 .github/stale.yml
 delete mode 100644 .github/workflows/label-commenter.yml

diff --git a/.github/label-commenter-config.yml b/.github/label-commenter-config.yml
deleted file mode 100644
index 77711680..00000000
--- a/.github/label-commenter-config.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-labels:
-  - name: complete
-    labeled:
-      issue:
-        body: This issue has been marked as complete as I believe the original query has been fixed/answered or will not be actioned. The issue will be closed in three days. If you feel the issue requires further attention then please let me know. Thanks!
diff --git a/.github/no-response.yml b/.github/no-response.yml
deleted file mode 100644
index c4bf7399..00000000
--- a/.github/no-response.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-# Number of days of inactivity before an Issue is closed for lack of response
-daysUntilClose: 7
-# Label requiring a response
-responseRequiredLabel: complete
-# Comment to post when closing an Issue for lack of response. Set to `false` to disable
-closeComment: >
-  This issue has been automatically closed as it was marked as complete and has had
-  no further responses within seven days. If you are still experiencing problems related
-  to the original issue then please reply to this message and the issue will be reopened
-  if necessary. Thank you.
diff --git a/.github/stale.yml b/.github/stale.yml
deleted file mode 100644
index 47fa62a3..00000000
--- a/.github/stale.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-# Number of days of inactivity before an issue becomes stale
-daysUntilStale: 14
-# Number of days of inactivity before a stale issue is closed
-daysUntilClose: 7
-# Issues with these labels will never be considered stale
-exemptLabels:
-  - "feedback wanted"
-  - "don't close"
-# Label to use when marking an issue as stale
-staleLabel: inactive
-# Comment to post when marking an issue as stale. Set to `false` to disable
-markComment: >
-  This issue has been automatically marked as inactive because it has not had
-  recent activity. It will be closed if no further activity occurs. Thank you
-  for your contributions.
-# Comment to post when closing a stale issue. Set to `false` to disable
-closeComment: >
-  This issue has been automatically closed.
diff --git a/.github/workflows/label-commenter.yml b/.github/workflows/label-commenter.yml
deleted file mode 100644
index d0a313c6..00000000
--- a/.github/workflows/label-commenter.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-on:
-  issues:
-    types:
-      - labeled
-      - unlabeled
-
-jobs:
-  comment:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Label Commenter
-        uses: peaceiris/actions-label-commenter@v1
-        with:
-          config_file: .github/label-commenter-config.yml

From 90e4af6b2f05a54b4a17eb5c9fc36935df8e6cfc Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 3 Sep 2022 16:10:29 +0100
Subject: [PATCH 3054/3183] switchman devices

---
 lib/device/index.js      |  2 +
 lib/device/switch-man.js | 82 ++++++++++++++++++++++++++++++++++++++++
 lib/platform.js          |  7 ++++
 lib/utils/constants.js   | 10 ++---
 4 files changed, 95 insertions(+), 6 deletions(-)
 create mode 100644 lib/device/switch-man.js

diff --git a/lib/device/index.js b/lib/device/index.js
index c3fa352b..a498d3ca 100644
--- a/lib/device/index.js
+++ b/lib/device/index.js
@@ -19,6 +19,7 @@ import deviceSensorAmbient from './sensor-ambient.js';
 import deviceSensorContact from './sensor-contact.js';
 import deviceSensorTempHumi from './sensor-temp-humi.js';
 import sim from './simulation/index.js';
+import deviceSwitchMan from './switch-man.js';
 import deviceSwitchMate from './switch-mate.js';
 import deviceSwitchMulti from './switch-multi.js';
 import deviceSwitchSingleInched from './switch-single-inched.js';
@@ -48,6 +49,7 @@ export default {
   deviceSensorAmbient,
   deviceSensorContact,
   deviceSensorTempHumi,
+  deviceSwitchMan,
   deviceSwitchMate,
   deviceSwitchMulti,
   deviceSwitchSingle,
diff --git a/lib/device/switch-man.js b/lib/device/switch-man.js
new file mode 100644
index 00000000..30d3398d
--- /dev/null
+++ b/lib/device/switch-man.js
@@ -0,0 +1,82 @@
+import { hasProperty } from '../utils/functions.js';
+
+export default class {
+  constructor(platform, accessory) {
+    // Set up variables from the platform
+    this.hapChar = platform.api.hap.Characteristic;
+    this.hapServ = platform.api.hap.Service;
+    this.lang = platform.lang;
+    this.log = platform.log;
+    this.platform = platform;
+
+    // Set up variables from the accessory
+    this.name = accessory.displayName;
+    this.accessory = accessory;
+
+    // Set up custom variables for this device type
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId] || {};
+
+    // Set the correct logging variables for this accessory
+    switch (deviceConf.overrideLogging) {
+      case 'standard':
+        this.enableLogging = true;
+        this.enableDebugLogging = false;
+        break;
+      case 'debug':
+        this.enableLogging = true;
+        this.enableDebugLogging = true;
+        break;
+      case 'disable':
+        this.enableLogging = false;
+        this.enableDebugLogging = false;
+        break;
+      default:
+        this.enableLogging = !platform.config.disableDeviceLogging;
+        this.enableDebugLogging = platform.config.debug;
+        break;
+    }
+    this.timeouts = {
+      0: false,
+      1: false,
+      2: false,
+    };
+
+    // Add the stateless switch service if it doesn't already exist
+    this.service = this.accessory.getService(this.hapServ.StatelessProgrammableSwitch)
+      || this.accessory.addService(this.hapServ.StatelessProgrammableSwitch);
+
+    // Output the customised options to the log
+    const normalLogging = this.enableLogging ? 'standard' : 'disable';
+    const opts = JSON.stringify({
+      logging: this.enableDebugLogging ? 'debug' : normalLogging,
+    });
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts);
+  }
+
+  async externalUpdate(params) {
+    try {
+      if (
+        hasProperty(params, 'outlet')
+        && [0, 1, 2].includes(params.outlet)
+        && params.actionTime
+        && !this.timeouts[params.outlet]
+      ) {
+        this.timeouts[params.outlet] = true;
+        setTimeout(() => {
+          this.timeouts[params.outlet] = false;
+        }, 1000);
+        const timeDiff = (new Date().getTime() - Date.parse(params.actionTime)) / 1000;
+        if (timeDiff < 5) {
+          this.service.updateCharacteristic(this.hapChar.ProgrammableSwitchEvent, params.outlet);
+          if (params.updateSource && this.enableLogging) {
+            const doubleLong = params.outlet === 1 ? this.lang.buttonDouble : this.lang.buttonLong;
+            const textLabel = params.outlet === 0 ? this.lang.buttonSingle : doubleLong;
+            this.log('[%s] %s [%s].', this.name, this.lang.curState, textLabel);
+          }
+        }
+      }
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, false);
+    }
+  }
+}
diff --git a/lib/platform.js b/lib/platform.js
index 200772d5..45aa7edf 100644
--- a/lib/platform.js
+++ b/lib/platform.js
@@ -1227,6 +1227,13 @@ export default class {
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
         accessory.control = new deviceTypes.deviceSwitchMate(this, accessory);
         /** *************** */
+      } else if (platformConsts.devices.switchMan.includes(uiid)) {
+        /** *******
+         SWITCH MAN
+         ******** */
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SW0`);
+        accessory.control = new deviceTypes.deviceSwitchMan(this, accessory);
+        /** *************** */
       } else if (platformConsts.devices.rfBridge.includes(uiid)) {
         /** *******************
          RF BRIDGE + SUBDEVICES
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 111fbb4b..6ee2f8a4 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -281,16 +281,13 @@ export default {
       133,
       136,
       138,
-      160,
-      161,
-      162,
       165,
       181,
       182,
       190,
     ],
     switchSingle: [1, 6, 14, 24, 27, 1009, 1256, 7004],
-    switchSCM: [77, 78, 81, 107, 112, 138, 160],
+    switchSCM: [77, 78, 81, 107, 112, 138],
     switchSCMPower: [182, 190],
     switchSinglePower: [5, 32],
     switchMulti: [
@@ -312,14 +309,13 @@ export default {
       139,
       140,
       141,
-      161,
-      162,
       2256,
       3256,
       4256,
     ],
     switchMultiPower: [126, 165],
     switchMate: [177],
+    switchMan: [160, 161, 162, 174],
     lightDimmer: [36, 44, 57],
     lightRGB: [22],
     lightCCT: [103],
@@ -488,6 +484,7 @@ export default {
     165: 2, // "DUALR3 Lite"
     168: 1, // Zigbee Bridge Pro
     173: 1, // Sonoff L3
+    174: 1, // SwitchMan R5 - 6 Gang
     177: 1, // Switch Mate
     181: 1, // Sonoff TH Elite THR316 and THR320
     182: 1, // Power Detection Plug Overload Alarm-Multi-Channel Protocols (S40)
@@ -520,6 +517,7 @@ export default {
     119: 0, // "2.4G-2C" (eWeLink 2.4G Remote)
     120: 0, // "2.4G-3C" (eWeLink 2.4G Remote)
     121: 0, // "2.4G-6C" (eWeLink 2.4G Remote)
+    147: 0, // NSPanel linked device (bulb) but no controls available
   },
 
   yetToSupportDevices: {

From 464db813b1acd2c59bbee10ed455b85fed5232eb Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 3 Sep 2022 16:11:00 +0100
Subject: [PATCH 3055/3183] 10.0.1-beta.4

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 787d8b39..8228a612 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "10.0.1-beta.3",
+  "version": "10.0.1-beta.4",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "10.0.1-beta.3",
+      "version": "10.0.1-beta.4",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index c6ac506d..011beec8 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "10.0.1-beta.3",
+  "version": "10.0.1-beta.4",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From 014593fec0ed855bf492a0db157bafb4235f8454 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 25 Sep 2022 13:34:46 +0100
Subject: [PATCH 3056/3183] prep 10.1.0

---
 CHANGELOG.md      |  22 +++++-
 lib/platform.js   |  12 +--
 package-lock.json | 183 ++++++++++++++++++++++++++--------------------
 package.json      |   6 +-
 4 files changed, 131 insertions(+), 92 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7d285181..0925ff18 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,15 +2,29 @@
 
 All notable changes to homebridge-ewelink will be documented in this file.
 
-## BETA
+## 10.1.0 (2022-09-25)
 
 ### Added
 
-- Support Sonoff DW2-Wifi-L
+- Support devices with UUID 128 (SPM Main Unit)
+- Support devices with UUID 154 (DW2-Wifi-L)
+- Support devices with UUID 168 (Zigbee Bridge Pro)
+- Support devices with UUID 190 (POWR316/POWR316D/POWR320D)
+- Work-in-progress for devices with UUIDs:
+  - 130 (SPM sub-unit)
+  - 160/161/162/174 (SwitchMan devices)
+  - 173 (Sonoff L3)
+  - 1514 (Zigbee motor controller)
+  - 3258 (Zigbee RGB light)
 
-## 10.0.0 (2022-07-08)
+### Changed
 
-*On a personal level, this is not the kind of release I like to make. But circumstances have changed and so modifications to the plugin have needed to be made:*
+- Correct parameters for `updatePlatformAccessories()`
+- Bump `node` recommended versions to v14.20.1 or v16.17.1
+- Bump `ws` to v8.9.0
+- Updated dev dependencies
+
+## 10.0.0 (2022-07-08)
 
 ⚠️ After updating to this version:
   - Each time you start the plugin, you will be logged out the eWeLink app, and so I would recommend:
diff --git a/lib/platform.js b/lib/platform.js
index 45aa7edf..db50b07b 100644
--- a/lib/platform.js
+++ b/lib/platform.js
@@ -1213,7 +1213,7 @@ export default class {
           }
 
           // Update any changes to the sub accessory to the platform
-          this.api.updatePlatformAccessories(plugin.name, plugin.alias, [subAccessory]);
+          this.api.updatePlatformAccessories([subAccessory]);
           devicesInHB.set(subAccessory.UUID, subAccessory);
           if (i === 0) {
             accessory = subAccessory;
@@ -1350,7 +1350,7 @@ export default class {
           }
 
           // Update any changes to the sub accessory to the platform
-          this.api.updatePlatformAccessories(plugin.name, plugin.alias, [subAccessory]);
+          this.api.updatePlatformAccessories([subAccessory]);
           devicesInHB.set(subAccessory.UUID, subAccessory);
 
           // Increment the counter
@@ -1539,7 +1539,7 @@ export default class {
       }
 
       // Update any changes to the device into our devicesInHB map
-      this.api.updatePlatformAccessories(plugin.name, plugin.alias, [accessory]);
+      this.api.updatePlatformAccessories([accessory]);
       devicesInHB.set(accessory.UUID, accessory);
       if (uiid === 5000) {
         this.log(
@@ -1840,7 +1840,7 @@ export default class {
       // The update is from WS so update the WS online/offline status
       if (device.params.online !== accessory.context.reachableWAN) {
         accessory.context.reachableWAN = device.params.online;
-        this.api.updatePlatformAccessories(plugin.name, plugin.alias, [accessory]);
+        this.api.updatePlatformAccessories([accessory]);
         devicesInHB.set(accessory.UUID, accessory);
 
         // Flag this true to update the sub accessories later
@@ -1913,7 +1913,7 @@ export default class {
 
       // Update the accessory context if the device is back online or the IP changed
       if (reachableChange) {
-        this.api.updatePlatformAccessories(plugin.name, plugin.alias, [accessory]);
+        this.api.updatePlatformAccessories([accessory]);
         devicesInHB.set(accessory.UUID, accessory);
       }
     }
@@ -1942,7 +1942,7 @@ export default class {
           }
 
           // Save the sub accessory updates to the platform
-          this.api.updatePlatformAccessories(plugin.name, plugin.alias, [subAccessory]);
+          this.api.updatePlatformAccessories([subAccessory]);
           devicesInHB.set(subAccessory.UUID, subAccessory);
         }
       }
diff --git a/package-lock.json b/package-lock.json
index 8228a612..ed5ef6a2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -32,10 +32,10 @@
         "node-persist": "^3.1.0",
         "p-queue": "^7.3.0",
         "websocket-as-promised": "^2.0.1",
-        "ws": "^8.8.1"
+        "ws": "^8.9.0"
       },
       "devDependencies": {
-        "eslint": "^8.23.0",
+        "eslint": "^8.24.0",
         "eslint-config-airbnb-base": "^15.0.0",
         "eslint-plugin-import": "^2.26.0",
         "eslint-plugin-import-newlines": "^1.2.3",
@@ -43,13 +43,13 @@
       },
       "engines": {
         "homebridge": "^1.5.0",
-        "node": "^14.20.0 || ^16.17.0"
+        "node": "^14.20.1 || ^16.17.1"
       }
     },
     "node_modules/@eslint/eslintrc": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.1.tgz",
-      "integrity": "sha512-OhSY22oQQdw3zgPOOwdoj01l/Dzl1Z+xyUP33tkSN+aqyEhymJCcPHyXt+ylW8FSe0TfRC2VG+ROQOapD0aZSQ==",
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.2.tgz",
+      "integrity": "sha512-AXYd23w1S/bv3fTs3Lz0vjiYemS08jWkI3hYyS9I1ry+0f+Yjs1wm+sU0BS8qDOPrBIkp4qHYC16I8uVtpLajQ==",
       "dev": true,
       "dependencies": {
         "ajv": "^6.12.4",
@@ -75,9 +75,9 @@
       "integrity": "sha512-axFX7lN2Yd7bz/6SlD7dzq5sY/N9+XYuLHPukuiyHQRDtNMRL1uDqJhOx6RVaN2tYDHB75h7YxRQWP7U44Mgzg=="
     },
     "node_modules/@humanwhocodes/config-array": {
-      "version": "0.10.4",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.10.4.tgz",
-      "integrity": "sha512-mXAIHxZT3Vcpg83opl1wGlVZ9xydbfZO3r5YfRSH6Gpp2J/PfdBP0wbDa2sO6/qRbcalpoevVyW6A/fI6LfeMw==",
+      "version": "0.10.5",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.10.5.tgz",
+      "integrity": "sha512-XVVDtp+dVvRxMoxSiSfasYaG02VEe1qH5cKgMQJWhol6HwzbcqoCMJi8dAGoYAO57jhUyhI6cWuRiTcRaDaYug==",
       "dev": true,
       "dependencies": {
         "@humanwhocodes/object-schema": "^1.2.1",
@@ -481,21 +481,21 @@
       }
     },
     "node_modules/es-abstract": {
-      "version": "1.20.2",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.2.tgz",
-      "integrity": "sha512-XxXQuVNrySBNlEkTYJoDNFe5+s2yIOpzq80sUHEdPdQr0S5nTLz4ZPPPswNIpKseDDUS5yghX1gfLIHQZ1iNuQ==",
+      "version": "1.20.3",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.3.tgz",
+      "integrity": "sha512-AyrnaKVpMzljIdwjzrj+LxGmj8ik2LckwXacHqrJJ/jxz6dDDBcZ7I7nlHM0FvEW8MfbWJwOd+yT2XzYW49Frw==",
       "dependencies": {
         "call-bind": "^1.0.2",
         "es-to-primitive": "^1.2.1",
         "function-bind": "^1.1.1",
         "function.prototype.name": "^1.1.5",
-        "get-intrinsic": "^1.1.2",
+        "get-intrinsic": "^1.1.3",
         "get-symbol-description": "^1.0.0",
         "has": "^1.0.3",
         "has-property-descriptors": "^1.0.0",
         "has-symbols": "^1.0.3",
         "internal-slot": "^1.0.3",
-        "is-callable": "^1.2.4",
+        "is-callable": "^1.2.6",
         "is-negative-zero": "^2.0.2",
         "is-regex": "^1.1.4",
         "is-shared-array-buffer": "^1.0.2",
@@ -505,6 +505,7 @@
         "object-keys": "^1.1.1",
         "object.assign": "^4.1.4",
         "regexp.prototype.flags": "^1.4.3",
+        "safe-regex-test": "^1.0.0",
         "string.prototype.trimend": "^1.0.5",
         "string.prototype.trimstart": "^1.0.5",
         "unbox-primitive": "^1.0.2"
@@ -554,13 +555,13 @@
       }
     },
     "node_modules/eslint": {
-      "version": "8.23.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.23.0.tgz",
-      "integrity": "sha512-pBG/XOn0MsJcKcTRLr27S5HpzQo4kLr+HjLQIyK4EiCsijDl/TB+h5uEuJU6bQ8Edvwz1XWOjpaP2qgnXGpTcA==",
+      "version": "8.24.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.24.0.tgz",
+      "integrity": "sha512-dWFaPhGhTAiPcCgm3f6LI2MBWbogMnTJzFBbhXVRQDJPkr9pGZvVjlVfXd+vyDcWPA2Ic9L2AXPIQM0+vk/cSQ==",
       "dev": true,
       "dependencies": {
-        "@eslint/eslintrc": "^1.3.1",
-        "@humanwhocodes/config-array": "^0.10.4",
+        "@eslint/eslintrc": "^1.3.2",
+        "@humanwhocodes/config-array": "^0.10.5",
         "@humanwhocodes/gitignore-to-minimatch": "^1.0.2",
         "@humanwhocodes/module-importer": "^1.0.1",
         "ajv": "^6.10.0",
@@ -578,7 +579,6 @@
         "fast-deep-equal": "^3.1.3",
         "file-entry-cache": "^6.0.1",
         "find-up": "^5.0.0",
-        "functional-red-black-tree": "^1.0.1",
         "glob-parent": "^6.0.1",
         "globals": "^13.15.0",
         "globby": "^11.1.0",
@@ -587,6 +587,7 @@
         "import-fresh": "^3.0.0",
         "imurmurhash": "^0.1.4",
         "is-glob": "^4.0.0",
+        "js-sdsl": "^4.1.4",
         "js-yaml": "^4.1.0",
         "json-stable-stringify-without-jsonify": "^1.0.1",
         "levn": "^0.4.1",
@@ -871,9 +872,9 @@
       "dev": true
     },
     "node_modules/fast-glob": {
-      "version": "3.2.11",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz",
-      "integrity": "sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==",
+      "version": "3.2.12",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz",
+      "integrity": "sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==",
       "dev": true,
       "dependencies": {
         "@nodelib/fs.stat": "^2.0.2",
@@ -979,9 +980,9 @@
       "dev": true
     },
     "node_modules/follow-redirects": {
-      "version": "1.15.1",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.1.tgz",
-      "integrity": "sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA==",
+      "version": "1.15.2",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz",
+      "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==",
       "funding": [
         {
           "type": "individual",
@@ -1038,12 +1039,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/functional-red-black-tree": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
-      "integrity": "sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==",
-      "dev": true
-    },
     "node_modules/functions-have-names": {
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
@@ -1053,9 +1048,9 @@
       }
     },
     "node_modules/get-intrinsic": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.2.tgz",
-      "integrity": "sha512-Jfm3OyCxHh9DJyc28qGk+JmfkpO41A4XkneDSujN9MDXrm4oDKdHvndhZ2dN94+ERNfkYJWDclW6k2L/ZGHjXA==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz",
+      "integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==",
       "dependencies": {
         "function-bind": "^1.1.1",
         "has": "^1.0.3",
@@ -1307,9 +1302,9 @@
       }
     },
     "node_modules/is-callable": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
-      "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
+      "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
       "engines": {
         "node": ">= 0.4"
       },
@@ -1469,6 +1464,12 @@
       "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
       "dev": true
     },
+    "node_modules/js-sdsl": {
+      "version": "4.1.4",
+      "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.1.4.tgz",
+      "integrity": "sha512-Y2/yD55y5jteOAmY50JbUZYwk3CP3wnLPEZnlR1w9oKhITrBEtAxwuWKebFf8hMrPMgbYwFoWK/lH2sBkErELw==",
+      "dev": true
+    },
     "node_modules/js-yaml": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
@@ -2002,6 +2003,19 @@
         "queue-microtask": "^1.2.2"
       }
     },
+    "node_modules/safe-regex-test": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz",
+      "integrity": "sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==",
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.1.3",
+        "is-regex": "^1.1.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/semver": {
       "version": "6.3.0",
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
@@ -2274,9 +2288,9 @@
       "dev": true
     },
     "node_modules/ws": {
-      "version": "8.8.1",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.8.1.tgz",
-      "integrity": "sha512-bGy2JzvzkPowEJV++hF07hAD6niYSr0JzBNo/J29WsB57A2r7Wlc1UFcTR9IzrPvuNVO4B8LGqF8qcpsVOhJCA==",
+      "version": "8.9.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.9.0.tgz",
+      "integrity": "sha512-Ja7nszREasGaYUYCI2k4lCKIRTt+y7XuqVoHR44YpI49TtryyqbqvDMn5eqfW7e6HzTukDRIsXqzVHScqRcafg==",
       "engines": {
         "node": ">=10.0.0"
       },
@@ -2308,9 +2322,9 @@
   },
   "dependencies": {
     "@eslint/eslintrc": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.1.tgz",
-      "integrity": "sha512-OhSY22oQQdw3zgPOOwdoj01l/Dzl1Z+xyUP33tkSN+aqyEhymJCcPHyXt+ylW8FSe0TfRC2VG+ROQOapD0aZSQ==",
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.2.tgz",
+      "integrity": "sha512-AXYd23w1S/bv3fTs3Lz0vjiYemS08jWkI3hYyS9I1ry+0f+Yjs1wm+sU0BS8qDOPrBIkp4qHYC16I8uVtpLajQ==",
       "dev": true,
       "requires": {
         "ajv": "^6.12.4",
@@ -2330,9 +2344,9 @@
       "integrity": "sha512-axFX7lN2Yd7bz/6SlD7dzq5sY/N9+XYuLHPukuiyHQRDtNMRL1uDqJhOx6RVaN2tYDHB75h7YxRQWP7U44Mgzg=="
     },
     "@humanwhocodes/config-array": {
-      "version": "0.10.4",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.10.4.tgz",
-      "integrity": "sha512-mXAIHxZT3Vcpg83opl1wGlVZ9xydbfZO3r5YfRSH6Gpp2J/PfdBP0wbDa2sO6/qRbcalpoevVyW6A/fI6LfeMw==",
+      "version": "0.10.5",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.10.5.tgz",
+      "integrity": "sha512-XVVDtp+dVvRxMoxSiSfasYaG02VEe1qH5cKgMQJWhol6HwzbcqoCMJi8dAGoYAO57jhUyhI6cWuRiTcRaDaYug==",
       "dev": true,
       "requires": {
         "@humanwhocodes/object-schema": "^1.2.1",
@@ -2630,21 +2644,21 @@
       }
     },
     "es-abstract": {
-      "version": "1.20.2",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.2.tgz",
-      "integrity": "sha512-XxXQuVNrySBNlEkTYJoDNFe5+s2yIOpzq80sUHEdPdQr0S5nTLz4ZPPPswNIpKseDDUS5yghX1gfLIHQZ1iNuQ==",
+      "version": "1.20.3",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.3.tgz",
+      "integrity": "sha512-AyrnaKVpMzljIdwjzrj+LxGmj8ik2LckwXacHqrJJ/jxz6dDDBcZ7I7nlHM0FvEW8MfbWJwOd+yT2XzYW49Frw==",
       "requires": {
         "call-bind": "^1.0.2",
         "es-to-primitive": "^1.2.1",
         "function-bind": "^1.1.1",
         "function.prototype.name": "^1.1.5",
-        "get-intrinsic": "^1.1.2",
+        "get-intrinsic": "^1.1.3",
         "get-symbol-description": "^1.0.0",
         "has": "^1.0.3",
         "has-property-descriptors": "^1.0.0",
         "has-symbols": "^1.0.3",
         "internal-slot": "^1.0.3",
-        "is-callable": "^1.2.4",
+        "is-callable": "^1.2.6",
         "is-negative-zero": "^2.0.2",
         "is-regex": "^1.1.4",
         "is-shared-array-buffer": "^1.0.2",
@@ -2654,6 +2668,7 @@
         "object-keys": "^1.1.1",
         "object.assign": "^4.1.4",
         "regexp.prototype.flags": "^1.4.3",
+        "safe-regex-test": "^1.0.0",
         "string.prototype.trimend": "^1.0.5",
         "string.prototype.trimstart": "^1.0.5",
         "unbox-primitive": "^1.0.2"
@@ -2685,13 +2700,13 @@
       "dev": true
     },
     "eslint": {
-      "version": "8.23.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.23.0.tgz",
-      "integrity": "sha512-pBG/XOn0MsJcKcTRLr27S5HpzQo4kLr+HjLQIyK4EiCsijDl/TB+h5uEuJU6bQ8Edvwz1XWOjpaP2qgnXGpTcA==",
+      "version": "8.24.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.24.0.tgz",
+      "integrity": "sha512-dWFaPhGhTAiPcCgm3f6LI2MBWbogMnTJzFBbhXVRQDJPkr9pGZvVjlVfXd+vyDcWPA2Ic9L2AXPIQM0+vk/cSQ==",
       "dev": true,
       "requires": {
-        "@eslint/eslintrc": "^1.3.1",
-        "@humanwhocodes/config-array": "^0.10.4",
+        "@eslint/eslintrc": "^1.3.2",
+        "@humanwhocodes/config-array": "^0.10.5",
         "@humanwhocodes/gitignore-to-minimatch": "^1.0.2",
         "@humanwhocodes/module-importer": "^1.0.1",
         "ajv": "^6.10.0",
@@ -2709,7 +2724,6 @@
         "fast-deep-equal": "^3.1.3",
         "file-entry-cache": "^6.0.1",
         "find-up": "^5.0.0",
-        "functional-red-black-tree": "^1.0.1",
         "glob-parent": "^6.0.1",
         "globals": "^13.15.0",
         "globby": "^11.1.0",
@@ -2718,6 +2732,7 @@
         "import-fresh": "^3.0.0",
         "imurmurhash": "^0.1.4",
         "is-glob": "^4.0.0",
+        "js-sdsl": "^4.1.4",
         "js-yaml": "^4.1.0",
         "json-stable-stringify-without-jsonify": "^1.0.1",
         "levn": "^0.4.1",
@@ -2931,9 +2946,9 @@
       "dev": true
     },
     "fast-glob": {
-      "version": "3.2.11",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz",
-      "integrity": "sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==",
+      "version": "3.2.12",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz",
+      "integrity": "sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==",
       "dev": true,
       "requires": {
         "@nodelib/fs.stat": "^2.0.2",
@@ -3020,9 +3035,9 @@
       "dev": true
     },
     "follow-redirects": {
-      "version": "1.15.1",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.1.tgz",
-      "integrity": "sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA=="
+      "version": "1.15.2",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz",
+      "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA=="
     },
     "form-data": {
       "version": "4.0.0",
@@ -3056,21 +3071,15 @@
         "functions-have-names": "^1.2.2"
       }
     },
-    "functional-red-black-tree": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
-      "integrity": "sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==",
-      "dev": true
-    },
     "functions-have-names": {
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
       "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ=="
     },
     "get-intrinsic": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.2.tgz",
-      "integrity": "sha512-Jfm3OyCxHh9DJyc28qGk+JmfkpO41A4XkneDSujN9MDXrm4oDKdHvndhZ2dN94+ERNfkYJWDclW6k2L/ZGHjXA==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz",
+      "integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==",
       "requires": {
         "function-bind": "^1.1.1",
         "has": "^1.0.3",
@@ -3244,9 +3253,9 @@
       }
     },
     "is-callable": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
-      "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w=="
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
+      "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA=="
     },
     "is-core-module": {
       "version": "2.10.0",
@@ -3346,6 +3355,12 @@
       "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
       "dev": true
     },
+    "js-sdsl": {
+      "version": "4.1.4",
+      "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.1.4.tgz",
+      "integrity": "sha512-Y2/yD55y5jteOAmY50JbUZYwk3CP3wnLPEZnlR1w9oKhITrBEtAxwuWKebFf8hMrPMgbYwFoWK/lH2sBkErELw==",
+      "dev": true
+    },
     "js-yaml": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
@@ -3700,6 +3715,16 @@
         "queue-microtask": "^1.2.2"
       }
     },
+    "safe-regex-test": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz",
+      "integrity": "sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==",
+      "requires": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.1.3",
+        "is-regex": "^1.1.4"
+      }
+    },
     "semver": {
       "version": "6.3.0",
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
@@ -3900,9 +3925,9 @@
       "dev": true
     },
     "ws": {
-      "version": "8.8.1",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.8.1.tgz",
-      "integrity": "sha512-bGy2JzvzkPowEJV++hF07hAD6niYSr0JzBNo/J29WsB57A2r7Wlc1UFcTR9IzrPvuNVO4B8LGqF8qcpsVOhJCA==",
+      "version": "8.9.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.9.0.tgz",
+      "integrity": "sha512-Ja7nszREasGaYUYCI2k4lCKIRTt+y7XuqVoHR44YpI49TtryyqbqvDMn5eqfW7e6HzTukDRIsXqzVHScqRcafg==",
       "requires": {}
     },
     "yocto-queue": {
diff --git a/package.json b/package.json
index 011beec8..a9813912 100644
--- a/package.json
+++ b/package.json
@@ -31,7 +31,7 @@
   },
   "engines": {
     "homebridge": "^1.5.0",
-    "node": "^14.20.0 || ^16.17.0"
+    "node": "^14.20.1 || ^16.17.1"
   },
   "repository": {
     "type": "git",
@@ -64,13 +64,13 @@
     "node-persist": "^3.1.0",
     "p-queue": "^7.3.0",
     "websocket-as-promised": "^2.0.1",
-    "ws": "^8.8.1"
+    "ws": "^8.9.0"
   },
   "devDependencies": {
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-import-newlines": "^1.2.3",
     "eslint-plugin-sort-exports": "^0.7.0",
-    "eslint": "^8.23.0"
+    "eslint": "^8.24.0"
   }
 }

From f5a8f89e93b1d200fa2ef973635bfd55e87d6e54 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 25 Sep 2022 13:35:15 +0100
Subject: [PATCH 3057/3183] 10.1.0

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ed5ef6a2..6917033b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "10.0.1-beta.4",
+  "version": "10.1.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "10.0.1-beta.4",
+      "version": "10.1.0",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index a9813912..7a908495 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "10.0.1-beta.4",
+  "version": "10.1.0",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From 9034e03d5c98cb5a72d3b61ba06ffbe363bc92d1 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 25 Sep 2022 15:38:24 +0100
Subject: [PATCH 3058/3183] zigbee 3258 brightness attempt

---
 lib/device/light-rgb.js            |   1 -
 lib/device/zigbee/light-cct.js     |  30 ++++++--
 lib/device/zigbee/light-rgb-cct.js | 110 +++++++++++++++++++++++++++--
 3 files changed, 127 insertions(+), 14 deletions(-)

diff --git a/lib/device/light-rgb.js b/lib/device/light-rgb.js
index d499e5d5..5341cfc6 100644
--- a/lib/device/light-rgb.js
+++ b/lib/device/light-rgb.js
@@ -73,7 +73,6 @@ export default class {
       });
       this.service
         .getCharacteristic(this.hapChar.Brightness)
-        .setProps({ minStep: 100 })
         .onGet(() => {
           if (!this.isOnline) {
             throw new this.hapErr(-70402);
diff --git a/lib/device/zigbee/light-cct.js b/lib/device/zigbee/light-cct.js
index c74d9722..1ca1a42a 100644
--- a/lib/device/zigbee/light-cct.js
+++ b/lib/device/zigbee/light-cct.js
@@ -60,12 +60,6 @@ export default class {
     // Add the get/set handler to the lightbulb on/off characteristic
     this.service
       .getCharacteristic(this.hapChar.On)
-      .onGet(() => {
-        if (this.isOnline) {
-          return this.service.getCharacteristic(this.hapChar.On).value;
-        }
-        throw new this.hapErr(-70402);
-      })
       .onSet(async (value) => {
         this.internalStateUpdate(value);
       });
@@ -94,6 +88,30 @@ export default class {
       this.accessory.configureController(this.accessory.alController);
     }
 
+    // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
+    if (!platform.config.disableNoResponse) {
+      this.service.getCharacteristic(this.hapChar.On).onGet(() => {
+        if (!this.isOnline) {
+          throw new this.hapErr(-70402);
+        }
+        return this.service.getCharacteristic(this.hapChar.On).value;
+      });
+      this.service
+        .getCharacteristic(this.hapChar.Brightness)
+        .onGet(() => {
+          if (!this.isOnline) {
+            throw new this.hapErr(-70402);
+          }
+          return this.service.getCharacteristic(this.hapChar.Brightness).value;
+        });
+      this.service.getCharacteristic(this.hapChar.ColorTemperature).onGet(() => {
+        if (!this.isOnline) {
+          throw new this.hapErr(-70402);
+        }
+        return this.service.getCharacteristic(this.hapChar.ColorTemperature).value;
+      });
+    }
+
     // Output the customised options to the log
     const normalLogging = this.enableLogging ? 'standard' : 'disable';
     const opts = JSON.stringify({
diff --git a/lib/device/zigbee/light-rgb-cct.js b/lib/device/zigbee/light-rgb-cct.js
index b1fe75e9..37bb6d3d 100644
--- a/lib/device/zigbee/light-rgb-cct.js
+++ b/lib/device/zigbee/light-rgb-cct.js
@@ -1,4 +1,5 @@
 import platformConsts from '../../utils/constants.js';
+import { generateRandomString, hasProperty, sleep } from '../../utils/functions.js';
 
 export default class {
   constructor(platform, accessory) {
@@ -47,15 +48,34 @@ export default class {
     // Add the get/set handler to the lightbulb on/off characteristic
     this.service
       .getCharacteristic(this.hapChar.On)
-      .onGet(() => {
-        if (this.isOnline) {
-          return this.service.getCharacteristic(this.hapChar.On).value;
+      .onSet(async (value) => this.internalStateUpdate(value));
+
+    // Add the set handler to the lightbulb brightness characteristic
+    this.service
+      .getCharacteristic(this.hapChar.Brightness)
+      .setProps({ minStep: this.brightStep })
+      .onSet(async (value) => this.internalBrightnessUpdate(value));
+
+    // This is needed as sometimes we need to send the brightness with a cct update
+    this.cacheBright = this.service.getCharacteristic(this.hapChar.Brightness).value;
+
+    // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
+    if (!platform.config.disableNoResponse) {
+      this.service.getCharacteristic(this.hapChar.On).onGet(() => {
+        if (!this.isOnline) {
+          throw new this.hapErr(-70402);
         }
-        throw new this.hapErr(-70402);
-      })
-      .onSet(async (value) => {
-        this.internalStateUpdate(value);
+        return this.service.getCharacteristic(this.hapChar.On).value;
       });
+      this.service
+        .getCharacteristic(this.hapChar.Brightness)
+        .onGet(() => {
+          if (!this.isOnline) {
+            throw new this.hapErr(-70402);
+          }
+          return this.service.getCharacteristic(this.hapChar.Brightness).value;
+        });
+    }
 
     // Output the customised options to the log
     const normalLogging = this.enableLogging ? 'standard' : 'disable';
@@ -85,6 +105,43 @@ export default class {
     }
   }
 
+  async internalBrightnessUpdate(value) {
+    try {
+      if (this.cacheBright === value || value === 0) {
+        return;
+      }
+      const updateKey = generateRandomString(5);
+      this.updateKeyBright = updateKey;
+      await sleep(500);
+      if (updateKey !== this.updateKeyBright) {
+        return;
+      }
+      const params = {};
+      switch (this.cacheMode) {
+        case 'color':
+          params.rgbBrightness = value;
+          break;
+        case 'white':
+          params.cctBrightness = value;
+          break;
+        default:
+          throw new Error('Color mode not set');
+      }
+
+      await this.platform.sendDeviceUpdate(this.accessory, params);
+      this.cacheBright = value;
+      if (this.enableLogging) {
+        this.log('[%s] %s [%s%].', this.name, this.lang.curBright, this.cacheBright);
+      }
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, true);
+      setTimeout(() => {
+        this.service.updateCharacteristic(this.hapChar.Brightness, this.cacheBright);
+      }, 2000);
+      throw new this.hapErr(-70402);
+    }
+  }
+
   async externalUpdate(params) {
     try {
       if (params.switch && params.switch !== this.cacheState) {
@@ -94,6 +151,45 @@ export default class {
           this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState);
         }
       }
+
+      // How to tell which mode the bulb is in
+      // params.colorMode can be "rgb" or "cct"
+      // params.rgbBrightness is the brightness of the bulb when in rgb mode 0-100
+      // params.cctBrightness is the brightness of the bulb when in cct mode 0-100
+      // params.colorTemp is the colour temperature of the bulb when in cct mode 0-100
+      // params.hue is the hue of the bulb when in rgb mode 0-360
+      // params.saturation is the saturation of the bulb when in rgb mode 0-100
+      if (
+        params.colorMode === 'rgb'
+        || hasProperty(params, 'rgbBrightness')
+        || hasProperty(params, 'hue')
+        || hasProperty(params, 'saturation')
+      ) {
+        this.cacheMode = 'color';
+
+        if (hasProperty(params, 'rgbBrightness') && params.rgbBrightness !== this.cacheBright) {
+          this.cacheBright = params.rgbBrightness;
+          this.service.updateCharacteristic(this.hapChar.Brightness, this.cacheBright);
+          if (params.updateSource && this.enableLogging) {
+            this.log('[%s] %s [%s%].', this.name, this.lang.curBright, this.cacheBright);
+          }
+          this.cacheBright = params.rgbBrightness;
+          this.service.updateCharacteristic(this.hapChar.Brightness, this.cacheBright);
+        }
+      } else if (
+        params.colorMode === 'cct'
+        || hasProperty(params, 'cctBrightness')
+        || hasProperty(params, 'colorTemp')
+      ) {
+        this.cacheMode = 'white';
+        if (hasProperty(params, 'cctBrightness') && params.cctBrightness !== this.cacheBright) {
+          this.cacheBright = params.cctBrightness;
+          this.service.updateCharacteristic(this.hapChar.Brightness, this.cacheBright);
+          if (params.updateSource && this.enableLogging) {
+            this.log('[%s] %s [%s%].', this.name, this.lang.curBright, this.cacheBright);
+          }
+        }
+      }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false);
     }

From e23a255205d66742f2fc3e6766cbc2032f95aa61 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 25 Sep 2022 15:39:21 +0100
Subject: [PATCH 3059/3183] 10.1.1-beta.0

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 6917033b..001534b1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "10.1.0",
+  "version": "10.1.1-beta.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "10.1.0",
+      "version": "10.1.1-beta.0",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 7a908495..99445b09 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "10.1.0",
+  "version": "10.1.1-beta.0",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From 24d47087f1760afcf5a75b37366c4853a336e998 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 25 Sep 2022 16:05:48 +0100
Subject: [PATCH 3060/3183] zigbee 3258 colour attempt

---
 lib/device/zigbee/light-rgb-cct.js | 77 ++++++++++++++++++++++++++++++
 1 file changed, 77 insertions(+)

diff --git a/lib/device/zigbee/light-rgb-cct.js b/lib/device/zigbee/light-rgb-cct.js
index 37bb6d3d..cf78f484 100644
--- a/lib/device/zigbee/light-rgb-cct.js
+++ b/lib/device/zigbee/light-rgb-cct.js
@@ -56,6 +56,12 @@ export default class {
       .setProps({ minStep: this.brightStep })
       .onSet(async (value) => this.internalBrightnessUpdate(value));
 
+    // Add the set handler to the lightbulb hue characteristic
+    this.service
+      .getCharacteristic(this.hapChar.Hue)
+      .onSet(async (value) => this.internalColourUpdate(value));
+    this.cacheSat = this.service.getCharacteristic(this.hapChar.Saturation).value;
+
     // This is needed as sometimes we need to send the brightness with a cct update
     this.cacheBright = this.service.getCharacteristic(this.hapChar.Brightness).value;
 
@@ -75,6 +81,12 @@ export default class {
           }
           return this.service.getCharacteristic(this.hapChar.Brightness).value;
         });
+      this.service.getCharacteristic(this.hapChar.Hue).onGet(() => {
+        if (!this.isOnline) {
+          throw new this.hapErr(-70402);
+        }
+        return this.service.getCharacteristic(this.hapChar.Hue).value;
+      });
     }
 
     // Output the customised options to the log
@@ -142,6 +154,54 @@ export default class {
     }
   }
 
+  async internalColourUpdate(value) {
+    try {
+      if (this.cacheHue === value) {
+        return;
+      }
+      const updateKey = generateRandomString(5);
+      this.updateKey = updateKey;
+      await sleep(400);
+      if (updateKey !== this.updateKey) {
+        return;
+      }
+      this.updateTimeout = updateKey;
+      setTimeout(() => {
+        if (this.updateTimeout === updateKey) {
+          this.updateTimeout = false;
+        }
+      }, 5000);
+      this.service.updateCharacteristic(this.hapChar.ColorTemperature, 140);
+      const params = {
+        hue: value,
+        saturation: this.cacheSat,
+      };
+      if (this.cacheMode !== 'color') {
+        params.colorMode = 'rgb';
+      }
+      await this.platform.sendDeviceUpdate(this.accessory, params);
+      this.cacheHue = value;
+      this.cacheSat = this.service.getCharacteristic(this.hapChar.Saturation).value;
+      this.cacheMired = 0;
+      this.cacheCT = 0;
+      this.cacheMode = 'color';
+      if (this.enableLogging) {
+        this.log(
+          '[%s] %s [hue %s saturation %s].',
+          this.name,
+          this.lang.curColour,
+          `${this.cacheHue} ${this.cacheSat}`,
+        );
+      }
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, true);
+      setTimeout(() => {
+        this.service.updateCharacteristic(this.hapChar.Hue, this.cacheHue);
+      }, 2000);
+      throw new this.hapErr(-70402);
+    }
+  }
+
   async externalUpdate(params) {
     try {
       if (params.switch && params.switch !== this.cacheState) {
@@ -176,6 +236,23 @@ export default class {
           this.cacheBright = params.rgbBrightness;
           this.service.updateCharacteristic(this.hapChar.Brightness, this.cacheBright);
         }
+        if (
+          (hasProperty(params, 'hue') && params.hue !== this.cacheHue)
+          || (hasProperty(params, 'saturation') && params.saturation !== this.cacheSat)
+        ) {
+          this.cacheHue = hasProperty(params, 'hue') ? params.hue : this.cacheHue;
+          this.cacheSat = hasProperty(params, 'saturation') ? params.saturation : this.cacheSat;
+          this.service.updateCharacteristic(this.hapChar.Hue, this.cacheHue);
+          this.service.updateCharacteristic(this.hapChar.Saturation, this.cacheSat);
+          if (params.updateSource && this.enableLogging) {
+            this.log(
+              '[%s] %s [hue %s saturation %s].',
+              this.name,
+              this.lang.curColour,
+              `${this.cacheHue} ${this.cacheSat}`,
+            );
+          }
+        }
       } else if (
         params.colorMode === 'cct'
         || hasProperty(params, 'cctBrightness')

From eeb281aa6bf1c488b3702a00336f2d99a14685b2 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 25 Sep 2022 16:06:20 +0100
Subject: [PATCH 3061/3183] 10.1.1-beta.1

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 001534b1..f8c07632 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "10.1.1-beta.0",
+  "version": "10.1.1-beta.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "10.1.1-beta.0",
+      "version": "10.1.1-beta.1",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 99445b09..8149bfd3 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "10.1.1-beta.0",
+  "version": "10.1.1-beta.1",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From d6582a5f0613c5c6af63897b090dfc41aec2912d Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 25 Sep 2022 17:13:41 +0100
Subject: [PATCH 3062/3183] zigbee 3258 cct attempt

---
 lib/device/zigbee/light-cct.js     |  6 +--
 lib/device/zigbee/light-rgb-cct.js | 85 +++++++++++++++++++++++++++---
 2 files changed, 81 insertions(+), 10 deletions(-)

diff --git a/lib/device/zigbee/light-cct.js b/lib/device/zigbee/light-cct.js
index 1ca1a42a..707d2a35 100644
--- a/lib/device/zigbee/light-cct.js
+++ b/lib/device/zigbee/light-cct.js
@@ -72,14 +72,14 @@ export default class {
         this.internalBrightnessUpdate(value);
       });
 
+    // This is needed as sometimes we need to send the brightness with a cct update
+    this.cacheBright = this.service.getCharacteristic(this.hapChar.Brightness).value;
+
     // Add the set handler to the lightbulb colour temperature characteristic
     this.service.getCharacteristic(this.hapChar.ColorTemperature).onSet(async (value) => {
       this.internalCTUpdate(value);
     });
 
-    // This is needed as sometimes we need to send the brightness with a cct update
-    this.cacheBright = this.service.getCharacteristic(this.hapChar.Brightness).value;
-
     // Set up the adaptive lighting controller if not disabled by user
     if (this.alShift !== -1) {
       this.accessory.alController = new platform.api.hap.AdaptiveLightingController(this.service, {
diff --git a/lib/device/zigbee/light-rgb-cct.js b/lib/device/zigbee/light-rgb-cct.js
index cf78f484..f8bd6976 100644
--- a/lib/device/zigbee/light-rgb-cct.js
+++ b/lib/device/zigbee/light-rgb-cct.js
@@ -21,6 +21,10 @@ export default class {
       ? Math.min(deviceConf.brightnessStep, 100)
       : platformConsts.defaultValues.brightnessStep;
 
+    // Different bulbs have different colour temperature ranges
+    this.minK = 2200;
+    this.maxK = 4000;
+
     // Set the correct logging variables for this accessory
     switch (deviceConf.overrideLogging) {
       case 'standard':
@@ -56,14 +60,19 @@ export default class {
       .setProps({ minStep: this.brightStep })
       .onSet(async (value) => this.internalBrightnessUpdate(value));
 
+    // This is needed as sometimes we need to send the brightness with a cct update
+    this.cacheBright = this.service.getCharacteristic(this.hapChar.Brightness).value;
+
     // Add the set handler to the lightbulb hue characteristic
     this.service
       .getCharacteristic(this.hapChar.Hue)
       .onSet(async (value) => this.internalColourUpdate(value));
     this.cacheSat = this.service.getCharacteristic(this.hapChar.Saturation).value;
 
-    // This is needed as sometimes we need to send the brightness with a cct update
-    this.cacheBright = this.service.getCharacteristic(this.hapChar.Brightness).value;
+    // Add the set handler to the lightbulb colour temperature characteristic
+    this.service.getCharacteristic(this.hapChar.ColorTemperature).onSet(async (value) => {
+      this.internalCTUpdate(value);
+    });
 
     // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
     if (!platform.config.disableNoResponse) {
@@ -87,6 +96,12 @@ export default class {
         }
         return this.service.getCharacteristic(this.hapChar.Hue).value;
       });
+      this.service.getCharacteristic(this.hapChar.ColorTemperature).onGet(() => {
+        if (!this.isOnline) {
+          throw new this.hapErr(-70402);
+        }
+        return this.service.getCharacteristic(this.hapChar.ColorTemperature).value;
+      });
     }
 
     // Output the customised options to the log
@@ -202,6 +217,41 @@ export default class {
     }
   }
 
+  async internalCTUpdate(value) {
+    try {
+      if (this.cacheMired === value) {
+        return;
+      }
+      const updateKey = generateRandomString(5);
+      this.updateKeyCT = updateKey;
+      await sleep(400);
+      if (updateKey !== this.updateKeyCT) {
+        return;
+      }
+      const kelvin = Math.round(1000000 / value);
+      const scaledK = Math.max(Math.min(kelvin, this.maxK), this.minK);
+      const scaledCT = Math.round(((scaledK - this.minK) / (this.maxK - this.minK)) * 100);
+      const params = {
+        colorTemp: scaledCT,
+      };
+      if (this.cacheMode !== 'white') {
+        params.colorMode = 'cct';
+      }
+      await this.platform.sendDeviceUpdate(this.accessory, params);
+      this.cacheMired = value;
+      this.cacheCT = scaledCT;
+      if (this.enableLogging) {
+        this.log('[%s] %s [%sK].', this.name, this.lang.curColour, scaledK);
+      }
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, true);
+      setTimeout(() => {
+        this.service.updateCharacteristic(this.hapChar.ColorTemperature, this.cacheMired);
+      }, 2000);
+      throw new this.hapErr(-70402);
+    }
+  }
+
   async externalUpdate(params) {
     try {
       if (params.switch && params.switch !== this.cacheState) {
@@ -219,11 +269,18 @@ export default class {
       // params.colorTemp is the colour temperature of the bulb when in cct mode 0-100
       // params.hue is the hue of the bulb when in rgb mode 0-360
       // params.saturation is the saturation of the bulb when in rgb mode 0-100
+      // when the plugin first loads we will have all the info
+
       if (
         params.colorMode === 'rgb'
-        || hasProperty(params, 'rgbBrightness')
-        || hasProperty(params, 'hue')
-        || hasProperty(params, 'saturation')
+        || (
+          this.cacheMode === 'color'
+          && (
+            hasProperty(params, 'rgbBrightness')
+            || hasProperty(params, 'hue')
+            || hasProperty(params, 'saturation')
+          )
+        )
       ) {
         this.cacheMode = 'color';
 
@@ -255,8 +312,13 @@ export default class {
         }
       } else if (
         params.colorMode === 'cct'
-        || hasProperty(params, 'cctBrightness')
-        || hasProperty(params, 'colorTemp')
+        || (
+          this.cacheMode === 'white'
+          && (
+            hasProperty(params, 'cctBrightness')
+            || hasProperty(params, 'colorTemp')
+          )
+        )
       ) {
         this.cacheMode = 'white';
         if (hasProperty(params, 'cctBrightness') && params.cctBrightness !== this.cacheBright) {
@@ -266,6 +328,15 @@ export default class {
             this.log('[%s] %s [%s%].', this.name, this.lang.curBright, this.cacheBright);
           }
         }
+        if (hasProperty(params, 'colorTemp') && params.colorTemp !== this.cacheCT) {
+          this.cacheCT = params.colorTemp;
+          const kelvin = Math.round(((this.cacheCT / 100) * (this.maxK - this.minK)) + this.minK);
+          this.cacheMired = Math.round(1000000 / kelvin);
+          this.service.updateCharacteristic(this.hapChar.ColorTemperature, this.cacheMired);
+          if (params.updateSource && this.enableLogging) {
+            this.log('[%s] %s [%sK].', this.name, this.lang.curColour, kelvin);
+          }
+        }
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false);

From 8b07a73d1e752f2ddabdfb504a6ee6a99e6c85c8 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 25 Sep 2022 17:14:15 +0100
Subject: [PATCH 3063/3183] 10.1.1-beta.2

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index f8c07632..2739368e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "10.1.1-beta.1",
+  "version": "10.1.1-beta.2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "10.1.1-beta.1",
+      "version": "10.1.1-beta.2",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 8149bfd3..70a4dbfc 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "10.1.1-beta.1",
+  "version": "10.1.1-beta.2",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From eb52499de88d56aa79398dbb3aca12ac149d1c8e Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 1 Oct 2022 18:45:07 +0100
Subject: [PATCH 3064/3183] lights

---
 lib/device/light-rgb-cct.js        | 16 +++++++-
 lib/device/zigbee/light-rgb-cct.js | 59 ++++++++++++++++++++++++++++--
 2 files changed, 70 insertions(+), 5 deletions(-)

diff --git a/lib/device/light-rgb-cct.js b/lib/device/light-rgb-cct.js
index c6705424..7f2ddc80 100644
--- a/lib/device/light-rgb-cct.js
+++ b/lib/device/light-rgb-cct.js
@@ -451,7 +451,7 @@ export default class {
           };
           break;
         case 136:
-          scaledCT = Math.round(((mToK - 2700) / 3800) * 255);
+          scaledCT = Math.round(((mToK - 2700) / 3800) * 100);
           params = {
             ltype: 'white',
             white: {
@@ -723,7 +723,19 @@ export default class {
               this.cacheMode = 'white';
               const ctDiff = Math.abs(params.white.ct - this.cacheCT);
               this.cacheCT = params.white.ct;
-              const ctToK = Math.round((this.cacheCT / 255) * 3800 + 2700);
+
+              let ctToK;
+              switch (this.accessory.context.eweUIID) {
+                case 136:
+                  ctToK = Math.round((this.cacheCT / 100) * 3800 + 2700);
+                  break;
+                case 137:
+                  ctToK = Math.round(((100 - this.cacheCT) / 100) * 3800 + 2700);
+                  break;
+                default:
+                  ctToK = Math.round((this.cacheCT / 255) * 3800 + 2700);
+                  break;
+              }
               this.cacheMired = Math.max(Math.min(Math.round(1000000 / ctToK), 500), 140);
               hs = m2hs(this.cacheMired);
               [this.cacheHue] = hs;
diff --git a/lib/device/zigbee/light-rgb-cct.js b/lib/device/zigbee/light-rgb-cct.js
index f8bd6976..e6968120 100644
--- a/lib/device/zigbee/light-rgb-cct.js
+++ b/lib/device/zigbee/light-rgb-cct.js
@@ -1,3 +1,4 @@
+import { m2hs } from '../../utils/colour.js';
 import platformConsts from '../../utils/constants.js';
 import { generateRandomString, hasProperty, sleep } from '../../utils/functions.js';
 
@@ -22,8 +23,8 @@ export default class {
       : platformConsts.defaultValues.brightnessStep;
 
     // Different bulbs have different colour temperature ranges
-    this.minK = 2200;
-    this.maxK = 4000;
+    this.minK = 2700;
+    this.maxK = 6500;
 
     // Set the correct logging variables for this accessory
     switch (deviceConf.overrideLogging) {
@@ -49,6 +50,13 @@ export default class {
     this.service = this.accessory.getService(this.hapServ.Lightbulb)
       || this.accessory.addService(this.hapServ.Lightbulb);
 
+    // If adaptive lighting has just been disabled then remove and re-add service to hide AL icon
+    if (this.alShift === -1 && this.accessory.context.adaptiveLighting) {
+      this.accessory.removeService(this.service);
+      this.service = this.accessory.addService(this.hapServ.Lightbulb);
+      this.accessory.context.adaptiveLighting = false;
+    }
+
     // Add the get/set handler to the lightbulb on/off characteristic
     this.service
       .getCharacteristic(this.hapChar.On)
@@ -74,6 +82,14 @@ export default class {
       this.internalCTUpdate(value);
     });
 
+    // Set up the adaptive lighting controller if not disabled by user
+    if (this.alShift !== -1) {
+      this.accessory.alController = new platform.api.hap.AdaptiveLightingController(this.service, {
+        customTemperatureAdjustment: this.alShift,
+      });
+      this.accessory.configureController(this.accessory.alController);
+    }
+
     // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
     if (!platform.config.disableNoResponse) {
       this.service.getCharacteristic(this.hapChar.On).onGet(() => {
@@ -107,6 +123,7 @@ export default class {
     // Output the customised options to the log
     const normalLogging = this.enableLogging ? 'standard' : 'disable';
     const opts = JSON.stringify({
+      adaptiveLightingShift: this.alShift,
       brightnessStep: this.brightStep,
       logging: this.enableDebugLogging ? 'debug' : normalLogging,
     });
@@ -222,12 +239,23 @@ export default class {
       if (this.cacheMired === value) {
         return;
       }
+      if (
+        this.accessory.alController
+        && this.accessory.alController.isAdaptiveLightingActive()
+        && (this.cacheState !== 'on')
+      ) {
+        return;
+      }
       const updateKey = generateRandomString(5);
       this.updateKeyCT = updateKey;
       await sleep(400);
       if (updateKey !== this.updateKeyCT) {
         return;
       }
+      const hs = m2hs(value);
+      this.service.updateCharacteristic(this.hapChar.Hue, hs[0]);
+      this.service.updateCharacteristic(this.hapChar.Saturation, hs[1]);
+      const mToK = Math.max(Math.min(Math.round(1000000 / value), 6500), 2700);
       const kelvin = Math.round(1000000 / value);
       const scaledK = Math.max(Math.min(kelvin, this.maxK), this.minK);
       const scaledCT = Math.round(((scaledK - this.minK) / (this.maxK - this.minK)) * 100);
@@ -241,7 +269,11 @@ export default class {
       this.cacheMired = value;
       this.cacheCT = scaledCT;
       if (this.enableLogging) {
-        this.log('[%s] %s [%sK].', this.name, this.lang.curColour, scaledK);
+        if (this.accessory.alController && this.accessory.alController.isAdaptiveLightingActive()) {
+          this.log('[%s] %s [%sK] %s.', this.name, this.lang.curColour, mToK, this.lang.viaAL);
+        } else {
+          this.log('[%s] %s [%sK].', this.name, this.lang.curColour, mToK);
+        }
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true);
@@ -283,6 +315,15 @@ export default class {
         )
       ) {
         this.cacheMode = 'color';
+        if (
+          this.accessory.alController
+          && this.accessory.alController.isAdaptiveLightingActive()
+        ) {
+          this.accessory.alController.disableAdaptiveLighting();
+          if (this.enableLogging) {
+            this.log('[%s] %s.', this.name, this.lang.disabledAL);
+          }
+        }
 
         if (hasProperty(params, 'rgbBrightness') && params.rgbBrightness !== this.cacheBright) {
           this.cacheBright = params.rgbBrightness;
@@ -329,10 +370,22 @@ export default class {
           }
         }
         if (hasProperty(params, 'colorTemp') && params.colorTemp !== this.cacheCT) {
+          const ctDiff = Math.abs(params.colorTemp - this.cacheCT);
           this.cacheCT = params.colorTemp;
           const kelvin = Math.round(((this.cacheCT / 100) * (this.maxK - this.minK)) + this.minK);
           this.cacheMired = Math.round(1000000 / kelvin);
           this.service.updateCharacteristic(this.hapChar.ColorTemperature, this.cacheMired);
+          if (
+            this.accessory.alController
+            && this.accessory.alController.isAdaptiveLightingActive()
+            && ctDiff > 20
+          ) {
+            // Look for a variation greater than twenty
+            this.accessory.alController.disableAdaptiveLighting();
+            if (this.enableLogging) {
+              this.log('[%s] %s.', this.name, this.lang.disabledAL);
+            }
+          }
           if (params.updateSource && this.enableLogging) {
             this.log('[%s] %s [%sK].', this.name, this.lang.curColour, kelvin);
           }

From 3746d8f2cc874ef724a8341251d6c900df7fd503 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 1 Oct 2022 18:45:37 +0100
Subject: [PATCH 3065/3183] 10.1.1-beta.3

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 2739368e..0db53ea8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "10.1.1-beta.2",
+  "version": "10.1.1-beta.3",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "10.1.1-beta.2",
+      "version": "10.1.1-beta.3",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 70a4dbfc..fb005c72 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "10.1.1-beta.2",
+  "version": "10.1.1-beta.3",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From 636901cf11465f1aee3665e7bb37e85beb691872 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 3 Oct 2022 20:24:38 +0100
Subject: [PATCH 3066/3183] M5 act like switch devices

---
 lib/device/outlet-single-inched.js | 2 +-
 lib/device/outlet-single.js        | 2 +-
 lib/device/switch-multi.js         | 2 +-
 lib/device/switch-single-inched.js | 2 +-
 lib/device/switch-single.js        | 2 +-
 lib/utils/constants.js             | 9 +++++++--
 6 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/lib/device/outlet-single-inched.js b/lib/device/outlet-single-inched.js
index 8ca037f2..5c9b575b 100644
--- a/lib/device/outlet-single-inched.js
+++ b/lib/device/outlet-single-inched.js
@@ -24,7 +24,7 @@ export default class {
     UIID 1/6/14/24/27/112/1009/1256/7004: single switch, no power readings
     UIID 5: single switch, with wattage readings
     UIID 32: single switch, with wattage, voltage and amp readings
-    UIID 77/78/81/107: single switch but firmware uses multiple channels (only need CH0)
+    UIID 77/78/81/107/112/138/160: single switch but firmware uses multiple channels (only need CH0)
     UIID 182: single switch but multiple channels with wattage, voltage and amp readings
     */
 
diff --git a/lib/device/outlet-single.js b/lib/device/outlet-single.js
index c0e890e4..37dad6ae 100644
--- a/lib/device/outlet-single.js
+++ b/lib/device/outlet-single.js
@@ -23,7 +23,7 @@ export default class {
     UIID 1/6/14/24/27/112/1009/1256/7004: single switch, no power readings
     UIID 5: single switch, with wattage readings
     UIID 32: single switch, with wattage, voltage and amp readings
-    UIID 77/78/81/107: single switch but firmware uses multiple channels (only need CH0)
+    UIID 77/78/81/107/112/138/160: single switch but firmware uses multiple channels (only need CH0)
     UIID 182/190: single switch but multiple channels with wattage, voltage and amp readings
     */
 
diff --git a/lib/device/switch-multi.js b/lib/device/switch-multi.js
index 18a59d0a..fc4aaa22 100644
--- a/lib/device/switch-multi.js
+++ b/lib/device/switch-multi.js
@@ -23,7 +23,7 @@ export default class {
     this.isOnline = true;
 
     /*
-    UIID 2/3/4/7/8/9/29/30/31/41/82/83/84/113/114/2256/3256/4256: multi switch, no power readings
+    UIID 2/3/4/7/8/9/29/30/31/41/82/83/84/113/114/161/162/2256/3256/4256: multi switch, no power readings
     UIID 126: multi switch, with wattage, voltage and amp readings (DUALR3)
     */
 
diff --git a/lib/device/switch-single-inched.js b/lib/device/switch-single-inched.js
index eff07709..66b13827 100644
--- a/lib/device/switch-single-inched.js
+++ b/lib/device/switch-single-inched.js
@@ -24,7 +24,7 @@ export default class {
     UIID 1/6/14/24/27/112/1009/1256/7004: single switch, no power readings
     UIID 5: single switch, with wattage readings
     UIID 32: single switch, with wattage, voltage and amp readings
-    UIID 77/78/81/107: single switch but firmware uses multiple channels (only need CH0)
+    UIID 77/78/81/107/112/138/160: single switch but firmware uses multiple channels (only need CH0)
     UIID 182/190: single switch but multiple channels with wattage, voltage and amp readings
     */
 
diff --git a/lib/device/switch-single.js b/lib/device/switch-single.js
index e2535205..5f0b8a87 100644
--- a/lib/device/switch-single.js
+++ b/lib/device/switch-single.js
@@ -23,7 +23,7 @@ export default class {
     UIID 1/6/14/24/27/112/1009/1256/7004: single switch, no power readings
     UIID 5: single switch, with wattage readings
     UIID 32: single switch, with wattage, voltage and amp readings
-    UIID 77/78/81/107: single switch but firmware uses multiple channels (only need CH0)
+    UIID 77/78/81/107/112/138/160: single switch but firmware uses multiple channels (only need CH0)
     UIID 182/190: single switch but multiple channels with wattage, voltage and amp readings
     */
 
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 6ee2f8a4..2c2a25c0 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -281,13 +281,16 @@ export default {
       133,
       136,
       138,
+      160,
+      161,
+      162,
       165,
       181,
       182,
       190,
     ],
     switchSingle: [1, 6, 14, 24, 27, 1009, 1256, 7004],
-    switchSCM: [77, 78, 81, 107, 112, 138],
+    switchSCM: [77, 78, 81, 107, 112, 138, 160],
     switchSCMPower: [182, 190],
     switchSinglePower: [5, 32],
     switchMulti: [
@@ -309,13 +312,15 @@ export default {
       139,
       140,
       141,
+      161,
+      162,
       2256,
       3256,
       4256,
     ],
     switchMultiPower: [126, 165],
     switchMate: [177],
-    switchMan: [160, 161, 162, 174],
+    switchMan: [174],
     lightDimmer: [36, 44, 57],
     lightRGB: [22],
     lightCCT: [103],

From 03c78baf940a207ef09aa79245a9c194ea4db5b3 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Mon, 3 Oct 2022 20:25:25 +0100
Subject: [PATCH 3067/3183] 10.1.1-beta.4

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 0db53ea8..757e5ff7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "10.1.1-beta.3",
+  "version": "10.1.1-beta.4",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "10.1.1-beta.3",
+      "version": "10.1.1-beta.4",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index fb005c72..ed5ed8ca 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "10.1.1-beta.3",
+  "version": "10.1.1-beta.4",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From bff851bee208262e61f1cf63c199daabfe631bb4 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 4 Oct 2022 18:08:44 +0100
Subject: [PATCH 3068/3183] try zigbee motor

---
 lib/device/zigbee/motor.js | 223 ++++++++++++++++++++++++++++++++++++-
 lib/utils/constants.js     |   2 +
 package-lock.json          |  24 ++--
 3 files changed, 236 insertions(+), 13 deletions(-)

diff --git a/lib/device/zigbee/motor.js b/lib/device/zigbee/motor.js
index 51cfe5b8..40459668 100644
--- a/lib/device/zigbee/motor.js
+++ b/lib/device/zigbee/motor.js
@@ -1,5 +1,5 @@
 import platformConsts from '../../utils/constants.js';
-import { hasProperty } from '../../utils/functions.js';
+import { generateRandomString, hasProperty, sleep } from '../../utils/functions.js';
 
 export default class {
   constructor(platform, accessory) {
@@ -19,6 +19,7 @@ export default class {
     this.lowBattThreshold = deviceConf.lowBattThreshold
       ? Math.min(deviceConf.lowBattThreshold, 100)
       : platformConsts.defaultValues.lowBattThreshold;
+    const showAsMotor = deviceConf.showAsMotor || platformConsts.defaultValues.showAsMotor;
 
     // Set the correct logging variables for this accessory
     switch (deviceConf.overrideLogging) {
@@ -49,15 +50,161 @@ export default class {
       || this.accessory.addService(this.hapServ.Battery);
     this.cacheBatt = this.battService.getCharacteristic(this.hapChar.BatteryLevel).value;
 
+    // Add the window covering service if it doesn't already exist
+    let service;
+    switch (showAsMotor) {
+      case 'door':
+        service = this.hapServ.Door;
+        if (this.accessory.getService(this.hapServ.GarageDoorOpener)) {
+          this.accessory.removeService(this.accessory.getService(this.hapServ.GarageDoorOpener));
+        }
+        if (this.accessory.getService(this.hapServ.Window)) {
+          this.accessory.removeService(this.accessory.getService(this.hapServ.Window));
+        }
+        if (this.accessory.getService(this.hapServ.WindowCovering)) {
+          this.accessory.removeService(this.accessory.getService(this.hapServ.WindowCovering));
+        }
+        break;
+      case 'garage':
+        service = this.hapServ.GarageDoorOpener;
+        this.isGarage = true;
+        if (this.accessory.getService(this.hapServ.Door)) {
+          this.accessory.removeService(this.accessory.getService(this.hapServ.Door));
+        }
+        if (this.accessory.getService(this.hapServ.Window)) {
+          this.accessory.removeService(this.accessory.getService(this.hapServ.Window));
+        }
+        if (this.accessory.getService(this.hapServ.WindowCovering)) {
+          this.accessory.removeService(this.accessory.getService(this.hapServ.WindowCovering));
+        }
+        break;
+      case 'window':
+        service = this.hapServ.Window;
+        if (this.accessory.getService(this.hapServ.Door)) {
+          this.accessory.removeService(this.accessory.getService(this.hapServ.Door));
+        }
+        if (this.accessory.getService(this.hapServ.GarageDoorOpener)) {
+          this.accessory.removeService(this.accessory.getService(this.hapServ.GarageDoorOpener));
+        }
+        if (this.accessory.getService(this.hapServ.WindowCovering)) {
+          this.accessory.removeService(this.accessory.getService(this.hapServ.WindowCovering));
+        }
+        break;
+      default:
+        service = this.hapServ.WindowCovering;
+        if (this.accessory.getService(this.hapServ.Door)) {
+          this.accessory.removeService(this.accessory.getService(this.hapServ.Door));
+        }
+        if (this.accessory.getService(this.hapServ.GarageDoorOpener)) {
+          this.accessory.removeService(this.accessory.getService(this.hapServ.GarageDoorOpener));
+        }
+        if (this.accessory.getService(this.hapServ.Window)) {
+          this.accessory.removeService(this.accessory.getService(this.hapServ.Window));
+        }
+        break;
+    }
+    this.service = this.accessory.getService(service) || this.accessory.addService(service);
+
+    // Add the set handler to the target position characteristic
+    if (this.isGarage) {
+      this.service
+        .getCharacteristic(this.hapChar.TargetDoorState)
+        .onSet(async (value) => this.internalTargetUpdate(value));
+    } else {
+      this.service
+        .getCharacteristic(this.hapChar.TargetPosition)
+        .onSet(async (value) => this.internalPositionUpdate(value));
+    }
+
+    // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
+    if (!platform.config.disableNoResponse) {
+      if (this.isGarage) {
+        this.service.getCharacteristic(this.hapChar.CurrentDoorState).onGet(() => {
+          if (!this.isOnline) {
+            throw new this.hapErr(-70402);
+          }
+          return this.service.getCharacteristic(this.hapChar.CurrentDoorState).value;
+        });
+        this.service.getCharacteristic(this.hapChar.TargetDoorState).onGet(() => {
+          if (!this.isOnline) {
+            throw new this.hapErr(-70402);
+          }
+          return this.service.getCharacteristic(this.hapChar.TargetDoorState).value;
+        });
+      } else {
+        this.service.getCharacteristic(this.hapChar.CurrentPosition).onGet(() => {
+          if (!this.isOnline) {
+            throw new this.hapErr(-70402);
+          }
+          return this.service.getCharacteristic(this.hapChar.CurrentPosition).value;
+        });
+        this.service.getCharacteristic(this.hapChar.TargetPosition).onGet(() => {
+          if (!this.isOnline) {
+            throw new this.hapErr(-70402);
+          }
+          return this.service.getCharacteristic(this.hapChar.TargetPosition).value;
+        });
+      }
+    }
+
     // Output the customised options to the log
     const normalLogging = this.enableLogging ? 'standard' : 'disable';
     const opts = JSON.stringify({
       logging: this.enableDebugLogging ? 'debug' : normalLogging,
       lowBattThreshold: this.lowBattThreshold,
+      showAsMotor,
     });
     this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts);
   }
 
+  async internalPositionUpdate(value) {
+    try {
+      if (this.cachePos === value) {
+        return;
+      }
+      const updateKey = generateRandomString(5);
+      this.updateKey = updateKey;
+      await sleep(500);
+      if (updateKey !== this.updateKey) {
+        return;
+      }
+      const params = { openPercent: value };
+      await this.platform.sendDeviceUpdate(this.accessory, params);
+      this.cacheTarg = value;
+      if (this.enableLogging) {
+        this.log('[%s] %s [%s%].', this.name, this.lang.curTarg, this.cacheTarg);
+      }
+    } catch (err) {
+      // Catch any errors and let the platform display them
+      this.platform.deviceUpdateError(this.accessory, err, true);
+      setTimeout(() => {
+        this.service.updateCharacteristic(this.hapChar.TargetPosition, this.cacheTarg);
+      }, 2000);
+      throw new this.hapErr(-70402);
+    }
+  }
+
+  async internalTargetUpdate(value) {
+    try {
+      // 0 for open, 1 for closed
+      // this.cachePos is 0 for closed and >0 for open
+
+      const params = { openPercent: value === 1 ? 0 : 100 };
+      await this.platform.sendDeviceUpdate(this.accessory, params);
+      this.cacheTarg = value === 1 ? 0 : 100;
+      if (this.enableLogging) {
+        this.log('[%s] %s [%s%].', this.name, this.lang.curTarg, this.cacheTarg);
+      }
+    } catch (err) {
+      // Catch any errors and let the platform display them
+      this.platform.deviceUpdateError(this.accessory, err, true);
+      setTimeout(() => {
+        this.service.updateCharacteristic(this.hapChar.TargetDoorState, this.cacheTarg);
+      }, 2000);
+      throw new this.hapErr(-70402);
+    }
+  }
+
   async externalUpdate(params) {
     try {
       if (hasProperty(params, 'battery') && params.battery !== this.cacheBatt) {
@@ -72,6 +219,80 @@ export default class {
           this.log('[%s] %s [%s%].', this.name, this.lang.curBatt, this.cacheBattScaled);
         }
       }
+
+      // currLocation is the current position of the motor
+      if (hasProperty(params, 'curPercen')) {
+        if (params.curPercen !== this.cachePos) {
+          this.cachePos = params.curPercen;
+          if (!this.isGarage) {
+            this.service.updateCharacteristic(this.hapChar.CurrentPosition, this.cachePos);
+          }
+          if (params.updateSource && this.enableLogging) {
+            this.log('[%s] %s [%s%].', this.name, this.lang.curPos, this.cachePos);
+          }
+        }
+      }
+
+      // location is the target position of the motor
+      if (hasProperty(params, 'openPercent')) {
+        if (params.openPercent !== this.cacheTarg) {
+          this.cacheTarg = params.openPercent;
+          if (!this.isGarage) {
+            this.service.updateCharacteristic(this.hapChar.TargetPosition, this.cacheTarg);
+          }
+          if (params.updateSource && this.enableLogging) {
+            this.log('[%s] %s [%s%].', this.name, this.lang.curTarg, this.cacheTarg);
+          }
+        }
+      }
+
+      // Get the target door state characteristic for use later
+      let targetChar;
+      if (this.isGarage) {
+        targetChar = this.service.getCharacteristic(this.TargetDoorState);
+      }
+
+      // If the two are equal then the motor must have stopped at this position
+      if (this.cacheTarg === this.cachePos) {
+        if (this.isGarage) {
+          if (this.cachePos === 0) {
+            // CLOSED
+            this.service.updateCharacteristic(this.hapChar.CurrentDoorState, 1);
+            if (targetChar.value !== 1) {
+              targetChar.updateValue(1);
+            }
+          } else {
+            // OPEN
+            this.service.updateCharacteristic(this.hapChar.CurrentDoorState, 0);
+            if (targetChar.value !== 0) {
+              targetChar.updateValue(0);
+            }
+          }
+        } else {
+          // PositionState 2 === STOPPED
+          this.service.updateCharacteristic(this.hapChar.PositionState, 2);
+        }
+      } else if (this.cacheTarg > this.cachePos) {
+        if (this.isGarage) {
+          // OPENING
+          this.service.updateCharacteristic(this.hapChar.CurrentDoorState, 2);
+          if (targetChar.value !== 0) {
+            targetChar.updateValue(0);
+          }
+        } else {
+          // PositionState 1 === INCREASING
+          this.service.updateCharacteristic(this.hapChar.PositionState, 1);
+        }
+      } else if (this.isGarage) {
+        // CLOSING
+        this.service.updateCharacteristic(this.hapChar.CurrentDoorState, 3);
+        if (targetChar.value !== 1) {
+          targetChar.updateValue(1);
+        }
+      } else {
+        // PositionState 0 === DECREASING
+        this.service.updateCharacteristic(this.hapChar.PositionState, 0);
+      }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false);
     }
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 2c2a25c0..555e4be4 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -370,6 +370,7 @@ export default {
     'colorR',
     'colorTemp',
     'config',
+    'curPercent',
     'current',
     'currentHumidity',
     'currentTemperature',
@@ -392,6 +393,7 @@ export default {
     'mode',
     'motion',
     'motorTurn',
+    'openPercent',
     'online',
     'outlet',
     'per',
diff --git a/package-lock.json b/package-lock.json
index 757e5ff7..4e35af94 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -75,9 +75,9 @@
       "integrity": "sha512-axFX7lN2Yd7bz/6SlD7dzq5sY/N9+XYuLHPukuiyHQRDtNMRL1uDqJhOx6RVaN2tYDHB75h7YxRQWP7U44Mgzg=="
     },
     "node_modules/@humanwhocodes/config-array": {
-      "version": "0.10.5",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.10.5.tgz",
-      "integrity": "sha512-XVVDtp+dVvRxMoxSiSfasYaG02VEe1qH5cKgMQJWhol6HwzbcqoCMJi8dAGoYAO57jhUyhI6cWuRiTcRaDaYug==",
+      "version": "0.10.7",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.10.7.tgz",
+      "integrity": "sha512-MDl6D6sBsaV452/QSdX+4CXIjZhIcI0PELsxUjk4U828yd58vk3bTIvk/6w5FY+4hIy9sLW0sfrV7K7Kc++j/w==",
       "dev": true,
       "dependencies": {
         "@humanwhocodes/object-schema": "^1.2.1",
@@ -1465,9 +1465,9 @@
       "dev": true
     },
     "node_modules/js-sdsl": {
-      "version": "4.1.4",
-      "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.1.4.tgz",
-      "integrity": "sha512-Y2/yD55y5jteOAmY50JbUZYwk3CP3wnLPEZnlR1w9oKhITrBEtAxwuWKebFf8hMrPMgbYwFoWK/lH2sBkErELw==",
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.1.5.tgz",
+      "integrity": "sha512-08bOAKweV2NUC1wqTtf3qZlnpOX/R2DU9ikpjOHs0H+ibQv3zpncVQg6um4uYtRtrwIX8M4Nh3ytK4HGlYAq7Q==",
       "dev": true
     },
     "node_modules/js-yaml": {
@@ -2344,9 +2344,9 @@
       "integrity": "sha512-axFX7lN2Yd7bz/6SlD7dzq5sY/N9+XYuLHPukuiyHQRDtNMRL1uDqJhOx6RVaN2tYDHB75h7YxRQWP7U44Mgzg=="
     },
     "@humanwhocodes/config-array": {
-      "version": "0.10.5",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.10.5.tgz",
-      "integrity": "sha512-XVVDtp+dVvRxMoxSiSfasYaG02VEe1qH5cKgMQJWhol6HwzbcqoCMJi8dAGoYAO57jhUyhI6cWuRiTcRaDaYug==",
+      "version": "0.10.7",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.10.7.tgz",
+      "integrity": "sha512-MDl6D6sBsaV452/QSdX+4CXIjZhIcI0PELsxUjk4U828yd58vk3bTIvk/6w5FY+4hIy9sLW0sfrV7K7Kc++j/w==",
       "dev": true,
       "requires": {
         "@humanwhocodes/object-schema": "^1.2.1",
@@ -3356,9 +3356,9 @@
       "dev": true
     },
     "js-sdsl": {
-      "version": "4.1.4",
-      "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.1.4.tgz",
-      "integrity": "sha512-Y2/yD55y5jteOAmY50JbUZYwk3CP3wnLPEZnlR1w9oKhITrBEtAxwuWKebFf8hMrPMgbYwFoWK/lH2sBkErELw==",
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.1.5.tgz",
+      "integrity": "sha512-08bOAKweV2NUC1wqTtf3qZlnpOX/R2DU9ikpjOHs0H+ibQv3zpncVQg6um4uYtRtrwIX8M4Nh3ytK4HGlYAq7Q==",
       "dev": true
     },
     "js-yaml": {

From 51a1ba69ae245750e5f1447d27b40934ba921a79 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Tue, 4 Oct 2022 18:09:16 +0100
Subject: [PATCH 3069/3183] 10.1.1-beta.5

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 4e35af94..2922c639 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "10.1.1-beta.4",
+  "version": "10.1.1-beta.5",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "10.1.1-beta.4",
+      "version": "10.1.1-beta.5",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index ed5ed8ca..6fa73b8a 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "10.1.1-beta.4",
+  "version": "10.1.1-beta.5",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From ee918ee467fa0d6baaf72ed092e98dab2e68ce04 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Thu, 6 Oct 2022 19:44:11 +0100
Subject: [PATCH 3070/3183] update axios, and node 18

---
 package-lock.json | 36 ++++++++++++++++++++++++------------
 package.json      |  4 ++--
 2 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 2922c639..80ea0537 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -28,7 +28,7 @@
       "license": "MIT",
       "dependencies": {
         "@homebridge/plugin-ui-utils": "^0.0.19",
-        "axios": "^0.27.2",
+        "axios": "^1.0.0",
         "node-persist": "^3.1.0",
         "p-queue": "^7.3.0",
         "websocket-as-promised": "^2.0.1",
@@ -43,7 +43,7 @@
       },
       "engines": {
         "homebridge": "^1.5.0",
-        "node": "^14.20.1 || ^16.17.1"
+        "node": "^14.20.1 || ^16.17.1 || ^18.10.0"
       }
     },
     "node_modules/@eslint/eslintrc": {
@@ -277,12 +277,13 @@
       "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
     },
     "node_modules/axios": {
-      "version": "0.27.2",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-0.27.2.tgz",
-      "integrity": "sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.0.0.tgz",
+      "integrity": "sha512-SsHsGFN1qNPFT5QhSoSD37SHDfGyLSW5AESmyLk2JeCMHv5g0I9g0Hz/zQHx2KNe0jGXh2q2hAm7OdkXm360CA==",
       "dependencies": {
-        "follow-redirects": "^1.14.9",
-        "form-data": "^4.0.0"
+        "follow-redirects": "^1.15.0",
+        "form-data": "^4.0.0",
+        "proxy-from-env": "^1.1.0"
       }
     },
     "node_modules/balanced-match": {
@@ -1872,6 +1873,11 @@
         "node": ">=10"
       }
     },
+    "node_modules/proxy-from-env": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
+      "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="
+    },
     "node_modules/punycode": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
@@ -2487,12 +2493,13 @@
       "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
     },
     "axios": {
-      "version": "0.27.2",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-0.27.2.tgz",
-      "integrity": "sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.0.0.tgz",
+      "integrity": "sha512-SsHsGFN1qNPFT5QhSoSD37SHDfGyLSW5AESmyLk2JeCMHv5g0I9g0Hz/zQHx2KNe0jGXh2q2hAm7OdkXm360CA==",
       "requires": {
-        "follow-redirects": "^1.14.9",
-        "form-data": "^4.0.0"
+        "follow-redirects": "^1.15.0",
+        "form-data": "^4.0.0",
+        "proxy-from-env": "^1.1.0"
       }
     },
     "balanced-match": {
@@ -3646,6 +3653,11 @@
       "resolved": "https://registry.npmjs.org/promised-map/-/promised-map-1.0.0.tgz",
       "integrity": "sha512-fP9VSMgcml+U2uJ9PBc4/LDQ3ZkJCH4blLNCS6gbH7RHyRZCYs91zxWHqiUy+heFiEMiB2op/qllYoFqmIqdWA=="
     },
+    "proxy-from-env": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
+      "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="
+    },
     "punycode": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
diff --git a/package.json b/package.json
index 6fa73b8a..af73ef31 100644
--- a/package.json
+++ b/package.json
@@ -31,7 +31,7 @@
   },
   "engines": {
     "homebridge": "^1.5.0",
-    "node": "^14.20.1 || ^16.17.1"
+    "node": "^14.20.1 || ^16.17.1 || ^18.10.0"
   },
   "repository": {
     "type": "git",
@@ -60,7 +60,7 @@
   ],
   "dependencies": {
     "@homebridge/plugin-ui-utils": "^0.0.19",
-    "axios": "^0.27.2",
+    "axios": "^1.0.0",
     "node-persist": "^3.1.0",
     "p-queue": "^7.3.0",
     "websocket-as-promised": "^2.0.1",

From f08f02ac043f7fe018534170d1491534a3eea165 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 9 Oct 2022 13:08:13 +0100
Subject: [PATCH 3071/3183] new version

---
 CHANGELOG.md      | 24 +++++++++++++--
 package-lock.json | 78 ++++++++++++++++++-----------------------------
 package.json      |  4 +--
 3 files changed, 54 insertions(+), 52 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0925ff18..8bdfbc72 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,26 @@
 
 All notable changes to homebridge-ewelink will be documented in this file.
 
+## 10.2.0 (2022-10-09)
+
+### Added
+
+- Support devices with UIID 173 (Sonoff L3)
+- Support devices with UIID 3258 (Zigbee RGBW light)
+- Work-in-progress for devices with UUIDs:
+  - 130 (SPM sub-unit)
+  - 174 (SwitchMan devices)
+  - 1514 (Zigbee motor controller)
+
+### Changed
+
+- Allow for node v18.10.0
+- Update axios to `v1.1.2`
+
+### Fixed
+
+- Incorrectly exposing Sonoff M5 devices as programmable switches
+
 ## 10.1.0 (2022-09-25)
 
 ### Added
@@ -12,10 +32,10 @@ All notable changes to homebridge-ewelink will be documented in this file.
 - Support devices with UUID 190 (POWR316/POWR316D/POWR320D)
 - Work-in-progress for devices with UUIDs:
   - 130 (SPM sub-unit)
-  - 160/161/162/174 (SwitchMan devices)
+  - 174 (SwitchMan devices)
   - 173 (Sonoff L3)
   - 1514 (Zigbee motor controller)
-  - 3258 (Zigbee RGB light)
+  - 3258 (Zigbee RGBW light)
 
 ### Changed
 
diff --git a/package-lock.json b/package-lock.json
index 80ea0537..0b6b39a4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -28,14 +28,14 @@
       "license": "MIT",
       "dependencies": {
         "@homebridge/plugin-ui-utils": "^0.0.19",
-        "axios": "^1.0.0",
+        "axios": "^1.1.2",
         "node-persist": "^3.1.0",
         "p-queue": "^7.3.0",
         "websocket-as-promised": "^2.0.1",
         "ws": "^8.9.0"
       },
       "devDependencies": {
-        "eslint": "^8.24.0",
+        "eslint": "^8.25.0",
         "eslint-config-airbnb-base": "^15.0.0",
         "eslint-plugin-import": "^2.26.0",
         "eslint-plugin-import-newlines": "^1.2.3",
@@ -47,9 +47,9 @@
       }
     },
     "node_modules/@eslint/eslintrc": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.2.tgz",
-      "integrity": "sha512-AXYd23w1S/bv3fTs3Lz0vjiYemS08jWkI3hYyS9I1ry+0f+Yjs1wm+sU0BS8qDOPrBIkp4qHYC16I8uVtpLajQ==",
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.3.tgz",
+      "integrity": "sha512-uj3pT6Mg+3t39fvLrj8iuCIJ38zKO9FpGtJ4BBJebJhEwjoT+KLVNCcHT5QC9NGRIEi7fZ0ZR8YRb884auB4Lg==",
       "dev": true,
       "dependencies": {
         "ajv": "^6.12.4",
@@ -88,16 +88,6 @@
         "node": ">=10.10.0"
       }
     },
-    "node_modules/@humanwhocodes/gitignore-to-minimatch": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/gitignore-to-minimatch/-/gitignore-to-minimatch-1.0.2.tgz",
-      "integrity": "sha512-rSqmMJDdLFUsyxR6FMtD00nfQKKLFb1kv+qBbOVKqErvloEIJLo5bDTJTQNTYgeyp78JsA7u/NPi5jT1GR/MuA==",
-      "dev": true,
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/nzakas"
-      }
-    },
     "node_modules/@humanwhocodes/module-importer": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
@@ -277,9 +267,9 @@
       "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
     },
     "node_modules/axios": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.0.0.tgz",
-      "integrity": "sha512-SsHsGFN1qNPFT5QhSoSD37SHDfGyLSW5AESmyLk2JeCMHv5g0I9g0Hz/zQHx2KNe0jGXh2q2hAm7OdkXm360CA==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.1.2.tgz",
+      "integrity": "sha512-bznQyETwElsXl2RK7HLLwb5GPpOLlycxHCtrpDR/4RqqBzjARaOTo3jz4IgtntWUYee7Ne4S8UHd92VCuzPaWA==",
       "dependencies": {
         "follow-redirects": "^1.15.0",
         "form-data": "^4.0.0",
@@ -482,9 +472,9 @@
       }
     },
     "node_modules/es-abstract": {
-      "version": "1.20.3",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.3.tgz",
-      "integrity": "sha512-AyrnaKVpMzljIdwjzrj+LxGmj8ik2LckwXacHqrJJ/jxz6dDDBcZ7I7nlHM0FvEW8MfbWJwOd+yT2XzYW49Frw==",
+      "version": "1.20.4",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.4.tgz",
+      "integrity": "sha512-0UtvRN79eMe2L+UNEF1BwRe364sj/DXhQ/k5FmivgoSdpM90b8Jc0mDzKMGo7QS0BVbOP/bTwBKNnDc9rNzaPA==",
       "dependencies": {
         "call-bind": "^1.0.2",
         "es-to-primitive": "^1.2.1",
@@ -496,7 +486,7 @@
         "has-property-descriptors": "^1.0.0",
         "has-symbols": "^1.0.3",
         "internal-slot": "^1.0.3",
-        "is-callable": "^1.2.6",
+        "is-callable": "^1.2.7",
         "is-negative-zero": "^2.0.2",
         "is-regex": "^1.1.4",
         "is-shared-array-buffer": "^1.0.2",
@@ -556,14 +546,13 @@
       }
     },
     "node_modules/eslint": {
-      "version": "8.24.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.24.0.tgz",
-      "integrity": "sha512-dWFaPhGhTAiPcCgm3f6LI2MBWbogMnTJzFBbhXVRQDJPkr9pGZvVjlVfXd+vyDcWPA2Ic9L2AXPIQM0+vk/cSQ==",
+      "version": "8.25.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.25.0.tgz",
+      "integrity": "sha512-DVlJOZ4Pn50zcKW5bYH7GQK/9MsoQG2d5eDH0ebEkE8PbgzTTmtt/VTH9GGJ4BfeZCpBLqFfvsjX35UacUL83A==",
       "dev": true,
       "dependencies": {
-        "@eslint/eslintrc": "^1.3.2",
+        "@eslint/eslintrc": "^1.3.3",
         "@humanwhocodes/config-array": "^0.10.5",
-        "@humanwhocodes/gitignore-to-minimatch": "^1.0.2",
         "@humanwhocodes/module-importer": "^1.0.1",
         "ajv": "^6.10.0",
         "chalk": "^4.0.0",
@@ -2328,9 +2317,9 @@
   },
   "dependencies": {
     "@eslint/eslintrc": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.2.tgz",
-      "integrity": "sha512-AXYd23w1S/bv3fTs3Lz0vjiYemS08jWkI3hYyS9I1ry+0f+Yjs1wm+sU0BS8qDOPrBIkp4qHYC16I8uVtpLajQ==",
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.3.tgz",
+      "integrity": "sha512-uj3pT6Mg+3t39fvLrj8iuCIJ38zKO9FpGtJ4BBJebJhEwjoT+KLVNCcHT5QC9NGRIEi7fZ0ZR8YRb884auB4Lg==",
       "dev": true,
       "requires": {
         "ajv": "^6.12.4",
@@ -2360,12 +2349,6 @@
         "minimatch": "^3.0.4"
       }
     },
-    "@humanwhocodes/gitignore-to-minimatch": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/gitignore-to-minimatch/-/gitignore-to-minimatch-1.0.2.tgz",
-      "integrity": "sha512-rSqmMJDdLFUsyxR6FMtD00nfQKKLFb1kv+qBbOVKqErvloEIJLo5bDTJTQNTYgeyp78JsA7u/NPi5jT1GR/MuA==",
-      "dev": true
-    },
     "@humanwhocodes/module-importer": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
@@ -2493,9 +2476,9 @@
       "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
     },
     "axios": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.0.0.tgz",
-      "integrity": "sha512-SsHsGFN1qNPFT5QhSoSD37SHDfGyLSW5AESmyLk2JeCMHv5g0I9g0Hz/zQHx2KNe0jGXh2q2hAm7OdkXm360CA==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.1.2.tgz",
+      "integrity": "sha512-bznQyETwElsXl2RK7HLLwb5GPpOLlycxHCtrpDR/4RqqBzjARaOTo3jz4IgtntWUYee7Ne4S8UHd92VCuzPaWA==",
       "requires": {
         "follow-redirects": "^1.15.0",
         "form-data": "^4.0.0",
@@ -2651,9 +2634,9 @@
       }
     },
     "es-abstract": {
-      "version": "1.20.3",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.3.tgz",
-      "integrity": "sha512-AyrnaKVpMzljIdwjzrj+LxGmj8ik2LckwXacHqrJJ/jxz6dDDBcZ7I7nlHM0FvEW8MfbWJwOd+yT2XzYW49Frw==",
+      "version": "1.20.4",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.4.tgz",
+      "integrity": "sha512-0UtvRN79eMe2L+UNEF1BwRe364sj/DXhQ/k5FmivgoSdpM90b8Jc0mDzKMGo7QS0BVbOP/bTwBKNnDc9rNzaPA==",
       "requires": {
         "call-bind": "^1.0.2",
         "es-to-primitive": "^1.2.1",
@@ -2665,7 +2648,7 @@
         "has-property-descriptors": "^1.0.0",
         "has-symbols": "^1.0.3",
         "internal-slot": "^1.0.3",
-        "is-callable": "^1.2.6",
+        "is-callable": "^1.2.7",
         "is-negative-zero": "^2.0.2",
         "is-regex": "^1.1.4",
         "is-shared-array-buffer": "^1.0.2",
@@ -2707,14 +2690,13 @@
       "dev": true
     },
     "eslint": {
-      "version": "8.24.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.24.0.tgz",
-      "integrity": "sha512-dWFaPhGhTAiPcCgm3f6LI2MBWbogMnTJzFBbhXVRQDJPkr9pGZvVjlVfXd+vyDcWPA2Ic9L2AXPIQM0+vk/cSQ==",
+      "version": "8.25.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.25.0.tgz",
+      "integrity": "sha512-DVlJOZ4Pn50zcKW5bYH7GQK/9MsoQG2d5eDH0ebEkE8PbgzTTmtt/VTH9GGJ4BfeZCpBLqFfvsjX35UacUL83A==",
       "dev": true,
       "requires": {
-        "@eslint/eslintrc": "^1.3.2",
+        "@eslint/eslintrc": "^1.3.3",
         "@humanwhocodes/config-array": "^0.10.5",
-        "@humanwhocodes/gitignore-to-minimatch": "^1.0.2",
         "@humanwhocodes/module-importer": "^1.0.1",
         "ajv": "^6.10.0",
         "chalk": "^4.0.0",
diff --git a/package.json b/package.json
index af73ef31..7f29f190 100644
--- a/package.json
+++ b/package.json
@@ -60,7 +60,7 @@
   ],
   "dependencies": {
     "@homebridge/plugin-ui-utils": "^0.0.19",
-    "axios": "^1.0.0",
+    "axios": "^1.1.2",
     "node-persist": "^3.1.0",
     "p-queue": "^7.3.0",
     "websocket-as-promised": "^2.0.1",
@@ -71,6 +71,6 @@
     "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-import-newlines": "^1.2.3",
     "eslint-plugin-sort-exports": "^0.7.0",
-    "eslint": "^8.24.0"
+    "eslint": "^8.25.0"
   }
 }

From 38652f213c0c08e72a8f344fc02e21f74dab2bb2 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 9 Oct 2022 13:08:51 +0100
Subject: [PATCH 3072/3183] 10.2.0

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 0b6b39a4..84681c06 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "10.1.1-beta.5",
+  "version": "10.2.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "10.1.1-beta.5",
+      "version": "10.2.0",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 7f29f190..b6b74296 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "10.1.1-beta.5",
+  "version": "10.2.0",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From 59c6eda5b47628fb9fde5f749f4a62bca10f8148 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Sun, 16 Oct 2022 12:14:30 +0100
Subject: [PATCH 3073/3183] update node versions

---
 package-lock.json | 33 ++++++++++++++++++---------------
 package.json      |  4 ++--
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 84681c06..9b7b6f19 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -28,7 +28,7 @@
       "license": "MIT",
       "dependencies": {
         "@homebridge/plugin-ui-utils": "^0.0.19",
-        "axios": "^1.1.2",
+        "axios": "^1.1.3",
         "node-persist": "^3.1.0",
         "p-queue": "^7.3.0",
         "websocket-as-promised": "^2.0.1",
@@ -43,7 +43,7 @@
       },
       "engines": {
         "homebridge": "^1.5.0",
-        "node": "^14.20.1 || ^16.17.1 || ^18.10.0"
+        "node": "^14.20.1 || ^16.18.0 || ^18.11.0"
       }
     },
     "node_modules/@eslint/eslintrc": {
@@ -267,9 +267,9 @@
       "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
     },
     "node_modules/axios": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.1.2.tgz",
-      "integrity": "sha512-bznQyETwElsXl2RK7HLLwb5GPpOLlycxHCtrpDR/4RqqBzjARaOTo3jz4IgtntWUYee7Ne4S8UHd92VCuzPaWA==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.1.3.tgz",
+      "integrity": "sha512-00tXVRwKx/FZr/IDVFt4C+f9FYairX517WoGCL6dpOntqLkZofjhu43F/Xl44UOpqa+9sLFDrG/XAnFsUYgkDA==",
       "dependencies": {
         "follow-redirects": "^1.15.0",
         "form-data": "^4.0.0",
@@ -1584,10 +1584,13 @@
       }
     },
     "node_modules/minimist": {
-      "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
-      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
-      "dev": true
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.7.tgz",
+      "integrity": "sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
     },
     "node_modules/ms": {
       "version": "2.1.2",
@@ -2476,9 +2479,9 @@
       "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
     },
     "axios": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.1.2.tgz",
-      "integrity": "sha512-bznQyETwElsXl2RK7HLLwb5GPpOLlycxHCtrpDR/4RqqBzjARaOTo3jz4IgtntWUYee7Ne4S8UHd92VCuzPaWA==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.1.3.tgz",
+      "integrity": "sha512-00tXVRwKx/FZr/IDVFt4C+f9FYairX517WoGCL6dpOntqLkZofjhu43F/Xl44UOpqa+9sLFDrG/XAnFsUYgkDA==",
       "requires": {
         "follow-redirects": "^1.15.0",
         "form-data": "^4.0.0",
@@ -3444,9 +3447,9 @@
       }
     },
     "minimist": {
-      "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
-      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.7.tgz",
+      "integrity": "sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==",
       "dev": true
     },
     "ms": {
diff --git a/package.json b/package.json
index b6b74296..1a0f9c56 100644
--- a/package.json
+++ b/package.json
@@ -31,7 +31,7 @@
   },
   "engines": {
     "homebridge": "^1.5.0",
-    "node": "^14.20.1 || ^16.17.1 || ^18.10.0"
+    "node": "^14.20.1 || ^16.18.0 || ^18.11.0"
   },
   "repository": {
     "type": "git",
@@ -60,7 +60,7 @@
   ],
   "dependencies": {
     "@homebridge/plugin-ui-utils": "^0.0.19",
-    "axios": "^1.1.2",
+    "axios": "^1.1.3",
     "node-persist": "^3.1.0",
     "p-queue": "^7.3.0",
     "websocket-as-promised": "^2.0.1",

From 68fcfe5850ea1b90df523822b7cb2b31e7209faa Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Tue, 8 Nov 2022 00:07:17 +0000
Subject: [PATCH 3074/3183] prep

---
 CHANGELOG.md      |   9 +
 package-lock.json | 509 +++++++++++-----------------------------------
 package.json      |   6 +-
 3 files changed, 132 insertions(+), 392 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8bdfbc72..f1037d6d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,15 @@
 
 All notable changes to homebridge-ewelink will be documented in this file.
 
+⚠️ Note that Node 14 will no longer be supported after April 2023
+
+## BETA
+
+### Changed
+
+- Bump `node` recommended versions to v14.21.1 or v16.18.1 or v18.12.1
+- Bump `ws` to v8.11.0
+
 ## 10.2.0 (2022-10-09)
 
 ### Added
diff --git a/package-lock.json b/package-lock.json
index 9b7b6f19..dae13e59 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -32,10 +32,10 @@
         "node-persist": "^3.1.0",
         "p-queue": "^7.3.0",
         "websocket-as-promised": "^2.0.1",
-        "ws": "^8.9.0"
+        "ws": "^8.11.0"
       },
       "devDependencies": {
-        "eslint": "^8.25.0",
+        "eslint": "^8.27.0",
         "eslint-config-airbnb-base": "^15.0.0",
         "eslint-plugin-import": "^2.26.0",
         "eslint-plugin-import-newlines": "^1.2.3",
@@ -43,7 +43,7 @@
       },
       "engines": {
         "homebridge": "^1.5.0",
-        "node": "^14.20.1 || ^16.18.0 || ^18.11.0"
+        "node": "^14.21.1 || ^16.18.1 || ^18.12.1"
       }
     },
     "node_modules/@eslint/eslintrc": {
@@ -75,14 +75,14 @@
       "integrity": "sha512-axFX7lN2Yd7bz/6SlD7dzq5sY/N9+XYuLHPukuiyHQRDtNMRL1uDqJhOx6RVaN2tYDHB75h7YxRQWP7U44Mgzg=="
     },
     "node_modules/@humanwhocodes/config-array": {
-      "version": "0.10.7",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.10.7.tgz",
-      "integrity": "sha512-MDl6D6sBsaV452/QSdX+4CXIjZhIcI0PELsxUjk4U828yd58vk3bTIvk/6w5FY+4hIy9sLW0sfrV7K7Kc++j/w==",
+      "version": "0.11.7",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.7.tgz",
+      "integrity": "sha512-kBbPWzN8oVMLb0hOUYXhmxggL/1cJE6ydvjDIGi9EnAGUyA7cLVKQg+d/Dsm+KZwx2czGHrCmMVLiyg8s5JPKw==",
       "dev": true,
       "dependencies": {
         "@humanwhocodes/object-schema": "^1.2.1",
         "debug": "^4.1.1",
-        "minimatch": "^3.0.4"
+        "minimatch": "^3.0.5"
       },
       "engines": {
         "node": ">=10.10.0"
@@ -149,9 +149,9 @@
       "dev": true
     },
     "node_modules/acorn": {
-      "version": "8.8.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.0.tgz",
-      "integrity": "sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w==",
+      "version": "8.8.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz",
+      "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==",
       "dev": true,
       "bin": {
         "acorn": "bin/acorn"
@@ -234,24 +234,15 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/array-union": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
-      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/array.prototype.flat": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.0.tgz",
-      "integrity": "sha512-12IUEkHsAhA4DY5s0FPgNXIdc8VRSqD9Zp78a5au9abH/SOBrsp082JOWFNTjkMozh8mqcdiKuaLGhPeYztxSw==",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz",
+      "integrity": "sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA==",
       "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4",
         "es-shim-unscopables": "^1.0.0"
       },
       "engines": {
@@ -292,18 +283,6 @@
         "concat-map": "0.0.1"
       }
     },
-    "node_modules/braces": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-      "dev": true,
-      "dependencies": {
-        "fill-range": "^7.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/call-bind": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
@@ -447,18 +426,6 @@
         "node": ">=0.4.0"
       }
     },
-    "node_modules/dir-glob": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
-      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
-      "dev": true,
-      "dependencies": {
-        "path-type": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/doctrine": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
@@ -546,14 +513,15 @@
       }
     },
     "node_modules/eslint": {
-      "version": "8.25.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.25.0.tgz",
-      "integrity": "sha512-DVlJOZ4Pn50zcKW5bYH7GQK/9MsoQG2d5eDH0ebEkE8PbgzTTmtt/VTH9GGJ4BfeZCpBLqFfvsjX35UacUL83A==",
+      "version": "8.27.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.27.0.tgz",
+      "integrity": "sha512-0y1bfG2ho7mty+SiILVf9PfuRA49ek4Nc60Wmmu62QlobNR+CeXa4xXIJgcuwSQgZiWaPH+5BDsctpIW0PR/wQ==",
       "dev": true,
       "dependencies": {
         "@eslint/eslintrc": "^1.3.3",
-        "@humanwhocodes/config-array": "^0.10.5",
+        "@humanwhocodes/config-array": "^0.11.6",
         "@humanwhocodes/module-importer": "^1.0.1",
+        "@nodelib/fs.walk": "^1.2.8",
         "ajv": "^6.10.0",
         "chalk": "^4.0.0",
         "cross-spawn": "^7.0.2",
@@ -569,14 +537,14 @@
         "fast-deep-equal": "^3.1.3",
         "file-entry-cache": "^6.0.1",
         "find-up": "^5.0.0",
-        "glob-parent": "^6.0.1",
+        "glob-parent": "^6.0.2",
         "globals": "^13.15.0",
-        "globby": "^11.1.0",
         "grapheme-splitter": "^1.0.4",
         "ignore": "^5.2.0",
         "import-fresh": "^3.0.0",
         "imurmurhash": "^0.1.4",
         "is-glob": "^4.0.0",
+        "is-path-inside": "^3.0.3",
         "js-sdsl": "^4.1.4",
         "js-yaml": "^4.1.0",
         "json-stable-stringify-without-jsonify": "^1.0.1",
@@ -792,9 +760,9 @@
       }
     },
     "node_modules/espree": {
-      "version": "9.4.0",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-9.4.0.tgz",
-      "integrity": "sha512-DQmnRpLj7f6TgN/NYb0MTzJXL+vJF9h3pHy4JhCIs3zwcgez8xmGg3sXHcEO97BrmO2OSvCwMdfdlyl+E9KjOw==",
+      "version": "9.4.1",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-9.4.1.tgz",
+      "integrity": "sha512-XwctdmTO6SIvCzd9810yyNzIrOrqNYV9Koizx4C/mRhf9uq0o4yHoCEU/670pOxOL/MSraektvSAji79kX90Vg==",
       "dev": true,
       "dependencies": {
         "acorn": "^8.8.0",
@@ -861,34 +829,6 @@
       "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
       "dev": true
     },
-    "node_modules/fast-glob": {
-      "version": "3.2.12",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz",
-      "integrity": "sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==",
-      "dev": true,
-      "dependencies": {
-        "@nodelib/fs.stat": "^2.0.2",
-        "@nodelib/fs.walk": "^1.2.3",
-        "glob-parent": "^5.1.2",
-        "merge2": "^1.3.0",
-        "micromatch": "^4.0.4"
-      },
-      "engines": {
-        "node": ">=8.6.0"
-      }
-    },
-    "node_modules/fast-glob/node_modules/glob-parent": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-      "dev": true,
-      "dependencies": {
-        "is-glob": "^4.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
     "node_modules/fast-json-stable-stringify": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
@@ -922,18 +862,6 @@
         "node": "^10.12.0 || >=12.0.0"
       }
     },
-    "node_modules/fill-range": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-      "dev": true,
-      "dependencies": {
-        "to-regex-range": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/find-up": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
@@ -1112,26 +1040,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/globby": {
-      "version": "11.1.0",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
-      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
-      "dev": true,
-      "dependencies": {
-        "array-union": "^2.1.0",
-        "dir-glob": "^3.0.1",
-        "fast-glob": "^3.2.9",
-        "ignore": "^5.2.0",
-        "merge2": "^1.4.1",
-        "slash": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/grapheme-splitter": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz",
@@ -1303,9 +1211,9 @@
       }
     },
     "node_modules/is-core-module": {
-      "version": "2.10.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.10.0.tgz",
-      "integrity": "sha512-Erxj2n/LDAZ7H8WNJXd9tw38GYM3dv8rk8Zcs+jJuxYTW7sozH+SS8NtrSjVL1/vpLvWi1hxy96IzjJ3EHTJJg==",
+      "version": "2.11.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz",
+      "integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==",
       "dev": true,
       "dependencies": {
         "has": "^1.0.3"
@@ -1360,15 +1268,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/is-number": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.12.0"
-      }
-    },
     "node_modules/is-number-object": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
@@ -1383,6 +1282,15 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/is-path-inside": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
+      "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/is-regex": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
@@ -1530,28 +1438,6 @@
       "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
       "dev": true
     },
-    "node_modules/merge2": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
-      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/micromatch": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
-      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
-      "dev": true,
-      "dependencies": {
-        "braces": "^3.0.2",
-        "picomatch": "^2.3.1"
-      },
-      "engines": {
-        "node": ">=8.6"
-      }
-    },
     "node_modules/mime-db": {
       "version": "1.52.0",
       "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
@@ -1646,28 +1532,28 @@
       }
     },
     "node_modules/object.entries": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.5.tgz",
-      "integrity": "sha512-TyxmjUoZggd4OrrU1W66FMDG6CuqJxsFvymeyXI51+vQLN67zYfZseptRge703kKQdo4uccgAKebXFcRCzk4+g==",
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.6.tgz",
+      "integrity": "sha512-leTPzo4Zvg3pmbQ3rDK69Rl8GQvIqMWubrkxONG9/ojtFE2rD9fjMKfSI5BxW3osRH1m6VdzmqK8oAY9aT4x5w==",
       "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.1"
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
       },
       "engines": {
         "node": ">= 0.4"
       }
     },
     "node_modules/object.values": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.5.tgz",
-      "integrity": "sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg==",
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.6.tgz",
+      "integrity": "sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw==",
       "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.1"
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
       },
       "engines": {
         "node": ">= 0.4"
@@ -1803,27 +1689,6 @@
       "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
       "dev": true
     },
-    "node_modules/path-type": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/picomatch": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
-      "dev": true,
-      "engines": {
-        "node": ">=8.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/jonschlinkert"
-      }
-    },
     "node_modules/prelude-ls": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
@@ -1842,13 +1707,13 @@
       }
     },
     "node_modules/promise.prototype.finally": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/promise.prototype.finally/-/promise.prototype.finally-3.1.3.tgz",
-      "integrity": "sha512-EXRF3fC9/0gz4qkt/f5EP5iW4kj9oFpBICNpCNOb/52+8nlHIX07FPLbi/q4qYBQ1xZqivMzTpNQSnArVASolQ==",
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/promise.prototype.finally/-/promise.prototype.finally-3.1.4.tgz",
+      "integrity": "sha512-nNc3YbgMfLzqtqvO/q5DP6RR0SiHI9pUPGzyDf1q+usTwCN2kjvAnJkBb7bHe3o+fFSBPpsGMoYtaSi+LTNqng==",
       "dependencies": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.1"
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
       },
       "engines": {
         "node": ">= 0.4"
@@ -2057,36 +1922,27 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/slash": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/string.prototype.trimend": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz",
-      "integrity": "sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==",
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz",
+      "integrity": "sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==",
       "dependencies": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.1.4",
-        "es-abstract": "^1.19.5"
+        "es-abstract": "^1.20.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/string.prototype.trimstart": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz",
-      "integrity": "sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==",
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz",
+      "integrity": "sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==",
       "dependencies": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.1.4",
-        "es-abstract": "^1.19.5"
+        "es-abstract": "^1.20.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -2155,18 +2011,6 @@
       "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
       "dev": true
     },
-    "node_modules/to-regex-range": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-      "dev": true,
-      "dependencies": {
-        "is-number": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=8.0"
-      }
-    },
     "node_modules/tsconfig-paths": {
       "version": "3.14.1",
       "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz",
@@ -2286,9 +2130,9 @@
       "dev": true
     },
     "node_modules/ws": {
-      "version": "8.9.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.9.0.tgz",
-      "integrity": "sha512-Ja7nszREasGaYUYCI2k4lCKIRTt+y7XuqVoHR44YpI49TtryyqbqvDMn5eqfW7e6HzTukDRIsXqzVHScqRcafg==",
+      "version": "8.11.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.11.0.tgz",
+      "integrity": "sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==",
       "engines": {
         "node": ">=10.0.0"
       },
@@ -2342,14 +2186,14 @@
       "integrity": "sha512-axFX7lN2Yd7bz/6SlD7dzq5sY/N9+XYuLHPukuiyHQRDtNMRL1uDqJhOx6RVaN2tYDHB75h7YxRQWP7U44Mgzg=="
     },
     "@humanwhocodes/config-array": {
-      "version": "0.10.7",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.10.7.tgz",
-      "integrity": "sha512-MDl6D6sBsaV452/QSdX+4CXIjZhIcI0PELsxUjk4U828yd58vk3bTIvk/6w5FY+4hIy9sLW0sfrV7K7Kc++j/w==",
+      "version": "0.11.7",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.7.tgz",
+      "integrity": "sha512-kBbPWzN8oVMLb0hOUYXhmxggL/1cJE6ydvjDIGi9EnAGUyA7cLVKQg+d/Dsm+KZwx2czGHrCmMVLiyg8s5JPKw==",
       "dev": true,
       "requires": {
         "@humanwhocodes/object-schema": "^1.2.1",
         "debug": "^4.1.1",
-        "minimatch": "^3.0.4"
+        "minimatch": "^3.0.5"
       }
     },
     "@humanwhocodes/module-importer": {
@@ -2397,9 +2241,9 @@
       "dev": true
     },
     "acorn": {
-      "version": "8.8.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.0.tgz",
-      "integrity": "sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w==",
+      "version": "8.8.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz",
+      "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==",
       "dev": true
     },
     "acorn-jsx": {
@@ -2455,21 +2299,15 @@
         "is-string": "^1.0.7"
       }
     },
-    "array-union": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
-      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
-      "dev": true
-    },
     "array.prototype.flat": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.0.tgz",
-      "integrity": "sha512-12IUEkHsAhA4DY5s0FPgNXIdc8VRSqD9Zp78a5au9abH/SOBrsp082JOWFNTjkMozh8mqcdiKuaLGhPeYztxSw==",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz",
+      "integrity": "sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA==",
       "dev": true,
       "requires": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4",
         "es-shim-unscopables": "^1.0.0"
       }
     },
@@ -2504,15 +2342,6 @@
         "concat-map": "0.0.1"
       }
     },
-    "braces": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-      "dev": true,
-      "requires": {
-        "fill-range": "^7.0.1"
-      }
-    },
     "call-bind": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
@@ -2618,15 +2447,6 @@
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
       "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ=="
     },
-    "dir-glob": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
-      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
-      "dev": true,
-      "requires": {
-        "path-type": "^4.0.0"
-      }
-    },
     "doctrine": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
@@ -2693,14 +2513,15 @@
       "dev": true
     },
     "eslint": {
-      "version": "8.25.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.25.0.tgz",
-      "integrity": "sha512-DVlJOZ4Pn50zcKW5bYH7GQK/9MsoQG2d5eDH0ebEkE8PbgzTTmtt/VTH9GGJ4BfeZCpBLqFfvsjX35UacUL83A==",
+      "version": "8.27.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.27.0.tgz",
+      "integrity": "sha512-0y1bfG2ho7mty+SiILVf9PfuRA49ek4Nc60Wmmu62QlobNR+CeXa4xXIJgcuwSQgZiWaPH+5BDsctpIW0PR/wQ==",
       "dev": true,
       "requires": {
         "@eslint/eslintrc": "^1.3.3",
-        "@humanwhocodes/config-array": "^0.10.5",
+        "@humanwhocodes/config-array": "^0.11.6",
         "@humanwhocodes/module-importer": "^1.0.1",
+        "@nodelib/fs.walk": "^1.2.8",
         "ajv": "^6.10.0",
         "chalk": "^4.0.0",
         "cross-spawn": "^7.0.2",
@@ -2716,14 +2537,14 @@
         "fast-deep-equal": "^3.1.3",
         "file-entry-cache": "^6.0.1",
         "find-up": "^5.0.0",
-        "glob-parent": "^6.0.1",
+        "glob-parent": "^6.0.2",
         "globals": "^13.15.0",
-        "globby": "^11.1.0",
         "grapheme-splitter": "^1.0.4",
         "ignore": "^5.2.0",
         "import-fresh": "^3.0.0",
         "imurmurhash": "^0.1.4",
         "is-glob": "^4.0.0",
+        "is-path-inside": "^3.0.3",
         "js-sdsl": "^4.1.4",
         "js-yaml": "^4.1.0",
         "json-stable-stringify-without-jsonify": "^1.0.1",
@@ -2886,9 +2707,9 @@
       "dev": true
     },
     "espree": {
-      "version": "9.4.0",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-9.4.0.tgz",
-      "integrity": "sha512-DQmnRpLj7f6TgN/NYb0MTzJXL+vJF9h3pHy4JhCIs3zwcgez8xmGg3sXHcEO97BrmO2OSvCwMdfdlyl+E9KjOw==",
+      "version": "9.4.1",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-9.4.1.tgz",
+      "integrity": "sha512-XwctdmTO6SIvCzd9810yyNzIrOrqNYV9Koizx4C/mRhf9uq0o4yHoCEU/670pOxOL/MSraektvSAji79kX90Vg==",
       "dev": true,
       "requires": {
         "acorn": "^8.8.0",
@@ -2937,30 +2758,6 @@
       "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
       "dev": true
     },
-    "fast-glob": {
-      "version": "3.2.12",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz",
-      "integrity": "sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==",
-      "dev": true,
-      "requires": {
-        "@nodelib/fs.stat": "^2.0.2",
-        "@nodelib/fs.walk": "^1.2.3",
-        "glob-parent": "^5.1.2",
-        "merge2": "^1.3.0",
-        "micromatch": "^4.0.4"
-      },
-      "dependencies": {
-        "glob-parent": {
-          "version": "5.1.2",
-          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-          "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-          "dev": true,
-          "requires": {
-            "is-glob": "^4.0.1"
-          }
-        }
-      }
-    },
     "fast-json-stable-stringify": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
@@ -2991,15 +2788,6 @@
         "flat-cache": "^3.0.4"
       }
     },
-    "fill-range": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-      "dev": true,
-      "requires": {
-        "to-regex-range": "^5.0.1"
-      }
-    },
     "find-up": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
@@ -3119,20 +2907,6 @@
         "type-fest": "^0.20.2"
       }
     },
-    "globby": {
-      "version": "11.1.0",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
-      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
-      "dev": true,
-      "requires": {
-        "array-union": "^2.1.0",
-        "dir-glob": "^3.0.1",
-        "fast-glob": "^3.2.9",
-        "ignore": "^5.2.0",
-        "merge2": "^1.4.1",
-        "slash": "^3.0.0"
-      }
-    },
     "grapheme-splitter": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz",
@@ -3250,9 +3024,9 @@
       "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA=="
     },
     "is-core-module": {
-      "version": "2.10.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.10.0.tgz",
-      "integrity": "sha512-Erxj2n/LDAZ7H8WNJXd9tw38GYM3dv8rk8Zcs+jJuxYTW7sozH+SS8NtrSjVL1/vpLvWi1hxy96IzjJ3EHTJJg==",
+      "version": "2.11.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz",
+      "integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==",
       "dev": true,
       "requires": {
         "has": "^1.0.3"
@@ -3286,12 +3060,6 @@
       "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
       "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA=="
     },
-    "is-number": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-      "dev": true
-    },
     "is-number-object": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
@@ -3300,6 +3068,12 @@
         "has-tostringtag": "^1.0.0"
       }
     },
+    "is-path-inside": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
+      "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
+      "dev": true
+    },
     "is-regex": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
@@ -3408,22 +3182,6 @@
       "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
       "dev": true
     },
-    "merge2": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
-      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
-      "dev": true
-    },
-    "micromatch": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
-      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
-      "dev": true,
-      "requires": {
-        "braces": "^3.0.2",
-        "picomatch": "^2.3.1"
-      }
-    },
     "mime-db": {
       "version": "1.52.0",
       "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
@@ -3491,25 +3249,25 @@
       }
     },
     "object.entries": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.5.tgz",
-      "integrity": "sha512-TyxmjUoZggd4OrrU1W66FMDG6CuqJxsFvymeyXI51+vQLN67zYfZseptRge703kKQdo4uccgAKebXFcRCzk4+g==",
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.6.tgz",
+      "integrity": "sha512-leTPzo4Zvg3pmbQ3rDK69Rl8GQvIqMWubrkxONG9/ojtFE2rD9fjMKfSI5BxW3osRH1m6VdzmqK8oAY9aT4x5w==",
       "dev": true,
       "requires": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.1"
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
       }
     },
     "object.values": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.5.tgz",
-      "integrity": "sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg==",
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.6.tgz",
+      "integrity": "sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw==",
       "dev": true,
       "requires": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.1"
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
       }
     },
     "once": {
@@ -3600,18 +3358,6 @@
       "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
       "dev": true
     },
-    "path-type": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
-      "dev": true
-    },
-    "picomatch": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
-      "dev": true
-    },
     "prelude-ls": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
@@ -3624,13 +3370,13 @@
       "integrity": "sha512-goA0zA9L91tuQbUmiMinSYqlyUtEgg4fxJcjYnLYOQnrktb4o4UqciXDNXiRUPiDBPACmsr1k8jDW4r7UDq9Qw=="
     },
     "promise.prototype.finally": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/promise.prototype.finally/-/promise.prototype.finally-3.1.3.tgz",
-      "integrity": "sha512-EXRF3fC9/0gz4qkt/f5EP5iW4kj9oFpBICNpCNOb/52+8nlHIX07FPLbi/q4qYBQ1xZqivMzTpNQSnArVASolQ==",
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/promise.prototype.finally/-/promise.prototype.finally-3.1.4.tgz",
+      "integrity": "sha512-nNc3YbgMfLzqtqvO/q5DP6RR0SiHI9pUPGzyDf1q+usTwCN2kjvAnJkBb7bHe3o+fFSBPpsGMoYtaSi+LTNqng==",
       "requires": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.1"
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
       }
     },
     "promised-map": {
@@ -3753,30 +3499,24 @@
         "object-inspect": "^1.9.0"
       }
     },
-    "slash": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-      "dev": true
-    },
     "string.prototype.trimend": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz",
-      "integrity": "sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==",
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz",
+      "integrity": "sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==",
       "requires": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.1.4",
-        "es-abstract": "^1.19.5"
+        "es-abstract": "^1.20.4"
       }
     },
     "string.prototype.trimstart": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz",
-      "integrity": "sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==",
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz",
+      "integrity": "sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==",
       "requires": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.1.4",
-        "es-abstract": "^1.19.5"
+        "es-abstract": "^1.20.4"
       }
     },
     "strip-ansi": {
@@ -3821,15 +3561,6 @@
       "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
       "dev": true
     },
-    "to-regex-range": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-      "dev": true,
-      "requires": {
-        "is-number": "^7.0.0"
-      }
-    },
     "tsconfig-paths": {
       "version": "3.14.1",
       "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz",
@@ -3922,9 +3653,9 @@
       "dev": true
     },
     "ws": {
-      "version": "8.9.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.9.0.tgz",
-      "integrity": "sha512-Ja7nszREasGaYUYCI2k4lCKIRTt+y7XuqVoHR44YpI49TtryyqbqvDMn5eqfW7e6HzTukDRIsXqzVHScqRcafg==",
+      "version": "8.11.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.11.0.tgz",
+      "integrity": "sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==",
       "requires": {}
     },
     "yocto-queue": {
diff --git a/package.json b/package.json
index 1a0f9c56..ce2b7892 100644
--- a/package.json
+++ b/package.json
@@ -31,7 +31,7 @@
   },
   "engines": {
     "homebridge": "^1.5.0",
-    "node": "^14.20.1 || ^16.18.0 || ^18.11.0"
+    "node": "^14.21.1 || ^16.18.1 || ^18.12.1"
   },
   "repository": {
     "type": "git",
@@ -64,13 +64,13 @@
     "node-persist": "^3.1.0",
     "p-queue": "^7.3.0",
     "websocket-as-promised": "^2.0.1",
-    "ws": "^8.9.0"
+    "ws": "^8.11.0"
   },
   "devDependencies": {
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-import-newlines": "^1.2.3",
     "eslint-plugin-sort-exports": "^0.7.0",
-    "eslint": "^8.25.0"
+    "eslint": "^8.27.0"
   }
 }

From f2406003ee3442047af899c3b234f18ea9be773a Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Tue, 8 Nov 2022 00:10:52 +0000
Subject: [PATCH 3075/3183] nspanel pro trial

---
 CHANGELOG.md           |  4 +++
 lib/device/panel.js    | 69 ++++++++++++++++++++++--------------------
 lib/utils/constants.js |  3 +-
 3 files changed, 42 insertions(+), 34 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f1037d6d..5e151c76 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,10 @@ All notable changes to homebridge-ewelink will be documented in this file.
 
 ## BETA
 
+### Added
+
+- Support NSPanel Pro [UIID 195]
+
 ### Changed
 
 - Bump `node` recommended versions to v14.21.1 or v16.18.1 or v18.12.1
diff --git a/lib/device/panel.js b/lib/device/panel.js
index b5d8f1c7..93e9ec17 100644
--- a/lib/device/panel.js
+++ b/lib/device/panel.js
@@ -14,6 +14,7 @@ export default class {
     // Set up variables from the accessory
     this.name = accessory.displayName;
     this.accessory = accessory;
+    this.isProPanel = accessory.context.eweUIID === 195;
 
     // Initially set the online flag as true (to be then updated as false if necessary)
     this.isOnline = true;
@@ -54,42 +55,44 @@ export default class {
     this.cacheTemp = this.tempService.getCharacteristic(this.hapChar.CurrentTemperature).value;
     this.updateCache();
 
-    // Add the outlet services if they don't already exist
-    this.service1 = this.accessory.getService('Channel 1')
-      || this.accessory.addService(this.hapServ.Switch, 'Channel 1', 'channel1');
-    this.service2 = this.accessory.getService('Channel 2')
-      || this.accessory.addService(this.hapServ.Switch, 'Channel 2', 'channel2');
+    if (!this.isProPanel) {
+      // Add the outlet services if they don't already exist
+      this.service1 = this.accessory.getService('Channel 1')
+        || this.accessory.addService(this.hapServ.Switch, 'Channel 1', 'channel1');
+      this.service2 = this.accessory.getService('Channel 2')
+        || this.accessory.addService(this.hapServ.Switch, 'Channel 2', 'channel2');
 
-    // Add the set handler to the switch on/off characteristic
-    this.service1.getCharacteristic(this.hapChar.On).onSet(async (value) => {
-      this.internalStateUpdate(this.service1, value);
-    });
-    this.cacheState1 = this.service1.getCharacteristic(this.hapChar.On).value ? 'on' : 'off';
-    this.service2.getCharacteristic(this.hapChar.On).onSet(async (value) => {
-      this.internalStateUpdate(this.service2, value);
-    });
-    this.cacheState2 = this.service2.getCharacteristic(this.hapChar.On).value ? 'on' : 'off';
-
-    // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
-    if (!platform.config.disableNoResponse) {
-      this.tempService.getCharacteristic(this.hapChar.CurrentTemperature).onGet(() => {
-        if (!this.isOnline) {
-          throw new this.hapErr(-70402);
-        }
-        return this.tempService.getCharacteristic(this.hapChar.CurrentTemperature).value;
+      // Add the set handler to the switch on/off characteristic
+      this.service1.getCharacteristic(this.hapChar.On).onSet(async (value) => {
+        this.internalStateUpdate(this.service1, value);
       });
-      this.service1.getCharacteristic(this.hapChar.On).onGet(() => {
-        if (!this.isOnline) {
-          throw new this.hapErr(-70402);
-        }
-        return this.service1.getCharacteristic(this.hapChar.On).value;
-      });
-      this.service2.getCharacteristic(this.hapChar.On).onGet(() => {
-        if (!this.isOnline) {
-          throw new this.hapErr(-70402);
-        }
-        return this.service1.getCharacteristic(this.hapChar.On).value;
+      this.cacheState1 = this.service1.getCharacteristic(this.hapChar.On).value ? 'on' : 'off';
+      this.service2.getCharacteristic(this.hapChar.On).onSet(async (value) => {
+        this.internalStateUpdate(this.service2, value);
       });
+      this.cacheState2 = this.service2.getCharacteristic(this.hapChar.On).value ? 'on' : 'off';
+
+      // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
+      if (!platform.config.disableNoResponse) {
+        this.tempService.getCharacteristic(this.hapChar.CurrentTemperature).onGet(() => {
+          if (!this.isOnline) {
+            throw new this.hapErr(-70402);
+          }
+          return this.tempService.getCharacteristic(this.hapChar.CurrentTemperature).value;
+        });
+        this.service1.getCharacteristic(this.hapChar.On).onGet(() => {
+          if (!this.isOnline) {
+            throw new this.hapErr(-70402);
+          }
+          return this.service1.getCharacteristic(this.hapChar.On).value;
+        });
+        this.service2.getCharacteristic(this.hapChar.On).onGet(() => {
+          if (!this.isOnline) {
+            throw new this.hapErr(-70402);
+          }
+          return this.service1.getCharacteristic(this.hapChar.On).value;
+        });
+      }
     }
 
     // Pass the accessory to Fakegato to set up with Eve
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 555e4be4..8df5cae7 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -330,7 +330,7 @@ export default {
     sensorAmbient: [15, 181],
     sensorTempHumi: [18],
     thermostat: [127],
-    panel: [133],
+    panel: [133, 195],
     fan: [34],
     humidifier: [19],
     diffuser: [25],
@@ -496,6 +496,7 @@ export default {
     181: 1, // Sonoff TH Elite THR316 and THR320
     182: 1, // Power Detection Plug Overload Alarm-Multi-Channel Protocols (S40)
     190: 1, // POWR316 POWR316D POWR320D
+    195: 1, // NSPANEL Pro
     1000: 1, // "zigbee_ON_OFF_SWITCH_1000" (button device)
     1009: 1, // "" (Some sort of single switch device)
     1256: 1, // "ZIGBEE_SINGLE_SWITCH"

From fb615993a2bad63a67b6fb470e3d6a0af62f5412 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Tue, 8 Nov 2022 00:13:59 +0000
Subject: [PATCH 3076/3183] 10.3.0-beta.0

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index dae13e59..98f514a8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "10.2.0",
+  "version": "10.3.0-beta.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "10.2.0",
+      "version": "10.3.0-beta.0",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index ce2b7892..fe8ba5ef 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "10.2.0",
+  "version": "10.3.0-beta.0",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From 43d100735288d54965f1f33b130806c1744ad667 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 11 Nov 2022 01:13:33 +0000
Subject: [PATCH 3077/3183] nspanel pro UIID195

---
 CHANGELOG.md      |    4 +-
 package-lock.json | 1515 +--------------------------------------------
 2 files changed, 8 insertions(+), 1511 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5e151c76..a7f18f77 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,11 +4,11 @@ All notable changes to homebridge-ewelink will be documented in this file.
 
 ⚠️ Note that Node 14 will no longer be supported after April 2023
 
-## BETA
+## 10.3.0 (2022-11-11)
 
 ### Added
 
-- Support NSPanel Pro [UIID 195]
+- Support NSPanel Pro (as a temperature sensor) [UIID 195]
 
 ### Changed
 
diff --git a/package-lock.json b/package-lock.json
index 98f514a8..2c9db75f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "version": "10.3.0-beta.0",
-  "lockfileVersion": 2,
+  "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
@@ -216,15 +216,15 @@
       "dev": true
     },
     "node_modules/array-includes": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.5.tgz",
-      "integrity": "sha512-iSDYZMMyTPkiFasVqfuAQnWAYcvO/SeBSCGKePoEthjp4LEMTe4uLc7b025o4jAZpHhihh8xPo99TNWUWWkGDQ==",
+      "version": "3.1.6",
+      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.6.tgz",
+      "integrity": "sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw==",
       "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.1.4",
-        "es-abstract": "^1.19.5",
-        "get-intrinsic": "^1.1.1",
+        "es-abstract": "^1.20.4",
+        "get-intrinsic": "^1.1.3",
         "is-string": "^1.0.7"
       },
       "engines": {
@@ -2161,1508 +2161,5 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     }
-  },
-  "dependencies": {
-    "@eslint/eslintrc": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.3.tgz",
-      "integrity": "sha512-uj3pT6Mg+3t39fvLrj8iuCIJ38zKO9FpGtJ4BBJebJhEwjoT+KLVNCcHT5QC9NGRIEi7fZ0ZR8YRb884auB4Lg==",
-      "dev": true,
-      "requires": {
-        "ajv": "^6.12.4",
-        "debug": "^4.3.2",
-        "espree": "^9.4.0",
-        "globals": "^13.15.0",
-        "ignore": "^5.2.0",
-        "import-fresh": "^3.2.1",
-        "js-yaml": "^4.1.0",
-        "minimatch": "^3.1.2",
-        "strip-json-comments": "^3.1.1"
-      }
-    },
-    "@homebridge/plugin-ui-utils": {
-      "version": "0.0.19",
-      "resolved": "https://registry.npmjs.org/@homebridge/plugin-ui-utils/-/plugin-ui-utils-0.0.19.tgz",
-      "integrity": "sha512-axFX7lN2Yd7bz/6SlD7dzq5sY/N9+XYuLHPukuiyHQRDtNMRL1uDqJhOx6RVaN2tYDHB75h7YxRQWP7U44Mgzg=="
-    },
-    "@humanwhocodes/config-array": {
-      "version": "0.11.7",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.7.tgz",
-      "integrity": "sha512-kBbPWzN8oVMLb0hOUYXhmxggL/1cJE6ydvjDIGi9EnAGUyA7cLVKQg+d/Dsm+KZwx2czGHrCmMVLiyg8s5JPKw==",
-      "dev": true,
-      "requires": {
-        "@humanwhocodes/object-schema": "^1.2.1",
-        "debug": "^4.1.1",
-        "minimatch": "^3.0.5"
-      }
-    },
-    "@humanwhocodes/module-importer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
-      "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==",
-      "dev": true
-    },
-    "@humanwhocodes/object-schema": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
-      "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
-      "dev": true
-    },
-    "@nodelib/fs.scandir": {
-      "version": "2.1.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
-      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
-      "dev": true,
-      "requires": {
-        "@nodelib/fs.stat": "2.0.5",
-        "run-parallel": "^1.1.9"
-      }
-    },
-    "@nodelib/fs.stat": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
-      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
-      "dev": true
-    },
-    "@nodelib/fs.walk": {
-      "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
-      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
-      "dev": true,
-      "requires": {
-        "@nodelib/fs.scandir": "2.1.5",
-        "fastq": "^1.6.0"
-      }
-    },
-    "@types/json5": {
-      "version": "0.0.29",
-      "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
-      "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==",
-      "dev": true
-    },
-    "acorn": {
-      "version": "8.8.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz",
-      "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==",
-      "dev": true
-    },
-    "acorn-jsx": {
-      "version": "5.3.2",
-      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
-      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
-      "dev": true,
-      "requires": {}
-    },
-    "ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-      "dev": true,
-      "requires": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      }
-    },
-    "ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-      "dev": true
-    },
-    "ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "requires": {
-        "color-convert": "^2.0.1"
-      }
-    },
-    "argparse": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-      "dev": true
-    },
-    "array-includes": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.5.tgz",
-      "integrity": "sha512-iSDYZMMyTPkiFasVqfuAQnWAYcvO/SeBSCGKePoEthjp4LEMTe4uLc7b025o4jAZpHhihh8xPo99TNWUWWkGDQ==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.19.5",
-        "get-intrinsic": "^1.1.1",
-        "is-string": "^1.0.7"
-      }
-    },
-    "array.prototype.flat": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz",
-      "integrity": "sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4",
-        "es-shim-unscopables": "^1.0.0"
-      }
-    },
-    "asynckit": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
-    },
-    "axios": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.1.3.tgz",
-      "integrity": "sha512-00tXVRwKx/FZr/IDVFt4C+f9FYairX517WoGCL6dpOntqLkZofjhu43F/Xl44UOpqa+9sLFDrG/XAnFsUYgkDA==",
-      "requires": {
-        "follow-redirects": "^1.15.0",
-        "form-data": "^4.0.0",
-        "proxy-from-env": "^1.1.0"
-      }
-    },
-    "balanced-match": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
-      "dev": true
-    },
-    "brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
-      "requires": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "call-bind": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
-      "requires": {
-        "function-bind": "^1.1.1",
-        "get-intrinsic": "^1.0.2"
-      }
-    },
-    "callsites": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
-      "dev": true
-    },
-    "chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "requires": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      }
-    },
-    "chnl": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/chnl/-/chnl-1.2.0.tgz",
-      "integrity": "sha512-g5gJb59edwCliFbX2j7G6sBfY4sX9YLy211yctONI2GRaiX0f2zIbKWmBm+sPqFNEpM7Ljzm7IJX/xrjiEbPrw=="
-    },
-    "color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "requires": {
-        "color-name": "~1.1.4"
-      }
-    },
-    "color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "combined-stream": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
-      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
-      "requires": {
-        "delayed-stream": "~1.0.0"
-      }
-    },
-    "concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
-      "dev": true
-    },
-    "confusing-browser-globals": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/confusing-browser-globals/-/confusing-browser-globals-1.0.11.tgz",
-      "integrity": "sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA==",
-      "dev": true
-    },
-    "cross-spawn": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-      "dev": true,
-      "requires": {
-        "path-key": "^3.1.0",
-        "shebang-command": "^2.0.0",
-        "which": "^2.0.1"
-      }
-    },
-    "debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-      "dev": true,
-      "requires": {
-        "ms": "2.1.2"
-      }
-    },
-    "deep-is": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
-      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
-      "dev": true
-    },
-    "define-properties": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-      "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-      "requires": {
-        "has-property-descriptors": "^1.0.0",
-        "object-keys": "^1.1.1"
-      }
-    },
-    "delayed-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ=="
-    },
-    "doctrine": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
-      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
-      "dev": true,
-      "requires": {
-        "esutils": "^2.0.2"
-      }
-    },
-    "es-abstract": {
-      "version": "1.20.4",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.4.tgz",
-      "integrity": "sha512-0UtvRN79eMe2L+UNEF1BwRe364sj/DXhQ/k5FmivgoSdpM90b8Jc0mDzKMGo7QS0BVbOP/bTwBKNnDc9rNzaPA==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "es-to-primitive": "^1.2.1",
-        "function-bind": "^1.1.1",
-        "function.prototype.name": "^1.1.5",
-        "get-intrinsic": "^1.1.3",
-        "get-symbol-description": "^1.0.0",
-        "has": "^1.0.3",
-        "has-property-descriptors": "^1.0.0",
-        "has-symbols": "^1.0.3",
-        "internal-slot": "^1.0.3",
-        "is-callable": "^1.2.7",
-        "is-negative-zero": "^2.0.2",
-        "is-regex": "^1.1.4",
-        "is-shared-array-buffer": "^1.0.2",
-        "is-string": "^1.0.7",
-        "is-weakref": "^1.0.2",
-        "object-inspect": "^1.12.2",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.4",
-        "regexp.prototype.flags": "^1.4.3",
-        "safe-regex-test": "^1.0.0",
-        "string.prototype.trimend": "^1.0.5",
-        "string.prototype.trimstart": "^1.0.5",
-        "unbox-primitive": "^1.0.2"
-      }
-    },
-    "es-shim-unscopables": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz",
-      "integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==",
-      "dev": true,
-      "requires": {
-        "has": "^1.0.3"
-      }
-    },
-    "es-to-primitive": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
-      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
-      "requires": {
-        "is-callable": "^1.1.4",
-        "is-date-object": "^1.0.1",
-        "is-symbol": "^1.0.2"
-      }
-    },
-    "escape-string-regexp": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-      "dev": true
-    },
-    "eslint": {
-      "version": "8.27.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.27.0.tgz",
-      "integrity": "sha512-0y1bfG2ho7mty+SiILVf9PfuRA49ek4Nc60Wmmu62QlobNR+CeXa4xXIJgcuwSQgZiWaPH+5BDsctpIW0PR/wQ==",
-      "dev": true,
-      "requires": {
-        "@eslint/eslintrc": "^1.3.3",
-        "@humanwhocodes/config-array": "^0.11.6",
-        "@humanwhocodes/module-importer": "^1.0.1",
-        "@nodelib/fs.walk": "^1.2.8",
-        "ajv": "^6.10.0",
-        "chalk": "^4.0.0",
-        "cross-spawn": "^7.0.2",
-        "debug": "^4.3.2",
-        "doctrine": "^3.0.0",
-        "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^7.1.1",
-        "eslint-utils": "^3.0.0",
-        "eslint-visitor-keys": "^3.3.0",
-        "espree": "^9.4.0",
-        "esquery": "^1.4.0",
-        "esutils": "^2.0.2",
-        "fast-deep-equal": "^3.1.3",
-        "file-entry-cache": "^6.0.1",
-        "find-up": "^5.0.0",
-        "glob-parent": "^6.0.2",
-        "globals": "^13.15.0",
-        "grapheme-splitter": "^1.0.4",
-        "ignore": "^5.2.0",
-        "import-fresh": "^3.0.0",
-        "imurmurhash": "^0.1.4",
-        "is-glob": "^4.0.0",
-        "is-path-inside": "^3.0.3",
-        "js-sdsl": "^4.1.4",
-        "js-yaml": "^4.1.0",
-        "json-stable-stringify-without-jsonify": "^1.0.1",
-        "levn": "^0.4.1",
-        "lodash.merge": "^4.6.2",
-        "minimatch": "^3.1.2",
-        "natural-compare": "^1.4.0",
-        "optionator": "^0.9.1",
-        "regexpp": "^3.2.0",
-        "strip-ansi": "^6.0.1",
-        "strip-json-comments": "^3.1.0",
-        "text-table": "^0.2.0"
-      }
-    },
-    "eslint-config-airbnb-base": {
-      "version": "15.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-airbnb-base/-/eslint-config-airbnb-base-15.0.0.tgz",
-      "integrity": "sha512-xaX3z4ZZIcFLvh2oUNvcX5oEofXda7giYmuplVxoOg5A7EXJMrUyqRgR+mhDhPK8LZ4PttFOBvCYDbX3sUoUig==",
-      "dev": true,
-      "requires": {
-        "confusing-browser-globals": "^1.0.10",
-        "object.assign": "^4.1.2",
-        "object.entries": "^1.1.5",
-        "semver": "^6.3.0"
-      }
-    },
-    "eslint-import-resolver-node": {
-      "version": "0.3.6",
-      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz",
-      "integrity": "sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw==",
-      "dev": true,
-      "requires": {
-        "debug": "^3.2.7",
-        "resolve": "^1.20.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "3.2.7",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        }
-      }
-    },
-    "eslint-module-utils": {
-      "version": "2.7.4",
-      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.4.tgz",
-      "integrity": "sha512-j4GT+rqzCoRKHwURX7pddtIPGySnX9Si/cgMI5ztrcqOPtk5dDEeZ34CQVPphnqkJytlc97Vuk05Um2mJ3gEQA==",
-      "dev": true,
-      "requires": {
-        "debug": "^3.2.7"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "3.2.7",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        }
-      }
-    },
-    "eslint-plugin-import": {
-      "version": "2.26.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz",
-      "integrity": "sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA==",
-      "dev": true,
-      "requires": {
-        "array-includes": "^3.1.4",
-        "array.prototype.flat": "^1.2.5",
-        "debug": "^2.6.9",
-        "doctrine": "^2.1.0",
-        "eslint-import-resolver-node": "^0.3.6",
-        "eslint-module-utils": "^2.7.3",
-        "has": "^1.0.3",
-        "is-core-module": "^2.8.1",
-        "is-glob": "^4.0.3",
-        "minimatch": "^3.1.2",
-        "object.values": "^1.1.5",
-        "resolve": "^1.22.0",
-        "tsconfig-paths": "^3.14.1"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "doctrine": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
-          "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
-          "dev": true,
-          "requires": {
-            "esutils": "^2.0.2"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-          "dev": true
-        }
-      }
-    },
-    "eslint-plugin-import-newlines": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import-newlines/-/eslint-plugin-import-newlines-1.2.3.tgz",
-      "integrity": "sha512-UQBhG7dcIoBjaPjbcudqqcKYQVhYXnu9NBB7d8pBnDFZP4GTNPdszpeUbvSxcp/JyBE4TsUZt5u/UtEVioxh9g==",
-      "dev": true,
-      "requires": {}
-    },
-    "eslint-plugin-sort-exports": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-sort-exports/-/eslint-plugin-sort-exports-0.7.0.tgz",
-      "integrity": "sha512-z3mpCMUOF7qWq5L/9SbEvG3fcfpOJgaNTkYvjwacPBDa1F3Ow1Q/WA0apr3sKtKy+5zXb4XOych+ir3p+u+Xlg==",
-      "dev": true,
-      "requires": {}
-    },
-    "eslint-scope": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz",
-      "integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==",
-      "dev": true,
-      "requires": {
-        "esrecurse": "^4.3.0",
-        "estraverse": "^5.2.0"
-      }
-    },
-    "eslint-utils": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
-      "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
-      "dev": true,
-      "requires": {
-        "eslint-visitor-keys": "^2.0.0"
-      },
-      "dependencies": {
-        "eslint-visitor-keys": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
-          "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
-          "dev": true
-        }
-      }
-    },
-    "eslint-visitor-keys": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
-      "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
-      "dev": true
-    },
-    "espree": {
-      "version": "9.4.1",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-9.4.1.tgz",
-      "integrity": "sha512-XwctdmTO6SIvCzd9810yyNzIrOrqNYV9Koizx4C/mRhf9uq0o4yHoCEU/670pOxOL/MSraektvSAji79kX90Vg==",
-      "dev": true,
-      "requires": {
-        "acorn": "^8.8.0",
-        "acorn-jsx": "^5.3.2",
-        "eslint-visitor-keys": "^3.3.0"
-      }
-    },
-    "esquery": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
-      "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
-      "dev": true,
-      "requires": {
-        "estraverse": "^5.1.0"
-      }
-    },
-    "esrecurse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
-      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
-      "dev": true,
-      "requires": {
-        "estraverse": "^5.2.0"
-      }
-    },
-    "estraverse": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-      "dev": true
-    },
-    "esutils": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
-      "dev": true
-    },
-    "eventemitter3": {
-      "version": "4.0.7",
-      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
-      "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="
-    },
-    "fast-deep-equal": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
-      "dev": true
-    },
-    "fast-json-stable-stringify": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
-      "dev": true
-    },
-    "fast-levenshtein": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-      "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
-      "dev": true
-    },
-    "fastq": {
-      "version": "1.13.0",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz",
-      "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==",
-      "dev": true,
-      "requires": {
-        "reusify": "^1.0.4"
-      }
-    },
-    "file-entry-cache": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
-      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
-      "dev": true,
-      "requires": {
-        "flat-cache": "^3.0.4"
-      }
-    },
-    "find-up": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
-      "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
-      "dev": true,
-      "requires": {
-        "locate-path": "^6.0.0",
-        "path-exists": "^4.0.0"
-      }
-    },
-    "flat-cache": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
-      "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
-      "dev": true,
-      "requires": {
-        "flatted": "^3.1.0",
-        "rimraf": "^3.0.2"
-      }
-    },
-    "flatted": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz",
-      "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==",
-      "dev": true
-    },
-    "follow-redirects": {
-      "version": "1.15.2",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz",
-      "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA=="
-    },
-    "form-data": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
-      "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
-      "requires": {
-        "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.8",
-        "mime-types": "^2.1.12"
-      }
-    },
-    "fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
-      "dev": true
-    },
-    "function-bind": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
-    },
-    "function.prototype.name": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz",
-      "integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.0",
-        "functions-have-names": "^1.2.2"
-      }
-    },
-    "functions-have-names": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
-      "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ=="
-    },
-    "get-intrinsic": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz",
-      "integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==",
-      "requires": {
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.3"
-      }
-    },
-    "get-symbol-description": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz",
-      "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.1"
-      }
-    },
-    "glob": {
-      "version": "7.2.3",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-      "dev": true,
-      "requires": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.1.1",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      }
-    },
-    "glob-parent": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
-      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
-      "dev": true,
-      "requires": {
-        "is-glob": "^4.0.3"
-      }
-    },
-    "globals": {
-      "version": "13.17.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.17.0.tgz",
-      "integrity": "sha512-1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw==",
-      "dev": true,
-      "requires": {
-        "type-fest": "^0.20.2"
-      }
-    },
-    "grapheme-splitter": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz",
-      "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==",
-      "dev": true
-    },
-    "has": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-      "requires": {
-        "function-bind": "^1.1.1"
-      }
-    },
-    "has-bigints": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
-      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ=="
-    },
-    "has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true
-    },
-    "has-property-descriptors": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz",
-      "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==",
-      "requires": {
-        "get-intrinsic": "^1.1.1"
-      }
-    },
-    "has-symbols": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="
-    },
-    "has-tostringtag": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
-      "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
-      "requires": {
-        "has-symbols": "^1.0.2"
-      }
-    },
-    "ignore": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
-      "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
-      "dev": true
-    },
-    "import-fresh": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
-      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
-      "dev": true,
-      "requires": {
-        "parent-module": "^1.0.0",
-        "resolve-from": "^4.0.0"
-      }
-    },
-    "imurmurhash": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-      "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
-      "dev": true
-    },
-    "inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
-      "dev": true,
-      "requires": {
-        "once": "^1.3.0",
-        "wrappy": "1"
-      }
-    },
-    "inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-      "dev": true
-    },
-    "internal-slot": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz",
-      "integrity": "sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==",
-      "requires": {
-        "get-intrinsic": "^1.1.0",
-        "has": "^1.0.3",
-        "side-channel": "^1.0.4"
-      }
-    },
-    "is-bigint": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
-      "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
-      "requires": {
-        "has-bigints": "^1.0.1"
-      }
-    },
-    "is-boolean-object": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
-      "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
-      }
-    },
-    "is-callable": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
-      "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA=="
-    },
-    "is-core-module": {
-      "version": "2.11.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz",
-      "integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==",
-      "dev": true,
-      "requires": {
-        "has": "^1.0.3"
-      }
-    },
-    "is-date-object": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
-      "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
-      "requires": {
-        "has-tostringtag": "^1.0.0"
-      }
-    },
-    "is-extglob": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
-      "dev": true
-    },
-    "is-glob": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
-      "dev": true,
-      "requires": {
-        "is-extglob": "^2.1.1"
-      }
-    },
-    "is-negative-zero": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
-      "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA=="
-    },
-    "is-number-object": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
-      "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==",
-      "requires": {
-        "has-tostringtag": "^1.0.0"
-      }
-    },
-    "is-path-inside": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
-      "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
-      "dev": true
-    },
-    "is-regex": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
-      }
-    },
-    "is-shared-array-buffer": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
-      "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
-      "requires": {
-        "call-bind": "^1.0.2"
-      }
-    },
-    "is-string": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
-      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
-      "requires": {
-        "has-tostringtag": "^1.0.0"
-      }
-    },
-    "is-symbol": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
-      "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
-      "requires": {
-        "has-symbols": "^1.0.2"
-      }
-    },
-    "is-weakref": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
-      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
-      "requires": {
-        "call-bind": "^1.0.2"
-      }
-    },
-    "isexe": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
-      "dev": true
-    },
-    "js-sdsl": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.1.5.tgz",
-      "integrity": "sha512-08bOAKweV2NUC1wqTtf3qZlnpOX/R2DU9ikpjOHs0H+ibQv3zpncVQg6um4uYtRtrwIX8M4Nh3ytK4HGlYAq7Q==",
-      "dev": true
-    },
-    "js-yaml": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
-      "dev": true,
-      "requires": {
-        "argparse": "^2.0.1"
-      }
-    },
-    "json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
-    },
-    "json-stable-stringify-without-jsonify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-      "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
-      "dev": true
-    },
-    "json5": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
-      "dev": true,
-      "requires": {
-        "minimist": "^1.2.0"
-      }
-    },
-    "levn": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
-      "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
-      "dev": true,
-      "requires": {
-        "prelude-ls": "^1.2.1",
-        "type-check": "~0.4.0"
-      }
-    },
-    "locate-path": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
-      "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
-      "dev": true,
-      "requires": {
-        "p-locate": "^5.0.0"
-      }
-    },
-    "lodash.merge": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
-      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
-      "dev": true
-    },
-    "mime-db": {
-      "version": "1.52.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
-      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="
-    },
-    "mime-types": {
-      "version": "2.1.35",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
-      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
-      "requires": {
-        "mime-db": "1.52.0"
-      }
-    },
-    "minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "dev": true,
-      "requires": {
-        "brace-expansion": "^1.1.7"
-      }
-    },
-    "minimist": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.7.tgz",
-      "integrity": "sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==",
-      "dev": true
-    },
-    "ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "natural-compare": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
-      "dev": true
-    },
-    "node-persist": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/node-persist/-/node-persist-3.1.0.tgz",
-      "integrity": "sha512-/j+fd/u71wNgKf3V2bx4tnDm+3GvLnlCuvf2MXbJ3wern+67IAb6zN9Leu1tCWPlPNZ+v1hLSibVukkPK2HqJw=="
-    },
-    "object-inspect": {
-      "version": "1.12.2",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz",
-      "integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ=="
-    },
-    "object-keys": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="
-    },
-    "object.assign": {
-      "version": "4.1.4",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",
-      "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "has-symbols": "^1.0.3",
-        "object-keys": "^1.1.1"
-      }
-    },
-    "object.entries": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.6.tgz",
-      "integrity": "sha512-leTPzo4Zvg3pmbQ3rDK69Rl8GQvIqMWubrkxONG9/ojtFE2rD9fjMKfSI5BxW3osRH1m6VdzmqK8oAY9aT4x5w==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
-      }
-    },
-    "object.values": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.6.tgz",
-      "integrity": "sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
-      }
-    },
-    "once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
-      "dev": true,
-      "requires": {
-        "wrappy": "1"
-      }
-    },
-    "optionator": {
-      "version": "0.9.1",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
-      "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
-      "dev": true,
-      "requires": {
-        "deep-is": "^0.1.3",
-        "fast-levenshtein": "^2.0.6",
-        "levn": "^0.4.1",
-        "prelude-ls": "^1.2.1",
-        "type-check": "^0.4.0",
-        "word-wrap": "^1.2.3"
-      }
-    },
-    "p-limit": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
-      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
-      "dev": true,
-      "requires": {
-        "yocto-queue": "^0.1.0"
-      }
-    },
-    "p-locate": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
-      "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
-      "dev": true,
-      "requires": {
-        "p-limit": "^3.0.2"
-      }
-    },
-    "p-queue": {
-      "version": "7.3.0",
-      "resolved": "https://registry.npmjs.org/p-queue/-/p-queue-7.3.0.tgz",
-      "integrity": "sha512-5fP+yVQ0qp0rEfZoDTlP2c3RYBgxvRsw30qO+VtPPc95lyvSG+x6USSh1TuLB4n96IO6I8/oXQGsTgtna4q2nQ==",
-      "requires": {
-        "eventemitter3": "^4.0.7",
-        "p-timeout": "^5.0.2"
-      }
-    },
-    "p-timeout": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-5.1.0.tgz",
-      "integrity": "sha512-auFDyzzzGZZZdHz3BtET9VEz0SE/uMEAx7uWfGPucfzEwwe/xH0iVeZibQmANYE/hp9T2+UUZT5m+BKyrDp3Ew=="
-    },
-    "parent-module": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
-      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
-      "dev": true,
-      "requires": {
-        "callsites": "^3.0.0"
-      }
-    },
-    "path-exists": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-      "dev": true
-    },
-    "path-is-absolute": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
-      "dev": true
-    },
-    "path-key": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-      "dev": true
-    },
-    "path-parse": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
-      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
-      "dev": true
-    },
-    "prelude-ls": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
-      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
-      "dev": true
-    },
-    "promise-controller": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/promise-controller/-/promise-controller-1.0.0.tgz",
-      "integrity": "sha512-goA0zA9L91tuQbUmiMinSYqlyUtEgg4fxJcjYnLYOQnrktb4o4UqciXDNXiRUPiDBPACmsr1k8jDW4r7UDq9Qw=="
-    },
-    "promise.prototype.finally": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/promise.prototype.finally/-/promise.prototype.finally-3.1.4.tgz",
-      "integrity": "sha512-nNc3YbgMfLzqtqvO/q5DP6RR0SiHI9pUPGzyDf1q+usTwCN2kjvAnJkBb7bHe3o+fFSBPpsGMoYtaSi+LTNqng==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
-      }
-    },
-    "promised-map": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/promised-map/-/promised-map-1.0.0.tgz",
-      "integrity": "sha512-fP9VSMgcml+U2uJ9PBc4/LDQ3ZkJCH4blLNCS6gbH7RHyRZCYs91zxWHqiUy+heFiEMiB2op/qllYoFqmIqdWA=="
-    },
-    "proxy-from-env": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
-      "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="
-    },
-    "punycode": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
-      "dev": true
-    },
-    "queue-microtask": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
-      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
-      "dev": true
-    },
-    "regexp.prototype.flags": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
-      "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "functions-have-names": "^1.2.2"
-      }
-    },
-    "regexpp": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
-      "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
-      "dev": true
-    },
-    "resolve": {
-      "version": "1.22.1",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz",
-      "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==",
-      "dev": true,
-      "requires": {
-        "is-core-module": "^2.9.0",
-        "path-parse": "^1.0.7",
-        "supports-preserve-symlinks-flag": "^1.0.0"
-      }
-    },
-    "resolve-from": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
-      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
-      "dev": true
-    },
-    "reusify": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
-      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
-      "dev": true
-    },
-    "rimraf": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-      "dev": true,
-      "requires": {
-        "glob": "^7.1.3"
-      }
-    },
-    "run-parallel": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
-      "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
-      "dev": true,
-      "requires": {
-        "queue-microtask": "^1.2.2"
-      }
-    },
-    "safe-regex-test": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz",
-      "integrity": "sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.3",
-        "is-regex": "^1.1.4"
-      }
-    },
-    "semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-      "dev": true
-    },
-    "shebang-command": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-      "dev": true,
-      "requires": {
-        "shebang-regex": "^3.0.0"
-      }
-    },
-    "shebang-regex": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-      "dev": true
-    },
-    "side-channel": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
-      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
-      "requires": {
-        "call-bind": "^1.0.0",
-        "get-intrinsic": "^1.0.2",
-        "object-inspect": "^1.9.0"
-      }
-    },
-    "string.prototype.trimend": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz",
-      "integrity": "sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
-      }
-    },
-    "string.prototype.trimstart": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz",
-      "integrity": "sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
-      }
-    },
-    "strip-ansi": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "dev": true,
-      "requires": {
-        "ansi-regex": "^5.0.1"
-      }
-    },
-    "strip-bom": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-      "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
-      "dev": true
-    },
-    "strip-json-comments": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-      "dev": true
-    },
-    "supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "requires": {
-        "has-flag": "^4.0.0"
-      }
-    },
-    "supports-preserve-symlinks-flag": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
-      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
-      "dev": true
-    },
-    "text-table": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-      "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
-      "dev": true
-    },
-    "tsconfig-paths": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz",
-      "integrity": "sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==",
-      "dev": true,
-      "requires": {
-        "@types/json5": "^0.0.29",
-        "json5": "^1.0.1",
-        "minimist": "^1.2.6",
-        "strip-bom": "^3.0.0"
-      }
-    },
-    "type-check": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
-      "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
-      "dev": true,
-      "requires": {
-        "prelude-ls": "^1.2.1"
-      }
-    },
-    "type-fest": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
-      "dev": true
-    },
-    "unbox-primitive": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
-      "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "has-bigints": "^1.0.2",
-        "has-symbols": "^1.0.3",
-        "which-boxed-primitive": "^1.0.2"
-      }
-    },
-    "uri-js": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
-      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
-      "dev": true,
-      "requires": {
-        "punycode": "^2.1.0"
-      }
-    },
-    "websocket-as-promised": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/websocket-as-promised/-/websocket-as-promised-2.0.1.tgz",
-      "integrity": "sha512-ePV26D/D37ughXU9j+DjGmwUbelWJrC/vi+6GK++fRlBJmS7aU9T8ABu47KFF0O7r6XN2NAuqJRpegbUwXZxQg==",
-      "requires": {
-        "chnl": "^1.2.0",
-        "promise-controller": "^1.0.0",
-        "promise.prototype.finally": "^3.1.2",
-        "promised-map": "^1.0.0"
-      }
-    },
-    "which": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-      "dev": true,
-      "requires": {
-        "isexe": "^2.0.0"
-      }
-    },
-    "which-boxed-primitive": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
-      "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
-      "requires": {
-        "is-bigint": "^1.0.1",
-        "is-boolean-object": "^1.1.0",
-        "is-number-object": "^1.0.4",
-        "is-string": "^1.0.5",
-        "is-symbol": "^1.0.3"
-      }
-    },
-    "word-wrap": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
-      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
-      "dev": true
-    },
-    "wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
-      "dev": true
-    },
-    "ws": {
-      "version": "8.11.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.11.0.tgz",
-      "integrity": "sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==",
-      "requires": {}
-    },
-    "yocto-queue": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
-      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
-      "dev": true
-    }
   }
 }

From 0f9cabbed82605749d68924177dd1d3bbda7d184 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Fri, 11 Nov 2022 01:16:51 +0000
Subject: [PATCH 3078/3183] 10.3.0

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 2c9db75f..3d3b2e14 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "10.3.0-beta.0",
+  "version": "10.3.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "10.3.0-beta.0",
+      "version": "10.3.0",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index fe8ba5ef..45838401 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "10.3.0-beta.0",
+  "version": "10.3.0",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From 6a5ea95ab432c032e2406c89d33331f3c3bb09c6 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Wed, 23 Nov 2022 01:25:14 +0000
Subject: [PATCH 3079/3183] deps

---
 package-lock.json | 1547 ++++++++++++++++++++++++++++++++++++++++++++-
 package.json      |    6 +-
 2 files changed, 1530 insertions(+), 23 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 3d3b2e14..205aad0f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "version": "10.3.0",
-  "lockfileVersion": 3,
+  "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
@@ -28,18 +28,18 @@
       "license": "MIT",
       "dependencies": {
         "@homebridge/plugin-ui-utils": "^0.0.19",
-        "axios": "^1.1.3",
+        "axios": "^1.2.0",
         "node-persist": "^3.1.0",
         "p-queue": "^7.3.0",
         "websocket-as-promised": "^2.0.1",
         "ws": "^8.11.0"
       },
       "devDependencies": {
-        "eslint": "^8.27.0",
+        "eslint": "^8.28.0",
         "eslint-config-airbnb-base": "^15.0.0",
         "eslint-plugin-import": "^2.26.0",
         "eslint-plugin-import-newlines": "^1.2.3",
-        "eslint-plugin-sort-exports": "^0.7.0"
+        "eslint-plugin-sort-exports": "^0.8.0"
       },
       "engines": {
         "homebridge": "^1.5.0",
@@ -258,9 +258,9 @@
       "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
     },
     "node_modules/axios": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.1.3.tgz",
-      "integrity": "sha512-00tXVRwKx/FZr/IDVFt4C+f9FYairX517WoGCL6dpOntqLkZofjhu43F/Xl44UOpqa+9sLFDrG/XAnFsUYgkDA==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.2.0.tgz",
+      "integrity": "sha512-zT7wZyNYu3N5Bu0wuZ6QccIf93Qk1eV8LOewxgjOZFd2DenOs98cJ7+Y6703d0wkaXGY6/nZd4EweJaHz9uzQw==",
       "dependencies": {
         "follow-redirects": "^1.15.0",
         "form-data": "^4.0.0",
@@ -513,9 +513,9 @@
       }
     },
     "node_modules/eslint": {
-      "version": "8.27.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.27.0.tgz",
-      "integrity": "sha512-0y1bfG2ho7mty+SiILVf9PfuRA49ek4Nc60Wmmu62QlobNR+CeXa4xXIJgcuwSQgZiWaPH+5BDsctpIW0PR/wQ==",
+      "version": "8.28.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.28.0.tgz",
+      "integrity": "sha512-S27Di+EVyMxcHiwDrFzk8dJYAaD+/5SoWKxL1ri/71CRHsnJnRDPNt2Kzj24+MT9FDupf4aqqyqPrvI8MvQ4VQ==",
       "dev": true,
       "dependencies": {
         "@eslint/eslintrc": "^1.3.3",
@@ -702,9 +702,9 @@
       "dev": true
     },
     "node_modules/eslint-plugin-sort-exports": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-sort-exports/-/eslint-plugin-sort-exports-0.7.0.tgz",
-      "integrity": "sha512-z3mpCMUOF7qWq5L/9SbEvG3fcfpOJgaNTkYvjwacPBDa1F3Ow1Q/WA0apr3sKtKy+5zXb4XOych+ir3p+u+Xlg==",
+      "version": "0.8.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-sort-exports/-/eslint-plugin-sort-exports-0.8.0.tgz",
+      "integrity": "sha512-5x7kJNjIS5bSyehFJ6Gk2gh2wUPt/rmhwDHF8JPDicSH7bvrLRFdlkhHu74YqYBjEySHYaOZVoKNP90TjI0v6w==",
       "dev": true,
       "peerDependencies": {
         "eslint": ">=5.0.0"
@@ -1026,9 +1026,9 @@
       }
     },
     "node_modules/globals": {
-      "version": "13.17.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.17.0.tgz",
-      "integrity": "sha512-1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw==",
+      "version": "13.18.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.18.0.tgz",
+      "integrity": "sha512-/mR4KI8Ps2spmoc0Ulu9L7agOF0du1CZNQ3dke8yItYlyKNmGrkONemBbd6V8UTc1Wgcqn21t3WYB7dbRmh6/A==",
       "dev": true,
       "dependencies": {
         "type-fest": "^0.20.2"
@@ -1363,10 +1363,14 @@
       "dev": true
     },
     "node_modules/js-sdsl": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.1.5.tgz",
-      "integrity": "sha512-08bOAKweV2NUC1wqTtf3qZlnpOX/R2DU9ikpjOHs0H+ibQv3zpncVQg6um4uYtRtrwIX8M4Nh3ytK4HGlYAq7Q==",
-      "dev": true
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.2.0.tgz",
+      "integrity": "sha512-dyBIzQBDkCqCu+0upx25Y2jGdbTGxE9fshMsCdK0ViOongpV+n5tXRcZY9v7CaVQ79AGS9KA1KHtojxiM7aXSQ==",
+      "dev": true,
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/js-sdsl"
+      }
     },
     "node_modules/js-yaml": {
       "version": "4.1.0",
@@ -2161,5 +2165,1508 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     }
+  },
+  "dependencies": {
+    "@eslint/eslintrc": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.3.tgz",
+      "integrity": "sha512-uj3pT6Mg+3t39fvLrj8iuCIJ38zKO9FpGtJ4BBJebJhEwjoT+KLVNCcHT5QC9NGRIEi7fZ0ZR8YRb884auB4Lg==",
+      "dev": true,
+      "requires": {
+        "ajv": "^6.12.4",
+        "debug": "^4.3.2",
+        "espree": "^9.4.0",
+        "globals": "^13.15.0",
+        "ignore": "^5.2.0",
+        "import-fresh": "^3.2.1",
+        "js-yaml": "^4.1.0",
+        "minimatch": "^3.1.2",
+        "strip-json-comments": "^3.1.1"
+      }
+    },
+    "@homebridge/plugin-ui-utils": {
+      "version": "0.0.19",
+      "resolved": "https://registry.npmjs.org/@homebridge/plugin-ui-utils/-/plugin-ui-utils-0.0.19.tgz",
+      "integrity": "sha512-axFX7lN2Yd7bz/6SlD7dzq5sY/N9+XYuLHPukuiyHQRDtNMRL1uDqJhOx6RVaN2tYDHB75h7YxRQWP7U44Mgzg=="
+    },
+    "@humanwhocodes/config-array": {
+      "version": "0.11.7",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.7.tgz",
+      "integrity": "sha512-kBbPWzN8oVMLb0hOUYXhmxggL/1cJE6ydvjDIGi9EnAGUyA7cLVKQg+d/Dsm+KZwx2czGHrCmMVLiyg8s5JPKw==",
+      "dev": true,
+      "requires": {
+        "@humanwhocodes/object-schema": "^1.2.1",
+        "debug": "^4.1.1",
+        "minimatch": "^3.0.5"
+      }
+    },
+    "@humanwhocodes/module-importer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
+      "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==",
+      "dev": true
+    },
+    "@humanwhocodes/object-schema": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
+      "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
+      "dev": true
+    },
+    "@nodelib/fs.scandir": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
+      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
+      "dev": true,
+      "requires": {
+        "@nodelib/fs.stat": "2.0.5",
+        "run-parallel": "^1.1.9"
+      }
+    },
+    "@nodelib/fs.stat": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
+      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
+      "dev": true
+    },
+    "@nodelib/fs.walk": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
+      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
+      "dev": true,
+      "requires": {
+        "@nodelib/fs.scandir": "2.1.5",
+        "fastq": "^1.6.0"
+      }
+    },
+    "@types/json5": {
+      "version": "0.0.29",
+      "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
+      "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==",
+      "dev": true
+    },
+    "acorn": {
+      "version": "8.8.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz",
+      "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==",
+      "dev": true
+    },
+    "acorn-jsx": {
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
+      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
+      "dev": true,
+      "requires": {}
+    },
+    "ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dev": true,
+      "requires": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      }
+    },
+    "ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true
+    },
+    "ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "requires": {
+        "color-convert": "^2.0.1"
+      }
+    },
+    "argparse": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+      "dev": true
+    },
+    "array-includes": {
+      "version": "3.1.6",
+      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.6.tgz",
+      "integrity": "sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4",
+        "get-intrinsic": "^1.1.3",
+        "is-string": "^1.0.7"
+      }
+    },
+    "array.prototype.flat": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz",
+      "integrity": "sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4",
+        "es-shim-unscopables": "^1.0.0"
+      }
+    },
+    "asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
+    },
+    "axios": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.2.0.tgz",
+      "integrity": "sha512-zT7wZyNYu3N5Bu0wuZ6QccIf93Qk1eV8LOewxgjOZFd2DenOs98cJ7+Y6703d0wkaXGY6/nZd4EweJaHz9uzQw==",
+      "requires": {
+        "follow-redirects": "^1.15.0",
+        "form-data": "^4.0.0",
+        "proxy-from-env": "^1.1.0"
+      }
+    },
+    "balanced-match": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+      "dev": true
+    },
+    "brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "requires": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "call-bind": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
+      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+      "requires": {
+        "function-bind": "^1.1.1",
+        "get-intrinsic": "^1.0.2"
+      }
+    },
+    "callsites": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+      "dev": true
+    },
+    "chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "requires": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      }
+    },
+    "chnl": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/chnl/-/chnl-1.2.0.tgz",
+      "integrity": "sha512-g5gJb59edwCliFbX2j7G6sBfY4sX9YLy211yctONI2GRaiX0f2zIbKWmBm+sPqFNEpM7Ljzm7IJX/xrjiEbPrw=="
+    },
+    "color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "requires": {
+        "color-name": "~1.1.4"
+      }
+    },
+    "color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "combined-stream": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+      "requires": {
+        "delayed-stream": "~1.0.0"
+      }
+    },
+    "concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
+      "dev": true
+    },
+    "confusing-browser-globals": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/confusing-browser-globals/-/confusing-browser-globals-1.0.11.tgz",
+      "integrity": "sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA==",
+      "dev": true
+    },
+    "cross-spawn": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "dev": true,
+      "requires": {
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
+      }
+    },
+    "debug": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "dev": true,
+      "requires": {
+        "ms": "2.1.2"
+      }
+    },
+    "deep-is": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
+      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
+      "dev": true
+    },
+    "define-properties": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
+      "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
+      "requires": {
+        "has-property-descriptors": "^1.0.0",
+        "object-keys": "^1.1.1"
+      }
+    },
+    "delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ=="
+    },
+    "doctrine": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
+      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
+      "dev": true,
+      "requires": {
+        "esutils": "^2.0.2"
+      }
+    },
+    "es-abstract": {
+      "version": "1.20.4",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.4.tgz",
+      "integrity": "sha512-0UtvRN79eMe2L+UNEF1BwRe364sj/DXhQ/k5FmivgoSdpM90b8Jc0mDzKMGo7QS0BVbOP/bTwBKNnDc9rNzaPA==",
+      "requires": {
+        "call-bind": "^1.0.2",
+        "es-to-primitive": "^1.2.1",
+        "function-bind": "^1.1.1",
+        "function.prototype.name": "^1.1.5",
+        "get-intrinsic": "^1.1.3",
+        "get-symbol-description": "^1.0.0",
+        "has": "^1.0.3",
+        "has-property-descriptors": "^1.0.0",
+        "has-symbols": "^1.0.3",
+        "internal-slot": "^1.0.3",
+        "is-callable": "^1.2.7",
+        "is-negative-zero": "^2.0.2",
+        "is-regex": "^1.1.4",
+        "is-shared-array-buffer": "^1.0.2",
+        "is-string": "^1.0.7",
+        "is-weakref": "^1.0.2",
+        "object-inspect": "^1.12.2",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.4",
+        "regexp.prototype.flags": "^1.4.3",
+        "safe-regex-test": "^1.0.0",
+        "string.prototype.trimend": "^1.0.5",
+        "string.prototype.trimstart": "^1.0.5",
+        "unbox-primitive": "^1.0.2"
+      }
+    },
+    "es-shim-unscopables": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz",
+      "integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==",
+      "dev": true,
+      "requires": {
+        "has": "^1.0.3"
+      }
+    },
+    "es-to-primitive": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
+      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
+      "requires": {
+        "is-callable": "^1.1.4",
+        "is-date-object": "^1.0.1",
+        "is-symbol": "^1.0.2"
+      }
+    },
+    "escape-string-regexp": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+      "dev": true
+    },
+    "eslint": {
+      "version": "8.28.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.28.0.tgz",
+      "integrity": "sha512-S27Di+EVyMxcHiwDrFzk8dJYAaD+/5SoWKxL1ri/71CRHsnJnRDPNt2Kzj24+MT9FDupf4aqqyqPrvI8MvQ4VQ==",
+      "dev": true,
+      "requires": {
+        "@eslint/eslintrc": "^1.3.3",
+        "@humanwhocodes/config-array": "^0.11.6",
+        "@humanwhocodes/module-importer": "^1.0.1",
+        "@nodelib/fs.walk": "^1.2.8",
+        "ajv": "^6.10.0",
+        "chalk": "^4.0.0",
+        "cross-spawn": "^7.0.2",
+        "debug": "^4.3.2",
+        "doctrine": "^3.0.0",
+        "escape-string-regexp": "^4.0.0",
+        "eslint-scope": "^7.1.1",
+        "eslint-utils": "^3.0.0",
+        "eslint-visitor-keys": "^3.3.0",
+        "espree": "^9.4.0",
+        "esquery": "^1.4.0",
+        "esutils": "^2.0.2",
+        "fast-deep-equal": "^3.1.3",
+        "file-entry-cache": "^6.0.1",
+        "find-up": "^5.0.0",
+        "glob-parent": "^6.0.2",
+        "globals": "^13.15.0",
+        "grapheme-splitter": "^1.0.4",
+        "ignore": "^5.2.0",
+        "import-fresh": "^3.0.0",
+        "imurmurhash": "^0.1.4",
+        "is-glob": "^4.0.0",
+        "is-path-inside": "^3.0.3",
+        "js-sdsl": "^4.1.4",
+        "js-yaml": "^4.1.0",
+        "json-stable-stringify-without-jsonify": "^1.0.1",
+        "levn": "^0.4.1",
+        "lodash.merge": "^4.6.2",
+        "minimatch": "^3.1.2",
+        "natural-compare": "^1.4.0",
+        "optionator": "^0.9.1",
+        "regexpp": "^3.2.0",
+        "strip-ansi": "^6.0.1",
+        "strip-json-comments": "^3.1.0",
+        "text-table": "^0.2.0"
+      }
+    },
+    "eslint-config-airbnb-base": {
+      "version": "15.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-airbnb-base/-/eslint-config-airbnb-base-15.0.0.tgz",
+      "integrity": "sha512-xaX3z4ZZIcFLvh2oUNvcX5oEofXda7giYmuplVxoOg5A7EXJMrUyqRgR+mhDhPK8LZ4PttFOBvCYDbX3sUoUig==",
+      "dev": true,
+      "requires": {
+        "confusing-browser-globals": "^1.0.10",
+        "object.assign": "^4.1.2",
+        "object.entries": "^1.1.5",
+        "semver": "^6.3.0"
+      }
+    },
+    "eslint-import-resolver-node": {
+      "version": "0.3.6",
+      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz",
+      "integrity": "sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw==",
+      "dev": true,
+      "requires": {
+        "debug": "^3.2.7",
+        "resolve": "^1.20.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.2.7",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        }
+      }
+    },
+    "eslint-module-utils": {
+      "version": "2.7.4",
+      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.4.tgz",
+      "integrity": "sha512-j4GT+rqzCoRKHwURX7pddtIPGySnX9Si/cgMI5ztrcqOPtk5dDEeZ34CQVPphnqkJytlc97Vuk05Um2mJ3gEQA==",
+      "dev": true,
+      "requires": {
+        "debug": "^3.2.7"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.2.7",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        }
+      }
+    },
+    "eslint-plugin-import": {
+      "version": "2.26.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz",
+      "integrity": "sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA==",
+      "dev": true,
+      "requires": {
+        "array-includes": "^3.1.4",
+        "array.prototype.flat": "^1.2.5",
+        "debug": "^2.6.9",
+        "doctrine": "^2.1.0",
+        "eslint-import-resolver-node": "^0.3.6",
+        "eslint-module-utils": "^2.7.3",
+        "has": "^1.0.3",
+        "is-core-module": "^2.8.1",
+        "is-glob": "^4.0.3",
+        "minimatch": "^3.1.2",
+        "object.values": "^1.1.5",
+        "resolve": "^1.22.0",
+        "tsconfig-paths": "^3.14.1"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "doctrine": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
+          "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
+          "dev": true,
+          "requires": {
+            "esutils": "^2.0.2"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+          "dev": true
+        }
+      }
+    },
+    "eslint-plugin-import-newlines": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import-newlines/-/eslint-plugin-import-newlines-1.2.3.tgz",
+      "integrity": "sha512-UQBhG7dcIoBjaPjbcudqqcKYQVhYXnu9NBB7d8pBnDFZP4GTNPdszpeUbvSxcp/JyBE4TsUZt5u/UtEVioxh9g==",
+      "dev": true,
+      "requires": {}
+    },
+    "eslint-plugin-sort-exports": {
+      "version": "0.8.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-sort-exports/-/eslint-plugin-sort-exports-0.8.0.tgz",
+      "integrity": "sha512-5x7kJNjIS5bSyehFJ6Gk2gh2wUPt/rmhwDHF8JPDicSH7bvrLRFdlkhHu74YqYBjEySHYaOZVoKNP90TjI0v6w==",
+      "dev": true,
+      "requires": {}
+    },
+    "eslint-scope": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz",
+      "integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==",
+      "dev": true,
+      "requires": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^5.2.0"
+      }
+    },
+    "eslint-utils": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
+      "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
+      "dev": true,
+      "requires": {
+        "eslint-visitor-keys": "^2.0.0"
+      },
+      "dependencies": {
+        "eslint-visitor-keys": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
+          "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
+          "dev": true
+        }
+      }
+    },
+    "eslint-visitor-keys": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
+      "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
+      "dev": true
+    },
+    "espree": {
+      "version": "9.4.1",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-9.4.1.tgz",
+      "integrity": "sha512-XwctdmTO6SIvCzd9810yyNzIrOrqNYV9Koizx4C/mRhf9uq0o4yHoCEU/670pOxOL/MSraektvSAji79kX90Vg==",
+      "dev": true,
+      "requires": {
+        "acorn": "^8.8.0",
+        "acorn-jsx": "^5.3.2",
+        "eslint-visitor-keys": "^3.3.0"
+      }
+    },
+    "esquery": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
+      "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
+      "dev": true,
+      "requires": {
+        "estraverse": "^5.1.0"
+      }
+    },
+    "esrecurse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
+      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+      "dev": true,
+      "requires": {
+        "estraverse": "^5.2.0"
+      }
+    },
+    "estraverse": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+      "dev": true
+    },
+    "esutils": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+      "dev": true
+    },
+    "eventemitter3": {
+      "version": "4.0.7",
+      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
+      "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="
+    },
+    "fast-deep-equal": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+      "dev": true
+    },
+    "fast-json-stable-stringify": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+      "dev": true
+    },
+    "fast-levenshtein": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+      "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
+      "dev": true
+    },
+    "fastq": {
+      "version": "1.13.0",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz",
+      "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==",
+      "dev": true,
+      "requires": {
+        "reusify": "^1.0.4"
+      }
+    },
+    "file-entry-cache": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
+      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
+      "dev": true,
+      "requires": {
+        "flat-cache": "^3.0.4"
+      }
+    },
+    "find-up": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
+      "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
+      "dev": true,
+      "requires": {
+        "locate-path": "^6.0.0",
+        "path-exists": "^4.0.0"
+      }
+    },
+    "flat-cache": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
+      "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
+      "dev": true,
+      "requires": {
+        "flatted": "^3.1.0",
+        "rimraf": "^3.0.2"
+      }
+    },
+    "flatted": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz",
+      "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==",
+      "dev": true
+    },
+    "follow-redirects": {
+      "version": "1.15.2",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz",
+      "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA=="
+    },
+    "form-data": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
+      "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
+      "requires": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.8",
+        "mime-types": "^2.1.12"
+      }
+    },
+    "fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
+      "dev": true
+    },
+    "function-bind": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
+    },
+    "function.prototype.name": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz",
+      "integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==",
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.19.0",
+        "functions-have-names": "^1.2.2"
+      }
+    },
+    "functions-have-names": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
+      "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ=="
+    },
+    "get-intrinsic": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz",
+      "integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==",
+      "requires": {
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.3"
+      }
+    },
+    "get-symbol-description": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz",
+      "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==",
+      "requires": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.1.1"
+      }
+    },
+    "glob": {
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "dev": true,
+      "requires": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.1.1",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      }
+    },
+    "glob-parent": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
+      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
+      "dev": true,
+      "requires": {
+        "is-glob": "^4.0.3"
+      }
+    },
+    "globals": {
+      "version": "13.18.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.18.0.tgz",
+      "integrity": "sha512-/mR4KI8Ps2spmoc0Ulu9L7agOF0du1CZNQ3dke8yItYlyKNmGrkONemBbd6V8UTc1Wgcqn21t3WYB7dbRmh6/A==",
+      "dev": true,
+      "requires": {
+        "type-fest": "^0.20.2"
+      }
+    },
+    "grapheme-splitter": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz",
+      "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==",
+      "dev": true
+    },
+    "has": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+      "requires": {
+        "function-bind": "^1.1.1"
+      }
+    },
+    "has-bigints": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
+      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ=="
+    },
+    "has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true
+    },
+    "has-property-descriptors": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz",
+      "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==",
+      "requires": {
+        "get-intrinsic": "^1.1.1"
+      }
+    },
+    "has-symbols": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="
+    },
+    "has-tostringtag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
+      "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
+      "requires": {
+        "has-symbols": "^1.0.2"
+      }
+    },
+    "ignore": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
+      "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
+      "dev": true
+    },
+    "import-fresh": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
+      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
+      "dev": true,
+      "requires": {
+        "parent-module": "^1.0.0",
+        "resolve-from": "^4.0.0"
+      }
+    },
+    "imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
+      "dev": true
+    },
+    "inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+      "dev": true,
+      "requires": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+      "dev": true
+    },
+    "internal-slot": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz",
+      "integrity": "sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==",
+      "requires": {
+        "get-intrinsic": "^1.1.0",
+        "has": "^1.0.3",
+        "side-channel": "^1.0.4"
+      }
+    },
+    "is-bigint": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
+      "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
+      "requires": {
+        "has-bigints": "^1.0.1"
+      }
+    },
+    "is-boolean-object": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
+      "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
+      "requires": {
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
+      }
+    },
+    "is-callable": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
+      "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA=="
+    },
+    "is-core-module": {
+      "version": "2.11.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz",
+      "integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==",
+      "dev": true,
+      "requires": {
+        "has": "^1.0.3"
+      }
+    },
+    "is-date-object": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
+      "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
+      "requires": {
+        "has-tostringtag": "^1.0.0"
+      }
+    },
+    "is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+      "dev": true
+    },
+    "is-glob": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+      "dev": true,
+      "requires": {
+        "is-extglob": "^2.1.1"
+      }
+    },
+    "is-negative-zero": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
+      "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA=="
+    },
+    "is-number-object": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
+      "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==",
+      "requires": {
+        "has-tostringtag": "^1.0.0"
+      }
+    },
+    "is-path-inside": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
+      "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
+      "dev": true
+    },
+    "is-regex": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
+      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
+      "requires": {
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
+      }
+    },
+    "is-shared-array-buffer": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
+      "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
+      "requires": {
+        "call-bind": "^1.0.2"
+      }
+    },
+    "is-string": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
+      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
+      "requires": {
+        "has-tostringtag": "^1.0.0"
+      }
+    },
+    "is-symbol": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
+      "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
+      "requires": {
+        "has-symbols": "^1.0.2"
+      }
+    },
+    "is-weakref": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
+      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
+      "requires": {
+        "call-bind": "^1.0.2"
+      }
+    },
+    "isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+      "dev": true
+    },
+    "js-sdsl": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.2.0.tgz",
+      "integrity": "sha512-dyBIzQBDkCqCu+0upx25Y2jGdbTGxE9fshMsCdK0ViOongpV+n5tXRcZY9v7CaVQ79AGS9KA1KHtojxiM7aXSQ==",
+      "dev": true
+    },
+    "js-yaml": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+      "dev": true,
+      "requires": {
+        "argparse": "^2.0.1"
+      }
+    },
+    "json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
+    },
+    "json-stable-stringify-without-jsonify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+      "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
+      "dev": true
+    },
+    "json5": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+      "dev": true,
+      "requires": {
+        "minimist": "^1.2.0"
+      }
+    },
+    "levn": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
+      "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
+      "dev": true,
+      "requires": {
+        "prelude-ls": "^1.2.1",
+        "type-check": "~0.4.0"
+      }
+    },
+    "locate-path": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
+      "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
+      "dev": true,
+      "requires": {
+        "p-locate": "^5.0.0"
+      }
+    },
+    "lodash.merge": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
+      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
+      "dev": true
+    },
+    "mime-db": {
+      "version": "1.52.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="
+    },
+    "mime-types": {
+      "version": "2.1.35",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+      "requires": {
+        "mime-db": "1.52.0"
+      }
+    },
+    "minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
+      "requires": {
+        "brace-expansion": "^1.1.7"
+      }
+    },
+    "minimist": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.7.tgz",
+      "integrity": "sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==",
+      "dev": true
+    },
+    "ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "natural-compare": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
+      "dev": true
+    },
+    "node-persist": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/node-persist/-/node-persist-3.1.0.tgz",
+      "integrity": "sha512-/j+fd/u71wNgKf3V2bx4tnDm+3GvLnlCuvf2MXbJ3wern+67IAb6zN9Leu1tCWPlPNZ+v1hLSibVukkPK2HqJw=="
+    },
+    "object-inspect": {
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz",
+      "integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ=="
+    },
+    "object-keys": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="
+    },
+    "object.assign": {
+      "version": "4.1.4",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",
+      "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "has-symbols": "^1.0.3",
+        "object-keys": "^1.1.1"
+      }
+    },
+    "object.entries": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.6.tgz",
+      "integrity": "sha512-leTPzo4Zvg3pmbQ3rDK69Rl8GQvIqMWubrkxONG9/ojtFE2rD9fjMKfSI5BxW3osRH1m6VdzmqK8oAY9aT4x5w==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
+      }
+    },
+    "object.values": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.6.tgz",
+      "integrity": "sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
+      }
+    },
+    "once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+      "dev": true,
+      "requires": {
+        "wrappy": "1"
+      }
+    },
+    "optionator": {
+      "version": "0.9.1",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
+      "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
+      "dev": true,
+      "requires": {
+        "deep-is": "^0.1.3",
+        "fast-levenshtein": "^2.0.6",
+        "levn": "^0.4.1",
+        "prelude-ls": "^1.2.1",
+        "type-check": "^0.4.0",
+        "word-wrap": "^1.2.3"
+      }
+    },
+    "p-limit": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+      "dev": true,
+      "requires": {
+        "yocto-queue": "^0.1.0"
+      }
+    },
+    "p-locate": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
+      "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
+      "dev": true,
+      "requires": {
+        "p-limit": "^3.0.2"
+      }
+    },
+    "p-queue": {
+      "version": "7.3.0",
+      "resolved": "https://registry.npmjs.org/p-queue/-/p-queue-7.3.0.tgz",
+      "integrity": "sha512-5fP+yVQ0qp0rEfZoDTlP2c3RYBgxvRsw30qO+VtPPc95lyvSG+x6USSh1TuLB4n96IO6I8/oXQGsTgtna4q2nQ==",
+      "requires": {
+        "eventemitter3": "^4.0.7",
+        "p-timeout": "^5.0.2"
+      }
+    },
+    "p-timeout": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-5.1.0.tgz",
+      "integrity": "sha512-auFDyzzzGZZZdHz3BtET9VEz0SE/uMEAx7uWfGPucfzEwwe/xH0iVeZibQmANYE/hp9T2+UUZT5m+BKyrDp3Ew=="
+    },
+    "parent-module": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+      "dev": true,
+      "requires": {
+        "callsites": "^3.0.0"
+      }
+    },
+    "path-exists": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+      "dev": true
+    },
+    "path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
+      "dev": true
+    },
+    "path-key": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+      "dev": true
+    },
+    "path-parse": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
+      "dev": true
+    },
+    "prelude-ls": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
+      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
+      "dev": true
+    },
+    "promise-controller": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/promise-controller/-/promise-controller-1.0.0.tgz",
+      "integrity": "sha512-goA0zA9L91tuQbUmiMinSYqlyUtEgg4fxJcjYnLYOQnrktb4o4UqciXDNXiRUPiDBPACmsr1k8jDW4r7UDq9Qw=="
+    },
+    "promise.prototype.finally": {
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/promise.prototype.finally/-/promise.prototype.finally-3.1.4.tgz",
+      "integrity": "sha512-nNc3YbgMfLzqtqvO/q5DP6RR0SiHI9pUPGzyDf1q+usTwCN2kjvAnJkBb7bHe3o+fFSBPpsGMoYtaSi+LTNqng==",
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
+      }
+    },
+    "promised-map": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/promised-map/-/promised-map-1.0.0.tgz",
+      "integrity": "sha512-fP9VSMgcml+U2uJ9PBc4/LDQ3ZkJCH4blLNCS6gbH7RHyRZCYs91zxWHqiUy+heFiEMiB2op/qllYoFqmIqdWA=="
+    },
+    "proxy-from-env": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
+      "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="
+    },
+    "punycode": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+      "dev": true
+    },
+    "queue-microtask": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
+      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
+      "dev": true
+    },
+    "regexp.prototype.flags": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
+      "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==",
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3",
+        "functions-have-names": "^1.2.2"
+      }
+    },
+    "regexpp": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
+      "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
+      "dev": true
+    },
+    "resolve": {
+      "version": "1.22.1",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz",
+      "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==",
+      "dev": true,
+      "requires": {
+        "is-core-module": "^2.9.0",
+        "path-parse": "^1.0.7",
+        "supports-preserve-symlinks-flag": "^1.0.0"
+      }
+    },
+    "resolve-from": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+      "dev": true
+    },
+    "reusify": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
+      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
+      "dev": true
+    },
+    "rimraf": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+      "dev": true,
+      "requires": {
+        "glob": "^7.1.3"
+      }
+    },
+    "run-parallel": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
+      "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
+      "dev": true,
+      "requires": {
+        "queue-microtask": "^1.2.2"
+      }
+    },
+    "safe-regex-test": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz",
+      "integrity": "sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==",
+      "requires": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.1.3",
+        "is-regex": "^1.1.4"
+      }
+    },
+    "semver": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+      "dev": true
+    },
+    "shebang-command": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+      "dev": true,
+      "requires": {
+        "shebang-regex": "^3.0.0"
+      }
+    },
+    "shebang-regex": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+      "dev": true
+    },
+    "side-channel": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
+      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
+      "requires": {
+        "call-bind": "^1.0.0",
+        "get-intrinsic": "^1.0.2",
+        "object-inspect": "^1.9.0"
+      }
+    },
+    "string.prototype.trimend": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz",
+      "integrity": "sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==",
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
+      }
+    },
+    "string.prototype.trimstart": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz",
+      "integrity": "sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==",
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
+      }
+    },
+    "strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "requires": {
+        "ansi-regex": "^5.0.1"
+      }
+    },
+    "strip-bom": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+      "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
+      "dev": true
+    },
+    "strip-json-comments": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+      "dev": true
+    },
+    "supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "requires": {
+        "has-flag": "^4.0.0"
+      }
+    },
+    "supports-preserve-symlinks-flag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
+      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
+      "dev": true
+    },
+    "text-table": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
+      "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
+      "dev": true
+    },
+    "tsconfig-paths": {
+      "version": "3.14.1",
+      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz",
+      "integrity": "sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==",
+      "dev": true,
+      "requires": {
+        "@types/json5": "^0.0.29",
+        "json5": "^1.0.1",
+        "minimist": "^1.2.6",
+        "strip-bom": "^3.0.0"
+      }
+    },
+    "type-check": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
+      "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
+      "dev": true,
+      "requires": {
+        "prelude-ls": "^1.2.1"
+      }
+    },
+    "type-fest": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+      "dev": true
+    },
+    "unbox-primitive": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
+      "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
+      "requires": {
+        "call-bind": "^1.0.2",
+        "has-bigints": "^1.0.2",
+        "has-symbols": "^1.0.3",
+        "which-boxed-primitive": "^1.0.2"
+      }
+    },
+    "uri-js": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
+      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
+      "dev": true,
+      "requires": {
+        "punycode": "^2.1.0"
+      }
+    },
+    "websocket-as-promised": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/websocket-as-promised/-/websocket-as-promised-2.0.1.tgz",
+      "integrity": "sha512-ePV26D/D37ughXU9j+DjGmwUbelWJrC/vi+6GK++fRlBJmS7aU9T8ABu47KFF0O7r6XN2NAuqJRpegbUwXZxQg==",
+      "requires": {
+        "chnl": "^1.2.0",
+        "promise-controller": "^1.0.0",
+        "promise.prototype.finally": "^3.1.2",
+        "promised-map": "^1.0.0"
+      }
+    },
+    "which": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+      "dev": true,
+      "requires": {
+        "isexe": "^2.0.0"
+      }
+    },
+    "which-boxed-primitive": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
+      "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
+      "requires": {
+        "is-bigint": "^1.0.1",
+        "is-boolean-object": "^1.1.0",
+        "is-number-object": "^1.0.4",
+        "is-string": "^1.0.5",
+        "is-symbol": "^1.0.3"
+      }
+    },
+    "word-wrap": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
+      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
+      "dev": true
+    },
+    "wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
+      "dev": true
+    },
+    "ws": {
+      "version": "8.11.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.11.0.tgz",
+      "integrity": "sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==",
+      "requires": {}
+    },
+    "yocto-queue": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
+      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
+      "dev": true
+    }
   }
 }
diff --git a/package.json b/package.json
index 45838401..1464f75d 100644
--- a/package.json
+++ b/package.json
@@ -60,7 +60,7 @@
   ],
   "dependencies": {
     "@homebridge/plugin-ui-utils": "^0.0.19",
-    "axios": "^1.1.3",
+    "axios": "^1.2.0",
     "node-persist": "^3.1.0",
     "p-queue": "^7.3.0",
     "websocket-as-promised": "^2.0.1",
@@ -70,7 +70,7 @@
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-import-newlines": "^1.2.3",
-    "eslint-plugin-sort-exports": "^0.7.0",
-    "eslint": "^8.27.0"
+    "eslint-plugin-sort-exports": "^0.8.0",
+    "eslint": "^8.28.0"
   }
 }

From e7f3a2175f09bb038a25113d29559cbf6efb709f Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Thu, 24 Nov 2022 18:29:44 +0000
Subject: [PATCH 3080/3183] first try on switchman

---
 lib/device/switch-man.js | 47 ++++++++++++++++++++++++++++++----------
 package-lock.json        | 14 ++++++------
 package.json             |  2 +-
 3 files changed, 44 insertions(+), 19 deletions(-)

diff --git a/lib/device/switch-man.js b/lib/device/switch-man.js
index 30d3398d..32e8c4de 100644
--- a/lib/device/switch-man.js
+++ b/lib/device/switch-man.js
@@ -36,14 +36,36 @@ export default class {
         break;
     }
     this.timeouts = {
-      0: false,
       1: false,
       2: false,
+      3: false,
+      4: false,
+      5: false,
+      6: false,
+      7: false,
+      8: false,
+      9: false,
     };
 
     // Add the stateless switch service if it doesn't already exist
-    this.service = this.accessory.getService(this.hapServ.StatelessProgrammableSwitch)
-      || this.accessory.addService(this.hapServ.StatelessProgrammableSwitch);
+    this.service1 = this.accessory.getService('Channel 1')
+      || this.accessory.addService(this.hapServ.StatelessProgrammableSwitch, 'Channel 1', 'channel1');
+    this.service2 = this.accessory.getService('Channel 2')
+      || this.accessory.addService(this.hapServ.StatelessProgrammableSwitch, 'Channel 2', 'channel2');
+    this.service3 = this.accessory.getService('Channel 3')
+      || this.accessory.addService(this.hapServ.StatelessProgrammableSwitch, 'Channel 3', 'channel3');
+    this.service4 = this.accessory.getService('Channel 4')
+      || this.accessory.addService(this.hapServ.StatelessProgrammableSwitch, 'Channel 4', 'channel4');
+    this.service5 = this.accessory.getService('Channel 5')
+      || this.accessory.addService(this.hapServ.StatelessProgrammableSwitch, 'Channel 5', 'channel5');
+    this.service6 = this.accessory.getService('Channel 6')
+      || this.accessory.addService(this.hapServ.StatelessProgrammableSwitch, 'Channel 6', 'channel6');
+    this.service7 = this.accessory.getService('Channel 7')
+      || this.accessory.addService(this.hapServ.StatelessProgrammableSwitch, 'Channel 7', 'channel7');
+    this.service8 = this.accessory.getService('Channel 8')
+      || this.accessory.addService(this.hapServ.StatelessProgrammableSwitch, 'Channel 8', 'channel8');
+    this.service9 = this.accessory.getService('Channel 9')
+      || this.accessory.addService(this.hapServ.StatelessProgrammableSwitch, 'Channel 9', 'channel9');
 
     // Output the customised options to the log
     const normalLogging = this.enableLogging ? 'standard' : 'disable';
@@ -57,21 +79,24 @@ export default class {
     try {
       if (
         hasProperty(params, 'outlet')
-        && [0, 1, 2].includes(params.outlet)
+        && [0, 1, 2, 3, 4, 5, 6, 7, 8].includes(params.outlet)
         && params.actionTime
-        && !this.timeouts[params.outlet]
+        && !this.timeouts[params.outlet + 1]
       ) {
-        this.timeouts[params.outlet] = true;
+        this.timeouts[params.outlet + 1] = true;
         setTimeout(() => {
-          this.timeouts[params.outlet] = false;
+          this.timeouts[params.outlet + 1] = false;
         }, 1000);
         const timeDiff = (new Date().getTime() - Date.parse(params.actionTime)) / 1000;
         if (timeDiff < 5) {
-          this.service.updateCharacteristic(this.hapChar.ProgrammableSwitchEvent, params.outlet);
+          const service = this[`service${params.outlet + 1}`];
+          service.updateCharacteristic(this.hapChar.ProgrammableSwitchEvent, params.key);
           if (params.updateSource && this.enableLogging) {
-            const doubleLong = params.outlet === 1 ? this.lang.buttonDouble : this.lang.buttonLong;
-            const textLabel = params.outlet === 0 ? this.lang.buttonSingle : doubleLong;
-            this.log('[%s] %s [%s].', this.name, this.lang.curState, textLabel);
+            const doubleLong = params.key === 1 ? this.lang.buttonDouble : this.lang.buttonLong;
+            const textLabel = params.key === 0 ? this.lang.buttonSingle : doubleLong;
+            if (this.enableLogging) {
+              this.log('[%s] [%s] %s [%s].', this.name, service.displayName, this.lang.curState, textLabel);
+            }
           }
         }
       }
diff --git a/package-lock.json b/package-lock.json
index 205aad0f..03850d0d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -38,7 +38,7 @@
         "eslint": "^8.28.0",
         "eslint-config-airbnb-base": "^15.0.0",
         "eslint-plugin-import": "^2.26.0",
-        "eslint-plugin-import-newlines": "^1.2.3",
+        "eslint-plugin-import-newlines": "^1.3.0",
         "eslint-plugin-sort-exports": "^0.8.0"
       },
       "engines": {
@@ -660,9 +660,9 @@
       }
     },
     "node_modules/eslint-plugin-import-newlines": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import-newlines/-/eslint-plugin-import-newlines-1.2.3.tgz",
-      "integrity": "sha512-UQBhG7dcIoBjaPjbcudqqcKYQVhYXnu9NBB7d8pBnDFZP4GTNPdszpeUbvSxcp/JyBE4TsUZt5u/UtEVioxh9g==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import-newlines/-/eslint-plugin-import-newlines-1.3.0.tgz",
+      "integrity": "sha512-8rokf6NvxC10ugA1VNmzEIO75CzId7IDF3Ai2GNXl0Xr4VORpb8u+bxsjRuE+2BS8MfDbrK/MHUQZI2G9qQyyA==",
       "dev": true,
       "bin": {
         "import-linter": "lib/index.js"
@@ -2664,9 +2664,9 @@
       }
     },
     "eslint-plugin-import-newlines": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import-newlines/-/eslint-plugin-import-newlines-1.2.3.tgz",
-      "integrity": "sha512-UQBhG7dcIoBjaPjbcudqqcKYQVhYXnu9NBB7d8pBnDFZP4GTNPdszpeUbvSxcp/JyBE4TsUZt5u/UtEVioxh9g==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import-newlines/-/eslint-plugin-import-newlines-1.3.0.tgz",
+      "integrity": "sha512-8rokf6NvxC10ugA1VNmzEIO75CzId7IDF3Ai2GNXl0Xr4VORpb8u+bxsjRuE+2BS8MfDbrK/MHUQZI2G9qQyyA==",
       "dev": true,
       "requires": {}
     },
diff --git a/package.json b/package.json
index 1464f75d..201cc03f 100644
--- a/package.json
+++ b/package.json
@@ -69,7 +69,7 @@
   "devDependencies": {
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-plugin-import": "^2.26.0",
-    "eslint-plugin-import-newlines": "^1.2.3",
+    "eslint-plugin-import-newlines": "^1.3.0",
     "eslint-plugin-sort-exports": "^0.8.0",
     "eslint": "^8.28.0"
   }

From efefbcd65da45c2f6aca6f6298f3dda1ce733269 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Thu, 24 Nov 2022 18:40:14 +0000
Subject: [PATCH 3081/3183] 10.3.1-beta.0

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 03850d0d..0e4bb94b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "10.3.0",
+  "version": "10.3.1-beta.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "10.3.0",
+      "version": "10.3.1-beta.0",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 201cc03f..ed4b2b18 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "10.3.0",
+  "version": "10.3.1-beta.0",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From 868c14cc61f5028df5fd78b4d19746b7372532b1 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Sat, 26 Nov 2022 10:31:28 +0000
Subject: [PATCH 3082/3183] switchman updates

---
 lib/device/switch-man.js | 70 ++++++++++++++++++++--------------------
 lib/platform.js          |  3 ++
 package-lock.json        |  2 +-
 package.json             |  2 +-
 4 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/lib/device/switch-man.js b/lib/device/switch-man.js
index 32e8c4de..5d60deb3 100644
--- a/lib/device/switch-man.js
+++ b/lib/device/switch-man.js
@@ -35,37 +35,31 @@ export default class {
         this.enableDebugLogging = platform.config.debug;
         break;
     }
-    this.timeouts = {
-      1: false,
-      2: false,
-      3: false,
-      4: false,
-      5: false,
-      6: false,
-      7: false,
-      8: false,
-      9: false,
-    };
+    this.timeouts = {};
 
-    // Add the stateless switch service if it doesn't already exist
-    this.service1 = this.accessory.getService('Channel 1')
-      || this.accessory.addService(this.hapServ.StatelessProgrammableSwitch, 'Channel 1', 'channel1');
-    this.service2 = this.accessory.getService('Channel 2')
-      || this.accessory.addService(this.hapServ.StatelessProgrammableSwitch, 'Channel 2', 'channel2');
-    this.service3 = this.accessory.getService('Channel 3')
-      || this.accessory.addService(this.hapServ.StatelessProgrammableSwitch, 'Channel 3', 'channel3');
-    this.service4 = this.accessory.getService('Channel 4')
-      || this.accessory.addService(this.hapServ.StatelessProgrammableSwitch, 'Channel 4', 'channel4');
-    this.service5 = this.accessory.getService('Channel 5')
-      || this.accessory.addService(this.hapServ.StatelessProgrammableSwitch, 'Channel 5', 'channel5');
-    this.service6 = this.accessory.getService('Channel 6')
-      || this.accessory.addService(this.hapServ.StatelessProgrammableSwitch, 'Channel 6', 'channel6');
-    this.service7 = this.accessory.getService('Channel 7')
-      || this.accessory.addService(this.hapServ.StatelessProgrammableSwitch, 'Channel 7', 'channel7');
-    this.service8 = this.accessory.getService('Channel 8')
-      || this.accessory.addService(this.hapServ.StatelessProgrammableSwitch, 'Channel 8', 'channel8');
-    this.service9 = this.accessory.getService('Channel 9')
-      || this.accessory.addService(this.hapServ.StatelessProgrammableSwitch, 'Channel 9', 'channel9');
+    // Add the stateless switch services if they don't already exist
+    [0, 1, 2, 3, 4, 5].forEach((channel) => {
+      const label = channel + 1;
+
+      this[`service${label}`] = this.accessory.getService(`Channel ${label}`);
+      if (!this[`service${label}`]) {
+        this[`service${label}`] = this.accessory.addService(
+          this.hapServ.StatelessProgrammableSwitch,
+          `Channel ${label}`,
+          `channel${label}`,
+        );
+
+        // Add the ConfiguredName characteristic
+        this[`service${label}`].addCharacteristic(this.hapChar.ConfiguredName);
+        this[`service${label}`].updateCharacteristic(this.hapChar.ConfiguredName, `Channel ${label}`);
+
+        // Add the ServiceLabelIndex characteristic
+        this[`service${label}`].addCharacteristic(this.hapChar.ServiceLabelIndex);
+        this[`service${label}`].updateCharacteristic(this.hapChar.ServiceLabelIndex, channel);
+      }
+
+      this.timeouts[channel] = false;
+    });
 
     // Output the customised options to the log
     const normalLogging = this.enableLogging ? 'standard' : 'disable';
@@ -79,13 +73,13 @@ export default class {
     try {
       if (
         hasProperty(params, 'outlet')
-        && [0, 1, 2, 3, 4, 5, 6, 7, 8].includes(params.outlet)
+        && [0, 1, 2, 3, 4, 5].includes(params.outlet)
         && params.actionTime
-        && !this.timeouts[params.outlet + 1]
+        && !this.timeouts[params.outlet]
       ) {
-        this.timeouts[params.outlet + 1] = true;
+        this.timeouts[params.outlet] = true;
         setTimeout(() => {
-          this.timeouts[params.outlet + 1] = false;
+          this.timeouts[params.outlet] = false;
         }, 1000);
         const timeDiff = (new Date().getTime() - Date.parse(params.actionTime)) / 1000;
         if (timeDiff < 5) {
@@ -95,7 +89,13 @@ export default class {
             const doubleLong = params.key === 1 ? this.lang.buttonDouble : this.lang.buttonLong;
             const textLabel = params.key === 0 ? this.lang.buttonSingle : doubleLong;
             if (this.enableLogging) {
-              this.log('[%s] [%s] %s [%s].', this.name, service.displayName, this.lang.curState, textLabel);
+              this.log(
+                '[%s] [%s] %s [%s].',
+                this.name,
+                service.getCharacteristic(this.hapChar.ConfiguredName),
+                this.lang.curState,
+                textLabel,
+              );
             }
           }
         }
diff --git a/lib/platform.js b/lib/platform.js
index db50b07b..b63381f2 100644
--- a/lib/platform.js
+++ b/lib/platform.js
@@ -1231,6 +1231,9 @@ export default class {
         /** *******
          SWITCH MAN
          ******** */
+        if (devicesInHB.get(uuid)) { // temporarily reset each time
+          this.removeAccessory(devicesInHB.get(uuid));
+        }
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SW0`);
         accessory.control = new deviceTypes.deviceSwitchMan(this, accessory);
         /** *************** */
diff --git a/package-lock.json b/package-lock.json
index 0e4bb94b..1c662c16 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -42,7 +42,7 @@
         "eslint-plugin-sort-exports": "^0.8.0"
       },
       "engines": {
-        "homebridge": "^1.5.0",
+        "homebridge": "^1.6.0",
         "node": "^14.21.1 || ^16.18.1 || ^18.12.1"
       }
     },
diff --git a/package.json b/package.json
index ed4b2b18..97c5c012 100644
--- a/package.json
+++ b/package.json
@@ -30,7 +30,7 @@
     "rebuild": "rm -rf package-lock.json && rm -rf node_modules && npm install"
   },
   "engines": {
-    "homebridge": "^1.5.0",
+    "homebridge": "^1.6.0",
     "node": "^14.21.1 || ^16.18.1 || ^18.12.1"
   },
   "repository": {

From 10ed5c5687f9be9675d234eb9b5ba3b278b4d585 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Sat, 26 Nov 2022 10:32:14 +0000
Subject: [PATCH 3083/3183] 10.3.1-beta.1

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 1c662c16..e5001559 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "10.3.1-beta.0",
+  "version": "10.3.1-beta.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "10.3.1-beta.0",
+      "version": "10.3.1-beta.1",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 97c5c012..0f9a71c0 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "10.3.1-beta.0",
+  "version": "10.3.1-beta.1",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From cd2410c7d26757090f703f499c806a7d508be6fa Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 26 Nov 2022 10:49:42 +0000
Subject: [PATCH 3084/3183] Update switch-man.js

---
 lib/device/switch-man.js | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/lib/device/switch-man.js b/lib/device/switch-man.js
index 5d60deb3..03c02422 100644
--- a/lib/device/switch-man.js
+++ b/lib/device/switch-man.js
@@ -38,9 +38,7 @@ export default class {
     this.timeouts = {};
 
     // Add the stateless switch services if they don't already exist
-    [0, 1, 2, 3, 4, 5].forEach((channel) => {
-      const label = channel + 1;
-
+    [1, 2, 3, 4, 5, 6].forEach((label) => {
       this[`service${label}`] = this.accessory.getService(`Channel ${label}`);
       if (!this[`service${label}`]) {
         this[`service${label}`] = this.accessory.addService(
@@ -55,10 +53,10 @@ export default class {
 
         // Add the ServiceLabelIndex characteristic
         this[`service${label}`].addCharacteristic(this.hapChar.ServiceLabelIndex);
-        this[`service${label}`].updateCharacteristic(this.hapChar.ServiceLabelIndex, channel);
+        this[`service${label}`].updateCharacteristic(this.hapChar.ServiceLabelIndex, label);
       }
 
-      this.timeouts[channel] = false;
+      this.timeouts[label] = false;
     });
 
     // Output the customised options to the log
@@ -75,15 +73,16 @@ export default class {
         hasProperty(params, 'outlet')
         && [0, 1, 2, 3, 4, 5].includes(params.outlet)
         && params.actionTime
-        && !this.timeouts[params.outlet]
+        && !this.timeouts[params.outlet + 1]
       ) {
-        this.timeouts[params.outlet] = true;
+        const label = params.outlet + 1;
+        this.timeouts[label] = true;
         setTimeout(() => {
-          this.timeouts[params.outlet] = false;
+          this.timeouts[label] = false;
         }, 1000);
         const timeDiff = (new Date().getTime() - Date.parse(params.actionTime)) / 1000;
         if (timeDiff < 5) {
-          const service = this[`service${params.outlet + 1}`];
+          const service = this[`service${label}`];
           service.updateCharacteristic(this.hapChar.ProgrammableSwitchEvent, params.key);
           if (params.updateSource && this.enableLogging) {
             const doubleLong = params.key === 1 ? this.lang.buttonDouble : this.lang.buttonLong;

From 38e76e13cde8e2552cee2721b178bf74cd74a054 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 26 Nov 2022 10:50:54 +0000
Subject: [PATCH 3085/3183] 10.3.1-beta.2

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index e5001559..cd11378d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "10.3.1-beta.1",
+  "version": "10.3.1-beta.2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "10.3.1-beta.1",
+      "version": "10.3.1-beta.2",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 0f9a71c0..a804683a 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "10.3.1-beta.1",
+  "version": "10.3.1-beta.2",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From 52764695baacc2453ce74fe5945ed0ec559f6670 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Mon, 28 Nov 2022 18:15:28 +0000
Subject: [PATCH 3086/3183] stop resetting switchman

---
 lib/platform.js   |  3 ---
 package-lock.json | 12 ++++++------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/lib/platform.js b/lib/platform.js
index b63381f2..db50b07b 100644
--- a/lib/platform.js
+++ b/lib/platform.js
@@ -1231,9 +1231,6 @@ export default class {
         /** *******
          SWITCH MAN
          ******** */
-        if (devicesInHB.get(uuid)) { // temporarily reset each time
-          this.removeAccessory(devicesInHB.get(uuid));
-        }
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SW0`);
         accessory.control = new deviceTypes.deviceSwitchMan(this, accessory);
         /** *************** */
diff --git a/package-lock.json b/package-lock.json
index cd11378d..ca3eaa87 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1111,9 +1111,9 @@
       }
     },
     "node_modules/ignore": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
-      "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.1.tgz",
+      "integrity": "sha512-d2qQLzTJ9WxQftPAuEQpSPmKqzxePjzVbpAVv62AQ64NTL+wR4JkrVqR/LqFsFEUsHDAiId52mJteHDFuDkElA==",
       "dev": true,
       "engines": {
         "node": ">= 4"
@@ -2958,9 +2958,9 @@
       }
     },
     "ignore": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
-      "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.1.tgz",
+      "integrity": "sha512-d2qQLzTJ9WxQftPAuEQpSPmKqzxePjzVbpAVv62AQ64NTL+wR4JkrVqR/LqFsFEUsHDAiId52mJteHDFuDkElA==",
       "dev": true
     },
     "import-fresh": {

From 1b4863741e198d7e9c1545f1d28c55ec789d0a6c Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Mon, 28 Nov 2022 18:15:51 +0000
Subject: [PATCH 3087/3183] 10.3.1-beta.3

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ca3eaa87..d58ae249 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "10.3.1-beta.2",
+  "version": "10.3.1-beta.3",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "10.3.1-beta.2",
+      "version": "10.3.1-beta.3",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index a804683a..45ca4d3a 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "10.3.1-beta.2",
+  "version": "10.3.1-beta.3",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From b23892714f667fa8114a750149278bd464a4fa12 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Tue, 29 Nov 2022 15:56:29 +0000
Subject: [PATCH 3088/3183] allow for hb 2.0.0-beta.0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d58ae249..e5f282e7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -42,7 +42,7 @@
         "eslint-plugin-sort-exports": "^0.8.0"
       },
       "engines": {
-        "homebridge": "^1.6.0",
+        "homebridge": "^1.6.0 || 2.0.0-beta.0",
         "node": "^14.21.1 || ^16.18.1 || ^18.12.1"
       }
     },
diff --git a/package.json b/package.json
index 45ca4d3a..f4f2e82f 100644
--- a/package.json
+++ b/package.json
@@ -30,7 +30,7 @@
     "rebuild": "rm -rf package-lock.json && rm -rf node_modules && npm install"
   },
   "engines": {
-    "homebridge": "^1.6.0",
+    "homebridge": "^1.6.0 || 2.0.0-beta.0",
     "node": "^14.21.1 || ^16.18.1 || ^18.12.1"
   },
   "repository": {

From c05d1945fb9bbfd3aa886ad678ea0c4d2b0c4f42 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Tue, 29 Nov 2022 15:56:49 +0000
Subject: [PATCH 3089/3183] 10.3.1-beta.4

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index e5f282e7..50eb81ef 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "10.3.1-beta.3",
+  "version": "10.3.1-beta.4",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "10.3.1-beta.3",
+      "version": "10.3.1-beta.4",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index f4f2e82f..049fffd7 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "10.3.1-beta.3",
+  "version": "10.3.1-beta.4",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From dacc6ef9ef2181f5ec799b44159ecff7807040f7 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Thu, 8 Dec 2022 23:14:47 +0000
Subject: [PATCH 3090/3183] divisor for power readings for outlet 190

---
 lib/device/outlet-single.js | 30 ++++++++------
 package-lock.json           | 81 +++++++++++++++++++++++--------------
 package.json                |  4 +-
 3 files changed, 71 insertions(+), 44 deletions(-)

diff --git a/lib/device/outlet-single.js b/lib/device/outlet-single.js
index 37dad6ae..756ce833 100644
--- a/lib/device/outlet-single.js
+++ b/lib/device/outlet-single.js
@@ -60,6 +60,9 @@ export default class {
     this.service = this.accessory.getService(this.hapServ.Outlet)
       || this.accessory.addService(this.hapServ.Outlet);
 
+    // Some models provide a power reading in different decimals
+    this.divisor = 1;
+
     switch (this.accessory.context.eweUIID) {
       case 5:
       case 182:
@@ -88,6 +91,10 @@ export default class {
         if (this.service.testCharacteristic(this.eveChar.Voltage)) {
           this.service.removeCharacteristic(this.service.getCharacteristic(this.eveChar.Voltage));
         }
+
+        if (this.accessory.context.eweUIID === 190) {
+          this.divisor = 100;
+        }
         break;
       case 32:
         // Add Eve power characteristics
@@ -306,8 +313,11 @@ export default class {
         return;
       }
       let logger = false;
+      let power;
+      let voltage;
+      let current;
       if (hasProperty(params, 'power')) {
-        const power = parseFloat(params.power);
+        power = Math.round(parseFloat(params.power) / this.divisor);
         this.service.updateCharacteristic(
           this.hapChar.OutletInUse,
           this.cacheState === 'on' && power > this.inUsePowerThreshold,
@@ -318,26 +328,22 @@ export default class {
         logger = true;
       }
       if (hasProperty(params, 'voltage')) {
-        this.service.updateCharacteristic(this.eveChar.Voltage, parseFloat(params.voltage));
+        voltage = Math.round(parseFloat(params.voltage) / this.divisor);
+        this.service.updateCharacteristic(this.eveChar.Voltage, voltage);
         logger = true;
       }
       if (hasProperty(params, 'current')) {
-        this.service.updateCharacteristic(this.eveChar.ElectricCurrent, parseFloat(params.current));
+        current = Math.round(parseFloat(params.current) / this.divisor);
+        this.service.updateCharacteristic(this.eveChar.ElectricCurrent, current);
         logger = true;
       }
       if (params.updateSource && logger && this.enableLogging) {
         this.log(
           '[%s] %s%s%s.',
           this.name,
-          hasProperty(params, 'power')
-            ? `${this.lang.curPower} [${params.power}W]`
-            : '',
-          hasProperty(params, 'voltage')
-            ? ` ${this.lang.curVolt} [${params.voltage}V]`
-            : '',
-          hasProperty(params, 'current')
-            ? ` ${this.lang.curCurr} [${params.current}A]`
-            : '',
+          power !== undefined ? `${this.lang.curPower} [${power}W]` : '',
+          voltage !== undefined ? ` ${this.lang.curVolt} [${voltage}V]` : '',
+          current !== undefined ? ` ${this.lang.curCurr} [${current}A]` : '',
         );
       }
     } catch (err) {
diff --git a/package-lock.json b/package-lock.json
index 50eb81ef..be8050bf 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -28,14 +28,14 @@
       "license": "MIT",
       "dependencies": {
         "@homebridge/plugin-ui-utils": "^0.0.19",
-        "axios": "^1.2.0",
+        "axios": "^1.2.1",
         "node-persist": "^3.1.0",
         "p-queue": "^7.3.0",
         "websocket-as-promised": "^2.0.1",
         "ws": "^8.11.0"
       },
       "devDependencies": {
-        "eslint": "^8.28.0",
+        "eslint": "^8.29.0",
         "eslint-config-airbnb-base": "^15.0.0",
         "eslint-plugin-import": "^2.26.0",
         "eslint-plugin-import-newlines": "^1.3.0",
@@ -258,9 +258,9 @@
       "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
     },
     "node_modules/axios": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.2.0.tgz",
-      "integrity": "sha512-zT7wZyNYu3N5Bu0wuZ6QccIf93Qk1eV8LOewxgjOZFd2DenOs98cJ7+Y6703d0wkaXGY6/nZd4EweJaHz9uzQw==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.2.1.tgz",
+      "integrity": "sha512-I88cFiGu9ryt/tfVEi4kX2SITsvDddTajXTOFmt2uK1ZVA8LytjtdeyefdQWEf5PU8w+4SSJDoYnggflB5tW4A==",
       "dependencies": {
         "follow-redirects": "^1.15.0",
         "form-data": "^4.0.0",
@@ -439,9 +439,9 @@
       }
     },
     "node_modules/es-abstract": {
-      "version": "1.20.4",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.4.tgz",
-      "integrity": "sha512-0UtvRN79eMe2L+UNEF1BwRe364sj/DXhQ/k5FmivgoSdpM90b8Jc0mDzKMGo7QS0BVbOP/bTwBKNnDc9rNzaPA==",
+      "version": "1.20.5",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.5.tgz",
+      "integrity": "sha512-7h8MM2EQhsCA7pU/Nv78qOXFpD8Rhqd12gYiSJVkrH9+e8VuA8JlPJK/hQjjlLv6pJvx/z1iRFKzYb0XT/RuAQ==",
       "dependencies": {
         "call-bind": "^1.0.2",
         "es-to-primitive": "^1.2.1",
@@ -449,6 +449,7 @@
         "function.prototype.name": "^1.1.5",
         "get-intrinsic": "^1.1.3",
         "get-symbol-description": "^1.0.0",
+        "gopd": "^1.0.1",
         "has": "^1.0.3",
         "has-property-descriptors": "^1.0.0",
         "has-symbols": "^1.0.3",
@@ -464,8 +465,8 @@
         "object.assign": "^4.1.4",
         "regexp.prototype.flags": "^1.4.3",
         "safe-regex-test": "^1.0.0",
-        "string.prototype.trimend": "^1.0.5",
-        "string.prototype.trimstart": "^1.0.5",
+        "string.prototype.trimend": "^1.0.6",
+        "string.prototype.trimstart": "^1.0.6",
         "unbox-primitive": "^1.0.2"
       },
       "engines": {
@@ -513,9 +514,9 @@
       }
     },
     "node_modules/eslint": {
-      "version": "8.28.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.28.0.tgz",
-      "integrity": "sha512-S27Di+EVyMxcHiwDrFzk8dJYAaD+/5SoWKxL1ri/71CRHsnJnRDPNt2Kzj24+MT9FDupf4aqqyqPrvI8MvQ4VQ==",
+      "version": "8.29.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.29.0.tgz",
+      "integrity": "sha512-isQ4EEiyUjZFbEKvEGJKKGBwXtvXX+zJbkVKCgTuB9t/+jUBcy8avhkEwWJecI15BkRkOYmvIM5ynbhRjEkoeg==",
       "dev": true,
       "dependencies": {
         "@eslint/eslintrc": "^1.3.3",
@@ -842,9 +843,9 @@
       "dev": true
     },
     "node_modules/fastq": {
-      "version": "1.13.0",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz",
-      "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==",
+      "version": "1.14.0",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.14.0.tgz",
+      "integrity": "sha512-eR2D+V9/ExcbF9ls441yIuN6TI2ED1Y2ZcA5BmMtJsOkWOFRJQ0Jt0g1UwqXJJVAb+V+umH5Dfr8oh4EVP7VVg==",
       "dev": true,
       "dependencies": {
         "reusify": "^1.0.4"
@@ -1040,6 +1041,17 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/gopd": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
+      "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
+      "dependencies": {
+        "get-intrinsic": "^1.1.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/grapheme-splitter": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz",
@@ -2321,9 +2333,9 @@
       "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
     },
     "axios": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.2.0.tgz",
-      "integrity": "sha512-zT7wZyNYu3N5Bu0wuZ6QccIf93Qk1eV8LOewxgjOZFd2DenOs98cJ7+Y6703d0wkaXGY6/nZd4EweJaHz9uzQw==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.2.1.tgz",
+      "integrity": "sha512-I88cFiGu9ryt/tfVEi4kX2SITsvDddTajXTOFmt2uK1ZVA8LytjtdeyefdQWEf5PU8w+4SSJDoYnggflB5tW4A==",
       "requires": {
         "follow-redirects": "^1.15.0",
         "form-data": "^4.0.0",
@@ -2461,9 +2473,9 @@
       }
     },
     "es-abstract": {
-      "version": "1.20.4",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.4.tgz",
-      "integrity": "sha512-0UtvRN79eMe2L+UNEF1BwRe364sj/DXhQ/k5FmivgoSdpM90b8Jc0mDzKMGo7QS0BVbOP/bTwBKNnDc9rNzaPA==",
+      "version": "1.20.5",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.5.tgz",
+      "integrity": "sha512-7h8MM2EQhsCA7pU/Nv78qOXFpD8Rhqd12gYiSJVkrH9+e8VuA8JlPJK/hQjjlLv6pJvx/z1iRFKzYb0XT/RuAQ==",
       "requires": {
         "call-bind": "^1.0.2",
         "es-to-primitive": "^1.2.1",
@@ -2471,6 +2483,7 @@
         "function.prototype.name": "^1.1.5",
         "get-intrinsic": "^1.1.3",
         "get-symbol-description": "^1.0.0",
+        "gopd": "^1.0.1",
         "has": "^1.0.3",
         "has-property-descriptors": "^1.0.0",
         "has-symbols": "^1.0.3",
@@ -2486,8 +2499,8 @@
         "object.assign": "^4.1.4",
         "regexp.prototype.flags": "^1.4.3",
         "safe-regex-test": "^1.0.0",
-        "string.prototype.trimend": "^1.0.5",
-        "string.prototype.trimstart": "^1.0.5",
+        "string.prototype.trimend": "^1.0.6",
+        "string.prototype.trimstart": "^1.0.6",
         "unbox-primitive": "^1.0.2"
       }
     },
@@ -2517,9 +2530,9 @@
       "dev": true
     },
     "eslint": {
-      "version": "8.28.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.28.0.tgz",
-      "integrity": "sha512-S27Di+EVyMxcHiwDrFzk8dJYAaD+/5SoWKxL1ri/71CRHsnJnRDPNt2Kzj24+MT9FDupf4aqqyqPrvI8MvQ4VQ==",
+      "version": "8.29.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.29.0.tgz",
+      "integrity": "sha512-isQ4EEiyUjZFbEKvEGJKKGBwXtvXX+zJbkVKCgTuB9t/+jUBcy8avhkEwWJecI15BkRkOYmvIM5ynbhRjEkoeg==",
       "dev": true,
       "requires": {
         "@eslint/eslintrc": "^1.3.3",
@@ -2775,9 +2788,9 @@
       "dev": true
     },
     "fastq": {
-      "version": "1.13.0",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz",
-      "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==",
+      "version": "1.14.0",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.14.0.tgz",
+      "integrity": "sha512-eR2D+V9/ExcbF9ls441yIuN6TI2ED1Y2ZcA5BmMtJsOkWOFRJQ0Jt0g1UwqXJJVAb+V+umH5Dfr8oh4EVP7VVg==",
       "dev": true,
       "requires": {
         "reusify": "^1.0.4"
@@ -2911,6 +2924,14 @@
         "type-fest": "^0.20.2"
       }
     },
+    "gopd": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
+      "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
+      "requires": {
+        "get-intrinsic": "^1.1.3"
+      }
+    },
     "grapheme-splitter": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz",
diff --git a/package.json b/package.json
index 049fffd7..c217c9be 100644
--- a/package.json
+++ b/package.json
@@ -60,7 +60,7 @@
   ],
   "dependencies": {
     "@homebridge/plugin-ui-utils": "^0.0.19",
-    "axios": "^1.2.0",
+    "axios": "^1.2.1",
     "node-persist": "^3.1.0",
     "p-queue": "^7.3.0",
     "websocket-as-promised": "^2.0.1",
@@ -71,6 +71,6 @@
     "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-import-newlines": "^1.3.0",
     "eslint-plugin-sort-exports": "^0.8.0",
-    "eslint": "^8.28.0"
+    "eslint": "^8.29.0"
   }
 }

From ccc6439c9daaeebb5a0e3452636b972d64bb33f1 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Thu, 8 Dec 2022 23:15:21 +0000
Subject: [PATCH 3091/3183] 10.3.1-beta.5

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index be8050bf..b32d4d0f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "10.3.1-beta.4",
+  "version": "10.3.1-beta.5",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "10.3.1-beta.4",
+      "version": "10.3.1-beta.5",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index c217c9be..56093f42 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "10.3.1-beta.4",
+  "version": "10.3.1-beta.5",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From 74a1c993d2f7f73307adfb2e35a67995e50501df Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Sat, 10 Dec 2022 14:17:37 +0000
Subject: [PATCH 3092/3183] improvements

---
 CHANGELOG.md                       |  11 ++
 config.schema.json                 |  19 +++
 lib/device/light-cct.js            |   2 +-
 lib/device/light-dimmer.js         |   7 +-
 lib/device/light-rgb-cct.js        |   2 +-
 lib/device/light-rgb.js            |   2 +-
 lib/device/outlet-single.js        |   6 +-
 lib/device/simulation/index.js     |   2 +
 lib/device/simulation/light-fan.js | 259 +++++++++++++++++++++++++++++
 lib/device/switch-single.js        |  31 ++--
 lib/platform.js                    |   4 +-
 lib/utils/constants.js             |   2 +
 12 files changed, 327 insertions(+), 20 deletions(-)
 create mode 100644 lib/device/simulation/light-fan.js

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a7f18f77..e3e603d9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,17 @@ All notable changes to homebridge-ewelink will be documented in this file.
 
 ⚠️ Note that Node 14 will no longer be supported after April 2023
 
+## BETA
+
+### Added
+
+- Expose a Sonoff D1 or KING-M4 as a fan accessory type
+- Improved support for SwitchMan devices (Sonoff R5)
+
+### Fixed
+
+- Power readings for POWR320 now show correctly
+
 ## 10.3.0 (2022-11-11)
 
 ### Added
diff --git a/config.schema.json b/config.schema.json
index e9803d4b..de203781 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -922,6 +922,24 @@
                 "functionBody": "return (model.lightDevices && model.lightDevices[arrayIndices] && model.lightDevices[arrayIndices].deviceId && model.lightDevices[arrayIndices].deviceId.length === 10 && !model.lightDevices[arrayIndices].ignoreDevice);"
               }
             },
+            "showAs": {
+              "type": "string",
+              "title": "Show As (Simulation)",
+              "description": "Expose this device as a different HomeKit accessory type.",
+              "oneOf": [
+                {
+                  "title": "1 Light (Default)",
+                  "enum": ["default"]
+                },
+                {
+                  "title": "1 Fan",
+                  "enum": ["fan"]
+                }
+              ],
+              "condition": {
+                "functionBody": "return (model.lightDevices && model.lightDevices[arrayIndices] && ['d1', 'king'].includes(model.lightDevices[arrayIndices].deviceModel) && !model.lightDevices[arrayIndices].ignoreDevice);"
+              }
+            },
             "brightnessStep": {
               "title": "Brightness Step",
               "type": "integer",
@@ -1824,6 +1842,7 @@
             "lightDevices[].deviceId",
             "lightDevices[].ignoreDevice",
             "lightDevices[].deviceModel",
+            "lightDevices[].showAs",
             "lightDevices[].brightnessStep",
             "lightDevices[].adaptiveLightingShift",
             "lightDevices[].offlineAsOff",
diff --git a/lib/device/light-cct.js b/lib/device/light-cct.js
index d5cb91f1..148cc9b7 100644
--- a/lib/device/light-cct.js
+++ b/lib/device/light-cct.js
@@ -306,7 +306,7 @@ export default class {
   markStatus(isOnline) {
     this.isOnline = isOnline;
 
-    // Show as off if offline if configured by user
+    // Show as off if offlineAsOff is enabled
     if (this.offlineAsOff && !isOnline && this.cacheState !== 'off') {
       this.service.updateCharacteristic(this.hapChar.On, false);
       this.cacheState = 'off';
diff --git a/lib/device/light-dimmer.js b/lib/device/light-dimmer.js
index b97d217d..7a333eb4 100644
--- a/lib/device/light-dimmer.js
+++ b/lib/device/light-dimmer.js
@@ -45,6 +45,11 @@ export default class {
         break;
     }
 
+    // Remove any fan services from a similation
+    if (accessory.getService(this.hapServ.Fan)) {
+      accessory.removeService(accessory.getService(this.hapServ.Fan));
+    }
+
     // Add the lightbulb service if it doesn't already exist
     this.service = this.accessory.getService(this.hapServ.Lightbulb)
       || this.accessory.addService(this.hapServ.Lightbulb);
@@ -231,7 +236,7 @@ export default class {
   markStatus(isOnline) {
     this.isOnline = isOnline;
 
-    // Show as off if offline if configured by user
+    // Show as off if offlineAsOff is enabled
     if (this.offlineAsOff && !isOnline && this.cacheState !== 'off') {
       this.service.updateCharacteristic(this.hapChar.On, false);
       this.cacheState = 'off';
diff --git a/lib/device/light-rgb-cct.js b/lib/device/light-rgb-cct.js
index 7f2ddc80..880493fa 100644
--- a/lib/device/light-rgb-cct.js
+++ b/lib/device/light-rgb-cct.js
@@ -772,7 +772,7 @@ export default class {
   markStatus(isOnline) {
     this.isOnline = isOnline;
 
-    // Show as off if offline if configured by user
+    // Show as off if offlineAsOff is enabled
     if (this.offlineAsOff && !isOnline && this.cacheState !== 'off') {
       this.service.updateCharacteristic(this.hapChar.On, false);
       this.cacheState = 'off';
diff --git a/lib/device/light-rgb.js b/lib/device/light-rgb.js
index 5341cfc6..563fbc14 100644
--- a/lib/device/light-rgb.js
+++ b/lib/device/light-rgb.js
@@ -248,7 +248,7 @@ export default class {
   markStatus(isOnline) {
     this.isOnline = isOnline;
 
-    // Show as off if offline if configured by user
+    // Show as off if offlineAsOff is enabled
     if (this.offlineAsOff && !isOnline && this.cacheState !== 'off') {
       this.service.updateCharacteristic(this.hapChar.On, false);
       this.cacheState = 'off';
diff --git a/lib/device/outlet-single.js b/lib/device/outlet-single.js
index 756ce833..6c6f979e 100644
--- a/lib/device/outlet-single.js
+++ b/lib/device/outlet-single.js
@@ -317,7 +317,7 @@ export default class {
       let voltage;
       let current;
       if (hasProperty(params, 'power')) {
-        power = Math.round(parseFloat(params.power) / this.divisor);
+        power = Math.round((parseFloat(params.power) * 100) / this.divisor) / 100;
         this.service.updateCharacteristic(
           this.hapChar.OutletInUse,
           this.cacheState === 'on' && power > this.inUsePowerThreshold,
@@ -328,12 +328,12 @@ export default class {
         logger = true;
       }
       if (hasProperty(params, 'voltage')) {
-        voltage = Math.round(parseFloat(params.voltage) / this.divisor);
+        voltage = Math.round((parseFloat(params.voltage) * 100) / this.divisor) / 100;
         this.service.updateCharacteristic(this.eveChar.Voltage, voltage);
         logger = true;
       }
       if (hasProperty(params, 'current')) {
-        current = Math.round(parseFloat(params.current) / this.divisor);
+        current = Math.round((parseFloat(params.current) * 100) / this.divisor) / 100;
         this.service.updateCharacteristic(this.eveChar.ElectricCurrent, current);
         logger = true;
       }
diff --git a/lib/device/simulation/index.js b/lib/device/simulation/index.js
index 8f3367e3..65cdf3f5 100644
--- a/lib/device/simulation/index.js
+++ b/lib/device/simulation/index.js
@@ -9,6 +9,7 @@ import deviceGarageOne from './garage-one.js';
 import deviceGarageTwo from './garage-two.js';
 import deviceGateOne from './gate-one.js';
 import deviceHeater from './heater.js';
+import deviceLightFan from './light-fan.js';
 import deviceLockEachen from './lock-eachen.js';
 import deviceLockOne from './lock-one.js';
 import devicePButton from './p-button.js';
@@ -46,6 +47,7 @@ export default {
   deviceGarageTwo,
   deviceGateOne,
   deviceHeater,
+  deviceLightFan,
   deviceLockEachen,
   deviceLockOne,
   devicePButton,
diff --git a/lib/device/simulation/light-fan.js b/lib/device/simulation/light-fan.js
new file mode 100644
index 00000000..e79ba34a
--- /dev/null
+++ b/lib/device/simulation/light-fan.js
@@ -0,0 +1,259 @@
+import platformConsts from '../../utils/constants.js';
+import { generateRandomString, hasProperty, sleep } from '../../utils/functions.js';
+
+export default class {
+  constructor(platform, accessory) {
+    // Set up variables from the platform
+    this.hapChar = platform.api.hap.Characteristic;
+    this.hapErr = platform.api.hap.HapStatusError;
+    this.hapServ = platform.api.hap.Service;
+    this.lang = platform.lang;
+    this.log = platform.log;
+    this.platform = platform;
+
+    // Set up variables from the accessory
+    this.name = accessory.displayName;
+    this.accessory = accessory;
+
+    // Initially set the online flag as true (to be then updated as false if necessary)
+    this.isOnline = true;
+
+    // Set up custom variables for this device type
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId] || {};
+    this.brightStep = deviceConf.brightnessStep
+      ? Math.min(deviceConf.brightnessStep, 100)
+      : platformConsts.defaultValues.brightnessStep;
+    this.offlineAsOff = deviceConf.offlineAsOff;
+
+    // Set the correct logging variables for this accessory
+    switch (deviceConf.overrideLogging) {
+      case 'standard':
+        this.enableLogging = true;
+        this.enableDebugLogging = false;
+        break;
+      case 'debug':
+        this.enableLogging = true;
+        this.enableDebugLogging = true;
+        break;
+      case 'disable':
+        this.enableLogging = false;
+        this.enableDebugLogging = false;
+        break;
+      default:
+        this.enableLogging = !platform.config.disableDeviceLogging;
+        this.enableDebugLogging = platform.config.debug;
+        break;
+    }
+
+    // Remove any existing lightbulb services if found
+    if (accessory.getService(this.hapServ.Lightbulb)) {
+      accessory.removeService(accessory.getService(this.hapServ.Lightbulb));
+    }
+
+    // Add the fan service if it doesn't already exist
+    this.service = this.accessory.getService(this.hapServ.Fan)
+      || this.accessory.addService(this.hapServ.Fan);
+
+    // Add the set handler to the fan on/off characteristic
+    this.service
+      .getCharacteristic(this.hapChar.On)
+      .onSet(async (value) => this.internalStateUpdate(value));
+
+    // Add the set handler to the fan speed characteristic
+    this.service
+      .getCharacteristic(this.hapChar.RotationSpeed)
+      .setProps({ minStep: this.brightStep })
+      .onSet(async (value) => this.internalSpeedUpdate(value));
+
+    // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
+    if (!platform.config.disableNoResponse) {
+      this.service.getCharacteristic(this.hapChar.On).onGet(() => {
+        if (!this.isOnline) {
+          throw new this.hapErr(-70402);
+        }
+        return this.service.getCharacteristic(this.hapChar.On).value;
+      });
+      this.service.getCharacteristic(this.hapChar.RotationSpeed).onGet(() => {
+        if (!this.isOnline) {
+          throw new this.hapErr(-70402);
+        }
+        return this.service.getCharacteristic(this.hapChar.RotationSpeed).value;
+      });
+    }
+
+    // Output the customised options to the log
+    const normalLogging = this.enableLogging ? 'standard' : 'disable';
+    const opts = JSON.stringify({
+      brightnessStep: this.brightStep,
+      logging: this.enableDebugLogging ? 'debug' : normalLogging,
+      offlineAsOff: !!this.offlineAsOff,
+      showAs: 'fan',
+    });
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts);
+  }
+
+  async internalStateUpdate(value) {
+    try {
+      const newValue = value ? 'on' : 'off';
+      if (this.cacheState === newValue) {
+        return;
+      }
+      const params = {};
+      switch (this.accessory.context.eweUIID) {
+        case 36:
+        case 44:
+          // KING-M4, D1
+          params.switch = newValue;
+          break;
+        case 57:
+          params.state = newValue;
+          break;
+        default:
+          return;
+      }
+      await this.platform.sendDeviceUpdate(this.accessory, params);
+      this.cacheState = newValue;
+      if (this.enableLogging) {
+        this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState);
+      }
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, true);
+      setTimeout(() => {
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on');
+      }, 2000);
+      throw new this.hapErr(-70402);
+    }
+  }
+
+  async internalSpeedUpdate(value) {
+    try {
+      if (this.cacheSpeed === value) {
+        return;
+      }
+      const updateKey = generateRandomString(5);
+      this.updateKeySpeed = updateKey;
+      await sleep(500);
+      if (updateKey !== this.updateKeySpeed) {
+        return;
+      }
+      const params = {};
+      switch (this.accessory.context.eweUIID) {
+        case 36:
+          params.bright = Math.round((value * 9) / 10 + 10);
+          // KING-M4 eWeLink scale is 10-100 and HomeKit scale is 0-100
+          break;
+        case 44:
+          params.brightness = value;
+          // D1 eWeLink scale matches HomeKit scale of 0-100
+          params.mode = 0;
+          break;
+        case 57:
+          params.channel0 = Math.round((value * 23) / 10 + 25).toString();
+          // Device eWeLink scale is 25-255 and HomeKit scale is 0-100.
+          break;
+        default:
+          return;
+      }
+      await this.platform.sendDeviceUpdate(this.accessory, params);
+      this.cacheSpeed = value;
+      if (this.enableLogging) {
+        this.log('[%s] %s [%s%].', this.name, this.lang.curSpeed, this.cacheSpeed);
+      }
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, true);
+      setTimeout(() => {
+        this.service.updateCharacteristic(this.hapChar.RotationSpeed, this.cacheSpeed);
+      }, 2000);
+      throw new this.hapErr(-70402);
+    }
+  }
+
+  async externalUpdate(params) {
+    try {
+      if (this.accessory.context.eweUIID === 57) {
+        if (params.state && params.state !== this.cacheState) {
+          this.service.updateCharacteristic(this.hapChar.On, params.state === 'on');
+          this.cacheState = params.state;
+          if (params.updateSource && this.enableLogging) {
+            this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState);
+          }
+        }
+      } else if (params.switch && params.switch !== this.cacheState) {
+        this.service.updateCharacteristic(this.hapChar.On, params.switch === 'on');
+        this.cacheState = params.switch;
+        if (params.updateSource && this.enableLogging) {
+          this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState);
+        }
+      }
+
+      switch (this.accessory.context.eweUIID) {
+        case 36:
+          // KING-M4 eWeLink scale is 10-100 and HomeKit scale is 0-100.
+          if (hasProperty(params, 'bright')) {
+            const nb = Math.round(((params.bright - 10) * 10) / 9);
+            if (nb !== this.cacheSpeed) {
+              this.service.updateCharacteristic(this.hapChar.RotationSpeed, nb);
+              this.cacheSpeed = nb;
+              if (params.updateSource && this.enableLogging) {
+                this.log('[%s] %s [%s%].', this.name, this.lang.curSpeed, nb);
+              }
+            }
+          }
+          break;
+        case 44:
+          // D1 eWeLink scale matches HomeKit scale of 0-100
+          if (hasProperty(params, 'brightness')) {
+            const nb = params.brightness;
+            if (nb !== this.cacheSpeed) {
+              this.service.updateCharacteristic(this.hapChar.RotationSpeed, nb);
+              this.cacheSpeed = nb;
+              if (params.updateSource && this.enableLogging) {
+                this.log('[%s] %s [%s%].', this.name, this.lang.curSpeed, nb);
+              }
+            }
+          }
+          break;
+        case 57:
+          // Device eWeLink scale is 25-255 and HomeKit scale is 0-100.
+          if (hasProperty(params, 'channel0')) {
+            const ns = Math.round(((parseInt(params.channel0, 10) - 25) * 10) / 23);
+            if (ns !== this.cacheSpeed) {
+              this.service.updateCharacteristic(this.hapChar.RotationSpeed, ns);
+              this.cacheSpeed = ns;
+              if (params.updateSource && this.enableLogging) {
+                this.log('[%s] %s [%s%].', this.name, this.lang.curSpeed, ns);
+              }
+            }
+          }
+          break;
+        default:
+          return;
+      }
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, false);
+    }
+  }
+
+  markStatus(isOnline) {
+    this.isOnline = isOnline;
+
+    // Show as off if offlineAsOff is enabled
+    if (this.offlineAsOff && !isOnline && this.cacheState !== 'off') {
+      this.service.updateCharacteristic(this.hapChar.On, false);
+      this.cacheState = 'off';
+      if (this.enableLogging) {
+        this.log('[%s] %s [%s - offline]', this.name, this.lang.curState, this.cacheState);
+      }
+    }
+  }
+
+  currentState() {
+    const toReturn = {};
+    toReturn.services = ['light'];
+    toReturn.light = {
+      state: this.service.getCharacteristic(this.hapChar.On).value ? 'on' : 'off',
+      speed: this.service.getCharacteristic(this.hapChar.RotationSpeed).value,
+    };
+    return toReturn;
+  }
+}
diff --git a/lib/device/switch-single.js b/lib/device/switch-single.js
index 5f0b8a87..76030b47 100644
--- a/lib/device/switch-single.js
+++ b/lib/device/switch-single.js
@@ -60,6 +60,9 @@ export default class {
     this.service = this.accessory.getService(this.hapServ.Switch)
       || this.accessory.addService(this.hapServ.Switch);
 
+    // Some models provide a power reading in different decimals
+    this.divisor = 1;
+
     switch (this.accessory.context.eweUIID) {
       case 5:
       case 182:
@@ -82,6 +85,10 @@ export default class {
         if (this.service.testCharacteristic(this.eveChar.Voltage)) {
           this.service.removeCharacteristic(this.service.getCharacteristic(this.eveChar.Voltage));
         }
+
+        if (this.accessory.context.eweUIID === 190) {
+          this.divisor = 100;
+        }
         break;
       case 32:
         // Add Eve power characteristics
@@ -230,8 +237,12 @@ export default class {
         return;
       }
       let logger = false;
+      let power;
+      let voltage;
+      let current;
       if (hasProperty(params, 'power')) {
-        this.service.updateCharacteristic(this.eveChar.CurrentConsumption, parseFloat(params.power));
+        power = Math.round((parseFloat(params.power) * 100) / this.divisor) / 100;
+        this.service.updateCharacteristic(this.eveChar.CurrentConsumption, power);
         this.service.updateCharacteristic(
           this.hapChar.OutletInUse,
           this.cacheState === 'on' && parseFloat(params.power) > this.inUsePowerThreshold,
@@ -239,26 +250,22 @@ export default class {
         logger = true;
       }
       if (hasProperty(params, 'voltage')) {
-        this.service.updateCharacteristic(this.eveChar.Voltage, parseFloat(params.voltage));
+        voltage = Math.round((parseFloat(params.voltage) * 100) / this.divisor) / 100;
+        this.service.updateCharacteristic(this.eveChar.Voltage, voltage);
         logger = true;
       }
       if (hasProperty(params, 'current')) {
-        this.service.updateCharacteristic(this.eveChar.ElectricCurrent, parseFloat(params.current));
+        current = Math.round((parseFloat(params.current) * 100) / this.divisor) / 100;
+        this.service.updateCharacteristic(this.eveChar.ElectricCurrent, current);
         logger = true;
       }
       if (params.updateSource && logger && this.enableLogging) {
         this.log(
           '[%s] %s%s%s.',
           this.name,
-          hasProperty(params, 'power')
-            ? `${this.lang.curPower} [${params.power}W]`
-            : '',
-          hasProperty(params, 'voltage')
-            ? ` ${this.lang.curVolt} [${params.voltage}V]`
-            : '',
-          hasProperty(params, 'current')
-            ? ` ${this.lang.curCurr} [${params.current}A]`
-            : '',
+          power !== undefined ? `${this.lang.curPower} [${power}W]` : '',
+          voltage !== undefined ? ` ${this.lang.curVolt} [${voltage}V]` : '',
+          current !== undefined ? ` ${this.lang.curCurr} [${current}A]` : '',
         );
       }
     } catch (err) {
diff --git a/lib/platform.js b/lib/platform.js
index db50b07b..658e5d68 100644
--- a/lib/platform.js
+++ b/lib/platform.js
@@ -1128,7 +1128,9 @@ export default class {
          LIGHTS [DIMMER]
          ************* */
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
-        accessory.control = new deviceTypes.deviceLightDimmer(this, accessory);
+        accessory.control = device.showAs === 'fan'
+          ? new deviceTypes.sim.deviceLightFan(this, accessory)
+          : new deviceTypes.deviceLightDimmer(this, accessory);
         /** ********** */
         /** ******************* */
       } else if (
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 8df5cae7..f46ceef8 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -127,6 +127,7 @@ export default {
       'deviceId',
       'ignoreDevice',
       'deviceModel',
+      'showAs',
       'brightnessStep',
       'adaptiveLightingShift',
       'offlineAsOff',
@@ -226,6 +227,7 @@ export default {
       'dehumidifier',
       'door',
       'doorbell',
+      'fan',
       'garage',
       'garage_eachen',
       'garage_four',

From 590ebe94c30d5014cde2ad886849319411c823ff Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Sat, 10 Dec 2022 14:18:12 +0000
Subject: [PATCH 3093/3183] 10.3.1-beta.6

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b32d4d0f..a40f664c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "10.3.1-beta.5",
+  "version": "10.3.1-beta.6",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "10.3.1-beta.5",
+      "version": "10.3.1-beta.6",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 56093f42..00e8bcb0 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "10.3.1-beta.5",
+  "version": "10.3.1-beta.6",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From 50383d8fc850227616888b467e8ef6d30874cb0a Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Sun, 18 Dec 2022 22:15:51 +0000
Subject: [PATCH 3094/3183] try a manual lock

---
 lib/device/simulation/lock-one.js | 50 +++++++++++++++++--
 package-lock.json                 | 82 +++++++++++++++----------------
 package.json                      |  2 +-
 3 files changed, 87 insertions(+), 47 deletions(-)

diff --git a/lib/device/simulation/lock-one.js b/lib/device/simulation/lock-one.js
index a96c9808..e6294bdd 100644
--- a/lib/device/simulation/lock-one.js
+++ b/lib/device/simulation/lock-one.js
@@ -22,6 +22,7 @@ export default class {
     // Set up custom variables for this device type
     const deviceConf = platform.deviceConf[accessory.context.eweDeviceId] || {};
     this.operationTime = deviceConf.operationTime || platformConsts.defaultValues.operationTime;
+    this.isManual = this.operationTime === 0;
 
     // Set the correct logging variables for this accessory
     switch (deviceConf.overrideLogging) {
@@ -100,9 +101,13 @@ export default class {
     }
 
     // Add the set handler to the lock target state characteristic
-    this.service.getCharacteristic(this.hapChar.LockTargetState).onSet((value) => {
-      // We don't use await as we want the callback to be run straight away
-      this.internalUpdate(value);
+    this.service.getCharacteristic(this.hapChar.LockTargetState).onSet(async (value) => {
+      if (this.isManual) {
+        await this.internalManualUpdate(value);
+      } else {
+        // We don't use await as we want the callback to be run straight away
+        this.internalTimedUpdate(value);
+      }
     });
 
     // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
@@ -151,7 +156,7 @@ export default class {
     this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts);
   }
 
-  async internalUpdate(value) {
+  async internalTimedUpdate(value) {
     try {
       if (value === 1) {
         this.service.updateCharacteristic(this.hapChar.LockCurrentState, 1);
@@ -209,6 +214,41 @@ export default class {
     }
   }
 
+  async internalManualUpdate(value) {
+    try {
+      const newValue = value === 1 ? 'off' : 'on';
+      const newLang = value === 1 ? this.lang.lockLocked : this.lang.lockUnlocked;
+
+      const params = {};
+      switch (this.setup) {
+        case 'switchSingle':
+          params.switch = newValue;
+          break;
+        case 'switchMulti':
+          params.switches = [
+            {
+              switch: newValue,
+              outlet: 0,
+            },
+          ];
+          break;
+        default:
+          return;
+      }
+
+      await this.platform.sendDeviceUpdate(this.accessory, params);
+      if (this.enableLogging) {
+        this.log('[%s] %s [%s].', this.name, this.lang.curState, newLang);
+      }
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, true);
+      setTimeout(() => {
+        this.service.updateCharacteristic(this.hapChar.LockTargetState, 1);
+      }, 2000);
+      this.service.updateCharacteristic(this.hapChar.LockTargetState, new this.hapErr(-70402));
+    }
+  }
+
   async internalUIUpdate() {
     try {
       // Skip polling if device isn't online
@@ -245,7 +285,7 @@ export default class {
 
   async externalUpdate(params) {
     try {
-      if (!this.inUse) {
+      if (!this.inUse && !this.isManual) {
         if (
           (this.setup === 'switchMulti' && params.switches && params.switches[0].switch === 'on')
           || (this.setup === 'switchSingle' && params.switch && params.switch === 'on')
diff --git a/package-lock.json b/package-lock.json
index a40f664c..47622156 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -35,7 +35,7 @@
         "ws": "^8.11.0"
       },
       "devDependencies": {
-        "eslint": "^8.29.0",
+        "eslint": "^8.30.0",
         "eslint-config-airbnb-base": "^15.0.0",
         "eslint-plugin-import": "^2.26.0",
         "eslint-plugin-import-newlines": "^1.3.0",
@@ -47,15 +47,15 @@
       }
     },
     "node_modules/@eslint/eslintrc": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.3.tgz",
-      "integrity": "sha512-uj3pT6Mg+3t39fvLrj8iuCIJ38zKO9FpGtJ4BBJebJhEwjoT+KLVNCcHT5QC9NGRIEi7fZ0ZR8YRb884auB4Lg==",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.4.0.tgz",
+      "integrity": "sha512-7yfvXy6MWLgWSFsLhz5yH3iQ52St8cdUY6FoGieKkRDVxuxmrNuUetIuu6cmjNWwniUHiWXjxCr5tTXDrbYS5A==",
       "dev": true,
       "dependencies": {
         "ajv": "^6.12.4",
         "debug": "^4.3.2",
         "espree": "^9.4.0",
-        "globals": "^13.15.0",
+        "globals": "^13.19.0",
         "ignore": "^5.2.0",
         "import-fresh": "^3.2.1",
         "js-yaml": "^4.1.0",
@@ -75,9 +75,9 @@
       "integrity": "sha512-axFX7lN2Yd7bz/6SlD7dzq5sY/N9+XYuLHPukuiyHQRDtNMRL1uDqJhOx6RVaN2tYDHB75h7YxRQWP7U44Mgzg=="
     },
     "node_modules/@humanwhocodes/config-array": {
-      "version": "0.11.7",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.7.tgz",
-      "integrity": "sha512-kBbPWzN8oVMLb0hOUYXhmxggL/1cJE6ydvjDIGi9EnAGUyA7cLVKQg+d/Dsm+KZwx2czGHrCmMVLiyg8s5JPKw==",
+      "version": "0.11.8",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.8.tgz",
+      "integrity": "sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g==",
       "dev": true,
       "dependencies": {
         "@humanwhocodes/object-schema": "^1.2.1",
@@ -514,13 +514,13 @@
       }
     },
     "node_modules/eslint": {
-      "version": "8.29.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.29.0.tgz",
-      "integrity": "sha512-isQ4EEiyUjZFbEKvEGJKKGBwXtvXX+zJbkVKCgTuB9t/+jUBcy8avhkEwWJecI15BkRkOYmvIM5ynbhRjEkoeg==",
+      "version": "8.30.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.30.0.tgz",
+      "integrity": "sha512-MGADB39QqYuzEGov+F/qb18r4i7DohCDOfatHaxI2iGlPuC65bwG2gxgO+7DkyL38dRFaRH7RaRAgU6JKL9rMQ==",
       "dev": true,
       "dependencies": {
-        "@eslint/eslintrc": "^1.3.3",
-        "@humanwhocodes/config-array": "^0.11.6",
+        "@eslint/eslintrc": "^1.4.0",
+        "@humanwhocodes/config-array": "^0.11.8",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
         "ajv": "^6.10.0",
@@ -539,7 +539,7 @@
         "file-entry-cache": "^6.0.1",
         "find-up": "^5.0.0",
         "glob-parent": "^6.0.2",
-        "globals": "^13.15.0",
+        "globals": "^13.19.0",
         "grapheme-splitter": "^1.0.4",
         "ignore": "^5.2.0",
         "import-fresh": "^3.0.0",
@@ -1027,9 +1027,9 @@
       }
     },
     "node_modules/globals": {
-      "version": "13.18.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.18.0.tgz",
-      "integrity": "sha512-/mR4KI8Ps2spmoc0Ulu9L7agOF0du1CZNQ3dke8yItYlyKNmGrkONemBbd6V8UTc1Wgcqn21t3WYB7dbRmh6/A==",
+      "version": "13.19.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.19.0.tgz",
+      "integrity": "sha512-dkQ957uSRWHw7CFXLUtUHQI3g3aWApYhfNR2O6jn/907riyTYKVBmxYVROkBcY614FSSeSJh7Xm7SrUWCxvJMQ==",
       "dev": true,
       "dependencies": {
         "type-fest": "^0.20.2"
@@ -1173,11 +1173,11 @@
       "dev": true
     },
     "node_modules/internal-slot": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz",
-      "integrity": "sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.4.tgz",
+      "integrity": "sha512-tA8URYccNzMo94s5MQZgH8NB/XTa6HsOo0MLfXTKKEnHVVdegzaQoFZ7Jp44bdvLvY2waT5dc+j5ICEswhi7UQ==",
       "dependencies": {
-        "get-intrinsic": "^1.1.0",
+        "get-intrinsic": "^1.1.3",
         "has": "^1.0.3",
         "side-channel": "^1.0.4"
       },
@@ -2180,15 +2180,15 @@
   },
   "dependencies": {
     "@eslint/eslintrc": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.3.tgz",
-      "integrity": "sha512-uj3pT6Mg+3t39fvLrj8iuCIJ38zKO9FpGtJ4BBJebJhEwjoT+KLVNCcHT5QC9NGRIEi7fZ0ZR8YRb884auB4Lg==",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.4.0.tgz",
+      "integrity": "sha512-7yfvXy6MWLgWSFsLhz5yH3iQ52St8cdUY6FoGieKkRDVxuxmrNuUetIuu6cmjNWwniUHiWXjxCr5tTXDrbYS5A==",
       "dev": true,
       "requires": {
         "ajv": "^6.12.4",
         "debug": "^4.3.2",
         "espree": "^9.4.0",
-        "globals": "^13.15.0",
+        "globals": "^13.19.0",
         "ignore": "^5.2.0",
         "import-fresh": "^3.2.1",
         "js-yaml": "^4.1.0",
@@ -2202,9 +2202,9 @@
       "integrity": "sha512-axFX7lN2Yd7bz/6SlD7dzq5sY/N9+XYuLHPukuiyHQRDtNMRL1uDqJhOx6RVaN2tYDHB75h7YxRQWP7U44Mgzg=="
     },
     "@humanwhocodes/config-array": {
-      "version": "0.11.7",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.7.tgz",
-      "integrity": "sha512-kBbPWzN8oVMLb0hOUYXhmxggL/1cJE6ydvjDIGi9EnAGUyA7cLVKQg+d/Dsm+KZwx2czGHrCmMVLiyg8s5JPKw==",
+      "version": "0.11.8",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.8.tgz",
+      "integrity": "sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g==",
       "dev": true,
       "requires": {
         "@humanwhocodes/object-schema": "^1.2.1",
@@ -2530,13 +2530,13 @@
       "dev": true
     },
     "eslint": {
-      "version": "8.29.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.29.0.tgz",
-      "integrity": "sha512-isQ4EEiyUjZFbEKvEGJKKGBwXtvXX+zJbkVKCgTuB9t/+jUBcy8avhkEwWJecI15BkRkOYmvIM5ynbhRjEkoeg==",
+      "version": "8.30.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.30.0.tgz",
+      "integrity": "sha512-MGADB39QqYuzEGov+F/qb18r4i7DohCDOfatHaxI2iGlPuC65bwG2gxgO+7DkyL38dRFaRH7RaRAgU6JKL9rMQ==",
       "dev": true,
       "requires": {
-        "@eslint/eslintrc": "^1.3.3",
-        "@humanwhocodes/config-array": "^0.11.6",
+        "@eslint/eslintrc": "^1.4.0",
+        "@humanwhocodes/config-array": "^0.11.8",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
         "ajv": "^6.10.0",
@@ -2555,7 +2555,7 @@
         "file-entry-cache": "^6.0.1",
         "find-up": "^5.0.0",
         "glob-parent": "^6.0.2",
-        "globals": "^13.15.0",
+        "globals": "^13.19.0",
         "grapheme-splitter": "^1.0.4",
         "ignore": "^5.2.0",
         "import-fresh": "^3.0.0",
@@ -2916,9 +2916,9 @@
       }
     },
     "globals": {
-      "version": "13.18.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.18.0.tgz",
-      "integrity": "sha512-/mR4KI8Ps2spmoc0Ulu9L7agOF0du1CZNQ3dke8yItYlyKNmGrkONemBbd6V8UTc1Wgcqn21t3WYB7dbRmh6/A==",
+      "version": "13.19.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.19.0.tgz",
+      "integrity": "sha512-dkQ957uSRWHw7CFXLUtUHQI3g3aWApYhfNR2O6jn/907riyTYKVBmxYVROkBcY614FSSeSJh7Xm7SrUWCxvJMQ==",
       "dev": true,
       "requires": {
         "type-fest": "^0.20.2"
@@ -3017,11 +3017,11 @@
       "dev": true
     },
     "internal-slot": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz",
-      "integrity": "sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.4.tgz",
+      "integrity": "sha512-tA8URYccNzMo94s5MQZgH8NB/XTa6HsOo0MLfXTKKEnHVVdegzaQoFZ7Jp44bdvLvY2waT5dc+j5ICEswhi7UQ==",
       "requires": {
-        "get-intrinsic": "^1.1.0",
+        "get-intrinsic": "^1.1.3",
         "has": "^1.0.3",
         "side-channel": "^1.0.4"
       }
diff --git a/package.json b/package.json
index 00e8bcb0..8c148063 100644
--- a/package.json
+++ b/package.json
@@ -71,6 +71,6 @@
     "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-import-newlines": "^1.3.0",
     "eslint-plugin-sort-exports": "^0.8.0",
-    "eslint": "^8.29.0"
+    "eslint": "^8.30.0"
   }
 }

From 5ace67962321eec065fee08902e2ab868753e163 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Sun, 18 Dec 2022 22:16:08 +0000
Subject: [PATCH 3095/3183] 10.3.1-beta.7

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 47622156..59230aa8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "10.3.1-beta.6",
+  "version": "10.3.1-beta.7",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "10.3.1-beta.6",
+      "version": "10.3.1-beta.7",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 8c148063..8bcc5bb5 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "10.3.1-beta.6",
+  "version": "10.3.1-beta.7",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From 5c2ec69249963e38b6807a495c0dc553b4b3184d Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Sat, 31 Dec 2022 14:24:48 +0000
Subject: [PATCH 3096/3183] packages

---
 package-lock.json | 72 +++++++++++++++++++++++------------------------
 package.json      |  8 +++---
 2 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 59230aa8..97b9a081 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -28,28 +28,28 @@
       "license": "MIT",
       "dependencies": {
         "@homebridge/plugin-ui-utils": "^0.0.19",
-        "axios": "^1.2.1",
+        "axios": "^1.2.2",
         "node-persist": "^3.1.0",
         "p-queue": "^7.3.0",
         "websocket-as-promised": "^2.0.1",
         "ws": "^8.11.0"
       },
       "devDependencies": {
-        "eslint": "^8.30.0",
+        "eslint": "^8.31.0",
         "eslint-config-airbnb-base": "^15.0.0",
         "eslint-plugin-import": "^2.26.0",
         "eslint-plugin-import-newlines": "^1.3.0",
         "eslint-plugin-sort-exports": "^0.8.0"
       },
       "engines": {
-        "homebridge": "^1.6.0 || 2.0.0-beta.0",
-        "node": "^14.21.1 || ^16.18.1 || ^18.12.1"
+        "homebridge": "^1.5.0 || 2.0.0-beta.0",
+        "node": "^14.21.2 || ^16.19.0 || ^18.12.1"
       }
     },
     "node_modules/@eslint/eslintrc": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.4.0.tgz",
-      "integrity": "sha512-7yfvXy6MWLgWSFsLhz5yH3iQ52St8cdUY6FoGieKkRDVxuxmrNuUetIuu6cmjNWwniUHiWXjxCr5tTXDrbYS5A==",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.4.1.tgz",
+      "integrity": "sha512-XXrH9Uarn0stsyldqDYq8r++mROmWRI1xKMXa640Bb//SY1+ECYX6VzT6Lcx5frD0V30XieqJ0oX9I2Xj5aoMA==",
       "dev": true,
       "dependencies": {
         "ajv": "^6.12.4",
@@ -258,9 +258,9 @@
       "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
     },
     "node_modules/axios": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.2.1.tgz",
-      "integrity": "sha512-I88cFiGu9ryt/tfVEi4kX2SITsvDddTajXTOFmt2uK1ZVA8LytjtdeyefdQWEf5PU8w+4SSJDoYnggflB5tW4A==",
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.2.2.tgz",
+      "integrity": "sha512-bz/J4gS2S3I7mpN/YZfGFTqhXTYzRho8Ay38w2otuuDR322KzFIWm/4W2K6gIwvWaws5n+mnb7D1lN9uD+QH6Q==",
       "dependencies": {
         "follow-redirects": "^1.15.0",
         "form-data": "^4.0.0",
@@ -514,12 +514,12 @@
       }
     },
     "node_modules/eslint": {
-      "version": "8.30.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.30.0.tgz",
-      "integrity": "sha512-MGADB39QqYuzEGov+F/qb18r4i7DohCDOfatHaxI2iGlPuC65bwG2gxgO+7DkyL38dRFaRH7RaRAgU6JKL9rMQ==",
+      "version": "8.31.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.31.0.tgz",
+      "integrity": "sha512-0tQQEVdmPZ1UtUKXjX7EMm9BlgJ08G90IhWh0PKDCb3ZLsgAOHI8fYSIzYVZej92zsgq+ft0FGsxhJ3xo2tbuA==",
       "dev": true,
       "dependencies": {
-        "@eslint/eslintrc": "^1.4.0",
+        "@eslint/eslintrc": "^1.4.1",
         "@humanwhocodes/config-array": "^0.11.8",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
@@ -1123,9 +1123,9 @@
       }
     },
     "node_modules/ignore": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.1.tgz",
-      "integrity": "sha512-d2qQLzTJ9WxQftPAuEQpSPmKqzxePjzVbpAVv62AQ64NTL+wR4JkrVqR/LqFsFEUsHDAiId52mJteHDFuDkElA==",
+      "version": "5.2.4",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz",
+      "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==",
       "dev": true,
       "engines": {
         "node": ">= 4"
@@ -1409,9 +1409,9 @@
       "dev": true
     },
     "node_modules/json5": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
+      "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
       "dev": true,
       "dependencies": {
         "minimist": "^1.2.0"
@@ -2180,9 +2180,9 @@
   },
   "dependencies": {
     "@eslint/eslintrc": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.4.0.tgz",
-      "integrity": "sha512-7yfvXy6MWLgWSFsLhz5yH3iQ52St8cdUY6FoGieKkRDVxuxmrNuUetIuu6cmjNWwniUHiWXjxCr5tTXDrbYS5A==",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.4.1.tgz",
+      "integrity": "sha512-XXrH9Uarn0stsyldqDYq8r++mROmWRI1xKMXa640Bb//SY1+ECYX6VzT6Lcx5frD0V30XieqJ0oX9I2Xj5aoMA==",
       "dev": true,
       "requires": {
         "ajv": "^6.12.4",
@@ -2333,9 +2333,9 @@
       "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
     },
     "axios": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.2.1.tgz",
-      "integrity": "sha512-I88cFiGu9ryt/tfVEi4kX2SITsvDddTajXTOFmt2uK1ZVA8LytjtdeyefdQWEf5PU8w+4SSJDoYnggflB5tW4A==",
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.2.2.tgz",
+      "integrity": "sha512-bz/J4gS2S3I7mpN/YZfGFTqhXTYzRho8Ay38w2otuuDR322KzFIWm/4W2K6gIwvWaws5n+mnb7D1lN9uD+QH6Q==",
       "requires": {
         "follow-redirects": "^1.15.0",
         "form-data": "^4.0.0",
@@ -2530,12 +2530,12 @@
       "dev": true
     },
     "eslint": {
-      "version": "8.30.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.30.0.tgz",
-      "integrity": "sha512-MGADB39QqYuzEGov+F/qb18r4i7DohCDOfatHaxI2iGlPuC65bwG2gxgO+7DkyL38dRFaRH7RaRAgU6JKL9rMQ==",
+      "version": "8.31.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.31.0.tgz",
+      "integrity": "sha512-0tQQEVdmPZ1UtUKXjX7EMm9BlgJ08G90IhWh0PKDCb3ZLsgAOHI8fYSIzYVZej92zsgq+ft0FGsxhJ3xo2tbuA==",
       "dev": true,
       "requires": {
-        "@eslint/eslintrc": "^1.4.0",
+        "@eslint/eslintrc": "^1.4.1",
         "@humanwhocodes/config-array": "^0.11.8",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
@@ -2979,9 +2979,9 @@
       }
     },
     "ignore": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.1.tgz",
-      "integrity": "sha512-d2qQLzTJ9WxQftPAuEQpSPmKqzxePjzVbpAVv62AQ64NTL+wR4JkrVqR/LqFsFEUsHDAiId52mJteHDFuDkElA==",
+      "version": "5.2.4",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz",
+      "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==",
       "dev": true
     },
     "import-fresh": {
@@ -3174,9 +3174,9 @@
       "dev": true
     },
     "json5": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
+      "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
       "dev": true,
       "requires": {
         "minimist": "^1.2.0"
diff --git a/package.json b/package.json
index 8bcc5bb5..5380f10e 100644
--- a/package.json
+++ b/package.json
@@ -30,8 +30,8 @@
     "rebuild": "rm -rf package-lock.json && rm -rf node_modules && npm install"
   },
   "engines": {
-    "homebridge": "^1.6.0 || 2.0.0-beta.0",
-    "node": "^14.21.1 || ^16.18.1 || ^18.12.1"
+    "homebridge": "^1.5.0 || 2.0.0-beta.0",
+    "node": "^14.21.2 || ^16.19.0 || ^18.12.1"
   },
   "repository": {
     "type": "git",
@@ -60,7 +60,7 @@
   ],
   "dependencies": {
     "@homebridge/plugin-ui-utils": "^0.0.19",
-    "axios": "^1.2.1",
+    "axios": "^1.2.2",
     "node-persist": "^3.1.0",
     "p-queue": "^7.3.0",
     "websocket-as-promised": "^2.0.1",
@@ -71,6 +71,6 @@
     "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-import-newlines": "^1.3.0",
     "eslint-plugin-sort-exports": "^0.8.0",
-    "eslint": "^8.30.0"
+    "eslint": "^8.31.0"
   }
 }

From f9fbc602b9c6eaebb45474e94c23b34f2e574538 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Mon, 2 Jan 2023 13:01:37 +0000
Subject: [PATCH 3097/3183] Update package-lock.json

---
 package-lock.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 97b9a081..e9f858cd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -843,9 +843,9 @@
       "dev": true
     },
     "node_modules/fastq": {
-      "version": "1.14.0",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.14.0.tgz",
-      "integrity": "sha512-eR2D+V9/ExcbF9ls441yIuN6TI2ED1Y2ZcA5BmMtJsOkWOFRJQ0Jt0g1UwqXJJVAb+V+umH5Dfr8oh4EVP7VVg==",
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz",
+      "integrity": "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==",
       "dev": true,
       "dependencies": {
         "reusify": "^1.0.4"
@@ -2788,9 +2788,9 @@
       "dev": true
     },
     "fastq": {
-      "version": "1.14.0",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.14.0.tgz",
-      "integrity": "sha512-eR2D+V9/ExcbF9ls441yIuN6TI2ED1Y2ZcA5BmMtJsOkWOFRJQ0Jt0g1UwqXJJVAb+V+umH5Dfr8oh4EVP7VVg==",
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz",
+      "integrity": "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==",
       "dev": true,
       "requires": {
         "reusify": "^1.0.4"

From 04d204dd53d99fc8972e8e324d0089cf9c32f9c8 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 7 Jan 2023 02:17:29 +0000
Subject: [PATCH 3098/3183] prep new vsion

---
 CHANGELOG.md      |   8 +-
 package-lock.json | 239 +++++++++++++++++++++++++++++++++++++++++++---
 package.json      |   4 +-
 3 files changed, 236 insertions(+), 15 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e3e603d9..55768c4d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,13 +4,19 @@ All notable changes to homebridge-ewelink will be documented in this file.
 
 ⚠️ Note that Node 14 will no longer be supported after April 2023
 
-## BETA
+## 10.4.0 (2023-01-07)
 
 ### Added
 
 - Expose a Sonoff D1 or KING-M4 as a fan accessory type
 - Improved support for SwitchMan devices (Sonoff R5)
 
+### Changed
+
+- Bump `axios` to v1.2.2
+- Bump `homebridge` recommended version to v1.6.0 or v2.0.0-beta
+- Bump `node` recommended versions to v14.21.2 or v16.19.0 or v18.13.0
+
 ### Fixed
 
 - Power readings for POWR320 now show correctly
diff --git a/package-lock.json b/package-lock.json
index e9f858cd..947cf7ae 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -42,8 +42,8 @@
         "eslint-plugin-sort-exports": "^0.8.0"
       },
       "engines": {
-        "homebridge": "^1.5.0 || 2.0.0-beta.0",
-        "node": "^14.21.2 || ^16.19.0 || ^18.12.1"
+        "homebridge": "^1.6.0 || 2.0.0-beta.0",
+        "node": "^14.21.2 || ^16.19.0 || ^18.13.0"
       }
     },
     "node_modules/@eslint/eslintrc": {
@@ -257,6 +257,17 @@
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
       "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
     },
+    "node_modules/available-typed-arrays": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz",
+      "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/axios": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/axios/-/axios-1.2.2.tgz",
@@ -439,26 +450,31 @@
       }
     },
     "node_modules/es-abstract": {
-      "version": "1.20.5",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.5.tgz",
-      "integrity": "sha512-7h8MM2EQhsCA7pU/Nv78qOXFpD8Rhqd12gYiSJVkrH9+e8VuA8JlPJK/hQjjlLv6pJvx/z1iRFKzYb0XT/RuAQ==",
+      "version": "1.21.0",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.21.0.tgz",
+      "integrity": "sha512-GUGtW7eXQay0c+PRq0sGIKSdaBorfVqsCMhGHo4elP7YVqZu9nCZS4UkK4gv71gOWNMra/PaSKD3ao1oWExO0g==",
       "dependencies": {
         "call-bind": "^1.0.2",
+        "es-set-tostringtag": "^2.0.0",
         "es-to-primitive": "^1.2.1",
         "function-bind": "^1.1.1",
         "function.prototype.name": "^1.1.5",
         "get-intrinsic": "^1.1.3",
         "get-symbol-description": "^1.0.0",
+        "globalthis": "^1.0.3",
         "gopd": "^1.0.1",
         "has": "^1.0.3",
         "has-property-descriptors": "^1.0.0",
+        "has-proto": "^1.0.1",
         "has-symbols": "^1.0.3",
-        "internal-slot": "^1.0.3",
+        "internal-slot": "^1.0.4",
+        "is-array-buffer": "^3.0.0",
         "is-callable": "^1.2.7",
         "is-negative-zero": "^2.0.2",
         "is-regex": "^1.1.4",
         "is-shared-array-buffer": "^1.0.2",
         "is-string": "^1.0.7",
+        "is-typed-array": "^1.1.10",
         "is-weakref": "^1.0.2",
         "object-inspect": "^1.12.2",
         "object-keys": "^1.1.1",
@@ -467,7 +483,9 @@
         "safe-regex-test": "^1.0.0",
         "string.prototype.trimend": "^1.0.6",
         "string.prototype.trimstart": "^1.0.6",
-        "unbox-primitive": "^1.0.2"
+        "typed-array-length": "^1.0.4",
+        "unbox-primitive": "^1.0.2",
+        "which-typed-array": "^1.1.9"
       },
       "engines": {
         "node": ">= 0.4"
@@ -476,6 +494,19 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/es-set-tostringtag": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz",
+      "integrity": "sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==",
+      "dependencies": {
+        "get-intrinsic": "^1.1.3",
+        "has": "^1.0.3",
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/es-shim-unscopables": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz",
@@ -917,6 +948,14 @@
         }
       }
     },
+    "node_modules/for-each": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
+      "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==",
+      "dependencies": {
+        "is-callable": "^1.1.3"
+      }
+    },
     "node_modules/form-data": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
@@ -1041,6 +1080,20 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/globalthis": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz",
+      "integrity": "sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==",
+      "dependencies": {
+        "define-properties": "^1.1.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/gopd": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
@@ -1097,6 +1150,17 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/has-proto": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz",
+      "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/has-symbols": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
@@ -1185,6 +1249,19 @@
         "node": ">= 0.4"
       }
     },
+    "node_modules/is-array-buffer": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.1.tgz",
+      "integrity": "sha512-ASfLknmY8Xa2XtB4wmbz13Wu202baeA18cJBCeCy0wXUHZF0IPyVEXqKEcd+t2fNSLLL1vC6k7lxZEojNbISXQ==",
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.1.3",
+        "is-typed-array": "^1.1.10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/is-bigint": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
@@ -1357,6 +1434,24 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/is-typed-array": {
+      "version": "1.1.10",
+      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.10.tgz",
+      "integrity": "sha512-PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A==",
+      "dependencies": {
+        "available-typed-arrays": "^1.0.5",
+        "call-bind": "^1.0.2",
+        "for-each": "^0.3.3",
+        "gopd": "^1.0.1",
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/is-weakref": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
@@ -2063,6 +2158,19 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/typed-array-length": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.4.tgz",
+      "integrity": "sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==",
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "for-each": "^0.3.3",
+        "is-typed-array": "^1.1.9"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/unbox-primitive": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
@@ -2130,6 +2238,25 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/which-typed-array": {
+      "version": "1.1.9",
+      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.9.tgz",
+      "integrity": "sha512-w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA==",
+      "dependencies": {
+        "available-typed-arrays": "^1.0.5",
+        "call-bind": "^1.0.2",
+        "for-each": "^0.3.3",
+        "gopd": "^1.0.1",
+        "has-tostringtag": "^1.0.0",
+        "is-typed-array": "^1.1.10"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/word-wrap": {
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
@@ -2332,6 +2459,11 @@
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
       "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
     },
+    "available-typed-arrays": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz",
+      "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw=="
+    },
     "axios": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/axios/-/axios-1.2.2.tgz",
@@ -2473,26 +2605,31 @@
       }
     },
     "es-abstract": {
-      "version": "1.20.5",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.5.tgz",
-      "integrity": "sha512-7h8MM2EQhsCA7pU/Nv78qOXFpD8Rhqd12gYiSJVkrH9+e8VuA8JlPJK/hQjjlLv6pJvx/z1iRFKzYb0XT/RuAQ==",
+      "version": "1.21.0",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.21.0.tgz",
+      "integrity": "sha512-GUGtW7eXQay0c+PRq0sGIKSdaBorfVqsCMhGHo4elP7YVqZu9nCZS4UkK4gv71gOWNMra/PaSKD3ao1oWExO0g==",
       "requires": {
         "call-bind": "^1.0.2",
+        "es-set-tostringtag": "^2.0.0",
         "es-to-primitive": "^1.2.1",
         "function-bind": "^1.1.1",
         "function.prototype.name": "^1.1.5",
         "get-intrinsic": "^1.1.3",
         "get-symbol-description": "^1.0.0",
+        "globalthis": "^1.0.3",
         "gopd": "^1.0.1",
         "has": "^1.0.3",
         "has-property-descriptors": "^1.0.0",
+        "has-proto": "^1.0.1",
         "has-symbols": "^1.0.3",
-        "internal-slot": "^1.0.3",
+        "internal-slot": "^1.0.4",
+        "is-array-buffer": "^3.0.0",
         "is-callable": "^1.2.7",
         "is-negative-zero": "^2.0.2",
         "is-regex": "^1.1.4",
         "is-shared-array-buffer": "^1.0.2",
         "is-string": "^1.0.7",
+        "is-typed-array": "^1.1.10",
         "is-weakref": "^1.0.2",
         "object-inspect": "^1.12.2",
         "object-keys": "^1.1.1",
@@ -2501,7 +2638,19 @@
         "safe-regex-test": "^1.0.0",
         "string.prototype.trimend": "^1.0.6",
         "string.prototype.trimstart": "^1.0.6",
-        "unbox-primitive": "^1.0.2"
+        "typed-array-length": "^1.0.4",
+        "unbox-primitive": "^1.0.2",
+        "which-typed-array": "^1.1.9"
+      }
+    },
+    "es-set-tostringtag": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz",
+      "integrity": "sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==",
+      "requires": {
+        "get-intrinsic": "^1.1.3",
+        "has": "^1.0.3",
+        "has-tostringtag": "^1.0.0"
       }
     },
     "es-shim-unscopables": {
@@ -2836,6 +2985,14 @@
       "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz",
       "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA=="
     },
+    "for-each": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
+      "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==",
+      "requires": {
+        "is-callable": "^1.1.3"
+      }
+    },
     "form-data": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
@@ -2924,6 +3081,14 @@
         "type-fest": "^0.20.2"
       }
     },
+    "globalthis": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz",
+      "integrity": "sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==",
+      "requires": {
+        "define-properties": "^1.1.3"
+      }
+    },
     "gopd": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
@@ -2965,6 +3130,11 @@
         "get-intrinsic": "^1.1.1"
       }
     },
+    "has-proto": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz",
+      "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg=="
+    },
     "has-symbols": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
@@ -3026,6 +3196,16 @@
         "side-channel": "^1.0.4"
       }
     },
+    "is-array-buffer": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.1.tgz",
+      "integrity": "sha512-ASfLknmY8Xa2XtB4wmbz13Wu202baeA18cJBCeCy0wXUHZF0IPyVEXqKEcd+t2fNSLLL1vC6k7lxZEojNbISXQ==",
+      "requires": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.1.3",
+        "is-typed-array": "^1.1.10"
+      }
+    },
     "is-bigint": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
@@ -3132,6 +3312,18 @@
         "has-symbols": "^1.0.2"
       }
     },
+    "is-typed-array": {
+      "version": "1.1.10",
+      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.10.tgz",
+      "integrity": "sha512-PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A==",
+      "requires": {
+        "available-typed-arrays": "^1.0.5",
+        "call-bind": "^1.0.2",
+        "for-each": "^0.3.3",
+        "gopd": "^1.0.1",
+        "has-tostringtag": "^1.0.0"
+      }
+    },
     "is-weakref": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
@@ -3613,6 +3805,16 @@
       "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
       "dev": true
     },
+    "typed-array-length": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.4.tgz",
+      "integrity": "sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==",
+      "requires": {
+        "call-bind": "^1.0.2",
+        "for-each": "^0.3.3",
+        "is-typed-array": "^1.1.9"
+      }
+    },
     "unbox-primitive": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
@@ -3665,6 +3867,19 @@
         "is-symbol": "^1.0.3"
       }
     },
+    "which-typed-array": {
+      "version": "1.1.9",
+      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.9.tgz",
+      "integrity": "sha512-w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA==",
+      "requires": {
+        "available-typed-arrays": "^1.0.5",
+        "call-bind": "^1.0.2",
+        "for-each": "^0.3.3",
+        "gopd": "^1.0.1",
+        "has-tostringtag": "^1.0.0",
+        "is-typed-array": "^1.1.10"
+      }
+    },
     "word-wrap": {
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
diff --git a/package.json b/package.json
index 5380f10e..d3a56945 100644
--- a/package.json
+++ b/package.json
@@ -30,8 +30,8 @@
     "rebuild": "rm -rf package-lock.json && rm -rf node_modules && npm install"
   },
   "engines": {
-    "homebridge": "^1.5.0 || 2.0.0-beta.0",
-    "node": "^14.21.2 || ^16.19.0 || ^18.12.1"
+    "homebridge": "^1.6.0 || 2.0.0-beta.0",
+    "node": "^14.21.2 || ^16.19.0 || ^18.13.0"
   },
   "repository": {
     "type": "git",

From 56ea0e8f4be2ce884a93a040ac7aabd99341090a Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sat, 7 Jan 2023 02:18:27 +0000
Subject: [PATCH 3099/3183] 10.4.0

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 947cf7ae..3f4d95bd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "10.3.1-beta.7",
+  "version": "10.4.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "10.3.1-beta.7",
+      "version": "10.4.0",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index d3a56945..6498a901 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "10.3.1-beta.7",
+  "version": "10.4.0",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From 007bd26937f6921954eb7ea109ff14c4e6af3faf Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Fri, 20 Jan 2023 00:12:22 +0000
Subject: [PATCH 3100/3183] packages

---
 package-lock.json | 216 ++++++++++++++++++++++++++--------------------
 package.json      |   8 +-
 2 files changed, 125 insertions(+), 99 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 3f4d95bd..57bb6504 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -28,16 +28,16 @@
       "license": "MIT",
       "dependencies": {
         "@homebridge/plugin-ui-utils": "^0.0.19",
-        "axios": "^1.2.2",
+        "axios": "^1.2.3",
         "node-persist": "^3.1.0",
         "p-queue": "^7.3.0",
         "websocket-as-promised": "^2.0.1",
-        "ws": "^8.11.0"
+        "ws": "^8.12.0"
       },
       "devDependencies": {
-        "eslint": "^8.31.0",
+        "eslint": "^8.32.0",
         "eslint-config-airbnb-base": "^15.0.0",
-        "eslint-plugin-import": "^2.26.0",
+        "eslint-plugin-import": "^2.27.5",
         "eslint-plugin-import-newlines": "^1.3.0",
         "eslint-plugin-sort-exports": "^0.8.0"
       },
@@ -252,6 +252,24 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/array.prototype.flatmap": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.1.tgz",
+      "integrity": "sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4",
+        "es-shim-unscopables": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
@@ -269,9 +287,9 @@
       }
     },
     "node_modules/axios": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.2.2.tgz",
-      "integrity": "sha512-bz/J4gS2S3I7mpN/YZfGFTqhXTYzRho8Ay38w2otuuDR322KzFIWm/4W2K6gIwvWaws5n+mnb7D1lN9uD+QH6Q==",
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.2.3.tgz",
+      "integrity": "sha512-pdDkMYJeuXLZ6Xj/Q5J3Phpe+jbGdsSzlQaFVkMQzRUL05+6+tetX8TV3p4HrU4kzuO9bt+io/yGQxuyxA/xcw==",
       "dependencies": {
         "follow-redirects": "^1.15.0",
         "form-data": "^4.0.0",
@@ -450,12 +468,13 @@
       }
     },
     "node_modules/es-abstract": {
-      "version": "1.21.0",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.21.0.tgz",
-      "integrity": "sha512-GUGtW7eXQay0c+PRq0sGIKSdaBorfVqsCMhGHo4elP7YVqZu9nCZS4UkK4gv71gOWNMra/PaSKD3ao1oWExO0g==",
+      "version": "1.21.1",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.21.1.tgz",
+      "integrity": "sha512-QudMsPOz86xYz/1dG1OuGBKOELjCh99IIWHLzy5znUB6j8xG2yMA7bfTV86VSqKF+Y/H08vQPR+9jyXpuC6hfg==",
       "dependencies": {
+        "available-typed-arrays": "^1.0.5",
         "call-bind": "^1.0.2",
-        "es-set-tostringtag": "^2.0.0",
+        "es-set-tostringtag": "^2.0.1",
         "es-to-primitive": "^1.2.1",
         "function-bind": "^1.1.1",
         "function.prototype.name": "^1.1.5",
@@ -468,7 +487,7 @@
         "has-proto": "^1.0.1",
         "has-symbols": "^1.0.3",
         "internal-slot": "^1.0.4",
-        "is-array-buffer": "^3.0.0",
+        "is-array-buffer": "^3.0.1",
         "is-callable": "^1.2.7",
         "is-negative-zero": "^2.0.2",
         "is-regex": "^1.1.4",
@@ -545,9 +564,9 @@
       }
     },
     "node_modules/eslint": {
-      "version": "8.31.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.31.0.tgz",
-      "integrity": "sha512-0tQQEVdmPZ1UtUKXjX7EMm9BlgJ08G90IhWh0PKDCb3ZLsgAOHI8fYSIzYVZej92zsgq+ft0FGsxhJ3xo2tbuA==",
+      "version": "8.32.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.32.0.tgz",
+      "integrity": "sha512-nETVXpnthqKPFyuY2FNjz/bEd6nbosRgKbkgS/y1C7LJop96gYHWpiguLecMHQ2XCPxn77DS0P+68WzG6vkZSQ==",
       "dev": true,
       "dependencies": {
         "@eslint/eslintrc": "^1.4.1",
@@ -620,13 +639,14 @@
       }
     },
     "node_modules/eslint-import-resolver-node": {
-      "version": "0.3.6",
-      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz",
-      "integrity": "sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw==",
+      "version": "0.3.7",
+      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.7.tgz",
+      "integrity": "sha512-gozW2blMLJCeFpBwugLTGyvVjNoeo1knonXAcatC6bjPBZitotxdWf7Gimr25N4c0AAOo4eOUfaG82IJPDpqCA==",
       "dev": true,
       "dependencies": {
         "debug": "^3.2.7",
-        "resolve": "^1.20.0"
+        "is-core-module": "^2.11.0",
+        "resolve": "^1.22.1"
       }
     },
     "node_modules/eslint-import-resolver-node/node_modules/debug": {
@@ -665,23 +685,25 @@
       }
     },
     "node_modules/eslint-plugin-import": {
-      "version": "2.26.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz",
-      "integrity": "sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA==",
+      "version": "2.27.5",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.27.5.tgz",
+      "integrity": "sha512-LmEt3GVofgiGuiE+ORpnvP+kAm3h6MLZJ4Q5HCyHADofsb4VzXFsRiWj3c0OFiV+3DWFh0qg3v9gcPlfc3zRow==",
       "dev": true,
       "dependencies": {
-        "array-includes": "^3.1.4",
-        "array.prototype.flat": "^1.2.5",
-        "debug": "^2.6.9",
+        "array-includes": "^3.1.6",
+        "array.prototype.flat": "^1.3.1",
+        "array.prototype.flatmap": "^1.3.1",
+        "debug": "^3.2.7",
         "doctrine": "^2.1.0",
-        "eslint-import-resolver-node": "^0.3.6",
-        "eslint-module-utils": "^2.7.3",
+        "eslint-import-resolver-node": "^0.3.7",
+        "eslint-module-utils": "^2.7.4",
         "has": "^1.0.3",
-        "is-core-module": "^2.8.1",
+        "is-core-module": "^2.11.0",
         "is-glob": "^4.0.3",
         "minimatch": "^3.1.2",
-        "object.values": "^1.1.5",
-        "resolve": "^1.22.0",
+        "object.values": "^1.1.6",
+        "resolve": "^1.22.1",
+        "semver": "^6.3.0",
         "tsconfig-paths": "^3.14.1"
       },
       "engines": {
@@ -707,12 +729,12 @@
       }
     },
     "node_modules/eslint-plugin-import/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
       "dev": true,
       "dependencies": {
-        "ms": "2.0.0"
+        "ms": "^2.1.1"
       }
     },
     "node_modules/eslint-plugin-import/node_modules/doctrine": {
@@ -727,12 +749,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/eslint-plugin-import/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-      "dev": true
-    },
     "node_modules/eslint-plugin-sort-exports": {
       "version": "0.8.0",
       "resolved": "https://registry.npmjs.org/eslint-plugin-sort-exports/-/eslint-plugin-sort-exports-0.8.0.tgz",
@@ -1610,9 +1626,9 @@
       }
     },
     "node_modules/object-inspect": {
-      "version": "1.12.2",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz",
-      "integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==",
+      "version": "1.12.3",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz",
+      "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==",
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -1847,9 +1863,9 @@
       "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="
     },
     "node_modules/punycode": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz",
+      "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==",
       "dev": true,
       "engines": {
         "node": ">=6"
@@ -2273,15 +2289,15 @@
       "dev": true
     },
     "node_modules/ws": {
-      "version": "8.11.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.11.0.tgz",
-      "integrity": "sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==",
+      "version": "8.12.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.12.0.tgz",
+      "integrity": "sha512-kU62emKIdKVeEIOIKVegvqpXMSTAMLJozpHZaJNDYqBjzlSYXQGviYwN1osDLJ9av68qHd4a2oSjd7yD4pacig==",
       "engines": {
         "node": ">=10.0.0"
       },
       "peerDependencies": {
         "bufferutil": "^4.0.1",
-        "utf-8-validate": "^5.0.2"
+        "utf-8-validate": ">=5.0.2"
       },
       "peerDependenciesMeta": {
         "bufferutil": {
@@ -2454,6 +2470,18 @@
         "es-shim-unscopables": "^1.0.0"
       }
     },
+    "array.prototype.flatmap": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.1.tgz",
+      "integrity": "sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4",
+        "es-shim-unscopables": "^1.0.0"
+      }
+    },
     "asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
@@ -2465,9 +2493,9 @@
       "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw=="
     },
     "axios": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.2.2.tgz",
-      "integrity": "sha512-bz/J4gS2S3I7mpN/YZfGFTqhXTYzRho8Ay38w2otuuDR322KzFIWm/4W2K6gIwvWaws5n+mnb7D1lN9uD+QH6Q==",
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.2.3.tgz",
+      "integrity": "sha512-pdDkMYJeuXLZ6Xj/Q5J3Phpe+jbGdsSzlQaFVkMQzRUL05+6+tetX8TV3p4HrU4kzuO9bt+io/yGQxuyxA/xcw==",
       "requires": {
         "follow-redirects": "^1.15.0",
         "form-data": "^4.0.0",
@@ -2605,12 +2633,13 @@
       }
     },
     "es-abstract": {
-      "version": "1.21.0",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.21.0.tgz",
-      "integrity": "sha512-GUGtW7eXQay0c+PRq0sGIKSdaBorfVqsCMhGHo4elP7YVqZu9nCZS4UkK4gv71gOWNMra/PaSKD3ao1oWExO0g==",
+      "version": "1.21.1",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.21.1.tgz",
+      "integrity": "sha512-QudMsPOz86xYz/1dG1OuGBKOELjCh99IIWHLzy5znUB6j8xG2yMA7bfTV86VSqKF+Y/H08vQPR+9jyXpuC6hfg==",
       "requires": {
+        "available-typed-arrays": "^1.0.5",
         "call-bind": "^1.0.2",
-        "es-set-tostringtag": "^2.0.0",
+        "es-set-tostringtag": "^2.0.1",
         "es-to-primitive": "^1.2.1",
         "function-bind": "^1.1.1",
         "function.prototype.name": "^1.1.5",
@@ -2623,7 +2652,7 @@
         "has-proto": "^1.0.1",
         "has-symbols": "^1.0.3",
         "internal-slot": "^1.0.4",
-        "is-array-buffer": "^3.0.0",
+        "is-array-buffer": "^3.0.1",
         "is-callable": "^1.2.7",
         "is-negative-zero": "^2.0.2",
         "is-regex": "^1.1.4",
@@ -2679,9 +2708,9 @@
       "dev": true
     },
     "eslint": {
-      "version": "8.31.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.31.0.tgz",
-      "integrity": "sha512-0tQQEVdmPZ1UtUKXjX7EMm9BlgJ08G90IhWh0PKDCb3ZLsgAOHI8fYSIzYVZej92zsgq+ft0FGsxhJ3xo2tbuA==",
+      "version": "8.32.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.32.0.tgz",
+      "integrity": "sha512-nETVXpnthqKPFyuY2FNjz/bEd6nbosRgKbkgS/y1C7LJop96gYHWpiguLecMHQ2XCPxn77DS0P+68WzG6vkZSQ==",
       "dev": true,
       "requires": {
         "@eslint/eslintrc": "^1.4.1",
@@ -2738,13 +2767,14 @@
       }
     },
     "eslint-import-resolver-node": {
-      "version": "0.3.6",
-      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz",
-      "integrity": "sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw==",
+      "version": "0.3.7",
+      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.7.tgz",
+      "integrity": "sha512-gozW2blMLJCeFpBwugLTGyvVjNoeo1knonXAcatC6bjPBZitotxdWf7Gimr25N4c0AAOo4eOUfaG82IJPDpqCA==",
       "dev": true,
       "requires": {
         "debug": "^3.2.7",
-        "resolve": "^1.20.0"
+        "is-core-module": "^2.11.0",
+        "resolve": "^1.22.1"
       },
       "dependencies": {
         "debug": {
@@ -2779,33 +2809,35 @@
       }
     },
     "eslint-plugin-import": {
-      "version": "2.26.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz",
-      "integrity": "sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA==",
+      "version": "2.27.5",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.27.5.tgz",
+      "integrity": "sha512-LmEt3GVofgiGuiE+ORpnvP+kAm3h6MLZJ4Q5HCyHADofsb4VzXFsRiWj3c0OFiV+3DWFh0qg3v9gcPlfc3zRow==",
       "dev": true,
       "requires": {
-        "array-includes": "^3.1.4",
-        "array.prototype.flat": "^1.2.5",
-        "debug": "^2.6.9",
+        "array-includes": "^3.1.6",
+        "array.prototype.flat": "^1.3.1",
+        "array.prototype.flatmap": "^1.3.1",
+        "debug": "^3.2.7",
         "doctrine": "^2.1.0",
-        "eslint-import-resolver-node": "^0.3.6",
-        "eslint-module-utils": "^2.7.3",
+        "eslint-import-resolver-node": "^0.3.7",
+        "eslint-module-utils": "^2.7.4",
         "has": "^1.0.3",
-        "is-core-module": "^2.8.1",
+        "is-core-module": "^2.11.0",
         "is-glob": "^4.0.3",
         "minimatch": "^3.1.2",
-        "object.values": "^1.1.5",
-        "resolve": "^1.22.0",
+        "object.values": "^1.1.6",
+        "resolve": "^1.22.1",
+        "semver": "^6.3.0",
         "tsconfig-paths": "^3.14.1"
       },
       "dependencies": {
         "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "version": "3.2.7",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
           "dev": true,
           "requires": {
-            "ms": "2.0.0"
+            "ms": "^2.1.1"
           }
         },
         "doctrine": {
@@ -2816,12 +2848,6 @@
           "requires": {
             "esutils": "^2.0.2"
           }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-          "dev": true
         }
       }
     },
@@ -3445,9 +3471,9 @@
       "integrity": "sha512-/j+fd/u71wNgKf3V2bx4tnDm+3GvLnlCuvf2MXbJ3wern+67IAb6zN9Leu1tCWPlPNZ+v1hLSibVukkPK2HqJw=="
     },
     "object-inspect": {
-      "version": "1.12.2",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz",
-      "integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ=="
+      "version": "1.12.3",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz",
+      "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g=="
     },
     "object-keys": {
       "version": "1.1.1",
@@ -3607,9 +3633,9 @@
       "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="
     },
     "punycode": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz",
+      "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==",
       "dev": true
     },
     "queue-microtask": {
@@ -3893,9 +3919,9 @@
       "dev": true
     },
     "ws": {
-      "version": "8.11.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.11.0.tgz",
-      "integrity": "sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==",
+      "version": "8.12.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.12.0.tgz",
+      "integrity": "sha512-kU62emKIdKVeEIOIKVegvqpXMSTAMLJozpHZaJNDYqBjzlSYXQGviYwN1osDLJ9av68qHd4a2oSjd7yD4pacig==",
       "requires": {}
     },
     "yocto-queue": {
diff --git a/package.json b/package.json
index 6498a901..413b4293 100644
--- a/package.json
+++ b/package.json
@@ -60,17 +60,17 @@
   ],
   "dependencies": {
     "@homebridge/plugin-ui-utils": "^0.0.19",
-    "axios": "^1.2.2",
+    "axios": "^1.2.3",
     "node-persist": "^3.1.0",
     "p-queue": "^7.3.0",
     "websocket-as-promised": "^2.0.1",
-    "ws": "^8.11.0"
+    "ws": "^8.12.0"
   },
   "devDependencies": {
     "eslint-config-airbnb-base": "^15.0.0",
-    "eslint-plugin-import": "^2.26.0",
+    "eslint-plugin-import": "^2.27.5",
     "eslint-plugin-import-newlines": "^1.3.0",
     "eslint-plugin-sort-exports": "^0.8.0",
-    "eslint": "^8.31.0"
+    "eslint": "^8.32.0"
   }
 }

From f9da1f34c842689d20ce4b67ff0eb10e8e1656c9 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Fri, 10 Feb 2023 19:35:40 +0000
Subject: [PATCH 3101/3183] fix switchman cache issue

---
 lib/platform.js   |    2 +-
 package-lock.json | 1680 +--------------------------------------------
 package.json      |    6 +-
 3 files changed, 39 insertions(+), 1649 deletions(-)

diff --git a/lib/platform.js b/lib/platform.js
index 658e5d68..e4d566fd 100644
--- a/lib/platform.js
+++ b/lib/platform.js
@@ -1233,7 +1233,7 @@ export default class {
         /** *******
          SWITCH MAN
          ******** */
-        accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SW0`);
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
         accessory.control = new deviceTypes.deviceSwitchMan(this, accessory);
         /** *************** */
       } else if (platformConsts.devices.rfBridge.includes(uiid)) {
diff --git a/package-lock.json b/package-lock.json
index 57bb6504..0eaceaa9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "version": "10.4.0",
-  "lockfileVersion": 2,
+  "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
@@ -28,14 +28,14 @@
       "license": "MIT",
       "dependencies": {
         "@homebridge/plugin-ui-utils": "^0.0.19",
-        "axios": "^1.2.3",
+        "axios": "^1.3.2",
         "node-persist": "^3.1.0",
-        "p-queue": "^7.3.0",
+        "p-queue": "^7.3.4",
         "websocket-as-promised": "^2.0.1",
         "ws": "^8.12.0"
       },
       "devDependencies": {
-        "eslint": "^8.32.0",
+        "eslint": "^8.33.0",
         "eslint-config-airbnb-base": "^15.0.0",
         "eslint-plugin-import": "^2.27.5",
         "eslint-plugin-import-newlines": "^1.3.0",
@@ -149,9 +149,9 @@
       "dev": true
     },
     "node_modules/acorn": {
-      "version": "8.8.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz",
-      "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==",
+      "version": "8.8.2",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz",
+      "integrity": "sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==",
       "dev": true,
       "bin": {
         "acorn": "bin/acorn"
@@ -287,9 +287,9 @@
       }
     },
     "node_modules/axios": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.2.3.tgz",
-      "integrity": "sha512-pdDkMYJeuXLZ6Xj/Q5J3Phpe+jbGdsSzlQaFVkMQzRUL05+6+tetX8TV3p4HrU4kzuO9bt+io/yGQxuyxA/xcw==",
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.3.2.tgz",
+      "integrity": "sha512-1M3O703bYqYuPhbHeya5bnhpYVsDDRyQSabNja04mZtboLNSuZ4YrltestrLXfHgmzua4TpUqRiVKbiQuo2epw==",
       "dependencies": {
         "follow-redirects": "^1.15.0",
         "form-data": "^4.0.0",
@@ -433,9 +433,9 @@
       "dev": true
     },
     "node_modules/define-properties": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-      "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.0.tgz",
+      "integrity": "sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==",
       "dependencies": {
         "has-property-descriptors": "^1.0.0",
         "object-keys": "^1.1.1"
@@ -564,9 +564,9 @@
       }
     },
     "node_modules/eslint": {
-      "version": "8.32.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.32.0.tgz",
-      "integrity": "sha512-nETVXpnthqKPFyuY2FNjz/bEd6nbosRgKbkgS/y1C7LJop96gYHWpiguLecMHQ2XCPxn77DS0P+68WzG6vkZSQ==",
+      "version": "8.33.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.33.0.tgz",
+      "integrity": "sha512-WjOpFQgKK8VrCnAtl8We0SUOy/oVZ5NHykyMiagV1M9r8IFpIJX7DduK6n1mpfhlG7T1NLWm2SuD8QB7KFySaA==",
       "dev": true,
       "dependencies": {
         "@eslint/eslintrc": "^1.4.1",
@@ -1022,9 +1022,9 @@
       }
     },
     "node_modules/get-intrinsic": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz",
-      "integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.0.tgz",
+      "integrity": "sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q==",
       "dependencies": {
         "function-bind": "^1.1.1",
         "has": "^1.0.3",
@@ -1082,9 +1082,9 @@
       }
     },
     "node_modules/globals": {
-      "version": "13.19.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.19.0.tgz",
-      "integrity": "sha512-dkQ957uSRWHw7CFXLUtUHQI3g3aWApYhfNR2O6jn/907riyTYKVBmxYVROkBcY614FSSeSJh7Xm7SrUWCxvJMQ==",
+      "version": "13.20.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz",
+      "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==",
       "dev": true,
       "dependencies": {
         "type-fest": "^0.20.2"
@@ -1253,11 +1253,11 @@
       "dev": true
     },
     "node_modules/internal-slot": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.4.tgz",
-      "integrity": "sha512-tA8URYccNzMo94s5MQZgH8NB/XTa6HsOo0MLfXTKKEnHVVdegzaQoFZ7Jp44bdvLvY2waT5dc+j5ICEswhi7UQ==",
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.5.tgz",
+      "integrity": "sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ==",
       "dependencies": {
-        "get-intrinsic": "^1.1.3",
+        "get-intrinsic": "^1.2.0",
         "has": "^1.0.3",
         "side-channel": "^1.0.4"
       },
@@ -1486,9 +1486,9 @@
       "dev": true
     },
     "node_modules/js-sdsl": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.2.0.tgz",
-      "integrity": "sha512-dyBIzQBDkCqCu+0upx25Y2jGdbTGxE9fshMsCdK0ViOongpV+n5tXRcZY9v7CaVQ79AGS9KA1KHtojxiM7aXSQ==",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.3.0.tgz",
+      "integrity": "sha512-mifzlm2+5nZ+lEcLJMoBK0/IH/bDg8XnJfd/Wq6IP+xoCjLZsTOnV2QpxlVbX9bMnkl5PdEjNtBJ9Cj1NjifhQ==",
       "dev": true,
       "funding": {
         "type": "opencollective",
@@ -1597,9 +1597,9 @@
       }
     },
     "node_modules/minimist": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.7.tgz",
-      "integrity": "sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==",
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
+      "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
       "dev": true,
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -1746,9 +1746,9 @@
       }
     },
     "node_modules/p-queue": {
-      "version": "7.3.0",
-      "resolved": "https://registry.npmjs.org/p-queue/-/p-queue-7.3.0.tgz",
-      "integrity": "sha512-5fP+yVQ0qp0rEfZoDTlP2c3RYBgxvRsw30qO+VtPPc95lyvSG+x6USSh1TuLB4n96IO6I8/oXQGsTgtna4q2nQ==",
+      "version": "7.3.4",
+      "resolved": "https://registry.npmjs.org/p-queue/-/p-queue-7.3.4.tgz",
+      "integrity": "sha512-esox8CWt0j9EZECFvkFl2WNPat8LN4t7WWeXq73D9ha0V96qPRufApZi4ZhPwXAln1uVVal429HVVKPa2X0yQg==",
       "dependencies": {
         "eventemitter3": "^4.0.7",
         "p-timeout": "^5.0.2"
@@ -2320,1615 +2320,5 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     }
-  },
-  "dependencies": {
-    "@eslint/eslintrc": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.4.1.tgz",
-      "integrity": "sha512-XXrH9Uarn0stsyldqDYq8r++mROmWRI1xKMXa640Bb//SY1+ECYX6VzT6Lcx5frD0V30XieqJ0oX9I2Xj5aoMA==",
-      "dev": true,
-      "requires": {
-        "ajv": "^6.12.4",
-        "debug": "^4.3.2",
-        "espree": "^9.4.0",
-        "globals": "^13.19.0",
-        "ignore": "^5.2.0",
-        "import-fresh": "^3.2.1",
-        "js-yaml": "^4.1.0",
-        "minimatch": "^3.1.2",
-        "strip-json-comments": "^3.1.1"
-      }
-    },
-    "@homebridge/plugin-ui-utils": {
-      "version": "0.0.19",
-      "resolved": "https://registry.npmjs.org/@homebridge/plugin-ui-utils/-/plugin-ui-utils-0.0.19.tgz",
-      "integrity": "sha512-axFX7lN2Yd7bz/6SlD7dzq5sY/N9+XYuLHPukuiyHQRDtNMRL1uDqJhOx6RVaN2tYDHB75h7YxRQWP7U44Mgzg=="
-    },
-    "@humanwhocodes/config-array": {
-      "version": "0.11.8",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.8.tgz",
-      "integrity": "sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g==",
-      "dev": true,
-      "requires": {
-        "@humanwhocodes/object-schema": "^1.2.1",
-        "debug": "^4.1.1",
-        "minimatch": "^3.0.5"
-      }
-    },
-    "@humanwhocodes/module-importer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
-      "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==",
-      "dev": true
-    },
-    "@humanwhocodes/object-schema": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
-      "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
-      "dev": true
-    },
-    "@nodelib/fs.scandir": {
-      "version": "2.1.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
-      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
-      "dev": true,
-      "requires": {
-        "@nodelib/fs.stat": "2.0.5",
-        "run-parallel": "^1.1.9"
-      }
-    },
-    "@nodelib/fs.stat": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
-      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
-      "dev": true
-    },
-    "@nodelib/fs.walk": {
-      "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
-      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
-      "dev": true,
-      "requires": {
-        "@nodelib/fs.scandir": "2.1.5",
-        "fastq": "^1.6.0"
-      }
-    },
-    "@types/json5": {
-      "version": "0.0.29",
-      "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
-      "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==",
-      "dev": true
-    },
-    "acorn": {
-      "version": "8.8.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz",
-      "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==",
-      "dev": true
-    },
-    "acorn-jsx": {
-      "version": "5.3.2",
-      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
-      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
-      "dev": true,
-      "requires": {}
-    },
-    "ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-      "dev": true,
-      "requires": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      }
-    },
-    "ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-      "dev": true
-    },
-    "ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "requires": {
-        "color-convert": "^2.0.1"
-      }
-    },
-    "argparse": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-      "dev": true
-    },
-    "array-includes": {
-      "version": "3.1.6",
-      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.6.tgz",
-      "integrity": "sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4",
-        "get-intrinsic": "^1.1.3",
-        "is-string": "^1.0.7"
-      }
-    },
-    "array.prototype.flat": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz",
-      "integrity": "sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4",
-        "es-shim-unscopables": "^1.0.0"
-      }
-    },
-    "array.prototype.flatmap": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.1.tgz",
-      "integrity": "sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4",
-        "es-shim-unscopables": "^1.0.0"
-      }
-    },
-    "asynckit": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
-    },
-    "available-typed-arrays": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz",
-      "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw=="
-    },
-    "axios": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.2.3.tgz",
-      "integrity": "sha512-pdDkMYJeuXLZ6Xj/Q5J3Phpe+jbGdsSzlQaFVkMQzRUL05+6+tetX8TV3p4HrU4kzuO9bt+io/yGQxuyxA/xcw==",
-      "requires": {
-        "follow-redirects": "^1.15.0",
-        "form-data": "^4.0.0",
-        "proxy-from-env": "^1.1.0"
-      }
-    },
-    "balanced-match": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
-      "dev": true
-    },
-    "brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
-      "requires": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "call-bind": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
-      "requires": {
-        "function-bind": "^1.1.1",
-        "get-intrinsic": "^1.0.2"
-      }
-    },
-    "callsites": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
-      "dev": true
-    },
-    "chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "requires": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      }
-    },
-    "chnl": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/chnl/-/chnl-1.2.0.tgz",
-      "integrity": "sha512-g5gJb59edwCliFbX2j7G6sBfY4sX9YLy211yctONI2GRaiX0f2zIbKWmBm+sPqFNEpM7Ljzm7IJX/xrjiEbPrw=="
-    },
-    "color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "requires": {
-        "color-name": "~1.1.4"
-      }
-    },
-    "color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "combined-stream": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
-      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
-      "requires": {
-        "delayed-stream": "~1.0.0"
-      }
-    },
-    "concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
-      "dev": true
-    },
-    "confusing-browser-globals": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/confusing-browser-globals/-/confusing-browser-globals-1.0.11.tgz",
-      "integrity": "sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA==",
-      "dev": true
-    },
-    "cross-spawn": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-      "dev": true,
-      "requires": {
-        "path-key": "^3.1.0",
-        "shebang-command": "^2.0.0",
-        "which": "^2.0.1"
-      }
-    },
-    "debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-      "dev": true,
-      "requires": {
-        "ms": "2.1.2"
-      }
-    },
-    "deep-is": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
-      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
-      "dev": true
-    },
-    "define-properties": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-      "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-      "requires": {
-        "has-property-descriptors": "^1.0.0",
-        "object-keys": "^1.1.1"
-      }
-    },
-    "delayed-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ=="
-    },
-    "doctrine": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
-      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
-      "dev": true,
-      "requires": {
-        "esutils": "^2.0.2"
-      }
-    },
-    "es-abstract": {
-      "version": "1.21.1",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.21.1.tgz",
-      "integrity": "sha512-QudMsPOz86xYz/1dG1OuGBKOELjCh99IIWHLzy5znUB6j8xG2yMA7bfTV86VSqKF+Y/H08vQPR+9jyXpuC6hfg==",
-      "requires": {
-        "available-typed-arrays": "^1.0.5",
-        "call-bind": "^1.0.2",
-        "es-set-tostringtag": "^2.0.1",
-        "es-to-primitive": "^1.2.1",
-        "function-bind": "^1.1.1",
-        "function.prototype.name": "^1.1.5",
-        "get-intrinsic": "^1.1.3",
-        "get-symbol-description": "^1.0.0",
-        "globalthis": "^1.0.3",
-        "gopd": "^1.0.1",
-        "has": "^1.0.3",
-        "has-property-descriptors": "^1.0.0",
-        "has-proto": "^1.0.1",
-        "has-symbols": "^1.0.3",
-        "internal-slot": "^1.0.4",
-        "is-array-buffer": "^3.0.1",
-        "is-callable": "^1.2.7",
-        "is-negative-zero": "^2.0.2",
-        "is-regex": "^1.1.4",
-        "is-shared-array-buffer": "^1.0.2",
-        "is-string": "^1.0.7",
-        "is-typed-array": "^1.1.10",
-        "is-weakref": "^1.0.2",
-        "object-inspect": "^1.12.2",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.4",
-        "regexp.prototype.flags": "^1.4.3",
-        "safe-regex-test": "^1.0.0",
-        "string.prototype.trimend": "^1.0.6",
-        "string.prototype.trimstart": "^1.0.6",
-        "typed-array-length": "^1.0.4",
-        "unbox-primitive": "^1.0.2",
-        "which-typed-array": "^1.1.9"
-      }
-    },
-    "es-set-tostringtag": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz",
-      "integrity": "sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==",
-      "requires": {
-        "get-intrinsic": "^1.1.3",
-        "has": "^1.0.3",
-        "has-tostringtag": "^1.0.0"
-      }
-    },
-    "es-shim-unscopables": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz",
-      "integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==",
-      "dev": true,
-      "requires": {
-        "has": "^1.0.3"
-      }
-    },
-    "es-to-primitive": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
-      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
-      "requires": {
-        "is-callable": "^1.1.4",
-        "is-date-object": "^1.0.1",
-        "is-symbol": "^1.0.2"
-      }
-    },
-    "escape-string-regexp": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-      "dev": true
-    },
-    "eslint": {
-      "version": "8.32.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.32.0.tgz",
-      "integrity": "sha512-nETVXpnthqKPFyuY2FNjz/bEd6nbosRgKbkgS/y1C7LJop96gYHWpiguLecMHQ2XCPxn77DS0P+68WzG6vkZSQ==",
-      "dev": true,
-      "requires": {
-        "@eslint/eslintrc": "^1.4.1",
-        "@humanwhocodes/config-array": "^0.11.8",
-        "@humanwhocodes/module-importer": "^1.0.1",
-        "@nodelib/fs.walk": "^1.2.8",
-        "ajv": "^6.10.0",
-        "chalk": "^4.0.0",
-        "cross-spawn": "^7.0.2",
-        "debug": "^4.3.2",
-        "doctrine": "^3.0.0",
-        "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^7.1.1",
-        "eslint-utils": "^3.0.0",
-        "eslint-visitor-keys": "^3.3.0",
-        "espree": "^9.4.0",
-        "esquery": "^1.4.0",
-        "esutils": "^2.0.2",
-        "fast-deep-equal": "^3.1.3",
-        "file-entry-cache": "^6.0.1",
-        "find-up": "^5.0.0",
-        "glob-parent": "^6.0.2",
-        "globals": "^13.19.0",
-        "grapheme-splitter": "^1.0.4",
-        "ignore": "^5.2.0",
-        "import-fresh": "^3.0.0",
-        "imurmurhash": "^0.1.4",
-        "is-glob": "^4.0.0",
-        "is-path-inside": "^3.0.3",
-        "js-sdsl": "^4.1.4",
-        "js-yaml": "^4.1.0",
-        "json-stable-stringify-without-jsonify": "^1.0.1",
-        "levn": "^0.4.1",
-        "lodash.merge": "^4.6.2",
-        "minimatch": "^3.1.2",
-        "natural-compare": "^1.4.0",
-        "optionator": "^0.9.1",
-        "regexpp": "^3.2.0",
-        "strip-ansi": "^6.0.1",
-        "strip-json-comments": "^3.1.0",
-        "text-table": "^0.2.0"
-      }
-    },
-    "eslint-config-airbnb-base": {
-      "version": "15.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-airbnb-base/-/eslint-config-airbnb-base-15.0.0.tgz",
-      "integrity": "sha512-xaX3z4ZZIcFLvh2oUNvcX5oEofXda7giYmuplVxoOg5A7EXJMrUyqRgR+mhDhPK8LZ4PttFOBvCYDbX3sUoUig==",
-      "dev": true,
-      "requires": {
-        "confusing-browser-globals": "^1.0.10",
-        "object.assign": "^4.1.2",
-        "object.entries": "^1.1.5",
-        "semver": "^6.3.0"
-      }
-    },
-    "eslint-import-resolver-node": {
-      "version": "0.3.7",
-      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.7.tgz",
-      "integrity": "sha512-gozW2blMLJCeFpBwugLTGyvVjNoeo1knonXAcatC6bjPBZitotxdWf7Gimr25N4c0AAOo4eOUfaG82IJPDpqCA==",
-      "dev": true,
-      "requires": {
-        "debug": "^3.2.7",
-        "is-core-module": "^2.11.0",
-        "resolve": "^1.22.1"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "3.2.7",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        }
-      }
-    },
-    "eslint-module-utils": {
-      "version": "2.7.4",
-      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.4.tgz",
-      "integrity": "sha512-j4GT+rqzCoRKHwURX7pddtIPGySnX9Si/cgMI5ztrcqOPtk5dDEeZ34CQVPphnqkJytlc97Vuk05Um2mJ3gEQA==",
-      "dev": true,
-      "requires": {
-        "debug": "^3.2.7"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "3.2.7",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        }
-      }
-    },
-    "eslint-plugin-import": {
-      "version": "2.27.5",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.27.5.tgz",
-      "integrity": "sha512-LmEt3GVofgiGuiE+ORpnvP+kAm3h6MLZJ4Q5HCyHADofsb4VzXFsRiWj3c0OFiV+3DWFh0qg3v9gcPlfc3zRow==",
-      "dev": true,
-      "requires": {
-        "array-includes": "^3.1.6",
-        "array.prototype.flat": "^1.3.1",
-        "array.prototype.flatmap": "^1.3.1",
-        "debug": "^3.2.7",
-        "doctrine": "^2.1.0",
-        "eslint-import-resolver-node": "^0.3.7",
-        "eslint-module-utils": "^2.7.4",
-        "has": "^1.0.3",
-        "is-core-module": "^2.11.0",
-        "is-glob": "^4.0.3",
-        "minimatch": "^3.1.2",
-        "object.values": "^1.1.6",
-        "resolve": "^1.22.1",
-        "semver": "^6.3.0",
-        "tsconfig-paths": "^3.14.1"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "3.2.7",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "doctrine": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
-          "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
-          "dev": true,
-          "requires": {
-            "esutils": "^2.0.2"
-          }
-        }
-      }
-    },
-    "eslint-plugin-import-newlines": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import-newlines/-/eslint-plugin-import-newlines-1.3.0.tgz",
-      "integrity": "sha512-8rokf6NvxC10ugA1VNmzEIO75CzId7IDF3Ai2GNXl0Xr4VORpb8u+bxsjRuE+2BS8MfDbrK/MHUQZI2G9qQyyA==",
-      "dev": true,
-      "requires": {}
-    },
-    "eslint-plugin-sort-exports": {
-      "version": "0.8.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-sort-exports/-/eslint-plugin-sort-exports-0.8.0.tgz",
-      "integrity": "sha512-5x7kJNjIS5bSyehFJ6Gk2gh2wUPt/rmhwDHF8JPDicSH7bvrLRFdlkhHu74YqYBjEySHYaOZVoKNP90TjI0v6w==",
-      "dev": true,
-      "requires": {}
-    },
-    "eslint-scope": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz",
-      "integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==",
-      "dev": true,
-      "requires": {
-        "esrecurse": "^4.3.0",
-        "estraverse": "^5.2.0"
-      }
-    },
-    "eslint-utils": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
-      "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
-      "dev": true,
-      "requires": {
-        "eslint-visitor-keys": "^2.0.0"
-      },
-      "dependencies": {
-        "eslint-visitor-keys": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
-          "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
-          "dev": true
-        }
-      }
-    },
-    "eslint-visitor-keys": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
-      "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
-      "dev": true
-    },
-    "espree": {
-      "version": "9.4.1",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-9.4.1.tgz",
-      "integrity": "sha512-XwctdmTO6SIvCzd9810yyNzIrOrqNYV9Koizx4C/mRhf9uq0o4yHoCEU/670pOxOL/MSraektvSAji79kX90Vg==",
-      "dev": true,
-      "requires": {
-        "acorn": "^8.8.0",
-        "acorn-jsx": "^5.3.2",
-        "eslint-visitor-keys": "^3.3.0"
-      }
-    },
-    "esquery": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
-      "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
-      "dev": true,
-      "requires": {
-        "estraverse": "^5.1.0"
-      }
-    },
-    "esrecurse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
-      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
-      "dev": true,
-      "requires": {
-        "estraverse": "^5.2.0"
-      }
-    },
-    "estraverse": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-      "dev": true
-    },
-    "esutils": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
-      "dev": true
-    },
-    "eventemitter3": {
-      "version": "4.0.7",
-      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
-      "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="
-    },
-    "fast-deep-equal": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
-      "dev": true
-    },
-    "fast-json-stable-stringify": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
-      "dev": true
-    },
-    "fast-levenshtein": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-      "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
-      "dev": true
-    },
-    "fastq": {
-      "version": "1.15.0",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz",
-      "integrity": "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==",
-      "dev": true,
-      "requires": {
-        "reusify": "^1.0.4"
-      }
-    },
-    "file-entry-cache": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
-      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
-      "dev": true,
-      "requires": {
-        "flat-cache": "^3.0.4"
-      }
-    },
-    "find-up": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
-      "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
-      "dev": true,
-      "requires": {
-        "locate-path": "^6.0.0",
-        "path-exists": "^4.0.0"
-      }
-    },
-    "flat-cache": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
-      "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
-      "dev": true,
-      "requires": {
-        "flatted": "^3.1.0",
-        "rimraf": "^3.0.2"
-      }
-    },
-    "flatted": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz",
-      "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==",
-      "dev": true
-    },
-    "follow-redirects": {
-      "version": "1.15.2",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz",
-      "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA=="
-    },
-    "for-each": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
-      "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==",
-      "requires": {
-        "is-callable": "^1.1.3"
-      }
-    },
-    "form-data": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
-      "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
-      "requires": {
-        "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.8",
-        "mime-types": "^2.1.12"
-      }
-    },
-    "fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
-      "dev": true
-    },
-    "function-bind": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
-    },
-    "function.prototype.name": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz",
-      "integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.0",
-        "functions-have-names": "^1.2.2"
-      }
-    },
-    "functions-have-names": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
-      "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ=="
-    },
-    "get-intrinsic": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz",
-      "integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==",
-      "requires": {
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.3"
-      }
-    },
-    "get-symbol-description": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz",
-      "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.1"
-      }
-    },
-    "glob": {
-      "version": "7.2.3",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-      "dev": true,
-      "requires": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.1.1",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      }
-    },
-    "glob-parent": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
-      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
-      "dev": true,
-      "requires": {
-        "is-glob": "^4.0.3"
-      }
-    },
-    "globals": {
-      "version": "13.19.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.19.0.tgz",
-      "integrity": "sha512-dkQ957uSRWHw7CFXLUtUHQI3g3aWApYhfNR2O6jn/907riyTYKVBmxYVROkBcY614FSSeSJh7Xm7SrUWCxvJMQ==",
-      "dev": true,
-      "requires": {
-        "type-fest": "^0.20.2"
-      }
-    },
-    "globalthis": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz",
-      "integrity": "sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==",
-      "requires": {
-        "define-properties": "^1.1.3"
-      }
-    },
-    "gopd": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
-      "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
-      "requires": {
-        "get-intrinsic": "^1.1.3"
-      }
-    },
-    "grapheme-splitter": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz",
-      "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==",
-      "dev": true
-    },
-    "has": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-      "requires": {
-        "function-bind": "^1.1.1"
-      }
-    },
-    "has-bigints": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
-      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ=="
-    },
-    "has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true
-    },
-    "has-property-descriptors": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz",
-      "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==",
-      "requires": {
-        "get-intrinsic": "^1.1.1"
-      }
-    },
-    "has-proto": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz",
-      "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg=="
-    },
-    "has-symbols": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="
-    },
-    "has-tostringtag": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
-      "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
-      "requires": {
-        "has-symbols": "^1.0.2"
-      }
-    },
-    "ignore": {
-      "version": "5.2.4",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz",
-      "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==",
-      "dev": true
-    },
-    "import-fresh": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
-      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
-      "dev": true,
-      "requires": {
-        "parent-module": "^1.0.0",
-        "resolve-from": "^4.0.0"
-      }
-    },
-    "imurmurhash": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-      "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
-      "dev": true
-    },
-    "inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
-      "dev": true,
-      "requires": {
-        "once": "^1.3.0",
-        "wrappy": "1"
-      }
-    },
-    "inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-      "dev": true
-    },
-    "internal-slot": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.4.tgz",
-      "integrity": "sha512-tA8URYccNzMo94s5MQZgH8NB/XTa6HsOo0MLfXTKKEnHVVdegzaQoFZ7Jp44bdvLvY2waT5dc+j5ICEswhi7UQ==",
-      "requires": {
-        "get-intrinsic": "^1.1.3",
-        "has": "^1.0.3",
-        "side-channel": "^1.0.4"
-      }
-    },
-    "is-array-buffer": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.1.tgz",
-      "integrity": "sha512-ASfLknmY8Xa2XtB4wmbz13Wu202baeA18cJBCeCy0wXUHZF0IPyVEXqKEcd+t2fNSLLL1vC6k7lxZEojNbISXQ==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.3",
-        "is-typed-array": "^1.1.10"
-      }
-    },
-    "is-bigint": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
-      "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
-      "requires": {
-        "has-bigints": "^1.0.1"
-      }
-    },
-    "is-boolean-object": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
-      "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
-      }
-    },
-    "is-callable": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
-      "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA=="
-    },
-    "is-core-module": {
-      "version": "2.11.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz",
-      "integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==",
-      "dev": true,
-      "requires": {
-        "has": "^1.0.3"
-      }
-    },
-    "is-date-object": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
-      "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
-      "requires": {
-        "has-tostringtag": "^1.0.0"
-      }
-    },
-    "is-extglob": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
-      "dev": true
-    },
-    "is-glob": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
-      "dev": true,
-      "requires": {
-        "is-extglob": "^2.1.1"
-      }
-    },
-    "is-negative-zero": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
-      "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA=="
-    },
-    "is-number-object": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
-      "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==",
-      "requires": {
-        "has-tostringtag": "^1.0.0"
-      }
-    },
-    "is-path-inside": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
-      "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
-      "dev": true
-    },
-    "is-regex": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
-      }
-    },
-    "is-shared-array-buffer": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
-      "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
-      "requires": {
-        "call-bind": "^1.0.2"
-      }
-    },
-    "is-string": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
-      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
-      "requires": {
-        "has-tostringtag": "^1.0.0"
-      }
-    },
-    "is-symbol": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
-      "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
-      "requires": {
-        "has-symbols": "^1.0.2"
-      }
-    },
-    "is-typed-array": {
-      "version": "1.1.10",
-      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.10.tgz",
-      "integrity": "sha512-PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A==",
-      "requires": {
-        "available-typed-arrays": "^1.0.5",
-        "call-bind": "^1.0.2",
-        "for-each": "^0.3.3",
-        "gopd": "^1.0.1",
-        "has-tostringtag": "^1.0.0"
-      }
-    },
-    "is-weakref": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
-      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
-      "requires": {
-        "call-bind": "^1.0.2"
-      }
-    },
-    "isexe": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
-      "dev": true
-    },
-    "js-sdsl": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.2.0.tgz",
-      "integrity": "sha512-dyBIzQBDkCqCu+0upx25Y2jGdbTGxE9fshMsCdK0ViOongpV+n5tXRcZY9v7CaVQ79AGS9KA1KHtojxiM7aXSQ==",
-      "dev": true
-    },
-    "js-yaml": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
-      "dev": true,
-      "requires": {
-        "argparse": "^2.0.1"
-      }
-    },
-    "json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
-    },
-    "json-stable-stringify-without-jsonify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-      "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
-      "dev": true
-    },
-    "json5": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
-      "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
-      "dev": true,
-      "requires": {
-        "minimist": "^1.2.0"
-      }
-    },
-    "levn": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
-      "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
-      "dev": true,
-      "requires": {
-        "prelude-ls": "^1.2.1",
-        "type-check": "~0.4.0"
-      }
-    },
-    "locate-path": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
-      "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
-      "dev": true,
-      "requires": {
-        "p-locate": "^5.0.0"
-      }
-    },
-    "lodash.merge": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
-      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
-      "dev": true
-    },
-    "mime-db": {
-      "version": "1.52.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
-      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="
-    },
-    "mime-types": {
-      "version": "2.1.35",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
-      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
-      "requires": {
-        "mime-db": "1.52.0"
-      }
-    },
-    "minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "dev": true,
-      "requires": {
-        "brace-expansion": "^1.1.7"
-      }
-    },
-    "minimist": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.7.tgz",
-      "integrity": "sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==",
-      "dev": true
-    },
-    "ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "natural-compare": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
-      "dev": true
-    },
-    "node-persist": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/node-persist/-/node-persist-3.1.0.tgz",
-      "integrity": "sha512-/j+fd/u71wNgKf3V2bx4tnDm+3GvLnlCuvf2MXbJ3wern+67IAb6zN9Leu1tCWPlPNZ+v1hLSibVukkPK2HqJw=="
-    },
-    "object-inspect": {
-      "version": "1.12.3",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz",
-      "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g=="
-    },
-    "object-keys": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="
-    },
-    "object.assign": {
-      "version": "4.1.4",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",
-      "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "has-symbols": "^1.0.3",
-        "object-keys": "^1.1.1"
-      }
-    },
-    "object.entries": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.6.tgz",
-      "integrity": "sha512-leTPzo4Zvg3pmbQ3rDK69Rl8GQvIqMWubrkxONG9/ojtFE2rD9fjMKfSI5BxW3osRH1m6VdzmqK8oAY9aT4x5w==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
-      }
-    },
-    "object.values": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.6.tgz",
-      "integrity": "sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
-      }
-    },
-    "once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
-      "dev": true,
-      "requires": {
-        "wrappy": "1"
-      }
-    },
-    "optionator": {
-      "version": "0.9.1",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
-      "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
-      "dev": true,
-      "requires": {
-        "deep-is": "^0.1.3",
-        "fast-levenshtein": "^2.0.6",
-        "levn": "^0.4.1",
-        "prelude-ls": "^1.2.1",
-        "type-check": "^0.4.0",
-        "word-wrap": "^1.2.3"
-      }
-    },
-    "p-limit": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
-      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
-      "dev": true,
-      "requires": {
-        "yocto-queue": "^0.1.0"
-      }
-    },
-    "p-locate": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
-      "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
-      "dev": true,
-      "requires": {
-        "p-limit": "^3.0.2"
-      }
-    },
-    "p-queue": {
-      "version": "7.3.0",
-      "resolved": "https://registry.npmjs.org/p-queue/-/p-queue-7.3.0.tgz",
-      "integrity": "sha512-5fP+yVQ0qp0rEfZoDTlP2c3RYBgxvRsw30qO+VtPPc95lyvSG+x6USSh1TuLB4n96IO6I8/oXQGsTgtna4q2nQ==",
-      "requires": {
-        "eventemitter3": "^4.0.7",
-        "p-timeout": "^5.0.2"
-      }
-    },
-    "p-timeout": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-5.1.0.tgz",
-      "integrity": "sha512-auFDyzzzGZZZdHz3BtET9VEz0SE/uMEAx7uWfGPucfzEwwe/xH0iVeZibQmANYE/hp9T2+UUZT5m+BKyrDp3Ew=="
-    },
-    "parent-module": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
-      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
-      "dev": true,
-      "requires": {
-        "callsites": "^3.0.0"
-      }
-    },
-    "path-exists": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-      "dev": true
-    },
-    "path-is-absolute": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
-      "dev": true
-    },
-    "path-key": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-      "dev": true
-    },
-    "path-parse": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
-      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
-      "dev": true
-    },
-    "prelude-ls": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
-      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
-      "dev": true
-    },
-    "promise-controller": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/promise-controller/-/promise-controller-1.0.0.tgz",
-      "integrity": "sha512-goA0zA9L91tuQbUmiMinSYqlyUtEgg4fxJcjYnLYOQnrktb4o4UqciXDNXiRUPiDBPACmsr1k8jDW4r7UDq9Qw=="
-    },
-    "promise.prototype.finally": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/promise.prototype.finally/-/promise.prototype.finally-3.1.4.tgz",
-      "integrity": "sha512-nNc3YbgMfLzqtqvO/q5DP6RR0SiHI9pUPGzyDf1q+usTwCN2kjvAnJkBb7bHe3o+fFSBPpsGMoYtaSi+LTNqng==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
-      }
-    },
-    "promised-map": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/promised-map/-/promised-map-1.0.0.tgz",
-      "integrity": "sha512-fP9VSMgcml+U2uJ9PBc4/LDQ3ZkJCH4blLNCS6gbH7RHyRZCYs91zxWHqiUy+heFiEMiB2op/qllYoFqmIqdWA=="
-    },
-    "proxy-from-env": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
-      "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="
-    },
-    "punycode": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz",
-      "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==",
-      "dev": true
-    },
-    "queue-microtask": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
-      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
-      "dev": true
-    },
-    "regexp.prototype.flags": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
-      "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "functions-have-names": "^1.2.2"
-      }
-    },
-    "regexpp": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
-      "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
-      "dev": true
-    },
-    "resolve": {
-      "version": "1.22.1",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz",
-      "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==",
-      "dev": true,
-      "requires": {
-        "is-core-module": "^2.9.0",
-        "path-parse": "^1.0.7",
-        "supports-preserve-symlinks-flag": "^1.0.0"
-      }
-    },
-    "resolve-from": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
-      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
-      "dev": true
-    },
-    "reusify": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
-      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
-      "dev": true
-    },
-    "rimraf": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-      "dev": true,
-      "requires": {
-        "glob": "^7.1.3"
-      }
-    },
-    "run-parallel": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
-      "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
-      "dev": true,
-      "requires": {
-        "queue-microtask": "^1.2.2"
-      }
-    },
-    "safe-regex-test": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz",
-      "integrity": "sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.3",
-        "is-regex": "^1.1.4"
-      }
-    },
-    "semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-      "dev": true
-    },
-    "shebang-command": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-      "dev": true,
-      "requires": {
-        "shebang-regex": "^3.0.0"
-      }
-    },
-    "shebang-regex": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-      "dev": true
-    },
-    "side-channel": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
-      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
-      "requires": {
-        "call-bind": "^1.0.0",
-        "get-intrinsic": "^1.0.2",
-        "object-inspect": "^1.9.0"
-      }
-    },
-    "string.prototype.trimend": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz",
-      "integrity": "sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
-      }
-    },
-    "string.prototype.trimstart": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz",
-      "integrity": "sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
-      }
-    },
-    "strip-ansi": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "dev": true,
-      "requires": {
-        "ansi-regex": "^5.0.1"
-      }
-    },
-    "strip-bom": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-      "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
-      "dev": true
-    },
-    "strip-json-comments": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-      "dev": true
-    },
-    "supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "requires": {
-        "has-flag": "^4.0.0"
-      }
-    },
-    "supports-preserve-symlinks-flag": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
-      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
-      "dev": true
-    },
-    "text-table": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-      "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
-      "dev": true
-    },
-    "tsconfig-paths": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz",
-      "integrity": "sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==",
-      "dev": true,
-      "requires": {
-        "@types/json5": "^0.0.29",
-        "json5": "^1.0.1",
-        "minimist": "^1.2.6",
-        "strip-bom": "^3.0.0"
-      }
-    },
-    "type-check": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
-      "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
-      "dev": true,
-      "requires": {
-        "prelude-ls": "^1.2.1"
-      }
-    },
-    "type-fest": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
-      "dev": true
-    },
-    "typed-array-length": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.4.tgz",
-      "integrity": "sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "for-each": "^0.3.3",
-        "is-typed-array": "^1.1.9"
-      }
-    },
-    "unbox-primitive": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
-      "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "has-bigints": "^1.0.2",
-        "has-symbols": "^1.0.3",
-        "which-boxed-primitive": "^1.0.2"
-      }
-    },
-    "uri-js": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
-      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
-      "dev": true,
-      "requires": {
-        "punycode": "^2.1.0"
-      }
-    },
-    "websocket-as-promised": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/websocket-as-promised/-/websocket-as-promised-2.0.1.tgz",
-      "integrity": "sha512-ePV26D/D37ughXU9j+DjGmwUbelWJrC/vi+6GK++fRlBJmS7aU9T8ABu47KFF0O7r6XN2NAuqJRpegbUwXZxQg==",
-      "requires": {
-        "chnl": "^1.2.0",
-        "promise-controller": "^1.0.0",
-        "promise.prototype.finally": "^3.1.2",
-        "promised-map": "^1.0.0"
-      }
-    },
-    "which": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-      "dev": true,
-      "requires": {
-        "isexe": "^2.0.0"
-      }
-    },
-    "which-boxed-primitive": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
-      "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
-      "requires": {
-        "is-bigint": "^1.0.1",
-        "is-boolean-object": "^1.1.0",
-        "is-number-object": "^1.0.4",
-        "is-string": "^1.0.5",
-        "is-symbol": "^1.0.3"
-      }
-    },
-    "which-typed-array": {
-      "version": "1.1.9",
-      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.9.tgz",
-      "integrity": "sha512-w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA==",
-      "requires": {
-        "available-typed-arrays": "^1.0.5",
-        "call-bind": "^1.0.2",
-        "for-each": "^0.3.3",
-        "gopd": "^1.0.1",
-        "has-tostringtag": "^1.0.0",
-        "is-typed-array": "^1.1.10"
-      }
-    },
-    "word-wrap": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
-      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
-      "dev": true
-    },
-    "wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
-      "dev": true
-    },
-    "ws": {
-      "version": "8.12.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.12.0.tgz",
-      "integrity": "sha512-kU62emKIdKVeEIOIKVegvqpXMSTAMLJozpHZaJNDYqBjzlSYXQGviYwN1osDLJ9av68qHd4a2oSjd7yD4pacig==",
-      "requires": {}
-    },
-    "yocto-queue": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
-      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
-      "dev": true
-    }
   }
 }
diff --git a/package.json b/package.json
index 413b4293..0728fbd0 100644
--- a/package.json
+++ b/package.json
@@ -60,9 +60,9 @@
   ],
   "dependencies": {
     "@homebridge/plugin-ui-utils": "^0.0.19",
-    "axios": "^1.2.3",
+    "axios": "^1.3.2",
     "node-persist": "^3.1.0",
-    "p-queue": "^7.3.0",
+    "p-queue": "^7.3.4",
     "websocket-as-promised": "^2.0.1",
     "ws": "^8.12.0"
   },
@@ -71,6 +71,6 @@
     "eslint-plugin-import": "^2.27.5",
     "eslint-plugin-import-newlines": "^1.3.0",
     "eslint-plugin-sort-exports": "^0.8.0",
-    "eslint": "^8.32.0"
+    "eslint": "^8.33.0"
   }
 }

From 67c280e3d884f2ef4fbc2271ef2d0a0195b2ae16 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Fri, 10 Feb 2023 19:36:19 +0000
Subject: [PATCH 3102/3183] 10.4.1-beta.0

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 0eaceaa9..5a5e9845 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "10.4.0",
+  "version": "10.4.1-beta.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "10.4.0",
+      "version": "10.4.1-beta.0",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 0728fbd0..0ca2fc20 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "10.4.0",
+  "version": "10.4.1-beta.0",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From ed0a0d972c024cc0ba15a8cb533e1a6975df3796 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Sun, 5 Mar 2023 21:22:11 +0000
Subject: [PATCH 3103/3183] prep beta

---
 CHANGELOG.md           |  16 ++-
 config.schema.json     | 246 ++---------------------------------------
 lib/platform.js        | 160 +++++++++++++++++++--------
 lib/utils/constants.js |  12 --
 lib/utils/lang-en.js   |  13 ++-
 lib/utils/lang-fr.js   |   9 +-
 lib/utils/lang-th.js   |   9 +-
 package-lock.json      |  82 ++++++++------
 package.json           |  10 +-
 9 files changed, 205 insertions(+), 352 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 55768c4d..695f99db 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,21 @@
 
 All notable changes to homebridge-ewelink will be documented in this file.
 
-⚠️ Note that Node 14 will no longer be supported after April 2023
+## BETA
+
+### Breaking
+
+- Remove official support for Node 14
+- Remove option to disable plugin - this is now available in the Homebridge UI
+- Remove option for debug logging - this will be enabled when using a beta version of the plugin
+- Remove individual accessory logging options to simplify the config
+
+### Changed
+
+- Bump `homebridge` recommended version to v1.6.0 or v2.0.0-beta
+- Bump `node` recommended versions to v16.19.1 or v18.14.2
+- Updated dependencies
+
 
 ## 10.4.0 (2023-01-07)
 
diff --git a/config.schema.json b/config.schema.json
index de203781..9bd88d17 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -46,18 +46,6 @@
           }
         ]
       },
-      "debug": {
-        "title": "Debug Logging",
-        "type": "boolean"
-      },
-      "debugFakegato": {
-        "title": "Debug Fakegato",
-        "type": "boolean"
-      },
-      "disablePlugin": {
-        "title": "Disable Plugin",
-        "type": "boolean"
-      },
       "language": {
         "type": "string",
         "title": "Logging Language",
@@ -467,32 +455,6 @@
               "condition": {
                 "functionBody": "return (model.singleDevices && model.singleDevices[arrayIndices] && ['single', 't', 'pow', 'iw', 's', 'micro', 'slampher', 'gddc5'].includes(model.singleDevices[arrayIndices].deviceModel) && !model.singleDevices[arrayIndices].ignoreDevice);"
               }
-            },
-            "overrideLogging": {
-              "type": "string",
-              "title": "Override Logging Setting",
-              "description": "Override global logging setting for this device.",
-              "oneOf": [
-                {
-                  "title": "Default (Use Global Setting)",
-                  "enum": ["default"]
-                },
-                {
-                  "title": "Enable Standard Logging",
-                  "enum": ["standard"]
-                },
-                {
-                  "title": "Enable Debug Logging",
-                  "enum": ["debug"]
-                },
-                {
-                  "title": "Disable All Logging",
-                  "enum": ["disable"]
-                }
-              ],
-              "condition": {
-                "functionBody": "return (model.singleDevices && model.singleDevices[arrayIndices] && model.singleDevices[arrayIndices].deviceId && ['single', 't', 'pow', 'iw', 's', 'micro', 'slampher', 'gddc5', 'king', 'zb'].includes(model.singleDevices[arrayIndices].deviceModel) && !model.singleDevices[arrayIndices].ignoreDevice);"
-              }
             }
           }
         }
@@ -811,32 +773,6 @@
               "condition": {
                 "functionBody": "return (model.mode !== 'wan' && model.multiDevices && model.multiDevices[arrayIndices] && model.multiDevices[arrayIndices].deviceId && ['dual_dualr2', 'dualr3_switch', 'dualr3_motor', '4ch', 't'].includes(model.multiDevices[arrayIndices].deviceModel) && !model.multiDevices[arrayIndices].ignoreDevice);"
               }
-            },
-            "overrideLogging": {
-              "type": "string",
-              "title": "Override Logging Setting",
-              "description": "Override global logging setting for this device.",
-              "oneOf": [
-                {
-                  "title": "Default (Use Global Setting)",
-                  "enum": ["default"]
-                },
-                {
-                  "title": "Enable Standard Logging",
-                  "enum": ["standard"]
-                },
-                {
-                  "title": "Enable Debug Logging",
-                  "enum": ["debug"]
-                },
-                {
-                  "title": "Disable All Logging",
-                  "enum": ["disable"]
-                }
-              ],
-              "condition": {
-                "functionBody": "return (model.multiDevices && model.multiDevices[arrayIndices] && model.multiDevices[arrayIndices].deviceId && ['dual_dualr2', 'dualr3_switch', 'dualr3_motor', '4ch', 't', 'zb'].includes(model.multiDevices[arrayIndices].deviceModel) && !model.multiDevices[arrayIndices].ignoreDevice);"
-              }
             }
           }
         }
@@ -975,32 +911,6 @@
               "condition": {
                 "functionBody": "return (model.mode !== 'wan' && model.lightDevices && model.lightDevices[arrayIndices] && ['d1', 'bulbB05BLA19'].includes(model.lightDevices[arrayIndices].deviceModel) && !model.lightDevices[arrayIndices].ignoreDevice);"
               }
-            },
-            "overrideLogging": {
-              "type": "string",
-              "title": "Override Logging Setting",
-              "description": "Override global logging setting for this device.",
-              "oneOf": [
-                {
-                  "title": "Default (Use Global Setting)",
-                  "enum": ["default"]
-                },
-                {
-                  "title": "Enable Standard Logging",
-                  "enum": ["standard"]
-                },
-                {
-                  "title": "Enable Debug Logging",
-                  "enum": ["debug"]
-                },
-                {
-                  "title": "Disable All Logging",
-                  "enum": ["disable"]
-                }
-              ],
-              "condition": {
-                "functionBody": "return (model.lightDevices && model.lightDevices[arrayIndices] && ['d1', 'b1', 'l1', 'bulbB02BA60', 'bulbB05BA60', 'bulbB02FA60', 'bulbB02FST64', 'bulbB05BLA19', 'king', 'zl_d', 'zl_dc'].includes(model.lightDevices[arrayIndices].deviceModel) && !model.lightDevices[arrayIndices].ignoreDevice);"
-              }
             }
           }
         }
@@ -1178,32 +1088,6 @@
               "condition": {
                 "functionBody": "return (model.mode !== 'wan' && model.thDevices && model.thDevices[arrayIndices] && ['th', 'panel'].includes(model.thDevices[arrayIndices].deviceModel) && !model.thDevices[arrayIndices].ignoreDevice);"
               }
-            },
-            "overrideLogging": {
-              "type": "string",
-              "title": "Override Logging Setting",
-              "description": "Override global logging setting for this device.",
-              "oneOf": [
-                {
-                  "title": "Default (Use Global Setting)",
-                  "enum": ["default"]
-                },
-                {
-                  "title": "Enable Standard Logging",
-                  "enum": ["standard"]
-                },
-                {
-                  "title": "Enable Debug Logging",
-                  "enum": ["debug"]
-                },
-                {
-                  "title": "Disable All Logging",
-                  "enum": ["disable"]
-                }
-              ],
-              "condition": {
-                "functionBody": "return (model.thDevices && model.thDevices[arrayIndices] && ['th', 'sc', 'hc', 'panel'].includes(model.thDevices[arrayIndices].deviceModel) && !model.thDevices[arrayIndices].ignoreDevice);"
-              }
             }
           }
         }
@@ -1264,32 +1148,6 @@
               "condition": {
                 "functionBody": "return (model.mode !== 'wan' && model.fanDevices && model.fanDevices[arrayIndices] && ['ifan'].includes(model.fanDevices[arrayIndices].deviceModel) && !model.fanDevices[arrayIndices].ignoreDevice);"
               }
-            },
-            "overrideLogging": {
-              "type": "string",
-              "title": "Override Logging Setting",
-              "description": "Override global logging setting for this device.",
-              "oneOf": [
-                {
-                  "title": "Default (Use Global Setting)",
-                  "enum": ["default"]
-                },
-                {
-                  "title": "Enable Standard Logging",
-                  "enum": ["standard"]
-                },
-                {
-                  "title": "Enable Debug Logging",
-                  "enum": ["debug"]
-                },
-                {
-                  "title": "Disable All Logging",
-                  "enum": ["disable"]
-                }
-              ],
-              "condition": {
-                "functionBody": "return (model.mode !== 'wan' && model.fanDevices && model.fanDevices[arrayIndices] && ['ifan'].includes(model.fanDevices[arrayIndices].deviceModel) && !model.fanDevices[arrayIndices].ignoreDevice);"
-              }
             }
           }
         }
@@ -1442,32 +1300,6 @@
               "condition": {
                 "functionBody": "return (model.sensorDevices && model.sensorDevices[arrayIndices] && ['snzb01', 'snzb03', 'leak'].includes(model.sensorDevices[arrayIndices].deviceModel) && !model.sensorDevices[arrayIndices].ignoreDevice);"
               }
-            },
-            "overrideLogging": {
-              "type": "string",
-              "title": "Override Logging Setting",
-              "description": "Override global logging setting for this device.",
-              "oneOf": [
-                {
-                  "title": "Default (Use Global Setting)",
-                  "enum": ["default"]
-                },
-                {
-                  "title": "Enable Standard Logging",
-                  "enum": ["standard"]
-                },
-                {
-                  "title": "Enable Debug Logging",
-                  "enum": ["debug"]
-                },
-                {
-                  "title": "Disable All Logging",
-                  "enum": ["disable"]
-                }
-              ],
-              "condition": {
-                "functionBody": "return (model.sensorDevices && model.sensorDevices[arrayIndices] && ['dw', 'snzb01', 'snzb02', 'snzb03', 'snzb04', 'leak'].includes(model.sensorDevices[arrayIndices].deviceModel) && !model.sensorDevices[arrayIndices].ignoreDevice);"
-              }
             }
           }
         }
@@ -1514,32 +1346,6 @@
               "condition": {
                 "functionBody": "return (model.mode !== 'wan' && model.rfDevices && model.rfDevices[arrayIndices] && model.rfDevices[arrayIndices].deviceId && model.rfDevices[arrayIndices].deviceId.length === 10 && !model.rfDevices[arrayIndices].ignoreDevice);"
               }
-            },
-            "overrideLogging": {
-              "type": "string",
-              "title": "Override Logging Setting",
-              "description": "Override global logging setting for this device.",
-              "oneOf": [
-                {
-                  "title": "Default (Use Global Setting)",
-                  "enum": ["default"]
-                },
-                {
-                  "title": "Enable Standard Logging",
-                  "enum": ["standard"]
-                },
-                {
-                  "title": "Enable Debug Logging",
-                  "enum": ["debug"]
-                },
-                {
-                  "title": "Disable All Logging",
-                  "enum": ["disable"]
-                }
-              ],
-              "condition": {
-                "functionBody": "return (model.rfDevices && model.rfDevices[arrayIndices] && model.rfDevices[arrayIndices].deviceId && model.rfDevices[arrayIndices].deviceId.length === 10 && !model.rfDevices[arrayIndices].ignoreDevice);"
-              }
             }
           }
         }
@@ -1705,32 +1511,6 @@
               "condition": {
                 "functionBody": "return (model.bridgeSensors && model.bridgeSensors[arrayIndices] && model.bridgeSensors[arrayIndices].type && model.bridgeSensors[arrayIndices].deviceType === 'sensor' && ['motion', 'smoke', 'water', 'co', 'co2', 'occupancy', 'contact', 'p_button', 'doorbell'].includes(model.bridgeSensors[arrayIndices].type));"
               }
-            },
-            "overrideLogging": {
-              "type": "string",
-              "title": "Override Logging Setting",
-              "description": "Override global logging setting for this device.",
-              "oneOf": [
-                {
-                  "title": "Default (Use Global Setting)",
-                  "enum": ["default"]
-                },
-                {
-                  "title": "Enable Standard Logging",
-                  "enum": ["standard"]
-                },
-                {
-                  "title": "Enable Debug Logging",
-                  "enum": ["debug"]
-                },
-                {
-                  "title": "Disable All Logging",
-                  "enum": ["disable"]
-                }
-              ],
-              "condition": {
-                "functionBody": "return (model.bridgeSensors && model.bridgeSensors[arrayIndices] && model.bridgeSensors[arrayIndices].fullDeviceId && model.bridgeSensors[arrayIndices].fullDeviceId.length >= 13);"
-              }
             }
           }
         }
@@ -1741,7 +1521,7 @@
     {
       "type": "fieldset",
       "title": "Required Settings",
-      "items": ["username", "password", "mode", "debug", "disablePlugin"]
+      "items": ["username", "password", "mode"]
     },
     {
       "type": "fieldset",
@@ -1788,8 +1568,7 @@
             "singleDevices[].hideSensor",
             "singleDevices[].obstructId",
             "singleDevices[].sensorType",
-            "singleDevices[].ipAddress",
-            "singleDevices[].overrideLogging"
+            "singleDevices[].ipAddress"
           ]
         }
       ]
@@ -1821,8 +1600,7 @@
             "multiDevices[].sensorId",
             "multiDevices[].hideSensor",
             "multiDevices[].obstructId",
-            "multiDevices[].ipAddress",
-            "multiDevices[].overrideLogging"
+            "multiDevices[].ipAddress"
           ]
         }
       ]
@@ -1846,8 +1624,7 @@
             "lightDevices[].brightnessStep",
             "lightDevices[].adaptiveLightingShift",
             "lightDevices[].offlineAsOff",
-            "lightDevices[].ipAddress",
-            "lightDevices[].overrideLogging"
+            "lightDevices[].ipAddress"
           ]
         }
       ]
@@ -1877,8 +1654,7 @@
             "thDevices[].targetTempThreshold",
             "thDevices[].minTarget",
             "thDevices[].maxTarget",
-            "thDevices[].ipAddress",
-            "thDevices[].overrideLogging"
+            "thDevices[].ipAddress"
           ]
         }
       ]
@@ -1899,8 +1675,7 @@
             "fanDevices[].ignoreDevice",
             "fanDevices[].deviceModel",
             "fanDevices[].hideLight",
-            "fanDevices[].ipAddress",
-            "fanDevices[].overrideLogging"
+            "fanDevices[].ipAddress"
           ]
         }
       ]
@@ -1928,8 +1703,7 @@
             "sensorDevices[].humidityOffsetFactor",
             "sensorDevices[].hideLongDouble",
             "sensorDevices[].scaleBattery",
-            "sensorDevices[].sensorTimeDifference",
-            "sensorDevices[].overrideLogging"
+            "sensorDevices[].sensorTimeDifference"
           ]
         }
       ]
@@ -1949,8 +1723,7 @@
             "rfDevices[].deviceId",
             "rfDevices[].ignoreDevice",
             "rfDevices[].resetOnStartup",
-            "rfDevices[].ipAddress",
-            "rfDevices[].overrideLogging"
+            "rfDevices[].ipAddress"
           ]
         }
       ]
@@ -1975,8 +1748,7 @@
             "bridgeSensors[].type",
             "bridgeSensors[].sensorTimeLength",
             "bridgeSensors[].sensorTimeDifference",
-            "bridgeSensors[].sensorWebHook",
-            "bridgeSensors[].overrideLogging"
+            "bridgeSensors[].sensorWebHook"
           ]
         }
       ]
diff --git a/lib/platform.js b/lib/platform.js
index e4d566fd..e0034856 100644
--- a/lib/platform.js
+++ b/lib/platform.js
@@ -35,6 +35,7 @@ export default class {
     try {
       this.api = api;
       this.log = log;
+      this.isBeta = plugin.version.includes('beta');
       this.apiClient = false;
       this.apiServer = false;
       this.httpClient = false;
@@ -57,8 +58,8 @@ export default class {
         : platformConsts.defaultValues.language;
       this.lang = platformLang[lang];
 
-      // Make sure user is running Homebridge v1.4 or above
-      if (!api?.versionGreaterOrEqual('1.4.0')) {
+      // Make sure user is running Homebridge v1.5 or above
+      if (!api?.versionGreaterOrEqual('1.5.0')) {
         throw new Error(this.lang.hbVersionFail);
       }
 
@@ -170,7 +171,6 @@ export default class {
                 switch (k) {
                   case 'curtainType':
                   case 'deviceType':
-                  case 'overrideLogging':
                   case 'type': {
                     const index = k === 'type' ? 'sensorType' : k;
                     const inSet = platformConsts.allowed[index].includes(v);
@@ -227,11 +227,8 @@ export default class {
             this.config.countryCode = `+${val.replace(/\D/g, '')}`;
           }
           break;
-        case 'debug':
-        case 'debugFakegato':
         case 'disableDeviceLogging':
         case 'disableNoResponse':
-        case 'disablePlugin':
           if (typeof val === 'string') {
             logQuotes(key);
           }
@@ -446,10 +443,21 @@ export default class {
       // Log that the plugin initialisation has been successful
       this.log('%s.', this.lang.initialised);
 
-      // If the user has disabled the plugin then remove all accessories
-      if (this.config.disablePlugin) {
-        devicesInHB.forEach((accessory) => this.removeAccessory(accessory));
-        throw new Error(this.lang.disabled);
+      // Sort out some logging functions
+      if (this.isBeta) {
+        this.log.debug = this.log;
+        this.log.debugWarn = this.log.warn;
+
+        // Log that using a beta will generate a lot of debug logs
+        if (this.isBeta) {
+          const divide = '*'.repeat(platformLang.beta.length + 1); // don't forget the full stop (+1!)
+          this.log.warn(divide);
+          this.log.warn(`${platformLang.beta}.`);
+          this.log.warn(divide);
+        }
+      } else {
+        this.log.debug = () => {};
+        this.log.debugWarn = () => {};
       }
 
       // Check the eWeLink credentials are configured (except lan mode)
@@ -472,10 +480,7 @@ export default class {
         await this.storageLAN.init();
         this.storageClientLAN = true;
       } catch (err) {
-        if (this.config.debug) {
-          const eText = parseError(err);
-          this.log.warn('%s %s.', this.lang.storageSetupErr, eText);
-        }
+        this.log.debugWarn(`${this.lang.storageSetupErr} ${parseError(err)}`);
       }
 
       // Persist files are used to store device info that can be used by my other plugins
@@ -487,10 +492,7 @@ export default class {
         await this.storageData.init();
         this.storageClientData = true;
       } catch (err) {
-        if (this.config.debug) {
-          const eText = parseError(err);
-          this.log.warn('%s %s.', this.lang.storageSetupErr, eText);
-        }
+        this.log.debugWarn(`${this.lang.storageSetupErr} ${parseError(err)}`);
       }
 
       // Manually disable no response mode if mode is set to lan
@@ -522,13 +524,10 @@ export default class {
           // Refresh the WS connection every 60 minutes
           this.wsRefresh = setInterval(async () => {
             try {
-              if (this.config.debug) {
-                this.log('%s.', this.lang.wsRef);
-              }
+              this.log.debug(this.lang.wsRef);
               await this.wsClient.login();
             } catch (err) {
-              const eText = parseError(err);
-              this.log.warn('%s %s.', this.lang.wsRefFail, eText);
+              this.log.warn('%s %s.', this.lang.wsRefFail, parseError(err));
             }
           }, 3600000);
         }
@@ -538,10 +537,7 @@ export default class {
           try {
             await this.storageLAN.clear();
           } catch (err) {
-            if (this.config.debug) {
-              const eText = parseError(err);
-              this.log.warn('%s %s.', this.lang.storageClearErr, eText);
-            }
+            this.log.debugWarn(`${this.lang.storageClearErr} ${parseError(err)}`);
           }
         }
       } else {
@@ -555,10 +551,7 @@ export default class {
             const persistDeviceList = await this.storageLAN.values();
             persistDeviceList.forEach((device) => deviceList.push(device));
           } catch (err) {
-            if (this.config.debug) {
-              const eText = parseError(err);
-              this.log.warn('%s %s.', this.lang.storageReadErr, eText);
-            }
+            this.log.debugWarn(`${this.lang.storageReadErr} ${parseError(err)}`);
           }
         }
       }
@@ -646,7 +639,6 @@ export default class {
     } catch (err) {
       // Catch any errors during setup
       const eText = parseError(err, [
-        this.lang.disabled,
         this.lang.missingCreds,
         'password error! [10001]',
         'user does not exists [10003]',
@@ -663,9 +655,7 @@ export default class {
       // Shutdown the listener server if it's running
       if (this.apiServer) {
         this.apiServer.close(() => {
-          if (this.config.debug) {
-            this.log('%s.', this.lang.apiShutdown);
-          }
+          this.log.debug(this.lang.apiShutdown);
         });
       }
 
@@ -684,6 +674,25 @@ export default class {
     }
   }
 
+  applyAccessoryLogging(accessory) {
+    if (this.isBeta) {
+      accessory.log = (msg) => this.log('[%s] %s.', accessory.displayName, msg);
+      accessory.logWarn = (msg) => this.log.warn('[%s] %s.', accessory.displayName, msg);
+      accessory.logDebug = (msg) => this.log('[%s] %s.', accessory.displayName, msg);
+      accessory.logDebugWarn = (msg) => this.log.warn('[%s] %s.', accessory.displayName, msg);
+    } else {
+      if (this.config.disableDeviceLogging) {
+        accessory.log = () => {};
+        accessory.logWarn = () => {};
+      } else {
+        accessory.log = (msg) => this.log('[%s] %s.', accessory.displayName, msg);
+        accessory.logWarn = (msg) => this.log.warn('[%s] %s.', accessory.displayName, msg);
+      }
+      accessory.logDebug = () => {};
+      accessory.logDebugWarn = () => {};
+    }
+  }
+
   async initialiseDevice(device) {
     try {
       let accessory;
@@ -720,6 +729,7 @@ export default class {
           return;
         }
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+        this.applyAccessoryLogging(accessory);
         accessory.control = new deviceTypes.deviceMotor(this, accessory);
         /** ********************* */
       } else if (
@@ -740,6 +750,7 @@ export default class {
          NSPANEL
          ***** */
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+        this.applyAccessoryLogging(accessory);
         accessory.control = new deviceTypes.devicePanel(this, accessory);
         /** ** */
       } else if (platformConsts.devices.curtain.includes(uiid)) {
@@ -747,6 +758,7 @@ export default class {
          BLINDS [EWELINK UIID 11 & 67]
          *************************** */
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+        this.applyAccessoryLogging(accessory);
         accessory.control = new deviceTypes.deviceCurtain(this, accessory);
         /** ************************ */
       } else if (device.showAs === 'blind') {
@@ -754,6 +766,7 @@ export default class {
          BLINDS [ACCESSORY SIMULATION]
          *************************** */
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+        this.applyAccessoryLogging(accessory);
         accessory.control = new deviceTypes.sim.deviceBlind(this, accessory);
         /** ************************ */
       } else if (device.showAs === 'door') {
@@ -761,6 +774,7 @@ export default class {
          DOORS [ACCESSORY SIMULATION]
          ************************** */
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+        this.applyAccessoryLogging(accessory);
         accessory.control = new deviceTypes.sim.deviceDoor(this, accessory);
         /** *********************** */
       } else if (device.showAs === 'window') {
@@ -768,6 +782,7 @@ export default class {
          WINDOWS [ACCESSORY SIMULATION]
          **************************** */
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+        this.applyAccessoryLogging(accessory);
         accessory.control = new deviceTypes.sim.deviceWindow(this, accessory);
         /** ************************* */
       } else if (this.obstructSwitches[device.deviceid]) {
@@ -775,6 +790,7 @@ export default class {
          OBSTRUCTION DETECTION SWITCHES
          **************************** */
         accessory = this.addAccessory(device, `${device.deviceid}SWX`, true);
+        this.applyAccessoryLogging(accessory);
         accessory.control = new deviceTypes.sim.deviceGarageOdSwitch(this, accessory, devicesInHB);
         /** ************************* */
       } else if (
@@ -802,10 +818,12 @@ export default class {
             instance = deviceTypes.sim.deviceSensorVisible;
             accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
           }
+          this.applyAccessoryLogging(accessory);
           accessory.control = new instance(this, accessory, subAccessory);
         } else {
           accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
           this.log.warn('[%s] %s.', accessory.displayName, this.lang.sensorNoDevice);
+          this.applyAccessoryLogging(accessory);
           accessory.control = new deviceTypes.deviceSensorContact(this, accessory);
         }
         /** ******************************************** */
@@ -814,6 +832,7 @@ export default class {
          GARAGE DOORS [ONE] [ACCESSORY SIMULATION]
          *************************************** */
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+        this.applyAccessoryLogging(accessory);
         accessory.control = new deviceTypes.sim.deviceGarageOne(this, accessory);
         /** ************************************ */
       } else if (device.showAs === 'garage_two') {
@@ -821,6 +840,7 @@ export default class {
          GARAGE DOORS [TWO] [ACCESSORY SIMULATION]
          *************************************** */
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+        this.applyAccessoryLogging(accessory);
         accessory.control = new deviceTypes.sim.deviceGarageTwo(this, accessory);
         /** ************************************ */
       } else if (device.showAs === 'garage_four') {
@@ -828,6 +848,7 @@ export default class {
          GARAGE DOORS [FOUR] [ACCESSORY SIMULATION]
          **************************************** */
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+        this.applyAccessoryLogging(accessory);
         accessory.control = new deviceTypes.sim.deviceGarageFour(this, accessory);
         /** ************************************* */
       } else if (device.showAs === 'garage_eachen') {
@@ -839,6 +860,7 @@ export default class {
           ? deviceTypes.sim.deviceLockEachen
           : deviceTypes.sim.deviceGarageEachen;
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+        this.applyAccessoryLogging(accessory);
         accessory.control = new instance(this, accessory);
         /** *********************** */
       } else if (device.showAs === 'gate') {
@@ -846,6 +868,7 @@ export default class {
          GATES (AS GARAGE DOOR) [ACCESSORY SIMULATION]
          ******************************************* */
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+        this.applyAccessoryLogging(accessory);
         accessory.control = new deviceTypes.sim.deviceGateOne(this, accessory, devicesInHB);
         /** **************************************** */
       } else if (device.showAs === 'lock') {
@@ -853,6 +876,7 @@ export default class {
          LOCKS [ACCESSORY SIMULATION]
          ************************** */
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+        this.applyAccessoryLogging(accessory);
         accessory.control = new deviceTypes.sim.deviceLockOne(this, accessory);
         /** *********************** */
       } else if (device.showAs === 'switch_valve') {
@@ -860,6 +884,7 @@ export default class {
          SWITCH-VALVE [ACCESSORY SIMULATION]
          ********************************* */
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+        this.applyAccessoryLogging(accessory);
         accessory.control = new deviceTypes.sim.deviceSwitchValve(this, accessory);
         /** ****************************** */
       } else if (device.showAs === 'tap') {
@@ -867,6 +892,7 @@ export default class {
          TAPS [ONE] [ACCESSORY SIMULATION]
          ******************************* */
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+        this.applyAccessoryLogging(accessory);
         accessory.control = new deviceTypes.sim.deviceTapOne(this, accessory);
         /** **************************** */
       } else if (device.showAs === 'tap_two') {
@@ -874,6 +900,7 @@ export default class {
          TAPS [TWO] [ACCESSORY SIMULATION]
          ******************************* */
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+        this.applyAccessoryLogging(accessory);
         accessory.control = new deviceTypes.sim.deviceTapTwo(this, accessory);
         /** **************************** */
       } else if (device.showAs === 'valve') {
@@ -881,6 +908,7 @@ export default class {
          VALVES [ONE] [ACCESSORY SIMULATION]
          ********************************* */
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+        this.applyAccessoryLogging(accessory);
         accessory.control = new deviceTypes.sim.deviceValveOne(this, accessory);
         /** ****************************** */
       } else if (device.showAs === 'valve_two') {
@@ -888,6 +916,7 @@ export default class {
          VALVES [TWO] [ACCESSORY SIMULATION]
          ********************************* */
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+        this.applyAccessoryLogging(accessory);
         accessory.control = new deviceTypes.sim.deviceValveTwo(this, accessory);
         /** ****************************** */
       } else if (device.showAs === 'valve_four') {
@@ -895,6 +924,7 @@ export default class {
          VALVES [FOUR] [ACCESSORY SIMULATION]
          ********************************** */
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+        this.applyAccessoryLogging(accessory);
         accessory.control = new deviceTypes.sim.deviceValveFour(this, accessory);
         /** ******************************* */
       } else if (device.showAs === 'sensor') {
@@ -902,6 +932,7 @@ export default class {
          SENSORS [SIMULATION]
          ****************** */
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+        this.applyAccessoryLogging(accessory);
         accessory.control = new deviceTypes.sim.deviceSensor(this, accessory);
         /** *************** */
       } else if (device.showAs === 'p_button') {
@@ -909,6 +940,7 @@ export default class {
          PROGRAMMABLE BUTTON [SIMULATION]
          ****************************** */
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+        this.applyAccessoryLogging(accessory);
         accessory.control = new deviceTypes.sim.devicePButton(this, accessory);
         /** *************************** */
       } else if (device.showAs === 'doorbell') {
@@ -916,6 +948,7 @@ export default class {
          DOORBELL [SIMULATION]
          ******************* */
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+        this.applyAccessoryLogging(accessory);
         accessory.control = new deviceTypes.sim.deviceDoorbell(this, accessory);
         /** **************** */
       } else if (device.showAs === 'purifier') {
@@ -923,6 +956,7 @@ export default class {
          PURIFIERS [SIMULATION]
          ******************** */
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+        this.applyAccessoryLogging(accessory);
         accessory.control = new deviceTypes.sim.devicePurifier(this, accessory);
         /** ***************** */
       } else if (device.showAs === 'audio') {
@@ -933,6 +967,7 @@ export default class {
           this.removeAccessory(devicesInHB.get(uuid));
         }
         accessory = this.addExternalAccessory(device, `${device.deviceid}SWX`, 34);
+        this.applyAccessoryLogging(accessory);
         accessory.control = new deviceTypes.sim.deviceTv(this, accessory);
         /** *********************** */
       } else if (device.showAs === 'box') {
@@ -943,6 +978,7 @@ export default class {
           this.removeAccessory(devicesInHB.get(uuid));
         }
         accessory = this.addExternalAccessory(device, `${device.deviceid}SWX`, 35);
+        this.applyAccessoryLogging(accessory);
         accessory.control = new deviceTypes.sim.deviceTv(this, accessory);
         /** ******************* */
       } else if (device.showAs === 'stick') {
@@ -953,6 +989,7 @@ export default class {
           this.removeAccessory(devicesInHB.get(uuid));
         }
         accessory = this.addExternalAccessory(device, `${device.deviceid}SWX`, 36);
+        this.applyAccessoryLogging(accessory);
         accessory.control = new deviceTypes.sim.deviceTv(this, accessory);
         /** *********************** */
       } else if (
@@ -963,6 +1000,7 @@ export default class {
          SENSORS [LEAK DW2 ACCESSORY SIMULATION]
          ************************************* */
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+        this.applyAccessoryLogging(accessory);
         accessory.control = new deviceTypes.sim.deviceSensorLeak(this, accessory);
         /** ********************************** */
       } else if (platformConsts.devices.sensorContact.includes(uiid)) {
@@ -970,12 +1008,14 @@ export default class {
          SENSORS [SONOFF DW2]
          ****************** */
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+        this.applyAccessoryLogging(accessory);
         accessory.control = new deviceTypes.deviceSensorContact(this, accessory);
       } else if (platformConsts.devices.fan.includes(uiid)) {
         /** *
          FANS
          ** */
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+        this.applyAccessoryLogging(accessory);
         accessory.control = new deviceTypes.deviceFan(this, accessory);
         /**/
       } else if (platformConsts.devices.diffuser.includes(uiid)) {
@@ -983,6 +1023,7 @@ export default class {
          DIFFUSERS
          ******* */
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+        this.applyAccessoryLogging(accessory);
         accessory.control = new deviceTypes.deviceDiffuser(this, accessory);
         /** **** */
       } else if (platformConsts.devices.humidifier.includes(uiid)) {
@@ -990,6 +1031,7 @@ export default class {
          HUMIDIFIERS
          ********* */
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+        this.applyAccessoryLogging(accessory);
         accessory.control = new deviceTypes.deviceHumidifier(this, accessory);
         /** ****** */
       } else if (platformConsts.devices.thermostat.includes(uiid)) {
@@ -997,6 +1039,7 @@ export default class {
          THERMOSTATS
          ********* */
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+        this.applyAccessoryLogging(accessory);
         accessory.control = new deviceTypes.deviceThermostat(this, accessory);
         /** **** */
       } else if (
@@ -1008,6 +1051,7 @@ export default class {
          **************************************** */
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
         accessory.context.sensorType = device.params.sensorType;
+        this.applyAccessoryLogging(accessory);
         accessory.control = new deviceTypes.sim.deviceThThermostat(this, accessory);
         /** ************************************* */
       } else if (device.showAs === 'heater' && platformConsts.devices.sensorAmbient.includes(uiid)) {
@@ -1016,6 +1060,7 @@ export default class {
          ************************************ */
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
         accessory.context.sensorType = device.params.sensorType;
+        this.applyAccessoryLogging(accessory);
         accessory.control = new deviceTypes.sim.deviceThHeater(this, accessory);
         /** ********************************* */
       } else if (device.showAs === 'cooler' && platformConsts.devices.sensorAmbient.includes(uiid)) {
@@ -1024,6 +1069,7 @@ export default class {
          ************************************ */
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
         accessory.context.sensorType = device.params.sensorType;
+        this.applyAccessoryLogging(accessory);
         accessory.control = new deviceTypes.sim.deviceThCooler(this, accessory);
         /** ********************************* */
       } else if (
@@ -1042,6 +1088,7 @@ export default class {
         }
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
         accessory.context.sensorType = device.params.sensorType;
+        this.applyAccessoryLogging(accessory);
         accessory.control = new deviceTypes.sim.deviceThHumidifier(this, accessory);
         /** ************************************** */
       } else if (
@@ -1057,6 +1104,7 @@ export default class {
         }
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
         accessory.context.sensorType = device.params.sensorType;
+        this.applyAccessoryLogging(accessory);
         accessory.control = new deviceTypes.sim.deviceThDehumidifier(this, accessory);
         /** **************************************** */
       } else if (platformConsts.devices.sensorAmbient.includes(uiid)) {
@@ -1065,6 +1113,7 @@ export default class {
          ********************** */
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
         accessory.context.sensorType = device.params.sensorType;
+        this.applyAccessoryLogging(accessory);
         accessory.control = new deviceTypes.deviceSensorAmbient(this, accessory);
         /** ******************* */
       } else if (platformConsts.devices.sensorTempHumi.includes(uiid)) {
@@ -1072,6 +1121,7 @@ export default class {
          SENSOR [AMBIENT-SONOFF SC]
          ************************ */
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+        this.applyAccessoryLogging(accessory);
         accessory.control = new deviceTypes.deviceSensorTempHumi(this, accessory);
         /** ********************* */
       } else if (device.showAs === 'heater') {
@@ -1086,6 +1136,7 @@ export default class {
           return;
         }
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+        this.applyAccessoryLogging(accessory);
         accessory.control = new deviceTypes.sim.deviceHeater(this, accessory);
         /** *************** */
       } else if (device.showAs === 'cooler') {
@@ -1100,6 +1151,7 @@ export default class {
           return;
         }
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+        this.applyAccessoryLogging(accessory);
         accessory.control = new deviceTypes.sim.deviceCooler(this, accessory);
         /** *************** */
       } else if (platformConsts.devices.lightRGB.includes(uiid)) {
@@ -1107,6 +1159,7 @@ export default class {
          LIGHTS [RGB]
          ********** */
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+        this.applyAccessoryLogging(accessory);
         accessory.control = new deviceTypes.deviceLightRGB(this, accessory);
         /** ******* */
       } else if (platformConsts.devices.lightCCT.includes(uiid)) {
@@ -1114,6 +1167,7 @@ export default class {
          LIGHTS [CCT]
          ********** */
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+        this.applyAccessoryLogging(accessory);
         accessory.control = new deviceTypes.deviceLightCCT(this, accessory);
         /** ******* */
       } else if (platformConsts.devices.lightRGBCCT.includes(uiid)) {
@@ -1121,6 +1175,7 @@ export default class {
          LIGHTS [RGB & CCT]
          **************** */
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+        this.applyAccessoryLogging(accessory);
         accessory.control = new deviceTypes.deviceLightRGBCCT(this, accessory);
         /** ************* */
       } else if (platformConsts.devices.lightDimmer.includes(uiid)) {
@@ -1128,6 +1183,7 @@ export default class {
          LIGHTS [DIMMER]
          ************* */
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+        this.applyAccessoryLogging(accessory);
         accessory.control = device.showAs === 'fan'
           ? new deviceTypes.sim.deviceLightFan(this, accessory)
           : new deviceTypes.deviceLightDimmer(this, accessory);
@@ -1143,6 +1199,7 @@ export default class {
          SWITCHES/OUTLETS [SINGLE CHANNEL]
          ******************************* */
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+        this.applyAccessoryLogging(accessory);
         if (device.showAs === 'outlet') {
           accessory.control = this.deviceConf?.[device.deviceid]?.isInched
             ? new deviceTypes.deviceOutletSingleInched(this, accessory)
@@ -1205,6 +1262,7 @@ export default class {
             : false;
           subAccessory.context.macAddress = device.extra?.staMac?.replace(/:+/g, '').replace(/..\B/g, '$&:') || false;
           subAccessory.context.lanKey = device.devicekey;
+          this.applyAccessoryLogging(subAccessory);
           subAccessory.control = device.showAs === 'outlet'
             ? new deviceTypes.deviceOutletMulti(this, subAccessory, devicesInHB)
             : new deviceTypes.deviceSwitchMulti(this, subAccessory, devicesInHB);
@@ -1227,6 +1285,7 @@ export default class {
          SWITCH MATE (S-MATE)
          ****************** */
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+        this.applyAccessoryLogging(accessory);
         accessory.control = new deviceTypes.deviceSwitchMate(this, accessory);
         /** *************** */
       } else if (platformConsts.devices.switchMan.includes(uiid)) {
@@ -1234,6 +1293,7 @@ export default class {
          SWITCH MAN
          ******** */
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+        this.applyAccessoryLogging(accessory);
         accessory.control = new deviceTypes.deviceSwitchMan(this, accessory);
         /** *************** */
       } else if (platformConsts.devices.rfBridge.includes(uiid)) {
@@ -1252,6 +1312,7 @@ export default class {
           }));
         }
         accessory = this.addAccessory(device, `${device.deviceid}SW0`, true, { rfMap }, 'rf_pri');
+        this.applyAccessoryLogging(accessory);
         accessory.control = new deviceTypes.deviceRfBridge(this, accessory, devicesInHB);
 
         // We don't want to add the main bridge as a visible accessory in Homebridge
@@ -1344,6 +1405,7 @@ export default class {
           subAccessory.context.subType = subType;
 
           // Get the instance for this RF device
+          this.applyAccessoryLogging(subAccessory);
           subAccessory.control = new subInstance(this, subAccessory);
 
           // Mark the online/offline status of certain devices
@@ -1374,6 +1436,7 @@ export default class {
          ZIGBEE STATELESS SWITCH
          ********************* */
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+        this.applyAccessoryLogging(accessory);
         accessory.control = new deviceTypes.zb.deviceSwitchStateless(this, accessory);
         /** ****************** */
       } else if (platformConsts.devices.zbLightDimmer.includes(uiid)) {
@@ -1381,6 +1444,7 @@ export default class {
          ZB LIGHTS [DIMMER]
          **************** */
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+        this.applyAccessoryLogging(accessory);
         accessory.control = new deviceTypes.zb.deviceLightDimmer(this, accessory);
         /** ************* */
       } else if (platformConsts.devices.zbLightCCT.includes(uiid)) {
@@ -1388,6 +1452,7 @@ export default class {
          ZB LIGHTS [CCT]
          ************* */
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+        this.applyAccessoryLogging(accessory);
         accessory.control = new deviceTypes.zb.deviceLightCCT(this, accessory);
         /** ********** */
       } else if (platformConsts.devices.zbLightRGBCCT.includes(uiid)) {
@@ -1395,6 +1460,7 @@ export default class {
          ZB LIGHTS [RGB+CCT]
          ***************** */
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+        this.applyAccessoryLogging(accessory);
         accessory.control = new deviceTypes.zb.deviceLightRGBCCT(this, accessory);
         /** ********** */
       } else if (platformConsts.devices.zbMotor.includes(uiid)) {
@@ -1402,6 +1468,7 @@ export default class {
          ZB MOTOR
          ****** */
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+        this.applyAccessoryLogging(accessory);
         accessory.control = new deviceTypes.zb.deviceMotor(this, accessory);
         /** ********** */
       } else if (platformConsts.devices.zbSensorAmbient.includes(uiid)) {
@@ -1409,6 +1476,7 @@ export default class {
          ZB SENSOR [AMBIENT]
          ***************** */
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+        this.applyAccessoryLogging(accessory);
         accessory.control = new deviceTypes.zb.deviceSensorAmbient(this, accessory);
         /** ************** */
       } else if (platformConsts.devices.zbSensorMotion.includes(uiid)) {
@@ -1416,6 +1484,7 @@ export default class {
          ZB SENSOR [MOTION]
          **************** */
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+        this.applyAccessoryLogging(accessory);
         accessory.control = new deviceTypes.zb.deviceSensorMotion(this, accessory);
         /** ************* */
       } else if (platformConsts.devices.zbSensorContact.includes(uiid)) {
@@ -1423,6 +1492,7 @@ export default class {
          ZB SENSOR [CONTACT]
          ***************** */
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+        this.applyAccessoryLogging(accessory);
         accessory.control = new deviceTypes.zb.deviceSensorContact(this, accessory);
         /** ************** */
       } else if (platformConsts.devices.zbSensorWater.includes(uiid)) {
@@ -1430,6 +1500,7 @@ export default class {
          ZB SENSOR [LEAK]
          ************** */
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+        this.applyAccessoryLogging(accessory);
         accessory.control = new deviceTypes.zb.deviceSensorLeak(this, accessory);
         /** *********** */
       } else if (platformConsts.devices.zbSensorSmoke.includes(uiid)) {
@@ -1437,6 +1508,7 @@ export default class {
          ZB SENSOR [SMOKE]
          *************** */
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+        this.applyAccessoryLogging(accessory);
         accessory.control = new deviceTypes.zb.deviceSensorSmoke(this, accessory);
         /** ************ */
       } else if (platformConsts.devices.group.includes(uiid)) {
@@ -1445,6 +1517,7 @@ export default class {
          ************ */
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
         accessory.context.groupUIID = device.uiid;
+        this.applyAccessoryLogging(accessory);
         accessory.control = new deviceTypes.deviceGroup(this, accessory);
         /** ********* */
       } else if (platformConsts.devices.camera.includes(uiid)) {
@@ -1460,6 +1533,7 @@ export default class {
          TEMPLATE DEV
          ********** */
         accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+        this.applyAccessoryLogging(accessory);
         accessory.control = new deviceTypes.deviceTemplate(this, accessory);
         /** ******* */
       } else if (platformConsts.devices.cannotSupport.includes(uiid)) {
@@ -1512,22 +1586,17 @@ export default class {
         && this.ipOverride[device.deviceid]
         && this.ipOverride[device.deviceid] !== this.lanDevices.get(device.deviceid).ip
       ) {
-        this.log.warn(
-          '[%s] %s [%s].',
-          accessory.displayName,
-          this.lang.lanIPDifferent,
-          this.lanDevices.get(device.deviceid).ip,
-        );
+        accessory.logWarn(`${this.lang.lanIPDifferent} [${this.lanDevices.get(device.deviceid).ip}]`);
       }
 
       // Check to see if it's a shared device being used with the cloud
       if (!accessory.context.reachableLAN && accessory.context.eweShared) {
-        this.log.warn('[%s] %s.', accessory.displayName, this.lang.shareWarn);
+        accessory.logWarn(this.lang.shareWarn);
       }
 
       // Check to see if the device has initially been reported offline
       if (this.wsClient && !accessory.context.reachableWAN && !accessory.context.reachableLAN) {
-        this.log.warn('[%s] %s %s.', accessory.displayName, this.lang.repOffline, this.lang.viaWS);
+        accessory.logWarn(`${this.lang.repOffline} ${this.lang.viaWS}`);
       }
 
       // Update accessory characteristics with the latest values
@@ -1567,10 +1636,7 @@ export default class {
         try {
           await this.storageLAN.setItem(device.deviceid, device);
         } catch (err) {
-          if (this.config.debug) {
-            const eText = parseError(err);
-            this.log.warn('[%s] %s %s.', accessory.displayName, this.lang.storageWriteErr, eText);
-          }
+          accessory.logDebugWarn(`${this.lang.storageWriteErr} ${parseError(err)}`);
         }
       }
     } catch (err) {
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index f46ceef8..456f0b48 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -4,9 +4,6 @@ export default {
     username: '',
     password: '',
     mode: 'auto',
-    debug: false,
-    debugFakegato: false,
-    disablePlugin: false,
     language: 'en',
     disableDeviceLogging: false,
     disableNoResponse: false,
@@ -41,7 +38,6 @@ export default {
     offset: 0,
     operationTime: 100,
     operationTimeDown: 100,
-    overrideLogging: 'default',
     sensorTimeDifference: 60,
     sensorTimeLength: 60,
     sensorWebHook: '',
@@ -100,7 +96,6 @@ export default {
       'obstructId',
       'sensorType',
       'ipAddress',
-      'overrideLogging',
     ],
     multiDevices: [
       'label',
@@ -120,7 +115,6 @@ export default {
       'hideSensor',
       'obstructId',
       'ipAddress',
-      'overrideLogging',
     ],
     lightDevices: [
       'label',
@@ -132,7 +126,6 @@ export default {
       'adaptiveLightingShift',
       'offlineAsOff',
       'ipAddress',
-      'overrideLogging',
     ],
     thDevices: [
       'label',
@@ -150,7 +143,6 @@ export default {
       'minTarget',
       'maxTarget',
       'ipAddress',
-      'overrideLogging',
     ],
     fanDevices: [
       'label',
@@ -159,7 +151,6 @@ export default {
       'deviceModel',
       'hideLight',
       'ipAddress',
-      'overrideLogging',
     ],
     sensorDevices: [
       'label',
@@ -175,7 +166,6 @@ export default {
       'hideLongDouble',
       'scaleBattery',
       'sensorTimeDifference',
-      'overrideLogging',
     ],
     rfDevices: [
       'label',
@@ -183,7 +173,6 @@ export default {
       'ignoreDevice',
       'resetOnStartup',
       'ipAddress',
-      'overrideLogging',
     ],
     models: {
       singleDevices: ['single', 't', 'pow', 'iw', 's', 'micro', 'slampher', 'gddc5', 'king', 'zb'],
@@ -206,7 +195,6 @@ export default {
       sensorDevices: ['dw', 'snzb01', 'snzb02', 'snzb03', 'snzb04', 'leak'],
       rfDevices: [],
     },
-    overrideLogging: ['default', 'standard', 'debug', 'disable'],
     sensorType: [
       'water',
       'smoke',
diff --git a/lib/utils/lang-en.js b/lib/utils/lang-en.js
index 975f1440..9d17ebea 100644
--- a/lib/utils/lang-en.js
+++ b/lib/utils/lang-en.js
@@ -2,6 +2,7 @@ export default {
   apiListenErr: 'Internal API server error',
   apiListening: 'Internal API listening on port',
   apiShutdown: 'Internal API gracefully shutdown',
+  beta: 'You are using a beta version of the plugin - you will experience more logging than normal',
   buttonDouble: 'double press',
   buttonLong: 'long press',
   buttonNotFound: 'rf button not found (restart Homebridge)',
@@ -59,7 +60,6 @@ export default {
   devNotSupYet: 'is not supported, do create a GitHub issue with the following info',
   devNotUpd: 'device update failed as',
   devRemove: 'has been removed from Homebridge',
-  disabled: 'To change this, set disablePlugin to false',
   disabledAL: 'adaptive lighting disabled due to significant colour change',
   disabling: 'Disabling plugin',
   doorClosed: 'closed',
@@ -70,14 +70,14 @@ export default {
   errGetHomes: 'An error occurred during http getHomes()',
   errGetHost: 'An error occurred during ws getHost()',
   errLogin: 'An error occurred during http login()',
-  eweError: 'An eWeLink error [500] occured, retrying in 30 seconds',
+  eweError: 'An eWeLink error [500] occurred, retrying in 30 seconds',
   fetchHome: 'Fetching devices from eWeLink home/id',
   foundWithIP: 'found locally with IP',
   foundWithManIP: 'using manual IP',
-  hbVersionFail: 'Your version of Homebridge is too low - update to v1.3',
+  hbVersionFail: 'Your version of Homebridge is too low - update to v1.6',
   heaterSimNoSensor: 'you must configure a device ID that provides a temperature reading',
   httpDisabled: 'HTTP/WS clients disabled as',
-  httpLogin10003: 'See http://bit.ly/hb-ewelink-errors for more info about login issues',
+  httpLogin10003: 'See https://bit.ly/hb-ewelink-errors for more info about login issues',
   httpRetry: 'Unable to reach eWeLink, retrying in 30 seconds',
   identify: 'identify button pressed',
   initialised: 'Plugin initialised. Setting up accessories...',
@@ -141,8 +141,8 @@ export default {
   wsLoginError: 'WS login failed as',
   wsLoginErrRecon: 'WS could not be opened and will try again in 5 seconds',
   wsLoginSuccess: 'WS login successful',
-  wsLogin406: 'WS login failed [406] see http://bit.ly/hb-ewelink-errors',
-  wsPingError: 'Cound not send WS ping as',
+  wsLogin406: 'WS login failed [406] see https://bit.ly/hb-ewelink-errors',
+  wsPingError: 'Could not send WS ping as',
   wsRec: 'WS message received',
   wsReconnectClose: 'WS close event and will try to reconnect in 5 seconds',
   wsReconnectError: 'WS error event and will try to reconnect in 5 seconds',
@@ -165,5 +165,6 @@ export default {
     'Have time to give this plugin a review? https://bit.ly/hb-ewelink-review',
     'This plugin currently has a 5☆ rating on HOOBS! https://bit.ly/hb-ewelink-review',
     'Want to see this plugin in your own language? Let me know!',
+    'Want to beta test Homebridge 2.0? https://github.com/homebridge/homebridge/wiki/Homebridge-Beta-Testing',
   ],
 };
diff --git a/lib/utils/lang-fr.js b/lib/utils/lang-fr.js
index 7cee64fc..ac80739d 100644
--- a/lib/utils/lang-fr.js
+++ b/lib/utils/lang-fr.js
@@ -2,6 +2,7 @@ export default {
   apiListenErr: 'Erreur de serveur d\'API interne',
   apiListening: 'API interne à l\'écoute sur le port',
   apiShutdown: 'L\'API interne s\'arrête normalement',
+  beta: 'You are using a beta version of the plugin - you will experience more logging than normal',
   buttonDouble: 'appui double',
   buttonLong: 'appui long',
   buttonNotFound: 'rf button non trouvé (veuillez redémarrer Homebridge)',
@@ -60,7 +61,6 @@ export default {
   devNotSupYet: 'non supporté, crée un ticket incident sur Github avec les infos suivantes',
   devNotUpd: 'echec de la mise à jour de l\'appareil en tant que',
   devRemove: 'a été supprimé de Homebridge',
-  disabled: 'Pour changer celà, régler disablePlugin à false',
   disabledAL: 'luminosité adaptative désactivée suite à un changement de couleur',
   disabling: 'Désactivation du plugin',
   doorClosed: 'fermée',
@@ -74,11 +74,11 @@ export default {
   fetchHome: 'Fetching devices from eWeLink home/id',
   foundWithIP: 'trouvé locallement avec IP',
   foundWithManIP: 'utilisation de l\'IP manuelle',
-  hbVersionFail: 'Votre version de Homebridge est trop ancienne - Mettez à jour vers v1.3',
+  hbVersionFail: 'Votre version de Homebridge est trop ancienne - Mettez à jour vers v1.6',
   heaterSimNoSensor: 'you must configure a device ID that provides a temperature reading',
   httpDisabled: 'HTTP/WS clients désactivé en tant que',
   httpLogin10003:
-    'Consulter http://bit.ly/hb-ewelink-errors pour plus d\'informations sur cette erreur de connexion',
+    'Consulter https://bit.ly/hb-ewelink-errors pour plus d\'informations sur cette erreur de connexion',
   httpRetry: 'eWelink n\'est pas joignable, réessai dans 30 secondes',
   identify: 'identifier le bouton préssé',
   initialised: 'Plugin intitialisé. Configuration des accessoires...',
@@ -144,7 +144,7 @@ export default {
   wsLoginError: 'Echec de la connection WS en tant que',
   wsLoginErrRecon: 'WS n\'a pas pus être ouvert and réessaiera dans 5 secondes',
   wsLoginSuccess: 'Succès de la connection WS',
-  wsLogin406: 'Echec de la connection WS [406] voir http://bit.ly/hb-ewelink-errors',
+  wsLogin406: 'Echec de la connection WS [406] voir https://bit.ly/hb-ewelink-errors',
   wsPingError: 'Ne peux pas envoyer un ping WS en tant que',
   wsRec: 'Message WS reçus',
   wsReconnectClose: 'Évènement de fermeture WS et réessaiera de se connecter dans 5 secondes',
@@ -166,5 +166,6 @@ export default {
     'Ce plugin a été fait avec ♥ par bwp91 au Royaume-Unis!',
     'Un peu de temps pour laisser un avis sur ce plugin? https://bit.ly/hb-ewelink-review',
     'Vous voulez voir ce plugin dans votre langage ? Dite le moi!',
+    'Want to beta test Homebridge 2.0? https://github.com/homebridge/homebridge/wiki/Homebridge-Beta-Testing',
   ],
 };
diff --git a/lib/utils/lang-th.js b/lib/utils/lang-th.js
index 35758245..8dffeea8 100644
--- a/lib/utils/lang-th.js
+++ b/lib/utils/lang-th.js
@@ -2,6 +2,7 @@ export default {
   apiListenErr: 'ข้อผิดพลาดเซิร์ฟเวอร์ API ภายใน',
   apiListening: 'การฟัง API ภายในบนพอร์ต',
   apiShutdown: 'API ภายในปิดได้อย่างสมบูรณ์',
+  beta: 'You are using a beta version of the plugin - you will experience more logging than normal',
   buttonDouble: 'กดสองครั้ง',
   buttonLong: 'กดค้าง',
   buttonNotFound: 'ไม่พบปุ่ม rf (รีสตาร์ท Homebridge)',
@@ -59,7 +60,6 @@ export default {
   devNotSupYet: 'ไม่รองรับ แจ้งปัญหาใน GitHub ด้วยข้อมูลต่อไปนี้',
   devNotUpd: 'การอัปเดตอุปกรณ์ล้มเหลวเนื่องจาก',
   devRemove: 'ถูกลบออกจาก Homebridge แล้ว',
-  disabled: 'หากต้องการเปลี่ยนแปลง ให้ตั้งค่า ปิดการใช้งานปลั๊กอิน เป็น false',
   disabledAL: 'ระบบปรับแสงอัตโนมัติถูกปิดใช้งานเนื่องจากการเปลี่ยนสีอย่างมีนัยสำคัญ',
   disabling: 'ปิดการใช้งานปลั๊กอิน',
   doorClosed: 'ปิดแล้ว',
@@ -74,10 +74,10 @@ export default {
   fetchHome: 'กำลังดึงอุปกรณ์จาก eWeLink home/id',
   foundWithIP: 'พบในท้องที่ด้วย IP',
   foundWithManIP: 'ใช้ IP ด้วยตนเอง',
-  hbVersionFail: 'เวอร์ชัน Homebridge ของคุณต่ำเกินไป - อัปเดตเป็น v1.3',
+  hbVersionFail: 'เวอร์ชัน Homebridge ของคุณต่ำเกินไป - อัปเดตเป็น v1.6',
   heaterSimNoSensor: 'คุณต้องกำหนดค่า ID อุปกรณ์ที่ให้การอ่านอุณหภูมิ',
   httpDisabled: 'ไคลเอ็นต์ HTTP/WS ถูกปิดใช้งานเป็น',
-  httpLogin10003: 'ดู http://bit.ly/hb-ewelink-errors สำหรับข้อมูลเพิ่มเติมเกี่ยวกับปัญหาการเข้าสู่ระบบ',
+  httpLogin10003: 'ดู https://bit.ly/hb-ewelink-errors สำหรับข้อมูลเพิ่มเติมเกี่ยวกับปัญหาการเข้าสู่ระบบ',
   httpRetry: 'ไม่สามารถเข้าถึง eWeLink ได้ ลองอีกครั้งใน 30 วินาที',
   identify: 'ระบุปุ่มกด',
   initialised: 'ปลั๊กอินเริ่มต้น กำลังตั้งค่าอุปกรณ์เสริม...',
@@ -141,7 +141,7 @@ export default {
   wsLoginError: 'การเข้าสู่ระบบ WS ล้มเหลวเนื่องจาก',
   wsLoginErrRecon: 'ไม่สามารถเปิด WS ได้และจะลองอีกครั้งใน 5 วินาที',
   wsLoginSuccess: 'เข้าสู่ระบบ WS สำเร็จ',
-  wsLogin406: 'การเข้าสู่ระบบ WS ล้มเหลว [406] ดู http://bit.ly/hb-ewelink-errors',
+  wsLogin406: 'การเข้าสู่ระบบ WS ล้มเหลว [406] ดู https://bit.ly/hb-ewelink-errors',
   wsPingError: 'ไม่สามารถส่ง WS ping เป็น',
   wsRec: 'ได้รับข้อความ WS',
   wsReconnectClose: 'WS ปิดเหตุการณ์และจะพยายามเชื่อมต่อใหม่ใน 5 วินาที',
@@ -165,5 +165,6 @@ export default {
     'มีเวลาให้รีวิวปลั๊กอินนี้หรือไม่? https://bit.ly/hb-ewelink-review',
     'ปลั๊กอินนี้มีคะแนน 5☆ บน HOOBS! https://bit.ly/hb-ewelink-review',
     'ต้องการดูปลั๊กอินนี้ในภาษาของคุณเองหรือ? แจ้งให้เราทราบ!',
+    'Want to beta test Homebridge 2.0? https://github.com/homebridge/homebridge/wiki/Homebridge-Beta-Testing',
   ],
 };
diff --git a/package-lock.json b/package-lock.json
index 5a5e9845..32ecfb0c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -28,28 +28,28 @@
       "license": "MIT",
       "dependencies": {
         "@homebridge/plugin-ui-utils": "^0.0.19",
-        "axios": "^1.3.2",
+        "axios": "^1.3.3",
         "node-persist": "^3.1.0",
         "p-queue": "^7.3.4",
         "websocket-as-promised": "^2.0.1",
-        "ws": "^8.12.0"
+        "ws": "^8.12.1"
       },
       "devDependencies": {
-        "eslint": "^8.33.0",
+        "eslint": "^8.34.0",
         "eslint-config-airbnb-base": "^15.0.0",
         "eslint-plugin-import": "^2.27.5",
-        "eslint-plugin-import-newlines": "^1.3.0",
+        "eslint-plugin-import-newlines": "^1.3.1",
         "eslint-plugin-sort-exports": "^0.8.0"
       },
       "engines": {
         "homebridge": "^1.6.0 || 2.0.0-beta.0",
-        "node": "^14.21.2 || ^16.19.0 || ^18.13.0"
+        "node": "^16.19.1 || ^18.14.2"
       }
     },
     "node_modules/@eslint/eslintrc": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.4.1.tgz",
-      "integrity": "sha512-XXrH9Uarn0stsyldqDYq8r++mROmWRI1xKMXa640Bb//SY1+ECYX6VzT6Lcx5frD0V30XieqJ0oX9I2Xj5aoMA==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.0.0.tgz",
+      "integrity": "sha512-fluIaaV+GyV24CCu/ggiHdV+j4RNh85yQnAYS/G2mZODZgGmmlrgCydjUcV3YvxCm9x8nMAfThsqTni4KiXT4A==",
       "dev": true,
       "dependencies": {
         "ajv": "^6.12.4",
@@ -69,6 +69,15 @@
         "url": "https://opencollective.com/eslint"
       }
     },
+    "node_modules/@eslint/js": {
+      "version": "8.35.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.35.0.tgz",
+      "integrity": "sha512-JXdzbRiWclLVoD8sNUjR443VVlYqiYmDVT6rGUEIEHU5YJW0gaVZwV2xgM7D4arkvASqD0IlLUVjHiFuxaftRw==",
+      "dev": true,
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      }
+    },
     "node_modules/@homebridge/plugin-ui-utils": {
       "version": "0.0.19",
       "resolved": "https://registry.npmjs.org/@homebridge/plugin-ui-utils/-/plugin-ui-utils-0.0.19.tgz",
@@ -287,9 +296,9 @@
       }
     },
     "node_modules/axios": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.3.2.tgz",
-      "integrity": "sha512-1M3O703bYqYuPhbHeya5bnhpYVsDDRyQSabNja04mZtboLNSuZ4YrltestrLXfHgmzua4TpUqRiVKbiQuo2epw==",
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.3.4.tgz",
+      "integrity": "sha512-toYm+Bsyl6VC5wSkfkbbNB6ROv7KY93PEBBL6xyDczaIHasAiv4wPqQ/c4RjoQzipxRD2W5g21cOqQulZ7rHwQ==",
       "dependencies": {
         "follow-redirects": "^1.15.0",
         "form-data": "^4.0.0",
@@ -564,12 +573,13 @@
       }
     },
     "node_modules/eslint": {
-      "version": "8.33.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.33.0.tgz",
-      "integrity": "sha512-WjOpFQgKK8VrCnAtl8We0SUOy/oVZ5NHykyMiagV1M9r8IFpIJX7DduK6n1mpfhlG7T1NLWm2SuD8QB7KFySaA==",
+      "version": "8.35.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.35.0.tgz",
+      "integrity": "sha512-BxAf1fVL7w+JLRQhWl2pzGeSiGqbWumV4WNvc9Rhp6tiCtm4oHnyPBSEtMGZwrQgudFQ+otqzWoPB7x+hxoWsw==",
       "dev": true,
       "dependencies": {
-        "@eslint/eslintrc": "^1.4.1",
+        "@eslint/eslintrc": "^2.0.0",
+        "@eslint/js": "8.35.0",
         "@humanwhocodes/config-array": "^0.11.8",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
@@ -583,7 +593,7 @@
         "eslint-utils": "^3.0.0",
         "eslint-visitor-keys": "^3.3.0",
         "espree": "^9.4.0",
-        "esquery": "^1.4.0",
+        "esquery": "^1.4.2",
         "esutils": "^2.0.2",
         "fast-deep-equal": "^3.1.3",
         "file-entry-cache": "^6.0.1",
@@ -714,9 +724,9 @@
       }
     },
     "node_modules/eslint-plugin-import-newlines": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import-newlines/-/eslint-plugin-import-newlines-1.3.0.tgz",
-      "integrity": "sha512-8rokf6NvxC10ugA1VNmzEIO75CzId7IDF3Ai2GNXl0Xr4VORpb8u+bxsjRuE+2BS8MfDbrK/MHUQZI2G9qQyyA==",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import-newlines/-/eslint-plugin-import-newlines-1.3.1.tgz",
+      "integrity": "sha512-7vyhwliGm+CTwteRw2ym+IO9OaksGYmSt63elPPBM0QJ3zwRwMKtgHOSHVtdHlrSERRTVCsWtMO8dDdAdmHMXg==",
       "dev": true,
       "bin": {
         "import-linter": "lib/index.js"
@@ -825,9 +835,9 @@
       }
     },
     "node_modules/esquery": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
-      "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz",
+      "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==",
       "dev": true,
       "dependencies": {
         "estraverse": "^5.1.0"
@@ -1266,12 +1276,12 @@
       }
     },
     "node_modules/is-array-buffer": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.1.tgz",
-      "integrity": "sha512-ASfLknmY8Xa2XtB4wmbz13Wu202baeA18cJBCeCy0wXUHZF0IPyVEXqKEcd+t2fNSLLL1vC6k7lxZEojNbISXQ==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.2.tgz",
+      "integrity": "sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==",
       "dependencies": {
         "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.3",
+        "get-intrinsic": "^1.2.0",
         "is-typed-array": "^1.1.10"
       },
       "funding": {
@@ -1618,9 +1628,9 @@
       "dev": true
     },
     "node_modules/node-persist": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/node-persist/-/node-persist-3.1.0.tgz",
-      "integrity": "sha512-/j+fd/u71wNgKf3V2bx4tnDm+3GvLnlCuvf2MXbJ3wern+67IAb6zN9Leu1tCWPlPNZ+v1hLSibVukkPK2HqJw==",
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/node-persist/-/node-persist-3.1.3.tgz",
+      "integrity": "sha512-CaFv+kSZtsc+VeDRldK1yR47k1vPLBpzYB9re2z7LIwITxwBtljMq3s8VQnnr+x3E8pQfHbc5r2IyJsBLJhtXg==",
       "engines": {
         "node": ">=10.12.0"
       }
@@ -2139,13 +2149,13 @@
       "dev": true
     },
     "node_modules/tsconfig-paths": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz",
-      "integrity": "sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==",
+      "version": "3.14.2",
+      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.2.tgz",
+      "integrity": "sha512-o/9iXgCYc5L/JxCHPe3Hvh8Q/2xm5Z+p18PESBU6Ff33695QnCHBEjcytY2q19ua7Mbl/DavtBOLq+oG0RCL+g==",
       "dev": true,
       "dependencies": {
         "@types/json5": "^0.0.29",
-        "json5": "^1.0.1",
+        "json5": "^1.0.2",
         "minimist": "^1.2.6",
         "strip-bom": "^3.0.0"
       }
@@ -2289,9 +2299,9 @@
       "dev": true
     },
     "node_modules/ws": {
-      "version": "8.12.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.12.0.tgz",
-      "integrity": "sha512-kU62emKIdKVeEIOIKVegvqpXMSTAMLJozpHZaJNDYqBjzlSYXQGviYwN1osDLJ9av68qHd4a2oSjd7yD4pacig==",
+      "version": "8.12.1",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.12.1.tgz",
+      "integrity": "sha512-1qo+M9Ba+xNhPB+YTWUlK6M17brTut5EXbcBaMRN5pH5dFrXz7lzz1ChFSUq3bOUl8yEvSenhHmYUNJxFzdJew==",
       "engines": {
         "node": ">=10.0.0"
       },
diff --git a/package.json b/package.json
index 0ca2fc20..3179481c 100644
--- a/package.json
+++ b/package.json
@@ -31,7 +31,7 @@
   },
   "engines": {
     "homebridge": "^1.6.0 || 2.0.0-beta.0",
-    "node": "^14.21.2 || ^16.19.0 || ^18.13.0"
+    "node": "^16.19.1 || ^18.14.2"
   },
   "repository": {
     "type": "git",
@@ -60,17 +60,17 @@
   ],
   "dependencies": {
     "@homebridge/plugin-ui-utils": "^0.0.19",
-    "axios": "^1.3.2",
+    "axios": "^1.3.3",
     "node-persist": "^3.1.0",
     "p-queue": "^7.3.4",
     "websocket-as-promised": "^2.0.1",
-    "ws": "^8.12.0"
+    "ws": "^8.12.1"
   },
   "devDependencies": {
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-plugin-import": "^2.27.5",
-    "eslint-plugin-import-newlines": "^1.3.0",
+    "eslint-plugin-import-newlines": "^1.3.1",
     "eslint-plugin-sort-exports": "^0.8.0",
-    "eslint": "^8.33.0"
+    "eslint": "^8.34.0"
   }
 }

From 1ac76c9845fe23bf8166584b33619af4b1ea8487 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Sat, 11 Mar 2023 05:10:57 +0000
Subject: [PATCH 3104/3183] next version prep

---
 README.md                           |   5 +-
 lib/homebridge-ui/public/index.html |   5 --
 package-lock.json                   | 111 ++++++++++++----------------
 package.json                        |   6 +-
 4 files changed, 53 insertions(+), 74 deletions(-)

diff --git a/README.md b/README.md
index 0b14f646..4355c916 100644
--- a/README.md
+++ b/README.md
@@ -28,8 +28,8 @@ Homebridge plugin to integrate eWeLink devices into HomeKit
 
 ### Prerequisites
 
-- To use this plugin, you will need to already have [Homebridge](https://homebridge.io) (at least v1.4) or [HOOBS](https://hoobs.org) (at least v4.2) installed. Refer to the links for more information and installation instructions.
-- Whilst it is recommended to use [Node](https://nodejs.org/en/) v16, the plugin supports v14 as per the [Homebridge guidelines](https://github.com/homebridge/homebridge/wiki/How-To-Update-Node.js).
+- [Homebridge](https://homebridge.io): v1.6 or [HOOBS](https://hoobs.org): v4.3 installed - refer to the links for more information and installation instructions.
+- Node: latest version of v16 or v18 - any other major version is not supported.
 
 ### Setup
 
@@ -37,7 +37,6 @@ Homebridge plugin to integrate eWeLink devices into HomeKit
 - [Configuration](https://github.com/bwp91/homebridge-ewelink/wiki/Configuration)
 - [Beta Version](https://github.com/bwp91/homebridge-ewelink/wiki/Beta-Version)
 - [Node Version](https://github.com/bwp91/homebridge-ewelink/wiki/Node-Version)
-- [Uninstallation](https://github.com/bwp91/homebridge-ewelink/wiki/Uninstallation)
 
 ### Features
 
diff --git a/lib/homebridge-ui/public/index.html b/lib/homebridge-ui/public/index.html
index e5ec875e..2cffe977 100644
--- a/lib/homebridge-ui/public/index.html
+++ b/lib/homebridge-ui/public/index.html
@@ -129,11 +129,6 @@ <h4>Setup</h4>
         >Node Version</a
       >
     </li>
-    <li>
-      <a href="https://github.com/bwp91/homebridge-ewelink/wiki/Uninstallation" target="_blank"
-        >Uninstallation</a
-      >
-    </li>
   </ul>
   <h4>Features</h4>
   <ul>
diff --git a/package-lock.json b/package-lock.json
index 32ecfb0c..6a9675ad 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -32,10 +32,10 @@
         "node-persist": "^3.1.0",
         "p-queue": "^7.3.4",
         "websocket-as-promised": "^2.0.1",
-        "ws": "^8.12.1"
+        "ws": "^8.13.0"
       },
       "devDependencies": {
-        "eslint": "^8.34.0",
+        "eslint": "^8.36.0",
         "eslint-config-airbnb-base": "^15.0.0",
         "eslint-plugin-import": "^2.27.5",
         "eslint-plugin-import-newlines": "^1.3.1",
@@ -43,18 +43,42 @@
       },
       "engines": {
         "homebridge": "^1.6.0 || 2.0.0-beta.0",
-        "node": "^16.19.1 || ^18.14.2"
+        "node": "^16.19.1 || ^18.15.0"
+      }
+    },
+    "node_modules/@eslint-community/eslint-utils": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.2.0.tgz",
+      "integrity": "sha512-gB8T4H4DEfX2IV9zGDJPOBgP1e/DbfCPDTtEqUMckpvzS1OYtva8JdFYBqMwYk7xAQ429WGF/UPqn8uQ//h2vQ==",
+      "dev": true,
+      "dependencies": {
+        "eslint-visitor-keys": "^3.3.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "peerDependencies": {
+        "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0"
+      }
+    },
+    "node_modules/@eslint-community/regexpp": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.4.0.tgz",
+      "integrity": "sha512-A9983Q0LnDGdLPjxyXQ00sbV+K+O+ko2Dr+CZigbHWtX9pNfxlaBkMR8X1CztI73zuEyEBXTVjx7CE+/VSwDiQ==",
+      "dev": true,
+      "engines": {
+        "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
       }
     },
     "node_modules/@eslint/eslintrc": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.0.0.tgz",
-      "integrity": "sha512-fluIaaV+GyV24CCu/ggiHdV+j4RNh85yQnAYS/G2mZODZgGmmlrgCydjUcV3YvxCm9x8nMAfThsqTni4KiXT4A==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.0.1.tgz",
+      "integrity": "sha512-eFRmABvW2E5Ho6f5fHLqgena46rOj7r7OKHYfLElqcBfGFHHpjBhivyi5+jOEQuSpdc/1phIZJlbC2te+tZNIw==",
       "dev": true,
       "dependencies": {
         "ajv": "^6.12.4",
         "debug": "^4.3.2",
-        "espree": "^9.4.0",
+        "espree": "^9.5.0",
         "globals": "^13.19.0",
         "ignore": "^5.2.0",
         "import-fresh": "^3.2.1",
@@ -70,9 +94,9 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "8.35.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.35.0.tgz",
-      "integrity": "sha512-JXdzbRiWclLVoD8sNUjR443VVlYqiYmDVT6rGUEIEHU5YJW0gaVZwV2xgM7D4arkvASqD0IlLUVjHiFuxaftRw==",
+      "version": "8.36.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.36.0.tgz",
+      "integrity": "sha512-lxJ9R5ygVm8ZWgYdUweoq5ownDlJ4upvoWmO4eLxBYHdMo+vZ/Rx0EN6MbKWDJOSUGrqJy2Gt+Dyv/VKml0fjg==",
       "dev": true,
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -573,13 +597,15 @@
       }
     },
     "node_modules/eslint": {
-      "version": "8.35.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.35.0.tgz",
-      "integrity": "sha512-BxAf1fVL7w+JLRQhWl2pzGeSiGqbWumV4WNvc9Rhp6tiCtm4oHnyPBSEtMGZwrQgudFQ+otqzWoPB7x+hxoWsw==",
+      "version": "8.36.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.36.0.tgz",
+      "integrity": "sha512-Y956lmS7vDqomxlaaQAHVmeb4tNMp2FWIvU/RnU5BD3IKMD/MJPr76xdyr68P8tV1iNMvN2mRK0yy3c+UjL+bw==",
       "dev": true,
       "dependencies": {
-        "@eslint/eslintrc": "^2.0.0",
-        "@eslint/js": "8.35.0",
+        "@eslint-community/eslint-utils": "^4.2.0",
+        "@eslint-community/regexpp": "^4.4.0",
+        "@eslint/eslintrc": "^2.0.1",
+        "@eslint/js": "8.36.0",
         "@humanwhocodes/config-array": "^0.11.8",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
@@ -590,9 +616,8 @@
         "doctrine": "^3.0.0",
         "escape-string-regexp": "^4.0.0",
         "eslint-scope": "^7.1.1",
-        "eslint-utils": "^3.0.0",
         "eslint-visitor-keys": "^3.3.0",
-        "espree": "^9.4.0",
+        "espree": "^9.5.0",
         "esquery": "^1.4.2",
         "esutils": "^2.0.2",
         "fast-deep-equal": "^3.1.3",
@@ -614,7 +639,6 @@
         "minimatch": "^3.1.2",
         "natural-compare": "^1.4.0",
         "optionator": "^0.9.1",
-        "regexpp": "^3.2.0",
         "strip-ansi": "^6.0.1",
         "strip-json-comments": "^3.1.0",
         "text-table": "^0.2.0"
@@ -781,33 +805,6 @@
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       }
     },
-    "node_modules/eslint-utils": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
-      "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
-      "dev": true,
-      "dependencies": {
-        "eslint-visitor-keys": "^2.0.0"
-      },
-      "engines": {
-        "node": "^10.0.0 || ^12.0.0 || >= 14.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/mysticatea"
-      },
-      "peerDependencies": {
-        "eslint": ">=5"
-      }
-    },
-    "node_modules/eslint-utils/node_modules/eslint-visitor-keys": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
-      "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/eslint-visitor-keys": {
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
@@ -818,9 +815,9 @@
       }
     },
     "node_modules/espree": {
-      "version": "9.4.1",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-9.4.1.tgz",
-      "integrity": "sha512-XwctdmTO6SIvCzd9810yyNzIrOrqNYV9Koizx4C/mRhf9uq0o4yHoCEU/670pOxOL/MSraektvSAji79kX90Vg==",
+      "version": "9.5.0",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-9.5.0.tgz",
+      "integrity": "sha512-JPbJGhKc47++oo4JkEoTe2wjy4fmMwvFpgJT9cQzmfXKp22Dr6Hf1tdCteLz1h0P3t+mGvWZ+4Uankvh8+c6zw==",
       "dev": true,
       "dependencies": {
         "acorn": "^8.8.0",
@@ -1917,18 +1914,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/regexpp": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
-      "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/mysticatea"
-      }
-    },
     "node_modules/resolve": {
       "version": "1.22.1",
       "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz",
@@ -2299,9 +2284,9 @@
       "dev": true
     },
     "node_modules/ws": {
-      "version": "8.12.1",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.12.1.tgz",
-      "integrity": "sha512-1qo+M9Ba+xNhPB+YTWUlK6M17brTut5EXbcBaMRN5pH5dFrXz7lzz1ChFSUq3bOUl8yEvSenhHmYUNJxFzdJew==",
+      "version": "8.13.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz",
+      "integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==",
       "engines": {
         "node": ">=10.0.0"
       },
diff --git a/package.json b/package.json
index 3179481c..63927189 100644
--- a/package.json
+++ b/package.json
@@ -31,7 +31,7 @@
   },
   "engines": {
     "homebridge": "^1.6.0 || 2.0.0-beta.0",
-    "node": "^16.19.1 || ^18.14.2"
+    "node": "^16.19.1 || ^18.15.0"
   },
   "repository": {
     "type": "git",
@@ -64,13 +64,13 @@
     "node-persist": "^3.1.0",
     "p-queue": "^7.3.4",
     "websocket-as-promised": "^2.0.1",
-    "ws": "^8.12.1"
+    "ws": "^8.13.0"
   },
   "devDependencies": {
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-plugin-import": "^2.27.5",
     "eslint-plugin-import-newlines": "^1.3.1",
     "eslint-plugin-sort-exports": "^0.8.0",
-    "eslint": "^8.34.0"
+    "eslint": "^8.36.0"
   }
 }

From c668a972bd46544919fcb01f586a4f3fe7d32da4 Mon Sep 17 00:00:00 2001
From: bwp91 <43026681+bwp91@users.noreply.github.com>
Date: Sun, 19 Mar 2023 15:10:38 +0000
Subject: [PATCH 3105/3183] Update platform.js

---
 lib/platform.js | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/lib/platform.js b/lib/platform.js
index e0034856..9a4b5ce1 100644
--- a/lib/platform.js
+++ b/lib/platform.js
@@ -373,7 +373,13 @@ export default class {
                       this.obstructSwitches[parsed] = id;
                     }
                     break;
-                  case 'overrideLogging':
+                  case 'sensorId':
+                    if (typeof v !== 'string' || v === '') {
+                      logIgnore(`${key}.${id}.${k}`);
+                    } else {
+                      this.deviceConf[id].sensorId = parseDeviceId(v);
+                    }
+                    break;
                   case 'sensorType':
                   case 'showAs':
                   case 'showAsEachen':
@@ -386,13 +392,6 @@ export default class {
                     }
                     break;
                   }
-                  case 'sensorId':
-                    if (typeof v !== 'string' || v === '') {
-                      logIgnore(`${key}.${id}.${k}`);
-                    } else {
-                      this.deviceConf[id].sensorId = parseDeviceId(v);
-                    }
-                    break;
                   default:
                     logRemove(`${key}.${id}.${k}`);
                 }
@@ -450,9 +449,9 @@ export default class {
 
         // Log that using a beta will generate a lot of debug logs
         if (this.isBeta) {
-          const divide = '*'.repeat(platformLang.beta.length + 1); // don't forget the full stop (+1!)
+          const divide = '*'.repeat(this.lang.beta.length + 1); // don't forget the full stop (+1!)
           this.log.warn(divide);
-          this.log.warn(`${platformLang.beta}.`);
+          this.log.warn(`${this.lang.beta}.`);
           this.log.warn(divide);
         }
       } else {

From 8dbaadfaa09b59e0d6749a172f0f90359dbe2535 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Sun, 19 Mar 2023 15:11:28 +0000
Subject: [PATCH 3106/3183] 10.4.1-beta.1

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 6a9675ad..58837f30 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "10.4.1-beta.0",
+  "version": "10.4.1-beta.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "10.4.1-beta.0",
+      "version": "10.4.1-beta.1",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 63927189..2c035725 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "10.4.1-beta.0",
+  "version": "10.4.1-beta.1",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From 5eb93a08ea9b63829484a88ba9654a1a85e64d59 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Wed, 5 Apr 2023 22:30:22 +0100
Subject: [PATCH 3107/3183] prep beta

---
 .github/ISSUE_TEMPLATE/config.yml |   6 +-
 CHANGELOG.md                      |   3 +-
 README.md                         |  11 ++-
 lib/platform.js                   |   9 +--
 lib/utils/lang-en.js              |  14 +---
 lib/utils/lang-fr.js              |  12 +--
 lib/utils/lang-th.js              |  14 +---
 package-lock.json                 | 128 +++++++++++++++++++-----------
 package.json                      |   6 +-
 9 files changed, 97 insertions(+), 106 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 17e1c2a2..e884e3a7 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,5 +1,5 @@
 blank_issues_enabled: false
 contact_links:
-  - name: 🌍 My Discord Server
-    url: https://discord.gg/cMGhNtZ3tW
-    about: Join my personal Discord server where you can post messages in the plugin channels or message me directly. This is often easier and quicker than creating an issue on here.
+  - name: 🌍 Homebridge Discord Server
+    url: https://discord.gg/bHjKNkN
+    about: Please ask and answer questions here.
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 695f99db..32e6a946 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,10 +14,9 @@ All notable changes to homebridge-ewelink will be documented in this file.
 ### Changed
 
 - Bump `homebridge` recommended version to v1.6.0 or v2.0.0-beta
-- Bump `node` recommended versions to v16.19.1 or v18.14.2
+- Bump `node` recommended versions to v16.20.0 or v18.15.0
 - Updated dependencies
 
-
 ## 10.4.0 (2023-01-07)
 
 ### Added
diff --git a/README.md b/README.md
index 4355c916..9558b5b0 100644
--- a/README.md
+++ b/README.md
@@ -7,13 +7,11 @@
 
 Homebridge plugin to integrate eWeLink devices into HomeKit
 
-[![verified-by-homebridge](https://badgen.net/badge/homebridge/verified/purple)](https://github.com/homebridge/homebridge/wiki/Verified-Plugins)
-[![hoobs-certified](https://badgen.net/badge/HOOBS/certified/yellow)](https://plugins.hoobs.org/plugin/homebridge-ewelink)  
 [![npm](https://img.shields.io/npm/v/homebridge-ewelink/latest?label=latest)](https://www.npmjs.com/package/homebridge-ewelink)
 [![npm](https://img.shields.io/npm/v/homebridge-ewelink/beta?label=beta)](https://github.com/bwp91/homebridge-ewelink/wiki/Beta-Version)  
+[![verified-by-homebridge](https://badgen.net/badge/homebridge/verified/purple)](https://github.com/homebridge/homebridge/wiki/Verified-Plugins)
+[![hoobs-certified](https://badgen.net/badge/HOOBS/certified/yellow?label=hoobs)](https://plugins.hoobs.org/plugin/homebridge-ewelink)  
 [![npm](https://img.shields.io/npm/dt/homebridge-ewelink)](https://www.npmjs.com/package/homebridge-ewelink)
-[![JavaScript Style Guide](https://img.shields.io/badge/code_style-standard-brightgreen.svg)](https://standardjs.com)  
-[![Discord](https://img.shields.io/discord/784827113378676736?color=728ED5&logo=discord&label=bwp91-discord)](https://discord.com/channels/784827113378676736/784827113378676739)
 [![Discord](https://img.shields.io/discord/432663330281226270?color=728ED5&logo=discord&label=hb-discord)](https://discord.com/channels/432663330281226270/742733745743855627)
 
 </span>
@@ -28,8 +26,9 @@ Homebridge plugin to integrate eWeLink devices into HomeKit
 
 ### Prerequisites
 
-- [Homebridge](https://homebridge.io): v1.6 or [HOOBS](https://hoobs.org): v4.3 installed - refer to the links for more information and installation instructions.
-- Node: latest version of v16 or v18 - any other major version is not supported.
+- To use this plugin, you will need to already have:
+  - [Node](https://nodejs.org): latest version of v16 or v18 - any other major version is not supported.
+  - [Homebridge](https://homebridge.io): v1.6 - refer to link for more information and installation instructions.
 
 ### Setup
 
diff --git a/lib/platform.js b/lib/platform.js
index 9a4b5ce1..4eb43e4a 100644
--- a/lib/platform.js
+++ b/lib/platform.js
@@ -628,13 +628,8 @@ export default class {
         });
       }
 
-      // Log that the plugin setup has been successful with a welcome message
-      const randIndex = Math.floor(Math.random() * this.lang.zWelcome.length);
-
-      // Set a small timeout so the message should appear after the API port log entry
-      setTimeout(() => {
-        this.log('%s. %s', this.lang.complete, this.lang.zWelcome[randIndex]);
-      }, 2000);
+      // Setup successful
+      this.log('%s. %s', platformLang.complete, platformLang.welcome);
     } catch (err) {
       // Catch any errors during setup
       const eText = parseError(err, [
diff --git a/lib/utils/lang-en.js b/lib/utils/lang-en.js
index 9d17ebea..b9c4ebbe 100644
--- a/lib/utils/lang-en.js
+++ b/lib/utils/lang-en.js
@@ -135,6 +135,7 @@ export default {
   viaAL: 'via adaptive lighting',
   viaLAN: 'via LAN',
   viaWS: 'via WS',
+  welcome: 'This plugin has been made with ♥ by bwp91, please consider a ☆ on GitHub if you are finding it useful!',
   wsHostRec: 'Web socket host received',
   wsLogin: 'Sending WS login request',
   wsLoginErr: 'Unknown WS parameters received',
@@ -154,17 +155,4 @@ export default {
   wsUnkAct: 'WS message received has unknown action',
   wsUnkCmd: 'WS unknown command received',
   wsUnkRes: 'unknown WS response',
-  zWelcome: [
-    'Don\'t forget to ☆ this plugin on GitHub if you\'re finding it useful!',
-    'Have a feature request? Visit https://bit.ly/hb-ewelink-issues to ask!',
-    'Interested in sponsoring this plugin? https://github.com/sponsors/bwp91',
-    'Join the plugin\'s Discord community! https://discord.gg/cMGhNtZ3tW',
-    'Thanks for using this plugin, I hope you find it helpful!',
-    'This plugin has been made with ♥ by bwp91 from the UK!',
-    'Check out my other Homebridge plugins! https://github.com/bwp91',
-    'Have time to give this plugin a review? https://bit.ly/hb-ewelink-review',
-    'This plugin currently has a 5☆ rating on HOOBS! https://bit.ly/hb-ewelink-review',
-    'Want to see this plugin in your own language? Let me know!',
-    'Want to beta test Homebridge 2.0? https://github.com/homebridge/homebridge/wiki/Homebridge-Beta-Testing',
-  ],
 };
diff --git a/lib/utils/lang-fr.js b/lib/utils/lang-fr.js
index ac80739d..70794f08 100644
--- a/lib/utils/lang-fr.js
+++ b/lib/utils/lang-fr.js
@@ -138,6 +138,7 @@ export default {
   viaAL: 'via éclairafe adaptatif',
   viaLAN: 'via LAN',
   viaWS: 'via WS',
+  welcome: 'Ce plugin a été fait avec ♥ par bwp91, n\'oubliez pas de ☆ ce plugin sur GitHub si vous le trouvez utile!',
   wsHostRec: 'reception d\'un hôte Web socket',
   wsLogin: 'Envoie d\'une requête de connection WS',
   wsLoginErr: 'Paramètres WS reçus inconnus',
@@ -157,15 +158,4 @@ export default {
   wsUnkAct: 'message WS reçus comme action inconnue',
   wsUnkCmd: 'commande WS inconnue reçue',
   wsUnkRes: 'réponse WS inconnue reçue',
-  zWelcome: [
-    'N\'oubliez pas de ☆ ce plugin sur GitHub si vous le trouvez utile!',
-    'Vous avez une demande de fonctionnalité? Visitez https://bit.ly/hb-ewelink-issues pour demander!',
-    'Intéressé pour sponsoriser ce plugin? https://github.com/sponsors/bwp91',
-    'Rejoignez la communauté Discord de ce plugin! https://discord.gg/cMGhNtZ3tW',
-    'Merci d\'utiliser ce plugin. J\'espère que vous le trouvez utile!',
-    'Ce plugin a été fait avec ♥ par bwp91 au Royaume-Unis!',
-    'Un peu de temps pour laisser un avis sur ce plugin? https://bit.ly/hb-ewelink-review',
-    'Vous voulez voir ce plugin dans votre langage ? Dite le moi!',
-    'Want to beta test Homebridge 2.0? https://github.com/homebridge/homebridge/wiki/Homebridge-Beta-Testing',
-  ],
 };
diff --git a/lib/utils/lang-th.js b/lib/utils/lang-th.js
index 8dffeea8..7c3908a2 100644
--- a/lib/utils/lang-th.js
+++ b/lib/utils/lang-th.js
@@ -135,6 +135,7 @@ export default {
   viaAL: 'ผ่านแสงแบบปรับได้',
   viaLAN: 'ผ่าน LAN',
   viaWS: 'ผ่าน WS',
+  welcome: 'ปลั๊กอินนี้สร้างด้วย ♥ โดย bwp91, อย่าลืม ☆ ปลั๊กอินนี้บน GitHub หากคุณพบว่ามีประโยชน์!',
   wsHostRec: 'ได้รับโฮสต์เว็บซ็อกเก็ต',
   wsLogin: 'กำลังส่งคำขอเข้าสู่ระบบ WS',
   wsLoginErr: 'ได้รับพารามิเตอร์ WS ที่ไม่รู้จัก',
@@ -154,17 +155,4 @@ export default {
   wsUnkAct: 'ได้รับข้อความ WS มีการดำเนินการที่ไม่รู้จัก',
   wsUnkCmd: 'ได้รับคำสั่ง WS ที่ไม่รู้จัก',
   wsUnkRes: 'การตอบสนอง WS ที่ไม่รู้จัก',
-  zWelcome: [
-    'อย่าลืม ☆ ปลั๊กอินนี้บน GitHub หากคุณพบว่ามีประโยชน์!',
-    'มีคำขอคุณสมบัติ? เข้าไปที่ https://bit.ly/hb-ewelink-issues เพื่อสอบถาม!',
-    'สนใจสนับสนุนปลั๊กอินนี้หรือไม่? https://github.com/sponsors/bwp91',
-    'เข้าร่วมชุมชน Discord ของปลั๊กอิน! https://discord.gg/cMGhNtZ3tW',
-    'ขอบคุณที่ใช้ปลั๊กอินนี้ ฉันหวังว่าคุณจะพบว่ามีประโยชน์!',
-    'ปลั๊กอินนี้สร้างด้วย ♥ โดย bwp91 จากสหราชอาณาจักร!',
-    'ลองดูปลั๊กอิน Homebridge อื่นๆ ของฉันสิ! https://github.com/bwp91',
-    'มีเวลาให้รีวิวปลั๊กอินนี้หรือไม่? https://bit.ly/hb-ewelink-review',
-    'ปลั๊กอินนี้มีคะแนน 5☆ บน HOOBS! https://bit.ly/hb-ewelink-review',
-    'ต้องการดูปลั๊กอินนี้ในภาษาของคุณเองหรือ? แจ้งให้เราทราบ!',
-    'Want to beta test Homebridge 2.0? https://github.com/homebridge/homebridge/wiki/Homebridge-Beta-Testing',
-  ],
 };
diff --git a/package-lock.json b/package-lock.json
index 58837f30..6fa90a68 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -28,14 +28,14 @@
       "license": "MIT",
       "dependencies": {
         "@homebridge/plugin-ui-utils": "^0.0.19",
-        "axios": "^1.3.3",
+        "axios": "^1.3.5",
         "node-persist": "^3.1.0",
         "p-queue": "^7.3.4",
         "websocket-as-promised": "^2.0.1",
         "ws": "^8.13.0"
       },
       "devDependencies": {
-        "eslint": "^8.36.0",
+        "eslint": "^8.37.0",
         "eslint-config-airbnb-base": "^15.0.0",
         "eslint-plugin-import": "^2.27.5",
         "eslint-plugin-import-newlines": "^1.3.1",
@@ -43,13 +43,13 @@
       },
       "engines": {
         "homebridge": "^1.6.0 || 2.0.0-beta.0",
-        "node": "^16.19.1 || ^18.15.0"
+        "node": "^16.20.0 || ^18.15.0"
       }
     },
     "node_modules/@eslint-community/eslint-utils": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.2.0.tgz",
-      "integrity": "sha512-gB8T4H4DEfX2IV9zGDJPOBgP1e/DbfCPDTtEqUMckpvzS1OYtva8JdFYBqMwYk7xAQ429WGF/UPqn8uQ//h2vQ==",
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
+      "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==",
       "dev": true,
       "dependencies": {
         "eslint-visitor-keys": "^3.3.0"
@@ -62,23 +62,23 @@
       }
     },
     "node_modules/@eslint-community/regexpp": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.4.0.tgz",
-      "integrity": "sha512-A9983Q0LnDGdLPjxyXQ00sbV+K+O+ko2Dr+CZigbHWtX9pNfxlaBkMR8X1CztI73zuEyEBXTVjx7CE+/VSwDiQ==",
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.5.0.tgz",
+      "integrity": "sha512-vITaYzIcNmjn5tF5uxcZ/ft7/RXGrMUIS9HalWckEOF6ESiwXKoMzAQf2UW0aVd6rnOeExTJVd5hmWXucBKGXQ==",
       "dev": true,
       "engines": {
         "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
       }
     },
     "node_modules/@eslint/eslintrc": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.0.1.tgz",
-      "integrity": "sha512-eFRmABvW2E5Ho6f5fHLqgena46rOj7r7OKHYfLElqcBfGFHHpjBhivyi5+jOEQuSpdc/1phIZJlbC2te+tZNIw==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.0.2.tgz",
+      "integrity": "sha512-3W4f5tDUra+pA+FzgugqL2pRimUTDJWKr7BINqOpkZrC0uYI0NIc0/JFgBROCU07HR6GieA5m3/rsPIhDmCXTQ==",
       "dev": true,
       "dependencies": {
         "ajv": "^6.12.4",
         "debug": "^4.3.2",
-        "espree": "^9.5.0",
+        "espree": "^9.5.1",
         "globals": "^13.19.0",
         "ignore": "^5.2.0",
         "import-fresh": "^3.2.1",
@@ -94,9 +94,9 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "8.36.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.36.0.tgz",
-      "integrity": "sha512-lxJ9R5ygVm8ZWgYdUweoq5ownDlJ4upvoWmO4eLxBYHdMo+vZ/Rx0EN6MbKWDJOSUGrqJy2Gt+Dyv/VKml0fjg==",
+      "version": "8.37.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.37.0.tgz",
+      "integrity": "sha512-x5vzdtOOGgFVDCUs81QRB2+liax8rFg3+7hqM+QhBG0/G3F1ZsoYl97UrqgHgQ9KKT7G6c4V+aTUCgu/n22v1A==",
       "dev": true,
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -248,6 +248,18 @@
       "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
       "dev": true
     },
+    "node_modules/array-buffer-byte-length": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz",
+      "integrity": "sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A==",
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "is-array-buffer": "^3.0.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/array-includes": {
       "version": "3.1.6",
       "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.6.tgz",
@@ -320,9 +332,9 @@
       }
     },
     "node_modules/axios": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.3.4.tgz",
-      "integrity": "sha512-toYm+Bsyl6VC5wSkfkbbNB6ROv7KY93PEBBL6xyDczaIHasAiv4wPqQ/c4RjoQzipxRD2W5g21cOqQulZ7rHwQ==",
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.3.5.tgz",
+      "integrity": "sha512-glL/PvG/E+xCWwV8S6nCHcrfg1exGx7vxyUIivIA1iL7BIh6bePylCfVHwp6k13ao7SATxB6imau2kqY+I67kw==",
       "dependencies": {
         "follow-redirects": "^1.15.0",
         "form-data": "^4.0.0",
@@ -501,17 +513,17 @@
       }
     },
     "node_modules/es-abstract": {
-      "version": "1.21.1",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.21.1.tgz",
-      "integrity": "sha512-QudMsPOz86xYz/1dG1OuGBKOELjCh99IIWHLzy5znUB6j8xG2yMA7bfTV86VSqKF+Y/H08vQPR+9jyXpuC6hfg==",
+      "version": "1.21.2",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.21.2.tgz",
+      "integrity": "sha512-y/B5POM2iBnIxCiernH1G7rC9qQoM77lLIMQLuob0zhp8C56Po81+2Nj0WFKnd0pNReDTnkYryc+zhOzpEIROg==",
       "dependencies": {
+        "array-buffer-byte-length": "^1.0.0",
         "available-typed-arrays": "^1.0.5",
         "call-bind": "^1.0.2",
         "es-set-tostringtag": "^2.0.1",
         "es-to-primitive": "^1.2.1",
-        "function-bind": "^1.1.1",
         "function.prototype.name": "^1.1.5",
-        "get-intrinsic": "^1.1.3",
+        "get-intrinsic": "^1.2.0",
         "get-symbol-description": "^1.0.0",
         "globalthis": "^1.0.3",
         "gopd": "^1.0.1",
@@ -519,8 +531,8 @@
         "has-property-descriptors": "^1.0.0",
         "has-proto": "^1.0.1",
         "has-symbols": "^1.0.3",
-        "internal-slot": "^1.0.4",
-        "is-array-buffer": "^3.0.1",
+        "internal-slot": "^1.0.5",
+        "is-array-buffer": "^3.0.2",
         "is-callable": "^1.2.7",
         "is-negative-zero": "^2.0.2",
         "is-regex": "^1.1.4",
@@ -528,11 +540,12 @@
         "is-string": "^1.0.7",
         "is-typed-array": "^1.1.10",
         "is-weakref": "^1.0.2",
-        "object-inspect": "^1.12.2",
+        "object-inspect": "^1.12.3",
         "object-keys": "^1.1.1",
         "object.assign": "^4.1.4",
         "regexp.prototype.flags": "^1.4.3",
         "safe-regex-test": "^1.0.0",
+        "string.prototype.trim": "^1.2.7",
         "string.prototype.trimend": "^1.0.6",
         "string.prototype.trimstart": "^1.0.6",
         "typed-array-length": "^1.0.4",
@@ -597,15 +610,15 @@
       }
     },
     "node_modules/eslint": {
-      "version": "8.36.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.36.0.tgz",
-      "integrity": "sha512-Y956lmS7vDqomxlaaQAHVmeb4tNMp2FWIvU/RnU5BD3IKMD/MJPr76xdyr68P8tV1iNMvN2mRK0yy3c+UjL+bw==",
+      "version": "8.37.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.37.0.tgz",
+      "integrity": "sha512-NU3Ps9nI05GUoVMxcZx1J8CNR6xOvUT4jAUMH5+z8lpp3aEdPVCImKw6PWG4PY+Vfkpr+jvMpxs/qoE7wq0sPw==",
       "dev": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.4.0",
-        "@eslint/eslintrc": "^2.0.1",
-        "@eslint/js": "8.36.0",
+        "@eslint/eslintrc": "^2.0.2",
+        "@eslint/js": "8.37.0",
         "@humanwhocodes/config-array": "^0.11.8",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
@@ -616,8 +629,8 @@
         "doctrine": "^3.0.0",
         "escape-string-regexp": "^4.0.0",
         "eslint-scope": "^7.1.1",
-        "eslint-visitor-keys": "^3.3.0",
-        "espree": "^9.5.0",
+        "eslint-visitor-keys": "^3.4.0",
+        "espree": "^9.5.1",
         "esquery": "^1.4.2",
         "esutils": "^2.0.2",
         "fast-deep-equal": "^3.1.3",
@@ -806,23 +819,26 @@
       }
     },
     "node_modules/eslint-visitor-keys": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
-      "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.0.tgz",
+      "integrity": "sha512-HPpKPUBQcAsZOsHAFwTtIKcYlCje62XB7SEAcxjtmW6TD1WVpkS6i6/hOVtTZIl4zGj/mBqpFVGvaDneik+VoQ==",
       "dev": true,
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
       }
     },
     "node_modules/espree": {
-      "version": "9.5.0",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-9.5.0.tgz",
-      "integrity": "sha512-JPbJGhKc47++oo4JkEoTe2wjy4fmMwvFpgJT9cQzmfXKp22Dr6Hf1tdCteLz1h0P3t+mGvWZ+4Uankvh8+c6zw==",
+      "version": "9.5.1",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-9.5.1.tgz",
+      "integrity": "sha512-5yxtHSZXRSW5pvv3hAlXM5+/Oswi1AUFqBmbibKb5s6bp3rGIDkyXU6xCoyuuLhijr4SFwPrXRoZjz0AZDN9tg==",
       "dev": true,
       "dependencies": {
         "acorn": "^8.8.0",
         "acorn-jsx": "^5.3.2",
-        "eslint-visitor-keys": "^3.3.0"
+        "eslint-visitor-keys": "^3.4.0"
       },
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -1493,9 +1509,9 @@
       "dev": true
     },
     "node_modules/js-sdsl": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.3.0.tgz",
-      "integrity": "sha512-mifzlm2+5nZ+lEcLJMoBK0/IH/bDg8XnJfd/Wq6IP+xoCjLZsTOnV2QpxlVbX9bMnkl5PdEjNtBJ9Cj1NjifhQ==",
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.4.0.tgz",
+      "integrity": "sha512-FfVSdx6pJ41Oa+CF7RDaFmTnCaFhua+SNYQX74riGOpl96x+2jQCqEfQ2bnXu/5DPCqlRuiqyvTJM0Qjz26IVg==",
       "dev": true,
       "funding": {
         "type": "opencollective",
@@ -1915,12 +1931,12 @@
       }
     },
     "node_modules/resolve": {
-      "version": "1.22.1",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz",
-      "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==",
+      "version": "1.22.2",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.2.tgz",
+      "integrity": "sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==",
       "dev": true,
       "dependencies": {
-        "is-core-module": "^2.9.0",
+        "is-core-module": "^2.11.0",
         "path-parse": "^1.0.7",
         "supports-preserve-symlinks-flag": "^1.0.0"
       },
@@ -2044,6 +2060,22 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/string.prototype.trim": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz",
+      "integrity": "sha512-p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg==",
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/string.prototype.trimend": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz",
diff --git a/package.json b/package.json
index 2c035725..1a799cdc 100644
--- a/package.json
+++ b/package.json
@@ -31,7 +31,7 @@
   },
   "engines": {
     "homebridge": "^1.6.0 || 2.0.0-beta.0",
-    "node": "^16.19.1 || ^18.15.0"
+    "node": "^16.20.0 || ^18.15.0"
   },
   "repository": {
     "type": "git",
@@ -60,7 +60,7 @@
   ],
   "dependencies": {
     "@homebridge/plugin-ui-utils": "^0.0.19",
-    "axios": "^1.3.3",
+    "axios": "^1.3.5",
     "node-persist": "^3.1.0",
     "p-queue": "^7.3.4",
     "websocket-as-promised": "^2.0.1",
@@ -71,6 +71,6 @@
     "eslint-plugin-import": "^2.27.5",
     "eslint-plugin-import-newlines": "^1.3.1",
     "eslint-plugin-sort-exports": "^0.8.0",
-    "eslint": "^8.36.0"
+    "eslint": "^8.37.0"
   }
 }

From daae08ff74892d98345b4334c977d73e78d379ac Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Wed, 5 Apr 2023 22:30:50 +0100
Subject: [PATCH 3108/3183] 10.4.1-beta.2

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 6fa90a68..db7187a5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "10.4.1-beta.1",
+  "version": "10.4.1-beta.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "10.4.1-beta.1",
+      "version": "10.4.1-beta.2",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 1a799cdc..c4c8d990 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "10.4.1-beta.1",
+  "version": "10.4.1-beta.2",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From dddbfcf7164fb4445f71d0506edca0e68e099ab2 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Mon, 10 Apr 2023 16:45:48 +0100
Subject: [PATCH 3109/3183] fix welcome

---
 lib/platform.js   |  2 +-
 package-lock.json | 16 ++++++++--------
 package.json      |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/lib/platform.js b/lib/platform.js
index 4eb43e4a..0967b3a9 100644
--- a/lib/platform.js
+++ b/lib/platform.js
@@ -629,7 +629,7 @@ export default class {
       }
 
       // Setup successful
-      this.log('%s. %s', platformLang.complete, platformLang.welcome);
+      this.log('%s. %s', this.lang.complete, this.lang.welcome);
     } catch (err) {
       // Catch any errors during setup
       const eText = parseError(err, [
diff --git a/package-lock.json b/package-lock.json
index db7187a5..ff0dec82 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -35,7 +35,7 @@
         "ws": "^8.13.0"
       },
       "devDependencies": {
-        "eslint": "^8.37.0",
+        "eslint": "^8.38.0",
         "eslint-config-airbnb-base": "^15.0.0",
         "eslint-plugin-import": "^2.27.5",
         "eslint-plugin-import-newlines": "^1.3.1",
@@ -94,9 +94,9 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "8.37.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.37.0.tgz",
-      "integrity": "sha512-x5vzdtOOGgFVDCUs81QRB2+liax8rFg3+7hqM+QhBG0/G3F1ZsoYl97UrqgHgQ9KKT7G6c4V+aTUCgu/n22v1A==",
+      "version": "8.38.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.38.0.tgz",
+      "integrity": "sha512-IoD2MfUnOV58ghIHCiil01PcohxjbYR/qCxsoC+xNgUwh1EY8jOOrYmu3d3a71+tJJ23uscEV4X2HJWMsPJu4g==",
       "dev": true,
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -610,15 +610,15 @@
       }
     },
     "node_modules/eslint": {
-      "version": "8.37.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.37.0.tgz",
-      "integrity": "sha512-NU3Ps9nI05GUoVMxcZx1J8CNR6xOvUT4jAUMH5+z8lpp3aEdPVCImKw6PWG4PY+Vfkpr+jvMpxs/qoE7wq0sPw==",
+      "version": "8.38.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.38.0.tgz",
+      "integrity": "sha512-pIdsD2jwlUGf/U38Jv97t8lq6HpaU/G9NKbYmpWpZGw3LdTNhZLbJePqxOXGB5+JEKfOPU/XLxYxFh03nr1KTg==",
       "dev": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.4.0",
         "@eslint/eslintrc": "^2.0.2",
-        "@eslint/js": "8.37.0",
+        "@eslint/js": "8.38.0",
         "@humanwhocodes/config-array": "^0.11.8",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
diff --git a/package.json b/package.json
index c4c8d990..dee2bc9a 100644
--- a/package.json
+++ b/package.json
@@ -71,6 +71,6 @@
     "eslint-plugin-import": "^2.27.5",
     "eslint-plugin-import-newlines": "^1.3.1",
     "eslint-plugin-sort-exports": "^0.8.0",
-    "eslint": "^8.37.0"
+    "eslint": "^8.38.0"
   }
 }

From ac28963cd0ff6a3e84976537861f39473f0fc4b0 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Mon, 10 Apr 2023 16:46:38 +0100
Subject: [PATCH 3110/3183] 10.4.1-beta.3

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ff0dec82..fd30ca76 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "10.4.1-beta.2",
+  "version": "10.4.1-beta.3",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "10.4.1-beta.2",
+      "version": "10.4.1-beta.3",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index dee2bc9a..309343da 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "10.4.1-beta.2",
+  "version": "10.4.1-beta.3",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From 3d871394b02e17c3edfe6e9731f4eb7186c22dbd Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Mon, 24 Apr 2023 22:31:43 +0100
Subject: [PATCH 3111/3183] deps

---
 README.md         |  4 ++--
 package-lock.json | 59 +++++++++++++++++++++++++----------------------
 package.json      |  6 ++---
 3 files changed, 36 insertions(+), 33 deletions(-)

diff --git a/README.md b/README.md
index 9558b5b0..f7c23e13 100644
--- a/README.md
+++ b/README.md
@@ -27,8 +27,8 @@ Homebridge plugin to integrate eWeLink devices into HomeKit
 ### Prerequisites
 
 - To use this plugin, you will need to already have:
-  - [Node](https://nodejs.org): latest version of v16 or v18 - any other major version is not supported.
-  - [Homebridge](https://homebridge.io): v1.6 - refer to link for more information and installation instructions.
+  - [Node](https://nodejs.org): latest version of `v16`, `v18` or `v20` - any other major version is not supported.
+  - [Homebridge](https://homebridge.io): `v1.6` - refer to link for more information and installation instructions.
 
 ### Setup
 
diff --git a/package-lock.json b/package-lock.json
index fd30ca76..29fae05d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -28,14 +28,14 @@
       "license": "MIT",
       "dependencies": {
         "@homebridge/plugin-ui-utils": "^0.0.19",
-        "axios": "^1.3.5",
+        "axios": "^1.3.6",
         "node-persist": "^3.1.0",
         "p-queue": "^7.3.4",
         "websocket-as-promised": "^2.0.1",
         "ws": "^8.13.0"
       },
       "devDependencies": {
-        "eslint": "^8.38.0",
+        "eslint": "^8.39.0",
         "eslint-config-airbnb-base": "^15.0.0",
         "eslint-plugin-import": "^2.27.5",
         "eslint-plugin-import-newlines": "^1.3.1",
@@ -43,7 +43,7 @@
       },
       "engines": {
         "homebridge": "^1.6.0 || 2.0.0-beta.0",
-        "node": "^16.20.0 || ^18.15.0"
+        "node": "^16.20.0 || ^18.16.0 || ^20.0.0"
       }
     },
     "node_modules/@eslint-community/eslint-utils": {
@@ -94,9 +94,9 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "8.38.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.38.0.tgz",
-      "integrity": "sha512-IoD2MfUnOV58ghIHCiil01PcohxjbYR/qCxsoC+xNgUwh1EY8jOOrYmu3d3a71+tJJ23uscEV4X2HJWMsPJu4g==",
+      "version": "8.39.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.39.0.tgz",
+      "integrity": "sha512-kf9RB0Fg7NZfap83B3QOqOGg9QmD9yBudqQXzzOtn3i4y7ZUXe5ONeW34Gwi+TxhH4mvj72R1Zc300KUMa9Bng==",
       "dev": true,
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -332,9 +332,9 @@
       }
     },
     "node_modules/axios": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.3.5.tgz",
-      "integrity": "sha512-glL/PvG/E+xCWwV8S6nCHcrfg1exGx7vxyUIivIA1iL7BIh6bePylCfVHwp6k13ao7SATxB6imau2kqY+I67kw==",
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.3.6.tgz",
+      "integrity": "sha512-PEcdkk7JcdPiMDkvM4K6ZBRYq9keuVJsToxm2zQIM70Qqo2WHTdJZMXcG9X+RmRp2VPNUQC8W1RAGbgt6b1yMg==",
       "dependencies": {
         "follow-redirects": "^1.15.0",
         "form-data": "^4.0.0",
@@ -610,15 +610,15 @@
       }
     },
     "node_modules/eslint": {
-      "version": "8.38.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.38.0.tgz",
-      "integrity": "sha512-pIdsD2jwlUGf/U38Jv97t8lq6HpaU/G9NKbYmpWpZGw3LdTNhZLbJePqxOXGB5+JEKfOPU/XLxYxFh03nr1KTg==",
+      "version": "8.39.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.39.0.tgz",
+      "integrity": "sha512-mwiok6cy7KTW7rBpo05k6+p4YVZByLNjAZ/ACB9DRCu4YDRwjXI01tWHp6KAUWelsBetTxKK/2sHB0vdS8Z2Og==",
       "dev": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.4.0",
         "@eslint/eslintrc": "^2.0.2",
-        "@eslint/js": "8.38.0",
+        "@eslint/js": "8.39.0",
         "@humanwhocodes/config-array": "^0.11.8",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
@@ -628,7 +628,7 @@
         "debug": "^4.3.2",
         "doctrine": "^3.0.0",
         "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^7.1.1",
+        "eslint-scope": "^7.2.0",
         "eslint-visitor-keys": "^3.4.0",
         "espree": "^9.5.1",
         "esquery": "^1.4.2",
@@ -706,9 +706,9 @@
       }
     },
     "node_modules/eslint-module-utils": {
-      "version": "2.7.4",
-      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.4.tgz",
-      "integrity": "sha512-j4GT+rqzCoRKHwURX7pddtIPGySnX9Si/cgMI5ztrcqOPtk5dDEeZ34CQVPphnqkJytlc97Vuk05Um2mJ3gEQA==",
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.8.0.tgz",
+      "integrity": "sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw==",
       "dev": true,
       "dependencies": {
         "debug": "^3.2.7"
@@ -806,9 +806,9 @@
       }
     },
     "node_modules/eslint-scope": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz",
-      "integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.0.tgz",
+      "integrity": "sha512-DYj5deGlHBfMt15J7rdtyKNq/Nqlv5KfU4iodrQ019XESsRnwXH9KAE0y3cwtUHDo2ob7CypAnCqefh6vioWRw==",
       "dev": true,
       "dependencies": {
         "esrecurse": "^4.3.0",
@@ -816,6 +816,9 @@
       },
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
       }
     },
     "node_modules/eslint-visitor-keys": {
@@ -1339,9 +1342,9 @@
       }
     },
     "node_modules/is-core-module": {
-      "version": "2.11.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz",
-      "integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==",
+      "version": "2.12.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.12.0.tgz",
+      "integrity": "sha512-RECHCBCd/viahWmwj6enj19sKbHfJrddi/6cBDsNTKbNq0f7VeaUkBo60BqzvPqo/W54ChS62Z5qyun7cfOMqQ==",
       "dev": true,
       "dependencies": {
         "has": "^1.0.3"
@@ -1915,13 +1918,13 @@
       ]
     },
     "node_modules/regexp.prototype.flags": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
-      "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==",
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.0.tgz",
+      "integrity": "sha512-0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA==",
       "dependencies": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "functions-have-names": "^1.2.2"
+        "define-properties": "^1.2.0",
+        "functions-have-names": "^1.2.3"
       },
       "engines": {
         "node": ">= 0.4"
diff --git a/package.json b/package.json
index 309343da..96b02ad9 100644
--- a/package.json
+++ b/package.json
@@ -31,7 +31,7 @@
   },
   "engines": {
     "homebridge": "^1.6.0 || 2.0.0-beta.0",
-    "node": "^16.20.0 || ^18.15.0"
+    "node": "^16.20.0 || ^18.16.0 || ^20.0.0"
   },
   "repository": {
     "type": "git",
@@ -60,7 +60,7 @@
   ],
   "dependencies": {
     "@homebridge/plugin-ui-utils": "^0.0.19",
-    "axios": "^1.3.5",
+    "axios": "^1.3.6",
     "node-persist": "^3.1.0",
     "p-queue": "^7.3.4",
     "websocket-as-promised": "^2.0.1",
@@ -71,6 +71,6 @@
     "eslint-plugin-import": "^2.27.5",
     "eslint-plugin-import-newlines": "^1.3.1",
     "eslint-plugin-sort-exports": "^0.8.0",
-    "eslint": "^8.38.0"
+    "eslint": "^8.39.0"
   }
 }

From c0fc4e34693360f86f7fe4dc4f65bb9387a7a876 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Mon, 1 May 2023 00:49:18 +0100
Subject: [PATCH 3112/3183] fix hb versions

---
 package-lock.json | 16 ++++++++--------
 package.json      |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 29fae05d..e852686b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -28,7 +28,7 @@
       "license": "MIT",
       "dependencies": {
         "@homebridge/plugin-ui-utils": "^0.0.19",
-        "axios": "^1.3.6",
+        "axios": "^1.4.0",
         "node-persist": "^3.1.0",
         "p-queue": "^7.3.4",
         "websocket-as-promised": "^2.0.1",
@@ -42,7 +42,7 @@
         "eslint-plugin-sort-exports": "^0.8.0"
       },
       "engines": {
-        "homebridge": "^1.6.0 || 2.0.0-beta.0",
+        "homebridge": "^1.6.0 || ^2.0.0-beta.0",
         "node": "^16.20.0 || ^18.16.0 || ^20.0.0"
       }
     },
@@ -62,9 +62,9 @@
       }
     },
     "node_modules/@eslint-community/regexpp": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.5.0.tgz",
-      "integrity": "sha512-vITaYzIcNmjn5tF5uxcZ/ft7/RXGrMUIS9HalWckEOF6ESiwXKoMzAQf2UW0aVd6rnOeExTJVd5hmWXucBKGXQ==",
+      "version": "4.5.1",
+      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.5.1.tgz",
+      "integrity": "sha512-Z5ba73P98O1KUYCCJTUeVpja9RcGoMdncZ6T49FCUl2lN38JtCJ+3WgIDBv0AuY4WChU5PmtJmOCTlN6FZTFKQ==",
       "dev": true,
       "engines": {
         "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
@@ -332,9 +332,9 @@
       }
     },
     "node_modules/axios": {
-      "version": "1.3.6",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.3.6.tgz",
-      "integrity": "sha512-PEcdkk7JcdPiMDkvM4K6ZBRYq9keuVJsToxm2zQIM70Qqo2WHTdJZMXcG9X+RmRp2VPNUQC8W1RAGbgt6b1yMg==",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.4.0.tgz",
+      "integrity": "sha512-S4XCWMEmzvo64T9GfvQDOXgYRDJ/wsSZc7Jvdgx5u1sd0JwsuPLqb3SYmusag+edF6ziyMensPVqLTSc1PiSEA==",
       "dependencies": {
         "follow-redirects": "^1.15.0",
         "form-data": "^4.0.0",
diff --git a/package.json b/package.json
index 96b02ad9..a0300905 100644
--- a/package.json
+++ b/package.json
@@ -30,7 +30,7 @@
     "rebuild": "rm -rf package-lock.json && rm -rf node_modules && npm install"
   },
   "engines": {
-    "homebridge": "^1.6.0 || 2.0.0-beta.0",
+    "homebridge": "^1.6.0 || ^2.0.0-beta.0",
     "node": "^16.20.0 || ^18.16.0 || ^20.0.0"
   },
   "repository": {
@@ -60,7 +60,7 @@
   ],
   "dependencies": {
     "@homebridge/plugin-ui-utils": "^0.0.19",
-    "axios": "^1.3.6",
+    "axios": "^1.4.0",
     "node-persist": "^3.1.0",
     "p-queue": "^7.3.4",
     "websocket-as-promised": "^2.0.1",

From 86f764fcfa091f769acfd623bddc2b6ad9c52833 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Wed, 10 May 2023 19:55:11 +0100
Subject: [PATCH 3113/3183] try sonoff ultimate

---
 lib/utils/constants.js | 10 ++++++++-
 package-lock.json      | 46 +++++++++++++++++++++---------------------
 package.json           |  4 ++--
 3 files changed, 34 insertions(+), 26 deletions(-)

diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 456f0b48..54635d33 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -278,8 +278,11 @@ export default {
       181,
       182,
       190,
+      209,
+      210,
+      211,
     ],
-    switchSingle: [1, 6, 14, 24, 27, 1009, 1256, 7004],
+    switchSingle: [1, 6, 14, 24, 27, 209, 1009, 1256, 7004],
     switchSCM: [77, 78, 81, 107, 112, 138, 160],
     switchSCMPower: [182, 190],
     switchSinglePower: [5, 32],
@@ -304,6 +307,8 @@ export default {
       141,
       161,
       162,
+      210,
+      211,
       2256,
       3256,
       4256,
@@ -487,6 +492,9 @@ export default {
     182: 1, // Power Detection Plug Overload Alarm-Multi-Channel Protocols (S40)
     190: 1, // POWR316 POWR316D POWR320D
     195: 1, // NSPANEL Pro
+    209: 1, // Sonoff Ultimate Switch T5-1C-86
+    210: 2, // Sonoff Ultimate Switch T5-2C-86
+    211: 3, // Sonoff Ultimate Switch T5-3C-86
     1000: 1, // "zigbee_ON_OFF_SWITCH_1000" (button device)
     1009: 1, // "" (Some sort of single switch device)
     1256: 1, // "ZIGBEE_SINGLE_SWITCH"
diff --git a/package-lock.json b/package-lock.json
index e852686b..59285d9c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -35,7 +35,7 @@
         "ws": "^8.13.0"
       },
       "devDependencies": {
-        "eslint": "^8.39.0",
+        "eslint": "^8.40.0",
         "eslint-config-airbnb-base": "^15.0.0",
         "eslint-plugin-import": "^2.27.5",
         "eslint-plugin-import-newlines": "^1.3.1",
@@ -43,7 +43,7 @@
       },
       "engines": {
         "homebridge": "^1.6.0 || ^2.0.0-beta.0",
-        "node": "^16.20.0 || ^18.16.0 || ^20.0.0"
+        "node": "^16.20.0 || ^18.16.0 || ^20.1.0"
       }
     },
     "node_modules/@eslint-community/eslint-utils": {
@@ -71,14 +71,14 @@
       }
     },
     "node_modules/@eslint/eslintrc": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.0.2.tgz",
-      "integrity": "sha512-3W4f5tDUra+pA+FzgugqL2pRimUTDJWKr7BINqOpkZrC0uYI0NIc0/JFgBROCU07HR6GieA5m3/rsPIhDmCXTQ==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.0.3.tgz",
+      "integrity": "sha512-+5gy6OQfk+xx3q0d6jGZZC3f3KzAkXc/IanVxd1is/VIIziRqqt3ongQz0FiTUXqTk0c7aDB3OaFuKnuSoJicQ==",
       "dev": true,
       "dependencies": {
         "ajv": "^6.12.4",
         "debug": "^4.3.2",
-        "espree": "^9.5.1",
+        "espree": "^9.5.2",
         "globals": "^13.19.0",
         "ignore": "^5.2.0",
         "import-fresh": "^3.2.1",
@@ -94,9 +94,9 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "8.39.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.39.0.tgz",
-      "integrity": "sha512-kf9RB0Fg7NZfap83B3QOqOGg9QmD9yBudqQXzzOtn3i4y7ZUXe5ONeW34Gwi+TxhH4mvj72R1Zc300KUMa9Bng==",
+      "version": "8.40.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.40.0.tgz",
+      "integrity": "sha512-ElyB54bJIhXQYVKjDSvCkPO1iU1tSAeVQJbllWJq1XQSmmA4dgFk8CbiBGpiOPxleE48vDogxCtmMYku4HSVLA==",
       "dev": true,
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -610,15 +610,15 @@
       }
     },
     "node_modules/eslint": {
-      "version": "8.39.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.39.0.tgz",
-      "integrity": "sha512-mwiok6cy7KTW7rBpo05k6+p4YVZByLNjAZ/ACB9DRCu4YDRwjXI01tWHp6KAUWelsBetTxKK/2sHB0vdS8Z2Og==",
+      "version": "8.40.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.40.0.tgz",
+      "integrity": "sha512-bvR+TsP9EHL3TqNtj9sCNJVAFK3fBN8Q7g5waghxyRsPLIMwL73XSKnZFK0hk/O2ANC+iAoq6PWMQ+IfBAJIiQ==",
       "dev": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.4.0",
-        "@eslint/eslintrc": "^2.0.2",
-        "@eslint/js": "8.39.0",
+        "@eslint/eslintrc": "^2.0.3",
+        "@eslint/js": "8.40.0",
         "@humanwhocodes/config-array": "^0.11.8",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
@@ -629,8 +629,8 @@
         "doctrine": "^3.0.0",
         "escape-string-regexp": "^4.0.0",
         "eslint-scope": "^7.2.0",
-        "eslint-visitor-keys": "^3.4.0",
-        "espree": "^9.5.1",
+        "eslint-visitor-keys": "^3.4.1",
+        "espree": "^9.5.2",
         "esquery": "^1.4.2",
         "esutils": "^2.0.2",
         "fast-deep-equal": "^3.1.3",
@@ -822,9 +822,9 @@
       }
     },
     "node_modules/eslint-visitor-keys": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.0.tgz",
-      "integrity": "sha512-HPpKPUBQcAsZOsHAFwTtIKcYlCje62XB7SEAcxjtmW6TD1WVpkS6i6/hOVtTZIl4zGj/mBqpFVGvaDneik+VoQ==",
+      "version": "3.4.1",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz",
+      "integrity": "sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA==",
       "dev": true,
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -834,14 +834,14 @@
       }
     },
     "node_modules/espree": {
-      "version": "9.5.1",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-9.5.1.tgz",
-      "integrity": "sha512-5yxtHSZXRSW5pvv3hAlXM5+/Oswi1AUFqBmbibKb5s6bp3rGIDkyXU6xCoyuuLhijr4SFwPrXRoZjz0AZDN9tg==",
+      "version": "9.5.2",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-9.5.2.tgz",
+      "integrity": "sha512-7OASN1Wma5fum5SrNhFMAMJxOUAbhyfQ8dQ//PJaJbNw0URTPWqIghHWt1MmAANKhHZIYOHruW4Kw4ruUWOdGw==",
       "dev": true,
       "dependencies": {
         "acorn": "^8.8.0",
         "acorn-jsx": "^5.3.2",
-        "eslint-visitor-keys": "^3.4.0"
+        "eslint-visitor-keys": "^3.4.1"
       },
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
diff --git a/package.json b/package.json
index a0300905..7349d96a 100644
--- a/package.json
+++ b/package.json
@@ -31,7 +31,7 @@
   },
   "engines": {
     "homebridge": "^1.6.0 || ^2.0.0-beta.0",
-    "node": "^16.20.0 || ^18.16.0 || ^20.0.0"
+    "node": "^16.20.0 || ^18.16.0 || ^20.1.0"
   },
   "repository": {
     "type": "git",
@@ -71,6 +71,6 @@
     "eslint-plugin-import": "^2.27.5",
     "eslint-plugin-import-newlines": "^1.3.1",
     "eslint-plugin-sort-exports": "^0.8.0",
-    "eslint": "^8.39.0"
+    "eslint": "^8.40.0"
   }
 }

From b9c7c077e1e75666ff68eb5109f810b5eed29e5f Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Wed, 10 May 2023 19:56:37 +0100
Subject: [PATCH 3114/3183] 10.4.1-beta.4

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 59285d9c..c7867255 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "10.4.1-beta.3",
+  "version": "10.4.1-beta.4",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "10.4.1-beta.3",
+      "version": "10.4.1-beta.4",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 7349d96a..087160d1 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "10.4.1-beta.3",
+  "version": "10.4.1-beta.4",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From 0dec82e8953aae8e91ee7a84bc7734c8a408a022 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Sun, 25 Jun 2023 19:09:55 +0100
Subject: [PATCH 3115/3183] support `SONOFF SNZB-02D`

---
 CHANGELOG.md           |  6 +++-
 lib/utils/constants.js |  3 +-
 package-lock.json      | 66 ++++++++++++++++++------------------------
 package.json           |  6 ++--
 4 files changed, 38 insertions(+), 43 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 32e6a946..30d1a7e5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to homebridge-ewelink will be documented in this file.
 
 ## BETA
 
+### Added
+
+- Support for `SONOFF SNZB-02D`
+
 ### Breaking
 
 - Remove official support for Node 14
@@ -14,7 +18,7 @@ All notable changes to homebridge-ewelink will be documented in this file.
 ### Changed
 
 - Bump `homebridge` recommended version to v1.6.0 or v2.0.0-beta
-- Bump `node` recommended versions to v16.20.0 or v18.15.0
+- Bump `node` recommended versions to v16.20.1 or v18.16.1 or v20.3.1
 - Updated dependencies
 
 ## 10.4.0 (2023-01-07)
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 54635d33..2bd8a851 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -337,7 +337,7 @@ export default {
     zbLightCCT: [1258],
     zbLightRGBCCT: [3258],
     zbMotor: [1514],
-    zbSensorAmbient: [1770],
+    zbSensorAmbient: [1770, 1771],
     zbSensorMotion: [2026, 7002],
     zbSensorContact: [3026, 7003],
     zbSensorWater: [4026],
@@ -502,6 +502,7 @@ export default {
     1258: 1,
     1514: 1, // Graywind Zigbee Shades
     1770: 1, // "ZIGBEE_TEMPERATURE_SENSOR"
+    1771: 1, // "" some duplicate of the above https://github.com/bwp91/homebridge-ewelink/issues/494
     2026: 1, // "ZIGBEE_MOBILE_SENSOR"
     2256: 2, // "ZIGBEE_SWITCH_2"
     3026: 1, // "ZIGBEE_DOOR_AND_WINDOW_SENSOR"
diff --git a/package-lock.json b/package-lock.json
index c7867255..0ec9918a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -35,7 +35,7 @@
         "ws": "^8.13.0"
       },
       "devDependencies": {
-        "eslint": "^8.40.0",
+        "eslint": "^8.43.0",
         "eslint-config-airbnb-base": "^15.0.0",
         "eslint-plugin-import": "^2.27.5",
         "eslint-plugin-import-newlines": "^1.3.1",
@@ -43,7 +43,7 @@
       },
       "engines": {
         "homebridge": "^1.6.0 || ^2.0.0-beta.0",
-        "node": "^16.20.0 || ^18.16.0 || ^20.1.0"
+        "node": "^16.20.1 || ^18.16.1 || ^20.3.1"
       }
     },
     "node_modules/@eslint-community/eslint-utils": {
@@ -94,9 +94,9 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "8.40.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.40.0.tgz",
-      "integrity": "sha512-ElyB54bJIhXQYVKjDSvCkPO1iU1tSAeVQJbllWJq1XQSmmA4dgFk8CbiBGpiOPxleE48vDogxCtmMYku4HSVLA==",
+      "version": "8.43.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.43.0.tgz",
+      "integrity": "sha512-s2UHCoiXfxMvmfzqoN+vrQ84ahUSYde9qNO1MdxmoEhyHWsfmwOpFlwYV+ePJEVc7gFnATGUi376WowX1N7tFg==",
       "dev": true,
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -108,9 +108,9 @@
       "integrity": "sha512-axFX7lN2Yd7bz/6SlD7dzq5sY/N9+XYuLHPukuiyHQRDtNMRL1uDqJhOx6RVaN2tYDHB75h7YxRQWP7U44Mgzg=="
     },
     "node_modules/@humanwhocodes/config-array": {
-      "version": "0.11.8",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.8.tgz",
-      "integrity": "sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g==",
+      "version": "0.11.10",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.10.tgz",
+      "integrity": "sha512-KVVjQmNUepDVGXNuoRRdmmEjruj0KfiGSbS8LVc12LMsWDQzRXJ0qdhN8L8uUigKpfEHRhlaQFY0ib1tnUbNeQ==",
       "dev": true,
       "dependencies": {
         "@humanwhocodes/object-schema": "^1.2.1",
@@ -182,9 +182,9 @@
       "dev": true
     },
     "node_modules/acorn": {
-      "version": "8.8.2",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz",
-      "integrity": "sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==",
+      "version": "8.9.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.9.0.tgz",
+      "integrity": "sha512-jaVNAFBHNLXspO543WnNNPZFRtavh3skAkITqD0/2aeMkKZTN+254PyhwxFYrk3vQ1xfY+2wbesJMs/JC8/PwQ==",
       "dev": true,
       "bin": {
         "acorn": "bin/acorn"
@@ -610,16 +610,16 @@
       }
     },
     "node_modules/eslint": {
-      "version": "8.40.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.40.0.tgz",
-      "integrity": "sha512-bvR+TsP9EHL3TqNtj9sCNJVAFK3fBN8Q7g5waghxyRsPLIMwL73XSKnZFK0hk/O2ANC+iAoq6PWMQ+IfBAJIiQ==",
+      "version": "8.43.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.43.0.tgz",
+      "integrity": "sha512-aaCpf2JqqKesMFGgmRPessmVKjcGXqdlAYLLC3THM8t5nBRZRQ+st5WM/hoJXkdioEXLLbXgclUpM0TXo5HX5Q==",
       "dev": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.4.0",
         "@eslint/eslintrc": "^2.0.3",
-        "@eslint/js": "8.40.0",
-        "@humanwhocodes/config-array": "^0.11.8",
+        "@eslint/js": "8.43.0",
+        "@humanwhocodes/config-array": "^0.11.10",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
         "ajv": "^6.10.0",
@@ -638,13 +638,12 @@
         "find-up": "^5.0.0",
         "glob-parent": "^6.0.2",
         "globals": "^13.19.0",
-        "grapheme-splitter": "^1.0.4",
+        "graphemer": "^1.4.0",
         "ignore": "^5.2.0",
         "import-fresh": "^3.0.0",
         "imurmurhash": "^0.1.4",
         "is-glob": "^4.0.0",
         "is-path-inside": "^3.0.3",
-        "js-sdsl": "^4.1.4",
         "js-yaml": "^4.1.0",
         "json-stable-stringify-without-jsonify": "^1.0.1",
         "levn": "^0.4.1",
@@ -1048,12 +1047,13 @@
       }
     },
     "node_modules/get-intrinsic": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.0.tgz",
-      "integrity": "sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz",
+      "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==",
       "dependencies": {
         "function-bind": "^1.1.1",
         "has": "^1.0.3",
+        "has-proto": "^1.0.1",
         "has-symbols": "^1.0.3"
       },
       "funding": {
@@ -1147,10 +1147,10 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/grapheme-splitter": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz",
-      "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==",
+    "node_modules/graphemer": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
+      "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==",
       "dev": true
     },
     "node_modules/has": {
@@ -1342,9 +1342,9 @@
       }
     },
     "node_modules/is-core-module": {
-      "version": "2.12.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.12.0.tgz",
-      "integrity": "sha512-RECHCBCd/viahWmwj6enj19sKbHfJrddi/6cBDsNTKbNq0f7VeaUkBo60BqzvPqo/W54ChS62Z5qyun7cfOMqQ==",
+      "version": "2.12.1",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.12.1.tgz",
+      "integrity": "sha512-Q4ZuBAe2FUsKtyQJoQHlvP8OvBERxO3jEmy1I7hcRXcJBGGHFh/aJBswbXuS9sgrDH2QUO8ilkwNPHvHMd8clg==",
       "dev": true,
       "dependencies": {
         "has": "^1.0.3"
@@ -1511,16 +1511,6 @@
       "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
       "dev": true
     },
-    "node_modules/js-sdsl": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.4.0.tgz",
-      "integrity": "sha512-FfVSdx6pJ41Oa+CF7RDaFmTnCaFhua+SNYQX74riGOpl96x+2jQCqEfQ2bnXu/5DPCqlRuiqyvTJM0Qjz26IVg==",
-      "dev": true,
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/js-sdsl"
-      }
-    },
     "node_modules/js-yaml": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
diff --git a/package.json b/package.json
index 087160d1..39314f14 100644
--- a/package.json
+++ b/package.json
@@ -31,7 +31,7 @@
   },
   "engines": {
     "homebridge": "^1.6.0 || ^2.0.0-beta.0",
-    "node": "^16.20.0 || ^18.16.0 || ^20.1.0"
+    "node": "^16.20.1 || ^18.16.1 || ^20.3.1"
   },
   "repository": {
     "type": "git",
@@ -67,10 +67,10 @@
     "ws": "^8.13.0"
   },
   "devDependencies": {
+    "eslint": "^8.43.0",
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-plugin-import": "^2.27.5",
     "eslint-plugin-import-newlines": "^1.3.1",
-    "eslint-plugin-sort-exports": "^0.8.0",
-    "eslint": "^8.40.0"
+    "eslint-plugin-sort-exports": "^0.8.0"
   }
 }

From 9bb73176583f5d55f5fbde20a6e684c05cdbbed5 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Sun, 25 Jun 2023 19:11:05 +0100
Subject: [PATCH 3116/3183] 10.4.1-beta.5

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 0ec9918a..8a724b79 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "10.4.1-beta.4",
+  "version": "10.4.1-beta.5",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "10.4.1-beta.4",
+      "version": "10.4.1-beta.5",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 39314f14..8418ce25 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "10.4.1-beta.4",
+  "version": "10.4.1-beta.5",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From 81610421a81451c5021995241e7406b7917d4319 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Sun, 25 Jun 2023 23:11:40 +0100
Subject: [PATCH 3117/3183] support `B02-BL`

---
 CHANGELOG.md                | 1 +
 lib/device/light-rgb-cct.js | 8 +++++++-
 lib/utils/constants.js      | 3 ++-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 30d1a7e5..c207272f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@ All notable changes to homebridge-ewelink will be documented in this file.
 
 ### Added
 
+- Support for `B02-BL`
 - Support for `SONOFF SNZB-02D`
 
 ### Breaking
diff --git a/lib/device/light-rgb-cct.js b/lib/device/light-rgb-cct.js
index 880493fa..36079faa 100644
--- a/lib/device/light-rgb-cct.js
+++ b/lib/device/light-rgb-cct.js
@@ -264,6 +264,7 @@ export default class {
             };
           }
           break;
+        case 135:
         case 136:
           if (this.cacheMode === 'white') {
             params = {
@@ -352,6 +353,7 @@ export default class {
             },
           };
           break;
+        case 135:
         case 136:
           params = {
             ltype: 'color',
@@ -371,7 +373,7 @@ export default class {
       [this.cacheR, this.cacheG, this.cacheB] = rgb;
       this.cacheMired = 0;
       this.cacheCT = 0;
-      if ([104, 136].includes(this.accessory.context.eweUIID)) {
+      if ([104, 135, 136].includes(this.accessory.context.eweUIID)) {
         this.cacheMode = 'color';
       }
       if (this.enableLogging) {
@@ -450,6 +452,7 @@ export default class {
             },
           };
           break;
+        case 135:
         case 136:
           scaledCT = Math.round(((mToK - 2700) / 3800) * 100);
           params = {
@@ -487,6 +490,7 @@ export default class {
           break;
         }
         case 104:
+        case 135:
         case 136:
           this.cacheMode = 'white';
           break;
@@ -659,6 +663,7 @@ export default class {
           }
           break;
         case 104:
+        case 135:
         case 136:
           // B02-B-A60, B05-B-A60, GTLC104
           if (params.ltype === 'color' && params.color) {
@@ -726,6 +731,7 @@ export default class {
 
               let ctToK;
               switch (this.accessory.context.eweUIID) {
+                case 135:
                 case 136:
                   ctToK = Math.round((this.cacheCT / 100) * 3800 + 2700);
                   break;
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 2bd8a851..cc878111 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -319,7 +319,7 @@ export default {
     lightDimmer: [36, 44, 57],
     lightRGB: [22],
     lightCCT: [103],
-    lightRGBCCT: [33, 59, 104, 136, 137, 173],
+    lightRGBCCT: [33, 59, 104, 135, 136, 137, 173],
     curtain: [11, 67],
     sensorContact: [102, 154],
     sensorAmbient: [15, 181],
@@ -473,6 +473,7 @@ export default {
     128: 1, // SPM Main Unit (same data structure as zigbee bridge)
     130: 1, // SPM Sub Unit
     133: 1, // "NSPANEL"
+    135: 1, // ""
     136: 1, // RGB Five-Color Light_Support 2.4G eWeLink-Remote
     137: 1, // "L2/SPIDER CONTROLLER"
     138: 1, // "MINIR3?" (WOOLLEY WLAN SMART SWITCH)

From b64b54f7ace698d8f345bb6fda0234dae6a6f939 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Sun, 25 Jun 2023 23:12:13 +0100
Subject: [PATCH 3118/3183] 10.4.1-beta.6

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 8a724b79..435797a5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "10.4.1-beta.5",
+  "version": "10.4.1-beta.6",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "10.4.1-beta.5",
+      "version": "10.4.1-beta.6",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 8418ce25..30d746ba 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "10.4.1-beta.5",
+  "version": "10.4.1-beta.6",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From 864eb2dd32f6f2a7d20f6ddcb7d2373e12c962b6 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Tue, 27 Jun 2023 23:24:23 +0100
Subject: [PATCH 3119/3183] support uiid 7014 + lint

---
 CHANGELOG.md                            | 1 +
 lib/device/curtain.js                   | 1 -
 lib/device/light-dimmer.js              | 1 -
 lib/device/light-rgb-cct.js             | 1 -
 lib/device/outlet-multi.js              | 1 -
 lib/device/panel.js                     | 1 -
 lib/device/simulation/garage-two.js     | 1 -
 lib/device/simulation/light-fan.js      | 1 -
 lib/device/simulation/sensor-hidden.js  | 1 -
 lib/device/simulation/sensor-visible.js | 1 -
 lib/device/switch-multi.js              | 1 -
 lib/utils/constants.js                  | 3 ++-
 12 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c207272f..35025aa1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@ All notable changes to homebridge-ewelink will be documented in this file.
 
 - Support for `B02-BL`
 - Support for `SONOFF SNZB-02D`
+- Support for devices with UIID `7014`
 
 ### Breaking
 
diff --git a/lib/device/curtain.js b/lib/device/curtain.js
index 8a1069df..69584bab 100644
--- a/lib/device/curtain.js
+++ b/lib/device/curtain.js
@@ -268,7 +268,6 @@ export default class {
             }
             break;
           default:
-            return;
         }
       } else if (
         params.switch
diff --git a/lib/device/light-dimmer.js b/lib/device/light-dimmer.js
index 7a333eb4..0ba26700 100644
--- a/lib/device/light-dimmer.js
+++ b/lib/device/light-dimmer.js
@@ -226,7 +226,6 @@ export default class {
           }
           break;
         default:
-          return;
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false);
diff --git a/lib/device/light-rgb-cct.js b/lib/device/light-rgb-cct.js
index 36079faa..5b0c13c2 100644
--- a/lib/device/light-rgb-cct.js
+++ b/lib/device/light-rgb-cct.js
@@ -768,7 +768,6 @@ export default class {
           }
           break;
         default:
-          return;
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false);
diff --git a/lib/device/outlet-multi.js b/lib/device/outlet-multi.js
index f87b79f9..7b0ff23e 100644
--- a/lib/device/outlet-multi.js
+++ b/lib/device/outlet-multi.js
@@ -274,7 +274,6 @@ export default class {
           }
           break;
         default:
-          return;
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true);
diff --git a/lib/device/panel.js b/lib/device/panel.js
index 93e9ec17..bb0c4ef8 100644
--- a/lib/device/panel.js
+++ b/lib/device/panel.js
@@ -266,7 +266,6 @@ export default class {
           break;
         }
         default:
-          return;
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true);
diff --git a/lib/device/simulation/garage-two.js b/lib/device/simulation/garage-two.js
index f5d0a5ac..cf505119 100644
--- a/lib/device/simulation/garage-two.js
+++ b/lib/device/simulation/garage-two.js
@@ -204,7 +204,6 @@ export default class {
           break;
         }
         default:
-          return;
       }
     } catch (err) {
       this.inUse = false;
diff --git a/lib/device/simulation/light-fan.js b/lib/device/simulation/light-fan.js
index e79ba34a..da0b4054 100644
--- a/lib/device/simulation/light-fan.js
+++ b/lib/device/simulation/light-fan.js
@@ -227,7 +227,6 @@ export default class {
           }
           break;
         default:
-          return;
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false);
diff --git a/lib/device/simulation/sensor-hidden.js b/lib/device/simulation/sensor-hidden.js
index d373ae56..88e5771f 100644
--- a/lib/device/simulation/sensor-hidden.js
+++ b/lib/device/simulation/sensor-hidden.js
@@ -97,7 +97,6 @@ export default class {
           break;
         }
         default:
-          return;
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false);
diff --git a/lib/device/simulation/sensor-visible.js b/lib/device/simulation/sensor-visible.js
index 9e266b4e..08849557 100644
--- a/lib/device/simulation/sensor-visible.js
+++ b/lib/device/simulation/sensor-visible.js
@@ -223,7 +223,6 @@ export default class {
           break;
         }
         default:
-          return;
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false);
diff --git a/lib/device/switch-multi.js b/lib/device/switch-multi.js
index fc4aaa22..f5f3cf78 100644
--- a/lib/device/switch-multi.js
+++ b/lib/device/switch-multi.js
@@ -269,7 +269,6 @@ export default class {
           }
           break;
         default:
-          return;
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true);
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index cc878111..d382f786 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -337,7 +337,7 @@ export default {
     zbLightCCT: [1258],
     zbLightRGBCCT: [3258],
     zbMotor: [1514],
-    zbSensorAmbient: [1770, 1771],
+    zbSensorAmbient: [1770, 1771, 7014],
     zbSensorMotion: [2026, 7002],
     zbSensorContact: [3026, 7003],
     zbSensorWater: [4026],
@@ -516,6 +516,7 @@ export default {
     7002: 1, // Zigbee Human Body Sensor_Support OTA
     7003: 1, // Zigbee Door Magnet_Support OTA
     7004: 1, // Zigbee Single-Channel Switch ­_Support OTA
+    7014: 1, // some sensor https://github.com/bwp91/homebridge-ewelink/issues/494
   },
 
   cannotSupportDevices: {

From eb3f31ede71291cddbf2ff7090d19ddab3648801 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Tue, 27 Jun 2023 23:24:55 +0100
Subject: [PATCH 3120/3183] 10.4.1-beta.7

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 435797a5..e48092dd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "10.4.1-beta.6",
+  "version": "10.4.1-beta.7",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "10.4.1-beta.6",
+      "version": "10.4.1-beta.7",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 30d746ba..f3b2cc1f 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "10.4.1-beta.6",
+  "version": "10.4.1-beta.7",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From 1640408cb66fcd75e370d55f092521d8e156be0e Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Sat, 1 Jul 2023 14:24:06 +0100
Subject: [PATCH 3121/3183] support uiid 191

---
 CHANGELOG.md           |  1 +
 lib/utils/constants.js |  3 +-
 package-lock.json      | 66 +++++++++++++++++++++---------------------
 package.json           |  2 +-
 4 files changed, 37 insertions(+), 35 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 35025aa1..edcd5279 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@ All notable changes to homebridge-ewelink will be documented in this file.
 
 - Support for `B02-BL`
 - Support for `SONOFF SNZB-02D`
+- Support for devices with UIID `191`
 - Support for devices with UIID `7014`
 
 ### Breaking
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index d382f786..5cbe8081 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -283,7 +283,7 @@ export default {
       211,
     ],
     switchSingle: [1, 6, 14, 24, 27, 209, 1009, 1256, 7004],
-    switchSCM: [77, 78, 81, 107, 112, 138, 160],
+    switchSCM: [77, 78, 81, 107, 112, 138, 160, 191],
     switchSCMPower: [182, 190],
     switchSinglePower: [5, 32],
     switchMulti: [
@@ -492,6 +492,7 @@ export default {
     181: 1, // Sonoff TH Elite THR316 and THR320
     182: 1, // Power Detection Plug Overload Alarm-Multi-Channel Protocols (S40)
     190: 1, // POWR316 POWR316D POWR320D
+    191: 1, // Like the above 190
     195: 1, // NSPANEL Pro
     209: 1, // Sonoff Ultimate Switch T5-1C-86
     210: 2, // Sonoff Ultimate Switch T5-2C-86
diff --git a/package-lock.json b/package-lock.json
index e48092dd..d462b173 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -35,7 +35,7 @@
         "ws": "^8.13.0"
       },
       "devDependencies": {
-        "eslint": "^8.43.0",
+        "eslint": "^8.44.0",
         "eslint-config-airbnb-base": "^15.0.0",
         "eslint-plugin-import": "^2.27.5",
         "eslint-plugin-import-newlines": "^1.3.1",
@@ -46,6 +46,15 @@
         "node": "^16.20.1 || ^18.16.1 || ^20.3.1"
       }
     },
+    "node_modules/@aashutoshrathi/word-wrap": {
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz",
+      "integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/@eslint-community/eslint-utils": {
       "version": "4.4.0",
       "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
@@ -71,14 +80,14 @@
       }
     },
     "node_modules/@eslint/eslintrc": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.0.3.tgz",
-      "integrity": "sha512-+5gy6OQfk+xx3q0d6jGZZC3f3KzAkXc/IanVxd1is/VIIziRqqt3ongQz0FiTUXqTk0c7aDB3OaFuKnuSoJicQ==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.0.tgz",
+      "integrity": "sha512-Lj7DECXqIVCqnqjjHMPna4vn6GJcMgul/wuS0je9OZ9gsL0zzDpKPVtcG1HaDVc+9y+qgXneTeUMbCqXJNpH1A==",
       "dev": true,
       "dependencies": {
         "ajv": "^6.12.4",
         "debug": "^4.3.2",
-        "espree": "^9.5.2",
+        "espree": "^9.6.0",
         "globals": "^13.19.0",
         "ignore": "^5.2.0",
         "import-fresh": "^3.2.1",
@@ -94,9 +103,9 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "8.43.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.43.0.tgz",
-      "integrity": "sha512-s2UHCoiXfxMvmfzqoN+vrQ84ahUSYde9qNO1MdxmoEhyHWsfmwOpFlwYV+ePJEVc7gFnATGUi376WowX1N7tFg==",
+      "version": "8.44.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.44.0.tgz",
+      "integrity": "sha512-Ag+9YM4ocKQx9AarydN0KY2j0ErMHNIocPDrVo8zAE44xLTjEtz81OdR68/cydGtk6m6jDb5Za3r2useMzYmSw==",
       "dev": true,
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -610,15 +619,15 @@
       }
     },
     "node_modules/eslint": {
-      "version": "8.43.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.43.0.tgz",
-      "integrity": "sha512-aaCpf2JqqKesMFGgmRPessmVKjcGXqdlAYLLC3THM8t5nBRZRQ+st5WM/hoJXkdioEXLLbXgclUpM0TXo5HX5Q==",
+      "version": "8.44.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.44.0.tgz",
+      "integrity": "sha512-0wpHoUbDUHgNCyvFB5aXLiQVfK9B0at6gUvzy83k4kAsQ/u769TQDX6iKC+aO4upIHO9WSaA3QoXYQDHbNwf1A==",
       "dev": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.4.0",
-        "@eslint/eslintrc": "^2.0.3",
-        "@eslint/js": "8.43.0",
+        "@eslint/eslintrc": "^2.1.0",
+        "@eslint/js": "8.44.0",
         "@humanwhocodes/config-array": "^0.11.10",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
@@ -630,7 +639,7 @@
         "escape-string-regexp": "^4.0.0",
         "eslint-scope": "^7.2.0",
         "eslint-visitor-keys": "^3.4.1",
-        "espree": "^9.5.2",
+        "espree": "^9.6.0",
         "esquery": "^1.4.2",
         "esutils": "^2.0.2",
         "fast-deep-equal": "^3.1.3",
@@ -650,7 +659,7 @@
         "lodash.merge": "^4.6.2",
         "minimatch": "^3.1.2",
         "natural-compare": "^1.4.0",
-        "optionator": "^0.9.1",
+        "optionator": "^0.9.3",
         "strip-ansi": "^6.0.1",
         "strip-json-comments": "^3.1.0",
         "text-table": "^0.2.0"
@@ -833,12 +842,12 @@
       }
     },
     "node_modules/espree": {
-      "version": "9.5.2",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-9.5.2.tgz",
-      "integrity": "sha512-7OASN1Wma5fum5SrNhFMAMJxOUAbhyfQ8dQ//PJaJbNw0URTPWqIghHWt1MmAANKhHZIYOHruW4Kw4ruUWOdGw==",
+      "version": "9.6.0",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.0.tgz",
+      "integrity": "sha512-1FH/IiruXZ84tpUlm0aCUEwMl2Ho5ilqVh0VvQXw+byAz/4SAciyHLlfmL5WYqsvD38oymdUwBss0LtK8m4s/A==",
       "dev": true,
       "dependencies": {
-        "acorn": "^8.8.0",
+        "acorn": "^8.9.0",
         "acorn-jsx": "^5.3.2",
         "eslint-visitor-keys": "^3.4.1"
       },
@@ -1715,17 +1724,17 @@
       }
     },
     "node_modules/optionator": {
-      "version": "0.9.1",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
-      "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
+      "version": "0.9.3",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz",
+      "integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==",
       "dev": true,
       "dependencies": {
+        "@aashutoshrathi/word-wrap": "^1.2.3",
         "deep-is": "^0.1.3",
         "fast-levenshtein": "^2.0.6",
         "levn": "^0.4.1",
         "prelude-ls": "^1.2.1",
-        "type-check": "^0.4.0",
-        "word-wrap": "^1.2.3"
+        "type-check": "^0.4.0"
       },
       "engines": {
         "node": ">= 0.8.0"
@@ -2293,15 +2302,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/word-wrap": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
-      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
diff --git a/package.json b/package.json
index f3b2cc1f..7347f739 100644
--- a/package.json
+++ b/package.json
@@ -67,7 +67,7 @@
     "ws": "^8.13.0"
   },
   "devDependencies": {
-    "eslint": "^8.43.0",
+    "eslint": "^8.44.0",
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-plugin-import": "^2.27.5",
     "eslint-plugin-import-newlines": "^1.3.1",

From 1188627ecf8db704f65fca75c3c5d0a5b6895ce5 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Sat, 1 Jul 2023 14:24:37 +0100
Subject: [PATCH 3122/3183] 10.4.1-beta.8

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d462b173..eb534c9d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "10.4.1-beta.7",
+  "version": "10.4.1-beta.8",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "10.4.1-beta.7",
+      "version": "10.4.1-beta.8",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 7347f739..51537257 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "10.4.1-beta.7",
+  "version": "10.4.1-beta.8",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From 4a28f06c38fe7001a8f6d1339b80535b101fb0e6 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Mon, 3 Jul 2023 21:24:11 +0100
Subject: [PATCH 3123/3183] lan mode 191

---
 CHANGELOG.md           | 2 +-
 lib/utils/constants.js | 1 +
 package-lock.json      | 8 ++++----
 package.json           | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index edcd5279..e1f270b9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,7 +8,7 @@ All notable changes to homebridge-ewelink will be documented in this file.
 
 - Support for `B02-BL`
 - Support for `SONOFF SNZB-02D`
-- Support for devices with UIID `191`
+- Support for devices with UIID `191` with LAN mode
 - Support for devices with UIID `7014`
 
 ### Breaking
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 5cbe8081..cf480224 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -278,6 +278,7 @@ export default {
       181,
       182,
       190,
+      191,
       209,
       210,
       211,
diff --git a/package-lock.json b/package-lock.json
index eb534c9d..e337e30e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -38,7 +38,7 @@
         "eslint": "^8.44.0",
         "eslint-config-airbnb-base": "^15.0.0",
         "eslint-plugin-import": "^2.27.5",
-        "eslint-plugin-import-newlines": "^1.3.1",
+        "eslint-plugin-import-newlines": "^1.3.3",
         "eslint-plugin-sort-exports": "^0.8.0"
       },
       "engines": {
@@ -769,9 +769,9 @@
       }
     },
     "node_modules/eslint-plugin-import-newlines": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import-newlines/-/eslint-plugin-import-newlines-1.3.1.tgz",
-      "integrity": "sha512-7vyhwliGm+CTwteRw2ym+IO9OaksGYmSt63elPPBM0QJ3zwRwMKtgHOSHVtdHlrSERRTVCsWtMO8dDdAdmHMXg==",
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import-newlines/-/eslint-plugin-import-newlines-1.3.3.tgz",
+      "integrity": "sha512-WBLhJdbh7QJKupF//BFDEIzwg2rfcWJegIDBwz79j0w7lQnfrOkAY6YBIQ/oIZ1+S5NZugG9TfRd/n0VWz+deA==",
       "dev": true,
       "bin": {
         "import-linter": "lib/index.js"
diff --git a/package.json b/package.json
index 51537257..8c3add2b 100644
--- a/package.json
+++ b/package.json
@@ -70,7 +70,7 @@
     "eslint": "^8.44.0",
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-plugin-import": "^2.27.5",
-    "eslint-plugin-import-newlines": "^1.3.1",
+    "eslint-plugin-import-newlines": "^1.3.3",
     "eslint-plugin-sort-exports": "^0.8.0"
   }
 }

From 6a2ab979ec2a93a3f57e9b3b5b098cc24a1d8957 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Mon, 3 Jul 2023 21:25:06 +0100
Subject: [PATCH 3124/3183] 10.4.1-beta.9

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index e337e30e..a5ee9ebc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "10.4.1-beta.8",
+  "version": "10.4.1-beta.9",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "10.4.1-beta.8",
+      "version": "10.4.1-beta.9",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 8c3add2b..42590dbb 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "10.4.1-beta.8",
+  "version": "10.4.1-beta.9",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From 084401e2ef83c67292e274792c6843ddd1d78424 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Tue, 4 Jul 2023 00:57:24 +0100
Subject: [PATCH 3125/3183] fix: motor params

---
 lib/device/motor.js | 78 ++++++++++++++++++++++++---------------------
 1 file changed, 42 insertions(+), 36 deletions(-)

diff --git a/lib/device/motor.js b/lib/device/motor.js
index 65be9f51..aa56f640 100644
--- a/lib/device/motor.js
+++ b/lib/device/motor.js
@@ -243,8 +243,11 @@ export default class {
 
   async externalUpdate(params) {
     try {
+      let locationParams = false;
+
       // currLocation is the current position of the motor
       if (hasProperty(params, 'currLocation')) {
+        locationParams = true;
         if (params.currLocation !== this.cachePos) {
           this.cachePos = params.currLocation;
           if (!this.isGarage) {
@@ -258,6 +261,7 @@ export default class {
 
       // location is the target position of the motor
       if (hasProperty(params, 'location')) {
+        locationParams = true;
         if (params.location !== this.cacheTarg) {
           this.cacheTarg = params.location;
           if (!this.isGarage) {
@@ -269,52 +273,54 @@ export default class {
         }
       }
 
-      // Get the target door state characteristic for use later
-      let targetChar;
-      if (this.isGarage) {
-        targetChar = this.service.getCharacteristic(this.TargetDoorState);
-      }
-
-      // If the two are equal then the motor must have stopped at this position
-      if (this.cacheTarg === this.cachePos) {
+      if (locationParams) {
+        // Get the target door state characteristic for use later
+        let targetChar;
         if (this.isGarage) {
-          if (this.cachePos === 0) {
-            // CLOSED
-            this.service.updateCharacteristic(this.hapChar.CurrentDoorState, 1);
-            if (targetChar.value !== 1) {
-              targetChar.updateValue(1);
+          targetChar = this.service.getCharacteristic(this.TargetDoorState);
+        }
+
+        // If the two are equal then the motor must have stopped at this position
+        if (this.cacheTarg === this.cachePos) {
+          if (this.isGarage) {
+            if (this.cachePos === 0) {
+              // CLOSED
+              this.service.updateCharacteristic(this.hapChar.CurrentDoorState, 1);
+              if (targetChar.value !== 1) {
+                targetChar.updateValue(1);
+              }
+            } else {
+              // OPEN
+              this.service.updateCharacteristic(this.hapChar.CurrentDoorState, 0);
+              if (targetChar.value !== 0) {
+                targetChar.updateValue(0);
+              }
             }
           } else {
-            // OPEN
-            this.service.updateCharacteristic(this.hapChar.CurrentDoorState, 0);
+            // PositionState 2 === STOPPED
+            this.service.updateCharacteristic(this.hapChar.PositionState, 2);
+          }
+        } else if (this.cacheTarg > this.cachePos) {
+          if (this.isGarage) {
+            // OPENING
+            this.service.updateCharacteristic(this.hapChar.CurrentDoorState, 2);
             if (targetChar.value !== 0) {
               targetChar.updateValue(0);
             }
+          } else {
+            // PositionState 1 === INCREASING
+            this.service.updateCharacteristic(this.hapChar.PositionState, 1);
           }
-        } else {
-          // PositionState 2 === STOPPED
-          this.service.updateCharacteristic(this.hapChar.PositionState, 2);
-        }
-      } else if (this.cacheTarg > this.cachePos) {
-        if (this.isGarage) {
-          // OPENING
-          this.service.updateCharacteristic(this.hapChar.CurrentDoorState, 2);
-          if (targetChar.value !== 0) {
-            targetChar.updateValue(0);
+        } else if (this.isGarage) {
+          // CLOSING
+          this.service.updateCharacteristic(this.hapChar.CurrentDoorState, 3);
+          if (targetChar.value !== 1) {
+            targetChar.updateValue(1);
           }
         } else {
-          // PositionState 1 === INCREASING
-          this.service.updateCharacteristic(this.hapChar.PositionState, 1);
-        }
-      } else if (this.isGarage) {
-        // CLOSING
-        this.service.updateCharacteristic(this.hapChar.CurrentDoorState, 3);
-        if (targetChar.value !== 1) {
-          targetChar.updateValue(1);
+          // PositionState 0 === DECREASING
+          this.service.updateCharacteristic(this.hapChar.PositionState, 0);
         }
-      } else {
-        // PositionState 0 === DECREASING
-        this.service.updateCharacteristic(this.hapChar.PositionState, 0);
       }
 
       // Update power information if given

From 2ee85b0127b224def26c21662459c5b5c19fca44 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Tue, 4 Jul 2023 00:57:45 +0100
Subject: [PATCH 3126/3183] 10.4.1-beta.10

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index a5ee9ebc..1138c6bc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "10.4.1-beta.9",
+  "version": "10.4.1-beta.10",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "10.4.1-beta.9",
+      "version": "10.4.1-beta.10",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 42590dbb..e7cab649 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "10.4.1-beta.9",
+  "version": "10.4.1-beta.10",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From ae0ebaf9570b44b4a6bd56e94fa64603f66ce373 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Wed, 12 Jul 2023 22:56:29 +0100
Subject: [PATCH 3127/3183] try fix motor

---
 lib/device/motor.js |  7 +++---
 package-lock.json   | 57 ++++++++++++++++++++++++++++++---------------
 package.json        |  2 +-
 3 files changed, 42 insertions(+), 24 deletions(-)

diff --git a/lib/device/motor.js b/lib/device/motor.js
index aa56f640..6a5c2a75 100644
--- a/lib/device/motor.js
+++ b/lib/device/motor.js
@@ -275,10 +275,9 @@ export default class {
 
       if (locationParams) {
         // Get the target door state characteristic for use later
-        let targetChar;
-        if (this.isGarage) {
-          targetChar = this.service.getCharacteristic(this.TargetDoorState);
-        }
+        const targetChar = this.isGarage
+          ? this.service.getCharacteristic(this.TargetDoorState)
+          : this.service.getCharacteristic(this.hapChar.TargetPosition);
 
         // If the two are equal then the motor must have stopped at this position
         if (this.cacheTarg === this.cachePos) {
diff --git a/package-lock.json b/package-lock.json
index 1138c6bc..d1dee475 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -38,7 +38,7 @@
         "eslint": "^8.44.0",
         "eslint-config-airbnb-base": "^15.0.0",
         "eslint-plugin-import": "^2.27.5",
-        "eslint-plugin-import-newlines": "^1.3.3",
+        "eslint-plugin-import-newlines": "^1.3.4",
         "eslint-plugin-sort-exports": "^0.8.0"
       },
       "engines": {
@@ -191,9 +191,9 @@
       "dev": true
     },
     "node_modules/acorn": {
-      "version": "8.9.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.9.0.tgz",
-      "integrity": "sha512-jaVNAFBHNLXspO543WnNNPZFRtavh3skAkITqD0/2aeMkKZTN+254PyhwxFYrk3vQ1xfY+2wbesJMs/JC8/PwQ==",
+      "version": "8.10.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz",
+      "integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==",
       "dev": true,
       "bin": {
         "acorn": "bin/acorn"
@@ -522,9 +522,9 @@
       }
     },
     "node_modules/es-abstract": {
-      "version": "1.21.2",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.21.2.tgz",
-      "integrity": "sha512-y/B5POM2iBnIxCiernH1G7rC9qQoM77lLIMQLuob0zhp8C56Po81+2Nj0WFKnd0pNReDTnkYryc+zhOzpEIROg==",
+      "version": "1.21.3",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.21.3.tgz",
+      "integrity": "sha512-ZU4miiY1j3sGPFLJ34VJXEqhpmL+HGByCinGHv4HC+Fxl2fI2Z4yR6tl0mORnDr6PA8eihWo4LmSWDbvhALckg==",
       "dependencies": {
         "array-buffer-byte-length": "^1.0.0",
         "available-typed-arrays": "^1.0.5",
@@ -532,7 +532,7 @@
         "es-set-tostringtag": "^2.0.1",
         "es-to-primitive": "^1.2.1",
         "function.prototype.name": "^1.1.5",
-        "get-intrinsic": "^1.2.0",
+        "get-intrinsic": "^1.2.1",
         "get-symbol-description": "^1.0.0",
         "globalthis": "^1.0.3",
         "gopd": "^1.0.1",
@@ -552,14 +552,15 @@
         "object-inspect": "^1.12.3",
         "object-keys": "^1.1.1",
         "object.assign": "^4.1.4",
-        "regexp.prototype.flags": "^1.4.3",
+        "regexp.prototype.flags": "^1.5.0",
         "safe-regex-test": "^1.0.0",
         "string.prototype.trim": "^1.2.7",
         "string.prototype.trimend": "^1.0.6",
         "string.prototype.trimstart": "^1.0.6",
+        "typed-array-byte-offset": "^1.0.0",
         "typed-array-length": "^1.0.4",
         "unbox-primitive": "^1.0.2",
-        "which-typed-array": "^1.1.9"
+        "which-typed-array": "^1.1.10"
       },
       "engines": {
         "node": ">= 0.4"
@@ -769,9 +770,9 @@
       }
     },
     "node_modules/eslint-plugin-import-newlines": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import-newlines/-/eslint-plugin-import-newlines-1.3.3.tgz",
-      "integrity": "sha512-WBLhJdbh7QJKupF//BFDEIzwg2rfcWJegIDBwz79j0w7lQnfrOkAY6YBIQ/oIZ1+S5NZugG9TfRd/n0VWz+deA==",
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import-newlines/-/eslint-plugin-import-newlines-1.3.4.tgz",
+      "integrity": "sha512-Lmf/BbK+EQKUfjKPcZpslE/KTGYlgaI8ZJ/sYzdbb3BVTg5+GmLBLHBjsUKNEVRM1SEhDTF/didtOSYKi4tSnQ==",
       "dev": true,
       "bin": {
         "import-linter": "lib/index.js"
@@ -2020,9 +2021,9 @@
       }
     },
     "node_modules/semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
       "dev": true,
       "bin": {
         "semver": "bin/semver.js"
@@ -2203,6 +2204,24 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/typed-array-byte-offset": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.0.tgz",
+      "integrity": "sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg==",
+      "dependencies": {
+        "available-typed-arrays": "^1.0.5",
+        "call-bind": "^1.0.2",
+        "for-each": "^0.3.3",
+        "has-proto": "^1.0.1",
+        "is-typed-array": "^1.1.10"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/typed-array-length": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.4.tgz",
@@ -2284,9 +2303,9 @@
       }
     },
     "node_modules/which-typed-array": {
-      "version": "1.1.9",
-      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.9.tgz",
-      "integrity": "sha512-w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA==",
+      "version": "1.1.10",
+      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.10.tgz",
+      "integrity": "sha512-uxoA5vLUfRPdjCuJ1h5LlYdmTLbYfums398v3WLkM+i/Wltl2/XyZpQWKbN++ck5L64SR/grOHqtXCUKmlZPNA==",
       "dependencies": {
         "available-typed-arrays": "^1.0.5",
         "call-bind": "^1.0.2",
diff --git a/package.json b/package.json
index e7cab649..198a7392 100644
--- a/package.json
+++ b/package.json
@@ -70,7 +70,7 @@
     "eslint": "^8.44.0",
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-plugin-import": "^2.27.5",
-    "eslint-plugin-import-newlines": "^1.3.3",
+    "eslint-plugin-import-newlines": "^1.3.4",
     "eslint-plugin-sort-exports": "^0.8.0"
   }
 }

From 54e89859af5a020795abe7a617a07294478ac99c Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Wed, 12 Jul 2023 22:56:53 +0100
Subject: [PATCH 3128/3183] 10.4.1-beta.11

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d1dee475..762d887e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "10.4.1-beta.10",
+  "version": "10.4.1-beta.11",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "10.4.1-beta.10",
+      "version": "10.4.1-beta.11",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 198a7392..141da82e 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "10.4.1-beta.10",
+  "version": "10.4.1-beta.11",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From 5e811b5a7a1410b3a87fcf207a35a5996d628332 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Fri, 14 Jul 2023 19:23:28 +0100
Subject: [PATCH 3129/3183] motor

---
 lib/device/motor.js |  2 +-
 package-lock.json   | 22 ++++++++++------------
 package.json        |  2 +-
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/lib/device/motor.js b/lib/device/motor.js
index 6a5c2a75..505c7f18 100644
--- a/lib/device/motor.js
+++ b/lib/device/motor.js
@@ -276,7 +276,7 @@ export default class {
       if (locationParams) {
         // Get the target door state characteristic for use later
         const targetChar = this.isGarage
-          ? this.service.getCharacteristic(this.TargetDoorState)
+          ? this.service.getCharacteristic(this.hapChar.TargetDoorState)
           : this.service.getCharacteristic(this.hapChar.TargetPosition);
 
         // If the two are equal then the motor must have stopped at this position
diff --git a/package-lock.json b/package-lock.json
index 762d887e..195e3e43 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -35,7 +35,7 @@
         "ws": "^8.13.0"
       },
       "devDependencies": {
-        "eslint": "^8.44.0",
+        "eslint": "^8.45.0",
         "eslint-config-airbnb-base": "^15.0.0",
         "eslint-plugin-import": "^2.27.5",
         "eslint-plugin-import-newlines": "^1.3.4",
@@ -620,9 +620,9 @@
       }
     },
     "node_modules/eslint": {
-      "version": "8.44.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.44.0.tgz",
-      "integrity": "sha512-0wpHoUbDUHgNCyvFB5aXLiQVfK9B0at6gUvzy83k4kAsQ/u769TQDX6iKC+aO4upIHO9WSaA3QoXYQDHbNwf1A==",
+      "version": "8.45.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.45.0.tgz",
+      "integrity": "sha512-pd8KSxiQpdYRfYa9Wufvdoct3ZPQQuVuU5O6scNgMuOMYuxvH0IGaYK0wUFjo4UYYQQCUndlXiMbnxopwvvTiw==",
       "dev": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
@@ -650,7 +650,6 @@
         "globals": "^13.19.0",
         "graphemer": "^1.4.0",
         "ignore": "^5.2.0",
-        "import-fresh": "^3.0.0",
         "imurmurhash": "^0.1.4",
         "is-glob": "^4.0.0",
         "is-path-inside": "^3.0.3",
@@ -662,7 +661,6 @@
         "natural-compare": "^1.4.0",
         "optionator": "^0.9.3",
         "strip-ansi": "^6.0.1",
-        "strip-json-comments": "^3.1.0",
         "text-table": "^0.2.0"
       },
       "bin": {
@@ -815,9 +813,9 @@
       }
     },
     "node_modules/eslint-scope": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.0.tgz",
-      "integrity": "sha512-DYj5deGlHBfMt15J7rdtyKNq/Nqlv5KfU4iodrQ019XESsRnwXH9KAE0y3cwtUHDo2ob7CypAnCqefh6vioWRw==",
+      "version": "7.2.1",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.1.tgz",
+      "integrity": "sha512-CvefSOsDdaYYvxChovdrPo/ZGt8d5lrJWleAc1diXRKhHGiTYEI26cvo8Kle/wGnsizoCJjK73FMg1/IkIwiNA==",
       "dev": true,
       "dependencies": {
         "esrecurse": "^4.3.0",
@@ -843,9 +841,9 @@
       }
     },
     "node_modules/espree": {
-      "version": "9.6.0",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.0.tgz",
-      "integrity": "sha512-1FH/IiruXZ84tpUlm0aCUEwMl2Ho5ilqVh0VvQXw+byAz/4SAciyHLlfmL5WYqsvD38oymdUwBss0LtK8m4s/A==",
+      "version": "9.6.1",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz",
+      "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==",
       "dev": true,
       "dependencies": {
         "acorn": "^8.9.0",
diff --git a/package.json b/package.json
index 141da82e..5d5165b1 100644
--- a/package.json
+++ b/package.json
@@ -67,7 +67,7 @@
     "ws": "^8.13.0"
   },
   "devDependencies": {
-    "eslint": "^8.44.0",
+    "eslint": "^8.45.0",
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-plugin-import": "^2.27.5",
     "eslint-plugin-import-newlines": "^1.3.4",

From 0c1ed120fac5ba9db268f451424e4cf3bbc83d77 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Fri, 14 Jul 2023 19:23:42 +0100
Subject: [PATCH 3130/3183] 10.4.1-beta.12

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 195e3e43..3a8bd54b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "10.4.1-beta.11",
+  "version": "10.4.1-beta.12",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "10.4.1-beta.11",
+      "version": "10.4.1-beta.12",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 5d5165b1..b0f188d9 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "10.4.1-beta.11",
+  "version": "10.4.1-beta.12",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From 322bea8971750a6d05c9a8106dd7fab84f08ec97 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Mon, 24 Jul 2023 02:10:00 +0100
Subject: [PATCH 3131/3183] prep v11

---
 CHANGELOG.md      |  10 ++++-
 package-lock.json | 110 +++++++++++++++++++++++++++++++++++++---------
 package.json      |   2 +-
 3 files changed, 99 insertions(+), 23 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e1f270b9..7c190ca2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,13 @@
 
 All notable changes to homebridge-ewelink will be documented in this file.
 
-## BETA
+This project tries to adhere to [Semantic Versioning](http://semver.org/). In practice, this means that the version number will be incremented based on the following:
+
+- `MAJOR` version when a minimum supported version of `homebridge` or `node` is increased to a new major version, or when a breaking change is made to the plugin config
+- `MINOR` version when a new device type is added, or when a new feature is added that is backwards-compatible
+- `PATCH` version when backwards-compatible bug fixes are implemented
+
+## 11.0.0 (2023-07-24)
 
 ### Added
 
@@ -21,7 +27,7 @@ All notable changes to homebridge-ewelink will be documented in this file.
 ### Changed
 
 - Bump `homebridge` recommended version to v1.6.0 or v2.0.0-beta
-- Bump `node` recommended versions to v16.20.1 or v18.16.1 or v20.3.1
+- Bump `node` recommended versions to v16.20.1 or v18.17.0 or v20.5.0
 - Updated dependencies
 
 ## 10.4.0 (2023-01-07)
diff --git a/package-lock.json b/package-lock.json
index 3a8bd54b..9175f8a4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -43,7 +43,7 @@
       },
       "engines": {
         "homebridge": "^1.6.0 || ^2.0.0-beta.0",
-        "node": "^16.20.1 || ^18.16.1 || ^20.3.1"
+        "node": "^16.20.1 || ^18.17.0 || ^20.5.0"
       }
     },
     "node_modules/@aashutoshrathi/word-wrap": {
@@ -71,9 +71,9 @@
       }
     },
     "node_modules/@eslint-community/regexpp": {
-      "version": "4.5.1",
-      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.5.1.tgz",
-      "integrity": "sha512-Z5ba73P98O1KUYCCJTUeVpja9RcGoMdncZ6T49FCUl2lN38JtCJ+3WgIDBv0AuY4WChU5PmtJmOCTlN6FZTFKQ==",
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.6.0.tgz",
+      "integrity": "sha512-uiPeRISaglZnaZk8vwrjQZ1CxogZeY/4IYft6gBOTqu1WhVXWmCmZMWxUv2Q/pxSvPdp1JPaO62kLOcOkMqWrw==",
       "dev": true,
       "engines": {
         "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
@@ -324,6 +324,25 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/arraybuffer.prototype.slice": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.1.tgz",
+      "integrity": "sha512-09x0ZWFEjj4WD8PDbykUwo3t9arLn8NIzmmYEJFpYekOAQjpkGSyrQhNoRTcwwcFRu+ycWF78QZ63oWTqSjBcw==",
+      "dependencies": {
+        "array-buffer-byte-length": "^1.0.0",
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.2.0",
+        "get-intrinsic": "^1.2.1",
+        "is-array-buffer": "^3.0.2",
+        "is-shared-array-buffer": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
@@ -522,11 +541,12 @@
       }
     },
     "node_modules/es-abstract": {
-      "version": "1.21.3",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.21.3.tgz",
-      "integrity": "sha512-ZU4miiY1j3sGPFLJ34VJXEqhpmL+HGByCinGHv4HC+Fxl2fI2Z4yR6tl0mORnDr6PA8eihWo4LmSWDbvhALckg==",
+      "version": "1.22.1",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.1.tgz",
+      "integrity": "sha512-ioRRcXMO6OFyRpyzV3kE1IIBd4WG5/kltnzdxSCqoP8CMGs/Li+M1uF5o7lOkZVFjDs+NLesthnF66Pg/0q0Lw==",
       "dependencies": {
         "array-buffer-byte-length": "^1.0.0",
+        "arraybuffer.prototype.slice": "^1.0.1",
         "available-typed-arrays": "^1.0.5",
         "call-bind": "^1.0.2",
         "es-set-tostringtag": "^2.0.1",
@@ -553,10 +573,13 @@
         "object-keys": "^1.1.1",
         "object.assign": "^4.1.4",
         "regexp.prototype.flags": "^1.5.0",
+        "safe-array-concat": "^1.0.0",
         "safe-regex-test": "^1.0.0",
         "string.prototype.trim": "^1.2.7",
         "string.prototype.trimend": "^1.0.6",
         "string.prototype.trimstart": "^1.0.6",
+        "typed-array-buffer": "^1.0.0",
+        "typed-array-byte-length": "^1.0.0",
         "typed-array-byte-offset": "^1.0.0",
         "typed-array-length": "^1.0.4",
         "unbox-primitive": "^1.0.2",
@@ -1485,15 +1508,11 @@
       }
     },
     "node_modules/is-typed-array": {
-      "version": "1.1.10",
-      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.10.tgz",
-      "integrity": "sha512-PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A==",
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.12.tgz",
+      "integrity": "sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==",
       "dependencies": {
-        "available-typed-arrays": "^1.0.5",
-        "call-bind": "^1.0.2",
-        "for-each": "^0.3.3",
-        "gopd": "^1.0.1",
-        "has-tostringtag": "^1.0.0"
+        "which-typed-array": "^1.1.11"
       },
       "engines": {
         "node": ">= 0.4"
@@ -1513,6 +1532,11 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/isarray": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
+      "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw=="
+    },
     "node_modules/isexe": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
@@ -2005,6 +2029,23 @@
         "queue-microtask": "^1.2.2"
       }
     },
+    "node_modules/safe-array-concat": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.0.0.tgz",
+      "integrity": "sha512-9dVEFruWIsnie89yym+xWTAYASdpw3CJV7Li/6zBewGf9z2i1j31rP6jnY0pHEO4QZh6N0K11bFjWmdR8UGdPQ==",
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.2.0",
+        "has-symbols": "^1.0.3",
+        "isarray": "^2.0.5"
+      },
+      "engines": {
+        "node": ">=0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/safe-regex-test": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz",
@@ -2202,6 +2243,36 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/typed-array-buffer": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.0.tgz",
+      "integrity": "sha512-Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw==",
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.2.1",
+        "is-typed-array": "^1.1.10"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/typed-array-byte-length": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.0.tgz",
+      "integrity": "sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA==",
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "for-each": "^0.3.3",
+        "has-proto": "^1.0.1",
+        "is-typed-array": "^1.1.10"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/typed-array-byte-offset": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.0.tgz",
@@ -2301,16 +2372,15 @@
       }
     },
     "node_modules/which-typed-array": {
-      "version": "1.1.10",
-      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.10.tgz",
-      "integrity": "sha512-uxoA5vLUfRPdjCuJ1h5LlYdmTLbYfums398v3WLkM+i/Wltl2/XyZpQWKbN++ck5L64SR/grOHqtXCUKmlZPNA==",
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.11.tgz",
+      "integrity": "sha512-qe9UWWpkeG5yzZ0tNYxDmd7vo58HDBc39mZ0xWWpolAGADdFOzkfamWLDxkOWcvHQKVmdTyQdLD4NOfjLWTKew==",
       "dependencies": {
         "available-typed-arrays": "^1.0.5",
         "call-bind": "^1.0.2",
         "for-each": "^0.3.3",
         "gopd": "^1.0.1",
-        "has-tostringtag": "^1.0.0",
-        "is-typed-array": "^1.1.10"
+        "has-tostringtag": "^1.0.0"
       },
       "engines": {
         "node": ">= 0.4"
diff --git a/package.json b/package.json
index b0f188d9..d25a56a6 100644
--- a/package.json
+++ b/package.json
@@ -31,7 +31,7 @@
   },
   "engines": {
     "homebridge": "^1.6.0 || ^2.0.0-beta.0",
-    "node": "^16.20.1 || ^18.16.1 || ^20.3.1"
+    "node": "^16.20.1 || ^18.17.0 || ^20.5.0"
   },
   "repository": {
     "type": "git",

From 256ad62924cd9270ba8364eb2dfea40c2947dedf Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Mon, 24 Jul 2023 02:10:22 +0100
Subject: [PATCH 3132/3183] 11.0.0

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 9175f8a4..7fd6f72e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "10.4.1-beta.12",
+  "version": "11.0.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "10.4.1-beta.12",
+      "version": "11.0.0",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index d25a56a6..d77d11f8 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "10.4.1-beta.12",
+  "version": "11.0.0",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From 47e9025b8c879473e5a3639d46d8423ad9081818 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Mon, 24 Jul 2023 07:03:43 +0100
Subject: [PATCH 3133/3183] few fixes

---
 lib/connection/lan.js                    |  3 +-
 lib/connection/ws.js                     |  9 +--
 lib/device/group.js                      |  2 +-
 lib/device/outlet-multi.js               |  2 +-
 lib/device/outlet-single-inched.js       |  2 +-
 lib/device/outlet-single.js              |  2 +-
 lib/device/panel.js                      |  5 +-
 lib/device/rf-bridge.js                  |  3 +-
 lib/device/rf-sensor.js                  |  2 +-
 lib/device/sensor-ambient.js             |  5 +-
 lib/device/sensor-contact.js             |  2 +-
 lib/device/sensor-temp-humi.js           |  5 +-
 lib/device/simulation/cooler.js          |  8 +--
 lib/device/simulation/garage-eachen.js   |  2 +-
 lib/device/simulation/garage-one.js      |  2 +-
 lib/device/simulation/gate-one.js        |  2 +-
 lib/device/simulation/heater.js          |  8 +--
 lib/device/simulation/sensor-leak.js     |  2 +-
 lib/device/simulation/sensor-visible.js  |  2 +-
 lib/device/simulation/sensor.js          |  2 +-
 lib/device/simulation/switch-valve.js    |  2 +-
 lib/device/simulation/th-cooler.js       |  5 +-
 lib/device/simulation/th-dehumidifier.js |  5 +-
 lib/device/simulation/th-heater.js       |  5 +-
 lib/device/simulation/th-humidifier.js   |  5 +-
 lib/device/simulation/th-thermostat.js   |  5 +-
 lib/device/switch-multi.js               |  2 +-
 lib/device/switch-single-inched.js       |  2 +-
 lib/device/switch-single.js              |  2 +-
 lib/device/thermostat.js                 |  5 +-
 lib/device/zigbee/sensor-ambient.js      |  5 +-
 lib/device/zigbee/sensor-contact.js      |  2 +-
 lib/device/zigbee/sensor-leak.js         |  2 +-
 lib/device/zigbee/sensor-motion.js       |  2 +-
 lib/platform.js                          | 75 ++++++------------------
 35 files changed, 69 insertions(+), 125 deletions(-)

diff --git a/lib/connection/lan.js b/lib/connection/lan.js
index a991a1a3..e808aaf4 100644
--- a/lib/connection/lan.js
+++ b/lib/connection/lan.js
@@ -134,8 +134,7 @@ export default class {
             }
           });
       } catch (err) {
-        const eText = parseError(err);
-        this.log.warn('%s %s.', this.lang.cantParsePacket, eText);
+        this.log.warn('%s %s.', this.lang.cantParsePacket, parseError(err));
       }
     };
 
diff --git a/lib/connection/ws.js b/lib/connection/ws.js
index 56a221d9..ae0adace 100644
--- a/lib/connection/ws.js
+++ b/lib/connection/ws.js
@@ -151,8 +151,7 @@ export default class {
               } catch (err) {
                 // Catch errors sending ping and show in debug mode
                 if (this.debug) {
-                  const eText = parseError(err);
-                  this.log.warn('%s %s.', this.lang.wsPingError, eText);
+                  this.log.warn('%s %s.', this.lang.wsPingError, parseError(err));
                 }
               }
             }, (res.config.hbInterval + 7) * 1000);
@@ -171,8 +170,7 @@ export default class {
           }
         } catch (err) {
           // Catch any errors authenticating the WS connection
-          const eText = parseError(err);
-          this.log.warn('%s %s.', this.lang.wsLoginError, eText);
+          this.log.warn('%s %s.', this.lang.wsLoginError, parseError(err));
         }
       });
 
@@ -340,8 +338,7 @@ export default class {
         }
       } catch (err) {
         // Catch any errors sending the device update
-        const eText = parseError(err);
-        throw new Error(eText);
+        throw new Error(parseError(err));
       }
     } else {
       // The web socket isn't currently open so log this
diff --git a/lib/device/group.js b/lib/device/group.js
index ed2948df..d5ae491c 100644
--- a/lib/device/group.js
+++ b/lib/device/group.js
@@ -34,7 +34,7 @@ export default class {
 
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new platform.eveService('switch', this.accessory, {
-      log: platform.config.debugFakegato ? this.log : () => {},
+      log: () => {},
     });
 
     // Output the customised options to the log
diff --git a/lib/device/outlet-multi.js b/lib/device/outlet-multi.js
index 7b0ff23e..7c8baf40 100644
--- a/lib/device/outlet-multi.js
+++ b/lib/device/outlet-multi.js
@@ -136,7 +136,7 @@ export default class {
 
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new platform.eveService('energy', this.accessory, {
-      log: platform.config.debugFakegato ? this.log : () => {},
+      log: () => {},
     });
 
     // Set up extra features for outlets that provide power readings
diff --git a/lib/device/outlet-single-inched.js b/lib/device/outlet-single-inched.js
index 5c9b575b..c070838e 100644
--- a/lib/device/outlet-single-inched.js
+++ b/lib/device/outlet-single-inched.js
@@ -181,7 +181,7 @@ export default class {
 
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new platform.eveService('energy', this.accessory, {
-      log: platform.config.debugFakegato ? this.log : () => {},
+      log: () => {},
     });
 
     // Set up extra features for outlets that provide power readings
diff --git a/lib/device/outlet-single.js b/lib/device/outlet-single.js
index 6c6f979e..b2fec27e 100644
--- a/lib/device/outlet-single.js
+++ b/lib/device/outlet-single.js
@@ -174,7 +174,7 @@ export default class {
 
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new platform.eveService('energy', this.accessory, {
-      log: platform.config.debugFakegato ? this.log : () => {},
+      log: () => {},
     });
 
     // Set up extra features for outlets that provide power readings
diff --git a/lib/device/panel.js b/lib/device/panel.js
index bb0c4ef8..88a723a9 100644
--- a/lib/device/panel.js
+++ b/lib/device/panel.js
@@ -97,7 +97,7 @@ export default class {
 
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new platform.eveService('custom', this.accessory, {
-      log: platform.config.debugFakegato ? this.log : () => {},
+      log: () => {},
     });
 
     // Output the customised options to the log
@@ -362,8 +362,7 @@ export default class {
       );
     } catch (err) {
       if (this.enableLogging) {
-        const eText = parseError(err);
-        this.log.warn('[%s] %s %s.', this.name, this.lang.storageWriteErr, eText);
+        this.log.warn('[%s] %s %s.', this.name, this.lang.storageWriteErr, parseError(err));
       }
     }
   }
diff --git a/lib/device/rf-bridge.js b/lib/device/rf-bridge.js
index 0d14e6be..612b0d72 100644
--- a/lib/device/rf-bridge.js
+++ b/lib/device/rf-bridge.js
@@ -306,8 +306,7 @@ export default class {
                 throw new Error(`${this.lang.rfNotFound}[${chan}]`);
               }
             } catch (err) {
-              const eText = parseError(err);
-              this.log.warn('[%s] %s %s.', this.name, this.lang.devNotRf, eText);
+              this.log.warn('[%s] %s %s.', this.name, this.lang.devNotRf, parseError(err));
             }
           });
       }
diff --git a/lib/device/rf-sensor.js b/lib/device/rf-sensor.js
index 431dc7d9..fe04afb3 100644
--- a/lib/device/rf-sensor.js
+++ b/lib/device/rf-sensor.js
@@ -153,7 +153,7 @@ export default class {
 
     // Pass the accessory to Fakegato to set up with Eve
     accessory.eveService = new platform.eveService(eveType, accessory, {
-      log: platform.config.debugFakegato ? this.log : () => {},
+      log: () => {},
     });
 
     // Output the customised options to the log
diff --git a/lib/device/sensor-ambient.js b/lib/device/sensor-ambient.js
index ae1bf88d..47f24d75 100644
--- a/lib/device/sensor-ambient.js
+++ b/lib/device/sensor-ambient.js
@@ -135,7 +135,7 @@ export default class {
 
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new platform.eveService('custom', this.accessory, {
-      log: platform.config.debugFakegato ? this.log : () => {},
+      log: () => {},
     });
 
     // Set up an interval to get eWeLink to send regular temperature/humidity updates
@@ -282,8 +282,7 @@ export default class {
       );
     } catch (err) {
       if (this.enableLogging) {
-        const eText = parseError(err);
-        this.log.warn('[%s] %s %s.', this.name, this.lang.storageWriteErr, eText);
+        this.log.warn('[%s] %s %s.', this.name, this.lang.storageWriteErr, parseError(err));
       }
     }
   }
diff --git a/lib/device/sensor-contact.js b/lib/device/sensor-contact.js
index db6ed70b..b95b4289 100644
--- a/lib/device/sensor-contact.js
+++ b/lib/device/sensor-contact.js
@@ -68,7 +68,7 @@ export default class {
 
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new platform.eveService('door', this.accessory, {
-      log: platform.config.debugFakegato ? this.log : () => {},
+      log: () => {},
     });
     this.accessory.eveService.addEntry({
       status: this.service.getCharacteristic(this.hapChar.ContactSensorState).value,
diff --git a/lib/device/sensor-temp-humi.js b/lib/device/sensor-temp-humi.js
index 401c73ce..f48522a8 100644
--- a/lib/device/sensor-temp-humi.js
+++ b/lib/device/sensor-temp-humi.js
@@ -84,7 +84,7 @@ export default class {
 
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new platform.eveService('custom', this.accessory, {
-      log: platform.config.debugFakegato ? this.log : () => {},
+      log: () => {},
     });
 
     // Output the customised options to the log
@@ -159,8 +159,7 @@ export default class {
       );
     } catch (err) {
       if (this.enableLogging) {
-        const eText = parseError(err);
-        this.log.warn('[%s] %s %s.', this.name, this.lang.storageWriteErr, eText);
+        this.log.warn('[%s] %s %s.', this.name, this.lang.storageWriteErr, parseError(err));
       }
     }
   }
diff --git a/lib/device/simulation/cooler.js b/lib/device/simulation/cooler.js
index 92316918..0ae735a0 100644
--- a/lib/device/simulation/cooler.js
+++ b/lib/device/simulation/cooler.js
@@ -133,7 +133,7 @@ export default class {
 
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new platform.eveService('custom', this.accessory, {
-      log: platform.config.debugFakegato ? this.log : () => {},
+      log: () => {},
     });
 
     // Set up an interval to get regular temperature updates
@@ -280,8 +280,7 @@ export default class {
         this.cacheCool === 'on' ? 3 : 1,
       );
     } catch (err) {
-      const eText = parseError(err);
-      this.log.warn('[%s] %s.', this.name, eText);
+      this.log.warn('[%s] %s.', this.name, parseError(err));
     }
   }
 
@@ -303,8 +302,7 @@ export default class {
         this.internalCurrentTempUpdate();
       }
     } catch (err) {
-      const eText = parseError(err);
-      this.log.warn('[%s] %s.', this.name, eText);
+      this.log.warn('[%s] %s.', this.name, parseError(err));
     }
   }
 
diff --git a/lib/device/simulation/garage-eachen.js b/lib/device/simulation/garage-eachen.js
index dd6da50f..ceee734c 100644
--- a/lib/device/simulation/garage-eachen.js
+++ b/lib/device/simulation/garage-eachen.js
@@ -115,7 +115,7 @@ export default class {
 
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new platform.eveService('door', this.accessory, {
-      log: platform.config.debugFakegato ? this.log : () => {},
+      log: () => {},
     });
     this.accessory.eveService.addEntry({
       status: this.service.getCharacteristic(this.hapChar.CurrentDoorState).value === 0 ? 0 : 1,
diff --git a/lib/device/simulation/garage-one.js b/lib/device/simulation/garage-one.js
index c7470e86..0234e1f4 100644
--- a/lib/device/simulation/garage-one.js
+++ b/lib/device/simulation/garage-one.js
@@ -156,7 +156,7 @@ export default class {
 
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new platform.eveService('door', this.accessory, {
-      log: platform.config.debugFakegato ? this.log : () => {},
+      log: () => {},
     });
     this.accessory.eveService.addEntry({
       status: this.service.getCharacteristic(this.hapChar.CurrentDoorState).value === 0 ? 0 : 1,
diff --git a/lib/device/simulation/gate-one.js b/lib/device/simulation/gate-one.js
index 0c54fe47..97557de9 100644
--- a/lib/device/simulation/gate-one.js
+++ b/lib/device/simulation/gate-one.js
@@ -134,7 +134,7 @@ export default class {
 
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new platform.eveService('door', this.accessory, {
-      log: platform.config.debugFakegato ? this.log : () => {},
+      log: () => {},
     });
     this.accessory.eveService.addEntry({
       status: this.service.getCharacteristic(this.hapChar.CurrentDoorState).value === 0 ? 0 : 1,
diff --git a/lib/device/simulation/heater.js b/lib/device/simulation/heater.js
index 6747faac..e76b372d 100644
--- a/lib/device/simulation/heater.js
+++ b/lib/device/simulation/heater.js
@@ -133,7 +133,7 @@ export default class {
 
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new platform.eveService('custom', this.accessory, {
-      log: platform.config.debugFakegato ? this.log : () => {},
+      log: () => {},
     });
 
     // Set up an interval to get regular temperature updates
@@ -280,8 +280,7 @@ export default class {
         this.cacheHeat === 'on' ? 2 : 1,
       );
     } catch (err) {
-      const eText = parseError(err);
-      this.log.warn('[%s] %s.', this.name, eText);
+      this.log.warn('[%s] %s.', this.name, parseError(err));
     }
   }
 
@@ -303,8 +302,7 @@ export default class {
         this.internalCurrentTempUpdate();
       }
     } catch (err) {
-      const eText = parseError(err);
-      this.log.warn('[%s] %s.', this.name, eText);
+      this.log.warn('[%s] %s.', this.name, parseError(err));
     }
   }
 
diff --git a/lib/device/simulation/sensor-leak.js b/lib/device/simulation/sensor-leak.js
index 32833136..4b0e95e0 100644
--- a/lib/device/simulation/sensor-leak.js
+++ b/lib/device/simulation/sensor-leak.js
@@ -59,7 +59,7 @@ export default class {
 
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new platform.eveService('motion', this.accessory, {
-      log: platform.config.debugFakegato ? this.log : () => {},
+      log: () => {},
     });
 
     // Output the customised options to the log
diff --git a/lib/device/simulation/sensor-visible.js b/lib/device/simulation/sensor-visible.js
index 08849557..855c0b33 100644
--- a/lib/device/simulation/sensor-visible.js
+++ b/lib/device/simulation/sensor-visible.js
@@ -92,7 +92,7 @@ export default class {
 
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new platform.eveService('door', this.accessory, {
-      log: platform.config.debugFakegato ? this.log : () => {},
+      log: () => {},
     });
     this.accessory.eveService.addEntry({
       status: this.service.getCharacteristic(this.hapChar.ContactSensorState).value,
diff --git a/lib/device/simulation/sensor.js b/lib/device/simulation/sensor.js
index 0e9c8fea..0f731957 100644
--- a/lib/device/simulation/sensor.js
+++ b/lib/device/simulation/sensor.js
@@ -161,7 +161,7 @@ export default class {
 
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new platform.eveService(eveType, this.accessory, {
-      log: platform.config.debugFakegato ? this.log : () => {},
+      log: () => {},
     });
 
     // Set up an interval to get eWeLink to send power updates
diff --git a/lib/device/simulation/switch-valve.js b/lib/device/simulation/switch-valve.js
index b47ddc3a..73b9c3f7 100644
--- a/lib/device/simulation/switch-valve.js
+++ b/lib/device/simulation/switch-valve.js
@@ -127,7 +127,7 @@ export default class {
 
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new platform.eveService('switch', this.accessory, {
-      log: platform.config.debugFakegato ? this.log : () => {},
+      log: () => {},
     });
 
     // Set up an interval to get eWeLink to send power updates
diff --git a/lib/device/simulation/th-cooler.js b/lib/device/simulation/th-cooler.js
index de8cb7f6..d7ebddb6 100644
--- a/lib/device/simulation/th-cooler.js
+++ b/lib/device/simulation/th-cooler.js
@@ -187,7 +187,7 @@ export default class {
 
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new platform.eveService('custom', this.accessory, {
-      log: platform.config.debugFakegato ? this.log : () => {},
+      log: () => {},
     });
 
     // Set up an interval to get eWeLink to send regular temperature/humidity updates
@@ -432,8 +432,7 @@ export default class {
       );
     } catch (err) {
       if (this.enableLogging) {
-        const eText = parseError(err);
-        this.log.warn('[%s] %s %s.', this.name, this.lang.storageWriteErr, eText);
+        this.log.warn('[%s] %s %s.', this.name, this.lang.storageWriteErr, parseError(err));
       }
     }
   }
diff --git a/lib/device/simulation/th-dehumidifier.js b/lib/device/simulation/th-dehumidifier.js
index f2920b8a..56429b49 100644
--- a/lib/device/simulation/th-dehumidifier.js
+++ b/lib/device/simulation/th-dehumidifier.js
@@ -174,7 +174,7 @@ export default class {
 
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new platform.eveService('custom', this.accessory, {
-      log: platform.config.debugFakegato ? this.log : () => {},
+      log: () => {},
     });
 
     // Set up an interval to get eWeLink to send regular temperature/humidity updates
@@ -413,8 +413,7 @@ export default class {
       );
     } catch (err) {
       if (this.enableLogging) {
-        const eText = parseError(err);
-        this.log.warn('[%s] %s %s.', this.name, this.lang.storageWriteErr, eText);
+        this.log.warn('[%s] %s %s.', this.name, this.lang.storageWriteErr, parseError(err));
       }
     }
   }
diff --git a/lib/device/simulation/th-heater.js b/lib/device/simulation/th-heater.js
index bb057974..4add324c 100644
--- a/lib/device/simulation/th-heater.js
+++ b/lib/device/simulation/th-heater.js
@@ -186,7 +186,7 @@ export default class {
 
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new platform.eveService('custom', this.accessory, {
-      log: platform.config.debugFakegato ? this.log : () => {},
+      log: () => {},
     });
 
     // Set up an interval to get eWeLink to send regular temperature/humidity updates
@@ -438,8 +438,7 @@ export default class {
       );
     } catch (err) {
       if (this.enableLogging) {
-        const eText = parseError(err);
-        this.log.warn('[%s] %s %s.', this.name, this.lang.storageWriteErr, eText);
+        this.log.warn('[%s] %s %s.', this.name, this.lang.storageWriteErr, parseError(err));
       }
     }
   }
diff --git a/lib/device/simulation/th-humidifier.js b/lib/device/simulation/th-humidifier.js
index 294be681..aed2e69d 100644
--- a/lib/device/simulation/th-humidifier.js
+++ b/lib/device/simulation/th-humidifier.js
@@ -174,7 +174,7 @@ export default class {
 
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new platform.eveService('custom', this.accessory, {
-      log: platform.config.debugFakegato ? this.log : () => {},
+      log: () => {},
     });
 
     // Set up an interval to get eWeLink to send regular temperature/humidity updates
@@ -413,8 +413,7 @@ export default class {
       );
     } catch (err) {
       if (this.enableLogging) {
-        const eText = parseError(err);
-        this.log.warn('[%s] %s %s.', this.name, this.lang.storageWriteErr, eText);
+        this.log.warn('[%s] %s %s.', this.name, this.lang.storageWriteErr, parseError(err));
       }
     }
   }
diff --git a/lib/device/simulation/th-thermostat.js b/lib/device/simulation/th-thermostat.js
index 86affb2b..14472893 100644
--- a/lib/device/simulation/th-thermostat.js
+++ b/lib/device/simulation/th-thermostat.js
@@ -195,7 +195,7 @@ export default class {
 
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new platform.eveService('custom', this.accessory, {
-      log: platform.config.debugFakegato ? this.log : () => {},
+      log: () => {},
     });
 
     // Set up an interval to get eWeLink to send regular temperature/humidity updates
@@ -600,8 +600,7 @@ export default class {
       );
     } catch (err) {
       if (this.enableLogging) {
-        const eText = parseError(err);
-        this.log.warn('[%s] %s %s.', this.name, this.lang.storageWriteErr, eText);
+        this.log.warn('[%s] %s %s.', this.name, this.lang.storageWriteErr, parseError(err));
       }
     }
   }
diff --git a/lib/device/switch-multi.js b/lib/device/switch-multi.js
index f5f3cf78..28860480 100644
--- a/lib/device/switch-multi.js
+++ b/lib/device/switch-multi.js
@@ -132,7 +132,7 @@ export default class {
 
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new platform.eveService('switch', this.accessory, {
-      log: platform.config.debugFakegato ? this.log : () => {},
+      log: () => {},
     });
 
     // Set up extra features for outlets that provide power readings
diff --git a/lib/device/switch-single-inched.js b/lib/device/switch-single-inched.js
index 66b13827..6dc5a262 100644
--- a/lib/device/switch-single-inched.js
+++ b/lib/device/switch-single-inched.js
@@ -157,7 +157,7 @@ export default class {
 
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new platform.eveService('switch', this.accessory, {
-      log: platform.config.debugFakegato ? this.log : () => {},
+      log: () => {},
     });
 
     // Set up extra features for outlets that provide power readings
diff --git a/lib/device/switch-single.js b/lib/device/switch-single.js
index 76030b47..6f58c2d8 100644
--- a/lib/device/switch-single.js
+++ b/lib/device/switch-single.js
@@ -149,7 +149,7 @@ export default class {
 
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new platform.eveService('switch', this.accessory, {
-      log: platform.config.debugFakegato ? this.log : () => {},
+      log: () => {},
     });
 
     // Set up extra features for outlets that provide power readings
diff --git a/lib/device/thermostat.js b/lib/device/thermostat.js
index d50c4b03..3d5e6576 100644
--- a/lib/device/thermostat.js
+++ b/lib/device/thermostat.js
@@ -130,7 +130,7 @@ export default class {
 
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new platform.eveService('custom', this.accessory, {
-      log: platform.config.debugFakegato ? this.log : () => {},
+      log: () => {},
     });
 
     // Output the customised options to the log
@@ -279,8 +279,7 @@ export default class {
       );
     } catch (err) {
       if (this.enableLogging) {
-        const eText = parseError(err);
-        this.log.warn('[%s] %s %s.', this.name, this.lang.storageWriteErr, eText);
+        this.log.warn('[%s] %s %s.', this.name, this.lang.storageWriteErr, parseError(err));
       }
     }
   }
diff --git a/lib/device/zigbee/sensor-ambient.js b/lib/device/zigbee/sensor-ambient.js
index 68264419..9325df66 100644
--- a/lib/device/zigbee/sensor-ambient.js
+++ b/lib/device/zigbee/sensor-ambient.js
@@ -67,7 +67,7 @@ export default class {
 
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new platform.eveService('weather', this.accessory, {
-      log: platform.config.debugFakegato ? this.log : () => {},
+      log: () => {},
     });
 
     // Output the customised options to the log
@@ -155,8 +155,7 @@ export default class {
       );
     } catch (err) {
       if (this.enableLogging) {
-        const eText = parseError(err);
-        this.log.warn('[%s] %s %s.', this.name, this.lang.storageWriteErr, eText);
+        this.log.warn('[%s] %s %s.', this.name, this.lang.storageWriteErr, parseError(err));
       }
     }
   }
diff --git a/lib/device/zigbee/sensor-contact.js b/lib/device/zigbee/sensor-contact.js
index 95e14d01..59bb643b 100644
--- a/lib/device/zigbee/sensor-contact.js
+++ b/lib/device/zigbee/sensor-contact.js
@@ -64,7 +64,7 @@ export default class {
 
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new platform.eveService('door', this.accessory, {
-      log: platform.config.debugFakegato ? this.log : () => {},
+      log: () => {},
     });
 
     // Output the customised options to the log
diff --git a/lib/device/zigbee/sensor-leak.js b/lib/device/zigbee/sensor-leak.js
index 00f67e02..50f7b07b 100644
--- a/lib/device/zigbee/sensor-leak.js
+++ b/lib/device/zigbee/sensor-leak.js
@@ -55,7 +55,7 @@ export default class {
 
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new platform.eveService('motion', this.accessory, {
-      log: platform.config.debugFakegato ? this.log : () => {},
+      log: () => {},
     });
 
     // Output the customised options to the log
diff --git a/lib/device/zigbee/sensor-motion.js b/lib/device/zigbee/sensor-motion.js
index 0c66078b..88495b33 100644
--- a/lib/device/zigbee/sensor-motion.js
+++ b/lib/device/zigbee/sensor-motion.js
@@ -55,7 +55,7 @@ export default class {
 
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new platform.eveService('motion', this.accessory, {
-      log: platform.config.debugFakegato ? this.log : () => {},
+      log: () => {},
     });
 
     // Output the customised options to the log
diff --git a/lib/platform.js b/lib/platform.js
index 0967b3a9..68129e5a 100644
--- a/lib/platform.js
+++ b/lib/platform.js
@@ -502,7 +502,7 @@ export default class {
       const deviceList = [];
       const groupList = [];
 
-      // Username and password are now optional
+      // Username and password are optional
       if (this.config.username && this.config.password) {
         // Set up the HTTP client, get the user HTTP host, and login
         this.httpClient = new httpClient(this);
@@ -816,8 +816,8 @@ export default class {
           accessory.control = new instance(this, accessory, subAccessory);
         } else {
           accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
-          this.log.warn('[%s] %s.', accessory.displayName, this.lang.sensorNoDevice);
           this.applyAccessoryLogging(accessory);
+          accessory.logWarn(this.lang.sensorNoDevice);
           accessory.control = new deviceTypes.deviceSensorContact(this, accessory);
         }
         /** ******************************************** */
@@ -1354,14 +1354,7 @@ export default class {
               subInstance = deviceTypes.deviceRfSensor;
               break;
             default: {
-              this.log.warn(
-                '[%s] %s:\n[%s-%s] %s.',
-                device.name,
-                this.lang.devNotSupYet,
-                uiid,
-                subDevice.type || '?',
-                JSON.stringify(device.params),
-              );
+              accessory.logWarn(`${this.lang.devNotSupYet}\n[${uiid}-${subDevice.type || '?'}] ${JSON.stringify(device.params)}`);
               return;
             }
           }
@@ -1635,8 +1628,7 @@ export default class {
       }
     } catch (err) {
       // Catch any errors during initialisation
-      const eText = parseError(err);
-      this.log.warn('[%s] %s %s.', device.name, this.lang.devNotInit, eText);
+      this.log.warn('[%s] %s %s.', device.name, this.lang.devNotInit, parseError(err));
     }
   }
 
@@ -1722,8 +1714,7 @@ export default class {
       return accessory;
     } catch (err) {
       // Catch any errors during add
-      const eText = parseError(err);
-      this.log.warn('[%s] %s %s.', newDeviceName, this.lang.devNotAdd, eText);
+      this.log.warn('[%s] %s %s.', newDeviceName, this.lang.devNotAdd, parseError(err));
       return false;
     }
   }
@@ -1777,8 +1768,7 @@ export default class {
       return accessory;
     } catch (err) {
       // Catch any errors during add
-      const eText = parseError(err);
-      this.log.warn('[%s] %s %s.', device.name, this.lang.devNotAdd, eText);
+      this.log.warn('[%s] %s %s.', device.name, this.lang.devNotAdd, parseError(err));
       return false;
     }
   }
@@ -1808,8 +1798,7 @@ export default class {
       this.log('[%s] %s.', accessory.displayName, this.lang.devRemove);
     } catch (err) {
       // Catch any errors during remove
-      const eText = parseError(err);
-      this.log.warn('[%s] %s %s.', accessory.displayName, this.lang.devNotRemove, eText);
+      this.log.warn('[%s] %s %s.', accessory.displayName, this.lang.devNotRemove, parseError(err));
     }
   }
 
@@ -1817,9 +1806,7 @@ export default class {
     // Add to a queue so multiple updates are at least 500ms apart
     return queue.add(async () => {
       // Log the update being sent
-      if (accessory.control.enableDebugLogging) {
-        this.log('[%s] %s %s.', accessory.displayName, this.lang.updSend, JSON.stringify(params));
-      }
+      accessory.logDebug(`${this.lang.updSend} ${JSON.stringify(params)}`);
 
       // Set up the payload to send via LAN/WS
       const payload = {
@@ -1843,9 +1830,7 @@ export default class {
         // Check to see if the device is online
         if (this.wsClient) {
           // Log the revert if appropriate
-          if (accessory.control.enableDebugLogging) {
-            this.log('[%s] %s %s.', accessory.displayName, this.lang.revertWS, res);
-          }
+          accessory.logDebug(`${this.lang.revertWS} ${res}`);
 
           // Attempt the update
           if (accessory.context.reachableWAN) {
@@ -1870,9 +1855,7 @@ export default class {
     // Add to a queue so multiple updates are at least 500ms apart
     return queue.add(async () => {
       // Log the update being sent
-      if (accessory.control.enableDebugLogging) {
-        this.log('[%s] %s %s.', accessory.displayName, this.lang.updSend, JSON.stringify(params));
-      }
+      accessory.logDebug(`${this.lang.updSend} ${JSON.stringify(params)}`);
 
       // Send the request via HTTP
       this.httpClient.updateGroup(accessory.context.eweDeviceId, params);
@@ -1890,14 +1873,7 @@ export default class {
     if (!accessory) {
       return;
     }
-    if (accessory.control.enableDebugLogging) {
-      this.log(
-        '[%s] %s %s.',
-        accessory.displayName,
-        this.lang.updRec,
-        JSON.stringify(device.params),
-      );
-    }
+    accessory.logDebug(`${this.lang.updRec} ${JSON.stringify(device.params)}`);
     if (device.params.updateSource === 'WS') {
       // The update is from WS so update the WS online/offline status
       if (device.params.online !== accessory.context.reachableWAN) {
@@ -1909,17 +1885,10 @@ export default class {
         reachableChange = true;
 
         // Log the new reachability of the device
-        if (accessory.control.enableLogging) {
-          if (accessory.context.reachableWAN) {
-            this.log('[%s] %s %s.', accessory.displayName, this.lang.repOnline, this.lang.viaWS);
-          } else {
-            this.log.warn(
-              '[%s] %s %s.',
-              accessory.displayName,
-              this.lang.repOffline,
-              this.lang.viaWS,
-            );
-          }
+        if (accessory.context.reachableWAN) {
+          accessory.logDebug(`${this.lang.repOnline} ${this.lang.viaWS}`);
+        } else {
+          accessory.logDebugWarn(`${this.lang.repOffline} ${this.lang.viaWS}`);
         }
 
         // Mark the online/offline status of certain devices
@@ -1946,9 +1915,7 @@ export default class {
         reachableChange = true;
 
         // Log the new reachability of the device
-        if (accessory.control.enableLogging) {
-          this.log('[%s] %s %s.', accessory.displayName, this.lang.repOnline, this.lang.viaLAN);
-        }
+        accessory.log(`${this.lang.repOnline} ${this.lang.viaLAN}`);
 
         // Try and request an update through WS if the device has come back online
         if (accessory.context.reachableWAN && this.wsClient) {
@@ -1968,9 +1935,7 @@ export default class {
         reachableChange = true;
 
         // Log the new ip of the device
-        if (accessory.control.enableLogging) {
-          this.log('[%s] %s [%s].', accessory.displayName, this.lang.newIP, device.params.ip);
-        }
+        accessory.log(`${this.lang.newIP} [${device.params.ip}]`);
       }
 
       // Update the accessory context if the device is back online or the IP changed
@@ -2015,15 +1980,13 @@ export default class {
         accessory.control.externalUpdate(device.params);
       }
     } catch (err) {
-      const eText = parseError(err);
-      this.log.warn('[%s] %s %s.', accessory.displayName, this.lang.devNotRf, eText);
+      this.log.warn('[%s] %s %s.', accessory.displayName, this.lang.devNotRf, parseError(err));
     }
   }
 
   async deviceUpdateError(accessory, err, requestRefresh) {
     // Log the error
-    const eText = parseError(err);
-    this.log.warn('[%s] %s %s.', accessory.displayName, this.lang.devNotUpd, eText);
+    this.log.warn('[%s] %s %s.', accessory.displayName, this.lang.devNotUpd, parseError(err));
 
     // We only request a device refresh on failed internal updates
     if (requestRefresh && accessory.context.reachableWAN && this.wsClient) {

From c2636f63ce829d5820b87876b58bc874afd9a2f8 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Sat, 19 Aug 2023 01:22:39 +0100
Subject: [PATCH 3134/3183] prep

---
 CHANGELOG.md      |   7 ++
 package-lock.json | 160 ++++++++++++++++++++++++++++++----------------
 package.json      |   8 +--
 3 files changed, 116 insertions(+), 59 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7c190ca2..d56fa96c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,13 @@ This project tries to adhere to [Semantic Versioning](http://semver.org/). In pr
 - `MINOR` version when a new device type is added, or when a new feature is added that is backwards-compatible
 - `PATCH` version when backwards-compatible bug fixes are implemented
 
+## 11.0.1 (2023-08-19)
+
+### Changed
+
+- Bump `node` recommended versions to v16.20.2 or v18.17.1 or v20.5.1
+- Some code refactoring
+
 ## 11.0.0 (2023-07-24)
 
 ### Added
diff --git a/package-lock.json b/package-lock.json
index 7fd6f72e..f2fc77aa 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -27,7 +27,7 @@
       ],
       "license": "MIT",
       "dependencies": {
-        "@homebridge/plugin-ui-utils": "^0.0.19",
+        "@homebridge/plugin-ui-utils": "^0.1.0",
         "axios": "^1.4.0",
         "node-persist": "^3.1.0",
         "p-queue": "^7.3.4",
@@ -35,15 +35,15 @@
         "ws": "^8.13.0"
       },
       "devDependencies": {
-        "eslint": "^8.45.0",
+        "eslint": "^8.47.0",
         "eslint-config-airbnb-base": "^15.0.0",
-        "eslint-plugin-import": "^2.27.5",
+        "eslint-plugin-import": "^2.28.1",
         "eslint-plugin-import-newlines": "^1.3.4",
         "eslint-plugin-sort-exports": "^0.8.0"
       },
       "engines": {
         "homebridge": "^1.6.0 || ^2.0.0-beta.0",
-        "node": "^16.20.1 || ^18.17.0 || ^20.5.0"
+        "node": "^16.20.2 || ^18.17.1 || ^20.5.1"
       }
     },
     "node_modules/@aashutoshrathi/word-wrap": {
@@ -71,18 +71,18 @@
       }
     },
     "node_modules/@eslint-community/regexpp": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.6.0.tgz",
-      "integrity": "sha512-uiPeRISaglZnaZk8vwrjQZ1CxogZeY/4IYft6gBOTqu1WhVXWmCmZMWxUv2Q/pxSvPdp1JPaO62kLOcOkMqWrw==",
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.6.2.tgz",
+      "integrity": "sha512-pPTNuaAG3QMH+buKyBIGJs3g/S5y0caxw0ygM3YyE6yJFySwiGGSzA+mM3KJ8QQvzeLh3blwgSonkFjgQdxzMw==",
       "dev": true,
       "engines": {
         "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
       }
     },
     "node_modules/@eslint/eslintrc": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.0.tgz",
-      "integrity": "sha512-Lj7DECXqIVCqnqjjHMPna4vn6GJcMgul/wuS0je9OZ9gsL0zzDpKPVtcG1HaDVc+9y+qgXneTeUMbCqXJNpH1A==",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.2.tgz",
+      "integrity": "sha512-+wvgpDsrB1YqAMdEUCcnTlpfVBH7Vqn6A/NT3D8WVXFIaKMlErPIZT3oCIAVCOtarRpMtelZLqJeU3t7WY6X6g==",
       "dev": true,
       "dependencies": {
         "ajv": "^6.12.4",
@@ -103,18 +103,18 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "8.44.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.44.0.tgz",
-      "integrity": "sha512-Ag+9YM4ocKQx9AarydN0KY2j0ErMHNIocPDrVo8zAE44xLTjEtz81OdR68/cydGtk6m6jDb5Za3r2useMzYmSw==",
+      "version": "8.47.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.47.0.tgz",
+      "integrity": "sha512-P6omY1zv5MItm93kLM8s2vr1HICJH8v0dvddDhysbIuZ+vcjOHg5Zbkf1mTkcmi2JA9oBG2anOkRnW8WJTS8Og==",
       "dev": true,
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       }
     },
     "node_modules/@homebridge/plugin-ui-utils": {
-      "version": "0.0.19",
-      "resolved": "https://registry.npmjs.org/@homebridge/plugin-ui-utils/-/plugin-ui-utils-0.0.19.tgz",
-      "integrity": "sha512-axFX7lN2Yd7bz/6SlD7dzq5sY/N9+XYuLHPukuiyHQRDtNMRL1uDqJhOx6RVaN2tYDHB75h7YxRQWP7U44Mgzg=="
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/@homebridge/plugin-ui-utils/-/plugin-ui-utils-0.1.0.tgz",
+      "integrity": "sha512-dFpXhSy/+moDzOf8yRZxeuqZOAHTA0bZDElMXnO98cequ+7kPmX+wgREYVrYcHZYtJK744nD1n7qT2gy/E/yFg=="
     },
     "node_modules/@humanwhocodes/config-array": {
       "version": "0.11.10",
@@ -288,6 +288,25 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/array.prototype.findlastindex": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.2.tgz",
+      "integrity": "sha512-tb5thFFlUcp7NdNF6/MpDk/1r/4awWG1FIz3YqDf+/zJSTezBb+/5WViH41obXULHVpDzoiCLpJ/ZO9YbJMsdw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4",
+        "es-shim-unscopables": "^1.0.0",
+        "get-intrinsic": "^1.1.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/array.prototype.flat": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz",
@@ -643,27 +662,27 @@
       }
     },
     "node_modules/eslint": {
-      "version": "8.45.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.45.0.tgz",
-      "integrity": "sha512-pd8KSxiQpdYRfYa9Wufvdoct3ZPQQuVuU5O6scNgMuOMYuxvH0IGaYK0wUFjo4UYYQQCUndlXiMbnxopwvvTiw==",
+      "version": "8.47.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.47.0.tgz",
+      "integrity": "sha512-spUQWrdPt+pRVP1TTJLmfRNJJHHZryFmptzcafwSvHsceV81djHOdnEeDmkdotZyLNjDhrOasNK8nikkoG1O8Q==",
       "dev": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
-        "@eslint-community/regexpp": "^4.4.0",
-        "@eslint/eslintrc": "^2.1.0",
-        "@eslint/js": "8.44.0",
+        "@eslint-community/regexpp": "^4.6.1",
+        "@eslint/eslintrc": "^2.1.2",
+        "@eslint/js": "^8.47.0",
         "@humanwhocodes/config-array": "^0.11.10",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
-        "ajv": "^6.10.0",
+        "ajv": "^6.12.4",
         "chalk": "^4.0.0",
         "cross-spawn": "^7.0.2",
         "debug": "^4.3.2",
         "doctrine": "^3.0.0",
         "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^7.2.0",
-        "eslint-visitor-keys": "^3.4.1",
-        "espree": "^9.6.0",
+        "eslint-scope": "^7.2.2",
+        "eslint-visitor-keys": "^3.4.3",
+        "espree": "^9.6.1",
         "esquery": "^1.4.2",
         "esutils": "^2.0.2",
         "fast-deep-equal": "^3.1.3",
@@ -716,14 +735,14 @@
       }
     },
     "node_modules/eslint-import-resolver-node": {
-      "version": "0.3.7",
-      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.7.tgz",
-      "integrity": "sha512-gozW2blMLJCeFpBwugLTGyvVjNoeo1knonXAcatC6bjPBZitotxdWf7Gimr25N4c0AAOo4eOUfaG82IJPDpqCA==",
+      "version": "0.3.9",
+      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz",
+      "integrity": "sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==",
       "dev": true,
       "dependencies": {
         "debug": "^3.2.7",
-        "is-core-module": "^2.11.0",
-        "resolve": "^1.22.1"
+        "is-core-module": "^2.13.0",
+        "resolve": "^1.22.4"
       }
     },
     "node_modules/eslint-import-resolver-node/node_modules/debug": {
@@ -762,26 +781,28 @@
       }
     },
     "node_modules/eslint-plugin-import": {
-      "version": "2.27.5",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.27.5.tgz",
-      "integrity": "sha512-LmEt3GVofgiGuiE+ORpnvP+kAm3h6MLZJ4Q5HCyHADofsb4VzXFsRiWj3c0OFiV+3DWFh0qg3v9gcPlfc3zRow==",
+      "version": "2.28.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.28.1.tgz",
+      "integrity": "sha512-9I9hFlITvOV55alzoKBI+K9q74kv0iKMeY6av5+umsNwayt59fz692daGyjR+oStBQgx6nwR9rXldDev3Clw+A==",
       "dev": true,
       "dependencies": {
         "array-includes": "^3.1.6",
+        "array.prototype.findlastindex": "^1.2.2",
         "array.prototype.flat": "^1.3.1",
         "array.prototype.flatmap": "^1.3.1",
         "debug": "^3.2.7",
         "doctrine": "^2.1.0",
         "eslint-import-resolver-node": "^0.3.7",
-        "eslint-module-utils": "^2.7.4",
+        "eslint-module-utils": "^2.8.0",
         "has": "^1.0.3",
-        "is-core-module": "^2.11.0",
+        "is-core-module": "^2.13.0",
         "is-glob": "^4.0.3",
         "minimatch": "^3.1.2",
+        "object.fromentries": "^2.0.6",
+        "object.groupby": "^1.0.0",
         "object.values": "^1.1.6",
-        "resolve": "^1.22.1",
-        "semver": "^6.3.0",
-        "tsconfig-paths": "^3.14.1"
+        "semver": "^6.3.1",
+        "tsconfig-paths": "^3.14.2"
       },
       "engines": {
         "node": ">=4"
@@ -836,9 +857,9 @@
       }
     },
     "node_modules/eslint-scope": {
-      "version": "7.2.1",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.1.tgz",
-      "integrity": "sha512-CvefSOsDdaYYvxChovdrPo/ZGt8d5lrJWleAc1diXRKhHGiTYEI26cvo8Kle/wGnsizoCJjK73FMg1/IkIwiNA==",
+      "version": "7.2.2",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz",
+      "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==",
       "dev": true,
       "dependencies": {
         "esrecurse": "^4.3.0",
@@ -852,9 +873,9 @@
       }
     },
     "node_modules/eslint-visitor-keys": {
-      "version": "3.4.1",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz",
-      "integrity": "sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA==",
+      "version": "3.4.3",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
+      "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
       "dev": true,
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -1139,9 +1160,9 @@
       }
     },
     "node_modules/globals": {
-      "version": "13.20.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz",
-      "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==",
+      "version": "13.21.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.21.0.tgz",
+      "integrity": "sha512-ybyme3s4yy/t/3s35bewwXKOf7cvzfreG2lH0lZl0JB7I4GxRP2ghxOK/Nb9EkRXdbBXZLfq/p/0W2JUONB/Gg==",
       "dev": true,
       "dependencies": {
         "type-fest": "^0.20.2"
@@ -1373,9 +1394,9 @@
       }
     },
     "node_modules/is-core-module": {
-      "version": "2.12.1",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.12.1.tgz",
-      "integrity": "sha512-Q4ZuBAe2FUsKtyQJoQHlvP8OvBERxO3jEmy1I7hcRXcJBGGHFh/aJBswbXuS9sgrDH2QUO8ilkwNPHvHMd8clg==",
+      "version": "2.13.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.0.tgz",
+      "integrity": "sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ==",
       "dev": true,
       "dependencies": {
         "has": "^1.0.3"
@@ -1720,6 +1741,35 @@
         "node": ">= 0.4"
       }
     },
+    "node_modules/object.fromentries": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.6.tgz",
+      "integrity": "sha512-VciD13dswC4j1Xt5394WR4MzmAQmlgN72phd/riNp9vtD7tp4QQWJ0R4wvclXcafgcYK8veHRed2W6XeGBvcfg==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.groupby": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.0.tgz",
+      "integrity": "sha512-70MWG6NfRH9GnbZOikuhPPYzpUpof9iW2J9E4dW7FXTqPNb6rllE6u39SKwwiNh8lCwX3DDb5OgcKGiEBrTTyw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.21.2",
+        "get-intrinsic": "^1.2.1"
+      }
+    },
     "node_modules/object.values": {
       "version": "1.1.6",
       "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.6.tgz",
@@ -1956,12 +2006,12 @@
       }
     },
     "node_modules/resolve": {
-      "version": "1.22.2",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.2.tgz",
-      "integrity": "sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==",
+      "version": "1.22.4",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.4.tgz",
+      "integrity": "sha512-PXNdCiPqDqeUou+w1C2eTQbNfxKSuMxqTCuvlmmMsk1NWHL5fRrhY6Pl0qEYYc6+QqGClco1Qj8XnjPego4wfg==",
       "dev": true,
       "dependencies": {
-        "is-core-module": "^2.11.0",
+        "is-core-module": "^2.13.0",
         "path-parse": "^1.0.7",
         "supports-preserve-symlinks-flag": "^1.0.0"
       },
diff --git a/package.json b/package.json
index d77d11f8..cbdb3ce2 100644
--- a/package.json
+++ b/package.json
@@ -31,7 +31,7 @@
   },
   "engines": {
     "homebridge": "^1.6.0 || ^2.0.0-beta.0",
-    "node": "^16.20.1 || ^18.17.0 || ^20.5.0"
+    "node": "^16.20.2 || ^18.17.1 || ^20.5.1"
   },
   "repository": {
     "type": "git",
@@ -59,7 +59,7 @@
     }
   ],
   "dependencies": {
-    "@homebridge/plugin-ui-utils": "^0.0.19",
+    "@homebridge/plugin-ui-utils": "^0.1.0",
     "axios": "^1.4.0",
     "node-persist": "^3.1.0",
     "p-queue": "^7.3.4",
@@ -67,9 +67,9 @@
     "ws": "^8.13.0"
   },
   "devDependencies": {
-    "eslint": "^8.45.0",
+    "eslint": "^8.47.0",
     "eslint-config-airbnb-base": "^15.0.0",
-    "eslint-plugin-import": "^2.27.5",
+    "eslint-plugin-import": "^2.28.1",
     "eslint-plugin-import-newlines": "^1.3.4",
     "eslint-plugin-sort-exports": "^0.8.0"
   }

From 5cef31fb69b9fc24e838d6baa792996ce889f628 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Sat, 19 Aug 2023 01:23:05 +0100
Subject: [PATCH 3135/3183] 11.0.1

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index f2fc77aa..3f58780a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "11.0.0",
+  "version": "11.0.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "11.0.0",
+      "version": "11.0.1",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index cbdb3ce2..a56cc4a9 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "11.0.0",
+  "version": "11.0.1",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From ec6826cef472a8cdc3b29fa81160ae6349f909b9 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Mon, 28 Aug 2023 15:35:56 +0100
Subject: [PATCH 3136/3183] prep

---
 CHANGELOG.md      | 11 +++++++
 package-lock.json | 76 ++++++++++++++++++++++++++++-------------------
 package.json      |  4 +--
 3 files changed, 59 insertions(+), 32 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d56fa96c..09bf956c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,17 @@ This project tries to adhere to [Semantic Versioning](http://semver.org/). In pr
 - `MINOR` version when a new device type is added, or when a new feature is added that is backwards-compatible
 - `PATCH` version when backwards-compatible bug fixes are implemented
 
+## 11.0.2 (2023-08-28)
+
+⚠️ Note this will be the last version of the plugin to support Node 16.
+- Node 16 moves to 'end of life' on 2023-09-11 ([more info](https://nodejs.org/en/blog/announcements/nodejs16-eol))
+- This is in-line with the Homebridge guidelines on supporting node versions ([more info](https://github.com/homebridge/homebridge/wiki/How-To-Update-Node.js/))
+- If you are currently using Node 16, now is a good time to upgrade to Node 18 or 20 (see the link above for more info)
+
+### Changed
+
+- Update `axios` to `v1.5.0`
+
 ## 11.0.1 (2023-08-19)
 
 ### Changed
diff --git a/package-lock.json b/package-lock.json
index 3f58780a..96eb6285 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -28,14 +28,14 @@
       "license": "MIT",
       "dependencies": {
         "@homebridge/plugin-ui-utils": "^0.1.0",
-        "axios": "^1.4.0",
+        "axios": "^1.5.0",
         "node-persist": "^3.1.0",
         "p-queue": "^7.3.4",
         "websocket-as-promised": "^2.0.1",
         "ws": "^8.13.0"
       },
       "devDependencies": {
-        "eslint": "^8.47.0",
+        "eslint": "^8.48.0",
         "eslint-config-airbnb-base": "^15.0.0",
         "eslint-plugin-import": "^2.28.1",
         "eslint-plugin-import-newlines": "^1.3.4",
@@ -71,9 +71,9 @@
       }
     },
     "node_modules/@eslint-community/regexpp": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.6.2.tgz",
-      "integrity": "sha512-pPTNuaAG3QMH+buKyBIGJs3g/S5y0caxw0ygM3YyE6yJFySwiGGSzA+mM3KJ8QQvzeLh3blwgSonkFjgQdxzMw==",
+      "version": "4.8.0",
+      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.8.0.tgz",
+      "integrity": "sha512-JylOEEzDiOryeUnFbQz+oViCXS0KsvR1mvHkoMiu5+UiBvy+RYX7tzlIIIEstF/gVa2tj9AQXk3dgnxv6KxhFg==",
       "dev": true,
       "engines": {
         "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
@@ -103,9 +103,9 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "8.47.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.47.0.tgz",
-      "integrity": "sha512-P6omY1zv5MItm93kLM8s2vr1HICJH8v0dvddDhysbIuZ+vcjOHg5Zbkf1mTkcmi2JA9oBG2anOkRnW8WJTS8Og==",
+      "version": "8.48.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.48.0.tgz",
+      "integrity": "sha512-ZSjtmelB7IJfWD2Fvb7+Z+ChTIKWq6kjda95fLcQKNS5aheVHn4IkfgRQE3sIIzTcSLwLcLZUD9UBt+V7+h+Pw==",
       "dev": true,
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -379,9 +379,9 @@
       }
     },
     "node_modules/axios": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.4.0.tgz",
-      "integrity": "sha512-S4XCWMEmzvo64T9GfvQDOXgYRDJ/wsSZc7Jvdgx5u1sd0JwsuPLqb3SYmusag+edF6ziyMensPVqLTSc1PiSEA==",
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.5.0.tgz",
+      "integrity": "sha512-D4DdjDo5CY50Qms0qGQTTw6Q44jl7zRwY7bthds06pUGfChBCTcQs+N743eFWGEd6pRTMd6A+I87aWyFV5wiZQ==",
       "dependencies": {
         "follow-redirects": "^1.15.0",
         "form-data": "^4.0.0",
@@ -662,15 +662,15 @@
       }
     },
     "node_modules/eslint": {
-      "version": "8.47.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.47.0.tgz",
-      "integrity": "sha512-spUQWrdPt+pRVP1TTJLmfRNJJHHZryFmptzcafwSvHsceV81djHOdnEeDmkdotZyLNjDhrOasNK8nikkoG1O8Q==",
+      "version": "8.48.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.48.0.tgz",
+      "integrity": "sha512-sb6DLeIuRXxeM1YljSe1KEx9/YYeZFQWcV8Rq9HfigmdDEugjLEVEa1ozDjL6YDjBpQHPJxJzze+alxi4T3OLg==",
       "dev": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.6.1",
         "@eslint/eslintrc": "^2.1.2",
-        "@eslint/js": "^8.47.0",
+        "@eslint/js": "8.48.0",
         "@humanwhocodes/config-array": "^0.11.10",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
@@ -1004,16 +1004,17 @@
       }
     },
     "node_modules/flat-cache": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
-      "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.1.0.tgz",
+      "integrity": "sha512-OHx4Qwrrt0E4jEIcI5/Xb+f+QmJYNj2rrK8wiIdQOIrB9WrrJL8cjZvXdXuBTkkEwEqLycb5BeZDV1o2i9bTew==",
       "dev": true,
       "dependencies": {
-        "flatted": "^3.1.0",
+        "flatted": "^3.2.7",
+        "keyv": "^4.5.3",
         "rimraf": "^3.0.2"
       },
       "engines": {
-        "node": "^10.12.0 || >=12.0.0"
+        "node": ">=12.0.0"
       }
     },
     "node_modules/flatted": {
@@ -1576,6 +1577,12 @@
         "js-yaml": "bin/js-yaml.js"
       }
     },
+    "node_modules/json-buffer": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
+      "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
+      "dev": true
+    },
     "node_modules/json-schema-traverse": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
@@ -1600,6 +1607,15 @@
         "json5": "lib/cli.js"
       }
     },
+    "node_modules/keyv": {
+      "version": "4.5.3",
+      "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.3.tgz",
+      "integrity": "sha512-QCiSav9WaX1PgETJ+SpNnx2PRRapJ/oRSXM4VO5OGYGSjrxbKPVFVhB3l2OCbLCk329N8qyAtsJjSjvVBWzEug==",
+      "dev": true,
+      "dependencies": {
+        "json-buffer": "3.0.1"
+      }
+    },
     "node_modules/levn": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
@@ -1728,14 +1744,14 @@
       }
     },
     "node_modules/object.entries": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.6.tgz",
-      "integrity": "sha512-leTPzo4Zvg3pmbQ3rDK69Rl8GQvIqMWubrkxONG9/ojtFE2rD9fjMKfSI5BxW3osRH1m6VdzmqK8oAY9aT4x5w==",
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.7.tgz",
+      "integrity": "sha512-jCBs/0plmPsOnrKAfFQXRG2NFjlhZgjjcBLSmTnEhU8U6vVTsVe8ANeQJCHTl3gSsI4J+0emOoCgoKlmQPMgmA==",
       "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1"
       },
       "engines": {
         "node": ">= 0.4"
@@ -1771,14 +1787,14 @@
       }
     },
     "node_modules/object.values": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.6.tgz",
-      "integrity": "sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw==",
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.7.tgz",
+      "integrity": "sha512-aU6xnDFYT3x17e/f0IiiwlGPTy2jzMySGfUB4fq6z7CV8l85CWHDk5ErhyhpfDHhrOMwGFhSQkhMGHaIotA6Ng==",
       "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1"
       },
       "engines": {
         "node": ">= 0.4"
diff --git a/package.json b/package.json
index a56cc4a9..7219b536 100644
--- a/package.json
+++ b/package.json
@@ -60,14 +60,14 @@
   ],
   "dependencies": {
     "@homebridge/plugin-ui-utils": "^0.1.0",
-    "axios": "^1.4.0",
+    "axios": "^1.5.0",
     "node-persist": "^3.1.0",
     "p-queue": "^7.3.4",
     "websocket-as-promised": "^2.0.1",
     "ws": "^8.13.0"
   },
   "devDependencies": {
-    "eslint": "^8.47.0",
+    "eslint": "^8.48.0",
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-plugin-import": "^2.28.1",
     "eslint-plugin-import-newlines": "^1.3.4",

From 269c9ee89deccc67da96d61ca4819bb9c4b7e7b3 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Mon, 28 Aug 2023 15:36:12 +0100
Subject: [PATCH 3137/3183] 11.0.2

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 96eb6285..8897275a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "11.0.1",
+  "version": "11.0.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "11.0.1",
+      "version": "11.0.2",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 7219b536..f08844a6 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "11.0.1",
+  "version": "11.0.2",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From 3ece6996d52fa19a74fbcc9ad5278da426868b27 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Sun, 3 Sep 2023 14:07:38 +0100
Subject: [PATCH 3138/3183] support for 7006

---
 CHANGELOG.md           |  6 ++++
 lib/utils/constants.js |  3 +-
 package-lock.json      | 74 +++++++++++++++++++++---------------------
 package.json           |  2 +-
 4 files changed, 46 insertions(+), 39 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 09bf956c..a96ceaca 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,12 @@ This project tries to adhere to [Semantic Versioning](http://semver.org/). In pr
 - `MINOR` version when a new device type is added, or when a new feature is added that is backwards-compatible
 - `PATCH` version when backwards-compatible bug fixes are implemented
 
+## BETA
+
+### Added
+
+- Support for ZigBee motor device with UIID `7006`
+
 ## 11.0.2 (2023-08-28)
 
 ⚠️ Note this will be the last version of the plugin to support Node 16.
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index cf480224..7a2660fd 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -337,7 +337,7 @@ export default {
     zbLightDimmer: [1257],
     zbLightCCT: [1258],
     zbLightRGBCCT: [3258],
-    zbMotor: [1514],
+    zbMotor: [1514, 7006],
     zbSensorAmbient: [1770, 1771, 7014],
     zbSensorMotion: [2026, 7002],
     zbSensorContact: [3026, 7003],
@@ -518,6 +518,7 @@ export default {
     7002: 1, // Zigbee Human Body Sensor_Support OTA
     7003: 1, // Zigbee Door Magnet_Support OTA
     7004: 1, // Zigbee Single-Channel Switch ­_Support OTA
+    7006: 1, // Zigbee Curtain_Support OTA
     7014: 1, // some sensor https://github.com/bwp91/homebridge-ewelink/issues/494
   },
 
diff --git a/package-lock.json b/package-lock.json
index 8897275a..effaf506 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -30,7 +30,7 @@
         "@homebridge/plugin-ui-utils": "^0.1.0",
         "axios": "^1.5.0",
         "node-persist": "^3.1.0",
-        "p-queue": "^7.3.4",
+        "p-queue": "^7.4.1",
         "websocket-as-promised": "^2.0.1",
         "ws": "^8.13.0"
       },
@@ -117,9 +117,9 @@
       "integrity": "sha512-dFpXhSy/+moDzOf8yRZxeuqZOAHTA0bZDElMXnO98cequ+7kPmX+wgREYVrYcHZYtJK744nD1n7qT2gy/E/yFg=="
     },
     "node_modules/@humanwhocodes/config-array": {
-      "version": "0.11.10",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.10.tgz",
-      "integrity": "sha512-KVVjQmNUepDVGXNuoRRdmmEjruj0KfiGSbS8LVc12LMsWDQzRXJ0qdhN8L8uUigKpfEHRhlaQFY0ib1tnUbNeQ==",
+      "version": "0.11.11",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.11.tgz",
+      "integrity": "sha512-N2brEuAadi0CcdeMXUkhbZB84eskAc8MEX1By6qEchoVywSgXPIjou4rYsl0V3Hj0ZnuGycGCjdNgockbzeWNA==",
       "dev": true,
       "dependencies": {
         "@humanwhocodes/object-schema": "^1.2.1",
@@ -289,16 +289,16 @@
       }
     },
     "node_modules/array.prototype.findlastindex": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.2.tgz",
-      "integrity": "sha512-tb5thFFlUcp7NdNF6/MpDk/1r/4awWG1FIz3YqDf+/zJSTezBb+/5WViH41obXULHVpDzoiCLpJ/ZO9YbJMsdw==",
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.3.tgz",
+      "integrity": "sha512-LzLoiOMAxvy+Gd3BAq3B7VeIgPdo+Q8hthvKtXybMvRV0jrXfJM/t8mw7nNlpEcVlVUnCnM2KSX4XU5HmpodOA==",
       "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1",
         "es-shim-unscopables": "^1.0.0",
-        "get-intrinsic": "^1.1.3"
+        "get-intrinsic": "^1.2.1"
       },
       "engines": {
         "node": ">= 0.4"
@@ -944,9 +944,9 @@
       }
     },
     "node_modules/eventemitter3": {
-      "version": "4.0.7",
-      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
-      "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.1.tgz",
+      "integrity": "sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA=="
     },
     "node_modules/fast-deep-equal": {
       "version": "3.1.3",
@@ -1075,14 +1075,14 @@
       "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
     },
     "node_modules/function.prototype.name": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz",
-      "integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==",
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.6.tgz",
+      "integrity": "sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==",
       "dependencies": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.0",
-        "functions-have-names": "^1.2.2"
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1",
+        "functions-have-names": "^1.2.3"
       },
       "engines": {
         "node": ">= 0.4"
@@ -1758,14 +1758,14 @@
       }
     },
     "node_modules/object.fromentries": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.6.tgz",
-      "integrity": "sha512-VciD13dswC4j1Xt5394WR4MzmAQmlgN72phd/riNp9vtD7tp4QQWJ0R4wvclXcafgcYK8veHRed2W6XeGBvcfg==",
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.7.tgz",
+      "integrity": "sha512-UPbPHML6sL8PI/mOqPwsH4G6iyXcCGzLin8KvEPenOZN5lpCNBZZQ+V62vdjB1mQHrmqGQt5/OJzemUA+KJmEA==",
       "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1"
       },
       "engines": {
         "node": ">= 0.4"
@@ -1775,14 +1775,14 @@
       }
     },
     "node_modules/object.groupby": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.0.tgz",
-      "integrity": "sha512-70MWG6NfRH9GnbZOikuhPPYzpUpof9iW2J9E4dW7FXTqPNb6rllE6u39SKwwiNh8lCwX3DDb5OgcKGiEBrTTyw==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.1.tgz",
+      "integrity": "sha512-HqaQtqLnp/8Bn4GL16cj+CUYbnpe1bh0TtEaWvybszDG4tgxCJuRpV8VGuvNaI1fAnI4lUJzDG55MXcOH4JZcQ==",
       "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.2.0",
-        "es-abstract": "^1.21.2",
+        "es-abstract": "^1.22.1",
         "get-intrinsic": "^1.2.1"
       }
     },
@@ -1860,11 +1860,11 @@
       }
     },
     "node_modules/p-queue": {
-      "version": "7.3.4",
-      "resolved": "https://registry.npmjs.org/p-queue/-/p-queue-7.3.4.tgz",
-      "integrity": "sha512-esox8CWt0j9EZECFvkFl2WNPat8LN4t7WWeXq73D9ha0V96qPRufApZi4ZhPwXAln1uVVal429HVVKPa2X0yQg==",
+      "version": "7.4.1",
+      "resolved": "https://registry.npmjs.org/p-queue/-/p-queue-7.4.1.tgz",
+      "integrity": "sha512-vRpMXmIkYF2/1hLBKisKeVYJZ8S2tZ0zEAmIJgdVKP2nq0nh4qCdf8bgw+ZgKrkh71AOCaqzwbJJk1WtdcF3VA==",
       "dependencies": {
-        "eventemitter3": "^4.0.7",
+        "eventemitter3": "^5.0.1",
         "p-timeout": "^5.0.2"
       },
       "engines": {
@@ -1948,13 +1948,13 @@
       }
     },
     "node_modules/promise.prototype.finally": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/promise.prototype.finally/-/promise.prototype.finally-3.1.4.tgz",
-      "integrity": "sha512-nNc3YbgMfLzqtqvO/q5DP6RR0SiHI9pUPGzyDf1q+usTwCN2kjvAnJkBb7bHe3o+fFSBPpsGMoYtaSi+LTNqng==",
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/promise.prototype.finally/-/promise.prototype.finally-3.1.5.tgz",
+      "integrity": "sha512-4TQ3Dk8yyUZGyU+UXInKdkQ2b6xtiBXAIScGAtGnXVmJtG1uOrxRgbF1ggIu72uzoWFzUfT3nUKa1SuMm9NBdg==",
       "dependencies": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1"
       },
       "engines": {
         "node": ">= 0.4"
diff --git a/package.json b/package.json
index f08844a6..e586c1c3 100644
--- a/package.json
+++ b/package.json
@@ -62,7 +62,7 @@
     "@homebridge/plugin-ui-utils": "^0.1.0",
     "axios": "^1.5.0",
     "node-persist": "^3.1.0",
-    "p-queue": "^7.3.4",
+    "p-queue": "^7.4.1",
     "websocket-as-promised": "^2.0.1",
     "ws": "^8.13.0"
   },

From 918e8460e30e7d517438c7b6a4a30fba2cdd97e3 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Sun, 3 Sep 2023 14:08:11 +0100
Subject: [PATCH 3139/3183] 11.0.3-beta.0

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index effaf506..038c4ad0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "11.0.2",
+  "version": "11.0.3-beta.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "11.0.2",
+      "version": "11.0.3-beta.0",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index e586c1c3..9807108d 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "11.0.2",
+  "version": "11.0.3-beta.0",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From 305dd8c1b2b37006afcd8e7bff3a4cf399645ce4 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Mon, 4 Sep 2023 19:53:45 +0100
Subject: [PATCH 3140/3183] fix zb motor

---
 lib/device/zigbee/motor.js |  1 +
 package-lock.json          | 12 ++++++------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/lib/device/zigbee/motor.js b/lib/device/zigbee/motor.js
index 40459668..e49cb345 100644
--- a/lib/device/zigbee/motor.js
+++ b/lib/device/zigbee/motor.js
@@ -5,6 +5,7 @@ export default class {
   constructor(platform, accessory) {
     // Set up variables from the platform
     this.hapChar = platform.api.hap.Characteristic;
+    this.hapErr = platform.api.hap.HapStatusError;
     this.hapServ = platform.api.hap.Service;
     this.lang = platform.lang;
     this.log = platform.log;
diff --git a/package-lock.json b/package-lock.json
index 038c4ad0..9cbd927c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -270,15 +270,15 @@
       }
     },
     "node_modules/array-includes": {
-      "version": "3.1.6",
-      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.6.tgz",
-      "integrity": "sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw==",
+      "version": "3.1.7",
+      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.7.tgz",
+      "integrity": "sha512-dlcsNBIiWhPkHdOEEKnehA+RNUWDc4UqFtnIXU4uuYDPtA4LDkr7qip2p0VvFAEXNDr0yWZ9PJyIRiGjRLQzwQ==",
       "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4",
-        "get-intrinsic": "^1.1.3",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1",
+        "get-intrinsic": "^1.2.1",
         "is-string": "^1.0.7"
       },
       "engines": {

From 6d787c06e83de23216ef8f3a17266c673917bee0 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Mon, 4 Sep 2023 19:54:17 +0100
Subject: [PATCH 3141/3183] 11.0.3-beta.1

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 9cbd927c..5134a1e5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "11.0.3-beta.0",
+  "version": "11.0.3-beta.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "11.0.3-beta.0",
+      "version": "11.0.3-beta.1",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 9807108d..bce8b23d 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "11.0.3-beta.0",
+  "version": "11.0.3-beta.1",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From 057f6043761ca496577e893dff5f6f2542919a93 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Thu, 7 Sep 2023 02:28:10 +0100
Subject: [PATCH 3142/3183] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index f7c23e13..a4f93d11 100644
--- a/README.md
+++ b/README.md
@@ -34,7 +34,7 @@ Homebridge plugin to integrate eWeLink devices into HomeKit
 
 - [Installation](https://github.com/bwp91/homebridge-ewelink/wiki/Installation)
 - [Configuration](https://github.com/bwp91/homebridge-ewelink/wiki/Configuration)
-- [Beta Version](https://github.com/bwp91/homebridge-ewelink/wiki/Beta-Version)
+- [Beta Version](https://github.com/homebridge/homebridge/wiki/How-to-Install-Alternate-Plugin-Versions)
 - [Node Version](https://github.com/bwp91/homebridge-ewelink/wiki/Node-Version)
 
 ### Features

From 9de74819865c0349708dd9cf1d3e2869b8f0648d Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Thu, 7 Sep 2023 02:29:53 +0100
Subject: [PATCH 3143/3183] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index a4f93d11..e538f7e4 100644
--- a/README.md
+++ b/README.md
@@ -27,7 +27,7 @@ Homebridge plugin to integrate eWeLink devices into HomeKit
 ### Prerequisites
 
 - To use this plugin, you will need to already have:
-  - [Node](https://nodejs.org): latest version of `v16`, `v18` or `v20` - any other major version is not supported.
+  - [Node](https://nodejs.org): latest version of `v18` or `v20` - any other major version is not supported.
   - [Homebridge](https://homebridge.io): `v1.6` - refer to link for more information and installation instructions.
 
 ### Setup

From 2441e51c312313c9a9a5bfa75247a46f72e7b2c2 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Sun, 10 Sep 2023 14:48:15 +0100
Subject: [PATCH 3144/3183] Update light-rgb-cct.js

---
 lib/device/light-rgb-cct.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/device/light-rgb-cct.js b/lib/device/light-rgb-cct.js
index 5b0c13c2..b1ccfb66 100644
--- a/lib/device/light-rgb-cct.js
+++ b/lib/device/light-rgb-cct.js
@@ -287,6 +287,7 @@ export default class {
           }
           break;
         case 137:
+        case 173:
           params = {
             bright: value,
           };

From 8bd116a26bbd8a8e9cca90fd2c3c8f3d06ef1980 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Sun, 10 Sep 2023 14:48:32 +0100
Subject: [PATCH 3145/3183] 11.0.3-beta.2

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 5134a1e5..d433a371 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "11.0.3-beta.1",
+  "version": "11.0.3-beta.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "11.0.3-beta.1",
+      "version": "11.0.3-beta.2",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index bce8b23d..818fdd19 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "11.0.3-beta.1",
+  "version": "11.0.3-beta.2",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From 6891aa8ac77e08076b1baf153af351f60e24b834 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Sun, 10 Sep 2023 14:54:43 +0100
Subject: [PATCH 3146/3183] 173 brightness colour

---
 CHANGELOG.md                |  1 +
 lib/device/light-rgb-cct.js |  9 +++-
 package-lock.json           | 91 +++++++++++++++++++------------------
 package.json                |  4 +-
 4 files changed, 56 insertions(+), 49 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a96ceaca..34a9aef3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@ This project tries to adhere to [Semantic Versioning](http://semver.org/). In pr
 ### Added
 
 - Support for ZigBee motor device with UIID `7006`
+- Brightness and colour support for light device with UIID `173`
 
 ## 11.0.2 (2023-08-28)
 
diff --git a/lib/device/light-rgb-cct.js b/lib/device/light-rgb-cct.js
index b1ccfb66..0df6375b 100644
--- a/lib/device/light-rgb-cct.js
+++ b/lib/device/light-rgb-cct.js
@@ -334,6 +334,7 @@ export default class {
         case 33:
         case 59:
         case 137:
+        case 173:
           // L1/L2
           params = {
             mode: 1,
@@ -464,7 +465,8 @@ export default class {
             },
           };
           break;
-        case 137: {
+        case 137:
+        case 173: {
           // L2
           scaledCT = 100 - Math.round(((mToK - 2700) / 3800) * 100);
           newRGB = k2rgb(mToK);
@@ -485,7 +487,8 @@ export default class {
       switch (this.accessory.context.eweUIID) {
         case 33:
         case 59:
-        case 137: {
+        case 137:
+        case 173: {
           // L1
           [this.cacheR, this.cacheG, this.cacheB] = newRGB;
           break;
@@ -569,6 +572,7 @@ export default class {
         case 33:
         case 59:
         case 137:
+        case 173:
           // L1/L2
           if (hasProperty(params, 'bright')) {
             if (params.bright !== this.cacheBright) {
@@ -737,6 +741,7 @@ export default class {
                   ctToK = Math.round((this.cacheCT / 100) * 3800 + 2700);
                   break;
                 case 137:
+                case 173:
                   ctToK = Math.round(((100 - this.cacheCT) / 100) * 3800 + 2700);
                   break;
                 default:
diff --git a/package-lock.json b/package-lock.json
index d433a371..2ce4042c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -32,10 +32,10 @@
         "node-persist": "^3.1.0",
         "p-queue": "^7.4.1",
         "websocket-as-promised": "^2.0.1",
-        "ws": "^8.13.0"
+        "ws": "^8.14.1"
       },
       "devDependencies": {
-        "eslint": "^8.48.0",
+        "eslint": "^8.49.0",
         "eslint-config-airbnb-base": "^15.0.0",
         "eslint-plugin-import": "^2.28.1",
         "eslint-plugin-import-newlines": "^1.3.4",
@@ -103,9 +103,9 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "8.48.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.48.0.tgz",
-      "integrity": "sha512-ZSjtmelB7IJfWD2Fvb7+Z+ChTIKWq6kjda95fLcQKNS5aheVHn4IkfgRQE3sIIzTcSLwLcLZUD9UBt+V7+h+Pw==",
+      "version": "8.49.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.49.0.tgz",
+      "integrity": "sha512-1S8uAY/MTJqVx0SC4epBq+N2yhuwtNwLbJYNZyhL2pO1ZVKn5HFXav5T41Ryzy9K9V7ZId2JB2oy/W4aCd9/2w==",
       "dev": true,
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -308,14 +308,14 @@
       }
     },
     "node_modules/array.prototype.flat": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz",
-      "integrity": "sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA==",
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.2.tgz",
+      "integrity": "sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==",
       "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1",
         "es-shim-unscopables": "^1.0.0"
       },
       "engines": {
@@ -326,14 +326,14 @@
       }
     },
     "node_modules/array.prototype.flatmap": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.1.tgz",
-      "integrity": "sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ==",
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.2.tgz",
+      "integrity": "sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==",
       "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1",
         "es-shim-unscopables": "^1.0.0"
       },
       "engines": {
@@ -344,13 +344,14 @@
       }
     },
     "node_modules/arraybuffer.prototype.slice": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.1.tgz",
-      "integrity": "sha512-09x0ZWFEjj4WD8PDbykUwo3t9arLn8NIzmmYEJFpYekOAQjpkGSyrQhNoRTcwwcFRu+ycWF78QZ63oWTqSjBcw==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.2.tgz",
+      "integrity": "sha512-yMBKppFur/fbHu9/6USUe03bZ4knMYiwFBcyiaXB8Go0qNehwX6inYPzK9U0NeQvGxKthcmHcaR8P5MStSRBAw==",
       "dependencies": {
         "array-buffer-byte-length": "^1.0.0",
         "call-bind": "^1.0.2",
         "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1",
         "get-intrinsic": "^1.2.1",
         "is-array-buffer": "^3.0.2",
         "is-shared-array-buffer": "^1.0.2"
@@ -662,16 +663,16 @@
       }
     },
     "node_modules/eslint": {
-      "version": "8.48.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.48.0.tgz",
-      "integrity": "sha512-sb6DLeIuRXxeM1YljSe1KEx9/YYeZFQWcV8Rq9HfigmdDEugjLEVEa1ozDjL6YDjBpQHPJxJzze+alxi4T3OLg==",
+      "version": "8.49.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.49.0.tgz",
+      "integrity": "sha512-jw03ENfm6VJI0jA9U+8H5zfl5b+FvuU3YYvZRdZHOlU2ggJkxrlkJH4HcDrZpj6YwD8kuYqvQM8LyesoazrSOQ==",
       "dev": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.6.1",
         "@eslint/eslintrc": "^2.1.2",
-        "@eslint/js": "8.48.0",
-        "@humanwhocodes/config-array": "^0.11.10",
+        "@eslint/js": "8.49.0",
+        "@humanwhocodes/config-array": "^0.11.11",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
         "ajv": "^6.12.4",
@@ -2096,12 +2097,12 @@
       }
     },
     "node_modules/safe-array-concat": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.0.0.tgz",
-      "integrity": "sha512-9dVEFruWIsnie89yym+xWTAYASdpw3CJV7Li/6zBewGf9z2i1j31rP6jnY0pHEO4QZh6N0K11bFjWmdR8UGdPQ==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.0.1.tgz",
+      "integrity": "sha512-6XbUAseYE2KtOuGueyeobCySj9L4+66Tn6KQMOPQJrAJEowYKW/YR/MGJZl7FdydUdaFu4LYyDZjxf4/Nmo23Q==",
       "dependencies": {
         "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.2.0",
+        "get-intrinsic": "^1.2.1",
         "has-symbols": "^1.0.3",
         "isarray": "^2.0.5"
       },
@@ -2169,13 +2170,13 @@
       }
     },
     "node_modules/string.prototype.trim": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz",
-      "integrity": "sha512-p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg==",
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.8.tgz",
+      "integrity": "sha512-lfjY4HcixfQXOfaqCvcBuOIapyaroTXhbkfJN3gcB1OtyupngWK4sEET9Knd0cXd28kTUqu/kHoV4HKSJdnjiQ==",
       "dependencies": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1"
       },
       "engines": {
         "node": ">= 0.4"
@@ -2185,26 +2186,26 @@
       }
     },
     "node_modules/string.prototype.trimend": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz",
-      "integrity": "sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.7.tgz",
+      "integrity": "sha512-Ni79DqeB72ZFq1uH/L6zJ+DKZTkOtPIHovb3YZHQViE+HDouuU4mBrLOLDn5Dde3RF8qw5qVETEjhu9locMLvA==",
       "dependencies": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/string.prototype.trimstart": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz",
-      "integrity": "sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.7.tgz",
+      "integrity": "sha512-NGhtDFu3jCEm7B4Fy0DpLewdJQOZcQ0rGbwQ/+stjnrp2i+rlKeCvos9hOIeCmqwratM47OBxY7uFZzjxHXmrg==",
       "dependencies": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -2462,9 +2463,9 @@
       "dev": true
     },
     "node_modules/ws": {
-      "version": "8.13.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz",
-      "integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==",
+      "version": "8.14.1",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.14.1.tgz",
+      "integrity": "sha512-4OOseMUq8AzRBI/7SLMUwO+FEDnguetSk7KMb1sHwvF2w2Wv5Hoj0nlifx8vtGsftE/jWHojPy8sMMzYLJ2G/A==",
       "engines": {
         "node": ">=10.0.0"
       },
diff --git a/package.json b/package.json
index 818fdd19..323c5d91 100644
--- a/package.json
+++ b/package.json
@@ -64,10 +64,10 @@
     "node-persist": "^3.1.0",
     "p-queue": "^7.4.1",
     "websocket-as-promised": "^2.0.1",
-    "ws": "^8.13.0"
+    "ws": "^8.14.1"
   },
   "devDependencies": {
-    "eslint": "^8.48.0",
+    "eslint": "^8.49.0",
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-plugin-import": "^2.28.1",
     "eslint-plugin-import-newlines": "^1.3.4",

From 768d23c43c635e659f1a39ec71e6745ec3904f5f Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Sun, 10 Sep 2023 14:55:00 +0100
Subject: [PATCH 3147/3183] 11.0.3-beta.3

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 2ce4042c..41a177ed 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "11.0.3-beta.2",
+  "version": "11.0.3-beta.3",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "11.0.3-beta.2",
+      "version": "11.0.3-beta.3",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 323c5d91..8283b474 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "11.0.3-beta.2",
+  "version": "11.0.3-beta.3",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From a57501b749a00ad7521e5263e2fd912360f82dcc Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Sun, 10 Sep 2023 15:12:18 +0100
Subject: [PATCH 3148/3183] Update light-rgb-cct.js

---
 lib/device/light-rgb-cct.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/lib/device/light-rgb-cct.js b/lib/device/light-rgb-cct.js
index 0df6375b..6eb6f86d 100644
--- a/lib/device/light-rgb-cct.js
+++ b/lib/device/light-rgb-cct.js
@@ -740,10 +740,6 @@ export default class {
                 case 136:
                   ctToK = Math.round((this.cacheCT / 100) * 3800 + 2700);
                   break;
-                case 137:
-                case 173:
-                  ctToK = Math.round(((100 - this.cacheCT) / 100) * 3800 + 2700);
-                  break;
                 default:
                   ctToK = Math.round((this.cacheCT / 255) * 3800 + 2700);
                   break;

From 1b13ea670e84279354c3ef1358d3cfa41400dbcb Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Sun, 10 Sep 2023 15:12:38 +0100
Subject: [PATCH 3149/3183] 11.0.3-beta.4

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 41a177ed..07c6b8a6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "11.0.3-beta.3",
+  "version": "11.0.3-beta.4",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "11.0.3-beta.3",
+      "version": "11.0.3-beta.4",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 8283b474..7707174f 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "11.0.3-beta.3",
+  "version": "11.0.3-beta.4",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From 308557af54f48a7da10395026b415a46c8c1fddf Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Wed, 27 Sep 2023 22:26:09 +0100
Subject: [PATCH 3150/3183] fix sim heater

---
 lib/device/simulation/heater.js |  91 +++++++++++++++++++--
 package-lock.json               | 141 +++++++++++++++++++-------------
 package.json                    |   8 +-
 3 files changed, 173 insertions(+), 67 deletions(-)

diff --git a/lib/device/simulation/heater.js b/lib/device/simulation/heater.js
index e76b372d..7e3cf6cd 100644
--- a/lib/device/simulation/heater.js
+++ b/lib/device/simulation/heater.js
@@ -1,3 +1,4 @@
+import platformConsts from '../../utils/constants.js';
 import { hasProperty, parseError } from '../../utils/functions.js';
 
 export default class {
@@ -61,6 +62,19 @@ export default class {
       this.accessory.context.cacheTarget = 20;
     }
 
+    // Set up the device type and power readings if necessary
+    if (platformConsts.devices.switchSingle.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'switchSingle';
+    } else if (platformConsts.devices.switchSinglePower.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'switchSingle';
+    } else if (platformConsts.devices.switchMulti.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'switchMulti';
+    } else if (platformConsts.devices.switchSCM.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'switchMulti';
+    } else if (platformConsts.devices.switchSCMPower.includes(this.accessory.context.eweUIID)) {
+      this.setup = 'switchMulti';
+    }
+
     // Add the heater service if it doesn't already exist
     this.service = this.accessory.getService(this.hapServ.HeaterCooler)
       || this.accessory.addService(this.hapServ.HeaterCooler);
@@ -163,15 +177,42 @@ export default class {
       let newHeat;
       const params = {};
       if (value === 0) {
-        params.switch = 'off';
+        if (this.setup === 'switchSingle') {
+          params.switch = 'off';
+        } else { // switchMulti
+          params.switches = [
+            {
+              switch: 'off',
+              outlet: 0,
+            },
+          ];
+        }
         newState = 'off';
         newHeat = 'off';
       } else if (this.cacheTemp < this.accessory.context.cacheTarget) {
-        params.switch = 'on';
+        if (this.setup === 'switchSingle') {
+          params.switch = 'on';
+        } else { // switchMulti
+          params.switches = [
+            {
+              switch: 'on',
+              outlet: 0,
+            },
+          ];
+        }
         newState = 'on';
         newHeat = 'on';
       } else {
-        params.switch = 'off';
+        if (this.setup === 'switchSingle') {
+          params.switch = 'off';
+        } else { // switchMulti
+          params.switches = [
+            {
+              switch: 'off',
+              outlet: 0,
+            },
+          ];
+        }
         newState = 'on';
         newHeat = 'off';
       }
@@ -223,10 +264,28 @@ export default class {
       const params = {};
       let newHeat;
       if (this.cacheTemp < value) {
-        params.switch = 'on';
+        if (this.setup === 'switchSingle') {
+          params.switch = 'on';
+        } else { // switchMulti
+          params.switches = [
+            {
+              switch: 'on',
+              outlet: 0,
+            },
+          ];
+        }
         newHeat = 'on';
       } else {
-        params.switch = 'off';
+        if (this.setup === 'switchSingle') {
+          params.switch = 'off';
+        } else { // switchMulti
+          params.switches = [
+            {
+              switch: 'off',
+              outlet: 0,
+            },
+          ];
+        }
         newHeat = 'off';
       }
       if (newHeat === this.cacheHeat) {
@@ -261,10 +320,28 @@ export default class {
       const params = {};
       let newHeat;
       if (this.cacheTemp < this.accessory.context.cacheTarget) {
-        params.switch = 'on';
+        if (this.setup === 'switchSingle') {
+          params.switch = 'on';
+        } else { // switchMulti
+          params.switches = [
+            {
+              switch: 'on',
+              outlet: 0,
+            },
+          ];
+        }
         newHeat = 'on';
       } else {
-        params.switch = 'off';
+        if (this.setup === 'switchSingle') {
+          params.switch = 'off';
+        } else { // switchMulti
+          params.switches = [
+            {
+              switch: 'off',
+              outlet: 0,
+            },
+          ];
+        }
         newHeat = 'off';
       }
       if (newHeat === this.cacheHeat) {
diff --git a/package-lock.json b/package-lock.json
index 07c6b8a6..811175d4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -28,14 +28,14 @@
       "license": "MIT",
       "dependencies": {
         "@homebridge/plugin-ui-utils": "^0.1.0",
-        "axios": "^1.5.0",
+        "axios": "^1.5.1",
         "node-persist": "^3.1.0",
         "p-queue": "^7.4.1",
         "websocket-as-promised": "^2.0.1",
-        "ws": "^8.14.1"
+        "ws": "^8.14.2"
       },
       "devDependencies": {
-        "eslint": "^8.49.0",
+        "eslint": "^8.50.0",
         "eslint-config-airbnb-base": "^15.0.0",
         "eslint-plugin-import": "^2.28.1",
         "eslint-plugin-import-newlines": "^1.3.4",
@@ -43,7 +43,7 @@
       },
       "engines": {
         "homebridge": "^1.6.0 || ^2.0.0-beta.0",
-        "node": "^16.20.2 || ^18.17.1 || ^20.5.1"
+        "node": "^16.20.2 || ^18.18.0 || ^20.7.0"
       }
     },
     "node_modules/@aashutoshrathi/word-wrap": {
@@ -71,9 +71,9 @@
       }
     },
     "node_modules/@eslint-community/regexpp": {
-      "version": "4.8.0",
-      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.8.0.tgz",
-      "integrity": "sha512-JylOEEzDiOryeUnFbQz+oViCXS0KsvR1mvHkoMiu5+UiBvy+RYX7tzlIIIEstF/gVa2tj9AQXk3dgnxv6KxhFg==",
+      "version": "4.9.0",
+      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.9.0.tgz",
+      "integrity": "sha512-zJmuCWj2VLBt4c25CfBIbMZLGLyhkvs7LznyVX5HfpzeocThgIj5XQK4L+g3U36mMcx8bPMhGyPpwCATamC4jQ==",
       "dev": true,
       "engines": {
         "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
@@ -103,9 +103,9 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "8.49.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.49.0.tgz",
-      "integrity": "sha512-1S8uAY/MTJqVx0SC4epBq+N2yhuwtNwLbJYNZyhL2pO1ZVKn5HFXav5T41Ryzy9K9V7ZId2JB2oy/W4aCd9/2w==",
+      "version": "8.50.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.50.0.tgz",
+      "integrity": "sha512-NCC3zz2+nvYd+Ckfh87rA47zfu2QsQpvc6k1yzTk+b9KzRj0wkGa8LSoGOXN6Zv4lRf/EIoZ80biDh9HOI+RNQ==",
       "dev": true,
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -380,9 +380,9 @@
       }
     },
     "node_modules/axios": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.5.0.tgz",
-      "integrity": "sha512-D4DdjDo5CY50Qms0qGQTTw6Q44jl7zRwY7bthds06pUGfChBCTcQs+N743eFWGEd6pRTMd6A+I87aWyFV5wiZQ==",
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.5.1.tgz",
+      "integrity": "sha512-Q28iYCWzNHjAm+yEAot5QaAMxhMghWLFVf7rRdwhUI+c2jix2DUXjAHXVi+s1ibs3mjPO/cCgbA++3BjD0vP/A==",
       "dependencies": {
         "follow-redirects": "^1.15.0",
         "form-data": "^4.0.0",
@@ -525,11 +525,25 @@
       "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
       "dev": true
     },
+    "node_modules/define-data-property": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.0.tgz",
+      "integrity": "sha512-UzGwzcjyv3OtAvolTj1GoyNYzfFR+iqbGjcnBEENZVCpM4/Ng1yhGNvS3lR/xDS74Tb2wGG9WzNSNIOS9UVb2g==",
+      "dependencies": {
+        "get-intrinsic": "^1.2.1",
+        "gopd": "^1.0.1",
+        "has-property-descriptors": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/define-properties": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.0.tgz",
-      "integrity": "sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz",
+      "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==",
       "dependencies": {
+        "define-data-property": "^1.0.1",
         "has-property-descriptors": "^1.0.0",
         "object-keys": "^1.1.1"
       },
@@ -561,17 +575,17 @@
       }
     },
     "node_modules/es-abstract": {
-      "version": "1.22.1",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.1.tgz",
-      "integrity": "sha512-ioRRcXMO6OFyRpyzV3kE1IIBd4WG5/kltnzdxSCqoP8CMGs/Li+M1uF5o7lOkZVFjDs+NLesthnF66Pg/0q0Lw==",
+      "version": "1.22.2",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.2.tgz",
+      "integrity": "sha512-YoxfFcDmhjOgWPWsV13+2RNjq1F6UQnfs+8TftwNqtzlmFzEXvlUwdrNrYeaizfjQzRMxkZ6ElWMOJIFKdVqwA==",
       "dependencies": {
         "array-buffer-byte-length": "^1.0.0",
-        "arraybuffer.prototype.slice": "^1.0.1",
+        "arraybuffer.prototype.slice": "^1.0.2",
         "available-typed-arrays": "^1.0.5",
         "call-bind": "^1.0.2",
         "es-set-tostringtag": "^2.0.1",
         "es-to-primitive": "^1.2.1",
-        "function.prototype.name": "^1.1.5",
+        "function.prototype.name": "^1.1.6",
         "get-intrinsic": "^1.2.1",
         "get-symbol-description": "^1.0.0",
         "globalthis": "^1.0.3",
@@ -587,23 +601,23 @@
         "is-regex": "^1.1.4",
         "is-shared-array-buffer": "^1.0.2",
         "is-string": "^1.0.7",
-        "is-typed-array": "^1.1.10",
+        "is-typed-array": "^1.1.12",
         "is-weakref": "^1.0.2",
         "object-inspect": "^1.12.3",
         "object-keys": "^1.1.1",
         "object.assign": "^4.1.4",
-        "regexp.prototype.flags": "^1.5.0",
-        "safe-array-concat": "^1.0.0",
+        "regexp.prototype.flags": "^1.5.1",
+        "safe-array-concat": "^1.0.1",
         "safe-regex-test": "^1.0.0",
-        "string.prototype.trim": "^1.2.7",
-        "string.prototype.trimend": "^1.0.6",
-        "string.prototype.trimstart": "^1.0.6",
+        "string.prototype.trim": "^1.2.8",
+        "string.prototype.trimend": "^1.0.7",
+        "string.prototype.trimstart": "^1.0.7",
         "typed-array-buffer": "^1.0.0",
         "typed-array-byte-length": "^1.0.0",
         "typed-array-byte-offset": "^1.0.0",
         "typed-array-length": "^1.0.4",
         "unbox-primitive": "^1.0.2",
-        "which-typed-array": "^1.1.10"
+        "which-typed-array": "^1.1.11"
       },
       "engines": {
         "node": ">= 0.4"
@@ -663,15 +677,15 @@
       }
     },
     "node_modules/eslint": {
-      "version": "8.49.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.49.0.tgz",
-      "integrity": "sha512-jw03ENfm6VJI0jA9U+8H5zfl5b+FvuU3YYvZRdZHOlU2ggJkxrlkJH4HcDrZpj6YwD8kuYqvQM8LyesoazrSOQ==",
+      "version": "8.50.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.50.0.tgz",
+      "integrity": "sha512-FOnOGSuFuFLv/Sa+FDVRZl4GGVAAFFi8LecRsI5a1tMO5HIE8nCm4ivAlzt4dT3ol/PaaGC0rJEEXQmHJBGoOg==",
       "dev": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.6.1",
         "@eslint/eslintrc": "^2.1.2",
-        "@eslint/js": "8.49.0",
+        "@eslint/js": "8.50.0",
         "@humanwhocodes/config-array": "^0.11.11",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
@@ -1019,15 +1033,15 @@
       }
     },
     "node_modules/flatted": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz",
-      "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==",
+      "version": "3.2.9",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.9.tgz",
+      "integrity": "sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==",
       "dev": true
     },
     "node_modules/follow-redirects": {
-      "version": "1.15.2",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz",
-      "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==",
+      "version": "1.15.3",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.3.tgz",
+      "integrity": "sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q==",
       "funding": [
         {
           "type": "individual",
@@ -1162,9 +1176,9 @@
       }
     },
     "node_modules/globals": {
-      "version": "13.21.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.21.0.tgz",
-      "integrity": "sha512-ybyme3s4yy/t/3s35bewwXKOf7cvzfreG2lH0lZl0JB7I4GxRP2ghxOK/Nb9EkRXdbBXZLfq/p/0W2JUONB/Gg==",
+      "version": "13.22.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.22.0.tgz",
+      "integrity": "sha512-H1Ddc/PbZHTDVJSnj8kWptIRSD6AM3pK+mKytuIVF4uoBV7rshFlhhvA58ceJ5wp3Er58w6zj7bykMpYXt3ETw==",
       "dev": true,
       "dependencies": {
         "type-fest": "^0.20.2"
@@ -1949,13 +1963,15 @@
       }
     },
     "node_modules/promise.prototype.finally": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/promise.prototype.finally/-/promise.prototype.finally-3.1.5.tgz",
-      "integrity": "sha512-4TQ3Dk8yyUZGyU+UXInKdkQ2b6xtiBXAIScGAtGnXVmJtG1uOrxRgbF1ggIu72uzoWFzUfT3nUKa1SuMm9NBdg==",
+      "version": "3.1.7",
+      "resolved": "https://registry.npmjs.org/promise.prototype.finally/-/promise.prototype.finally-3.1.7.tgz",
+      "integrity": "sha512-iL9OcJRUZcCE5xn6IwhZxO+eMM0VEXjkETHy+Nk+d9q3s7kxVtPg+mBlMO+ZGxNKNMODyKmy/bOyt/yhxTnvEw==",
       "dependencies": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1"
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.22.1",
+        "get-intrinsic": "^1.2.1",
+        "set-function-name": "^2.0.1"
       },
       "engines": {
         "node": ">= 0.4"
@@ -2007,13 +2023,13 @@
       ]
     },
     "node_modules/regexp.prototype.flags": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.0.tgz",
-      "integrity": "sha512-0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA==",
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.1.tgz",
+      "integrity": "sha512-sy6TXMN+hnP/wMy+ISxg3krXx7BAtWVO4UouuCN/ziM9UEne0euamVNafDfvC83bRNr95y0V5iijeDQFUNpvrg==",
       "dependencies": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.2.0",
-        "functions-have-names": "^1.2.3"
+        "set-function-name": "^2.0.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -2023,9 +2039,9 @@
       }
     },
     "node_modules/resolve": {
-      "version": "1.22.4",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.4.tgz",
-      "integrity": "sha512-PXNdCiPqDqeUou+w1C2eTQbNfxKSuMxqTCuvlmmMsk1NWHL5fRrhY6Pl0qEYYc6+QqGClco1Qj8XnjPego4wfg==",
+      "version": "1.22.6",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.6.tgz",
+      "integrity": "sha512-njhxM7mV12JfufShqGy3Rz8j11RPdLy4xi15UurGJeoHLfJpVXKdh3ueuOqbYUcDZnffr6X739JBo5LzyahEsw==",
       "dev": true,
       "dependencies": {
         "is-core-module": "^2.13.0",
@@ -2135,6 +2151,19 @@
         "semver": "bin/semver.js"
       }
     },
+    "node_modules/set-function-name": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.1.tgz",
+      "integrity": "sha512-tMNCiqYVkXIZgc2Hnoy2IvC/f8ezc5koaRFkCjrpWzGpCd3qbZXPzVy9MAZzK1ch/X0jvSkojys3oqJN0qCmdA==",
+      "dependencies": {
+        "define-data-property": "^1.0.1",
+        "functions-have-names": "^1.2.3",
+        "has-property-descriptors": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/shebang-command": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
@@ -2463,9 +2492,9 @@
       "dev": true
     },
     "node_modules/ws": {
-      "version": "8.14.1",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.14.1.tgz",
-      "integrity": "sha512-4OOseMUq8AzRBI/7SLMUwO+FEDnguetSk7KMb1sHwvF2w2Wv5Hoj0nlifx8vtGsftE/jWHojPy8sMMzYLJ2G/A==",
+      "version": "8.14.2",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.14.2.tgz",
+      "integrity": "sha512-wEBG1ftX4jcglPxgFCMJmZ2PLtSbJ2Peg6TmpJFTbe9GZYOQCDPdMYu/Tm0/bGZkw8paZnJY45J4K2PZrLYq8g==",
       "engines": {
         "node": ">=10.0.0"
       },
diff --git a/package.json b/package.json
index 7707174f..cee7612c 100644
--- a/package.json
+++ b/package.json
@@ -31,7 +31,7 @@
   },
   "engines": {
     "homebridge": "^1.6.0 || ^2.0.0-beta.0",
-    "node": "^16.20.2 || ^18.17.1 || ^20.5.1"
+    "node": "^16.20.2 || ^18.18.0 || ^20.7.0"
   },
   "repository": {
     "type": "git",
@@ -60,14 +60,14 @@
   ],
   "dependencies": {
     "@homebridge/plugin-ui-utils": "^0.1.0",
-    "axios": "^1.5.0",
+    "axios": "^1.5.1",
     "node-persist": "^3.1.0",
     "p-queue": "^7.4.1",
     "websocket-as-promised": "^2.0.1",
-    "ws": "^8.14.1"
+    "ws": "^8.14.2"
   },
   "devDependencies": {
-    "eslint": "^8.49.0",
+    "eslint": "^8.50.0",
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-plugin-import": "^2.28.1",
     "eslint-plugin-import-newlines": "^1.3.4",

From 7b815312d7224ec85377915c09266ed996685ccb Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Wed, 27 Sep 2023 23:01:51 +0100
Subject: [PATCH 3151/3183] 11.1.0-beta.0

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 811175d4..9c35970a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "11.0.3-beta.4",
+  "version": "11.1.0-beta.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "11.0.3-beta.4",
+      "version": "11.1.0-beta.0",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index cee7612c..46a7463d 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "11.0.3-beta.4",
+  "version": "11.1.0-beta.0",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From 3a30ea456a0400f5e6245255ea925db3dbb4112f Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Wed, 27 Sep 2023 23:29:39 +0100
Subject: [PATCH 3152/3183] 11.1.0-beta.1

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 9c35970a..558ec207 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "11.1.0-beta.0",
+  "version": "11.1.0-beta.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "11.1.0-beta.0",
+      "version": "11.1.0-beta.1",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 46a7463d..b2149563 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "11.1.0-beta.0",
+  "version": "11.1.0-beta.1",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From fdc626c066c0d9f9b9879ea9378e628ea1c66daf Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Tue, 24 Oct 2023 11:14:04 +0100
Subject: [PATCH 3153/3183] prep 12

---
 CHANGELOG.md                        |  11 +-
 lib/homebridge-ui/public/index.html |   2 +-
 package-lock.json                   | 261 +++++++++++++++-------------
 package.json                        |  10 +-
 4 files changed, 159 insertions(+), 125 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 34a9aef3..d99cab06 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,13 +8,22 @@ This project tries to adhere to [Semantic Versioning](http://semver.org/). In pr
 - `MINOR` version when a new device type is added, or when a new feature is added that is backwards-compatible
 - `PATCH` version when backwards-compatible bug fixes are implemented
 
-## BETA
+## 12.0.0 (2023-10-24)
 
 ### Added
 
 - Support for ZigBee motor device with UIID `7006`
 - Brightness and colour support for light device with UIID `173`
 
+### Changed
+
+- Updated dependencies
+- Bump `node` supported versions to v18.18.2 or v20.8.1
+
+### Removed
+
+- Support for node 16
+
 ## 11.0.2 (2023-08-28)
 
 ⚠️ Note this will be the last version of the plugin to support Node 16.
diff --git a/lib/homebridge-ui/public/index.html b/lib/homebridge-ui/public/index.html
index 2cffe977..4dfa5d2b 100644
--- a/lib/homebridge-ui/public/index.html
+++ b/lib/homebridge-ui/public/index.html
@@ -120,7 +120,7 @@ <h4>Setup</h4>
       >
     </li>
     <li>
-      <a href="https://github.com/bwp91/homebridge-ewelink/wiki/Beta-Version" target="_blank"
+      <a href="https://github.com/homebridge/homebridge/wiki/How-to-Install-Alternate-Plugin-Versions" target="_blank"
         >Beta Version</a
       >
     </li>
diff --git a/package-lock.json b/package-lock.json
index 558ec207..6f450b4f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -27,7 +27,7 @@
       ],
       "license": "MIT",
       "dependencies": {
-        "@homebridge/plugin-ui-utils": "^0.1.0",
+        "@homebridge/plugin-ui-utils": "^1.0.0",
         "axios": "^1.5.1",
         "node-persist": "^3.1.0",
         "p-queue": "^7.4.1",
@@ -35,15 +35,15 @@
         "ws": "^8.14.2"
       },
       "devDependencies": {
-        "eslint": "^8.50.0",
+        "eslint": "^8.52.0",
         "eslint-config-airbnb-base": "^15.0.0",
-        "eslint-plugin-import": "^2.28.1",
+        "eslint-plugin-import": "^2.29.0",
         "eslint-plugin-import-newlines": "^1.3.4",
         "eslint-plugin-sort-exports": "^0.8.0"
       },
       "engines": {
-        "homebridge": "^1.6.0 || ^2.0.0-beta.0",
-        "node": "^16.20.2 || ^18.18.0 || ^20.7.0"
+        "homebridge": "^1.6.0",
+        "node": "^18.18.2 || ^20.8.1"
       }
     },
     "node_modules/@aashutoshrathi/word-wrap": {
@@ -71,9 +71,9 @@
       }
     },
     "node_modules/@eslint-community/regexpp": {
-      "version": "4.9.0",
-      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.9.0.tgz",
-      "integrity": "sha512-zJmuCWj2VLBt4c25CfBIbMZLGLyhkvs7LznyVX5HfpzeocThgIj5XQK4L+g3U36mMcx8bPMhGyPpwCATamC4jQ==",
+      "version": "4.9.1",
+      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.9.1.tgz",
+      "integrity": "sha512-Y27x+MBLjXa+0JWDhykM3+JE+il3kHKAEqabfEWq3SDhZjLYb6/BHL/JKFnH3fe207JaXkyDo685Oc2Glt6ifA==",
       "dev": true,
       "engines": {
         "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
@@ -103,26 +103,26 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "8.50.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.50.0.tgz",
-      "integrity": "sha512-NCC3zz2+nvYd+Ckfh87rA47zfu2QsQpvc6k1yzTk+b9KzRj0wkGa8LSoGOXN6Zv4lRf/EIoZ80biDh9HOI+RNQ==",
+      "version": "8.52.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.52.0.tgz",
+      "integrity": "sha512-mjZVbpaeMZludF2fsWLD0Z9gCref1Tk4i9+wddjRvpUNqqcndPkBD09N/Mapey0b3jaXbLm2kICwFv2E64QinA==",
       "dev": true,
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       }
     },
     "node_modules/@homebridge/plugin-ui-utils": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/@homebridge/plugin-ui-utils/-/plugin-ui-utils-0.1.0.tgz",
-      "integrity": "sha512-dFpXhSy/+moDzOf8yRZxeuqZOAHTA0bZDElMXnO98cequ+7kPmX+wgREYVrYcHZYtJK744nD1n7qT2gy/E/yFg=="
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@homebridge/plugin-ui-utils/-/plugin-ui-utils-1.0.0.tgz",
+      "integrity": "sha512-HVZCSiBgwOx+4ItOF78rZYOWDxOskz//k2r5Wqj7+iUD7Bcpmqp+ymhEuWO8fMtz1aSiFauYpWMz2ll5CBrG9g=="
     },
     "node_modules/@humanwhocodes/config-array": {
-      "version": "0.11.11",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.11.tgz",
-      "integrity": "sha512-N2brEuAadi0CcdeMXUkhbZB84eskAc8MEX1By6qEchoVywSgXPIjou4rYsl0V3Hj0ZnuGycGCjdNgockbzeWNA==",
+      "version": "0.11.13",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.13.tgz",
+      "integrity": "sha512-JSBDMiDKSzQVngfRjOdFXgFfklaXI4K9nLF49Auh21lmBWRLIK3+xTErTWD4KU54pb6coM6ESE7Awz/FNU3zgQ==",
       "dev": true,
       "dependencies": {
-        "@humanwhocodes/object-schema": "^1.2.1",
+        "@humanwhocodes/object-schema": "^2.0.1",
         "debug": "^4.1.1",
         "minimatch": "^3.0.5"
       },
@@ -144,9 +144,9 @@
       }
     },
     "node_modules/@humanwhocodes/object-schema": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
-      "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.1.tgz",
+      "integrity": "sha512-dvuCeX5fC9dXgJn9t+X5atfmgQAzUOWqS1254Gh0m6i8wKd10ebXkfNKiRK+1GWi/yTvvLDHpoxLr0xxxeslWw==",
       "dev": true
     },
     "node_modules/@nodelib/fs.scandir": {
@@ -190,6 +190,12 @@
       "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==",
       "dev": true
     },
+    "node_modules/@ungap/structured-clone": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz",
+      "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==",
+      "dev": true
+    },
     "node_modules/acorn": {
       "version": "8.10.0",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz",
@@ -406,12 +412,13 @@
       }
     },
     "node_modules/call-bind": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.5.tgz",
+      "integrity": "sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ==",
       "dependencies": {
-        "function-bind": "^1.1.1",
-        "get-intrinsic": "^1.0.2"
+        "function-bind": "^1.1.2",
+        "get-intrinsic": "^1.2.1",
+        "set-function-length": "^1.1.1"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -526,9 +533,9 @@
       "dev": true
     },
     "node_modules/define-data-property": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.0.tgz",
-      "integrity": "sha512-UzGwzcjyv3OtAvolTj1GoyNYzfFR+iqbGjcnBEENZVCpM4/Ng1yhGNvS3lR/xDS74Tb2wGG9WzNSNIOS9UVb2g==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.1.tgz",
+      "integrity": "sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==",
       "dependencies": {
         "get-intrinsic": "^1.2.1",
         "gopd": "^1.0.1",
@@ -575,25 +582,25 @@
       }
     },
     "node_modules/es-abstract": {
-      "version": "1.22.2",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.2.tgz",
-      "integrity": "sha512-YoxfFcDmhjOgWPWsV13+2RNjq1F6UQnfs+8TftwNqtzlmFzEXvlUwdrNrYeaizfjQzRMxkZ6ElWMOJIFKdVqwA==",
+      "version": "1.22.3",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.3.tgz",
+      "integrity": "sha512-eiiY8HQeYfYH2Con2berK+To6GrK2RxbPawDkGq4UiCQQfZHb6wX9qQqkbpPqaxQFcl8d9QzZqo0tGE0VcrdwA==",
       "dependencies": {
         "array-buffer-byte-length": "^1.0.0",
         "arraybuffer.prototype.slice": "^1.0.2",
         "available-typed-arrays": "^1.0.5",
-        "call-bind": "^1.0.2",
+        "call-bind": "^1.0.5",
         "es-set-tostringtag": "^2.0.1",
         "es-to-primitive": "^1.2.1",
         "function.prototype.name": "^1.1.6",
-        "get-intrinsic": "^1.2.1",
+        "get-intrinsic": "^1.2.2",
         "get-symbol-description": "^1.0.0",
         "globalthis": "^1.0.3",
         "gopd": "^1.0.1",
-        "has": "^1.0.3",
         "has-property-descriptors": "^1.0.0",
         "has-proto": "^1.0.1",
         "has-symbols": "^1.0.3",
+        "hasown": "^2.0.0",
         "internal-slot": "^1.0.5",
         "is-array-buffer": "^3.0.2",
         "is-callable": "^1.2.7",
@@ -603,7 +610,7 @@
         "is-string": "^1.0.7",
         "is-typed-array": "^1.1.12",
         "is-weakref": "^1.0.2",
-        "object-inspect": "^1.12.3",
+        "object-inspect": "^1.13.1",
         "object-keys": "^1.1.1",
         "object.assign": "^4.1.4",
         "regexp.prototype.flags": "^1.5.1",
@@ -617,7 +624,7 @@
         "typed-array-byte-offset": "^1.0.0",
         "typed-array-length": "^1.0.4",
         "unbox-primitive": "^1.0.2",
-        "which-typed-array": "^1.1.11"
+        "which-typed-array": "^1.1.13"
       },
       "engines": {
         "node": ">= 0.4"
@@ -627,25 +634,25 @@
       }
     },
     "node_modules/es-set-tostringtag": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz",
-      "integrity": "sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.2.tgz",
+      "integrity": "sha512-BuDyupZt65P9D2D2vA/zqcI3G5xRsklm5N3xCwuiy+/vKy8i0ifdsQP1sLgO4tZDSCaQUSnmC48khknGMV3D2Q==",
       "dependencies": {
-        "get-intrinsic": "^1.1.3",
-        "has": "^1.0.3",
-        "has-tostringtag": "^1.0.0"
+        "get-intrinsic": "^1.2.2",
+        "has-tostringtag": "^1.0.0",
+        "hasown": "^2.0.0"
       },
       "engines": {
         "node": ">= 0.4"
       }
     },
     "node_modules/es-shim-unscopables": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz",
-      "integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.2.tgz",
+      "integrity": "sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==",
       "dev": true,
       "dependencies": {
-        "has": "^1.0.3"
+        "hasown": "^2.0.0"
       }
     },
     "node_modules/es-to-primitive": {
@@ -677,18 +684,19 @@
       }
     },
     "node_modules/eslint": {
-      "version": "8.50.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.50.0.tgz",
-      "integrity": "sha512-FOnOGSuFuFLv/Sa+FDVRZl4GGVAAFFi8LecRsI5a1tMO5HIE8nCm4ivAlzt4dT3ol/PaaGC0rJEEXQmHJBGoOg==",
+      "version": "8.52.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.52.0.tgz",
+      "integrity": "sha512-zh/JHnaixqHZsolRB/w9/02akBk9EPrOs9JwcTP2ek7yL5bVvXuRariiaAjjoJ5DvuwQ1WAE/HsMz+w17YgBCg==",
       "dev": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.6.1",
         "@eslint/eslintrc": "^2.1.2",
-        "@eslint/js": "8.50.0",
-        "@humanwhocodes/config-array": "^0.11.11",
+        "@eslint/js": "8.52.0",
+        "@humanwhocodes/config-array": "^0.11.13",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
+        "@ungap/structured-clone": "^1.2.0",
         "ajv": "^6.12.4",
         "chalk": "^4.0.0",
         "cross-spawn": "^7.0.2",
@@ -796,26 +804,26 @@
       }
     },
     "node_modules/eslint-plugin-import": {
-      "version": "2.28.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.28.1.tgz",
-      "integrity": "sha512-9I9hFlITvOV55alzoKBI+K9q74kv0iKMeY6av5+umsNwayt59fz692daGyjR+oStBQgx6nwR9rXldDev3Clw+A==",
+      "version": "2.29.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.29.0.tgz",
+      "integrity": "sha512-QPOO5NO6Odv5lpoTkddtutccQjysJuFxoPS7fAHO+9m9udNHvTCPSAMW9zGAYj8lAIdr40I8yPCdUYrncXtrwg==",
       "dev": true,
       "dependencies": {
-        "array-includes": "^3.1.6",
-        "array.prototype.findlastindex": "^1.2.2",
-        "array.prototype.flat": "^1.3.1",
-        "array.prototype.flatmap": "^1.3.1",
+        "array-includes": "^3.1.7",
+        "array.prototype.findlastindex": "^1.2.3",
+        "array.prototype.flat": "^1.3.2",
+        "array.prototype.flatmap": "^1.3.2",
         "debug": "^3.2.7",
         "doctrine": "^2.1.0",
-        "eslint-import-resolver-node": "^0.3.7",
+        "eslint-import-resolver-node": "^0.3.9",
         "eslint-module-utils": "^2.8.0",
-        "has": "^1.0.3",
-        "is-core-module": "^2.13.0",
+        "hasown": "^2.0.0",
+        "is-core-module": "^2.13.1",
         "is-glob": "^4.0.3",
         "minimatch": "^3.1.2",
-        "object.fromentries": "^2.0.6",
-        "object.groupby": "^1.0.0",
-        "object.values": "^1.1.6",
+        "object.fromentries": "^2.0.7",
+        "object.groupby": "^1.0.1",
+        "object.values": "^1.1.7",
         "semver": "^6.3.1",
         "tsconfig-paths": "^3.14.2"
       },
@@ -1019,12 +1027,12 @@
       }
     },
     "node_modules/flat-cache": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.1.0.tgz",
-      "integrity": "sha512-OHx4Qwrrt0E4jEIcI5/Xb+f+QmJYNj2rrK8wiIdQOIrB9WrrJL8cjZvXdXuBTkkEwEqLycb5BeZDV1o2i9bTew==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.1.1.tgz",
+      "integrity": "sha512-/qM2b3LUIaIgviBQovTLvijfyOQXPtSRnRK26ksj2J7rzPIecePUIpJsZ4T02Qg+xiAEKIs5K8dsHEd+VaKa/Q==",
       "dev": true,
       "dependencies": {
-        "flatted": "^3.2.7",
+        "flatted": "^3.2.9",
         "keyv": "^4.5.3",
         "rimraf": "^3.0.2"
       },
@@ -1085,9 +1093,12 @@
       "dev": true
     },
     "node_modules/function-bind": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
     },
     "node_modules/function.prototype.name": {
       "version": "1.1.6",
@@ -1115,14 +1126,14 @@
       }
     },
     "node_modules/get-intrinsic": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz",
-      "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==",
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.2.tgz",
+      "integrity": "sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA==",
       "dependencies": {
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
+        "function-bind": "^1.1.2",
         "has-proto": "^1.0.1",
-        "has-symbols": "^1.0.3"
+        "has-symbols": "^1.0.3",
+        "hasown": "^2.0.0"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -1176,9 +1187,9 @@
       }
     },
     "node_modules/globals": {
-      "version": "13.22.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.22.0.tgz",
-      "integrity": "sha512-H1Ddc/PbZHTDVJSnj8kWptIRSD6AM3pK+mKytuIVF4uoBV7rshFlhhvA58ceJ5wp3Er58w6zj7bykMpYXt3ETw==",
+      "version": "13.23.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.23.0.tgz",
+      "integrity": "sha512-XAmF0RjlrjY23MA51q3HltdlGxUpXPvg0GioKiD9X6HD28iMjo2dKC8Vqwm7lne4GNr78+RHTfliktR6ZH09wA==",
       "dev": true,
       "dependencies": {
         "type-fest": "^0.20.2"
@@ -1221,17 +1232,6 @@
       "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==",
       "dev": true
     },
-    "node_modules/has": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-      "dependencies": {
-        "function-bind": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4.0"
-      }
-    },
     "node_modules/has-bigints": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
@@ -1250,11 +1250,11 @@
       }
     },
     "node_modules/has-property-descriptors": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz",
-      "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.1.tgz",
+      "integrity": "sha512-VsX8eaIewvas0xnvinAe9bw4WfIeODpGYikiWYLH+dma0Jw6KHYqWiWfhQlgOVK8D6PvjubK5Uc4P0iIhIcNVg==",
       "dependencies": {
-        "get-intrinsic": "^1.1.1"
+        "get-intrinsic": "^1.2.2"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -1296,6 +1296,17 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/hasown": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.0.tgz",
+      "integrity": "sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==",
+      "dependencies": {
+        "function-bind": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/ignore": {
       "version": "5.2.4",
       "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz",
@@ -1347,12 +1358,12 @@
       "dev": true
     },
     "node_modules/internal-slot": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.5.tgz",
-      "integrity": "sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ==",
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.6.tgz",
+      "integrity": "sha512-Xj6dv+PsbtwyPpEflsejS+oIZxmMlV44zAhG479uYu89MsjcYOhCFnNyKrkJrihbsiasQyY0afoCl/9BLR65bg==",
       "dependencies": {
-        "get-intrinsic": "^1.2.0",
-        "has": "^1.0.3",
+        "get-intrinsic": "^1.2.2",
+        "hasown": "^2.0.0",
         "side-channel": "^1.0.4"
       },
       "engines": {
@@ -1410,12 +1421,12 @@
       }
     },
     "node_modules/is-core-module": {
-      "version": "2.13.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.0.tgz",
-      "integrity": "sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ==",
+      "version": "2.13.1",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz",
+      "integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==",
       "dev": true,
       "dependencies": {
-        "has": "^1.0.3"
+        "hasown": "^2.0.0"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -1623,9 +1634,9 @@
       }
     },
     "node_modules/keyv": {
-      "version": "4.5.3",
-      "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.3.tgz",
-      "integrity": "sha512-QCiSav9WaX1PgETJ+SpNnx2PRRapJ/oRSXM4VO5OGYGSjrxbKPVFVhB3l2OCbLCk329N8qyAtsJjSjvVBWzEug==",
+      "version": "4.5.4",
+      "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
+      "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==",
       "dev": true,
       "dependencies": {
         "json-buffer": "3.0.1"
@@ -1726,9 +1737,9 @@
       }
     },
     "node_modules/object-inspect": {
-      "version": "1.12.3",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz",
-      "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==",
+      "version": "1.13.1",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz",
+      "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==",
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -2039,9 +2050,9 @@
       }
     },
     "node_modules/resolve": {
-      "version": "1.22.6",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.6.tgz",
-      "integrity": "sha512-njhxM7mV12JfufShqGy3Rz8j11RPdLy4xi15UurGJeoHLfJpVXKdh3ueuOqbYUcDZnffr6X739JBo5LzyahEsw==",
+      "version": "1.22.8",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz",
+      "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==",
       "dev": true,
       "dependencies": {
         "is-core-module": "^2.13.0",
@@ -2151,6 +2162,20 @@
         "semver": "bin/semver.js"
       }
     },
+    "node_modules/set-function-length": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.1.1.tgz",
+      "integrity": "sha512-VoaqjbBJKiWtg4yRcKBQ7g7wnGnLV3M8oLvVWwOk2PdYY6PEFegR1vezXR0tw6fZGF9csVakIRjrJiy2veSBFQ==",
+      "dependencies": {
+        "define-data-property": "^1.1.1",
+        "get-intrinsic": "^1.2.1",
+        "gopd": "^1.0.1",
+        "has-property-descriptors": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/set-function-name": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.1.tgz",
@@ -2468,12 +2493,12 @@
       }
     },
     "node_modules/which-typed-array": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.11.tgz",
-      "integrity": "sha512-qe9UWWpkeG5yzZ0tNYxDmd7vo58HDBc39mZ0xWWpolAGADdFOzkfamWLDxkOWcvHQKVmdTyQdLD4NOfjLWTKew==",
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.13.tgz",
+      "integrity": "sha512-P5Nra0qjSncduVPEAr7xhoF5guty49ArDTwzJ/yNuPIbZppyRxFQsRCWrocxIY+CnMVG+qfbU2FmDKyvSGClow==",
       "dependencies": {
         "available-typed-arrays": "^1.0.5",
-        "call-bind": "^1.0.2",
+        "call-bind": "^1.0.4",
         "for-each": "^0.3.3",
         "gopd": "^1.0.1",
         "has-tostringtag": "^1.0.0"
diff --git a/package.json b/package.json
index b2149563..eb11a59b 100644
--- a/package.json
+++ b/package.json
@@ -30,8 +30,8 @@
     "rebuild": "rm -rf package-lock.json && rm -rf node_modules && npm install"
   },
   "engines": {
-    "homebridge": "^1.6.0 || ^2.0.0-beta.0",
-    "node": "^16.20.2 || ^18.18.0 || ^20.7.0"
+    "homebridge": "^1.6.0",
+    "node": "^18.18.2 || ^20.8.1"
   },
   "repository": {
     "type": "git",
@@ -59,7 +59,7 @@
     }
   ],
   "dependencies": {
-    "@homebridge/plugin-ui-utils": "^0.1.0",
+    "@homebridge/plugin-ui-utils": "^1.0.0",
     "axios": "^1.5.1",
     "node-persist": "^3.1.0",
     "p-queue": "^7.4.1",
@@ -67,9 +67,9 @@
     "ws": "^8.14.2"
   },
   "devDependencies": {
-    "eslint": "^8.50.0",
+    "eslint": "^8.52.0",
     "eslint-config-airbnb-base": "^15.0.0",
-    "eslint-plugin-import": "^2.28.1",
+    "eslint-plugin-import": "^2.29.0",
     "eslint-plugin-import-newlines": "^1.3.4",
     "eslint-plugin-sort-exports": "^0.8.0"
   }

From ca4b00eddc70fe944a217be2e27b96370b48b182 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Tue, 24 Oct 2023 11:14:35 +0100
Subject: [PATCH 3154/3183] 12.0.0

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 6f450b4f..4f01b3e8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "11.1.0-beta.1",
+  "version": "12.0.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "11.1.0-beta.1",
+      "version": "12.0.0",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index eb11a59b..7ec96097 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "11.1.0-beta.1",
+  "version": "12.0.0",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From 70f8c1eb0c04f471b60074e5e221e8f5e9317ca2 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Thu, 26 Oct 2023 00:57:19 +0100
Subject: [PATCH 3155/3183] attempt fix ip

---
 lib/connection/lan.js | 16 +++++++++++++---
 package-lock.json     |  8 ++++----
 package.json          |  2 +-
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/lib/connection/lan.js b/lib/connection/lan.js
index e808aaf4..b60b0246 100644
--- a/lib/connection/lan.js
+++ b/lib/connection/lan.js
@@ -30,7 +30,10 @@ export default class {
     Object.entries(this.ipOverride).forEach((entry) => {
       const [deviceId, ip] = entry;
       // Add this device into the map with its user configured IP
-      this.deviceMap.set(deviceId, { ip });
+      this.deviceMap.set(deviceId, {
+        ip,
+        ipOverride: true,
+      });
     });
 
     // Perform an initial discovery of devices on the local network
@@ -46,7 +49,14 @@ export default class {
     res.forEach((device) => {
       // Obtain the ewelink deviceId and check to see it is in our map
       const deviceId = device.fqdn.replace('._ewelink._tcp.local', '').replace('eWeLink_', '');
-      this.deviceMap.set(deviceId, { ip: device.address });
+
+      // Do not override any overridden IPs
+      if (!this.deviceMap.has(deviceId)) {
+        this.deviceMap.set(deviceId, {
+          ip: device.address,
+          ipOverride: false,
+        });
+      }
     });
     return this.deviceMap;
   }
@@ -91,7 +101,7 @@ export default class {
             ]).toString('utf8');
 
             // Check to see if the IP address of the device has changed
-            if (packet.address !== deviceInfo.ip) {
+            if (packet.address !== deviceInfo.ip && !deviceInfo.ipOverride) {
               deviceInfo.ip = packet.address;
             }
 
diff --git a/package-lock.json b/package-lock.json
index 4f01b3e8..8dd48f8c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -43,7 +43,7 @@
       },
       "engines": {
         "homebridge": "^1.6.0",
-        "node": "^18.18.2 || ^20.8.1"
+        "node": "^18.18.2 || ^20.9.0"
       }
     },
     "node_modules/@aashutoshrathi/word-wrap": {
@@ -71,9 +71,9 @@
       }
     },
     "node_modules/@eslint-community/regexpp": {
-      "version": "4.9.1",
-      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.9.1.tgz",
-      "integrity": "sha512-Y27x+MBLjXa+0JWDhykM3+JE+il3kHKAEqabfEWq3SDhZjLYb6/BHL/JKFnH3fe207JaXkyDo685Oc2Glt6ifA==",
+      "version": "4.10.0",
+      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.10.0.tgz",
+      "integrity": "sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==",
       "dev": true,
       "engines": {
         "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
diff --git a/package.json b/package.json
index 7ec96097..2105cbbc 100644
--- a/package.json
+++ b/package.json
@@ -31,7 +31,7 @@
   },
   "engines": {
     "homebridge": "^1.6.0",
-    "node": "^18.18.2 || ^20.8.1"
+    "node": "^18.18.2 || ^20.9.0"
   },
   "repository": {
     "type": "git",

From 6e6014c6f9c362b91bb389e20d9530912bad3f50 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Thu, 26 Oct 2023 00:59:49 +0100
Subject: [PATCH 3156/3183] 12.0.1-beta.0

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 8dd48f8c..27da2097 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "12.0.0",
+  "version": "12.0.1-beta.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "12.0.0",
+      "version": "12.0.1-beta.0",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 2105cbbc..e958e59d 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "12.0.0",
+  "version": "12.0.1-beta.0",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From f9407d5c9b6d6097d71697f3614ce75ea048fb7f Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Sun, 29 Oct 2023 17:45:04 +0000
Subject: [PATCH 3157/3183] beta

---
 CHANGELOG.md          |  6 ++++++
 lib/connection/lan.js |  4 ++--
 package-lock.json     | 14 +++++++-------
 package.json          |  2 +-
 4 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d99cab06..9aa2bacd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,12 @@ This project tries to adhere to [Semantic Versioning](http://semver.org/). In pr
 - `MINOR` version when a new device type is added, or when a new feature is added that is backwards-compatible
 - `PATCH` version when backwards-compatible bug fixes are implemented
 
+## BETA
+
+### Changed
+
+- 
+
 ## 12.0.0 (2023-10-24)
 
 ### Added
diff --git a/lib/connection/lan.js b/lib/connection/lan.js
index b60b0246..a9f51c36 100644
--- a/lib/connection/lan.js
+++ b/lib/connection/lan.js
@@ -101,8 +101,8 @@ export default class {
             ]).toString('utf8');
 
             // Check to see if the IP address of the device has changed
-            if (packet.address !== deviceInfo.ip && !deviceInfo.ipOverride) {
-              deviceInfo.ip = packet.address;
+            if (packet.address !== deviceInfo.ip) {
+              deviceInfo.ip = deviceInfo.ipOverride ? deviceInfo.ip : packet.address;
             }
 
             this.deviceMap.set(rdata.id, deviceInfo);
diff --git a/package-lock.json b/package-lock.json
index 27da2097..17d375ce 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -28,7 +28,7 @@
       "license": "MIT",
       "dependencies": {
         "@homebridge/plugin-ui-utils": "^1.0.0",
-        "axios": "^1.5.1",
+        "axios": "^1.6.0",
         "node-persist": "^3.1.0",
         "p-queue": "^7.4.1",
         "websocket-as-promised": "^2.0.1",
@@ -197,9 +197,9 @@
       "dev": true
     },
     "node_modules/acorn": {
-      "version": "8.10.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz",
-      "integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==",
+      "version": "8.11.2",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.2.tgz",
+      "integrity": "sha512-nc0Axzp/0FILLEVsm4fNwLCwMttvhEI263QtVPQcbpfZZ3ts0hLsZGOpE6czNlid7CJ9MlyH8reXkpsf3YUY4w==",
       "dev": true,
       "bin": {
         "acorn": "bin/acorn"
@@ -386,9 +386,9 @@
       }
     },
     "node_modules/axios": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.5.1.tgz",
-      "integrity": "sha512-Q28iYCWzNHjAm+yEAot5QaAMxhMghWLFVf7rRdwhUI+c2jix2DUXjAHXVi+s1ibs3mjPO/cCgbA++3BjD0vP/A==",
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.0.tgz",
+      "integrity": "sha512-EZ1DYihju9pwVB+jg67ogm+Tmqc6JmhamRN6I4Zt8DfZu5lbcQGw3ozH9lFejSJgs/ibaef3A9PMXPLeefFGJg==",
       "dependencies": {
         "follow-redirects": "^1.15.0",
         "form-data": "^4.0.0",
diff --git a/package.json b/package.json
index e958e59d..d540ebc6 100644
--- a/package.json
+++ b/package.json
@@ -60,7 +60,7 @@
   ],
   "dependencies": {
     "@homebridge/plugin-ui-utils": "^1.0.0",
-    "axios": "^1.5.1",
+    "axios": "^1.6.0",
     "node-persist": "^3.1.0",
     "p-queue": "^7.4.1",
     "websocket-as-promised": "^2.0.1",

From a94bb5754d781aaef9ce784d715b8840ec7ef437 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Sun, 29 Oct 2023 17:45:33 +0000
Subject: [PATCH 3158/3183] 12.0.1-beta.1

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 17d375ce..bf1214f8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "12.0.1-beta.0",
+  "version": "12.0.1-beta.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "12.0.1-beta.0",
+      "version": "12.0.1-beta.1",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index d540ebc6..eb12a55e 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ewelink",
   "alias": "eWeLink",
-  "version": "12.0.1-beta.0",
+  "version": "12.0.1-beta.1",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From 1c74ae16291501514b29aa5e746d8c7d8580bdea Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Tue, 31 Oct 2023 12:44:10 +0000
Subject: [PATCH 3159/3183] display name

---
 CHANGELOG.md      | 3 ++-
 package-lock.json | 6 +++---
 package.json      | 1 +
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9aa2bacd..3976d440 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,7 +12,8 @@ This project tries to adhere to [Semantic Versioning](http://semver.org/). In pr
 
 ### Changed
 
-- 
+- Added plugin display name
+- Don't overwrite the IP of a LAN device if it reports a different IP
 
 ## 12.0.0 (2023-10-24)
 
diff --git a/package-lock.json b/package-lock.json
index bf1214f8..d42676ee 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2005,9 +2005,9 @@
       "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="
     },
     "node_modules/punycode": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz",
-      "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==",
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
+      "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
       "dev": true,
       "engines": {
         "node": ">=6"
diff --git a/package.json b/package.json
index eb12a55e..7c25ad61 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,6 @@
 {
   "name": "homebridge-ewelink",
+  "displayName": "Homebridge eWeLink",
   "alias": "eWeLink",
   "version": "12.0.1-beta.1",
   "author": {

From fe040dd8bd02284b80ae1041743a3eca44fa9f72 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Tue, 31 Oct 2023 12:45:16 +0000
Subject: [PATCH 3160/3183] 12.0.1-beta.2

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d42676ee..b63ecf9b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "12.0.1-beta.1",
+  "version": "12.0.1-beta.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "12.0.1-beta.1",
+      "version": "12.0.1-beta.2",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 7c25ad61..17047acf 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "homebridge-ewelink",
   "displayName": "Homebridge eWeLink",
   "alias": "eWeLink",
-  "version": "12.0.1-beta.1",
+  "version": "12.0.1-beta.2",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From 26743685d1c82c1ce20e02205316a7bbc49ccf2e Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Wed, 1 Nov 2023 19:21:39 +0000
Subject: [PATCH 3161/3183] UIID 7000

---
 CHANGELOG.md           | 4 ++++
 lib/utils/constants.js | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3976d440..e901dd2e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,10 @@ This project tries to adhere to [Semantic Versioning](http://semver.org/). In pr
 
 ## BETA
 
+### Added
+
+- Support for ZigBee button with UIID `7000`
+
 ### Changed
 
 - Added plugin display name
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 7a2660fd..74259833 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -333,7 +333,7 @@ export default {
     camera: [87],
     rfBridge: [28, 98],
     zbBridge: [66, 128, 168], // 128 not technically Zigbee, but same data structure
-    zbSwitchStateless: [1000],
+    zbSwitchStateless: [1000, 7000],
     zbLightDimmer: [1257],
     zbLightCCT: [1258],
     zbLightRGBCCT: [3258],
@@ -515,6 +515,7 @@ export default {
     4256: 4, // "ZIGBEE_SWITCH_4"
     5000: 1, // Custom uiid for groups
     5026: 1, // Zigbee Smoke Sensor
+    7000: 1, // Zigbee Button?
     7002: 1, // Zigbee Human Body Sensor_Support OTA
     7003: 1, // Zigbee Door Magnet_Support OTA
     7004: 1, // Zigbee Single-Channel Switch ­_Support OTA

From 8ba4063090379add705336218599d0a96f81a9f2 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Wed, 1 Nov 2023 19:22:22 +0000
Subject: [PATCH 3162/3183] 12.0.1-beta.3

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b63ecf9b..7100aead 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "12.0.1-beta.2",
+  "version": "12.0.1-beta.3",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "12.0.1-beta.2",
+      "version": "12.0.1-beta.3",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 17047acf..07c0f311 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "homebridge-ewelink",
   "displayName": "Homebridge eWeLink",
   "alias": "eWeLink",
-  "version": "12.0.1-beta.2",
+  "version": "12.0.1-beta.3",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From 5e938b8690aadf751db9618d6a9f7b8a5a22115b Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Wed, 22 Nov 2023 21:12:42 +0000
Subject: [PATCH 3163/3183] model 209 lan

---
 lib/utils/constants.js |  4 ++--
 package-lock.json      | 48 +++++++++++++++++++++---------------------
 package.json           |  6 +++---
 3 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 74259833..469b90c2 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -283,8 +283,8 @@ export default {
       210,
       211,
     ],
-    switchSingle: [1, 6, 14, 24, 27, 209, 1009, 1256, 7004],
-    switchSCM: [77, 78, 81, 107, 112, 138, 160, 191],
+    switchSingle: [1, 6, 14, 24, 27, 1009, 1256, 7004],
+    switchSCM: [77, 78, 81, 107, 112, 138, 160, 191, 209],
     switchSCMPower: [182, 190],
     switchSinglePower: [5, 32],
     switchMulti: [
diff --git a/package-lock.json b/package-lock.json
index 7100aead..fca227cb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -28,14 +28,14 @@
       "license": "MIT",
       "dependencies": {
         "@homebridge/plugin-ui-utils": "^1.0.0",
-        "axios": "^1.6.0",
+        "axios": "^1.6.2",
         "node-persist": "^3.1.0",
         "p-queue": "^7.4.1",
         "websocket-as-promised": "^2.0.1",
         "ws": "^8.14.2"
       },
       "devDependencies": {
-        "eslint": "^8.52.0",
+        "eslint": "^8.54.0",
         "eslint-config-airbnb-base": "^15.0.0",
         "eslint-plugin-import": "^2.29.0",
         "eslint-plugin-import-newlines": "^1.3.4",
@@ -43,7 +43,7 @@
       },
       "engines": {
         "homebridge": "^1.6.0",
-        "node": "^18.18.2 || ^20.9.0"
+        "node": "^18.18.2 || ^20.10.0"
       }
     },
     "node_modules/@aashutoshrathi/word-wrap": {
@@ -80,9 +80,9 @@
       }
     },
     "node_modules/@eslint/eslintrc": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.2.tgz",
-      "integrity": "sha512-+wvgpDsrB1YqAMdEUCcnTlpfVBH7Vqn6A/NT3D8WVXFIaKMlErPIZT3oCIAVCOtarRpMtelZLqJeU3t7WY6X6g==",
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.3.tgz",
+      "integrity": "sha512-yZzuIG+jnVu6hNSzFEN07e8BxF3uAzYtQb6uDkaYZLo6oYZDCq454c5kB8zxnzfCYyP4MIuyBn10L0DqwujTmA==",
       "dev": true,
       "dependencies": {
         "ajv": "^6.12.4",
@@ -103,9 +103,9 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "8.52.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.52.0.tgz",
-      "integrity": "sha512-mjZVbpaeMZludF2fsWLD0Z9gCref1Tk4i9+wddjRvpUNqqcndPkBD09N/Mapey0b3jaXbLm2kICwFv2E64QinA==",
+      "version": "8.54.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.54.0.tgz",
+      "integrity": "sha512-ut5V+D+fOoWPgGGNj83GGjnntO39xDy6DWxO0wb7Jp3DcMX0TfIqdzHF85VTQkerdyGmuuMD9AKAo5KiNlf/AQ==",
       "dev": true,
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -386,9 +386,9 @@
       }
     },
     "node_modules/axios": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.0.tgz",
-      "integrity": "sha512-EZ1DYihju9pwVB+jg67ogm+Tmqc6JmhamRN6I4Zt8DfZu5lbcQGw3ozH9lFejSJgs/ibaef3A9PMXPLeefFGJg==",
+      "version": "1.6.2",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.2.tgz",
+      "integrity": "sha512-7i24Ri4pmDRfJTR7LDBhsOTtcm+9kjX5WiY1X3wIisx6G9So3pfMkEiU7emUBe46oceVImccTEM3k6C5dbVW8A==",
       "dependencies": {
         "follow-redirects": "^1.15.0",
         "form-data": "^4.0.0",
@@ -684,15 +684,15 @@
       }
     },
     "node_modules/eslint": {
-      "version": "8.52.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.52.0.tgz",
-      "integrity": "sha512-zh/JHnaixqHZsolRB/w9/02akBk9EPrOs9JwcTP2ek7yL5bVvXuRariiaAjjoJ5DvuwQ1WAE/HsMz+w17YgBCg==",
+      "version": "8.54.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.54.0.tgz",
+      "integrity": "sha512-NY0DfAkM8BIZDVl6PgSa1ttZbx3xHgJzSNJKYcQglem6CppHyMhRIQkBVSSMaSRnLhig3jsDbEzOjwCVt4AmmA==",
       "dev": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.6.1",
-        "@eslint/eslintrc": "^2.1.2",
-        "@eslint/js": "8.52.0",
+        "@eslint/eslintrc": "^2.1.3",
+        "@eslint/js": "8.54.0",
         "@humanwhocodes/config-array": "^0.11.13",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
@@ -1027,9 +1027,9 @@
       }
     },
     "node_modules/flat-cache": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.1.1.tgz",
-      "integrity": "sha512-/qM2b3LUIaIgviBQovTLvijfyOQXPtSRnRK26ksj2J7rzPIecePUIpJsZ4T02Qg+xiAEKIs5K8dsHEd+VaKa/Q==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz",
+      "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==",
       "dev": true,
       "dependencies": {
         "flatted": "^3.2.9",
@@ -1037,7 +1037,7 @@
         "rimraf": "^3.0.2"
       },
       "engines": {
-        "node": ">=12.0.0"
+        "node": "^10.12.0 || >=12.0.0"
       }
     },
     "node_modules/flatted": {
@@ -1308,9 +1308,9 @@
       }
     },
     "node_modules/ignore": {
-      "version": "5.2.4",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz",
-      "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==",
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.0.tgz",
+      "integrity": "sha512-g7dmpshy+gD7mh88OC9NwSGTKoc3kyLAZQRU1mt53Aw/vnvfXnbC+F/7F7QoYVKbV+KNvJx8wArewKy1vXMtlg==",
       "dev": true,
       "engines": {
         "node": ">= 4"
diff --git a/package.json b/package.json
index 07c0f311..d9ced20f 100644
--- a/package.json
+++ b/package.json
@@ -32,7 +32,7 @@
   },
   "engines": {
     "homebridge": "^1.6.0",
-    "node": "^18.18.2 || ^20.9.0"
+    "node": "^18.18.2 || ^20.10.0"
   },
   "repository": {
     "type": "git",
@@ -61,14 +61,14 @@
   ],
   "dependencies": {
     "@homebridge/plugin-ui-utils": "^1.0.0",
-    "axios": "^1.6.0",
+    "axios": "^1.6.2",
     "node-persist": "^3.1.0",
     "p-queue": "^7.4.1",
     "websocket-as-promised": "^2.0.1",
     "ws": "^8.14.2"
   },
   "devDependencies": {
-    "eslint": "^8.52.0",
+    "eslint": "^8.54.0",
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-plugin-import": "^2.29.0",
     "eslint-plugin-import-newlines": "^1.3.4",

From 331e7a1c83dad60d5565b1112ca294a6099f817a Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Wed, 22 Nov 2023 21:13:35 +0000
Subject: [PATCH 3164/3183] 12.0.1-beta.4

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index fca227cb..9226bb49 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "12.0.1-beta.3",
+  "version": "12.0.1-beta.4",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "12.0.1-beta.3",
+      "version": "12.0.1-beta.4",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index d9ced20f..67e9ec1f 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "homebridge-ewelink",
   "displayName": "Homebridge eWeLink",
   "alias": "eWeLink",
-  "version": "12.0.1-beta.3",
+  "version": "12.0.1-beta.4",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From 00ff278da07b31cd07e410d403a4b81552db3d6a Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Sun, 26 Nov 2023 13:44:57 +0000
Subject: [PATCH 3165/3183] icon

---
 icon.png     | Bin 0 -> 14319 bytes
 package.json |   1 +
 2 files changed, 1 insertion(+)
 create mode 100644 icon.png

diff --git a/icon.png b/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..ad213ec19dcc56401fc273b1bdda986eeaf63e83
GIT binary patch
literal 14319
zcmY*=WmFu^7VY5fuE90Hpuru2I|O$bED)T*VQ>f<B)Gdf!8N$MySoK{`R={%-uJ3j
z_1S%DpMC1|k6Np1b%(1ceMUnjMg{-?XtFYrYJaWyKLZi|@6~bphsIw6YbB;A1_0E=
zpuCvC{k^9!lTlLy0KjwrfIkEPc>3$|KLh|=fdIg<F#y1y0ss&=rnjmJ{+)nWXv<nE
zDgv1PVnhHO6gB|nFM|5p0Z_z%f7JdWfE*Obf3X@A!+$u?06?fU0QNr|-M{vqCi8dv
z6Z3BilMVGh#cb&Rvdyz${)hhwTMeia|7(yOWptbY02G{m1{C0DI^kb69cvA37i~oa
zelrJqRugjvQwvrPd&hsG0D>O;f1$mFiwT8?z1>%5eh(q4e=+#~;(y$1R22WBxY!C&
zX)CHwNH{oIQ1Gw<S%Fl-$P^S5f==d^{A!ZY{|WzlCqxBuadG5lV{><RXLaXfb#Ss`
zW9Q@JV*_%qad5EwWw1DVeswYNVEO7y{cn-~t0QUQZ02O`=wj{gmEs>=6H^CQ7a=OD
ze-iz-{d=7*)|UUv^ws%4W&JIX?VlMoc2*$Uf3^RH3jX8eS9Y?t_?!73ePMRNe=+|*
z-+%H5vi+0%|5?nxEB%-EZ>hq_f^7eNY{JMyhFb^#0Jo#8q?m>W)K~^m3hn1_2RCc4
zh8qi`AQ~5=JQzxna0eiw-XOFYM4JS{2S<o+*EL|vc5+uk*tXsv^1O0~u*fWI2kg-o
zucqi@L8q?i=@Ccd;+KXd%j4tvth}*yarkim9$9`^>HFGRbP(GymI~JV@q-BKZzm#3
z)yzN|QKxI!OIQ4!KJH0&^%7;o6w;C7z4%t}^O~4HWZZiPtq2ePlTaD{@WEJpL=nsG
zNZzA<NBR&UDxOZN?l82hIzg~L52~h<SkdIPk2D^E3p@KS%+lz>^Dpxv%cPqa?gtW#
zS$OA3TR%%!A>ohGzmel+8kk=2X&Q-hbh2zTt=yZ4Z!kU`6keom_+0p?8$IV`lzytp
z!)0xzBe{Pq$G>0G!!U8Agh*V<SqX^F%yy^lTJ6Y=M!ak-!*vr;;+_hEW!dc(H4-UG
zEszd(H(o+fP)Nqtl1`30Kki;1>?0c##Eyl6+sXIK?tpr>AtB9ZoOS%hlKgQSxUz62
zgxEn&Oc2M~o@LCXow{fhJ(X9Nf*ltYosZjGwYQu+Gl-g7Cz2<~^;DUD^`EE%_3k{w
zi+SiM*BXEg?<6x1>n{~c0+kyDU^tx7_Ko=1LaeY4i0}dBm=R426Rc5-B&HL;Q9yjF
z&r&eJ%i)->X97oUpYCq&4OL5T-7IJ?wepzud)AAMCx20#kIOS~&RG_p@P96>rXU<=
zjq1)!1ST4(#}K9&0?(w(V!W_rK+FWSP^*(cn8!U{q8<y;apSX2+#}`^N-U%9B>`iT
zrAikz<I1bNcRLf_ruX;n?VRbp7GJbulZ4&$G|yyF`r*vLQ14wAT=gh<m|!0K9!}p9
z()0Hh{l{zftY!Bt?u+3haMc*@FXyr4@>VtHoRkU6Ru^29R8-yXGNfR0?-B4wJ*))A
z?~<^LVEe^jO4Vu3(mP9DE^1;;_*~NOtTDFGZW3JxBP}Y7Cat+DbQV-a`I4S^yr!$z
zF*Z4glnHG69FJ<Cam8~Rg|oM=Hw^n{E{5LJ&LkuZKk@`R&PD}b<)~$RHX947f(B(&
zrV(;bk!x^h2ZzY@z(jk!(*TNa;sw#tvTm`Jc-}H@ohDmCg?!0AaRutAzJCpv!b0{g
zM1et;WJ+fCo1taEdLZzc>9g`TlPFn2#H%BjLnTGE09Ft@%k5|h+2<dCI925>5O*4}
z-cM{fze=my;bGb;0g;7YN0rAIB3$_6eo}m=oer9w5(qtAk}auB@B@(p-KM;^H^FF~
zuV)(*4_TL9m`l3FCBG~fntt<i0$_d)__V|#{V?UhRYaUp350~+*Z>y<oyR0o%%+t>
zrKXDb1LRw=z_Suhv+CswOwOiC?UL<}#o!^iT#HWK3WYBYm3$&CUcLuH7liM(t{WH2
z*T>f{uUYAu-$<#!D1{@V$tZz0Y7-y@s;K!8_w_e|#~iCRMKj1L+AbSG$ni&c5Se}j
z(yd)P9{wTPw(!r;E*Ut3nV{*$=OcXSe98QX`Bu<rywjv@PR6>^Y<nLRTZUPcPBBky
zu#;bh!;ZY1mEry7Y{i8qg`KA>E$JUdaf)tofwnK3^Bk7Ay^}-*)d!UWg?|%o+`!Ox
zbZBNw7qb)?_6Eb5@>3EnhZ^tG5UN<GsAh7kOgD33I}8&}-=CIr1QX9HJegSH(TeF1
z4<|A<cEA0Zq~L6v)c$RLQ{X*u*f>oz@qTpL^k(;&_uVG7ifjZDC>p_UdckX}$9LLX
z(7JWD@uu7&c83ZHU_9v?a#gVrlHRkd8L_d`u`CyI9cqi)k70&ct||A$h;BZ>yTkq&
zJ}!zCF)QY$h2YXmAH^~j9IQ~O^4k@|NN3S|>fxZ{S;RfK&PWXvL6Kow1w@JYXoLM5
zZb75xe&P#J7fNr@I|irvJm>d}k9@{Co$(8sWT_KX62V9Y*tk4ind|vCay2DA>WSF}
zIhCro_Hc?SrflJ6WW53tF?t+1#YMQxd-@Z<X&WSdebw=}9MR-cSpxq0;KH(;*(9ca
zgQ~ysa(Q&Y37xHg>|EXlB(a<{Kdlxs!nCp&+21t;V?b-VGty5mTX|}oYhzW_3ERkW
zuGOnWe}jD6W6YsW7;8ALi?;JTOz$px8}Y+$m0olt*NQL+;wxiK2^dMgH~3TQzBl|z
zFX?c+h>Is{n)R#T^%hWx1;FXN;v4(4tEp)7LZPE`6uQr4B6;qp`kHjTD?&DOh%K&=
zTom7WsvasrU1eMPg9W3_ZTBv#RnYF;jyv7QQ?_{z1}jaC*Zj}i2cNHvv(EN){4mTw
zi@`)t+Ab#e*S1~Cz?7aNbBiTKM&gZ|3?<68)~HlU0<eYjnDKWZ&IA|?ffm{n*8vvX
zYNumHR*>NkXjPylSr$&>UFTW7ewT9%Ju0y~T%!3wqr&j=h^DvRhng-MeV%ibf{pV<
z0WV7HxjbiPU$s9|JTsc)XF8cmO3}azq*hRcSjD@ni6(}=C8kArjSa1`FgAzqr-KN$
zWuzrT^;GE?PhEfJK~&r0K6CH+2d&<HEBR2o1~PE}9f4)!4`%Zf28KpbpIj4=UehT$
zrwbUFE~k{;taV<OXDe{w7FT1_-}1=$m_3n}GG*OK7?nXcsg~wy>)Tr}`XvYb6sdst
zf)KP=O+2Z9^V!3hxhPoN_c?F;p|8g&Li_eBxBxk^M;t8!6(u;@%3%cm*Dpyl>DMsh
zMzdV6oJS#38U;AQ==4~l5mzs>=0Sz7Sczk?DCR_J)y`kcR_yc#>fTPLotut=qCx2U
z60UdHhm?87J2Gl=^q||`VVam?6dw;;25Ogt&vFrcY4=8qB5|gvl?SEj=^uRWqlx!z
zfGgaNIw(4%d)~cQ{-lBM=B4<(N5kpZ38@hj4D_=n`4ivt!{gS4@6fTMnVH+5U{a=f
zWAkJ+oL9RfzsVG$@^e}yQcwga>&#nAdvQ@KT`w=0b+5zX?@+6nC!sr{Z)1JSz1xI}
zn#q=rx69q9E6A+uIV576eC^x|t$h7$9dVMiqD#SXy6fn<i)516?@H&-^)m#>V_XWd
zC1GdAycA>`w$d=1Y5``qphSy4U(SZOM7vAxpeHkI|0$l}_MB9WEl1%%Z{CKu`iDY)
z3;Bw!d>en;e&Fl|m5Pu^CwEtaj2H~qZ$k%vK*~IPr?PK_wf(IT!aC>5m-S)MC9YLL
z)&QY^ukcFZjz#-`(E4{`mv|Q#$Gn%z)P%*;7)DptTs##&qQ8S5KpXi)nn>Rb$c2hR
zU<E{;7aj}rzLMI~bq4OVDT#t_wCb4+M5y~VKQh5jS44O?j<(|xeOd;YK`UpXT=kE7
z{xEuLk9K<cHDR?UZ{s*y1HBvq?Lt6lY)z3hN1@pK>R4z)1mgmeGb>i7{edX)1_8&!
zNmj^0Wn#@cAnh6$1cezbev<mxIPjX^Yf~i#zais#c5jfd(rYt&iClG){TmC_tl&<V
zh<+a!aTWGs-)6Vw{(8Zlcu)7%VUlrSL4KVLi8z#Jna+Z^w6DZtzP!?~6^cO-<7Gb#
z`3KEF6-2W}v~B>^v_L__aUvZlmYuO$vV~^S7oB~@2V6+tBgbm1Gzk`Tf;<EuL_;V}
zlqc^wFK0oazb`Tw?jGzpHKc%Y@(hgWYj%`Dmo3^X>TXb*ws?)~F*%h5haUcx7vFU0
z#>^x-oj2E+ia<h=e%$shEFnzRdV*IPvx?YLWpPoVCRUZGe*3V@ViGEh)&`<O3$AW1
zB<J=Czr5=$pt-}00L2JN)p;yR?tD}!;T+vv9)xC6jp3Nww+Y!-Z)9DotJ9jn1l)pi
zKeF<+=hCRdpyqb=wJ^Z9jWY@#5CKUzno{&ZEW1A&5$9=7x_RLg)O3a;tI@45L?zTF
zk|QY9OQTAIADwRNzkDVTb9sa7!0pD*7lp^-0!iOvThjdz_+t2(^)A4y(Y^Jnfb`+$
zra0yv#O|EWm`O)p;<I9um9d42g;YX7{DC3*-qt!!<T7v$XM#_q^^V4v&#si><+w-u
zw=HAo=UXir#LPTIUer^6KHizh<ti;!6u7nSURNqxdc<AK<*M}nx&T;nJG;#%ZCGf#
z-%e<iGG<7B3UDS?tUv9KD19l&;nw8&sWF;DlRcGcXgIc+4=^hfWGAPHm6Cl5>P;tu
z_UH}|j2gME`NK_-OkQV`L&a{bZMK^Nt~{@Mj8eeEpPZTgaZv6H&lp5_1B)rni^DuG
z((IP26<U3b^k>TSRKP85(_CjQgAXbi1|!@FJ<HpzS)sHW^yx*?WdIeK$x}yUaP>zg
z?q`bcq1cu-u)I(WwbLd}r1Y#p`wsxK+yO>s|5<H?1^;`AGopnCg2p;u;}Cj3{EJuC
zcne76G1OQ-fqh;?^$}{wq<~-nE6WJwqw{!T4*4JMb8Cg+rB#?k8p1xPge}$}$0r?C
z;?Jt1*moH@Oki_aU^X>>2A2D6Yp&>bLPKN$*EJi`L<tVHxZELHE4A<kUZx<pGp81=
z%rdSpYg`^;HIU#$atVCjwTcy@6=%>Va=ID>lo9dFH$5WJ{Dj_n!Qt)N?ZRp5OGm-U
z!|I&i03vk=$#8Z!^;CkLivPXXX$|xb#D3TV#P6G^_Vtl4`%v^8ar2kAi}4aU29OA8
zr>O!28?m$Tm|J`rShRSqKz-jfEhl+5{;S0V&L}S~H_065`bc<H^k(*Q%(2)p<2yi|
zv4u<Y$TG`5hjbUf*ojyDn_^A7Liz26jN~`OjUb!^>wChS-?*5?g7fBoa*RS}zLf*p
zg@HMpthq%8oH@!|37eY2WGe;Ps<Hff<PV=?4^0XUW@}i(5))|ryCgv%j)gyG)?zBy
zA%9Mjkf?g{usmGu^+i_eWX0tyZ!jP|g61k-20q(_@*kGinsX*-u~-J;ZN1DV`IGTo
zt{BXA>>mQtsn(k6CF7HE@QEZP7~$CYuSh0ZuTl2sUaC>j;&hh^vKs0c(FWU+`}V?7
zwFA570-HyCSw<;<>?Mf7uxLritH87mT9~mdh(Y|{stgSjYy{0H6yubmd+COYPEwS}
z8t3B(vdKJ3Qj8y2lCC}IxLm|I=@?V2Lq4sBO~+)Id78mLH0l|^V2}3EMC075cl-(m
zRT-3VM<EFIwq@JX7^@@;pr6kmP2_cA_X0s>QmS(WA0=5W%h0qCEX6(v?1gfD<I;wn
zXSNFRM7$vY+X}pJRo=Sh)9zV_QQx^<o_f%M0^dAaj@pp|9-EaYHEhZ`M`Gy~SHeYM
zh`fD5;rqr%lFW9F0_9(s;=e!3fzqG|AGkA&6B&bs{Ykc`E8O}wiNsoS^?M^CfavV-
zk56z3Reanw>Bjkr6;$|k&KY9lg#+cTZ>3zz@idn+5;2%zUyN=(P8RCd|F}OG8=F>)
zqz}#cIXD??CG`zd=nlLPCA>ve9#B~0v^Kw+bZ5R^J>hUqNzxHpNu6N$Y1Y$w>j;<_
zHHBXAgbhmB!<Js)PeTe@@6rxRts|obOU9fg6S%3+p{1WF;ub8#fvO6qi!U_iy`;N&
zfwap3vEpDtM9gq`Jvjxu=sq-y<PXbAxv14T1V?d8#=e+v2+kE@?Do<D+*IA>PzVW-
zLIG~NC`lP|{?P8`rt#H!|N7^3FqWq%6zf9sq>lkd3Gs{lL;kgFq7F-g2xlwVq0Nu)
zlpiK1ZG_C*9YGXPmR%6W0o1jfi0i06KycUMzJm$6P&WF6HEx{;7<OOL&cJfTgag)7
zjr*o&(tDq@OZ3pg9AEKA_Rct_#kC4v@l0lR0s|L0p%4*{9NeL7X~UNqFXkj)@vS0C
zPtZYiu_<TLw(O);0B3$S><$rqigG@jbZ_cs%nhnd8EZ}n{=uKK-%DP}NoVP=qG0O!
zu<E;xELlU=@=|-#<Cckr(Fxb#!kIm;H(`4drTR;{r@nvSRd&~H5~aut$;;rvmo}+F
z+H_6RnLO{~xshxk^8D6T9>krC-Y%MaqI6~vur&%J+|!*vWpsG9CU#gK%*de$Pe^)O
z+}4PXMLWP~e8R+P1@^@2@qc%ra|x56T<YIE`1yx27XE4-0nY>$t>+e%*(rRVNOVsf
zUznnt5h)0c4&Hkd4aobQyTHUBC4G15+c7UPvMV*|0NVgNDJ-ZFe2)`6GlM6=4LM|Q
zM<nR)9xD`5{t_`0MEGj(1tSNo(x)C-ch6!O-ljfoT_VT?eLwsg^i3b{77nMepyrT?
z1Ob<0j58Ekist&flX{~J%pOBACya>09tRS)lv+%qmF(8-o$2e23zVIqcktI~6F6}`
zc=5)QB7-mW=q%!SQAqp~a+r2DVV+np_UDNnrRW6pKJu0d#H4qh9;3yJ3?aF|2!N(5
zz^fwBH!581a|5^CKFzpxWKsAdM5mm-82fHCzvQ#YG{Xp#Z|0SR&aeG9UK-;(-f|h}
zw3A+Bn(gRc-8*;FY_Qa*f|NYXCJCuOetGIL5mkYr6g-NH0n2|dNs|C9vnZ}fFI3k2
z^tD_if~wObnEkpVNIz5bV9JM?L^OgstnYC3UBS>?JHmOqIL@vsv=SGhOEPq@-$KDi
zaO_5%mEMU8B6ZN8Uvcny%c>YLG0nbTT6zm_;VJ6fMj5h~40!S(+S4a_(H*rP|6Dn6
zb(dM4ZN8Zv3%)!}h}_EG5?@@*YWl&sk3&-dULH7o1zQ~sU4cD}m07&4tb|tmRJLPN
z1uMQ-!Vg5qgXVRSbeDF8OxyW;E|{%)-x%GtY$?V#Qlo-=p2Z34&CsOpN?|jpumTFV
z84yur&g=~$zu#NUT6n`16=}jjb8rQw3JPEm80hTHh+g24GmCd?QGZoIeMyDf|Iy}r
z`K2DQ_2Y|csF7fvfE_vGa*{gNyqbVNO_~*IYbY-K<I?%#CELRoMC85Zp3)ZH_sKsO
zz(l{!`m+hq?kIVm^(Sis9Mm+q<yD7s@R(;?liKhn0wZn3oF<hi|CDYXa-690fNog=
zU2)Gv=F)B>x5pV@FrBq#z-Em`pUlg{?V?!O60Ra@lwl4PT^Ot(q}1qK^`872Ohv~_
zpSZ_D6-MYm`ij{V9SR|`tU-FI&Ms>}EIjO7BQd_$(ZHKH@3&&Y#>@p0!{<QVKg$L<
zTkh``!>w13$G!+~F-&Jjv4~>|$%vM&=<vWH78DU2<u45T^mWMfUpIw*^z{)DAsO^t
z>I0i^?vK+p^VF@USFE+q*6AnTyi-L{YcjhIeV1%4o2^X`i9p9<_69XN*G!Vxe9K@O
zfeqvb<@z23BQ8weSI;1m=1&fK@&_~utwfiXzPxP5O$N?c`Ma3|95Yt7Os-1gEFn!_
zS1>D^i`l#{%Mg0*9!7&%s9S)HyOSG?P!X{&h-;Z7KYCd*9k}pQkyt!JtgE6lRU&>p
zquSv_DJV(_g+x1Cy*^7-<LYpBQxC0>MoR4tt7|D>ZljqHz;4-2*ESx7gyZ@;PiJcL
z-JwtoL}b}^t*?wiF4|npJVqiv&&|~G$eODnI|oQZ?Z{wrsU_F3?8#MI*`Fi(xvuSB
zZY86Y(z70pB`=aBO=VC((WjwmKO8Kl<W^3VT}3rA+p-4)8A|f$Z~3UB<!u}=d^L5%
zMSR96^_d++C1X`Z_x5mZ)Tr><teKgCg?4Hqe=#v+gb7C(3?SjKm@c5K#WB3b9O!kf
za4c#4-QL;GCup=EOfGhbsfSd#6PFFOHQKFD*>OG`cUkbs4pD$B<r1H{uwF<kEBe!@
za{dxmrd#coh=oH;OeEp}<y`d9ZR4UX-)J+*4~{bipv2yvQNN+9ACOZLFGQiG(CBWj
z@Q|2`Z1?3yHxwvFTbJ~Ks|M9yk-Ea7f{E8+<K;l2^pc73@eq1$Uc>C*0+Mxaao*=X
zRxiBnhULxjE11%Iv*_)6#KlPgdbVS!&czQMZfhV94{?~fuv1BT&rM??VWQ0P3T@cl
zih~+MH9d>erY?+hO2=q<pk1LcS(ut&5SupozJNC2D9J@+J^ipczVFJSf)ANTS@Vq!
zW1D?TO)!}d6s4}ljHngcgg=Yy{TWlIwLqG5>3JfLliz7;^j4IjL7{9UxrUx+XRswz
z4GnRCmwk>)MtF3b$9j(aebfgT^MlbSh*N*vQ*V(WJFeSrZ!{Z-OT|NvxYd~%aKD1}
zc-pcYnjE8f*{inKAD$ubBlu-eU&5Bf6-65y<D{)k+{p3m;w~FXn^$1uz80%Bj)EpH
zmTXFZu)Rd*qd!segY8{(fEQLA1x|7<6c<xQ^Tn5BKXW@u@2%yn%TaY^;=}sKF6JT>
z`UOnc3kiS)A0{x-r}7uZTn`R{tx57Yh!T+*{5{q*1HCK$qw%P$SJe_f?z)$b@?z!V
zcs67;+)x3ghG*t2Ul>O4OoEcnOI)TzFNk2o!n`NwusrR0n*1kfM!unEG4;<*&`x0g
zl7E0d(BX3a$n=!LXjSV{-PGh6DIB>iMb<sUIBhAu3c-UH1cx|-l<gzlY+$*K(R2?f
zV?F;=SWb&d9Cm+T4&!!S6)fPc5GwE?6Xiir2Sa3%(0>p*x8gdLZJq>2Z{p+My=DeS
zX<a4i*IYj=eDA$E8l5_+=Z+@z*86D+M$8G`>DO<B^07+w5@0Ksl8ZB{_%UWYM`Ue{
z0M*72acRA6zMfu$ogi*rL0&ck)B&)JK@VrI4TATcJ>cAaB|cLur~<2mJZstXi-fS8
zrhz8rAH!LNZK(jnLMnS$@i5)wNC>~ZxP2xHd)y~|VRP8)Cs_nv9X!YsZIz{h;fP{W
zOz=jFk8UZGEc5j;y`>%Qb~*ax`6NRB`DEcj=lfOq%gohf_sCPv$eu99Z)vkmB9Ubr
z9S^BAc$BSnHd53DZ#%z5u2Lilc>W(C6npcpJ>GrX_-FkM_l;Ch#qA}-CGx{@K(j-v
ztdvsR7qng84l#?)a!et(OmXTn7$le$N*F{TSU-~d&{+?!7U_a-ioYP;`nCB~C<1_e
zo(%9@DMDZUL#HD}dTR}h^pHBhEEM7?DnPz0MBsa}qa3o5Sscn4a>p9Nv$b=Av&_*!
zE0dCfKCFS~wS=>Re9>$n=xzUO_vd864z&m+xxHZpir|l}>8<m`1sa=xGl#c{gHSqC
za2#qfZE^m=Cj8A4X;i2QB4S8RSo+X~za`N}JoYzWHRn|MaYmYNs;Iu+vGe9w9BPa)
zCs&^=W7uh&pfrTCq!tg3@y6fEg+<xJq}d`PtjA!Wz4dr|T}G(lFm@4DOyWaAc<a-X
z&=yb0X)wp<>)3`HJ=Uz00yoKR%@6BDbuQgEIzo9bEF88gl^bN_Yew82*$&DoqM*>p
z-?o|5t+4vvvzk0>cr}k`A&LrH*wZr!;>$`c;}yEF4IW#-99so5Dt4}_7)L&TIQ>TB
zhMU>#3Cumjk|>7iBGJH3V8;2O1*t&YRp{KJ2yZ8II+rfTL^&ChML_ueSn1Zq^J>Rs
z82tK;x!XM@RDoM_QtH#yLE=WP*mYd0<)4{})4Crrw;|Gv^eGW4zFXyAgY}$D#NB3b
zD=V^ld1j{Wqx1+5EcgY_Q{eb!DII?=aukYv2v(p!q|R;;)U!;9z<*bkQ)gLj{Vh{F
zmASWRYO?wXpDEM*YZJ>wBXx8E?C0oQ_tmGo@XLvZu~2zDO!K2Aqfwgqg03?YjA7Nx
zOu1JQcMUYds81F7<G8Xe4x|i_4c=eOr)nAtM(5vJdDU^~Qb@{cg1|?RN5gH&r=h1x
zs8FXOuZ)G=IR|kKc_o+?|3skjX*l#J?44yO$Cy`m$JV7)`6&y+Ivyx<Z|$j{u;dC}
zFQP2^UN<TJRy`SzjhQZu^RRf>Udu)I4SuXlKa;G}POWFy+Kf~N8QIL$dCvN!hwrJe
z7X)*YOO#XOxy{z<iYsF@Wp^32u7E^yC=3ldlWX^LPgv5-IRA-ItmZ5(*zn|FzMSOA
zcA4gUuJ6cP$hnibF1gPlx$9TcijTnj2Gmgry*O?C)GlM8H+lyVlc_Y>UjAiUVmorW
zXdSc`M-hqh+KQ;DY)$Ml3q>-Fk-Y9QT!Sx-aWpAy^JsRU;Lrr(FBCBJfgJkOiRB#+
z&i({${z`PvCTPpVsl1N>n=ly^#AE)9Reb{njPUB-z+u%6p*SfYVPl^1FCXSNWxeKl
z*MnkGaJk$??Qi|P^7J>Y?k#$uS{xxF`2x(?cS8f-j?p$fqJKE5&JQMjv{%9^O2{J8
zj=!0Cz#{Za$^$PUkRDy-sWMVkieVbNfU?LWU`Q9QZFMn%sDKz9rqIa@F&qS^ORE$5
zEkcsD9rf9-P2Fq4J~W20e@#%aZXxT`7NX9z5a+5F*A}gf(iwtql?M}L5ch$ZsnJ4P
zPctTFA5$=Y=<pMcXkfymd@2zi0}B$ZZv}L^ZbBSa^?)k3i#W-p?qz{cg=It(mKt>j
z^q_|X^}L*D{`i&fd>^AX5YK{y5|!or&}k0V9+4&kMB<fTvUp8@q;~c505SWs_~)JW
zgJ}tL#&b9p8l@C(QY7ILa!o@asl8e|1^;*4?>R7v5#_oc{k4LA-^73BXZ!*X{d#>f
zd88Kb&Q@7|72glY0a>@O3eXL273M~b^CCNq!6R8-+nkpokyE0UqXu~p4?rMO!ZDG5
z%m@1X_L(xT?ZEdIk_t)$C@^wBq7S4r1CCWwZiZlZ<lo2X9?N2-87LnH^)IjI5##hP
z*`|I$U`wYg-DcRN>66Iyb^{#ws<@wp>t@Yt8|FS=qHcH1h*|B(%K+Qeh4K_F5I1mX
zL#c8SN}rHS4p}?&V+V3=NAbdz!B=XGP`!=1$FtJ~@s>=}RTBl|LIuenCc2U3Y}=GM
z#woX9Pt((!vt6j(ZG&rZ#$=`0Y|`<bSa@r_tT?Xb!RP^JI6E()P%+{C5n+j3d)eDQ
z^Cr0LWO{g0rptUX3Q7X$Y<9)wYM*boI!L{g;-rwOVJtR}wuzpSm?K#f>UL=f67=6x
z?C(@LdfEtWO6#WuCBodsW<i`O)9W~=(Huh6-$cDBuSb|M%b4m+u0Jf%ZDoI#DxbyS
zCb8nwK`qr`$J4eKJ!o-7#R66qS76AY`!4A?-g*W)zAj)u*xo$o?2>RqDQcW^!{0`$
z_`I&Id@l}MmRwR(CNA<K^uIIB=M~Ej!Y25*qd|)iv2(YTfpp7sM++?L9SBjoU~#R4
zqjroeyLM}u-MQE@EH(M~d!UE;*#-Ux254|_K#u61oVPTLP)sJeTPy0^YvU682hY{s
z*PO)J+YaW3fF(&6suskx9C0h($K)Fiifr9W2X6{qzLwZ<MCCIta|;1N>CQ~1+&~8`
zZ1eJ_ME8Kf2{#Xz5N^xr-<HnYH5d;`+1pceIEZV*;P7m0et@S!Btd44#{jgQmdtZu
zd-UbkJ8V;F%sNvBRrs~{)MY{fc#Ne_W1naJ=O}*x@KtFE%J#fk<}wGp<L0sGm8V?9
zN%bWN&Wcz(4BB>a+#gO#-gZbY3#dEhqf@sn{0QLj;Y?IMWI~_FB)B3WLLuKzu-?I#
zoiU^7>z!YJC|9Z?{AD!KsLY^bfm4c(D@tgP;-hi#t65-Gq!Nyln>?T=e-0g-EwZzW
zaUH)!aZ971&?}dG^OSz)HwPJ_g_TH?MLkT>1Qiuk?}b?biG%waEbMC5_`u&&O&3Hq
z?rPZ~wOF%Q?>|M$YyCHgVqL6%r!vSvZ5!JuC%vnn&x&}1c(5@!lL%_DvG&UhvnReY
zV*ZB6oM;rLZl1dU`fgh8A?(JzcX{zWKFT~jX8af@>sy|DRVP*x4k9<{EumiOKys6?
z&d3NEws15_&@mCV^s)jas*mXq#Jygq_ef5X!UQo+$|DCTyZXRzD(Z09XA3VgAL;Ni
zq`(W*F+#rO^WQ~{Yo4cfU<lST5+WwotYSi@v%O+;v2RG)P(v@wqDZ*vN<i7-Kf`)E
zJ(2E_$CY2{aG(^-ZE$AsTKqn=$Gy-2Q;BOh+{{HuC%iudZYKPSvkO7G>>rIk>{e(2
z&YCQ&k%w;hHnPL!0zy=#QK1>%+>=v|{JKA)0dA^QcYb5sbM<tdr68@a62+eF;q5}M
zHB4Tdliah4Eas}(3h)}&syEUDQD`PhEgwO&mr2@`W12oGwAgkJZD;ApL(e-0?xF5&
z<`RUOq-V7#UcE8oKasLJ%s9MHq1ru)A7@*1jiJ8dizj!>$C)LogxBVrrI0O;bUVQ`
zyIMzt4fgZ<1W*{ogL0#Zj)|fu2PFvo$M1wM&fZn=Ypb$Z9+7)0Hfh4xExw&C424@c
zOhSlVROHLpI*PwQM|F50q^4wp`j+T_^o}$o_NEVHItc4xnAw~*!#0YALgzPbDb?_q
z4O0^X25$MlhGZUFNWqr@$rzyvZ^L2RUy1b-7<zRA-GgCo%B+r+KgxM_ym$za&e~$|
z3G+;b$L14BcUCSfR@Wm$IY<ozGi7qV0p*)m#KSWvvdGQMLNaF}G1u8?-V8Mxb<$oI
zM)yTlJJc@((ly3e>g#osHaHXJWvC~Svyvz2gn!1IIV`{;62*(2tJ^()Fyg^AbbqWS
zY<QAJ2!r=cPU)h07ZS-r+Gzi>;!j={TvhEzJ7Z=e&)k5sC#6f~eLqy-xRiA6IF*V=
zqOkN0+VC(!m!(ysgJGbi^|5Qb<+4D4zJ~>4ER>#WK!(-!J`rmli%a4Cn{%p!V<Zp^
zm+-3DYGBUqan<t&ljw1flDoE`!`sYs0U=2NA614He>1fI@DMcu$PR3mUyW3=)$hw-
zfq6?a;=^U-Z?_}aOIgT&1+z^ojV2SbUYeXFtvi<7>({`ASBN1Z1*pOY8xIPuaHi5<
z9tWbVlmzpo$SB}?g_XE(G3JVWbvrL?-x6w44z8=eFH_`Z#_p+q3^h*k*X(H$2!}<<
z!D-;mIa!K_F3t?QP!sYK33(c%rZut+=b3~O2S94ZLMlt;sr{q->~e$Rtf8AN+3-W&
zFzO#ScN~P+qwcLgho}51Re`1EVE>8GfhVHENaSolhBN^THHkwt>GB|4XN(&emm22W
zX+JAU*b;JA2<GI<1Sb7`<4qWoFSC}$>Bx4!Tw`g%oGn0ocKCY^g;xIK@^x(|)x3oB
zJ{5<jC{C30%NR#v8BE#)4p&GFbP9<bZSuRZ_4w4y#km9I{pqM3nQ;&e1Ozp}>cgw|
zmOOogqmaZ6;C$%NLdRif(t;*fF}?6~;nBak@-Y!bM~IjXhrR|3`YS>6tmBC*cS3D4
z=z#a?ywB}*F5(@H_2~b=-^%!6OP=mFdHU*JiNX_u;k{falRl;d9t93674Pi&>f<&3
zPJS(RgS=eP-!J;IK@js$^9jx!3x&DrKZN2yXJ;e)#2Sbp&qPZ0_HdYd6R>amjx&jV
z7)5?Hqk!+q*Y(5DEf~LtJ}T?#`L4Wpy2>o~VFw}L{ZD?dbmLsH@)d$xfnTJ49XvA3
zv{gx5uwPgZh%VAw8{UM`R!8l5mtB^DIP86^`|+|7;{sXWUV{a{k8>boCp8<vgdml0
zSl?G-C5pA(*I_Zc@OCJD(ssq#<z<#ue|taFyJKn(MdMZ<9M$edQ3uP0NvIU`nX9=;
zakKOnG5Mf-igV$d#_s~vtXMscx}pLy3@TJ&7O4&?+?Q+Qt8EF3TWkFQLbfc8I-EeW
zqAk8<4ad6qYPLUJm6!bj=&6HhIhk^lDS1E8T(TR0!PZbg=VH-|7oDC)i}!IpTe$We
zrYOg{J^t`&{3*oF+idnbQWR|r{IEUQ6|*}XmEi~$zd!!O6u6-h*BfM;$&_Z{Iw*2K
zK!`-aU<TdwL<uAQ-KrtoxZX5`qnSpCkQ`vV3TIV74XA1aFEHm5=na27c0~@x@GTr>
z3r!>w-9h7Uw`YdwTf2@wVR?X+E%Us%gmv?e47scCzN6`3NW^>ycO1j-?G98gdrfpb
z2G1v3-b;-3J)hE*{E)*8;xUw#Evk%*Ft4KYv>s1k(kAoY4Iu|K;BcP^{e|Wc$bo(N
z9kiCsnh5ML#}i5K-2Uof-lLZNai-k&itj_<O#kH`+|m>v5?X+08~Q0-Oql<6TzMl2
zOb({5nDK%2!=s3h8rr+d`}*ZiXZfw4R(CQ$i%85mbGu*q8u)2QcFOfJV)z`t2Og{x
zR$815tAL{r<#i#Pj?Q0|J|@T)BWL?~Ze=@w<#EB@St``$JWlA-!!9UwosGtfPpuDD
z=pkOlm%2vE*RkLz>PE{-t25WObK(OnI-}q9HqJ51e(xb`k3$9z4s6lsP7G<xsK-^O
z+6UEV%%+%?Y)Ao)Lny5Gg+D558cqjms~Rc-(Y8wlt?HEz+L3&+E^uPBdg&Wa*tAFT
z+u!m{n`II@)IXz`h~A*VYor5g8;-GQ2lPl5A_WlWNwxyk8XO;R<}NjZZK?zCTIvrN
zlek%E+P(rhl)}ArbD1)X?&dk^Amx{-a4K-a?s9azc&4Y<!OS<a@xf(EuJfZoJ4=CY
zljD8u4TGJ|z|QBwjSW6<H=g?m8?g~92^|4%0;R8%gRu(r{lspl`Gp#8{b#KS6D|v|
zoOhwa9;&b+ENXY*%|V<ZaIN+V+OgLxLdg2E2?@y{Tm{P@Qj&JAW(XPw9@A!Xd<d08
zxSOzoe8odb_50t|l}<Bzs5h3A%Vs`EZekW~YdV;EG8oy}(}S=uW}rv$v%t{kmMDKd
z{{TWgo#3J*D6bbjp;;a~JL5ceE~yhW>rX`C(<ceFkP6vg?IUe17F|pFr?KXCYqlSp
z-2^v;1zO@n)uVJ|{k$b64zldwHQx-s7L-t$G$1gkO}}Raw?-KiP0SXsA7aZ_@luTr
zcT2pPPNO-K6AdsF_aoRENaF0#Zo-{hY2(7SoztLX3?227H!RWH#;m^i%$e!Xp_+p~
z-#?^#bj#ljMm_6Rz`1E#Pm>g2IC3F$R~rXkkPD@U5jA0%A_`X~6BZFcUB-X+h7qWn
zqydhgU;hzAwrEyDL0#682O63$X$Js77_MZW?wSW~7qcwnL^ikhv6BKNe-ZhWUUzKH
zJ*n5Fvbb95)rAWCUCubP%KF7L$FdkXDxP<JdSBRyZW&6uU2sc@<{HGaHNNa?cllGZ
zP|YadOS2IdA5;CO?L#!R*mPX1#gFg37`!<Mt&i!roL|#1inm2YCqaf}e_STg`WXh|
zCT*cHNn=a_!y0Lkcl7L^l5Mq$%I1Vb9-~T+EaGdVE2oCP+$Kldw45u(Xz*k?yV4n*
zrcKj3)WgvQWtekE$zlsZiRT(?nOayUJi-|g{6vIdP?m_vuVJSAAUwF$t9}1?^}x57
zve^zT7OTQB(BD7iKb+^j`SaJdPIvDM0DaAjF_}@cK7g3uX#GTq<xStPkx#&FCm`nK
zIp)ZrjG$LyBYojhMB~CR!Hcxp#lrh`+(6%Y=fr-!tI>_LAYv>w2XA&bL5-i6&zIBz
z(1CaaK(JcXQ{Hanb^@x02A%$g4OwYncKQ3X39WFbl+~j^>l;55FBZJGzprqL*)J{}
z;@s4@9x^zwu7NpPzRX@e*hEDY?z>ROn~KLFn7RkQor}Z_wCDR_WfYX@q8xFv`zr-r
zYg^Cv<c*t|xQeRI=A;vWcGW7Ld=vIs3I-6?I(`i)oeN+;2M)pYYzUtB4qxBO?xS#P
zg=B;cY*erL7$(5@&(__7S79c~&)5E-W$rNdL&kecdpC8A%@LGx8PkE3r38<!eo{*I
z0db!bQu3#ju-oGvhiux%RE?EPq?8NdSrpD*>e{owH%;7jxFj*YdgqqKk*$0_xmI-Q
zM|_lDvQ}GSKk%QO&vy-d3Dqz8#APou51a-p0E9QiA83dpWh1|4<#9coB20w2!mOI5
zh&2-<bZve_MuavqaE#Rwk9d3=9Y9($=1AG>-mUk9{yxF%U4TOhEA3-}SztUim}rLd
z@>E5k_Cu9_8A(Z@O%XEzo`#<D##o%4xnIG|1H@~TF5<ZJ>gThxk!Vr6-?;J71eH;P
zV?oq_mjhcmHeW8Z<H7wIxk&ipP5dIH?5?MIy}G*ydQB}iGC{)ZPY<z?pL2{^iH4ed
zaQPII@`V^LsP>Km={K}DG`!%92c9KrEo^3ie2@gu@nr~$EjI&<Pz)sdsC~3iCq&AT
z&RZyte(*<USY!(V+r(tj-_PJ+Sk9!0va>o3QA98?xu(#sQ+cs%j!%Ypz)uJ_V@p9I
z%?ItBm%qTP48h{<!ew6)G}Rwc%KLdj2Rab+_HK++GoR-Dyoz1M@nZIws8=|2UR}{&
z+qJ~L`>5khBbAIqf1&`c;26}E!gDr!3uJ^%kii_ASL_h5AYq&Zg0WDf>GHLQiOEO?
zjn3mJ>SO!e{1#jyx?L`>)|lLiceG;>IAvz73|4=Hc;}**r6z0J-Whc{P2z)v<ivV{
z%qj=|$P0iK5ZRxydAO1H-n{KCPw8X)&R!i-{kG3*hWWlUSblhiDjbI7)Cq$M!VA%P
zhf?<rOq>7A{cwDsKM1M(b#**l$Z|2UEB8YS2Fa3PhJ6a;cHOOCIVH%W9aE;8oHDKr
zjYGNaeYY4Q1qC%*8}Cg6MM_9!Fjs6HrN^pqe3=ec!N?v+NUEo6!fT;Vp}zyo$qtLu
ze&~3zRa%>J%0IN(2bH>M$;{{g;;Z0A-V{S(%%>XV*K4Wl(Dym+>O6mZdiJw@Cwu>6
z{&+gV=`7Gup{%h;ObopR44^<o2g~a+SU@;lN@IkZJhr9$(pWIksj_r@x_`<oeGd=m
zbz!Cr3`^f$BMc}tnbKwd@fCFol<;d7J+?J7y=1lM=9LfXa~s2`1g@c=IzI3gy3y}R
zJ_#6KMXJaEwjY;<4tueXCEER#tv@N|S(%gSCfel3HFKgieu#@wpIwvPxtWS_t$(8a
z>;S&3%6u(q&`tT6^*FNB654svLoxcbXL1Ra3KOep+&Tw0aP-UK+mf!u$%@jU*Z9dh
zjUM?6x1wczEEW37LSdA_>?Z&S35VuQdpj3=OjKpR1(+mEk>nfKkhC@cO8Sh+tJBeq
zB_!WH-`DlhZUhhPVo-jYaQ=cgTs`AgLdqw<%db1GvI*0;@Tv54u#}}I++72aWk^nO
zRvt6>TqP@mv@AyC>XX3ReekD4Yb{F~llyLm*3|1vN?&66Qz0&d3BEOTQwP4AeuJ&8
zs$*5q_qHqNm1~Kj4o<yeA39WrIa+h;fH2VyQErTOhjG&P@(f(W*`Ug^a~xf(OzPmJ
z6k^d$ZmcuK7%7SnzOLFX20(lt-d#pZW|pv5s)eUK#q<($Rd)-=f)lFb3zklpq2GiS
zWd81p{RxrJoT*!@VMf|Z&-ru5bHL@D2)NpIr1AO%$_K;z9V6Ajqe>KWzQwh%kk|UC
z4yE5K($Xs#w>Lzwzxq{P#?5$F#M?rz!+odW_<ORsypU(`8D2FmdGH0)$Fz-jf#n_)
zaYD?}&IcPDh4U$%ah1Ta!F=E*N0$VmP*@!~Q5}-Q<uxiRkC06Nshy=nu)oy}<&Prr
zPQ!&Z-wDM`fds}8*K(Yyk_@G{C_&sF;^Gf3GCOcni*_xmcw}lqB0!#Rj;7$_`KR?P
zUz_{FrnM3qB0jmtma{BZoM6m0E5JBE$ENGY>G+Nic*u5OPLbqR`fI!z@1-bRlu&uI
z=OK~D+-Ei>w2W)!)XF#cz37aJPtGAUG_G3x51KwQBxT_~;Yw1>IvXk}0!s<K6cgpC
z1WYCzLkx12j*V9*R$NCWJyN-e21kSA!xR|%)N)<M&`ao&!t(XxBiosv^5DQ`O4WHe
zWO7NSs}WiRIh=_rJ`?xG=v<&8qlv^w<)c;}`*Oxo0bb`>!;nu?^y^FL#>zv#$RnRI
z*C4}~qAlE6&96-YaZy6wd^jjwc_rOvp+{0yToGoOeC1DezKtC;JgI0R&*Wi%)tToq
zzm^s*@cq!=L#QJTYm&WKO^!#qB!hr`U>UA=&l=5=`FJIWlp>x+)9P5F#d?6uVh|6N
zEt@knQ)5mK=Yewop_CXtAJw}E`OhuITL)zt59YGk_5kI_J+PK{ZiO1y9CVjpZSz^Y
zj%U48NhGd9Nkq+OGbv-o{jH9N8DUgaOm#&tpyzVYe$^{xQ$b=T^eY)oGUba1A~rVN
UQ|H&=e|}?=l~R(d6gLk1KMrQi&j0`b

literal 0
HcmV?d00001

diff --git a/package.json b/package.json
index 67e9ec1f..87c1c374 100644
--- a/package.json
+++ b/package.json
@@ -7,6 +7,7 @@
     "name": "bwp91",
     "email": "bwp91@icloud.com"
   },
+  "icon": "https://raw.githubusercontent.com/bwp91/homebridge-ewelink/latest/icon.png",
   "description": "Homebridge plugin to integrate eWeLink devices into HomeKit.",
   "type": "module",
   "license": "MIT",

From 57c169a65424e4b153e4802fe6acf3efa98f2b3f Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Sun, 26 Nov 2023 13:47:06 +0000
Subject: [PATCH 3166/3183] 12.0.1-beta.5

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 9226bb49..b29dda9b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "12.0.1-beta.4",
+  "version": "12.0.1-beta.5",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "12.0.1-beta.4",
+      "version": "12.0.1-beta.5",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 87c1c374..11b1516d 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "homebridge-ewelink",
   "displayName": "Homebridge eWeLink",
   "alias": "eWeLink",
-  "version": "12.0.1-beta.4",
+  "version": "12.0.1-beta.5",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From cb0b3f1db70eb2e7fe58892f2fa43272e1649c44 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Sun, 26 Nov 2023 14:58:08 +0000
Subject: [PATCH 3167/3183] icon

---
 icon.png => branding/icon.png | Bin
 package.json                  |   1 -
 2 files changed, 1 deletion(-)
 rename icon.png => branding/icon.png (100%)

diff --git a/icon.png b/branding/icon.png
similarity index 100%
rename from icon.png
rename to branding/icon.png
diff --git a/package.json b/package.json
index 11b1516d..ed4c1b1d 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,6 @@
     "name": "bwp91",
     "email": "bwp91@icloud.com"
   },
-  "icon": "https://raw.githubusercontent.com/bwp91/homebridge-ewelink/latest/icon.png",
   "description": "Homebridge plugin to integrate eWeLink devices into HomeKit.",
   "type": "module",
   "license": "MIT",

From dc32d51ea270eeb590b7761c3bd804825f0b7788 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Sat, 16 Dec 2023 22:12:41 +0000
Subject: [PATCH 3168/3183] prep 12.1.0

---
 CHANGELOG.md           |  5 ++-
 lib/utils/constants.js |  3 +-
 package-lock.json      | 94 +++++++++++++++++++++---------------------
 package.json           | 12 +++---
 4 files changed, 59 insertions(+), 55 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e901dd2e..91a9b118 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,16 +8,19 @@ This project tries to adhere to [Semantic Versioning](http://semver.org/). In pr
 - `MINOR` version when a new device type is added, or when a new feature is added that is backwards-compatible
 - `PATCH` version when backwards-compatible bug fixes are implemented
 
-## BETA
+## 12.1.0 (2023-12-16)
 
 ### Added
 
 - Support for ZigBee button with UIID `7000`
+- Support for ZigBee switch with UIID `7005`
 
 ### Changed
 
 - Added plugin display name
 - Don't overwrite the IP of a LAN device if it reports a different IP
+- Bump `node` recommended versions to v18.19.0 or v20.10.0
+- Updated dependencies
 
 ## 12.0.0 (2023-10-24)
 
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 469b90c2..13b13e55 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -283,7 +283,7 @@ export default {
       210,
       211,
     ],
-    switchSingle: [1, 6, 14, 24, 27, 1009, 1256, 7004],
+    switchSingle: [1, 6, 14, 24, 27, 1009, 1256, 7004, 7005],
     switchSCM: [77, 78, 81, 107, 112, 138, 160, 191, 209],
     switchSCMPower: [182, 190],
     switchSinglePower: [5, 32],
@@ -519,6 +519,7 @@ export default {
     7002: 1, // Zigbee Human Body Sensor_Support OTA
     7003: 1, // Zigbee Door Magnet_Support OTA
     7004: 1, // Zigbee Single-Channel Switch ­_Support OTA
+    7005: 1, // Some switch, not entirely sure
     7006: 1, // Zigbee Curtain_Support OTA
     7014: 1, // some sensor https://github.com/bwp91/homebridge-ewelink/issues/494
   },
diff --git a/package-lock.json b/package-lock.json
index b29dda9b..f1a41e19 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -29,21 +29,21 @@
       "dependencies": {
         "@homebridge/plugin-ui-utils": "^1.0.0",
         "axios": "^1.6.2",
-        "node-persist": "^3.1.0",
-        "p-queue": "^7.4.1",
+        "node-persist": "^4.0.1",
+        "p-queue": "^8.0.1",
         "websocket-as-promised": "^2.0.1",
-        "ws": "^8.14.2"
+        "ws": "^8.15.1"
       },
       "devDependencies": {
-        "eslint": "^8.54.0",
+        "eslint": "^8.56.0",
         "eslint-config-airbnb-base": "^15.0.0",
-        "eslint-plugin-import": "^2.29.0",
+        "eslint-plugin-import": "^2.29.1",
         "eslint-plugin-import-newlines": "^1.3.4",
         "eslint-plugin-sort-exports": "^0.8.0"
       },
       "engines": {
         "homebridge": "^1.6.0",
-        "node": "^18.18.2 || ^20.10.0"
+        "node": "^18.19.0 || ^20.10.0"
       }
     },
     "node_modules/@aashutoshrathi/word-wrap": {
@@ -80,9 +80,9 @@
       }
     },
     "node_modules/@eslint/eslintrc": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.3.tgz",
-      "integrity": "sha512-yZzuIG+jnVu6hNSzFEN07e8BxF3uAzYtQb6uDkaYZLo6oYZDCq454c5kB8zxnzfCYyP4MIuyBn10L0DqwujTmA==",
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz",
+      "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==",
       "dev": true,
       "dependencies": {
         "ajv": "^6.12.4",
@@ -103,9 +103,9 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "8.54.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.54.0.tgz",
-      "integrity": "sha512-ut5V+D+fOoWPgGGNj83GGjnntO39xDy6DWxO0wb7Jp3DcMX0TfIqdzHF85VTQkerdyGmuuMD9AKAo5KiNlf/AQ==",
+      "version": "8.56.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.56.0.tgz",
+      "integrity": "sha512-gMsVel9D7f2HLkBma9VbtzZRehRogVRfbr++f06nL2vnCGCNlzOD+/MUov/F4p8myyAHspEhVobgjpX64q5m6A==",
       "dev": true,
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -684,15 +684,15 @@
       }
     },
     "node_modules/eslint": {
-      "version": "8.54.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.54.0.tgz",
-      "integrity": "sha512-NY0DfAkM8BIZDVl6PgSa1ttZbx3xHgJzSNJKYcQglem6CppHyMhRIQkBVSSMaSRnLhig3jsDbEzOjwCVt4AmmA==",
+      "version": "8.56.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.56.0.tgz",
+      "integrity": "sha512-Go19xM6T9puCOWntie1/P997aXxFsOi37JIHRWI514Hc6ZnaHGKY9xFhrU65RT6CcBEzZoGG1e6Nq+DT04ZtZQ==",
       "dev": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.6.1",
-        "@eslint/eslintrc": "^2.1.3",
-        "@eslint/js": "8.54.0",
+        "@eslint/eslintrc": "^2.1.4",
+        "@eslint/js": "8.56.0",
         "@humanwhocodes/config-array": "^0.11.13",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
@@ -804,9 +804,9 @@
       }
     },
     "node_modules/eslint-plugin-import": {
-      "version": "2.29.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.29.0.tgz",
-      "integrity": "sha512-QPOO5NO6Odv5lpoTkddtutccQjysJuFxoPS7fAHO+9m9udNHvTCPSAMW9zGAYj8lAIdr40I8yPCdUYrncXtrwg==",
+      "version": "2.29.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.29.1.tgz",
+      "integrity": "sha512-BbPC0cuExzhiMo4Ff1BTVwHpjjv28C5R+btTOGaCRC7UEz801up0JadwkeSk5Ued6TG34uaczuVuH6qyy5YUxw==",
       "dev": true,
       "dependencies": {
         "array-includes": "^3.1.7",
@@ -825,7 +825,7 @@
         "object.groupby": "^1.0.1",
         "object.values": "^1.1.7",
         "semver": "^6.3.1",
-        "tsconfig-paths": "^3.14.2"
+        "tsconfig-paths": "^3.15.0"
       },
       "engines": {
         "node": ">=4"
@@ -1187,9 +1187,9 @@
       }
     },
     "node_modules/globals": {
-      "version": "13.23.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.23.0.tgz",
-      "integrity": "sha512-XAmF0RjlrjY23MA51q3HltdlGxUpXPvg0GioKiD9X6HD28iMjo2dKC8Vqwm7lne4GNr78+RHTfliktR6ZH09wA==",
+      "version": "13.24.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
+      "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
       "dev": true,
       "dependencies": {
         "type-fest": "^0.20.2"
@@ -1729,9 +1729,9 @@
       "dev": true
     },
     "node_modules/node-persist": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/node-persist/-/node-persist-3.1.3.tgz",
-      "integrity": "sha512-CaFv+kSZtsc+VeDRldK1yR47k1vPLBpzYB9re2z7LIwITxwBtljMq3s8VQnnr+x3E8pQfHbc5r2IyJsBLJhtXg==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/node-persist/-/node-persist-4.0.1.tgz",
+      "integrity": "sha512-QtRjwAlcOQChQpfG6odtEhxYmA3nS5XYr+bx9JRjwahl1TM3sm9J3CCn51/MI0eoHRb2DrkEsCOFo8sq8jG5sQ==",
       "engines": {
         "node": ">=10.12.0"
       }
@@ -1753,12 +1753,12 @@
       }
     },
     "node_modules/object.assign": {
-      "version": "4.1.4",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",
-      "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.5.tgz",
+      "integrity": "sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
+        "call-bind": "^1.0.5",
+        "define-properties": "^1.2.1",
         "has-symbols": "^1.0.3",
         "object-keys": "^1.1.1"
       },
@@ -1886,26 +1886,26 @@
       }
     },
     "node_modules/p-queue": {
-      "version": "7.4.1",
-      "resolved": "https://registry.npmjs.org/p-queue/-/p-queue-7.4.1.tgz",
-      "integrity": "sha512-vRpMXmIkYF2/1hLBKisKeVYJZ8S2tZ0zEAmIJgdVKP2nq0nh4qCdf8bgw+ZgKrkh71AOCaqzwbJJk1WtdcF3VA==",
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/p-queue/-/p-queue-8.0.1.tgz",
+      "integrity": "sha512-NXzu9aQJTAzbBqOt2hwsR63ea7yvxJc0PwN/zobNAudYfb1B7R08SzB4TsLeSbUCuG467NhnoT0oO6w1qRO+BA==",
       "dependencies": {
         "eventemitter3": "^5.0.1",
-        "p-timeout": "^5.0.2"
+        "p-timeout": "^6.1.2"
       },
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/p-timeout": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-5.1.0.tgz",
-      "integrity": "sha512-auFDyzzzGZZZdHz3BtET9VEz0SE/uMEAx7uWfGPucfzEwwe/xH0iVeZibQmANYE/hp9T2+UUZT5m+BKyrDp3Ew==",
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-6.1.2.tgz",
+      "integrity": "sha512-UbD77BuZ9Bc9aABo74gfXhNvzC9Tx7SxtHSh1fxvx3jTLLYvmVhiQZZrJzqqU0jKbN32kb5VOKiLEQI/3bIjgQ==",
       "engines": {
-        "node": ">=12"
+        "node": ">=14.16"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
@@ -2329,9 +2329,9 @@
       "dev": true
     },
     "node_modules/tsconfig-paths": {
-      "version": "3.14.2",
-      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.2.tgz",
-      "integrity": "sha512-o/9iXgCYc5L/JxCHPe3Hvh8Q/2xm5Z+p18PESBU6Ff33695QnCHBEjcytY2q19ua7Mbl/DavtBOLq+oG0RCL+g==",
+      "version": "3.15.0",
+      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz",
+      "integrity": "sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==",
       "dev": true,
       "dependencies": {
         "@types/json5": "^0.0.29",
@@ -2517,9 +2517,9 @@
       "dev": true
     },
     "node_modules/ws": {
-      "version": "8.14.2",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.14.2.tgz",
-      "integrity": "sha512-wEBG1ftX4jcglPxgFCMJmZ2PLtSbJ2Peg6TmpJFTbe9GZYOQCDPdMYu/Tm0/bGZkw8paZnJY45J4K2PZrLYq8g==",
+      "version": "8.15.1",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.15.1.tgz",
+      "integrity": "sha512-W5OZiCjXEmk0yZ66ZN82beM5Sz7l7coYxpRkzS+p9PP+ToQry8szKh+61eNktr7EA9DOwvFGhfC605jDHbP6QQ==",
       "engines": {
         "node": ">=10.0.0"
       },
diff --git a/package.json b/package.json
index ed4c1b1d..d3a2fa18 100644
--- a/package.json
+++ b/package.json
@@ -32,7 +32,7 @@
   },
   "engines": {
     "homebridge": "^1.6.0",
-    "node": "^18.18.2 || ^20.10.0"
+    "node": "^18.19.0 || ^20.10.0"
   },
   "repository": {
     "type": "git",
@@ -62,15 +62,15 @@
   "dependencies": {
     "@homebridge/plugin-ui-utils": "^1.0.0",
     "axios": "^1.6.2",
-    "node-persist": "^3.1.0",
-    "p-queue": "^7.4.1",
+    "node-persist": "^4.0.1",
+    "p-queue": "^8.0.1",
     "websocket-as-promised": "^2.0.1",
-    "ws": "^8.14.2"
+    "ws": "^8.15.1"
   },
   "devDependencies": {
-    "eslint": "^8.54.0",
+    "eslint": "^8.56.0",
     "eslint-config-airbnb-base": "^15.0.0",
-    "eslint-plugin-import": "^2.29.0",
+    "eslint-plugin-import": "^2.29.1",
     "eslint-plugin-import-newlines": "^1.3.4",
     "eslint-plugin-sort-exports": "^0.8.0"
   }

From ac934d077124edf12c1c5791afec2036d6c9f803 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Sat, 16 Dec 2023 22:13:58 +0000
Subject: [PATCH 3169/3183] 12.1.0

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index f1a41e19..098294e1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "12.0.1-beta.5",
+  "version": "12.1.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "12.0.1-beta.5",
+      "version": "12.1.0",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index d3a2fa18..6158802d 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "homebridge-ewelink",
   "displayName": "Homebridge eWeLink",
   "alias": "eWeLink",
-  "version": "12.0.1-beta.5",
+  "version": "12.1.0",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From eab14778ff1ef3e276dc090f09e9c4e4fa1bf32e Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Tue, 26 Dec 2023 14:06:15 +0000
Subject: [PATCH 3170/3183] attempt to implement 7016

---
 CHANGELOG.md                          |   6 ++
 lib/device/zigbee/index.js            |   2 +
 lib/device/zigbee/sensor-occupancy.js | 119 ++++++++++++++++++++++++++
 lib/platform.js                       |   8 ++
 lib/utils/constants.js                |   3 +
 lib/utils/lang-en.js                  |   2 +
 lib/utils/lang-fr.js                  |   2 +
 lib/utils/lang-th.js                  |   2 +
 package-lock.json                     |   6 +-
 9 files changed, 147 insertions(+), 3 deletions(-)
 create mode 100644 lib/device/zigbee/sensor-occupancy.js

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 91a9b118..f3fffdb2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,12 @@ This project tries to adhere to [Semantic Versioning](http://semver.org/). In pr
 - `MINOR` version when a new device type is added, or when a new feature is added that is backwards-compatible
 - `PATCH` version when backwards-compatible bug fixes are implemented
 
+## BETA
+
+### Added 
+
+- Support for ZigBee occupancy sensor with UIID `7016`
+
 ## 12.1.0 (2023-12-16)
 
 ### Added
diff --git a/lib/device/zigbee/index.js b/lib/device/zigbee/index.js
index 0c618324..178e5543 100644
--- a/lib/device/zigbee/index.js
+++ b/lib/device/zigbee/index.js
@@ -6,6 +6,7 @@ import deviceSensorAmbient from './sensor-ambient.js';
 import deviceSensorContact from './sensor-contact.js';
 import deviceSensorLeak from './sensor-leak.js';
 import deviceSensorMotion from './sensor-motion.js';
+import deviceSensorOccupancy from './sensor-occupancy.js';
 import deviceSensorSmoke from './sensor-smoke.js';
 import deviceSwitchStateless from './switch-stateless.js';
 
@@ -18,6 +19,7 @@ export default {
   deviceSensorContact,
   deviceSensorLeak,
   deviceSensorMotion,
+  deviceSensorOccupancy,
   deviceSensorSmoke,
   deviceSwitchStateless,
 };
diff --git a/lib/device/zigbee/sensor-occupancy.js b/lib/device/zigbee/sensor-occupancy.js
new file mode 100644
index 00000000..d2c182cd
--- /dev/null
+++ b/lib/device/zigbee/sensor-occupancy.js
@@ -0,0 +1,119 @@
+import platformConsts from '../../utils/constants.js';
+import { hasProperty } from '../../utils/functions.js';
+
+export default class {
+  constructor(platform, accessory) {
+    // Set up variables from the platform
+    this.eveChar = platform.eveChar;
+    this.hapChar = platform.api.hap.Characteristic;
+    this.hapServ = platform.api.hap.Service;
+    this.lang = platform.lang;
+    this.log = platform.log;
+    this.platform = platform;
+
+    // Set up variables from the accessory
+    this.name = accessory.displayName;
+    this.accessory = accessory;
+
+    // Set up custom variables for this device type
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId] || {};
+    this.lowBattThreshold = deviceConf.lowBattThreshold
+      ? Math.min(deviceConf.lowBattThreshold, 100)
+      : platformConsts.defaultValues.lowBattThreshold;
+    this.sensorTimeDifference = deviceConf.sensorTimeDifference || platformConsts.defaultValues.sensorTimeDifference;
+
+    // Set the correct logging variables for this accessory
+    switch (deviceConf.overrideLogging) {
+      case 'standard':
+        this.enableLogging = true;
+        this.enableDebugLogging = false;
+        break;
+      case 'debug':
+        this.enableLogging = true;
+        this.enableDebugLogging = true;
+        break;
+      case 'disable':
+        this.enableLogging = false;
+        this.enableDebugLogging = false;
+        break;
+      default:
+        this.enableLogging = !platform.config.disableDeviceLogging;
+        this.enableDebugLogging = platform.config.debug;
+        break;
+    }
+
+    // Add the occupancy sensor service if it doesn't already exist
+    this.service = this.accessory.getService(this.hapServ.OccupancySensor);
+    if (!this.service) {
+      this.service = this.accessory.addService(this.hapServ.OccupancySensor);
+      this.service.addCharacteristic(this.eveChar.LastActivation);
+    }
+
+    // Add the battery service if it doesn't already exist
+    this.battService = this.accessory.getService(this.hapServ.Battery)
+      || this.accessory.addService(this.hapServ.Battery);
+
+    // Pass the accessory to Fakegato to set up with Eve
+    this.accessory.eveService = new platform.eveService('motion', this.accessory, {
+      log: () => {},
+    });
+
+    // Output the customised options to the log
+    const normalLogging = this.enableLogging ? 'standard' : 'disable';
+    const opts = JSON.stringify({
+      logging: this.enableDebugLogging ? 'debug' : normalLogging,
+      lowBattThreshold: this.lowBattThreshold,
+      sensorTimeDifference: this.sensorTimeDifference,
+    });
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts);
+  }
+
+  async externalUpdate(params) {
+    try {
+      if (hasProperty(params, 'battery') && params.battery !== this.cacheBatt) {
+        this.cacheBatt = params.battery;
+        this.cacheBattScaled = Math.max(Math.min(this.cacheBatt, 100), 0);
+        this.battService.updateCharacteristic(this.hapChar.BatteryLevel, this.cacheBattScaled);
+        this.battService.updateCharacteristic(
+          this.hapChar.StatusLowBattery,
+          this.cacheBattScaled < this.lowBattThreshold ? 1 : 0,
+        );
+        if (params.updateSource && this.enableLogging) {
+          this.log('[%s] %s [%s%].', this.name, this.lang.curBatt, this.cacheBattScaled);
+        }
+      }
+      if (
+        hasProperty(params, 'human')
+        && hasProperty(params, 'trigTime')
+        && params.occupancy !== this.cacheState
+      ) {
+        this.cacheState = params.occupancy;
+        const timeDiff = (new Date().getTime() - params.trigTime) / 1000;
+        const occupancyDetected = !!(
+          params.updateSource
+          && params.occupancy === 1
+          && timeDiff < this.sensorTimeDifference
+        );
+        this.service.updateCharacteristic(this.hapChar.OccupancyDetected, occupancyDetected);
+        if (occupancyDetected) {
+          const initialTime = this.accessory.eveService.getInitialTime();
+          this.service.updateCharacteristic(
+            this.eveChar.LastActivation,
+            Math.round(new Date().valueOf() / 1000) - initialTime,
+          );
+        }
+        this.accessory.eveService.addEntry({ status: occupancyDetected ? 1 : 0 });
+        if (params.updateSource && this.enableLogging) {
+          this.log(
+            '[%s] %s [%s].',
+            this.name,
+            this.lang.curState,
+            occupancyDetected ? this.lang.occupancyYes : this.lang.occupancyNo,
+          );
+        }
+      }
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, false);
+    }
+  }
+}
diff --git a/lib/platform.js b/lib/platform.js
index 68129e5a..56d1ed87 100644
--- a/lib/platform.js
+++ b/lib/platform.js
@@ -1474,6 +1474,14 @@ export default class {
         this.applyAccessoryLogging(accessory);
         accessory.control = new deviceTypes.zb.deviceSensorMotion(this, accessory);
         /** ************* */
+      } else if (platformConsts.devices.zbSensorOccupancy.includes(uiid)) {
+        /** ******************
+         ZB SENSOR [OCCUPANCY]
+         ******************* */
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+        this.applyAccessoryLogging(accessory);
+        accessory.control = new deviceTypes.zb.deviceSensorOccupancy(this, accessory);
+        /** ************* */
       } else if (platformConsts.devices.zbSensorContact.includes(uiid)) {
         /** ****************
          ZB SENSOR [CONTACT]
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 13b13e55..3cd1b678 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -340,6 +340,7 @@ export default {
     zbMotor: [1514, 7006],
     zbSensorAmbient: [1770, 1771, 7014],
     zbSensorMotion: [2026, 7002],
+    zbSensorOccupancy: [7016],
     zbSensorContact: [3026, 7003],
     zbSensorWater: [4026],
     zbSensorSmoke: [5026],
@@ -374,6 +375,7 @@ export default {
     'currLocation',
     'fan',
     'hue',
+    'human',
     'humidity',
     'key',
     'light',
@@ -522,6 +524,7 @@ export default {
     7005: 1, // Some switch, not entirely sure
     7006: 1, // Zigbee Curtain_Support OTA
     7014: 1, // some sensor https://github.com/bwp91/homebridge-ewelink/issues/494
+    7016: 1, // https://sonoff.tech/product/gateway-and-sensors/snzb-06p/
   },
 
   cannotSupportDevices: {
diff --git a/lib/utils/lang-en.js b/lib/utils/lang-en.js
index b9c4ebbe..862aa246 100644
--- a/lib/utils/lang-en.js
+++ b/lib/utils/lang-en.js
@@ -104,6 +104,8 @@ export default {
   noGarageForOD: 'No corresponding garage door accessory found',
   noRegionRec: 'No valid region received',
   noWSHost: 'Server did not respond with a web socket host',
+  occupancyNo: 'occupancy not detected',
+  occupancyYes: 'occupancy detected',
   pluginNotConf: 'Plugin has not been configured',
   repOffline: 'has been reported [offline]',
   repOnline: 'has been reported [online]',
diff --git a/lib/utils/lang-fr.js b/lib/utils/lang-fr.js
index 70794f08..e8c5dc53 100644
--- a/lib/utils/lang-fr.js
+++ b/lib/utils/lang-fr.js
@@ -105,6 +105,8 @@ export default {
   noGarageForOD: 'pas daccessoire de porte de garage trouvé',
   noRegionRec: 'pas de région valide reçus',
   noWSHost: 'le serveur ne répond pas avec un hote web socket',
+  occupancyNo: 'occupancy not detected',
+  occupancyYes: 'occupancy detected',
   pluginNotConf: 'le plugin n\'a pas été configuré',
   repOffline: 'a été rapporté [offline]',
   repOnline: 'a été rapporté [online]',
diff --git a/lib/utils/lang-th.js b/lib/utils/lang-th.js
index 7c3908a2..3b045ba0 100644
--- a/lib/utils/lang-th.js
+++ b/lib/utils/lang-th.js
@@ -104,6 +104,8 @@ export default {
   noGarageForOD: 'ไม่พบอุปกรณ์เสริมประตูโรงรถที่สอดคล้องกัน',
   noRegionRec: 'ไม่ได้รับภูมิภาคที่ถูกต้อง',
   noWSHost: 'เซิร์ฟเวอร์ไม่ตอบสนองกับโฮสต์เว็บซ็อกเก็ต',
+  occupancyNo: 'occupancy not detected',
+  occupancyYes: 'occupancy detected',
   pluginNotConf: 'ปลั๊กอินไม่ได้รับการกำหนดค่า',
   repOffline: 'มีการรายงาน [ออฟไลน์]',
   repOnline: 'มีการรายงาน [ออนไลน์]',
diff --git a/package-lock.json b/package-lock.json
index 098294e1..eee7b8ae 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -990,9 +990,9 @@
       "dev": true
     },
     "node_modules/fastq": {
-      "version": "1.15.0",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz",
-      "integrity": "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==",
+      "version": "1.16.0",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.16.0.tgz",
+      "integrity": "sha512-ifCoaXsDrsdkWTtiNJX5uzHDsrck5TzfKKDcuFFTIrrc/BS076qgEIfoIy1VeZqViznfKiysPYTh/QeHtnIsYA==",
       "dev": true,
       "dependencies": {
         "reusify": "^1.0.4"

From 90bedf9aec52b44313f73c034dc4b8eea767f071 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Tue, 26 Dec 2023 14:06:54 +0000
Subject: [PATCH 3171/3183] 12.1.1-beta.0

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index eee7b8ae..44a44de3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "12.1.0",
+  "version": "12.1.1-beta.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "12.1.0",
+      "version": "12.1.1-beta.0",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 6158802d..b6846dba 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "homebridge-ewelink",
   "displayName": "Homebridge eWeLink",
   "alias": "eWeLink",
-  "version": "12.1.0",
+  "version": "12.1.1-beta.0",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From a0dce8d8f24add26f434f80097257699bd832ab7 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Tue, 26 Dec 2023 14:25:33 +0000
Subject: [PATCH 3172/3183] attempt to implement 7017

---
 CHANGELOG.md                    |   1 +
 branding/icon.png               | Bin 14319 -> 0 bytes
 lib/device/zigbee/index.js      |   2 +
 lib/device/zigbee/thermostat.js | 288 ++++++++++++++++++++++++++++++++
 lib/platform.js                 |   8 +
 lib/utils/constants.js          |   3 +
 6 files changed, 302 insertions(+)
 delete mode 100644 branding/icon.png
 create mode 100644 lib/device/zigbee/thermostat.js

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f3fffdb2..17087ec2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@ This project tries to adhere to [Semantic Versioning](http://semver.org/). In pr
 ### Added 
 
 - Support for ZigBee occupancy sensor with UIID `7016`
+- Support for ZigBee thermostat with UIID `7017`
 
 ## 12.1.0 (2023-12-16)
 
diff --git a/branding/icon.png b/branding/icon.png
deleted file mode 100644
index ad213ec19dcc56401fc273b1bdda986eeaf63e83..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 14319
zcmY*=WmFu^7VY5fuE90Hpuru2I|O$bED)T*VQ>f<B)Gdf!8N$MySoK{`R={%-uJ3j
z_1S%DpMC1|k6Np1b%(1ceMUnjMg{-?XtFYrYJaWyKLZi|@6~bphsIw6YbB;A1_0E=
zpuCvC{k^9!lTlLy0KjwrfIkEPc>3$|KLh|=fdIg<F#y1y0ss&=rnjmJ{+)nWXv<nE
zDgv1PVnhHO6gB|nFM|5p0Z_z%f7JdWfE*Obf3X@A!+$u?06?fU0QNr|-M{vqCi8dv
z6Z3BilMVGh#cb&Rvdyz${)hhwTMeia|7(yOWptbY02G{m1{C0DI^kb69cvA37i~oa
zelrJqRugjvQwvrPd&hsG0D>O;f1$mFiwT8?z1>%5eh(q4e=+#~;(y$1R22WBxY!C&
zX)CHwNH{oIQ1Gw<S%Fl-$P^S5f==d^{A!ZY{|WzlCqxBuadG5lV{><RXLaXfb#Ss`
zW9Q@JV*_%qad5EwWw1DVeswYNVEO7y{cn-~t0QUQZ02O`=wj{gmEs>=6H^CQ7a=OD
ze-iz-{d=7*)|UUv^ws%4W&JIX?VlMoc2*$Uf3^RH3jX8eS9Y?t_?!73ePMRNe=+|*
z-+%H5vi+0%|5?nxEB%-EZ>hq_f^7eNY{JMyhFb^#0Jo#8q?m>W)K~^m3hn1_2RCc4
zh8qi`AQ~5=JQzxna0eiw-XOFYM4JS{2S<o+*EL|vc5+uk*tXsv^1O0~u*fWI2kg-o
zucqi@L8q?i=@Ccd;+KXd%j4tvth}*yarkim9$9`^>HFGRbP(GymI~JV@q-BKZzm#3
z)yzN|QKxI!OIQ4!KJH0&^%7;o6w;C7z4%t}^O~4HWZZiPtq2ePlTaD{@WEJpL=nsG
zNZzA<NBR&UDxOZN?l82hIzg~L52~h<SkdIPk2D^E3p@KS%+lz>^Dpxv%cPqa?gtW#
zS$OA3TR%%!A>ohGzmel+8kk=2X&Q-hbh2zTt=yZ4Z!kU`6keom_+0p?8$IV`lzytp
z!)0xzBe{Pq$G>0G!!U8Agh*V<SqX^F%yy^lTJ6Y=M!ak-!*vr;;+_hEW!dc(H4-UG
zEszd(H(o+fP)Nqtl1`30Kki;1>?0c##Eyl6+sXIK?tpr>AtB9ZoOS%hlKgQSxUz62
zgxEn&Oc2M~o@LCXow{fhJ(X9Nf*ltYosZjGwYQu+Gl-g7Cz2<~^;DUD^`EE%_3k{w
zi+SiM*BXEg?<6x1>n{~c0+kyDU^tx7_Ko=1LaeY4i0}dBm=R426Rc5-B&HL;Q9yjF
z&r&eJ%i)->X97oUpYCq&4OL5T-7IJ?wepzud)AAMCx20#kIOS~&RG_p@P96>rXU<=
zjq1)!1ST4(#}K9&0?(w(V!W_rK+FWSP^*(cn8!U{q8<y;apSX2+#}`^N-U%9B>`iT
zrAikz<I1bNcRLf_ruX;n?VRbp7GJbulZ4&$G|yyF`r*vLQ14wAT=gh<m|!0K9!}p9
z()0Hh{l{zftY!Bt?u+3haMc*@FXyr4@>VtHoRkU6Ru^29R8-yXGNfR0?-B4wJ*))A
z?~<^LVEe^jO4Vu3(mP9DE^1;;_*~NOtTDFGZW3JxBP}Y7Cat+DbQV-a`I4S^yr!$z
zF*Z4glnHG69FJ<Cam8~Rg|oM=Hw^n{E{5LJ&LkuZKk@`R&PD}b<)~$RHX947f(B(&
zrV(;bk!x^h2ZzY@z(jk!(*TNa;sw#tvTm`Jc-}H@ohDmCg?!0AaRutAzJCpv!b0{g
zM1et;WJ+fCo1taEdLZzc>9g`TlPFn2#H%BjLnTGE09Ft@%k5|h+2<dCI925>5O*4}
z-cM{fze=my;bGb;0g;7YN0rAIB3$_6eo}m=oer9w5(qtAk}auB@B@(p-KM;^H^FF~
zuV)(*4_TL9m`l3FCBG~fntt<i0$_d)__V|#{V?UhRYaUp350~+*Z>y<oyR0o%%+t>
zrKXDb1LRw=z_Suhv+CswOwOiC?UL<}#o!^iT#HWK3WYBYm3$&CUcLuH7liM(t{WH2
z*T>f{uUYAu-$<#!D1{@V$tZz0Y7-y@s;K!8_w_e|#~iCRMKj1L+AbSG$ni&c5Se}j
z(yd)P9{wTPw(!r;E*Ut3nV{*$=OcXSe98QX`Bu<rywjv@PR6>^Y<nLRTZUPcPBBky
zu#;bh!;ZY1mEry7Y{i8qg`KA>E$JUdaf)tofwnK3^Bk7Ay^}-*)d!UWg?|%o+`!Ox
zbZBNw7qb)?_6Eb5@>3EnhZ^tG5UN<GsAh7kOgD33I}8&}-=CIr1QX9HJegSH(TeF1
z4<|A<cEA0Zq~L6v)c$RLQ{X*u*f>oz@qTpL^k(;&_uVG7ifjZDC>p_UdckX}$9LLX
z(7JWD@uu7&c83ZHU_9v?a#gVrlHRkd8L_d`u`CyI9cqi)k70&ct||A$h;BZ>yTkq&
zJ}!zCF)QY$h2YXmAH^~j9IQ~O^4k@|NN3S|>fxZ{S;RfK&PWXvL6Kow1w@JYXoLM5
zZb75xe&P#J7fNr@I|irvJm>d}k9@{Co$(8sWT_KX62V9Y*tk4ind|vCay2DA>WSF}
zIhCro_Hc?SrflJ6WW53tF?t+1#YMQxd-@Z<X&WSdebw=}9MR-cSpxq0;KH(;*(9ca
zgQ~ysa(Q&Y37xHg>|EXlB(a<{Kdlxs!nCp&+21t;V?b-VGty5mTX|}oYhzW_3ERkW
zuGOnWe}jD6W6YsW7;8ALi?;JTOz$px8}Y+$m0olt*NQL+;wxiK2^dMgH~3TQzBl|z
zFX?c+h>Is{n)R#T^%hWx1;FXN;v4(4tEp)7LZPE`6uQr4B6;qp`kHjTD?&DOh%K&=
zTom7WsvasrU1eMPg9W3_ZTBv#RnYF;jyv7QQ?_{z1}jaC*Zj}i2cNHvv(EN){4mTw
zi@`)t+Ab#e*S1~Cz?7aNbBiTKM&gZ|3?<68)~HlU0<eYjnDKWZ&IA|?ffm{n*8vvX
zYNumHR*>NkXjPylSr$&>UFTW7ewT9%Ju0y~T%!3wqr&j=h^DvRhng-MeV%ibf{pV<
z0WV7HxjbiPU$s9|JTsc)XF8cmO3}azq*hRcSjD@ni6(}=C8kArjSa1`FgAzqr-KN$
zWuzrT^;GE?PhEfJK~&r0K6CH+2d&<HEBR2o1~PE}9f4)!4`%Zf28KpbpIj4=UehT$
zrwbUFE~k{;taV<OXDe{w7FT1_-}1=$m_3n}GG*OK7?nXcsg~wy>)Tr}`XvYb6sdst
zf)KP=O+2Z9^V!3hxhPoN_c?F;p|8g&Li_eBxBxk^M;t8!6(u;@%3%cm*Dpyl>DMsh
zMzdV6oJS#38U;AQ==4~l5mzs>=0Sz7Sczk?DCR_J)y`kcR_yc#>fTPLotut=qCx2U
z60UdHhm?87J2Gl=^q||`VVam?6dw;;25Ogt&vFrcY4=8qB5|gvl?SEj=^uRWqlx!z
zfGgaNIw(4%d)~cQ{-lBM=B4<(N5kpZ38@hj4D_=n`4ivt!{gS4@6fTMnVH+5U{a=f
zWAkJ+oL9RfzsVG$@^e}yQcwga>&#nAdvQ@KT`w=0b+5zX?@+6nC!sr{Z)1JSz1xI}
zn#q=rx69q9E6A+uIV576eC^x|t$h7$9dVMiqD#SXy6fn<i)516?@H&-^)m#>V_XWd
zC1GdAycA>`w$d=1Y5``qphSy4U(SZOM7vAxpeHkI|0$l}_MB9WEl1%%Z{CKu`iDY)
z3;Bw!d>en;e&Fl|m5Pu^CwEtaj2H~qZ$k%vK*~IPr?PK_wf(IT!aC>5m-S)MC9YLL
z)&QY^ukcFZjz#-`(E4{`mv|Q#$Gn%z)P%*;7)DptTs##&qQ8S5KpXi)nn>Rb$c2hR
zU<E{;7aj}rzLMI~bq4OVDT#t_wCb4+M5y~VKQh5jS44O?j<(|xeOd;YK`UpXT=kE7
z{xEuLk9K<cHDR?UZ{s*y1HBvq?Lt6lY)z3hN1@pK>R4z)1mgmeGb>i7{edX)1_8&!
zNmj^0Wn#@cAnh6$1cezbev<mxIPjX^Yf~i#zais#c5jfd(rYt&iClG){TmC_tl&<V
zh<+a!aTWGs-)6Vw{(8Zlcu)7%VUlrSL4KVLi8z#Jna+Z^w6DZtzP!?~6^cO-<7Gb#
z`3KEF6-2W}v~B>^v_L__aUvZlmYuO$vV~^S7oB~@2V6+tBgbm1Gzk`Tf;<EuL_;V}
zlqc^wFK0oazb`Tw?jGzpHKc%Y@(hgWYj%`Dmo3^X>TXb*ws?)~F*%h5haUcx7vFU0
z#>^x-oj2E+ia<h=e%$shEFnzRdV*IPvx?YLWpPoVCRUZGe*3V@ViGEh)&`<O3$AW1
zB<J=Czr5=$pt-}00L2JN)p;yR?tD}!;T+vv9)xC6jp3Nww+Y!-Z)9DotJ9jn1l)pi
zKeF<+=hCRdpyqb=wJ^Z9jWY@#5CKUzno{&ZEW1A&5$9=7x_RLg)O3a;tI@45L?zTF
zk|QY9OQTAIADwRNzkDVTb9sa7!0pD*7lp^-0!iOvThjdz_+t2(^)A4y(Y^Jnfb`+$
zra0yv#O|EWm`O)p;<I9um9d42g;YX7{DC3*-qt!!<T7v$XM#_q^^V4v&#si><+w-u
zw=HAo=UXir#LPTIUer^6KHizh<ti;!6u7nSURNqxdc<AK<*M}nx&T;nJG;#%ZCGf#
z-%e<iGG<7B3UDS?tUv9KD19l&;nw8&sWF;DlRcGcXgIc+4=^hfWGAPHm6Cl5>P;tu
z_UH}|j2gME`NK_-OkQV`L&a{bZMK^Nt~{@Mj8eeEpPZTgaZv6H&lp5_1B)rni^DuG
z((IP26<U3b^k>TSRKP85(_CjQgAXbi1|!@FJ<HpzS)sHW^yx*?WdIeK$x}yUaP>zg
z?q`bcq1cu-u)I(WwbLd}r1Y#p`wsxK+yO>s|5<H?1^;`AGopnCg2p;u;}Cj3{EJuC
zcne76G1OQ-fqh;?^$}{wq<~-nE6WJwqw{!T4*4JMb8Cg+rB#?k8p1xPge}$}$0r?C
z;?Jt1*moH@Oki_aU^X>>2A2D6Yp&>bLPKN$*EJi`L<tVHxZELHE4A<kUZx<pGp81=
z%rdSpYg`^;HIU#$atVCjwTcy@6=%>Va=ID>lo9dFH$5WJ{Dj_n!Qt)N?ZRp5OGm-U
z!|I&i03vk=$#8Z!^;CkLivPXXX$|xb#D3TV#P6G^_Vtl4`%v^8ar2kAi}4aU29OA8
zr>O!28?m$Tm|J`rShRSqKz-jfEhl+5{;S0V&L}S~H_065`bc<H^k(*Q%(2)p<2yi|
zv4u<Y$TG`5hjbUf*ojyDn_^A7Liz26jN~`OjUb!^>wChS-?*5?g7fBoa*RS}zLf*p
zg@HMpthq%8oH@!|37eY2WGe;Ps<Hff<PV=?4^0XUW@}i(5))|ryCgv%j)gyG)?zBy
zA%9Mjkf?g{usmGu^+i_eWX0tyZ!jP|g61k-20q(_@*kGinsX*-u~-J;ZN1DV`IGTo
zt{BXA>>mQtsn(k6CF7HE@QEZP7~$CYuSh0ZuTl2sUaC>j;&hh^vKs0c(FWU+`}V?7
zwFA570-HyCSw<;<>?Mf7uxLritH87mT9~mdh(Y|{stgSjYy{0H6yubmd+COYPEwS}
z8t3B(vdKJ3Qj8y2lCC}IxLm|I=@?V2Lq4sBO~+)Id78mLH0l|^V2}3EMC075cl-(m
zRT-3VM<EFIwq@JX7^@@;pr6kmP2_cA_X0s>QmS(WA0=5W%h0qCEX6(v?1gfD<I;wn
zXSNFRM7$vY+X}pJRo=Sh)9zV_QQx^<o_f%M0^dAaj@pp|9-EaYHEhZ`M`Gy~SHeYM
zh`fD5;rqr%lFW9F0_9(s;=e!3fzqG|AGkA&6B&bs{Ykc`E8O}wiNsoS^?M^CfavV-
zk56z3Reanw>Bjkr6;$|k&KY9lg#+cTZ>3zz@idn+5;2%zUyN=(P8RCd|F}OG8=F>)
zqz}#cIXD??CG`zd=nlLPCA>ve9#B~0v^Kw+bZ5R^J>hUqNzxHpNu6N$Y1Y$w>j;<_
zHHBXAgbhmB!<Js)PeTe@@6rxRts|obOU9fg6S%3+p{1WF;ub8#fvO6qi!U_iy`;N&
zfwap3vEpDtM9gq`Jvjxu=sq-y<PXbAxv14T1V?d8#=e+v2+kE@?Do<D+*IA>PzVW-
zLIG~NC`lP|{?P8`rt#H!|N7^3FqWq%6zf9sq>lkd3Gs{lL;kgFq7F-g2xlwVq0Nu)
zlpiK1ZG_C*9YGXPmR%6W0o1jfi0i06KycUMzJm$6P&WF6HEx{;7<OOL&cJfTgag)7
zjr*o&(tDq@OZ3pg9AEKA_Rct_#kC4v@l0lR0s|L0p%4*{9NeL7X~UNqFXkj)@vS0C
zPtZYiu_<TLw(O);0B3$S><$rqigG@jbZ_cs%nhnd8EZ}n{=uKK-%DP}NoVP=qG0O!
zu<E;xELlU=@=|-#<Cckr(Fxb#!kIm;H(`4drTR;{r@nvSRd&~H5~aut$;;rvmo}+F
z+H_6RnLO{~xshxk^8D6T9>krC-Y%MaqI6~vur&%J+|!*vWpsG9CU#gK%*de$Pe^)O
z+}4PXMLWP~e8R+P1@^@2@qc%ra|x56T<YIE`1yx27XE4-0nY>$t>+e%*(rRVNOVsf
zUznnt5h)0c4&Hkd4aobQyTHUBC4G15+c7UPvMV*|0NVgNDJ-ZFe2)`6GlM6=4LM|Q
zM<nR)9xD`5{t_`0MEGj(1tSNo(x)C-ch6!O-ljfoT_VT?eLwsg^i3b{77nMepyrT?
z1Ob<0j58Ekist&flX{~J%pOBACya>09tRS)lv+%qmF(8-o$2e23zVIqcktI~6F6}`
zc=5)QB7-mW=q%!SQAqp~a+r2DVV+np_UDNnrRW6pKJu0d#H4qh9;3yJ3?aF|2!N(5
zz^fwBH!581a|5^CKFzpxWKsAdM5mm-82fHCzvQ#YG{Xp#Z|0SR&aeG9UK-;(-f|h}
zw3A+Bn(gRc-8*;FY_Qa*f|NYXCJCuOetGIL5mkYr6g-NH0n2|dNs|C9vnZ}fFI3k2
z^tD_if~wObnEkpVNIz5bV9JM?L^OgstnYC3UBS>?JHmOqIL@vsv=SGhOEPq@-$KDi
zaO_5%mEMU8B6ZN8Uvcny%c>YLG0nbTT6zm_;VJ6fMj5h~40!S(+S4a_(H*rP|6Dn6
zb(dM4ZN8Zv3%)!}h}_EG5?@@*YWl&sk3&-dULH7o1zQ~sU4cD}m07&4tb|tmRJLPN
z1uMQ-!Vg5qgXVRSbeDF8OxyW;E|{%)-x%GtY$?V#Qlo-=p2Z34&CsOpN?|jpumTFV
z84yur&g=~$zu#NUT6n`16=}jjb8rQw3JPEm80hTHh+g24GmCd?QGZoIeMyDf|Iy}r
z`K2DQ_2Y|csF7fvfE_vGa*{gNyqbVNO_~*IYbY-K<I?%#CELRoMC85Zp3)ZH_sKsO
zz(l{!`m+hq?kIVm^(Sis9Mm+q<yD7s@R(;?liKhn0wZn3oF<hi|CDYXa-690fNog=
zU2)Gv=F)B>x5pV@FrBq#z-Em`pUlg{?V?!O60Ra@lwl4PT^Ot(q}1qK^`872Ohv~_
zpSZ_D6-MYm`ij{V9SR|`tU-FI&Ms>}EIjO7BQd_$(ZHKH@3&&Y#>@p0!{<QVKg$L<
zTkh``!>w13$G!+~F-&Jjv4~>|$%vM&=<vWH78DU2<u45T^mWMfUpIw*^z{)DAsO^t
z>I0i^?vK+p^VF@USFE+q*6AnTyi-L{YcjhIeV1%4o2^X`i9p9<_69XN*G!Vxe9K@O
zfeqvb<@z23BQ8weSI;1m=1&fK@&_~utwfiXzPxP5O$N?c`Ma3|95Yt7Os-1gEFn!_
zS1>D^i`l#{%Mg0*9!7&%s9S)HyOSG?P!X{&h-;Z7KYCd*9k}pQkyt!JtgE6lRU&>p
zquSv_DJV(_g+x1Cy*^7-<LYpBQxC0>MoR4tt7|D>ZljqHz;4-2*ESx7gyZ@;PiJcL
z-JwtoL}b}^t*?wiF4|npJVqiv&&|~G$eODnI|oQZ?Z{wrsU_F3?8#MI*`Fi(xvuSB
zZY86Y(z70pB`=aBO=VC((WjwmKO8Kl<W^3VT}3rA+p-4)8A|f$Z~3UB<!u}=d^L5%
zMSR96^_d++C1X`Z_x5mZ)Tr><teKgCg?4Hqe=#v+gb7C(3?SjKm@c5K#WB3b9O!kf
za4c#4-QL;GCup=EOfGhbsfSd#6PFFOHQKFD*>OG`cUkbs4pD$B<r1H{uwF<kEBe!@
za{dxmrd#coh=oH;OeEp}<y`d9ZR4UX-)J+*4~{bipv2yvQNN+9ACOZLFGQiG(CBWj
z@Q|2`Z1?3yHxwvFTbJ~Ks|M9yk-Ea7f{E8+<K;l2^pc73@eq1$Uc>C*0+Mxaao*=X
zRxiBnhULxjE11%Iv*_)6#KlPgdbVS!&czQMZfhV94{?~fuv1BT&rM??VWQ0P3T@cl
zih~+MH9d>erY?+hO2=q<pk1LcS(ut&5SupozJNC2D9J@+J^ipczVFJSf)ANTS@Vq!
zW1D?TO)!}d6s4}ljHngcgg=Yy{TWlIwLqG5>3JfLliz7;^j4IjL7{9UxrUx+XRswz
z4GnRCmwk>)MtF3b$9j(aebfgT^MlbSh*N*vQ*V(WJFeSrZ!{Z-OT|NvxYd~%aKD1}
zc-pcYnjE8f*{inKAD$ubBlu-eU&5Bf6-65y<D{)k+{p3m;w~FXn^$1uz80%Bj)EpH
zmTXFZu)Rd*qd!segY8{(fEQLA1x|7<6c<xQ^Tn5BKXW@u@2%yn%TaY^;=}sKF6JT>
z`UOnc3kiS)A0{x-r}7uZTn`R{tx57Yh!T+*{5{q*1HCK$qw%P$SJe_f?z)$b@?z!V
zcs67;+)x3ghG*t2Ul>O4OoEcnOI)TzFNk2o!n`NwusrR0n*1kfM!unEG4;<*&`x0g
zl7E0d(BX3a$n=!LXjSV{-PGh6DIB>iMb<sUIBhAu3c-UH1cx|-l<gzlY+$*K(R2?f
zV?F;=SWb&d9Cm+T4&!!S6)fPc5GwE?6Xiir2Sa3%(0>p*x8gdLZJq>2Z{p+My=DeS
zX<a4i*IYj=eDA$E8l5_+=Z+@z*86D+M$8G`>DO<B^07+w5@0Ksl8ZB{_%UWYM`Ue{
z0M*72acRA6zMfu$ogi*rL0&ck)B&)JK@VrI4TATcJ>cAaB|cLur~<2mJZstXi-fS8
zrhz8rAH!LNZK(jnLMnS$@i5)wNC>~ZxP2xHd)y~|VRP8)Cs_nv9X!YsZIz{h;fP{W
zOz=jFk8UZGEc5j;y`>%Qb~*ax`6NRB`DEcj=lfOq%gohf_sCPv$eu99Z)vkmB9Ubr
z9S^BAc$BSnHd53DZ#%z5u2Lilc>W(C6npcpJ>GrX_-FkM_l;Ch#qA}-CGx{@K(j-v
ztdvsR7qng84l#?)a!et(OmXTn7$le$N*F{TSU-~d&{+?!7U_a-ioYP;`nCB~C<1_e
zo(%9@DMDZUL#HD}dTR}h^pHBhEEM7?DnPz0MBsa}qa3o5Sscn4a>p9Nv$b=Av&_*!
zE0dCfKCFS~wS=>Re9>$n=xzUO_vd864z&m+xxHZpir|l}>8<m`1sa=xGl#c{gHSqC
za2#qfZE^m=Cj8A4X;i2QB4S8RSo+X~za`N}JoYzWHRn|MaYmYNs;Iu+vGe9w9BPa)
zCs&^=W7uh&pfrTCq!tg3@y6fEg+<xJq}d`PtjA!Wz4dr|T}G(lFm@4DOyWaAc<a-X
z&=yb0X)wp<>)3`HJ=Uz00yoKR%@6BDbuQgEIzo9bEF88gl^bN_Yew82*$&DoqM*>p
z-?o|5t+4vvvzk0>cr}k`A&LrH*wZr!;>$`c;}yEF4IW#-99so5Dt4}_7)L&TIQ>TB
zhMU>#3Cumjk|>7iBGJH3V8;2O1*t&YRp{KJ2yZ8II+rfTL^&ChML_ueSn1Zq^J>Rs
z82tK;x!XM@RDoM_QtH#yLE=WP*mYd0<)4{})4Crrw;|Gv^eGW4zFXyAgY}$D#NB3b
zD=V^ld1j{Wqx1+5EcgY_Q{eb!DII?=aukYv2v(p!q|R;;)U!;9z<*bkQ)gLj{Vh{F
zmASWRYO?wXpDEM*YZJ>wBXx8E?C0oQ_tmGo@XLvZu~2zDO!K2Aqfwgqg03?YjA7Nx
zOu1JQcMUYds81F7<G8Xe4x|i_4c=eOr)nAtM(5vJdDU^~Qb@{cg1|?RN5gH&r=h1x
zs8FXOuZ)G=IR|kKc_o+?|3skjX*l#J?44yO$Cy`m$JV7)`6&y+Ivyx<Z|$j{u;dC}
zFQP2^UN<TJRy`SzjhQZu^RRf>Udu)I4SuXlKa;G}POWFy+Kf~N8QIL$dCvN!hwrJe
z7X)*YOO#XOxy{z<iYsF@Wp^32u7E^yC=3ldlWX^LPgv5-IRA-ItmZ5(*zn|FzMSOA
zcA4gUuJ6cP$hnibF1gPlx$9TcijTnj2Gmgry*O?C)GlM8H+lyVlc_Y>UjAiUVmorW
zXdSc`M-hqh+KQ;DY)$Ml3q>-Fk-Y9QT!Sx-aWpAy^JsRU;Lrr(FBCBJfgJkOiRB#+
z&i({${z`PvCTPpVsl1N>n=ly^#AE)9Reb{njPUB-z+u%6p*SfYVPl^1FCXSNWxeKl
z*MnkGaJk$??Qi|P^7J>Y?k#$uS{xxF`2x(?cS8f-j?p$fqJKE5&JQMjv{%9^O2{J8
zj=!0Cz#{Za$^$PUkRDy-sWMVkieVbNfU?LWU`Q9QZFMn%sDKz9rqIa@F&qS^ORE$5
zEkcsD9rf9-P2Fq4J~W20e@#%aZXxT`7NX9z5a+5F*A}gf(iwtql?M}L5ch$ZsnJ4P
zPctTFA5$=Y=<pMcXkfymd@2zi0}B$ZZv}L^ZbBSa^?)k3i#W-p?qz{cg=It(mKt>j
z^q_|X^}L*D{`i&fd>^AX5YK{y5|!or&}k0V9+4&kMB<fTvUp8@q;~c505SWs_~)JW
zgJ}tL#&b9p8l@C(QY7ILa!o@asl8e|1^;*4?>R7v5#_oc{k4LA-^73BXZ!*X{d#>f
zd88Kb&Q@7|72glY0a>@O3eXL273M~b^CCNq!6R8-+nkpokyE0UqXu~p4?rMO!ZDG5
z%m@1X_L(xT?ZEdIk_t)$C@^wBq7S4r1CCWwZiZlZ<lo2X9?N2-87LnH^)IjI5##hP
z*`|I$U`wYg-DcRN>66Iyb^{#ws<@wp>t@Yt8|FS=qHcH1h*|B(%K+Qeh4K_F5I1mX
zL#c8SN}rHS4p}?&V+V3=NAbdz!B=XGP`!=1$FtJ~@s>=}RTBl|LIuenCc2U3Y}=GM
z#woX9Pt((!vt6j(ZG&rZ#$=`0Y|`<bSa@r_tT?Xb!RP^JI6E()P%+{C5n+j3d)eDQ
z^Cr0LWO{g0rptUX3Q7X$Y<9)wYM*boI!L{g;-rwOVJtR}wuzpSm?K#f>UL=f67=6x
z?C(@LdfEtWO6#WuCBodsW<i`O)9W~=(Huh6-$cDBuSb|M%b4m+u0Jf%ZDoI#DxbyS
zCb8nwK`qr`$J4eKJ!o-7#R66qS76AY`!4A?-g*W)zAj)u*xo$o?2>RqDQcW^!{0`$
z_`I&Id@l}MmRwR(CNA<K^uIIB=M~Ej!Y25*qd|)iv2(YTfpp7sM++?L9SBjoU~#R4
zqjroeyLM}u-MQE@EH(M~d!UE;*#-Ux254|_K#u61oVPTLP)sJeTPy0^YvU682hY{s
z*PO)J+YaW3fF(&6suskx9C0h($K)Fiifr9W2X6{qzLwZ<MCCIta|;1N>CQ~1+&~8`
zZ1eJ_ME8Kf2{#Xz5N^xr-<HnYH5d;`+1pceIEZV*;P7m0et@S!Btd44#{jgQmdtZu
zd-UbkJ8V;F%sNvBRrs~{)MY{fc#Ne_W1naJ=O}*x@KtFE%J#fk<}wGp<L0sGm8V?9
zN%bWN&Wcz(4BB>a+#gO#-gZbY3#dEhqf@sn{0QLj;Y?IMWI~_FB)B3WLLuKzu-?I#
zoiU^7>z!YJC|9Z?{AD!KsLY^bfm4c(D@tgP;-hi#t65-Gq!Nyln>?T=e-0g-EwZzW
zaUH)!aZ971&?}dG^OSz)HwPJ_g_TH?MLkT>1Qiuk?}b?biG%waEbMC5_`u&&O&3Hq
z?rPZ~wOF%Q?>|M$YyCHgVqL6%r!vSvZ5!JuC%vnn&x&}1c(5@!lL%_DvG&UhvnReY
zV*ZB6oM;rLZl1dU`fgh8A?(JzcX{zWKFT~jX8af@>sy|DRVP*x4k9<{EumiOKys6?
z&d3NEws15_&@mCV^s)jas*mXq#Jygq_ef5X!UQo+$|DCTyZXRzD(Z09XA3VgAL;Ni
zq`(W*F+#rO^WQ~{Yo4cfU<lST5+WwotYSi@v%O+;v2RG)P(v@wqDZ*vN<i7-Kf`)E
zJ(2E_$CY2{aG(^-ZE$AsTKqn=$Gy-2Q;BOh+{{HuC%iudZYKPSvkO7G>>rIk>{e(2
z&YCQ&k%w;hHnPL!0zy=#QK1>%+>=v|{JKA)0dA^QcYb5sbM<tdr68@a62+eF;q5}M
zHB4Tdliah4Eas}(3h)}&syEUDQD`PhEgwO&mr2@`W12oGwAgkJZD;ApL(e-0?xF5&
z<`RUOq-V7#UcE8oKasLJ%s9MHq1ru)A7@*1jiJ8dizj!>$C)LogxBVrrI0O;bUVQ`
zyIMzt4fgZ<1W*{ogL0#Zj)|fu2PFvo$M1wM&fZn=Ypb$Z9+7)0Hfh4xExw&C424@c
zOhSlVROHLpI*PwQM|F50q^4wp`j+T_^o}$o_NEVHItc4xnAw~*!#0YALgzPbDb?_q
z4O0^X25$MlhGZUFNWqr@$rzyvZ^L2RUy1b-7<zRA-GgCo%B+r+KgxM_ym$za&e~$|
z3G+;b$L14BcUCSfR@Wm$IY<ozGi7qV0p*)m#KSWvvdGQMLNaF}G1u8?-V8Mxb<$oI
zM)yTlJJc@((ly3e>g#osHaHXJWvC~Svyvz2gn!1IIV`{;62*(2tJ^()Fyg^AbbqWS
zY<QAJ2!r=cPU)h07ZS-r+Gzi>;!j={TvhEzJ7Z=e&)k5sC#6f~eLqy-xRiA6IF*V=
zqOkN0+VC(!m!(ysgJGbi^|5Qb<+4D4zJ~>4ER>#WK!(-!J`rmli%a4Cn{%p!V<Zp^
zm+-3DYGBUqan<t&ljw1flDoE`!`sYs0U=2NA614He>1fI@DMcu$PR3mUyW3=)$hw-
zfq6?a;=^U-Z?_}aOIgT&1+z^ojV2SbUYeXFtvi<7>({`ASBN1Z1*pOY8xIPuaHi5<
z9tWbVlmzpo$SB}?g_XE(G3JVWbvrL?-x6w44z8=eFH_`Z#_p+q3^h*k*X(H$2!}<<
z!D-;mIa!K_F3t?QP!sYK33(c%rZut+=b3~O2S94ZLMlt;sr{q->~e$Rtf8AN+3-W&
zFzO#ScN~P+qwcLgho}51Re`1EVE>8GfhVHENaSolhBN^THHkwt>GB|4XN(&emm22W
zX+JAU*b;JA2<GI<1Sb7`<4qWoFSC}$>Bx4!Tw`g%oGn0ocKCY^g;xIK@^x(|)x3oB
zJ{5<jC{C30%NR#v8BE#)4p&GFbP9<bZSuRZ_4w4y#km9I{pqM3nQ;&e1Ozp}>cgw|
zmOOogqmaZ6;C$%NLdRif(t;*fF}?6~;nBak@-Y!bM~IjXhrR|3`YS>6tmBC*cS3D4
z=z#a?ywB}*F5(@H_2~b=-^%!6OP=mFdHU*JiNX_u;k{falRl;d9t93674Pi&>f<&3
zPJS(RgS=eP-!J;IK@js$^9jx!3x&DrKZN2yXJ;e)#2Sbp&qPZ0_HdYd6R>amjx&jV
z7)5?Hqk!+q*Y(5DEf~LtJ}T?#`L4Wpy2>o~VFw}L{ZD?dbmLsH@)d$xfnTJ49XvA3
zv{gx5uwPgZh%VAw8{UM`R!8l5mtB^DIP86^`|+|7;{sXWUV{a{k8>boCp8<vgdml0
zSl?G-C5pA(*I_Zc@OCJD(ssq#<z<#ue|taFyJKn(MdMZ<9M$edQ3uP0NvIU`nX9=;
zakKOnG5Mf-igV$d#_s~vtXMscx}pLy3@TJ&7O4&?+?Q+Qt8EF3TWkFQLbfc8I-EeW
zqAk8<4ad6qYPLUJm6!bj=&6HhIhk^lDS1E8T(TR0!PZbg=VH-|7oDC)i}!IpTe$We
zrYOg{J^t`&{3*oF+idnbQWR|r{IEUQ6|*}XmEi~$zd!!O6u6-h*BfM;$&_Z{Iw*2K
zK!`-aU<TdwL<uAQ-KrtoxZX5`qnSpCkQ`vV3TIV74XA1aFEHm5=na27c0~@x@GTr>
z3r!>w-9h7Uw`YdwTf2@wVR?X+E%Us%gmv?e47scCzN6`3NW^>ycO1j-?G98gdrfpb
z2G1v3-b;-3J)hE*{E)*8;xUw#Evk%*Ft4KYv>s1k(kAoY4Iu|K;BcP^{e|Wc$bo(N
z9kiCsnh5ML#}i5K-2Uof-lLZNai-k&itj_<O#kH`+|m>v5?X+08~Q0-Oql<6TzMl2
zOb({5nDK%2!=s3h8rr+d`}*ZiXZfw4R(CQ$i%85mbGu*q8u)2QcFOfJV)z`t2Og{x
zR$815tAL{r<#i#Pj?Q0|J|@T)BWL?~Ze=@w<#EB@St``$JWlA-!!9UwosGtfPpuDD
z=pkOlm%2vE*RkLz>PE{-t25WObK(OnI-}q9HqJ51e(xb`k3$9z4s6lsP7G<xsK-^O
z+6UEV%%+%?Y)Ao)Lny5Gg+D558cqjms~Rc-(Y8wlt?HEz+L3&+E^uPBdg&Wa*tAFT
z+u!m{n`II@)IXz`h~A*VYor5g8;-GQ2lPl5A_WlWNwxyk8XO;R<}NjZZK?zCTIvrN
zlek%E+P(rhl)}ArbD1)X?&dk^Amx{-a4K-a?s9azc&4Y<!OS<a@xf(EuJfZoJ4=CY
zljD8u4TGJ|z|QBwjSW6<H=g?m8?g~92^|4%0;R8%gRu(r{lspl`Gp#8{b#KS6D|v|
zoOhwa9;&b+ENXY*%|V<ZaIN+V+OgLxLdg2E2?@y{Tm{P@Qj&JAW(XPw9@A!Xd<d08
zxSOzoe8odb_50t|l}<Bzs5h3A%Vs`EZekW~YdV;EG8oy}(}S=uW}rv$v%t{kmMDKd
z{{TWgo#3J*D6bbjp;;a~JL5ceE~yhW>rX`C(<ceFkP6vg?IUe17F|pFr?KXCYqlSp
z-2^v;1zO@n)uVJ|{k$b64zldwHQx-s7L-t$G$1gkO}}Raw?-KiP0SXsA7aZ_@luTr
zcT2pPPNO-K6AdsF_aoRENaF0#Zo-{hY2(7SoztLX3?227H!RWH#;m^i%$e!Xp_+p~
z-#?^#bj#ljMm_6Rz`1E#Pm>g2IC3F$R~rXkkPD@U5jA0%A_`X~6BZFcUB-X+h7qWn
zqydhgU;hzAwrEyDL0#682O63$X$Js77_MZW?wSW~7qcwnL^ikhv6BKNe-ZhWUUzKH
zJ*n5Fvbb95)rAWCUCubP%KF7L$FdkXDxP<JdSBRyZW&6uU2sc@<{HGaHNNa?cllGZ
zP|YadOS2IdA5;CO?L#!R*mPX1#gFg37`!<Mt&i!roL|#1inm2YCqaf}e_STg`WXh|
zCT*cHNn=a_!y0Lkcl7L^l5Mq$%I1Vb9-~T+EaGdVE2oCP+$Kldw45u(Xz*k?yV4n*
zrcKj3)WgvQWtekE$zlsZiRT(?nOayUJi-|g{6vIdP?m_vuVJSAAUwF$t9}1?^}x57
zve^zT7OTQB(BD7iKb+^j`SaJdPIvDM0DaAjF_}@cK7g3uX#GTq<xStPkx#&FCm`nK
zIp)ZrjG$LyBYojhMB~CR!Hcxp#lrh`+(6%Y=fr-!tI>_LAYv>w2XA&bL5-i6&zIBz
z(1CaaK(JcXQ{Hanb^@x02A%$g4OwYncKQ3X39WFbl+~j^>l;55FBZJGzprqL*)J{}
z;@s4@9x^zwu7NpPzRX@e*hEDY?z>ROn~KLFn7RkQor}Z_wCDR_WfYX@q8xFv`zr-r
zYg^Cv<c*t|xQeRI=A;vWcGW7Ld=vIs3I-6?I(`i)oeN+;2M)pYYzUtB4qxBO?xS#P
zg=B;cY*erL7$(5@&(__7S79c~&)5E-W$rNdL&kecdpC8A%@LGx8PkE3r38<!eo{*I
z0db!bQu3#ju-oGvhiux%RE?EPq?8NdSrpD*>e{owH%;7jxFj*YdgqqKk*$0_xmI-Q
zM|_lDvQ}GSKk%QO&vy-d3Dqz8#APou51a-p0E9QiA83dpWh1|4<#9coB20w2!mOI5
zh&2-<bZve_MuavqaE#Rwk9d3=9Y9($=1AG>-mUk9{yxF%U4TOhEA3-}SztUim}rLd
z@>E5k_Cu9_8A(Z@O%XEzo`#<D##o%4xnIG|1H@~TF5<ZJ>gThxk!Vr6-?;J71eH;P
zV?oq_mjhcmHeW8Z<H7wIxk&ipP5dIH?5?MIy}G*ydQB}iGC{)ZPY<z?pL2{^iH4ed
zaQPII@`V^LsP>Km={K}DG`!%92c9KrEo^3ie2@gu@nr~$EjI&<Pz)sdsC~3iCq&AT
z&RZyte(*<USY!(V+r(tj-_PJ+Sk9!0va>o3QA98?xu(#sQ+cs%j!%Ypz)uJ_V@p9I
z%?ItBm%qTP48h{<!ew6)G}Rwc%KLdj2Rab+_HK++GoR-Dyoz1M@nZIws8=|2UR}{&
z+qJ~L`>5khBbAIqf1&`c;26}E!gDr!3uJ^%kii_ASL_h5AYq&Zg0WDf>GHLQiOEO?
zjn3mJ>SO!e{1#jyx?L`>)|lLiceG;>IAvz73|4=Hc;}**r6z0J-Whc{P2z)v<ivV{
z%qj=|$P0iK5ZRxydAO1H-n{KCPw8X)&R!i-{kG3*hWWlUSblhiDjbI7)Cq$M!VA%P
zhf?<rOq>7A{cwDsKM1M(b#**l$Z|2UEB8YS2Fa3PhJ6a;cHOOCIVH%W9aE;8oHDKr
zjYGNaeYY4Q1qC%*8}Cg6MM_9!Fjs6HrN^pqe3=ec!N?v+NUEo6!fT;Vp}zyo$qtLu
ze&~3zRa%>J%0IN(2bH>M$;{{g;;Z0A-V{S(%%>XV*K4Wl(Dym+>O6mZdiJw@Cwu>6
z{&+gV=`7Gup{%h;ObopR44^<o2g~a+SU@;lN@IkZJhr9$(pWIksj_r@x_`<oeGd=m
zbz!Cr3`^f$BMc}tnbKwd@fCFol<;d7J+?J7y=1lM=9LfXa~s2`1g@c=IzI3gy3y}R
zJ_#6KMXJaEwjY;<4tueXCEER#tv@N|S(%gSCfel3HFKgieu#@wpIwvPxtWS_t$(8a
z>;S&3%6u(q&`tT6^*FNB654svLoxcbXL1Ra3KOep+&Tw0aP-UK+mf!u$%@jU*Z9dh
zjUM?6x1wczEEW37LSdA_>?Z&S35VuQdpj3=OjKpR1(+mEk>nfKkhC@cO8Sh+tJBeq
zB_!WH-`DlhZUhhPVo-jYaQ=cgTs`AgLdqw<%db1GvI*0;@Tv54u#}}I++72aWk^nO
zRvt6>TqP@mv@AyC>XX3ReekD4Yb{F~llyLm*3|1vN?&66Qz0&d3BEOTQwP4AeuJ&8
zs$*5q_qHqNm1~Kj4o<yeA39WrIa+h;fH2VyQErTOhjG&P@(f(W*`Ug^a~xf(OzPmJ
z6k^d$ZmcuK7%7SnzOLFX20(lt-d#pZW|pv5s)eUK#q<($Rd)-=f)lFb3zklpq2GiS
zWd81p{RxrJoT*!@VMf|Z&-ru5bHL@D2)NpIr1AO%$_K;z9V6Ajqe>KWzQwh%kk|UC
z4yE5K($Xs#w>Lzwzxq{P#?5$F#M?rz!+odW_<ORsypU(`8D2FmdGH0)$Fz-jf#n_)
zaYD?}&IcPDh4U$%ah1Ta!F=E*N0$VmP*@!~Q5}-Q<uxiRkC06Nshy=nu)oy}<&Prr
zPQ!&Z-wDM`fds}8*K(Yyk_@G{C_&sF;^Gf3GCOcni*_xmcw}lqB0!#Rj;7$_`KR?P
zUz_{FrnM3qB0jmtma{BZoM6m0E5JBE$ENGY>G+Nic*u5OPLbqR`fI!z@1-bRlu&uI
z=OK~D+-Ei>w2W)!)XF#cz37aJPtGAUG_G3x51KwQBxT_~;Yw1>IvXk}0!s<K6cgpC
z1WYCzLkx12j*V9*R$NCWJyN-e21kSA!xR|%)N)<M&`ao&!t(XxBiosv^5DQ`O4WHe
zWO7NSs}WiRIh=_rJ`?xG=v<&8qlv^w<)c;}`*Oxo0bb`>!;nu?^y^FL#>zv#$RnRI
z*C4}~qAlE6&96-YaZy6wd^jjwc_rOvp+{0yToGoOeC1DezKtC;JgI0R&*Wi%)tToq
zzm^s*@cq!=L#QJTYm&WKO^!#qB!hr`U>UA=&l=5=`FJIWlp>x+)9P5F#d?6uVh|6N
zEt@knQ)5mK=Yewop_CXtAJw}E`OhuITL)zt59YGk_5kI_J+PK{ZiO1y9CVjpZSz^Y
zj%U48NhGd9Nkq+OGbv-o{jH9N8DUgaOm#&tpyzVYe$^{xQ$b=T^eY)oGUba1A~rVN
UQ|H&=e|}?=l~R(d6gLk1KMrQi&j0`b

diff --git a/lib/device/zigbee/index.js b/lib/device/zigbee/index.js
index 178e5543..fd7dbd6d 100644
--- a/lib/device/zigbee/index.js
+++ b/lib/device/zigbee/index.js
@@ -9,6 +9,7 @@ import deviceSensorMotion from './sensor-motion.js';
 import deviceSensorOccupancy from './sensor-occupancy.js';
 import deviceSensorSmoke from './sensor-smoke.js';
 import deviceSwitchStateless from './switch-stateless.js';
+import deviceThermostat from './thermostat.js';
 
 export default {
   deviceLightCCT,
@@ -22,4 +23,5 @@ export default {
   deviceSensorOccupancy,
   deviceSensorSmoke,
   deviceSwitchStateless,
+  deviceThermostat,
 };
diff --git a/lib/device/zigbee/thermostat.js b/lib/device/zigbee/thermostat.js
new file mode 100644
index 00000000..3aa429d7
--- /dev/null
+++ b/lib/device/zigbee/thermostat.js
@@ -0,0 +1,288 @@
+import platformConsts from '../../utils/constants.js';
+import { hasProperty, parseError } from '../../utils/functions.js';
+
+export default class {
+  constructor(platform, accessory) {
+    // Set up variables from the platform
+    this.hapChar = platform.api.hap.Characteristic;
+    this.hapServ = platform.api.hap.Service;
+    this.hapErr = platform.api.hap.HapStatusError;
+    this.lang = platform.lang;
+    this.log = platform.log;
+    this.platform = platform;
+
+    // Set up variables from the accessory
+    this.name = accessory.displayName;
+    this.accessory = accessory;
+
+    // Initially set the online flag as true (to be then updated as false if necessary)
+    this.isOnline = true;
+
+    // Set up custom variables for this device type
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId] || {};
+    this.tempOffset = deviceConf.offset || platformConsts.defaultValues.offset;
+    this.tempOffsetFactor = deviceConf.offsetFactor;
+
+    // Set the correct logging variables for this accessory
+    switch (deviceConf.overrideLogging) {
+      case 'standard':
+        this.enableLogging = true;
+        this.enableDebugLogging = false;
+        break;
+      case 'debug':
+        this.enableLogging = true;
+        this.enableDebugLogging = true;
+        break;
+      case 'disable':
+        this.enableLogging = false;
+        this.enableDebugLogging = false;
+        break;
+      default:
+        this.enableLogging = !platform.config.disableDeviceLogging;
+        this.enableDebugLogging = platform.config.debug;
+        break;
+    }
+
+    /*
+      **************
+      *** PARAMS ***
+      **************
+      "subDevId": "",
+      "parentid": "",
+      "fwVersion": "1.1.1",
+      "battery": 100,
+      "supportPowConfig": 1,
+      "ecoTargetTemp": 70,
+      "step": "008d",
+      "limitVoltage": "0507",
+      "runVoltage": "0593",
+      "temperature": 230,
+      "trigTime": "1698510595000",
+      "mon": "000000a001a400be025800a0025800a003fc00be056400a0",
+      "tues": "000000a001a400be025800a0025800a003fc00be056400a0",
+      "workMode": "0",
+      "curTargetTemp": 230,
+      "switch": "on",
+      "manTargetTemp": 230,
+      "wed": "000000a001a400be025800a0025800a003fc00be056400a0",
+      "thur": "000000a001a400be025800a0025800a003fc00be056400a0",
+      "fri": "000000a001a400be025800a0025800a003fc00be056400a0",
+      "sat": "000000a001a400be025800be025800be025800be056400a0",
+      "sun": "000000a001a400be025800be025800be025800be056400a0",
+      "autoTargetTemp": 190,
+      "workState": "0"
+    */
+
+    // Add the thermostat service if it doesn't already exist
+    this.service = this.accessory.getService(this.hapServ.Thermostat)
+      || this.accessory.addService(this.hapServ.Thermostat);
+
+    // Set custom properties of the current temperature characteristic
+    this.service.getCharacteristic(this.hapChar.CurrentTemperature).setProps({
+      minStep: 0.1,
+    });
+    this.cacheTemp = this.service.getCharacteristic(this.hapChar.CurrentTemperature).value;
+    this.updateCache();
+
+    // Add the set handler to the target state characteristic
+    this.service
+      .getCharacteristic(this.hapChar.TargetHeatingCoolingState)
+      .setProps({
+        minValue: 0,
+        maxValue: 1,
+        validValues: [0, 1],
+      })
+      .onSet(async (value) => {
+        this.internalStateUpdate(value);
+      });
+
+    // Add the set handler to the target temperature characteristic
+    this.service
+      .getCharacteristic(this.hapChar.TargetTemperature)
+      .setProps({
+        minValue: 5,
+        maxValue: 45,
+        minStep: 0.5,
+      })
+      .onSet(async (value) => {
+        this.internalTargetUpdate(value);
+      });
+
+    // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
+    if (!platform.config.disableNoResponse) {
+      this.service.getCharacteristic(this.hapChar.CurrentTemperature).onGet(() => {
+        if (!this.isOnline) {
+          throw new this.hapErr(-70402);
+        }
+        return this.service.getCharacteristic(this.hapChar.CurrentTemperature).value;
+      });
+      this.service.getCharacteristic(this.hapChar.CurrentHeatingCoolingState).onGet(() => {
+        if (!this.isOnline) {
+          throw new this.hapErr(-70402);
+        }
+        return this.service.getCharacteristic(this.hapChar.CurrentHeatingCoolingState).value;
+      });
+      this.service.getCharacteristic(this.hapChar.TargetHeatingCoolingState).onGet(() => {
+        if (!this.isOnline) {
+          throw new this.hapErr(-70402);
+        }
+        return this.service.getCharacteristic(this.hapChar.TargetHeatingCoolingState).value;
+      });
+      this.service.getCharacteristic(this.hapChar.TargetTemperature).onGet(() => {
+        if (!this.isOnline) {
+          throw new this.hapErr(-70402);
+        }
+        return this.service.getCharacteristic(this.hapChar.TargetTemperature).value;
+      });
+    }
+
+    // Pass the accessory to Fakegato to set up with Eve
+    this.accessory.eveService = new platform.eveService('custom', this.accessory, {
+      log: () => {},
+    });
+
+    // Output the customised options to the log
+    const normalLogging = this.enableLogging ? 'standard' : 'disable';
+    const opts = JSON.stringify({
+      logging: this.enableDebugLogging ? 'debug' : normalLogging,
+      offset: this.tempOffset,
+      offsetFactor: this.tempOffsetFactor,
+    });
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts);
+  }
+
+  async internalStateUpdate(value) {
+    try {
+      const newValue = value !== 0 ? 'on' : 'off';
+      const params = {
+        switch: newValue,
+      };
+      await this.platform.sendDeviceUpdate(this.accessory, params);
+      if (value === 0) {
+        this.service.updateCharacteristic(this.hapChar.CurrentHeatingCoolingState, 0);
+      }
+      this.cacheState = newValue;
+      if (this.enableLogging) {
+        this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState);
+      }
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, true);
+      setTimeout(() => {
+        this.service.updateCharacteristic(
+          this.hapChar.TargetHeatingCoolingState,
+          this.cacheState === 'on' ? 1 : 0,
+        );
+      }, 2000);
+      throw new this.hapErr(-70402);
+    }
+  }
+
+  async internalTargetUpdate(value) {
+    try {
+      const params = {
+        workMode: '1',
+        curTargetTemp: value * 10,
+      };
+      await this.platform.sendDeviceUpdate(this.accessory, params);
+      this.cacheTarg = value;
+      if (this.enableLogging) {
+        this.log('[%s] %s [%s°C].', this.name, this.lang.curTarg, this.cacheTarg);
+      }
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, true);
+      setTimeout(() => {
+        this.service.updateCharacteristic(this.hapChar.TargetTemperature, this.cacheTarg);
+      }, 2000);
+      throw new this.hapErr(-70402);
+    }
+  }
+
+  async externalUpdate(params) {
+    try {
+      if (params.switch && params.switch !== this.OnOff) {
+        this.cacheState = params.switch;
+        if (this.cacheState === 'off') {
+          this.service.updateCharacteristic(this.hapChar.CurrentHeatingCoolingState, 0);
+        }
+        this.service.updateCharacteristic(
+          this.hapChar.TargetHeatingCoolingState,
+          this.cacheState === 'on' ? 1 : 0,
+        );
+        if (params.updateSource && this.enableLogging) {
+          this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState);
+        }
+      }
+
+      if (params.workState) {
+        const workState = params.workState === '1' ? 'on' : 'off';
+        if (this.cacheHeat !== workState) {
+          this.cacheHeat = workState;
+          this.service.updateCharacteristic(
+            this.hapChar.CurrentHeatingCoolingState,
+            this.cacheHeat === 'on' ? 1 : 0,
+          );
+          if (params.updateSource && this.enableLogging) {
+            this.log('[%s] %s [%s].', this.name, this.lang.curHeat, this.cacheHeat);
+          }
+        }
+      }
+
+      if (hasProperty(params, 'curTargetTemp')) {
+        const curTargetTemp = Number(params.curTargetTemp) / 10;
+        if (this.cacheTarg !== curTargetTemp) {
+          this.cacheTarg = curTargetTemp;
+          this.service.updateCharacteristic(this.hapChar.TargetTemperature, this.cacheTarg);
+          if (params.updateSource && this.enableLogging) {
+            this.log('[%s] %s [%s°C].', this.name, this.lang.curTarg, this.cacheTarg);
+          }
+        }
+      }
+
+      if (hasProperty(params, 'temperature')) {
+        let currentTemp = Number(params.temperature) / 10;
+        if (this.tempOffsetFactor) {
+          currentTemp *= this.tempOffset;
+        } else {
+          currentTemp += this.tempOffset;
+        }
+
+        if (this.cacheTemp !== currentTemp) {
+          this.cacheTemp = currentTemp;
+          this.service.updateCharacteristic(this.hapChar.CurrentTemperature, this.cacheTemp);
+          this.accessory.eveService.addEntry({ temp: this.cacheTemp });
+          if (params.updateSource && this.enableLogging) {
+            this.log('[%s] %s [%s°C].', this.name, this.lang.curTemp, this.cacheTemp);
+          }
+
+          // Update the cache file with the new temperature
+          this.updateCache();
+        }
+      }
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, false);
+    }
+  }
+
+  async updateCache() {
+    // Don't continue if the storage client hasn't initialised properly
+    if (!this.platform.storageClientData) {
+      return;
+    }
+
+    // Attempt to save the new temperature to the cache
+    try {
+      await this.platform.storageData.setItem(
+        `${this.accessory.context.eweDeviceId}_temp`,
+        this.cacheTemp,
+      );
+    } catch (err) {
+      if (this.enableLogging) {
+        this.log.warn('[%s] %s %s.', this.name, this.lang.storageWriteErr, parseError(err));
+      }
+    }
+  }
+
+  markStatus(isOnline) {
+    this.isOnline = isOnline;
+  }
+}
diff --git a/lib/platform.js b/lib/platform.js
index 56d1ed87..a8c86681 100644
--- a/lib/platform.js
+++ b/lib/platform.js
@@ -1506,6 +1506,14 @@ export default class {
         this.applyAccessoryLogging(accessory);
         accessory.control = new deviceTypes.zb.deviceSensorSmoke(this, accessory);
         /** ************ */
+      } else if (platformConsts.devices.zbThermostat.includes(uiid)) {
+        /** *******************
+         ZB SENSOR [THERMOSTAT]
+         ******************** */
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`);
+        this.applyAccessoryLogging(accessory);
+        accessory.control = new deviceTypes.zb.deviceThermostat(this, accessory);
+        /** ************* */
       } else if (platformConsts.devices.group.includes(uiid)) {
         /** ***********
          EWELINK GROUPS
diff --git a/lib/utils/constants.js b/lib/utils/constants.js
index 3cd1b678..8d640a22 100644
--- a/lib/utils/constants.js
+++ b/lib/utils/constants.js
@@ -344,6 +344,7 @@ export default {
     zbSensorContact: [3026, 7003],
     zbSensorWater: [4026],
     zbSensorSmoke: [5026],
+    zbThermostat: [7017],
     group: [5000],
     template: [130], // SPM sub unit
     cannotSupport: [0, 65, 118, 119, 120, 121],
@@ -373,6 +374,7 @@ export default {
     'currentTemperature',
     'current_',
     'currLocation',
+    'curTargetTemp',
     'fan',
     'hue',
     'human',
@@ -525,6 +527,7 @@ export default {
     7006: 1, // Zigbee Curtain_Support OTA
     7014: 1, // some sensor https://github.com/bwp91/homebridge-ewelink/issues/494
     7016: 1, // https://sonoff.tech/product/gateway-and-sensors/snzb-06p/
+    7017: 1, // https://github.com/bwp91/homebridge-ewelink/issues/518
   },
 
   cannotSupportDevices: {

From 7c80796e00916de3a17a0c5ec021694ba5df5e19 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Tue, 26 Dec 2023 14:26:05 +0000
Subject: [PATCH 3173/3183] 12.1.1-beta.1

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 44a44de3..d5c5015f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "12.1.1-beta.0",
+  "version": "12.1.1-beta.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "12.1.1-beta.0",
+      "version": "12.1.1-beta.1",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index b6846dba..24d3a20d 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "homebridge-ewelink",
   "displayName": "Homebridge eWeLink",
   "alias": "eWeLink",
-  "version": "12.1.1-beta.0",
+  "version": "12.1.1-beta.1",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From 362fc91ab6157bf2b0725701844c4b2e0e837b03 Mon Sep 17 00:00:00 2001
From: Vadim Pronin <github@mail.pronin.com>
Date: Wed, 27 Dec 2023 18:25:30 +0200
Subject: [PATCH 3174/3183] Changed Rotation Speed characteristic for Fans from
 percentage to levels (#534)

---
 lib/device/fan.js | 42 ++++++++++++++++++++++--------------------
 1 file changed, 22 insertions(+), 20 deletions(-)

diff --git a/lib/device/fan.js b/lib/device/fan.js
index 860e697d..c3e16096 100644
--- a/lib/device/fan.js
+++ b/lib/device/fan.js
@@ -52,7 +52,12 @@ export default class {
     // Add the set handler to the fan rotation speed characteristic
     this.service
       .getCharacteristic(this.hapChar.RotationSpeed)
-      .setProps({ minStep: 33 })
+      .setProps({
+        maxValue: 3,
+        minStep: 1,
+        minValue: 0,
+        unit: 'unitless', // This is actually from HAP for Bluetooth LE Specification, but fits
+      })
       .onSet(async (value) => this.internalSpeedUpdate(value));
 
     // Check to see if the user has hidden the light channel
@@ -77,9 +82,9 @@ export default class {
 
     // Conversion object eWeLink mode to text label
     this.speed2label = {
-      33: 'low',
-      66: 'medium',
-      99: 'high',
+      1: 'low',
+      2: 'medium',
+      3: 'high',
     };
 
     // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
@@ -130,11 +135,11 @@ export default class {
       });
       if (newState === 'on') {
         params.switches.push({
-          switch: this.cacheSpeed === 66 ? 'on' : 'off',
+          switch: this.cacheSpeed === 2 ? 'on' : 'off',
           outlet: 2,
         });
         params.switches.push({
-          switch: this.cacheSpeed === 99 ? 'on' : 'off',
+          switch: this.cacheSpeed === 3 ? 'on' : 'off',
           outlet: 3,
         });
       }
@@ -166,28 +171,25 @@ export default class {
       };
       const newState = value >= 1 ? 'on' : 'off';
       let newSpeed;
-      if (value === 0) {
+
+      if (value < 0 || value > 3) {
         newSpeed = 0;
-      } else if (value <= 33) {
-        newSpeed = 33;
-      } else if (value <= 66) {
-        newSpeed = 66;
       } else {
-        newSpeed = 99;
+        newSpeed = value;
       }
       if (newSpeed === this.cacheSpeed) {
         return;
       }
       params.switches.push({
-        switch: newState === 'on' && newSpeed >= 33 ? 'on' : 'off',
+        switch: newState === 'on' && newSpeed >= 1 ? 'on' : 'off',
         outlet: 1,
       });
       params.switches.push({
-        switch: newState === 'on' && newSpeed === 66 ? 'on' : 'off',
+        switch: newState === 'on' && newSpeed === 2 ? 'on' : 'off',
         outlet: 2,
       });
       params.switches.push({
-        switch: newState === 'on' && newSpeed === 99 ? 'on' : 'off',
+        switch: newState === 'on' && newSpeed === 3 ? 'on' : 'off',
         outlet: 3,
       });
       await this.platform.sendDeviceUpdate(this.accessory, params);
@@ -281,13 +283,13 @@ export default class {
       let speed;
       switch (params.switches[2].switch + params.switches[3].switch) {
         case 'onoff':
-          speed = 66;
+          speed = 2;
           break;
         case 'offon':
-          speed = 99;
+          speed = 3;
           break;
         default:
-          speed = 33;
+          speed = 1;
           break;
       }
       if (speed !== this.cacheSpeed && this.cacheState === 'on') {
@@ -320,9 +322,9 @@ export default class {
     const speed = this.service.getCharacteristic(this.hapChar.RotationSpeed).value;
     if (speed === 0) {
       speedLabel = 'off';
-    } else if (speed <= 33) {
+    } else if (speed <= 1) {
       speedLabel = 'low';
-    } else if (speed <= 66) {
+    } else if (speed <= 2) {
       speedLabel = 'medium';
     } else {
       speedLabel = 'high';

From f344a8e5f7100ec5a62d1c2d6ddaf1f75cd988a3 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Wed, 27 Dec 2023 16:33:19 +0000
Subject: [PATCH 3175/3183] update dependencies

---
 CHANGELOG.md      |  5 +++++
 package-lock.json | 16 ++++++++--------
 package.json      |  4 ++--
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 17087ec2..b51a7a34 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,11 @@ This project tries to adhere to [Semantic Versioning](http://semver.org/). In pr
 - Support for ZigBee occupancy sensor with UIID `7016`
 - Support for ZigBee thermostat with UIID `7017`
 
+### Changed
+
+- Changed Rotation Speed characteristic for Fans from percentage to levels (#534) (@vadimpronin)
+- Updated dependencies
+
 ## 12.1.0 (2023-12-16)
 
 ### Added
diff --git a/package-lock.json b/package-lock.json
index d5c5015f..54e1ebad 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -28,11 +28,11 @@
       "license": "MIT",
       "dependencies": {
         "@homebridge/plugin-ui-utils": "^1.0.0",
-        "axios": "^1.6.2",
+        "axios": "^1.6.3",
         "node-persist": "^4.0.1",
         "p-queue": "^8.0.1",
         "websocket-as-promised": "^2.0.1",
-        "ws": "^8.15.1"
+        "ws": "^8.16.0"
       },
       "devDependencies": {
         "eslint": "^8.56.0",
@@ -386,9 +386,9 @@
       }
     },
     "node_modules/axios": {
-      "version": "1.6.2",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.2.tgz",
-      "integrity": "sha512-7i24Ri4pmDRfJTR7LDBhsOTtcm+9kjX5WiY1X3wIisx6G9So3pfMkEiU7emUBe46oceVImccTEM3k6C5dbVW8A==",
+      "version": "1.6.3",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.3.tgz",
+      "integrity": "sha512-fWyNdeawGam70jXSVlKl+SUNVcL6j6W79CuSIPfi6HnDUmSCH6gyUys/HrqHeA/wU0Az41rRgean494d0Jb+ww==",
       "dependencies": {
         "follow-redirects": "^1.15.0",
         "form-data": "^4.0.0",
@@ -2517,9 +2517,9 @@
       "dev": true
     },
     "node_modules/ws": {
-      "version": "8.15.1",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.15.1.tgz",
-      "integrity": "sha512-W5OZiCjXEmk0yZ66ZN82beM5Sz7l7coYxpRkzS+p9PP+ToQry8szKh+61eNktr7EA9DOwvFGhfC605jDHbP6QQ==",
+      "version": "8.16.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.16.0.tgz",
+      "integrity": "sha512-HS0c//TP7Ina87TfiPUz1rQzMhHrl/SG2guqRcTOIUYD2q8uhUdNHZYJUaQ8aTGPzCh+c6oawMKW35nFl1dxyQ==",
       "engines": {
         "node": ">=10.0.0"
       },
diff --git a/package.json b/package.json
index 24d3a20d..680bab6d 100644
--- a/package.json
+++ b/package.json
@@ -61,11 +61,11 @@
   ],
   "dependencies": {
     "@homebridge/plugin-ui-utils": "^1.0.0",
-    "axios": "^1.6.2",
+    "axios": "^1.6.3",
     "node-persist": "^4.0.1",
     "p-queue": "^8.0.1",
     "websocket-as-promised": "^2.0.1",
-    "ws": "^8.15.1"
+    "ws": "^8.16.0"
   },
   "devDependencies": {
     "eslint": "^8.56.0",

From f6537bbea05c0111aa575ff7f54fcd695f90ceff Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Wed, 27 Dec 2023 16:33:47 +0000
Subject: [PATCH 3176/3183] 12.1.1-beta.2

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 54e1ebad..a3241060 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "12.1.1-beta.1",
+  "version": "12.1.1-beta.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "12.1.1-beta.1",
+      "version": "12.1.1-beta.2",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 680bab6d..55dd8eb4 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "homebridge-ewelink",
   "displayName": "Homebridge eWeLink",
   "alias": "eWeLink",
-  "version": "12.1.1-beta.1",
+  "version": "12.1.1-beta.2",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From 87457bbab93f26c0f1ed805bfb991129fa4edb0c Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Mon, 8 Jan 2024 07:31:39 +0000
Subject: [PATCH 3177/3183] zb thermo updates

---
 lib/device/thermostat.js        |  2 +-
 lib/device/zigbee/thermostat.js | 88 ++++++++++++++++++++++++---------
 package-lock.json               | 22 ++++-----
 package.json                    |  2 +-
 4 files changed, 77 insertions(+), 37 deletions(-)

diff --git a/lib/device/thermostat.js b/lib/device/thermostat.js
index 3d5e6576..1c38b9f8 100644
--- a/lib/device/thermostat.js
+++ b/lib/device/thermostat.js
@@ -192,7 +192,7 @@ export default class {
 
   async externalUpdate(params) {
     try {
-      if (params.switch && params.switch !== this.OnOff) {
+      if (params.switch && params.switch !== this.cacheState) {
         this.cacheState = params.switch;
         if (this.cacheState === 'off') {
           this.service.updateCharacteristic(this.hapChar.CurrentHeatingCoolingState, 0);
diff --git a/lib/device/zigbee/thermostat.js b/lib/device/zigbee/thermostat.js
index 3aa429d7..af180a93 100644
--- a/lib/device/zigbee/thermostat.js
+++ b/lib/device/zigbee/thermostat.js
@@ -89,8 +89,8 @@ export default class {
       .getCharacteristic(this.hapChar.TargetHeatingCoolingState)
       .setProps({
         minValue: 0,
-        maxValue: 1,
-        validValues: [0, 1],
+        maxValue: 3,
+        validValues: [0, 1, 3],
       })
       .onSet(async (value) => {
         this.internalStateUpdate(value);
@@ -152,25 +152,51 @@ export default class {
   }
 
   async internalStateUpdate(value) {
+    // value is 0 (off), 1 (heat), 3 (auto)
+    // workMode for heat is 0, auto is 2
     try {
-      const newValue = value !== 0 ? 'on' : 'off';
-      const params = {
-        switch: newValue,
-      };
-      await this.platform.sendDeviceUpdate(this.accessory, params);
-      if (value === 0) {
-        this.service.updateCharacteristic(this.hapChar.CurrentHeatingCoolingState, 0);
+      const params = {};
+
+      switch (value) {
+        case 0:
+          if (this.cacheMode === 'off') {
+            return;
+          }
+
+          // still not sure which params to send for "off"
+          this.cacheMode = 'off';
+          return;
+          // break;
+        case 1:
+        case 2:
+          if (this.cacheMode === 'heat') {
+            return;
+          }
+          this.cacheMode = 'heat';
+          params.workMode = '0';
+          break;
+        case 3:
+          if (this.cacheMode === 'auto') {
+            return;
+          }
+          this.cacheMode = 'auto';
+          params.workMode = '2';
+          break;
+        default:
+          return;
       }
-      this.cacheState = newValue;
+
+      await this.platform.sendDeviceUpdate(this.accessory, params);
       if (this.enableLogging) {
-        this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState);
+        this.log('[%s] %s [%s].', this.name, this.lang.curMode, this.cacheMode);
       }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, true);
       setTimeout(() => {
         this.service.updateCharacteristic(
           this.hapChar.TargetHeatingCoolingState,
-          this.cacheState === 'on' ? 1 : 0,
+          // eslint-disable-next-line no-nested-ternary
+          this.cacheMode === 'auto' ? 3 : (this.cacheMode === 'heat' ? 1 : 0),
         );
       }, 2000);
       throw new this.hapErr(-70402);
@@ -180,7 +206,7 @@ export default class {
   async internalTargetUpdate(value) {
     try {
       const params = {
-        workMode: '1',
+        workMode: '0',
         curTargetTemp: value * 10,
       };
       await this.platform.sendDeviceUpdate(this.accessory, params);
@@ -199,17 +225,31 @@ export default class {
 
   async externalUpdate(params) {
     try {
-      if (params.switch && params.switch !== this.OnOff) {
-        this.cacheState = params.switch;
-        if (this.cacheState === 'off') {
-          this.service.updateCharacteristic(this.hapChar.CurrentHeatingCoolingState, 0);
-        }
-        this.service.updateCharacteristic(
-          this.hapChar.TargetHeatingCoolingState,
-          this.cacheState === 'on' ? 1 : 0,
-        );
-        if (params.updateSource && this.enableLogging) {
-          this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState);
+      // if (params.switch && params.switch !== this.OnOff) {
+      //   this.cacheState = params.switch;
+      //   if (this.cacheState === 'off') {
+      //     this.service.updateCharacteristic(this.hapChar.CurrentHeatingCoolingState, 0);
+      //   }
+      //   this.service.updateCharacteristic(
+      //     this.hapChar.TargetHeatingCoolingState,
+      //     this.cacheState === 'on' ? 1 : 0,
+      //   );
+      //   if (params.updateSource && this.enableLogging) {
+      //     this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState);
+      //   }
+      // }
+
+      if (params.workMode) {
+        const workMode = params.workMode === '2' ? 'auto' : 'heat';
+        if (this.cacheMode !== workMode) {
+          this.cacheMode = workMode;
+          this.service.updateCharacteristic(
+            this.hapChar.TargetHeatingCoolingState,
+            this.cacheMode === 'auto' ? 3 : 1,
+          );
+          if (params.updateSource && this.enableLogging) {
+            this.log('[%s] %s [%s].', this.name, this.lang.curMode, this.cacheMode);
+          }
         }
       }
 
diff --git a/package-lock.json b/package-lock.json
index a3241060..7a0fd15b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -28,7 +28,7 @@
       "license": "MIT",
       "dependencies": {
         "@homebridge/plugin-ui-utils": "^1.0.0",
-        "axios": "^1.6.3",
+        "axios": "^1.6.5",
         "node-persist": "^4.0.1",
         "p-queue": "^8.0.1",
         "websocket-as-promised": "^2.0.1",
@@ -197,9 +197,9 @@
       "dev": true
     },
     "node_modules/acorn": {
-      "version": "8.11.2",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.2.tgz",
-      "integrity": "sha512-nc0Axzp/0FILLEVsm4fNwLCwMttvhEI263QtVPQcbpfZZ3ts0hLsZGOpE6czNlid7CJ9MlyH8reXkpsf3YUY4w==",
+      "version": "8.11.3",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.3.tgz",
+      "integrity": "sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==",
       "dev": true,
       "bin": {
         "acorn": "bin/acorn"
@@ -386,11 +386,11 @@
       }
     },
     "node_modules/axios": {
-      "version": "1.6.3",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.3.tgz",
-      "integrity": "sha512-fWyNdeawGam70jXSVlKl+SUNVcL6j6W79CuSIPfi6HnDUmSCH6gyUys/HrqHeA/wU0Az41rRgean494d0Jb+ww==",
+      "version": "1.6.5",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.5.tgz",
+      "integrity": "sha512-Ii012v05KEVuUoFWmMW/UQv9aRIc3ZwkWDcM+h5Il8izZCtRVpDUfwpoFf7eOtajT3QiGR4yDUx7lPqHJULgbg==",
       "dependencies": {
-        "follow-redirects": "^1.15.0",
+        "follow-redirects": "^1.15.4",
         "form-data": "^4.0.0",
         "proxy-from-env": "^1.1.0"
       }
@@ -1047,9 +1047,9 @@
       "dev": true
     },
     "node_modules/follow-redirects": {
-      "version": "1.15.3",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.3.tgz",
-      "integrity": "sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q==",
+      "version": "1.15.4",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.4.tgz",
+      "integrity": "sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw==",
       "funding": [
         {
           "type": "individual",
diff --git a/package.json b/package.json
index 55dd8eb4..daacb7fd 100644
--- a/package.json
+++ b/package.json
@@ -61,7 +61,7 @@
   ],
   "dependencies": {
     "@homebridge/plugin-ui-utils": "^1.0.0",
-    "axios": "^1.6.3",
+    "axios": "^1.6.5",
     "node-persist": "^4.0.1",
     "p-queue": "^8.0.1",
     "websocket-as-promised": "^2.0.1",

From 65aec4bf375feea0476ab2ba73bf0eb33763e56a Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Mon, 8 Jan 2024 07:32:10 +0000
Subject: [PATCH 3178/3183] 12.1.1-beta.3

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 7a0fd15b..132cbbc4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "12.1.1-beta.2",
+  "version": "12.1.1-beta.3",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "12.1.1-beta.2",
+      "version": "12.1.1-beta.3",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index daacb7fd..7f83f5e9 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "homebridge-ewelink",
   "displayName": "Homebridge eWeLink",
   "alias": "eWeLink",
-  "version": "12.1.1-beta.2",
+  "version": "12.1.1-beta.3",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From 7e5f00e1aa9ee01d7e3b264ae03f22ad2114b13a Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Mon, 8 Jan 2024 20:02:48 +0000
Subject: [PATCH 3179/3183] zb thermostat

---
 lib/device/zigbee/thermostat.js | 41 ++++++++++++++++-----------------
 1 file changed, 20 insertions(+), 21 deletions(-)

diff --git a/lib/device/zigbee/thermostat.js b/lib/device/zigbee/thermostat.js
index af180a93..dd48ba64 100644
--- a/lib/device/zigbee/thermostat.js
+++ b/lib/device/zigbee/thermostat.js
@@ -165,8 +165,8 @@ export default class {
 
           // still not sure which params to send for "off"
           this.cacheMode = 'off';
-          return;
-          // break;
+          params.workMode = '1';
+          break;
         case 1:
         case 2:
           if (this.cacheMode === 'heat') {
@@ -225,28 +225,27 @@ export default class {
 
   async externalUpdate(params) {
     try {
-      // if (params.switch && params.switch !== this.OnOff) {
-      //   this.cacheState = params.switch;
-      //   if (this.cacheState === 'off') {
-      //     this.service.updateCharacteristic(this.hapChar.CurrentHeatingCoolingState, 0);
-      //   }
-      //   this.service.updateCharacteristic(
-      //     this.hapChar.TargetHeatingCoolingState,
-      //     this.cacheState === 'on' ? 1 : 0,
-      //   );
-      //   if (params.updateSource && this.enableLogging) {
-      //     this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState);
-      //   }
-      // }
-
       if (params.workMode) {
-        const workMode = params.workMode === '2' ? 'auto' : 'heat';
+        let workMode;
+        let hkWorkMode;
+        switch (params.workMode) {
+          case '0':
+            workMode = 'heat';
+            hkWorkMode = 1;
+            break;
+          case '1':
+            workMode = 'off';
+            hkWorkMode = 0;
+            break;
+          // case '2':
+          default:
+            workMode = 'auto';
+            hkWorkMode = 3;
+            break;
+        }
         if (this.cacheMode !== workMode) {
           this.cacheMode = workMode;
-          this.service.updateCharacteristic(
-            this.hapChar.TargetHeatingCoolingState,
-            this.cacheMode === 'auto' ? 3 : 1,
-          );
+          this.service.updateCharacteristic(this.hapChar.TargetHeatingCoolingState, hkWorkMode);
           if (params.updateSource && this.enableLogging) {
             this.log('[%s] %s [%s].', this.name, this.lang.curMode, this.cacheMode);
           }

From b33b75d4564e71bff8477461ea55bd31304b6b68 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Mon, 8 Jan 2024 20:03:20 +0000
Subject: [PATCH 3180/3183] 12.1.1-beta.4

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 132cbbc4..fd888cf2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "12.1.1-beta.3",
+  "version": "12.1.1-beta.4",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "12.1.1-beta.3",
+      "version": "12.1.1-beta.4",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 7f83f5e9..b35468dc 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "homebridge-ewelink",
   "displayName": "Homebridge eWeLink",
   "alias": "eWeLink",
-  "version": "12.1.1-beta.3",
+  "version": "12.1.1-beta.4",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From 87d249b8b2b3924661410aa2bb2c194bfe9dd5c4 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Sat, 16 Mar 2024 15:07:01 +0000
Subject: [PATCH 3181/3183] deps

---
 CHANGELOG.md      |   1 +
 package-lock.json | 598 ++++++++++++++++++++++++++++------------------
 package.json      |  12 +-
 3 files changed, 369 insertions(+), 242 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b51a7a34..bd36d0c0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,7 @@ This project tries to adhere to [Semantic Versioning](http://semver.org/). In pr
 ### Changed
 
 - Changed Rotation Speed characteristic for Fans from percentage to levels (#534) (@vadimpronin)
+- Bump `node` recommended versions to v18.19.1 or v20.11.1
 - Updated dependencies
 
 ## 12.1.0 (2023-12-16)
diff --git a/package-lock.json b/package-lock.json
index fd888cf2..04233ef9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -27,23 +27,23 @@
       ],
       "license": "MIT",
       "dependencies": {
-        "@homebridge/plugin-ui-utils": "^1.0.0",
-        "axios": "^1.6.5",
+        "@homebridge/plugin-ui-utils": "^1.0.1",
+        "axios": "^1.6.8",
         "node-persist": "^4.0.1",
         "p-queue": "^8.0.1",
         "websocket-as-promised": "^2.0.1",
         "ws": "^8.16.0"
       },
       "devDependencies": {
-        "eslint": "^8.56.0",
+        "eslint": "^8.57.0",
         "eslint-config-airbnb-base": "^15.0.0",
         "eslint-plugin-import": "^2.29.1",
-        "eslint-plugin-import-newlines": "^1.3.4",
-        "eslint-plugin-sort-exports": "^0.8.0"
+        "eslint-plugin-import-newlines": "^1.4.0",
+        "eslint-plugin-sort-exports": "^0.9.1"
       },
       "engines": {
         "homebridge": "^1.6.0",
-        "node": "^18.19.0 || ^20.10.0"
+        "node": "^18.19.1 || ^20.11.1"
       }
     },
     "node_modules/@aashutoshrathi/word-wrap": {
@@ -103,27 +103,27 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "8.56.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.56.0.tgz",
-      "integrity": "sha512-gMsVel9D7f2HLkBma9VbtzZRehRogVRfbr++f06nL2vnCGCNlzOD+/MUov/F4p8myyAHspEhVobgjpX64q5m6A==",
+      "version": "8.57.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.0.tgz",
+      "integrity": "sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==",
       "dev": true,
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       }
     },
     "node_modules/@homebridge/plugin-ui-utils": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@homebridge/plugin-ui-utils/-/plugin-ui-utils-1.0.0.tgz",
-      "integrity": "sha512-HVZCSiBgwOx+4ItOF78rZYOWDxOskz//k2r5Wqj7+iUD7Bcpmqp+ymhEuWO8fMtz1aSiFauYpWMz2ll5CBrG9g=="
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@homebridge/plugin-ui-utils/-/plugin-ui-utils-1.0.1.tgz",
+      "integrity": "sha512-Qxpu+HTb5F3tz6iV+gls/snzKPcP/9lOHwoV8IpJlXOeVWj3QMeMuw19dHH8ggLPMm4GaKuObrWjU9yOMENKkw=="
     },
     "node_modules/@humanwhocodes/config-array": {
-      "version": "0.11.13",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.13.tgz",
-      "integrity": "sha512-JSBDMiDKSzQVngfRjOdFXgFfklaXI4K9nLF49Auh21lmBWRLIK3+xTErTWD4KU54pb6coM6ESE7Awz/FNU3zgQ==",
+      "version": "0.11.14",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz",
+      "integrity": "sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==",
       "dev": true,
       "dependencies": {
-        "@humanwhocodes/object-schema": "^2.0.1",
-        "debug": "^4.1.1",
+        "@humanwhocodes/object-schema": "^2.0.2",
+        "debug": "^4.3.1",
         "minimatch": "^3.0.5"
       },
       "engines": {
@@ -144,9 +144,9 @@
       }
     },
     "node_modules/@humanwhocodes/object-schema": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.1.tgz",
-      "integrity": "sha512-dvuCeX5fC9dXgJn9t+X5atfmgQAzUOWqS1254Gh0m6i8wKd10ebXkfNKiRK+1GWi/yTvvLDHpoxLr0xxxeslWw==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.2.tgz",
+      "integrity": "sha512-6EwiSjwWYP7pTckG6I5eyFANjPhmPjUX9JRLUSfNPC7FX7zK9gyZAfUEaECL6ALTpGX5AjnBq3C9XmVWPitNpw==",
       "dev": true
     },
     "node_modules/@nodelib/fs.scandir": {
@@ -264,12 +264,15 @@
       "dev": true
     },
     "node_modules/array-buffer-byte-length": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz",
-      "integrity": "sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.1.tgz",
+      "integrity": "sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "is-array-buffer": "^3.0.1"
+        "call-bind": "^1.0.5",
+        "is-array-buffer": "^3.0.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -294,17 +297,36 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/array.prototype.findlastindex": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.3.tgz",
-      "integrity": "sha512-LzLoiOMAxvy+Gd3BAq3B7VeIgPdo+Q8hthvKtXybMvRV0jrXfJM/t8mw7nNlpEcVlVUnCnM2KSX4XU5HmpodOA==",
+    "node_modules/array.prototype.filter": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/array.prototype.filter/-/array.prototype.filter-1.0.3.tgz",
+      "integrity": "sha512-VizNcj/RGJiUyQBgzwxzE5oHdeuXY5hSbbmKMlphj1cy1Vl7Pn2asCGbSrru6hSQjmCzqTBPVWAF/whmEOVHbw==",
       "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.2.0",
         "es-abstract": "^1.22.1",
-        "es-shim-unscopables": "^1.0.0",
-        "get-intrinsic": "^1.2.1"
+        "es-array-method-boxes-properly": "^1.0.0",
+        "is-string": "^1.0.7"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array.prototype.findlastindex": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.4.tgz",
+      "integrity": "sha512-hzvSHUshSpCflDR1QMUBLHGHP1VIEBegT4pix9H/Z92Xw3ySoy6c2qh7lJWTJnRJ8JCZ9bJNCgTyYaJGcJu6xQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.5",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.22.3",
+        "es-errors": "^1.3.0",
+        "es-shim-unscopables": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -350,16 +372,17 @@
       }
     },
     "node_modules/arraybuffer.prototype.slice": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.2.tgz",
-      "integrity": "sha512-yMBKppFur/fbHu9/6USUe03bZ4knMYiwFBcyiaXB8Go0qNehwX6inYPzK9U0NeQvGxKthcmHcaR8P5MStSRBAw==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.3.tgz",
+      "integrity": "sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A==",
       "dependencies": {
-        "array-buffer-byte-length": "^1.0.0",
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1",
-        "get-intrinsic": "^1.2.1",
-        "is-array-buffer": "^3.0.2",
+        "array-buffer-byte-length": "^1.0.1",
+        "call-bind": "^1.0.5",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.22.3",
+        "es-errors": "^1.2.1",
+        "get-intrinsic": "^1.2.3",
+        "is-array-buffer": "^3.0.4",
         "is-shared-array-buffer": "^1.0.2"
       },
       "engines": {
@@ -375,9 +398,12 @@
       "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
     },
     "node_modules/available-typed-arrays": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz",
-      "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz",
+      "integrity": "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==",
+      "dependencies": {
+        "possible-typed-array-names": "^1.0.0"
+      },
       "engines": {
         "node": ">= 0.4"
       },
@@ -386,11 +412,11 @@
       }
     },
     "node_modules/axios": {
-      "version": "1.6.5",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.5.tgz",
-      "integrity": "sha512-Ii012v05KEVuUoFWmMW/UQv9aRIc3ZwkWDcM+h5Il8izZCtRVpDUfwpoFf7eOtajT3QiGR4yDUx7lPqHJULgbg==",
+      "version": "1.6.8",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.8.tgz",
+      "integrity": "sha512-v/ZHtJDU39mDpyBoFVkETcd/uNdxrWRrg3bKpOKzXFA6Bvqopts6ALSMU3y6ijYxbw2B+wPrIv46egTzJXCLGQ==",
       "dependencies": {
-        "follow-redirects": "^1.15.4",
+        "follow-redirects": "^1.15.6",
         "form-data": "^4.0.0",
         "proxy-from-env": "^1.1.0"
       }
@@ -412,13 +438,18 @@
       }
     },
     "node_modules/call-bind": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.5.tgz",
-      "integrity": "sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ==",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz",
+      "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==",
       "dependencies": {
+        "es-define-property": "^1.0.0",
+        "es-errors": "^1.3.0",
         "function-bind": "^1.1.2",
-        "get-intrinsic": "^1.2.1",
-        "set-function-length": "^1.1.1"
+        "get-intrinsic": "^1.2.4",
+        "set-function-length": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -533,16 +564,19 @@
       "dev": true
     },
     "node_modules/define-data-property": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.1.tgz",
-      "integrity": "sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
+      "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
       "dependencies": {
-        "get-intrinsic": "^1.2.1",
-        "gopd": "^1.0.1",
-        "has-property-descriptors": "^1.0.0"
+        "es-define-property": "^1.0.0",
+        "es-errors": "^1.3.0",
+        "gopd": "^1.0.1"
       },
       "engines": {
         "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/define-properties": {
@@ -582,49 +616,51 @@
       }
     },
     "node_modules/es-abstract": {
-      "version": "1.22.3",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.3.tgz",
-      "integrity": "sha512-eiiY8HQeYfYH2Con2berK+To6GrK2RxbPawDkGq4UiCQQfZHb6wX9qQqkbpPqaxQFcl8d9QzZqo0tGE0VcrdwA==",
-      "dependencies": {
-        "array-buffer-byte-length": "^1.0.0",
-        "arraybuffer.prototype.slice": "^1.0.2",
-        "available-typed-arrays": "^1.0.5",
-        "call-bind": "^1.0.5",
-        "es-set-tostringtag": "^2.0.1",
+      "version": "1.22.5",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.5.tgz",
+      "integrity": "sha512-oW69R+4q2wG+Hc3KZePPZxOiisRIqfKBVo/HLx94QcJeWGU/8sZhCvc829rd1kS366vlJbzBfXf9yWwf0+Ko7w==",
+      "dependencies": {
+        "array-buffer-byte-length": "^1.0.1",
+        "arraybuffer.prototype.slice": "^1.0.3",
+        "available-typed-arrays": "^1.0.7",
+        "call-bind": "^1.0.7",
+        "es-define-property": "^1.0.0",
+        "es-errors": "^1.3.0",
+        "es-set-tostringtag": "^2.0.3",
         "es-to-primitive": "^1.2.1",
         "function.prototype.name": "^1.1.6",
-        "get-intrinsic": "^1.2.2",
-        "get-symbol-description": "^1.0.0",
+        "get-intrinsic": "^1.2.4",
+        "get-symbol-description": "^1.0.2",
         "globalthis": "^1.0.3",
         "gopd": "^1.0.1",
-        "has-property-descriptors": "^1.0.0",
-        "has-proto": "^1.0.1",
+        "has-property-descriptors": "^1.0.2",
+        "has-proto": "^1.0.3",
         "has-symbols": "^1.0.3",
-        "hasown": "^2.0.0",
-        "internal-slot": "^1.0.5",
-        "is-array-buffer": "^3.0.2",
+        "hasown": "^2.0.1",
+        "internal-slot": "^1.0.7",
+        "is-array-buffer": "^3.0.4",
         "is-callable": "^1.2.7",
-        "is-negative-zero": "^2.0.2",
+        "is-negative-zero": "^2.0.3",
         "is-regex": "^1.1.4",
-        "is-shared-array-buffer": "^1.0.2",
+        "is-shared-array-buffer": "^1.0.3",
         "is-string": "^1.0.7",
-        "is-typed-array": "^1.1.12",
+        "is-typed-array": "^1.1.13",
         "is-weakref": "^1.0.2",
         "object-inspect": "^1.13.1",
         "object-keys": "^1.1.1",
-        "object.assign": "^4.1.4",
-        "regexp.prototype.flags": "^1.5.1",
-        "safe-array-concat": "^1.0.1",
-        "safe-regex-test": "^1.0.0",
+        "object.assign": "^4.1.5",
+        "regexp.prototype.flags": "^1.5.2",
+        "safe-array-concat": "^1.1.0",
+        "safe-regex-test": "^1.0.3",
         "string.prototype.trim": "^1.2.8",
         "string.prototype.trimend": "^1.0.7",
         "string.prototype.trimstart": "^1.0.7",
-        "typed-array-buffer": "^1.0.0",
-        "typed-array-byte-length": "^1.0.0",
-        "typed-array-byte-offset": "^1.0.0",
-        "typed-array-length": "^1.0.4",
+        "typed-array-buffer": "^1.0.2",
+        "typed-array-byte-length": "^1.0.1",
+        "typed-array-byte-offset": "^1.0.2",
+        "typed-array-length": "^1.0.5",
         "unbox-primitive": "^1.0.2",
-        "which-typed-array": "^1.1.13"
+        "which-typed-array": "^1.1.14"
       },
       "engines": {
         "node": ">= 0.4"
@@ -633,14 +669,39 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/es-array-method-boxes-properly": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz",
+      "integrity": "sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA==",
+      "dev": true
+    },
+    "node_modules/es-define-property": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz",
+      "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==",
+      "dependencies": {
+        "get-intrinsic": "^1.2.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-errors": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
+      "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/es-set-tostringtag": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.2.tgz",
-      "integrity": "sha512-BuDyupZt65P9D2D2vA/zqcI3G5xRsklm5N3xCwuiy+/vKy8i0ifdsQP1sLgO4tZDSCaQUSnmC48khknGMV3D2Q==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.3.tgz",
+      "integrity": "sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ==",
       "dependencies": {
-        "get-intrinsic": "^1.2.2",
-        "has-tostringtag": "^1.0.0",
-        "hasown": "^2.0.0"
+        "get-intrinsic": "^1.2.4",
+        "has-tostringtag": "^1.0.2",
+        "hasown": "^2.0.1"
       },
       "engines": {
         "node": ">= 0.4"
@@ -684,16 +745,16 @@
       }
     },
     "node_modules/eslint": {
-      "version": "8.56.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.56.0.tgz",
-      "integrity": "sha512-Go19xM6T9puCOWntie1/P997aXxFsOi37JIHRWI514Hc6ZnaHGKY9xFhrU65RT6CcBEzZoGG1e6Nq+DT04ZtZQ==",
+      "version": "8.57.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.0.tgz",
+      "integrity": "sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==",
       "dev": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.6.1",
         "@eslint/eslintrc": "^2.1.4",
-        "@eslint/js": "8.56.0",
-        "@humanwhocodes/config-array": "^0.11.13",
+        "@eslint/js": "8.57.0",
+        "@humanwhocodes/config-array": "^0.11.14",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
         "@ungap/structured-clone": "^1.2.0",
@@ -778,9 +839,9 @@
       }
     },
     "node_modules/eslint-module-utils": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.8.0.tgz",
-      "integrity": "sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw==",
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.8.1.tgz",
+      "integrity": "sha512-rXDXR3h7cs7dy9RNpUlQf80nX31XWJEyGq1tRMo+6GsO5VmTe4UTwtmonAD4ZkAsrfMVDA2wlGJ3790Ys+D49Q==",
       "dev": true,
       "dependencies": {
         "debug": "^3.2.7"
@@ -835,9 +896,9 @@
       }
     },
     "node_modules/eslint-plugin-import-newlines": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import-newlines/-/eslint-plugin-import-newlines-1.3.4.tgz",
-      "integrity": "sha512-Lmf/BbK+EQKUfjKPcZpslE/KTGYlgaI8ZJ/sYzdbb3BVTg5+GmLBLHBjsUKNEVRM1SEhDTF/didtOSYKi4tSnQ==",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import-newlines/-/eslint-plugin-import-newlines-1.4.0.tgz",
+      "integrity": "sha512-+Cz1x2xBLtI9gJbmuYEpvY7F8K75wskBmJ7rk4VRObIJo+jklUJaejFJgtnWeL0dCFWabGEkhausrikXaNbtoQ==",
       "dev": true,
       "bin": {
         "import-linter": "lib/index.js"
@@ -871,14 +932,41 @@
       }
     },
     "node_modules/eslint-plugin-sort-exports": {
-      "version": "0.8.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-sort-exports/-/eslint-plugin-sort-exports-0.8.0.tgz",
-      "integrity": "sha512-5x7kJNjIS5bSyehFJ6Gk2gh2wUPt/rmhwDHF8JPDicSH7bvrLRFdlkhHu74YqYBjEySHYaOZVoKNP90TjI0v6w==",
+      "version": "0.9.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-sort-exports/-/eslint-plugin-sort-exports-0.9.1.tgz",
+      "integrity": "sha512-2w6jHusdF2K60bcGKpa9HEinETwNzVrvplZipVculCfu3ZDd5IW3xL54XVEnVkGIPJnp/LitFCg7owL4DOtuHg==",
       "dev": true,
+      "dependencies": {
+        "minimatch": "^9.0.3"
+      },
       "peerDependencies": {
         "eslint": ">=5.0.0"
       }
     },
+    "node_modules/eslint-plugin-sort-exports/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/eslint-plugin-sort-exports/node_modules/minimatch": {
+      "version": "9.0.3",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
+      "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/eslint-scope": {
       "version": "7.2.2",
       "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz",
@@ -990,9 +1078,9 @@
       "dev": true
     },
     "node_modules/fastq": {
-      "version": "1.16.0",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.16.0.tgz",
-      "integrity": "sha512-ifCoaXsDrsdkWTtiNJX5uzHDsrck5TzfKKDcuFFTIrrc/BS076qgEIfoIy1VeZqViznfKiysPYTh/QeHtnIsYA==",
+      "version": "1.17.1",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz",
+      "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==",
       "dev": true,
       "dependencies": {
         "reusify": "^1.0.4"
@@ -1041,15 +1129,15 @@
       }
     },
     "node_modules/flatted": {
-      "version": "3.2.9",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.9.tgz",
-      "integrity": "sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==",
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.1.tgz",
+      "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==",
       "dev": true
     },
     "node_modules/follow-redirects": {
-      "version": "1.15.4",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.4.tgz",
-      "integrity": "sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw==",
+      "version": "1.15.6",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz",
+      "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==",
       "funding": [
         {
           "type": "individual",
@@ -1126,26 +1214,31 @@
       }
     },
     "node_modules/get-intrinsic": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.2.tgz",
-      "integrity": "sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA==",
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
+      "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==",
       "dependencies": {
+        "es-errors": "^1.3.0",
         "function-bind": "^1.1.2",
         "has-proto": "^1.0.1",
         "has-symbols": "^1.0.3",
         "hasown": "^2.0.0"
       },
+      "engines": {
+        "node": ">= 0.4"
+      },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/get-symbol-description": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz",
-      "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.2.tgz",
+      "integrity": "sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg==",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.1"
+        "call-bind": "^1.0.5",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.4"
       },
       "engines": {
         "node": ">= 0.4"
@@ -1250,20 +1343,20 @@
       }
     },
     "node_modules/has-property-descriptors": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.1.tgz",
-      "integrity": "sha512-VsX8eaIewvas0xnvinAe9bw4WfIeODpGYikiWYLH+dma0Jw6KHYqWiWfhQlgOVK8D6PvjubK5Uc4P0iIhIcNVg==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
+      "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
       "dependencies": {
-        "get-intrinsic": "^1.2.2"
+        "es-define-property": "^1.0.0"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/has-proto": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz",
-      "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz",
+      "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==",
       "engines": {
         "node": ">= 0.4"
       },
@@ -1283,11 +1376,11 @@
       }
     },
     "node_modules/has-tostringtag": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
-      "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz",
+      "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==",
       "dependencies": {
-        "has-symbols": "^1.0.2"
+        "has-symbols": "^1.0.3"
       },
       "engines": {
         "node": ">= 0.4"
@@ -1297,9 +1390,9 @@
       }
     },
     "node_modules/hasown": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.0.tgz",
-      "integrity": "sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
+      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
       "dependencies": {
         "function-bind": "^1.1.2"
       },
@@ -1308,9 +1401,9 @@
       }
     },
     "node_modules/ignore": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.0.tgz",
-      "integrity": "sha512-g7dmpshy+gD7mh88OC9NwSGTKoc3kyLAZQRU1mt53Aw/vnvfXnbC+F/7F7QoYVKbV+KNvJx8wArewKy1vXMtlg==",
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.1.tgz",
+      "integrity": "sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==",
       "dev": true,
       "engines": {
         "node": ">= 4"
@@ -1358,11 +1451,11 @@
       "dev": true
     },
     "node_modules/internal-slot": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.6.tgz",
-      "integrity": "sha512-Xj6dv+PsbtwyPpEflsejS+oIZxmMlV44zAhG479uYu89MsjcYOhCFnNyKrkJrihbsiasQyY0afoCl/9BLR65bg==",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.7.tgz",
+      "integrity": "sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==",
       "dependencies": {
-        "get-intrinsic": "^1.2.2",
+        "es-errors": "^1.3.0",
         "hasown": "^2.0.0",
         "side-channel": "^1.0.4"
       },
@@ -1371,13 +1464,15 @@
       }
     },
     "node_modules/is-array-buffer": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.2.tgz",
-      "integrity": "sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==",
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.4.tgz",
+      "integrity": "sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==",
       "dependencies": {
         "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.2.0",
-        "is-typed-array": "^1.1.10"
+        "get-intrinsic": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -1468,9 +1563,9 @@
       }
     },
     "node_modules/is-negative-zero": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
-      "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.3.tgz",
+      "integrity": "sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==",
       "engines": {
         "node": ">= 0.4"
       },
@@ -1517,11 +1612,14 @@
       }
     },
     "node_modules/is-shared-array-buffer": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
-      "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.3.tgz",
+      "integrity": "sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg==",
       "dependencies": {
-        "call-bind": "^1.0.2"
+        "call-bind": "^1.0.7"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -1556,11 +1654,11 @@
       }
     },
     "node_modules/is-typed-array": {
-      "version": "1.1.12",
-      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.12.tgz",
-      "integrity": "sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==",
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.13.tgz",
+      "integrity": "sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==",
       "dependencies": {
-        "which-typed-array": "^1.1.11"
+        "which-typed-array": "^1.1.14"
       },
       "engines": {
         "node": ">= 0.4"
@@ -1801,15 +1899,16 @@
       }
     },
     "node_modules/object.groupby": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.1.tgz",
-      "integrity": "sha512-HqaQtqLnp/8Bn4GL16cj+CUYbnpe1bh0TtEaWvybszDG4tgxCJuRpV8VGuvNaI1fAnI4lUJzDG55MXcOH4JZcQ==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.2.tgz",
+      "integrity": "sha512-bzBq58S+x+uo0VjurFT0UktpKHOZmv4/xePiOA1nbB9pMqpGK7rUPNgf+1YC+7mE+0HzhTMqNUuCqvKhj6FnBw==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1",
-        "get-intrinsic": "^1.2.1"
+        "array.prototype.filter": "^1.0.3",
+        "call-bind": "^1.0.5",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.22.3",
+        "es-errors": "^1.0.0"
       }
     },
     "node_modules/object.values": {
@@ -1956,6 +2055,14 @@
       "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
       "dev": true
     },
+    "node_modules/possible-typed-array-names": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz",
+      "integrity": "sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/prelude-ls": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
@@ -1974,14 +2081,14 @@
       }
     },
     "node_modules/promise.prototype.finally": {
-      "version": "3.1.7",
-      "resolved": "https://registry.npmjs.org/promise.prototype.finally/-/promise.prototype.finally-3.1.7.tgz",
-      "integrity": "sha512-iL9OcJRUZcCE5xn6IwhZxO+eMM0VEXjkETHy+Nk+d9q3s7kxVtPg+mBlMO+ZGxNKNMODyKmy/bOyt/yhxTnvEw==",
+      "version": "3.1.8",
+      "resolved": "https://registry.npmjs.org/promise.prototype.finally/-/promise.prototype.finally-3.1.8.tgz",
+      "integrity": "sha512-aVDtsXOml9iuMJzUco9J1je/UrIT3oMYfWkCTiUhkt+AvZw72q4dUZnR/R/eB3h5GeAagQVXvM1ApoYniJiwoA==",
       "dependencies": {
-        "call-bind": "^1.0.2",
+        "call-bind": "^1.0.5",
         "define-properties": "^1.2.1",
-        "es-abstract": "^1.22.1",
-        "get-intrinsic": "^1.2.1",
+        "es-abstract": "^1.22.3",
+        "es-errors": "^1.0.0",
         "set-function-name": "^2.0.1"
       },
       "engines": {
@@ -2034,13 +2141,14 @@
       ]
     },
     "node_modules/regexp.prototype.flags": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.1.tgz",
-      "integrity": "sha512-sy6TXMN+hnP/wMy+ISxg3krXx7BAtWVO4UouuCN/ziM9UEne0euamVNafDfvC83bRNr95y0V5iijeDQFUNpvrg==",
+      "version": "1.5.2",
+      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.2.tgz",
+      "integrity": "sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw==",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "set-function-name": "^2.0.0"
+        "call-bind": "^1.0.6",
+        "define-properties": "^1.2.1",
+        "es-errors": "^1.3.0",
+        "set-function-name": "^2.0.1"
       },
       "engines": {
         "node": ">= 0.4"
@@ -2124,12 +2232,12 @@
       }
     },
     "node_modules/safe-array-concat": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.0.1.tgz",
-      "integrity": "sha512-6XbUAseYE2KtOuGueyeobCySj9L4+66Tn6KQMOPQJrAJEowYKW/YR/MGJZl7FdydUdaFu4LYyDZjxf4/Nmo23Q==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.2.tgz",
+      "integrity": "sha512-vj6RsCsWBCf19jIeHEfkRMw8DPiBb+DMXklQ/1SGDHOMlHdPUkZXFQ2YdplS23zESTijAcurb1aSgJA3AgMu1Q==",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.2.1",
+        "call-bind": "^1.0.7",
+        "get-intrinsic": "^1.2.4",
         "has-symbols": "^1.0.3",
         "isarray": "^2.0.5"
       },
@@ -2141,14 +2249,17 @@
       }
     },
     "node_modules/safe-regex-test": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz",
-      "integrity": "sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.3.tgz",
+      "integrity": "sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw==",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.3",
+        "call-bind": "^1.0.6",
+        "es-errors": "^1.3.0",
         "is-regex": "^1.1.4"
       },
+      "engines": {
+        "node": ">= 0.4"
+      },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -2163,27 +2274,30 @@
       }
     },
     "node_modules/set-function-length": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.1.1.tgz",
-      "integrity": "sha512-VoaqjbBJKiWtg4yRcKBQ7g7wnGnLV3M8oLvVWwOk2PdYY6PEFegR1vezXR0tw6fZGF9csVakIRjrJiy2veSBFQ==",
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
+      "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",
       "dependencies": {
-        "define-data-property": "^1.1.1",
-        "get-intrinsic": "^1.2.1",
+        "define-data-property": "^1.1.4",
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2",
+        "get-intrinsic": "^1.2.4",
         "gopd": "^1.0.1",
-        "has-property-descriptors": "^1.0.0"
+        "has-property-descriptors": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
       }
     },
     "node_modules/set-function-name": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.1.tgz",
-      "integrity": "sha512-tMNCiqYVkXIZgc2Hnoy2IvC/f8ezc5koaRFkCjrpWzGpCd3qbZXPzVy9MAZzK1ch/X0jvSkojys3oqJN0qCmdA==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.2.tgz",
+      "integrity": "sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==",
       "dependencies": {
-        "define-data-property": "^1.0.1",
+        "define-data-property": "^1.1.4",
+        "es-errors": "^1.3.0",
         "functions-have-names": "^1.2.3",
-        "has-property-descriptors": "^1.0.0"
+        "has-property-descriptors": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -2211,13 +2325,17 @@
       }
     },
     "node_modules/side-channel": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
-      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz",
+      "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==",
       "dependencies": {
-        "call-bind": "^1.0.0",
-        "get-intrinsic": "^1.0.2",
-        "object-inspect": "^1.9.0"
+        "call-bind": "^1.0.7",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.4",
+        "object-inspect": "^1.13.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -2365,27 +2483,28 @@
       }
     },
     "node_modules/typed-array-buffer": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.0.tgz",
-      "integrity": "sha512-Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.2.tgz",
+      "integrity": "sha512-gEymJYKZtKXzzBzM4jqa9w6Q1Jjm7x2d+sh19AdsD4wqnMPDYyvwpsIc2Q/835kHuo3BEQ7CjelGhfTsoBb2MQ==",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.2.1",
-        "is-typed-array": "^1.1.10"
+        "call-bind": "^1.0.7",
+        "es-errors": "^1.3.0",
+        "is-typed-array": "^1.1.13"
       },
       "engines": {
         "node": ">= 0.4"
       }
     },
     "node_modules/typed-array-byte-length": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.0.tgz",
-      "integrity": "sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.1.tgz",
+      "integrity": "sha512-3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw==",
       "dependencies": {
-        "call-bind": "^1.0.2",
+        "call-bind": "^1.0.7",
         "for-each": "^0.3.3",
-        "has-proto": "^1.0.1",
-        "is-typed-array": "^1.1.10"
+        "gopd": "^1.0.1",
+        "has-proto": "^1.0.3",
+        "is-typed-array": "^1.1.13"
       },
       "engines": {
         "node": ">= 0.4"
@@ -2395,15 +2514,16 @@
       }
     },
     "node_modules/typed-array-byte-offset": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.0.tgz",
-      "integrity": "sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.2.tgz",
+      "integrity": "sha512-Ous0vodHa56FviZucS2E63zkgtgrACj7omjwd/8lTEMEPFFyjfixMZ1ZXenpgCFBBt4EC1J2XsyVS2gkG0eTFA==",
       "dependencies": {
-        "available-typed-arrays": "^1.0.5",
-        "call-bind": "^1.0.2",
+        "available-typed-arrays": "^1.0.7",
+        "call-bind": "^1.0.7",
         "for-each": "^0.3.3",
-        "has-proto": "^1.0.1",
-        "is-typed-array": "^1.1.10"
+        "gopd": "^1.0.1",
+        "has-proto": "^1.0.3",
+        "is-typed-array": "^1.1.13"
       },
       "engines": {
         "node": ">= 0.4"
@@ -2413,13 +2533,19 @@
       }
     },
     "node_modules/typed-array-length": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.4.tgz",
-      "integrity": "sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==",
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.5.tgz",
+      "integrity": "sha512-yMi0PlwuznKHxKmcpoOdeLwxBoVPkqZxd7q2FgMkmD3bNwvF5VW0+UlUQ1k1vmktTu4Yu13Q0RIxEP8+B+wloA==",
       "dependencies": {
-        "call-bind": "^1.0.2",
+        "call-bind": "^1.0.7",
         "for-each": "^0.3.3",
-        "is-typed-array": "^1.1.9"
+        "gopd": "^1.0.1",
+        "has-proto": "^1.0.3",
+        "is-typed-array": "^1.1.13",
+        "possible-typed-array-names": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -2493,15 +2619,15 @@
       }
     },
     "node_modules/which-typed-array": {
-      "version": "1.1.13",
-      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.13.tgz",
-      "integrity": "sha512-P5Nra0qjSncduVPEAr7xhoF5guty49ArDTwzJ/yNuPIbZppyRxFQsRCWrocxIY+CnMVG+qfbU2FmDKyvSGClow==",
+      "version": "1.1.15",
+      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.15.tgz",
+      "integrity": "sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA==",
       "dependencies": {
-        "available-typed-arrays": "^1.0.5",
-        "call-bind": "^1.0.4",
+        "available-typed-arrays": "^1.0.7",
+        "call-bind": "^1.0.7",
         "for-each": "^0.3.3",
         "gopd": "^1.0.1",
-        "has-tostringtag": "^1.0.0"
+        "has-tostringtag": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
diff --git a/package.json b/package.json
index b35468dc..3b901622 100644
--- a/package.json
+++ b/package.json
@@ -32,7 +32,7 @@
   },
   "engines": {
     "homebridge": "^1.6.0",
-    "node": "^18.19.0 || ^20.10.0"
+    "node": "^18.19.1 || ^20.11.1"
   },
   "repository": {
     "type": "git",
@@ -60,18 +60,18 @@
     }
   ],
   "dependencies": {
-    "@homebridge/plugin-ui-utils": "^1.0.0",
-    "axios": "^1.6.5",
+    "@homebridge/plugin-ui-utils": "^1.0.1",
+    "axios": "^1.6.8",
     "node-persist": "^4.0.1",
     "p-queue": "^8.0.1",
     "websocket-as-promised": "^2.0.1",
     "ws": "^8.16.0"
   },
   "devDependencies": {
-    "eslint": "^8.56.0",
+    "eslint": "^8.57.0",
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-plugin-import": "^2.29.1",
-    "eslint-plugin-import-newlines": "^1.3.4",
-    "eslint-plugin-sort-exports": "^0.8.0"
+    "eslint-plugin-import-newlines": "^1.4.0",
+    "eslint-plugin-sort-exports": "^0.9.1"
   }
 }

From 5b4cfeff103c84157faddc5d61143e351b2bd712 Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Sat, 16 Mar 2024 15:07:16 +0000
Subject: [PATCH 3182/3183] 12.1.1-beta.5

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 04233ef9..98f8fed3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebridge-ewelink",
-  "version": "12.1.1-beta.4",
+  "version": "12.1.1-beta.5",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-ewelink",
-      "version": "12.1.1-beta.4",
+      "version": "12.1.1-beta.5",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 3b901622..47f0436a 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "homebridge-ewelink",
   "displayName": "Homebridge eWeLink",
   "alias": "eWeLink",
-  "version": "12.1.1-beta.4",
+  "version": "12.1.1-beta.5",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"

From 9f0bef581abdf0db9c382d12abfcff3ac0531faf Mon Sep 17 00:00:00 2001
From: Ben <43026681+bwp91@users.noreply.github.com>
Date: Sat, 16 Mar 2024 15:14:19 +0000
Subject: [PATCH 3183/3183] actions

---
 .github/workflows/build.yml           | 6 +++---
 .github/workflows/codeql-analysis.yml | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b1aacab9..bdfa0634 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -9,13 +9,13 @@ jobs:
     strategy:
       matrix:
         # the Node.js versions to build on
-        node-version: [12.x, 14.x, 16.x]
+        node-version: [18.x, 20.x]
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
 
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 51bab658..922b480e 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -16,7 +16,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
       with:
         # We must fetch at least the immediate parents so that if this is
         # a pull request then we can checkout the head.
@@ -29,7 +29,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
+      uses: github/codeql-action/init@v3
       # Override language selection by uncommenting this and choosing your languages
       # with:
       #   languages: go, javascript, csharp, python, cpp, java
@@ -37,7 +37,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
+      uses: github/codeql-action/autobuild@v3
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -51,4 +51,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@v3